From b78bfd9ad51e1bb2d1641fcc7766ac57d8043c55 Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Thu, 25 Oct 2012 10:33:24 +0100
Subject: [PATCH 001/623] Finished option to customise Processor Tray serial in
 MacPro

---
 i386/config/settings-template.h    |  4 ++++
 i386/libsaio/smbios/dynamic_data.h | 11 ++++++++---
 i386/libsaio/smbios/getters.h      |  9 +++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 263eba5..0732192 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -331,6 +331,10 @@
 	#undef USE_STATIC_CPU_DATA					// Prevent boot failures due to wrong settings (until I figured out what we are missing).
 #endif
 
+#if TARGET_MODEL & MACPRO
+    #define STATIC_SMBOARDSERIAL            "SOMEBOARDNMBR" // Example only!
+#endif
+
 #define OVERRIDE_DYNAMIC_MEMORY_DETECTION	0	// Set to 0 by default. Change this to 0 only when your SMBIOS data (type 17) is correct, or when
 												// you want/need to override some/all of the SMBIOS data.
 												//
diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 99f62fe..91f25d6 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -54,9 +54,9 @@ struct SMBStructure requiredStructures[] =
 {
 	{ kSMBTypeBIOSInformation		/*   0 */ ,		 0,		 5,		false,		0	},
 	{ kSMBTypeSystemInformation		/*   1 */ ,		 6,		10,		false,		0	},
-	{ kSMBTypeBaseBoard				/*   2 */ ,		11,		12,		false,		0	},
+	{ kSMBTypeBaseBoard				/*   2 */ ,		11,		14,		false,		0	},
 	{ kSMBUnused					/*   3 */ ,		 0,		 0,		false,		0	},
-	{ kSMBTypeProcessorInformation	/*   4 */ ,		13,		14,		true,		0	},
+	{ kSMBTypeProcessorInformation	/*   4 */ ,		15,		16,		true,		0	},
 	{ kSMBUnused					/*   5 */ ,		 0,		 0,		false,		0	},
 	{ kSMBUnused					/*   6 */ ,		 0,		 0,		false,		0	},
 	{ kSMBUnused					/*   7 */ ,		 0,		 0,		false,		0	},
@@ -69,7 +69,7 @@ struct SMBStructure requiredStructures[] =
 	{ kSMBUnused					/*  14 */ ,		 0,		 0,		false,		0	},
 	{ kSMBUnused					/*  15 */ ,		 0,		 0,		false,		0	},
 	{ kSMBUnused					/*  16 */ ,		 0,		 0,		false,		0	},
-	{ kSMBTypeMemoryDevice			/*  17 */ ,		15,		19,		true,		0	}
+	{ kSMBTypeMemoryDevice			/*  17 */ ,		17,		21,		true,		0	}
 };
 
 
@@ -130,6 +130,11 @@ struct SMBProperty SMBProperties[] =
 	
 	{ kSMBTypeBaseBoard,			0x04,	kSMBString,		.plainData		= APPLE_INC				},
 	{ kSMBTypeBaseBoard,			0x05,	kSMBString,		.plainData		= SMB_BOARD_PRODUCT		},
+    
+#if TARGET_MODEL & MACPRO
+    { kSMBTypeBaseBoard,			0x07,	kSMBString,		.plainData		= STATIC_SMBOARDSERIAL	},
+	{ kSMBTypeBaseBoard,			0x0d,	kSMBByte,		.getSMBByte		= getBoardType          },
+#endif
 	
 	//------------------------------------------------------------------------------------------------
 	
diff --git a/i386/libsaio/smbios/getters.h b/i386/libsaio/smbios/getters.h
index 9c9b100..54aade3 100755
--- a/i386/libsaio/smbios/getters.h
+++ b/i386/libsaio/smbios/getters.h
@@ -346,3 +346,12 @@ static SMBDWord getBIOSFeaturesEX(void)
 {
 	return (0x010002c1);
 }
+
+//==============================================================================
+
+#if TARGET_MODEL & MACPRO
+static SMBByte getBoardType(void)
+{
+	return 0x0b;	// Some logic here or just return 11/0x0b.
+}
+#endif

From 946bd41ae3c6880cfdd6903b8191a29c30ccf00d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:03:56 +0300
Subject: [PATCH 002/623] Update for RevoBoot v1.5.10/v1.5.20

---
 Makefile | 185 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 124 insertions(+), 61 deletions(-)

diff --git a/Makefile b/Makefile
index 8216a1e..40a2c4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,30 @@
 #
-#	Makefile for RevoBoot
+# File: RevoBoot/Makefile
+#
+# Updates:
+#
+#			- Major cleanup (PikerAlpha, October 2012).
+#			- Output improvements (PikerAlpha, October 2012).
+#			- Default build target is now Mountain Lion (PikerAlpha, October 2012).
+#			- PRODUCT_MODEL_TARGET for target build model added (PikerAlpha, October 2012).
+#			- Creates RevoBoot/config/SETTINGS when missing (PikerAlpha, October 2012).
+#			- Copies settings-template.h to SETTINGS/ModelnameNN.h when missing (PikerAlpha, October 2012).
+#			- Automatic ACPI/EFI/SMBIOS data selection (PikerAlpha, October 2012).
+#
+
+#
+# Include Apple makefile definitions.
 #
 
 export USE_APPLE_PB_SUPPORT = all
 
-# CFLAGS	= -O $(MORECPP) -arch i386 -g 
-DEFINES=
-CONFIG = hd
 LIBDIR = libsa
 INC = -I. -I$(LIBDIR)
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
-AS = as
-LD = ld
+
 PAX = /bin/pax
 
 OBJROOT = `pwd`/obj
 SYMROOT = `pwd`/sym
-DSTROOT = `pwd`/dst
-SRCROOT = /tmp
 
 #
 # Export version number (picked up by i386/libsaio/Makefile)
@@ -31,69 +34,129 @@ export PRODUCT_VERSION_NUMBER = `cat ../../VERSION`
 
 EXCLUDE = --exclude=.DS_Store --exclude=sym --exclude=obj --exclude=*.sh
 
-ARCHLESS_RC_CFLAGS=`echo $(RC_CFLAGS) | sed 's/-arch [a-z0-9]*//g'`
+#
+# Search paths.
+#
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-GENERIC_SUBDIRS =
-
 #
-# Export target OS type (picked up by i386/libsaio/Makefile)
+# Check if OS build target is specified (example: make mountain-lion).
 #
 
-ifeq ($(MAKECMDGOALS), mountain-lion)
+ifeq ($(MAKECMDGOALS),)
+	#
+	# No OS build target given. Build for Mountain Lion (default).
+	#
 	MAKE_TARGET_OS = 6;
+	MAKEGOAL = mountain-lion
 else
-	ifeq ($(MAKECMDGOALS), lion)
-		MAKE_TARGET_OS = 2;
+	#
+	# Setting MAKE_TARGET_OS and MAKEGOAL based on OS build target.
+	#
+	ifeq ($(MAKECMDGOALS), mountain-lion)
+		MAKE_TARGET_OS = 6;
+		MAKEGOAL = mountain-lion
 	else
-		MAKE_TARGET_OS = 1;
+		ifeq ($(MAKECMDGOALS), lion)
+			MAKE_TARGET_OS = 2;
+			MAKEGOAL = lion
+		else ifeq ($(MAKECMDGOALS), legacy)
+			MAKE_TARGET_OS = 1;
+			MAKEGOAL = legacy
+		endif
 	endif
 endif
 
+#
+# Export our make goal i.e. mountain-lion, lion or legacy (snow-leopard or leopard).
+#
+
+export MAKEGOAL
+
+#
+# Export OS build target (picked up by: i386/libsaio/Makefile).
+#
+
 export PRODUCT_OS_TARGET = `echo $(MAKE_TARGET_OS)`
 
-lion: all
-mountain-lion: all
-
-all: $(SYMROOT) $(OBJROOT)
-	@if [ -z "$(RC_ARCHS)" ]; then					  \
-		RC_ARCHS="i386";					  \
-	fi;								  \
-	SUBDIRS="$(GENERIC_SUBDIRS) $$RC_ARCHS";			  \
-	for i in $$SUBDIRS; 						  \
-	do \
-	    if [ -d $$i ]; then						  \
-		echo ================= make $@ for $$i =================; \
-		( OBJROOT=$(OBJROOT)/$${i};				  \
-		  SYMROOT=$(SYMROOT)/$${i};				  \
-		  DSTROOT=$(DSTROOT);					  \
-	          XCFLAGS=$(ARCHLESS_RC_CFLAGS);			  \
-	          GENSUBDIRS="$(GENERIC_SUBDIRS)";			  \
-	          for x in $$GENSUBDIRS;				  \
-	          do							  \
-	              if [ "$$x" == "$$i" ]; then			  \
-	                  XCFLAGS="$(RC_CFLAGS)";			  \
-	                  break;					  \
-	              fi						  \
-	          done;							  \
-		  echo "$$OBJROOT $$SYMROOT $$DSTROOT"; \
-		    cd $$i; ${MAKE}					  \
-			"OBJROOT=$$OBJROOT"		 	  	  \
-		  	"SYMROOT=$$SYMROOT"				  \
-			"DSTROOT=$$DSTROOT"				  \
-			"SRCROOT=$$SRCROOT"				  \
-			"RC_ARCHS=$$RC_ARCHS"				  \
-			"TARGET=$$i"					  \
-			"RC_CFLAGS=$$XCFLAGS" $@			  \
-		) || exit $$?; 						  \
-	    else							  \
-	    	echo "========= Nothing to build for $$i =========";	  \
-	    fi;								  \
-	done
+#
+# Check if a target model was specified (example: make MODEL=16 mountain-lion).
+#
+
+ifdef MODEL
+	#
+	# MODEL=[MacModelNN] specified, export target model as PRODUCT_MODEL_TARGET.
+	#
+	ifneq ($(MODEL),)
+		export MAKE_TARGET_MODEL = $(MODEL)
+		#
+		# Include static ACPI/EFI/SMBIOS data file per model identifier.
+		#
+		DATA_FILE = $(MODEL)
+	else
+		export MAKE_TARGET_MODEL = default
+		#
+		# Include default/empty static data file (no model identifier specified).
+		#
+		DATA_FILE = data.h
+	endif
+else
+	#
+	# Include default settings template (no model identifier specified).
+	#
+	export MAKE_TARGET_MODEL = default
+	#
+	# Include default/empty static data file (no model identifier specified).
+	#
+	DATA_FILE = data.h
+endif
+
+#
+# Export target filenames for static ACPI, EFI and SMBIOS data.
+# 
+
+export MAKE_ACPI_DATA_FILE = ACPI/$(DATA_FILE)
+export MAKE_EFI_DATA_FILE = EFI/$(DATA_FILE)
+export MAKE_SMBIOS_DATA_FILE = SMBIOS/$(DATA_FILE)
+
+#
+# Our one and only build target directory.
+#
+
+ARCH_DIR=i386
+
+CONFIG_DIR=$(ARCH_DIR)/config
+
+SETTINGS_DIR=$(CONFIG_DIR)/SETTINGS
+SETTINGS_FILE=$(SETTINGS_DIR)/$(MAKE_TARGET_MODEL).h
+
+$(MAKEGOAL): $(SYMROOT) $(OBJROOT)
+	@if [ ! -d $(SETTINGS_DIR) ]; then \
+		/bin/mkdir -p $(SETTINGS_DIR); \
+	fi;
+
+	@if [ ! -f $(SETTINGS_FILE) ]; then \
+		cp -n $(CONFIG_DIR)/settings-template.h $(SETTINGS_FILE); \
+	fi;
+
+	@if [ -d $(ARCH_DIR) ]; then \
+		echo ================= make MODEL=$(MAKE_TARGET_MODEL) $@ for: RevoBoot/$(ARCH_DIR) =================; \
+		( OBJROOT=$(OBJROOT)/$(ARCH_DIR); \
+		  SYMROOT=$(SYMROOT)/$(ARCH_DIR); \
+              XCFLAGS="$(RC_CFLAGS)"; \
+		  echo "$$OBJROOT $$SYMROOT"; \
+		    cd $(ARCH_DIR); ${MAKE}	\
+			"OBJROOT=$$OBJROOT" \
+		  	"SYMROOT=$$SYMROOT" \
+			"RC_ARCHS=$(ARCH_DIR)" \
+			"TARGET=$(ARCH_DIR)" \
+			"RC_CFLAGS=$$XCFLAGS" $@ \
+		) || exit $$?; \
+	fi;
 
 clean:
 	rm -rf sym obj dst out.log
 
-$(SYMROOT) $(OBJROOT) $(DSTROOT):
-	@$(MKDIRS) $@
+$(SYMROOT) $(OBJROOT):
+	@/bin/mkdir -p $@

From 190e0962dc46f1482e21943648a00592422e7943 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:05:00 +0300
Subject: [PATCH 003/623] Updating version info for RevoBoot v1.5.20

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 4ada1d8..a7ccabd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.00
+1.5.20

From a094b2215235ac7fa6f63dc6f28306d8572d7c6e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:06:14 +0300
Subject: [PATCH 004/623] Now cleanly defaults to Mountain Lion

---
 r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/r b/r
index ce7791e..74d7e5c 100755
--- a/r
+++ b/r
@@ -1,4 +1,4 @@
 make clean
 clear
-make mountain-lion > out.log
+make > out.log
 

From e5804efb7942ef5e8428bc14666a4fb98d65237c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:08:14 +0300
Subject: [PATCH 005/623] Update for RevoBoot v1.5.10/v1.5.20

---
 i386/MakeInc.dir | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/i386/MakeInc.dir b/i386/MakeInc.dir
index 77611ac..ddb327c 100755
--- a/i386/MakeInc.dir
+++ b/i386/MakeInc.dir
@@ -1,16 +1,11 @@
 #
-# Common makefile targets.
+# File: RevoBoot/i386/MakeInc.dir
 #
-# Define these variables (if desired) in directory makefiles:
-#	DIRS_NEEDED
-#	INSTALLDIR
-#	SRCROOT
+# Updates:
 #
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
+#		- Major cleanup (PikerAlpha, October 2012).
+#
+
 
 #
 # Use /usr/bin/gcc instead of /usr/bin/cc (symbolic link to clang in Xcode 4.3.2 and greater).
@@ -26,22 +21,6 @@ CC = gcc
 #OMIT_FRAME_POINTER_CFLAG=-fomit-frame-pointer
 OMIT_FRAME_POINTER_CFLAG=
 
-installsrc:: $(SRCROOT)
-	cp $(ALLSRC) $(SRCROOT)
-	cd $(SRCROOT); chmod a-w $(ALLSRC)
-
-install:: installhdrs
-	@if [ -z "$(RC_ARCHS)" -o -n "$(RC_i386)" ]; then 	\
-		$(MAKE) install_i386 OBJROOT=${OBJROOT}		\
-			SYMROOT=${SYMROOT} DSTROOT=${DSTROOT}	\
-			SRCROOT=${SRCROOT}; 			\
-	else							\
-		echo i386 not selected - null build.;		\
-	fi
-
-install_i386:: all
-
-installhdrs::
 
 .SUFFIXES: .s .i .c .o
 
@@ -69,5 +48,5 @@ boot2.o:
 $(OBJROOT)/%.o: %.s
 	$(CC) $(CPPFLAGS) -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) $<
 
-$(DIRS_NEEDED) $(INSTALLDIR) $(SRCROOT):
-	$(MKDIRS) $@
+$(DIRS_NEEDED): # $(INSTALLDIR) $(SRCROOT):
+	@/bin/mkdir -p $@

From ce6b5d0381a77da925174705427b894791e9190e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:08:48 +0300
Subject: [PATCH 006/623] Update for RevoBoot v1.5.10/v1.5.20

---
 i386/MakePaths.dir | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/i386/MakePaths.dir b/i386/MakePaths.dir
index 978ddf4..b4b04c5 100755
--- a/i386/MakePaths.dir
+++ b/i386/MakePaths.dir
@@ -1,9 +1,15 @@
+#
+# File: RevoBoot/i386/MakePaths.dir
+#
+# Updates:
+#
+#  	- Major cleanup (PikerAlpha, October 2012).
+#
+
+
 #
 # Default paths for subdirectories.
 #
 
 OBJROOT=../../obj/i386/$(DIR)
 SYMROOT=../../sym/i386
-DSTROOT=../../dst/i386
-SRCROOT=/tmp
-

From 28be76c2098a74c8b21f90f7065a14b8a6a9f93b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:09:46 +0300
Subject: [PATCH 007/623] Update for RevoBoot v1.5.10/v1.5.20

---
 i386/Makefile | 49 ++++++++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/i386/Makefile b/i386/Makefile
index 7d96cf6..a7ee5b7 100644
--- a/i386/Makefile
+++ b/i386/Makefile
@@ -1,49 +1,36 @@
 #
-#	Makefile for RevoBoot
+# File: RevoBoot/i386/Makefile
+#
+# Updates:
+#
+#			- Major cleanup (PikerAlpha, October 2012).
+#			- Output improvements (PikerAlpha, October 2012).
 #
-
-CFLAGS	= -O $(MORECPP) -arch i386 -g -static
-CONFIG = hd
-LIBDIR = libsa
-INC = -I. -I$(LIBDIR)
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
-AS = as
-LD = ld
 
 #
 # These paths are only valid in subdirectories of this directory.
 #
 
-OBJROOT=`pwd`/../../obj/i386
-SYMROOT=`pwd`/../../sym/i386
-DSTROOT=`pwd`/../../dst/i386
-SRCROOT=/tmp
+OBJROOT=../i386/obj/i386
+SYMROOT=../i386/sym/i386
 
-VPATH = $(OBJROOT):$(SYMROOT)
+# VPATH = $(OBJROOT):$(SYMROOT)
 
 #
-# The build over here is important.
+# The build order here is important.
 #
 
 SUBDIRS = util libsa libsaio boot2
 
-lion: all
-mountain-lion: all
 
-all:
+$(MAKEGOAL):
 	@for i in ${SUBDIRS}; \
 	do \
-		echo ================= make $@ for $$i =================; \
-		( cd $$i; ${MAKE}					  \
-			"OBJROOT=$(OBJROOT)/$$i"			  \
-		  	"SYMROOT=$(SYMROOT)"				  \
-			"DSTROOT=$(DSTROOT)"				  \
-			"SRCROOT=$(SRCROOT)"				  \
-			"RC_ARCHS=$(RC_ARCHS)"				  \
-			"RC_CFLAGS=$(RC_CFLAGS)" $@ 			  \
-		) || exit $$?; 						  \
+		echo ================= make MODEL=$(PRODUCT_MODEL_TARGET) $@ for: RevoBoot/i386/$$i =================; \
+		( cd $$i; ${MAKE} \
+			"OBJROOT=$(OBJROOT)/$$i" \
+		  	"SYMROOT=$(SYMROOT)" \
+			"RC_ARCHS=$(RC_ARCHS)" \
+			"RC_CFLAGS=$(RC_CFLAGS)" $@ \
+		) || exit $$?; \
 	done

From 4530f8ff11223e5aacfdfb50f24defb70daef659 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:10:47 +0300
Subject: [PATCH 008/623] Update for RevoBoot v1.5.10/v1.5.20

---
 i386/libsaio/Makefile | 46 +++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index 12e36a9..0bff17d 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -1,10 +1,18 @@
-DIR = libsaio
+#
+# File: RevoBoot/i386/libsaio/Makefile
+#
+# Updates:
+#
+#			- Major cleanup (PikerAlpha, October 2012).
+#			- DMAKE_TARGET_MODEL added (PikerAlpha, October 2012).
+#			- Static data selectors added (PikerAlpha, October 2012).
+#
+
+
 include ../MakePaths.dir
 
 UTILDIR = ../util
 LIBSADIR = ../libsa
-INSTALLDIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone
-#SYMROOT=
 
 OPTIM = -Os -Oz
 DEBUG = -DNOTHING
@@ -14,23 +22,15 @@ CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost \
     -DRCZ_COMPRESSED_FILE_SUPPORT $(DEBUG) \
     -DREVOBOOT_VERSION_INFO=\"RevoBoot\ v$(PRODUCT_VERSION_NUMBER)\" \
     -DMAKE_TARGET_OS=$(PRODUCT_OS_TARGET) \
+    -DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
+    -DACPI_DATA_FILE=$(MAKE_ACPI_DATA_FILE) \
+    -DEFI_DATA_FILE=$(MAKE_EFI_DATA_FILE) \
+    -DSMBIOS_DATA_FILE=$(MAKE_SMBIOS_DATA_FILE) \
     -fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \
     -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
     -march=pentium4 -msse2 -mfpmath=sse -msoft-float
 
-
-DEFINES=
-CONFIG = hd
 INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR)
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
-AS = as
-LD = ld
-# LIBS= -lc_static
-LIBS=
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
@@ -44,21 +44,10 @@ SAIO_OBJS = table.o asm.o bios.o biosfn.o \
 
 SAIO_EXTERN_OBJS = console.o
 
-SFILES =
-CFILES = 
-HFILES = 
-EXPORTED_HFILES =
-INSTALLED_HFILES =
-OTHERFILES = Makefile
-ALLSRC =  $(SFILES) $(CFILES) \
-	$(HFILES) $(OTHERFILES)
 LIBS = libsaio.a
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-lion: all
-mountain-lion: all
-
-all: $(DIRS_NEEDED) libsaio.h $(LIBS)
+$(MAKEGOAL): $(DIRS_NEEDED) libsaio.h $(LIBS)
 
 libsaio.a: $(SAIO_EXTERN_OBJS) $(SAIO_OBJS)
 	rm -f $(SYMROOT)/$(@F)
@@ -66,6 +55,3 @@ libsaio.a: $(SAIO_EXTERN_OBJS) $(SAIO_OBJS)
 	ranlib $(SYMROOT)/$(@F)
 
 include ../MakeInc.dir
-
-# dependencies
--include $(OBJROOT)/Makedep

From 5a382902e0908bc4ef422d6968d076878fe10181 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:12:15 +0300
Subject: [PATCH 009/623] Update for RevoBoot v1.5.10/v1.5.20

---
 i386/libsa/Makefile | 62 +++++++++++----------------------------------
 1 file changed, 15 insertions(+), 47 deletions(-)

diff --git a/i386/libsa/Makefile b/i386/libsa/Makefile
index 633e3b3..773acac 100644
--- a/i386/libsa/Makefile
+++ b/i386/libsa/Makefile
@@ -1,70 +1,38 @@
-DIR = libsa
+#
+# File: RevoBoot/i386/libsa/Makefile
+#
+# Updates:
+#
+#			- Major cleanup (PikerAlpha, October 2012).
+#
+
+
 include ../MakePaths.dir
 
 UTILDIR = ../util
 LIBSAIODIR = ../libsaio
-INSTALL_SA_DIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/standalone
-INSTALL_MD_DIR = $(DSTROOT)/System/Library/Frameworks/System.framework/Versions/B/PrivateHeaders/machdep/i386
 
 OPTIM = -Os -Oz
 CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
-	      -fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \
-	      -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
-	      -march=pentium4 -msse2 -mfpmath=sse -msoft-float
+		-fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \
+		-DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
+		-mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
+		-march=pentium4 -msse2 -mfpmath=sse -msoft-float
 
 INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSAIODIR)
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
-AS = as
-LD = ld
-# LIBS= -lc_static
-LIBS=
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-#SA_OBJS = prf.o printf.o zalloc.o \
-#	string.o strtol.o error.o \
-#	setjmp.o qsort.o efi_tables.o
-SA_OBJS = prf.o printf.o zalloc.o \
-	string.o strtol.o \
-	setjmp.o efi_tables.o
+SA_OBJS = prf.o printf.o zalloc.o string.o strtol.o setjmp.o efi_tables.o
 
-SFILES = setjmp.s
-#CFILES = prf.c printf.c zalloc.c \
-#	string.c strtol.c error.c \
-#	qsort.c efi_tables.c
-CFILES = prf.c printf.c zalloc.c \
-	string.c strtol.c \
-	efi_tables.c
-
-HFILES = allocate.h
-EXPORTED_HFILES = libsa.h allocate.h
-INSTALLED_SA_HFILES = libsa.h
-OTHERFILES = Makefile
-ALLSRC =  $(SFILES) $(CFILES) $(HFILES) $(OTHERFILES)
 LIBS = libsa.a
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-lion: all
-mountain-lion: all
-
-all: $(DIRS_NEEDED) $(LIBS)
+$(MAKEGOAL): $(DIRS_NEEDED) $(LIBS)
 
 libsa.a: $(SA_OBJS)
 	rm -f $(SYMROOT)/$(@F)
 	ar q $(SYMROOT)/$(@F) $^
 	ranlib $(SYMROOT)/$(@F)
 
-$(INSTALL_SA_DIR) $(INSTALL_MD_DIR):
-	$(MKDIRS) $@
-
-installhdrs:: $(INSTALL_SA_DIR) $(INSTALL_MD_DIR)
-	cp $(INSTALLED_SA_HFILES) $(INSTALL_SA_DIR)
-
 include ../MakeInc.dir
-
-# dependencies
--include $(OBJROOT)/Makedep

From e6f1d0c38775b33ac74fe517a47693d4d7e8c615 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:13:03 +0300
Subject: [PATCH 010/623] Update for RevoBoot v1.5.10/v1.5.20

---
 i386/boot2/Makefile | 63 +++++++++++++++++----------------------------
 1 file changed, 23 insertions(+), 40 deletions(-)

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 0c368d7..7c0970d 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -1,37 +1,31 @@
-#	Makefile for i386 boot program
-#	define FLOPPY and SMALL using DEFINES macro as necessary
+#
+# File: RevoBoot/i386/boot2/Makefile
+#
+# Updates:
+#
+#			- Support for self compiled libcc_kext.a added (PikerAlpha, October 2012).
+#			- Major cleanup (PikerAlpha, October 2012).
+#
 
 
-DIR = boot2
 include ../MakePaths.dir
 
 OPTIM = -Os -Oz
 CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
 	-fno-builtin -DSAIO_INTERNAL_USER -static $(OMIT_FRAME_POINTER_CFLAG) \
 	-DMAKE_TARGET_OS=$(PRODUCT_OS_TARGET) \
+    -DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
 	-mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
 	-march=pentium4 -msse2 -mfpmath=sse -msoft-float
 
-DEFINES=
-CONFIG = hd
-SYMDIR = $(SYMROOT)
 LIBSADIR = ../libsa
 LIBSAIODIR = ../libsaio
 UTILDIR = ../util
 
-INC = -I. -I.. -I$(SYMDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(UTILDIR)
-
-ifneq "" "$(wildcard /bin/mkdirs)"
-  MKDIRS = /bin/mkdirs
-else
-  MKDIRS = /bin/mkdir -p
-endif
-
-AS = as
-LD = gcc
+INC = -I. -I.. -I$(SYMROOT) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(UTILDIR)
 
-LIBS= -L$(SYMDIR) -lsaio -lsa
-LIBDEP= $(SYMDIR)/libsaio.a $(SYMDIR)/libsa.a
+LIBS = -L$(SYMROOT) -lsaio -lsa
+LIBDEP = $(SYMROOT)/libsaio.a $(SYMROOT)/libsa.a
 
 #
 # build_gcc no longer builds libgcc.a and libcc_kext.a with 'all' target  
@@ -51,48 +45,37 @@ ifeq ($(wildcard $(LIBCC)),)
   LIBCC= `find /usr/llvm-gcc-*/lib/gcc/*/*/ -name \libcc_kext.a`
 endif
 
-OTHER_FILES =
-INSTALLDIR = $(DSTROOT)/usr/standalone/i386
 VPATH = $(OBJROOT):$(SYMROOT)
 
 #
-# The ordering is important;
+# The order of object filenames below is important;
 #	
 
 OBJS = boot2.o boot.o bootlogo.o graphics.o drivers.o options.o lzss.o
 
-UTILDIR = ../util
-SFILES = boot2.s
-CFILES = boot.c bootlogo.c graphics.c drivers.c options.c
-HFILES = boot.h bootlogo.h 
-
-OTHERFILES = Makefile
-ALLSRC = $(FOREIGNSRC) $(FOREIGNBIN) $(SFILES) $(CFILES) $(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 BOOT2ADDR = 20200
-MAXBOOTSIZE = 392704
 
-lion: all
-mountain-lion: all
+#
+# Set maximum size of the booter to 128KB (should be more than sufficient).
+#
+MAXBOOTSIZE = 131072
 
-all: $(DIRS_NEEDED) boot
+$(MAKEGOAL): $(DIRS_NEEDED) boot
 
 boot: machOconv $(OBJS) $(LIBDEP)
 	$(UTILDIR)/ld_classic -static -preload -segaddr __INIT $(BOOT2ADDR) \
-	        -arch i386 -segalign 20 \
+	    -arch i386 -segalign 20 \
 		-o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) $(LIBCC)
 	machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
 	size $(SYMROOT)/boot.sys
 	ls -l $(SYMROOT)/boot
 	@( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \
-	  if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\
+	  if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ; \
 	  then \
-	    echo "Booter executable larger than $(MAXBOOTSIZE) bytes" ;\
-	    rm $(SYMROOT)/boot ;\
-	    exit 1;\
+	    echo "Error: Booter executable larger than $(MAXBOOTSIZE) bytes" ; \
+	    rm $(SYMROOT)/boot ; \
+	    exit 1 ; \
 	  fi)
 
 include ../MakeInc.dir
-
-#dependencies
--include $(OBJROOT)/Makedep

From 2aced469506a483bc6a392f6709bae655394a390 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:14:00 +0300
Subject: [PATCH 011/623] Update for RevoBoot v1.5.10/v1.5.20

---
 i386/config/data.h | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/i386/config/data.h b/i386/config/data.h
index c3a566c..bd56edc 100755
--- a/i386/config/data.h
+++ b/i386/config/data.h
@@ -1,19 +1,31 @@
 /*
  * Copyright (c) 2009 Master Chief.
- * Refactored by DHP in 2010-2011.
+ *
+ * This file, included by acpi.c, efi.c and smbios.c includes data files
+ * for the target build model (based on MODEL=MacModelNN) or default.h
+ *
+ * Updates:
+ *
+ *			- Refactored by DHP in 2010-2011.
+ *			- Automatic model data selection (PikerAlpha, October 2012).
+ *
  */
 
 
-#if PATCH_ACPI_TABLE_DATA && INCLUDE_ACPI_DATA
+#if (PATCH_ACPI_TABLE_DATA && INCLUDE_ACPI_DATA)
 	#undef INCLUDE_ACPI_DATA
-	#include "acpi/data.h"
 
-#elif INJECT_EFI_DEVICE_PROPERTIES && INCLUDE_EFI_DATA
+	#include STRING(ACPI_DATA_FILE)
+#endif
+
+#if (INJECT_EFI_DEVICE_PROPERTIES && INCLUDE_EFI_DATA)
 	#undef INCLUDE_EFI_DATA
-	#include "efi/data.h"
 
-#elif USE_STATIC_SMBIOS_DATA && INCLUDE_SMBIOS_DATA
+	#include STRING(EFI_DATA_FILE)
+#endif
+
+#if (USE_STATIC_SMBIOS_DATA && INCLUDE_SMBIOS_DATA)
 	#undef INCLUDE_SMBIOS_DATA
-	#include "smbios/data.h"
 
+	#include STRING(SMBIOS_DATA_FILE)
 #endif

From fea70a66c944ce5f27854cb20d1e6bbed1108492 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:15:15 +0300
Subject: [PATCH 012/623] Update for RevoBoot v1.5.10/v1.5.20

---
 i386/config/settings.h | 386 +----------------------------------------
 1 file changed, 6 insertions(+), 380 deletions(-)

diff --git a/i386/config/settings.h b/i386/config/settings.h
index 263eba5..ae4c0f9 100644
--- a/i386/config/settings.h
+++ b/i386/config/settings.h
@@ -1,387 +1,13 @@
 /*
- * Copyright (c) 2009 Master Chief. All rights reserved.
- *
- * Note: This is an essential part of the build process for RevoBoot v1.5.00 and greater.
+ * Copyright (c) 2009 Master Chief.
  *
  * Updates:
  *
- *			- Latest cleanups and additional directives added by DHP in 2011.
- *			- Static CPU data simplified by DHP in Juni 2011 (thanks to MC and flAked for the idea).
- *			- Automatic creation / injection of SSDT_PR.aml added by DHP in June 2011.
- *			- New compiler directive (BOOT_TURBO_BOOST_RATIO) added by Jeroen (June 2011).
- *			- SMBIOS data logic moved to preprocessor code (PikerAlpha, October 2012).
- *			- STATIC_MODEL_NAME moved to libsaio/i386/SMBIOS/model_data.h (PikerAlpha, October 2012).
- *			- STATIC_MAC_PRODUCT_NAME moved to libsaio/i386/SMBIOS/model_data.h (PikerAlpha, October 2012).
- *			- STATIC_SMBIOS_MODEL_ID rrenamed to TARGET_MODEL (PikerAlpha, October 2012).
- *			- OVERRIDE_DYNAMIC_PRODUCT_DETECTION removed/no longer supported (PikerAlpha, October 2012).
- *			- INTEL_CORE_TECHNOLOGY per default set to 1 (PikerAlpha, October 2012).
- *
+ *			- Read settings file based on given model identifier (PikerAlpha, October 2012).
  */
 
+#define TO_STRING_DO(a)		#a
+#define STRING(a)			TO_STRING_DO(a)
+#define INCLUDE_FILE		STRING(SETTINGS_FILE)
 
-//--------------------------------------------------------------- ACPI.C -------------------------------------------------------------------
-
-
-#define ACPI_10_SUPPORT						0	// Set to 0 by Default. Set to 1 for ACPI 1.0 compliant BIOS versions.
-												//
-												// Note:	Must go first (before acpi/essentials) since it is used there,
-												//			and requires you to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define PATCH_ACPI_TABLE_DATA				1	// Set to 1 by default (enabling patching). Use 0 to keep the original
-												// unmodified ACPI tables, but please note (very well) that this is
-												// only supported by very few motherboards / BIOS'es. You may also
-												// need a kext like OSXRestart.kext to be able to restart your system,
-												// this due to a possibly broken FACP table in your BIOS!
-												//
-												// Note: Requires one of the following STATIC_* and/or LOAD_* settings:
-
-
-#define USE_STATIC_ACPI_BASE_ADDRESS		0	// Set to 0 by default. Use 1 only after gathering the base address!
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#if USE_STATIC_ACPI_BASE_ADDRESS
-	#define	STATIC_ACPI_BASE_ADDRESS		0x000f0450	// Set DEBUG_ACPI to 1 to get this address.
-#endif
-
-
-#define STATIC_APIC_TABLE_INJECTION			0	// Set to 0 by default. Use 1 when you want to inject a modified copy
-												// with say stripped out unused CPU's or other required modifications.
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define STATIC_APIC2_TABLE_INJECTION		0	// Set to 0 by default. Use 1 when you want to inject a second APIC
-												// (ACPI-1) table data for additional CPU core support.
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define STATIC_DSDT_TABLE_INJECTION			0	// Set to 0 by default. Use 1 when you want to inject static DSDT data.
-
-
-#define STATIC_ECDT_TABLE_INJECTION			0	// Set to 0 by default. Use 1 when want to inject a custom ECDT table.
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define STATIC_FACS_TABLE_INJECTION			0	// Set to 0 by default. Use 1 when want to inject a custom FACS table.
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define STATIC_HPET_TABLE_INJECTION			0	// Set to 0 by default. Use 1 when you want to inject a static copy
-												// of a custom HPET table.
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define STATIC_SSDT_TABLE_INJECTION			0	// Set to 0 by default. Use 1 when you want to inject modifications
-												// that can / should be done from this ACPI table.
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define STATIC_SSDT_GPU_TABLE_INJECTION		0	// Set to 0 by default. Use 1 when you want to inject modifications
-												// for your graphics card (like I do for my ATI PCI-E card).
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define STATIC_SSDT_PR_TABLE_INJECTION		0	// Set to 0 by default. Use 1 when you want to inject your Intel
-												// SpeedStep related modifications (like I do).
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define STATIC_SSDT_SATA_TABLE_INJECTION	0	// Set to 0 by default. Use 1 when want to inject SATA related modifications.
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define STATIC_SSDT_USB_TABLE_INJECTION		0	// Set to 0 by default. Use 1 when want to inject USB related modifications.
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define LOAD_DSDT_TABLE_FROM_EXTRA_ACPI		1	// Set to 0 by default. Use 1 when your setup requires a modified DSDT table
-												// and you want to load: /Extra/ACPI/dsdt.aml instead of injecting a static
-												// DSDT table from: RevoBoot/i386/config/ACPI/data.h
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define LOAD_SSDT_TABLE_FROM_EXTRA_ACPI		0	// Set to 1 by default. Use 0 only after you've converted your SSDT into
-												// STATIC_SSDT_TABLE_INJECTION in: RevoBoot/i386/config/ACPI/data.h
-												// or when you don't want/need to load /Extra/ACPI/SSDT.aml
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-
-#define LOAD_EXTRA_ACPI_TABLES				(LOAD_DSDT_TABLE_FROM_EXTRA_ACPI || LOAD_SSDT_TABLE_FROM_EXTRA_ACPI)
-
-
-#define AUTOMATIC_SSDT_PR_CREATION			1	// Set to 0 by default (support for Sandy Bridge only).
-												//
-												// This injects a custom SSDT (in configure mode) with:
-												//
-												// Use 1 to inject: P/C-State definition blocks.
-												// Use 2 to inject: Processor (CPUn, 0x0n, 0x00000410, 0x06) {...} declaration blocks.
-												// Use 3 to inject: Both of the above.
-												// Use 4 to inject: Device (SBUS) {...} which is required for Power Management.
-												// Use 5 to inject: P/C-State definition blocks plus the former (Device SBUS).
-												// Use 7 to inject: All of the above.
-												//
-												// Notes:	Device SBUS can only be injected when it isn't part of other ACPI tables!
-												//			This feature should only be used once, to extract the SSDT_PR from ioreg
-												//			and use it as STATIC_SSDT_PR_TABLE_DATA in RevoBoot/i386/config/ACPI/data.h
-
-
-#if AUTOMATIC_SSDT_PR_CREATION && STATIC_SSDT_PR_TABLE_INJECTION == 0
-	#define MAX_NUMBER_OF_P_STATES			22	// The i5-2500K need 18 for the base-range (1600-3300) plus 4 for the Turbo modes.
-												// The i7-2600K need 19 for the base-range (1600-3400) plus 4 for the Turbo modes.
-												// The i7-2700K need 20 for the base-range (1600-3500) plus 4 for the Turbo modes.
-												// The i7-3770K need 20 for the base-range (1600-3500) plus 4 for the Turbo modes.
-												// Low power (mobility) processors might need an extended range!
-												//
-												// Note: AICPUPM wants a P-State for each 100 MHz bank or it will fail (see note below).
-
-#define DROP_FACTORY_SSDT_TABLES			1	// Set to 1 by default (this setting is required).
-												//
-												// Note: Do not change this setting (must drop SSDT tables).
-
-#define NUMBER_OF_TURBO_STATES				4	// Set to 4 by default.
-												//
-												// Note:	Make sure to add a full range, one P-State for each 100 MHz when OC'ing
-												//			or AICPIPM will fail with: "P-State Stepper Error 18 at step N on CPU N"
-
-#define OVERRIDE_ACPI_METHODS				0	// Set to 0 by default (do nothing).
-												// Use 1 to override Method _PTS in a static SSDT or Extra/ACPI/SSDT.aml
-												// Use 2 to override Method _WAK in a static SSDT or Extra/ACPI/SSDT.aml
-												// Use 3 to override both _PTS and _WAK.
-												//
-												// Note:	This changes the underscore of _PTS and/or _WAK into a "Z" which
-												//			allows you to inject a customized copy from /Extra/ACPI/SSDT.aml
-#else
-	#define OVERRIDE_ACPI_METHODS			0	// Set to 0 by default (do nothing).
-
-	#define DROP_FACTORY_SSDT_TABLES		0	// Set to 0 by default. Use 1 with caution (might disable SpeedStep).
-#endif
-
-#define REPLACE_EXISTING_SSDT_TABLES		0	// Set to 0 by default. Use 1 with caution (might disable SpeedStep).
-												//
-												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
-
-#define	APPLE_STYLE_ACPI					0	// Set to 0 by default. Use 1 to change the OEMID's to Mac likes.
-												//
-												// Note:	Don't forget to set PATCH_ACPI_TABLE_DATA to 1 and keep in mind that this can
-												//			only change the headers of injected/replaced tables. Not the factory tables.
-
-
-#define DEBUG_ACPI							0	// Set to 0 by default. Use 1 when things don't seem to work for you.
-
-
-//--------------------------------------------------------------- BOOT.C -------------------------------------------------------------------
-
-
-#define PRE_LINKED_KERNEL_SUPPORT		1	// Set to 1 by default. Change this to 0 to disable the use of pre-linked kernels.
-
-#define MUST_ENABLE_A20					0	// Set to 0 by default. Change this to 1 when your hardware requires it.
-
-#define SAFE_MALLOC						0	// Set to 0 by default. Change this to 1 when booting halts with a memory allocation error.
-
-#define DEBUG_BOOT						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
-
-
-//---------------------------------------------------------------- CPU.C -------------------------------------------------------------------
-
-
-#define USE_STATIC_CPU_DATA				1	// Set to 0 by default (dynamic data collection). Change this to 1 to use static data.
-
-#define CPU_VENDOR_ID					CPU_VENDOR_INTEL // CPU_VENDOR_AMD is not supported.
-
-#define INTEL_CORE_TECHNOLOGY			1	// Set to 1 by default. Use 0 for older non Intel Core CPU's (removes unused code).
-											//
-											// Warning: Do not use 0 on Core Technology CPU's or sysctl's machdep.tsc.frequency will be
-											//			initialized with the wrong value (various things, like the spinner will go mad).
-
-#define OC_BUSRATIO_CORRECTION			0	// Set to 0 by default. Change this to busratio-100 (OC'ed systems with a changed busratio).
-
-#define BOOT_TURBO_RATIO				0	// Set to 0 by default. Change this to the desired (and supported) max turbo multiplier.
-											//
-											// Example:  0x2800 for 4.0 GHz on a i7-2600.
-
-#define DEBUG_CPU						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
-											// Note: CPU info data will not be displayed when USE_STATIC_CPU_DATA is set to 1
-
-#if DEBUG_CPU
-#define DEBUG_CPU_TURBO_RATIOS			0	// Set to 0 by default. Change this to 1 when you want to check the core ratio.
-
-#define DEBUG_CST_SUPPORT				0	// Set to 0 by default. Change this to 1 to check the in BIOS enabled C-States.
-
-#define DEBUG_TSS_SUPPORT				0	// Set to 0 by default. Change this to 1 to check the T-State Clock Modulation.
-
-#define DEBUG_CPU_TDP					0	// Set to 0 by default. Change this to 1 when you want to check the TDP.
-#endif
-
-//---------------------------------------------------------- CPU/STATIC_DATA.C -------------------------------------------------------------
-
-
-#if USE_STATIC_CPU_DATA
-	#define STATIC_CPU_Type				0x602			// kSMBTypeOemProcessorType - used in: libsaio/SMBIOS/dynamic_data.h
-
-	#define STATIC_CPU_NumThreads		4				// Used in: i386/libsaio/ACPI/ssdt_pr_generator.h
-
-	#define STATIC_CPU_FSBFrequency		100000000ULL	// 9 digits + ULL - used in: i386/libsaio/efi.c
-
-	#define STATIC_CPU_QPISpeed			0				// kSMBTypeOemProcessorBusSpeed (0 for Sandy Bridge / Jaketown).
-#endif
-
-#define STATIC_CPU_NumCores				4				// Set to 4 by default. Must be set to the number of cores for your processor!
-														//
-														// Note: Used in i386/libsaio/ACPI/ssdt_pr_generator.h, cpu.c and platform.c
-														//		 for both static and dynamic CPU data.
-
-//--------------------------------------------------------------- DISK.C -------------------------------------------------------------------
-
-
-#define EFI_SYSTEM_PARTITION_SUPPORT	0	// Set to 0 by default. Set this to 1 when your system boots from the hidden EFI partition.
-
-#define LEGACY_BIOS_READ_SUPPORT		0	// Set to 0 by default. Change this to 1 for crappy old BIOSes.
-
-#define LION_FILEVAULT_SUPPORT			0	// Set to 0 by default.  Setting this to 1 will make RevoBoot skip encrypted boot partitions
-											// and boot from the Recovery HD partition instead (when available).
-
-#define APPLE_RAID_SUPPORT				0	// Set to 0 by default. Change this to 1 for Apple Software RAID support.
-
-#define DEBUG_DISK						0	// Set to 0 by default. Change it to 1 when things don't seem to work for you.
-
-
-//------------------------------------------------------------- DRIVERS.C -------------------------------------------------------------------
-
-
-#define DEBUG_DRIVERS					0	// Set to 0 by default. Change it to 1 when things don't seem to work for you.
-
-
-//---------------------------------------------------------------- EFI.C -------------------------------------------------------------------
-
-
-#define APPLE_STYLE_EFI					1	// Set to 1 by default. Change this to 1 to add additional 'Mac-like' properties.
-
-#define INJECT_EFI_DEVICE_PROPERTIES	0	// Set to 0 by default. Change this to 1 when you need to inject 'device-properties'.
-											//
-											// Note: Required when not setting device-properties from your DSDT/SSDT.
-
-#define EFI_64_BIT						1	// Set to 1 by default for EFI64 on 64-bit platforms. Supporting both
-											// 32 and 64-bit boot modes (using arch=i386/x86_64 under Kernel Flags).
-											//
-											// Change this to 0 for 32-bit only platforms (think Intel Atom CPU)
-											// or when you want to boot with EFI32 (for testing) on a 64-bit
-											// platform, but then you must make a small change in platform.c (see comment in file).
-											//
-											// Note: Do not change this setting, unless you know what you are doing.
-
-#define STATIC_SMSERIALNUMBER			"SOMESRLNUMBR" // Example only!
-
-#define STATIC_SYSTEM_SERIAL_NUMBER		{ 'S', 'O', 'M', 'E', 'S', 'R', 'L', 'N', 'U', 'M', 'B', 'R' } // Example only!
-
-#define STATIC_SYSTEM_ID				{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F } // Example only!
-
-#define DEBUG_EFI						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
-
-#define EFI_DEBUG_MODE					0	// Set to 0 by default (for OS X 10.7 LION only).
-
-
-//------------------------------------------------------------- GRAPHICS.C -----------------------------------------------------------------
-
-#define USE_STATIC_DISPLAY_RESOLUTION	1	// Set to 0 by default. Use 1 when you need to override the resolution detection features
-											// in RevoBoot, which may not be supported by your BIOS and/or display (monitor).
-
-#define STATIC_SCREEN_WIDTH				1900	// Used (in RevoBoot v1.0.35 and greater) when USE_STATIC_DISPLAY_RESOLUTION is 1 and when
-												// USE_STATIC_DISPLAY_RESOLUTION is 0 but getResolutionFromEDID() isn't supported (failed).
-
-#define STATIC_SCREEN_HEIGHT			1200	// Used (in RevoBoot v1.0.35 and greater) when USE_STATIC_DISPLAY_RESOLUTION is 1 and when
-												// USE_STATIC_DISPLAY_RESOLUTION is 0 but getResolutionFromEDID() isn't supported (failed).
-
-#define DEBUG_BOOT_GRAPHICS				0	// Set to 0 by default. Use 1 when to see debug info.
-
-
-//------------------------------------------------------------ STRINGDATA.H ----------------------------------------------------------------
-
-#define LION_FILEVAULT_SUPPORT			0	// Set to 0 by default.  Setting this to 1 will make RevoBoot skip encrypted boot partitions
-											// and boot from the Recovery HD partition instead (when available).
-
-#if LION_FILEVAULT_SUPPORT
-	#define LION_RECOVERY_SUPPORT		1	// Make RevoBoot search for the Recovery HD partition and boot from it (when available).
-#else
-	#define LION_RECOVERY_SUPPORT		0	// Set to 0 by default. Setting this to 1 will make RevoBoot search for the Recovery HD and
-											// try to boot from it, when it is properly setup and modified for RevoBoot.
-#endif
-
-#define LION_INSTALL_SUPPORT			0	// Set to 0 by default. Setting this to 1 will make RevoBoot search in specific directories
-											// for com.apple.Boot.plist – required for Mac like Lion OS X installations.
-
-//-------------------------------------------------------------- SMBIOS.C ------------------------------------------------------------------
-
-
-#define USE_STATIC_SMBIOS_DATA				0	// Set to 0 by default (dynamic data collection). Change this to 1 to use static data.
-
-#if (USE_STATIC_SMBIOS_DATA == 0 && USE_STATIC_CPU_DATA == 1)
-	#undef USE_STATIC_CPU_DATA					// Prevent boot failures due to wrong settings (until I figured out what we are missing).
-#endif
-
-#define OVERRIDE_DYNAMIC_MEMORY_DETECTION	0	// Set to 0 by default. Change this to 0 only when your SMBIOS data (type 17) is correct, or when
-												// you want/need to override some/all of the SMBIOS data.
-												//
-												// Note: Defaults to n MB 1066 DDR3 when set to 0 (to prevent errors in Profile Manager).
-
-
-#define TARGET_MODEL						MACMINI	// Set to MACMINI by default. Supported models are:
-													//
-													// IMAC and IMAC_131, IMAC_122, IMAC_111, IMAC_121
-													// MACBOOK and MACBOOK_41
-													// MACBOOKAIR and MACBOOKAIR_42, MACBOOKAIR_41
-													// MACBOOKPRO and MACBOOKPRO_101, MACBOOKPRO_91, MACBOOKPRO_83, MACBOOKPRO_82,
-													// MACBOOKPRO_81, MACBOOKPRO_61
-													// MACMINI and MACMINI_53, MACMINI_52, MACMINI_51
-													// MACPRO and MACPRO_51, MACPRO_41, MACPRO_31
-													//
-													// Note: MACMINI (without _NNN) selects the default model (last one i.e. MACMINI_51).
-
-#define DEBUG_SMBIOS						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
-
-
-//-------------------------------------------------------------- PLATFORM.C ----------------------------------------------------------------
-
-
-#if USE_STATIC_SMBIOS_DATA
-	// Do nothing.
-#elif OVERRIDE_DYNAMIC_MEMORY_DETECTION
-												// Setup RAM module info. Please note that you may have to expand this when you have more RAM modules.
-	#define STATIC_RAM_SLOTS				4	// Number of RAM slots on mainboard.
-
-	#define STATIC_RAM_VENDORS				{ "Corsair", "N/A", "Corsair", "N/A", 0 }	// Use "N/A" for empty RAM banks.
-
-	#define DYNAMIC_RAM_OVERRIDE_TYPE		0	// Set to 0 by default. See libsaio/platform.h for supported values.
-
-	#define DYNAMIC_RAM_OVERRIDE_SIZE		0	// Set to 0 by default. Change this to 1 when you want to use override values (see below).
-
-#if DYNAMIC_RAM_OVERRIDE_SIZE
-	#define DYNAMIC_RAM_OVERRIDE_SIZES	{ SMB_MEM_SIZE_2GB, SMB_MEM_BANK_EMPTY, SMB_MEM_SIZE_2GB, SMB_MEM_BANK_EMPTY, 0 } // See libsaio/platform.h for other values.
-#endif
-
-	#define DYNAMIC_RAM_OVERRIDE_FREQUENCY	0	// Set to 0 by default. Change this to the frequency that you want to use as override value.
-
-	#define STATIC_RAM_PART_NUMBERS			{ "PartNum#0", "N/A", "PartNum#2", "N/A", 0 }	// Use "N/A" for empty RAM banks.
-
-	#define STATIC_RAM_SERIAL_NUMBERS		{ "Serial#0", "N/A", "Serial#2", "N/A", 0 }		// Use "N/A" for empty RAM banks.
-#endif
-
-#define INCLUDE_MPS_TABLE					0	// Set to 0 by default. Change this to 1 when you want to include the MP table.
-
-#define DEBUG_PLATFORM						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
-
-
-//================================================================= END ====================================================================
-
+#include INCLUDE_FILE

From d52f639f9681422e4243aae245c80f9fd68d3d78 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:29:46 +0300
Subject: [PATCH 013/623] Build support for optional model identifier (example:
 Macmini51)

---
 r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/r b/r
index 74d7e5c..d75375a 100755
--- a/r
+++ b/r
@@ -1,4 +1,4 @@
 make clean
 clear
-make > out.log
+make MODEL=%1 > out.log
 

From 412daa8e5da88ccad8d50d018f140249db08b516 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:31:16 +0300
Subject: [PATCH 014/623] Moving file extensions

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 40a2c4c..76d6f57 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ ifdef MODEL
 		#
 		# Include default/empty static data file (no model identifier specified).
 		#
-		DATA_FILE = data.h
+		DATA_FILE = data
 	endif
 else
 	#
@@ -109,16 +109,16 @@ else
 	#
 	# Include default/empty static data file (no model identifier specified).
 	#
-	DATA_FILE = data.h
+	DATA_FILE = data
 endif
 
 #
 # Export target filenames for static ACPI, EFI and SMBIOS data.
 # 
 
-export MAKE_ACPI_DATA_FILE = ACPI/$(DATA_FILE)
-export MAKE_EFI_DATA_FILE = EFI/$(DATA_FILE)
-export MAKE_SMBIOS_DATA_FILE = SMBIOS/$(DATA_FILE)
+export MAKE_ACPI_DATA_FILE = ACPI/$(DATA_FILE).h
+export MAKE_EFI_DATA_FILE = EFI/$(DATA_FILE).h
+export MAKE_SMBIOS_DATA_FILE = SMBIOS/$(DATA_FILE).h
 
 #
 # Our one and only build target directory.

From 0cd25765d471da68b363a2a781dfb33c786646a6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:33:48 +0300
Subject: [PATCH 015/623] Fix typo

---
 r | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/r b/r
index d75375a..1d06cf0 100755
--- a/r
+++ b/r
@@ -1,4 +1,4 @@
 make clean
 clear
-make MODEL=%1 > out.log
+make MODEL=$1 > out.log
 

From ef159e73d99d11398fa6be186d83eee1f7da91a6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 11:48:31 +0300
Subject: [PATCH 016/623] Copy data-template.h for new configurations

---
 Makefile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Makefile b/Makefile
index 76d6f57..bbe91ec 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@
 #			- Creates RevoBoot/config/SETTINGS when missing (PikerAlpha, October 2012).
 #			- Copies settings-template.h to SETTINGS/ModelnameNN.h when missing (PikerAlpha, October 2012).
 #			- Automatic ACPI/EFI/SMBIOS data selection (PikerAlpha, October 2012).
+#			- Copies ACPI/EFI/SMBIOS/data-template.h for new conigurations (PikerAlpha, October 2012).
 #
 
 #
@@ -132,6 +133,18 @@ SETTINGS_DIR=$(CONFIG_DIR)/SETTINGS
 SETTINGS_FILE=$(SETTINGS_DIR)/$(MAKE_TARGET_MODEL).h
 
 $(MAKEGOAL): $(SYMROOT) $(OBJROOT)
+	@if [ ! -f $(ARCH_DIR)/config/$(MAKE_ACPI_DATA_FILE) ]; then \
+		cp -n $(ARCH_DIR)/config/ACPI/data-template.h $(ARCH_DIR)/config/$(MAKE_ACPI_DATA_FILE); \
+	fi;
+
+	@if [ ! -f $(ARCH_DIR)/config/$(MAKE_EFI_DATA_FILE) ]; then \
+		cp -n $(ARCH_DIR)/config/EFI/data-template.h $(ARCH_DIR)/config/$(MAKE_EFI_DATA_FILE); \
+	fi;
+
+	@if [ ! -f $(ARCH_DIR)/config/$(MAKE_SMBIOS_DATA_FILE) ]; then \
+		cp -n $(ARCH_DIR)/config/SMBIOS/data-template.h $(ARCH_DIR)/config/$(MAKE_SMBIOS_DATA_FILE); \
+	fi;
+
 	@if [ ! -d $(SETTINGS_DIR) ]; then \
 		/bin/mkdir -p $(SETTINGS_DIR); \
 	fi;

From 1826d9262d2060cb5370809d8652ee6f8e4b7730 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 12:00:44 +0300
Subject: [PATCH 017/623] Update for RevoBoot v1.5.10/v1.5.20

---
 i386/util/Makefile | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/i386/util/Makefile b/i386/util/Makefile
index 87e8d42..8a4883c 100644
--- a/i386/util/Makefile
+++ b/i386/util/Makefile
@@ -1,34 +1,27 @@
 #
-# Until I can remove the dependency on the appkit,
-# we'll just keep the generated files in this directory
-# and install them directly, rather than generating them again.
+#File: RevoBoot/i386/util/Makefile
 #
+# Updates:
+#
+#			- Major cleanup (PikerAlpha, October 2012).
+#
+
 
-DIR = util
 include ../MakePaths.dir
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-INSTALLDIR = $(DSTROOT)/usr/standalone/i386
-LOCALBIN = $(DSTROOT)/usr/local/bin
-
 OPTIM = -Os -Oz
 CFLAGS = $(RC_CFLAGS) $(OPTIM) -Wmost -Werror -g
+
 LDFLAGS =
-CFILES = md.c machOconv.c
-ALLSRC = $(CFILES) $(MFILES) $(HFILES) $(EXPORT_HFILES)
+DEFINES=
 
 PROGRAMS = md machOconv
 
-OUTFILES = $(PROGRAMS)
-
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT) $(LANGDIR)
 
-lion: all
-
-mountain-lion: all
-
-all: $(DIRS_NEEDED) $(PROGRAMS)
+$(MAKEGOAL): $(DIRS_NEEDED) $(PROGRAMS)
 
 machOconv: machOconv.o
 	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) machOconv.o
@@ -36,7 +29,3 @@ md:
 	$(CC) -mdynamic-no-pic -Wall -dead_strip -arch i386 -mmacosx-version-min=10.5 md.c -o $(SYMROOT)/md
 
 include ../MakeInc.dir
-
-#dependencies
--include $(OBJROOT)/Makedep
-

From a7b40d41e074fdb8633e3a57872394c5c4391247 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 12:09:30 +0300
Subject: [PATCH 018/623] Bug fix, typo and cleanups for RevoBoot v1.5.20

---
 i386/config/settings-template.h | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 0732192..82fa634 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -12,9 +12,10 @@
  *			- SMBIOS data logic moved to preprocessor code (PikerAlpha, October 2012).
  *			- STATIC_MODEL_NAME moved to libsaio/i386/SMBIOS/model_data.h (PikerAlpha, October 2012).
  *			- STATIC_MAC_PRODUCT_NAME moved to libsaio/i386/SMBIOS/model_data.h (PikerAlpha, October 2012).
- *			- STATIC_SMBIOS_MODEL_ID rrenamed to TARGET_MODEL (PikerAlpha, October 2012).
+ *			- STATIC_SMBIOS_MODEL_ID renamed to TARGET_MODEL (PikerAlpha, October 2012).
  *			- OVERRIDE_DYNAMIC_PRODUCT_DETECTION removed/no longer supported (PikerAlpha, October 2012).
  *			- INTEL_CORE_TECHNOLOGY per default set to 1 (PikerAlpha, October 2012).
+ *			- INJECT_EFI_DEVICE_PROPERTIES per default set to 1 (PikerAlpha, October 2012). 
  *
  */
 
@@ -216,13 +217,13 @@
 											// Note: CPU info data will not be displayed when USE_STATIC_CPU_DATA is set to 1
 
 #if DEBUG_CPU
-#define DEBUG_CPU_TURBO_RATIOS			0	// Set to 0 by default. Change this to 1 when you want to check the core ratio.
+	#define DEBUG_CPU_TURBO_RATIOS		0	// Set to 0 by default. Change this to 1 when you want to check the core ratio.
 
-#define DEBUG_CST_SUPPORT				0	// Set to 0 by default. Change this to 1 to check the in BIOS enabled C-States.
+	#define DEBUG_CST_SUPPORT		0	// Set to 0 by default. Change this to 1 to check the in BIOS enabled C-States.
 
-#define DEBUG_TSS_SUPPORT				0	// Set to 0 by default. Change this to 1 to check the T-State Clock Modulation.
+	#define DEBUG_TSS_SUPPORT		0	// Set to 0 by default. Change this to 1 to check the T-State Clock Modulation.
 
-#define DEBUG_CPU_TDP					0	// Set to 0 by default. Change this to 1 when you want to check the TDP.
+	#define DEBUG_CPU_TDP			0	// Set to 0 by default. Change this to 1 when you want to check the TDP.
 #endif
 
 //---------------------------------------------------------- CPU/STATIC_DATA.C -------------------------------------------------------------
@@ -233,7 +234,7 @@
 
 	#define STATIC_CPU_NumThreads		4				// Used in: i386/libsaio/ACPI/ssdt_pr_generator.h
 
-	#define STATIC_CPU_FSBFrequency		100000000ULL	// 9 digits + ULL - used in: i386/libsaio/efi.c
+	#define STATIC_CPU_FSBFrequency		100000000ULL	// 9 digits + ULL - used in: RevoBoot/i386/libsaio/efi.c
 
 	#define STATIC_CPU_QPISpeed			0				// kSMBTypeOemProcessorBusSpeed (0 for Sandy Bridge / Jaketown).
 #endif
@@ -331,10 +332,6 @@
 	#undef USE_STATIC_CPU_DATA					// Prevent boot failures due to wrong settings (until I figured out what we are missing).
 #endif
 
-#if TARGET_MODEL & MACPRO
-    #define STATIC_SMBOARDSERIAL            "SOMEBOARDNMBR" // Example only!
-#endif
-
 #define OVERRIDE_DYNAMIC_MEMORY_DETECTION	0	// Set to 0 by default. Change this to 0 only when your SMBIOS data (type 17) is correct, or when
 												// you want/need to override some/all of the SMBIOS data.
 												//
@@ -353,6 +350,10 @@
 													//
 													// Note: MACMINI (without _NNN) selects the default model (last one i.e. MACMINI_51).
 
+#if TARGET_MODEL & MACPRO
+    #define STATIC_SMBOARDSERIAL            "SOMEBOARDNMBR" // Example only!
+#endif
+
 #define DEBUG_SMBIOS						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
 

From b923535229bebe6ebd290b971ae48dbb6b4b1475 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 12:11:46 +0300
Subject: [PATCH 019/623] New Macmini6 data added for RevoBoot v1.5.21

---
 i386/libsaio/smbios/model_data.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index bf1ce85..92a435c 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -136,7 +136,19 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"Macmini"
 
-	#if (TARGET_MODEL == MACMINI_53)
+	#if (TARGET_MODEL == MACMINI_62)
+		// Intel Core i7-3615QM @ 2.30 GHz (4 cores - 8 threads)
+		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B00.1208091121"
+		#define SMB_PRODUCT_NAME	"Macmini6,2"
+		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '2' }
+	#elif (TARGET_MODEL == MACMINI_61)
+		// Intel Core i5-3210M @ 2.50 GH (2 cores - 4 theeads)
+		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B00.1208091121"
+		#define SMB_PRODUCT_NAME	"Macmini6,1"
+		#define SMB_BOARD_PRODUCT	"Mac-031AEE4D24BFF0B1"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '1' }
+	#elif (TARGET_MODEL == MACMINI_53)
 		// Intel Core i7-2635QM @ 2.0GHz (4 cores - 8 threads)
 		#define SMB_BIOS_VERSION	"MM51.88Z.0077.B10.1201241549"
 		#define SMB_PRODUCT_NAME	"Macmini5,3"

From b75feb8d161f5332716f92fa4bc79af287d334c0 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 12:25:20 +0300
Subject: [PATCH 020/623] Update for RevoBoot v.1.5.21

---
 CHANGES | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/CHANGES b/CHANGES
index e8624a6..39637a7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,30 @@
+RevoBoot v1.5.21
+================
+- Model data for new Macmini6,N added (PikerAlpha, October 2012).
+- VERSION updated to v1.5.21
+
+
+RevoBoot v1.5.20
+================
+- Automatic data selection for ACPI/EFI and SMBIOS data (PikerAlpha, October 2012)
+- Copies ACPI/EFI/SMBIOS/data-template.h to [your model.h] for new configurations (PikerAlpha, October 2012)
+
+
+RevoBoot v1.5.10
+================
+- Makefiles cleaned up/optimized (PikerAlpha, October 2012).
+- make now defaults to Mountain Lion (PikerAlpha, October 2012).
+- MODEL=[your model] argument added to makefiles (PikerAlpha, October 2012).
+- MODEL=$1 added to RevoBoot/r for optional model identifier (PikerAlpha, October 2012).
+- make now creates RevoBoot/i386/config/SETTINGS when missing (PikerAlpha, October 2012).
+- Makefile now copies settings-template.h to SETTINGS/[your model.h] when missing (PikerAlpha, October 2012).
+
+
+RevoBoot v1.5.01
+================
+- MacPro SMBIOS board serial/type added (dgsga, October 2012).
+
+
 RevoBoot v1.5.00
 ================
 - RevoBoot project forked (PikerAlpha, October 2012).

From 267063d55f36649f3532c6ea84abc17968703995 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 12:25:46 +0300
Subject: [PATCH 021/623] Updating version info for RevoBoot v1.5.21

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index a7ccabd..07a45d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.20
+1.5.21

From 989102f4b831fc5d2ff899f560a313103c70410d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 12:31:16 +0300
Subject: [PATCH 022/623] Typo

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 00f967b..579854f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-RevoBoot can now be build with Xcode 4.5.1 on Mountain Lion. See change log for instructions.
+RevoBoot can now be built with Xcode 4.5.1 on Mountain Lion. See change log for instructions.
 
 Please note that RevoBoot must be configured for your hardware so start reading our WiKi. See also:
 

From 9d7ffbd79e6b5c35a656bfde043a5c78ff82c3a7 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 12:41:02 +0300
Subject: [PATCH 023/623] Cleanup/update for RevoBoot v.1.5.20

---
 .gitignore | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f491c27..85c4e54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,14 @@
 .DS_Store
-data-hp.h
-data-asus.h
-settings-hp.h
-setting-asus.h
+
+i386/config/SETTINGS/*.h
+
+i386/config/ACPI/default.h
+i386/config/ACPI/*Mac*.h
+
+i386/config/EFI/default.h
+i386/config/EFI/*Mac*.h
+
+i386/config/SMBIOS/default.h
+i386/config/SMBIOS/*Mac*.h
+
+i386/util/libcc_kext.a
\ No newline at end of file

From adbeeb748cb0025b20fed44d413e6993af7567d0 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 12:43:58 +0300
Subject: [PATCH 024/623] No longer used in RevoBoot v1.5.20

---
 i386/config/ACPI/data.h | 97 -----------------------------------------
 1 file changed, 97 deletions(-)

diff --git a/i386/config/ACPI/data.h b/i386/config/ACPI/data.h
index 6a80eac..e69de29 100755
--- a/i386/config/ACPI/data.h
+++ b/i386/config/ACPI/data.h
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2009 Master Chief. All rights reserved.
- *
- * Note: This is an essential part of the build process for Revolution v0.6.43 and greater.
- *
- *
- * Latest cleanups and additional directives added by DHP in 2011
- */
-
-
-//--------------------------------------------------------- ESSENTIAL ACPI TABLES -------------------------------------------------------------
-
-
-#if STATIC_APIC_TABLE_INJECTION
-	#define STATIC_APIC_TABLE_DATA \
-	/* 0x0000 */	// Insert your APIC table replacement here (optional).
-#endif
-
-
-#if STATIC_ECDT_TABLE_INJECTION
-	#define STATIC_ECDT_TABLE_DATA \
-	/* 0x0000 */	// Insert your ECDT table replacement here (optional).
-#endif
-
-
-#if STATIC_HPET_TABLE_INJECTION
-	#define STATIC_HPET_TABLE_DATA \
-	/* 0x0000 */	// Insert your HPET table replacement here (optional).
-#endif
-
-
-#if STATIC_MCFG_TABLE_INJECTION
-	#define STATIC_MCFG_TABLE_DATA \
-	/* 0x0000 */	// Insert your MCFG table replacement here (optional).
-#endif
-
-
-#if STATIC_SBST_TABLE_INJECTION
-	#define STATIC_SBST_TABLE_DATA \
-	/* 0x0000 */	// Insert your SBST table replacement here (optional).
-#endif
-
-
-#if STATIC_SSDT_TABLE_INJECTION
-	#define STATIC_SSDT_TABLE_DATA \
-	/* 0x0000 */	// Insert your SSDT table replacement here (optional).
-#endif
-
-
-//--------------------------------------------------------- SECONDARY ACPI TABLES -------------------------------------------------------------
-
-
-#if STATIC_DSDT_TABLE_INJECTION
-	#define STATIC_DSDT_TABLE_DATA \
-	/* 0x0000 */	// Insert your DSDT table replacement here (optional).
-#endif
-
-
-#if STATIC_FACS_TABLE_INJECTION
-	#define STATIC_FACS_TABLE_DATA \
-	/* 0x0000 */	// Insert your FACS table replacement here (optional).
-#endif
-
-
-//---------------------------------------------------------- OPTIONAL ACPI TABLES -------------------------------------------------------------
-
-
-#if STATIC_APIC2_TABLE_INJECTION
-	#define STATIC_APIC2_TABLE_DATA \
-	/* 0x0000 */	// Insert a second APIC table (replacement) here (optional).
-#endif
-
-
-#if STATIC_SSDT_GPU_TABLE_INJECTION
-	#define STATIC_SSDT_GPU_TABLE_DATA \
-	/* 0x0000 */	// Insert your SSDT_GPU table replacement here (optional).
-#endif
-
-
-#if STATIC_SSDT_PR_TABLE_INJECTION
-	#define STATIC_SSDT_PR_TABLE_DATA \
-	/* 0x0000 */	// Insert your SSDT_PR table replacement here (optional).
-#endif
-
-
-#if STATIC_SSDT_SATA_TABLE_INJECTION
-	#define STATIC_SSDT_SATA_TABLE_DATA \
-	/* 0x0000 */	// Insert your SSDT_SATA table replacement here (optional).
-#endif
-
-
-#if STATIC_SSDT_USB_TABLE_INJECTION
-	#define STATIC_SSDT_USB_TABLE_DATA \
-	/* 0x0000 */	// Insert your SSDT_USB table replacement here (optional).
-#endif
-
-//================================================================= END ====================================================================

From f3874b7a2803da7581b6957213601bc3c56312f9 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 12:47:09 +0300
Subject: [PATCH 025/623] File no longer used in RevoBoot v1.5.10 (can be
 removed)

---
 i386/config/data-template.h | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/i386/config/data-template.h b/i386/config/data-template.h
index c3a566c..e69de29 100755
--- a/i386/config/data-template.h
+++ b/i386/config/data-template.h
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2009 Master Chief.
- * Refactored by DHP in 2010-2011.
- */
-
-
-#if PATCH_ACPI_TABLE_DATA && INCLUDE_ACPI_DATA
-	#undef INCLUDE_ACPI_DATA
-	#include "acpi/data.h"
-
-#elif INJECT_EFI_DEVICE_PROPERTIES && INCLUDE_EFI_DATA
-	#undef INCLUDE_EFI_DATA
-	#include "efi/data.h"
-
-#elif USE_STATIC_SMBIOS_DATA && INCLUDE_SMBIOS_DATA
-	#undef INCLUDE_SMBIOS_DATA
-	#include "smbios/data.h"
-
-#endif

From 6ea29185adb673496df515efb86bbf2c775fb39f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 13:22:50 +0300
Subject: [PATCH 026/623] Quick update for RevoBoot v1.5.10/v1.5.20

---
 i386/config/README | 50 +++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/i386/config/README b/i386/config/README
index dfacdef..e9dc128 100644
--- a/i386/config/README
+++ b/i386/config/README
@@ -4,8 +4,9 @@ RevoBoot comes with configuration templates of which some you need to change:
 ACPI/data-template.h
 --------------------
 
-This file is optional. Only required when you want to inject static ACPI table data. 
-Copy/rename the file to data.h and add your (modified) ACPI tables.
+RevoBoot's build process will copy this file for new configurations to the target modelidentifier 
+and use it, but only when you didn't already do this yourself. Make all required changes in 
+the new file only or it won't be used at all.
 
 Note: We use 'factory tables' for the original ACPI tables in the BIOS and 'modified' 
       for new/modified ACPI tables.
@@ -14,8 +15,9 @@ Note: We use 'factory tables' for the original ACPI tables in the BIOS and 'modi
 EFI/data-template.h
 -------------------
 
-This file is optional. Only required when you want/need to inject EFI device properties. 
-Copy/rename the file to data.h and add your EFI device properties.
+RevoBoot's build process will copy this file for new configurations to the target modelidentifier 
+and use it, but only when you didn't already do this yourself. Make all required changes in 
+the new file only or it won't be used at all.
 
 Note: A simple HOWTO will (hopefully) soon be added to the EFI directory. 
 
@@ -23,36 +25,38 @@ Note: A simple HOWTO will (hopefully) soon be added to the EFI directory.
 SMBIOS/data-template.h
 ----------------------
 
-This file is optional. Only required when you want to inject static ACPI table data. 
-Copy/rename the file to data.h and add your static SMBIOS data.
+RevoBoot's build process will copy this file for new configurations to the target modelidentifier 
+and use it, but only when you didn't already do this yourself. Make all required changes in 
+the new file only or it won't be used at all.
 
 Note: You can extract the SMBIOS table data with: /smbios/tools/smbios2struct2 
       Make instruction are included in the source code.
 
 
+settings.h
+----------
+
+This file selects the target settings file based on the specified model identifier. Using 
+make MODEL=Macmini51 or use ./r Macmini51 (examples) makes it select RevoBoot/i386/config/SETTINGS/Macmini51.h
+All future changes need to be made in this file, or they won't be picked up.
+
+
 settings-template.h
 -------------------
 
-This is the default configuration template for RevoBoot. Every possible option can be found in it. 
-You have to either copy or rename this file to settings.h and change it so that it matches your 
-hardware configuration.
+RevoBoot's build process first checks RevoBoot/i386/config/SETTINGS/*.h per target model identifier 
+(example: Macmini51,h) and use it, or copies RevoBoot/i386/config/settings-template.h to the target model 
+identifier (when the file is missing) to prevent build errors.
 
+People with working RevoBoot configurations can simply copy their settings.h to SETTINGS/[your model].h 
+This will allow the RevoBoot build process to compile without errors, but make sure to use the latest 
+preprocessor options.
 
-data-template.h
----------------
 
-RevoBoot has one main include file for static data in the ACPI, EFI and SMBIOS directories. 
-This enables you to add files for different target configurations there. Here's an example 
-for two setups:
-
-#include "ACPI/data-hp.h"
-#include "EFI/data-hp.h"
-#include "SMBIOS/data-hp.h"
+ACPI/EFI/SMBIOS/data.h
+----------------------
 
-or (not both):
+These are RevoBoot's main data selector files to support (optional) static data. 
 
-#include "ACPI/data-asus.h" 
-#include "EFI/data-asus.h" 
-#include "SMBIOS/data-asus.h" 
+Note: Do not change this file!
 
-Note: We plan to add a make option for this. To let it select the files for the target configuration. 

From fd2c2f589877ae9120de009862c21fb4d64ec022 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 14:44:40 +0300
Subject: [PATCH 027/623] ignore build/log stuff

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 85c4e54..c15d8f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,9 @@
 .DS_Store
 
+out.log
+obj/*
+sym/*
+
 i386/config/SETTINGS/*.h
 
 i386/config/ACPI/default.h

From 8f24a5099c6487164e86e367ff7f28390645d63a Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 26 Oct 2012 14:49:57 +0300
Subject: [PATCH 028/623] Changed usage: ./c USBDRIVE

---
 c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/c b/c
index 892a658..1928ec4 100755
--- a/c
+++ b/c
@@ -1,3 +1,3 @@
-sudo cp sym/i386/boot /Volumes/USBBOOT/
-sudo diskutil unmount /Volumes/USBBOOT
+sudo cp sym/i386/boot /Volumes/$1/
+sudo diskutil unmount /Volumes/$1
 

From 5a3421aab1cdcb5371dcd20f00c35e3234a3b594 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 01:01:56 +0300
Subject: [PATCH 029/623] New MacBookPro10,2 and Macmini6,[2/1] added

---
 i386/libsaio/platform.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 9205b14..9053cd8 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -64,6 +64,7 @@
 #define MACBOOK_AIR_42			MACBOOK_AIR | (1 << 15)
 #define MACBOOK_AIR_41			MACBOOK_AIR				// Defaults to MacBookAir4,1
 
+#define MACBOOK_PRO_102			MACBOOK_PRO | (6 << 15)
 #define MACBOOK_PRO_101			MACBOOK_PRO | (5 << 15)
 #define MACBOOK_PRO_91			MACBOOK_PRO | (4 << 15)
 #define MACBOOK_PRO_83			MACBOOK_PRO | (3 << 15)
@@ -71,6 +72,8 @@
 #define MACBOOK_PRO_81			MACBOOK_PRO | (1 << 15)
 #define MACBOOK_PRO_61			MACBOOK_PRO				// Defaults to MacBookPro8,1
 
+#define MACMINI_62				(MACMINI | (4 << 15))
+#define MACMINI_61				(MACMINI | (3 << 15))
 #define MACMINI_53				(MACMINI | (2 << 15))
 #define MACMINI_52				(MACMINI | (1 << 15))
 #define MACMINI_51				MACMINI					// Defaults to Macmini5,1

From f4e3ef9cb3f050f376f4dddba82c8efbecd19153 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 01:06:24 +0300
Subject: [PATCH 030/623] MacBookPro10,2 added

---
 i386/libsaio/smbios/model_data.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 92a435c..9039b23 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -20,6 +20,7 @@
  *			- EFI/SMBIOS data logic moved to preprocessor code (PikerAlpha, October 2012).
  *			- SMB_PRODUCT_NAME renamed/moved over from settings.h (PikerAlpha, October 2012).
  *			- EFI_MODEL_NAME renamed/moved over from settings.h (PikerAlpha, October 2012).
+ *			- Data for new MacBookPro and Macmini added (PikerAlpha, October 2012).
  *
  * Credits:
  *			- blackosx, DB1, dgsga, FKA, humph, scrax and STLVNUB (testers).
@@ -95,14 +96,20 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"MacBookPro"
 
-	#if (TARGET_MODEL == MACBOOK_PRO_101)
-	// Intel Core i7-3720QM @ 2.60 GHz - 4 cores / 8 threads.
+	#if (TARGET_MODEL == MACBOOK_PRO_102)
+		// Intel Core i7-3520QM @ 2.90 GHz - 2 cores / 4 threads.
+		#define SMB_BIOS_VERSION	"MBP102.88Z.00FE.B00.1207181057"
+		#define SMB_PRODUCT_NAME	"MacBookPro10,2"
+		#define SMB_BOARD_PRODUCT	"MMac-AFD8A9D944EA4843"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '2' }
+	#elif (TARGET_MODEL == MACBOOK_PRO_101)
+		// Intel Core i7-3720QM @ 2.60 GHz - 4 cores / 8 threads.
 		#define SMB_BIOS_VERSION	"MBP101.88Z.00EE.B00.1205101839"
 		#define SMB_PRODUCT_NAME	"MacBookPro10,1"
 		#define SMB_BOARD_PRODUCT	"Mac-C3EC7CD22292981F"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '1' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_91)
-	// Intel Core i7-3820QM @ 2.70 GHz - 4 cores / 8 threads.
+		// Intel Core i7-3820QM @ 2.70 GHz - 4 cores / 8 threads.
 		#define SMB_BIOS_VERSION	"MBP91.88Z.00D3.B00.1203211536"
 		#define SMB_PRODUCT_NAME	"MacBookPro9,1"
 		#define SMB_BOARD_PRODUCT	"Mac-4B7AC7E43945597E"

From b37e401c90bbddce4828cd8529e3097f41436bbc Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 01:07:55 +0300
Subject: [PATCH 031/623] Typo

---
 i386/libsaio/smbios/model_data.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 9039b23..bd8cc19 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -100,7 +100,7 @@
 		// Intel Core i7-3520QM @ 2.90 GHz - 2 cores / 4 threads.
 		#define SMB_BIOS_VERSION	"MBP102.88Z.00FE.B00.1207181057"
 		#define SMB_PRODUCT_NAME	"MacBookPro10,2"
-		#define SMB_BOARD_PRODUCT	"MMac-AFD8A9D944EA4843"
+		#define SMB_BOARD_PRODUCT	"Mac-AFD8A9D944EA4843"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '2' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_101)
 		// Intel Core i7-3720QM @ 2.60 GHz - 4 cores / 8 threads.

From 7336203d0319753f711abf1e91bc0934e669f986 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 15:10:54 +0300
Subject: [PATCH 032/623] Use CONFIG_DIR and data-template.h instead of data.h

---
 Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index bbe91ec..2c101ae 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ ifdef MODEL
 		#
 		# Include default/empty static data file (no model identifier specified).
 		#
-		DATA_FILE = data
+		DATA_FILE = data-template
 	endif
 else
 	#
@@ -110,7 +110,7 @@ else
 	#
 	# Include default/empty static data file (no model identifier specified).
 	#
-	DATA_FILE = data
+	DATA_FILE = data-template
 endif
 
 #
@@ -133,16 +133,16 @@ SETTINGS_DIR=$(CONFIG_DIR)/SETTINGS
 SETTINGS_FILE=$(SETTINGS_DIR)/$(MAKE_TARGET_MODEL).h
 
 $(MAKEGOAL): $(SYMROOT) $(OBJROOT)
-	@if [ ! -f $(ARCH_DIR)/config/$(MAKE_ACPI_DATA_FILE) ]; then \
-		cp -n $(ARCH_DIR)/config/ACPI/data-template.h $(ARCH_DIR)/config/$(MAKE_ACPI_DATA_FILE); \
+	@if [ ! -f $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE) ]; then \
+		cp -n $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE); \
 	fi;
 
-	@if [ ! -f $(ARCH_DIR)/config/$(MAKE_EFI_DATA_FILE) ]; then \
-		cp -n $(ARCH_DIR)/config/EFI/data-template.h $(ARCH_DIR)/config/$(MAKE_EFI_DATA_FILE); \
+	@if [ ! -f $(CONFIG_DIR)/$(MAKE_EFI_DATA_FILE) ]; then \
+		cp -n $(CONFIG_DIR)/EFI/data-template.h $(CONFIG_DIR)/$(MAKE_EFI_DATA_FILE); \
 	fi;
 
-	@if [ ! -f $(ARCH_DIR)/config/$(MAKE_SMBIOS_DATA_FILE) ]; then \
-		cp -n $(ARCH_DIR)/config/SMBIOS/data-template.h $(ARCH_DIR)/config/$(MAKE_SMBIOS_DATA_FILE); \
+	@if [ ! -f $(CONFIG_DIR)/$(MAKE_SMBIOS_DATA_FILE) ]; then \
+		cp -n $(CONFIG_DIR)/SMBIOS/data-template.h $(CONFIG_DIR)/$(MAKE_SMBIOS_DATA_FILE); \
 	fi;
 
 	@if [ ! -d $(SETTINGS_DIR) ]; then \

From 173260ccb8690810ca19a179bb0ccf536413a7ed Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 15:13:02 +0300
Subject: [PATCH 033/623] Update for RevoBoot v1.5.22

---
 CHANGES | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index 39637a7..3a80320 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+RevoBoot v1.5.22
+================
+- Bug fix in RevoBoot/Makefile (PikerAlpha, October 2012).
+- VERSION updated to v1.5.22
+
+
 RevoBoot v1.5.21
 ================
 - Model data for new Macmini6,N added (PikerAlpha, October 2012).

From f9c98adb51040d67671df436f2605efb6fae734c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 15:13:41 +0300
Subject: [PATCH 034/623] Updating version info for RevoBoot v1.5.22

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 07a45d7..d532fd9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.21
+1.5.22

From 00012ca3f6b931a25ca9e359c524811d7dba2a6b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 20:00:19 +0300
Subject: [PATCH 035/623] STATIC_SMSERIALNUMBER -> SMB_BOARD_SERIAL_NUMBER

---
 i386/config/settings-template.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 82fa634..966bcbc 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -283,8 +283,6 @@
 											//
 											// Note: Do not change this setting, unless you know what you are doing.
 
-#define STATIC_SMSERIALNUMBER			"SOMESRLNUMBR" // Example only!
-
 #define STATIC_SYSTEM_SERIAL_NUMBER		{ 'S', 'O', 'M', 'E', 'S', 'R', 'L', 'N', 'U', 'M', 'B', 'R' } // Example only!
 
 #define STATIC_SYSTEM_ID				{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F } // Example only!
@@ -350,8 +348,8 @@
 													//
 													// Note: MACMINI (without _NNN) selects the default model (last one i.e. MACMINI_51).
 
-#if TARGET_MODEL & MACPRO
-    #define STATIC_SMBOARDSERIAL            "SOMEBOARDNMBR" // Example only!
+#if (TARGET_MODEL & MACPRO)
+	#define SMB_BOARD_SERIAL_NUMBER			"SOMESRLNUMBR" // Example only!
 #endif
 
 #define DEBUG_SMBIOS						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.

From 0c34f1d57763caf112ad5b0e77fe2540582e8a10 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 20:05:03 +0300
Subject: [PATCH 036/623] Bug fix and cleanups

---
 i386/libsaio/smbios/dynamic_data.h | 120 ++++++++++++++++-------------
 1 file changed, 66 insertions(+), 54 deletions(-)

diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 91f25d6..f7c0356 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -11,6 +11,7 @@
  *			- SMBIOS data logic moved to preprocessor code (PikerAlpha, October 2012).
  *			- SMBProperties changed for speed and simplicity (PikerAlpha, October 2012).
  *			- Calls with SMBProperties.keyString cleaned up (PikerAlpha, October 2012).
+ *			- Fixed requiredStructures.start/stop values (PikerAlpha, October 2012).
  *
  * Credits:
  *			- Kabyl (see notes in source code)
@@ -36,6 +37,18 @@
 #include "smbios.h"
 #include "model_data.h"
 
+#if (TARGET_MODEL & MACPRO)
+	/*
+	 * Number of additional properties for MacPro models.
+	 */
+	#define PROBOARD	2
+#else
+	/*
+	 * No additional properties for other Mac models.
+	*/
+	#define PROBOARD	0
+#endif
+
 //------------------------------------------------------------------------------
 
 struct SMBStructure
@@ -52,24 +65,24 @@ struct SMBStructure
 
 struct SMBStructure requiredStructures[] =
 {
-	{ kSMBTypeBIOSInformation		/*   0 */ ,		 0,		 5,		false,		0	},
-	{ kSMBTypeSystemInformation		/*   1 */ ,		 6,		10,		false,		0	},
-	{ kSMBTypeBaseBoard				/*   2 */ ,		11,		14,		false,		0	},
-	{ kSMBUnused					/*   3 */ ,		 0,		 0,		false,		0	},
-	{ kSMBTypeProcessorInformation	/*   4 */ ,		15,		16,		true,		0	},
-	{ kSMBUnused					/*   5 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*   6 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*   7 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*   8 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*   9 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*  10 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*  11 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*  12 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*  13 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*  14 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*  15 */ ,		 0,		 0,		false,		0	},
-	{ kSMBUnused					/*  16 */ ,		 0,		 0,		false,		0	},
-	{ kSMBTypeMemoryDevice			/*  17 */ ,		17,		21,		true,		0	}
+	{ kSMBTypeBIOSInformation		/*   0 */ ,	 0,					5,					false,	0	},
+	{ kSMBTypeSystemInformation		/*   1 */ ,	 6,					10,					false,	0	},
+	{ kSMBTypeBaseBoard				/*   2 */ ,	(11 + PROBOARD),	(12 + PROBOARD),	false,	0	},
+	{ kSMBUnused					/*   3 */ ,	 0,					0,					false,	0	},
+	{ kSMBTypeProcessorInformation	/*   4 */ ,	(13 + PROBOARD),	(14 + PROBOARD),	true,	0	},
+	{ kSMBUnused					/*   5 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*   6 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*   7 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*   8 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*   9 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*  10 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*  11 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*  12 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*  13 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*  14 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*  15 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused					/*  16 */ ,	 0,					0,					false,	0	},
+	{ kSMBTypeMemoryDevice			/*  17 */ ,	(15 + PROBOARD),	(19 + PROBOARD),	true,	0	}
 };
 
 
@@ -103,64 +116,63 @@ struct SMBProperty
 };
 
 #define APPLE_INC			"Apple Inc."
-#define SMB_SYSTEM_VERSION	"1.0"
 
 //------------------------------------------------------------------------------
 
 struct SMBProperty SMBProperties[] =
 {
-	//------------------------------------------------------------------------------------------------
+	//----------------------------------------------------------------------------------------------------
 	
-	{ kSMBTypeBIOSInformation,		0x04,	kSMBString,		.plainData		= APPLE_INC				},
-	{ kSMBTypeBIOSInformation,		0x05,	kSMBString,		.plainData		= SMB_BIOS_VERSION		},
-	{ kSMBTypeBIOSInformation,		0x06,	kSMBWord,		.getSMBWord		= getBIOSLocation		},
-	{ kSMBTypeBIOSInformation,		0x08,	kSMBString,		.getSMBString	= getBIOSDate			},
-	{ kSMBTypeBIOSInformation,		0x0a,	kSMBQWord,		.getSMBQWord	= getBIOSFeatures		},
-	{ kSMBTypeBIOSInformation,		0x12,	kSMBDWord,		.getSMBDWord	= getBIOSFeaturesEX		},
-
-	//------------------------------------------------------------------------------------------------
+	{ kSMBTypeBIOSInformation,		0x04,	kSMBString,		.plainData		= APPLE_INC					},
+	{ kSMBTypeBIOSInformation,		0x05,	kSMBString,		.plainData		= SMB_BIOS_VERSION			},
+	{ kSMBTypeBIOSInformation,		0x06,	kSMBWord,		.getSMBWord		= getBIOSLocation			},
+	{ kSMBTypeBIOSInformation,		0x08,	kSMBString,		.getSMBString	= getBIOSDate				},
+	{ kSMBTypeBIOSInformation,		0x0a,	kSMBQWord,		.getSMBQWord	= getBIOSFeatures			},
+	{ kSMBTypeBIOSInformation,		0x12,	kSMBDWord,		.getSMBDWord	= getBIOSFeaturesEX			},
+
+	//----------------------------------------------------------------------------------------------------
 	
-	{ kSMBTypeSystemInformation,	0x04,	kSMBString,		.plainData		= APPLE_INC				},
-	{ kSMBTypeSystemInformation,	0x05,	kSMBString,		.plainData		= SMB_PRODUCT_NAME		},
-	{ kSMBTypeSystemInformation,	0x06,	kSMBString,		.plainData		= SMB_SYSTEM_VERSION	},
-	{ kSMBTypeSystemInformation,	0x07,	kSMBString,		.plainData		= STATIC_SMSERIALNUMBER	},
-	{ kSMBTypeSystemInformation,	0x1a,	kSMBString,		.plainData		= SMB_FAMILY			},
+	{ kSMBTypeSystemInformation,	0x04,	kSMBString,		.plainData		= APPLE_INC					},
+	{ kSMBTypeSystemInformation,	0x05,	kSMBString,		.plainData		= SMB_PRODUCT_NAME			},
+	{ kSMBTypeSystemInformation,	0x06,	kSMBString,		.plainData		= "1.0"						},
+	{ kSMBTypeSystemInformation,	0x07,	kSMBString,		.plainData		= STATIC_SMSERIALNUMBER		},
+	{ kSMBTypeSystemInformation,	0x1a,	kSMBString,		.plainData		= SMB_FAMILY				},
 	
-	//------------------------------------------------------------------------------------------------
+	//----------------------------------------------------------------------------------------------------
 	
-	{ kSMBTypeBaseBoard,			0x04,	kSMBString,		.plainData		= APPLE_INC				},
-	{ kSMBTypeBaseBoard,			0x05,	kSMBString,		.plainData		= SMB_BOARD_PRODUCT		},
-    
-#if TARGET_MODEL & MACPRO
-    { kSMBTypeBaseBoard,			0x07,	kSMBString,		.plainData		= STATIC_SMBOARDSERIAL	},
-	{ kSMBTypeBaseBoard,			0x0d,	kSMBByte,		.getSMBByte		= getBoardType          },
+	{ kSMBTypeBaseBoard,			0x04,	kSMBString,		.plainData		= APPLE_INC					},
+	{ kSMBTypeBaseBoard,			0x05,	kSMBString,		.plainData		= SMB_BOARD_PRODUCT			},
+
+#if (TARGET_MODEL & MACPRO)
+    { kSMBTypeBaseBoard,			0x07,	kSMBString,		.plainData		= SMB_BOARD_SERIAL_NUMBER	},
+	{ kSMBTypeBaseBoard,			0x0d,	kSMBByte,		.getSMBByte		= getBoardType				},
 #endif
+
+	//----------------------------------------------------------------------------------------------------
 	
-	//------------------------------------------------------------------------------------------------
-	
-	{ kSMBTypeProcessorInformation,	0x12,	kSMBWord,		.getSMBWord		= getFSBFrequency		},
-	{ kSMBTypeProcessorInformation,	0x14,	kSMBWord,		.getSMBWord		= getCPUFrequency		},
+	{ kSMBTypeProcessorInformation,	0x12,	kSMBWord,		.getSMBWord		= getFSBFrequency			},
+	{ kSMBTypeProcessorInformation,	0x14,	kSMBWord,		.getSMBWord		= getCPUFrequency			},
 	
-	//------------------------------------------------------------------------------------------------
+	//----------------------------------------------------------------------------------------------------
 	
 #if DYNAMIC_RAM_OVERRIDE_SIZE
-	{ kSMBTypeMemoryDevice,			0x0c,	kSMBWord,		.getSMBWord		= getRAMSize			},
+	{ kSMBTypeMemoryDevice,			0x0c,	kSMBWord,		.getSMBWord		= getRAMSize				},
 #endif
 	
-	{ kSMBTypeMemoryDevice,			0x10,	kSMBString,		.getSMBString	= NULL					},
-	{ kSMBTypeMemoryDevice,			0x11,	kSMBString,		.getSMBString	= NULL					},
+	{ kSMBTypeMemoryDevice,			0x10,	kSMBString,		.getSMBString	= NULL						},
+	{ kSMBTypeMemoryDevice,			0x11,	kSMBString,		.getSMBString	= NULL						},
 
 #if DYNAMIC_RAM_OVERRIDE_TYPE
-	{ kSMBTypeMemoryDevice,			0x12,	kSMBByte,		.getSMBByte		= getRAMType			},
+	{ kSMBTypeMemoryDevice,			0x12,	kSMBByte,		.getSMBByte		= getRAMType				},
 #endif
 
 #if DYNAMIC_RAM_OVERRIDE_FREQUENCY  
-	{ kSMBTypeMemoryDevice,			0x15,	kSMBWord,		.getSMBWord		= getRAMFrequency		},
+	{ kSMBTypeMemoryDevice,			0x15,	kSMBWord,		.getSMBWord		= getRAMFrequency			},
 #endif
 
-	{ kSMBTypeMemoryDevice,			0x17,	kSMBString,		.getSMBString	= getRAMVendor			},
-	{ kSMBTypeMemoryDevice,			0x18,	kSMBString,		.getSMBString	= getRAMSerialNumber	},
-	{ kSMBTypeMemoryDevice,			0x1a,	kSMBString,		.getSMBString	= getRAMPartNumber		},
+	{ kSMBTypeMemoryDevice,			0x17,	kSMBString,		.getSMBString	= getRAMVendor				},
+	{ kSMBTypeMemoryDevice,			0x18,	kSMBString,		.getSMBString	= getRAMSerialNumber		},
+	{ kSMBTypeMemoryDevice,			0x1a,	kSMBString,		.getSMBString	= getRAMPartNumber			},
 };
 
 
@@ -266,7 +278,7 @@ void setupSMBIOS(void)
 		newtablesPtr += 8;
 	}
 
-#if DYNAMIC_RAM_OVERRIDE_SIZE || DYNAMIC_RAM_OVERRIDE_TYPE || DYNAMIC_RAM_OVERRIDE_FREQUENCY
+#if (DYNAMIC_RAM_OVERRIDE_SIZE || DYNAMIC_RAM_OVERRIDE_TYPE || DYNAMIC_RAM_OVERRIDE_FREQUENCY)
 	requiredStructures[17].stop = (sizeof(SMBProperties) / sizeof(SMBProperties[0])) -1;
 #endif
 

From 5658ac96ffe79ce51e89a1fca25d456fc2a3e0db Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 20:06:05 +0300
Subject: [PATCH 037/623] Updating version info for RevoBoot v1.5.23

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index d532fd9..249319e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.22
+1.5.23

From 5c9837d1f785a5d5d6c5d7c5435443f7f1bd609f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 20:07:35 +0300
Subject: [PATCH 038/623] Update for RevoBoot v1.5.23

---
 CHANGES | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index 3a80320..4b80611 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+RevoBoot v1.5.23
+================
+- Bug fix and cleanups in RevoBoot/i386/libsaio/SMBIOS/dynamic_data.h (PikerAlpha, October 2012).
+- VERSION updated to v1.5.23
+
+
 RevoBoot v1.5.22
 ================
 - Bug fix in RevoBoot/Makefile (PikerAlpha, October 2012).

From 61d2aa501bde305e79a0a711a6006b5f6a07420d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 20:17:25 +0300
Subject: [PATCH 039/623] Comment only

---
 i386/config/data.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/config/data.h b/i386/config/data.h
index bd56edc..768bafc 100755
--- a/i386/config/data.h
+++ b/i386/config/data.h
@@ -14,7 +14,7 @@
 
 #if (PATCH_ACPI_TABLE_DATA && INCLUDE_ACPI_DATA)
 	#undef INCLUDE_ACPI_DATA
-
+	// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
 	#include STRING(ACPI_DATA_FILE)
 #endif
 

From 14d5d57b5a2da605ec6f60b6f10f9135ac58ffdf Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 27 Oct 2012 20:19:57 +0300
Subject: [PATCH 040/623] Cleanup only

---
 i386/config/settings.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/i386/config/settings.h b/i386/config/settings.h
index ae4c0f9..ad4fcb4 100644
--- a/i386/config/settings.h
+++ b/i386/config/settings.h
@@ -8,6 +8,5 @@
 
 #define TO_STRING_DO(a)		#a
 #define STRING(a)			TO_STRING_DO(a)
-#define INCLUDE_FILE		STRING(SETTINGS_FILE)
 
-#include INCLUDE_FILE
+#include STRING(SETTINGS_FILE)

From 3f254d25fbf6a030870af5375ae63950e6496b5a Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 28 Oct 2012 09:45:35 +0100
Subject: [PATCH 041/623] Updating version info for RevoBoot v1.5.25

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 249319e..32461d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.23
+1.5.25

From f1fe27b04d94119a73f31918ecb0852e9b7f66ad Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 28 Oct 2012 09:47:30 +0100
Subject: [PATCH 042/623] New static data paths for RevoBoot v1.5.25

---
 i386/libsaio/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index 0bff17d..0c3c64f 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -23,9 +23,9 @@ CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost \
     -DREVOBOOT_VERSION_INFO=\"RevoBoot\ v$(PRODUCT_VERSION_NUMBER)\" \
     -DMAKE_TARGET_OS=$(PRODUCT_OS_TARGET) \
     -DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
-    -DACPI_DATA_FILE=$(MAKE_ACPI_DATA_FILE) \
-    -DEFI_DATA_FILE=$(MAKE_EFI_DATA_FILE) \
-    -DSMBIOS_DATA_FILE=$(MAKE_SMBIOS_DATA_FILE) \
+    -DACPI_DATA_FILE=../../config/$(MAKE_ACPI_DATA_FILE) \
+    -DEFI_DATA_FILE=../config/$(MAKE_EFI_DATA_FILE) \
+    -DSMBIOS_DATA_FILE=../../config/$(MAKE_SMBIOS_DATA_FILE) \
     -fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \
     -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
     -march=pentium4 -msse2 -mfpmath=sse -msoft-float

From 3bcbf0ceee0bf183666c3111662a310724a949f1 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 28 Oct 2012 09:50:41 +0100
Subject: [PATCH 043/623] New static data paths for RevoBoot v1.5.25

---
 i386/libsaio/smbios/static_data.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/smbios/static_data.h b/i386/libsaio/smbios/static_data.h
index 5cf2938..eccaefb 100755
--- a/i386/libsaio/smbios/static_data.h
+++ b/i386/libsaio/smbios/static_data.h
@@ -3,6 +3,7 @@
  *
  * Updates:
  *			- Dynamic and static SMBIOS data gathering added by DHP in 2010.
+ *			- New path for static EFI data (PikerAlpha, October 2012).
  *
  * Credits:
  *			- blackosx, DB1, dgsga, FKA, humph, scrax and STLVNUB (testers).
@@ -13,8 +14,8 @@
 
 #include "essentials.h"
 
-#define INCLUDE_SMBIOS_DATA		1
-#include "../../config/data.h"
+// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
+#include STRING(SMBIOS_DATA_FILE)
 
 static uint32_t SMBIOS_Table[] = 
 {

From f6f699a408cdc55f85871f6538e53a8757ab0adc Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 28 Oct 2012 09:55:19 +0100
Subject: [PATCH 044/623] Use model identifier as filename for static data

---
 i386/libsaio/efi.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index d19557b..86e913e 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -31,16 +31,13 @@
  *			- STATIC_MODEL_NAME moved over from settings.h (PikerAlpha, October 2012).
  *			- STATIC_MODEL_NAME renamed to EFI_MODEL_NAME (PikerAlpha, October 2012).
  *			- Now no longer includes platform.h (PikerAlpha, October 2012).
+ *			- Data selector moved over from RevoBoot/i386/config/data.h (PikerAlpha, October 2012).
  *
  */
 
 
 #include "efi/fake_efi.h"
 
-#define INCLUDE_EFI_DATA	1
-
-#include "../config/data.h"
-
 //==============================================================================
 
 void initEFITree(void)
@@ -177,6 +174,8 @@ void initEFITree(void)
 	gPlatform.EFI.Nodes.Chosen = chosenNode;
 
 #if INJECT_EFI_DEVICE_PROPERTIES
+	// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
+	#include STRING(EFI_DATA_FILE)
 
 	static EFI_UINT8 const EFI_DEVICE_PROPERTIES[] = 
 	{

From 355af009c007124c0a44cf4709f62ddbbdfd89bb Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 28 Oct 2012 09:56:53 +0100
Subject: [PATCH 045/623] Use model identifier as filename for static data

---
 i386/libsaio/acpi/static_data.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/i386/libsaio/acpi/static_data.h b/i386/libsaio/acpi/static_data.h
index 8bf28d2..e9bb4e7 100755
--- a/i386/libsaio/acpi/static_data.h
+++ b/i386/libsaio/acpi/static_data.h
@@ -1,19 +1,18 @@
 /*
- * Copyright 2009 by Master Chief.
+ * Static data overrides for ACPI tables. Copyright 2009 by Master Chief.
  *
- * Refactored (dynamic and static ACPI patching) by DHP in 2010/2011.
+ * Updates:
+ *			- Refactored (dynamic and static ACPI patching) by DHP in 2010/2011.
+ *			- Data selector moved over from RevoBoot/i386/config/data.h (PikerAlpha, October 2012).
  */
 
 #ifndef __LIBSAIO_ACPI_STATIC_DATA_H
 #define __LIBSAIO_ACPI_STATIC_DATA_H
 
-#define INCLUDE_ACPI_DATA	1
+// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
+#include STRING(ACPI_DATA_FILE)
 
-#include "../config/data.h"
-
-// The STATIC_xxx_TABLE_DATA's here will get replaced with the data from private_data.h
-
-// Static data overrides for essential tables.
+// The STATIC_xxx_TABLE_DATA's here will get replaced with the data from RevoBoot/i386/config/ACPI/[default/MacmodelNN].h
 
 static uint32_t APIC_Table[] = 
 {

From 717befbc7e8904d9e6c62deff22b5f2702d33db7 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 28 Oct 2012 09:59:10 +0100
Subject: [PATCH 046/623] No longer included with RevoBoot v1.5.25

---
 i386/config/data.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/i386/config/data.h b/i386/config/data.h
index 768bafc..40de3d1 100755
--- a/i386/config/data.h
+++ b/i386/config/data.h
@@ -8,10 +8,15 @@
  *
  *			- Refactored by DHP in 2010-2011.
  *			- Automatic model data selection (PikerAlpha, October 2012).
- *
+ *			- Static ACPI data selector moved to RevoBoot/i386/libsaio/ACPI/static_data.h (PikerAlpha, October 2012).
+ *			- Static EFI data selector moved to RevoBoot/i386/libsaio/efi.c (PikerAlpha, October 2012).
+ *			- Static SMBIOS data selector moved to RevoBoot/i386/libsaio/SMBIOS/dynamic_data.h (PikerAlpha, October 2012).
+ *			- This file is no longer included with RevoBoot v1.5.25 (PikerAlpha, October 2012).
  */
 
 
+!!__WHEN_YOU_SEE_THIS_STUPID_ERROR_THAN_SOMETHING_IS_WRONG__!!
+
 #if (PATCH_ACPI_TABLE_DATA && INCLUDE_ACPI_DATA)
 	#undef INCLUDE_ACPI_DATA
 	// The STRING (macro) is defined in RevoBoot/i386/config/settings.h

From 997d1c68c6adc75ab9a6c3fc363c1f7f6f581d7d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 28 Oct 2012 10:05:00 +0100
Subject: [PATCH 047/623] Updating version info for RevoBoot v1.5.25

---
 CHANGES | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES b/CHANGES
index 4b80611..a9e4902 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+RevoBoot v1.5.25
+================
+- RevoBoot/i386/config/data.h is no longer included with (PikerAlpha, October 2012).
+- New static data paths in RevoBoot/i386/libsaio/Makefile (PikerAlpha, October 2012).
+- Use model identifier as filename for static data (PikerAlpha, October 2012).
+- VERSION updated to v1.5.25
+
+
 RevoBoot v1.5.23
 ================
 - Bug fix and cleanups in RevoBoot/i386/libsaio/SMBIOS/dynamic_data.h (PikerAlpha, October 2012).

From dc979bd5d2294f8f67b64de8894aedcb859e4fb8 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 11:48:14 +0100
Subject: [PATCH 048/623] Read/use MacModelNN from RevoBoot/MODEL

---
 r | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/r b/r
index 1d06cf0..73954b6 100755
--- a/r
+++ b/r
@@ -1,4 +1,28 @@
-make clean
 clear
-make MODEL=$1 > out.log
+make clean
+#
+# Check argument for Mac model.
+#
+if [[ "$1" =~ [iMac|Mac] ]];
+  then
+    #
+    # Use specified MacModelNN from argument.
+    #
+    make MODEL=$1 > out.log
+  else
+    #
+    # Check RevoBoot/MODEL for default model.
+    #
+    if [ -f MODEL ]; then
+      #
+      # Get MacModelNN from MODEL (assuming it to be correct).
+      #
+      make MODEL=`cat MODEL` > out.log
+    else
+      #
+      # No default model found.
+      #
+      make > out.log
+    fi;
+fi
 

From 79b2403bd3afa7d92dfb161a3406fbca9d69fcf6 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 11:51:42 +0100
Subject: [PATCH 049/623] Patch for RevoBoot v1.5.30

---
 i386/libsaio/acpi/patcher.h | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index f1617a8..d9eb40c 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -7,6 +7,7 @@
  *			- Refactorized for Revolution by DHP in 2010.
  *			- A complete new implementation written for RevoBoot by DHP in 2011.
  *			- Automatic SSDT_PR creation added by DHP in June 2011.
+ *			- Call loadBinaryData from loadACPITable (PikerAlpha, October 2012).
  */
 
 
@@ -26,33 +27,32 @@ int loadACPITable(int tableIndex)
 {
 	_ACPI_DEBUG_DUMP("loadACPITable(%s / ", customTables[tableIndex].name);
 
-	char dirspec[32];
-	sprintf (dirspec, "/Extra/ACPI/%s.aml", customTables[tableIndex].name);
-	int fd = open(dirspec, 0);
+	char dirSpec[32] = "";
+	sprintf(dirSpec, "/Extra/ACPI/%s.aml", customTables[tableIndex].name);
 
-	if (fd < 0)
-	{
-		_ACPI_DEBUG_DUMP("Error: File not found.)\n");
-
-		return -1;
-	}
+	void * tableAddress = (void *)kLoadAddr;
 
-	int fileSize = file_size(fd);
-	void * kernelAddress = malloc(fileSize);
+	/*
+	 * loadBinaryData calls LoadFile (both in sys.c) to load table data into a
+	 * load buffer at kLoadAddr (defined in memory.h) and copies it into a new
+	 * allocated memory block (kLoadAddr gets overwritten by the next call).
+	 */
+	long fileSize = loadBinaryData(dirSpec, &tableAddress);
 
-	if (kernelAddress)
+	if (fileSize)
 	{
-		read(fd, kernelAddress, fileSize);
-	}
+		_ACPI_DEBUG_DUMP("%d bytes).\n", fileSize);
 
-	close(fd);
+		// 'tableAddress' is copied into kernel memory later on (see setupACPI).
+		customTables[tableIndex].table			= tableAddress;
+		customTables[tableIndex].tableLength	= fileSize;
 
-	_ACPI_DEBUG_DUMP("%d bytes).\n", fileSize);
+		return 0;
+	}
 
-	customTables[tableIndex].table			= kernelAddress;
-	customTables[tableIndex].tableLength	= fileSize;
+	_ACPI_DEBUG_DUMP("Error: File not found.)\n");
 
-	return 0;
+	return -1;
 }
 
 

From c943b110603cb703cbf4993e1b792eca2e953401 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 11:54:00 +0100
Subject: [PATCH 050/623] Patch for RevoBoot v1.5.30

---
 i386/libsaio/load.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index dad895a..51e8cf1 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -427,3 +427,31 @@ static long DecodeSymbolTable(long cmdBase)
     
 	return 0;
 }
+
+
+//==============================================================================
+// Public function (RevoBoot v1.5.30 and greater). Called from our ACPI patcher
+// which looks in /Extra/ACPI/ for [TableName].aml but it is also used in two
+// other places, being libsaio/efi.c and libsaio/SMBIOS/static_data.h This to
+// get static (binary) data from /Extra/[EFI/SMBIOS]/[FileName].bin
+
+long loadBinaryData(char *aFilePath, void **aMemoryAddress)
+{
+	long fileSize = LoadFile(aFilePath);
+
+	printf("fileSize is: %ld", fileSize);
+
+	if (fileSize > 0)
+	{
+		*aMemoryAddress = (void *)malloc(fileSize);
+		
+		if (aMemoryAddress)
+		{
+			memcpy(*aMemoryAddress, (void *)kLoadAddr, fileSize);
+
+			return fileSize;
+		}
+	}
+
+	return 0;
+}

From 61494d2695e31fe682a4963fcabc39d03def5d82 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 11:58:59 +0100
Subject: [PATCH 051/623] Patch for RevoBoot v1.5.30

---
 i386/libsaio/efi.c | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 86e913e..720c054 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -32,6 +32,7 @@
  *			- STATIC_MODEL_NAME renamed to EFI_MODEL_NAME (PikerAlpha, October 2012).
  *			- Now no longer includes platform.h (PikerAlpha, October 2012).
  *			- Data selector moved over from RevoBoot/i386/config/data.h (PikerAlpha, October 2012).
+ *			- Get static EFI data (optional) from /Extra/EFI/[MacModelNN].bin (PikerAlpha, October 2012).
  *
  */
 
@@ -174,17 +175,35 @@ void initEFITree(void)
 	gPlatform.EFI.Nodes.Chosen = chosenNode;
 
 #if INJECT_EFI_DEVICE_PROPERTIES
-	// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
-	#include STRING(EFI_DATA_FILE)
+	_EFI_DEBUG_DUMP("Injecting static EFI device-properties [%s]\n", SMB_PRODUCT_NAME);
 
-	static EFI_UINT8 const EFI_DEVICE_PROPERTIES[] = 
-	{
-		STATIC_EFI_DEVICE_PROPERTIES
-	};
+	#if LOAD_STATIC_EFI_DATA_FROM_EXTRA
+		extern long loadBinaryData(char *aFilePath, void **aMemoryAddress);
+	
+		char dirSpec[32] = "";
+		sprintf(dirSpec, "/Extra/EFI/%s", STRING(STATIC_DATA_FILENAME));
+
+		void * staticEFIData = (void *)kLoadAddr;
+
+		_EFI_DEBUG_DUMP("Loading: %s\n", dirSpec);
 
-	_EFI_DEBUG_DUMP("Injecting EFI device-properties\n");
+		long fileSize = loadBinaryData(dirSpec, &staticEFIData);
+	
+		if (fileSize)
+		{
+			DT__AddProperty(efiNode, "device-properties", fileSize, (EFI_CHAR8*) staticEFIData);
+		}
+	#else
+		// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
+		#include STRING(EFI_DATA_FILE)
+
+		static EFI_UINT8 const EFI_DEVICE_PROPERTIES[] =
+		{
+			STATIC_EFI_DEVICE_PROPERTIES
+		};
 
-	DT__AddProperty(efiNode, "device-properties", sizeof(EFI_DEVICE_PROPERTIES), (EFI_CHAR8*) &EFI_DEVICE_PROPERTIES);
+		DT__AddProperty(efiNode, "device-properties", sizeof(EFI_DEVICE_PROPERTIES), (EFI_CHAR8*) &EFI_DEVICE_PROPERTIES);
+	#endif
 #endif
 
 	_EFI_DEBUG_DUMP("Exiting initEFITree()\n");

From 3870a4a37fda52a1b140ae2d1ebfeb3bf399b3dd Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 12:07:05 +0100
Subject: [PATCH 052/623] Patch for RevoBoot v1.5.30

---
 i386/boot2/boot.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 50f3e56..71ccc49 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -204,7 +204,14 @@ void boot(int biosdev)
 		}
 	}
 
+#if (LOAD_STATIC_EFI_DATA_FROM_EXTRA == 0)
+	/*
+	 * We can only make this call here when static EFI is included from
+	 * RevoBoot/i386/config/EFI/[MacModelNN.h] Not when the data is read
+	 * from: /Extra/ because then: RevoBoot/i386/libsaio/platform.c calls it.
+	 */
 	initPartitionChain();
+#endif
 
 	#define loadCABootPlist() loadSystemConfig(&bootInfo->bootConfig)
 

From 7b91930e279385ab3653570c758d6566a789125e Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 12:09:53 +0100
Subject: [PATCH 053/623] Patch for RevoBoot v1.5.30

---
 i386/libsaio/platform.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 11af0fa..78c4f9d 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -276,5 +276,13 @@ void initPlatform(int biosDevice)
 
 	initKernelBootConfig();
 
+#if (LOAD_STATIC_EFI_DATA_FROM_EXTRA)
+	/*
+	 * We need to call this much earlier in the boot process when static EFI data
+	 * is read from: /Extra/EFI[MacModelNN.bin]. Otherwise LoadFile (load.c) fails.
+	 */
+	initPartitionChain();
+#endif
+
 	initEFITree();
 }

From 6654d641d5a1225d79e3a6b097d8046d9f018639 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 12:14:09 +0100
Subject: [PATCH 054/623] Patch for RevoBoot v1.5.30

---
 i386/libsaio/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index 0c3c64f..bc5c4e1 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -6,9 +6,9 @@
 #			- Major cleanup (PikerAlpha, October 2012).
 #			- DMAKE_TARGET_MODEL added (PikerAlpha, October 2012).
 #			- Static data selectors added (PikerAlpha, October 2012).
+#			- STATIC_DATA_FILENAME added (PikerAlpha, October 2012).
 #
 
-
 include ../MakePaths.dir
 
 UTILDIR = ../util
@@ -23,6 +23,7 @@ CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost \
     -DREVOBOOT_VERSION_INFO=\"RevoBoot\ v$(PRODUCT_VERSION_NUMBER)\" \
     -DMAKE_TARGET_OS=$(PRODUCT_OS_TARGET) \
     -DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
+    -DSTATIC_DATA_FILENAME=$(MAKE_TARGET_MODEL).bin \
     -DACPI_DATA_FILE=../../config/$(MAKE_ACPI_DATA_FILE) \
     -DEFI_DATA_FILE=../config/$(MAKE_EFI_DATA_FILE) \
     -DSMBIOS_DATA_FILE=../../config/$(MAKE_SMBIOS_DATA_FILE) \

From e0fc38e372d5df9d6908c87150c781ae875daca4 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 12:18:27 +0100
Subject: [PATCH 055/623] Patch for RevoBoot v1.5.30

---
 i386/libsaio/acpi/patcher.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index d9eb40c..cf760a0 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -20,9 +20,12 @@ extern ACPI_RSDP * getACPIBaseAddress();
 	#include "ssdt_pr_generator.h"
 #endif
 
+
 #if LOAD_EXTRA_ACPI_TABLES && (LOAD_DSDT_TABLE_FROM_EXTRA_ACPI || LOAD_SSDT_TABLE_FROM_EXTRA_ACPI)
 //==============================================================================
 
+extern long loadBinaryData(char *aFilePath, void **aMemoryAddress);
+
 int loadACPITable(int tableIndex)
 {
 	_ACPI_DEBUG_DUMP("loadACPITable(%s / ", customTables[tableIndex].name);

From 355ce29ceb3ccb2660d6a00574899b3f59207984 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 12:21:23 +0100
Subject: [PATCH 056/623] Limit debug output (patch for RevoBoot v1.5.30)

---
 i386/libsaio/device_tree.c | 47 ++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/i386/libsaio/device_tree.c b/i386/libsaio/device_tree.c
index d80dd3e..9949fc2 100755
--- a/i386/libsaio/device_tree.c
+++ b/i386/libsaio/device_tree.c
@@ -79,14 +79,18 @@ Property * DT__AddProperty(Node *node, const char *name, uint32_t length, void *
 {
 	Property *prop;
 
-	_EFI_DEBUG_DUMP("DT__AddProperty([Node '%s'], '%s', %d, 0x%x)\n", DT__GetName(node), name, length, value);
+#if (DEBUG_EFI & 2)
+		_EFI_DEBUG_DUMP("DT__AddProperty([Node '%s'], '%s', %d, 0x%x)\n", DT__GetName(node), name, length, value);
+#endif
 
 	if (freeProperties == NULL)
 	{
 		void *buf = malloc(kAllocSize);
 		int i;
 
+	#if (DEBUG_EFI & 2)
 		_EFI_DEBUG_DUMP("Allocating more free properties\n");
+	#endif
 
 		if (buf == 0)
 		{
@@ -129,7 +133,9 @@ Property * DT__AddProperty(Node *node, const char *name, uint32_t length, void *
 	node->last_prop = prop;
 	prop->next = 0;
 
-	// _EFI_DEBUG_DUMP("Done [0x%x]\n", prop);
+#if (DEBUG_EFI & 8)
+	_EFI_DEBUG_DUMP("Done [0x%x]\n", prop);
+#endif
 
 	DTInfo.numProperties++;
 	DTInfo.totalPropertySize += RoundToLong(length);
@@ -155,7 +161,9 @@ Node * DT__AddChild(Node *parent, const char *name)
 
 		int i;
 
+#if (DEBUG_EFI & 2)
 		_EFI_DEBUG_DUMP("Allocating more free nodes\n");
+#endif
 
 		bzero(buf, kAllocSize);
 		node = (Node *)buf;
@@ -174,13 +182,17 @@ Node * DT__AddChild(Node *parent, const char *name)
 		}
 	}
 
+#if (DEBUG_EFI & 2)
 	_EFI_DEBUG_DUMP("DT__AddChild(0x%x, '%s')\n", parent, name);
+#endif
 
 	node = freeNodes;
 	freeNodes = node->next;
 
+#if (DEBUG_EFI & 2)
 	_EFI_DEBUG_DUMP("Got free node 0x%x\n", node);
 	_EFI_DEBUG_DUMP("prop = 0x%x, children = 0x%x, next = 0x%x\n", node->properties, node->children, node->next);
+#endif
 
 	if (parent == NULL)
 	{
@@ -252,7 +264,9 @@ void DT__Finalize(void)
 	Node *node;
 	Property *prop;
 
-	// _EFI_DEBUG_DUMP("DT__Finalize\n");
+#if (DEBUG_EFI & 8)
+	_EFI_DEBUG_DUMP("DT__Finalize\n");
+#endif
 
 	for (prop = allocedProperties; prop != NULL; prop = prop->next)
 	{
@@ -332,7 +346,9 @@ void DT__FlattenDeviceTree(void **buffer_p, uint32_t *length)
 	uint32_t totalSize;
 	void * buf;
 
+#if (DEBUG_EFI & 2)
 	_EFI_DEBUG_DUMP("DT__FlattenDeviceTree(0x%x, 0x%x)\n", buffer_p, length);
+#endif
 
 #if (DEBUG_EFI & 4)
 	if (buffer_p) 
@@ -345,7 +361,9 @@ void DT__FlattenDeviceTree(void **buffer_p, uint32_t *length)
 	DTInfo.numProperties * sizeof(DeviceTreeNodeProperty) +
 	DTInfo.totalPropertySize;
 
+#if (DEBUG_EFI & 2)
 	_EFI_DEBUG_DUMP("Total size 0x%x\n", totalSize);
+#endif
 
 	if (buffer_p != 0)
 	{
@@ -385,11 +403,16 @@ char * DT__GetName(Node *node)
 {
 	Property *prop;
 
-	//_EFI_DEBUG_DUMP("DT__GetName(0x%x)\n", node);
-	//_EFI_DEBUG_DUMP("Node properties = 0x%x\n", node->properties);
+#if (DEBUG_EFI & 8)
+	_EFI_DEBUG_DUMP("DT__GetName(0x%x)\n", node);
+	_EFI_DEBUG_DUMP("Node properties = 0x%x\n", node->properties);
+#endif
+
 	for (prop = node->properties; prop; prop = prop->next)
 	{
-		//_EFI_DEBUG_DUMP("Prop '%s'\n", prop->name);
+#if (DEBUG_EFI & 8)
+		_EFI_DEBUG_DUMP("Prop '%s'\n", prop->name);
+#endif
 		if (strcmp(prop->name, "name") == 0)
 		{
 			return prop->value;
@@ -410,8 +433,10 @@ Node * DT__FindNode(const char *path, bool createIfMissing)
 	char *bp;
 	int i;
 
+#if (DEBUG_EFI & 2)
 	_EFI_DEBUG_DUMP("DT__FindNode('%s', %d)\n", path, createIfMissing);
-    
+#endif
+
 	// Start at root
 	node = gPlatform.DT.RootNode;
 
@@ -436,13 +461,15 @@ Node * DT__FindNode(const char *path, bool createIfMissing)
 		{
 			break; // last path entry
 		}
-
+#if (DEBUG_EFI & 2)
 		_EFI_DEBUG_DUMP("Node '%s'\n", nameBuf);
+#endif
 
 		for (child = node->children; child != 0; child = child->next)
 		{
+#if (DEBUG_EFI & 2)
 			_EFI_DEBUG_DUMP("Child 0x%x\n", child);
-
+#endif
 			if (strcmp(DT__GetName(child), nameBuf) == 0)
 			{
 				break;
@@ -451,7 +478,9 @@ Node * DT__FindNode(const char *path, bool createIfMissing)
 
 		if (child == 0 && createIfMissing)
 		{
+#if (DEBUG_EFI & 2)
 			_EFI_DEBUG_DUMP("Creating node\n");
+#endif
 
 			char *str = malloc(strlen(nameBuf) + 1);
 			// XXX this will leak

From 40bb5656888e616ac44043a846437c3884c0d004 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 12:31:54 +0100
Subject: [PATCH 057/623] Patch for RevoBoot v1.5.30

---
 i386/libsaio/acpi/patcher.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index cf760a0..50f6113 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -13,7 +13,6 @@
 
 extern ACPI_RSDP * getACPIBaseAddress();
 
-
 #if PATCH_ACPI_TABLE_DATA
 
 #if AUTOMATIC_SSDT_PR_CREATION
@@ -21,7 +20,7 @@ extern ACPI_RSDP * getACPIBaseAddress();
 #endif
 
 
-#if LOAD_EXTRA_ACPI_TABLES && (LOAD_DSDT_TABLE_FROM_EXTRA_ACPI || LOAD_SSDT_TABLE_FROM_EXTRA_ACPI)
+#if (LOAD_EXTRA_ACPI_TABLES && (LOAD_DSDT_TABLE_FROM_EXTRA_ACPI || LOAD_SSDT_TABLE_FROM_EXTRA_ACPI))
 //==============================================================================
 
 extern long loadBinaryData(char *aFilePath, void **aMemoryAddress);

From c55291cd9741f67e297ddf80236fff80f2da77fd Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 12:33:17 +0100
Subject: [PATCH 058/623] Patch for RevoBoot v1.5.30

---
 i386/libsaio/efi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 720c054..109511d 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -39,6 +39,7 @@
 
 #include "efi/fake_efi.h"
 
+
 //==============================================================================
 
 void initEFITree(void)
@@ -47,7 +48,7 @@ void initEFITree(void)
 
 	static char ACPI[] = "ACPI";
 
-	// The required information should be added to private_data.h
+	// The information from RevoBoot/i386/libsaio/SMBIOS/model_data.h is used here.
 	static EFI_CHAR16 const MODEL_NAME[]			= EFI_MODEL_NAME;
 	static EFI_CHAR16 const SYSTEM_SERIAL_NUMBER[]	= STATIC_SYSTEM_SERIAL_NUMBER;
 

From 19e721fa9d974a5ca348aa2cbf2cf30d4b71317c Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 12:38:45 +0100
Subject: [PATCH 059/623] Preparations for RevoBoot v1.5.30

---
 CHANGES | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES b/CHANGES
index a9e4902..7c1ce7b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+RevoBoot v1.5.30
+================
+- Move/update /Extra/ data reading to RevoBoot/i386/libsaio/load.c (PikerAlpha, October 2012).
+- Option to read /Extra/EFI/[MacModelNN.bin] when static EFI data is used (PikerAlpha, October 2012).
+- Option to read /Extra/EFI/[MacModelNN.bin] when static SMBIOS data is used (PikerAlpha, October 2012).
+- Makefile changes for above features(PikerAlpha, October 2012).
+- VERSION updated to v1.5.30 (SMBIOS changes = WORK IN PROGRESS)
+
+
 RevoBoot v1.5.25
 ================
 - RevoBoot/i386/config/data.h is no longer included with (PikerAlpha, October 2012).

From 590d71b9cd5d7b5b257b3d6884ecf699560aa70d Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 13:21:44 +0100
Subject: [PATCH 060/623] Patch for RevoBoot v1.5.30

---
 i386/libsaio/smbios.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/i386/libsaio/smbios.c b/i386/libsaio/smbios.c
index 4b9b051..d99bb64 100755
--- a/i386/libsaio/smbios.c
+++ b/i386/libsaio/smbios.c
@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2009 by Master Chief.
- * Dynamic and static SMBIOS data gathering added by DHP in 2010.
- * Refactorized by DHP in 2011.
+ *
+ * Updates:
+ *
+ *			- Dynamic and static SMBIOS data gathering added by DHP in 2010.
+ *			- Refactorized by DHP in 2011.
+ *			- Get static EFI data (optional) from /Extra/EFI/[MacModelNN].bin (PikerAlpha, October 2012).
  */
 
 #include "platform.h"
 
 #if USE_STATIC_SMBIOS_DATA
-
-#include "smbios/static_data.h"
-
-
 //==============================================================================
 
 void setupSMBIOS(void)
@@ -19,15 +19,13 @@ void setupSMBIOS(void)
 
 	// Allocate 1 page of kernel memory (sufficient for a stripped SMBIOS table).
     void * kernelMemory = (void *)AllocateKernelMemory(4096);
-
+	
 	// Setup a new Entry Point Structure at the beginning of the newly allocated memory page.
 	struct SMBEntryPoint * newEPS = (struct SMBEntryPoint *) kernelMemory;
 
-    int tableLength = sizeof(SMBIOS_Table);
+	// Include additional/conditional code snippet.
+	#include "smbios/static_data.h"
 
-	// Copy the static SMBIOS data into the newly allocated memory page. Right after the new EPS.
-    memcpy((kernelMemory + sizeof(* newEPS)), SMBIOS_Table, tableLength);
-	
     newEPS->anchor[0]			= 0x5f;		// _
     newEPS->anchor[1]			= 0x53;		// S
     newEPS->anchor[2]			= 0x4d;		// M
@@ -69,9 +67,8 @@ void setupSMBIOS(void)
 	_SMBIOS_DEBUG_DUMP("New SMBIOS replacement setup.\n");
 	_SMBIOS_DEBUG_SLEEP(5);
 }
-
 #else
 
 #include "smbios/dynamic_data.h"
 
-#endif
\ No newline at end of file
+#endif // #if USE_STATIC_SMBIOS_DATA

From ba22e0241e8e073777604ae908265129e43401aa Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 13:23:10 +0100
Subject: [PATCH 061/623] Patch for RevoBoot v1.5.30

---
 i386/libsaio/smbios/static_data.h | 40 ++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/smbios/static_data.h b/i386/libsaio/smbios/static_data.h
index eccaefb..9d10db0 100755
--- a/i386/libsaio/smbios/static_data.h
+++ b/i386/libsaio/smbios/static_data.h
@@ -4,6 +4,7 @@
  * Updates:
  *			- Dynamic and static SMBIOS data gathering added by DHP in 2010.
  *			- New path for static EFI data (PikerAlpha, October 2012).
+ *			- Optionally check /Extra/SMBIOS/[MacModelNN.bin] for static SMBIOS data (PikerAlpha, October 2012).
  *
  * Credits:
  *			- blackosx, DB1, dgsga, FKA, humph, scrax and STLVNUB (testers).
@@ -14,12 +15,39 @@
 
 #include "essentials.h"
 
-// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
-#include STRING(SMBIOS_DATA_FILE)
+#if LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA
 
-static uint32_t SMBIOS_Table[] = 
-{
-	STATIC_SMBIOS_DATA	// Will get replaced with the data from: config/smbios/data.h
-};
+	#define STATIC_SMBIOS_DMI_STRUCTURE_COUNT	0
+	#define STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE	0
+
+	extern long loadBinaryData(char *aFilePath, void **aMemoryAddress);
+
+	int tableLength = 0;
+	char dirSpec[32] = "";
+	sprintf(dirSpec, "/Extra/SMBIOS/%s", STRING(STATIC_DATA_FILENAME));
+
+	void * staticSMBIOSData = (void *)kLoadAddr;
+
+	_SMBIOS_DEBUG_DUMP("Loading: %s\n", dirSpec);
+
+	long fileSize = loadBinaryData(dirSpec, &staticSMBIOSData);
+
+	if (fileSize)
+	{
+		tableLength = (int)fileSize;
+		
+		memcpy((kernelMemory + sizeof(* newEPS)), staticSMBIOSData, tableLength);
+	}
+#else
+	// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
+	#include STRING(SMBIOS_DATA_FILE)
+
+	static uint32_t SMBIOS_Table[] =
+	{
+		STATIC_SMBIOS_DATA	// Replaced with data from: RevoBoot/i386/config/SMBIOS/[default/MacModelNN].h
+	};
+
+	int tableLength = sizeof(SMBIOS_Table);
+#endif
 
 #endif /* !__LIBSAIO_SMBIOS_STATIC_DATA_H */

From 8d7298e401d3f0a96c616b6f1b467365c60fe25f Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 13:23:37 +0100
Subject: [PATCH 062/623] Updating version info for RevoBoot v1.5.30

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 32461d5..4578c8a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.25
+1.5.30

From 356b34d788edcd4e835d51f49b26b7cf4df6c73a Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 13:24:59 +0100
Subject: [PATCH 063/623] Updating version info for RevoBoot v1.5.30

---
 CHANGES | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7c1ce7b..3894662 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,9 @@ RevoBoot v1.5.30
 ================
 - Move/update /Extra/ data reading to RevoBoot/i386/libsaio/load.c (PikerAlpha, October 2012).
 - Option to read /Extra/EFI/[MacModelNN.bin] when static EFI data is used (PikerAlpha, October 2012).
-- Option to read /Extra/EFI/[MacModelNN.bin] when static SMBIOS data is used (PikerAlpha, October 2012).
+- Option to read /Extra/SMBIOS/[MacModelNN.bin] when static SMBIOS data is used (PikerAlpha, October 2012).
 - Makefile changes for above features(PikerAlpha, October 2012).
-- VERSION updated to v1.5.30 (SMBIOS changes = WORK IN PROGRESS)
+- VERSION updated to v1.5.30
 
 
 RevoBoot v1.5.25

From 84fe56a40e16afa7b70aeccb3011c4c6d694a64d Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 13:29:11 +0100
Subject: [PATCH 064/623] Patch for RevoBoot v1.5.30

---
 i386/config/settings-template.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 966bcbc..7fab6ba 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -16,6 +16,8 @@
  *			- OVERRIDE_DYNAMIC_PRODUCT_DETECTION removed/no longer supported (PikerAlpha, October 2012).
  *			- INTEL_CORE_TECHNOLOGY per default set to 1 (PikerAlpha, October 2012).
  *			- INJECT_EFI_DEVICE_PROPERTIES per default set to 1 (PikerAlpha, October 2012). 
+ *			- USE_STATIC_EFI_DATA added (PikerAlpha, October 2012).
+ *			- USE_STATIC_SMBIOS_DATA added (PikerAlpha, October 2012).
  *
  */
 
@@ -273,6 +275,9 @@
 #define INJECT_EFI_DEVICE_PROPERTIES	0	// Set to 0 by default. Change this to 1 when you need to inject 'device-properties'.
 											//
 											// Note: Required when not setting device-properties from your DSDT/SSDT.
+#if INJECT_EFI_DEVICE_PROPERTIES
+	#define LOAD_STATIC_EFI_DATA_FROM_EXTRA	1	// Set to 0 by default. Change this to 1 to load: /Extra/EFI/[MacModelNN].bin
+#endif
 
 #define EFI_64_BIT						1	// Set to 1 by default for EFI64 on 64-bit platforms. Supporting both
 											// 32 and 64-bit boot modes (using arch=i386/x86_64 under Kernel Flags).
@@ -330,6 +335,10 @@
 	#undef USE_STATIC_CPU_DATA					// Prevent boot failures due to wrong settings (until I figured out what we are missing).
 #endif
 
+#if USE_STATIC_SMBIOS_DATA
+	#define LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA	0	// Set to 0 by default. Change this to 1 to load: /Extra/SMBIOS/[MacModelNN].bin
+#endif
+
 #define OVERRIDE_DYNAMIC_MEMORY_DETECTION	0	// Set to 0 by default. Change this to 0 only when your SMBIOS data (type 17) is correct, or when
 												// you want/need to override some/all of the SMBIOS data.
 												//

From 0b0aad850b93a80771c57f14a3e84fd13f57a948 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 23:38:49 +0100
Subject: [PATCH 065/623] Updating version info for RevoBoot v1.5.31

---
 CHANGES | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES b/CHANGES
index 3894662..8310316 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+RevoBoot v1.5.31
+================
+- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
+- Restored lost STATIC_SMSERIALNUMBER in setings-template.h (PikerAlpha, October 2012).
+- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
+- VERSION updated to v1.5.31
+
+
 RevoBoot v1.5.30
 ================
 - Move/update /Extra/ data reading to RevoBoot/i386/libsaio/load.c (PikerAlpha, October 2012).

From 29daa6f798d8aedfe0f10259eae275af71caea13 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 23:39:24 +0100
Subject: [PATCH 066/623] Updating version info for RevoBoot v1.5.31

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 4578c8a..3b2f552 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.30
+1.5.31

From 823b7524452489d0993bd7e551afcfb459a33aa2 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 23:42:33 +0100
Subject: [PATCH 067/623] Bug fix for RevoBoot v1.5.31

---
 i386/config/settings-template.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 7fab6ba..a94e8a8 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -18,6 +18,9 @@
  *			- INJECT_EFI_DEVICE_PROPERTIES per default set to 1 (PikerAlpha, October 2012). 
  *			- USE_STATIC_EFI_DATA added (PikerAlpha, October 2012).
  *			- USE_STATIC_SMBIOS_DATA added (PikerAlpha, October 2012).
+ *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
+ *			- Restored lost STATIC_SMSERIALNUMBER (PikerAlpha, October 2012).
+ *			- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
  *
  */
 
@@ -288,7 +291,7 @@
 											//
 											// Note: Do not change this setting, unless you know what you are doing.
 
-#define STATIC_SYSTEM_SERIAL_NUMBER		{ 'S', 'O', 'M', 'E', 'S', 'R', 'L', 'N', 'U', 'M', 'B', 'R' } // Example only!
+#define EFI_SYSTEM_SERIAL_NUMBER		{ 'S', 'O', 'M', 'E', 'S', 'R', 'L', 'N', 'U', 'M', 'B', 'R' } // Example only!
 
 #define STATIC_SYSTEM_ID				{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F } // Example only!
 
@@ -357,6 +360,9 @@
 													//
 													// Note: MACMINI (without _NNN) selects the default model (last one i.e. MACMINI_51).
 
+#define SMB_SYSTEM_SERIAL_NUMBER			"SOMESRLNUMBR" // Example only!
+												// Note: Match this with EFI_SYSTEM_SERIAL_NUMBER
+
 #if (TARGET_MODEL & MACPRO)
 	#define SMB_BOARD_SERIAL_NUMBER			"SOMESRLNUMBR" // Example only!
 #endif

From d94c42eb4a51a68d840a2bc45d2c44f9fb674a01 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 23:44:49 +0100
Subject: [PATCH 068/623] Bug fix for RevoBoot v1.5.31

---
 i386/libsaio/efi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 109511d..561e7ab 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -33,6 +33,7 @@
  *			- Now no longer includes platform.h (PikerAlpha, October 2012).
  *			- Data selector moved over from RevoBoot/i386/config/data.h (PikerAlpha, October 2012).
  *			- Get static EFI data (optional) from /Extra/EFI/[MacModelNN].bin (PikerAlpha, October 2012).
+ *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012). 
  *
  */
 
@@ -50,7 +51,7 @@ void initEFITree(void)
 
 	// The information from RevoBoot/i386/libsaio/SMBIOS/model_data.h is used here.
 	static EFI_CHAR16 const MODEL_NAME[]			= EFI_MODEL_NAME;
-	static EFI_CHAR16 const SYSTEM_SERIAL_NUMBER[]	= STATIC_SYSTEM_SERIAL_NUMBER;
+	static EFI_CHAR16 const SYSTEM_SERIAL_NUMBER[]	= EFI_SYSTEM_SERIAL_NUMBER;
 
 	DT__Initialize(); // Add and initialize gPlatform.DT.RootNode
 

From e73a4953db6e465801bda7dc82a8443c456b3c52 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 30 Oct 2012 23:47:30 +0100
Subject: [PATCH 069/623] Bug fix for RevoBoot v1.5.31

---
 i386/libsaio/smbios/dynamic_data.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index f7c0356..cc92cb1 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -12,6 +12,7 @@
  *			- SMBProperties changed for speed and simplicity (PikerAlpha, October 2012).
  *			- Calls with SMBProperties.keyString cleaned up (PikerAlpha, October 2012).
  *			- Fixed requiredStructures.start/stop values (PikerAlpha, October 2012).
+ *			- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER(PikerAlpha, October 2012).
  *
  * Credits:
  *			- Kabyl (see notes in source code)
@@ -135,7 +136,7 @@ struct SMBProperty SMBProperties[] =
 	{ kSMBTypeSystemInformation,	0x04,	kSMBString,		.plainData		= APPLE_INC					},
 	{ kSMBTypeSystemInformation,	0x05,	kSMBString,		.plainData		= SMB_PRODUCT_NAME			},
 	{ kSMBTypeSystemInformation,	0x06,	kSMBString,		.plainData		= "1.0"						},
-	{ kSMBTypeSystemInformation,	0x07,	kSMBString,		.plainData		= STATIC_SMSERIALNUMBER		},
+	{ kSMBTypeSystemInformation,	0x07,	kSMBString,		.plainData		= SMB_SYSTEM_SERIAL_NUMBER		},
 	{ kSMBTypeSystemInformation,	0x1a,	kSMBString,		.plainData		= SMB_FAMILY				},
 	
 	//----------------------------------------------------------------------------------------------------

From 9e2382b61a3e676912edc957244eee78d2240d25 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 31 Oct 2012 00:25:35 +0100
Subject: [PATCH 070/623] Changed LOAD_STATIC_EFI_DATA_FROM_EXTRA to the
 default setting

---
 i386/config/settings-template.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index a94e8a8..3a1c125 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -279,7 +279,7 @@
 											//
 											// Note: Required when not setting device-properties from your DSDT/SSDT.
 #if INJECT_EFI_DEVICE_PROPERTIES
-	#define LOAD_STATIC_EFI_DATA_FROM_EXTRA	1	// Set to 0 by default. Change this to 1 to load: /Extra/EFI/[MacModelNN].bin
+	#define LOAD_STATIC_EFI_DATA_FROM_EXTRA	0	// Set to 0 by default. Change this to 1 to load: /Extra/EFI/[MacModelNN].bin
 #endif
 
 #define EFI_64_BIT						1	// Set to 1 by default for EFI64 on 64-bit platforms. Supporting both

From 42f885b2ae6eb8d7bf8716ea824b83abe519f224 Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Wed, 31 Oct 2012 20:44:29 +0000
Subject: [PATCH 071/623] Fix settings-template.h for when #define TARGET_MODEL
 = MACPRO

---
 i386/config/settings-template.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 3a1c125..bfa3555 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -363,9 +363,7 @@
 #define SMB_SYSTEM_SERIAL_NUMBER			"SOMESRLNUMBR" // Example only!
 												// Note: Match this with EFI_SYSTEM_SERIAL_NUMBER
 
-#if (TARGET_MODEL & MACPRO)
-	#define SMB_BOARD_SERIAL_NUMBER			"SOMESRLNUMBR" // Example only!
-#endif
+#define SMB_BOARD_SERIAL_NUMBER             "SOMESRLNUMBR" // Example only!
 
 #define DEBUG_SMBIOS						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 

From ffb2f80ab83dd1d64c4af587f64f11b106eeab0e Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Thu, 1 Nov 2012 12:21:15 +0100
Subject: [PATCH 072/623] Bla bla bla

---
 README | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 579854f..283faec 100644
--- a/README
+++ b/README
@@ -1,5 +1,28 @@
-RevoBoot can now be built with Xcode 4.5.1 on Mountain Lion. See change log for instructions.
+About this project:
+This Open Source hobby project is maintained by Pike and dgsga. Two long time supporters of the RevoBoot project.
 
+Note that we do not tolerate/share any (links to) copyrighted material. We only use purchased software and 
+we won't share any of it. Just get your copy of OS X in the Apple store. Should be affordable for everyone.
+
+
+Mountain Lion Server:
+RevoBoot has been confirmed to work with the Server app for Mountain Lion (12C60).
+
+
+Fusion Drive Support:
+Apple's new Fusion Drive* is a software implementation to speedup the load process 
+for frequently used applications, without limiting the storage capacity in a bad way.
+See also: http://support.apple.com/kb/HT5446
+
+RevoBoot has <i>not</i> yet been confirmed to work with a Fusion Drive. We however expect it to work flawlessly.
+
+
+Xcode Support for Mountain Lion:
+RevoBoot can be build on Snow Leopard, Lion and Mountain Lion. The latter requires 
+Xcode 4.5.1 and a libcc_kext.a from an older version of Xcode. See change log for instructions.
+
+
+Configuration:
 Please note that RevoBoot must be configured for your hardware so start reading our WiKi. See also:
 
 https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder
@@ -11,3 +34,5 @@ https://github.com/RevoGirl/RevoBoot/blob/master/i386/config/README
 There's also RevoBuilder (a great tool for first starters) over at:
 
 https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder
+
+Note: RevoBuilder is most likeky broken for RevoBoot v.1.5.00 and greater!

From 22050d70b2c92892c52163cd1a7ae7165631ca44 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Fri, 2 Nov 2012 23:45:11 +0100
Subject: [PATCH 073/623] Fusion Drive note updated

---
 README | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/README b/README
index 283faec..1f6ac8c 100644
--- a/README
+++ b/README
@@ -1,25 +1,22 @@
 About this project:
 This Open Source hobby project is maintained by Pike and dgsga. Two long time supporters of the RevoBoot project.
 
-Note that we do not tolerate/share any (links to) copyrighted material. We only use purchased software and 
-we won't share any of it. Just get your copy of OS X in the Apple store. Should be affordable for everyone.
-
+Note that we do not tolerate/share any (links to) copyrighted material. We only use purchased software and we won't share any of it. Just get your copy of OS X in the Apple store. Should be affordable for everyone.
 
 Mountain Lion Server:
 RevoBoot has been confirmed to work with the Server app for Mountain Lion (12C60).
 
-
 Fusion Drive Support:
-Apple's new Fusion Drive* is a software implementation to speedup the load process 
-for frequently used applications, without limiting the storage capacity in a bad way.
+Apple's new Fusion Drive* is a software implementation to speedup the boot and load process for frequently used applications, without limiting the storage capacity in a bad way.
 See also: http://support.apple.com/kb/HT5446
 
-RevoBoot has <i>not</i> yet been confirmed to work with a Fusion Drive. We however expect it to work flawlessly.
+The new Mac's that come with a Fusion Drive boot from the third (Recovery HD like) partition on the SSD. This partition in 134.2 MB in size and is called "Boot OS X".
+The Recovery HD partition can be found as third partition on the HDD. Setting up a Fusion Drive on a Mac needs to be done with Internet Recovery.
 
+RevoBoot detects CoreStorage partitions and will boot from the boot helper partition on the SDD.
 
 Xcode Support for Mountain Lion:
-RevoBoot can be build on Snow Leopard, Lion and Mountain Lion. The latter requires 
-Xcode 4.5.1 and a libcc_kext.a from an older version of Xcode. See change log for instructions.
+RevoBoot can be build on Snow Leopard, Lion and Mountain Lion. The latter requires Xcode 4.5.1 and a libcc_kext.a from an older version of Xcode. See change log for instructions.
 
 
 Configuration:

From 652aca3c12db62c9fc17abad74f9d8e785d14c80 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 12:31:34 +0100
Subject: [PATCH 074/623] Typo

---
 README | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 1f6ac8c..9da40cd 100644
--- a/README
+++ b/README
@@ -7,11 +7,10 @@ Mountain Lion Server:
 RevoBoot has been confirmed to work with the Server app for Mountain Lion (12C60).
 
 Fusion Drive Support:
-Apple's new Fusion Drive* is a software implementation to speedup the boot and load process for frequently used applications, without limiting the storage capacity in a bad way.
-See also: http://support.apple.com/kb/HT5446
+Apple's new Fusion Drive* is a software implementation to speedup the boot and load process for frequently used applications, without limiting the storage capacity in a bad way. See also: http://support.apple.com/kb/HT5446
 
-The new Mac's that come with a Fusion Drive boot from the third (Recovery HD like) partition on the SSD. This partition in 134.2 MB in size and is called "Boot OS X".
-The Recovery HD partition can be found as third partition on the HDD. Setting up a Fusion Drive on a Mac needs to be done with Internet Recovery.
+The new Mac's that come with a Fusion Drive boot from the third (Recovery HD like) partition on the SSD. This partition is 134.2 MB in size and is called "Boot OS X".
+The Recovery HD partition can be found as third partition on the HDD. Setting up a Fusion Drive on a Mac need to be done with Internet Recovery.
 
 RevoBoot detects CoreStorage partitions and will boot from the boot helper partition on the SDD.
 

From 6839bf37b5013cc0e72535c6a573d8a5b42c5af9 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 12:51:15 +0100
Subject: [PATCH 075/623] Fusion Drive cleanups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change was originally scheduled for RevoBoot v1.5.50 but is now
pushed forward and already part of v1.5.32, simply because people are
starting to experiment with Apple's Fusion Drive.
---
 i386/libsaio/disk.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index 8ba0d5c..4ab3e3e 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -49,9 +49,13 @@
     GPT support added by David Elliott.  Based on IOGUIDPartitionScheme.cpp.
  */
 
-/***
-  * Cleanups and refactoring by DHP in 2010 and 2011.
-  */
+/*
+ * Updates:
+ *		- Cleanups and refactoring by DHP in 2010 and 2011.
+ *		- Renamed LION_RECOVERY_SUPPORT to CORE_STARAGE_SUPPORT (PikerAlpha, November 2012).
+ *		- Renamed LION_FILEVAULT_SUPPORT to CORE_STARAGE_SUPPORT (PikerAlpha, November 2012).
+ *		- Renamed encryptedBootPartition to coreStoragePartition (PikerAlpha, November 2012).
+ */
 
 
 #include "bootstruct.h"
@@ -117,7 +121,7 @@ static struct disk_blk0 * gBootSector = NULL;
 // Apple_HFS
 EFI_GUID const GPT_HFS_GUID					= { 0x48465300, 0x0000, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
 
-#if LION_RECOVERY_SUPPORT || APPLE_RAID_SUPPORT
+#if CORE_STORAGE_SUPPORT || APPLE_RAID_SUPPORT
 	// Apple_Boot (RAID helper partition and the 650 MB 'Recovery HD' partition).
 	EFI_GUID const GPT_BOOT_GUID			= { 0x426F6F74, 0x0000, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
 #endif
@@ -140,8 +144,8 @@ EFI_GUID const GPT_HFS_GUID					= { 0x48465300, 0x0000, 0x11AA, { 0xAA, 0x11, 0x
     EFI_GUID const GPT_EFISYS_GUID			= { 0xC12A7328, 0xF81F, 0x11D2, { 0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B } };
 #endif
 
-#if LION_FILEVAULT_SUPPORT
-	// Apple_CoreStorage (FileVault 2)
+#if CORE_STORAGE_SUPPORT
+	// Apple_CoreStorage (FileVault 2 and Fusion Drive)
 	EFI_GUID const GPT_CORESTORAGE_GUID		= { 0x53746F72, 0x6167, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
 #endif
 
@@ -560,8 +564,8 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 								map->next		= gDiskBVMap;
 								gDiskBVMap		= map;
 
-#if LION_FILEVAULT_SUPPORT
-								bool encryptedBootPartition = false;
+#if CORE_STORAGE_SUPPORT
+								bool codeStoragePartition = false;
 #endif
 
 								for (; gptID <= gptCount; gptID++)
@@ -615,16 +619,16 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 										else
 #endif
 
-#if LION_FILEVAULT_SUPPORT				// Is this an encrypted boot partition?
+#if CORE_STORAGE_SUPPORT							// Is this a CoreStorage partition?
 										if (efi_guid_compare(&GPT_CORESTORAGE_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
 										{
 											_DISK_DEBUG_DUMP("Matched: CoreStorage GUID\n");
 
-											encryptedBootPartition = true;
+											coreStoragePartition = true;
 											
 											continue; // Start searching for the Recovery HD partition.
 										}
-										else if (!encryptedBootPartition && 
+										else if (!coreStoragePartition && 
 #else
 										// Check for HFS+ partitions.
 										if (
@@ -644,7 +648,7 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 										}
 #endif
 
-#if LION_RECOVERY_SUPPORT || APPLE_RAID_SUPPORT
+#if CORE_STORAGE_SUPPORT || APPLE_RAID_SUPPORT
 										else if (efi_guid_compare(&GPT_BOOT_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
 										{
 											_DISK_DEBUG_DUMP("Matched: GPT_BOOT_GUID\n");

From 5271e5f03914f740d1e4a3b9594287e20b465d1a Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 13:30:12 +0100
Subject: [PATCH 076/623] Fusion Drive cleanups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change was originally scheduled for RevoBoot v1.5.50 but is now 
pushed forward and already part of v1.5.32, simply because people are 
starting to experiment with Apple's Fusion Drive
---
 i386/boot2/boot.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 71ccc49..90302c4 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -47,7 +47,9 @@
  */
 
 /* 
- * Refactorized by DHP in 2010 and 2011.
+ * Updates:
+ *		- Refactorized by DHP in 2010 and 2011.
+ *		- Optionally include Recovery HD support code (PikerAlpha, November 2012).
  */
 
 
@@ -193,6 +195,7 @@ void boot(int biosdev)
 	showBootLogo();
 #endif
 
+#if LION_RECOVERY_SUPPORT
 	// A bit ugly maybe, but this will be changed sometime soon.
 	while (readKeyboardStatus())
 	{
@@ -203,6 +206,7 @@ void boot(int biosdev)
 			gPlatform.BootRecoveryHD = true;
 		}
 	}
+#endif
 
 #if (LOAD_STATIC_EFI_DATA_FROM_EXTRA == 0)
 	/*

From 59326fb922dd10d56b5593e857bcab8091efe27f Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 13:30:48 +0100
Subject: [PATCH 077/623] Updating version info for RevoBoot v1.5.32

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 3b2f552..6062bd9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.31
+1.5.32

From 08a77be51bc446de73b6a7e7dba5d742dad64154 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 13:36:24 +0100
Subject: [PATCH 078/623] Updating for RevoBoot v1.5.32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Parts of this change was originally scheduled for RevoBoot v1.5.50 but is now 
pushed forward and already part of v1.5.32, simply because people are 
starting to experiment with Apple's Fusion Drive
---
 CHANGES | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES b/CHANGES
index 8310316..914769c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+RevoBoot v1.5.32
+================
+- Optionally include Recovery HD support code in boot.c (PikerAlpha, October 2012).
+- Renamed LION_RECOVERY_SUPPORT to CORE_STARAGE_SUPPORT in disk.c (PikerAlpha, October 2012).
+- Renamed LION_FILEVAULT_SUPPORT to CORE_STARAGE_SUPPORT in disk.c (PikerAlpha, November 2012).
+- Renamed encryptedBootPartition to coreStoragePartition in disk.c (PikerAlpha, October 2012).
+- Cleaned up settings-template.h (PikerAlpha, October 2012).
+- VERSION updated to v1.5.32
+
+
 RevoBoot v1.5.31
 ================
 - STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).

From 9b0e500a7717cc1b7a538b1d930b398e5a994975 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 13:41:17 +0100
Subject: [PATCH 079/623] Cleanups
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change was originally scheduled for RevoBoot v1.5.50 but is now 
pushed forward and already part of v1.5.32, simply because people are 
starting to experiment with Apple's Fusion Drive
---
 i386/config/settings-template.h | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index bfa3555..114bfb8 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -197,6 +197,9 @@
 
 #define SAFE_MALLOC						0	// Set to 0 by default. Change this to 1 when booting halts with a memory allocation error.
 
+#define LION_RECOVERY_SUPPORT			0	// Set to 0 by default. Change this to 1 to make RevoBoot search for the 'Recovery HD'
+										// partition and, when available, boot from it.
+
 #define DEBUG_BOOT						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
 
@@ -256,8 +259,13 @@
 
 #define LEGACY_BIOS_READ_SUPPORT		0	// Set to 0 by default. Change this to 1 for crappy old BIOSes.
 
-#define LION_FILEVAULT_SUPPORT			0	// Set to 0 by default.  Setting this to 1 will make RevoBoot skip encrypted boot partitions
-											// and boot from the Recovery HD partition instead (when available).
+#if LION_RECOVERY_SUPPORT
+	#define CORE_STORAGE_SUPPORT		1	// Set to 0 by default since booting from a 'Recovery HD' partition may requires us to skip
+											// (encrypted) CoreStorage partitions.
+#else
+	#define CORE_STORAGE_SUPPORT		0	// Set to 0 by default. Change this to 1 when you want RevoBoot to boot from the 'Boot OS X'
+											// (usually the third) partition on a Fusion Drive (requires Mountain Lion 10.8.2).
+#endif
 
 #define APPLE_RAID_SUPPORT				0	// Set to 0 by default. Change this to 1 for Apple Software RAID support.
 
@@ -314,17 +322,7 @@
 #define DEBUG_BOOT_GRAPHICS				0	// Set to 0 by default. Use 1 when to see debug info.
 
 
-//------------------------------------------------------------ STRINGDATA.H ----------------------------------------------------------------
-
-#define LION_FILEVAULT_SUPPORT			0	// Set to 0 by default.  Setting this to 1 will make RevoBoot skip encrypted boot partitions
-											// and boot from the Recovery HD partition instead (when available).
-
-#if LION_FILEVAULT_SUPPORT
-	#define LION_RECOVERY_SUPPORT		1	// Make RevoBoot search for the Recovery HD partition and boot from it (when available).
-#else
-	#define LION_RECOVERY_SUPPORT		0	// Set to 0 by default. Setting this to 1 will make RevoBoot search for the Recovery HD and
-											// try to boot from it, when it is properly setup and modified for RevoBoot.
-#endif
+//------------------------------------------------------------ STRINGTABLE.H ----------------------------------------------------------------
 
 #define LION_INSTALL_SUPPORT			0	// Set to 0 by default. Setting this to 1 will make RevoBoot search in specific directories
 											// for com.apple.Boot.plist – required for Mac like Lion OS X installations.

From f43a90d9b94f22c72d3d206e2805de6be761c836 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 14:11:50 +0100
Subject: [PATCH 080/623] Fix compilation error for plain ./r

---
 r | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/r b/r
index 73954b6..530f117 100755
--- a/r
+++ b/r
@@ -20,9 +20,9 @@ if [[ "$1" =~ [iMac|Mac] ]];
       make MODEL=`cat MODEL` > out.log
     else
       #
-      # No default model found.
+      # No default model found. Use the default (matches settings-template.h)
       #
-      make > out.log
+      make MODEL=Macmini > out.log
     fi;
 fi
 

From d4827d6d871ec7c9dfab408a00814e56437211f4 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 14:30:43 +0100
Subject: [PATCH 081/623] Typos

---
 i386/libsaio/disk.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index 4ab3e3e..585774c 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -565,7 +565,7 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 								gDiskBVMap		= map;
 
 #if CORE_STORAGE_SUPPORT
-								bool codeStoragePartition = false;
+								bool coreStoragePartition = false;
 #endif
 
 								for (; gptID <= gptCount; gptID++)
@@ -619,14 +619,14 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 										else
 #endif
 
-#if CORE_STORAGE_SUPPORT							// Is this a CoreStorage partition?
+#if CORE_STORAGE_SUPPORT						// Is this a CoreStorage partition?
 										if (efi_guid_compare(&GPT_CORESTORAGE_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
 										{
 											_DISK_DEBUG_DUMP("Matched: CoreStorage GUID\n");
 
 											coreStoragePartition = true;
 											
-											continue; // Start searching for the Recovery HD partition.
+											continue; // Start searching for the Recovery HD/Boot OS X partition.
 										}
 										else if (!coreStoragePartition && 
 #else

From e15243ed2643ca9968f000e11fb814cf057bc936 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 14:40:30 +0100
Subject: [PATCH 082/623] Removed a debug printf()

---
 i386/libsaio/load.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 51e8cf1..2b89f0e 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -439,8 +439,6 @@ long loadBinaryData(char *aFilePath, void **aMemoryAddress)
 {
 	long fileSize = LoadFile(aFilePath);
 
-	printf("fileSize is: %ld", fileSize);
-
 	if (fileSize > 0)
 	{
 		*aMemoryAddress = (void *)malloc(fileSize);

From 9863ee6f6ab4912ffc439cb2b1778346bb024ac2 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 16:02:26 +0100
Subject: [PATCH 083/623] Fix for static SMBIOS bug for RevoBoot v1.5.33

---
 i386/libsaio/smbios/static_data.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/i386/libsaio/smbios/static_data.h b/i386/libsaio/smbios/static_data.h
index 9d10db0..a26a48b 100755
--- a/i386/libsaio/smbios/static_data.h
+++ b/i386/libsaio/smbios/static_data.h
@@ -5,6 +5,7 @@
  *			- Dynamic and static SMBIOS data gathering added by DHP in 2010.
  *			- New path for static EFI data (PikerAlpha, October 2012).
  *			- Optionally check /Extra/SMBIOS/[MacModelNN.bin] for static SMBIOS data (PikerAlpha, October 2012).
+ *			- Oops. Restoring lost lines (PikerAlpha, November 2012).
  *
  * Credits:
  *			- blackosx, DB1, dgsga, FKA, humph, scrax and STLVNUB (testers).
@@ -48,6 +49,9 @@
 	};
 
 	int tableLength = sizeof(SMBIOS_Table);
+
+	// Copy the static SMBIOS data into the newly allocated memory page. Right after the new EPS.
+	memcpy((kernelMemory + sizeof(* newEPS)), SMBIOS_Table, tableLength);
 #endif
 
 #endif /* !__LIBSAIO_SMBIOS_STATIC_DATA_H */

From b0785fde486443ff3f53c47b340e583f4bd4f541 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 16:03:12 +0100
Subject: [PATCH 084/623] Updating version info for RevoBoot v1.5.33

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 6062bd9..a26e0a8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.32
+1.5.33

From 31fe24fe3c9a0107d0b00e41ac0955d78b4a3850 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 16:05:07 +0100
Subject: [PATCH 085/623] Update to RevoBoot v1.5.33

---
 CHANGES | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES b/CHANGES
index 914769c..008d1cf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+RevoBoot v1.5.33
+================
+- Restored lost lines in RevoBoot/i386/libsaio/SMBIOS/static_data.h (PikerAlpha, November 2012).
+
+
 RevoBoot v1.5.32
 ================
 - Optionally include Recovery HD support code in boot.c (PikerAlpha, October 2012).

From bb4c68fdb6256ac9d8a63c90f4729e1366e0a5d3 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 18:49:04 +0100
Subject: [PATCH 086/623] Patch for RevoBoot v1.5.34

---
 i386/boot2/boot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 90302c4..47d7524 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -46,7 +46,7 @@
  * Reworked again by Curtis Galloway (galloway@NeXT.com)
  */
 
-/* 
+/*
  * Updates:
  *		- Refactorized by DHP in 2010 and 2011.
  *		- Optionally include Recovery HD support code (PikerAlpha, November 2012).
@@ -208,7 +208,7 @@ void boot(int biosdev)
 	}
 #endif
 
-#if (LOAD_STATIC_EFI_DATA_FROM_EXTRA == 0)
+#if (LOAD_MODEL_SPECIFIC_EFI_DATA == 0)
 	/*
 	 * We can only make this call here when static EFI is included from
 	 * RevoBoot/i386/config/EFI/[MacModelNN.h] Not when the data is read

From 1f9ac1685c75b709f6f4d85dc7a4a089e5ebbe9a Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 18:50:31 +0100
Subject: [PATCH 087/623] Patch for RevoBoot v1.5.34

---
 i386/libsa/libsa.h | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/i386/libsa/libsa.h b/i386/libsa/libsa.h
index 14d3ef8..7cba5a5 100755
--- a/i386/libsa/libsa.h
+++ b/i386/libsa/libsa.h
@@ -73,16 +73,8 @@ extern char * strdup(const char *s1);
 	extern int    strncasecmp(const char * s1, const char * s2, size_t n);
 #endif
 
-extern uint8_t checksum8( void * start, unsigned int length );
-
-#if CHAMELEON
-	/*
-	 * error.c
-	 */
-
-	extern int    errno;
-	extern char * strerror(int errnum);
-#endif
+extern uint8_t checksum8( void * start, unsigned int length);
+char * removeChar(char *aSourceString, char aTargetChar);
 
 /*
  * strtol.c

From 3280cf8e482fe21f18054e487c449756bb725771 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 18:51:38 +0100
Subject: [PATCH 088/623] Patch for RevoBoot v1.5.34

---
 i386/libsa/string.c | 88 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 86 insertions(+), 2 deletions(-)

diff --git a/i386/libsa/string.c b/i386/libsa/string.c
index 6919fe9..2e58d88 100755
--- a/i386/libsa/string.c
+++ b/i386/libsa/string.c
@@ -25,6 +25,9 @@
 
 #include "libsa.h"
 
+
+//==========================================================================
+
 void * memset(void * dst, int val, size_t len)
 {
     asm volatile ( "rep; stosb"
@@ -36,6 +39,8 @@ void * memset(void * dst, int val, size_t len)
 }
 
 #if 0
+//==========================================================================
+
 void * memcpy(void * dst, const void * src, size_t len)
 {
     asm volatile ( "rep; movsb"
@@ -46,17 +51,25 @@ void * memcpy(void * dst, const void * src, size_t len)
     return dst;
 }
 
+
+//==========================================================================
+
 void bcopy(const void * src, void * dst, size_t len)
 {
 	memcpy(dst, src, len);
 }
 
+
+//==========================================================================
+
 void bzero(void * dst, size_t len)
 {
     memset(dst, 0, len);
 }
 
 #else
+//==========================================================================
+
 void * memcpy(void * dst, const void * src, size_t len)
 {
     asm volatile ( "cld                  \n\t"
@@ -73,6 +86,9 @@ void * memcpy(void * dst, const void * src, size_t len)
     return dst;
 }
 
+
+//==========================================================================
+
 void bcopy(const void * src, void * dst, size_t len)
 {
     asm volatile ( "cld                  \n\t"
@@ -87,6 +103,9 @@ void bcopy(const void * src, void * dst, size_t len)
        : "memory", "%edx" );
 }
 
+
+//==========================================================================
+
 void bzero(void * dst, size_t len)
 {
     asm volatile ( "xorl %%eax, %%eax    \n\t"
@@ -104,20 +123,23 @@ void bzero(void * dst, size_t len)
 #endif
 
 /* #if DONT_USE_GCC_BUILT_IN_STRLEN */
-
 #define tolower(c)     ((int)((c) & ~0x20))
 #define toupper(c)     ((int)((c) | 0x20))
 
+//==========================================================================
+
 int strlen(const char * s)
 {
 	int n = 0;
 	while (*s++) n++;
 	return(n);
 }
-
 /*#endif*/
 
+
+//==========================================================================
 /* NOTE: Moved from ntfs.c */
+
 int memcmp(const void *p1, const void *p2, int len)
 {
     while (len--) {
@@ -127,6 +149,9 @@ int memcmp(const void *p1, const void *p2, int len)
     return 0;
 }
 
+
+//==========================================================================
+
 int strcmp(const char * s1, const char * s2)
 {
 	while (*s1 && (*s1 == *s2)) {
@@ -136,6 +161,9 @@ int strcmp(const char * s1, const char * s2)
 	return (*s1 - *s2);
 }
 
+
+//==========================================================================
+
 int strncmp(const char * s1, const char * s2, size_t len)
 {
 	register int n = len;
@@ -145,6 +173,9 @@ int strncmp(const char * s1, const char * s2, size_t len)
 	return(n<0 ? 0 : *s1 - *--s2);
 }
 
+
+//==========================================================================
+
 char * strcpy(char * s1, const char * s2)
 {
 	register char *ret = s1;
@@ -153,6 +184,9 @@ char * strcpy(char * s1, const char * s2)
 	return ret;
 }
 
+
+//==========================================================================
+
 char * strncpy(char * s1, const char * s2, size_t n)
 {
 	register char *ret = s1;
@@ -161,6 +195,9 @@ char * strncpy(char * s1, const char * s2, size_t n)
 	return ret;
 }
 
+
+//==========================================================================
+
 char * strlcpy(char * s1, const char * s2, size_t n)
 {
 	register char *ret = s1;
@@ -170,6 +207,9 @@ char * strlcpy(char * s1, const char * s2, size_t n)
 	return ret;
 }
 
+
+//==========================================================================
+
 char * strstr(const char *in, const char *str)
 {
     char c;
@@ -193,6 +233,9 @@ char * strstr(const char *in, const char *str)
     return (char *) (in - 1);
 }
 
+
+//==========================================================================
+
 int ptol(const char *str)
 {
 	register int c = *str;
@@ -205,6 +248,9 @@ int ptol(const char *str)
 	return c;
 }
 
+
+//==========================================================================
+
 int atoi(const char *str)
 {
 	register int sum = 0;
@@ -217,6 +263,9 @@ int atoi(const char *str)
 	return sum;
 }
 
+
+//==========================================================================
+
 char *strncat(char *s1, const char *s2, size_t n)
 {
 	register char *ret = s1;
@@ -228,17 +277,25 @@ char *strncat(char *s1, const char *s2, size_t n)
 	return ret;
 }
 
+
+//==========================================================================
+
 char *strcat(char *s1, const char *s2)
 {
 	return(strncat(s1, s2, strlen(s2)));
 }
 
+
+//==========================================================================
+
 char *strdup(const char *s1)
 {
 	return strcpy(malloc(strlen(s1) + 1), s1);
 }
 
+
 #if STRNCASECMP
+//==========================================================================
 int strncasecmp(const char *s1, const char *s2, size_t len)
 {
 	register int n = len;
@@ -249,7 +306,10 @@ int strncasecmp(const char *s1, const char *s2, size_t len)
 }
 #endif
 
+
+//==========================================================================
 /* COPYRIGHT NOTICE: checksum8 from AppleSMBIOS */
+
 uint8_t checksum8( void * start, unsigned int length )
 {
     uint8_t   csum = 0;
@@ -262,3 +322,27 @@ uint8_t checksum8( void * start, unsigned int length )
     return csum;
 }
 
+
+#if LOAD_MODEL_SPECIFIC_STATIC_DATA
+//==========================================================================
+
+char * removeChar(char *aSourceString, char aTargetChar)
+{
+	char *source = aSourceString;
+	char *destination = aSourceString;
+	
+    for (; *source != '\0'; source++)
+	{
+		*destination = *source;
+		
+        if (*destination != aTargetChar)
+		{
+			destination++;
+		}
+    }
+	
+	*destination = '\0';
+	
+	return (aSourceString);
+}
+#endif

From bdbc525c8d995919cf176cc76f63b96461f1072d Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 18:53:06 +0100
Subject: [PATCH 089/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/disk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index 585774c..6335e14 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -619,7 +619,7 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 										else
 #endif
 
-#if CORE_STORAGE_SUPPORT						// Is this a CoreStorage partition?
+#if CORE_STORAGE_SUPPORT				// Is this a CoreStorage partition?
 										if (efi_guid_compare(&GPT_CORESTORAGE_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
 										{
 											_DISK_DEBUG_DUMP("Matched: CoreStorage GUID\n");

From a80f048ea80ae4cc187a78bbc2e2865c2ecc8466 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 18:54:21 +0100
Subject: [PATCH 090/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/efi.c | 57 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 561e7ab..77f7df7 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -33,7 +33,7 @@
  *			- Now no longer includes platform.h (PikerAlpha, October 2012).
  *			- Data selector moved over from RevoBoot/i386/config/data.h (PikerAlpha, October 2012).
  *			- Get static EFI data (optional) from /Extra/EFI/[MacModelNN].bin (PikerAlpha, October 2012).
- *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012). 
+ *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
  *
  */
 
@@ -41,6 +41,26 @@
 #include "efi/fake_efi.h"
 
 
+/* #if LOAD_MODEL_SPECIFIC_EFI_DATA
+//==============================================================================
+
+void useStaticEFIProperties(Node * aEFINode)
+{
+	// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
+	#include STRING(EFI_DATA_FILE)
+	
+	static EFI_UINT8 const EFI_DEVICE_PROPERTIES[] =
+	{
+		// Replaced with data from: RevoBoot/i386/config/EFI/[data-template/MacModelNN].h
+		STATIC_EFI_DEVICE_PROPERTIES
+	};
+	
+	DT__AddProperty(aEFINode, "device-properties", sizeof(EFI_DEVICE_PROPERTIES), (EFI_CHAR8*) &EFI_DEVICE_PROPERTIES);
+	
+	// _EFI_DEBUG_DUMP("Using statically linked EFI device-properties\n");
+}
+#endif */
+
 //==============================================================================
 
 void initEFITree(void)
@@ -177,33 +197,46 @@ void initEFITree(void)
 	gPlatform.EFI.Nodes.Chosen = chosenNode;
 
 #if INJECT_EFI_DEVICE_PROPERTIES
-	_EFI_DEBUG_DUMP("Injecting static EFI device-properties [%s]\n", SMB_PRODUCT_NAME);
+	_EFI_DEBUG_DUMP("Injecting static EFI device-properties\n");
 
-	#if LOAD_STATIC_EFI_DATA_FROM_EXTRA
-		extern long loadBinaryData(char *aFilePath, void **aMemoryAddress);
-	
+	#if LOAD_MODEL_SPECIFIC_EFI_DATA
 		char dirSpec[32] = "";
-		sprintf(dirSpec, "/Extra/EFI/%s", STRING(STATIC_DATA_FILENAME));
-
-		void * staticEFIData = (void *)kLoadAddr;
+		sprintf(dirSpec, "/Extra/EFI/%s.bin", gPlatform.CommaLessModelID);
 
 		_EFI_DEBUG_DUMP("Loading: %s\n", dirSpec);
 
+		void * staticEFIData = (void *)kLoadAddr;
+
 		long fileSize = loadBinaryData(dirSpec, &staticEFIData);
-	
-		if (fileSize)
+
+		if (fileSize > 0)
 		{
 			DT__AddProperty(efiNode, "device-properties", fileSize, (EFI_CHAR8*) staticEFIData);
 		}
+		else // No model specific data found. Use static EFI data from RevoBoot/i386/config/EFI
+		{
+			// useStaticEFIProperties(efiNode);
+			// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
+			#include STRING(EFI_DATA_FILE)
+			
+			static EFI_UINT8 const EFI_DEVICE_PROPERTIES[] =
+			{
+				// Replaced with data from: RevoBoot/i386/config/EFI/[data-template/MacModelNN].h
+				STATIC_EFI_DEVICE_PROPERTIES
+			};
+			
+			DT__AddProperty(efiNode, "device-properties", sizeof(EFI_DEVICE_PROPERTIES), (EFI_CHAR8*) &EFI_DEVICE_PROPERTIES);
+		}
 	#else
 		// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
 		#include STRING(EFI_DATA_FILE)
-
+	
 		static EFI_UINT8 const EFI_DEVICE_PROPERTIES[] =
 		{
+			// Replaced with data from: RevoBoot/i386/config/EFI/[data-template/MacModelNN].h
 			STATIC_EFI_DEVICE_PROPERTIES
 		};
-
+	
 		DT__AddProperty(efiNode, "device-properties", sizeof(EFI_DEVICE_PROPERTIES), (EFI_CHAR8*) &EFI_DEVICE_PROPERTIES);
 	#endif
 #endif

From d00b7b84b93759d89c7e75f519ecb83fcc3f191d Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 18:55:24 +0100
Subject: [PATCH 091/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/acpi.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/i386/libsaio/acpi.c b/i386/libsaio/acpi.c
index 3b97a80..baaa8fd 100755
--- a/i386/libsaio/acpi.c
+++ b/i386/libsaio/acpi.c
@@ -26,6 +26,9 @@
  * EFI implementation for Revolution Copyright (c) 2010 by DHP.
  * All rights reserved.
  *
+ * Updates:
+ *
+ *			- Moved #include to end of file, eliminating need of extern in patcher.h (PikerAlpha, October 2012).
  */
 
 
@@ -72,29 +75,19 @@ void updateACPITableData(struct acpi_2_rsdp * rsdp, struct acpi_2_xsdt * xsdt, i
 
 
 #if APPLE_STYLE_ACPI
-
 	//------------------------- Used in acpi/patcher.h -------------------------
-
 	#define _ACPI_SET(target, str, len) strncpy(target, str, len)
 	#define _ACPI_SET_APPLE_OEMID(target) _ACPI_SET((target)->OEMID, "Apple ", 6)
 	#define _ACPI_SET_APPLE_OEMTargetID(target) _ACPI_SET((target)->OEMTableID, "Apple00", 8)
-
 	//--------------------------------------------------------------------------
-
 #else
-
 	//--------------------------- Void replacements ----------------------------
-
 	#define _ACPI_SET(target, str, len)
 	#define _ACPI_SET_APPLE_OEMID(target)
 	#define _ACPI_SET_APPLE_OEMTargetID(target)
-
 	//--------------------------------------------------------------------------
-
 #endif
 
-#include "acpi/patcher.h" // Macro's in this include file must be live now.
-
 
 //==============================================================================
 // Original version written by macerintel (?). Rewrite by Master Chief in 2009.
@@ -136,4 +129,4 @@ struct acpi_2_rsdp * getACPIBaseAddress()
 #endif
 }
 
-
+#include "acpi/patcher.h" // Macro's in this include file must be live now.

From 8c7f7b31629a5db1fd31da86760812a17d293af3 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 18:56:29 +0100
Subject: [PATCH 092/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/acpi/essentials.h | 53 +++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/i386/libsaio/acpi/essentials.h b/i386/libsaio/acpi/essentials.h
index 5d1486b..0b66f09 100644
--- a/i386/libsaio/acpi/essentials.h
+++ b/i386/libsaio/acpi/essentials.h
@@ -53,30 +53,55 @@ typedef struct static_acpi_2_table
 	int		tableLength;
 	bool	loaded;
 	void	* tableAddress;
+#if LOAD_MODEL_SPECIFIC_ACPI_DATA
+	char	fileName[32];
+#endif
 } __attribute__((packed)) ACPITable;
 
 
 static ACPITable customTables[] =
 {
+#if LOAD_MODEL_SPECIFIC_ACPI_DATA
 	// Essential tables.
-	{ "APIC",		APIC_Table,			sizeof(APIC_Table),			false,	0 },
-	{ "ECDT",		ECDT_Table,			sizeof(ECDT_Table),			false,	0 },
-	{ "HPET",		HPET_Table,			sizeof(HPET_Table),			false,	0 },
-	{ "MCFG",		MCFG_Table,			sizeof(MCFG_Table),			false,	0 },
-	{ "SBST",		SBST_Table,			sizeof(SBST_Table),			false,	0 },
-	{ "SSDT",		SSDT_Table,			sizeof(SSDT_Table),			false,	0 },
+	{ "APIC",		APIC_Table,			sizeof(APIC_Table),			false,	0,	""	},
+	{ "ECDT",		ECDT_Table,			sizeof(ECDT_Table),			false,	0,	""	},
+	{ "HPET",		HPET_Table,			sizeof(HPET_Table),			false,	0,	""	},
+	{ "MCFG",		MCFG_Table,			sizeof(MCFG_Table),			false,	0,	""	},
+	{ "SBST",		SBST_Table,			sizeof(SBST_Table),			false,	0,	""	},
+	{ "SSDT",		SSDT_Table,			sizeof(SSDT_Table),			false,	0,	""	},
 
 	// Special essential tables.
-	{ "DSDT",		DSDT_Table,			sizeof(DSDT_Table),			false,	0 },
-	{ "FACS",		FACS_Table,			sizeof(FACS_Table),			false,	0 },
+	{ "DSDT",		DSDT_Table,			sizeof(DSDT_Table),			false,	0,	""	},
+	{ "FACS",		FACS_Table,			sizeof(FACS_Table),			false,	0,	""	},
 
 	// Optional tables.
-	{ "APIC-1",		APIC2_Table,		sizeof(APIC2_Table),		false,	0 },
-	{ "SSDT_GPU",	SSDT_GPU_Table,		sizeof(SSDT_GPU_Table),		false,	0 },
-	{ "SSDT_PR",	SSDT_PR_Table,		sizeof(SSDT_PR_Table),		false,	0 },	
-	{ "SSDT_SATA",	SSDT_SATA_Table,	sizeof(SSDT_SATA_Table),	false,	0 },
-	{ "SSDT_USB",	SSDT_USB_Table,		sizeof(SSDT_USB_Table),		false,	0 },
-	{ "",			0,					0,							false,	0 }
+	{ "APIC-1",		APIC2_Table,		sizeof(APIC2_Table),		false,	0,	""	},
+	{ "SSDT_GPU",	SSDT_GPU_Table,		sizeof(SSDT_GPU_Table),		false,	0,	""	},
+	{ "SSDT_PR",	SSDT_PR_Table,		sizeof(SSDT_PR_Table),		false,	0,	""	},
+	{ "SSDT_SATA",	SSDT_SATA_Table,	sizeof(SSDT_SATA_Table),	false,	0,	""	},
+	{ "SSDT_USB",	SSDT_USB_Table,		sizeof(SSDT_USB_Table),		false,	0,	""	},
+	{ "",			0,					0,							false,	0,	""	}
+#else
+	// Essential tables.
+	{ "APIC",		APIC_Table,			sizeof(APIC_Table),			false,	0	},
+	{ "ECDT",		ECDT_Table,			sizeof(ECDT_Table),			false,	0	},
+	{ "HPET",		HPET_Table,			sizeof(HPET_Table),			false,	0	},
+	{ "MCFG",		MCFG_Table,			sizeof(MCFG_Table),			false,	0	},
+	{ "SBST",		SBST_Table,			sizeof(SBST_Table),			false,	0	},
+	{ "SSDT",		SSDT_Table,			sizeof(SSDT_Table),			false,	0	},
+	
+	// Special essential tables.
+	{ "DSDT",		DSDT_Table,			sizeof(DSDT_Table),			false,	0	},
+	{ "FACS",		FACS_Table,			sizeof(FACS_Table),			false,	0	},
+	
+	// Optional tables.
+	{ "APIC-1",		APIC2_Table,		sizeof(APIC2_Table),		false,	0	},
+	{ "SSDT_GPU",	SSDT_GPU_Table,		sizeof(SSDT_GPU_Table),		false,	0	},
+	{ "SSDT_PR",	SSDT_PR_Table,		sizeof(SSDT_PR_Table),		false,	0	},
+	{ "SSDT_SATA",	SSDT_SATA_Table,	sizeof(SSDT_SATA_Table),	false,	0	},
+	{ "SSDT_USB",	SSDT_USB_Table,		sizeof(SSDT_USB_Table),		false,	0	},
+	{ "",			0,					0,							false,	0	}
+#endif
 };
 
 

From 47fd41815feedc99f22e9ee99636803627403066 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 18:57:27 +0100
Subject: [PATCH 093/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/platform.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 78c4f9d..5de5caa 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -177,8 +177,14 @@ void initPlatform(int biosDevice)
 	gPlatform.MPS.Guid				= (EFI_GUID) EFI_MPS_TABLE_GUID;
 #endif // INCLUDE_MP_TABLE
 
-	// Used in boot.c to verify the checksum (adler32) of a pre-linked kernel.
-	gPlatform.ModelID				= SMB_PRODUCT_NAME;
+	// Used in boot.c to verify the checksum (adler32) of pre-linked kernels.
+	gPlatform.ModelID				= strdup(SMB_PRODUCT_NAME);
+
+#if LOAD_MODEL_SPECIFIC_STATIC_DATA
+	// Used in RevoBoot/i386/libsaio/ACPI/patcher.h, RevoBoot/i386/libsaio/efi.c
+	// and RevoBoot/i386/libsaio/SMBIOS/static_data.h
+	gPlatform.CommaLessModelID		= removeChar(strdup(gPlatform.ModelID), ',');
+#endif
 
 	// Determine system type based on product name. Used in
 	// acpi/patcher.h to update FADT->Preferred_PM_Profile
@@ -276,7 +282,7 @@ void initPlatform(int biosDevice)
 
 	initKernelBootConfig();
 
-#if (LOAD_STATIC_EFI_DATA_FROM_EXTRA)
+#if (LOAD_MODEL_SPECIFIC_EFI_DATA)
 	/*
 	 * We need to call this much earlier in the boot process when static EFI data
 	 * is read from: /Extra/EFI[MacModelNN.bin]. Otherwise LoadFile (load.c) fails.

From a56f855b5d9a993af0887252e1203cdc93180b2c Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 18:57:57 +0100
Subject: [PATCH 094/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/platform.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 9053cd8..e2dca81 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -82,6 +82,10 @@
 #define MACPRO_41				MACPRO | (1 << 15)
 #define MACPRO_31				MACPRO					// Defaults to MacPro3,1
 
+//------------------------------------------------------------------------------
+
+// #define	LOAD_MODEL_SPECIFIC_STATIC_DATA	(LOAD_MODEL_SPECIFIC_ACPI_DATA || LOAD_MODEL_SPECIFIC_EFI_DATA || LOAD_MODEL_SPECIFIC_SMBIOS_DATA)
+
 #include "smbios/model_data.h"
 
 //------------------------------------------------------------------------------
@@ -146,7 +150,10 @@ typedef struct _PlatformInfo_t
 												// later updated in boot.c with the actual version info.
 	
 	char *				ModelID;				// Initialized in platform.c and used in boot.c
-	
+#if LOAD_MODEL_SPECIFIC_STATIC_DATA
+	char *				CommaLessModelID;		// Initialized in platform.c and used in i386/libsaio/ACPI/patcher.h,
+#endif												// i386/libsaio/efi.c and i386/libsaio/SMBIOS/static_data.h
+
 	char *				KextFileName;			// Initialized and used in drivers.c
 	char *				KextFileSpec;			// Initialized and used in drivers.c
 	char *				KextPlistSpec;			// Initialized and used in drivers.c
@@ -300,7 +307,6 @@ typedef struct _PlatformInfo_t
 	
 } PlatformInfo_t;
 
-
 //------------------------------------------------------------------------------
 
 /* cpu/static_data.h & cpu/dynamic_data.h */

From ffe8613938dba7d4934883d73ee4b88092937fa7 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 18:59:01 +0100
Subject: [PATCH 095/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/saio_internal.h | 219 ++++++++++++++++++-----------------
 1 file changed, 112 insertions(+), 107 deletions(-)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index d4da384..c806216 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -20,6 +20,12 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ * Updates:
+ *
+ *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
+ *			- Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
+ *
  */
 
 #ifndef __LIBSAIO_SAIO_INTERNAL_H
@@ -28,71 +34,70 @@
 #include "saio_types.h"
 
 /* asm.s */
-extern void   real_to_prot(void);
-extern void   prot_to_real(void);
-extern void   halt(void);
-extern void   startMachKernel(unsigned int address, void *arg);
+extern void		real_to_prot(void);
+extern void		prot_to_real(void);
+extern void		halt(void);
+extern void		startMachKernel(unsigned int address, void *arg);
 
-// extern void   loader(UInt32 code, UInt32 cmdptr);
 
 /* bios.s */
-extern void   bios(biosBuf_t *bb);
+extern void		bios(biosBuf_t *bb);
 
 
-extern int	bgetc(void);
-extern int	biosread(int dev, int cyl, int head, int sec, int num);
-extern int	ebiosread(int dev, unsigned long long sec, int count);
-extern int	get_drive_info(int drive, struct driveInfo *dp);
-extern void	putc(int ch);
-extern void	putca(int ch, int attr, int repeat);
-extern int	getc(void);
-extern int	readKeyboardStatus(void);
+extern int		bgetc(void);
+extern int		biosread(int dev, int cyl, int head, int sec, int num);
+extern int		ebiosread(int dev, unsigned long long sec, int count);
+extern int		get_drive_info(int drive, struct driveInfo *dp);
+extern void		putc(int ch);
+extern void		putca(int ch, int attr, int repeat);
+extern int		getc(void);
+extern int		readKeyboardStatus(void);
 extern unsigned int	time18(void);
 
-extern void	delay(int ms);
+extern void		delay(int ms);
 extern unsigned int	get_diskinfo(int dev);
 
-extern int    memsize(int i);
-extern void   video_mode(int mode);
-extern void   setCursorPosition(int x, int y, int page);
-extern void   setCursorType(int type);
-extern void   getCursorPositionAndType(int *x, int *y, int *type);
-extern void   scollPage(int x1, int y1, int x2, int y2, int attr, int rows, int dir);
-extern void   clearScreenRows(int y1, int y2);
-extern void   setActiveDisplayPage( int page );
+extern int		memsize(int i);
+extern void		video_mode(int mode);
+extern void		setCursorPosition(int x, int y, int page);
+extern void		setCursorType(int type);
+extern void		getCursorPositionAndType(int *x, int *y, int *type);
+extern void		scollPage(int x1, int y1, int x2, int y2, int attr, int rows, int dir);
+extern void		clearScreenRows(int y1, int y2);
+extern void		setActiveDisplayPage(int page);
 extern unsigned long getMemoryMap(struct MemoryRange * rangeArray, unsigned long maxRangeCount, unsigned long * conMemSizePtr, unsigned long * extMemSizePtr);
 extern unsigned long getExtendedMemorySize();
 extern unsigned long getConventionalMemorySize();
-extern void   sleep(int n);
+extern void		sleep(int n);
 
 /* efi.c */
-extern void	initEFITree(void);
-extern void	updateEFITree(char *rootUUID);
-extern void finalizeEFITree(void);
+extern void		initEFITree(void);
+extern void		updateEFITree(char *rootUUID);
+extern void		finalizeEFITree(void);
 
 /* bootstruct.c */
-extern void	initKernelBootConfig(void);
-extern void	finalizeKernelBootConfig(void);
-extern void	moveKernelBootArgs(void);
+extern void		initKernelBootConfig(void);
+extern void		finalizeKernelBootConfig(void);
+extern void		moveKernelBootArgs(void);
 
 /* cache.c */
-extern void	CacheReset();
-extern void	CacheInit(CICell ih, long blockSize);
-extern long	CacheRead(CICell ih, char *buffer, long long offset, long length, long cache);
+extern void		CacheReset();
+extern void		CacheInit(CICell ih, long blockSize);
+extern long		CacheRead(CICell ih, char *buffer, long long offset, long length, long cache);
 
 /* console.c */
-extern bool	gVerboseMode;
-extern bool	gErrors;
-extern void	putchar(int ch);
-extern int	getchar(void);
-extern int	printf(const char *format, ...);
-extern int	error(const char *format, ...);
-extern int	verbose(const char *format, ...);
-extern void	stop(const char *format, ...);
+extern bool		gVerboseMode;
+extern bool		gErrors;
+extern void		putchar(int ch);
+extern int		getchar(void);
+extern int		printf(const char *format, ...);
+extern int		error(const char *format, ...);
+extern int		verbose(const char *format, ...);
+extern void		stop(const char *format, ...);
 
 
 /* disk.c */
-extern int		testBiosread( int biosdev, unsigned long long secno);
+extern int		testBiosread(int biosdev, unsigned long long secno);
 extern BVRef	diskScanBootVolumes(int biosdev, int *count);
 extern BVRef	diskScanGPTBootVolumes(int biosdev, int *count);
 extern void		diskSeek(BVRef bvr, long long position);
@@ -100,94 +105,94 @@ extern int		diskRead(BVRef bvr, long addr, long length);
 extern bool		hasBootEFI(BVRef bvr);
 extern void		initPartitionChain(void);
 
-extern BVRef  getBVChainForBIOSDev(int biosdev);
-extern BVRef  newFilteredBVChain(int minBIOSDev, int maxBIOSDev, unsigned int allowFlags, unsigned int denyFlags, int *count);
-extern int    freeFilteredBVChain(const BVRef chain);
-extern int    rawDiskRead(BVRef bvr, unsigned int secno, void *buffer, unsigned int len);
-extern int    rawDiskWrite(BVRef bvr, unsigned int secno, void *buffer, unsigned int len);
-extern int    readBootSector(int biosdev, unsigned int secno, void *buffer);
-extern void   turnOffFloppy(void);
-extern int	  testFAT32EFIBootSector( int biosdev, unsigned int secno, void * buffer );
+extern BVRef	getBVChainForBIOSDev(int biosdev);
+extern BVRef	newFilteredBVChain(int minBIOSDev, int maxBIOSDev, unsigned int allowFlags, unsigned int denyFlags, int *count);
+extern int		freeFilteredBVChain(const BVRef chain);
+extern int		rawDiskRead(BVRef bvr, unsigned int secno, void *buffer, unsigned int len);
+extern int		rawDiskWrite(BVRef bvr, unsigned int secno, void *buffer, unsigned int len);
+extern int		readBootSector(int biosdev, unsigned int secno, void *buffer);
+extern void		turnOffFloppy(void);
+extern int		testFAT32EFIBootSector(int biosdev, unsigned int secno, void * buffer);
 
 
 /* hfs_compare.c */
-extern int32_t FastUnicodeCompare(u_int16_t *uniStr1, u_int32_t len1, u_int16_t *uniStr2, u_int32_t len2, int byte_order);
-extern void utf_encodestr( const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32_t bufsize, int byte_order );
-extern void utf_decodestr(const u_int8_t *utf8p, u_int16_t *ucsp, u_int16_t *ucslen, u_int32_t bufsize, int byte_order );
+extern int32_t	FastUnicodeCompare(u_int16_t *uniStr1, u_int32_t len1, u_int16_t *uniStr2, u_int32_t len2, int byte_order);
+extern void		utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32_t bufsize, int byte_order);
+extern void		utf_decodestr(const u_int8_t *utf8p, u_int16_t *ucsp, u_int16_t *ucslen, u_int32_t bufsize, int byte_order);
 
 
 /* load.c */
-extern bool gLoadKernelDrivers;
-extern long ThinFatFile(void **binary, unsigned long *length);
-extern long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize);
+extern bool		gLoadKernelDrivers;
+extern long		ThinFatFile(void **binary, unsigned long *length);
+extern long		DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize);
+extern long		loadBinaryData(char *aFilePath, void **aMemoryAddress);
 
 
 /* memory.c */
-long AllocateKernelMemory( long inSize );
-long AllocateMemoryRange(char * rangeName, long start, long length, long type);
+long			AllocateKernelMemory(long inSize);
+long			AllocateMemoryRange(char * rangeName, long start, long length, long type);
 
 
 /* platform.c */
-extern void   enableA20(void);
+extern void		enableA20(void);
 
 
 /* stringTable.c */
-extern bool   getValueForConfigTableKey(config_file_t *config, const char *key, const char **val, int *size);
-extern char * newStringForKey(char *key, config_file_t *configBuff);
-extern bool   getValueForBootKey(const char *line, const char *match, const char **matchval, int *len);
-extern bool   getValueForKey(const char *key, const char **val, int *size, config_file_t *configBuff);
-extern bool   getBoolForKey(const char *key, bool *val, config_file_t *configBuff);
-extern bool   getIntForKey(const char *key, int *val, config_file_t *configBuff);
-
-extern int    loadConfigFile(const char *configFile, config_file_t *configBuff);
-
-extern int    loadSystemConfig(config_file_t *configBuff);
-
-
-extern int    loadHelperConfig(config_file_t *configBuff);
-extern int    loadOverrideConfig(config_file_t *configBuff);
-
-extern char * newString(const char *oldString);
-extern char * getNextArg(char ** ptr, char * val);
-extern long	  ParseXMLFile( char * buffer, TagPtr * dict );
+extern bool		getValueForConfigTableKey(config_file_t *config, const char *key, const char **val, int *size);
+extern char		* newStringForKey(char *key, config_file_t *configBuff);
+extern bool		getValueForBootKey(const char *line, const char *match, const char **matchval, int *len);
+extern bool		getValueForKey(const char *key, const char **val, int *size, config_file_t *configBuff);
+extern bool		getBoolForKey(const char *key, bool *val, config_file_t *configBuff);
+extern bool		getIntForKey(const char *key, int *val, config_file_t *configBuff);
+extern int		loadConfigFile(const char *configFile, config_file_t *configBuff);
+extern int		loadSystemConfig(config_file_t *configBuff);
+extern int		loadHelperConfig(config_file_t *configBuff);
+extern int		loadOverrideConfig(config_file_t *configBuff);
+extern char		* newString(const char *oldString);
+extern char		* getNextArg(char ** ptr, char * val);
+extern long		ParseXMLFile(char * buffer, TagPtr * dict);
 
 
 /* sys.c */
-extern BVRef getBootVolumeRef( const char * path, const char ** outPath );
-extern long   LoadVolumeFile(BVRef bvr, const char *fileSpec);
-extern long   LoadFile(const char *fileSpec);
-extern long   ReadFileAtOffset(const char * fileSpec, void *buffer, uint64_t offset, uint64_t length);
-extern long   LoadThinFatFile(const char *fileSpec, void **binary);
-extern long   GetDirEntry(const char *dirSpec, long *dirIndex, const char **name, long *flags, long *time);
-extern long   GetFileInfo(const char *dirSpec, const char *name,long *flags, long *time);
-extern long   GetFileBlock(const char *fileSpec, unsigned long long *firstBlock);
-extern long   GetFSUUID(char *spec, char *uuidStr);
-extern long   CreateUUIDString(uint8_t uubytes[], int nbytes, char *uuidStr);
-extern int    openmem(char *buf, int len);
-extern int    open(const char *str, int how);
-extern int    close(int fdesc);
-extern int    file_size(int fdesc);
-extern int    read(int fdesc, char *buf, int count);
-extern int    b_lseek(int fdesc, int addr, int ptr);
-extern int    tell(int fdesc);
+extern BVRef	getBootVolumeRef(const char * path, const char ** outPath);
+extern long		LoadVolumeFile(BVRef bvr, const char *fileSpec);
+extern long		LoadFile(const char *fileSpec);
+extern long		ReadFileAtOffset(const char * fileSpec, void *buffer, uint64_t offset, uint64_t length);
+extern long		LoadThinFatFile(const char *fileSpec, void **binary);
+extern long		GetDirEntry(const char *dirSpec, long *dirIndex, const char **name, long *flags, long *time);
+extern long		GetFileInfo(const char *dirSpec, const char *name,long *flags, long *time);
+extern long		GetFileBlock(const char *fileSpec, unsigned long long *firstBlock);
+extern long		GetFSUUID(char *spec, char *uuidStr);
+extern long		CreateUUIDString(uint8_t uubytes[], int nbytes, char *uuidStr);
+extern int		openmem(char *buf, int len);
+extern int		open(const char *str, int how);
+extern int		close(int fdesc);
+extern int		file_size(int fdesc);
+extern int		read(int fdesc, char *buf, int count);
+extern int		b_lseek(int fdesc, int addr, int ptr);
+extern int		tell(int fdesc);
 extern const char * systemConfigDir(void);
-extern struct dirstuff * opendir(const char *path);
-extern struct dirstuff * vol_opendir(BVRef bvr, const char *path);
-extern int    closedir(struct dirstuff *dirp);
-extern int    readdir(struct dirstuff *dirp, const char **name, long *flags, long *time);
-extern int    readdir_ext(struct dirstuff * dirp, const char ** name, long * flags, long * time, FinderInfo *finderInfo, long *infoValid);
-extern void   flushdev(void);
-extern void   scanBootVolumes(int biosdev, int *count);
+extern struct	dirstuff * opendir(const char *path);
+extern struct	dirstuff * vol_opendir(BVRef bvr, const char *path);
+extern int		closedir(struct dirstuff *dirp);
+extern int		readdir(struct dirstuff *dirp, const char **name, long *flags, long *time);
+extern int		readdir_ext(struct dirstuff * dirp, const char ** name, long * flags, long * time, FinderInfo *finderInfo, long *infoValid);
+extern void		flushdev(void);
+extern void		scanBootVolumes(int biosdev, int *count);
 
-extern BVRef getBootVolume(BVRef chain, int targetDevice);
-extern BVRef getTargetRootVolume(char *rootUUID);
-extern BVRef selectBootVolume(BVRef chain);
+extern BVRef	getBootVolume(BVRef chain, int targetDevice);
+extern BVRef	getTargetRootVolume(char *rootUUID);
+extern BVRef	selectBootVolume(BVRef chain);
 
-extern void   getBootVolumeDescription(BVRef bvr, char *str, long strMaxLen, bool verbose);
+extern void		getBootVolumeDescription(BVRef bvr, char *str, long strMaxLen, bool verbose);
 
 
 // Function pointer to be filled in if ramdisks are available
-extern int (*p_get_ramdisk_info)(int biosdev, struct driveInfo *dip);
-extern int (*p_ramdiskReadBytes)( int biosdev, unsigned int blkno, unsigned int byteoff, unsigned int byteCount, void * buffer );
+extern int		(*p_get_ramdisk_info)(int biosdev, struct driveInfo *dip);
+extern int		(*p_ramdiskReadBytes)(int biosdev, unsigned int blkno, unsigned int byteoff, unsigned int byteCount, void * buffer);
+
+
+/* string.h */
+extern char		* toLowerCase(char *aSourceString);
 
 #endif /* !__LIBSAIO_SAIO_INTERNAL_H */

From 0b82d821d6e7b0ed688764a5b0df2ba3ba1388ef Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 19:00:05 +0100
Subject: [PATCH 096/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index bc5c4e1..63262be 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -26,7 +26,7 @@ CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost \
     -DSTATIC_DATA_FILENAME=$(MAKE_TARGET_MODEL).bin \
     -DACPI_DATA_FILE=../../config/$(MAKE_ACPI_DATA_FILE) \
     -DEFI_DATA_FILE=../config/$(MAKE_EFI_DATA_FILE) \
-    -DSMBIOS_DATA_FILE=../../config/$(MAKE_SMBIOS_DATA_FILE) \
+    -DSMBIOS_DATA_FILE=../config/$(MAKE_SMBIOS_DATA_FILE) \
     -fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \
     -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
     -march=pentium4 -msse2 -mfpmath=sse -msoft-float

From aa11394eb40c936efb2aa8ee5c92c408e1bfb443 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 19:01:47 +0100
Subject: [PATCH 097/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/smbios/dynamic_data.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index cc92cb1..25fa300 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -136,7 +136,7 @@ struct SMBProperty SMBProperties[] =
 	{ kSMBTypeSystemInformation,	0x04,	kSMBString,		.plainData		= APPLE_INC					},
 	{ kSMBTypeSystemInformation,	0x05,	kSMBString,		.plainData		= SMB_PRODUCT_NAME			},
 	{ kSMBTypeSystemInformation,	0x06,	kSMBString,		.plainData		= "1.0"						},
-	{ kSMBTypeSystemInformation,	0x07,	kSMBString,		.plainData		= SMB_SYSTEM_SERIAL_NUMBER		},
+	{ kSMBTypeSystemInformation,	0x07,	kSMBString,		.plainData		= SMB_SYSTEM_SERIAL_NUMBER	},
 	{ kSMBTypeSystemInformation,	0x1a,	kSMBString,		.plainData		= SMB_FAMILY				},
 	
 	//----------------------------------------------------------------------------------------------------
@@ -498,4 +498,3 @@ void setupSMBIOS(void)
 
 
 #endif /* !__LIBSAIO_SMBIOS_PATCHER_H */
-

From d99c78ef92975ba6f3f49b79751d13e0216ac393 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 19:04:24 +0100
Subject: [PATCH 098/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/acpi/patcher.h | 46 ++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 50f6113..acc9233 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -8,11 +8,12 @@
  *			- A complete new implementation written for RevoBoot by DHP in 2011.
  *			- Automatic SSDT_PR creation added by DHP in June 2011.
  *			- Call loadBinaryData from loadACPITable (PikerAlpha, October 2012).
+ *			- Moved extern declarations to saio_internal.h (PikerAlpha, October 2012).
+ *			- Now using gPlatform.CommaLessModelID instead of gPlatform.ModelID (PikerAlpha, October 2012).
+ *			- Fall back to non-model specific file when model specific file is unavailable (PikerAlpha, October 2012).
  */
 
 
-extern ACPI_RSDP * getACPIBaseAddress();
-
 #if PATCH_ACPI_TABLE_DATA
 
 #if AUTOMATIC_SSDT_PR_CREATION
@@ -23,36 +24,53 @@ extern ACPI_RSDP * getACPIBaseAddress();
 #if (LOAD_EXTRA_ACPI_TABLES && (LOAD_DSDT_TABLE_FROM_EXTRA_ACPI || LOAD_SSDT_TABLE_FROM_EXTRA_ACPI))
 //==============================================================================
 
-extern long loadBinaryData(char *aFilePath, void **aMemoryAddress);
-
 int loadACPITable(int tableIndex)
 {
-	_ACPI_DEBUG_DUMP("loadACPITable(%s / ", customTables[tableIndex].name);
-
-	char dirSpec[32] = "";
-	sprintf(dirSpec, "/Extra/ACPI/%s.aml", customTables[tableIndex].name);
-
+	char dirSpec[48] = "";
+	long fileSize = 0;
 	void * tableAddress = (void *)kLoadAddr;
 
+#if LOAD_MODEL_SPECIFIC_ACPI_DATA
+	// Example: /Extra/ACPI/DSDT-MacBookPro101.aml
+	//          0123456789 0123456789 0123456789 1
+	sprintf(dirSpec, "/Extra/ACPI/%s-%s.aml", customTables[tableIndex].name, gPlatform.CommaLessModelID);
+
 	/*
 	 * loadBinaryData calls LoadFile (both in sys.c) to load table data into a
 	 * load buffer at kLoadAddr (defined in memory.h) and copies it into a new
 	 * allocated memory block (kLoadAddr gets overwritten by the next call).
 	 */
-	long fileSize = loadBinaryData(dirSpec, &tableAddress);
+	fileSize = loadBinaryData(dirSpec, &tableAddress);
 
-	if (fileSize)
+	if (fileSize == -1)
 	{
-		_ACPI_DEBUG_DUMP("%d bytes).\n", fileSize);
+#endif
+		// File: /Extra/ACPI/DSDT-MacBookPro101.aml not found. Try: /Extra/ACPI/dsdt.aml
+		sprintf(dirSpec, "/Extra/ACPI/%s.aml", customTables[tableIndex].name);
+		fileSize = loadBinaryData(dirSpec, &tableAddress);
+#if LOAD_MODEL_SPECIFIC_ACPI_DATA
+	}
+#endif
+
+	if (fileSize > 0)
+	{
+		_ACPI_DEBUG_DUMP("Loading: %s (%d bytes).\n", dirSpec, fileSize);
+		_ACPI_DEBUG_SLEEP(1);
 
 		// 'tableAddress' is copied into kernel memory later on (see setupACPI).
 		customTables[tableIndex].table			= tableAddress;
 		customTables[tableIndex].tableLength	= fileSize;
 
+#if (DEBUG_ACPI && LOAD_MODEL_SPECIFIC_ACPI_DATA)
+		// Update table name from DSDT.aml to DSDT-Macmini51.aml (DSDT example).
+		sprintf(customTables[tableIndex].fileName, gPlatform.CommaLessModelID);
+#endif
+
 		return 0;
 	}
 
-	_ACPI_DEBUG_DUMP("Error: File not found.)\n");
+	_ACPI_DEBUG_DUMP("Error: File %s not found.)\n", dirSpec);
+	_ACPI_DEBUG_SLEEP(5);
 
 	return -1;
 }
@@ -246,7 +264,7 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 #if STATIC_DSDT_TABLE_INJECTION
 		_ACPI_DEBUG_DUMP("static DSDT data");
 #else	// STATIC_DSDT_TABLE_INJECTION
-		_ACPI_DEBUG_DUMP("loaded DSDT.aml");
+		_ACPI_DEBUG_DUMP("%s", customTables[DSDT].fileName);
 #endif	// STATIC_DSDT_TABLE_INJECTION
 		_ACPI_DEBUG_DUMP(" @ 0x%x\n", customTables[DSDT].tableAddress);
 

From 4f25936b85881de0c84240c90f50b9c40a5b2675 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 19:06:10 +0100
Subject: [PATCH 099/623] Whitespace fix only

---
 i386/libsaio/saio_internal.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index c806216..1bc2fa0 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -23,8 +23,8 @@
  *
  * Updates:
  *
- *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
- *			- Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
+ *      - loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
+ *      - Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
  *
  */
 

From 4165da1720242ae387aafff7058a1cbd2571ec79 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 19:07:21 +0100
Subject: [PATCH 100/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/smbios.c | 49 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/smbios.c b/i386/libsaio/smbios.c
index d99bb64..267a0c6 100755
--- a/i386/libsaio/smbios.c
+++ b/i386/libsaio/smbios.c
@@ -10,7 +10,34 @@
 
 #include "platform.h"
 
+
 #if USE_STATIC_SMBIOS_DATA
+
+#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
+//==============================================================================
+
+int useStaticSMBIOSData(void * aMemoryAddress)
+{
+	// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
+	#include STRING(SMBIOS_DATA_FILE)
+
+	static uint32_t SMBIOS_Table[] =
+	{
+		// Replaced with data from: RevoBoot/i386/config/SMBIOS/[data-template/MacModelNN].h
+		STATIC_SMBIOS_DATA
+	};
+
+	_SMBIOS_DEBUG_DUMP("Using statically linked SMBIOS data\n");
+
+	int tableLength = sizeof(SMBIOS_Table);
+
+	// Copy the static SMBIOS data into the newly allocated memory page. Right after the new EPS.
+	memcpy(aMemoryAddress, SMBIOS_Table, tableLength);
+	
+	return tableLength;
+}
+#endif /* #if INJECT_EFI_DEVICE_PROPERTIES */
+
 //==============================================================================
 
 void setupSMBIOS(void)
@@ -34,7 +61,7 @@ void setupSMBIOS(void)
     newEPS->entryPointLength	= 0x1f;		// sizeof(* newEPS)
     newEPS->majorVersion		= 2;
     newEPS->minorVersion		= 4;
-    newEPS->maxStructureSize	= STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE; // Defined in: config/smbios/data.h
+	newEPS->maxStructureSize	= STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE;	// Defined in RevoBoot/i386/config/SMBIOS/data-template.h
     newEPS->entryPointRevision	= 0;
     
     newEPS->formattedArea[0]	= 0;
@@ -51,9 +78,25 @@ void setupSMBIOS(void)
     newEPS->dmi.checksum		= 0;
     newEPS->dmi.tableLength		= tableLength; 
     newEPS->dmi.tableAddress	= (uint32_t) (kernelMemory + sizeof(struct SMBEntryPoint)); 
-    newEPS->dmi.structureCount	= STATIC_SMBIOS_DMI_STRUCTURE_COUNT; // Defined in: config/smbios/data.h
     newEPS->dmi.bcdRevision		= 0x24;
-    
+	newEPS->dmi.structureCount	= STATIC_SMBIOS_DMI_STRUCTURE_COUNT;	// Defined in RevoBoot/i386/config/SMBIOS/data-template.h
+
+#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
+	/*
+	 * This is nothing more than a mere stop gap solution, since using the factory values here, instead of walking over 
+	 * staticSMBIOSData to get them, may hang the kernel at boot time (will be fixed in a next update of RevoBoot).
+	 */
+	if (fileSize > 0)
+	{
+		newEPS->maxStructureSize	= factoryEPS->maxStructureSize;		// Defined in RevoBoot/i386/libsaio/SMBIOS/static_data.h
+		newEPS->dmi.structureCount	= factoryEPS->dmi.structureCount;	// Defined in RevoBoot/i386/libsaio/SMBIOS/static_data.h
+		
+		_SMBIOS_DEBUG_DUMP("factoryEPS->maxStructureSize  : %d\n", factoryEPS->maxStructureSize);
+		_SMBIOS_DEBUG_DUMP("factoryEPS->dmi.structureCount: %d\n", factoryEPS->dmi.structureCount);
+		_SMBIOS_DEBUG_SLEEP(1);
+	}
+#endif
+
     // Take care of possible checksum errors
     newEPS->dmi.checksum		= 256 - checksum8(&newEPS->dmi, sizeof(newEPS->dmi));
     newEPS->checksum			= 256 - checksum8(newEPS, sizeof(* newEPS));

From 1c40333cdbdcc9ba109f861f5ccd8641dd13f0de Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 19:08:37 +0100
Subject: [PATCH 101/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/smbios/static_data.h | 77 +++++++++++++++++++++----------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/i386/libsaio/smbios/static_data.h b/i386/libsaio/smbios/static_data.h
index a26a48b..efe7645 100755
--- a/i386/libsaio/smbios/static_data.h
+++ b/i386/libsaio/smbios/static_data.h
@@ -5,7 +5,7 @@
  *			- Dynamic and static SMBIOS data gathering added by DHP in 2010.
  *			- New path for static EFI data (PikerAlpha, October 2012).
  *			- Optionally check /Extra/SMBIOS/[MacModelNN.bin] for static SMBIOS data (PikerAlpha, October 2012).
- *			- Oops. Restoring lost lines (PikerAlpha, November 2012).
+ *			- Get maxStructureSize/structureCount from factory EPS (PikerAlpha, October 2012).
  *
  * Credits:
  *			- blackosx, DB1, dgsga, FKA, humph, scrax and STLVNUB (testers).
@@ -16,42 +16,71 @@
 
 #include "essentials.h"
 
-#if LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA
+int tableLength = 0;
 
-	#define STATIC_SMBIOS_DMI_STRUCTURE_COUNT	0
-	#define STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE	0
+#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
 
-	extern long loadBinaryData(char *aFilePath, void **aMemoryAddress);
+	#define SMBIOS_SEARCH_BASE		0x000F0000
+	#define SMBIOS_SEARCH_END		0x000FFFFF
+	#define SMBIOS_ANCHOR			0x5f4d535f	// '_SM_' in Little Endian.
+	#define SMBIOS_MPS_ANCHOR		0x5f504d5f	// '_MP_' in Little Endian.
+
+	_SMBIOS_DEBUG_DUMP("in getEPSAddress()\n");
+
+	void *baseAddress = (void *)SMBIOS_SEARCH_BASE;
+
+	for(; baseAddress <= (void *)SMBIOS_SEARCH_END; baseAddress += 16)
+	{
+		if (*(uint32_t *)baseAddress == SMBIOS_ANCHOR) // _SM_
+		{
+			if (checksum8(baseAddress, sizeof(struct SMBEntryPoint)) == 0)
+			{
+	#if INCLUDE_MP_TABLE
+				// SMBIOS table located. Use this address as starting point.
+				void * mpsAddress = baseAddress;
+			
+				// Now search for the Multi Processor table.
+				for(; mpsAddress <= (void *)SMBIOS_SEARCH_END; mpsAddress += 16)
+				{
+					if (*(uint32_t *)mpsAddress == SMBIOS_MPS_ANCHOR)
+					{
+						gPlatform.MP.BaseAddress = (uint32_t)mpsAddress;
+						break;
+					}
+				}
+	#endif // INCLUDE_MP_TABLE
+
+				break;
+
+				_SMBIOS_DEBUG_DUMP("SMBIOS baseAddress: 0x%08x\n", baseAddress);
+			}
+		}
+	}
 
-	int tableLength = 0;
 	char dirSpec[32] = "";
-	sprintf(dirSpec, "/Extra/SMBIOS/%s", STRING(STATIC_DATA_FILENAME));
 
 	void * staticSMBIOSData = (void *)kLoadAddr;
 
+	struct SMBEntryPoint *factoryEPS;
+
+	sprintf(dirSpec, "/Extra/SMBIOS/%s.bin", COMMA_STRIPPED_MODEL_ID);
+
 	_SMBIOS_DEBUG_DUMP("Loading: %s\n", dirSpec);
 
 	long fileSize = loadBinaryData(dirSpec, &staticSMBIOSData);
 
-	if (fileSize)
+	if (fileSize > 0)
 	{
-		tableLength = (int)fileSize;
-		
-		memcpy((kernelMemory + sizeof(* newEPS)), staticSMBIOSData, tableLength);
-	}
-#else
-	// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
-	#include STRING(SMBIOS_DATA_FILE)
+		memcpy((kernelMemory + sizeof(* newEPS)), staticSMBIOSData, fileSize);
 
-	static uint32_t SMBIOS_Table[] =
+		factoryEPS = (struct SMBEntryPoint *) baseAddress;
+	}
+	else // File not found. Use static data defined in RevoBoot/i386/config/SMBIOS/
 	{
-		STATIC_SMBIOS_DATA	// Replaced with data from: RevoBoot/i386/config/SMBIOS/[default/MacModelNN].h
-	};
-
-	int tableLength = sizeof(SMBIOS_Table);
-
-	// Copy the static SMBIOS data into the newly allocated memory page. Right after the new EPS.
-	memcpy((kernelMemory + sizeof(* newEPS)), SMBIOS_Table, tableLength);
-#endif
+		tableLength = useStaticSMBIOSData((kernelMemory + sizeof(* newEPS)));
+	}
+#else
+		tableLength = useStaticSMBIOSData((kernelMemory + sizeof(* newEPS)));
+#endif /* LOAD_MODEL_SPECIFIC_SMBIOS_DATA */
 
 #endif /* !__LIBSAIO_SMBIOS_STATIC_DATA_H */

From ee1791f86f14cffd8d16c762b61f660f7e3a5f64 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 19:23:35 +0100
Subject: [PATCH 102/623] Patch for RevoBoot v1.5.34

---
 i386/config/settings-template.h | 230 +++++++++++++++++---------------
 1 file changed, 120 insertions(+), 110 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 114bfb8..8f553c8 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Master Chief. All rights reserved.
  *
- * Note: This is an essential part of the build process for RevoBoot v1.5.00 and greater.
+ * Note: This is an essential part of the build process for RevoBoot v1.5.32 and greater.
  *
  * Updates:
  *
@@ -15,13 +15,17 @@
  *			- STATIC_SMBIOS_MODEL_ID renamed to TARGET_MODEL (PikerAlpha, October 2012).
  *			- OVERRIDE_DYNAMIC_PRODUCT_DETECTION removed/no longer supported (PikerAlpha, October 2012).
  *			- INTEL_CORE_TECHNOLOGY per default set to 1 (PikerAlpha, October 2012).
- *			- INJECT_EFI_DEVICE_PROPERTIES per default set to 1 (PikerAlpha, October 2012). 
- *			- USE_STATIC_EFI_DATA added (PikerAlpha, October 2012).
- *			- USE_STATIC_SMBIOS_DATA added (PikerAlpha, October 2012).
+ *			- INJECT_EFI_DEVICE_PROPERTIES per default set to 1 (PikerAlpha, October 2012).
+ *			- SMBIOS base board serial# (SMB_BOARD_SERIAL_NUMBER) feature added (dgsga, October 2012).
+ *			- LOAD_STATIC_EFI_DATA_FROM_EXTRA feature added (PikerAlpha, October 2012).
+ *			- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA feature added (PikerAlpha, October 2012).
  *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
  *			- Restored lost STATIC_SMSERIALNUMBER (PikerAlpha, October 2012).
  *			- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
- *
+ *			- LOAD_STATIC_ACPI_DATA_FROM_EXTRA added (PikerAlpha, October 2012).
+ *			- LOAD_STATIC_EFI_DATA_FROM_EXTRA renamed to LOAD_MODEL_SPECIFIC_EFI_DATA (PikerAlpha, October 2012).
+ *			- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA renamed to LOAD_MODEL_SPECIFIC_SMBIOS_DATA (PikerAlpha, October 2012).
+ *			- LOAD_MODEL_SPECIFIC_STATIC_DATA added (PikerAlpha, October 2012).
  */
 
 
@@ -34,10 +38,10 @@
 												//			and requires you to set PATCH_ACPI_TABLE_DATA to 1.
 
 
-#define PATCH_ACPI_TABLE_DATA				1	// Set to 1 by default (enabling patching). Use 0 to keep the original
-												// unmodified ACPI tables, but please note (very well) that this is
-												// only supported by very few motherboards / BIOS'es. You may also
-												// need a kext like OSXRestart.kext to be able to restart your system,
+#define PATCH_ACPI_TABLE_DATA				1	// Set to 1 by default (enabling patching). Use 0 to keep the original 
+												// unmodified ACPI tables, but please note (very well) that this is 
+												// only supported by very few motherboards / BIOS'es. You may also 
+												// need a kext like OSXRestart.kext to be able to restart your system, 
 												// this due to a possibly broken FACP table in your BIOS!
 												//
 												// Note: Requires one of the following STATIC_* and/or LOAD_* settings:
@@ -52,13 +56,13 @@
 #endif
 
 
-#define STATIC_APIC_TABLE_INJECTION			0	// Set to 0 by default. Use 1 when you want to inject a modified copy
+#define STATIC_APIC_TABLE_INJECTION			0	// Set to 0 by default. Use 1 when you want to inject a modified copy 
 												// with say stripped out unused CPU's or other required modifications.
 												//
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
 
 
-#define STATIC_APIC2_TABLE_INJECTION		0	// Set to 0 by default. Use 1 when you want to inject a second APIC
+#define STATIC_APIC2_TABLE_INJECTION		0	// Set to 0 by default. Use 1 when you want to inject a second APIC 
 												// (ACPI-1) table data for additional CPU core support.
 												//
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
@@ -77,7 +81,7 @@
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
 
 
-#define STATIC_HPET_TABLE_INJECTION			0	// Set to 0 by default. Use 1 when you want to inject a static copy
+#define STATIC_HPET_TABLE_INJECTION			0	// Set to 0 by default. Use 1 when you want to inject a static copy 
 												// of a custom HPET table.
 												//
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
@@ -95,7 +99,7 @@
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
 
 
-#define STATIC_SSDT_PR_TABLE_INJECTION		0	// Set to 0 by default. Use 1 when you want to inject your Intel
+#define STATIC_SSDT_PR_TABLE_INJECTION		0	// Set to 0 by default. Use 1 when you want to inject your Intel 
 												// SpeedStep related modifications (like I do).
 												//
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
@@ -111,15 +115,15 @@
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
 
 
-#define LOAD_DSDT_TABLE_FROM_EXTRA_ACPI		1	// Set to 0 by default. Use 1 when your setup requires a modified DSDT table
-												// and you want to load: /Extra/ACPI/dsdt.aml instead of injecting a static
-												// DSDT table from: RevoBoot/i386/config/ACPI/data.h
+#define LOAD_DSDT_TABLE_FROM_EXTRA_ACPI		0	// Set to 0 by default. Use 1 when your setup requires a modified DSDT table 
+												// and you want to load: /Extra/ACPI/dsdt.aml instead of injecting a static 
+												// DSDT table from: RevoBoot/i386/config/ACPI/data.h 
 												//
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
 
 
-#define LOAD_SSDT_TABLE_FROM_EXTRA_ACPI		0	// Set to 1 by default. Use 0 only after you've converted your SSDT into
-												// STATIC_SSDT_TABLE_INJECTION in: RevoBoot/i386/config/ACPI/data.h
+#define LOAD_SSDT_TABLE_FROM_EXTRA_ACPI		1	// Set to 1 by default. Use 0 only after you've converted your SSDT into 
+												// STATIC_SSDT_TABLE_INJECTION in: RevoBoot/i386/config/ACPI/data.h 
 												// or when you don't want/need to load /Extra/ACPI/SSDT.aml
 												//
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
@@ -127,8 +131,12 @@
 
 #define LOAD_EXTRA_ACPI_TABLES				(LOAD_DSDT_TABLE_FROM_EXTRA_ACPI || LOAD_SSDT_TABLE_FROM_EXTRA_ACPI)
 
+#if LOAD_EXTRA_ACPI_TABLES
+	#define LOAD_MODEL_SPECIFIC_ACPI_DATA	0	// Set to 0 by default. Use 1 to read: /Extra/ACPI/[XXXX-MacModelNN].aml and
+												// falls back to: /Extra/ACPI/[XXXX].aml when model specific data is not available.
+#endif
 
-#define AUTOMATIC_SSDT_PR_CREATION			1	// Set to 0 by default (support for Sandy Bridge only).
+#define AUTOMATIC_SSDT_PR_CREATION			1	// Set to 1 by default (support for Sandy Bridge only).
 												//
 												// This injects a custom SSDT (in configure mode) with:
 												//
@@ -138,7 +146,7 @@
 												// Use 4 to inject: Device (SBUS) {...} which is required for Power Management.
 												// Use 5 to inject: P/C-State definition blocks plus the former (Device SBUS).
 												// Use 7 to inject: All of the above.
-												//
+												// 
 												// Notes:	Device SBUS can only be injected when it isn't part of other ACPI tables!
 												//			This feature should only be used once, to extract the SSDT_PR from ioreg
 												//			and use it as STATIC_SSDT_PR_TABLE_DATA in RevoBoot/i386/config/ACPI/data.h
@@ -153,16 +161,16 @@
 												//
 												// Note: AICPUPM wants a P-State for each 100 MHz bank or it will fail (see note below).
 
-#define DROP_FACTORY_SSDT_TABLES			1	// Set to 1 by default (this setting is required).
+	#define DROP_FACTORY_SSDT_TABLES		1	// Set to 1 by default (this setting is required).
 												//
 												// Note: Do not change this setting (must drop SSDT tables).
 
-#define NUMBER_OF_TURBO_STATES				4	// Set to 4 by default.
+	#define NUMBER_OF_TURBO_STATES			4	// Set to 4 by default.
 												//
 												// Note:	Make sure to add a full range, one P-State for each 100 MHz when OC'ing
 												//			or AICPIPM will fail with: "P-State Stepper Error 18 at step N on CPU N"
 
-#define OVERRIDE_ACPI_METHODS				0	// Set to 0 by default (do nothing).
+	#define OVERRIDE_ACPI_METHODS			0	// Set to 0 by default (do nothing).
 												// Use 1 to override Method _PTS in a static SSDT or Extra/ACPI/SSDT.aml
 												// Use 2 to override Method _WAK in a static SSDT or Extra/ACPI/SSDT.aml
 												// Use 3 to override both _PTS and _WAK.
@@ -181,7 +189,7 @@
 
 #define	APPLE_STYLE_ACPI					0	// Set to 0 by default. Use 1 to change the OEMID's to Mac likes.
 												//
-												// Note:	Don't forget to set PATCH_ACPI_TABLE_DATA to 1 and keep in mind that this can
+												// Note:	Don't forget to set PATCH_ACPI_TABLE_DATA to 1 and keep in mind that this can 
 												//			only change the headers of injected/replaced tables. Not the factory tables.
 
 
@@ -191,142 +199,143 @@
 //--------------------------------------------------------------- BOOT.C -------------------------------------------------------------------
 
 
-#define PRE_LINKED_KERNEL_SUPPORT		1	// Set to 1 by default. Change this to 0 to disable the use of pre-linked kernels.
+#define PRE_LINKED_KERNEL_SUPPORT			1	// Set to 1 by default. Change this to 0 to disable the use of pre-linked kernels.
 
-#define MUST_ENABLE_A20					0	// Set to 0 by default. Change this to 1 when your hardware requires it.
+#define MUST_ENABLE_A20						0	// Set to 0 by default. Change this to 1 when your hardware requires it.
 
-#define SAFE_MALLOC						0	// Set to 0 by default. Change this to 1 when booting halts with a memory allocation error.
+#define SAFE_MALLOC							0	// Set to 0 by default. Change this to 1 when booting halts with a memory allocation error.
 
-#define LION_RECOVERY_SUPPORT			0	// Set to 0 by default. Change this to 1 to make RevoBoot search for the 'Recovery HD'
-										// partition and, when available, boot from it.
+#define LION_RECOVERY_SUPPORT				0	// Set to 0 by default. Change this to 1 to make RevoBoot search for the 'Recovery HD'
+												// partition and, when available, boot from it.
 
-#define DEBUG_BOOT						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
+#define DEBUG_BOOT							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
 
 //---------------------------------------------------------------- CPU.C -------------------------------------------------------------------
 
 
-#define USE_STATIC_CPU_DATA				1	// Set to 0 by default (dynamic data collection). Change this to 1 to use static data.
+#define USE_STATIC_CPU_DATA					0	// Set to 0 by default (dynamic data collection). Change this to 1 to use static data.
 
-#define CPU_VENDOR_ID					CPU_VENDOR_INTEL // CPU_VENDOR_AMD is not supported.
+#define CPU_VENDOR_ID						CPU_VENDOR_INTEL // CPU_VENDOR_AMD is not supported.
 
-#define INTEL_CORE_TECHNOLOGY			1	// Set to 1 by default. Use 0 for older non Intel Core CPU's (removes unused code).
-											//
-											// Warning: Do not use 0 on Core Technology CPU's or sysctl's machdep.tsc.frequency will be
-											//			initialized with the wrong value (various things, like the spinner will go mad).
+#define INTEL_CORE_TECHNOLOGY				1	// Set to 1 by default. Use 0 for older non Intel Core CPU's (removes unused code).
+												//
+												// Warning: Do not use 0 on Core Technology CPU's or sysctl's machdep.tsc.frequency will be
+												//			initialized with the wrong value (various things, like the spinner will go mad).
 
-#define OC_BUSRATIO_CORRECTION			0	// Set to 0 by default. Change this to busratio-100 (OC'ed systems with a changed busratio).
+#define OC_BUSRATIO_CORRECTION				0	// Set to 0 by default. Change this to busratio-100 (OC'ed systems with a changed busratio).
 
-#define BOOT_TURBO_RATIO				0	// Set to 0 by default. Change this to the desired (and supported) max turbo multiplier.
-											//
-											// Example:  0x2800 for 4.0 GHz on a i7-2600.
+#define BOOT_TURBO_RATIO					0	// Set to 0 by default. Change this to the desired (and supported) max turbo multiplier.
+												//
+												// Example:  0x2800 for 4.0 GHz on a i7-2600.
 
-#define DEBUG_CPU						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
-											// Note: CPU info data will not be displayed when USE_STATIC_CPU_DATA is set to 1
+#define DEBUG_CPU							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
+												// Note: CPU info data will not be displayed when USE_STATIC_CPU_DATA is set to 1
 
 #if DEBUG_CPU
-	#define DEBUG_CPU_TURBO_RATIOS		0	// Set to 0 by default. Change this to 1 when you want to check the core ratio.
+	#define DEBUG_CPU_TURBO_RATIOS			0	// Set to 0 by default. Change this to 1 when you want to check the core ratio.
 
-	#define DEBUG_CST_SUPPORT		0	// Set to 0 by default. Change this to 1 to check the in BIOS enabled C-States.
+	#define DEBUG_CST_SUPPORT				0	// Set to 0 by default. Change this to 1 to check the in BIOS enabled C-States.
 
-	#define DEBUG_TSS_SUPPORT		0	// Set to 0 by default. Change this to 1 to check the T-State Clock Modulation.
+	#define DEBUG_TSS_SUPPORT				0	// Set to 0 by default. Change this to 1 to check the T-State Clock Modulation.
 
-	#define DEBUG_CPU_TDP			0	// Set to 0 by default. Change this to 1 when you want to check the TDP.
+	#define DEBUG_CPU_TDP					0	// Set to 0 by default. Change this to 1 when you want to check the TDP.
 #endif
 
 //---------------------------------------------------------- CPU/STATIC_DATA.C -------------------------------------------------------------
 
 
 #if USE_STATIC_CPU_DATA
-	#define STATIC_CPU_Type				0x602			// kSMBTypeOemProcessorType - used in: libsaio/SMBIOS/dynamic_data.h
+	#define STATIC_CPU_Type					0x602			// kSMBTypeOemProcessorType - used in: libsaio/SMBIOS/dynamic_data.h
 
-	#define STATIC_CPU_NumThreads		4				// Used in: i386/libsaio/ACPI/ssdt_pr_generator.h
+	#define STATIC_CPU_NumThreads			4				// Used in: i386/libsaio/ACPI/ssdt_pr_generator.h
 
-	#define STATIC_CPU_FSBFrequency		100000000ULL	// 9 digits + ULL - used in: RevoBoot/i386/libsaio/efi.c
+	#define STATIC_CPU_FSBFrequency			100000000ULL	// 9 digits + ULL - used in: i386/libsaio/efi.c
 
-	#define STATIC_CPU_QPISpeed			0				// kSMBTypeOemProcessorBusSpeed (0 for Sandy Bridge / Jaketown).
+	#define STATIC_CPU_QPISpeed				0				// kSMBTypeOemProcessorBusSpeed (0 for Sandy Bridge / Jaketown).
 #endif
 
-#define STATIC_CPU_NumCores				4				// Set to 4 by default. Must be set to the number of cores for your processor!
-														//
-														// Note: Used in i386/libsaio/ACPI/ssdt_pr_generator.h, cpu.c and platform.c
-														//		 for both static and dynamic CPU data.
+#define STATIC_CPU_NumCores					4				// Set to 4 by default. Must be set to the number of cores for your processor!
+															//
+															// Note: Used in i386/libsaio/ACPI/ssdt_pr_generator.h, cpu.c and platform.c 
+															//		 for both static and dynamic CPU data.
 
 //--------------------------------------------------------------- DISK.C -------------------------------------------------------------------
 
 
-#define EFI_SYSTEM_PARTITION_SUPPORT	0	// Set to 0 by default. Set this to 1 when your system boots from the hidden EFI partition.
+#define EFI_SYSTEM_PARTITION_SUPPORT		0	// Set to 0 by default. Set this to 1 when your system boots from the hidden EFI partition.
 
-#define LEGACY_BIOS_READ_SUPPORT		0	// Set to 0 by default. Change this to 1 for crappy old BIOSes.
+#define LEGACY_BIOS_READ_SUPPORT			0	// Set to 0 by default. Change this to 1 for crappy old BIOSes.
 
 #if LION_RECOVERY_SUPPORT
-	#define CORE_STORAGE_SUPPORT		1	// Set to 0 by default since booting from a 'Recovery HD' partition may requires us to skip
-											// (encrypted) CoreStorage partitions.
+	#define CORE_STORAGE_SUPPORT			1	// Set to 1 by default since booting from a 'Recovery HD' partition may requires us to skip
+												// (encrypted) CoreStorage partitions.
 #else
-	#define CORE_STORAGE_SUPPORT		0	// Set to 0 by default. Change this to 1 when you want RevoBoot to boot from the 'Boot OS X'
-											// (usually the third) partition on a Fusion Drive (requires Mountain Lion 10.8.2).
+	#define CORE_STORAGE_SUPPORT			0	// Set to 0 by default. Change this to 1 when you want RevoBoot to boot from the 'Boot OS X'
+												// (usually the third) partition on a Fusion Drive (requires Mountain Lion 10.8.2).
 #endif
 
-#define APPLE_RAID_SUPPORT				0	// Set to 0 by default. Change this to 1 for Apple Software RAID support.
+#define APPLE_RAID_SUPPORT					0	// Set to 0 by default. Change this to 1 for Apple Software RAID support.
 
-#define DEBUG_DISK						0	// Set to 0 by default. Change it to 1 when things don't seem to work for you.
+#define DEBUG_DISK							0	// Set to 0 by default. Change it to 1 when things don't seem to work for you.
 
 
 //------------------------------------------------------------- DRIVERS.C -------------------------------------------------------------------
 
 
-#define DEBUG_DRIVERS					0	// Set to 0 by default. Change it to 1 when things don't seem to work for you.
+#define DEBUG_DRIVERS						0	// Set to 0 by default. Change it to 1 when things don't seem to work for you.
 
 
 //---------------------------------------------------------------- EFI.C -------------------------------------------------------------------
 
 
-#define APPLE_STYLE_EFI					1	// Set to 1 by default. Change this to 1 to add additional 'Mac-like' properties.
+#define APPLE_STYLE_EFI						1	// Set to 1 by default. Change this to 1 to add additional 'Mac-like' properties.
+
+#define INJECT_EFI_DEVICE_PROPERTIES		0	// Set to 0 by default. Change this to 1 when you need to inject 'device-properties'.
+												//
+												// Note: Required when not setting device-properties from your DSDT/SSDT.
 
-#define INJECT_EFI_DEVICE_PROPERTIES	0	// Set to 0 by default. Change this to 1 when you need to inject 'device-properties'.
-											//
-											// Note: Required when not setting device-properties from your DSDT/SSDT.
 #if INJECT_EFI_DEVICE_PROPERTIES
-	#define LOAD_STATIC_EFI_DATA_FROM_EXTRA	0	// Set to 0 by default. Change this to 1 to load: /Extra/EFI/[MacModelNN].bin
+	#define LOAD_MODEL_SPECIFIC_EFI_DATA	0	// Set to 0 by default. Use 1 to read: /Extra/EFI/[-MacModelNN].bin
 #endif
 
-#define EFI_64_BIT						1	// Set to 1 by default for EFI64 on 64-bit platforms. Supporting both
-											// 32 and 64-bit boot modes (using arch=i386/x86_64 under Kernel Flags).
-											//
-											// Change this to 0 for 32-bit only platforms (think Intel Atom CPU)
-											// or when you want to boot with EFI32 (for testing) on a 64-bit
-											// platform, but then you must make a small change in platform.c (see comment in file).
-											//
-											// Note: Do not change this setting, unless you know what you are doing.
+#define EFI_64_BIT							1	// Set to 1 by default for EFI64 on 64-bit platforms. Supporting both 
+												// 32 and 64-bit boot modes (using arch=i386/x86_64 under Kernel Flags).
+												// 
+												// Change this to 0 for 32-bit only platforms (think Intel Atom CPU) 
+												// or when you want to boot with EFI32 (for testing) on a 64-bit 
+												// platform, but then you must make a small change in platform.c (see comment in file).
+												//
+												// Note: Do not change this setting, unless you know what you are doing.
 
-#define EFI_SYSTEM_SERIAL_NUMBER		{ 'S', 'O', 'M', 'E', 'S', 'R', 'L', 'N', 'U', 'M', 'B', 'R' } // Example only!
+#define EFI_SYSTEM_SERIAL_NUMBER			{ 'S', 'O', 'M', 'E', 'S', 'R', 'L', 'N', 'U', 'M', 'B', 'R' }
 
-#define STATIC_SYSTEM_ID				{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F } // Example only!
+#define STATIC_SYSTEM_ID					{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F } // Example only!
 
-#define DEBUG_EFI						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
+#define DEBUG_EFI							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
-#define EFI_DEBUG_MODE					0	// Set to 0 by default (for OS X 10.7 LION only).
+#define EFI_DEBUG_MODE						0	// Set to 0 by default (for OS X 10.7 LION and greater).
 
 
 //------------------------------------------------------------- GRAPHICS.C -----------------------------------------------------------------
 
-#define USE_STATIC_DISPLAY_RESOLUTION	1	// Set to 0 by default. Use 1 when you need to override the resolution detection features
-											// in RevoBoot, which may not be supported by your BIOS and/or display (monitor).
+#define USE_STATIC_DISPLAY_RESOLUTION		1	// Set to 0 by default. Use 1 when you need to override the resolution detection features 
+												// in RevoBoot, which may not be supported by your BIOS and/or display (monitor).
 
-#define STATIC_SCREEN_WIDTH				1900	// Used (in RevoBoot v1.0.35 and greater) when USE_STATIC_DISPLAY_RESOLUTION is 1 and when
-												// USE_STATIC_DISPLAY_RESOLUTION is 0 but getResolutionFromEDID() isn't supported (failed).
+#define STATIC_SCREEN_WIDTH					1900	// Used (in RevoBoot v1.0.35 and greater) when USE_STATIC_DISPLAY_RESOLUTION is 1 and when
+													// USE_STATIC_DISPLAY_RESOLUTION is 0 but getResolutionFromEDID() isn't supported (failed).
 
-#define STATIC_SCREEN_HEIGHT			1200	// Used (in RevoBoot v1.0.35 and greater) when USE_STATIC_DISPLAY_RESOLUTION is 1 and when
-												// USE_STATIC_DISPLAY_RESOLUTION is 0 but getResolutionFromEDID() isn't supported (failed).
+#define STATIC_SCREEN_HEIGHT				1200	// Used (in RevoBoot v1.0.35 and greater) when USE_STATIC_DISPLAY_RESOLUTION is 1 and when 
+													// USE_STATIC_DISPLAY_RESOLUTION is 0 but getResolutionFromEDID() isn't supported (failed).
 
-#define DEBUG_BOOT_GRAPHICS				0	// Set to 0 by default. Use 1 when to see debug info.
+#define DEBUG_BOOT_GRAPHICS					0	// Set to 0 by default. Use 1 when to see debug info.
 
 
 //------------------------------------------------------------ STRINGTABLE.H ----------------------------------------------------------------
 
-#define LION_INSTALL_SUPPORT			0	// Set to 0 by default. Setting this to 1 will make RevoBoot search in specific directories
-											// for com.apple.Boot.plist – required for Mac like Lion OS X installations.
-
+#define LION_INSTALL_SUPPORT				0	// Set to 0 by default. Setting this to 1 will make RevoBoot search in specific directories
+												// for com.apple.Boot.plist – required for Mac like Lion OS X installations.
+												
 //-------------------------------------------------------------- SMBIOS.C ------------------------------------------------------------------
 
 
@@ -337,7 +346,7 @@
 #endif
 
 #if USE_STATIC_SMBIOS_DATA
-	#define LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA	0	// Set to 0 by default. Change this to 1 to load: /Extra/SMBIOS/[MacModelNN].bin
+	#define LOAD_MODEL_SPECIFIC_SMBIOS_DATA	0 	// Set to 0 by default. Change this to 1 to load: /Extra/SMBIOS/[MacModelNN].bin
 #endif
 
 #define OVERRIDE_DYNAMIC_MEMORY_DETECTION	0	// Set to 0 by default. Change this to 0 only when your SMBIOS data (type 17) is correct, or when
@@ -346,22 +355,23 @@
 												// Note: Defaults to n MB 1066 DDR3 when set to 0 (to prevent errors in Profile Manager).
 
 
-#define TARGET_MODEL						MACMINI	// Set to MACMINI by default. Supported models are:
-													//
-													// IMAC and IMAC_131, IMAC_122, IMAC_111, IMAC_121
-													// MACBOOK and MACBOOK_41
-													// MACBOOKAIR and MACBOOKAIR_42, MACBOOKAIR_41
-													// MACBOOKPRO and MACBOOKPRO_101, MACBOOKPRO_91, MACBOOKPRO_83, MACBOOKPRO_82,
-													// MACBOOKPRO_81, MACBOOKPRO_61
-													// MACMINI and MACMINI_53, MACMINI_52, MACMINI_51
-													// MACPRO and MACPRO_51, MACPRO_41, MACPRO_31
-													//
-													// Note: MACMINI (without _NNN) selects the default model (last one i.e. MACMINI_51).
+#define TARGET_MODEL					MACMINI	// Set to MACMINI by default. Supported models are:
+												//
+												// IMAC and IMAC_131, IMAC_122, IMAC_111, IMAC_121
+												// MACBOOK and MACBOOK_41
+												// MACBOOKAIR and MACBOOKAIR_42, MACBOOKAIR_41
+												// MACBOOKPRO and MACBOOKPRO_101, MACBOOKPRO_91, MACBOOKPRO_83, MACBOOKPRO_82,
+												// MACBOOKPRO_81, MACBOOKPRO_61
+												// MACMINI and MACMINI_53, MACMINI_52, MACMINI_51
+												// MACPRO and MACPRO_51, MACPRO_41, MACPRO_31
+												//
+												// Note: MACMINI (without _NNN) selects the default model (last one i.e. MACMINI_51).
 
 #define SMB_SYSTEM_SERIAL_NUMBER			"SOMESRLNUMBR" // Example only!
-												// Note: Match this with EFI_SYSTEM_SERIAL_NUMBER
 
-#define SMB_BOARD_SERIAL_NUMBER             "SOMESRLNUMBR" // Example only!
+#if (TARGET_MODEL & MACPRO)
+	#define SMB_BOARD_SERIAL_NUMBER			"SOMESRLNUMBR" // Example only!
+#endif
 
 #define DEBUG_SMBIOS						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
@@ -370,7 +380,7 @@
 
 
 #if USE_STATIC_SMBIOS_DATA
-	// Do nothing.
+												// Do nothing.
 #elif OVERRIDE_DYNAMIC_MEMORY_DETECTION
 												// Setup RAM module info. Please note that you may have to expand this when you have more RAM modules.
 	#define STATIC_RAM_SLOTS				4	// Number of RAM slots on mainboard.
@@ -382,20 +392,20 @@
 	#define DYNAMIC_RAM_OVERRIDE_SIZE		0	// Set to 0 by default. Change this to 1 when you want to use override values (see below).
 
 #if DYNAMIC_RAM_OVERRIDE_SIZE
-	#define DYNAMIC_RAM_OVERRIDE_SIZES	{ SMB_MEM_SIZE_2GB, SMB_MEM_BANK_EMPTY, SMB_MEM_SIZE_2GB, SMB_MEM_BANK_EMPTY, 0 } // See libsaio/platform.h for other values.
+	#define DYNAMIC_RAM_OVERRIDE_SIZES		{ SMB_MEM_SIZE_2GB, SMB_MEM_BANK_EMPTY, SMB_MEM_SIZE_2GB, SMB_MEM_BANK_EMPTY, 0 } // See libsaio/platform.h for other values.
 #endif
 
 	#define DYNAMIC_RAM_OVERRIDE_FREQUENCY	0	// Set to 0 by default. Change this to the frequency that you want to use as override value.
 
-	#define STATIC_RAM_PART_NUMBERS			{ "PartNum#0", "N/A", "PartNum#2", "N/A", 0 }	// Use "N/A" for empty RAM banks.
+	#define STATIC_RAM_PART_NUMBERS			{ "PartNum#0", "N/A", "PartNum#1", "N/A", 0 }	// Use "N/A" for empty RAM banks.
 
-	#define STATIC_RAM_SERIAL_NUMBERS		{ "Serial#0", "N/A", "Serial#2", "N/A", 0 }		// Use "N/A" for empty RAM banks.
+	#define STATIC_RAM_SERIAL_NUMBERS		{ "Serial#0", "N/A", "Serial#2", "N/A", 0 }	// Use "N/A" for empty RAM banks.
 #endif
 
 #define INCLUDE_MPS_TABLE					0	// Set to 0 by default. Change this to 1 when you want to include the MP table.
 
-#define DEBUG_PLATFORM						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
+#define	LOAD_MODEL_SPECIFIC_STATIC_DATA		(LOAD_MODEL_SPECIFIC_ACPI_DATA || LOAD_MODEL_SPECIFIC_EFI_DATA || LOAD_MODEL_SPECIFIC_SMBIOS_DATA)
 
+#define DEBUG_PLATFORM						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
 //================================================================= END ====================================================================
-

From 0fa8bfae4bf33d5e3cc1c179bdcf23c361038803 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 19:33:03 +0100
Subject: [PATCH 103/623] Patch for RevoBoot v1.5.34

---
 i386/config/settings.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/i386/config/settings.h b/i386/config/settings.h
index ad4fcb4..09da11a 100644
--- a/i386/config/settings.h
+++ b/i386/config/settings.h
@@ -3,10 +3,17 @@
  *
  * Updates:
  *
- *			- Read settings file based on given model identifier (PikerAlpha, October 2012).
+ *  		- Read settings file based on given model identifier (PikerAlpha, October 2012).
+ *			- COMMA_STRIPPED_MODEL_ID added (PikerAlpha, November 2012).
  */
 
-#define TO_STRING_DO(a)		#a
-#define STRING(a)			TO_STRING_DO(a)
+#define TO_STRING_DO(a)						#a
+#define STRING(a)							TO_STRING_DO(a)
 
 #include STRING(SETTINGS_FILE)
+
+/*
+ * gPlatform.ModelID is a char * initialized by a call to strdup(SMB_PRODUCT_NAME) in
+ * platform.c and we use strdup once more here so that gPlatform.ModelID is untouched.
+ */
+#define COMMA_STRIPPED_MODEL_ID	removeChar(strdup(gPlatform.ModelID), ',')

From b42ff7d63c6eb053e78819cf140172047d4d30c9 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 19:35:54 +0100
Subject: [PATCH 104/623] Patch for RevoBoot v1.5.34

---
 i386/libsaio/smbios.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/i386/libsaio/smbios.c b/i386/libsaio/smbios.c
index 267a0c6..eb8507a 100755
--- a/i386/libsaio/smbios.c
+++ b/i386/libsaio/smbios.c
@@ -13,7 +13,6 @@
 
 #if USE_STATIC_SMBIOS_DATA
 
-#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
 //==============================================================================
 
 int useStaticSMBIOSData(void * aMemoryAddress)
@@ -36,7 +35,7 @@ int useStaticSMBIOSData(void * aMemoryAddress)
 	
 	return tableLength;
 }
-#endif /* #if INJECT_EFI_DEVICE_PROPERTIES */
+
 
 //==============================================================================
 

From 27d81d300c035ea8a40ceb35d929dc8b7bea8e2f Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 22:46:29 +0100
Subject: [PATCH 105/623] Updating version info for RevoBoot v1.5.34

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index a26e0a8..e201dd3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.33
+1.5.34

From 344e6e25ebe2cfa6f484f76426f32fcee3cde6bc Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 23:05:26 +0100
Subject: [PATCH 106/623] Update to RevoBoot v1.5.34

---
 CHANGES | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGES b/CHANGES
index 008d1cf..3eab64a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,17 @@
+RevoBoot v1.5.34
+================
+- LOAD_STATIC_EFI_DATA_FROM_EXTRA in settings-template.h renamed to LOAD_MODEL_SPECIFIC_EFI_DATA (PikerAlpha, October 2012).
+- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA in settings-template.h renamed to LOAD_MODEL_SPECIFIC_SMBIOS_DATA (PikerAlpha, October 2012).
+- New LOAD_MODEL_SPECIFIC_ACPI_DATA setting in settings-template.h (PikerAlpha, October 2012).
+- New LOAD_MODEL_SPECIFIC_STATIC_DATA setting in settings-template.h (PikerAlpha, October 2012).
+
+Notes:
+
+Static EFI/SMBIOS data will be used when RevoBoot can't find model specific data: /Extra/[EFI/SMBIOS]/MacModelNN.bin
+DSDT.aml will be loaded when RevoBoot can't find: /Extra/ACPI/DSDT-MacModelNN.aml (example).
+You <i>must</i> use the latest version of RevoBoot/i386/config/settings-template.h or things won't work. 
+
+
 RevoBoot v1.5.33
 ================
 - Restored lost lines in RevoBoot/i386/libsaio/SMBIOS/static_data.h (PikerAlpha, November 2012).

From 5975a026b0f54ca7579590d23f319f4172ba8ac7 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 23:05:53 +0100
Subject: [PATCH 107/623] Fix version number

---
 i386/config/settings-template.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 8f553c8..65cbbbc 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Master Chief. All rights reserved.
  *
- * Note: This is an essential part of the build process for RevoBoot v1.5.32 and greater.
+ * Note: This is an essential part of the build process for RevoBoot v1.5.34 and greater.
  *
  * Updates:
  *

From 187236880cdb39fb8926973da0b89267fce020b2 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 3 Nov 2012 23:22:58 +0100
Subject: [PATCH 108/623] Typo, note about NetBoot/NetInstall and cleanups

---
 README | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 9da40cd..f0a28a3 100644
--- a/README
+++ b/README
@@ -1,12 +1,15 @@
 About this project:
+-------------------
 This Open Source hobby project is maintained by Pike and dgsga. Two long time supporters of the RevoBoot project.
 
 Note that we do not tolerate/share any (links to) copyrighted material. We only use purchased software and we won't share any of it. Just get your copy of OS X in the Apple store. Should be affordable for everyone.
 
 Mountain Lion Server:
+---------------------
 RevoBoot has been confirmed to work with the Server app for Mountain Lion (12C60).
 
 Fusion Drive Support:
+---------------------
 Apple's new Fusion Drive* is a software implementation to speedup the boot and load process for frequently used applications, without limiting the storage capacity in a bad way. See also: http://support.apple.com/kb/HT5446
 
 The new Mac's that come with a Fusion Drive boot from the third (Recovery HD like) partition on the SSD. This partition is 134.2 MB in size and is called "Boot OS X".
@@ -14,11 +17,19 @@ The Recovery HD partition can be found as third partition on the HDD. Setting up
 
 RevoBoot detects CoreStorage partitions and will boot from the boot helper partition on the SDD.
 
+NetBoot/NetInstall:
+-------------------
+People who have Mountain Lion Server setup and like to install their hack from it... sorry that won't work. The source 
+code snippets for it have been stripped out (by Master Chief in 2009) but we will fix this in a next update of RevoBoot. 
+
 Xcode Support for Mountain Lion:
-RevoBoot can be build on Snow Leopard, Lion and Mountain Lion. The latter requires Xcode 4.5.1 and a libcc_kext.a from an older version of Xcode. See change log for instructions.
+--------------------------------
+RevoBoot can be built on Snow Leopard, Lion and Mountain Lion. The latter requires Xcode 4.5.1 (and greater) and libcc_kext.a from an older version of Xcode. See change log for instructions.
 
+Note: The latest release of Xcode (4.5.2) also works with fine with an older copy libcc_kext.a.
 
 Configuration:
+--------------
 Please note that RevoBoot must be configured for your hardware so start reading our WiKi. See also:
 
 https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder

From ddaeb064be69154d71fd86a3457f74fa5c082561 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:00:24 +0100
Subject: [PATCH 109/623] Cleanups for RevoBoot v1.5.35

---
 i386/libsaio/allocate.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/allocate.c b/i386/libsaio/allocate.c
index f986219..fdd5849 100755
--- a/i386/libsaio/allocate.c
+++ b/i386/libsaio/allocate.c
@@ -36,10 +36,7 @@
 
 long AllocateMemoryRange(char * rangeName, long start, long length, long type)
 {
-	char *nameBuf;
-	uint32_t *buffer;
-    
-	nameBuf = malloc(strlen(rangeName) + 1);
+	char *nameBuf = malloc(strlen(rangeName) + 1);
 
 	if (nameBuf == 0)
 	{
@@ -48,10 +45,12 @@ long AllocateMemoryRange(char * rangeName, long start, long length, long type)
 
 	strcpy(nameBuf, rangeName);
 
-	buffer = malloc(2 * sizeof(uint32_t));
+	uint32_t *buffer = malloc(2 * sizeof(uint32_t));
 
 	if (buffer == 0)
 	{
+		free(nameBuf);
+
 		return -1;
 	}
     

From b7e97101d56ad8f2b81e320009fdd8f4d4121a20 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:01:04 +0100
Subject: [PATCH 110/623] Cleanups for RevoBoot v1.5.35

---
 i386/libsaio/bios.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/bios.h b/i386/libsaio/bios.h
index 0a0c927..7391450 100755
--- a/i386/libsaio/bios.h
+++ b/i386/libsaio/bios.h
@@ -32,7 +32,7 @@
 
 typedef union
 {
-	unsigned int		rx;
+	unsigned int	rx;
 	unsigned short	rr;
 
 	struct
@@ -87,13 +87,13 @@ typedef struct
 #define EBIOS_LOCKING_ACCESS		0x02
 #define EBIOS_ENHANCED_DRIVE_INFO	0x04
 
-#define BASE_HD_DRIVE			0x80
+#define BASE_HD_DRIVE				0x80
 
 /* 
  * Used in saio_types.h and in StringTable.c (function loadSystemConfig).
  */
 
-#define IO_CONFIG_DATA_SIZE		4096
+#define IO_CONFIG_DATA_SIZE			4096
 
 
 /*

From 585650095e8c66ba2f11ec4671da6bf09cdc85ea Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:01:37 +0100
Subject: [PATCH 111/623] Cleanups for RevoBoot v1.5.35

---
 i386/libsaio/biosfn.c | 82 ++++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 32 deletions(-)

diff --git a/i386/libsaio/biosfn.c b/i386/libsaio/biosfn.c
index 32a5c82..61f09c5 100755
--- a/i386/libsaio/biosfn.c
+++ b/i386/libsaio/biosfn.c
@@ -51,8 +51,8 @@ static biosBuf_t bb;
 
 int fastEnableA20(void)
 {
-	bb.intno = 0x15;	
-	bb.eax.rx = 0x2401;
+	bb.intno	= 0x15;
+	bb.eax.rx	= 0x2401;
 	bios(&bb);
 
 	// If successful: CF clear, AH = 00h. On error: CF set, AH = status
@@ -72,8 +72,8 @@ int bgetc(void)
      */
 	while(!readKeyboardStatus());
 
-	bb.intno = 0x16;
-	bb.eax.r.h = 0x00;
+	bb.intno	= 0x16;
+	bb.eax.r.h	= 0x00;
 	bios(&bb);
 
 	return bb.eax.rr;
@@ -150,7 +150,9 @@ unsigned long getMemoryMap(MemoryRange * rangeArray, unsigned long maxRangeCount
     // printf("Get memory map 0x%x, %d\n", rangeArray);
 	// getchar();
     if (maxRangeCount > (BIOS_LEN / sizeof(MemoryRange)))
+	{
         maxRangeCount = (BIOS_LEN / sizeof(MemoryRange));
+	}
 
     bb.ebx.rx = 0;  // Initial continuation value must be zero.
 
@@ -160,14 +162,13 @@ unsigned long getMemoryMap(MemoryRange * rangeArray, unsigned long maxRangeCount
         bb.eax.rx = 0xe820;
         bb.ecx.rx = kDescriptorSizeMin;
         bb.edx.rx = kMemoryMapSignature;
-        bb.edi.rr = NORMALIZED_OFFSET(  (unsigned long) range );
-        bb.es     = NORMALIZED_SEGMENT( (unsigned long) range );
+        bb.edi.rr = NORMALIZED_OFFSET(  (unsigned long) range);
+        bb.es     = NORMALIZED_SEGMENT( (unsigned long) range);
         bios(&bb);
 
         // Check for errors.
 
-        if ( bb.flags.cf ||   bb.eax.rx != kMemoryMapSignature
-            || bb.ecx.rx != kDescriptorSizeMin )
+        if (bb.flags.cf || bb.eax.rx != kMemoryMapSignature || bb.ecx.rx != kDescriptorSizeMin)
         {
             //printf("Got an error %x %x %x\n", bb.flags.cf,
             //       bb.eax.rx, bb.ecx.rx);
@@ -176,16 +177,19 @@ unsigned long getMemoryMap(MemoryRange * rangeArray, unsigned long maxRangeCount
 
         // Tally up the conventional/extended memory sizes.
 
-        if (range->type == kMemoryRangeUsable || range->type == kMemoryRangeACPI   ||
-            range->type == kMemoryRangeNVS )
+        if (range->type == kMemoryRangeUsable || range->type == kMemoryRangeACPI || range->type == kMemoryRangeNVS)
         {
             // Tally the conventional memory ranges.
             if (range->base + range->length <= 0xa0000)
+			{
                 conMemSize += range->length;
+			}
 
             // Record the top of extended memory.
             if (range->base >= EXTENDED_ADDR)
+			{
                 extMemSize += range->length;
+			}
         }
 
         range++;
@@ -193,13 +197,15 @@ unsigned long getMemoryMap(MemoryRange * rangeArray, unsigned long maxRangeCount
 
         // Is this the last address range?
 
-        if ( bb.ebx.rx == 0 ) {
+        if (bb.ebx.rx == 0)
+		{
             //printf("last range\n");
             break;
         }
     }
-    *conMemSizePtr = conMemSize / 1024;  // size in KB
-    *extMemSizePtr = extMemSize / 1024;  // size in KB
+
+    *conMemSizePtr = (conMemSize / 1024);  // size in KB
+    *extMemSizePtr = (extMemSize / 1024);  // size in KB
 
     // Copy out data
     bcopy((char *)BIOS_ADDR, rangeArray, ((char *)range - (char *)BIOS_ADDR));
@@ -339,7 +345,7 @@ int biosread(int dev, int cyl, int head, int sec, int num)
 	bb.intno = 0x13;
 	sec += 1;  // sector numbers start at 1.
     
-	for (i=0;;)
+	for (i = 0; ;)
 	{
 		bb.ecx.r.h = cyl;
 		bb.ecx.r.l = ((cyl & 0x300) >> 2) | (sec & 0x3F);
@@ -430,11 +436,11 @@ int ebiosread(int dev, unsigned long long sec, int count)
 
 void putc(int ch)
 {
-	bb.intno = 0x10;
-	bb.ebx.r.h = 0x00;  /* background black */
-	bb.ebx.r.l = 0x0F;  /* foreground white */
-	bb.eax.r.h = 0x0e;
-	bb.eax.r.l = ch;
+	bb.intno	= 0x10;
+	bb.ebx.r.h	= 0x00;  /* background black */
+	bb.ebx.r.l	= 0x0F;  /* foreground white */
+	bb.eax.r.h	= 0x0e;
+	bb.eax.r.l	= ch;
 	bios(&bb);
 }
 
@@ -516,9 +522,10 @@ int is_no_emulation(int drive)
 
 int get_drive_info(int drive, struct driveInfo *dp)
 {
-    boot_drive_info_t *di = &dp->di;
     int ret = 0;
 
+    boot_drive_info_t *di = &dp->di;
+
 #if UNUSED
     if (maxhd == 0)
     {
@@ -528,11 +535,15 @@ int get_drive_info(int drive, struct driveInfo *dp)
         bios(&bb);
 
         if (bb.flags.cf == 0)
+		{
             maxhd = 0x7f + bb.edx.r.l;
+		}
     };
 
     if (drive > maxhd)
+	{
         return 0;
+	}
 #endif
 
     bzero(dp, sizeof(struct driveInfo));
@@ -549,18 +560,21 @@ int get_drive_info(int drive, struct driveInfo *dp)
     bios(&bb);
 
     if ((bb.ebx.rr == 0xaa55) && (bb.flags.cf == 0))
+	{
         dp->uses_ebios = bb.ecx.r.l; // Get flags for supported operations.
+	}
 
     if (dp->uses_ebios & (EBIOS_ENHANCED_DRIVE_INFO | EBIOS_LOCKING_ACCESS | EBIOS_FIXED_DISK_ACCESS))
     {
         // Get EBIOS drive info.
         static struct drive_params params;
         params.buf_size = sizeof(params);
-        bb.intno = 0x13;
-        bb.eax.r.h = 0x48;
-        bb.edx.r.l = drive;
-        bb.esi.rr = NORMALIZED_OFFSET((unsigned)&params);
-        bb.ds     = NORMALIZED_SEGMENT((unsigned)&params);
+
+        bb.intno	= 0x13;
+        bb.eax.r.h	= 0x48;
+        bb.edx.r.l	= drive;
+        bb.esi.rr	= NORMALIZED_OFFSET((unsigned)&params);
+        bb.ds		= NORMALIZED_SEGMENT((unsigned)&params);
         bios(&bb);
 
         if (bb.flags.cf != 0 /* || params.phys_sectors < 2097152 */)
@@ -600,7 +614,9 @@ int get_drive_info(int drive, struct driveInfo *dp)
 #endif
 
     if (ret == 0)
+	{
         dp->valid = 1;
+	}
 
     return ret;
 }
@@ -610,8 +626,11 @@ int get_drive_info(int drive, struct driveInfo *dp)
 
 void sleep(int n)
 {
-    unsigned int endtime = (time18() + 18*n);
-    while (time18() < endtime);
+	if (n < 60)
+	{
+		unsigned int endtime = (time18() + (18*n));
+		while (time18() < endtime);
+	}
 }
 
 
@@ -619,10 +638,9 @@ void sleep(int n)
 
 void delay(int ms)
 {
-    bb.intno = 0x15;
-    bb.eax.r.h = 0x86;
-    bb.ecx.rr = ms >> 16;
-    bb.edx.rr = ms & 0xFFFF;
+    bb.intno	= 0x15;
+    bb.eax.r.h	= 0x86;
+    bb.ecx.rr	= ms >> 16;
+    bb.edx.rr	= ms & 0xFFFF;
     bios(&bb);
 }
-

From e7ed8ffac7f26d3c0b9f82142d3c3e444711c6ef Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:02:22 +0100
Subject: [PATCH 112/623] Cleanups for RevoBoot v1.5.35

---
 i386/libsaio/efi.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 77f7df7..4b35f18 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -253,9 +253,9 @@ void *convertHexStr2Binary(const char *hexStr, int *outLength)
 {
 	int len;
 	char hexNibble;
-	char hexByte[2];
+	char hexByte[2] = "";
 	uint8_t binChar;
-	uint8_t *binStr;
+	uint8_t *binStr = NULL;
 	int hexStrIdx, binStrIdx, hexNibbleIdx;
 	
 	len = strlen(hexStr);
@@ -331,22 +331,31 @@ static EFI_UINT32* getUUIDFromString(const char * givenUUID) // Patch by: rekurs
 			char szUUID[37]; // 0-35 (36) + 1
 			char *p = szUUID;
 			
-			while (*givenUUID) {
+			while (*givenUUID)
+			{
 				if (*givenUUID != '-')
+				{
 					*p++ = *givenUUID++;
+				}
 				else
+				{
 					givenUUID++;
+				}
 			}
 			*p = '\0';
 			void* binaryString = convertHexStr2Binary(szUUID, &size);
 			
 			if (binaryString && size == 16)
+			{
 				return (EFI_UINT32*) binaryString;
+			}
 			
 			verbose("%swrong format maybe?\n", errStr);
 		}
 		else
+		{
 			verbose("%slength should be 36.\n", errStr);
+		}
 	}
 	return (EFI_UINT32*) 0;
 }

From 896c00258686fbfb6bce2bf974ed04e8f48265ef Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:03:02 +0100
Subject: [PATCH 113/623] Cleanups for RevoBoot v1.5.35

---
 i386/libsaio/hfs_compare.c | 340 ++++++++++++++++++++++++-------------
 1 file changed, 221 insertions(+), 119 deletions(-)

diff --git a/i386/libsaio/hfs_compare.c b/i386/libsaio/hfs_compare.c
index 405a571..8b86b60 100755
--- a/i386/libsaio/hfs_compare.c
+++ b/i386/libsaio/hfs_compare.c
@@ -31,45 +31,60 @@
 #include "hfs_CaseTables.h"
 
 #if ! UNCOMPRESSED
+//==============================================================================
 
 static unsigned short * UncompressStructure(struct compressed_block *bp, int count, int size)
 {
-    unsigned short *out = malloc(size);
-    unsigned short *op = out;
-    unsigned short data;
-    int i, j;
-
-    for (i=0; i<count; i++, bp++) {
-        // If this happens (it shouldn't) please fix size and/or double check that count really is
-        // the number of elements in the array.
-        // This was a very hard bug to find, so please leave this code here.
-        if(out + size <= op + bp->count)
-        {
-            stop("HFS+ Unicode tables are malformed\n");
-        }
-        data = bp->data;
-        for (j=0; j<bp->count; j++) {
-            *op++ = data;
-            if (bp->type == kTypeAscending) data++;
-            else if (bp->type == kTypeAscending256) data += 256;
-        }
-    }
-    return out;
+	int i, j;
+
+	unsigned short *out = malloc(size);
+	unsigned short *op = out;
+	unsigned short data;
+
+	for (i = 0; i < count; i++, bp++)
+	{
+		// If this happens (it shouldn't) please fix size and/or double check that count really is
+		// the number of elements in the array.
+		// This was a very hard bug to find, so please leave this code here.
+		if (out + size <= op + bp->count)
+		{
+			stop("HFS+ Unicode tables are malformed\n");
+		}
+
+		data = bp->data;
+
+		for (j = 0; j <bp->count; j++)
+		{
+			*op++ = data;
+
+			if (bp->type == kTypeAscending)
+			{
+				data++;
+			}
+			else if (bp->type == kTypeAscending256)
+			{
+				data += 256;
+			}
+		}
+	}
+
+	return out;
 }
 
+
+//==============================================================================
+
 static void InitCompareTables(void)
 {
-    if (gCompareTable == 0) {
-        gCompareTable = UncompressStructure(gCompareTableCompressed,
-                                            kCompareTableNBlocks, kCompareTableDataSize);
-        gLowerCaseTable = UncompressStructure(gLowerCaseTableCompressed,
-                                            kLowerCaseTableNBlocks, kLowerCaseTableDataSize);
-    }
+	if (gCompareTable == 0)
+	{
+		gCompareTable = UncompressStructure(gCompareTableCompressed, kCompareTableNBlocks, kCompareTableDataSize);
+		gLowerCaseTable = UncompressStructure(gLowerCaseTableCompressed, kLowerCaseTableNBlocks, kLowerCaseTableDataSize);
+	}
 }
-
 #endif /* ! UNCOMPRESSED */
 
-//_______________________________________________________________________
+//==============================================================================
 //
 //	Routine:	FastRelString
 //
@@ -77,7 +92,7 @@ static void InitCompareTables(void)
 //				returns  1 if str1 > str2
 //				return	 0 if equal
 //
-//_______________________________________________________________________
+//==============================================================================
 
 int32_t	FastRelString(u_int8_t * str1, u_int8_t * str2)
 {
@@ -85,16 +100,20 @@ int32_t	FastRelString(u_int8_t * str1, u_int8_t * str2)
 	u_int8_t length, length2;
 
 #if ! UNCOMPRESED
-        InitCompareTables();
+	InitCompareTables();
 #endif
 
 	length = *(str1++);
 	length2 = *(str2++);
 
 	if (length == length2)
+	{
 		bestGuess = 0;
+	}
 	else if (length < length2)
+	{
 		bestGuess = -1;
+	}
 	else
 	{
 		bestGuess = 1;
@@ -116,12 +135,16 @@ int32_t	FastRelString(u_int8_t * str1, u_int8_t * str2)
 			bSortWord = gCompareTable[bChar];
 
 			if (aSortWord > bSortWord)
+			{
 				return 1;
+			}
 
 			if (aSortWord < bSortWord)
+			{
 				return -1;
+			}
 		}
-		
+
 		/*
 		 * If characters match exactly, then go on to next character
 		 * immediately without doing any extra work.
@@ -133,6 +156,7 @@ int32_t	FastRelString(u_int8_t * str1, u_int8_t * str2)
 }	
 
 
+//==============================================================================
 //
 //	FastUnicodeCompare - Compare two Unicode strings; produce a relative ordering
 //
@@ -190,91 +214,125 @@ int32_t	FastRelString(u_int8_t * str1, u_int8_t * str2)
 //			return 1;
 //
 
-int32_t FastUnicodeCompare( u_int16_t * str1, register u_int32_t length1,
-                            u_int16_t * str2, register u_int32_t length2, int byte_order )
+int32_t FastUnicodeCompare(u_int16_t * str1, register u_int32_t length1,
+                            u_int16_t * str2, register u_int32_t length2, int byte_order)
 {
-	register u_int16_t c1,c2;
+	register u_int16_t c1, c2;
 	register u_int16_t temp;
 
 #if ! UNCOMPRESSED
-        InitCompareTables();
+	InitCompareTables();
 #endif
 
-	while (1) {
+	while (1)
+	{
 		/* Set default values for c1, c2 in case there are no more valid chars */
 		c1 = 0;
 		c2 = 0;
 
 		/* Find next non-ignorable char from str1, or zero if no more */
-		while (length1 && c1 == 0) {
+		while (length1 && c1 == 0)
+		{
 			if (byte_order == OSBigEndian)
+			{
 				c1 = SWAP_BE16(*(str1++));
+			}
 			else
+			{
 				c1 = SWAP_LE16(*(str1++));
+			}
+
 			--length1;
+
 			if ((temp = gLowerCaseTable[c1>>8]) != 0)		// is there a subtable for this upper byte?
+			{
 				c1 = gLowerCaseTable[temp + (c1 & 0x00FF)];	// yes, so fold the char
+			}
 		}
 
 		/* Find next non-ignorable char from str2, or zero if no more */
-		while (length2 && c2 == 0) {
+		while (length2 && c2 == 0)
+		{
 			if (byte_order == OSBigEndian)
+			{
 				c2 = SWAP_BE16(*(str2++));
+			}
 			else
+			{
 				c2 = SWAP_LE16(*(str2++));
+			}
+
 			--length2;
+
 			if ((temp = gLowerCaseTable[c2>>8]) != 0)		// is there a subtable for this upper byte?
+			{
 				c2 = gLowerCaseTable[temp + (c2 & 0x00FF)];	// yes, so fold the char
+			}
 		}
 
 		if (c1 != c2)	/* found a difference, so stop looping */
+		{
 			break;
+		}
 		
 		if (c1 == 0)		/* did we reach the end of both strings at the same time? */
+		{
 			return 0;	/* yes, so strings are equal */
+		}
 	}
 	
 	if (c1 < c2)
+	{
 		return -1;
-	else
-		return 1;
+	}
+
+	return 1;
 }
 
 
+//==============================================================================
 //
 //  BinaryUnicodeCompare - Compare two Unicode strings; produce a relative ordering
 //  Compared using a 16-bit binary comparison (no case folding)
-//
-int32_t BinaryUnicodeCompare (u_int16_t * str1, u_int32_t length1,
-                              u_int16_t * str2, u_int32_t length2)
+
+int32_t BinaryUnicodeCompare(u_int16_t * str1, u_int32_t length1, u_int16_t * str2, u_int32_t length2)
 {
-        register u_int16_t c1, c2;
-        int32_t bestGuess;
-        u_int32_t length;
-
-        bestGuess = 0;
-
-        if (length1 < length2) {
-                length = length1;
-                --bestGuess;
-        } else if (length1 > length2) {
-                length = length2;
-                ++bestGuess;
-        } else {
-                length = length1;
-        }
-
-        while (length--) {
-                c1 = *(str1++);
-                c2 = *(str2++);
-
-                if (c1 > c2)
-                        return (1);
-                if (c1 < c2)
-                        return (-1);
-        }
-
-        return (bestGuess);
+	register u_int16_t c1, c2;
+	int32_t bestGuess = 0;
+	u_int32_t length;
+
+	if (length1 < length2)
+	{
+		length = length1;
+		--bestGuess;
+	}
+	else if (length1 > length2)
+	{
+		length = length2;
+		++bestGuess;
+	}
+	else
+	{
+		length = length1;
+	}
+
+	while (length--)
+	{
+		c1 = *(str1++);
+		c2 = *(str2++);
+
+		if (c1 > c2)
+		{
+			return (1);
+		}
+
+		if (c1 < c2)
+        {
+			return (-1);
+		}
+	}
+
+	return (bestGuess);
 }
 
 
@@ -304,36 +362,57 @@ int32_t BinaryUnicodeCompare (u_int16_t * str1, u_int32_t length1,
  * ucslen is the number of UCS-2 input characters (not bytes)
  * bufsize is the size of the output buffer in bytes
  */
-void utf_encodestr( const u_int16_t * ucsp, int ucslen,
-               u_int8_t * utf8p, u_int32_t bufsize, int byte_order )
+
+void utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32_t bufsize, int byte_order)
 {
 	u_int8_t *bufend;
 	u_int16_t ucs_ch;
 
 	bufend = utf8p + bufsize;
 
-	while (ucslen-- > 0) {
-                if (byte_order == OSBigEndian)
-		    ucs_ch = SWAP_BE16(*ucsp++);
-                else
-                    ucs_ch = SWAP_LE16(*ucsp++);
+	while (ucslen-- > 0)
+	{
+		if (byte_order == OSBigEndian)
+		{
+			ucs_ch = SWAP_BE16(*ucsp++);
+		}
+		else
+		{
+			ucs_ch = SWAP_LE16(*ucsp++);
+		}
 
-		if (ucs_ch < 0x0080) {
+		if (ucs_ch < 0x0080)
+		{
 			if (utf8p >= bufend)
+			{
 				break;
+			}
+
 			if (ucs_ch == '\0')
+			{
 				continue;	/* skip over embedded NULLs */
+			}
+
 			*utf8p++ = ucs_ch;
 
-		} else if (ucs_ch < 0x800) {
+		}
+		else if (ucs_ch < 0x800)
+		{
 			if ((utf8p + 1) >= bufend)
+			{
 				break;
+			}
+
 			*utf8p++ = (ucs_ch >> 6)   | 0xc0;
 			*utf8p++ = (ucs_ch & 0x3f) | 0x80;
-
-		} else {
+		}
+		else
+		{
 			if ((utf8p + 2) >= bufend)
+			{
 				break;
+			}
+
 			*utf8p++ = (ucs_ch >> 12)         | 0xe0;
 			*utf8p++ = ((ucs_ch >> 6) & 0x3f) | 0x80;
 			*utf8p++ = ((ucs_ch) & 0x3f)      | 0x80;
@@ -351,6 +430,7 @@ void utf_encodestr( const u_int16_t * ucsp, int ucslen,
  * ucslen is the number of UCS-2 output characters (not bytes)
  * bufsize is the size of the output buffer in bytes
  */
+
 void utf_decodestr(const u_int8_t * utf8p, u_int16_t * ucsp, u_int16_t * ucslen, u_int32_t bufsize, int byte_order)
 {
 	u_int16_t *bufstart;
@@ -361,58 +441,80 @@ void utf_decodestr(const u_int8_t * utf8p, u_int16_t * ucsp, u_int16_t * ucslen,
 	bufstart = ucsp;
 	bufend = (u_int16_t *)((u_int8_t *)ucsp + bufsize);
 
-	while ((byte = *utf8p++) != '\0') {
+	while ((byte = *utf8p++) != '\0')
+	{
 		if (ucsp >= bufend)
+		{
 			break;
+		}
 
 		/* check for ascii */
-		if (byte < 0x80) {
+		if (byte < 0x80)
+		{
 			ucs_ch = byte;
 			
-                        if (byte_order == OSBigEndian)
-		            *ucsp++ = SWAP_BE16(ucs_ch);
-                        else
-                            *ucsp++ = SWAP_LE16(ucs_ch);
-			
+			if (byte_order == OSBigEndian)
+			{
+				*ucsp++ = SWAP_BE16(ucs_ch);
+			}
+			else
+			{
+				*ucsp++ = SWAP_LE16(ucs_ch);
+			}
+
 			continue;
 		}
 
-		switch (byte & 0xf0) {
-		/*  2 byte sequence*/
-		case 0xc0:
-		case 0xd0:
-			/* extract bits 6 - 10 from first byte */
-			ucs_ch = (byte & 0x1F) << 6;  
-			break;
-		/* 3 byte sequence*/
-		case 0xe0:
-			/* extract bits 12 - 15 from first byte */
-			ucs_ch = (byte & 0x0F) << 6;
-
-			/* extract bits 6 - 11 from second byte */
-			if (((byte = *utf8p++) & 0xc0) != 0x80)
-				goto stop;
-
-			ucs_ch += (byte & 0x3F);
-			ucs_ch <<= 6;
-			break;
-		default:
-			goto stop;
+		switch (byte & 0xf0)
+		{
+			/*  2 byte sequence*/
+			case 0xc0:
+			case 0xd0:	/* extract bits 6 - 10 from first byte */
+						ucs_ch = (byte & 0x1F) << 6;
+						break;
+			/* 3 byte sequence*/
+			case 0xe0:
+						/* extract bits 12 - 15 from first byte */
+						ucs_ch = (byte & 0x0F) << 6;
+
+						/* extract bits 6 - 11 from second byte */
+						if (((byte = *utf8p++) & 0xc0) != 0x80)
+						{
+							goto stop;
+						}
+
+						ucs_ch += (byte & 0x3F);
+						ucs_ch <<= 6;
+						break;
+			default:
+						goto stop;
 		}
 
 		/* extract bits 0 - 5 from final byte */
 		if (((byte = *utf8p++) & 0xc0) != 0x80)
+		{
 			goto stop;
-		ucs_ch += (byte & 0x3F);  
+		}
+
+		ucs_ch += (byte & 0x3F);
 
-                if (byte_order == OSBigEndian)
-                    *ucsp++ = SWAP_BE16(ucs_ch);
-                else
-                    *ucsp++ = SWAP_LE16(ucs_ch);
+		if (byte_order == OSBigEndian)
+		{
+			*ucsp++ = SWAP_BE16(ucs_ch);
+		}
+		else
+		{
+			*ucsp++ = SWAP_LE16(ucs_ch);
+		}
 	}
+
 stop:
-        if (byte_order == OSBigEndian)
-            *ucslen = SWAP_BE16(ucsp - bufstart);
-        else
-            *ucslen = SWAP_LE16(ucsp - bufstart);
+	if (byte_order == OSBigEndian)
+	{
+		*ucslen = SWAP_BE16(ucsp - bufstart);
+	}
+    else
+	{
+		*ucslen = SWAP_LE16(ucsp - bufstart);
+	}
 }

From d2ae81d752ad1fb3d65675e2ce96a5ad7d3cb5f8 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:04:20 +0100
Subject: [PATCH 114/623] Feature enhancements for RevoBoot v1.5.35

---
 i386/libsaio/smbios.c | 110 ++++++++++++++++++++++++++----------------
 1 file changed, 68 insertions(+), 42 deletions(-)

diff --git a/i386/libsaio/smbios.c b/i386/libsaio/smbios.c
index eb8507a..deb8ae0 100755
--- a/i386/libsaio/smbios.c
+++ b/i386/libsaio/smbios.c
@@ -6,37 +6,16 @@
  *			- Dynamic and static SMBIOS data gathering added by DHP in 2010.
  *			- Refactorized by DHP in 2011.
  *			- Get static EFI data (optional) from /Extra/EFI/[MacModelNN].bin (PikerAlpha, October 2012).
+ *			- Set newEPS->dmi.tableLength to fileSize when model specific data is loaded (PikerAlpha, November 2012).
+ *			- Get number of table structures from loaded model specific SMBIOS data (PikerAlpha, November 2012).
+ *			- Set newEPS->maxStructureSize when SET_MAX_STRUCTURE_LENGTH is set (PikerAlpha, November 2012).
+ *			- Check/correct errors in RevoBoot/i386/config/SMBIOS/[data-template/MacModelNN].h (PikerAlpha, November 2012).
  */
 
 #include "platform.h"
 
 
 #if USE_STATIC_SMBIOS_DATA
-
-//==============================================================================
-
-int useStaticSMBIOSData(void * aMemoryAddress)
-{
-	// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
-	#include STRING(SMBIOS_DATA_FILE)
-
-	static uint32_t SMBIOS_Table[] =
-	{
-		// Replaced with data from: RevoBoot/i386/config/SMBIOS/[data-template/MacModelNN].h
-		STATIC_SMBIOS_DATA
-	};
-
-	_SMBIOS_DEBUG_DUMP("Using statically linked SMBIOS data\n");
-
-	int tableLength = sizeof(SMBIOS_Table);
-
-	// Copy the static SMBIOS data into the newly allocated memory page. Right after the new EPS.
-	memcpy(aMemoryAddress, SMBIOS_Table, tableLength);
-	
-	return tableLength;
-}
-
-
 //==============================================================================
 
 void setupSMBIOS(void)
@@ -75,41 +54,88 @@ void setupSMBIOS(void)
     newEPS->dmi.anchor[3]		= 0x49;		// I
     newEPS->dmi.anchor[4]		= 0x5f;		// _
     newEPS->dmi.checksum		= 0;
-    newEPS->dmi.tableLength		= tableLength; 
+    newEPS->dmi.tableLength		= tableLength;
     newEPS->dmi.tableAddress	= (uint32_t) (kernelMemory + sizeof(struct SMBEntryPoint)); 
     newEPS->dmi.bcdRevision		= 0x24;
-	newEPS->dmi.structureCount	= STATIC_SMBIOS_DMI_STRUCTURE_COUNT;	// Defined in RevoBoot/i386/config/SMBIOS/data-template.h
+	newEPS->dmi.structureCount	= STATIC_SMBIOS_DMI_STRUCTURE_COUNT;	// Defined in RevoBoot/i386/config/SMBIOS/[data-template/MacModelNN].h
 
-#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
+	// Safety measure to protect people from doing something that breaks the boot process.
+	// #define FORCED_CHECK ((STATIC_SMBIOS_DMI_STRUCTURE_COUNT == 0) || (SET_MAX_STRUCTURE_LENGTH && (STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE == 0)))
+	#define FORCED_CHECK	((STATIC_SMBIOS_DMI_STRUCTURE_COUNT == 0) || SET_MAX_STRUCTURE_LENGTH)
+
+#if (LOAD_MODEL_SPECIFIC_SMBIOS_DATA || FORCED_CHECK)
 	/*
-	 * This is nothing more than a mere stop gap solution, since using the factory values here, instead of walking over 
-	 * staticSMBIOSData to get them, may hang the kernel at boot time (will be fixed in a next update of RevoBoot).
+	 * Get number of SMBIOS table structures from the loaded model specific SMBIOS data, or
+	 * when we have 0 values in: RevoBoot/i386/config/SMBIOS/[data-template/MacModelNN].bin
 	 */
-	if (fileSize > 0)
+	if ((fileSize > 0) || FORCED_CHECK)
 	{
-		newEPS->maxStructureSize	= factoryEPS->maxStructureSize;		// Defined in RevoBoot/i386/libsaio/SMBIOS/static_data.h
-		newEPS->dmi.structureCount	= factoryEPS->dmi.structureCount;	// Defined in RevoBoot/i386/libsaio/SMBIOS/static_data.h
-		
-		_SMBIOS_DEBUG_DUMP("factoryEPS->maxStructureSize  : %d\n", factoryEPS->maxStructureSize);
-		_SMBIOS_DEBUG_DUMP("factoryEPS->dmi.structureCount: %d\n", factoryEPS->dmi.structureCount);
-		_SMBIOS_DEBUG_SLEEP(1);
-	}
+		UInt16 structureCount = 0;
+
+		char * structurePtr = (char *)newEPS->dmi.tableAddress;
+		char * structureEnd = (structurePtr + newEPS->dmi.tableLength);
+	
+		while (structureEnd > (structurePtr + sizeof(SMBStructHeader)))
+		{
+			struct SMBStructHeader * header = (struct SMBStructHeader *) structurePtr;
+
+#if SET_MAX_STRUCTURE_LENGTH
+			char * stringsPtr = structurePtr;
+		#if DEBUG_SMBIOS
+			SMBByte currentStructureType = header->type;
+		#endif
 #endif
+			// Skip the formatted area of the structure.
+			structurePtr += header->length;
+
+			/*
+			 * Skip the unformatted structure area at the end (strings).
+			 * Using word comparison instead of checking two bytes (thanks to Kabyl).
+			 */
+			for (; ((uint16_t *)structurePtr)[0] != 0; structurePtr++);
+
+			// Adjust pointer after locating the double 0 terminator.
+			structurePtr += 2;
+
+			// Update structure counter.
+			structureCount++;
+	
+			_SMBIOS_DEBUG_DUMP("structureCount: %d\n", structureCount);
+
+#if SET_MAX_STRUCTURE_LENGTH
+			UInt16 maxStructureSize = (structurePtr - stringsPtr);
+
+			if (newEPS->maxStructureSize < maxStructureSize)
+			{
+				newEPS->maxStructureSize = maxStructureSize;
+			}
+			
+			_SMBIOS_DEBUG_DUMP("Structure (%d) length: %3d bytes.\n", currentStructureType, maxStructureSize);
+			_SMBIOS_DEBUG_SLEEP(1);
+#endif	// #if SET_MAX_STRUCTURE_LENGTH
+		}
+		// Uodate number of structures (boot hang without the correct value).
+		newEPS->dmi.structureCount = structureCount;
+	}
+#endif	// #if (LOAD_MODEL_SPECIFIC_SMBIOS_DATA || FORCED_CHECK)
+	/*
+	 * newEPS->dmi.tableLength represents the length of the static data, or the size
+	 * of the model specific SMBIOS data file from: /Extra/SMBIOS/MacModelNN.bin
+	 */
+	_SMBIOS_DEBUG_DUMP("newEPS->dmi.structureCount: %d\nnewEPS.dmi.tableLength: %d\n", newEPS->dmi.structureCount, newEPS->dmi.tableLength);
 
     // Take care of possible checksum errors
     newEPS->dmi.checksum		= 256 - checksum8(&newEPS->dmi, sizeof(newEPS->dmi));
     newEPS->checksum			= 256 - checksum8(newEPS, sizeof(* newEPS));
 
-	_SMBIOS_DEBUG_DUMP("newEPS->dmi.structureCount: %d - tableLength: %d\n", newEPS->dmi.structureCount, newEPS->dmi.tableLength);
-
-	// Used to update the EFI Configuration Table (in efi.c) which is 
+	// Used to update the EFI Configuration Table (in efi.c) which is
 	// what AppleSMBIOS.kext reads to setup the SMBIOS table for OS X.
 	gPlatform.SMBIOS.BaseAddress = (uint32_t) newEPS;
 
 	_SMBIOS_DEBUG_DUMP("New SMBIOS replacement setup.\n");
 	_SMBIOS_DEBUG_SLEEP(5);
 }
-#else
+#else // #if USE_STATIC_SMBIOS_DATA
 
 #include "smbios/dynamic_data.h"
 

From 43ba53217f12e8466c2baced2dd5974cda44deee Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:05:06 +0100
Subject: [PATCH 115/623] Adding SMBStructHeader for RevoBoot v1.5.35

---
 i386/libsaio/smbios/essentials.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/essentials.h b/i386/libsaio/smbios/essentials.h
index dc2ad54..9b4a970 100755
--- a/i386/libsaio/smbios/essentials.h
+++ b/i386/libsaio/smbios/essentials.h
@@ -58,4 +58,11 @@ struct SMBEntryPoint
 	struct DMIEntryPoint dmi;
 } __attribute__((packed));
 
-#endif /* !__LIBSAIO_SMBIOS_ESSENTIALS_H */
\ No newline at end of file
+typedef struct SMBStructHeader
+{
+    SMBByte    type;
+    SMBByte    length;
+    SMBWord    handle;
+} __attribute__((packed)) SMBStructHeader;
+
+#endif /* !__LIBSAIO_SMBIOS_ESSENTIALS_H */

From 00894237c7aebbcdedc1c7e5ac7990bc30ee2f6d Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:06:24 +0100
Subject: [PATCH 116/623] Feature enhancements for RevoBoot v1.5.35

---
 i386/libsaio/smbios/static_data.h | 102 ++++++++++++++----------------
 1 file changed, 47 insertions(+), 55 deletions(-)

diff --git a/i386/libsaio/smbios/static_data.h b/i386/libsaio/smbios/static_data.h
index efe7645..dc4f429 100755
--- a/i386/libsaio/smbios/static_data.h
+++ b/i386/libsaio/smbios/static_data.h
@@ -14,73 +14,65 @@
 #ifndef __LIBSAIO_SMBIOS_STATIC_DATA_H
 #define __LIBSAIO_SMBIOS_STATIC_DATA_H
 
-#include "essentials.h"
+	#include "essentials.h"
 
-int tableLength = 0;
+	int tableLength = 0;
+	long fileSize = 0;
 
-#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
+	#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
+		char dirSpec[32] = "";
+		void * staticSMBIOSData = (void *)kLoadAddr;
 
-	#define SMBIOS_SEARCH_BASE		0x000F0000
-	#define SMBIOS_SEARCH_END		0x000FFFFF
-	#define SMBIOS_ANCHOR			0x5f4d535f	// '_SM_' in Little Endian.
-	#define SMBIOS_MPS_ANCHOR		0x5f504d5f	// '_MP_' in Little Endian.
+		sprintf(dirSpec, "/Extra/SMBIOS/%s.bin", COMMA_STRIPPED_MODEL_ID);
 
-	_SMBIOS_DEBUG_DUMP("in getEPSAddress()\n");
+		_SMBIOS_DEBUG_DUMP("Loading: %s", dirSpec);
 
-	void *baseAddress = (void *)SMBIOS_SEARCH_BASE;
+		fileSize = loadBinaryData(dirSpec, &staticSMBIOSData);
 
-	for(; baseAddress <= (void *)SMBIOS_SEARCH_END; baseAddress += 16)
-	{
-		if (*(uint32_t *)baseAddress == SMBIOS_ANCHOR) // _SM_
+		if (fileSize > 0)
 		{
-			if (checksum8(baseAddress, sizeof(struct SMBEntryPoint)) == 0)
-			{
-	#if INCLUDE_MP_TABLE
-				// SMBIOS table located. Use this address as starting point.
-				void * mpsAddress = baseAddress;
-			
-				// Now search for the Multi Processor table.
-				for(; mpsAddress <= (void *)SMBIOS_SEARCH_END; mpsAddress += 16)
-				{
-					if (*(uint32_t *)mpsAddress == SMBIOS_MPS_ANCHOR)
-					{
-						gPlatform.MP.BaseAddress = (uint32_t)mpsAddress;
-						break;
-					}
-				}
-	#endif // INCLUDE_MP_TABLE
+			memcpy((kernelMemory + sizeof(* newEPS)), staticSMBIOSData, fileSize);
 
-				break;
+			// factoryEPS = (struct SMBEntryPoint *) baseAddress;
+		
+			tableLength = fileSize;
 
-				_SMBIOS_DEBUG_DUMP("SMBIOS baseAddress: 0x%08x\n", baseAddress);
-			}
+			_SMBIOS_DEBUG_DUMP("\n");
 		}
-	}
-
-	char dirSpec[32] = "";
-
-	void * staticSMBIOSData = (void *)kLoadAddr;
-
-	struct SMBEntryPoint *factoryEPS;
-
-	sprintf(dirSpec, "/Extra/SMBIOS/%s.bin", COMMA_STRIPPED_MODEL_ID);
-
-	_SMBIOS_DEBUG_DUMP("Loading: %s\n", dirSpec);
+		else // File not found. Use static data defined in RevoBoot/i386/config/SMBIOS/
+		{
+			// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
+			#include STRING(SMBIOS_DATA_FILE)
+		
+			static uint32_t SMBIOS_Table[] =
+			{
+				// Replaced with data from: RevoBoot/i386/config/SMBIOS/[data-template/MacModelNN].h
+				STATIC_SMBIOS_DATA
+			};
 
-	long fileSize = loadBinaryData(dirSpec, &staticSMBIOSData);
+			tableLength = sizeof(SMBIOS_Table);
 
-	if (fileSize > 0)
-	{
-		memcpy((kernelMemory + sizeof(* newEPS)), staticSMBIOSData, fileSize);
+			_SMBIOS_DEBUG_DUMP("Error: File not found!\nNow trying statically linked SMBIOS data: %d bytes\n", tableLength);
 
-		factoryEPS = (struct SMBEntryPoint *) baseAddress;
-	}
-	else // File not found. Use static data defined in RevoBoot/i386/config/SMBIOS/
-	{
-		tableLength = useStaticSMBIOSData((kernelMemory + sizeof(* newEPS)));
-	}
-#else
-		tableLength = useStaticSMBIOSData((kernelMemory + sizeof(* newEPS)));
-#endif /* LOAD_MODEL_SPECIFIC_SMBIOS_DATA */
+			// Copy the static SMBIOS data into the newly allocated memory page. Right after the new EPS.
+			memcpy((kernelMemory + sizeof(* newEPS)), SMBIOS_Table, tableLength);
+		}
+	#else
+		// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
+		#include STRING(SMBIOS_DATA_FILE)
+		
+		static uint32_t SMBIOS_Table[] =
+		{
+			// Replaced with data from: RevoBoot/i386/config/SMBIOS/[data-template/MacModelNN].h
+			STATIC_SMBIOS_DATA
+		};
+		
+		_SMBIOS_DEBUG_DUMP("Using statically linked SMBIOS data\n");
+		
+		tableLength = sizeof(SMBIOS_Table);
+		
+		// Copy the static SMBIOS data into the newly allocated memory page. Right after the new EPS.
+		memcpy((kernelMemory + sizeof(* newEPS)), SMBIOS_Table, tableLength);
+	#endif /* LOAD_MODEL_SPECIFIC_SMBIOS_DATA */
 
 #endif /* !__LIBSAIO_SMBIOS_STATIC_DATA_H */

From e18e79c9399f0435c5b7c50dcca58c1417a5d6a4 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:06:57 +0100
Subject: [PATCH 117/623] Feature enhancements for RevoBoot v1.5.35

---
 i386/libsaio/smbios/dynamic_data.h | 101 +++++++++++++++--------------
 1 file changed, 53 insertions(+), 48 deletions(-)

diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 25fa300..9f9bff6 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -12,7 +12,10 @@
  *			- SMBProperties changed for speed and simplicity (PikerAlpha, October 2012).
  *			- Calls with SMBProperties.keyString cleaned up (PikerAlpha, October 2012).
  *			- Fixed requiredStructures.start/stop values (PikerAlpha, October 2012).
- *			- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER(PikerAlpha, October 2012).
+ *			- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
+ *			- Removed some unused experimental code snippets (PikerAlpha, November 2012).
+ *			- Option SET_MAX_STRUCTURE_LENGTH to verify/fix newEPS->maxStructureSize (PikerAlpha, November 2012).
+ *			- Allow DEBUG_SMBIOS = 2 to filter out some of the output (PikerAlpha, November 2012).
  *
  * Credits:
  *			- Kabyl (see notes in source code)
@@ -21,7 +24,7 @@
  * Tip:		The idea is to use dynamic SMBIOS generation in RevoBoot only to 
  *			let it strip your factory table, after which you should do this:
  *
- *			1.) Extract the new OS X compatible SMBIOS table with: tools/smbios2struct
+ *			1.) Extract the new OS X compatible SMBIOS table with: tools/smbios2struct3
  *			2.) Add the data structure to: RevoBoot/i386/config/SMBIOS/data.h
  *			3.) Recompile RevoBoot, and be happy with your quicker boot time.
  *
@@ -203,15 +206,15 @@ void setupSMBIOS(void)
 	// Clear the first K bytes (new table will be even shorter).
 	bzero(kernelMemory, 1024);
 
-	newEPS->anchor[0]			= 0x5f;		// _
-	newEPS->anchor[1]			= 0x53;		// S
-	newEPS->anchor[2]			= 0x4d;		// M
-	newEPS->anchor[3]			= 0x5f;		// _
-	newEPS->checksum			= 0;		// Updated at the end of this run.
-	newEPS->entryPointLength	= 0x1f;		// sizeof(* newEPS)
-	newEPS->majorVersion		= 2;		// SMBIOS version 2.4
+	newEPS->anchor[0]			= 0x5f;							// _
+	newEPS->anchor[1]			= 0x53;							// S
+	newEPS->anchor[2]			= 0x4d;							// M
+	newEPS->anchor[3]			= 0x5f;							// _
+	newEPS->checksum			= 0;							// Updated at the end of this run.
+	newEPS->entryPointLength	= 0x1f;							// sizeof(* newEPS)
+	newEPS->majorVersion		= 2;							// SMBIOS version 2.4
 	newEPS->minorVersion		= 4;
-	newEPS->maxStructureSize	= 0;		// Updated during this run.
+	newEPS->maxStructureSize	= factoryEPS->maxStructureSize;	// Optionally checked and updated later on.
 	newEPS->entryPointRevision	= 0;
 
 	newEPS->formattedArea[0]	= 0;
@@ -220,25 +223,23 @@ void setupSMBIOS(void)
 	newEPS->formattedArea[3]	= 0;
 	newEPS->formattedArea[4]	= 0;
 
-	newEPS->dmi.anchor[0]		= 0x5f;		// _
-	newEPS->dmi.anchor[1]		= 0x44;		// D
-	newEPS->dmi.anchor[2]		= 0x4d;		// M
-	newEPS->dmi.anchor[3]		= 0x49;		// I
-	newEPS->dmi.anchor[4]		= 0x5f;		// _
-	newEPS->dmi.checksum		= 0;		// Updated at the end of this run.
-	newEPS->dmi.tableLength		= 0;		// Updated at the end of this run.
+	newEPS->dmi.anchor[0]		= 0x5f;							// _
+	newEPS->dmi.anchor[1]		= 0x44;							// D
+	newEPS->dmi.anchor[2]		= 0x4d;							// M
+	newEPS->dmi.anchor[3]		= 0x49;							// I
+	newEPS->dmi.anchor[4]		= 0x5f;							// _
+	newEPS->dmi.checksum		= 0;							// Updated at the end of this run.
+	newEPS->dmi.tableLength		= 0;							// Updated at the end of this run.
 	newEPS->dmi.tableAddress	= (uint32_t) (kernelMemory + sizeof(struct SMBEntryPoint));
-	newEPS->dmi.structureCount	= 0;		// Updated during this run.
-	newEPS->dmi.bcdRevision		= 0x24;		// SMBIOS version 2.4
+	newEPS->dmi.structureCount	= 0;							// Updated during this run.
+	newEPS->dmi.bcdRevision		= 0x24;							// SMBIOS version 2.4
 
 	char * stringsPtr			= NULL;
 	char * newtablesPtr			= (char *)newEPS->dmi.tableAddress;
 	char * structurePtr			= (char *)factoryEPS->dmi.tableAddress;
-	char * structureStartPtr	= NULL;
 
-	int i, j;
-	int numberOfStrings	= 0;
-	int structureCount	= factoryEPS->dmi.structureCount;
+	int i, j, numberOfStrings	= 0;
+	int structureCount			= factoryEPS->dmi.structureCount;
 
 	SMBWord handle = 1;
 
@@ -305,13 +306,13 @@ void setupSMBIOS(void)
 			// Adjust pointer after locating the double 0 terminator.
 			structurePtr += 2;
 
-#if DEBUG_SMBIOS
-			// printf("currentStructureType: %d (length: %d)\n", currentStructureType, factoryHeader->length);
-			// sleep(1); // Silent sleep (for debug only).
+#if (DEBUG_SMBIOS & 2)
+			_SMBIOS_DEBUG_DUMP("currentStructureType: %d (length: %d)\n", currentStructureType, factoryHeader->length);
+			_SMBIOS_DEBUG_SLEEP(1);
 #endif
 			continue;
 		}
-			
+
 		newHeader = (struct SMBStructHeader *) newtablesPtr;
 
 		// Copy structure data from factory table to new table (not the strings).
@@ -323,8 +324,6 @@ void setupSMBIOS(void)
 		// Update structure counter.
 		newEPS->dmi.structureCount++;
 
-		structureStartPtr = newtablesPtr;
-
 		// Update pointers (pointing to the end of the formatted area).
 		structurePtr	+= factoryHeader->length;
 		stringsPtr		= structurePtr;
@@ -352,7 +351,30 @@ void setupSMBIOS(void)
 		}
 
 		structurePtr += 2;
-		
+
+#if SET_MAX_STRUCTURE_LENGTH
+		/*
+		 * Size of the longest factory SMBIOS structure, in bytes, encompasses the structure’s formatted area
+		 * and text strings. In our case a kSMBTypeProcessorInformation structure, because we strip out all
+		 * unwanted data. And safe to check it at this point, because we don't add anything this long ourself.
+		 *
+		 * Note: The maximum structure length is only checked when SET_MAX_STRUCTURE_LENGTH is set to 1 but 
+		 *		 is not required, because it is only available since RevoBoot v1.5.35. Never checked before.
+		 */
+
+		UInt16 maxStructureSize = (structurePtr - (stringsPtr - factoryHeader->length));
+
+		if (newEPS->maxStructureSize < maxStructureSize)
+		{
+			newEPS->maxStructureSize = maxStructureSize;
+		}
+
+	#if (DEBUG_SMBIOS & 2)
+		_SMBIOS_DEBUG_DUMP("Structure (%d) length: %3d bytes.\n", currentStructureType, maxStructureSize);
+		_SMBIOS_DEBUG_SLEEP(1);
+	#endif
+#endif // if SET_MAX_STRUCTURE_LENGTH
+
 		// Do we need to copy the string data?
 		if (requiredStructures[currentStructureType].copyStrings)
 		{
@@ -364,23 +386,6 @@ void setupSMBIOS(void)
 
 			// Point to the next possible position for a string (deducting the second 0 char at the end).
 			newtablesPtr += stringDataLength;
-
-			/* ----------------------------------------------------------------------
-			// Start of experimental code.
-
-			if (currentStructureType == kSMBTypeProcessorInformation)
-			{
-				int c = 0;
-
-				for (; c < 3; c++)
-				{
-					memcpy(newtablesPtr + 1, structureStartPtr, factoryHeader->length + stringDataLength + 2);
-					newtablesPtr += factoryHeader->length + stringDataLength + 2;
-				}
-			}
-
-			//----------------------------------------------------------------------
-			// End of experimental code. */
 		}
 		else
 		{
@@ -403,7 +408,7 @@ void setupSMBIOS(void)
 		{
 			const char * str = "";
 
-#if DEBUG_SMBIOS
+#if (DEBUG_SMBIOS & 2)
 			if (SMBProperties[j].type != currentStructureType)
 			{
 				printf("SMBIOS Patcher Error: Turbo Index [%d != %d] Mismatch!\n", SMBProperties[j].type, currentStructureType);

From 7046f8130fe574047a51b7bb239c734af6b43d21 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:09:05 +0100
Subject: [PATCH 118/623] Update to RevoBoot v1.5.35

---
 CHANGES | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES b/CHANGES
index 3eab64a..c96a333 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,16 @@
+RevoBoot v1.5.35
+================
+- SMBIOS related enhancements for RevoBoot v1.5.35 (PikerAlpha, November 2012).
+- VERSION updated to v1.5.35
+
+
 RevoBoot v1.5.34
 ================
 - LOAD_STATIC_EFI_DATA_FROM_EXTRA in settings-template.h renamed to LOAD_MODEL_SPECIFIC_EFI_DATA (PikerAlpha, October 2012).
 - LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA in settings-template.h renamed to LOAD_MODEL_SPECIFIC_SMBIOS_DATA (PikerAlpha, October 2012).
 - New LOAD_MODEL_SPECIFIC_ACPI_DATA setting in settings-template.h (PikerAlpha, October 2012).
 - New LOAD_MODEL_SPECIFIC_STATIC_DATA setting in settings-template.h (PikerAlpha, October 2012).
+- VERSION updated to v1.5.34
 
 Notes:
 
@@ -15,6 +22,7 @@ You <i>must</i> use the latest version of RevoBoot/i386/config/settings-template
 RevoBoot v1.5.33
 ================
 - Restored lost lines in RevoBoot/i386/libsaio/SMBIOS/static_data.h (PikerAlpha, November 2012).
+- VERSION updated to v1.5.33
 
 
 RevoBoot v1.5.32

From eb1ec001eb5b794738d5cce2dc8d94553f4a1209 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:09:45 +0100
Subject: [PATCH 119/623] Updating version info for RevoBoot v1.5.35

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index e201dd3..ff4e38d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.34
+1.5.35

From e13aa261b52e9655f663bd54949aa00939e250f6 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:16:35 +0100
Subject: [PATCH 120/623] New setting SET_MAX_STRUCTURE_LENGTH for RevoBoot
 v1.5.35

---
 i386/config/settings-template.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 65cbbbc..1136591 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Master Chief. All rights reserved.
  *
- * Note: This is an essential part of the build process for RevoBoot v1.5.34 and greater.
+ * Note: This is an essential part of the build process for RevoBoot v1.5.35 and greater.
  *
  * Updates:
  *
@@ -26,6 +26,7 @@
  *			- LOAD_STATIC_EFI_DATA_FROM_EXTRA renamed to LOAD_MODEL_SPECIFIC_EFI_DATA (PikerAlpha, October 2012).
  *			- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA renamed to LOAD_MODEL_SPECIFIC_SMBIOS_DATA (PikerAlpha, October 2012).
  *			- LOAD_MODEL_SPECIFIC_STATIC_DATA added (PikerAlpha, October 2012).
+ *			- Option SET_MAX_STRUCTURE_LENGTH added (PikerAlpha, November 2012).
  */
 
 
@@ -373,6 +374,10 @@
 	#define SMB_BOARD_SERIAL_NUMBER			"SOMESRLNUMBR" // Example only!
 #endif
 
+#define SET_MAX_STRUCTURE_LENGTH			0	// Set to 0 by default. Only change this to 1 when boot hangs without it.
+												//
+												// Note: Safe to keep at 0 since it is only available since RevoBoot v1.5.35
+
 #define DEBUG_SMBIOS						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
 

From a8d21c2c9f3ae94c10476428db268cccdd437356 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 5 Nov 2012 20:25:44 +0100
Subject: [PATCH 121/623] Last minute patch for RevoBoot v1.5.35

---
 i386/config/SMBIOS/data-template.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/config/SMBIOS/data-template.h b/i386/config/SMBIOS/data-template.h
index 0d0cb7a..d388f10 100755
--- a/i386/config/SMBIOS/data-template.h
+++ b/i386/config/SMBIOS/data-template.h
@@ -21,9 +21,9 @@
 
 //--------------------------------------------------------------- SMBIOS -------------------------------------------------------------------
 
-#define	STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE		NNN
+#define	STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE 0
 
-#define	STATIC_SMBIOS_DMI_STRUCTURE_COUNT		NN
+#define	STATIC_SMBIOS_DMI_STRUCTURE_COUNT 0
 
 #define STATIC_SMBIOS_DATA \
 /* 0x0000 */	// Insert your SMBIOS data here.

From 820379939ca26ed98f4f0862ac7f39087c71b3f1 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 7 Nov 2012 17:34:39 +0100
Subject: [PATCH 122/623] Interim solution for writing to /Extra/MacModelNN.bin

---
 i386/libsaio/smbios/tools/smbios2struct3.c | 112 +++++++++++++++++----
 1 file changed, 91 insertions(+), 21 deletions(-)

diff --git a/i386/libsaio/smbios/tools/smbios2struct3.c b/i386/libsaio/smbios/tools/smbios2struct3.c
index 85fc38c..d6c3872 100755
--- a/i386/libsaio/smbios/tools/smbios2struct3.c
+++ b/i386/libsaio/smbios/tools/smbios2struct3.c
@@ -1,26 +1,34 @@
-/***
-  *
-  * Name        : smbios2struct3 (pipe output to file)
-  * Version     : 1.0.5
-  * Type        : Command line tool
-  * Description : SMBIOS extractor / converter (resulting in a smaller and more Apple like table).
-  *
-  * Copyright   : DutchHockeyPro (c) 2011
-  *
-  * Compile with: cc -I . smbios2struct3.c -o smbios2struct3 -Wall -framework IOKit -framework CoreFoundation
-  *
-  */
+/*
+ *
+ * Name			: smbios2struct4
+ * Version		: 1.1.0
+ * Type			: Command line tool
+ * Copyright	: Sam aka RevoGirl (c) 2011
+ * Description	: SMBIOS extractor / converter (resulting in a smaller and more Apple like table).
+ *
+ * Usage		: sudo ./smbios2struct4											(output to terminal window)
+ *				: sudo ./smbios2struct4 > ../../../config/SMBIOS/MacModelNN.h	(writes to [path]MacModelNN.h)
+ *				: sudo ./smbios2struct4 MacModelNN								(writes to: /Extra/SMBIOS/MacModel.bin)
+ *
+ * Compile with	: cc smbios2struct4.c -o smbios2struct4 -Wall -framework IOKit -framework CoreFoundation
+ *
+ * Updates		: Interim solution for writing stripped SMBIOS table data to MacModelNN.bin (PikerAlpha, November 2012)
+ *				: Check root priveledges for writing to: /Extra/SMBIOS/MacModelNN.bin (PikerAlpha, November 2012)
+ *
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/file.h>
+#include <sys/stat.h>
 
 #include <IOKit/IOKitLib.h>
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "SMBIOS.h"
+#include "../smbios.h"
 
 #define DEBUG		0	// Set to 1 for additional (debug) output
-#define VERBOSE		1
+#define VERBOSE		0
 
 #if VERBOSE
 	#define VERBOSE_DUMP(x...) printf(x)
@@ -102,12 +110,12 @@ void dumpStaticTableData(const UInt8 * tableBuffer, int maxStructureSize, int st
 {
 	int index = 0;
 
-	printf("\n\t#define	STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE\t%d\n", maxStructureSize);
-	printf("\n\t#define	STATIC_SMBIOS_DMI_STRUCTURE_COUNT\t%d\n", structureCount);
+	printf("\n#define STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE\t%d\n", maxStructureSize);
+	printf("\n#define STATIC_SMBIOS_DMI_STRUCTURE_COUNT\t%d\n", structureCount);
 	printf("\n");
-	printf("\t#define STATIC_SMBIOS_DATA \\\n");
-	printf("\t/* SMBIOS data (0x%04x / %d bytes) converted with smbios2struct2 into little endian format. */ \\\n", tableLength, tableLength);
-	printf("\t/* 0x0000 */\t");
+	printf("#define STATIC_SMBIOS_DATA \\\n");
+	printf("/* SMBIOS data (0x%04x / %d bytes) converted with smbios2struct2 into little endian format. */ \\\n", tableLength, tableLength);
+	printf("/* 0x0000 */\t");
 	
 	UInt16 length = round2(tableLength, 4);
 	UInt32 * newTableData = malloc(tableLength);
@@ -123,7 +131,7 @@ void dumpStaticTableData(const UInt8 * tableBuffer, int maxStructureSize, int st
 			
 			if ((index % 8) == 0)
 			{
-				printf("\\\n\t/* 0x%04x */\t", (index * 4));
+				printf("\\\n/* 0x%04x */\t", (index * 4));
 			}
 		}
 	} while((index * 4) <= length);
@@ -138,6 +146,23 @@ void dumpStaticTableData(const UInt8 * tableBuffer, int maxStructureSize, int st
 
 int main(int argc, char * argv[])
 {
+	if (argc == 2)
+	{
+		uid_t real_uid	= getuid();
+		uid_t euid		= geteuid();
+
+#if DEBUG
+		printf("UID: %u EUID: %u\n", real_uid, euid);
+#endif
+		// Under sudo, getuid and geteuid return 0.
+		if (real_uid != 0 || euid != 0)
+		{
+			printf("Error: Not root. Use sudo ./smbios2struct4 [filename without extension]\n");
+
+			exit (-1);
+		}
+	}
+
 	mach_port_t		masterPort;
     io_service_t	service = MACH_PORT_NULL;
 	CFDataRef		dataRef;
@@ -321,7 +346,52 @@ int main(int argc, char * argv[])
 			
 			VERBOSE_DUMP("\nDropped tables: %2d.\n", droppedTables);
 
-			dumpStaticTableData(tableBuffer, maxStructureSize, newStructureCount, newTableLength);
+			if (argc == 2) // Write to file?
+			{
+				struct stat my_sb;
+				// Sanity check for required directory.
+				if (stat("/Extra", &my_sb) != 0)
+				{
+					mkdir("/Extra", (S_IRWXU | S_IRWXG | S_IRWXO));
+				}
+				// Sanity check for required directory.
+				if (stat("/Extra/SMBIOS", &my_sb) != 0)
+				{
+					mkdir("/Extra/SMBIOS", (S_IRWXU | S_IRWXG | S_IRWXO));
+				}
+
+				char dirspec[128];
+				sprintf (dirspec, "/Extra/SMBIOS/%s.bin", argv[1]);
+				int filedesc = open(dirspec, O_WRONLY|O_CREAT|O_TRUNC, 0644);
+
+				if (filedesc == -1)
+				{
+					printf("Error: Unable to open file!\n");
+				}
+				else
+				{
+					newTableLength = round2((newTableLength + 2), 4);
+
+					VERBOSE_DUMP("newTableLength: %d\n", newTableLength);
+
+					int status = write(filedesc, tableBuffer, newTableLength);
+
+					if (status != newTableLength)
+					{
+						printf("status %d, saved %d bytes\n", status, newTableLength);
+					}
+					else
+					{
+						printf("%d bytes written to: %s\n", newTableLength, dirspec);
+					}
+				}
+
+				close (filedesc);
+			}
+			else
+			{
+				dumpStaticTableData(tableBuffer, maxStructureSize, newStructureCount, newTableLength);
+			}
 
 			free((void *)tableBuffer);
 

From 5e0d33721cd7f463fa33e5a68ec867345cfc0556 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Thu, 8 Nov 2012 08:07:10 +0100
Subject: [PATCH 123/623] Also write properties from efi/device-properties

Command line utility output:

sudo ./smbios2struct5 Macmini51
722 bytes written to: /Extra/EFI/Macmini51.bin
812 bytes written to: /Extra/SMBIOS/Macmini51.bin
---
 i386/libsaio/smbios/tools/smbios2struct3.c | 103 +++++++++++++++++----
 1 file changed, 83 insertions(+), 20 deletions(-)

diff --git a/i386/libsaio/smbios/tools/smbios2struct3.c b/i386/libsaio/smbios/tools/smbios2struct3.c
index d6c3872..297be55 100755
--- a/i386/libsaio/smbios/tools/smbios2struct3.c
+++ b/i386/libsaio/smbios/tools/smbios2struct3.c
@@ -1,7 +1,7 @@
 /*
  *
  * Name			: smbios2struct4
- * Version		: 1.1.0
+ * Version		: 1.1.1
  * Type			: Command line tool
  * Copyright	: Sam aka RevoGirl (c) 2011
  * Description	: SMBIOS extractor / converter (resulting in a smaller and more Apple like table).
@@ -14,6 +14,7 @@
  *
  * Updates		: Interim solution for writing stripped SMBIOS table data to MacModelNN.bin (PikerAlpha, November 2012)
  *				: Check root priveledges for writing to: /Extra/SMBIOS/MacModelNN.bin (PikerAlpha, November 2012)
+ *				: Now also saves /EFI-device-properties (PikerAlpha, November 2012)
  *
  */
 
@@ -146,6 +147,10 @@ void dumpStaticTableData(const UInt8 * tableBuffer, int maxStructureSize, int st
 
 int main(int argc, char * argv[])
 {
+	char dirspec[128];
+	int filedesc = 0;
+	struct stat my_sb;
+
 	if (argc == 2)
 	{
 		uid_t real_uid	= getuid();
@@ -171,20 +176,88 @@ int main(int argc, char * argv[])
 	UInt16 tableLength = 0, droppedTables = 0;
 	UInt16 newTableLength = 0;
 
-	// UInt32 * shadowTableData = NULL;
-
 	IOMasterPort(MACH_PORT_NULL, &masterPort);
+
+	//==================================================================================
+
+	io_registry_entry_t efi = IORegistryEntryFromPath(kIOMasterPortDefault, kIODeviceTreePlane ":/efi");
+
+	if (efi == IO_OBJECT_NULL)
+	{
+#if DEBUG
+		printf("FAILURE: Unable to locate EFI registry entry.\n");
+#endif
+		exit(-1);
+	}
+	else
+	{
+#if DEBUG
+		printf("OK\n");
+#endif
+		dataRef = (CFDataRef) IORegistryEntryCreateCFProperty(efi, CFSTR("device-properties"), kCFAllocatorDefault, kNilOptions);
+
+		if (dataRef)
+		{
+			UInt32 * deviceProperties = (UInt32 *) CFDataGetBytePtr(dataRef);
+			UInt16 devicePropertiesBytes = (int) CFDataGetLength(dataRef);
+#if DEBUG
+			printf("Property 'device-properties' %d bytes found.", numBytes);
+#endif
+			if ((argc == 2) && (devicePropertiesBytes)) // Write to file?
+			{
+				// Sanity check for required directory.
+				if (stat("/Extra", &my_sb) != 0)
+				{
+					mkdir("/Extra", (S_IRWXU | S_IRWXG | S_IRWXO));
+				}
+				// Sanity check for required directory.
+				if (stat("/Extra/EFI", &my_sb) != 0)
+				{
+					mkdir("/Extra/EFI", (S_IRWXU | S_IRWXG | S_IRWXO));
+				}
+				
+				sprintf (dirspec, "/Extra/EFI/%s.bin", argv[1]);
+				filedesc = open(dirspec, O_WRONLY|O_CREAT|O_TRUNC, 0644);
+				
+				if (filedesc == -1)
+				{
+					printf("Error: Unable to open file!\n");
+				}
+				else
+				{
+					int status = write(filedesc, deviceProperties, devicePropertiesBytes);
+					
+					if (status != devicePropertiesBytes)
+					{
+						printf("status %d, saved %d bytes\n", status, devicePropertiesBytes);
+					}
+					else
+					{
+						printf("%d bytes written to: %s\n", devicePropertiesBytes, dirspec);
+					}
+				}
+				
+				close (filedesc);
+			}
+		}
+#if DEBUG
+		else
+		{
+			printf("FAILURE: Unable to locate ':/efi/device-properties'\n");
+		}
+#endif
+	}
+
+	//==================================================================================
+
 	service = IOServiceGetMatchingService(masterPort, IOServiceMatching("AppleSMBIOS"));
 
     if (service)
 	{
 #if DEBUG
-		printf("\nHave AppleSMBIOS\n");
+		printf("\nAppleSMBIOS found\n");
 #endif
-		dataRef = (CFDataRef) IORegistryEntryCreateCFProperty(service, 
-															  CFSTR("SMBIOS-EPS"), 
-															  kCFAllocatorDefault, 
-															  kNilOptions);
+		dataRef = (CFDataRef) IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS-EPS"), kCFAllocatorDefault, kNilOptions);
 
 		if (dataRef)
 		{
@@ -233,10 +306,7 @@ int main(int argc, char * argv[])
 		printf("\n");
 #endif
 
-		dataRef = (CFDataRef) IORegistryEntryCreateCFProperty(service, 
-															  CFSTR("SMBIOS"), 
-															  kCFAllocatorDefault, 
-															  kNilOptions);
+		dataRef = (CFDataRef) IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS"), kCFAllocatorDefault, kNilOptions);
 
 		if (dataRef)
 		{
@@ -348,21 +418,14 @@ int main(int argc, char * argv[])
 
 			if (argc == 2) // Write to file?
 			{
-				struct stat my_sb;
-				// Sanity check for required directory.
-				if (stat("/Extra", &my_sb) != 0)
-				{
-					mkdir("/Extra", (S_IRWXU | S_IRWXG | S_IRWXO));
-				}
 				// Sanity check for required directory.
 				if (stat("/Extra/SMBIOS", &my_sb) != 0)
 				{
 					mkdir("/Extra/SMBIOS", (S_IRWXU | S_IRWXG | S_IRWXO));
 				}
 
-				char dirspec[128];
 				sprintf (dirspec, "/Extra/SMBIOS/%s.bin", argv[1]);
-				int filedesc = open(dirspec, O_WRONLY|O_CREAT|O_TRUNC, 0644);
+				filedesc = open(dirspec, O_WRONLY|O_CREAT|O_TRUNC, 0644);
 
 				if (filedesc == -1)
 				{

From 67318fde619046eff0169853632da67baa0d445f Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 10 Nov 2012 15:45:33 +0100
Subject: [PATCH 124/623] Added feedback/output

---
 Makefile | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Makefile b/Makefile
index 2c101ae..2a7a5f8 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@
 #			- Copies settings-template.h to SETTINGS/ModelnameNN.h when missing (PikerAlpha, October 2012).
 #			- Automatic ACPI/EFI/SMBIOS data selection (PikerAlpha, October 2012).
 #			- Copies ACPI/EFI/SMBIOS/data-template.h for new conigurations (PikerAlpha, October 2012).
+#			- Output added for cp/mkdir/rm actions (PikerAlpha, November 2012).
+#			- New build target 'help' added (PikerAlpha, November 2012).
 #
 
 #
@@ -134,22 +136,27 @@ SETTINGS_FILE=$(SETTINGS_DIR)/$(MAKE_TARGET_MODEL).h
 
 $(MAKEGOAL): $(SYMROOT) $(OBJROOT)
 	@if [ ! -f $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE) ]; then \
+		echo "\t[CP] $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE)"; \
 		cp -n $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE); \
 	fi;
 
 	@if [ ! -f $(CONFIG_DIR)/$(MAKE_EFI_DATA_FILE) ]; then \
+		echo "\t[CP] $(CONFIG_DIR)/EFI/data-template.h $(CONFIG_DIR)/$(MAKE_EFI_DATA_FILE)"; \
 		cp -n $(CONFIG_DIR)/EFI/data-template.h $(CONFIG_DIR)/$(MAKE_EFI_DATA_FILE); \
 	fi;
 
 	@if [ ! -f $(CONFIG_DIR)/$(MAKE_SMBIOS_DATA_FILE) ]; then \
+		echo "\t[CP] $(CONFIG_DIR)/SMBIOS/data-template.h $(CONFIG_DIR)/$(MAKE_SMBIOS_DATA_FILE)"; \
 		cp -n $(CONFIG_DIR)/SMBIOS/data-template.h $(CONFIG_DIR)/$(MAKE_SMBIOS_DATA_FILE); \
 	fi;
 
 	@if [ ! -d $(SETTINGS_DIR) ]; then \
+		echo "\t[MKDIR] $(SETTINGS_DIR)"; \
 		/bin/mkdir -p $(SETTINGS_DIR); \
 	fi;
 
 	@if [ ! -f $(SETTINGS_FILE) ]; then \
+		echo "\t[CP] $(CONFIG_DIR)/settings-template.h $(SETTINGS_FILE)"; \
 		cp -n $(CONFIG_DIR)/settings-template.h $(SETTINGS_FILE); \
 	fi;
 
@@ -169,7 +176,17 @@ $(MAKEGOAL): $(SYMROOT) $(OBJROOT)
 	fi;
 
 clean:
+	@if [ -d "$(OBJROOT)" ];then echo "\t[RMDIR] $(OBJROOT)"; fi
+	@if [ -d "$(SYMROOT)" ];then echo "\t[RMDIR] $(SYMROOT)"; fi
 	rm -rf sym obj dst out.log
 
+help:
+	@echo
+	@echo   'Build targets:'
+	@echo   '		- Build all targets [DEFAULT]'
+	@echo
+	@echo   'Cleaning targets:'
+	@echo   '  clean	- Remove generated files'
+
 $(SYMROOT) $(OBJROOT):
 	@/bin/mkdir -p $@

From 5b6712f8489384379ee63d769ac08b7b1107da63 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 10 Nov 2012 15:50:31 +0100
Subject: [PATCH 125/623] Added feedback/output

---
 i386/libsa/Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/i386/libsa/Makefile b/i386/libsa/Makefile
index 773acac..2b0069d 100644
--- a/i386/libsa/Makefile
+++ b/i386/libsa/Makefile
@@ -4,6 +4,7 @@
 # Updates:
 #
 #			- Major cleanup (PikerAlpha, October 2012).
+#			- Output added for rm/ar/ranlib actions (PikerAlpha, November 2012).
 #
 
 
@@ -26,13 +27,17 @@ VPATH = $(OBJROOT):$(SYMROOT)
 SA_OBJS = prf.o printf.o zalloc.o string.o strtol.o setjmp.o efi_tables.o
 
 LIBS = libsa.a
+
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
 $(MAKEGOAL): $(DIRS_NEEDED) $(LIBS)
 
-libsa.a: $(SA_OBJS)
-	rm -f $(SYMROOT)/$(@F)
-	ar q $(SYMROOT)/$(@F) $^
-	ranlib $(SYMROOT)/$(@F)
+$(LIBS): $(SA_OBJS)
+	@echo "\t[RM] $(SYMROOT)/$@"
+	@rm -f $(SYMROOT)/$@
+	@echo "\t[AR] $@"
+	@ar q $(SYMROOT)/$@ $^ &> /dev/null
+	@echo "\t[RANLIB] $@"
+	@ranlib $(SYMROOT)/$@
 
 include ../MakeInc.dir

From eb4df18955e8c0829a61db206079d83532b79669 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 10 Nov 2012 15:53:21 +0100
Subject: [PATCH 126/623] Added feedback/output

---
 i386/libsaio/Makefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index 63262be..3e13d49 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -7,6 +7,7 @@
 #			- DMAKE_TARGET_MODEL added (PikerAlpha, October 2012).
 #			- Static data selectors added (PikerAlpha, October 2012).
 #			- STATIC_DATA_FILENAME added (PikerAlpha, October 2012).
+#			- Output added for rm/ar/ranlib actions (PikerAlpha, November 2012).
 #
 
 include ../MakePaths.dir
@@ -41,18 +42,20 @@ SAIO_OBJS = table.o asm.o bios.o biosfn.o \
 	vbe.o hfs.o hfs_compare.o \
 	xml.o md5c.o device_tree.o \
 	cpu.o platform.o acpi.o \
-	smbios.o efi.o
-
-SAIO_EXTERN_OBJS = console.o
+	smbios.o efi.o console.o
 
 LIBS = libsaio.a
+
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
 $(MAKEGOAL): $(DIRS_NEEDED) libsaio.h $(LIBS)
 
-libsaio.a: $(SAIO_EXTERN_OBJS) $(SAIO_OBJS)
-	rm -f $(SYMROOT)/$(@F)
-	ar q $(SYMROOT)/$(@F) $^
-	ranlib $(SYMROOT)/$(@F)
+$(LIBS): $(SAIO_OBJS)
+	@echo "\t[RM] $(SYMROOT)/$@"
+	@rm -f $@
+	@echo "\t[AR] $@"
+	@ar q $(SYMROOT)/$@ $^ &> /dev/null
+	@echo "\t[RANLIB] $@"
+	@ranlib $(SYMROOT)/$@
 
 include ../MakeInc.dir

From 31eff7695dc7693c207d2586395bf2faa3494687 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 10 Nov 2012 15:56:24 +0100
Subject: [PATCH 127/623] Bug fix

---
 i386/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/Makefile b/i386/Makefile
index a7ee5b7..57f3137 100644
--- a/i386/Makefile
+++ b/i386/Makefile
@@ -5,6 +5,7 @@
 #
 #			- Major cleanup (PikerAlpha, October 2012).
 #			- Output improvements (PikerAlpha, October 2012).
+#			- PRODUCT_MODEL_TARGET renamed to MAKE_TARGET_MODEL (PikerAlpha, November 2012).
 #
 
 #
@@ -26,7 +27,7 @@ SUBDIRS = util libsa libsaio boot2
 $(MAKEGOAL):
 	@for i in ${SUBDIRS}; \
 	do \
-		echo ================= make MODEL=$(PRODUCT_MODEL_TARGET) $@ for: RevoBoot/i386/$$i =================; \
+		echo ================= make MODEL=$(MAKE_TARGET_MODEL) $@ for: RevoBoot/i386/$$i =================; \
 		( cd $$i; ${MAKE} \
 			"OBJROOT=$(OBJROOT)/$$i" \
 		  	"SYMROOT=$(SYMROOT)" \

From 3558ddae9338d0ac9b5bae73c3ab2958684ab099 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 10 Nov 2012 16:02:43 +0100
Subject: [PATCH 128/623] Be silent

---
 i386/util/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/util/Makefile b/i386/util/Makefile
index 8a4883c..e4ccd5f 100644
--- a/i386/util/Makefile
+++ b/i386/util/Makefile
@@ -24,8 +24,8 @@ DIRS_NEEDED = $(OBJROOT) $(SYMROOT) $(LANGDIR)
 $(MAKEGOAL): $(DIRS_NEEDED) $(PROGRAMS)
 
 machOconv: machOconv.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) machOconv.o
+	@$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) machOconv.o
 md:
-	$(CC) -mdynamic-no-pic -Wall -dead_strip -arch i386 -mmacosx-version-min=10.5 md.c -o $(SYMROOT)/md
+	@$(CC) -mdynamic-no-pic -Wall -dead_strip -arch i386 -mmacosx-version-min=10.5 md.c -o $(SYMROOT)/md
 
 include ../MakeInc.dir

From 30b71cea5c12517227094557a756fdf96991499a Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Sun, 11 Nov 2012 09:25:09 +0000
Subject: [PATCH 129/623] Enable clang compilation

---
 .gitignore                                    |    3 +-
 README                                        |    4 +-
 i386/MakeInc.dir                              |   44 +-
 i386/boot2/Makefile                           |   64 +-
 i386/boot2/boot.c                             |   17 +-
 i386/include/IOKit/IOBSD.h                    |   41 +
 i386/include/IOKit/IOBufferMemoryDescriptor.h |  261 ++
 i386/include/IOKit/IOCatalogue.h              |  272 +++
 i386/include/IOKit/IOCommand.h                |   83 +
 i386/include/IOKit/IOCommandGate.h            |  241 ++
 i386/include/IOKit/IOCommandPool.h            |  230 ++
 i386/include/IOKit/IOConditionLock.h          |   71 +
 i386/include/IOKit/IODMACommand.h             |  557 +++++
 i386/include/IOKit/IODMAController.h          |   67 +
 i386/include/IOKit/IODMAEventSource.h         |   84 +
 i386/include/IOKit/IODataQueue.h              |  141 ++
 i386/include/IOKit/IODataQueueShared.h        |   92 +
 i386/include/IOKit/IODeviceMemory.h           |   98 +
 i386/include/IOKit/IODeviceTreeSupport.h      |  127 +
 i386/include/IOKit/IOEventSource.h            |  244 ++
 .../IOKit/IOFilterInterruptEventSource.h      |  156 ++
 .../IOKit/IOInterleavedMemoryDescriptor.h     |  122 +
 i386/include/IOKit/IOInterruptController.h    |  155 ++
 i386/include/IOKit/IOInterruptEventSource.h   |  200 ++
 i386/include/IOKit/IOInterrupts.h             |   58 +
 i386/include/IOKit/IOKitDebug.h               |  111 +
 i386/include/IOKit/IOKitKeys.h                |  164 ++
 i386/include/IOKit/IOKitServer.h              |  123 +
 i386/include/IOKit/IOLib.h                    |   83 +
 i386/include/IOKit/IOLocks.h                  |  409 ++++
 i386/include/IOKit/IOMapper.h                 |  154 ++
 i386/include/IOKit/IOMemoryCursor.h           |  462 ++++
 i386/include/IOKit/IOMemoryDescriptor.h       |  898 +++++++
 i386/include/IOKit/IOMessage.h                |   75 +
 i386/include/IOKit/IOMultiMemoryDescriptor.h  |  110 +
 i386/include/IOKit/IONVRAM.h                  |  167 ++
 i386/include/IOKit/IONotifier.h               |   72 +
 i386/include/IOKit/IOPlatformExpert.h         |  318 +++
 i386/include/IOKit/IORangeAllocator.h         |  171 ++
 i386/include/IOKit/IORegistryEntry.h          |  947 ++++++++
 i386/include/IOKit/IOReturn.h                 |  137 ++
 i386/include/IOKit/IOService.h                | 1690 +++++++++++++
 i386/include/IOKit/IOServicePM.h              |   42 +
 i386/include/IOKit/IOSharedDataQueue.h        |  129 +
 i386/include/IOKit/IOSharedLock.h             |   86 +
 i386/include/IOKit/IOSubMemoryDescriptor.h    |  109 +
 i386/include/IOKit/IOSyncer.h                 |   64 +
 i386/include/IOKit/IOTimeStamp.h              |  189 ++
 i386/include/IOKit/IOTimerEventSource.h       |  230 ++
 i386/include/IOKit/IOTypes.h                  |  238 ++
 i386/include/IOKit/IOUserClient.h             |  333 +++
 i386/include/IOKit/IOWorkLoop.h               |  321 +++
 i386/include/IOKit/OSMessageNotification.h    |  158 ++
 .../include/IOKit/acpi/IOACPIPlatformDevice.h |  254 ++
 .../include/IOKit/acpi/IOACPIPlatformExpert.h |  178 ++
 i386/include/IOKit/acpi/IOACPITypes.h         |  136 ++
 i386/include/IOKit/assert.h                   |   54 +
 i386/include/IOKit/ata/ATADeviceNub.h         |  164 ++
 i386/include/IOKit/ata/ATATimerEventSource.h  |  126 +
 i386/include/IOKit/ata/IOATABusCommand.h      |  250 ++
 i386/include/IOKit/ata/IOATABusInfo.h         |  219 ++
 i386/include/IOKit/ata/IOATACommand.h         |  478 ++++
 i386/include/IOKit/ata/IOATAController.h      |  314 +++
 i386/include/IOKit/ata/IOATADevConfig.h       |  239 ++
 i386/include/IOKit/ata/IOATADevice.h          |  179 ++
 i386/include/IOKit/ata/IOATARegI386.h         |   76 +
 i386/include/IOKit/ata/IOATATypes.h           |  393 +++
 i386/include/IOKit/ata/IOPCIATA.h             |  200 ++
 i386/include/IOKit/ata/MacIOATA.h             |  225 ++
 i386/include/IOKit/audio/IOAudioControl.h     |  595 +++++
 .../IOKit/audio/IOAudioControlUserClient.h    |   90 +
 i386/include/IOKit/audio/IOAudioDebug.h       |   61 +
 i386/include/IOKit/audio/IOAudioDefines.h     |  465 ++++
 i386/include/IOKit/audio/IOAudioDevice.h      |  749 ++++++
 i386/include/IOKit/audio/IOAudioEngine.h      |  865 +++++++
 .../IOKit/audio/IOAudioEngineUserClient.h     |  270 +++
 .../include/IOKit/audio/IOAudioLevelControl.h |  205 ++
 i386/include/IOKit/audio/IOAudioPort.h        |  184 ++
 .../IOKit/audio/IOAudioSelectorControl.h      |  122 +
 i386/include/IOKit/audio/IOAudioStream.h      |  289 +++
 .../IOKit/audio/IOAudioToggleControl.h        |  121 +
 i386/include/IOKit/audio/IOAudioTypes.h       |  661 +++++
 i386/include/IOKit/avc/IOFireWireAVCCommand.h |   94 +
 i386/include/IOKit/avc/IOFireWireAVCConsts.h  |  259 ++
 .../IOKit/avc/IOFireWireAVCRequestSpace.h     |   31 +
 .../IOKit/avc/IOFireWireAVCTargetSpace.h      |  297 +++
 i386/include/IOKit/avc/IOFireWireAVCUnit.h    |  408 ++++
 .../IOKit/avc/IOFireWireAVCUserClientCommon.h |  124 +
 i386/include/IOKit/avc/IOFireWirePCRSpace.h   |  202 ++
 i386/include/IOKit/bluetooth/Bluetooth.h      | 2158 +++++++++++++++++
 .../bluetooth/BluetoothAssignedNumbers.h      |  552 +++++
 .../bluetooth/IOBluetoothHCIController.h      | 1370 +++++++++++
 .../IOKit/bluetooth/IOBluetoothHCIRequest.h   |  155 ++
 .../IOKit/bluetooth/IOBluetoothHIDDriver.h    |  230 ++
 .../bluetooth/IOBluetoothHIDDriverTypes.h     |   61 +
 .../IOKit/bluetooth/IOBluetoothInternal.h     |  103 +
 .../IOKit/bluetooth/IOBluetoothTypes.h        |   23 +
 .../IOKit/firewire/IOConfigDirectory.h        |  182 ++
 .../include/IOKit/firewire/IOFWAddressSpace.h |  331 +++
 .../IOKit/firewire/IOFWAsyncStreamListener.h  |  132 +
 i386/include/IOKit/firewire/IOFWCommand.h     |  977 ++++++++
 i386/include/IOKit/firewire/IOFWDCL.h         |  346 +++
 i386/include/IOKit/firewire/IOFWDCLPool.h     |  160 ++
 i386/include/IOKit/firewire/IOFWDCLProgram.h  |  133 +
 .../IOKit/firewire/IOFWDCLTranslator.h        |  114 +
 .../include/IOKit/firewire/IOFWIsochChannel.h |  132 +
 i386/include/IOKit/firewire/IOFWIsochPort.h   |   66 +
 .../IOKit/firewire/IOFWLocalIsochPort.h       |  135 ++
 .../IOKit/firewire/IOFWPHYPacketListener.h    |   77 +
 .../IOKit/firewire/IOFWPhysicalAddressSpace.h |  263 ++
 .../IOKit/firewire/IOFWPseudoAddressSpace.h   |  370 +++
 i386/include/IOKit/firewire/IOFWRegs.h        |   73 +
 ...IOFWSimpleContiguousPhysicalAddressSpace.h |   66 +
 .../firewire/IOFWSimplePhysicalAddressSpace.h |   70 +
 i386/include/IOKit/firewire/IOFWSyncer.h      |   54 +
 .../IOKit/firewire/IOFWUserObjectExporter.h   |   95 +
 i386/include/IOKit/firewire/IOFWUtils.h       |   32 +
 i386/include/IOKit/firewire/IOFireWireBus.h   |  373 +++
 .../IOKit/firewire/IOFireWireController.h     | 1089 +++++++++
 .../include/IOKit/firewire/IOFireWireDevice.h |  289 +++
 .../IOKit/firewire/IOFireWireFamilyCommon.h   | 1235 ++++++++++
 .../IOKit/firewire/IOFireWireIRMAllocation.h  |  116 +
 .../IOKit/firewire/IOFireWireLocalNode.h      |  143 ++
 .../firewire/IOFireWireMultiIsochReceive.h    |  137 ++
 i386/include/IOKit/firewire/IOFireWireNub.h   |  293 +++
 .../IOKit/firewire/IOFireWirePowerManager.h   |   78 +
 i386/include/IOKit/firewire/IOFireWireUnit.h  |  167 ++
 .../IOKit/firewire/IOLocalConfigDirectory.h   |  110 +
 .../IOKit/firewire/IORemoteConfigDirectory.h  |   92 +
 .../IOKit/graphics/IOAccelClientConnect.h     |   44 +
 .../IOKit/graphics/IOAccelSurfaceConnect.h    |  182 ++
 i386/include/IOKit/graphics/IOAccelTypes.h    |  101 +
 i386/include/IOKit/graphics/IOAccelerator.h   |   42 +
 i386/include/IOKit/graphics/IODisplay.h       |  292 +++
 i386/include/IOKit/graphics/IOFramebuffer.h   |  827 +++++++
 .../IOKit/graphics/IOFramebufferShared.h      |  255 ++
 .../include/IOKit/graphics/IOGraphicsDevice.h |   47 +
 .../include/IOKit/graphics/IOGraphicsEngine.h |   51 +
 .../IOKit/graphics/IOGraphicsInterfaceTypes.h |  301 +++
 i386/include/IOKit/graphics/IOGraphicsTypes.h | 1260 ++++++++++
 i386/include/IOKit/hid/IOHIDDevice.h          |  706 ++++++
 i386/include/IOKit/hid/IOHIDElement.h         |  106 +
 i386/include/IOKit/hid/IOHIDInterface.h       |  252 ++
 i386/include/IOKit/hid/IOHIDKeys.h            |  349 +++
 i386/include/IOKit/hid/IOHIDUsageTables.h     | 1665 +++++++++++++
 .../include/IOKit/hidevent/IOHIDEventDriver.h |  171 ++
 .../IOKit/hidevent/IOHIDEventService.h        |  394 +++
 .../IOKit/hidsystem/IOHIDDescriptorParser.h   |  939 +++++++
 i386/include/IOKit/hidsystem/IOHIDParameter.h |  310 +++
 i386/include/IOKit/hidsystem/IOHIDShared.h    |  341 +++
 i386/include/IOKit/hidsystem/IOHIDSystem.h    |  785 ++++++
 i386/include/IOKit/hidsystem/IOHIDTypes.h     |  171 ++
 .../IOKit/hidsystem/IOHIDUsageTables.h        | 1665 +++++++++++++
 i386/include/IOKit/hidsystem/IOHIDevice.h     |   71 +
 i386/include/IOKit/hidsystem/IOHIKeyboard.h   |  268 ++
 .../IOKit/hidsystem/IOHIKeyboardMapper.h      |  350 +++
 i386/include/IOKit/hidsystem/IOHIPointing.h   |  280 +++
 i386/include/IOKit/hidsystem/IOLLEvent.h      |  558 +++++
 i386/include/IOKit/hidsystem/ev_keymap.h      |  166 ++
 i386/include/IOKit/i2c/IOI2CInterface.h       |  262 ++
 i386/include/IOKit/ndrvsupport/IOMacOSTypes.h |  441 ++++
 i386/include/IOKit/ndrvsupport/IOMacOSVideo.h | 1391 +++++++++++
 .../IOKit/ndrvsupport/IONDRVFramebuffer.h     |  352 +++
 .../IOKit/ndrvsupport/IONDRVLibraries.h       |  696 ++++++
 .../include/IOKit/ndrvsupport/IONDRVSupport.h |   95 +
 .../IOKit/network/IOBasicOutputQueue.h        |  319 +++
 .../IOKit/network/IOEthernetController.h      |  502 ++++
 .../IOKit/network/IOEthernetInterface.h       |  328 +++
 i386/include/IOKit/network/IOEthernetStats.h  |  161 ++
 .../IOKit/network/IOGatedOutputQueue.h        |  140 ++
 i386/include/IOKit/network/IOKernelDebugger.h |  324 +++
 .../IOKit/network/IOMbufMemoryCursor.h        |  381 +++
 .../IOKit/network/IONetworkController.h       | 1452 +++++++++++
 i386/include/IOKit/network/IONetworkData.h    |  477 ++++
 .../IOKit/network/IONetworkInterface.h        | 1104 +++++++++
 i386/include/IOKit/network/IONetworkMedium.h  |  426 ++++
 i386/include/IOKit/network/IONetworkStats.h   |   87 +
 i386/include/IOKit/network/IOOutputQueue.h    |  270 +++
 i386/include/IOKit/network/IOPacketQueue.h    |  290 +++
 i386/include/IOKit/nvram/IONVRAMController.h  |   49 +
 i386/include/IOKit/pci/IOAGPDevice.h          |  222 ++
 i386/include/IOKit/pci/IOPCIBridge.h          |  381 +++
 i386/include/IOKit/pci/IOPCIDevice.h          |  673 +++++
 i386/include/IOKit/platform/.svn/all-wcprops  |   29 +
 i386/include/IOKit/platform/.svn/entries      |  164 ++
 .../.svn/text-base/AppleMacIO.h.svn-base      |   79 +
 .../text-base/AppleMacIODevice.h.svn-base     |   60 +
 .../.svn/text-base/AppleNMI.h.svn-base        |   76 +
 .../text-base/ApplePlatformExpert.h.svn-base  |   91 +
 i386/include/IOKit/platform/AppleMacIO.h      |   79 +
 .../include/IOKit/platform/AppleMacIODevice.h |   60 +
 i386/include/IOKit/platform/AppleNMI.h        |   76 +
 .../IOKit/platform/ApplePlatformExpert.h      |   91 +
 i386/include/IOKit/power/.svn/all-wcprops     |   11 +
 i386/include/IOKit/power/.svn/entries         |   62 +
 .../.svn/text-base/IOPwrController.h.svn-base |   41 +
 i386/include/IOKit/power/IOPwrController.h    |   41 +
 i386/include/IOKit/ppc/.svn/all-wcprops       |   11 +
 i386/include/IOKit/ppc/.svn/entries           |   62 +
 .../ppc/.svn/text-base/IODBDMA.h.svn-base     |  367 +++
 i386/include/IOKit/ppc/IODBDMA.h              |  367 +++
 i386/include/IOKit/pwr_mgt/.svn/all-wcprops   |   59 +
 i386/include/IOKit/pwr_mgt/.svn/entries       |  334 +++
 .../pwr_mgt/.svn/text-base/IOPM.h.svn-base    |  654 +++++
 .../.svn/text-base/IOPMDeprecated.h.svn-base  |  177 ++
 .../.svn/text-base/IOPMLibDefs.h.svn-base     |   40 +
 .../.svn/text-base/IOPMPowerSource.h.svn-base |  300 +++
 .../text-base/IOPMPowerSourceList.h.svn-base  |   54 +
 .../.svn/text-base/IOPMPrivate.h.svn-base     |  269 ++
 .../.svn/text-base/IOPMpowerState.h.svn-base  |   72 +
 .../text-base/IOPowerConnection.h.svn-base    |  159 ++
 .../.svn/text-base/RootDomain.h.svn-base      |  251 ++
 i386/include/IOKit/pwr_mgt/IOPM.h             |  654 +++++
 i386/include/IOKit/pwr_mgt/IOPMDeprecated.h   |  177 ++
 i386/include/IOKit/pwr_mgt/IOPMLibDefs.h      |   40 +
 i386/include/IOKit/pwr_mgt/IOPMPowerSource.h  |  300 +++
 .../IOKit/pwr_mgt/IOPMPowerSourceList.h       |   54 +
 i386/include/IOKit/pwr_mgt/IOPMPrivate.h      |  269 ++
 i386/include/IOKit/pwr_mgt/IOPMpowerState.h   |   72 +
 .../include/IOKit/pwr_mgt/IOPowerConnection.h |  159 ++
 i386/include/IOKit/pwr_mgt/RootDomain.h       |  251 ++
 i386/include/IOKit/rtc/.svn/all-wcprops       |   11 +
 i386/include/IOKit/rtc/.svn/entries           |   62 +
 .../.svn/text-base/IORTCController.h.svn-base |   46 +
 i386/include/IOKit/rtc/IORTCController.h      |   46 +
 i386/include/IOKit/sbp2/.svn/all-wcprops      |   59 +
 i386/include/IOKit/sbp2/.svn/entries          |  334 +++
 ...WireSBP2LSIWorkaroundDescriptor.h.svn-base |  292 +++
 .../text-base/IOFireWireSBP2LUN.h.svn-base    |  270 +++
 .../text-base/IOFireWireSBP2Login.h.svn-base  | 1078 ++++++++
 .../IOFireWireSBP2ManagementORB.h.svn-base    |  345 +++
 .../text-base/IOFireWireSBP2ORB.h.svn-base    |  547 +++++
 .../text-base/IOFireWireSBP2Target.h.svn-base |  224 ++
 .../IOFireWireSBP2UserClient.h.svn-base       |  186 ++
 .../IOFireWireSBP2UserClientCommon.h.svn-base |   79 +
 ...eWireSerialBusProtocolTransport.h.svn-base |  449 ++++
 .../IOFireWireSBP2LSIWorkaroundDescriptor.h   |  292 +++
 i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h   |  270 +++
 i386/include/IOKit/sbp2/IOFireWireSBP2Login.h | 1078 ++++++++
 .../IOKit/sbp2/IOFireWireSBP2ManagementORB.h  |  345 +++
 i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h   |  547 +++++
 .../include/IOKit/sbp2/IOFireWireSBP2Target.h |  224 ++
 .../IOKit/sbp2/IOFireWireSBP2UserClient.h     |  186 ++
 .../sbp2/IOFireWireSBP2UserClientCommon.h     |   79 +
 .../IOFireWireSerialBusProtocolTransport.h    |  449 ++++
 i386/include/IOKit/scsi/.svn/all-wcprops      |  155 ++
 i386/include/IOKit/scsi/.svn/entries          |  881 +++++++
 .../.svn/text-base/IOBDServices.h.svn-base    |  241 ++
 .../IOBlockStorageServices.h.svn-base         |  158 ++
 .../IOCompactDiscServices.h.svn-base          |  230 ++
 .../.svn/text-base/IODVDServices.h.svn-base   |  251 ++
 .../IOReducedBlockServices.h.svn-base         |  147 ++
 .../IOSCSIBlockCommandsDevice.h.svn-base      | 1146 +++++++++
 .../IOSCSIMultimediaCommandsDevice.h.svn-base | 1057 ++++++++
 .../IOSCSIPeripheralDeviceNub.h.svn-base      |  233 ++
 .../IOSCSIPeripheralDeviceType00.h.svn-base   |  102 +
 .../IOSCSIPeripheralDeviceType05.h.svn-base   |   75 +
 .../IOSCSIPeripheralDeviceType07.h.svn-base   |   75 +
 .../IOSCSIPeripheralDeviceType0E.h.svn-base   |   77 +
 .../IOSCSIPrimaryCommandsDevice.h.svn-base    |  805 ++++++
 .../IOSCSIProtocolInterface.h.svn-base        |  854 +++++++
 .../IOSCSIProtocolServices.h.svn-base         |  362 +++
 ...OSCSIReducedBlockCommandsDevice.h.svn-base |  438 ++++
 .../SCSICmds_INQUIRY_Definitions.h.svn-base   |  923 +++++++
 .../SCSICmds_MODE_Definitions.h.svn-base      |  559 +++++
 ...ICmds_READ_CAPACITY_Definitions.h.svn-base |  141 ++
 ...CSICmds_REPORT_LUNS_Definitions.h.svn-base |  146 ++
 .../SCSICmds_REQUEST_SENSE_Defs.h.svn-base    |  234 ++
 .../SCSICommandDefinitions.h.svn-base         |  479 ++++
 .../SCSICommandOperationCodes.h.svn-base      |  941 +++++++
 .../scsi/.svn/text-base/SCSIPort.h.svn-base   |   77 +
 .../scsi/.svn/text-base/SCSITask.h.svn-base   |  456 ++++
 i386/include/IOKit/scsi/IOBDServices.h        |  241 ++
 .../IOKit/scsi/IOBlockStorageServices.h       |  158 ++
 .../IOKit/scsi/IOCompactDiscServices.h        |  230 ++
 i386/include/IOKit/scsi/IODVDServices.h       |  251 ++
 .../IOKit/scsi/IOReducedBlockServices.h       |  147 ++
 .../IOKit/scsi/IOSCSIBlockCommandsDevice.h    | 1146 +++++++++
 .../scsi/IOSCSIMultimediaCommandsDevice.h     | 1057 ++++++++
 .../IOKit/scsi/IOSCSIPeripheralDeviceNub.h    |  233 ++
 .../IOKit/scsi/IOSCSIPeripheralDeviceType00.h |  102 +
 .../IOKit/scsi/IOSCSIPeripheralDeviceType05.h |   75 +
 .../IOKit/scsi/IOSCSIPeripheralDeviceType07.h |   75 +
 .../IOKit/scsi/IOSCSIPeripheralDeviceType0E.h |   77 +
 .../IOKit/scsi/IOSCSIPrimaryCommandsDevice.h  |  805 ++++++
 .../IOKit/scsi/IOSCSIProtocolInterface.h      |  854 +++++++
 .../IOKit/scsi/IOSCSIProtocolServices.h       |  362 +++
 .../scsi/IOSCSIReducedBlockCommandsDevice.h   |  438 ++++
 .../IOKit/scsi/SCSICmds_INQUIRY_Definitions.h |  923 +++++++
 .../IOKit/scsi/SCSICmds_MODE_Definitions.h    |  559 +++++
 .../scsi/SCSICmds_READ_CAPACITY_Definitions.h |  141 ++
 .../scsi/SCSICmds_REPORT_LUNS_Definitions.h   |  146 ++
 .../IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h  |  234 ++
 .../IOKit/scsi/SCSICommandDefinitions.h       |  479 ++++
 .../IOKit/scsi/SCSICommandOperationCodes.h    |  941 +++++++
 i386/include/IOKit/scsi/SCSIPort.h            |   77 +
 i386/include/IOKit/scsi/SCSITask.h            |  456 ++++
 i386/include/IOKit/scsi/spi/.svn/all-wcprops  |   11 +
 i386/include/IOKit/scsi/spi/.svn/entries      |   62 +
 ...SCSIParallelInterfaceController.h.svn-base | 1568 ++++++++++++
 .../spi/IOSCSIParallelInterfaceController.h   | 1568 ++++++++++++
 i386/include/IOKit/serial/.svn/all-wcprops    |   35 +
 i386/include/IOKit/serial/.svn/entries        |  198 ++
 .../IOModemSerialStreamSync.h.svn-base        |   42 +
 .../IORS232SerialStreamSync.h.svn-base        |  172 ++
 .../text-base/IOSerialDriverSync.h.svn-base   |   91 +
 .../.svn/text-base/IOSerialKeys.h.svn-base    |   80 +
 .../text-base/IOSerialStreamSync.h.svn-base   |  275 +++
 .../IOKit/serial/IOModemSerialStreamSync.h    |   42 +
 .../IOKit/serial/IORS232SerialStreamSync.h    |  172 ++
 .../include/IOKit/serial/IOSerialDriverSync.h |   91 +
 i386/include/IOKit/serial/IOSerialKeys.h      |   80 +
 .../include/IOKit/serial/IOSerialStreamSync.h |  275 +++
 i386/include/IOKit/storage/.svn/all-wcprops   |  185 ++
 i386/include/IOKit/storage/.svn/entries       | 1051 ++++++++
 .../text-base/IOAppleLabelScheme.h.svn-base   |  191 ++
 .../IOApplePartitionScheme.h.svn-base         |  122 +
 .../IOBDBlockStorageDevice.h.svn-base         |  157 ++
 .../IOBDBlockStorageDriver.h.svn-base         |  152 ++
 .../.svn/text-base/IOBDMedia.h.svn-base       |  297 +++
 .../text-base/IOBDMediaBSDClient.h.svn-base   |  182 ++
 .../.svn/text-base/IOBDTypes.h.svn-base       |  133 +
 .../text-base/IOBlockStorageDevice.h.svn-base |   80 +
 .../text-base/IOBlockStorageDriver.h.svn-base |  245 ++
 .../IOCDBlockStorageDevice.h.svn-base         |   60 +
 .../IOCDBlockStorageDriver.h.svn-base         |   51 +
 .../.svn/text-base/IOCDMedia.h.svn-base       |  553 +++++
 .../text-base/IOCDMediaBSDClient.h.svn-base   |  199 ++
 .../text-base/IOCDPartitionScheme.h.svn-base  |  226 ++
 .../.svn/text-base/IOCDTypes.h.svn-base       |  492 ++++
 .../IODVDBlockStorageDevice.h.svn-base        |  145 ++
 .../IODVDBlockStorageDriver.h.svn-base        |  219 ++
 .../.svn/text-base/IODVDMedia.h.svn-base      |  357 +++
 .../text-base/IODVDMediaBSDClient.h.svn-base  |  197 ++
 .../.svn/text-base/IODVDTypes.h.svn-base      |  451 ++++
 .../IOFDiskPartitionScheme.h.svn-base         |  105 +
 .../.svn/text-base/IOFilterScheme.h.svn-base  |  289 +++
 ...OFireWireStorageCharacteristics.h.svn-base |   63 +
 .../IOGUIDPartitionScheme.h.svn-base          |   90 +
 .../storage/.svn/text-base/IOMedia.h.svn-base |  231 ++
 .../text-base/IOMediaBSDClient.h.svn-base     |   29 +
 .../text-base/IOPartitionScheme.h.svn-base    |  373 +++
 .../.svn/text-base/IOStorage.h.svn-base       |  217 ++
 .../IOStorageDeviceCharacteristics.h.svn-base |  659 +++++
 ...OStorageProtocolCharacteristics.h.svn-base | 1758 ++++++++++++++
 .../IOKit/storage/IOAppleLabelScheme.h        |  191 ++
 .../IOKit/storage/IOApplePartitionScheme.h    |  122 +
 .../IOKit/storage/IOBDBlockStorageDevice.h    |  157 ++
 .../IOKit/storage/IOBDBlockStorageDriver.h    |  152 ++
 i386/include/IOKit/storage/IOBDMedia.h        |  297 +++
 .../IOKit/storage/IOBDMediaBSDClient.h        |  182 ++
 i386/include/IOKit/storage/IOBDTypes.h        |  133 +
 .../IOKit/storage/IOBlockStorageDevice.h      |   80 +
 .../IOKit/storage/IOBlockStorageDriver.h      |  245 ++
 .../IOKit/storage/IOCDBlockStorageDevice.h    |   60 +
 .../IOKit/storage/IOCDBlockStorageDriver.h    |   51 +
 i386/include/IOKit/storage/IOCDMedia.h        |  553 +++++
 .../IOKit/storage/IOCDMediaBSDClient.h        |  199 ++
 .../IOKit/storage/IOCDPartitionScheme.h       |  226 ++
 i386/include/IOKit/storage/IOCDTypes.h        |  492 ++++
 .../IOKit/storage/IODVDBlockStorageDevice.h   |  145 ++
 .../IOKit/storage/IODVDBlockStorageDriver.h   |  219 ++
 i386/include/IOKit/storage/IODVDMedia.h       |  357 +++
 .../IOKit/storage/IODVDMediaBSDClient.h       |  197 ++
 i386/include/IOKit/storage/IODVDTypes.h       |  451 ++++
 .../IOKit/storage/IOFDiskPartitionScheme.h    |  105 +
 i386/include/IOKit/storage/IOFilterScheme.h   |  289 +++
 .../IOFireWireStorageCharacteristics.h        |   63 +
 .../IOKit/storage/IOGUIDPartitionScheme.h     |   90 +
 i386/include/IOKit/storage/IOMedia.h          |  231 ++
 i386/include/IOKit/storage/IOMediaBSDClient.h |   29 +
 .../include/IOKit/storage/IOPartitionScheme.h |  373 +++
 i386/include/IOKit/storage/IOStorage.h        |  217 ++
 .../storage/IOStorageDeviceCharacteristics.h  |  659 +++++
 .../IOStorageProtocolCharacteristics.h        | 1758 ++++++++++++++
 .../IOKit/storage/ata/.svn/all-wcprops        |   17 +
 i386/include/IOKit/storage/ata/.svn/entries   |   96 +
 .../IOATAPIProtocolTransport.h.svn-base       |  365 +++
 .../text-base/IOATAStorageDefines.h.svn-base  |  321 +++
 .../storage/ata/IOATAPIProtocolTransport.h    |  365 +++
 .../IOKit/storage/ata/IOATAStorageDefines.h   |  321 +++
 i386/include/IOKit/stream/.svn/all-wcprops    |   29 +
 i386/include/IOKit/stream/.svn/entries        |  164 ++
 .../stream/.svn/text-base/IOStream.h.svn-base |  609 +++++
 .../.svn/text-base/IOStreamFamily.h.svn-base  |   13 +
 .../.svn/text-base/IOStreamShared.h.svn-base  |  175 ++
 .../text-base/IOStreamUserClient.h.svn-base   |   76 +
 i386/include/IOKit/stream/IOStream.h          |  609 +++++
 i386/include/IOKit/stream/IOStreamFamily.h    |   13 +
 i386/include/IOKit/stream/IOStreamShared.h    |  175 ++
 .../include/IOKit/stream/IOStreamUserClient.h |   76 +
 i386/include/IOKit/system.h                   |   67 +
 .../IOKit/system_management/.svn/all-wcprops  |   11 +
 .../IOKit/system_management/.svn/entries      |   62 +
 .../.svn/text-base/IOWatchDogTimer.h.svn-base |   55 +
 .../IOKit/system_management/IOWatchDogTimer.h |   55 +
 i386/include/IOKit/usb/.svn/all-wcprops       |  155 ++
 i386/include/IOKit/usb/.svn/entries           |  878 +++++++
 .../text-base/IOUFIStorageServices.h.svn-base |  136 ++
 .../usb/.svn/text-base/IOUSBBus.h.svn-base    |   35 +
 .../.svn/text-base/IOUSBCommand.h.svn-base    |  266 ++
 .../text-base/IOUSBCompositeDriver.h.svn-base |  127 +
 .../.svn/text-base/IOUSBController.h.svn-base | 1073 ++++++++
 .../IOUSBControllerListElement.h.svn-base     |  126 +
 .../text-base/IOUSBControllerV2.h.svn-base    |  374 +++
 .../text-base/IOUSBControllerV3.h.svn-base    |  233 ++
 .../usb/.svn/text-base/IOUSBDevice.h.svn-base |  639 +++++
 .../.svn/text-base/IOUSBHIDDriver.h.svn-base  |  289 +++
 .../.svn/text-base/IOUSBHubDevice.h.svn-base  |  247 ++
 .../text-base/IOUSBHubPolicyMaker.h.svn-base  |  218 ++
 .../.svn/text-base/IOUSBInterface.h.svn-base  |  264 ++
 .../usb/.svn/text-base/IOUSBLog.h.svn-base    |  240 ++
 .../IOUSBMassStorageClass.h.svn-base          |  507 ++++
 .../IOUSBMassStorageUFISubclass.h.svn-base    |  355 +++
 .../usb/.svn/text-base/IOUSBNub.h.svn-base    |   69 +
 .../usb/.svn/text-base/IOUSBPipe.h.svn-base   |  387 +++
 .../text-base/IOUSBRootHubDevice.h.svn-base   |   97 +
 .../.svn/text-base/IOUSBUserClient.h.svn-base |  144 ++
 .../.svn/text-base/IOUSBWorkLoop.h.svn-base   |   64 +
 .../IOKit/usb/.svn/text-base/USB.h.svn-base   | 1076 ++++++++
 .../usb/.svn/text-base/USBHub.h.svn-base      |  240 ++
 .../usb/.svn/text-base/USBSpec.h.svn-base     |  470 ++++
 .../.svn/text-base/USBTracepoints.h.svn-base  |  662 +++++
 i386/include/IOKit/usb/IOUFIStorageServices.h |  136 ++
 i386/include/IOKit/usb/IOUSBBus.h             |   35 +
 i386/include/IOKit/usb/IOUSBCommand.h         |  266 ++
 i386/include/IOKit/usb/IOUSBCompositeDriver.h |  127 +
 i386/include/IOKit/usb/IOUSBController.h      | 1073 ++++++++
 .../IOKit/usb/IOUSBControllerListElement.h    |  126 +
 i386/include/IOKit/usb/IOUSBControllerV2.h    |  374 +++
 i386/include/IOKit/usb/IOUSBControllerV3.h    |  233 ++
 i386/include/IOKit/usb/IOUSBDevice.h          |  639 +++++
 i386/include/IOKit/usb/IOUSBHIDDriver.h       |  289 +++
 i386/include/IOKit/usb/IOUSBHubDevice.h       |  247 ++
 i386/include/IOKit/usb/IOUSBHubPolicyMaker.h  |  218 ++
 i386/include/IOKit/usb/IOUSBInterface.h       |  264 ++
 i386/include/IOKit/usb/IOUSBLog.h             |  240 ++
 .../include/IOKit/usb/IOUSBMassStorageClass.h |  507 ++++
 .../IOKit/usb/IOUSBMassStorageUFISubclass.h   |  355 +++
 i386/include/IOKit/usb/IOUSBNub.h             |   69 +
 i386/include/IOKit/usb/IOUSBPipe.h            |  387 +++
 i386/include/IOKit/usb/IOUSBRootHubDevice.h   |   97 +
 i386/include/IOKit/usb/IOUSBUserClient.h      |  144 ++
 i386/include/IOKit/usb/IOUSBWorkLoop.h        |   64 +
 i386/include/IOKit/usb/USB.h                  | 1076 ++++++++
 i386/include/IOKit/usb/USBHub.h               |  240 ++
 i386/include/IOKit/usb/USBSpec.h              |  470 ++++
 i386/include/IOKit/usb/USBTracepoints.h       |  662 +++++
 i386/include/_structs.h                       |   25 +
 i386/include/_types.h                         |   68 +
 i386/include/architecture/alignment.h         |   47 +
 i386/include/architecture/byte_order.h        |   36 +
 i386/include/architecture/i386/alignment.h    |   69 +
 i386/include/architecture/i386/asm_help.h     |  398 +++
 i386/include/architecture/i386/byte_order.h   |   33 +
 i386/include/architecture/i386/cpu.h          |   74 +
 i386/include/architecture/i386/desc.h         |  150 ++
 i386/include/architecture/i386/fenv.h         |  287 +++
 i386/include/architecture/i386/fpu.h          |  170 ++
 i386/include/architecture/i386/frame.h        |  129 +
 i386/include/architecture/i386/io.h           |   40 +
 i386/include/architecture/i386/math.h         |  642 +++++
 i386/include/architecture/i386/pio.h          |  104 +
 i386/include/architecture/i386/reg_help.h     |  105 +
 i386/include/architecture/i386/sel.h          |   53 +
 i386/include/architecture/i386/table.h        |   98 +
 i386/include/architecture/i386/tss.h          |  120 +
 i386/include/assert.h                         |   92 +
 i386/include/ctype.h                          |  438 ++++
 i386/include/device/.svn/all-wcprops          |   17 +
 i386/include/device/.svn/entries              |   96 +
 .../.svn/text-base/device_port.h.svn-base     |   80 +
 .../.svn/text-base/device_types.h.svn-base    |  141 ++
 i386/include/device/device_port.h             |   80 +
 i386/include/device/device_types.h            |  141 ++
 i386/include/errno.h                          |   24 +
 i386/include/float.h                          |  281 +++
 i386/include/i386/_limits.h                   |   27 +
 i386/include/i386/_param.h                    |   46 +
 i386/include/i386/_structs.h                  |  105 +
 i386/include/i386/_types.h                    |  120 +
 i386/include/i386/eflags.h                    |   94 +
 i386/include/i386/endian.h                    |  102 +
 i386/include/i386/fasttrap_isa.h              |  116 +
 i386/include/i386/limits.h                    |  107 +
 i386/include/i386/param.h                     |  169 ++
 i386/include/i386/profile.h                   |   39 +
 i386/include/i386/setjmp.h                    |   80 +
 i386/include/i386/signal.h                    |   62 +
 i386/include/i386/types.h                     |  138 ++
 i386/include/i386/user_ldt.h                  |   80 +
 i386/include/i386/vmparam.h                   |   62 +
 i386/include/inttypes.h                       |  321 +++
 i386/include/libkern/OSAtomic.h               |  209 ++
 i386/include/libkern/OSByteOrder.h            |  310 +++
 i386/include/libkern/OSCacheControl.h         |   65 +
 i386/include/libkern/OSDebug.h                |   66 +
 i386/include/libkern/OSKextLib.h              |  472 ++++
 i386/include/libkern/OSReturn.h               |  198 ++
 i386/include/libkern/OSTypes.h                |  131 +
 i386/include/libkern/_OSByteOrder.h           |  133 +
 i386/include/libkern/crypto/md5.h             |   79 +
 i386/include/libkern/crypto/sha1.h            |   70 +
 i386/include/libkern/i386/OSByteOrder.h       |  115 +
 i386/include/libkern/i386/_OSByteOrder.h      |  104 +
 i386/include/libkern/machine/OSByteOrder.h    |  143 ++
 i386/include/libkern/ppc/OSByteOrder.h        |  206 ++
 i386/include/limits.h                         |  144 ++
 i386/include/locale.h                         |   56 +
 i386/include/mach-o/arch.h                    |  105 +
 i386/include/mach-o/compact_unwind_encoding.h |  224 ++
 i386/include/mach-o/dyld.h                    |  253 ++
 i386/include/mach-o/dyld_images.h             |  164 ++
 i386/include/mach-o/fat.h                     |   64 +
 i386/include/mach-o/getsect.h                 |  131 +
 i386/include/mach-o/i386/swap.h               |   96 +
 i386/include/mach-o/ldsyms.h                  |  133 +
 i386/include/mach-o/loader.h                  | 1402 +++++++++++
 i386/include/mach-o/nlist.h                   |  312 +++
 i386/include/mach-o/ranlib.h                  |   67 +
 i386/include/mach-o/reloc.h                   |  203 ++
 i386/include/mach-o/stab.h                    |  122 +
 i386/include/mach-o/swap.h                    |  207 ++
 i386/include/mach-o/x86_64/reloc.h            |  185 ++
 i386/include/mach/audit_triggers.defs         |   49 +
 i386/include/mach/boolean.h                   |   88 +
 i386/include/mach/bootstrap.h                 |   34 +
 i386/include/mach/clock.defs                  |   81 +
 i386/include/mach/clock.h                     |  221 ++
 i386/include/mach/clock_priv.defs             |   69 +
 i386/include/mach/clock_priv.h                |  175 ++
 i386/include/mach/clock_reply.defs            |   56 +
 i386/include/mach/clock_reply.h               |  136 ++
 i386/include/mach/clock_types.defs            |   73 +
 i386/include/mach/clock_types.h               |  126 +
 i386/include/mach/error.h                     |  114 +
 i386/include/mach/exc.defs                    |  119 +
 i386/include/mach/exc.h                       |  257 ++
 i386/include/mach/exception.h                 |   62 +
 i386/include/mach/exception_types.h           |  181 ++
 i386/include/mach/host_info.h                 |  218 ++
 i386/include/mach/host_notify.h               |   37 +
 i386/include/mach/host_notify_reply.defs      |   40 +
 i386/include/mach/host_priv.defs              |  380 +++
 i386/include/mach/host_priv.h                 | 1269 ++++++++++
 i386/include/mach/host_reboot.h               |   39 +
 i386/include/mach/host_security.defs          |  101 +
 i386/include/mach/host_security.h             |  197 ++
 i386/include/mach/host_special_ports.h        |  180 ++
 i386/include/mach/i386/_structs.h             |  561 +++++
 i386/include/mach/i386/asm.h                  |  308 +++
 i386/include/mach/i386/boolean.h              |   74 +
 i386/include/mach/i386/exception.h            |  135 ++
 i386/include/mach/i386/fp_reg.h               |  141 ++
 i386/include/mach/i386/kern_return.h          |   74 +
 i386/include/mach/i386/machine_types.defs     |  127 +
 i386/include/mach/i386/ndr_def.h              |   45 +
 i386/include/mach/i386/processor_info.h       |   37 +
 i386/include/mach/i386/rpc.h                  |   36 +
 i386/include/mach/i386/sdt_isa.h              |  412 ++++
 i386/include/mach/i386/task.h                 | 1578 ++++++++++++
 i386/include/mach/i386/thread_act.h           | 1155 +++++++++
 i386/include/mach/i386/thread_state.h         |   42 +
 i386/include/mach/i386/thread_status.h        |  297 +++
 i386/include/mach/i386/vm_param.h             |  157 ++
 i386/include/mach/i386/vm_types.h             |  140 ++
 i386/include/mach/kern_return.h               |  322 +++
 i386/include/mach/kmod.h                      |  180 ++
 i386/include/mach/ledger.defs                 |   79 +
 i386/include/mach/ledger.h                    |  259 ++
 i386/include/mach/lock_set.defs               |   79 +
 i386/include/mach/lock_set.h                  |  326 +++
 i386/include/mach/mach.h                      |  133 +
 i386/include/mach/mach_error.h                |   93 +
 i386/include/mach/mach_exc.defs               |  119 +
 i386/include/mach/mach_host.defs              |  257 ++
 i386/include/mach/mach_host.h                 |  873 +++++++
 i386/include/mach/mach_init.h                 |  130 +
 i386/include/mach/mach_interface.h            |   54 +
 i386/include/mach/mach_param.h                |   73 +
 i386/include/mach/mach_port.defs              |  492 ++++
 i386/include/mach/mach_port.h                 | 1383 +++++++++++
 i386/include/mach/mach_syscalls.h             |   37 +
 i386/include/mach/mach_time.h                 |   56 +
 i386/include/mach/mach_traps.h                |  152 ++
 i386/include/mach/mach_types.defs             |  474 ++++
 i386/include/mach/mach_types.h                |  230 ++
 i386/include/mach/mach_vm.defs                |  480 ++++
 i386/include/mach/mach_vm.h                   | 1032 ++++++++
 i386/include/mach/machine.h                   |  344 +++
 i386/include/mach/machine/asm.h               |   42 +
 i386/include/mach/machine/boolean.h           |   42 +
 i386/include/mach/machine/exception.h         |   42 +
 i386/include/mach/machine/kern_return.h       |   42 +
 i386/include/mach/machine/machine_types.defs  |   44 +
 i386/include/mach/machine/ndr_def.h           |   42 +
 i386/include/mach/machine/processor_info.h    |   42 +
 i386/include/mach/machine/rpc.h               |   42 +
 i386/include/mach/machine/sdt.h               |   36 +
 i386/include/mach/machine/sdt_isa.h           |   41 +
 i386/include/mach/machine/thread_state.h      |   42 +
 i386/include/mach/machine/thread_status.h     |   42 +
 i386/include/mach/machine/vm_param.h          |   42 +
 i386/include/mach/machine/vm_types.h          |   42 +
 i386/include/mach/memory_object_types.h       |  271 +++
 i386/include/mach/message.h                   |  783 ++++++
 i386/include/mach/mig.h                       |  174 ++
 i386/include/mach/mig_errors.h                |  124 +
 i386/include/mach/ndr.h                       |  207 ++
 i386/include/mach/notify.defs                 |  124 +
 i386/include/mach/notify.h                    |  132 +
 i386/include/mach/policy.h                    |  235 ++
 i386/include/mach/port.h                      |  319 +++
 i386/include/mach/port_obj.h                  |  103 +
 i386/include/mach/processor.defs              |  128 +
 i386/include/mach/processor.h                 |  336 +++
 i386/include/mach/processor_info.h            |  153 ++
 i386/include/mach/processor_set.defs          |  161 ++
 i386/include/mach/processor_set.h             |  516 ++++
 i386/include/mach/rpc.h                       |  135 ++
 i386/include/mach/sdt.h                       |   32 +
 i386/include/mach/security.defs               |  208 ++
 i386/include/mach/semaphore.h                 |   78 +
 i386/include/mach/shared_memory_server.h      |  147 ++
 i386/include/mach/shared_region.h             |  134 +
 i386/include/mach/std_types.defs              |  150 ++
 i386/include/mach/std_types.h                 |   72 +
 i386/include/mach/sync.h                      |   35 +
 i386/include/mach/sync_policy.h               |   49 +
 i386/include/mach/task.defs                   |  393 +++
 i386/include/mach/task.h                      |   40 +
 i386/include/mach/task_access.defs            |   59 +
 i386/include/mach/task_info.h                 |  244 ++
 i386/include/mach/task_ledger.h               |   51 +
 i386/include/mach/task_policy.h               |  129 +
 i386/include/mach/task_special_ports.h        |  141 ++
 i386/include/mach/thread_act.defs             |  323 +++
 i386/include/mach/thread_act.h                |   40 +
 i386/include/mach/thread_info.h               |  154 ++
 i386/include/mach/thread_policy.h             |  218 ++
 i386/include/mach/thread_special_ports.h      |   83 +
 i386/include/mach/thread_status.h             |   94 +
 i386/include/mach/thread_switch.h             |   77 +
 i386/include/mach/time_value.h                |   96 +
 i386/include/mach/vm_attributes.h             |   99 +
 i386/include/mach/vm_behavior.h               |   78 +
 i386/include/mach/vm_inherit.h                |   89 +
 i386/include/mach/vm_map.defs                 |  475 ++++
 i386/include/mach/vm_map.h                    | 1378 +++++++++++
 i386/include/mach/vm_param.h                  |   73 +
 i386/include/mach/vm_prot.h                   |  141 ++
 i386/include/mach/vm_purgable.h               |  134 +
 i386/include/mach/vm_region.h                 |  320 +++
 i386/include/mach/vm_statistics.h             |  335 +++
 i386/include/mach/vm_sync.h                   |   80 +
 i386/include/mach/vm_task.h                   |   34 +
 i386/include/mach/vm_types.h                  |   93 +
 i386/include/mach/x86_64/.svn/all-wcprops     |   17 +
 i386/include/mach/x86_64/.svn/entries         |   96 +
 .../x86_64/.svn/text-base/task.h.svn-base     | 1578 ++++++++++++
 .../.svn/text-base/thread_act.h.svn-base      | 1155 +++++++++
 i386/include/mach/x86_64/task.h               | 1578 ++++++++++++
 i386/include/mach/x86_64/thread_act.h         | 1155 +++++++++
 i386/include/machine/_limits.h                |   41 +
 i386/include/machine/_param.h                 |   36 +
 i386/include/machine/_structs.h               |   36 +
 i386/include/machine/_types.h                 |   41 +
 i386/include/machine/byte_order.h             |   37 +
 i386/include/machine/endian.h                 |   44 +
 i386/include/machine/fasttrap_isa.h           |   41 +
 i386/include/machine/limits.h                 |   13 +
 i386/include/machine/param.h                  |   44 +
 i386/include/machine/profile.h                |   46 +
 i386/include/machine/setjmp.h                 |   44 +
 i386/include/machine/signal.h                 |   41 +
 i386/include/machine/types.h                  |   44 +
 i386/include/machine/vmparam.h                |   41 +
 i386/include/math.h                           |   35 +
 i386/include/pexpert/boot.h                   |   33 +
 i386/include/pexpert/i386/boot.h              |  177 ++
 i386/include/pexpert/i386/efi.h               |  558 +++++
 i386/include/pexpert/i386/protos.h            |   95 +
 i386/include/pexpert/machine/boot.h           |   39 +
 i386/include/pexpert/machine/protos.h         |   39 +
 i386/include/pexpert/pexpert.h                |  306 +++
 i386/include/pexpert/protos.h                 |   32 +
 i386/include/runetype.h                       |  136 ++
 i386/include/setjmp.h                         |   28 +
 i386/include/signal.h                         |  187 ++
 i386/include/stdarg.h                         |  133 +
 i386/include/stdbool.h                        |   46 +
 i386/include/stddef.h                         |  130 +
 i386/include/stdint.h                         |  253 ++
 i386/include/stdio.h                          |  503 ++++
 i386/include/stdlib.h                         |  320 +++
 i386/include/string.h                         |  154 ++
 i386/include/sys/_endian.h                    |  139 ++
 i386/include/sys/_select.h                    |   52 +
 i386/include/sys/_structs.h                   |  236 ++
 i386/include/sys/_types.h                     |   84 +
 i386/include/sys/appleapiopts.h               |   62 +
 i386/include/sys/buf.h                        |  859 +++++++
 i386/include/sys/cdefs.h                      |  583 +++++
 i386/include/sys/disk.h                       |  139 ++
 i386/include/sys/kernel_types.h               |  143 ++
 i386/include/sys/param.h                      |  250 ++
 i386/include/sys/reboot.h                     |  129 +
 i386/include/sys/select.h                     |  157 ++
 i386/include/sys/socket.h                     |  629 +++++
 i386/include/sys/syscall.h                    |  477 ++++
 i386/include/sys/syslimits.h                  |  117 +
 i386/include/sys/time.h                       |  221 ++
 i386/include/sys/types.h                      |  239 ++
 i386/include/sys/unistd.h                     |  181 ++
 i386/include/sys/vnode.h                      |  119 +
 i386/include/time.h                           |  213 ++
 i386/include/unistd.h                         |  623 +++++
 i386/include/unwind.h                         |  245 ++
 i386/libsa/Makefile                           |   10 +-
 i386/libsaio/Makefile                         |    9 +-
 i386/libsaio/smbios/static_data.h             |    2 +-
 i386/libsaio/stringTable.c                    |   26 +-
 i386/util/Makefile                            |   11 +-
 i386/util/ld_classic                          |  Bin 425120 -> 0 bytes
 i386/util/ld_classic.1                        | 1823 --------------
 i386/util/machOconv.c                         |  221 +-
 i386/util/md.1                                |  121 -
 i386/util/md.c                                |  726 ------
 i386/util/segsize.c                           |  128 +
 729 files changed, 191890 insertions(+), 2869 deletions(-)
 create mode 100644 i386/include/IOKit/IOBSD.h
 create mode 100644 i386/include/IOKit/IOBufferMemoryDescriptor.h
 create mode 100644 i386/include/IOKit/IOCatalogue.h
 create mode 100644 i386/include/IOKit/IOCommand.h
 create mode 100644 i386/include/IOKit/IOCommandGate.h
 create mode 100644 i386/include/IOKit/IOCommandPool.h
 create mode 100644 i386/include/IOKit/IOConditionLock.h
 create mode 100644 i386/include/IOKit/IODMACommand.h
 create mode 100644 i386/include/IOKit/IODMAController.h
 create mode 100644 i386/include/IOKit/IODMAEventSource.h
 create mode 100644 i386/include/IOKit/IODataQueue.h
 create mode 100644 i386/include/IOKit/IODataQueueShared.h
 create mode 100644 i386/include/IOKit/IODeviceMemory.h
 create mode 100644 i386/include/IOKit/IODeviceTreeSupport.h
 create mode 100644 i386/include/IOKit/IOEventSource.h
 create mode 100644 i386/include/IOKit/IOFilterInterruptEventSource.h
 create mode 100644 i386/include/IOKit/IOInterleavedMemoryDescriptor.h
 create mode 100644 i386/include/IOKit/IOInterruptController.h
 create mode 100644 i386/include/IOKit/IOInterruptEventSource.h
 create mode 100644 i386/include/IOKit/IOInterrupts.h
 create mode 100644 i386/include/IOKit/IOKitDebug.h
 create mode 100644 i386/include/IOKit/IOKitKeys.h
 create mode 100644 i386/include/IOKit/IOKitServer.h
 create mode 100644 i386/include/IOKit/IOLib.h
 create mode 100644 i386/include/IOKit/IOLocks.h
 create mode 100644 i386/include/IOKit/IOMapper.h
 create mode 100644 i386/include/IOKit/IOMemoryCursor.h
 create mode 100644 i386/include/IOKit/IOMemoryDescriptor.h
 create mode 100644 i386/include/IOKit/IOMessage.h
 create mode 100644 i386/include/IOKit/IOMultiMemoryDescriptor.h
 create mode 100644 i386/include/IOKit/IONVRAM.h
 create mode 100644 i386/include/IOKit/IONotifier.h
 create mode 100644 i386/include/IOKit/IOPlatformExpert.h
 create mode 100644 i386/include/IOKit/IORangeAllocator.h
 create mode 100644 i386/include/IOKit/IORegistryEntry.h
 create mode 100644 i386/include/IOKit/IOReturn.h
 create mode 100644 i386/include/IOKit/IOService.h
 create mode 100644 i386/include/IOKit/IOServicePM.h
 create mode 100644 i386/include/IOKit/IOSharedDataQueue.h
 create mode 100644 i386/include/IOKit/IOSharedLock.h
 create mode 100644 i386/include/IOKit/IOSubMemoryDescriptor.h
 create mode 100644 i386/include/IOKit/IOSyncer.h
 create mode 100644 i386/include/IOKit/IOTimeStamp.h
 create mode 100644 i386/include/IOKit/IOTimerEventSource.h
 create mode 100644 i386/include/IOKit/IOTypes.h
 create mode 100644 i386/include/IOKit/IOUserClient.h
 create mode 100644 i386/include/IOKit/IOWorkLoop.h
 create mode 100644 i386/include/IOKit/OSMessageNotification.h
 create mode 100644 i386/include/IOKit/acpi/IOACPIPlatformDevice.h
 create mode 100644 i386/include/IOKit/acpi/IOACPIPlatformExpert.h
 create mode 100644 i386/include/IOKit/acpi/IOACPITypes.h
 create mode 100644 i386/include/IOKit/assert.h
 create mode 100644 i386/include/IOKit/ata/ATADeviceNub.h
 create mode 100644 i386/include/IOKit/ata/ATATimerEventSource.h
 create mode 100644 i386/include/IOKit/ata/IOATABusCommand.h
 create mode 100644 i386/include/IOKit/ata/IOATABusInfo.h
 create mode 100644 i386/include/IOKit/ata/IOATACommand.h
 create mode 100644 i386/include/IOKit/ata/IOATAController.h
 create mode 100644 i386/include/IOKit/ata/IOATADevConfig.h
 create mode 100644 i386/include/IOKit/ata/IOATADevice.h
 create mode 100644 i386/include/IOKit/ata/IOATARegI386.h
 create mode 100644 i386/include/IOKit/ata/IOATATypes.h
 create mode 100644 i386/include/IOKit/ata/IOPCIATA.h
 create mode 100644 i386/include/IOKit/ata/MacIOATA.h
 create mode 100644 i386/include/IOKit/audio/IOAudioControl.h
 create mode 100644 i386/include/IOKit/audio/IOAudioControlUserClient.h
 create mode 100644 i386/include/IOKit/audio/IOAudioDebug.h
 create mode 100644 i386/include/IOKit/audio/IOAudioDefines.h
 create mode 100644 i386/include/IOKit/audio/IOAudioDevice.h
 create mode 100644 i386/include/IOKit/audio/IOAudioEngine.h
 create mode 100644 i386/include/IOKit/audio/IOAudioEngineUserClient.h
 create mode 100644 i386/include/IOKit/audio/IOAudioLevelControl.h
 create mode 100644 i386/include/IOKit/audio/IOAudioPort.h
 create mode 100644 i386/include/IOKit/audio/IOAudioSelectorControl.h
 create mode 100644 i386/include/IOKit/audio/IOAudioStream.h
 create mode 100644 i386/include/IOKit/audio/IOAudioToggleControl.h
 create mode 100644 i386/include/IOKit/audio/IOAudioTypes.h
 create mode 100644 i386/include/IOKit/avc/IOFireWireAVCCommand.h
 create mode 100644 i386/include/IOKit/avc/IOFireWireAVCConsts.h
 create mode 100644 i386/include/IOKit/avc/IOFireWireAVCRequestSpace.h
 create mode 100644 i386/include/IOKit/avc/IOFireWireAVCTargetSpace.h
 create mode 100644 i386/include/IOKit/avc/IOFireWireAVCUnit.h
 create mode 100644 i386/include/IOKit/avc/IOFireWireAVCUserClientCommon.h
 create mode 100644 i386/include/IOKit/avc/IOFireWirePCRSpace.h
 create mode 100644 i386/include/IOKit/bluetooth/Bluetooth.h
 create mode 100644 i386/include/IOKit/bluetooth/BluetoothAssignedNumbers.h
 create mode 100644 i386/include/IOKit/bluetooth/IOBluetoothHCIController.h
 create mode 100644 i386/include/IOKit/bluetooth/IOBluetoothHCIRequest.h
 create mode 100644 i386/include/IOKit/bluetooth/IOBluetoothHIDDriver.h
 create mode 100644 i386/include/IOKit/bluetooth/IOBluetoothHIDDriverTypes.h
 create mode 100644 i386/include/IOKit/bluetooth/IOBluetoothInternal.h
 create mode 100644 i386/include/IOKit/bluetooth/IOBluetoothTypes.h
 create mode 100644 i386/include/IOKit/firewire/IOConfigDirectory.h
 create mode 100644 i386/include/IOKit/firewire/IOFWAddressSpace.h
 create mode 100644 i386/include/IOKit/firewire/IOFWAsyncStreamListener.h
 create mode 100644 i386/include/IOKit/firewire/IOFWCommand.h
 create mode 100644 i386/include/IOKit/firewire/IOFWDCL.h
 create mode 100644 i386/include/IOKit/firewire/IOFWDCLPool.h
 create mode 100644 i386/include/IOKit/firewire/IOFWDCLProgram.h
 create mode 100644 i386/include/IOKit/firewire/IOFWDCLTranslator.h
 create mode 100644 i386/include/IOKit/firewire/IOFWIsochChannel.h
 create mode 100644 i386/include/IOKit/firewire/IOFWIsochPort.h
 create mode 100644 i386/include/IOKit/firewire/IOFWLocalIsochPort.h
 create mode 100644 i386/include/IOKit/firewire/IOFWPHYPacketListener.h
 create mode 100644 i386/include/IOKit/firewire/IOFWPhysicalAddressSpace.h
 create mode 100644 i386/include/IOKit/firewire/IOFWPseudoAddressSpace.h
 create mode 100644 i386/include/IOKit/firewire/IOFWRegs.h
 create mode 100644 i386/include/IOKit/firewire/IOFWSimpleContiguousPhysicalAddressSpace.h
 create mode 100644 i386/include/IOKit/firewire/IOFWSimplePhysicalAddressSpace.h
 create mode 100644 i386/include/IOKit/firewire/IOFWSyncer.h
 create mode 100644 i386/include/IOKit/firewire/IOFWUserObjectExporter.h
 create mode 100644 i386/include/IOKit/firewire/IOFWUtils.h
 create mode 100644 i386/include/IOKit/firewire/IOFireWireBus.h
 create mode 100644 i386/include/IOKit/firewire/IOFireWireController.h
 create mode 100644 i386/include/IOKit/firewire/IOFireWireDevice.h
 create mode 100644 i386/include/IOKit/firewire/IOFireWireFamilyCommon.h
 create mode 100644 i386/include/IOKit/firewire/IOFireWireIRMAllocation.h
 create mode 100644 i386/include/IOKit/firewire/IOFireWireLocalNode.h
 create mode 100644 i386/include/IOKit/firewire/IOFireWireMultiIsochReceive.h
 create mode 100644 i386/include/IOKit/firewire/IOFireWireNub.h
 create mode 100644 i386/include/IOKit/firewire/IOFireWirePowerManager.h
 create mode 100644 i386/include/IOKit/firewire/IOFireWireUnit.h
 create mode 100644 i386/include/IOKit/firewire/IOLocalConfigDirectory.h
 create mode 100644 i386/include/IOKit/firewire/IORemoteConfigDirectory.h
 create mode 100644 i386/include/IOKit/graphics/IOAccelClientConnect.h
 create mode 100644 i386/include/IOKit/graphics/IOAccelSurfaceConnect.h
 create mode 100644 i386/include/IOKit/graphics/IOAccelTypes.h
 create mode 100644 i386/include/IOKit/graphics/IOAccelerator.h
 create mode 100644 i386/include/IOKit/graphics/IODisplay.h
 create mode 100644 i386/include/IOKit/graphics/IOFramebuffer.h
 create mode 100644 i386/include/IOKit/graphics/IOFramebufferShared.h
 create mode 100644 i386/include/IOKit/graphics/IOGraphicsDevice.h
 create mode 100644 i386/include/IOKit/graphics/IOGraphicsEngine.h
 create mode 100644 i386/include/IOKit/graphics/IOGraphicsInterfaceTypes.h
 create mode 100644 i386/include/IOKit/graphics/IOGraphicsTypes.h
 create mode 100644 i386/include/IOKit/hid/IOHIDDevice.h
 create mode 100644 i386/include/IOKit/hid/IOHIDElement.h
 create mode 100644 i386/include/IOKit/hid/IOHIDInterface.h
 create mode 100644 i386/include/IOKit/hid/IOHIDKeys.h
 create mode 100644 i386/include/IOKit/hid/IOHIDUsageTables.h
 create mode 100644 i386/include/IOKit/hidevent/IOHIDEventDriver.h
 create mode 100644 i386/include/IOKit/hidevent/IOHIDEventService.h
 create mode 100644 i386/include/IOKit/hidsystem/IOHIDDescriptorParser.h
 create mode 100644 i386/include/IOKit/hidsystem/IOHIDParameter.h
 create mode 100644 i386/include/IOKit/hidsystem/IOHIDShared.h
 create mode 100644 i386/include/IOKit/hidsystem/IOHIDSystem.h
 create mode 100644 i386/include/IOKit/hidsystem/IOHIDTypes.h
 create mode 100644 i386/include/IOKit/hidsystem/IOHIDUsageTables.h
 create mode 100644 i386/include/IOKit/hidsystem/IOHIDevice.h
 create mode 100644 i386/include/IOKit/hidsystem/IOHIKeyboard.h
 create mode 100644 i386/include/IOKit/hidsystem/IOHIKeyboardMapper.h
 create mode 100644 i386/include/IOKit/hidsystem/IOHIPointing.h
 create mode 100644 i386/include/IOKit/hidsystem/IOLLEvent.h
 create mode 100644 i386/include/IOKit/hidsystem/ev_keymap.h
 create mode 100644 i386/include/IOKit/i2c/IOI2CInterface.h
 create mode 100644 i386/include/IOKit/ndrvsupport/IOMacOSTypes.h
 create mode 100644 i386/include/IOKit/ndrvsupport/IOMacOSVideo.h
 create mode 100644 i386/include/IOKit/ndrvsupport/IONDRVFramebuffer.h
 create mode 100644 i386/include/IOKit/ndrvsupport/IONDRVLibraries.h
 create mode 100644 i386/include/IOKit/ndrvsupport/IONDRVSupport.h
 create mode 100644 i386/include/IOKit/network/IOBasicOutputQueue.h
 create mode 100644 i386/include/IOKit/network/IOEthernetController.h
 create mode 100644 i386/include/IOKit/network/IOEthernetInterface.h
 create mode 100644 i386/include/IOKit/network/IOEthernetStats.h
 create mode 100644 i386/include/IOKit/network/IOGatedOutputQueue.h
 create mode 100644 i386/include/IOKit/network/IOKernelDebugger.h
 create mode 100644 i386/include/IOKit/network/IOMbufMemoryCursor.h
 create mode 100644 i386/include/IOKit/network/IONetworkController.h
 create mode 100644 i386/include/IOKit/network/IONetworkData.h
 create mode 100644 i386/include/IOKit/network/IONetworkInterface.h
 create mode 100644 i386/include/IOKit/network/IONetworkMedium.h
 create mode 100644 i386/include/IOKit/network/IONetworkStats.h
 create mode 100644 i386/include/IOKit/network/IOOutputQueue.h
 create mode 100644 i386/include/IOKit/network/IOPacketQueue.h
 create mode 100644 i386/include/IOKit/nvram/IONVRAMController.h
 create mode 100644 i386/include/IOKit/pci/IOAGPDevice.h
 create mode 100644 i386/include/IOKit/pci/IOPCIBridge.h
 create mode 100644 i386/include/IOKit/pci/IOPCIDevice.h
 create mode 100644 i386/include/IOKit/platform/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/platform/.svn/entries
 create mode 100644 i386/include/IOKit/platform/.svn/text-base/AppleMacIO.h.svn-base
 create mode 100644 i386/include/IOKit/platform/.svn/text-base/AppleMacIODevice.h.svn-base
 create mode 100644 i386/include/IOKit/platform/.svn/text-base/AppleNMI.h.svn-base
 create mode 100644 i386/include/IOKit/platform/.svn/text-base/ApplePlatformExpert.h.svn-base
 create mode 100644 i386/include/IOKit/platform/AppleMacIO.h
 create mode 100644 i386/include/IOKit/platform/AppleMacIODevice.h
 create mode 100644 i386/include/IOKit/platform/AppleNMI.h
 create mode 100644 i386/include/IOKit/platform/ApplePlatformExpert.h
 create mode 100644 i386/include/IOKit/power/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/power/.svn/entries
 create mode 100644 i386/include/IOKit/power/.svn/text-base/IOPwrController.h.svn-base
 create mode 100644 i386/include/IOKit/power/IOPwrController.h
 create mode 100644 i386/include/IOKit/ppc/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/ppc/.svn/entries
 create mode 100644 i386/include/IOKit/ppc/.svn/text-base/IODBDMA.h.svn-base
 create mode 100644 i386/include/IOKit/ppc/IODBDMA.h
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/entries
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPM.h.svn-base
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMDeprecated.h.svn-base
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMLibDefs.h.svn-base
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSource.h.svn-base
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSourceList.h.svn-base
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPrivate.h.svn-base
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMpowerState.h.svn-base
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPowerConnection.h.svn-base
 create mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/RootDomain.h.svn-base
 create mode 100644 i386/include/IOKit/pwr_mgt/IOPM.h
 create mode 100644 i386/include/IOKit/pwr_mgt/IOPMDeprecated.h
 create mode 100644 i386/include/IOKit/pwr_mgt/IOPMLibDefs.h
 create mode 100644 i386/include/IOKit/pwr_mgt/IOPMPowerSource.h
 create mode 100644 i386/include/IOKit/pwr_mgt/IOPMPowerSourceList.h
 create mode 100644 i386/include/IOKit/pwr_mgt/IOPMPrivate.h
 create mode 100644 i386/include/IOKit/pwr_mgt/IOPMpowerState.h
 create mode 100644 i386/include/IOKit/pwr_mgt/IOPowerConnection.h
 create mode 100644 i386/include/IOKit/pwr_mgt/RootDomain.h
 create mode 100644 i386/include/IOKit/rtc/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/rtc/.svn/entries
 create mode 100644 i386/include/IOKit/rtc/.svn/text-base/IORTCController.h.svn-base
 create mode 100644 i386/include/IOKit/rtc/IORTCController.h
 create mode 100644 i386/include/IOKit/sbp2/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/sbp2/.svn/entries
 create mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LSIWorkaroundDescriptor.h.svn-base
 create mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LUN.h.svn-base
 create mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Login.h.svn-base
 create mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ManagementORB.h.svn-base
 create mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ORB.h.svn-base
 create mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Target.h.svn-base
 create mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClient.h.svn-base
 create mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClientCommon.h.svn-base
 create mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSerialBusProtocolTransport.h.svn-base
 create mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2LSIWorkaroundDescriptor.h
 create mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h
 create mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2Login.h
 create mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2ManagementORB.h
 create mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h
 create mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2Target.h
 create mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2UserClient.h
 create mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2UserClientCommon.h
 create mode 100644 i386/include/IOKit/sbp2/IOFireWireSerialBusProtocolTransport.h
 create mode 100644 i386/include/IOKit/scsi/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/scsi/.svn/entries
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOBDServices.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOBlockStorageServices.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOCompactDiscServices.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IODVDServices.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOReducedBlockServices.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIBlockCommandsDevice.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIMultimediaCommandsDevice.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceNub.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType00.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType05.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType07.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType0E.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPrimaryCommandsDevice.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolInterface.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolServices.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIReducedBlockCommandsDevice.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICmds_INQUIRY_Definitions.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICmds_MODE_Definitions.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICmds_READ_CAPACITY_Definitions.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REPORT_LUNS_Definitions.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REQUEST_SENSE_Defs.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICommandDefinitions.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICommandOperationCodes.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSIPort.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSITask.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/IOBDServices.h
 create mode 100644 i386/include/IOKit/scsi/IOBlockStorageServices.h
 create mode 100644 i386/include/IOKit/scsi/IOCompactDiscServices.h
 create mode 100644 i386/include/IOKit/scsi/IODVDServices.h
 create mode 100644 i386/include/IOKit/scsi/IOReducedBlockServices.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIBlockCommandsDevice.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIMultimediaCommandsDevice.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIPeripheralDeviceNub.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType00.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType05.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType07.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType0E.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIPrimaryCommandsDevice.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIProtocolInterface.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIProtocolServices.h
 create mode 100644 i386/include/IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h
 create mode 100644 i386/include/IOKit/scsi/SCSICmds_INQUIRY_Definitions.h
 create mode 100644 i386/include/IOKit/scsi/SCSICmds_MODE_Definitions.h
 create mode 100644 i386/include/IOKit/scsi/SCSICmds_READ_CAPACITY_Definitions.h
 create mode 100644 i386/include/IOKit/scsi/SCSICmds_REPORT_LUNS_Definitions.h
 create mode 100644 i386/include/IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h
 create mode 100644 i386/include/IOKit/scsi/SCSICommandDefinitions.h
 create mode 100644 i386/include/IOKit/scsi/SCSICommandOperationCodes.h
 create mode 100644 i386/include/IOKit/scsi/SCSIPort.h
 create mode 100644 i386/include/IOKit/scsi/SCSITask.h
 create mode 100644 i386/include/IOKit/scsi/spi/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/scsi/spi/.svn/entries
 create mode 100644 i386/include/IOKit/scsi/spi/.svn/text-base/IOSCSIParallelInterfaceController.h.svn-base
 create mode 100644 i386/include/IOKit/scsi/spi/IOSCSIParallelInterfaceController.h
 create mode 100644 i386/include/IOKit/serial/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/serial/.svn/entries
 create mode 100644 i386/include/IOKit/serial/.svn/text-base/IOModemSerialStreamSync.h.svn-base
 create mode 100644 i386/include/IOKit/serial/.svn/text-base/IORS232SerialStreamSync.h.svn-base
 create mode 100644 i386/include/IOKit/serial/.svn/text-base/IOSerialDriverSync.h.svn-base
 create mode 100644 i386/include/IOKit/serial/.svn/text-base/IOSerialKeys.h.svn-base
 create mode 100644 i386/include/IOKit/serial/.svn/text-base/IOSerialStreamSync.h.svn-base
 create mode 100644 i386/include/IOKit/serial/IOModemSerialStreamSync.h
 create mode 100644 i386/include/IOKit/serial/IORS232SerialStreamSync.h
 create mode 100644 i386/include/IOKit/serial/IOSerialDriverSync.h
 create mode 100644 i386/include/IOKit/serial/IOSerialKeys.h
 create mode 100644 i386/include/IOKit/serial/IOSerialStreamSync.h
 create mode 100644 i386/include/IOKit/storage/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/storage/.svn/entries
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOAppleLabelScheme.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOApplePartitionScheme.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDevice.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDriver.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBDMedia.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBDMediaBSDClient.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBDTypes.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDevice.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDriver.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDevice.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDriver.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDMedia.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDMediaBSDClient.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDPartitionScheme.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDTypes.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDevice.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDriver.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IODVDMedia.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IODVDMediaBSDClient.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IODVDTypes.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOFDiskPartitionScheme.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOFilterScheme.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOFireWireStorageCharacteristics.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOGUIDPartitionScheme.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOMedia.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOMediaBSDClient.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOPartitionScheme.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOStorage.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOStorageDeviceCharacteristics.h.svn-base
 create mode 100644 i386/include/IOKit/storage/.svn/text-base/IOStorageProtocolCharacteristics.h.svn-base
 create mode 100644 i386/include/IOKit/storage/IOAppleLabelScheme.h
 create mode 100644 i386/include/IOKit/storage/IOApplePartitionScheme.h
 create mode 100644 i386/include/IOKit/storage/IOBDBlockStorageDevice.h
 create mode 100644 i386/include/IOKit/storage/IOBDBlockStorageDriver.h
 create mode 100644 i386/include/IOKit/storage/IOBDMedia.h
 create mode 100644 i386/include/IOKit/storage/IOBDMediaBSDClient.h
 create mode 100644 i386/include/IOKit/storage/IOBDTypes.h
 create mode 100644 i386/include/IOKit/storage/IOBlockStorageDevice.h
 create mode 100644 i386/include/IOKit/storage/IOBlockStorageDriver.h
 create mode 100644 i386/include/IOKit/storage/IOCDBlockStorageDevice.h
 create mode 100644 i386/include/IOKit/storage/IOCDBlockStorageDriver.h
 create mode 100644 i386/include/IOKit/storage/IOCDMedia.h
 create mode 100644 i386/include/IOKit/storage/IOCDMediaBSDClient.h
 create mode 100644 i386/include/IOKit/storage/IOCDPartitionScheme.h
 create mode 100644 i386/include/IOKit/storage/IOCDTypes.h
 create mode 100644 i386/include/IOKit/storage/IODVDBlockStorageDevice.h
 create mode 100644 i386/include/IOKit/storage/IODVDBlockStorageDriver.h
 create mode 100644 i386/include/IOKit/storage/IODVDMedia.h
 create mode 100644 i386/include/IOKit/storage/IODVDMediaBSDClient.h
 create mode 100644 i386/include/IOKit/storage/IODVDTypes.h
 create mode 100644 i386/include/IOKit/storage/IOFDiskPartitionScheme.h
 create mode 100644 i386/include/IOKit/storage/IOFilterScheme.h
 create mode 100644 i386/include/IOKit/storage/IOFireWireStorageCharacteristics.h
 create mode 100644 i386/include/IOKit/storage/IOGUIDPartitionScheme.h
 create mode 100644 i386/include/IOKit/storage/IOMedia.h
 create mode 100644 i386/include/IOKit/storage/IOMediaBSDClient.h
 create mode 100644 i386/include/IOKit/storage/IOPartitionScheme.h
 create mode 100644 i386/include/IOKit/storage/IOStorage.h
 create mode 100644 i386/include/IOKit/storage/IOStorageDeviceCharacteristics.h
 create mode 100644 i386/include/IOKit/storage/IOStorageProtocolCharacteristics.h
 create mode 100644 i386/include/IOKit/storage/ata/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/storage/ata/.svn/entries
 create mode 100644 i386/include/IOKit/storage/ata/.svn/text-base/IOATAPIProtocolTransport.h.svn-base
 create mode 100644 i386/include/IOKit/storage/ata/.svn/text-base/IOATAStorageDefines.h.svn-base
 create mode 100644 i386/include/IOKit/storage/ata/IOATAPIProtocolTransport.h
 create mode 100644 i386/include/IOKit/storage/ata/IOATAStorageDefines.h
 create mode 100644 i386/include/IOKit/stream/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/stream/.svn/entries
 create mode 100644 i386/include/IOKit/stream/.svn/text-base/IOStream.h.svn-base
 create mode 100644 i386/include/IOKit/stream/.svn/text-base/IOStreamFamily.h.svn-base
 create mode 100644 i386/include/IOKit/stream/.svn/text-base/IOStreamShared.h.svn-base
 create mode 100644 i386/include/IOKit/stream/.svn/text-base/IOStreamUserClient.h.svn-base
 create mode 100644 i386/include/IOKit/stream/IOStream.h
 create mode 100644 i386/include/IOKit/stream/IOStreamFamily.h
 create mode 100644 i386/include/IOKit/stream/IOStreamShared.h
 create mode 100644 i386/include/IOKit/stream/IOStreamUserClient.h
 create mode 100644 i386/include/IOKit/system.h
 create mode 100644 i386/include/IOKit/system_management/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/system_management/.svn/entries
 create mode 100644 i386/include/IOKit/system_management/.svn/text-base/IOWatchDogTimer.h.svn-base
 create mode 100644 i386/include/IOKit/system_management/IOWatchDogTimer.h
 create mode 100644 i386/include/IOKit/usb/.svn/all-wcprops
 create mode 100644 i386/include/IOKit/usb/.svn/entries
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUFIStorageServices.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBBus.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBCommand.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBCompositeDriver.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBController.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBControllerListElement.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV2.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV3.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBDevice.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBHIDDriver.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBHubDevice.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBHubPolicyMaker.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBInterface.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBLog.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageClass.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageUFISubclass.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBNub.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBPipe.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBRootHubDevice.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBUserClient.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBWorkLoop.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/USB.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/USBHub.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/USBSpec.h.svn-base
 create mode 100644 i386/include/IOKit/usb/.svn/text-base/USBTracepoints.h.svn-base
 create mode 100644 i386/include/IOKit/usb/IOUFIStorageServices.h
 create mode 100644 i386/include/IOKit/usb/IOUSBBus.h
 create mode 100644 i386/include/IOKit/usb/IOUSBCommand.h
 create mode 100644 i386/include/IOKit/usb/IOUSBCompositeDriver.h
 create mode 100644 i386/include/IOKit/usb/IOUSBController.h
 create mode 100644 i386/include/IOKit/usb/IOUSBControllerListElement.h
 create mode 100644 i386/include/IOKit/usb/IOUSBControllerV2.h
 create mode 100644 i386/include/IOKit/usb/IOUSBControllerV3.h
 create mode 100644 i386/include/IOKit/usb/IOUSBDevice.h
 create mode 100644 i386/include/IOKit/usb/IOUSBHIDDriver.h
 create mode 100644 i386/include/IOKit/usb/IOUSBHubDevice.h
 create mode 100644 i386/include/IOKit/usb/IOUSBHubPolicyMaker.h
 create mode 100644 i386/include/IOKit/usb/IOUSBInterface.h
 create mode 100644 i386/include/IOKit/usb/IOUSBLog.h
 create mode 100644 i386/include/IOKit/usb/IOUSBMassStorageClass.h
 create mode 100644 i386/include/IOKit/usb/IOUSBMassStorageUFISubclass.h
 create mode 100644 i386/include/IOKit/usb/IOUSBNub.h
 create mode 100644 i386/include/IOKit/usb/IOUSBPipe.h
 create mode 100644 i386/include/IOKit/usb/IOUSBRootHubDevice.h
 create mode 100644 i386/include/IOKit/usb/IOUSBUserClient.h
 create mode 100644 i386/include/IOKit/usb/IOUSBWorkLoop.h
 create mode 100644 i386/include/IOKit/usb/USB.h
 create mode 100644 i386/include/IOKit/usb/USBHub.h
 create mode 100644 i386/include/IOKit/usb/USBSpec.h
 create mode 100644 i386/include/IOKit/usb/USBTracepoints.h
 create mode 100644 i386/include/_structs.h
 create mode 100644 i386/include/_types.h
 create mode 100644 i386/include/architecture/alignment.h
 create mode 100644 i386/include/architecture/byte_order.h
 create mode 100644 i386/include/architecture/i386/alignment.h
 create mode 100644 i386/include/architecture/i386/asm_help.h
 create mode 100644 i386/include/architecture/i386/byte_order.h
 create mode 100644 i386/include/architecture/i386/cpu.h
 create mode 100644 i386/include/architecture/i386/desc.h
 create mode 100644 i386/include/architecture/i386/fenv.h
 create mode 100644 i386/include/architecture/i386/fpu.h
 create mode 100644 i386/include/architecture/i386/frame.h
 create mode 100644 i386/include/architecture/i386/io.h
 create mode 100644 i386/include/architecture/i386/math.h
 create mode 100644 i386/include/architecture/i386/pio.h
 create mode 100644 i386/include/architecture/i386/reg_help.h
 create mode 100644 i386/include/architecture/i386/sel.h
 create mode 100644 i386/include/architecture/i386/table.h
 create mode 100644 i386/include/architecture/i386/tss.h
 create mode 100644 i386/include/assert.h
 create mode 100644 i386/include/ctype.h
 create mode 100644 i386/include/device/.svn/all-wcprops
 create mode 100644 i386/include/device/.svn/entries
 create mode 100644 i386/include/device/.svn/text-base/device_port.h.svn-base
 create mode 100644 i386/include/device/.svn/text-base/device_types.h.svn-base
 create mode 100644 i386/include/device/device_port.h
 create mode 100644 i386/include/device/device_types.h
 create mode 100644 i386/include/errno.h
 create mode 100644 i386/include/float.h
 create mode 100644 i386/include/i386/_limits.h
 create mode 100644 i386/include/i386/_param.h
 create mode 100644 i386/include/i386/_structs.h
 create mode 100644 i386/include/i386/_types.h
 create mode 100644 i386/include/i386/eflags.h
 create mode 100644 i386/include/i386/endian.h
 create mode 100644 i386/include/i386/fasttrap_isa.h
 create mode 100644 i386/include/i386/limits.h
 create mode 100644 i386/include/i386/param.h
 create mode 100644 i386/include/i386/profile.h
 create mode 100644 i386/include/i386/setjmp.h
 create mode 100644 i386/include/i386/signal.h
 create mode 100644 i386/include/i386/types.h
 create mode 100644 i386/include/i386/user_ldt.h
 create mode 100644 i386/include/i386/vmparam.h
 create mode 100644 i386/include/inttypes.h
 create mode 100644 i386/include/libkern/OSAtomic.h
 create mode 100644 i386/include/libkern/OSByteOrder.h
 create mode 100644 i386/include/libkern/OSCacheControl.h
 create mode 100644 i386/include/libkern/OSDebug.h
 create mode 100644 i386/include/libkern/OSKextLib.h
 create mode 100644 i386/include/libkern/OSReturn.h
 create mode 100644 i386/include/libkern/OSTypes.h
 create mode 100644 i386/include/libkern/_OSByteOrder.h
 create mode 100644 i386/include/libkern/crypto/md5.h
 create mode 100644 i386/include/libkern/crypto/sha1.h
 create mode 100644 i386/include/libkern/i386/OSByteOrder.h
 create mode 100644 i386/include/libkern/i386/_OSByteOrder.h
 create mode 100644 i386/include/libkern/machine/OSByteOrder.h
 create mode 100644 i386/include/libkern/ppc/OSByteOrder.h
 create mode 100644 i386/include/limits.h
 create mode 100644 i386/include/locale.h
 create mode 100644 i386/include/mach-o/arch.h
 create mode 100644 i386/include/mach-o/compact_unwind_encoding.h
 create mode 100644 i386/include/mach-o/dyld.h
 create mode 100644 i386/include/mach-o/dyld_images.h
 create mode 100644 i386/include/mach-o/fat.h
 create mode 100644 i386/include/mach-o/getsect.h
 create mode 100644 i386/include/mach-o/i386/swap.h
 create mode 100644 i386/include/mach-o/ldsyms.h
 create mode 100644 i386/include/mach-o/loader.h
 create mode 100644 i386/include/mach-o/nlist.h
 create mode 100644 i386/include/mach-o/ranlib.h
 create mode 100644 i386/include/mach-o/reloc.h
 create mode 100644 i386/include/mach-o/stab.h
 create mode 100644 i386/include/mach-o/swap.h
 create mode 100644 i386/include/mach-o/x86_64/reloc.h
 create mode 100644 i386/include/mach/audit_triggers.defs
 create mode 100644 i386/include/mach/boolean.h
 create mode 100644 i386/include/mach/bootstrap.h
 create mode 100644 i386/include/mach/clock.defs
 create mode 100644 i386/include/mach/clock.h
 create mode 100644 i386/include/mach/clock_priv.defs
 create mode 100644 i386/include/mach/clock_priv.h
 create mode 100644 i386/include/mach/clock_reply.defs
 create mode 100644 i386/include/mach/clock_reply.h
 create mode 100644 i386/include/mach/clock_types.defs
 create mode 100644 i386/include/mach/clock_types.h
 create mode 100644 i386/include/mach/error.h
 create mode 100644 i386/include/mach/exc.defs
 create mode 100644 i386/include/mach/exc.h
 create mode 100644 i386/include/mach/exception.h
 create mode 100644 i386/include/mach/exception_types.h
 create mode 100644 i386/include/mach/host_info.h
 create mode 100644 i386/include/mach/host_notify.h
 create mode 100644 i386/include/mach/host_notify_reply.defs
 create mode 100644 i386/include/mach/host_priv.defs
 create mode 100644 i386/include/mach/host_priv.h
 create mode 100644 i386/include/mach/host_reboot.h
 create mode 100644 i386/include/mach/host_security.defs
 create mode 100644 i386/include/mach/host_security.h
 create mode 100644 i386/include/mach/host_special_ports.h
 create mode 100644 i386/include/mach/i386/_structs.h
 create mode 100644 i386/include/mach/i386/asm.h
 create mode 100644 i386/include/mach/i386/boolean.h
 create mode 100644 i386/include/mach/i386/exception.h
 create mode 100644 i386/include/mach/i386/fp_reg.h
 create mode 100644 i386/include/mach/i386/kern_return.h
 create mode 100644 i386/include/mach/i386/machine_types.defs
 create mode 100644 i386/include/mach/i386/ndr_def.h
 create mode 100644 i386/include/mach/i386/processor_info.h
 create mode 100644 i386/include/mach/i386/rpc.h
 create mode 100644 i386/include/mach/i386/sdt_isa.h
 create mode 100644 i386/include/mach/i386/task.h
 create mode 100644 i386/include/mach/i386/thread_act.h
 create mode 100644 i386/include/mach/i386/thread_state.h
 create mode 100644 i386/include/mach/i386/thread_status.h
 create mode 100644 i386/include/mach/i386/vm_param.h
 create mode 100644 i386/include/mach/i386/vm_types.h
 create mode 100644 i386/include/mach/kern_return.h
 create mode 100644 i386/include/mach/kmod.h
 create mode 100644 i386/include/mach/ledger.defs
 create mode 100644 i386/include/mach/ledger.h
 create mode 100644 i386/include/mach/lock_set.defs
 create mode 100644 i386/include/mach/lock_set.h
 create mode 100644 i386/include/mach/mach.h
 create mode 100644 i386/include/mach/mach_error.h
 create mode 100644 i386/include/mach/mach_exc.defs
 create mode 100644 i386/include/mach/mach_host.defs
 create mode 100644 i386/include/mach/mach_host.h
 create mode 100644 i386/include/mach/mach_init.h
 create mode 100644 i386/include/mach/mach_interface.h
 create mode 100644 i386/include/mach/mach_param.h
 create mode 100644 i386/include/mach/mach_port.defs
 create mode 100644 i386/include/mach/mach_port.h
 create mode 100644 i386/include/mach/mach_syscalls.h
 create mode 100644 i386/include/mach/mach_time.h
 create mode 100644 i386/include/mach/mach_traps.h
 create mode 100644 i386/include/mach/mach_types.defs
 create mode 100644 i386/include/mach/mach_types.h
 create mode 100644 i386/include/mach/mach_vm.defs
 create mode 100644 i386/include/mach/mach_vm.h
 create mode 100644 i386/include/mach/machine.h
 create mode 100644 i386/include/mach/machine/asm.h
 create mode 100644 i386/include/mach/machine/boolean.h
 create mode 100644 i386/include/mach/machine/exception.h
 create mode 100644 i386/include/mach/machine/kern_return.h
 create mode 100644 i386/include/mach/machine/machine_types.defs
 create mode 100644 i386/include/mach/machine/ndr_def.h
 create mode 100644 i386/include/mach/machine/processor_info.h
 create mode 100644 i386/include/mach/machine/rpc.h
 create mode 100644 i386/include/mach/machine/sdt.h
 create mode 100644 i386/include/mach/machine/sdt_isa.h
 create mode 100644 i386/include/mach/machine/thread_state.h
 create mode 100644 i386/include/mach/machine/thread_status.h
 create mode 100644 i386/include/mach/machine/vm_param.h
 create mode 100644 i386/include/mach/machine/vm_types.h
 create mode 100644 i386/include/mach/memory_object_types.h
 create mode 100644 i386/include/mach/message.h
 create mode 100644 i386/include/mach/mig.h
 create mode 100644 i386/include/mach/mig_errors.h
 create mode 100644 i386/include/mach/ndr.h
 create mode 100644 i386/include/mach/notify.defs
 create mode 100644 i386/include/mach/notify.h
 create mode 100644 i386/include/mach/policy.h
 create mode 100644 i386/include/mach/port.h
 create mode 100644 i386/include/mach/port_obj.h
 create mode 100644 i386/include/mach/processor.defs
 create mode 100644 i386/include/mach/processor.h
 create mode 100644 i386/include/mach/processor_info.h
 create mode 100644 i386/include/mach/processor_set.defs
 create mode 100644 i386/include/mach/processor_set.h
 create mode 100644 i386/include/mach/rpc.h
 create mode 100644 i386/include/mach/sdt.h
 create mode 100644 i386/include/mach/security.defs
 create mode 100644 i386/include/mach/semaphore.h
 create mode 100644 i386/include/mach/shared_memory_server.h
 create mode 100644 i386/include/mach/shared_region.h
 create mode 100644 i386/include/mach/std_types.defs
 create mode 100644 i386/include/mach/std_types.h
 create mode 100644 i386/include/mach/sync.h
 create mode 100644 i386/include/mach/sync_policy.h
 create mode 100644 i386/include/mach/task.defs
 create mode 100644 i386/include/mach/task.h
 create mode 100644 i386/include/mach/task_access.defs
 create mode 100644 i386/include/mach/task_info.h
 create mode 100644 i386/include/mach/task_ledger.h
 create mode 100644 i386/include/mach/task_policy.h
 create mode 100644 i386/include/mach/task_special_ports.h
 create mode 100644 i386/include/mach/thread_act.defs
 create mode 100644 i386/include/mach/thread_act.h
 create mode 100644 i386/include/mach/thread_info.h
 create mode 100644 i386/include/mach/thread_policy.h
 create mode 100644 i386/include/mach/thread_special_ports.h
 create mode 100644 i386/include/mach/thread_status.h
 create mode 100644 i386/include/mach/thread_switch.h
 create mode 100644 i386/include/mach/time_value.h
 create mode 100644 i386/include/mach/vm_attributes.h
 create mode 100644 i386/include/mach/vm_behavior.h
 create mode 100644 i386/include/mach/vm_inherit.h
 create mode 100644 i386/include/mach/vm_map.defs
 create mode 100644 i386/include/mach/vm_map.h
 create mode 100644 i386/include/mach/vm_param.h
 create mode 100644 i386/include/mach/vm_prot.h
 create mode 100644 i386/include/mach/vm_purgable.h
 create mode 100644 i386/include/mach/vm_region.h
 create mode 100644 i386/include/mach/vm_statistics.h
 create mode 100644 i386/include/mach/vm_sync.h
 create mode 100644 i386/include/mach/vm_task.h
 create mode 100644 i386/include/mach/vm_types.h
 create mode 100644 i386/include/mach/x86_64/.svn/all-wcprops
 create mode 100644 i386/include/mach/x86_64/.svn/entries
 create mode 100644 i386/include/mach/x86_64/.svn/text-base/task.h.svn-base
 create mode 100644 i386/include/mach/x86_64/.svn/text-base/thread_act.h.svn-base
 create mode 100644 i386/include/mach/x86_64/task.h
 create mode 100644 i386/include/mach/x86_64/thread_act.h
 create mode 100644 i386/include/machine/_limits.h
 create mode 100644 i386/include/machine/_param.h
 create mode 100644 i386/include/machine/_structs.h
 create mode 100644 i386/include/machine/_types.h
 create mode 100644 i386/include/machine/byte_order.h
 create mode 100644 i386/include/machine/endian.h
 create mode 100644 i386/include/machine/fasttrap_isa.h
 create mode 100644 i386/include/machine/limits.h
 create mode 100644 i386/include/machine/param.h
 create mode 100644 i386/include/machine/profile.h
 create mode 100644 i386/include/machine/setjmp.h
 create mode 100644 i386/include/machine/signal.h
 create mode 100644 i386/include/machine/types.h
 create mode 100644 i386/include/machine/vmparam.h
 create mode 100644 i386/include/math.h
 create mode 100644 i386/include/pexpert/boot.h
 create mode 100644 i386/include/pexpert/i386/boot.h
 create mode 100644 i386/include/pexpert/i386/efi.h
 create mode 100644 i386/include/pexpert/i386/protos.h
 create mode 100644 i386/include/pexpert/machine/boot.h
 create mode 100644 i386/include/pexpert/machine/protos.h
 create mode 100644 i386/include/pexpert/pexpert.h
 create mode 100644 i386/include/pexpert/protos.h
 create mode 100644 i386/include/runetype.h
 create mode 100644 i386/include/setjmp.h
 create mode 100644 i386/include/signal.h
 create mode 100644 i386/include/stdarg.h
 create mode 100644 i386/include/stdbool.h
 create mode 100644 i386/include/stddef.h
 create mode 100644 i386/include/stdint.h
 create mode 100644 i386/include/stdio.h
 create mode 100644 i386/include/stdlib.h
 create mode 100644 i386/include/string.h
 create mode 100644 i386/include/sys/_endian.h
 create mode 100644 i386/include/sys/_select.h
 create mode 100644 i386/include/sys/_structs.h
 create mode 100644 i386/include/sys/_types.h
 create mode 100644 i386/include/sys/appleapiopts.h
 create mode 100644 i386/include/sys/buf.h
 create mode 100644 i386/include/sys/cdefs.h
 create mode 100644 i386/include/sys/disk.h
 create mode 100644 i386/include/sys/kernel_types.h
 create mode 100644 i386/include/sys/param.h
 create mode 100644 i386/include/sys/reboot.h
 create mode 100644 i386/include/sys/select.h
 create mode 100644 i386/include/sys/socket.h
 create mode 100644 i386/include/sys/syscall.h
 create mode 100644 i386/include/sys/syslimits.h
 create mode 100644 i386/include/sys/time.h
 create mode 100644 i386/include/sys/types.h
 create mode 100644 i386/include/sys/unistd.h
 create mode 100644 i386/include/sys/vnode.h
 create mode 100644 i386/include/time.h
 create mode 100644 i386/include/unistd.h
 create mode 100644 i386/include/unwind.h
 delete mode 100755 i386/util/ld_classic
 delete mode 100644 i386/util/ld_classic.1
 mode change 100755 => 100644 i386/util/machOconv.c
 delete mode 100644 i386/util/md.1
 delete mode 100644 i386/util/md.c
 create mode 100644 i386/util/segsize.c

diff --git a/.gitignore b/.gitignore
index c15d8f4..17d5f72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ i386/config/EFI/*Mac*.h
 i386/config/SMBIOS/default.h
 i386/config/SMBIOS/*Mac*.h
 
-i386/util/libcc_kext.a
\ No newline at end of file
+i386/util/libcc_kext.a
+MODEL
diff --git a/README b/README
index f0a28a3..b0266b4 100644
--- a/README
+++ b/README
@@ -24,9 +24,7 @@ code snippets for it have been stripped out (by Master Chief in 2009) but we wil
 
 Xcode Support for Mountain Lion:
 --------------------------------
-RevoBoot can be built on Snow Leopard, Lion and Mountain Lion. The latter requires Xcode 4.5.1 (and greater) and libcc_kext.a from an older version of Xcode. See change log for instructions.
-
-Note: The latest release of Xcode (4.5.2) also works with fine with an older copy libcc_kext.a.
+RevoBoot can be built on Snow Leopard, Lion and Mountain Lion. The latter requires Xcode 4.5.1 (and greater) and the latest 'command line tools' need to be installed. See change log for instructions.
 
 Configuration:
 --------------
diff --git a/i386/MakeInc.dir b/i386/MakeInc.dir
index ddb327c..cf4ed0a 100755
--- a/i386/MakeInc.dir
+++ b/i386/MakeInc.dir
@@ -4,15 +4,11 @@
 # Updates:
 #
 #		- Major cleanup (PikerAlpha, October 2012).
+#		- Fixed clang compilation (dgsga, November 2012. Credits to Evan Lojewski
+#         for original work).
 #
 
 
-#
-# Use /usr/bin/gcc instead of /usr/bin/cc (symbolic link to clang in Xcode 4.3.2 and greater).
-#
-
-CC = gcc
-
 # Toggle this as to whether you want a frame pointer (%ebp) to be used. It is
 # invaluable for debugging the booter. For example using GDB attached to VMware.
 # In fact, it's so invaluable that it's now the default.  Not only that but the
@@ -25,28 +21,34 @@ OMIT_FRAME_POINTER_CFLAG=
 .SUFFIXES: .s .i .c .o
 
 .c.o .m.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \
-	    -MD -dependency-file $(OBJROOT)/$*.d
-	$(SYMROOT)/md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d
-
+	@echo "\t[CC] $<"
+	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -MM -M -o $(OBJROOT)/$@.Makedep
+	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$@
+    
 $(OBJROOT)/%.o: %.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \
-	    -MD -dependency-file $(OBJROOT)/$*.d
-	$(SYMROOT)/md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d
+	@echo "\t[CC] $<"
+	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -MM -M -o $(OBJROOT)/$@.Makedep
+	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$@
 
 $(OBJROOT)/%.o: %.m
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$*.o \
-	    -MD -dependency-file $(OBJROOT)/$*.d
-	$(SYMROOT)/md -u $(OBJROOT)/Makedep -f -d $(OBJROOT)/$*.d
+	@echo "\t[M] $<"
+	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -MM -M -o $(OBJROOT)/$@.Makedep
+	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$@
 
 .s.o:
-	$(CC) $(CPPFLAGS) -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) $<
-
-boot2.o:
-	$(CC) $(CPPFLAGS) -Wa,-n -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) boot2.s
+	@echo "\t[AS] $<"
+	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -MM -M -o $(OBJROOT)/$@.Makedep
+	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -o $(OBJROOT)/$(@F)
+
+$(OBJROOT)/boot2.o:
+	@echo "\t[AS] boot2.s"
+	@$(CC) -Wa,-n -c $(INC) -arch i386 boot2.s -MM -M -o $(OBJROOT)/$@.Makedep
+	@$(CC) -Wa,-n -c $(INC) -arch i386 boot2.s -o $(OBJROOT)/$(@F)
 	
 $(OBJROOT)/%.o: %.s
-	$(CC) $(CPPFLAGS) -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) $<
+	@echo "\t[AS] $<"
+	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -MM -M -o $(OBJROOT)/$@.Makedep
+	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -o $(OBJROOT)/$(@F)
 
 $(DIRS_NEEDED): # $(INSTALLDIR) $(SRCROOT):
 	@/bin/mkdir -p $@
diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 7c0970d..d69d15d 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -5,6 +5,7 @@
 #
 #			- Support for self compiled libcc_kext.a added (PikerAlpha, October 2012).
 #			- Major cleanup (PikerAlpha, October 2012).
+#			- Fixed clang compilation (dgsga, November 2012. Credits to Evan Lojewski for original work).
 #
 
 
@@ -14,37 +15,20 @@ OPTIM = -Os -Oz
 CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
 	-fno-builtin -DSAIO_INTERNAL_USER -static $(OMIT_FRAME_POINTER_CFLAG) \
 	-DMAKE_TARGET_OS=$(PRODUCT_OS_TARGET) \
-    -DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
-	-mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
-	-march=pentium4 -msse2 -mfpmath=sse -msoft-float
+    	-DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
+	-fno-stack-protector \
+	-march=pentium4 -msse2 -msoft-float -nostdinc
 
 LIBSADIR = ../libsa
 LIBSAIODIR = ../libsaio
 UTILDIR = ../util
+SRCROOT = $(abspath $(CURDIR)/../..)
 
-INC = -I. -I.. -I$(SYMROOT) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(UTILDIR)
+INC = -I. -I.. -I$(SYMROOT) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(UTILDIR) -I${SRCROOT}/i386/include
 
 LIBS = -L$(SYMROOT) -lsaio -lsa
 LIBDEP = $(SYMROOT)/libsaio.a $(SYMROOT)/libsa.a
 
-#
-# build_gcc no longer builds libgcc.a and libcc_kext.a with 'all' target  
-# and thus we have to provide it, or people will have to build gcc.
-#
-
-LIBCC= $(UTILDIR)/libcc_kext.a
-
-#
-# Check ../util/ for a self compiled copy of libcc_kext.a
-#
-
-ifeq ($(wildcard $(LIBCC)),)
-  #
-  # Not found: Use Xcode supplied file.
-  #
-  LIBCC= `find /usr/llvm-gcc-*/lib/gcc/*/*/ -name \libcc_kext.a`
-endif
-
 VPATH = $(OBJROOT):$(SYMROOT)
 
 #
@@ -64,18 +48,34 @@ MAXBOOTSIZE = 131072
 $(MAKEGOAL): $(DIRS_NEEDED) boot
 
 boot: machOconv $(OBJS) $(LIBDEP)
-	$(UTILDIR)/ld_classic -static -preload -segaddr __INIT $(BOOT2ADDR) \
-	    -arch i386 -segalign 20 \
-		-o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) $(LIBCC)
-	machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
-	size $(SYMROOT)/boot.sys
-	ls -l $(SYMROOT)/boot
+	@$(CC) -Wl,-preload -Wl,-alias,boot2,start \
+		-nostdlib -arch i386  -Wl,-pie \
+		-Wl,-read_only_relocs,suppress \
+		-lcc_kext \
+		$(filter %.o,$^) $(LIBS) \
+		-o ${SYMROOT}/$@.sys
+	@echo "\t[LD] boot.sys"
+	@$(CC) -Wl,-preload -Wl,-alias,boot2,start \
+		-nostdlib -arch i386  -Wl,-pie \
+		-Wl,-segalign,20 \
+		-Wl,-segaddr,__INIT,`echo obase=16\; $$((0x${BOOT2ADDR})) | bc` \
+		-Wl,-segaddr,__TEXT,`echo obase=16\; $$((0x${BOOT2ADDR})) + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __INIT\` | bc` \
+		-Wl,-segaddr,__DATA,`echo obase=16\; $$((0x${BOOT2ADDR})) + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __INIT\` + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __TEXT\` | bc` \
+		-Wl,-read_only_relocs,suppress \
+		-lcc_kext \
+		$(filter %.o,$^) $(LIBS) \
+		-o ${SYMROOT}/$@.sys
+	@echo "\t[MACHOCONV] boot"
+	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
 	@( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \
-	  if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ; \
+	  if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\
 	  then \
-	    echo "Error: Booter executable larger than $(MAXBOOTSIZE) bytes" ; \
-	    rm $(SYMROOT)/boot ; \
-	    exit 1 ; \
+	   	echo "\t******* boot is $$size bytes *******"; \
+	    echo "Booter executable larger than $(MAXBOOTSIZE) bytes" ;\
+	    rm $(SYMROOT)/boot ;\
+	    exit 1;\
+	  else \
+	  	echo "\t******* boot is $$size bytes *******"; \
 	  fi)
 
 include ../MakeInc.dir
diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 47d7524..2a4b3c4 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -50,6 +50,7 @@
  * Updates:
  *		- Refactorized by DHP in 2010 and 2011.
  *		- Optionally include Recovery HD support code (PikerAlpha, November 2012).
+ *      - Fixed clang compilation (PikerAlpha, November 2012).
  */
 
 
@@ -119,11 +120,13 @@ unsigned long Adler32(unsigned char *buf, long len)
 
 static void zeroBSS()
 {
-    extern char _DATA__bss__begin, _DATA__bss__end;
-    extern char _DATA__common__begin, _DATA__common__end;
-
-    bzero( &_DATA__bss__begin, (&_DATA__bss__end - &_DATA__bss__begin) );
-    bzero( &_DATA__common__begin, (&_DATA__common__end - &_DATA__common__begin) );
+	extern int  _DATA_bss__start	__asm("section$start$__DATA$__bss");
+	extern int  _DATA_bss__end	__asm("section$end$__DATA$__bss");
+	extern int  _DATA_common__start	__asm("section$start$__DATA$__common");
+	extern int  _DATA_common__end	__asm("section$end$__DATA$__common");
+    
+	bzero(&_DATA_bss__start, (&_DATA_bss__end - &_DATA_bss__start));
+	bzero(&_DATA_common__start, (&_DATA_common__end - &_DATA_common__start));
 }
 
 /*
@@ -256,9 +259,9 @@ void boot(int biosdev)
 				
 				if (gVerboseMode)
 				{
-#if DEBUG_BOOT == false
+/*#if DEBUG_BOOT == false
 					setVideoMode(VGA_TEXT_MODE);
-#endif
+#endif*/
 				}
 
 				// Check for -x (safe) and -f (flush cache) flags.
diff --git a/i386/include/IOKit/IOBSD.h b/i386/include/IOKit/IOBSD.h
new file mode 100644
index 0000000..8938656
--- /dev/null
+++ b/i386/include/IOKit/IOBSD.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOBSD_H
+#define _IOBSD_H
+
+/*
+ * bsd-related registry properties
+ */
+
+#define kIOBSDNameKey  "BSD Name"  // (an OSString)
+#define kIOBSDNamesKey "BSD Names" // (an OSDictionary of OSString's, for links)
+#define kIOBSDMajorKey "BSD Major" // (an OSNumber)
+#define kIOBSDMinorKey "BSD Minor" // (an OSNumber)
+#define kIOBSDUnitKey  "BSD Unit"  // (an OSNumber)
+
+#endif /* !_IOBSD_H */
diff --git a/i386/include/IOKit/IOBufferMemoryDescriptor.h b/i386/include/IOKit/IOBufferMemoryDescriptor.h
new file mode 100644
index 0000000..0926e5b
--- /dev/null
+++ b/i386/include/IOKit/IOBufferMemoryDescriptor.h
@@ -0,0 +1,261 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOBUFFERMEMORYDESCRIPTOR_H
+#define _IOBUFFERMEMORYDESCRIPTOR_H
+
+#include <IOKit/IOMemoryDescriptor.h>
+
+enum {
+    kIOMemoryPhysicallyContiguous	= 0x00000010,
+    kIOMemoryPageable	      		= 0x00000020,
+    kIOMemoryPurgeable	      		= 0x00000040,
+    kIOMemorySharingTypeMask		= 0x000f0000,
+    kIOMemoryUnshared			= 0x00000000,
+    kIOMemoryKernelUserShared		= 0x00010000,
+    // shared IOMemoryDescriptor options for IOBufferMemoryDescriptor:
+    kIOBufferDescriptorMemoryFlags	= kIOMemoryDirectionMask 
+					| kIOMemoryThreadSafe
+};
+
+#define _IOBUFFERMEMORYDESCRIPTOR_INTASKWITHOPTIONS_	1
+/*!
+    @class IOBufferMemoryDescriptor
+    @abstract Provides a simple memory descriptor that allocates its own buffer memory.
+*/
+
+class IOBufferMemoryDescriptor : public IOGeneralMemoryDescriptor
+{
+    OSDeclareDefaultStructors(IOBufferMemoryDescriptor);
+
+private:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of this class in the future.
+    */    
+    struct ExpansionData {
+	IOMemoryMap *   map;
+    };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData * reserved;
+
+protected:
+    void *               _buffer;
+    vm_size_t            _capacity;
+    vm_offset_t		 _alignment;
+    IOOptionBits	 _options;
+private:
+    uintptr_t		 _internalReserved;
+    unsigned             _internalFlags;
+
+private:
+#ifndef __LP64__
+    virtual bool initWithOptions(
+                               IOOptionBits options,
+                               vm_size_t    capacity,
+                               vm_offset_t  alignment,
+			       task_t	    inTask) APPLE_KEXT_DEPRECATED; /* use withOptions() instead */
+#endif /* !__LP64__ */
+
+    virtual bool initWithPhysicalMask(
+				task_t		  inTask,
+				IOOptionBits      options,
+				mach_vm_size_t    capacity,
+				mach_vm_address_t alignment,
+				mach_vm_address_t physicalMask);
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 0);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 1);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IOBufferMemoryDescriptor, 0);
+    OSMetaClassDeclareReservedUsed(IOBufferMemoryDescriptor, 1);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 2);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 3);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 4);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 5);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 6);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 7);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 8);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 9);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 10);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 11);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 12);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 13);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 14);
+    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 15);
+
+protected:
+    virtual void free();
+
+public:
+
+    /*
+     * withOptions:
+     *
+     * Returns a new IOBufferMemoryDescriptor with a buffer large enough to
+     * hold capacity bytes.  The descriptor's length is initially set to the
+     * capacity.
+     */
+#ifndef __LP64__
+    virtual bool initWithOptions(   IOOptionBits options,
+                                    vm_size_t    capacity,
+                                    vm_offset_t  alignment) APPLE_KEXT_DEPRECATED; /* use withOptions() instead */
+#endif /* !__LP64__ */
+
+    static IOBufferMemoryDescriptor * withOptions(  IOOptionBits options,
+                                                    vm_size_t    capacity,
+                                                    vm_offset_t  alignment = 1);
+
+/*! @function inTaskWithOptions
+    @abstract Creates a memory buffer with memory descriptor for that buffer. 
+    @discussion Added in Mac OS X 10.2, this method allocates a memory buffer with a given size and alignment in the task's address space specified, and returns a memory descriptor instance representing the memory. It is recommended that memory allocated for I/O or sharing via mapping be created via IOBufferMemoryDescriptor. Options passed with the request specify the kind of memory to be allocated - pageablity and sharing are specified with option bits. This function may block and so should not be called from interrupt level or while a simple lock is held.
+    @param inTask The task the buffer will be allocated in.
+    @param options Options for the allocation:<br>
+    kIODirectionOut, kIODirectionIn - set the direction of the I/O transfer.<br>
+    kIOMemoryPhysicallyContiguous - pass to request memory be physically contiguous. This option is heavily discouraged. The request may fail if memory is fragmented, may cause large amounts of paging activity, and may take a very long time to execute.<br>
+    kIOMemoryPageable - pass to request memory be non-wired - the default for kernel allocated memory is wired.<br>
+    kIOMemoryPurgeable - pass to request memory that may later have its purgeable state set with IOMemoryDescriptor::setPurgeable. Only supported for kIOMemoryPageable allocations.<br>
+    kIOMemoryKernelUserShared - pass to request memory that will be mapped into both the kernel and client applications.
+    @param capacity The number of bytes to allocate.
+    @param alignment The minimum required alignment of the buffer in bytes - 1 is the default for no required alignment. For example, pass 256 to get memory allocated at an address with bits 0-7 zero.
+    @result Returns an instance of class IOBufferMemoryDescriptor to be released by the caller, which will free the memory desriptor and associated buffer. */
+
+    static IOBufferMemoryDescriptor * inTaskWithOptions(
+					    task_t       inTask,
+                                            IOOptionBits options,
+                                            vm_size_t    capacity,
+                                            vm_offset_t  alignment = 1);
+
+/*! @function inTaskWithPhysicalMask
+    @abstract Creates a memory buffer with memory descriptor for that buffer. 
+    @discussion Added in Mac OS X 10.5, this method allocates a memory buffer with a given size and alignment in the task's address space specified, and returns a memory descriptor instance representing the memory. It is recommended that memory allocated for I/O or sharing via mapping be created via IOBufferMemoryDescriptor. Options passed with the request specify the kind of memory to be allocated - pageablity and sharing are specified with option bits. This function may block and so should not be called from interrupt level or while a simple lock is held.
+    @param inTask The task the buffer will be mapped in. Pass NULL to create memory unmapped in any task (eg. for use as a DMA buffer).
+    @param options Options for the allocation:<br>
+    kIODirectionOut, kIODirectionIn - set the direction of the I/O transfer.<br>
+    kIOMemoryPhysicallyContiguous - pass to request memory be physically contiguous. This option is heavily discouraged. The request may fail if memory is fragmented, may cause large amounts of paging activity, and may take a very long time to execute.<br>
+    kIOMemoryKernelUserShared - pass to request memory that will be mapped into both the kernel and client applications.
+    @param capacity The number of bytes to allocate.
+    @param mask The buffer will be allocated with pages such that physical addresses will only have bits set present in physicalMask. For example, pass 0x00000000FFFFFFFFULL for a buffer to be accessed by hardware that has 32 address bits.
+    @result Returns an instance of class IOBufferMemoryDescriptor to be released by the caller, which will free the memory desriptor and associated buffer. */
+
+    static IOBufferMemoryDescriptor * inTaskWithPhysicalMask(
+					    task_t	      inTask,
+                                            IOOptionBits      options,
+                                            mach_vm_size_t    capacity,
+                                            mach_vm_address_t physicalMask);
+
+    /*
+     * withCapacity:
+     *
+     * Returns a new IOBufferMemoryDescriptor with a buffer large enough to
+     * hold capacity bytes.  The descriptor's length is initially set to the
+     * capacity.
+     */
+    static IOBufferMemoryDescriptor * withCapacity(
+                                     vm_size_t    capacity,
+                                     IODirection  withDirection,
+                                     bool         withContiguousMemory = false);
+#ifndef __LP64__
+    virtual bool initWithBytes(const void * bytes,
+                               vm_size_t    withLength,
+                               IODirection  withDirection,
+                               bool         withContiguousMemory = false) APPLE_KEXT_DEPRECATED; /* use withBytes() instead */
+#endif /* !__LP64__ */
+
+    /*
+     * withBytes:
+     *
+     * Returns a new IOBufferMemoryDescriptor preloaded with bytes (copied).
+     * The descriptor's length and capacity are set to the input buffer's size.
+     */
+    static IOBufferMemoryDescriptor * withBytes(
+                                     const void * bytes,
+                                     vm_size_t    withLength,
+                                     IODirection  withDirection,
+                                     bool         withContiguousMemory = false);
+
+    /*
+     * setLength:
+     *
+     * Change the buffer length of the memory descriptor.  When a new buffer
+     * is created, the initial length of the buffer is set to be the same as
+     * the capacity.  The length can be adjusted via setLength for a shorter
+     * transfer (there is no need to create more buffer descriptors when you
+     * can reuse an existing one, even for different transfer sizes).   Note
+     * that the specified length must not exceed the capacity of the buffer.
+     */
+    virtual void setLength(vm_size_t length);
+
+    /*
+     * setDirection:
+     *
+     * Change the direction of the transfer.  This method allows one to redirect
+     * the descriptor's transfer direction.  This eliminates the need to destroy
+     * and create new buffers when different transfer directions are needed.
+     */
+    virtual void setDirection(IODirection direction);
+
+    /*
+     * getCapacity:
+     *
+     * Get the buffer capacity
+     */
+    virtual vm_size_t getCapacity() const;
+
+    /*
+     * getBytesNoCopy:
+     *
+     * Return the virtual address of the beginning of the buffer
+     */
+    virtual void *getBytesNoCopy();
+
+    /*
+     * getBytesNoCopy:
+     *
+     * Return the virtual address of an offset from the beginning of the buffer
+     */
+    virtual void *getBytesNoCopy(vm_size_t start, vm_size_t withLength);
+
+    /*
+     * appendBytes:
+     *
+     * Add some data to the end of the buffer.  This method automatically
+     * maintains the memory descriptor buffer length.  Note that appendBytes
+     * will not copy past the end of the memory descriptor's current capacity.
+     */
+    virtual bool appendBytes(const void *bytes, vm_size_t withLength);
+
+#ifndef __LP64__
+    virtual void * getVirtualSegment(IOByteCount offset,
+					IOByteCount * length) APPLE_KEXT_DEPRECATED; /* use getBytesNoCopy() instead */
+#endif /* !__LP64__ */
+};
+
+#endif /* !_IOBUFFERMEMORYDESCRIPTOR_H */
diff --git a/i386/include/IOKit/IOCatalogue.h b/i386/include/IOKit/IOCatalogue.h
new file mode 100644
index 0000000..f087396
--- /dev/null
+++ b/i386/include/IOKit/IOCatalogue.h
@@ -0,0 +1,272 @@
+/*
+ * Copyright (c) 1998-2000 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOCATALOGUE_H
+#define _IOKIT_IOCATALOGUE_H
+
+#include <libkern/c++/OSObject.h>
+#include <libkern/c++/OSCollectionIterator.h>
+#include <libkern/c++/OSArray.h>
+#include <libkern/c++/OSDictionary.h>
+#include <IOKit/IOLocks.h>
+#include <sys/cdefs.h>
+
+#include <IOKit/IOKitServer.h>
+
+class IOService;
+
+/*!
+    @class IOCatalogue
+    @abstract In-kernel database for IOKit driver personalities.
+    @discussion The IOCatalogue is a database which contains all IOKit driver personalities.  IOService uses this resource when matching devices to their associated drivers.
+*/
+class IOCatalogue : public OSObject
+{
+    OSDeclareDefaultStructors(IOCatalogue)
+    
+private:
+    OSCollectionIterator   * kernelTables;
+    OSArray                * array;
+    IOLock *                 lock;
+    SInt32                   generation;
+
+/* This stuff is no longer used at all but was exported in prior
+ * releases, so we keep it around for PPC/i386 only.
+ */
+#if __ppc__ || __i386__
+    IOLock *                 kld_lock;
+#endif /* __ppc__ || __i386__ */
+
+public:
+    /*!
+        @function initialize
+        @abstract Creates and initializes the database object and poputates it with in-kernel driver personalities.
+    */
+    static void initialize( void );
+    
+    /*!
+        @function init
+        @abstract Initializes the database object.
+        @param initArray  The initial array of driver personalities to populate the database.
+    */
+    bool init( OSArray * initArray );
+    
+    /*!
+        @function free
+        @abstract Cleans up the database and deallocates memory allocated at initialization.  This is never called in normal operation of the system.
+    */
+    void free( void );
+    
+    /*!
+        @function findDrivers
+        @abstract This is the primary entry point for IOService.
+        @param service
+        @param generationCount  Returns a reference to the generation count of the database. The generation count increases only when personalities are added to the database *and* IOService matching has been initiated.
+        @result Returns an ordered set of driver personalities ranked on probe-scores.  The ordered set must be released by the receiver.
+    */
+    OSOrderedSet * findDrivers( IOService * service, SInt32 * generationCount );
+    
+    /*!
+        @function findDrivers
+        @abstract A more general purpose interface which allows one to retreive driver personalities based the intersection of the 'matching' dictionary and the personality's own property list.
+        @param matching  A dictionary containing only keys and values which are to be used for matching. For example, a matching dictionary containing 'IOProviderClass'='IOPCIDevice' will return all personalities with an IOProviderClass key and a value of IOPCIDevice.
+        @param generationCount  Returns a reference to the current generation of the database. The generation count increases only when personalities are added to the database *and* IOService matching has been initiated.
+        @result Returns an ordered set of driver personalities ranked on probe-scores. The ordered set must be released by the receiver.
+    */
+    OSOrderedSet * findDrivers( OSDictionary * matching, SInt32 * generationCount );
+    
+    /*!
+        @function addDrivers
+        @abstract Adds an array of driver personalities to the database.
+        @param array Array of driver personalities to be added to the database.
+        @param doNubMatchng Start matching process after personalities have been added.
+        @result Returns true if driver personality was added to the database successfully. Failure is due to a memory allocation failure.
+    */
+    bool addDrivers( OSArray * array, bool doNubMatching = true );
+    
+    /*!
+        @function removeDrivers
+        @abstract Remove driver personalities from the database based on matching information provided.
+        @param matching  A dictionary whose keys and values are used for matching personalities in the database.  For example, a matching dictionary containing a 'IOProviderClass' key with the value 'IOPCIDevice' will remove all personalities which have the key 'IOProviderClass' equal to 'IOPCIDevice'.
+        @param doNubMatchng Start matching process after personalities have been removed.  Matching criteria is based on IOProviderClass of those personalities which were removed.  This is to allow drivers which haven't been matched to match against NUB's which were blocked by the previous personalities. 
+        @result Returns true if personality was removed successfully. Failure is due to a memory allocation failure.
+    */
+    bool removeDrivers( OSDictionary * matching, bool doNubMatching = true );
+    
+    /*!
+        @function getGenerationCount
+        @abstract Get the current generation count of the database.
+    */
+    SInt32 getGenerationCount( void ) const;
+
+    /*!
+        @function isModuleLoaded
+        @abstract Reports if a kernel module has been loaded.
+        @param moduleName  Name of the module.
+        @result Returns true if the associated kernel module has been loaded into the kernel.
+    */
+    bool isModuleLoaded( OSString * moduleName ) const;
+
+    /*!
+        @function isModuleLoaded
+        @abstract Reports if a kernel module has been loaded.
+        @param moduleName  Name of the module.
+        @result Returns true if the associated kernel module has been loaded into the kernel.
+    */
+    bool isModuleLoaded( const char * moduleName ) const;
+    
+    /*!
+        @function isModuleLoaded
+        @abstract Reports if a kernel module has been loaded for a particular personality.
+        @param driver  A driver personality's property list.
+        @result Returns true if the associated kernel module has been loaded into the kernel for a particular driver personality on which it depends.
+    */
+    bool isModuleLoaded( OSDictionary * driver ) const;
+    
+    /*!
+        @function moduleHasLoaded
+        @abstract Callback function called after a IOKit dependent kernel module is loaded.
+        @param name  Name of the kernel module.
+    */
+    void moduleHasLoaded( OSString * name );
+    
+    /*!
+        @function moduleHasLoaded
+        @abstract Callback function called after a IOKit dependent kernel module is loaded.
+        @param name  Name of the kernel module.
+    */
+    void moduleHasLoaded( const char * name );
+
+    /*!
+        @function terminateDrivers
+        @abstract Terminates all instances of a driver which match the contents of the matching dictionary. Does not unload module.
+        @param matching  A dictionary whose keys and values are used for matching personalities in the database.  For example, a matching dictionary containing a 'IOProviderClass' key with the value 'IOPCIDevice' will cause termination for all instances whose personalities have the key 'IOProviderClass' equal to 'IOPCIDevice'.
+     */
+    IOReturn terminateDrivers( OSDictionary * matching );
+
+    /*!
+        @function terminateDriversForModule
+        @abstract Terminates all instances of a driver which depends on a particular module and unloads the module.
+        @param moduleName Name of the module which is used to determine which driver instances to terminate and unload.
+        @param unload Flag to cause the actual unloading of the module.
+     */
+    IOReturn terminateDriversForModule( OSString * moduleName, bool unload = true);
+
+    /*!
+        @function terminateDriversForModule
+        @abstract Terminates all instances of a driver which depends on a particular module and unloads the module.
+        @param moduleName Name of the module which is used to determine which driver instances to terminate and unload.
+        @param unload Flag to cause the actual unloading of the module.
+     */
+    IOReturn terminateDriversForModule( const char * moduleName, bool unload = true);
+
+    /*!
+        @function startMatching
+        @abstract Starts an IOService matching thread where matching keys and values are provided by the matching dictionary.
+        @param matching  A dictionary whose keys and values are used for matching personalities in the database.  For example, a matching dictionary containing a 'IOProviderClass' key with the value 'IOPCIDevice' will start matching for all personalities which have the key 'IOProviderClass' equal to 'IOPCIDevice'.
+     */
+    bool startMatching( OSDictionary * matching );
+
+    /*!
+        @function reset
+        @abstract Return the Catalogue to its initial state.
+    */
+    void reset(void);
+
+    /*!
+        @function serialize
+        @abstract Serializes the catalog for transport to the user.
+        @param s The serializer object.
+        @result Returns false if unable to serialize database, most likely due to memory shortage.
+     */
+    virtual bool serialize(OSSerialize * s) const;
+
+    bool serializeData(IOOptionBits kind, OSSerialize * s) const;
+
+/* This stuff is no longer used at all we keep it around for PPC/i386
+ * binary compatibility only. Symbols are no longer exported.
+ */
+#if __ppc__ || __i386__
+    /*!
+        @function recordStartupExtensions
+        @abstract Records extensions made available by the primary booter.
+            <p>
+            This function is for internal use by the kernel startup linker.
+            Kernel extensions should never call it.
+        @result Returns true if startup extensions were successfully recorded,
+            false if not.
+    */
+    virtual bool recordStartupExtensions(void);
+
+    /*!
+        @function addExtensionsFromArchive()
+        @abstract Records an archive of extensions, as from device ROM.
+            <p>
+            This function is currently for internal use.
+            Kernel extensions should never call it.
+        @param mkext An OSData object containing a multikext archive.
+        @result Returns true if mkext was properly unserialized and its
+                contents recorded, false if not.
+    */
+    virtual bool addExtensionsFromArchive(OSData * mkext);
+
+
+    /*!
+        @function removeKernelLinker
+        @abstract Removes from memory all code and data related to
+            boot-time loading of kernel extensions. kextd triggers
+            this when it first starts in order to pass responsibility
+            for loading extensions from the kernel itself to kextd.
+        @result Returns KERN_SUCCESS if the kernel linker is successfully
+            removed or wasn't present, KERN_FAILURE otherwise.
+    */
+    virtual kern_return_t removeKernelLinker(void);
+#endif /* __ppc__ || __i386__ */
+
+private:
+
+    /*!
+        @function unloadModule
+        @abstract Unloads the reqested module if no driver instances are currently depending on it.
+        @param moduleName An OSString containing the name of the module to unload.
+     */
+    IOReturn unloadModule( OSString * moduleName ) const;
+};
+
+extern const OSSymbol * gIOClassKey;
+extern const OSSymbol * gIOProbeScoreKey;
+extern IOCatalogue    * gIOCatalogue;
+
+#endif /* ! _IOKIT_IOCATALOGUE_H */
diff --git a/i386/include/IOKit/IOCommand.h b/i386/include/IOKit/IOCommand.h
new file mode 100644
index 0000000..136c41b
--- /dev/null
+++ b/i386/include/IOKit/IOCommand.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+/*
+ *
+ *	Copyright (c) 2000 Apple Computer, Inc.  All rights reserved.
+ *
+ *	HISTORY
+ *
+ *	2001-01-18 gvdl	Made the primary queue pointer public, to be used when
+ *			Ownership is clear.
+ *	11/13/2000 CJS	Created IOCommand class and implementation
+ *
+ */
+
+/*!
+ * @header IOCommand
+ * @abstract
+ * This header contains the IOCommand class definition.
+ */
+
+#ifndef _IOKIT_IO_COMMAND_H_
+#define _IOKIT_IO_COMMAND_H_
+
+/*
+ * Kernel
+ */
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+#include <kern/queue.h>
+#include <libkern/c++/OSObject.h>
+
+/*!
+ * @class IOCommand
+ * @abstract
+ * This class is an abstract class which represents an I/O command.
+ * @discussion
+ * This class is an abstract class which represents an I/O command passed
+ * from a device driver to a controller. All controller commands (e.g. IOATACommand)
+ * should inherit from this class.
+ */
+ 
+class IOCommand : public OSObject
+{
+    OSDeclareDefaultStructors(IOCommand)
+    
+public:
+    virtual bool init(void);
+    
+/*! @var fCommandChain
+    This variable is used by the current 'owner' to queue the command.  During the life cycle of a command it moves through a series of queues.  This is the queue pointer for it.  Only valid while 'ownership' is clear.  For instance a IOCommandPool uses this pointer to maintain its list of free commands.  May be manipulated using the kern/queue.h macros */
+    queue_chain_t fCommandChain;	/* used to queue commands */
+};
+
+#endif /* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_COMMAND_H_ */
diff --git a/i386/include/IOKit/IOCommandGate.h b/i386/include/IOKit/IOCommandGate.h
new file mode 100644
index 0000000..1b17b79
--- /dev/null
+++ b/i386/include/IOKit/IOCommandGate.h
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 1998-2009 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*[
+    1999-8-10	Godfrey van der Linden(gvdl)
+	Created.
+]*/
+/*! @language embedded-c++ */
+
+#ifndef _IOKIT_IOCOMMANDGATE_H
+#define _IOKIT_IOCOMMANDGATE_H
+
+#include <IOKit/IOEventSource.h>
+
+/*!
+    @class IOCommandGate : public IOEventSource
+    @abstract Single-threaded work-loop client request mechanism.
+    @discussion An IOCommandGate instance is an extremely light way mechanism
+that executes an action on the driver's work-loop.  'On the work-loop' is
+actually a lie but the work-loop single threaded semantic is maintained for this
+event source.  Using the work-loop gate rather than execution by the workloop.
+The command gate tests for a potential self dead lock by checking if the
+runCommand request is made from the work-loop's thread, it doesn't check for a
+mutual dead lock though where a pair of work loop's dead lock each other.
+<br><br>
+	The IOCommandGate is a lighter weight version of the IOCommandQueue and
+should be used in preference.  Generally use a command queue whenever you need a
+client to submit a request to a work loop.  A typical command gate action would
+check if the hardware is active, if so it will add the request to a pending
+queue internal to the device or the device's family.  Otherwise if the hardware
+is inactive then this request can be acted upon immediately.
+<br><br>
+    CAUTION: The runAction, runCommand, and attemptCommand functions cannot be called from an interrupt context.
+
+*/
+class IOCommandGate : public IOEventSource
+{
+    OSDeclareDefaultStructors(IOCommandGate)
+
+public:
+/*!
+    @typedef Action
+    @discussion Type and arguments of callout C function that is used when
+a runCommand is executed by a client.  Cast to this type when you want a C++
+member function to be used.  Note the arg1 - arg3 parameters are straight pass
+through from the runCommand to the action callout.
+    @param owner
+	Target of the function, can be used as a refcon.  The owner is set
+during initialisation of the IOCommandGate instance.	 Note if a C++ function
+was specified this parameter is implicitly the first paramter in the target
+member function's parameter list.
+    @param arg0 Argument to action from run operation.
+    @param arg1 Argument to action from run operation.
+    @param arg2 Argument to action from run operation.
+    @param arg3 Argument to action from run operation.
+*/
+    typedef IOReturn (*Action)(OSObject *owner,
+			       void *arg0, void *arg1,
+			       void *arg2, void *arg3);
+
+protected:
+/*!
+    @function checkForWork
+    @abstract Not used, $link IOEventSource::checkForWork(). */
+    virtual bool checkForWork();
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+public:
+/*! @function commandGate
+    @abstract Factory method to create and initialise an IOCommandGate, See $link init.
+    @result Returns a pointer to the new command gate if sucessful, 0 otherwise. */
+    static IOCommandGate *commandGate(OSObject *owner, Action action = 0);
+
+/*! @function init
+    @abstract Class initialiser.
+    @discussion Initialiser for IOCommandGate operates only on newly 'newed'
+objects.  Shouldn't be used to re-init an existing instance.
+    @param owner 	Owner of this, newly created, instance of the IOCommandGate.  This argument will be used as the first parameter in the action callout.
+    @param action
+	Pointer to a C function that is called whenever a client of the
+IOCommandGate calls runCommand.	 NB Can be a C++ member function but caller
+must cast the member function to $link IOCommandGate::Action and they will get a
+compiler warning.  Defaults to zero, see $link IOEventSource::setAction.
+    @result True if inherited classes initialise successfully. */
+    virtual bool init(OSObject *owner, Action action = 0);
+
+    // Superclass overrides
+    virtual void free();
+    virtual void setWorkLoop(IOWorkLoop *inWorkLoop);
+
+/*! @function runCommand
+    @abstract Single thread a command with the target work-loop.
+    @discussion Client function that causes the current action to be called in
+a single threaded manner.  Beware the work-loop's gate is recursive and command
+gates can cause direct or indirect re-entrancy.	 When the executing on a
+client's thread runCommand will sleep until the work-loop's gate opens for
+execution of client actions, the action is single threaded against all other
+work-loop event sources.  If the command is disabled the attempt to run a command will be stalled until enable is called.
+    @param arg0 Parameter for action of command gate, defaults to 0.
+    @param arg1 Parameter for action of command gate, defaults to 0.
+    @param arg2 Parameter for action of command gate, defaults to 0.
+    @param arg3 Parameter for action of command gate, defaults to 0.
+    @result kIOReturnSuccess if successful. kIOReturnAborted if a disabled command gate is free()ed before being reenabled, kIOReturnNoResources if no action available.
+*/
+    virtual IOReturn runCommand(void *arg0 = 0, void *arg1 = 0,
+				void *arg2 = 0, void *arg3 = 0);
+
+/*! @function runAction
+    @abstract Single thread a call to an action with the target work-loop.
+    @discussion Client function that causes the given action to be called in
+a single threaded manner.  Beware the work-loop's gate is recursive and command
+gates can cause direct or indirect re-entrancy.	 When the executing on a
+client's thread runAction will sleep until the work-loop's gate opens for
+execution of client actions, the action is single threaded against all other
+work-loop event sources.  If the command is disabled the attempt to run a command will be stalled until enable is called.
+    @param action Pointer to function to be executed in work-loop context.
+    @param arg0 Parameter for action parameter, defaults to 0.
+    @param arg1 Parameter for action parameter, defaults to 0.
+    @param arg2 Parameter for action parameter, defaults to 0.
+    @param arg3 Parameter for action parameter, defaults to 0.
+    @result kIOReturnSuccess if successful. kIOReturnBadArgument if action is not defined, kIOReturnAborted if a disabled command gate is free()ed before being reenabled.
+*/
+    virtual IOReturn runAction(Action action,
+			       void *arg0 = 0, void *arg1 = 0,
+			       void *arg2 = 0, void *arg3 = 0);
+
+/*! @function attemptCommand
+    @abstract Single thread a command with the target work-loop.
+    @discussion Client function that causes the current action to be called in
+a single threaded manner.  When the executing on a client's thread attemptCommand will fail if the work-loop's gate is closed.
+    @param arg0 Parameter for action of command gate, defaults to 0.
+    @param arg1 Parameter for action of command gate, defaults to 0.
+    @param arg2 Parameter for action of command gate, defaults to 0.
+    @param arg3 Parameter for action of command gate, defaults to 0.
+    @result kIOReturnSuccess if successful. kIOReturnNotPermitted if this event source is currently disabled, kIOReturnNoResources if no action available, kIOReturnCannotLock if lock attempt fails.
+*/
+    virtual IOReturn attemptCommand(void *arg0 = 0, void *arg1 = 0,
+                                    void *arg2 = 0, void *arg3 = 0);
+
+/*! @function attemptAction
+    @abstract Single thread a call to an action with the target work-loop.
+    @discussion Client function that causes the given action to be called in
+a single threaded manner.  Beware the work-loop's gate is recursive and command
+gates can cause direct or indirect re-entrancy.	 When the executing on a
+client's thread attemptCommand will fail if the work-loop's gate is closed.
+    @param action Pointer to function to be executed in work-loop context.
+    @param arg0 Parameter for action parameter, defaults to 0.
+    @param arg1 Parameter for action parameter, defaults to 0.
+    @param arg2 Parameter for action parameter, defaults to 0.
+    @param arg3 Parameter for action parameter, defaults to 0.
+    @result kIOReturnSuccess if successful. kIOReturnBadArgument if action is not defined, kIOReturnNotPermitted if this event source is currently disabled, kIOReturnCannotLock if lock attempt fails.
+
+*/
+    virtual IOReturn attemptAction(Action action,
+                                   void *arg0 = 0, void *arg1 = 0,
+                                   void *arg2 = 0, void *arg3 = 0);
+
+/*! @function commandSleep  
+    @abstract Put a thread that is currently holding the command gate to sleep.
+    @discussion Put a thread to sleep waiting for an event but release the gate first.  If the event occurs then the commandGate is closed before the function returns.
+    @param event Pointer to an address.
+    @param interruptible THREAD_UNINT, THREAD_INTERRUPTIBLE or THREAD_ABORTSAFE.  THREAD_UNINT specifies that the sleep cannot be interrupted by a signal.  THREAD_INTERRUPTIBLE specifies that the sleep may be interrupted by a "kill -9" signal.  THREAD_ABORTSAFE (the default value) specifies that the sleep may be interrupted by any user signal.
+    @result THREAD_AWAKENED - normal wakeup, THREAD_TIMED_OUT - timeout expired, THREAD_INTERRUPTED - interrupted, THREAD_RESTART - restart operation entirely, kIOReturnNotPermitted if the calling thread does not hold the command gate. */
+    virtual IOReturn commandSleep(void *event,
+                                  UInt32 interruptible = THREAD_ABORTSAFE);
+
+/*! @function commandWakeup
+    @abstract Wakeup one or more threads that are asleep on an event.
+    @param event Pointer to an address.
+    @param onlyOneThread true to only wake up at most one thread, false otherwise. */
+    virtual void commandWakeup(void *event, bool oneThread = false);
+
+/*! @function disable
+    @abstract Disable the command gate
+    @discussion When a command gate is disabled all future calls to runAction and runCommand will stall until the gate is enable()d later.  This can be used to block client threads when a system sleep is requested.  The IOWorkLoop thread itself will never stall, even when making runAction/runCommand calls.  This call must be made from a gated context, to clear potential race conditions.  */
+    virtual void disable();
+
+/*! @function enable
+    @abstract Enable command gate, this will unblock any blocked Commands and Actions.
+    @discussion  Enable the command gate.  The attemptAction/attemptCommand calls will now be enabled and can succeeed.  Stalled runCommand/runAction calls will be woken up. */
+    virtual void enable();
+
+/*! @function commandSleep  
+    @abstract Put a thread that is currently holding the command gate to sleep.
+    @discussion Put a thread to sleep waiting for an event but release the gate first.  If the event occurs or timeout occurs then the commandGate is closed before the function returns.
+    @param event Pointer to an address.
+	@param deadline Clock deadline to timeout the sleep.
+    @param interruptible THREAD_UNINT, THREAD_INTERRUPTIBLE or THREAD_ABORTSAFE.  THREAD_UNINT specifies that the sleep cannot be interrupted by a signal.  THREAD_INTERRUPTIBLE specifies that the sleep may be interrupted by a "kill -9" signal.  THREAD_ABORTSAFE specifies that the sleep may be interrupted by any user signal.
+    @result THREAD_AWAKENED - normal wakeup, THREAD_TIMED_OUT - timeout expired, THREAD_INTERRUPTED - interrupted, THREAD_RESTART - restart operation entirely, kIOReturnNotPermitted if the calling thread does not hold the command gate. */
+    virtual IOReturn commandSleep(void *event,
+								  AbsoluteTime deadline,
+                                  UInt32 interruptible);
+
+private:
+#if __LP64__
+    OSMetaClassDeclareReservedUnused(IOCommandGate, 0);
+#else
+    OSMetaClassDeclareReservedUsed(IOCommandGate, 0);
+#endif
+    OSMetaClassDeclareReservedUnused(IOCommandGate, 1);
+    OSMetaClassDeclareReservedUnused(IOCommandGate, 2);
+    OSMetaClassDeclareReservedUnused(IOCommandGate, 3);
+    OSMetaClassDeclareReservedUnused(IOCommandGate, 4);
+    OSMetaClassDeclareReservedUnused(IOCommandGate, 5);
+    OSMetaClassDeclareReservedUnused(IOCommandGate, 6);
+    OSMetaClassDeclareReservedUnused(IOCommandGate, 7);
+};
+
+#endif /* !_IOKIT_IOCOMMANDGATE_H */
diff --git a/i386/include/IOKit/IOCommandPool.h b/i386/include/IOKit/IOCommandPool.h
new file mode 100644
index 0000000..91069f3
--- /dev/null
+++ b/i386/include/IOKit/IOCommandPool.h
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+/*
+ *
+ *	Copyright (c) 2000 Apple Computer, Inc.  All rights reserved.
+ *
+ *	HISTORY
+ *
+ *	2001-01-17	gvdl	Re-implement on IOCommandGate::commandSleep
+ *	11/13/2000	CJS	Created IOCommandPool class and implementation
+ *
+ */
+
+/*!
+ * @header IOCommandPool
+ * @abstract
+ * This header contains the IOCommandPool class definition.
+ */
+
+#ifndef _IOKIT_IO_COMMAND_POOL_H_
+#define _IOKIT_IO_COMMAND_POOL_H_
+
+/*
+ * Kernel
+ */
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+#include <kern/kern_types.h>
+#include <kern/queue.h>
+#include <IOKit/IOCommand.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOWorkLoop.h>
+
+/*!
+ * @class IOCommandPool
+ * @abstract Manipulates a pool of commands which inherit from IOCommand.
+ * @discussion
+ * The IOCommandPool class is used to manipulate a pool of commands which
+ * inherit from IOCommand. It includes a factory method to create a pool
+ * of a certain size. Once the factory method is invoked, the semaphore
+ * is set to zero. The caller must then put commands in the pool by creating
+ * the command (via the controller's factory method or a memory allocation)
+ * and calling the returnCommand method with the newly created command as its
+ * argument.
+ */
+
+class IOCommandPool : public OSObject
+{
+	
+    OSDeclareDefaultStructors(IOCommandPool)
+    
+    
+protected:
+
+    queue_head_t fQueueHead;	/* head of the queue of elements available */
+    UInt32 fSleepers;		/* Count of threads sleeping on this pool */
+    IOCommandGate *fSerializer;	/* command gate used for serializing pool access */
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOEventSource in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+    /*!
+     * @const kIOCommandPoolDefaultSize
+     * @abstract The default size of any command pool.
+     * @discussion
+     * kIOCommandPoolDefaultSize is the default size of any command pool.
+     * The default size was determined to be the smallest size for which
+     * a pool makes sense.
+     */
+
+    static const UInt32 kIOCommandPoolDefaultSize = 2;
+    
+    /*
+     * Free all of this object's outstanding resources.
+     */
+
+    virtual void free(void);
+    
+    
+public:
+
+    /*!
+     * @function initWithWorkLoop
+     * @abstract Primary initializer for an IOCommandPool object.
+     * @discussion Primary initializer for an IOCommandPool.
+     * Should probably use IOCommandPool::withWorkLoop() as it is easier to use.
+     * @param inWorkLoop
+     * The workloop that this command pool should synchronize with.
+     * @result Returns true if command pool was successfully initialized.
+     */
+    virtual bool initWithWorkLoop(IOWorkLoop *workLoop);
+
+    /*!
+     * @function withWorkLoop
+     * @abstract Primary factory method for the IOCommandPool class
+     * @discussion
+     * The withWorkLoop method is what is known as a factory method. It creates
+     * a new instance of an IOCommandPool and returns a pointer to that object.
+     * @param inWorkLoop
+     * The workloop that this command pool should synchronize with.
+     * @result
+     * Returns a pointer to an instance of IOCommandPool if successful,
+     * otherwise NULL.
+     */
+
+    static IOCommandPool *withWorkLoop(IOWorkLoop *inWorkLoop);
+
+    /*!
+     * @function init
+     * @abstract Should never be used, obsolete. See initWithWorkLoop.
+     */
+    virtual bool init(IOService *inOwner,
+                      IOWorkLoop *inWorkLoop,
+                      UInt32 inSize = kIOCommandPoolDefaultSize);
+
+    /*!
+     * @function withWorkLoop
+     * @abstract Should never be used, obsolete. See IOCommandPool::withWorkLoop.
+     */
+    static IOCommandPool *commandPool(IOService *inOwner,
+                                        IOWorkLoop *inWorkLoop,
+                                        UInt32 inSize = kIOCommandPoolDefaultSize);
+    
+    
+    /*!
+     * @function getCommand
+     * @discussion The getCommand method is used to get a pointer to an object of type IOCommand from the pool.
+     * @param blockForCommand
+     * If the caller would like to have its thread slept until a command is
+     * available, it should pass true, else false.
+     * @result
+     * If the caller passes true in blockForCommand, getCommand guarantees that
+     * the result will be a pointer to an IOCommand object from the pool. If
+     * the caller passes false, s/he is responsible for checking whether a non-NULL
+     * pointer was returned.
+     */
+
+    virtual IOCommand *getCommand(bool blockForCommand = true);
+    
+    /*!
+     * @function returnCommand
+     * @discussion
+     * The returnCommand method is used to place an object of type IOCommand
+     * into the pool, whether it be the first time, or the 1000th time.
+     * @param commmand
+     * The command to place in the pool.
+     */
+    
+    virtual void returnCommand(IOCommand *command);
+    
+protected:
+    
+    /*!
+     * @function gatedGetCommand
+     * @discussion
+     * The gatedGetCommand method is used to serialize the extraction of a 
+     * command from the pool behind a command gate, runAction-ed by getCommand.
+     * @param vCommand
+     * A pointer to a pointer to an IOCommand object where the returned
+     * command will be stored.
+     * @param vBlock
+     * A bool that indicates whether to block the request until a command
+     * becomes available.
+     * @result
+     * Returns kIOReturnNoResources if no command is available and the client
+     * doesn't wish to block until one does become available.
+     * kIOReturnSuccess if the vCommand argument is valid.
+     */
+    virtual IOReturn gatedGetCommand(IOCommand **command, bool blockForCommand);
+    
+    /*!
+     * @function gatedReturnCommand
+     * @discussion
+     * The gatedReturnCommand method is used to serialize the return of a 
+     * command to the pool behind a command gate, runAction-ed by returnCommand.
+     * @param vCommand
+     * A pointer to the IOCommand object to be returned to the pool.
+     * @result
+     * Always returns kIOReturnSuccess if the vCommand argument is valid.
+     */
+    virtual IOReturn gatedReturnCommand(IOCommand *command);
+
+private:
+    OSMetaClassDeclareReservedUnused(IOCommandPool, 0);
+    OSMetaClassDeclareReservedUnused(IOCommandPool, 1);
+    OSMetaClassDeclareReservedUnused(IOCommandPool, 2);
+    OSMetaClassDeclareReservedUnused(IOCommandPool, 3);
+    OSMetaClassDeclareReservedUnused(IOCommandPool, 4);
+    OSMetaClassDeclareReservedUnused(IOCommandPool, 5);
+    OSMetaClassDeclareReservedUnused(IOCommandPool, 6);
+    OSMetaClassDeclareReservedUnused(IOCommandPool, 7);
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_COMMAND_POOL_H_ */
diff --git a/i386/include/IOKit/IOConditionLock.h b/i386/include/IOKit/IOConditionLock.h
new file mode 100644
index 0000000..f628fee
--- /dev/null
+++ b/i386/include/IOKit/IOConditionLock.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1999 Apple Computer, Inc.  All rights reserved.
+ * Copyright (c) 1994-1996 NeXT Software, Inc.  All rights reserved. 
+ */
+
+#ifndef _IOKIT_IOCONDITIONLOCK_H
+#define _IOKIT_IOCONDITIONLOCK_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOLib.h>
+#include <IOKit/system.h>
+
+#include <IOKit/IOLocks.h>
+
+class IOConditionLock : public OSObject
+{
+    OSDeclareDefaultStructors(IOConditionLock)
+
+private:
+    IOLock *		cond_interlock;		// condition var Simple lock
+    volatile int	condition;
+
+    IOLock *		sleep_interlock;	// sleep lock Simple lock
+    unsigned char	interruptible;
+    volatile bool	want_lock;
+    volatile bool	waiting;
+
+public:
+    static IOConditionLock *withCondition(int condition, bool inIntr = true);
+    virtual bool initWithCondition(int condition, bool inIntr = true);
+    virtual void free();
+
+    virtual bool tryLock();	// acquire lock, no waiting
+    virtual int  lock();	// acquire lock (enter critical section)
+    virtual void unlock();	// release lock (leave critical section)
+
+    virtual bool getInterruptible() const;
+    virtual int  getCondition() const;
+    virtual int  setCondition(int condition);
+
+    virtual int  lockWhen(int condition); // acquire lock when condition
+    virtual void unlockWith(int condition); // set condition & release lock
+};
+
+#endif /* _IOKIT_IOCONDITIONLOCK_H */
diff --git a/i386/include/IOKit/IODMACommand.h b/i386/include/IOKit/IODMACommand.h
new file mode 100644
index 0000000..a2a2852
--- /dev/null
+++ b/i386/include/IOKit/IODMACommand.h
@@ -0,0 +1,557 @@
+/*
+ * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IODMACOMMAND_H
+#define _IODMACOMMAND_H
+
+#include <IOKit/IOCommand.h>
+#include <IOKit/IOMemoryDescriptor.h>
+class IOMapper;
+
+/**************************** class IODMACommand ***************************/
+
+/*!
+    @class IODMACommand
+    @abstract A mechanism to convert memory references to I/O bus addresses.
+    @discussion The IODMACommand is supersedes the IOMemoryCursor and greatly enhances the functionality and power of it.  The command can be specified to output 64 bit physical addresses and also allows driver writers bypass mapping hardware or get addresses suitable for non-snooped DMA.
+<br><br>
+    The command is designed to be very easily subclassable.  Most driver writers need to associate some DMA operations with their memory descriptor and usually use a C structure for that purpose.  This structure is often kept in a linked list.  This IODMACommand has built it <kern/queue.h> linkage and can be derived and 'public:' variables added, giving the developer a structure that can associate a memory descriptor with a particular dma command but will also allow the developer to generate that command and keep the state necessary for tracking it.
+<br><br>
+    It is envisaged that a pool of IODMACommands will be created at driver initialisation and each command will be kept in an IOCommandPool while not in use.  However if developers wishes to maintain their own free lists that is certainly possible.  See the <kern/queue.h> and <xnu/iokit/Kernel/IOCommandPool> for sample code on manipulating the command's doubly linked list entries.
+<br><br>
+    The IODMACommand can be used in a 'weak-linked' manner.  To do this you must avoid using any static member functions.  Use the, much slower but safe, weakWithSpecification function.  On success a dma command instance will be returned.  This instance can then be used to clone as many commands as is needed.  Remember deriving from this class can not be done weakly, that is no weak subclassing!
+*/
+
+class IODMACommand : public IOCommand
+{
+    OSDeclareDefaultStructors(IODMACommand);
+
+friend class IODMAEventSource;
+
+public:
+
+/*!
+    @typedef Segment32
+    @discussion A 32 bit I/O bus address/length pair
+*/
+    struct Segment32 {
+	UInt32 fIOVMAddr, fLength;
+    };
+
+/*!
+    @typedef Segment64
+    @discussion A 64 bit I/O bus address/length pair
+*/
+    struct Segment64 {
+	UInt64 fIOVMAddr, fLength;
+    };
+
+/*! @enum MappingOptions
+    @abstract Mapping types to indicate the desired mapper type for translating memory descriptors into I/O DMA Bus addresses.
+    @constant kNonCoherent	Used by drivers for non-coherent transfers, implies unmapped memmory
+    @constant kMapped		Allow a driver to define addressing size
+    @constant kBypassed		Allow drivers to bypass any mapper
+    @constant kMaxMappingOptions	Internal use only
+*/
+    enum MappingOptions {
+	kMapped       = 0x00000000,
+	kBypassed     = 0x00000001,
+	kNonCoherent  = 0x00000002,
+	kTypeMask     = 0x0000000f,
+
+	kNoCacheStore = 0x00000010,	// Memory in descriptor 
+	kOnChip       = 0x00000020,	// Indicates DMA is on South Bridge
+	kIterateOnly  = 0x00000040	// DMACommand will be used as a cursor only
+    };
+
+/*! @enum SynchronizeOptions
+    @abstract Options for the synchronize method.
+    @constant kForceDoubleBuffer Copy the entire prepared range to a new page aligned buffer.
+*/
+    enum SynchronizeOptions {
+	kForceDoubleBuffer = 0x01000000
+    };
+
+/*!
+    @typedef SegmentFunction
+    @discussion Pointer to a C function that translates a 64 segment and outputs a single desired segment to the array at the requested index. There are a group of pre-implemented SegmentFunctions that may be usefull to the developer below.
+    @param segment The 64Bit I/O bus address and length.
+    @param segments Base of the output vector of DMA address length pairs.
+    @param segmentIndex Index to output 'segment' in the 'segments' array.
+    @result Returns true if segment encoding succeeded.  false may be returned if the current segment does not fit in an output segment, i.e. a 38bit address wont fit into a 32 encoding.
+*/
+    typedef bool (*SegmentFunction)(IODMACommand *target,
+	    			    Segment64 segment,
+				    void     *segments,
+				    UInt32    segmentIndex);
+
+    // -------------- Preimplemented output functions ----------------
+
+/*! @function OutputHost32
+    @abstract Output host natural Segment32 output segment function.
+*/
+    static bool OutputHost32(IODMACommand *target,
+	    Segment64 seg, void *segs, UInt32 ind);
+
+/*! @defined kIODMACommandOutputHost32
+    @abstract Output host natural Segment32 output segment function.
+ */
+#define kIODMACommandOutputHost32   (IODMACommand::OutputHost32)
+
+/*! @function OutputBig32
+    @abstract Output big-endian Segment32 output segment function.
+*/
+    static bool OutputBig32(IODMACommand *target,
+	    Segment64 seg, void *segs, UInt32 ind);
+
+/*! @defined kIODMACommandOutputBig32
+    @abstract Output big-endian Segment32 output segment function.
+ */
+#define kIODMACommandOutputBig32    (IODMACommand::OutputBig32)
+
+/*! @function OutputLittle32
+    @abstract Output little-endian Segment32 output segment function.
+*/
+    static bool OutputLittle32(IODMACommand *target,
+	    Segment64 seg, void *segs, UInt32 ind);
+
+/*! @defined kIODMACommandOutputLittle32
+    @abstract Output little-endian Segment32 output segment function.
+*/
+#define kIODMACommandOutputLittle32 (IODMACommand::OutputLittle32)
+
+/*! @function OutputHost64
+    @abstract Output host natural Segment64 output segment function.
+*/
+    static bool OutputHost64(IODMACommand *target,
+	    Segment64 seg, void *segs, UInt32 ind);
+
+/*! @defined kIODMACommandOutputHost64
+    @abstract Output host natural Segment64 output segment function.
+*/
+#define kIODMACommandOutputHost64   (IODMACommand::OutputHost64)
+
+/*! @function OutputBig64
+    @abstract Output big-endian Segment64 output segment function.
+*/
+    static bool OutputBig64(IODMACommand *target,
+	    Segment64 seg, void *segs, UInt32 ind);
+
+/*! @defined kIODMACommandOutputLittle64
+    @abstract Output little-endian Segment64 output segment function.
+*/
+#define kIODMACommandOutputBig64    (IODMACommand::OutputBig64)
+
+/*! @function OutputLittle64
+    @abstract Output little-endian Segment64 output segment function.
+*/
+    static bool OutputLittle64(IODMACommand *target,
+	    Segment64 seg, void *segs, UInt32 ind);
+
+/*! @defined kIODMACommandOutputBig64
+    @abstract Output big-endian Segment64 output segment function.
+*/
+#define kIODMACommandOutputLittle64 (IODMACommand::OutputLittle64)
+
+/*! @function withSpecification
+    @abstract Creates and initializes an IODMACommand in one operation.
+    @discussion Factory function to create and initialize an IODMACommand in one operation.
+    @param outSegFunc SegmentFunction to call to output one physical segment. A set of nine commonly required segment functions are provided.
+    @param numAddressBits Number of bits that the hardware uses on its internal address bus. Typically 32 but may be more on modern hardware.  A 0 implies no-restriction other than that implied by the output segment function.
+    @param maxSegmentSize Maximum allowable size for one segment.  If 0 is passed the maximum segment size is unlimited.
+    @param mappingOptions is the type of mapping that is required to translate an IOMemoryDescriptor into the desired number of bits.  For instance if your hardware only supports 32 bits but must run on machines with > 4G of RAM some mapping will be required.  Number of bits will be specified in numAddressBits, see below.This parameter can take 3 values:- kNonCoherent - used for non-coherent hardware transfers, Mapped - Validate that all I/O bus generated addresses are within the number of addressing bits specified, Bypassed indicates that bypassed addressing is required, this is used when the hardware transferes are into coherent memory but no mapping is required.  See also prepare() for failure cases.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restriction, in bytes, on I/O bus addresses.  Defaults to single byte alignment.
+    @param mapper For mapping types kMapped & kBypassed mapper is used to define the hardware that will perform the mapping, defaults to the system mapper.
+    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
+*/
+    static IODMACommand *
+	withSpecification(SegmentFunction  outSegFunc,
+			  UInt8            numAddressBits,
+			  UInt64           maxSegmentSize,
+			  MappingOptions   mappingOptions = kMapped,
+			  UInt64           maxTransferSize = 0,
+			  UInt32           alignment = 1,
+			  IOMapper        *mapper = 0,
+			  void            *refCon = 0);
+
+/*! @function weakWithSpecification
+    @abstract Creates and initialises an IODMACommand in one operation if this version of the operating system supports it.
+    @discussion Factory function to create and initialise an IODMACommand in one operation.  The function allows a developer to 'weak' link with IODMACommand.  This function will return kIOReturnUnsupported if the IODMACommand is unavailable.  This function is actually fairly slow so it will be better to call it once then clone the successfully create command using cloneCommand (q.v.).
+    @param newCommand Output reference variable of the newly created IODMACommand.
+    @param outSegFunc SegmentFunction to call to output one physical segment. A set of nine commonly required segment functions are provided.
+    @param numAddressBits Number of bits that the hardware uses on its internal address bus. Typically 32 but may be more on modern hardware.  A 0 implies no-restriction other than that implied by the output segment function.
+    @param maxSegmentSize Maximum allowable size for one segment. Zero is treated as an unlimited segment size.
+    @param mapType is the type of mapping that is required to translate an IOMemoryDescriptor into the desired number of bits.  For instance if your hardware only supports 32 bits but must run on machines with > 4G of RAM some mapping will be required.  Number of bits will be specified in numAddressBits, see below.  This parameter can take 3 values:- kNonCoherent - used for non-coherent hardware transfers, Mapped - Validate that all I/O bus generated addresses are within the number of addressing bits specified, Bypassed indicates that bypassed addressing is required, this is used when the hardware transfers are into coherent memory but no mapping is required.  See also prepare() for failure cases.
+    @param maxTransferSize Maximum size of an entire transfer.  Defaults to 0 indicating no maximum.
+    @param alignment Alignment restriction, in bytes, on I/O bus addresses.  Defaults to single byte alignment.
+    @param mapper For mapping types kMapped & kBypassed mapper is used to define the hardware that will perform the mapping, defaults to the system mapper.
+    @result kIOReturnSuccess if everything is OK, otherwise kIOReturnBadArgument if newCommand is NULL, kIOReturnUnsupported if the kernel doesn't export IODMACommand or IOReturnError if the new command fails to init, q.v. initWithSpecification.
+*/
+    // Note that the function has the attribute always_inline.
+    // The point of this function is to make a call into the kernel
+    // without generating an undefined symbol.  If the client could call
+    // the code as a function then the goal of no undefined symbols
+    // would be lost thus defeating the purpose.
+    static inline IOReturn weakWithSpecification
+	    (IODMACommand   **newCommand,
+	     SegmentFunction outSegFunc,
+	     UInt8           numAddressBits,
+	     UInt64          maxSegmentSize,
+	     MappingOptions  mapType = kMapped,
+	     UInt64          maxTransferSize = 0,
+	     UInt32          alignment = 1,
+	     IOMapper       *mapper = 0,
+	     void           *refCon = 0) __attribute__((always_inline));
+
+/*!
+    @function cloneCommand
+    @abstract Creates a new command based on the specification of the current one.
+    @discussion Factory function to create and initialise an IODMACommand in one operation.  The current command's specification will be duplicated in the new object, but however none of its state will be duplicated.  This means that it is safe to clone a command even if it is currently active and running, however you must be certain that the command to be duplicated does have a valid reference for the duration.
+    @result Returns a new memory cursor if successfully created and initialised, 0 otherwise.
+*/
+    virtual IODMACommand *cloneCommand(void *refCon = 0);
+
+/*! @function initWithSpecification
+    @abstract Primary initializer for the IODMACommand class. 
+    @param outSegFunc SegmentFunction to call to output one physical segment. A set of nine commonly required segment functions are provided.
+    @param numAddressBits Number of bits that the hardware uses on its internal address bus. Typically 32 but may be more on modern hardware.  A 0 implies no-restriction other than that implied by the output segment function.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0 which means any size.
+    @param mappingOptions is the type of mapping that is required to translate an IOMemoryDescriptor into the desired number of bits.  For instance if your hardware only supports 32 bits but must run on machines with > 4G of RAM some mapping will be required.  Number of bits will be specified in numAddressBits, see below.This parameter can take 3 values:- kNonCoherent - used for non-coherent hardware transfers, Mapped - Validate that all I/O bus generated addresses are within the number of addressing bits specified, Bypassed indicates that bypassed addressing is required, this is used when the hardware transferes are into coherent memory but no mapping is required.  See also prepare() for failure cases.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restriction, in bytes, on I/O bus addresses.  Defaults to single byte alignment.
+    @param mapper For mapping types kMapped & kBypassed mapper is used to define the hardware that will perform the mapping, defaults to the system mapper.
+    @result Can fail if the mapping type is not recognised, if one of the 3 mandatory parameters are set to 0, if a 32 bit output function is selected when more than 32 bits of address is required or, if kBypassed is requested on a machine that doesn't support bypassing.  Returns true otherwise.
+*/
+    virtual bool initWithSpecification( SegmentFunction  outSegFunc,
+					UInt8     numAddressBits,
+					UInt64    maxSegmentSize,
+					MappingOptions mappingOptions = kMapped,
+					UInt64    maxTransferSize = 0,
+					UInt32    alignment = 1,
+					IOMapper *mapper = 0,
+					void     *refCon = 0);
+
+/*! @function setMemoryDescriptor
+    @abstract Sets and resets the DMACommand's current memory descriptor
+    @discussion The DMA command will configure itself based on the information that it finds in the memory descriptor.  It looks for things like the direction of the memory descriptor and whether the current memory descriptor is already mapped into some IOMMU.  As a programmer convenience it can also prepare the memory descriptor immediately.  See prepare().  Note the IODMACommand is designed to used multiple times with a succession of memory descriptors, making the pooling of commands possible.  It is an error though to attempt to reset a currently prepared() DMA command.  Warning: This routine may block so never try to autoprepare an IODMACommand while in a gated context, i.e. one of the WorkLoops action call outs.
+    @param mem A pointer to the current I/Os memory descriptor.
+    @param autoPrepare An optional boolean variable that will call the prepare() function automatically after the memory descriptor is processed. Defaults to true.
+    @result Returns kIOReturnSuccess, kIOReturnBusy if currently prepared, kIOReturnNoSpace if the length(mem) >= Maximum Transfer Size or the error codes returned by prepare() (qv).
+*/
+    virtual IOReturn setMemoryDescriptor(const IOMemoryDescriptor *mem,
+				         bool autoPrepare = true);
+
+/*! @function clearMemoryDescriptor
+    @abstract Clears the DMACommand's current memory descriptor
+    @discussion completes and invalidates the cache if the DMA command is currently active, copies all data from bounce buffers if necessary and releases all resources acquired during setMemoryDescriptor.
+    @param autoComplete An optional boolean variable that will call the complete() function automatically before the memory descriptor is processed. Defaults to true.
+*/
+    virtual IOReturn clearMemoryDescriptor(bool autoComplete = true);
+
+/*! @function getMemoryDescriptor
+    @abstract Get the current memory descriptor
+*/
+    virtual const IOMemoryDescriptor *getMemoryDescriptor() const;
+
+/*! @function prepare
+    @abstract Prepare the memory for an I/O transfer.
+    @discussion Allocate the mapping resources neccessary for this transfer, specifying a sub range of the IOMemoryDescriptor that will be the target of the I/O.  The complete() method frees these resources.  Data may be copied to buffers for kIODirectionOut memory descriptors, depending on hardware mapping resource availabilty or alignment restrictions.  It should be noted that the this function may block and should only be called on the clients context, i.e never call this routine while gated; also the call itself is not thread safe though this should be an issue as each IODMACommand is independant.
+    @param offset defines the starting offset in the memory descriptor the DMA command will operate on. genIOVMSegments will produce its results based on the offset and length passed to the prepare method.
+    @param length defines the ending position in the memory descriptor the DMA command will operate on. genIOVMSegments will produce its results based on the offset and length passed to the prepare method.
+    @param flushCache Flush the caches for the memory descriptor and make certain that the memory cycles are complete.  Defaults to true for kNonCoherent and is ignored by the other types.
+    @param synchronize Copy any buffered data back from the target IOMemoryDescriptor.  Defaults to true, if synchronize() is being used to explicitly copy data, passing false may avoid an unneeded copy.
+    @result An IOReturn code. */
+
+    virtual IOReturn prepare(UInt64 offset = 0, UInt64 length = 0, bool flushCache = true, bool synchronize = true);
+
+/*! @function complete
+    @abstract Complete processing of DMA mappings after an I/O transfer is finished.
+    @discussion This method should not be called unless a prepare was previously issued; the prepare() and complete() must occur in pairs, before and after an I/O transfer
+    @param invalidCache Invalidate the caches for the memory descriptor.  Defaults to true for kNonCoherent and is ignored by the other types.
+    @param synchronize Copy any buffered data back to the target IOMemoryDescriptor.  Defaults to true, if synchronize() is being used to explicitly copy data, passing false may avoid an unneeded copy.
+    @result kIOReturnNotReady if not prepared, kIOReturnSuccess otherwise. */
+
+    virtual IOReturn complete(bool invalidateCache = true, bool synchronize = true);
+
+/*! @function synchronize
+    @abstract Bring IOMemoryDescriptor and IODMACommand buffers into sync.
+    @discussion This method should not be called unless a prepare was previously issued. If needed a caller may synchronize any IODMACommand buffers with the original IOMemoryDescriptor buffers.
+    @param options Specifies the direction of the copy:
+	kIODirectionOut copy IOMemoryDesciptor memory to any IODMACommand buffers. By default this action takes place automatically at prepare().
+	kIODirectionIn copy any IODMACommand buffers back to the IOMemoryDescriptor. By default this action takes place automatically at complete().
+        kForceDoubleBuffer copy the entire prepared range to a new page aligned buffer.
+    @result kIOReturnNotReady if not prepared, kIOReturnBadArgument if invalid options are passed, kIOReturnSuccess otherwise. */
+
+    virtual IOReturn synchronize(IOOptionBits options);
+
+/*! @function genIOVMSegments
+    @abstract Generates a physical scatter/gather for the current DMA command
+    @discussion Generates a list of physical segments from the given memory descriptor, relative to the current position of the descriptor.  The constraints that are set during initialisation will be respected. This function maintains the state across multiple calls for efficiency.  However the state is discarded if the new offset is not the expected one.
+    @param offset input/output parameter, defines the starting and ending offset in the memory descriptor, relative to any offset passed to the prepare() method.
+    @param segments Void pointer to base of output physical scatter/gather list.  Always passed directly onto the SegmentFunction.
+    @param numSegments Input/output parameter Number of segments that can fit in the segment array and returns number of segments generated.
+    @result kIOReturnSuccess on success, kIOReturnOverrun if the memory descriptor is exhausted, kIOReturnMessageTooLarge if the output segment function's address bits has insufficient resolution for a segment, kIOReturnNotReady if the DMA command has not be prepared, kIOReturnBadArgument if the DMA command doesn't have a memory descriptor yet or some of the parameters are NULL and kIOReturnNotReady if the DMA command is not prepared.
+*/
+    virtual IOReturn genIOVMSegments(UInt64 *offset,
+				     void   *segments,
+				     UInt32 *numSegments);
+
+private:
+    virtual UInt64 transfer( IOOptionBits transferOp, UInt64 offset, void * buffer, UInt64 length );
+
+public:
+
+/*! @function writeBytes
+    @abstract Copy data to the IODMACommand's buffer from the specified buffer.
+    @discussion This method copies data to the IODMACommand's memory at the given offset, from the caller's buffer. The IODMACommand must be prepared, and the offset is relative to the prepared offset.
+    @param offset A byte offset into the IODMACommand's memory, relative to the prepared offset.
+    @param bytes The caller supplied buffer to copy the data from.
+    @param length The length of the data to copy.
+    @result The number of bytes copied, zero will be returned if the specified offset is beyond the prepared length of the IODMACommand. */
+
+    UInt64 writeBytes(UInt64 offset, const void *bytes, UInt64 length);
+
+/*! @function readBytes
+    @abstract Copy data from the IODMACommand's buffer to the specified buffer.
+    @discussion This method copies data from the IODMACommand's memory at the given offset, to the caller's buffer. The IODMACommand must be prepared, and the offset is relative to the prepared offset.
+    @param offset A byte offset into the IODMACommand's memory, relative to the prepared offset.
+    @param bytes The caller supplied buffer to copy the data to.
+    @param length The length of the data to copy.
+    @result The number of bytes copied, zero will be returned if the specified offset is beyond the prepared length of the IODMACommand. */
+
+    UInt64 readBytes(UInt64 offset, void *bytes, UInt64 length);
+
+/*! @function gen32IOVMSegments
+    @abstract Helper function for a type checked call to genIOVMSegments(qv), for use with an IODMACommand set up with the output function kIODMACommandOutputHost32, kIODMACommandOutputBig32, or kIODMACommandOutputLittle32. If the output function of the IODMACommand is not a 32 bit function, results will be incorrect.
+*/
+    inline IOReturn gen32IOVMSegments(UInt64   *offset,
+				      Segment32 *segments,
+				      UInt32     *numSegments)
+    { return genIOVMSegments(offset, segments, numSegments); };
+
+/*! @function gen64IOVMSegments
+    @abstract Helper function for a type checked call to genIOVMSegments(qv), for use with an IODMACommand set up with the output function kIODMACommandOutputHost64, kIODMACommandOutputBig64, or kIODMACommandOutputLittle64. If the output function of the IODMACommand is not a 64 bit function, results will be incorrect.
+*/
+    inline IOReturn gen64IOVMSegments(UInt64    *offset,
+				      Segment64 *segments,
+				      UInt32    *numSegments)
+    { return genIOVMSegments(offset, segments, numSegments); };
+
+	IOReturn
+	genIOVMSegments(SegmentFunction segmentFunction,
+							UInt64 *offsetP,
+							void   *segmentsP,
+							UInt32 *numSegmentsP);
+	
+    virtual void free();
+
+private:
+    typedef IOReturn (*InternalSegmentFunction)(
+				    void         *reference,
+				    IODMACommand *target,
+				    Segment64     segment,
+				    void         *segments,
+				    UInt32        segmentIndex);
+
+    IOReturn genIOVMSegments(uint32_t op,
+				  InternalSegmentFunction outSegFunc,
+				  void   *reference,
+				  UInt64 *offsetP,
+				  void   *segmentsP,
+				  UInt32 *numSegmentsP);
+
+    static IOReturn clientOutputSegment(
+	    void *reference, IODMACommand *target,
+	    Segment64 segment, void *vSegList, UInt32 outSegIndex);
+	
+    static IOReturn segmentOp(
+			void         *reference,
+			IODMACommand *target,
+			Segment64     segment,
+			void         *segments,
+			UInt32        segmentIndex);
+    IOReturn walkAll(UInt8 op);
+
+public:
+
+/*! @function prepareWithSpecification
+    @abstract Prepare the memory for an I/O transfer with a new specification.
+    @discussion Allocate the mapping resources neccessary for this transfer, specifying a sub range of the IOMemoryDescriptor that will be the target of the I/O.  The complete() method frees these resources.  Data may be copied to buffers for kIODirectionOut memory descriptors, depending on hardware mapping resource availabilty or alignment restrictions.  It should be noted that the this function may block and should only be called on the clients context, i.e never call this routine while gated; also the call itself is not thread safe though this should be an issue as each IODMACommand is independant.
+    @param outSegFunc SegmentFunction to call to output one physical segment. A set of nine commonly required segment functions are provided.
+    @param numAddressBits Number of bits that the hardware uses on its internal address bus. Typically 32 but may be more on modern hardware.  A 0 implies no-restriction other than that implied by the output segment function.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0 which means any size.
+    @param mappingOptions is the type of mapping that is required to translate an IOMemoryDescriptor into the desired number of bits.  For instance if your hardware only supports 32 bits but must run on machines with > 4G of RAM some mapping will be required.  Number of bits will be specified in numAddressBits, see below.This parameter can take 3 values:- kNonCoherent - used for non-coherent hardware transfers, Mapped - Validate that all I/O bus generated addresses are within the number of addressing bits specified, Bypassed indicates that bypassed addressing is required, this is used when the hardware transferes are into coherent memory but no mapping is required.  See also prepare() for failure cases.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restriction, in bytes, on I/O bus addresses.  Defaults to single byte alignment.
+    @param mapper For mapping types kMapped & kBypassed mapper is used to define the hardware that will perform the mapping, defaults to the system mapper.
+    @param offset defines the starting offset in the memory descriptor the DMA command will operate on. genIOVMSegments will produce its results based on the offset and length passed to the prepare method.
+    @param length defines the ending position in the memory descriptor the DMA command will operate on. genIOVMSegments will produce its results based on the offset and length passed to the prepare method.
+    @param flushCache Flush the caches for the memory descriptor and make certain that the memory cycles are complete.  Defaults to true for kNonCoherent and is ignored by the other types.
+    @param synchronize Copy any buffered data back from the target IOMemoryDescriptor.  Defaults to true, if synchronize() is being used to explicitly copy data, passing false may avoid an unneeded copy.
+    @result An IOReturn code. Can fail if the mapping type is not recognised, if one of the 3 mandatory parameters are set to 0, if a 32 bit output function is selected when more than 32 bits of address is required or, if kBypassed is requested on a machine that doesn't support bypassing.
+*/
+
+    virtual IOReturn prepareWithSpecification(SegmentFunction	outSegFunc,
+					      UInt8		numAddressBits,
+					      UInt64		maxSegmentSize,
+					      MappingOptions	mappingOptions = kMapped,
+					      UInt64		maxTransferSize = 0,
+					      UInt32		alignment = 1,
+					      IOMapper		*mapper = 0,
+					      UInt64		offset = 0,
+					      UInt64		length = 0,
+					      bool		flushCache = true,
+					      bool		synchronize = true);
+
+    static IOReturn transferSegment(
+			void         *reference,
+			IODMACommand *target,
+			Segment64     segment,
+			void         *segments,
+			UInt32        segmentIndex);
+
+/*! @function getPreparedOffsetAndLength
+    @abstract Returns the offset and length into the target IOMemoryDescriptor of a prepared IODDMACommand.
+    @discussion If successfully prepared, returns the offset and length into the IOMemoryDescriptor. Will fail for an unprepared IODMACommand.
+    @param offset returns the starting offset in the memory descriptor the DMA command was prepared with. Pass NULL for don't care.
+    @param length returns the length in the memory descriptor the DMA command was prepared with. Pass NULL for don't care.
+    @result An IOReturn code. kIOReturnNotReady if the IODMACommand is not prepared. */
+
+    virtual IOReturn getPreparedOffsetAndLength(UInt64 * offset, UInt64 * length);
+
+	UInt8	 getNumAddressBits(void);
+	UInt32	 getAlignment(void);
+	
+private:
+    OSMetaClassDeclareReservedUsed(IODMACommand,  0);
+    OSMetaClassDeclareReservedUsed(IODMACommand,  1);
+    OSMetaClassDeclareReservedUsed(IODMACommand,  2);
+    OSMetaClassDeclareReservedUnused(IODMACommand,  3);
+    OSMetaClassDeclareReservedUnused(IODMACommand,  4);
+    OSMetaClassDeclareReservedUnused(IODMACommand,  5);
+    OSMetaClassDeclareReservedUnused(IODMACommand,  6);
+    OSMetaClassDeclareReservedUnused(IODMACommand,  7);
+    OSMetaClassDeclareReservedUnused(IODMACommand,  8);
+    OSMetaClassDeclareReservedUnused(IODMACommand,  9);
+    OSMetaClassDeclareReservedUnused(IODMACommand, 10);
+    OSMetaClassDeclareReservedUnused(IODMACommand, 11);
+    OSMetaClassDeclareReservedUnused(IODMACommand, 12);
+    OSMetaClassDeclareReservedUnused(IODMACommand, 13);
+    OSMetaClassDeclareReservedUnused(IODMACommand, 14);
+    OSMetaClassDeclareReservedUnused(IODMACommand, 15);
+
+public:
+/*! @var fRefCon Reference Constant, client defined publicly avialable */
+    void *fRefCon;
+
+protected:
+
+/*! @var fMaxSegmentSize Maximum size of one segment in a scatter/gather list */
+    UInt64  fMaxSegmentSize;
+
+/*! @var fMaxTransferSize
+    Maximum size of a transfer that this memory cursor is allowed to generate */
+    UInt64  fMaxTransferSize;
+
+/*! @var fBypassMask
+    Mask to be ored into the address to bypass the given iommu's mapping. */
+    UInt64  fBypassMask;
+
+/*! @var fMapper
+    Client defined mapper. */
+    IOMapper *fMapper;
+
+/*! @var fMemory
+    memory descriptor for current I/O. */
+    const IOMemoryDescriptor *fMemory;
+
+/*! @var fOutSeg The action method called when an event has been delivered */
+    SegmentFunction fOutSeg;
+
+/*! @var fAlignMask
+    Alignment restriction mask. */
+    UInt32  fAlignMask;
+
+/*! @var fNumAddressBits
+    Number of bits that the hardware can address */
+    UInt32 fNumAddressBits;
+
+/*! @var fNumSegments
+    Number of contiguous segments required for the current memory descriptor and desired mapping */
+    UInt32  fNumSegments;
+
+/*! @var fMappingOptions
+    What type of I/O virtual address mapping is required for this command */
+    MappingOptions  fMappingOptions;
+
+/*! @var fActive
+    fActive indicates that this DMA command is currently prepared and ready to go */
+    UInt32 fActive;
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    struct IODMACommandInternal * reserved;
+};
+
+IOReturn IODMACommand::
+weakWithSpecification(IODMACommand **newCommand,
+		      SegmentFunction  outSegFunc,
+		      UInt8     numAddressBits,
+		      UInt64    maxSegmentSize,
+		      MappingOptions mapType,
+		      UInt64    maxTransferSize,
+		      UInt32    alignment,
+		      IOMapper *mapper,
+		      void     *refCon) 
+{
+    if (!newCommand)
+	return kIOReturnBadArgument;
+
+    IODMACommand *self = (IODMACommand *)
+	OSMetaClass::allocClassWithName("IODMACommand");
+    if (!self)
+	return kIOReturnUnsupported;
+
+    IOReturn ret;
+    bool inited = self->
+	initWithSpecification(outSegFunc,
+			      numAddressBits, maxSegmentSize, mapType,
+			      maxTransferSize, alignment, mapper, refCon);
+    if (inited)
+	ret =  kIOReturnSuccess;
+    else {
+	self->release();
+	self = 0;
+	ret = kIOReturnError;
+    }
+
+    *newCommand = self;
+    return ret;
+};
+#endif /* !_IODMACOMMAND_H */
+
diff --git a/i386/include/IOKit/IODMAController.h b/i386/include/IOKit/IODMAController.h
new file mode 100644
index 0000000..a8c1aed
--- /dev/null
+++ b/i386/include/IOKit/IODMAController.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IODMACONTROLLER_H
+#define _IOKIT_IODMACONTROLLER_H
+
+#include <IOKit/IODMACommand.h>
+#include <IOKit/IODMAEventSource.h>
+#include <IOKit/IOService.h>
+
+class IODMAEventSource;
+
+class IODMAController : public IOService
+{
+  OSDeclareAbstractStructors(IODMAController);
+  
+  friend class IODMAEventSource;
+  
+ private:
+  IOService       *_provider;
+  const OSSymbol  *_dmaControllerName;
+  
+ protected:
+  virtual void registerDMAController(IOOptionBits options = 0);  
+  virtual IOReturn initDMAChannel(IOService *provider, IODMAEventSource *dmaES, UInt32 *dmaIndex, UInt32 reqIndex) = 0;
+  virtual IOReturn startDMACommand(UInt32 dmaIndex, IODMACommand *dmaCommand, IODirection direction,
+				   IOByteCount byteCount = 0, IOByteCount byteOffset = 0) = 0;
+  virtual IOReturn stopDMACommand(UInt32 dmaIndex, bool flush = false, uint64_t timeout = UINT64_MAX) = 0;
+  virtual void completeDMACommand(IODMAEventSource *dmaES, IODMACommand *dmaCommand);
+  virtual void notifyDMACommand(IODMAEventSource *dmaES, IODMACommand *dmaCommand, IOReturn status, IOByteCount actualByteCount);
+  virtual IOReturn queryDMACommand(UInt32 dmaIndex, IODMACommand **dmaCommand, IOByteCount *transferCount, bool waitForIdle = false) = 0;
+  virtual IOByteCount getFIFODepth(UInt32 dmaIndex) = 0;
+  
+ public:
+  static const OSSymbol *createControllerName(UInt32 phandle);
+  static IODMAController *getController(IOService *provider, UInt32 dmaIndex);
+  
+  virtual bool start(IOService *provider);
+};
+
+
+#endif /* _IOKIT_IODMACONTROLLER_H */
diff --git a/i386/include/IOKit/IODMAEventSource.h b/i386/include/IOKit/IODMAEventSource.h
new file mode 100644
index 0000000..18a72de
--- /dev/null
+++ b/i386/include/IOKit/IODMAEventSource.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IODMAEVENTSOURCE_H
+#define _IOKIT_IODMAEVENTSOURCE_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IODMACommand.h>
+#include <IOKit/IODMAController.h>
+#include <IOKit/IOEventSource.h>
+
+class IODMAController;
+
+class IODMAEventSource : public IOEventSource
+{
+  OSDeclareDefaultStructors(IODMAEventSource);
+  
+  friend class IODMAController;
+  
+ public:
+  typedef void (*Action)(OSObject *owner, IODMAEventSource *dmaES, IODMACommand *dmaCommand, IOReturn status, IOByteCount actualByteCount);
+#define IODMAEventAction IODMAEventSource::Action
+  
+ protected:
+  virtual void completeDMACommand(IODMACommand *dmaCommand);
+  virtual void notifyDMACommand(IODMACommand *dmaCommand, IOReturn status, IOByteCount actualByteCount);
+  
+ public:
+  static IODMAEventSource *dmaEventSource(OSObject *owner,
+					  IOService *provider,
+					  Action completion = 0,
+					  Action notification = 0,
+					  UInt32 dmaIndex = 0);
+  
+  virtual IOReturn startDMACommand(IODMACommand *dmaCommand, IODirection direction, IOByteCount byteCount = 0, IOByteCount byteOffset = 0);
+  virtual IOReturn stopDMACommand(bool flush = false, uint64_t timeout = UINT64_MAX);
+  
+  virtual IOReturn queryDMACommand(IODMACommand **dmaCommand, IOByteCount *transferCount, bool waitForIdle = false);
+  virtual IOByteCount getFIFODepth();
+  
+ private:
+  IOService       *dmaProvider;
+  IODMAController *dmaController;
+  UInt32          dmaIndex;
+  queue_head_t    dmaCommandsCompleted;
+  IOSimpleLock	  *dmaCommandsCompletedLock;
+  Action          dmaCompletionAction;
+  Action          dmaNotificationAction;
+  bool            dmaSynchBusy;
+  
+  virtual bool init(OSObject *owner,
+		    IOService *provider,
+		    Action completion = 0,
+		    Action notification = 0,
+		    UInt32 dmaIndex = 0);
+  virtual bool checkForWork(void);
+};
+
+#endif /* _IOKIT_IODMAEVENTSOURCE_H */
diff --git a/i386/include/IOKit/IODataQueue.h b/i386/include/IOKit/IODataQueue.h
new file mode 100644
index 0000000..458cb47
--- /dev/null
+++ b/i386/include/IOKit/IODataQueue.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IODATAQUEUE_H
+#define _IOKIT_IODATAQUEUE_H
+
+#include <libkern/c++/OSObject.h>
+#include <libkern/OSTypes.h>
+#include <mach/port.h>
+#include <mach/message.h>
+
+typedef struct _IODataQueueMemory IODataQueueMemory;
+class IOMemoryDescriptor;
+
+struct _notifyMsg {
+    mach_msg_header_t h;
+};
+
+/*!
+ * @class IODataQueue : public OSObject
+ * @abstract A generic queue designed to pass data from the kernel to a user process.
+ * @discussion The IODataQueue class is designed to allow kernel code to queue data to a user process.  IODataQueue objects are designed to be used in a single producer / single consumer situation.  As such, there are no locks on the data itself.  Because the kernel enqueue and user-space dequeue methods follow a strict set of guidelines, no locks are necessary to maintain the integrity of the data struct.
+ *
+ * <br>Each data entry can be variable sized, but the entire size of the queue data region (including overhead for each entry) must be specified up front.
+ *
+ * <br>In order for the IODataQueue instance to notify the user process that data is available, a notification mach port must be set.  When the queue is empty and a new entry is added, a message is sent to the specified port.
+ *
+ * <br>User client code exists in the IOKit framework that facilitates the creation of the receive notification port as well as the listen process for new data available notifications.
+ *
+ * <br>In order to make the data queue memory available to a user process, the method getMemoryDescriptor() must be used to get an IOMemoryDescriptor instance that can be mapped into a user process.  Typically, the clientMemoryForType() method on an IOUserClient instance will be used to request the IOMemoryDescriptor and then return it to be mapped into the user process.
+ */
+class IODataQueue : public OSObject
+{
+    OSDeclareDefaultStructors(IODataQueue)
+
+protected:
+    IODataQueueMemory *	dataQueue;
+
+    void *		notifyMsg;
+
+    virtual void free();
+
+    /*!
+     * @function sendDataAvailableNotification
+     * @abstract Sends a dataAvailableNotification message to the specified mach port.
+     * @discussion This method sends a message to the mach port passed to setNotificationPort().  It is used to indicate that data is available in the queue.
+     */
+    virtual void sendDataAvailableNotification();
+
+public:
+    /*!
+     * @function withCapacity
+     * @abstract Static method that creates a new IODataQueue instance with the capacity specified in the size parameter.
+     * @discussion The actual size of the entire data queue memory region (to be shared into a user process) is equal to the capacity plus the IODataQueueMemory overhead.  This overhead value can be determined from the DATA_QUEUE_MEMORY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.  The size of the data queue memory region must include space for the overhead of each IODataQueueEntry.  This entry overhead can be determined from the DATA_QUEUE_ENTRY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.<br>  This method allocates a new IODataQueue instance and then calls initWithCapacity() with the given size parameter.  If the initWithCapacity() fails, the new instance is released and zero is returned.
+     * @param size The size of the data queue memory region.
+     * @result Returns the newly allocated IODataQueue instance.  Zero is returned on failure.
+     */
+    static IODataQueue *withCapacity(UInt32 size);
+
+    /*!
+     * @function withEntries
+     * @abstract Static method that creates a new IODataQueue instance with the specified number of entries of the given size.
+     * @discussion This method will create a new IODataQueue instance with enough capacity for numEntries of entrySize.  It does account for the IODataQueueEntry overhead for each entry.  Note that the numEntries and entrySize are simply used to determine the data region size.  They do not actually restrict the size of number of entries that can be added to the queue.<br>  This method allocates a new IODataQueue instance and then calls initWithEntries() with the given numEntries and entrySize parameters.  If the initWithEntries() fails, the new instance is released and zero is returned.
+     * @param numEntries Number of entries to allocate space for.
+     * @param entrySize Size of each entry.
+     * @result Reeturns the newly allocated IODataQueue instance.  Zero is returned on failure.
+     */
+    static IODataQueue *withEntries(UInt32 numEntries, UInt32 entrySize);
+
+    /*!
+     * @function initWithCapacity
+     * @abstract Initializes an IODataQueue instance with the capacity specified in the size parameter.
+     * @discussion The actual size of the entire data queue memory region (to be shared into a user process) is equal to the capacity plus the IODataQueueMemory overhead.  This overhead value can be determined from the DATA_QUEUE_MEMORY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.  The size of the data queue memory region must include space for the overhead of each IODataQueueEntry.  This entry overhead can be determined from the DATA_QUEUE_ENTRY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.
+     * @param size The size of the data queue memory region.
+     * @result Returns true on success and false on failure.
+     */
+    virtual Boolean initWithCapacity(UInt32 size);
+
+    /*!
+     * @function initWithEntries
+     * @abstract Initializes an IODataQueue instance with the specified number of entries of the given size.
+     * @discussion This method will initialize an IODataQueue instance with enough capacity for numEntries of entrySize.  It does account for the IODataQueueEntry overhead for each entry.  Note that the numEntries and entrySize are simply used to determine the data region size.  They do not actually restrict the size of number of entries that can be added to the queue.<br>  This method allocates a new IODataQueue instance and then calls initWithEntries() with the given numEntries and entrySize parameters.
+     * @param numEntries Number of entries to allocate space for.
+     * @param entrySize Size of each entry.
+     * @result Reeturns true on success and false on failure.
+     */
+    virtual Boolean initWithEntries(UInt32 numEntries, UInt32 entrySize);
+
+    /*!
+     * @function enqueue
+     * @abstract Enqueues a new entry on the queue.
+     * @discussion This method adds a new data entry of dataSize to the queue.  It sets the size parameter of the entry pointed to by the tail value and copies the memory pointed to by the data parameter in place in the queue.  Once that is done, it moves the tail to the next available location.  When attempting to add a new entry towards the end of the queue and there isn't enough space at the end, it wraps back to the beginning.<br>  If the queue is empty when a new entry is added, sendDataAvailableNotification() is called to send a message to the user process that data is now available.
+     * @param data Pointer to the data to be added to the queue.
+     * @param dataSize Size of the data pointed to by data.
+     * @result Returns true on success and false on failure.  Typically failure means that the queue is full.
+     */
+    virtual Boolean enqueue(void *data, UInt32 dataSize);
+
+    /*!
+     * @function setNotificationPort
+     * @abstract Creates a simple mach message targeting the mach port specified in port.
+     * @discussion This message is sent when data is added to an empty queue.  It is to notify a user process that new data has become available.
+     * @param port The mach port to target with the notification message.
+     */
+    virtual void setNotificationPort(mach_port_t port);
+
+    /*!
+     * @function getMemoryDescriptor
+     * @abstract Returns a memory descriptor covering the IODataQueueMemory region.
+     * @discussion The IOMemoryDescriptor instance returned by this method is intended to be mapped into a user process.  This is the memory region that the IODataQueueClient code operates on.
+     * @result Returns a newly allocated IOMemoryDescriptor for the IODataQueueMemory region.  Returns zero on failure.
+     */
+    virtual IOMemoryDescriptor *getMemoryDescriptor();
+};
+
+#endif /* _IOKIT_IODATAQUEUE_H */
diff --git a/i386/include/IOKit/IODataQueueShared.h b/i386/include/IOKit/IODataQueueShared.h
new file mode 100644
index 0000000..2fa0e9a
--- /dev/null
+++ b/i386/include/IOKit/IODataQueueShared.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IODATAQUEUESHARED_H
+#define _IOKIT_IODATAQUEUESHARED_H
+
+#include <libkern/OSTypes.h>
+#include <mach/port.h>
+#include <mach/message.h>
+
+/*!
+ * @typedef IODataQueueEntry
+ * @abstract Represents an entry within the data queue
+ * @discussion This is a variable sized struct.  The data field simply represents the start of the data region.  The size of the data region is stored in the size field.  The whole size of the specific entry is the size of a UInt32 plus the size of the data region.  
+ * @field size The size of the following data region.
+ * @field data Represents the beginning of the data region.  The address of the data field is a pointer to the start of the data region.
+ */
+typedef struct _IODataQueueEntry{
+    UInt32  size;
+    UInt8   data[4];
+} IODataQueueEntry;
+
+/*!
+ * @typedef IODataQueueMemory
+ * @abstract A struct mapping to the header region of a data queue.
+ * @discussion This struct is variable sized.  The struct represents the data queue header information plus a pointer to the actual data queue itself.  The size of the struct is the combined size of the header fields (3 * sizeof(UInt32)) plus the actual size of the queue region.  This size is stored in the queueSize field.
+ * @field queueSize The size of the queue region pointed to by the queue field.
+ * @field head The location of the queue head.  This field is represented as a byte offset from the beginning of the queue memory region.
+ * @field tail The location of the queue tail.  This field is represented as a byte offset from the beginning of the queue memory region.
+ * @field queue Represents the beginning of the queue memory region.  The size of the region pointed to by queue is stored in the queueSize field.
+ */
+typedef struct _IODataQueueMemory {
+    UInt32            queueSize;
+    volatile UInt32   head;
+    volatile UInt32   tail;
+    IODataQueueEntry  queue[1];
+} IODataQueueMemory;
+
+/*!
+ * @typedef IODataQueueAppendix
+ * @abstract A struct mapping to the appendix region of a data queue.
+ * @discussion This struct is variable sized dependent on the version.  The struct represents the data queue appendix information.
+ * @field version The version of the queue appendix.
+ * @field port The notification port associated with this queue.
+ */
+typedef struct _IODataQueueAppendix {
+    UInt32            version;
+    mach_msg_header_t msgh;
+} IODataQueueAppendix;
+
+/*!
+ * @defined DATA_QUEUE_ENTRY_HEADER_SIZE Represents the size of the data queue entry header independent of the actual size of the data in the entry.  This is the overhead of each entry in the queue.  The total size of an entry is equal to this value plus the size stored in the entry's size field (in IODataQueueEntry).
+ */
+#define DATA_QUEUE_ENTRY_HEADER_SIZE (sizeof(IODataQueueEntry) - 4)
+
+/*!
+ * @defined DATA_QUEUE_MEMORY_HEADER_SIZE Represents the size of the data queue memory header independent of the actual size of the queue data itself.  The total size of the queue memory is equal to this value plus the size of the queue appendix and the size of the queue data region which is stored in the queueSize field of IODataQueueMeory.
+ */
+#define DATA_QUEUE_MEMORY_HEADER_SIZE (sizeof(IODataQueueMemory) - sizeof(IODataQueueEntry))
+
+/*!
+ * @defined DATA_QUEUE_MEMORY_APPENDIX_SIZE Represents the size of the data queue memory appendix independent of the actual size of the queue data itself.  The total size of the queue memory is equal to this value plus the size of queue header and size of the queue data region which is stored in the queueSize field of IODataQueueMeory.
+ */
+#define DATA_QUEUE_MEMORY_APPENDIX_SIZE (sizeof(IODataQueueAppendix))
+
+#endif /* _IOKIT_IODATAQUEUESHARED_H */
+
diff --git a/i386/include/IOKit/IODeviceMemory.h b/i386/include/IOKit/IODeviceMemory.h
new file mode 100644
index 0000000..0665efc
--- /dev/null
+++ b/i386/include/IOKit/IODeviceMemory.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+#ifndef _IOKIT_IODEVICEMEMORY_H
+#define _IOKIT_IODEVICEMEMORY_H
+
+#include <IOKit/IOMemoryDescriptor.h>
+
+/*! @class IODeviceMemory
+    @abstract An IOMemoryDescriptor used for device physical memory ranges.
+    @discussion The IODeviceMemory class is a simple subclass of IOMemoryDescriptor that uses its methods to describe a single range of physical memory on a device. IODeviceMemory objects are usually looked up with IOService or IOPCIDevice accessors, and are created by memory-mapped bus families. IODeviceMemory implements only some factory methods in addition to the methods of IOMemoryDescriptor. 
+*/
+
+class IODeviceMemory : public IOMemoryDescriptor
+{
+    OSDeclareDefaultStructors(IODeviceMemory)
+
+public:
+
+/*! @struct InitElement
+    @field start First physical address in the range.
+    @field length Length of the range.
+    @field tag 32-bit value not interpreted by IODeviceMemory or IOMemoryDescriptor, for use by the bus family. */
+
+    struct InitElement {
+        IOPhysicalAddress	start;
+        IOPhysicalLength	length;
+        IOOptionBits 		tag;
+    };
+
+/*! @function arrayFromList
+    @abstract Constructs an OSArray of IODeviceMemory instances, each describing one physical range, and a tag value.
+    @discussion This method creates IODeviceMemory instances for each physical range passed in an IODeviceMemory::InitElement array. Each element consists of a physical address, length and tag value for the IODeviceMemory. The instances are returned as a created OSArray.
+    @param list An array of IODeviceMemory::InitElement structures.
+    @param count The number of elements in the list.
+    @result Returns a created OSArray of IODeviceMemory objects, to be released by the caller, or zero on failure. */
+
+    static OSArray *		arrayFromList(
+	InitElement		list[],
+	IOItemCount		count );
+
+/*! @function withRange
+    @abstract Constructs an IODeviceMemory instance, describing one physical range.
+    @discussion This method creates an IODeviceMemory instance for one physical range passed as a physical address and length. It just calls IOMemoryDescriptor::withPhysicalAddress.
+    @param address The physical address of the first byte in the memory.
+    @param withLength The length of memory.
+    @result Returns the created IODeviceMemory on success, to be released by the caller, or zero on failure. */
+
+    static IODeviceMemory *	withRange( 
+	IOPhysicalAddress	start,
+	IOPhysicalLength	length );
+
+/*! @function withSubRange
+    @abstract Constructs an IODeviceMemory instance, describing a subset of an existing IODeviceMemory range.
+    @discussion This method creates an IODeviceMemory instance for a subset of an existing IODeviceMemory range, passed as a physical address offset and length. It just calls IOMemoryDescriptor::withSubRange.
+    @param of The parent IODeviceMemory of which a subrange is to be used for the new descriptor, which will be retained by the subrange IODeviceMemory.
+    @param offset A byte offset into the parent's memory.
+    @param length The length of the subrange.
+    @result Returns the created IODeviceMemory on success, to be released by the caller, or zero on failure. */
+
+    static IODeviceMemory *	withSubRange( 
+	IODeviceMemory *	of,
+	IOPhysicalAddress	offset,
+	IOPhysicalLength	length );
+};
+
+#endif /* ! _IOKIT_IODEVICEMEMORY_H */
diff --git a/i386/include/IOKit/IODeviceTreeSupport.h b/i386/include/IOKit/IODeviceTreeSupport.h
new file mode 100644
index 0000000..15b5aa4
--- /dev/null
+++ b/i386/include/IOKit/IODeviceTreeSupport.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+#ifndef _IOKIT_IODEVICETREE_H
+#define _IOKIT_IODEVICETREE_H
+
+#include <IOKit/IORegistryEntry.h>
+#include <libkern/c++/OSData.h>
+
+class IODeviceMemory;
+class IOService;
+
+extern const IORegistryPlane *	gIODTPlane;
+
+extern const OSSymbol *		gIODTPHandleKey;
+
+extern const OSSymbol *		gIODTCompatibleKey;
+extern const OSSymbol * 	gIODTTypeKey;
+extern const OSSymbol * 	gIODTModelKey;
+
+extern const OSSymbol *		gIODTAAPLInterruptsKey;
+extern const OSSymbol *		gIODTDefaultInterruptController;
+extern const OSSymbol *		gIODTNWInterruptMappingKey;
+
+IORegistryEntry * IODeviceTreeAlloc( void * dtTop );
+
+
+bool IODTMatchNubWithKeys( IORegistryEntry * nub,
+                                    const char * keys );
+
+bool IODTCompareNubName( const IORegistryEntry * regEntry,
+			 OSString * name, OSString ** matchingName );
+
+enum {
+    kIODTRecursive	= 0x00000001,
+    kIODTExclusive	= 0x00000002
+};
+
+OSCollectionIterator * IODTFindMatchingEntries( IORegistryEntry * from,
+			IOOptionBits options, const char * keys );
+
+typedef SInt32 (*IODTCompareAddressCellFunc)
+	(UInt32 cellCount, UInt32 left[], UInt32 right[]);
+typedef void (*IODTNVLocationFunc)
+	(IORegistryEntry * entry,
+	UInt8 * busNum, UInt8 * deviceNum, UInt8 * functionNum );
+
+void IODTSetResolving( IORegistryEntry * 	regEntry,
+		IODTCompareAddressCellFunc	compareFunc,
+		IODTNVLocationFunc		locationFunc );
+
+bool IODTResolveAddressCell( IORegistryEntry * regEntry,
+                             UInt32 cellsIn[],
+                             IOPhysicalAddress * phys, IOPhysicalLength * len );
+
+OSArray * IODTResolveAddressing( IORegistryEntry * regEntry,
+			const char * addressPropertyName,
+			IODeviceMemory * parent );
+
+struct IONVRAMDescriptor {
+    unsigned int format:4;
+    unsigned int marker:1;
+    unsigned int bridgeCount:3;
+    unsigned int busNum:2;
+    unsigned int bridgeDevices:6 * 5;
+    unsigned int functionNum:3;
+    unsigned int deviceNum:5;
+} __attribute__((aligned(2), packed));
+
+IOReturn IODTMakeNVDescriptor( IORegistryEntry * regEntry,
+				IONVRAMDescriptor * hdr );
+
+OSData * IODTFindSlotName( IORegistryEntry * regEntry, UInt32 deviceNumber );
+
+const OSSymbol * IODTInterruptControllerName(
+			IORegistryEntry * regEntry );
+
+bool IODTMapInterrupts( IORegistryEntry * regEntry );
+
+enum {
+    kIODTInterruptShared = 0x00000001
+};
+IOReturn IODTGetInterruptOptions( IORegistryEntry * regEntry, int source, IOOptionBits * options );
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+IOReturn IONDRVLibrariesInitialize( IOService * provider );
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _IOKIT_IODEVICETREE_H */
+
diff --git a/i386/include/IOKit/IOEventSource.h b/i386/include/IOKit/IOEventSource.h
new file mode 100644
index 0000000..4afc5aa
--- /dev/null
+++ b/i386/include/IOKit/IOEventSource.h
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+Copyright (c) 1998 Apple Computer, Inc.	 All rights reserved.
+HISTORY
+    1998-7-13	Godfrey van der Linden(gvdl)
+	Created.
+    1998-10-30	Godfrey van der Linden(gvdl)
+	Converted to C++
+*/
+#ifndef _IOKIT_IOEVENTSOURCE_H
+#define _IOKIT_IOEVENTSOURCE_H
+
+#include <sys/cdefs.h>
+
+#include <libkern/c++/OSObject.h>
+
+#include <IOKit/IOLib.h>
+#include <IOKit/system.h>
+#include <IOKit/IOWorkLoop.h>
+
+
+__BEGIN_DECLS
+#include <mach/clock_types.h>
+#include <kern/clock.h>
+__END_DECLS
+
+/*!
+    @class IOEventSource : public OSObject
+    @abstract Abstract class for all work-loop event sources.
+    @discussion The IOEventSource declares the abstract super class that all
+event sources must inherit from if an IOWorkLoop is to receive events from them.
+<br><br>
+	An event source can represent any event that should cause the work-loop of a
+device to wake up and perform work.  Two examples of event sources are the
+IOInterruptEventSource which delivers interrupt notifications and IOCommandGate
+which delivers command requests.
+<br><br>
+	A kernel module can always use the work-loop model for serialising access to
+anything at all.  The IOEventSource is used for communicating events to the
+work-loop, and the chain of event sources should be used to walk the possible
+event sources and demultipex them.  Note a particular instance of an event
+source may only be a member of 1 linked list chain.  If you need to move it
+between chains than make sure it is removed from the original chain before
+attempting to move it.
+<br><br>
+	The IOEventSource makes no attempt to maintain the consitency of it's internal data across multi-threading.  It is assumed that the user of these basic tools will protect the data that these objects represent in some sort of device wide instance lock.	For example the IOWorkLoop maintains the event chain by handing off change request to its own thread and thus single threading access to its state.
+<br><br>
+	All subclasses of the IOEventSource are expected to implement the checkForWork() member function.
+
+<br><br>
+	checkForWork() is the key method in this class.	 It is called by some work-loop when convienient and is expected to evaluate it's internal state and determine if an event has occurred since the last call.  In the case of an event having occurred then the instance defined target(owner)/action will be called.	 The action is stored as an ordinary C function pointer but the first parameter is always the owner.  This means that a C++ member function can be used as an action function though this depends on the ABI.
+<br><br>
+	Although the eventChainNext variable contains a reference to the next event source in the chain this reference is not retained.  The list 'owner' i.e. the client that creates the event, not the work-loop, is expected to retain the source.
+*/
+class IOEventSource : public OSObject
+{
+    OSDeclareAbstractStructors(IOEventSource)
+    friend class IOWorkLoop;
+
+public:
+/*!
+    @typedef Action
+    @discussion Placeholder type for C++ function overloading discrimination.
+As the all event sources require an action and it has to be stored somewhere
+and be of some type, this is that type.
+    @param owner
+	Target of the function, can be used as a refcon.  The owner is set
+during initialisation.	 Note if a C++ function was specified this parameter
+is implicitly the first paramter in the target member function's parameter list.
+*/
+    typedef void (*Action)(OSObject *owner, ...);
+
+/*! @defined IOEventSourceAction
+    @discussion Backward compatibilty define for the old non-class scoped type definition.  See $link IOEventSource::Action */
+ #define IOEventSourceAction IOEventSource::Action
+
+protected:
+/*! @var eventChainNext
+	The next event source in the event chain. nil at end of chain. */
+    IOEventSource *eventChainNext;
+
+/*! @var owner The owner object called when an event has been delivered. */
+    OSObject *owner;
+
+/*! @var action
+	The action method called when an event has been delivered */
+    Action action;
+
+/*! @var enabled
+	Is this event source enabled to deliver requests to the work-loop. */
+    bool enabled;
+
+/*! @var workLoop What is the work-loop for this event source. */
+    IOWorkLoop *workLoop;
+
+/*! @var refcon What ever the client wants to do, see $link setRefcon. */
+    void *refcon;
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOEventSource in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+/*! @function init
+    @abstract Primary initialiser for the IOEventSource class.
+    @param owner
+	Owner of this instance of an event source.  Used as the first parameter
+of the action callout.	Owner will generally be an OSObject it doesn't have to
+be as no member functions will be called directly in it.  It can just be a
+refcon for a client routine.
+    @param action
+	Pointer to C call out function.	 Action is a pointer to a C function
+that gets called when this event source has outstanding work.  It will usually
+be called by the checkForWork member function.	The first parameter of the
+action call out will always be the owner, this allows C++ member functions to
+be used as actions.  Defaults to 0.
+    @result true if the inherited classes and this instance initialise
+successfully.
+*/
+    virtual bool init(OSObject *owner, IOEventSource::Action action = 0);
+
+/*! @function checkForWork
+    @abstract Pure Virtual member function used by IOWorkLoop for work
+scheduling.
+    @discussion This function will be called to request a subclass to check
+it's internal state for any work to do and then to call out the owner/action.
+    @result Return true if this function needs to be called again before all its outstanding events have been processed.
+        */
+    virtual bool checkForWork() = 0;
+
+/*! @function setWorkLoop
+    @abstract Set'ter for $link workLoop variable.
+    @param workLoop
+	Target work-loop of this event source instance.	 A subclass of
+IOWorkLoop that at least reacts to signalWorkAvailable() and onThread functions. 
+*/
+    virtual void setWorkLoop(IOWorkLoop *workLoop);
+
+/*! @function setNext
+    @abstract Set'ter for $link eventChainNext variable.
+    @param next
+	Pointer to another IOEventSource instance.
+*/
+    virtual void setNext(IOEventSource *next);
+
+/*! @function getNext
+    @abstract Get'ter for $link eventChainNext variable.
+    @result value of eventChainNext.
+*/
+    virtual IOEventSource *getNext() const;
+
+
+protected:
+    // Methods to access the IOWorkLoop exported fields
+    void signalWorkAvailable();
+    void openGate();
+    void closeGate();
+    bool tryCloseGate();
+    int sleepGate(void *event, UInt32 type);
+	int sleepGate(void *event, AbsoluteTime deadline, UInt32 type);
+    void wakeupGate(void *event, bool oneThread);
+
+public:
+/*! @function setAction
+    @abstract Set'ter for $link action variable.
+    @param action Pointer to a C function of type IOEventSource::Action. */
+    virtual void setAction(IOEventSource::Action action);
+
+/*! @function getAction
+    @abstract Get'ter for $link action variable.
+    @result value of action. */
+    virtual IOEventSource::Action getAction() const;
+
+/*! @function enable
+    @abstract Enable event source.
+    @discussion A subclass implementation is expected to respect the enabled
+state when checkForWork is called.  Calling this function will cause the
+work-loop to be signalled so that a checkForWork is performed. */
+    virtual void enable();
+
+/*! @function disable
+    @abstract Disable event source.
+    @discussion A subclass implementation is expected to respect the enabled
+state when checkForWork is called. */
+    virtual void disable();
+
+/*! @function isEnabled
+    @abstract Get'ter for $link enable variable.
+    @result true if enabled. */
+    virtual bool isEnabled() const;
+
+/*! @function getWorkLoop
+    @abstract Get'ter for $link workLoop variable.
+    @result value of workLoop. */
+    virtual IOWorkLoop *getWorkLoop() const;
+
+/*! @function onThread
+    @abstract Convenience function for workLoop->onThread.
+    @result true if called on the work-loop thread.
+*/
+    virtual bool onThread() const;
+
+private:
+    OSMetaClassDeclareReservedUnused(IOEventSource, 0);
+    OSMetaClassDeclareReservedUnused(IOEventSource, 1);
+    OSMetaClassDeclareReservedUnused(IOEventSource, 2);
+    OSMetaClassDeclareReservedUnused(IOEventSource, 3);
+    OSMetaClassDeclareReservedUnused(IOEventSource, 4);
+    OSMetaClassDeclareReservedUnused(IOEventSource, 5);
+    OSMetaClassDeclareReservedUnused(IOEventSource, 6);
+    OSMetaClassDeclareReservedUnused(IOEventSource, 7);
+};
+
+#endif /* !_IOKIT_IOEVENTSOURCE_H */
diff --git a/i386/include/IOKit/IOFilterInterruptEventSource.h b/i386/include/IOKit/IOFilterInterruptEventSource.h
new file mode 100644
index 0000000..de05c90
--- /dev/null
+++ b/i386/include/IOKit/IOFilterInterruptEventSource.h
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+Copyright (c) 1999 Apple Computer, Inc.	 All rights reserved.
+
+HISTORY
+    1999-4-15	Godfrey van der Linden(gvdl)
+	Created.
+*/
+#ifndef _IOKIT_IOFILTERINTERRUPTEVENTSOURCE_H
+#define _IOKIT_IOFILTERINTERRUPTEVENTSOURCE_H
+
+#include <IOKit/IOInterruptEventSource.h>
+
+class IOService;
+
+/*! @class IOFilterInterruptEventSource : public IOInterruptEventSource
+    @abstract Filtering varient of the $link IOInterruptEventSource.
+    @discussion An interrupt event source that calls the client to determine if a interrupt event needs to be scheduled on the work loop.  A filter interrupt event source call's the client in the primary interrupt context, the client can then interrogate its hardware and determine if the interrupt needs to be processed yet.
+<br><br>
+    As the routine is called in the primary interrupt context great care must be taken in the writing of this routine.  In general none of the generic IOKit environment is safe to call in this context.  We intend this routine to be used by hardware that can interrogate its registers without destroying state.  Primarily this variant of event sources will be used by drivers that share interrupts.  The filter routine will determine if the interrupt is a real interrupt or a ghost and thus optimise the work thread context switch away.
+<br><br>
+If you are implementing 'SoftDMA' (or pseudo-DMA), you may not want the I/O Kit to automatically start your interrupt handler routine on your work loop when your filter routine returns true.  In this case, you may choose to have your filter routine schedule the work on the work loop itself and then return false.  If you do this, the interrupt will not be disabled in hardware and you could receive additional primary interrupts before your work loop–level service routine completes.  Because this scheme has implications for synchronization between your filter routine and your interrupt service routine, you should avoid doing this unless your driver requires SoftDMA.
+<br><br>
+CAUTION:  Called in primary interrupt context, if you need to disable interrupt to guard you registers against an unexpected call then it is better to use a straight IOInterruptEventSource and its secondary interrupt delivery mechanism.
+*/
+class IOFilterInterruptEventSource : public IOInterruptEventSource
+{
+    OSDeclareDefaultStructors(IOFilterInterruptEventSource)
+
+public:
+/*!
+    @typedef Filter
+    @discussion C Function pointer to a routine to call when an interrupt occurs.
+    @param owner Pointer to the owning/client instance.
+    @param sender Where is the interrupt comming from.
+    @result false if this interrupt can be ignored. */
+    typedef bool (*Filter)(OSObject *, IOFilterInterruptEventSource *);
+
+/*! @defined IOFilterInterruptAction
+    @discussion Backward compatibilty define for the old non-class scoped type definition.  See $link IOFilterInterruptSource::Filter */
+#define IOFilterInterruptAction IOFilterInterruptEventSource::Filter
+
+private:
+    // Hide the superclass initializers
+    virtual bool init(OSObject *inOwner,
+		      IOInterruptEventSource::Action inAction = 0,
+		      IOService *inProvider = 0,
+		      int inIntIndex = 0);
+
+    static IOInterruptEventSource *
+	interruptEventSource(OSObject *inOwner,
+			     IOInterruptEventSource::Action inAction = 0,
+			     IOService *inProvider = 0,
+			     int inIntIndex = 0);
+
+protected:
+/*! @var filterAction Filter callout */
+    Filter filterAction;
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+public:
+/*! @function filterInterruptEventSource
+    @abstract Factor method to create and initialise an IOFilterInterruptEventSource.  See $link init.
+    @param owner Owner/client of this event source.
+    @param action 'C' Function to call when something happens.
+    @param filter 'C' Function to call when interrupt occurs.
+    @param provider Service that provides interrupts.
+    @param intIndex Defaults to 0.
+    @result a new event source if succesful, 0 otherwise.  */
+    static IOFilterInterruptEventSource *
+	filterInterruptEventSource(OSObject *owner,
+				   IOInterruptEventSource::Action action,
+				   Filter filter,
+				   IOService *provider,
+				   int intIndex = 0);
+
+/*! @function init
+    @abstract Primary initialiser for the IOFilterInterruptEventSource class.
+    @param owner Owner/client of this event source.
+    @param action 'C' Function to call when something happens.
+    @param filter 'C' Function to call in primary interrupt context.
+    @param provider Service that provides interrupts.
+    @param intIndex Interrupt source within provider.  Defaults to 0.
+    @result true if the inherited classes and this instance initialise
+successfully.  */
+    virtual bool init(OSObject *owner,
+		      IOInterruptEventSource::Action action,
+		      Filter filter,
+		      IOService *provider,
+		      int intIndex = 0);
+
+
+/*! @function signalInterrupt
+    @abstract Cause the work loop to schedule the action.
+    @discussion Cause the work loop to schedule the interrupt action even if the filter routine returns 'false'. Note well the interrupting condition MUST be cleared from the hardware otherwise an infinite process interrupt loop will occur.  Use this function when SoftDMA is desired.  See $link IOFilterInterruptSource::Filter */
+    virtual void signalInterrupt();
+
+/*! @function getFilterAction
+    @abstract Get'ter for filterAction variable.
+    @result value of filterAction. */
+    virtual Filter getFilterAction() const;
+
+/*! @function normalInterruptOccurred
+    @abstract Override $link IOInterruptEventSource::normalInterruptOccured to make a filter callout. */
+    virtual void normalInterruptOccurred(void *self, IOService *prov, int ind);
+
+/*! @function disableInterruptOccurred
+    @abstract Override $link IOInterruptEventSource::disableInterruptOccurred to make a filter callout. */
+    virtual void disableInterruptOccurred(void *self, IOService *prov, int ind);
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 0);
+    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 1);
+    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 2);
+    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 3);
+    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 4);
+    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 5);
+    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 6);
+    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 7);
+};
+
+#endif /* !_IOKIT_IOFILTERINTERRUPTEVENTSOURCE_H */
diff --git a/i386/include/IOKit/IOInterleavedMemoryDescriptor.h b/i386/include/IOKit/IOInterleavedMemoryDescriptor.h
new file mode 100644
index 0000000..e5c2a94
--- /dev/null
+++ b/i386/include/IOKit/IOInterleavedMemoryDescriptor.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOINTERLEAVEDMEMORYDESCRIPTOR_H
+#define _IOINTERLEAVEDMEMORYDESCRIPTOR_H
+
+#include <IOKit/IOMemoryDescriptor.h>
+
+/*! @class IOInterleavedMemoryDescriptor : public IOMemoryDescriptor
+    @abstract The IOInterleavedMemoryDescriptor object describes a memory area made up of portions of several other IOMemoryDescriptors.
+    @discussion The IOInterleavedMemoryDescriptor object represents interleaved ranges of memory, specified as an ordered list of portions of individual IOMemoryDescriptors.  The portions are chained end-to-end to make up a single contiguous buffer. */
+
+class IOInterleavedMemoryDescriptor : public IOMemoryDescriptor
+{
+    OSDeclareDefaultStructors(IOInterleavedMemoryDescriptor);
+
+protected:
+
+    IOByteCount           _descriptorCapacity;
+    UInt32                _descriptorCount;
+    IOMemoryDescriptor ** _descriptors;
+    IOByteCount         * _descriptorOffsets;
+    IOByteCount         * _descriptorLengths;
+    bool                  _descriptorPrepared;
+
+    virtual void free();
+
+public:
+
+/*! @function withCapacity
+    @abstract Create an IOInterleavedMemoryDescriptor to describe a memory area made up of several other IOMemoryDescriptors.
+    @discussion This method creates and initializes an IOInterleavedMemoryDescriptor for memory consisting of portions of a number of other IOMemoryDescriptors, chained end-to-end (in the order they appear in the array) to represent a single contiguous memory buffer.
+    @param capacity The maximum number of IOMemoryDescriptors that may be subsequently added to this IOInterleavedMemoryDescriptor.
+    @param direction An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
+    @result The created IOInterleavedMemoryDescriptor on success, to be released by the caller, or zero on failure. */
+
+    static IOInterleavedMemoryDescriptor * withCapacity( IOByteCount	       capacity,
+                                                         IODirection           direction);
+
+/*! @function initWithCapacity
+    @abstract Initialize an IOInterleavedMemoryDescriptor to describe a memory area made up of several other IOMemoryDescriptors.
+    @discussion This method initializes an IOInterleavedMemoryDescriptor for memory consisting of portions of a number of other IOMemoryDescriptors, chained end-to-end (in the order they appear in the array) to represent a single contiguous memory buffer.
+    @param capacity The maximum number of IOMemoryDescriptors that may be subsequently added to this IOInterleavedMemoryDescriptor.
+    @param direction An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
+    @result The created IOInterleavedMemoryDescriptor on success, to be released by the caller, or zero on failure. */
+
+    virtual bool initWithCapacity( IOByteCount           capacity,
+                                   IODirection           direction );
+
+/*! @function clearMemoryDescriptors
+    @abstract Clear all of the IOMemoryDescriptors currently contained in and reset the IOInterleavedMemoryDescriptor.
+    @discussion Clears each IOMemoryDescriptor by completing (if needed) and releasing.  The IOInterleavedMemoryDescriptor is then reset and may accept new descriptors up to the capacity specified when it was created.
+    @param direction An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures. */
+
+    virtual void clearMemoryDescriptors( IODirection direction = kIODirectionNone );
+
+/*! @function setMemoryDescriptor
+    @abstract Add a portion of an IOMemoryDescriptor to the IOInterleavedMemoryDescriptor.
+    @discussion This method adds the portion of an IOMemoryDescriptor described by the offset and length parameters to the end of the IOInterleavedMemoryDescriptor.  A single IOMemoryDescriptor may be added as many times as there is room for it.  The offset and length must describe a portion entirely within the IOMemoryDescriptor.
+    @param descriptor An IOMemoryDescriptor to be added to the IOInterleavedMemoryDescriptor.  Its direction must be compatible with that of the IOInterleavedMemoryDescriptor.
+    @param offset The offset into the IOMemoryDescriptor of the portion that will be added to the virtualized buffer.
+    @param length The length of the portion of the IOMemoryDescriptor to be added to the virtualized buffer. 
+    @result Returns true the portion was successfully added. */
+
+    virtual bool setMemoryDescriptor( IOMemoryDescriptor * descriptor,
+                                      IOByteCount offset,
+                                      IOByteCount length );
+
+/*! @function getPhysicalSegment
+    @abstract Break a memory descriptor into its physically contiguous segments.
+    @discussion This method returns the physical address of the byte at the given offset into the memory, and optionally the length of the physically contiguous segment from that offset.
+    @param offset A byte offset into the memory whose physical address to return.
+    @param length If non-zero, getPhysicalSegment will store here the length of the physically contiguous segement at the given offset.
+    @result A physical address, or zero if the offset is beyond the length of the memory. */
+
+    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
+                                         IOByteCount * length,
+                                         IOOptionBits  options = 0 );
+
+/*! @function prepare
+    @abstract Prepare the memory for an I/O transfer.
+    @discussion This involves paging in the memory, if necessary, and wiring it down for the duration of the transfer.  The complete() method completes the processing of the memory after the I/O transfer finishes.  This method need not called for non-pageable memory.
+    @param forDirection The direction of the I/O to be performed, or kIODirectionNone for the direction specified by the memory descriptor.
+    @result An IOReturn code. */
+
+    virtual IOReturn prepare(IODirection forDirection = kIODirectionNone);
+
+/*! @function complete
+    @abstract Complete processing of the memory after an I/O transfer finishes.
+    @discussion This method should not be called unless a prepare was previously issued; the prepare() and complete() must occur in pairs, before and after an I/O transfer involving pageable memory.
+    @param forDirection The direction of the I/O just completed, or kIODirectionNone for the direction specified by the memory descriptor.
+    @result An IOReturn code. */
+
+    virtual IOReturn complete(IODirection forDirection = kIODirectionNone);
+};
+
+#endif /* !_IOINTERLEAVEDMEMORYDESCRIPTOR_H */
diff --git a/i386/include/IOKit/IOInterruptController.h b/i386/include/IOKit/IOInterruptController.h
new file mode 100644
index 0000000..71f55e5
--- /dev/null
+++ b/i386/include/IOKit/IOInterruptController.h
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved.
+ *
+ *  DRI: Josh de Cesare
+ *  
+ */
+
+
+#ifndef _IOKIT_IOINTERRUPTCONTROLLER_H
+#define _IOKIT_IOINTERRUPTCONTROLLER_H
+
+#include <IOKit/IOLocks.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOInterrupts.h>
+
+
+class IOSharedInterruptController;
+
+struct IOInterruptVector {
+  volatile char               interruptActive;
+  volatile char               interruptDisabledSoft;
+  volatile char               interruptDisabledHard;
+  volatile char               interruptRegistered;
+  IOLock *                    interruptLock;
+  IOService *                 nub;
+  int                         source;
+  void *                      target;
+  IOInterruptHandler          handler;
+  void *                      refCon;
+  IOSharedInterruptController *sharedController;
+};
+
+typedef struct IOInterruptVector IOInterruptVector;
+
+#if __LP64__
+typedef int32_t IOInterruptVectorNumber;
+#else
+typedef long IOInterruptVectorNumber;
+#endif
+
+class IOInterruptController : public IOService
+{
+  OSDeclareAbstractStructors(IOInterruptController);
+
+protected:
+  IOInterruptVector *vectors;
+  IOSimpleLock      *controllerLock;
+
+  struct ExpansionData { };
+  ExpansionData *reserved;
+
+public:
+  virtual IOReturn registerInterrupt(IOService *nub, int source,
+				     void *target,
+				     IOInterruptHandler handler,
+				     void *refCon);
+  virtual IOReturn unregisterInterrupt(IOService *nub, int source);
+  
+  virtual IOReturn getInterruptType(IOService *nub, int source,
+				    int *interruptType);
+  
+  virtual IOReturn enableInterrupt(IOService *nub, int source);
+  virtual IOReturn disableInterrupt(IOService *nub, int source);
+  virtual IOReturn causeInterrupt(IOService *nub, int source);
+  
+  virtual IOInterruptAction getInterruptHandlerAddress(void);
+  virtual IOReturn handleInterrupt(void *refCon, IOService *nub,
+				   int source);
+  
+  // Methods to be overridden for simplifed interrupt controller subclasses.
+  
+  virtual bool vectorCanBeShared(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+  virtual void initVector(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+  virtual int  getVectorType(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+  virtual void disableVectorHard(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+  virtual void enableVector(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+  virtual void causeVector(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+
+  OSMetaClassDeclareReservedUnused(IOInterruptController, 0);
+  OSMetaClassDeclareReservedUnused(IOInterruptController, 1);
+  OSMetaClassDeclareReservedUnused(IOInterruptController, 2);
+  OSMetaClassDeclareReservedUnused(IOInterruptController, 3);
+  OSMetaClassDeclareReservedUnused(IOInterruptController, 4);
+  OSMetaClassDeclareReservedUnused(IOInterruptController, 5);
+};
+
+
+class IOSharedInterruptController : public IOInterruptController
+{
+  OSDeclareDefaultStructors(IOSharedInterruptController);
+  
+private:
+  IOService         *provider;
+  int               numVectors;
+  int               vectorsRegistered;
+  int               vectorsEnabled;
+  volatile int      controllerDisabled;
+  bool              sourceIsLevel;
+
+  struct ExpansionData { };
+  ExpansionData *reserved;
+
+public:
+  virtual IOReturn initInterruptController(IOInterruptController *parentController, OSData *parentSource);
+  
+  virtual IOReturn registerInterrupt(IOService *nub, int source,
+                                     void *target,
+                                     IOInterruptHandler handler,
+                                     void *refCon);
+  virtual IOReturn unregisterInterrupt(IOService *nub, int source);
+  
+  virtual IOReturn getInterruptType(IOService *nub, int source,
+				    int *interruptType);
+  
+  virtual IOReturn enableInterrupt(IOService *nub, int source);
+  virtual IOReturn disableInterrupt(IOService *nub, int source);
+  
+  virtual IOInterruptAction getInterruptHandlerAddress(void);
+  virtual IOReturn handleInterrupt(void *refCon, IOService *nub, int source);
+
+  OSMetaClassDeclareReservedUnused(IOSharedInterruptController, 0);
+  OSMetaClassDeclareReservedUnused(IOSharedInterruptController, 1);
+  OSMetaClassDeclareReservedUnused(IOSharedInterruptController, 2);
+  OSMetaClassDeclareReservedUnused(IOSharedInterruptController, 3);
+};
+
+
+#endif /* ! _IOKIT_IOINTERRUPTCONTROLLER_H */
diff --git a/i386/include/IOKit/IOInterruptEventSource.h b/i386/include/IOKit/IOInterruptEventSource.h
new file mode 100644
index 0000000..0be7caf
--- /dev/null
+++ b/i386/include/IOKit/IOInterruptEventSource.h
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+Copyright (c) 1998 Apple Computer, Inc.	 All rights reserved.
+
+HISTORY
+    1998-7-13	Godfrey van der Linden(gvdl)
+	Created.
+    1998-10-30	Godfrey van der Linden(gvdl)
+	Converted to C++
+*/
+
+#ifndef _IOKIT_IOINTERRUPTEVENTSOURCE_H
+#define _IOKIT_IOINTERRUPTEVENTSOURCE_H
+
+#include <IOKit/IOEventSource.h>
+
+class IOService;
+
+/*! @class IOInterruptEventSource : public IOEventSource
+    @abstract Event source for interrupt delivery to work-loop based drivers.
+    @discussion The IOInterruptEventSource is a generic object that delivers calls interrupt routines in it's client in a guaranteed single-threaded manner.  IOInterruptEventSource is part of the IOKit $link IOWorkLoop infrastructure where the semantic that one and only one action method is executing within a work-loops event chain.
+<br><br>
+When the action method is called in the client member function will receive 2 arguments, (IOEventSource *) sender and (int) count, See $link IOInterruptEventSource::Action.	Where sender will be reference to the interrupt that occurred and the count will be computed by the difference between the $link producerCount and $link consumerCount.  This number may not be reliable as no attempt is made to adjust for around the world type problems but is provided for general information and statistic gathering.
+<br><br>
+In general a client will use the factory member function to create and initialise the event source and then add it to their work-loop.  It is the work loop's responsiblity to maintain the new event source in it's event chain.  See $link IOWorkLoop.
+<br><br>
+An interrupt event source attaches itself to the given provider's interrupt source at initialisation time.  At this time it determines if it is connected to a level or edge triggered interrupt.  If the interrupt is an level triggered interrupt the event source automatically disables the interrupt source at primary interrupt time and after it call's the client it automatically reenables the interrupt.  This action is fairly expensive but it is 100% safe and defaults sensibly so that the driver writer does not have to implement type dependant interrupt routines.  So to repeat, the driver writer does not have to be concerned by the actual underlying interrupt mechanism as the event source hides the complexity.
+<br><br>
+Saying this if the hardware is a multi-device card, for instance a 4 port NIC, where all of the devices are sharing one level triggered interrupt AND it is possible to determine each port's interrupt state non-destructively then the $link IOFilterInterruptEventSource would be a better choice.
+<br><br>
+Warning:  All IOInterruptEventSources are created in the disabled state.  If you want to actually schedule interrupt delivery do not forget to enable the source.
+*/
+class IOInterruptEventSource : public IOEventSource
+{
+    OSDeclareDefaultStructors(IOInterruptEventSource)
+
+public:
+/*! @typedef Action
+    @discussion 'C' pointer prototype of functions that are called in a single threaded context when an interrupt occurs.
+    @param owner Pointer to client instance.
+    @param sender Pointer to generation interrupt event source.
+    @param count Number of interrupts seen before delivery. */
+    typedef void (*Action)(OSObject *, IOInterruptEventSource *, int count);
+
+/*! @defined IOInterruptEventAction
+    @discussion Backward compatibilty define for the old non-class scoped type definition.  See $link IOInterruptEventSource::Action */
+#define IOInterruptEventAction IOInterruptEventSource::Action
+
+protected:
+/*! @var provider IOService that provides interrupts for delivery. */
+    IOService *provider;
+
+/*! @var intIndex */
+    int intIndex;
+
+/*! @var producerCount
+    Current count of produced interrupts that have been received. */
+    volatile unsigned int producerCount;
+
+/*! @var consumerCount
+    Current count of produced interrupts that the owner has been informed of. */
+    unsigned int consumerCount;
+
+/*! @var autoDisable Do we need to automatically disable the interrupt source when we take an interrupt, i.e. we are level triggered. */
+    bool autoDisable;
+
+/*! @var explicitDisable Has the user expicitly disabled this event source, if so then do not overide their request when returning from the callout */
+    bool explicitDisable;
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+/*! @function free
+    @abstract Sub-class implementation of free method, disconnects from the interrupt source. */
+    virtual void free();
+
+/*! @function checkForWork
+    @abstract Pure Virtual member function used by IOWorkLoop for issueing a client calls.
+    @discussion This function called when the work-loop is ready to check for any work to do and then to call out the owner/action.
+    @result Return true if this function needs to be called again before all its outstanding events have been processed. */
+    virtual bool checkForWork();
+
+public:
+
+/*! @function interruptEventSource
+    @abstract Factory function for IOInterruptEventSources creation and initialisation.
+    @param owner Owning client of the new event source.
+    @param action 'C' Function to call when something happens.
+    @param provider IOService that represents the interrupt source.  Defaults to 0.  When no provider is defined the event source assumes that the client will in some manner call the interruptOccured method explicitly.  This will start the ball rolling for safe delivery of asynchronous event's into the driver.
+    @param intIndex The index of the interrupt within the provider's interrupt sources.  Defaults to 0, i.e. the first interrupt in the provider.
+    @result A new interrupt event source if successfully created and initialised, 0 otherwise.  */
+    static IOInterruptEventSource *
+	interruptEventSource(OSObject *owner,
+			     Action action,
+			     IOService *provider = 0,
+			     int intIndex = 0);
+
+/*! @function init
+    @abstract Primary initialiser for the IOInterruptEventSource class.
+    @param owner Owning client of the new event source.
+    @param action 'C' Function to call when something happens.
+    @param provider IOService that represents the interrupt source.  Defaults to 0.  When no provider is defined the event source assumes that the client will in some manner call the interruptOccured method explicitly.  This will start the ball rolling for safe delivery of asynchronous event's into the driver.
+    @param intIndex The index of the interrupt within the provider's interrupt sources.  Defaults to 0, i.e. the first interrupt in the provider.
+    @result true if the inherited classes and this instance initialise
+successfully.  */
+    virtual bool init(OSObject *owner,
+                      Action action,
+		      IOService *provider = 0,
+		      int intIndex = 0);
+
+/*! @function enable
+    @abstract Enable event source.
+    @discussion A subclass implementation is expected to respect the enabled
+state when checkForWork is called.  Calling this function will cause the
+work-loop to be signalled so that a checkForWork is performed. */
+    virtual void enable();
+
+/*! @function disable
+    @abstract Disable event source.
+    @discussion A subclass implementation is expected to respect the enabled
+state when checkForWork is called. */
+    virtual void disable();
+
+/*! @function getProvider
+    @abstract Get'ter for $link provider variable.
+    @result value of provider. */
+    virtual const IOService *getProvider() const;
+
+/*! @function getIntIndex
+    @abstract Get'ter for $link intIndex interrupt index variable.
+    @result value of intIndex. */
+    virtual int getIntIndex() const;
+
+/*! @function getAutoDisable
+    @abstract Get'ter for $link autoDisable variable.
+    @result value of autoDisable. */
+    virtual bool getAutoDisable() const;
+
+/*! @function interruptOccurred
+    @abstract Functions that get called by the interrupt controller. See $link IOService::registerInterrupt
+    @param nub Where did the interrupt originate from
+    @param ind What is this interrupts index within 'nub'. */
+    virtual void interruptOccurred(void *, IOService *nub, int ind);
+
+/*! @function normalInterruptOccurred
+    @abstract Functions that get called by the interrupt controller.See $link IOService::registerInterrupt
+    @param nub Where did the interrupt originate from
+    @param ind What is this interrupts index within 'nub'. */
+    virtual void normalInterruptOccurred(void *, IOService *nub, int ind);
+
+/*! @function disableInterruptOccurred
+    @abstract Functions that get called by the interrupt controller.See $link IOService::registerInterrupt
+    @param nub Where did the interrupt originate from
+    @param ind What is this interrupts index within 'nub'. */
+    virtual void disableInterruptOccurred(void *, IOService *nub, int ind);
+
+private:
+    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 0);
+    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 1);
+    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 2);
+    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 3);
+    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 4);
+    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 5);
+    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 6);
+    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 7);
+};
+
+#endif /* !_IOKIT_IOINTERRUPTEVENTSOURCE_H */
diff --git a/i386/include/IOKit/IOInterrupts.h b/i386/include/IOKit/IOInterrupts.h
new file mode 100644
index 0000000..fa8aa7b
--- /dev/null
+++ b/i386/include/IOKit/IOInterrupts.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
+ *
+ *  DRI: Josh de Cesare
+ *
+ */
+
+
+#ifndef _IOKIT_IOINTERRUPTS_H
+#define _IOKIT_IOINTERRUPTS_H
+
+#define kIOInterruptTypeEdge  (0)
+#define kIOInterruptTypeLevel (1)
+
+#ifdef __cplusplus
+
+class OSData;
+class IOInterruptController;
+
+struct IOInterruptSource {
+  IOInterruptController *interruptController;
+  OSData                *vectorData;
+};
+typedef struct IOInterruptSource IOInterruptSource;
+
+#endif /* __cplusplus */
+
+typedef void (*IOInterruptHandler)(void *target, void *refCon,
+				   void *nub, int source);
+
+#endif /* ! _IOKIT_IOINTERRUPTS_H */
diff --git a/i386/include/IOKit/IOKitDebug.h b/i386/include/IOKit/IOKitDebug.h
new file mode 100644
index 0000000..499faa3
--- /dev/null
+++ b/i386/include/IOKit/IOKitDebug.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOKITDEBUG_H
+#define _IOKIT_IOKITDEBUG_H
+
+#include <IOKit/IOTypes.h>
+
+
+#ifdef __cplusplus
+
+#include <libkern/c++/OSObject.h>
+#include <libkern/c++/OSDictionary.h>
+#include <libkern/c++/OSSerialize.h>
+
+class IOKitDiagnostics : public OSObject
+{
+    OSDeclareDefaultStructors(IOKitDiagnostics)
+
+public:
+    static OSObject * diagnostics( void );
+    virtual bool serialize(OSSerialize *s) const;
+private:
+    static void updateOffset( OSDictionary * dict,
+            UInt32 value, const char * name );
+};
+
+#endif /* __cplusplus */
+
+enum {
+    // loggage
+    kIOLogAttach        =         0x00000001ULL,
+    kIOLogProbe         =         0x00000002ULL,
+    kIOLogStart         =         0x00000004ULL,
+    kIOLogRegister      =         0x00000008ULL,
+    kIOLogMatch         =         0x00000010ULL,
+    kIOLogConfig        =         0x00000020ULL,
+    kIOLogYield         =         0x00000040ULL,
+    kIOLogPower         =         0x00000080ULL,
+    kIOLogMapping       =         0x00000100ULL,
+    kIOLogCatalogue     =         0x00000200ULL,
+    kIOLogTracePower    =         0x00000400ULL,
+    kIOLogDebugPower    =         0x00000800ULL,
+    kIOLogServiceTree   =         0x00001000ULL,
+    kIOLogDTree         =         0x00002000ULL,
+    kIOLogMemory        =         0x00004000ULL,
+    kIOLogKextMemory    =         0x00008000ULL,
+    kOSLogRegistryMods  =         0x00010000ULL,  // Log attempts to modify registry collections
+    kIOLogPMRootDomain  =         0x00020000ULL,
+    kOSRegistryModsMode =         0x00040000ULL,  // Change default registry modification handling - panic vs. log
+    kIOTraceIOService   =         0x00080000ULL,
+    kIOLogHibernate     =         0x00100000ULL,
+
+    // debug aids - change behaviour
+    kIONoFreeObjects    =         0x00100000ULL,
+    kIOLogSynchronous   =         0x00200000ULL,  // IOLog completes synchronously
+    kOSTraceObjectAlloc =         0x00400000ULL,
+
+    _kIODebugTopFlag    = 0x8000000000000000ULL   // force enum to be 64 bits
+};
+
+extern SInt64    gIOKitDebug;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct IORegistryPlane;
+extern void    IOPrintPlane( const struct IORegistryPlane * plane );
+#ifndef _OSCPPDEBUG_H
+extern void    OSPrintMemory( void );
+#endif
+#define IOPrintMemory OSPrintMemory
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* ! _IOKIT_IOKITDEBUG_H */
diff --git a/i386/include/IOKit/IOKitKeys.h b/i386/include/IOKit/IOKitKeys.h
new file mode 100644
index 0000000..62395d5
--- /dev/null
+++ b/i386/include/IOKit/IOKitKeys.h
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
+ *
+ * Common symbol definitions for IOKit. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOKITKEYS_H
+#define _IOKIT_IOKITKEYS_H
+
+// properties found in the registry root
+#define kIOKitBuildVersionKey		"IOKitBuildVersion"
+#define kIOKitDiagnosticsKey		"IOKitDiagnostics"
+	// a dictionary keyed by plane name
+#define kIORegistryPlanesKey		"IORegistryPlanes"
+#define kIOCatalogueKey			"IOCatalogue"
+
+// registry plane names
+#define kIOServicePlane			"IOService"
+#define kIOPowerPlane			"IOPower"
+#define kIODeviceTreePlane		"IODeviceTree"
+#define kIOAudioPlane			"IOAudio"
+#define kIOFireWirePlane		"IOFireWire"
+#define kIOUSBPlane			"IOUSB"
+
+// registry ID number
+#define kIORegistryEntryIDKey		"IORegistryEntryID"
+
+// IOService class name
+#define kIOServiceClass			"IOService"
+
+// IOResources class name
+#define kIOResourcesClass		"IOResources"
+
+// IOService driver probing property names
+#define kIOClassKey			"IOClass"
+#define kIOProbeScoreKey		"IOProbeScore"
+#define kIOKitDebugKey			"IOKitDebug"
+
+// IOService matching property names
+#define kIOProviderClassKey		"IOProviderClass"
+#define kIONameMatchKey			"IONameMatch"
+#define kIOPropertyMatchKey		"IOPropertyMatch"
+#define kIOPathMatchKey			"IOPathMatch"
+#define kIOLocationMatchKey		"IOLocationMatch"
+#define kIOParentMatchKey		"IOParentMatch"
+#define kIOResourceMatchKey		"IOResourceMatch"
+#define kIOMatchedServiceCountKey	"IOMatchedServiceCountMatch"
+
+#define kIONameMatchedKey		"IONameMatched"
+
+#define kIOMatchCategoryKey		"IOMatchCategory"
+#define kIODefaultMatchCategoryKey	"IODefaultMatchCategory"
+
+// IOService default user client class, for loadable user clients
+#define kIOUserClientClassKey		"IOUserClientClass"
+
+// key to find IOMappers
+#define kIOMapperIDKey				"IOMapperID"
+
+#define kIOUserClientCrossEndianKey		"IOUserClientCrossEndian"
+#define kIOUserClientCrossEndianCompatibleKey	"IOUserClientCrossEndianCompatible"
+#define kIOUserClientSharedInstanceKey		"IOUserClientSharedInstance"
+// diagnostic string describing the creating task
+#define kIOUserClientCreatorKey		"IOUserClientCreator"
+
+// IOService notification types
+#define kIOPublishNotification		"IOServicePublish"
+#define kIOFirstPublishNotification	"IOServiceFirstPublish"
+#define kIOMatchedNotification		"IOServiceMatched"
+#define kIOFirstMatchNotification	"IOServiceFirstMatch"
+#define kIOTerminatedNotification	"IOServiceTerminate"
+
+// IOService interest notification types
+#define kIOGeneralInterest		"IOGeneralInterest"
+#define kIOBusyInterest			"IOBusyInterest"
+#define kIOAppPowerStateInterest	"IOAppPowerStateInterest"
+#define kIOPriorityPowerStateInterest	"IOPriorityPowerStateInterest"
+
+#define kIOPlatformDeviceMessageKey     "IOPlatformDeviceMessage"
+
+// IOService interest notification types
+#define kIOCFPlugInTypesKey		"IOCFPlugInTypes"
+
+// properties found in services that implement command pooling
+#define kIOCommandPoolSizeKey	       "IOCommandPoolSize"          // (OSNumber)
+
+// properties found in services that have transfer constraints
+#define kIOMaximumBlockCountReadKey             "IOMaximumBlockCountRead"             // (OSNumber)
+#define kIOMaximumBlockCountWriteKey            "IOMaximumBlockCountWrite"            // (OSNumber)
+#define kIOMaximumByteCountReadKey              "IOMaximumByteCountRead"              // (OSNumber)
+#define kIOMaximumByteCountWriteKey             "IOMaximumByteCountWrite"             // (OSNumber)
+#define kIOMaximumSegmentCountReadKey           "IOMaximumSegmentCountRead"           // (OSNumber)
+#define kIOMaximumSegmentCountWriteKey          "IOMaximumSegmentCountWrite"          // (OSNumber)
+#define kIOMaximumSegmentByteCountReadKey       "IOMaximumSegmentByteCountRead"       // (OSNumber)
+#define kIOMaximumSegmentByteCountWriteKey      "IOMaximumSegmentByteCountWrite"      // (OSNumber)
+#define kIOMinimumSegmentAlignmentByteCountKey  "IOMinimumSegmentAlignmentByteCount"  // (OSNumber)
+#define kIOMaximumSegmentAddressableBitCountKey "IOMaximumSegmentAddressableBitCount" // (OSNumber)
+
+// properties found in services that wish to describe an icon
+//
+// IOIcon = 
+// {
+//     CFBundleIdentifier   = "com.example.driver.example";
+//     IOBundleResourceFile = "example.icns";
+// };
+//
+// where IOBundleResourceFile is the filename of the resource
+
+#define kIOIconKey               "IOIcon"               // (OSDictionary)
+#define kIOBundleResourceFileKey "IOBundleResourceFile" // (OSString)
+
+#define kIOBusBadgeKey           "IOBusBadge"           // (OSDictionary)
+#define kIODeviceIconKey         "IODeviceIcon"         // (OSDictionary)
+
+// property of root that describes the machine's serial number as a string
+#define kIOPlatformSerialNumberKey	"IOPlatformSerialNumber"	// (OSString)
+
+// property of root that describes the machine's UUID as a string
+#define kIOPlatformUUIDKey	"IOPlatformUUID"	// (OSString)
+
+// IODTNVRAM property keys
+#define kIONVRAMDeletePropertyKey	"IONVRAM-DELETE-PROPERTY"
+#define kIODTNVRAMPanicInfoKey		"aapl,panic-info"
+
+// keys for complex boot information
+#define kIOBootDeviceKey          "IOBootDevice"		// dict | array of dicts
+#define kIOBootDevicePathKey      "IOBootDevicePath"	// arch-neutral OSString
+#define kIOBootDeviceSizeKey      "IOBootDeviceSize"	// OSNumber of bytes
+
+// keys for OS Version information
+#define kOSBuildVersionKey		"OS Build Version"
+
+#endif /* ! _IOKIT_IOKITKEYS_H */
diff --git a/i386/include/IOKit/IOKitServer.h b/i386/include/IOKit/IOKitServer.h
new file mode 100644
index 0000000..a68c992
--- /dev/null
+++ b/i386/include/IOKit/IOKitServer.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+/*
+ * Internal definitions used between the iokit user library and
+ * server routines.
+ */
+
+#ifndef _IOKIT_IOKITSERVER_H
+#define _IOKIT_IOKITSERVER_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOKitKeys.h>
+#include <IOKit/OSMessageNotification.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <mach/kmod.h>
+#ifdef __cplusplus
+}
+#endif
+
+// IOMakeMatching
+/*!
+    @enum IOMakeMatching
+    @constant kIOServiceMatching
+    @constant kIOBSDNameMatching
+    @constant kIOOFPathMatching
+*/
+enum {
+    kIOServiceMatching		= 100,
+    kIOBSDNameMatching		= 101,
+    kIOOFPathMatching		= 102
+};
+
+// IOCatalogueSendData
+/*!
+    @enum IOCatalogueSendData user-client flags.
+    @constant kIOCatalogAddDrivers  Signals a call to the addDrivers function in IOCatalogue.
+    @constant kIOCatalogAddDriversNoMatch  Signals a call to the addDrivers function in IOCatalogue but does not start a matching thread.
+    @constant kIOCatalogRemoveDrivers  Signals a call to the removeDrivers function in IOCatalogue.
+    @constant kIOCatalogRemoveDriversNoMatch  Signals a call to the removedrivers function in IOCatalogue but does not start a matching thread. 
+    @constant kIOCatalogStartMatching  Signals the IOCatalogue to start an IOService matching thread.
+*/
+enum {
+    kIOCatalogAddDrivers	= 1,
+    kIOCatalogAddDriversNoMatch,
+    kIOCatalogRemoveDrivers,
+    kIOCatalogRemoveDriversNoMatch,
+    kIOCatalogStartMatching,
+    kIOCatalogRemoveKernelLinker,
+    kIOCatalogKextdActive,
+    kIOCatalogKextdFinishedLaunching
+};
+
+// IOCatalogueGetData
+/*!
+    @enum IOCatalogueGetData user-client flags
+    @constant kIOCatalogGetContents  Returns a snapshot of the database to the caller.
+*/
+enum {
+    kIOCatalogGetContents	  = 1,
+    kIOCatalogGetModuleDemandList = 2,
+    kIOCatalogGetCacheMissList	  = 3,
+    kIOCatalogGetROMMkextList     = 4
+};
+
+// IOCatalogueReset
+/*!
+    @enum IOCatalogueReset user-client flag
+    @constant kIOCatalogResetDefault  Removes all entries from IOCatalogue except those used for booting the system.
+*/
+enum {
+    kIOCatalogResetDefault	= 1
+};
+
+// IOCatalogueTerminate
+/*!
+    @enum IOCatalogueTerminate user-client flags.
+    @constant kIOCatalogModuleUnload Terminates all services which depend on a particular module and unloads the module.
+    @constant kIOCatalogModuleTerminate Terminates all services which depend on a particular module but does not unload the module.
+    @constant kIOCatalogServiceTerminate Terminates a particular service by name.
+*/
+enum {
+    kIOCatalogModuleUnload      = 1,
+    kIOCatalogModuleTerminate,
+    kIOCatalogServiceTerminate
+};
+
+#endif /* ! _IOKIT_IOKITSERVER_H */
+
diff --git a/i386/include/IOKit/IOLib.h b/i386/include/IOKit/IOLib.h
new file mode 100644
index 0000000..1eb5562
--- /dev/null
+++ b/i386/include/IOKit/IOLib.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+#ifndef __IOKIT_IOLIB_H
+#define __IOKIT_IOLIB_H
+
+
+#include <stdarg.h>
+#include <sys/cdefs.h>
+
+#include <sys/appleapiopts.h>
+
+#include <IOKit/system.h>
+
+#include <IOKit/IOReturn.h>
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOLocks.h>
+
+#include <libkern/OSAtomic.h>
+
+__BEGIN_DECLS
+
+#include <kern/thread_call.h>
+#include <kern/clock.h>
+
+/*
+ * min/max macros.
+ */
+
+#define min(a,b) ((a) < (b) ? (a) : (b))
+#define max(a,b) ((a) > (b) ? (a) : (b))
+
+/*
+ * These are opaque to the user.
+ */
+typedef thread_t IOThread;
+typedef void (*IOThreadFunc)(void *argument);
+
+
+/*
+ * IORound and IOTrunc convenience functions, in the spirit
+ * of vm's round_page() and trunc_page().
+ */
+#define IORound(value,multiple) \
+        ((((value) + (multiple) - 1) / (multiple)) * (multiple))
+
+#define IOTrunc(value,multiple) \
+        (((value) / (multiple)) * (multiple));
+
+__END_DECLS
+
+#endif /* !__IOKIT_IOLIB_H */
diff --git a/i386/include/IOKit/IOLocks.h b/i386/include/IOKit/IOLocks.h
new file mode 100644
index 0000000..81701a0
--- /dev/null
+++ b/i386/include/IOKit/IOLocks.h
@@ -0,0 +1,409 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ *
+ */
+
+#ifndef __IOKIT_IOLOCKS_H
+#define __IOKIT_IOLOCKS_H
+
+
+#include <sys/appleapiopts.h>
+
+#include <IOKit/system.h>
+
+#include <IOKit/IOReturn.h>
+#include <IOKit/IOTypes.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <libkern/locks.h>
+#include <machine/machine_routines.h>
+
+/*! @var IOLockGroup
+    Global lock group used by all IOKit locks.  To simplify kext debugging and lock-heat analysis, consider using lck_* locks with a per-driver lock group, as defined in kern/locks.h.
+*/
+extern lck_grp_t	*IOLockGroup;
+
+
+/*
+ * Mutex lock operations
+ */
+
+#ifdef	IOLOCKS_INLINE
+typedef lck_mtx_t	IOLock;
+#else
+typedef struct _IOLock	IOLock;
+#endif	/* IOLOCKS_INLINE */
+
+
+/*! @function IOLockAlloc
+    @abstract Allocates and initializes a mutex.
+    @discussion Allocates a mutex in general purpose memory, and initializes it. Mutexes are general purpose blocking mutual exclusion locks, supplied by libkern/locks.h. This function may block and so should not be called from interrupt level or while a spin lock is held.  IOLocks use the global IOKit lock group, IOLockGroup.  To simplify kext debugging and lock-heat analysis, consider using lck_* locks with a per-driver lock group, as defined in kern/locks.h.
+    @result Pointer to the allocated lock, or zero on failure. */
+
+IOLock * IOLockAlloc( void );
+
+/*! @function IOLockFree
+    @abstract Frees a mutex.
+    @discussion Frees a lock allocated with IOLockAlloc. Any blocked waiters will not be woken.
+    @param lock Pointer to the allocated lock. */
+
+void	IOLockFree( IOLock * lock);
+
+/*! @function IOLockGetMachLock
+    @abstract Accessor to a Mach mutex.
+    @discussion Accessor to the Mach mutex.
+    @param lock Pointer to the allocated lock. */
+
+lck_mtx_t * IOLockGetMachLock( IOLock * lock);
+
+/*! @function IOLockLock
+    @abstract Lock a mutex.
+    @discussion Lock the mutex. If the lock is held by any thread, block waiting for its unlock. This function may block and so should not be called from interrupt level or while a spin lock is held. Locking the mutex recursively from one thread will result in deadlock. 
+    @param lock Pointer to the allocated lock. */
+
+#ifdef	IOLOCKS_INLINE
+#define IOLockLock(l)	lck_mtx_lock(l)
+#else
+void	IOLockLock( IOLock * lock);
+#endif	/* !IOLOCKS_INLINE */
+
+/*! @function IOLockTryLock
+    @abstract Attempt to lock a mutex.
+    @discussion Lock the mutex if it is currently unlocked, and return true. If the lock is held by any thread, return false.
+    @param lock Pointer to the allocated lock.
+    @result True if the mutex was unlocked and is now locked by the caller, otherwise false. */
+
+#ifdef	IOLOCKS_INLINE
+#define IOLockTryLock(l)	lck_mtx_try_lock(l)
+#else
+boolean_t IOLockTryLock( IOLock * lock);
+#endif	/* !IOLOCKS_INLINE */
+
+/*! @function IOLockUnlock
+    @abstract Unlock a mutex.
+@discussion Unlock the mutex and wake any blocked waiters. Results are undefined if the caller has not locked the mutex. This function may block and so should not be called from interrupt level or while a spin lock is held. 
+    @param lock Pointer to the allocated lock. */
+
+#ifdef	IOLOCKS_INLINE
+#define IOLockUnlock(l)	lck_mtx_unlock(l)
+#else
+#if	defined(__i386__)
+void	IOLockUnlock( IOLock * lock) __DARWIN10_ALIAS(IOLockUnlock);
+#else	/* !__i386__ */
+void	IOLockUnlock( IOLock * lock);
+#endif	/* __i386__ */
+#endif	/* !IOLOCKS_INLINE */
+
+/*! @function IOLockSleep
+    @abstract Sleep with mutex unlock and relock
+@discussion Prepare to sleep,unlock the mutex, and re-acquire it on wakeup. Results are undefined if the caller has not locked the mutex. This function may block and so should not be called from interrupt level or while a spin lock is held. 
+    @param lock Pointer to the locked lock. 
+    @param event The event to sleep on.
+    @param interType How can the sleep be interrupted.
+	@result The wait-result value indicating how the thread was awakened.*/
+int	IOLockSleep( IOLock * lock, void *event, UInt32 interType);
+
+int	IOLockSleepDeadline( IOLock * lock, void *event,
+				AbsoluteTime deadline, UInt32 interType);
+
+void	IOLockWakeup(IOLock * lock, void *event, bool oneThread);
+
+#ifdef __APPLE_API_OBSOLETE
+
+/* The following API is deprecated */
+
+typedef enum {
+    kIOLockStateUnlocked	= 0,
+    kIOLockStateLocked		= 1
+} IOLockState;
+
+void	IOLockInitWithState( IOLock * lock, IOLockState state);
+#define	IOLockInit( l )	IOLockInitWithState( l, kIOLockStateUnlocked);
+
+static __inline__ void IOTakeLock( IOLock * lock) { IOLockLock(lock); 	     }
+static __inline__ boolean_t IOTryLock(  IOLock * lock) { return(IOLockTryLock(lock)); }
+static __inline__ void IOUnlock(   IOLock * lock) { IOLockUnlock(lock);	     }
+
+#endif /* __APPLE_API_OBSOLETE */
+
+/*
+ * Recursive lock operations
+ */
+
+typedef struct _IORecursiveLock IORecursiveLock;
+
+/*! @function IORecursiveLockAlloc
+    @abstract Allocates and initializes an recursive lock.
+    @discussion Allocates a recursive lock in general purpose memory, and initializes it. Recursive locks function identically to mutexes but allow one thread to lock more than once, with balanced unlocks.  IORecursiveLocks use the global IOKit lock group, IOLockGroup.  To simplify kext debugging and lock-heat analysis, consider using lck_* locks with a per-driver lock group, as defined in kern/locks.h.
+    @result Pointer to the allocated lock, or zero on failure. */
+
+IORecursiveLock * IORecursiveLockAlloc( void );
+
+/*! @function IORecursiveLockFree
+    @abstract Frees a recursive lock.
+    @discussion Frees a lock allocated with IORecursiveLockAlloc. Any blocked waiters will not be woken.
+    @param lock Pointer to the allocated lock. */
+
+void		IORecursiveLockFree( IORecursiveLock * lock);
+
+/*! @function IORecursiveLockGetMachLock
+    @abstract Accessor to a Mach mutex.
+    @discussion Accessor to the Mach mutex.
+    @param lock Pointer to the allocated lock. */
+
+lck_mtx_t * IORecursiveLockGetMachLock( IORecursiveLock * lock);
+
+/*! @function IORecursiveLockLock
+    @abstract Lock a recursive lock.
+    @discussion Lock the recursive lock. If the lock is held by another thread, block waiting for its unlock. This function may block and so should not be called from interrupt level or while a spin lock is held. The lock may be taken recursively by the same thread, with a balanced number of calls to IORecursiveLockUnlock.
+    @param lock Pointer to the allocated lock. */
+
+void		IORecursiveLockLock( IORecursiveLock * lock);
+
+/*! @function IORecursiveLockTryLock
+    @abstract Attempt to lock a recursive lock.
+    @discussion Lock the lock if it is currently unlocked, or held by the calling thread, and return true. If the lock is held by another thread, return false. Successful calls to IORecursiveLockTryLock should be balanced with calls to IORecursiveLockUnlock.
+    @param lock Pointer to the allocated lock.
+    @result True if the lock is now locked by the caller, otherwise false. */
+
+boolean_t	IORecursiveLockTryLock( IORecursiveLock * lock);
+
+/*! @function IORecursiveLockUnlock
+    @abstract Unlock a recursive lock.
+@discussion Undo one call to IORecursiveLockLock, if the lock is now unlocked wake any blocked waiters. Results are undefined if the caller does not balance calls to IORecursiveLockLock with IORecursiveLockUnlock. This function may block and so should not be called from interrupt level or while a spin lock is held.
+    @param lock Pointer to the allocated lock. */
+
+void		IORecursiveLockUnlock( IORecursiveLock * lock);
+
+/*! @function IORecursiveLockHaveLock
+    @abstract Check if a recursive lock is held by the calling thread.
+    @discussion If the lock is held by the calling thread, return true, otherwise the lock is unlocked, or held by another thread and false is returned.
+    @param lock Pointer to the allocated lock.
+    @result True if the calling thread holds the lock otherwise false. */
+
+boolean_t	IORecursiveLockHaveLock( const IORecursiveLock * lock);
+
+extern int	IORecursiveLockSleep( IORecursiveLock *_lock,
+                                      void *event, UInt32 interType);
+extern int	IORecursiveLockSleepDeadline( IORecursiveLock * _lock, void *event,
+											AbsoluteTime deadline, UInt32 interType);
+extern void	IORecursiveLockWakeup( IORecursiveLock *_lock,
+                                       void *event, bool oneThread);
+
+/*
+ * Complex (read/write) lock operations
+ */
+
+#ifdef	IOLOCKS_INLINE
+typedef lck_rw_t		IORWLock;
+#else
+typedef struct _IORWLock	IORWLock;
+#endif	/* IOLOCKS_INLINE */
+
+/*! @function IORWLockAlloc
+    @abstract Allocates and initializes a read/write lock.
+    @discussion Allocates and initializes a read/write lock in general purpose memory. Read/write locks provide for multiple readers, one exclusive writer, and are supplied by libkern/locks.h. This function may block and so should not be called from interrupt level or while a spin lock is held.  IORWLocks use the global IOKit lock group, IOLockGroup.  To simplify kext debugging and lock-heat analysis, consider using lck_* locks with a per-driver lock group, as defined in kern/locks.h.
+    @result Pointer to the allocated lock, or zero on failure. */
+
+IORWLock * IORWLockAlloc( void );
+
+/*! @function IORWLockFree
+   @abstract Frees a read/write lock.
+   @discussion Frees a lock allocated with IORWLockAlloc. Any blocked waiters will not be woken.
+    @param lock Pointer to the allocated lock. */
+
+void	IORWLockFree( IORWLock * lock);
+
+/*! @function IORWLockGetMachLock
+    @abstract Accessor to a Mach read/write lock.
+    @discussion Accessor to the Mach read/write lock.
+    @param lock Pointer to the allocated lock. */
+
+lck_rw_t * IORWLockGetMachLock( IORWLock * lock);
+
+/*! @function IORWLockRead
+    @abstract Lock a read/write lock for read.
+@discussion Lock the lock for read, allowing multiple readers when there are no writers. If the lock is held for write, block waiting for its unlock. This function may block and so should not be called from interrupt level or while a spin lock is held. Locking the lock recursively from one thread, for read or write, can result in deadlock.
+    @param lock Pointer to the allocated lock. */
+
+#ifdef	IOLOCKS_INLINE
+#define IORWLockRead(l)	lck_rw_lock_shared(l)
+#else
+void	IORWLockRead(IORWLock * lock);
+#endif	/* !IOLOCKS_INLINE */
+
+/*! @function IORWLockWrite
+    @abstract Lock a read/write lock for write.
+    @discussion Lock the lock for write, allowing one writer exlusive access. If the lock is held for read or write, block waiting for its unlock. This function may block and so should not be called from interrupt level or while a spin lock is held. Locking the lock recursively from one thread, for read or write, can result in deadlock.
+    @param lock Pointer to the allocated lock. */
+
+#ifdef	IOLOCKS_INLINE
+#define IORWLockWrite(l)	lck_rw_lock_exclusive(l)
+#else
+void	IORWLockWrite( IORWLock * lock);
+#endif	/* !IOLOCKS_INLINE */
+
+/*! @function IORWLockUnlock
+    @abstract Unlock a read/write lock.
+    @discussion Undo one call to IORWLockRead or IORWLockWrite. Results are undefined if the caller has not locked the lock. This function may block and so should not be called from interrupt level or while a spin lock is held.
+    @param lock Pointer to the allocated lock. */
+
+#ifdef	IOLOCKS_INLINE
+#define IORWLockUnlock(l)	lck_rw_done(l)
+#else
+void	IORWLockUnlock( IORWLock * lock);
+#endif	/* !IOLOCKS_INLINE */
+
+
+#ifdef __APPLE_API_OBSOLETE
+
+/* The following API is deprecated */
+
+static __inline__ void IOReadLock( IORWLock * lock)   { IORWLockRead(lock);   }
+static __inline__ void IOWriteLock(  IORWLock * lock) { IORWLockWrite(lock);  }
+static __inline__ void IORWUnlock(   IORWLock * lock) { IORWLockUnlock(lock); }
+
+#endif /* __APPLE_API_OBSOLETE */
+
+
+/*
+ * Simple locks. Cannot block while holding a simple lock.
+ */
+
+#ifdef	IOLOCKS_INLINE
+typedef lck_spin_t		IOSimpleLock;
+#else
+typedef struct _IOSimpleLock	IOSimpleLock;
+#endif	/* IOLOCKS_INLINE */
+
+/*! @function IOSimpleLockAlloc
+    @abstract Allocates and initializes a spin lock.
+    @discussion Allocates and initializes a spin lock in general purpose memory. Spin locks provide non-blocking mutual exclusion for synchronization between thread context and interrupt context, or for multiprocessor synchronization, and are supplied by libkern/locks.h. This function may block and so should not be called from interrupt level or while a spin lock is held.  IOSimpleLocks use the global IOKit lock group, IOLockGroup.  To simplify kext debugging and lock-heat analysis, consider using lck_* locks with a per-driver lock group, as defined in kern/locks.h.
+    @result Pointer to the allocated lock, or zero on failure. */
+
+IOSimpleLock * IOSimpleLockAlloc( void );
+
+/*! @function IOSimpleLockFree
+    @abstract Frees a spin lock.
+    @discussion Frees a lock allocated with IOSimpleLockAlloc.
+    @param lock Pointer to the lock. */
+
+void IOSimpleLockFree( IOSimpleLock * lock );
+
+/*! @function IOSimpleLockGetMachLock
+    @abstract Accessor to a Mach spin lock.
+    @discussion Accessor to the Mach spin lock.
+    @param lock Pointer to the allocated lock. */
+
+lck_spin_t * IOSimpleLockGetMachLock( IOSimpleLock * lock);
+
+/*! @function IOSimpleLockInit
+    @abstract Initialize a spin lock.
+    @discussion Initialize an embedded spin lock, to the unlocked state.
+    @param lock Pointer to the lock. */
+
+void IOSimpleLockInit( IOSimpleLock * lock );
+
+/*! @function IOSimpleLockLock
+    @abstract Lock a spin lock.
+@discussion Lock the spin lock. If the lock is held, spin waiting for its unlock. Spin locks disable preemption, cannot be held across any blocking operation, and should be held for very short periods. When used to synchronize between interrupt context and thread context they should be locked with interrupts disabled - IOSimpleLockLockDisableInterrupt() will do both. Locking the lock recursively from one thread will result in deadlock.
+    @param lock Pointer to the lock. */
+
+#ifdef	IOLOCKS_INLINE
+#define IOSimpleLockLock(l)	lck_spin_lock(l)
+#else
+void IOSimpleLockLock( IOSimpleLock * lock );
+#endif	/* !IOLOCKS_INLINE */
+
+
+/*! @function IOSimpleLockTryLock
+    @abstract Attempt to lock a spin lock.
+@discussion Lock the spin lock if it is currently unlocked, and return true. If the lock is held, return false. Successful calls to IOSimpleLockTryLock should be balanced with calls to IOSimpleLockUnlock. 
+    @param lock Pointer to the lock.
+    @result True if the lock was unlocked and is now locked by the caller, otherwise false. */
+
+#ifdef	IOLOCKS_INLINE
+#define IOSimpleLockTryLock(l)	lck_spin_try_lock(l)
+#else
+boolean_t IOSimpleLockTryLock( IOSimpleLock * lock );
+#endif	/* !IOLOCKS_INLINE */
+
+/*! @function IOSimpleLockUnlock
+    @abstract Unlock a spin lock.
+    @discussion Unlock the lock, and restore preemption. Results are undefined if the caller has not locked the lock.
+    @param lock Pointer to the lock. */
+
+#ifdef	IOLOCKS_INLINE
+#define IOSimpleLockUnlock(l)	lck_spin_unlock(l)
+#else
+void IOSimpleLockUnlock( IOSimpleLock * lock );
+#endif	/* !IOLOCKS_INLINE */
+
+#if __LP64__
+typedef boolean_t IOInterruptState;
+#else
+typedef long int IOInterruptState;
+#endif
+
+/*! @function IOSimpleLockLockDisableInterrupt
+    @abstract Lock a spin lock.
+    @discussion Lock the spin lock. If the lock is held, spin waiting for its unlock. Simple locks disable preemption, cannot be held across any blocking operation, and should be held for very short periods. When used to synchronize between interrupt context and thread context they should be locked with interrupts disabled - IOSimpleLockLockDisableInterrupt() will do both. Locking the lock recursively from one thread will result in deadlock.
+    @param lock Pointer to the lock. */
+
+static __inline__
+IOInterruptState IOSimpleLockLockDisableInterrupt( IOSimpleLock * lock )
+{
+    IOInterruptState	state = ml_set_interrupts_enabled( false );
+    IOSimpleLockLock( lock );
+    return( state );
+}
+
+/*! @function IOSimpleLockUnlockEnableInterrupt
+    @abstract Unlock a spin lock, and restore interrupt state.
+    @discussion Unlock the lock, and restore preemption and interrupts to the state as they were when the lock was taken. Results are undefined if the caller has not locked the lock.
+    @param lock Pointer to the lock.
+    @param state The interrupt state returned by IOSimpleLockLockDisableInterrupt() */
+
+static __inline__
+void IOSimpleLockUnlockEnableInterrupt( IOSimpleLock * lock,
+					IOInterruptState state )
+{
+    IOSimpleLockUnlock( lock );
+    ml_set_interrupts_enabled( state );
+}
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* !__IOKIT_IOLOCKS_H */
+
diff --git a/i386/include/IOKit/IOMapper.h b/i386/include/IOKit/IOMapper.h
new file mode 100644
index 0000000..d877974
--- /dev/null
+++ b/i386/include/IOKit/IOMapper.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 1998-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef __IOKIT_IOMAPPER_H
+#define __IOKIT_IOMAPPER_H
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+#include <IOKit/IOTypes.h>
+#include <mach/vm_types.h>
+
+// These are C accessors to the system mapper for non-IOKit clients
+ppnum_t IOMapperIOVMAlloc(unsigned pages);
+void IOMapperIOVMFree(ppnum_t addr, unsigned pages);
+
+ppnum_t IOMapperInsertPage(ppnum_t addr, unsigned offset, ppnum_t page);
+void IOMapperInsertPPNPages(ppnum_t addr, unsigned offset,
+                            ppnum_t *pageList, unsigned pageCount);
+void IOMapperInsertUPLPages(ppnum_t addr, unsigned offset,
+                            upl_page_info_t *pageList, unsigned pageCount);
+
+mach_vm_address_t IOMallocPhysical(mach_vm_size_t size, mach_vm_address_t mask);
+
+void IOFreePhysical(mach_vm_address_t address, mach_vm_size_t size);
+
+__END_DECLS
+
+#if __cplusplus
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOMemoryDescriptor.h>
+
+class OSData;
+class IODMACommand;
+
+extern const OSSymbol * gIOMapperIDKey;
+
+class IOMapper : public IOService
+{
+    OSDeclareAbstractStructors(IOMapper);
+
+    // Give the platform expert access to setMapperRequired();
+    friend class IOPlatformExpert;
+
+private:
+    enum SystemMapperState {
+        kNoMapper  = 0,
+        kUnknown   = 1,
+        kHasMapper = 2,	// Any other value is pointer to a live mapper
+        kWaitMask  = 3,
+    };
+protected:
+    void *fTable;
+    ppnum_t fTablePhys;
+    IOItemCount fTableSize;
+    OSData *fTableHandle;
+    bool fIsSystem;
+
+
+    static void setMapperRequired(bool hasMapper);
+    static void waitForSystemMapper();
+
+    virtual bool initHardware(IOService *provider) = 0;
+
+    virtual bool allocTable(IOByteCount size);
+
+public:
+    virtual bool start(IOService *provider);
+    virtual void free();
+
+    // Static routines capable of allocating tables that are physically
+    // contiguous in real memory space.
+    static OSData * NewARTTable(IOByteCount size,
+                                void ** virtAddrP, ppnum_t *physAddrP);
+    static void FreeARTTable(OSData *handle, IOByteCount size);
+
+
+    // To get access to the system mapper IOMapper::gSystem 
+    static IOMapper *gSystem;
+
+    virtual ppnum_t iovmAlloc(IOItemCount pages) = 0;
+    virtual void iovmFree(ppnum_t addr, IOItemCount pages) = 0;
+
+    virtual void iovmInsert(ppnum_t addr, IOItemCount offset, ppnum_t page) = 0;
+    virtual void iovmInsert(ppnum_t addr, IOItemCount offset,
+                            ppnum_t *pageList, IOItemCount pageCount);
+    virtual void iovmInsert(ppnum_t addr, IOItemCount offset,
+                            upl_page_info_t *pageList, IOItemCount pageCount);
+
+    static void checkForSystemMapper()
+        { if ((uintptr_t) gSystem & kWaitMask) waitForSystemMapper(); };
+
+    static IOMapper * copyMapperForDevice(IOService * device);
+
+	
+    // Function will panic if the given address is not found in a valid
+    // iovm mapping.
+    virtual addr64_t mapAddr(IOPhysicalAddress addr) = 0;
+
+    // Get the address mask to or into an address to bypass this mapper
+    virtual bool getBypassMask(addr64_t *maskP) const;
+
+    virtual ppnum_t iovmAllocDMACommand(IODMACommand * command, IOItemCount pageCount);
+    virtual void iovmFreeDMACommand(IODMACommand * command, ppnum_t addr, IOItemCount pageCount);
+    
+    OSMetaClassDeclareReservedUsed(IOMapper, 0);
+    OSMetaClassDeclareReservedUsed(IOMapper, 1);
+    OSMetaClassDeclareReservedUsed(IOMapper, 2);
+
+private:
+    OSMetaClassDeclareReservedUnused(IOMapper, 3);
+    OSMetaClassDeclareReservedUnused(IOMapper, 4);
+    OSMetaClassDeclareReservedUnused(IOMapper, 5);
+    OSMetaClassDeclareReservedUnused(IOMapper, 6);
+    OSMetaClassDeclareReservedUnused(IOMapper, 7);
+    OSMetaClassDeclareReservedUnused(IOMapper, 8);
+    OSMetaClassDeclareReservedUnused(IOMapper, 9);
+    OSMetaClassDeclareReservedUnused(IOMapper, 10);
+    OSMetaClassDeclareReservedUnused(IOMapper, 11);
+    OSMetaClassDeclareReservedUnused(IOMapper, 12);
+    OSMetaClassDeclareReservedUnused(IOMapper, 13);
+    OSMetaClassDeclareReservedUnused(IOMapper, 14);
+    OSMetaClassDeclareReservedUnused(IOMapper, 15);
+};
+
+#endif /* __cplusplus */
+
+#endif /* !__IOKIT_IOMAPPER_H */
diff --git a/i386/include/IOKit/IOMemoryCursor.h b/i386/include/IOKit/IOMemoryCursor.h
new file mode 100644
index 0000000..dfe9eed
--- /dev/null
+++ b/i386/include/IOKit/IOMemoryCursor.h
@@ -0,0 +1,462 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOMEMORYCURSOR_H
+#define _IOMEMORYCURSOR_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOTypes.h>
+
+class IOMemoryDescriptor;
+
+/**************************** class IOMemoryCursor ***************************/
+
+/*!
+    @class IOMemoryCursor
+    @abstract A mechanism to convert memory references to physical addresses.
+    @discussion The IOMemoryCursor declares the super class that all
+specific memory cursors must inherit from, but a memory cursor can be created without a specific format subclass by just providing a segment function to the initializers.  This class does the difficult stuff of dividing a memory descriptor into a physical scatter/gather list appropriate for the target hardware.
+<br><br>
+    A driver is expected to create a memory cursor and configure it to the limitations of its DMA hardware; for instance the memory cursor used by the FireWire SBP-2 protocol has a maximum physical segment size of 2^16 - 1 but the actual transfer size is unlimited.  Thus it would create a cursor with a maxSegmentSize of 65535 and a maxTransfer size of UINT_MAX.   It would also provide a SegmentFunction that can output a pagelist entry.
+<br><br>
+Below is the simplest example of a SegmentFunction:<br>
+void IONaturalMemoryCursor::outputSegment(PhysicalSegment segment,<br>
+					  void *	  outSegments,<br>
+					  UInt32	  outSegmentIndex)<br>
+{<br>
+    ((PhysicalSegment *) outSegments)[outSegmentIndex] = segment;<br>
+}
+
+*/
+class IOMemoryCursor : public OSObject
+{
+    OSDeclareDefaultStructors(IOMemoryCursor)
+
+public:
+/*!
+    @typedef PhysicalSegment
+    @discussion A physical address/length pair.
+*/
+    struct PhysicalSegment
+    {
+	IOPhysicalAddress location;
+	IOPhysicalLength  length;
+    };
+
+/*! @defined IOPhysicalSegment
+    @discussion Backward compatibility define for the old non-class scoped type definition.  See IOMemoryCursor::PhysicalSegment 
+*/
+#define IOPhysicalSegment IOMemoryCursor::PhysicalSegment
+
+/*!
+    @typedef SegmentFunction
+    @discussion Pointer to a C function that outputs a single physical segment to an element in the array as defined by the segments and segmentIndex parameters.
+    @param segment The physical address and length that is next to be output.
+    @param segments Base of the output vector of DMA address length pairs.
+    @param segmentIndex Index to output 'segment' in the 'segments' array.
+*/
+    typedef void (*SegmentFunction)(PhysicalSegment segment,
+				    void *	    segments,
+				    UInt32	    segmentIndex);
+
+/*! @defined OutputSegmentFunc
+    @discussion Backward compatibility define for the old non-class scoped type definition.  See IOMemoryCursor::SegmentFunction */
+#define OutputSegmentFunc IOMemoryCursor::SegmentFunction
+
+protected:
+/*! @var outSeg The action method called when an event has been delivered */
+    SegmentFunction outSeg;
+
+/*! @var maxSegmentSize Maximum size of one segment in a scatter/gather list */
+    IOPhysicalLength  maxSegmentSize;
+
+/*! @var maxTransferSize
+    Maximum size of a transfer that this memory cursor is allowed to generate */
+    IOPhysicalLength  maxTransferSize;
+
+/*! @var alignMask
+    Currently unused.  Reserved for automated aligment restriction code. */
+    IOPhysicalLength  alignMask;
+
+public:
+/*! @function withSpecification
+    @abstract Creates and initializes an IOMemoryCursor in one operation.
+    @discussion Factory function to create and initialize an IOMemoryCursor in one operation.  For more information, see IOMemoryCursor::initWithSpecification.
+    @param outSegFunc SegmentFunction to call to output one physical segment.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
+    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
+*/
+    static IOMemoryCursor *
+	withSpecification(SegmentFunction  outSegFunc,
+			  IOPhysicalLength maxSegmentSize = 0,
+			  IOPhysicalLength maxTransferSize = 0,
+			  IOPhysicalLength alignment = 1);
+
+/*! @function initWithSpecification
+    @abstract Primary initializer for the IOMemoryCursor class.
+    @param outSegFunc SegmentFunction to call to output one physical segment.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
+    @result Returns true if the inherited classes and this instance initialize
+successfully.
+*/
+    virtual bool initWithSpecification(SegmentFunction	outSegFunc,
+				       IOPhysicalLength maxSegmentSize = 0,
+				       IOPhysicalLength maxTransferSize = 0,
+				       IOPhysicalLength alignment = 1);
+
+/*! @function genPhysicalSegments
+    @abstract Generates a physical scatter/gather list given a memory descriptor.
+    @discussion Generates a list of physical segments from the given memory descriptor, relative to the current position of the descriptor.
+    @param descriptor IOMemoryDescriptor that describes the data associated with an I/O request. 
+    @param fromPosition Starting location of the I/O within a memory descriptor. 
+    @param segments Void pointer to base of output physical scatter/gather list.  Always passed directly onto the SegmentFunction without interpretation by the cursor. 
+    @param maxSegments Maximum number of segments that can be written to segments array.
+    @param maxTransferSize Maximum transfer size is limited to that many bytes, otherwise it defaults to the maximum transfer size specified when the memory cursor was initialized.
+    @param transferSize Pointer to an IOByteCount variable that can contain the total size of the transfer being described.  Defaults to 0 indicating that no transfer size need be returned. 
+    @result If the descriptor is exhausted of memory, a zero is returned, otherwise the number of segments that were filled in is returned.
+*/
+    virtual UInt32 genPhysicalSegments(
+				      IOMemoryDescriptor *descriptor,
+				      IOByteCount	  fromPosition,
+				      void *		  segments,
+				      UInt32		  maxSegments,
+				      UInt32		  maxTransferSize = 0,
+				      IOByteCount	 *transferSize = 0);
+};
+
+/************************ class IONaturalMemoryCursor ************************/
+
+
+/*!
+    @class IONaturalMemoryCursor
+    @abstract An IOMemoryCursor subclass that outputs a vector of PhysicalSegments in the natural byte orientation for the CPU.  
+    @discussion The IONaturalMemoryCursor would be used when it is too difficult to safely describe a SegmentFunction that is more appropriate for your hardware.  This cursor just outputs an array of PhysicalSegments.
+*/
+class IONaturalMemoryCursor : public IOMemoryCursor
+{
+    OSDeclareDefaultStructors(IONaturalMemoryCursor)
+
+public:
+/*! @function outputSegment
+    @abstract Outputs the given segment into the output segments array in natural byte order.
+    @param segment The physical address and length that is next to be output.
+    @param segments Base of the output vector of DMA address length pairs.
+    @param segmentIndex Index to output 'segment' in the 'segments' array.
+*/
+    static void outputSegment(PhysicalSegment segment,
+			      void *	      segments,
+			      UInt32	      segmentIndex);
+
+/*! @defined naturalOutputSegment
+    @discussion Backward compatibility define for the old global function definition.  See IONaturalMemoryCursor::outputSegment.
+*/
+#define naturalOutputSegment IONaturalMemoryCursor::outputSegment
+
+/*! @function withSpecification
+    @abstract Creates and initializes an IONaturalMemoryCursor in one operation.
+    @discussion Factory function to create and initialize an IONaturalMemoryCursor in one operation.  For more information, see IONaturalMemoryCursor::initWithSpecification.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
+    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
+*/
+    static IONaturalMemoryCursor * 
+	withSpecification(IOPhysicalLength maxSegmentSize,
+			  IOPhysicalLength maxTransferSize,
+			  IOPhysicalLength alignment = 1);
+
+/*! @function initWithSpecification
+    @abstract Primary initializer for the IONaturalMemoryCursor class.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
+    @result Returns true if the inherited classes and this instance initialize successfully.
+*/
+    virtual bool initWithSpecification(IOPhysicalLength	 maxSegmentSize,
+				       IOPhysicalLength	 maxTransferSize,
+				       IOPhysicalLength	 alignment = 1);
+
+
+/*! @function getPhysicalSegments
+    @abstract Generates a CPU natural physical scatter/gather list given a memory descriptor.
+    @discussion Generates a list of physical segments from the given memory descriptor, relative to the current position of the descriptor.  Wraps IOMemoryCursor::genPhysicalSegments.
+    @param descriptor IOMemoryDescriptor that describes the data associated with an I/O request. 
+    @param fromPosition Starting location of the I/O within a memory descriptor. 
+    @param segments Pointer to an array of IOMemoryCursor::PhysicalSegments for the output physical scatter/gather list.
+    @param maxSegments Maximum number of segments that can be written to segments array.
+    @param inMaxTransferSize Maximum transfer size is limited to that many bytes, otherwise it defaults to the maximum transfer size specified when the memory cursor was initialized.
+    @param transferSize Pointer to an IOByteCount variable that can contain the total size of the transfer being described.  Defaults to 0 indicating that no transfer size need be returned. 
+    @result If the descriptor is exhausted of memory, a zero is returned, otherwise the number of segments that were filled in is returned.
+*/
+    virtual UInt32 getPhysicalSegments(IOMemoryDescriptor *descriptor,
+				       IOByteCount	   fromPosition,
+				       PhysicalSegment	  *segments,
+				       UInt32		   maxSegments,
+				       UInt32		   inMaxTransferSize = 0,
+				       IOByteCount	  *transferSize = 0)
+    {
+	return genPhysicalSegments(descriptor, fromPosition, segments,
+				maxSegments, inMaxTransferSize, transferSize);
+    }
+};
+
+/************************** class IOBigMemoryCursor **************************/
+
+/*!
+    @class IOBigMemoryCursor
+    @abstract An IOMemoryCursor subclass that outputs a vector of PhysicalSegments in the big endian byte order.  
+    @discussion The IOBigMemoryCursor would be used when the DMA hardware requires a big endian address and length pair.  This cursor outputs an array of PhysicalSegments that are encoded in big-endian format.
+*/
+class IOBigMemoryCursor : public IOMemoryCursor
+{
+    OSDeclareDefaultStructors(IOBigMemoryCursor)
+
+public:
+/*! @function outputSegment
+    @abstract Outputs the given segment into the output segments array in big endian byte order.
+    @param segment The physical address and length that is next to be output.
+    @param segments Base of the output vector of DMA address length pairs.
+    @param segmentIndex Index to output 'segment' in the 'segments' array.
+*/
+    static void outputSegment(PhysicalSegment segment,
+			      void *	      segments,
+			      UInt32	      segmentIndex);
+
+/*! @defined bigOutputSegment
+    @discussion Backward compatibility define for the old global function definition.  See IOBigMemoryCursor::outputSegment 
+*/
+#define bigOutputSegment IOBigMemoryCursor::outputSegment
+
+/*! @function withSpecification
+    @abstract Creates and initializes an IOBigMemoryCursor in one operation.
+    @discussion Factory function to create and initialize an IOBigMemoryCursor in one operation.  See also IOBigMemoryCursor::initWithSpecification.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
+    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
+*/
+    static IOBigMemoryCursor *
+	withSpecification(IOPhysicalLength maxSegmentSize,
+			  IOPhysicalLength maxTransferSize,
+			  IOPhysicalLength alignment = 1);
+
+/*! @function initWithSpecification
+    @abstract Primary initializer for the IOBigMemoryCursor class.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
+    @result Returns true if the inherited classes and this instance initialize
+successfully.
+*/
+    virtual bool initWithSpecification(IOPhysicalLength	 maxSegmentSize,
+				       IOPhysicalLength	 maxTransferSize,
+				       IOPhysicalLength	 alignment = 1);
+
+
+/*! @function getPhysicalSegments
+    @abstract Generates a big endian physical scatter/gather list given a memory descriptor.
+    @discussion Generates a list of physical segments from the given memory descriptor, relative to the current position of the descriptor.  Wraps IOMemoryCursor::genPhysicalSegments.
+    @param descriptor IOMemoryDescriptor that describes the data associated with an I/O request. 
+    @param fromPosition Starting location of the I/O within a memory descriptor. 
+    @param segments Pointer to an array of IOMemoryCursor::PhysicalSegments for the output physical scatter/gather list.
+    @param maxSegments Maximum number of segments that can be written to segments array.
+    @param inMaxTransferSize Maximum transfer size is limited to that many bytes, otherwise it defaults to the maximum transfer size specified when the memory cursor was initialized.
+    @param transferSize Pointer to an IOByteCount variable that can contain the total size of the transfer being described.  Defaults to 0 indicating that no transfer size need be returned. 
+    @result If the descriptor is exhausted of memory, a zero is returned, otherwise the number of segments that were filled in is returned.
+*/
+    virtual UInt32 getPhysicalSegments(IOMemoryDescriptor * descriptor,
+				       IOByteCount	    fromPosition,
+				       PhysicalSegment *    segments,
+				       UInt32		    maxSegments,
+				       UInt32		    inMaxTransferSize = 0,
+				       IOByteCount	 *  transferSize = 0)
+    {
+	return genPhysicalSegments(descriptor, fromPosition, segments,
+				maxSegments, inMaxTransferSize, transferSize);
+    }
+};
+
+/************************* class IOLittleMemoryCursor ************************/
+
+/*!
+    @class IOLittleMemoryCursor
+    @abstract An IOMemoryCursor subclass that outputs a vector of PhysicalSegments in the little endian byte order.  
+    @discussion The IOLittleMemoryCursor would be used when the DMA hardware requires a little endian address and length pair.	This cursor outputs an array of PhysicalSegments that are encoded in little endian format.
+*/
+class IOLittleMemoryCursor : public IOMemoryCursor
+{
+    OSDeclareDefaultStructors(IOLittleMemoryCursor)
+
+public:
+/*! @function outputSegment
+    @abstract Outputs the given segment into the output segments array in little endian byte order.
+    @param segment The physical address and length that is next to be output.
+    @param segments Base of the output vector of DMA address length pairs.
+    @param segmentIndex Index to output 'segment' in the 'segments' array.
+*/
+    static void outputSegment(PhysicalSegment segment,
+			      void *	      segments,
+			      UInt32	      segmentIndex);
+
+/*! @defined littleOutputSegment
+    @discussion Backward compatibility define for the old global function definition.  See also IOLittleMemoryCursor::outputSegment. */
+#define littleOutputSegment IOLittleMemoryCursor::outputSegment
+
+/*! @function withSpecification
+    @abstract Creates and initializes an IOLittleMemoryCursor in one operation.
+    @discussion Factory function to create and initialize an IOLittleMemoryCursor in one operation.  See also IOLittleMemoryCursor::initWithSpecification.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
+    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
+*/
+    static IOLittleMemoryCursor *
+	withSpecification(IOPhysicalLength maxSegmentSize,
+			  IOPhysicalLength maxTransferSize,
+			  IOPhysicalLength alignment = 1);
+
+/*! @function initWithSpecification
+    @abstract Primary initializer for the IOLittleMemoryCursor class.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
+    @result Returns true if the inherited classes and this instance initialize successfully.
+*/
+    virtual bool initWithSpecification(IOPhysicalLength	 maxSegmentSize,
+				       IOPhysicalLength	 maxTransferSize,
+				       IOPhysicalLength	 alignment = 1);
+
+
+/*! @function getPhysicalSegments
+    @abstract Generates a little endian physical scatter/gather list given a memory descriptor.
+    @discussion Generates a list of physical segments from the given memory descriptor, relative to the current position of the descriptor.  Wraps IOMemoryCursor::genPhysicalSegments.
+    @param descriptor IOMemoryDescriptor that describes the data associated with an I/O request. 
+    @param fromPosition Starting location of the I/O within a memory descriptor. 
+    @param segments Pointer to an array of IOMemoryCursor::PhysicalSegments for the output physical scatter/gather list.
+    @param maxSegments Maximum number of segments that can be written to segments array.
+    @param inMaxTransferSize Maximum transfer size is limited to that many bytes, otherwise it defaults to the maximum transfer size specified when the memory cursor was initialized.
+    @param transferSize Pointer to an IOByteCount variable that can contain the total size of the transfer being described.  Defaults to 0 indicating that no transfer size need be returned. 
+    @result If the descriptor is exhausted of memory, a zero is returned, otherwise the number of segments that were filled in is returned.
+*/
+    virtual UInt32 getPhysicalSegments(IOMemoryDescriptor * descriptor,
+				       IOByteCount	    fromPosition,
+				       PhysicalSegment *    segments,
+				       UInt32		    maxSegments,
+				       UInt32		    inMaxTransferSize = 0,
+				       IOByteCount	 *  transferSize = 0)
+    {
+	return genPhysicalSegments(descriptor, fromPosition, segments,
+				maxSegments, inMaxTransferSize, transferSize);
+    }
+};
+
+/************************* class IODBDMAMemoryCursor *************************/
+
+#if defined(__ppc__)
+
+struct IODBDMADescriptor;
+
+/*!
+    @class IODBDMAMemoryCursor
+    @abstract An IOMemoryCursor subclass that outputs a vector of DBDMA descriptors where the address and length are filled in.  
+    @discussion The IODBDMAMemoryCursor would be used when the DBDMA hardware is available for the device for that will use an instance of this cursor.
+*/
+class IODBDMAMemoryCursor : public IOMemoryCursor
+{
+    OSDeclareDefaultStructors(IODBDMAMemoryCursor)
+
+public:
+/*! @function outputSegment
+    @abstract Outpust the given segment into the output segments array in address and length fields of an DBDMA descriptor.
+    @param segment The physical address and length that is next to be output.
+    @param segments Base of the output vector of DMA address length pairs.
+    @param segmentIndex Index to output 'segment' in the 'segments' array.
+*/
+    static void outputSegment(PhysicalSegment segment,
+			      void *	      segments,
+			      UInt32	      segmentIndex);
+
+/*! @defined dbdmaOutputSegment
+    @discussion Backward compatibility define for the old global function definition.  See IODBDMAMemoryCursor::outputSegment. */
+#define dbdmaOutputSegment IODBDMAMemoryCursor::outputSegment
+
+/*! @function withSpecification
+    @abstract Creates and initializes an IODBDMAMemoryCursor in one operation.
+    @discussion Factory function to create and initialize an IODBDMAMemoryCursor in one operation.  See also IODBDMAMemoryCursor::initWithSpecification.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
+    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
+*/
+    static IODBDMAMemoryCursor * 
+	withSpecification(IOPhysicalLength maxSegmentSize,
+			  IOPhysicalLength maxTransferSize,
+			  IOPhysicalLength alignment = 1);
+
+/*! @function initWithSpecification
+    @abstract Primary initializer for the IODBDMAMemoryCursor class.
+    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
+    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
+    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
+    @result Returns true if the inherited classes and this instance initialize successfully.
+*/
+    virtual bool initWithSpecification(IOPhysicalLength	 maxSegmentSize,
+				       IOPhysicalLength	 maxTransferSize,
+				       IOPhysicalLength	 alignment = 1);
+
+
+/*! @function getPhysicalSegments
+    @abstract Generates a DBDMA physical scatter/gather list given a memory descriptor.
+    @discussion Generates a list of DBDMA descriptors where the address and length fields are filled in appropriately.	But the client is expected to fill in the rest of the DBDMA descriptor as is appropriate for their particular hardware.  Wraps IOMemoryCursor::genPhysicalSegments.
+    @param descriptor IOMemoryDescriptor that describes the data associated with an I/O request. 
+    @param fromPosition Starting location of the I/O within a memory descriptor. 
+    @param segments Pointer to an array of DBDMA descriptors for the output physical scatter/gather list.  Be warned no room is left for a preamble in the output array.  'segments' should point to the first memory description slot in a DBDMA command.
+    @param maxSegments Maximum number of segments that can be written to the DBDMA descriptor table.
+    @param inMaxTransferSize Maximum transfer size is limited to that many bytes, otherwise it defaults to the maximum transfer size specified when the memory cursor was initialized.
+    @param transferSize Pointer to an IOByteCount variable that can contain the total size of the transfer being described.  Defaults to 0 indicating that no transfer size need be returned. 
+    @result If the descriptor is exhausted of memory, a zero is returned, otherwise the number of segments that were filled in is returned.
+*/
+    virtual UInt32 getPhysicalSegments(IOMemoryDescriptor * descriptor,
+				       IOByteCount	    fromPosition,
+				       IODBDMADescriptor *  segments,
+				       UInt32		    maxSegments,
+				       UInt32		    inMaxTransferSize = 0,
+				       IOByteCount	 *  transferSize = 0)
+    {
+	return genPhysicalSegments(descriptor, fromPosition, segments,
+				maxSegments, inMaxTransferSize, transferSize);
+    }
+};
+
+#endif /* defined(__ppc__) */
+
+#endif /* !_IOMEMORYCURSOR_H */
+
diff --git a/i386/include/IOKit/IOMemoryDescriptor.h b/i386/include/IOKit/IOMemoryDescriptor.h
new file mode 100644
index 0000000..d60d864
--- /dev/null
+++ b/i386/include/IOKit/IOMemoryDescriptor.h
@@ -0,0 +1,898 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOMEMORYDESCRIPTOR_H
+#define _IOMEMORYDESCRIPTOR_H
+
+#include <sys/cdefs.h>
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOLocks.h>
+#include <libkern/c++/OSContainers.h>
+
+#include <mach/memory_object_types.h>
+
+class IOMemoryMap;
+class IOMapper;
+
+/*
+ * Direction of transfer, with respect to the described memory.
+ */
+#ifdef __LP64__
+enum
+#else /* !__LP64__ */
+enum IODirection
+#endif /* !__LP64__ */
+{
+    kIODirectionNone  = 0x0,	//                    same as VM_PROT_NONE
+    kIODirectionIn    = 0x1,	// User land 'read',  same as VM_PROT_READ
+    kIODirectionOut   = 0x2,	// User land 'write', same as VM_PROT_WRITE
+    kIODirectionOutIn = kIODirectionOut | kIODirectionIn,
+    kIODirectionInOut = kIODirectionIn  | kIODirectionOut
+};
+#ifdef __LP64__
+typedef IOOptionBits IODirection;
+#endif /* __LP64__ */
+
+/*
+ * IOOptionBits used in the withOptions variant
+ */
+enum {
+    kIOMemoryDirectionMask	= 0x00000007,
+
+    kIOMemoryTypeVirtual	= 0x00000010,
+    kIOMemoryTypePhysical	= 0x00000020,
+    kIOMemoryTypeUPL		= 0x00000030,
+    kIOMemoryTypePersistentMD	= 0x00000040,	// Persistent Memory Descriptor
+    kIOMemoryTypeUIO		= 0x00000050,
+#ifdef __LP64__
+    kIOMemoryTypeVirtual64	= kIOMemoryTypeVirtual,
+    kIOMemoryTypePhysical64	= kIOMemoryTypePhysical,
+#else /* !__LP64__ */
+    kIOMemoryTypeVirtual64	= 0x00000060,
+    kIOMemoryTypePhysical64	= 0x00000070,
+#endif /* !__LP64__ */
+    kIOMemoryTypeMask		= 0x000000f0,
+
+    kIOMemoryAsReference	= 0x00000100,
+    kIOMemoryBufferPageable	= 0x00000400,
+    kIOMemoryMapperNone		= 0x00000800,
+    kIOMemoryPersistent		= 0x00010000,
+    kIOMemoryThreadSafe		= 0x00100000,	// Shared with Buffer MD
+};
+
+#define kIOMapperSystem	((IOMapper *) 0)
+
+enum 
+{
+    kIOMemoryPurgeableKeepCurrent = 1,
+    kIOMemoryPurgeableNonVolatile = 2,
+    kIOMemoryPurgeableVolatile    = 3,
+    kIOMemoryPurgeableEmpty       = 4
+};
+enum 
+{
+    kIOMemoryIncoherentIOFlush	 = 1,
+    kIOMemoryIncoherentIOStore	 = 2,
+};
+
+#define	IOMEMORYDESCRIPTOR_SUPPORTS_DMACOMMAND	1
+
+enum 
+{
+    kIOPreparationIDUnprepared = 0,
+    kIOPreparationIDUnsupported = 1,
+    kIOPreparationIDAlwaysPrepared = 2,
+};
+
+/*! @class IOMemoryDescriptor : public OSObject
+    @abstract An abstract base class defining common methods for describing physical or virtual memory.
+    @discussion The IOMemoryDescriptor object represents a buffer or range of memory, specified as one or more physical or virtual address ranges. It contains methods to return the memory's physically contiguous segments (fragments), for use with the IOMemoryCursor, and methods to map the memory into any address space with caching and placed mapping options. */
+
+class IOMemoryDescriptor : public OSObject
+{
+    friend class IOMemoryMap;
+
+    OSDeclareDefaultStructors(IOMemoryDescriptor);
+
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of this class in the future.
+    */    
+    struct ExpansionData {
+        void *				devicePager;
+        unsigned int			pagerContig:1;
+        unsigned int			unused:31;
+	IOMemoryDescriptor *		memory;
+    };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData * reserved;
+
+protected:
+    OSSet *		_mappings;
+    IOOptionBits 	_flags;
+    void *		_memEntry;
+
+#ifdef __LP64__
+    uint64_t		__iomd_reserved1;
+    uint64_t		__iomd_reserved2;
+    uint64_t		__iomd_reserved3;
+    uint64_t		__iomd_reserved4;
+#else /* !__LP64__ */
+    IODirection         _direction;        /* use _flags instead */
+#endif /* !__LP64__ */
+    IOByteCount         _length;           /* length of all ranges */
+    IOOptionBits 	_tag;
+
+public:
+typedef IOOptionBits DMACommandOps;
+#ifndef __LP64__
+    virtual IOPhysicalAddress getSourceSegment( IOByteCount offset,
+						IOByteCount * length ) APPLE_KEXT_DEPRECATED;
+#endif /* !__LP64__ */
+
+/*! @function initWithOptions
+    @abstract Master initialiser for all variants of memory descriptors.  For a more complete description see IOMemoryDescriptor::withOptions.
+    @discussion Note this function can be used to re-init a previously created memory descriptor.
+    @result true on success, false on failure. */
+    virtual bool initWithOptions(void *		buffers,
+                                 UInt32		count,
+                                 UInt32		offset,
+                                 task_t		task,
+                                 IOOptionBits	options,
+                                 IOMapper *	mapper = kIOMapperSystem);
+
+#ifndef __LP64__
+    virtual addr64_t getPhysicalSegment64( IOByteCount offset,
+                                            IOByteCount * length ) APPLE_KEXT_DEPRECATED; /* use getPhysicalSegment() and kIOMemoryMapperNone instead */
+#endif /* !__LP64__ */
+
+/*! @function setPurgeable
+    @abstract Control the purgeable status of a memory descriptors memory.
+    @discussion Buffers may be allocated with the ability to have their purgeable status changed - IOBufferMemoryDescriptor with the kIOMemoryPurgeable option, VM_FLAGS_PURGEABLE may be passed to vm_allocate() in user space to allocate such buffers. The purgeable status of such a buffer may be controlled with setPurgeable(). The process of making a purgeable memory descriptor non-volatile and determining its previous state is atomic - if a purgeable memory descriptor is made nonvolatile and the old state is returned as kIOMemoryPurgeableVolatile, then the memory's previous contents are completely intact and will remain so until the memory is made volatile again.  If the old state is returned as kIOMemoryPurgeableEmpty then the memory was reclaimed while it was in a volatile state and its previous contents have been lost.
+    @param newState - the desired new purgeable state of the memory:<br>
+    kIOMemoryPurgeableKeepCurrent - make no changes to the memory's purgeable state.<br>
+    kIOMemoryPurgeableVolatile    - make the memory volatile - the memory may be reclaimed by the VM system without saving its contents to backing store.<br>
+    kIOMemoryPurgeableNonVolatile - make the memory nonvolatile - the memory is treated as with usual allocations and must be saved to backing store if paged.<br>
+    kIOMemoryPurgeableEmpty       - make the memory volatile, and discard any pages allocated to it.
+    @param oldState - if non-NULL, the previous purgeable state of the memory is returned here:<br>
+    kIOMemoryPurgeableNonVolatile - the memory was nonvolatile.<br>
+    kIOMemoryPurgeableVolatile    - the memory was volatile but its content has not been discarded by the VM system.<br>
+    kIOMemoryPurgeableEmpty       - the memory was volatile and has been discarded by the VM system.<br>
+    @result An IOReturn code. */
+
+    virtual IOReturn setPurgeable( IOOptionBits newState,
+                                    IOOptionBits * oldState );
+
+/*! @function performOperation
+    @abstract Perform an operation on the memory descriptor's memory.
+    @discussion This method performs some operation on a range of the memory descriptor's memory. When a memory descriptor's memory is not mapped, it should be more efficient to use this method than mapping the memory to perform the operation virtually.
+    @param options The operation to perform on the memory:<br>
+    kIOMemoryIncoherentIOFlush - pass this option to store to memory and flush any data in the processor cache for the memory range, with synchronization to ensure the data has passed through all levels of processor cache. It may not be supported on all architectures. This type of flush may be used for non-coherent I/O such as AGP - it is NOT required for PCI coherent operations. The memory descriptor must have been previously prepared.<br>
+    kIOMemoryIncoherentIOStore - pass this option to store to memory any data in the processor cache for the memory range, with synchronization to ensure the data has passed through all levels of processor cache. It may not be supported on all architectures. This type of flush may be used for non-coherent I/O such as AGP - it is NOT required for PCI coherent operations. The memory descriptor must have been previously prepared.
+    @param offset A byte offset into the memory descriptor's memory.
+    @param length The length of the data range.
+    @result An IOReturn code. */
+
+    virtual IOReturn performOperation( IOOptionBits options,
+                                        IOByteCount offset, IOByteCount length );
+
+    // Used for dedicated communications for IODMACommand
+    virtual IOReturn dmaCommandOperation(DMACommandOps op, void *vData, UInt dataSize) const;
+
+/*! @function getPhysicalSegment
+    @abstract Break a memory descriptor into its physically contiguous segments.
+    @discussion This method returns the physical address of the byte at the given offset into the memory, and optionally the length of the physically contiguous segment from that offset.
+    @param offset A byte offset into the memory whose physical address to return.
+    @param length If non-zero, getPhysicalSegment will store here the length of the physically contiguous segement at the given offset.
+    @result A physical address, or zero if the offset is beyond the length of the memory. */
+
+#ifdef __LP64__
+    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
+                                         IOByteCount * length,
+                                         IOOptionBits  options = 0 ) = 0;
+#else /* !__LP64__ */
+    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
+                                         IOByteCount * length,
+                                         IOOptionBits  options );
+#endif /* !__LP64__ */
+
+    virtual uint64_t getPreparationID( void );
+	
+private:
+    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 0);
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 1);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 2);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 3);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 4);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 5);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 6);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 7);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 1);
+    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 2);
+    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 3);
+    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 4);
+    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 5);
+    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 6);
+    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 7);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 8);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 9);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 10);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 11);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 12);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 13);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 14);
+    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 15);
+
+protected:
+    virtual void free();
+public:
+    static void initialize( void );
+
+public:
+/*! @function withAddress
+    @abstract Create an IOMemoryDescriptor to describe one virtual range of the kernel task.
+    @discussion This method creates and initializes an IOMemoryDescriptor for memory consisting of a single virtual memory range mapped into the kernel map.  This memory descriptor needs to be prepared before it can be used to extract data from the memory described.
+    @param address The virtual address of the first byte in the memory.
+    @param withLength The length of memory.
+    @param withDirection An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
+    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
+
+    static IOMemoryDescriptor * withAddress(void *       address,
+                                            IOByteCount  withLength,
+                                            IODirection  withDirection);
+
+#ifndef __LP64__
+    static IOMemoryDescriptor * withAddress(IOVirtualAddress address,
+                                            IOByteCount  withLength,
+                                            IODirection  withDirection,
+                                            task_t       withTask) APPLE_KEXT_DEPRECATED; /* use withAddressRange() and prepare() instead */
+#endif /* !__LP64__ */
+
+/*! @function withPhysicalAddress
+    @abstract Create an IOMemoryDescriptor to describe one physical range.
+    @discussion This method creates and initializes an IOMemoryDescriptor for memory consisting of a single physical memory range.
+    @param address The physical address of the first byte in the memory.
+    @param withLength The length of memory.
+    @param withDirection An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
+    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
+
+    static IOMemoryDescriptor * withPhysicalAddress(
+				IOPhysicalAddress	address,
+				IOByteCount		withLength,
+				IODirection      	withDirection );
+
+#ifndef __LP64__
+     static IOMemoryDescriptor * withRanges(IOVirtualRange * ranges,
+                                            UInt32           withCount,
+                                            IODirection      withDirection,
+                                            task_t           withTask,
+                                            bool             asReference = false) APPLE_KEXT_DEPRECATED; /* use withAddressRanges() instead */
+#endif /* !__LP64__ */
+
+/*! @function withAddressRange
+    @abstract Create an IOMemoryDescriptor to describe one virtual range of the specified map.
+    @discussion This method creates and initializes an IOMemoryDescriptor for memory consisting of a single virtual memory range mapped into the specified map.  This memory descriptor needs to be prepared before it can be used to extract data from the memory described.
+    @param address The virtual address of the first byte in the memory.
+    @param withLength The length of memory.
+    @param options
+        kIOMemoryDirectionMask (options:direction)	This nibble indicates the I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures. 
+    @param task The task the virtual ranges are mapped into. Note that unlike IOMemoryDescriptor::withAddress(), kernel_task memory must be explicitly prepared when passed to this api.
+    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
+
+    static IOMemoryDescriptor * withAddressRange(
+					mach_vm_address_t address,
+					mach_vm_size_t	  length,
+					IOOptionBits      options,
+					task_t            task);
+
+/*! @function withAddressRanges
+    @abstract Create an IOMemoryDescriptor to describe one or more virtual ranges.
+    @discussion This method creates and initializes an IOMemoryDescriptor for memory consisting of an array of virtual memory ranges each mapped into a specified source task.  This memory descriptor needs to be prepared before it can be used to extract data from the memory described.
+    @param ranges An array of IOAddressRange structures which specify the virtual ranges in the specified map which make up the memory to be described. IOAddressRange is the 64bit version of IOVirtualRange.
+    @param rangeCount The member count of the ranges array.
+    @param options
+        kIOMemoryDirectionMask (options:direction)	This nibble indicates the I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures. 
+        kIOMemoryAsReference	For options:type = Virtual or Physical this indicate that the memory descriptor need not copy the ranges array into local memory.  This is an optimisation to try to minimise unnecessary allocations.
+    @param task The task each of the virtual ranges are mapped into. Note that unlike IOMemoryDescriptor::withAddress(), kernel_task memory must be explicitly prepared when passed to this api.
+    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
+
+    static IOMemoryDescriptor * withAddressRanges(
+					IOAddressRange * ranges,
+					UInt32           rangeCount,
+					IOOptionBits     options,
+					task_t           task);
+
+/*! @function withOptions
+    @abstract Master initialiser for all variants of memory descriptors.
+    @discussion This method creates and initializes an IOMemoryDescriptor for memory it has three main variants: Virtual, Physical & mach UPL.  These variants are selected with the options parameter, see below.  This memory descriptor needs to be prepared before it can be used to extract data from the memory described.
+
+
+    @param buffers A pointer to an array of IOAddressRange when options:type is kIOMemoryTypeVirtual64 or kIOMemoryTypePhysical64 or a 64bit kernel. For type UPL it is a upl_t returned by the mach/memory_object_types.h apis, primarily used internally by the UBC. IOVirtualRanges or IOPhysicalRanges are 32 bit only types for use when options:type is kIOMemoryTypeVirtual or kIOMemoryTypePhysical on 32bit kernels.
+
+    @param count options:type = Virtual or Physical count contains a count of the number of entires in the buffers array.  For options:type = UPL this field contains a total length.
+
+    @param offset Only used when options:type = UPL, in which case this field contains an offset for the memory within the buffers upl.
+
+    @param task Only used options:type = Virtual, The task each of the virtual ranges are mapped into.
+
+    @param options
+        kIOMemoryDirectionMask (options:direction)	This nibble indicates the I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures. 
+        kIOMemoryTypeMask (options:type)	kIOMemoryTypeVirtual64, kIOMemoryTypeVirtual, kIOMemoryTypePhysical64, kIOMemoryTypePhysical, kIOMemoryTypeUPL Indicates that what type of memory basic memory descriptor to use.  This sub-field also controls the interpretation of the buffers, count, offset & task parameters.
+        kIOMemoryAsReference	For options:type = Virtual or Physical this indicate that the memory descriptor need not copy the ranges array into local memory.  This is an optimisation to try to minimise unnecessary allocations.
+        kIOMemoryBufferPageable	Only used by the IOBufferMemoryDescriptor as an indication that the kernel virtual memory is in fact pageable and we need to use the kernel pageable submap rather than the default map.
+    
+    @param mapper Which IOMapper should be used to map the in-memory physical addresses into I/O space addresses.  Defaults to 0 which indicates that the system mapper is to be used, if present.  
+
+    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
+
+    static IOMemoryDescriptor *withOptions(void *	buffers,
+                                           UInt32	count,
+                                           UInt32	offset,
+                                           task_t	task,
+                                           IOOptionBits	options,
+                                           IOMapper *	mapper = kIOMapperSystem);
+
+#ifndef __LP64__
+    static IOMemoryDescriptor * withPhysicalRanges(
+                                            IOPhysicalRange *	ranges,
+                                            UInt32		withCount,
+                                            IODirection 	withDirection,
+                                            bool		asReference = false) APPLE_KEXT_DEPRECATED; /* use withOptions() and kIOMemoryTypePhysical instead */
+#endif /* !__LP64__ */
+
+#ifndef __LP64__
+    static IOMemoryDescriptor *	withSubRange(IOMemoryDescriptor *of,
+					     IOByteCount offset,
+					     IOByteCount length,
+					     IODirection withDirection) APPLE_KEXT_DEPRECATED; /* use IOSubMemoryDescriptor::withSubRange() and kIOMemoryThreadSafe instead */
+#endif /* !__LP64__ */
+
+/*! @function withPersistentMemoryDescriptor
+    @abstract Copy constructor that generates a new memory descriptor if the backing memory for the same task's virtual address and length has changed.
+    @discussion If the original memory descriptor's address and length is still backed by the same real memory, i.e. the user hasn't deallocated and the reallocated memory at the same address then the original memory descriptor is returned with a additional reference.  Otherwise we build a totally new memory descriptor with the same characteristics as the previous one but with a new view of the vm.  Note not legal to call this function with anything except an IOGeneralMemoryDescriptor that was created with the kIOMemoryPersistent option.
+    @param originalMD The memory descriptor to be duplicated.
+    @result Either the original memory descriptor with an additional retain or a new memory descriptor, 0 for a bad original memory descriptor or some other resource shortage. */
+    static IOMemoryDescriptor *
+	withPersistentMemoryDescriptor(IOMemoryDescriptor *originalMD);
+
+#ifndef __LP64__
+	// obsolete initializers
+	// - initWithOptions is the designated initializer 
+    virtual bool initWithAddress(void *       address,
+                                 IOByteCount  withLength,
+                                 IODirection  withDirection) APPLE_KEXT_DEPRECATED; /* use initWithOptions() instead */
+    virtual bool initWithAddress(IOVirtualAddress address,
+                                 IOByteCount  withLength,
+                                 IODirection  withDirection,
+                                 task_t       withTask) APPLE_KEXT_DEPRECATED; /* use initWithOptions() instead */
+    virtual bool initWithPhysicalAddress(
+				 IOPhysicalAddress	address,
+				 IOByteCount		withLength,
+				 IODirection      	withDirection ) APPLE_KEXT_DEPRECATED; /* use initWithOptions() instead */
+    virtual bool initWithRanges(IOVirtualRange * ranges,
+                                UInt32           withCount,
+                                IODirection      withDirection,
+                                task_t           withTask,
+                                bool             asReference = false) APPLE_KEXT_DEPRECATED; /* use initWithOptions() instead */
+    virtual bool initWithPhysicalRanges(IOPhysicalRange * ranges,
+                                        UInt32           withCount,
+                                        IODirection      withDirection,
+                                        bool             asReference = false) APPLE_KEXT_DEPRECATED; /* use initWithOptions() instead */
+#endif /* __LP64__ */
+
+/*! @function getDirection
+    @abstract Accessor to get the direction the memory descriptor was created with.
+    @discussion This method returns the direction the memory descriptor was created with.
+    @result The direction. */
+
+    virtual IODirection getDirection() const;
+
+/*! @function getLength
+    @abstract Accessor to get the length of the memory descriptor (over all its ranges).
+    @discussion This method returns the total length of the memory described by the descriptor, ie. the sum of its ranges' lengths.
+    @result The byte count. */
+
+    virtual IOByteCount getLength() const;
+
+/*! @function setTag
+    @abstract Set the tag for the memory descriptor.
+    @discussion This method sets the tag for the memory descriptor. Tag bits are not interpreted by IOMemoryDescriptor.
+    @param tag The tag. */
+
+    virtual void setTag( IOOptionBits tag );
+
+/*! @function getTag
+    @abstract Accessor to the retrieve the tag for the memory descriptor.
+    @discussion This method returns the tag for the memory descriptor. Tag bits are not interpreted by IOMemoryDescriptor.
+    @result The tag. */
+
+    virtual IOOptionBits getTag( void );
+
+/*! @function readBytes
+    @abstract Copy data from the memory descriptor's buffer to the specified buffer.
+    @discussion This method copies data from the memory descriptor's memory at the given offset, to the caller's buffer.  The memory descriptor MUST have the kIODirectionOut direcction bit set  and be prepared.  kIODirectionOut means that this memory descriptor will be output to an external device, so readBytes is used to get memory into a local buffer for a PIO transfer to the device.
+    @param offset A byte offset into the memory descriptor's memory.
+    @param bytes The caller supplied buffer to copy the data to.
+    @param withLength The length of the data to copy.
+    @result The number of bytes copied, zero will be returned if the specified offset is beyond the length of the descriptor. Development/debug kernel builds will assert if the offset is beyond the length of the descriptor. */
+
+    virtual IOByteCount readBytes(IOByteCount offset,
+				void * bytes, IOByteCount withLength);
+
+/*! @function writeBytes
+    @abstract Copy data to the memory descriptor's buffer from the specified buffer.
+    @discussion This method copies data to the memory descriptor's memory at the given offset, from the caller's buffer.  The memory descriptor MUST have the kIODirectionIn direcction bit set  and be prepared.  kIODirectionIn means that this memory descriptor will be input from an external device, so writeBytes is used to write memory into the descriptor for PIO drivers.
+    @param offset A byte offset into the memory descriptor's memory.
+    @param bytes The caller supplied buffer to copy the data from.
+    @param withLength The length of the data to copy.
+    @result The number of bytes copied, zero will be returned if the specified offset is beyond the length of the descriptor. Development/debug kernel builds will assert if the offset is beyond the length of the descriptor. */
+
+    virtual IOByteCount writeBytes(IOByteCount offset,
+				const void * bytes, IOByteCount withLength);
+
+#ifndef __LP64__
+    virtual IOPhysicalAddress getPhysicalSegment(IOByteCount offset,
+						 IOByteCount * length);
+#endif /* !__LP64__ */
+
+/*! @function getPhysicalAddress
+    @abstract Return the physical address of the first byte in the memory.
+    @discussion This method returns the physical address of the  first byte in the memory. It is most useful on memory known to be physically contiguous.
+    @result A physical address. */
+
+    IOPhysicalAddress getPhysicalAddress();
+
+#ifndef __LP64__
+    virtual void * getVirtualSegment(IOByteCount offset,
+					IOByteCount * length) APPLE_KEXT_DEPRECATED; /* use map() and getVirtualAddress() instead */
+#endif /* !__LP64__ */
+
+/*! @function prepare
+    @abstract Prepare the memory for an I/O transfer.
+    @discussion This involves paging in the memory, if necessary, and wiring it down for the duration of the transfer.  The complete() method completes the processing of the memory after the I/O transfer finishes.  Note that the prepare call is not thread safe and it is expected that the client will more easily be able to guarantee single threading a particular memory descriptor.
+    @param forDirection The direction of the I/O just completed, or kIODirectionNone for the direction specified by the memory descriptor.
+    @result An IOReturn code. */
+
+    virtual IOReturn prepare(IODirection forDirection = kIODirectionNone) = 0;
+
+/*! @function complete
+    @abstract Complete processing of the memory after an I/O transfer finishes.
+    @discussion This method should not be called unless a prepare was previously issued; the prepare() and complete() must occur in pairs, before and after an I/O transfer involving pageable memory.  In 10.3 or greater systems the direction argument to complete is not longer respected.  The direction is totally determined at prepare() time.
+    @param forDirection DEPRECATED The direction of the I/O just completed, or kIODirectionNone for the direction specified by the memory descriptor.
+    @result An IOReturn code. */
+
+    virtual IOReturn complete(IODirection forDirection = kIODirectionNone) = 0;
+
+    /*
+     * Mapping functions.
+     */
+
+/*! @function createMappingInTask
+    @abstract Maps a IOMemoryDescriptor into a task.
+    @discussion This is the general purpose method to map all or part of the memory described by a memory descriptor into a task at any available address, or at a fixed address if possible. Caching & read-only options may be set for the mapping. The mapping is represented as a returned reference to a IOMemoryMap object, which may be shared if the mapping is compatible with an existing mapping of the IOMemoryDescriptor. The IOMemoryMap object returned should be released only when the caller has finished accessing the mapping, as freeing the object destroys the mapping. 
+    @param intoTask Sets the target task for the mapping. Pass kernel_task for the kernel address space.
+    @param atAddress If a placed mapping is requested, atAddress specifies its address, and the kIOMapAnywhere should not be set. Otherwise, atAddress is ignored.
+    @param options Mapping options are defined in IOTypes.h,<br>
+	kIOMapAnywhere should be passed if the mapping can be created anywhere. If not set, the atAddress parameter sets the location of the mapping, if it is available in the target map.<br>
+	kIOMapDefaultCache to inhibit the cache in I/O areas, kIOMapCopybackCache in general purpose RAM.<br>
+	kIOMapInhibitCache, kIOMapWriteThruCache, kIOMapCopybackCache to set the appropriate caching.<br>
+	kIOMapReadOnly to allow only read only accesses to the memory - writes will cause and access fault.<br>
+	kIOMapReference will only succeed if the mapping already exists, and the IOMemoryMap object is just an extra reference, ie. no new mapping will be created.<br>
+	kIOMapUnique allows a special kind of mapping to be created that may be used with the IOMemoryMap::redirect() API. These mappings will not be shared as is the default - there will always be a unique mapping created for the caller, not an existing mapping with an extra reference.<br>
+    @param offset Is a beginning offset into the IOMemoryDescriptor's memory where the mapping starts. Zero is the default to map all the memory.
+    @param length Is the length of the mapping requested for a subset of the IOMemoryDescriptor. Zero is the default to map all the memory.
+    @result A reference to an IOMemoryMap object representing the mapping, which can supply the virtual address of the mapping and other information. The mapping may be shared with multiple callers - multiple maps are avoided if a compatible one exists. The IOMemoryMap object returned should be released only when the caller has finished accessing the mapping, as freeing the object destroys the mapping. The IOMemoryMap instance also retains the IOMemoryDescriptor it maps while it exists. */
+
+    IOMemoryMap * 	createMappingInTask(
+	task_t			intoTask,
+	mach_vm_address_t	atAddress,
+	IOOptionBits		options,
+	mach_vm_size_t		offset = 0,
+	mach_vm_size_t		length = 0 );
+
+#ifndef __LP64__
+    virtual IOMemoryMap * 	map(
+	task_t		intoTask,
+	IOVirtualAddress	atAddress,
+	IOOptionBits		options,
+	IOByteCount		offset = 0,
+	IOByteCount		length = 0 ) APPLE_KEXT_DEPRECATED; /* use createMappingInTask() instead */
+#endif /* !__LP64__ */
+
+/*! @function map
+    @abstract Maps a IOMemoryDescriptor into the kernel map.
+    @discussion This is a shortcut method to map all the memory described by a memory descriptor into the kernel map at any available address. See the full version of the createMappingInTask method for further details.
+    @param options Mapping options as in the full version of the createMappingInTask method, with kIOMapAnywhere assumed.
+    @result See the full version of the createMappingInTask method. */
+
+    virtual IOMemoryMap * 	map(
+	IOOptionBits		options = 0 );
+
+/*! @function setMapping
+    @abstract Establishes an already existing mapping.
+    @discussion This method tells the IOMemoryDescriptor about a mapping that exists, but was created elsewhere. It allows later callers of the map method to share this externally created mapping. The IOMemoryMap object returned is created to represent it. This method is not commonly needed.
+    @param task Address space in which the mapping exists.
+    @param mapAddress Virtual address of the mapping.
+    @param options Caching and read-only attributes of the mapping.
+    @result A IOMemoryMap object created to represent the mapping. */
+
+    virtual IOMemoryMap * 	setMapping(
+	task_t		task,
+	IOVirtualAddress	mapAddress,
+	IOOptionBits		options = 0 );
+
+    // Following methods are private implementation
+
+#ifdef __LP64__
+    virtual
+#endif /* __LP64__ */
+    IOReturn redirect( task_t safeTask, bool redirect );
+
+    IOReturn handleFault(
+        void *			pager,
+	vm_map_t		addressMap,
+	mach_vm_address_t	address,
+	mach_vm_size_t		sourceOffset,
+	mach_vm_size_t		length,
+        IOOptionBits		options );
+
+    virtual IOMemoryMap * 	makeMapping(
+	IOMemoryDescriptor *	owner,
+	task_t			intoTask,
+	IOVirtualAddress	atAddress,
+	IOOptionBits		options,
+	IOByteCount		offset,
+	IOByteCount		length );
+
+protected:
+    virtual void 		addMapping(
+	IOMemoryMap *		mapping );
+
+    virtual void 		removeMapping(
+	IOMemoryMap *		mapping );
+
+    virtual IOReturn doMap(
+	vm_map_t		addressMap,
+	IOVirtualAddress *	atAddress,
+	IOOptionBits		options,
+	IOByteCount		sourceOffset = 0,
+	IOByteCount		length = 0 );
+
+    virtual IOReturn doUnmap(
+	vm_map_t		addressMap,
+	IOVirtualAddress	logical,
+	IOByteCount		length );
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*! @class IOMemoryMap : public OSObject
+    @abstract A class defining common methods for describing a memory mapping.
+    @discussion The IOMemoryMap object represents a mapped range of memory, described by a IOMemoryDescriptor. The mapping may be in the kernel or a non-kernel task and has processor cache mode attributes. IOMemoryMap instances are created by IOMemoryDescriptor when it creates mappings in its map method, and returned to the caller. */
+
+class IOMemoryMap : public OSObject
+{
+    OSDeclareDefaultStructors(IOMemoryMap)
+
+protected:
+    virtual void taggedRelease(const void *tag = 0) const;
+    virtual void free();
+
+public:
+/*! @function getVirtualAddress
+    @abstract Accessor to the virtual address of the first byte in the mapping.
+    @discussion This method returns the virtual address of the first byte in the mapping.
+    @result A virtual address. */
+
+    virtual IOVirtualAddress 	getVirtualAddress();
+
+/*! @function getPhysicalSegment
+    @abstract Break a mapping into its physically contiguous segments.
+    @discussion This method returns the physical address of the byte at the given offset into the mapping, and optionally the length of the physically contiguous segment from that offset. It functions similarly to IOMemoryDescriptor::getPhysicalSegment.
+    @param offset A byte offset into the mapping whose physical address to return.
+    @param length If non-zero, getPhysicalSegment will store here the length of the physically contiguous segement at the given offset.
+    @result A physical address, or zero if the offset is beyond the length of the mapping. */
+
+#ifdef __LP64__
+    virtual IOPhysicalAddress 	getPhysicalSegment(IOByteCount offset,
+	       					   IOByteCount * length,
+	       					   IOOptionBits  options = 0);
+#else /* !__LP64__ */
+    virtual IOPhysicalAddress 	getPhysicalSegment(IOByteCount offset,
+	       					   IOByteCount * length);
+#endif /* !__LP64__ */
+
+/*! @function getPhysicalAddress
+    @abstract Return the physical address of the first byte in the mapping.
+    @discussion This method returns the physical address of the  first byte in the mapping. It is most useful on mappings known to be physically contiguous.
+    @result A physical address. */
+
+    IOPhysicalAddress getPhysicalAddress();
+
+/*! @function getLength
+    @abstract Accessor to the length of the mapping.
+    @discussion This method returns the length of the mapping.
+    @result A byte count. */
+
+    virtual IOByteCount 	getLength();
+
+/*! @function getAddressTask
+    @abstract Accessor to the task of the mapping.
+    @discussion This method returns the mach task the mapping exists in.
+    @result A mach task_t. */
+
+    virtual task_t		getAddressTask();
+
+/*! @function getMemoryDescriptor
+    @abstract Accessor to the IOMemoryDescriptor the mapping was created from.
+    @discussion This method returns the IOMemoryDescriptor the mapping was created from.
+    @result An IOMemoryDescriptor reference, which is valid while the IOMemoryMap object is retained. It should not be released by the caller. */
+
+    virtual IOMemoryDescriptor * getMemoryDescriptor();
+
+/*! @function getMapOptions
+    @abstract Accessor to the options the mapping was created with.
+    @discussion This method returns the options to IOMemoryDescriptor::map the mapping was created with.
+    @result Options for the mapping, including cache settings. */
+
+    virtual IOOptionBits 	getMapOptions();
+
+/*! @function unmap
+    @abstract Force the IOMemoryMap to unmap, without destroying the object.
+    @discussion IOMemoryMap instances will unmap themselves upon free, ie. when the last client with a reference calls release. This method forces the IOMemoryMap to destroy the mapping it represents, regardless of the number of clients. It is not generally used.
+    @result An IOReturn code. */
+
+    virtual IOReturn 		unmap();
+
+    virtual void		taskDied();
+
+/*! @function redirect
+    @abstract Replace the memory mapped in a process with new backing memory.
+    @discussion An IOMemoryMap created with the kIOMapUnique option to IOMemoryDescriptor::map() can remapped to a new IOMemoryDescriptor backing object. If the new IOMemoryDescriptor is specified as NULL, client access to the memory map is blocked until a new backing object has been set. By blocking access and copying data, the caller can create atomic copies of the memory while the client is potentially reading or writing the memory. 
+    @param newBackingMemory The IOMemoryDescriptor that represents the physical memory that is to be now mapped in the virtual range the IOMemoryMap represents. If newBackingMemory is NULL, any access to the mapping will hang (in vm_fault()) until access has been restored by a new call to redirect() with non-NULL newBackingMemory argument.
+    @param options Mapping options are defined in IOTypes.h, and are documented in IOMemoryDescriptor::map()
+    @param offset As with IOMemoryDescriptor::map(), a beginning offset into the IOMemoryDescriptor's memory where the mapping starts. Zero is the default.
+    @result An IOReturn code. */
+
+#ifndef __LP64__
+// For 32 bit XNU, there is a 32 bit (IOByteCount) and a 64 bit (mach_vm_size_t) interface;
+// for 64 bit, these fall together on the 64 bit one.
+    virtual IOReturn		redirect(IOMemoryDescriptor * newBackingMemory,
+					 IOOptionBits         options,
+					 IOByteCount          offset = 0);
+#endif
+    virtual IOReturn		redirect(IOMemoryDescriptor * newBackingMemory,
+					 IOOptionBits         options,
+					 mach_vm_size_t       offset = 0);
+
+#ifdef __LP64__
+    inline mach_vm_address_t 	getAddress() __attribute__((always_inline));
+    inline mach_vm_size_t 	getSize() __attribute__((always_inline));
+#else /* !__LP64__ */
+    virtual mach_vm_address_t 	getAddress();
+    virtual mach_vm_size_t 	getSize();
+#endif /* !__LP64__ */
+
+
+    OSMetaClassDeclareReservedUnused(IOMemoryMap, 0);
+    OSMetaClassDeclareReservedUnused(IOMemoryMap, 1);
+    OSMetaClassDeclareReservedUnused(IOMemoryMap, 2);
+    OSMetaClassDeclareReservedUnused(IOMemoryMap, 3);
+    OSMetaClassDeclareReservedUnused(IOMemoryMap, 4);
+    OSMetaClassDeclareReservedUnused(IOMemoryMap, 5);
+    OSMetaClassDeclareReservedUnused(IOMemoryMap, 6);
+    OSMetaClassDeclareReservedUnused(IOMemoryMap, 7);
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#if !defined(__LP64) || defined(_IOMEMORYDESCRIPTOR_INTERNAL_)
+
+// The following classes are private implementation of IOMemoryDescriptor - they
+// should not be referenced directly, just through the public API's in the 
+// IOMemoryDescriptor class. For example, an IOGeneralMemoryDescriptor instance
+// might be created by IOMemoryDescriptor::withAddressRange(), but there should be 
+// no need to reference as anything but a generic IOMemoryDescriptor *.
+
+class IOGeneralMemoryDescriptor : public IOMemoryDescriptor
+{
+    OSDeclareDefaultStructors(IOGeneralMemoryDescriptor);
+
+public:
+    union Ranges {
+        IOVirtualRange   *v;
+        IOAddressRange   *v64;
+        IOPhysicalRange  *p;
+	void 		 *uio;
+    };
+protected:
+    Ranges		_ranges;
+    unsigned		_rangesCount;       /* number of address ranges in list */
+#ifndef __LP64__
+    bool		_rangesIsAllocated; /* is list allocated by us? */
+#endif /* !__LP64__ */
+
+    task_t		_task;               /* task where all ranges are mapped to */
+
+    union {
+        IOVirtualRange	v;
+        IOPhysicalRange	p;
+    }			_singleRange;	   /* storage space for a single range */
+
+    unsigned		_wireCount;        /* number of outstanding wires */
+
+#ifndef __LP64__
+    uintptr_t _cachedVirtualAddress;
+
+    IOPhysicalAddress	_cachedPhysicalAddress;
+#endif /* !__LP64__ */
+
+    bool		_initialized;      /* has superclass been initialized? */
+
+public:
+    virtual void free();
+
+    virtual IOReturn dmaCommandOperation(DMACommandOps op, void *vData, UInt dataSize) const;
+
+    virtual uint64_t getPreparationID( void );
+
+private:
+
+#ifndef __LP64__
+    virtual void setPosition(IOByteCount position);
+    virtual void mapIntoKernel(unsigned rangeIndex);
+    virtual void unmapFromKernel();
+#endif /* !__LP64__ */
+
+    // Internal APIs may be made virtual at some time in the future.
+    IOReturn wireVirtual(IODirection forDirection);
+    void *createNamedEntry();
+
+    // Internal
+    OSData *	    _memoryEntries;
+    unsigned int    _pages;
+    ppnum_t	    _highestPage;
+    uint32_t	    __iomd_reservedA;
+    uint32_t	    __iomd_reservedB;
+
+    IOLock *	    _prepareLock;
+
+public:
+    /*
+     * IOMemoryDescriptor required methods
+     */
+
+    // Master initaliser
+    virtual bool initWithOptions(void *		buffers,
+                                 UInt32		count,
+                                 UInt32		offset,
+                                 task_t		task,
+                                 IOOptionBits	options,
+                                 IOMapper *	mapper = kIOMapperSystem);
+
+#ifndef __LP64__
+    // Secondary initialisers
+    virtual bool initWithAddress(void *		address,
+                                 IOByteCount	withLength,
+                                 IODirection	withDirection) APPLE_KEXT_DEPRECATED;
+
+    virtual bool initWithAddress(IOVirtualAddress address,
+                                 IOByteCount    withLength,
+                                 IODirection	withDirection,
+                                 task_t		withTask) APPLE_KEXT_DEPRECATED;
+
+    virtual bool initWithPhysicalAddress(
+				 IOPhysicalAddress	address,
+				 IOByteCount		withLength,
+				 IODirection      	withDirection ) APPLE_KEXT_DEPRECATED;
+
+    virtual bool initWithRanges(        IOVirtualRange * ranges,
+                                        UInt32           withCount,
+                                        IODirection      withDirection,
+                                        task_t           withTask,
+                                        bool             asReference = false) APPLE_KEXT_DEPRECATED;
+
+    virtual bool initWithPhysicalRanges(IOPhysicalRange * ranges,
+                                        UInt32           withCount,
+                                        IODirection      withDirection,
+                                        bool             asReference = false) APPLE_KEXT_DEPRECATED;
+
+    virtual addr64_t getPhysicalSegment64( IOByteCount offset,
+                                            IOByteCount * length ) APPLE_KEXT_DEPRECATED;
+
+    virtual IOPhysicalAddress getPhysicalSegment(IOByteCount offset,
+						 IOByteCount * length);
+
+    virtual IOPhysicalAddress getSourceSegment(IOByteCount offset,
+                                               IOByteCount * length) APPLE_KEXT_DEPRECATED;
+
+    virtual void * getVirtualSegment(IOByteCount offset,
+					IOByteCount * length) APPLE_KEXT_DEPRECATED;
+#endif /* !__LP64__ */
+
+    virtual IOReturn setPurgeable( IOOptionBits newState,
+                                    IOOptionBits * oldState );
+
+    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
+                                         IOByteCount * length,
+#ifdef __LP64__
+                                         IOOptionBits  options = 0 );
+#else /* !__LP64__ */
+                                         IOOptionBits  options );
+#endif /* !__LP64__ */
+
+    virtual IOReturn prepare(IODirection forDirection = kIODirectionNone);
+
+    virtual IOReturn complete(IODirection forDirection = kIODirectionNone);
+
+    virtual IOReturn doMap(
+	vm_map_t		addressMap,
+	IOVirtualAddress *	atAddress,
+	IOOptionBits		options,
+	IOByteCount		sourceOffset = 0,
+	IOByteCount		length = 0 );
+
+    virtual IOReturn doUnmap(
+	vm_map_t		addressMap,
+	IOVirtualAddress	logical,
+	IOByteCount		length );
+
+    virtual bool serialize(OSSerialize *s) const;
+
+    // Factory method for cloning a persistent IOMD, see IOMemoryDescriptor
+    static IOMemoryDescriptor *
+	withPersistentMemoryDescriptor(IOGeneralMemoryDescriptor *originalMD);
+
+};
+
+#endif /* !defined(__LP64) || defined(_IOMEMORYDESCRIPTOR_INTERNAL_) */
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifdef __LP64__
+mach_vm_address_t 	IOMemoryMap::getAddress()
+{
+    return (getVirtualAddress());
+}
+
+mach_vm_size_t 	IOMemoryMap::getSize()
+{
+    return (getLength());
+}
+#else /* !__LP64__ */
+#include <IOKit/IOSubMemoryDescriptor.h>
+#endif /* !__LP64__ */
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#endif /* !_IOMEMORYDESCRIPTOR_H */
diff --git a/i386/include/IOKit/IOMessage.h b/i386/include/IOKit/IOMessage.h
new file mode 100644
index 0000000..3ca9e1e
--- /dev/null
+++ b/i386/include/IOKit/IOMessage.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef __IOKIT_IOMESSAGE_H
+#define __IOKIT_IOMESSAGE_H
+
+#include <IOKit/IOReturn.h>
+#include <IOKit/IOTypes.h>
+
+typedef UInt32 IOMessage;
+
+#define iokit_common_msg(message)          (UInt32)(sys_iokit|sub_iokit_common|message)
+#define iokit_family_msg(sub,message)      (UInt32)(sys_iokit|sub|message)
+
+/*! @defined iokit_vendor_specific_msg
+    @discussion iokit_vendor_specific_msg passes messages in the sub_iokit_vendor_specific
+    subsystem. It can be used to be generate messages that are used for private 
+    communication between vendor specific code with the  IOService::message() etc. APIs.
+*/
+#define iokit_vendor_specific_msg(message) (UInt32)(sys_iokit|sub_iokit_vendor_specific|message)
+
+#define kIOMessageServiceIsTerminated      iokit_common_msg(0x010)
+#define kIOMessageServiceIsSuspended       iokit_common_msg(0x020)
+#define kIOMessageServiceIsResumed         iokit_common_msg(0x030)
+
+#define kIOMessageServiceIsRequestingClose iokit_common_msg(0x100)
+#define kIOMessageServiceIsAttemptingOpen  iokit_common_msg(0x101)
+#define kIOMessageServiceWasClosed         iokit_common_msg(0x110)
+
+#define kIOMessageServiceBusyStateChange   iokit_common_msg(0x120)
+
+#define kIOMessageServicePropertyChange    iokit_common_msg(0x130)
+
+#define kIOMessageCanDevicePowerOff        iokit_common_msg(0x200)
+#define kIOMessageDeviceWillPowerOff       iokit_common_msg(0x210)
+#define kIOMessageDeviceWillNotPowerOff    iokit_common_msg(0x220)
+#define kIOMessageDeviceHasPoweredOn       iokit_common_msg(0x230)
+#define kIOMessageCanSystemPowerOff        iokit_common_msg(0x240)
+#define kIOMessageSystemWillPowerOff       iokit_common_msg(0x250)
+#define kIOMessageSystemWillNotPowerOff    iokit_common_msg(0x260)
+#define kIOMessageCanSystemSleep           iokit_common_msg(0x270)
+#define kIOMessageSystemWillSleep          iokit_common_msg(0x280)
+#define kIOMessageSystemWillNotSleep       iokit_common_msg(0x290)
+#define kIOMessageSystemHasPoweredOn       iokit_common_msg(0x300)
+#define kIOMessageSystemWillRestart        iokit_common_msg(0x310)
+#define kIOMessageSystemWillPowerOn        iokit_common_msg(0x320)
+
+#define kIOMessageCopyClientID		   iokit_common_msg(0x330)
+
+#endif /* ! __IOKIT_IOMESSAGE_H */
diff --git a/i386/include/IOKit/IOMultiMemoryDescriptor.h b/i386/include/IOKit/IOMultiMemoryDescriptor.h
new file mode 100644
index 0000000..42b19a4
--- /dev/null
+++ b/i386/include/IOKit/IOMultiMemoryDescriptor.h
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOMULTIMEMORYDESCRIPTOR_H
+#define _IOMULTIMEMORYDESCRIPTOR_H
+
+#include <IOKit/IOMemoryDescriptor.h>
+
+/*! @class IOMultiMemoryDescriptor : public IOMemoryDescriptor
+    @abstract The IOMultiMemoryDescriptor object describes a memory area made up of several other IOMemoryDescriptors.
+    @discussion The IOMultiMemoryDescriptor object represents multiple ranges of memory, specified as an ordered list of IOMemoryDescriptors.  The descriptors are chained end-to-end to make up a single contiguous buffer. */
+
+class IOMultiMemoryDescriptor : public IOMemoryDescriptor
+{
+    OSDeclareDefaultStructors(IOMultiMemoryDescriptor);
+
+protected:
+
+    IOMemoryDescriptor ** _descriptors;
+    UInt32                _descriptorsCount;
+    bool                  _descriptorsIsAllocated;
+
+    virtual void free();
+
+public:
+
+/*! @function withDescriptors
+    @abstract Create an IOMultiMemoryDescriptor to describe a memory area made up of several other IOMemoryDescriptors.
+    @discussion This method creates and initializes an IOMultiMemoryDescriptor for memory consisting of a number of other IOMemoryDescriptors, chained end-to-end (in the order they appear in the array) to represent a single contiguous memory buffer.  Passing the descriptor array as a reference will avoid an extra allocation.
+    @param descriptors An array of IOMemoryDescriptors which make up the memory to be described.
+    @param withCount The object count for the descriptors array.
+    @param withDirection An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
+    @param asReference If false, the IOMultiMemoryDescriptor object will make a copy of the descriptors array, otherwise, the array will be used in situ, avoiding an extra allocation.
+    @result The created IOMultiMemoryDescriptor on success, to be released by the caller, or zero on failure. */
+
+    static IOMultiMemoryDescriptor * withDescriptors(
+                                  IOMemoryDescriptor ** descriptors,
+                                  UInt32                withCount,
+                                  IODirection           withDirection,
+                                  bool                  asReference = false );
+
+/*! @function withDescriptors
+    @abstract Initialize an IOMultiMemoryDescriptor to describe a memory area made up of several other IOMemoryDescriptors.
+    @discussion This method initializes an IOMultiMemoryDescriptor for memory consisting of a number of other IOMemoryDescriptors, chained end-to-end (in the order they appear in the array) to represent a single contiguous memory buffer.  Passing the descriptor array as a reference will avoid an extra allocation.
+    @param descriptors An array of IOMemoryDescriptors which make up the memory to be described.
+    @param withCount The object count for the descriptors array.
+    @param withDirection An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
+    @param asReference If false, the IOMultiMemoryDescriptor object will make a copy of the descriptors array, otherwise, the array will be used in situ, avoiding an extra allocation.
+    @result The created IOMultiMemoryDescriptor on success, to be released by the caller, or zero on failure. */
+
+    virtual bool initWithDescriptors(
+                                  IOMemoryDescriptor ** descriptors,
+                                  UInt32                withCount,
+                                  IODirection           withDirection,
+                                  bool                  asReference = false );
+
+/*! @function getPhysicalSegment
+    @abstract Break a memory descriptor into its physically contiguous segments.
+    @discussion This method returns the physical address of the byte at the given offset into the memory, and optionally the length of the physically contiguous segment from that offset.
+    @param offset A byte offset into the memory whose physical address to return.
+    @param length If non-zero, getPhysicalSegment will store here the length of the physically contiguous segement at the given offset.
+    @result A physical address, or zero if the offset is beyond the length of the memory. */
+
+    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
+                                         IOByteCount * length,
+                                         IOOptionBits  options = 0 );
+
+/*! @function prepare
+    @abstract Prepare the memory for an I/O transfer.
+    @discussion This involves paging in the memory, if necessary, and wiring it down for the duration of the transfer.  The complete() method completes the processing of the memory after the I/O transfer finishes.  This method needn't called for non-pageable memory.
+    @param forDirection The direction of the I/O just completed, or kIODirectionNone for the direction specified by the memory descriptor.
+    @result An IOReturn code. */
+
+    virtual IOReturn prepare(IODirection forDirection = kIODirectionNone);
+
+/*! @function complete
+    @abstract Complete processing of the memory after an I/O transfer finishes.
+    @discussion This method should not be called unless a prepare was previously issued; the prepare() and complete() must occur in pairs, before and after an I/O transfer involving pageable memory.
+    @param forDirection The direction of the I/O just completed, or kIODirectionNone for the direction specified by the memory descriptor.
+    @result An IOReturn code. */
+
+    virtual IOReturn complete(IODirection forDirection = kIODirectionNone);
+};
+
+#endif /* !_IOMULTIMEMORYDESCRIPTOR_H */
diff --git a/i386/include/IOKit/IONVRAM.h b/i386/include/IOKit/IONVRAM.h
new file mode 100644
index 0000000..a9337bd
--- /dev/null
+++ b/i386/include/IOKit/IONVRAM.h
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IONVRAM_H
+#define _IOKIT_IONVRAM_H
+
+#include <IOKit/IOKitKeys.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IODeviceTreeSupport.h>
+#include <IOKit/nvram/IONVRAMController.h>
+
+
+#define kIODTNVRAMOFPartitionName       "common"
+#define kIODTNVRAMXPRAMPartitionName    "APL,MacOS75"
+#define kIODTNVRAMPanicInfoPartitonName "APL,OSXPanic"
+#define kIODTNVRAMFreePartitionName     "wwwwwwwwwwww"
+
+enum {
+  kIODTNVRAMImageSize        = 0x2000,
+  kIODTNVRAMXPRAMSize        = 0x0100,
+  kIODTNVRAMNameRegistrySize = 0x0400
+};
+
+enum {
+  kOFVariableTypeBoolean = 1,
+  kOFVariableTypeNumber,
+  kOFVariableTypeString,
+  kOFVariableTypeData
+};
+
+enum {
+  kOFVariablePermRootOnly = 0,
+  kOFVariablePermUserRead,
+  kOFVariablePermUserWrite,
+  kOFVariablePermKernelOnly
+};
+
+class IODTNVRAM : public IOService
+{
+  OSDeclareDefaultStructors(IODTNVRAM);
+  
+private:
+  IONVRAMController *_nvramController;
+  const OSSymbol    *_registryPropertiesKey;
+  UInt8             *_nvramImage;
+  bool              _nvramImageDirty;
+  UInt32            _ofPartitionOffset;
+  UInt32            _ofPartitionSize;
+  UInt8             *_ofImage;
+  bool              _ofImageDirty;
+  OSDictionary      *_ofDict;
+  OSDictionary      *_nvramPartitionOffsets;
+  OSDictionary      *_nvramPartitionLengths;
+  UInt32            _xpramPartitionOffset;
+  UInt32            _xpramPartitionSize;
+  UInt8             *_xpramImage;
+  UInt32            _nrPartitionOffset;
+  UInt32            _nrPartitionSize;
+  UInt8             *_nrImage;
+  UInt32            _piPartitionOffset;
+  UInt32            _piPartitionSize;
+  UInt8             *_piImage;
+  bool              _systemPaniced;
+  
+  virtual UInt8 calculatePartitionChecksum(UInt8 *partitionHeader);
+  virtual IOReturn initOFVariables(void);
+public:
+  virtual IOReturn syncOFVariables(void);
+private:
+  virtual UInt32 getOFVariableType(const OSSymbol *propSymbol) const;
+  virtual UInt32 getOFVariablePerm(const OSSymbol *propSymbol) const;
+  virtual bool getOWVariableInfo(UInt32 variableNumber, const OSSymbol **propSymbol,
+				 UInt32 *propType, UInt32 *propOffset);
+  virtual bool convertPropToObject(UInt8 *propName, UInt32 propNameLength,
+				   UInt8 *propData, UInt32 propDataLength,
+				   const OSSymbol **propSymbol,
+				   OSObject **propObject);
+  virtual bool convertObjectToProp(UInt8 *buffer, UInt32 *length,
+				   const OSSymbol *propSymbol, OSObject *propObject);
+  virtual UInt16 generateOWChecksum(UInt8 *buffer);
+  virtual bool validateOWChecksum(UInt8 *buffer);
+  virtual void updateOWBootArgs(const OSSymbol *key, OSObject *value);
+  virtual bool searchNVRAMProperty(struct IONVRAMDescriptor *hdr,
+				   UInt32 *where);
+  
+  virtual IOReturn readNVRAMPropertyType0(IORegistryEntry *entry,
+					  const OSSymbol **name,
+					  OSData **value);
+  virtual IOReturn writeNVRAMPropertyType0(IORegistryEntry *entry,
+					   const OSSymbol *name,
+					   OSData * value);
+  
+  virtual OSData *unescapeBytesToData(const UInt8 *bytes, UInt32 length);
+  virtual OSData *escapeDataToData(OSData * value);
+
+  virtual IOReturn readNVRAMPropertyType1(IORegistryEntry *entry,
+					  const OSSymbol **name,
+					  OSData **value);
+  virtual IOReturn writeNVRAMPropertyType1(IORegistryEntry *entry,
+					   const OSSymbol *name,
+					   OSData *value);
+  
+public:
+  virtual bool init(IORegistryEntry *old, const IORegistryPlane *plane);
+  
+  virtual void registerNVRAMController(IONVRAMController *nvram);
+  
+  virtual void sync(void);
+  
+  virtual bool serializeProperties(OSSerialize *s) const;
+  virtual OSObject *getProperty(const OSSymbol *aKey) const;
+  virtual OSObject *getProperty(const char *aKey) const;
+  virtual bool setProperty(const OSSymbol *aKey, OSObject *anObject);
+  virtual void removeProperty(const OSSymbol *aKey);
+  virtual IOReturn setProperties(OSObject *properties);
+  
+  virtual IOReturn readXPRAM(IOByteCount offset, UInt8 *buffer,
+			     IOByteCount length);
+  virtual IOReturn writeXPRAM(IOByteCount offset, UInt8 *buffer,
+			      IOByteCount length);
+  
+  virtual IOReturn readNVRAMProperty(IORegistryEntry *entry,
+				     const OSSymbol **name,
+				     OSData **value);
+  virtual IOReturn writeNVRAMProperty(IORegistryEntry *entry,
+				      const OSSymbol *name,
+				      OSData *value);
+  
+  virtual OSDictionary *getNVRAMPartitions(void);
+  
+  virtual IOReturn readNVRAMPartition(const OSSymbol *partitionID,
+				      IOByteCount offset, UInt8 *buffer,
+				      IOByteCount length);
+  
+  virtual IOReturn writeNVRAMPartition(const OSSymbol *partitionID,
+				       IOByteCount offset, UInt8 *buffer,
+				       IOByteCount length);  
+  
+  virtual IOByteCount savePanicInfo(UInt8 *buffer, IOByteCount length);
+};
+
+#endif /* !_IOKIT_IONVRAM_H */
diff --git a/i386/include/IOKit/IONotifier.h b/i386/include/IOKit/IONotifier.h
new file mode 100644
index 0000000..8f4378a
--- /dev/null
+++ b/i386/include/IOKit/IONotifier.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+#ifndef _IOKIT_IONOTIFIER_H
+#define _IOKIT_IONOTIFIER_H
+
+#include <libkern/c++/OSObject.h>
+
+/*! @class IONotifier : public OSObject
+    @abstract An abstract base class defining common methods for controlling a notification request.
+    @discussion IOService notification requests are represented as implementations of the IONotifier object. It defines methods to enable, disable and remove notification requests. These actions are synchronized with invocations of the notification handler, so removing a notification request will guarantee the handler is not being executed. */
+
+class IONotifier : public OSObject
+{
+    OSDeclareAbstractStructors(IONotifier)
+
+public:
+
+/*! @function remove
+    @abstract Removes the notification request and releases it.
+    @discussion Removes the notification request and release it. Since creating an IONotifier instance will leave it with a retain count of one, creating an IONotifier and then removing it will destroy it. This method is synchronous with any handler invocations, so when this method returns its guaranteed the handler will not be in entered. */
+
+    virtual void remove() = 0;
+
+/*! @function disable
+    @abstract Disables the notification request.
+    @discussion Disables the notification request. This method is synchronous with any handler invocations, so when this method returns its guaranteed the handler will not be in entered.
+    @result Returns the previous enable state of the IONotifier. */
+
+    virtual bool disable() = 0;
+    
+/*! @function enable
+    @abstract Sets the enable state of the notification request.
+    @discussion Restores the enable state of the notification request, given the previous state passed in.
+    @param was The enable state of the notifier to restore. */
+
+    virtual void enable( bool was ) = 0;
+
+};
+
+#endif /* ! _IOKIT_IONOTIFIER_H */
diff --git a/i386/include/IOKit/IOPlatformExpert.h b/i386/include/IOKit/IOPlatformExpert.h
new file mode 100644
index 0000000..f75a3e3
--- /dev/null
+++ b/i386/include/IOKit/IOPlatformExpert.h
@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOPLATFORMEXPERT_H
+#define _IOKIT_IOPLATFORMEXPERT_H
+
+#ifdef __cplusplus
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOInterrupts.h>
+#include <IOKit/IOInterruptController.h>
+
+extern "C" {
+#endif
+
+#include <libkern/OSTypes.h>
+
+extern boolean_t PEGetMachineName( char * name, int maxLength );
+extern boolean_t PEGetModelName( char * name, int maxLength );
+extern int PEGetPlatformEpoch( void );
+
+enum {
+  kPEHaltCPU,
+  kPERestartCPU,
+  kPEHangCPU,
+  kPEUPSDelayHaltCPU,
+  kPEPanicRestartCPU,
+  kPEPanicSync
+};
+extern int (*PE_halt_restart)(unsigned int type);
+extern int PEHaltRestart(unsigned int type);
+
+// Save the Panic Info.  Returns the number of bytes saved.
+extern UInt32 PESavePanicInfo(UInt8 *buffer, UInt32 length);
+
+extern long PEGetGMTTimeOfDay( void );
+extern void PESetGMTTimeOfDay( long secs );
+  
+#ifdef __cplusplus
+} /* extern "C" */
+
+#define kIOPlatformMapperPresentKey "IOPlatformMapperPresent"
+
+
+extern OSSymbol *               gPlatformInterruptControllerName;
+
+extern const OSSymbol *		gIOPlatformSleepActionKey;
+extern const OSSymbol *		gIOPlatformWakeActionKey;
+extern const OSSymbol *		gIOPlatformQuiesceActionKey;
+extern const OSSymbol *		gIOPlatformActiveActionKey;
+
+class IORangeAllocator;
+class IONVRAMController;
+class IOPMrootDomain;
+
+class IOPlatformExpert : public IOService
+{
+    OSDeclareDefaultStructors(IOPlatformExpert);
+
+private:
+    long _peBootROMType;
+    long _peChipSetType;
+    long _peMachineType;
+
+protected:
+    IOPMrootDomain * root;
+    int _pePMFeatures;
+    int _pePrivPMFeatures;
+    int _peNumBatteriesSupported;
+    OSArray  * thePowerTree;
+
+    bool       searchingForAdditionalParents;
+    OSNumber * multipleParentKeyValue;
+    int        numInstancesRegistered;
+
+    struct ExpansionData { };
+    ExpansionData *reserved;
+
+    virtual void setBootROMType(long peBootROMType);
+    virtual void setChipSetType(long peChipSetType);
+    virtual void setMachineType(long peMachineType);
+
+    virtual bool CheckSubTree (OSArray * inSubTree, IOService * theNub, IOService * theDevice, OSDictionary * theParent);
+    virtual bool RegisterServiceInTree (IOService * theService, OSDictionary * theTreeNode, OSDictionary * theTreeParentNode, IOService * theProvider);
+
+    virtual void PMInstantiatePowerDomains ( void );
+
+public:
+    virtual bool attach( IOService * provider );
+    virtual bool start( IOService * provider );
+    virtual bool configure( IOService * provider );
+    virtual IOService * createNub( OSDictionary * from );
+
+    virtual bool compareNubName( const IOService * nub, OSString * name,
+				 OSString ** matched = 0 ) const;
+    virtual IOReturn getNubResources( IOService * nub );
+
+    virtual long getBootROMType(void);
+    virtual long getChipSetType(void);
+    virtual long getMachineType(void);
+
+    virtual bool getModelName( char * name, int maxLength );
+    virtual bool getMachineName( char * name, int maxLength );
+
+    virtual int haltRestart(unsigned int type);
+    virtual void sleepKernel(void);
+
+    virtual long getGMTTimeOfDay( void );
+    virtual void setGMTTimeOfDay( long secs );
+
+    virtual IOReturn getConsoleInfo( PE_Video * consoleInfo );
+    virtual IOReturn setConsoleInfo( PE_Video * consoleInfo, unsigned int op );
+
+    virtual void registerNVRAMController( IONVRAMController * nvram );
+
+    virtual IOReturn registerInterruptController(OSSymbol *name, IOInterruptController *interruptController);
+    virtual IOInterruptController *lookUpInterruptController(OSSymbol *name);
+    virtual void setCPUInterruptProperties(IOService *service);
+    virtual bool atInterruptLevel(void);
+
+    virtual IOReturn callPlatformFunction(const OSSymbol *functionName,
+					  bool waitForFunction,
+					  void *param1, void *param2,
+					  void *param3, void *param4);
+
+    virtual IORangeAllocator * getPhysicalRangeAllocator(void);
+
+    virtual bool platformAdjustService(IOService *service);
+
+    virtual void PMRegisterDevice(IOService * theNub, IOService * theDevice);
+    virtual void PMLog ( const char *,unsigned long, unsigned long, unsigned long );
+
+    virtual bool hasPMFeature (unsigned long featureMask);
+    virtual bool hasPrivPMFeature (unsigned long privFeatureMask);
+    virtual int  numBatteriesSupported (void);
+
+    virtual IOByteCount savePanicInfo(UInt8 *buffer, IOByteCount length);
+
+    virtual OSString* createSystemSerialNumberString(OSData* myProperty);
+    
+    OSMetaClassDeclareReservedUsed(IOPlatformExpert,  0);
+    OSMetaClassDeclareReservedUsed(IOPlatformExpert,  1);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  2);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  3);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  4);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  5);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  6);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  7);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  8);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  9);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpert, 10);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpert, 11);
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+class IODTNVRAM;
+
+class IODTPlatformExpert : public IOPlatformExpert
+{
+    OSDeclareAbstractStructors(IODTPlatformExpert);
+
+private:
+    IODTNVRAM *dtNVRAM;
+
+    struct ExpansionData { };
+    ExpansionData *reserved;
+
+public:
+    virtual IOService * probe(	IOService * 	provider,
+				SInt32 	  *	score );
+    virtual bool configure( IOService * provider );
+
+    virtual void processTopLevel( IORegistryEntry * root );
+    virtual const char * deleteList( void ) = 0;
+    virtual const char * excludeList( void ) = 0;
+    virtual IOService * createNub( IORegistryEntry * from );
+    virtual bool createNubs( IOService * parent, OSIterator * iter );
+
+    virtual bool compareNubName( const IOService * nub, OSString * name,
+				 OSString ** matched = 0 ) const;
+
+    virtual IOReturn getNubResources( IOService * nub );
+
+    virtual bool getModelName( char * name, int maxLength );
+    virtual bool getMachineName( char * name, int maxLength );
+    
+    virtual void registerNVRAMController( IONVRAMController * nvram );
+
+    virtual int haltRestart(unsigned int type);
+
+    /* virtual */ IOReturn readXPRAM(IOByteCount offset, UInt8 * buffer,
+				     IOByteCount length);
+
+    /* virtual */ IOReturn writeXPRAM(IOByteCount offset, UInt8 * buffer,
+				      IOByteCount length);
+
+    virtual IOReturn readNVRAMProperty(
+	IORegistryEntry * entry,
+	const OSSymbol ** name, OSData ** value );
+
+    virtual IOReturn writeNVRAMProperty(
+	IORegistryEntry * entry,
+	const OSSymbol * name, OSData * value );
+
+    // This returns a dictionary describing all the NVRAM partitions.
+    // The keys will be the partitionIDs of the form "0x52,nvram".
+    // The values will be OSNumbers of the partition's byte count.
+    /* virtual */ OSDictionary *getNVRAMPartitions(void);
+
+    /* virtual */ IOReturn readNVRAMPartition(const OSSymbol * partitionID,
+					      IOByteCount offset, UInt8 * buffer,
+					      IOByteCount length);
+
+    /* virtual */ IOReturn writeNVRAMPartition(const OSSymbol * partitionID,
+					       IOByteCount offset, UInt8 * buffer,
+					       IOByteCount length);
+
+    virtual IOByteCount savePanicInfo(UInt8 *buffer, IOByteCount length);
+    virtual OSString* createSystemSerialNumberString(OSData* myProperty);
+
+    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  0);
+    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  1);
+    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  2);
+    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  3);
+    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  4);
+    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  5);
+    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  6);
+    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  7);
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* generic root nub of service tree */
+
+class IOPlatformExpertDevice : public IOService
+{
+    OSDeclareDefaultStructors(IOPlatformExpertDevice)
+
+private:
+    IOWorkLoop *workLoop;
+
+    struct ExpansionData { };
+    ExpansionData *reserved;
+
+public:
+    virtual bool initWithArgs( void * p1, void * p2,
+					void * p3, void *p4 );
+    virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
+
+    virtual IOWorkLoop *getWorkLoop() const;
+    virtual IOReturn setProperties( OSObject * properties );
+
+    virtual void free();
+
+    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  0);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  1);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  2);
+    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  3);
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* generic nub for motherboard devices */
+
+class IOPlatformDevice : public IOService
+{
+    OSDeclareDefaultStructors(IOPlatformDevice)
+
+    struct ExpansionData { };
+    ExpansionData *reserved;
+
+public:
+    virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
+    virtual IOService * matchLocation( IOService * client );
+    virtual IOReturn getResources( void );
+
+    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  0);
+    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  1);
+    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  2);
+    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  3);
+};
+
+#endif /* __cplusplus */
+
+#endif /* ! _IOKIT_IOPLATFORMEXPERT_H */
diff --git a/i386/include/IOKit/IORangeAllocator.h b/i386/include/IOKit/IORangeAllocator.h
new file mode 100644
index 0000000..d81bbef
--- /dev/null
+++ b/i386/include/IOKit/IORangeAllocator.h
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.
+ *
+ *
+ * HISTORY
+ *
+ * sdouglas 05 Nov 99 - created.
+ */
+
+#ifndef _IOKIT_IORANGEALLOCATOR_H
+#define _IOKIT_IORANGEALLOCATOR_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOTypes.h>
+
+typedef IOByteCount IORangeScalar;
+
+/*! @class IORangeAllocator
+    @abstract A utility class to manage allocations from a range.
+    @discussion The IORangeAllocator class provides functions for allocating ranges, at a fixed or any offset, and freeing them back to a free list. It is useful for describing ranges of memory or address space without requiring storage in the memory - information describing the free elements is kept elsewhere. Ranges are described by a start offset and a size. IORangeAllocator is optionally protected against multithreaded access. 
+*/
+
+class IORangeAllocator : public OSObject {
+
+    OSDeclareDefaultStructors(IORangeAllocator)
+
+protected:
+    UInt32		numElements;
+    UInt32		capacity;
+    UInt32		capacityIncrement;
+    IORangeScalar	defaultAlignmentMask;
+    IOOptionBits	options;
+
+    struct IORangeAllocatorElement * 	elements;
+
+private:
+    virtual bool allocElement( UInt32 index );
+
+    virtual void deallocElement( UInt32 index );
+
+public:
+    enum {
+	kLocking	= 0x00000001
+    };
+
+/*! @function init
+    @abstract Standard initializer for IORangeAllocator.
+    @discussion This method initializes an IORangeAllocator and optionally sets the free list to contain one fragment, from zero to an endOfRange parameter. The capacity in terms of free fragments and locking options are set for the instance.
+    @param endOfRange If the free list is to contain an initial fragment, set endOfRange to the last offset in the range, ie. size - 1, to create a free fragment for the range zero to endOfRange inclusive. If zero is passed, the free list will be initialized empty, and can be populated with calls to the deallocate method.
+    @param defaultAlignment If this parameter is non-zero it specifies a required alignment for all allocations, for example pass 256 to align allocations on 256 byte boundaries. Zero or one specify unaligned allocations.
+    @param capacity Sets the initial size of the free list in number of noncontiguous fragments. This value is also used for the capacityIncrement.
+    @param options Pass kLocking if the instance can be used by multiple threads.
+    @result Returns true if the instance is successfully initialized, false on failure. */
+
+    virtual bool init( IORangeScalar endOfRange,
+			IORangeScalar defaultAlignment,
+			UInt32 capacity,
+			IOOptionBits options );
+
+/*! @function withRange
+    @abstract Standard factory method for IORangeAllocator.
+    @discussion This method allocates and initializes an IORangeAllocator and optionally sets the free list to contain one fragment, from zero to an endOfRange parameter. The capacity in terms of free fragments and locking options are set for the instance.
+    @param endOfRange If the free list is to contain an initial fragment, set endOfRange to the last offset in the range, ie. size - 1, to create a free fragment for the range zero to endOfRange inclusive. If zero is passed the free list will be initialized empty, and can be populated with calls to the deallocate method.
+    @param defaultAlignment If this parameter is non-zero it specifies a required alignment for all allocations, for example pass 256 to align allocations on 256 byte boundaries. Zero or one specify unaligned allocations.
+    @param capacity Sets the initial size of the free list in number of non-contiguous fragments. This value is also used for the capacityIncrement.
+    @param options Pass kLocking if the instance can be used by multiple threads.
+    @result Returns the new IORangeAllocator instance, to be released by the caller, or zero on failure. */
+
+    static IORangeAllocator * withRange( IORangeScalar endOfRange,
+					IORangeScalar defaultAlignment = 0,
+					UInt32 capacity = 0,
+					IOOptionBits options = 0 );
+
+    virtual void free();
+    virtual bool serialize(OSSerialize *s) const;
+
+/*! @function getFragmentCount
+    @abstract Accessor to return the number of free fragments in the range.
+    @discussion This method returns a count of free fragments. Each fragment describes a non-contiguous free range - deallocations will merge contiguous fragments together.
+    @result Returns the count of free fragments. 
+*/
+
+    virtual UInt32 getFragmentCount( void );
+
+/*! @function getFragmentCapacity
+    @abstract Accessor to return the number of free fragments in the range.
+    @discussion This method returns the current capacity of the free fragment list.
+    @result Returns the current capacity of free fragment list. 
+*/
+
+    virtual UInt32 getFragmentCapacity( void );
+
+/*! @function setFragmentCapacityIncrement
+    @abstract Sets the count of fragments the free list will increase by when full.
+    @discussion This method sets the number of extra fragments the free list will expand to when full. It defaults to the initial capacity.
+    @param count The number of fragments to increment the capacity by when the free list is full. 
+*/
+
+    virtual void setFragmentCapacityIncrement( UInt32 count );
+
+/*! @function getFreeCount
+    @abstract Totals the sizes of the free fragments.
+    @discussion This method returns the total of the sizes of the fragments on the free list.
+    @result Returns the total of the free fragments sizes. 
+*/
+
+    virtual IORangeScalar getFreeCount( void );
+
+/*! @function allocate
+    @abstract Allocates from the free list, at any offset.
+    @discussion This method allocates a range from the free list. The alignment will default to the alignment set when the allocator was created or may be set here. 
+    @param size The size of the range requested.
+    @param result The beginning of the range allocated is returned here on success.
+    @param alignment If zero is passed, default to the allocators alignment, otherwise pass an alignment required for the allocation, for example 4096 to page align.
+    @result Returns true if the allocation was successful, else false. 
+*/
+
+    virtual bool allocate( IORangeScalar size,
+				 	    IORangeScalar * result,
+				 	    IORangeScalar alignment = 0 );
+
+/*! @function allocateRange
+    @abstract Allocates from the free list, at a set offset.
+    @discussion This method allocates a range from the free list, given a set offset passed in. 
+    @param start The beginning of the range requested.
+    @param size The size of the range requested.
+    @result Returns true if the allocation was successful, else false.
+*/
+
+    virtual bool allocateRange( IORangeScalar start,
+						    IORangeScalar size );
+
+/*! @function deallocate
+    @abstract Deallocates a range to the free list.
+    @discussion This method deallocates a range to the free list, given a the start offset and length passed in. 
+    @param start The beginning of the range requested.
+    @param size Returns the size of the range requested. 
+*/
+
+    virtual void deallocate( IORangeScalar start,
+			     		 IORangeScalar size );
+};
+
+#endif /* _IOKIT_IORANGEALLOCATOR_H */
diff --git a/i386/include/IOKit/IORegistryEntry.h b/i386/include/IOKit/IORegistryEntry.h
new file mode 100644
index 0000000..bbe4b18
--- /dev/null
+++ b/i386/include/IOKit/IORegistryEntry.h
@@ -0,0 +1,947 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOREGISTRYENTRY_H
+#define _IOKIT_IOREGISTRYENTRY_H
+
+#include <IOKit/IOTypes.h>
+#include <libkern/c++/OSContainers.h>
+
+
+extern const OSSymbol * gIONameKey;
+extern const OSSymbol * gIOLocationKey;
+extern const OSSymbol * gIORegistryEntryIDKey;
+
+class IORegistryEntry;
+class IORegistryPlane;
+class IORegistryIterator;
+
+typedef void (*IORegistryEntryApplierFunction)(IORegistryEntry * entry,
+                                               void * context);
+
+enum {
+    kIORegistryIterateRecursively	= 0x00000001,
+    kIORegistryIterateParents		= 0x00000002
+};
+
+/*! @class IORegistryEntry : public OSObject
+    @abstract The base class for all objects in the registry.
+    @discussion The IORegistryEntry base class provides functions for describing graphs of connected registry entries, each with a dictionary-based property table. Entries may be connected in different planes, with differing topologies. Access to the registry is protected against multiple threads. Inside the kernel planes are specified with plane objects and are published by the creator - IOService exports the gIOServicePlane plane object for example. Non kernel clients specify planes by their name.
+*/
+
+class IORegistryEntry : public OSObject
+{
+    friend class IORegistryIterator;
+
+    OSDeclareDefaultStructors(IORegistryEntry)
+
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of this class in the future.
+    */    
+    struct ExpansionData
+    {
+	uint64_t	fRegistryEntryID;
+    };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData * reserved;
+
+private:
+
+    OSDictionary *	fRegistryTable;
+    OSDictionary *	fPropertyTable;
+
+public:
+    /* methods available in Mac OS X 10.1 or later */
+
+/*! @function copyProperty
+    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy. Available in Mac OS X 10.1 or later.
+    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
+    @param aKey The property's name as a C-string.
+    @param plane The plane to iterate over, eg. gIOServicePlane.
+    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
+    @result The property value found, or zero. A reference on any found property is returned to caller, which should be released. */
+
+    virtual OSObject * copyProperty( const char *           aKey,
+                                     const IORegistryPlane * plane,
+                                     IOOptionBits            options =
+                                        kIORegistryIterateRecursively |
+                                        kIORegistryIterateParents) const;
+
+/*! @function copyProperty
+    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy. Available in Mac OS X 10.1 or later.
+    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
+    @param aKey The property's name as an OSString.
+    @param plane The plane to iterate over, eg. gIOServicePlane.
+    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
+    @result The property value found, or zero. A reference on any found property is returned to caller, which should be released. */
+
+    virtual OSObject * copyProperty( const OSString *        aKey,
+                                     const IORegistryPlane * plane,
+                                     IOOptionBits            options =
+                                        kIORegistryIterateRecursively |
+                                        kIORegistryIterateParents) const;
+
+/*! @function copyProperty
+    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy. Available in Mac OS X 10.1 or later.
+    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
+    @param aKey The property's name as an OSSymbol.
+    @param plane The plane to iterate over, eg. gIOServicePlane.
+    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
+    @result The property value found, or zero. A reference on any found property is returned to caller, which should be released. */
+
+    virtual OSObject * copyProperty( const OSSymbol *        aKey,
+                                     const IORegistryPlane * plane,
+                                     IOOptionBits            options =
+                                        kIORegistryIterateRecursively |
+                                        kIORegistryIterateParents) const;
+
+/*! @function copyParentEntry
+    @abstract Returns an registry entry's first parent entry in a plane. Available in Mac OS X 10.1 or later.
+    @discussion This function will return the parent to which a registry entry was first attached. Since the majority of registry entrys have only one provider, this is a useful simplification.
+    @param plane The plane object.
+    @result Returns the first parent of the registry entry, or zero if the entry is not attached into the registry in that plane. A reference on the entry is returned to caller, which should be released. */
+
+    virtual IORegistryEntry * copyParentEntry( const IORegistryPlane * plane ) const;
+
+/*! @function copyChildEntry
+    @abstract Returns an registry entry's first child entry in a plane. Available in Mac OS X 10.1 or later.
+    @discussion This function will return the child which first attached to a registry entry.
+    @param plane The plane object.
+    @result Returns the first child of the registry entry, or zero if the entry is not attached into the registry in that plane. A reference on the entry is returned to caller, which should be released. */
+
+    virtual IORegistryEntry * copyChildEntry( const IORegistryPlane * plane ) const;
+
+    /* method available in Mac OS X 10.4 or later */
+/*!
+    @typedef Action
+    @discussion Type and arguments of callout C function that is used when
+a runCommand is executed by a client.  Cast to this type when you want a C++
+member function to be used.  Note the arg1 - arg3 parameters are passed straight pass through to the action callout.
+    @param target
+	Target of the function, can be used as a refcon.  Note if a C++ function
+was specified, this parameter is implicitly the first parameter in the target
+member function's parameter list.
+    @param arg0 Argument to action from run operation.
+    @param arg1 Argument to action from run operation.
+    @param arg2 Argument to action from run operation.
+    @param arg3 Argument to action from run operation.
+*/
+    typedef IOReturn (*Action)(OSObject *target,
+			       void *arg0, void *arg1,
+			       void *arg2, void *arg3);
+
+/*! @function runPropertyAction
+    @abstract Single thread a call to an action w.r.t. the property lock
+    @discussion Client function that causes the given action to be called in a manner that syncrhonises with the registry iterators and serialisers.  This functin can be used to synchronously manipulate the property table of this nub
+    @param action Pointer to function to be executed in work-loop context.
+    @param arg0 Parameter for action parameter, defaults to 0.
+    @param arg1 Parameter for action parameter, defaults to 0.
+    @param arg2 Parameter for action parameter, defaults to 0.
+    @param arg3 Parameter for action parameter, defaults to 0.
+    @result Returns the value of the Action callout.
+*/
+    virtual IOReturn runPropertyAction(Action action, OSObject *target,
+			       void *arg0 = 0, void *arg1 = 0,
+			       void *arg2 = 0, void *arg3 = 0);
+
+private:
+#if __LP64__
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 0);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 1);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 2);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 3);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 4);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 5);
+#else
+    OSMetaClassDeclareReservedUsed(IORegistryEntry, 0);
+    OSMetaClassDeclareReservedUsed(IORegistryEntry, 1);
+    OSMetaClassDeclareReservedUsed(IORegistryEntry, 2);
+    OSMetaClassDeclareReservedUsed(IORegistryEntry, 3);
+    OSMetaClassDeclareReservedUsed(IORegistryEntry, 4);
+    OSMetaClassDeclareReservedUsed(IORegistryEntry, 5);
+#endif
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 6);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 7);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 8);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 9);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 10);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 11);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 12);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 13);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 14);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 15);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 16);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 17);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 18);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 19);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 20);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 21);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 22);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 23);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 24);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 25);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 26);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 27);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 28);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 29);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 30);
+    OSMetaClassDeclareReservedUnused(IORegistryEntry, 31);
+
+public:
+
+    /* Registry accessors */
+
+/*! @function getRegistryRoot
+    @abstract Returns a pointer to the root instance of the registry.
+    @discussion This method provides an accessor to the root of the registry for the machine. The root may be passed to a registry iterator when iterating a plane, and contains properties that describe the available planes, and diagnostic information for IOKit. Keys for these properties are in IOKitKeys.h.
+    @result A pointer to the IORegistryEntry root instance. It should not be released by the caller. */
+
+    static IORegistryEntry * getRegistryRoot( void );
+    
+/*! @function getGenerationCount
+    @abstract Returns an generation count for all registry changing operations.
+    @discussion This method provides an accessor to the current generation count (or seed) of the registry which changes when any topology change occurs in the registry - this does not include property table changes. It may be used to invalidate any caching of the results from IORegistryEntry methods.
+    @result An integer generation count. */
+
+    static SInt32 	     getGenerationCount( void );
+
+/*! @function getPlane
+    @abstract Looks up the plane object by a C-string name.
+    @discussion Planes are usually provided as globals by the creator, eg. gIOServicePlane, gIODeviceTreePlane, or gIOAudioPlane, however they may also be looked up by name with this method.
+    @result A pointer to the plane object, or zero if no such plane exists. The returned plane should not be released. */
+
+    static const IORegistryPlane * getPlane( const char * name );
+
+    /* Registry Entry allocation & init */
+
+/*! @function init
+    @abstract Standard init method for all IORegistryEntry subclasses.
+    @discussion A registry entry must be initialized with this method before it can be used. A property dictionary may passed and will be retained by this method for use as the registry entry's property table, or an empty one will be created.
+    @param A dictionary that will become the registry entry's property table (retaining it), or zero which will cause an empty property table to be created.
+    @result true on success, or false on a resource failure. */
+
+    virtual bool init( OSDictionary * dictionary = 0 );
+
+/*! @function free
+    @abstract Standard free method for all IORegistryEntry subclasses.
+    @discussion This method will release any resources of the entry, in particular its property table. Note that the registry entry must always be detached from the registry before free may be called, and subclasses (namely IOService) will have additional protocols for removing registry entries. free should never need be called directly. */
+
+    virtual void free( void );
+
+/*! @function setPropertyTable
+    @abstract Replace a registry entry's property table.
+    @discussion This method will release the current property table of a the entry and replace it with another, retaining the new property table.
+    @param dict The new dictionary to be used as the entry's property table. */
+
+    virtual void setPropertyTable( OSDictionary * dict );
+
+    /* Synchronized property accessors; wrappers to OSDictionary
+     * plus property creation helpers */
+
+/*! @function setProperty
+    @abstract Synchronized method to add a property to a registry entry's property table.
+    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The properties name as an OSSymbol.
+    @param anObject The property value.
+    @result true on success or false on a resource failure. */
+
+    virtual bool setProperty(const OSSymbol * aKey, OSObject * anObject);
+
+/*! @function setProperty
+    @abstract Synchronized method to add a property to a registry entry's property table.
+    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as an OSString.
+    @param anObject The property value.
+    @result true on success or false on a resource failure. */
+
+    virtual bool setProperty(const OSString * aKey, OSObject * anObject);
+
+/*! @function setProperty
+    @abstract Synchronized method to add a property to a registry entry's property table.
+    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as a C-string.
+    @param anObject The property value.
+    @result true on success or false on a resource failure. */
+
+    virtual bool setProperty(const char * aKey, OSObject * anObject);
+
+/*! @function setProperty
+    @abstract Synchronized method to construct and add a OSString property to a registry entry's property table.
+    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table. The property is created as an OSString from the supplied C-string, set in the property table with the given name, and released.
+    @param aKey The property's name as a C-string.
+    @param aString The property value as a C-string.
+    @result true on success or false on a resource failure. */
+
+    virtual bool setProperty(const char * aKey, const char * aString);
+
+/*! @function setProperty
+    @abstract Synchronized method to construct and add an OSBoolean property to a registry entry's property table.
+    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table. The property is created as an OSBoolean from the supplied value, set in the property table with the given name, and released.
+    @param aKey The property's name as a C-string.
+    @param aBoolean The property's boolean value.
+    @result true on success or false on a resource failure. */
+
+    virtual bool setProperty(const char * aKey, bool aBoolean);
+
+/*! @function setProperty
+    @abstract Synchronized method to construct and add an OSNumber property to a registry entry's property table.
+    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table. The property is created as an OSNumber from the supplied value and size, set in the property table with the given name, and released.
+    @param aKey The property's name as a C-string.
+    @param aValue The property's numeric value.
+    @param aNumberOfBits The property's size in bits, for OSNumber.
+    @result true on success or false on a resource failure. */
+
+    virtual bool setProperty( const char *       aKey,
+                              unsigned long long aValue,
+                              unsigned int       aNumberOfBits);
+
+/*! @function setProperty
+    @abstract Synchronized method to construct and add an OSData property to a registry entry's property table.
+    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table. The property is created as an OSData copied from the supplied data and length, set in the property table with the given name, and released.
+    @param aKey The property's name as a C-string.
+    @param bytes The property's value as a pointer. OSData will copy this data.
+    @param length The property's size in bytes, for OSData.
+    @result true on success or false on a resource failure. */
+
+    virtual bool setProperty( const char *       aKey,
+                              void *      	 bytes,
+                              unsigned int       length);
+
+/*! @function removeProperty
+    @abstract Synchronized method to remove a property from a registry entry's property table.
+    @discussion This method will remove a property from a registry entry's property table, using the OSDictionary::removeObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as an OSSymbol. */
+
+    virtual void removeProperty( const OSSymbol * aKey);
+
+/*! @function removeProperty
+    @abstract Synchronized method to remove a property from a registry entry's property table.
+    @discussion This method will remove a property from a registry entry's property table, using the OSDictionary::removeObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as an OSString. */
+
+    virtual void removeProperty( const OSString * aKey);
+
+/*! @function removeProperty
+    @abstract Synchronized method to remove a property from a registry entry's property table.
+    @discussion This method will remove a property from a registry entry's property table, using the OSDictionary::removeObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as a C-string. */
+
+    virtual void removeProperty( const char * aKey);
+
+/*! @function getProperty
+    @abstract Synchronized method to obtain a property from a registry entry's property table.
+    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as an OSSymbol.
+    @result The property value found, or zero. */
+
+    virtual OSObject * getProperty( const OSSymbol * aKey) const;
+
+/*! @function getProperty
+    @abstract Synchronized method to obtain a property from a registry entry's property table.
+    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as an OSString.
+    @result The property value found, or zero. */
+
+    virtual OSObject * getProperty( const OSString * aKey) const;
+
+/*! @function getProperty
+    @abstract Synchronized method to obtain a property from a registry entry's property table.
+    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as a C-string.
+    @result The property value found, or zero. */
+
+    virtual OSObject * getProperty( const char * aKey) const;
+
+/*! @function getProperty
+    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy.
+    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
+    @param aKey The property's name as an OSSymbol.
+    @param plane The plane to iterate over, eg. gIOServicePlane.
+    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
+    @result The property value found, or zero. */
+
+    virtual OSObject * getProperty( const OSSymbol *        aKey,
+                                    const IORegistryPlane * plane,
+                                    IOOptionBits            options =
+                                        kIORegistryIterateRecursively |
+                                        kIORegistryIterateParents) const;
+
+/*! @function getProperty
+    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy.
+    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
+    @param aKey The property's name as an OSString.
+    @param plane The plane to iterate over, eg. gIOServicePlane.
+    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
+    @result The property value found, or zero. */
+
+    virtual OSObject * getProperty( const OSString *        aKey,
+                                    const IORegistryPlane * plane,
+                                    IOOptionBits            options =
+                                        kIORegistryIterateRecursively |
+                                        kIORegistryIterateParents) const;
+
+/*! @function getProperty
+    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy.
+    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
+    @param aKey The property's name as a C-string.
+    @param plane The plane to iterate over, eg. gIOServicePlane.
+    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
+    @result The property value found, or zero. */
+
+    virtual OSObject * getProperty( const char *            aKey,
+                                    const IORegistryPlane * plane,
+                                    IOOptionBits            options =
+                                        kIORegistryIterateRecursively |
+                                        kIORegistryIterateParents) const;
+
+/*! @function copyProperty
+    @abstract Synchronized method to obtain a property from a registry entry's property table.
+    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics, and return a reference to the caller. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as an OSSymbol.
+    @result The property value found, or zero. It should be released by the caller. */
+
+    virtual OSObject * copyProperty( const OSSymbol * aKey) const;
+
+/*! @function copyProperty
+    @abstract Synchronized method to obtain a property from a registry entry's property table.
+    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics, and return a reference to the caller. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as an OSString.
+    @result The property value found, or zero. It should be released by the caller. */
+
+    virtual OSObject * copyProperty( const OSString * aKey) const;
+
+/*! @function copyProperty
+    @abstract Synchronized method to obtain a property from a registry entry's property table.
+    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics, and return a reference to the caller. This method is synchronized with other IORegistryEntry accesses to the property table.
+    @param aKey The property's name as a C-string.
+    @result The property value found, or zero. It should be released by the caller. */
+
+    virtual OSObject * copyProperty( const char * aKey) const;
+
+/*! @function dictionaryWithProperties
+    @abstract Synchronized method to obtain copy a registry entry's property table.
+    @discussion This method will copy a registry entry's property table, using the OSDictionary::withDictionary semantics. This method is synchronized with other IORegistryEntry accesses to the property table. Since OSDictionary will only copy property values by reference, synchronization is not guaranteed to any collection values.
+    @result The created dictionary, or zero on a resource value. It should be released by the caller. */
+
+    virtual OSDictionary * dictionaryWithProperties( void ) const;
+
+/*! @function serializeProperties
+    @abstract Synchronized method to serialize a registry entry's property table.
+    @discussion This method will serialize a registry entry's property table, using the OSDictionary::serialize semantics. This method is synchronized with other IORegistryEntry accesses to the property table. Many non-kernel clients of IOKit read information from the registry via properties, and will invoke this method in a registry entry to create a serialization of all the entry's properties, which is then reconstructed in the client's task as a CFDictionary. This method may be intercepted by subclasses to update their properties or implement a different serialization method, though it is usually better to implement such functionality by creating objects in the property table and implementing their serialize methods, avoiding any need to implement serializeProperties.
+    @param serialize The OSSerialize instance representing the serialization request.
+    @result True on success, false otherwise. */
+
+    virtual bool serializeProperties( OSSerialize * serialize ) const;
+
+    /* Unsynchronized(!) property table access */
+
+/*! @function getPropertyTable
+    @abstract Unsynchronized accessor to a registry entry's property table.
+    @discussion This method will return a pointer to the live property table as an OSDictionery. Its use is not recommended in most cases, instead use the synchronized accessors and helper functions of IORegistryEntry to access properties. It can only safely be used by one thread, which usually means it can only be used before a registry entry is entered into the registry.
+    @result A pointer to the property table as an OSDictionary. The pointer is valid while the registry entry is retained, and should not be released by the caller. */
+
+    /* inline */ OSDictionary * getPropertyTable( void ) const;
+            /* { return(fPropertyTable); } */
+
+    /* Set properties from user level, to be overridden if supported */
+
+/*! @function setProperties
+    @abstract Optionally supported external method to set properties in a registry entry.
+    @discussion This method is not implemented by IORegistryEntry, but is available to kernel and non-kernel clients to set properties in a registry entry. IOUserClient provides connection based, more controlled access to this functionality and may be more appropriate for many uses, since there is no differentiation between clients available to this method.
+    @param properties Any OSObject subclass, to be interpreted by the implementing method - for example an OSDictionary, OSData etc. may all be appropriate.
+    @result An IOReturn code to be returned to the caller. */
+
+    virtual IOReturn setProperties( OSObject * properties );
+
+    /* Topology */
+
+/*! @function getParentIterator
+    @abstract Returns an iterator over an registry entry's parent entries in a specified plane.
+    @param plane The plane object.
+    @result Returns an iterator over the parents of the registry entry, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, though they may no longer be attached during the iteration. */
+
+    virtual OSIterator * getParentIterator( const IORegistryPlane * plane )
+									const;
+    virtual void applyToParents( IORegistryEntryApplierFunction applier,
+                                 void * context,
+                                 const IORegistryPlane * plane ) const;
+
+/*! @function getParentEntry
+    @abstract Returns an registry entry's first parent entry in a plane.
+    @discussion This function will return the parent to which a registry entry was first attached. Since the majority of registry entrys have only one provider, this is a useful simplification.
+    @param plane The plane object.
+    @result Returns the first parent of the registry entry, or zero if the entry is not attached into the registry in that plane. The parent is retained while the entry is attached, and should not be released by the caller. */
+
+    virtual IORegistryEntry * getParentEntry( const IORegistryPlane * plane ) const;
+
+/*! @function getChildIterator
+    @abstract Returns an iterator over an registry entry's child entries in a plane.
+    @discussion This method creates an iterator which will return each of a registry entry's child entries in a specified plane.
+    @param plane The plane object.
+    @result Returns an iterator over the children of the entry, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, though they may no longer be attached during the iteration. */
+
+    virtual OSIterator * getChildIterator( const IORegistryPlane * plane )
+									const;
+
+    virtual void applyToChildren( IORegistryEntryApplierFunction applier,
+                                  void * context,
+                                  const IORegistryPlane * plane ) const;
+
+/*! @function getChildEntry
+    @abstract Returns an registry entry's first child entry in a plane.
+    @discussion This function will return the child which first attached to a registry entry.
+    @param plane The plane object.
+    @result Returns the first child of the registry entry, or zero if the entry is not attached into the registry in that plane. The child is retained while the entry is attached, and should not be released by the caller. */
+
+    virtual IORegistryEntry * getChildEntry( const IORegistryPlane * plane ) const;
+
+/*! @function isChild
+    @abstract Determines whether a registry entry is the child of another in a plane.
+    @discussion This method called in the parent entry determines if the specified entry is a child, in a plane. Additionally, it can check if the child is the only child of the parent entry.
+    @param child The possible child registry entry.
+    @param plane The plane object.
+    @param onlyChild If true, check also if the child is the only child.
+    @result If the child argument is not a child of the registry entry, false is returned. If onlyChild is true and the child is not the only child of the entry, false is returned, otherwise true is returned. */
+
+    virtual bool isChild( IORegistryEntry * child,
+                                const IORegistryPlane * plane,
+				bool onlyChild = false ) const;
+
+/*! @function isParent
+    @abstract Determines whether a registry entry is the parent of another in a plane.
+    @discussion This method called in the child entry determines if the specified entry is a parent, in a plane. Additionally, it can check if the parent is the only parent of the child entry.
+    @param parent The possible parent registry entry.
+    @param plane The plane object.
+    @param onlyParent If true, check also if the parent is the only parent.
+    @result If the parent argument is not a parent of the registry entry, false is returned. If onlyParent is true and the parent is not the only parent of the entry, false is returned, otherwise true is returned. */
+
+    virtual bool isParent( IORegistryEntry * parent,
+                                const IORegistryPlane * plane,
+				bool onlyParent = false ) const;
+
+/*! @function inPlane
+    @abstract Determines whether a registry entry is attached in a plane.
+    @discussion This method determines if the entry is attached in a plane to any other entry.  It can also be used to determine if the entry is a member of any plane.
+    @param plane The plane object, 0 indicates any plane.
+    @result If the entry has a parent in the given plane or if plane = 0 then if entry has any parent; return true, otherwise false. */
+
+    virtual bool inPlane( const IORegistryPlane * plane = 0) const;
+
+/*! @function getDepth
+    @abstract Counts the maximum number of entries between an entry and the registry root, in a plane.
+    @discussion This method counts the number of entries between and entry and the registry root, in a plane, for each parent of the entry and returns the maximum value.
+    @param plane The plane object.
+    @result The maximum number of entries between the entry and the root. Zero is returned if the entry is not attached in the plane. */
+
+    virtual unsigned int getDepth( const IORegistryPlane * plane ) const;
+
+    /* Attach / detach */
+
+/*! @function attachToParent
+    @abstract Attaches a entry to a parent entry in a plane.
+    @discussion This is the usual method of entering an entry into the registry. It is a no-op and success if the entry is already attached to the parent. Attaching the  entry into the registry retains both the child and parent while they are attached. This method will call attachToChild in the parent entry if it is not being called from attachToChild.
+    @param parent The registry entry to attach to.
+    @param plane The plane object.
+    @result true on success, or false on a resource failure, or if the parent is the same as the child. */
+
+    virtual bool attachToParent( IORegistryEntry * parent,
+                                const IORegistryPlane * plane );
+
+/*! @function detachFromParent
+    @abstract Detaches an entry from a parent entry in a plane.
+    @discussion This is the usual method of removing an entry from the registry. It is a no-op if the entry is not attached to the parent. Detaching the entry will release both the child and parent. This method will call detachFromChild in the parent entry if it is not being called from detachFromChild.
+    @param parent The registry entry to detach from.
+    @param plane The plane object. */
+
+    virtual void detachFromParent( IORegistryEntry * parent,
+                                const IORegistryPlane * plane );
+
+/*! @function attachToChild
+    @abstract Method called in the parent entry when a child attaches.
+    @discussion This method is called in the parent entry when a child attaches, to make overrides possible. This method will also call attachToParent in the child entry if it is not being called from attachToParent. It is a no-op and success if the entry is already a child. Attaching the  entry into the registry retains both the child and parent while they are attached.
+    @param child The registry entry being attached.
+    @param plane The plane object.
+    @result true on success, or false on a resource failure, or if the parent is the same as the child. */
+
+    virtual bool attachToChild( IORegistryEntry * child,
+                                const IORegistryPlane * plane );
+
+/*! @function detachFromChild
+    @abstract Detaches a child entry from its parent in a plane.
+    @discussion This method is called in the parent entry when a child detaches, to make overrides possible. It is a no-op if the entry is not a child of the parent. Detaching the entry will release both the child and parent. This method will call detachFromParent in the child entry if it is not being called from detachFromParent.
+    @param parent The registry entry to detach.
+    @param plane The plane object. */
+
+    virtual void detachFromChild( IORegistryEntry * child,
+                                const IORegistryPlane * plane );
+
+/*! @function detachAbove
+    @abstract Detaches an entry from all its parent entries in a plane.
+    @discussion This method calls detachFromParent in the entry for each of its parent entries in the plane.
+    @param plane The plane object. */
+
+    virtual void detachAbove( const IORegistryPlane * plane );
+
+/*! @function detachAll
+    @abstract Detaches an entry and all its children recursively in a plane.
+    @discussion This method breaks the registry connections for a subtree. detachAbove is called in the entry, and all child entries and their children in the plane.
+    @param plane The plane object. */
+
+    virtual void detachAll( const IORegistryPlane * plane );
+
+    /* Name, location and path accessors */
+
+/*! @function getName
+    @abstract Returns the name assigned to the registry entry as a C-string.
+    @discussion Entries can be named in a particular plane, or globally. If the entry is named in plane and the plane is specified that name will be returned, otherwise the global name is returned. The global name defaults to the entry's meta class name if it has not been named.
+    @param plane The plane object, or zero for the global name.
+    @result A C-string name, valid while the entry is retained. */
+
+    virtual const char * getName( const IORegistryPlane * plane = 0 ) const;
+
+/*! @function copyName
+    @abstract Returns the name assigned to the registry entry as an OSSymbol.
+    @discussion Entries can be named in a particular plane, or globally. If the entry is named in plane and the plane is specified that name will be returned, otherwise the global name is returned. The global name defaults to the entry's meta class name if it has not been named.
+    @param plane The plane object, or zero for the global name.
+    @result A reference to an OSSymbol for the name, which should be released by the caller. */
+
+    virtual const OSSymbol * copyName(
+				const IORegistryPlane * plane = 0 ) const;
+
+/*! @function compareNames
+    @abstract Compares the name of the entry with one or more names, and optionally returns the matching name.
+    @discussion This method is called during IOService name matching and elsewhere to compare the entry's global name with a list of names, or a single name. A list of names may be passed as any OSCollection of OSStrings, while a single name may be passed an OSString, in the name parameter. compareNames will call the compareName method for each name, for overrides.
+    @param name The name or names to compare with as any OSCollection (eg. OSArray, OSSet, OSDictionary) of OSStrings, or a single name may be passed an OSString.
+    @param matched If the caller wants the successfully matched name returned, pass a non-zero pointer for the matched parameter and an OSString will be returned here. It should be released by the caller.
+    @result True if one of the names compared true with the entry's global name. */
+
+    virtual bool compareNames( OSObject * name, OSString ** matched = 0 ) const;
+
+/*! @function compareName
+    @abstract Compares the name of the entry with one name, and optionally returns the matching name.
+    @discussion This method is called during IOService name matching and elsewhere from the compareNames method. It should be overridden to provide non-standard name matching.
+    @param name The name to compare with as an OSString.
+    @param matched If the caller wants the successfully matched name returned, pass a non-zero pointer for the matched parameter and an OSString will be returned here. It should be released by the caller. Generally, this will be the same as the name parameter, but may not be if wildcards are used.
+    @result True if the name compared true with the entry's global name. */
+
+    virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
+
+/*! @function setName
+    @abstract Sets a name for the registry entry, in a particular plane, or globally.
+    @discussion Entries can be named in a particular plane, or globally. If the plane is specified the name applies only to that plane, otherwise the global name is set. The global name defaults to the entry's meta class name if it has not been named.
+    @param name An OSSymbol which will be retained.
+    @param plane The plane object, or zero to set the global name. */
+
+    virtual void setName( const OSSymbol * name,
+				const IORegistryPlane * plane = 0 );
+
+/*! @function setName
+    @abstract Sets a name for the registry entry, in a particular plane, or globally.
+    @discussion Entries can be named in a particular plane, or globally. If the plane is specified the name applies only to that plane, otherwise the global name is set. The global name defaults to the entry's meta class name if it has not been named.
+    @param name A const C-string name which will be copied.
+    @param plane The plane object, or zero to set the global name. */
+
+    virtual void setName( const char * name,
+				const IORegistryPlane * plane = 0 );
+
+/*! @function getLocation
+    @abstract Returns the location string assigned to the registry entry as a C-string.
+    @discussion Entries can given a location string in a particular plane, or globally. If the entry has had a location set in a plane and the plane is specified that location string will be returned, otherwise the global location string is returned. If no global location string has been set, zero is returned.
+    @param plane The plane object, or zero for the global name.
+    @result A C-string location string, valid while the entry is retained, or zero. */
+
+    virtual const char * getLocation( const IORegistryPlane * plane = 0 ) const;
+
+/*! @function copyLocation
+    @abstract Returns the location string assigned to the registry entry as an OSSymbol.
+    @discussion Entries can given a location string in a particular plane, or globally. If the entry has had a location set in a plane and the plane is specified that location string will be returned, otherwise the global location string is returned. If no global location string has been set, zero is returned.
+    @param plane The plane object, or zero for the global name.
+    @result A reference to an OSSymbol for the location if one exists, which should be released by the caller, or zero. */
+
+    virtual const OSSymbol * copyLocation(
+				const IORegistryPlane * plane = 0 ) const;
+
+/*! @function setLocation
+    @abstract Sets a location string for the registry entry, in a particular plane, or globally.
+    @discussion Entries can be given a location string in a particular plane, or globally. If the plane is specified the location applies only to that plane, otherwise the global location is set. The location string may be used during path lookups of registry entries, to distinguish between sibling entries with the same name. The default IORegistryEntry parsing of location strings expects a list of hex numbers separated by commas, though subclasses of IORegistryEntry might do their own parsing.
+    @param location A C-string location string which will be copied, or an OSSymbol which will be retained.
+    @param plane The plane object, or zero to set the global location string. */
+
+    virtual void setLocation( const OSSymbol * location,
+				const IORegistryPlane * plane = 0 );
+    virtual void setLocation( const char * location,
+				const IORegistryPlane * plane = 0 );
+
+/*! @function getPath
+    @abstract Create a path for a registry entry.
+    @discussion The path for a registry entry is copied to the caller's buffer. The path describes the entry's attachment in a particular plane, which must be specified. The path begins with the plane name followed by a colon, and then followed by '/' separated path components for each of the entries between the root and the registry entry. Each component is constructed with the getPathComponent method called in each entry. An alias may also exist for the entry, which are described as properties in a registry entry found at /aliases in the plane. If a property value interpreted as a path in a call to IORegistryEntry::fromPath yields the entry, then the property name is used as the entry's path.
+    @param path A char buffer allocated by the caller.
+    @param length An in/out parameter - the caller sets the length of the buffer available, and getPath returns the total length of the path copied to the buffer.
+    @param plane The plane object.
+    @result getPath will fail if the entry is not attached in the plane, or if the buffer is not large enough to contain the path. */
+
+    virtual bool getPath( char * path, int * length,
+                            const IORegistryPlane * plane) const;
+
+/*! @function getPathComponent
+    @abstract Create a path component for a registry entry.
+    @discussion Each component of a path created with getPath is created with getPathComponent. The default implementation concatenates the entry's name in the the plane, with the "at" symbol and the location string of the entry in the plane if it has been set.
+    @param path A char buffer allocated by the caller.
+    @param length An in/out parameter - the caller sets the length of the buffer available, and getPathComponent returns the total length of the path component copied to the buffer.
+    @param plane The plane object.
+    @result true if the path fits into the supplied buffer or false on a overflow. */
+
+    virtual bool getPathComponent( char * path, int * length,
+                                    const IORegistryPlane * plane ) const;
+
+/*! @function fromPath
+    @abstract Looks up a registry entry by path.
+    @discussion This function parses paths to lookup registry entries. The path may begin with the <plane name>: created by getPath, or the plane may be set by the caller. If there are characters remaining unparsed after an entry has been looked up, this may be considered an invalid lookup, or those characters may be passed back to the caller and the lookup successful.
+    @param path A C-string path.
+    @param plane The plane to lookup up the path, or zero, in which case the path must begin with the plane name.
+    @param residualPath If the path may contain residual characters after the last path component, the residual will be copied back to the caller's residualPath buffer. If there are residual characters and no residual buffer is specified, fromPath will fail.
+    @param residualLength An in/out parameter - the caller sets the length of the residual buffer available, and fromPath returns the total length of the residual path copied to the buffer. If there is no residualBuffer (residualPath = 0) then residualLength may be zero also.
+    @param fromEntry The lookup will proceed rooted at this entry if non-zero, otherwise it proceeds from the root of the plane.
+    @result A retained registry entry is returned on success, or zero on failure. The caller should release the entry. */
+
+    static IORegistryEntry * fromPath(  const char * path,
+                                        const IORegistryPlane * plane = 0,
+                                        char * residualPath = 0,
+					int * residualLength = 0,
+					IORegistryEntry * fromEntry = 0 );
+
+/*! @function fromPath
+    @abstract Looks up a registry entry by relative path.
+    @discussion This function looks up a entry below the called entry by a relative path. It is just a convenience that calls IORegistryEntry::fromPath with this as the fromEntry parameter.
+    @param path See IORegistryEntry::fromPath.
+    @param plane See IORegistryEntry::fromPath.
+    @param residualPath See IORegistryEntry::fromPath.
+    @param residualLength See IORegistryEntry::fromPath.
+    @result See IORegistryEntry::fromPath. */
+
+    virtual IORegistryEntry * childFromPath( const char * path,
+                                             const IORegistryPlane * plane = 0,
+                                             char * residualPath = 0,
+					     int * residualLength = 0 );
+
+/*! @function dealiasPath
+    @abstract Strips any aliases from the head of path and returns the full path.
+    @discussion If the path specified begins with an alias found in the /aliases entry, the value of the alias is returned, and a pointer into the passed in path after the alias is passed back to the caller. If an alias is not found, zero is returned and the path parameter is unchanged.
+    @param opath An in/out paramter - the caller passes in a pointer to a C-string pointer to a path. If an alias is found, dealiasPath returns a pointer into the path just beyond the end of the alias.
+    @param plane A plane object must be specified.
+    @result A C-string pointer to the value of the alias if one is found, or zero if not. */
+
+    static const char * dealiasPath( const char ** opath,
+                                    const IORegistryPlane * plane );
+
+/*! @function makePlane
+    @abstract Constructs an IORegistryPlane object.
+    @discussion Most planes in IOKit are created by the OS, although other planes may be created.
+    @param name A C-string name for the new plane, to be copied.
+    @result A new instance of an IORegistryPlane, or zero on failure. */
+
+    static const IORegistryPlane * makePlane( const char * name );
+
+/*!    @abstract Returns an ID for the registry entry that is global to all tasks.
+    @discussion The entry ID returned by getRegistryEntryID can be used to identify a registry entry across all tasks. A registry entry may be looked up by its entry ID by creating a matching dictionary with IORegistryEntryIDMatching() in user space, or <code>IOService::registryEntryIDMatching()</code> in the kernel, to be used with the IOKit matching functions. The ID is valid only until the machine reboots.
+    @result An ID for the registry entry, assigned when the entry is first attached in the registry. */
+
+    uint64_t getRegistryEntryID( void );
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+    /* * * * * * * * * * * * internals * * * * * * * * * * * */
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    virtual bool init( IORegistryEntry * from,
+				const IORegistryPlane * inPlane );
+
+private:
+    static IORegistryEntry * initialize( void );
+
+private:
+    inline bool arrayMember( OSArray * set,
+                            const IORegistryEntry * member,
+                            unsigned int * index = 0 ) const;
+
+    bool makeLink( IORegistryEntry * to,
+                    unsigned int relation,
+                    const IORegistryPlane * plane ) const;
+    void breakLink( IORegistryEntry * to,
+                    unsigned int relation,
+                    const IORegistryPlane * plane ) const;
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+	OSArray * getParentSetReference( const IORegistryPlane * plane )
+									const;
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    OSArray * getChildSetReference( const IORegistryPlane * plane )
+									const;
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IORegistryEntry * getChildFromComponent( const char ** path,
+				const IORegistryPlane * plane );
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    const OSSymbol * hasAlias(  const IORegistryPlane * plane,
+                                    char * opath = 0, int * length = 0 ) const;
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    const char * matchPathLocation( const char * cmp,
+				const IORegistryPlane * plane );
+
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*! @class IORegistryIterator : public OSIterator
+    @abstract An iterator over the registry.
+    @discussion An iterator that can traverse the children or parents of a registry entry in a plane, and recurse. Access to the registry is protected against multiple threads, but an IORegistryIterator instance is for use by one thread only. */
+
+class IORegistryIterator : public OSIterator
+{
+    OSDeclareAbstractStructors(IORegistryIterator)
+
+private:
+    struct IORegCursor {
+        IORegCursor  	     *	next;
+        IORegistryEntry      *	current;
+        OSIterator 	     *	iter;
+    };
+    IORegCursor 		start;
+    IORegCursor 	  *	where;
+    IORegistryEntry 	  *	root;
+    OSOrderedSet  	  *	done;
+    const IORegistryPlane *	plane;
+    IOOptionBits		options;
+
+    virtual void free( void );
+
+public:
+/*! @function iterateOver
+    @abstract Create an iterator rooted at a given registry entry.
+    @discussion This method creates an IORegistryIterator that is set up with options to iterate children or parents of a root entry, and to recurse automatically into entries as they are returned, or only when instructed. The iterator object keeps track of entries that have been recursed into previously to avoid loops.
+    @param start The root entry to begin the iteration at.
+    @param plane A plane object must be specified.
+    @param options kIORegistryIterateRecursively may be set to recurse automatically into each entry as it is returned. This option affects the behaviour of the getNextObject method, which is defined in the OSIterator superclass. Other methods will override this behaviour. kIORegistryIterateParents may be set to iterate the parents of each entry, by default the children are iterated.
+    @result A created IORegistryIterator instance, to be released by the caller when it has finished with it. */
+
+    static IORegistryIterator * iterateOver( IORegistryEntry * start,
+                                             const IORegistryPlane * plane,
+					     IOOptionBits options = 0 );
+
+/*! @function iterateOver
+    @abstract Create an iterator rooted at the registry root.
+    @discussion This method creates an IORegistryIterator that is set up with options to iterate children of the registry root entry, and to recurse automatically into entries as they are returned, or only when instructed. The iterator object keeps track of entries that have been recursed into previously to avoid loops.
+    @param plane A plane object must be specified.
+    @param options kIORegistryIterateRecursively may be set to recurse automatically into each entry as it is returned. This option affects the behaviour of the getNextObject method, which is defined in the OSIterator superclass. Other methods will override this behaviour. kIORegistryIterateParents may be set to iterate the parents of each entry, by default the children are iterated.
+    @result A created IORegistryIterator instance, to be released by the caller when it has finished with it. */
+
+    static IORegistryIterator * iterateOver( const IORegistryPlane * plane,
+                                             IOOptionBits options = 0 );
+
+/*! @function getNextObject
+    @abstract Return the next object in the registry iteration.
+    @discussion This method calls either getNextObjectFlat or getNextObjectRecursive depending on the options the iterator was created with. This implements the OSIterator defined getNextObject method. The object returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it.
+    @result The next registry entry in the iteration (the current entry), or zero if the iteration has finished at this level of recursion. The entry returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it. */
+
+    virtual IORegistryEntry * getNextObject( void );
+
+/*! @function getNextObjectFlat
+    @abstract Return the next object in the registry iteration, ignoring the kIORegistryIterateRecursively option.
+    @discussion This method returns the next child, or parent if the kIORegistryIterateParents option was used to create the iterator, of the current root entry. The object returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it.
+    @result The next registry entry in the iteration (the current entry), or zero if the iteration has finished at this level of recursion, or the iteration is invalid (see isValid). The entry returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it. */
+
+    virtual IORegistryEntry * getNextObjectFlat( void );
+
+/*! @function getNextObjectRecursive
+    @abstract Return the next object in the registry iteration, and enter it.
+    @discussion If the iterator has a current entry, and the iterator has not already entered previously, enterEntry is called to recurse into it, ie. make it the new root, and the next child, or parent if the kIORegistryIterateParents option was used to create the iterator, at this new level of recursion is returned. If there is no current entry at this level of recursion, exitEntry is called and the process repeats, until the iteration returns to the entry the iterator was created with and zero is returned. The object returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it.
+    @result The next registry entry in the iteration (the current entry), or zero if its finished, or the iteration is invalid (see isValid). The entry returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it. */
+
+    virtual IORegistryEntry * getNextObjectRecursive( void );
+
+/*! @function getCurrentEntry
+    @abstract Return the current entry in the registry iteration.
+    @discussion This method returns the current entry, last returned by getNextObject et al. The object returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it. If the iteration is no longer valid (see isValid), the current entry is zero.
+    @result The current registry entry in the iteration, or zero if the last iteration returned zero, or the iteration is invalid (see isValid). The entry returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it. */
+
+    virtual IORegistryEntry * getCurrentEntry( void );
+
+/*! @function enterEntry
+    @abstract Recurse into the current entry in the registry iteration.
+    @discussion This method makes the current entry, ie. the last entry returned by getNextObject et al., the root in a new level of recursion. */
+
+    virtual void enterEntry( void );
+    
+/*! @function enterEntry
+    @abstract Recurse into the current entry in the registry iteration.
+    @discussion This method recurses into an entry as with enterEntry, but also switches from the current plane to a new one set by the caller.
+    @param plane The new plane to switch into. */
+
+    virtual void enterEntry( const IORegistryPlane * plane );
+
+/*! @function exitEntry
+    @abstract Exits a level of recursion, restoring the current entry.
+    @discussion This method undoes an enterEntry, restoring the current entry. If there are no more levels of recursion to exit false is returned, otherwise true is returned.
+    @result true if a level of recursion was undone, false if no recursive levels are left in the iteration. */
+
+    virtual bool exitEntry( void );
+
+/*! @function reset
+    @abstract Exits all levels of recursion, restoring the iterator to its state at creation.
+    @discussion This method exits all levels of recursion, and restores the iterator to its state at creation. */
+
+    virtual void reset( void );
+
+/*! @function isValid
+    @abstract Checks that no registry changes have invalidated the iteration.
+    @discussion If a registry iteration is invalidated by changes to the registry, it will be made invalid, the currentEntry will be considered zero, and further calls to getNextObject et al. will return zero. The iterator should be reset to restart the iteration when this happens.
+    @result false if the iterator has been invalidated by changes to the registry, true otherwise. */
+
+    virtual bool isValid( void );
+
+/*! @function iterateAll
+    @abstract Iterates all entries (with getNextObject) and returns a set of all returned entries.
+    @discussion This method will reset, then iterate all entries in the iteration (with getNextObject) until successful (ie. the iterator is valid at the end of the iteration).
+    @result A set of entries returned by the iteration. The caller should release the set when it has finished with it. Zero is returned on a resource failure. */
+
+    virtual OSOrderedSet * iterateAll( void );
+};
+
+#endif /* _IOKIT_IOREGISTRYENTRY_H */
diff --git a/i386/include/IOKit/IOReturn.h b/i386/include/IOKit/IOReturn.h
new file mode 100644
index 0000000..38811b6
--- /dev/null
+++ b/i386/include/IOKit/IOReturn.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * HISTORY
+ */
+ 
+/*
+ * Core IOReturn values. Others may be family defined.
+ */
+
+#ifndef __IOKIT_IORETURN_H
+#define __IOKIT_IORETURN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <mach/error.h>
+
+typedef	kern_return_t		IOReturn;
+
+#ifndef sys_iokit
+#define sys_iokit                         err_system(0x38)
+#endif /* sys_iokit */
+#define sub_iokit_common                  err_sub(0)
+#define sub_iokit_usb                     err_sub(1)
+#define sub_iokit_firewire                err_sub(2)
+#define sub_iokit_block_storage           err_sub(4)
+#define sub_iokit_graphics                err_sub(5)
+#define sub_iokit_networking		  err_sub(6)
+#define sub_iokit_bluetooth               err_sub(8)
+#define sub_iokit_pmu                     err_sub(9)
+#define sub_iokit_acpi                    err_sub(10)
+#define sub_iokit_smbus                   err_sub(11)
+#define sub_iokit_ahci                    err_sub(12)
+#define sub_iokit_powermanagement         err_sub(13)
+//#define sub_iokit_hidsystem             err_sub(14)
+#define sub_iokit_scsi                    err_sub(16)
+//#define sub_iokit_pccard                err_sub(21)
+
+#define sub_iokit_vendor_specific         err_sub(-2)
+#define sub_iokit_reserved                err_sub(-1)
+
+#define	iokit_common_err(return)          (sys_iokit|sub_iokit_common|return)
+#define	iokit_family_err(sub,return)      (sys_iokit|sub|return)
+#define iokit_vendor_specific_err(return) (sys_iokit|sub_iokit_vendor_specific|return)
+
+#define kIOReturnSuccess         KERN_SUCCESS            // OK
+#define kIOReturnError           iokit_common_err(0x2bc) // general error 	
+#define kIOReturnNoMemory        iokit_common_err(0x2bd) // can't allocate memory 
+#define kIOReturnNoResources     iokit_common_err(0x2be) // resource shortage 
+#define kIOReturnIPCError        iokit_common_err(0x2bf) // error during IPC 
+#define kIOReturnNoDevice        iokit_common_err(0x2c0) // no such device 
+#define kIOReturnNotPrivileged   iokit_common_err(0x2c1) // privilege violation 
+#define kIOReturnBadArgument     iokit_common_err(0x2c2) // invalid argument 
+#define kIOReturnLockedRead      iokit_common_err(0x2c3) // device read locked 
+#define kIOReturnLockedWrite     iokit_common_err(0x2c4) // device write locked 
+#define kIOReturnExclusiveAccess iokit_common_err(0x2c5) // exclusive access and
+                                                         //   device already open 
+#define kIOReturnBadMessageID    iokit_common_err(0x2c6) // sent/received messages
+                                                         //   had different msg_id
+#define kIOReturnUnsupported     iokit_common_err(0x2c7) // unsupported function 
+#define kIOReturnVMError         iokit_common_err(0x2c8) // misc. VM failure 
+#define kIOReturnInternalError   iokit_common_err(0x2c9) // internal error 
+#define kIOReturnIOError         iokit_common_err(0x2ca) // General I/O error 
+//#define kIOReturn???Error      iokit_common_err(0x2cb) // ??? 
+#define kIOReturnCannotLock      iokit_common_err(0x2cc) // can't acquire lock
+#define kIOReturnNotOpen         iokit_common_err(0x2cd) // device not open 
+#define kIOReturnNotReadable     iokit_common_err(0x2ce) // read not supported 
+#define kIOReturnNotWritable     iokit_common_err(0x2cf) // write not supported 
+#define kIOReturnNotAligned      iokit_common_err(0x2d0) // alignment error 
+#define kIOReturnBadMedia        iokit_common_err(0x2d1) // Media Error 
+#define kIOReturnStillOpen       iokit_common_err(0x2d2) // device(s) still open 
+#define kIOReturnRLDError        iokit_common_err(0x2d3) // rld failure 
+#define kIOReturnDMAError        iokit_common_err(0x2d4) // DMA failure 
+#define kIOReturnBusy            iokit_common_err(0x2d5) // Device Busy 
+#define kIOReturnTimeout         iokit_common_err(0x2d6) // I/O Timeout 
+#define kIOReturnOffline         iokit_common_err(0x2d7) // device offline 
+#define kIOReturnNotReady        iokit_common_err(0x2d8) // not ready 
+#define kIOReturnNotAttached     iokit_common_err(0x2d9) // device not attached 
+#define kIOReturnNoChannels      iokit_common_err(0x2da) // no DMA channels left
+#define kIOReturnNoSpace         iokit_common_err(0x2db) // no space for data 
+//#define kIOReturn???Error      iokit_common_err(0x2dc) // ??? 
+#define kIOReturnPortExists      iokit_common_err(0x2dd) // port already exists
+#define kIOReturnCannotWire      iokit_common_err(0x2de) // can't wire down 
+                                                         //   physical memory
+#define kIOReturnNoInterrupt     iokit_common_err(0x2df) // no interrupt attached
+#define kIOReturnNoFrames        iokit_common_err(0x2e0) // no DMA frames enqueued
+#define kIOReturnMessageTooLarge iokit_common_err(0x2e1) // oversized msg received
+                                                         //   on interrupt port
+#define kIOReturnNotPermitted    iokit_common_err(0x2e2) // not permitted
+#define kIOReturnNoPower         iokit_common_err(0x2e3) // no power to device
+#define kIOReturnNoMedia         iokit_common_err(0x2e4) // media not present
+#define kIOReturnUnformattedMedia iokit_common_err(0x2e5)// media not formatted
+#define kIOReturnUnsupportedMode iokit_common_err(0x2e6) // no such mode
+#define kIOReturnUnderrun        iokit_common_err(0x2e7) // data underrun
+#define kIOReturnOverrun         iokit_common_err(0x2e8) // data overrun
+#define kIOReturnDeviceError	 iokit_common_err(0x2e9) // the device is not working properly!
+#define kIOReturnNoCompletion	 iokit_common_err(0x2ea) // a completion routine is required
+#define kIOReturnAborted	 iokit_common_err(0x2eb) // operation aborted
+#define kIOReturnNoBandwidth	 iokit_common_err(0x2ec) // bus bandwidth would be exceeded
+#define kIOReturnNotResponding	 iokit_common_err(0x2ed) // device not responding
+#define kIOReturnIsoTooOld	 iokit_common_err(0x2ee) // isochronous I/O request for distant past!
+#define kIOReturnIsoTooNew	 iokit_common_err(0x2ef) // isochronous I/O request for distant future
+#define kIOReturnNotFound        iokit_common_err(0x2f0) // data was not found
+#define kIOReturnInvalid         iokit_common_err(0x1)   // should never be seen
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ! __IOKIT_IORETURN_H */
diff --git a/i386/include/IOKit/IOService.h b/i386/include/IOKit/IOService.h
new file mode 100644
index 0000000..a965ea1
--- /dev/null
+++ b/i386/include/IOKit/IOService.h
@@ -0,0 +1,1690 @@
+/*
+ * Copyright (c) 1998-2009 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998,1999 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+/*!
+	@header
+	This header contains the definition of the IOService class.  IOService is the sole direct subclass of IORegistryEntry and is the base class of almost all I/O Kit family superclasses.  IOService defines methods that support the life cycle of I/O Kit drivers.  For more information on IOService, see {@linkdoc //apple_ref/doc/uid/TP0000011 I/O Kit Fundamentals}.
+
+	@seealso //apple_ref/doc/header/IORegistryEntry.h IORegistryEntry
+*/
+
+#ifndef _IOKIT_IOSERVICE_H
+#define _IOKIT_IOSERVICE_H
+
+#include <IOKit/IORegistryEntry.h>
+#include <IOKit/IOReturn.h>
+#include <IOKit/IODeviceMemory.h>
+#include <IOKit/IONotifier.h>
+#include <IOKit/IOLocks.h>
+
+#include <IOKit/IOKitDebug.h>
+#include <IOKit/IOInterrupts.h>
+
+#include <IOKit/pwr_mgt/IOPMpowerState.h>
+#include <IOKit/IOServicePM.h>
+
+extern "C" {
+#include <kern/thread_call.h>
+}
+
+#ifndef UINT64_MAX
+#define UINT64_MAX        18446744073709551615ULL
+#endif
+
+enum {
+    kIODefaultProbeScore 	= 0
+};
+
+// masks for getState()
+enum {
+    kIOServiceInactiveState	= 0x00000001,
+    kIOServiceRegisteredState	= 0x00000002,
+    kIOServiceMatchedState	= 0x00000004,
+    kIOServiceFirstPublishState	= 0x00000008,
+    kIOServiceFirstMatchState	= 0x00000010
+};
+
+enum {
+    // options for registerService()
+    kIOServiceExclusive		= 0x00000001,
+
+    // options for terminate()
+    kIOServiceRequired		= 0x00000001,
+    kIOServiceTerminate		= 0x00000004,
+
+    // options for registerService() & terminate()
+    kIOServiceSynchronous	= 0x00000002,
+    // options for registerService()
+    kIOServiceAsynchronous	= 0x00000008
+};
+
+// options for open()
+enum {
+    kIOServiceSeize		= 0x00000001,
+    kIOServiceFamilyOpenOptions = 0xffff0000
+};
+
+// options for close()
+enum {
+    kIOServiceFamilyCloseOptions = 0xffff0000
+};
+
+typedef void * IONotificationRef;
+
+extern const IORegistryPlane *	gIOServicePlane;
+extern const IORegistryPlane *  gIOPowerPlane;
+
+extern const OSSymbol *		gIOResourcesKey;
+extern const OSSymbol *		gIOResourceMatchKey;
+extern const OSSymbol *		gIOProviderClassKey;
+extern const OSSymbol * 	gIONameMatchKey;
+extern const OSSymbol *		gIONameMatchedKey;
+extern const OSSymbol *		gIOPropertyMatchKey;
+extern const OSSymbol *		gIOLocationMatchKey;
+extern const OSSymbol *		gIOParentMatchKey;
+extern const OSSymbol *		gIOPathMatchKey;
+extern const OSSymbol *		gIOMatchCategoryKey;
+extern const OSSymbol *		gIODefaultMatchCategoryKey;
+extern const OSSymbol *		gIOMatchedServiceCountKey;
+
+extern const OSSymbol *		gIOUserClientClassKey;
+extern const OSSymbol *		gIOKitDebugKey;
+extern const OSSymbol *		gIOServiceKey;
+
+extern const OSSymbol *		gIOCommandPoolSizeKey;
+
+extern const OSSymbol *		gIOPublishNotification;
+extern const OSSymbol *		gIOFirstPublishNotification;
+extern const OSSymbol *		gIOMatchedNotification;
+extern const OSSymbol *		gIOFirstMatchNotification;
+extern const OSSymbol *		gIOTerminatedNotification;
+
+extern const OSSymbol *		gIOGeneralInterest;
+extern const OSSymbol *		gIOBusyInterest;
+extern const OSSymbol *		gIOOpenInterest;
+extern const OSSymbol *		gIOAppPowerStateInterest;
+extern const OSSymbol *		gIOPriorityPowerStateInterest;
+
+extern const OSSymbol *		gIODeviceMemoryKey;
+extern const OSSymbol *		gIOInterruptControllersKey;
+extern const OSSymbol *		gIOInterruptSpecifiersKey;
+
+extern SInt32 IOServiceOrdering( const OSMetaClassBase * inObj1, const OSMetaClassBase * inObj2, void * ref );
+
+typedef void (*IOInterruptAction)( OSObject * target, void * refCon,
+				   IOService * nub, int source );
+
+/*! @typedef IOServiceNotificationHandler
+    @param target Reference supplied when the notification was registered.
+    @param refCon Reference constant supplied when the notification was registered.
+    @param newService The IOService object the notification is delivering. It is retained for the duration of the handler's invocation and doesn't need to be released by the handler. */
+
+typedef bool (*IOServiceNotificationHandler)( void * target, void * refCon,
+                  IOService * newService );
+
+typedef bool (*IOServiceMatchingNotificationHandler)( void * target, void * refCon,
+                  IOService * newService,
+				  IONotifier * notifier );
+
+/*! @typedef IOServiceInterestHandler
+    @param target Reference supplied when the notification was registered.
+    @param refCon Reference constant supplied when the notification was registered.
+    @param messageType Type of the message - IOKit defined in IOKit/IOMessage.h or family specific.
+    @param provider The IOService object who is delivering the notification. It is retained for the duration of the handler's invocation and doesn't need to be released by the handler.
+    @param messageArgument An argument for message, dependent on its type.
+    @param argSize Non zero if the argument represents a struct of that size, used when delivering messages outside the kernel. */
+
+typedef IOReturn (*IOServiceInterestHandler)( void * target, void * refCon,
+                                              UInt32 messageType, IOService * provider,
+                                              void * messageArgument, vm_size_t argSize );
+
+typedef void (*IOServiceApplierFunction)(IOService * service, void * context);
+typedef void (*OSObjectApplierFunction)(OSObject * object, void * context);
+
+class IOUserClient;
+class IOPlatformExpert;
+
+/*! @class IOService
+    @abstract The base class for most I/O Kit families, devices, and drivers.
+    @discussion The IOService base class defines APIs used to publish services, instantiate other services based on the existance of a providing service (ie. driver stacking), destroy a service and its dependent stack, notify interested parties of service state changes, and general utility functions useful across all families. 
+
+Types of service are specified with a matching dictionary that describes properties of the service. For example, a matching dictionary might describe any IOUSBDevice (or subclass), an IOUSBDevice with a certain class code, or a IOPCIDevice with a set of OpenFirmware matching names or device & vendor IDs. Since the matching dictionary is interpreted by the family which created the service, as well as generically by IOService, the list of properties considered for matching depends on the familiy.
+
+Matching dictionaries are associated with IOService classes by the catalogue, as driver property tables, and also supplied by clients of the notification APIs.
+
+IOService provides matching based on C++ class (via OSMetaClass dynamic casting), registry entry name, a registry path to the service (which includes OpenFirmware paths), a name assigned by BSD, or by its location (its point of attachment).
+
+<br><br>Driver Instantiation by IOService<br><br>
+
+Drivers are subclasses of IOService, and their availability is managed through the catalogue. They are instantiated based on the publication of an IOService they use (for example, an IOPCIDevice or IOUSBDevice), or when they are added to  the catalogue and the IOService(s) they use are already available.
+
+When an IOService (the "provider") is published with the @link registerService registerService@/link method, the matching and probing process begins, which is always single threaded per provider. A list of matching dictionaries from the catalog and installed publish notification requests, that successfully match the IOService, is constructed, with ordering supplied by <code>kIOProbeScoreKey</code> ("IOProbeScore") property in the dictionary, or supplied with the notification. 
+
+Each entry in the list is then processed in order - for notifications, the notification is delivered, for driver property tables a lot more happens.
+
+The driver class is instantiated and <code>init()</code> called with its property table. The new driver instance is then attached to the provider, and has its @link probe probe@/link method called with the provider as an argument. The default <code>probe</code> method does nothing but return success, but a driver may implement this method to interrogate the provider to make sure it can work with it. It may also modify its probe score at this time. After probe, the driver is detached and the next in the list is considered (ie. attached, probed, and detached).
+
+When the probing phase is complete, the list consists of successfully probed drivers, in order of their probe score (after adjustment during the @link probe probe@/link call). The list is then divided into categories based on the <code>kIOMatchCategoryKey</code> property ("IOMatchCategory"); drivers without a match category are all considered in one default category. Match categories allow multiple clients of a provider to be attached and started, though the provider may also enforce open/close semantics to gain active access to it.
+
+For each category, the highest scoring driver in that category is attached to the provider, and its @link start start@/link method called. If <code>start</code> is successful, the rest of the drivers in the same match category are discarded, otherwise the next highest scoring driver is started, and so on.
+
+The driver should only consider itself in action when the start method is called, meaning it has been selected for use on the provider, and consuming that particular match category. It should also be prepared to be allocated, probed and freed even if the probe was successful.
+
+After the drivers have all synchronously been started, the installed "matched" notifications that match the registered IOService are delivered.
+
+<br><br>Properties used by IOService<br><br>
+
+	<code>kIOClassKey, extern const OSSymbol * gIOClassKey, "IOClass"</code>
+<br>
+<br>
+Class of the driver to instantiate on matching providers.
+<br>
+<br>
+	<code>kIOProviderClassKey, extern const OSSymbol * gIOProviderClassKey, "IOProviderClass"</code>
+<br>
+<br>
+Class of the provider(s) to be considered for matching, checked with OSDynamicCast so subclasses will also match.
+<br>
+<br>
+	<code>kIOProbeScoreKey, extern const OSSymbol * gIOProbeScoreKey, "IOProbeScore"</code>
+<br>
+<br>
+The probe score initially used to order multiple matching drivers.
+<br>
+<br>
+	<code>kIOMatchCategoryKey, extern const OSSymbol * gIOMatchCategoryKey, "IOMatchCategory"</code>
+<br>
+<br>
+A string defining the driver category for matching purposes. All drivers with no <code>IOMatchCategory</code> property are considered to be in the same default category. Only one driver in a category can be started on each provider.
+<br>
+<br>
+	<code>kIONameMatchKey, extern const OSSymbol * gIONameMatchKey, "IONameMatch"</code>
+<br>
+A string or collection of strings that match the provider's name. The comparison is implemented with the @link //apple_ref/cpp/instm/IORegistryEntry/compareNames/virtualbool/(OSObject*,OSString**) IORegistryEntry::compareNames@/link method, which supports a single string, or any collection (OSArray, OSSet, OSDictionary etc.) of strings. IOService objects with OpenFirmware device tree properties (eg. IOPCIDevice) will also be matched based on that standard's "compatible", "name", "device_type" properties. The matching name will be left in the driver's property table in the <code>kIONameMatchedKey</code> property.
+<br>
+Examples
+<pre>
+@textblock
+	<key>IONameMatch</key>
+	<string>pci106b,7</string>
+@/textblock
+</pre>
+
+For a list of possible matching names, a serialized array of strings should used, eg.
+<pre>
+@textblock
+	<key>IONameMatch</key>
+	<array>
+		<string>APPL,happy16</string>
+		<string>pci106b,7</string>
+	</array>
+@/textblock
+</pre>
+
+<br>
+	<code>kIONameMatchedKey, extern const OSSymbol * gIONameMatchedKey, "IONameMatched"</code>
+<br>
+The name successfully matched name from the <code>kIONameMatchKey</code> property will be left in the driver's property table as the <code>kIONameMatchedKey</code> property.
+<br>
+<br>
+	<code>kIOPropertyMatchKey, extern const OSSymbol * gIOPropertyMatchKey, "IOPropertyMatch"</code>
+<br>
+A dictionary of properties that each must exist in the matching IOService and compare successfully with the <code>isEqualTo</code> method.
+
+<pre>
+@textblock
+	<key>IOPropertyMatch</key>
+	<dictionary>
+		<key>APPL,happy16</key>
+		<string>APPL,meek8</string>
+	</dictionary>
+@/textblock
+</pre>
+
+<br>
+	<code>kIOUserClientClassKey, extern const OSSymbol * gIOUserClientClassKey, "IOUserClientClass"</code>
+<br>
+The class name that the service will attempt to allocate when a user client connection is requested.  First the device nub is queried, then the nub's provider is queried by default.
+<br>
+<br>
+	<code>kIOKitDebugKey, extern const OSSymbol * gIOKitDebugKey, "IOKitDebug"</code>
+<br>
+Set some debug flags for logging the driver loading process. Flags are defined in <code>IOKit/IOKitDebug.h</code>, but <code>65535</code> works well.*/
+
+class IOService : public IORegistryEntry
+{
+    OSDeclareDefaultStructors(IOService)
+
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of this class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData * reserved;
+
+private:
+    IOService *		__provider;
+    SInt32		__providerGeneration;
+    IOService *		__owner;
+    IOOptionBits	__state[2];
+    uint64_t		__timeBusy;
+    uint64_t		__accumBusy;
+    IOServicePM *	pwrMgt;
+
+protected:
+    // TRUE once PMinit has been called
+    bool			initialized;
+
+public:
+    // DEPRECATED
+    void *          pm_vars;
+
+public:
+    /* methods available in Mac OS X 10.1 or later */
+/*! @function requestTerminate
+    @abstract Passes a termination up the stack.
+    @discussion When an IOService is made inactive the default behavior is to also make any of its clients that have it as their only provider also inactive, in this way recursing the termination up the driver stack. This method allows an IOService object to override this behavior. Returning <code>true</code> from this method when passed a just terminated provider will cause the client to also be terminated.
+    @param provider The terminated provider of this object.
+    @param options Options originally passed to terminate, plus <code>kIOServiceRecursing</code>.
+    @result <code>true</code> if this object should be terminated now that its provider has been. */
+
+    virtual bool requestTerminate( IOService * provider, IOOptionBits options );
+
+/*! @function willTerminate
+    @abstract Passes a termination up the stack.
+    @discussion Notification that a provider has been terminated, sent before recursing up the stack, in root-to-leaf order.
+    @param provider The terminated provider of this object.
+    @param options Options originally passed to terminate.
+    @result <code>true</code>. */
+
+    virtual bool willTerminate( IOService * provider, IOOptionBits options );
+
+/*! @function didTerminate
+    @abstract Passes a termination up the stack.
+    @discussion Notification that a provider has been terminated, sent after recursing up the stack, in leaf-to-root order.
+    @param provider The terminated provider of this object.
+    @param options Options originally passed to terminate.
+    @param defer If there is pending I/O that requires this object to persist, and the provider is not opened by this object set <code>defer</code> to <code>true</code> and call the <code>IOService::didTerminate()</code> implementation when the I/O completes. Otherwise, leave <code>defer</code> set to its default value of <code>false</code>.
+    @result <code>true</code>. */
+
+    virtual bool didTerminate( IOService * provider, IOOptionBits options, bool * defer );
+
+/*! @function nextIdleTimeout
+    @availability Mac OS X v10.4 and later
+    @abstract Allows subclasses to customize idle power management behavior.
+    @discussion Returns the next time that the device should idle into its next lower power state. Subclasses may override for custom idle behavior.
+    
+    A power managed driver might override this method to provide a more sophisticated idle power off algorithm than the one defined by power management.
+    @param currentTime The current time
+    @param lastActivity The time of last activity on this device
+    @param powerState The device's current power state.
+    @result Returns the next time the device should idle off (in seconds, relative to the current time). */
+
+    virtual SInt32 nextIdleTimeout(AbsoluteTime currentTime, 
+        AbsoluteTime lastActivity, unsigned int powerState);
+
+/*! @function systemWillShutdown
+    @availability Mac OS X v10.5 and later
+    @abstract Notifies members of the power plane of system shutdown and restart.
+    @discussion This function is called for all members of the power plane in leaf-to-root order. If a subclass needs to wait for a pending I/O, then the call to <code>systemWillShutdown</code> should be postponed until the I/O completes.
+    
+    Any power managed driver (which has called @link joinPMtree joinPMtree@/link to join the power plane) interested in taking action at system shutdown or restart should override this method.
+    @param specifier <code>kIOMessageSystemWillPowerOff</code> or <code>kIOMessageSystemWillRestart</code>. */
+
+    virtual void systemWillShutdown( IOOptionBits specifier );
+
+/*! @function copyClientWithCategory
+    @availability Mac OS X v10.6 and later
+    @param category An OSSymbol corresponding to an IOMatchCategory matching property.
+	@result Returns a reference to the IOService child with the given category. The result should be released by the caller.
+*/
+
+    virtual IOService * copyClientWithCategory( const OSSymbol * category );
+
+private:
+#if __LP64__
+    OSMetaClassDeclareReservedUnused(IOService, 0);
+    OSMetaClassDeclareReservedUnused(IOService, 1);
+    OSMetaClassDeclareReservedUnused(IOService, 2);
+    OSMetaClassDeclareReservedUnused(IOService, 3);
+    OSMetaClassDeclareReservedUnused(IOService, 4);
+    OSMetaClassDeclareReservedUnused(IOService, 5);
+#else
+    OSMetaClassDeclareReservedUsed(IOService, 0);
+    OSMetaClassDeclareReservedUsed(IOService, 1);
+    OSMetaClassDeclareReservedUsed(IOService, 2);
+    OSMetaClassDeclareReservedUsed(IOService, 3);
+    OSMetaClassDeclareReservedUsed(IOService, 4);
+    OSMetaClassDeclareReservedUsed(IOService, 5);
+#endif
+
+    OSMetaClassDeclareReservedUnused(IOService, 6);
+    OSMetaClassDeclareReservedUnused(IOService, 7);
+    OSMetaClassDeclareReservedUnused(IOService, 8);
+    OSMetaClassDeclareReservedUnused(IOService, 9);
+    OSMetaClassDeclareReservedUnused(IOService, 10);
+    OSMetaClassDeclareReservedUnused(IOService, 11);
+    OSMetaClassDeclareReservedUnused(IOService, 12);
+    OSMetaClassDeclareReservedUnused(IOService, 13);
+    OSMetaClassDeclareReservedUnused(IOService, 14);
+    OSMetaClassDeclareReservedUnused(IOService, 15);
+    OSMetaClassDeclareReservedUnused(IOService, 16);
+    OSMetaClassDeclareReservedUnused(IOService, 17);
+    OSMetaClassDeclareReservedUnused(IOService, 18);
+    OSMetaClassDeclareReservedUnused(IOService, 19);
+    OSMetaClassDeclareReservedUnused(IOService, 20);
+    OSMetaClassDeclareReservedUnused(IOService, 21);
+    OSMetaClassDeclareReservedUnused(IOService, 22);
+    OSMetaClassDeclareReservedUnused(IOService, 23);
+    OSMetaClassDeclareReservedUnused(IOService, 24);
+    OSMetaClassDeclareReservedUnused(IOService, 25);
+    OSMetaClassDeclareReservedUnused(IOService, 26);
+    OSMetaClassDeclareReservedUnused(IOService, 27);
+    OSMetaClassDeclareReservedUnused(IOService, 28);
+    OSMetaClassDeclareReservedUnused(IOService, 29);
+    OSMetaClassDeclareReservedUnused(IOService, 30);
+    OSMetaClassDeclareReservedUnused(IOService, 31);
+    OSMetaClassDeclareReservedUnused(IOService, 32);
+    OSMetaClassDeclareReservedUnused(IOService, 33);
+    OSMetaClassDeclareReservedUnused(IOService, 34);
+    OSMetaClassDeclareReservedUnused(IOService, 35);
+    OSMetaClassDeclareReservedUnused(IOService, 36);
+    OSMetaClassDeclareReservedUnused(IOService, 37);
+    OSMetaClassDeclareReservedUnused(IOService, 38);
+    OSMetaClassDeclareReservedUnused(IOService, 39);
+    OSMetaClassDeclareReservedUnused(IOService, 40);
+    OSMetaClassDeclareReservedUnused(IOService, 41);
+    OSMetaClassDeclareReservedUnused(IOService, 42);
+    OSMetaClassDeclareReservedUnused(IOService, 43);
+    OSMetaClassDeclareReservedUnused(IOService, 44);
+    OSMetaClassDeclareReservedUnused(IOService, 45);
+    OSMetaClassDeclareReservedUnused(IOService, 46);
+    OSMetaClassDeclareReservedUnused(IOService, 47);
+
+#ifdef __ppc__
+    OSMetaClassDeclareReservedUnused(IOService, 48);
+    OSMetaClassDeclareReservedUnused(IOService, 49);
+    OSMetaClassDeclareReservedUnused(IOService, 50);
+    OSMetaClassDeclareReservedUnused(IOService, 51);
+    OSMetaClassDeclareReservedUnused(IOService, 52);
+    OSMetaClassDeclareReservedUnused(IOService, 53);
+    OSMetaClassDeclareReservedUnused(IOService, 54);
+    OSMetaClassDeclareReservedUnused(IOService, 55);
+    OSMetaClassDeclareReservedUnused(IOService, 56);
+    OSMetaClassDeclareReservedUnused(IOService, 57);
+    OSMetaClassDeclareReservedUnused(IOService, 58);
+    OSMetaClassDeclareReservedUnused(IOService, 59);
+    OSMetaClassDeclareReservedUnused(IOService, 60);
+    OSMetaClassDeclareReservedUnused(IOService, 61);
+    OSMetaClassDeclareReservedUnused(IOService, 62);
+    OSMetaClassDeclareReservedUnused(IOService, 63);
+#endif
+
+public:
+/*! @function getState
+    @abstract Accessor for IOService state bits, not normally needed or used outside IOService.
+    @result State bits for the IOService, eg. <code>kIOServiceInactiveState</code>, <code>kIOServiceRegisteredState</code>. */
+
+    virtual IOOptionBits getState( void ) const;
+
+/*! @function isInactive
+    @abstract Checks if the IOService object has been terminated, and is in the process of being destroyed.
+    @discussion When an IOService object is successfully terminated, it is immediately made inactive, which blocks further attach()es, matching or notifications occuring on the object. It remains inactive until the last client closes, and is then finalized and destroyed.
+    @result <code>true</code> if the IOService object has been terminated. */
+
+    bool isInactive( void ) const;
+
+    /* Stack creation */
+
+/*! @function registerService
+    @abstract Starts the registration process for a newly discovered IOService object.
+    @discussion This function allows an IOService subclass to be published and made available to possible clients, by starting the registration process and delivering notifications to registered clients. The object should be completely setup and ready to field requests from clients before <code>registerService</code> is called.
+    @param options The default zero options mask is recommended and should be used in most cases. The registration process is usually asynchronous, with possible driver probing and notification occurring some time later. <code>kIOServiceSynchronous</code> may be passed to carry out the matching and notification process for currently registered clients before returning to the caller. */
+
+    virtual void registerService( IOOptionBits options = 0 );
+
+/*! @function probe
+    @abstract During an IOService object's instantiation, probes a matched service to see if it can be used.
+    @discussion The registration process for an IOService object (the provider) includes instantiating possible driver clients. The <code>probe</code> method is called in the client instance to check the matched service can be used before the driver is considered to be started. Since matching screens many possible providers, in many cases the <code>probe</code> method can be left unimplemented by IOService subclasses. The client is already attached to the provider when <code>probe</code> is called.
+    @param provider The registered IOService object that matches a driver personality's matching dictionary.
+    @param score Pointer to the current driver's probe score, which is used to order multiple matching drivers in the same match category. It defaults to the value of the <code>IOProbeScore</code> property in the drivers property table, or <code>kIODefaultProbeScore</code> if none is specified. The <code>probe</code> method may alter the score to affect start order.
+    @result An IOService instance or zero when the probe is unsuccessful. In almost all cases the value of <code>this</code> is returned on success. If another IOService object is returned, the probed instance is detached and freed, and the returned instance is used in its stead for <code>start</code>. */
+    
+    virtual IOService * probe(	IOService * 	provider,
+				SInt32 	  *	score );
+
+/*! @function start
+    @abstract During an IOService object's instantiation, starts the IOService object that has been selected to run on the provider.
+    @discussion The <code>start</code> method of an IOService instance is called by its provider when it has been selected (due to its probe score and match category) as the winning client. The client is already attached to the provider when <code>start</code> is called.<br>Implementations of <code>start</code> must call <code>start</code> on their superclass at an appropriate point. If an implementation of <code>start</code> has already called <code>super::start</code> but subsequently determines that it will fail, it must call <code>super::stop</code> to balance the prior call to <code>super::start</code> and prevent reference leaks.
+    @result <code>true</code> if the start was successful; <code>false</code> otherwise (which will cause the instance to be detached and usually freed). */
+    
+    virtual bool start( IOService * provider );
+    
+/*! @function stop
+    @abstract During an IOService termination, the stop method is called in its clients before they are detached & it is destroyed.
+    @discussion The termination process for an IOService (the provider) will call stop in each of its clients, after they have closed the provider if they had it open, or immediately on termination. */
+
+    virtual void stop( IOService * provider );
+
+    /* Open / Close */
+
+/*! @function open
+    @abstract Requests active access to a provider.
+    @discussion IOService provides generic open and close semantics to track clients of a provider that have established an active datapath. The use of <code>open</code> and @link close close@/link, and rules regarding ownership are family defined, and defined by the @link handleOpen handleOpen@/link and @link handleClose handleClose@/link methods in the provider. Some families will limit access to a provider based on its open state.
+    @param forClient Designates the client of the provider requesting the open.
+    @param options Options for the open. The provider family may implement options for open; IOService defines only <code>kIOServiceSeize</code> to request the device be withdrawn from its current owner.
+    @result <code>true</code> if the open was successful; <code>false</code> otherwise. */
+
+    virtual bool open( 	 IOService *	   forClient,
+                         IOOptionBits	   options = 0,
+                         void *		   arg = 0 );
+
+/*! @function close
+    @abstract Releases active access to a provider.
+    @discussion IOService provides generic open and close semantics to track clients of a provider that have established an active datapath. The use of @link open open@/link and <code>close</code>, and rules regarding ownership are family defined, and defined by the @link handleOpen handleOpen@/link and @link handleClose handleClose@/link methods in the provider.
+    @param forClient Designates the client of the provider requesting the close.
+    @param options Options available for the close. The provider family may implement options for close; IOService defines none.
+    @param arg Family specific arguments which are ignored by IOService. */
+    
+    virtual void close(  IOService *	   forClient,
+                         IOOptionBits	   options = 0 );
+                         
+/*! @function isOpen
+    @abstract Determines whether a specific, or any, client has an IOService object open.
+    @discussion Returns the open state of an IOService object with respect to the specified client, or when it is open by any client.
+    @param forClient If non-zero, <codeisOpen</code returns the open state for that client. If zero is passed, <codeisOpen</code returns the open state for all clients.
+    @result <codetrue</code if the specific, or any, client has the IOService object open. */
+
+    virtual bool isOpen( const IOService * forClient = 0 ) const;
+
+/*! @function handleOpen
+    @abstract Controls the open / close behavior of an IOService object (overrideable by subclasses).
+    @discussion IOService calls this method in its subclasses in response to the @link open open@/link method, so the subclass may implement the request. The default implementation provides single owner access to an IOService object via <code>open</code>. The object is locked via @link lockForArbitration lockForArbitration@/link before <code>handleOpen</code> is called.
+    @param forClient Designates the client of the provider requesting the open.
+    @param options Options for the open, may be interpreted by the implementor of <code>handleOpen</code>.
+    @result <code>true</code>if the open was successful; <code>false</code> otherwise. */
+
+    virtual bool handleOpen( 	IOService *	  forClient,
+                                IOOptionBits	  options,
+                                void *		  arg );
+                                
+/*! @function handleClose
+    @abstract Controls the open / close behavior of an IOService object (overrideable by subclasses).
+    @discussion IOService calls this method in its subclasses in response to the @link close close@/link method, so the subclass may implement the request. The default implementation provides single owner access to an IOService object via @link open open@/link. The object is locked via @link lockForArbitration lockForArbitration@/link before <code>handleClose</code> is called.
+    @param forClient Designates the client of the provider requesting the close.
+    @param options Options for the close, may be interpreted by the implementor of @link handleOpen handleOpen@/link. */
+
+    virtual void handleClose(   IOService *	  forClient,
+                                IOOptionBits	  options );
+                                
+/*! @function handleIsOpen
+    @abstract Controls the open / close behavior of an IOService object (overrideable by subclasses).
+    @discussion IOService calls this method in its subclasses in response to the @link open open@/link method, so the subclass may implement the request. The default implementation provides single owner access to an IOService object via @link open open@/link. The object is locked via @link lockForArbitration lockForArbitration@/link before <code>handleIsOpen</code> is called.
+    @param forClient If non-zero, <code>isOpen</code> returns the open state for that client. If zero is passed, <code>isOpen</code> returns the open state for all clients.
+    @result <code>true</code> if the specific, or any, client has the IOService object open. */
+
+    virtual bool handleIsOpen(  const IOService * forClient ) const;
+
+    /* Stacking change */
+
+/*! @function terminate
+    @abstract Makes an IOService object inactive and begins its destruction.
+    @discussion Registering an IOService object informs possible clients of its existance and instantiates drivers that may be used with it; <code>terminate</code> involves the opposite process of informing clients that an IOService object is no longer able to be used and will be destroyed. By default, if any client has the service open, <code>terminate</code> fails. If the <code>kIOServiceRequired</code> flag is passed however, <code>terminate</code> will be successful though further progress in the destruction of the IOService object will not proceed until the last client has closed it. The service will be made inactive immediately upon successful termination, and all its clients will be notified via their @link message message@/link method with a message of type <code>kIOMessageServiceIsTerminated</code>. Both these actions take place on the caller's thread. After the IOService object is made inactive, further matching or attach calls will fail on it. Each client has its @link stop stop@/link method called upon their close of an inactive IOService object , or on its termination if they do not have it open. After <code>stop</code>, @link detach detach@/link is called in each client. When all clients have been detached, the @link finalize finalize@/link method is called in the inactive service. The termination process is inherently asynchronous because it will be deferred until all clients have chosen to close.
+    @param options In most cases no options are needed. <code>kIOServiceSynchronous</code> may be passed to cause <code>terminate</code> to not return until the service is finalized. */
+
+    virtual bool terminate( IOOptionBits options = 0 );
+
+/*! @function finalize
+    @abstract Finalizes the destruction of an IOService object.
+    @discussion The <code>finalize</code> method is called in an inactive (ie. terminated) IOService object after the last client has detached. IOService's implementation will call @link stop stop@/link, @link close close@/link, and @link detach detach@/link on each provider. When <code>finalize</code> returns, the object's retain count will have no references generated by IOService's registration process.
+    @param options The options passed to the @link terminate terminate@/link method of the IOService object are passed on to <code>finalize</code>.
+    @result <code>true</code>. */
+    
+    virtual bool finalize( IOOptionBits options );
+
+/*! @function free
+    @abstract Frees data structures that were allocated when power management was initialized on this service. */
+    
+    virtual void free( void );
+
+/*! @function lockForArbitration
+    @abstract Locks an IOService object against changes in state or ownership.
+    @discussion The registration, termination and open / close functions of IOService use <code>lockForArbtration</code> to single-thread access to an IOService object. <code>lockForArbitration</code> grants recursive access to the same thread.
+    @param isSuccessRequired If a request for access to an IOService object should be denied if it is terminated, pass <code>false</code>, otherwise pass <code>true</code>. */
+    
+    virtual bool lockForArbitration( bool isSuccessRequired = true );
+    
+/*! @function unlockForArbitration
+    @abstract Unlocks an IOService obkect after a successful @link lockForArbitration lockForArbitration@/link.
+    @discussion A thread granted exclusive access to an IOService object should release it with <code>unlockForArbitration</code>. */
+    
+    virtual void unlockForArbitration( void );
+
+/*! @function terminateClient
+    @abstract Passes a termination up the stack.
+    @discussion When an IOService object is made inactive the default behavior is to also make any of its clients that have it as their only provider inactive, in this way recursing the termination up the driver stack. This method allows a terminated  IOService object to override this behavior. Note the client may also override this behavior by overriding its @link terminate terminate@/link method.
+    @param client The client of the terminated provider.
+    @param options Options originally passed to @link terminate terminate@/link, plus <code>kIOServiceRecursing</code>.
+    @result result of the terminate request on the client. */
+
+    virtual bool terminateClient( IOService * client, IOOptionBits options );
+
+    /* Busy state indicates discovery, matching or termination is in progress */
+
+/*! @function getBusyState
+    @abstract Returns the <code>busyState</code> of an IOService object.
+    @discussion Many activities in IOService are asynchronous. When registration, matching, or termination is in progress on an IOService object, its <code>busyState</code> is increased by one. Change in <code>busyState</code> to or from zero also changes the IOService object's provider's <code>busyState</code> by one, which means that an IOService object is marked busy when any of the above activities is ocurring on it or any of its clients.
+    @result The <code>busyState</code> value. */
+
+    virtual UInt32 getBusyState( void );
+    
+/*! @function adjustBusy
+    @abstract Adjusts the <code>busyState</code> of an IOService object.
+    @discussion Applies a delta to an IOService object's <code>busyState</code>. A change in the <code>busyState</code> to or from zero will change the IOService object's provider's <code>busyState</code> by one (in the same direction). 
+    @param delta The delta to be applied to the IOService object's <code>busyState</code>. */
+
+    virtual void adjustBusy( SInt32 delta );
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+	IOReturn waitQuiet(mach_timespec_t * timeout)
+	APPLE_KEXT_DEPRECATED;
+
+/*! @function waitQuiet
+    @abstract Waits for an IOService object's <code>busyState</code> to be zero.
+    @discussion Blocks the caller until an IOService object is non busy.
+	@param timeout The maximum time to wait in nanoseconds. Default is to wait forever.
+    @result Returns an error code if Mach synchronization primitives fail, <code>kIOReturnTimeout</code>, or <code>kIOReturnSuccess</code>. */
+    
+    IOReturn waitQuiet(uint64_t timeout = UINT64_MAX);
+
+    /* Matching */
+
+/*! @function matchPropertyTable
+    @abstract Allows a registered IOService object to implement family specific matching.
+    @discussion All matching on an IOService object will call this method to allow a family writer to implement matching in addition to the generic methods provided by IOService. The implementer should examine the matching dictionary passed to see if it contains properties the family understands for matching, and use them to match with the IOService object if so. Note that since matching is also carried out by other parts of the I/O Kit, the matching dictionary may contain properties the family does not understand - these should not be considered matching failures.
+    @param table The dictionary of properties to be matched against.
+    @param score Pointer to the current driver's probe score, which is used to order multiple matching drivers in the same match category. It defaults to the value of the <code>IOProbeScore</code> property in the drivers property table, or <code>kIODefaultProbeScore</code> if none is specified.
+    @result <code>false</code> if the family considers the matching dictionary does not match in properties it understands; <code>true</code> otherwise. */
+
+    virtual bool matchPropertyTable( OSDictionary *	table,
+                                     SInt32       *	score );
+
+    virtual bool matchPropertyTable( OSDictionary * table );
+
+/*! @function matchLocation
+    @abstract Allows a registered IOService object to direct location matching.
+    @discussion By default, a location matching property will be applied to an IOService object's provider. This method allows that behavior to be overridden by families.
+    @param client The IOService object at which matching is taking place.
+    @result Returns the IOService instance to be used for location matching. */
+
+    virtual IOService * matchLocation( IOService * client );
+
+    /* Resource service */
+
+/*! @function publishResource
+    @abstract Uses the resource service to publish a property.
+    @discussion The resource service uses IOService's matching and notification to allow objects to be published and found by any I/O Kit client by a global name. <code>publishResource</code> makes an object available to anyone waiting for it or looking for it in the future.
+    @param key An OSSymbol key that globally identifies the object.
+    @param The object to be published. */
+
+    static void publishResource( const OSSymbol * key, OSObject * value = 0 );
+
+/*! @function publishResource
+    @abstract Uses the resource service to publish a property.
+    @discussion The resource service uses IOService object's matching and notification to allow objects to be published and found by any I/O Kit client by a global name. <code>publishResource</code> makes an object available to anyone waiting for it or looking for it in the future.
+    @param key A C string key that globally identifies the object.
+    @param The object to be published. */
+
+    static void publishResource( const char * key, OSObject * value = 0 );
+    virtual bool addNeededResource( const char * key );
+
+    /* Notifications */
+
+/*! @function addNotification
+    @abstract Deprecated use addMatchingNotification(). Adds a persistant notification handler to be notified of IOService events.
+    @discussion IOService will deliver notifications of changes in state of an IOService object to registered clients. The type of notification is specified by a symbol, for example <code>gIOMatchedNotification</code> or <code>gIOTerminatedNotification</code>, and notifications will only include IOService objects that match the supplied matching dictionary. Notifications are ordered by a priority set with <code>addNotification</code>. When the notification is installed, its handler will be called with each of any currently existing IOService objects that are in the correct state (eg. registered) and match the supplied matching dictionary, avoiding races between finding preexisting and new IOService events. The notification request is identified by an instance of an IONotifier object, through which it can be enabled, disabled, or removed. <code>addNotification</code> consumes a retain count on the matching dictionary when the notification is removed.
+    @param type An OSSymbol identifying the type of notification and IOService state:
+<br>	<code>gIOPublishNotification</code> Delivered when an IOService object is registered.
+<br>	<code>gIOFirstPublishNotification</code> Delivered when an IOService object is registered, but only once per IOService instance. Some IOService objects may be reregistered when their state is changed.
+<br>	<code>gIOMatchedNotification</code> Delivered when an IOService object has been matched with all client drivers, and they have been probed and started.
+<br>	<code>gIOFirstMatchNotification</code> Delivered when an IOService object has been matched with all client drivers, but only once per IOService instance. Some IOService objects may be reregistered when their state is changed.
+<br>	<code>gIOTerminatedNotification</code> Delivered after an IOService object has been terminated, during its finalize stage.
+    @param matching A matching dictionary to restrict notifications to only matching IOService objects. The dictionary will be released when the notification is removed, consuming the passed-in reference.
+    @param handler A C function callback to deliver notifications.
+    @param target An instance reference for the callback's use.
+    @param ref A reference constant for the callback's use.
+    @param priority A constant ordering all notifications of a each type.
+    @result An instance of an IONotifier object that can be used to control or destroy the notification request. */
+
+    static IONotifier * addNotification(
+                            const OSSymbol * type, OSDictionary * matching,
+                            IOServiceNotificationHandler handler,
+                            void * target, void * ref = 0,
+                            SInt32 priority = 0 )
+	APPLE_KEXT_DEPRECATED;
+
+/*! @function addMatchingNotification
+    @abstract Adds a persistant notification handler to be notified of IOService events.
+    @discussion IOService will deliver notifications of changes in state of an IOService object to registered clients. The type of notification is specified by a symbol, for example <code>gIOMatchedNotification</code> or <code>gIOTerminatedNotification</code>, and notifications will only include IOService objects that match the supplied matching dictionary. Notifications are ordered by a priority set with <code>addNotification</code>. When the notification is installed, its handler will be called with each of any currently existing IOService objects that are in the correct state (eg. registered) and match the supplied matching dictionary, avoiding races between finding preexisting and new IOService events. The notification request is identified by an instance of an IONotifier object, through which it can be enabled, disabled, or removed. <code>addMatchingNotification</code> does not consume a reference on the matching dictionary when the notification is removed, unlike addNotification.
+    @param type An OSSymbol identifying the type of notification and IOService state:
+<br>	<code>gIOPublishNotification</code> Delivered when an IOService object is registered.
+<br>	<code>gIOFirstPublishNotification</code> Delivered when an IOService object is registered, but only once per IOService instance. Some IOService objects may be reregistered when their state is changed.
+<br>	<code>gIOMatchedNotification</code> Delivered when an IOService object has been matched with all client drivers, and they have been probed and started.
+<br>	<code>gIOFirstMatchNotification</code> Delivered when an IOService object has been matched with all client drivers, but only once per IOService instance. Some IOService objects may be reregistered when their state is changed.
+<br>	<code>gIOTerminatedNotification</code> Delivered after an IOService object has been terminated, during its finalize stage.
+    @param matching A matching dictionary to restrict notifications to only matching IOService objects. The dictionary is retained while the notification is installed. (Differs from addNotification).
+    @param handler A C function callback to deliver notifications.
+    @param target An instance reference for the callback's use.
+    @param ref A reference constant for the callback's use.
+    @param priority A constant ordering all notifications of a each type.
+    @result An instance of an IONotifier object that can be used to control or destroy the notification request. */
+
+    static IONotifier * addMatchingNotification(
+                            const OSSymbol * type, OSDictionary * matching,
+                            IOServiceMatchingNotificationHandler handler,
+                            void * target, void * ref = 0,
+                            SInt32 priority = 0 );
+
+/*! @function waitForService
+    @abstract Deprecated use waitForMatchingService(). Waits for a matching to service to be published.
+    @discussion Provides a method of waiting for an IOService object matching the supplied matching dictionary to be registered and fully matched. 
+    @param matching The matching dictionary describing the desired IOService object. <code>waitForService</code> consumes one reference of the matching dictionary.
+    @param timeout The maximum time to wait.
+    @result A published IOService object matching the supplied dictionary. */
+
+    static IOService * waitForService( OSDictionary * matching,
+                            mach_timespec_t * timeout = 0);
+
+/*! @function waitForMatchingService
+    @abstract Waits for a matching to service to be published.
+    @discussion Provides a method of waiting for an IOService object matching the supplied matching dictionary to be registered and fully matched. 
+    @param matching The matching dictionary describing the desired IOService object. (Does not consume a reference of the matching dictionary - differs from waitForService() which does consume a reference on the matching dictionary.)
+	@param timeout The maximum time to wait in nanoseconds. Default is to wait forever.
+    @result A published IOService object matching the supplied dictionary. waitForMatchingService returns a reference to the IOService which should be released by the caller. (Differs from waitForService() which does not retain the returned object.) */
+
+    static IOService * waitForMatchingService( OSDictionary * matching,
+                            uint64_t timeout = UINT64_MAX);
+
+/*! @function getMatchingServices
+    @abstract Finds the set of current published IOService objects matching a matching dictionary.
+    @discussion Provides a method of finding the current set of published IOService objects matching the supplied matching dictionary.   
+    @param matching The matching dictionary describing the desired IOService objects.
+    @result An instance of an iterator over a set of IOService objects. To be released by the caller. */
+
+    static OSIterator * getMatchingServices( OSDictionary * matching );
+
+public:
+    /* Helpers to make matching dictionaries for simple cases,
+     * they add keys to an existing dictionary, or create one. */
+
+/*! @function serviceMatching
+    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify an IOService class match.
+    @discussion A very common matching criteria for IOService object is based on its class. <code>serviceMatching</code> creates a matching dictionary that specifies any IOService object of a class, or its subclasses. The class is specified by name, and an existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
+    @param className The class name, as a const C string. Class matching is successful on IOService objects of this class or any subclass.
+    @param table If zero, <code>serviceMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
+    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
+
+    static OSDictionary * serviceMatching( const char * className,
+			OSDictionary * table = 0 );
+
+/*! @function serviceMatching
+    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify an IOService class match.
+    @discussion A very common matching criteria for IOService object is based on its class. <code>serviceMatching</code> creates a matching dictionary that specifies any IOService of a class, or its subclasses. The class is specified by name, and an existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
+    @param className The class name, as an OSString (which includes OSSymbol). Class matching is successful on IOService objects of this class or any subclass.
+    @param table If zero, <code>serviceMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
+    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
+
+    static OSDictionary * serviceMatching( const OSString * className,
+			OSDictionary * table = 0 );
+
+/*! @function nameMatching
+    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify an IOService name match.
+    @discussion A very common matching criteria for IOService object is based on its name. <code>nameMatching</code> creates a matching dictionary that specifies any IOService object which responds successfully to the @link //apple_ref/cpp/instm/IORegistryEntry/compareName/virtualbool/(OSString*,OSString**) IORegistryEntry::compareName@/link method. An existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
+    @param name The service's name, as a const C string. Name matching is successful on IOService objects that respond successfully to the <code>IORegistryEntry::compareName</code> method.
+    @param table If zero, <code>nameMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
+    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
+
+    static OSDictionary * nameMatching( const char * name,
+			OSDictionary * table = 0 );
+
+/*! @function nameMatching
+    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify an IOService name match.
+    @discussion A very common matching criteria for IOService object is based on its name. <code>nameMatching</code> creates a matching dictionary that specifies any IOService object which responds successfully to the @link //apple_ref/cpp/instm/IORegistryEntry/compareName/virtualbool/(OSString*,OSString**) IORegistryEntry::compareName@/link method. An existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
+    @param name The service's name, as an OSString (which includes OSSymbol). Name matching is successful on IOService objects that respond successfully to the <code>IORegistryEntry::compareName</code> method.
+    @param table If zero, <code>nameMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
+    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
+
+    static OSDictionary * nameMatching( const OSString* name,
+			OSDictionary * table = 0 );
+
+/*! @function resourceMatching
+    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify a resource service match.
+    @discussion IOService maintains a resource service IOResources that allows objects to be published and found globally in the I/O Kit based on a name, using the standard IOService matching and notification calls.
+    @param name The resource name, as a const C string. Resource matching is successful when an object by that name has been published with the <code>publishResource</code> method.
+    @param table If zero, <code>resourceMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
+    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
+
+    static OSDictionary * resourceMatching( const char * name,
+			OSDictionary * table = 0 );
+
+/*! @function resourceMatching
+    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify a resource service match.
+    @discussion IOService maintains a resource service IOResources that allows objects to be published and found globally in the I/O Kit based on a name, using the standard IOService matching and notification calls.
+    @param name The resource name, as an OSString (which includes OSSymbol). Resource matching is successful when an object by that name has been published with the <code>publishResource</code> method.
+    @param table If zero, <code>resourceMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
+    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
+
+    static OSDictionary * resourceMatching( const OSString * name,
+			OSDictionary * table = 0 );
+
+
+/*! @function propertyMatching
+    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify an IOService phandle match.
+    @discussion TODO A very common matching criteria for IOService is based on its name. nameMatching will create a matching dictionary that specifies any IOService which respond successfully to the IORegistryEntry method compareName. An existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
+    @param key The service's phandle, as a const UInt32. PHandle matching is successful on IOService objects that respond successfully to the IORegistryEntry method compareName.
+    @param value The service's phandle, as a const UInt32. PHandle matching is successful on IOService's which respond successfully to the IORegistryEntry method compareName.
+    @param table If zero, nameMatching will create a matching dictionary and return a reference to it, otherwise the matching properties are added to the specified dictionary.
+    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
+
+    static OSDictionary * propertyMatching( const OSSymbol * key, const OSObject * value,
+			OSDictionary * table = 0 );
+
+/*! @function registryEntryIDMatching
+    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify a IORegistryEntryID match.
+    @discussion <code>registryEntryIDMatching</code> creates a matching dictionary that specifies the IOService object with the assigned registry entry ID (returned by <code>IORegistryEntry::getRegistryEntryID()</code>). An existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
+    @param name The service's ID. Matching is successful on the IOService object that return that ID from the <code>IORegistryEntry::getRegistryEntryID()</code> method.
+    @param table If zero, <code>registryEntryIDMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
+    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
+
+    static OSDictionary * registryEntryIDMatching( uint64_t entryID,
+			OSDictionary * table = 0 );
+
+
+/*! @function addLocation
+    @abstract Adds a location matching property to an existing dictionary.
+    @discussion This function creates matching properties that specify the location of a IOService object, as an embedded matching dictionary. This matching will be successful on an IOService object that attached to an IOService object which matches this location matching dictionary.
+    @param table The matching properties are added to the specified dictionary, which must be non-zero.
+    @result The location matching dictionary created is returned on success, or zero on failure. */
+
+    static OSDictionary * addLocation( OSDictionary * table );
+
+    /* Helpers for matching dictionaries. */
+
+/*! @function compareProperty
+    @abstract Compares a property in a matching dictionary with an IOService object's property table.
+    @discussion This is a helper function to aid in implementing @link matchPropertyTable matchPropertyTable@/link. If the property specified by <code>key</code> exists in the matching dictionary, it is compared with a property of the same name in the IOService object's property table. The comparison is performed with the <code>isEqualTo</code> method. If the property does not exist in the matching table, success is returned. If the property exists in the matching dictionary but not the IOService property table, failure is returned.
+    @param matching The matching dictionary, which must be non-zero.
+    @param key The dictionary key specifying the property to be compared, as a C string.
+    @result <code>true</code> if the property does not exist in the matching table. If the property exists in the matching dictionary but not the IOService property table, failure is returned. Otherwise the result of calling the property from the matching dictionary's <code>isEqualTo</code> method with the IOService property as an argument is returned. */
+
+    virtual bool compareProperty(   OSDictionary   * matching,
+                                    const char     * key );
+/*! @function compareProperty
+    @abstract Compares a property in a matching dictionary with an IOService object's property table.
+    @discussion This is a helper function to aid in implementing @link matchPropertyTable matchPropertyTable@/link. If the property specified by <code>key</code> exists in the matching dictionary, it is compared with a property of the same name in the IOService object's property table. The comparison is performed with the <code>isEqualTo</code> method. If the property does not exist in the matching table, success is returned. If the property exists in the matching dictionary but not the IOService property table, failure is returned.
+    @param matching The matching dictionary, which must be non-zero.
+    @param key The dictionary key specifying the property to be compared, as an OSString (which includes OSSymbol).
+    @result <code>true</code> if the property does not exist in the matching table. If the property exists in the matching dictionary but not the IOService property table, failure is returned. Otherwise the result of calling the property from the matching dictionary's <code>isEqualTo</code> method with the IOService property as an argument is returned. */
+
+    virtual bool compareProperty(   OSDictionary   * matching,
+                                    const OSString * key );
+
+/*! @function compareProperties
+    @abstract Compares a set of properties in a matching dictionary with an IOService object's property table.
+    @discussion This is a helper function to aid in implementing @link matchPropertyTable matchPropertyTable@/link. A collection of dictionary keys specifies properties in a matching dictionary to be compared, with <code>compareProperty</code>, with an IOService object's property table, if <code>compareProperty</code> returns <code>true</code> for each key, success is returned; otherwise failure.
+    @param matching The matching dictionary, which must be non-zero.
+    @param keys A collection (eg. OSSet, OSArray, OSDictionary) which should contain OSStrings (or OSSymbols) that specify the property keys to be compared.
+    @result Success if <code>compareProperty</code> returns <code>true</code> for each key in the collection; otherwise failure. */
+
+    virtual bool compareProperties( OSDictionary   * matching,
+                                    OSCollection   * keys );
+
+    /* Client / provider accessors */
+
+/*! @function attach
+    @abstract Attaches an IOService client to a provider in the I/O Registry.
+    @discussion This function called in an IOService client enters the client into the I/O Registry as a child of the provider in the service plane. The provider must be active or the attach will fail. Multiple attach calls to the same provider are no-ops and return success. A client may be attached to multiple providers. Entering an object into the I/O Registry retains both the client and provider until they are detached.
+    @param provider The IOService object which will serve as this object's provider.
+    @result <code>false</code> if the provider is inactive or on a resource failure; otherwise <code>true</code>. */
+
+    virtual bool attach( IOService * provider );
+    
+/*! @function detach
+    @abstract Detaches an IOService client from a provider in the I/O Registry.
+    @discussion This function called in an IOService client removes the client as a child of the provider in the service plane of the I/O Registry. If the provider is not a parent of the client this is a no-op, otherwise the I/O Registry releases both the client and provider.
+    @param provider The IOService object to detach from. */
+
+    virtual void detach( IOService * provider );
+
+/*! @function getProvider
+    @abstract Returns an IOService object's primary provider.
+    @discussion This function called in an IOService client will return the provider to which it was first attached. Because the majority of IOService objects have only one provider, this is a useful simplification and also supports caching of the provider when the I/O Registry is unchanged.
+    @result The first provider of the client, or zero if the IOService object is not attached into the I/O Registry. The provider is retained while the client is attached, and should not be released by the caller. */
+
+    virtual IOService * getProvider( void ) const;
+
+/*! @function getWorkLoop
+    @abstract Returns the current work loop or <code>provider->getWorkLoop</code>.
+    @discussion This function returns a valid work loop that a client can use to add an IOCommandGate to. The intention is that an IOService client has data that needs to be protected but doesn't want to pay the cost of a dedicated thread. This data has to be accessed from a provider's call-out context as well. So to achieve both of these goals the client creates an IOCommandGate to lock access to his data but he registers it with the provider's work loop, i.e. the work loop which will make the completion call-outs. This avoids a potential deadlock because the work loop gate uses a recursive lock, which allows the same lock to be held multiple times by a single thread.
+    @result A work loop, either the current work loop or it walks up the @link getProvider getProvider@/link chain calling <code>getWorkLoop</code>. Eventually it will reach a valid work loop-based driver or the root of the I/O tree, where it will return a system-wide work loop. Returns 0 if it fails to find (or create) a work loop.*/
+
+    virtual IOWorkLoop * getWorkLoop() const;
+
+/*! @function getProviderIterator
+    @abstract Returns an iterator over an IOService object's providers.
+    @discussion For those few IOService objects that obtain service from multiple providers, this method supplies an iterator over a client's providers. 
+    @result An iterator over the providers of the client, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, though they may no longer be attached during the iteration. */
+
+    virtual OSIterator * getProviderIterator( void ) const;
+
+/*! @function getOpenProviderIterator
+    @abstract Returns an iterator over an client's providers that are currently opened by the client.
+    @discussion For those few IOService objects that obtain service from multiple providers, this method supplies an iterator over a client's providers, locking each in turn with @link lockForArbitration lockForArbitration@/link and returning those that have been opened by the client. 
+    @result An iterator over the providers the client has open, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, and the current entry in the iteration is locked with <code>lockForArbitration</code>, protecting it from state changes. */
+
+    virtual OSIterator * getOpenProviderIterator( void ) const;
+
+/*! @function getClient
+    @abstract Returns an IOService object's primary client.
+    @discussion This function called in an IOService provider will return the first client to attach to it. For IOService objects which have only only one client, this may be a useful simplification.
+    @result The first client of the provider, or zero if the IOService object is not attached into the I/O Registry. The client is retained while it is attached, and should not be released by the caller. */
+
+    virtual IOService * getClient( void ) const;
+
+/*! @function getClientIterator
+    @abstract Returns an iterator over an IOService object's clients.
+    @discussion For IOService objects that may have multiple clients, this method supplies an iterator over a provider's clients. 
+    @result An iterator over the clients of the provider, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, though they may no longer be attached during the iteration. */
+
+    virtual OSIterator * getClientIterator( void ) const;
+
+/*! @function getOpenClientIterator
+    @abstract Returns an iterator over a provider's clients that currently have opened the provider.
+    @discussion For IOService objects that may have multiple clients, this method supplies an iterator over a provider's clients, locking each in turn with @link lockForArbitration lockForArbitration@/link and returning those that have opened the provider. 
+    @result An iterator over the clients that have opened the provider, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, and the current entry in the iteration is locked with <code>lockForArbitration</code>, protecting it from state changes. */
+
+    virtual OSIterator * getOpenClientIterator( void ) const;
+
+/*! @function callPlatformFunction
+    @abstract Calls the platform function with the given name.
+    @discussion The platform expert or other drivers may implement various functions to control hardware features.  <code>callPlatformFunction</code> allows any IOService object to access these functions. Normally <code>callPlatformFunction</code> is called on a service's provider. The provider services the request or passes it to its provider. The system's IOPlatformExpert subclass catches functions it knows about and redirects them into other parts of the service plane. If the IOPlatformExpert subclass cannot execute the function, the base class is called. The IOPlatformExpert base class attempts to find a service to execute the function by looking up the function name in an IOResources name space. A service may publish a service using <code>publishResource(functionName, this)</code>. If no service can be found to execute the function an error is returned.
+    @param functionName Name of the function to be called. When <code>functionName</code> is a C string, <code>callPlatformFunction</code> converts the C string to an OSSymbol and calls the OSSymbol version of <code>callPlatformFunction</code>. This process can block and should not be used from an interrupt context.
+    @param waitForFunction If <code>true</code>, <code>callPlatformFunction</code> will not return until the function has been called.
+    @result An IOReturn code; <code>kIOReturnSuccess</code> if the function was successfully executed, <code>kIOReturnUnsupported</code> if a service to execute the function could not be found. Other return codes may be returned by the function.*/
+
+    virtual IOReturn callPlatformFunction( const OSSymbol * functionName,
+					   bool waitForFunction,
+					   void *param1, void *param2,
+					   void *param3, void *param4 );
+
+    virtual IOReturn callPlatformFunction( const char * functionName,
+					   bool waitForFunction,
+					   void *param1, void *param2,
+					   void *param3, void *param4 );
+
+
+    /* Some accessors */
+
+/*! @function getPlatform
+    @abstract Returns a pointer to the platform expert instance for the computer.
+    @discussion This method provides an accessor to the platform expert instance for the computer. 
+    @result A pointer to the IOPlatformExport instance. It should not be released by the caller. */
+
+    static IOPlatformExpert * getPlatform( void );
+
+/*! @function getPMRootDomain
+    @abstract Returns a pointer to the power management root domain instance for the computer.
+    @discussion This method provides an accessor to the power management root domain instance for the computer. 
+    @result A pointer to the power management root domain instance. It should not be released by the caller. */
+
+    static class IOPMrootDomain * getPMRootDomain( void );
+
+/*! @function getServiceRoot
+    @abstract Returns a pointer to the root of the service plane.
+    @discussion This method provides an accessor to the root of the service plane for the computer. 
+    @result A pointer to the IOService instance at the root of the service plane. It should not be released by the caller. */
+
+    static IOService * getServiceRoot( void );
+
+/*! @function getResourceService
+    @abstract Returns a pointer to the IOResources service.
+    @discussion IOService maintains a resource service IOResources that allows objects to be published and found globally in the I/O Kit based on a name, using the standard IOService matching and notification calls.
+    @result A pointer to the IOResources instance. It should not be released by the caller. */
+
+    static IOService * getResourceService( void );
+
+    /* Allocate resources for a matched service */
+
+/*! @function getResources
+    @abstract Allocates any needed resources for a published IOService object before clients attach.
+    @discussion This method is called during the registration process for an IOService object if there are successful driver matches, before any clients attach. It allows for lazy allocation of resources to an IOService object when a matching driver is found.
+    @result An IOReturn code; <code>kIOReturnSuccess</code> is necessary for the IOService object to be successfully used, otherwise the registration process for the object is halted. */
+    
+    virtual IOReturn getResources( void );
+
+    /* Device memory accessors */
+
+/*! @function getDeviceMemoryCount
+    @abstract Returns a count of the physical memory ranges available for a device.
+    @discussion This method returns the count of physical memory ranges, each represented by an IODeviceMemory instance, that have been allocated for a memory mapped device.
+    @result An integer count of the number of ranges available. */
+
+    virtual IOItemCount getDeviceMemoryCount( void );
+
+/*! @function getDeviceMemoryWithIndex
+    @abstract Returns an instance of IODeviceMemory representing one of a device's memory mapped ranges.
+    @discussion This method returns a pointer to an instance of IODeviceMemory for the physical memory range at the given index for a memory mapped device.
+    @param index An index into the array of ranges assigned to the device.
+    @result A pointer to an instance of IODeviceMemory, or zero if the index is beyond the count available. The IODeviceMemory is retained by the provider, so is valid while attached, or while any mappings to it exist. It should not be released by the caller. See also @link mapDeviceMemoryWithIndex mapDeviceMemoryWithIndex@/link, which creates a device memory mapping. */
+
+    virtual IODeviceMemory * getDeviceMemoryWithIndex( unsigned int index );
+
+/*! @function mapDeviceMemoryWithIndex
+    @abstract Maps a physical range of a device.
+    @discussion This method creates a mapping for the IODeviceMemory at the given index, with <code>IODeviceMemory::map(options)</code>. The mapping is represented by the returned instance of IOMemoryMap, which should not be released until the mapping is no longer required.
+    @param index An index into the array of ranges assigned to the device.
+    @result An instance of IOMemoryMap, or zero if the index is beyond the count available. The mapping should be released only when access to it is no longer required. */
+
+    virtual IOMemoryMap * mapDeviceMemoryWithIndex( unsigned int index,
+						IOOptionBits options = 0 );
+
+/*! @function getDeviceMemory
+    @abstract Returns the array of IODeviceMemory objects representing a device's memory mapped ranges.
+    @discussion This method returns an array of IODeviceMemory objects representing the physical memory ranges allocated to a memory mapped device.
+    @result An OSArray of IODeviceMemory objects, or zero if none are available. The array is retained by the provider, so is valid while attached. */
+
+    virtual OSArray * getDeviceMemory( void );
+
+/*! @function setDeviceMemory
+    @abstract Sets the array of IODeviceMemory objects representing a device's memory mapped ranges.
+    @discussion This method sets an array of IODeviceMemory objects representing the physical memory ranges allocated to a memory mapped device.
+    @param array An OSArray of IODeviceMemory objects, or zero if none are available. The array will be retained by the object. */
+
+    virtual void setDeviceMemory( OSArray * array );
+
+    /* Interrupt accessors */
+
+/*! @function registerInterrupt
+    @abstract Registers a C function interrupt handler for a device supplying interrupts.
+    @discussion This method installs a C function interrupt handler to be called at primary interrupt time for a device's interrupt. Only one handler may be installed per interrupt source. IOInterruptEventSource provides a work loop based abstraction for interrupt delivery that may be more appropriate for work loop based drivers.
+    @param source The index of the interrupt source in the device.
+    @param target An object instance to be passed to the interrupt handler.
+    @param handler The C function to be called at primary interrupt time when the interrupt occurs. The handler should process the interrupt by clearing the interrupt, or by disabling the source.
+    @param refCon A reference constant for the handler's use.
+    @result An IOReturn code.<br><code>kIOReturnNoInterrupt</code> is returned if the source is not valid; <code>kIOReturnNoResources</code> is returned if the interrupt already has an installed handler. */
+
+    virtual IOReturn registerInterrupt(int source, OSObject *target,
+				       IOInterruptAction handler,
+				       void *refCon = 0);
+                                       
+/*! @function unregisterInterrupt
+    @abstract Removes a C function interrupt handler for a device supplying hardware interrupts.
+    @discussion This method removes a C function interrupt handler previously installed with @link registerInterrupt registerInterrupt@/link.
+    @param source The index of the interrupt source in the device.
+    @result An IOReturn code (<code>kIOReturnNoInterrupt</code> is returned if the source is not valid). */
+
+    virtual IOReturn unregisterInterrupt(int source);
+
+/*! @function getInterruptType
+    @abstract Returns the type of interrupt used for a device supplying hardware interrupts.
+    @param source The index of the interrupt source in the device.
+    @param interruptType The interrupt type for the interrupt source will be stored here by <code>getInterruptType</code>.<br> <code>kIOInterruptTypeEdge</code> will be returned for edge-trigggered sources.<br><code>kIOInterruptTypeLevel</code> will be returned for level-trigggered sources.
+    @result An IOReturn code (<code>kIOReturnNoInterrupt</code> is returned if the source is not valid). */
+
+    virtual IOReturn getInterruptType(int source, int *interruptType);
+
+/*! @function enableInterrupt
+    @abstract Enables a device interrupt.
+    @discussion It is the caller's responsiblity to keep track of the enable state of the interrupt source.
+    @param source The index of the interrupt source in the device.
+    @result An IOReturn code (<code>kIOReturnNoInterrupt</code> is returned if the source is not valid). */
+
+    virtual IOReturn enableInterrupt(int source);
+
+/*! @function disableInterrupt
+    @abstract Synchronously disables a device interrupt.
+    @discussion If the interrupt routine is running, the call will block until the routine completes. It is the caller's responsiblity to keep track of the enable state of the interrupt source.
+    @param source The index of the interrupt source in the device.
+    @result An IOReturn code (<code>kIOReturnNoInterrupt</code> is returned if the source is not valid). */
+
+    virtual IOReturn disableInterrupt(int source);
+
+/*! @function causeInterrupt
+    @abstract Causes a device interrupt to occur.
+    @discussion Emulates a hardware interrupt, to be called from task level.
+    @param source The index of the interrupt source in the device.
+    @result An IOReturn code (<code>kIOReturnNoInterrupt</code> is returned if the source is not valid). */
+
+    virtual IOReturn causeInterrupt(int source);
+
+/*! @function requestProbe
+    @abstract Requests that hardware be re-scanned for devices.
+    @discussion For bus families that do not usually detect device addition or removal, this method represents an external request (eg. from a utility application) to rescan and publish or remove found devices.
+    @param options Family defined options, not interpreted by IOService.
+    @result An IOReturn code. */
+
+    virtual IOReturn requestProbe( IOOptionBits options );
+
+    /* Generic API for non-data-path upstream calls */
+
+/*! @function message
+    @abstract Receives a generic message delivered from an attached provider.
+    @discussion A provider may deliver messages via the <code>message</code> method to its clients informing them of state changes, such as <code>kIOMessageServiceIsTerminated</code> or <code>kIOMessageServiceIsSuspended</code>. Certain messages are defined by the I/O Kit in <code>IOMessage.h</code> while others may be family dependent. This method is implemented in the client to receive messages.
+    @param type A type defined in <code>IOMessage.h</code> or defined by the provider family.
+    @param provider The provider from which the message originates.
+    @param argument An argument defined by the provider family, not used by IOService.
+    @result An IOReturn code defined by the message type. */
+
+    virtual IOReturn message( UInt32 type, IOService * provider,
+                              void * argument = 0 );
+                                
+/*! @function messageClient
+    @abstract Sends a generic message to an attached client.
+    @discussion A provider may deliver messages via the @link message message@/link method to its clients informing them of state changes, such as <code>kIOMessageServiceIsTerminated</code> or <code>kIOMessageServiceIsSuspended</code>. Certain messages are defined by the I/O Kit in <code>IOMessage.h</code> while others may be family dependent. This method may be called in the provider to send a message to the specified client, which may be useful for overrides.
+    @param messageType A type defined in <code>IOMessage.h</code> or defined by the provider family.
+    @param client A client of the IOService to send the message.
+    @param messageArgument An argument defined by the provider family, not used by IOService.
+    @param argSize Specifies the size of messageArgument, in bytes.  If argSize is non-zero, messageArgument is treated as a pointer to argSize bytes of data.  If argSize is 0 (the default), messageArgument is treated as an ordinal and passed by value.
+    @result The return code from the client message call. */
+    
+    virtual IOReturn messageClient( UInt32 messageType, OSObject * client,
+                                    void * messageArgument = 0, vm_size_t argSize = 0 );
+
+/*! @function messageClients
+    @abstract Sends a generic message to all attached clients.
+    @discussion A provider may deliver messages via the @link message message@/link method to its clients informing them of state changes, such as <code>kIOMessageServiceIsTerminated</code> or <code>kIOMessageServiceIsSuspended</code>. Certain messages are defined by the I/O Kit in <code>IOMessage.h</code> while others may be family dependent. This method may be called in the provider to send a message to all the attached clients, via the @link messageClient messageClient@/link method.
+    @param type A type defined in <code>IOMessage.h</code> or defined by the provider family.
+    @param argument An argument defined by the provider family, not used by IOService.
+    @param argSize Specifies the size of argument, in bytes.  If argSize is non-zero, argument is treated as a pointer to argSize bytes of data.  If argSize is 0 (the default), argument is treated as an ordinal and passed by value.
+    @result Any non-<code>kIOReturnSuccess</code> return codes returned by the clients, or <code>kIOReturnSuccess</code> if all return <code>kIOReturnSuccess</code>. */
+
+    virtual IOReturn messageClients( UInt32 type,
+                                     void * argument = 0, vm_size_t argSize = 0 );
+
+    virtual IONotifier * registerInterest( const OSSymbol * typeOfInterest,
+                                           IOServiceInterestHandler handler,
+                                           void * target, void * ref = 0 );
+
+    virtual void applyToProviders( IOServiceApplierFunction applier,
+                                   void * context );
+
+    virtual void applyToClients( IOServiceApplierFunction applier,
+                                 void * context );
+
+    virtual void applyToInterested( const OSSymbol * typeOfInterest,
+                                    OSObjectApplierFunction applier,
+                                    void * context );
+
+    virtual IOReturn acknowledgeNotification( IONotificationRef notification,
+                                              IOOptionBits response );
+
+    /* User client create */
+
+/*! @function newUserClient
+    @abstract Creates a connection for a non kernel client.
+    @discussion A non kernel client may request a connection be opened via the @link //apple_ref/c/func/IOServiceOpen IOServiceOpen@/link library function, which will call this method in an IOService object. The rules and capabilities of user level clients are family dependent, and use the functions of the IOUserClient class for support. IOService's implementation returns <code>kIOReturnUnsupported</code>, so any family supporting user clients must implement this method.
+    @param owningTask The Mach task of the client thread in the process of opening the user client. Note that in Mac OS X, each process is based on a Mach task and one or more Mach threads. For more information on the composition of a Mach task and its relationship with Mach threads, see {@linkdoc //apple_ref/doc/uid/TP30000905-CH209-TPXREF103 "Tasks and Threads"}.
+    @param securityID A token representing the access level for the task.
+    @param type A constant specifying the type of connection to be created, specified by the caller of @link //apple_ref/c/func/IOServiceOpen IOServiceOpen@/link and interpreted only by the family.
+    @param handler An instance of an IOUserClient object to represent the connection, which will be released when the connection is closed, or zero if the connection was not opened.    
+    @param properties A dictionary of additional properties for the connection.
+    @result A return code to be passed back to the caller of <code>IOServiceOpen</code>. */
+
+    virtual IOReturn newUserClient( task_t owningTask, void * securityID,
+                                    UInt32 type, OSDictionary * properties,
+                                    IOUserClient ** handler );
+
+    virtual IOReturn newUserClient( task_t owningTask, void * securityID,
+                                    UInt32 type, IOUserClient ** handler );
+
+    /* Return code utilities */
+
+/*! @function stringFromReturn
+    @abstract Supplies a programmer-friendly string from an IOReturn code.
+    @discussion Strings are available for the standard return codes in <code>IOReturn.h</code> in IOService, while subclasses may implement this method to interpret family dependent return codes.
+    @param rtn The IOReturn code.
+    @result A pointer to a constant string, or zero if the return code is unknown. */
+    
+    virtual const char * stringFromReturn( IOReturn rtn );
+
+/*! @function errnoFromReturn
+    @abstract Translates an IOReturn code to a BSD <code>errno</code>.
+    @discussion BSD defines its own return codes for its functions in <code>sys/errno.h</code>, and I/O Kit families may need to supply compliant results in BSD shims. Results are available for the standard return codes in <code>IOReturn.h</code> in IOService, while subclasses may implement this method to interpret family dependent return codes.
+    @param rtn The IOReturn code.
+    @result The BSD <code>errno</code> or <code>EIO</code> if unknown. */
+    
+    virtual int errnoFromReturn( IOReturn rtn );
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+    /* * * * * * * * * * end of IOService API  * * * * * * * */
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    /* for IOInterruptController implementors */
+
+    int               _numInterruptSources;
+    IOInterruptSource *_interruptSources;
+
+    /* overrides */
+    virtual bool serializeProperties( OSSerialize * s ) const;
+
+    void   requireMaxBusStall(UInt32 ns);
+    void   requireMaxInterruptDelay(uint32_t ns);
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+    /* * * * * * * * * * * * Internals * * * * * * * * * * * */
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+
+private:
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+	bool checkResources( void );
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    bool checkResource( OSObject * matching );
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    void probeCandidates( OSOrderedSet * matches );
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    bool startCandidate( IOService * candidate );
+
+public:
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOService * getClientWithCategory( const OSSymbol * category )
+	APPLE_KEXT_DEPRECATED;
+	// copyClientWithCategory is the public replacement
+
+private:
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    bool passiveMatch( OSDictionary * matching, bool changesOK = false);
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    void startMatching( IOOptionBits options = 0 );
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    void doServiceMatch( IOOptionBits options );
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    void doServiceTerminate( IOOptionBits options );
+
+private:
+    static OSObject * copyExistingServices( OSDictionary * matching,
+		 IOOptionBits inState, IOOptionBits options = 0 );
+
+    static IONotifier * setNotification(
+			const OSSymbol * type, OSDictionary * matching,
+                    	IOServiceMatchingNotificationHandler handler,
+                        void * target, void * ref,
+                        SInt32 priority = 0 );
+
+    static IONotifier * doInstallNotification(
+			const OSSymbol * type, OSDictionary * matching,
+			IOServiceMatchingNotificationHandler handler,
+			void * target, void * ref,
+			SInt32 priority, OSIterator ** existing );
+
+    static bool syncNotificationHandler( void * target, void * ref,
+			IOService * newService, IONotifier * notifier  );
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+	void deliverNotification( const OSSymbol * type,
+                            IOOptionBits orNewState, IOOptionBits andNewState );
+
+    bool invokeNotifer( class _IOServiceNotifier * notify );
+
+	APPLE_KEXT_COMPATIBILITY_VIRTUAL
+	void unregisterAllInterest( void );
+
+	APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOReturn waitForState( UInt32 mask, UInt32 value,
+				 mach_timespec_t * timeout = 0 );
+
+    IOReturn waitForState( UInt32 mask, UInt32 value, uint64_t timeout );
+
+    UInt32 _adjustBusy( SInt32 delta );
+
+    bool terminatePhase1( IOOptionBits options = 0 );
+    void scheduleTerminatePhase2( IOOptionBits options = 0 );
+    void scheduleStop( IOService * provider );
+    void scheduleFinalize( void );
+    static void terminateThread( void * arg, wait_result_t unused );
+    static void terminateWorker( IOOptionBits options );
+    static void actionWillTerminate( IOService * victim, IOOptionBits options, 
+                                        OSArray * doPhase2List );
+    static void actionDidTerminate( IOService * victim, IOOptionBits options );
+    static void actionFinalize( IOService * victim, IOOptionBits options );
+    static void actionStop( IOService * client, IOService * provider );
+
+	APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOReturn resolveInterrupt(IOService *nub, int source);
+	APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOReturn lookupInterrupt(int source, bool resolve, IOInterruptController **interruptController);
+
+
+    /* power management */
+public:
+
+/*! @function PMinit
+    @abstract Initializes power management for a driver.
+    @discussion <code>PMinit</code> allocates and initializes the power management instance variables, and it should be called before accessing those variables or calling the power management methods. This method should be called inside the driver's <code>start</code> routine and must be paired with a call to @link PMstop PMstop@/link.
+    Most calls to <code>PMinit</code> are followed by calls to @link joinPMtree joinPMtree@/link and @link registerPowerDriver registerPowerDriver@/link. */
+
+    virtual void PMinit( void );
+
+/*! @function PMstop
+    @abstract Frees and removes the driver from power management.
+    @discussion The power managment variables don't exist after this call and the power managment methods in the caller shouldn't be called.    
+    Calling <code>PMstop</code> cleans up for the three power management initialization calls: @link PMinit PMinit@/link, @link joinPMtree joinPMtree@/link, and @link registerPowerDriver registerPowerDriver@/link. */
+
+    virtual void PMstop( void );
+
+/*! @function joinPMtree
+    @abstract Joins the driver into the power plane of the I/O Registry.
+    @discussion A driver uses this method to call its nub when initializing (usually in its <code>start</code> routine after calling @link PMinit PMinit@/link), to be attached into the power management hierarchy (i.e., the power plane). A driver usually calls this method on the driver for the device that provides it power (this is frequently the nub).    
+    Before this call returns, the caller will probably be called at @link setPowerParent setPowerParent@/link and @link setAggressiveness setAggressiveness@/link and possibly at @link addPowerChild addPowerChild@/link as it is added to the hierarchy. This method may be overridden by a nub subclass.
+    @param driver The driver to be added to the power plane, usually <code>this</code>. */
+
+    virtual void joinPMtree( IOService * driver );
+
+/*! @function registerPowerDriver
+    @abstract Registers a set of power states that the driver supports.
+    @discussion A driver defines its array of supported power states with power management in its power management initialization (its <code>start</code> routine). If successful, power management will call the driver to instruct it to change its power state through @link setPowerState setPowerState@/link.
+    Most drivers do not need to override <code>registerPowerDriver</code>. A nub may override <code>registerPowerDriver</code> if it needs to arrange its children in the power plane differently than the default placement, but this is uncommon.
+    @param controllingDriver A pointer to the calling driver, usually <code>this</code>.
+    @param powerStates A driver-defined array of power states that the driver and device support. Power states are defined in <code>pwr_mgt/IOPMpowerState.h</code>.
+    @param numberOfStates The number of power states in the array.
+    @result </code>IOPMNoErr</code>. All errors are logged via <code>kprintf</code>. */
+
+    virtual IOReturn registerPowerDriver(
+                        IOService *      controllingDriver,
+                        IOPMPowerState * powerStates,
+                        unsigned long    numberOfStates );
+
+/*! @function registerInterestedDriver
+    @abstract Allows an IOService object to register interest in the changing power state of a power-managed IOService object.
+    @discussion Call <code>registerInterestedDriver</code> on the IOService object you are interested in receiving power state messages from, and pass a pointer to the interested driver (<code>this</code>) as an argument.
+    The interested driver should override @link powerStateWillChangeTo powerStateWillChangeTo@/link and @link powerStateDidChangeTo powerStateDidChangeTo@/link to receive these power change messages.
+    Interested drivers must acknowledge power changes in <code>powerStateWillChangeTo</code> or <code>powerStateDidChangeTo</code>, either via return value or later calls to @link acknowledgePowerChange acknowledgePowerChange@/link.
+    @param theDriver The driver of interest adds this pointer to the list of interested drivers. It informs drivers on this list before and after the power change.
+    @result Flags describing the capability of the device in its current power state. If the current power state is not yet defined, zero is returned (this is the case when the driver is not yet in the power domain hierarchy or hasn't fully registered with power management yet). */
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOPMPowerFlags registerInterestedDriver( IOService * theDriver );
+
+/*! @function deRegisterInterestedDriver
+    @abstract De-registers power state interest from a previous call to <code>registerInterestedDriver</code>.
+    @discussion Most drivers do not need to override <code>deRegisterInterestedDriver</code>.
+    @param theDriver The interested driver previously passed into @link registerInterestedDriver registerInterestedDriver@/link.
+    @result A return code that can be ignored by the caller. */
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOReturn deRegisterInterestedDriver( IOService * theDriver );
+
+/*! @function acknowledgePowerChange
+    @abstract Acknowledges an in-progress power state change.
+    @discussion When power management informs an interested object (via @link powerStateWillChangeTo powerStateWillChangeTo@/link or @link powerStateDidChangeTo powerStateDidChangeTo@/link), the object can return an immediate acknowledgement via a return code, or it may return an indication that it will acknowledge later by calling <code>acknowledgePowerChange</code>.
+    Interested objects are those that have registered as interested drivers, as well as power plane children of the power changing driver. A driver that calls @link registerInterestedDriver registerInterestedDriver@/link must call <code>acknowledgePowerChange</code>, or use an immediate acknowledgement return from <code>powerStateWillChangeTo</code> or <code>powerStateDidChangeTo</code>.
+    @param whichDriver A pointer to the calling driver. The called object tracks all interested parties to ensure that all have acknowledged the power state change.
+    @result <code>IOPMNoErr</code>. */
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOReturn acknowledgePowerChange( IOService * whichDriver );
+
+/*! @function acknowledgeSetPowerState
+    @abstract Acknowledges the belated completion of a driver's <code>setPowerState</code> power state change.
+    @discussion After power management instructs a driver to change its state via @link setPowerState setPowerState@/link, that driver must acknowledge the change when its device has completed its transition. The acknowledgement may be immediate, via a return code from <code>setPowerState</code>, or delayed, via this call to <code>acknowledgeSetPowerState</code>.
+    Any driver that does not return <code>kIOPMAckImplied</code> from its <code>setPowerState</code> implementation must later call <code>acknowledgeSetPowerState</code>.
+    @result <code>IOPMNoErr</code>. */
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOReturn acknowledgeSetPowerState( void );
+
+/*! @function requestPowerDomainState
+    @abstract Tells a driver to adjust its power state.
+    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
+
+    virtual IOReturn requestPowerDomainState(
+                        IOPMPowerFlags desiredState,
+                        IOPowerConnection * whichChild,
+                        unsigned long specificationFlags );
+
+/*! @function makeUsable
+    @abstract Requests that a device become usable.
+    @discussion This method is called when some client of a device (or the device's own driver) is asking for the device to become usable. Power management responds by telling the object upon which this method is called to change to its highest power state.
+    <code>makeUsable</code> is implemented using @link changePowerStateToPriv changePowerStateToPriv@/link. Subsequent requests for lower power, such as from <code>changePowerStateToPriv</code>, will pre-empt this request.
+    @result A return code that can be ignored by the caller. */
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOReturn makeUsable( void );
+
+/*! @function temporaryPowerClampOn
+    @abstract A driver calls this method to hold itself in the highest power state until it has children.
+    @discussion Use <code>temporaryPowerClampOn</code> to hold your driver in its highest power state while waiting for child devices to attach. After children have attached, the clamp is released and the device's power state is controlled by the children's requirements.
+    @result A return code that can be ignored by the caller. */
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOReturn temporaryPowerClampOn( void );
+
+/*! @function changePowerStateTo
+    @abstract Sets a driver's power state.
+    @discussion This function is one of several that are used to set a driver's power state. In most circumstances, however, you should call @link changePowerStateToPriv changePowerStateToPriv@/link instead.
+	Calls to <code>changePowerStateTo</code>, <code>changePowerStateToPriv</code>, and a driver's power children all affect the power state of a driver. For legacy design reasons, they have overlapping functionality. Although you should call <code>changePowerStateToPriv</code> to change your device's power state, you might need to call <code>changePowerStateTo</code> in the following circumstances:
+    <ul><li>If a driver will be using <code>changePowerStateToPriv</code> to change its power state, it should call <code>changePowerStateTo(0)</code> in its <code>start</code> routine to eliminate the influence <code>changePowerStateTo</code> has on power state calculations.
+    <li>Call <code>changePowerStateTo</code> in conjunction with @link setIdleTimerPeriod setIdleTimerPeriod@/link and @link activityTickle activityTickle@/link to idle a driver into a low power state. For a driver with 3 power states, for example, <code>changePowerStateTo(1)</code> sets a minimum level of power state 1, such that the idle timer period may not set your device's power any lower than state 1.</ul>
+    @param ordinal The number of the desired power state in the power state array. 
+    @result A return code that can be ignored by the caller. */
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOReturn changePowerStateTo( unsigned long ordinal );
+
+/*! @function currentCapability
+    @abstract Finds out the capability of a device's current power state.
+    @result A copy of the <code>capabilityFlags</code> field for the current power state in the power state array. */
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    IOPMPowerFlags currentCapability( void );
+
+/*! @function currentPowerConsumption
+    @abstract Finds out the current power consumption of a device.
+    @discussion Most Mac OS X power managed drivers do not report their power consumption via the <code>staticPower</code> field. Thus this call will not accurately reflect power consumption for most drivers.
+    @result A copy of the <code>staticPower</code> field for the current power state in the power state array. */
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    unsigned long currentPowerConsumption( void );
+
+/*! @function activityTickle
+    @abstract Informs power management when a power-managed device is in use, so that power management can track when it is idle and adjust its power state accordingly.
+    @discussion The <code>activityTickle</code> method is provided for objects in the system (or for the driver itself) to tell a driver that its device is being used.
+    The IOService superclass can manage idleness determination with a simple idle timer mechanism and this <code>activityTickle</code> call. To start this up, the driver calls its superclass's <code>setIdleTimerPeriod</code>. This starts a timer for the time interval specified in the call. When the timer expires, the superclass checks to see if there has been any activity since the last timer expiration. (It checks to see if <code>activityTickle</code> has been called). If there has been activity, it restarts the timer, and this process continues. When the timer expires, and there has been no device activity, the superclass lowers the device power state to the next lower state. This can continue until the device is in state zero.
+    After the device has been powered down by at least one power state, a subsequent call to <code>activityTickle</code> causes the device to be switched to a higher state required for the activity.    
+    If the driver is managing the idleness determination totally on its own, the value of the <code>type</code> parameter should be <code>kIOPMSubclassPolicy</code>, and the driver should override the <code>activityTickle</code> method. The superclass IOService implementation of <code>activityTickle</code> does nothing with the <code>kIOPMSubclassPolicy</code> argument.
+    @param type When <code>type</code> is <code>kIOPMSubclassPolicy</code>, <code>activityTickle</code> is not handled in IOService and should be intercepted by the subclass. When <code>type</code> is <code>kIOPMSuperclassPolicy1</code>, an activity flag is set and the device state is checked. If the device has been powered down, it is powered up again.
+    @param stateNumber When <code>type</code> is <code>kIOPMSuperclassPolicy1</code>, <code>stateNumber</code> contains the desired power state ordinal for the activity. If the device is in a lower state, the superclass will switch it to this state. This is for devices that can handle some accesses in lower power states; the device is powered up only as far as it needs to be for the activity.
+    @result When <code>type</code> is <code>kIOPMSuperclassPolicy1</code>, the superclass returns <code>true</code> if the device is currently in the state specified by <code>stateNumber</code>. If the device is in a lower state and must be powered up, the superclass returns <code>false</code>; in this case the superclass will initiate a power change to power the device up. */
+
+    virtual bool activityTickle(
+                        unsigned long type,
+                        unsigned long stateNumber = 0 );
+
+/*! @function setAggressiveness
+    @abstract Broadcasts an aggressiveness factor from the parent of a driver to the driver.
+    @discussion Implement <code>setAggressiveness</code> to receive a notification when an "aggressiveness Aggressiveness factors are a loose set of power management variables that contain values for system sleep timeout, display sleep timeout, whether the system is on battery or AC, and other power management features. There are several aggressiveness factors that can be broadcast and a driver may take action on whichever factors apply to it.
+    A driver that has joined the power plane via @link joinPMtree joinPMtree@/link will receive <code>setAgressiveness</code> calls when aggressiveness factors change.
+    A driver may override this call if it needs to do something with the new factor (such as change its idle timeout). If overridden, the driver must  call its superclass's <code>setAgressiveness</code> method in its own <code>setAgressiveness</code> implementation.
+    Most drivers do not need to implement <code>setAgressiveness</code>.
+    @param type The aggressiveness factor type, such as <code>kPMMinutesToDim</code>, <code>kPMMinutesToSpinDown</code>, <code>kPMMinutesToSleep</code>, and <code>kPMPowerSource</code>. (Aggressiveness factors are defined in <code>pwr_mgt/IOPM.h</code>.)
+    @param newLevel The aggressiveness factor's new value.
+    @result <code>IOPMNoErr</code>. */
+
+    virtual IOReturn setAggressiveness(
+                        unsigned long type,
+                        unsigned long newLevel );
+
+/*! @function getAggressiveness
+    @abstract Returns the current aggressiveness value for the given type.
+    @param type The aggressiveness factor to query.
+    @param currentLevel Upon successful return, contains the value of aggressiveness factor <code>type</code>.
+    @result <code>kIOReturnSuccess</code> upon success; an I/O Kit error code otherwise. */
+
+    virtual IOReturn getAggressiveness(
+                        unsigned long type,
+                        unsigned long * currentLevel );
+
+#ifndef __LP64__
+/*! @function systemWake
+    @abstract Tells every driver in the power plane that the system is waking up.
+    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
+
+    virtual IOReturn systemWake( void )
+    APPLE_KEXT_DEPRECATED;
+
+/*! @function temperatureCriticalForZone
+    @abstract Alerts a driver to a critical temperature in some thermal zone.
+    @discussion This call is unused by power management. It is not intended to be called or overridden. */
+
+    virtual IOReturn temperatureCriticalForZone( IOService * whichZone )
+    APPLE_KEXT_DEPRECATED;
+
+/*! @function youAreRoot
+    @abstract Informs power management which IOService object is the power plane root.
+    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
+
+    virtual IOReturn youAreRoot( void )
+    APPLE_KEXT_DEPRECATED;
+
+/*! @function setPowerParent
+    @abstract This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
+
+    virtual IOReturn setPowerParent(
+                        IOPowerConnection * parent,
+                        bool stateKnown,
+                        IOPMPowerFlags currentState )
+    APPLE_KEXT_DEPRECATED;
+#endif /* !__LP64__ */
+
+/*! @function addPowerChild
+    @abstract Informs a driver that it has a new child.
+    @discussion The Platform Expert uses this method to call a driver and introduce it to a new child. This call is handled internally by power management. It is not intended to be overridden or called by drivers.
+    @param theChild A pointer to the child IOService object. */
+
+    virtual IOReturn addPowerChild( IOService * theChild );
+
+/*! @function removePowerChild
+    @abstract Informs a power managed driver that one of its power plane childen is disappearing.
+    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
+
+    virtual IOReturn removePowerChild( IOPowerConnection * theChild );
+
+#ifndef __LP64__
+/*! @function command_received
+    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
+
+    virtual void command_received( void *, void * , void * , void * );
+#endif
+
+/*! @function start_PM_idle_timer
+    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
+
+    APPLE_KEXT_COMPATIBILITY_VIRTUAL
+    void start_PM_idle_timer( void );
+
+#ifndef __LP64__
+/*! @function PM_idle_timer_expiration
+    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
+
+    virtual void PM_idle_timer_expiration( void )
+    APPLE_KEXT_DEPRECATED;
+
+/*! @function PM_Clamp_Timer_Expired
+    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
+
+    virtual void PM_Clamp_Timer_Expired( void )
+    APPLE_KEXT_DEPRECATED;
+#endif
+
+/*! @function setIdleTimerPeriod
+    @abstract Sets or changes the idle timer period.
+    @discussion A driver using the idleness determination provided by IOService calls its superclass with this method to set or change the idle timer period. See @link activityTickle activityTickle@/link for a description of this type of idleness determination.
+    @param period The desired idle timer period in seconds.
+    @result <code>kIOReturnSuccess</code> upon success; an I/O Kit error code otherwise. */
+
+    virtual IOReturn setIdleTimerPeriod( unsigned long );
+
+#ifndef __LP64__
+/*! @function getPMworkloop
+    @abstract Returns a pointer to the system-wide power management work loop.
+    @availability Deprecated in Mac OS X version 10.6.
+    @discussion Most drivers should create their own work loops to synchronize their code; drivers should not run arbitrary code on the power management work loop. */
+
+    virtual IOWorkLoop * getPMworkloop( void )
+    APPLE_KEXT_DEPRECATED;
+#endif
+
+/*! @function getPowerState
+    @abstract Determines a device's power state.
+    @discussion A device's "current power state" is updated at the end of each power state transition (e.g. transition from state 1 to state 0, or state 0 to state 2). This transition includes the time spent powering on or off any power plane children. Thus, if a child calls <code>getPowerState</code> on its power parent during system wake from sleep, the call will return the index to the device's off state rather than its on state.
+    @result The current power state's index into the device's power state array. */
+
+    UInt32 getPowerState( void );
+
+/*! @function setPowerState
+    @abstract Requests a power managed driver to change the power state of its device.
+    @discussion A power managed driver must override <code>setPowerState</code> to take part in system power management. After a driver is registered with power management, the system uses <code>setPowerState</code> to power the device off and on for system sleep and wake.
+    Calls to @link PMinit PMinit@/link and @link registerPowerDriver registerPowerDriver@/link enable power management to change a device's power state using <code>setPowerState</code>. <code>setPowerState</code> is called in a clean and separate thread context.
+    @param powerStateOrdinal The number in the power state array of the state the driver is being instructed to switch to. 
+    @param whatDevice A pointer to the power management object which registered to manage power for this device. In most cases, <code>whatDevice</code> will be equal to your driver's own <code>this</code> pointer.
+    @result The driver must return <code>IOPMAckImplied</code> if it has complied with the request when it returns. Otherwise if it has started the process of changing power state but not finished it, the driver should return a number of microseconds which is an upper limit of the time it will need to finish. Then, when it has completed the power switch, it should call @link acknowledgeSetPowerState acknowledgeSetPowerState@/link. */
+
+    virtual IOReturn setPowerState(
+                        unsigned long powerStateOrdinal,
+                        IOService *   whatDevice );
+
+#ifndef __LP64__
+/*! @function clampPowerOn
+    @abstract Deprecated. Do not use. */
+
+    virtual void clampPowerOn( unsigned long duration );
+#endif
+
+/*! @function maxCapabilityForDomainState
+    @abstract Determines a driver's highest power state possible for a given power domain state.
+    @discussion This happens when the power domain is changing state and power management needs to determine which state the device is capable of in the new domain state.
+    Most drivers do not need to implement this method, and can rely upon the default IOService implementation. The IOService implementation scans the power state array looking for the highest state whose <code>inputPowerRequirement</code> field exactly matches the value of the <code>domainState</code> parameter. If more intelligent determination is required, the driver itself should implement the method and override the superclass's implementation.
+    @param domainState Flags that describe the character of "domain power"; they represent the <code>outputPowerCharacter</code> field of a state in the power domain's power state array.
+    @result A state number. */
+
+    virtual unsigned long maxCapabilityForDomainState( IOPMPowerFlags domainState );
+
+/*! @function initialPowerStateForDomainState
+    @abstract Determines which power state a device is in, given the current power domain state.
+    @discussion Power management calls this method once, when the driver is initializing power management.
+    Most drivers do not need to implement this method, and can rely upon the default IOService implementation. The IOService implementation scans the power state array looking for the highest state whose <code>inputPowerRequirement</code> field exactly matches the value of the <code>domainState</code> parameter. If more intelligent determination is required, the power managed driver should implement the method and override the superclass's implementation.
+    @param domainState Flags that describe the character of "domain power"; they represent the <code>outputPowerCharacter</code> field of a state in the power domain's power state array.
+    @result A state number. */
+
+    virtual unsigned long initialPowerStateForDomainState( IOPMPowerFlags domainState );
+
+/*! @function powerStateForDomainState
+    @abstract Determines what power state the device would be in for a given power domain state.
+    @discussion Power management calls a driver with this method to find out what power state the device would be in for a given power domain state. This happens when the power domain is changing state and power management needs to determine the effect of the change.
+    Most drivers do not need to implement this method, and can rely upon the default IOService implementation. The IOService implementation scans the power state array looking for the highest state whose <code>inputPowerRequirement</code> field exactly matches the value of the <code>domainState</code> parameter. If more intelligent determination is required, the power managed driver should implement the method and override the superclass's implementation.
+    @param domainState Flags that describe the character of "domain power"; they represent the <code>outputPowerCharacter</code> field of a state in the power domain's power state array.
+    @result A state number. */
+
+    virtual unsigned long powerStateForDomainState( IOPMPowerFlags domainState );
+
+/*! @function powerStateWillChangeTo
+    @abstract Informs interested parties that a device is about to change its power state.
+    @discussion Power management informs interested parties that a device is about to change to a different power state. Interested parties are those that have registered for this notification via @link registerInterestedDriver registerInterestedDriver@/link. If you have called <code>registerInterestedDriver</code> on a power managed driver, you must implement <code>powerStateWillChangeTo</code> and @link powerStateDidChangeTo powerStateDidChangeTo@/link to receive the notifications.
+    <code>powerStateWillChangeTo</code> is called in a clean and separate thread context. <code>powerStateWillChangeTo</code> is called before a power state transition takes place; <code>powerStateDidChangeTo</code> is called after the transition has completed.
+    @param capabilities Flags that describe the capability of the device in the new power state (they come from the <code>capabilityFlags</code> field of the new state in the power state array).
+	@param stateNumber The number of the state in the state array that the device is switching to.
+    @param whatDevice A pointer to the driver that is changing. It can be used by a driver that is receiving power state change notifications for multiple devices to distinguish between them.
+    @result The driver returns <code>IOPMAckImplied</code> if it has prepared for the power change when it returns. If it has started preparing but not finished, it should return a number of microseconds which is an upper limit of the time it will need to finish preparing. Then, when it has completed its preparations, it should call @link acknowledgePowerChange acknowledgePowerChange@/link. */
+
+    virtual IOReturn powerStateWillChangeTo(
+                        IOPMPowerFlags  capabilities,
+                        unsigned long   stateNumber,
+                        IOService *     whatDevice );
+
+/*! @function powerStateDidChangeTo
+    @abstract Informs interested parties that a device has changed to a different power state.
+    @discussion Power management informs interested parties that a device has changed to a different power state. Interested parties are those that have registered for this notification via @link registerInterestedDriver registerInterestedDriver@/link. If you have called <code>registerInterestedDriver</code> on a power managed driver, you must implemnt @link powerStateWillChangeTo powerStateWillChangeTo@/link and <code>powerStateDidChangeTo</code> to receive the notifications.
+    <code>powerStateDidChangeTo</code> is called in a clean and separate thread context. <code>powerStateWillChangeTo</code> is called before a power state transition takes place; <code>powerStateDidChangeTo</code> is called after the transition has completed.
+    @param capabilities Flags that describe the capability of the device in the new power state (they come from the <code>capabilityFlags</code> field of the new state in the power state array).
+	@param stateNumber The number of the state in the state array that the device is switching to.
+    @param whatDevice A pointer to the driver that is changing. It can be used by a driver that is receiving power state change notifications for multiple devices to distinguish between them.
+    @result The driver returns <code>IOPMAckImplied</code> if it has prepared for the power change when it returns. If it has started preparing but not finished, it should return a number of microseconds which is an upper limit of the time it will need to finish preparing. Then, when it has completed its preparations, it should call @link acknowledgePowerChange acknowledgePowerChange@/link. */
+
+    virtual IOReturn powerStateDidChangeTo(
+                        IOPMPowerFlags  capabilities,
+                        unsigned long   stateNumber,
+                        IOService *     whatDevice );
+
+#ifndef __LP64__
+/*! @function didYouWakeSystem
+    @abstract Asks a driver if its device is the one that just woke the system from sleep.
+    @availability Deprecated in Mac OS X version 10.6.
+    @discussion Power management calls a power managed driver with this method to ask if its device is the one that just woke the system from sleep. If a device is capable of waking the system from sleep, its driver should implement <code>didYouWakeSystem</code> and return <code>true</code> if its device was responsible for waking the system.
+    @result <code>true</code> if the driver's device woke the system and <code>false</code> otherwise. */
+
+    virtual bool didYouWakeSystem( void )
+    APPLE_KEXT_DEPRECATED;
+
+/*! @function newTemperature
+    @abstract Tells a power managed driver that the temperature in the thermal zone has changed.
+    @discussion This call is unused by power management. It is not intended to be called or overridden. */
+
+    virtual IOReturn newTemperature( long currentTemp, IOService * whichZone )
+    APPLE_KEXT_DEPRECATED;
+#endif
+
+    virtual bool askChangeDown( unsigned long );
+    virtual bool tellChangeDown( unsigned long );
+    virtual void tellNoChangeDown ( unsigned long );
+    virtual void tellChangeUp( unsigned long );
+    virtual IOReturn allowPowerChange( unsigned long refcon );
+    virtual IOReturn cancelPowerChange( unsigned long refcon );
+
+protected:
+/*! @function changePowerStateToPriv 
+    @abstract Tells a driver's superclass to change the power state of its device.
+    @discussion A driver uses this method to tell its superclass to change the power state of the device. This is the recommended way to change the power state of a device.
+    Three things affect driver power state: @link changePowerStateTo changePowerStateTo@/link, <code>changePowerStateToPriv</code>, and the desires of the driver's power plane children. Power management puts the device into the maximum state governed by those three entities.
+    Drivers may eliminate the influence of the <code>changePowerStateTo</code> method on power state one of two ways. See @link powerOverrideOnPriv powerOverrideOnPriv@/link to ignore the method's influence, or call <code>changePowerStateTo(0)</code> in the driver's <code>start</code> routine to remove the <code>changePowerStateTo</code> method's power request.
+    @param ordinal The number of the desired power state in the power state array.
+    @result A return code that can be ignored by the caller. */
+
+    IOReturn changePowerStateToPriv( unsigned long ordinal );
+
+/*! @function powerOverrideOnPriv
+    @abstract Allows a driver to ignore its children's power management requests and only use changePowerStateToPriv to define its own power state.
+    @discussion Power management normally keeps a device at the highest state required by its requests via @link changePowerStateTo changePowerStateTo@/link, @link changePowerStateToPriv changePowerStateToPriv@/link, and its children. However, a driver may ensure a lower power state than otherwise required by itself and its children using <code>powerOverrideOnPriv</code>. When the override is on, power management keeps the device's power state in the state specified by <code>changePowerStateToPriv</code>. Turning on the override will initiate a power change if the driver's <code>changePowerStateToPriv</code> desired power state is different from the maximum of the <code>changePowerStateTo</code> desired power state and the children's desires.
+    @result A return code that can be ignored by the caller. */
+
+    IOReturn powerOverrideOnPriv( void );
+
+/*! @function powerOverrideOffPriv
+    @abstract Allows a driver to disable a power override.
+    @discussion When a driver has enabled an override via @link powerOverrideOnPriv powerOverrideOnPriv@/link, it can disable it again by calling this method in its superclass. Disabling the override reverts to the default algorithm for determining a device's power state. The superclass will now keep the device at the highest state required by <code>changePowerStateTo</code>, <code>changePowerStateToPriv</code>, and its children. Turning off the override will initiate a power change if the driver's desired power state is different from the maximum of the power managed driver's desire and the children's desires.
+    @result A return code that can be ignored by the caller. */
+
+    IOReturn powerOverrideOffPriv( void );
+
+/*! @function powerChangeDone
+    @abstract Tells a driver when a power state change is complete.
+    @discussion Power management uses this method to inform a driver when a power change is completely done, when all interested parties have acknowledged the @link powerStateDidChangeTo powerStateDidChangeTo@/link call. The default implementation of this method is null; the method is meant to be overridden by subclassed power managed drivers. A driver should use this method to find out if a power change it initiated is complete.
+    @param stateNumber The number of the state in the state array that the device has switched from. */
+
+    virtual void powerChangeDone( unsigned long stateNumber );
+};
+
+#endif /* ! _IOKIT_IOSERVICE_H */
diff --git a/i386/include/IOKit/IOServicePM.h b/i386/include/IOKit/IOServicePM.h
new file mode 100644
index 0000000..9955e03
--- /dev/null
+++ b/i386/include/IOKit/IOServicePM.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOSERVICEPM_H
+#define _IOKIT_IOSERVICEPM_H
+
+#include <IOKit/pwr_mgt/IOPM.h>
+
+class IOService;
+class IOServicePM;
+class IOPowerConnection;
+class IOWorkLoop;
+class IOCommandGate;
+class IOTimerEventSource;
+class IOPlatformExpert;
+
+#endif /* !_IOKIT_IOSERVICEPM_H */
diff --git a/i386/include/IOKit/IOSharedDataQueue.h b/i386/include/IOKit/IOSharedDataQueue.h
new file mode 100644
index 0000000..fdfa1d6
--- /dev/null
+++ b/i386/include/IOKit/IOSharedDataQueue.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOSHAREDDATAQUEUE_H
+#define _IOKIT_IOSHAREDDATAQUEUE_H
+
+#ifdef dequeue
+#undef dequeue
+#endif
+
+#include <IOKit/IODataQueue.h>
+
+typedef struct _IODataQueueEntry IODataQueueEntry;
+
+/*!
+ * @class IOSharedDataQueue : public IODataQueue
+ * @abstract A generic queue designed to pass data both from the kernel to a user process and from a user process to the kernel.
+ * @discussion The IOSharedDataQueue class is designed to also allow a user process to queue data to kernel code.  IOSharedDataQueue objects are designed to be used in a single producer / single consumer situation.  As such, there are no locks on the data itself.  Because the kernel enqueue and user-space dequeue methods follow a strict set of guidelines, no locks are necessary to maintain the integrity of the data struct.
+ *
+ * <br>Each data entry can be variable sized, but the entire size of the queue data region (including overhead for each entry) must be specified up front.
+ *
+ * <br>In order for the IODataQueue instance to notify the user process that data is available, a notification mach port must be set.  When the queue is empty and a new entry is added, a message is sent to the specified port.
+ *
+ * <br>In order to make the data queue memory available to a user process, the method getMemoryDescriptor() must be used to get an IOMemoryDescriptor instance that can be mapped into a user process.  Typically, the clientMemoryForType() method on an IOUserClient instance will be used to request the IOMemoryDescriptor and then return it to be mapped into the user process.
+ */
+class IOSharedDataQueue : public IODataQueue
+{
+    OSDeclareDefaultStructors(IOSharedDataQueue)
+
+    struct ExpansionData { 
+    };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData * _reserved;
+
+protected:
+    virtual void free();
+
+public:
+    /*!
+     * @function withCapacity
+     * @abstract Static method that creates a new IOSharedDataQueue instance with the capacity specified in the size parameter.
+     * @discussion The actual size of the entire data queue memory region (to be shared into a user process) is equal to the capacity plus the IODataQueueMemory overhead.  This overhead value can be determined from the DATA_QUEUE_MEMORY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.  The size of the data queue memory region must include space for the overhead of each IODataQueueEntry.  This entry overhead can be determined from the DATA_QUEUE_ENTRY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.<br>  This method allocates a new IODataQueue instance and then calls initWithCapacity() with the given size parameter.  If the initWithCapacity() fails, the new instance is released and zero is returned.
+     * @param size The size of the data queue memory region.
+     * @result Returns the newly allocated IOSharedDataQueue instance.  Zero is returned on failure.
+     */
+    static IOSharedDataQueue *withCapacity(UInt32 size);
+
+    /*!
+     * @function withEntries
+     * @abstract Static method that creates a new IOSharedDataQueue instance with the specified number of entries of the given size.
+     * @discussion This method will create a new IOSharedDataQueue instance with enough capacity for numEntries of entrySize.  It does account for the IODataQueueEntry overhead for each entry.  Note that the numEntries and entrySize are simply used to determine the data region size.  They do not actually restrict the size of number of entries that can be added to the queue.<br>  This method allocates a new IODataQueue instance and then calls initWithEntries() with the given numEntries and entrySize parameters.  If the initWithEntries() fails, the new instance is released and zero is returned.
+     * @param numEntries Number of entries to allocate space for.
+     * @param entrySize Size of each entry.
+     * @result Reeturns the newly allocated IOSharedDataQueue instance.  Zero is returned on failure.
+     */
+    static IOSharedDataQueue *withEntries(UInt32 numEntries, UInt32 entrySize);
+
+    /*!
+     * @function initWithCapacity
+     * @abstract Initializes an IOSharedDataQueue instance with the capacity specified in the size parameter.
+     * @discussion The actual size of the entire data queue memory region (to be shared into a user process) is equal to the capacity plus the IODataQueueMemory overhead.  This overhead value can be determined from the DATA_QUEUE_MEMORY_HEADER_SIZE and DATA_QUEUE_MEMORY_APPENDIX_SIZE macro in <IOKit/IODataQueueShared.h>.  The size of the data queue memory region must include space for the overhead of each IODataQueueEntry.  This entry overhead can be determined from the DATA_QUEUE_ENTRY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.
+     * @param size The size of the data queue memory region.
+     * @result Returns true on success and false on failure.
+     */
+    virtual Boolean initWithCapacity(UInt32 size);
+
+    /*!
+     * @function getMemoryDescriptor
+     * @abstract Returns a memory descriptor covering the IODataQueueMemory region.
+     * @discussion The IOMemoryDescriptor instance returned by this method is intended to be mapped into a user process.  This is the memory region that the IODataQueueClient code operates on.
+     * @result Returns a newly allocated IOMemoryDescriptor for the IODataQueueMemory region.  Returns zero on failure.
+     */
+    virtual IOMemoryDescriptor *getMemoryDescriptor();
+
+    /*!
+     * @function peek
+     * @abstract Used to peek at the next entry on the queue.
+     * @discussion This function can be used to look at the next entry which allows the entry to be received without having to copy it with dequeue.  In order to do this, call peek to get the entry.  Then call dequeue with a NULL data pointer.  That will cause the head to be moved to the next entry, but no memory to be copied.
+     * @result Returns a pointer to the next IODataQueueEntry if one is available.  0 (NULL) is returned if the queue is empty.
+     */
+    virtual IODataQueueEntry * peek();
+
+    /*!
+     * @function dequeue
+     * @abstract Dequeues the next available entry on the queue and copies it into the given data pointer.
+     * @discussion This function will dequeue the next available entry on the queue.  If a data pointer is provided, it will copy the data into the memory region if there is enough space available as specified in the dataSize parameter.  If no data pointer is provided, it will simply move the head value past the current entry.
+     * @param data A pointer to the data memory region in which to copy the next entry data on the queue.  If this parameter is 0 (NULL), it will simply move to the next entry.
+     * @param dataSize A pointer to the size of the data parameter.  On return, this contains the size of the actual entry data - even if the original size was not large enough.
+     * @result Returns true on success and false on failure.  Typically failure means that the queue is empty.
+     */
+    virtual Boolean dequeue(void *data, UInt32 *dataSize);
+
+    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 0);
+    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 1);
+    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 2);
+    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 3);
+    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 4);
+    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 5);
+    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 6);
+    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 7);
+};
+
+#endif /* _IOKIT_IOSHAREDDATAQUEUE_H */
diff --git a/i386/include/IOKit/IOSharedLock.h b/i386/include/IOKit/IOSharedLock.h
new file mode 100644
index 0000000..59b47ec
--- /dev/null
+++ b/i386/include/IOKit/IOSharedLock.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+/*
+ * Multiprocessor locks used within the shared memory area between the
+ * kernel and event system.  These must work in both user and kernel mode.
+ * 
+ * These routines are public, for the purpose of writing frame buffer device
+ * drivers which handle their own cursors.  Certain architectures define a
+ * generic display class which handles cursor drawing and is subclassed by
+ * driver writers.  These drivers need not be concerned with the following
+ * types and definitions.
+ *
+ * The ev_lock(), ev_unlock(), and ev_try_lock() functions are available only
+ * to drivers built in or dynamically loaded into the kernel, and to DPS
+ * drivers built in or dynamically loaded into the Window Server.  They do not
+ * exist in any shared library.
+ *
+ * --> They're now in IOKit user lib.
+ */
+
+#ifndef _IOKIT_IOSHAREDLOCK_H
+#define _IOKIT_IOSHAREDLOCK_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// should be 32 bytes on PPC
+typedef volatile int		IOSharedLockData;
+typedef IOSharedLockData    *   IOSharedLock;
+
+#define IOSpinLockInit(l)	(*(l) = (IOSharedLockData)0)
+
+
+extern void IOSpinUnlock(IOSharedLock l);
+extern boolean_t IOTrySpinLock(IOSharedLock l);
+
+/* exact same stuff & implementation */
+
+typedef IOSharedLockData 	ev_lock_data_t;
+typedef ev_lock_data_t	    *	ev_lock_t;
+
+#define ev_init_lock(l)		(*(l) = (ev_lock_data_t)0)
+// needs isync?
+//#define ev_is_locked(l)	(*(l) != (ev_lock_data_t)0)
+
+
+extern void ev_unlock(ev_lock_t l);
+extern boolean_t ev_try_lock(ev_lock_t l);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* ! _IOKIT_IOSHAREDLOCK_H */
diff --git a/i386/include/IOKit/IOSubMemoryDescriptor.h b/i386/include/IOKit/IOSubMemoryDescriptor.h
new file mode 100644
index 0000000..0093ea3
--- /dev/null
+++ b/i386/include/IOKit/IOSubMemoryDescriptor.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOSUBMEMORYDESCRIPTOR_H
+#define _IOSUBMEMORYDESCRIPTOR_H
+
+#include <IOKit/IOMemoryDescriptor.h>
+
+/*! @class IOSubMemoryDescriptor : public IOMemoryDescriptor
+    @abstract The IOSubMemoryDescriptor object describes a memory area made up of a portion of another IOMemoryDescriptor.
+    @discussion The IOSubMemoryDescriptor object represents a subrange of memory, specified as a portion of another IOMemoryDescriptor. */
+
+class IOSubMemoryDescriptor : public IOMemoryDescriptor
+{
+    OSDeclareDefaultStructors(IOSubMemoryDescriptor);
+
+protected:
+    IOMemoryDescriptor * _parent;
+    IOByteCount 	 _start;
+
+    virtual void free();
+
+public:
+/*! @function withSubRange
+    @abstract Create an IOMemoryDescriptor to describe a subrange of an existing descriptor.
+    @discussion  This method creates and initializes an IOMemoryDescriptor for memory consisting of a subrange of the specified memory descriptor. The parent memory descriptor is retained by the new descriptor.
+    @param of The parent IOMemoryDescriptor of which a subrange is to be used for the new descriptor, which will be retained by the subrange IOMemoryDescriptor.
+    @param offset A byte offset into the parent memory descriptor's memory.
+    @param length The length of the subrange.
+    @param options
+        kIOMemoryDirectionMask (options:direction)	This nibble indicates the I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures. 
+    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
+
+    static IOSubMemoryDescriptor *	withSubRange(IOMemoryDescriptor *of,
+					     IOByteCount offset,
+					     IOByteCount length,
+					     IOOptionBits options);
+
+    /*
+     * Initialize or reinitialize an IOSubMemoryDescriptor to describe
+     * a subrange of an existing descriptor.
+     *
+     * An IOSubMemoryDescriptor can be re-used by calling initSubRange
+     * again on an existing instance -- note that this behavior is not
+     * commonly supported in other IOKit classes, although it is here.
+     */
+    virtual bool initSubRange( IOMemoryDescriptor * parent,
+				IOByteCount offset, IOByteCount length,
+				IODirection withDirection );
+
+    /*
+     * IOMemoryDescriptor required methods
+     */
+
+    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
+                                         IOByteCount * length,
+                                         IOOptionBits  options = 0 );
+
+    virtual IOReturn prepare(IODirection forDirection = kIODirectionNone);
+
+    virtual IOReturn complete(IODirection forDirection = kIODirectionNone);
+
+#ifdef __LP64__
+    virtual
+#endif /* __LP64__ */
+    IOReturn redirect( task_t safeTask, bool redirect );
+
+    virtual IOReturn setPurgeable( IOOptionBits newState,
+                                    IOOptionBits * oldState );
+
+    // support map() on kIOMemoryTypeVirtual without prepare()
+    virtual IOMemoryMap * 	makeMapping(
+	IOMemoryDescriptor *	owner,
+	task_t			intoTask,
+	IOVirtualAddress	atAddress,
+	IOOptionBits		options,
+	IOByteCount		offset,
+	IOByteCount		length );
+
+	virtual uint64_t getPreparationID( void );
+
+};
+
+#endif /* !_IOSUBMEMORYDESCRIPTOR_H */
diff --git a/i386/include/IOKit/IOSyncer.h b/i386/include/IOKit/IOSyncer.h
new file mode 100644
index 0000000..f6dfce3
--- /dev/null
+++ b/i386/include/IOKit/IOSyncer.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOSYNCER_H
+#define _IOSYNCER_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOLocks.h>
+
+class IOSyncer : public OSObject
+{
+    OSDeclareDefaultStructors(IOSyncer)
+
+private:
+    // The spin lock that is used to guard the 'threadMustStop' variable. 
+    IOSimpleLock *guardLock;
+    volatile bool threadMustStop;
+    IOReturn fResult;
+    virtual void free();
+    virtual void privateSignal();
+
+public:
+
+    static IOSyncer * create(bool twoRetains = true)
+	APPLE_KEXT_DEPRECATED;
+
+    virtual bool init(bool twoRetains)
+	APPLE_KEXT_DEPRECATED;
+    virtual void reinit()
+	APPLE_KEXT_DEPRECATED;
+    virtual IOReturn wait(bool autoRelease = true)
+	APPLE_KEXT_DEPRECATED;
+    virtual void signal(IOReturn res = kIOReturnSuccess,
+					bool autoRelease = true)
+	APPLE_KEXT_DEPRECATED;
+};
+
+#endif /* !_IOSYNCER */
+
diff --git a/i386/include/IOKit/IOTimeStamp.h b/i386/include/IOKit/IOTimeStamp.h
new file mode 100644
index 0000000..b1b0905
--- /dev/null
+++ b/i386/include/IOKit/IOTimeStamp.h
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef IOKIT_IOTIMESTAMP_H
+#define IOKIT_IOTIMESTAMP_H
+
+#include <sys/kdebug.h>
+
+static inline void
+IOTimeStampStartConstant(unsigned int csc,
+			 uintptr_t a = 0, uintptr_t b = 0,
+			 uintptr_t c = 0, uintptr_t d = 0)
+{
+    KERNEL_DEBUG_CONSTANT(csc | DBG_FUNC_START, a, b, c, d, 0);
+}
+
+static inline void
+IOTimeStampEndConstant(uintptr_t csc,
+		       uintptr_t a = 0, uintptr_t b = 0,
+		       uintptr_t c = 0, uintptr_t d = 0)
+{
+    KERNEL_DEBUG_CONSTANT(csc | DBG_FUNC_END, a, b, c, d, 0);
+}
+
+static inline void
+IOTimeStampConstant(uintptr_t csc,
+		    uintptr_t a = 0, uintptr_t b = 0,
+		    uintptr_t c = 0, uintptr_t d = 0)
+{
+    KERNEL_DEBUG_CONSTANT(csc | DBG_FUNC_NONE, a, b, c, d, 0);
+}
+
+#if KDEBUG
+
+static inline void
+IOTimeStampStart(uintptr_t csc,
+                 uintptr_t a = 0, uintptr_t b = 0,
+                 uintptr_t c = 0, uintptr_t d = 0)
+{
+    KERNEL_DEBUG(csc | DBG_FUNC_START, a, b, c, d, 0);
+}
+
+static inline void
+IOTimeStampEnd(uintptr_t csc,
+               uintptr_t a = 0, uintptr_t b = 0,
+               uintptr_t c = 0, uintptr_t d = 0)
+{
+    KERNEL_DEBUG(csc | DBG_FUNC_END, a, b, c, d, 0);
+}
+
+static inline void
+IOTimeStamp(uintptr_t csc,
+            uintptr_t a = 0, uintptr_t b = 0,
+            uintptr_t c = 0, uintptr_t d = 0)
+{
+    KERNEL_DEBUG(csc | DBG_FUNC_NONE, a, b, c, d, 0);
+}
+
+#endif /* KDEBUG */
+
+#define IODBG_STORAGE(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOSTORAGE, code))
+#define IODBG_NETWORK(code)			(KDBG_CODE(DBG_IOKIT, DBG_IONETWORK, code))
+#define IODBG_KEYBOARD(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOKEYBOARD, code))
+#define IODBG_HID(code)				(KDBG_CODE(DBG_IOKIT, DBG_IOHID, code))
+#define IODBG_AUDIO(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOAUDIO, code))
+#define IODBG_SERIAL(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOSERIAL, code))
+#define IODBG_TTY(code)				(KDBG_CODE(DBG_IOKIT, DBG_IOTTY, code))
+#define IODBG_SAM(code)				(KDBG_CODE(DBG_IOKIT, DBG_IOSAM, code))
+#define IODBG_PARALLELATA(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOPARALLELATA, code))
+#define IODBG_PARALLELSCSI(code)	(KDBG_CODE(DBG_IOKIT, DBG_IOPARALLELSCSI, code))
+#define IODBG_SATA(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOSATA, code))
+#define IODBG_SAS(code)				(KDBG_CODE(DBG_IOKIT, DBG_IOSAS, code))
+#define IODBG_FIBRECHANNEL(code)	(KDBG_CODE(DBG_IOKIT, DBG_IOFIBRECHANNEL, code))
+#define IODBG_USB(code)				(KDBG_CODE(DBG_IOKIT, DBG_IOUSB, code))
+#define IODBG_BLUETOOTH(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOBLUETOOTH, code))
+#define IODBG_FIREWIRE(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOFIREWIRE, code))
+#define IODBG_INFINIBAND(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOINFINIBAND, code))
+
+
+/* Backwards compatibility */
+#define IODBG_DISK(code)			IODBG_STORAGE(code)
+#define IODBG_POINTING(code)		IODBG_HID(code)
+
+
+/* IOKit infrastructure subclasses */
+#define IODBG_WORKLOOP(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOWORKLOOP, code))
+#define IODBG_INTES(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOINTES, code))
+#define IODBG_TIMES(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOCLKES, code))
+#define IODBG_CMDQ(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOCMDQ, code))
+#define IODBG_MCURS(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOMCURS, code))
+#define IODBG_MDESC(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOMDESC, code))
+#define IODBG_POWER(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOPOWER, code))
+#define IODBG_IOSERVICE(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOSERVICE, code))
+
+/* IOKit specific codes - within each subclass */
+
+/* DBG_IOKIT/DBG_IODISK codes */
+
+/* DBG_IOKIT/DBG_IONETWORK codes */
+
+/* DBG_IOKIT/DBG_IOKEYBOARD codes */
+
+/* DBG_IOKIT/DBG_IOHID codes */
+
+/* DBG_IOKIT/DBG_IOAUDIO codes */
+
+/* DBG_IOKIT/DBG_IOSERIAL codes */
+
+/* DBG_IOKIT/DBG_IOTTY codes */
+
+/* DBG_IOKIT/DBG_IOWORKLOOP codes */
+#define IOWL_CLIENT		1	/* 0x05010004 */
+#define IOWL_WORK		2	/* 0x05010008 */
+
+/* DBG_IOKIT/DBG_IOINTES codes */
+#define IOINTES_CLIENT	1	/* 0x05020004 */
+#define IOINTES_LAT		2	/* 0x05020008 */
+#define IOINTES_SEMA	3	/* 0x0502000c */
+#define IOINTES_INTCTXT 4	/* 0x05020010 */
+#define IOINTES_INTFLTR 5	/* 0x05020014 */
+#define IOINTES_ACTION	6	/* 0x05020018 */
+#define IOINTES_FILTER	7	/* 0x0502001c */
+
+/* DBG_IOKIT/DBG_IOTIMES codes */
+#define IOTIMES_CLIENT	1	/* 0x05030004 */
+#define IOTIMES_LAT		2	/* 0x05030008 */
+#define IOTIMES_SEMA	3	/* 0x0503000c */
+#define IOTIMES_ACTION	4	/* 0x05030010 */
+
+/* DBG_IOKIT/DBG_IOCMDQ codes */
+#define IOCMDQ_CLIENT	1	/* 0x05040004 */
+#define IOCMDQ_LAT		2	/* 0x05040008 */
+#define IOCMDQ_SEMA		3	/* 0x0504000c */
+#define IOCMDQ_PSEMA	4	/* 0x05040010 */
+#define IOCMDQ_PLOCK	5	/* 0x05040014 */
+#define IOCMDQ_ACTION	6	/* 0x05040018 */
+
+/* DBG_IOKIT/DBG_IOMCURS codes */
+
+/* DBG_IOKIT/DBG_IOMDESC codes */
+
+/* DBG_IOKIT/DBG_IOPOWER codes */
+// See IOKit/pwr_mgt/IOPMlog.h for the power management codes
+
+/* DBG_IOKIT/DBG_IOSERVICE codes */
+#define IOSERVICE_BUSY		1	/* 0x05080004 */
+#define IOSERVICE_NONBUSY	2	/* 0x05080008 */
+#define IOSERVICE_MODULESTALL	3	/* 0x0508000C */
+#define IOSERVICE_MODULEUNSTALL	4	/* 0x05080010 */
+
+#define IOSERVICE_TERMINATE_PHASE1		5	/* 0x05080014 */
+#define IOSERVICE_TERMINATE_REQUEST_OK		6	/* 0x05080018 */
+#define IOSERVICE_TERMINATE_REQUEST_FAIL	7	/* 0x0508001C */
+#define IOSERVICE_TERMINATE_SCHEDULE_STOP	8	/* 0x05080020 */
+#define IOSERVICE_TERMINATE_SCHEDULE_FINALIZE	9	/* 0x05080024 */
+#define IOSERVICE_TERMINATE_WILL		10	/* 0x05080028 */
+#define IOSERVICE_TERMINATE_DID			11	/* 0x0508002C */
+#define IOSERVICE_TERMINATE_DID_DEFER		12	/* 0x05080030 */
+#define IOSERVICE_TERMINATE_FINALIZE		13	/* 0x05080034 */
+#define IOSERVICE_TERMINATE_STOP		14	/* 0x05080038 */
+#define IOSERVICE_TERMINATE_STOP_NOP		15	/* 0x0508003C */
+#define IOSERVICE_TERMINATE_STOP_DEFER		16	/* 0x05080040 */
+#define IOSERVICE_TERMINATE_DONE		17	/* 0x05080044 */
+
+#endif /* ! IOKIT_IOTIMESTAMP_H */
diff --git a/i386/include/IOKit/IOTimerEventSource.h b/i386/include/IOKit/IOTimerEventSource.h
new file mode 100644
index 0000000..7cc0d38
--- /dev/null
+++ b/i386/include/IOKit/IOTimerEventSource.h
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
+ *
+ * IOTimerEventSource.h
+ *
+ * HISTORY
+ * 2-Feb-1999		Joe Liu (jliu) created.
+ *
+ */
+
+#ifndef _IOTIMEREVENTSOURCE
+#define _IOTIMEREVENTSOURCE
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+#include <kern/clock.h>
+__END_DECLS
+
+#include <IOKit/IOEventSource.h>
+#include <IOKit/IOTypes.h>
+
+/*!
+    @class IOTimerEventSource : public IOEventSource
+    @abstract Time based event source mechanism.
+    @discussion An event source that implements a simple timer.	 A timeout handler is called once the timeout period expires.  This timeout handler will be called by the work-loop that this event source is attached to.
+<br><br>
+	Usually a timer event source will be used to implement a timeout.  In general when a driver makes a request it will need to setup a call to keep track of when the I/O doesn't complete.  This class is designed to make that somewhat easier.
+<br><br>
+	Remember the system doesn't guarantee the accuracy of the callout.	It is possible that a higher priority thread is running which will delay the execution of the action routine.  In fact the thread will be made runable at the exact requested time, within the accuracy of the CPU's decrementer based interrupt, but the scheduler will then control execution.
+*/
+class IOTimerEventSource : public IOEventSource
+{
+    OSDeclareDefaultStructors(IOTimerEventSource)
+
+protected:
+/*! @var calloutEntry thread_call entry for preregistered thread callouts */
+    void *calloutEntry;
+
+/*! @var abstime time to wake up next, see enable. */
+    AbsoluteTime abstime;
+
+/*! @struct ExpansionData
+    @discussion This structure is private to the IOTimerEventSource implementation.
+    */    
+    struct ExpansionData
+    {
+        SInt32	     calloutGeneration;
+        IOWorkLoop * workLoop;
+    };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+/*! @function timeout
+    @abstract Function that routes the call from the OS' timeout mechanism into a work-loop context.
+    @discussion timeout will normally not be called nor overridden by a subclass.  If the event source is enabled then close the work-loop's gate and call the action routine.
+    @param self This argument will be cast to an IOTimerEventSource. */
+    static void timeout(void *self);
+
+/*! @function setTimeoutFunc
+    @abstract Set's timeout as the function of calloutEntry.
+    @discussion IOTimerEventSource is based upon the kern/thread_call.h APIs currently.	 This function allocates the calloutEntry member variable by using thread_call_allocate(timeout, this).	 If you need to write your own subclass of IOTimerEventSource you probably should override this method to allocate an entry that points to your own timeout routine. */
+    virtual void setTimeoutFunc();
+
+/*! @function free
+    @abstract Sub-class implementation of free method, frees calloutEntry */
+    virtual void free();
+
+/*! @function checkForWork
+    @abstract Have to implement it is mandatory in $link IOEventSource, but IOTimerEventSources don't actually use this work-loop mechanism. */
+    virtual bool checkForWork();
+
+    virtual void setWorkLoop(IOWorkLoop *workLoop);
+
+public:
+
+/*! @typedef Action
+    @discussion 'C' Function pointer defining the callout routine of this event source.
+    @param owner Owning target object.	Note by a startling coincidence the first parameter in a C callout is currently used to define the target of a C++ member function.
+    @param sender The object that timed out. */
+    typedef void (*Action)(OSObject *owner, IOTimerEventSource *sender);
+
+/*! @function timerEventSource
+    @abstract Allocates and returns an initialized timer instance.
+    @param owner
+    @param action */
+    static IOTimerEventSource *
+	timerEventSource(OSObject *owner, Action action = 0);
+
+/*! @function init
+    @abstract Initializes the timer with an owner, and a handler to call when the timeout expires.
+    @param owner 
+    @param action */
+    virtual bool init(OSObject *owner, Action action = 0);
+
+/*! @function enable
+    @abstract Enables a call to the action.
+    @discussion Allows the action function to be called.  If the timer event source was disabled while a call was outstanding and the call wasn't cancelled then it will be rescheduled.  So a disable/enable pair will disable calls from this event source. */
+    virtual void enable();
+
+/*! @function disable
+    @abstract Disable a timed callout.
+    @discussion When disable returns the action will not be called until the next time enable(qv) is called. */
+    virtual void disable();
+
+
+/*! @function setTimeoutTicks
+    @abstract Setup a callback at after the delay in scheduler ticks.  See wakeAtTime(AbsoluteTime).
+    @param interval Delay from now to wake up, in scheduler ticks, whatever that may be.
+    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
+    virtual IOReturn setTimeoutTicks(UInt32 ticks);
+
+/*! @function setTimeoutMS
+    @abstract Setup a callback at after the delay in milliseconds.  See wakeAtTime(AbsoluteTime).
+    @param interval Delay from now to wake up, time in milliseconds.
+    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
+    virtual IOReturn setTimeoutMS(UInt32 ms);
+
+/*! @function setTimeoutUS
+        @abstract Setup a callback at after the delay in microseconds.	 See wakeAtTime(AbsoluteTime).
+    @param interval Delay from now to wake up, time in microseconds.
+    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
+    virtual IOReturn setTimeoutUS(UInt32 us);
+
+/*! @function setTimeout
+    @abstract Setup a callback at after the delay in some unit.	 See wakeAtTime(AbsoluteTime).
+    @param interval Delay from now to wake up in some defined unit.
+    @param scale_factor Define the unit of interval, default to nanoseconds.
+    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
+    virtual IOReturn setTimeout(UInt32 interval,
+				UInt32 scale_factor = kNanosecondScale);
+
+#if !defined(__LP64__)
+    virtual IOReturn setTimeout(mach_timespec_t interval)
+	APPLE_KEXT_DEPRECATED;
+#endif
+
+/*! @function setTimeout
+    @abstract Setup a callback at after the delay in decrementer ticks.	 See wakeAtTime(AbsoluteTime).
+    @param interval Delay from now to wake up in decrementer ticks.
+    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
+    virtual IOReturn setTimeout(AbsoluteTime interval);
+
+/*! @function wakeAtTimeTicks
+    @abstract Setup a callback at this absolute time.  See wakeAtTime(AbsoluteTime).
+    @param abstime Time to wake up in scheduler quantums, whatever that is?
+    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
+    virtual IOReturn wakeAtTimeTicks(UInt32 ticks);
+
+/*! @function wakeAtTimeMS
+    @abstract Setup a callback at this absolute time.  See wakeAtTime(AbsoluteTime).
+    @param abstime Time to wake up in milliseconds.
+    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
+    virtual IOReturn wakeAtTimeMS(UInt32 ms);
+
+/*! @function wakeAtTimeUS
+    @abstract Setup a callback at this absolute time.  See wakeAtTime(AbsoluteTime).
+    @param abstime Time to wake up in microseconds.
+    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
+    virtual IOReturn wakeAtTimeUS(UInt32 us);
+
+/*! @function wakeAtTime
+    @abstract Setup a callback at this absolute time.  See wakeAtTime(AbsoluteTime).
+    @param abstime Time to wake up in some unit.
+    @param scale_factor Define the unit of abstime, default to nanoseconds.
+    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
+    virtual IOReturn wakeAtTime(UInt32 abstime,
+				UInt32 scale_factor = kNanosecondScale);
+
+#if !defined(__LP64__)
+    virtual IOReturn wakeAtTime(mach_timespec_t abstime)
+	APPLE_KEXT_DEPRECATED;
+#endif
+
+/*! @function wakeAtTime
+    @abstract Setup a callback at this absolute time.
+    @discussion Starts the timer, which will expire at abstime. After it expires, the timer will call the 'action' registered in the init() function. This timer is not periodic, a further call is needed to reset and restart the timer after it expires.  
+    @param abstime Absolute Time when to wake up, counted in 'decrementer' units and starts at zero when system boots.
+    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared by init or IOEventSource::setAction (qqv). */
+    virtual IOReturn wakeAtTime(AbsoluteTime abstime);
+
+/*! @function cancelTimeout
+    @abstract Disable any outstanding calls to this event source.
+    @discussion Clear down any oustanding calls.  By the time this function completes it is guaranteed that the action will not be called again. */
+   virtual void cancelTimeout();
+
+private:
+    static void timeoutAndRelease(void *self, void *wl);
+
+private:
+    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 0);
+    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 1);
+    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 2);
+    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 3);
+    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 4);
+    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 5);
+    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 6);
+    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 7);
+};
+
+#endif /* !_IOTIMEREVENTSOURCE */
diff --git a/i386/include/IOKit/IOTypes.h b/i386/include/IOKit/IOTypes.h
new file mode 100644
index 0000000..5d20efb
--- /dev/null
+++ b/i386/include/IOKit/IOTypes.h
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef	__IOKIT_IOTYPES_H
+#define __IOKIT_IOTYPES_H
+
+#ifndef IOKIT
+#define IOKIT 1
+#endif /* !IOKIT */
+
+#if KERNEL
+#include <IOKit/system.h>
+#else
+#include <mach/message.h>
+#include <mach/vm_types.h>
+#endif
+
+#include <IOKit/IOReturn.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef	NULL
+#if defined (__cplusplus)
+#define	NULL	0
+#else
+#define NULL ((void *)0)
+#endif
+#endif
+	
+/*
+ * Simple data types.
+ */
+#ifndef __MACTYPES__	/* CF MacTypes.h */
+#ifndef __TYPES__	/* guess... Mac Types.h */
+
+#include <stdbool.h>
+#include <libkern/OSTypes.h>
+
+#endif /* __TYPES__ */
+#endif /* __MACTYPES__ */
+
+#if KERNEL
+#include <libkern/OSBase.h>
+#endif
+
+typedef UInt32		IOOptionBits;
+typedef SInt32		IOFixed;
+typedef UInt32		IOVersion;
+typedef UInt32		IOItemCount;
+typedef UInt32  	IOCacheMode;
+
+typedef UInt32	 	IOByteCount32;
+typedef UInt64	 	IOByteCount64;
+
+typedef UInt32	IOPhysicalAddress32;
+typedef UInt64	IOPhysicalAddress64;
+typedef UInt32	IOPhysicalLength32;
+typedef UInt64	IOPhysicalLength64;
+
+#ifdef __LP64__
+typedef mach_vm_address_t	IOVirtualAddress;
+#else
+typedef vm_address_t		IOVirtualAddress;
+#endif
+
+#if defined(__LP64__) && defined(KERNEL)
+typedef IOByteCount64		IOByteCount;
+#else
+typedef IOByteCount32	 	IOByteCount;
+#endif
+
+typedef IOVirtualAddress    IOLogicalAddress;
+
+#if defined(__LP64__) && defined(KERNEL)
+
+typedef IOPhysicalAddress64	 IOPhysicalAddress;
+typedef IOPhysicalLength64	 IOPhysicalLength;
+#define IOPhysical32( hi, lo )		((UInt64) lo + ((UInt64)(hi) << 32))
+#define IOPhysSize	64
+
+#else
+
+typedef IOPhysicalAddress32	 IOPhysicalAddress;
+typedef IOPhysicalLength32	 IOPhysicalLength;
+#define IOPhysical32( hi, lo )		(lo)
+#define IOPhysSize	32
+
+#endif
+
+
+typedef struct
+{
+    IOPhysicalAddress	address;
+    IOByteCount		length;
+} IOPhysicalRange;
+
+typedef struct 
+{
+    IOVirtualAddress	address;
+    IOByteCount		length;
+} IOVirtualRange;
+
+#ifdef __LP64__
+typedef IOVirtualRange	IOAddressRange;
+#else /* !__LP64__ */
+typedef struct 
+{
+    mach_vm_address_t	address;
+    mach_vm_size_t	length;
+} IOAddressRange;
+#endif /* !__LP64__ */
+
+/*
+ * Map between #defined or enum'd constants and text description.
+ */
+typedef struct {
+	int value;
+	const char *name;
+} IONamedValue;
+
+
+/*
+ * Memory alignment -- specified as a power of two.
+ */
+typedef unsigned int	IOAlignment;
+
+#define IO_NULL_VM_TASK		((vm_task_t)0)
+
+
+/*
+ * Pull in machine specific stuff.
+ */
+
+//#include <IOKit/machine/IOTypes.h>
+
+#ifndef MACH_KERNEL
+
+#ifndef __IOKIT_PORTS_DEFINED__
+#define __IOKIT_PORTS_DEFINED__
+typedef struct OSObject * io_object_t;
+#endif /* __IOKIT_PORTS_DEFINED__ */
+
+#include <device/device_types.h>
+
+typedef io_object_t	io_connect_t;
+typedef io_object_t	io_enumerator_t;
+typedef io_object_t	io_iterator_t;
+typedef io_object_t	io_registry_entry_t;
+typedef io_object_t	io_service_t;
+
+#define	IO_OBJECT_NULL	((io_object_t) 0)
+
+#endif /* MACH_KERNEL */
+
+// IOConnectMapMemory memoryTypes
+enum {
+    kIODefaultMemoryType	= 0
+};
+
+enum {
+    kIODefaultCache		= 0,
+    kIOInhibitCache		= 1,
+    kIOWriteThruCache		= 2,
+    kIOCopybackCache		= 3,
+    kIOWriteCombineCache	= 4
+};
+
+// IOMemory mapping options
+enum {
+    kIOMapAnywhere		= 0x00000001,
+
+    kIOMapCacheMask		= 0x00000700,
+    kIOMapCacheShift		= 8,
+    kIOMapDefaultCache		= kIODefaultCache      << kIOMapCacheShift,
+    kIOMapInhibitCache		= kIOInhibitCache      << kIOMapCacheShift,
+    kIOMapWriteThruCache	= kIOWriteThruCache    << kIOMapCacheShift,
+    kIOMapCopybackCache		= kIOCopybackCache     << kIOMapCacheShift,
+    kIOMapWriteCombineCache	= kIOWriteCombineCache << kIOMapCacheShift,
+
+    kIOMapUserOptionsMask	= 0x00000fff,
+
+    kIOMapReadOnly		= 0x00001000,
+
+    kIOMapStatic		= 0x01000000,
+    kIOMapReference		= 0x02000000,
+    kIOMapUnique		= 0x04000000
+};
+
+/*! @enum Scale Factors
+    @discussion Used when a scale_factor parameter is required to define a unit of time.
+    @constant kNanosecondScale Scale factor for nanosecond based times.
+    @constant kMicrosecondScale Scale factor for microsecond based times.
+    @constant kMillisecondScale Scale factor for millisecond based times.
+    @constant kTickScale Scale factor for the standard (100Hz) tick.
+    @constant kSecondScale Scale factor for second based times. */
+
+enum {
+    kNanosecondScale  = 1,
+    kMicrosecondScale = 1000,
+    kMillisecondScale = 1000 * 1000,
+    kSecondScale      = 1000 * 1000 * 1000,
+    kTickScale        = (kSecondScale / 100)
+};
+
+/* compatibility types */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ! __IOKIT_IOTYPES_H */
diff --git a/i386/include/IOKit/IOUserClient.h b/i386/include/IOKit/IOUserClient.h
new file mode 100644
index 0000000..c1d7fe5
--- /dev/null
+++ b/i386/include/IOKit/IOUserClient.h
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+/*
+ * Changes to this API are expected.
+ */
+
+#ifndef _IOKIT_IOUSERCLIENT_H
+#define _IOKIT_IOUSERCLIENT_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOService.h>
+#include <IOKit/OSMessageNotification.h>
+
+
+enum {
+    kIOUCTypeMask	= 0x0000000f,
+    kIOUCScalarIScalarO = 0,
+    kIOUCScalarIStructO = 2,
+    kIOUCStructIStructO = 3,
+    kIOUCScalarIStructI = 4,
+
+    kIOUCForegroundOnly = 0x00000010,
+};
+
+/*! @enum
+    @abstract Constant to denote a variable length structure argument to IOUserClient.
+    @constant kIOUCVariableStructureSize Use in the structures IOExternalMethod, IOExternalAsyncMethod, IOExternalMethodDispatch to specify the size of the structure is variable.
+*/
+enum {
+    kIOUCVariableStructureSize = 0xffffffff
+};
+
+
+typedef IOReturn (IOService::*IOMethod)(void * p1, void * p2, void * p3,
+                                        void * p4, void * p5, void * p6 );
+
+typedef IOReturn (IOService::*IOAsyncMethod)(OSAsyncReference asyncRef,
+                                        void * p1, void * p2, void * p3,
+                                        void * p4, void * p5, void * p6 );
+
+typedef IOReturn (IOService::*IOTrap)(void * p1, void * p2, void * p3,
+                                      void * p4, void * p5, void * p6 );
+
+struct IOExternalMethod {
+    IOService *		object;
+    IOMethod		func;
+    IOOptionBits	flags;
+    IOByteCount		count0;
+    IOByteCount		count1;
+};
+
+struct IOExternalAsyncMethod {
+    IOService *		object;
+    IOAsyncMethod	func;
+    IOOptionBits	flags;
+    IOByteCount		count0;
+    IOByteCount		count1;
+};
+
+struct IOExternalTrap {
+    IOService *		object;
+    IOTrap		func;
+};
+
+enum {
+    kIOUserNotifyMaxMessageSize = 64
+};
+
+// keys for clientHasPrivilege
+#define kIOClientPrivilegeAdministrator	"root"
+#define kIOClientPrivilegeLocalUser	"local"
+#define kIOClientPrivilegeForeground	"foreground"
+
+/*! @enum
+    @abstract Constants to specify the maximum number of scalar arguments in the IOExternalMethodArguments structure. These constants are documentary since the scalarInputCount, scalarOutputCount fields reflect the actual number passed.
+    @constant kIOExternalMethodScalarInputCountMax The maximum number of scalars able to passed on input.
+    @constant kIOExternalMethodScalarOutputCountMax The maximum number of scalars able to passed on output.
+*/
+enum {
+    kIOExternalMethodScalarInputCountMax  = 16,
+    kIOExternalMethodScalarOutputCountMax = 16,
+};
+
+
+struct IOExternalMethodArguments
+{
+    uint32_t		version;
+
+    uint32_t		selector;
+
+    mach_port_t           asyncWakePort;
+    io_user_reference_t * asyncReference;
+    uint32_t              asyncReferenceCount;
+
+    const uint64_t *    scalarInput;
+    uint32_t		scalarInputCount;
+
+    const void *	structureInput;
+    uint32_t		structureInputSize;
+
+    IOMemoryDescriptor * structureInputDescriptor;
+   
+    uint64_t *		scalarOutput;
+    uint32_t		scalarOutputCount;
+
+    void *		structureOutput;
+    uint32_t		structureOutputSize;
+
+    IOMemoryDescriptor * structureOutputDescriptor;
+    uint32_t		 structureOutputDescriptorSize;
+
+    uint32_t		__reserved[32];
+};
+
+typedef IOReturn (*IOExternalMethodAction)(OSObject * target, void * reference, 
+					    IOExternalMethodArguments * arguments);
+struct IOExternalMethodDispatch
+{
+    IOExternalMethodAction function;
+    uint32_t		   checkScalarInputCount;
+    uint32_t		   checkStructureInputSize;
+    uint32_t		   checkScalarOutputCount;
+    uint32_t		   checkStructureOutputSize;
+};
+
+enum {
+#define IO_EXTERNAL_METHOD_ARGUMENTS_CURRENT_VERSION	1
+    kIOExternalMethodArgumentsCurrentVersion = IO_EXTERNAL_METHOD_ARGUMENTS_CURRENT_VERSION
+};
+
+
+/*!
+    @class IOUserClient
+    @abstract   Provides a basis for communication between client applications and I/O Kit objects.
+*/
+
+
+class IOUserClient : public IOService
+{
+    OSDeclareAbstractStructors(IOUserClient)
+
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of this class in the future.
+*/    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only) 
+*/
+    ExpansionData * reserved;
+
+private:
+    OSSet * mappings;
+    UInt8   sharedInstance;
+    UInt8   __reservedA[3];
+    void  * __reserved[7];
+
+public:
+   virtual IOReturn externalMethod( uint32_t selector, IOExternalMethodArguments * arguments,
+					IOExternalMethodDispatch * dispatch = 0, OSObject * target = 0, void * reference = 0 );
+
+   virtual IOReturn registerNotificationPort(
+					mach_port_t port, UInt32 type, io_user_reference_t refCon);
+
+private:
+#if __LP64__
+    OSMetaClassDeclareReservedUnused(IOUserClient, 0);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 1);
+#else
+    OSMetaClassDeclareReservedUsed(IOUserClient, 0);
+    OSMetaClassDeclareReservedUsed(IOUserClient, 1);
+#endif
+    OSMetaClassDeclareReservedUnused(IOUserClient, 2);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 3);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 4);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 5);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 6);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 7);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 8);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 9);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 10);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 11);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 12);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 13);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 14);
+    OSMetaClassDeclareReservedUnused(IOUserClient, 15);
+
+
+protected:
+    static IOReturn sendAsyncResult(OSAsyncReference reference,
+                                    IOReturn result, void *args[], UInt32 numArgs);
+    static void setAsyncReference(OSAsyncReference asyncRef,
+                                  mach_port_t wakePort,
+                                  void *callback, void *refcon);
+
+    static IOReturn sendAsyncResult64(OSAsyncReference64 reference,
+                                        IOReturn result, io_user_reference_t args[], UInt32 numArgs);
+    static void setAsyncReference64(OSAsyncReference64 asyncRef,
+					mach_port_t wakePort,
+					mach_vm_address_t callback, io_user_reference_t refcon);
+public:
+
+    static IOReturn clientHasPrivilege( void * securityToken,
+                                        const char * privilegeName );
+
+    /*!
+        @function releaseAsyncReference64
+	@abstract Release the mach_port_t reference held within the OSAsyncReference64 structure.
+	@discussion The OSAsyncReference64 structure passed to async methods holds a reference to the wakeup mach port, which should be released to balance each async method call. Behavior is undefined if these calls are not correctly balanced.
+        @param reference The reference passed to the subclass IOAsyncMethod, or externalMethod() in the IOExternalMethodArguments.asyncReference field.
+        @result A return code.
+    */
+    static IOReturn releaseAsyncReference64(OSAsyncReference64 reference);
+    /*!
+        @function releaseNotificationPort
+	@abstract Release the mach_port_t passed to registerNotificationPort().
+	@discussion The mach_port_t passed to the registerNotificationPort() methods should be released to balance each call to registerNotificationPort(). Behavior is undefined if these calls are not correctly balanced.
+        @param reference The mach_port_t argument previously passed to the subclass implementation of registerNotificationPort().
+        @result A return code.
+    */
+    static IOReturn releaseNotificationPort(mach_port_t port);
+
+    virtual bool init();
+    virtual bool init( OSDictionary * dictionary );
+    // Currently ignores the all args, just passes up to IOService::init()
+    virtual bool initWithTask(
+                    task_t owningTask, void * securityToken, UInt32 type,
+                    OSDictionary * properties);
+
+    virtual bool initWithTask(
+                    task_t owningTask, void * securityToken, UInt32 type);
+
+    virtual void free();
+
+    virtual IOReturn clientClose( void );
+    virtual IOReturn clientDied( void );
+
+    virtual IOService * getService( void );
+
+    virtual IOReturn registerNotificationPort(
+		mach_port_t port, UInt32 type, UInt32 refCon );
+
+    virtual IOReturn getNotificationSemaphore( UInt32 notification_type,
+                                    semaphore_t * semaphore );
+
+    virtual IOReturn connectClient( IOUserClient * client );
+
+    // memory will be released by user client when last map is destroyed
+    virtual IOReturn clientMemoryForType( UInt32 type,
+			        IOOptionBits * options,
+				IOMemoryDescriptor ** memory );
+
+#if !__LP64__
+private:
+	APPLE_KEXT_COMPATIBILITY_VIRTUAL
+	IOMemoryMap * mapClientMemory( IOOptionBits type,
+                                    task_t task,
+                                    IOOptionBits mapFlags = kIOMapAnywhere,
+									IOVirtualAddress atAddress = 0 );
+#endif
+
+public:
+
+    /*!
+        @function removeMappingForDescriptor
+        Remove the first mapping created from the memory descriptor returned by clientMemoryForType() from IOUserClient's list of mappings. If such a mapping exists, it is retained and the reference currently held by IOUserClient is returned to the caller.
+        @param memory The memory descriptor instance previously returned by the implementation of clientMemoryForType().
+        @result A reference to the first IOMemoryMap instance found in the list of mappings created by IOUserClient from that passed memory descriptor is returned, or zero if none exist. The caller should release this reference.
+    */
+    IOMemoryMap * removeMappingForDescriptor(IOMemoryDescriptor * memory);
+
+    /*!
+        @function exportObjectToClient
+        Make an arbitrary OSObject available to the client task.
+        @param task The task.
+        @param obj The object we want to export to the client.
+        @param clientObj Returned value is the client's port name.
+    */
+    virtual IOReturn exportObjectToClient(task_t task,
+				OSObject *obj, io_object_t *clientObj);
+
+    // Old methods for accessing method vector backward compatiblility only
+    virtual IOExternalMethod *
+        getExternalMethodForIndex( UInt32 index )
+	APPLE_KEXT_DEPRECATED;
+    virtual IOExternalAsyncMethod *
+        getExternalAsyncMethodForIndex( UInt32 index )
+	APPLE_KEXT_DEPRECATED;
+
+    // Methods for accessing method vector.
+    virtual IOExternalMethod *
+        getTargetAndMethodForIndex( IOService ** targetP, UInt32 index );
+    virtual IOExternalAsyncMethod *
+        getAsyncTargetAndMethodForIndex( IOService ** targetP, UInt32 index );
+
+    // Methods for accessing trap vector - old and new style
+    virtual IOExternalTrap *
+		getExternalTrapForIndex( UInt32 index )
+	APPLE_KEXT_DEPRECATED;
+
+    virtual IOExternalTrap *
+      getTargetAndTrapForIndex( IOService **targetP, UInt32 index );
+};
+
+#endif /* ! _IOKIT_IOUSERCLIENT_H */
+
diff --git a/i386/include/IOKit/IOWorkLoop.h b/i386/include/IOKit/IOWorkLoop.h
new file mode 100644
index 0000000..808329a
--- /dev/null
+++ b/i386/include/IOKit/IOWorkLoop.h
@@ -0,0 +1,321 @@
+/*
+ * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+Copyright (c) 1998 Apple Computer, Inc.	 All rights reserved.
+HISTORY
+    1998-7-13	Godfrey van der Linden(gvdl)
+	Created.
+    1998-10-30	Godfrey van der Linden(gvdl)
+	Converted to C++
+*/
+
+#ifndef __IOKIT_IOWORKLOOP_H
+#define __IOKIT_IOWORKLOOP_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOReturn.h>
+#include <IOKit/IOLib.h>
+#include <IOKit/IOLocks.h>
+
+#include <IOKit/system.h>
+
+class IOEventSource;
+class IOTimerEventSource;
+class IOCommandGate;
+
+/*! @class IOWorkLoop
+    @discussion An IOWorkLoop is a thread of control that is intended to be used to provide single threaded access to hardware.  This class has no knowledge of the nature and type of the events that it marshals and forwards.  When a device driver successfully starts (see IOService::start), it is expected to create the event sources it will need to receive events.  Then a work loop is initialized and the events are added to the work loop for monitoring.  In general this set up will be automated by the family superclass of the specific device.
+<br><br>
+	The thread main method walks the event source linked list and messages each one requesting a work check.  At this point each event source is expected to notify its registered owner that the event has occurred.  After each event has been walked and each indicates that another loop isn't required (by setting the 'more' flag to false) the thread will go to sleep on a signaling semaphore.
+<br><br>
+	When an event source is registered with a work loop it is informed of the semaphore to use to wake up the loop.
+*/
+class IOWorkLoop : public OSObject
+{
+    OSDeclareDefaultStructors(IOWorkLoop)
+
+public:
+/*!
+    @typedef Action
+    @discussion Type and arguments of callout C function that is used when
+a runCommand is executed by a client.  Cast to this type when you want a C++
+member function to be used.  Note the arg1 - arg3 parameters are straight pass
+through from the runCommand to the action callout.
+    @param target
+	Target of the function, can be used as a refcon.  Note if a C++ function
+was specified, this parameter is implicitly the first parameter in the target
+member function's parameter list.
+    @param arg0 Argument to action from run operation.
+    @param arg1 Argument to action from run operation.
+    @param arg2 Argument to action from run operation.
+    @param arg3 Argument to action from run operation.
+*/
+    typedef IOReturn (*Action)(OSObject *target,
+			       void *arg0, void *arg1,
+			       void *arg2, void *arg3);
+    enum {
+	kPreciousStack = 0x00000001
+    };
+
+private:
+/*! @function threadMainContinuation
+    @abstract Static function that calls the threadMain function. 
+*/
+    static void threadMainContinuation(IOWorkLoop *self);
+
+protected:
+
+/*! @typedef maintCommandEnum
+    @discussion Enumeration of commands that _maintCommand can deal with.  
+    @constant mAddEvent Used to tag a Remove event source command.
+    @constant mRemoveEvent Used to tag a Remove event source command. 
+*/    
+    typedef enum { mAddEvent, mRemoveEvent } maintCommandEnum;
+
+/*! @var gateLock
+    Mutual exclusion lock that is used by close and open Gate functions.  
+    This is a recursive lock, which allows multiple layers of code to share a single IOWorkLoop without deadlock.  This is common in IOKit since threads of execution tend to follow the service plane in the IORegistry, and multiple objects along the call path may acquire the gate for the same (shared) workloop.
+*/
+    IORecursiveLock *gateLock;
+
+/*! @var eventChain 
+    Pointer to first event source in linked list. 
+*/
+    IOEventSource *eventChain;
+
+/*! @var controlG 
+    Internal control gate to maintain event system.  
+*/
+    IOCommandGate *controlG;
+
+/*! @var workToDoLock
+    The spin lock that is used to guard the 'workToDo' variable. 
+*/
+    IOSimpleLock *workToDoLock;
+
+/*! @var workThread 
+    Work loop thread.	
+*/
+    IOThread workThread;
+
+/*! @var workToDo
+    Used to to indicate that an interrupt has fired and needs to be processed.
+*/
+    volatile bool workToDo;
+
+/*! @var loopRestart
+    Set if an event chain has been changed and the system has to be rechecked from start.  (Internal use only)  
+*/
+    bool loopRestart;
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+*/    
+    struct ExpansionData {
+	IOOptionBits options;
+    };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only) 
+*/
+    ExpansionData *reserved;
+
+/*! @function _maintRequest
+    @abstract Synchronous implementation of addEventSource and removeEventSource functions. 
+    @discussion This function implements the commands as defined in the maintCommandEnum.  It can be subclassed but it isn't an external API in the usual sense.  A subclass implementation of _maintRequest would be called synchronously with respect to the work loop and it should be implemented in the usual way that an ioctl would be.
+    @return kIOReturnUnsupported if the command given is not implemented, kIOReturnSuccess otherwise.
+*/
+    virtual IOReturn _maintRequest(void *command, void *data, void *, void *);
+
+/*! @function free
+    @discussion Mandatory free of the object independent of the current retain count.  If the work loop is running, this method will not return until the thread has successfully terminated.  Each event source in the chain will be released and the working semaphore will be destroyed.
+<br><br>
+	If the client has some outstanding requests on an event they will never be informed of completion.  If an external thread is blocked on any of the event sources they will be awakened with a KERN_INTERUPTED status. 
+*/
+    virtual void free();
+
+/*! @function threadMain
+    @discussion Work loop threads main function.  This function consists of 3
+    loops: the outermost loop is the semaphore clear and wait loop, the middle
+    loop terminates when there is no more work, and the inside loop walks the
+    event list calling the checkForWork method in each event source.  If an
+    event source has more work to do, it can set the more flag and the middle
+    loop will repeat.  When no more work is outstanding the outermost will
+    sleep until an event is signalled.
+*/
+    virtual void threadMain();
+
+public:
+
+/*! @function workLoop
+    @abstract Factory member function to construct and intialize a work loop.
+    @result Returns a workLoop instance if constructed successfully, 0 otherwise. 
+*/
+    static IOWorkLoop *workLoop();
+
+/*! @function workLoopWithOptions(IOOptionBits options)
+    @abstract Factory member function to constuct and intialize a work loop.
+    @param options Options - kPreciousStack to avoid stack deallocation on paging path.
+    @result Returns a workLoop instance if constructed successfully, 0 otherwise. 
+*/
+    static IOWorkLoop *workLoopWithOptions(IOOptionBits options);
+
+/*! @function init
+    @discussion Initializes an instance of the workloop.  This method creates and initializes the signaling semaphore, the controller gate lock, and spawns the thread that will continue executing.
+    @result Returns true if initialized successfully, false otherwise. 
+*/
+    virtual bool init();
+
+/*! @function getThread
+    @abstract Gets the workThread.
+    @result Returns workThread.
+*/
+    virtual IOThread getThread() const;
+
+/*! @function onThread
+    @abstract Is the current execution context on the work thread? 
+    @result Returns true if IOThreadSelf() == workThread. 
+*/
+    virtual bool onThread() const;
+
+/*! @function inGate
+    @abstract Is the current execution context holding the work-loop's gate? 
+    @result Returns true if IOThreadSelf() is gate holder.
+*/
+    virtual bool inGate() const;
+    
+/*! @function addEventSource
+    @discussion Add an event source to be monitored by the work loop.  This function does not return until the work loop has acknowledged the arrival of the new event source.  When a new event has been added the threadMain will always restart its loop and check all outstanding events.  The event source is retained by the work loop.
+    @param newEvent Pointer to IOEventSource subclass to add.
+    @result Always returns kIOReturnSuccess. 
+*/
+    virtual IOReturn addEventSource(IOEventSource *newEvent);
+
+/*! @function removeEventSource
+    @discussion Remove an event source from the work loop.  This function does not return until the work loop has acknowledged the removal of the event source.  When an event has been removed the threadMain will always restart its loop and check all outstanding events.  The event source will be released before return.
+    @param toRemove Pointer to IOEventSource subclass to remove.
+    @result Returns kIOReturnSuccess if successful, kIOReturnBadArgument if toRemove couldn't be found. 
+*/
+    virtual IOReturn removeEventSource(IOEventSource *toRemove);
+
+/*! @function enableAllEventSources
+    @abstract Calls enable() in all event sources.
+    @discussion For all event sources in eventChain, call enable() function.  See IOEventSource::enable().
+*/
+    virtual void enableAllEventSources() const;
+
+/*! @function disableAllEventSources
+    @abstract Calls disable() in all event sources.
+    @discussion For all event sources in eventChain, call disable() function.  See IOEventSource::disable().
+*/
+    virtual void disableAllEventSources() const;
+
+/*! @function enableAllInterrupts
+    @abstract Calls enable() in all interrupt event sources.
+    @discussion For all event sources (ES) for which IODynamicCast(IOInterruptEventSource, ES) is valid, in eventChain call enable() function.  See IOEventSource::enable().
+*/
+    virtual void enableAllInterrupts() const;
+
+/*! @function disableAllInterrupts
+    @abstract Calls disable() in all interrupt event sources.
+    @discussion For all event sources (ES) for which IODynamicCast(IOInterruptEventSource, ES) is valid,  in eventChain call disable() function.  See IOEventSource::disable().
+*/
+    virtual void disableAllInterrupts() const;
+
+
+protected:
+    // Internal APIs used by event sources to control the thread
+    friend class IOEventSource;
+    friend class IOTimerEventSource;
+    virtual void signalWorkAvailable();
+    virtual void openGate();
+    virtual void closeGate();
+    virtual bool tryCloseGate();
+    virtual int  sleepGate(void *event, UInt32 interuptibleType);
+    virtual void wakeupGate(void *event, bool oneThread);
+
+public:
+    /* methods available in Mac OS X 10.1 or later */
+
+/*! @function runAction
+    @abstract Single thread a call to an action with the work-loop.
+    @discussion Client function that causes the given action to be called in a single threaded manner.  Beware: the work-loop's gate is recursive and runAction can cause direct or indirect re-entrancy.  When executing on a client's thread, runAction will sleep until the work-loop's gate opens for execution of client actions, the action is single threaded against all other work-loop event sources.
+    @param action Pointer to function to be executed in work-loop context.
+    @param arg0 Parameter for action parameter, defaults to 0.
+    @param arg1 Parameter for action parameter, defaults to 0.
+    @param arg2 Parameter for action parameter, defaults to 0.
+    @param arg3 Parameter for action parameter, defaults to 0.
+    @result Returns the value of the Action callout.
+*/
+    virtual IOReturn runAction(Action action, OSObject *target,
+			       void *arg0 = 0, void *arg1 = 0,
+			       void *arg2 = 0, void *arg3 = 0);
+
+/*! @function runEventSources
+    @discussion Consists of the inner 2 loops of the threadMain function(qv).
+    The outer loop terminates when there is no more work, and the inside loop
+    walks the event list calling the checkForWork method in each event source.
+    If an event source has more work to do, it can set the more flag and the
+    outer loop will repeat.
+<br><br>
+    This function can be used to clear a priority inversion between the normal
+    workloop thread and multimedia's real time threads.  The problem is that
+    the interrupt action routine is often held off by high priority threads.
+    So if they want to get their data now they will have to call us and ask if
+    any data is available.  The multi-media user client will arrange for this
+    function to be called, which causes any pending interrupts to be processed
+    and the completion routines called.  By the time the function returns all
+    outstanding work will have been completed at the real time threads
+    priority.
+
+    @result Return false if the work loop is shutting down, true otherwise.
+*/
+    virtual bool runEventSources();
+
+protected:
+    // Internal APIs used by event sources to control the thread
+    virtual int sleepGate(void *event, AbsoluteTime deadline, UInt32 interuptibleType);
+
+protected:
+#if __LP64__
+    OSMetaClassDeclareReservedUnused(IOWorkLoop, 0);
+    OSMetaClassDeclareReservedUnused(IOWorkLoop, 1);
+    OSMetaClassDeclareReservedUnused(IOWorkLoop, 2);
+#else
+    OSMetaClassDeclareReservedUsed(IOWorkLoop, 0);
+    OSMetaClassDeclareReservedUsed(IOWorkLoop, 1);
+    OSMetaClassDeclareReservedUsed(IOWorkLoop, 2);
+#endif
+    OSMetaClassDeclareReservedUnused(IOWorkLoop, 3);
+    OSMetaClassDeclareReservedUnused(IOWorkLoop, 4);
+    OSMetaClassDeclareReservedUnused(IOWorkLoop, 5);
+    OSMetaClassDeclareReservedUnused(IOWorkLoop, 6);
+    OSMetaClassDeclareReservedUnused(IOWorkLoop, 7);
+};
+
+#endif /* !__IOKIT_IOWORKLOOP_H */
diff --git a/i386/include/IOKit/OSMessageNotification.h b/i386/include/IOKit/OSMessageNotification.h
new file mode 100644
index 0000000..7d7b5e5
--- /dev/null
+++ b/i386/include/IOKit/OSMessageNotification.h
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+#ifndef	__OS_OSMESSAGENOTIFICATION_H
+#define __OS_OSMESSAGENOTIFICATION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <mach/mach_types.h>
+#include <device/device_types.h>
+#include <IOKit/IOReturn.h>
+
+enum {
+    kFirstIOKitNotificationType 		= 100,
+    kIOServicePublishNotificationType 		= 100,
+    kIOServiceMatchedNotificationType		= 101,
+    kIOServiceTerminatedNotificationType	= 102,
+    kIOAsyncCompletionNotificationType		= 150,
+    kIOServiceMessageNotificationType		= 160,
+    kLastIOKitNotificationType 			= 199
+};
+
+enum {
+    kOSNotificationMessageID		= 53,
+    kOSAsyncCompleteMessageID		= 57,
+    kMaxAsyncArgs			= 16
+};
+
+enum {
+    kIOAsyncReservedIndex 	= 0,
+    kIOAsyncReservedCount,
+
+    kIOAsyncCalloutFuncIndex 	= kIOAsyncReservedCount,
+    kIOAsyncCalloutRefconIndex,
+    kIOAsyncCalloutCount,
+
+    kIOMatchingCalloutFuncIndex	= kIOAsyncReservedCount,
+    kIOMatchingCalloutRefconIndex,
+    kIOMatchingCalloutCount,
+    
+    kIOInterestCalloutFuncIndex	= kIOAsyncReservedCount,
+    kIOInterestCalloutRefconIndex,
+    kIOInterestCalloutServiceIndex,
+    kIOInterestCalloutCount
+};
+
+
+
+// --------------
+enum {
+    kOSAsyncRef64Count	= 8,
+    kOSAsyncRef64Size 	= kOSAsyncRef64Count * ((int) sizeof(io_user_reference_t))
+};
+typedef io_user_reference_t OSAsyncReference64[kOSAsyncRef64Count];
+
+struct OSNotificationHeader64 {
+    mach_msg_size_t	size;		/* content size */
+    natural_t		type;
+    OSAsyncReference64	reference;
+
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+    unsigned char	content[];
+#else
+    unsigned char	content[0];
+#endif
+};
+
+#pragma pack(4)
+struct IOServiceInterestContent64 {
+    natural_t		messageType;
+    io_user_reference_t	messageArgument[1];
+};
+#pragma pack()
+// --------------
+
+#if !KERNEL_USER32
+
+enum {
+    kOSAsyncRefCount	= 8,
+    kOSAsyncRefSize 	= 32
+};
+typedef natural_t OSAsyncReference[kOSAsyncRefCount];
+
+struct OSNotificationHeader {
+    mach_msg_size_t	size;		/* content size */
+    natural_t		type;
+    OSAsyncReference	reference;
+
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+    unsigned char	content[];
+#else
+    unsigned char	content[0];
+#endif
+};
+
+#pragma pack(4)
+struct IOServiceInterestContent {
+    natural_t	messageType;
+    void *	messageArgument[1];
+};
+#pragma pack()
+
+#endif /* KERNEL_USER32  */
+
+struct IOAsyncCompletionContent {
+    IOReturn result;
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+    void * args[] __attribute__ ((packed));
+#else
+    void * args[0] __attribute__ ((packed));
+#endif
+};
+
+#ifndef __cplusplus
+typedef struct OSNotificationHeader OSNotificationHeader;
+typedef struct IOServiceInterestContent IOServiceInterestContent;
+typedef struct IOAsyncCompletionContent IOAsyncCompletionContent;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*  __OS_OSMESSAGENOTIFICATION_H */
+
diff --git a/i386/include/IOKit/acpi/IOACPIPlatformDevice.h b/i386/include/IOKit/acpi/IOACPIPlatformDevice.h
new file mode 100644
index 0000000..ebf0ccf
--- /dev/null
+++ b/i386/include/IOKit/acpi/IOACPIPlatformDevice.h
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOACPIPLATFORMDEVICE_H
+#define _IOKIT_IOACPIPLATFORMDEVICE_H
+
+#include <libkern/c++/OSContainers.h>
+#include <IOKit/IOPlatformExpert.h>
+#include <IOKit/acpi/IOACPITypes.h>
+
+class IOACPIPlatformExpert;
+
+class IOACPIPlatformDevice : public IOPlatformDevice
+{
+    OSDeclareDefaultStructors( IOACPIPlatformDevice )
+
+protected:
+    void *                 _deviceHandle;
+    UInt32                 _deviceType;
+    UInt32                 _powerFlags;
+    UInt32 *               _powerStateFlags;
+    UInt32                 _sleepPowerState;
+    IOService *            _acpiParent;
+    IOACPIPlatformExpert * _platform;
+
+    /*! @struct ExpansionData
+        @discussion This structure will be used to expand the capablilties
+                    of the class in the future.
+     */
+    struct ExpansionData { };
+
+    /*! @var reserved
+        Reserved for future use. (Internal use only)
+     */
+    ExpansionData *  reserved;
+
+    virtual bool     initACPIPowerManagement( IOService * powerParent );
+    virtual void     stopACPIPowerManagement( IOService * powerParent );
+
+public:
+    virtual bool     init( IOService *    platform,
+                           void *         handle,
+                           OSDictionary * properties );
+
+    virtual void     free( void );
+
+    virtual bool     attachToParent( IORegistryEntry * parent,
+                                     const IORegistryPlane * plane );
+
+    virtual void     detachFromParent( IORegistryEntry * parent,
+                                       const IORegistryPlane * plane );
+
+    virtual bool     getPathComponent( char * path, int * length,
+                                       const IORegistryPlane * plane ) const;
+
+    virtual bool     compareName( OSString *  name,
+                                  OSString ** matched ) const;
+
+    virtual IOReturn getResources( void );
+
+    virtual void *   getDeviceHandle( void ) const;
+
+    virtual UInt32   getDeviceStatus( void ) const;
+
+    enum {
+        kTypeDevice         = 0,
+        kTypeProcessor      = 1,
+        kTypePowerResource  = 2
+    };
+
+    virtual UInt32   getDeviceType( void ) const;
+
+    virtual void     setDeviceType( UInt32 deviceType );
+
+    // Method (object) evaluation
+
+    virtual IOReturn validateObject(  const OSSymbol * objectName );
+
+    virtual IOReturn validateObject(  const char * objectName );
+
+    virtual IOReturn evaluateObject(  const OSSymbol * objectName,
+                                      OSObject **      result     = 0,
+                                      OSObject *       params[]   = 0,
+                                      IOItemCount      paramCount = 0,
+                                      IOOptionBits     options    = 0 );
+
+    virtual IOReturn evaluateObject(  const char *     objectName,
+                                      OSObject **      result     = 0,
+                                      OSObject *       params[]   = 0,
+                                      IOItemCount      paramCount = 0,
+                                      IOOptionBits     options    = 0 );
+
+    virtual IOReturn evaluateInteger( const OSSymbol * objectName,
+                                      UInt32 *         resultInt32,
+                                      OSObject *       params[]   = 0,
+                                      IOItemCount      paramCount = 0,
+                                      IOOptionBits     options    = 0 );
+
+    virtual IOReturn evaluateInteger( const char *     objectName,
+                                      UInt32 *         resultInt32,
+                                      OSObject *       params[]   = 0,
+                                      IOItemCount      paramCount = 0,
+                                      IOOptionBits     options    = 0 );
+
+    virtual IOReturn evaluateInteger( const OSSymbol * objectName,
+                                      UInt64 *         resultInt64,
+                                      OSObject *       params[]   = 0,
+                                      IOItemCount      paramCount = 0,
+                                      IOOptionBits     options    = 0 );
+
+    virtual IOReturn evaluateInteger( const char *     objectName,
+                                      UInt64 *         resultInt64,
+                                      OSObject *       params[]   = 0,
+                                      IOItemCount      paramCount = 0,
+                                      IOOptionBits     options    = 0 );
+
+    // ACPI table access
+
+    virtual const OSData * getACPITableData( const char * tableName,
+                                             UInt32       tableInstance = 0 ) const;
+
+    // Map ACPI event to interrupt event source index
+
+    virtual SInt32   installInterruptForFixedEvent( UInt32 fixedEvent );
+
+    virtual SInt32   installInterruptForGPE( UInt32       gpeNumber,
+                                             void *       gpeBlockDevice = 0,
+                                             IOOptionBits options = 0 );
+
+    // ACPI global lock acquire/release
+
+    virtual IOReturn acquireGlobalLock( UInt32 * lockToken,
+                                        const mach_timespec_t * timeout = 0 );
+
+    virtual void     releaseGlobalLock( UInt32 lockToken );
+
+    // Address space handler registration
+
+    virtual IOReturn registerAddressSpaceHandler(
+                                   IOACPIAddressSpaceID      spaceID,
+                                   IOACPIAddressSpaceHandler handler,
+                                   void *                    context,
+                                   IOOptionBits              options = 0 );
+
+    virtual void     unregisterAddressSpaceHandler(
+                                   IOACPIAddressSpaceID      spaceID,
+                                   IOACPIAddressSpaceHandler handler,
+                                   IOOptionBits              options = 0 );
+
+    // Address space access
+
+    virtual IOReturn readAddressSpace(  UInt64 *             value,
+                                        IOACPIAddressSpaceID spaceID,
+                                        IOACPIAddress        address,
+                                        UInt32               bitWidth,
+                                        UInt32               bitOffset = 0,
+                                        IOOptionBits         options   = 0 );
+
+    virtual IOReturn writeAddressSpace( UInt64               value,
+                                        IOACPIAddressSpaceID spaceID,
+                                        IOACPIAddress        address,
+                                        UInt32               bitWidth,
+                                        UInt32               bitOffset = 0,            
+                                        IOOptionBits         options   = 0 );
+
+    // Power management
+
+    virtual bool     hasSystemWakeCapability( void ) const;
+
+    virtual IOReturn setSystemWakeCapabilityEnable( bool enable );
+
+    virtual bool     hasACPIPowerStateSupport( UInt32 powerState ) const;
+
+    virtual IOReturn setACPIPowerManagementEnable(
+                            bool         enable,
+                            UInt32       powerState = kIOACPIDevicePowerStateD3,
+                            IOOptionBits options    = 0 );
+
+    virtual IOReturn setPowerState( unsigned long powerState,
+                                    IOService * whatDevice );
+
+    // I/O space helpers
+
+    virtual void     ioWrite32( UInt16 offset, UInt32 value,
+                                IOMemoryMap * map = 0 );
+
+    virtual void     ioWrite16( UInt16 offset, UInt16 value,
+                                IOMemoryMap * map = 0 );
+
+    virtual void     ioWrite8(  UInt16 offset, UInt8 value,
+                                IOMemoryMap * map = 0 );
+
+    virtual UInt32   ioRead32( UInt16 offset, IOMemoryMap * map = 0 );
+
+    virtual UInt16   ioRead16( UInt16 offset, IOMemoryMap * map = 0 );
+
+    virtual UInt8    ioRead8(  UInt16 offset, IOMemoryMap * map = 0 );
+
+    // vtable padding
+
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  0 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  1 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  2 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  3 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  4 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  5 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  6 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  7 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  8 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  9 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 10 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 11 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 12 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 13 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 14 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 15 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 16 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 17 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 18 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 19 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 20 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 21 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 22 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 23 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 24 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 25 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 26 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 27 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 28 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 29 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 30 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 31 );
+};
+
+#endif /* !_IOKIT_IOACPIPLATFORMDEVICE_H */
diff --git a/i386/include/IOKit/acpi/IOACPIPlatformExpert.h b/i386/include/IOKit/acpi/IOACPIPlatformExpert.h
new file mode 100644
index 0000000..413f396
--- /dev/null
+++ b/i386/include/IOKit/acpi/IOACPIPlatformExpert.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOACPIPLATFORMEXPERT_H
+#define _IOKIT_IOACPIPLATFORMEXPERT_H
+
+#include <IOKit/IOPlatformExpert.h>           // superclass
+#include <IOKit/acpi/IOACPIPlatformDevice.h>  // children
+
+class IOACPIPlatformExpert : public IODTPlatformExpert
+{
+    OSDeclareAbstractStructors( IOACPIPlatformExpert )
+
+    friend class IOACPIPlatformDevice;
+
+protected:
+    /*! @struct ExpansionData
+        @discussion This structure will be used to expand the capablilties
+                    of the class in the future.
+     */
+    struct ExpansionData { };
+
+    /*! @var reserved
+        Reserved for future use. (Internal use only)
+     */
+    ExpansionData *  reserved;
+
+public:
+    virtual bool     start( IOService * provider );
+
+protected:
+    // Map ACPI event to interrupt event source index
+
+    virtual SInt32   installDeviceInterruptForFixedEvent(
+                                  IOService *  device,
+                                  UInt32       fixedEvent ) = 0;
+
+    virtual SInt32   installDeviceInterruptForGPE(
+                                  IOService *  device,
+                                  UInt32       gpeNumber,
+                                  void *       gpeBlockDevice,
+                                  IOOptionBits options ) = 0;
+
+    // ACPI global lock acquisition
+
+    virtual IOReturn acquireGlobalLock( IOService *             client,
+                                        UInt32 *                lockToken,
+                                        const mach_timespec_t * timeout ) = 0;
+
+    virtual void     releaseGlobalLock( IOService * client,
+                                        UInt32      lockToken ) = 0;
+
+    // ACPI method and object evaluation
+
+    virtual IOReturn validateObject( IOACPIPlatformDevice * device,
+                                     const OSSymbol *       objectName ) = 0;
+
+    virtual IOReturn validateObject( IOACPIPlatformDevice * device,
+                                     const char *           objectName );
+
+    virtual IOReturn evaluateObject( IOACPIPlatformDevice * device,
+                                     const OSSymbol *       objectName,
+                                     OSObject **            result,
+                                     OSObject *             params[],
+                                     IOItemCount            paramCount,
+                                     IOOptionBits           options ) = 0;
+
+    virtual IOReturn evaluateObject( IOACPIPlatformDevice * device,
+                                     const char *           objectName,
+                                     OSObject **            result,
+                                     OSObject *             params[],
+                                     IOItemCount            paramCount,
+                                     IOOptionBits           options );
+
+    // ACPI table
+
+    virtual const OSData * getACPITableData(
+                                     const char * tableName,
+                                     UInt32       tableInstance ) = 0;
+
+    // Address space handler
+
+    virtual IOReturn registerAddressSpaceHandler(
+                                   IOACPIPlatformDevice *    device,
+                                   IOACPIAddressSpaceID      spaceID,
+                                   IOACPIAddressSpaceHandler handler,
+                                   void *                    context,
+                                   IOOptionBits              options ) = 0;
+
+    virtual void     unregisterAddressSpaceHandler(
+                                   IOACPIPlatformDevice *    device,
+                                   IOACPIAddressSpaceID      spaceID,
+                                   IOACPIAddressSpaceHandler handler,
+                                   IOOptionBits              options ) = 0;
+
+    // Address space read/write
+
+    virtual IOReturn readAddressSpace(  UInt64 *             value,
+                                        IOACPIAddressSpaceID spaceID,
+                                        IOACPIAddress        address,
+                                        UInt32               bitWidth,
+                                        UInt32               bitOffset,
+                                        IOOptionBits         options ) = 0;
+
+    virtual IOReturn writeAddressSpace( UInt64               value,
+                                        IOACPIAddressSpaceID spaceID,
+                                        IOACPIAddress        address,
+                                        UInt32               bitWidth,
+                                        UInt32               bitOffset,            
+                                        IOOptionBits         options ) = 0;
+
+    // Device power management
+
+    virtual IOReturn setDevicePowerState( IOACPIPlatformDevice * device,
+                                          UInt32 powerState ) = 0;
+
+    virtual IOReturn getDevicePowerState( IOACPIPlatformDevice * device,
+                                          UInt32 * powerState ) = 0;
+
+    virtual IOReturn setDeviceWakeEnable( IOACPIPlatformDevice * device,
+                                          bool enable ) = 0;
+
+    // vtable padding
+
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  0 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  1 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  2 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  3 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  4 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  5 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  6 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  7 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  8 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  9 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 10 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 11 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 12 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 13 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 14 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 15 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 16 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 17 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 18 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 19 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 20 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 21 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 22 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 23 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 24 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 25 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 26 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 27 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 28 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 29 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 30 );
+    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 31 );
+};
+
+#endif /* !_IOKIT_IOACPIPLATFORMEXPERT_H */
diff --git a/i386/include/IOKit/acpi/IOACPITypes.h b/i386/include/IOKit/acpi/IOACPITypes.h
new file mode 100644
index 0000000..6215cd4
--- /dev/null
+++ b/i386/include/IOKit/acpi/IOACPITypes.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __IOKIT_IOACPITYPES_H
+#define __IOKIT_IOACPITYPES_H
+
+#include <IOKit/IOMessage.h>
+
+extern const IORegistryPlane * gIOACPIPlane;
+extern const OSSymbol *        gIOACPIHardwareIDKey;
+extern const OSSymbol *        gIOACPIUniqueIDKey;
+extern const OSSymbol *        gIOACPIAddressKey;
+extern const OSSymbol *        gIOACPIDeviceStatusKey;
+
+#pragma pack(1)
+
+struct IOACPIAddressSpaceDescriptor {
+    UInt32  resourceType;
+    UInt32  generalFlags;
+    UInt32  typeSpecificFlags;
+    UInt32  reserved1;
+    UInt64  granularity;
+    UInt64  minAddressRange;
+    UInt64  maxAddressRange;
+    UInt64  translationOffset;
+    UInt64  addressLength;
+    UInt64  reserved2;
+    UInt64  reserved3;
+    UInt64  reserved4;
+};
+
+enum {
+    kIOACPIMemoryRange    = 0,
+    kIOACPIIORange        = 1,
+    kIOACPIBusNumberRange = 2
+};
+
+typedef UInt32 IOACPIAddressSpaceID;
+
+enum {
+    kIOACPIAddressSpaceIDSystemMemory       = 0,
+    kIOACPIAddressSpaceIDSystemIO           = 1,
+    kIOACPIAddressSpaceIDPCIConfiguration   = 2,
+    kIOACPIAddressSpaceIDEmbeddedController = 3,
+    kIOACPIAddressSpaceIDSMBus              = 4
+};
+
+/*
+ * Address space operation
+ */
+enum {
+    kIOACPIAddressSpaceOpRead  = 0,
+    kIOACPIAddressSpaceOpWrite = 1
+};
+
+/*
+ * 64-bit ACPI address
+ */
+union IOACPIAddress {
+    UInt64 addr64;
+    struct {
+        unsigned int offset     :16;
+        unsigned int function   :3;
+        unsigned int device     :5;
+        unsigned int bus        :8;
+        unsigned int segment    :16;
+        unsigned int reserved   :16;
+    } pci;
+};
+
+/*
+ * Address space handler
+ */
+typedef IOReturn (*IOACPIAddressSpaceHandler)( UInt32         operation,
+                                               IOACPIAddress  address,
+                                               UInt64 *       value,
+                                               UInt32         bitWidth,
+                                               UInt32         bitOffset,
+                                               void *         context );
+
+/*
+ * ACPI fixed event types
+ */
+enum {
+    kIOACPIFixedEventPMTimer       = 0,
+    kIOACPIFixedEventPowerButton   = 2,
+    kIOACPIFixedEventSleepButton   = 3,
+    kIOACPIFixedEventRealTimeClock = 4
+};
+
+#pragma pack()
+
+/*
+ * FIXME: Move to xnu/iokit to reserve the ACPI family code.
+ */
+#ifndef sub_iokit_acpi
+#define sub_iokit_acpi   err_sub(10)
+#endif
+
+/*
+ * ACPI notify message sent to all clients and interested parties.
+ * The notify code can be read from the argument as an UInt32.
+ */
+#define kIOACPIMessageDeviceNotification  iokit_family_msg(sub_iokit_acpi, 0x10)
+
+/*
+ * ACPI device power states
+ */
+enum {
+    kIOACPIDevicePowerStateD0    = 0,
+    kIOACPIDevicePowerStateD1    = 1,
+    kIOACPIDevicePowerStateD2    = 2,
+    kIOACPIDevicePowerStateD3    = 3,
+    kIOACPIDevicePowerStateCount = 4
+};
+
+#endif /* !__IOKIT_IOACPITYPES_H */
diff --git a/i386/include/IOKit/assert.h b/i386/include/IOKit/assert.h
new file mode 100644
index 0000000..4c56050
--- /dev/null
+++ b/i386/include/IOKit/assert.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_IO_ASSERT_H_
+#define	_IO_ASSERT_H_
+#include <sys/cdefs.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if IOASSERT
+#undef MACH_ASSERT
+#define MACH_ASSERT	1
+#endif
+#include <kern/assert.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#if( !defined( OSCompileAssert ) )
+#	define OSCompileAssert( TEST )     \
+	extern int OSCompileAssertFailed[ ( TEST ) ? 1 : -1 ] __unused;
+#endif
+
+#endif	/* _IO_ASSERT_H_ */
+
diff --git a/i386/include/IOKit/ata/ATADeviceNub.h b/i386/include/IOKit/ata/ATADeviceNub.h
new file mode 100644
index 0000000..db14182
--- /dev/null
+++ b/i386/include/IOKit/ata/ATADeviceNub.h
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ @header ATADeviceNub.h
+ @abstract A concrete implementation of IOATADevice.
+ */
+ 
+#ifndef _ATADEVICENUB_H
+#define _ATADEVICENUB_H
+
+#include <IOKit/IOTypes.h>
+#include "IOATATypes.h"
+#include "IOATADevice.h"
+#include "IOATAController.h"
+
+#include "IOATABusCommand.h"
+
+
+/*!
+@class ATADeviceNub
+@abstract ATADeviceNub is a concrete implementation of IOATADevice.
+@discussion clients of IOATA (disk drivers) should use the interface presented
+by IOATADevice.  Concrete nubs are private to the IOATA family and 
+specific subclasses of IOATADevice are instantiated by controller 
+drivers to provide the abstract interface to clients.
+
+*/
+class ATADeviceNub : public IOATADevice
+{
+    OSDeclareDefaultStructors(ATADeviceNub);
+
+public:
+
+	/*!@function ataDeviceNub
+	@abstract static creator function - used by IOATAControllers to create nubs.
+	*/
+	static ATADeviceNub* ataDeviceNub( IOATAController* provider, ataUnitID unit, ataDeviceType devType);
+ 
+	/*!@function attach
+	@abstract override of IOService method.
+	*/
+    virtual bool attach(IOService* provider );
+ 
+ 
+ 	// overrides from IOATADevice to provide actual client interface
+ 	
+ 
+	/*!@function executeCommand
+	@abstract Submit IO requests 
+	*/
+    virtual IOReturn executeCommand(IOATACommand* command);
+
+	// create and destroy IOATACommands
+	/*!@function allocCommand
+	@abstract create command objects for clients.
+	*/
+	virtual IOATACommand*	allocCommand( void );
+	
+	/*!@function freeCommand
+	@abstract Clients use this method to dispose of command objects.
+	*/
+	virtual void freeCommand( IOATACommand* inCommand); 
+	
+	
+protected:
+	
+    /*!@function init
+	@abstract used after creating the nub.
+	*/
+    virtual bool init(IOATAController* provider, ataUnitID unit, ataDeviceType devType);
+	
+	/*!@function publishProperties
+	@abstract publish the nub's properties in the device tree.
+	*/
+	virtual void publishProperties( void );
+	
+	/*!@function publishBusProperties
+	@abstract puts info about this device's bus capability in the device tree.
+	*/
+	virtual void publishBusProperties(void);
+	
+	/*!@function publishVendorProperties
+	@abstract will be deprecated.
+	*/
+	virtual void publishVendorProperties( void );
+
+	/*!@function getDeviceID
+	@abstract get the unit id of this drive (0 or 1)
+	*/
+	virtual IOReturn getDeviceID(void);
+
+	/*!@function MyATACallback
+	@abstract to be deprecated.
+	*/
+	static void MyATACallback(IOATACommand* command );
+	
+	/*!@function processCallback
+	@abstract to be deprecated.
+	*/
+	void processCallback(IOATACommand* command );
+	
+	/*!@function swapBytes16
+	@abstract to be deprecated.
+	*/
+	void swapBytes16( UInt8* dataBuffer, IOByteCount length);
+    
+    UInt8* buffer;
+	
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the ATADeviceNub in the future.
+    */
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+private:
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 0);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 1);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 2);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 3);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 4);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 5);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 6);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 7);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 8);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 9);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 10);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 11);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 12);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 13);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 14);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 15);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 16);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 17);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 18);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 19);
+    OSMetaClassDeclareReservedUnused(ATADeviceNub, 20);
+
+};
+
+#endif /* !_IOATABUSNUB_H */
diff --git a/i386/include/IOKit/ata/ATATimerEventSource.h b/i386/include/IOKit/ata/ATATimerEventSource.h
new file mode 100644
index 0000000..864fa9e
--- /dev/null
+++ b/i386/include/IOKit/ata/ATATimerEventSource.h
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2001-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _ATATIMEREVENTSOURCE_H
+#define _ATATIMEREVENTSOURCE_H
+
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOTimerEventSource.h>
+
+
+/*!
+@class ATATimerEventSource
+
+@discussion
+Extend the timer event source to allow checking for timer expiration 
+from behind the workloop.
+*/
+
+class ATATimerEventSource : public IOTimerEventSource
+{
+    OSDeclareDefaultStructors(ATATimerEventSource);
+
+	public:
+		
+	/*!@function ataTimerEventSource
+	@abstract  allocate an instance of this type.
+	*/
+    static ATATimerEventSource *
+	ataTimerEventSource(OSObject *owner, Action action = 0);
+	
+	/*!@function hasTimedOut
+	@abstract returns true if the timer has expired since the last enable/disable or setTimeout() or wakeAtTime() call.
+	*/
+	virtual bool hasTimedOut( void );
+		
+	// override to initialize the time out flag.
+  	/*!@function 
+	@abstract 
+	*/
+	virtual bool init(OSObject *owner, Action action = 0);
+
+	/*!@function enable
+	@abstract overrides in order to set/clear the timed out flag
+	*/
+	virtual void enable();
+
+	/*!@function disable
+	@abstract overrides in order to set/clear the timed out flag
+	*/
+	virtual void disable();
+
+	/*!@function wakeAtTime
+	@abstract overrides in order to set/clear the timed out flag
+	*/
+	virtual IOReturn wakeAtTime(UnsignedWide abstime);
+
+	/*!@function cancelTimeout
+	@abstract overrides in order to set/clear the timed out flag
+	*/
+	virtual void cancelTimeout();
+
+protected:
+	
+	enum{  kTimedOutTrue = 'true',
+			kTimedOutFalse = 'fals'
+		};
+	
+	UInt32 hasExpired;
+
+
+	/*!@function myTimeout
+	@abstract my timeout function which sets the timedOut flag atomically.
+	*/
+	static void myTimeout(void *self);
+
+	/*!@function setTimeoutFunc
+	@abstract override to install my timeout function instead of the super's.
+	*/
+    virtual void setTimeoutFunc();
+
+	/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */
+    struct ExpansionData { };
+
+	/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+private:
+    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 0);
+    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 1);
+    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 2);
+    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 3);
+    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 4);
+    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 5);
+    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 6);
+    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 7);
+	
+};
+
+
+#endif /*_ATATIMEREVENTSOURCE_H*/
diff --git a/i386/include/IOKit/ata/IOATABusCommand.h b/i386/include/IOKit/ata/IOATABusCommand.h
new file mode 100644
index 0000000..94b3bca
--- /dev/null
+++ b/i386/include/IOKit/ata/IOATABusCommand.h
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ *
+ *	IOATABusCommand.h
+ *
+ */
+ 
+#ifndef _IOATABUSCOMMAND_H
+#define _IOATABUSCOMMAND_H
+
+#include <IOKit/IOTypes.h>
+#include "IOATATypes.h"
+#include "IOATACommand.h"
+
+
+class IOSyncer;
+
+
+/*!
+
+@class IOATABusCommand
+
+@discussion ATA Device (disk) drivers should use the superclass, IOATACommand 
+and may not derive or use any subclass of IOATACommand. 
+
+IOATABusCommand is the subclass of IOATACommand used by 
+IOATAControllers. Controller classes may override this class to 
+provide additional fields as their needs dictate or may use this 
+as a concrete class if it is sufficient.
+
+IOATAControllers are always paired with specific IOATADevices 
+and each specific subclass of IOATADevice is in turn the factory method 
+for IOATACommands for use by disk drivers.
+
+In this manner, mass-storage device drivers (disk drivers, clients of 
+ATA bus controllers) see only the generalized interface of IOATADevice 
+and the generalized interface of IOATACommand. This provides isolation 
+from specific bus details for disk drivers and offers flexibility to 
+controllers to add per-command fields and state variables for their own 
+internal use.
+
+*/
+
+class IOATABusCommand : public IOATACommand {
+
+	OSDeclareDefaultStructors( IOATABusCommand );
+	
+	public:
+	
+	// data items for use by IOATAController
+	
+	/*! @var queueChain queue header for use by IOATAController. */
+	queue_chain_t	queueChain; 
+
+	/*! @var state state-semaphore for use by IOATAController */
+	UInt32 state;
+	
+	/*! @var syncer IOSyncer for use by IOATAController */
+	IOSyncer* syncer;
+
+
+
+	/*!@function allocateCmd
+	@abstract factory method to create an instance of this class used by subclasses of IOATADevice
+	*/
+	static IOATABusCommand* allocateCmd(void);
+
+	/*!@function zeroCommand
+	@abstract set to blank state, call prior to re-use of this object
+	*/
+	virtual void zeroCommand(void);  	  	  	
+  	
+ 	/*!@function getOpcode
+	@abstract return the command opcode
+	*/
+	virtual ataOpcode getOpcode( void );  
+	
+	/*!@function getFlags
+	@abstract return the flags for this command.
+	*/
+	virtual ataFlags getFlags ( void ); 
+		
+	/*!@function getRegMask
+	@abstract  get the register mask for desired regs
+	*/
+	virtual ataRegMask getRegMask( void );
+	
+	/*!@function getUnit
+	@abstract return the unit id (0 master, 1 slave)
+	*/
+	virtual ataUnitID getUnit( void ); 
+	
+	/*!@function getTimeoutMS
+	@abstract return the timeout value for this command
+	*/
+	virtual UInt32 getTimeoutMS (void ); 
+	
+	/*!@function setResult
+	@abstract set the result code
+	*/
+	virtual void setResult( IOReturn );
+
+	/*!@function getCallbackPtr
+	@abstract return the callback pointer
+	*/
+	virtual IOATACompletionFunction* getCallbackPtr (void ); 
+	
+	
+	/*!@function executeCallback
+	@abstract call the completion callback function
+	*/
+	virtual void executeCallback(void);
+
+	/*!@function getTaskFilePtr
+	@abstract return the taskfile structure pointer.
+	*/
+	virtual ataTaskFile* getTaskFilePtr(void);
+	
+	/*!@function getPacketSize
+	@abstract return the size of atapi packet if any.
+	*/
+	virtual UInt16 getPacketSize(void);
+	
+	/*!@function getPacketData
+	@abstract return pointer to the array of packet data. 
+	*/
+	virtual UInt16*	getPacketData(void);
+	
+	/*!@function getTransferChunkSize
+	@abstract number of bytes between interrupts.
+	*/
+	virtual IOByteCount getTransferChunkSize(void);
+
+	/*!@function setActualTransfer
+	@abstract set the byte count of bytes actually transferred.
+	*/
+	virtual void setActualTransfer ( IOByteCount bytesTransferred );
+	
+	/*!@function getBuffer
+	@abstract get pointer to the memory descriptor for this transaction
+	*/
+	virtual IOMemoryDescriptor* getBuffer ( void);
+	
+	/*!@function getPosition
+	@abstract the position within the memory buffer for the transaction.
+	*/
+	virtual IOByteCount getPosition (void);
+	
+	/*!@function getByteCount
+	@abstract return the byte count for this transaction to transfer.
+	*/
+	virtual IOByteCount getByteCount (void);
+	
+	/*!@function setCommandInUse
+	@abstract mark the command as being in progress.
+	*/
+	virtual void setCommandInUse( bool inUse = true);
+
+
+	protected:
+	
+	//
+	/*!@function init
+	@abstract Zeroes all data, returns false if allocation fails. protected.
+	*/
+  	virtual bool init();  
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+private:
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 1);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 2);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 3);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 4);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 5);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 6);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 7);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 8);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 9);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 10);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 11);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 12);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 13);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 14);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 15);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 16);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 17);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 18);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 19);
+    OSMetaClassDeclareReservedUnused(IOATABusCommand, 20);
+};
+
+#include <IOKit/IODMACommand.h>
+
+class IOATABusCommand64 : public IOATABusCommand
+{
+
+	OSDeclareDefaultStructors( IOATABusCommand64 );
+	
+	public:
+	
+	// new features
+	static IOATABusCommand64* allocateCmd32(void);	
+	virtual IODMACommand* GetDMACommand( void );
+	
+	
+	
+	// overrides for IODMACommand setup
+	virtual void zeroCommand(void);  	 
+	virtual void setBuffer ( IOMemoryDescriptor* inDesc);
+	virtual void setCommandInUse( bool inUse = true);
+	virtual void executeCallback(void);
+
+
+	protected:
+	IODMACommand* _dmaCmd;
+	virtual bool init();  
+	virtual void free();
+};
+
+#endif /*_IOATABUSCOMMAND_H*/
diff --git a/i386/include/IOKit/ata/IOATABusInfo.h b/i386/include/IOKit/ata/IOATABusInfo.h
new file mode 100644
index 0000000..6faec4c
--- /dev/null
+++ b/i386/include/IOKit/ata/IOATABusInfo.h
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOATABUSINFO_H
+#define _IOATABUSINFO_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOTypes.h>
+#include "IOATATypes.h"
+
+/*!
+@class IOATABusInfo
+@discussion used to indicate the capabilities of the bus the device is connected to, PIO and DMA modes supported, etc.
+*/
+
+class IOATABusInfo : public OSObject
+{
+	OSDeclareDefaultStructors( IOATABusInfo );
+	
+	public:
+	
+	/*!@function atabusinfo
+	@abstract factory method
+	*/
+	static IOATABusInfo* atabusinfo(void);
+	
+	/*!@function zeroData
+	@abstract set this object to a blank state.
+	*/
+	virtual void zeroData(void);
+
+	// Used by clients of ATAControllers to find out about the bus
+	// capability.
+
+	/*!@function getSocketType
+	@abstract returns the socket type, internal fixed, media-bay, PC-Card
+	Used by clients of ATAControllers to find out about the bus
+	*/
+	ataSocketType getSocketType( void );  
+
+	/*!@function getPIOModes
+	@abstract returns the bit-significant map of PIO mode(s) supported on the bus. 
+	Used by clients of ATAControllers to find out about the bus.
+	*/
+	UInt8 getPIOModes( void );
+	
+	/*!@function getDMAModes
+	@abstract bit-significant map of DMA mode(s) supported on the bus. 
+	Used by clients of ATAControllers to find out about the bus.
+	*/
+	UInt8 getDMAModes( void );
+	
+	/*!@function getUltraModes
+	@abstract bit-significant map of Ultra mode(s) supported on the bus. 
+	Used by clients of ATAControllers to find out about the bus.
+	*/
+	UInt8 getUltraModes( void );
+	
+	/*!@function getUnits
+	@abstract How many devices are present on bus. 
+	Used by clients of ATAControllers to find out about the bus.
+	*/
+	UInt8 getUnits( void );	 
+
+	/*!@function supportsDMA
+	@abstract  True = DMA supported on bus - inferred by looking at the DMA mode bits.
+	Used by clients of ATAControllers to find out about the bus.
+	*/
+	bool supportsDMA( void );   		
+	
+	/*!@function supportsExtendedLBA
+	@abstract Supports 48-bit LBA if true.
+	Used by clients of ATAControllers to find out about the bus.
+	*/
+	bool supportsExtendedLBA( void );
+	
+	/*!@function maxBlocksExtended
+	@abstract The maximum number of 512-byte blocks this controller supports
+	in a single Extended LBA transfer. Some controllers may be limited to less than 
+	the maximum sector count allowed under extended LBA protocol. 
+	*/
+	UInt16 maxBlocksExtended(void);
+	
+	/*!@function supportsOverlapped
+	@abstract Supports overlapped packet feature set if true. 
+	Used by clients of ATAControllers to find out about the bus.
+	*/
+	bool supportsOverlapped( void );  
+	
+	/*!@function supportsDMAQueued
+	@abstract Supports DMA Queued Feature set if true. 
+	Used by clients of ATAControllers to find out about the bus.
+	*/
+	bool supportsDMAQueued( void ); 
+	
+	
+	// Used by ATAControllers to generate an information object.
+	// Would not be used by disk device drivers normally.
+	// Bus controllers should set these items everytime.
+	
+	/*!@function setSocketType
+	@abstract internal fixed, media-bay, PC-Card. Set by ATAControllers.
+	*/
+	void setSocketType( ataSocketType inSocketType ); 
+	
+	/*!@function setPIOModes
+	@abstract Bit significant map of supported transfer modes. Set by ATAControllers.
+	*/
+	void setPIOModes( UInt8 inModeBitMap);		
+	
+	/*!@function setDMAModes
+	@abstract Bit significant map of supported transfer modes. Set by ATAControllers.
+	*/
+	void setDMAModes( UInt8 inModeBitMap );	
+	
+	/*!@function setUltraModes
+	@abstract Bit significant map of supported transfer modes. Set by ATAControllers.
+	*/
+	void setUltraModes( UInt8 inModeBitMap );	
+	
+	/*!@function setUnits
+	@abstract set to indicate how many devices are on this bus. Set by ATAControllers.
+	*/
+	void setUnits( UInt8 inNumUnits );
+
+	// Optional bus protocols some busses may support
+	/*!@function setExtendedLBA
+	@abstract Set true for supports 48-bit LBA. Set by ATAControllers.
+	*/
+	void setExtendedLBA( bool	inState ); 	
+	
+	/*!function setMaxBlocksExtended 
+	 @abstract value set by controllers to indicate the maximum number of blocks 
+	 allowed in a single transfer of data. Some dma engines may not be capable of supporting the full 
+	 16-bit worth of sector count allowed under 48 bit extended LBA. Default is 256 blocks, same as 
+	 standard ATA. 
+	 */
+	void setMaxBlocksExtended( UInt16 inMaxBlocks);
+	
+	/*!@function setOverlapped
+	@abstract Set true for supports overlapped packet feature set. Set by ATAControllers.
+	*/
+	void setOverlapped( bool inState);  	  
+	
+	/*!@function setDMAQueued
+	@abstract Set true if supports DMA Queued Feature. Set by ATAControllers.
+	*/
+	void setDMAQueued( bool inState);   	//    
+
+	protected:
+
+	UInt8 							_PIOModes;				/* PIO modes supported (bit-significant) */
+	UInt8 							_MultiDMAModes;			/* <--: Multiword DMA modes supported (b-sig) */
+	UInt8 							_UltraDMAModes;			/* <--: Ultra DMA modes supported (b-sig) */
+	bool							_ExtendedLBA;           /* <--: Suppports 48-bit LBA protocol */
+	bool							_Overlapped;			/* <--: Supports overlapped packet feature set */
+	bool							_DMAQueued;				/* <--: Supports DMA Queued Feature set */
+	ataSocketType					_SocketType;			/* <--: Indicates bus is fixed internal, removable media-bay, removable PC-Card or unknown type */
+	UInt8							_numUnits;				/* <--: How many devices on this bus */
+	UInt16							_maxBlocksExtended;
+	
+	protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+ 
+	virtual bool init(); 
+
+private:
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 0);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 1);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 2);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 3);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 4);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 5);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 6);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 7);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 8);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 9);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 10);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 11);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 12);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 13);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 14);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 15);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 16);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 17);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 18);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 19);
+    OSMetaClassDeclareReservedUnused(IOATABusInfo, 20);
+};
+
+
+#endif /* !_IOATABUSINFO_H */
diff --git a/i386/include/IOKit/ata/IOATACommand.h b/i386/include/IOKit/ata/IOATACommand.h
new file mode 100644
index 0000000..773f28a
--- /dev/null
+++ b/i386/include/IOKit/ata/IOATACommand.h
@@ -0,0 +1,478 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ *
+ *	IOATACommand.h
+ *
+ */
+
+#ifndef _IOATACOMMAND_H
+#define _IOATACOMMAND_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOCommand.h>
+#include "IOATATypes.h"
+
+
+class IOExtendedLBA;
+class IOATACommand;
+
+
+/*! @typedef IOATACompletionFunction callback function for ATA disk devices.
+*/
+typedef void (IOATACompletionFunction)(IOATACommand* command );
+
+
+/*!
+@class IOATACommand
+
+@discussion
+Command structure superclass, created and freed only by IOATADevice objects 
+populated by disk device drivers with command parameters
+then submitted for operation to their IOATADevice provider for execution.
+
+IOATACommand is a virtual class, a concrete subclass contains the methods and fields needed 
+by IOATAControllers. Subclasses may be specific to particular controller hardware.
+Disk device drivers will only have visibility to this interface and may not subclass this object.
+Disk device drivers should instead make use of the void* refcon field which the controllers will not 
+touch
+*/
+
+class IOATACommand : public IOCommand {
+
+	OSDeclareAbstractStructors( IOATACommand );
+	
+	public:
+	
+	/*!@function zeroCommand
+	@abstract set to blank state, MUST call prior to re-use of this object
+	*/
+	virtual void zeroCommand(void);  
+	
+	/*!@function setOpcode
+	@abstract command opcode as defined in IOATATypes.
+	*/
+	virtual void setOpcode( ataOpcode inCode);
+
+	/*!@function setFlags
+	@abstract set the flags for this command, as defined in IOATATypes.
+	*/
+	virtual void setFlags( UInt32 inFlags);
+
+	/*!@function setUnit
+	@abstract set the unit number for this command.
+	*/
+	virtual void setUnit( ataUnitID inUnit);
+	
+	/*!@function setTimeoutMS
+	@abstract how long to allow this command to complete, in milliseconds, once issued to
+	 the hardware. if the time period expires, this command will return with a timeout error.
+	*/
+	virtual void setTimeoutMS( UInt32 inMs);
+
+	/*!@function setCallbackPtr
+	@abstract set the function pointer to call when this command completes.
+	*/
+	virtual void setCallbackPtr (IOATACompletionFunction* inCompletion);
+	
+	/*!@function setRegMask
+	@abstract used when accessing registers or reading registers on an error result. Mask is defined
+	in IOATATypes.h
+	*/
+	virtual void setRegMask( ataRegMask mask);
+
+	// memory information
+	// Since ATA hardware is limited in the amount of bytes 
+	// that can be transfered in a command, the disk driver shall supply
+	// a seperate offset and byte count per transfer.
+	// the offset may be any amount. The byte count must be a multiple of the  
+	// sector size of the device, ie, N * 512 bytes for ata hard drives.
+	/*!@function setBuffer
+	@abstract set the IIOMemoryDescriptor for this transaction.
+	*/
+	virtual void setBuffer ( IOMemoryDescriptor* inDesc);
+
+	/*!@function setPosition
+	@abstract used to set an offset into the memory descriptor for this transfer.
+	*/
+	virtual void setPosition (IOByteCount fromPosition);
+
+	/*!@function setByteCount
+	@abstract set the byte count for this transaction. Should agree with the device command and the 
+	memory descriptor in use.
+	*/
+	virtual void setByteCount (IOByteCount numBytes);
+
+	/*!@function setTransferChunkSize
+	@abstract set the size of transfer between intervening interrupts. necessary when doing PIO Read/Write Multiple, etc. so the controller knows when to expect an interrupt during multi-sector data transfers.
+	*/
+	virtual void setTransferChunkSize( IOByteCount chunk = kATADefaultSectorSize);
+	
+	/*!@function setFeatures
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setFeatures( UInt8 in);
+
+	/*!@function getErrorReg
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt8 getErrorReg (void );
+	
+	/*!@function setSectorCount
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setSectorCount( UInt8 in);
+
+	/*!@function getSectorCount
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt8 getSectorCount (void );
+	
+	/*!@function setSectorNumber
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setSectorNumber( UInt8 in);
+
+	/*!@function getSectorNumber
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt8 getSectorNumber (void );
+	
+	/*!@function setCylLo
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setCylLo ( UInt8 in);
+
+	/*!@function getCylLo
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt8 getCylLo (void );
+	
+	/*!@function setCylHi
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setCylHi( UInt8 in);
+
+	/*!@function getCylHi
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt8 getCylHi (void );
+	
+	/*!@function setDevice_Head
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setDevice_Head( UInt8 in);
+
+	/*!@function getDevice_Head
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt8 getDevice_Head (void );
+	
+	/*!@function setCommand
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setCommand ( UInt8 in);
+
+	/*!@function getStatus
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt8 getStatus (void );
+	
+	/*!@function setLBA28
+	@abstract convenience method that sets the taskfile registers into a 28-bit LBA address, with unit selected and LBA bit set. return err if param out of range, return kIOSuccess (kATANoErr) = 0 on return if successful
+	*/
+	virtual IOReturn setLBA28( UInt32 lba, ataUnitID inUnit);
+	
+	/*!@function setPacketCommand
+	@abstract ATAPI command packet max size is 16 bytes. Makes deep copy of data. 
+	*/
+	virtual IOReturn setPacketCommand( UInt16 packetSizeBytes, UInt8* command); 
+	
+	// the following registers are only accessed by register access 
+	// commands. Not by normal command dispatch where they are handled 
+	// by the controller.
+	
+	// not part of task file params. not written to device when sending commands.
+	virtual void setDataReg ( UInt16 in);
+	virtual UInt16 getDataReg (void );
+
+	// not part of taskfile. Not usually used except by controller.
+	virtual void setControl ( UInt8 in);
+	virtual UInt8 getAltStatus (void );
+
+	// return values
+	/*!@function getResult
+	@abstract IOReturn value of the result of this command. ATA family errors are defined in IOATATypes.h
+	*/
+	virtual IOReturn getResult (void);
+
+	/*!@function getBuffer
+	@abstract the IOMemoryDescriptor used in this transaction.
+	*/
+	virtual IOMemoryDescriptor* getBuffer ( void ); 
+
+	/*!@function getActualTransfer
+	@abstract The byte count on the ending result, as best as can be determined by the controller. May be zero, but partial transfer may have occurred on error in some cases.
+	*/
+	virtual IOByteCount getActualTransfer ( void );
+
+	/*!@function getEndStatusReg
+	@abstract the value of the status register on the end of the command.
+	*/
+	virtual UInt8	getEndStatusReg (void);   // always returned
+
+	/*!@function getEndErrorReg
+	@abstract If the error bit was set in the status register, the value of the error register is returned at the end of a command.
+	*/
+	virtual UInt8 	getEndErrorReg( void );   
+
+	/*!@function getCommandInUse
+	@abstract returns true if IOATAController is still in control of the command.
+	*/
+	virtual bool	getCommandInUse( void );  // returns true if IOATAController is using the command.
+	
+	// for use by disk drivers, clients of IOATADevice only.
+	// IOATADevice and IOATAControllers shall not use this field in any manner
+	/*!@var refCon
+	@abstract for use by disk drivers, clients of IOATADevice only. IOATADevice and IOATAControllers shall not use this field in any manner.
+	*/
+	void*	refCon;
+	
+	/*!@var refCon2
+	@abstract for use by disk drivers, clients of IOATADevice only. IOATADevice and IOATAControllers shall not use this field in any manner.
+	*/
+	void* 	refCon2;
+
+	protected:
+  											// < 	return from ATA controllers to disk drivers
+  											//  > 	sent to ATA controllers from disk drivers	
+	ataOpcode			_opCode;			//  >	Command code for the controller.
+	UInt32				_flags;		 		//  > 	Flags for this command
+	ataRegisterImage 	_taskFile;   		// <> 	Taskfile + data and control registers.
+	ATAPICmdPacket		_packet;	 		//  > 	ATAPI packet
+	ataUnitID			_unit;				//  > 	Unit number
+	UInt32				_timeoutMS;			//  > 	timeout command in ms.
+	IOMemoryDescriptor* _desc;        		//  >	Buffer for data may be nil if command transfer no data
+	IOByteCount			_position;			//  >	Position within the descriptor for this command
+	IOByteCount			_byteCount;			//	>	How many bytes to transfer.
+	IOByteCount			_logicalChunkSize;	//  >	How many bytes between intervening interrupts (R/W Multiple)
+	ataRegMask			_regMask;			//  >	Which registers to write or read for reg access commands
+	IOATACompletionFunction*	_callback;  // 	> 	if nil, command is synchronous
+ 
+ 	IOReturn			_result;			// < 	result
+	IOByteCount			_actualByteCount;  	// <	actual bytes transfered.
+ 	UInt8				_status;			// <  	Status register at end of command
+ 	UInt8				_errReg;			// <	Error register at end of command if error bit set.
+	bool				_inUse;				// <	true while IOATAController has possesion of the command
+
+
+	virtual bool		init();
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */
+    struct ExpansionData {IOExtendedLBA* extLBA; };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *fExpansionData;
+	
+	// overrides
+	virtual void free();
+
+
+private:
+    OSMetaClassDeclareReservedUsed(IOATACommand, 0);   // set end result
+    OSMetaClassDeclareReservedUsed(IOATACommand, 1); // get extendedLBAPtr
+    OSMetaClassDeclareReservedUnused(IOATACommand, 2);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 3);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 4);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 5);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 6);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 7);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 8);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 9);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 10);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 11);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 12);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 13);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 14);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 15);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 16);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 17);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 18);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 19);
+    OSMetaClassDeclareReservedUnused(IOATACommand, 20);
+
+public:
+	virtual void setEndResult(UInt8 inStatus, UInt8 endError  );
+	virtual IOExtendedLBA* getExtendedLBA(void);
+	
+
+};
+
+
+/*!
+@class IOExtendedLBA
+
+@discussion
+If 48-bit LBAs are supported, IOExtendedLBA is used to represent a 48-bit LBA.
+The driver examines the ATA identify data to determine if 48-bit addressing is
+supported.
+*/
+
+class IOExtendedLBA : public OSObject
+{
+	OSDeclareDefaultStructors( IOExtendedLBA );
+	
+	public:
+	static IOExtendedLBA* createIOExtendedLBA(IOATACommand* owner);
+	
+	// terminology as established in ATA/ATAPI-6. 
+	// for the extended LBA address
+	
+	/*!@function setLBALow16
+	@abstract convenience method that sets the lower 16 bits of a 48-bit LBA
+	*/
+	virtual void setLBALow16( UInt16 lbaLow);
+	
+	/*!@function getLBALow16
+	@abstract convenience method that gets the lower 16 bits of a 48-bit LBA
+	*/
+	virtual UInt16 getLBALow16 (void);
+
+	/*!@function setLBAMid16
+	@abstract convenience method that sets the middle 16 bits of a 48-bit LBA
+	*/
+	virtual void setLBAMid16 (UInt16 lbaMid);
+
+	/*!@function getLBAMid16
+	@abstract convenience method that gets the middle 16 bits of a 48-bit LBA
+	*/
+	virtual UInt16 getLBAMid16( void );
+	
+	/*!@function setLBAHigh16
+	@abstract convenience method that sets the high 16 bits of a 48-bit LBA
+	*/
+	virtual void setLBAHigh16( UInt16 lbaHigh );
+	
+	/*!@function getLBAHigh16
+	@abstract convenience method that gets the high 16 bits of a 48-bit LBA
+	*/
+	virtual UInt16 getLBAHigh16( void );
+
+	/*!@function setSectorCount16
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setSectorCount16( UInt16 sectorCount );
+	
+	/*!@function getSectorCount16
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt16 getSectorCount16( void );
+	
+	/*!@function setFeatures16
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setFeatures16( UInt16 features );
+	
+	/*!@function getFeatures16
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt16 getFeatures16( void );
+
+	/*!@function setDevice
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setDevice( UInt8 inDevice );
+
+	/*!@function getDevice
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt8 getDevice( void );
+
+	/*!@function setCommand
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual void setCommand( UInt8 inCommand );
+
+	/*!@function getCommand
+	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
+	*/
+	virtual UInt8 getCommand( void );
+
+	/*!@function setExtendedLBA
+	@abstract convenience method that sets the taskfile registers into a 48-bit LBA address, along with sector count, and unit selected and LBA bit set
+	*/
+	virtual void setExtendedLBA( UInt32 inLBAHi, UInt32 inLBALo, ataUnitID inUnit, UInt16 extendedCount, UInt8 extendedCommand);
+	
+	/*!@function getExtendedLBA
+	@abstract convenience method that gets a 48-bit LBA
+	*/
+	virtual void getExtendedLBA(  UInt32* outLBAHi, UInt32* outLBALo );
+
+	/*!@function zeroData
+	@abstract convenience method that zeros out the lba, sector count, features, device, and command member variables
+	*/
+	virtual void zeroData(void);
+	
+	/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties in the future.
+    */
+    struct ExpansionData { };
+
+	/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+
+	protected:
+	
+	IOATACommand* owner;
+	UInt16 lbaLow;
+	UInt16 lbaMid;
+	UInt16 lbaHigh;
+	UInt16 sectorCount;
+	UInt16 features;
+	UInt16 device;
+	UInt16 command;
+	
+	private:
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 0);
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 1);
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 2);
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 3);
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 4);
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 5);
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 6);
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 7);
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 8);
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 9);
+    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 10);
+
+
+};
+
+#endif
diff --git a/i386/include/IOKit/ata/IOATAController.h b/i386/include/IOKit/ata/IOATAController.h
new file mode 100644
index 0000000..3758941
--- /dev/null
+++ b/i386/include/IOKit/ata/IOATAController.h
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+ 
+#ifndef _IOATACONTROLLER_H
+#define _IOATACONTROLLER_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOWorkLoop.h>
+#include "ATATimerEventSource.h"
+
+class IOATADevice;
+class IOATABusCommand;
+class IOATABusInfo;
+class IOATADevConfig;
+
+/*! @class IOATAController
+    @abstract The base class for ata controller family. Provides the interface common to all ata bus controllers.
+    @discussion Subclasses of IOATAController implement drivers for specific bus hardware. Disk devices are clients of 
+    IOATAController and communicate via the IOATABusNub instantiated for each device discovered by the specific IOATAController
+    subclass when it probes hardware.  Via the nub, the ATA Controller provides standard information about bus capability, accepts 
+    requests for transfer mode configuration (timing), accepts requests for IO and bus operations, notifies the device driver about 
+    bus events which may affect the device, such as soft-resets or device removal (ie, media-bay and PC-card) and removal of queued 
+    IO requests which have not been dispatched into the hardware. 
+    
+    @discussion The header doc for this class is incomplete. The source however is heavily commented and should be consulted until 
+    such time as complete header doc is available.
+*/
+
+
+
+class IOATAController : public IOService
+{
+    OSDeclareDefaultStructors(IOATAController);
+
+public:
+
+
+	/*--- Common ATA Controller Interface ---*/
+	// find out bus capability
+	virtual IOReturn provideBusInfo( IOATABusInfo* infoOut);
+
+	// set and get bus timing configuration for a specific unit 
+	virtual IOReturn selectConfig( IOATADevConfig* configRequest, UInt32 unitNumber);
+	virtual IOReturn getConfig( IOATADevConfig* configRequest, UInt32 unitNumber); 
+
+	// The main call puts something on the work loop
+	virtual IOReturn executeCommand( IOATADevice* nub, IOATABusCommand* cmd);	
+
+	
+	
+	/*-- Power Management ---*/
+	
+	// TBD
+
+
+	/*--- Overrides from IOService ---*/
+	virtual bool init(OSDictionary * properties);
+
+	virtual IOService* probe( IOService* provider,	SInt32*	score );
+    virtual bool start( IOService* provider );
+
+
+protected:
+	
+	enum {  	
+			kBusFree = 'free',   // bus is available
+			kBusBusy = 'busy',   // bus is busy with request
+			kQueueOpen = '!lck',  // queue is not locked
+			kQueueLocked = 'LOCK', // queue is frozen and not
+			kImmediateLocked = '!Imd', // immediate commands may not be processed
+			kImmediateOK	=  'Immd'  // immediate commands allowed.
+		};	
+
+	/* Transaction State indicator definition - indicates what action is next*/
+	enum transState {
+		kATAInitial					= 0x00,  // in queue
+		kATAStarted					= 0x01,  // issue taskfile  
+		kATAPICmd					= 0x02,	 // issue packet						
+		kATADataTx					= 0x03,  // data transfer phase
+		kATAStatus					= 0x04,  // read status
+		kATAComplete				= 0x05,  // io complete
+		kATADone					= 0x06   // completion callout called
+	};
+	
+	struct ataDevInfo {
+		ataDeviceType   type;       // ata, atapi, unknown
+		atapiConfig		packetSend; // slow DRQ, IRQ, or fast DRQ for packet
+	};
+	
+
+	struct ataDoubleBuffer
+	{
+		IOPhysicalAddress	physicalBuffer;
+		IOLogicalAddress	logicalBuffer;
+		IOByteCount	bufferSize;
+		
+	};
+
+	
+ 	IOService*					_provider;
+    IOWorkLoop*					_workLoop;
+    IOCommandGate*      		_cmdGate;
+	ATATimerEventSource*			_timer;
+	queue_head_t				_commandQueue;
+	IOATABusCommand*			_currentCommand;
+	UInt32						_busState;
+	UInt32						_queueState;
+	UInt32						_immediateGate;
+	ataUnitID					_selectedUnit;
+	ataDevInfo					_devInfo[2];
+	IOATADevice*				_nub[2];
+	ataDoubleBuffer				_doubleBuffer;
+	
+	IOATARegPtr8				_tfFeatureReg;
+	IOATARegPtr8				_tfSCountReg;
+	IOATARegPtr8				_tfSectorNReg;
+	IOATARegPtr8				_tfCylLoReg;
+	IOATARegPtr8				_tfCylHiReg;
+	IOATARegPtr8				_tfSDHReg;
+	IOATARegPtr8				_tfStatusCmdReg;  
+	IOATARegPtr16				_tfDataReg;
+	IOATARegPtr8				_tfAltSDevCReg;   
+
+	
+	// false if couldn't allocate the per-bus double buffer.
+	// controllers should provide implementation where needed 
+	// for DMA hardware compatibility. The default method provides
+	// a 4K buffer for PIO since MemoryDescriptors do not by default have 
+	// logical addresses in the kernel space.
+	virtual bool allocateDoubleBuffer( void );
+
+	// perform 2-byte endian swap. Only useful on PIO transfers and identify data
+	virtual void swapBytes16( UInt8* dataBuffer, IOByteCount length);
+
+/*! @function handleCommand
+    @abstract Called by executeCommand() to handle the client command
+    from the workloop context.
+    @param command The command code.
+    @param param1 Command parameter.
+    @param param2 Command parameter.
+    @param param3 Command parameter.
+	@result kIOReturnSuccess on success, or an error code otherwise. */
+
+    virtual IOReturn handleCommand( void *     command,
+                                   	void *     param1 = 0,
+                                   	void *     param2 = 0,
+                                   	void *     param3 = 0);
+
+
+/*! @function busCanDispatch
+    @abstract answers whether the bus is in state such that the next command 
+    can be dispatched.
+	@result true - bus is free to issue commands. false - bus cannot issue
+	commands at this time. */
+	virtual bool busCanDispatch( void );
+
+
+/*! @function dispatchNext
+    @abstract Causes the command at the front of the queue to dequeue, made the 
+    current command and begin execution.
+	@result  noErr indicates successful dispatch.  */
+	virtual IOReturn dispatchNext( void );
+
+	// sets the result code, free's the bus state, dispatch next command and execute completion
+	virtual void completeIO( IOReturn commandResult );
+
+	// Command queue handlers.	
+	virtual IOReturn enqueueCommand( IOATABusCommand* command);	
+	virtual IOATABusCommand* dequeueFirstCommand( void );
+
+	// event notifier for clients
+	virtual void executeEventCallouts(  ataEventCode event, ataUnitID unit);
+
+	// default handler for device interrupts.
+	virtual IOReturn handleDeviceInterrupt( void );
+
+
+	// timer functions
+	// starts the timeout on the current command
+	virtual IOReturn startTimer( UInt32 inMS);
+	//disable and clear a running timer.
+	virtual void stopTimer( void );
+	// called when a timeout occurs.
+	virtual void handleTimeout( void );
+	// true if the timer has expired 
+	virtual bool checkTimeout( void );
+
+	// handle IO opcodes
+	virtual IOReturn handleExecIO( void );
+	virtual IOReturn handleRegAccess( void );
+	virtual IOReturn handleBusReset(void);
+	virtual IOReturn handleQueueFlush( void );
+	
+	// various protocol phases
+	virtual IOReturn asyncData(void);
+	virtual IOReturn asyncStatus(void);
+	virtual IOReturn asyncIO(void);
+	virtual IOReturn asyncCommand(void);
+	virtual IOReturn synchronousIO(void);	
+	
+	// hardware access
+	virtual IOReturn selectDevice( ataUnitID unit );
+	virtual IOReturn issueCommand( void );
+	virtual IOReturn writePacket( void );
+	virtual IOReturn softResetBus( bool doATAPI = false );
+	
+	virtual IOReturn startDMA( void );
+	virtual IOReturn stopDMA( void );
+
+	virtual bool ATAPISlaveExists( void );
+	virtual UInt32 scanForDrives( void );
+
+	virtual bool waitForU8Status (UInt8 mask, UInt8 value);
+	
+	virtual IOByteCount readATAPIByteCount( void );
+	virtual void handleOverrun( IOByteCount length);
+	virtual IOReturn registerAccess(bool isWrite);
+	
+	// PIO data transfers
+	virtual IOReturn txDataIn (IOLogicalAddress buf, IOByteCount length);
+	virtual IOReturn txDataOut (IOLogicalAddress buf, IOByteCount length);
+
+	virtual IOATAController::transState	determineATAPIState(void);
+
+	// device should set the controller to the config for this device
+	virtual void selectIOTiming( ataUnitID unit );
+
+	// subclasses MUST implement this function in order to initialize
+	// the pointers to the ATA task file registers during start() time.
+	virtual bool configureTFPointers(void);
+
+	// convert a bit-significant indicator to a numeric value.
+	virtual UInt16 bitSigToNumeric( UInt16 binary);
+
+	// for 48 bit register reading and writing 
+	UInt16 readExtRegister( IOATARegPtr8 inRegister );
+	void writeExtRegister( IOATARegPtr8 inRegister, UInt16 inValue );
+
+	// overrides
+	virtual void free();
+	
+private:
+
+	// used called by the commandgate in executeCommand.
+    static void executeCommandAction(OSObject * owner,
+                                     void *     arg0,
+                                     void *     arg1,
+                                     void *     arg2,
+                                     void *     arg3);
+
+	// callout used by the timer to indicate the timeout failure.
+	static void timeoutOccured(	OSObject *owner, 
+								IOTimerEventSource *sender);
+
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOATAController in the future.
+    */
+    typedef struct ExpansionData
+    {
+    	IOBufferMemoryDescriptor*	_doubleBufferDesc;
+    } ExpansionData;
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+private:
+    OSMetaClassDeclareReservedUnused(IOATAController, 0);
+    OSMetaClassDeclareReservedUnused(IOATAController, 1);
+    OSMetaClassDeclareReservedUnused(IOATAController, 2);
+    OSMetaClassDeclareReservedUnused(IOATAController, 3);
+    OSMetaClassDeclareReservedUnused(IOATAController, 4);
+    OSMetaClassDeclareReservedUnused(IOATAController, 5);
+    OSMetaClassDeclareReservedUnused(IOATAController, 6);
+    OSMetaClassDeclareReservedUnused(IOATAController, 7);
+    OSMetaClassDeclareReservedUnused(IOATAController, 8);
+    OSMetaClassDeclareReservedUnused(IOATAController, 9);
+    OSMetaClassDeclareReservedUnused(IOATAController, 10);
+    OSMetaClassDeclareReservedUnused(IOATAController, 11);
+    OSMetaClassDeclareReservedUnused(IOATAController, 12);
+    OSMetaClassDeclareReservedUnused(IOATAController, 13);
+    OSMetaClassDeclareReservedUnused(IOATAController, 14);
+    OSMetaClassDeclareReservedUnused(IOATAController, 15);
+    OSMetaClassDeclareReservedUnused(IOATAController, 16);
+    OSMetaClassDeclareReservedUnused(IOATAController, 17);
+    OSMetaClassDeclareReservedUnused(IOATAController, 18);
+    OSMetaClassDeclareReservedUnused(IOATAController, 19);
+    OSMetaClassDeclareReservedUnused(IOATAController, 20);
+};
+#endif /* !_IOATACONTROLLER_H */
diff --git a/i386/include/IOKit/ata/IOATADevConfig.h b/i386/include/IOKit/ata/IOATADevConfig.h
new file mode 100644
index 0000000..e5714c3
--- /dev/null
+++ b/i386/include/IOKit/ata/IOATADevConfig.h
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOATADEVCONFIG_H
+#define _IOATADEVCONFIG_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOTypes.h>
+#include "IOATATypes.h"
+#include "IOATABusInfo.h"
+
+
+/*!
+	@class IOATADevConfig 
+	@abstract used for configuring and communicating the desired transfer modes of a device.
+	 A disk driver would typically use this object in conjunction with the 512-bytes of identification 
+	 data from the drive and the IOATABusInfo object for the bus it is connected to.
+	 This object will determine the best matching transfer speeds available.
+	 the device driver will then send a series of Set Features commands to configure the drive
+	 and this object to the bus through the IOATADevice nub in order to configure the optimum transfer mode.
+	 The driver for the disk drive may choose to populate this object with whatever transfer mode 
+	 desired, in the event that a different mode is required.
+	@discussion usually use the initWithBestSelection to make a best mode match.
+	The Mode accessors use bit significance to indicate a selected mode or supported modes(s)
+	ie, 00000001b indicates Mode-0, 00000010b indicates mode 1, etc.
+	Selected mode is indicated by a single set bit. No bit set indicates no mode in that class is selected.
+	ie, a bus will support multiple possible modes, but will only have one mode selected at that time.
+
+*/
+
+class IOATADevConfig : public OSObject {
+
+	OSDeclareDefaultStructors( IOATADevConfig );
+	
+	public:
+	
+	/*!@function atadevconfig
+	@abstract static creator function.
+	*/
+    static	IOATADevConfig* atadevconfig(void);
+    
+   /*!@function initWithBestSelection
+	@abstract Handy initializer: pass the 512-byte result of the Identify Device or 
+    Identify Packet Device in endian-order for your platform (byte-swapped on PPC) 
+    and the IOATABusInfo object for the bus. The object will initialize all fields 
+    and select the best transfer modes that match on bus and device. 
+    If the return value was 0 (success or noErr), then a matching mode is supported.
+    Examine the PIO and UDMA/DMA fields and to generate the apropriate SET FEATURES 
+    parameters for your drive and send this initialised object to the IOATAController 
+    when requesting a speed configuration.
+    failure means no supported transfer modes matched between bus and device info.
+	
+	@param identifyData 512 bytes of data obtained from the device via IDENTIFY DEVICE or IDENTIFY PACKET DEVICE command.
+	@param busInfo pointer to an IOATAbusInfo object obtained from a previous atanub->provideBusInfo() call.
+	@result kIOSuccess (0) when a matching transfer mode is available between the device and controller.
+	*/
+	IOReturn	initWithBestSelection( const UInt16* identifyData, IOATABusInfo* busInfo);
+    
+    // intitialize with the 512 byte data from an ATA device identify command
+	IOReturn assignFromData( const UInt16* identifyData );
+
+	/*!@function setPacketConfig
+	@param packetConfig
+	@abstract 	For ATAPI devices, if the device asserts interrupt after the Packet Command when it is ready to accept the packet, set this value to true (mostly older devices). If the device accepts the packet only by asserting DRQ bit in status, then set this value false. Tells the bus controller whether to wait for packet acceptance or set pending interrupt.
+	*/
+	void setPacketConfig ( atapiConfig packetConfig);
+
+	/*!@function getPacketConfig
+	@result atapiConfig as defined in IOATATypes.h 
+	*/
+	atapiConfig getPacketConfig( void );	
+
+	// The following Mode accessors use bit significance to indicate a selected mode or supported modes(s)
+	// ie, 00000001b indicates Mode-0, 00000010b indicates mode 1, etc.
+	// Selected mode is indicated by a single set bit. No bit set indicates no mode in that class is selected.
+	// ie, a bus will support multiple possible modes, but will only have one mode selected at that time.
+
+	/*!@function setPIOMode
+	@param inModeBitMap bit-significant map of PIO mode
+	*/
+	void setPIOMode( UInt8 inModeBitMap);		// bit-significant map of PIO mode(s)
+	
+	/*!@function getPIOMode
+	@result bit-significant map of PIO mode
+	*/
+	UInt8 getPIOMode( void );
+	
+	/*!@function setDMAMode
+	@param inModeBitMap bit-significant map of DMA mode
+	*/
+	void setDMAMode( UInt8 inModeBitMap );	// bit-significant map of DMA mode(s)
+	
+	/*!@function getDMAMode
+	@result bit-significant map of DMA mode
+	*/
+	UInt8 getDMAMode( void );
+	
+	/*!@function setUltraMode
+	@param inModeBitMap bit-significant map of Ultra mode
+	*/
+	void setUltraMode( UInt8 inModeBitMap );	// bit-significant map of Ultra mode(s)
+
+	/*!@function getUltraMode
+	@result  bit-significant map of Ultra mode
+	*/
+	UInt8 getUltraMode( void );
+	
+	// The following cycle time accessors report cycle times in nanoseconds.
+	// A device requesting a mode should also request a cycle time as reported in the device's identification page.
+	// A bus controller will configure the bus not to exceed (go faster than) the minimum time requested.
+	// When a bus controller reports a mode configuration, the cycle time indicates the busses contract not to go 
+	// faster than. However an actual cycle time may be slower than the indicated time.	
+	/*!@function setPIOCycleTime
+	@param inNS PIO cycle time in nanoseconds. 
+	*/
+	void setPIOCycleTime( UInt16 inNS );
+	
+	/*!@function getPIOCycleTime
+	@result reported PIO CycleTime in nanoseconds. 
+	*/
+	UInt16 getPIOCycleTime( void );
+
+	/*!@function setDMACycleTime
+	@param inNS reported multiword DMA Cycle time in nanoseconds.
+	*/
+	void setDMACycleTime( UInt16 inNS );
+	
+	/*!@function getDMACycleTime
+	@result Reported multiword DMA cycle time in nanoseconds. 
+	*/
+	UInt16 getDMACycleTime( void );
+	
+	// Ultra ATA defines cycle times a device must meet to comply with standards.
+	// No cycle time field is needed.
+
+	// convert bit-significant to numeric value
+	/*!@function bitSigToNumeric
+	@abstract converts a bit-significant field to a numerical value. Note that a bit field of 0x00 has no defined result.
+	@param binary the bit significant field.
+	@result the numerical value of the highest bit set in the field.
+	*/
+	virtual UInt8 bitSigToNumeric( UInt16 binary);
+
+	
+	protected:
+	
+	atapiConfig 					_atapiIRQForPacket;			// enum for bits 5 and 6 of word zero of 
+																// the identify packet device info data for PACKET devices ONLY.
+																// shift word-0 5-bits left, mask 0x03 and these enums apply.
+																// values are:
+																
+																//	kATAPIDRQSlow 	= 0x00   - wait up to 3MS for packet on DRQ
+																//	kATAPIIRQPacket = 0x01,  - device asserts IRQ for packet
+																//	kATAPIDRQFast	= 0x10,  - packet on DRQ within 50us
+																//	kATAPIUnknown   = 0x11   - reserved as of ATA/ATAPI-5
+
+
+
+
+	UInt8 							_ataPIOMode;					/* <->: PIO Mode Timing class bit-significant */
+	UInt16 							_ataPIOCycleTime;			/* <->: Cycle time in ns for PIO mode */
+	UInt8 							_ataMultiDMAMode;			/* <->: Multiple Word DMA Timing Class bit-significant*/
+	UInt16 							_ataMultiCycleTime;			/* <->: Cycle time in ns for Multiword DMA mode */
+	UInt8 							_ataUltraDMAMode;			/* <->: Ultra DMA timing class bit-significant */
+
+	IOReturn						_AssignPIOData( const UInt16* identifyData);
+	IOReturn						_AssignDMAData(const UInt16* identifyData);
+	IOReturn						_AssignUltraData(const UInt16* identifyData);
+	UInt8							_MostSignificantBit( UInt8 inByte);
+
+
+    virtual bool init();  
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+private:
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 0);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 1);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 2);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 3);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 4);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 5);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 6);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 7);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 8);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 9);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 10);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 11);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 12);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 13);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 14);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 15);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 16);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 17);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 18);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 19);
+    OSMetaClassDeclareReservedUnused(IOATADevConfig, 20);
+	
+public:
+
+//some static utility functions to parse the identify data for feature support
+
+  static bool sDriveSupports48BitLBA( const UInt16* identifyData );
+  static UInt32 sDriveExtendedLBASize( UInt32* lbaHi, UInt32* lbaLo, const UInt16* identifyData); // result returned is same as lbaLo. 
+	
+};
+
+
+// header doc info goes here. I find putting it within the delcarations more confusing than putting it all in the bottom of the header.
+
+
+#endif /* !_IOATADEVCONFIG_H */
diff --git a/i386/include/IOKit/ata/IOATADevice.h b/i386/include/IOKit/ata/IOATADevice.h
new file mode 100644
index 0000000..78be513
--- /dev/null
+++ b/i386/include/IOKit/ata/IOATADevice.h
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * IOATADevice.h
+ *
+ * This object implements a relay to an ATA Bus where a drive is attached.
+ */
+
+
+#ifndef _IOATADEVICE_H
+#define _IOATADEVICE_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOTypes.h>
+#include "IOATATypes.h"
+#include "IOATACommand.h"
+#include "IOATABusInfo.h"
+#include "IOATADevConfig.h"
+
+class IOATAController;
+
+
+/*!
+	@class IOATADevice
+	@abstract This object implements a relay to an ATA Bus where a drive is attached.
+	@discussion IOATADevice is the superclass which represents a particular device attached to a particular IOATAController (bus). IOATADevice is the provider for ATA mass-storage device drivers.IOATADevice is the factory for all IOATACommand objects and is responsible for creating and freeing IOATACommands. IOATAControllers will create an instance of IOATADevice for each device physically connected to the ata bus. IOATADevice is virtual and specific subclass should be implemented for particular types of IOATAController. In this manner, controller-specifc IOATACommands may be paired with the proper type of controller.
+*/
+
+class IOATADevice : public IOService
+{
+    OSDeclareDefaultStructors(IOATADevice);
+
+public:
+
+	// 
+	/*!@function getUnitID
+	@abstract Determine whether this device is number 0 or 1 (ie, master/slave)
+	@result ataUnitID - 0 or 1.
+	*/
+	virtual ataUnitID	getUnitID( void );
+
+	// 
+	/*!@function getDeviceType
+	@abstract Find out what kind of device this nub is (ata or atapi)
+	@result ataDeviceType as defined in IOATATypes.h
+	*/
+	virtual ataDeviceType getDeviceType( void );
+
+	// 
+	/*!@function provideBusInfo
+	@abstract Find out the bus capability so the client can choose the features to set and commands to run.
+	@param getInfo a pointer to a valid IOATABusInfo object.
+	@result kIOSuccess (0) and the getInfo object will be filled out by the bus controller with information about the bus.
+	*/
+ 	virtual IOReturn provideBusInfo( IOATABusInfo* getInfo);  
+
+	// 
+	/*!@function selectConfig
+	@abstract Tell the bus what speed to use for your device.
+	@param configRequest pointer to a valid and initialized IOATADevConfig object.
+	@result kIOSuccess (0) if the configuration was succesfully selected.
+	@discussion This should only be called once during a disk drivers start method before registering its availability, and must be called prior to issuing any data IO transactions.
+	*/
+	virtual IOReturn selectConfig( IOATADevConfig* configRequest); 
+
+	// 
+	/*!@function provideConfig
+	@abstract Find out what speed the bus has configured for this unit. 
+	@param configRequest pointer to a valid IOATADevConfig object.
+	@result kIOSuccess (0) on successful completion and configRequest will contain the configuration information. 
+	*/
+	virtual IOReturn provideConfig( IOATADevConfig* configRequest);    
+
+	// Submit IO requests 
+ 	/*!
+ 	@function executeCommand
+	@abstract Submit IO requests
+	@param command pointer to a valid IOATACommand with the command to be executed.
+	@result kIOSuccess (0) if the command was successfully queued in the controller. 
+	*/
+	virtual IOReturn		executeCommand(IOATACommand* command);
+ 
+	// create and destroy IOATACommands
+	/*!
+	@function allocCommand
+	@abstract create IOATACommands. Device drivers should allocate command objects only through this method.
+	@result null if allocation failed. Retain count is one.
+	*/
+	virtual IOATACommand*	allocCommand( void );
+	
+	/*!
+	@function freeCommand
+	@abstract release a command object that is no longer needed. Do not free an object in use and do not release the object anymore times than you have retained it.
+	@param inCommand the command to be released.
+	*/
+	virtual void			freeCommand( IOATACommand* inCommand); 
+
+	// matching stuff for IOBSDInit and so on.	
+	/*!@function matchPropertyTable
+	@abstract matching stuff for IOBSDInit and so on.
+	*/
+	virtual bool matchPropertyTable(OSDictionary * table);
+	
+	/*!@function matchLocation
+	@abstract matching stuff for IOBSDInit and so on.
+	*/
+	virtual IOService* matchLocation(IOService * client);
+	
+	/*!@function matchPropertyTable
+	@abstract matching stuff for IOBSDInit and so on.	
+	*/
+	virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
+
+	// called by controllers when they need to send a message to client drivers.
+	/*!
+	@function notifyEvent
+	@abstract called by controllers when they need to send a message to client (disk) drivers.
+	*/
+	virtual void notifyEvent( UInt32 event );
+
+	
+protected:
+    IOATAController*     _provider;
+    ataUnitID			_unitNumber;  // 0 - master, 1 - slave, -1 = not Valid
+    ataDeviceType		_deviceType;  // ata, atapi, unknown	    
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+private:
+    OSMetaClassDeclareReservedUnused(IOATADevice, 0);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 1);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 2);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 3);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 4);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 5);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 6);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 7);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 8);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 9);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 10);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 11);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 12);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 13);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 14);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 15);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 16);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 17);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 18);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 19);
+    OSMetaClassDeclareReservedUnused(IOATADevice, 20);    
+};
+
+#endif /* !_IOATABUSNUB_H */
diff --git a/i386/include/IOKit/ata/IOATARegI386.h b/i386/include/IOKit/ata/IOATARegI386.h
new file mode 100644
index 0000000..73016ba
--- /dev/null
+++ b/i386/include/IOKit/ata/IOATARegI386.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOATAREGI386_H
+#define _IOATAREGI386_H
+
+#include <libkern/c++/OSObject.h>
+
+/*
+ * IOATAReg: ATA register abstract base class.
+ */
+#define DefineIOATAReg(w)                                   \
+class IOATAReg##w : public OSObject                         \
+{                                                           \
+    OSDeclareAbstractStructors( IOATAReg##w )               \
+                                                            \
+public:                                                     \
+    virtual void operator = (UInt##w rhs) = 0;              \
+    virtual operator UInt##w() const = 0;                   \
+}
+
+DefineIOATAReg( 8 );
+DefineIOATAReg( 16 );
+DefineIOATAReg( 32 );
+
+typedef IOATAReg8  * IOATARegPtr8;
+typedef IOATAReg16 * IOATARegPtr16;
+typedef IOATAReg32 * IOATARegPtr32;
+
+#define IOATARegPtr8Cast(x) (x)
+
+/*
+ * IOATAIOReg: I/O mapped ATA registers.
+ */
+#define DefineIOATAIOReg(w)                                 \
+class IOATAIOReg##w : public IOATAReg##w                    \
+{                                                           \
+    OSDeclareDefaultStructors( IOATAIOReg##w )              \
+                                                            \
+protected:                                                  \
+    UInt16 _address;                                        \
+                                                            \
+public:                                                     \
+    static IOATAIOReg##w * withAddress( UInt16 address );   \
+                                                            \
+    virtual bool initWithAddress( UInt16 address );         \
+    virtual UInt16 getAddress() const;                      \
+                                                            \
+    virtual void operator = (UInt##w rhs);                  \
+    virtual operator UInt##w() const;                       \
+}
+
+DefineIOATAIOReg( 8 );
+DefineIOATAIOReg( 16 );
+DefineIOATAIOReg( 32 );
+
+#endif /* !_IOATAREGI386_H */
diff --git a/i386/include/IOKit/ata/IOATATypes.h b/i386/include/IOKit/ata/IOATATypes.h
new file mode 100644
index 0000000..a3be9dc
--- /dev/null
+++ b/i386/include/IOKit/ata/IOATATypes.h
@@ -0,0 +1,393 @@
+/*
+ * Copyright (c) 2000-2008 Apple, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOATATYPES_H
+#define _IOATATYPES_H
+
+#include <IOKit/IOTypes.h>
+
+
+/*!
+
+@header IOATAtypes.h
+@discussion contains various definitions and constants for use in the IOATAFamily and clients. Header Doc is incomplete at this point, but file is heavily commented.
+
+*/
+// property strings
+#define kATADevPropertyKey "ata device type"
+#define kATATypeATAString "ata"
+#define kATATypeATAPIString "atapi"
+#define kATATypeUnknownString "unknown"
+
+#define kATAVendorPropertyKey "device model"
+#define kATARevisionPropertyKey "device revision"
+#define kATASerialNumPropertyKey "device serial"
+
+#define kATAUnitNumberKey "unit number"
+
+#define kATASocketKey "socket type"
+#define kATAInternalSocketString "internal"
+#define kATAMediaBaySocketString "media-bay"
+#define kATAPCCardSocketString "pccard"
+#define kATAInternalSATAString "serial-ata"
+#define kATASATABayString "sata-bay"
+#define kATAInternalSATA2 "serial-ata-2"
+#define kATASATA2BayString "sata-2-bay"
+#define kATAUnkownSocketString "unknown"
+
+#define kATANotifyOnChangeKey "media-notify"
+
+// allows for porting to non-memory-mapped IO systems, such as x86.
+// for such a platform, create a class and overload the assignment operators
+// so that the correct IO operation is performed and define the type for that architecture port.
+#ifdef __ppc__
+#define IOATARegPtr8 volatile UInt8* 
+#define IOATARegPtr16 volatile UInt16*
+#define IOATARegPtr32 volatile UInt32*
+#define IOATARegPtr8Cast(x) ((IOATARegPtr8)(x))
+#elif defined( __i386__ ) || defined( __x86_64__ )
+#include <IOKit/ata/IOATARegI386.h>
+#else
+#error Unknown machine architecture
+#endif
+
+enum ataSocketType{
+
+	kUnknownSocket	= 0,
+	kInternalATASocket,
+	kMediaBaySocket	,
+	kPCCardSocket,
+	kInternalSATA,
+	kSATABay,
+	kInternalSATA2,
+	kSATA2Bay
+
+} ;
+
+
+enum ataDeviceType {
+
+	kUnknownATADeviceType = 0,
+	kATADeviceType,
+	kATAPIDeviceType
+
+} ;
+
+// enum for bits 5 and 6 of word zero of 
+// the identify packet device info data.
+// shift word-0 5-bits left, mask 0x03 and these enums apply.
+enum atapiConfig {
+
+	kATAPIDRQSlow 	= 0x00,
+	kATAPIIRQPacket = 0x01,
+	kATAPIDRQFast	= 0x10,
+	kATAPIUnknown   = 0x11
+
+};
+
+
+enum ataUnitID {
+
+	kATAInvalidDeviceID			= -1,
+	kATADevice0DeviceID			= 0,							/* aka, Master. Device 0 is the correct terminology */
+	kATADevice1DeviceID			= 1								/* aka, Slave. Device 1 is the correct terminology */
+
+} ;
+
+enum {
+
+	kATADefaultSectorSize = 512
+};
+
+/* Task file definition *** Error Register *** */
+enum {
+	bATABadBlock				= 7,							/* bit number of bad block error bit*/
+	bATAUncorrectable			= 6,							/* bit number of uncorrectable error bit*/
+	bATAMediaChanged			= 5,							/* bit number of media changed indicator*/
+	bATAIDNotFound				= 4,							/* bit number of ID not found error bit*/
+	bATAMediaChangeReq			= 3,							/* bit number of media changed request*/
+	bATACommandAborted			= 2,							/* bit number of command abort bit*/
+	bATATrack0NotFound			= 1,							/* bit number of track not found*/
+	bATAAddressNotFound			= 0,							/* bit number of address mark not found*/
+	mATABadBlock				= 1 << bATABadBlock,			/* Bad Block Detected*/
+	mATAUncorrectable			= 1 << bATAUncorrectable,		/* Uncorrectable Data Error*/
+	mATAMediaChanged			= 1 << bATAMediaChanged,		/* Media Changed Indicator (for removable)*/
+	mATAIDNotFound				= 1 << bATAIDNotFound,			/* ID Not Found*/
+	mATAMediaChangeReq			= 1 << bATAMediaChangeReq,		/* Media Change Requested (NOT IMPLEMENTED)*/
+	mATACommandAborted			= 1 << bATACommandAborted,		/* Aborted Command*/
+	mATATrack0NotFound			= 1 << bATATrack0NotFound,		/* Track 0 Not Found*/
+	mATAAddressNotFound			= 1 << bATAAddressNotFound		/* Address Mark Not Found*/
+};
+
+/* Task file definition *** Features register *** */
+enum {
+	bATAPIuseDMA				= 0,							/* bit number of useDMA bit (ATAPI)*/
+	mATAPIuseDMA				= 1 << bATAPIuseDMA
+};
+
+/* Task file definition *** ataTFSDH Register *** */
+enum {
+	mATAHeadNumber				= 0x0F,							/* Head Number (bits 0-3) */
+	mATASectorSize				= 0xA0,							/* bit 7=1; bit 5 = 01 (512 sector size) <DP4>*/
+	mATADriveSelect				= 0x10,							/* Drive (0 = master, 1 = slave) */
+	mATALBASelect				= 0x40							/* LBA mode bit (0 = chs, 1 = LBA)*/
+};
+
+/* Task file definition *** Status Register *** */
+enum {
+	bATABusy					= 7,							/* bit number of BSY bit*/
+	bATADriveReady				= 6,							/* bit number of drive ready bit*/
+	bATAWriteFault				= 5,							/* bit number of write fault bit*/
+	bATASeekComplete			= 4,							/* bit number of seek complete bit*/
+	bATADataRequest				= 3,							/* bit number of data request bit*/
+	bATADataCorrected			= 2,							/* bit number of data corrected bit*/
+	bATAIndex					= 1,							/* bit number of index mark*/
+	bATAError					= 0,							/* bit number of error bit*/
+	mATABusy					= 1 << bATABusy,				/* Unit is busy*/
+	mATADriveReady				= 1 << bATADriveReady,			/* Unit is ready*/
+	mATAWriteFault				= 1 << bATAWriteFault,			/* Unit has a write fault condition*/
+	mATASeekComplete			= 1 << bATASeekComplete,		/* Unit seek complete*/
+	mATADataRequest				= 1 << bATADataRequest,			/* Unit data request*/
+	mATADataCorrected			= 1 << bATADataCorrected,		/* Data corrected*/
+	mATAIndex					= 1 << bATAIndex,				/* Index mark - NOT USED*/
+	mATAError					= 1 << bATAError				/* Error condition - see error register*/
+};
+
+/* Task file definition *** Device Control Register *** */
+enum {
+	bATADCROne					= 3,							/* bit number of always one bit*/
+	bATADCRReset				= 2,							/* bit number of reset bit*/
+	bATADCRnIntEnable			= 1,							/* bit number of interrupt disable*/
+	mATADCROne					= 1 << bATADCROne,				/* always one bit*/
+	mATADCRReset				= 1 << bATADCRReset,			/* Reset (1 = reset)*/
+	mATADCRnIntEnable			= 1 << bATADCRnIntEnable		/* Interrupt Disable(0 = enabled)*/
+};
+
+
+/* 'ataRegMask' field of the ataRegAccess definition*/
+enum ataRegMask{
+
+	bATAAltSDevCValid			= 14,							/* bit number of alternate status/device cntrl valid bit*/
+	bATAStatusCmdValid			= 7,							/* bit number of status/command valid bit*/
+	bATASDHValid				= 6,							/* bit number of ataTFSDH valid bit*/
+	bATACylinderHiValid			= 5,							/* bit number of cylinder high valid bit*/
+	bATACylinderLoValid			= 4,							/* bit number of cylinder low valid bit*/
+	bATASectorNumValid			= 3,							/* bit number of sector number valid bit*/
+	bATASectorCntValid			= 2,							/* bit number of sector count valid bit*/
+	bATAErrFeaturesValid		= 1,							/* bit number of error/features valid bit*/
+	bATADataValid				= 0,							/* bit number of data valid bit*/
+	mATAAltSDevCValid			= 1 << bATAAltSDevCValid,		/* alternate status/device control valid*/
+	mATAStatusCmdValid			= 1 << bATAStatusCmdValid,		/* status/command valid*/
+	mATASDHValid				= 1 << bATASDHValid,			/* ataTFSDH valid*/
+	mATACylinderHiValid			= 1 << bATACylinderHiValid,		/* cylinder high valid*/
+	mATACylinderLoValid			= 1 << bATACylinderLoValid,		/* cylinder low valid*/
+	mATASectorNumValid			= 1 << bATASectorNumValid,		/* sector number valid*/
+	mATASectorCntValid			= 1 << bATASectorCntValid,		/* sector count valid*/
+	mATAErrFeaturesValid		= 1 << bATAErrFeaturesValid,	/* error/features valid*/
+	mATADataValid				= 1 << bATADataValid			/* data valid*/
+
+} ;
+
+
+enum ataFlags{
+	bATAFlagQuiesce				= 20,
+	bATAFlagNoIRQ				= 19,							/* bit Number of no IRQ protocol flag*/
+	bATAFlag48BitLBA			= 18,
+	bATAFlagDMAQueued			= 17,
+	bATAFlagOverlapped			= 16,
+	bATAFlagUseConfigSpeed		= 15,							/* bit number of use configured speed flag*/
+	bATAFlagByteSwap			= 14,							/* bit number of byte swap flag*/
+	bATAFlagIORead				= 13,							/* bit number of I/O read flag*/
+	bATAFlagIOWrite				= 12,							/* bit number of I/O write flag*/
+	bATAFlagTFAccessResult 		= 8,							/* bit number of get register results on command completion.*/
+	bATAFlagUseDMA				= 7,							/* bit number of use DMA flag*/
+	bATAFlagProtocolATAPI		= 5,							/* bit number of ATAPI protocol*/
+	bATAFlagImmediate			= 1,							/* bit number of immediate flag */
+	bATAFlagTFAccess			= 0,							/* bit number of TF access */
+
+	mATAFlagQuiesce				= 1 << bATAFlagQuiesce,
+	mATAFlagUseNoIRQ			= 1 << bATAFlagNoIRQ,  			/* Special purpose! Avoid using! No-IRQ, polled synchronous protocol valid only for PIO commands*/
+	mATAFlag48BitLBA			= 1 << bATAFlag48BitLBA,		/* Use 48 bit extended LBA protocol on this command. Requires support from the controller.*/
+	mATAFlagDMAQueued			= 1 << bATAFlagDMAQueued,		/* Use tagged dma queuing protocol on this command. Requires support from the controller.*/
+	mATAFlagOverlapped			= 1 << bATAFlagOverlapped,		/* Use overllaped protocol on this command. Requires support from the controller.*/
+	mATAFlagUseConfigSpeed		= 1 << bATAFlagUseConfigSpeed,  /* Use the configured interface speed = true. False = use default PIO (slow) speed. valid only for PIO commands*/
+	mATAFlagByteSwap			= 1 << bATAFlagByteSwap,		/* Swap data bytes (read - after; write - before)*/
+	mATAFlagIORead				= 1 << bATAFlagIORead,			/* Read (in) operation*/
+	mATAFlagIOWrite				= 1 << bATAFlagIOWrite,			/* Write (out) operation*/
+	mATAFlagTFAccessResult		= 1 << bATAFlagTFAccessResult,  /* get contents of TaskFile registers indicated in TFMask on command completion, even if no error*/
+	mATAFlagUseDMA				= 1 << bATAFlagUseDMA,
+	mATAFlagProtocolATAPI		= 1 << bATAFlagProtocolATAPI,	/* ATAPI protocol indicator*/
+	mATAFlagImmediate			= 1 << bATAFlagImmediate,		/* Put command at head of queue */
+	mATAFlagTFAccess			= 1 << bATAFlagTFAccess,		/* Return Taskfile on error status*/
+
+} ;
+
+/* The Function codes sent to controllers*/
+enum ataOpcode {
+
+	kATANoOp = 0, 
+	kATAFnExecIO ,		/* Execute ATA I/O */
+	kATAPIFnExecIO,		/* ATAPI I/O */
+	kATAFnRegAccess ,	/* Register Access */
+
+	kATAFnQFlush ,		/* I/O Queue flush requests for your unit number */
+	kATAFnBusReset 	/* Reset ATA bus */
+
+} ;
+
+
+/* The ATA Event codes */
+/* sent when calling the device driver's event handler*/
+enum ataEventCode {
+	kATANullEvent				= 0x00,							/* Just kidding -- nothing happened*/
+	kATAOnlineEvent				= 0x01,							/* An ATA device has come online*/
+	kATAOfflineEvent			= 0x02,							/* An ATA device has gone offline*/
+	kATARemovedEvent			= 0x03,							/* An ATA device has been removed from the bus*/
+	kATAResetEvent				= 0x04,							/* Someone gave a hard reset to the drive*/
+	kATAOfflineRequest			= 0x05,							/* Someone requesting to offline the drive*/
+	kATAEjectRequest			= 0x06,							/* Someone requesting to eject the drive*/
+	kATAPIResetEvent			= 0x07,							/* Someone gave a ATAPI reset to the drive*/
+	kATAReservedEvent			= 0x80							/* RESERVED*/
+};
+
+
+// These need to be combined with a new enumeration of the current ATA/ATAPI command set.
+// Some opcodes are of interest to ATA controllers, since they imply special protocols 
+// or handling.   Device Reset, Execute Device Diagnostics have subtle side effects that
+// controllers need to be aware of, so we snoop for those commands being issued.
+// the rest are here for informational purposes.
+
+// BUG make new enum for all current ATA commands.
+
+enum {
+	kSOFTRESET	=	0x008,			// ATAPI Soft Reset command
+	kPACKET		=	0x0A0,			// ATAPI Packet command
+	kID_DRIVE	=	0x0A1			// ATAPI Identify drive command
+};
+/* ATA Command Opcode definition*/
+enum {
+	kATAcmdWORetry				= 0x01,							/* Without I/O retry option*/
+	kATAcmdNOP					= 0x0000,						/* NOP operation - media detect*/
+	kATAcmdRecal				= 0x0010,						/* Recalibrate command */
+	kATAcmdRead					= 0x0020,						/* Read command */
+	kATAcmdReadLong				= 0x0022,						/* Read Long command*/
+	kATAcmdReadExtended			= 0x0024,						/* Read Extended (with retries)*/
+	kATAcmdReadDMAExtended		= 0x0025,						/* Read DMA Extended (with retries)*/
+	kATAcmdWrite				= 0x0030,						/* Write command */
+	kATAcmdWriteLong			= 0x0032,						/* Write Long*/
+	kATAcmdWriteExtended		= 0x0034,						/* Write Extended (with retries)*/
+	kATAcmdWriteDMAExtended		= 0x0035,						/* Write DMA Extended (with retries)*/
+	kATAcmdWriteVerify			= 0x003C,						/* Write verify*/
+	kATAcmdReadVerify			= 0x0040,						/* Read Verify command */
+	kATAcmdFormatTrack			= 0x0050,						/* Format Track command */
+	kATAcmdSeek					= 0x0070,						/* Seek command */
+	kATAcmdDiagnostic			= 0x0090,						/* Drive Diagnostic command */
+	kATAcmdInitDrive			= 0x0091,						/* Init drive parameters command */
+	kATAcmdReadMultiple			= 0x00C4,						/* Read multiple*/
+	kATAcmdWriteMultiple		= 0x00C5,						/* Write multiple*/
+	kATAcmdSetRWMultiple		= 0x00C6,						/* Set Multiple for Read/Write Multiple*/
+	kATAcmdReadDMA				= 0x00C8,						/* Read DMA (with retries)*/
+	kATAcmdWriteDMA				= 0x00CA,						/* Write DMA (with retries)*/
+	kATAcmdMCAcknowledge		= 0x00DB,						/* Acknowledge media change - removable*/
+	kATAcmdDoorLock				= 0x00DE,						/* Door lock*/
+	kATAcmdDoorUnlock			= 0x00DF,						/* Door unlock*/
+	kATAcmdStandbyImmed			= 0x00E0,						/* Standby Immediate*/
+	kATAcmdIdleImmed			= 0x00E1,						/* Idle Immediate*/
+	kATAcmdStandby				= 0x00E2,						/* Standby*/
+	kATAcmdIdle					= 0x00E3,						/* Idle*/
+	kATAcmdReadBuffer			= 0x00E4,						/* Read sector buffer command */
+	kATAcmdCheckPowerMode		= 0x00E5,						/* Check power mode command	<04/04/94>*/
+	kATAcmdSleep				= 0x00E6,						/* Sleep*/
+	kATAcmdFlushCache			= 0x00E7,						/* Flush Cache */
+	kATAcmdWriteBuffer			= 0x00E8,						/* Write sector buffer command */
+	kATAcmdWriteSame			= 0x00E9,						/* Write same data to multiple sectors*/
+	kATAcmdFlushCacheExtended	= 0x00EA,						/* Flush Cache Extended */
+	kATAcmdDriveIdentify		= 0x00EC,						/* Identify Drive command */
+	kATAcmdMediaEject			= 0x00ED,						/* Media Eject*/
+	kATAcmdSetFeatures			= 0x00EF						/* Set Features*/
+};
+
+/* Set feature command opcodes*/
+enum {
+	kATAEnableWriteCache		= 0x02,							/*		Enable write cache*/
+	kATASetTransferMode			= 0x03,							/*		Set transfer mode*/
+	kATAEnableAPM				= 0x05,							/* 		Enable Advanced Power Management*/
+	kATASetPIOMode				= 0x08,							/*		PIO Flow Control Tx Mode bit*/
+	kATADisableWriteCache		= 0x82,							/*		disable write cache*/
+	kATAEnableReadAhead			= 0xAA							/*		Read look-ahead enable*/
+};
+
+// revisit the opcode enumerations.
+
+//////////////////////
+
+
+/* task file for ata */
+typedef struct ataTaskFile {
+
+	UInt8 							ataTFFeatures;				/* <-> Error(R) or ataTFFeatures(W) register image */
+	UInt8 							ataTFCount;					/* <-> Sector count/remaining */
+	UInt8 							ataTFSector;				/* <-> Sector start/finish */
+	UInt8 							ataTFCylLo;					/* <-> ataTFCylLo					*/
+	UInt8 							ataTFCylHigh;				/* <-> ataTFCylHigh  */
+	UInt8 							ataTFSDH;					/* <-> ataTFSDH register image*/
+	UInt8 							ataTFCommand;				/* <-> Status(R) or Command(W) register image */
+
+} ataTaskFile;
+
+
+typedef struct ataRegisterImage {
+
+	ataTaskFile						taskFile;
+	UInt16							ataDataRegister;			/* <-> Data register. */
+	UInt8 							ataAltSDevCReg;				/* <->: Alternate status(R) or Device Control(W) register image*/
+
+} ataRegisterImage ;
+
+
+typedef struct ATAPICmdPacket{
+
+	UInt16 							atapiPacketSize;			/* Size of command packet in bytes	*/
+	UInt16 							atapiCommandByte[8];		/* The command packet itself*/
+
+}ATAPICmdPacket;
+
+
+
+// Error and result codes:  TBD
+enum {
+		kATAErrUnknownType = -1,
+		kATANoErr = 0,
+		kATAQueueEmpty = 1,
+		kATAUnknownOpcode,
+		kATATimeoutErr,
+		kATAInvalidDevID,
+		kATAErrDevBusy,
+		kATAModeNotSupported,
+		kATADevIntNoCmd,
+		kATADeviceError,
+		kATADMAErr
+};
+
+
+#endif /* !_IOATATYPES_H */
diff --git a/i386/include/IOKit/ata/IOPCIATA.h b/i386/include/IOKit/ata/IOPCIATA.h
new file mode 100644
index 0000000..62067b2
--- /dev/null
+++ b/i386/include/IOKit/ata/IOPCIATA.h
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+#ifndef _DRV_PCI_ATA_H
+#define _DRV_PCI_ATA_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOTypes.h>
+#include "IOATAController.h"
+#include <IOKit/IOMemoryCursor.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+
+#include <IOKit/IOInterruptEventSource.h>
+
+/*! @class IOPCIATA
+    @abstract The base class for  PCI-IDE ata controller family.
+    @discussion class defining the common elements of bus-mastering PCI ATA controllers which meet or at least loosely follow the pci bus mastering pci-ide controller spec. Header doc is incomplete, but source is heavily commented.
+
+*/
+
+
+
+class IOPCIATA : public IOATAController
+{
+    OSDeclareDefaultStructors(IOPCIATA);
+
+public:
+
+	/*--- Overrides from IOATAController ---*/
+	virtual bool init(OSDictionary * properties);
+    virtual bool start( IOService* provider );
+
+protected:
+
+	// The DMA states: not in use, in use and running with additional passes needed,
+	// in use on final pass, transfer complete, and failure
+	enum ATADMAState 
+	{
+		// DMA state flags
+		kATADMAInactive,
+		kATADMAStarting,
+		kATADMAActive,
+		kATADMAStatus,
+		kATADMAComplete,
+		kATADMAError,
+	
+	};
+	
+	enum {
+		// PRD flags	
+		kLast_PRD =	0x8000,
+		kContinue_PRD = 0,
+	
+	};
+	
+		
+	enum {
+		mBMCmdStartOutput = 0x01,  						// start engine to transfer from memory to device.
+		mBMCmdStartInput = (1 << 3 ) | 0x01,  	// start engine to transfer from device to memory
+		mBMCmdStop = 0x00,								// halt engine.
+	};
+	
+	enum {	
+		// bus master status register definitions.
+		bBMStatusSimplex = 7,  	// 0 = simultaneous transactions allowed. 1 = primary and secondary busses may not be active at same time.
+		bBMStatusDrv1 = 6,     	// 1 = device 1 and bus are already configured by some other software/firmware
+		bBMStatusDrv0 = 5,     	// 1 = device 0 and bus are already configured by some other software/firmware
+		bBMStatusInt = 2,		// 1 = device has asserted INTRQ and all data is flushed to/from memory.
+		bBMStatusError = 1,		// 1 = an error in the DMA has occured. Software clears by writing 1 to this bit.
+		bBMStatusActive = 0,	// 1 = DMA engine is active.
+	};
+	
+	enum{
+	
+		mBMStatusSimplex = 	1 << 7,
+		mBMStatusDrv1 = 	1 << 6,
+		mBMStatusDrv0 = 	1 << 5,
+		mBMStatusInt = 		1 << 2,
+		mBMStatusError = 	1 << 1,
+		mBMStatusActive = 	1
+	};
+		
+	// the physical region descriptor used for the dma engine.
+	struct PRD
+	{
+		UInt32	bufferPtr;		// address
+		UInt16	byteCount;		// 16 bit byte count where 0x0000 = 64K
+		UInt16	flags;			// 0 in flags means contine, 0x80 means stop
+	};	
+
+
+	// descendants of this class MUST initialize these values
+	// prior to activating any DMA command.
+	IOATARegPtr8 _bmCommandReg;
+	IOATARegPtr8 _bmStatusReg;
+	IOATARegPtr32 _bmPRDAddresReg;	
+	
+	// semaphore for DMA state
+	UInt32	_dmaState;
+	
+	// table of PRD descriptors
+	PRD*	_prdTable;
+	IOPhysicalAddress _prdTablePhysical;	
+	
+	IONaturalMemoryCursor*	_DMACursor;		
+
+	// override from IOATAController
+	// activate the DMA engine as per the current command
+	virtual IOReturn startDMA( void );
+
+	// override from IOATAController
+	// safely halt the DMA engine  regardless of state
+	virtual IOReturn stopDMA( void );
+
+	// allocate memory for the PRD descriptors.
+	virtual bool allocDMAChannel(void);
+	
+	// fill CC with stop commands.
+	virtual void initATADMAChains (PRD* descPtr);
+	
+	// fill out a PRD, respecting endianess
+	virtual void setPRD(UInt8 *bffr, UInt16 count, PRD *tableElement, UInt16 end);
+	
+	// setup the CC with IO commands
+	virtual IOReturn createChannelCommands(void);
+	
+	// deallocate memory for the DMA engine
+	virtual bool freeDMAChannel(void);
+	
+	// clean up on device interrupt
+	virtual IOReturn handleDeviceInterrupt(void);
+	
+	// activate the DMA engine
+	virtual void activateDMAEngine(void);
+	
+	// shutdown the DMA engine
+	virtual void stopDMAEngine(void);
+	
+	// safely suspend the DMA engine
+	virtual void shutDownATADMA (void);
+	
+	// overrides
+	virtual void free();
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOPCIATA class in the future.
+    */
+    typedef struct ExpansionData
+    {
+    	IOBufferMemoryDescriptor*	_prdBuffer;
+    } ExpansionData;
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+private:
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 0);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 1);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 2);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 3);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 4);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 5);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 6);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 7);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 8);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 9);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 10);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 11);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 12);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 13);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 14);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 15);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 16);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 17);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 18);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 19);
+    OSMetaClassDeclareReservedUnused(IOPCIATA, 20);
+};
+
+#endif // _DRV_PCI_ATA_H
diff --git a/i386/include/IOKit/ata/MacIOATA.h b/i386/include/IOKit/ata/MacIOATA.h
new file mode 100644
index 0000000..fad6c33
--- /dev/null
+++ b/i386/include/IOKit/ata/MacIOATA.h
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#if defined(__ppc__)
+ 
+ 
+#ifndef _DRV_MACIO_ATA_H
+#define _DRV_MACIO_ATA_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOTypes.h>
+#include "IOATAController.h"
+#include <IOKit/ppc/IODBDMA.h>
+#include <IOKit/IOMemoryCursor.h>
+
+#include <IOKit/IOInterruptEventSource.h>
+
+
+/*! @class MacIOATA
+    @abstract The base class for MAC-IO ata controller family. .
+    @discussion class defining the portions of MacIO ATA cells which are shared
+	in common between Heathrow and Key Largo ATA Cells.
+	These controllers share a common register file layout, interrupt 
+	source format and all use DBDMA engines. These are different from 
+	other ATA controllers, such as most PCI-IDE and PC-Card ATA ports.
+ 	Each cell type has some distinctive features that must be implemented
+	by a specific driver subclass. As much common code as possible is 
+	presented in this superclass.
+
+*/
+
+class MacIOATA : public IOATAController
+{
+    OSDeclareDefaultStructors(MacIOATA);
+
+public:
+
+	/*--- Overrides from IOATAController ---*/
+	virtual bool init(OSDictionary * properties);
+    virtual bool start( IOService* provider );
+	virtual IOReturn message (UInt32 type, IOService* provider, void* argument = 0);
+
+protected:
+
+	// The DMA states: not in use, in use and running with additional passes needed,
+	// in use on final pass, transfer complete, and failure
+	enum ATADMAState 
+	{
+		kATADMAInactive,
+		kATADMAStarting,
+		kATADMAActive,
+		kATADMAStatus,
+		kATADMAComplete,
+		kATADMAError
+	};
+
+
+
+	// the address of the timing register in the controller
+	volatile UInt32* _timingConfigReg;
+	// the timing values to use for each device.
+	UInt32	_timingConfig[2];  
+	
+	// semaphore for DMA state
+	UInt32	_dmaState;
+	
+	// indicates whether a DMA interrupt is expected
+	UInt32 _dmaIntExpected;
+	
+	// pointer to the DMA control register address.
+	volatile IODBDMAChannelRegisters* _dmaControlReg;
+	
+	// mappings to the controller and DMA engine registers
+	// we have to free these when we go away.
+	IOMemoryMap* _baseAddressMap;
+	IOMemoryMap* _dmaBaseMap;
+	
+	// the DBDMA memory cursor
+	IODBDMAMemoryCursor*	_DMACursor;
+	
+	// the DBDMA descriptor table
+	IODBDMADescriptor* _descriptors;
+	IOPhysicalAddress	_descriptorsPhysical;
+	
+	// interrupt event sources
+	IOInterruptEventSource* _devIntSrc;
+	IOInterruptEventSource* _dmaIntSrc;
+	
+	// flag indicating device and dma engine interrupts need 
+	// re-synchronization.
+	
+	bool	_resyncInterrupts;
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+	
+	// overriden to allow synchronization of DMA vs. device interrupts.
+	virtual IOReturn handleDeviceInterrupt(void);
+	// overriden here to allow for reporting of DMA errs
+	virtual IOReturn asyncStatus(void);
+	
+	// overriden here to allow for clean up of DMA resynch flag on timeout.
+	virtual void handleTimeout(void);
+
+
+	// called by the superclass::start method in order to 
+	// find and enable access to the ATA task file.
+	virtual bool configureTFPointers(void);
+
+	// allocate memory for the DMA descriptors.
+	virtual bool allocDMAChannel(void);
+	
+	// fill CC with stop commands.
+	virtual void initATADMAChains (IODBDMADescriptor* descPtr);
+	
+	// setup the CC with IO commands
+	virtual IOReturn createChannelCommands(void);
+	
+	// deallocate memory for the DMA engine
+	virtual bool freeDMAChannel(void);
+	
+	// connect the device (drive) interrupt to our workloop
+	virtual bool createDeviceInterrupt(void);
+
+	// connect the DMA interrupt to our workloop.
+	virtual bool createDMAInterrupt(void);
+
+
+	// override from IOATAController
+	// activate the DMA engine as per the current command
+	virtual IOReturn startDMA( void );
+
+	// override from IOATAController
+	// safely halt the DMA engine  regardless of state
+	virtual IOReturn stopDMA( void );
+
+	// handle the interrupt processing
+	virtual void processDMAInterrupt (void);
+	
+	// activate the DMA engine
+	virtual void activateDMAEngine(void);
+	
+	// shutdown the DMA engine
+	virtual void stopDMAEngine(void);
+	
+	// safely suspend the DMA engine
+	virtual void shutDownATADMA (void);
+	
+	// check the command chain after run to update byte counts
+	// and check for errors
+	virtual bool scanATADMAChain (IOByteCount* byteCount);
+
+
+	// c to c++ glue code.
+	static void deviceInterruptOccurred(OSObject*, IOInterruptEventSource *, int count);
+	static void dmaInterruptOccurred(OSObject*, IOInterruptEventSource *, int count);
+
+	// overrides
+	virtual void free();
+
+	// media bay specific code
+	bool	isMediaBay;
+	bool	isBusOnline;
+	
+	virtual IOReturn executeCommand(IOATADevice* nub, IOATABusCommand* command);
+	virtual IOReturn handleQueueFlush( void );
+	virtual bool checkTimeout( void );
+	static void cleanUpAction(OSObject * owner, void*, void*, void*, void*);
+	virtual void cleanUpBus(void);
+	virtual IOReturn handleBusReset(void);
+	// end media bay specific.
+
+private:
+    OSMetaClassDeclareReservedUnused(MacIOATA, 0);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 1);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 2);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 3);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 4);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 5);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 6);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 7);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 8);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 9);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 10);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 11);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 12);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 13);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 14);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 15);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 16);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 17);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 18);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 19);
+    OSMetaClassDeclareReservedUnused(MacIOATA, 20);
+
+};
+
+#endif // _DRV_MACIO_ATA_H
+
+
+#endif // defined(ppc)
diff --git a/i386/include/IOKit/audio/IOAudioControl.h b/i386/include/IOKit/audio/IOAudioControl.h
new file mode 100644
index 0000000..d1d9019
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioControl.h
@@ -0,0 +1,595 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOAUDIOCONTROL_H
+#define _IOKIT_IOAUDIOCONTROL_H
+
+#include <IOKit/IOService.h>
+#ifndef IOAUDIOFAMILY_SELF_BUILD
+#include <IOKit/audio/IOAudioEngine.h>
+#else
+#include "IOAudioEngine.h"
+#endif
+
+class IOAudioPort;
+class OSDictionary;
+class OSSet;
+class IOAudioUserClient;
+class IOAudioControlUserClient;
+class IOWorkLoop;
+class IOCommandGate;
+
+/*!
+ * @class IOAudioControl
+ * @abstract Represents any controllable attribute of an IOAudioDevice.
+ * @discussion An IOAudioControl instance may belong to one IOAudioPort.  Additionally, it may associated 
+ *  with an IOAudioEngine as a default control for that IOAudioEngine.
+ *
+ *  When its value changes, it sends a notification to the CoreAudio.framework (HAL).  It also makes a call
+ *  to the ValueChangeHandler.
+ *
+ *  The base IOAudioControl class contains a type, a value and a channel ID representing the channel(s) which 
+ *  the control acts on.  It may also contain a readable format for the name of the channel as well as a 
+ *  control ID that can be used to identify unique controls.  Additionally it may contain a subType and a usage.  
+ *  Each type has its own set of possible subTypes.  There currently four different control types defined: 
+ *  kIOAudioControlTypeLevel, kIOAudioControlTypeToggle, kIOAudioControlTypeSelector.  
+ *  Each one is represented by a subclass of IOAudioControl: IOAudioLevelControl, IOAudioToggleControl, 
+ *  IOAudioSelectorControl.  The level control defines a range of allowed values and has 
+ *  a defined subtype of kIOAudioLevelControlSubTypeVolume used to define a volume control.  The toggle control 
+ *  allows for a boolean value and has a defined subtype kIOAudioToggleControlSubTypeMute for a mute control.  The 
+ *  selector control has a list of allowed selections with a value and description for each allowed selection and 
+ *  has the following sub types: kIOAudioSelectorControlSubTypeOutput for an output selector and 
+ *  kIOAudioSelectorControlSubTypeInput for an input selector.  See the subclass documentation for a more 
+ *  complete description of each 
+ * 
+ *  There are enums for default channel ID values and common channel names in IOAudioTypes.h.  The channel ID 
+ *  values are prefixed with 'kIOAudioControlChannelID' and the common channel names are prefixed with
+ *  'kIOAudioControlChannelName'.  All of the attributes of the IOAudioControl are stored in the registry.
+ *  The key used for each attribute is defined in IOAudioTypes.h with the define matching the following
+ *  pattern: 'kIOAudioControl<attribute name>Key'.  For example: kIOAudioControlChannelIDKey.
+ *
+ *  In addition to the existing defined control types, drivers can define their own as well for other purposes.
+ *
+ *  Changes to the IOAudioControl's value made by the CoreAudio.framework are done through the IORegistry.  
+ *  When the CoreAudio.framework initiates a value change, the control receives a setProperties() message. 
+ *  The setProperties() implementation looks for the property 'IOAudioControlValue' and if present, calls 
+ *  setValue() on the driver's IOWorkLoop with the new value.  The setValue() function first checks to see 
+ *  if the new value is different.  If so, it calls performValueChange() to call through to the driver
+ *  to make the change in the hardware.  If that call succeeds the value is changed and the new value is set
+ *  in the registry.  Additionally notifications are sent to all clients that have registered for them.
+ */
+class IOAudioControl : public IOService
+{
+    friend class IOAudioPort;
+    friend class IOAudioDevice;
+    friend class IOAudioEngine;
+    
+    OSDeclareDefaultStructors(IOAudioControl)
+    
+public:
+
+    /*!
+     * @typedef IntValueChangeHandler
+     * @abstract Handler function used to make a notification when a value is to be changed.
+     * @param target Reference supplied when the handler was registered.
+     * @param audioControl The IOAudioControl that is changing.
+	 * @param oldValue The old value of the control.
+     * @param newValue The new value the control is being changed to.
+	 * @result Must return kIOReturnSuccess when the hardware is successfully updated.
+     */
+    typedef IOReturn (*IntValueChangeHandler)(OSObject *target, IOAudioControl *audioControl, SInt32 oldValue, SInt32 newValue);
+    typedef IOReturn (*DataValueChangeHandler)(OSObject *target, IOAudioControl *audioControl, const void *oldData, UInt32 oldDataSize, const void *newData, UInt32 newDataSize);
+    typedef IOReturn (*ObjectValueChangeHandler)(OSObject *target, IOAudioControl *audioControl, OSObject *oldValue, OSObject *newValue);
+    
+protected:
+    /*! @var workLoop 
+        The IOWorkLoop for the audio driver - shared from the IOAudioDevice. 
+    */
+    IOWorkLoop 		*workLoop;
+    /*! @var commandGate 
+        The IOCommandGate for this control - attached to the driver's IOWorkLoop.
+    */
+    IOCommandGate	*commandGate;
+    
+    /*! @var isStarted 
+        Internal state keeping track of when the IOAudioControl has been started. 
+    */
+    bool		isStarted;
+
+    /*! @var controlID 
+        An optional identifier that can be used to identify the control. 
+    */
+    UInt32 		controlID;
+    /*! @var channelID 
+        The ID of the channel this control affects - may be kIOAudioControlChannelIDAll if it represents all channels.
+    */
+    UInt32		channelID;
+    
+    UInt32		type;
+    UInt32		subType;
+    UInt32		usage;
+    
+    OSObject	*value;
+    
+    typedef enum {
+        kIntValueChangeHandler,
+        kDataValueChangeHandler,
+        kObjectValueChangeHandler
+    } ValueChangeHandlerType;
+    
+    ValueChangeHandlerType valueChangeHandlerType;
+
+    union {
+        IntValueChangeHandler		intHandler;
+        DataValueChangeHandler		dataHandler;
+        ObjectValueChangeHandler	objectHandler;
+    } valueChangeHandler;
+    
+    OSObject	*valueChangeTarget;
+    
+    /*! @var clients
+        A list of user clients that have requested value change notifications. 
+    */ 
+    OSSet		*userClients;
+
+protected:
+    struct ExpansionData {
+		IOAudioEngine *				providerEngine;
+		OSArray *					notificationQueue;
+	};
+    
+    ExpansionData *reserved;
+    
+public:
+	// OSMetaClassDeclareReservedUsed(IOAudioControl, 0);
+	virtual void sendChangeNotification(UInt32 notificationType);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioControl, 1);
+    /*!
+	 * @function setReadOnlyFlag
+     * @abstract Call this function to say that a control is read only.
+	 * This call cannot be undone, so if a control is only temporarily unsetable,
+	 * do not use this call but instead return an error from the control handler.
+     */
+	virtual void setReadOnlyFlag();
+
+	// OSMetaClassDeclareReservedUsed(IOAudioControl, 2);
+	virtual void sendQueuedNotifications(void);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioControl, 3);
+    /*!
+     * @function createUserClient
+     * @abstract Creates a new IOAudioControlUserClient instance.
+     * @discussion This function is called by newUserClient() to create a new IOAudioControlUserClient instance.  This function may be overridden by subclasses that need to add functionality
+     *  to the IOAudioControlUserClient.  In that case, they must subclass IOAudioControlUserClient
+     *  and return a new, initialized instance of that subclass.
+	 *  A derived class that requires overriding of createUserClient should override the version with the properties
+	 *  parameter for Intel targets, and without the properties parameter for PPC targets.  The #if __i386__ directive
+	 *  can be used to select between the two behaviors.
+     * @param task The task requesting the new user client.
+     * @param securityID Optional security paramater passed in by the client - ignored.
+     * @param type Optional user client type passed in by the client.
+     * @param newUserClient The IOAudioControlUserClient * must be stored in this param on a successful
+     *  completion.
+     * @param properties A dictionary of additional properties for the connection.
+     * @result Returns kIOReturnSuccess on success.
+     */
+    virtual IOReturn createUserClient(task_t task, void *securityID, UInt32 type, IOAudioControlUserClient **newUserClient, OSDictionary *properties);
+
+private:
+    OSMetaClassDeclareReservedUsed(IOAudioControl, 0);
+    OSMetaClassDeclareReservedUsed(IOAudioControl, 1);
+    OSMetaClassDeclareReservedUsed(IOAudioControl, 2);
+    OSMetaClassDeclareReservedUsed(IOAudioControl, 3);
+
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 4);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 5);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 6);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 7);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 8);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 9);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 10);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 11);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 12);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 13);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 14);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 15);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 16);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 17);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 18);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 19);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 20);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 21);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 22);
+    OSMetaClassDeclareReservedUnused(IOAudioControl, 23);
+    
+public:
+
+    /*!
+     * @function withAttributes
+     * @abstract Static function that allocates a new IOAudioControl with the given attributes.
+     * @param type The type of the control.  Common, known types are defined in IOAudioTypes.h.  They currently
+     *  consist of kIOAudioControlTypeLevel, kIOAudioControlTypeToggle, kIOAudioControlTypeSelector.
+     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
+     * @param channelName An optional name for the channel.  Common names are located in IOAudioDefines.h.  Any name not
+     *  defined in IOAudioDefines.h must be localized in order to be properly displayed in multiple languages.
+     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls
+     * @param subType An optional subType specific to the given type
+     * @param usage An optional value specifying how the control will be used.  Currently defined usages are kIOAudioControlUsageInput, 
+     *  kIOAudioControlUsageOutput and kIOAudioControlUsagePassThru.  This value is used when a control is set as a default control
+     *  on an IOAudioEngine.
+     * @result Returns a newly allocated and initialized IOAudioControl.
+     */
+    static IOAudioControl *withAttributes(UInt32 type,
+                                          OSObject *initialValue,
+                                          UInt32 channelID,
+                                          const char *channelName = 0,
+                                          UInt32 cntrlID = 0,
+                                          UInt32 subType = 0,
+                                          UInt32 usage = 0);
+
+    /*!
+     * @function init
+     * @abstract Initializes a newly allocated IOAudioControl with the given attributes.
+     * @param type The type of the control.  Common, known types are defined in IOAudioTypes.h.  They currently
+     *  consist of kIOAudioControlTypeLevel, kIOAudioControlTypeToggle, kIOAudioControlTypeSelector.
+     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
+     * @param channelName An optional name for the channel.  Common names are located in IOAudioDefines.h.  Any name not
+     *  defined in IOAudioDefines.h must be localized in order to be properly displayed in multiple languages.
+     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls
+     * @param subType An optional subType specific to the given type
+     * @param usage An optional value specifying how the control will be used.  Currently defined usages are kIOAudioControlUsageInput, 
+     *  kIOAudioControlUsageOutput and kIOAudioControlUsagePassThru.  This value is used when a control is set as a default control
+     *  on an IOAudioEngine.
+     * @param properties Standard property list passed to the init() function of any new IOService.  This dictionary
+     *  gets stored in the registry entry for this instance.
+     * @result Returns true on success.
+     */
+    virtual bool init(UInt32 type,
+                      OSObject *initialValue,
+                      UInt32 channelID,
+                      const char *channelName = 0,
+                      UInt32 cntrlID = 0,
+                      UInt32 subType = 0,
+                      UInt32 usage = 0,
+                      OSDictionary *properties = 0);
+                      
+    /*!
+     * @function free
+     * @abstract Frees all of the resources allocated by the IOAudioControl.
+     * @discussion Do not call this directly.  This is called automatically by the system when the instance's
+     *  refcount goes to 0.  To decrement the refcount, call release() on the object.
+     */
+    virtual void free();
+
+    /*!
+     * @function start
+     * @abstract Starts a newly created IOAudioControl.
+     * @discussion This is called automatically by IOAudioPort when addAudioControl() is called or by IOAudioEngine 
+     *  when addDefaultAudioControl() is called.  It will only be called by the first call to either addAudioControl() or
+     *  addDefaultAudioControl().
+     * @param provider The IOAudioPort or IOAudioEngine that owns this control.
+     * @result Returns true on success.
+     */
+    virtual bool start(IOService *provider);
+    
+	virtual bool attachAndStart(IOService *provider);
+
+    /*!
+     * @function getIsStarted
+     * @abstract Returns true after start() has been called.
+     * @discussion Used by IOAudioPort and IOAudioEngine to decide if the control needs to be started.
+     */
+    virtual bool getIsStarted();
+
+    /*!
+     * @function stop
+     * @abstract Stops the control when the provider is going away.
+     * @param provider The IOAudioPort or IOAudioEngine that owns this control.
+     */
+    virtual void stop(IOService *provider);
+    
+    /*!
+     * @function getWorkLoop
+     * @abstract Returns the IOWorkLoop for the whole audio driver.
+     */
+    virtual IOWorkLoop *getWorkLoop();
+
+    /*!
+     * @function getCommandGate
+     * @abstract Returns the IOCommandGate for this IOAudioControl.
+     */
+    virtual IOCommandGate *getCommandGate();
+
+    /*!
+     * @function newUserClient
+     * @abstract Creates a new user client object for this IOAudioControl instance.
+     * @discussion This is called automatically by I/O Kit when a user process opens a connection to this
+     *  IOAudioControl.  This is typically done when the user process needs to register for value change
+     *  notifications.  This implementation allocates a new IOAudioControlUserClient object.  There is no
+     *  need to call this directly.
+	 *  A derived class that requires overriding of newUserClient should override the version with the properties
+	 *  parameter for Intel targets, and without the properties parameter for PPC targets.  The #if __i386__ directive
+	 *  can be used to select between the two behaviors.
+     * @param task The task requesting the new user client.
+     * @param securityID Optional security paramater passed in by the client - ignored.
+     * @param type Optional user client type passed in by the client - 0 for the default user client type.
+     * @param handler The new IOUserClient * must be stored in this param on a successful completion.
+     * @param properties A dictionary of additional properties for the connection.
+     * @result Returns kIOReturnSuccess on success.  May also result kIOReturnError or kIOReturnNoMemory.
+     */
+    virtual IOReturn newUserClient(task_t task, void *securityID, UInt32 type, IOUserClient **handler);
+    virtual IOReturn newUserClient(task_t task, void *securityID, UInt32 type, OSDictionary *properties, IOUserClient **handler);
+
+    /*!
+     * @function createUserClient
+     * @abstract Creates a new IOAudioControlUserClient instance.
+     * @discussion This function is called by newUserClient() to create a new IOAudioControlUserClient instance.  This function may be overridden by subclasses that need to add functionality
+     *  to the IOAudioControlUserClient.  In that case, they must subclass IOAudioControlUserClient
+     *  and return a new, initialized instance of that subclass.
+	 *  A derived class that requires overriding of createUserClient should override the version with the properties
+	 *  parameter for Intel targets, and without the properties parameter for PPC targets.  The #if __i386__ directive
+	 *  can be used to select between the two behaviors.
+     * @param task The task requesting the new user client.
+     * @param securityID Optional security paramater passed in by the client - ignored.
+     * @param type Optional user client type passed in by the client.
+     * @param newUserClient The IOAudioControlUserClient * must be stored in this param on a successful
+     *  completion.
+     * @result Returns kIOReturnSuccess on success.
+     */
+    virtual IOReturn createUserClient(task_t task, void *securityID, UInt32 type, IOAudioControlUserClient **newUserClient);
+    
+    /*!
+     * @function clientClosed
+     * @abstract Called automatically by the IOAudioControlUserClient when a user client closes its
+     *  connection to the control.
+     * @param client The user client object that has disconnected.
+     */
+    virtual void clientClosed(IOAudioControlUserClient *client);
+
+    /*!
+     * @function setProperties
+     * @abstract Changes a property of this IOService. 
+     * @discussion This is called when the user client changes a property of this 
+     *  IOAudioControl.  In this case it is used to change the value.  This function
+     *  looks for that property and then calls setValue() through the IOCommandGate and
+     *  setValueAction().
+     * @param properties An OSDictionary containing the properties to change.
+     * @result Returns kIOReturnSuccess on success.
+     */
+    virtual IOReturn setProperties(OSObject *properties);
+    
+    virtual void setValueChangeHandler(IntValueChangeHandler intValueChangeHandler, OSObject *target);
+    virtual void setValueChangeHandler(DataValueChangeHandler dataValueChangeHandler, OSObject *target);
+    virtual void setValueChangeHandler(ObjectValueChangeHandler objectValueChangeHandler, OSObject *target);
+
+    virtual void setValueChangeTarget(OSObject *target);
+
+    /*!
+     * @function flushValue
+     * @abstract Forces the control to be flushed out to the hardware.
+     * @discussion This function calls performValueChange() directly with the current value of the IOAudioControl.
+     * @result Returns the result of performValueChange() - kIOReturnSuccess on success.
+     */
+    virtual IOReturn flushValue();
+
+    /*!
+     * @function setValueAction
+     * @abstract IOCommandGate Action which calls setValue() while holding the IOCommandGate.
+     * @discussion This is needed to allow setValue() to be called on the IOWorkLoop.
+     * @param owner The owner of the IOCommandGate (the IOAudioControl in this case).
+     * @param arg1 The new value for the IOAudioControl.
+     * @result Returns the result of setValue() - kIOReturnSuccess on success.
+     */
+    static IOReturn setValueAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+
+	static IOReturn _setValueAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+	
+    /*!
+     * @function setValue
+     * @abstract Sets the value for this control.
+     * @discussion When the control's value is changed, a call is made to performValueChange().  If that call
+     *  succeeds, the value is set and sendValueChangeNotification() is called to send a notification to the
+     *  user clients.  This function must be called on the IOWorkLoop.
+     * @param newValue The new value for this control.
+     * @result Returns kIOReturnSuccess if the value is successfully set.
+     */
+    virtual IOReturn setValue(OSObject *newValue);
+    
+    virtual IOReturn setValue(SInt32 intValue);
+    
+    /*!
+     * @function hardwareValueChanged
+     * @abstract Updates the value for this control and sends out the value changed notification.
+     * @discussion This is designed to be called by the driver when it detects that the hardware's value has
+     *  changed without driver intervention (e.g. when an external event causes the change).  The difference between
+     *  hardwareValueChanged() and setValue() is that hardwareValueChanged() doesn't call performValueChange() which 
+     *  sends a message back to the driver to cause it to change the hardware with the new value.  This function must
+     *  be called on the IOWorkLoop.
+     * @param newValue The new value for this control.
+     * @result Returns kIOReturnSuccess if the value is successfully updated.
+     */
+    virtual IOReturn hardwareValueChanged(OSObject *newValue);
+
+    /*!
+     * @function getValue 
+     * @abstract Returns the current value of the control.
+     */
+    virtual OSObject *getValue();
+    virtual SInt32 getIntValue();
+    virtual const void *getDataBytes();
+    virtual UInt32 getDataLength();
+
+    /*!
+     * @function getControlID 
+     * @abstract Returns the control ID for the control.
+     */
+    virtual UInt32 getControlID();
+
+    /*!
+     * @function getChannelID 
+     * @abstract Returns the channel ID for the control.
+     */
+    virtual UInt32 getChannelID();
+    
+    virtual UInt32 getType();
+    virtual UInt32 getSubType();
+    virtual UInt32 getUsage();
+
+    virtual void setCoreAudioPropertyID(UInt32 propertyID);
+
+	void setWorkLoop(IOWorkLoop *wl);
+
+protected:
+    /*!
+     * @function sendValueChangeNotification
+     * @abstract Called when the value has changed for the control.
+     * @discussion This function sends out the value change notification to the user clients.
+     */
+    virtual void sendValueChangeNotification();
+    
+    /*!
+     * @function setChannelName 
+     * @abstract Called at init time to set the channel name for this IOAudioControl.
+     */
+    virtual void setChannelName(const char *channelName);
+
+    /*!
+     * @function setChannelID 
+     * @abstract Called at init time to set the channel ID for this IOAudioControl.
+     */
+    virtual void setChannelID(UInt32 newChannelID);
+    virtual void setChannelNumber(SInt32 channelNumber);
+
+    /*!
+     * @function setSubType 
+     * @abstract Called at init time to set the control subType.
+     */
+    virtual void setType(UInt32 type);
+
+    /*!
+     * @function setType 
+     * @abstract Called at init time to set the control type.
+     */
+    virtual void setSubType(UInt32 subType);
+
+    /*!
+     * @function setUsage 
+     * @abstract Called at init time to set the control usage.
+     */
+    virtual void setUsage(UInt32 usage);
+
+    /*!
+     * @function setControlID
+     * @abstract Sets the controlID for this control.
+     * @discussion The control ID is an optional attribute that can be used to track IOAudioControls.  A typical
+     *  use is for the IOAudioDevice to assign a unique controlID to each control that it creates and then
+     *  do a switch statement on the id of the control when it gets an audioControlValueChanged() notification.
+     *  Typically the control ID is set when the object is created and doesn't need to be called again.
+     * @param cntrlID The control ID for the control.
+     */
+    virtual void setControlID(UInt32 cntrlID);
+    
+    /*!
+     * @function validateValue
+     * @abstract Called by setValue() to verify that the value is valid.
+     * @param newValue The new value to be verified.
+     * @result Returns kIOReturnSuccess if the value is valid.
+     */
+    virtual IOReturn validateValue(OSObject *newValue);
+    
+    /*!
+     * @function updateValue
+     * @abstract Called by setValue() in order to update the value and the registry.
+     * @discussion It also calls
+     *  sendValueChangedNotification() to send notifications to the user clients.
+     * @param newValue The new value to b updated.
+     * @result Returns kIOReturnSuccess if the value is successfully updated.
+     */
+    virtual IOReturn updateValue(OSObject *newValue);
+    
+    virtual IOReturn _setValue(OSObject *newValue);
+
+    /*!
+     * @function performValueChange
+     * @abstract Called by setValue() to make the call to the valueChangeHandler
+     *  to update the hardware.
+     * @result Returns the result of the handler call (or kIOReturnError on an error).
+     */
+    virtual IOReturn performValueChange(OSObject *newValue);
+
+    /*!
+     * @function addUserClientAction
+     * @abstract IOCommandGate Action which calls addUserClient() while holding the IOCommandGate.
+     * @discussion This is needed to allow addUserClient() to be called on the IOWorkLoop.
+     * @param owner The owner of the IOCommandGate (the IOAudioControl in this case).
+     * @param arg1 The IOAudioControlUserClient to be added.
+     * @result Returns the result of addUserClient() - kIOReturnSuccess on success.
+     */
+    static IOReturn addUserClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+    
+	static IOReturn _addUserClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+
+    /*!
+     * @function removeUserClientAction
+     * @abstract IOCommandGate Action which calls removeUserClient() while holding the IOCommandGate.
+     * @discussion This is needed to allow removeUserClient() to be called on the IOWorkLoop.
+     * @param owner The owner of the IOCommandGate (the IOAudioControl in this case).
+     * @param arg1 The IOAudioControlUserClient to be removed.
+     * @result Returns the result of removeUserClient() - kIOReturnSuccess on success.
+     */
+    static IOReturn removeUserClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+    
+	static IOReturn _removeUserClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+
+    /*!
+     * @function detachUserClientsAction
+     */
+     static IOReturn detachUserClientsAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+
+    /*!
+     * @function addUserClient
+     * @abstract Called on the IOWorkLoop to add a new IOAudioControlUserClient.
+     * @discussion There is no need to call this directly.  It is called on the workLoop 
+     *  by newUserClient() through addUserClientAction().
+     * @param newUserClient The IOAudioControlUserClientto be added.
+     * @result Returns kIOReturnSuccess on success.
+     */
+    virtual IOReturn addUserClient(IOAudioControlUserClient *newUserClient);
+    
+    /*!
+     * @function removeUserClient
+     * @abstract Called on the IOWorkLoop to remove an IOAudioControlUserClient.
+     * @discussion This is called on the IOWorkLoop by clientClosed() through
+     *  removeUserClientAction() when the user client is going away.  It should
+     *  not be called directly. 
+     * @param userClient The IOAudioControlUserClient to be removed.
+     * @result Returns kIOReturnSuccess on success.
+     */
+    virtual IOReturn removeUserClient(IOAudioControlUserClient *userClient);
+    
+    virtual IOReturn detachUserClients();
+
+};
+
+#endif /* _IOKIT_IOAUDIOCONTROL_H */
+
diff --git a/i386/include/IOKit/audio/IOAudioControlUserClient.h b/i386/include/IOKit/audio/IOAudioControlUserClient.h
new file mode 100644
index 0000000..4ceb05f
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioControlUserClient.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOAUDIOCONTROLUSERCLIENT_H
+#define _IOKIT_IOAUDIOCONTROLUSERCLIENT_H
+
+#include <IOKit/IOUserClient.h>
+
+#ifndef IOAUDIOFAMILY_SELF_BUILD
+#include <IOKit/audio/IOAudioTypes.h>
+#else
+#include "IOAudioTypes.h"
+#endif
+
+class IOAudioControl;
+
+class IOAudioControlUserClient : public IOUserClient
+{
+    OSDeclareDefaultStructors(IOAudioControlUserClient)
+    
+protected:
+    task_t 				clientTask;
+    IOAudioControl *			audioControl;
+    IOAudioNotificationMessage *	notificationMessage;
+
+    virtual IOReturn clientClose();
+    virtual IOReturn clientDied();
+
+protected:
+    struct ExpansionData { };
+    
+    ExpansionData *reserved;
+
+public:
+	virtual void sendChangeNotification(UInt32 notificationType);
+    // OSMetaClassDeclareReservedUsed(IOAudioControlUserClient, 1);
+    virtual bool initWithAudioControl(IOAudioControl *control, task_t owningTask, void *securityID, UInt32 type, OSDictionary *properties);
+
+private:
+    OSMetaClassDeclareReservedUsed(IOAudioControlUserClient, 0);
+    OSMetaClassDeclareReservedUsed(IOAudioControlUserClient, 1);
+
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 2);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 3);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 4);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 5);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 6);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 7);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 8);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 9);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 10);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 11);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 12);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 13);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 14);
+    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 15);
+
+public:
+    static IOAudioControlUserClient *withAudioControl(IOAudioControl *control, task_t clientTask, void *securityID, UInt32 type);
+    static IOAudioControlUserClient *withAudioControl(IOAudioControl *control, task_t clientTask, void *securityID, UInt32 type, OSDictionary *properties);
+
+    virtual bool initWithAudioControl(IOAudioControl *control, task_t owningTask, void *securityID, UInt32 type);
+	
+    virtual void free();
+
+    virtual IOReturn registerNotificationPort(mach_port_t port, UInt32 type, UInt32 refCon);
+
+    virtual void sendValueChangeNotification();
+};
+
+#endif /* _IOKIT_IOAUDIOCONTROLUSERCLIENT_H */
diff --git a/i386/include/IOKit/audio/IOAudioDebug.h b/i386/include/IOKit/audio/IOAudioDebug.h
new file mode 100644
index 0000000..04b744e
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioDebug.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOAUDIODEBUG_H
+#define _IOAUDIODEBUG_H
+
+#ifdef DEBUG
+	#define DEBUG_LEVEL 1
+	#define DEBUG_USE_FIRELOG 1
+	
+	#ifdef DEBUG_USE_FIRELOG
+	#include <IOKit/firewire/FireLog.h>
+	#define audioDebugIOLog( level, message... ) \
+		do {FireLog(  message ); FireLog("\n");} while (0)
+			
+	#else
+	#include <IOKit/usb/IOUSBLog.h>
+	#define audioDebugIOLog( level, message... ) \
+		do {USBLog( level, message );} while (0)
+	#endif
+
+
+
+	#ifdef assert
+		#undef assert
+
+		#define AssertionMessage( cond, file, line ) \
+			"assert \"" #cond "\" failed in " #file " at line " #line
+
+		#define AssertionFailed( cond, file, line ) \
+			panic(AssertionMessage( cond, file, line ));
+
+		#define	assert( cond )								\
+			if( !(cond) ) {									\
+				AssertionFailed( cond, __FILE__, __LINE__ )	\
+			}
+	#endif
+#else
+	#define audioDebugIOLog( level, message... ) ;
+#endif
+
+#endif /* _IOAUDIODEBUG_H */
diff --git a/i386/include/IOKit/audio/IOAudioDefines.h b/i386/include/IOKit/audio/IOAudioDefines.h
new file mode 100644
index 0000000..068267a
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioDefines.h
@@ -0,0 +1,465 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOAUDIODEFINES_H
+#define _IOAUDIODEFINES_H
+
+#define kIOAudioDeviceClassName		"IOAudioDevice"
+#define kIOAudioEngineClassName		"IOAudioEngine"
+#define kIOAudioStreamClassName		"IOAudioStream"
+#define kIOAudioPortClassName		"IOAudioPort"
+#define kIOAudioControlClassName	"IOAudioControl"
+
+/*!
+ * @defined kIOAudioSampleRateKey
+ * @abstract The key in the IORegistry for the IOAudioEngine sample rate attribute
+ * @discussion This value is represented as an integer in samples per second.
+ */
+#define kIOAudioSampleRateKey				"IOAudioSampleRate"
+
+#define kIOAudioSampleRateWholeNumberKey	"IOAudioSampleRateWholeNumber"
+#define kIOAudioSampleRateFractionKey		"IOAudioSampleRateFraction"
+
+
+
+/******
+ *
+ * IOAudioDevice  defines
+ *
+ *****/
+
+
+/*!
+ * @defined kIOAudioDeviceNameKey
+ * @abstract The key in the IORegistry for the IOAudioDevice name attribute.
+ */
+#define kIOAudioDeviceNameKey				"IOAudioDeviceName"
+
+#define kIOAudioDeviceShortNameKey			"IOAudioDeviceShortName"
+
+/*!
+ * @defined kIOAudioDeviceManufacturerNameKey
+ * @abstract The key in the IORegistry for the IOAudioDevice manufacturer name attribute.
+ */
+#define kIOAudioDeviceManufacturerNameKey	"IOAudioDeviceManufacturerName"
+
+#define kIOAudioDeviceLocalizedBundleKey	"IOAudioDeviceLocalizedBundle"
+
+#define kIOAudioDeviceTransportTypeKey		"IOAudioDeviceTransportType"
+
+#define kIOAudioDeviceConfigurationAppKey	"IOAudioDeviceConfigurationApplication"
+
+#define kIOAudioDeviceCanBeDefaults			"IOAudioDeviceCanBeDefaults"
+
+#define kIOAudioDeviceModelIDKey			"IOAudioDeviceModelID"
+
+
+/*!
+ * @defined kIOAudioDeviceIconName
+ * @abstract The key in the IORegistry for the IOAudioDevice icon name attribute.
+ */
+#define kIOAudioDeviceIconNameKey		"IOAudioDeviceIconName"
+
+#define kIOAudioDeviceIconTypeKey		"IOAudioDeviceIconType"
+
+#define kIOAudioDeviceIconSubDirKey	"IOAudioDeviceIconSubDir"
+
+/*****
+ *
+ * IOAudioEngine defines
+ *
+ *****/
+
+
+ /*!
+ * @defined kIOAudioEngineStateKey
+ * @abstract The key in the IORegistry for the IOAudioEngine state atrribute
+ * @discussion The value for this key may be one of: "Running", "Stopped" or "Paused".  Currently the "Paused"
+ *  state is unimplemented.
+ */
+#define kIOAudioEngineStateKey		"IOAudioEngineState"
+
+/*!
+ * @defined kIOAudioEngineOutputSampleLatencyKey
+ * @abstract The key in the IORegistry for the IOAudioEngine output sample latency key
+ * @discussion 
+ */
+#define kIOAudioEngineOutputSampleLatencyKey		"IOAudioEngineOutputSampleLatency"
+
+/*!
+ * @defined kIOAudioStreamSampleLatencyKey
+ * @abstract The key in the IORegistry for the IOAudioStream output sample latency key
+ * @discussion Tells the HAL how much latency is on a particular stream.  If two streams
+ * on the same engine have different latencies (e.g. one is analog, one is digital), then
+ * set this property on both streams to inform the HAL of the latency differences.  Alternately,
+ * you can set the engine latency, and just include the latency additional to that for the particular
+ * stream.  The HAL will add the engine and stream latency numbers together to get the total latency.
+ */
+#define kIOAudioStreamSampleLatencyKey				"IOAudioStreamSampleLatency"
+
+#define kIOAudioEngineInputSampleLatencyKey			"IOAudioEngineInputSampleLatency"
+
+#define kIOAudioEngineSampleOffsetKey				"IOAudioEngineSampleOffset"
+
+#define kIOAudioEngineInputSampleOffsetKey			"IOAudioEngineInputSampleOffset"
+
+#define kIOAudioEngineNumSampleFramesPerBufferKey	"IOAudioEngineNumSampleFramesPerBuffer"
+
+#define kIOAudioEngineCoreAudioPlugInKey			"IOAudioEngineCoreAudioPlugIn"
+
+#define kIOAudioEngineNumActiveUserClientsKey		"IOAudioEngineNumActiveUserClients"
+
+#define kIOAudioEngineUserClientActiveKey			"IOAudioEngineUserClientActive"
+
+#define kIOAudioEngineGlobalUniqueIDKey				"IOAudioEngineGlobalUniqueID"
+
+#define kIOAudioEngineDescriptionKey				"IOAudioEngineDescription"
+
+#define kIOAudioEngineClockIsStableKey				"IOAudioEngineClockIsStable"
+
+#define kIOAudioEngineClockDomainKey				"IOAudioEngineClockDomain"
+
+#define kIOAudioEngineIsHiddenKey               "IOAudioEngineIsHidden"
+/*!
+ * @defined kIOAudioEngineFullChannelNamesKey
+ * @abstract The key in the IORegistry for the IOAudioEngine's dictionary of fully constructed names for each channel keyed by the device channel
+ * @discussion 
+ */
+#define	kIOAudioEngineFullChannelNamesKey			"IOAudioEngineChannelNames"
+
+/*!
+ * @defined kIOAudioEngineFullChannelNamesKey
+ * @abstract The key in the IORegistry for the IOAudioEngine's dictionary of category names for each channel keyed by the device channel
+ * @discussion 
+ */
+#define	kIOAudioEngineFullChannelCategoryNamesKey	"IOAudioEngineChannelCategoryNames"
+
+/*!
+ * @defined kIOAudioEngineFullChannelNamesKey
+ * @abstract The key in the IORegistry for the IOAudioEngine's dictionary of number names for each channel keyed by the device channel
+ * @discussion 
+ */
+#define	kIOAudioEngineFullChannelNumberNamesKey			"IOAudioEngineChannelNumberNames"
+
+#define	kIOAudioEngineFullChannelNameKeyInputFormat		"InputChannel%u"
+
+#define	kIOAudioEngineFullChannelNameKeyOutputFormat	"OutputChannel%u"
+
+#define kIOAudioEngineFlavorKey							"IOAudioEngineFlavor"
+
+#define	kIOAudioEngineAlwaysLoadCoreAudioPlugInKey		"IOAudioEngineAlwaysLoadCoreAudioPlugIn"
+
+/*!
+ * @defined kIOAudioEngineInputChannelLayoutKey
+ * @abstract The key in the IORegistry for the IOAudioEngine's dictionary describes an array of OSNumber data that describe the spatial position of each channel.  See IOAudioTypes.h.
+ * @discussion
+ */
+
+#ifndef __OPEN_SOURCE__
+//	<rdar://6868206>
+#endif
+#define kIOAudioEngineInputChannelLayoutKey				"IOAudioEngineInputChannelLayout"
+
+/*!
+ * @defined kIOAudioEngineOutputChannelLayoutKey
+ * @abstract The key in the IORegistry for the IOAudioEngine's dictionary describes an array of OSNumber data that describe the spatial position of each channel.  See IOAudioTypes.h.
+ * @discussion
+ */
+
+#ifndef __OPEN_SOURCE__
+//	<rdar://6868206>
+#endif
+#define kIOAudioEngineOutputChannelLayoutKey			"IOAudioEngineOutputChannelLayout"
+
+/*****
+ *
+ * IOAudioStream defines
+ *
+ *****/
+ 
+ 
+#define kIOAudioStreamIDKey					"IOAudioStreamID"
+#define kIOAudioStreamDescriptionKey		"IOAudioStreamDescription"
+#define kIOAudioStreamNumClientsKey			"IOAudioStreamNumClients"
+
+/*!
+ * @defined kIOAudioStreamDirectionKey
+ * @abstract The key in the IORegistry for the IOAudioStream direction attribute.
+ * @discussion The value for this key may be either "Output" or "Input".
+ */
+#define kIOAudioStreamDirectionKey				"IOAudioStreamDirection"
+
+#define kIOAudioStreamStartingChannelIDKey		"IOAudioStreamStartingChannelID"
+#define kIOAudioStreamStartingChannelNumberKey	"IOAudioStreamStartingChannelNumber"
+#define kIOAudioStreamAvailableKey				"IOAudioStreamAvailable"
+
+#define kIOAudioStreamFormatKey					"IOAudioStreamFormat"
+#define kIOAudioStreamAvailableFormatsKey		"IOAudioStreamAvailableFormats"
+
+#define kIOAudioStreamNumChannelsKey			"IOAudioStreamNumChannels"
+#define kIOAudioStreamSampleFormatKey			"IOAudioStreamSampleFormat"
+
+#define kIOAudioStreamNumericRepresentationKey	"IOAudioStreamNumericRepresentation"
+
+#define kIOAudioStreamFormatFlagsKey			"IOAudioStreamFormatFlags"
+#define kIOAudioStreamFramesPerPacketKey		"IOAudioStreamFramesPerPacket"
+#define kIOAudioStreamBytesPerPacketKey			"IOAudioStreamBytesPerPacket"
+
+
+#define kIOAudioStreamBitDepthKey				"IOAudioStreamBitDepth"
+#define kIOAudioStreamBitWidthKey				"IOAudioStreamBitWidth"
+    
+#define kIOAudioStreamAlignmentKey				"IOAudioStreamAlignment"
+
+#define kIOAudioStreamByteOrderKey				"IOAudioStreamByteOrder"
+
+#define kIOAudioStreamIsMixableKey				"IOAudioStreamIsMixable"
+
+#define kIOAudioStreamMinimumSampleRateKey		"IOAudioStreamMinimumSampleRate"
+#define kIOAudioStreamMaximumSampleRateKey		"IOAudioStreamMaximumSampleRate"
+
+#define kIOAudioStreamDriverTagKey				"IOAudioStreamDriverTag"
+
+#define kIOAudioStreamTerminalTypeKey			"IOAudioStreamTerminalType"
+
+/*****
+ *
+ * IOAudioPort defines
+ *
+ *****/
+ 
+ 
+ /*!
+ * @defined kIOAudioPortTypeKey
+ * @abstract The key in the IORegistry for the IOAudioPort type attribute.
+ * @discussion This is a driver-defined text attribute that may contain any type.
+ *  Common types are defined as: "Speaker", "Headphones", "Microphone", "CD", "Line", "Digital", "Mixer", "PassThru".
+ */
+#define kIOAudioPortTypeKey			"IOAudioPortType"
+
+/*!
+ * @defined kIOAudioPortSubTypeKey
+ * @abstract The key in the IORegistry for the IOAudioPort subtype attribute.
+ * @discussion The IOAudioPort subtype is a driver-defined text attribute designed to complement the type
+ *  attribute.
+ */
+#define kIOAudioPortSubTypeKey		"IOAudioPortSubType"
+
+/*!
+ * @defined kIOAudioPortNameKey
+ * @abstract The key in the IORegistry for the IOAudioPort name attribute.
+ */
+#define kIOAudioPortNameKey			"IOAudioPortName"
+
+
+
+/*****
+ *
+ * IOAudioControl defines
+ *
+ *****/
+ 
+ 
+ /*!
+ * @defined kIOAudioControlTypeKey
+ * @abstract The key in the IORegistry for the IOAudioCntrol type attribute.
+ * @discussion The value of this text attribute may be defined by the driver, however system-defined
+ *  types recognized by the upper-level software are "Level", "Mute", "Selector".
+ */
+#define kIOAudioControlTypeKey		"IOAudioControlType"
+
+#define kIOAudioControlSubTypeKey	"IOAudioControlSubType"
+
+#define kIOAudioControlUsageKey		"IOAudioControlUsage"
+
+#define kIOAudioControlIDKey		"IOAudioControlID"
+
+/*!
+ * @defined kIOAudioControlChannelIDKey
+ * @abstract The key in the IORegistry for the IOAudioControl channel ID attribute
+ * @discussion The value for this key is an integer which may be driver defined.  Default values for
+ *  common channel types are provided in the following defines.
+ */
+#define kIOAudioControlChannelIDKey		"IOAudioControlChannelID"
+
+#define kIOAudioControlChannelNumberKey			"IOAudioControlChannelNumber"
+
+#define kIOAudioControlCoreAudioPropertyIDKey	"IOAudioControlCoreAudioPropertyID"
+/*!
+ * @defined kIOAudioControlChannelNameKey
+ * @abstract The key in the IORegistry for the IOAudioControl name attribute.
+ * @discussion This name should be a human-readable name for the channel(s) represented by the port.
+ *  *** NOTE *** We really need to make all of the human-readable attributes that have potential to
+ *  be used in a GUI localizable.  There will need to be localized strings in the kext bundle matching
+ *  the text.
+ */
+#define kIOAudioControlChannelNameKey		"IOAudioControlChannelName"
+
+/*!
+ * @defined kIOAudioControlChannelNameAll
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for all channels.
+ */
+#define kIOAudioControlChannelNameAll		"All Channels"
+
+/*!
+ * @defined kIOAudioControlChannelNameLeft
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the left channel.
+ */
+#define kIOAudioControlChannelNameLeft		"Left"
+
+/*!
+ * @defined kIOAudioControlChannelNameRight
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the right channel.
+ */
+#define kIOAudioControlChannelNameRight		"Right"
+
+/*!
+ * @defined kIOAudioControlChannelNameCenter
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the center channel.
+ */
+#define kIOAudioControlChannelNameCenter	"Center"
+
+/*!
+ * @defined kIOAudioControlChannelNameLeftRear
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the left rear channel.
+ */
+#define kIOAudioControlChannelNameLeftRear	"LeftRear"
+
+/*!
+ * @defined kIOAudioControlChannelNameRightRear
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the right rear channel.
+ */
+#define kIOAudioControlChannelNameRightRear	"RightRear"
+
+/*!
+ * @defined kIOAudioControlChannelNameSub
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the sub/LFE channel.
+ */
+#define kIOAudioControlChannelNameSub		"Sub"
+
+/*!
+ * @defined kIOAudioControlChannelNameFrontLeftCenter
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the FrontLeftCenter channel.
+ */
+#define kIOAudioControlChannelNameFrontLeftCenter		"FrontLeftCenter"
+
+/*!
+ * @defined kIOAudioControlChannelNameFrontRightCenter
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the FrontRightCenter channel.
+ */
+#define kIOAudioControlChannelNameFrontRightCenter		"FrontRightCenter"
+
+/*!
+ * @defined kIOAudioControlChannelNameRearCenter
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the RearCenter channel.
+ */
+#define kIOAudioControlChannelNameRearCenter		"RearCenter"
+
+/*!
+ * @defined kIOAudioControlChannelNameSurroundLeft
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the SurroundLeft channel.
+ */
+#define kIOAudioControlChannelNameSurroundLeft		"SurroundLeft"
+
+/*!
+ * @defined kIOAudioControlChannelNameSurroundRight
+ * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
+ *  the channel name for the SurroundRight channel.
+ */
+#define kIOAudioControlChannelNameSurroundRight		"SurroundRight"
+
+
+/*!
+ * @defined kIOAudioControlValueKey
+ * @abstract The key in the IORegistry for the IOAudioControl value attribute.
+ * @discussion The value returned by this key is a 32-bit integer representing the current value of the IOAudioControl.
+ */
+#define kIOAudioControlValueKey				"IOAudioControlValue"
+
+/*!
+ * @defined kIOAudioControlValueIsReadOnlyKey
+ * @abstract The key in the IORegistry for the IOAudioControl value-is-read-only attribute.
+ * @discussion The value returned by this key is a 32-bit integer but the value doesn't have any direct meaning.
+ *  Instead, the presence of this key indicates that the value for the control is read-only
+ */
+#define kIOAudioControlValueIsReadOnlyKey	"IOAudioControlValueIsReadOnly"
+
+/*!
+ * @defined kIOAudioLevelControlMinValueKey
+ * @abstract The key in the IORegistry for the IOAudioControl minimum value attribute.
+ * @discussion The value returned by this key is a 32-bit integer representing the minimum value for the IOAudioControl.
+ *  This is currently only valid for Level controls or other driver-defined controls that have a minimum and maximum
+ *  value.
+ */
+#define kIOAudioLevelControlMinValueKey		"IOAudioLevelControlMinValue"
+
+/*!
+ * @defined kIOAudioLevelControlMaxValueKey
+ * @abstract The key in the IORegistry for the IOAudioControl maximum value attribute.
+ * @discussion The value returned by this key is a 32-bit integer representing the maximum value for the IOAudioControl.
+ *  This is currently only valid for Level controls or other driver-defined controls that have a minimum and maximum
+ *  value.
+ */
+#define kIOAudioLevelControlMaxValueKey		"IOAudioLevelControlMaxValue"
+
+/*!
+ * @defined kIOAudioLevelControlMinDBKey
+ * @abstract The key in the IORgistry for the IOAudioControl minimum db value attribute.
+ * @discussion The value returned by this key is a fixed point value in 16.16 format represented as a 32-bit
+ *  integer.  It represents the minimum value in db for the IOAudioControl.  This value matches the minimum
+ *  value attribute.  This is currently valid for Level controls or other driver-defined controls that have a
+ *  minimum and maximum db value.
+ */
+#define kIOAudioLevelControlMinDBKey		"IOAudioLevelControlMinDB"
+
+/*!
+ * @defined kIOAudioLevelControlMaxDBKey
+ * @abstract The key in the IORgistry for the IOAudioControl maximum db value attribute.
+ * @discussion The value returned by this key is a fixed point value in 16.16 format represented as a 32-bit
+ *  integer.  It represents the maximum value in db for the IOAudioControl.  This value matches the maximum
+ *  value attribute.  This is currently valid for Level controls or other driver-defined controls that have a
+ *  minimum and maximum db value.
+ */
+#define kIOAudioLevelControlMaxDBKey		"IOAudioLevelControlMaxDB"
+
+#define kIOAudioLevelControlRangesKey		"IOAudioLevelControlRanges"
+
+#define kIOAudioLevelControlUseLinearScale	"IOAudioLevelControlUseLinearScale"
+
+#define kIOAudioSelectorControlAvailableSelectionsKey	"IOAudioSelectorControlAvailableSelections"
+#define kIOAudioSelectorControlSelectionValueKey		"IOAudioSelectorControlSelectionValue"
+#define kIOAudioSelectorControlSelectionDescriptionKey	"IOAudioSelectorControlSelectionDescriptionKey"
+
+#define kIOAudioSelectorControlClockSourceKey				"IOAudioSelectorControlClockSourceKey"
+
+#endif /* _IOAUDIODEFINES_H */
diff --git a/i386/include/IOKit/audio/IOAudioDevice.h b/i386/include/IOKit/audio/IOAudioDevice.h
new file mode 100644
index 0000000..6d55147
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioDevice.h
@@ -0,0 +1,749 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOAudioDevice
+ */
+
+#ifndef _IOKIT_IOAUDIODEVICE_H
+#define _IOKIT_IOAUDIODEVICE_H
+
+#include <IOKit/IOService.h>
+
+#ifndef IOAUDIOFAMILY_SELF_BUILD
+#include <IOKit/audio/IOAudioTypes.h>
+#include <IOKit/audio/IOAudioStream.h>
+#else
+#include "IOAudioTypes.h"
+#include "IOAudioStream.h"
+#endif
+
+class IOAudioEngine;
+class IOAudioStream;
+class IOAudioPort;
+class IOAudioControl;
+class OSDictionary;
+class OSSet;
+class OSArray;
+class IOTimerEventSource;
+class IOCommandGate;
+
+/*!
+ * enum IOAudioDevicePowerState
+ * @abstract Identifies the power state of the audio device
+ * @discussion A newly created IOAudioDevices defaults to the idle state.
+ * @constant kIOAudioDeviceSleep State set when the system is going to sleep
+ * @constant kIOAudioDeviceIdle State when the system is awake but none of the IOAudioEngines are in use
+ * @constant kIOAudioDeviceActive State when one ore more IOAudioEngines are in use.  This state transition must complete before the system will begin playing audio.
+ */
+typedef enum _IOAudioDevicePowerState {
+    kIOAudioDeviceSleep 	= 0,	// When sleeping
+    kIOAudioDeviceIdle		= 1,	// When no audio engines running
+    kIOAudioDeviceActive 	= 2		// audio engines running
+} IOAudioDevicePowerState;
+
+/*!
+ * @class IOAudioDevice
+ * @abstract Abstract base class for a single piece of audio hardware.  The IOAudioDevice provides
+ *  the central coordination point for an audio driver.
+ * @discussion An audio driver is required to subclass IOAudioDevice in order to provide
+ *  working audio to the system.  A single driver instance will contain a single instance of the 
+ *  driver's IOAudioDevice subclass.  The subclass is responsible for mapping all hardware device
+ *  resources from the service provider nub.  It must control access to the hardware so that the
+ *  hardware doesn't get into an inconsistent state.  It is possible that different threads may make
+ *  requests of the hardware at the same time.  The IOAudioDevice superclass provides an IOWorkLoop
+ *  and IOCommandGate on the IOWorkLoop through which all hardware accesses may be synchronized.
+ *  All entry points to all parts of the driver controlled by the IOAudioFamily will be synchronized
+ *  through this one IOWorkLoop.
+ *
+ *  The IOAudioDevice subclass is responsible for creating the rest of the pieces of the driver.
+ *  It must identify and create all IOAudioEngines that are not automatically created by the system
+ *  (i.e. those that are not matched and instantiated by IOKit directly).
+ *
+ *  The IOAudioDevice subclass must enumerate and create all IOAudioControls to match
+ *  the device capabilities.
+ *
+ *  It must also execute control value chages when requested by the system (i.e. volume adjustments).
+ *
+ *  In order to allow sleep and wake to work on the system, the IOAudioDevice subclass is responsible
+ *  for performing the necessary actions to sleep and wake its hardware (and restore necessary state
+ *  on wake).
+ *
+ *  The IOAudioDevice class provides timer services that allow different elements in the audio driver
+ *  to receive timer notifications as needed.  These services were designed with the idea that most
+ *  timed events in a typical audio driver need to be done at least as often as a certain interval.
+ *  Further, it is designed with the idea that being called more often than the specified interval
+ *  doesn't hurt anything - and in fact may help.  With this in mind, the timer services provided
+ *  by the IOAudioDevice class allow different targets to register for timer callbacks at least as
+ *  often as the specified interval.  The actual interval will be the smallest of the intervals of
+ *  all of the callbacks.  This way, we avoid the overhead of having many timers in a single audio
+ *  device.  As an example, each output IOAudioEngine has a timer to run the erase head.  It doesn't hurt
+ *  to have the erase head run more often.  Also, a typical IOAudioDevice subclass may need to run a timer
+ *  to check for device state changes (e.g. jack insertions).
+ *
+ *  There are a number of strings passed from the driver to the CoreAudio.framework and then into
+ *  applications.  All of those strings should be localized by the driver.  In order to do that
+ *  the kext bundle should have localized string files following the Mac OS X localization 
+ *  instructions.  The IOAudioDevice should contain a property with the name of the bundle/kext
+ *  that contains the localized string resources.  To do that, the driver's personality in 
+ *  the bundle resources could have a property named 'IOAudioDeviceLocalizedBundle' with the path 
+ *  of the bundle/kext relative to '/System/Library/Extensions'.  It could also be set by the 
+ *  IOAudioDevice subclass in its initHardware() function.  To do so, call
+ *  setProperty(kIOAudioDeviceLocalizedBundleKey, "Driver.kext").
+ *
+ *  In a typical driver, the IOAudioDevice subclass will implement initHardware() to perform the
+ *  hardware initialization and driver construction.  Within that initialization it must create at 
+ *  least one IOAudioEngine instance and activate it.  In order to activate a new IOAudioEngine
+ *  activateAudioEngine() should be called for each one.  It must create the IOAudioControls 
+ *  matching the hardware capabilities to allow the system to set volume, mute and input selection.  
+ *  To add those controls to the driver, each control should be attached to the IOAudioEngine to
+ *  which it applies by calling addDefaultAudioControl() on the IOAudioEngine.
+ *  During initialization it should also call setDeviceName(), setDeviceShortName() and 
+ *  setManufacturerName() with localized strings representing each of the attributes.
+ *
+ *  If the driver is to work properly after sleep/wake, it must implement performPowerStateChange()
+ *  and deal with the sleep and wake transitions.  It may also deal with the idle state transitions
+ *  to turn off device power when it isn't in use (especially useful for devices attached to a 
+ *  portable running on battery power).
+ */
+
+class IOAudioDevice : public IOService
+{
+    friend class IOAudioEngine;
+    
+    OSDeclareDefaultStructors(IOAudioDevice)
+
+protected:
+    /*! @var workLoop The IOWorkLoop for the driver - this is shared with the other objects in the driver */
+    IOWorkLoop				*workLoop;
+    /*! @var commandGate The IOCommandGate for this IOAudioDevice.  It is attached to workLoop */
+    IOCommandGate			*commandGate;
+    /*! @var timerEventSource An IOTimerEventSource attached to workLoop used for the timer services */
+    IOTimerEventSource		*timerEventSource;
+
+    /*! @var duringStartup State variable set to true while the driver is starting up and false all other times */
+    bool			duringStartup;
+    /*! @var familyManagePower Set to true if the family is supposed to manage power - this is the default state.  It can be changed early in the initialization process with a call to setFamilyManagePower(). */
+    bool			familyManagePower;
+    /*! @var asyncPowerStateChangeInProgress Set to true while an asynchronous power change is pending and false all other times. */
+    bool			asyncPowerStateChangeInProgress;
+    
+    /*! @var numRunningAudioEngines The number of running IOAudioEngines.  This is used to maintain idle vs active power state. */
+    UInt32			numRunningAudioEngines;
+    
+    /*! @var currentPowerState Used to track the existing power state - can be fetched by calling getPowerState() */
+    IOAudioDevicePowerState	currentPowerState;
+    /*! @var pendingPowerState If a power state change is in progress, this represents the pending power state.  All other times this is the same as the currentPowerState. */
+    IOAudioDevicePowerState	pendingPowerState;
+
+    /*! @var audioEngines The set of IOAudioEngine objects vended by the IOAudioDevice. */
+    OSArray *			audioEngines;
+    /*! @var timerEvents The set of timer events in use by the device.  
+     *  @discussion The key for the dictionary is the target of the event.  This means that a single target may
+     *   have only a single event associated with it.
+     */
+    OSDictionary *		timerEvents;
+    /*! @var audioPorts The set of IOAudioPort objects associated with the IOAudioDevice */
+    OSSet *			audioPorts;
+
+    /*! @var minimumInterval The smallest timer interval requested by all timer event targets. */
+    AbsoluteTime		minimumInterval;
+    /*! @var previousTimerFire The time of the last timer event.
+     *  @discussion This is used to schedule the next timer event.
+     */
+    AbsoluteTime		previousTimerFire;
+
+public:
+    /*! @var gIOAudioPlane A static IORegistryPlane representing the new IOAudioPlane that the IOAudioFamily uses
+     *   to represent the signal chain of the device.
+     */
+    static const IORegistryPlane *gIOAudioPlane;
+
+protected:
+    struct ExpansionData {
+		unsigned long long			idleSleepDelayTime;
+		IOTimerEventSource *		idleTimer;
+	};
+    
+    ExpansionData *reserved;
+    
+public:
+	static void idleAudioSleepHandlerTimer(OSObject *owner, IOTimerEventSource *sender);
+	virtual IOReturn setAggressiveness(unsigned long type, unsigned long newLevel);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 0);
+	virtual void setDeviceTransportType(const UInt32 transportType);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 1);
+    /*!
+	 * @function setIdleAudioSleepTime
+     * @abstract This function is to be called by a driver that doesn't want to be told about the audio
+	 * going idle immediately, but at some point in the future.
+	 * @discussion This is useful if the device will want to power down its hardware into an idle sleep
+	 * state, but doesn't want to do that unless audio hasn't been used for a while.  Calling this function
+	 * immediately changes the idle sleep timer and queues it up if the idle is different from the previous
+	 * idle time.  The idle time defaults to 0, which means be called immediately (backwards compatible with
+	 * previous versions of IOAudioFamily).  A value of 0xffffffffffffffffULL means don't ever tell the
+	 * driver about going idle.
+     * @param sleepDelay The amount of time, in nanoseconds, before the hardware should be told to go idle.
+     */
+	virtual void setIdleAudioSleepTime(unsigned long long sleepDelay);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 2);
+	virtual void scheduleIdleAudioSleep(void);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 3);
+    /*!
+	 * @function setConfigurationApplicationBundle
+     * @abstract This function is to be called if an external configuration application is available to set
+	 * which application to launch.
+	 * @discussion This is useful for device drivers that are too complex to be represented by the Sound Preferences
+	 * panel.  The bundle ID is a more flexible way of specifying where the application is than a hard coded path.
+     * @param bundleID The bundle ID of the application to be launched by the HAL for configuration of the device and its engine(s).
+     */
+	virtual void setConfigurationApplicationBundle(const char *bundleID);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 4);
+    /*!
+	 * @function setDeviceCanBeDefault
+     * @abstract This function is to be called to tell CoreAudio if this device shouldn't be a default device.
+	 * @discussion This is useful for device drivers that don't want to be a default device.  Can be called with
+	 * kIOAudioDeviceCanBeDefaultNothing to prevent CoreAudio from allowing this device to be any default device, or it
+	 * can be called with any combination of kIOAudioDeviceCanBeDefaultInput, kIOAudioDeviceCanBeDefaultOutput, or
+	 * kIOAudioDeviceCanBeSystemOutput.  The default is 
+	 * (kIOAudioDeviceCanBeDefaultInput | kIOAudioDeviceCanBeDefaultOutput | kIOAudioDeviceCanBeSystemOutput).
+     * @param defaultsFlags The flags to instruct CoreAudio to allow this device to be only the indicated default devices.
+     */
+	virtual void setDeviceCanBeDefault(UInt32 defaultsFlags);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 5);
+	virtual void setDeviceModelName(const char * modelName);
+
+private:
+	OSMetaClassDeclareReservedUsed(IOAudioDevice, 0);
+	OSMetaClassDeclareReservedUsed(IOAudioDevice, 1);
+	OSMetaClassDeclareReservedUsed(IOAudioDevice, 2);
+	OSMetaClassDeclareReservedUsed(IOAudioDevice, 3);
+	OSMetaClassDeclareReservedUsed(IOAudioDevice, 4);
+	OSMetaClassDeclareReservedUsed(IOAudioDevice, 5);
+
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 6);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 7);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 8);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 9);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 10);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 11);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 12);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 13);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 14);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 15);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 16);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 17);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 18);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 19);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 20);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 21);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 22);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 23);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 24);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 25);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 26);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 27);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 28);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 29);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 30);
+	OSMetaClassDeclareReservedUnused(IOAudioDevice, 31);
+	
+
+public:
+    // Initialization
+    
+    /*!
+     * @function init
+     * @abstract Initialize a newly created instance of IOAudioDevice.
+     * @discussion This implementation initializes all of the data structures and variables used by the
+     *  IOAudioDevice.  The currentPowerState and pendingPowerState variables are set to kIOAudioDeviceIdle.
+     *  A subclass that overrides this method must call the superclass' implementation.
+     * @param properties An OSDictionary of the device properties that gets passed to super::init and set
+     *  in the IORegistry.
+     * @result true if initialization was successful
+     */
+    virtual bool init(OSDictionary *properties);
+
+    /*!
+     * @function free
+     * @abstract Frees resources used by the IOAudioDevice instance
+     * @discussion This method will deactivate all audio audio engines and release the audioEngines OSSet.
+     *  It will also deactivate all of the audio ports and release the audioPorts OSSet.  It will release
+     *  the timerEvents OSDictionary as well as cancel any outstanding timer callbacks.  It will clean up
+     *  all of the event sources and the workLoop.
+     *
+     *  Do not call this directly.  This is called automatically by the system when the instance's
+     *  refcount goes to 0.  To decrement the refcount, call release() on the object.
+     */
+     
+    virtual void free();
+
+    /*!
+     * @function start
+     * @abstract This function is called automatically by the system to tell the driver to start vending
+     *  services to the rest of the system.
+     * @discussion The start() implementation in IOAudioDevice starts by calling start() on its superclass.
+     *  It then calls initHardware() which the subclass should override to properly initialize itself and 
+     *  the hardware.  If that call succeeds, it sets up power management if the family is supposed to 
+     *  manage power (checking the familyManagePower variable).  Then finally it calls registerService() 
+     *  to make the IOAudioDevice visible in the IORegistry.
+     * @param provider This is the service provider nub that provides access to the hardware resources.
+     * @result Returns true on success
+     */
+    virtual bool start(IOService *provider);
+
+    /*!
+     * @function stop
+     * @abstract This is responsible for stopping the device after the system is done with it (or
+     *  if the device is removed from the system).
+     * @discussion The IOAudioDevice implentation of stop() disables the timer services, deactivates 
+     *  all of the audio audio engines and audio ports and stops power management of the device.
+     *  The audio engine and port deactivation causes all of the audio engines to get stopped and 
+     *  all of the audio engine and port resources and objects to be released.  A subclass' implementation 
+     *  may could shut down hardware here if necessary.  If this function is overridden by a subclass,
+     *  the superclass' implementation must be called.
+     * @param The service provider nub for the device.
+     */
+    virtual void stop(IOService *provider);
+    virtual bool willTerminate(IOService *provider, IOOptionBits options);
+
+    /*!
+     * @function initHardware
+     * @abstract This function is called by start() to provide a convenient place for the subclass to 
+     *  perform its initialization.
+     * @discussion In a typical implementation, a driver would implementation this function and perform
+     *  a number of tasks.  Those include mapping hardware resources, initializing the hardware to a known
+     *  state, creating the IOAudioEngines, IOAudioControls and IOAudioStreams.  Additionally it 
+     *  should also call setDeviceName(), setDeviceShortName(), setManufacturerName().  Upon return of
+     *  this function, the device should be ready to begin vending services to the system.
+     * @param provider The service provider nub for the device.
+     * @result This function should return true on a successful initialization.
+     */
+    virtual bool initHardware(IOService *provider);
+    
+    /*!
+     * @function setDeviceName
+     * @abstract Sets the name of the device
+     * @discussion This method should be called during initialization or startup.  It should
+     *  be set by the time initHardware() completes.  The device name is used by the 
+     *  CoreAudio.framework to identify the particular piece of hardware.  This string should
+     *  should be localized by the driver.
+     */
+    virtual void setDeviceName(const char *deviceName);
+    
+    /*!
+     * @function setDeviceShortName
+     * @abstract Sets the short name of the device
+     * @discussion The short name is a shorter representation of the device name.  It may be used
+     *  by applications when the device name is too long.  It should be set by the time initHardware()
+     *  completes.  The string should be localized by the driver.
+     */
+    virtual void setDeviceShortName(const char *shortName);
+
+    /*!
+     * @function setManufacturerName
+     * @abstract Sets the manufacturer name of the device
+     * @discussion This method should be called during initialization or startup.  This should be 
+     *  called by the time initHardware() completes.  The string should be localized by the driver.
+     */
+    virtual void setManufacturerName(const char *manufacturerName);
+
+    
+    // IOWorkLoop, IOCommandGate management
+    
+    /*!
+     * @function getWorkLoop
+     * @abstract Returns the IOWorkLoop for the driver
+     * @discussion The IOWorkLoop is used to synchronized all critical aspects of the driver.  This
+     *  includes all entry points to the driver as well as power management.
+     */
+    virtual IOWorkLoop *getWorkLoop() const;
+    
+    /*!
+     * @function getCommandGate
+     * @abstract Returns the IOCommandGate for this IOAudioDevice
+     * @discussion This IOCommandGate allows calls into this IOAudioDevice to be synchronized on 
+     *  the IOWorkLoop.
+     */
+    virtual IOCommandGate *getCommandGate() const;
+
+    
+    // IOAudioEngine management
+    
+    /*!
+     * @function activateAudioEngine
+     * @abstract This simply calls activateAudioEngine(IOAudioEngine *audioEngine, 
+     *  bool shouldStartAudioEngine) with a value of true for shouldStartAudioEngine.
+     * @param audioEngine The IOAudioEngine instance to be activated.  It is treated as a newly 
+     *  allocated instance.
+     * @result Returns true if the audio engine was successfully activated.
+     */
+    virtual IOReturn activateAudioEngine(IOAudioEngine *audioEngine);
+
+    /*!
+     * @function activateAudioEngine
+     * @abstract This is called to add a new IOAudioEngine object to the IOAudioDevice.
+     * @discussion Once the IOAudioEngine has been activated by this function, it is ready
+     *  to begin moving audio data.  This should be called either during the subclass' initHardware()
+     *  implementation for each IOAudioEngine the device creates.  Or it should be called by
+     *  the IOAudioEngine itself if the audio engine was automatically created by IOKit's matching
+     *  process.  The system won't be able to properly track and control IOAudioEngines if
+     *  they are not activated though this function.
+     *  This implementation will retain the IOAudioEngine while it maintains control of it.  
+     *  When the audio engine is deactivated, the IOAudioEngine will be released.  If the 
+     *  IOAudioDevice subclass is passing a newly instantiated IOAudioEngine, it will need to release 
+     *  the audio engine after it has been activated.  This will insure that the refCount on the audio engine 
+     *  is correct when it gets deactivated when the driver is stopped.  That allows the audio engine to be
+     *  freed when it is no longer needed.
+     * @param audioEngine The IOAudioEngine instance to be activated.
+     * @param shouldStartAudioEngine If true, the audio engine is treated as a newly allocated IOAudioEngine
+     *  instance and is appropriately attached and started according to IOKit convention.  If it is false
+     *  it is assumed that some other process (possibly the IOKit matching process) has started the
+     *  IOAudioEngine and will skip that step.
+     * @result Returns true if the audio engine was successfully activated.
+     */
+    virtual IOReturn activateAudioEngine(IOAudioEngine *audioEngine, bool shouldStartAudioEngine);
+
+    /*!
+     * @function deactivateAllAudioEngines
+     * @abstract Deactivates all of the audio engines in the device.
+     * @discussion This is called by the stop() and free() methods in IOAudioDevice to completely
+     *  shut down all audio engines as the driver is being shut down.
+     */
+    virtual void deactivateAllAudioEngines();
+
+    
+    // Power management
+    
+    /*!
+     * @function setFamilyManagePower
+     * @abstract Called set whether or not the family should manage the device power throught the
+     *  IOService power management APIs.
+     * @discussion The default behavior is for the family to manage power.  It is only necessary to 
+     *  call this function if the driver does not want the family to manage power.  It is not
+     *  recommended that this function be called because it makes power management much more
+     *  difficult for the driver.  If this function is to be called, it must be called before
+     *  initHardware() completes.  Immediately after initHardware() is called by start(), 
+     *  the power management system is initialized if the family is to manage power.
+     * @param manage Set to false if it is not desired that the family does the power management
+     */
+    virtual void setFamilyManagePower(bool manage);
+    
+    /*!
+     * @function setPowerState
+     * @abstract Called by the power management system in IOService when the power state of this 
+     *  service needs to change.
+     * @discussion The default implementation of IOAudioDevice sets up two power states for IOService
+     *  to use.  State 0 is sleep and state 1 is wake.  This function should not be called directly.
+     *  It is only supposed to be used by the IOService power management services.
+     * @param powerStateOrdinal The number of the power state as defined by the IOAudioDevice - 
+     *  0 for sleep, 1 for wake.
+     * @param device The power management policy maker.
+     * @result Returns kIOPMAckImplied (0) when the power state change is complete.  Otherwise the an
+     *  upper bound on the number of microseconds until the state change is complete is returned.
+     */
+    virtual IOReturn setPowerState(unsigned long powerStateOrdinal, IOService *device);
+    
+    /*!
+     * @function setPowerStateAction
+     * @abstract IOCommandGate Action which calls protectedSetPowerState() while holding the IOCommandGate
+     * @discussion This is needed to allow protectedSetPowerState() to be called on the IOWorkLoop
+     * @param owner The owner of the IOCommandGate (the IOAudioDevice in this case)
+     * @param arg1 The powerStateOrdinal to be passed to protectedSetPowerState()
+     * @param arg2 The device to be passed to protectedSetPowerState()
+     * @result Returns the result of protectedSetPowerState()
+     */
+    static IOReturn setPowerStateAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+    
+    /*!
+     * @function protectedSetPowerState
+     * @abstract Called by setPowerStateAction() to deal with a power state change from the IOService
+     *  power management facility.
+     * @discussion This function is responsible for performing the necessary sleep and wake tasks
+     *  when the system is sleeping or waking.  If an outstanding power state change is in progress,
+     *  it will wait until the state changes has completed.  While sleeping, all audio engines are
+     *  stopped before calling initiatePowerStateChange() to call performPowerStateChange() to let
+     *  the driver deal with the sleep request.  When waking, it determines if the device should be
+     *  idle or active and continues to call initiatePowerStateChange().  If initiatePowerStateChange()
+     *  indicates that the power state change is occuring asynchronously, it returns the number of
+     *  microseconds.  This function must be called on the IOWorkLoop, but should not be called
+     *  directly.
+     * @param powerStateOrdinal Param passed to setPowerState() - 0 for sleep, 1 for wake
+     * @param device Param passed to setPowerState - the device initiating the power state change
+     * @result Returns 0 if the power state change is complete - the number of microseconds until 
+     *  complete if its asynchronous.
+     */
+    virtual IOReturn protectedSetPowerState(unsigned long powerStateOrdinal, IOService *device);
+    
+    /*!
+     * @function performPowerStateChange
+     * @abstract This function is called by the IOAudioDevice when a power state change is needed.
+     * @discussion In order to deal with power state changes, a subclass must override this function.
+     *  Any combination of old and new power states may be passed to this function.  If work is to
+     *  be performed while transitioning to sleep, check for a newPowerState of kIOAudioDeviceSleep.
+     *  If work is to be performed while transitioning from sleep, check for an oldPowerState of
+     *  kIOAudioDeviceSleep.  A power state of kIOAudioDeviceIdle means the system is awake, but
+     *  no clients are currently playing or recording audio (i.e. no IOAudioEngines are active).
+     *  A power state of kIOAudioDeviceActive means that at least one IOAudioEngine is active.
+     *  It is possible for a power state change to be performed synchronously or asynchronously.
+     *  In the case of a synchronous power state change, simple leave microsecondsUntilComplete
+     *  alone and return kIOReturnSuccess.  If an asynchronous power state change is needed the 
+     *  driver should do whatever needed to schedule another thread to finish the state change
+     *  and set the microsecondsUntilComplete to an upper bound on the amount of time it will
+     *  take to complete the power state change.  Then when the power state change is complete,
+     *  a call must be made to completePowerStateChange().  During an asynchronous power state
+     *  change, the current power state will remain the same as before the transition began, 
+     *  and the pendingPowerState is set to the new power state that will be set when the 
+     *  change is complete.
+     * @param oldPowerState The power state before the power state change
+     * @param newPowerState The power state being transitioned to
+     * @param microsecondsUntilComplete A pointer to a value representing an upper bound on
+     *  the number of microseconds to complete an asynchronous power state change.  It points
+     *  to a value of zero at the start and if it remains zero, the state change is complete
+     *  upon a successful return from the function.
+     * @result Returns kIOReturnSuccess on a successful completion
+     */
+    virtual IOReturn performPowerStateChange(IOAudioDevicePowerState oldPowerState,
+                                                IOAudioDevicePowerState newPowerState,
+                                                UInt32 *microsecondsUntilComplete);
+                                                    
+    /*!
+     * @function completePowerStateChange
+     * @abstract Called when a power state change is complete
+     * @discussion In the case of an asynchronous power state change, a subclass is responsible
+     *  for calling this function.  It is safe to call this function if not on the IOWorkLoop.
+     *  This function calls protectedCompletePowerStateChange() through the IOCommandGate and
+     *  completePowerStateChangeAction().  If the call is already on the IOWorkLoop, it is safe
+     *  to call protectedCompletePowerStateChange() directly.
+     * @result Returns kIOReturnSuccess on a successful completion
+     */
+    virtual IOReturn completePowerStateChange();
+    
+    /*!
+     * @function completePowerStateChangeAction
+     * @abstract IOCommandGate Action which calls protectedCompletePowerStateChange() while holding the
+     *  IOCommandGate.
+     * @discussion This is needed to allow protectedCompletePowerStateChange() to be called on the IOWorkLoop.
+     * @param owner The owner of the IOCommandGate (the IOAudioDevice in this case)
+     * @result Returns the result of protectedCompletePowerStateChange()
+     */
+    static IOReturn completePowerStateChangeAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+    
+    /*!
+     * @function protectedCompletePowerStateChange()
+     * @abstract Called on the IOWorkLoop when a power state change is complete.
+     * @discussion This function does the work to complete a power state change (both synchronous and
+     *  asynchronous).  If the system is waking from sleep, the timer system is restarted and the 
+     *  audio engines are resumed.  If this was called as a result of an asynchronous power state changed
+     *  it makes the IOService power management call acknowledgePowerChange() and resets the
+     *  asyncPowerStateChangeInProgress variable.  Finally it sets the currentPowerState to the
+     *  pendingPowerState.  This function must be called on the IOWorkLoop.  If a subclass is not
+     *  on the IOWorkLoop (e.g. holding the IOCommandGate), call completePowerStateChange() instead.
+     * @result Returns kIOReturnSuccess on success
+     */
+    virtual IOReturn protectedCompletePowerStateChange();
+
+    /*!
+     * @function getPowerState
+     * @abstract Returns the current power state (the old power state if a change is in progress).
+     * @result The current power state
+     */
+    virtual IOAudioDevicePowerState getPowerState();
+    
+    /*!
+     * @function getPendingPowerState
+     * @abstract Returns the pending power state if a state change is in progress.  Otherwise it 
+     *  returns the current power state change.
+     * @result The pending power state
+     */
+    virtual IOAudioDevicePowerState getPendingPowerState();
+    
+    /*!
+     * @function waitForPendingPowerStateChange
+     * @abstract Called internally to wait until a pending power state change is complete.
+     * @discussion This is only used by internal functions to wait during pending power
+     *  state changes.  It is used to prevent multiple power state changes at the same time.
+     *  This function must be called while holding the IOCommandGate.  If an asynchronous 
+     *  power state change is in progress this function will block until the state change
+     *  if complete.  Once complete, it will return while still holding the IOCommandGate.
+     */
+    virtual void waitForPendingPowerStateChange();
+    
+    /*!
+     * @function initiatePowerStateChange
+     * @abstract Called internally to execute a power state change
+     * @discussion This function must be called on the IOWorkLoop.  It calls performPowerStateChange()
+     *  to let the driver process the state change.  If the state change is completed synchronously
+     *  by the driver (subclass) it calls protectedCompletePowerStateChange().  If done asynchronously
+     *  it returns the microsecondsUntilComplete that was set by performPowerStateChange().  This
+     *  function should not be called directly.
+     * @param microsecondsUntilComplete Pointer to the microsecondsUntilComplete that should be set
+     *  by performPowerStateChange if an asynchronous power state change was started.
+     * @result Returns kIOReturnSuccess on success
+     */
+    virtual IOReturn initiatePowerStateChange(UInt32 *microsecondsUntilComplete = NULL);
+    
+
+    // IOAudioControl management
+    
+    /*!
+     * @function flushAudioControls
+     * @abstract Forces each IOAudioControl in the driver to have its value flushed out to the hardware.
+     *  That will cause either the IOAudioControl's ValueChangeHandler to be called.
+     * @discussion This can be used to force the hardware to get updated with the current value 
+     *  of each control.  It may be useful during wake for example.
+     */
+    virtual void flushAudioControls();
+
+
+    // Timer services
+    
+    /*!
+     * @typedef TimerEvent
+     * @abstract Generic timer event callback for IOAudioDevice timer targets
+     * @discussion TimerEvent callback function takes two arguments; the target of
+     *  the timer event and the IOAudioDevice sending the event.
+     * @param target The target of the timer event - passed in when the timer event was registered
+     * @param audioDevice The IOAudioDevice sending the event
+     */
+    typedef void (*TimerEvent)(OSObject *target, IOAudioDevice *audioDevice);
+
+    /*!
+     * @function addTimerEvent
+     * @abstract Adds a TimerEvent callback for the given target called at least as often
+     *  as specified in interval.
+     * @discussion The frequency of the timer event callbacks will be the smallest interval
+     *  specified by all targets.  Only one interval and callback may be specified per target.
+     *  If a addTimerEvent is called twice with the same target, the second one overrides the
+     *  first.  There is currently a bug triggered if the first call had the smallest interval.
+     *  In that case, that smallest interval would still be used.
+     * @param target This parameter is the target object of the TimerEvent.
+     * @param event The callback function called each time the timer fires.
+     * @param interval The callback will be called at least this often.
+     * @result Returns kIOReturnSuccess if the timer event was successfully added.
+     */
+    virtual IOReturn addTimerEvent(OSObject *target, TimerEvent event, AbsoluteTime interval);
+
+    /*!
+     * @function removeTimerEvent
+     * @abstract Removes the timer event for the given target.
+     * @discussion If the interval for the target to be removed is the smallest interval,
+     *  the timer interval is recalculated based on the remaining targets.  The next fire
+     *  time is readjusted based on the new interval compared to the last fire time.
+     * @param target The target whose timer event will be removed.
+     */
+    virtual void removeTimerEvent(OSObject *target);
+    
+    /*!
+     * @function removeAllTimerEvents
+     * @abstract Removes all timer events and stops the timer
+     * @discussion Called during teardown of the driver
+     */    
+    virtual void removeAllTimerEvents();
+
+    
+    // IOAudioPort management
+
+    /*!
+     * @function attachAudioPort
+     * @abstract Adds the port to the IOAudioDevice's list of ports and attaches the port to its parent
+     *  and attaches the child to the port.
+     * @discussion This function provides the functionality to represent the device's signal chain in the
+     *  IOAudioPlane in the IORegistry.  An IOAudioPort's parent(s) are before it in the signal chain
+     *  and its children are after it.  This method may be called multiple times for a single IOAudioPort.
+     *  This is necessary when there are many children or parents.  Once a relationship is made, it is not
+     *  necessary to make the reverse relationship.  A NULL value may be passed in for either the parent
+     *  or child or both.
+     *  The IOAudioPort passed in should be a newly allocated IOAudioPort instance.  This function will
+     *  appropriately attach and start the port object.  NOTE: It is not necessary to use IOAudioPorts
+     *  in a fully functional audio driver.
+     * @param port The newly created IOAudioPort instance to be activated.
+     * @param parent A parent IOAudioPort or IOAudioEngine of the given port.
+     * @param child A child IOAudioPort or IOAudioEngine of the given port.
+     * @result Returns true when the port has been successfully added and attached.
+     */
+    virtual IOReturn attachAudioPort(IOAudioPort *port, IORegistryEntry *parent, IORegistryEntry *child);
+
+    /*!
+     * @function detachAllAudioPorts
+     * @abstract Deactivates all of the ports in the device.
+     * @discussion This is called by the stop() and free() methods in IOAudioDevice to completely
+     *  shut down all ports as the driver is being shut down.
+     */
+    virtual void detachAllAudioPorts();
+
+protected:
+    /*!
+     * @function timerFired
+     * @abstract Internal static function called when the timer fires.
+     * @discussion This function simply calls dispatchTimerEvents() on the IOAudioDevice to do just that.
+     * @param target The IOAudioDevice instance that initiated the timer callback.
+     * @param sender The IOTimerEventSources calling this callback
+     */
+    static void timerFired(OSObject *target, IOTimerEventSource *sender);
+
+    /*!
+     * @function dispatchTimerEvents
+     * @abstract Called by timerFired() to cause the timer event callbacks to be called.
+     * @discussion This method iterates through all of the timer event targets and calls
+     *  the callback on each.  Unless the force flag is set to true, the timer events will
+     *  only be dispatched if the power state is not kIOAudioDeviceSleep.  This prevents
+     *  unexpected timer firings while making wake->sleep->wake transitions.  This function must
+     *  be called on the IOWorkLoop.
+     * @function force A bool param to allow the timer events to be dispatched even if the 
+     *  device is in the kIOAudioDeviceSleep power state.
+     */
+    virtual void dispatchTimerEvents(bool force);
+
+    /*!
+     * @function audioEngineStarting
+     * @abstract Called by IOAudioEngine when it is starting up
+     * @discussion This should only be called while on the IOWorkLoop.  It is not intended to be called
+     *  directly.  It is called when an IOAudioEngine is starting up to allow the IOAudioDevice
+     *  to keep track of running audio engines and change the power state from kIOAudioDeviceIdle to
+     *  kIOAudioDeviceActive when the first audio engine starts up.  If the state change is done
+     *  asynchronously, it waits for the state change to complete.  This is to ensure that the
+     *  system doesn't start playing audio until the IOAudioDevice has completed its transition
+     *  to kIOAudioDeviceActive.
+     */
+    virtual void audioEngineStarting();
+    
+    /*!
+     * @function audioEngineStopped
+     * @abstract Called by IOAudioEngine when it has stopped
+     * @discussion This should only be called while on the IOWorkLoop.  It is not intended to be called
+     *  directly.  It is called when an IOAudioEngine has stopped to allow the IOAudioDevice
+     *  to keep track of running audio engines and change the power state from kIOAudioDeviceActive
+     *  to kIOAudioDeviceIdle when the last audio engine stops.  If the state change is done 
+     *  asynchronously, it waits for the state change to complete.
+     */
+    virtual void audioEngineStopped();
+    
+};
+
+#endif /* _IOKIT_IOAUDIODEVICE_H */
diff --git a/i386/include/IOKit/audio/IOAudioEngine.h b/i386/include/IOKit/audio/IOAudioEngine.h
new file mode 100644
index 0000000..19477b5
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioEngine.h
@@ -0,0 +1,865 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOAudioEngine
+ */
+
+#ifndef _IOKIT_IOAUDIOENGINE_H
+#define _IOKIT_IOAUDIOENGINE_H
+
+#include <IOKit/IOService.h>
+
+#ifndef IOAUDIOFAMILY_SELF_BUILD
+#include <IOKit/audio/IOAudioTypes.h>
+#else
+#include "IOAudioTypes.h"
+#endif
+#include <IOKit/IOBufferMemoryDescriptor.h>
+
+class OSDictionary;
+class OSCollection;
+class OSOrderedSet;
+class IOAudioEngineUserClient;
+class IOAudioDevice;
+class IOAudioStream;
+class IOAudioControl;
+class IOCommandGate;
+
+#define IOAUDIOENGINE_DEFAULT_NUM_ERASES_PER_BUFFER	4
+
+/*!
+ * @typedef IOAudioEnginePosition
+ * @abstract Represents a position in an audio audio engine.
+ * @discussion This position is based on the sample frame within a 
+ *  loop around the sample buffer, and the loop count which starts at 0 when the audio engine
+ *  begins playback.
+ * @field fSampleFrame The sample frame within the buffer - starts at 0.
+ * @field fLoopCount The number of times the ring buffer has looped.
+ */
+typedef struct {
+    UInt32	fSampleFrame;
+    UInt32	fLoopCount;
+} IOAudioEnginePosition;
+
+#define CMP_IOAUDIOENGINEPOSITION(p1, p2) \
+    (((p1)->fLoopCount > (p2)->fLoopCount) ? 1 :	\
+        ((p1)->fLoopCount == (p2)->fLoopCount) && ((p1)->fSampleFrame > (p2)->fSampleFrame) ? 1 :	\
+            ((p1)->fLoopCount == (p2)->fLoopCount) && ((p1)->fSampleFrame == (p2)->fSampleFrame) ? 0 : -1)
+            
+#define IOAUDIOENGINEPOSITION_IS_ZERO(p1) (((p1)->fLoopCount == 0) && ((p1)->fSampleFrame == 0))
+
+/*!
+ * @class IOAudioEngine
+ * @abstract Abstract base class for a single audio audio / I/O engine.
+ * @discussion An IOAudioEngine is defined by a single I/O engine to transfer data to
+ *  or from one or more sample buffers.  Each sample buffer is represented by a single IOAudioStream
+ *  instance.  A single IOAudioEngine must contain at least one IOAudioStream, but has no upper
+ *  limit on the number of IOAudioStreams it may contain.  An IOAudioEngine instance may contain
+ *  both input and output IOAudioStreams.
+ *
+ *  An audio driver must subclass IOAudioEngine in order to provide certain services.  An 
+ *  IOAudioEngine subclass must start and stop the I/O engine when requested.  The I/O
+ *  engine should be continuously running and loop around from end to beginning.  While the audio
+ *  engine is running, it must take a timestamp as the sample buffer(s) wrap around and start at
+ *  the beginning.  The CoreAudio.framework uses the timestamp to calculate the exact position of
+ *  the audio engine.  An IOAudioEngine subclass must implement getCurrentSampleFrame() to provide
+ *  a sample position on demand.  Finally, an IOAudioEngine subclass must provide clipping and
+ *  format conversion routines to go to/from the CoreAudio.framework's native float format.
+ *
+ *  If multiple stream formats or sample rates are allowed, the IOAudioEngine
+ *  subclass must provide support for changing the hardware when a format or sample rate is
+ *  changed.
+ *
+ *  There are several attributes associated with a single IOAudioEngine: 
+ *
+ *  The IOAudioEngine superclass provides a shared status buffer that contains all of the dynamic pieces
+ *  of information about the audio engine (type IOAudioEngineStatus).  It runs an erase process on
+ *  all of the output streams.  The erase head is used to zero out the mix and sample buffers after
+ *  the samples have been played.  Additionally, the IOAudioEngine superclass handles the 
+ *  communication with the CoreAudio.framework and makes the decision to start and stop the
+ *  audio engine when it detects it is in use.
+ *
+ *  In order for an audio device to play back or record sound, an IOAudioEngine subclass must be created.
+ *  The subclass must initialize all of the necessary hardware resources to prepare for starting the
+ *  audio I/O engine.  It typically will perform these tasks in the initHardware() method.  A subclass 
+ *  may also implement a stop() method which is called as the driver is being torn down.  This is 
+ *  typically called in preparation of removing the device from the system for removable devices.
+ *
+ *  In addition to initializing the necessary hardware, there are a number of other tasks an 
+ *  IOAudioEngine must do during initHardware().  It must create the necessary IOAudioStream objects
+ *  to match the device capabilities.  Each IOAudioStream must be added using addAudioStream().  It
+ *  also should create the IOAudioControls needed to control the various attributes of the audio engine:
+ *  output volume, mute, input gain, input selection, analog passthru.  To do that, addDefaultAudioControl()
+ *  should be called with each IOAudioControl to be attached to the IOAudioEngine.  In order to provide
+ *  for proper synchronization, the latency of the audio engine should be specified with setSampleLatency().
+ *  This value represents the latency between the timestamp taken at the beginning of the buffer and 
+ *  when the audio is actually played (or recorded) by the device.  If a device is block based or if
+ *  there is a need to keep the CoreAudio.framework a certain number of samples ahead of (or behind for
+ *  input) the I/O head, that value should be specified using setSampleOffset().  If this is not specified
+ *  the CoreAudio.framework may attempt to get as close to the I/O head as possible.
+ *
+ *  The following fields in the shared IOAudioEngineStatus struct must be maintained by the subclass
+ *  implementation:
+ *  <pre>
+ *  <t>  fCurrentLoopCount - the number of times the sample buffer has wrapped around to the beginning
+ *  <t>  fLastLoopTime - timestamp of the most recent time that the I/O engine looped back to the 
+ *  beginning of the sample buffer
+ *  </pre>
+ *  It is critically important that the fLastLoopTime field be as accurate as possible.  It is 
+ *  the basis for the entire timer and synchronization mechanism used by the audio system.
+ *
+ *  At init time, the IOAudioEngine subclass must call setNumSampleFramesPerBuffer() to indicate how large
+ *  each of the sample buffers are (measured in sample frames).  Within a single IOAudioEngine, all sample
+ *  buffers must be the same size and be running at the same sample rate.  If different buffers/streams can
+ *  be run at different rates, separate IOAudioEngines should be used.  The IOAudioEngine subclass must
+ *  also call setSampleRate() at init time to indicate the starting sample rate of the device.
+ *
+ */
+
+class IOAudioEngine : public IOService
+{
+    OSDeclareAbstractStructors(IOAudioEngine)
+    
+    friend class IOAudioEngineUserClient;
+    friend class IOAudioDevice;
+    friend class IOAudioStream;
+    
+public:
+    /*! @var gSampleRateWholeNumberKey */
+    static const OSSymbol	*gSampleRateWholeNumberKey;
+    /*! @var gSampleRateFractionKey */
+    static const OSSymbol	*gSampleRateFractionKey;
+    
+    /*! @var numSampleFramesPerBuffer */
+    UInt32			numSampleFramesPerBuffer;
+    
+    /*! @var sampleRate 
+     *  The current sample rate of the audio engine in samples per second. */
+    IOAudioSampleRate			sampleRate;
+
+    /*! @var numErasesPerBuffer 
+     *  The number of times the erase head get scheduled to run for each 
+     *   cycle of the audio engine. */
+    UInt32			numErasesPerBuffer;
+    /*! @var runEraseHead 
+     *  Set to true if the erase head is to run when the audio engine is running.  This is the case if there are any output streams. */
+    bool			runEraseHead;
+    
+    /*! @var audioEngineStopPosition 
+     *  When all clients have disconnected, this is set to one buffer length past the
+    *    current audio engine position at the time.  Then when the stop position is reached, the audio engine
+    *    is stopped */
+    IOAudioEnginePosition	audioEngineStopPosition;
+
+    /*! @var isRegistered 
+     *  Internal state variable to keep track or whether registerService() has been called. */
+    bool			isRegistered;
+    /*! @var configurationChangeInProgress 
+     *  Set to true after beginConfigurationChange() and false upon a 
+    *    subsequent call to completeConfigurationChange() or cancelConfigurationChange(). */
+    bool			configurationChangeInProgress;
+    
+    /*! @var state 
+     *  The current state of the IOAudioEngine - running, stopped, paused. */
+    IOAudioEngineState		state;
+
+    /*! @var status 
+     *  Status struct shared with the CoreAudio.framework. */
+    IOAudioEngineStatus *	status;
+
+    /*! @var audioDevice 
+     *  The IOAudioDevice instance to which the IOAudioEngine belongs. */
+    IOAudioDevice *		audioDevice;
+    
+    /*! @var workLoop 
+     *  The IOWorkLoop for the audio driver - shared with the IOAudioDevice. */
+    IOWorkLoop 			*workLoop;
+    /*! @var commandGate 
+     *  The IOCommandGate for this audio engine - attached to the driver's IOWorkLoop. */
+    IOCommandGate		*commandGate;
+
+    /*! @var inputStreams 
+     *  An OSSet of all of the input IOAudioStreams attached to this IOAudioEngine. */
+    OSOrderedSet 	*inputStreams;
+    UInt32			maxNumInputChannels;
+    /*! @var outputStreams 
+     *  An OSSet of all of the output IOAudioStreams attached to this IOAudioEngine. */
+    OSOrderedSet	*outputStreams;
+    UInt32			maxNumOutputChannels;
+    /*! @var userClients 
+     *  An OSSet of all of the currently connected user clients. */
+    OSSet			*userClients;
+    /*! @var defaultAudioControls 
+     *  All of the IOAudioControls that affect this audio engine. */
+    OSSet			*defaultAudioControls;
+    
+    /*! @var numActiveUserClients 
+     *  A total of the active user clients - those that are currently playing or 
+     *    recording audio. */
+    UInt32			numActiveUserClients;
+    UInt32			sampleOffset;				// used for input and output if inputSampleOffset is not set, if inputSampleOffset is set used as output only 
+		      
+    UInt32			index;
+    bool			duringStartup;
+
+protected:
+
+    /*!
+     * @var deviceStartedAudioEngine 
+     *  Used by the IOAudioDevice to determine responsibility for shutting
+     *  the audio engine down when it is no longer needed.
+     */
+    bool			deviceStartedAudioEngine;
+    
+protected:
+    struct ExpansionData {
+		UInt32								pauseCount;
+		IOBufferMemoryDescriptor			*statusDescriptor;
+		IOBufferMemoryDescriptor			*bytesInInputBufferArrayDescriptor;
+		IOBufferMemoryDescriptor			*bytesInOutputBufferArrayDescriptor;
+		UInt32								mixClipOverhead;
+		OSArray								*streams;
+	    UInt32								inputSampleOffset;
+	};
+    
+    ExpansionData   *reserved;
+
+//	static UInt32	sInstanceCount;	
+
+public:
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 0);
+    virtual IOReturn performFormatChange(IOAudioStream *audioStream, const IOAudioStreamFormat *newFormat, const IOAudioStreamFormatExtension *formatExtension, const IOAudioSampleRate *newSampleRate);
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 1);
+	virtual IOBufferMemoryDescriptor * getStatusDescriptor();
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 2);
+	virtual IOReturn getNearestStartTime(IOAudioStream *audioStream, IOAudioTimeStamp *ioTimeStamp, bool isInput);
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 3);
+	virtual IOBufferMemoryDescriptor * getBytesInInputBufferArrayDescriptor();
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 4);
+	virtual IOBufferMemoryDescriptor * getBytesInOutputBufferArrayDescriptor();
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 5);
+    /*!
+	 * @function eraseOutputSamples
+     * @abstract This function allows for the actual erasing of the mix and sample buffer to be overridden by
+	 * a child class.
+	 * @param mixBuf Pointer to the IOAudioFamily allocated mix buffer.
+	 * @param sampleBuf Pointer to the child class' sample buffer.
+	 * @param firstSampleFrame Index to the first sample frame to erase.
+	 * @param numSampleFrames Number of sample frames to erase.
+	 * @param streamFormat Format of the data to be erased.
+	 * @param audioStream Pointer to stream object that corresponds to the sample buffer being erased.
+	 * @result Must return kIOReturnSuccess if the samples have been erased.
+     */
+	virtual IOReturn eraseOutputSamples(const void *mixBuf, void *sampleBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 6);
+    /*!
+	 * @function setClockIsStable
+     * @abstract This function sets a flag that CoreAudio uses to select its sample rate tracking algorithm.  Set
+	 * this to TRUE unless that results in dropped audio.  If the driver is experiencing unexplained dropouts
+	 * setting this FALSE might help.
+	 * @param clockIsStable TRUE tells CoreAudio to use an agressive PLL to quickly lock to the engine's sample rate
+	 * while FALSE tells CoreAudio to adjust more slowly to perceived sample rate changes that might just be the
+	 * result of an unstable clock.
+     */
+	virtual void setClockIsStable(bool clockIsStable);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 7);
+	/*!
+     * @function setMixClipOverhead
+     * @abstract Used to tell IOAudioFamily when the watchdog timer must fire by.
+     * @discussion setMixClipOverhead allows an audio engine to tell IOAudioFamily how much time
+	 * an engine will take to mix and clip its samples, in percent.
+	 * The default value is 10, meaning 10%.  This will cause IOAudioFamily to make
+	 * the watchdog timer fire when there is just over 10% of the time to complete
+	 * a buffer set left (e.g. 51 samples when the HAL is using a buffer size of 512
+	 * samples).
+     * @param newMixClipOverhead How much time per buffer should be made available for the
+	 * mix and clip routines to run.  Valid values are 1 through 99, inclusive.
+     * @result return no error
+	*/
+	virtual void setMixClipOverhead(UInt32 newMixClipOverhead);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 8);
+    /*!
+	 * @function setClockDomain
+     * @abstract Sets a property that CoreAudio uses to determine how devices are synchronized.  If an audio device can tell that it is
+	 * synchronized to another engine, it should set this value to that engine's clock domain.  If an audio device can be a clock master, it may publish
+	 * its own clock domain for other devices to use.
+	 * @param clockDomain is the unique ID of another engine that this engine realizes it is synchronized to, use the default value kIOAudioNewClockDomain 
+	 * to have IOAudioEngine create a unique clock domain.
+     */
+	virtual void setClockDomain(UInt32 clockDomain = kIOAudioNewClockDomain);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 9);
+    /*!
+	 * @function convertInputSamplesVBR
+     * @abstract Override this method if you want to return a different number of sample frames than was requested.  
+     */
+	virtual IOReturn convertInputSamplesVBR(const void *sampleBuf, void *destBuf, UInt32 firstSampleFrame, UInt32 &numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 10);
+    /*!
+	 * @function setInputSampleOffset
+     * @abstract set the offset CoreAudio will read from off the current read pointer
+	 * @param numSamples size of offset in sample
+	 */
+    virtual void setInputSampleOffset(UInt32 numSamples);
+
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 11);
+    /*!
+	 * @function setOutputSampleOffset
+     * @abstract set the offset CoreAudio will write at off the current write pointer
+	 * @param numSamples size of offset in sample
+	 */
+    virtual void setOutputSampleOffset(UInt32 numSamples);
+
+protected:
+	
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 12);
+    virtual IOReturn createUserClient(task_t task, void *securityID, UInt32 type, IOAudioEngineUserClient **newUserClient, OSDictionary *properties);
+
+public:
+	
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 13);
+	/*! 
+	 * @function setAttributeForConnection
+	 * @abstract Generic method to set some attribute of the audio engine, specific to one connection.
+	 * @discussion IOAudioEngine subclasses may implement this method to allow arbitrary attribute/value pairs to be set, specific to one connection. 
+	 * @param attribute Defines the attribute to be set. 
+	 * @param value The new value for the attribute.
+	 * @result an IOReturn code.
+	 */
+	
+    virtual IOReturn setAttributeForConnection( SInt32 connectIndex, UInt32 attribute, uintptr_t value );
+	
+	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 14);
+	/*! @function getAttributeForConnection
+	 * @abstract Generic method to retrieve some attribute of the audio engine, specific to one connection.
+	 * @discussion IOAudioEngine subclasses may implement this method to allow arbitrary attribute/value pairs to be returned, specific to one connection. 
+	 * @param attribute Defines the attribute to be returned. Some defined attributes are:<br> 
+	 * @param value Returns the value for the attribute.
+	 * @result an IOReturn code.
+	 */
+	
+    virtual IOReturn getAttributeForConnection( SInt32 connectIndex, UInt32 attribute, uintptr_t * value );
+
+private:
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 0);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 1);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 2);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 3);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 4);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 5);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 6);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 7);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 8);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 9);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 10);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 11);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 12);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 13);
+	OSMetaClassDeclareReservedUsed(IOAudioEngine, 14);
+
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 15);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 16);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 17);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 18);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 19);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 20);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 21);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 22);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 23);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 24);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 25);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 26);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 27);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 28);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 29);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 30);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 31);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 32);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 33);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 34);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 35);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 36);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 37);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 38);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 39);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 40);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 41);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 42);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 43);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 44);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 45);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 46);
+	OSMetaClassDeclareReservedUnused(IOAudioEngine, 47);
+
+public:
+    /*!
+     * @function createDictionaryFromSampleRate
+     * @abstract Generates a dictionary matching the given sample rate.
+     * @discussion This is an internal routine used to generate a dictionary matching the given sample rate.  It is used to generate a sample rate dictionary for the I/O Registry - used by the 
+     *  CoreAudio.framework.
+     * @result Returns the newly create OSDictionary.
+     */
+    static OSDictionary *createDictionaryFromSampleRate(const IOAudioSampleRate *sampleRate, OSDictionary *rateDict = 0);
+    
+    /*!
+     * @function createSampleRateFromDictionary
+     * @abstract Generates a sample rate from an OSDictionary.
+     * @discussion This is an internal routine used to generate a sample rate from an OSDictionary.  It is used to generate a sample rate give a new OSDictionary from the IORegistry - coming
+     *  from the CoreAudio.framework.
+     * @result Returns the sample rate.
+     */
+    static IOAudioSampleRate *createSampleRateFromDictionary(const OSDictionary *rateDict, IOAudioSampleRate *sampleRate = 0);
+
+    /*!
+     * @function init
+     * @abstract Performs initialization of a newly allocated IOAudioEngine.
+     * @discussion This function is responsible for initialization of all of the general attributes of
+     *  a new IOAudioEngine.  It initializes instance variables to their default
+     *  values and allocates the shared status buffer.  Subclasses will likely want to override this method
+     *  and do all of their common initialization in their implementation.  They do need to be sure to call
+     *  IOAudioEngine's implementation of init and pay attention to the return value.
+     * @param properties The default properties for the IOAudioEngine.
+     * @result Returns true if initialization was successful.
+     */
+    virtual bool init(OSDictionary *properties);
+
+    /*!
+     * @function free
+     * @abstract Frees all of the resources allocated by the IOAudioEngine.
+     * @discussion Do not call this directly.  This is called automatically by the system when the instance's
+     *  refcount goes to 0.  To decrement the refcount, call release() on the object.
+     */
+    virtual void free();
+
+    /*!
+     * @function getWorkLoop
+     * @abstract Returns the IOWorkLoop for the driver.
+     */
+    virtual IOWorkLoop *getWorkLoop() const;
+    
+    /*!
+     * @function getCommandGate
+     * @abstract Returns the IOCommandGate for this IOAudioEngine.
+     */
+    virtual IOCommandGate *getCommandGate() const;
+    
+    /*!
+     * @function start
+     * @abstract A simple cover function for start(IOService *, IOAudioDevice *) that assumes the provider
+     *  is the IOAudioDevice.
+     * @discussion Subclasses will want to override start(IOService *, IOAudioDevice *) rather than this
+     *  one.
+     * @param provider The service provider for the IOAudioEngine (the IOAudioDevice in this case).
+     * @result Returns true if the IOAudioEngine was successfully started.
+     */
+    virtual bool start(IOService *provider);
+
+    /*!
+     * @function start
+     * @abstract Standard IOKit start() routine called to start an IOService.
+     * @discussion This function is called in order to prepare the IOAudioEngine for use.  It does NOT
+     *  mean that the audio I/O engine itself should be started.  This implementation gets the IOWorkLoop
+     *  from the IOAudioDevice and allocates an IOCommandGate.  Finally it calls initHardware() in which
+     *  all of the subclass-specific device initialization should be done.  Upon return from initHardware()
+     *  all IOAudioStreams should be created and added to the audio engine.  Also, all IOAudioControls
+     *  for this IOAudioEngine should be created and attached.
+     * @param provider The service provider for the IOAudioEngine.
+     * @param device The IOAudioDevice to which this IOAudioEngine belongs.
+     * @result Returns true if the service was successfully started.
+     */
+    virtual bool start(IOService *provider, IOAudioDevice *device);
+    
+    /*!
+     * @function initHardware
+     * @abstract This function is called by start() to provide a convenient place for the subclass to
+     *  perform its hardware initialization.
+     * @discussion Upon return from this function, all IOAudioStreams and IOAudioControls should be created
+     *  and the audio engine should be ready to be started when a client requests that playback begin.
+     * @function provider The service provider numb for this audio engine - typically the IOAudioDevice.
+     * @result Returns true if the hardware was successfully initialized.
+     */
+    virtual bool initHardware(IOService *provider);
+
+    /*!
+     * @function stop
+     * @abstract Stops the service and prepares for the driver to be terminated.
+     * @discussion This function is called before the driver is terminated and usually means that the device
+     *  has been removed from the system.
+     * @param provider The service provider for the IOAudioEngine.
+     */
+    virtual void stop(IOService *provider);
+
+    /*!
+     * @function registerService
+     * @abstract Called when this audio engine is ready to begin vending services.
+     * @discussion This function is called by IOAudioDevice::activateAudioEngine() once the audio engine
+     *  has been fully initialized and is ready to begin audio playback.
+     * @param options
+     */
+    virtual void registerService(IOOptionBits options = 0);
+    
+    virtual void setAudioDevice(IOAudioDevice *device);
+    virtual void setIndex(UInt32 index);
+    
+    virtual void setDescription(const char *description);
+
+    /*!
+     * @function newUserClient
+     * @abstract Requests a new user client object for this service.
+     * @discussion This function is called automatically by I/O Kit when a user process attempts
+     *  to connect to this service.  It allocates a new IOAudioEngineUserClient object and increments
+     *  the number of connections for this audio engine.  If this is the first user client for this IOAudioEngine,
+     *  it calls startAudioEngine().  There is no need to call this function directly.
+	 *  A derived class that requires overriding of newUserClient should override the version with the properties
+	 *  parameter for Intel targets, and without the properties parameter for PPC targets.  The #if __i386__ directive
+	 *  can be used to select between the two behaviors.
+     * @param task The task requesting the new user client.
+     * @param securityID Optional security paramater passed in by the client - ignored.
+     * @param type Optional user client type passed in by the client - ignored.
+     * @param handler The new IOUserClient * must be stored in this param on a successful completion.
+     * @param properties A dictionary of additional properties for the connection.
+     * @result Returns kIOReturnSuccess on success.  May also result kIOReturnError or kIOReturnNoMemory.
+     */
+    virtual IOReturn newUserClient(task_t task, void *securityID, UInt32 type, IOUserClient **handler);
+    virtual IOReturn newUserClient(task_t task, void *securityID, UInt32 type, OSDictionary *properties, IOUserClient **handler);
+
+    /*!
+     * @function addAudioStream
+     * @abstract Adds an IOAudioStream to the audio engine.
+     * @discussion This function is called by the driver to add an IOAudioStream to the audio engine.  This must be called at least once to make sure the audio engine has at least one IOAudioStream.
+     * @param stream The IOAudioStream to be added.
+     * @result Returns kIOReturnSuccess if the stream was successfully added.
+     */
+    virtual IOReturn addAudioStream(IOAudioStream *stream);
+    
+    virtual IOAudioStream *getAudioStream(IOAudioStreamDirection direction, UInt32 channelID);
+    
+    virtual void lockAllStreams();
+    virtual void unlockAllStreams();
+    
+    virtual void updateChannelNumbers();
+
+    /*!
+     * @function resetStatusBuffer
+     * @abstract Resets the status buffer to its default values.
+     * @discussion This is called during startAudioEngine() and resumeAudioEngine() to clear out the status buffer
+     *  in preparation of starting up the I/O engine.  There is no need to call this directly.
+     */
+    virtual void resetStatusBuffer();
+    
+    /*!
+     * @function clearAllSampleBuffers
+     * @abstract Zeros out all of the sample and mix buffers associated with the IOAudioEngine
+     * @discussion This is called during resumeAudioEngine() since the audio engine gets started back at the
+     *  beginning of the sample buffer.
+     */
+    virtual void clearAllSampleBuffers();
+    
+    /*!
+     * @function getCurrentSampleFrame
+     * @abstract Gets the current sample frame from the IOAudioEngine subclass.
+     * @result
+     */
+    virtual UInt32 getCurrentSampleFrame() = 0;
+
+    /*!
+     * @function startAudioEngine
+     * @abstract Starts the audio I/O engine.
+     * @discussion This method is called automatically when the audio engine is placed into use the first time.
+     *  This must be overridden by the subclass.  No call to the superclass's implementation is
+     *  necessary.  The subclass's implementation must start up the audio I/O engine.  This includes any audio
+     *  engine that needs to be started as well as any interrupts that need to be enabled.  Upon successfully
+     *  starting the engine, the subclass's implementation must call setState(kIOAudioEngineRunning).  If
+     *  it has also checked the state using getState() earlier in the implementation, the stateLock must be
+     *  acquired for the entire initialization process (using IORecursiveLockLock(stateLock) and
+     *  IORecursiveLockUnlock(stateLock)) to ensure that the state remains consistent.  See the general class
+     *  comments for an example.
+     * @result Must return kIOReturnSuccess on a successful start of the engine.
+     */
+    virtual IOReturn startAudioEngine();
+
+    /*!
+     * @function stopAudioEngine
+     * @abstract Stops the audio I/O engine.
+     * @discussion This method is called automatically when the last client disconnects from this audio engine.
+     *  It must be overridden by the subclass.  No call to the superclass's implementation is necessary.
+     *  The subclass's implementation must stop the audio I/O engine.  The audio engine (if it exists) should
+     *  be stopped and any interrupts disabled.  Upon successfully stopping the engine, the subclass must call
+     *  setState(kAudioEngineStopped).  If it has also checked the state using getState() earlier in the
+     *  implementation, the stateLock must be acquired for the entire initialization process (using
+     *  IORecursiveLockLock(stateLock) and IORecursiveLockUnlock(stateLock)) to ensure that the state remains
+     *  consistent.
+     * @result Must return kIOReturnSuccess on a successful stop of the engine.
+     */
+    virtual IOReturn stopAudioEngine();
+    virtual IOReturn pauseAudioEngine();
+    virtual IOReturn resumeAudioEngine();
+    
+    /*!
+     * @function performAudioEngineStart
+     * @abstract Called to start the audio I/O engine
+     * @discussion This method is called by startAudioEngine().  This must be overridden by the subclass.
+	 *	No call to the superclass' implementation is necessary.  The subclass' implementation must start up the
+	 *	audio I/O engine.  This includes any audio engine that needs to be started as well as any interrupts
+	 *	that need to be enabled.
+     * @result Must return kIOReturnSuccess on a successful start of the engine.
+     */
+    virtual IOReturn performAudioEngineStart();
+
+    /*!
+     * @function performAudioEngineStop
+     * @abstract Called to stop the audio I/O engine
+     * @discussion This method is called by stopAudioEngine() and pauseAudioEngine.
+     *  This must be overridden by the subclass.  No call to the superclass' implementation is
+     *  necessary.  The subclass' implementation must stop the audio I/O engine.  This includes any audio
+     *  engine that needs to be stopped as well as any interrupts that need to be disabled.
+     * @result Must return kIOReturnSuccess on a successful stop of the engine.
+     */
+    virtual IOReturn performAudioEngineStop();
+
+    /*! 
+     * @function getState
+     * @abstract Returns the current state of the IOAudioEngine.
+     * @discussion If this method is called in preparation for calling setState(), the stateLock must
+     *  be acquired before the first call to getState() and held until after the last call to setState().
+     *  Be careful not to return from the code acquiring the lock while the lock is being held.  That
+     *  will cause a deadlock situation.
+     * @result The current state of the IOAudioEngine: kIOAudioEngineRunning, kIOAudioEngineStopped.
+     */
+    virtual IOAudioEngineState getState();
+
+    /*!
+     * @function getSampleRate 
+     * @abstract Returns the sample rate of the IOAudioEngine in samples per second.
+     */
+    virtual const IOAudioSampleRate *getSampleRate();
+    
+    virtual IOReturn hardwareSampleRateChanged(const IOAudioSampleRate *sampleRate);
+
+    /*!
+     * @function getRunEraseHead 
+     * @abstract Returns true if the audio engine will run the erase head when the audio engine is running.
+     */
+    virtual bool getRunEraseHead();
+
+    /*!
+     * @function getStatus 
+     * @abstract Returns a pointer to the shared status buffer.
+     */
+    virtual const IOAudioEngineStatus *getStatus();
+
+    /*!
+     * @function timerCallback
+     * @abstract A static method used as a callback for the IOAudioDevice timer services.
+     * @discussion This method implements the IOAudioDevice::TimerEvent type.
+     * @param arg1 The IOAudioEngine that is the target of the event.
+     * @param device The IOAudioDevice that sent the timer event.
+     */
+    static void timerCallback(OSObject *arg1, IOAudioDevice *device);
+
+    /*!
+     * @function timerFired
+     * @abstract Indicates the timer has fired.
+     * @discussion This method is called by timerCallback to indicate the timer has fired.  This method calls performErase() and performFlush() to do erase head processing and
+     *  audio engine flushing each time the timer event fires.
+     */
+    virtual void timerFired();
+
+    /*!
+     * @function getTimerInterval
+     * @abstract Gets the timer interval for use by the timer event.
+     * @discussion This method is called each time the timer event is enabled through addTimer().  The default
+     *  implementation is set to return a value such that the timer event runs n times each cycle of the audio
+     *  engine through the sample buffer.  The value n is stored as the instance variable: numErasesPerBuffer.
+     *  The default value of numErasesPerBuffer is set to IOAUDIOENGINE_DEFAULT_NUM_ERASES_PER_BUFFER which is 4.
+     *  A subclass may change the value of numErasesPerBuffer or override getTimerInterval.  If it is overridden,
+     *  the subclass should call the superclass's implementation, compare its interval with the superclass's and
+     *  return the smaller of the two.
+     * @result Returns the interval for the timer event.
+     */
+    virtual AbsoluteTime getTimerInterval();
+
+    /*!
+     * @function performErase
+     * @abstract Performs erase head processing.
+     * @discussion This method is called automatically each time the timer event fires and erases the sample
+     *  buffer and mix buffer from the previous location up to the current location of the audio engine.
+     */
+    virtual void performErase();
+
+    /*!
+     * @function performFlush
+     * @abstract Performs the flush operation.
+     * @discussion This method is called automatically each time the timer event fires.  It stops the audio engine
+     *  if there are no more clients and the audio engine is passed the latest flush ending position.
+     */
+    virtual void performFlush();
+    
+    virtual void stopEngineAtPosition(IOAudioEnginePosition *endingPosition);
+
+    virtual IOReturn mixOutputSamples(const void *sourceBuf, void *mixBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
+    virtual IOReturn clipOutputSamples(const void *mixBuf, void *sampleBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
+    virtual void resetClipPosition(IOAudioStream *audioStream, UInt32 clipSampleFrame);
+    virtual IOReturn convertInputSamples(const void *sampleBuf, void *destBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
+    
+    virtual void takeTimeStamp(bool incrementLoopCount = true, AbsoluteTime *timestamp = NULL);
+    virtual IOReturn getLoopCountAndTimeStamp(UInt32 *loopCount, AbsoluteTime *timestamp);
+
+    virtual IOReturn calculateSampleTimeout(AbsoluteTime *sampleInterval, UInt32 numSampleFrames, IOAudioEnginePosition *startingPosition, AbsoluteTime *wakeupTime);
+    
+    virtual IOReturn performFormatChange(IOAudioStream *audioStream, const IOAudioStreamFormat *newFormat, const IOAudioSampleRate *newSampleRate);
+    
+    virtual void beginConfigurationChange();
+    virtual void completeConfigurationChange();
+    virtual void cancelConfigurationChange();
+
+    virtual IOReturn addDefaultAudioControl(IOAudioControl *defaultAudioControl);
+    virtual IOReturn removeDefaultAudioControl(IOAudioControl *defaultAudioControl);
+    virtual void removeAllDefaultAudioControls();
+    
+    virtual OSString *getGlobalUniqueID();
+    virtual OSString *getLocalUniqueID();
+
+protected:
+
+    /*!
+     * @function initKeys
+     * @abstract Generates the OSSymbols with the keys.
+     * @discussion Do not call this directly.  This is an internal initialization routine.
+     */ 
+    static void initKeys();
+    
+    virtual void setNumSampleFramesPerBuffer(UInt32 numSampleFrames);
+    virtual UInt32 getNumSampleFramesPerBuffer();
+
+    /*!
+     * @function setState
+     * @abstract Indicates that the audio engine is in the specified state.
+     * @discussion This method simply sets the internal state of the audio engine to the specified state.  It does not
+     *  affect a change to the state.  It does however keep other internal state-related attributes consistent.
+     *  For example, it enables or disables the timer as needed when the state changes to running or stopped.
+     * @param newState The state the audio engine is in.
+     * @result Returns the old state.
+     */
+    virtual IOAudioEngineState setState(IOAudioEngineState newState);
+
+    /*!
+     * @function setSampleRate
+     * @abstract Records the sample rate of the audio engine.
+     * @discussion  This method must be called during initialization of a new audio engine to record the audio engine's
+     *  initial sample rate.  It also is intended to be used to record changes to the sample rate during use.
+     *  Currently changing sample rates after the audio engine has been started is not supported.
+     *  It may require that the sample buffers be re-sized.  This will be available in an upcoming release.
+     * @param newSampleRate The sample rate of the audio engine in samples per second.
+     */
+    virtual void setSampleRate(const IOAudioSampleRate *newSampleRate);
+
+    /*!
+     * @function setSampleLatency
+     * @abstract Sets the sample latency for the audio engine.
+     * @discussion The sample latency represents the number of samples ahead of the playback head
+     *  that it is safe to write into the sample buffer.  The audio device API will never write
+     *  closer to the playback head than the number of samples specified.  For input audio engines
+     *  the number of samples is behind the record head.
+     */
+    virtual void setSampleLatency(UInt32 numSamples);
+    virtual void setOutputSampleLatency(UInt32 numSamples);
+    virtual void setInputSampleLatency(UInt32 numSamples);
+    virtual void setSampleOffset(UInt32 numSamples);
+
+    /*!
+     * @function setRunEraseHead
+     * @abstract Tells the audio engine whether or not to run the erase head.
+     * @discussion By default, output audio engines run the erase head and input audio engines do not.  This method can
+     *  be called after setDirection() is called in order to change the default behavior.
+     * @param runEraseHead The audio engine will run the erase head if this value is true.
+     */
+    virtual void setRunEraseHead(bool runEraseHead);
+
+    /*!
+     * @function clientClosed
+     * @abstract Called automatically when a user client closes its connection to the audio engine.
+     * @discussion This method decrements the number of connections to the audio engine and if they reach
+     *  zero, the audio engine is called with a call to stopAudioEngine().  This method should not be called directly.
+     * @param client The user client that has disconnected.
+     */
+    virtual void clientClosed(IOAudioEngineUserClient *client);
+
+    /*!
+     * @function addTimer
+     * @abstract Enables the timer event for the audio engine.
+     * @discussion There is a timer event needed by the IOAudioEngine for processing the erase head
+     *  and performing flushing operations. When the timer fires, the method timerFired() is ultimately
+     *  called which in turn calls performErase() and performFlush().  This is called automatically
+     *  to enable the timer event for this audio engine.  It is called by setState() when the audio engine state
+     *  is set to kIOAudioEngineRunning.  When the timer is no longer needed, removeTimer() is called.
+     *  There is no need to call this directly.  
+     */
+    virtual void addTimer();
+
+    /*!
+     * @function removeTimer
+     * @abstract Disables the timer event for the audio engine.
+     * @discussion  This method is called automatically to disable the timer event for this audio engine.
+     *  There is need to call it directly.  This method is called by setState() when the audio engine state
+     *  is changed from kIOAudioEngineRunning to one of the stopped states.
+     */
+    virtual void removeTimer();
+
+    virtual void sendFormatChangeNotification(IOAudioStream *audioStream);
+    virtual void sendNotification(UInt32 notificationType);
+    
+    virtual IOReturn createUserClient(task_t task, void *securityID, UInt32 type, IOAudioEngineUserClient **newUserClient);
+
+	static IOReturn _addUserClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);		// <rdar://7529580>
+    static IOReturn addUserClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+	static IOReturn _removeUserClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+    static IOReturn removeUserClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+    static IOReturn detachUserClientsAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+    
+    virtual IOReturn addUserClient(IOAudioEngineUserClient *newUserClient);
+    virtual IOReturn removeUserClient(IOAudioEngineUserClient *userClient);
+    virtual IOReturn detachUserClients();
+    
+    virtual IOReturn startClient(IOAudioEngineUserClient *userClient);
+    virtual IOReturn stopClient(IOAudioEngineUserClient *userClient);
+    
+    virtual IOReturn incrementActiveUserClients();
+    virtual IOReturn decrementActiveUserClients();
+    
+    virtual void detachAudioStreams();
+	void setWorkLoopOnAllAudioControls(IOWorkLoop *wl);
+
+	static inline void lockStreamForIO(IOAudioStream *stream);
+	static inline void unlockStreamForIO(IOAudioStream *stream);
+
+	// These aren't virtual by design
+	UInt32 getNextStreamID(IOAudioStream * newStream);
+	IOAudioStream * getStreamForID(UInt32 streamID);
+
+};
+
+#endif /* _IOKIT_IOAUDIOENGINE_H */
diff --git a/i386/include/IOKit/audio/IOAudioEngineUserClient.h b/i386/include/IOKit/audio/IOAudioEngineUserClient.h
new file mode 100644
index 0000000..cc51a83
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioEngineUserClient.h
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOAUDIOENGINEUSERCLIENT_H
+#define _IOKIT_IOAUDIOENGINEUSERCLIENT_H
+
+#include <IOKit/IOUserClient.h>
+#ifndef IOAUDIOFAMILY_SELF_BUILD
+#include <IOKit/audio/IOAudioEngine.h>
+#include <IOKit/audio/IOAudioTypes.h>
+#else
+#include "IOAudioEngine.h"
+#include "IOAudioTypes.h"
+#endif
+#include <IOKit/IOBufferMemoryDescriptor.h>
+
+class IOAudioEngine;
+class IOAudioStream;
+class IOMemoryDescriptor;
+class IOCommandGate;
+class IOWorkLoop;
+
+class IOAudioEngineUserClient;
+class IOAudioClientBufferSet;
+typedef struct IOAudioFormatNotification;
+typedef struct IOAudioClientBuffer {
+    IOAudioEngineUserClient		*userClient;
+    IOAudioStream 				*audioStream;
+    void						*sourceBuffer;
+    IOMemoryDescriptor			*sourceBufferDescriptor;
+    IOMemoryMap					*sourceBufferMap;
+    void						*unmappedSourceBuffer; 
+    UInt32						numSampleFrames;
+    UInt32						numChannels;
+    IOAudioEnginePosition		mixedPosition;
+    struct IOAudioClientBuffer	*mNextBuffer32;
+    struct IOAudioClientBuffer	*nextClip;
+    struct IOAudioClientBuffer	*previousClip;
+    struct IOAudioClientBuffer	*nextClient;
+	IOAudioBufferDataDescriptor *bufferDataDescriptor;
+} IOAudioClientBuffer;
+
+/* IOAudioClientBuffer64 added for binary compatibility with old PPC drivers covered by <rdar://problem/4651809> */
+typedef struct IOAudioClientBuffer64 
+{
+    IOAudioClientBuffer				mAudioClientBuffer32;
+    mach_vm_address_t				mUnmappedSourceBuffer64;
+    struct IOAudioClientBuffer64	*mNextBuffer64;
+} IOAudioClientBuffer64;
+
+typedef struct IOAudioClientBufferExtendedInfo {
+	// Added stuff for registerClientParameterBuffer
+	UInt32						bufferSetID;
+	void						*paramBuffer;
+	IOMemoryDescriptor			*paramBufferDescriptor;
+	IOMemoryMap					*paramBufferMap;
+	void						*unmappedParamBuffer;
+	struct IOAudioClientBufferExtendedInfo	*mNextExtended;
+} IOAudioClientBufferExtendedInfo;
+/* IOAudioClientBufferExtendedInfo64 added for binary compatibility with old PPC drivers covered by <rdar://problem/4651809>  */
+typedef struct IOAudioClientBufferExtendedInfo64 
+{
+	IOAudioClientBufferExtendedInfo mAudioClientBufferExtended32;
+	mach_vm_address_t			mUnmappedParamBuffer64;
+	struct IOAudioClientBufferExtendedInfo64	*mNextExtended64;
+}	IOAudioClientBufferExtendedInfo64;
+
+
+class IOAudioEngineUserClient : public IOUserClient
+	{
+		OSDeclareDefaultStructors(IOAudioEngineUserClient)
+		
+		friend class IOAudioEngine;
+		friend class IOAudioClientBufferSet;
+		friend class IOAudioStream;
+		
+	protected:
+		IOAudioEngine				*audioEngine;
+		
+		IOWorkLoop					*workLoop;
+		IOCommandGate				*commandGate;
+		
+		IOExternalMethod			old_methods[5];		// It's size can't be changed for binary compatibility reasons, no longer used.
+		IOExternalTrap				trap;
+		
+		task_t						clientTask;
+		UInt32						numSampleFrames;		// Never used...
+		
+		IOAudioClientBufferSet		*clientBufferSetList;
+		IORecursiveLock 			*clientBufferLock;
+		
+		IOAudioNotificationMessage	*notificationMessage;
+		
+		bool						online;
+		
+	protected:
+		struct ExpansionData {
+			IOAudioClientBufferExtendedInfo64	*extendedInfo;
+			IOExternalMethod					methods[kIOAudioEngineNumCalls];		// This size can be changed, this is the new methods pointer
+			UInt32								classicMode;
+		};
+		
+		ExpansionData *reserved;
+		
+	public:
+		virtual IOReturn externalMethod( uint32_t selector, IOExternalMethodArguments * arguments, 	IOExternalMethodDispatch * dispatch, 
+										OSObject * target, 	void * reference);
+		// New code added here...
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 0);	
+		virtual IOReturn registerClientParameterBuffer (void * parameterBuffer, UInt32 bufferSetID);  // unused function
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 1);	
+		virtual IOAudioClientBufferExtendedInfo * findExtendedInfo(UInt32 bufferSetID);
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 2);	
+		virtual IOReturn getNearestStartTime(IOAudioStream *audioStream, IOAudioTimeStamp *ioTimeStamp, UInt32 isInput);
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 3);	
+		virtual IOReturn getClientNearestStartTime(IOAudioStream *audioStream, IOAudioTimeStamp *ioTimeStamp, UInt32 isInput);
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 4);	
+		virtual IOReturn safeRegisterClientBuffer(UInt32 audioStreamIndex, void * sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 5);	
+		virtual bool initWithAudioEngine(IOAudioEngine *engine, task_t task, void *securityToken, UInt32 type, OSDictionary *properties);	
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 6);	<rdar://problems/5321701>
+		virtual IOReturn safeRegisterClientBuffer64(UInt32 audioStreamIndex, mach_vm_address_t * sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 7);	<rdar://problems/5321701>
+		virtual IOReturn registerClientBuffer64(IOAudioStream *audioStream, mach_vm_address_t sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 8);	<rdar://problems/5321701>
+		virtual IOReturn registerBuffer64(IOAudioStream *audioStream, mach_vm_address_t sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 9);	<rdar://problems/5321701>
+		virtual IOReturn unregisterBuffer64(mach_vm_address_t sourceBuffer, UInt32 bufferSetID);
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 10);	<rdar://problems/5321701>
+		virtual IOReturn unregisterClientBuffer64(mach_vm_address_t  * sourceBuffer, UInt32 bufferSetID);
+		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 11);	 <rdar://problems/5321701>
+		virtual IOAudioClientBufferExtendedInfo64 * findExtendedInfo64(UInt32 bufferSetID);
+	
+		
+		
+	private:
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 0);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 1);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 2);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 3);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 4);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 5);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 6);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 7);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 8);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 9);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 10);
+		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 11);
+		
+		
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 12);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 13);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 14);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 15);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 16);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 17);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 18);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 19);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 20);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 21);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 22);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 23);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 24);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 25);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 26);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 27);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 28);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 29);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 30);
+		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 31);
+		
+	protected:
+		virtual IOReturn clientClose();
+		virtual IOReturn clientDied();
+		
+		static IOReturn _closeClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+		static IOReturn closeClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+		virtual IOReturn closeClient();
+		
+		
+		virtual IOReturn clientMemoryForType(UInt32 type, UInt32 *flags, IOMemoryDescriptor **memory);
+		virtual IOExternalMethod *getExternalMethodForIndex(UInt32 index);
+		virtual IOExternalTrap *getExternalTrapForIndex(UInt32 index);
+		virtual IOReturn registerNotificationPort(mach_port_t port, UInt32 type, UInt32 refCon);
+		
+		static IOReturn _registerNotificationAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+		static IOReturn registerNotificationAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+		virtual IOReturn registerNotification(mach_port_t port, UInt32 refCon);
+	
+		virtual void setOnline(bool newOnline);
+		
+		virtual IOReturn performClientOutput(UInt32 firstSampleFrame, UInt32 loopCount, IOAudioClientBufferSet *bufferSet, UInt32 sampleIntervalHi, UInt32 sampleIntervalLo);
+		virtual IOReturn performClientInput(UInt32 firstSampleFrame, IOAudioClientBufferSet *bufferSet);
+		virtual void performWatchdogOutput(IOAudioClientBufferSet *clientBufferSet, UInt32 generationCount);
+		
+		virtual void lockBuffers();
+		virtual void unlockBuffers();
+		
+	public:
+		
+		static IOAudioEngineUserClient *withAudioEngine(IOAudioEngine *engine, task_t clientTask, void *securityToken, UInt32 type);
+		static IOAudioEngineUserClient *withAudioEngine(IOAudioEngine *engine, task_t clientTask, void *securityToken, UInt32 type, OSDictionary *properties);
+		
+		virtual bool initWithAudioEngine(IOAudioEngine *engine, task_t task, void *securityToken, UInt32 type);
+		
+		virtual void free();
+		virtual void freeClientBufferSetList();
+		virtual void freeClientBuffer(IOAudioClientBuffer64 *clientBuffer);
+		
+		virtual void stop(IOService *provider);
+		
+		virtual bool isOnline();
+		
+		virtual IOReturn registerBuffer(IOAudioStream *audioStream, void* sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
+		virtual IOReturn unregisterBuffer( void * sourceBuffer, UInt32 bufferSetID);
+		
+		static IOReturn _registerBufferAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+		static IOReturn registerBufferAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+		static IOReturn _unregisterBufferAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+		static IOReturn unregisterBufferAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+		
+		virtual IOReturn registerClientBuffer(IOAudioStream *audioStream, void * sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
+		virtual IOReturn unregisterClientBuffer(void * sourceBuffer, UInt32 bufferSetID);
+		
+		static IOReturn _getNearestStartTimeAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+		static IOReturn getNearestStartTimeAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+		
+		virtual IOAudioClientBufferSet *findBufferSet(UInt32 bufferSetID);
+		virtual void removeBufferSet(IOAudioClientBufferSet *bufferSet);
+		
+		virtual IOReturn getConnectionID(UInt32 *connectionID);
+		
+		virtual IOReturn clientStart();
+		virtual IOReturn clientStop();
+		
+		static IOReturn _startClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+		static IOReturn startClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+		static IOReturn _stopClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
+		static IOReturn stopClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+		
+		virtual IOReturn startClient();
+		virtual IOReturn stopClient();
+		
+		virtual IOReturn performClientIO(UInt32 firstSampleFrame, UInt32 loopCount, bool inputIO, UInt32 bufferSetID, UInt32 sampleIntervalHi, UInt32 sampleIntervalLo);
+		
+		virtual void sendFormatChangeNotification(IOAudioStream *audioStream);
+		virtual IOReturn sendNotification(UInt32 notificationType);
+		
+	};
+
+#endif /* _IOKIT_IOAUDIOENGINEUSERCLIENT_H */
diff --git a/i386/include/IOKit/audio/IOAudioLevelControl.h b/i386/include/IOKit/audio/IOAudioLevelControl.h
new file mode 100644
index 0000000..d76786d
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioLevelControl.h
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOAUDIOLEVELCONTROL_H
+#define _IOKIT_IOAUDIOLEVELCONTROL_H
+
+#ifndef IOAUDIOFAMILY_SELF_BUILD
+#include <IOKit/audio/IOAudioControl.h>
+#else
+#include "IOAudioControl.h"
+#endif
+
+class OSArray;
+
+/*!
+ * @class IOAudioLevelControl
+ * @abstract
+ * @discussion
+ */
+
+class IOAudioLevelControl : public IOAudioControl
+{
+    OSDeclareDefaultStructors(IOAudioLevelControl)
+
+protected:
+    SInt32	minValue;
+    SInt32	maxValue;
+    IOFixed	minDB;
+    IOFixed	maxDB;
+    
+    OSArray *ranges;
+    
+protected:
+    struct ExpansionData { };
+    
+    ExpansionData *reserved;
+
+public:
+	static IOAudioLevelControl *createPassThruVolumeControl (SInt32 initialValue,
+                                                                SInt32 minValue,
+                                                                SInt32 maxValue,
+                                                                IOFixed minDB,
+                                                                IOFixed maxDB,
+                                                                UInt32 channelID,
+                                                                const char *channelName,
+                                                                UInt32 cntrlID);
+
+	// OSMetaClassDefineReservedUnused(IOAudioLevelControl, 0);
+    /*!
+	 * @function setLinearScale
+     * @abstract This function tells CoreAudio if it should apply a curve to the scaler representation of the volume.
+	 * @param useLinearScale TRUE instructs CoreAudio to not apply a curve to the scaler representation of the volume,
+	 * FALSE instructs CoreAudio to apply a curve, which is CoreAudio's default behavior.
+     */
+	virtual void setLinearScale(bool useLinearScale);
+
+private:
+    OSMetaClassDeclareReservedUsed(IOAudioLevelControl, 0);
+
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 1);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 2);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 3);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 4);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 5);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 6);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 7);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 8);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 9);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 10);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 11);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 12);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 13);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 14);
+    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 15);
+
+public:
+    /*!
+     * @function create
+     * @abstract Allocates a new level control with the given attributes
+     * @param initialValue The initial value of the control
+     * @param minValue The lowest possible value the control may have 
+     * @param maxValue The highest possible value the control may have
+     * @param minDB A fixed point representation of the db value matching minValue 
+     * @param maxDB A fixed point representation of the db value matching maxValue 
+     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
+     * @param channelName An optional name for the channel.  Common names are located in IOAudioTypes.h.
+     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls.
+     * @result Returns a newly allocted and initialized level IOAudioControl
+     */
+    static IOAudioLevelControl *create(SInt32 initialValue,
+                                       SInt32 minValue,
+                                       SInt32 maxValue,
+                                       IOFixed minDB,
+                                       IOFixed maxDB,
+                                       UInt32 channelID,
+                                       const char *channelName = 0,
+                                       UInt32 cntrlID = 0,
+                                       UInt32 subType = 0,
+                                       UInt32 usage = 0);
+                                       
+    static IOAudioLevelControl *createVolumeControl(SInt32 initialValue,
+                                                    SInt32 minValue,
+                                                    SInt32 maxValue,
+                                                    IOFixed minDB,
+                                                    IOFixed maxDB,
+                                                    UInt32 channelID,
+                                                    const char *channelName = 0,
+                                                    UInt32 cntrlID = 0,
+                                                    UInt32 usage = 0);
+
+    /*!
+     * @function init
+     * @abstract Initializes a newly allocated IOAudioLevelControl with the given attributes
+     * @param initialValue The initial value of the control
+     * @param minValue The lowest possible value the control may have 
+     * @param maxValue The highest possible value the control may have
+     * @param minDB A fixed point representation of the db value matching minValue 
+     * @param maxDB A fixed point representation of the db value matching maxValue 
+     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
+     * @param channelName An optional name for the channel.  Common names are located in IOAudioTypes.h.
+     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls.
+     * @param properties Standard property list passed to the init() function of any new IOService.  This dictionary
+     *  gets stored in the registry entry for this service.
+     * @result Returns true on success
+     */
+    virtual bool init(SInt32 initialValue,
+                      SInt32 minValue,
+                      SInt32 maxValue,
+                      IOFixed minDB,
+                      IOFixed maxDB,
+                      UInt32 channelID,
+                      const char *channelName = 0,
+                      UInt32 cntrlID = 0,
+                      UInt32 subType = 0,
+                      UInt32 usage = 0,
+                      OSDictionary *properties = 0);
+                      
+    virtual void free();
+
+    /*!
+     * @function setMinValue
+     * @abstract Sets the minimum value the control may have
+     * @param minValue The minimum value for the control
+     */
+    virtual void setMinValue(SInt32 minValue);
+
+    virtual SInt32 getMinValue();
+     
+    /*!
+     * @function setMaxValue
+     * @abstract Sets the maximum value the control may have
+     * @param maxValue The maximum value for the control
+     */ 
+    virtual void setMaxValue(SInt32 maxValue);
+
+    virtual SInt32 getMaxValue();
+     
+     /*!
+     * @function setMinDB
+     * @abstract Sets the minimum value in db that the control may have
+     * @discussion This value is represented as an IOFixed value which is a fixed point number.  The IOFixed
+     *  type is a 16.16 fixed point value.
+     * @param minDB The minimum value in db for the control
+     */
+    virtual void setMinDB(IOFixed minDB);
+
+    virtual IOFixed getMinDB();
+    
+    /*!
+     * @function setMaxDB
+     * @abstract Sets the maximum value in db that the control may have
+     * @discussion This value is represented as an IOFixed value which is a fixed point number.  The IOFixed
+     *  type is a 16.16 fixed point value.
+     * @param maxDB The maximum value in db for the control
+     */
+    virtual void setMaxDB(IOFixed maxDB);
+
+    virtual IOFixed getMaxDB();
+    
+    virtual IOReturn addRange(SInt32 minValue, SInt32 maxValue, IOFixed minDB, IOFixed maxDB);
+    virtual IOReturn addNegativeInfinity(SInt32 negativeInfinityValue);
+    
+    virtual IOReturn validateValue(OSObject *newValue);
+};
+
+#endif /* _IOKIT_IOAUDIOLEVELCONTROL_H */
diff --git a/i386/include/IOKit/audio/IOAudioPort.h b/i386/include/IOKit/audio/IOAudioPort.h
new file mode 100644
index 0000000..728c65e
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioPort.h
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOAUDIOPORT_H
+#define _IOKIT_IOAUDIOPORT_H
+
+#include <IOKit/IOService.h>
+
+class IOAudioDevice;
+class IOAudioControl;
+class OSDictionary;
+
+/*!
+ * @class IOAudioPort
+ * @abstract Represents a logical or physical port or functional unit in an audio device.
+ * @discussion An IOAudioPort represents an element in the signal chain in the audio device.  It may contain
+ *  one or more controls (represented by IOAudioControl) by which different attributes of the port may be
+ *  represented and adjusted.
+ *
+ *  IOAudioPort objects are connected up in the IORegistry in the IOAudioPlane to represent the signal chain of
+ *  the device.  They may be connected to other IOAudioPorts as well as IOAudioEngines to indicate they either
+ *  feed into or are fed by one of the audio engines (i.e. they provide input to or take output from the computer).
+ */
+class IOAudioPort : public IOService
+{
+    friend class IOAudioDevice;
+
+    OSDeclareDefaultStructors(IOAudioPort)
+
+public:
+    /* @var audioDevice The IOAudioDevice that this IOAudioPort belongs to. */
+    IOAudioDevice *	audioDevice;
+    /* @var audioControls A set containg all of the IOAudioControl instances that belong to the port. */
+    OSSet *		audioControls;
+    bool		isRegistered;
+
+protected:
+    struct ExpansionData { };
+    
+    ExpansionData *reserved;
+    
+private:
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 0);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 1);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 2);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 3);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 4);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 5);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 6);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 7);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 8);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 9);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 10);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 11);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 12);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 13);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 14);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 15);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 16);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 17);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 18);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 19);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 20);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 21);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 22);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 23);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 24);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 25);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 26);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 27);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 28);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 29);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 30);
+    OSMetaClassDeclareReservedUnused(IOAudioPort, 31);
+
+public:
+    /*!
+     * @function withAttributes
+     * @abstract Allocates a new IOAudioPort instance with the given attributes
+     * @discussion This static method allocates a new IOAudioPort and calls initWithAttributes() on it with
+     *  the parameters passed in to it.
+     * @param portType A readable string representing the type of port.  Common port types are defined in
+     *  IOAudioTypes.h and are prefixed with 'kIOAudioPortType'.  Please provide feedback if there are
+     *  other common port types that should be included.
+     * @param portName A readable string representing the name of the port.  For example: 'Internal Speaker',
+     *  'Line Out'.  This field is optional, but useful for providing information to the application/user.
+     * @param subType Developer defined readable string representing a subtype for the port. (optional)
+     * @param properties Standard property list passed to the init of any new IOService.  This dictionary
+     *  gets stored in the registry for this instance. (optional)
+     * @result Returns the newly allocated and initialized IOAudioPort instance.
+     */
+    static IOAudioPort *withAttributes(UInt32 portType, const char *portName = 0, UInt32 subType = 0, OSDictionary *properties = 0);
+
+    /*!
+     * @function initWithAttributes
+     * @abstract Initializes a newly allocated IOAudioPort instance with the given attributes
+     * @discussion The properties parameter is passed on the superclass' init().  The portType, subType
+     *  and properties parameters are optional, however portType is recommended.
+     * @param portType A readable string representing the type of port.  Common port types are defined in
+     *  IOAudioTypes.h and are prefixed with 'kIOAudioPortType'.  Please provide feedback if there are
+     *  other common port types that should be included.
+     * @param portName A readable string representing the name of the port.  For example: 'Internal Speaker',
+     *  'Line Out'.  This field is optional, but useful for providing information to the application/user.
+     * @param subType Developer defined readable string representing a subtype for the port. (optional)
+     * @param properties Standard property list passed to the init of any new IOService.  This dictionary
+     *  gets stored in the registry for this instance. (optional)
+     * @result Returns true on success.
+     */
+    virtual bool initWithAttributes(UInt32 portType, const char *portName = 0, UInt32 subType = 0, OSDictionary *properties = 0);
+
+    /*!
+     * @function free
+     * @abstract Frees all of the resources allocated by the IOAudioPort.
+     * @discussion Do not call this directly.  This is called automatically by the system when the instance's
+     *  refcount goes to 0.  To decrement the refcount, call release() on the object.
+     */
+    virtual void free();
+
+    /*!
+     * @function start
+     * @abstract Called to start a newly created IOAudioPort.
+     * @discussion This is called automatically by IOAudioDevice when attachAudioPort() is called.
+     * @param provider The IOAudioDevice that owns this port
+     * @result Returns true on success
+     */
+    virtual bool start(IOService *provider);
+
+    /*!
+     * @function stop
+     * @abstract Called when the IOAudioDevice is stopping when it is no longer available.
+     * @discussion This method calls deactivateAudioControls() to shut down all of the controls associated with
+     *  this port.
+     * @param provider The IOAudioDevice that owns this port
+     */
+    virtual void stop(IOService *provider);
+
+    virtual void registerService(IOOptionBits options = 0);
+
+    virtual IOAudioDevice *getAudioDevice();
+
+    /*!
+     * @function addAudioControl
+     * @abstract Adds a newly created IOAudioControl instance to the port.
+     * @discussion This method is responsible for starting the new IOAudioControl and adding it to the internal
+     *  audioControls array.
+     * @param control A newly created IOAudioControl instance that should belong to this port.
+     * @result Returns true on successfully staring the IOAudioControl.
+     */
+    virtual IOReturn addAudioControl(IOAudioControl *control);
+
+    /*!
+     * @function deactivateAudioControls
+     * @abstract Called to shut down all of the audio controls for this port.
+     * @discussion This will stop all of the audio controls and release them so that the instances may be
+     *  freed.  This is called from the free() method.
+     */
+    virtual void deactivateAudioControls();
+
+protected:
+    virtual void setType(UInt32 portType);
+    virtual void setSubType(UInt32 subType);
+    virtual void setName(const char *name);
+};
+
+#endif /* _IOKIT_IOAUDIOPORT_H */
diff --git a/i386/include/IOKit/audio/IOAudioSelectorControl.h b/i386/include/IOKit/audio/IOAudioSelectorControl.h
new file mode 100644
index 0000000..8687810
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioSelectorControl.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOAUDIOSELECTORCONTROL_H
+#define _IOKIT_IOAUDIOSELECTORCONTROL_H
+
+#ifndef IOAUDIOFAMILY_SELF_BUILD
+#include <IOKit/audio/IOAudioControl.h>
+#else
+#include "IOAudioControl.h"
+#endif
+
+class OSString;
+class OSArray;
+
+class IOAudioSelectorControl : public IOAudioControl
+{
+    OSDeclareDefaultStructors(IOAudioSelectorControl)
+    
+protected:
+
+    OSArray *availableSelections;
+
+protected:
+    struct ExpansionData { };
+    
+    ExpansionData *reserved;
+
+public:
+	static IOAudioSelectorControl *createOutputSelector(SInt32 initialValue,
+															UInt32 channelID,
+															const char *channelName = 0,
+															UInt32 cntrlID = 0);
+	static IOAudioSelectorControl *createOutputClockSelector(SInt32 initialValue,
+                                                                    UInt32 channelID,
+																	UInt32 clockSource,
+                                                                    const char *channelName = 0,
+                                                                    UInt32 cntrlID = 0);
+	static IOAudioSelectorControl *createInputClockSelector(SInt32 initialValue,
+                                                                    UInt32 channelID,
+																	UInt32 clockSource,
+                                                                    const char *channelName = 0,
+                                                                    UInt32 cntrlID = 0);
+
+    // OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 0);
+	virtual IOReturn removeAvailableSelection(SInt32 selectionValue);
+    // OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 1);
+	virtual IOReturn replaceAvailableSelection(SInt32 selectionValue, const char *selectionDescription);
+    // OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 2);
+	virtual IOReturn replaceAvailableSelection(SInt32 selectionValue, OSString *selectionDescription);
+
+private:
+    OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 0);
+    OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 1);
+    OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 2);
+
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 3);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 4);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 5);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 6);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 7);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 8);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 9);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 10);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 11);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 12);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 13);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 14);
+    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 15);
+
+public:
+    static IOAudioSelectorControl *create(SInt32 initialValue,
+                                            UInt32 channelID,
+                                            const char *channelName = 0,
+                                            UInt32 cntrlID = 0,
+                                            UInt32 subType = 0,
+                                            UInt32 usage = 0);
+                                            
+    static IOAudioSelectorControl *createInputSelector(SInt32 initialValue,
+                                                        UInt32 channelID,
+                                                        const char *channelName = 0,
+                                                        UInt32 cntrlID = 0);
+                                                        
+    virtual bool init(SInt32 initialValue,
+                      UInt32 channelID,
+                      const char *channelName = 0,
+                      UInt32 cntrlID = 0,
+                      UInt32 subType = 0,
+                      UInt32 usage = 0,
+                      OSDictionary *properties = 0);
+
+    virtual void free();
+
+    virtual IOReturn addAvailableSelection(SInt32 selectionValue, const char *selectionDescription);
+    virtual IOReturn addAvailableSelection(SInt32 selectionValue, OSString *selectionDescription);
+
+    virtual bool valueExists(SInt32 selectorValue);
+
+    virtual IOReturn validateValue(OSObject *newValue);
+
+};
+
+#endif /* _IOKIT_IOAUDIOSELECTORCONTROL_H */
diff --git a/i386/include/IOKit/audio/IOAudioStream.h b/i386/include/IOKit/audio/IOAudioStream.h
new file mode 100644
index 0000000..07f40be
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioStream.h
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOAUDIOSTREAM_H
+#define _IOKIT_IOAUDIOSTREAM_H
+
+#include <IOKit/IOService.h>
+#ifndef IOAUDIOFAMILY_SELF_BUILD
+#include <IOKit/audio/IOAudioEngine.h>
+#include <IOKit/audio/IOAudioTypes.h>
+#else
+#include "IOAudioEngine.h"
+#include "IOAudioTypes.h"
+#endif
+
+class OSSymbol;
+class OSArray;
+class OSDictionary;
+class OSSet;
+
+class IOCommandGate;
+class IOAudioControl;
+
+typedef struct IOAudioClientBuffer;
+typedef struct IOAudioStreamFormatDesc;
+
+/*!
+ * @class IOAudioStream
+ * @abstract This class wraps a single sample buffer in an audio driver.
+ * @discussion An IOAudioStream represents one hardware sample buffer as well as the direction
+ *  of that buffer, the mix buffer that multiple clients mix into as well as a list of
+ *  all of the formats to which this buffer can be set.
+ *
+ *  When an IOAudioEngine is created during init time in the driver, an IOAudioStream must be
+ *  created for each sample buffer in the device.  Typically, the sample buffer will be interleaved 
+ *  (or single channel), as a non-interleaved buffer should be divided into multiple single-channel
+ *  buffers (and multiple IOAudioStreams).
+ *
+ *  Additionally, when an IOAudioStream is created it must have all of the possible formats (and
+ *  allowed sample rates for each format) set and must have the currently set format specified
+ *  (addAvailableFormat() and setFormat()).
+ */
+
+class IOAudioStream : public IOService
+{
+    OSDeclareDefaultStructors(IOAudioStream)
+    
+    friend class IOAudioEngine;
+    friend class IOAudioEngineUserClient;
+
+public:
+
+    typedef IOReturn (*AudioIOFunction)(const void *mixBuf, void *sampleBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
+    
+    static const OSSymbol	*gDirectionKey;
+    static const OSSymbol	*gNumChannelsKey;
+    static const OSSymbol	*gSampleFormatKey;
+    static const OSSymbol	*gNumericRepresentationKey;
+    static const OSSymbol	*gBitDepthKey;
+    static const OSSymbol	*gBitWidthKey;
+    static const OSSymbol	*gAlignmentKey;
+    static const OSSymbol	*gByteOrderKey;
+    static const OSSymbol	*gIsMixableKey;
+    static const OSSymbol	*gDriverTagKey;
+    static const OSSymbol	*gMinimumSampleRateKey;
+    static const OSSymbol	*gMaximumSampleRateKey;
+
+    static void initKeys();
+
+    static OSDictionary *createDictionaryFromFormat(const IOAudioStreamFormat *streamFormat, const IOAudioStreamFormatExtension *formatExtension, OSDictionary *formatDict = 0);
+    static IOAudioStreamFormat *createFormatFromDictionary(const OSDictionary *formatDict, IOAudioStreamFormat *streamFormat = 0, IOAudioStreamFormatExtension *formatExtension = 0);
+
+    IOAudioEngine 				*audioEngine;
+    IOWorkLoop					*workLoop;
+    IOCommandGate				*commandGate;
+    IORecursiveLock				*streamIOLock;
+    
+    UInt32						numClients;
+
+    IOAudioStreamDirection		direction;
+
+    IOAudioStreamFormat			format;
+    IOAudioStreamFormatDesc		*availableFormats;
+    OSArray						*availableFormatDictionaries;
+    UInt32						numAvailableFormats;
+    
+    UInt32						startingChannelID;
+    UInt32						maxNumChannels;
+    
+    void						*sampleBuffer;
+    UInt32						sampleBufferSize;
+
+    void						*mixBuffer;
+    UInt32						mixBufferSize;
+    bool						streamAllocatedMixBuffer;
+    
+    AudioIOFunction				*audioIOFunctions;
+    UInt32						numIOFunctions;
+    
+    bool						streamAvailable;
+    
+    OSSet						*defaultAudioControls;
+    
+    IOAudioEnginePosition		startingPosition;
+    IOAudioEnginePosition		clippedPosition;
+    
+    IOAudioClientBuffer			*clientBufferListStart;
+    IOAudioClientBuffer			*clientBufferListEnd;
+    
+    IOAudioClientBuffer			*userClientList;
+	
+protected:
+
+    struct ExpansionData {
+		IOAudioStreamFormatExtension	streamFormatExtension;
+		UInt32							mSampleFramesReadByEngine;
+		IOReturn						mClipOutputStatus;
+	};
+    
+    ExpansionData *reserved;
+
+public:
+// New code added here:
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 0);
+    virtual const IOAudioStreamFormatExtension *getFormatExtension();
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 1);
+    virtual IOReturn setFormat(const IOAudioStreamFormat *streamFormat, const IOAudioStreamFormatExtension *formatExtension, bool callDriver = true);
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 2);
+    virtual IOReturn setFormat(const IOAudioStreamFormat *streamFormat, const IOAudioStreamFormatExtension *formatExtension, OSDictionary *formatDict, bool callDriver = true);
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 3);
+    virtual void addAvailableFormat(const IOAudioStreamFormat *streamFormat, const IOAudioStreamFormatExtension *formatExtension, const IOAudioSampleRate *minRate, const IOAudioSampleRate *maxRate, const AudioIOFunction *ioFunctionList = NULL, UInt32 numFunctions = 0);
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 4);
+    virtual void addAvailableFormat(const IOAudioStreamFormat *streamFormat, const IOAudioStreamFormatExtension *formatExtension, const IOAudioSampleRate *minRate, const IOAudioSampleRate *maxRate, AudioIOFunction ioFunction);
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 5);
+    virtual bool validateFormat(IOAudioStreamFormat *streamFormat, IOAudioStreamFormatExtension *formatExtension, IOAudioStreamFormatDesc *formatDesc);
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 6);
+	virtual void setTerminalType(const UInt32 terminalType);
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 7);
+	virtual IOReturn mixOutputSamples(const void *sourceBuf, void *mixBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 8);
+	virtual void setSampleLatency(UInt32 numSamples);
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 9);
+	virtual bool validateFormat(IOAudioStreamFormat *streamFormat, IOAudioStreamFormatExtension *formatExtension, IOAudioStreamFormatDesc *formatDesc, const IOAudioSampleRate *sampleRate);
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 10);
+	virtual UInt32 getNumSampleFramesRead();
+	// OSMetaClassDeclareReservedUsed(IOAudioStream, 11);
+	virtual void setDefaultNumSampleFramesRead(UInt32);
+
+private:
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 0);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 1);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 2);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 3);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 4);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 5);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 6);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 7);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 8);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 9);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 10);
+    OSMetaClassDeclareReservedUsed(IOAudioStream, 11);
+
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 12);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 13);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 14);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 15);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 16);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 17);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 18);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 19);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 20);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 21);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 22);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 23);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 24);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 25);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 26);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 27);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 28);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 29);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 30);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 31);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 32);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 33);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 34);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 35);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 36);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 37);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 38);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 39);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 40);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 41);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 42);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 43);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 44);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 45);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 46);
+    OSMetaClassDeclareReservedUnused(IOAudioStream, 47);
+
+public:
+    virtual bool initWithAudioEngine(IOAudioEngine *engine, IOAudioStreamDirection dir, UInt32 startChannelID, const char *streamDescription = NULL, OSDictionary *properties = 0);
+    virtual void free();
+    
+    virtual void stop(IOService *provider);
+    
+    virtual IOWorkLoop *getWorkLoop() const;
+
+    virtual IOReturn setProperties(OSObject *properties);
+
+    virtual IOAudioStreamDirection getDirection();
+
+    virtual void setSampleBuffer(void *buffer, UInt32 size);
+    virtual void *getSampleBuffer();
+    virtual UInt32 getSampleBufferSize();
+    
+    virtual void setMixBuffer(void *buffer, UInt32 size);
+    virtual void *getMixBuffer();
+    virtual UInt32 getMixBufferSize();
+    
+    virtual void numSampleFramesPerBufferChanged();
+
+    virtual void clearSampleBuffer();
+    
+    virtual void setIOFunction(AudioIOFunction ioFunction);
+    virtual void setIOFunctionList(const AudioIOFunction *ioFunctionList, UInt32 numFunctions);
+
+    virtual const IOAudioStreamFormat *getFormat();
+    static IOReturn setFormatAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
+    virtual IOReturn setFormat(const IOAudioStreamFormat *streamFormat, bool callDriver = true);
+    virtual IOReturn setFormat(OSDictionary *formatDict);
+    virtual IOReturn setFormat(const IOAudioStreamFormat *streamFormat, OSDictionary *formatDict, bool callDriver = true);
+    virtual IOReturn hardwareFormatChanged(const IOAudioStreamFormat *streamFormat);
+    virtual void addAvailableFormat(const IOAudioStreamFormat *streamFormat, const IOAudioSampleRate *minRate, const IOAudioSampleRate *maxRate, const AudioIOFunction *ioFunctionList = NULL, UInt32 numFunctions = 0);
+    virtual void addAvailableFormat(const IOAudioStreamFormat *streamFormat, const IOAudioSampleRate *minRate, const IOAudioSampleRate *maxRate, AudioIOFunction ioFunction);
+    virtual void clearAvailableFormats();
+    virtual bool validateFormat(IOAudioStreamFormat *streamFormat, IOAudioStreamFormatDesc *formatDesc);
+    
+    virtual UInt32 getStartingChannelID();
+    virtual UInt32 getMaxNumChannels();
+    
+    virtual void setStreamAvailable(bool available);
+    virtual bool getStreamAvailable();
+    
+    virtual IOReturn addDefaultAudioControl(IOAudioControl *defaultAudioControl);
+    virtual void removeDefaultAudioControls();
+
+protected:
+    virtual void lockStreamForIO();
+    virtual void unlockStreamForIO();
+    
+    virtual void updateNumClients();
+    virtual IOReturn addClient(IOAudioClientBuffer *clientBuffer);
+    virtual void removeClient(IOAudioClientBuffer *clientBuffer);
+    virtual UInt32 getNumClients();
+    
+    virtual IOReturn processOutputSamples(IOAudioClientBuffer *clientBuffer, UInt32 firstSampleFrame, UInt32 loopCount, bool samplesAvailable);
+    virtual IOReturn readInputSamples(IOAudioClientBuffer *clientBuffer, UInt32 firstSampleFrame);
+    
+    virtual void resetClipInfo();
+    virtual void clipIfNecessary();
+    virtual void clipOutputSamples(UInt32 startingSampleFrame, UInt32 numSampleFrames);
+    
+    virtual void setStartingChannelNumber(UInt32 channelNumber);
+
+private:
+    virtual void setDirection(IOAudioStreamDirection dir);
+
+};
+
+#endif /* _IOKIT_IOAUDIOSTREAM_H */
diff --git a/i386/include/IOKit/audio/IOAudioToggleControl.h b/i386/include/IOKit/audio/IOAudioToggleControl.h
new file mode 100644
index 0000000..95bfb4a
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioToggleControl.h
@@ -0,0 +1,121 @@
+/*   
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *   
+ * @APPLE_LICENSE_HEADER_START@
+ *   
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *  
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *  
+ * @APPLE_LICENSE_HEADER_END@
+ */  
+
+#ifndef _IOKIT_IOAUDIOTOGGLECONTROL_H
+#define _IOKIT_IOAUDIOTOGGLECONTROL_H
+
+#ifndef IOAUDIOFAMILY_SELF_BUILD
+#include <IOKit/audio/IOAudioControl.h>
+#else
+#include "IOAudioControl.h"
+#endif
+
+/*!
+ * @class IOAudioToggleControl
+ */
+
+class IOAudioToggleControl : public IOAudioControl
+{
+    OSDeclareDefaultStructors(IOAudioToggleControl)
+
+protected:
+    struct ExpansionData { };
+    
+    ExpansionData *reserved;
+
+// New code added here
+public:
+    /*!
+     * @function createPassThruMuteControl
+     * @abstract Allocates a new pass through mute control with the given attributes
+     * @param initialValue The initial value of the control
+     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
+     * @param channelName An optional name for the channel.  Common names are located in IOAudioPort.h.
+     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls
+     * @result Returns a newly allocated and initialized mute IOAudioControl
+     */
+	static IOAudioToggleControl *createPassThruMuteControl (bool initialValue,
+																UInt32 channelID,
+																const char *channelName,
+																UInt32 cntrlID);
+
+private:
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 0);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 1);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 2);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 3);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 4);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 5);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 6);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 7);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 8);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 9);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 10);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 11);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 12);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 13);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 14);
+    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 15);
+
+public:
+    /*!
+     * @function create
+     * @abstract Allocates a new mute control with the given attributes
+     * @param initialValue The initial value of the control
+     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
+     * @param channelName An optional name for the channel.  Common names are located in IOAudioPort.h.
+     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls
+     * @result Returns a newly allocated and initialized mute IOAudioControl
+     */
+    static IOAudioToggleControl *create(bool initialValue,
+                                        UInt32 channelID,
+                                        const char *channelName = 0,
+                                        UInt32 cntrlID = 0,
+                                        UInt32 subType = 0,
+                                        UInt32 usage = 0);
+                                      
+    static IOAudioToggleControl *createMuteControl(bool initialValue,
+                                                    UInt32 channelID,
+                                                    const char *channelName = 0,
+                                                    UInt32 cntrlID = 0,
+                                                    UInt32 usage = 0);
+
+    /*!
+     * @function init
+     * @abstract Initializes a newly allocated IOAudioToggleControl with the given attributes
+     * @param initialValue The initial value of the control
+     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
+     * @param channelName An optional name for the channel.  Common names are located in IOAudioPort.h.
+     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls
+     * @result Returns truen on success
+     */
+    virtual bool init(bool initialValue,
+                      UInt32 channelID, 
+                      const char *channelName = 0,
+                      UInt32 cntrlID = 0,
+                      UInt32 subType = 0,
+                      UInt32 usage = 0,
+                      OSDictionary *properties = 0);
+
+};
+
+#endif /* _IOKIT_IOAUDIOTOGGLECONTROL_H */
diff --git a/i386/include/IOKit/audio/IOAudioTypes.h b/i386/include/IOKit/audio/IOAudioTypes.h
new file mode 100644
index 0000000..0526575
--- /dev/null
+++ b/i386/include/IOKit/audio/IOAudioTypes.h
@@ -0,0 +1,661 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOAUDIOTYPES_H
+#define _IOKIT_IOAUDIOTYPES_H
+
+#include <libkern/OSTypes.h>
+#include <mach/message.h>
+#include <device/device_types.h>
+
+
+/*!
+ * @enum IOAudioEngineMemory
+ * @abstract Used to identify the type of memory requested by a client process to be mapped into its process space
+ * @discussion This is the parameter to the type field of IOMapMemory when called on an IOAudioEngine.  This is
+ *  only intended for use by the Audio Device API library.
+ * @constant kIOAudioSampleBuffer This requests the IOAudioEngine's sample buffer
+ * @constant kIOAudioStatusBuffer This requests the IOAudioEngine's status buffer.  It's type is IOAudioEngineStatus.
+ * @constant kIOAudioMixBuffer This requests the IOAudioEngine's mix buffer
+*/
+typedef enum _IOAudioEngineMemory {
+    kIOAudioStatusBuffer 			= 0,
+    kIOAudioSampleBuffer			= 1,
+    kIOAudioMixBuffer				= 2,
+	kIOAudioBytesInInputBuffer		= 3,
+	kIOAudioBytesInOutputBuffer		= 4
+} IOAudioEngineMemory;
+
+/*!
+ * @enum IOAudioEngineCalls
+ * @abstract The set of constants passed to IOAudioEngineUserClient::getExternalMethodForIndex() when making calls
+ *  from the IOAudioFamily user client code.
+ */
+typedef enum _IOAudioEngineCalls {
+    kIOAudioEngineCallRegisterClientBuffer			= 0,
+    kIOAudioEngineCallUnregisterClientBuffer		= 1,
+    kIOAudioEngineCallGetConnectionID				= 2,
+    kIOAudioEngineCallStart							= 3,
+    kIOAudioEngineCallStop							= 4,
+	kIOAudioEngineCallGetNearestStartTime			= 5
+} IOAudioEngineCalls;
+
+/*! @defined kIOAudioEngineNumCalls The number of elements in the IOAudioEngineCalls enum. */
+#define kIOAudioEngineNumCalls		6
+
+typedef enum _IOAudioEngineTraps {
+    kIOAudioEngineTrapPerformClientIO				= 0
+} IOAudioEngineTraps;
+
+typedef enum _IOAudioEngineNotifications {
+    kIOAudioEngineAllNotifications 					= 0,
+    kIOAudioEngineStreamFormatChangeNotification	= 1,
+    kIOAudioEngineChangeNotification 				= 2,
+    kIOAudioEngineStartedNotification 				= 3,
+    kIOAudioEngineStoppedNotification 				= 4,
+    kIOAudioEnginePausedNotification				= 5,
+    kIOAudioEngineResumedNotification				= 6
+} IOAudioEngineNotifications;
+
+/*!
+ * @enum IOAudioEngineState
+ * @abstract Represents the state of an IOAudioEngine
+ * @constant kIOAudioEngineRunning The IOAudioEngine is currently running - it is transferring data to or 
+ *           from the device.
+ * @constant kIOAudioEngineStopped The IOAudioEngine is currently stopped - no activity is occurring.
+ */
+
+typedef enum _IOAudioEngineState {
+    kIOAudioEngineStopped							= 0,
+    kIOAudioEngineRunning							= 1,
+    kIOAudioEnginePaused							= 2,
+    kIOAudioEngineResumed							= 3
+} IOAudioEngineState;
+
+
+/*!
+ * @typedef IOAudioEngineStatus
+ * @abstract Shared-memory structure giving audio engine status
+ * @discussion
+ * @field fVersion Indicates version of this structure
+ * @field fCurrentLoopCount Number of times around the ring buffer since the audio engine started
+ * @field fLastLoopTime Timestamp of the last time the ring buffer wrapped
+ * @field fEraseHeadSampleFrame Location of the erase head in sample frames - erased up to but not
+ *        including the given sample frame
+ */
+
+typedef struct _IOAudioEngineStatus {
+    UInt32					fVersion;
+    volatile UInt32			fCurrentLoopCount;
+    volatile AbsoluteTime                    fLastLoopTime;
+    volatile UInt32			fEraseHeadSampleFrame;
+} IOAudioEngineStatus;
+
+#define kIOAudioEngineCurrentStatusStructVersion		2
+
+typedef struct _IOAudioStreamFormat {
+    UInt32	fNumChannels;
+    UInt32	fSampleFormat;
+    UInt32	fNumericRepresentation;
+    UInt8	fBitDepth;
+    UInt8	fBitWidth;
+    UInt8	fAlignment;
+    UInt8	fByteOrder;
+    UInt8	fIsMixable;
+    UInt32	fDriverTag;
+} IOAudioStreamFormat;
+
+#define kFormatExtensionInvalidVersion					0
+#define kFormatExtensionCurrentVersion					1
+
+typedef struct _IOAudioStreamFormatExtension {
+    UInt32	fVersion;
+    UInt32	fFlags;
+    UInt32	fFramesPerPacket;
+    UInt32	fBytesPerPacket;
+} IOAudioStreamFormatExtension;
+
+typedef struct _IOAudioBufferDataDescriptor {
+	UInt32	fActualDataByteSize;
+	UInt32	fActualNumSampleFrames;
+	UInt32	fTotalDataByteSize;
+	UInt32	fNominalDataByteSize;
+	UInt8	fData[1];
+} IOAudioBufferDataDescriptor;
+
+#define kStreamDataDescriptorInvalidVersion				0
+#define kStreamDataDescriptorCurrentVersion				1
+
+typedef struct _IOAudioStreamDataDescriptor {
+    UInt32	fVersion;
+    UInt32	fNumberOfStreams;
+    UInt32	fStreamLength[1];			// Array with fNumberOfStreams number of entries
+} IOAudioStreamDataDescriptor;
+
+typedef struct _IOAudioSampleIntervalDescriptor {
+	UInt32	sampleIntervalHi;
+	UInt32	sampleIntervalLo;
+} IOAudioSampleIntervalDescriptor;
+
+/*!
+    @struct         SMPTETime
+    @abstract       A structure for holding a SMPTE time.
+    @field          fSubframes
+                        The number of subframes in the full message.
+    @field          fSubframeDivisor
+                        The number of subframes per frame (typically 80).
+    @field          fCounter
+                        The total number of messages received.
+    @field          fType
+                        The kind of SMPTE time using the SMPTE time type constants.
+    @field          fFlags
+                        A set of flags that indicate the SMPTE state.
+    @field          fHours
+                        The number of hourse in the full message.
+    @field          fMinutes
+                        The number of minutes in the full message.
+    @field          fSeconds
+                        The number of seconds in the full message.
+    @field          fFrames
+                        The number of frames in the full message.
+*/
+typedef struct _IOAudioSMPTETime
+{
+    SInt16  fSubframes;
+    SInt16  fSubframeDivisor;
+    UInt32  fCounter;
+    UInt32  fType;
+    UInt32  fFlags;
+    SInt16  fHours;
+    SInt16  fMinutes;
+    SInt16  fSeconds;
+    SInt16  fFrames;
+
+} IOAudioSMPTETime;
+
+//	constants describing SMPTE types (taken from the MTC spec)
+enum
+{
+	kIOAudioSMPTETimeType24			= 0,
+	kIOAudioSMPTETimeType25			= 1,
+	kIOAudioSMPTETimeType30Drop		= 2,
+	kIOAudioSMPTETimeType30			= 3,
+	kIOAudioSMPTETimeType2997		= 4,
+	kIOAudioSMPTETimeType2997Drop	= 5
+};
+
+//	flags describing a SMPTE time stamp
+enum
+{
+	kIOAudioSMPTETimeValid		= (1L << 0),	//	the full time is valid
+	kIOAudioSMPTETimeRunning	= (1L << 1)		//	time is running
+};
+
+//	A struct for encapsulating the parts of a time stamp. The flags
+//	say which fields are valid.
+typedef struct _IOAudioTimeStamp
+{
+	UInt64				fSampleTime;	//	the absolute sample time, was a Float64
+	UInt64				fHostTime;		//	the host's root timebase's time
+	UInt64				fRateScalar;	//	the system rate scalar, was a Float64
+	UInt64				fWordClockTime;	//	the word clock time
+	IOAudioSMPTETime	fSMPTETime;		//	the SMPTE time
+	UInt32				fFlags;			//	the flags indicate which fields are valid
+	UInt32				fReserved;		//	reserved, pads the structure out to force 8 byte alignment
+} IOAudioTimeStamp;
+
+//	flags for the AudioTimeStamp sturcture
+enum
+{
+	kIOAudioTimeStampSampleTimeValid	= (1L << 0),
+	kIOAudioTimeStampHostTimeValid		= (1L << 1),
+	kIOAudioTimeStampRateScalarValid	= (1L << 2),
+	kIOAudioTimeStampWordClockTimeValid	= (1L << 3),
+	kIOAudioTimeStampSMPTETimeValid		= (1L << 4)
+};
+
+//	Some commonly used combinations of timestamp flags
+enum
+{
+	kIOAudioTimeStampSampleHostTimeValid	= (kIOAudioTimeStampSampleTimeValid | kIOAudioTimeStampHostTimeValid)
+};
+
+/*!
+* @enum IOAudioStreamDirection
+ * @abstract Represents the direction of an IOAudioStream
+ * @constant kIOAudioStreamDirectionOutput Output buffer
+ * @constant kIOAudioStreamDirectionInput Input buffer
+ */
+
+typedef enum _IOAudioStreamDirection {
+    kIOAudioStreamDirectionOutput	= 0,
+    kIOAudioStreamDirectionInput	= 1
+} IOAudioStreamDirection;
+
+enum {
+	kIOAudioDeviceCanBeDefaultNothing	= 0,
+	kIOAudioDeviceCanBeDefaultInput		= (1L << 0),
+	kIOAudioDeviceCanBeDefaultOutput	= (1L << 1),
+	kIOAudioDeviceCanBeSystemOutput		= (1L << 2)
+};
+
+/*!
+ * @defined kIOAudioEngineDefaultMixBufferSampleSize
+ */
+
+#define kIOAudioEngineDefaultMixBufferSampleSize		sizeof(float)
+
+/* The following are for use only by the IOKit.framework audio family code */
+
+/*!
+ * @enum IOAudioControlCalls
+ * @abstract The set of constants passed to IOAudioControlUserClient::getExternalMethodForIndex() when making calls
+ *  from the IOAudioFamily user client code.
+ * @constant kIOAudioControlCallSetValue Used to set the value of an IOAudioControl.
+ * @constant kIOAudioControlCallGetValue Used to get the value of an IOAudioControl.
+ */
+typedef enum _IOAudioControlCalls {
+    kIOAudioControlCallSetValue = 0,
+    kIOAudioControlCallGetValue = 1
+} IOAudioControlCalls;
+
+/*! @defined kIOAudioControlNumCalls The number of elements in the IOAudioControlCalls enum. */
+#define kIOAudioControlNumCalls 	2
+
+/*!
+ * @enum IOAudioControlNotifications
+ * @abstract The set of constants passed in the type field of IOAudioControlUserClient::registerNotificaitonPort().
+ * @constant kIOAudioControlValueChangeNotification Used to request value change notifications.
+ * @constant kIOAudioControlRangeChangeNotification Used to request range change notifications.
+ */
+typedef enum _IOAudioControlNotifications {
+    kIOAudioControlValueChangeNotification = 0,
+	kIOAudioControlRangeChangeNotification = 1
+} IOAudioControlNotifications;
+
+/*!
+ * @struct IOAudioNotificationMessage
+ * @abstract Used in the mach message for IOAudio notifications.
+ * @field messageHeader Standard mach message header
+ * @field ref The param passed to registerNotificationPort() in refCon.
+ */
+typedef struct _IOAudioNotificationMessage {
+    mach_msg_header_t	messageHeader;
+    UInt32		type;
+    UInt32		ref;
+    void *		sender;
+} IOAudioNotificationMessage;
+
+typedef struct _IOAudioSampleRate {
+    UInt32	whole;
+    UInt32	fraction;
+} IOAudioSampleRate;
+
+#define kNoIdleAudioPowerDown		0xffffffffffffffffULL
+
+enum {
+    kIOAudioPortTypeOutput		= 'outp',
+    kIOAudioPortTypeInput		= 'inpt',
+    kIOAudioPortTypeMixer		= 'mixr',
+    kIOAudioPortTypePassThru	= 'pass',
+    kIOAudioPortTypeProcessing	= 'proc'
+};
+
+enum {
+    kIOAudioOutputPortSubTypeInternalSpeaker	= 'ispk',
+    kIOAudioOutputPortSubTypeExternalSpeaker	= 'espk',
+    kIOAudioOutputPortSubTypeHeadphones			= 'hdpn',
+    kIOAudioOutputPortSubTypeLine				= 'line',
+    kIOAudioOutputPortSubTypeSPDIF				= 'spdf',
+    
+    kIOAudioInputPortSubTypeInternalMicrophone	= 'imic',
+    kIOAudioInputPortSubTypeExternalMicrophone	= 'emic',
+    kIOAudioInputPortSubTypeCD					= 'cd  ',
+    kIOAudioInputPortSubTypeLine				= 'line',
+    kIOAudioInputPortSubTypeSPDIF				= 'spdf'
+};
+
+enum {
+    kIOAudioControlTypeLevel			= 'levl',
+    kIOAudioControlTypeToggle			= 'togl',
+	kIOAudioControlTypeJack				= 'jack',
+    kIOAudioControlTypeSelector			= 'slct'
+};
+
+enum {
+    kIOAudioLevelControlSubTypeVolume						= 'vlme',
+	kIOAudioLevelControlSubTypeLFEVolume					= 'subv',
+	kIOAudioLevelControlSubTypePRAMVolume					= 'pram',
+    kIOAudioToggleControlSubTypeMute						= 'mute',
+    kIOAudioToggleControlSubTypeSolo						= 'solo',
+	kIOAudioToggleControlSubTypeLFEMute						= 'subm',
+	kIOAudioToggleControlSubTypeiSubAttach					= 'atch',
+    kIOAudioSelectorControlSubTypeOutput					= 'outp',
+    kIOAudioSelectorControlSubTypeInput						= 'inpt',
+    kIOAudioSelectorControlSubTypeClockSource				= 'clck',
+    kIOAudioSelectorControlSubTypeDestination				= 'dest',
+	kIOAudioSelectorControlSubTypeChannelNominalLineLevel	= 'nlev',
+	kIOAudioSelectorControlSubTypeChannelLevelPlus4dBu		= '4dbu',
+	kIOAudioSelectorControlSubTypeChannelLevelMinus10dBV	= '10db',
+	kIOAudioSelectorControlSubTypeChannelLevelMinus20dBV	= '20db',
+	kIOAudioSelectorControlSubTypeChannelLevelMicLevel		= 'micl',
+	kIOAudioSelectorControlSubTypeChannelLevelInstrumentLevel		= 'istl'
+};
+
+enum {
+    kIOAudioControlUsageOutput				= 'outp',
+    kIOAudioControlUsageInput				= 'inpt',
+    kIOAudioControlUsagePassThru			= 'pass',
+    kIOAudioControlUsageCoreAudioProperty	= 'prop'
+};
+
+enum {
+    kIOAudioControlChannelNumberInactive				= -1,
+    kIOAudioControlChannelIDAll							= 0,
+    kIOAudioControlChannelIDDefaultLeft					= 1,
+    kIOAudioControlChannelIDDefaultRight				= 2,
+    kIOAudioControlChannelIDDefaultCenter				= 3,
+    kIOAudioControlChannelIDDefaultLeftRear				= 4,
+    kIOAudioControlChannelIDDefaultRightRear			= 5,
+    kIOAudioControlChannelIDDefaultSub					= 6,
+    kIOAudioControlChannelIDDefaultFrontLeftCenter		= 7,
+    kIOAudioControlChannelIDDefaultFrontRightCenter		= 8,
+    kIOAudioControlChannelIDDefaultRearCenter			= 9,
+    kIOAudioControlChannelIDDefaultSurroundLeft			= 10,
+    kIOAudioControlChannelIDDefaultSurroundRight		= 11
+};
+
+enum {
+    kIOAudioSelectorControlSelectionValueNone				= 'none',
+    
+    // Output-specific selection IDs 
+    kIOAudioSelectorControlSelectionValueInternalSpeaker	= 'ispk',
+    kIOAudioSelectorControlSelectionValueExternalSpeaker	= 'espk',
+    kIOAudioSelectorControlSelectionValueHeadphones			= 'hdpn',
+    
+    // Input-specific selection IDs
+    kIOAudioSelectorControlSelectionValueInternalMicrophone	= 'imic',
+    kIOAudioSelectorControlSelectionValueExternalMicrophone	= 'emic',
+    kIOAudioSelectorControlSelectionValueCD					= 'cd  ',
+    
+    // Common selection IDs
+    kIOAudioSelectorControlSelectionValueLine				= 'line',
+    kIOAudioSelectorControlSelectionValueSPDIF				= 'spdf'
+};
+
+enum {
+    kIOAudioStreamSampleFormatLinearPCM		= 'lpcm',
+    kIOAudioStreamSampleFormatIEEEFloat		= 'ieee',
+    kIOAudioStreamSampleFormatALaw			= 'alaw',
+    kIOAudioStreamSampleFormatMuLaw			= 'ulaw',
+    kIOAudioStreamSampleFormatMPEG			= 'mpeg',
+    kIOAudioStreamSampleFormatAC3			= 'ac-3',
+    kIOAudioStreamSampleFormat1937AC3		= 'cac3',
+    kIOAudioStreamSampleFormat1937MPEG1		= 'mpg1',
+    kIOAudioStreamSampleFormat1937MPEG2		= 'mpg2',
+	kIOAudioStreamSampleFormatTimeCode		= 'time'		//	a stream of IOAudioTimeStamp structures that capture any incoming time code information
+};
+
+enum {
+    kIOAudioStreamNumericRepresentationSignedInt	= 'sint',
+    kIOAudioStreamNumericRepresentationUnsignedInt	= 'uint',
+	kIOAudioStreamNumericRepresentationIEEE754Float = 'flot'
+};
+
+enum {
+	kIOAudioClockSelectorTypeInternal			= 'int ',
+	kIOAudioClockSelectorTypeExternal			= 'ext ',
+	kIOAudioClockSelectorTypeAESEBU				= 'asbu',
+	kIOAudioClockSelectorTypeTOSLink			= 'tosl',
+	kIOAudioClockSelectorTypeSPDIF				= 'spdf',
+	kIOAudioClockSelectorTypeADATOptical		= 'adto',
+	kIOAudioClockSelectorTypeADAT9Pin			= 'adt9',
+	kIOAudioClockSelectorTypeSMPTE				= 'smpt',
+	kIOAudioClockSelectorTypeVideo				= 'vdeo',
+	kIOAudioClockSelectorTypeControl			= 'cnrl',
+	kIOAudioClockSelectorTypeOther				= 'othr',
+};
+
+enum {
+    kIOAudioStreamAlignmentLowByte					= 0,
+    kIOAudioStreamAlignmentHighByte					= 1
+};
+
+enum {
+    kIOAudioStreamByteOrderBigEndian				= 0,
+    kIOAudioStreamByteOrderLittleEndian				= 1
+};
+
+enum {
+    kIOAudioLevelControlNegativeInfinity			= 0xffffffff
+};
+
+enum {
+    kIOAudioNewClockDomain							= 0xffffffff
+};
+
+// Device connection types
+#ifndef __OPEN_SOURCE__
+//	<rdar://7130813>	Added kIOAudioDeviceTransportTypeDisplayPort
+#endif
+enum {
+	kIOAudioDeviceTransportTypeBuiltIn				= 'bltn',
+	kIOAudioDeviceTransportTypePCI					= 'pci ',
+	kIOAudioDeviceTransportTypeUSB					= 'usb ',
+	kIOAudioDeviceTransportTypeFireWire				= '1394',
+	kIOAudioDeviceTransportTypeNetwork				= 'ntwk',
+	kIOAudioDeviceTransportTypeWireless				= 'wrls',
+	kIOAudioDeviceTransportTypeOther				= 'othr',
+	kIOAudioDeviceTransportTypeBluetooth			= 'blue',
+	kIOAudioDeviceTransportTypeVirtual				= 'virt',
+	kIOAudioDeviceTransportTypeDisplayPort			= 'dprt',
+	kIOAudioDeviceTransportTypeHdmi					= 'hdmi'
+
+};
+
+// types that go nowhere
+enum {
+	OUTPUT_NULL										= 0x0100,
+	INPUT_NULL										= 0x0101
+};
+
+// Input terminal types
+enum {
+	INPUT_UNDEFINED									= 0x0200,
+	INPUT_MICROPHONE								= 0x0201,
+	INPUT_DESKTOP_MICROPHONE						= 0x0202,
+	INPUT_PERSONAL_MICROPHONE						= 0x0203,
+	INPUT_OMNIDIRECTIONAL_MICROPHONE				= 0x0204,
+	INPUT_MICROPHONE_ARRAY							= 0x0205,
+	INPUT_PROCESSING_MICROPHONE_ARRAY				= 0x0206,
+	INPUT_MODEM_AUDIO								= 0x207
+};
+
+// Output terminal types
+enum {
+	OUTPUT_UNDEFINED								= 0x0300,
+	OUTPUT_SPEAKER									= 0x0301,
+	OUTPUT_HEADPHONES								= 0x0302,
+	OUTPUT_HEAD_MOUNTED_DISPLAY_AUDIO				= 0x0303,
+	OUTPUT_DESKTOP_SPEAKER							= 0x0304,
+	OUTPUT_ROOM_SPEAKER								= 0x0305,
+	OUTPUT_COMMUNICATION_SPEAKER					= 0x0306,
+	OUTPUT_LOW_FREQUENCY_EFFECTS_SPEAKER			= 0x0307
+};
+
+// Bi-directional terminal types
+enum {
+	BIDIRECTIONAL_UNDEFINED							= 0x0400,
+	BIDIRECTIONAL_HANDSET							= 0x0401,
+	BIDIRECTIONAL_HEADSET							= 0x0402,
+	BIDIRECTIONAL_SPEAKERPHONE_NO_ECHO_REDX			= 0x0403,
+	BIDIRECTIONAL_ECHO_SUPPRESSING_SPEAKERPHONE		= 0x0404,
+	BIDIRECTIONAL_ECHO_CANCELING_SPEAKERPHONE		= 0x0405
+};
+
+// Telephony terminal types
+enum {
+	TELEPHONY_UNDEFINED								= 0x0500,
+	TELEPHONY_PHONE_LINE							= 0x0501,
+	TELEPHONY_TELEPHONE								= 0x0502,
+	TELEPHONY_DOWN_LINE_PHONE						= 0x0503
+};
+
+// External terminal types
+enum {
+	EXTERNAL_UNDEFINED								= 0x0600,
+	EXTERNAL_ANALOG_CONNECTOR						= 0x0601,
+	EXTERNAL_DIGITAL_AUDIO_INTERFACE				= 0x0602,
+	EXTERNAL_LINE_CONNECTOR							= 0x0603,
+	EXTERNAL_LEGACY_AUDIO_CONNECTOR					= 0x0604,
+	EXTERNAL_SPDIF_INTERFACE						= 0x0605,
+	EXTERNAL_1394_DA_STREAM							= 0x0606,
+	EXTERNAL_1394_DV_STREAM_SOUNDTRACK				= 0x0607,
+	EXTERNAL_ADAT									= 0x0608,
+	EXTERNAL_TDIF									= 0x0609,
+	EXTERNAL_MADI									= 0x060A
+};
+
+// Embedded terminal types
+enum {
+	EMBEDDED_UNDEFINED								= 0x0700,
+	EMBEDDED_LEVEL_CALIBRATION_NOISE_SOURCE			= 0x0701,
+	EMBEDDED_EQUALIZATION_NOISE						= 0x0702,
+	EMBEDDED_CD_PLAYER								= 0x0703,
+	EMBEDDED_DAT									= 0x0704,
+	EMBEDDED_DCC									= 0x0705,
+	EMBEDDED_MINIDISK								= 0x0706,
+	EMBEDDED_ANALOG_TAPE							= 0x0707,
+	EMBEDDED_PHONOGRAPH								= 0x0708,
+	EMBEDDED_VCR_AUDIO								= 0x0709,
+	EMBEDDED_VIDEO_DISC_AUDIO						= 0x070A,
+	EMBEDDED_DVD_AUDIO								= 0x070B,
+	EMBEDDED_TV_TUNER_AUDIO							= 0x070C,
+	EMBEDDED_SATELLITE_RECEIVER_AUDIO				= 0x070D,
+	EMBEDDED_CABLE_TUNER_AUDIO						= 0x070E,
+	EMBEDDED_DSS_AUDIO								= 0x070F,
+	EMBEDDED_RADIO_RECEIVER							= 0x0710,
+	EMBEDDED_RADIO_TRANSMITTER						= 0x0711,
+	EMBEDDED_MULTITRACK_RECORDER					= 0x0712,
+	EMBEDDED_SYNTHESIZER							= 0x0713
+};
+
+// Processing terminal types
+enum {
+	PROCESSOR_UNDEFINED								= 0x0800,
+	PROCESSOR_GENERAL								= 0x0801
+};
+
+//	Channel spatial position types
+
+#ifndef __OPEN_SOURCE__
+//	<rdar://6868206>	NOTE: the following are derived from CoreAudioTypes.h
+#endif
+
+#define	kIOAudioChannelLabel_Discrete_field_ba		16
+enum {
+    kIOAudioChannelLabel_Unknown                  = 0xFFFFFFFF,   // unknown or unspecified other use
+    kIOAudioChannelLabel_Unused                   = 0,            // channel is present, but has no intended use or destination
+    kIOAudioChannelLabel_UseCoordinates           = 100,          // channel is described by the mCoordinates fields.
+	
+    kIOAudioChannelLabel_Left                     = 1,
+    kIOAudioChannelLabel_Right                    = 2,
+    kIOAudioChannelLabel_Center                   = 3,
+    kIOAudioChannelLabel_LFEScreen                = 4,
+    kIOAudioChannelLabel_LeftSurround             = 5,            // WAVE: "Back Left"
+    kIOAudioChannelLabel_RightSurround            = 6,            // WAVE: "Back Right"
+    kIOAudioChannelLabel_LeftCenter               = 7,
+    kIOAudioChannelLabel_RightCenter              = 8,
+    kIOAudioChannelLabel_CenterSurround           = 9,            // WAVE: "Back Center" or plain "Rear Surround"
+    kIOAudioChannelLabel_LeftSurroundDirect       = 10,           // WAVE: "Side Left"
+    kIOAudioChannelLabel_RightSurroundDirect      = 11,           // WAVE: "Side Right"
+    kIOAudioChannelLabel_TopCenterSurround        = 12,
+    kIOAudioChannelLabel_VerticalHeightLeft       = 13,           // WAVE: "Top Front Left"
+    kIOAudioChannelLabel_VerticalHeightCenter     = 14,           // WAVE: "Top Front Center"
+    kIOAudioChannelLabel_VerticalHeightRight      = 15,           // WAVE: "Top Front Right"
+	
+    kIOAudioChannelLabel_TopBackLeft              = 16,
+    kIOAudioChannelLabel_TopBackCenter            = 17,
+    kIOAudioChannelLabel_TopBackRight             = 18,
+	
+    kIOAudioChannelLabel_RearSurroundLeft         = 33,
+    kIOAudioChannelLabel_RearSurroundRight        = 34,
+    kIOAudioChannelLabel_LeftWide                 = 35,
+    kIOAudioChannelLabel_RightWide                = 36,
+    kIOAudioChannelLabel_LFE2                     = 37,
+    kIOAudioChannelLabel_LeftTotal                = 38,           // matrix encoded 4 channels
+    kIOAudioChannelLabel_RightTotal               = 39,           // matrix encoded 4 channels
+    kIOAudioChannelLabel_HearingImpaired          = 40,
+    kIOAudioChannelLabel_Narration                = 41,
+    kIOAudioChannelLabel_Mono                     = 42,
+    kIOAudioChannelLabel_DialogCentricMix         = 43,
+	
+    kIOAudioChannelLabel_CenterSurroundDirect     = 44,           // back center, non diffuse
+    
+    kIOAudioChannelLabel_Haptic                   = 45,
+	
+    // first order ambisonic channels
+    kIOAudioChannelLabel_Ambisonic_W              = 200,
+    kIOAudioChannelLabel_Ambisonic_X              = 201,
+    kIOAudioChannelLabel_Ambisonic_Y              = 202,
+    kIOAudioChannelLabel_Ambisonic_Z              = 203,
+	
+    // Mid/Side Recording
+    kIOAudioChannelLabel_MS_Mid                   = 204,
+    kIOAudioChannelLabel_MS_Side                  = 205,
+	
+    // X-Y Recording
+    kIOAudioChannelLabel_XY_X                     = 206,
+    kIOAudioChannelLabel_XY_Y                     = 207,
+	
+    // other
+    kIOAudioChannelLabel_HeadphonesLeft           = 301,
+    kIOAudioChannelLabel_HeadphonesRight          = 302,
+    kIOAudioChannelLabel_ClickTrack               = 304,
+    kIOAudioChannelLabel_ForeignLanguage          = 305,
+	
+    // generic discrete channel
+    kIOAudioChannelLabel_Discrete                 = 400,
+	
+    // numbered discrete channel
+    kIOAudioChannelLabel_Discrete_0               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 0,
+    kIOAudioChannelLabel_Discrete_1               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 1,
+    kIOAudioChannelLabel_Discrete_2               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 2,
+    kIOAudioChannelLabel_Discrete_3               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 3,
+    kIOAudioChannelLabel_Discrete_4               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 4,
+    kIOAudioChannelLabel_Discrete_5               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 5,
+    kIOAudioChannelLabel_Discrete_6               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 6,
+    kIOAudioChannelLabel_Discrete_7               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 7,
+    kIOAudioChannelLabel_Discrete_8               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 8,
+    kIOAudioChannelLabel_Discrete_9               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 9,
+    kIOAudioChannelLabel_Discrete_10              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 10,
+    kIOAudioChannelLabel_Discrete_11              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 11,
+    kIOAudioChannelLabel_Discrete_12              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 12,
+    kIOAudioChannelLabel_Discrete_13              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 13,
+    kIOAudioChannelLabel_Discrete_14              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 14,
+    kIOAudioChannelLabel_Discrete_15              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 15,
+    kIOAudioChannelLabel_Discrete_65535           = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 65535
+};
+
+
+
+#endif /* _IOKIT_IOAUDIOTYPES_H */
diff --git a/i386/include/IOKit/avc/IOFireWireAVCCommand.h b/i386/include/IOKit/avc/IOFireWireAVCCommand.h
new file mode 100644
index 0000000..ff9850d
--- /dev/null
+++ b/i386/include/IOKit/avc/IOFireWireAVCCommand.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 1998-2001 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _IOKIT_IOFireWireAVCCommand_H
+#define _IOKIT_IOFireWireAVCCommand_H
+ 
+#include <IOKit/firewire/IOFWCommand.h>
+
+/*! @class IOFireWireAVCCommand
+*/
+class IOFireWireAVCCommand : public IOFWCommand
+{
+    OSDeclareDefaultStructors(IOFireWireAVCCommand)
+    
+protected:
+    IOFWCommand 		*fWriteCmd;
+    IOMemoryDescriptor	*fMem;
+    const UInt8 		*fCommand;
+    
+    UInt32 	fCmdLen;
+    UInt8 	*fResponse;
+    UInt32 	*fResponseLen;
+    int		fCurRetries;
+    int		fMaxRetries;
+    
+    UInt32	fWriteGen;
+    UInt16	fWriteNodeID;
+    bool	bypassRobustCommandResponseMatching;
+	
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { 
+		bool 	fStarted;
+		bool 	fSyncWakeupSignaled;
+	};
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *fIOFireWireAVCCommandExpansion;
+    
+    static void writeDone(void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd);
+    
+    virtual IOReturn	complete(IOReturn status);
+    virtual IOReturn	execute();
+    virtual void		free();
+    
+public:
+    virtual bool init(IOFireWireNub *device, const UInt8 * command, UInt32 cmdLen,
+                                                    UInt8 * response, UInt32 * responseLen);
+    virtual IOReturn reinit(IOFireWireNub *device, const UInt8 * command, UInt32 cmdLen,
+                                                    UInt8 * response, UInt32 * responseLen);
+                                                    
+    static IOFireWireAVCCommand *withNub(IOFireWireNub *device, const UInt8 * command, UInt32 cmdLen,
+                                                    UInt8 * response, UInt32 * responseLen);
+                                                    
+    static IOFireWireAVCCommand *withNub(IOFireWireNub *device, UInt32 generation,
+                const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 * responseLen);
+                                                    
+    virtual UInt32 handleResponse(UInt16 nodeID, UInt32 len, const void *buf);
+
+    virtual IOReturn resetInterimTimeout();
+
+	virtual UInt32 handleResponseWithSimpleMatching(UInt16 nodeID, UInt32 len, const void *buf);
+
+    virtual IOReturn 	submit(bool queue = false);
+
+private:
+    OSMetaClassDeclareReservedUsed(IOFireWireAVCCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCCommand, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCCommand, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCCommand, 3);
+};
+
+#endif // _IOKIT_IOFireWireAVCCommand_H
+
diff --git a/i386/include/IOKit/avc/IOFireWireAVCConsts.h b/i386/include/IOKit/avc/IOFireWireAVCConsts.h
new file mode 100644
index 0000000..ae7a12c
--- /dev/null
+++ b/i386/include/IOKit/avc/IOFireWireAVCConsts.h
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 1998-2001 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _IOKIT_IOFIREWIREAVCCONSTS_H
+#define _IOKIT_IOFIREWIREAVCCONSTS_H
+
+// Fields of AVC frame
+typedef enum {
+    kAVCCommandResponse = 0,
+    kAVCAddress = 1,
+    kAVCOpcode = 2,
+    kAVCOperand0 = 3,
+    kAVCOperand1 = 4,
+    kAVCOperand2 = 5,
+    kAVCOperand3 = 6,
+    kAVCOperand4 = 7,
+    kAVCOperand5 = 8,
+    kAVCOperand6 = 9,
+    kAVCOperand7 = 10,
+    kAVCOperand8 = 11
+} IOAVCFrameFields;
+
+// Command/Response values
+typedef enum {
+    kAVCControlCommand                      = 0x00,
+    kAVCStatusInquiryCommand                = 0x01,
+    kAVCSpecificInquiryCommand				= 0x02,
+    kAVCNotifyCommand						= 0x03,
+    kAVCGeneralInquiryCommand				= 0x04,
+    kAVCNotImplementedStatus				= 0x08,
+    kAVCAcceptedStatus						= 0x09,
+    kAVCRejectedStatus						= 0x0a,
+    kAVCInTransitionStatus					= 0x0b,
+    kAVCImplementedStatus					= 0x0c,
+    kAVCChangedStatus						= 0x0d,
+    kAVCInterimStatus						= 0x0f
+} IOAVCCommandResponse;
+
+// Opcodes
+typedef enum {
+
+    // Unit commands
+    kAVCPlugInfoOpcode						= 0x02,
+    kAVCOutputPlugSignalFormatOpcode		= 0x18,
+    kAVCInputPlugSignalFormatOpcode			= 0x19,
+    kAVCUnitInfoOpcode						= 0x30,
+    kAVCSubunitInfoOpcode					= 0x31,
+    kAVCConnectionsOpcode					= 0x22,
+    kAVCConnectOpcode						= 0x24,
+    kAVCDisconnectOpcode					= 0x25,
+    kAVCPowerOpcode							= 0xB2,
+	kAVCSignalSourceOpcode					= 0x1A,
+	
+    // Vendor dependent commands
+    kAVCVendorDependentOpcode				= 0x00,
+
+    // Subunit commands
+    kAVCOutputSignalModeOpcode              = 0x78,
+    kAVCInputSignalModeOpcode               = 0x79, 
+    kAVCSignalModeSD525_60                  = 0x00,
+    kAVCSignalModeSDL525_60                 = 0x04,
+    kAVCSignalModeHD1125_60                 = 0x08,
+    kAVCSignalModeSD625_50                  = 0x80, 
+    kAVCSignalModeSDL625_50                 = 0x84, 
+    kAVCSignalModeHD1250_50                 = 0x88,
+    kAVCSignalModeDVCPro525_60				= 0x78,
+    kAVCSignalModeDVCPro625_50				= 0xf8,
+    
+    kAVCSignalModeDummyOperand              = 0xff,
+    kAVCSignalModeMask_50					= 0x80,
+    kAVCSignalModeMask_STYPE				= 0x7c,          
+    kAVCSignalModeMask_SDL					= 0x04,          
+    kAVCSignalModeMask_DVCPro25				= 0x78        
+
+} IOAVCOpcodes;
+
+// Unit/Subunit types
+typedef enum {
+    kAVCVideoMonitor						= 0x00,
+    kAVCAudio								= 0x01,
+    kAVCPrinter								= 0x02,
+    kAVCDiskRecorder						= 0x03,
+    kAVCTapeRecorder						= 0x04,
+    kAVCTuner								= 0x05,
+    kAVCVideoCamera							= 0x07,
+    kAVCCameraStorage						= 0x0b,
+    kAVCVendorUnique						= 0x1c,
+    kAVCNumSubUnitTypes						= 0x20
+} IOAVCUnitTypes;
+
+#define kAVCAllOpcodes 0xFF
+#define kAVCAllSubunitsAndUnit 0xEE
+#define kAVCMaxNumPlugs 31
+#define kAVCAnyAvailableIsochPlug 0x7F
+#define kAVCAnyAvailableExternalPlug 0xFF
+#define kAVCAnyAvailableSubunitPlug 0xFF
+#define kAVCMultiplePlugs 0xFD
+#define kAVCInvalidPlug 0xFE
+
+
+#define IOAVCAddress(type, id) (((type) << 3) | (id))
+#define kAVCUnitAddress 0xff
+#define IOAVCType(address) ((address) >> 3)
+#define IOAVCId(address) ((address) & 0x7)
+
+// Macros for Plug Control Register field manipulation
+
+// Master control registers
+#define kIOFWPCRDataRate FWBitRange(0,1)
+#define kIOFWPCRDataRatePhase FWBitRangePhase(0,1)
+#define kIOFWPCRExtension FWBitRange(8,15)
+#define kIOFWPCRExtensionPhase FWBitRangePhase(8,15)
+#define kIOFWPCRNumPlugs FWBitRange(27,31)
+#define kIOFWPCRNumPlugsPhase FWBitRangePhase(27,31)
+
+// master output register
+#define kIOFWPCRBroadcastBase FWBitRange(2,7)
+#define kIOFWPCRBroadcastBasePhase FWBitRangePhase(2,7)
+
+// plug registers
+#define kIOFWPCROnline FWBitRange(0,0)
+#define kIOFWPCROnlinePhase FWBitRangePhase(0,0)
+#define kIOFWPCRBroadcast FWBitRange(1,1)
+#define kIOFWPCRBroadcastPhase FWBitRangePhase(1,1)
+#define kIOFWPCRP2PCount FWBitRange(2,7)
+#define kIOFWPCRP2PCountPhase FWBitRangePhase(2,7)
+#define kIOFWPCRChannel FWBitRange(10,15)
+#define kIOFWPCRChannelPhase FWBitRangePhase(10,15)
+
+// Extra fields for output plug registers
+#define kIOFWPCROutputDataRate FWBitRange(16,17)
+#define kIOFWPCROutputDataRatePhase FWBitRangePhase(16,17)
+#define kIOFWPCROutputOverhead FWBitRange(18,21)
+#define kIOFWPCROutputOverheadPhase FWBitRangePhase(18,21)
+#define kIOFWPCROutputPayload FWBitRange(22,31)
+#define kIOFWPCROutputPayloadPhase FWBitRangePhase(22,31)
+
+// async plug numbers
+
+enum
+{
+	kFWAVCAsyncPlug0 	= 0xa0,
+	kFWAVCAsyncPlug1 	= 0xa1,
+	kFWAVCAsyncPlug2 	= 0xa2,
+	kFWAVCAsyncPlug3 	= 0xa3,
+	kFWAVCAsyncPlug4 	= 0xa4,
+	kFWAVCAsyncPlug5 	= 0xa5,
+	kFWAVCAsyncPlug6 	= 0xa6,
+	kFWAVCAsyncPlug7 	= 0xa7,
+	kFWAVCAsyncPlug8 	= 0xa8,
+	kFWAVCAsyncPlug9 	= 0xa9,
+	kFWAVCAsyncPlug10 	= 0xa1,
+	kFWAVCAsyncPlug11	= 0xab,
+	kFWAVCAsyncPlug12 	= 0xac,
+	kFWAVCAsyncPlug13	= 0xad,
+	kFWAVCAsyncPlug14	= 0xae,
+	kFWAVCAsyncPlug15 	= 0xaf,
+	kFWAVCAsyncPlug16 	= 0xb0,
+	kFWAVCAsyncPlug17 	= 0xb1,
+	kFWAVCAsyncPlug18	= 0xb2,
+	kFWAVCAsyncPlug19 	= 0xb3,
+	kFWAVCAsyncPlug20 	= 0xb4,
+	kFWAVCAsyncPlug21 	= 0xb5,
+	kFWAVCAsyncPlug22 	= 0xb6,
+	kFWAVCAsyncPlug23 	= 0xb7,
+	kFWAVCAsyncPlug24 	= 0xb8,
+	kFWAVCAsyncPlug25 	= 0xb9,
+	kFWAVCAsyncPlug26 	= 0xba,
+	kFWAVCAsyncPlug27 	= 0xbb,
+	kFWAVCAsyncPlug28 	= 0xbc,
+	kFWAVCAsyncPlug29 	= 0xbd,
+	kFWAVCAsyncPlug30	= 0xbe,
+	kFWAVCAsyncPlugAny	= 0xbf
+};
+
+enum
+{
+    kFWAVCStateBusSuspended 	= 0,
+    kFWAVCStateBusResumed 		= 1,
+    kFWAVCStatePlugReconnected 	= 2,
+    kFWAVCStatePlugDisconnected = 3,
+    kFWAVCStateDeviceRemoved	= 4
+};
+
+enum
+{
+    kFWAVCConsumerMode_MORE		= 1,
+    kFWAVCConsumerMode_LAST		= 4,
+    kFWAVCConsumerMode_LESS		= 5,
+    kFWAVCConsumerMode_JUNK		= 6,
+    kFWAVCConsumerMode_LOST		= 7
+};
+
+enum
+{
+    kFWAVCProducerMode_SEND		= 5,
+    kFWAVCProducerMode_TOSS		= 7
+};
+
+
+typedef enum
+{
+	IOFWAVCPlugSubunitSourceType,
+	IOFWAVCPlugSubunitDestType,
+	IOFWAVCPlugIsochInputType,
+	IOFWAVCPlugIsochOutputType,
+	IOFWAVCPlugAsynchInputType,
+	IOFWAVCPlugAsynchOutputType,
+	IOFWAVCPlugExternalInputType,
+	IOFWAVCPlugExternalOutputType
+} IOFWAVCPlugTypes;
+
+typedef enum
+{
+	kIOFWAVCSubunitPlugMsgConnected,
+	kIOFWAVCSubunitPlugMsgDisconnected,
+	kIOFWAVCSubunitPlugMsgConnectedPlugModified,
+	kIOFWAVCSubunitPlugMsgSignalFormatModified
+} IOFWAVCSubunitPlugMessages;
+
+// Some plug signal formats
+#define kAVCPlugSignalFormatNTSCDV 0x80000000
+#define kAVCPlugSignalFormatPalDV 0x80800000 
+#define kAVCPlugSignalFormatMPEGTS 0xA0000000
+
+// Possible states of an AVCAsynchronousCommand
+typedef enum
+{
+	kAVCAsyncCommandStatePendingRequest,
+	kAVCAsyncCommandStateRequestSent,
+	kAVCAsyncCommandStateRequestFailed,
+	kAVCAsyncCommandStateWaitingForResponse,
+	kAVCAsyncCommandStateReceivedInterimResponse,
+	kAVCAsyncCommandStateReceivedFinalResponse,
+	kAVCAsyncCommandStateTimeOutBeforeResponse,
+	kAVCAsyncCommandStateBusReset,
+	kAVCAsyncCommandStateOutOfMemory,
+	kAVCAsyncCommandStateCanceled
+} IOFWAVCAsyncCommandState;
+
+#endif // _IOKIT_IOFIREWIREAVCCONSTS_H
diff --git a/i386/include/IOKit/avc/IOFireWireAVCRequestSpace.h b/i386/include/IOKit/avc/IOFireWireAVCRequestSpace.h
new file mode 100644
index 0000000..c02797f
--- /dev/null
+++ b/i386/include/IOKit/avc/IOFireWireAVCRequestSpace.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *
+ *	IOFireWirePCRSpace.h
+ *
+ * Class to multiplex access to the FCP request address.
+ */
+#ifndef _IOKIT_IOFIREWIREAVCREQUESTSPACE_H
+#define _IOKIT_IOFIREWIREAVCREQUESTSPACE_H
+
+#endif /* _IOKIT_IOFIREWIREAVCREQUESTSPACE_H */
diff --git a/i386/include/IOKit/avc/IOFireWireAVCTargetSpace.h b/i386/include/IOKit/avc/IOFireWireAVCTargetSpace.h
new file mode 100644
index 0000000..4f3cdb0
--- /dev/null
+++ b/i386/include/IOKit/avc/IOFireWireAVCTargetSpace.h
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ *
+ *	IOFireWireAVCTargetSpace.h
+ *
+ * Class to centralize the AVC Target mode support
+ *
+ */
+
+#ifndef _IOKIT_IOFIREWIREAVCTARGETSPACE_H
+#define _IOKIT_IOFIREWIREAVCTARGETSPACE_H
+
+#include <IOKit/IOUserClient.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+
+#include <IOKit/firewire/IOFWAddressSpace.h>
+#include <IOKit/firewire/IOLocalConfigDirectory.h>
+#include <IOKit/avc/IOFireWireAVCConsts.h>
+#include <IOKit/avc/IOFireWireAVCUserClientCommon.h>
+
+class IOFireWireAVCProtocolUserClient;
+class AVCCommandHandlerInfo;
+class AVCSubunitInfo;
+
+typedef void (*IOFireWireAVCTargetCommandHandlerCallback)(const AVCCommandHandlerInfo *pCmdInfo,
+														  UInt32 generation,
+														  UInt16 nodeID,
+														  const void *command,
+														  UInt32 cmdLen,
+														  IOFWSpeed &speed,
+														  UInt32 handlerSearchIndex);
+
+typedef void (*IOFireWireAVCSubunitPlugHandlerCallback)(const AVCSubunitInfo *pSubunitInfo,
+														IOFWAVCSubunitPlugMessages plugMessage,
+														IOFWAVCPlugTypes plugType,
+														UInt32 plugNum,
+														UInt32 messageParams,
+														UInt32 generation,
+														UInt16 nodeID);
+
+/*!
+@class AVCCommandHandlerInfo
+@abstract internal class to manage installed command handlers
+*/
+class AVCCommandHandlerInfo : public OSObject
+{
+    OSDeclareDefaultStructors(AVCCommandHandlerInfo)
+public:
+	IOFireWireAVCProtocolUserClient * userClient;
+	IOFireWireAVCTargetCommandHandlerCallback callBack;
+	OSAsyncReference64 asyncRef;
+	UInt32 subUnitTypeAndID;
+	UInt32 opCode;
+	uint64_t userCallBack;
+	uint64_t userRefCon;
+};
+
+typedef struct _AVCSubunitPlugRecord
+{
+	UInt32 plugSignalFormat;
+	UInt32 connectionCount;
+}AVCSubunitPlugRecord;
+
+/*!
+@class AVCSubunitInfo
+@abstract internal class to manage installed subunits
+*/
+class AVCSubunitInfo : public OSObject
+{
+    OSDeclareDefaultStructors(AVCSubunitInfo)
+    bool init();
+    void free();
+public:
+	static AVCSubunitInfo *create();
+	IOFireWireAVCProtocolUserClient * userClient;
+	IOFireWireAVCSubunitPlugHandlerCallback callBack;
+	OSAsyncReference64 asyncRef;
+	UInt32 subunitTypeAndID;
+	UInt32 numSourcePlugs;
+	UInt32 numDestPlugs;
+	uint64_t userCallBack;
+	uint64_t userRefCon;
+	AVCSubunitPlugRecord *sourcePlugRecords;
+	AVCSubunitPlugRecord *destPlugRecords;
+};
+
+typedef struct _AVCUnitPlugRecord
+{
+	UInt32 connectionCount;
+}AVCUnitPlugRecord;
+
+typedef struct _AVCUnitPlugs
+{
+	UInt32 numIsochInPlugs;
+	UInt32 numIsochOutPlugs;
+	UInt32 numExternalInPlugs;
+	UInt32 numExternalOutPlugs;
+	AVCUnitPlugRecord isochInPlugRecord[kAVCMaxNumPlugs];
+	AVCUnitPlugRecord isochOutPlugRecord[kAVCMaxNumPlugs];
+	AVCUnitPlugRecord externalInPlugRecord[kAVCMaxNumPlugs];
+	AVCUnitPlugRecord externalOutPlugRecord[kAVCMaxNumPlugs];
+}AVCUnitPlugs;
+
+/*!
+@class UCInfo
+@abstract internal class to manage multiple protocol user clients
+*/
+class UCInfo : public OSObject
+{
+    OSDeclareDefaultStructors(UCInfo)
+public:
+    IOFireWireAVCProtocolUserClient *fUserClient;
+};
+
+/*!
+@class AVCConnectionRecord
+@abstract internal class to manage AVC connections
+*/
+class AVCConnectionRecord : public OSObject
+{
+    OSDeclareDefaultStructors(AVCConnectionRecord)
+public:
+	UInt32 sourceSubunitTypeAndID;
+	IOFWAVCPlugTypes sourcePlugType;
+	UInt32 sourcePlugNum;
+	UInt32 destSubunitTypeAndID;
+	IOFWAVCPlugTypes destPlugType;
+	UInt32 destPlugNum;
+	bool lockConnection;
+	bool permConnection;
+};
+
+/*!
+@class IOFireWireAVCTargetSpace
+@abstract object to centralize the AVC Target mode support
+*/
+class IOFireWireAVCTargetSpace : public IOFWPseudoAddressSpace
+{
+    OSDeclareDefaultStructors(IOFireWireAVCTargetSpace)
+
+protected:
+    UInt32 fBuf[512];
+    UInt32 fActivations;
+	IOFireWireController *fController;
+	IOLocalConfigDirectory * fAVCLocalConfigDirectory;
+    OSArray * fUserClients;
+	OSArray * fCommandHandlers;
+	OSArray * fSubunits;
+	OSArray * fConnectionRecords;
+	AVCUnitPlugs fUnitPlugs;
+	IORecursiveLock * fLock;
+
+	/*! @struct ExpansionData
+	@discussion This structure will be used to expand the capablilties of the class in the future.
+	*/
+    struct ExpansionData { };
+
+	/*! @var reserved
+	Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+    virtual UInt32 doWrite(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
+                           const void *buf, IOFWRequestRefCon refcon);
+
+
+	IOReturn targetSendAVCResponse(UInt32 generation, UInt16 nodeID, IOBufferMemoryDescriptor *pBufMemDesc, UInt32 size);
+
+	// Internal AVC Target Command Handlers
+	IOReturn handleUnitInfoCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
+	IOReturn handleSubUnitInfoCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
+	IOReturn handlePlugInfoCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
+	IOReturn handlePowerCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
+	IOReturn handleConnectCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
+	IOReturn handleDisconnectCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
+	IOReturn handleInputPlugSignalFormatCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
+	IOReturn handleOutputPlugSignalFormatCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
+	IOReturn handleConnectionsCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
+	IOReturn handleSignalSourceCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
+
+	UInt32 subUnitOfTypeCount(UInt32 type);
+	AVCSubunitInfo *getSubunitInfo(UInt32 subunitTypeAndID);
+	bool canConnectDestPlug(UInt32 destSubunitTypeAndID,
+						 IOFWAVCPlugTypes destPlugType,
+						 UInt32 *destPlugNum);
+	
+public:
+
+	// Activate/Deactivate Functions
+	virtual IOReturn activateWithUserClient(IOFireWireAVCProtocolUserClient *userClient);
+    virtual void deactivateWithUserClient(IOFireWireAVCProtocolUserClient *userClient);
+
+	/*!
+	@function init
+	@abstract initializes the IOFireWireAVCTargetSpace object
+	*/
+    virtual bool init(IOFireWireController *controller);
+
+	/*!
+	@function getAVCTargetSpace
+	@abstract returns the IOFireWireAVCTargetSpace object for the given FireWire bus
+	@param bus The FireWire bus
+	*/
+    static IOFireWireAVCTargetSpace *getAVCTargetSpace(IOFireWireController *controller);
+
+	/*!
+	@function publishAVCUnitDirectory
+	@abstract Creates a local AVC Unit directory if it doesn't already exist
+	*/
+    virtual IOReturn publishAVCUnitDirectory(void);
+
+	virtual IOReturn installAVCCommandHandler(IOFireWireAVCProtocolUserClient *userClient,
+										   IOFireWireAVCTargetCommandHandlerCallback callBack,
+										   OSAsyncReference64 asyncRef,
+										   UInt32 subUnitTypeAndID,
+										   UInt32 opCode,
+										   uint64_t userCallBack,
+										   uint64_t userRefCon);
+
+	virtual IOReturn addSubunit(IOFireWireAVCProtocolUserClient *userClient,
+							 IOFireWireAVCSubunitPlugHandlerCallback callBack,
+							 OSAsyncReference64 asyncRef,
+							 UInt32 subunitType,
+							 UInt32 numSourcePlugs,
+							 UInt32 numDestPlugs,
+							 uint64_t userCallBack,
+							 uint64_t userRefCon,
+							 UInt32 *subUnitID);
+
+	virtual IOReturn setSubunitPlugSignalFormat(IOFireWireAVCProtocolUserClient *userClient,
+											 UInt32 subunitTypeAndID,
+											 IOFWAVCPlugTypes plugType,
+											 UInt32 plugNum,
+											 UInt32 signalFormat);
+
+	virtual IOReturn getSubunitPlugSignalFormat(IOFireWireAVCProtocolUserClient *userClient,
+											 UInt32 subunitTypeAndID,
+											 IOFWAVCPlugTypes plugType,
+											 UInt32 plugNum,
+											 UInt32 *pSignalFormat);
+
+	virtual IOReturn connectTargetPlugs(IOFireWireAVCProtocolUserClient *userClient,
+									 AVCConnectTargetPlugsInParams *inParams,
+									 AVCConnectTargetPlugsOutParams *outParams);
+
+	virtual IOReturn disconnectTargetPlugs(IOFireWireAVCProtocolUserClient *userClient,
+										UInt32 sourceSubunitTypeAndID,
+										IOFWAVCPlugTypes sourcePlugType,
+										UInt32 sourcePlugNum,
+										UInt32 destSubunitTypeAndID,
+										IOFWAVCPlugTypes destPlugType,
+										UInt32 destPlugNum);
+
+	virtual IOReturn getTargetPlugConnection(IOFireWireAVCProtocolUserClient *userClient,
+										  AVCGetTargetPlugConnectionInParams *inParams,
+										  AVCGetTargetPlugConnectionOutParams *outParams);
+
+    virtual IOReturn findAVCRequestHandler(IOFireWireAVCProtocolUserClient *userClient,
+										  UInt32 generation,
+										  UInt16 nodeID,
+										  IOFWSpeed speed,
+										  UInt32 handlerSearchIndex,
+										  const char *pCmdBuf,
+										  UInt32 cmdLen);
+	
+	virtual void pcrModified(IOFWAVCPlugTypes plugType,
+						  UInt32 plugNum,
+						  UInt32 newValue);
+	
+private:
+	OSMetaClassDeclareReservedUnused(IOFireWireAVCTargetSpace, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCTargetSpace, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCTargetSpace, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCTargetSpace, 3);
+};
+
+#endif /*_IOKIT_IOFIREWIREAVCTARGETSPACE_H */
\ No newline at end of file
diff --git a/i386/include/IOKit/avc/IOFireWireAVCUnit.h b/i386/include/IOKit/avc/IOFireWireAVCUnit.h
new file mode 100644
index 0000000..0abf1cd
--- /dev/null
+++ b/i386/include/IOKit/avc/IOFireWireAVCUnit.h
@@ -0,0 +1,408 @@
+/*
+ * Copyright (c) 1998-2001 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOFIREWIREAVCUNIT_H
+#define _IOKIT_IOFIREWIREAVCUNIT_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/firewire/IOFWRegs.h>
+#include <IOKit/firewire/IOFWAddressSpace.h>
+#include <IOKit/firewire/IOFWCommand.h>
+#include <IOKit/avc/IOFireWireAVCConsts.h>
+
+extern const OSSymbol *gIOAVCUnitType;
+
+class IOFireWireNub;
+class IOFireWireAVCCommand;
+class IOFireWirePCRSpace;
+class IOFireWireAVCUnit;
+class IOFireWireAVCSubUnit;
+class IOFireWireAVCAsynchronousCommand;
+class IOFireWireAVCNub;
+
+// The callback prototype for AVC Asynchronous Commands
+typedef void (*IOFireWireAVCAsynchronousCommandCallback)(void *pRefCon, IOFireWireAVCAsynchronousCommand *pCommandObject);
+
+const UInt16 kIOFWAVCAsyncCmdFreed = 0xdead;
+
+/*!
+@class IOFireWireAVCAsynchronousCommand
+*/
+class IOFireWireAVCAsynchronousCommand : public IOCommand 
+{
+    OSDeclareDefaultStructors(IOFireWireAVCAsynchronousCommand)
+	void free(void);
+
+	friend class IOFireWireAVCUnit;
+	
+protected:
+	/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */
+    struct ExpansionData { };
+
+	/*! @var reserved
+		Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+	
+public:
+	IOReturn init(const UInt8 * command, UInt32 len, IOFireWireAVCAsynchronousCommandCallback completionCallback, void *pClientRefCon);
+	IOReturn submit(IOFireWireAVCNub *pAVCNub);
+	IOReturn cancel(void);
+	IOReturn reinit(const UInt8 * command, UInt32 cmdLen);
+
+	// This function returns true if this command is currently waiting for a response
+	bool isPending(void);
+	
+	IOFWAVCAsyncCommandState cmdState;
+	void	*pRefCon;
+	UInt8	*pCommandBuf;
+	UInt32	cmdLen;
+	UInt8	*pInterimResponseBuf;
+	UInt32	interimResponseLen;
+	UInt8	*pFinalResponseBuf;
+	UInt32	finalResponseLen;
+
+protected:
+	IOFireWireAVCAsynchronousCommandCallback fCallback;
+	IOFireWireAVCUnit *fAVCUnit;
+	IOMemoryDescriptor *fMem;
+	IOFWCommand *fWriteCmd;
+	IOFWDelayCommand *fDelayCmd;
+    UInt16 fWriteNodeID;
+	UInt32 fWriteGen;
+	
+private:
+	OSMetaClassDeclareReservedUnused(IOFireWireAVCAsynchronousCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCAsynchronousCommand, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCAsynchronousCommand, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCAsynchronousCommand, 3);
+};
+
+/*!
+    @class IOFireWireAVCNub
+    @abstract nub for AVC devices
+*/
+class IOFireWireAVCNub : public IOService
+{
+    OSDeclareDefaultStructors(IOFireWireAVCNub)
+
+protected:
+    IOFireWireNub * fDevice;
+
+public:
+    // execute AVC command
+/*!
+    @function AVCCommand
+    @abstract Sends an AVC command to the device and stores the response.
+    @param command Pointer to command to send.
+    @param cmdLen Length of the command.
+    @param response Pointer to place to store the response.
+    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
+    updated to the number of bytes returned by the device.
+*/
+    virtual IOReturn AVCCommand(const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen) = 0;
+
+/*!
+    @function AVCCommandInGeneration
+    @abstract Sends an AVC command to the device and stores the response. The command must complete in the specified
+    FireWire bus generation otherwise kIOFireWireBusReset is returned.
+    @param generation The bus generation that the command must execute in.
+    @param command Pointer to command to send.
+    @param cmdLen Length of the command.
+    @param response Pointer to place to store the response.
+    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
+    updated to the number of bytes returned by the device.
+*/
+    virtual IOReturn AVCCommandInGeneration(UInt32 generation,
+                const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen) = 0;
+
+/*!
+    @function getDevice
+    @abstract Returns the FireWire device nub that is this object's provider .
+*/
+    IOFireWireNub* getDevice() const
+        {return fDevice;};
+
+/*!
+    @function updateAVCCommandTimeout
+    @abstract By default, AVCCommands timeout 10 seconds after receiving an Interim response.
+    This function resets the timeout of the current command to 10 seconds from the current time.
+    Call this repeatedly for AVC commands that take a very long time to execute to prevent premature
+    timeout.
+*/
+    virtual IOReturn updateAVCCommandTimeout() = 0;
+
+private:
+    OSMetaClassDeclareReservedUsed(IOFireWireAVCNub, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCNub, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCNub, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCNub, 3);
+};
+
+/*!
+    @class IOFireWireAVCUnit
+    @abstract nub for AVC devices
+*/
+class IOFireWireAVCUnit : public IOFireWireAVCNub
+{
+    OSDeclareDefaultStructors(IOFireWireAVCUnit)
+
+	friend class IOFireWireAVCAsynchronousCommand;
+	
+protected:
+    IOFWPseudoAddressSpace *fFCPResponseSpace;
+    IOLock *avcLock;
+    IOFireWireAVCCommand *fCommand;
+
+    UInt8 fSubUnitCount[kAVCNumSubUnitTypes];
+    
+	bool fStarted;
+    IOLock *cmdLock;
+	
+/*! @struct ExpansionData
+    @discussion This structure is used to expand the capablilties of the class in a binary compatible way
+    */    
+    struct ExpansionData
+	{
+		OSArray * fAVCAsyncCommands;
+		IOFireWireController *fControl;
+		bool enableRobustAVCCommandResponseMatching;
+	};
+
+/*! @var fIOFireWireAVCUnitExpansion 
+      */
+    ExpansionData *fIOFireWireAVCUnitExpansion;
+    
+    static UInt32 AVCResponse(void *refcon, UInt16 nodeID, IOFWSpeed &speed,
+                    FWAddress addr, UInt32 len, const void *buf, IOFWRequestRefCon requestRefcon);
+
+    static void rescanSubUnits(void *arg);
+    
+    virtual void free(void);
+    
+    virtual void updateSubUnits(bool firstTime);
+
+	static void AVCAsynchRequestWriteDone(void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd);
+	static void AVCAsynchDelayDone(void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd);
+
+public:
+    // IOService overrides
+    virtual bool start(IOService *provider);
+    virtual IOReturn message(UInt32 type, IOService *provider, void *argument);
+	virtual IOReturn setProperties (OSObject * properties );
+
+/*! @function handleOpen
+    @abstract Overrideable method to control the open / close behaviour of an IOService.
+    @discussion See IOService for discussion.		
+    @param forClient Designates the client of the provider requesting the open.
+    @param options Options for the open, may be interpreted by the implementor of handleOpen.
+    @result Return true if the open was successful, false otherwise.
+*/
+
+    virtual bool handleOpen(  IOService *	  forClient,
+                              IOOptionBits	  options,
+                              void *		  arg );
+/*! 
+    @function handleClose
+    @abstract Overrideable method to control the open / close behaviour of an IOService.
+    @discussion See IOService for discussion.
+    @param forClient Designates the client of the provider requesting the close.
+    @param options Options for the close, may be interpreted by the implementor of handleOpen. 
+*/
+
+    virtual void handleClose(   IOService *		forClient,
+                                IOOptionBits	options );
+    
+
+/*!
+    @function matchPropertyTable
+    @abstract Matching language support
+	Match on the following properties of the unit:
+	Vendor_ID
+	GUID
+	Unit_Type
+	and available sub-units, match if the device has at least the requested number of a sub-unit type:
+	AVCSubUnit_0 -> AVCSubUnit_1f
+*/
+    virtual bool matchPropertyTable(OSDictionary * table);
+
+    // execute AVC command
+/*!
+    @function AVCCommand
+    @abstract Sends an AVC command to the device and stores the response.
+    @param command Pointer to command to send.
+    @param cmdLen Length of the command.
+    @param response Pointer to place to store the response.
+    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
+    updated to the number of bytes returned by the device.
+*/
+    virtual IOReturn AVCCommand(const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen);
+
+/*!
+    @function AVCCommandInGeneration
+    @abstract Sends an AVC command to the device and stores the response. The command must complete in the specified
+    FireWire bus generation otherwise kIOFireWireBusReset is returned.
+    @param generation The bus generation that the command must execute in.
+    @param command Pointer to command to send.
+    @param cmdLen Length of the command.
+    @param response Pointer to place to store the response.
+    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
+    updated to the number of bytes returned by the device.
+*/
+    virtual IOReturn AVCCommandInGeneration(UInt32 generation,
+                const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen);
+
+/*!
+    @function updateAVCCommandTimeout
+    @abstract By default, AVCCommands timeout 10 seconds after receiving an Interim response.
+    This function resets the timeout of the current command to 10 seconds from the current time.
+    Call this repeatedly for AVC commands that take a very long time to execute to prevent premature
+    timeout.
+*/
+    virtual IOReturn updateAVCCommandTimeout();
+
+protected:
+	UInt32 indexOfAVCAsynchronousCommandObject(IOFireWireAVCAsynchronousCommand *pCommandObject);
+	void removeAVCAsynchronousCommandObjectAtIndex(UInt32 index);
+
+	void lockAVCAsynchronousCommandLock();
+
+	void unlockAVCAsynchronousCommandLock();
+	
+	bool available();
+	
+private:
+		
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCUnit, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCUnit, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCUnit, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCUnit, 3);
+
+};
+
+/*!
+    @class IOFireWireAVCSubUnit
+    @abstract nub for sub unit of AVC devices. Just for matching, calls the AVC unit for all functions.
+*/
+class IOFireWireAVCSubUnit : public IOFireWireAVCNub
+{
+    OSDeclareDefaultStructors(IOFireWireAVCSubUnit)
+	
+	friend class IOFireWireAVCAsynchronousCommand;
+
+protected:
+    IOFireWireAVCUnit *fAVCUnit;
+    
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+    
+public:
+    virtual bool init(OSDictionary *propTable, IOFireWireAVCUnit *provider);
+
+    // IOService overrides
+    virtual IOReturn message(UInt32 type, IOService *provider, void *argument);
+
+/*! @function handleOpen
+    @abstract Overrideable method to control the open / close behaviour of an IOService.
+    @discussion See IOService for discussion.		
+    @param forClient Designates the client of the provider requesting the open.
+    @param options Options for the open, may be interpreted by the implementor of handleOpen.
+    @result Return true if the open was successful, false otherwise.
+*/
+
+    virtual bool handleOpen(  IOService *	  forClient,
+                              IOOptionBits	  options,
+                              void *		  arg );
+/*! 
+    @function handleClose
+    @abstract Overrideable method to control the open / close behaviour of an IOService.
+    @discussion See IOService for discussion.
+    @param forClient Designates the client of the provider requesting the close.
+    @param options Options for the close, may be interpreted by the implementor of handleOpen. 
+*/
+
+    virtual void handleClose(   IOService *		forClient,
+                                IOOptionBits	options );
+    
+
+/*!
+    @function matchPropertyTable
+    @abstract Matching language support
+	Match on the following properties of the sub unit:
+	Vendor_ID
+	GUID
+	SubUnit_Type
+*/
+    virtual bool matchPropertyTable(OSDictionary * table);
+
+    // execute AVC command
+/*!
+    @function AVCCommand
+    @abstract Sends an AVC command to the device and stores the response.
+    @param command Pointer to command to send.
+    @param cmdLen Length of the command.
+    @param response Pointer to place to store the response.
+    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
+    updated to the number of bytes returned by the device.
+*/
+    virtual IOReturn AVCCommand(const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen);
+
+/*!
+    @function AVCCommandInGeneration
+    @abstract Sends an AVC command to the device and stores the response. The command must complete in the specified
+    FireWire bus generation otherwise kIOFireWireBusReset is returned.
+    @param generation The bus generation that the command must execute in.
+    @param command Pointer to command to send.
+    @param cmdLen Length of the command.
+    @param response Pointer to place to store the response.
+    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
+    updated to the number of bytes returned by the device.
+*/
+    virtual IOReturn AVCCommandInGeneration(UInt32 generation,
+                const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen);
+
+/*!
+    @function updateAVCCommandTimeout
+    @abstract By default, AVCCommands timeout 10 seconds after receiving an Interim response.
+    This function resets the timeout of the current command to 10 seconds from the current time.
+    Call this repeatedly for AVC commands that take a very long time to execute to prevent premature
+    timeout.
+*/
+    virtual IOReturn updateAVCCommandTimeout();
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCSubUnit, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCSubUnit, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCSubUnit, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireAVCSubUnit, 3);
+
+};
+
+#endif // _IOKIT_IOFIREWIREAVCUNIT_H
+
diff --git a/i386/include/IOKit/avc/IOFireWireAVCUserClientCommon.h b/i386/include/IOKit/avc/IOFireWireAVCUserClientCommon.h
new file mode 100644
index 0000000..cecf812
--- /dev/null
+++ b/i386/include/IOKit/avc/IOFireWireAVCUserClientCommon.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 1998-2001 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOFIREWIREAVCUSERCLIENTCOMMON_H_
+#define _IOKIT_IOFIREWIREAVCUSERCLIENTCOMMON_H_
+
+#include <IOKit/avc/IOFireWireAVCConsts.h>
+
+#define kIOFireWireAVCLibConnection 13
+
+enum IOFWAVCUserClientCommandCodes {
+    kIOFWAVCUserClientOpen,						// kIOUCScalarIScalarO 0,0
+    kIOFWAVCUserClientClose,					// kIOUCScalarIScalarO 0,0
+    kIOFWAVCUserClientOpenWithSessionRef,		// kIOUCScalarIScalarO 1,0
+	kIOFWAVCUserClientGetSessionRef,			// kIOUCScalarIScalarO 0,1
+    kIOFWAVCUserClientAVCCommand,				// kIOUCStructIStructO -1,-1
+    kIOFWAVCUserClientAVCCommandInGen,			// kIOUCStructIStructO -1,-1
+    kIOFWAVCUserClientUpdateAVCCommandTimeout,	// kIOUCScalarIScalarO 0,0
+    kIOFWAVCUserClientMakeP2PInputConnection,	// KIOUCScalarIScalarO 1, 0
+    kIOFWAVCUserClientBreakP2PInputConnection,	// KIOUCScalarIScalarO 1, 0
+    kIOFWAVCUserClientMakeP2POutputConnection,	// KIOUCScalarIScalarO 1, 0
+    kIOFWAVCUserClientBreakP2POutputConnection,	// KIOUCScalarIScalarO 1, 0
+	kIOFWAVCUserClientCreateAsyncAVCCommand,	// kIOUCStructIStructO -1,-1
+	kIOFWAVCUserClientSubmitAsyncAVCCommand,	// kIOUCScalarIScalarO 1, 0
+	kIOFWAVCUserClientCancelAsyncAVCCommand,	// kIOUCScalarIScalarO 1, 0
+	kIOFWAVCUserClientReleaseAsyncAVCCommand,	// kIOUCScalarIScalarO 1, 0
+	kIOFWAVCUserClientReinitAsyncAVCCommand,	// // kIOUCScalarIStructI 1, -1
+    kIOFWAVCUserClientNumCommands
+};
+
+enum IOFWAVCUserClientAsyncCommandCodes {
+    kIOFWAVCUserClientInstallAsyncAVCCommandCallback = kIOFWAVCUserClientNumCommands,	// kIOUCScalarIScalarO 1, 1
+    kIOFWAVCUserClientNumAsyncCommands
+};
+
+
+enum IOFWAVCProtocolUserClientCommandCodes {
+    kIOFWAVCProtocolUserClientSendAVCResponse,   		// kIOUCScalarIStructI 2, -1
+    kIOFWAVCProtocolUserClientFreeInputPlug,			// kIOUCScalarIScalarO 1, 0
+    kIOFWAVCProtocolUserClientReadInputPlug,			// kIOUCScalarIScalarO 1, 1
+    kIOFWAVCProtocolUserClientUpdateInputPlug,			// kIOUCScalarIScalarO 3, 0
+    kIOFWAVCProtocolUserClientFreeOutputPlug,			// kIOUCScalarIScalarO 1, 0
+    kIOFWAVCProtocolUserClientReadOutputPlug,			// kIOUCScalarIScalarO 1, 1
+    kIOFWAVCProtocolUserClientUpdateOutputPlug,			// kIOUCScalarIScalarO 3, 0
+    kIOFWAVCProtocolUserClientReadOutputMasterPlug,		// kIOUCScalarIScalarO 0, 1
+    kIOFWAVCProtocolUserClientUpdateOutputMasterPlug,	// kIOUCScalarIScalarO 2, 0
+    kIOFWAVCProtocolUserClientReadInputMasterPlug,		// kIOUCScalarIScalarO 0, 1
+    kIOFWAVCProtocolUserClientUpdateInputMasterPlug,	// kIOUCScalarIScalarO 2, 0
+    kIOFWAVCProtocolUserClientPublishAVCUnitDirectory,	// kIOUCScalarIScalarO 0, 0
+	kIOFWAVCProtocolUserClientSetSubunitPlugSignalFormat, // kIOUCScalarIScalarO 4, 0
+	kIOFWAVCProtocolUserClientGetSubunitPlugSignalFormat, // kIOUCScalarIScalarO 3, 1
+	kIOFWAVCProtocolUserClientConnectTargetPlugs,		// kIOUCStructIStructO
+	kIOFWAVCProtocolUserClientDisconnectTargetPlugs,	// kIOUCScalarIScalarO 6, 0
+	kIOFWAVCProtocolUserClientGetTargetPlugConnection,	// kIOUCStructIStructO
+	kIOFWAVCProtocolUserClientAVCRequestNotHandled,		// kIOUCScalarIStructI 4, -1
+    kIOFWAVCProtocolUserClientNumCommands
+};
+
+enum IOFWAVCProtocolUserClientAsyncCommandCodes {
+    kIOFWAVCProtocolUserClientSetAVCRequestCallback = kIOFWAVCProtocolUserClientNumCommands,   		// kIOUCScalarIScalarO 2, 0
+    kIOFWAVCProtocolUserClientAllocateInputPlug,			// kIOUCScalarIScalarO 1, 1
+    kIOFWAVCProtocolUserClientAllocateOutputPlug,			// kIOUCScalarIScalarO 1, 1
+    kIOFWAVCProtocolUserClientInstallAVCCommandHandler,		// kIOUCScalarIScalarO 4, 0
+    kIOFWAVCProtocolUserClientAddSubunit,					// kIOUCScalarIScalarO 5, 1
+    kIOFWAVCProtocolUserClientNumAsyncCommands
+};
+
+typedef struct _AVCConnectTargetPlugsInParams
+{
+	UInt32 sourceSubunitTypeAndID;
+	IOFWAVCPlugTypes sourcePlugType;
+	UInt32 sourcePlugNum;
+	UInt32 destSubunitTypeAndID;
+	IOFWAVCPlugTypes destPlugType;
+	UInt32 destPlugNum;
+	Boolean lockConnection;
+	Boolean permConnection;
+}AVCConnectTargetPlugsInParams;
+
+typedef struct _AVCConnectTargetPlugsOutParams
+{
+	UInt32 sourcePlugNum;
+	UInt32 destPlugNum;
+}AVCConnectTargetPlugsOutParams;
+
+typedef struct _AVCGetTargetPlugConnectionInParams
+{
+	UInt32 subunitTypeAndID;
+	IOFWAVCPlugTypes plugType;
+	UInt32 plugNum;
+}AVCGetTargetPlugConnectionInParams;
+
+typedef struct _AVCGetTargetPlugConnectionOutParams
+{
+	UInt32 connectedSubunitTypeAndID;
+	IOFWAVCPlugTypes connectedPlugType;
+	UInt32 connectedPlugNum;
+	Boolean lockConnection;
+	Boolean permConnection;
+}AVCGetTargetPlugConnectionOutParams;
+
+#define kAsyncCmdSharedBufInterimRespOffset 0
+#define kAsyncCmdSharedBufFinalRespOffset 512
+
+#endif // _IOKIT_IOFIREWIREAVCUSERCLIENTCOMMON_H_
\ No newline at end of file
diff --git a/i386/include/IOKit/avc/IOFireWirePCRSpace.h b/i386/include/IOKit/avc/IOFireWirePCRSpace.h
new file mode 100644
index 0000000..9f31176
--- /dev/null
+++ b/i386/include/IOKit/avc/IOFireWirePCRSpace.h
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *
+ *	IOFireWirePCRSpace.h
+ *
+ * Class to multiplex access to the PCR addresses.
+ */
+#ifndef _IOKIT_IOFIREWIREPCRSPACE_H
+#define _IOKIT_IOFIREWIREPCRSPACE_H
+
+#include <IOKit/firewire/IOFWAddressSpace.h>
+#include <IOKit/avc/IOFireWireAVCTargetSpace.h>
+
+/*!
+    @typedef IOFireWirePCRCallback
+	@abstract Callback called after a successful lock transaction to a plug.
+    @param refcon refcon supplied to the IOFireWireFCPSpace when a client is registered
+	@param nodeID is the node originating the request
+	@param plugNo is the plug number
+	@param oldVal is the value the plug used to contain
+    @param newVal is the quad written into the plug
+
+ */
+typedef void (*IOFireWirePCRCallback)(void *refcon, UInt16 nodeID, UInt32 plug, UInt32 oldVal, UInt32 newVal);
+
+class IOFireWireBus;
+
+/*!
+    @class IOFireWirePCRSpace
+    @abstract object to multiplex users of the PCR plug registers
+*/
+class IOFireWirePCRSpace : public IOFWPseudoAddressSpace
+{
+    OSDeclareDefaultStructors(IOFireWirePCRSpace)
+    
+protected:
+    struct Client {
+        IOFireWirePCRCallback func;
+        void * refcon;
+    };
+    UInt32 fBuf[64];
+    
+    Client fClients[64];
+    UInt32 fActivations;
+	IOFireWireAVCTargetSpace *	fAVCTargetSpace;
+	IONotifier *fNotifier;
+    
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+    
+    // Override to notify client of each plug seperately
+    virtual UInt32 doWrite(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
+                           const void *buf, IOFWRequestRefCon refcon);
+                          
+    virtual IOReturn allocatePlug(void *refcon, IOFireWirePCRCallback func, UInt32 &plug, Client* head);
+    virtual void freePlug(UInt32 plug, Client* head);
+    virtual UInt32 readPlug(UInt32 plug);
+    virtual IOReturn updatePlug(UInt32 plug, UInt32 oldVal, UInt32 newVal);
+    
+public:
+
+    // Override to handle multiple activations (one per client)
+    virtual IOReturn activate();
+    virtual void deactivate();
+
+/*!
+    @function init
+    @abstract initializes the IOFireWirePCRSpace object
+*/
+    virtual bool init(IOFireWireBus *bus);
+/*!
+    @function getPCRAddressSpace
+    @abstract returns the IOFireWirePCRSpace object for the given FireWire bus
+    @param bus The FireWire bus
+*/
+    static IOFireWirePCRSpace *getPCRAddressSpace(IOFireWireBus *bus);
+/*!
+    @function allocateInputPlug
+    @abstract allocates an input plug.
+    @param refcon arbitrary value passed back as first argument of callback.
+    @param func callback function when a successful lock transaction to the plug has been performed
+    @param plug set to the plug number if a plug is successfully allocated
+*/
+    virtual IOReturn allocateInputPlug(void *refcon, IOFireWirePCRCallback func, UInt32 &plug);
+/*!
+    @function freeInputPlug
+    @abstract deallocates an input plug.
+    @param plug value returned by allocateInputPlug.
+*/
+    virtual void freeInputPlug(UInt32 plug);
+/*!
+    @function readInputPlug
+    @abstract returns the current value of an input plug.
+    @param plug value returned by allocateInputPlug.
+*/
+    virtual UInt32 readInputPlug(UInt32 plug);
+/*!
+    @function updateInputPlug
+    @abstract updates the value of an input plug (simulating a lock transaction).
+    @param plug value returned by allocateInputPlug.
+    @param oldVal value returned by readInputPlug.
+    @param newVal new value to store in plug if it's current value is oldVal.
+*/
+    virtual IOReturn updateInputPlug(UInt32 plug, UInt32 oldVal, UInt32 newVal);
+/*!
+    @function allocateOutputPlug
+    @abstract allocates an output plug.
+    @param refcon arbitrary value passed back as first argument of callback.
+    @param func callback function when a successful lock transaction to the plug has been performed
+    @param plug set to the plug number if a plug is successfully allocated
+*/
+    virtual IOReturn allocateOutputPlug(void *refcon, IOFireWirePCRCallback func, UInt32 &plug);
+/*!
+    @function freeOutputPlug
+    @abstract deallocates an output plug.
+    @param plug value returned by allocateOutputPlug.
+*/
+    virtual void freeOutputPlug(UInt32 plug);
+/*!
+    @function readOutputPlug
+    @abstract returns the current value of an output plug.
+    @param plug value returned by allocateOutputPlug.
+*/
+    virtual UInt32 readOutputPlug(UInt32 plug);
+/*!
+    @function updateOutputPlug
+    @abstract updates the value of an output plug (simulating a lock transaction).
+    @param plug value returned by allocateOutputPlug.
+    @param oldVal value returned by readOutputPlug.
+    @param newVal new value to store in plug if it's current value is oldVal.
+*/
+    virtual IOReturn updateOutputPlug(UInt32 plug, UInt32 oldVal, UInt32 newVal);
+/*!
+    @function readOutputMasterPlug
+    @abstract returns the current value of the output master plug.
+*/
+    virtual UInt32 readOutputMasterPlug();
+/*!
+    @function updateOutputMasterPlug
+    @abstract updates the value of the master output plug (simulating a lock transaction).
+    @param oldVal value returned by readOutputMasterPlug.
+    @param newVal new value to store in plug if it's current value is oldVal.
+*/
+    virtual IOReturn updateOutputMasterPlug(UInt32 oldVal, UInt32 newVal);
+/*!
+    @function readInputMasterPlug
+    @abstract returns the current value of the input master plug.
+*/
+    virtual UInt32 readInputMasterPlug();
+/*!
+    @function updateInputMasterPlug
+    @abstract updates the value of the master input plug (simulating a lock transaction).
+    @param oldVal value returned by readInputMasterPlug.
+    @param newVal new value to store in plug if it's current value is oldVal.
+*/
+    virtual IOReturn updateInputMasterPlug(UInt32 oldVal, UInt32 newVal);
+
+	/*!
+		@function setAVCTargetSpacePointer
+	 */
+    virtual void setAVCTargetSpacePointer(IOFireWireAVCTargetSpace *pAVCTargetSpace);
+
+	/*!
+		@function clearAllP2PConnections
+	 */
+    virtual void clearAllP2PConnections(void);
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWirePCRSpace, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWirePCRSpace, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWirePCRSpace, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWirePCRSpace, 3);
+
+};
+
+#endif /* _IOKIT_IOFIREWIREPCRSPACE_H */
diff --git a/i386/include/IOKit/bluetooth/Bluetooth.h b/i386/include/IOKit/bluetooth/Bluetooth.h
new file mode 100644
index 0000000..6692b90
--- /dev/null
+++ b/i386/include/IOKit/bluetooth/Bluetooth.h
@@ -0,0 +1,2158 @@
+/*
+	File:		Bluetooth.h
+	Contains:	Public interfaces for Bluetooth technology.
+	Copyright:	(c) 2002-2007 by Apple Inc. All rights reserved.
+*/
+
+#pragma once
+
+#ifdef KERNEL
+#include	<IOKit/bluetooth/BluetoothAssignedNumbers.h>
+#else
+#include 	<CoreFoundation/CFBase.h>
+#include	<IOBluetooth/BluetoothAssignedNumbers.h>
+#endif
+
+#include <IOKit/IOTypes.h>
+#include <libkern/OSByteOrder.h>
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@header		Bluetooth
+	Bluetooth wireless technology
+*/
+
+#ifdef	__cplusplus
+	extern "C" {
+#endif
+
+
+#if 0
+
+#pragma mark === Baseband ===
+#endif
+
+//===========================================================================================================================
+//	Baseband
+//===========================================================================================================================
+
+typedef UInt16		BluetoothConnectionHandle;		// Upper 4 bits are reserved.
+typedef uint8_t		BluetoothLMPHandle;
+enum
+{
+    kBluetoothConnectionHandleNone	= 0xffff
+};
+
+typedef UInt8		BluetoothReasonCode;
+typedef UInt8		BluetoothEncryptionEnable;
+enum
+{
+	kBluetoothEncryptionEnableOff 	= 0x00, 
+	kBluetoothEncryptionEnableOn	= 0x01
+};
+
+typedef UInt8		BluetoothKeyFlag;
+enum
+{
+	kBluetoothKeyFlagSemiPermanent 	= 0x00, 
+	kBluetoothKeyFlagTemporary 		= 0x01
+};
+
+typedef UInt8		BluetoothKeyType;
+enum
+{
+	kBluetoothKeyTypeCombination					= 0x00, 
+	kBluetoothKeyTypeLocalUnit						= 0x01,
+	kBluetoothKeyTypeRemoteUnit						= 0x02,
+	kBluetoothKeyTypeDebugCombination				= 0x03,
+	kBluetoothKeyTypeUnauthenticatedCombination		= 0x04,
+	kBluetoothKeyTypeAuthenticatedCombination		= 0x05,
+	kBluetoothKeyTypeChangedCombination				= 0x06,
+};
+
+// Packet types (Bluetooth spec section 7.1.5 - Create Connection)
+
+typedef UInt16		BluetoothPacketType;
+enum
+{
+	kBluetoothPacketTypeReserved1	= 0x0001, 
+	kBluetoothPacketType2DH1Omit	= 0x0002,	// Masks OUT this packet type
+	kBluetoothPacketType3DH1Omit	= 0x0004,	// Masks OUT this packet type
+
+	kBluetoothPacketTypeDM1			= 0x0008, 
+	kBluetoothPacketTypeDH1			= 0x0010, 
+	kBluetoothPacketTypeHV1			= 0x0020, 	// Reserved
+	kBluetoothPacketTypeHV2			= 0x0040, 	// Reserved
+	kBluetoothPacketTypeHV3			= 0x0080, 	// Reserved
+	kBluetoothPacketTypeDV			= 0x0100, 	// Reserved
+	kBluetoothPacketType2DH3Omit	= 0x0100,	// Masks OUT this packet type
+	kBluetoothPacketType3DH3Omit	= 0x0200,	// Masks OUT this packet type
+	kBluetoothPacketTypeAUX			= 0x0200,	// Deprecated
+	
+	kBluetoothPacketTypeDM3			= 0x0400, 
+	kBluetoothPacketTypeDH3			= 0x0800,
+	
+	kBluetoothPacketType2DH5Omit	= 0x1000,	// Masks OUT this packet type
+	kBluetoothPacketType3DM5Omit	= 0x2000,	// Masks OUT this packet type 
+	
+	kBluetoothPacketTypeDM5			= 0x4000, 
+	kBluetoothPacketTypeDH5			= 0x8000, 
+	
+	kBluetoothPacketTypeEnd
+};
+
+// Setup Synchronous Packet types (Bluetooth 2.1 spec section 7.1.26 - Setup Synchronous Command)
+
+enum
+{
+	kBluetoothSynchronousConnectionPacketTypeHV1			= 0x0001,
+	kBluetoothSynchronousConnectionPacketTypeHV2			= 0x0002,
+	kBluetoothSynchronousConnectionPacketTypeHV3			= 0x0004,
+	kBluetoothSynchronousConnectionPacketTypeEV3			= 0x0008,
+	kBluetoothSynchronousConnectionPacketTypeEV4			= 0x0010,
+	kBluetoothSynchronousConnectionPacketTypeEV5			= 0x0020,
+
+	// masking out certain types:
+	
+	kBluetoothSynchronousConnectionPacketType2EV3Omit		= 0x0040,
+	kBluetoothSynchronousConnectionPacketType3EV3Omit		= 0x0080,
+	kBluetoothSynchronousConnectionPacketType2EV5Omit		= 0x0100,
+	kBluetoothSynchronousConnectionPacketType3EV5Omit		= 0x0200,
+	
+	kBluetoothSynchronousConnectionPacketTypeAll			= 0xFFFF,
+
+	kBluetoothSynchronousConnectionPacketTypeEnd
+};
+
+
+// LAP/Inquiry Access Codes
+
+typedef UInt32		BluetoothLAP;
+enum
+{
+	kBluetoothGeneralInquiryAccessCodeIndex		= 0, 			// General/Unlimited Inquiry Access Code (GIAC)
+	kBluetoothGeneralInquiryAccessCodeLAPValue 	= 0x9E8B33, 	// General/Unlimited Inquiry Access Code (GIAC)
+	
+	kBluetoothLimitedInquiryAccessCodeIndex		= 1, 			// Limited Dedicated Inquiry Access Code (LIAC)
+	kBluetoothLimitedInquiryAccessCodeLAPValue 	= 0x9E8B00, 	// Limited Dedicated Inquiry Access Code (LIAC)
+	
+	// All other access codes are reserved for future use (indices 2-63, LAP values 0x9E8B01-0x9E8B32 and 0x9E8B34-0x9E8B3F).
+	
+	kBluetoothLimitedInquiryAccessCodeEnd
+};
+
+// PageScanRepetitionMode
+
+typedef	UInt8	BluetoothPageScanRepetitionMode;
+enum
+{
+	kBluetoothPageScanRepetitionModeR0 			= 0x00, 
+	kBluetoothPageScanRepetitionModeR1 			= 0x01, 
+	kBluetoothPageScanRepetitionModeR2 			= 0x02
+	
+	// All other values are reserved for future use.
+};
+
+// PageScanPeriodMode
+
+typedef UInt8	BluetoothPageScanPeriodMode;
+enum
+{
+	kBluetoothPageScanPeriodModeP0 				= 0x00, 
+	kBluetoothPageScanPeriodModeP1 				= 0x01, 
+	kBluetoothPageScanPeriodModeP2 				= 0x02
+	
+	// All other values are reserved for future use.
+};
+
+// PageScanMode
+
+typedef UInt8	BluetoothPageScanMode;
+enum
+{
+	kBluetoothPageScanModeMandatory 			= 0x00, 
+	kBluetoothPageScanModeOptional1 			= 0x01, 
+	kBluetoothPageScanModeOptional2 			= 0x02, 
+	kBluetoothPageScanModeOptional3 			= 0x03
+	
+	// All other values are reserved for future use.
+};
+
+#if 0
+#pragma mark -
+#pragma mark === Devices ===
+#endif
+
+typedef struct	BluetoothDeviceAddress		BluetoothDeviceAddress;
+struct	BluetoothDeviceAddress
+{
+	UInt8		data[ 6 ];
+};
+
+typedef struct	BluetoothKey				BluetoothKey;
+struct	BluetoothKey
+{
+	UInt8		data[ 16 ];
+};
+
+typedef struct	BluetoothPINCode			BluetoothPINCode;
+struct	BluetoothPINCode
+{
+	UInt8		data[ 16 ];		// PIN codes may be up to 128 bits.
+};
+
+
+//	Physical layout of the "class of device/service" field (see Bluetooth Assigned Numbers section 1.2):
+//
+//	 2 2 2 2 1 1 1 1 1 1 1 1 1 1
+//	 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0  <- Bit Transmission Order
+//	+---------------+---------------+---------------+
+//	|    octet 3    |    octet 2    |    octet 1    | <- Octet Transmission Order
+//	+---------------+---------------+---------------+
+//	<------ 11 bits ----->< 5 bits ><- 6 bits ->
+//	+---------------------+---------+-----------+-+-+
+//	|   Service Classes   | Major   |  Minor    | | |
+//	+-+-+-+-+-+-+-+-+-+-+-+  Device |   Device  |0|0|
+//	| | | | | | | |*|*|*| |   Class |    Class  | | |
+//	+-+-+-+-+-+-+-+-+-+-+-+---------+-----------+-+-+
+//	 | | | | | | |       |                        |
+//   | | | | | | |       + Limited Discoverable   +- Format Type
+//	 | | | | | | +- Networking
+//	 | | | | | +- Rendering
+//	 | | | | +- Capturing
+//	 | | | +- Object Transfer
+//	 | | +- Audio
+//	 | +- Telephony
+//	 +- Information
+
+typedef UInt32		BluetoothClassOfDevice;
+
+#define		BluetoothGetDeviceClassMajor( inCOD )		( (inCOD & 0x00001F00) >> 8 )
+#define		BluetoothGetDeviceClassMinor( inCOD )		( (inCOD & 0x000000FC) >> 2 )
+#define		BluetoothGetServiceClassMajor( inCOD )		( (inCOD & 0x00FFE000) >> 13 )
+#define		BluetoothMakeClassOfDevice( inServiceClassMajor, inDeviceClassMajor, inDeviceClassMinor )		\
+										(((inServiceClassMajor << 13) & 0x00FFE000) | ((inDeviceClassMajor << 8) & 0x00001F00) | ((inDeviceClassMinor << 2) & 0x000000FC))
+
+///
+/// Major Service Classes (11-bit value - bits 13-23 of Device/Service field)
+///
+
+typedef UInt32		BluetoothServiceClassMajor;
+// Service Class Major enum in BluetoothAssignedNumbers.h
+
+///
+/// Major Device Classes (5-bit value - bits 8-12 of Device/Service field)
+///
+
+typedef UInt32		BluetoothDeviceClassMajor;
+// Device Class Major enum in BluetoothAssignedNumbers.h
+
+///
+/// Minor Device Classes (6-bit value - bits 2-7 of Device/Service field)
+///
+
+typedef UInt32		BluetoothDeviceClassMinor;
+// Device Class Minor enum in BluetoothAssignedNumbers.h
+
+// Misc Device Types
+
+enum
+{
+	kBluetoothDeviceNameMaxLength	= 248
+};
+typedef UInt8	BluetoothDeviceName[ 256 ];		// Max 248 bytes of UTF-8 encoded Unicode.
+typedef UInt16	BluetoothClockOffset;			// Bits 14-0 come from bits 16-2 of CLKslav-CLKmaster.
+typedef UInt8	BluetoothRole;					// 
+typedef UInt8	BluetoothAllowRoleSwitch;		// 0x00-0x01 valid, 0x02-0xFF reserved.
+enum
+{
+	kBluetoothDontAllowRoleSwitch 	= 0x00, 
+	kBluetoothAllowRoleSwitch 		= 0x01
+};
+
+enum
+{
+	kBluetoothRoleBecomeMaster 	= 0x00, 
+	kBluetoothRoleRemainSlave 	= 0x01
+};
+
+typedef struct BluetoothSetEventMask	BluetoothSetEventMask;
+struct	BluetoothSetEventMask
+{
+	UInt8		data[ 8 ];
+};
+
+typedef UInt8	BluetoothPINType;
+
+
+#if 0
+#pragma mark -
+#pragma mark === L2CAP ===
+#endif
+
+//===========================================================================================================================
+//	Logical Link Control and Adaptation Protocol (L2CAP)
+//===========================================================================================================================
+
+
+// ACL Packet values (Bluetooth L2CAP spec section 1).
+
+enum
+{
+	kBluetoothL2CAPMaxPacketSize					= 65535,	// Max number of data bytes in an L2CAP packet.
+
+	kBluetoothACLLogicalChannelReserved 			= 0, 		// [00] Reserved for future use
+	kBluetoothACLLogicalChannelL2CAPContinue	 	= 1, 		// [01] Continuation of L2CAP packet.
+	kBluetoothACLLogicalChannelL2CAPStart 			= 2, 		// [10] Start of L2CAP packet.
+	kBluetoothACLLogicalChannelLMP	 				= 3			// [11] Link Manager Protocol packet.
+};
+
+// Channel Identifiers (Bluetooth L2CAP spec section 2.1).
+
+typedef UInt16		BluetoothL2CAPChannelID;
+enum
+{
+	kBluetoothL2CAPChannelNull					= 0x0000, 	// Illegal, should not be used
+	kBluetoothL2CAPChannelSignalling	 		= 0x0001, 	// L2CAP signalling channel
+	kBluetoothL2CAPChannelConnectionLessData	= 0x0002, 	// L2CAP connection less data
+	kBluetoothL2CAPChannelAMPManagerProtocol	= 0x0003,	// AMP Manager Protocol
+	
+	// Range 0x0003 to 0x003F reserved for future use.
+	kBluetoothL2CAPChannelReservedStart			= 0x0004,
+    kBluetoothL2CAPChannelReservedEnd			= 0x003F,
+    
+    // Range 0x0040 to 0xFFFF are dynamically allocated.
+    kBluetoothL2CAPChannelDynamicStart			= 0x0040,
+    kBluetoothL2CAPChannelDynamicEnd			= 0xffff,
+	kBluetoothL2CAPChannelEnd					= 0xffff
+};
+
+typedef BluetoothL2CAPChannelID		BluetoothL2CAPGroupID;
+
+// Protocol/Service Multiplexor (PSM) values (Bluetooth L2CAP spec section 5.2).
+
+typedef UInt16		BluetoothL2CAPPSM;
+// PSM enum in BluetoothAssignedNumbers.h
+
+// Command Codes
+
+typedef enum
+{
+	kBluetoothL2CAPCommandCodeReserved							= 0x00, 
+	kBluetoothL2CAPCommandCodeCommandReject						= 0x01, 
+	kBluetoothL2CAPCommandCodeConnectionRequest					= 0x02, 
+	kBluetoothL2CAPCommandCodeConnectionResponse				= 0x03, 
+	kBluetoothL2CAPCommandCodeConfigureRequest					= 0x04, 
+	kBluetoothL2CAPCommandCodeConfigureResponse					= 0x05, 
+	kBluetoothL2CAPCommandCodeDisconnectionRequest				= 0x06, 
+	kBluetoothL2CAPCommandCodeDisconnectionResponse				= 0x07, 
+	kBluetoothL2CAPCommandCodeEchoRequest						= 0x08, 
+	kBluetoothL2CAPCommandCodeEchoResponse						= 0x09, 
+	kBluetoothL2CAPCommandCodeInformationRequest				= 0x0A, 
+	kBluetoothL2CAPCommandCodeInformationResponse				= 0x0B,
+	kBluetoothL2CAPCommandCodeCreateChannelRequest				= 0x0C,
+	kBluetoothL2CAPCommandCodeCreateChannelResponse				= 0x0D,
+	kBluetoothL2CAPCommandCodeMoveChannelRequest				= 0x0E,
+	kBluetoothL2CAPCommandCodeMoveChannelResponse				= 0x0F,
+	kBluetoothL2CAPCommandCodeMoveChannelConfirmation			= 0x10,
+	kBluetoothL2CAPCommandCodeMoveChannelConfirmationResponse	= 0x11,
+} BluetoothL2CAPCommandCode;
+
+// Command Reject
+
+typedef enum
+{
+	kBluetoothL2CAPCommandRejectReasonCommandNotUnderstood 	= 0x0000, 
+	kBluetoothL2CAPCommandRejectReasonSignallingMTUExceeded = 0x0001, 
+	kBluetoothL2CAPCommandRejectReasonInvalidCIDInRequest 	= 0x0002, 
+} BluetoothL2CAPCommandRejectReason;
+
+typedef UInt16		BluetoothL2CAPMTU;
+typedef	UInt16		BluetoothL2CAPLinkTimeout;
+typedef UInt16		BluetoothL2CAPFlushTimeout;
+enum
+{
+	kBluetoothL2CAPFlushTimeoutUseExisting 	= 0x0000, 
+	kBluetoothL2CAPFlushTimeoutImmediate 	= 0x0001, 
+	kBluetoothL2CAPFlushTimeoutForever 		= 0xFFFF, 
+	
+	kBluetoothL2CAPFlushTimeoutEnd
+};
+
+typedef struct BluetoothL2CAPQualityOfServiceOptions	BluetoothL2CAPQualityOfServiceOptions;
+struct BluetoothL2CAPQualityOfServiceOptions
+{
+	UInt8		flags;
+	UInt8		serviceType;
+	UInt32		tokenRate;
+	UInt32		tokenBucketSize;
+	UInt32		peakBandwidth;
+	UInt32		latency;
+	UInt32		delayVariation;
+};
+
+typedef struct BluetoothL2CAPRetransmissionAndFlowControlOptions BluetoothL2CAPRetransmissionAndFlowControlOptions;
+struct BluetoothL2CAPRetransmissionAndFlowControlOptions
+{
+	UInt8		flags;
+	UInt8		txWindowSize;
+	UInt8		maxTransmit;
+	UInt16		retransmissionTimeout;
+	UInt16		monitorTimeout;
+	UInt16		maxPDUPayloadSize;
+};
+
+enum
+{
+	kBluetoothL2CAPInfoTypeMaxConnectionlessMTUSize = 0x0001
+};
+
+// Packets
+
+enum
+{
+	kBluetoothL2CAPPacketHeaderSize = 4
+};
+
+typedef UInt16		BluetoothL2CAPByteCount;
+typedef UInt8		BluetoothL2CAPCommandID;
+typedef UInt16		BluetoothL2CAPCommandByteCount;
+
+typedef enum
+{
+    kBluetoothL2CAPConnectionResultSuccessful				= 0x0000,
+    kBluetoothL2CAPConnectionResultPending					= 0x0001,
+    kBluetoothL2CAPConnectionResultRefusedPSMNotSupported	= 0x0002,
+    kBluetoothL2CAPConnectionResultRefusedSecurityBlock		= 0x0003,
+    kBluetoothL2CAPConnectionResultRefusedNoResources		= 0x0004,
+} BluetoothL2CAPConnectionResult;
+
+typedef enum 
+{
+    kBluetoothL2CAPConnectionStatusNoInfoAvailable			= 0x0000,
+    kBluetoothL2CAPConnectionStatusAuthenticationPending	= 0x0001,
+    kBluetoothL2CAPConnectionStatusAuthorizationPending		= 0x0002,
+} BluetoothL2CAPConnectionStatus;
+
+typedef enum
+{
+    kBluetoothL2CAPConfigurationResultSuccess					= 0x0000,
+    kBluetoothL2CAPConfigurationResultUnacceptableParams		= 0x0001,
+    kBluetoothL2CAPConfigurationResultRejected					= 0x0002,
+    kBluetoothL2CAPConfigurationResultUnknownOptions			= 0x0003,
+} BluetoothL2CAPConfigurationResult;
+
+typedef enum
+{
+    kBluetoothL2CAPConfigurationOptionMTU                           = 0x01,
+    kBluetoothL2CAPConfigurationOptionFlushTimeout                  = 0x02,
+    kBluetoothL2CAPConfigurationOptionQoS                           = 0x03,
+    kBluetoothL2CAPConfigurationOptionRetransmissionAndFlowControl  = 0x04
+} BluetoothL2CAPConfigurationOption;
+
+enum
+{
+    kBluetoothL2CAPConfigurationOptionMTULength                             = 2,
+    kBluetoothL2CAPConfigurationOptionFlushTimeoutLength                    = 2,
+    kBluetoothL2CAPConfigurationOptionQoSLength                             = 22,
+    kBluetoothL2CAPConfigurationOptionRetransmissionAndFlowControlLength    = 9
+};
+
+typedef enum
+{
+    kBluetoothL2CAPConfigurationRetransmissionModeFlag  = 0x01,
+    kBluetoothL2CAPConfigurationFlowControlModeFlag     = 0x02,
+    kBluetoothL2CAPConfigurationBasicL2CAPModeFlag      = 0x00,
+} BluetoothL2CAPConfigurationRetransmissionAndFlowControlFlags;
+
+
+typedef enum
+{
+    kBluetoothL2CAPInformationTypeConnectionlessMTU			= 0x0001,
+    kBluetoothL2CAPInformationTypeExtendedFeatures			= 0x0002,
+	kBluetoothL2CAPInformationTypeFixedChannelsSupported	= 0x0003,
+} BluetoothL2CAPInformationType;
+
+typedef enum
+{
+    kBluetoothL2CAPInformationResultSuccess			= 0x0000,
+    kBluetoothL2CAPInformationResultNotSupported	= 0x0001,
+} BluetoothL2CAPInformationResult;
+
+typedef enum
+{
+    kBluetoothL2CAPInformationNoExtendedFeatures			= 0x00000000,
+    kBluetoothL2CAPInformationFlowControlMode				= 0x00000001,
+    kBluetoothL2CAPInformationRetransmissionMode			= 0x00000002,
+    kBluetoothL2CAPInformationBidirectionalQoS				= 0x00000004,
+	kBluetoothL2CAPInformationEnhancedRetransmissionMode	= 0x00000008,
+	kBluetoothL2CAPInformationStreamingMode					= 0x00000010,
+	kBluetoothL2CAPInformationFCSOption						= 0x00000020,
+	kBluetoothL2CAPInformationExtendedFlowSpecification		= 0x00000040,
+	kBluetoothL2CAPInformationFixedChannels					= 0x00000080,
+	kBluetoothL2CAPInformationExtendedWindowSize			= 0x00000100,
+	kBluetoothL2CAPUnicastConnectionlessDataReception		= 0x00000200,
+} BluetoothL2CAPInformationExtendedFeaturesMask;
+
+typedef enum
+{
+    kBluetoothL2CAPQoSTypeNoTraffic     = 0x00,
+    kBluetoothL2CAPQoSTypeBestEffort	= 0x01,
+    kBluetoothL2CAPQoSTypeGuaranteed	= 0x02,
+} BluetoothL2CAPQoSType;
+
+enum
+{
+	kBluetoothL2CAPMTUMinimum					= 0x0030,	// 48 bytes
+	kBluetoothL2CAPMTUDefault					= 0x03F9,	// 11.10.08 - dropped back to 1017 from 1021 (don't aggravate the 3DH5 problem between CSR<->BRCM just yet)
+	kBluetoothL2CAPMTUMaximum					= 0xffff,	
+	kBluetoothL2CAPMTUStart						= 0x7fff,
+	kBluetoothL2CAPMTUSIG						= 0x0030,	// 48 bytes
+	kBluetoothL2CAPFlushTimeoutDefault			= kBluetoothL2CAPFlushTimeoutForever,	// 0xffff
+	kBluetoothL2CAPQoSFlagsDefault				= 0,
+	kBluetoothL2CAPQoSTypeDefault				= kBluetoothL2CAPQoSTypeBestEffort,	// 0x01
+	kBluetoothL2CAPQoSTokenRateDefault			= 0x00000000,
+	kBluetoothL2CAPQoSTokenBucketSizeDefault	= 0x00000000,
+	kBluetoothL2CAPQoSPeakBandwidthDefault		= 0x00000000,
+	kBluetoothL2CAPQoSLatencyDefault			= 0xffffffff,
+	kBluetoothL2CAPQoSDelayVariationDefault		= 0xffffffff
+};
+
+#pragma mark === AMP Manager ===
+typedef enum {
+	kBluetoothAMPManagerCodeReserved							= 0x00,
+	kBluetoothAMPManagerCodeAMPCommandReject					= 0x01,
+	kBluetoothAMPManagerCodeAMPDiscoverRequest					= 0x02,
+	kBluetoothAMPManagerCodeAMPDiscoverResponse					= 0x03,
+	kBluetoothAMPManagerCodeAMPChangeNotify						= 0x04,
+	kBluetoothAMPManagerCodeAMPChangeResponse					= 0x05,
+	kBluetoothAMPManagerCodeAMPGetInfoRequest					= 0x06,
+	kBluetoothAMPManagerCodeAMPGetInfoResponse					= 0x07,
+	kBluetoothAMPManagerCodeAMPGetAssocRequest					= 0x08,
+	kBluetoothAMPManagerCodeAMPGetAssocResponse					= 0x09,
+	kBluetoothAMPManagerCodeAMPCreatePhysicalLinkRequest		= 0x0A,
+	kBluetoothAMPManagerCodeAMPCreatePhysicalLinkResponse		= 0x0B,
+	kBluetoothAMPManagerCodeAMPDisconnectPhysicalLinkRequest	= 0x0C,
+	kBluetoothAMPManagerCodeAMPDisconnectPhysicalLinkResponse	= 0x0D,
+} BluetoothAMPManagerCode;
+		
+typedef enum {
+	kBluetoothAMPManagerCommandRejectReasonCommandNotRecognized	= 0x0000,
+} BluetoothAMPCommandRejectReason;
+		
+typedef enum {
+	kBluetoothAMPManagerDiscoverResponseControllerStatusPoweredDown		= 0x00,
+	kBluetoothAMPManagerDiscoverResponseControllerStatusBluetoothOnly	= 0x01,
+	kBluetoothAMPManagerDiscoverResponseControllerStatusNoCapacity		= 0x02,
+	kBluetoothAMPManagerDiscoverResponseControllerStatusLowCapacity		= 0x03,
+	kBluetoothAMPManagerDiscoverResponseControllerStatusMediumCapacity	= 0x04,
+	kBluetoothAMPManagerDiscoverResponseControllerStatusHighCapacity	= 0x05,
+	kBluetoothAMPManagerDiscoverResponseControllerStatusFullCapacity	= 0x06,
+} BluetoothAMPDiscoverResponseControllerStatus;
+		
+typedef enum {
+	kBluetoothAMPManagerGetInfoResponseSuccess				= 0x00,
+	kBluetoothAMPManagerGetInfoResponseInvalidControllerID	= 0x01,
+} BluetoothAMPGetInfoResponseStatus;
+		
+typedef enum {
+	kBluetoothAMPManagerGetAssocResponseSuccess				= 0x00,
+	kBluetoothAMPManagerGetAssocResponseInvalidControllerID	= 0x01,
+} BluetoothAMPGetAssocResponseStatus;
+		
+typedef enum {
+	kBluetoothAMPManagerCreatePhysicalLinkResponseSuccess										= 0x00,
+	kBluetoothAMPManagerCreatePhysicalLinkResponseInvalidControllerID							= 0x01,
+	kBluetoothAMPManagerCreatePhysicalLinkResponseUnableToStartLinkCreation						= 0x02,
+	kBluetoothAMPManagerCreatePhysicalLinkResponseCollisionOccurred								= 0x03,
+	kBluetoothAMPManagerCreatePhysicalLinkResponseAMPDisconnectedPhysicalLinkRequestReceived	= 0x04,
+	kBluetoothAMPManagerCreatePhysicalLinkResponsePhysicalLinkAlreadyExists						= 0x05,
+	kBluetoothAMPManagerCreatePhysicalLinkResponseSecurityViolation								= 0x06,
+} BluetoothAMPCreatePhysicalLinkResponseStatus;
+		
+typedef enum {
+	kBluetoothAMPManagerDisconnectPhysicalLinkResponseSuccess				= 0x00,
+	kBluetoothAMPManagerDisconnectPhysicalLinkResponseInvalidControllerID	= 0x01,
+	kBluetoothAMPManagerDisconnectPhysicalLinkResponseNoPhysicalLink		= 0x02,
+} BluetoothAMPDisconnectPhysicalLinkResponseStatus;
+
+#if 0
+#pragma mark -
+#pragma mark === HCI ===
+#endif
+
+//===========================================================================================================================
+//	Host Controller Interface (HCI)
+//===========================================================================================================================
+
+//	HCI Command Packet
+//	------------------
+//	
+//	                     1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3
+//	 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+//	+--------------------------------+---------------+--------------+
+//	|            OpCode              |               |              |
+//	+--------------------+-----------| Param Length  |  Params...   |
+//	|         OCF        |    OGF    |               |              |
+//	+--------------------+-----------+---------------+--------------+
+//	|                                                               |
+//	|                         Params...                             |
+//	|                                                               |
+//	+---------------------------------------------------------------+
+
+// Commands
+
+typedef UInt8		BluetoothHCICommandOpCodeGroup;
+typedef UInt16		BluetoothHCICommandOpCodeCommand;
+typedef UInt16		BluetoothHCICommandOpCode;
+typedef	UInt32		BluetoothHCIVendorCommandSelector;
+
+#define	BluetoothHCIMakeCommandOpCode( GROUP, CMD )				( ( ( ( GROUP ) & 0x003F ) << 10 ) | ( ( CMD ) & 0x03FF ) )
+#define	BluetoothHCIMakeCommandOpCodeEndianSwap( GROUP, CMD )	( CFSwapInt16HostToLittle ( BluetoothHCIMakeCommandOpCode( GROUP, CMD ) ) )
+#define	BluetoothHCIExtractCommandOpCodeGroup( OPCODE )			( ( ( OPCODE ) >> 10 ) & 0x003F )
+#define	BluetoothHCIExtractCommandOpCodeCommand( OPCODE )		( ( OPCODE ) & 0x03FF )
+
+#define BluetoothHCIMakeCommandOpCodeHostOrder(GROUP, CMD )	OSSwapLittleToHostConstInt16( ( ( ( GROUP ) & 0x003F ) << 10 ) | ( ( CMD ) & 0x03FF ) )
+
+
+enum
+{
+	// Command Group: NoOp
+	
+	kBluetoothHCIOpCodeNoOp												= 0, 
+	kBluetoothHCICommandGroupNoOp										= 0x00, 
+		kBluetoothHCICommandNoOp										= 0x0000,
+	
+	// Command Group: Link Control
+	
+	kBluetoothHCICommandGroupLinkControl								= 0x01, 
+		kBluetoothHCICommandInquiry										= 0x0001, 
+		kBluetoothHCICommandInquiryCancel								= 0x0002, 
+		kBluetoothHCICommandPeriodicInquiryMode							= 0x0003, 
+		kBluetoothHCICommandExitPeriodicInquiryMode						= 0x0004, 
+		kBluetoothHCICommandCreateConnection							= 0x0005, 
+		kBluetoothHCICommandDisconnect									= 0x0006, 
+		kBluetoothHCICommandAddSCOConnection							= 0x0007,
+		kBluetoothHCICommandCreateConnectionCancel						= 0x0008,
+		kBluetoothHCICommandAcceptConnectionRequest						= 0x0009, 
+		kBluetoothHCICommandRejectConnectionRequest						= 0x000A, 
+		kBluetoothHCICommandLinkKeyRequestReply							= 0x000B, 
+		kBluetoothHCICommandLinkKeyRequestNegativeReply					= 0x000C, 
+		kBluetoothHCICommandPINCodeRequestReply							= 0x000D, 
+		kBluetoothHCICommandPINCodeRequestNegativeReply					= 0x000E, 
+		kBluetoothHCICommandChangeConnectionPacketType					= 0x000F, 
+		kBluetoothHCICommandAuthenticationRequested						= 0x0011, 
+		kBluetoothHCICommandSetConnectionEncryption						= 0x0013, 
+		kBluetoothHCICommandChangeConnectionLinkKey						= 0x0015, 
+		kBluetoothHCICommandMasterLinkKey								= 0x0017, 
+		kBluetoothHCICommandRemoteNameRequest							= 0x0019, 
+		kBluetoothHCICommandReadRemoteSupportedFeatures					= 0x001B, 
+		kBluetoothHCICommandReadRemoteExtendedFeatures					= 0x001C, 
+		kBluetoothHCICommandReadRemoteVersionInformation				= 0x001D, 
+		kBluetoothHCICommandReadClockOffset								= 0x001F, 
+		kBluetoothHCICommandRemoteNameRequestCancel						= 0x001A,
+		kBluetoothHCICommandReadLMPHandle								= 0x0020,
+		kBluetoothHCICommandSetupSynchronousConnection					= 0x0028,
+		kBluetoothHCICommandAcceptSynchronousConnectionRequest			= 0x0029,
+		kBluetoothHCICommandRejectSynchronousConnectionRequest			= 0x002A,
+		kBluetoothHCICommandIOCapabilityRequestReply					= 0x002B,
+		kBluetoothHCICommandUserConfirmationRequestReply				= 0x002C,
+		kBluetoothHCICommandUserConfirmationRequestNegativeReply		= 0x002D,
+		kBluetoothHCICommandUserPasskeyRequestReply						= 0x002E,
+		kBluetoothHCICommandUserPasskeyRequestNegativeReply				= 0x002F,
+		kBluetoothHCICommandRemoteOOBDataRequestReply					= 0x0030,
+		kBluetoothHCICommandRemoteOOBDataRequestNegativeReply			= 0x0033,
+
+	// Command Group: Link Policy
+	
+	kBluetoothHCICommandGroupLinkPolicy									= 0x02, 
+		kBluetoothHCICommandHoldMode									= 0x0001, 
+		kBluetoothHCICommandSniffMode									= 0x0003, 
+		kBluetoothHCICommandExitSniffMode								= 0x0004, 
+		kBluetoothHCICommandParkMode									= 0x0005, 
+		kBluetoothHCICommandExitParkMode								= 0x0006, 
+		kBluetoothHCICommandQoSSetup									= 0x0007, 
+		kBluetoothHCICommandRoleDiscovery								= 0x0009, 
+		kBluetoothHCICommandSwitchRole									= 0x000B, 
+		kBluetoothHCICommandReadLinkPolicySettings						= 0x000C, 
+		kBluetoothHCICommandWriteLinkPolicySettings						= 0x000D, 
+		kBluetoothHCICommandReadDefaultLinkPolicySettings				= 0x000E,
+		kBluetoothHCICommandWriteDefaultLinkPolicySettings				= 0x000F,
+		kBluetoothHCICommandFlowSpecification							= 0x0010,
+		kBluetoothHCICommandSniffSubrating								= 0x0011,
+		kBluetoothHCICommandAcceptSniffRequest							= 0x0031,
+		kBluetoothHCICommandRejectSniffRequest							= 0x0032,
+	
+	// Command Group: Host Controller & Baseband
+	
+	kBluetoothHCICommandGroupHostController								= 0x03, 
+		kBluetoothHCICommandSetEventMask								= 0x0001, 
+		kBluetoothHCICommandReset										= 0x0003, 
+		kBluetoothHCICommandSetEventFilter								= 0x0005, 
+		kBluetoothHCICommandFlush										= 0x0008, 
+		kBluetoothHCICommandReadPINType									= 0x0009, 
+		kBluetoothHCICommandWritePINType								= 0x000A, 
+		kBluetoothHCICommandCreateNewUnitKey							= 0x000B, 
+		kBluetoothHCICommandReadStoredLinkKey							= 0x000D, 
+		kBluetoothHCICommandWriteStoredLinkKey							= 0x0011, 
+		kBluetoothHCICommandDeleteStoredLinkKey							= 0x0012, 
+		kBluetoothHCICommandChangeLocalName								= 0x0013, 
+		kBluetoothHCICommandReadLocalName								= 0x0014, 
+		kBluetoothHCICommandReadConnectionAcceptTimeout					= 0x0015, 
+		kBluetoothHCICommandWriteConnectionAcceptTimeout				= 0x0016, 
+		kBluetoothHCICommandReadPageTimeout								= 0x0017, 
+		kBluetoothHCICommandWritePageTimeout							= 0x0018, 
+		kBluetoothHCICommandReadScanEnable								= 0x0019, 
+		kBluetoothHCICommandWriteScanEnable								= 0x001A, 
+		kBluetoothHCICommandReadPageScanActivity						= 0x001B, 
+		kBluetoothHCICommandWritePageScanActivity						= 0x001C, 
+		kBluetoothHCICommandReadInquiryScanActivity						= 0x001D, 
+		kBluetoothHCICommandWriteInquiryScanActivity					= 0x001E, 
+		kBluetoothHCICommandReadAuthenticationEnable					= 0x001F, 
+		kBluetoothHCICommandWriteAuthenticationEnable					= 0x0020, 
+		kBluetoothHCICommandReadEncryptionMode							= 0x0021, 
+		kBluetoothHCICommandWriteEncryptionMode							= 0x0022, 
+		kBluetoothHCICommandReadClassOfDevice							= 0x0023,
+		kBluetoothHCICommandWriteClassOfDevice							= 0x0024, 
+		kBluetoothHCICommandReadVoiceSetting							= 0x0025,
+		kBluetoothHCICommandWriteVoiceSetting							= 0x0026, 
+		kBluetoothHCICommandReadAutomaticFlushTimeout					= 0x0027, 
+		kBluetoothHCICommandWriteAutomaticFlushTimeout					= 0x0028, 
+		kBluetoothHCICommandReadNumberOfBroadcastRetransmissions		= 0x0029, 
+		kBluetoothHCICommandWriteNumberOfBroadcastRetransmissions		= 0x002A, 
+		kBluetoothHCICommandReadHoldModeActivity						= 0x002B, 
+		kBluetoothHCICommandWriteHoldModeActivity						= 0x002C, 
+		kBluetoothHCICommandReadTransmitPowerLevel						= 0x002D, 
+		kBluetoothHCICommandReadSCOFlowControlEnable					= 0x002E, 
+		kBluetoothHCICommandWriteSCOFlowControlEnable					= 0x002F, 
+		kBluetoothHCICommandSetHostControllerToHostFlowControl			= 0x0031, 
+		kBluetoothHCICommandHostBufferSize								= 0x0033, 
+		kBluetoothHCICommandHostNumberOfCompletedPackets				= 0x0035, 
+		kBluetoothHCICommandReadLinkSupervisionTimeout					= 0x0036, 
+		kBluetoothHCICommandWriteLinkSupervisionTimeout					= 0x0037, 
+		kBluetoothHCICommandReadNumberOfSupportedIAC					= 0x0038, 
+		kBluetoothHCICommandReadCurrentIACLAP							= 0x0039, 
+		kBluetoothHCICommandWriteCurrentIACLAP							= 0x003A, 
+		kBluetoothHCICommandReadPageScanPeriodMode						= 0x003B, 
+		kBluetoothHCICommandWritePageScanPeriodMode						= 0x003C, 
+		kBluetoothHCICommandReadPageScanMode							= 0x003D, 
+		kBluetoothHCICommandWritePageScanMode							= 0x003E, 
+		kBluetoothHCICommandSetAFHClassification						= 0x003F, 		
+		kBluetoothHCICommandReadInquiryScanType							= 0x0042, 		
+		kBluetoothHCICommandWriteInquiryScanType						= 0x0043, 		
+		kBluetoothHCICommandReadInquiryMode								= 0x0044, 		
+		kBluetoothHCICommandWriteInquiryMode							= 0x0045,
+		kBluetoothHCICommandReadPageScanType							= 0x0046,
+		kBluetoothHCICommandWritePageScanType							= 0x0047,
+		kBluetoothHCICommandReadAFHChannelAssessmentMode				= 0x0048,
+		kBluetoothHCICommandWriteAFHChannelAssessmentMode				= 0x0049,
+		kBluetoothHCICommandReadExtendedInquiryResponse					= 0x0051, 		
+		kBluetoothHCICommandWriteExtendedInquiryResponse				= 0x0052, 		
+		kBluetoothHCICommandReadSimplePairingMode						= 0x0055,
+		kBluetoothHCICommandWriteSimplePairingMode						= 0x0056,
+		kBluetoothHCICommandReadLocalOOBData							= 0x0057,
+		kBluetoothHCICommandReadInquiryResponseTransmitPower			= 0x0058,
+		kBluetoothHCICommandWriteInquiryResponseTransmitPower			= 0x0059,
+		kBluetoothHCICommandReadDefaultErroneousDataReporting			= 0x005A,
+		kBluetoothHCICommandWriteDefaultErroneousDataReporting			= 0x005B,
+		kBluetoothHCICommandReadPersistentSniffInterval					= 0x005C,
+		kBluetoothHCICommandWritePersistentSniffInterval				= 0x005D,
+		kBluetoothHCICommandDeletePersistentSniffInterval				= 0x005E,
+		kBluetoothHCICommandEnhancedFlush								= 0x005F,
+		kBluetoothHCICommandSendKeypressNotification					= 0x0060,
+	
+	// Command Group: Informational
+	
+	kBluetoothHCICommandGroupInformational								= 0x04, 
+		kBluetoothHCICommandReadLocalVersionInformation					= 0x0001, 
+		kBluetoothHCICommandReadLocalSupportedCommands					= 0x0002, 
+		kBluetoothHCICommandReadLocalSupportedFeatures					= 0x0003, 
+		kBluetoothHCICommandReadLocalExtendedFeatures					= 0x0004,
+		kBluetoothHCICommandReadBufferSize								= 0x0005, 
+		kBluetoothHCICommandReadCountryCode								= 0x0007, 
+		kBluetoothHCICommandReadDeviceAddress							= 0x0009, 
+	
+	// Command Group: Status
+	
+	kBluetoothHCICommandGroupStatus										= 0x05, 
+		kBluetoothHCICommandReadFailedContactCounter					= 0x0001, 
+		kBluetoothHCICommandResetFailedContactCounter					= 0x0002, 
+		kBluetoothHCICommandGetLinkQuality								= 0x0003, 
+		kBluetoothHCICommandReadRSSI									= 0x0005, 
+		kBluetoothHCICommandReadAFHMappings								= 0x0006,
+		kBluetoothHCICommandReadClock									= 0x0007,
+
+	// Command Group: Testing
+	
+	kBluetoothHCICommandGroupTesting									= 0x06, 
+		kBluetoothHCICommandReadLoopbackMode							= 0x0001, 
+		kBluetoothHCICommandWriteLoopbackMode							= 0x0002, 
+		kBluetoothHCICommandEnableDeviceUnderTestMode					= 0x0003, 
+		kBluetoothHCICommandWriteSimplePairingDebugMode					= 0x0004,
+
+	// Command Group: Logo Testing (no commands yet)
+	
+	kBluetoothHCICommandGroupLogoTesting 								= 0x3E, 
+	
+	// Command Group: Vendor Specific (from Broadcom HCI Programmer's Reference Guide)
+	
+	kBluetoothHCICommandGroupVendorSpecific								= 0x3f, 
+		kBluetoothHCICommandWriteDeviceAddress							= 0x0001, 
+		kBluetoothHCICommandWriteHoppingChannels						= 0x0012,
+		kBluetoothHCICommandInvalidateFlashAndReboot					= 0x0017,
+		kBluetoothHCICommandSetMaxPower									= 0x0026,
+		kBluetoothHCICommandEnableHIDEmulation							= 0x003B,
+		kBluetoothHCICommandEnableRadio									= 0x0034,
+		kBluetoothHCIGetHIDDeviceList									= 0x0036,
+		kBluetoothHCIAddHIDDevice										= 0x0037,
+		kBluetoothHCIRemoveHIDDevice									= 0x0039,
+	
+	kBluetoothHCICommandGroupMax										= 0x40, 
+	kBluetoothHCICommandMax												= 0x03FF
+};
+
+// HCI Data Types
+
+typedef UInt8										BluetoothHCIQoSFlags;
+typedef UInt8										BluetoothHCIParamByteCount;
+typedef UInt16										BluetoothHCIACLDataByteCount;
+typedef UInt8										BluetoothHCISCODataByteCount;
+typedef UInt8										BluetoothHCIInquiryLength;
+typedef UInt8										BluetoothHCIResponseCount;
+typedef UInt8										BluetoothHCICountryCode;
+typedef UInt16										BluetoothHCIModeInterval;
+typedef UInt16										BluetoothHCISniffAttemptCount;
+typedef UInt16										BluetoothHCISniffTimeout;
+typedef UInt16										BluetoothHCIParkModeBeaconInterval;
+
+typedef UInt8										BluetoothMaxSlots;
+typedef UInt16										BluetoothManufacturerName;
+typedef UInt8										BluetoothLMPVersion;
+typedef UInt16										BluetoothLMPSubversion;
+
+typedef UInt8										BluetoothHCIConnectionMode;
+enum BluetoothHCIConnectionModes
+{
+	kConnectionActiveMode					= 0,
+	kConnectionHoldMode						= 1,
+	kConnectionSniffMode					= 2,
+	kConnectionParkMode						= 3,
+	kConnectionModeReservedForFutureUse		= 4,
+};
+
+typedef struct	BluetoothHCISupportedFeatures		BluetoothHCISupportedFeatures;
+struct BluetoothHCISupportedFeatures
+{
+	UInt8	data[8];
+};
+
+#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1
+typedef UInt8										BluetoothHCIPageNumber;
+typedef struct	BluetoothHCIExtendedFeaturesInfo	BluetoothHCIExtendedFeaturesInfo;
+struct BluetoothHCIExtendedFeaturesInfo
+{
+	BluetoothHCIPageNumber	page;
+	BluetoothHCIPageNumber	maxPage;
+	UInt8					data[8];
+};
+#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1 */
+		
+enum BluetoothFeatureBits
+{
+	// Byte 0 of the support features data structure.
+
+	kBluetoothFeatureThreeSlotPackets					= (1 << 0L),
+	kBluetoothFeatureFiveSlotPackets					= (1 << 1L),
+	kBluetoothFeatureEncryption							= (1 << 2L),
+	kBluetoothFeatureSlotOffset							= (1 << 3L),
+	kBluetoothFeatureTimingAccuracy						= (1 << 4L),
+	kBluetoothFeatureSwitchRoles						= (1 << 5L),
+	kBluetoothFeatureHoldMode							= (1 << 6L),
+	kBluetoothFeatureSniffMode							= (1 << 7L),
+	
+	// Byte 1 of the support features data structure.
+
+	kBluetoothFeatureParkMode							= (1 << 0L),
+	kBluetoothFeatureRSSI								= (1 << 1L),
+	kBluetoothFeaturePowerControlRequests				= (1 << 1L),
+	kBluetoothFeatureChannelQuality						= (1 << 2L),
+	kBluetoothFeatureSCOLink							= (1 << 3L),
+	kBluetoothFeatureHV2Packets							= (1 << 4L),
+	kBluetoothFeatureHV3Packets							= (1 << 5L),
+	kBluetoothFeatureULawLog							= (1 << 6L),
+	kBluetoothFeatureALawLog							= (1 << 7L),
+
+	// Byte 2 of the support features data structure.
+
+	kBluetoothFeatureCVSD								= (1 << 0L),
+	kBluetoothFeaturePagingScheme						= (1 << 1L),
+	kBluetoothFeaturePowerControl						= (1 << 2L),
+	kBluetoothFeatureTransparentSCOData					= (1 << 3L),
+	kBluetoothFeatureFlowControlLagBit0					= (1 << 4L),
+	kBluetoothFeatureFlowControlLagBit1					= (1 << 5L),
+	kBluetoothFeatureFlowControlLagBit2					= (1 << 6L),
+	kBluetoothFeatureBroadcastEncryption				= (1 << 7L),	
+	
+	// Byte 3 of the support features data structure.	
+	
+	kBluetoothFeatureScatterMode						= (1 << 0L),
+	kBluetoothFeatureEnhancedDataRateACL2MbpsMode		= (1 << 1L),	
+	kBluetoothFeatureEnhancedDataRateACL3MbpsMode		= (1 << 2L),	
+	kBluetoothFeatureEnhancedInquiryScan				= (1 << 3L),
+	kBluetoothFeatureInterlacedInquiryScan				= (1 << 4L),	
+	kBluetoothFeatureInterlacedPageScan					= (1 << 5L),		
+	kBluetoothFeatureRSSIWithInquiryResult				= (1 << 6L),	
+	kBluetoothFeatureExtendedSCOLink					= (1 << 7L),
+
+	// Byte 4 of the support features data structure.	
+
+	kBluetoothFeatureEV4Packets							= (1 << 0L),
+	kBluetoothFeatureEV5Packets							= (1 << 1L),	
+	kBluetoothFeatureAbsenceMasks						= (1 << 2L),
+	kBluetoothFeatureAFHCapableSlave					= (1 << 3L),
+	kBluetoothFeatureAFHClassificationSlave				= (1 << 4L),	
+	kBluetoothFeatureAliasAuhentication					= (1 << 5L),
+	kBluetoothFeatureAnonymityMode						= (1 << 6L),
+	kBluetoothFeature3SlotEnhancedDataRateACLPackets	= (1 << 7L),
+	
+	// Byte 5 of the support features data structure.
+
+	kBluetoothFeature5SlotEnhancedDataRateACLPackets	= (1 << 0L), // 2.0 version of this header had this at the wrong bit location
+	kBluetoothFeatureSniffSubrating						= (1 << 1L),
+	kBluetoothFeaturePauseEncryption					= (1 << 2L),
+	kBluetoothFeatureAFHCapableMaster					= (1 << 3L),
+	kBluetoothFeatureAFHClassificationMaster			= (1 << 4L),
+	kBluetoothFeatureEnhancedDataRateeSCO2MbpsMode		= (1 << 5L),
+	kBluetoothFeatureEnhancedDataRateeSCO3MbpsMode		= (1 << 6L),
+	kBluetoothFeature3SlotEnhancedDataRateeSCOPackets	= (1 << 7L),
+	
+	// Byte 6 of the support features data structure.	
+
+	kBluetoothFeatureExtendedInquiryResponse			= (1 << 0L),
+	kBluetoothFeatureSecureSimplePairing				= (1 << 3L),
+	kBluetoothFeatureEncapsulatedPDU					= (1 << 4L),
+	kBluetoothFeatureErroneousDataReporting				= (1 << 5L),
+	kBluetoothFeatureNonFlushablePacketBoundaryFlag		= (1 << 6L),
+	
+	// Byte 7 of the support features data structure.
+
+	kBluetoothFeatureLinkSupervisionTimeoutChangedEvent	= (1 << 0L),
+	kBluetoothFeatureInquiryTransmissionPowerLevel		= (1 << 1L),
+	kBluetoothFeatureExtendedFeatures					= (1 << 7L),
+	
+	// Byte 8 of the support features data structure (extended)
+
+	kBluetoothFeatureSimpleSecurePairingHostMode		= (1 << 0L),
+
+};
+
+typedef UInt16										BluetoothHCIFailedContactCount;
+typedef struct BluetoothHCIFailedContactInfo		BluetoothHCIFailedContactInfo;
+struct BluetoothHCIFailedContactInfo
+{
+	BluetoothHCIFailedContactCount	count;
+	BluetoothConnectionHandle		handle;
+};
+
+typedef SInt8										BluetoothHCIRSSIValue;	/* Valid Range: -127 to +20 */
+typedef struct BluetoothHCIRSSIInfo					BluetoothHCIRSSIInfo;
+struct BluetoothHCIRSSIInfo
+{
+	BluetoothConnectionHandle		handle;
+	BluetoothHCIRSSIValue			RSSIValue;
+};
+
+typedef	UInt8										BluetoothHCILinkQuality;
+typedef struct BluetoothHCILinkQualityInfo			BluetoothHCILinkQualityInfo;
+struct BluetoothHCILinkQualityInfo
+{
+	BluetoothConnectionHandle		handle;
+	BluetoothHCILinkQuality			qualityValue;
+};
+
+typedef UInt8	BluetoothHCIRole;
+typedef struct	BluetoothHCIRoleInfo					BluetoothHCIRoleInfo;
+struct BluetoothHCIRoleInfo
+{
+	UInt8						role;
+	BluetoothConnectionHandle	handle;
+};
+
+enum BluetoothHCIRoles
+{
+	kBluetoothHCIMasterRole				= 0x00,
+	kBluetoothHCISlaveRole				= 0x01
+};
+
+typedef UInt16										BluetoothHCILinkPolicySettings;
+enum BluetoothHCILinkPolicySettingsValues
+{
+	kDisableAllLMModes					= 0x0000,
+	kEnableMasterSlaveSwitch			= 0x0001,
+	kEnableHoldMode						= 0x0002,
+	kEnableSniffMode					= 0x0004,
+	kEnableParkMode						= 0x0008,
+	kReservedForFutureUse				= 0x0010
+};
+
+typedef struct	BluetoothHCILinkPolicySettingsInfo		BluetoothHCILinkPolicySettingsInfo;
+struct BluetoothHCILinkPolicySettingsInfo
+{
+	BluetoothHCILinkPolicySettings		settings;
+	BluetoothConnectionHandle			handle;
+};
+
+
+typedef struct BluetoothHCIQualityOfServiceSetupParams	BluetoothHCIQualityOfServiceSetupParams;
+struct BluetoothHCIQualityOfServiceSetupParams
+{
+	UInt8		flags;
+	UInt8		serviceType;
+	UInt32		tokenRate;
+	UInt32		peakBandwidth;
+	UInt32		latency;
+	UInt32		delayVariation;
+};
+
+typedef UInt8										BluetoothHCILoopbackMode;
+enum
+{
+	kBluetoothHCILoopbackModeOff		= 0x00,
+	kBluetoothHCILoopbackModeLocal		= 0x01,
+	kBluetoothHCILoopbackModeRemote		= 0x02
+};
+
+typedef UInt32 BluetoothHCIOperationID;
+typedef UInt32 BluetoothHCIEventID;
+typedef UInt32 BluetoothHCIDataID;
+typedef UInt32 BluetoothHCISignalID;
+typedef UInt32 BluetoothHCITransportID;
+typedef UInt32 BluetoothHCITransportCommandID;
+typedef UInt32 BluetoothHCIRequestID;
+		
+
+// Version Information
+
+typedef struct	BluetoothHCIVersionInfo		BluetoothHCIVersionInfo;
+struct	BluetoothHCIVersionInfo
+{
+	// Local & Remote information
+	
+	BluetoothManufacturerName	manufacturerName;
+	BluetoothLMPVersion			lmpVersion;
+	BluetoothLMPSubversion		lmpSubVersion;
+	
+	// Local information only
+	
+	UInt8		hciVersion;
+	UInt16		hciRevision;
+};
+
+// HCI buffer sizes.
+
+typedef struct	BluetoothHCIBufferSize		BluetoothHCIBufferSize;
+struct	BluetoothHCIBufferSize
+{
+	UInt16	ACLDataPacketLength;
+	UInt8	SCODataPacketLength;
+	UInt16	totalNumACLDataPackets;
+	UInt16	totalNumSCODataPackets;
+};
+
+// Timeouts
+typedef UInt16	BluetoothHCIConnectionAcceptTimeout;
+typedef UInt16	BluetoothHCIPageTimeout;
+enum BluetoothHCITimeoutValues
+{
+	kDefaultPageTimeout			= 0x2000,
+};
+
+#define		BluetoothGetSlotsFromSeconds( inSeconds )		( (inSeconds/.000625 ) )
+
+
+// Link Keys
+typedef UInt16	BluetoothHCINumLinkKeysDeleted;
+typedef UInt8	BluetoothHCINumLinkKeysToWrite;
+typedef UInt8	BluetoothHCIDeleteStoredLinkKeyFlag;
+enum BluetoothHCIDeleteStoredLinkKeyFlags
+{
+	kDeleteKeyForSpecifiedDeviceOnly		= 0x00,
+	kDeleteAllStoredLinkKeys				= 0x01,
+};
+
+typedef UInt8	BluetoothHCIReadStoredLinkKeysFlag;
+enum BluetoothHCIReadStoredLinkKeysFlags
+{
+	kReturnLinkKeyForSpecifiedDeviceOnly		= 0x00,
+	kReadAllStoredLinkKeys						= 0x01,
+};
+
+typedef struct	BluetoothHCIStoredLinkKeysInfo	BluetoothHCIStoredLinkKeysInfo;
+struct BluetoothHCIStoredLinkKeysInfo
+{
+	UInt16	numLinkKeysRead;
+	UInt16	maxNumLinkKeysAllowedInDevice;
+};
+
+
+// Page Scan
+
+typedef UInt8	BluetoothHCIPageScanMode;
+enum BluetoothHCIPageScanModes
+{
+	kMandatoryPageScanMode		= 0x00,
+	kOptionalPageScanMode1		= 0x01,
+	kOptionalPageScanMode2		= 0x02,
+	kOptionalPageScanMode3		= 0x03,
+};
+
+typedef UInt8	BluetoothHCIPageScanPeriodMode;
+enum BluetoothHCIPageScanPeriodModes
+{
+	kP0Mode						= 0x00,
+	kP1Mode						= 0x01,
+	kP2Mode						= 0x02,
+};
+
+typedef UInt8	BluetoothHCIPageScanEnableState;
+enum BluetoothHCIPageScanEnableStates
+{
+	kNoScansEnabled							= 0x00,
+	kInquiryScanEnabledPageScanDisabled		= 0x01,
+	kInquiryScanDisabledPageScanEnabled		= 0x02,
+	kInquiryScanEnabledPageScanEnabled		= 0x03,
+};
+
+typedef struct	BluetoothHCIScanActivity	BluetoothHCIScanActivity;
+struct BluetoothHCIScanActivity
+{
+	UInt16 	scanInterval;
+	UInt16	scanWindow;
+};
+
+typedef struct	BluetoothHCIInquiryAccessCode	BluetoothHCIInquiryAccessCode;
+struct BluetoothHCIInquiryAccessCode
+{
+	UInt8 	data[3];
+};
+
+typedef UInt8 BluetoothHCIInquiryAccessCodeCount;
+typedef struct	BluetoothHCICurrentInquiryAccessCodes	BluetoothHCICurrentInquiryAccessCodes;
+struct BluetoothHCICurrentInquiryAccessCodes
+{
+	BluetoothHCIInquiryAccessCodeCount	count;	// Number of codes in array.
+	BluetoothHCIInquiryAccessCode *		codes;	// Ptr to array of codes.
+};
+
+typedef	struct BluetoothHCILinkSupervisionTimeout	BluetoothHCILinkSupervisionTimeout;
+struct BluetoothHCILinkSupervisionTimeout
+{
+	BluetoothConnectionHandle 	handle;
+	UInt16						timeout;
+};
+
+typedef UInt8 BluetoothHCIFlowControlState;
+enum BluetoothHCISCOFlowControlStates
+{
+	kSCOFlowControlDisabled		= 0x00,
+	kSCOFlowControlEnabled		= 0x01
+};
+
+enum BluetoothHCIGeneralFlowControlStates
+{
+	kHostControllerToHostFlowControlOff			= 0x00,
+	kHCIACLDataPacketsOnHCISCODataPacketsOff	= 0x01,
+	kHCIACLDataPacketsOffHCISCODataPacketsOn	= 0x02,
+	kHCIACLDataPacketsOnHCISCODataPacketsOn		= 0x03,
+};		
+		
+typedef SInt8 BluetoothHCITransmitPowerLevel;
+typedef UInt8 BluetoothHCITransmitPowerLevelType;
+enum BluetoothHCITransmitReadPowerLevelTypes
+{
+	kReadCurrentTransmitPowerLevel	= 0x00,
+	kReadMaximumTransmitPowerLevel	= 0x01,
+};
+
+typedef UInt8	BluetoothHCIAFHChannelAssessmentMode;	
+enum BluetoothHCIAFHChannelAssessmentModes
+{
+	kAFHChannelAssessmentModeDisabled		= 0x00,
+	kAFHChannelAssessmentModeEnabled		= 0x01
+};
+
+
+typedef struct BluetoothHCITransmitPowerLevelInfo	BluetoothHCITransmitPowerLevelInfo;
+struct BluetoothHCITransmitPowerLevelInfo
+{
+	BluetoothConnectionHandle		handle;
+	BluetoothHCITransmitPowerLevel	level; // Range: -70 <= N <= 20 (units are dBm)
+};
+
+typedef UInt8	BluetoothHCINumBroadcastRetransmissions;
+typedef UInt8	BluetoothHCIHoldModeActivity;
+enum BluetoothHCIHoldModeActivityStates
+{
+	kMaintainCurrentPowerState		= 0x00,
+	kSuspendPageScan				= 0x01,
+	kSuspendInquiryScan				= 0x02,
+	kSuspendPeriodicInquiries		= 0x03,
+};
+
+typedef UInt8 BluetoothHCIAuthenticationEnable;
+enum BluetoothHCIAuthentionEnableModes
+{
+	kAuthenticationDisabled			= 0x00,
+	kAuthenticationEnabled			= 0x01,
+};
+
+typedef UInt8	BluetoothHCIEncryptionMode;
+enum BluetoothHCIEncryptionModes
+{
+	kEncryptionDisabled									= 0x00,		// Default.
+	kEncryptionOnlyForPointToPointPackets				= 0x01,
+	kEncryptionForBothPointToPointAndBroadcastPackets	= 0x02,
+};
+
+typedef UInt16	BluetoothHCIAutomaticFlushTimeout;
+typedef struct	BluetoothHCIAutomaticFlushTimeoutInfo	BluetoothHCIAutomaticFlushTimeoutInfo;
+struct BluetoothHCIAutomaticFlushTimeoutInfo
+{
+	BluetoothConnectionHandle			handle;
+	BluetoothHCIAutomaticFlushTimeout	timeout;
+};
+
+#define	kInfoStringMaxLength		25
+typedef struct	BluetoothTransportInfo 		BluetoothTransportInfo;
+typedef 		BluetoothTransportInfo*		BluetoothTransportInfoPtr;
+struct			BluetoothTransportInfo
+{
+	UInt32	productID;
+	UInt32	vendorID;
+	UInt32	type;
+	char	productName[kInfoStringMaxLength];
+	char	vendorName[kInfoStringMaxLength];
+};
+
+enum BluetoothTransportTypes
+{
+	kBluetoothTransportTypeUSB				= 0x01,
+	kBluetoothTransportTypePCCard			= 0x02,
+	kBluetoothTransportTypePCICard			= 0x03
+};
+
+// Inquiries
+
+typedef struct	BluetoothHCIInquiryResult	BluetoothHCIInquiryResult;
+struct	BluetoothHCIInquiryResult
+{
+	BluetoothDeviceAddress				deviceAddress;
+	BluetoothPageScanRepetitionMode		pageScanRepetitionMode;
+	BluetoothHCIPageScanPeriodMode		pageScanPeriodMode;
+	BluetoothHCIPageScanMode			pageScanMode;
+	BluetoothClassOfDevice				classOfDevice;
+	BluetoothClockOffset				clockOffset;
+};
+
+#define kBluetoothHCIInquiryResultsMaxResults 50
+typedef struct	BluetoothHCIInquiryResults	BluetoothHCIInquiryResults;
+struct	BluetoothHCIInquiryResults
+{
+	BluetoothHCIInquiryResult		results[kBluetoothHCIInquiryResultsMaxResults];
+	IOItemCount						count;
+};
+
+#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0
+
+//Inquiries with RSSI (v1.2 specification)
+
+typedef struct	BluetoothHCIInquiryWithRSSIResult	BluetoothHCIInquiryWithRSSIResult;
+struct	BluetoothHCIInquiryWithRSSIResult
+{
+	BluetoothDeviceAddress				deviceAddress;
+	BluetoothPageScanRepetitionMode		pageScanRepetitionMode;
+	UInt8								reserved;
+	BluetoothClassOfDevice				classOfDevice;
+	BluetoothClockOffset				clockOffset;
+	BluetoothHCIRSSIValue				RSSIValue;
+};
+
+typedef struct	BluetoothHCIInquiryWithRSSIResults	BluetoothHCIInquiryWithRSSIResults;
+struct	BluetoothHCIInquiryWithRSSIResults
+{
+	BluetoothHCIInquiryWithRSSIResult	results[50];
+	IOItemCount							count;
+};
+
+//Inquiries with 'Extended Inquiry Response' (v2.1 specification)
+
+typedef UInt8	BluetoothHCIFECRequired;
+enum BluetoothHCIFECRequiredValues
+{
+	kBluetoothHCIFECRequired		= 0x00,
+	kBluetoothHCIFECNotRequired		= 0x01
+};
+
+typedef	UInt8	BluetoothHCIInquiryMode;
+enum BluetoothHCIInquiryModes
+{
+	kBluetoothHCIInquiryModeResultFormatStandard								=	0x00,
+	kBluetoothHCIInquiryModeResultFormatWithRSSI								=	0x01,
+	kBluetoothHCIInquiryModeResultFormatWithRSSIOrExtendedInquiryResultFormat	=	0x02
+};
+
+typedef	UInt8	BluetoothHCIExtendedInquiryResponseDataType;
+
+typedef struct	BluetoothHCIExtendedInquiryResponse		BluetoothHCIExtendedInquiryResponse;	/* Extended Inquiry Response [EIR] data, consisting of a sequence of data structures in this format: [length(1byte)][data type(1byte)][data(e.g. device name)] */
+struct	BluetoothHCIExtendedInquiryResponse
+{
+	UInt8		data[ 240 ];
+};
+
+typedef struct	BluetoothHCIReadExtendedInquiryResponseResults	BluetoothHCIReadExtendedInquiryResponseResults;
+struct	BluetoothHCIReadExtendedInquiryResponseResults
+{
+	BluetoothHCIFECRequired					outFECRequired;
+	BluetoothHCIExtendedInquiryResponse		extendedInquiryResponse;
+};
+
+typedef struct	BluetoothHCIExtendedInquiryResult	BluetoothHCIExtendedInquiryResult;
+struct	BluetoothHCIExtendedInquiryResult
+{
+	UInt8								numberOfReponses;			/* always a value of 1 */
+	BluetoothDeviceAddress				deviceAddress;
+	BluetoothPageScanRepetitionMode		pageScanRepetitionMode;
+	UInt8								reserved;
+	BluetoothClassOfDevice				classOfDevice;
+	BluetoothClockOffset				clockOffset;
+	BluetoothHCIRSSIValue				RSSIValue;
+	BluetoothHCIExtendedInquiryResponse	extendedInquiryResponse;
+};
+
+// 'Simple Pairing' (v2.1 specification)
+
+typedef	UInt8	BluetoothHCISimplePairingMode;
+enum BluetoothHCISimplePairingModes
+{
+	kBluetoothHCISimplePairingModeNotSet											=	0x00,
+	kBluetoothHCISimplePairingModeEnabled											=	0x01
+};
+
+typedef	UInt8	BluetoothSimplePairingDebugMode;
+enum BluetoothSimplePairingDebugModes
+{
+	kBluetoothHCISimplePairingDebugModeDisabled										=	0x00,
+	kBluetoothHCISimplePairingDebugModeEnabled										=	0x01
+};
+
+typedef struct	BluetoothHCISimplePairingOOBData		BluetoothHCISimplePairingOOBData;
+struct BluetoothHCISimplePairingOOBData
+{
+	UInt8		data[ 16 ];
+};
+
+typedef struct BluetoothHCIReadLocalOOBDataResults BluetoothHCIReadLocalOOBDataResults;
+struct	BluetoothHCIReadLocalOOBDataResults
+{
+	BluetoothHCISimplePairingOOBData		hash;
+	BluetoothHCISimplePairingOOBData		randomizer;
+};
+
+typedef UInt8	BluetoothIOCapability;
+enum BluetoothIOCapabilities
+{
+	kBluetoothCapabilityTypeDisplayOnly			= 0x00,
+	kBluetoothCapabilityTypeDisplayYesNo		= 0x01,
+	kBluetoothCapabilityTypeKeyboardOnly		= 0x02,
+	kBluetoothCapabilityTypeNoInputNoOutput		= 0x03
+};
+
+typedef UInt8	BluetoothOOBDataPresence;
+enum BluetoothOOBDataPresenceValues
+{
+	kBluetoothOOBAuthenticationDataNotPresent				= 0x00,
+	kBluetoothOOBAuthenticationDataFromRemoteDevicePresent	= 0x01
+};
+
+typedef UInt8	BluetoothAuthenticationRequirements;
+enum BluetoothAuthenticationRequirementsValues
+{
+	kBluetoothAuthenticationRequirementsMITMProtectionNotRequired	= 0x00,		/* Numeric comparison with automatic accept allowed */
+	kBluetoothAuthenticationRequirementsMITMProtectionRequired		= 0x01,		/* Refer to BluetoothIOCapabilities to determine authentication procedure */
+	kBluetoothAuthenticationRequirementsMITMProtectionNotRequiredNoBonding			= 0x00,
+	kBluetoothAuthenticationRequirementsMITMProtectionRequiredNoBonding				= 0x01,
+	kBluetoothAuthenticationRequirementsMITMProtectionNotRequiredDedicatedBonding	= 0x02,
+	kBluetoothAuthenticationRequirementsMITMProtectionRequiredDedicatedBonding		= 0x03,
+	kBluetoothAuthenticationRequirementsMITMProtectionNotRequiredGeneralBonding		= 0x04,
+	kBluetoothAuthenticationRequirementsMITMProtectionRequiredGeneralBonding		= 0x05
+};
+
+typedef struct BluetoothIOCapabilityResponse	BluetoothIOCapabilityResponse;
+struct BluetoothIOCapabilityResponse
+{
+	BluetoothDeviceAddress				deviceAddress;
+	BluetoothIOCapability				ioCapability;				/* possible values from BluetoothIOCapabilities above */
+	BluetoothOOBDataPresence			OOBDataPresence;				
+	BluetoothAuthenticationRequirements	authenticationRequirements;
+};
+
+typedef UInt32	BluetoothPasskey;
+
+typedef struct BluetoothUserPasskeyNotification	BluetoothUserPasskeyNotification;
+struct BluetoothUserPasskeyNotification
+{
+	BluetoothDeviceAddress				deviceAddress;
+	BluetoothPasskey					passkey;				/* passkey for display. valid values are 000000 - 999999 */
+};
+
+typedef UInt8	BluetoothKeypressNotificationType;
+enum BluetoothKeypressNotificationTypes
+{
+	kBluetoothKeypressNotificationTypePasskeyEntryStarted		= 0,
+	kBluetoothKeypressNotificationTypePasskeyDigitEntered		= 1,
+	kBluetoothKeypressNotificationTypePasskeyDigitErased		= 2,
+	kBluetoothKeypressNotificationTypePasskeyCleared			= 3,
+	kBluetoothKeypressNotificationTypePasskeyEntryCompleted		= 4
+};
+		
+typedef struct BluetoothKeypressNotification	BluetoothKeypressNotification;
+struct BluetoothKeypressNotification
+{
+	BluetoothDeviceAddress				deviceAddress;
+	BluetoothKeypressNotificationType	notificationType;
+};
+		
+typedef SInt8	TransmissionPower;
+
+typedef UInt8	BluetoothAFHMode;
+typedef struct	BluetoothAFHResults					BluetoothAFHResults;
+struct BluetoothAFHResults
+{
+	BluetoothConnectionHandle	handle;
+	BluetoothAFHMode			mode;
+	UInt8						afhMap[10];
+};
+
+#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0 */
+
+#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1
+
+typedef UInt32	BluetoothNumericValue;
+
+typedef struct BluetoothUserConfirmationRequest	BluetoothUserConfirmationRequest;
+struct BluetoothUserConfirmationRequest
+{
+	BluetoothDeviceAddress				deviceAddress;
+	BluetoothNumericValue				numericValue;				/* numeric value for display. valid values are 000000 - 999999 */
+};
+
+typedef struct	BluetoothHCIEventSimplePairingCompleteResults 		BluetoothHCIEventSimplePairingCompleteResults;
+struct			BluetoothHCIEventSimplePairingCompleteResults
+{
+	BluetoothDeviceAddress						deviceAddress;
+};
+
+#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1 */
+
+
+// Packet Sizes
+
+enum
+{
+	kBluetoothHCICommandPacketHeaderSize 	= 3, 
+	kBluetoothHCICommandPacketMaxDataSize 	= 255, 
+	kBluetoothHCIMaxCommandPacketSize		= kBluetoothHCICommandPacketHeaderSize + kBluetoothHCICommandPacketMaxDataSize, 
+	
+	kBluetoothHCIEventPacketHeaderSize	 	= 2, 
+	kBluetoothHCIEventPacketMaxDataSize 	= 255, 
+	kBluetoothHCIMaxEventPacketSize			= kBluetoothHCIEventPacketHeaderSize + kBluetoothHCIEventPacketMaxDataSize, 
+	
+	kBluetoothHCIDataPacketHeaderSize 		= 4, 
+	kBluetoothHCIDataPacketMaxDataSize 		= 65535, 
+	kBluetoothHCIMaxDataPacketSize			= kBluetoothHCIDataPacketHeaderSize + kBluetoothHCIDataPacketMaxDataSize
+};
+
+typedef UInt8		BluetoothHCIEventCode;
+typedef UInt8		BluetoothLinkType;
+enum BluetoothLinkTypes
+{
+	kBluetoothSCOConnection		= 0,
+	kBluetoothACLConnection		= 1,
+	kBluetoothESCOConnection	= 2,
+    kBluetoothLinkTypeNone		= 0xff
+};
+
+typedef UInt16		BluetoothHCIVoiceSetting; // 10 bits meaningful
+typedef UInt8		BluetoothHCISupportedIAC;
+
+typedef uint32_t	BluetoothHCITransmitBandwidth;
+typedef uint32_t	BluetoothHCIReceiveBandwidth;
+typedef uint16_t	BluetoothHCIMaxLatency;
+typedef uint8_t		BluetoothHCIRetransmissionEffort;		
+enum BluetoothHCIRetransmissionEffortTypes
+{
+	kHCIRetransmissionEffortTypeNone								= 0x00,
+	kHCIRetransmissionEffortTypeAtLeastOneAndOptimizeForPower		= 0x01,
+	kHCIRetransmissionEffortTypeAtLeastOneAndOptimizeLinkQuality	= 0x02,
+	kHCIRetransmissionEffortTypeDontCare							= 0xFF,
+};
+		
+
+// Setup Synchronous Packet types (Bluetooth 2.1 spec section 7.7.35  - Setup Synchronous Command Complete Event)
+
+typedef uint8_t		BluetoothAirMode;
+enum
+{
+	kBluetoothAirModeULawLog				= 0x00,
+	kBluetoothAirModeALawLog				= 0x01,
+	kBluetoothAirModeCVSD					= 0x02,
+	kBluetoothAirModeTransparentData		= 0x03
+};
+
+typedef struct	BluetoothSynchronousConnectionInfo		BluetoothSynchronousConnectionInfo;
+struct	BluetoothSynchronousConnectionInfo
+{
+	BluetoothHCITransmitBandwidth		transmitBandWidth;
+	BluetoothHCIReceiveBandwidth		receiveBandWidth;
+	BluetoothHCIMaxLatency				maxLatency;
+	BluetoothHCIVoiceSetting			voiceSetting;
+	BluetoothHCIRetransmissionEffort	retransmissionEffort;
+	BluetoothPacketType					packetType;
+};
+
+typedef struct	BluetoothHCIEventSynchronousConnectionCompleteResults 	BluetoothHCIEventSynchronousConnectionCompleteResults;
+struct			BluetoothHCIEventSynchronousConnectionCompleteResults
+{
+	BluetoothConnectionHandle			connectionHandle;
+	BluetoothDeviceAddress				deviceAddress;
+	BluetoothLinkType					linkType;
+	uint8_t								transmissionInterval;
+	uint8_t								retransmissionWindow;
+	uint16_t							receivePacketLength;
+	uint16_t							transmitPacketLength;
+	BluetoothAirMode					airMode;
+};
+
+
+typedef UInt8	BluetoothHCIStatus;
+typedef UInt8	BluetoothHCIEventStatus;
+
+// Events.
+
+enum
+{
+	kBluetoothHCIEventInquiryComplete									= 0x01,
+	kBluetoothHCIEventInquiryResult										= 0x02,
+	kBluetoothHCIEventConnectionComplete								= 0x03,
+	kBluetoothHCIEventConnectionRequest									= 0x04,
+	kBluetoothHCIEventDisconnectionComplete								= 0x05,
+	kBluetoothHCIEventAuthenticationComplete							= 0x06,
+	kBluetoothHCIEventRemoteNameRequestComplete							= 0x07,
+	kBluetoothHCIEventEncryptionChange									= 0x08,
+	kBluetoothHCIEventChangeConnectionLinkKeyComplete					= 0x09,
+	kBluetoothHCIEventMasterLinkKeyComplete								= 0x0A,
+	kBluetoothHCIEventReadRemoteSupportedFeaturesComplete				= 0x0B,
+	kBluetoothHCIEventReadRemoteVersionInformationComplete				= 0x0C,
+	kBluetoothHCIEventQoSSetupComplete									= 0x0D,
+	kBluetoothHCIEventCommandComplete									= 0x0E,
+	kBluetoothHCIEventCommandStatus										= 0x0F,
+	kBluetoothHCIEventHardwareError										= 0x10,
+	kBluetoothHCIEventFlushOccurred										= 0x11,
+	kBluetoothHCIEventRoleChange										= 0x12,
+	kBluetoothHCIEventNumberOfCompletedPackets							= 0x13,
+	kBluetoothHCIEventModeChange										= 0x14,
+	kBluetoothHCIEventReturnLinkKeys									= 0x15,
+	kBluetoothHCIEventPINCodeRequest									= 0x16,
+	kBluetoothHCIEventLinkKeyRequest									= 0x17,
+	kBluetoothHCIEventLinkKeyNotification								= 0x18,
+	kBluetoothHCIEventLoopbackCommand									= 0x19,
+	kBluetoothHCIEventDataBufferOverflow								= 0x1A,
+	kBluetoothHCIEventMaxSlotsChange									= 0x1B,
+	kBluetoothHCIEventReadClockOffsetComplete							= 0x1C,
+	kBluetoothHCIEventConnectionPacketType								= 0x1D,
+	kBluetoothHCIEventQoSViolation										= 0x1E,
+	kBluetoothHCIEventPageScanModeChange								= 0x1F,
+	kBluetoothHCIEventPageScanRepetitionModeChange						= 0x20,
+	
+	// [v1.2]
+
+	kBluetoothHCIEventFlowSpecificationComplete							= 0x21,
+	kBluetoothHCIEventInquiryResultWithRSSI								= 0x22,
+	kBluetoothHCIEventReadRemoteExtendedFeaturesComplete				= 0x23,
+	kBluetoothHCIEventSynchronousConnectionComplete						= 0x2C,
+	kBluetoothHCIEventSynchronousConnectionChanged						= 0x2D,
+
+	// [v2.1]
+
+	kBluetoothHCIEventSniffSubstrate									= 0x2E,
+	kBluetoothHCIEventExtendedInquiryResult								= 0x2F,
+	kBluetoothHCIEventIOCapabilityRequest								= 0x31,
+	kBluetoothHCIEventIOCapabilityResponse								= 0x32,
+	kBluetoothHCIEventUserConfirmationRequest							= 0x33,
+	kBluetoothHCIEventUserPasskeyRequest								= 0x34,
+	kBluetoothHCIEventRemoteOOBDataRequest								= 0x35,
+	kBluetoothHCIEventSimplePairingComplete								= 0x36,
+	kBluetoothHCIEventLinkSupervisionTimeoutChanged						= 0x38,
+	kBluetoothHCIEventEnhancedFlushComplete								= 0x39,
+	kBluetoothHCIEventSniffRequest										= 0x3A,
+	kBluetoothHCIEventUserPasskeyNotification							= 0x3B,
+	kBluetoothHCIEventKeypressNotification								= 0x3C,
+	
+	kBluetoothHCIEventLogoTesting										= 0xFE,
+	kBluetoothHCIEventVendorSpecific									= 0xFF
+};
+
+// HCI Event Masks
+
+// Event masks are 8 octets according to the spec. v2.1 introduces some event masks that
+// actually exceed 32 bits so the 4 byte enum we had before Bluetooth 2.0 will still work for old
+// the masks, but the new masks need to be defined as 64 bits.
+
+typedef uint64_t	BluetoothHCIEventMask;
+
+#define	kBluetoothHCIEventMaskDefault64Bit								0x00001FFFFFFFFFFFLL
+#define	kBluetoothHCIEventMaskAll64Bit									0xFFFFFFFFFFFFFFFFLL
+
+	// [v1.2]
+
+#define	kBluetoothHCIEventMaskFlowSpecificationCompleteEvent			0x0000000100000000LL
+#define	kBluetoothHCIEventMaskInquiryResultWithRSSIEvent				0x0000000200000000LL
+#define	kBluetoothHCIEventMaskReadRemoteExtendedFeaturesCompleteEvent	0x0000000400000000LL
+#define	kBluetoothHCIEventMaskSynchronousConnectionCompleteEvent		0x0000080000000000LL
+#define	kBluetoothHCIEventMaskSynchronousConnectionChangedEvent			0x0000100000000000LL
+
+	// [v2.1]
+
+#define	kBluetoothHCIEventMaskSniffSubstrateEvent						0x0000200000000000LL
+#define	kBluetoothHCIEventMaskExtendedInquiryResultEvent				0x0000400000000000LL
+#define	kBluetoothHCIEventMaskLinkSupervisionTimeoutChangedEvent		0x0080000000000000LL
+#define	kBluetoothHCIEventMaskEnhancedFlushCompleteEvent				0x0100000000000000LL
+	
+	// [v2.1 Secure Simple Pairing]
+
+#define	kBluetoothHCIEventMaskIOCapabilityRequestEvent					0x0001000000000000LL
+#define	kBluetoothHCIEventMaskIOCapabilityRequestReplyEvent				0x0002000000000000LL
+#define	kBluetoothHCIEventMaskUserConfirmationRequestEvent				0x0004000000000000LL
+#define	kBluetoothHCIEventMaskUserPasskeyRequestEvent					0x0008000000000000LL
+#define	kBluetoothHCIEventMaskRemoteOOBDataRequestEvent					0x0010000000000000LL
+#define	kBluetoothHCIEventMaskSimplePairingCompleteEvent				0x0020000000000000LL
+#define	kBluetoothHCIEventMaskUserPasskeyNotificationEvent				0x0400000000000000LL
+#define	kBluetoothHCIEventMaskKeypressNotificationEvent					0x0800000000000000LL
+	
+enum
+{
+	kBluetoothHCIEventMaskNone											= 0x00000000, 
+	kBluetoothHCIEventMaskInquiryComplete								= 0x00000001, 
+	kBluetoothHCIEventMaskInquiryResult									= 0x00000002, 
+	kBluetoothHCIEventMaskConnectionComplete							= 0x00000004, 
+	kBluetoothHCIEventMaskConnectionRequest								= 0x00000008, 
+	kBluetoothHCIEventMaskDisconnectionComplete							= 0x00000010, 
+	kBluetoothHCIEventMaskAuthenticationComplete						= 0x00000020, 
+	kBluetoothHCIEventMaskRemoteNameRequestComplete						= 0x00000040, 
+	kBluetoothHCIEventMaskEncryptionChange								= 0x00000080, 
+	kBluetoothHCIEventMaskChangeConnectionLinkKeyComplete				= 0x00000100, 
+	kBluetoothHCIEventMaskMasterLinkKeyComplete							= 0x00000200, 
+	kBluetoothHCIEventMaskReadRemoteSupportedFeaturesComplete			= 0x00000400, 
+	kBluetoothHCIEventMaskReadRemoteVersionInformationComplete			= 0x00000800, 
+	kBluetoothHCIEventMaskQoSSetupComplete								= 0x00001000, 
+	kBluetoothHCIEventMaskCommandComplete								= 0x00002000, 
+	kBluetoothHCIEventMaskCommandStatus									= 0x00004000, 
+	kBluetoothHCIEventMaskHardwareError									= 0x00008000, 
+	kBluetoothHCIEventMaskFlushOccurred									= 0x00010000, 
+	kBluetoothHCIEventMaskRoleChange									= 0x00020000, 
+	
+	kBluetoothHCIEventMaskNumberOfCompletedPackets						= 0x00040000, 
+	kBluetoothHCIEventMaskModeChange									= 0x00080000, 
+	kBluetoothHCIEventMaskReturnLinkKeys								= 0x00100000, 
+	kBluetoothHCIEventMaskPINCodeRequest								= 0x00200000, 
+	kBluetoothHCIEventMaskLinkKeyRequest								= 0x00400000, 
+	kBluetoothHCIEventMaskLinkKeyNotification							= 0x00800000, 
+	kBluetoothHCIEventMaskLoopbackCommand								= 0x01000000, 
+	kBluetoothHCIEventMaskDataBufferOverflow							= 0x02000000, 
+	kBluetoothHCIEventMaskMaxSlotsChange								= 0x04000000, 
+	kBluetoothHCIEventMaskReadClockOffsetComplete						= 0x08000000, 
+	kBluetoothHCIEventMaskConnectionPacketTypeChanged					= 0x10000000, 
+	kBluetoothHCIEventMaskQoSViolation									= 0x20000000, 
+	kBluetoothHCIEventMaskPageScanModeChange							= 0x40000000, 
+	kBluetoothHCIEventMaskPageScanRepetitionModeChange					= 0x80000000, 
+	
+	kBluetoothHCIEventMaskAll											= 0xFFFFFFFF, 
+	kBluetoothHCIEventMaskDefault										= kBluetoothHCIEventMaskAll		/* Use kBluetoothHCIEventMaskDefault64Bit above! */
+};
+
+// Event results structures.
+
+typedef struct	BluetoothHCIEventConnectionCompleteResults		BluetoothHCIEventConnectionCompleteResults;
+struct			BluetoothHCIEventConnectionCompleteResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothDeviceAddress						deviceAddress;
+	BluetoothLinkType							linkType;
+	BluetoothHCIEncryptionMode					encryptionMode;
+};
+
+typedef struct	BluetoothHCIEventDisconnectionCompleteResults		BluetoothHCIEventDisconnectionCompleteResults;
+struct			BluetoothHCIEventDisconnectionCompleteResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothReasonCode							reason;
+};
+
+typedef struct	BluetoothHCIEventReadSupportedFeaturesResults 	BluetoothHCIEventReadSupportedFeaturesResults;
+struct 			BluetoothHCIEventReadSupportedFeaturesResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothHCISupportedFeatures				supportedFeatures;
+};
+
+#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1
+typedef struct	BluetoothHCIEventReadExtendedFeaturesResults 	BluetoothHCIEventReadExtendedFeaturesResults;
+struct 			BluetoothHCIEventReadExtendedFeaturesResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothHCIExtendedFeaturesInfo			supportedFeaturesInfo;
+};
+#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1 */
+		
+typedef struct	BluetoothHCIEventReadRemoteVersionInfoResults 	BluetoothHCIEventReadRemoteVersionInfoResults;
+struct 			BluetoothHCIEventReadRemoteVersionInfoResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothLMPVersion							lmpVersion;
+	BluetoothManufacturerName					manufacturerName;
+	BluetoothLMPSubversion						lmpSubversion;
+};
+
+typedef struct	BluetoothHCIEventRemoteNameRequestResults 		BluetoothHCIEventRemoteNameRequestResults;
+struct 			BluetoothHCIEventRemoteNameRequestResults
+{
+	BluetoothDeviceAddress						deviceAddress;
+	BluetoothDeviceName							deviceName;
+};
+
+typedef struct	BluetoothHCIEventReadClockOffsetResults 		BluetoothHCIEventReadClockOffsetResults;
+struct			BluetoothHCIEventReadClockOffsetResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothClockOffset						clockOffset;
+};
+
+typedef struct	BluetoothHCIEventConnectionRequestResults 		BluetoothHCIEventConnectionRequestResults;
+struct			BluetoothHCIEventConnectionRequestResults
+{
+	BluetoothDeviceAddress						deviceAddress;
+	BluetoothClassOfDevice						classOfDevice;
+	BluetoothLinkType							linkType;
+};
+
+typedef struct	BluetoothHCIEventLinkKeyNotificationResults 		BluetoothHCIEventLinkKeyNotificationResults;
+struct			BluetoothHCIEventLinkKeyNotificationResults
+{
+	BluetoothDeviceAddress						deviceAddress;
+	BluetoothKey								linkKey;
+	BluetoothKeyType							keyType;
+};
+
+typedef struct	BluetoothHCIEventMaxSlotsChangeResults 		BluetoothHCIEventMaxSlotsChangeResults;
+struct			BluetoothHCIEventMaxSlotsChangeResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothMaxSlots							maxSlots;
+};
+
+typedef struct	BluetoothHCIEventModeChangeResults 		BluetoothHCIEventModeChangeResults;
+struct			BluetoothHCIEventModeChangeResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothHCIConnectionMode					mode;
+	BluetoothHCIModeInterval					modeInterval;
+};
+
+typedef struct	BluetoothHCIEventReturnLinkKeysResults	BluetoothHCIEventReturnLinkKeysResults;
+struct			BluetoothHCIEventReturnLinkKeysResults
+{
+	UInt8										numLinkKeys;
+	struct {
+		BluetoothDeviceAddress					deviceAddress;
+		BluetoothKey							linkKey;
+	} linkKeys[1];
+};
+
+typedef struct	BluetoothHCIEventAuthenticationCompleteResults 		BluetoothHCIEventAuthenticationCompleteResults;
+struct			BluetoothHCIEventAuthenticationCompleteResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+};
+
+typedef struct	BluetoothHCIEventEncryptionChangeResults 		BluetoothHCIEventEncryptionChangeResults;
+struct			BluetoothHCIEventEncryptionChangeResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothEncryptionEnable					enable;
+};
+
+typedef struct	BluetoothHCIEventChangeConnectionLinkKeyCompleteResults 	BluetoothHCIEventChangeConnectionLinkKeyCompleteResults;
+struct			BluetoothHCIEventChangeConnectionLinkKeyCompleteResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+};
+
+typedef struct	BluetoothHCIEventMasterLinkKeyCompleteResults 	BluetoothHCIEventMasterLinkKeyCompleteResults;
+struct			BluetoothHCIEventMasterLinkKeyCompleteResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothKeyFlag							keyFlag;
+};
+
+typedef struct	BluetoothHCIEventQoSSetupCompleteResults 	BluetoothHCIEventQoSSetupCompleteResults;
+struct			BluetoothHCIEventQoSSetupCompleteResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothHCIQualityOfServiceSetupParams		setupParams;
+};
+
+typedef struct	BluetoothHCIEventHardwareErrorResults 	BluetoothHCIEventHardwareErrorResults;
+struct			BluetoothHCIEventHardwareErrorResults
+{
+	BluetoothHCIStatus							error;
+};
+
+typedef struct	BluetoothHCIEventFlushOccurredResults 	BluetoothHCIEventFlushOccurredResults;
+struct			BluetoothHCIEventFlushOccurredResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+};
+
+typedef struct	BluetoothHCIEventRoleChangeResults 	BluetoothHCIEventRoleChangeResults;
+struct			BluetoothHCIEventRoleChangeResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothDeviceAddress						deviceAddress;
+	BluetoothRole								role;
+};
+
+typedef struct	BluetoothHCIEventDataBufferOverflowResults 	BluetoothHCIEventDataBufferOverflowResults;
+struct			BluetoothHCIEventDataBufferOverflowResults
+{
+	BluetoothLinkType							linkType;
+};
+
+typedef struct	BluetoothHCIEventConnectionPacketTypeResults 	BluetoothHCIEventConnectionPacketTypeResults;
+struct			BluetoothHCIEventConnectionPacketTypeResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothPacketType							packetType;
+};
+
+typedef struct	BluetoothHCIEventReadRemoteSupportedFeaturesResults 	BluetoothHCIEventReadRemoteSupportedFeaturesResults;
+struct			BluetoothHCIEventReadRemoteSupportedFeaturesResults
+{
+	BluetoothHCIStatus							error;
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothHCISupportedFeatures				lmpFeatures;
+};
+
+#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1
+typedef struct	BluetoothHCIEventReadRemoteExtendedFeaturesResults 	BluetoothHCIEventReadRemoteExtendedFeaturesResults;
+struct			BluetoothHCIEventReadRemoteExtendedFeaturesResults
+{
+	BluetoothHCIStatus							error;
+	BluetoothConnectionHandle					connectionHandle;
+	BluetoothHCIPageNumber						page;
+	BluetoothHCIPageNumber						maxPage;
+	BluetoothHCISupportedFeatures				lmpFeatures;
+};
+#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1 */
+
+typedef struct	BluetoothHCIEventQoSViolationResults 	BluetoothHCIEventQoSViolationResults;
+struct			BluetoothHCIEventQoSViolationResults
+{
+	BluetoothConnectionHandle					connectionHandle;
+};
+
+typedef struct	BluetoothHCIEventPageScanModeChangeResults 	BluetoothHCIEventPageScanModeChangeResults;
+struct			BluetoothHCIEventPageScanModeChangeResults
+{
+	BluetoothDeviceAddress			deviceAddress;
+	BluetoothPageScanMode			pageScanMode;
+};
+
+typedef struct	BluetoothHCIEventPageScanRepetitionModeChangeResults 	BluetoothHCIEventPageScanRepetitionModeChangeResults;
+struct			BluetoothHCIEventPageScanRepetitionModeChangeResults
+{
+	BluetoothDeviceAddress				deviceAddress;
+	BluetoothPageScanRepetitionMode		pageScanRepetitionMode;
+};
+
+typedef struct	BluetoothHCIEventVendorSpecificResults 	BluetoothHCIEventVendorSpecificResults;
+struct			BluetoothHCIEventVendorSpecificResults
+{
+	UInt8								length;
+	UInt8								data[255];
+};
+
+#define kNoNotifyProc	NULL
+#define kNoUserRefCon	NULL
+
+typedef struct BluetoothHCIRequestCallbackInfo BluetoothHCIRequestCallbackInfo;
+struct BluetoothHCIRequestCallbackInfo
+{
+	mach_vm_address_t					userCallback;			// Proc to call when async handler is called.
+	mach_vm_address_t					userRefCon;				// For user's info.
+	mach_vm_address_t					internalRefCon;			// For our purposes.
+	mach_vm_address_t 					asyncIDRefCon;			// For our aync calls.
+	mach_vm_address_t					reserved;				// For the future. Currently Unused.
+};
+
+// Error codes
+
+enum
+{
+	kBluetoothHCIErrorSuccess											= 0x00, 
+	kBluetoothHCIErrorUnknownHCICommand									= 0x01, 
+	kBluetoothHCIErrorNoConnection										= 0x02, 
+	kBluetoothHCIErrorHardwareFailure									= 0x03, 
+	kBluetoothHCIErrorPageTimeout										= 0x04, 
+	kBluetoothHCIErrorAuthenticationFailure								= 0x05, 
+	kBluetoothHCIErrorKeyMissing										= 0x06, 
+	kBluetoothHCIErrorMemoryFull										= 0x07, 
+	kBluetoothHCIErrorConnectionTimeout									= 0x08, 
+	kBluetoothHCIErrorMaxNumberOfConnections							= 0x09, 
+	kBluetoothHCIErrorMaxNumberOfSCOConnectionsToADevice				= 0x0A, 
+	kBluetoothHCIErrorACLConnectionAlreadyExists						= 0x0B, 
+	kBluetoothHCIErrorCommandDisallowed									= 0x0C, 
+	kBluetoothHCIErrorHostRejectedLimitedResources						= 0x0D, 
+	kBluetoothHCIErrorHostRejectedSecurityReasons						= 0x0E, 
+	kBluetoothHCIErrorHostRejectedRemoteDeviceIsPersonal				= 0x0F, 
+	kBluetoothHCIErrorHostTimeout										= 0x10, 
+	kBluetoothHCIErrorUnsupportedFeatureOrParameterValue				= 0x11, 
+	kBluetoothHCIErrorInvalidHCICommandParameters						= 0x12, 
+	kBluetoothHCIErrorOtherEndTerminatedConnectionUserEnded				= 0x13, 
+	kBluetoothHCIErrorOtherEndTerminatedConnectionLowResources			= 0x14, 
+	kBluetoothHCIErrorOtherEndTerminatedConnectionAboutToPowerOff		= 0x15, 
+	kBluetoothHCIErrorConnectionTerminatedByLocalHost					= 0x16, 
+	kBluetoothHCIErrorRepeatedAttempts									= 0x17, 
+	kBluetoothHCIErrorPairingNotAllowed									= 0x18, 
+	kBluetoothHCIErrorUnknownLMPPDU										= 0x19, 
+	kBluetoothHCIErrorUnsupportedRemoteFeature							= 0x1A, 
+	kBluetoothHCIErrorSCOOffsetRejected									= 0x1B, 
+	kBluetoothHCIErrorSCOIntervalRejected								= 0x1C, 
+	kBluetoothHCIErrorSCOAirModeRejected								= 0x1D, 
+	kBluetoothHCIErrorInvalidLMPParameters								= 0x1E, 
+	kBluetoothHCIErrorUnspecifiedError									= 0x1F, 
+	kBluetoothHCIErrorUnsupportedLMPParameterValue						= 0x20, 
+	kBluetoothHCIErrorRoleChangeNotAllowed								= 0x21, 
+	kBluetoothHCIErrorLMPResponseTimeout								= 0x22, 
+	kBluetoothHCIErrorLMPErrorTransactionCollision						= 0x23, 
+	kBluetoothHCIErrorLMPPDUNotAllowed									= 0x24, 
+	kBluetoothHCIErrorEncryptionModeNotAcceptable						= 0x25, 	// Added Core Spec, v1.1
+	kBluetoothHCIErrorUnitKeyUsed										= 0x26, 	// 1.1
+	kBluetoothHCIErrorQoSNotSupported									= 0x27, 	// 1.1
+	kBluetoothHCIErrorInstantPassed										= 0x28, 	// 1.1
+	kBluetoothHCIErrorPairingWithUnitKeyNotSupported					= 0x29, 	// 1.1
+	kBluetoothHCIErrorHostRejectedUnacceptableDeviceAddress				= 0x0F,		// 2.0+
+	kBluetoothHCIErrorDifferentTransactionCollision						= 0x2A, 	// 1.2
+	kBluetoothHCIErrorQoSUnacceptableParameter							= 0x2C, 	// 1.2
+	kBluetoothHCIErrorQoSRejected										= 0x2D, 	// 1.2
+	kBluetoothHCIErrorChannelClassificationNotSupported					= 0x2E, 	// 1.2
+	kBluetoothHCIErrorInsufficientSecurity								= 0x2F, 	// 1.2
+	kBluetoothHCIErrorParameterOutOfMandatoryRange						= 0x30,		// 1.2
+	kBluetoothHCIErrorRoleSwitchPending									= 0x31,		// 1.2
+	kBluetoothHCIErrorReservedSlotViolation								= 0x34,		// 1.2
+	kBluetoothHCIErrorRoleSwitchFailed									= 0x35,		// 1.2
+	kBluetoothHCIErrorExtendedInquiryResponseTooLarge					= 0x36, 	// 2.1
+	kBluetoothHCIErrorSecureSimplePairingNotSupportedByHost				= 0x37, 	// 2.1
+	
+	kBluetoothHCIErrorMax												= 0x37
+};
+
+#if 0
+#pragma mark === HCI Power Mode ===
+#endif
+
+//===========================================================================================================================
+//	HCI Power Mode 
+//===========================================================================================================================
+
+typedef enum
+{
+	kBluetoothHCIPowerStateON				= 0x01,
+	kBluetoothHCIPowerStateOFF				= 0x00,
+	kBluetoothHCIPowerStateUnintialized		= 0xFF,	
+} BluetoothHCIPowerState;
+
+enum
+{
+        kBluetoothHCIErrorPowerIsOFF		= (kBluetoothHCIErrorMax + 1)
+};
+
+#if 0
+#pragma mark === HCI USB Transport ===
+#endif
+
+//===========================================================================================================================
+//	HCI USB Transport
+//===========================================================================================================================
+
+//---------------------------------------------------------------------------------------------------------------------------
+/*!	@enum		BluetoothHCIUSBDeviceMatchingConstants
+	@abstract	Bluetooth USB device matching constants
+	@constant	kBluetoothHCITransportUSBClassCode			Wireless Controller
+	@constant	kBluetoothHCITransportUSBSubClassCode		RF Controller
+	@constant	kBluetoothHCITransportUSBProtocolCode		Bluetooth Programming
+*/
+
+enum
+{
+	kBluetoothHCITransportUSBClassCode		= 0xE0,
+	kBluetoothHCITransportUSBSubClassCode	= 0x01,
+	kBluetoothHCITransportUSBProtocolCode	= 0x01
+};
+
+#if 0
+#pragma mark === TCI - L2CAP ===
+#endif
+
+//===========================================================================================================================
+//	TCI - L2CAP
+//===========================================================================================================================
+
+enum
+{
+	kBluetoothL2CAPTCIEventIDReserved							= 0x00,
+	kBluetoothL2CAPTCIEventIDL2CA_ConnectInd					= 0x01,
+	kBluetoothL2CAPTCIEventIDL2CA_ConfigInd						= 0x02,
+	kBluetoothL2CAPTCIEventIDL2CA_DisconnectInd					= 0x03,
+	kBluetoothL2CAPTCIEventIDL2CA_QoSViolationInd				= 0x04,
+	kBluetoothL2CAPTCIEventIDL2CA_TimeOutInd					= 0x05
+};
+
+enum
+{
+	kBluetoothL2CAPTCICommandReserved							= 0x0000,
+	kBluetoothL2CAPTCICommandL2CA_ConnectReq					= 0x0001,
+	kBluetoothL2CAPTCICommandL2CA_DisconnectReq					= 0x0002,
+	kBluetoothL2CAPTCICommandL2CA_ConfigReq						= 0x0003,
+	kBluetoothL2CAPTCICommandL2CA_DisableCLT					= 0x0004,
+	kBluetoothL2CAPTCICommandL2CA_EnableCLT						= 0x0005,
+	kBluetoothL2CAPTCICommandL2CA_GroupCreate					= 0x0006,
+	kBluetoothL2CAPTCICommandL2CA_GroupClose					= 0x0007,
+	kBluetoothL2CAPTCICommandL2CA_GroupAddMember				= 0x0008,
+	kBluetoothL2CAPTCICommandL2CA_GroupRemoveMember				= 0x0009,
+	kBluetoothL2CAPTCICommandL2CA_GroupMembership				= 0x000A,
+	kBluetoothL2CAPTCICommandL2CA_WriteData						= 0x000B,
+	kBluetoothL2CAPTCICommandL2CA_ReadData						= 0x000C,
+	kBluetoothL2CAPTCICommandL2CA_Ping							= 0x000D,
+	kBluetoothL2CAPTCICommandL2CA_GetInfo						= 0x000E,
+	kBluetoothL2CAPTCICommandL2CA_Reserved1						= 0x000F,
+	kBluetoothL2CAPTCICommandL2CA_Reserved2						= 0x0010,
+	kBluetoothL2CAPTCICommandL2CA_ConnectResp					= 0x0011,
+	kBluetoothL2CAPTCICommandL2CA_DisconnectResp				= 0x0012,
+	kBluetoothL2CAPTCICommandL2CA_ConfigResp					= 0x0013
+};
+
+#if 0
+#pragma mark -
+#pragma mark === RFCOMM ===
+#endif
+
+//===========================================================================================================================
+//	RFCOMM
+//===========================================================================================================================
+#define kMaxChannelIDPerSide	31
+
+typedef UInt8	BluetoothRFCOMMChannelID;
+
+#define	RFCOMM_CHANNEL_ID_IS_VALID( CHANNEL ) (( CHANNEL >= 1 ) && ( CHANNEL <= 30 ))
+
+typedef UInt16	BluetoothRFCOMMMTU;
+
+typedef enum BluetoothRFCOMMParityType
+{
+    kBluetoothRFCOMMParityTypeNoParity = 0, 
+    kBluetoothRFCOMMParityTypeOddParity, 
+    kBluetoothRFCOMMParityTypeEvenParity, 
+    kBluetoothRFCOMMParityTypeMaxParity
+} BluetoothRFCOMMParityType;
+
+typedef enum BluetoothRFCOMMLineStatus
+{
+    BluetoothRFCOMMLineStatusNoError = 0, 
+    BluetoothRFCOMMLineStatusOverrunError, 
+    BluetoothRFCOMMLineStatusParityError, 
+    BluetoothRFCOMMLineStatusFramingError
+} BluetoothRFCOMMLineStatus;
+
+#if 0
+#pragma mark -
+#pragma mark === SDP ===
+#endif
+
+//===========================================================================================================================
+//	SDP
+//===========================================================================================================================
+
+typedef UInt8	BluetoothSDPPDUID;
+enum {
+    kBluetoothSDPPDUIDReserved							= 0,
+    kBluetoothSDPPDUIDErrorResponse						= 1,
+    kBluetoothSDPPDUIDServiceSearchRequest				= 2,
+    kBluetoothSDPPDUIDServiceSearchResponse				= 3,
+    kBluetoothSDPPDUIDServiceAttributeRequest			= 4,
+    kBluetoothSDPPDUIDServiceAttributeResponse			= 5,
+    kBluetoothSDPPDUIDServiceSearchAttributeRequest		= 6,
+    kBluetoothSDPPDUIDServiceSearchAttributeResponse	= 7
+};
+
+#define IS_REQUEST_PDU( _pduID ) (	( _pduID == kBluetoothSDPPDUIDServiceSearchRequest ) || \
+                                    ( _pduID == kBluetoothSDPPDUIDServiceAttributeRequest ) || \
+                                    ( _pduID == kBluetoothSDPPDUIDServiceSearchAttributeRequest ) )
+                                    
+#define IS_RESPONSE_PDU( _pduID ) (	( _pduID == kBluetoothSDPPDUIDErrorResponse ) || \
+                                    ( _pduID == kBluetoothSDPPDUIDServiceSearchResponse ) || \
+                                    ( _pduID == kBluetoothSDPPDUIDServiceAttributeResponse ) || \
+                                    ( _pduID == kBluetoothSDPPDUIDServiceSearchAttributeResponse ) )
+
+typedef UInt16	BluetoothSDPErrorCode;
+enum {
+    kBluetoothSDPErrorCodeSuccess						= 0x0000,
+    kBluetoothSDPErrorCodeReserved						= 0x0000,
+    kBluetoothSDPErrorCodeInvalidSDPVersion				= 0x0001,
+    kBluetoothSDPErrorCodeInvalidServiceRecordHandle	= 0x0002,
+    kBluetoothSDPErrorCodeInvalidRequestSyntax			= 0x0003,
+    kBluetoothSDPErrorCodeInvalidPDUSize				= 0x0004,
+    kBluetoothSDPErrorCodeInvalidContinuationState		= 0x0005,
+    kBluetoothSDPErrorCodeInsufficientResources			= 0x0006,
+    
+    kBluetoothSDPErrorCodeReservedStart					= 0x0007,
+    kBluetoothSDPErrorCodeReservedEnd					= 0xFFFF
+};
+
+typedef UInt16	BluetoothSDPTransactionID;
+
+typedef UInt32	BluetoothSDPServiceRecordHandle;
+
+enum {
+    kBluetoothSDPDataElementTypeNil						= 0,
+    kBluetoothSDPDataElementTypeUnsignedInt				= 1,
+    kBluetoothSDPDataElementTypeSignedInt				= 2,
+    kBluetoothSDPDataElementTypeUUID					= 3,
+    kBluetoothSDPDataElementTypeString					= 4,
+    kBluetoothSDPDataElementTypeBoolean					= 5,
+    kBluetoothSDPDataElementTypeDataElementSequence		= 6,
+    kBluetoothSDPDataElementTypeDataElementAlternative	= 7,
+    kBluetoothSDPDataElementTypeURL						= 8,
+    kBluetoothSDPDataElementTypeReservedStart			= 9,
+    kBluetoothSDPDataElementTypeReservedEnd				= 31
+};
+
+typedef UInt16	BluetoothSDPUUID16;
+typedef UInt32	BluetoothSDPUUID32;
+
+typedef UInt8	BluetoothSDPDataElementTypeDescriptor;
+typedef UInt8	BluetoothSDPDataElementSizeDescriptor;
+
+typedef UInt16	BluetoothSDPServiceAttributeID;
+
+#ifdef	__cplusplus
+	}
+#endif
diff --git a/i386/include/IOKit/bluetooth/BluetoothAssignedNumbers.h b/i386/include/IOKit/bluetooth/BluetoothAssignedNumbers.h
new file mode 100644
index 0000000..ea5db2e
--- /dev/null
+++ b/i386/include/IOKit/bluetooth/BluetoothAssignedNumbers.h
@@ -0,0 +1,552 @@
+/*
+	File:		BluetoothAssignedNumbers.h
+	Copyright:	(c) 2002-2008 by Apple Computer, Inc. All rights reserved.
+*/
+
+#pragma once
+
+#ifdef	__cplusplus
+	extern "C" {
+#endif
+
+#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0
+
+#pragma mark -
+#pragma mark === General ===
+
+enum BluetoothCompanyIdentifers
+{
+	kBluetoothCompanyIdentiferEricssonTechnologyLicensing						=	0,
+	kBluetoothCompanyIdentiferNokiaMobilePhones									=	1,
+	kBluetoothCompanyIdentiferIntel												=	2,
+	kBluetoothCompanyIdentiferIBM												=	3,
+	kBluetoothCompanyIdentiferToshiba											=	4,
+	kBluetoothCompanyIdentifer3Com												=	5,
+	kBluetoothCompanyIdentiferMicrosoft											=	6,
+	kBluetoothCompanyIdentiferLucent											=	7,
+	kBluetoothCompanyIdentiferMotorola											=	8,
+	kBluetoothCompanyIdentiferInfineonTechnologiesAG							=	9,
+	kBluetoothCompanyIdentiferCambridgeSiliconRadio								=	10,
+	kBluetoothCompanyIdentiferSiliconWave										=	11,
+	kBluetoothCompanyIdentiferDigianswerAS										=	12,
+	kBluetoothCompanyIdentiferTexasInstruments									=	13,
+	kBluetoothCompanyIdentiferParthusTechnologies								=	14,
+	kBluetoothCompanyIdentiferBroadcom											=	15,
+	kBluetoothCompanyIdentiferMitelSemiconductor								=	16,
+	kBluetoothCompanyIdentiferWidcomm											=	17,
+	kBluetoothCompanyIdentiferZeevo												=	18,
+	kBluetoothCompanyIdentiferAtmel												=	19,
+	kBluetoothCompanyIdentiferMistubishiElectric								=	20,
+	kBluetoothCompanyIdentiferRTXTelecom										=	21,
+	kBluetoothCompanyIdentiferKCTechnology										=	22,
+	kBluetoothCompanyIdentiferNewlogic											=	23,
+	kBluetoothCompanyIdentiferTransilica										=	24,
+	kBluetoothCompanyIdentiferRohdeandSchwarz									=	25,
+	kBluetoothCompanyIdentiferTTPCom											=	26,
+	kBluetoothCompanyIdentiferSigniaTechnologies								=	27,
+	kBluetoothCompanyIdentiferConexantSystems									=	28,
+	kBluetoothCompanyIdentiferQualcomm											=	29,
+	kBluetoothCompanyIdentiferInventel											=	30,
+	kBluetoothCompanyIdentiferAVMBerlin											=	31,
+	kBluetoothCompanyIdentiferBandspeed											=	32,
+	kBluetoothCompanyIdentiferMansella											=	33,
+	kBluetoothCompanyIdentiferNEC												=	34,
+	kBluetoothCompanyIdentiferWavePlusTechnology								=	35,
+	kBluetoothCompanyIdentiferAlcatel											=	36,
+	kBluetoothCompanyIdentiferPhilipsSemiconductor								=	37,
+	kBluetoothCompanyIdentiferCTechnologies										=	38,
+	kBluetoothCompanyIdentiferOpenInterface										=	39,
+	kBluetoothCompanyIdentiferRFCMicroDevices									=	40,
+	kBluetoothCompanyIdentiferHitachi											=	41,
+	kBluetoothCompanyIdentiferSymbolTechnologies								=	42,
+	kBluetoothCompanyIdentiferTenovis											=	43,
+	kBluetoothCompanyIdentiferMacronixInternational								=	44,
+	kBluetoothCompanyIdentiferGCTSemiconductor									=	45,
+	kBluetoothCompanyIdentiferNorwoodSystems									=	46,
+	kBluetoothCompanyIdentiferMewTelTechnology									=	47,
+	kBluetoothCompanyIdentiferSTMicroelectronics								=	48,
+	kBluetoothCompanyIdentiferSynopsys											=	49,
+	kBluetoothCompanyIdentiferRedMCommunications								=	50,
+	kBluetoothCompanyIdentiferCommil											=	51,
+	kBluetoothCompanyIdentiferCATC												=	52,
+	kBluetoothCompanyIdentiferEclipse											=	53,
+	kBluetoothCompanyIdentiferRenesasTechnology									=	54,
+	kBluetoothCompanyIdentiferMobilian											=	55,
+	kBluetoothCompanyIdentiferTerax												=	56,
+	kBluetoothCompanyIdentiferIntegratedSystemSolution							=	57,
+	kBluetoothCompanyIdentiferMatsushitaElectricIndustrial						=	58,
+	kBluetoothCompanyIdentiferGennum											=	59,
+	kBluetoothCompanyIdentiferResearchInMotion									=	60,
+	kBluetoothCompanyIdentiferIPextreme											=	61,
+	kBluetoothCompanyIdentiferSystemsAndChips									=	62,
+	kBluetoothCompanyIdentiferBluetoothSIG										=	63,
+	kBluetoothCompanyIdentiferSeikoEpson										=	64,
+	kBluetoothCompanyIdentiferIntegratedSiliconSolution							=	65,
+	kBluetoothCompanyIdentiferCONWISETechnology									=	66,
+	kBluetoothCompanyIdentiferParrotSA											=	67,
+	kBluetoothCompanyIdentiferSocketCommunications								=	68,
+	kBluetoothCompanyIdentiferAtherosCommunications								=	69,
+	kBluetoothCompanyIdentiferMediaTek											=	70,
+	kBluetoothCompanyIdentiferBluegiga											=	71,
+	kBluetoothCompanyIdentiferMarvellTechnologyGroup							=	72,
+	kBluetoothCompanyIdentifer3DSP												=	73,
+	kBluetoothCompanyIdentiferAccelSemiconductor								=	74,
+	kBluetoothCompanyIdentiferContinentialAutomotiveSystems						=	75,
+	kBluetoothCompanyIdentiferApple												=	76,
+	kBluetoothCompanyIdentiferStaccatoCommunications							=	77,
+	kBluetoothCompanyIdentiferAvagoTechnologies									=	78,
+	kBluetoothCompanyIdentiferAPT												=	79,
+
+	kBluetoothCompanyIdentiferInteropIdentifier									=	65535
+};
+
+#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0 */
+
+#pragma mark -
+#pragma mark === Baseband ===
+
+//==================================================================================================================
+//	Baseband
+//==================================================================================================================
+
+//
+// Service Class Major
+//
+
+enum
+{
+	kBluetoothServiceClassMajorLimitedDiscoverableMode		= 0x001,	// Bit 13 - Limited Discoverable Mode
+	kBluetoothServiceClassMajorReserved1					= 0x002, 	// Bit 14 - Reserved for future use.
+	kBluetoothServiceClassMajorReserved2					= 0x004, 	// Bit 15 - Reserved for future use.
+	kBluetoothServiceClassMajorPositioning					= 0x008, 	// Bit 16 - Positioning (Location ID)
+	kBluetoothServiceClassMajorNetworking					= 0x010, 	// Bit 17 - LAN, Ad hoc, etc...
+	kBluetoothServiceClassMajorRendering					= 0x020, 	// Bit 18 - Printing, Speaker, etc...
+	kBluetoothServiceClassMajorCapturing					= 0x040,	// Bit 19 - Scanner, Microphone, etc...
+	kBluetoothServiceClassMajorObjectTransfer				= 0x080,	// Bit 20 - v-Inbox, v-Folder, etc...
+	kBluetoothServiceClassMajorAudio						= 0x100,	// Bit 21 - Speaker, Microphone, Headset, etc...
+	kBluetoothServiceClassMajorTelephony					= 0x200,	// Bit 22 - Cordless telephony, Modem, Headset, etc...
+	kBluetoothServiceClassMajorInformation					= 0x400,	// Bit 23 - Web server, WAP server, etc...
+	
+	kBluetoothServiceClassMajorAny							= '****',	// Pseudo-class - means anything acceptable.
+	kBluetoothServiceClassMajorNone							= 'none',	// Pseudo-class - means no matching.
+	
+	kBluetoothServiceClassMajorEnd
+};
+
+//
+// Device Class Major
+//
+
+enum
+{
+	kBluetoothDeviceClassMajorMiscellaneous					= 0x00, 	// [00000] Miscellaneous
+	kBluetoothDeviceClassMajorComputer						= 0x01, 	// [00001] Desktop, Notebook, PDA, Organizers, etc...
+	kBluetoothDeviceClassMajorPhone							= 0x02, 	// [00010] Cellular, Cordless, Payphone, Modem, etc...
+	kBluetoothDeviceClassMajorLANAccessPoint				= 0x03, 	// [00011] LAN Access Point
+	kBluetoothDeviceClassMajorAudio							= 0x04, 	// [00100] Headset, Speaker, Stereo, etc...
+	kBluetoothDeviceClassMajorPeripheral					= 0x05, 	// [00101] Mouse, Joystick, Keyboards, etc...
+    kBluetoothDeviceClassMajorImaging						= 0x06,		// [00110] Printing, scanner, camera, display, etc...
+	kBluetoothDeviceClassMajorUnclassified					= 0x1F, 	// [11111] Specific device code not assigned
+	
+	// Range 0x06 to 0x1E Reserved for future use.
+	
+	kBluetoothDeviceClassMajorAny							= '****',	// Pseudo-class - means anything acceptable.
+	kBluetoothDeviceClassMajorNone							= 'none',	// Pseudo-class - means no matching.
+	
+	kBluetoothDeviceClassMajorEnd
+};
+
+//
+// Device Class Minor
+//
+
+enum
+{
+	///
+	/// Computer Major Class
+	///
+	
+	kBluetoothDeviceClassMinorComputerUnclassified			= 0x00, 	// [000000] Specific device code not assigned
+	kBluetoothDeviceClassMinorComputerDesktopWorkstation	= 0x01, 	// [000001] Desktop workstation
+	kBluetoothDeviceClassMinorComputerServer				= 0x02, 	// [000010] Server-class computer
+	kBluetoothDeviceClassMinorComputerLaptop				= 0x03, 	// [000011] Laptop
+	kBluetoothDeviceClassMinorComputerHandheld				= 0x04, 	// [000100] Handheld PC/PDA (clam shell)
+	kBluetoothDeviceClassMinorComputerPalmSized				= 0x05, 	// [000101] Palm-sized PC/PDA
+    kBluetoothDeviceClassMinorComputerWearable				= 0x06,		// [000110] Wearable computer (watch sized)
+	
+	// Range 0x06 to 0x7F Reserved for future use.
+	
+    
+	///
+	/// Phone Major Class
+	///
+	
+	kBluetoothDeviceClassMinorPhoneUnclassified				= 0x00, 	// [000000] Specific device code not assigned
+	kBluetoothDeviceClassMinorPhoneCellular					= 0x01, 	// [000001] Cellular
+	kBluetoothDeviceClassMinorPhoneCordless					= 0x02, 	// [000010] Cordless
+	kBluetoothDeviceClassMinorPhoneSmartPhone				= 0x03, 	// [000011] Smart phone
+	kBluetoothDeviceClassMinorPhoneWiredModemOrVoiceGateway	= 0x04, 	// [000100] Wired modem or voice gateway
+    kBluetoothDeviceClassMinorPhoneCommonISDNAccess			= 0x05,		// [000101] Common ISDN Access
+	
+	// Range 0x05 to 0x7F Reserved for future use.
+	
+    
+	///
+	/// LAN Access Point Major Class
+	///
+	
+	// $$$ TO DO: LAN Access Point minor classes are broken into bits 5-7 for utilization and bits 2-4 for class.
+	
+    
+	///
+	/// Audio Major Class
+	///
+	
+	kBluetoothDeviceClassMinorAudioUnclassified					= 0x00, 	// [000000] Specific device code not assigned
+	kBluetoothDeviceClassMinorAudioHeadset						= 0x01, 	// [000001] Device conforms to the Headset profile
+    kBluetoothDeviceClassMinorAudioHandsFree					= 0x02,		// [000010] Hands-free
+    kBluetoothDeviceClassMinorAudioReserved1					= 0x03,		// [000011] Reserved
+    kBluetoothDeviceClassMinorAudioMicrophone					= 0x04,		// [000100] Microphone
+    kBluetoothDeviceClassMinorAudioLoudspeaker					= 0x05,		// [000101] Loudspeaker
+    kBluetoothDeviceClassMinorAudioHeadphones					= 0x06,		// [000110] Headphones
+    kBluetoothDeviceClassMinorAudioPortable						= 0x07,		// [000111] Portable Audio
+    kBluetoothDeviceClassMinorAudioCar							= 0x08,		// [001000] Car Audio
+    kBluetoothDeviceClassMinorAudioSetTopBox					= 0x09,		// [001001] Set-top box
+    kBluetoothDeviceClassMinorAudioHiFi							= 0x0a,		// [001010] HiFi Audio Device
+    kBluetoothDeviceClassMinorAudioVCR							= 0x0b,		// [001011] VCR
+    kBluetoothDeviceClassMinorAudioVideoCamera					= 0x0c,		// [001100] Video Camera
+    kBluetoothDeviceClassMinorAudioCamcorder					= 0x0d,		// [001101] Camcorder
+    kBluetoothDeviceClassMinorAudioVideoMonitor					= 0x0e,		// [001110] Video Monitor
+    kBluetoothDeviceClassMinorAudioVideoDisplayAndLoudspeaker	= 0x0f,		// [001111] Video Display and Loudspeaker
+    kBluetoothDeviceClassMinorAudioVideoConferencing			= 0x10,		// [010000] Video Conferencing
+    kBluetoothDeviceClassMinorAudioReserved2					= 0x11,		// [010001] Reserved
+    kBluetoothDeviceClassMinorAudioGamingToy					= 0x12,		// [010010] Gaming/Toy
+    
+	
+	// Range 0x13 to 0x7F Reserved for future use.
+	
+    
+	///
+	/// Peripheral Major Class
+	///
+    
+    // Peripheral1 subclass is bits 7 & 6
+    
+    kBluetoothDeviceClassMinorPeripheral1Keyboard			= 0x10,		// [01XXXX] Keyboard
+    kBluetoothDeviceClassMinorPeripheral1Pointing			= 0x20,		// [10XXXX] Pointing device
+    kBluetoothDeviceClassMinorPeripheral1Combo				= 0x30,		// [11XXXX] Combo keyboard/pointing device
+    
+    // Peripheral2 subclass is bits 5-2
+    
+    kBluetoothDeviceClassMinorPeripheral2Unclassified		= 0x00,		// [XX0000] Uncategorized device
+    kBluetoothDeviceClassMinorPeripheral2Joystick			= 0x01,		// [XX0001] Joystick
+    kBluetoothDeviceClassMinorPeripheral2Gamepad			= 0x02,		// [XX0010] Gamepad
+    kBluetoothDeviceClassMinorPeripheral2RemoteControl		= 0x03,		// [XX0011] Remote control
+    kBluetoothDeviceClassMinorPeripheral2SensingDevice		= 0x04,		// [XX0100] Sensing device
+    kBluetoothDeviceClassMinorPeripheral2DigitizerTablet	= 0x05,		// [XX0101] Digitizer Tablet	
+    kBluetoothDeviceClassMinorPeripheral2CardReader			= 0x06,		// [XX0110] Card Reader
+    
+	kBluetoothDeviceClassMinorPeripheral2AnyPointing		= 'poin',	// Anything under MinorPeripheral1Pointing
+	
+    // Range 0x05 to 0x0f reserved for future use
+	
+    
+	///
+	/// Imaging Major Class
+	///
+    
+    // Imaging1 subclass is bits 7 - 4
+    
+    kBluetoothDeviceClassMinorImaging1Display				= 0x04,		// [XXX1XX] Display
+    kBluetoothDeviceClassMinorImaging1Camera				= 0x08,		// [XX1XXX] Camera
+    kBluetoothDeviceClassMinorImaging1Scanner				= 0x10,		// [X1XXXX] Scanner
+    kBluetoothDeviceClassMinorImaging1Printer				= 0x20,		// [1XXXXX] Printer
+    
+    // Imaging2 subclass is bits 3 - 2
+    
+    kBluetoothDeviceClassMinorImaging2Unclassified			= 0x00,		// [XXXX00] Uncategorized, default
+    
+    // Range 0x01 - 0x03 reserved for future use
+    
+    
+	///
+	///	Misc
+	///
+	
+	kBluetoothDeviceClassMinorAny							= '****',	// Pseudo-class - means anything acceptable.
+	kBluetoothDeviceClassMinorNone							= 'none',	// Pseudo-class - means no matching.
+	
+	kBluetoothDeviceClassMinorEnd
+};
+		
+		
+// Peripheral devices bits 7 & 6
+#define BluetoothCoDMinorPeripheral1(minorClass) (minorClass & 0x30)
+		
+// Peripheral devices bits 5 - 2
+#define BluetoothCoDMinorPeripheral2(minorClass) (minorClass & 0x0f)	
+		
+#pragma mark -
+#pragma mark === L2CAP ===
+
+//===========================================================================================================================
+//	L2CAP
+//===========================================================================================================================
+
+enum
+{
+	kBluetoothL2CAPPSMSDP						= 0x0001, 
+	kBluetoothL2CAPPSMRFCOMM					= 0x0003, 
+	kBluetoothL2CAPPSMTCS_BIN					= 0x0005,	// Telephony Control Specifictation / TCS Binary
+    kBluetoothL2CAPPSMTCS_BIN_Cordless			= 0x0007,	// Telephony Control Specifictation / TCS Binary
+    kBluetoothL2CAPPSMBNEP						= 0x000F,	// Bluetooth Network Encapsulation Protocol
+    kBluetoothL2CAPPSMHIDControl				= 0x0011,	// HID profile - control interface
+    kBluetoothL2CAPPSMHIDInterrupt				= 0x0013,	// HID profile - interrupt interface
+    kBluetoothL2CAPPSMAVCTP						= 0x0017,	// Audio/Video Control Transport Protocol
+    kBluetoothL2CAPPSMAVDTP						= 0x0019,	// Audio/Video Distribution Transport Protocol
+    kBluetoothL2CAPPSMUID_C_Plane				= 0x001D,	// Unrestricted Digital Information Profile (UDI)
+	
+	// Range < 0x1000 reserved.
+    kBluetoothL2CAPPSMReservedStart				= 0x0001,
+    kBluetoothL2CAPPSMReservedEnd				= 0x1000,
+    
+	// Range 0x1001-0xFFFF dynamically assigned.
+    kBluetoothL2CAPPSMDynamicStart				= 0x1001,
+	kBluetoothL2CAPPSMD2D						= 0x100F,
+    kBluetoothL2CAPPSMDynamicEnd				= 0xFFFF,
+    
+    kBluetoothL2CAPPSMNone						= 0x0000
+};
+
+
+#pragma mark -
+#pragma mark === SDP ===
+
+//===========================================================================================================================
+//	Service Discovery Protocol
+//===========================================================================================================================
+
+enum
+{
+	// General
+	
+	kBluetoothSDPUUID16Base									= 0x0000, 	// 00000000-0000-1000-8000-00805f9b34fb
+	
+	// Protocols
+	
+	kBluetoothSDPUUID16SDP				 					= 0x0001, 	// 00000001-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16UDP 									= 0x0002, 	// 00000002-0000-1000-8000-00805f9b34fb 
+	kBluetoothSDPUUID16RFCOMM 								= 0x0003, 	// 00000003-0000-1000-8000-00805f9b34fb 
+	kBluetoothSDPUUID16TCP 									= 0x0004, 	// 00000004-0000-1000-8000-00805f9b34fb 
+	kBluetoothSDPUUID16TCSBIN 								= 0x0005, 	// 00000005-0000-1000-8000-00805f9b34fb 
+	kBluetoothSDPUUID16TCSAT 								= 0x0006, 	// 00000006-0000-1000-8000-00805f9b34fb 
+	kBluetoothSDPUUID16OBEX 								= 0x0008, 	// 00000008-0000-1000-8000-00805f9b34fb 
+	kBluetoothSDPUUID16IP 									= 0x0009, 	// 00000009-0000-1000-8000-00805f9b34fb 
+	kBluetoothSDPUUID16FTP 									= 0x000A, 	// 0000000A-0000-1000-8000-00805f9b34fb 
+	kBluetoothSDPUUID16HTTP 								= 0x000C, 	// 0000000C-0000-1000-8000-00805f9b34fb 
+	kBluetoothSDPUUID16WSP	 								= 0x000E, 	// 0000000E-0000-1000-8000-00805f9b34fb 
+	kBluetoothSDPUUID16BNEP									= 0x000F,
+	kBluetoothSDPUUID16UPNP									= 0x0010,
+	kBluetoothSDPUUID16HIDP									= 0x0011,
+	kBluetoothSDPUUID16HardcopyControlChannel				= 0x0012,
+	kBluetoothSDPUUID16HardcopyDataChannel					= 0x0014,
+	kBluetoothSDPUUID16HardcopyNotification					= 0x0016,
+	kBluetoothSDPUUID16AVCTP								= 0x0017,
+	kBluetoothSDPUUID16AVDTP								= 0x0019,
+	kBluetoothSDPUUID16CMPT									= 0x001B,
+	kBluetoothSDPUUID16UDI_C_Plane							= 0x001D,
+	kBluetoothSDPUUID16L2CAP 								= 0x0100, 	// 00000100-0000-1000-8000-00805f9b34fb 
+};
+
+enum SDPServiceClasses
+{
+	kBluetoothSDPUUID16ServiceClassServiceDiscoveryServer					= 0x1000,	// 00001000-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassBrowseGroupDescriptor					= 0x1001,	// 00001001-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassPublicBrowseGroup						= 0x1002,	// 00001002-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassSerialPort								= 0x1101,	// 00001101-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassLANAccessUsingPPP						= 0x1102,	// 00001102-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassDialupNetworking							= 0x1103,	// 00001103-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassIrMCSync									= 0x1104,	// 00001104-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassOBEXObjectPush							= 0x1105,	// 00001105-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassOBEXFileTransfer							= 0x1106,	// 00001106-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassIrMCSyncCommand							= 0x1107,	// 00001107-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassHeadset									= 0x1108,	// 00001108-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassCordlessTelephony						= 0x1109,	// 00001109-0000-1000-8000-00805f9b34fb
+    kBluetoothSDPUUID16ServiceClassAudioSource								= 0x110A,
+    kBluetoothSDPUUID16ServiceClassAudioSink								= 0x110B,
+    kBluetoothSDPUUID16ServiceClassAVRemoteControlTarget					= 0x110C,
+    kBluetoothSDPUUID16ServiceClassAdvancedAudioDistribution				= 0x110D,
+    kBluetoothSDPUUID16ServiceClassAVRemoteControl							= 0x110E,
+    kBluetoothSDPUUID16ServiceClassVideoConferencing						= 0x110F,
+	kBluetoothSDPUUID16ServiceClassIntercom									= 0x1110,	// 00001110-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassFax										= 0x1111,	// 00001111-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassHeadsetAudioGateway						= 0x1112,	// 00001112-0000-1000-8000-00805f9b34fb
+    kBluetoothSDPUUID16ServiceClassWAP										= 0x1113,
+    kBluetoothSDPUUID16ServiceClassWAPClient								= 0x1114,
+    kBluetoothSDPUUID16ServiceClassPANU										= 0x1115,
+    kBluetoothSDPUUID16ServiceClassNAP										= 0x1116,
+    kBluetoothSDPUUID16ServiceClassGN										= 0x1117,
+    kBluetoothSDPUUID16ServiceClassDirectPrinting							= 0x1118,
+    kBluetoothSDPUUID16ServiceClassReferencePrinting						= 0x1119,
+    kBluetoothSDPUUID16ServiceClassImaging									= 0x111A,
+    kBluetoothSDPUUID16ServiceClassImagingResponder							= 0x111B,
+    kBluetoothSDPUUID16ServiceClassImagingAutomaticArchive					= 0x111C,
+    kBluetoothSDPUUID16ServiceClassImagingReferencedObjects					= 0x111D,
+    kBluetoothSDPUUID16ServiceClassHandsFree								= 0x111E,
+    kBluetoothSDPUUID16ServiceClassHandsFreeAudioGateway					= 0x111F,
+    kBluetoothSDPUUID16ServiceClassDirectPrintingReferenceObjectsService	= 0x1120,
+    kBluetoothSDPUUID16ServiceClassReflectedUI								= 0x1121,
+    kBluetoothSDPUUID16ServiceClassBasicPrinting							= 0x1122,
+    kBluetoothSDPUUID16ServiceClassPrintingStatus							= 0x1123,
+    kBluetoothSDPUUID16ServiceClassHumanInterfaceDeviceService				= 0x1124,
+    kBluetoothSDPUUID16ServiceClassHardcopyCableReplacement					= 0x1125,
+    kBluetoothSDPUUID16ServiceClassHCR_Print								= 0x1126,
+    kBluetoothSDPUUID16ServiceClassHCR_Scan									= 0x1127,
+    kBluetoothSDPUUID16ServiceClassCommonISDNAccess							= 0x1128,
+    kBluetoothSDPUUID16ServiceClassVideoConferencingGW						= 0x1129,
+    kBluetoothSDPUUID16ServiceClassUDI_MT									= 0x112A,
+    kBluetoothSDPUUID16ServiceClassUDI_TA									= 0x112B,
+    kBluetoothSDPUUID16ServiceClassAudioVideo								= 0x112C,
+    kBluetoothSDPUUID16ServiceClassSIM_Access								= 0x112D,
+    kBluetoothSDPUUID16ServiceClassPhonebookAccess_PCE						= 0x112E,
+    kBluetoothSDPUUID16ServiceClassPhonebookAccess_PSE						= 0x112F,
+    kBluetoothSDPUUID16ServiceClassPhonebookAccess							= 0x1130,
+    kBluetoothSDPUUID16ServiceClassHeadset_HS								= 0x1131,
+    kBluetoothSDPUUID16ServiceClassMessageAccessServer						= 0x1132,
+    kBluetoothSDPUUID16ServiceClassMessageNotificationServer				= 0x1133,
+    kBluetoothSDPUUID16ServiceClassMessageAccessProfile						= 0x1134,
+	kBluetoothSDPUUID16ServiceClassPnPInformation							= 0x1200,	// 00001200-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassGenericNetworking						= 0x1201,	// 00001201-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassGenericFileTransfer						= 0x1202,	// 00001202-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassGenericAudio								= 0x1203,	// 00001203-0000-1000-8000-00805f9b34fb
+	kBluetoothSDPUUID16ServiceClassGenericTelephony							= 0x1204	// 00001204-0000-1000-8000-00805f9b34fb
+};
+
+enum SDPAttributeIdentifierCodes
+{
+	kBluetoothSDPAttributeIdentifierServiceRecordHandle					= 0x0000,
+	kBluetoothSDPAttributeIdentifierServiceClassIDList					= 0x0001,
+	kBluetoothSDPAttributeIdentifierServiceRecordState					= 0x0002,
+	kBluetoothSDPAttributeIdentifierServiceID							= 0x0003,
+	kBluetoothSDPAttributeIdentifierProtocolDescriptorList				= 0x0004,
+	kBluetoothSDPAttributeIdentifierBrowseGroupList						= 0x0005,
+	kBluetoothSDPAttributeIdentifierLanguageBaseAttributeIDList			= 0x0006,
+	kBluetoothSDPAttributeIdentifierServiceInfoTimeToLive				= 0x0007,
+	kBluetoothSDPAttributeIdentifierServiceAvailability					= 0x0008,
+	kBluetoothSDPAttributeIdentifierBluetoothProfileDescriptorList		= 0x0009,
+	kBluetoothSDPAttributeIdentifierDocumentationURL					= 0x000A,
+	kBluetoothSDPAttributeIdentifierClientExecutableURL					= 0x000B,
+	kBluetoothSDPAttributeIdentifierIconURL								= 0x000C,
+	kBluetoothSDPAttributeIdentifierAdditionalProtocolsDescriptorList	= 0x000D,
+
+    // Service Discovery Server
+	kBluetoothSDPAttributeIdentifierVersionNumberList					= 0x0200,
+	kBluetoothSDPAttributeIdentifierServiceDatabaseState				= 0x0201,
+    
+    // Browse Group Descriptor
+    kBluetoothSDPAttributeIdentifierGroupID								= 0x0200,
+    
+    // PAN
+    kBluetoothSDPAttributeIdentifierIPSubnet							= 0x0200,
+
+#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1
+
+    // HID																			Required		Type		Section		Notes
+    kBluetoothSDPAttributeIdentifierHIDReleaseNumber					= 0x0200,	// O			uint16		7.11.1
+    kBluetoothSDPAttributeIdentifierHIDParserVersion					= 0x0201,	// M			uint16		-
+    kBluetoothSDPAttributeIdentifierHIDDeviceSubclass					= 0x0202,	// M			uint8		7.11.2		Should match the low order 8 bits of CoD unless a combo device
+    kBluetoothSDPAttributeIdentifierHIDCountryCode						= 0x0203,	// M			uint8		7.11.3
+    kBluetoothSDPAttributeIdentifierHIDVirtualCable						= 0x0204,	// M			bool		7.11.4
+    kBluetoothSDPAttributeIdentifierHIDReconnectInitiate				= 0x0205,	// M			bool		7.11.5
+    kBluetoothSDPAttributeIdentifierHIDDescriptorList					= 0x0206,	// M			sequence	7.11.6		Layout is defined in Section 6.2 of the HID Specification
+    kBluetoothSDPAttributeIdentifierHIDLangIDBaseList					= 0x0207,	// M			sequence	7.11.7
+    kBluetoothSDPAttributeIdentifierHIDSDPDisable						= 0x0208,	// O			bool		7.11.8
+    kBluetoothSDPAttributeIdentifierHIDBatteryPower						= 0x0209,	// O			bool		7.11.9
+    kBluetoothSDPAttributeIdentifierHIDRemoteWake						= 0x020A,	// O			bool		7.11.10
+    kBluetoothSDPAttributeIdentifierHIDProfileVersion					= 0x020B,	// M			uint16		7.11.14
+    kBluetoothSDPAttributeIdentifierHIDSupervisionTimeout				= 0x020C,	// O			uint16		7.11.12		Default to 5 seconds or longer if not defined
+    kBluetoothSDPAttributeIdentifierHIDNormallyConnectable				= 0x020D,	// O			bool		7.11.13
+    kBluetoothSDPAttributeIdentifierHIDBootDevice						= 0x020E,	// M			bool		7.11.11		Only defined for mice and keyboards as of HID 1.0
+
+#endif
+    
+	kBluetoothSDPAttributeIdentifierServiceVersion						= 0x0300,
+	kBluetoothSDPAttributeIdentifierExternalNetwork						= 0x0301,	// Cordless telephony
+    kBluetoothSDPAttributeIdentifierNetwork								= 0x0301,	// Handsfree Profile (HFP)
+	kBluetoothSDPAttributeIdentifierSupportedDataStoresList				= 0x0301,	// Sync Profile
+	kBluetoothSDPAttributeIdentifierFaxClass1Support					= 0x0302,	// Fax Profile
+	kBluetoothSDPAttributeIdentifierRemoteAudioVolumeControl			= 0x0302,	// GAP???
+	kBluetoothSDPAttributeIdentifierFaxClass2_0Support					= 0x0303,
+	kBluetoothSDPAttributeIdentifierSupporterFormatsList				= 0x0303,
+	kBluetoothSDPAttributeIdentifierFaxClass2Support					= 0x0304,
+	kBluetoothSDPAttributeIdentifierAudioFeedbackSupport				= 0x0305,
+    kBluetoothSDPAttributeIdentifierNetworkAddress						= 0x0306,	// WAP
+    kBluetoothSDPAttributeIdentifierWAPGateway							= 0x0307,	// WAP
+    kBluetoothSDPAttributeIdentifierHomepageURL							= 0x0308,	// WAP
+    kBluetoothSDPAttributeIdentifierWAPStackType						= 0x0309,	// WAP
+    kBluetoothSDPAttributeIdentifierSecurityDescription					= 0x030A,	// PAN
+    kBluetoothSDPAttributeIdentifierNetAccessType						= 0x030B,	// PAN
+    kBluetoothSDPAttributeIdentifierMaxNetAccessRate					= 0x030C,	// PAN
+    kBluetoothSDPAttributeIdentifierSupportedCapabilities				= 0x0310,	// Imaging
+    kBluetoothSDPAttributeIdentifierSupportedFeatures					= 0x0311,	// Imaging & HFP
+    kBluetoothSDPAttributeIdentifierSupportedFunctions					= 0x0312,	// Imaging
+    kBluetoothSDPAttributeIdentifierTotalImagingDataCapacity			= 0x0313,	// Imaging
+
+	kBluetoothSDPAttributeIdentifierServiceName							= 0x0000, /* +language base offset*/
+	kBluetoothSDPAttributeIdentifierServiceDescription					= 0x0001, /* +language base offset*/
+	kBluetoothSDPAttributeIdentifierProviderName						= 0x0002  /* +language base offset*/
+};
+
+enum SDPAttributeDeviceIdentificationRecord
+{
+	/* Values taken from the Bluetooth Device Identification specification, 1.0 draft, 1.16.2003 */
+	
+	kBluetoothSDPAttributeDeviceIdentifierServiceDescription			= 0x0001,	/* String */
+	kBluetoothSDPAttributeDeviceIdentifierDocumentationURL				= 0x000A,	/* URL */
+	kBluetoothSDPAttributeDeviceIdentifierClientExecutableURL			= 0x000B,	/* URL */
+	kBluetoothSDPAttributeDeviceIdentifierSpecificationID				= 0x0200,	/* 2 byte unsigned integer */
+	kBluetoothSDPAttributeDeviceIdentifierVendorID						= 0x0201,	/* 2 byte unsigned integer */
+	kBluetoothSDPAttributeDeviceIdentifierProductID						= 0x0202,	/* 2 byte unsigned integer */
+	kBluetoothSDPAttributeDeviceIdentifierVersion						= 0x0203,	/* 2 byte unsigned integer */
+	kBluetoothSDPAttributeDeviceIdentifierPrimaryRecord					= 0x0204,	/* Boolean */
+	kBluetoothSDPAttributeDeviceIdentifierVendorIDSource				= 0x0205,	/* 2 byte unsigned integer */
+	kBluetoothSDPAttributeDeviceIdentifierReservedRangeStart			= 0x0206,
+	kBluetoothSDPAttributeDeviceIdentifierReservedRangeEnd				= 0x02FF
+	
+};
+
+enum ProtocolParameters
+{
+    kBluetoothSDPProtocolParameterL2CAPPSM								= 1,
+    kBluetoothSDPProtocolParameterRFCOMMChannel							= 1,
+    kBluetoothSDPProtocolParameterTCPPort								= 1,
+    kBluetoothSDPProtocolParameterUDPPort								= 1,
+    kBluetoothSDPProtocolParameterBNEPVersion							= 1,
+    kBluetoothSDPProtocolParameterBNEPSupportedNetworkPacketTypeList	= 2
+};
+
+#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0
+
+//Inquiries with 'Extended Inquiry Response' (v2.1 specification)
+
+enum BluetoothHCIExtendedInquiryResponseDataTypes
+{
+	kBluetoothHCIExtendedInquiryResponseDataTypeFlags										=	0x01,
+	kBluetoothHCIExtendedInquiryResponseDataType16BitServiceClassUUIDsWithMoreAvailable		=	0x02,
+	kBluetoothHCIExtendedInquiryResponseDataType16BitServiceClassUUIDsCompleteList			=	0x03,
+	kBluetoothHCIExtendedInquiryResponseDataType32BitServiceClassUUIDsWithMoreAvailable		=	0x04,
+	kBluetoothHCIExtendedInquiryResponseDataType32BitServiceClassUUIDsCompleteList			=	0x05,
+	kBluetoothHCIExtendedInquiryResponseDataType128BitServiceClassUUIDsWithMoreAvailable	=	0x06,
+	kBluetoothHCIExtendedInquiryResponseDataType128BitServiceClassUUIDsCompleteList			=	0x07,
+	kBluetoothHCIExtendedInquiryResponseDataTypeShortenedLocalName							=	0x08,
+	kBluetoothHCIExtendedInquiryResponseDataTypeCompleteLocalName							=	0x09,
+	kBluetoothHCIExtendedInquiryResponseDataTypeDeviceID									=	0x10,
+	kBluetoothHCIExtendedInquiryResponseDataTypeManufacturerSpecificData					=	0xFF
+};
+
+#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0 */
+
+
+#ifdef	__cplusplus
+	}
+#endif
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothHCIController.h b/i386/include/IOKit/bluetooth/IOBluetoothHCIController.h
new file mode 100644
index 0000000..303795e
--- /dev/null
+++ b/i386/include/IOKit/bluetooth/IOBluetoothHCIController.h
@@ -0,0 +1,1370 @@
+/*
+	File:		IOBluetoothHCIController.h
+	Contains:	Bluetooth Host Controller base class.
+	Copyright:	(c) 2001-2008 by Apple, all rights reserved.
+*/
+
+
+#pragma once
+
+//====================================================================================================
+// Imports
+//====================================================================================================
+
+#import <IOKit/IOService.h>
+#import <IOKit/system.h>
+#import <IOKit/system.h>
+#import <kern/thread_call.h>
+
+#import </usr/include/AvailabilityMacros.h>
+
+#include <IOKit/pwr_mgt/RootDomain.h>
+
+#import <IOKit/bluetooth/Bluetooth.h>
+
+#import <IOKit/bluetooth/IOBluetoothTypes.h>
+#import <IOKit/bluetooth/IOBluetoothInternal.h>
+
+//====================================================================================================
+// Forward declarations
+//====================================================================================================
+
+class OSSet;
+class IOWorkLoop;
+class IOCommandGate;
+class IOWorkQueue;
+class IOBluetoothDevice;
+class IOBluetoothHCIRequest;
+class IOBluetoothHCIController;
+class IOBluetoothACLMemoryDescriptor;
+class IOTimerEventSource;
+class IOBluetoothInactivityTimerEventSource;
+class IOBluetoothHCIPacketLogUserClient;
+
+//====================================================================================================
+// defines, typdefs, etc.
+//====================================================================================================
+
+#define kNoReturnParam					NULL
+
+typedef	uint16_t	DevicePublishNotificationStateType;
+enum DevicePublishNotificationStateTypes
+{
+	kHasNotRegisteredForDevicePublishNotification		= 0x0001,
+	kHasRegisteredForDevicePublishNotification			= 0x0002,
+	kDevicePublishNotificationCalled					= 0x0004,
+	kDevicePublishNotificationProcessed					= 0x0008
+};
+
+typedef UInt32 HCIDataHandlerType;
+enum HCIDataHandlerTypes
+{
+	kTransportDataTypeHCIEvents,
+	kTransportDataTypeACL,
+	kTransportDataTypeSCO
+};
+
+typedef IOReturn (*IOBluetoothIncomingDataAction) ( IOBluetoothHCIController *hciController,  UInt8 *inDataPtr, UInt32 inDataSize, UInt32 inSequenceNumber );
+typedef IOReturn (*IOBluetoothHCIControllerDataHandler) ( void * contextPtr, const UInt8 * data, UInt32 dataSize );
+
+typedef struct HCIDataHandler	HCIDataHandler;
+struct HCIDataHandler
+{
+	IOBluetoothHCIControllerDataHandler		procPtr;
+	void * 									contextPtr;
+};
+
+typedef struct HCIEventNotificationListener	HCIEventNotificationListener;
+struct HCIEventNotificationListener
+{
+	task_t				owningTask;		// Used to ID these things when adding/removing them from our listener pool.
+	mach_port_t			port;			// Mach port to send out the notificaton.
+	void * 				refCon;			// RefCon for the port's use.
+};
+
+#define POWER_STATE_CHANGE_IN_PROGRESS()	( mCurrentInternalPowerState != mPendingInternalPowerState )
+#define	IS_POWERING_DOWN()	( POWER_STATE_CHANGE_IN_PROGRESS() && ( mPendingInternalPowerState == kIOBluetoothHCIControllerInternalPowerStateOff ) )
+
+//====================================================================================================
+// Callback structure for data:
+//====================================================================================================
+
+typedef struct SendDataContext
+{
+	// Data sent:
+	IOMemoryDescriptor *memoryDescriptorPointer;
+	
+	// Referece to the device that sent the data:
+	IOBluetoothDevice *devicePointer;
+	void *devicePointerContextInfo0;
+	void *devicePointerContextInfo1;
+	
+	// And the controller that received it:
+	IOBluetoothHCIController *hciController;
+	void *controllerPointerContextInfo0;
+	void *controllerPointerContextInfo1;
+	
+	// ReturnValue:
+	IOReturn sendingWasSuccessful;
+} SendDataContext;
+
+
+//====================================================================================================
+// Keep track of hearing devices
+//====================================================================================================
+typedef struct HearingDeviceListType
+{
+	BluetoothDeviceAddress					mDeviceAddress;
+	bool									mRemoveDeviceCalled;
+	DevicePublishNotificationStateType		mDevicePublishNotificationState;
+	HearingDeviceListType *					mNextDevice;
+	HearingDeviceListType *					mPreviousDevice;
+} HearingDeviceListType;
+
+//====================================================================================================
+// IOBluetoothHCIController
+//====================================================================================================
+
+class IOBluetoothHCIController : public IOService
+{
+	// We don't make many friends, but at least we have a few...
+
+    friend class IOBluetoothHCIPacketLogUserClient;
+    friend class IOBluetoothSerialManager;
+    friend class IOBluetoothHCIUserClient;
+    friend class IOBluetoothDevice;
+	friend class IOBluetoothHCIRequest;
+	
+	// IOKit stuff.
+	
+    OSDeclareDefaultStructors( IOBluetoothHCIController )
+
+protected:
+
+	IOWorkLoop *					mWorkLoop;
+	IOCommandGate *					mCommandGate;
+	IOWorkQueue *					mWorkQueue;
+	IOTimerEventSource *			mTimerEventSource;
+	Boolean							mShouldRunInactivityTimer;
+	
+	// Data and request queue stuff.
+	
+	HCIEventNotificationListener*	mHCIEventListenersList;
+	size_t							mHCIEventListenersListSize;
+ 	HCIDataHandler*					mHCIEventDataHandlerList;
+	size_t							mHCIEventDataHandlerListSize;
+	HCIDataHandler*					mACLDataHandlerList;
+	size_t							mACLDataHandlerListSize;
+	HCIDataHandler*					mSCODataHandlerList;
+	size_t							mSCODataHandlerListSize;
+	
+	IOBluetoothHCIRequest *	 		mBusyQueueHead;
+	IOBluetoothHCIRequest *	 		mWaitQueueHead;
+	IOBluetoothHCIRequest **		mHCIRequestList;
+
+    IOBluetoothDevice *				mDeviceListHead;
+	
+	OSSet *							mPacketLogClients;
+	UInt8 *							mPacketLogBuffer;
+	UInt32							mPacketLogBufferSize;
+   
+	uint8_t *						mEventDataBuffer;			// Events without matching requests will use this.
+	size_t							mEventDataBufferSize;
+	
+    // This keeps track of the ACL packets we actually sent:
+    BluetoothHCIBufferSize			mHCIBufferSize;
+    UInt16							mNumOutstandingACLPackets;
+    
+    OSArray *						mAllowedIncomingL2CAPChannels;
+    
+    UInt32							mNextAvailableSequenceNumber;
+    UInt32							mCurrentlyExecutingSequenceNumber;
+    UInt16							mActiveConnections;
+	
+	// Packet Queue description:
+	typedef struct QueuePacketHolder {
+		IOMemoryDescriptor								*memDescriptor;	// The data we need to send
+		SendDataContext *								contextPtr;		// Context pointer for the sent data.
+		IOBluetoothDevice *								inTargetDevice;	// The device that enqueued the data.
+		struct QueuePacketHolder						*next;			// The next block in the queue.
+	} QueuePacketHolder;
+    QueuePacketHolder *mACLQueueHead, *mACLQueueTail;
+	
+	// Counters to limit the number of packets in the queue (we do not want to go out of memory)
+	UInt32 mNumberOfPacketsInQueue;
+
+	// The allowed RFCOMM channels
+    OSArray *mAllowedIncomingRFCOMMChannels;
+    
+	IOBluetoothHCIControllerInternalPowerState	mCurrentInternalPowerState;
+	IOBluetoothHCIControllerInternalPowerState	mPendingInternalPowerState;
+	Boolean										mAsyncPowerStateChangeInProgress;
+	UInt32										mPendingPowerStateChangeOptions;
+	IOBluetoothHCIControllerPowerOptions		mControllerPowerOptions;
+	Boolean										mPowerStateChangeIsUserEnforced;
+	
+	Boolean										mHardwareSetupComplete;
+	
+	IOBluetoothHCIControllerConfigState		mControllerConfigState;
+	IOBluetoothHCIControllerConfigState		mPreviousControllerConfigState;
+	
+	IOBluetoothHCIControllerFeatureFlags	mControllerFeatureFlags;
+
+	// Overrides.
+
+	bool 				start( IOService * provider );
+
+	bool		 		init( OSDictionary* dictionary );
+
+    virtual void		free();
+
+#if defined( MAC_OS_X_VERSION_10_5 )
+    virtual void		systemWillShutdown( IOOptionBits specifier );
+#endif
+
+    static IOReturn		initHardwareAction(	OSObject	*owner,
+                                            void		*arg1,
+                                            void		*arg2,
+                                            void		*arg3,
+                                            void		*arg4 );
+                                            
+    virtual bool		initHardware( IOService * provider );
+	
+    static IOReturn		setupHardwareAction(	OSObject	*owner,
+												void		*arg1,
+												void		*arg2,
+												void		*arg3,
+												void		*arg4 );
+                                                    
+	virtual IOReturn	setupHardware( IOService* provider );
+
+    virtual void		hardwareSetupComplete( IOReturn status );
+    
+	virtual	void		setConfigState( IOBluetoothHCIControllerConfigState configState );
+	virtual	bool		terminate( IOOptionBits options = 0 );
+	virtual bool		willTerminate( IOService * provider, IOOptionBits options );
+	virtual bool		didTerminate( IOService * provider, IOOptionBits options, bool * defer );
+	
+	void 				stop( IOService * provider );
+	
+	IOReturn			newUserClient(	task_t 				owningTask,
+										void *				securityID,
+										UInt32 				type,
+										IOUserClient **		handler );
+	
+	uint32_t			CountExistingHCIControllers();
+
+	virtual IOReturn	powerStateWillChangeTo(	IOPMPowerFlags	powerFlags,
+												unsigned long	powerState,
+												IOService *		from );
+
+	virtual	unsigned long	maxCapabilityForDomainState(  IOPMPowerFlags domainState );
+
+	virtual unsigned long	initialPowerStateForDomainState ( IOPMPowerFlags powerFlags );
+
+	// Our protected custom stuff.
+	
+    static IOReturn		DetachUserClientsAction(	OSObject *owner,
+                                                    void *arg1,
+                                                    void *arg2,
+                                                    void *arg3,
+                                                    void *arg4 );
+
+    virtual void		DetachUserClients();
+	
+    static IOReturn		setPropertiesAction( OSObject	*owner, 
+                                             void		*arg1, 
+                                             void		*arg2, 
+                                             void		*arg3, 
+                                             void		*arg4 );
+                                            
+    virtual IOReturn	setPropertiesWL( OSObject * properties );
+
+    static IOReturn		AddPacketLogUserClientAction(	OSObject *owner, 
+                                                        void *arg1, 
+                                                        void *arg2, 
+                                                        void *arg3, 
+                                                        void *arg4 );
+
+    virtual IOReturn	AddPacketLogUserClient( IOBluetoothHCIPacketLogUserClient *newPacketLogUserClient );
+	
+	virtual bool		PacketLogFillBufferedData();
+	
+    virtual void		PacketLogClientClosed( IOBluetoothHCIPacketLogUserClient *packetLogClient );
+	
+    virtual void		LogPacket( UInt8 packetType, void *packetData, size_t packetSize );
+
+	static IOReturn		LogPacketAction( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4 );
+
+	virtual	void		DesyncIncomingData( IOBluetoothIncomingDataAction action, UInt8 *inDataPtr, UInt32 inDataSize );
+    
+	static	void		DesyncIncomingDataAction( IOBluetoothHCIController *hciController, IOBluetoothIncomingDataAction action, void *inDataPtr, UInt32 inDataSize, UInt32 sequenceNumber );
+	
+    virtual void		SynchronizePacketSequence( UInt32 sequenceNumber );
+    
+    virtual IOReturn	AddDevice( IOBluetoothDevice *inDevice );
+    
+    virtual IOReturn	RemoveDevice( IOBluetoothDevice *inDevice );
+    
+    virtual IOReturn	CreateDeviceFromConnectionResults( BluetoothHCIEventConnectionCompleteResults *connectionResults );
+    
+    virtual IOReturn	DestroyDeviceWithDisconnectionResults( BluetoothHCIEventDisconnectionCompleteResults *disconnectionResults );
+    
+    virtual IOReturn	DestroyDevice( IOBluetoothDevice *inDevice );
+    
+    virtual IOReturn	DestroyAllDevices();
+
+    virtual void		FlushDeviceACLPackets( IOBluetoothDevice *inDevice );
+    
+    virtual void		DecrementOutstandingACLPackets( UInt16 delta );
+    
+    virtual void		ProcessFlushOccurredEvent( BluetoothHCIEventFlushOccurredResults *inFlushResults );
+    
+    virtual void		ProcessNumCompletedPacketsEvent( UInt8 *inDataPtr );
+    
+    virtual void		ProcessHCIControllerResetEvent();
+    
+    virtual IOReturn	DispatchIncomingACLData( UInt8 *inDataPtr, UInt32 inDataSize );
+
+	// Common methods for L2CAP and RFCOMM channel managment:
+	virtual void		MergeChannelDescription(OSDictionary *destination , OSDictionary *source);
+	virtual void		RemoveChannelRestrictions(OSDictionary *toChange , OSDictionary *removeRule, const char *key);
+	virtual Boolean		IsAllowedDevice(OSDictionary *description , IOBluetoothDevice *device);
+	virtual void		RemoveAllRules();
+
+	// L2CAP channel managment methods:
+    virtual void		RemoveAllowedIncomingL2CAPChannel( OSObject *channelID );
+	virtual IOReturn 	AddAllowedIncomingL2CAPChannel( OSDictionary *channelDescription );
+	virtual OSDictionary *GetIncomingL2CAPChannelDescription( OSNumber *psmNumber );
+
+	// L2CAP channel accessory methods:
+    virtual void		AddAllowedIncomingL2CAPChannel( BluetoothL2CAPPSM incomingPSM );
+    virtual void		AddAllowedIncomingL2CAPChannel( OSNumber *psmNumber );
+    virtual void 		RemoveAllowedIncomingL2CAPChannel( BluetoothL2CAPPSM incomingPSM );
+
+	// RFCOMM channel managment methods:
+	virtual OSDictionary *GetIncomingRFCOMMChannelDescription( OSNumber *channelIDNumber );
+	virtual IOReturn 	AddAllowedIncomingRFCOMMChannel( OSDictionary *channelDescription );
+    virtual void		RemoveAllowedIncomingRFCOMMChannel( OSObject *channelID );
+
+	// RFCOMM channel accessory methods:
+    virtual void		AddAllowedIncomingRFCOMMChannel( BluetoothRFCOMMChannelID incomingChannelID );
+    virtual void		AddAllowedIncomingRFCOMMChannel( OSNumber *channelIDNumber );
+    virtual void		AddSecureIncomingRFCOMMChannel( BluetoothRFCOMMChannelID incomingChannelID );
+    virtual void		AddSecureIncomingRFCOMMChannel( OSNumber *channelIDNumber );
+    virtual void 		RemoveAllowedIncomingRFCOMMChannel( BluetoothRFCOMMChannelID incomingChannelID );
+		
+	virtual IOReturn	TransferACLPacketToHW(IOMemoryDescriptor *memDescriptor,
+													SendDataContext *								contextPtr);
+	
+	// ACL Packet queue:
+	virtual IOReturn	EnqueuePacket(	IOMemoryDescriptor	*memDescriptor,
+										SendDataContext		*contextPtr,
+										IOBluetoothDevice	*inTargetDevice);
+										
+	virtual IOReturn	DequeuePacket();
+	
+	virtual IOReturn	RemoveAllPacketsBelongingTo(IOBluetoothDevice	*inTargetDevice);
+
+public:
+
+    // IOWorkLoop and IOCommandGate accessors
+    
+    virtual IOWorkLoop *getWorkLoop() const;
+    
+    virtual IOCommandGate *getCommandGate() const;
+    
+    virtual IOReturn setProperties( OSObject * properties );
+
+	// Subclasses must implement these for it to be a working transport
+	// in the Bluetooth Family world.
+	
+	virtual	IOReturn	SendHCIRequest(	UInt8 * 					buffer,
+										IOByteCount					bufferSize  );
+
+	static	IOReturn	SendACLCompletedAction ( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 );
+	
+	virtual	void		SendACLCompleted(	SendDataContext	*contextPtr);
+		
+	virtual	IOReturn	SendACLData(	IOMemoryDescriptor						*memDescriptor,
+										SendDataContext *						contextPtr  );
+
+	virtual	IOReturn	GetTransportInfo( BluetoothTransportInfo *	infoStruct );
+	
+	static	IOReturn	SendSCOCompletedAction ( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 );
+	
+	// Override to do something custom with the data. Otherwise, the registered data handler
+	// will get a peek at it.
+	
+    // The ProcessXXXData() functions are safe to be called from anywhere.
+    // They call ProcessXXXDataWL() on the workloop using ProcessXXXDataAction()
+    
+	virtual	void	 	ProcessEventData( UInt8 * inDataPtr, UInt32 inDataSize );
+		
+	virtual	void	 	ProcessACLData( UInt8 * data, UInt32 dataSize );
+	
+	virtual	void	 	ProcessSCOData( UInt8 * data, UInt32 dataSize, UInt32 inMissingData, AbsoluteTime inTimestamp, Boolean copyData );
+    
+	virtual	void	 	ProcessEventDataWL( UInt8 * inDataPtr, UInt32 inDataSize, UInt32 sequenceNumber );
+		
+	virtual	void	 	ProcessACLDataWL( UInt8 * data, UInt32 dataSize, UInt32 sequenceNumber );
+	
+	virtual	void	 	ProcessSCODataWL( UInt8 * data, UInt32 dataSize, UInt32 inMissingData, AbsoluteTime inTimestamp, Boolean copyData );
+    
+	static	IOReturn	ProcessEventDataAction( IOBluetoothHCIController *	hciController,
+												UInt8 *						incomingDataPtr,
+												UInt32						inDataSize,
+												UInt32						inSequenceNumber );
+		
+	static	IOReturn	ProcessACLDataAction(	IOBluetoothHCIController *	hciController,
+												UInt8 *						incomingDataPtr,
+												UInt32						inDataSize,
+												UInt32						inSequenceNumber );
+
+	// The following is only a "ghost" call and exists only to make the compiler happy, its implementation 
+	// does not do anything.
+	static	IOReturn	ProcessSCODataAction( IOBluetoothHCIController *	hciController,
+												UInt8 *						incomingDataPtr,
+												UInt32						inDataSize,
+												UInt32						inMissingData,
+												UInt32						inTimestampHi,
+												UInt32						inTimestampLo,
+												Boolean						inCopyData );
+												
+	static	IOReturn	ProcessSCODataActionAT( IOBluetoothHCIController *	hciController,
+												UInt8 *						incomingDataPtr,
+												UInt32						inDataSize,
+												UInt32						inMissingData,
+												AbsoluteTime*				inTimestamp,
+												Boolean						inCopyData );
+
+	// Data processing helpers.
+
+    virtual bool		GetCompleteCodeForCommand(	BluetoothHCICommandOpCode	inOpCode,
+                                                    BluetoothHCIEventCode		*outEventCode );
+                                                    
+	virtual	bool		GetOpCodeAndEventCode(	UInt8 * 						inDataPtr,
+												BluetoothHCICommandOpCode * 	outOpCode,
+												BluetoothHCIEventCode * 		eventCode,
+                                                BluetoothHCIEventStatus *		outStatus,
+                                                BluetoothDeviceAddress *		outDeviceAddress,
+                                                BluetoothConnectionHandle *		outConnectionHandle );
+									
+	virtual	IOReturn	FindConnectionCompleteType( BluetoothHCICommandOpCode *		outOpCode );
+													
+	virtual	IOReturn	HandleSpecialOpcodes( BluetoothHCICommandOpCode opCode );
+
+	// This is a hook for other interested parties to get HCI event notifications. When a user client is created,
+	// that mach_port_t will be passed on to us via these calls so that their port will get HCI events that aren't
+	// specifically tied to a requst object, but occur due to requests they make.
+	
+	virtual	IOReturn	AddHCIEventNotification( task_t inOwningTask, mach_port_t inPort, void * refCon );
+	
+	virtual	void		BroadcastEventNotification(	BluetoothHCIRequestID		inID,
+													BluetoothHCIEventCode		inEventCode,
+													IOReturn					eventStatus,
+													UInt8 *						inDataToSendPtr, 
+													IOByteCount 				inDataSize,
+                                                    BluetoothHCICommandOpCode	inOpCode );
+												
+	virtual void		BroadcastConfigStateChangeNotification(	IOBluetoothHCIControllerConfigState oldState,
+																IOBluetoothHCIControllerConfigState newState );
+																
+	virtual IOReturn	RemoveHCIEventNotification( task_t inOwningTask );
+
+	// This is a hook for other interested parties to get data from transports. They will register itself
+	// with these to receive the raw data from the transport, bypassing HCI code.
+	
+	virtual	IOReturn	AddDataClient(	HCIDataHandlerType		 			inType,
+										IOBluetoothHCIControllerDataHandler inProcPtr,
+										void * 								inContextPtr );
+										
+	virtual IOReturn	NotifyDataClients( HCIDataHandlerType inType, UInt8 * inDataPtr, UInt32 inDataSize );
+	
+	virtual IOReturn	RemoveDataClient( HCIDataHandlerType inType, IOBluetoothHCIControllerDataHandler inProcPtr );
+
+	// Request creation, deletion and other data processing stuff.
+
+	virtual	IOReturn 	HCIRequestCreate(	BluetoothHCIRequestID * 			outRequestID,
+											bool 								inDoAsyncNotify 	= TRUE,
+											UInt32 								inTimeout 			= 5,
+											BluetoothHCIRequestCallbackInfo * 	inCallbackInfo 		= NULL,
+											task_t								inTaskID			= 0,
+											UInt32								inControlFlags		= 0 );
+											
+	virtual	IOReturn	HCIRequestDelete( task_t inTask, BluetoothHCIRequestID inID );
+	
+	virtual	IOReturn 	LookupRequest( BluetoothHCIRequestID inID, IOBluetoothHCIRequest ** outRequestPtr );
+
+    virtual IOReturn	PrepareRequestForNewCommand(	BluetoothHCIRequestID			inID,
+                                                        const BluetoothDeviceAddress *	inDeviceAddress,
+                                                        BluetoothConnectionHandle		inConnectionHandle );
+                                                        
+	virtual	IOReturn	EnqueueRequest( IOBluetoothHCIRequest * inRequestPtr );
+
+	virtual	IOReturn	FindQueuedRequest(	BluetoothHCICommandOpCode	opCode,
+                                            BluetoothDeviceAddress *	inDeviceAddress,
+                                            BluetoothConnectionHandle	inConnectionHandle,
+                                            Boolean						inUseAttributes,
+                                            IOBluetoothHCIRequest **	outRequestPtr );
+
+	virtual	IOReturn	DequeueRequest( IOBluetoothHCIRequest * inRequestPtr );
+
+	virtual	IOReturn 	EnqueueWaitRequest( IOBluetoothHCIRequest * inRequestPtr );
+
+	virtual	IOReturn	FindQueuedWaitRequest( BluetoothHCICommandOpCode opCode, IOBluetoothHCIRequest ** outRequestPtr );
+
+	virtual IOReturn	DequeueWaitRequest( IOBluetoothHCIRequest * inRequestPtr );
+
+	virtual	IOReturn	AbortRequest( IOBluetoothHCIRequest * inRequestPtr );
+
+	virtual	IOReturn	FindNextExpiringRequest( BluetoothHCICommandOpCode opCode, IOBluetoothHCIRequest ** outRequestPtr );
+	
+	virtual	IOReturn	ProcessWaitingRequests();
+	
+	inline	IOBluetoothHCIRequest*	GetNextWaitRequest() { return( mWaitQueueHead ); }
+
+	inline	IOBluetoothHCIRequest*	GetNextBusyRequest() { return( mBusyQueueHead ); }
+			
+	virtual	void		TakeAHexDump( const void *inData, UInt32 inDataSize );
+			
+	virtual	IOReturn	DumpStats();
+        
+	virtual IOBluetoothHCIControllerPowerOptions		GetControllerPowerOptions();
+	virtual IOBluetoothHCIControllerInternalPowerState	GetControllerPowerState();
+	virtual IOReturn	WaitForControllerPowerState( IOBluetoothHCIControllerInternalPowerState powerState );
+	
+	virtual IOReturn	RequestPowerStateChange( IOBluetoothHCIControllerInternalPowerState newPowerState );
+
+	virtual IOReturn	SendHCIRequestFormatted( BluetoothHCIRequestID		inID, 
+												 BluetoothHCICommandOpCode 	inOpCode,
+												 IOByteCount				outResultsSize, 
+												 void *						outResultsPtr,
+												 const char *				inFormat, 
+												 ... );
+
+	static	void		RequestExpired( OSObject *owner, IOTimerEventSource *sender );
+
+	// Misc stuff.
+	
+			IOReturn	DisposeRequestsForTaskID( task_t inTaskID );
+	
+			IOReturn	KillAllPendingRequests( Boolean destroy, Boolean includeIdleRequests );
+                        void	SendingRequest( IOBluetoothHCIRequest *requestPtr );
+                        void	DecrementActiveConnections(  );
+
+	virtual	void	ActiveConnectionsInProgress( );
+	virtual	void	AllConnectionsGone( );
+			
+	virtual IOReturn	SendRawHCICommand(	BluetoothHCIRequestID	inID,
+											char * 		 			buffer,
+											UInt32					bufferSize );
+	
+	// Vendor Specific stuff.
+
+	virtual	IOReturn	VendorCommand(	BluetoothHCIRequestID	 			inID, 
+										BluetoothHCIVendorCommandSelector	inSelector,
+										UInt8 *								inCommandData,
+										IOByteCount							inCommandDataSize,
+										IOByteCount 						outBufferSize,
+										UInt8 * 							outBuffer );
+
+	// IOBluetoothDevice object management
+    
+    virtual IOBluetoothDevice *	FindDeviceWithHandle( BluetoothConnectionHandle inConnectionHandle );
+    
+    virtual IOBluetoothDevice * FindDeviceWithAddress( const BluetoothDeviceAddress *inDeviceAddress );
+
+    virtual IOReturn	SendACLPacket(	IOBluetoothACLMemoryDescriptor				*memDescriptor,
+                                        SendDataContext *								contextPtr,
+                                        IOBluetoothDevice *						inTargetDevice = NULL );
+                                        
+
+    // API for the serial manager to open a new connection
+
+    virtual IOBluetoothDevice *OpenDeviceConnection( const BluetoothDeviceAddress *inDeviceAddress );
+
+    static IOReturn OpenDeviceConnectionAction(	OSObject	*owner,
+                                                void 		*arg1,
+                                                void		*arg2,
+                                                void		*arg3,
+                                                void		*arg4 );
+                                                
+    virtual IOBluetoothDevice *OpenDeviceConnectionWL( const BluetoothDeviceAddress *inDeviceAddress );
+
+    // API to track the secure state of RFCOMM channels
+    virtual Boolean IsSecureIncomingRFCOMMChannel( BluetoothRFCOMMChannelID incomingChannelID );
+    virtual Boolean IsSecureIncomingRFCOMMChannel( OSNumber *channelIDNumber );
+        
+	// API to track allowed incoming L2CAP and RFCOMM channels given a device:
+	virtual Boolean IsAllowedIncomingL2CAPChannelForDevice( BluetoothL2CAPPSM incomingPSM, IOBluetoothDevice *device );
+	virtual Boolean IsAllowedIncomingRFCOMMChannelForDevice( BluetoothRFCOMMChannelID incomingChannelID, IOBluetoothDevice *device );
+
+	// Enabled state for RFCOMM channels:
+	virtual void SetEnabledIncomingRFCOMMChannel( OSNumber *channelIDNumber, bool ShouldBeEnabled);
+	virtual void SetEnabledIncomingRFCOMMChannel( BluetoothRFCOMMChannelID incomingChannelID, bool ShouldBeEnabled);
+
+    virtual Boolean ShouldRunInactivityTimer(); // NOT USED: See StartIdleTimer
+    virtual void	SetRunInactivityTimer( Boolean shouldRun ); // NOT USED: See StopIdleTimer
+
+	//============================
+
+	// From here on out, we implement each of the commands in the HCI spec. You can work around
+	// hardware bugs by overriding any of these functions if necessary.
+	
+	
+	// Link Control Commands.
+																				
+	virtual IOReturn	BluetoothHCIInquiry(	BluetoothHCIRequestID	 		inID, 
+												BluetoothLAP					inLAP, 
+												BluetoothHCIInquiryLength		inInquiryLength, 
+												BluetoothHCIResponseCount		inMaxResponseCount, 
+												BluetoothHCIInquiryResults *	outResults );
+
+	virtual IOReturn	BluetoothHCIInquiryCancel( BluetoothHCIRequestID		 inID );
+
+	virtual IOReturn	BluetoothHCIPeriodicInquiryMode(	BluetoothHCIRequestID	 	inID, 
+															BluetoothHCIInquiryLength	inMaxPeriodLength, 
+															BluetoothHCIInquiryLength	inMinPeriodLength, 
+															BluetoothLAP				inLAP, 
+															BluetoothHCIInquiryLength	inInquiryLength, 
+															BluetoothHCIResponseCount	inMaxResponses,
+                                                            BluetoothHCIInquiryResults *	outResults );
+
+	virtual IOReturn	BluetoothHCIExitPeriodicInquiryMode( BluetoothHCIRequestID	inID );
+
+	virtual IOReturn	BluetoothHCICreateConnection(	BluetoothHCIRequestID						inID, 
+														const BluetoothDeviceAddress *				inAddressPtr, 
+														BluetoothPacketType							inPacketType, 
+														BluetoothPageScanRepetitionMode				inPageScanRepetitionMode, 
+														BluetoothPageScanMode						inPageScanMode, 
+														BluetoothClockOffset						inClockOffset, 
+														BluetoothAllowRoleSwitch					inAllowRoleSwitch, 
+														BluetoothHCIEventConnectionCompleteResults *outConnectionHandle );
+
+	virtual IOReturn	BluetoothHCIDisconnect( BluetoothHCIRequestID			inID, 
+												BluetoothConnectionHandle	 	inConnectionHandle, 
+												BluetoothReasonCode				inReason,
+                                                BluetoothHCIEventDisconnectionCompleteResults *	outResults );
+
+	virtual IOReturn	BluetoothHCIAddSCOConnection(	BluetoothHCIRequestID		inID, 
+														BluetoothConnectionHandle	inACLConnectionHandle, 
+														BluetoothPacketType 		inPacketType );
+
+	virtual IOReturn	BluetoothHCIAcceptConnectionRequest(	BluetoothHCIRequestID				inID, 
+																const BluetoothDeviceAddress *		inAddressPtr, 
+																BluetoothRole						inRole );
+
+	virtual IOReturn	BluetoothHCIRejectConnectionRequest(	BluetoothHCIRequestID			inID, 
+																const BluetoothDeviceAddress *	inAddressPtr, 
+																BluetoothReasonCode				inReason );
+
+	virtual IOReturn	BluetoothHCILinkKeyRequestReply(	BluetoothHCIRequestID			inID, 
+															const BluetoothDeviceAddress *	inAddressPtr, 
+															const BluetoothKey *			inKeyPtr,
+															BluetoothDeviceAddress *		outAddress );
+
+	virtual IOReturn	BluetoothHCILinkKeyRequestNegativeReply( 	BluetoothHCIRequestID			inID, 
+																	const BluetoothDeviceAddress *	inAddressPtr,
+																	BluetoothDeviceAddress *		outAddress );
+
+	virtual IOReturn	BluetoothHCIPINCodeRequestReply(	BluetoothHCIRequestID				inID, 
+															const BluetoothDeviceAddress *		inAddressPtr, 
+															IOByteCount							inPINCodeSize, 
+															const BluetoothPINCode *			inPINCode,
+															BluetoothDeviceAddress *		outAddress );
+
+	virtual IOReturn	BluetoothHCIPINCodeRequestNegativeReply(	BluetoothHCIRequestID			inID, 
+																	const BluetoothDeviceAddress *	inAddressPtr,
+																	BluetoothDeviceAddress *		outAddress );
+
+	virtual IOReturn	BluetoothHCIChangeConnectionPacketType( BluetoothHCIRequestID		inID, 
+																BluetoothConnectionHandle	inConnectionHandle, 
+																BluetoothPacketType			inPacketType );
+
+	virtual IOReturn	BluetoothHCIAuthenticationRequested(	BluetoothHCIRequestID		inID, 
+																BluetoothConnectionHandle	inConnectionHandle );
+
+	virtual IOReturn	BluetoothHCISetEncryptionEnable(	BluetoothHCIRequestID		inID, 
+															BluetoothConnectionHandle	inConnectionHandle, 
+															BluetoothEncryptionEnable	inEncryptionEnable );
+
+	virtual IOReturn	BluetoothHCIChangeConnectionLinkKey(	BluetoothHCIRequestID		inID, 
+																BluetoothConnectionHandle	inConnectionHandle );
+
+	virtual IOReturn	BluetoothHCIMasterLinkKey(	BluetoothHCIRequestID	inID, 
+													BluetoothKeyFlag		inKeyFlag );
+
+	virtual IOReturn	BluetoothHCIRemoteNameRequest(	BluetoothHCIRequestID						inID, 
+														const BluetoothDeviceAddress *				inAddressPtr, 
+														BluetoothPageScanRepetitionMode 			inPageScanRepetitionMode, 
+														BluetoothPageScanMode						inPageScanMode, 
+														BluetoothClockOffset						inClockOffset,
+														BluetoothHCIEventRemoteNameRequestResults *	outName );
+
+	virtual IOReturn	BluetoothHCIReadRemoteSupportedFeatures(	BluetoothHCIRequestID			inID, 
+																	BluetoothConnectionHandle		inConnectionHandle,
+																	BluetoothHCIEventReadRemoteSupportedFeaturesResults *	outFeatures );
+
+	virtual IOReturn	BluetoothHCIReadRemoteVersionInformation(	BluetoothHCIRequestID		inID, 
+																	BluetoothConnectionHandle	inConnectionHandle, 
+																	BluetoothHCIEventReadRemoteVersionInfoResults *	outVersionInfo );
+
+	virtual IOReturn	BluetoothHCIReadClockOffset(	BluetoothHCIRequestID		inID, 
+														BluetoothConnectionHandle	inConnectionHandle,
+														BluetoothClockOffset *		outClockOffset );
+
+	// Link Policy commands.
+	
+	virtual	IOReturn	BluetoothHCIHoldMode(	BluetoothHCIRequestID	 		inID,
+												BluetoothConnectionHandle		inConnectionHandle,
+												BluetoothHCIModeInterval		inHoldModeMaxInterval,
+												BluetoothHCIModeInterval		inHoldModeMinInterval );
+												
+	virtual	IOReturn	BluetoothHCISniffMode(	BluetoothHCIRequestID	 		inID,
+												BluetoothConnectionHandle		inConnectionHandle,
+												BluetoothHCIModeInterval		inSniffModeMaxInterval,
+												BluetoothHCIModeInterval		inSniffModeMinInterval,
+												BluetoothHCISniffAttemptCount	inSniffAttemptCount,
+												BluetoothHCISniffTimeout		inSniffModeTimeout );
+												
+	virtual	IOReturn	BluetoothHCIExitSniffMode(	BluetoothHCIRequestID	 	inID,
+													BluetoothConnectionHandle	inConnectionHandle );
+
+	virtual	IOReturn	BluetoothHCIParkMode(	BluetoothHCIRequestID	 			inID,
+												BluetoothConnectionHandle			inConnectionHandle,
+												BluetoothHCIParkModeBeaconInterval	inMaxInterval,
+												BluetoothHCIParkModeBeaconInterval	inMinInterval );
+												
+	virtual	IOReturn	BluetoothHCIExitParkMode(	BluetoothHCIRequestID	 		inID,
+													BluetoothConnectionHandle		inConnectionHandle );
+													
+	virtual	IOReturn	BluetoothHCIQualityOfServiceSetup(	BluetoothHCIRequestID	 					inID,
+															BluetoothConnectionHandle					inConnectionHandle,
+															BluetoothHCIQualityOfServiceSetupParams * 	inSetupPtr );
+		
+	virtual	IOReturn	BluetoothHCIRoleDiscovery(	BluetoothHCIRequestID			inID, 
+													BluetoothConnectionHandle		inConnectionHandle,
+													BluetoothHCIRoleInfo  *			outRoleInfo );
+																
+	virtual	IOReturn	BluetoothHCISwitchRole(	BluetoothHCIRequestID		inID, 
+												BluetoothDeviceAddress * 	inAddressPtr,
+												BluetoothHCIRole			inNewRole );
+																							
+	virtual	IOReturn	BluetoothHCIReadLinkPolicySettings(	BluetoothHCIRequestID					inID, 
+															BluetoothConnectionHandle				inConnectionHandle,
+															BluetoothHCILinkPolicySettingsInfo  *	outSettingsInfo );
+															
+	virtual	IOReturn	BluetoothHCIWriteLinkPolicySettings(	BluetoothHCIRequestID				inID,
+																BluetoothConnectionHandle			inConnectionHandle,
+																BluetoothHCILinkPolicySettings		inSettings,
+																BluetoothConnectionHandle *			outConnectionHandle );
+																																					
+	// Host controller and baseband commands.
+
+	virtual	IOReturn	BluetoothHCISetEventMask(	BluetoothHCIRequestID	inID,
+													BluetoothSetEventMask *	inMask );
+											
+	virtual	IOReturn	BluetoothHCIReset( BluetoothHCIRequestID	inID );
+
+	virtual	IOReturn	BluetoothHCISetEventFilter( BluetoothHCIRequestID	inID );
+
+	virtual	IOReturn	BluetoothHCIFlush(	BluetoothHCIRequestID	 	inID,
+											BluetoothConnectionHandle	inHandle );
+
+	virtual	IOReturn	BluetoothHCIReadPINType(	BluetoothHCIRequestID	inID,
+													BluetoothPINType *		outType );
+
+	virtual	IOReturn	BluetoothHCIWritePINType(	BluetoothHCIRequestID	inID,
+													BluetoothPINType		inType );
+
+	virtual	IOReturn	BluetoothHCICreateNewUnitKey( BluetoothHCIRequestID	inID );
+
+	virtual	IOReturn	BluetoothHCIReadStoredLinkKey(	BluetoothHCIRequestID					inID,
+														BluetoothDeviceAddress *				targetDevice,
+														BluetoothHCIReadStoredLinkKeysFlag * 	inFlags,
+														BluetoothHCIStoredLinkKeysInfo *		outKeysInfo );
+
+	virtual	IOReturn	BluetoothHCIWriteStoredLinkKey( BluetoothHCIRequestID				inID,
+														IOItemCount 						inNumKeysToWrite,
+														BluetoothDeviceAddress				inDeviceAddresses[],
+														BluetoothKey						inLinkKeys[],
+														BluetoothHCINumLinkKeysToWrite * 	outNumKeysWritten );
+
+	virtual	IOReturn	BluetoothHCIDeleteStoredLinkKey(	BluetoothHCIRequestID					inID,
+															BluetoothDeviceAddress	*				targetDevice,
+															BluetoothHCIDeleteStoredLinkKeyFlag *	inFlag,
+															BluetoothHCINumLinkKeysDeleted *		outNumDeleted );
+
+	virtual	IOReturn	BluetoothHCIReadLocalName(	BluetoothHCIRequestID	inID,
+													BluetoothDeviceName		name );
+
+	virtual	IOReturn	BluetoothHCIChangeLocalName( BluetoothHCIRequestID		inID,
+													 BluetoothDeviceName		newName );
+
+	virtual	IOReturn	BluetoothHCIReadConnectionAcceptTimeout( 	BluetoothHCIRequestID					inID,
+																	BluetoothHCIConnectionAcceptTimeout *	outTimeout );
+
+	virtual	IOReturn	BluetoothHCIWriteConnectionAcceptTimeout(	BluetoothHCIRequestID					inID,
+																	BluetoothHCIConnectionAcceptTimeout		inTimeout );
+
+	virtual	IOReturn	BluetoothHCIReadPageTimeout(	BluetoothHCIRequestID	 	inID,
+														BluetoothHCIPageTimeout * 	outDataPtr );
+
+	virtual	IOReturn	BluetoothHCIWritePageTimeout(	BluetoothHCIRequestID	 	inID,
+														BluetoothHCIPageTimeout 	inTimeout );
+
+	virtual	IOReturn	BluetoothHCIReadScanEnable( BluetoothHCIRequestID	 			inID,
+													BluetoothHCIPageScanEnableState *	outState );
+
+	virtual	IOReturn	BluetoothHCIWriteScanEnable( 	BluetoothHCIRequestID				inID,
+														BluetoothHCIPageScanEnableState		inState  );
+
+	virtual	IOReturn	BluetoothHCIReadPageScanActivity(	BluetoothHCIRequestID 		inID,
+															BluetoothHCIScanActivity *	outActivityInfo );
+
+	virtual	IOReturn	BluetoothHCIWritePageScanActivity(	BluetoothHCIRequestID	 	inID,
+															BluetoothHCIScanActivity *	inActivityInfo );
+
+	virtual	IOReturn	BluetoothHCIReadInquiryScanActivity(	BluetoothHCIRequestID 		inID,
+																BluetoothHCIScanActivity *	outActivityInfo );
+
+	virtual	IOReturn	BluetoothHCIWriteInquiryScanActivity(	BluetoothHCIRequestID	 	inID,
+																BluetoothHCIScanActivity *	inActivityInfo );
+
+	virtual	IOReturn	BluetoothHCIReadAuthenticationEnable(	BluetoothHCIRequestID	 			inID,
+																BluetoothHCIAuthenticationEnable *	outAuthenticationState );
+	
+	virtual	IOReturn	BluetoothHCIWriteAuthenticationEnable(	BluetoothHCIRequestID	 			inID,
+																BluetoothHCIAuthenticationEnable	inAuthenticationState );
+																
+	virtual	IOReturn	BluetoothHCIReadEncryptionMode(	BluetoothHCIRequestID	 		inID,
+														BluetoothHCIEncryptionMode *	outEncryptionState );
+
+	virtual	IOReturn	BluetoothHCIWriteEncryptionMode(	BluetoothHCIRequestID		 	inID,
+															BluetoothHCIEncryptionMode		inEncryptionMode );
+
+	virtual	IOReturn	BluetoothHCIReadClassOfDevice(	BluetoothHCIRequestID		inID,
+														BluetoothClassOfDevice *	outClassOfDevice );
+																	
+	virtual	IOReturn	BluetoothHCIWriteClassOfDevice(	BluetoothHCIRequestID		inID,
+														BluetoothClassOfDevice		inClassOfDevice );
+																	
+	virtual	IOReturn	BluetoothHCIReadVoiceSetting(	BluetoothHCIRequestID	 	inID,
+														BluetoothHCIVoiceSetting *	outVoiceSetting );
+
+	virtual	IOReturn	BluetoothHCIWriteVoiceSetting(	BluetoothHCIRequestID		inID,
+														BluetoothHCIVoiceSetting	inVoiceSetting );
+
+	virtual	IOReturn	BluetoothHCIReadAutomaticFlushTimeout(	BluetoothHCIRequestID	 				inID,
+																BluetoothConnectionHandle				inConnectionHandle,
+																BluetoothHCIAutomaticFlushTimeoutInfo *	outAutomaticFlushTimeoutInfo );
+
+
+	virtual	IOReturn	BluetoothHCIWriteAutomaticFlushTimeout(	BluetoothHCIRequestID					inID,
+																BluetoothHCIAutomaticFlushTimeoutInfo *	inAutomaticFlushTimeoutInfo,
+																BluetoothConnectionHandle *				outConnectionHandle );
+
+	virtual	IOReturn	BluetoothHCIReadNumBroadcastRetransmissions(	BluetoothHCIRequestID	 					inID,
+																		BluetoothHCINumBroadcastRetransmissions *	outNumRetrans );
+																				
+	virtual	IOReturn	BluetoothHCIWriteNumBroadcastRetransmissions(	BluetoothHCIRequestID					inID,
+																		BluetoothHCINumBroadcastRetransmissions	inNumRetrans );
+																				
+	virtual	IOReturn	BluetoothHCIReadHoldModeActivity(	BluetoothHCIRequestID	 		inID,
+															BluetoothHCIHoldModeActivity *	outState );
+																	
+	virtual	IOReturn	BluetoothHCIWriteHoldModeActivity(	BluetoothHCIRequestID			inID,
+															BluetoothHCIHoldModeActivity	inState );
+
+	virtual	IOReturn	BluetoothHCIReadTransmitPowerLevel(	BluetoothHCIRequestID	 				inID,
+															BluetoothConnectionHandle				inHandle,
+															BluetoothHCITransmitPowerLevelType		inType,
+															BluetoothHCITransmitPowerLevelInfo *	outLevelInfo );
+
+	virtual	IOReturn	BluetoothHCIReadSCOFlowControlEnable(	BluetoothHCIRequestID	 		inID,
+																BluetoothHCIFlowControlState *	outState );
+																		
+	virtual	IOReturn	BluetoothHCIWriteSCOFlowControlEnable(	BluetoothHCIRequestID			inID,
+																BluetoothHCIFlowControlState	inState );
+
+	virtual	IOReturn	BluetoothHCISetHostControllerToHostFlowControl(	BluetoothHCIRequestID			inID,
+																		BluetoothHCIFlowControlState	inState );
+
+	virtual	IOReturn	BluetoothHCIHostBufferSize(	BluetoothHCIRequestID	 	inID,
+													BluetoothHCIBufferSize * 	inSize );
+
+	virtual	IOReturn	BluetoothHCIHostNumberOfCompletePackets( BluetoothHCIRequestID inID );
+
+	virtual	IOReturn	BluetoothHCIReadLinkSupervisionTimeout(	BluetoothHCIRequestID 					inID,
+																BluetoothConnectionHandle				inHandle,
+																BluetoothHCILinkSupervisionTimeout *	outInfo );
+																			
+	virtual	IOReturn	BluetoothHCIWriteLinkSupervisionTimeout(	BluetoothHCIRequestID 					inID,
+																	BluetoothHCILinkSupervisionTimeout *	inInfo,
+																	BluetoothConnectionHandle *				outHandle );
+
+	virtual	IOReturn	BluetoothHCIReadNumberOfSupportedIAC(	BluetoothHCIRequestID 		inID,
+																BluetoothHCISupportedIAC *	outNumSupported );
+																		
+	virtual	IOReturn	BluetoothHCIReadCurrentIACLAP(	BluetoothHCIRequestID inID );
+
+	virtual	IOReturn	BluetoothHCIWriteCurrentIACLAP(	BluetoothHCIRequestID inID );
+
+	virtual	IOReturn	BluetoothHCIReadPageScanPeriodMode(	BluetoothHCIRequestID 				inID,
+															BluetoothHCIPageScanPeriodMode *	outMode );
+																		
+	virtual	IOReturn	BluetoothHCIWritePageScanPeriodMode(	BluetoothHCIRequestID 			inID,
+																BluetoothHCIPageScanPeriodMode	inMode );
+																		
+	virtual	IOReturn	BluetoothHCIReadPageScanMode(	BluetoothHCIRequestID 		inID,
+														BluetoothHCIPageScanMode *	outMode );
+																
+	virtual	IOReturn	BluetoothHCIWritePageScanMode(	BluetoothHCIRequestID 		inID,
+														BluetoothHCIPageScanMode	inMode );
+																	
+	// Informational commands.
+	
+	virtual	IOReturn	BluetoothHCIReadLocalVersionInformation( BluetoothHCIRequestID		inID,
+																 BluetoothHCIVersionInfo *	outVersionInfo );
+
+	virtual	IOReturn	BluetoothHCIReadLocalSupportedFeatures( BluetoothHCIRequestID				inID,
+																BluetoothHCISupportedFeatures	 *	outFeatures );
+	
+	virtual	IOReturn	BluetoothHCIReadBufferSize( BluetoothHCIRequestID	 	inID,
+													BluetoothHCIBufferSize * 	outSize );
+
+	virtual	IOReturn	BluetoothHCIReadCountryCode(	BluetoothHCIRequestID	 	inID,
+														BluetoothHCICountryCode * 	outCountryCode );
+
+	virtual	IOReturn	BluetoothHCIReadDeviceAddress(	BluetoothHCIRequestID	 	inID, 
+														BluetoothDeviceAddress *	outAddress );
+
+	// Status commands.
+	
+	virtual	IOReturn	BluetoothHCIReadFailedContactCounter(	BluetoothHCIRequestID	 			inID,
+																BluetoothConnectionHandle			inConnectionHandle,
+																BluetoothHCIFailedContactInfo *		outFailedContactCount );
+																
+	virtual	IOReturn	BluetoothHCIResetFailedContactCounter(	BluetoothHCIRequestID	 	inID,
+																BluetoothConnectionHandle	inConnectionHandle );
+																
+	virtual	IOReturn	BluetoothHCIGetLinkQuality(	BluetoothHCIRequestID	 		inID,
+													BluetoothConnectionHandle		inConnectionHandle,
+													BluetoothHCILinkQualityInfo *	outLinkQualityInfo );
+																
+	virtual	IOReturn	BluetoothHCIReadRSSI(	BluetoothHCIRequestID	 	inID,
+												BluetoothConnectionHandle	inConnectionHandle,
+												BluetoothHCIRSSIInfo *		outRSSIInfo );
+	
+	// Testing Commands.
+
+	virtual	IOReturn	BluetoothHCIReadLoopbackMode(	BluetoothHCIRequestID	 	inID,
+														BluetoothHCILoopbackMode *	inLoopbackMode );
+
+	virtual	IOReturn	BluetoothHCIWriteLoopbackMode(	BluetoothHCIRequestID		inID, 
+														BluetoothHCILoopbackMode	inLoopbackMode );
+
+	virtual	IOReturn	BluetoothHCIEnableDeviceUnderTestMode( BluetoothHCIRequestID	inID );
+	
+	virtual IOBluetoothHCIControllerFeatureFlags	GetControllerFeatureFlags();
+
+protected:
+
+	// Power managment functions:
+
+	virtual bool		configurePM(IOService *provider);
+
+	virtual	IOReturn	setPowerState( unsigned long powerStateOrdinal, IOService* whatDevice );
+	static	IOReturn	setPowerStateAction( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4 );
+	virtual	IOReturn	setPowerStateWL( unsigned long powerStateOrdinal, IOService* whatDevice );
+    
+	virtual void		UpdatePowerStateProperty( IOBluetoothHCIControllerInternalPowerState powerState );
+	
+	virtual void		SetControllerPowerOptions( IOBluetoothHCIControllerPowerOptions controllerPowerOptions );
+	virtual IOReturn	PerformPowerStateChange(	IOBluetoothHCIControllerInternalPowerState oldPowerState,
+													IOBluetoothHCIControllerInternalPowerState newPowerState,
+													UInt32 powerStateOptions,
+													UInt32 *microsecondsUntilComplete );
+	virtual void		CompletePowerStateChange();
+	
+	virtual void		SetControllerFeatureFlags( IOBluetoothHCIControllerFeatureFlags featureFlags );
+
+	virtual IOReturn	setAggressiveness( unsigned long type, unsigned long newLevel );
+
+	// Enablers for future Changes.
+
+    typedef struct ExpansionData 
+	{
+		void	*mUnsedPointer1, *mUnsedPointer2;
+
+		// Max number of HCI command allowed;
+		UInt8									mNumberOfCommandsAllowedByHardware;
+		UInt8									mNumConfiguredHIDDevices;
+		UInt8									mControllerSleepFlags;
+		
+		// This pointer is depreacted and free for future uses.
+		void*									mUnusedPointer;
+
+		// AFH support:
+		// the mask for the channels to use:
+		UInt8									mMaskByte[10];
+
+		// AirPort changes notifications:
+		IONotifier 								*windowServerNotifier;
+		IONotifier 								*mAirPortPCI;
+		Boolean									mProcessingConnectionRequest;
+		Boolean									mWaitingForCompletedACLPacketsToSleep;
+
+        // SCO Support
+		UInt8									mNumSCOConnections;
+		UInt8									*mSCOPacketBuffer;
+		UInt16									mNumBufferedSCOBytes;
+		AbsoluteTime							mBufferedSCOPacketTimestamp;
+		
+		// Repository for the packets when logging at boot
+		OSArray									*mRepositoryForBoot;
+		UInt16									mMaxNumberOfBootPackets;
+		
+		IOService								*mOverriddenControllerProvider;
+		
+		size_t									mHCIRequestListSize;
+		uint32_t								mNewRequestIndex;
+		
+		IOBluetoothInactivityTimerEventSource	*mIdleTimer;
+		Boolean									mSystemOnTheWayToSleep;
+
+		// New Airport notifications:
+		IONotifier 								*mIO80211Interface;
+
+		UInt32									mNextAvailableSCOSequenceNumber;
+		UInt32									mCurrentlyExecutingSCOSequenceNumber;
+		
+		Boolean									mNeedToCleanUpWaitForAckQueue;
+		Boolean									mResettingDevice;
+		
+		HearingDeviceListType 					*mConnectedHearingDeviceListHead;
+		HearingDeviceListType 					*mConnectedHearingDeviceListTail;
+
+	} ExpansionData;
+
+	ExpansionData*		mExpansionData;
+	
+#define	mConnectedHearingDeviceListTail			IOBluetoothHCIController::mExpansionData->mConnectedHearingDeviceListTail
+#define	mConnectedHearingDeviceListHead			IOBluetoothHCIController::mExpansionData->mConnectedHearingDeviceListHead
+#define	mResettingDevice						IOBluetoothHCIController::mExpansionData->mResettingDevice
+#define	mNeedToCleanUpWaitForAckQueue			IOBluetoothHCIController::mExpansionData->mNeedToCleanUpWaitForAckQueue
+#define mNextAvailableSCOSequenceNumber			IOBluetoothHCIController::mExpansionData->mNextAvailableSCOSequenceNumber
+#define mCurrentlyExecutingSCOSequenceNumber	IOBluetoothHCIController::mExpansionData->mCurrentlyExecutingSCOSequenceNumber
+
+#define mNumberOfCommandsAllowedByHardware		IOBluetoothHCIController::mExpansionData->mNumberOfCommandsAllowedByHardware
+#define	mNumConfiguredHIDDevices				IOBluetoothHCIController::mExpansionData->mNumConfiguredHIDDevices
+#define mControllerSleepFlags					IOBluetoothHCIController::mExpansionData->mControllerSleepFlags
+#define mSleepWakeNotifier						IOBluetoothHCIController::mExpansionData->mSleepWakeNotifier
+
+#define mMaskByte								IOBluetoothHCIController::mExpansionData->mMaskByte
+#define windowServerNotifier					IOBluetoothHCIController::mExpansionData->windowServerNotifier
+#define mAirPortPCI								IOBluetoothHCIController::mExpansionData->mAirPortPCI
+#define mProcessingConnectionRequest			IOBluetoothHCIController::mExpansionData->mProcessingConnectionRequest
+#define mWaitingForCompletedACLPacketsToSleep   IOBluetoothHCIController::mExpansionData->mWaitingForCompletedACLPacketsToSleep
+
+#define	mNumSCOConnections						IOBluetoothHCIController::mExpansionData->mNumSCOConnections
+#define mSCOPacketBuffer						IOBluetoothHCIController::mExpansionData->mSCOPacketBuffer
+#define mNumBufferedSCOBytes					IOBluetoothHCIController::mExpansionData->mNumBufferedSCOBytes
+#define mBufferedSCOPacketTimestamp				IOBluetoothHCIController::mExpansionData->mBufferedSCOPacketTimestamp
+#define mRepositoryForBoot						IOBluetoothHCIController::mExpansionData->mRepositoryForBoot
+#define mMaxNumberOfBootPackets					IOBluetoothHCIController::mExpansionData->mMaxNumberOfBootPackets
+#define mOverriddenControllerProvider			IOBluetoothHCIController::mExpansionData->mOverriddenControllerProvider
+#define mHCIRequestListSize						IOBluetoothHCIController::mExpansionData->mHCIRequestListSize
+#define mNewRequestIndex						IOBluetoothHCIController::mExpansionData->mNewRequestIndex
+#define mIdleTimer								IOBluetoothHCIController::mExpansionData->mIdleTimer
+#define mSystemOnTheWayToSleep					IOBluetoothHCIController::mExpansionData->mSystemOnTheWayToSleep
+#define mIO80211Interface						IOBluetoothHCIController::mExpansionData->mIO80211Interface
+
+	enum {
+		kIOBluetoothHCIControllerSleepFlagInquiryScanWasEnabled	= 0x01
+	};
+
+	
+private:
+
+	// Command Packet Queue:
+	virtual IOReturn	EnqueueRequestForController( IOBluetoothHCIRequest *requestPtr );	// Was OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  0 )
+	virtual IOReturn	DequeueAndSendRequests();											// Was OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  1 )
+	virtual IOReturn	RemoveAllRequestsFromQueue();										// Was OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  2 )
+
+	// New Device creation upon connection:
+	IOReturn CreateDeviceFromConnectionResults( BluetoothHCIEventConnectionCompleteResults *connectionResults, bool isInitiator);
+
+	// Expanded version of OpenDeviceConnection MUST BE CALLED IN THE WORKLOOP
+    virtual IOBluetoothDevice *OpenDeviceConnection( const BluetoothDeviceAddress *inDeviceAddress, BluetoothHCIPageTimeout pageTimeoutValue, bool  authenticationRequired);
+
+	// sleepWakeHandler DEPRECATED METHOD RETURNS kIOReturnUnsupported ALL THE TIME	!
+	static	IOReturn sleepWakeHandler( void *target, void *refCon, UInt32 messageType, IOService *service, void *messageArgument, vm_size_t argSize );
+	
+	static	IOReturn	restartShutdownAction( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4 );
+	static	IOReturn	systemSleepWakeAction( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4 );
+
+public:	
+	virtual	IOReturn 	restartShutdownWL( UInt32 messageType, void *reserved);
+	
+	// AFH support:
+	virtual	UInt8 *rangeForChannel(UInt16 channel);
+	virtual IOReturn handleAirPortChangesChannelWL(IOService *serviceForAirport);
+
+	// Version of stop in the workloop
+	virtual void stopWL( IOService * provider );
+        
+private:
+	static bool staticAirPortDriverNotification(void *us, void *unused, IOService * yourDevice);
+	static IOReturn handleAirPortChangesChannelAction( OSObject *owner, void *castMeToServiceForAirport, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 );
+
+	static bool windowServerDidAppear( void * target, void * refCon, IOService * newService, IONotifier * notifier );
+	static IOReturn windowServerDidAppearAction( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 );
+
+	// Expansion slots:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  0 );
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  1 );
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  2 );
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  3 );
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  4 );
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  5 );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  6 );
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  7 );
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  8 );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  9 );
+	virtual void SetNumSCOConnections( UInt8 numSCOConnections );
+	
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  10 );
+	virtual void UpdateSCOConnections( UInt8 numSCOConnections );
+	
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  11 );
+	virtual IOBluetoothDevice *FindDeviceWithSCOHandle( BluetoothConnectionHandle inConnectionHandle );
+	
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  12 );
+	virtual IOReturn SendSCOData(	IOMemoryDescriptor	*scoDataDescriptor,
+									SendDataContext		*scoDataContext );
+
+protected:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  13 );
+	virtual	void	SendSCOCompleted( SendDataContext *contextPtr, AbsoluteTime timestamp );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  14 );
+	virtual IOReturn DispatchIncomingSCOData( UInt8 *inDataPtr, UInt32 inDataSize, UInt32 inMissingData, AbsoluteTime inTimestamp );
+        
+        OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  15 );
+        virtual bool willTerminateWL( IOService * provider, IOOptionBits options );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  16 );
+	virtual bool shouldOverrideExistingController( IOBluetoothHCIController *controller );
+
+	static void idleTimerFired( OSObject *owner, IOTimerEventSource *timerEventSource );
+	
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  17 );
+	virtual void handleIdleTimeout();
+
+	static IOReturn terminateAction(	OSObject	*owner, 
+										void		*arg1, 
+										void		*arg2, 
+										void		*arg3, 
+										void		*arg4 );
+	
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  18 );
+	virtual IOReturn terminateWL( IOOptionBits options );
+
+	// Support for dynamic channel width
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  19 );
+	virtual	UInt8 *rangeForChannel(UInt16 channel, SInt16 width);
+
+public:
+
+	// v1.2 + v2.1 commands
+	
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  20 );
+	virtual	IOReturn	BluetoothHCIReadExtendedInquiryResponse(	BluetoothHCIRequestID								inID,
+																	BluetoothHCIReadExtendedInquiryResponseResults *	outData );
+
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  21 );
+	virtual	IOReturn	BluetoothHCIWriteExtendedInquiryResponse(	BluetoothHCIRequestID					inID,
+																	BluetoothHCIFECRequired					inFECRequired,
+																	BluetoothHCIExtendedInquiryResponse *	inData );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  22 );
+	virtual	IOReturn	BluetoothHCIReadInquiryMode(	BluetoothHCIRequestID		inID,
+														BluetoothHCIInquiryMode	*	outMode );
+
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  23 );
+	virtual	IOReturn	BluetoothHCIWriteInquiryMode(	BluetoothHCIRequestID		inID,
+														BluetoothHCIInquiryMode		inMode );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  24 );
+	virtual	IOReturn	BluetoothHCIReadSimplePairingMode(	BluetoothHCIRequestID				inID,
+															BluetoothHCISimplePairingMode	*	outMode );
+
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  25 );
+	virtual	IOReturn	BluetoothHCIWriteSimplePairingMode(	BluetoothHCIRequestID				inID,
+															BluetoothHCISimplePairingMode		inMode );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  26 );
+	virtual IOReturn	BluetoothHCIIOCapabilityRequestReply(	BluetoothHCIRequestID					inID, 
+																const BluetoothDeviceAddress *			inAddress,
+																BluetoothIOCapability					inIOCapability,
+																BluetoothOOBDataPresence				inOOBDataPresence,
+																BluetoothAuthenticationRequirements		inAuthenticationRequirements );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  27 );
+	virtual	IOReturn	BluetoothHCIReadLocalOOBData(	BluetoothHCIRequestID					inID,
+														BluetoothHCIReadLocalOOBDataResults *	outData	);
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  28 );
+	virtual	IOReturn	BluetoothHCIReadInquiryResponseTransmitPower(	BluetoothHCIRequestID				inID,
+																		BluetoothHCITransmitPowerLevel *	outData	);
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  29 );
+	virtual	IOReturn	BluetoothHCIWriteInquiryResponseTransmitPower(	BluetoothHCIRequestID				inID,
+																		BluetoothHCITransmitPowerLevel		inData );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  30 );
+	virtual	IOReturn	BluetoothHCIUserConfirmationRequestReply(	BluetoothHCIRequestID				inID,
+																	const BluetoothDeviceAddress *		inAddress );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  31 );
+	virtual	IOReturn	BluetoothHCIUserConfirmationRequestNegativeReply(	BluetoothHCIRequestID				inID,
+																			const BluetoothDeviceAddress *		inAddress );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  32 );
+	virtual	IOReturn	BluetoothHCIUserPasskeyRequestReply(	BluetoothHCIRequestID					inID,
+																const BluetoothDeviceAddress *			inAddress,
+																BluetoothPasskey						inPasskey);
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  33 );
+	virtual	IOReturn	BluetoothHCIUserPasskeyRequestNegativeReply(	BluetoothHCIRequestID					inID,
+																		const BluetoothDeviceAddress *			inAddress );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  34 );
+	virtual	IOReturn	BluetoothHCIRemoteOOBDataRequestReply(	BluetoothHCIRequestID				inID,
+																const BluetoothDeviceAddress *		inAddress,
+																BluetoothHCISimplePairingOOBData *	hash,
+																BluetoothHCISimplePairingOOBData *	randomizer );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  35 );
+	virtual	IOReturn	BluetoothHCIRemoteOOBDataRequestNegativeReply(	BluetoothHCIRequestID				inID,
+																		const BluetoothDeviceAddress *		inAddress );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  36 );
+	virtual	IOReturn	BluetoothHCIWriteSimplePairingDebugMode(	BluetoothHCIRequestID					inID,
+																	BluetoothSimplePairingDebugMode			inData	);
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  37 );
+	virtual	IOReturn	BluetoothHCISendKeypressNotification(	BluetoothHCIRequestID					inID,
+																const BluetoothDeviceAddress *			inAddress,
+																BluetoothKeypressNotificationType		inData	);
+
+protected:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  38 );
+	virtual	IOReturn	systemSleepWakeWL( UInt32 messageType, void *reserved);
+
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  39 );
+	virtual	IOReturn	BluetoothHCIReadLocalExtendedFeatures(	BluetoothHCIRequestID				inID,
+															  BluetoothHCIPageNumber				inPageNumber,
+															  BluetoothHCIExtendedFeaturesInfo *	outFeatures );
+	
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  40 );
+	virtual IOReturn	BluetoothHCIReadRemoteExtendedFeatures(	BluetoothHCIRequestID				inID, 
+																BluetoothConnectionHandle			inConnectionHandle,
+																BluetoothHCIPageNumber				inPageNumber,
+																BluetoothHCIEventReadRemoteExtendedFeaturesResults *	outFeatures  );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  41 );
+	virtual	IOReturn	BluetoothHCIReadAFHChannelAssessmentMode(	BluetoothHCIRequestID					inID,
+																	BluetoothHCIAFHChannelAssessmentMode *	outData );
+	
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  42 );
+	virtual IOReturn	BluetoothHCIWriteAFHChannelAssessmentMode(	BluetoothHCIRequestID						inID,
+																	BluetoothHCIAFHChannelAssessmentMode		inData  );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  43 );
+	virtual IOReturn	BluetoothHCISetAFHHostChannelClassification(	BluetoothHCIRequestID						inID,
+																		uint8_t	 *									inDataPtr,
+																		uint8_t										inDataLength );
+	
+private:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  44 );
+	virtual IOReturn	BluetoothHCIReadAFHChannelMap(	BluetoothHCIRequestID	 		inID,
+														BluetoothConnectionHandle		inConnectionHandle,
+														BluetoothAFHResults *			outData );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  45 );
+    virtual void		SynchronizeSCOPacketSequence( UInt32 sequenceNumber );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  46 );
+	virtual IOReturn	BluetoothHCICreateConnectionCancel(	BluetoothHCIRequestID				inID,
+															const BluetoothDeviceAddress *	inAddressPtr,
+															BluetoothDeviceAddress *		outAddress );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  47 );
+    virtual IOReturn	BluetoothHCIRemoteNameRequestCancel(	BluetoothHCIRequestID				inID,
+																const BluetoothDeviceAddress *	inAddressPtr,
+																BluetoothDeviceAddress *		outAddress );
+
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  48 );
+	void				StartIdleTimer( uint32_t milliseconds );
+	
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  49 );
+	void				StopIdleTimer();
+
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  50 );
+	virtual	IOReturn	setUnackQueueCompletionCalled(void * memoryDescriptor);
+
+protected:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  51 );
+	virtual IOReturn	RemovePacket(IOMemoryDescriptor	*memDescriptor);
+
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  52 );
+	IOReturn 			exitHIDSniff(bool	 exitSniff);
+	
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  53 );
+	virtual IOReturn	WaitForControllerPowerStateWithTimeout( IOBluetoothHCIControllerInternalPowerState	powerState,
+															    UInt32										waitTimeInMicroSecond);
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  54 );
+	void				SetHCIDriverExistsVariableTo( bool isLoaded );
+	
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  55 );
+	virtual	IOReturn	ToggleLMPLogging( );
+	
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  56 );
+	virtual	HearingDeviceListType * 	FindHearingDeviceWithAddress( const BluetoothDeviceAddress *inDeviceAddress );
+	
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  57 );
+	virtual	IOReturn	AddHearingDevice( IOBluetoothDevice *inDevice );
+	
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  58 );
+	virtual	IOReturn	RemoveHearingDevice( IOBluetoothDevice *inDevice, bool all );
+	
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  59 );
+	virtual	IOReturn	SetDevicePublishNotificationState( const BluetoothDeviceAddress *inDeviceAddress, DevicePublishNotificationStateType state );
+	
+public:
+	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  60 );
+	virtual	DevicePublishNotificationStateType *	GetDevicePublishNotificationState( const BluetoothDeviceAddress *inDeviceAddress );
+	
+private:
+	OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  61 );
+	OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  62 );
+	OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  63 );
+};
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothHCIRequest.h b/i386/include/IOKit/bluetooth/IOBluetoothHCIRequest.h
new file mode 100644
index 0000000..c9d970e
--- /dev/null
+++ b/i386/include/IOKit/bluetooth/IOBluetoothHCIRequest.h
@@ -0,0 +1,155 @@
+/*
+	File:		IOBluetoothHCIRequest.h
+	Contains:	Bluetooth Host Controller request object.
+	Copyright:	(c) 2001-2008 by Apple, all rights reserved.
+*/
+
+#pragma once
+
+#import <IOKit/IOService.h>
+#import <IOKit/system.h>
+
+#import <IOKit/bluetooth/Bluetooth.h>
+
+
+class IOCommandGate;
+class IOTimerEventSource;
+class IOBluetoothHCIController;
+
+// Forward declaration to avoid the need to include IOBluetoothHCIUserLibShared.h
+typedef struct	BluetoothHCINotificationMessage;
+
+//===========================================================================================================================
+// enums, macros, etc.
+//===========================================================================================================================
+
+enum
+{
+	kMaxHCIBufferLength	= 512
+};
+
+typedef UInt8	BluetoothHCIRequestState;
+enum BluetoothHCIRequestStates
+{
+	kHCIRequestStateIdle		= 0,		// Doing nothing - neither waiting nor busy. usually waiting for deletion.
+	kHCIRequestStateWaiting		= 1,		// On the wait queue - request has not been processed in any way.
+	kHCIRequestStateBusy		= 2,		// On the busy queue - request is sent and is currently processing
+};
+
+
+//===========================================================================================================================
+// IOBluetoothHCIRequest
+//===========================================================================================================================
+
+class IOBluetoothHCIRequest : public OSObject
+{
+    OSDeclareDefaultStructors( IOBluetoothHCIRequest )
+
+	UInt8								mPrivateResultsBuffer[kMaxHCIBufferLength*4];	// Just in case they didn't give a results ptr.
+	IOByteCount							mPrivateResultsSize;							// Result size.
+	BluetoothHCITransportID				mTransportID;									// Transport ID to use for this request.
+	UInt8								mState;											// Busy, waiting, idle.
+	bool								mAsyncNotify;
+	task_t								mOwningTaskID;
+	BluetoothHCIRequestCallbackInfo		mCallbackInfo;									// When this request is complete, call this.
+	BluetoothHCICommandOpCode			mOpCode;
+    BluetoothDeviceAddress				mDeviceAddress;
+    BluetoothConnectionHandle			mConnectionHandle;
+	BluetoothHCINotificationMessage *	mNotificationMessage;
+	IOByteCount							mNotificationMessageSize;
+		
+	
+public:
+
+	IOBluetoothHCIRequest *				mNextBusy;									// Points to next request element on busy queue.
+	IOBluetoothHCIRequest *				mNextWait;									// Points to next request element on wait queue.
+	IOBluetoothHCIRequest *				mNextAllocated;								// Points to next allocated request element.
+	IOBluetoothHCIRequest *				mPreviousAllocated;							// Points to next allocated request element.
+	BluetoothHCIRequestID				mID;										// For internal identification.
+	UInt8								mCommandBuffer[kMaxHCIBufferLength];		// Built-up HCI Command to send to the transport.
+	IOByteCount							mCommandBufferSize;							// Size of command buffer.
+	
+	UInt8 *								mResultsPtr;								// Result ptr, provided by object creator.
+	IOByteCount							mResultsSize;								// Result size.
+	
+	IOCommandGate *						mCommandGate;
+    IOTimerEventSource *				mTimer;	
+	IOBluetoothHCIController *			mHCIController;
+    IOReturn							mStatus;									// Success/failure code of request.
+	UInt32								mTimeout;									// Timeout for request to complete, in milliseconds.
+	UInt32								mControlFlags;
+	int									mPID;										// Creating Task
+	bool								mHCIRequestDeleteWasCalled;					// Fixed rdar://problem/7044168
+	
+	
+public:
+
+	bool							init( IOCommandGate *commandGate, IOBluetoothHCIController *hciController );
+	void							free();
+	
+	static IOBluetoothHCIRequest *	Create( IOCommandGate *commandGate, IOBluetoothHCIController *hciController, bool async = TRUE, UInt32 timeout = 5, UInt32 controlFlags = 0 );
+	static IOReturn					Dispose( IOBluetoothHCIRequest * inObject );
+
+	
+	// Called when a request is started on a transport, and completed.
+	
+	IOReturn					Start();
+	void						Complete();
+
+	// Accessors for object members.
+
+	void						SetState( BluetoothHCIRequestState inState );
+	BluetoothHCIRequestState	GetState() { return( mState ); }
+
+	void						SetHCIStatus( BluetoothHCIStatus inStatus ) { mStatus = inStatus; }
+	BluetoothHCIStatus			GetHCIStatus() { return( mStatus ); }
+
+	void						SetID( BluetoothHCIRequestID inID ) { mID = inID; }
+	BluetoothHCIRequestID		GetID() { return( mID ); }
+
+	void								SetCallbackInfo( BluetoothHCIRequestCallbackInfo * inInfo );
+	BluetoothHCIRequestCallbackInfo *	GetCallbackInfo() { return( &mCallbackInfo ); }
+	
+	void						SetOwningTaskID( task_t inTaskID ) { mOwningTaskID = inTaskID; }
+	task_t						GetOwningTaskID() { return( mOwningTaskID ); }
+	
+	void *						GetCommandBuffer();
+	
+	BluetoothHCICommandOpCode	GetCommandOpCode();
+	void						SetCommandOpCode( BluetoothHCICommandOpCode inOpCode ) { mOpCode = inOpCode; }
+    
+    BluetoothDeviceAddress *	GetDeviceAddress() { return &mDeviceAddress; }
+    void						SetDeviceAddress( const BluetoothDeviceAddress *inDeviceAddress ) { if ( inDeviceAddress != NULL ) memcpy( &mDeviceAddress, inDeviceAddress, sizeof( BluetoothDeviceAddress ) ); }
+    void						ClearDeviceAddress() { bzero( &mDeviceAddress, sizeof( BluetoothDeviceAddress ) ); }
+    Boolean						CompareDeviceAddress( const BluetoothDeviceAddress *inDeviceAddress );
+    
+    BluetoothConnectionHandle	GetConnectionHandle() { return mConnectionHandle; }
+    void						SetConnectionHandle( BluetoothConnectionHandle inConnectionHandle ) { mConnectionHandle = inConnectionHandle; }
+    void						ClearConnectionHandle() { mConnectionHandle = kBluetoothConnectionHandleNone; }
+	
+	void						SetTimeout( UInt32 inTimeout ) { mTimeout = inTimeout; }	// in milliseconds
+	UInt32						GetTimeout() { return( mTimeout ); }
+    
+	void						StartTimer();
+	
+    static void 				timerFired( OSObject *owner, IOTimerEventSource *sender );
+    void						handleTimeout();
+	
+	void						CopyDataIntoResultsPtr( UInt8 * inDataPtr, IOByteCount inSize );
+	void						SetParamPtrAndSize( UInt8 paramNumber, UInt8 * inParamPtr, IOByteCount inSize );
+	
+	void						SetResultsBufferPtrAndSize( UInt8 * resultsBuffer, IOByteCount inSize );
+	void						SetResultsDataSize( IOByteCount inCount );
+	UInt8 *						GetResultsBuffer();
+	IOByteCount					GetResultsBufferSize();
+	
+	mach_vm_address_t			GetNotificationRefCon() { return( mCallbackInfo.asyncIDRefCon ); }
+	
+	void						SetDoAsyncNotify( bool inAsyncNotify ) { mAsyncNotify = inAsyncNotify; }
+	Boolean						IsSynchronous() { return !mAsyncNotify; }
+	
+	void						SetControlFlags( UInt32 controlFlags ) { mControlFlags = controlFlags; }
+	UInt32						GetControlFlags() { return mControlFlags; }
+	
+	const char *				RequestDescription();
+};
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothHIDDriver.h b/i386/include/IOKit/bluetooth/IOBluetoothHIDDriver.h
new file mode 100644
index 0000000..b3bb449
--- /dev/null
+++ b/i386/include/IOKit/bluetooth/IOBluetoothHIDDriver.h
@@ -0,0 +1,230 @@
+/*
+	File:		IOBluetoothHIDDriver.h
+	Contains:	Driver for generic Bluetooth HID devices.
+	Copyright:	(c) 2001-2008 by Apple, all rights reserved.
+*/
+
+#ifndef IOBLUETOOTHHIDDRIVER_H
+#define IOBLUETOOTHHIDDRIVER_H
+
+#include <IOKit/hid/IOHIDDevice.h>
+#include <IOKit/bluetooth/Bluetooth.h>
+
+//===========================================================================================================================
+// Forwards
+//===========================================================================================================================
+
+class IOTimerEventSource;
+class IOWorkLoop;
+
+class IOBluetoothL2CAPChannel;
+class IOBluetoothDevice;
+class IOWorkQueue;
+
+//===========================================================================================================================
+// IOBluetoothHIDDriver
+//===========================================================================================================================
+
+class IOBluetoothHIDDriver : public IOHIDDevice
+{
+	OSDeclareDefaultStructors( IOBluetoothHIDDriver )
+
+    IOWorkLoop*					_workLoop;
+	IOCommandGate*				_commandGate;
+	
+	IOWorkQueue					*_desyncWorkQueue;
+	
+	IOBluetoothL2CAPChannel*	_controlChannel;
+    IOBluetoothL2CAPChannel*	_interruptChannel;
+
+    IOBluetoothDevice*			_device;
+
+	IOMemoryDescriptor*			_memDescriptor;
+	IOMemoryDescriptor*			_getReportDescriptor;
+	IONotifier*					_interruptOpenNotification;
+	IOTimerEventSource*			_timer;
+    IONotifier*					_sleepWakeNotifier;
+
+	bool						_deviceReady;
+
+	UInt8						_expectedReportID;
+	UInt8						_expectedReportType;
+	UInt8						_handshake;
+	
+	OSDictionary*				_deviceProperties;
+
+	UInt16						_vendorIDSource;
+	UInt16						_vendorID;
+	UInt16						_productID;
+	UInt16						_deviceVersion;
+	uint32_t					_classOfDevice;
+    UInt16                      _countryCode;
+	
+	BluetoothDeviceAddress		_deviceAddress;
+	char						_deviceAddressString[20];
+	
+	uint32_t					_outstandingIO;
+	bool						_sendOutstanding;
+	
+	// Debug / Behavior Modifiers
+	UInt8						_verboseLevel;
+	bool						_logPackets;
+	bool						_decodePackets;
+	bool						_logOutstandingIO;
+	bool						_suppressDisconnectNotifications;
+	bool						_suppressSetProtocol;
+	bool						_driverIsAwake;
+	bool						_reservedFlag4;
+	UInt8						_reservedByte;
+	
+    struct ExpansionData 
+    { 
+        OSArray*    _sendQueue;
+		
+		uint8_t		*interruptBuffer;
+		uint32_t	interruptBufferUsed;
+		
+		uint8_t		*controlBuffer;
+		uint32_t	controlBufferUsed;
+
+		uint8_t		deviceSupportsSuspend;
+
+		uint32_t	getReportTimeoutMS;
+		uint32_t	setReportTimeoutMS;
+		
+		uint32_t	outstandingMemoryBlockCount;
+		bool		waitingForMemoryBlockCount;
+    };
+    ExpansionData	*_expansionData;
+	
+public:
+	// Standard IOService Methods
+    virtual IOService*  probe( IOService * provider, SInt32 * score );
+	virtual bool		init( OSDictionary *properties );
+	virtual void		free();
+	virtual bool 		willTerminate( IOService * provider, IOOptionBits options );
+	
+	// Starting & Stopping
+    virtual bool		handleStart( IOService * provider );
+    virtual void		handleStop( IOService *  provider );
+	virtual void		deviceReady();
+	virtual void		closeDownServices();
+
+	// Power Management
+    virtual void		handleSleep();
+    virtual void		handleWake();
+    virtual void		handleShutdown();			// Does nothing
+    virtual void		handleRestart();			// Does nothing
+	
+	// HID Properties
+	virtual OSString*	newTransportString() const;
+	virtual OSString*	newManufacturerString() const;
+	virtual OSString*	newProductString() const;
+	virtual OSNumber*	newVendorIDSourceNumber() const;
+	virtual OSNumber*	newVendorIDNumber() const;
+	virtual OSNumber*	newProductIDNumber() const;
+	virtual OSNumber*	newVersionNumber() const;
+    virtual IOReturn	newReportDescriptor( IOMemoryDescriptor ** descriptor ) const;
+	virtual OSString*	newSerialNumberString() const;
+	virtual OSNumber*	newLocationIDNumber() const;
+    virtual OSNumber*	newCountryCodeNumber() const;
+	virtual OSNumber*	newReportIntervalNumber() const;
+
+	// Main UserLand Entry Points
+    virtual IOReturn	getReport( IOMemoryDescriptor* report, IOHIDReportType reportType, IOOptionBits options = 0 );
+    virtual IOReturn 	setReport( IOMemoryDescriptor* report, IOHIDReportType reportType, IOOptionBits options = 0 );
+    virtual IOReturn	setProperties( OSObject* properties );
+
+	// General IO
+	virtual IOReturn	sendData( IOBluetoothL2CAPChannel* theChannel, void* theData, IOByteCount theSize );
+    virtual void		processControlData( UInt8 *buffer, UInt16 length );
+    virtual void		processInterruptData( UInt8 *buffer, UInt16 length );
+	virtual IOReturn	waitForData( IOMemoryDescriptor* report, UInt8 btReportType, UInt8 reportID );
+	virtual IOReturn	waitForHandshake();
+	
+	// HID Transaction Methods
+	virtual IOReturn	hidControl( UInt8 controlOperation );
+	virtual int			getProtocol();
+	virtual IOReturn	setProtocol( UInt8 protocol );
+	virtual int			getIdle();
+	virtual IOReturn	setIdle( UInt8 idleRate );
+
+	// Device Introspection
+	virtual bool		isKeyboard();
+	virtual bool		isMouse();
+	
+	// Misc
+	virtual IOReturn	setPowerState( unsigned long powerStateOrdinal, IOService* whatDevice );
+	virtual IOReturn	createCommandGate( IOService* provider );
+	virtual IOReturn	getDeviceProperties( IOService* provider );
+	virtual	bool		readDeviceName();
+	
+	// Command Gate Actions
+	static	IOReturn	staticCloseDownServicesAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
+	static	IOReturn	staticSendToAction( OSObject* owner, void* theChannel, void* theData, void *theSize, void* );
+	static	IOReturn	staticPrepControlChannelAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
+	static	IOReturn	staticPrepInterruptChannelAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
+	static	IOReturn	staticGetReportAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
+	static	IOReturn	staticSetReportAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
+	static	IOReturn	staticProcessCommandAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
+	static	IOReturn	staticGetDevicePropertiesAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
+	static	IOReturn	staticInterruptChannelOpeningAction( OSObject* owner, void* newService, void* arg2, void* arg3, void* arg4 );
+	static	IOReturn	staticWillTerminateAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
+	
+	// Work Loop Methods
+	virtual void		closeDownServicesWL();
+	virtual IOReturn	prepInterruptChannelWL();
+	virtual IOReturn	getReportWL( IOMemoryDescriptor* report, IOHIDReportType reportType, IOOptionBits options );
+	virtual IOReturn	setReportWL( IOMemoryDescriptor* report, IOHIDReportType reportType, IOOptionBits options );
+	virtual IOReturn	processCommandWL( OSString* command, OSNumber* commandParameter );
+	virtual IOReturn	getDevicePropertiesWL( IOService* provider );
+	virtual IOReturn	interruptChannelOpeningWL( IOBluetoothL2CAPChannel* theChannel );
+
+	// Timeout Handler
+	static	void		timerFired( OSObject* owner, IOTimerEventSource* sender );
+	virtual void		handleTimeout();
+	
+	// IO Counting
+	virtual void		incrementOutstandingIO();
+	virtual void		decrementOutstandingIO();
+	
+private:
+	// Lazy Interrupt Channel Methods
+	static	bool		interruptChannelOpeningCallback(	void* me, void* ignoreMe, IOService* newService, IONotifier *notifier );
+    static	IOReturn 	powerStateHandler( void *target, void *refCon, UInt32 messageType, IOService *service, void *messageArgument, vm_size_t argSize );
+
+public:
+    OSMetaClassDeclareReservedUsed( IOBluetoothHIDDriver,  0 );
+    virtual void        	sendDeviceDisconnectNotifications( void );
+
+	OSMetaClassDeclareReservedUsed( IOBluetoothHIDDriver,  1 );
+	virtual IOReturn		setPowerStateWL( unsigned long powerStateOrdinal, IOService* whatDevice ); 
+    
+	OSMetaClassDeclareReservedUsed( IOBluetoothHIDDriver,  2 );
+    virtual void        	sendDeviceConnectNotifications( void );
+
+	OSMetaClassDeclareReservedUsed( IOBluetoothHIDDriver,  3 );
+    virtual void        	decrementOutstandingMemoryBlockCount( void );
+
+	OSMetaClassDeclareReservedUsed( IOBluetoothHIDDriver,  4 );
+    virtual IOReturn       	willTerminateWL( void );
+
+public:    
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver,  5 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver,  6 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver,  7 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver,  8 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver,  9 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 10 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 11 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 12 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 13 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 14 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 15 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 16 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 17 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 18 );
+    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 19 );
+};
+
+#endif	// IOBLUETOOTHHIDDRIVER_H
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothHIDDriverTypes.h b/i386/include/IOKit/bluetooth/IOBluetoothHIDDriverTypes.h
new file mode 100644
index 0000000..8d722aa
--- /dev/null
+++ b/i386/include/IOKit/bluetooth/IOBluetoothHIDDriverTypes.h
@@ -0,0 +1,61 @@
+/*
+	File:		IOBluetoothHIDDriverTypes.h
+	Contains:	Type defined for the IOBluetoothHIDDriver.h.
+	Copyright:	(c) 2001-2008 by Apple, all rights reserved.
+*/
+
+
+#ifndef IOBLUETOOTHHIDDRIVERTYPES_H
+#define IOBLUETOOTHHIDDRIVERTYPES_H
+
+// Vendor ID Sources
+//------------------
+#define kVendorIDSourceBluetoothSIG				0x1
+#define kVendorIDSourceUSBIF					0x2
+
+// Bluetooth HID Transaction Headers
+//----------------------------------
+#define IOBTHID_HANDSHAKE_HEADER				0x00
+#define IOBTHID_HID_CONTROL_HEADER				0x10
+#define IOBTHID_GET_REPORT_HEADER				0x40
+#define IOBTHID_SET_REPORT_HEADER				0x50
+#define IOBTHID_GET_PROTOCOL_HEADER				0x60
+#define IOBTHID_SET_PROTOCOL_HEADER				0x70
+#define IOBTHID_GET_IDLE_HEADER					0x80
+#define IOBTHID_SET_IDLE_HEADER					0x90
+#define IOBTHID_DATA_HEADER						0xA0
+#define IOBTHID_DATC_HEADER						0xB0
+
+// Handshake Types
+//----------------
+#define IOBTHID_HANDSHAKE_SUCCESSFUL			0x0
+#define IOBTHID_HANDSHAKE_NOT_READY				0x1
+#define IOBTHID_HANDSHAKE_INVALID_REPORT_ID		0x2
+#define IOBTHID_HANDSHAKE_UNSUPPORTED_REQUEST	0x3
+#define IOBTHID_HANDSHAKE_INVALID_PARAMETER		0x4
+#define IOBTHID_HANDSHAKE_ERR_UNKNOWN			0xE
+#define IOBTHID_HANDSHAKE_ERR_FATAL				0xF
+
+// HID_Control Types
+//------------------
+#define IOBTHID_CONTROL_NOP						0x0
+#define IOBTHID_CONTROL_HARD_RESET				0x1
+#define IOBTHID_CONTROL_SOFT_RESET				0x2
+#define IOBTHID_CONTROL_SUSPEND					0x3
+#define IOBTHID_CONTROL_EXIT_SUSPEND			0x4
+#define IOBTHID_CONTROL_VC_UNPLUG				0x5
+
+// Protocol Types
+//---------------
+#define IOBTHID_BOOT_PROTOCOL					0x0
+#define IOBTHID_REPORT_PROTOCOL					0x1
+
+// Report Types
+//-------------
+#define IOBTHID_RESERVED_REPORT					0x0
+#define IOBTHID_OTHER_REPORT					0x0
+#define IOBTHID_INPUT_REPORT					0x1
+#define IOBTHID_OUTPUT_REPORT					0x2
+#define IOBTHID_FEATURE_REPORT					0x3
+
+#endif // IOBLUETOOTHHIDDRIVERTYPES_H
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothInternal.h b/i386/include/IOKit/bluetooth/IOBluetoothInternal.h
new file mode 100644
index 0000000..ed40a76
--- /dev/null
+++ b/i386/include/IOKit/bluetooth/IOBluetoothInternal.h
@@ -0,0 +1,103 @@
+/*
+	File:		BluetoothInternal.h
+	Contains:	Internal types and macros needed by public kernel APIs.
+	Copyright:	2003-2007 by Apple, Inc. All rights reserved.
+*/
+
+#pragma once
+
+typedef enum IOBluetoothHCIControllerConfigState
+{
+	kIOBluetoothHCIControllerConfigStateOnline							= 0,	// Controller is configured and ready for clients
+	kIOBluetoothHCIControllerConfigStateKernelSetupPending				= 1,	// New controller - kernel setup in progress
+	kIOBluetoothHCIControllerConfigStateDaemonSetupPending				= 2,	// New controller - daemon setup in progress
+	kIOBluetoothHCIControllerConfigStateDaemonSetupComplete				= 3,	// New controller - daemon setup complete
+	kIOBluetoothHCIControllerConfigStateResetPending					= 4,	// HCI reset has been issued
+	kIOBluetoothHCIControllerConfigStateKernelPostResetSetupPending		= 5,	// HCI reset complete - kernel setup in progress
+	kIOBluetoothHCIControllerConfigStateDaemonPostResetSetupPending		= 6,	// HCI reset complete - daemon setup in progress
+	kIOBluetoothHCIControllerConfigStateDaemonPostResetSetupComplete	= 7,	// HCI reset complete - daemon setup complete
+	kIOBluetoothHCIControllerConfigStateUninitialized					= 8
+} IOBluetoothHCIControllerConfigState;
+
+typedef UInt32 IOBluetoothHCIControllerPowerOptions;
+enum
+{
+	kIOBluetoothHCIControllerPowerOptionPowerOffSupported					= 0x00000001,
+	kIOBluetoothHCIControllerPowerOptionWakeFromExistingConnectionSupported	= 0x00000002,
+	kIOBluetoothHCIControllerPowerOptionWakeFromNewConnectionSupported		= 0x00000004,
+	kIOBluetoothHCIControllerPowerOptionIdleWithConnectionSupported			= 0x00000008,	
+	kIOBluetoothHCIControllerPowerOptionIdleWhenInternalPower				= 0x00000010	
+};
+
+enum IOBluetoothHCIControllerSleepOptions
+{
+	kIOBluetoothHCIControllerAllowWakeFromExistingConnection				= 0x00000001,
+	kIOBluetoothHCIControllerAllowWakeFromNewConnection						= 0x00000002,
+	kIOBluetoothHCIControllerTemporaryOnFromIdle							= 0x00000004
+};
+
+#define HCI_CONTROLLER_POWER_OFF_SUPPORTED( _controllerPowerOptions )	( ( _controllerPowerOptions & kIOBluetoothHCIControllerPowerOptionPowerOffSupported ) == kIOBluetoothHCIControllerPowerOptionPowerOffSupported )
+#define HCI_CONTROLLER_SLEEP_SUPPORTED( _controllerPowerOptions )	\
+	( ( _controllerPowerOptions &	\
+		( kIOBluetoothHCIControllerPowerOptionWakeFromExistingConnectionSupported |	\
+		  kIOBluetoothHCIControllerPowerOptionWakeFromNewConnectionSupported ) ) != 0 )
+
+typedef enum IOBluetoothHCIControllerInternalPowerState
+{
+	kIOBluetoothHCIControllerInternalPowerStateOff		= 0,
+	kIOBluetoothHCIControllerInternalPowerStateOn		= 1,
+	kIOBluetoothHCIControllerInternalPowerStateSleep	= 2,
+	kIOBluetoothHCIControllerInternalPowerStateIdle		= 3
+} IOBluetoothHCIControllerInternalPowerState;
+
+enum IOBluetoothHCIControllerPowerStateOrdinal
+{
+	kIOBluetoothHCIControllerPowerStateOrdinalOff		= 0,
+	kIOBluetoothHCIControllerPowerStateOrdinalIdle		= 1,
+	kIOBluetoothHCIControllerPowerStateOrdinalOn		= 2
+};
+
+typedef UInt32 IOBluetoothHCIControllerFeatureFlags;
+
+enum
+{
+	kIOBluetoothHCIControllerFeatureFlagVendorCommandFlowControl	= 0x00000001,
+	kIOBluetoothHCIControllerFeatureFlagSCOSupported				= 0x00000002,
+	kIOBluetoothHCIControllerFeatureFlagSerializeCommands			= 0x10000000
+};
+
+//===========================================================================================================================
+//	Private_UnifiedInquiryResult
+//===========================================================================================================================
+
+typedef struct	IOBluetoothHCIUnifiedInquiryResult	IOBluetoothHCIUnifiedInquiryResult;
+struct	IOBluetoothHCIUnifiedInquiryResult
+{
+	BluetoothHCIInquiryResult			originalInquiryResult;
+
+	// event code will be either:
+	// kBluetoothHCIEventInquiryResult, kBluetoothHCIEventInquiryResultWithRSSI, or kBluetoothHCIEventExtendedInquiryResult
+
+	BluetoothHCIEventCode eventCode;
+
+	// kBluetoothHCIEventExtendedInquiryResult only
+
+	BluetoothHCIExtendedInquiryResponse	extendedInquiryResponse;
+
+	// kBluetoothHCIEventExtendedInquiryResult or kBluetoothHCIEventInquiryResultWithRSSI only
+
+	UInt8								reserved;
+	BluetoothHCIRSSIValue				RSSIValue;
+};
+
+#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0
+
+enum BluetoothHCIExtendedInquiryResponseDataTypesAppleSpecificInfo
+{
+	kBluetoothHCIExtendedInquiryResponseDataTypeAppleSpecificInfoReserved					=	0x00,
+	kBluetoothHCIExtendedInquiryResponseDataTypeAppleSpecificInfoModelIdentifier			=	0x01,	/* UTF8String char data */
+	kBluetoothHCIExtendedInquiryResponseDataTypeAppleSpecificInfoThirdPartyAdvertising		=	0x02,
+};
+
+#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0 */
+
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothTypes.h b/i386/include/IOKit/bluetooth/IOBluetoothTypes.h
new file mode 100644
index 0000000..07ee4c2
--- /dev/null
+++ b/i386/include/IOKit/bluetooth/IOBluetoothTypes.h
@@ -0,0 +1,23 @@
+/*
+	File:		IOBluetoothTypes.h
+	Contains:	Family provided types and defines - shared between user and kernel code.
+	Copyright:	© 2002-2007 by Apple Inc. All rights reserved.
+*/
+
+#pragma once
+
+#include <IOKit/IOReturn.h>
+
+// Error returns
+#ifndef sub_iokit_bluetooth
+#define sub_iokit_bluetooth				err_sub(8)
+#endif
+
+#define iokit_bluetooth_err(return)		(sys_iokit|sub_iokit_bluetooth|return)
+
+#define kIOBluetoothDeviceResetError			iokit_bluetooth_err(1)	// Device reset interrupted pending operation
+#define kIOBluetoothConnectionAlreadyExists		iokit_bluetooth_err(2)	// Attempting to open a connection that already exists
+#define kIOBluetoothNoHCIController				iokit_bluetooth_err(3)	// No HCI controller is present
+#define kIOBluetoothHCIPowerStatesNotSupported	iokit_bluetooth_err(4)	// HCI controller does not support changing power states
+
+
diff --git a/i386/include/IOKit/firewire/IOConfigDirectory.h b/i386/include/IOKit/firewire/IOConfigDirectory.h
new file mode 100644
index 0000000..d72ed21
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOConfigDirectory.h
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __IOCONFIGDIRECTORY_H__
+#define __IOCONFIGDIRECTORY_H__
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOReturn.h>
+
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+
+class OSData;
+class OSString;
+class OSIterator;
+class IOFireWireDevice;
+
+/*! @class IOConfigDirectory 
+*/
+class IOConfigDirectory : public OSObject
+{
+    OSDeclareAbstractStructors(IOConfigDirectory);
+
+protected:
+    int fStart;			// Offset into ROM of start of this dir
+    int fType;			// Directory type
+    int fNumEntries;		// In directory
+    
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+    virtual bool initWithOffset(int start, int type);
+
+    virtual const UInt32 *getBase() = 0;
+    virtual IOReturn createIterator(UInt32 testVal, UInt32 testMask,
+                                    OSIterator *&iterator);
+    virtual IOConfigDirectory *getSubDir(int start, int type) = 0;
+
+public:
+    /*!
+        @function update
+        makes sure that the ROM has at least the specified capacity,
+        and that the ROM is uptodate from its start to at least the
+        specified quadlet offset.
+        @result kIOReturnSuccess if the specified offset is now
+        accessable at romBase[offset].
+    */
+    virtual IOReturn update(UInt32 offset, const UInt32 *&romBase) = 0;
+
+    /*!
+        @function getKeyType
+        Gets the data type for the specified key
+        @param type on return, set to the data type
+        @result kIOReturnSuccess if the key exists in the dictionary
+    */
+    virtual IOReturn getKeyType(int key, IOConfigKeyType &type);
+    /*!
+        @function getKeyValue
+        Gets the value for the specified key, in a variety of forms.
+        @param value on return, set to the data type
+        @param text if non-zero, on return points to the
+        string description of the field, or NULL if no text found.
+        @result kIOReturnSuccess if the key exists in the dictionary
+        and is of a type appropriate for the value parameter
+        @param value reference to variable to store the entry's value
+    */
+    virtual IOReturn getKeyValue(int key, UInt32 &value, OSString** text = NULL);
+    virtual IOReturn getKeyValue(int key, OSData *&value,
+                                 OSString** text = NULL);
+    virtual IOReturn getKeyValue(int key, IOConfigDirectory *&value,
+                                 OSString** text = NULL);
+    virtual IOReturn getKeyOffset(int key, FWAddress &value,
+                                  OSString** text = NULL);
+
+
+    /*!
+        @function getIndexType
+        Gets the data type for entry at the specified index
+        @param type on return, set to the data type
+        @result kIOReturnSuccess if the index exists in the dictionary
+    */
+    virtual IOReturn getIndexType(int index, IOConfigKeyType &type);
+    /*!
+        @function getIndexKey
+        Gets the key for entry at the specified index
+        @param key on return, set to the key
+        @result kIOReturnSuccess if the index exists in the dictionary
+    */
+    virtual IOReturn getIndexKey(int index, int &key);
+
+    /*!
+        @function getIndexValue
+        Gets the value at the specified index of the directory,
+        in a variety of forms.
+        @param type on return, set to the data type
+        @result kIOReturnSuccess if the index exists in the dictionary
+        and is of a type appropriate for the value parameter
+        @param value reference to variable to store the entry's value
+    */
+    virtual IOReturn getIndexValue(int index, UInt32 &value);
+    virtual IOReturn getIndexValue(int index, OSData *&value);
+    virtual IOReturn getIndexValue(int index, OSString *&value);
+    virtual IOReturn getIndexValue(int index, IOConfigDirectory *&value);
+    virtual IOReturn getIndexOffset(int index, FWAddress &value);
+    virtual IOReturn getIndexOffset(int index, UInt32 &value);
+
+    /*!
+        @function getIndexEntry
+        Gets the entry at the specified index of the directory,
+        as a raw UInt32.
+        @param entry on return, set to the entry value
+        @result kIOReturnSuccess if the index exists in the dictionary
+        @param value reference to variable to store the entry's value
+    */
+    virtual IOReturn getIndexEntry(int index, UInt32 &value);
+
+    /*!
+        @function getSubdirectories
+        Creates an iterator over the subdirectories of the directory.
+        @param iterator on return, set to point to an OSIterator
+        @result kIOReturnSuccess if the iterator could be created
+    */
+    virtual IOReturn getSubdirectories(OSIterator *&iterator);
+
+    /*!
+        @function getKeySubdirectories
+        Creates an iterator over subdirectories of a given type of the directory.
+        @param key type of subdirectory to iterate over
+        @param iterator on return, set to point to an OSIterator
+        @result kIOReturnSuccess if the iterator could be created
+    */
+    virtual IOReturn getKeySubdirectories(int key, OSIterator *&iterator);
+
+    int getType() const;
+	
+    int getNumEntries() const;
+
+protected:
+	
+	virtual const UInt32 * lockData( void ) = 0;
+	virtual void unlockData( void ) = 0;
+	virtual IOReturn updateROMCache( UInt32 offset, UInt32 length ) = 0;
+	virtual IOReturn checkROMState( void ) = 0;
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 0);
+    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 1);
+    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 2);
+    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 3);
+    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 4);
+    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 5);
+    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 6);
+    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 7);
+    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 8);
+
+};
+
+#endif /* __IOCONFIGDIRECTORY_H__ */
diff --git a/i386/include/IOKit/firewire/IOFWAddressSpace.h b/i386/include/IOKit/firewire/IOFWAddressSpace.h
new file mode 100644
index 0000000..7ad6764
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWAddressSpace.h
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ *
+ *	IOFWAddressSpace.h
+ *
+ * Classes which describe addresses in the local node which are accessable to other nodes
+ * via firewire asynchronous read/write/lock requests.
+ */
+ 
+#ifndef _IOKIT_IOFWADDRESSSPACE_H
+#define _IOKIT_IOFWADDRESSSPACE_H
+
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+
+class IOFireWireDevice;
+class IOFireWireBus;
+class IOFireWireController;
+
+typedef void * IOFWRequestRefCon;
+
+/*!	@function	FWWriteCallback
+	@abstract	Callback called when a write request packet is received for
+				a 'virtual' firewire address.
+	@param		device	is the node originating the request
+	@param		speed	is the FireWire speed of the request, update it if you need to control
+						the speed of the reply, otherwise the response will be the same speed.
+	@param		addr	is the address the device is requesting to write to
+	@param		len		is the number of bytes to write
+	@param		buf		contains the packet data
+	@param		requestRefcon	refcon Can be queried for extra info about the request,
+								using IOFireWireController::isLockRequest(), isQuadRequest()
+	@result		return:
+				kFWResponseComplete			= 0,	OK
+				kFWResponseConflictError	= 4,	Resource conflict, may retry
+				kFWResponseDataError		= 5,	Data not available
+				kFWResponseTypeError		= 6,	Operation not supported
+				kFWResponseAddressError		= 7		Address not valid in target device */
+typedef UInt32 (*FWWriteCallback)(void *refcon, UInt16 nodeID, IOFWSpeed &speed,
+                                  FWAddress addr, UInt32 len, const void *buf, IOFWRequestRefCon requestRefcon);
+
+/*!	@function	FWReadCallback
+	@abstract	Callback called when a read request packet is received for
+				a 'virtual' firewire address.
+	@param		 nodeID is the node originating the request
+	@param		speed is the FireWire speed of the request, update it if you need to control
+						the speed of the reply, otherwise the response will be the same speed.
+	@param		addr is the address the device is requesting to read from
+	@param		len is the number of bytes to read
+	@param		buf contains the packet data
+	@param		offset on return points to the offset into *buf of the packet data
+	@param		requestRefcon   refcon to pass back if sending a delayed response. Also can be queried 
+								for extra info about the request
+	@result		return:
+    kFWResponsePending			= -1,	Pseudo response, real response sent later.
+	kFWResponseComplete			= 0,	OK!
+	kFWResponseConflictError	= 4,	Resource conflict, may retry
+	kFWResponseDataError		= 5,	Data not available
+	kFWResponseTypeError		= 6,	Operation not supported
+	kFWResponseAddressError		= 7		Address not valid in target device 
+
+	A return of kFWResponsePending should be followed at some later time by a call to
+	IOFireWireController::asyncReadResponse	*/ 
+typedef UInt32 (*FWReadCallback)(void *refcon, UInt16 nodeID, IOFWSpeed &speed,
+                                FWAddress addr, UInt32 len, IOMemoryDescriptor **buf,
+                                 IOByteCount * offset, IOFWRequestRefCon requestRefcon);
+
+class IOFWAddressSpace;
+
+#pragma mark -
+
+/*! @class IOFWAddressSpaceAux
+	@discussion An IOFWAddressSpaceAux is for internal use only. You should never subclass IOFWAddressSpaceAux 
+*/
+
+class IOFWAddressSpaceAux : public OSObject
+{
+    OSDeclareDefaultStructors(IOFWAddressSpaceAux)
+
+	friend class IOFWAddressSpace;
+	
+protected:
+	
+	IOFWAddressSpace * 		fPrimary;
+	IOFireWireController *	fControl;
+	
+	OSSet *					fTrustedNodeSet;
+    OSIterator *			fTrustedNodeSetIterator;
+	
+	bool					fExclusive;
+	
+	/*! 
+		@struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+    */  
+	  
+    struct ExpansionData { };
+
+	/*! 
+		@var reserved
+		Reserved for future use.  (Internal use only)  
+	*/
+    
+	ExpansionData * reserved;
+
+    virtual bool init( IOFWAddressSpace * primary );
+	virtual	void free();
+
+	virtual bool isTrustedNode( UInt16 nodeID );
+	virtual void addTrustedNode( IOFireWireDevice * device );
+	virtual void removeTrustedNode( IOFireWireDevice * device );
+	virtual void removeAllTrustedNodes( void );
+
+	bool isExclusive( void );
+	void setExclusive( bool exclusive );
+	
+	virtual bool intersects( IOFWAddressSpace * space );
+		
+private:
+    OSMetaClassDeclareReservedUsed(IOFWAddressSpaceAux, 0);
+    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 1);
+    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 2);
+    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 3);
+    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 4);
+    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 5);
+    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 6);
+    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 7);
+    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 8);
+    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 9);
+	
+};
+
+#pragma mark -
+
+/*
+ * Base class for FireWire address space objects
+ */
+ 
+/*! 
+	@class IOFWAddressSpace
+*/
+
+class IOFWAddressSpace : public OSObject
+{
+    OSDeclareAbstractStructors(IOFWAddressSpace)
+
+	friend class IOFWAddressSpaceAux;
+	
+protected:
+    
+	IOFireWireController *fControl;
+
+	/*!
+		@struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+    */  
+	  
+    struct ExpansionData 
+	{ 
+		IOFWAddressSpaceAux * fAuxiliary; 
+	};
+
+	/*! 
+		@var reserved
+		Reserved for future use.  (Internal use only)  
+	*/
+	
+    ExpansionData * fIOFWAddressSpaceExpansion;
+
+    virtual bool init(IOFireWireBus *bus);
+	virtual	void free();
+  
+public:
+
+	/*!	@function	doRead
+		@abstract	An abstract method for processing an address space read request
+		@param		nodeID	FireWire Read from nodeID.
+		@param		speed	at this 'speed'.
+		@param		addr	with FireWire address 'addr'.
+		@param		len		read 'len' bytes from nodeID.
+		@param		buf		points to a memory descriptor containing the packet data.
+		@param		offset	start from this 'offset' in 'buf'.
+		@param		refcon  Can be queried for extra info about the request.
+		@result		UIn32	returns kFWResponseComplete on success */
+	virtual UInt32 doRead(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len, 
+					IOMemoryDescriptor **buf, IOByteCount * offset,
+                          IOFWRequestRefCon refcon) = 0;
+						  
+	/*!	@function	doWrite
+		@abstract	An abstract method for processing an address space write request
+		@param		nodeID	FireWire Write to nodeID.
+		@param		speed	at this 'speed'.
+		@param		addr	with FireWire address 'addr'.
+		@param		len		write 'len' bytes to nodeID.
+		@param		buf		obtain bytes from location given by 'buf'.
+		@param		refcon  Can be queried for extra info about the request.
+		@result		UIn32	returns kFWResponseComplete on success */
+    virtual UInt32 doWrite(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
+                           const void *buf, IOFWRequestRefCon refcon) = 0;
+
+	/*!	@function	doLock
+		@abstract	A method for processing a lock request.
+		@param		nodeID	FireWire Lock request for nodeID.
+		@param		speed	at this 'speed'.
+		@param		addr	with FireWire address 'addr'.
+		@param		inlen	'inlen' bytes to use.
+		@param		newVal	new value to write at 'addr' location .
+		@param		outLen	'outLen' bytes for result.
+		@param		oldVal	old value read from 'addr' location.
+		@param		extType	Type like kFWExtendedTCodeCompareSwap.
+		@param		refcon  Can be queried for extra info about the request.
+		@result		UIn32	returns kFWResponseComplete on success */
+    virtual UInt32 doLock(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 inlen,
+                          const UInt32 *newVal, UInt32 &outLen, UInt32 *oldVal,
+                          UInt32 extType, IOFWRequestRefCon refcon);
+
+	/*!	@function	activate
+		@abstract	Address space is ready for handling requests.
+		@result		IOReturn
+		*/
+    virtual IOReturn activate();
+	
+	/*!	@function	deactivate
+		@abstract	Address space request handler is disabled.
+		@result		none
+		*/
+    virtual void deactivate();
+    
+	/*!	@function	contains
+		@abstract	returns number of bytes starting at addr in this space
+		@result		0 if it doesn't contain the address
+		*/
+    virtual UInt32 contains(FWAddress addr);
+
+	/*!	@function	isTrustedNode
+		@abstract	returns true if the node is added as a trusted node
+		@param		nodeID is the nodeID to verify whether its trusted.
+		@result		false if nodeID is not trusted
+		*/
+	inline bool isTrustedNode( UInt16 nodeID ) 
+				{ return fIOFWAddressSpaceExpansion->fAuxiliary->isTrustedNode( nodeID ); }
+
+	/*!	@function	addTrustedNode
+		@abstract	Add a trusted node.
+		@param		device object pointing to a FireWire node on the bus.
+		@result		none
+		*/
+	inline void addTrustedNode( IOFireWireDevice * device )
+				{ fIOFWAddressSpaceExpansion->fAuxiliary->addTrustedNode( device ); }
+	
+	/*!	@function	removeTrustedNode
+		@abstract	Remove a trusted node.
+		@param		device object pointing to a FireWire node on the bus.
+		@result		none
+		*/
+	inline void removeTrustedNode( IOFireWireDevice * device )
+				{ fIOFWAddressSpaceExpansion->fAuxiliary->removeTrustedNode( device ); }
+		
+	/*!	@function	removeAllTrustedNodes
+		@abstract	Remove all trusted nodes.
+		@result		none
+		*/
+	inline void removeAllTrustedNodes( void )
+				{ fIOFWAddressSpaceExpansion->fAuxiliary->removeAllTrustedNodes(); }
+
+	/*!	@function	isExclusive
+		@abstract	Checks if an address space wants exclusive control of its address range
+		@result		True if the address space is marked exclusive false otherwise
+		*/
+
+	inline bool isExclusive( void )
+		{ return fIOFWAddressSpaceExpansion->fAuxiliary->isExclusive(); }
+
+	/*!	@function	setExclusive
+		@abstract	Sets if this address space requires exclusive control of its address range. Exclusivity should be set before an address space is activated.
+		@param		exclusive  True if address space should be exclusive, false otherwise
+		@result		none
+	*/
+		
+	inline void setExclusive( bool exclusive )
+		{ fIOFWAddressSpaceExpansion->fAuxiliary->setExclusive( exclusive ); }
+
+	/*!	@function	intersects
+		@abstract	Checks this address space intersects with the given address range. Currently only supports IOFWPsuedoAddressSpaces.
+		@param		space  An address space to compare against
+		@result		True if the address spaces intersect false otherwise
+	*/
+		
+	inline bool intersects( IOFWAddressSpace * space )
+		{ return fIOFWAddressSpaceExpansion->fAuxiliary->intersects( space ); }
+
+		
+protected:
+	
+	virtual IOFWAddressSpaceAux * createAuxiliary( void );
+    
+private:
+    OSMetaClassDeclareReservedUsed(IOFWAddressSpace, 0);
+    OSMetaClassDeclareReservedUsed(IOFWAddressSpace, 1);
+    
+};
+
+// the physical and psuedo address space classes used to be defined here
+// for backwards compatibility, we pull them in now.  the ifdefs surrounding
+// the content of the header files ensures we do not multiply include a header.
+
+#include <IOKit/firewire/IOFWPseudoAddressSpace.h>
+#include <IOKit/firewire/IOFWPhysicalAddressSpace.h>
+
+#endif /* _IOKIT_IOFWADDRESSSPACE */
diff --git a/i386/include/IOKit/firewire/IOFWAsyncStreamListener.h b/i386/include/IOKit/firewire/IOFWAsyncStreamListener.h
new file mode 100644
index 0000000..cef64f8
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWAsyncStreamListener.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 1998-2001 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _IOKIT_IOFWASYNCSTREAMLISTENER_H
+#define _IOKIT_IOFWASYNCSTREAMLISTENER_H
+
+#include <IOKit/firewire/IOFireWireLink.h>
+#include <IOKit/firewire/IOFWCommand.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/firewire/IOFWDCLProgram.h>
+
+class IOFWAsyncStreamReceiver;
+class IOFWAsyncStreamReceivePort;
+
+/*! @class IOFWAsyncStreamListener
+*/
+class IOFWAsyncStreamListener : public OSObject
+{
+    OSDeclareDefaultStructors(IOFWAsyncStreamListener)
+
+friend class IOFWAsyncStreamReceiver;
+friend class IOFireWireController;
+
+public:
+
+/*!	@function initAll
+	@abstract Creates an AsyncStream client for an Isoch channel.
+	@param control	Points to IOFireWireController.
+	@param channel	Isoch channel for listening.
+	@param proc		Callback on packet reception.
+	@param obj  Client's callback object.
+	@result returns true on success, else false.	*/	
+	bool initAll( IOFireWireController *control, UInt32 channel, FWAsyncStreamReceiveCallback proc, void *refcon );
+
+/*!	@function setListenerHandler
+	@abstract Set the callback that should be called to handle incoming async stream packets
+	@param inReceiver The callback to set.
+	@result Returns the callback that was previously set or nil for none.*/
+	const FWAsyncStreamReceiveCallback setListenerHandler( FWAsyncStreamReceiveCallback inReceiver );
+
+/*!	@function TurnOffNotification
+	@abstract Turns off client callback notification.
+	@result   none.	*/	
+	inline void TurnOffNotification() { fNotify = false; };
+
+/*!	@function TurnOnNotification
+	@abstract Turns on client callback notification.
+	@result   none.	*/	
+	inline void TurnOnNotification() { fNotify = true; };
+
+/*!	@function IsNotificationOn
+	@abstract checks the notification state.
+	@result   true if ON, else false	*/	
+	inline bool IsNotificationOn() { return fNotify; };
+
+/*!	@function setFlags
+	@abstract set flags for the listener.
+	@param flags indicate performance metrics.
+	@result none.	*/	
+	void setFlags( UInt32 flags );
+	
+/*!	@function getFlags
+	@abstract get the flags of listener.
+	@param none.
+	@result flags.	*/	
+	UInt32 getFlags();
+
+/*!	@function getRefCon
+	@abstract get the refcon specific to this listener.
+	@param none.
+	@result fRefCon refcon passed during initialization. */	
+	inline void* getRefCon() { return fRefCon; };
+	
+/*!	@function getOverrunCounter
+	@abstract get overrun counter from the DCL program.
+	@param none.
+	@result returns the counter value.	*/	
+	UInt32 getOverrunCounter();
+	
+protected:
+
+	FWAsyncStreamReceiveCallback	fClientProc; 
+	void							*fRefCon;
+	IOFWAsyncStreamReceiver			*fReceiver;
+	bool							 fNotify;
+	UInt32							 fFlags;
+	IOFireWireController			*fControl;
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+    
+    virtual void		free();
+
+private:
+/*!	function getReceiver
+	abstract Returns the Async Stream receiver object which tracks multiple
+	         IOFWAsyncStreamListeners for the same Isoc channel. */	
+	inline IOFWAsyncStreamReceiver *getReceiver() { return fReceiver; };
+
+/*!	function invokeClients
+	abstract Invokes client's callback function with fRefCon.	*/	
+	void invokeClients( UInt8 *buffer );
+	
+    OSMetaClassDeclareReservedUnused(IOFWAsyncStreamListener, 0);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncStreamListener, 1);
+};
+#endif // _IOKIT_IOFWASYNCSTREAMLISTENER_H
+
diff --git a/i386/include/IOKit/firewire/IOFWCommand.h b/i386/include/IOKit/firewire/IOFWCommand.h
new file mode 100644
index 0000000..fdf85b5
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWCommand.h
@@ -0,0 +1,977 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *
+ *	IOFWCommand.h
+ *
+ */
+#ifndef _IOKIT_IOFWCOMMAND_H
+#define _IOKIT_IOFWCOMMAND_H
+
+#include <IOKit/IOCommand.h>
+#include <IOKit/IOLib.h>
+
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+
+#include <IOKit/firewire/IOFWSyncer.h>
+
+#define kFWCmdDefaultRetries 3
+#define kFWCmdZeroRetries 0
+#define kFWCmdReducedRetries 2
+#define kFWCmdIncreasedRetries 6
+
+class IOMemoryDescriptor;
+class IOSyncer;
+class IOFireWireBus;
+class IOFireWireController;
+class IOFireWireNub;
+class IOFWAddressSpace;	// Description of chunk of local FW address space
+class IOFWCommand;
+class IOFWBusCommand;
+class IOFWAsyncStreamCommand;
+class IOCommandGate;
+class IOFWAsyncPHYCommand;
+
+struct AsyncPendingTrans;
+
+// Struct for head of command queue
+/*!
+    @struct IOFWCmdQ
+    @abstract Structure for head of a queue of IOFWCommands
+    @field fHead Points to the head of the queue, or NULL if queue is empty
+    @field fTail Points to the tail of the queue, or NULL if queue is empty
+    @function headChanged called when head command is changed, or the command
+ 	itself changes state.
+*/
+
+struct IOFWCmdQ
+{
+    IOFWCommand *fHead;
+    IOFWCommand *fTail;
+    bool executeQueue(bool all);
+    virtual void headChanged(IOFWCommand *oldHead);
+	
+	virtual ~IOFWCmdQ() {}
+
+	void checkProgress( void );
+};
+
+// Callback when device command completes asynchronously
+typedef void (*FWDeviceCallback)(void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd);
+
+// Callback when bus command completes asynchronously
+typedef void (*FWBusCallback)(void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd);
+
+// Callback when async stream command completes asynchronously
+typedef void (*FWAsyncStreamCallback)(void *refcon, IOReturn status, IOFireWireBus *bus, IOFWAsyncStreamCommand *fwCmd);
+
+// Callback when async stream command completes asynchronously
+typedef void (*FWAsyncPHYCallback)(void *refcon, IOReturn status, IOFireWireBus *bus, IOFWAsyncPHYCommand *fwCmd );
+
+// Callback when async stream packet is received
+typedef void (*FWAsyncStreamReceiveCallback)(void *refcon, const void *buf);
+
+#pragma mark -
+
+/*
+ * Base class for FireWire commands
+ */
+/*! @class IOFWCommand
+*/
+class IOFWCommand : public IOCommand
+{
+    OSDeclareAbstractStructors(IOFWCommand)
+
+protected:
+    IOReturn		fStatus;
+    IOFireWireController *fControl;
+    IOFWCommand *	fQueuePrev;
+    IOFWCommand *	fQueueNext;
+    IOFWCmdQ *		fQueue;
+    UInt32			fTimeout;	// How long (in microsecs) after execute() to timeout
+    AbsoluteTime	fDeadline;	// Time after which this command has timed out.
+    IOFWSyncer *	fSyncWakeup;
+    UInt8			fSync;
+    UInt8			fCancelOnReset;
+    UInt8			spare[2];
+    
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct MemberVariables 
+	{
+		void *			fFWIMRefCon;
+		IOReturn		fCompletionStatus;
+		bool			fSubmitTimeLatched;
+	    AbsoluteTime	fSubmitTime;
+		bool			fFlush;
+	};
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    MemberVariables * fMembers;
+
+    virtual IOReturn	complete(IOReturn status);
+    virtual void	updateTimer();
+    virtual IOReturn	startExecution();
+    
+    /*	
+     *	Execute the FWCommand immediately
+     *	must be called with the workloop gate closed
+     */
+    virtual IOReturn	execute() = 0;
+
+public:
+
+    virtual bool	initWithController(IOFireWireController *control);
+	virtual void	free( void );
+	
+    IOReturn		getStatus() const { return fStatus; };
+    
+    /*	
+     *	Submit the FWCommand.
+     *	if queue is false the command's execute()
+     *	method will be called on the caller's thread, otherwise
+     *	the command wil be queued for execution on the work loop thread.
+     */                          
+    virtual IOReturn 	submit(bool queue = false);
+
+    /*
+     * Cancel command, causes it to complete with given status
+     */
+    virtual IOReturn	cancel(IOReturn reason);
+
+    /*!
+        @function setHead
+        inserts a command at the head of a queue.
+        @param queue queue command is being added to
+    */
+    virtual void setHead(IOFWCmdQ &queue);
+    /*!
+        @function insertAfter
+        inserts a command after the specified one.
+        @param prev command to insert after
+        @param queue queue command is being added to
+    */
+    virtual void insertAfter(IOFWCommand &prev);
+
+    /*!
+        @function removeFromQ
+        Removes command from current queue.
+    */
+    virtual void removeFromQ();
+
+    IOFWCommand *getPrevious() const
+	{ return fQueuePrev; };
+    IOFWCommand *getNext() const
+        { return fQueueNext; };
+    const AbsoluteTime &getDeadline() const
+	{ return fDeadline; };
+
+    bool cancelOnReset() const
+    { return fCancelOnReset; };
+
+    bool Busy() const
+        { return fStatus == kIOReturnBusy || fStatus == kIOFireWirePending;};
+    
+    void setTimeout( UInt32 timeout )
+        { fTimeout = timeout; };
+        
+    friend class IOFWCmdQ;
+
+	void * getFWIMRefCon( void )
+	{
+		return fMembers->fFWIMRefCon;
+	}
+	
+	void setFWIMRefCon( void * refcon )
+	{
+		fMembers->fFWIMRefCon = refcon;
+	}
+
+	void setFlush( bool flush )
+	{
+		fMembers->fFlush = flush;		
+	}
+	
+	virtual IOReturn checkProgress( void );
+	
+private:
+    OSMetaClassDeclareReservedUsed(IOFWCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFWCommand, 1);
+
+};
+
+#pragma mark -
+
+/*
+ * Bus control commands
+ */
+/*! @class IOFWBusCommand
+*/
+class IOFWBusCommand : public IOFWCommand
+{
+    OSDeclareAbstractStructors(IOFWBusCommand)
+
+protected:
+    FWBusCallback	fComplete;
+    void *		fRefCon;
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+    virtual IOReturn	complete(IOReturn status);
+
+    virtual bool	initWithController(IOFireWireController *control,
+				FWBusCallback completion=NULL, void *refcon=NULL);
+    virtual IOReturn	reinit(FWBusCallback completion, void *refcon);
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFWBusCommand, 0);
+
+};
+
+#pragma mark -
+
+/*
+ * Command to execute some code after a specified delay (in microseconds)
+ * All it does is timeout after the specified delay, hence calling the completion
+ * callback.
+ */
+/*! @class IOFWDelayCommand
+*/
+class IOFWDelayCommand : public IOFWBusCommand
+{
+    OSDeclareDefaultStructors(IOFWDelayCommand)
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+protected:
+    virtual IOReturn	execute();
+
+public:
+    virtual bool	initWithDelay(IOFireWireController *control, UInt32 uSecs,
+                                FWBusCallback completion, void *refcon);
+    virtual IOReturn	reinit(UInt32 uSecs, FWBusCallback completion, void *refcon);
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFWDelayCommand, 0);
+
+};
+
+/*
+ * Send an async request to a device
+ */
+class IOFWUserReadQuadletCommand ;
+class IOFWUserWriteCommand ;
+
+#pragma mark -
+
+/*! @class IOFWAsyncCommand
+*/
+class IOFWAsyncCommand : public IOFWCommand
+{
+	OSDeclareAbstractStructors(IOFWAsyncCommand)
+
+protected:
+    IOFireWireNub *	fDevice;
+    FWDeviceCallback	fComplete;
+    void *		fRefCon;
+    IOMemoryDescriptor *fMemDesc;
+    AsyncPendingTrans *	fTrans;
+    UInt32		fAddressHi;
+    UInt32		fAddressLo;
+    IOByteCount		fBytesTransferred;
+    int			fSize;
+    int			fSpeed;
+    int			fMaxPack;
+    int			fCurRetries;
+    int			fMaxRetries;
+    UInt32		fGeneration;	// bus topology fNodeID is valid for.
+    UInt16		fNodeID;
+    bool		fFailOnReset;
+    bool		fWrite;
+
+	typedef struct 
+	{ 
+		// some of our subclasses didn't have room for expansion data, so
+		// we've reserved space for their use here.
+		
+		void *			fSubclassMembers;
+		int				fMaxSpeed;
+		int				fAckCode;
+		UInt32			fResponseCode;
+		UInt32			fFastRetryCount;
+		int				fResponseSpeed;
+		bool			fForceBlockRequests;
+	} 
+	MemberVariables;
+
+    MemberVariables * fMembers;
+
+    virtual IOReturn	complete(IOReturn status);
+	virtual bool	initWithController(IOFireWireController *control);
+    virtual bool	initAll(IOFireWireNub *device, FWAddress devAddress,
+				IOMemoryDescriptor *hostMem,
+				FWDeviceCallback completion, void *refcon, bool failOnReset);
+    virtual bool	initAll(IOFireWireController *control,
+                                UInt32 generation, FWAddress devAddress,
+                                IOMemoryDescriptor *hostMem,
+                                FWDeviceCallback completion, void *refcon);
+	virtual void free( void );
+    virtual IOReturn	reinit(FWAddress devAddress, IOMemoryDescriptor *hostMem,
+				FWDeviceCallback completion, void *refcon, bool failOnReset);
+    virtual IOReturn	reinit(UInt32 generation, FWAddress devAddress, IOMemoryDescriptor *hostMem,
+                                FWDeviceCallback completion, void *refcon);
+	bool createMemberVariables( void );
+	void destroyMemberVariables( void );
+public:
+	// Utility for setting generation on newly created command
+	virtual void	setGeneration(UInt32 generation)
+	{ fGeneration = generation; }
+
+    // To be called by IOFireWireController and derived classes.
+    virtual void 	gotPacket(int rcode, const void* data, int size) = 0;
+    virtual void	gotAck(int ackCode);
+
+    // update nodeID/generation after bus reset, from the device object
+    IOReturn		updateGeneration();
+    // explicitly update nodeID/generation after bus reset
+    IOReturn		updateNodeID(UInt32 generation, UInt16 nodeID);
+    
+    // Generally useful stuff
+    IOByteCount		getBytesTransferred() const
+    { return fBytesTransferred; };
+
+    FWAddress		getAddress() const
+    { return FWAddress(fAddressHi, fAddressLo, fNodeID); }
+
+    bool		failOnReset() const
+    { return fFailOnReset; }
+    
+    IOFireWireNub *	getDevice() const
+    { return fDevice; }
+    
+    /*!
+        @function setMaxPacket
+        Sets the maximum size for block transfers used by the command.
+        The command is initialized to use the maximum packet size calculated from the device's
+        PHY speed, bus info block and the bus topology.
+        Call this method before calling submit().
+        @param maxBytes Maximum packet size in bytes. If the maxsize is 4 then quadlet transfers will be used.
+    */
+    IOReturn	setMaxPacket(UInt32 maxBytes)
+    {
+        if(fStatus == kIOReturnBusy || fStatus == kIOFireWirePending)
+            return fStatus;
+        fMaxPack = maxBytes;
+        return kIOReturnSuccess;
+    }
+
+	void setMaxSpeed( int speed );
+	
+	void setAckCode( int ack );
+	int getAckCode( void );
+	
+	void setRetries( int retries);
+	int getMaxRetries( void );
+	
+	void setResponseCode( UInt32 rcode );
+	UInt32 getResponseCode( void ) const;
+
+	void setFastRetryCount( UInt32 count ) 
+		{ fMembers->fFastRetryCount = count; };
+
+	UInt32 getFastRetryCount( void ) 
+		{ return fMembers->fFastRetryCount; };
+		
+	void setResponseSpeed( int speed ) 
+		{ fMembers->fResponseSpeed = speed; };
+
+	int getResponseSpeed( void ) 
+		{ return fMembers->fResponseSpeed; };
+
+	// forces even 4 byte transactions to be block requests
+	void setForceBlockRequests( bool enabled )
+		{ fMembers->fForceBlockRequests = enabled; }
+
+	virtual IOReturn checkProgress( void );
+			
+private:
+    OSMetaClassDeclareReservedUnused(IOFWAsyncCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncCommand, 1);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncCommand, 2);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncCommand, 3);
+
+};
+
+#pragma mark -
+
+/*
+ * Concrete async requests - read, write and hordes of read/modify/write
+ */
+class IOFWReadCommand : public IOFWAsyncCommand
+{
+    OSDeclareDefaultStructors(IOFWReadCommand)
+
+protected:
+	
+    virtual void 	gotPacket(int rcode, const void* data, int size);
+
+    virtual IOReturn	execute();
+
+public:
+    virtual bool	initAll(IOFireWireNub *device, FWAddress devAddress,
+				IOMemoryDescriptor *hostMem,
+				FWDeviceCallback completion, void *refcon, bool failOnReset);
+    virtual bool	initAll(IOFireWireController *control,
+                                UInt32 generation, FWAddress devAddress,
+                                IOMemoryDescriptor *hostMem,
+                                FWDeviceCallback completion, void *refcon);
+    virtual IOReturn	reinit(FWAddress devAddress, IOMemoryDescriptor *hostMem,
+				FWDeviceCallback completion=NULL, void *refcon=NULL,
+				bool failOnReset=false);
+    virtual IOReturn	reinit(UInt32 generation, FWAddress devAddress, IOMemoryDescriptor *hostMem,
+                                FWDeviceCallback completion=NULL, void *refcon=NULL);
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFWReadCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFWReadCommand, 1);
+};
+
+#pragma mark -
+
+/*!
+	@class IOFWReadQuadCommand
+	@discussion An easier to use version of IOFWReadCommand for use when the data to be transferred
+	is an integer number of quads.
+	Note that block read requests will be used for transfers greater than one quad unless setMaxPacket(4)
+	is called.
+*/
+
+class IOFWReadQuadCommand : public IOFWAsyncCommand
+{
+    OSDeclareDefaultStructors(IOFWReadQuadCommand)
+
+protected:
+
+    UInt32 *	fQuads;
+
+	typedef struct 
+	{ 
+		bool	fPingTime;
+	}
+	MemberVariables;
+	
+	bool createMemberVariables( void );
+	void destroyMemberVariables( void );
+	virtual void free( void );
+	
+    virtual void 	gotPacket(int rcode, const void* data, int size);
+
+    virtual IOReturn	execute();
+
+public:
+    virtual bool	initAll(IOFireWireNub *device, FWAddress devAddress,
+				UInt32 *quads, int numQuads,
+				FWDeviceCallback completion, void *refcon, bool failOnReset);
+
+    virtual bool	initAll(IOFireWireController *control,
+                                UInt32 generation, FWAddress devAddress,
+                                UInt32 *quads, int numQuads,
+                                FWDeviceCallback completion, void *refcon);
+    
+    virtual IOReturn	reinit(FWAddress devAddress, UInt32 *quads, int numQuads,
+				FWDeviceCallback completion=NULL, void *refcon=NULL,
+				bool failOnReset=false);
+
+    virtual IOReturn	reinit(UInt32 generation, FWAddress devAddress, UInt32 *quads, int numQuads,
+                                FWDeviceCallback completion=NULL, void *refcon=NULL);
+
+	void setPingTime( bool state ) 
+		{ ((MemberVariables*)fMembers->fSubclassMembers)->fPingTime = state; };    
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFWReadQuadCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFWReadQuadCommand, 1);
+};
+
+#pragma mark -
+
+class IOFWWriteCommand : public IOFWAsyncCommand
+{
+
+    OSDeclareDefaultStructors(IOFWWriteCommand)
+
+protected:
+
+    int			fPackSize;
+	
+	typedef struct 
+	{ 
+		bool 	fDeferredNotify;
+		bool	fFastRetryOnBusy;
+	}
+	MemberVariables;
+		
+    virtual IOReturn	execute();
+
+    virtual void 	gotPacket( int rcode, const void* data, int size );
+
+	bool createMemberVariables( void );
+	void destroyMemberVariables( void );
+	
+public:
+
+	virtual bool	initWithController(IOFireWireController *control);
+    virtual bool	initAll(	IOFireWireNub *			device, 
+								FWAddress 				devAddress,
+								IOMemoryDescriptor *	hostMem,
+								FWDeviceCallback 		completion, 
+								void *					refcon, 
+								bool 					failOnReset );
+								
+    virtual bool	initAll(	IOFireWireController *	control,
+                                UInt32 					generation, 
+								FWAddress 				devAddress,
+                                IOMemoryDescriptor *	hostMem,
+                                FWDeviceCallback 		completion, 
+								void *					refcon );
+	virtual void free( void );
+								
+    virtual IOReturn	reinit(	FWAddress 				devAddress, 
+								IOMemoryDescriptor *	hostMem,
+								FWDeviceCallback 		completion = NULL, 
+								void *					refcon = NULL,
+								bool 					failOnReset = false );
+								
+    virtual IOReturn	reinit(	UInt32 					generation, 
+								FWAddress 				devAddress, 
+								IOMemoryDescriptor *	hostMem,
+                                FWDeviceCallback		completion = NULL, 
+								void *					refcon = NULL );
+
+	void setDeferredNotify( bool state ) 
+		{ ((MemberVariables*)fMembers->fSubclassMembers)->fDeferredNotify = state; };
+
+	void setFastRetryOnBusy( bool state ) 
+		{ ((MemberVariables*)fMembers->fSubclassMembers)->fFastRetryOnBusy = state; };
+	
+private:
+
+    OSMetaClassDeclareReservedUnused(IOFWWriteCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFWWriteCommand, 1);
+
+};
+
+#pragma mark -
+
+/*!
+	@class IOFWWriteQuadCommand
+	@discussion An easier to use version of IOFWWriteCommand for use when the data to be transferred
+	is small and an integer number of quads.
+	Note that block read requests will be used for transfers greater than one quad unless setMaxPacket(4)
+	is called.
+	kMaxWriteQuads is the largest legal number of quads that this object can be asked to transfer
+	(the data is copied into an internal buffer in init() and reinit()).
+*/
+
+class IOFWWriteQuadCommand : public IOFWAsyncCommand
+{
+
+    OSDeclareDefaultStructors(IOFWWriteQuadCommand)
+
+public:
+
+    enum 
+	{
+        kMaxWriteQuads = 8
+    };
+    
+protected:
+
+    UInt32					fQuads[kMaxWriteQuads];
+    UInt32 *				fQPtr;
+    int						fPackSize;
+	
+	typedef struct 
+	{ 
+		bool 					fDeferredNotify;
+		IOMemoryDescriptor *	fMemory;
+	} 
+	MemberVariables;
+	
+    virtual void 	gotPacket( int rcode, const void* data, int size );
+
+    virtual IOReturn	execute();
+
+	bool createMemberVariables( void );
+	void destroyMemberVariables( void );
+	
+public:
+	virtual bool	initWithController(IOFireWireController *control);
+    
+	virtual bool	initAll(	IOFireWireNub *		device, 
+								FWAddress 			devAddress,
+								UInt32 *			quads, 
+								int 				numQuads,
+								FWDeviceCallback	completion, 
+								void *				refcon, 
+								bool 				failOnReset );
+								
+    virtual bool	initAll(	IOFireWireController *	control,
+                                UInt32 					generation, 
+								FWAddress 				devAddress,
+                                UInt32 *				quads, 
+								int 					numQuads,
+                                FWDeviceCallback 		completion, 
+								void *					refcon );
+
+	virtual void free( void );
+
+    virtual IOReturn	reinit(	FWAddress 			devAddress, 
+								UInt32 *			quads, 
+								int 				numQuads,
+								FWDeviceCallback	completion = NULL, 
+								void *				refcon = NULL,
+								bool 				failOnReset = false );
+								
+    virtual IOReturn	reinit(	UInt32 				generation, 
+								FWAddress 			devAddress, 
+								UInt32 *			quads, 
+								int 				numQuads,
+                                FWDeviceCallback 	completion = NULL, 
+								void *				refcon = NULL );
+
+protected:
+	
+	void setQuads( UInt32 * quads, int numQuads );
+	bool createMemoryDescriptor( void );
+	void destroyMemoryDescriptor( void );
+
+public:
+
+ 	void setDeferredNotify( bool state ) 
+		{ ((MemberVariables*)fMembers->fSubclassMembers)->fDeferredNotify = state; };
+	
+private:
+    
+	OSMetaClassDeclareReservedUnused(IOFWWriteQuadCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFWWriteQuadCommand, 1);
+
+};
+
+/*
+ * May need more parameters for some of these,
+ * and/or derive from a base Lock transaction command
+ */
+
+#pragma mark -
+
+/*! @class IOFWCompareAndSwapCommand
+*/
+class IOFWCompareAndSwapCommand : public IOFWAsyncCommand
+{
+    OSDeclareDefaultStructors(IOFWCompareAndSwapCommand)
+
+protected:
+    UInt32 					fInputVals[4];
+    UInt32 					fOldVal[2];
+	
+	typedef struct 
+	{ 
+		IOMemoryDescriptor *	fMemory;
+	} 
+	MemberVariables;
+	
+	MemberVariables * fMembers;
+
+    virtual void 	gotPacket(int rcode, const void* data, int size);
+
+    virtual IOReturn	execute();
+
+public:
+    // Compare to cmpVal, and if equal replace with newVal.
+    // Size = 1 for 32 bit operation (one quad), 2 for 64 bit (two quads)
+	virtual bool	initWithController(IOFireWireController *control);
+    virtual bool	initAll(IOFireWireNub *device, FWAddress devAddress,
+				const UInt32 *cmpVal, const UInt32 *newVal, int size,
+				FWDeviceCallback completion, void *refcon, bool failOnReset);
+    virtual bool	initAll(IOFireWireController *control,
+                                UInt32 generation, FWAddress devAddress,
+                                const UInt32 *cmpVal, const UInt32 *newVal, int size,
+                                FWDeviceCallback completion, void *refcon);
+
+    virtual IOReturn	reinit(FWAddress devAddress, const UInt32 *cmpVal, const UInt32 *newVal, int size,
+                                FWDeviceCallback completion=NULL, void *refcon=NULL, bool failOnReset=false);
+    virtual IOReturn	reinit(UInt32 generation, FWAddress devAddress,
+                                const UInt32 *cmpVal, const UInt32 *newVal, int size,
+                                FWDeviceCallback completion=NULL, void *refcon=NULL);
+
+    // sets oldVal to the old value returned by the device, and
+    // returns true if it was the expected value, ie. the lock succeeded
+    virtual bool	locked(UInt32 *oldVal);
+
+	virtual void free( void );
+
+protected:
+
+	bool createMemberVariables( void );
+	void destroyMemberVariables( void );
+	
+	void setInputVals( const UInt32 *	cmpVal, const UInt32 * newVal, int size );
+
+	bool createMemoryDescriptor( void );
+	void destroyMemoryDescriptor( void );
+    
+private:
+    OSMetaClassDeclareReservedUnused(IOFWCompareAndSwapCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFWCompareAndSwapCommand, 1);
+    OSMetaClassDeclareReservedUnused(IOFWCompareAndSwapCommand, 2);
+    OSMetaClassDeclareReservedUnused(IOFWCompareAndSwapCommand, 3);
+
+};
+
+/*
+ * Send an async stream packet
+ */
+
+#pragma mark -
+
+/*! @class IOFWAsyncStreamCommand
+*/
+class IOFWAsyncStreamCommand : public IOFWCommand
+{
+	// temporary for debugging:
+	friend class IOFireWireUserClient ;
+
+	OSDeclareDefaultStructors(IOFWAsyncStreamCommand)
+
+protected:
+    FWAsyncStreamCallback	fComplete;
+    void *					fRefCon;
+    IOMemoryDescriptor 		* fMemDesc;
+    int						fSpeed;
+    int						fSize;
+    int						fCurRetries;
+    int						fMaxRetries;
+    int						fChannel;
+    int						fSyncBits;
+    int						fTag;
+    UInt32					fGeneration;	// bus topology fNodeID is valid for.
+    bool					fFailOnReset;
+
+	typedef struct 
+	{ 	} 
+	MemberVariables;
+
+    MemberVariables * fMembers;		
+	
+    virtual IOReturn	complete(
+    							IOReturn 				status);
+    							
+	// To be called by IOFireWireController and derived classes.
+    virtual IOReturn	execute();
+
+public:
+
+    virtual bool		initAll(
+    							IOFireWireController 	* control,
+                                UInt32 					generation, 
+                                UInt32 					channel,
+                                UInt32 					sync,
+                                UInt32 					tag,
+                                IOMemoryDescriptor 		* hostMem,
+                                UInt32					size,
+                                int						speed,
+                                FWAsyncStreamCallback	completion,
+                                void 					* refcon);
+
+	virtual void free( void );
+
+    virtual IOReturn	reinit(	UInt32 					generation, 
+                                UInt32 					channel,
+                                UInt32 					sync,
+                                UInt32 					tag,
+                                IOMemoryDescriptor 		* hostMem,
+                                UInt32					size,
+                                int						speed,
+                               	FWAsyncStreamCallback	completion,
+                                void 					* refcon);
+								
+    virtual void				gotAck(
+    							int 					ackCode);
+	// Utility for setting generation on newly created command
+	virtual void				setGeneration(
+								UInt32 					generation)
+	{ fGeneration = generation; }
+
+ 
+    // update nodeID/generation after bus reset, from the device object
+    IOReturn		updateGeneration();
+    
+    bool		failOnReset() const
+    { return fFailOnReset; }
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFWAsyncStreamCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncStreamCommand, 1);
+
+public:
+    virtual bool		initAll(
+    							IOFireWireController 	* control,
+                                UInt32 					generation, 
+                                UInt32 					channel,
+                                UInt32 					sync,
+                                UInt32 					tag,
+                                IOMemoryDescriptor 		* hostMem,
+                                UInt32					size,
+                                int						speed,
+                                FWAsyncStreamCallback	completion,
+                                void 					* refcon,
+								bool					failOnReset );
+								
+    
+	virtual IOReturn	reinit(
+								UInt32 					generation, 
+                                UInt32 					channel,
+                                UInt32 					sync,
+                                UInt32 					tag,
+                                IOMemoryDescriptor 		* hostMem,
+                                UInt32					size,
+                                int						speed,
+                                FWAsyncStreamCallback 	completion,
+                                void 					* refcon,
+								bool					failOnReset);
+	
+
+};
+
+/*
+ * Send an async PHY packet
+ */
+
+#pragma mark -
+
+/*! @class IOFWAsyncPHYCommand
+*/
+class IOFWAsyncPHYCommand : public IOFWCommand
+{
+	// temporary for debugging:
+	friend class IOFireWireUserClient;
+
+	OSDeclareDefaultStructors( IOFWAsyncPHYCommand )
+
+protected:
+	AsyncPendingTrans *		fTrans;
+    FWAsyncPHYCallback		fComplete;
+    void *					fRefCon;
+    int						fCurRetries;
+    int						fMaxRetries;
+    UInt32					fGeneration;
+    bool					fFailOnReset;
+	UInt32					fData1;
+	UInt32					fData2;
+	int						fAckCode;
+	UInt32					fResponseCode;
+		
+	typedef struct 
+	{ 	} 
+	MemberVariables;
+
+    MemberVariables * fMembers;		
+	
+    virtual IOReturn	complete(
+    							IOReturn 				status );
+    							
+	// To be called by IOFireWireController and derived classes.
+    virtual IOReturn	execute();
+
+	void setResponseCode( UInt32 rcode );
+	void setAckCode( int ack );
+
+public:
+
+    virtual bool		initAll(
+    							IOFireWireController 	* control,
+                                UInt32 					generation, 
+                                UInt32					data1,
+								UInt32					data2,
+                                FWAsyncPHYCallback		completion,
+                                void 					* refcon,
+								bool 					failOnReset );
+	virtual void free( void );
+
+    virtual IOReturn	reinit(	UInt32 					generation, 
+								UInt32					data1,
+								UInt32					data2,
+                               	FWAsyncPHYCallback		completion,
+                                void 					* refcon,
+								bool 					failOnReset );
+
+    virtual void				gotAck(
+    							int 					ackCode );
+								
+	// Utility for setting generation on newly created command
+	virtual void				setGeneration(
+								UInt32 					generation )
+			{ fGeneration = generation; }
+
+ 
+    // update nodeID/generation after bus reset, from the device object
+    IOReturn		updateGeneration();
+    
+    bool		failOnReset() const
+		{ return fFailOnReset; }
+    
+
+	virtual void gotPacket( int rcode  );
+
+	int getAckCode( void );
+	UInt32 getResponseCode( void ) const;
+
+	void setRetries( int retries);
+private:
+    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 0);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 1);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 2);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 3);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 4);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 5);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 6);
+    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 7);
+};
+
+#endif /* _IOKIT_IOFWCOMMAND_H */
diff --git a/i386/include/IOKit/firewire/IOFWDCL.h b/i386/include/IOKit/firewire/IOFWDCL.h
new file mode 100644
index 0000000..8919485
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWDCL.h
@@ -0,0 +1,346 @@
+/*
+*  IOFWDCL.h
+*  IOFireWireFamily
+*
+*  Created by Niels on Fri Feb 21 2003.
+*  Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+*
+*	$Log: IOFWDCL.h,v $
+*	Revision 1.20  2008/11/14 00:17:11  arulchan
+*	fix for rdar://5939334
+*	
+*	Revision 1.19  2007/03/14 01:01:12  collin
+*	*** empty log message ***
+*	
+*	Revision 1.18  2007/01/26 23:42:19  ayanowit
+*	another fix for nuDCL rosetta mode
+*	
+*	Revision 1.17  2006/08/16 01:41:41  collin
+*	*** empty log message ***
+*	
+*	Revision 1.16  2006/03/09 22:26:46  niels
+*	fix 4466075
+*	
+*	Revision 1.15  2006/03/09 22:20:14  niels
+*	fix 4466075
+*	
+*	Revision 1.14  2006/03/09 21:40:44  niels
+*	fix 4466075
+*	
+*	Revision 1.13  2006/02/09 00:21:50  niels
+*	merge chardonnay branch to tot
+*	
+*	Revision 1.12.4.1  2005/08/06 01:31:31  collin
+*	*** empty log message ***
+*	
+*	Revision 1.12  2005/02/18 03:19:03  niels
+*	fix isight
+*	
+*	Revision 1.11  2004/04/19 21:51:49  niels
+*	*** empty log message ***
+*	
+*	Revision 1.10  2004/03/25 00:00:23  niels
+*	fix panic allocating large physical address spaces
+*	
+*	Revision 1.9  2003/10/31 02:40:58  niels
+*	*** empty log message ***
+*	
+*	Revision 1.8  2003/08/26 05:11:21  niels
+*	*** empty log message ***
+*	
+*	Revision 1.7  2003/08/25 08:39:15  niels
+*	*** empty log message ***
+*	
+*	Revision 1.6  2003/08/18 23:18:14  niels
+*	*** empty log message ***
+*	
+*	Revision 1.5  2003/08/08 22:30:32  niels
+*	*** empty log message ***
+*	
+*	Revision 1.4  2003/07/30 05:22:14  niels
+*	*** empty log message ***
+*	
+*	Revision 1.3  2003/07/29 22:49:22  niels
+*	*** empty log message ***
+*	
+*	Revision 1.2  2003/07/21 06:52:58  niels
+*	merge isoch to TOT
+*	
+*	Revision 1.1.2.5  2003/07/18 00:17:41  niels
+*	*** empty log message ***
+*	
+*	Revision 1.1.2.4  2003/07/14 22:08:53  niels
+*	*** empty log message ***
+*	
+*	Revision 1.1.2.3  2003/07/11 18:15:33  niels
+*	*** empty log message ***
+*	
+*	Revision 1.1.2.2  2003/07/03 22:10:24  niels
+*	fix iidc/dv rcv
+*	
+*	Revision 1.1.2.1  2003/07/01 20:54:06  niels
+*	isoch merge
+*	
+*/
+
+#import <IOKit/firewire/IOFireWireFamilyCommon.h>
+
+#import <libkern/c++/OSObject.h>
+#import <libkern/c++/OSSet.h>
+#import <IOKit/IOTypes.h>
+
+class IODCLProgram ;
+class OSIterator ;
+class IOFireWireLink ;
+class IOMemoryMap ;
+
+/*! @class IOFWDCL
+*/
+
+class IOFWDCL : public OSObject
+{
+	OSDeclareAbstractStructors( IOFWDCL ) ;
+	
+	public:
+	
+		typedef void (*Callback)( void * refcon ) ;
+
+		enum
+		{
+			kDynamic					= BIT(1)//kNuDCLDynamic,
+			,kUpdateBeforeCallback		= BIT(2)//kNuDCLUpdateBeforeCallback
+			,kUser						= BIT(18) // kNuDCLUser
+			,kBigEndianUpdates			= BIT(19) // NOTE: Don't change this without making similar change to IOFireWireLib's NuDCL::Export(...)!
+		} ;
+
+		class InternalData 
+		{
+			public:
+			
+				IOFWDCL *			lastBranch ;
+		} ;
+
+	protected:
+		
+		IOFWDCL*			fBranch ;
+		Callback			fCallback ;
+		volatile UInt32 *	fTimeStampPtr ;
+		UInt32				fRangeCount ;
+		IOVirtualRange *	fRanges ;
+		OSSet*				fUpdateList ;
+		OSIterator *		fUpdateIterator ;
+		volatile UInt32 *	fUserStatusPtr ;
+		void*				fRefcon ;
+		UInt32				fFlags ;
+		
+		InternalData *		fLoLevel ;
+
+	public:
+
+		//
+		// IOFWDCL public API:
+		//
+		
+		virtual bool		initWithRanges ( 
+											OSSet * 				updateSet, 
+											unsigned 				rangesCount = 0, 
+											IOVirtualRange 			ranges [] = NULL ) ;
+
+		void				setBranch( IOFWDCL* branch ) ;
+		IOFWDCL*			getBranch()	const ;
+		void				setTimeStampPtr ( UInt32* timeStampPtr ) ;
+		UInt32*				getTimeStampPtr () const ;
+		void				setCallback( Callback callback ) ;
+		Callback			getCallback() const ;
+		void				setStatusPtr( UInt32* statusPtr ) ;
+		UInt32*				getStatusPtr() const ;
+		void				setRefcon( void * refcon ) ;
+		void *				getRefcon() const ;
+		const OSSet*		getUpdateList() const ;
+		
+		virtual IOReturn	addRange ( IOVirtualRange& range ) ;
+		virtual IOReturn	setRanges ( UInt32 numRanges, IOVirtualRange ranges[] ) ;
+		virtual UInt32		getRanges( UInt32 maxRanges, IOVirtualRange ranges[] ) const ;
+		virtual UInt32		countRanges() ;
+		virtual IOReturn	getSpan( IOVirtualRange& result ) const ;
+		virtual IOByteCount	getSize() const ;
+		IOReturn			appendUpdateList( IOFWDCL* updateDCL ) ;
+		IOReturn			setUpdateList( OSSet* updateList ) ;
+		void				emptyUpdateList() ; 
+		void				setFlags( UInt32 flags ) ;
+		UInt32				getFlags() const ;
+		
+
+		virtual void		update() = 0 ;
+
+		// OSObject
+		
+		virtual void		free () ;
+		
+	public:
+		
+		//
+		// internal use only; please don't use... 
+		//
+		
+		virtual IOReturn				compile( IODCLProgram & , bool & ) = 0 ;
+		virtual void					link () = 0 ;
+
+		OSMetaClassDeclareReservedUnused ( IOFWDCL, 4 ) ;		// used to be relink()
+
+	public :
+		virtual bool					interrupt( bool &, IOFWDCL * & ) = 0 ;
+		virtual void					finalize ( IODCLProgram & ) ;
+		virtual IOReturn				importUserDCL (
+														UInt8 *				data,
+														IOByteCount &		dataSize,
+														IOMemoryMap *		bufferMap,
+														const OSArray *		dcl ) ;
+			
+	protected :
+	
+		friend class IOFWDCLFriend ;
+		
+	public :
+	
+		// dump DCL info...
+		virtual void					debug() ;
+
+	public:
+		
+		//
+		// internal use only; please don't use... 
+		//
+		
+		virtual bool					checkForInterrupt() = 0 ;
+
+    OSMetaClassDeclareReservedUsed ( IOFWDCL, 0 ) ;
+    OSMetaClassDeclareReservedUnused ( IOFWDCL, 1 ) ;
+    OSMetaClassDeclareReservedUnused ( IOFWDCL, 2 ) ;
+    OSMetaClassDeclareReservedUnused ( IOFWDCL, 3 ) ;
+//	OSMetaClassDeclareReservedUnused ( ***, 4 ) ;			// used above
+
+} ;
+
+#pragma mark -
+
+/*! @class IOFWReceiveDCL
+*/
+
+class IOFWReceiveDCL : public IOFWDCL
+{
+	OSDeclareAbstractStructors( IOFWReceiveDCL )
+
+	protected :
+	
+		UInt8		fHeaderBytes ;
+		bool		fWait ;
+	
+	public:
+
+		// me
+		virtual bool		initWithParams( 
+											OSSet *				updateSet, 
+											UInt8				headerBytes, 
+											unsigned			rangesCount, 
+											IOVirtualRange		ranges [] ) ;	
+		IOReturn			setWaitControl( bool wait ) ;
+
+	public :
+
+		// internal use only:
+		virtual IOReturn				importUserDCL (
+														UInt8 *				data,
+														IOByteCount &		dataSize,
+														IOMemoryMap *		bufferMap,
+														const OSArray *		dcl ) ;
+	
+	protected :
+	
+		virtual void		debug() ;
+
+} ;
+
+#pragma mark -
+
+/*! @class IOFWSendDCL
+*/
+
+class IOFWSendDCL : public IOFWDCL
+{
+	OSDeclareAbstractStructors( IOFWSendDCL )
+
+	protected:
+	
+		UInt32 * 	fUserHeaderPtr ;			// pointer to 2 quadlets containing isoch header for this packet
+		UInt32 *	fUserHeaderMaskPtr ;		// pointer to 2 quadlets; used to mask header quadlets
+		IOFWDCL *	fSkipBranchDCL ;
+		Callback	fSkipCallback ;
+		void *		fSkipRefcon ;
+		UInt8		fSync ;
+		UInt8		fTag ;
+
+	public:
+
+		// OSObject
+		virtual void		free() ;
+		
+		// IOFWDCL
+		virtual IOReturn	addRange ( IOVirtualRange& range ) ;
+		virtual IOReturn	setRanges ( UInt32 numRanges, IOVirtualRange ranges[] ) ;
+
+		// me
+		virtual bool		initWithParams( OSSet * 				updateSet, 
+											unsigned 				rangesCount = 0, 
+											IOVirtualRange 			ranges [] = NULL,
+											UInt8					sync = 0,
+											UInt8					tag = 0 ) ;
+		
+		void				setUserHeaderPtr( UInt32* userHeaderPtr, UInt32 * maskPtr ) ;
+		UInt32 *			getUserHeaderPtr() ;
+		UInt32 *			getUserHeaderMask() ;
+		void				setSkipBranch( IOFWDCL * skipBranchDCL ) ;
+		IOFWDCL *			getSkipBranch() const ;
+		void				setSkipCallback( Callback callback ) ;
+		Callback			getSkipCallback() const ;
+		void				setSkipRefcon( void * refcon = 0 ) ;
+		void *				getSkipRefcon() const ;										
+		void				setSync( UInt8 sync ) ;
+		UInt8				getSync() const ;												
+		void				setTag( UInt8 tag ) ;											
+		UInt8				getTag() const ;
+
+	public :
+	
+		// internal use only:
+		virtual IOReturn				importUserDCL (
+														UInt8 *				data,
+														IOByteCount &		dataSize,
+														IOMemoryMap *		bufferMap,
+														const OSArray *		dcl ) ;
+	protected :
+	
+		virtual void		debug() ;
+} ;
+
+#pragma mark -
+
+/*! @class IOFWSkipCycleDCL
+*/
+
+class IOFWSkipCycleDCL : public IOFWDCL
+{
+	OSDeclareAbstractStructors( IOFWSkipCycleDCL )
+
+	public:
+	
+		virtual bool		init() ;
+		
+		virtual IOReturn	addRange ( IOVirtualRange& range ) ;
+		virtual IOReturn	setRanges ( UInt32 numRanges, IOVirtualRange ranges[] ) ;
+		virtual IOReturn	getSpan( IOVirtualRange& result ) ;
+
+	protected :
+	
+		virtual void		debug() ;
+} ;
diff --git a/i386/include/IOKit/firewire/IOFWDCLPool.h b/i386/include/IOKit/firewire/IOFWDCLPool.h
new file mode 100644
index 0000000..005b62a
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWDCLPool.h
@@ -0,0 +1,160 @@
+/*
+ *  IOFWNuDCLPool.h
+ *  IOFireWireFamily
+ *
+ *  Created by Niels on Fri Mar 07 2003.
+ *  Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ *	$Log: IOFWDCLPool.h,v $
+ *	Revision 1.15  2008/11/14 00:17:12  arulchan
+ *	fix for rdar://5939334
+ *	
+ *	Revision 1.14  2008/03/03 23:31:42  ayanowit
+ *	another gcc-42 fix.
+ *	
+ *	Revision 1.13  2007/01/26 20:52:31  ayanowit
+ *	changes to user-space isoch stuff to support 64-bit apps.
+ *	
+ *	Revision 1.12  2006/02/09 00:21:50  niels
+ *	merge chardonnay branch to tot
+ *	
+ *	Revision 1.11  2005/04/12 20:09:13  niels
+ *	fix memory leak importing NuDCL programs from user space
+ *	
+ *	Revision 1.10.20.2  2006/01/31 04:49:50  collin
+ *	*** empty log message ***
+ *	
+ *	Revision 1.10  2003/11/07 21:24:28  niels
+ *	*** empty log message ***
+ *	
+ *	Revision 1.9  2003/11/07 21:01:18  niels
+ *	*** empty log message ***
+ *	
+ *	Revision 1.8  2003/08/25 08:39:15  niels
+ *	*** empty log message ***
+ *	
+ *	Revision 1.7  2003/08/22 18:15:16  niels
+ *	*** empty log message ***
+ *	
+ *	Revision 1.6  2003/08/15 04:36:55  niels
+ *	*** empty log message ***
+ *	
+ *	Revision 1.5  2003/07/30 05:22:14  niels
+ *	*** empty log message ***
+ *	
+ *	Revision 1.4  2003/07/21 08:48:20  niels
+ *	*** empty log message ***
+ *	
+ *	Revision 1.3  2003/07/21 07:52:13  niels
+ *	*** empty log message ***
+ *	
+ *	Revision 1.2  2003/07/21 06:52:58  niels
+ *	merge isoch to TOT
+ *	
+ *	Revision 1.1.2.3  2003/07/11 18:15:34  niels
+ *	*** empty log message ***
+ *	
+ *	Revision 1.1.2.2  2003/07/09 21:24:00  niels
+ *	*** empty log message ***
+ *	
+ *	Revision 1.1.2.1  2003/07/01 20:54:06  niels
+ *	isoch merge
+ *	
+ */
+
+#import <libkern/c++/OSObject.h>
+#import <libkern/c++/OSArray.h>
+#import <IOKit/IOTypes.h>
+
+class IOFireWireLink ;
+class IOFWDCL ;
+class IOFWReceiveDCL ;
+class IOFWSendDCL ;
+class IOFWSkipCycleDCL ;
+class IOFireWireUserClient ;
+class IOMemoryDescriptor ;
+class IOMemoryMap ;
+class OSSet;
+
+/*! @class IOFWDCLPool
+	@discussion You should never subclass IOFWDCLPool 
+*/
+
+class IOFWDCLPool : public OSObject
+{
+	OSDeclareAbstractStructors( IOFWDCLPool )
+
+	friend class IOFireWireUserClient ;
+	friend class IOFWUserLocalIsochPort ;
+	
+	protected:
+	
+		class Expansion*		fReserved ;		// for class expansion
+
+		IOFireWireLink *		fLink ;
+		UInt8					fCurrentTag ;
+		UInt8					fCurrentSync ;
+		OSArray*				fProgram ;
+		DCLNuDCLLeader			fLeader ;
+	
+	public:
+		
+		// OSObject
+		
+		virtual void						free() ;
+		
+		// me
+		
+		virtual bool	 					initWithLink ( IOFireWireLink& link, UInt32 capacity ) ;
+		
+		virtual void						setCurrentTagAndSync ( UInt8 tag, UInt8 sync ) ;
+		
+		virtual IOFWReceiveDCL*				appendReceiveDCL ( 
+													OSSet * 				updateSet, 
+													UInt8 					headerBytes,
+													UInt32					rangesCount,
+													IOVirtualRange			ranges[] ) ;
+		virtual IOFWSendDCL*				appendSendDCL ( 
+													OSSet * 				updateSet, 
+													UInt32					rangesCount,
+													IOVirtualRange			ranges[] ) ;
+		virtual IOFWSkipCycleDCL*			appendSkipCycleDCL () ;
+		virtual const OSArray *				getProgramRef () const ;
+		
+	protected :
+	
+		IOReturn							importUserProgram (
+													IOMemoryDescriptor *	userExportDesc,
+													unsigned				bufferRangeCount,
+													IOAddressRange			bufferRanges[],
+													IOMemoryMap *			bufferMap ) ;
+		IOReturn							importUserDCL(
+													IOFWDCL *				dcl,
+													void * 					importData,
+													IOByteCount &			dataSize,
+													IOMemoryMap *			bufferMap ) ;
+													
+
+	protected :
+	
+		virtual IOFWReceiveDCL *			allocReceiveDCL () = 0 ;
+		virtual IOFWSendDCL *				allocSendDCL () = 0 ;
+		virtual IOFWSkipCycleDCL *			allocSkipCycleDCL () = 0 ;
+
+	private :
+	
+		void								appendDCL( IOFWDCL * dcl ) ;
+
+	public :
+	
+		DCLCommand *						getProgram() ;
+													
+    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 0);
+    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 1);
+    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 2);
+    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 3);
+    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 4);
+    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 5);
+    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 6);
+    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 7);		
+} ;
diff --git a/i386/include/IOKit/firewire/IOFWDCLProgram.h b/i386/include/IOKit/firewire/IOFWDCLProgram.h
new file mode 100644
index 0000000..cf91f06
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWDCLProgram.h
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOFWDCLPROGRAM_H
+#define _IOKIT_IOFWDCLPROGRAM_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+#include <IOKit/firewire/IOFireWireBus.h>
+#include <IOKit/IOMemoryCursor.h>
+
+/*! @class IODCLProgram
+*/
+class IODCLProgram : public OSObject
+{
+    OSDeclareAbstractStructors(IODCLProgram)
+
+	private :	
+	
+		void * 						reserved0 ;//fDCLTaskToKernel;
+		void * 						reserved1 ;//fDataTaskToKernel;
+		void *		 				reserved2 ;//fDataBase;
+		void *		 				reserved3 ;//		IOMemoryDescriptor *		fDCLDesc;
+		IOMemoryMap *				fBufferMem ;
+		void *		 				reserved5 ;//		IOMemoryCursor *			fDataCursor;
+
+	protected:
+	
+	/*! @struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+		*/    
+		struct ExpansionData 
+		{
+			IOFWIsochResourceFlags		resourceFlags ;
+		};
+		
+	/*! @var reserved
+		Reserved for future use.  (Internal use only)  */
+		ExpansionData *					fExpansionData ;
+	
+	public :
+	
+		virtual void			setIsochResourceFlags ( IOFWIsochResourceFlags flags ) ;	// formerly getPhysicalSegs()
+		IOFWIsochResourceFlags	getIsochResourceFlags () const ;
+		
+	protected:
+	
+		virtual void 			free () ;
+	
+	public:
+	
+		virtual bool 			init ( IOFireWireBus::DCLTaskInfo * info = NULL ) ;
+		virtual IOReturn 		allocateHW (
+										IOFWSpeed 			speed, 
+										UInt32 				chan) = 0;
+		virtual IOReturn 		releaseHW () = 0;
+		virtual IOReturn 		compile (
+										IOFWSpeed 			speed, 
+										UInt32 				chan) = 0;
+		virtual IOReturn 		notify (
+												IOFWDCLNotificationType		notificationType,
+												DCLCommand ** 				dclCommandList, 
+												UInt32 						numDCLCommands ) = 0;
+		virtual IOReturn 		start () = 0;
+		virtual void 			stop () = 0;
+		virtual IOReturn 		pause ();
+		virtual IOReturn 		resume ();
+				
+		virtual void			setForceStopProc( 
+												IOFWIsochChannel::ForceStopNotificationProc proc, 
+												void * 						refCon,
+												IOFWIsochChannel *			channel ) ;
+	protected :
+	
+		void					generateBufferMap( DCLCommand * program ) ;
+		IOReturn				virtualToPhysical( 
+												IOVirtualRange						ranges[], 
+												unsigned							rangeCount, 
+												IOMemoryCursor::IOPhysicalSegment	outSegments[], 
+												unsigned &							outPhysicalSegmentCount, 
+												unsigned							maxSegments ) ;
+
+	public :
+	
+		IOMemoryMap *			getBufferMap() const ;
+
+	public :
+	
+		// close/open isoch workloop gate...
+		// clients should not need to call these.
+		virtual void			closeGate() = 0 ;
+		virtual void			openGate() = 0 ;
+
+		virtual IOReturn		synchronizeWithIO() = 0 ;
+		
+	private:
+	
+		OSMetaClassDeclareReservedUsed(IODCLProgram, 0);
+		OSMetaClassDeclareReservedUsed(IODCLProgram, 1);
+		OSMetaClassDeclareReservedUnused(IODCLProgram, 2);
+		OSMetaClassDeclareReservedUnused(IODCLProgram, 3);
+		OSMetaClassDeclareReservedUnused(IODCLProgram, 4);
+	
+};
+
+#endif /* ! _IOKIT_IOFWDCLPROGRAM_H */
+
diff --git a/i386/include/IOKit/firewire/IOFWDCLTranslator.h b/i386/include/IOKit/firewire/IOFWDCLTranslator.h
new file mode 100644
index 0000000..e02067c
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWDCLTranslator.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
+ *
+ * A DCL program to interpret (in software) a program that's too complicated
+ * for the DMA engine.
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOFWDCLTRANSLATOR_H
+#define _IOKIT_IOFWDCLTRANSLATOR_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/firewire/IOFWDCLProgram.h>
+
+
+/*! @class IODCLTranslator
+*/
+
+class IODCLTranslator : public IODCLProgram
+{
+    OSDeclareAbstractStructors(IODCLTranslator)
+
+protected:
+    enum
+    {
+        kNumPingPongs				= 2,
+        kNumPacketsPerPingPong		= 500,
+        kMaxIsochPacketSize			= 1000,
+        kPingPongBufferSize			= kNumPingPongs * kNumPacketsPerPingPong * kMaxIsochPacketSize
+    };
+
+    // Opcodes and buffer for pingpong program
+    DCLLabel			fStartLabel;
+    DCLTransferPacket	fTransfers[kNumPingPongs*kNumPacketsPerPingPong];
+    DCLCallProc			fCalls[kNumPingPongs];
+    DCLJump				fJumpToStart;
+    UInt8				fBuffer[kPingPongBufferSize];
+
+    IODCLProgram *		fHWProgram;				// Hardware program executing our opcodes
+    DCLCommand*			fToInterpret;			// The commands to interpret
+    DCLCommand*			fCurrentDCLCommand;		// Current command to interpret
+    int					fPingCount;				// Are we pinging or ponging?
+    UInt32				fPacketHeader;
+
+    static void ListeningDCLPingPongProc(DCLCommand* pDCLCommand);
+    static void TalkingDCLPingPongProc(DCLCommand* pDCLCommand);
+
+public:
+    virtual bool init(DCLCommand* toInterpret);
+    virtual IOReturn allocateHW(IOFWSpeed speed, UInt32 chan);
+    virtual IOReturn releaseHW();
+    virtual IOReturn notify(IOFWDCLNotificationType notificationType,
+	DCLCommand** dclCommandList, UInt32 numDCLCommands);
+    virtual void stop();
+
+    DCLCommand* getTranslatorOpcodes();
+    void setHWProgram(IODCLProgram *program);
+};
+
+/*! @class IODCLTranslateTalk
+*/
+
+class IODCLTranslateTalk : public IODCLTranslator
+{
+    OSDeclareDefaultStructors(IODCLTranslateTalk)
+
+protected:
+
+public:
+    virtual IOReturn compile(IOFWSpeed speed, UInt32 chan);
+    virtual IOReturn start();
+
+};
+
+/*! @class IODCLTranslateListen
+*/
+
+class IODCLTranslateListen : public IODCLTranslator
+{
+    OSDeclareDefaultStructors(IODCLTranslateListen)
+
+protected:
+
+public:
+    virtual IOReturn compile(IOFWSpeed speed, UInt32 chan);
+    virtual IOReturn start();
+
+};
+#endif /* ! _IOKIT_IOFWDCLPROGRAM_H */
+
diff --git a/i386/include/IOKit/firewire/IOFWIsochChannel.h b/i386/include/IOKit/firewire/IOFWIsochChannel.h
new file mode 100644
index 0000000..4bbd6c8
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWIsochChannel.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOFWISOCHCHANNEL_H
+#define _IOKIT_IOFWISOCHCHANNEL_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+
+enum
+{
+    kFWIsochChannelUnknownCondition	= 0,
+    kFWIsochChannelNotEnoughBandwidth	= 1,
+    kFWIsochChannelChannelNotAvailable	= 2
+};
+
+class IOFireWireController;
+class IOFWIsochChannel;
+class IOFWIsochPort;
+class OSSet;
+class IOFWReadQuadCommand;
+class IOFWCompareAndSwapCommand;
+
+/*! @class IOFWIsochChannel
+*/
+class IOFWIsochChannel : public OSObject
+{
+    OSDeclareDefaultStructors(IOFWIsochChannel)
+
+	public:
+
+		typedef IOReturn (ForceStopNotificationProc)(void* refCon, IOFWIsochChannel* channel, UInt32 stopCondition );
+
+protected:
+    IOFireWireController *			fControl;
+    ForceStopNotificationProc* 		fStopProc;
+    void *							fStopRefCon;
+    IOFWIsochPort *					fTalker;
+    OSSet *							fListeners;
+    bool							fDoIRM;
+    UInt32							fBandwidth;	// Allocation units used
+    UInt32							fPacketSize;
+    IOFWSpeed						fPrefSpeed;
+    IOFWSpeed						fSpeed;		// Actual speed used
+    UInt32							fChannel;	// Actual channel used
+    IOFWReadQuadCommand *			fReadCmd;
+    IOFWCompareAndSwapCommand *		fLockCmd;
+    UInt32							fGeneration;	// When bandwidth was allocated
+    
+	IOLock *		fLock;
+	
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+    static void					threadFunc( void * arg );
+    
+    virtual IOReturn			updateBandwidth(bool claim);
+    virtual void				reallocBandwidth( UInt32 generation );	
+    virtual void				free();
+
+public:
+    // Called from IOFireWireController
+    virtual bool 				init( IOFireWireController *control, bool doIRM, UInt32 packetSize, 
+										IOFWSpeed prefSpeed, ForceStopNotificationProc* stopProc,
+										void *stopRefCon );
+    virtual void 				handleBusReset();
+
+    // Called by clients
+    virtual IOReturn 			setTalker(IOFWIsochPort *talker);
+    virtual IOReturn 			addListener(IOFWIsochPort *listener);
+
+    virtual IOReturn 			allocateChannel();
+    virtual IOReturn 			releaseChannel();
+    virtual IOReturn 			start();
+    virtual IOReturn 			stop();
+
+protected:
+	// handles IRM and channel determination and allocation.
+	// called by both user and kernel isoch channels
+	IOReturn					allocateChannelBegin( IOFWSpeed speed, UInt64 allowedChans, UInt32 * channel = NULL ) ;
+
+	// handles IRM and channel allocation.
+	// called by both user and kernel isoch channels
+	IOReturn					releaseChannelComplete() ;
+
+	IOReturn	checkMemoryInRange( IOMemoryDescriptor * memory );
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFWIsochChannel, 0);
+    OSMetaClassDeclareReservedUnused(IOFWIsochChannel, 1);
+    OSMetaClassDeclareReservedUnused(IOFWIsochChannel, 2);
+    OSMetaClassDeclareReservedUnused(IOFWIsochChannel, 3);
+
+};
+
+typedef IOFWIsochChannel::ForceStopNotificationProc 	FWIsochChannelForceStopNotificationProc ;
+typedef IOFWIsochChannel::ForceStopNotificationProc* 	FWIsochChannelForceStopNotificationProcPtr ;
+
+#endif /* ! _IOKIT_IOFWISOCHCHANNEL_H */
+
diff --git a/i386/include/IOKit/firewire/IOFWIsochPort.h b/i386/include/IOKit/firewire/IOFWIsochPort.h
new file mode 100644
index 0000000..793c5e9
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWIsochPort.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
+ *
+ * IOFWIsochPort is an abstract object that represents hardware on the bus
+ * (locally or remotely) that sends or receives isochronous packets.
+ * Local ports are implemented by the local device driver,
+ * Remote ports are implemented by the driver for the remote device.
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOFWISOCHPORT_H
+#define _IOKIT_IOFWISOCHPORT_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+
+/*! @class IOFWIsochPort
+*/
+
+class IOFWIsochPort : public OSObject
+{
+    OSDeclareAbstractStructors(IOFWIsochPort)
+
+public:
+	// Return maximum speed and channels supported
+	// (bit n set = chan n supported)
+    virtual IOReturn getSupported(IOFWSpeed &maxSpeed, UInt64 &chanSupported) = 0;
+
+	// Allocate hardware resources for port
+    virtual IOReturn allocatePort(IOFWSpeed speed, UInt32 chan) = 0;
+    virtual IOReturn releasePort() = 0;		// Free hardware resources
+    virtual IOReturn start() = 0;		// Start port processing packets
+    virtual IOReturn stop() = 0;		// Stop processing packets
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFWIsochPort, 0);
+    OSMetaClassDeclareReservedUnused(IOFWIsochPort, 1);
+
+};
+
+#endif /* ! _IOKIT_IOFWISOCHPORT_H */
+
diff --git a/i386/include/IOKit/firewire/IOFWLocalIsochPort.h b/i386/include/IOKit/firewire/IOFWLocalIsochPort.h
new file mode 100644
index 0000000..493f719
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWLocalIsochPort.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
+ *
+ * IOFWIsochPort is an abstract object that represents hardware on the bus
+ * (locally or remotely) that sends or receives isochronous packets.
+ * Local ports are implemented by the local device driver,
+ * Remote ports are implemented by the driver for the remote device.
+ *
+ * HISTORY
+ *
+ * $Log: IOFWLocalIsochPort.h,v $
+ * Revision 1.10  2004/06/10 20:57:36  niels
+ * *** empty log message ***
+ *
+ * Revision 1.9  2003/08/30 00:16:44  collin
+ * *** empty log message ***
+ *
+ * Revision 1.8  2003/08/15 04:36:55  niels
+ * *** empty log message ***
+ *
+ * Revision 1.7  2003/07/29 22:49:22  niels
+ * *** empty log message ***
+ *
+ * Revision 1.6  2003/07/21 06:52:58  niels
+ * merge isoch to TOT
+ *
+ * Revision 1.5.14.1  2003/07/01 20:54:07  niels
+ * isoch merge
+ *
+ */
+
+
+#ifndef _IOKIT_IOFWLOCALISOCHPORT_H
+#define _IOKIT_IOFWLOCALISOCHPORT_H
+
+#import <IOKit/firewire/IOFireWireFamilyCommon.h>
+#import <IOKit/firewire/IOFWIsochPort.h>
+
+class IOFireWireController;
+class IODCLProgram;
+
+/*! @class IOFWLocalIsochPort
+*/
+class IOFWLocalIsochPort : public IOFWIsochPort
+{
+    OSDeclareDefaultStructors(IOFWLocalIsochPort)
+
+	protected:
+	
+		IOFireWireController *	fControl;
+		IODCLProgram *			fProgram;
+	
+	/*! @struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+		*/    
+		struct ExpansionData
+		{
+		} ;
+	
+		ExpansionData *			fExpansion ;
+
+	protected :
+	
+		virtual void 			free ( void ) ;
+
+	public:
+	
+		virtual bool 			init (
+										IODCLProgram *			program, 
+										IOFireWireController *	control ) ;
+	
+		// Return maximum speed and channels supported
+		// (bit n set = chan n supported)
+		virtual IOReturn 		getSupported (
+										IOFWSpeed &				maxSpeed, 
+										UInt64 &				chanSupported ) ;
+	
+		// Allocate hardware resources for port
+		virtual IOReturn 		allocatePort (
+										IOFWSpeed 				speed, 
+										UInt32 					chan ) ;
+		virtual IOReturn 		releasePort ( void ) ;	// Free hardware resources
+		virtual IOReturn 		start ( void ) ;		// Start port processing packets
+		virtual IOReturn 		stop ( void ) ;		// Stop processing packets
+	
+		/*! @function notify
+			@abstract Informs hardware of a change to the DCL program.
+			@param notificationType Type of change.
+			@param dclCommandList List of DCL commands that have been changed.
+			@param numDCLCommands Number of commands in list.
+			@result IOKit error code. */
+		virtual IOReturn 		notify(
+										IOFWDCLNotificationType 	notificationType,
+										DCLCommand ** 				dclCommandList, 
+										UInt32 						numDCLCommands ) ;
+		static void				printDCLProgram (
+										const DCLCommand *		dcl,
+										UInt32					count = 0,
+										void (*printFN)( const char *format, ...) = NULL,
+										unsigned				lineDelayMS = 0 ) ;
+		IOReturn				setIsochResourceFlags (
+										IOFWIsochResourceFlags	flags ) ;
+		IODCLProgram *			getProgramRef() const ;
+
+		IOReturn				synchronizeWithIO() ;
+
+	private:
+
+		OSMetaClassDeclareReservedUnused ( IOFWLocalIsochPort, 0 ) ;
+		OSMetaClassDeclareReservedUnused ( IOFWLocalIsochPort, 1 ) ;
+};
+
+#endif /* ! _IOKIT_IOFWLOCALISOCHPORT_H */
+
diff --git a/i386/include/IOKit/firewire/IOFWPHYPacketListener.h b/i386/include/IOKit/firewire/IOFWPHYPacketListener.h
new file mode 100644
index 0000000..ea2c6ff
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWPHYPacketListener.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2007 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+#ifndef _IOFWPHYPACKETLISTENER_H_
+#define _IOFWPHYPACKETLISTENER_H_
+
+#include <libkern/c++/OSObject.h>
+
+class IOFireWireController;
+
+// Callback when phy packet is received
+typedef void (*FWPHYPacketCallback)( void *refcon, UInt32 data1, UInt32 data2 );
+
+/*! @class IOFWPHYPacketListener
+*/
+
+class IOFWPHYPacketListener : public OSObject
+{
+	OSDeclareDefaultStructors( IOFWPHYPacketListener );
+
+	friend class IOFireWireController;
+	
+protected:
+	
+	IOFireWireController *		fControl;
+	FWPHYPacketCallback			fCallback;
+	void *						fRefCon;
+
+	static IOFWPHYPacketListener * createWithController( IOFireWireController * controller );
+
+    virtual bool initWithController( IOFireWireController * control );
+    virtual void free( void );
+
+public:
+
+	virtual IOReturn activate( void );
+	virtual void deactivate( void );
+
+	virtual void setCallback( FWPHYPacketCallback callback );
+	virtual void setRefCon( void * refcon );
+	virtual void * getRefCon( void );
+
+protected:
+	virtual void processPHYPacket( UInt32 data1, UInt32 data2 );
+
+    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 0 );
+    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 1 );
+    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 2 );
+    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 3 );
+    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 4 );
+    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 5 );
+    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 6 );
+    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 7 );
+    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 8 );
+    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 9 );
+};
+
+#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/firewire/IOFWPhysicalAddressSpace.h b/i386/include/IOKit/firewire/IOFWPhysicalAddressSpace.h
new file mode 100644
index 0000000..b1944f4
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWPhysicalAddressSpace.h
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+#ifndef _IOKIT_IOFWPHYSICALADDRESSSPACE_H
+#define _IOKIT_IOFWPHYSICALADDRESSSPACE_H
+
+#include <IOKit/firewire/IOFWAddressSpace.h>
+#include <IOKit/IODMACommand.h>
+
+/*
+ * Direct physical memory <-> FireWire address.
+ * Accesses to these addresses may be handled automatically by the
+ * hardware without notification.
+ *
+ * The 64 bit FireWire address of (32 bit) physical addr xxxx:xxxx is hostNode:0000:xxxx:xxxx
+ */
+
+class IOFWPhysicalAddressSpace;
+
+struct FWSegment
+{
+	FWAddress	address;
+	UInt32		length;
+};
+
+#pragma mark -
+
+/*! 
+	@class IOFWPhysicalAddressSpaceAux
+*/
+
+class IOFWPhysicalAddressSpaceAux : public IOFWAddressSpaceAux
+{
+    OSDeclareDefaultStructors(IOFWPhysicalAddressSpaceAux)
+
+	friend class IOFWAddressSpace;
+	friend class IOFWPhysicalAddressSpace;
+	
+protected:
+	
+	/*! 
+		@struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+    */  
+	  
+    struct ExpansionData { };
+
+	/*! 
+		@var reserved
+		Reserved for future use.  (Internal use only)  
+	*/
+    
+	ExpansionData *reserved;
+	
+	IODMACommand *	fDMACommand;
+	bool			fDMACommandPrepared;
+	
+public:
+    virtual bool init( IOFWAddressSpace * primary );
+	virtual	void free();
+
+	void setDMACommand( IODMACommand * dma_command );
+	IODMACommand * getDMACommand( void ); 
+	UInt64 getPhysicalSegment( UInt64 offset, UInt64 * length );
+	
+	IOReturn prepare( void );
+	IOReturn synchronize( IOOptionBits options );
+	IOReturn complete( void );
+
+	bool isPrepared( void );
+
+	IOReturn getSegments( UInt64 * offset, FWSegment * fw_segments, UInt32 * num_segments );
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 0);
+    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 1);
+    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 2);
+    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 3);
+    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 4);
+    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 5);
+    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 6);
+    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 7);
+    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 8);
+    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 9);
+	
+};
+
+#pragma mark -
+
+/*! 
+	@class IOFWPhysicalAddressSpace
+*/
+
+class IOFWPhysicalAddressSpace : public IOFWAddressSpace
+{
+    OSDeclareDefaultStructors(IOFWPhysicalAddressSpace)
+
+	friend class IOFWPhysicalAddressSpaceAux;
+
+protected:
+    
+	IOMemoryDescriptor *	fMem;	// unused
+    vm_size_t				fLen;	// unused
+	
+    virtual	void 					free();
+
+public:
+
+/*!	@function	init
+	@abstract	Initialize physical address space.
+	@param		bus	Points to IOFireWireBus object.
+	@result		returns true if success, else false */
+	virtual bool init( IOFireWireBus * bus );
+	
+/*!	@function	initWithDesc
+	@abstract	Initialize physical address space with IOMemoryDescriptor.
+	@param		bus	Points to IOFireWireBus object.
+	@param		mem	Points to IOMemoryDescriptor.
+	@result		returns true if success, else false */
+    virtual bool initWithDesc(IOFireWireBus *bus,
+                                        IOMemoryDescriptor *mem);
+
+/*!	@function	doRead
+	@abstract	A method for processing an address space read request
+	@param		nodeID	FireWire Read from nodeID.
+	@param		speed	at this 'speed'.
+	@param		addr	with FireWire address 'addr'.
+	@param		len		read 'len' bytes from nodeID.
+	@param		buf		points to a memory descriptor containing the packet data.
+	@param		offset	start from this 'offset' in 'buf'.
+	@param		refcon  Can be queried for extra info about the request.
+	@result		UIn32	returns kFWResponseComplete on success */
+    virtual UInt32 doRead(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len, 
+							IOMemoryDescriptor **buf, IOByteCount * offset,
+							IOFWRequestRefCon refcon);
+
+/*!	@function	doWrite
+	@abstract	A method for processing an address space write request
+	@param		nodeID	FireWire Write to nodeID.
+	@param		speed	at this 'speed'.
+	@param		addr	with FireWire address 'addr'.
+	@param		len		write 'len' bytes to nodeID.
+	@param		buf		obtain bytes from location given by 'buf'.
+	@param		reqrefcon  Can be queried for extra info about the request.
+	@result		UIn32	returns kFWResponseComplete on success */
+    virtual UInt32 doWrite(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
+                           const void *buf, IOFWRequestRefCon refcon);
+
+/*!	@function	getMemoryDescriptor
+	@abstract	Gets the memory descriptor, which is associated to this 
+				PhysicalAddressSpace.
+	@param		none.
+	@result		returns the IOMemoryDescriptor */
+	IOMemoryDescriptor * getMemoryDescriptor( void );
+
+/*!	@function	setMemoryDescriptor
+	@abstract	Sets the memory descriptor, which will be associated to this 
+				PhysicalAddressSpace.
+	@param		none.
+	@result		returns the IOMemoryDescriptor */
+	IOReturn setMemoryDescriptor( IOMemoryDescriptor * descriptor );
+
+/*!	@function	getLength
+	@abstract	Get the length of the memory backed by PhysicalAddressSpace.
+	@param		none.
+	@result		returns the length */
+	UInt64 getLength( void );
+
+/*!	@function	setDMACommand
+	@abstract	Set the DMACommand for this PhysicalAddressSpace.
+	@param		dma_command	Points to IODMACommand object.
+	@result		none */
+	inline void setDMACommand( IODMACommand * dma_command )
+		{ ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->setDMACommand( dma_command ); };
+		
+/*!	@function	getDMACommand
+	@abstract	Get the DMACommand from this PhysicalAddressSpace.
+	@param		none.
+	@result		return previously assigned IODMACommand, null if not initialized */
+	inline IODMACommand * getDMACommand( void )
+		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->getDMACommand(); };
+
+/*!	@function	initWithDMACommand
+	@abstract	Initialize physical address space with IODMACommand.
+	@param		bus	Points to IOFireWireBus object.
+	@param		command	Points to IODMACommand.
+	@result		returns true if success, else false */
+	virtual bool initWithDMACommand( IOFireWireBus * control, IODMACommand * command );
+	
+/*!	@function	prepare
+	@abstract	Prepare the IODMACommand used by this PhysicalAddressSpace.
+	@param		none.
+	@result		returns kIOReturnSuccess on success */
+	inline IOReturn prepare( void )
+		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->prepare(); };
+
+/*!	@function	synchronize
+	@abstract	synchronize the IODMACommand used by this PhysicalAddressSpace.
+	@param		none.
+	@result		returns kIOReturnSuccess on success */
+	inline IOReturn synchronize( IOOptionBits options )
+		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->synchronize( options ); };
+		 
+/*!	@function	complete
+	@abstract	complete the IODMACommand used by this PhysicalAddressSpace.
+	@param		none.
+	@result		returns kIOReturnSuccess on success */
+	inline IOReturn complete( void )
+		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->complete(); };
+
+/*!	@function	isPrepared
+	@abstract	Inspects whether the IODMACommand was prepared in this PhysicalAddressSpace.
+	@param		none.
+	@result		returns true if prepared, else false */
+	inline bool isPrepared( void )
+		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->isPrepared(); };
+
+/*!	@function	getSegments
+	@abstract	Returns the scatter gather list of memory segments from the IODMACommand
+				used in this PhysicalAddressSpace.
+	@param		offset		input/output parameter, defines the starting and ending offset in the memory 
+							descriptor, relative to any offset passed to the prepare() method.
+				FWSegment 	Points to an array of memory segments.
+				num_segments Size of the FWSegment array.   
+	@result		returns kIOReturnSuccess on success */
+	inline IOReturn getSegments( UInt64 * offset, FWSegment * fw_segments, UInt32 * num_segments )
+		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->getSegments( offset, fw_segments, num_segments ); };
+
+/*!	@function	checkMemoryInRange
+	@abstract	Validates the IOMemoryDescriptor, which is used to initialize the PhysicalAddressSpace.
+	@param		memory	Points to a valid IOMemoryDescriptor.
+	@result		returns kIOReturnSuccess on success */
+	IOReturn checkMemoryInRange( IOMemoryDescriptor * memory );
+		
+protected:
+
+	UInt64 getPhysicalSegment( UInt64 offset, UInt64 * length )
+		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->getPhysicalSegment( offset, length); };
+			
+	virtual IOFWAddressSpaceAux * createAuxiliary( void );
+    	
+};
+
+#endif
diff --git a/i386/include/IOKit/firewire/IOFWPseudoAddressSpace.h b/i386/include/IOKit/firewire/IOFWPseudoAddressSpace.h
new file mode 100644
index 0000000..02c2c30
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWPseudoAddressSpace.h
@@ -0,0 +1,370 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+#ifndef _IOKIT_IOFWPSEUDOADDRESSSPACE_H
+#define _IOKIT_IOFWPSEUDOADDRESSSPACE_H
+
+#include <IOKit/firewire/IOFWAddressSpace.h>
+
+/*
+ * If installed, this callback is invoked for drivers which 
+ * would like to coalesce incoming writes and do batch processing 
+ * of incoming block write packets.
+ * This callback can be installed by calling setARxReqIntCompleteHandler
+ * method in IOFWPseudoAddressSpace object. 
+ */
+typedef void (*IOFWARxReqIntCompleteHandler)( void * refcon );
+
+/*
+ * Pseudo firewire addresses usually represent emulated registers of some kind.
+ * Accesses to these addresses will result in the owner being notified.
+ * 
+ * Virtual addresses should not have zero as the top 16 bits of the 48 bit local address,
+ * since that may look like a physical address to hardware (eg. OHCI).
+ * if reader is NULL then reads will not be allowed.
+ * if writer is NULL then writes will not be allowed.
+ * if either is NULL then lock requests will not be allowed.
+ * refcon is passed back as the first argument of read and write callbacks.
+ */
+
+class IOFWPseudoAddressSpace;
+
+#pragma mark -
+
+/*! 
+	@class IOFWPseudoAddressSpaceAux
+*/
+
+class IOFWPseudoAddressSpaceAux : public IOFWAddressSpaceAux
+{
+    OSDeclareDefaultStructors(IOFWPseudoAddressSpaceAux)
+
+	friend class IOFWAddressSpace;
+	friend class IOFWPseudoAddressSpace;
+	friend class IOFireWireController;
+		
+protected:
+	
+    struct MemberVariables 
+	{ 		
+		IOFWARxReqIntCompleteHandler		fARxReqIntCompleteHandler;
+		void *	  							fARxReqIntCompleteHandlerRefcon;	
+	};
+	  
+    MemberVariables * fMembers;
+
+public:
+     
+	virtual bool init( IOFWAddressSpace * primary );
+	virtual	void free();
+
+protected:
+
+	bool createMemberVariables( void );
+	void destroyMemberVariables( void );
+	
+	virtual void handleARxReqIntComplete();
+		
+public:
+
+/*!	@function setARxReqIntCompleteHandler
+	@abstract Installs a callback to receive notification, when FWIM has completed
+			  ARxReqInt processing and no incoming packets are left in the queue.
+	@param refcon	Client's callback object.
+	@param handler	Client callback to be invoked, at the end of interrupt processing.
+	@result none.	*/	
+	virtual void setARxReqIntCompleteHandler( void * refcon, IOFWARxReqIntCompleteHandler handler );
+
+	virtual bool intersects( IOFWAddressSpace * space );
+	
+private:
+
+    OSMetaClassDeclareReservedUsed(IOFWPseudoAddressSpaceAux, 0);
+    OSMetaClassDeclareReservedUsed(IOFWPseudoAddressSpaceAux, 1);
+    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 2);
+    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 3);
+    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 4);
+    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 5);
+    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 6);
+    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 7);
+    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 8);
+    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 9);
+	
+};
+
+/*! 
+	@class IOFWPseudoAddressSpace
+*/
+
+class IOFWPseudoAddressSpace : public IOFWAddressSpace
+{
+    OSDeclareDefaultStructors(IOFWPseudoAddressSpace)
+
+	friend class IOFWPseudoAddressSpaceAux;
+	friend class IOFireWireController;
+	
+protected:
+
+    IOMemoryDescriptor*	fDesc;
+    void *				fRefCon;
+    FWReadCallback		fReader;
+    FWWriteCallback		fWriter;
+    FWAddress			fBase;
+    UInt32				fLen;
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+    static	OSData *	allocatedAddresses; // unused
+    
+    virtual	void 					free();
+	
+public:
+
+/*!	@function	simpleReader
+	@abstract	A method for processing an address space read request
+	@param		refcon		Client's callback object.
+	@param		nodeID		FireWire Read from nodeID.
+	@param		speed		at this 'speed'.
+	@param		addr		with FireWire address 'addr'.
+	@param		len			read 'len' bytes from nodeID.
+	@param		buf			points to a memory descriptor containing the packet data.
+	@param		offset		start from this 'offset' in 'buf'.
+	@param		reqrefcon	Can be queried for extra info about the request.
+	@result		UIn32		returns kFWResponseComplete on success */
+    static 	UInt32 					simpleReader(
+											void*					refcon,
+											UInt16 					nodeID,
+											IOFWSpeed &				speed,
+											FWAddress 				addr,
+											UInt32 					len,
+											IOMemoryDescriptor**	buf,
+											IOByteCount* 			offset,
+                                            IOFWRequestRefCon		reqrefcon);
+
+/*!	@function	simpleWriter
+	@abstract	A method for processing an address space write request
+	@param		refcon		Client's callback object.
+	@param		nodeID		FireWire Write to nodeID.
+	@param		speed		at this 'speed'.
+	@param		addr		with FireWire address 'addr'.
+	@param		len			write 'len' bytes to nodeID.
+	@param		buf			obtain bytes from location given by 'buf'.
+	@param		reqrefcon	Can be queried for extra info about the request.
+	@result		UIn32		returns kFWResponseComplete on success */
+    static 	UInt32 					simpleWriter(
+											void*					refcon,
+											UInt16 					nodeID,
+											IOFWSpeed&				speed,
+											FWAddress 				addr,
+											UInt32 					len,
+											const void*				buf,
+                                            IOFWRequestRefCon		reqrefcon);
+protected:
+
+    // Get a unique address range
+    IOReturn						allocateAddress(
+											FWAddress*				addr,
+											UInt32 					len);
+    // free address
+    void							freeAddress(
+											FWAddress 				addr,
+											UInt32 					len);
+
+public:
+
+    static IOFWPseudoAddressSpace*	readWrite(
+											FWAddress 				addr,
+											UInt32 					len, 
+											FWReadCallback 			reader,
+											FWWriteCallback 		writer,
+											void*					refcon);
+
+/*!	@function	simpleRead
+	@abstract	Create an address space object to handle read-only memory (eg. the local ROM)
+				handles everything itself
+	@param		bus		Points to IOFireWireBus object.
+	@param		addr	Points to starting address for the Pseudo Address Space.
+	@param		len		Length of the Pseudo Address Space.
+	@param		data	The virtual address of the first byte in the memory.
+	@result		returns valid IOFWPseudoAddressSpace on success, null on failure */
+    static IOFWPseudoAddressSpace*	simpleRead(
+                                            IOFireWireBus*			bus,
+			                                FWAddress*				addr,
+											UInt32 					len,
+											const void*				data);
+
+/*!	@function	simpleReadFixed
+	@abstract	Create an address space object to handle fixed read-only memory (eg. the local ROM)
+				handles everything itself
+	@param		bus		Points to IOFireWireBus object.
+	@param		addr	Points to starting address for the Pseudo Address Space.
+	@param		len		Length of the Pseudo Address Space.
+	@param		data	The virtual address of the first byte in the memory.
+	@result		returns valid IOFWPseudoAddressSpace on success, null on failure */
+    static IOFWPseudoAddressSpace*	simpleReadFixed(
+                                            IOFireWireBus*			bus,
+			                                FWAddress 				addr,
+											UInt32 					len,
+											const void*				data);
+
+/*!	@function	simpleRW
+	@abstract	Create an address space object to handle r/w memory
+				handles everything itself
+	@param		bus		Points to IOFireWireBus object.
+	@param		addr	Points to starting address for the Pseudo Address Space.
+	@param		len		Length of the Pseudo Address Space.
+	@param		data	The virtual address of the first byte in the memory.
+	@result		returns valid IOFWPseudoAddressSpace on success, null on failure */
+    static IOFWPseudoAddressSpace*	simpleRW(
+                                            IOFireWireBus*			bus,
+                                			FWAddress*				addr,
+											UInt32 					len,
+											void *					data);
+											
+/*!	@function	simpleRW
+	@abstract	Create an address space object to handle r/w memory
+				handles everything itself
+	@param		bus		Points to IOFireWireBus object.
+	@param		addr	Points to starting address for the Pseudo Address Space.
+	@param		data	The virtual address of the first byte in the memory.
+	@result		returns valid IOFWPseudoAddressSpace on success, null on failure */
+    static IOFWPseudoAddressSpace*	simpleRW(
+                                            IOFireWireBus*			bus,
+                                			FWAddress*				addr,
+											IOMemoryDescriptor *	data);
+											
+/*!	@function	initAll
+	@abstract	Initialize an address space object to handle r/w memory
+	@param		bus		Points to IOFireWireBus object.
+	@param		addr	Points to starting address for the Pseudo Address Space.
+	@param		len		Length of the Pseudo Address Space.
+	@param		reader	Callback handler for incoming Read.
+	@param		writer	Callback handler for incoming Write.
+	@param		refcon	Client's callback object.
+	@result		returns true on success, false on failure */
+    virtual bool 					initAll(
+                                            IOFireWireBus*			bus,
+                							FWAddress*				addr,
+											UInt32 					len, 
+											FWReadCallback 			reader,
+											FWWriteCallback 		writer,
+											void*					refcon);
+											
+/*!	@function	initFixed
+	@abstract	Initialize a fixed address space at top of kCSRRegisterSpaceBaseAddressHi
+	@param		bus		Points to IOFireWireBus object.
+	@param		addr	Points to starting address for the Pseudo Address Space.
+	@param		reader	Callback handler for incoming Read.
+	@param		writer	Callback handler for incoming Write.
+	@param		refcon	Client's callback object.
+	@result		returns true on success, false on failure */
+    virtual bool 					initFixed(
+                                            IOFireWireBus*			bus,
+							                FWAddress 				addr,
+											UInt32 					len,
+                							FWReadCallback 			reader,
+											FWWriteCallback 		writer,
+											void*					refcon);
+
+/*!	@function	doRead
+	@abstract	A method for processing an address space read request
+	@param		nodeID	FireWire Read from nodeID.
+	@param		speed	at this 'speed'.
+	@param		addr	with FireWire address 'addr'.
+	@param		len		read 'len' bytes from nodeID.
+	@param		buf		points to a memory descriptor containing the packet data.
+	@param		offset	start from this 'offset' in 'buf'.
+	@param		reqrefcon  Can be queried for extra info about the request.
+	@result		UIn32	returns kFWResponseComplete on success */
+    virtual UInt32 					doRead(
+											UInt16 					nodeID, 
+											IOFWSpeed &				speed, 
+											FWAddress 				addr, 
+											UInt32 					len,
+                               				IOMemoryDescriptor **	buf, 
+											IOByteCount * 			offset,
+                                            IOFWRequestRefCon		reqrefcon);
+/*!	@function	doWrite
+	@abstract	A method for processing an address space write request
+	@param		nodeID	FireWire Write to nodeID.
+	@param		speed	at this 'speed'.
+	@param		addr	with FireWire address 'addr'.
+	@param		len		write 'len' bytes to nodeID.
+	@param		buf		obtain bytes from location given by 'buf'.
+	@param		reqrefcon  Can be queried for extra info about the request.
+	@result		UIn32	returns kFWResponseComplete on success */
+    virtual UInt32 					doWrite(
+											UInt16 					nodeID,
+											IOFWSpeed&				speed,
+											FWAddress 				addr,
+											UInt32 					len, 
+											const void*				buf,
+                                            IOFWRequestRefCon		reqrefcon);
+
+/*!	@function	contains
+	@abstract	returns number of bytes starting at addr in this space
+	@result		0 if it doesn't contain the address
+	*/
+    virtual UInt32					contains(FWAddress addr);
+
+/*!	@function	simpleRWFixed
+	@abstract	Create a Read/Write fixed address space at top of kCSRRegisterSpaceBaseAddressHi.
+	@param		control	Points to IOFireWireBus object.
+	@param		addr	Points to starting address for the Pseudo Address Space.
+	@param		len		Length of the address range.
+	@param		data	The virtual address of the first byte in the memory.
+	@result		returns valid IOFWPseudoAddressSpace on success, null on failure */
+	static IOFWPseudoAddressSpace * simpleRWFixed( IOFireWireBus *control, FWAddress addr, UInt32 len, const void *data );
+
+protected:
+	
+	virtual IOFWAddressSpaceAux * createAuxiliary( void );
+
+protected:
+	inline void handleARxReqIntComplete( void )
+		{ ((IOFWPseudoAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->handleARxReqIntComplete(); }
+	
+public:
+/*!	@function setARxReqIntCompleteHandler
+	@abstract Installs a callback to receive notification, when FWIM has completed
+			  ARxReqInt processing and no incoming packets are left in the queue.
+	@param refcon	Client's callback object.
+	@param handler	Client callback to be invoked, at the end of interrupt processing.
+	@result none.	*/	
+	inline void setARxReqIntCompleteHandler( void * refcon, IOFWARxReqIntCompleteHandler handler )
+		{ ((IOFWPseudoAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->setARxReqIntCompleteHandler( refcon, handler ); }
+			
+private:
+
+    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpace, 0);
+    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpace, 1);
+    
+};
+
+#endif
diff --git a/i386/include/IOKit/firewire/IOFWRegs.h b/i386/include/IOKit/firewire/IOFWRegs.h
new file mode 100644
index 0000000..97c7078
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWRegs.h
@@ -0,0 +1,73 @@
+/*
+* Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+*
+* @APPLE_LICENSE_HEADER_START@
+* 
+* The contents of this file constitute Original Code as defined in and
+* are subject to the Apple Public Source License Version 1.1 (the
+* "License").  You may not use this file except in compliance with the
+* License.  Please obtain a copy of the License at
+* http://www.apple.com/publicsource and read it before using this file.
+* 
+* This Original Code and all software distributed under the License are
+* distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+* License for the specific language governing rights and limitations
+* under the License.
+* 
+* @APPLE_LICENSE_HEADER_END@
+*/
+/*
+	File:		IOFWRegs.h
+
+	Copyright:	© 1996-1999 by Apple Computer, Inc., all rights reserved.
+
+*/
+
+#ifndef __IOFWREGS_H__
+#define __IOFWREGS_H__
+
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+
+#ifndef NEW_ERROR_CODES
+
+//	 
+// (!)	The following error codes are obsolete...
+//		Please use the error codes defined in IOFireWireFamilyCommon.h
+//
+
+enum {
+	inUseErr					= -4160,				// Item already in use
+	notFoundErr					= -4161,				// Item not found
+	timeoutErr					= -4162,				// Something timed out
+	busReconfiguredErr			= -4163,				// Bus was reconfigured
+	invalidIDTypeErr			= -4166,				// Given ID is of an invalid type for the requested operation.
+	alreadyRegisteredErr		= -4168,				// Item has already been registered.
+	disconnectedErr				= -4169,				// Target of request has been disconnected.
+	retryExceededErr			= -4170,				// Retry limit was exceeded.
+	addressRangeErr				= -4171,				// Address is not in range.
+	addressAlignmentErr			= -4172,				// Address is not of proper alignment.
+
+	multipleTalkerErr			= -4180,				// Tried to install multiple talkers
+	channelActiveErr			= -4181,				// Operation not permitted when channel is active
+	noListenerOrTalkerErr		= -4182,				// Every isochronous channel must have one talker and at least
+														// one listener
+	noChannelsAvailableErr		= -4183,				// No supported isochronous channels are available
+	channelNotAvailableErr		= -4184,				// Required channel was not available.
+	invalidIsochPortIDErr		= -4185,				// An isochronous port ID is invalid.
+	invalidFWReferenceTypeErr	= -4186,				// Operation does not support type of given reference ID
+	separateBusErr				= -4187,				// Two or more entities are on two or more busses and cannot be associated with eachother.
+	badSelfIDsErr				= -4188,				// Received self IDs are bad.
+
+//zzz Do we own these next ID numbers?
+	cableVoltageTooLowErr		= -4190,				// Cable power below device's minimum voltage
+	cablePowerInsufficientErr	= -4191					// Can't grant power request at this time
+};
+
+
+#endif //NEW_ERROR_CODES
+
+#endif /* __IOFWREGS_H */
+
diff --git a/i386/include/IOKit/firewire/IOFWSimpleContiguousPhysicalAddressSpace.h b/i386/include/IOKit/firewire/IOFWSimpleContiguousPhysicalAddressSpace.h
new file mode 100644
index 0000000..606a9b2
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWSimpleContiguousPhysicalAddressSpace.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+#ifndef _IOFWSIMPLECONTIGUOUSPHYSICALADDRESSSPACE_H_
+#define _IOFWSIMPLECONTIGUOUSPHYSICALADDRESSSPACE_H_
+
+#include <IOKit/firewire/IOFWSimplePhysicalAddressSpace.h>
+
+/*! @class IOFWSimpleContiguousPhysicalAddressSpace
+*/
+
+class IOFWSimpleContiguousPhysicalAddressSpace : public IOFWSimplePhysicalAddressSpace
+{
+	OSDeclareDefaultStructors( IOFWSimpleContiguousPhysicalAddressSpace )
+
+private:
+
+	void * fSimpleContigPhysSpaceMembers;
+	
+	IOReturn cachePhysicalAddress( void );
+
+protected:	
+	virtual bool createMemberVariables( void );
+	virtual void destroyMemberVariables( void );
+
+public:
+
+	virtual bool init( IOFireWireBus * control, vm_size_t size, IODirection direction );
+	virtual void free( void );
+
+	FWAddress getFWAddress( void );
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 0);
+    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 1);
+    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 2);
+    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 3);
+    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 4);
+    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 5);
+    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 6);
+    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 7);
+    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 8);
+    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 9);
+
+};
+
+#endif
diff --git a/i386/include/IOKit/firewire/IOFWSimplePhysicalAddressSpace.h b/i386/include/IOKit/firewire/IOFWSimplePhysicalAddressSpace.h
new file mode 100644
index 0000000..83a76a4
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWSimplePhysicalAddressSpace.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+#ifndef _IOFWSIMPLEPHYSICALADDRESSSPACE_H_
+#define _IOFWSIMPLEPHYSICALADDRESSSPACE_H_
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/IODMACommand.h>
+#include <IOKit/firewire/IOFWPhysicalAddressSpace.h>
+
+/*! @class IOFWSimplePhysicalAddressSpace
+*/
+
+class IOFWSimplePhysicalAddressSpace : public IOFWPhysicalAddressSpace
+{
+	OSDeclareDefaultStructors( IOFWSimplePhysicalAddressSpace )
+	
+private:
+
+	void *	fSimplePhysSpaceMembers;
+		
+	IOReturn allocateMemory( void );	
+	void deallocateMemory( void );
+
+protected:	
+	virtual bool createMemberVariables( void );
+	virtual void destroyMemberVariables( void );
+
+public:
+
+	virtual bool init( IOFireWireBus * control, vm_size_t size, IODirection direction, bool contiguous = false );
+	virtual void free( void );
+
+	IOVirtualAddress getVirtualAddress( void );
+
+private:
+    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 0);
+    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 1);
+    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 2);
+    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 3);
+    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 4);
+    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 5);
+    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 6);
+    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 7);
+    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 8);
+    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 9);
+	
+};
+
+#endif
diff --git a/i386/include/IOKit/firewire/IOFWSyncer.h b/i386/include/IOKit/firewire/IOFWSyncer.h
new file mode 100644
index 0000000..0fa497f
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWSyncer.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1998-2007 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+#ifndef _IOFWSYNCER_H
+#define _IOFWSYNCER_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOLocks.h>
+
+class IOFWSyncer : public OSObject
+{
+    OSDeclareDefaultStructors(IOFWSyncer)
+
+private:
+    // The spin lock that is used to guard the 'threadMustStop' variable. 
+    IOSimpleLock *guardLock;
+    volatile bool threadMustStop;
+    IOReturn fResult;
+    virtual void free();
+    virtual void privateSignal();
+
+public:
+
+    static IOFWSyncer * create(bool twoRetains = true);
+
+    virtual bool init(bool twoRetains);
+    virtual void reinit();
+    virtual IOReturn wait(bool autoRelease = true);
+    virtual void signal(IOReturn res = kIOReturnSuccess,
+					bool autoRelease = true);
+};
+
+#endif /* !_IOFWSYNCER */
+
diff --git a/i386/include/IOKit/firewire/IOFWUserObjectExporter.h b/i386/include/IOKit/firewire/IOFWUserObjectExporter.h
new file mode 100644
index 0000000..5d12307
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWUserObjectExporter.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 1998-2008 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*! @class IOFWUserObjectExporter
+	@discussion An IOFWUserObjectExporter is for internal use only. You should never subclass IOFWUserObjectExporter 
+*/
+
+	namespace IOFireWireLib
+	{
+		typedef UInt32      UserObjectHandle;
+	}
+
+#ifdef KERNEL
+
+	class IOFWUserObjectExporter : public OSObject
+	{
+		OSDeclareDefaultStructors (IOFWUserObjectExporter )
+
+		public :
+		
+			typedef void (*CleanupFunction)( const OSObject * obj );
+			typedef void (*CleanupFunctionWithExporter)( const OSObject * obj, IOFWUserObjectExporter * );
+			
+		private :
+		
+			unsigned							fCapacity;
+			unsigned							fObjectCount;
+			const OSObject **					fObjects;
+			CleanupFunctionWithExporter *		fCleanupFunctions;
+			IOLock *							fLock;
+			OSObject *							fOwner;
+			
+		public :
+		
+			static IOFWUserObjectExporter *		createWithOwner( OSObject * owner );
+			bool								initWithOwner( OSObject * owner );
+
+			virtual bool			init();
+	
+			virtual void			free ();
+			virtual bool			serialize ( OSSerialize * s ) const;
+			
+			// me
+			IOReturn				addObject ( OSObject * obj, CleanupFunction cleanup, IOFireWireLib::UserObjectHandle * outHandle );
+			void					removeObject ( IOFireWireLib::UserObjectHandle handle );
+			
+			// the returned object is retained! This is for thread safety.. if someone else released
+			// the object from the pool after you got it, you be in for Trouble
+			// Release the returned value when you're done!!
+			const OSObject *		lookupObject ( IOFireWireLib::UserObjectHandle handle ) const;
+			const OSObject *		lookupObjectForType( IOFireWireLib::UserObjectHandle handle, const OSMetaClass * toType ) const;
+			void					removeAllObjects ();
+
+			void					lock () const;
+			void					unlock () const;
+			
+			OSObject *				getOwner() const;
+			
+			const IOFireWireLib::UserObjectHandle	lookupHandle ( OSObject * object ) const;
+		
+			// don't subclass, but just in case someone does...
+			
+		private:
+		
+			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 0);
+			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 1);
+			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 2);
+			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 3);
+			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 4);
+			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 5);
+			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 6);
+			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 7);
+				
+	};
+
+#endif
diff --git a/i386/include/IOKit/firewire/IOFWUtils.h b/i386/include/IOKit/firewire/IOFWUtils.h
new file mode 100644
index 0000000..1a0ffc3
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFWUtils.h
@@ -0,0 +1,32 @@
+/*
+ *  IOFWUtils.h
+ *  IOFireWireFamily
+ *
+ *  Created by Niels on Fri Aug 16 2002.
+ *  Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#import <IOKit/IOTypes.h>
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Useful FireWire utility functions.
+//
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+UInt16 FWComputeCRC16(const UInt32 *pQuads, UInt32 numQuads);
+UInt16 FWUpdateCRC16(UInt16 crc16, UInt32 quad);
+
+UInt32 AddFWCycleTimeToFWCycleTime( UInt32 cycleTime1, UInt32 cycleTime2 );
+UInt32 SubtractFWCycleTimeFromFWCycleTime( UInt32 cycleTime1, UInt32 cycleTime2);
+
+void IOFWGetAbsoluteTime( AbsoluteTime * result );
+	
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/i386/include/IOKit/firewire/IOFireWireBus.h b/i386/include/IOKit/firewire/IOFireWireBus.h
new file mode 100644
index 0000000..053bfe4
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFireWireBus.h
@@ -0,0 +1,373 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOFIREWIREBUS_H
+#define _IOKIT_IOFIREWIREBUS_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/firewire/IOFWIsochChannel.h>
+#include <IOKit/firewire/IOFWAddressSpace.h>
+#include <IOKit/firewire/IOFWCommand.h>
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+
+extern const OSSymbol *gFireWireROM;
+extern const OSSymbol *gFireWireNodeID;
+extern const OSSymbol *gFireWireSelfIDs;
+extern const OSSymbol *gFireWireSpeed;
+extern const OSSymbol *gFireWireUnit_Spec_ID;
+extern const OSSymbol *gFireWireUnit_SW_Version;
+extern const OSSymbol *gFireWireVendor_ID;
+extern const OSSymbol *gFireWire_GUID;
+extern const OSSymbol *gFireWireVendor_Name;
+extern const OSSymbol *gFireWireProduct_Name;
+extern const OSSymbol *gFireWireModel_ID;
+extern const OSSymbol *gFireWireTDM;
+
+class IOFireWireDevice;
+class IOLocalConfigDirectory;
+class IOFWLocalIsochPort;
+class IOFireWirePowerManager;
+class IOFireWireBus;
+class IOFWDCLPool;
+class IOFWSimpleContiguousPhysicalAddressSpace;
+class IOFWSimplePhysicalAddressSpace;
+class IOFWUserObjectExporter;
+
+#pragma mark -
+
+/*! 
+	@class IOFireWireBusAux
+*/
+
+class IOFireWireBusAux : public OSObject
+{
+    OSDeclareAbstractStructors(IOFireWireBusAux)
+
+	friend class IOFireWireBus;
+	
+	protected:
+			
+		/*! 
+			@struct ExpansionData
+			@discussion This structure will be used to expand the capablilties of the class in the future.
+		*/  
+		
+		struct ExpansionData { };
+	
+		/*! 
+			@var reserved
+			Reserved for future use.  (Internal use only)  
+		*/
+		
+		ExpansionData * reserved;
+	
+	public :
+	
+		virtual IOFWDCLPool *							createDCLPool ( unsigned capacity ) const = 0 ;
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 32);
+		virtual UInt8 getMaxRec( void ) = 0;
+
+		virtual UInt64 getFireWirePhysicalAddressMask( void ) = 0;
+		virtual UInt32 getFireWirePhysicalAddressBits( void ) = 0;
+		virtual UInt64 getFireWirePhysicalBufferMask( void ) = 0;
+		virtual UInt32 getFireWirePhysicalBufferBits( void ) = 0;
+
+		virtual IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction ) = 0;
+		virtual IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction ) = 0;
+
+		virtual IOFWUserObjectExporter * getSessionRefExporter( void ) = 0;
+	
+	private:
+		OSMetaClassDeclareReservedUsed(IOFireWireBusAux, 0);
+		OSMetaClassDeclareReservedUsed(IOFireWireBusAux, 1);
+		OSMetaClassDeclareReservedUsed(IOFireWireBusAux, 2);
+		OSMetaClassDeclareReservedUsed(IOFireWireBusAux, 3);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 4);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 5);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 6);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 7);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 8);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 9);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 10);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 11);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 12);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 13);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 14);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 15);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 16);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 17);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 18);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 19);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 20);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 21);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 22);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 23);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 24);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 25);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 26);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 27);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 28);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 29);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 30);
+		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 31);
+		
+};
+
+#pragma mark -
+
+/*! 
+	@class IOFireWireBus
+	@abstract IOFireWireBus is a public class the provides access to
+		general FireWire functionality...
+*/
+
+class IOFireWireBus : public IOService
+{
+    OSDeclareAbstractStructors(IOFireWireBus)
+
+public:
+
+	struct DCLTaskInfoAux
+	{
+		unsigned version ;
+		union	// u
+		{
+			struct	// v0
+			{
+				IOMemoryMap * bufferMemoryMap ;				// This field required to get physical addresses to program DMA.
+															// If NULL, we try to make the map ourselves.
+															// If you created a buffer memory descriptor
+															// for your program's buffers, just call map() on it
+															// and pass the returned object here...
+			} v0 ;
+			
+			struct  // v1
+			{
+				IOMemoryMap * bufferMemoryMap ;				// same as 'bufferMemoryMap' from version 0, above.
+				
+				IOWorkLoop * workloop ;						// A workloop on which to run callbacks for this port..
+															// Can be NULL to use FireWire isochronous workloop...
+															// The workloop will be retained by the program object.
+			} v1 ;
+			
+			struct
+			{
+				IOMemoryMap * bufferMemoryMap ;				// same as 'bufferMemoryMap' from version 0, above.
+				
+				IOWorkLoop * workloop ;						// A workloop on which to run callbacks for this port..
+															// Can be NULL to use FireWire isochronous workloop...
+															// The workloop will be retained by the program object.
+				IOFWIsochPortOptions options ;				// extra options
+			} v2 ;
+		} u ;
+	} ;
+	
+	// this struct has been redefined for our next generation isochronous architecture,
+	// but is backwards compatible with the old definition.. This means we should
+	// be safe when an old-style driver is loaded..
+	// To use DCLTaskInfo (see createLocalIsochPort) make sure all 'unused' fields are set to 0 or NULL
+	// and that auxInfo points to a valid DCLTaskInfoAux struct, defined above.
+	
+	struct DCLTaskInfo
+	{
+		task_t 				unused0 ;
+		vm_address_t 		unused1 ;
+		UInt32 				unused2 ;
+		vm_address_t 		unused3 ;
+		UInt32 				unused4 ;
+		void				(*unused5)(void) ;
+		DCLTaskInfoAux *	auxInfo ;	// Refcon for user call
+	} ;
+
+	static const IORegistryPlane * gIOFireWirePlane;
+
+	IOFireWireBusAux * fAuxiliary;
+
+    // Create an Isochronous Channel object
+    virtual IOFWIsochChannel *createIsochChannel(
+        bool doIRM, UInt32 bandwidth, IOFWSpeed prefSpeed,
+        IOFWIsochChannel::ForceStopNotificationProc stopProc=NULL,
+        void *stopRefCon=NULL) = 0;
+ 
+	/*!	@function createLocalIsochPort
+		@abstract Create a local isochronous port to run the given DCL program
+		@param talking Pass true to create a talker port; pass false to create a listener port.
+		@param opcodes A pointer to your DCL program (linked list of DCLCommand structs)
+			To use an IOFWDCL/IOFWDCLPool program, pass the DCLCommand returned by
+			IOFWDCLPool::getProgram().
+		@param info (Optional) Pointer to DCLTaskInfo struct containing additional
+			configuration information. If you have an IOMemoryMap for your DCL program data buffers,
+			pass it here. You can also pass an IOWorkLoop if you want to use your own
+			workloop to handle callbacks for the created port object.
+		@param startEvent Specifies a bus condition on which the port should start receiving/sending packets
+			Must be kFWDCLImmediateEvent, kFWDCLCycleEvent, or kFWDCLSyBitsEvent.
+			Pass kFWDCLImmediateEvent to start without waiting when start() is called. Pass kFWDCLCycleEvent
+			to start() transmitting at a specified bus cycle time. Pass kFWDCLSyBitsEvent (receive only)
+			to start receiving packets once an isochronous packet with a specified sync field arrives.
+		@param startState Pass the value for the desired start condition, as specified by 'startEvent'
+			kFWDCLImmediateEvent: set to 0
+			kFWDCLCycleEvent: the cycle timer value on which to start processing packets. For talker
+				ports, This value will be masked by 'startMask' and packet processing will be begin on the 
+				next cycle whose lowest bits match the masked value. For listener ports, pass a 15-bit value
+				containg to the low order two bits of cycleSeconds and the 13-bit cycleCount on which to start
+				processing packets.
+			kFWDCLSyBitsEvent: The value of the sync field on which to start receive packets. The value will be masked
+				by 'startMask'. For DCLCommand based isoch ports, processing will begin on the first received packet 
+				that has an isochronous header sync field matching 'startState'. For IOFWDCL/IOFWDCLPool based
+				ports, processing will pause on each IOFWDCL that has wait set to true until a packet that has
+				an isochronous header sync field matching 'startState' is received.
+		@result Returns an IOFWLocalIsochPort on success.*/
+    virtual IOFWLocalIsochPort *createLocalIsochPort(bool talking,
+        DCLCommand *opcodes, DCLTaskInfo *info = 0,
+        UInt32 startEvent = 0, UInt32 startState = 0, UInt32 startMask = 0) = 0;
+
+    virtual IOReturn getCycleTime(UInt32 &cycleTime) = 0;
+    virtual IOReturn getBusCycleTime(UInt32 &busTime, UInt32 &cycleTime) = 0;
+
+    // Methods to manipulate the local Config ROM
+    virtual IOReturn AddUnitDirectory(IOLocalConfigDirectory *unitDir) = 0;
+    virtual IOReturn RemoveUnitDirectory(IOLocalConfigDirectory *unitDir) = 0;
+
+    // Cause a bus reset
+    virtual IOReturn resetBus() = 0;
+
+    // Convert a firewire nodeID into the IOFireWireDevice for it
+    virtual IOFireWireDevice * nodeIDtoDevice(UInt32 generation, UInt16 nodeID) = 0;
+
+    // Execute specified function on workloop after specified delay
+    // Returned command is for delay, call it's cancel() function to cancel timeout.
+    virtual IOFWDelayCommand * createDelayedCmd(UInt32 uSecDelay, FWBusCallback func, void *refcon) = 0;
+
+    virtual IOFWPhysicalAddressSpace *createPhysicalAddressSpace(IOMemoryDescriptor *mem) = 0;
+    virtual IOFWPseudoAddressSpace *createPseudoAddressSpace(FWAddress *addr, UInt32 len,
+                                FWReadCallback reader, FWWriteCallback writer, void *refcon) = 0;
+
+
+    // Extract info about the async request
+    virtual bool isLockRequest(IOFWRequestRefCon refcon) = 0;
+    virtual bool isQuadRequest(IOFWRequestRefCon refcon) = 0;
+    virtual UInt32 getExtendedTCode(IOFWRequestRefCon refcon) = 0;
+
+    // How big (as a power of two) can packets sent to/received from the node be?
+    virtual int maxPackLog ( bool forSend, UInt16 nodeAddress) const = 0;
+
+    // How big (as a power of two) can packets sent from A to B be?
+    virtual int maxPackLog ( UInt16 nodeA, UInt16 nodeB) const = 0;
+
+    // Force given node to be root (via root holdoff Phy packet)
+    virtual IOReturn makeRoot ( UInt32 generation, UInt16 nodeID) = 0;
+
+    // Create address space at fixed address in initial register space
+    virtual IOFWPseudoAddressSpace * createInitialAddressSpace (	UInt32 addressLo, UInt32 len,
+																	FWReadCallback reader, FWWriteCallback writer, void *refcon) = 0;
+
+    // Get address space object for given address, if any
+    virtual IOFWAddressSpace *						getAddressSpace(FWAddress address) = 0;
+
+    // Extract info about the async request - was the request ack'ed complete already?
+    virtual bool									isCompleteRequest(IOFWRequestRefCon refcon) = 0;
+    
+    virtual IOFWAsyncStreamCommand *				createAsyncStreamCommand( UInt32 generation,
+															UInt32 channel, UInt32 sync, UInt32 tag, IOMemoryDescriptor *hostMem,
+															UInt32 size, int speed,FWAsyncStreamCallback completion=NULL, void *refcon=NULL) = 0;
+	virtual UInt32									hopCount(UInt16 nodeAAddress, UInt16 nodeBAddress ) = 0;
+	virtual UInt32									hopCount(UInt16 nodeAAddress ) = 0;
+	virtual IOFireWirePowerManager *				getBusPowerManager( void ) = 0;
+
+protected:
+
+	virtual IOFireWireBusAux *						createAuxiliary( void ) = 0;
+
+	public :
+	
+		inline IOFWDCLPool *						createDCLPool ( UInt32 capacity = 0 )			{ return fAuxiliary->createDCLPool ( capacity ) ; }
+		inline UInt8								getMaxRec( void )								{ return fAuxiliary->getMaxRec(); }
+
+		// get the physical addressing limitations for this controller
+
+		// returns the physical mask for memory addressable by the bus and this controller's DMA engine
+		// intended for use with IOBufferMemoryDescriptor::inTaskWithPhysicalMask()
+		// all current hardware is 32 bit --- currently returns 0x00000000FFFFFFFF
+		// this API is intended for allocating physical buffers. 
+		// it will not return more than 48 bits so that buffer addresses can be turned into FWAddresses
+		inline UInt64 getFireWirePhysicalAddressMask( void )
+			{ return fAuxiliary->getFireWirePhysicalAddressMask(); }
+		
+		// returns a count of the maximum addressing bits supported by the bus and this controller
+		// intended for use with IODMACommand::withSpecification()
+		// all current hardware is 32 bit --- currently returns 32
+		// this API is intended for allocating physical buffers. 
+		// it will not return more than 48 bits so that buffer addresses can be turned into FWAddresses
+		inline UInt32 getFireWirePhysicalAddressBits( void )
+			{ return fAuxiliary->getFireWirePhysicalAddressBits(); }
+
+		// returns the physical mask for memory addressable by this controller's DMA engine
+		// intended for use with IOBufferMemoryDescriptor::inTaskWithPhysicalMask()
+		// all current hardware is 32 bit --- currently returns 0x00000000FFFFFFFF
+		// this API is to allocate isoch and other buffers that don't need to be addressable by the bus 
+		// it may someday return as high 64 bits
+		inline UInt64 getFireWirePhysicalBufferMask( void )
+			{ return fAuxiliary->getFireWirePhysicalBufferMask(); }
+		
+		// returns a count of the maximum addressing bits supported by this controller
+		// intended for use with IODMACommand::withSpecification()
+		// all current hardware is 32 bit --- currently returns 32
+		// this API is to allocate isoch and other buffers that don't need to be addressable by the bus 
+		// it may someday return as high 64 bits
+		inline UInt32 getFireWirePhysicalBufferBits( void )
+			{ return fAuxiliary->getFireWirePhysicalBufferBits(); }
+
+		inline IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction )
+			{ return fAuxiliary->createSimpleContiguousPhysicalAddressSpace( size, direction ); }
+			
+		inline IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction )
+			{ return fAuxiliary->createSimplePhysicalAddressSpace( size, direction ); }
+
+		virtual IOFWAsyncStreamCommand * createAsyncStreamCommand( UInt32 generation,
+															UInt32 channel, UInt32 sync, UInt32 tag, IOMemoryDescriptor *hostMem,
+															UInt32 size, int speed,FWAsyncStreamCallback completion, void *refcon, bool	failOnReset) = 0;
+	
+		inline IOFWUserObjectExporter * getSessionRefExporter( void )
+			{ return fAuxiliary->getSessionRefExporter(); }
+	
+	private:
+	
+		OSMetaClassDeclareReservedUsed(IOFireWireBus, 0);
+		OSMetaClassDeclareReservedUsed(IOFireWireBus, 1);
+		OSMetaClassDeclareReservedUsed(IOFireWireBus, 2);
+		OSMetaClassDeclareReservedUsed(IOFireWireBus, 3);
+		OSMetaClassDeclareReservedUsed(IOFireWireBus, 4);
+		OSMetaClassDeclareReservedUsed(IOFireWireBus, 5);
+		OSMetaClassDeclareReservedUsed(IOFireWireBus, 6);
+		OSMetaClassDeclareReservedUsed(IOFireWireBus, 7);
+
+};
+
+#endif /* ! _IOKIT_IOFIREWIREBUS_H */
+
diff --git a/i386/include/IOKit/firewire/IOFireWireController.h b/i386/include/IOKit/firewire/IOFireWireController.h
new file mode 100644
index 0000000..e2f3ae1
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFireWireController.h
@@ -0,0 +1,1089 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
+ *
+ * HISTORY
+ *
+ */
+
+#ifndef _IOKIT_IOFIREWIRECONTROLLER_H
+#define _IOKIT_IOFIREWIRECONTROLLER_H
+
+#ifndef FIREWIREPRIVATE
+#warning Please do not include this file. Include IOFireWireBus.h instead.
+#endif
+
+#include <IOKit/IOEventSource.h>
+#include <IOKit/firewire/IOFireWireBus.h>
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+#include <IOKit/firewire/IOFireWireIRMAllocation.h>
+#include <IOKit/firewire/IOFWPHYPacketListener.h>
+#include <IOKit/firewire/IOFireWireMultiIsochReceive.h>
+
+class OSData;
+class IOWorkLoop;
+class IOEventSource;
+class IOFWQEventSource;
+class IOTimerEventSource;
+class IOMemoryDescriptor;
+class IOFireWireController;
+class IOFWAddressSpace;
+class IOFWPseudoAddressSpace;
+class IOFireWireNub;
+class IOFireWireDevice;
+class IOFireWireDeviceAux;
+class IOFireWireUnit;
+class IODCLProgram;
+class IOLocalConfigDirectory;
+class IOFireWireLink;
+class IOFireWireSBP2ORB;
+class IOFireWireSBP2Login;
+class IOFireWireROMCache;
+class IOFireWireLocalNode;
+class IOFWWorkLoop;
+class IOFireWireIRM;
+class IOFireWirePowerManager;
+class IOFWSimplePhysicalAddressSpace;
+class IOFWSimpleContiguousPhysicalAddressSpace;
+class IOFWAsyncStreamReceiver;
+class IOFWAsyncStreamListener;
+class IOFWUserVectorCommand;
+class IOFWAsyncPHYCommand;
+class IOFWPHYPacketListener;
+class IOFWUserPHYPacketListener;
+
+#if FIRELOGCORE
+class IOFireLog;
+class IOFireLogPublisher;
+#endif
+
+const UInt32 kMaxWaitForValidSelfID = 20; // Still invalid SelfID after 20 retries
+
+// Phy packet defs.
+
+enum
+{
+	kFWPhyPacketID					= FWBitRange (0, 1),
+	kFWPhyPacketIDPhase				= FWBitRangePhase (0, 1),
+
+	kFWPhyPacketPhyID				= FWBitRange (2, 7),
+	kFWPhyPacketPhyIDPhase			= FWBitRangePhase (2, 7)
+};
+
+enum
+{
+	kSelfIDPacketSize				= 8,
+	kMaxSelfIDs						= 4	// SelfID 0,1,3,8
+};
+
+enum
+{
+	kFWConfigurationPacketID		= 0,
+	kFWLinkOnPacketID				= 1,
+	kFWSelfIDPacketID				= 2
+};
+
+enum
+{
+	kFWPhyConfigurationR					= FW_BIT(8),
+	kFWPhyConfigurationT					= FW_BIT(9),
+	kFWPhyConfigurationGapCnt				= FWBitRange (10, 15),
+	kFWPhyConfigurationGapCntPhase			= FWBitRangePhase (10, 15)
+};
+
+enum
+{
+	kFWSelfIDPortStatusChild				= 3,
+	kFWSelfIDPortStatusParent				= 2,
+	kFWSelfIDPortStatusNotConnected			= 1,
+	kFWSelfIDPortStatusNotPresent			= 0,
+
+	kFWSelfIDNoPower						= 0,
+	kFWSelfIDSelfPowered15W					= 1,
+	kFWSelfIDSelfPowered30W					= 2,
+	kFWSelfIDSelfPowered45W					= 3,
+	kFWSelfIDBusPowered1W					= 4,
+	kFWSelfIDBusPowered3W					= 5,
+	kFWSelfIDBusPowered6W					= 6,
+	kFWSelfIDBusPowered10W					= 7,
+
+	kFWSelfIDPhyID							= kFWPhyPacketPhyID,//zzz do we need or want this?
+	kFWSelfIDPhyIDPhase						= kFWPhyPacketPhyIDPhase,
+	kFWSelfIDM								= FW_BIT(31),
+
+	kFWSelfID0L								= FW_BIT(9),
+	kFWSelfID0GapCnt						= FWBitRange (10, 15),
+	kFWSelfID0GapCntPhase					= FWBitRangePhase (10, 15),
+	kFWSelfID0SP							= FWBitRange (16, 17),
+	kFWSelfID0SPPhase						= FWBitRangePhase (16, 17),
+	kFWSelfID0Del							= FWBitRange (18, 19),
+	kFWSelfID0DelPhase						= FWBitRangePhase (18, 19),
+	kFWSelfID0C								= FW_BIT(20),
+	kFWSelfID0Pwr							= FWBitRange (21, 23),
+	kFWSelfID0PwrPhase						= FWBitRangePhase (21, 23),
+	kFWSelfID0P0							= FWBitRange (24, 25),
+	kFWSelfID0P0Phase						= FWBitRangePhase (24, 25),
+	kFWSelfID0P1							= FWBitRange (26, 27),
+	kFWSelfID0P1Phase						= FWBitRangePhase (26, 27),
+	kFWSelfID0P2							= FWBitRange (28, 29),
+	kFWSelfID0P2Phase						= FWBitRangePhase (28, 29),
+	kFWSelfID0I								= FW_BIT(30),
+
+	kFWSelfIDPacketType						= FW_BIT(8),
+	kFWSelfIDNN								= FWBitRange (9, 11),
+	kFWSelfIDNNPhase						= FWBitRangePhase (9, 11),
+	kFWSelfIDNPa							= FWBitRange (14, 15),
+	kFWSelfIDNPaPhase						= FWBitRangePhase (14, 15),
+	kFWSelfIDNPb							= FWBitRange (16, 17),
+	kFWSelfIDNPbPhase						= FWBitRangePhase (16, 17),
+	kFWSelfIDNPc							= FWBitRange (18, 19),
+	kFWSelfIDNPcPhase						= FWBitRangePhase (18, 19),
+	kFWSelfIDNPd							= FWBitRange (20, 21),
+	kFWSelfIDNPdPhase						= FWBitRangePhase (20, 21),
+	kFWSelfIDNPe							= FWBitRange (22, 23),
+	kFWSelfIDNPePhase						= FWBitRangePhase (22, 23),
+	kFWSelfIDNPf							= FWBitRange (24, 25),
+	kFWSelfIDNPfPhase						= FWBitRangePhase (24, 25),
+	kFWSelfIDNPg							= FWBitRange (26, 27),
+	kFWSelfIDNPgPhase						= FWBitRangePhase (26, 27),
+	kFWSelfIDNPh							= FWBitRange (28, 29),
+	kFWSelfIDNPhPhase						= FWBitRangePhase (28, 29),
+	kFWSelfIDMore							= FW_BIT(31)
+};
+
+// Primary packet defs.
+enum
+{
+	kFWPacketTCode							= FWBitRange (24, 27),
+	kFWPacketTCodePhase						= FWBitRangePhase (24, 27)
+};
+
+
+enum
+{
+	kFWAsynchSpd							= FWBitRange (14, 15),
+	kFWAsynchSpdPhase						= FWBitRangePhase (14, 15),
+
+	kFWAsynchTLabel							= FWBitRange (16, 21),
+	kFWAsynchTLabelPhase					= FWBitRangePhase (16, 21),
+	kFWAsynchTTotal 						= ((0xffffffff & kFWAsynchTLabel) >> kFWAsynchTLabelPhase)+1,
+	kFWAsynchRt								= FWBitRange (22, 23),
+	kFWAsynchRtPhase						= FWBitRangePhase (22, 23),
+	kFWAsynchNew							= 0,
+	kFWAsynchRetryA							= 2,
+	kTIAsycnhRetryB							= 3,
+
+	kFWAsynchPriority						= FWBitRange (28, 31),
+	kFWAsynchPriorityPhase					= FWBitRangePhase (28, 31),
+
+	kFWAsynchDestinationID					= FWBitRange (0, 15),
+	kFWAsynchDestinationIDPhase				= FWBitRangePhase (0, 15),
+
+	kFWAsynchSourceID						= FWBitRange (0, 15),
+	kFWAsynchSourceIDPhase					= FWBitRangePhase (0, 15),
+
+	kFWAsynchDestinationOffsetHigh			= FWBitRange (16, 31),
+	kFWAsynchDestinationOffsetHighPhase		= FWBitRangePhase (16, 31),
+
+	kFWAsynchDestinationOffsetLow			= FWBitRange (0, 31),
+	kFWAsynchDestinationOffsetLowPhase		= FWBitRangePhase (0, 31),
+
+	kFWAsynchDataLength						= FWBitRange (0, 15),
+	kFWAsynchDataLengthPhase				= FWBitRangePhase (0, 15),
+
+	kFWAsynchExtendedTCode					= FWBitRange (16, 31),
+	kFWAsynchExtendedTCodePhase				= FWBitRangePhase (16, 31),
+
+	kFWAsynchAckSent						= FWBitRange (28, 31),
+	kFWAsynchAckSentPhase					= FWBitRangePhase (28, 31),
+
+	kFWAsynchRCode							= FWBitRange (16, 19),
+	kFWAsynchRCodePhase						= FWBitRangePhase (16, 19)
+};
+
+enum
+{
+	kFWTCodeWriteQuadlet					= 0,
+	kFWTCodeWriteBlock						= 1,
+	kFWTCodeWriteResponse					= 2,
+	kFWTCodeReadQuadlet						= 4,
+	kFWTCodeReadBlock						= 5,
+	kFWTCodeReadQuadletResponse				= 6,
+	kFWTCodeReadBlockResponse				= 7,
+	kFWTCodeCycleStart						= 8,
+	kFWTCodeLock							= 9,
+	kFWTCodeIsochronousBlock				= 10,
+	kFWTCodeLockResponse					= 11,
+	kFWTCodePHYPacket						= 14
+};
+
+enum
+{
+	kFWExtendedTCodeMaskSwap				= 1,
+	kFWExtendedTCodeCompareSwap				= 2,
+	kFWExtendedTCodeFetchAdd				= 3,
+	kFWExtendedTCodeLittleAdd				= 4,
+	kFWExtendedTCodeBoundedAdd				= 5,
+	kFWExtendedTCodeWrapAdd					= 6,
+	kFWExtendedTCodeVendorDependent			= 7
+};
+
+// debug boot-arg constants
+enum
+{
+	kFWDebugIgnoreNodeNone					= 0xFFFFFFFF
+};
+
+struct AsyncPendingTrans {
+    IOFWAsyncCommand *	fHandler;
+    IOFWCommand *		fAltHandler;
+    int			fTCode;
+    bool		fInUse;
+};
+
+struct IOFWNodeScan {
+    IOFireWireController 	*	fControl;
+    FWAddress					fAddr;
+    UInt32						fBuf[5];	// Enough for bus info block
+    UInt32 					*	fSelfIDs;
+    int							fNumSelfIDs;
+    int							fROMSize;
+    int							fRead;
+    IOFWReadQuadCommand 	* 	fCmd;
+	IOFWCompareAndSwapCommand * fLockCmd;
+	UInt32						generation;
+    UInt32						fIRMBitBucketOld;
+    UInt32						fIRMBitBucketNew;
+    bool						fIRMisBad;
+    bool						speedChecking;
+    bool						fContenderNeedsChecking;
+    bool						fIRMCheckingRead;
+    bool						fIRMCheckingLock;
+	int							fRetriesBumped;
+	bool						fMustNotBeRoot;
+};
+
+
+typedef struct IOFWDuplicateGUIDStruct IOFWDuplicateGUIDRec;
+struct IOFWDuplicateGUIDStruct
+ {
+	IOFWDuplicateGUIDRec		* 	fNextGUID;
+	CSRNodeUniqueID				fGUID;
+	UInt32						fLastGenSeen;
+};
+	
+
+// IOFireWireDuplicateGUIDList
+//
+// A little class for keeping track of GUIDs which where we have observed 2 nodes with
+// the same GUID
+
+class IOFireWireDuplicateGUIDList : public OSObject
+{
+    OSDeclareDefaultStructors(IOFireWireDuplicateGUIDList);
+
+private:
+    IOFWDuplicateGUIDRec		* 	fFirstGUID;
+    
+protected:
+    virtual void free();
+    
+public:
+
+	static IOFireWireDuplicateGUIDList * create( void );
+
+	void addDuplicateGUID( CSRNodeUniqueID guid, UInt32 gen );
+	void removeDuplicateGUID( CSRNodeUniqueID guid );
+	
+	bool findDuplicateGUID( CSRNodeUniqueID guid, UInt32 gen );
+	
+};
+
+#define kMaxPendingTransfers kFWAsynchTTotal
+
+class IOFireWireController;
+
+#pragma mark -
+
+/*! 
+	@class IOFireWireControllerAux
+*/
+
+class IOFireWireControllerAux : public IOFireWireBusAux
+{
+    OSDeclareDefaultStructors(IOFireWireControllerAux)
+
+	friend class IOFireWireController;
+	
+protected:
+	
+	IOFireWireController * 		fPrimary;
+	
+	UInt8						fMaxRec;
+	
+	UInt8						fPadding;
+	UInt16						fPadding2;
+	
+	IOFWUserObjectExporter *	fSessionRefExporter;
+	
+	/*! 
+		@struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+    */  
+	  
+    struct ExpansionData { };
+
+	/*! 
+		@var reserved
+		Reserved for future use.  (Internal use only)  
+	*/
+    
+	ExpansionData * reserved;
+
+    virtual bool 									init ( 
+																IOFireWireController * 	primary );
+	virtual	void 									free ();
+	virtual IOFWDCLPool *							createDCLPool ( unsigned capacity ) const ;	
+	virtual UInt8									getMaxRec( void );
+	
+	virtual UInt64 getFireWirePhysicalAddressMask( void );
+	virtual UInt32 getFireWirePhysicalAddressBits( void );
+	virtual UInt64 getFireWirePhysicalBufferMask( void );
+	virtual UInt32 getFireWirePhysicalBufferBits( void );
+	
+	virtual IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction );
+	virtual IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction );
+	
+	virtual IOFWUserObjectExporter * getSessionRefExporter( void );
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 7);
+
+};
+
+
+#pragma mark -
+
+/*! @class IOFireWireController
+*/
+class IOFireWireController : public IOFireWireBus
+{
+    OSDeclareAbstractStructors(IOFireWireController)
+
+protected:
+    enum busState {
+        kStarting = 0,		
+		kAsleep,			// Link off, zzzzzz
+		kWaitingBusReset,
+        kWaitingSelfIDs,	// Bus has been reset, no selfIDs yet
+        kWaitingScan,		// Got selfIDs, waiting a bit before hitting lame devices
+        kScanning,			// Reading node ROMs
+        kWaitingPrune,		// Read all ROMs, pausing before pruning missing devices
+        kRunning,			// Normal happy state,
+		kWaitingBusResetStart	// bus reset is desired, but not yet sent to the fwim
+    };
+    
+	enum ResetState
+	{
+		kResetStateResetting,
+		kResetStateDisabled,
+		kResetStateArbitrated
+	};
+
+	enum
+	{
+		kDisablePhysicalAccess 	= (1 << 0)
+	};
+		
+    struct timeoutQ: public IOFWCmdQ
+    {
+        IOTimerEventSource *fTimer;
+        virtual void headChanged(IOFWCommand *oldHead);
+        void busReset();
+    };
+	
+    struct pendingQ: public IOFWCmdQ
+    {
+        IOFWQEventSource *fSource;
+        virtual void headChanged(IOFWCommand *oldHead);
+    };
+
+    friend class IOFireWireLink;
+	friend class IOFireWireDevice;
+	friend class IOFireWireDeviceAux;
+	friend class IOFWAddressSpace;
+	friend class IOFWAddressSpaceAux;
+    friend class IOFWPseudoAddressSpace;
+    friend class IOFireWireSBP2ORB;
+	friend class IOFireWireSBP2Login;
+	friend class IOFWLocalIsochPort;
+	friend class IOFWCommand;
+    friend class IOFireWireUnit;
+	friend class IOFireWirePCRSpace;
+    friend class IOFireWireROMCache;
+    friend class IOFWAsyncStreamCommand;
+	friend class IOFireWireAVCLocalUnit;
+	friend class IOFireWireAVCUnit;
+    friend class IOFireWireAVCCommand;
+	friend class IOFireWirePowerManager;
+	friend class IOFWWriteQuadCommand;
+	friend class IOFWWriteCommand;
+	friend class IOFWCompareAndSwapCommand;
+	friend class IOFWAsyncCommand;
+	friend class IOFireWireAVCTargetSpace;
+	friend class AppleFWOHCI;
+	friend class IOFireWireNub;
+	friend class IOFWAsyncStreamListener;
+	friend class IOFireWireLocalNode;
+	friend class IOFireWireIRMAllocation;
+	friend class IOFWUserVectorCommand;
+	friend class IOFWAsyncPHYCommand;
+	friend class IOFWUserPHYPacketListener;
+	friend class IOFWAsyncStreamReceiver;	
+	
+#if FIRELOGCORE
+	friend class IOFireLog;
+#endif
+
+    IOFireWireLink *			fFWIM;
+    IOFWWorkLoop *				fWorkLoop;
+    IOTimerEventSource *		fTimer;
+    OSSet *						fLocalAddresses;	// Collection of local adress spaces
+    OSIterator *				fSpaceIterator;		// Iterator over local addr spaces
+
+    OSSet *						fAllocatedChannels;	// Need to be informed of bus resets
+    OSIterator *				fAllocChannelIterator;	// Iterator over channels
+
+	OSSet *						fIRMAllocations;	// Need to be informed of bus resets
+    OSIterator *				fIRMAllocationsIterator;	// Iterator over channels
+	OSSet *						fIRMAllocationsAllocated;	// Need to be informed of bus resets
+
+    // Bus management variables (although we aren't a FireWire Bus Manager...)
+    AbsoluteTime				fResetTime;		// Time of last reset
+    UInt32						fBusGeneration;		// ID of current bus topology.
+    UInt16						fLocalNodeID;		// ID of local node, ie. this computer
+    UInt16						fRootNodeID;		// ID of root, ie. highest node id in use.
+    UInt16						fIRMNodeID;		// ID of Isochronous resource manager, or kFWBadNodeID
+    bool						fBusMgr;		// true if at least one node is bus manager capable
+    IORegistryEntry *			fNodes[kFWMaxNodesPerBus];	// FireWire nodes on this bus
+    UInt32 *					fNodeIDs[kFWMaxNodesPerBus+1];	// Pointer to SelfID list for each node
+							// +1 so we know how many selfIDs the last node has
+							
+    UInt32						fGapCount;		// What we think the gap count should be
+    //UInt8						fSpeedCodes[(kFWMaxNodesPerBus+1)*kFWMaxNodesPerBus];
+    UInt8						fSpeedVector[((kFWMaxNodesPerBus+1)*kFWMaxNodesPerBus)/2];
+						// Max speed between two nodes
+    busState					fBusState;		// Which state are we in?
+    int							fNumROMReads;		// Number of device ROMs we are still reading
+    // SelfIDs
+    int							fNumSelfIDs;		// Total number of SelfID packets
+    UInt32						fSelfIDs[kMaxSelfIDs*kFWMaxNodesPerBus];
+
+    // The local device's Config ROM
+    UInt32						fROMHeader[5];		// More or less fixed header and bus info block
+    IOLocalConfigDirectory *	fRootDir;		// Local Config ROM root directory.
+
+    // log base 2 of maximum packet size the FWIM can send/receive
+    // Normally calculated from bus info block.
+    int	fMaxSendLog;
+    int fMaxRecvLog;
+    
+    IOFWAddressSpace *			fROMAddrSpace;
+    IOMemoryDescriptor *		fBadReadResponse;	// Send back easily identified bad data to out of range addrs. 
+
+    // Array for outstanding requests (up to 64)
+    AsyncPendingTrans			fTrans[kMaxPendingTransfers];
+    int							fLastTrans;
+
+    // queue for executing commands that may timeout
+    timeoutQ					fTimeoutQ;
+
+    // queue for commands that can't execute yet
+    pendingQ					fPendingQ;
+
+    // queue for async commands interrupted by bus reset
+    IOFWCmdQ					fAfterResetHandledQ;
+    
+    // Command to change bus state after a delay.
+    IOFWDelayCommand *			fDelayedStateChangeCmd;
+    bool						fDelayedStateChangeCmdNeedAbort;
+    
+	UInt32						fDelayedPhyPacket;
+	bool						fBusResetScheduled;
+	ResetState					fBusResetState;
+	IOFWDelayCommand *			fBusResetStateChangeCmd;
+	UInt32						fBusResetDisabledCount;
+
+#if FIRELOGCORE
+    IOFireLogPublisher *		fFireLogPublisher;
+#else
+    void *						fFireLogPublisher;
+#endif
+
+    OSData *					fAllocatedAddresses;
+
+	UInt32						fDevicePruneDelay;
+	
+	IOFWPhysicalAccessMode		fPhysicalAccessMode;
+	IOFWSecurityMode			fSecurityMode;
+	IONotifier *				fKeyswitchNotifier;
+	
+	IOFireWireIRM *				fIRM;
+	IOFireWirePowerManager *	fBusPowerManager;
+	
+	bool						fGapCountMismatch;
+
+	bool						fUseHalfSizePackets;
+	bool						fRequestedHalfSizePackets;
+
+	IOFWNodeScan *					fScans[kFWMaxNodesPerBus];
+	IOFireWireDuplicateGUIDList	*	fGUIDDups;
+	
+	bool						fDelegateCycleMaster;
+	bool						fBadIRMsKnown;
+	
+	UInt32						fPreviousGap;
+	
+	UInt32						fOutOfTLabels;
+	UInt32						fOutOfTLabels10S;
+	UInt32						fOutOfTLabelsThreshold;
+
+#ifdef LEGACY_SHUTDOWN
+	IONotifier *				fPowerEventNotifier;
+#endif
+
+	bool						fStarted;
+
+	UInt32						fIOCriticalSectionCount;
+	UInt32						fHubPort;
+	UInt32						fDebugIgnoreNode;
+
+	OSSet *						fLocalAsyncStreamReceivers; 
+    OSIterator *				fAsyncStreamReceiverIterator;
+
+	bool						fInstantiated;
+
+	IOReturn					fStartStatus;
+	UInt32						fWaitingForSelfID;
+
+	UInt32						fForcedRootNodeID;
+	bool						fNodeMustBeRootFlag;
+	bool						fNodeMustNotBeRootFlag;
+	
+	UInt32						fForcedGapCount;
+	bool						fForcedGapFlag;
+
+	OSSet *						fPHYPacketListeners;
+ 	OSIterator *				fPHYPacketListenersIterator;
+
+	bool						fDSLimited;
+	
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+	
+    static void clockTick(OSObject *, IOTimerEventSource *);
+    static void readROMGlue(void *refcon, IOReturn status,
+			IOFireWireNub *device, IOFWCommand *fwCmd);
+    static void delayedStateChange(void *refcon, IOReturn status,
+                                    IOFireWireBus *bus, IOFWBusCommand *fwCmd);
+
+    virtual void processBusReset();
+    virtual void processSelfIDs(UInt32 *IDs, int numIDs, UInt32 *ownIDs, int numOwnIDs);
+    virtual void processTimeout(IOTimerEventSource *src);
+    virtual void processRcvPacket( UInt32 *data, int numQuads, IOFWSpeed speed );
+    virtual void processWriteRequest(UInt16 sourceID, UInt32 tlabel,
+				UInt32 *hdr, void *buf, int len, IOFWSpeed speed);
+    virtual void processLockRequest(UInt16 sourceID, UInt32 tlabel,
+				UInt32 *hdr, void *buf, int len, IOFWSpeed speed);
+
+    // Process read from a local address, return rcode
+    virtual UInt32 doReadSpace(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
+                                      IOMemoryDescriptor **buf, IOByteCount * offset, IODMACommand **dma_command,
+                                      IOFWRequestRefCon refcon);
+
+    // Process write to a local address, return rcode
+    virtual UInt32 doWriteSpace(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
+                                const void *buf, IOFWRequestRefCon refcon);
+
+    // Process lock to a local address, return rcode
+    UInt32 doLockSpace(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 inlen,
+                                             const UInt32 *newVal, UInt32 &outLen, UInt32 *oldVal,
+                                             UInt32 extType, IOFWRequestRefCon refcon);
+    
+    virtual void updatePlane();
+    virtual void startBusScan();
+
+    // Called when all devices on bus have been examined
+    virtual void finishedBusScan();
+    
+    virtual void buildTopology(bool doFWPlane);
+
+    virtual void readDeviceROM(IOFWNodeScan *refCon, IOReturn status);
+    
+    virtual IOReturn UpdateROM();
+    virtual IOReturn allocAddress(IOFWAddressSpace *space);
+    virtual void freeAddress(IOFWAddressSpace *space);
+
+	IOFireWireBusAux * createAuxiliary( void );
+	
+public:
+
+    // Initialization
+    virtual bool init(IOFireWireLink *fwim);
+    virtual void free();
+    virtual bool start(IOService *provider);
+    virtual void stop( IOService * provider );
+    virtual bool finalize( IOOptionBits options );
+    virtual bool requestTerminate( IOService * provider, IOOptionBits options );
+
+	// Power management
+    virtual IOReturn setPowerState ( unsigned long powerStateOrdinal, IOService* whatDevice );
+
+    // Implement IOService::getWorkLoop
+    virtual IOWorkLoop *getWorkLoop() const;
+
+    // Allocate struct for tracking a transaction
+    virtual AsyncPendingTrans *allocTrans(IOFWAsyncCommand *cmd=NULL);
+    virtual void freeTrans(AsyncPendingTrans *trans);
+
+    // Really public methods
+
+    virtual IOReturn getCycleTime(UInt32 &cycleTime);
+    virtual IOReturn getBusCycleTime(UInt32 &busTime, UInt32 &cycleTime);
+    
+    // Methods to manipulate the local Config ROM
+    virtual IOReturn AddUnitDirectory(IOLocalConfigDirectory *unitDir);
+    virtual IOReturn RemoveUnitDirectory(IOLocalConfigDirectory *unitDir);
+
+    // Cause a bus reset
+    virtual IOReturn resetBus();
+
+    // Send async request packets
+    virtual IOReturn asyncRead(	UInt32 				generation, 
+								UInt16 				nodeID, 
+								UInt16 				addrHi, 
+								UInt32 				addrLo,
+                                int 				speed, 
+								int 				label, 
+								int 				size, 
+								IOFWAsyncCommand *	cmd );
+
+    virtual IOReturn asyncWrite(	UInt32 					generation, 
+									UInt16 					nodeID, 
+									UInt16 					addrHi, 
+									UInt32 					addrLo,
+									int 					speed, 
+									int 					label, 
+									IOMemoryDescriptor *	buf, 
+									IOByteCount 			offset,
+									int 					size, 
+									IOFWAsyncCommand *		cmd );
+				
+    /* DEPRECATED */ virtual IOReturn asyncWrite(	UInt32 				generation, 
+	/* DEPRECATED */								UInt16 				nodeID, 
+	/* DEPRECATED */								UInt16 				addrHi, 
+	/* DEPRECATED */								UInt32 				addrLo,
+	/* DEPRECATED */								int 				speed, 
+	/* DEPRECATED */								int 				label, 
+	/* DEPRECATED */								void *				data, 
+	/* DEPRECATED */								int 				size, 
+	/* DEPRECATED */								IOFWAsyncCommand *	cmd );
+
+    /* DEPRECATED */ virtual IOReturn asyncLock(	UInt32 				generation, 
+	/* DEPRECATED */								UInt16 				nodeID, 
+	/* DEPRECATED */								UInt16 				addrHi, 
+	/* DEPRECATED */								UInt32 				addrLo,
+	/* DEPRECATED */								int 				speed, 
+	/* DEPRECATED */								int 				label, 
+	/* DEPRECATED */								int 				type, 
+	/* DEPRECATED */								void *				data, 
+	/* DEPRECATED */								int 				size, 
+	/* DEPRECATED */								IOFWAsyncCommand *	cmd);
+
+
+    // Send async read response packets
+    // useful for pseudo address spaces that require servicing outside the FireWire work loop.
+    virtual IOReturn asyncReadResponse(	UInt32 					generation, 
+										UInt16 					nodeID, 
+										int 					speed,
+										IOMemoryDescriptor *	buf, 
+										IOByteCount 			offset, 
+										int 					len,
+										IOFWRequestRefCon 		refcon );
+
+    virtual IOReturn asyncLockResponse( UInt32 					generation, 
+										UInt16 					nodeID, 
+										int 					speed,
+                                        IOMemoryDescriptor *	buf, 
+										IOByteCount 			offset, 
+										int 					len,
+                                        IOFWRequestRefCon 		refcon );
+                                       
+    // Try to fix whatever might have caused the other device to not respond
+    virtual IOReturn handleAsyncTimeout(IOFWAsyncCommand *cmd);
+
+    // Convert a firewire nodeID into the IOFireWireDevice for it
+    virtual IOFireWireDevice * nodeIDtoDevice(UInt32 generation, UInt16 nodeID);
+
+    // Add/remove a channel from the list informed of bus resets
+    virtual void addAllocatedChannel(IOFWIsochChannel *channel);
+    virtual void removeAllocatedChannel(IOFWIsochChannel *channel);
+
+	// Add/remove a IRM allocation from the list informed of bus resets
+    virtual void addIRMAllocation(IOFireWireIRMAllocation *irmAllocation);
+    virtual void removeIRMAllocation(IOFireWireIRMAllocation *irmAllocation);
+	
+    // Create an Isochronous Channel object
+    // doIRM = true => allocate channel and bandwith in Isochronous Resource Manager
+    // packetSize packet size (in bytes), used to calculate bandwidth needed.
+    virtual IOFWIsochChannel *createIsochChannel(
+	bool doIRM, UInt32 packetSize, IOFWSpeed prefSpeed,
+	FWIsochChannelForceStopNotificationProc stopProc=NULL,
+	void *stopRefCon=NULL);
+
+    // Create a local isochronous port to run the given DCL program
+    // if task is 0, the DCL program is for the kernel task,
+    // otherwise all DCL pointers are valid in the specified task.
+    // opcodes is also pointer valid in the specified task.
+    virtual IOFWLocalIsochPort *createLocalIsochPort(bool talking,
+        DCLCommand* opcodes, DCLTaskInfo *info = 0,
+	UInt32 startEvent = 0, UInt32 startState = 0, UInt32 startMask = 0);
+
+    // Execute specified function on workloop after specified delay
+    // Returned command is for delay, call it's cancel() function to cancel timeout.
+    virtual IOFWDelayCommand * createDelayedCmd(UInt32 uSecDelay, FWBusCallback func, void *refcon);
+
+    virtual IOFWPhysicalAddressSpace *createPhysicalAddressSpace(IOMemoryDescriptor *mem);
+    virtual IOFWPseudoAddressSpace *createPseudoAddressSpace(FWAddress *addr, UInt32 len,
+                                FWReadCallback reader, FWWriteCallback writer, void *refcon);
+
+    // Extract info about the async request 
+    virtual bool isLockRequest(IOFWRequestRefCon refcon);
+    virtual bool isQuadRequest(IOFWRequestRefCon refcon);
+    virtual UInt32 getExtendedTCode(IOFWRequestRefCon refcon);
+    
+    // Inline accessors for protected member variables
+    IOFWCmdQ &getTimeoutQ();
+	IOFWCmdQ &getPendingQ();
+    IOFWCmdQ &getAfterResetHandledQ();
+    IOFireWireLink * getLink() const;
+
+    IOLocalConfigDirectory *getRootDir() const;
+    bool checkGeneration(UInt32 gen) const;
+    UInt32 getGeneration() const;
+    UInt16 getLocalNodeID() const;
+    IOReturn getIRMNodeID(UInt32 &generation, UInt16 &id);
+    
+    const AbsoluteTime * getResetTime() const;
+
+    IOFWSpeed FWSpeed(UInt16 nodeAddress) const;
+    IOFWSpeed FWSpeed(UInt16 nodeA, UInt16 nodeB) const;
+
+    // How big (as a power of two) can packets sent to/received from the node be?
+    virtual int maxPackLog(bool forSend, UInt16 nodeAddress) const;
+
+    // How big (as a power of two) can packets sent from A to B be?
+    virtual int maxPackLog(UInt16 nodeA, UInt16 nodeB) const;
+
+   // Force given node to be root (via root holdoff Phy packet)
+    virtual IOReturn makeRoot(UInt32 generation, UInt16 nodeID) ;
+
+    virtual IOFWPseudoAddressSpace *createInitialAddressSpace(UInt32 addressLo, UInt32 len,
+                                FWReadCallback reader, FWWriteCallback writer, void *refcon);
+    
+    virtual IOFWAddressSpace *getAddressSpace(FWAddress address);
+    
+    // Extract info about the async request - was the request ack'ed complete already?
+    virtual bool isCompleteRequest(IOFWRequestRefCon refcon);
+
+    // Are we currently scanning the bus?
+    bool scanningBus() const;
+
+protected:
+
+    void openGate();
+    void closeGate();
+		
+protected:    
+	virtual void doBusReset( void );
+	static void resetStateChange( void *refcon, IOReturn status,
+								   IOFireWireBus *bus, IOFWBusCommand *fwCmd);
+
+public:
+	virtual IOReturn disableSoftwareBusResets( void );
+	virtual void enableSoftwareBusResets( void );
+
+    virtual IOFWAsyncStreamCommand * createAsyncStreamCommand( UInt32 generation,
+    			UInt32 channel, UInt32 sync, UInt32 tag, IOMemoryDescriptor *hostMem,
+				UInt32 size, int speed,FWAsyncStreamCallback completion, void *refcon);
+    
+	virtual	IOReturn asyncStreamWrite(UInt32 generation,
+                    int speed, int tag, int sync, int channel,
+                    IOMemoryDescriptor *buf, IOByteCount offset,
+                	int size, IOFWAsyncStreamCommand *cmd);
+					
+protected:
+	bool inGate();
+
+    virtual IOReturn allocatePseudoAddress(FWAddress *addr, UInt32 lenDummy);
+    virtual void freePseudoAddress(FWAddress addr, UInt32 lenDummy);
+	
+	virtual IORegistryEntry * createDummyRegistryEntry( IOFWNodeScan *scan );
+
+	static IOFireWireLocalNode * getLocalNode(IOFireWireController *control);
+	
+	virtual void setPhysicalAccessMode( IOFWPhysicalAccessMode mode );
+	virtual IOFWPhysicalAccessMode getPhysicalAccessMode( void );
+	virtual void physicalAccessProcessBusReset( void );
+	virtual void setNodeIDPhysicalFilter( UInt16 nodeID, bool state );
+	
+	virtual void initSecurity( void );
+	virtual void freeSecurity( void );
+	static bool serverKeyswitchCallback( void * target, void * refCon, IOService * service, IONotifier * notifier );
+	virtual void setSecurityMode( IOFWSecurityMode mode );
+	virtual IOFWSecurityMode getSecurityMode( void );
+
+	virtual IOReturn createTimeoutQ( void );
+	virtual void destroyTimeoutQ( void );
+	virtual IOReturn createPendingQ( void );
+	virtual void destroyPendingQ( void );
+
+	virtual UInt32 countNodeIDChildren( UInt16 nodeID, int hub_port = 0, int * hubChildRemainder = NULL, bool * hubParentFlag = NULL );
+
+public:
+	virtual UInt32 hopCount(UInt16 nodeAAddress, UInt16 nodeBAddress );
+	virtual UInt32 hopCount(UInt16 nodeAAddress );
+	
+	virtual IOFireWirePowerManager * getBusPowerManager( void );
+
+protected:
+	virtual void handleARxReqIntComplete();
+
+    virtual IOReturn asyncLock(	UInt32 					generation, 
+								UInt16 					nodeID, 
+								UInt16 					addrHi, 
+								UInt32 					addrLo,
+								int 					speed, 
+								int 					label, 
+								int 					type, 
+								IOMemoryDescriptor *	buf, 
+								IOByteCount 			offset,
+								int 					size, 
+								IOFWAsyncCommand *		cmd );
+
+    virtual IOReturn asyncWrite(	UInt32 					generation, 
+									UInt16 					nodeID, 
+									UInt16 					addrHi, 
+									UInt32 					addrLo,
+									int 					speed, 
+									int 					label, 
+									IOMemoryDescriptor *	buf, 
+									IOByteCount 			offset,
+									int 					size, 
+									IOFWAsyncCommand *		cmd,
+									IOFWWriteFlags 			flags );
+
+protected:
+	bool delayedStateCommandInUse() const;
+	void enterBusResetDisabledState( );
+	
+	virtual UInt32 getPortNumberFromIndex( UInt16 index );
+												
+    virtual bool checkForDuplicateGUID(IOFWNodeScan *scan, CSRNodeUniqueID *currentGUIDs );
+    virtual void updateDevice(IOFWNodeScan *scan );
+    virtual bool AssignCycleMaster();
+
+public:
+
+ 	IOReturn clipMaxRec2K(Boolean clipMaxRec );
+	void setNodeSpeed( UInt16 nodeAddress, IOFWSpeed speed );
+	void useHalfSizePackets( void );
+	void disablePhyPortOnSleepForNodeID( UInt32 nodeID );
+
+	IOReturn handleAsyncCompletion( IOFWCommand *cmd, IOReturn status );
+	void processCycle64Int();
+
+#ifdef LEGACY_SHUTDOWN
+	static IOReturn systemShutDownHandler( void * target, void * refCon,
+                                    UInt32 messageType, IOService * service,
+                                    void * messageArgument, vm_size_t argSize );
+#else
+    virtual void systemWillShutdown( IOOptionBits specifier );
+#endif
+
+	IOReturn beginIOCriticalSection( void );
+	void endIOCriticalSection( void );
+
+protected:	
+	IOReturn poweredStart( void );
+	void setNodeSpeed( UInt16 nodeA, UInt16 nodeB, UInt8 speed );
+	void setNodeSpeed( UInt16 nodeAddress, UInt8 speed );
+
+public:
+	bool isPhysicalAccessEnabledForNodeID( UInt16 nodeID );
+	
+	// Allocate IRM bandwidth if the specified generation is the current FireWire generation.
+	IOReturn allocateIRMBandwidthInGeneration(UInt32 bandwidthUnits, UInt32 generation) ;
+	
+	// Release IRM bandwidth if the specified generation is the current FireWire generation.
+	IOReturn releaseIRMBandwidthInGeneration(UInt32 bandwidthUnits, UInt32 generation) ;
+	
+	// Allocate IRM channel if the specified generation is the current FireWire generation.
+	IOReturn allocateIRMChannelInGeneration(UInt8 isochChannel, UInt32 generation) ;
+	
+	// Release IRM channel if the specified generation is the current FireWire generation.
+	IOReturn releaseIRMChannelInGeneration(UInt8 isochChannel, UInt32 generation) ;
+	
+	// Create an IOFireWireIRMAllocation object which can be used to allocate isoch resources that are automatically reallocated after bus-resets!
+	IOFireWireIRMAllocation *createIRMAllocation(Boolean releaseIRMResourcesOnFree = true, 
+												IOFireWireIRMAllocation::AllocationLostNotificationProc allocationLostProc = NULL,
+												void *pLostNotificationProcRefCon = NULL);
+
+	IOFWAsyncStreamListener *createAsyncStreamListener( UInt32	channel, FWAsyncStreamReceiveCallback proc, void *refcon );
+
+	void removeAsyncStreamListener( IOFWAsyncStreamListener *listener );
+
+	IOFWSpeed getBroadcastSpeed(){ return FWSpeed( fLocalNodeID ); };
+
+private:
+
+	IOFWAsyncStreamReceiver *allocAsyncStreamReceiver( UInt32 channel, FWAsyncStreamReceiveCallback proc, void *refcon );
+
+	IOFWAsyncStreamReceiver *getAsyncStreamReceiver( UInt32 channel );
+
+	void freeAllAsyncStreamReceiver();
+
+	void activateAsyncStreamReceivers();
+
+	void deactivateAsyncStreamReceivers();
+
+protected:
+	IOService *findKeyswitchDevice( void );
+	void suspendBus( void );
+
+public:
+	virtual IOReturn			asyncRead(	UInt32 				generation, 
+											UInt16 				nodeID, 
+											UInt16 				addrHi, 
+											UInt32 				addrLo,
+											int 				speed, 
+											int 				label, 
+											int 				size, 
+											IOFWAsyncCommand *	cmd,
+											IOFWReadFlags		flags );
+
+	void checkProgress( void );
+
+	void terminateDevice( IOFireWireDevice * device );
+
+	void nodeMustBeRoot( UInt32 nodeID );
+
+	void nodeMustNotBeRoot( UInt32 nodeID );	
+
+	void setGapCount( UInt32	gapCount );	
+	
+	IOReturn asyncPHYPacket(	UInt32					generation, 
+								UInt32					data, 
+								UInt32					data2, 
+								IOFWAsyncPHYCommand *	cmd );
+
+    IOFWAsyncPHYCommand * createAsyncPHYCommand(	UInt32				generation,
+													UInt32				data1, 
+													UInt32				data2,			
+													FWAsyncPHYCallback	completion, 
+													void *				refcon, 
+													bool				failOnReset );
+	
+private:
+	AsyncPendingTrans * allocTrans( IOFWAsyncCommand * cmd, IOFWCommand * altcmd );
+
+public:
+
+	IOReturn activatePHYPacketListener( IOFWPHYPacketListener * listener );
+	void deactivatePHYPacketListener( IOFWPHYPacketListener * listener );
+
+	IOFWPHYPacketListener * createPHYPacketListener( FWPHYPacketCallback proc, void * refcon );
+
+private:
+	void processPHYPacket( UInt32 data1, UInt32 data2 );
+	void enterLoggingMode( void );
+
+public:
+	IOReturn getCycleTimeAndUpTime( UInt32 &cycleTime, UInt64 &uptime );
+
+protected:
+	void removeAsyncStreamReceiver( IOFWAsyncStreamReceiver *receiver );
+	
+public:
+
+	// Create a multi-isoch-receive listener
+	IOFireWireMultiIsochReceiveListener * createMultiIsochReceiveListener(UInt32 channel,
+																		  FWMultiIsochReceiveListenerCallback callback,
+																		  void *pCallbackRefCon,
+																		  FWMultiIsochReceiveListenerParams *pListenerParams = NULL);
+	
+	// Activate a multi-isoch-receive listener
+	IOReturn activateMultiIsochReceiveListener(IOFireWireMultiIsochReceiveListener *pListener);
+	
+	// Deactivate a multi-isoch-receive listener
+	IOReturn deactivateMultiIsochReceiveListener(IOFireWireMultiIsochReceiveListener *pListener);
+
+	// Call for client to specify he is done with a multi-isoch receiver isoch packet
+	void clientDoneWithMultiIsochReceivePacket(IOFireWireMultiIsochReceivePacket *pPacket);
+
+public:
+    virtual IOFWAsyncStreamCommand * createAsyncStreamCommand( UInt32 generation,
+    			UInt32 channel, UInt32 sync, UInt32 tag, IOMemoryDescriptor *hostMem,
+				UInt32 size, int speed,FWAsyncStreamCallback completion, void *refcon, bool	failOnReset);
+
+private:
+	void addToIRMAllocationSet(IOFireWireIRMAllocation *anObject);
+	void removeFromIRMAllocationSet(IOFireWireIRMAllocation *anObject);
+	
+protected:	
+	OSMetaClassDeclareReservedUnused(IOFireWireController, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireController, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireController, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireController, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireController, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireController, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireController, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireController, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireController, 8);
+
+};
+
+#endif /* ! _IOKIT_IOFIREWIRECONTROLLER_H */
diff --git a/i386/include/IOKit/firewire/IOFireWireDevice.h b/i386/include/IOKit/firewire/IOFireWireDevice.h
new file mode 100644
index 0000000..a68e5a2
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFireWireDevice.h
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ /*! @header
+	This header contains the definition of the <code>IOFireWireDevice</code> and <code>IOFireWireDeviceAux</code> classes. 
+	An <code>IOFireWireDevice</code> object represents a FireWire device in the I/O Registry.
+	It is strongly recommended that you write applications that access FireWire devices rather than in-kernel device drivers. 
+	For more information on how to do this, see {@linkdoc //apple_ref/doc/uid/TP40000969 FireWire Device Interface Guide}.
+	@indexgroup FireWire
+ */
+#ifndef _IOKIT_IOFIREWIREDEVICE_H
+#define _IOKIT_IOFIREWIREDEVICE_H
+
+#include <IOKit/firewire/IOFireWireNub.h>
+
+class IOFireWireROMCache;
+
+struct IOFWNodeScan;
+struct RomScan;
+
+class IOFireWireDevice;
+
+#pragma mark -
+
+/*! @class IOFireWireDeviceAux
+	@discussion An IOFireWireDeviceAux is for internal use only. You should never subclass IOFireWireDeviceAux 
+*/
+
+class IOFireWireDeviceAux : public IOFireWireNubAux
+{
+    OSDeclareDefaultStructors(IOFireWireDeviceAux)
+
+	friend class IOFireWireDevice;
+	
+protected:
+	
+	UInt32			fUnitCount;
+	IOFWSpeed		fMaxSpeed;
+	OSSet *			fOpenUnitSet;
+	AbsoluteTime	fResumeTime;
+	
+	/*! 
+		@struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+    */  
+	  
+    struct ExpansionData { };
+
+	/*! 
+		@var reserved
+		Reserved for future use.  (Internal use only)  
+	*/
+    
+	ExpansionData * reserved;
+
+    virtual bool init( IOFireWireDevice * primary );
+	
+	virtual	void free();
+
+	virtual bool isTerminated( void );
+	
+	virtual void setTerminationState( TerminationState state );
+	
+	void setMaxSpeed( IOFWSpeed speed );
+	
+	void setUnitCount( UInt32 count );
+	
+	UInt32 getUnitCount( void );
+
+	bool isPhysicalAccessEnabled( void );
+
+	virtual IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction );
+		
+    virtual IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction );
+	
+	OSSet * getOpenUnitSet() const;
+	
+	void  latchResumeTime( void );
+	
+	AbsoluteTime getResumeTime( void );
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWireDeviceAux, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireDeviceAux, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireDeviceAux, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireDeviceAux, 3);	
+};
+
+#pragma mark -
+/*! @class IOFireWireDevice
+	@abstract Represents a FireWire device.
+	@discussion The FireWire family tries to read the configuration ROM of each device on the FireWire bus. For each device that responds with 
+				its bus information block, the FireWire family publishes an <code>IOFireWireDevice</code> object in the I/O Registry. An 
+				<code>IOFireWireDevice</code> object keeps track of the device's node ID, copies config ROM properties into the object's property 
+				list, and scans the config ROM for unit directories, publishing an <code>IOFireWireUnit</code> object for each unit directory it finds.
+*/
+
+class IOFireWireDevice : public IOFireWireNub
+{
+    OSDeclareDefaultStructors(IOFireWireDevice)
+
+    friend class IOFireWireController;
+	friend class IOFireWireDeviceAux;
+
+protected:
+
+	enum RegistrationState
+	{
+		kDeviceRegistered,
+		kDeviceNeedsRegisterService,
+		kDeviceNotRegistered
+	};
+	
+    IOFireWireROMCache	*fDeviceROM;
+    bool				fOpenFromDevice;
+    UInt32				fOpenFromUnitCount;
+    UInt32				fROMGeneration;
+    IORecursiveLock		*fROMLock;
+    RegistrationState	fRegistrationState;
+	UInt32				fROMReadRetry;
+	
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+    static	void readROMDirGlue(void *refcon, IOReturn status,
+                               IOFireWireNub *device, IOFWCommand *fwCmd);
+    static	void readROMThreadFunc(void *arg);
+
+    static	void terminateDevice(void *arg);
+    
+    void	processROM(RomScan *romScan);
+    
+    virtual void free();
+    
+public:
+    virtual IOReturn message( UInt32 type, IOService * provider, void * argument );
+
+    virtual bool handleOpen( IOService * forClient, IOOptionBits options, void * arg );
+
+    virtual void handleClose( IOService * forClient, IOOptionBits options );
+
+    virtual bool handleIsOpen( const IOService * forClient ) const;
+
+protected:    
+    virtual IOReturn cacheROM(OSData *rom, UInt32 offset, const UInt32 *&romBase);
+
+    virtual const UInt32 * getROMBase();
+    
+    virtual void setNodeROM(UInt32 generation, UInt16 localNodeID, const IOFWNodeScan *info);
+
+public:
+    virtual bool matchPropertyTable(OSDictionary * table);
+
+	/*!	@function	init
+		@abstract	Initializes the nub.
+		@param		propTable	Property table passed to the standard nub initialization.
+		@param		scan		Pointer to the node scan structure.
+		@result		Returns <code>true</code> if initialization was successful; <code>false</code> otherwise.
+	*/
+    virtual bool init(OSDictionary * propTable, const IOFWNodeScan *scan);
+
+    virtual bool attach(IOService * provider );
+
+    virtual bool finalize( IOOptionBits options );
+
+	/*!	@function	setNodeFlags
+		@abstract	Sets the node's characteristics.
+		@param		flags Refer to "node flags" in IOFireWireFamilyCommon.h.
+	*/
+    virtual void setNodeFlags( UInt32 flags );
+
+	/*!	@function	clearNodeFlags
+		@abstract	Resets the node's characteristics.
+		@param		flags Refer to "node flags" in IOFireWireFamilyCommon.h.
+	*/
+	virtual void clearNodeFlags( UInt32 flags );
+
+	/*!	@function	getNodeFlags
+		@abstract	Retrieves the node's characteristics.
+		@param		flags	Refer to "node flags" in IOFireWireFamilyCommon.h.
+		@result		UInt32	The flags set for a particular node. 
+	*/
+    virtual UInt32 getNodeFlags( void );
+
+protected:
+	virtual IOReturn configureNode( void );
+
+public:
+	/*!	@function	createPhysicalAddressSpace
+		@abstract	Creates local physical FireWire address spaces for the device to access.
+		@param		mem  Memory area allocated to back the physical access by Link hardware.
+		@result		A valid <code>IOFWPhysicalAddressSpace</code> object on success; NULL on failure.
+	*/
+    virtual IOFWPhysicalAddressSpace *createPhysicalAddressSpace(IOMemoryDescriptor *mem);
+
+	/*!	@function	createPseudoAddressSpace
+		@abstract	Creates local pseudo FireWire address spaces for the device to access.
+		@param		addr	The FireWire address that is mapped to the pseudo address access.
+		@param		len		Size of the address space to allocate.
+		@param		reader  Read callback, when the device reads from this address space.
+		@param		writer  Write callback, when the device writes to this address space.
+		@param		refcon  Client's callback object returned during reader/writer callbacks.
+		@result		A valid <code>IOFWPseudoAddressSpace</code> object on success; NULL on failure.
+	*/
+    virtual IOFWPseudoAddressSpace *createPseudoAddressSpace(FWAddress *addr, UInt32 len,
+                    FWReadCallback reader, FWWriteCallback writer, void *refcon);
+
+protected:
+	virtual IOReturn readRootDirectory( IOConfigDirectory * directory, OSDictionary * propTable );
+
+	virtual IOReturn processRootDirectory( OSDictionary * propTable );
+
+	virtual IOReturn readUnitDirectories( IOConfigDirectory * directory, OSSet * unitInfo );
+
+	virtual IOReturn processUnitDirectories( OSSet * unitSet );
+    
+	virtual void setRegistrationState( RegistrationState fRegistrationState );
+	
+	virtual void preprocessDirectories( OSDictionary * rootPropTable, OSSet * unitSet );
+	
+	virtual void configurePhysicalFilter( void );
+
+protected:
+	virtual IOFireWireNubAux * createAuxiliary( void );
+
+public:
+	inline bool isTerminated( void )
+		{ return ((IOFireWireDeviceAux*)fAuxiliary)->isTerminated(); }
+		
+	/*!	@function	setMaxSpeed
+		@abstract	Sets the maximum speed for this node.
+		@param		speed Maximum speed. Refer to "bus speed numbers" in IOFireWireFamilyCommon.h.
+	*/
+	inline void setMaxSpeed( IOFWSpeed speed )
+		{ ((IOFireWireDeviceAux*)fAuxiliary)->setMaxSpeed( speed ); }		
+
+protected:
+	inline void setUnitCount( UInt32 count )
+		{ ((IOFireWireDeviceAux*)fAuxiliary)->setUnitCount( count ); }		
+
+	inline OSSet * getOpenUnitSet( void ) const
+		{ return ((IOFireWireDeviceAux*)fAuxiliary)->getOpenUnitSet(); }
+			
+public:
+	/*!	@function	getUnitCount
+		@abstract	Returns number of units attached to this device.
+		@result		UInt32 The number of units attached to this device.
+	*/
+	inline UInt32 getUnitCount( void )
+		{ return ((IOFireWireDeviceAux*)fAuxiliary)->getUnitCount(); }		
+
+protected:
+	inline AbsoluteTime getResumeTime( void )
+		{ return ((IOFireWireDeviceAux*)fAuxiliary)->getResumeTime(); }		
+
+	inline void latchResumeTime( void )
+		{ ((IOFireWireDeviceAux*)fAuxiliary)->latchResumeTime(); }		
+		
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWireDevice, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireDevice, 1);
+
+};
+
+#endif /* ! _IOKIT_IOFIREWIREDEVICE_H */
diff --git a/i386/include/IOKit/firewire/IOFireWireFamilyCommon.h b/i386/include/IOKit/firewire/IOFireWireFamilyCommon.h
new file mode 100644
index 0000000..ceb426d
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFireWireFamilyCommon.h
@@ -0,0 +1,1235 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *  IOFireWireFamilyCommon.h
+ *  IOFireWireUserClient/IOFireWireFamily
+ *
+ *  Created by NWG on Fri Apr 28 2000.
+ *  Copyright (c) 2000-2001 Apple Computer, Inc. All rights reserved.
+ *
+ */
+/*
+	$Log: IOFireWireFamilyCommon.h,v $
+	Revision 1.79  2008/07/15 01:29:44  collin
+	<rdar://problem/5859733> & <rdar://problem/5843668>
+	
+	Revision 1.78  2008/05/08 02:33:22  collin
+	more K64
+	
+	Revision 1.77  2008/04/24 00:01:39  collin
+	more K640
+	
+	Revision 1.76  2007/12/05 04:52:08  collin
+	integrate chex workaround
+	
+	Revision 1.75  2007/08/31 20:29:06  collin
+	fixed 5437835
+	
+	Revision 1.74  2007/04/24 21:40:23  arulchan
+	headerdoc changes
+	
+	Revision 1.73  2007/04/24 21:28:24  arulchan
+	changes for headerdoc
+	
+	Revision 1.72  2007/04/13 19:37:01  calderon
+	Integrated FireWireKPrintf implemented
+	
+	Revision 1.71  2007/03/14 18:41:43  collin
+	*** empty log message ***
+	
+	Revision 1.70  2007/02/28 23:10:13  ayanowit
+	Another IRMAllocation fix.
+	
+	Revision 1.69  2007/02/20 01:25:28  collin
+	*** empty log message ***
+	
+	Revision 1.68  2007/02/17 00:26:51  collin
+	*** empty log message ***
+	
+	Revision 1.67  2007/02/15 19:42:07  ayanowit
+	For 4369537, eliminated support for legacy DCL SendPacketWithHeader, since it didn't work anyway, and NuDCL does support it.
+	
+	Revision 1.66  2007/02/15 01:23:39  arulchan
+	changes in AssignCycleMaster
+	
+	Revision 1.65  2007/02/09 04:44:06  collin
+	*** empty log message ***
+	
+	Revision 1.64  2007/01/26 20:52:31  ayanowit
+	changes to user-space isoch stuff to support 64-bit apps.
+	
+	Revision 1.63  2007/01/16 01:41:02  gecko1
+	4159728 Add improved async lock based check for bad IRMs
+	
+	Revision 1.62  2007/01/15 23:29:05  arulchan
+	Fixed Skipped Packet Handler Notifications
+	
+	Revision 1.61  2007/01/12 22:15:14  arulchan
+	Added flag kIOFWEnableBeingRoot
+	
+	Revision 1.60  2007/01/10 22:14:44  calderon
+	Fixed 4046607 Propagate vendor/model from IIDC UnitDepedantInfoDir
+	Fixed some null termination shinanigans in getIndexValue(string)
+	
+	Revision 1.59  2007/01/08 18:47:19  ayanowit
+	More 64-bit changes for isoch.
+	
+	Revision 1.58  2006/07/07 20:18:25  calderon
+	4227201: SpeedMap and HopCount table reductions.
+	
+	Revision 1.57  2006/04/03 21:29:48  collin
+	*** empty log message ***
+	
+	Revision 1.56  2006/02/09 00:21:51  niels
+	merge chardonnay branch to tot
+	
+	Revision 1.55.4.1  2005/08/06 01:31:31  collin
+	*** empty log message ***
+	
+	Revision 1.55  2005/03/12 03:27:51  collin
+	*** empty log message ***
+	
+	Revision 1.54  2005/01/12 06:34:53  collin
+	*** empty log message ***
+	
+	Revision 1.53  2004/05/04 22:52:19  niels
+	*** empty log message ***
+	
+	Revision 1.52  2004/03/26 01:42:53  gecko1
+	Add code to disable any port directly connected to an iPod when we go to sleep.
+	
+	Revision 1.51  2004/03/05 00:33:59  calderon
+	Fixed 3570909 - FireWire - iokit_fw_errs should be defined in hex
+	All decimal #define errors in header changed to hex
+	
+	Revision 1.50  2003/11/07 21:01:18  niels
+	Revision 1.49  2003/10/21 01:16:41  collin
+	Revision 1.48  2003/10/17 00:25:24  collin
+	Revision 1.47  2003/10/15 02:19:45  collin
+	Revision 1.46  2003/07/22 10:49:47  niels
+	Revision 1.45  2003/07/21 06:52:59  niels
+	merge isoch to TOT
+	
+	Revision 1.44.4.5  2003/07/21 06:44:44  niels
+	Revision 1.44.4.4  2003/07/18 00:17:42  niels
+	Revision 1.44.4.3  2003/07/14 22:08:53  niels
+	Revision 1.44.4.2  2003/07/09 21:24:01  niels
+	Revision 1.44.4.1  2003/07/01 20:54:07  niels
+	isoch merge
+	
+	Revision 1.44  2003/03/17 01:05:22  collin
+	Revision 1.43  2003/03/07 01:26:06  collin
+	Revision 1.42  2003/02/19 22:33:17  niels
+	add skip cycle DCL
+	
+	Revision 1.41  2003/02/18 00:14:01  collin
+	Revision 1.40  2003/02/17 21:47:52  collin
+	Revision 1.39  2002/12/05 19:08:37  niels
+	remove trailing commas from enums in IOFireWireFamilyCommon.h
+	
+	Revision 1.38  2002/11/01 20:45:57  collin
+	add enhanced IRM with support for the BROADCAST_CHANNEL register
+	
+	Revision 1.37  2002/10/01 02:40:27  collin
+	security mode support
+	
+	Revision 1.36  2002/09/25 21:17:14  collin
+	fix headers again.
+	
+	Revision 1.35  2002/09/25 00:27:23  niels
+	flip your world upside-down
+	
+	Revision 1.34  2002/09/12 22:41:53  niels
+	add GetIRMNodeID() to user client
+	
+*/
+
+/*! @header IOFireWireFamilyCommon.h
+This file contains useful definitions for working with FireWire
+in the kernel and in user space
+*/
+
+#ifndef __IOFireWireFamilyCommon_H__
+#define __IOFireWireFamilyCommon_H__
+
+#ifdef KERNEL
+#ifndef __IOKIT_IOTYPES_H
+	#include <IOKit/IOTypes.h>
+#endif
+#else
+#include <IOKit/IOKitLib.h>
+#endif
+
+//#define LEGACY_SHUTDOWN
+
+#define FW_OLD_DCL_DEFS
+#define FW_OLD_BIT_DEFS
+
+// =================================================================
+// bit ranges and fields
+// =================================================================
+#pragma mark -
+#pragma mark BITS
+
+// FireWire bit defs.
+
+#define BIT(x)		( 1 << (x) )
+#define FW_BIT(x)	( 1 << (31 - (x) ) )
+
+#define FWBitRange(start, end)						\
+(													\
+	((((UInt32) 0xFFFFFFFF) << (start)) >>			\
+	 ((start) + (31 - (end)))) <<					\
+	(31 - (end))									\
+)
+
+#define FWBitRangePhase(start, end)					\
+	(31 - (end))
+
+#define BitRange(start, end)						\
+(													\
+	((((UInt32) 0xFFFFFFFF) << (31 - (end))) >>		\
+	 ((31 - (end)) + (start))) <<					\
+	(start)											\
+)
+ 
+
+#define BitRangePhase(start, end)					\
+	(start)
+
+// =================================================================
+// FireWire messages & errors
+// =================================================================
+#pragma mark -
+#pragma mark MESSAGES AND ERRORS
+
+#define	iokit_fw_err(return) (sys_iokit|sub_iokit_firewire|return)
+
+// e0008010 -> 0xe000801f Response codes from response packets
+
+// Base of Response error codes
+#define kIOFireWireResponseBase							iokit_fw_err(0x10)
+
+// e0008020 -- Bus reset during command execution (current bus generation does
+//             not match that specified in command.)
+#define kIOFireWireBusReset								(kIOFireWireResponseBase+kFWResponseBusResetError)
+
+// e0008001 -- Can't find requested entry in ROM
+#define kIOConfigNoEntry								iokit_fw_err(0x1)
+
+// e0008002 -- In pending queue waiting to execute
+#define kIOFireWirePending								iokit_fw_err(0x2)
+
+// e0008003 -- Last DCL callback of program (internal use)
+#define kIOFireWireLastDCLToken							iokit_fw_err(0x3)
+
+// e0008004
+#define kIOFireWireConfigROMInvalid						iokit_fw_err(0x4)
+
+// e0008005
+#define kIOFireWireAlreadyRegistered					iokit_fw_err(0x5)
+
+// e0008006
+#define kIOFireWireMultipleTalkers						iokit_fw_err(0x6)
+
+// e0008007
+#define kIOFireWireChannelActive						iokit_fw_err(0x7)
+
+// e0008008
+#define kIOFireWireNoListenerOrTalker					iokit_fw_err(0x8)
+
+// e0008009
+#define kIOFireWireNoChannels							iokit_fw_err(0x9)
+
+// e000800A
+#define kIOFireWireChannelNotAvailable					iokit_fw_err(0xA)
+
+// e000800B
+#define kIOFireWireSeparateBus							iokit_fw_err(0xB)
+
+// e000800C
+#define kIOFireWireBadSelfIDs							iokit_fw_err(0xC)
+
+// e000800D
+#define kIOFireWireLowCableVoltage						iokit_fw_err(0xD)
+
+// e000800E
+#define kIOFireWireInsufficientPower					iokit_fw_err(0xE)
+
+// e000800f
+#define kIOFireWireOutOfTLabels							iokit_fw_err(0xF)
+
+// NOTE: errors 16Ñ31 used for address space response codes.. (see above)
+
+// e0008101
+#define kIOFireWireBogusDCLProgram						iokit_fw_err(0x101)
+
+// e0008102
+#define kIOFireWireTalkingAndListening					iokit_fw_err(0x102)
+
+// e0008103
+#define kIOFireWireHardwareSlept						iokit_fw_err(0x103)
+
+// e0008104		// let's resume here...
+
+// e0008104 -- In the middle of completing
+#define kIOFireWireCompleting							iokit_fw_err(0x104)
+
+// e0008105 -- Invalid Response Length
+#define kIOFireWireInvalidResponseLength				iokit_fw_err(0x105)
+
+// e0008106 -- Isoch Bandwidth Not Available
+#define kIOFireWireIsochBandwidthNotAvailable			iokit_fw_err(0x106)
+
+
+// e00087d0
+#define kIOFWMessageServiceIsRequestingClose 			(UInt32)iokit_fw_err(0x7D0)
+#define kIOFWMessagePowerStateChanged 					(UInt32)iokit_fw_err(0x7D1)
+#define kIOFWMessageTopologyChanged						(UInt32)iokit_fw_err(0x7D2)
+// =================================================================
+// Pseudo address space response codes
+// =================================================================
+#pragma mark -
+#pragma mark PSEDUO ADDRESS SPACE RESPONSE CODES
+enum
+{
+	kFWResponseComplete			= 0,	// OK!
+	kFWResponseConflictError	= 4,	// Resource conflict, may retry
+	kFWResponseDataError		= 5,	// Data not available
+	kFWResponseTypeError		= 6,	// Operation not supported
+	kFWResponseAddressError		= 7,	// Address not valid in target device
+	kFWResponseBusResetError	= 16,	// Pseudo response generated locally
+	kFWResponsePending			= 17	// Pseudo response, real response sent later.
+};
+
+//
+// Pseudo address space response codes
+//
+enum
+{
+	kFWAckTimeout				= -1,	// Pseudo ack generated locally
+	kFWAckComplete				= 1,
+	kFWAckPending				= 2,
+	kFWAckBusyX					= 4,
+	kFWAckBusyA					= 5,
+	kFWAckBusyB					= 6,
+	kFWAckDataError				= 13,
+	kFWAckTypeError				= 14
+};
+
+// =================================================================
+// FireWire bus speed numbers
+// =================================================================
+#pragma mark -
+#pragma mark BUS SPEED NUMBERS
+
+typedef enum
+{
+	kFWSpeed100MBit			= 0,
+	kFWSpeed200MBit			= 1,
+	kFWSpeed400MBit			= 2,
+	kFWSpeed800MBit			= 3,
+	kFWSpeedReserved		= 3,	// In all cases, 1394B Devices report this speed, 
+									// each port of the PHY could be different
+	
+	kFWSpeedUnknownMask		= 0x80,	// If speed was reserved and we haven't probed it further
+	
+	kFWSpeedMaximum			= 0x7FFFFFFF,	
+	kFWSpeedInvalid			= 0x80000000
+} IOFWSpeed;
+
+// =================================================================
+// FWAddress
+// =================================================================
+#pragma mark -
+#pragma mark FWADDRESS
+//
+// The venerable FWAddress structure. This is the standard
+// struct to use for passing FireWire addresses.
+//
+
+typedef struct FWAddressStruct
+{
+    UInt16	nodeID;		// bus/node
+    UInt16	addressHi;	// Top 16 bits of node address.
+    UInt32	addressLo;	// Bottom 32 bits of node address
+	
+	//
+	// Useful C++ only constructors
+	//
+	#ifdef __cplusplus
+	FWAddressStruct(const FWAddressStruct & a): 
+			nodeID(a.nodeID), addressHi(a.addressHi), addressLo(a.addressLo) {};
+    FWAddressStruct(UInt16 h=0xdead, UInt32 l=0xcafebabe) : 
+			nodeID(0), addressHi(h), addressLo(l) {};
+	FWAddressStruct(UInt16 h, UInt32 l, UInt16 n) :
+			nodeID(n), addressHi(h), addressLo(l) {};
+	#endif
+} FWAddress, *FWAddressPtr ;
+
+// =================================================================
+// Config ROM
+// =================================================================
+#pragma mark -
+#pragma mark CONFIG ROM
+
+//
+// CSR bit defs.
+//
+
+#define CSR_BIT(x) FW_BIT(x)
+
+#define CSRBitRange(start, end)						\
+(													\
+	((((UInt32) 0xFFFFFFFF) << (start)) >>			\
+	((start) + (31 - (end)))) <<					\
+	(31 - (end))									\
+)
+
+#define CSRBitRangePhase(start, end)				\
+	(31 - end)
+
+//
+// Key types.
+//
+
+typedef enum
+{
+	kConfigImmediateKeyType		= 0,
+	kConfigOffsetKeyType		= 1,
+	kConfigLeafKeyType		= 2,
+	kConfigDirectoryKeyType		= 3,
+	kInvalidConfigROMEntryType	= 0xff
+} IOConfigKeyType;
+
+//
+// Key values.
+//
+
+enum
+{
+	kConfigTextualDescriptorKey		= 0x01,
+	kConfigBusDependentInfoKey		= 0x02,
+	kConfigModuleVendorIdKey		= 0x03,
+	kConfigModuleHwVersionKey		= 0x04,
+	kConfigModuleSpecIdKey			= 0x05,
+	kConfigModuleSwVersionKey		= 0x06,
+	kConfigModuleDependentInfoKey	= 0x07,
+	kConfigNodeVendorIdKey			= 0x08,
+	kConfigNodeHwVersionKey			= 0x09,
+	kConfigNodeSpecIdKey			= 0x0A,
+	kConfigNodeSwVersionKey			= 0x0B,
+	kConfigNodeCapabilitiesKey		= 0x0C,
+	kConfigNodeUniqueIdKey			= 0x0D,
+	kConfigNodeUnitsExtentKey		= 0x0E,
+	kConfigNodeMemoryExtentKey		= 0x0F,
+	kConfigNodeDependentInfoKey		= 0x10,
+	kConfigUnitDirectoryKey			= 0x11,
+	kConfigUnitSpecIdKey			= 0x12,
+	kConfigUnitSwVersionKey			= 0x13,
+	kConfigUnitDependentInfoKey		= 0x14,
+	kConfigUnitLocationKey			= 0x15,
+	kConfigUnitPollMaskKey			= 0x16,
+	kConfigModelIdKey				= 0x17,
+	kConfigGenerationKey			= 0x38,		// Apple-specific
+
+	kConfigRootDirectoryKey			= 0xffff	// Not a real key
+};
+
+enum
+{
+	kConfigSBP2LUN					= 0x14,
+	kConfigSBP2Revision				= 0x21,
+	kConfigSBP2MAO					= 0x54	
+};
+
+// Core CSR registers.
+enum
+{
+	kCSRStateUnitDepend			= CSRBitRange(0, 15),
+	kCSRStateUnitDependPhase	= CSRBitRangePhase(0, 15),
+
+	kCSRStateBusDepend			= CSRBitRange(16, 23),
+	kCSRStateBusDependPhase		= CSRBitRangePhase(16, 23),
+
+	kCSRStateLost				= CSR_BIT(24),
+	kCSRStateDReq				= CSR_BIT(25),
+	kCSRStateELog				= CSR_BIT(27),
+	kCSRStateAtn				= CSR_BIT(28),
+	kCSRStateOff				= CSR_BIT(29),
+
+	kCSRStateState				= CSRBitRange(30, 31),
+	kCSRStateStatePhase			= CSRBitRangePhase(30, 31),
+	kCSRStateStateRunning		= 0,
+	kCSRStateStateInitializing	= 1,
+	kCSRStateStateTesting		= 2,
+	kCSRStateStateDead			= 3
+};
+
+// Config ROM entry bit locations.
+
+enum
+{
+	kConfigBusInfoBlockLength		= CSRBitRange (0, 7),
+	kConfigBusInfoBlockLengthPhase	= CSRBitRangePhase (0, 7),
+
+	kConfigROMCRCLength				= CSRBitRange (8, 15),
+	kConfigROMCRCLengthPhase		= CSRBitRangePhase (8, 15),
+
+	kConfigROMCRCValue				= CSRBitRange (16, 31),
+	kConfigROMCRCValuePhase			= CSRBitRangePhase (16, 31),
+
+	kConfigEntryKeyType				= CSRBitRange (0, 1),
+	kConfigEntryKeyTypePhase		= CSRBitRangePhase (0, 1),
+
+	kConfigEntryKeyValue			= CSRBitRange (2, 7),
+	kConfigEntryKeyValuePhase		= CSRBitRangePhase (2, 7),
+
+	kConfigEntryValue				= CSRBitRange (8, 31),
+	kConfigEntryValuePhase			= CSRBitRangePhase (8, 31),
+
+	kConfigLeafDirLength			= CSRBitRange (0, 15),
+	kConfigLeafDirLengthPhase		= CSRBitRangePhase (0, 15),
+
+	kConfigLeafDirCRC				= CSRBitRange (16, 31),
+	kConfigLeafDirCRCPhase			= CSRBitRangePhase (16, 31)
+};
+
+//
+// Key types.
+//
+typedef enum
+{
+	kCSRImmediateKeyType		= 0,
+	kCSROffsetKeyType			= 1,
+	kCSRLeafKeyType				= 2,
+	kCSRDirectoryKeyType		= 3,
+    kInvalidCSRROMEntryType		= 0xff
+} IOCSRKeyType;
+
+// CSR 64-bit fixed address defs.
+
+enum
+{
+	kCSRNodeID								= CSRBitRange (0, 15),
+	kCSRNodeIDPhase							= CSRBitRangePhase (0, 15),
+
+	kCSRInitialMemorySpaceBaseAddressHi		= 0x00000000,
+	kCSRInitialMemorySpaceBaseAddressLo		= 0x00000000,
+
+	kCSRPrivateSpaceBaseAddressHi			= 0x0000FFFF,
+	kCSRPrivateSpaceBaseAddressLo			= 0xE0000000,
+
+	kCSRRegisterSpaceBaseAddressHi			= 0x0000FFFF,
+	kCSRRegisterSpaceBaseAddressLo			= 0xF0000000,
+
+	kCSRCoreRegistersBaseAddress			= kCSRRegisterSpaceBaseAddressLo,
+	kCSRStateClearAddress					= kCSRCoreRegistersBaseAddress + 0x0000,
+	kCSRStateSetAddress						= kCSRCoreRegistersBaseAddress + 0x0004,
+	kCSRNodeIDsAddress						= kCSRCoreRegistersBaseAddress + 0x0008,
+	kCSRResetStartAddress					= kCSRCoreRegistersBaseAddress + 0x000C,
+	kCSRIndirectAddressAddress				= kCSRCoreRegistersBaseAddress + 0x0010,
+	kCSRIndirectDataAddress					= kCSRCoreRegistersBaseAddress + 0x0014,
+	kCSRSplitTimeoutHiAddress				= kCSRCoreRegistersBaseAddress + 0x0018,
+	kCSRSplitTimeoutLoAddress				= kCSRCoreRegistersBaseAddress + 0x001C,
+	kCSRArgumentHiAddress					= kCSRCoreRegistersBaseAddress + 0x0020,
+	kCSRArgumentLoAddress					= kCSRCoreRegistersBaseAddress + 0x0024,
+	kCSRTestStartAddress					= kCSRCoreRegistersBaseAddress + 0x0028,
+	kCSRTestStatusAddress					= kCSRCoreRegistersBaseAddress + 0x002C,
+	kCSRUnitsBaseHiAddress					= kCSRCoreRegistersBaseAddress + 0x0030,
+	kCSRUnitsBaseLoAddress					= kCSRCoreRegistersBaseAddress + 0x0034,
+	kCSRUnitsBoundHiAddress					= kCSRCoreRegistersBaseAddress + 0x0038,
+	kCSRUnitsBoundLoAddress					= kCSRCoreRegistersBaseAddress + 0x003C,
+	kCSRMemoryBaseHiAddress					= kCSRCoreRegistersBaseAddress + 0x0040,
+	kCSRMemoryBaseLoAddress					= kCSRCoreRegistersBaseAddress + 0x0044,
+	kCSRMemoryBoundHiAddress				= kCSRCoreRegistersBaseAddress + 0x0048,
+	kCSRMemoryBoundLoAddress				= kCSRCoreRegistersBaseAddress + 0x004C,
+	kCSRInterruptTargetAddress				= kCSRCoreRegistersBaseAddress + 0x0050,
+	kCSRInterruptMaskAddress				= kCSRCoreRegistersBaseAddress + 0x0054,
+	kCSRClockValueHiAddress					= kCSRCoreRegistersBaseAddress + 0x0058,
+	kCSRClockValueMidAddress				= kCSRCoreRegistersBaseAddress + 0x005C,
+	kCSRClockTickPeriodMidAddress			= kCSRCoreRegistersBaseAddress + 0x0060,
+	kCSRClockTickPeriodLoAddress			= kCSRCoreRegistersBaseAddress + 0x0064,
+	kCSRClockStrobeArrivedHiAddress			= kCSRCoreRegistersBaseAddress + 0x0068,
+	kCSRClockStrobeArrivedMidAddress		= kCSRCoreRegistersBaseAddress + 0x006C,
+	kCSRClockInfo0Address					= kCSRCoreRegistersBaseAddress + 0x0070,
+	kCSRClockInfo1Address					= kCSRCoreRegistersBaseAddress + 0x0074,
+	kCSRClockInfo2Address					= kCSRCoreRegistersBaseAddress + 0x0078,
+	kCSRClockInfo3Address					= kCSRCoreRegistersBaseAddress + 0x007C,
+	kCSRMessageRequestAddress				= kCSRCoreRegistersBaseAddress + 0x0080,
+	kCSRMessageResponseAddress				= kCSRCoreRegistersBaseAddress + 0x00C0,
+	kCSRErrorLogBufferAddress				= kCSRCoreRegistersBaseAddress + 0x0180,
+
+	kCSRBusDependentRegistersBaseAddress	= kCSRRegisterSpaceBaseAddressLo + 0x0200,
+	kCSRBusyTimeout							= kCSRRegisterSpaceBaseAddressLo + 0x0210,
+	kCSRBusManagerID						= kCSRRegisterSpaceBaseAddressLo + 0x021C,
+	kCSRBandwidthAvailable					= kCSRRegisterSpaceBaseAddressLo + 0x0220,
+	kCSRChannelsAvailable31_0				= kCSRRegisterSpaceBaseAddressLo + 0x0224,
+	kCSRChannelsAvailable63_32				= kCSRRegisterSpaceBaseAddressLo + 0x0228,
+	kCSRBroadcastChannel					= kCSRRegisterSpaceBaseAddressLo + 0x0234,
+	
+	kConfigROMBaseAddress					= kCSRRegisterSpaceBaseAddressLo + 0x0400,
+	kConfigBIBHeaderAddress					= kConfigROMBaseAddress,
+	kConfigBIBBusNameAddress				= kConfigROMBaseAddress + 4,
+	
+	kPCRBaseAddress							= kCSRRegisterSpaceBaseAddressLo + 0x900,
+	kFCPCommandAddress						= kCSRRegisterSpaceBaseAddressLo + 0xb00,
+	kFCPResponseAddress						= kCSRRegisterSpaceBaseAddressLo + 0xd00
+};
+
+// from figure 10-7 of 1394a
+#define kBroadcastChannelInitialValues 	0x8000001f
+#define kBroadcastChannelValidMask 		0x40000000
+
+// CSR defined 64 bit unique ID.
+
+typedef UInt64 CSRNodeUniqueID;
+
+// FireWire core CSR registers.
+
+enum
+{
+	kFWCSRStateGone				= FW_BIT(16),
+	kFWCSRStateLinkOff			= FW_BIT(22),
+	kFWCSRStateCMstr			= FW_BIT(23)
+};
+
+// FireWire bus/nodeID address defs.
+
+enum
+{
+	kFWAddressBusID				= FWBitRange (16, 25) << kCSRNodeIDPhase,
+	kFWAddressBusIDPhase		= FWBitRangePhase (16, 25) + kCSRNodeIDPhase,
+
+	kFWAddressNodeID			= FWBitRange (26, 31) << kCSRNodeIDPhase,
+	kFWAddressNodeIDPhase		= FWBitRangePhase (26, 31) + kCSRNodeIDPhase,
+
+	kFWLocalBusID				= 1023,
+	kFWBroadcastNodeID			= 63,
+	kFWBadNodeID				= 0xffff,
+
+	kFWLocalBusAddress			= kFWLocalBusID << kFWAddressBusIDPhase,
+	kFWBroadcastAddress			= kFWBroadcastNodeID << kFWAddressNodeIDPhase
+};
+
+#define FWNodeBaseAddress(busID, nodeID)												\
+(																						\
+	(busID << kFWAddressBusIDPhase) |													\
+	(nodeID << kFWAddressNodeIDPhase)													\
+)
+
+#define FWNodeRegisterSpaceBaseAddressHi(busID, nodeID)									\
+(																						\
+	FWNodeBaseAddress (busID, nodeID) |													\
+	kCSRRegisterSpaceBaseAddressHi														\
+)
+
+// FireWire CSR bus info block defs.
+
+enum
+{
+	kFWBIBHeaderAddress					= kConfigBIBHeaderAddress,
+	kFWBIBBusNameAddress				= kConfigBIBBusNameAddress,
+	kFWBIBNodeCapabilitiesAddress		= kConfigROMBaseAddress + 8,
+	kFWBIBNodeUniqueIDHiAddress			= kConfigROMBaseAddress + 12,
+	kFWBIBNodeUniqueIDLoAddress			= kConfigROMBaseAddress + 16,
+
+	kFWBIBBusName						= 0x31333934, //'1394'
+
+	kFWBIBIrmc							= FW_BIT(0),
+	kFWBIBCmc							= FW_BIT(1),
+	kFWBIBIsc							= FW_BIT(2),
+	kFWBIBBmc							= FW_BIT(3),
+	kFWBIBCycClkAcc						= FWBitRange (8, 15),
+	kFWBIBCycClkAccPhase				= FWBitRangePhase (8, 15),
+	kFWBIBMaxRec						= FWBitRange (16, 19),
+	kFWBIBMaxRecPhase					= FWBitRangePhase (16, 19),
+	kFWBIBMaxROM						= FWBitRange (20, 21),
+	kFWBIBMaxROMPhase					= FWBitRangePhase (20, 21),
+	kFWBIBGeneration					= FWBitRange (24, 27),
+	kFWBIBGenerationPhase				= FWBitRangePhase (24, 27),
+	kFWBIBLinkSpeed						= FWBitRange (29, 31),
+	kFWBIBLinkSpeedPhase				= FWBitRangePhase (29, 31)
+};
+
+enum
+{
+	kConfigUnitSpecAppleA27				= 0x000a27,
+	kConfigUnitSpec1394TA1				= 0x00a02d,
+	
+	kConfigUnitSWVersMacintosh10		= 10,
+	kConfigUnitSWVersIIDC100			= 0x000100,
+	kConfigUnitSWVersIIDC101			= 0x000101,
+	kConfigUnitSWVersIIDC102			= 0x000102
+};
+
+
+// =================================================================
+// Isoch defines
+// =================================================================
+#pragma mark -
+#pragma mark ISOCH
+
+enum
+{
+	kFWIsochDataLength		= FWBitRange (0, 15),
+	kFWIsochDataLengthPhase	= FWBitRangePhase (0, 15),
+	
+	kFWIsochTag				= FWBitRange (16, 17),
+	kFWIsochTagPhase		= FWBitRangePhase (16, 17),
+
+	kFWIsochChanNum			= FWBitRange (18, 23),
+	kFWIsochChanNumPhase	= FWBitRangePhase (18, 23),
+
+	kFWIsochTCode			= FWBitRange (24, 27),
+	kFWIsochTCodePhase		= FWBitRangePhase (24, 27),
+
+	kFWIsochSy				= FWBitRange (28, 31),
+	kFWIsochSyPhase			= FWBitRangePhase (28, 31)
+};
+
+#define CHAN_BIT(x) 		(((UInt64)1) << (63 - (x))
+#define CHAN_MASK(x) 		(~CHAN_BIT(X))
+
+typedef enum
+{
+	kFWNeverMultiMode = 0,
+	kFWAllowMultiMode,
+	kFWSuggestMultiMode,
+	kFWAlwaysMultiMode,
+	
+	kFWDefaultIsochResourceFlags = kFWNeverMultiMode
+} IOFWIsochResourceFlags ;
+
+enum
+{
+	kFWIsochChannelDefaultFlags = 0,
+	kFWIsochChannelDoNotResumeOnWake = BIT(1)
+} ;
+
+typedef enum
+{
+	kFWIsochPortDefaultOptions = 0,
+	kFWIsochPortUseSeparateKernelThread		= BIT(1),
+	kFWIsochEnableRobustness			= BIT(2),
+	kFWIsochBigEndianUpdates			= BIT(3),	// private
+	kFWIsochRequireLastContext			= BIT(4),	// private
+} IOFWIsochPortOptions ;
+
+// =================================================================
+// DCL opcode defs.
+// =================================================================
+#pragma mark -
+#pragma mark DCL OPCODES
+
+enum
+{
+	kFWDCLImmediateEvent				= 0,
+	kFWDCLCycleEvent					= 1,
+	kFWDCLSyBitsEvent					= 2
+};
+
+typedef enum
+{
+	kFWDCLInvalidNotification				= 0
+	, kFWDCLUpdateNotification				= 1
+	, kFWDCLModifyNotification				= 2
+	, kFWNuDCLModifyNotification			= 3
+	, kFWNuDCLModifyJumpNotification		= 4
+	, kFWNuDCLUpdateNotification			= 5
+} IOFWDCLNotificationType ;
+
+enum
+{
+	kFWDCLOpDynamicFlag					= BIT(16),
+	kFWDCLOpVendorDefinedFlag			= BIT(17),
+	kFWDCLOpFlagMask					= BitRange (16, 31),
+	kFWDCLOpFlagPhase					= BitRangePhase (16, 31)
+};
+
+enum
+{
+	kDCLInvalidOp						= 0,
+	kDCLSendPacketStartOp				= 1,
+	//kDCLSendPacketWithHeaderStartOp		= 2, // Deprecated legacy DCL opcode! Use NuDCL instead!
+	kDCLSendPacketOp					= 3,
+	kDCLSendBufferOp					= 4,	// obsolete - do not use
+	kDCLReceivePacketStartOp			= 5,
+	kDCLReceivePacketOp					= 6,
+	kDCLReceiveBufferOp					= 7,	// obsolete - do not use
+	kDCLCallProcOp						= 8,
+	kDCLLabelOp							= 9,
+	kDCLJumpOp							= 10,
+	kDCLSetTagSyncBitsOp				= 11,
+	kDCLUpdateDCLListOp					= 12,
+	kDCLTimeStampOp						= 13,
+	kDCLPtrTimeStampOp					= 14,
+	kDCLSkipCycleOp						= 15,
+
+	kDCLNuDCLLeaderOp					= 20	// compilerData field contains NuDCLRef to start of NuDCL
+												// program.
+												// Should not need to use this directly.
+};
+
+#ifdef FW_OLD_DCL_DEFS
+
+//typedef struct DCLCommandStruct ;
+//typedef void (DCLCallCommandProc)(DCLCommandStruct* command);
+
+#else
+
+//typedef struct DCLCommand ;
+//typedef void (DCLCallCommandProc)(DCLCommand* command);
+
+#endif
+
+// =================================================================
+// DCL structs
+// =================================================================
+#pragma mark -
+#pragma mark DCL
+
+#ifdef __LP64__		
+typedef void* DCLCallProcDataType;
+#else
+typedef UInt32 DCLCallProcDataType;
+#endif
+
+#ifdef KERNEL
+	#ifdef __LP64__		
+		typedef void* DCLCompilerDataType;
+	#else
+		typedef UInt32 DCLCompilerDataType;
+	#endif
+#else
+		typedef UInt32 DCLCompilerDataType;
+#endif
+
+typedef struct DCLCommandStruct
+{
+	struct DCLCommandStruct *	pNextDCLCommand;		// Next DCL command.
+	DCLCompilerDataType			compilerData;			// Data for use by DCL compiler.
+	UInt32						opcode;					// DCL opcode.
+	UInt32						operands[1];			// DCL operands (size varies)
+} DCLCommand;
+
+typedef void (DCLCallCommandProc)(DCLCommand * command);
+
+typedef struct DCLTransferPacketStruct
+{
+	DCLCommand *			pNextDCLCommand;		// Next DCL command.
+	DCLCompilerDataType		compilerData;			// Data for use by DCL compiler.
+	UInt32					opcode;					// DCL opcode.
+	void *					buffer;					// Packet buffer.
+	UInt32					size;					// Buffer size.
+} DCLTransferPacket ;
+
+typedef struct DCLTransferBufferStruct
+{
+	DCLCommand *			pNextDCLCommand;		// Next DCL command.
+	DCLCompilerDataType		compilerData;			// Data for use by DCL compiler.
+	UInt32					opcode;					// DCL opcode.
+	void *					buffer;					// Buffer.
+	UInt32					size;					// Buffer size.
+	UInt16					packetSize;				// Size of packets to send.
+	UInt16					reserved;
+	UInt32					bufferOffset;			// Current offset into buffer.
+} DCLTransferBuffer ;
+
+typedef struct DCLCallProcStruct
+{
+	DCLCommand *			pNextDCLCommand;	// Next DCL command.
+	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	DCLCallCommandProc *	proc;				// Procedure to call.
+	DCLCallProcDataType		procData;			// Data for use by called procedure.
+} DCLCallProc;
+
+typedef struct DCLLabelStruct
+{
+	DCLCommand *			pNextDCLCommand;	// Next DCL command.
+	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+} DCLLabel;
+
+typedef struct DCLJumpStruct
+{
+	DCLCommand *			pNextDCLCommand;	// Next DCL command.
+	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	DCLLabel *				pJumpDCLLabel;		// DCL label to jump to.
+} DCLJump;
+
+typedef struct DCLSetTagSyncBitsStruct
+{
+	DCLCommand *			pNextDCLCommand;	// Next DCL command.
+	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	UInt16					tagBits;			// Tag bits for following packets.
+	UInt16					syncBits;			// Sync bits for following packets.
+} DCLSetTagSyncBits;
+
+typedef struct DCLUpdateDCLListStruct
+{
+	DCLCommand *			pNextDCLCommand;	// Next DCL command.
+	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	DCLCommand **			dclCommandList;		// List of DCL commands to update.
+	UInt32					numDCLCommands;		// Number of DCL commands in list.
+} DCLUpdateDCLList;
+
+typedef struct DCLTimeStampStruct
+{
+	DCLCommand *			pNextDCLCommand;	// Next DCL command.
+	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	UInt32					timeStamp;			// Time stamp.
+} DCLTimeStamp;
+
+typedef struct DCLPtrTimeStampStruct
+{
+	DCLCommand *			pNextDCLCommand;	// Next DCL command.
+	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	UInt32 *				timeStampPtr;		// Where to store the time stamp.
+} DCLPtrTimeStamp ;
+
+typedef struct 
+{
+	DCLCommand *			pNextDCLCommand ;	// unused - always NULL
+	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode ;			// must be kDCLNuDCLLeaderOp
+	void*				 	program ;			// NuDCL program here...
+} DCLNuDCLLeader ;
+
+#ifdef FW_OLD_DCL_DEFS
+
+//  should not use these...
+
+typedef DCLCommand*				DCLCommandPtr ;
+typedef DCLTransferBuffer*		DCLTransferBufferPtr ;
+typedef DCLTransferPacket*		DCLTransferPacketPtr ;
+typedef DCLCallProc*			DCLCallProcPtr ;
+typedef DCLLabel*				DCLLabelPtr ;
+typedef DCLJump*				DCLJumpPtr ;
+typedef DCLSetTagSyncBits*		DCLSetTagSyncBitsPtr ;
+typedef DCLUpdateDCLList*		DCLUpdateDCLListPtr ;
+typedef DCLTimeStamp*			DCLTimeStampPtr ;
+typedef DCLPtrTimeStamp*		DCLPtrTimeStampPtr ;
+typedef DCLCallCommandProc* 	DCLCallCommandProcPtr ;
+
+#endif
+
+
+// =================================================================
+// User-Lib Export DCL structs - Thses structus are used to pass
+// a user-created legacy DCL program down into kernel space. These
+// structs allow support for both 32-bit and 64-bit user-space clients.
+// These structs should only be used internally. They are not for
+// clients to create DCL programs with.
+// =================================================================
+
+typedef struct UserExportDCLCommandStruct
+{
+	mach_vm_address_t					pClientDCLStruct;		// A pointer to the client's DCL struct
+	mach_vm_address_t					pNextDCLCommand;		// Next DCL command.
+	uint64_t							compilerData;			// Data for use by DCL compiler.
+	UInt32								opcode;					// DCL opcode.
+	UInt32								operands[1];			// DCL operands (size varies)
+} __attribute__ ((packed)) UserExportDCLCommand;
+
+typedef void (UserExportDCLCallCommandProc)(UserExportDCLCommand * command);
+
+typedef struct UserExportDCLTransferPacketStruct
+{
+	mach_vm_address_t		pClientDCLStruct;		// A pointer to the client's DCL struct
+	mach_vm_address_t		pNextDCLCommand;		// Next DCL command.
+	uint64_t				compilerData;			// Data for use by DCL compiler.
+	UInt32					opcode;					// DCL opcode.
+	mach_vm_address_t		buffer;					// Packet buffer.
+	UInt32					size;					// Buffer size.
+} __attribute__ ((packed)) UserExportDCLTransferPacket ;
+
+typedef struct UserExportDCLTransferBufferStruct
+{
+	mach_vm_address_t		pClientDCLStruct;		// A pointer to the client's DCL struct
+	mach_vm_address_t		pNextDCLCommand;		// Next DCL command.
+	uint64_t				compilerData;			// Data for use by DCL compiler.
+	UInt32					opcode;					// DCL opcode.
+	mach_vm_address_t		buffer;					// Buffer.
+	UInt32					size;					// Buffer size.
+	UInt16					packetSize;				// Size of packets to send.
+	UInt16					reserved;
+	UInt32					bufferOffset;			// Current offset into buffer.
+} __attribute__ ((packed)) UserExportDCLTransferBuffer ;
+
+typedef struct UserExportDCLCallProcStruct
+{
+	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
+	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
+	uint64_t				compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	mach_vm_address_t		proc;				// Procedure to call.
+	uint64_t				procData;			// Data for use by called procedure.
+} __attribute__ ((packed)) UserExportDCLCallProc;
+
+typedef struct UserExportDCLLabelStruct
+{
+	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
+	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
+	uint64_t				compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+} __attribute__ ((packed)) UserExportDCLLabel;
+
+typedef struct UserExportDCLJumpStruct
+{
+	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
+	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
+	uint64_t				compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	mach_vm_address_t		pJumpDCLLabel;		// DCL label to jump to.
+} __attribute__ ((packed)) UserExportDCLJump;
+
+typedef struct UserExportDCLSetTagSyncBitsStruct
+{
+	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
+	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
+	uint64_t				compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	UInt16					tagBits;			// Tag bits for following packets.
+	UInt16					syncBits;			// Sync bits for following packets.
+} __attribute__ ((packed)) UserExportDCLSetTagSyncBits;
+
+typedef struct UserExportDCLUpdateDCLListStruct
+{
+	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
+	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
+	uint64_t				compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	mach_vm_address_t		dclCommandList;		// List of DCL commands to update.
+	UInt32					numDCLCommands;		// Number of DCL commands in list.
+} __attribute__ ((packed)) UserExportDCLUpdateDCLList;
+
+typedef struct UserExportDCLTimeStampStruct
+{
+	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
+	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
+	uint64_t				compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	UInt32					timeStamp;			// Time stamp.
+} __attribute__ ((packed)) UserExportDCLTimeStamp;
+
+typedef struct UserExportDCLPtrTimeStampStruct
+{
+	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
+	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
+	uint64_t				compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode;				// DCL opcode.
+	mach_vm_address_t		timeStampPtr;		// Where to store the time stamp.
+} __attribute__ ((packed)) UserExportDCLPtrTimeStamp ;
+
+typedef struct 
+{
+	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
+	mach_vm_address_t		pNextDCLCommand ;	// unused - always NULL
+	uint64_t				compilerData;		// Data for use by DCL compiler.
+	UInt32					opcode ;			// must be kDCLNuDCLLeaderOp
+	mach_vm_address_t	 	program ;			// NuDCL program here...
+} __attribute__ ((packed)) UserExportDCLNuDCLLeader ;
+
+
+// =================================================================
+// NuDCL
+// =================================================================
+#pragma mark -
+#pragma mark NUDCL
+
+typedef struct __NuDCL *	NuDCLRef ;
+typedef NuDCLRef			NuDCLSendPacketRef ;
+typedef NuDCLRef			NuDCLSkipCycleRef ;
+typedef NuDCLRef			NuDCLReceivePacketRef ;
+
+typedef void (*NuDCLCallback)( void* refcon, NuDCLRef dcl );
+
+typedef enum
+{
+	kNuDCLDynamic = BIT( 1 ),
+	kNuDCLUpdateBeforeCallback = BIT( 2 )
+
+} NuDCLFlags ;
+
+// =================================================================
+// Miscellaneous
+// =================================================================
+#pragma mark -
+#pragma mark MISCELLANEOUS
+
+typedef void* FWClientCommandID ;
+
+typedef struct IOFireWireSessionRefOpaqueStuct* IOFireWireSessionRef ;
+
+//
+// bus management constants.
+//
+
+enum
+{
+	kFWBusManagerArbitrationTimeoutDuration	= 625 // durationMillisecond
+};
+
+//
+// bus characteristics.
+//
+
+enum
+{
+	kFWMaxBusses				= 1023,
+	kFWMaxNodesPerBus			= 63,
+	kFWMaxNodeHops				= 16
+};
+
+/*! @enum		NodeFlags
+
+	@abstract	Flags that specify characteristics of the FireWire device node.
+	
+	@constant	kIOFWDisablePhysicalAccess 		Disable physical memory access
+	
+	@constant	kIOFWDisableAllPhysicalAccess	Disable all physical memory access
+	
+	@constant	kIOFWEnableRetryOnAckD			Enable retry on Ack D
+	
+	@constant	kIOFWLimitAsyncPacketSize		Limit async packet size
+	
+	@constant	kIOFWDisablePhyOnSleep			Disable Phy, when machine is in Sleep mode
+	
+	@constant	kIOFWMustBeRoot					Attempt to make this device root, There is no guarentee Mac OS will succeed in making the device 
+	                                            root.
+												
+	@constant	kIOFWMustNotBeRoot				Attempt to prevent this device from being root, There is no guarentee Mac OS will succeed in preventing the device 
+	                                            from being root.
+												
+	@constant	kIOFWMustHaveGap63				Attempt to ensure the gap count is 63, when this device is on the bus. Gap 63 reduces bus performance significantly,
+												so this flag should be used only when absolutely necessary. There is no guarentee Mac OS will succeed in forcing
+												the gap count to 63.
+*/
+enum
+{
+    kIOFWDisablePhysicalAccess 		= (1 << 0),
+	kIOFWDisableAllPhysicalAccess 	= (1 << 1),
+	kIOFWEnableRetryOnAckD			= (1 << 2),
+	kIOFWLimitAsyncPacketSize		= (1 << 3),
+	kIOFWDisablePhyOnSleep			= (1 << 4),
+	kIOFWMustBeRoot					= (1 << 5),
+	kIOFWMustNotBeRoot				= (1 << 6),
+	kIOFWMustHaveGap63				= (1 << 7)
+};
+
+//
+// write flags
+//
+
+enum IOFWWriteFlags
+{
+	kIOFWWriteFlagsNone				= 0x00000000,
+	kIOFWWriteFlagsDeferredNotify 	= 0x00000001,
+	kIOFWWriteFastRetryOnBusy		= 0x00000002,
+	kIOFWWriteBlockRequest			= 0x00000004,		// force a block request
+};
+
+//
+// read flags
+//
+
+enum IOFWReadFlags
+{
+	kIOFWReadFlagsNone				= 0x00000000,
+	kIOFWReadBlockRequest			= 0x00000004,		// force a block request
+	kIOFWReadPingTime				= 0x00000008		// ping time
+};
+
+//
+// security modes
+//
+
+enum IOFWSecurityMode
+{
+	kIOFWSecurityModeNormal = 0,
+	kIOFWSecurityModeSecure = 1,
+	kIOFWSecurityModeSecurePermanent = 2
+};
+
+//
+// physical access settings
+//
+
+enum IOFWPhysicalAccessMode
+{
+	kIOFWPhysicalAccessEnabled = 0,
+	kIOFWPhysicalAccessDisabled = 1,
+	kIOFWPhysicalAccessDisabledForGeneration = 2
+};
+
+enum
+{
+	kIOFWSpecID_AAPL = 0xa27,
+	kIOFWSWVers_KPF = 0x40
+};
+
+// old style bit defs
+#ifdef FW_OLD_BIT_DEFS
+
+	#define kBit0	BIT(0)
+	#define kBit1	BIT(1)
+	#define kBit2	BIT(2)
+	#define kBit3	BIT(3)
+	#define kBit4	BIT(4)
+	#define kBit5	BIT(5)
+	#define kBit6	BIT(6)
+	#define kBit7	BIT(7)
+	#define kBit8	BIT(8)
+	#define kBit9	BIT(9)
+	#define kBit10	BIT(10)
+	#define kBit11	BIT(11)
+	#define kBit12	BIT(12)
+	#define kBit13	BIT(13)
+	#define kBit14	BIT(14)
+	#define kBit15	BIT(15)
+	#define kBit16	BIT(16)
+	#define kBit17	BIT(17)
+	#define kBit18	BIT(18)
+	#define kBit19	BIT(19)
+	#define kBit20	BIT(20)
+	#define kBit21	BIT(21)
+	#define kBit22	BIT(22)
+	#define kBit23	BIT(23)
+	#define kBit24	BIT(24)
+	#define kBit25	BIT(25)
+	#define kBit26	BIT(26)
+	#define kBit27	BIT(27)
+	#define kBit28	BIT(28)
+	#define kBit29	BIT(29)
+	#define kBit30	BIT(30)
+	#define kBit31	BIT(31)
+
+#endif
+
+#endif //__IOFireWireFamilyCommon_H__
diff --git a/i386/include/IOKit/firewire/IOFireWireIRMAllocation.h b/i386/include/IOKit/firewire/IOFireWireIRMAllocation.h
new file mode 100644
index 0000000..c67986c
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFireWireIRMAllocation.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOFIREWIREIRMALLOCATION_H
+#define _IOKIT_IOFIREWIREIRMALLOCATION_H
+
+#include <libkern/c++/OSObject.h>
+
+class IOFireWireController;
+
+//#include <IOKit/firewire/IOFireWireController.h>
+//#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+
+/*! @class IOFireWireIRMAllocation
+*/
+
+class IOFireWireIRMAllocation : public OSObject
+{
+	friend class IOFireWireController;
+
+    OSDeclareDefaultStructors(IOFireWireIRMAllocation)
+	
+public:
+		
+		// Prototype for the callback if reallocation after bus-reset is unsuccessful.
+		typedef IOReturn (*AllocationLostNotificationProc)(void* refCon, class IOFireWireIRMAllocation* allocation);
+
+	// Initialize the IRM allocation object. 
+    virtual bool init( IOFireWireController * control,
+					   Boolean releaseIRMResourcesOnFree = true, 
+					   AllocationLostNotificationProc allocationLostProc = NULL,
+					   void *pLostProcRefCon = NULL);
+    	
+	// Specify whether of not the IRM resources should automatically
+	// be released when freeing this allocation object.
+	virtual void setReleaseIRMResourcesOnFree(Boolean doRelease);
+	
+	// Use the IRMAllocation object to allocate isoch resources
+	virtual IOReturn allocateIsochResources(UInt8 isochChannel, UInt32 bandwidthUnits);
+
+	// Free isoch resources previously allocated with a call to allocateIsochResources
+	virtual IOReturn deallocateIsochResources(void);
+	
+	// Returns true if isoch resources are currently allocated, and if true, the allocated channel, and amount of isoch bandwidth.
+	virtual Boolean areIsochResourcesAllocated(UInt8 *pAllocatedIsochChannel, UInt32 *pAllocatedBandwidthUnits);
+	
+	// Get the refcon
+	virtual void * GetRefCon(void);
+	virtual void SetRefCon(void* refCon); 
+
+	// Override the base-class release function for special processing
+	virtual void release() const;
+	
+protected:
+
+		/*! @struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+		*/    
+		struct ExpansionData { };
+	
+		/*! @var reserved
+		Reserved for future use.  (Internal use only)  */
+		ExpansionData *reserved;
+
+		// Free the allocation object (and release IRM resources if needed)
+		virtual void free( void );
+
+		// Controller will call this to notify about bus-reset complete.
+		virtual void handleBusReset(UInt32 generation);
+	
+		virtual void failedToRealloc(void);
+		virtual UInt32 getAllocationGeneration(void);
+		static void threadFunc( void * arg );
+
+private:
+	
+	AllocationLostNotificationProc fAllocationLostProc;
+	void *fLostProcRefCon;
+	Boolean fReleaseIRMResourcesOnFree;
+	UInt8 fIsochChannel; 
+	UInt32 fBandwidthUnits;
+	UInt32 fAllocationGeneration;
+	IORecursiveLock *fLock ;
+	IOFireWireController *fControl;
+	Boolean isAllocated;
+	
+	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 0);
+	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 1);
+	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 2);
+	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 3);
+	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 4);
+	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 5);
+	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 6);
+	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 7);
+};
+
+#endif // _IOKIT_IOFIREWIREIRMALLOCATION_H
diff --git a/i386/include/IOKit/firewire/IOFireWireLocalNode.h b/i386/include/IOKit/firewire/IOFireWireLocalNode.h
new file mode 100644
index 0000000..339fb9e
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFireWireLocalNode.h
@@ -0,0 +1,143 @@
+/*
+ *  IOFireWireLocalNode.h
+ *  IOFireWireFamily
+ *
+ *  Created by Niels on Fri Aug 16 2002.
+ *  Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+	$Log: IOFireWireLocalNode.h,v $
+	Revision 1.8  2009/03/26 22:45:17  calderon
+	<rdar://6728033> User client fails to terminate with unexpected consuequences
+	
+	Revision 1.7  2008/11/14 00:17:12  arulchan
+	fix for rdar://5939334
+	
+	Revision 1.6  2005/02/18 22:56:53  gecko1
+	3958781 Q45C EVT: FireWire ASP reporter says port speed is 800 Mb/sec
+	
+	Revision 1.5  2003/02/20 02:00:12  collin
+	*** empty log message ***
+	
+	Revision 1.4  2003/02/17 21:47:53  collin
+	*** empty log message ***
+	
+	Revision 1.3  2002/10/18 23:29:44  collin
+	fix includes, fix cast which fails on new compiler
+	
+	Revision 1.2  2002/09/25 00:27:24  niels
+	flip your world upside-down
+	
+*/
+
+// public
+#import <IOKit/firewire/IOFireWireNub.h>
+
+class IOFireWireLocalNode;
+
+#pragma mark -
+
+/*! 
+	@class IOFireWireLocalNodeAux
+*/
+
+class IOFireWireLocalNodeAux : public IOFireWireNubAux
+{
+    OSDeclareDefaultStructors(IOFireWireLocalNodeAux)
+
+	friend class IOFireWireLocalNode;
+	
+protected:
+	
+	/*! 
+		@struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+    */  
+	  
+    struct ExpansionData { };
+
+	/*! 
+		@var reserved
+		Reserved for future use.  (Internal use only)  
+	*/
+    
+	ExpansionData * reserved;
+
+    virtual bool init( IOFireWireLocalNode * primary );
+	virtual	void free();
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWireLocalNodeAux, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireLocalNodeAux, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireLocalNodeAux, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireLocalNodeAux, 3);
+	
+};
+
+#pragma mark -
+
+/*! @class IOFireWireLocalNode
+*/
+
+class IOFireWireLocalNode : public IOFireWireNub
+{
+    OSDeclareDefaultStructors(IOFireWireLocalNode)
+
+	friend class IOFireWireLocalNodeAux;
+
+	/*------------------Useful info about device (also available in the registry)--------*/
+protected:
+
+	/*-----------Methods provided to FireWire device clients-------------*/
+public:
+	
+		// Set up properties affected by bus reset
+		virtual void setNodeProperties(UInt32 generation, UInt16 nodeID, UInt32 *selfIDs, int numIDs, IOFWSpeed maxSpeed );
+		
+		/*
+		* Standard nub initialization
+		*/
+		virtual bool init(OSDictionary * propTable);
+		virtual bool attach(IOService * provider );
+	
+		virtual void handleClose(   IOService *	  forClient,
+								IOOptionBits	  options ) ;
+		virtual bool handleOpen( 	IOService *	  forClient,
+								IOOptionBits	  options,
+								void *		  arg ) ;
+		virtual bool handleIsOpen(  const IOService * forClient ) const;
+	
+		/*
+		* Trick method to create protocol user clients
+		*/
+		virtual IOReturn setProperties( OSObject * properties );
+
+protected:
+	
+	virtual IOFireWireNubAux * createAuxiliary( void );
+
+public:
+	virtual IOReturn message( UInt32 type, IOService * provider, void * argument );
+	virtual void free();
+
+protected:
+	OSSet * fOpenClients;
+};
diff --git a/i386/include/IOKit/firewire/IOFireWireMultiIsochReceive.h b/i386/include/IOKit/firewire/IOFireWireMultiIsochReceive.h
new file mode 100644
index 0000000..e003660
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFireWireMultiIsochReceive.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2008 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@ 
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOFIREWIREMULTIISOCHRECEIVE_H_
+#define _IOKIT_IOFIREWIREMULTIISOCHRECEIVE_H_
+
+class IOFireWireMultiIsochReceiveListener;
+class IOFireWireMultiIsochReceivePacket;
+class IOFireWireController;
+
+typedef IOReturn (*FWMultiIsochReceiveListenerCallback)(void *refcon, IOFireWireMultiIsochReceivePacket *pPacket);
+
+// These are the parameters clients can set which help us to optimize the mult-isoch-receiver 
+// polling interval, and memory resources 
+typedef struct FWMultiIsochReceiveListenerParamsStruct
+	{
+		// How much latency, from when the packet arrives to when the client is notified, can the client tolerate. 
+		UInt32 maxLatencyInFireWireCycles;
+		
+		// In bits per second, the expected bit-rate of the incoming stream
+		UInt32 expectedStreamBitRate;
+		
+		// How long does the client expect to hold onto packets objects before returning them back to the receiver
+		UInt32 clientPacketReturnLatencyInFireWireCycles;
+	}FWMultiIsochReceiveListenerParams;
+
+/*! @class IOFireWireMultiIsochReceiveListener
+*/
+
+class IOFireWireMultiIsochReceiveListener : public OSObject
+	{
+		friend class IOFireWireLink;
+		
+	protected:
+		OSDeclareDefaultStructors(IOFireWireMultiIsochReceiveListener)
+		bool init(IOFireWireController *fwController,
+				  UInt32 receiveChannel,
+				  FWMultiIsochReceiveListenerCallback callback,
+				  void *pCallbackRefCon,
+				  FWMultiIsochReceiveListenerParams *pListenerParams);
+		void free();
+	public:
+		static IOFireWireMultiIsochReceiveListener *create(IOFireWireController *fwController,
+														   UInt32 channel,
+														   FWMultiIsochReceiveListenerCallback callback,
+														   void *pCallbackRefCon,
+														   FWMultiIsochReceiveListenerParams *pListenerParams);
+		
+		// Call this to activate the listener
+		IOReturn Activate();
+		
+		// Call this to deactivate the listener
+		IOReturn Deactivate();
+		
+		// Call this to modify the callback/refcon pointers. Only call this when not activated!
+		IOReturn SetCallback(FWMultiIsochReceiveListenerCallback callback,
+							 void *pCallbackRefCon);
+		
+		// Accessors
+		inline UInt32 getReceiveChannel(void) {return fChannel;};
+		inline FWMultiIsochReceiveListenerCallback getCallback(void){return fClientCallback;}; 
+		inline void * getRefCon(void){return fClientCallbackRefCon;};
+		inline bool getActivatedState(void) {return fActivated;};
+		
+	protected:
+		IOFireWireController *fControl;
+		UInt32 fChannel;
+		FWMultiIsochReceiveListenerCallback fClientCallback;
+		void *fClientCallbackRefCon;
+		bool fActivated;
+		FWMultiIsochReceiveListenerParams *fListenerParams;
+	};
+
+#define kMaxRangesPerMultiIsochReceivePacket 6
+
+/*! @class IOFireWireMultiIsochReceivePacket
+*/
+
+class IOFireWireMultiIsochReceivePacket : public OSObject
+	{
+		OSDeclareDefaultStructors(IOFireWireMultiIsochReceivePacket)
+		bool init(IOFireWireController *fwController);
+		void free();
+	public:
+		static IOFireWireMultiIsochReceivePacket *create(IOFireWireController *fwController);
+		
+		// The clients who are passed this packet by the 
+		// multi-isoch receiver calling their callback
+		// MUST call clientDone() on this packet to
+		// return it back for reuse!
+		void clientDone(void);
+		
+		UInt32 isochChannel(void);
+		UInt32 packetReceiveTime(void);
+		
+		UInt32 isochPayloadSize(void);	// The size of just the isoch payload, not including header/trailer quads.
+		inline UInt32 isochPacketSize(void) {return isochPayloadSize()+8; };	// The size of the packet, including header/trailer quads.
+		
+		// This returns a memory descriptor to the client. The client must call complete(), and release() on the
+		// memory descriptor when done.
+		IOMemoryDescriptor *createMemoryDescriptorForRanges(void);
+		
+		// These should be treated as read-only by clients,
+		// as should the data contained in these buffers!
+		IOAddressRange ranges[kMaxRangesPerMultiIsochReceivePacket] ;
+		UInt32 numRanges;
+		
+		// These should be treated private for clients!
+		// Messing with them will screw up the bookkeepping
+		// in the Multi-Isoch Receiver!
+		UInt32 numClientReferences;
+		void* elements[kMaxRangesPerMultiIsochReceivePacket];
+		
+	protected:
+		IOFireWireController *fControl;
+	};
+
+#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/firewire/IOFireWireNub.h b/i386/include/IOKit/firewire/IOFireWireNub.h
new file mode 100644
index 0000000..7df983b
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFireWireNub.h
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *
+ *	IOFireWireNub.h
+ *
+ *
+ * 	Note: IOFWCommand(s) are allocated by methods in this class. 
+ *            The remaining methods to setup and submit IOFWCommands are defined in
+ *            IOFWCommand.h
+ */
+#ifndef _IOKIT_IOFIREWIRENUB_H
+#define _IOKIT_IOFIREWIRENUB_H
+
+// public
+#include <IOKit/IOService.h>
+#include <IOKit/firewire/IOFWCommand.h>
+#include <IOKit/firewire/IOFWAddressSpace.h>
+
+class IOFireWireController;
+class IOFireWireBus;
+class IOConfigDirectory;
+class IOFireWireNub;
+class IOFireWireDevice;
+class IOFireWireUnit;
+class IOFWSimplePhysicalAddressSpace;
+class IOFWSimpleContiguousPhysicalAddressSpace;
+
+enum TerminationState
+{
+	kNotTerminated = 0,
+	kNeedsTermination,
+	kTerminated
+};
+
+#pragma mark -
+
+/*! 
+	@class IOFireWireNubAux
+*/
+
+class IOFireWireNubAux : public OSObject
+{
+    OSDeclareDefaultStructors(IOFireWireNubAux)
+
+	friend class IOFireWireNub;
+	
+protected:
+	
+	IOFireWireNub * 		fPrimary;
+	TerminationState		fTerminationState;
+	
+	/*! 
+		@struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+    */  
+	  
+    struct ExpansionData { };
+
+	/*! 
+		@var reserved
+		Reserved for future use.  (Internal use only)  
+	*/
+    
+	ExpansionData * reserved;
+
+    virtual bool init( IOFireWireNub * primary );
+	virtual	void free();
+
+	virtual UInt32 hopCount( IOFireWireNub * nub );
+	virtual UInt32 hopCount( void );
+	
+	virtual TerminationState getTerminationState( void );
+	virtual void setTerminationState( TerminationState state );
+
+	virtual bool isPhysicalAccessEnabled( void );
+
+	virtual IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction );
+		
+    virtual IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction );
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 8);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 9);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 10);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 11);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 12);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 13);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 14);
+    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 15);
+	
+};
+
+#pragma mark -
+
+/*! @class IOFireWireNub
+*/
+class IOFireWireNub : public IOService
+{
+    OSDeclareAbstractStructors(IOFireWireNub)
+
+    friend class IOFireWireController;
+    friend class IOFireWireNubAux;
+	friend class IOFireWireDeviceAux;
+	friend class IOFireWireUnitAux;
+	friend class IOFireWireDevice;
+	friend class IOFireWireUnit;
+   
+/*------------------Useful info about device (also available in the registry)--------*/
+protected:
+    int			fDeviceSpeed;	// Max supported by device
+    int			fCommsSpeed;	// Max speed this node can communicate with device
+    UInt16		fNodeID;	// Current node ID (could change after bus reset!)
+    UInt16		fLocalNodeID;	// ID of the local node (could change after bus reset!)
+    UInt32		fGeneration;	// ID Of bus topology that fNodeID is valid for.
+    CSRNodeUniqueID	fUniqueID;	// Device's globally unique ID (never changes)
+    mach_timespec_t	fAsyncTimeout;	// Guesstimate of how long to wait for response
+					// from device when making async requests
+					// Different values for quad/block transfers?
+					// OS8 FW has 40/100 mSec.
+
+    int			fMaxReadPackLog;
+    int			fMaxWritePackLog;
+    int			fMaxReadROMPackLog;
+
+    IOFireWireController *fControl;        
+    IOConfigDirectory	*fDirectory;
+
+    UInt32		fNodeFlags;
+    
+	OSSet *	 fConfigDirectorySet;
+
+	IOFireWireNubAux * fAuxiliary;
+		
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+    virtual void free();
+
+/*------------------Methods provided to FireWire device clients-----------------------*/
+public:
+
+    // Get nodeID and bus generation info
+    IOReturn getNodeIDGeneration(UInt32 &generation, UInt16 &nodeID, UInt16 &localID) const;
+    IOReturn getNodeIDGeneration(UInt32 &generation, UInt16 &nodeID) const;
+    
+    // How fast can this system talk to the node?
+    virtual IOFWSpeed FWSpeed() const;
+
+    // How fast can this node talk to another node?
+    virtual IOFWSpeed FWSpeed(const IOFireWireNub *dst) const;
+
+    // How big (as a power of two) can packets sent to/received from the node be?
+    virtual int maxPackLog(bool forSend) const;
+
+    // How big (as a power of two) can packets sent to/received from a specified address in the node be?
+    virtual int maxPackLog(bool forSend, FWAddress address) const;
+   
+    // How big (as a power of two) can packets sent from this node to dst node/received from dst be?
+    virtual int maxPackLog(bool forSend, const IOFireWireNub *dst) const;
+
+    // Set maximum packet size nub can handle
+    virtual void setMaxPackLog(bool forSend, bool forROM, int maxPackLog);
+    
+    /*
+     * Create various FireWire commands to send to the device
+     */
+    virtual IOFWReadCommand 	*createReadCommand(FWAddress devAddress, IOMemoryDescriptor *hostMem,
+				FWDeviceCallback completion=NULL, void *refcon=NULL,
+ 				bool failOnReset=false);
+    virtual IOFWReadQuadCommand *createReadQuadCommand(FWAddress devAddress, UInt32 *quads, int numQuads,
+				FWDeviceCallback completion=NULL, void *refcon=NULL,
+ 				bool failOnReset=false);
+
+    virtual IOFWWriteCommand 	*createWriteCommand(FWAddress devAddress, IOMemoryDescriptor *hostMem,
+				FWDeviceCallback completion=NULL, void *refcon=NULL,
+ 				bool failOnReset=false);
+    virtual IOFWWriteQuadCommand *createWriteQuadCommand(FWAddress devAddress, UInt32 *quads, int numQuads,
+				FWDeviceCallback completion=NULL, void *refcon=NULL,
+ 				bool failOnReset=false);
+
+    // size is 1 for 32 bit compare, 2 for 64 bit.
+    virtual IOFWCompareAndSwapCommand 	*createCompareAndSwapCommand(FWAddress devAddress,
+				const UInt32 *cmpVal, const UInt32 *newVal, int size,
+				FWDeviceCallback completion=NULL, void *refcon=NULL,
+ 				bool failOnReset=false);
+    /*
+     * Create local FireWire address spaces for the device to access
+     */
+    virtual IOFWPhysicalAddressSpace *createPhysicalAddressSpace(IOMemoryDescriptor *mem);
+    virtual IOFWPseudoAddressSpace *createPseudoAddressSpace(FWAddress *addr, UInt32 len,
+                    FWReadCallback reader, FWWriteCallback writer, void *refcon);
+
+    /*
+     * Get Config directory for nub
+     * Device nub directory is root directory, Unit nub directory is Unit directory.
+	 *
+	 * Depricated use getConfigDirectoryRef
+     *
+	 */
+    
+	virtual IOReturn getConfigDirectory(IOConfigDirectory *&dir);
+
+    /*
+     * Get bus for nub
+     */
+    IOFireWireBus * getBus() const;
+
+    IOFireWireController * getController() const;
+
+    const CSRNodeUniqueID &getUniqueID() const;
+
+    /*
+     * Standard nub initialization
+     */
+    virtual bool init(OSDictionary * propTable);
+
+    virtual void setNodeFlags( UInt32 flags );
+    virtual UInt32 getNodeFlags( void );
+	virtual void clearNodeFlags( UInt32 flags );
+	
+	virtual IOReturn setConfigDirectory( IOConfigDirectory *directory );
+
+    virtual IOReturn getConfigDirectoryRef( IOConfigDirectory *&dir );
+
+	inline UInt32 hopCount( IOFireWireNub * nub )
+		{ return fAuxiliary->hopCount( nub ); }
+		
+	inline UInt32 hopCount( void )
+		{ return fAuxiliary->hopCount(); }
+
+	inline TerminationState getTerminationState( void )
+		{ return fAuxiliary->getTerminationState(); }
+				
+protected:
+	inline void setTerminationState( TerminationState state )
+		{ fAuxiliary->setTerminationState( state ); }
+
+	virtual IOFireWireNubAux * createAuxiliary( void );
+
+public:
+
+	inline bool isPhysicalAccessEnabled( void )
+		{ return fAuxiliary->isPhysicalAccessEnabled(); }
+
+	inline IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction )
+		{ return fAuxiliary->createSimpleContiguousPhysicalAddressSpace( size, direction ); }
+		
+    inline IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction )
+		{ return fAuxiliary->createSimplePhysicalAddressSpace( size, direction ); }
+    
+private:
+    OSMetaClassDeclareReservedUsed(IOFireWireNub, 0);
+	OSMetaClassDeclareReservedUsed(IOFireWireNub, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireNub, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireNub, 3);
+
+};
+
+#endif /* ! _IOKIT_IOFIREWIRENUB_H */
diff --git a/i386/include/IOKit/firewire/IOFireWirePowerManager.h b/i386/include/IOKit/firewire/IOFireWirePowerManager.h
new file mode 100644
index 0000000..e0a141a
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFireWirePowerManager.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+#ifndef _IOKIT_IOFIREWIREPOWERMANAGER_H
+#define _IOKIT_IOFIREWIREPOWERMANAGER_H
+
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOReturn.h>
+
+class IOFireWireController;
+
+/*! @class IOFireWirePowerManager
+*/
+
+class IOFireWirePowerManager : public OSObject
+{
+    OSDeclareAbstractStructors(IOFireWirePowerManager);
+
+protected:
+    
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+	IOFireWireController *	fControl;
+	
+	UInt32		fMaximumDeciwatts;
+	UInt32		fAllocatedDeciwatts;
+
+public:	
+	static IOFireWirePowerManager * createWithController( IOFireWireController * controller );
+	
+	virtual bool initWithController( IOFireWireController * controller );
+
+	virtual void setMaximumDeciwatts( UInt32 deciwatts );
+	virtual IOReturn allocateDeciwatts( UInt32 deciwatts );
+	virtual void deallocateDeciwatts( UInt32 deciwatts );
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 8);
+    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 9);
+};
+
+#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/firewire/IOFireWireUnit.h b/i386/include/IOKit/firewire/IOFireWireUnit.h
new file mode 100644
index 0000000..6509b94
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOFireWireUnit.h
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *
+ *	IOFireWireUnit.h
+ *
+ *
+ */
+#ifndef _IOKIT_IOFIREWIREUNIT_H
+#define _IOKIT_IOFIREWIREUNIT_H
+
+// public
+#include <IOKit/firewire/IOFireWireNub.h>
+
+class IOFireWireDevice;
+class IOFireWireUnit;
+
+#pragma mark -
+
+/*! 
+	@class IOFireWireUnitAux
+*/
+
+class IOFireWireUnitAux : public IOFireWireNubAux
+{
+    OSDeclareDefaultStructors(IOFireWireUnitAux)
+
+	friend class IOFireWireUnit;
+	
+protected:
+	
+	/*! 
+		@struct ExpansionData
+		@discussion This structure will be used to expand the capablilties of the class in the future.
+    */  
+	  
+    struct ExpansionData { };
+
+	/*! 
+		@var reserved
+		Reserved for future use.  (Internal use only)  
+	*/
+    
+	ExpansionData * reserved;
+
+    virtual bool init( IOFireWireUnit * primary );
+	virtual	void free();
+
+	virtual bool isPhysicalAccessEnabled( void );
+
+	virtual IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction );
+		
+    virtual IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction );
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWireUnitAux, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireUnitAux, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireUnitAux, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireUnitAux, 3);
+	
+};
+
+#pragma mark -
+
+/*! @class IOFireWireUnit
+*/
+class IOFireWireUnit : public IOFireWireNub
+{
+    OSDeclareDefaultStructors(IOFireWireUnit)
+
+	friend class IOFireWireUnitAux;
+	friend class IOFireWireDevice;
+
+protected:
+    IOFireWireDevice *fDevice;	// The device unit is part of
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+/*------------------Methods provided to FireWire device clients-----------------------*/
+public:
+
+    virtual bool init(OSDictionary *propTable, IOConfigDirectory *directory);
+    
+    /*
+     * Standard nub initialization
+     */
+    virtual bool attach(IOService * provider );
+	virtual void free();
+
+    /*
+     * Matching language support
+     * Match on the following properties of the unit:
+     * Vendor_ID
+     * GUID
+     * Unit_Spec_ID
+     * Unit_SW_Version
+     */
+    virtual bool matchPropertyTable(OSDictionary * table);
+
+
+    virtual IOReturn message( UInt32 type, IOService * provider, void * argument );
+
+    // Override handleOpen() and handleClose() to pass on to device
+    virtual bool handleOpen( 	IOService *	  forClient,
+                                IOOptionBits	  options,
+                                void *		  arg );
+
+    virtual void handleClose(   IOService *	  forClient,
+                                IOOptionBits	  options );
+    
+    virtual void setNodeFlags( UInt32 flags );
+	virtual void clearNodeFlags( UInt32 flags );
+    virtual UInt32 getNodeFlags( void );
+
+	virtual IOReturn setConfigDirectory( IOConfigDirectory *directory );
+
+    /*
+     * Create local FireWire address spaces for the device to access
+     */
+    virtual IOFWPhysicalAddressSpace *createPhysicalAddressSpace(IOMemoryDescriptor *mem);
+    virtual IOFWPseudoAddressSpace *createPseudoAddressSpace(FWAddress *addr, UInt32 len,
+                    FWReadCallback reader, FWWriteCallback writer, void *refcon);
+
+protected:
+	
+	virtual IOFireWireNubAux * createAuxiliary( void );
+
+public:
+	void setMaxSpeed( IOFWSpeed speed );
+
+protected:
+	void terminateUnit( void );
+	static void terminateUnitThreadFunc( void * refcon );
+	    
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWireUnit, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireUnit, 1);
+
+};
+
+#endif /* ! _IOKIT_IOFIREWIREDEVICE_H */
diff --git a/i386/include/IOKit/firewire/IOLocalConfigDirectory.h b/i386/include/IOKit/firewire/IOLocalConfigDirectory.h
new file mode 100644
index 0000000..4be26df
--- /dev/null
+++ b/i386/include/IOKit/firewire/IOLocalConfigDirectory.h
@@ -0,0 +1,110 @@
+/*
+* Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+*
+* @APPLE_LICENSE_HEADER_START@
+*
+* The contents of this file constitute Original Code as defined in and
+* are subject to the Apple Public Source License Version 1.1 (the
+* "License").  You may not use this file except in compliance with the
+* License.  Please obtain a copy of the License at
+* http://www.apple.com/publicsource and read it before using this file.
+*
+* This Original Code and all software distributed under the License are
+* distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+* License for the specific language governing rights and limitations
+* under the License.
+*
+* @APPLE_LICENSE_HEADER_END@
+*/
+
+#ifndef __IOLOCALCONFIGDIRECTORY_H__
+#define __IOLOCALCONFIGDIRECTORY_H__
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOReturn.h>
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+#include <IOKit/firewire/IOConfigDirectory.h>
+
+class OSArray;
+class OSData;
+class IOFireWireController;
+class IOFWUserObjectExporter ;
+
+/*! @class IOLocalConfigDirectory
+*/
+class IOLocalConfigDirectory : public IOConfigDirectory
+{
+	friend class IOFireWireController;
+	friend class IOFireWireUserClient ;
+
+	OSDeclareDefaultStructors(IOLocalConfigDirectory);
+
+protected:
+	OSArray *fEntries;	// Entries for this directory.
+	OSData *fROM;	// Local ROM, if compiled.
+	UInt32 fHeader;	// Num entries and CRC.
+	
+/*! @struct ExpansionData
+	@discussion This structure will be used to expand the capablilties of the class in the future.
+	*/    
+	struct ExpansionData { };
+
+/*! @var reserved
+	Reserved for future use.  (Internal use only)  */
+	ExpansionData *reserved;
+
+	virtual bool init();
+	virtual void free();
+
+	virtual const UInt32 *getBase();
+	virtual IOConfigDirectory *getSubDir(int start, int type);
+
+public:
+	static IOLocalConfigDirectory *create();
+
+	/*!
+		@function update
+		makes sure that the ROM has at least the specified capacity,
+		and that the ROM is uptodate from its start to at least the
+		specified quadlet offset.
+		@result kIOReturnSuccess if the specified offset is now
+		accessable at romBase[offset].
+	*/
+	virtual IOReturn update(UInt32 offset, const UInt32 *&romBase);
+
+	virtual IOReturn compile(OSData *rom);
+	
+	// All flavours of addEntry eat a retain of the desc string
+	virtual IOReturn addEntry(int key, UInt32 value, OSString *desc = NULL);
+	virtual IOReturn addEntry(int key, IOLocalConfigDirectory *value,
+							OSString *desc = NULL);
+	virtual IOReturn addEntry(int key, OSData *value, OSString *desc = NULL);
+	virtual IOReturn addEntry(int key, FWAddress value, OSString *desc = NULL);
+	virtual IOReturn removeSubDir(IOLocalConfigDirectory *value);
+	const OSArray *getEntries() const;
+
+	virtual IOReturn getIndexValue(int index, IOConfigDirectory *&value);
+
+protected:
+
+	virtual const UInt32 * lockData( void );
+	virtual void unlockData( void );
+	virtual IOReturn updateROMCache( UInt32 offset, UInt32 length );
+	virtual IOReturn checkROMState( void );
+
+	// call eats a retain count
+	virtual IOReturn addEntry(OSString *desc);
+
+	IOReturn	incrementGeneration( void );
+	static void	exporterCleanup( const OSObject * self, IOFWUserObjectExporter * exporter ) ;
+		
+private:
+	OSMetaClassDeclareReservedUsed(IOLocalConfigDirectory, 0);
+	OSMetaClassDeclareReservedUnused(IOLocalConfigDirectory, 1);
+	OSMetaClassDeclareReservedUnused(IOLocalConfigDirectory, 2);
+};
+
+#endif /* __IOLOCALCONFIGDIRECTORY_H__ */
diff --git a/i386/include/IOKit/firewire/IORemoteConfigDirectory.h b/i386/include/IOKit/firewire/IORemoteConfigDirectory.h
new file mode 100644
index 0000000..7ddbb7c
--- /dev/null
+++ b/i386/include/IOKit/firewire/IORemoteConfigDirectory.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __IOREMOTECONFIGDIRECTORY_H__
+#define __IOREMOTECONFIGDIRECTORY_H__
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOReturn.h>
+
+#include <IOKit/firewire/IOFireWireFamilyCommon.h>
+#include <IOKit/firewire/IOConfigDirectory.h>
+
+#include "IOFireWireROMCache.h"
+
+class OSString;
+class OSIterator;
+class IOFireWireDevice;
+
+/*! @class IORemoteConfigDirectory
+*/
+class IORemoteConfigDirectory : public IOConfigDirectory
+{
+    OSDeclareDefaultStructors(IORemoteConfigDirectory);
+
+protected:
+    IOFireWireROMCache *fROM;				// Our cache of the ROM
+    
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+    virtual bool initWithOwnerOffset(IOFireWireROMCache *rom,
+                             int start, int type);
+    virtual void free();
+
+    virtual const UInt32 *getBase();
+    virtual IOConfigDirectory *getSubDir(int start, int type);
+
+public:
+    static IOConfigDirectory *withOwnerOffset(IOFireWireROMCache *rom,
+                                           int start, int type);
+
+
+    /*!
+        @function update
+        makes sure that the ROM has at least the specified capacity,
+        and that the ROM is uptodate from its start to at least the
+        specified quadlet offset.
+        @result kIOReturnSuccess if the specified offset is now
+        accessable at romBase[offset].
+    */
+    virtual IOReturn update(UInt32 offset, const UInt32 *&romBase);
+
+protected:
+	
+	virtual const UInt32 * lockData( void );
+	virtual void unlockData( void );
+	virtual IOReturn updateROMCache( UInt32 offset, UInt32 length );
+	virtual IOReturn checkROMState( void );
+	
+private:
+    OSMetaClassDeclareReservedUnused(IORemoteConfigDirectory, 0);
+    OSMetaClassDeclareReservedUnused(IORemoteConfigDirectory, 1);
+    OSMetaClassDeclareReservedUnused(IORemoteConfigDirectory, 2);
+};
+
+
+#endif /* __IOREMOTECONFIGDIRECTORY_H__ */
diff --git a/i386/include/IOKit/graphics/IOAccelClientConnect.h b/i386/include/IOKit/graphics/IOAccelClientConnect.h
new file mode 100644
index 0000000..80ff711
--- /dev/null
+++ b/i386/include/IOKit/graphics/IOAccelClientConnect.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOACCEL_CLIENT_CONNECT_H
+#define _IOACCEL_CLIENT_CONNECT_H
+
+
+/*
+** The IOAccelerator service name
+*/
+#define kIOAcceleratorClassName "IOAccelerator"
+
+
+/*
+** IOAccelerator public client types.  Private client types start with
+** kIOAccelNumClientTypes.
+*/
+enum eIOAcceleratorClientTypes {
+        kIOAccelSurfaceClientType,
+        kIOAccelNumClientTypes
+};
+
+
+#endif /* _IOACCEL_CLIENT_CONNECT_H */
+
diff --git a/i386/include/IOKit/graphics/IOAccelSurfaceConnect.h b/i386/include/IOKit/graphics/IOAccelSurfaceConnect.h
new file mode 100644
index 0000000..b597370
--- /dev/null
+++ b/i386/include/IOKit/graphics/IOAccelSurfaceConnect.h
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOACCEL_SURFACE_CONNECT_H
+#define _IOACCEL_SURFACE_CONNECT_H
+
+#include <IOKit/graphics/IOAccelTypes.h>
+#include <IOKit/graphics/IOAccelClientConnect.h>
+
+/*
+** Surface visible region in device coordinates.
+**
+** num_rects:   The number of rectangles in the rect array.  If num_rects
+**              is zero the bounds rectangle is used for the visible rectangle.
+**              If num_rects is zero the surface must be completely contained
+**              by the device.
+**
+** bounds:      The unclipped surface rectangle in device coords.  Extends
+**              beyond the device bounds if the surface is not totally on
+**              the device.
+**
+** rect[]:      An array of visible rectangles in device coords.  If num_rects
+**              is non-zero only the region described by these rectangles is
+**              copied to the frame buffer during a flush operation.
+*/
+typedef struct
+{
+        UInt32        num_rects;
+        IOAccelBounds bounds;
+        IOAccelBounds rect[0];
+} IOAccelDeviceRegion;
+
+
+/*
+** Determine the size of a region.
+*/
+#define IOACCEL_SIZEOF_DEVICE_REGION(_rgn_) (sizeof(IOAccelDeviceRegion) + (_rgn_)->num_rects * sizeof(IOAccelBounds))
+
+
+/*
+** Surface client public memory types.  Private memory types start with
+** kIOAccelNumSurfaceMemoryTypes.
+*/
+enum eIOAccelSurfaceMemoryTypes {
+        kIOAccelNumSurfaceMemoryTypes
+};
+
+
+/*
+** Surface client public methods.  Private methods start with
+** kIOAccelNumSurfaceMethods.
+*/
+enum eIOAccelSurfaceMethods {
+        kIOAccelSurfaceReadLockOptions,
+        kIOAccelSurfaceReadUnlockOptions,
+        kIOAccelSurfaceGetState,
+        kIOAccelSurfaceWriteLockOptions,
+        kIOAccelSurfaceWriteUnlockOptions,
+        kIOAccelSurfaceRead,
+        kIOAccelSurfaceSetShapeBacking,
+
+        kIOAccelSurfaceSetIDMode,
+        kIOAccelSurfaceSetScale,
+
+        kIOAccelSurfaceSetShape,
+        kIOAccelSurfaceFlush,
+
+        kIOAccelSurfaceQueryLock,
+
+        kIOAccelSurfaceReadLock,
+        kIOAccelSurfaceReadUnlock,
+        kIOAccelSurfaceWriteLock,
+        kIOAccelSurfaceWriteUnlock,
+
+        kIOAccelSurfaceControl,
+        kIOAccelSurfaceSetShapeBackingAndLength,
+
+        kIOAccelNumSurfaceMethods
+};
+
+
+/*
+** Option bits for IOAccelCreateSurface and the kIOAccelSurfaceSetIDMode method.
+** The color depth field can take any value of the _CGSDepth enumeration.
+*/
+typedef enum {
+        kIOAccelSurfaceModeColorDepth1555  = 0x00000003,  
+        kIOAccelSurfaceModeColorDepth8888  = 0x00000004,  
+//      kIOAccelSurfaceModeColorDepthRGB565 = 0x00000005,  
+        kIOAccelSurfaceModeColorDepthYUV   = 0x00000006,
+        kIOAccelSurfaceModeColorDepthYUV9  = 0x00000007,
+        kIOAccelSurfaceModeColorDepthYUV12 = 0x00000008,
+        kIOAccelSurfaceModeColorDepthYUV2  = 0x00000009,
+        kIOAccelSurfaceModeColorDepthBGRA32 = 0x0000000A,
+
+//      kIOAccelSurfaceModeColorDepthRGBA64       = 0x0000000B,
+//      kIOAccelSurfaceModeColorDepthRGBAFloat64  = 0x0000000C,
+//      kIOAccelSurfaceModeColorDepthRGBAFloat128 = 0x0000000D,
+        
+//      kIOAccelSurfaceModeColorDepthYUV420  = 0x0000000E,
+        kIOAccelSurfaceModeColorDepth2101010 = 0x0000000F,
+        
+        kIOAccelSurfaceModeColorDepthBits  = 0x0000000F,
+
+        kIOAccelSurfaceModeStereoBit       = 0x00000010,
+        kIOAccelSurfaceModeWindowedBit     = 0x00000020,
+
+        kIOAccelSurfaceModeBeamSync        = 0x00008000
+} eIOAccelSurfaceModeBits;
+
+
+/*
+** Options bits for IOAccelSetSurfaceShape and the kIOAccelSurfaceSetShape method.
+*/
+typedef enum {
+        kIOAccelSurfaceShapeNone             = 0x00000000,
+        kIOAccelSurfaceShapeNonBlockingBit   = 0x00000001,
+        kIOAccelSurfaceShapeNonSimpleBit     = 0x00000002,
+        kIOAccelSurfaceShapeIdentityScaleBit = 0x00000004,
+        kIOAccelSurfaceShapeFrameSyncBit     = 0x00000008,
+        kIOAccelSurfaceShapeBeamSyncBit      = 0x00000010,
+        kIOAccelSurfaceShapeStaleBackingBit  = 0x00000020,
+        kIOAccelSurfaceShapeAssemblyBit      = 0x00000040,
+        kIOAccelSurfaceShapeWaitEnabledBit   = 0x00000080,
+
+        /* wrong name, use kIOAccelSurfaceShapeNonBlockingBit */
+        kIOAccelSurfaceShapeBlockingBit      = kIOAccelSurfaceShapeNonBlockingBit
+} eIOAccelSurfaceShapeBits;
+
+/*
+** Return bits for the kIOAccelSurfaceGetState method.
+*/
+typedef enum {
+        kIOAccelSurfaceStateNone    = 0x00000000,
+        kIOAccelSurfaceStateIdleBit = 0x00000001
+} eIOAccelSurfaceStateBits;
+
+/*
+** Option bits for the kIOAccelSurfaceSetScale method.
+*/
+typedef enum {
+        kIOAccelSurfaceBeamSyncSwaps = 0x00000001,
+        kIOAccelSurfaceFixedSource   = 0x00000002,
+
+        kIOAccelSurfaceFiltering     = 0x000000f0,
+        kIOAccelSurfaceFilterDefault = 0x00000000,
+        kIOAccelSurfaceFilterNone    = 0x00000010,
+        kIOAccelSurfaceFilterLinear  = 0x00000020
+
+} eIOAccelSurfaceScaleBits;
+
+/*
+** Option bits for the kIOAccelSurfaceLock methods.
+*/
+typedef enum {
+    kIOAccelSurfaceLockInBacking  = 0,
+    kIOAccelSurfaceLockInAccel    = 1,
+    kIOAccelSurfaceLockInDontCare = 2,
+    kIOAccelSurfaceLockInMask     = 0x00000003
+} eIOAccelSurfaceLockBits;
+
+#endif /* _IOACCEL_SURFACE_CONNECT_H */
+
diff --git a/i386/include/IOKit/graphics/IOAccelTypes.h b/i386/include/IOKit/graphics/IOAccelTypes.h
new file mode 100644
index 0000000..09084c1
--- /dev/null
+++ b/i386/include/IOKit/graphics/IOAccelTypes.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOACCEL_TYPES_H
+#define _IOACCEL_TYPES_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOKitKeys.h>
+
+#define IOACCEL_TYPES_REV       12
+
+#if !defined(OSTYPES_K64_REV) && !defined(MAC_OS_X_VERSION_10_6)
+#define IOACCELTYPES_10_5       1
+#endif
+
+/* Integer rectangle in device coordinates */
+typedef struct
+{
+    SInt16      x;
+    SInt16      y;
+    SInt16      w;
+    SInt16      h;
+} IOAccelBounds;
+
+typedef struct
+{
+    SInt16      w;
+    SInt16      h;
+} IOAccelSize;
+
+/* Surface information */
+
+enum {
+    kIOAccelVolatileSurface     = 0x00000001,
+    kIOAccelKeycolorSurface     = 0x00000002
+};
+
+typedef struct
+{
+#if IOACCELTYPES_10_5
+    vm_address_t        address[4];
+#else
+    mach_vm_address_t   address[4];
+#endif /* IOACCELTYPES_10_5 */
+    UInt32              rowBytes;
+    UInt32              width;
+    UInt32              height;
+    UInt32              pixelFormat;
+    IOOptionBits        flags;
+    IOFixed             colorTemperature[4];
+    UInt32              typeDependent[4];
+} IOAccelSurfaceInformation;
+
+typedef struct
+{
+#if IOACCELTYPES_10_5
+        long x, y, w, h;
+        void *client_addr;
+        unsigned long client_row_bytes;
+#else
+        SInt32                    x, y, w, h;
+        mach_vm_address_t client_addr;
+        UInt32            client_row_bytes;
+#endif /* IOACCELTYPES_10_5 */
+} IOAccelSurfaceReadData;
+
+typedef struct {
+        IOAccelBounds   buffer;
+        IOAccelSize     source;
+        UInt32          reserved[8];
+} IOAccelSurfaceScaling;
+
+
+typedef SInt32 IOAccelID;
+
+enum {
+    kIOAccelPrivateID           = 0x00000001
+};
+
+
+#endif /* _IOACCEL_TYPES_H */
+
diff --git a/i386/include/IOKit/graphics/IOAccelerator.h b/i386/include/IOKit/graphics/IOAccelerator.h
new file mode 100644
index 0000000..1c2119c
--- /dev/null
+++ b/i386/include/IOKit/graphics/IOAccelerator.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IO_ACCELERATOR_H
+#define _IO_ACCELERATOR_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/graphics/IOAccelTypes.h>
+
+class IOAccelerator : public IOService
+{
+    OSDeclareDefaultStructors(IOAccelerator)
+
+public:
+    static IOReturn createAccelID(IOOptionBits options, IOAccelID * identifier);
+    static IOReturn retainAccelID(IOOptionBits options, IOAccelID identifier);
+    static IOReturn releaseAccelID(IOOptionBits options, IOAccelID identifier);
+
+};
+
+
+#endif /* _IO_ACCELERATOR_H */
+
diff --git a/i386/include/IOKit/graphics/IODisplay.h b/i386/include/IOKit/graphics/IODisplay.h
new file mode 100644
index 0000000..adcfc49
--- /dev/null
+++ b/i386/include/IOKit/graphics/IODisplay.h
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IODISPLAY_H
+#define _IOKIT_IODISPLAY_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/graphics/IOFramebuffer.h>
+
+extern const OSSymbol * gIODisplayParametersKey;
+extern const OSSymbol * gIODisplayGUIDKey;
+
+extern const OSSymbol * gIODisplayValueKey;
+extern const OSSymbol * gIODisplayMinValueKey;
+extern const OSSymbol * gIODisplayMaxValueKey;
+
+extern const OSSymbol * gIODisplayContrastKey;
+extern const OSSymbol * gIODisplayBrightnessKey;
+extern const OSSymbol * gIODisplayHorizontalPositionKey;
+extern const OSSymbol * gIODisplayHorizontalSizeKey;
+extern const OSSymbol * gIODisplayVerticalPositionKey;
+extern const OSSymbol * gIODisplayVerticalSizeKey;
+extern const OSSymbol * gIODisplayTrapezoidKey;
+extern const OSSymbol * gIODisplayPincushionKey;
+extern const OSSymbol * gIODisplayParallelogramKey;
+extern const OSSymbol * gIODisplayRotationKey;
+extern const OSSymbol * gIODisplayOverscanKey;
+extern const OSSymbol * gIODisplayVideoBestKey;
+
+extern const OSSymbol * gIODisplayParametersTheatreModeKey;
+extern const OSSymbol * gIODisplayParametersTheatreModeWindowKey;
+
+extern const OSSymbol * gIODisplayMCCSVersionKey;
+extern const OSSymbol * gIODisplayTechnologyTypeKey;
+extern const OSSymbol * gIODisplayUsageTimeKey;
+extern const OSSymbol * gIODisplayFirmwareLevelKey;
+
+extern const OSSymbol * gIODisplaySpeakerVolumeKey;
+extern const OSSymbol * gIODisplaySpeakerSelectKey;
+extern const OSSymbol * gIODisplayMicrophoneVolumeKey;
+extern const OSSymbol * gIODisplayAmbientLightSensorKey;
+extern const OSSymbol * gIODisplayAudioMuteAndScreenBlankKey;
+extern const OSSymbol * gIODisplayAudioTrebleKey;
+extern const OSSymbol * gIODisplayAudioBassKey;
+extern const OSSymbol * gIODisplayAudioBalanceLRKey;
+extern const OSSymbol * gIODisplayAudioProcessorModeKey;
+extern const OSSymbol * gIODisplayPowerModeKey;
+extern const OSSymbol * gIODisplayManufacturerSpecificKey;
+
+extern const OSSymbol * gIODisplayParametersCommitKey;
+extern const OSSymbol * gIODisplayParametersDefaultKey;
+extern const OSSymbol * gIODisplayParametersFlushKey;
+
+enum {
+    kIODisplayNumPowerStates = 4,
+    kIODisplayMaxPowerState  = kIODisplayNumPowerStates - 1
+};
+
+// these are the private instance variables for power management
+struct DisplayPMVars
+{
+    UInt32              currentState;
+    // highest state number normally, lowest usable state in emergency
+    unsigned long       maxState;
+    // true if the display has had power lowered due to user inactivity
+    bool                displayIdle;
+};
+
+class IODisplayConnect : public IOService
+{
+    OSDeclareDefaultStructors(IODisplayConnect)
+
+private:
+    IOIndex     connection;
+
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of this class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData * reserved;
+
+public:
+    virtual bool initWithConnection( IOIndex connection );
+    virtual IOFramebuffer * getFramebuffer( void );
+    virtual IOIndex getConnection( void );
+    virtual IOReturn getAttributeForConnection( IOSelect selector, uintptr_t * value );
+    virtual IOReturn setAttributeForConnection( IOSelect selector, uintptr_t value );
+    virtual void joinPMtree ( IOService * driver );
+};
+
+class IODisplay : public IOService
+{
+    OSDeclareAbstractStructors(IODisplay)
+
+public:
+    static void initialize( void );
+
+protected:
+    // used to query the framebuffer controller
+    IODisplayConnect *                  fConnection;
+    class IODisplayParameterHandler *   fParameterHandler;
+    void *                      __resv;
+    IONotifier *                        fNotifier;
+
+    // pointer to protected instance variables for power management
+    struct DisplayPMVars *              fDisplayPMVars;
+
+    // reserved for future expansion
+    void *                              _IODisplay_reserved[32];
+
+public:
+    virtual IOService * probe(  IOService *     provider,
+                                SInt32 *        score );
+
+    virtual bool start( IOService * provider );
+    virtual void stop( IOService * provider );
+    virtual void free();
+
+    virtual IODisplayConnect * getConnection( void );
+
+    virtual IOReturn getConnectFlagsForDisplayMode(
+                IODisplayModeID mode, UInt32 * flags );
+
+    virtual IOReturn getGammaTableByIndex(
+        UInt32 * channelCount, UInt32 * dataCount,
+        UInt32 * dataWidth, void ** data );
+
+    virtual IOReturn readFramebufferEDID( void );
+
+    // 
+    virtual IOReturn framebufferEvent( IOFramebuffer * framebuffer, 
+                                        IOIndex event, void * info );
+
+    // parameter setting
+    virtual IOReturn setProperties( OSObject * properties );
+    virtual bool setForKey( OSDictionary * params, const OSSymbol * key,
+                            SInt32 value, SInt32 min, SInt32 max );
+
+    static bool addParameter( OSDictionary * params, const OSSymbol * paramName, SInt32 min, SInt32 max );
+    static bool setParameter( OSDictionary * params, const OSSymbol * paramName, SInt32 value );
+    static OSDictionary * getIntegerRange( OSDictionary * params, const OSSymbol * sym,
+                                      SInt32 * value, SInt32 * min, SInt32 * max );
+
+    // low level set/get
+    virtual bool doIntegerSet( OSDictionary * params,
+                               const OSSymbol * paramName, UInt32 value );
+    virtual bool doDataSet( const OSSymbol * paramName, OSData * value );
+    virtual bool doUpdate( void );
+
+    // power management methods
+    virtual IOReturn setPowerState( unsigned long, IOService * );
+    virtual unsigned long maxCapabilityForDomainState( IOPMPowerFlags );
+    virtual unsigned long initialPowerStateForDomainState( IOPMPowerFlags );
+    virtual unsigned long powerStateForDomainState( IOPMPowerFlags );
+
+    // 
+    virtual void initPowerManagement( IOService * provider);
+    virtual void dropOneLevel( void );
+    virtual void makeDisplayUsable( void );
+
+private:
+    OSMetaClassDeclareReservedUnused(IODisplay, 0);
+    OSMetaClassDeclareReservedUnused(IODisplay, 1);
+    OSMetaClassDeclareReservedUnused(IODisplay, 2);
+    OSMetaClassDeclareReservedUnused(IODisplay, 3);
+    OSMetaClassDeclareReservedUnused(IODisplay, 4);
+    OSMetaClassDeclareReservedUnused(IODisplay, 5);
+    OSMetaClassDeclareReservedUnused(IODisplay, 6);
+    OSMetaClassDeclareReservedUnused(IODisplay, 7);
+    OSMetaClassDeclareReservedUnused(IODisplay, 8);
+    OSMetaClassDeclareReservedUnused(IODisplay, 9);
+    OSMetaClassDeclareReservedUnused(IODisplay, 10);
+    OSMetaClassDeclareReservedUnused(IODisplay, 11);
+    OSMetaClassDeclareReservedUnused(IODisplay, 12);
+    OSMetaClassDeclareReservedUnused(IODisplay, 13);
+    OSMetaClassDeclareReservedUnused(IODisplay, 14);
+    OSMetaClassDeclareReservedUnused(IODisplay, 15);
+    OSMetaClassDeclareReservedUnused(IODisplay, 16);
+    OSMetaClassDeclareReservedUnused(IODisplay, 17);
+    OSMetaClassDeclareReservedUnused(IODisplay, 18);
+    OSMetaClassDeclareReservedUnused(IODisplay, 19);
+
+private:
+    static IOReturn _framebufferEvent( OSObject * self, void * ref,
+                    IOFramebuffer *framebuffer, IOIndex event, void * info );
+
+    bool addParameterHandler( IODisplayParameterHandler * parameterHandler );
+    bool removeParameterHandler( IODisplayParameterHandler * parameterHandler );
+    static bool updateNumber( OSDictionary * params, const OSSymbol * key, SInt32 value );
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+class IOBacklightDisplay : public IODisplay
+{
+    OSDeclareDefaultStructors(IOBacklightDisplay)
+
+protected:
+    // User preferred brightness level
+    SInt32      fCurrentUserBrightness;
+    SInt32      fCurrentBrightness;
+    UInt32      fCurrentPowerState;
+    SInt32      fMinBrightness;
+    SInt32      fMaxBrightness;
+    UInt16      fMaxBrightnessLevel[kIODisplayNumPowerStates];
+
+public:
+    virtual IOService * probe( IOService *, SInt32 * );
+    virtual void stop( IOService * provider );
+    virtual IOReturn setPowerState( unsigned long, IOService * );
+    virtual unsigned long maxCapabilityForDomainState( IOPMPowerFlags );
+    virtual unsigned long initialPowerStateForDomainState( IOPMPowerFlags );
+    virtual unsigned long powerStateForDomainState( IOPMPowerFlags );
+
+    // 
+    virtual void initPowerManagement( IOService * );
+
+public:
+    virtual bool doIntegerSet( OSDictionary * params,
+                               const OSSymbol * paramName, UInt32 value );
+    virtual bool doUpdate( void );
+    virtual void makeDisplayUsable( void );
+    virtual bool setBrightness( SInt32 value );
+
+private:
+    void handlePMSettingCallback(const OSSymbol *, OSObject *, uintptr_t);
+
+    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 0);
+    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 1);
+    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 2);
+    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 3);
+    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 4);
+    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 5);
+    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 6);
+    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 7);
+    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 8);
+    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 9);
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+class IODisplayParameterHandler : public IOService
+{
+    OSDeclareDefaultStructors(IODisplayParameterHandler)
+
+public:
+    virtual bool setDisplay( IODisplay * display ) = 0;
+    virtual bool doIntegerSet( OSDictionary * params,
+                               const OSSymbol * paramName, UInt32 value ) = 0;
+    virtual bool doDataSet( const OSSymbol * paramName, OSData * value ) = 0;
+    virtual bool doUpdate( void ) = 0;
+
+private:
+    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 0);
+    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 1);
+    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 2);
+    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 3);
+    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 4);
+    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 5);
+    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 6);
+    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 7);
+    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 8);
+    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 9);
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#endif /* ! _IOKIT_IODISPLAY_H */
+
diff --git a/i386/include/IOKit/graphics/IOFramebuffer.h b/i386/include/IOKit/graphics/IOFramebuffer.h
new file mode 100644
index 0000000..16a5ffd
--- /dev/null
+++ b/i386/include/IOKit/graphics/IOFramebuffer.h
@@ -0,0 +1,827 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOFRAMEBUFFER_H
+#define _IOKIT_IOFRAMEBUFFER_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOInterruptEventSource.h>
+#include <IOKit/graphics/IOGraphicsDevice.h>
+#include <IOKit/graphics/IOFramebufferShared.h>
+#include <IOKit/IOLib.h>
+
+class IOFramebuffer;
+class IOBufferMemoryDescriptor;
+
+typedef void (*CursorBlitProc)(
+                    IOFramebuffer * inst,
+                    void * shmem,
+                    volatile unsigned char *vramPtr,
+                    unsigned int cursStart,
+                    unsigned int vramRow,
+                    unsigned int cursRow,
+                    int width,
+                    int height );
+
+typedef void (*CursorRemoveProc)(
+                    IOFramebuffer * inst,
+                    void * shmem,
+                    volatile unsigned char *vramPtr,
+                    unsigned int vramRow,
+                    int width,
+                    int height );
+
+
+typedef void * IOFBCursorRef;
+
+struct IOFBCursorControlCallouts {
+    IOReturn    (*setCursorImage) (void * self, void * ref,
+                                    IOHardwareCursorDescriptor * description, IOFBCursorRef cursorImage);
+    IOReturn    (*setCursorState) (void * self, void * ref,
+                                    SInt32 x, SInt32 y, bool visible);
+    UInt32      reserved[30];
+};
+typedef struct IOFBCursorControlCallouts IOFBCursorControlCallouts;
+
+struct IOFBCursorControlAttribute {
+    void *                              self;
+    void *                              ref;
+    const IOFBCursorControlCallouts *   callouts;
+    UInt32                              reserved[29];
+};
+typedef struct IOFBCursorControlAttribute IOFBCursorControlAttribute;
+
+// clock & data values
+enum {
+    kIODDCLow                           = 0,
+    kIODDCHigh                          = 1,
+    kIODDCTristate                      = 2
+};
+// ddcBlockType constants
+enum {
+    // EDID block type.
+    kIODDCBlockTypeEDID                 = 0
+};
+
+// ddcFlags constants
+enum {
+    // Force a new read of the EDID.
+    kIODDCForceRead                     = 0x00000001
+};
+
+enum {
+    kDisabledInterruptState             = 0,
+    kEnabledInterruptState              = 1
+};
+
+typedef void (*IOFBInterruptProc)( OSObject * target, void * ref );
+
+
+typedef IOReturn (*IOFramebufferNotificationHandler)
+        (OSObject * self, void * ref,
+        IOFramebuffer * framebuffer, IOIndex event,
+        void * info);
+
+// IOFramebufferNotificationHandler events
+enum {
+    kIOFBNotifyDisplayModeWillChange    = 1,
+    kIOFBNotifyDisplayModeDidChange     = 2,
+
+    kIOFBNotifyWillSleep        = 3,
+    kIOFBNotifyDidWake          = 4,
+
+    kIOFBNotifyDidPowerOff      = 5,
+    kIOFBNotifyWillPowerOn      = 6,
+
+    kIOFBNotifyDidSleep         = kIOFBNotifyDidPowerOff,
+    kIOFBNotifyWillWake         = kIOFBNotifyWillPowerOn,
+
+    kIOFBNotifyWillPowerOff     = 7,
+    kIOFBNotifyDidPowerOn       = 8,
+
+    kIOFBNotifyWillChangeSpeed  = 9,
+    kIOFBNotifyDidChangeSpeed   = 10,
+
+    kIOFBNotifyClamshellChange  = 20,
+
+    kIOFBNotifyCaptureChange    = 30,
+
+    kIOFBNotifyOnlineChange     = 40,
+
+    kIOFBNotifyDisplayDimsChange = 50,
+
+    kIOFBNotifyProbed           = 60,
+};
+
+enum {
+    kFBDisplayUsablePowerState          = 0x80000000,
+    kFBDisplayPowerStateMask            = 0x0000ffff
+};
+
+#define kIOFBDependentIDKey     "IOFBDependentID"
+#define kIOFBDependentIndexKey  "IOFBDependentIndex"
+
+struct StdFBShmem_t;
+class IOFramebufferUserClient;
+
+/*! @class IOFramebuffer : public IOGraphicsDevice
+    @abstract The base class for graphics devices to be made available as part of the desktop.
+    @discussion The IOFramebuffer base class defines APIs used to publish a linear framebuffer device. Device driver writers should subclass this class to provide a X native driver. Mac OS X will also utilize 'ndrv' drivers via a subclass of IOFramebuffer IONDRVFramebuffer that does not require device driver writers to provide a X native driver.
+    
+    There are no in kernel clients of IOFramebuffer aside from rudimentary console and panic UI supported by the IOFramebuffer class. The IOFramebuffer class provides the IOUserClient implementation to allow the CoreGraphics server to provide the user accessible interface to all displays on a Mac OS X system, and this is further layered underneath application frameworks. Device driver writers should not need any knowledge of this part of the interfaces. Similarly the instance variables of IOFramebuffer are mostly used for cursor rendering which is handled by the IOFramebuffer class, and should be avoided by subclass implementors. Only IOFramebuffer methods with header documentation in this header are designed for subclasses to implement.
+
+    IOFramebuffer provides simple dumb framebuffer operation - accceleration for 2D, 3D and video may be provided by a separate implementation of the IOAccelerator class.
+*/
+
+class IOFramebuffer : public IOGraphicsDevice
+{
+    friend class IOFramebufferUserClient;
+    friend class IOFramebufferSharedUserClient;
+    friend class IODisplay;
+
+    OSDeclareDefaultStructors(IOFramebuffer)
+
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of this class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData * reserved;
+
+private:
+
+protected:
+    StdFBShmem_t *                      priv;
+    int                                 shmemClientVersion;
+    IOBufferMemoryDescriptor *          sharedCursor;
+
+    union {
+        struct {
+            /* Mapping tables used in cursor drawing to 5-5-5 displays. */
+            unsigned char *     _bm34To35SampleTable;
+            unsigned char *     _bm35To34SampleTable;
+            /* Mapping tables used in cursor drawing to 8-bit RGB displays. */
+            unsigned int *      _bm256To38SampleTable;
+            unsigned char *     _bm38To256SampleTable;
+        }                               t;
+        UInt8 *                         tables[ 4 ];
+    }                                   colorConvert;
+    
+    /* cursor blitting vars */
+    CursorBlitProc                      cursorBlitProc;
+    CursorRemoveProc                    cursorRemoveProc;
+
+    IOGSize                             maxCursorSize;
+    void *                              _IOFramebuffer_reservedE[7];
+    const char *                        thisName;
+    volatile unsigned char *            cursorSave;
+    unsigned int                        white;
+
+    IOGPoint                            nextCursorLoc;
+    int                                 nextCursorFrame;
+    SInt32                              connectChange;
+    semaphore_t                         vblSemaphore;
+
+    /* memory ranges */
+    volatile unsigned char *            frameBuffer;
+    unsigned int                        totalWidth;
+    unsigned int                        rowBytes;
+    unsigned int                        bytesPerPixel;
+
+    IOMemoryMap *                       vramMap;
+    IOByteCount                         vramMapOffset;
+    OSArray *                           userAccessRanges;
+    unsigned int                        suspended:1;
+    unsigned int                        captured:1;
+    unsigned int                        sleepConnectCheck:1;
+    unsigned int                        messaged:1;
+    unsigned int                        _IOFramebuffer_reservedC:28;
+    IOFramebuffer *                     nextDependent;
+    OSSet *                             fbNotifications;
+
+    class IOFramebufferUserClient *       serverConnect;
+    class IOFramebufferSharedUserClient * sharedConnect;
+
+    unsigned int                        opened:1;
+    unsigned int                        dead:1;
+    unsigned int                        configPending:1;
+    unsigned int                        serverNotified:1;
+    unsigned int                        serverState:1;
+    unsigned int                        serverPendingAck:1;
+    unsigned int                        isUsable:1;
+    unsigned int                        mirrored:1;
+    unsigned int                        pendingPowerState:4;
+    unsigned int                        pendingPowerChange:1;
+    unsigned int                        pagingState:1;
+    unsigned int                        mirrorPrimary:1;
+    unsigned int                        mirrorSWCursor:1;
+
+    bool                                clutValid;
+    bool                                currentMono;
+    bool                                needCursorService;
+    bool                                haveVBLService;
+    bool                                haveHWCursor;
+    bool                                hwCursorLoaded;
+
+    void *                              serverMsg;
+    IOInterruptEventSource *            deferredEvents;
+
+    /* Reserved for future expansion. */
+    int                                 _IOFramebuffer_reserved[5];
+
+private:
+    struct IOFramebufferPrivate *       __private;
+
+public:
+/*! @function doI2CRequest
+    @abstract Carry out an I2C request.
+    @discussion IOFramebuffer subclasses may optionally implement this method to perform I2C bus requests on one of the buses they support. Alternatively they may implement the setDDCClock(), setDDCData(), readDDCClock(), readDDCData() methods and respond from getAttributeForConnection() to the kConnectionSupportsLLDDCSense attribute with success, in which case IOFramebuffer::doI2CRequest() will carry out a software implementation of I2C using the low level routines and conforming to the timing constraints passed in the timing parameter. Subclasses may pass timing parameters tuned for the specific bus, otherwise VESA DDC defaults will apply.
+    @timing event Subclasses may pass timing parameters tuned for the specific bus, otherwise if NULL, VESA DDC defaults will apply.
+    @param request An IOI2CRequest structure. The request should be carried out synchronously if the completion routine is NULL, otherwise it may optionally be carried out asynchronously. The completion routine should be called if supplied.
+    @result an IOReturn code. If kIOReturnSuccces, the result of the transaction is returned in the requests result field.
+*/
+    virtual IOReturn doI2CRequest( UInt32 bus, struct IOI2CBusTiming * timing, struct IOI2CRequest * request );
+
+private:
+    OSMetaClassDeclareReservedUsed(IOFramebuffer, 0);
+
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 1);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 2);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 3);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 4);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 5);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 6);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 7);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 8);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 9);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 10);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 11);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 12);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 13);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 14);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 15);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 16);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 17);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 18);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 19);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 20);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 21);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 22);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 23);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 24);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 25);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 26);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 27);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 28);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 29);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 30);
+    OSMetaClassDeclareReservedUnused(IOFramebuffer, 31);
+
+
+public:
+    static void initialize();
+
+    virtual bool requestTerminate( IOService * provider, IOOptionBits options );
+    virtual IOService * probe( IOService * provider, SInt32 * score );
+    virtual bool start( IOService * provider );
+    virtual void stop( IOService * provider );
+    virtual void free();
+    virtual IOWorkLoop * getWorkLoop() const;
+
+    IOWorkLoop * getGraphicsSystemWorkLoop() const;
+    IOWorkLoop * getControllerWorkLoop() const;
+
+    virtual IOReturn requestProbe( IOOptionBits options );
+
+    virtual IOReturn powerStateWillChangeTo ( IOPMPowerFlags, unsigned long, IOService* );
+    virtual IOReturn powerStateDidChangeTo ( IOPMPowerFlags, unsigned long, IOService* );
+    virtual IOReturn setPowerState( unsigned long powerStateOrdinal, IOService * device);
+    virtual IOReturn setAggressiveness( unsigned long type, unsigned long newLevel );
+    virtual IOReturn getAggressiveness( unsigned long type, unsigned long * currentLevel );
+    virtual IOReturn newUserClient( task_t              owningTask,
+                                    void *              security_id,
+                                    UInt32              type,
+                                    IOUserClient **     handler );
+    virtual IOReturn callPlatformFunction( const OSSymbol * functionName,
+                                    bool waitForFunction,
+                                    void *p1, void *p2,
+                                    void *p3, void *p4 );
+
+    virtual void hideCursor( void );
+    virtual void showCursor( IOGPoint * cursorLoc, int frame );
+    virtual void moveCursor( IOGPoint * cursorLoc, int frame );
+    // virtual
+    void resetCursor( void );
+
+    virtual void getVBLTime( AbsoluteTime * time, AbsoluteTime * delta );
+
+    virtual void getBoundingRect ( IOGBounds ** bounds );
+
+    virtual IOReturn open( void );
+    
+    virtual void close( void );
+
+    virtual bool isConsoleDevice( void );
+
+    virtual IOReturn setupForCurrentConfig( void );
+
+    virtual bool serializeInfo( OSSerialize * s );
+    virtual bool setNumber( OSDictionary * dict, const char * key,
+                                UInt32 number );
+
+    IONotifier * addFramebufferNotification(
+            IOFramebufferNotificationHandler handler,
+            OSObject * self, void * ref);
+
+/*! @function getApertureRange
+    @abstract Return reference to IODeviceMemory object representing memory range of framebuffer.
+    @discussion IOFramebuffer subclasses must implement this method to describe the memory used by the framebuffer in the current mode. The OS will map this memory range into user space for client access - the range should only include vram memory not hardware registers.
+    @param aperture The system will only access the aperture kIOFBSystemAperture.
+    @result an IODeviceMemory instance. A reference will be consumed by the caller for each call of this method - the implementatation should create a new instance of IODeviceMemory for each call, or return one instance with a retain for each call.
+*/
+
+    virtual IODeviceMemory * getApertureRange( IOPixelAperture aperture ) = 0;
+
+/*! @function getVRAMRange
+    @abstract Return reference to IODeviceMemory object representing memory range of all the cards vram.
+    @discussion IOFramebuffer subclasses should implement this method to describe all the vram memory available on the card. The OS will map this memory range into user space for client access - the range should only include vram memory not hardware registers.
+    @result an IODeviceMemory instance. A reference will be consumed by the caller for each call of this method - the implementatation should create a new instance of IODeviceMemory for each call, or return one instance with a retain for each call.
+*/
+
+    virtual IODeviceMemory * getVRAMRange( void );
+
+protected:
+
+/*! @function handleEvent
+    @abstract Notify IOFramebuffer superclass code of events.
+    @discussion IOFramebuffer subclasses should call this IOFramebuffer method on certain power state changes.
+    @param event The event that has occurred:<br>
+    kIOFBNotifyWillPowerOff call before entering a state other than the maximum.<br>
+    kIOFBNotifyDidPowerOn call after entering the maximum power state.<br>
+    kIOFBNotifyWillPowerOff call before entering a state other than the maximum.<br>
+    kIOFBNotifyDidPowerOn call after entering a state other than the maximum.<br>
+    @param info None of the above events require additional info, pass zero.
+    @result an IOReturn code, safely ignored.
+*/
+
+    IOReturn handleEvent( IOIndex event, void * info = 0 );
+
+
+    IOReturn deliverFramebufferNotification(
+                    IOIndex event, void * info = 0 );
+
+#ifdef IOFRAMEBUFFER_PRIVATE
+#include <IOKit/graphics/IOFramebufferPrivate.h>
+#endif
+
+public:
+/*! @function enableController
+    @abstract Perform first time setup of the framebuffer.
+    @discussion IOFramebuffer subclasses should perform their initialization of the hardware here. The IOService start() method is not called at a time appropriate for this initialization.
+    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
+*/
+
+    virtual IOReturn enableController( void );
+
+/*! @function getPixelFormats
+    @abstract List the pixel formats the framebuffer supports.
+    @discussion IOFramebuffer subclasses must implement this method to return an array of strings representing the possible pixel formats available in the framebuffer.
+    @result A const char * pointer. The string consists of a concatenation of each pixel format string separated by the NULL character. The commonly supported pixel formats for Mac OS X are defined as IO8BitIndexedPixels, IO16BitDirectPixels, IO32BitDirectPixels.
+*/
+
+    virtual const char * getPixelFormats( void ) = 0;
+
+/*! @function getDisplayModeCount
+    @abstract Return the number of display modes the framebuffer supports.
+    @discussion IOFramebuffer subclasses must implement this method to return a count of the display modes available. This count should change unless a connection change is posted for the device indicated the framebuffer and/or display configuration has changed.
+    @result A count of the display modes available.
+*/
+
+    virtual IOItemCount getDisplayModeCount( void ) = 0;
+
+/*! @function getDisplayModes
+    @abstract Return the number of display modes the framebuffer supports.
+    @discussion IOFramebuffer subclasses must implement this method to return an array of display mode IDs available for the framebuffer. The IDs are defined by the driver in the range 0x00000001 - 0x7fffffff, and should be constant for a given display mode. 
+    @param allDisplayModes A caller allocated buffer with the size given by the result of getDisplayModeCount().
+    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
+*/
+ 
+    virtual IOReturn getDisplayModes( IODisplayModeID * allDisplayModes ) = 0;
+
+/*! @function getInformationForDisplayMode
+    @abstract Return information about a given display mode.
+    @discussion IOFramebuffer subclasses must implement this method to return information in the IODisplayModeInformation structure for the display mode with the passed ID. 
+    @param displayMode A display mode ID previously returned by getDisplayModes().
+    @param info Pointer to a structure of type IODisplayModeInformation to be filled out by the driver. IODisplayModeInformation is documented in IOGraphicsTypes.h.
+    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
+*/
+
+    virtual IOReturn getInformationForDisplayMode( IODisplayModeID displayMode,
+                    IODisplayModeInformation * info ) = 0;
+
+/*! @function getPixelFormatsForDisplayMode
+    @abstract Obsolete.
+    @discussion IOFramebuffer subclasses must implement this method to return zero. 
+    @param displayMode Ignored.
+    @param depth Ignored.
+    @result Return zero.
+*/
+
+    virtual UInt64  getPixelFormatsForDisplayMode( IODisplayModeID displayMode,
+                    IOIndex depth ) = 0;
+
+/*! @function getPixelInformation
+    @abstract Return information about the framebuffer format for a given display mode and depth.
+    @discussion IOFramebuffer subclasses must implement this method to return information in the IOPixelInformation structure for the display mode with the passed ID, depth index and aperture. The aperture utilized by the system is always kIOFBSystemAperture. Drivers may define alternative apertures, being a view of the framebuffer in a different pixel format from the default.
+    @param displayMode A display mode ID previously returned by getDisplayModes().
+    @param depth An index from zero to the value of the maxDepthIndex field from the IODisplayModeInformation structure (inclusive).
+    @param info Pointer to a structure of type IOPixelInformation to be filled out by the driver. IOPixelInformation is documented in IOGraphicsTypes.h.
+    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
+*/
+
+    virtual IOReturn getPixelInformation(
+        IODisplayModeID displayMode, IOIndex depth,
+        IOPixelAperture aperture, IOPixelInformation * pixelInfo ) = 0;
+
+/*! @function getCurrentDisplayMode
+    @abstract Return the framebuffers current display mode and depth.
+    @discussion IOFramebuffer subclasses must implement this method to return the current mode and depth.
+    @param displayMode A display mode ID representing the current mode.
+    @param depth An index indicating the depth configuration of the framebuffer. The index should range from zero to the value of the maxDepthIndex field from the IODisplayModeInformation structure for the display mode.
+    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
+*/
+
+    virtual IOReturn getCurrentDisplayMode( IODisplayModeID * displayMode,
+                            IOIndex * depth ) = 0;
+
+/*! @function setCurrentDisplayMode
+    @abstract Set the framebuffers current display mode and depth.
+    @discussion IOFramebuffer subclasses should implement this method to set the current mode and depth. Other than at enableController() time, this is the only method that should change the framebuffer format and is synchronized with clients and attached accelerators to make sure access to the device is disallowed during the change.
+    @param displayMode A display mode ID representing the new mode.
+    @param depth An index indicating the new depth configuration of the framebuffer. The index should range from zero to the value of the maxDepthIndex field from the IODisplayModeInformation structure for the display mode.
+    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
+*/
+
+    virtual IOReturn setDisplayMode( IODisplayModeID displayMode,
+                            IOIndex depth );
+
+/*! @function setApertureEnable
+    @abstract Enable an aperture on the framebuffer (usually unimplemented, no OS usage).
+    @discussion IOFramebuffer subclasses may implement this method to set enable a non standard aperture. The system does not call this method.
+    @param aperture A device specific aperture index.
+    @param enable Device specific mask of options.
+    @result an IOReturn code.
+*/
+
+    virtual IOReturn setApertureEnable( IOPixelAperture aperture,
+                    IOOptionBits enable );
+
+/*! @function setStartupDisplayMode
+    @abstract Set the framebuffers display mode and depth to be used during boot and at startup.
+    @discussion IOFramebuffer subclasses should implement this method to set the mode and depth to be used during boot and at startup, to reduce needed mode changes during boot when the display connection type is the same. If possible this mode should also be used by the OpenFirmware driver for the card.
+    @param displayMode A display mode ID representing the new startup mode.
+    @param depth An index indicating the new startup depth configuration of the framebuffer. The index should range from zero to the value of the maxDepthIndex field from the IODisplayModeInformation structure for the display mode.
+    @result an IOReturn code.
+*/
+
+    virtual IOReturn setStartupDisplayMode( IODisplayModeID displayMode,
+                            IOIndex depth );
+
+/*! @function getCurrentDisplayMode
+    @abstract Return the framebuffers display mode and depth to be used during boot and at startup.
+    @discussion IOFramebuffer subclasses should implement this method to return the current mode and depth.
+    @param displayMode A display mode ID representing the mode used during startup.
+    @param depth An index indicating the depth configuration of the framebuffer used during startup. The index should range from zero to the value of the maxDepthIndex field from the IODisplayModeInformation structure for the display mode.
+    @result an IOReturn code.
+*/
+
+    virtual IOReturn getStartupDisplayMode( IODisplayModeID * displayMode,
+                            IOIndex * depth );
+
+/*! @function setCLUTWithEntries
+    @abstract Set the color lookup table to be used by the framebuffer in indexed modes.
+    @discussion IOFramebuffer subclasses may implement this method to allow a palette to be set for indexed display modes. It will not be called on framebuffers in direct display modes.
+    @param colors A pointer to an array of numEntries RGB color entries.
+    @param index The index of the first entry to set.
+    @param numEntries The number of entries in the table.
+    @param options Options controlling the operation. <br>
+    kSetCLUTByValue is set if the index field of each entry should be used to set the table sparsely, otherwise consecutive entries from the index parameter should be set.<br>
+    kSetCLUTImmediately is set if the CLUT set should not be synchronized with the vertical blank, otherwise it should.<br>
+    kSetCLUTWithLuminance is set if the CLUT should be set to a gray value equivalent in luminance to the passed color entry.<br>
+    @result an IOReturn code.
+*/
+
+    virtual IOReturn setCLUTWithEntries( IOColorEntry * colors, UInt32 index,
+                UInt32 numEntries, IOOptionBits options );
+
+/*! @function setGammaTable
+    @abstract Set the gamma table to be used by the framebuffer.
+    @discussion IOFramebuffer subclasses should implement this method to allow a gamma table to be set. 
+    @param channelCount Defines the number of channels in the supplied data. OS X will pass three for separate R, G, B data, or one if the same data should apply to all channels.
+    @param dataCount The number of data entries per channel.
+    @param dataWidth The number of bits in each entry. 8 for Mac OS X 10.1 and earlier, 16 for later releases.
+    @param data The packed array of correction data. Data is passed for the R (or single) channel followed by the G & B channels. Each entry is one or two bytes (if dataWidth > 8).
+    @result an IOReturn code.
+*/
+
+    virtual IOReturn setGammaTable( UInt32 channelCount, UInt32 dataCount,
+                    UInt32 dataWidth, void * data );
+
+/*! @function setAttribute
+    @abstract Generic method to set some attribute of the framebuffer device.
+    @discussion IOFramebuffer subclasses may implement this method to allow arbitrary attribute/value pairs to be set. 
+    @param attribute Defines the attribute to be set. Some defined attributes are:<br> 
+    kIOPowerAttribute The IOFramebuffer class implements most power management (IOService) methods. It calls the subclass to carry out the power management state change with this attribute. When carrying out power state changes, the subclass should call IOFramebuffer::handleEvent for certain changes - set that method for more information.
+    @param value The new value for the attribute.
+    @result an IOReturn code.
+*/
+
+    virtual IOReturn setAttribute( IOSelect attribute, uintptr_t value );
+
+/*! @function getAttribute
+    @abstract Generic method to retrieve some attribute of the framebuffer device.
+    @discussion IOFramebuffer subclasses may implement this method to allow arbitrary attribute/value pairs to be returned. 
+    @param attribute Defines the attribute to be set. Some defined attributes are:<br> 
+    kIOHardwareCursorAttribute If the device supports a hardware cursor and implements the setCursorImage() and setCursorState() calls it should return true for this attribute.
+    @param value Returns the value for the attribute.
+    @result an IOReturn code.
+*/
+
+    virtual IOReturn getAttribute( IOSelect attribute, uintptr_t * value );
+
+/*! @function getTimingInfoForDisplayMode
+    @abstract Returns a timing description for a display mode.
+    @discussion IOFramebuffer subclasses should implement this method to return timing information for a display mode. This allows the OS to enable display modes based on its knowledge of the connected display type. Two types of timing information are defined, by Apple defined constant, or by a detailed description of the timing parameters of the mode. 
+    @param displayMode A display mode ID representing the mode to examine.
+    @param info The driver returns the information for the display mode in this structure.<br>
+    If the mode has an Apple defined constant, such as timingVESA_1024x768_75hz, it should be returned in the appleTimingID field. Otherwise the field should be set to timingInvalid.<br>
+    If the driver is able to supply detailed timing information, it should return it in the detailedInfo.v2 field of the structure, otherwise the driver should clear the kIODetailedTimingValid flag from the flags field.<br>
+    The IODetailedTimingInformationV2 structure is documented in IOGraphicsTypes.h
+    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
+*/
+
+    virtual IOReturn getTimingInfoForDisplayMode(
+                IODisplayModeID displayMode, IOTimingInformation * info );
+
+/*! @function validateDetailedTiming
+    @abstract Reports whether a detailed timing is able to be programmed with the device.
+    @discussion IOFramebuffer subclasses may implement programmable mode functionality where the OS is able to install modes described by a detailed timing into the driver. 
+    @param description A pointer to a IODetailedTimingInformationV2 structure. The driver should examine this description and change any fields that it cannot implement to reflect its closest possible implementation.
+    @param descripSize sizeof(IODetailedTimingInformationV2)
+    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from installing the programmable mode.
+*/
+
+    virtual IOReturn validateDetailedTiming(
+                    void * description, IOByteCount descripSize );
+
+/*! @function setDetailedTimings
+    @abstract Installs an array of OS programmed detailed timings to be made available by the driver.
+    @discussion IOFramebuffer subclasses may implement programmable mode functionality where the OS is able to install modes described by a detailed timing into the driver. The driver needs to add these modes to its internal mode list if it provides this functionality.
+    @param array An OSArray of OSData objects. Each OSData contains one IODetailedTimingInformationV2 structure. All the data described by the array should be copied or retained by this call until the next invocation of this method.
+    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from installing the programmable modes.
+*/
+
+    virtual IOReturn setDetailedTimings( OSArray * array );
+
+/*! @function getConnectionCount
+    @abstract Reports the number of display connections the device supports, driven from one framebuffer.
+    @discussion IOFramebuffer subclasses may implement functionality where a single framebuffer drives multiple displays. This is not recommended or fully supported and instead multihead cards should implement multiple instances of IOFramebuffer objects to provide full functionality.
+    @result A count of the number of display connections reported by the framebuffer. Current versions of OS X only support one connection completely.
+*/
+
+    virtual IOItemCount getConnectionCount( void );
+
+
+/*! @function setAttributeForConnection
+    @abstract Generic method to set some attribute of the framebuffer device, specific to one display connection.
+    @discussion IOFramebuffer subclasses may implement this method to allow arbitrary attribute/value pairs to be set, specific to one display connection. 
+    @param attribute Defines the attribute to be set. Some defined attributes are:<br> 
+    kIOCapturedAttribute If the device supports hotplugging displays, it should disable the generation of hot plug interrupts when the attribute kIOCapturedAttribute is set to true.
+    @param value The new value for the attribute.
+    @result an IOReturn code.
+*/
+
+    virtual IOReturn setAttributeForConnection( IOIndex connectIndex,
+                    IOSelect attribute, uintptr_t value );
+
+/*! @function getAttributeForConnection
+    @abstract Generic method to retrieve some attribute of the framebuffer device, specific to one display connection.
+    @discussion IOFramebuffer subclasses may implement this method to allow arbitrary attribute/value pairs to be returned, specific to one display connection. 
+    @param attribute Defines the attribute to be returned. Some defined attributes are:<br> 
+    kConnectionSupportsHLDDCSense If the framebuffer supports the DDC methods hasDDCConnect() and getDDCBlock() it should return success (and no value) for this attribute.<br>
+    kConnectionSupportsLLDDCSense If the framebuffer wishes to make use of IOFramebuffer::doI2CRequest software implementation of I2C it should implement the I2C methods setDDCClock(), setDDCData(), readDDCClock(), readDDCData(), and it should return success (and no value) for this attribute.<br>
+    @param value Returns the value for the attribute.
+    @result an IOReturn code.
+*/
+
+    virtual IOReturn getAttributeForConnection( IOIndex connectIndex,
+                    IOSelect attribute, uintptr_t * value );
+
+/*! @function convertCursorImage
+    @abstract Utility method of IOFramebuffer to convert cursor image to a hardware cursor format.
+    @discussion IOFramebuffer subclasses may implement hardware cursor functionality, if so they should pass the cursor image given by the  setCursorImage() method, with a description of their hardware cursor format, to this helper function to this routine to convert the image to one suitable for the hardware.
+    @param cursorImage Opaque cursor parameter from the setCursorImage() call.
+    @param description Describes the cursor format supported by the driver.
+    @param cursor Structure describing the drivers allocated buffer to receive the converted image.
+    @result a bool indicating the conversion was successful.
+*/
+
+    virtual bool convertCursorImage( void * cursorImage,
+                IOHardwareCursorDescriptor * description,
+                IOHardwareCursorInfo * cursor );
+
+/*! @function setCursorImage
+    @abstract Set a new image for the hardware cursor.
+    @discussion IOFramebuffer subclasses may implement hardware cursor functionality, if so they should implement this method to change the hardware cursor image. The image should be passed to the convertCursorImage() method with each type of cursor format the hardware supports until success, if all fail the hardware cursor should be hidden and kIOReturnUnsupported returned.
+    @param cursorImage Opaque cursor description. This should be passed to the convertCursorImage() method to convert to a format specific to the hardware.
+    @result An IOReturn code.
+*/
+
+    virtual IOReturn setCursorImage( void * cursorImage );
+
+/*! @function setCursorState
+    @abstract Set a new position and visibility for the hardware cursor.
+    @discussion IOFramebuffer subclasses may implement hardware cursor functionality, if so they should implement this method to change the position and visibility of the cursor.
+    @param x Left coordinate of the cursor image. A signed value, will be negative if the cursor's hot spot and position place it partly offscreen.
+    @param y Top coordinate of the cursor image. A signed value, will be negative if the cursor's hot spot and position place it partly offscreen.
+    @param visible Visible state of the cursor.
+    @result An IOReturn code.
+*/
+
+    virtual IOReturn setCursorState( SInt32 x, SInt32 y, bool visible );
+
+/*! @function flushCursor
+    @abstract Perform any needed cache flushing after software cursor rendering.
+    @discussion IOFramebuffer implements software cursor functionality when a hardware cursor is unavailable. Some hardware may need to flush a cache after the processor has finished lifting and dropping the software cursor.
+*/
+
+    virtual void flushCursor( void );
+
+/*! @function getAppleSense
+    @abstract Return display sense information for legacy Apple sensing.
+    @discussion Hardware that supports simple display sensing, or the classic 3 pin Apple sensing described in Designing Cards and Drivers, should implement this method to return sense information.
+    @param connectIndex Index of the display connection, from zero to the value of getConnectionCount().
+    @param senseType Return zero to indicate legacy Apple sensing.
+    @param primary Return the value of the primary Apple sense code.
+    @param extended Return the value of the secondary Apple sense code.
+    @param displayType Return an Apple defined constant for the type of display sensed. For example, kVGAConnect, kNTSCConnect, kPALConnect etc.
+    @result An IOReturn code.
+*/
+
+    virtual IOReturn getAppleSense( IOIndex connectIndex,
+            UInt32 * senseType,
+            UInt32 * primary,
+            UInt32 * extended,
+            UInt32 * displayType );
+
+/*! @function connectFlags
+    @abstract Return display sense information for legacy Apple sensing.
+    @discussion Hardware that supports simple display sensing, or the classic 3 pin Apple sensing described in Designing Cards and Drivers, should implement this method to return mode flags relative to the sensed display. If this method is unimplemented, all modes have are given the flags kDisplayModeValidFlag | kDisplayModeSafeFlag.
+    @param connectIndex Index of the display connection, from zero to the value of getConnectionCount().
+    @param displayMode A display mode ID.
+    @param flags Return the flags value for the given mode with the connected display. Flags are:<br>
+    kDisplayModeValidFlag - mode is considered valid for the connected display by the driver.
+    kDisplayModeSafeFlag - mode is considered safe (not requiring mode change confirmation) for the connected display by the driver.
+    kDisplayModeDefaultFlag - mode is considered default for the connected display by the driver.
+    @result An IOReturn code.
+*/
+
+    virtual IOReturn connectFlags( IOIndex connectIndex,
+                    IODisplayModeID displayMode, IOOptionBits * flags );
+
+    //// IOLowLevelDDCSense
+
+/*! @function setDDCClock
+    @abstract Sets the state of the I2C clock line on a bus.
+    @discussion Framebuffers making use of the IOFramebuffer::doI2CRequest() software implementation of I2C should implement this method to set the state of the I2C clock line on the given bus. Otherwise may be unimplemented.
+    @param bus Index of the bus.
+    @param value One of kIODDCLow, kIODDCHigh, kIODDCTristate.
+*/
+
+    virtual void setDDCClock( IOIndex bus, UInt32 value );
+
+/*! @function setDDCData
+    @abstract Sets the state of the I2C data line on a bus.
+    @discussion Framebuffers making use of the IOFramebuffer::doI2CRequest() software implementation of I2C should implement this method to set the state of the I2C data line on the given bus. Otherwise may be unimplemented.
+    @param bus Index of the bus.
+    @param value One of kIODDCLow, kIODDCHigh, kIODDCTristate.
+*/
+    virtual void setDDCData( IOIndex bus, UInt32 value );
+
+/*! @function readDDCClock
+    @abstract Reads the input state of the I2C clock line on a bus.
+    @discussion Framebuffers making use of the IOFramebuffer::doI2CRequest() software implementation of I2C should implement this method to return the input state of the I2C clock line on the given bus. Otherwise may be unimplemented.
+    @param bus Index of the bus.
+    @result A boolean reflecting the current state of the clock line on the given bus.
+*/
+    virtual bool readDDCClock( IOIndex bus );
+
+/*! @function readDDCData
+    @abstract Reads the input state of the I2C data line on a bus.
+    @discussion Framebuffers making use of the IOFramebuffer::doI2CRequest() software implementation of I2C should implement this method to return the input state of the I2C data line on the given bus. Otherwise may be unimplemented.
+    @param bus Index of the bus.
+    @result A boolean reflecting the current state of the data line on the given bus.
+*/
+    virtual bool readDDCData( IOIndex bus );
+
+    virtual IOReturn enableDDCRaster( bool enable );
+
+/*! @function hasDDCConnect
+    @abstract Return display DDC connect state.
+    @discussion Hardware that supports DDC/EDID display sensing should implement this method to return true if a DDC display is detected. They should also return success for the connection attribute kConnectionSupportsHLDDCSense (from getAttributeForConnection()).
+    @param connectIndex Index of the display connection, from zero to the value of getConnectionCount().
+    @result True if a DDC display is detected.
+*/
+
+    virtual bool hasDDCConnect( IOIndex connectIndex );
+
+/*! @function getDDCBlock
+    @abstract Return display EDID data.
+    @discussion Hardware that supports DDC/EDID display sensing should implement this method to return EDID data in 128 byte blocks.
+    @param connectIndex Index of the display connection, from zero to the value of getConnectionCount().
+    @param blockNumber Block number, ranging from one to the number of blocks return by the display.
+    @param blockType kIODDCBlockTypeEDID will be passed. 
+    @param options No options are currently defined.
+    @param data Caller allocated buffer to receive the blocks data.
+    @param length In/out parameter - callers allocated buffer size, driver returns actual size.
+    @result An IOReturn code.
+*/
+
+    virtual IOReturn getDDCBlock( IOIndex connectIndex, UInt32 blockNumber,
+                    IOSelect blockType, IOOptionBits options,
+                    UInt8 * data, IOByteCount * length );
+
+/*! @function registerForInterruptType
+    @abstract Set callbacks for driver to call on interrupt events.
+    @discussion The IOFramebuffer class will call its subclasses to set callbacks to be called on interrupt events generated by hardware events. Only two are currently in use - vertical blank interrupts and connection changed interrupts.
+    @param interruptType One of these constants:<br>
+    kIOFBVBLInterruptType Specifying a vertical blanking interrupt.
+    kIOFBConnectInterruptType Specify the display connection should be resensed.
+    @param proc C callback to be called by the driver when the specified event occurs.
+    @param target Target parameter for the callback proc.
+    @param ref Ref parameter for the callback proc.
+    @param interruptRef The subclass should return an opaque reference to the installed interrupt handler, for use with unregisterInterrupt() and setInterruptState().
+    @result An IOReturn code.
+*/
+
+    virtual IOReturn registerForInterruptType( IOSelect interruptType,
+                    IOFBInterruptProc proc, OSObject * target, void * ref,
+                    void ** interruptRef );
+
+/*! @function unregisterInterrupt
+    @abstract Remove a callback previously installed by registerForInterruptType().
+    @discussion Remove a callback previously installed by registerForInterruptType().
+    @param interruptRef The interruptRef returned from the registerForInterruptType call that installed the interrupt.
+    @result An IOReturn code.
+*/
+
+    virtual IOReturn unregisterInterrupt( void * interruptRef );
+
+/*! @function unregisterInterrupt
+    @abstract Enable or disable a callback previously installed by registerForInterruptType().
+    @discussion Enable or disable a callback previously installed by registerForInterruptType().
+    @param state True or false to enable the callback.
+    @result An IOReturn code.
+*/
+
+    virtual IOReturn setInterruptState( void * interruptRef, UInt32 state );
+
+    virtual IOReturn getNotificationSemaphore( IOSelect interruptType,
+                                               semaphore_t * semaphore );
+
+/*  non WL clients apis
+*/
+    IOReturn setAttributeExt( IOSelect attribute, uintptr_t value );
+    
+    IOReturn getAttributeExt( IOSelect attribute, uintptr_t * value );
+    
+    IOReturn setAttributeForConnectionExt( IOIndex connectIndex,
+               IOSelect attribute, uintptr_t value );
+    
+    IOReturn getAttributeForConnectionExt( IOIndex connectIndex,
+            IOSelect attribute, uintptr_t * value );
+};
+
+#endif /* ! _IOKIT_IOFRAMEBUFFER_H */
diff --git a/i386/include/IOKit/graphics/IOFramebufferShared.h b/i386/include/IOKit/graphics/IOFramebufferShared.h
new file mode 100644
index 0000000..7f01ff3
--- /dev/null
+++ b/i386/include/IOKit/graphics/IOFramebufferShared.h
@@ -0,0 +1,255 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOFRAMEBUFFERSHARED_H
+#define _IOKIT_IOFRAMEBUFFERSHARED_H
+
+#include <IOKit/hidsystem/IOHIDTypes.h>
+#include <IOKit/graphics/IOGraphicsTypes.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*! @header IOFramebufferShared
+The IOFramebufferShared.h header contains definitions of objects and types shared between a kernel level IOFrameBuffer service and a non-kernel window server. In Mac OS X this structure is used by the CoreGraphics server and IOGraphics Family, and is not available to other clients. IOFramebuffer subclasses and IOFramebuffer clients within the kernel should also not rely on this structure definition and constants. It is public only for use on Darwin based window servers. Cursor and window server state data is exchanged by kernel and non-kernel tasks through a slice of shared memory containing a StdFBShmem_t structure.<br>
+For a non-kernel task to get access to this slice of shared memory, a connection to an IOFramebuffer service must be made. A connection is made with the IOServiceOpen() function described in IOKitLib.h. A connection type of kIOFBServerConnectType or kIOFBSharedConnectType (for read-only access) should be specified. An io_connect_t handle is returned by IOServiceOpen(). This handle must be passed to IOFBCreateSharedCursor() to create the slice of shared memory. Then IOConnectMapMemory() may be called with a memory type of kIOFBCursorMemory to map the shared memory into the non-kernel task.
+*/
+
+#ifdef KERNEL
+// CGS use optional
+/*! @defined IOFB_ARBITRARY_SIZE_CURSOR
+    @discussion When IOFB_ARBITRARY_SIZE_CURSOR is not defined, the maximum cursor size is assumed to be CURSORWIDTH x CURSORHEIGHT and this header file will define a number of structures for storing cursor images accordingly. A non-kernel task may define IOFB_ARBITRARY_SIZE_CURSOR and use cursors up to the size specified when IOFBCreateSharedCursor() was called. In this case appropriate structures for storing cursor images must be defined elsewhere. In the kernel, IOFB_ARBITRARY_SIZE_CURSOR is always defined.
+*/
+#define IOFB_ARBITRARY_SIZE_CURSOR
+#define IOFB_ARBITRARY_FRAMES_CURSOR    1
+#endif
+
+#define IOFB_SUPPORTS_XOR_CURSOR
+#define IOFB_SUPPORTS_HW_SHIELD
+#define IOFB_SUPPORTS_ARBITRARY_FRAMES_CURSOR
+
+//
+// Cursor and Window Server state data, occupying a slice of shared memory
+// between the kernel and WindowServer.
+//
+/*! @enum CursorParameters
+    @constant kIOFBNumCursorFrames The number of cursor images stored in the StdFBShmem_t structure.
+    @constant kIOFBNumCursorFramesShift Used with waiting cursors.
+    @constant kIOFBMaxCursorDepth The maximum cursor pixel depth.
+*/
+enum {
+#if IOFB_ARBITRARY_FRAMES_CURSOR
+    kIOFBMainCursorIndex        = 0,
+    kIOFBWaitCursorIndex        = 1,
+    kIOFBNumCursorIndex         = 4,
+#else
+    kIOFBNumCursorFrames        = 4,
+    kIOFBNumCursorFramesShift   = 2,
+#endif
+    kIOFBMaxCursorDepth         = 32
+};
+
+#ifndef IOFB_ARBITRARY_SIZE_CURSOR
+
+/*! @defined CURSORWIDTH
+    @discussion The maximum width of the cursor image in pixels. This is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
+*/
+#define CURSORWIDTH  16         /* width in pixels */
+
+/*! @defined CURSORHEIGHT
+    @discussion The maximum height of the cursor image in pixels. This is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
+*/
+#define CURSORHEIGHT 16         /* height in pixels */
+
+/*! @struct bm12Cursor
+    @abstract Cursor image for 1-bit cursor.
+    @discussion This structure stores 16 pixel x 16 pixel cursors to be used with 1-bit color depth. This structure is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
+    @field image This array contains the cursor images.
+    @field mask This array contains the cursor mask.
+    @field save This array stores the pixel values of the region underneath the cursor in its last drawn position.
+*/
+struct bm12Cursor {
+    unsigned int image[4][16];
+    unsigned int mask[4][16];
+    unsigned int save[16];
+};
+
+/*! @struct bm18Cursor
+    @abstract Cursor image for 8-bit cursor.
+    @discussion This structure stores 16 pixel x 16 pixel cursors to be used with 8-bit color depth. This structure is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
+    @field image This array contains cursor color values, which are converted to displayed colors through the color table. The array is two dimensional and its first index is the cursor frame and the second index is the cursor pixel.
+    @field mask This array contains the cursor alpha mask. The array is two dimensional with the same indexing as the image. If an alpha mask pixel is 0 and the corresponding image pixel is set to white for the display, then this cursor pixel will invert pixels on the display.
+    @field save This array stores the color values of the region underneath the cursor in its last drawn position.
+*/
+struct bm18Cursor {
+    unsigned char image[4][256];
+    unsigned char mask[4][256];
+    unsigned char save[256];
+};
+
+/*! @struct bm34Cursor
+    @abstract Cursor image for 15-bit cursor.
+    @discussion This structure stores 16 pixel x 16 pixel cursors to be used with 15-bit color depth. This structure is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
+    @field image This array defines the cursor color values and transparency. The array is two dimensional and its first index is the cursor frame and the second index is the cursor pixel. A value of 0 means the pixel is transparent. Non-zero values are stored with the red, green, blue, and alpha values encoded with the following masks:<BR>
+    red mask = 0xF000<br>
+    blue mask 0x0F00<br>
+    green mask 0x00F0<br>
+    alpha mask = 0x000F<br>
+Note, only 4 bits are allocated for each color component.
+    @field save This array stores the color values of the region underneath the cursor in its last drawn position.
+*/
+struct bm34Cursor {
+    unsigned short image[4][256];
+    unsigned short save[256];
+};
+
+/*! @struct bm38Cursor
+    @abstract Cursor image for 24-bit cursor.
+    @discussion This structure stores 16 pixel x 16 pixel cursors to be used with 24-bit color depth. This structure is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
+    @field image This array defines the cursor color values and transparency. The array is two dimensional and its first index is the cursor frame and the second index is the cursor pixel. The lower 24 bits of a pixel's value contain the RGB color, while the upper 8 bits contain the alpha value.
+    @field save This array stores the color values of the region underneath the cursor in its last drawn position.
+*/
+struct bm38Cursor {
+    unsigned int image[4][256];
+    unsigned int save[256];
+};
+
+#endif /* IOFB_ARBITRARY_SIZE_CURSOR */
+
+enum {
+    kIOFBCursorImageNew         = 0x01,
+    kIOFBCursorHWCapable        = 0x02
+};
+enum {
+    kIOFBHardwareCursorActive   = 0x01,
+    kIOFBHardwareCursorInVRAM   = 0x02
+};
+
+/*! @struct StdFBShmem_t
+    @discussion This structure contains cursor and window server state data and occupies a slice of shared memory between the kernel and window server. Several elements of this structure are only used in software cursor mode. Unless otherwise indicated, the coordinates in this structure are given in display space. Display space is the coordinate space that encompasses all the screens. The positions of the screens within display space indicate their location relative to each other as the cursor moves between them. If there is only one screen, the screen coordinates and display space coordinates will be the same.
+    @field cursorSema Semaphore lock for write access to the shared data in this structure.
+    @field frame The current cursor frame index.
+    @field cursorShow The cursor is displayed when cursorShow is 0.
+    @field cursorObscured If this is true, the cursor has been obscured and cursorShow should not be 0. The cursor will be shown again the next time it is moved.
+    @field shieldFlag When this is set to true the cursor will not be displayed in the region specified by shieldRect.
+    @field shielded True if the cursor has been hidden because it entered the shielded region.
+    @field saveRect The region that is saved underneath the cursor in software cursor mode.
+    @field shieldRect The region that the cursor will not be displayed in if shieldFlag is true.
+    @field cursorLoc The location of the cursor hot spot.
+    @field cursorRect The region that the cursor image currently occupies in software cursor mode.
+    @field oldCursorRect The region that the cursor image occupied the last time the cursor was drawn in software cursor mode.
+    @field screenBounds The region that the current screen occupies.
+    @field version Contains kIOFBCurrentShmemVersion so that a user client can ensure it is using the same version of this structure as the kernel.
+    @field structSize Contains the size of this structure.
+    @field vblTime The time of the most recent vertical blanking.
+    @field vblDelta The interval between the two most recent vertical blankings.
+    @field vblCount A running count of vertical blank interrupts.
+    @field reservedC Reserved for future use.
+    @field hardwareCursorCapable True if the hardware is capable of using hardware cursor mode.
+    @field hardwareCursorActive True if currently using the hardware cursor mode.
+    @field reservedB Reserved for future use.
+    @field cursorSize This array contains the cursor sizes indexed by frame.
+    @field hotSpot This array contains the location of the cursor hot spots indexed by frame. The hot spots coordinates are given relative to the top left corner of the cursor image.
+    @field cursor A union of structures that define the cursor images. The structure used depends on the framebuffer's bit depth. These structures are defined above.
+*/
+
+struct StdFBShmem_t {
+    ev_lock_data_t cursorSema;  
+    int frame;
+    char cursorShow;
+    char cursorObscured;
+    char shieldFlag;
+    char shielded;
+    IOGBounds saveRect;
+    IOGBounds shieldRect;
+    IOGPoint cursorLoc;
+    IOGBounds cursorRect;
+    IOGBounds oldCursorRect;
+    IOGBounds screenBounds;
+    int version;
+    int structSize;
+    AbsoluteTime vblTime;
+    AbsoluteTime vblDelta;
+    unsigned long long int vblCount;
+#if IOFB_ARBITRARY_FRAMES_CURSOR
+    unsigned int reservedC[28];
+#else
+    unsigned int reservedC[27];
+    unsigned char hardwareCursorFlags[kIOFBNumCursorFrames];
+#endif
+    unsigned char hardwareCursorCapable;
+    unsigned char hardwareCursorActive;
+    unsigned char hardwareCursorShields;
+    unsigned char reservedB[1];
+#if IOFB_ARBITRARY_FRAMES_CURSOR
+    IOGSize cursorSize[kIOFBNumCursorIndex];
+    IOGPoint hotSpot[kIOFBNumCursorIndex];
+#else
+    IOGSize cursorSize[kIOFBNumCursorFrames];
+    IOGPoint hotSpot[kIOFBNumCursorFrames];
+#endif
+#ifndef IOFB_ARBITRARY_SIZE_CURSOR
+    union {
+        struct bm12Cursor bw;
+        struct bm18Cursor bw8;
+        struct bm34Cursor rgb;
+        struct bm38Cursor rgb24;
+    } cursor;
+#else  /* IOFB_ARBITRARY_SIZE_CURSOR */
+    unsigned char cursor[0];
+#endif /* IOFB_ARBITRARY_SIZE_CURSOR */
+};
+#ifndef __cplusplus
+typedef volatile struct StdFBShmem_t StdFBShmem_t;
+#endif
+
+
+/*! @enum FramebufferConstants
+    @constant kIOFBCurrentShmemVersion The current version of the slice of shared memory that contains the cursor and window server state data in the StdFBShmem_t structure.
+    @constant kIOFBCursorMemory The memory type for IOConnectMapMemory() to get a slice of shared memory that contains the StdFBShmem_t structure.
+*/
+enum {
+    // version for IOFBCreateSharedCursor
+    kIOFBShmemVersionMask       = 0x000000ff,
+    kIOFBTenPtOneShmemVersion   = 2,
+    kIOFBTenPtTwoShmemVersion   = 3,
+    kIOFBCurrentShmemVersion    = 2,
+
+    // number of frames in animating cursor (if > kIOFBTenPtTwoShmemVersion)
+    kIOFBShmemCursorNumFramesMask       = 0x00ff0000,
+    kIOFBShmemCursorNumFramesShift      = 16,
+
+    // memory types for IOConnectMapMemory.
+    kIOFBCursorMemory           = 100
+};
+
+/*! @defined IOFRAMEBUFFER_CONFORMSTO
+    @discussion The class name of the framebuffer service.
+*/
+#define IOFRAMEBUFFER_CONFORMSTO        "IOFramebuffer"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ! _IOKIT_IOFRAMEBUFFERSHARED_H */
diff --git a/i386/include/IOKit/graphics/IOGraphicsDevice.h b/i386/include/IOKit/graphics/IOGraphicsDevice.h
new file mode 100644
index 0000000..8f51330
--- /dev/null
+++ b/i386/include/IOKit/graphics/IOGraphicsDevice.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IOGRAPHICSDEVICE_H
+#define _IOKIT_IOGRAPHICSDEVICE_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/graphics/IOGraphicsTypes.h>
+
+
+class IOGraphicsDevice : public IOService
+{
+    OSDeclareAbstractStructors(IOGraphicsDevice)
+
+public:
+
+    virtual void hideCursor( void ) = 0;
+    virtual void showCursor( IOGPoint * cursorLoc, int frame ) = 0;
+    virtual void moveCursor( IOGPoint * cursorLoc, int frame ) = 0;
+
+    virtual void getVBLTime( AbsoluteTime * time, AbsoluteTime * delta ) = 0;
+
+    virtual void getBoundingRect ( IOGBounds ** bounds ) = 0;
+};
+
+#endif /* ! _IOKIT_IOGRAPHICSDEVICE_H */
+
diff --git a/i386/include/IOKit/graphics/IOGraphicsEngine.h b/i386/include/IOKit/graphics/IOGraphicsEngine.h
new file mode 100644
index 0000000..4c79b41
--- /dev/null
+++ b/i386/include/IOKit/graphics/IOGraphicsEngine.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ * 10 Mar 99 sdouglas created.
+ */
+
+
+struct IOGraphicsEngineContext {
+    IOSharedLockData    contextLock;
+    IOOptionBits        state;
+    void *              owner;
+    UInt32              version;
+    IOByteCount         structSize;
+    UInt32              reserved[ 8 ];
+};
+#ifndef __cplusplus
+typedef volatile struct IOGraphicsEngineContext IOGraphicsEngineContext;
+#endif
+
+enum {
+    // memory type for IOMapMemory
+    kIOGraphicsEngineContext            = 100
+};
+
+enum {
+    // version
+    kIOGraphicsEngineContextVersion     = 1
+};
diff --git a/i386/include/IOKit/graphics/IOGraphicsInterfaceTypes.h b/i386/include/IOKit/graphics/IOGraphicsInterfaceTypes.h
new file mode 100644
index 0000000..5b392a7
--- /dev/null
+++ b/i386/include/IOKit/graphics/IOGraphicsInterfaceTypes.h
@@ -0,0 +1,301 @@
+/*
+ * Copyright (c) 1999-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOGRAPHICSINTERFACETYPES_H
+#define _IOKIT_IOGRAPHICSINTERFACETYPES_H
+
+#include <IOKit/graphics/IOAccelSurfaceConnect.h>
+
+#define IO_FOUR_CHAR_CODE(x)    (x)
+
+typedef UInt32 IOFourCharCode;
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#define kCurrentGraphicsInterfaceVersion        1
+#define kCurrentGraphicsInterfaceRevision       2
+
+
+#ifdef IOGA_COMPAT
+typedef SInt32          IOBlitCompletionToken;
+#endif
+
+typedef UInt32          IOBlitType;
+enum {
+    kIOBlitTypeVerbMask                 = 0x000000ff,
+    kIOBlitTypeRects                    = 0,
+    kIOBlitTypeCopyRects,
+    kIOBlitTypeLines,
+    kIOBlitTypeScanlines,
+    kIOBlitTypeCopyRegion,
+
+    kIOBlitTypeMoveCursor,
+    kIOBlitTypeShowCursor,
+    kIOBlitTypeHideCursor,
+
+    kIOBlitTypeMonoExpand               = 0x00000100,
+    kIOBlitTypeColorSpaceConvert        = 0x00000200,
+    kIOBlitTypeScale                    = 0x00000400,
+
+    kIOBlitTypeSourceKeyColorModeMask   = 0x00003000,
+    kIOBlitTypeDestKeyColorModeMask     = 0x0000c000,
+    kIOBlitTypeSourceKeyColorEqual      = 0x00001000,
+    kIOBlitTypeSourceKeyColorNotEqual   = 0x00002000,
+    kIOBlitTypeDestKeyColorEqual        = 0x00004000,
+    kIOBlitTypeDestKeyColorNotEqual     = 0x00008000,
+
+    kIOBlitTypeOperationMask            = 0x0fff0000,
+    kIOBlitTypeOperationShift           = 16,
+    kIOBlitTypeOperationTypeMask        = 0x0f000000,
+
+    kIOBlitTypeOperationType0           = 0x00000000,
+    kIOBlitCopyOperation                = 0x00000000 | kIOBlitTypeOperationType0,
+    kIOBlitOrOperation                  = 0x00010000 | kIOBlitTypeOperationType0,
+    kIOBlitXorOperation                 = 0x00020000 | kIOBlitTypeOperationType0,
+    kIOBlitBlendOperation               = 0x00030000 | kIOBlitTypeOperationType0,
+    kIOBlitHighlightOperation           = 0x00040000 | kIOBlitTypeOperationType0
+};
+
+typedef UInt32          IOBlitSourceType;
+enum {
+    kIOBlitSourceDefault                = 0x00000000,
+    kIOBlitSourceFramebuffer            = 0x00001000,
+    kIOBlitSourceMemory                 = 0x00002000,
+    kIOBlitSourceOOLMemory              = 0x00003000,
+    kIOBlitSourcePattern                = 0x00004000,
+    kIOBlitSourceOOLPattern             = 0x00005000,
+    kIOBlitSourceSolid                  = 0x00006000,
+    kIOBlitSourceCGSSurface             = 0x00007000,
+    kIOBlitSourceIsSame                 = 0x80000000
+};
+
+#ifdef IOGA_COMPAT
+typedef IOBlitSourceType        IOBlitSourceDestType;
+enum {
+    kIOBlitDestFramebuffer              = 0x00000001
+};
+#endif
+
+typedef struct IOBlitOperationStruct {
+    UInt32              color0;
+    UInt32              color1;
+    SInt32              offsetX;
+    SInt32              offsetY;
+    UInt32              sourceKeyColor;
+    UInt32              destKeyColor;
+    UInt32              specific[16];
+} IOBlitOperation;
+
+typedef struct IOBlitRectangleStruct {
+    SInt32              x;
+    SInt32              y;
+    SInt32              width;
+    SInt32              height;
+} IOBlitRectangle;
+
+typedef struct IOBlitRectanglesStruct {
+    IOBlitOperation     operation;
+    IOItemCount         count;
+    IOBlitRectangle     rects[1];
+} IOBlitRectangles;
+
+typedef struct IOBlitCopyRectangleStruct {
+    SInt32              sourceX;
+    SInt32              sourceY;
+    SInt32              x;
+    SInt32              y;
+    SInt32              width;
+    SInt32              height;
+} IOBlitCopyRectangle;
+
+typedef struct IOBlitCopyRectanglesStruct {
+    IOBlitOperation     operation;
+    IOItemCount         count;
+    IOBlitCopyRectangle rects[1];
+} IOBlitCopyRectangles;
+
+
+typedef struct IOBlitCopyRegionStruct {
+    IOBlitOperation       operation;
+    SInt32                deltaX;
+    SInt32                deltaY;
+    IOAccelDeviceRegion * region;
+} IOBlitCopyRegion;
+
+
+typedef struct IOBlitVertexStruct {
+    SInt32              x;
+    SInt32              y;
+} IOBlitVertex;
+
+typedef struct IOBlitVerticesStruct {
+    IOBlitOperation     operation;
+    IOItemCount         count;
+    IOBlitVertex        vertices[2];
+} IOBlitVertices;
+
+typedef struct IOBlitScanlinesStruct {
+    IOBlitOperation     operation;
+    IOItemCount         count;
+    SInt32              y;
+    SInt32              height;
+    SInt32              x[2];
+} IOBlitScanlines;
+
+
+typedef struct IOBlitCursorStruct {
+    IOBlitOperation     operation;
+    IOBlitRectangle     rect;
+} IOBlitCursor;
+
+typedef struct _IOBlitMemory * IOBlitMemoryRef;
+
+
+/* Quickdraw.h pixel formats*/
+
+enum {
+        kIO1MonochromePixelFormat       = 0x00000001,           /* 1 bit indexed*/
+        kIO2IndexedPixelFormat          = 0x00000002,           /* 2 bit indexed*/
+        kIO4IndexedPixelFormat          = 0x00000004,           /* 4 bit indexed*/
+        kIO8IndexedPixelFormat          = 0x00000008,           /* 8 bit indexed*/
+        kIO16BE555PixelFormat           = 0x00000010,           /* 16 bit BE rgb 555 (Mac)*/
+        kIO24RGBPixelFormat             = 0x00000018,           /* 24 bit rgb */
+        kIO32ARGBPixelFormat            = 0x00000020,           /* 32 bit argb  (Mac)*/
+        kIO1IndexedGrayPixelFormat      = 0x00000021,           /* 1 bit indexed gray*/
+        kIO2IndexedGrayPixelFormat      = 0x00000022,           /* 2 bit indexed gray*/
+        kIO4IndexedGrayPixelFormat      = 0x00000024,           /* 4 bit indexed gray*/
+        kIO8IndexedGrayPixelFormat      = 0x00000028            /* 8 bit indexed gray*/
+};
+
+enum {
+        kIO16LE555PixelFormat   = IO_FOUR_CHAR_CODE('L555'),    /* 16 bit LE rgb 555 (PC)*/
+        kIO16LE5551PixelFormat  = IO_FOUR_CHAR_CODE('5551'),    /* 16 bit LE rgb 5551*/
+        kIO16BE565PixelFormat   = IO_FOUR_CHAR_CODE('B565'),    /* 16 bit BE rgb 565*/
+        kIO16LE565PixelFormat   = IO_FOUR_CHAR_CODE('L565'),    /* 16 bit LE rgb 565*/
+        kIO24BGRPixelFormat     = IO_FOUR_CHAR_CODE('24BG'),    /* 24 bit bgr */
+        kIO32BGRAPixelFormat    = IO_FOUR_CHAR_CODE('BGRA'),    /* 32 bit bgra  (Matrox)*/
+        kIO32ABGRPixelFormat    = IO_FOUR_CHAR_CODE('ABGR'),    /* 32 bit abgr  */
+        kIO32RGBAPixelFormat    = IO_FOUR_CHAR_CODE('RGBA'),    /* 32 bit rgba  */
+        kIOYUVSPixelFormat      = IO_FOUR_CHAR_CODE('yuvs'),    /* YUV 4:2:2 byte ordering 16-unsigned = 'YUY2'*/
+        kIOYUVUPixelFormat      = IO_FOUR_CHAR_CODE('yuvu'),    /* YUV 4:2:2 byte ordering 16-signed*/
+        kIOYVU9PixelFormat      = IO_FOUR_CHAR_CODE('YVU9'),    /* YVU9 Planar  9*/
+        kIOYUV411PixelFormat    = IO_FOUR_CHAR_CODE('Y411'),    /* YUV 4:1:1 Interleaved 16*/
+        kIOYVYU422PixelFormat   = IO_FOUR_CHAR_CODE('YVYU'),    /* YVYU 4:2:2 byte ordering 16*/
+        kIOUYVY422PixelFormat   = IO_FOUR_CHAR_CODE('UYVY'),    /* UYVY 4:2:2 byte ordering 16*/
+        kIOYUV211PixelFormat    = IO_FOUR_CHAR_CODE('Y211'),    /* YUV 2:1:1 Packed     8*/
+        kIO2vuyPixelFormat      = IO_FOUR_CHAR_CODE('2vuy') /* UYVY 4:2:2 byte ordering   16*/
+};
+
+/* Non Quickdraw.h pixel formats*/
+enum {
+        kIO16LE4444PixelFormat     = IO_FOUR_CHAR_CODE('L444'), /* 16 bit LE argb 4444*/
+        kIO16BE4444PixelFormat     = IO_FOUR_CHAR_CODE('B444'), /* 16 bit BE argb 4444*/
+        kIO64BGRAPixelFormat       = IO_FOUR_CHAR_CODE('B16I'), /* 64 bit bgra  */
+        kIO64RGBAFloatPixelFormat  = IO_FOUR_CHAR_CODE('B16F'), /* 64 bit rgba  */
+        kIO128RGBAFloatPixelFormat = IO_FOUR_CHAR_CODE('B32F')  /* 128 bit rgba float */
+};
+
+enum {
+    kIOBlitMemoryRequiresHostFlush      = 0x00000001
+};
+
+typedef struct IOBlitSurfaceStruct {
+    union {
+        UInt8 *         bytes;
+        IOBlitMemoryRef ref;
+    }                   memory;
+    IOFourCharCode      pixelFormat;
+    IOBlitRectangle     size;
+    UInt32              rowBytes;
+    UInt32              byteOffset;
+    UInt32 *            palette;
+    IOOptionBits        accessFlags;
+    IOBlitMemoryRef     interfaceRef;
+    UInt32              more[14];
+} IOBlitSurface;
+
+typedef IOBlitSurface IOBlitMemory;
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+enum {
+    // options for Synchronize
+    kIOBlitSynchronizeWaitBeamExit      = 0x00000001,
+    kIOBlitSynchronizeFlushHostWrites   = 0x00000002
+};
+
+enum {
+    // options for WaitComplete & Flush
+    kIOBlitWaitContext                  = 0x00000000,
+    kIOBlitWaitAll2D                    = 0x00000001,
+    kIOBlitWaitGlobal                   = 0x00000001,
+    kIOBlitWaitAll                      = 0x00000002,
+    kIOBlitWaitCheck                    = 0x00000080,
+    kIOBlitFlushWithSwap                = 0x00010000
+};
+
+enum {
+    // options for AllocateSurface
+    kIOBlitHasCGSSurface                = 0x00000001,
+    kIOBlitFixedSource                  = 0x00000002,
+    kIOBlitBeamSyncSwaps                = 0x00000004,
+    kIOBlitReferenceSource              = 0x00000008
+};
+
+enum {
+    // options for UnlockSurface
+    kIOBlitUnlockWithSwap               = 0x80000000
+};
+
+enum {
+    // options for SetDestination
+    kIOBlitFramebufferDestination       = 0x00000000,
+    kIOBlitSurfaceDestination           = 0x00000001
+};
+
+
+
+enum {
+    // options for blit procs
+    kIOBlitBeamSync                     = 0x00000001,
+    kIOBlitBeamSyncAlways               = 0x00000002,
+    kIOBlitBeamSyncSpin                 = 0x00000004,
+
+    kIOBlitAllOptions                   = 0xffffffff
+};
+
+enum {
+    // capabilities
+    kIOBlitColorSpaceTypes              = IO_FOUR_CHAR_CODE('cspc')
+};
+
+
+// keys for IOAccelFindAccelerator()
+#define kIOAccelTypesKey                        "IOAccelTypes"
+#define kIOAccelIndexKey                        "IOAccelIndex"
+
+#define kIOAccelRevisionKey                     "IOAccelRevision"
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#endif /* !_IOKIT_IOGRAPHICSINTERFACETYPES_H */
diff --git a/i386/include/IOKit/graphics/IOGraphicsTypes.h b/i386/include/IOKit/graphics/IOGraphicsTypes.h
new file mode 100644
index 0000000..00bc2a8
--- /dev/null
+++ b/i386/include/IOKit/graphics/IOGraphicsTypes.h
@@ -0,0 +1,1260 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOGRAPHICSTYPES_H
+#define _IOKIT_IOGRAPHICSTYPES_H
+
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOKitKeys.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define IOGRAPHICSTYPES_REV     24
+
+typedef SInt32  IOIndex;
+typedef UInt32  IOSelect;
+typedef UInt32  IOFixed1616;
+typedef UInt32  IODisplayVendorID;
+typedef UInt32  IODisplayProductID;
+
+typedef SInt32  IODisplayModeID;
+enum {
+    // This is the ID given to a programmable timing used at boot time
+    kIODisplayModeIDBootProgrammable = (IODisplayModeID)0xFFFFFFFB,
+    // Lowest (unsigned) DisplayModeID reserved by Apple
+    kIODisplayModeIDReservedBase     = (IODisplayModeID)0x80000000
+};
+
+enum {
+    kIOMaxPixelBits     = 64
+};
+typedef char IOPixelEncoding[ kIOMaxPixelBits ];
+
+// Common Apple pixel formats
+
+#define IO1BitIndexedPixels     "P"
+#define IO2BitIndexedPixels     "PP"
+#define IO4BitIndexedPixels     "PPPP"
+#define IO8BitIndexedPixels     "PPPPPPPP"
+#define IO16BitDirectPixels     "-RRRRRGGGGGBBBBB"
+#define IO32BitDirectPixels     "--------RRRRRRRRGGGGGGGGBBBBBBBB"
+
+#define kIO30BitDirectPixels    "--RRRRRRRRRRGGGGGGGGGGBBBBBBBBBB"
+#define kIO64BitDirectPixels    "-16R16G16B16"
+
+#define kIO16BitFloatPixels     "-16FR16FG16FB16"
+#define kIO32BitFloatPixels     "-32FR32FG32FB32"
+
+// other possible pixel formats
+
+#define IOYUV422Pixels          "Y4U2V2"
+#define IO8BitOverlayPixels     "O8"
+// page flipping
+#define IOPagedPixels           "Page1"
+
+#define IO_SampleTypeAlpha      'A'
+#define IO_SampleTypeSkip       '-'
+
+// Info about a pixel format
+enum {
+    kIOCLUTPixels                   = 0,
+    kIOFixedCLUTPixels              = 1,
+    kIORGBDirectPixels              = 2,
+    kIOMonoDirectPixels             = 3,
+    kIOMonoInverseDirectPixels      = 4,
+    kIORGBSignedDirectPixels        = 5,
+    kIORGBSignedFloatingPointPixels = 6
+};
+
+/*!
+ * @struct IOPixelInformation
+ * @abstract A structure defining the format of a framebuffer.
+ * @discussion This structure is used by IOFramebuffer to define the format of the pixels.
+ * @field bytesPerRow The number of bytes per row.
+ * @field bytesPerPlane Not used.
+ * @field bitsPerPixel The number of bits per pixel, including unused bits and alpha.
+ * @field pixelType One of kIOCLUTPixels (indexed pixels with changeable CLUT), kIORGBDirectPixels (direct pixels).
+ * @field componentCount One for indexed pixels, three for direct pixel formats.
+ * @field bitsPerComponent Number of bits per component in each pixel.
+ * @field componentMasks Mask of the bits valid for each component of the pixel - in R, G, B order for direct pixels.
+ * @field pixelFormat String description of the pixel format - IO32BitDirectPixels, IO16BitDirectPixels etc.
+ * @field flags None defined - set to zero.
+ * @field activeWidth Number of pixels visible per row.
+ * @field activeHeight Number of visible pixel rows.
+ * @field reserved Set to zero.
+ */
+
+struct IOPixelInformation {
+    UInt32                      bytesPerRow;
+    UInt32                      bytesPerPlane;
+    UInt32                      bitsPerPixel;
+    UInt32                      pixelType;
+    UInt32                      componentCount;
+    UInt32                      bitsPerComponent;
+    UInt32                      componentMasks[ 8 * 2 ];
+    IOPixelEncoding             pixelFormat;
+    UInt32                      flags;
+    UInt32                      activeWidth;
+    UInt32                      activeHeight;
+    UInt32                      reserved[ 2 ];
+};
+typedef struct IOPixelInformation IOPixelInformation;
+
+// ID for industry standard display timings
+typedef UInt32  IOAppleTimingID;
+
+/*!
+ * @struct IODisplayModeInformation
+ * @abstract A structure defining the format of a framebuffer.
+ * @discussion This structure is used by IOFramebuffer to define the format of the pixels.
+ * @field nominalWidth Number of pixels visible per row.
+ * @field nominalHeight Number of visible pixel rows.
+ * @field refreshRate Refresh rate in fixed point 16.16.
+ * @field maxDepthIndex Highest depth index available in this display mode.
+ * @field flags Flags for the mode, including: <br>
+ *   kDisplayModeInterlacedFlag mode is interlaced. <br>
+ *   kDisplayModeSimulscanFlag mode is available on multiple display connections. <br>
+ *   kDisplayModeNotPresetFlag mode is not a factory preset for the display (geometry may need correction). <br>
+ *   kDisplayModeStretchedFlag mode is stretched/distorted to match the display aspect ratio. <br>
+ * @field reserved Set to zero.
+ */
+
+struct IODisplayModeInformation {
+    UInt32                      nominalWidth;
+    UInt32                      nominalHeight;
+    IOFixed1616                 refreshRate;
+    IOIndex                     maxDepthIndex;
+    UInt32                      flags;
+    UInt32                      reserved[ 4 ];
+};
+typedef struct IODisplayModeInformation IODisplayModeInformation;
+
+// flags
+enum {
+    kDisplayModeSafetyFlags             = 0x00000007,
+
+    kDisplayModeAlwaysShowFlag          = 0x00000008,
+    kDisplayModeNeverShowFlag           = 0x00000080,
+    kDisplayModeNotResizeFlag           = 0x00000010,
+    kDisplayModeRequiresPanFlag         = 0x00000020,
+
+    kDisplayModeInterlacedFlag          = 0x00000040,
+
+    kDisplayModeSimulscanFlag           = 0x00000100,
+    kDisplayModeBuiltInFlag             = 0x00000400,
+    kDisplayModeNotPresetFlag           = 0x00000200,
+    kDisplayModeStretchedFlag           = 0x00000800,
+    kDisplayModeNotGraphicsQualityFlag  = 0x00001000,
+    kDisplayModeValidateAgainstDisplay  = 0x00002000,
+    kDisplayModeTelevisionFlag          = 0x00100000,
+    kDisplayModeValidForMirroringFlag   = 0x00200000
+};
+enum {
+    kDisplayModeValidFlag               = 0x00000001,
+    kDisplayModeSafeFlag                = 0x00000002,
+    kDisplayModeDefaultFlag             = 0x00000004
+};
+
+#ifndef KERNEL
+// Framebuffer info - obsolete
+
+struct IOFramebufferInformation {
+    IOPhysicalAddress           baseAddress;
+    UInt32                      activeWidth;
+    UInt32                      activeHeight;
+    IOByteCount                 bytesPerRow;
+    IOByteCount                 bytesPerPlane;
+    UInt32                      bitsPerPixel;
+    UInt32                      pixelType;
+    UInt32                      flags;
+    UInt32                      reserved[ 4 ];
+};
+typedef struct IOFramebufferInformation IOFramebufferInformation;
+#endif
+
+// flags
+enum {
+    kFramebufferSupportsCopybackCache   = 0x00010000,
+    kFramebufferSupportsWritethruCache  = 0x00020000,
+    kFramebufferSupportsGammaCorrection = 0x00040000,
+    kFramebufferDisableAltivecAccess    = 0x00080000
+};
+
+// Aperture is an index into supported pixel formats for a mode & depth
+typedef IOIndex IOPixelAperture;
+enum {
+    kIOFBSystemAperture = 0
+};
+
+//// CLUTs
+
+typedef UInt16 IOColorComponent;
+
+/*!
+ * @struct IOColorEntry
+ * @abstract A structure defining one entry of a color lookup table.
+ * @discussion This structure is used by IOFramebuffer to define an entry of a color lookup table.
+ * @field index Number of pixels visible per row.
+ * @field red Value of red component 0-65535.
+ * @field green Value of green component 0-65535.
+ * @field blue Value of blue component 0-65535.
+ */
+
+struct IOColorEntry {
+    UInt16                      index;
+    IOColorComponent            red;
+    IOColorComponent            green;
+    IOColorComponent            blue;
+};
+typedef struct IOColorEntry IOColorEntry;
+
+// options (masks)
+enum {
+    kSetCLUTByValue             = 0x00000001,           // else at index
+    kSetCLUTImmediately         = 0x00000002,           // else at VBL
+    kSetCLUTWithLuminance       = 0x00000004            // else RGB
+};
+
+//// Controller attributes
+
+enum {
+    kIOPowerStateAttribute              = 'pwrs',
+    kIOPowerAttribute                   = 'powr',
+    kIODriverPowerAttribute             = 'dpow',
+    kIOHardwareCursorAttribute          = 'crsr',
+
+    kIOMirrorAttribute                  = 'mirr',
+    kIOMirrorDefaultAttribute           = 'mrdf',
+
+    kIOCapturedAttribute                = 'capd',
+
+    kIOCursorControlAttribute           = 'crsc',
+
+    kIOSystemPowerAttribute             = 'spwr',
+    kIOVRAMSaveAttribute                = 'vrsv',
+    kIODeferCLUTSetAttribute            = 'vclt',
+
+    kIOClamshellStateAttribute          = 'clam'
+};
+
+// values for kIOMirrorAttribute
+enum {
+    kIOMirrorIsPrimary                  = 0x80000000,
+    kIOMirrorHWClipped                  = 0x40000000
+};
+
+// values for kIOMirrorDefaultAttribute
+enum {
+    kIOMirrorDefault                    = 0x00000001,
+    kIOMirrorForced                     = 0x00000002
+};
+
+//// Display mode timing information
+
+struct IODetailedTimingInformationV1 {
+    // from EDID defn
+    UInt32                      pixelClock;             // Hertz
+    UInt32                      horizontalActive;       // pixels
+    UInt32                      horizontalBlanking;     // pixels
+    UInt32                      horizontalBorder;       // pixels
+    UInt32                      horizontalSyncOffset;   // pixels
+    UInt32                      horizontalSyncWidth;    // pixels
+    UInt32                      verticalActive;         // lines
+    UInt32                      verticalBlanking;       // lines
+    UInt32                      verticalBorder;         // lines
+    UInt32                      verticalSyncOffset;     // lines
+    UInt32                      verticalSyncWidth;      // lines
+};
+typedef struct IODetailedTimingInformationV1 IODetailedTimingInformationV1;
+
+/*!
+ * @struct IODetailedTimingInformationV2
+ * @abstract A structure defining the detailed timing information of a display mode.
+ * @discussion This structure is used by IOFramebuffer to define detailed timing information for a display mode. The VESA EDID document has more information.
+ * @field __reservedA Set to zero.
+ * @field horizontalScaledInset If the mode is scaled, sets the number of active pixels to remove the left and right edges in order to display an underscanned image.
+ * @field verticalScaledInset If the mode is scaled, sets the number of active lines to remove the top and bottom edges in order to display an underscanned image.
+ * @field scalerFlags If the mode is scaled,
+ *    kIOScaleStretchToFit may be set to allow stretching.
+ *    kIOScaleRotateFlags is mask which may have the value given by kIOScaleRotate90, kIOScaleRotate180, kIOScaleRotate270 to display a rotated framebuffer.
+ * @field horizontalScaled If the mode is scaled, sets the size of the image before scaling or rotation.
+ * @field verticalScaled If the mode is scaled, sets the size of the image before scaling or rotation.
+ * @field signalConfig 
+ *    kIOAnalogSetupExpected set if display expects a blank-to-black setup or pedestal.  See VESA signal standards. <br>
+ *    kIOInterlacedCEATiming set for a CEA style interlaced timing:<br>
+ *      Field 1 vertical blanking = half specified vertical blanking lines. <br>
+ *      Field 2 vertical blanking = (half vertical blanking lines) + 1 line. <br>
+ *      Field 1 vertical offset = half specified vertical sync offset. <br>
+ *      Field 2 vertical offset = (half specified vertical sync offset) + 0.5 lines. <br>
+ * @field signalLevels One of:<br>
+ *   kIOAnalogSignalLevel_0700_0300 0.700 - 0.300 V p-p.<br>
+ *   kIOAnalogSignalLevel_0714_0286 0.714 - 0.286 V p-p.<br>
+ *   kIOAnalogSignalLevel_1000_0400 1.000 - 0.400 V p-p.<br>
+ *   kIOAnalogSignalLevel_0700_0000 0.700 - 0.000 V p-p.<br>
+ * @field pixelClock Pixel clock frequency in Hz.
+ * @field minPixelClock Minimum pixel clock frequency in Hz, with error.
+ * @field maxPixelClock Maximum pixel clock frequency in Hz, with error.
+ * @field horizontalActive Pixel clocks per line.
+ * @field horizontalBlanking Blanking clocks per line.
+ * @field horizontalSyncOffset First clock of horizontal sync.
+ * @field horizontalSyncPulseWidth Width of horizontal sync.
+ * @field verticalActive Number of lines per frame.
+ * @field verticalBlanking Blanking lines per frame.
+ * @field verticalSyncOffset First line of vertical sync.
+ * @field verticalSyncPulseWidth Height of vertical sync.
+ * @field horizontalBorderLeft Number of pixels in left horizontal border.
+ * @field horizontalBorderRight Number of pixels in right horizontal border.
+ * @field verticalBorderTop Number of lines in top vertical border.
+ * @field verticalBorderBottom Number of lines in bottom vertical border.
+ * @field horizontalSyncConfig kIOSyncPositivePolarity for positive polarity horizontal sync (0 for negative).
+ * @field horizontalSyncLevel Zero.
+ * @field verticalSyncConfig kIOSyncPositivePolarity for positive polarity vertical sync (0 for negative).
+ * @field verticalSyncLevel Zero.
+ * @field numLinks number of links to be used by a dual link timing, if zero, assume one link.
+ * @field __reservedB Reserved set to zero.
+ */
+
+struct IODetailedTimingInformationV2 {
+
+    UInt32      __reservedA[3];                 // Init to 0
+    UInt32      horizontalScaledInset;          // pixels
+    UInt32      verticalScaledInset;            // lines
+
+    UInt32      scalerFlags;
+    UInt32      horizontalScaled;
+    UInt32      verticalScaled;
+
+    UInt32      signalConfig;
+    UInt32      signalLevels;
+
+    UInt64      pixelClock;                     // Hz
+
+    UInt64      minPixelClock;                  // Hz - With error what is slowest actual clock
+    UInt64      maxPixelClock;                  // Hz - With error what is fasted actual clock
+
+    UInt32      horizontalActive;               // pixels
+    UInt32      horizontalBlanking;             // pixels
+    UInt32      horizontalSyncOffset;           // pixels
+    UInt32      horizontalSyncPulseWidth;       // pixels
+
+    UInt32      verticalActive;                 // lines
+    UInt32      verticalBlanking;               // lines
+    UInt32      verticalSyncOffset;             // lines
+    UInt32      verticalSyncPulseWidth;         // lines
+
+    UInt32      horizontalBorderLeft;           // pixels
+    UInt32      horizontalBorderRight;          // pixels
+    UInt32      verticalBorderTop;              // lines
+    UInt32      verticalBorderBottom;           // lines
+
+    UInt32      horizontalSyncConfig;
+    UInt32      horizontalSyncLevel;            // Future use (init to 0)
+    UInt32      verticalSyncConfig;
+    UInt32      verticalSyncLevel;              // Future use (init to 0)
+    UInt32      numLinks;
+
+    UInt32      __reservedB[7];                 // Init to 0
+};
+typedef struct IODetailedTimingInformationV2 IODetailedTimingInformationV2;
+typedef struct IODetailedTimingInformationV2 IODetailedTimingInformation;
+
+struct IOTimingInformation {
+    IOAppleTimingID             appleTimingID;  // kIOTimingIDXXX const
+    UInt32                      flags;
+    union {
+      IODetailedTimingInformationV1     v1;
+      IODetailedTimingInformationV2     v2;
+    }                           detailedInfo;
+};
+typedef struct IOTimingInformation IOTimingInformation;
+
+enum {
+    // IOTimingInformation flags
+    kIODetailedTimingValid      = 0x80000000,
+    kIOScalingInfoValid         = 0x40000000
+};
+
+enum {
+    // scalerFlags
+    kIOScaleStretchToFit        = 0x00000001,
+
+    kIOScaleRotateFlags         = 0x000000f0,
+
+    kIOScaleSwapAxes            = 0x00000010,
+    kIOScaleInvertX             = 0x00000020,
+    kIOScaleInvertY             = 0x00000040,
+
+    kIOScaleRotate0             = 0x00000000,
+    kIOScaleRotate90            = kIOScaleSwapAxes | kIOScaleInvertX,
+    kIOScaleRotate180           = kIOScaleInvertX  | kIOScaleInvertY,
+    kIOScaleRotate270           = kIOScaleSwapAxes | kIOScaleInvertY
+};
+
+
+#pragma pack(push, 4)
+struct IOFBDisplayModeDescription {
+    IODisplayModeInformation    info;
+    IOTimingInformation         timingInfo;
+};
+typedef struct IOFBDisplayModeDescription IOFBDisplayModeDescription;
+#pragma pack(pop)
+
+/*!
+ * @struct IODisplayTimingRange
+ * @abstract A structure defining the limits and attributes of a display or framebuffer.
+ * @discussion This structure is used to define the limits for modes programmed as detailed timings by the OS. The VESA EDID is useful background information for many of these fields. A data property with this structure under the key kIOFBTimingRangeKey in a framebuffer will allow the OS to program detailed timings that fall within its range.
+ * @field __reservedA Set to zero.
+ * @field version Set to zero.
+ * @field __reservedB Set to zero.
+ * @field minPixelClock minimum pixel clock frequency in range, in Hz.
+ * @field minPixelClock maximum pixel clock frequency in range, in Hz.
+ * @field maxPixelError largest variation between specified and actual pixel clock frequency, in Hz.
+ * @field supportedSyncFlags mask of supported sync attributes. The following are defined:<br>
+ *    kIORangeSupportsSeparateSyncs - digital separate syncs.<br>
+ *    kIORangeSupportsSyncOnGreen - sync on green.<br>
+ *    kIORangeSupportsCompositeSync - composite sync.<br>
+ *    kIORangeSupportsVSyncSerration - vertical sync has serration and equalization pulses.<br>
+ * @field supportedSignalLevels mask of possible signal levels. The following are defined:<br>
+ *    kIORangeSupportsSignal_0700_0300 0.700 - 0.300 V p-p.<br>
+ *    kIORangeSupportsSignal_0714_0286 0.714 - 0.286 V p-p.<br>
+ *    kIORangeSupportsSignal_1000_0400 1.000 - 0.400 V p-p.<br>
+ *    kIORangeSupportsSignal_0700_0000 0.700 - 0.000 V p-p.<br>
+ * @field supportedSignalConfigs mask of possible signal configurations. The following are defined:<br>
+ *    kIORangeSupportsInterlacedCEATiming Supports CEA style interlaced timing:<br>
+ *      Field 1 vertical blanking = specified vertical blanking lines. <br>
+ *      Field 2 vertical blanking = vertical blanking lines + 1 line. <br> 
+ *      Field 1 vertical offset = specified vertical sync offset. <br>
+ *      Field 2 vertical offset = specified vertical sync offset + 0.5 lines. <br>
+ *    kIORangeSupportsInterlacedCEATimingWithConfirm Supports CEA style interlaced timing, but require a confirm.
+ * @field minFrameRate minimum frame rate (vertical refresh frequency) in range, in Hz.
+ * @field maxFrameRate maximum frame rate (vertical refresh frequency) in range, in Hz.
+ * @field minLineRate minimum line rate (horizontal refresh frequency) in range, in Hz.
+ * @field maxLineRate maximum line rate (horizontal refresh frequency) in range, in Hz.
+ * @field maxHorizontalTotal maximum clocks in horizontal line (active + blanking).
+ * @field maxVerticalTotal maximum lines in vertical frame (active + blanking).
+ * @field __reservedD Set to zero.
+ * @field charSizeHorizontalActive horizontalActive must be a multiple of charSizeHorizontalActive.
+ * @field charSizeHorizontalBlanking horizontalBlanking must be a multiple of charSizeHorizontalBlanking.
+ * @field charSizeHorizontalSyncOffset horizontalSyncOffset must be a multiple of charSizeHorizontalSyncOffset.
+ * @field charSizeHorizontalSyncPulse horizontalSyncPulse must be a multiple of charSizeHorizontalSyncPulse.
+ * @field charSizeVerticalActive verticalActive must be a multiple of charSizeVerticalActive.
+ * @field charSizeVerticalBlanking verticalBlanking must be a multiple of charSizeVerticalBlanking.
+ * @field charSizeVerticalSyncOffset verticalSyncOffset must be a multiple of charSizeVerticalSyncOffset.
+ * @field charSizeVerticalSyncPulse verticalSyncPulse must be a multiple of charSizeVerticalSyncPulse.
+ * @field charSizeHorizontalBorderLeft horizontalBorderLeft must be a multiple of charSizeHorizontalBorderLeft.
+ * @field charSizeHorizontalBorderRight horizontalBorderRight must be a multiple of charSizeHorizontalBorderRight.
+ * @field charSizeVerticalBorderTop verticalBorderTop must be a multiple of charSizeVerticalBorderTop.
+ * @field charSizeVerticalBorderBottom verticalBorderBottom must be a multiple of charSizeVerticalBorderBottom.
+ * @field charSizeHorizontalTotal (horizontalActive + horizontalBlanking) must be a multiple of charSizeHorizontalTotal.
+ * @field charSizeVerticalTotal (verticalActive + verticalBlanking) must be a multiple of charSizeVerticalTotal.
+ * @field __reservedE Set to zero.
+ * @field minHorizontalActiveClocks minimum value of horizontalActive.
+ * @field maxHorizontalActiveClocks maximum value of horizontalActive.
+ * @field minHorizontalBlankingClocks minimum value of horizontalBlanking.
+ * @field maxHorizontalBlankingClocks maximum value of horizontalBlanking.
+ * @field minHorizontalSyncOffsetClocks minimum value of horizontalSyncOffset.
+ * @field maxHorizontalSyncOffsetClocks maximum value of horizontalSyncOffset.
+ * @field minHorizontalPulseWidthClocks minimum value of horizontalPulseWidth.
+ * @field maxHorizontalPulseWidthClocks maximum value of horizontalPulseWidth.
+ * @field minVerticalActiveClocks minimum value of verticalActive.
+ * @field maxVerticalActiveClocks maximum value of verticalActive.
+ * @field minVerticalBlankingClocks minimum value of verticalBlanking.
+ * @field maxVerticalBlankingClocks maximum value of verticalBlanking.
+ * @field minVerticalSyncOffsetClocks minimum value of verticalSyncOffset.
+ * @field maxVerticalSyncOffsetClocks maximum value of verticalSyncOffset.
+ * @field minVerticalPulseWidthClocks minimum value of verticalPulseWidth.
+ * @field maxVerticalPulseWidthClocks maximum value of verticalPulseWidth.
+ * @field minHorizontalBorderLeft minimum value of horizontalBorderLeft.
+ * @field maxHorizontalBorderLeft maximum value of horizontalBorderLeft.
+ * @field minHorizontalBorderRight minimum value of horizontalBorderRight.
+ * @field maxHorizontalBorderRight maximum value of horizontalBorderRight.
+ * @field minVerticalBorderTop minimum value of verticalBorderTop.
+ * @field maxVerticalBorderTop maximum value of verticalBorderTop.
+ * @field minVerticalBorderBottom minimum value of verticalBorderBottom.
+ * @field maxVerticalBorderBottom maximum value of verticalBorderBottom.
+ * @field maxNumLinks number of links supported, if zero, 1 link is assumed.
+ * @field minLink0PixelClock minimum pixel clock for link 0 (kHz).
+ * @field maxLink0PixelClock maximum pixel clock for link 0 (kHz).
+ * @field minLink1PixelClock minimum pixel clock for link 1 (kHz).
+ * @field maxLink1PixelClock maximum pixel clock for link 1 (kHz).
+ * @field __reservedF Set to zero.
+ */
+
+struct IODisplayTimingRange
+{
+    UInt32      __reservedA[2];                 // Init to 0
+    UInt32      version;                        // Init to 0
+    UInt32      __reservedB[5];                 // Init to 0
+
+    UInt64      minPixelClock;                  // Min dot clock in Hz
+    UInt64      maxPixelClock;                  // Max dot clock in Hz
+
+    UInt32      maxPixelError;                  // Max dot clock error
+    UInt32      supportedSyncFlags;
+    UInt32      supportedSignalLevels;
+    UInt32      supportedSignalConfigs;
+
+    UInt32      minFrameRate;                   // Hz
+    UInt32      maxFrameRate;                   // Hz
+    UInt32      minLineRate;                    // Hz
+    UInt32      maxLineRate;                    // Hz
+
+    UInt32      maxHorizontalTotal;             // Clocks - Maximum total (active + blanking)
+    UInt32      maxVerticalTotal;               // Clocks - Maximum total (active + blanking)
+    UInt32      __reservedD[2];                 // Init to 0
+
+    UInt8       charSizeHorizontalActive;
+    UInt8       charSizeHorizontalBlanking;     
+    UInt8       charSizeHorizontalSyncOffset; 
+    UInt8       charSizeHorizontalSyncPulse; 
+
+    UInt8       charSizeVerticalActive;         
+    UInt8       charSizeVerticalBlanking;       
+    UInt8       charSizeVerticalSyncOffset;     
+    UInt8       charSizeVerticalSyncPulse;      
+
+    UInt8       charSizeHorizontalBorderLeft; 
+    UInt8       charSizeHorizontalBorderRight; 
+    UInt8       charSizeVerticalBorderTop;      
+    UInt8       charSizeVerticalBorderBottom; 
+
+    UInt8       charSizeHorizontalTotal;                // Character size for active + blanking
+    UInt8       charSizeVerticalTotal;                  // Character size for active + blanking
+    UInt16      __reservedE;                            // Reserved (Init to 0)
+
+    UInt32      minHorizontalActiveClocks;
+    UInt32      maxHorizontalActiveClocks;
+    UInt32      minHorizontalBlankingClocks;
+    UInt32      maxHorizontalBlankingClocks;
+
+    UInt32      minHorizontalSyncOffsetClocks;
+    UInt32      maxHorizontalSyncOffsetClocks;
+    UInt32      minHorizontalPulseWidthClocks;
+    UInt32      maxHorizontalPulseWidthClocks;
+
+    UInt32      minVerticalActiveClocks;
+    UInt32      maxVerticalActiveClocks;
+    UInt32      minVerticalBlankingClocks;
+    UInt32      maxVerticalBlankingClocks;
+
+    UInt32      minVerticalSyncOffsetClocks;
+    UInt32      maxVerticalSyncOffsetClocks;
+    UInt32      minVerticalPulseWidthClocks;
+    UInt32      maxVerticalPulseWidthClocks;
+
+    UInt32      minHorizontalBorderLeft;
+    UInt32      maxHorizontalBorderLeft;
+    UInt32      minHorizontalBorderRight;
+    UInt32      maxHorizontalBorderRight;
+
+    UInt32      minVerticalBorderTop;
+    UInt32      maxVerticalBorderTop;
+    UInt32      minVerticalBorderBottom;
+    UInt32      maxVerticalBorderBottom;
+    UInt32      maxNumLinks;                       // number of links, if zero, assume link 1
+    UInt32      minLink0PixelClock;                // min pixel clock for link 0 (kHz)
+    UInt32      maxLink0PixelClock;                // max pixel clock for link 0 (kHz)
+    UInt32      minLink1PixelClock;                // min pixel clock for link 1 (kHz)
+    UInt32      maxLink1PixelClock;                // max pixel clock for link 1 (kHz)
+
+    UInt32      __reservedF[3];                 // Init to 0
+};
+typedef struct IODisplayTimingRange  IODisplayTimingRange;
+
+enum {
+    // supportedSignalLevels
+    kIORangeSupportsSignal_0700_0300    = 0x00000001,
+    kIORangeSupportsSignal_0714_0286    = 0x00000002,
+    kIORangeSupportsSignal_1000_0400    = 0x00000004,
+    kIORangeSupportsSignal_0700_0000    = 0x00000008
+};
+enum {
+    // supportedSyncFlags
+    kIORangeSupportsSeparateSyncs        = 0x00000001,
+    kIORangeSupportsSyncOnGreen          = 0x00000002,
+    kIORangeSupportsCompositeSync        = 0x00000004,
+    kIORangeSupportsVSyncSerration       = 0x00000008
+};
+enum {
+    // supportedSignalConfigs
+    kIORangeSupportsInterlacedCEATiming            = 0x00000004,
+    kIORangeSupportsInterlacedCEATimingWithConfirm = 0x00000008
+};
+
+enum {
+    // signalConfig
+    kIODigitalSignal          = 0x00000001,
+    kIOAnalogSetupExpected    = 0x00000002,
+    kIOInterlacedCEATiming    = 0x00000004,
+    kIONTSCTiming             = 0x00000008,
+    kIOPALTiming              = 0x00000010
+};
+
+enum {
+    // signalLevels for analog
+    kIOAnalogSignalLevel_0700_0300 = 0,
+    kIOAnalogSignalLevel_0714_0286 = 1,
+    kIOAnalogSignalLevel_1000_0400 = 2,
+    kIOAnalogSignalLevel_0700_0000 = 3
+};
+
+enum {
+    // horizontalSyncConfig and verticalSyncConfig
+    kIOSyncPositivePolarity     = 0x00000001
+};
+
+/*!
+ * @struct IODisplayScalerInformation
+ * @abstract A structure defining the scaling capabilities of a framebuffer.
+ * @discussion This structure is used to define the limits for modes programmed as detailed timings by the OS. A data property with this structure under the key kIOFBScalerInfoKey in a framebuffer will allow the OS to program detailed timings that are scaled to a displays native resolution.
+ * @field __reservedA Set to zero.
+ * @field version Set to zero.
+ * @field __reservedB Set to zero.
+ * @field scalerFeatures Mask of scaling features. The following are defined:<br>
+ *   kIOScaleStretchOnly If set the framebuffer can only provide stretched scaling with non-square pixels, without borders.<br>
+ *   kIOScaleCanUpSamplePixels If set framebuffer can scale up from a smaller number of source pixels to a larger native timing (eg. 640x480 pixels on a 1600x1200 timing).<br>
+ *   kIOScaleCanDownSamplePixels If set framebuffer can scale down from a larger number of source pixels to a smaller native timing (eg. 1600x1200 pixels on a 640x480 timing).<br>
+ *   kIOScaleCanScaleInterlaced If set framebuffer can scale an interlaced detailed timing.<br>
+ *   kIOScaleCanSupportInset If set framebuffer can support scaled modes with non-zero horizontalScaledInset, verticalScaledInset fields.<br>
+ *   kIOScaleCanRotate If set framebuffer can support some of the flags in the kIOScaleRotateFlags mask.<br>
+ *   kIOScaleCanBorderInsetOnly If set framebuffer can support scaled modes with non-zero horizontalScaledInset, verticalScaledInset fields, but requires the active pixels to be equal in size to the inset area, ie. can do insets with a border versus scaling an image.<br>
+ * @field maxHorizontalPixels Maximum number of horizontal source pixels (horizontalScaled).<br>
+ * @field maxVerticalPixels Maximum number of vertical source pixels (verticalScaled).<br>
+ * @field __reservedC Set to zero.
+ */
+
+struct IODisplayScalerInformation {
+    UInt32              __reservedA[1];         // Init to 0
+    UInt32              version;                // Init to 0
+    UInt32              __reservedB[2];         // Init to 0
+    
+    IOOptionBits        scalerFeatures;
+    UInt32              maxHorizontalPixels;
+    UInt32              maxVerticalPixels;
+    UInt32              __reservedC[5];         // Init to 0
+};
+typedef struct IODisplayScalerInformation IODisplayScalerInformation;
+
+enum {
+    /* scalerFeatures */
+    kIOScaleStretchOnly           = 0x00000001,
+    kIOScaleCanUpSamplePixels     = 0x00000002,
+    kIOScaleCanDownSamplePixels   = 0x00000004,
+    kIOScaleCanScaleInterlaced    = 0x00000008,
+    kIOScaleCanSupportInset       = 0x00000010,
+    kIOScaleCanRotate             = 0x00000020,
+    kIOScaleCanBorderInsetOnly    = 0x00000040
+};
+
+//// Connections
+
+enum {
+    kOrConnections                      = 0xffffffe,
+    kAndConnections                     = 0xffffffd
+};
+
+enum {
+    kConnectionFlags                    = 'flgs',
+    kConnectionSyncEnable               = 'sync',
+    kConnectionSyncFlags                = 'sycf',
+    kConnectionSupportsAppleSense       = 'asns',
+    kConnectionSupportsLLDDCSense       = 'lddc',
+    kConnectionSupportsHLDDCSense       = 'hddc',
+    kConnectionEnable                   = 'enab',
+    kConnectionCheckEnable              = 'cena',
+    kConnectionProbe                    = 'prob',
+    kConnectionChanged                  = 'chng',
+    kConnectionPower                    = 'powr',
+    kConnectionPostWake                 = 'pwak',
+    kConnectionDisplayParameterCount    = 'pcnt',
+    kConnectionDisplayParameters        = 'parm',
+    kConnectionOverscan                 = 'oscn',
+    kConnectionVideoBest                = 'vbst',
+
+    kConnectionRedGammaScale            = 'rgsc',
+    kConnectionGreenGammaScale          = 'ggsc',
+    kConnectionBlueGammaScale           = 'bgsc',
+
+    kConnectionHandleDisplayPortEvent   = 'dpir',
+
+    kConnectionPanelTimingDisable       = 'pnlt',
+
+    kConnectionColorMode                = 'cyuv',
+    kConnectionColorModesSupported      = 'colr',
+    kConnectionColorDepthsSupported     = ' bpc',
+
+    kConnectionControllerDepthsSupported = '\0grd',
+    kConnectionControllerColorDepth      = '\0dpd',
+    kConnectionControllerDitherControl   = '\0gdc',
+
+    kConnectionDisplayFlags              = 'dflg',
+};
+
+// kConnectionFlags values
+enum {
+    kIOConnectionBuiltIn                = 0x00000800,
+    kIOConnectionStereoSync             = 0x00008000
+};
+
+// kConnectionSyncControl values
+enum {
+    kIOHSyncDisable                     = 0x00000001,
+    kIOVSyncDisable                     = 0x00000002,
+    kIOCSyncDisable                     = 0x00000004,
+    kIONoSeparateSyncControl            = 0x00000040,
+    kIOTriStateSyncs                    = 0x00000080,
+    kIOSyncOnBlue                       = 0x00000008,
+    kIOSyncOnGreen                      = 0x00000010,
+    kIOSyncOnRed                        = 0x00000020
+};
+
+// kConnectionHandleDisplayPortEvent values
+enum {
+    kIODPEventStart                             = 1,
+    kIODPEventIdle                              = 2,
+
+    kIODPEventForceRetrain                      = 3,
+
+    kIODPEventRemoteControlCommandPending       = 256,
+    kIODPEventAutomatedTestRequest              = 257,
+    kIODPEventContentProtection                 = 258,
+    kIODPEventMCCS                              = 259,
+    kIODPEventSinkSpecific                      = 260
+};
+
+#define kIODisplayAttributesKey         "IODisplayAttributes"
+
+#define kIODisplaySupportsUnderscanKey  "IODisplaySupportsUnderscan"
+#define kIODisplaySupportsBasicAudioKey "IODisplaySupportsBasicAudio"
+#define kIODisplaySupportsYCbCr444Key   "IODisplaySupportsYCbCr444"
+#define kIODisplaySupportsYCbCr422Key   "IODisplaySupportsYCbCr422"
+
+enum
+{ 
+    kIODisplayColorMode = kConnectionColorMode,
+};
+
+#if 0
+enum
+{
+    // kConnectionColorMode attribute
+    kIODisplayColorModeReserved   = 0x00000000,
+    kIODisplayColorModeRGB        = 0x00000001,
+    kIODisplayColorModeYCbCr422   = 0x00000010,
+    kIODisplayColorModeYCbCr444   = 0x00000100,
+    kIODisplayColorModeRGBLimited = 0x00001000,
+    kIODisplayColorModeAuto       = 0x10000000,
+};
+#endif
+
+enum
+{ 
+    // kConnectionColorDepthsSupported attribute
+    kIODisplayRGBColorComponentBitsUnknown       = 0x00000000,
+    kIODisplayRGBColorComponentBits6             = 0x00000001,
+    kIODisplayRGBColorComponentBits8             = 0x00000002,
+    kIODisplayRGBColorComponentBits10            = 0x00000004,
+    kIODisplayRGBColorComponentBits12            = 0x00000008,
+    kIODisplayRGBColorComponentBits14            = 0x00000010,
+    kIODisplayRGBColorComponentBits16            = 0x00000020,
+
+    kIODisplayYCbCr444ColorComponentBitsUnknown  = 0x00000000,
+    kIODisplayYCbCr444ColorComponentBits6        = 0x00000100,
+    kIODisplayYCbCr444ColorComponentBits8        = 0x00000200,
+    kIODisplayYCbCr444ColorComponentBits10       = 0x00000400,
+    kIODisplayYCbCr444ColorComponentBits12       = 0x00000800,
+    kIODisplayYCbCr444ColorComponentBits14       = 0x00001000,
+    kIODisplayYCbCr444ColorComponentBits16       = 0x00002000,
+
+    kIODisplayYCbCr422ColorComponentBitsUnknown  = 0x00000000,
+    kIODisplayYCbCr422ColorComponentBits6        = 0x00010000,
+    kIODisplayYCbCr422ColorComponentBits8        = 0x00020000,
+    kIODisplayYCbCr422ColorComponentBits10       = 0x00040000,
+    kIODisplayYCbCr422ColorComponentBits12       = 0x00080000,
+    kIODisplayYCbCr422ColorComponentBits14       = 0x00100000,
+    kIODisplayYCbCr422ColorComponentBits16       = 0x00200000,
+};
+
+enum
+{ 
+    // kConnectionDitherControl attribute
+    kIODisplayDitherDisable          = 0x00000000,
+    kIODisplayDitherSpatial          = 0x00000001,
+    kIODisplayDitherTemporal         = 0x00000002,
+    kIODisplayDitherFrameRateControl = 0x00000004,
+    kIODisplayDitherDefault          = 0x00000080,
+    kIODisplayDitherAll              = 0x000000FF,
+    kIODisplayDitherRGBShift         = 0,
+    kIODisplayDitherYCbCr444Shift    = 8,
+    kIODisplayDitherYCbCr422Shift    = 16,
+};
+
+enum
+{ 
+    // kConnectionDisplayFlags attribute
+    kIODisplayNeedsCEAUnderscan      = 0x00000001,
+};
+
+
+#define IO_DISPLAY_CAN_FILL             0x00000040
+#define IO_DISPLAY_CAN_BLIT             0x00000020
+
+#define IO_24BPP_TRANSFER_TABLE_SIZE    256
+#define IO_15BPP_TRANSFER_TABLE_SIZE    256
+#define IO_8BPP_TRANSFER_TABLE_SIZE     256
+#define IO_12BPP_TRANSFER_TABLE_SIZE    256
+#define IO_2BPP_TRANSFER_TABLE_SIZE     256
+
+#define STDFB_BM256_TO_BM38_MAP_SIZE    256
+#define STDFB_BM38_TO_BM256_MAP_SIZE    256
+#define STDFB_BM38_TO_256_WITH_LOGICAL_SIZE     \
+        (STDFB_BM38_TO_BM256_MAP_SIZE + (256/sizeof(int)))
+
+#define STDFB_4BPS_TO_5BPS_MAP_SIZE     16
+#define STDFB_5BPS_TO_4BPS_MAP_SIZE     32
+
+enum {
+    // connection types for IOServiceOpen
+    kIOFBServerConnectType              = 0,
+    kIOFBSharedConnectType              = 1
+};
+
+enum {
+    // options for IOServiceRequestProbe()
+    kIOFBUserRequestProbe               = 0x00000001
+};
+
+struct IOGPoint {
+    SInt16      x;
+    SInt16      y;
+};
+typedef struct IOGPoint IOGPoint;
+
+struct IOGSize {
+    SInt16      width;
+    SInt16      height;
+};
+typedef struct IOGSize IOGSize;
+
+struct IOGBounds {
+    SInt16      minx;
+    SInt16      maxx;
+    SInt16      miny;
+    SInt16      maxy;
+};
+typedef struct IOGBounds IOGBounds;
+
+#ifndef kIODescriptionKey
+
+#if !defined(__Point__) && !defined(BINTREE_H) && !defined(__MACTYPES__)
+#define __Point__
+typedef IOGPoint Point;
+#endif
+
+#if !defined(__Bounds__) && !defined(BINTREE_H) && !defined(__MACTYPES__)
+#define __Bounds__
+typedef IOGBounds Bounds;
+#endif
+
+#endif /* !kIODescriptionKey */
+
+// cursor description
+
+enum {
+   kTransparentEncoding         = 0,
+   kInvertingEncoding
+};
+
+enum {
+   kTransparentEncodingShift    = (kTransparentEncoding << 1),
+   kTransparentEncodedPixel     = (0x01 << kTransparentEncodingShift),
+
+   kInvertingEncodingShift      = (kInvertingEncoding << 1),
+   kInvertingEncodedPixel       = (0x01 << kInvertingEncodingShift)
+};
+
+enum {
+   kHardwareCursorDescriptorMajorVersion        = 0x0001,
+   kHardwareCursorDescriptorMinorVersion        = 0x0000
+};
+
+/*!
+ * @struct IOHardwareCursorDescriptor
+ * @abstract A structure defining the format of a hardware cursor.
+ * @discussion This structure is used by IOFramebuffer to define the format of a hardware cursor.
+ * @field majorVersion Set to kHardwareCursorDescriptorMajorVersion.
+ * @field minorVersion Set to kHardwareCursorDescriptorMinorVersion.
+ * @field height Maximum size of the cursor.
+ * @field width Maximum size of the cursor.
+ * @field bitDepth Number bits per pixel, or a QD/QT pixel type, for example kIO8IndexedPixelFormat, kIO32ARGBPixelFormat.
+ * @field maskBitDepth Unused.
+ * @field numColors Number of colors for indexed pixel types.
+ * @field colorEncodings An array pointer specifying the pixel values corresponding to the indices into the color table, for indexed pixel types.
+ * @field flags None defined, set to zero.
+ * @field supportedSpecialEncodings Mask of supported special pixel values, eg. kTransparentEncodedPixel, kInvertingEncodedPixel.
+ * @field specialEncodings Array of pixel values for each supported special encoding.
+ */
+
+struct IOHardwareCursorDescriptor {
+   UInt16               majorVersion;
+   UInt16               minorVersion;
+   UInt32               height;
+   UInt32               width;
+   UInt32               bitDepth;                       // bits per pixel, or a QD/QT pixel type
+   UInt32               maskBitDepth;                   // unused
+   UInt32               numColors;                      // number of colors in the colorMap. ie. 
+   UInt32 *             colorEncodings;
+   UInt32               flags;
+   UInt32               supportedSpecialEncodings;
+   UInt32               specialEncodings[16];
+};
+typedef struct IOHardwareCursorDescriptor IOHardwareCursorDescriptor;
+
+enum {
+   kHardwareCursorInfoMajorVersion              = 0x0001,
+   kHardwareCursorInfoMinorVersion              = 0x0000
+};
+
+/*!
+ * @struct IOHardwareCursorInfo
+ * @abstract A structure defining the converted data of a hardware cursor.
+ * @discussion This structure is used by IOFramebuffer to return the data of a hardware cursor by convertCursorImage() after conversion based on the IOHardwareCursorDescriptor passed to that routine.
+ * @field majorVersion Set to kHardwareCursorInfoMajorVersion.
+ * @field minorVersion Set to kHardwareCursorInfoMinorVersion.
+ * @field cursorHeight The actual size of the cursor is returned.
+ * @field cursorWidth The actual size of the cursor is returned.
+ * @field colorMap Pointer to array of IOColorEntry structures, with the number of elements set by the numColors field of the IOHardwareCursorDescriptor. Zero should be passed for direct pixel formats.
+ * @field hardwareCursorData Buffer to receive the converted cursor data.
+ * @field cursorHotSpotX Cursor's hotspot.
+ * @field cursorHotSpotY Cursor's hotspot.
+ * @field reserved Reserved, set to zero.
+ */
+
+struct IOHardwareCursorInfo {
+   UInt16               majorVersion;
+   UInt16               minorVersion;
+   UInt32               cursorHeight;
+   UInt32               cursorWidth;
+   // nil or big enough for hardware's max colors
+   IOColorEntry *       colorMap;
+   UInt8 *              hardwareCursorData;
+   UInt16               cursorHotSpotX;
+   UInt16               cursorHotSpotY;
+   UInt32               reserved[5];
+};
+typedef struct IOHardwareCursorInfo IOHardwareCursorInfo;
+
+// interrupt types
+
+enum {
+    kIOFBVBLInterruptType               = 'vbl ',
+    kIOFBHBLInterruptType               = 'hbl ',
+    kIOFBFrameInterruptType             = 'fram',
+    // Demand to check configuration (Hardware unchanged)
+    kIOFBConnectInterruptType           = 'dci ',
+    // Demand to rebuild (Hardware has reinitialized on dependent change)
+    kIOFBChangedInterruptType           = 'chng',
+    // Demand to remove framebuffer (Hardware not available on dependent change -- but must not buserror)
+    kIOFBOfflineInterruptType           = 'remv',
+    // Notice that hardware is available (after being removed)
+    kIOFBOnlineInterruptType            = 'add ',
+    // DisplayPort short pulse
+    kIOFBDisplayPortInterruptType           = 'dpir',
+    // DisplayPort link event
+    kIOFBDisplayPortLinkChangeInterruptType = 'dplk',
+    // MCCS
+    kIOFBMCCSInterruptType                  = 'mccs'
+};
+
+// IOAppleTimingID's
+enum {
+    kIOTimingIDInvalid               = 0,       /*  Not a standard timing */
+    kIOTimingIDApple_FixedRateLCD    = 42,      /*  Lump all fixed-rate LCDs into one category.*/
+    kIOTimingIDApple_512x384_60hz    = 130,     /*  512x384  (60 Hz) Rubik timing. */
+    kIOTimingIDApple_560x384_60hz    = 135,     /*  560x384  (60 Hz) Rubik-560 timing. */
+    kIOTimingIDApple_640x480_67hz    = 140,     /*  640x480  (67 Hz) HR timing. */
+    kIOTimingIDApple_640x400_67hz    = 145,     /*  640x400  (67 Hz) HR-400 timing. */
+    kIOTimingIDVESA_640x480_60hz     = 150,     /*  640x480  (60 Hz) VGA timing. */
+    kIOTimingIDVESA_640x480_72hz     = 152,     /*  640x480  (72 Hz) VGA timing. */
+    kIOTimingIDVESA_640x480_75hz     = 154,     /*  640x480  (75 Hz) VGA timing. */
+    kIOTimingIDVESA_640x480_85hz     = 158,     /*  640x480  (85 Hz) VGA timing. */
+    kIOTimingIDGTF_640x480_120hz     = 159,     /*  640x480  (120 Hz) VESA Generalized Timing Formula */
+    kIOTimingIDApple_640x870_75hz    = 160,     /*  640x870  (75 Hz) FPD timing.*/
+    kIOTimingIDApple_640x818_75hz    = 165,     /*  640x818  (75 Hz) FPD-818 timing.*/
+    kIOTimingIDApple_832x624_75hz    = 170,     /*  832x624  (75 Hz) GoldFish timing.*/
+    kIOTimingIDVESA_800x600_56hz     = 180,     /*  800x600  (56 Hz) SVGA timing. */
+    kIOTimingIDVESA_800x600_60hz     = 182,     /*  800x600  (60 Hz) SVGA timing. */
+    kIOTimingIDVESA_800x600_72hz     = 184,     /*  800x600  (72 Hz) SVGA timing. */
+    kIOTimingIDVESA_800x600_75hz     = 186,     /*  800x600  (75 Hz) SVGA timing. */
+    kIOTimingIDVESA_800x600_85hz     = 188,     /*  800x600  (85 Hz) SVGA timing. */
+    kIOTimingIDVESA_1024x768_60hz    = 190,     /* 1024x768  (60 Hz) VESA 1K-60Hz timing. */
+    kIOTimingIDVESA_1024x768_70hz    = 200,     /* 1024x768  (70 Hz) VESA 1K-70Hz timing. */
+    kIOTimingIDVESA_1024x768_75hz    = 204,     /* 1024x768  (75 Hz) VESA 1K-75Hz timing (very similar to kIOTimingIDApple_1024x768_75hz). */
+    kIOTimingIDVESA_1024x768_85hz    = 208,     /* 1024x768  (85 Hz) VESA timing. */
+    kIOTimingIDApple_1024x768_75hz   = 210,     /* 1024x768  (75 Hz) Apple 19" RGB. */
+    kIOTimingIDApple_1152x870_75hz   = 220,     /* 1152x870  (75 Hz) Apple 21" RGB. */
+    kIOTimingIDAppleNTSC_ST          = 230,     /*  512x384  (60 Hz, interlaced, non-convolved). */
+    kIOTimingIDAppleNTSC_FF          = 232,     /*  640x480  (60 Hz, interlaced, non-convolved). */
+    kIOTimingIDAppleNTSC_STconv      = 234,     /*  512x384  (60 Hz, interlaced, convolved). */
+    kIOTimingIDAppleNTSC_FFconv      = 236,     /*  640x480  (60 Hz, interlaced, convolved). */
+    kIOTimingIDApplePAL_ST           = 238,     /*  640x480  (50 Hz, interlaced, non-convolved). */
+    kIOTimingIDApplePAL_FF           = 240,     /*  768x576  (50 Hz, interlaced, non-convolved). */
+    kIOTimingIDApplePAL_STconv       = 242,     /*  640x480  (50 Hz, interlaced, convolved). */
+    kIOTimingIDApplePAL_FFconv       = 244,     /*  768x576  (50 Hz, interlaced, convolved). */
+    kIOTimingIDVESA_1280x960_75hz    = 250,     /* 1280x960  (75 Hz) */
+    kIOTimingIDVESA_1280x960_60hz    = 252,     /* 1280x960  (60 Hz) */
+    kIOTimingIDVESA_1280x960_85hz    = 254,     /* 1280x960  (85 Hz) */
+    kIOTimingIDVESA_1280x1024_60hz   = 260,     /* 1280x1024 (60 Hz) */
+    kIOTimingIDVESA_1280x1024_75hz   = 262,     /* 1280x1024 (75 Hz) */
+    kIOTimingIDVESA_1280x1024_85hz   = 268,     /* 1280x1024 (85 Hz) */
+    kIOTimingIDVESA_1600x1200_60hz   = 280,     /* 1600x1200 (60 Hz) VESA timing. */
+    kIOTimingIDVESA_1600x1200_65hz   = 282,     /* 1600x1200 (65 Hz) VESA timing. */
+    kIOTimingIDVESA_1600x1200_70hz   = 284,     /* 1600x1200 (70 Hz) VESA timing. */
+    kIOTimingIDVESA_1600x1200_75hz   = 286,     /* 1600x1200 (75 Hz) VESA timing (pixel clock is 189.2 Mhz dot clock). */
+    kIOTimingIDVESA_1600x1200_80hz   = 288,     /* 1600x1200 (80 Hz) VESA timing (pixel clock is 216>? Mhz dot clock) - proposed only. */
+    kIOTimingIDVESA_1600x1200_85hz   = 289,     /* 1600x1200 (85 Hz) VESA timing (pixel clock is 229.5 Mhz dot clock). */
+    kIOTimingIDVESA_1792x1344_60hz   = 296,     /* 1792x1344 (60 Hz) VESA timing (204.75 Mhz dot clock). */
+    kIOTimingIDVESA_1792x1344_75hz   = 298,     /* 1792x1344 (75 Hz) VESA timing (261.75 Mhz dot clock). */
+    kIOTimingIDVESA_1856x1392_60hz   = 300,     /* 1856x1392 (60 Hz) VESA timing (218.25 Mhz dot clock). */
+    kIOTimingIDVESA_1856x1392_75hz   = 302,     /* 1856x1392 (75 Hz) VESA timing (288 Mhz dot clock). */
+    kIOTimingIDVESA_1920x1440_60hz   = 304,     /* 1920x1440 (60 Hz) VESA timing (234 Mhz dot clock). */
+    kIOTimingIDVESA_1920x1440_75hz   = 306,     /* 1920x1440 (75 Hz) VESA timing (297 Mhz dot clock). */
+    kIOTimingIDSMPTE240M_60hz        = 400,     /* 60Hz V, 33.75KHz H, interlaced timing, 16:9 aspect, typical resolution of 1920x1035. */
+    kIOTimingIDFilmRate_48hz         = 410,     /* 48Hz V, 25.20KHz H, non-interlaced timing, typical resolution of 640x480. */
+    kIOTimingIDSony_1600x1024_76hz   = 500,     /* 1600x1024 (76 Hz) Sony timing (pixel clock is 170.447 Mhz dot clock). */
+    kIOTimingIDSony_1920x1080_60hz   = 510,     /* 1920x1080 (60 Hz) Sony timing (pixel clock is 159.84 Mhz dot clock). */
+    kIOTimingIDSony_1920x1080_72hz   = 520,     /* 1920x1080 (72 Hz) Sony timing (pixel clock is 216.023 Mhz dot clock). */
+    kIOTimingIDSony_1920x1200_76hz   = 540,     /* 1900x1200 (76 Hz) Sony timing (pixel clock is 243.20 Mhz dot clock). */
+    kIOTimingIDApple_0x0_0hz_Offline = 550,     /* Indicates that this timing will take the display off-line and remove it from the system. */
+    kIOTimingIDVESA_848x480_60hz     = 570,     /*  848x480 (60 Hz)  VESA timing. */
+    kIOTimingIDVESA_1360x768_60hz    = 590      /* 1360x768 (60 Hz)  VESA timing. */
+};
+
+// framebuffer property keys
+
+#define kIOFramebufferInfoKey           "IOFramebufferInformation"
+
+#define kIOFBWidthKey                   "IOFBWidth"
+#define kIOFBHeightKey                  "IOFBHeight"
+#define kIOFBRefreshRateKey             "IOFBRefreshRate"
+#define kIOFBFlagsKey                   "IOFBFlags"
+#define kIOFBBytesPerRowKey             "IOFBBytesPerRow"
+#define kIOFBBytesPerPlaneKey           "IOFBBytesPerPlane"
+#define kIOFBBitsPerPixelKey            "IOFBBitsPerPixel"
+#define kIOFBComponentCountKey          "IOFBComponentCount"
+#define kIOFBBitsPerComponentKey        "IOFBBitsPerComponent"
+
+#define kIOFBDetailedTimingsKey         "IOFBDetailedTimings"
+#define kIOFBTimingRangeKey             "IOFBTimingRange"
+#define kIOFBScalerInfoKey              "IOFBScalerInfo"
+#define kIOFBCursorInfoKey              "IOFBCursorInfo"
+
+#define kIOFBHostAccessFlagsKey         "IOFBHostAccessFlags"
+
+#define kIOFBMemorySizeKey              "IOFBMemorySize"
+
+#define kIOFBProbeOptionsKey            "IOFBProbeOptions"
+
+#define kIOFBGammaWidthKey              "IOFBGammaWidth"
+#define kIOFBGammaCountKey              "IOFBGammaCount"
+#define kIOFBCLUTDeferKey               "IOFBCLUTDefer"
+        
+// exists on the hibernate progress display device
+#ifndef kIOHibernatePreviewActiveKey
+#define kIOHibernatePreviewActiveKey    "IOHibernatePreviewActive"
+// values for kIOHibernatePreviewActiveKey set by driver
+enum {
+    kIOHibernatePreviewActive  = 0x00000001,
+    kIOHibernatePreviewUpdates = 0x00000002
+};
+#endif
+
+// CFNumber/CFData
+#define kIOFBAVSignalTypeKey            "av-signal-type"
+enum {
+    kIOFBAVSignalTypeUnknown = 0x00000000,
+    kIOFBAVSignalTypeVGA     = 0x00000001,
+    kIOFBAVSignalTypeDVI     = 0x00000002,
+    kIOFBAVSignalTypeHDMI    = 0x00000008,
+    kIOFBAVSignalTypeDP      = 0x00000010,
+};
+
+// diagnostic keys
+
+#define kIOFBConfigKey                  "IOFBConfig"
+#define kIOFBModesKey                   "IOFBModes"
+#define kIOFBModeIDKey                  "ID"
+#define kIOFBModeDMKey                  "DM"
+#define kIOFBModeTMKey                  "TM"
+#define kIOFBModeAIDKey                 "AID"
+#define kIOFBModeDFKey                  "DF"
+
+// display property keys
+
+#define kIODisplayEDIDKey               "IODisplayEDID"
+#define kIODisplayLocationKey           "IODisplayLocation"             // CFString
+#define kIODisplayConnectFlagsKey       "IODisplayConnectFlags"         // CFNumber
+#define kIODisplayHasBacklightKey       "IODisplayHasBacklight"         // CFBoolean
+#define kIODisplayIsDigitalKey          "IODisplayIsDigital"            // CFBoolean
+#define kDisplayBundleKey               "DisplayBundle"
+
+#define kAppleDisplayTypeKey            "AppleDisplayType"
+#define kAppleSenseKey                  "AppleSense"
+
+#define kIODisplayMCCSVersionKey                "IODisplayMCCSVersion"
+#define kIODisplayTechnologyTypeKey             "IODisplayTechnologyType"
+#define kIODisplayUsageTimeKey                  "IODisplayUsageTime"
+#define kIODisplayFirmwareLevelKey              "IODisplayFirmwareLevel"
+
+enum {
+    kDisplayVendorIDUnknown     = 'unkn',
+    kDisplayProductIDGeneric    = 0x717
+};
+
+#define kDisplayVendorID                "DisplayVendorID"        // CFNumber
+#define kDisplayProductID               "DisplayProductID"       // CFNumber
+#define kDisplaySerialNumber            "DisplaySerialNumber"    // CFNumber
+#define kDisplaySerialString            "DisplaySerialString"    // CFString
+#define kDisplayWeekOfManufacture       "DisplayWeekManufacture" // CFNumber
+#define kDisplayYearOfManufacture       "DisplayYearManufacture" // CFNumber
+
+// CFDictionary of language-locale keys, name values
+// eg. "en"="Color LCD", "en-GB"="Colour LCD"
+#define kDisplayProductName             "DisplayProductName"
+
+// all CFNumber or CFArray of CFNumber (floats)
+#define kDisplayWhitePointX             "DisplayWhitePointX"
+#define kDisplayWhitePointY             "DisplayWhitePointY"
+#define kDisplayRedPointX               "DisplayRedPointX"
+#define kDisplayRedPointY               "DisplayRedPointY"
+#define kDisplayGreenPointX             "DisplayGreenPointX"
+#define kDisplayGreenPointY             "DisplayGreenPointY"
+#define kDisplayBluePointX              "DisplayBluePointX"
+#define kDisplayBluePointY              "DisplayBluePointY"
+#define kDisplayWhiteGamma              "DisplayWhiteGamma"
+#define kDisplayRedGamma                "DisplayRedGamma"
+#define kDisplayGreenGamma              "DisplayGreenGamma"
+#define kDisplayBlueGamma               "DisplayBlueGamma"
+
+// Display gamma
+#define kDisplayGammaChannels           "DisplayGammaChannels"    // CFNumber 1 or 3 channel count
+#define kDisplayGammaEntryCount         "DisplayGammaEntryCount"  // CFNumber 1-based count of entries per channel
+#define kDisplayGammaEntrySize          "DisplayGammaEntrySize"   // CFNumber size in bytes of each table entry
+#define kDisplayGammaTable              "DisplayGammaTable"       // CFData
+
+// CFBoolean
+#define kDisplayBrightnessAffectsGamma  "DisplayBrightnessAffectsGamma"
+#define kDisplayViewAngleAffectsGamma   "DisplayViewAngleAffectsGamma"
+
+// CFData
+#define kDisplayCSProfile               "DisplayCSProfile"
+
+// CFNumber
+#define kDisplayHorizontalImageSize     "DisplayHorizontalImageSize"
+#define kDisplayVerticalImageSize       "DisplayVerticalImageSize"
+
+// Pixel description
+
+// CFBoolean
+#define kDisplayFixedPixelFormat        "DisplayFixedPixelFormat"
+
+enum {
+    kDisplaySubPixelLayoutUndefined     = 0x00000000,
+    kDisplaySubPixelLayoutRGB           = 0x00000001,
+    kDisplaySubPixelLayoutBGR           = 0x00000002,
+    kDisplaySubPixelLayoutQuadGBL       = 0x00000003,
+    kDisplaySubPixelLayoutQuadGBR       = 0x00000004,
+
+    kDisplaySubPixelConfigurationUndefined    = 0x00000000,
+    kDisplaySubPixelConfigurationDelta        = 0x00000001,
+    kDisplaySubPixelConfigurationStripe       = 0x00000002,
+    kDisplaySubPixelConfigurationStripeOffset = 0x00000003,
+    kDisplaySubPixelConfigurationQuad         = 0x00000004,
+
+    kDisplaySubPixelShapeUndefined      = 0x00000000,
+    kDisplaySubPixelShapeRound          = 0x00000001,
+    kDisplaySubPixelShapeSquare         = 0x00000002,
+    kDisplaySubPixelShapeRectangular    = 0x00000003,
+    kDisplaySubPixelShapeOval           = 0x00000004,
+    kDisplaySubPixelShapeElliptical     = 0x00000005
+};
+
+// CFNumbers
+#define kDisplaySubPixelLayout          "DisplaySubPixelLayout"
+#define kDisplaySubPixelConfiguration   "DisplaySubPixelConfiguration"
+#define kDisplaySubPixelShape           "DisplaySubPixelShape"
+
+#define kIODisplayOverrideMatchingKey   "IODisplayOverrideMatching"
+
+// Display parameters
+
+#define kIODisplayParametersKey         "IODisplayParameters"
+#define kIODisplayGUIDKey               "IODisplayGUID"
+
+#define kIODisplayValueKey              "value"
+#define kIODisplayMinValueKey           "min"
+#define kIODisplayMaxValueKey           "max"
+
+#define kIODisplayBrightnessKey         "brightness"
+#define kIODisplayContrastKey           "contrast"
+#define kIODisplayHorizontalPositionKey "horizontal-position"
+#define kIODisplayHorizontalSizeKey     "horizontal-size"
+#define kIODisplayVerticalPositionKey   "vertical-position"
+#define kIODisplayVerticalSizeKey       "vertical-size"
+#define kIODisplayTrapezoidKey          "trapezoid"
+#define kIODisplayPincushionKey         "pincushion"
+#define kIODisplayParallelogramKey      "parallelogram"
+#define kIODisplayRotationKey           "rotation"
+#define kIODisplayTheatreModeKey        "theatre-mode"
+#define kIODisplayTheatreModeWindowKey  "theatre-mode-window"
+#define kIODisplayOverscanKey           "oscn"
+#define kIODisplayVideoBestKey          "vbst"
+
+#define kIODisplaySpeakerVolumeKey              "speaker-volume"
+#define kIODisplaySpeakerSelectKey              "speaker-select"
+#define kIODisplayMicrophoneVolumeKey           "microphone-volume"
+#define kIODisplayAmbientLightSensorKey         "ambient-light-sensor"
+#define kIODisplayAudioMuteAndScreenBlankKey    "audio-mute-and-screen-blank"
+#define kIODisplayAudioTrebleKey                "audio-treble"
+#define kIODisplayAudioBassKey                  "audio-bass"
+#define kIODisplayAudioBalanceLRKey             "audio-balance-LR"
+#define kIODisplayAudioProcessorModeKey         "audio-processor-mode"
+#define kIODisplayPowerModeKey                  "power-mode"
+#define kIODisplayManufacturerSpecificKey       "manufacturer-specific"
+
+
+#define kIODisplayRedGammaScaleKey      "rgsc"
+#define kIODisplayGreenGammaScaleKey    "ggsc"
+#define kIODisplayBlueGammaScaleKey     "bgsc"
+
+#define kIODisplayParametersCommitKey   "commit"
+#define kIODisplayParametersDefaultKey  "defaults"
+#define kIODisplayParametersFlushKey    "flush"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ! _IOKIT_IOGRAPHICSTYPES_H */
diff --git a/i386/include/IOKit/hid/IOHIDDevice.h b/i386/include/IOKit/hid/IOHIDDevice.h
new file mode 100644
index 0000000..29f0024
--- /dev/null
+++ b/i386/include/IOKit/hid/IOHIDDevice.h
@@ -0,0 +1,706 @@
+/*
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_HID_IOHIDDEVICE_H
+#define _IOKIT_HID_IOHIDDEVICE_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/hidsystem/IOHIDDescriptorParser.h>
+#include <IOKit/hid/IOHIDKeys.h>
+
+class   IOHIDSystem;
+class   IOHIDPointing;
+class   IOHIDKeyboard;
+class   IOHIDConsumer;
+class   IOHIDElementPrivate;
+class   IOHIDEventQueue;
+class   IOHIDInterface;
+class   IOHIDDeviceShim;
+struct  IOHIDReportHandler;
+
+/*!
+    @typedef IOHIDCompletionAction
+    @abstract Function called when set/get report completes
+    @param target The target specified in the IOHIDCompletion struct.
+    @param parameter The parameter specified in the IOHIDCompletion struct.
+    @param status Completion status
+*/
+typedef void (*IOHIDCompletionAction)(
+                void *			target,
+                void *			parameter,
+                IOReturn		status,
+                UInt32			bufferSizeRemaining);
+
+/*!
+    @typedef IOHIDCompletion
+    @abstract Struct spefifying action to perform when set/get report completes.
+    @param target The target to pass to the action function.
+    @param action The function to call.
+    @param parameter The parameter to pass to the action function.
+*/
+typedef struct IOHIDCompletion {
+    void * 			target;
+    IOHIDCompletionAction	action;
+    void *			parameter;
+} IOHIDCompletion;
+
+/*!
+    @enum IOHIDReportOption
+    @abstract Option bits for IOHIDDevice::handleReport, 
+    IOHIDDevice::getReport, and IOHIDDevice::setReport
+    @constant kIOHIDReportOptionNotInterrupt Tells method that the report
+    passed was not interrupt driven.
+*/
+enum
+{
+    kIOHIDReportOptionNotInterrupt	= 0x100
+};
+
+
+/*! @class IOHIDDevice : public IOService
+    @abstract IOHIDDevice defines a Human Interface Device (HID) object,
+    which will interact with the HID Manager by publishing static properties
+    in the registry, and also by reporting HID events through shared memory.
+    IOHIDDevice is an abstract class that must be subclassed to support a
+    specific type of HID devices, such as USB HID class devices.
+    <br>
+    Since most HID devices are expected to be USB devices, IOHIDDevice
+    uses the USB HID specification to define the format of the report
+    descriptor, and also reports that are used to communicate with the
+    hardware via some intervening transport layer. However, there is no
+    mandate that the transport layer must be restricted to USB. A subclass
+    may be created to support legacy ADB joysticks, and issue packets on
+    the ADB bus and translate those packets to USB reports, and vice versa.
+    IOHIDDevice does not care how those reports are generated or consumed
+    by the physical device, as long as the reports abide to the USB
+    specification. */
+
+class IOHIDDevice : public IOService
+{
+    OSDeclareDefaultStructors( IOHIDDevice )
+
+    friend class IOHIDLibUserClient;
+    friend class IOHIDDeviceShim;
+    
+private:
+    OSArray *                   _elementArray;
+    UInt32                      _dataElementIndex;
+    IORecursiveLock *           _elementLock;
+    IOHIDReportHandler *        _reportHandlers;
+    IOBufferMemoryDescriptor *  _elementValuesDescriptor;
+    bool                        _readyForInputReports;
+    UInt32                      _reportCount;
+    UInt32                      _maxInputReportSize;
+    UInt32                      _maxOutputReportSize;
+    UInt32                      _maxFeatureReportSize;
+
+    struct ExpansionData { 
+        OSSet *                 clientSet;
+        IOService *             seizedClient;
+        AbsoluteTime            eventDeadline;
+        IONotifier *            publishNotify;
+        OSArray *               inputInterruptElementArray;
+		bool                    performTickle;
+		IOHIDInterface *        interfaceNub;
+        IOHIDElementPrivate *   rollOverElement;
+        OSArray *               hierarchElements;
+    };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData * _reserved;
+    
+    // HID report descriptor parsing support.
+
+    bool linkToParent( const OSArray * array,
+                       UInt32          parentIndex,
+                       UInt32          childIndex );
+
+    bool createCollectionElements( HIDPreparsedDataRef parseData,
+                                   OSArray *           array,
+                                   UInt32              maxCount );
+
+    bool createValueElements( HIDPreparsedDataRef parseData,
+                              OSArray *           array,
+                              UInt32              hidReportType,
+                              IOHIDElementType    elementType,
+                              UInt32              maxCount );
+
+    bool createButtonElements( HIDPreparsedDataRef parseData,
+                               OSArray *           array,
+                               UInt32              hidReportType,
+                               IOHIDElementType    elementType,
+                               UInt32              maxCount );
+                               
+    bool createReportHandlerElements( HIDPreparsedDataRef parseData);
+
+    OSArray * newDeviceUsagePairs();
+
+    bool getReportCountAndSizes( HIDPreparsedDataRef parseData );
+
+    bool setReportSize( UInt8           reportID,
+                        IOHIDReportType reportType,
+                        UInt32          bits );
+
+    IOReturn createElementHierarchy( HIDPreparsedDataRef parseData );
+
+    IOReturn parseReportDescriptor( IOMemoryDescriptor * report,
+                                    IOOptionBits         options = 0 );
+
+    IOBufferMemoryDescriptor * createMemoryForElementValues();
+
+    
+    static bool _publishNotificationHandler( void * target, 
+				void * ref, IOService * newService );
+    
+protected:
+
+/*! @function free
+    @abstract Free the IOHIDDevice object.
+    @discussion Release all resources that were previously allocated,
+    then call super::free() to propagate the call to our superclass. */
+
+    virtual void free();
+
+/*! @function handleOpen
+    @abstract Handle a client open on the interface.
+    @discussion This method is called by IOService::open() with the
+    arbitration lock held, and must return true to accept the client open.
+    This method will in turn call handleClientOpen() to qualify the client
+    requesting the open.
+    @param client The client object that requested the open.
+    @param options Options passed to IOService::open().
+    @param argument Argument passed to IOService::open().
+    @result true to accept the client open, false otherwise. */
+
+    virtual bool handleOpen(IOService *  client,
+                            IOOptionBits options,
+                            void *       argument);
+
+/*! @function handleClose
+    @abstract Handle a client close on the interface.
+    @discussion This method is called by IOService::close() with the
+    arbitration lock held. This method will in turn call handleClientClose()
+    to notify interested subclasses about the client close. If this represents
+    the last close, then the interface will also close the controller before
+    this method returns. The controllerWillClose() method will be called before
+    closing the controller. Subclasses should not override this method.
+    @param client The client object that requested the close.
+    @param options Options passed to IOService::close(). */
+
+    virtual void handleClose(IOService * client, IOOptionBits options);
+
+/*! @function handleIsOpen
+    @abstract Query whether a client has an open on the interface.
+    @discussion This method is always called by IOService with the
+    arbitration lock held. Subclasses should not override this method.
+    @result true if the specified client, or any client if none (0) is
+    specified, presently has an open on this object. */
+
+    virtual bool handleIsOpen(const IOService * client) const;
+
+/*! @function handleStart
+    @abstract Prepare the hardware and driver to support I/O operations.
+    @discussion IOHIDDevice will call this method from start() before
+    any I/O operations are issued to the concrete subclass. Methods
+    such as newReportDescriptor() are only called after handleStart()
+    has returned true. A subclass that overrides this method should
+    begin its implementation by calling the version in super, and
+    then check the return value.
+    @param provider The provider argument passed to start().
+    @result True on success, or false otherwise. Returning false will
+    cause start() to fail and return false. */
+
+    virtual bool handleStart( IOService * provider );
+
+/*! @function handleStop
+    @abstract Quiesce the hardware and stop the driver.
+    @discussion IOHIDDevice will call this method from stop() to
+    signal that the hardware should be quiesced and the driver stopped.
+    A subclass that overrides this method should end its implementation
+    by calling the version in super.
+    @param provider The provider argument passed to stop(). */
+
+    virtual void handleStop(  IOService * provider );
+
+/*! @function newUserClient
+    @abstract Handle a request to create a connection for a non kernel
+    client.
+    @discussion Create a new IOUserClient, or a subclass of IOUserClient,
+    to service a connection to a non kernel client. This implementation
+    will simply call the implementation in IOService to handle the call.
+    @param owningTask The mach task requesting the connection.
+    @param security_id A token representing the access level for the task.
+    @param type A constant specifying the type of connection to be created.
+    @param properties A dictionary of additional properties for the connection.
+    @param handler The IOUserClient object returned.
+    @result The return from IOService::newUserClient() is returned. */
+
+    virtual IOReturn newUserClient( task_t          owningTask,
+                                   void *          security_id,
+                                   UInt32          type,
+                                   OSDictionary *  properties,
+                                   IOUserClient ** handler );
+    IOReturn newUserClientGated(task_t          owningTask,
+                                void *          security_id,
+                                OSDictionary *  properties,
+                                IOUserClient ** handler );
+    
+/*! @function publishProperties
+    @abstract Publish HID properties to the I/O Kit registry.
+    @discussion Called by the start() method to fetch and publish all
+    HID properties to the I/O Kit registry. These properties will allow
+    the HID Manager to identify all HID device(s) in the system, by
+    iterating through objects that are subclasses of IOHIDDevice, and
+    then fetch their published property values. The implementation in
+    IOHIDDevice will call methods to get each individual HID property,
+    and subclasses will not normally need to override this method.
+    @param provider The provider argument passed to start().
+    @result True to indicate that all properties were discovered and
+    published to the registry, false otherwise. Returning false will
+    cause start() to fail and return false. */
+
+    virtual bool publishProperties( IOService * provider );
+
+public:
+
+/*! @function init
+    @abstract Initialize an IOHIDDevice object.
+    @discussion Prime the IOHIDDevice object and prepare it to support
+    a probe() or a start() call. This implementation will simply call
+    super::init().
+    @param A dictionary A property table associated with this IOHIDDevice
+    instance.
+    @result True on sucess, or false otherwise. */
+
+    virtual bool init( OSDictionary * dictionary = 0 );
+
+/*! @function start
+    @abstract Start up the driver using the given provider.
+    @discussion IOHIDDevice will allocate resources, then call handleStart()
+    before fetching the report descriptor through newReportDescriptor(), and
+    publishing HID properties to the registry. Before returning true to 
+    indicate success, registerService() is called to trigger client matching.
+    Subclasses are recommended to override handleStart().
+    @param provider The provider that the driver was matched to, and selected
+    to run with.
+    @result True on success, or false otherwise. */
+
+    virtual bool start( IOService * provider );
+
+/*! @function stop
+    @abstract Called by a provider (during its termination) before detaching
+    all its clients.
+    @discussion IOHIDDevice will call handleStop(), then release allocated
+    resources. Subclasses are recommended to override handleStop().
+    @param provider The provider that the driver was started on. */
+
+    virtual void stop( IOService * provider );
+    
+/*! @function matchPropertyTable
+    @abstract Called by the provider during a match
+    @discussion Compare the properties in the supplied table to this 
+    object's properties.
+    @param table The property table that this device will match against
+*/
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);    
+
+/*! @function newTransportString
+    @abstract Returns a string object that describes the transport
+    layer used by the HID device.
+    @result A string object. The caller must decrement the retain count
+    on the object returned. */
+
+    virtual OSString * newTransportString() const;
+    
+/*! @function newManufacturerString
+    @abstract Returns a string object that describes the manufacturer
+    of the HID device.
+    @result A string object. The caller must decrement the retain count
+    on the object returned. */
+
+    virtual OSString * newManufacturerString() const;
+
+/*! @function newProductString
+    @abstract Returns a string object that describes the product
+    of the HID device.
+    @result A string object. The caller must decrement the retain count
+    on the object returned. */
+
+    virtual OSString * newProductString() const;
+
+/*! @function newVendorIDNumber
+    @abstract Returns a number object that describes the vendor ID
+    of the HID device.
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */
+
+    virtual OSNumber * newVendorIDNumber() const;
+
+/*! @function newProductIDNumber
+    @abstract Returns a number object that describes the product ID
+    of the HID device.
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */
+
+    virtual OSNumber * newProductIDNumber() const;
+
+/*! @function newVersionNumber
+    @abstract Returns a number object that describes the version number
+    of the HID device.
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */
+
+    virtual OSNumber * newVersionNumber() const;
+
+//  *** THIS HAS BEEN DEPRECATED.  PLEASE USE newSerialNumberString ***
+/*! @function newSerialNumber
+    @abstract THIS HAS BEEN DEPRECATED.  PLEASE USE newSerialNumberString.
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */
+
+    virtual OSNumber * newSerialNumber() const;
+
+/*! @function newPrimaryUsageNumber
+    @abstract Returns a number object that describes the primary usage
+    of the HID device.
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */
+
+    virtual OSNumber * newPrimaryUsageNumber() const;
+
+/*! @function newPrimaryUsagePageNumber
+    @abstract Returns a number object that describes the primary usage
+    page of the HID device.
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */
+
+    virtual OSNumber * newPrimaryUsagePageNumber() const;
+
+/*! @function newReportDescriptor
+    @abstract Create and return a new memory descriptor that describes the
+    report descriptor for the HID device.
+    @discussion A subclass must override this pure virtual function, and
+    return a memory descriptor that describes the HID report descriptor as
+    defined by the USB Device Class Definition for Human Interface Devices
+    Version 1.1 specification.
+    @param descriptor Pointer to the memory descriptor returned. This
+    memory descriptor will be released by the caller.
+    @result kIOReturnSuccess on success, or an error return otherwise. */
+
+    virtual IOReturn newReportDescriptor(
+                        IOMemoryDescriptor ** descriptor ) const = 0;
+
+/*! @function handleReport
+    @abstract Handle an asynchronous report received from the HID device.
+    @param report A memory descriptor that describes the report.
+    @param reportType The type of report.
+    @param options Options to specify the request. No options are
+    currently defined, and the default value is 0.
+    @result kIOReturnSuccess on success, or an error return otherwise. */
+
+	virtual IOReturn handleReport(
+                     IOMemoryDescriptor * report,
+	                 IOHIDReportType      reportType = kIOHIDReportTypeInput,
+	                 IOOptionBits         options    = 0 );
+
+/*! @function getReport
+    @abstract Get a report from the HID device.
+    @discussion A completion parameter may be added in the future.
+    @param report A memory descriptor that describes the memory to store
+    the report read from the HID device.
+    @param reportType The report type.
+    @param options The lower 8 bits will represent the Report ID.  The
+    other 24 bits are options to specify the request.
+    @result kIOReturnSuccess on success, or an error return otherwise. */
+
+    virtual IOReturn getReport( IOMemoryDescriptor * report,
+                                IOHIDReportType      reportType,
+                                IOOptionBits         options );
+
+/*! @function setReport
+    @abstract Send a report to the HID device.
+    @discussion A completion parameter may be added in the future.
+    @param report A memory descriptor that describes the report to send
+    to the HID device.
+    @param reportType The report type.
+    @param options The lower 8 bits will represent the Report ID.  The
+    other 24 bits are options to specify the request.
+    @result kIOReturnSuccess on success, or an error return otherwise. */
+
+    virtual IOReturn setReport( IOMemoryDescriptor * report,
+                                IOHIDReportType      reportType,
+                                IOOptionBits         options = 0 );
+
+/*! @function getMemoryWithCurrentElementValues
+    @abstract Get a reference to a memory descriptor that describes the
+    memory block containing the current HID element values.
+    @discussion Each HID element that can contribute to an input, output,
+    or feature report, is assigned an area of memory from a common memory
+    block allocated by IOHIDDevice. Each element will use its assigned
+    memory area to store its current value, defined by an IOHIDElementValue
+    structure. The memory described by the memory descriptor may be mapped
+    to user space to allow the HID Manager to poll the current element
+    value without the cost of a user-kernel transition. Subclasses should
+    not override this method.
+    @result A reference to a memory descriptor that describes the current
+    element values, or 0 to indicate a resource shortage. */
+
+    virtual IOMemoryDescriptor * getMemoryWithCurrentElementValues() const;
+
+/*! @function registerElement
+    @abstract A registration function called by a HID element to register
+    itself, and also to obtain an unique cookie identifier
+    (unique per device, not unique system-wide).
+    @discussion An internal data type, an IOHIDElementPrivate, is created to
+    represent each HID element discovered by parsing the HID report
+    descriptor. Each element created will call this method to register
+    itself with its owner (IOHIDDevice), and also to obtain an element
+    cookie that is used by HID Manager to specify and identify the element.
+    Subclasses should not override this method.
+    @param element The element that is requesting registration with its
+    owner.
+    @param cookie Pointer to the returned cookie assigned to this element.
+    @result True on success, or false otherwise. */
+
+    virtual bool registerElement( IOHIDElementPrivate * element,
+                                  IOHIDElementCookie * cookie );
+
+/*! @function startEventDelivery
+    @abstract Start delivering events from a HID element to the event
+    queue specified.
+    @discussion Clients of IOHIDDevice may create an IOHIDEventQueue, and
+    then call this method to register for delivery of events generated by
+    one or more HID elements to that event queue. Subclasses should not
+    override this method.
+    @param queue The event queue that is interested in receiving events
+    generated by the HID element specified. The retain count on the queue
+    will be incremented by one.
+    @param cookie The cookie for a HID element published by the HID device.
+    @param options Options to specify the request. No options are currently
+    defined, and the default value is zero.
+    @result kIOReturnSuccess on success, or kIOReturnBadArgument if the
+    queue or the cookie argument specified is invalid, or kIOReturnNoMemory
+    if a resource shortage was encountered. */
+
+    virtual IOReturn startEventDelivery( IOHIDEventQueue *  queue,
+                                         IOHIDElementCookie cookie,
+                                         IOOptionBits       options = 0 );
+
+/*! @function stopEventDelivery
+    @abstract Stop delivering events from one or more HID elements to the
+    event queue specified.
+    @discussion Clients that called startEventDelivery() must eventually
+    call this method to stop event delivery to its queue from one or more
+    HID elements.
+    @param queue The event queue that no longer wishes to receive events
+    generated by the HID element specified.
+    @param cookie The cookie for a HID element published by the HID device.
+    The default value of zero indicates that the queue should be removed from
+    the event dispatch list of all HID elements published by the HID device.
+    Subclasses should not override this method.
+    @result kIOReturnSuccess if the queue was removed from the event dispatch
+    list for one or more HID elements, or kIOReturnBadArgument if the queue
+    or the cookie argument specified is invalid, or kIOReturnNotFound if the
+    queue was not found. */
+
+    virtual IOReturn stopEventDelivery( IOHIDEventQueue *  queue,
+                                        IOHIDElementCookie cookie = 0 );
+
+/*! @function checkEventDelivery
+    @abstract Check whether events from a HID element will be delivered to
+    the event queue specified.
+    @param queue The event queue.
+    @param cookie The cookie for a HID element published by the HID device.
+    @param isActive Pointer to the return value that is set to true if events
+    generated by the HID element will be delivered to the queue, or false
+    otherwise. This return value is set only if kIOReturnSuccess is
+    returned.
+    @result kIOReturnSuccess on success, or kIOReturnBadArgument if one or
+    more of the arguments provided are invalid. */
+
+    virtual IOReturn checkEventDelivery( IOHIDEventQueue *  queue,
+                                         IOHIDElementCookie cookie,
+                                         bool *             isActive );
+
+/*! @function updateElementValues
+    @abstract Updates element values from a HID device via getReport.
+    @discussion A completion parameter may be added in the future.
+    @param cookies A list of element cookies who's values need to be
+    set on the device.
+    @param cookieCount The number of element cookies.
+    @result kIOReturnSuccess on success, or an error return otherwise. */
+    OSMetaClassDeclareReservedUsed(IOHIDDevice,  0);
+    virtual IOReturn updateElementValues(IOHIDElementCookie * cookies, UInt32 cookieCount = 1);
+    
+/*! @function postElementValues
+    @abstract Posts element values to a HID device via setReport.
+    @discussion A completion parameter may be added in the future.
+    @param cookies A list of element cookies who's values need to be
+    set on the device.
+    @param cookieCount The number of element cookies.
+    @result kIOReturnSuccess on success, or an error return otherwise. */
+    OSMetaClassDeclareReservedUsed(IOHIDDevice,  1);
+    virtual IOReturn postElementValues(IOHIDElementCookie * cookies, UInt32 cookieCount = 1);
+
+/*! @function newSerialNumberString
+    @abstract Returns a string object that describes the serial number
+    of the HID device.
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */
+    OSMetaClassDeclareReservedUsed(IOHIDDevice,  2);
+    virtual OSString * newSerialNumberString() const;
+    
+/*! @function newLocationIDNumber
+    @abstract Returns a number object that describes the location ID
+    of the HID device.
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */    
+    OSMetaClassDeclareReservedUsed(IOHIDDevice,  3);
+    virtual OSNumber * newLocationIDNumber() const;
+
+/*! @function getReport
+    @abstract Get a report from the HID device.
+    @discussion A completion parameter may be added in the future.
+    @param report A memory descriptor that describes the memory to store
+    the report read from the HID device.
+    @param reportType The report type.
+    @param options The lower 8 bits will represent the Report ID.  The
+    other 24 bits are options to specify the request.
+    @param completionTimeout Specifies an amount of time (in ms) after which 
+    the command will be aborted if the entire command has not been completed.
+    @param completion Function to call when request completes. If omitted then
+    getReport() executes synchronously, blocking until the request is complete.
+    @result kIOReturnSuccess on success, or an error return otherwise. */
+
+    OSMetaClassDeclareReservedUsed(IOHIDDevice,  4);
+    virtual IOReturn getReport( IOMemoryDescriptor * report,
+                                IOHIDReportType      reportType,
+                                IOOptionBits         options,
+                                UInt32               completionTimeout,
+                                IOHIDCompletion	*    completion = 0);
+
+/*! @function setReport
+    @abstract Send a report to the HID device.
+    @discussion A completion parameter may be added in the future.
+    @param report A memory descriptor that describes the report to send
+    to the HID device.
+    @param reportType The report type.
+    @param options The lower 8 bits will represent the Report ID.  The
+    other 24 bits are options to specify the request.
+    @param completionTimeout Specifies an amount of time (in ms) after which 
+    the command will be aborted if the entire command has not been completed.
+    @param completion Function to call when request completes. If omitted then
+    setReport() executes synchronously, blocking until the request is complete.
+    @result kIOReturnSuccess on success, or an error return otherwise. */
+
+    OSMetaClassDeclareReservedUsed(IOHIDDevice,  5);
+    virtual IOReturn setReport( IOMemoryDescriptor * report,
+                                IOHIDReportType      reportType,
+                                IOOptionBits         options,
+                                UInt32               completionTimeout,
+                                IOHIDCompletion	*    completion = 0);    
+
+/*! @function newVendorIDSourceNumber
+    @abstract Returns a number object that describes the vendor ID
+    source of the HID device.  
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */
+    OSMetaClassDeclareReservedUsed(IOHIDDevice,  6);
+    virtual OSNumber * newVendorIDSourceNumber() const;
+    
+/*! @function newCountryCodeNumber
+    @abstract Returns a number object that describes the country code
+    of the HID device.  
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */
+    OSMetaClassDeclareReservedUsed(IOHIDDevice,  7);
+    virtual OSNumber * newCountryCodeNumber() const;
+
+    
+/*! @function handleReportWithTime
+    @abstract Handle an asynchronous report received from the HID device.
+	@param timeStamp The timestamp of report.
+    @param report A memory descriptor that describes the report.
+    @param reportType The type of report. Currently, only
+    kIOHIDReportTypeInput report type is handled.
+    @param options Options to specify the request. No options are
+    currently defined, and the default value is 0.
+    @result kIOReturnSuccess on success, or an error return otherwise. */
+
+    OSMetaClassDeclareReservedUsed(IOHIDDevice,  8);
+	virtual IOReturn handleReportWithTime(
+                     AbsoluteTime         timeStamp,
+                     IOMemoryDescriptor * report,
+	                 IOHIDReportType      reportType = kIOHIDReportTypeInput,
+	                 IOOptionBits         options    = 0);
+
+/*! @function newReportInterval
+    @abstract Returns a number object that describes the actual polling
+    interval of the HID device in microseconds.  
+    @result A number object. The caller must decrement the retain count
+    on the object returned. */
+    OSMetaClassDeclareReservedUsed(IOHIDDevice,  9);
+    virtual OSNumber * newReportIntervalNumber() const;
+    
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 10);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 11);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 12);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 13);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 14);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 15);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 16);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 17);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 18);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 19);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 20);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 21);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 22);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 23);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 24);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 25);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 26);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 27);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 28);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 29);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 30);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 31);
+
+#ifndef __ppc__
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 32);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 33);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 34);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 35);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 36);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 37);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 38);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 39);
+    OSMetaClassDeclareReservedUnused(IOHIDDevice, 40);
+#endif
+
+};
+
+#endif /* !_IOKIT_HID_IOHIDDEVICE_H */
diff --git a/i386/include/IOKit/hid/IOHIDElement.h b/i386/include/IOKit/hid/IOHIDElement.h
new file mode 100644
index 0000000..f4fbb17
--- /dev/null
+++ b/i386/include/IOKit/hid/IOHIDElement.h
@@ -0,0 +1,106 @@
+/*
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_HID_IOHIDELEMENT_H
+#define _IOKIT_HID_IOHIDELEMENT_H
+
+#include <libkern/c++/OSArray.h>
+#include <libkern/c++/OSData.h>
+#include <IOKit/hid/IOHIDKeys.h>
+
+//===========================================================================
+// An object that describes a single HID element.
+    
+class IOHIDElement: public OSObject
+{
+    OSDeclareAbstractStructors( IOHIDElement )
+    
+    struct ExpansionData { 
+    };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *             _reserved;
+
+
+public:
+
+    virtual IOHIDElementCookie              getCookie()            = 0;
+    virtual IOHIDElement *                  getParentElement()     = 0;
+    virtual OSArray *                       getChildElements()     = 0;
+    virtual IOHIDElementType                getType()              = 0;
+    virtual IOHIDElementCollectionType      getCollectionType()    = 0;
+    virtual UInt32                          getUsagePage()         = 0;
+    virtual UInt32                          getUsage()             = 0;
+    virtual UInt32                          getLogicalMin()        = 0;
+    virtual UInt32                          getLogicalMax()        = 0;
+    virtual UInt32                          getPhysicalMin()       = 0;
+    virtual UInt32                          getPhysicalMax()       = 0;
+    virtual UInt32                          getUnitExponent()      = 0;
+    virtual UInt32                          getUnit()              = 0;
+    virtual UInt32                          getReportSize()        = 0;
+    virtual UInt32                          getReportCount()       = 0;
+    virtual UInt32                          getReportID()          = 0;
+    virtual UInt32                          getFlags()             = 0;
+    virtual AbsoluteTime                    getTimeStamp()         = 0;
+    virtual UInt32                          getValue()             = 0;
+    virtual OSData *                        getDataValue()         = 0;
+    virtual void                            setValue(UInt32 value)  = 0;
+    virtual void                            setDataValue(OSData * value)    = 0;
+    
+    OSMetaClassDeclareReservedUnused(IOHIDElement,  0);
+    OSMetaClassDeclareReservedUnused(IOHIDElement,  1);
+    OSMetaClassDeclareReservedUnused(IOHIDElement,  2);
+    OSMetaClassDeclareReservedUnused(IOHIDElement,  3);
+    OSMetaClassDeclareReservedUnused(IOHIDElement,  4);
+    OSMetaClassDeclareReservedUnused(IOHIDElement,  5);
+    OSMetaClassDeclareReservedUnused(IOHIDElement,  6);
+    OSMetaClassDeclareReservedUnused(IOHIDElement,  7);
+    OSMetaClassDeclareReservedUnused(IOHIDElement,  8);
+    OSMetaClassDeclareReservedUnused(IOHIDElement,  9);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 10);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 11);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 12);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 13);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 14);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 15);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 16);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 17);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 18);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 19);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 20);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 21);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 22);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 23);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 24);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 25);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 26);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 27);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 28);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 29);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 30);
+    OSMetaClassDeclareReservedUnused(IOHIDElement, 31);
+
+};
+
+#endif /* !_IOKIT_HID_IOHIDELEMENT_H */
diff --git a/i386/include/IOKit/hid/IOHIDInterface.h b/i386/include/IOKit/hid/IOHIDInterface.h
new file mode 100644
index 0000000..54b4230
--- /dev/null
+++ b/i386/include/IOKit/hid/IOHIDInterface.h
@@ -0,0 +1,252 @@
+/*
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_HID_IOHIDINTERFACE_H
+#define _IOKIT_HID_IOHIDINTERFACE_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/hid/IOHIDKeys.h>
+
+class IOHIDDevice;
+
+/*! @class IOHIDInterface : public IOService
+    @abstract In kernel interface to a HID device.
+    @discussion
+*/
+
+class IOHIDInterface: public IOService
+{
+    OSDeclareDefaultStructors( IOHIDInterface )
+    
+public:
+
+    /*! @typedef IOHIDInterface::InterruptReportAction
+        @abstract Callback to handle an asynchronous report received from 
+        the HID device.
+        @discussion This callback is set when calling IOHIDInterface::open.  
+        @param target Pointer to your data object.
+        @param timestamp Time when the report was delivered.
+        @param report A memory descriptor that describes the report. 
+        @param reportType The type of report.
+        @param reportID The ID of the report.
+        @param refcon void * pointer to more data.
+    */  
+    typedef void (*InterruptReportAction)(
+                                OSObject *                  target,
+                                AbsoluteTime                timestamp,
+                                IOMemoryDescriptor *        report,
+                                IOHIDReportType             type,
+                                UInt32                      reportID,
+                                void *                      refcon);
+
+    /*!
+        @typedef IOHIDInterface::CompletionAction
+        @discussion Function called when HID I/O completes.
+        @param target
+        @param refcon
+        @param status Completion status.
+        @param bufferSizeRemaining Bytes left to be transferred.
+    */
+        
+    typedef void (*CompletionAction)(
+                                OSObject *                  target,
+                                void *                      refcon,
+                                IOReturn                    status,
+                                UInt32                      bufferSizeRemaining);
+
+private:
+    IOHIDDevice *               _owner;
+    OSArray *                   _elementArray;
+    InterruptReportAction       _interruptAction;
+    void *                      _interruptRefCon;
+    OSObject *                  _interruptTarget;
+    OSString *                  _transportString;
+    OSString *                  _manufacturerString;
+    OSString *                  _productString;
+    OSString *                  _serialNumberString;
+    UInt32                      _locationID;
+    UInt32                      _vendorID;
+    UInt32                      _vendorIDSource;
+    UInt32                      _productID;
+    UInt32                      _version;
+    UInt32                      _countryCode;
+    IOByteCount                 _maxReportSize[kIOHIDReportTypeCount];
+
+    struct ExpansionData { 
+        UInt32                  reportInterval;
+    };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *             _reserved;
+    
+protected:
+
+    /*! 
+        @function free
+        @abstract Free the IOHIDInterface object.
+        @discussion Release all resources that were previously allocated,
+        then call super::free() to propagate the call to our superclass. 
+    */
+
+    virtual void            free();
+
+public:
+
+    static IOHIDInterface * withElements ( OSArray * elements );
+
+    /*! 
+        @function init
+        @abstract Initialize an IOHIDInterface object.
+        @discussion Prime the IOHIDInterface object and prepare it to support
+        a probe() or a start() call. This implementation will simply call
+        super::init().
+        @param A dictionary A property table associated with this IOHIDInterface
+        instance.
+        @result True on sucess, or false otherwise. 
+    */
+
+    virtual bool            init( OSDictionary * dictionary = 0 );
+
+    /*! 
+        @function start
+        @abstract Start up the driver using the given provider.
+        @discussion IOHIDInterface will allocate resources. Before returning true
+        to indicate success, registerService() is called to trigger client matching.
+        @param provider The provider that the driver was matched to, and selected
+        to run with.
+        @result True on success, or false otherwise. 
+    */
+
+    virtual bool            start( IOService * provider );
+    
+    /*! 
+        @function matchPropertyTable
+        @abstract Called by the provider during a match
+        @discussion Compare the properties in the supplied table to this 
+        object's properties.
+        @param table The property table that this device will match against
+    */
+
+    virtual bool            matchPropertyTable(
+                                OSDictionary *              table, 
+                                SInt32 *                    score);    
+
+    virtual bool            open (
+                                IOService *                 client,
+                                IOOptionBits                options,
+                                InterruptReportAction       action,
+                                void *                      refCon);
+
+    virtual void			close(  
+								IOService *					client,
+								IOOptionBits				options = 0 );
+
+    virtual OSString *      getTransport ();
+    virtual UInt32          getLocationID ();
+    virtual UInt32          getVendorID ();
+    virtual UInt32          getVendorIDSource ();
+    virtual UInt32          getProductID ();
+    virtual UInt32          getVersion ();
+    virtual UInt32          getCountryCode ();
+    virtual OSString *      getManufacturer ();
+    virtual OSString *      getProduct ();
+    virtual OSString *      getSerialNumber ();
+    virtual IOByteCount     getMaxReportSize (IOHIDReportType type);
+
+    virtual OSArray *       createMatchingElements (
+                                OSDictionary *              matching            = 0, 
+                                IOOptionBits                options             = 0);
+                                
+    virtual void            handleReport (
+                                AbsoluteTime                timeStamp,
+                                IOMemoryDescriptor *        report,
+                                IOHIDReportType             reportType,
+                                UInt32                      reportID,
+                                IOOptionBits                options             = 0);
+    
+    virtual IOReturn        setReport ( 
+                                IOMemoryDescriptor *        report,
+                                IOHIDReportType             reportType,
+                                UInt32                      reportID            = 0,
+                                IOOptionBits                options             = 0);
+
+    virtual IOReturn        getReport ( 
+                                IOMemoryDescriptor *        report,
+                                IOHIDReportType             reportType,
+                                UInt32                      reportID            = 0,
+                                IOOptionBits                options             = 0);
+
+    virtual IOReturn        setReport ( 
+                                IOMemoryDescriptor *        report,
+                                IOHIDReportType             reportType,
+                                UInt32                      reportID            = 0,
+                                IOOptionBits                options             = 0,
+                                UInt32                      completionTimeout   = 0,
+                                CompletionAction *          completion          = 0);    
+
+    virtual IOReturn        getReport ( 
+                                IOMemoryDescriptor *        report,
+                                IOHIDReportType             reportType,
+                                UInt32                      reportID            = 0,
+                                IOOptionBits                options             = 0,
+                                UInt32                      completionTimeout   = 0,
+                                CompletionAction *          completion          = 0);
+                                    
+    OSMetaClassDeclareReservedUsed(IOHIDInterface,  0);
+    virtual UInt32             getReportInterval ();
+    
+    OSMetaClassDeclareReservedUnused(IOHIDInterface,  1);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface,  2);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface,  3);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface,  4);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface,  5);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface,  6);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface,  7);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface,  8);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface,  9);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 10);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 11);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 12);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 13);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 14);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 15);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 16);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 17);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 18);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 19);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 20);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 21);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 22);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 23);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 24);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 25);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 26);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 27);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 28);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 29);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 30);
+    OSMetaClassDeclareReservedUnused(IOHIDInterface, 31);
+};
+
+#endif /* !_IOKIT_HID_IOHIDINTERFACE_H */
diff --git a/i386/include/IOKit/hid/IOHIDKeys.h b/i386/include/IOKit/hid/IOHIDKeys.h
new file mode 100644
index 0000000..a4e3789
--- /dev/null
+++ b/i386/include/IOKit/hid/IOHIDKeys.h
@@ -0,0 +1,349 @@
+/*
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_HID_IOHIDKEYS_H_
+#define _IOKIT_HID_IOHIDKEYS_H_
+
+#include <sys/cdefs.h>
+#include <IOKit/hidsystem/IOHIDParameter.h>
+
+__BEGIN_DECLS
+
+/* The following keys are used to search the IORegistry for HID related services
+*/
+
+/* This is used to find HID Devices in the IORegistry */
+#define kIOHIDDeviceKey                     "IOHIDDevice"
+
+/*!
+    @defined HID Device Property Keys
+    @abstract Keys that represent properties of a paticular device.
+    @discussion Keys that represent properties of a paticular device.  Can be added
+        to your matching dictionary when refining searches for HID devices.
+        <br><br>
+        <b>Please note:</b><br>
+        kIOHIDPrimaryUsageKey and kIOHIDPrimaryUsagePageKey are no longer 
+        rich enough to describe a device's capabilities.  Take, for example, a
+        device that describes both a keyboard and a mouse in the same descriptor.  
+        The previous behavior was to only describe the keyboard behavior with the 
+        primary usage and usage page.   Needless to say, this would sometimes cause 
+        a program interested in mice to skip this device when matching.  
+        <br>
+        Thus we have added 3 
+        additional keys:
+        <ul>
+            <li>kIOHIDDeviceUsageKey</li>
+            <li>kIOHIDDeviceUsagePageKey</li>
+            <li>kIOHIDDeviceUsagePairsKey</li>
+        </ul>
+        kIOHIDDeviceUsagePairsKey is used to represent an array of dictionaries containing 
+        key/value pairs referenced by kIOHIDDeviceUsageKey and kIOHIDDeviceUsagePageKey.  
+        These usage pairs describe all application type collections (behaviors) defined 
+        by the device.
+        <br><br>
+        An application intersted in only matching on one criteria would only add the 
+        kIOHIDDeviceUsageKey and kIOHIDDeviceUsagePageKey keys to the matching dictionary.
+        If it is interested in a device that has multiple behaviors, the application would
+        instead add an array or dictionaries referenced by kIOHIDDeviceUsagePairsKey to his 
+        matching dictionary.
+*/
+#define kIOHIDTransportKey                  "Transport"
+#define kIOHIDVendorIDKey                   "VendorID"
+#define kIOHIDVendorIDSourceKey             "VendorIDSource"
+#define kIOHIDProductIDKey                  "ProductID"
+#define kIOHIDVersionNumberKey              "VersionNumber"
+#define kIOHIDManufacturerKey               "Manufacturer"
+#define kIOHIDProductKey                    "Product"
+#define kIOHIDSerialNumberKey               "SerialNumber"
+#define kIOHIDCountryCodeKey                "CountryCode"
+#define kIOHIDStandardTypeKey               "StandardType"
+#define kIOHIDLocationIDKey                 "LocationID"
+#define kIOHIDDeviceUsageKey                "DeviceUsage"
+#define kIOHIDDeviceUsagePageKey            "DeviceUsagePage"
+#define kIOHIDDeviceUsagePairsKey           "DeviceUsagePairs"
+#define kIOHIDPrimaryUsageKey               "PrimaryUsage"
+#define kIOHIDPrimaryUsagePageKey           "PrimaryUsagePage"
+#define kIOHIDMaxInputReportSizeKey         "MaxInputReportSize"
+#define kIOHIDMaxOutputReportSizeKey	    "MaxOutputReportSize"
+#define kIOHIDMaxFeatureReportSizeKey	    "MaxFeatureReportSize"
+#define kIOHIDReportIntervalKey             "ReportInterval"
+#define kIOHIDReportDescriptorKey           "ReportDescriptor"
+
+/*!
+    @define kIOHIDElementKey
+    @abstract Keys that represents an element property.
+    @discussion Property for a HID Device or element dictionary.
+        Elements can be heirarchical, so they can contain other elements.
+*/
+#define kIOHIDElementKey                    "Elements"
+
+/*!
+    @defined HID Element Dictionary Keys
+    @abstract Keys that represent properties of a particular elements.
+    @discussion These keys can also be added to a matching dictionary 
+        when searching for elements via copyMatchingElements.  
+*/
+#define kIOHIDElementCookieKey                      "ElementCookie"
+#define kIOHIDElementTypeKey                        "Type"
+#define kIOHIDElementCollectionTypeKey              "CollectionType"
+#define kIOHIDElementUsageKey                       "Usage"
+#define kIOHIDElementUsagePageKey                   "UsagePage"
+#define kIOHIDElementMinKey                         "Min"
+#define kIOHIDElementMaxKey                         "Max"
+#define kIOHIDElementScaledMinKey                   "ScaledMin"
+#define kIOHIDElementScaledMaxKey                   "ScaledMax"
+#define kIOHIDElementSizeKey                        "Size"
+#define kIOHIDElementReportSizeKey                  "ReportSize"
+#define kIOHIDElementReportCountKey                 "ReportCount"
+#define kIOHIDElementReportIDKey                    "ReportID"
+#define kIOHIDElementIsArrayKey                     "IsArray"
+#define kIOHIDElementIsRelativeKey                  "IsRelative"
+#define kIOHIDElementIsWrappingKey                  "IsWrapping"
+#define kIOHIDElementIsNonLinearKey                 "IsNonLinear"
+#define kIOHIDElementHasPreferredStateKey           "HasPreferredState"
+#define kIOHIDElementHasNullStateKey                "HasNullState"
+#define kIOHIDElementFlagsKey                       "Flags"
+#define kIOHIDElementUnitKey                        "Unit"
+#define kIOHIDElementUnitExponentKey                "UnitExponent"
+#define kIOHIDElementNameKey                        "Name"
+#define kIOHIDElementValueLocationKey               "ValueLocation"
+#define kIOHIDElementDuplicateIndexKey              "DuplicateIndex"
+#define kIOHIDElementParentCollectionKey            "ParentCollection"
+
+#ifndef __ppc__
+    #define kIOHIDElementVendorSpecificKey          "VendorSpecific"
+#else
+    #define kIOHIDElementVendorSpecificKey          "VendorSpecifc"
+#endif
+
+/*!
+    @defined HID Element Match Keys
+    @abstract Keys used for matching particular elements.
+    @discussion These keys should only be used with a matching  
+        dictionary when searching for elements via copyMatchingElements.  
+*/
+#define kIOHIDElementCookieMinKey           "ElementCookieMin"
+#define kIOHIDElementCookieMaxKey           "ElementCookieMax"
+#define kIOHIDElementUsageMinKey            "UsageMin"
+#define kIOHIDElementUsageMaxKey            "UsageMax"
+
+/*!
+    @defined kIOHIDElementCalibrationMinKey
+    @abstract The minimum bounds for a calibrated value.  
+*/
+#define kIOHIDElementCalibrationMinKey              "CalibrationMin"
+
+/*!
+    @defined kIOHIDElementCalibrationMaxKey
+    @abstract The maximum bounds for a calibrated value.  
+*/
+#define kIOHIDElementCalibrationMaxKey              "CalibrationMax"
+
+/*!
+    @defined kIOHIDElementCalibrationSaturationMinKey
+    @abstract The mininum tolerance to be used when calibrating a logical element value. 
+    @discussion The saturation property is used to allow for slight differences in the minimum and maximum value returned by an element. 
+*/
+#define kIOHIDElementCalibrationSaturationMinKey    "CalibrationSaturationMin"
+
+/*!
+    @defined kIOHIDElementCalibrationSaturationMaxKey
+    @abstract The maximum tolerance to be used when calibrating a logical element value.  
+    @discussion The saturation property is used to allow for slight differences in the minimum and maximum value returned by an element. 
+*/
+#define kIOHIDElementCalibrationSaturationMaxKey    "CalibrationSaturationMax"
+
+/*!
+    @defined kIOHIDElementCalibrationDeadZoneMinKey
+    @abstract The minimum bounds near the midpoint of a logical value in which the value is ignored.  
+    @discussion The dead zone property is used to allow for slight differences in the idle value returned by an element. 
+*/
+#define kIOHIDElementCalibrationDeadZoneMinKey      "CalibrationDeadZoneMin"
+
+/*!
+    @defined kIOHIDElementCalibrationDeadZoneMinKey
+    @abstract The maximum bounds near the midpoint of a logical value in which the value is ignored.  
+    @discussion The dead zone property is used to allow for slight differences in the idle value returned by an element. 
+*/
+#define kIOHIDElementCalibrationDeadZoneMaxKey      "CalibrationDeadZoneMax"
+
+/*!
+    @defined kIOHIDElementCalibrationGranularityKey
+    @abstract The scale or level of detail returned in a calibrated element value.  
+    @discussion Values are rounded off such that if granularity=0.1, values after calibration are 0, 0.1, 0.2, 0.3, etc.
+*/
+#define kIOHIDElementCalibrationGranularityKey      "CalibrationGranularity"
+
+/*!
+    @typedef IOHIDElementCookie
+    @abstract Abstract data type used as a unique identifier for an element.
+*/
+#ifdef __LP64__
+    typedef uint32_t IOHIDElementCookie;
+#else
+    typedef void * IOHIDElementCookie;
+#endif
+
+/*!
+  @typedef IOHIDElementType
+  @abstract Describes different types of HID elements.
+  @discussion Used by the IOHIDFamily to identify the type of
+  element processed.  Represented by the key kIOHIDElementTypeKey in the 
+    dictionary describing the element.
+  @constant kIOHIDElementTypeInput_Misc
+    Misc input data field or varying size.
+  @constant kIOHIDElementTypeInput_Button 
+    One bit input data field.
+  @constant kIOHIDElementTypeInput_Axis 
+    Input data field used to represent an axis.
+  @constant kIOHIDElementTypeInput_ScanCodes
+    Input data field used to represent a scan code or usage selector.
+  @constant kIOHIDElementTypeOutput
+    Used to represent an output data field in a report.
+  @constant kIOHIDElementTypeFeature
+    Describes input and output elements not intended for 
+    consumption by the end user.
+  @constant kIOHIDElementTypeCollection
+    Element used to identify a relationship between two or more elements.
+*/
+enum IOHIDElementType {
+	kIOHIDElementTypeInput_Misc        = 1,
+	kIOHIDElementTypeInput_Button      = 2,
+	kIOHIDElementTypeInput_Axis        = 3,
+	kIOHIDElementTypeInput_ScanCodes   = 4,
+	kIOHIDElementTypeOutput            = 129,
+	kIOHIDElementTypeFeature           = 257,
+	kIOHIDElementTypeCollection        = 513
+};
+typedef enum IOHIDElementType IOHIDElementType;
+
+/*!
+  @typedef IOHIDElementCollectionType
+  @abstract Describes different types of HID collections.
+  @discussion Collections identify a relationship between two or more
+    elements.
+  @constant kIOHIDElementCollectionTypePhysical   
+    Used for a set of data items that represent data points 
+    collected at one geometric point.
+  @constant kIOHIDElementCollectionTypeApplication 
+    Identifies item groups serving different purposes in a single device.
+  @constant kIOHIDElementCollectionTypeLogical
+    Used when a set of data items form a composite data structure.
+  @constant kIOHIDElementCollectionTypeReport 
+    Wraps all the fields in a report.
+  @constant kIOHIDElementCollectionTypeNamedArray 
+    Contains an array of selector usages.
+  @constant kIOHIDElementCollectionTypeUsageSwitch 
+    Modifies the meaning of the usage it contains.
+  @constant kIOHIDElementCollectionTypeUsageModifier 
+    Modifies the meaning of the usage attached to the encompassing collection.
+*/
+enum IOHIDElementCollectionType{
+	kIOHIDElementCollectionTypePhysical	= 0x00,
+	kIOHIDElementCollectionTypeApplication,
+    kIOHIDElementCollectionTypeLogical,
+    kIOHIDElementCollectionTypeReport,
+    kIOHIDElementCollectionTypeNamedArray,
+    kIOHIDElementCollectionTypeUsageSwitch,
+    kIOHIDElementCollectionTypeUsageModifier
+};
+typedef enum IOHIDElementCollectionType IOHIDElementCollectionType;
+
+
+/*!
+  @typedef IOHIDReportType
+  @abstract Describes different type of HID reports.
+  @discussion Used by the IOHIDFamily to identify the type of
+    report being processed.
+  @constant kIOHIDReportTypeInput Input report.
+  @constant kIOHIDReportTypeOutput Output report.
+  @constant kIOHIDReportTypeFeature Feature report.
+*/
+enum IOHIDReportType{
+    kIOHIDReportTypeInput = 0,
+    kIOHIDReportTypeOutput,
+    kIOHIDReportTypeFeature,
+    kIOHIDReportTypeCount
+};
+typedef enum IOHIDReportType IOHIDReportType;
+
+/*!
+  @typedef IOHIDOptionsType
+  @abstract Options for opening a device via IOHIDLib.
+  @constant kIOHIDOptionsTypeNone Default option.
+  @constant kIOHIDOptionsTypeSeizeDevice Used to open exclusive
+    communication with the device.  This will prevent the system
+    and other clients from receiving events from the device.
+*/
+enum {
+    kIOHIDOptionsTypeNone	 = 0x00,
+    kIOHIDOptionsTypeSeizeDevice = 0x01
+};
+typedef uint32_t IOHIDOptionsType;
+
+
+/*!
+  @typedef IOHIDQueueOptionsType
+  @abstract Options for creating a queue via IOHIDLib.
+  @constant kIOHIDQueueOptionsTypeNone Default option.
+  @constant kIOHIDQueueOptionsTypeEnqueueAll Force the IOHIDQueue
+    to enqueue all events, relative or absolute, regardless of change.
+*/
+enum {
+    kIOHIDQueueOptionsTypeNone	 = 0x00,
+    kIOHIDQueueOptionsTypeEnqueueAll = 0x01
+};
+typedef uint32_t IOHIDQueueOptionsType;
+
+
+enum {
+    kIOHIDElementFlagsConstantMask        = 0x0001,
+    kIOHIDElementFlagsVariableMask        = 0x0002,
+    kIOHIDElementFlagsRelativeMask        = 0x0004,
+    kIOHIDElementFlagsWrapMask            = 0x0008,
+    kIOHIDElementFlagsNonLinearMask       = 0x0010,
+    kIOHIDElementFlagsNoPreferredMask     = 0x0020,
+    kIOHIDElementFlagsNullStateMask       = 0x0040,
+    kIOHIDElementFlagsVolativeMask        = 0x0080,
+    kIOHIDElementFlagsBufferedByteMask    = 0x0100
+};
+typedef uint32_t IOHIDElementFlags;
+
+/*!
+  @typedef IOHIDStandardType
+  @abstract Type to define what industrial standard the device is referencing.
+  @constant kIOHIDStandardTypeANSI ANSI.
+  @constant kIOHIDStandardTypeISO ISO.
+  @constant kIOHIDStandardTypeJIS JIS.
+*/
+enum {
+    kIOHIDStandardTypeANSI                = 0,
+    kIOHIDStandardTypeISO                 = 1,
+    kIOHIDStandardTypeJIS                 = 2
+};
+typedef uint32_t IOHIDStandardType;
+
+__END_DECLS
+
+#endif /* !_IOKIT_HID_IOHIDKEYS_H_ */
diff --git a/i386/include/IOKit/hid/IOHIDUsageTables.h b/i386/include/IOKit/hid/IOHIDUsageTables.h
new file mode 100644
index 0000000..ff0fd88
--- /dev/null
+++ b/i386/include/IOKit/hid/IOHIDUsageTables.h
@@ -0,0 +1,1665 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _IOHIDUSAGETABLES_H
+#define _IOHIDUSAGETABLES_H
+
+/* ******************************************************************************************
+ * HID Usage Tables
+ *
+ * The following constants are from the USB 'HID Usage Tables' specification, revision 1.1rc3
+ * ****************************************************************************************** */
+
+
+/* Usage Pages */
+enum
+{
+	kHIDPage_Undefined	= 0x00,
+	kHIDPage_GenericDesktop	= 0x01,
+	kHIDPage_Simulation	= 0x02,
+	kHIDPage_VR	= 0x03,
+	kHIDPage_Sport	= 0x04,
+	kHIDPage_Game	= 0x05,
+	/* Reserved 0x06 */
+	kHIDPage_KeyboardOrKeypad	= 0x07,	/* USB Device Class Definition for Human Interface Devices (HID). Note: the usage type for all key codes is Selector (Sel). */
+	kHIDPage_LEDs	= 0x08,
+	kHIDPage_Button	= 0x09,
+	kHIDPage_Ordinal	= 0x0A,
+	kHIDPage_Telephony	= 0x0B,
+	kHIDPage_Consumer	= 0x0C,
+	kHIDPage_Digitizer	= 0x0D,
+	/* Reserved 0x0E */
+	kHIDPage_PID	= 0x0F,	/* USB Physical Interface Device definitions for force feedback and related devices. */
+	kHIDPage_Unicode	= 0x10,
+	/* Reserved 0x11 - 0x13 */
+	kHIDPage_AlphanumericDisplay	= 0x14,
+	/* Reserved 0x15 - 0x7F */
+	/* Monitor 0x80 - 0x83	 USB Device Class Definition for Monitor Devices */
+	/* Power 0x84 - 0x87	 USB Device Class Definition for Power Devices */
+	kHIDPage_PowerDevice = 0x84, 				/* Power Device Page */
+	kHIDPage_BatterySystem = 0x85, 				/* Battery System Page */
+	/* Reserved 0x88 - 0x8B */
+	kHIDPage_BarCodeScanner	= 0x8C,	/* (Point of Sale) USB Device Class Definition for Bar Code Scanner Devices */
+	kHIDPage_WeighingDevice	= 0x8D,	/* (Point of Sale) USB Device Class Definition for Weighing Devices */
+	kHIDPage_Scale	= 0x8D,	/* (Point of Sale) USB Device Class Definition for Scale Devices */
+    kHIDPage_MagneticStripeReader = 0x8E,
+	/* ReservedPointofSalepages 0x8F */
+	kHIDPage_CameraControl	= 0x90,	/* USB Device Class Definition for Image Class Devices */
+	kHIDPage_Arcade	= 0x91,	/* OAAF Definitions for arcade and coinop related Devices */
+	/* Reserved 0x92 - 0xFEFF */
+	/* VendorDefined 0xFF00 - 0xFFFF */
+	kHIDPage_VendorDefinedStart	= 0xFF00
+};
+
+/* Undefined Usage for all usage pages */
+enum
+{
+	kHIDUsage_Undefined	= 0x00
+};
+
+/* GenericDesktop Page (0x01) */
+enum
+{
+	kHIDUsage_GD_Pointer	= 0x01,	/* Physical Collection */
+	kHIDUsage_GD_Mouse	= 0x02,	/* Application Collection */
+	/* 0x03 Reserved */
+	kHIDUsage_GD_Joystick	= 0x04,	/* Application Collection */
+	kHIDUsage_GD_GamePad	= 0x05,	/* Application Collection */
+	kHIDUsage_GD_Keyboard	= 0x06,	/* Application Collection */
+	kHIDUsage_GD_Keypad	= 0x07,	/* Application Collection */
+	kHIDUsage_GD_MultiAxisController	= 0x08,	/* Application Collection */
+	/* 0x09 - 0x2F Reserved */
+	kHIDUsage_GD_X	= 0x30,	/* Dynamic Value */
+	kHIDUsage_GD_Y	= 0x31,	/* Dynamic Value */
+	kHIDUsage_GD_Z	= 0x32,	/* Dynamic Value */
+	kHIDUsage_GD_Rx	= 0x33,	/* Dynamic Value */
+	kHIDUsage_GD_Ry	= 0x34,	/* Dynamic Value */
+	kHIDUsage_GD_Rz	= 0x35,	/* Dynamic Value */
+	kHIDUsage_GD_Slider	= 0x36,	/* Dynamic Value */
+	kHIDUsage_GD_Dial	= 0x37,	/* Dynamic Value */
+	kHIDUsage_GD_Wheel	= 0x38,	/* Dynamic Value */
+	kHIDUsage_GD_Hatswitch	= 0x39,	/* Dynamic Value */
+	kHIDUsage_GD_CountedBuffer	= 0x3A,	/* Logical Collection */
+	kHIDUsage_GD_ByteCount	= 0x3B,	/* Dynamic Value */
+	kHIDUsage_GD_MotionWakeup	= 0x3C,	/* One-Shot Control */
+	kHIDUsage_GD_Start	= 0x3D,	/* On/Off Control */
+	kHIDUsage_GD_Select	= 0x3E,	/* On/Off Control */
+	/* 0x3F Reserved */
+	kHIDUsage_GD_Vx	= 0x40,	/* Dynamic Value */
+	kHIDUsage_GD_Vy	= 0x41,	/* Dynamic Value */
+	kHIDUsage_GD_Vz	= 0x42,	/* Dynamic Value */
+	kHIDUsage_GD_Vbrx	= 0x43,	/* Dynamic Value */
+	kHIDUsage_GD_Vbry	= 0x44,	/* Dynamic Value */
+	kHIDUsage_GD_Vbrz	= 0x45,	/* Dynamic Value */
+	kHIDUsage_GD_Vno	= 0x46,	/* Dynamic Value */
+	/* 0x47 - 0x7F Reserved */
+	kHIDUsage_GD_SystemControl	= 0x80,	/* Application Collection */
+	kHIDUsage_GD_SystemPowerDown	= 0x81,	/* One-Shot Control */
+	kHIDUsage_GD_SystemSleep	= 0x82,	/* One-Shot Control */
+	kHIDUsage_GD_SystemWakeUp	= 0x83,	/* One-Shot Control */
+	kHIDUsage_GD_SystemContextMenu	= 0x84,	/* One-Shot Control */
+	kHIDUsage_GD_SystemMainMenu	= 0x85,	/* One-Shot Control */
+	kHIDUsage_GD_SystemAppMenu	= 0x86,	/* One-Shot Control */
+	kHIDUsage_GD_SystemMenuHelp	= 0x87,	/* One-Shot Control */
+	kHIDUsage_GD_SystemMenuExit	= 0x88,	/* One-Shot Control */
+	kHIDUsage_GD_SystemMenu	= 0x89,	/* Selector */
+	kHIDUsage_GD_SystemMenuRight	= 0x8A,	/* Re-Trigger Control */
+	kHIDUsage_GD_SystemMenuLeft	= 0x8B,	/* Re-Trigger Control */
+	kHIDUsage_GD_SystemMenuUp	= 0x8C,	/* Re-Trigger Control */
+	kHIDUsage_GD_SystemMenuDown	= 0x8D,	/* Re-Trigger Control */
+	/* 0x8E - 0x8F Reserved */
+	kHIDUsage_GD_DPadUp	= 0x90,	/* On/Off Control */
+	kHIDUsage_GD_DPadDown	= 0x91,	/* On/Off Control */
+	kHIDUsage_GD_DPadRight	= 0x92,	/* On/Off Control */
+	kHIDUsage_GD_DPadLeft	= 0x93,	/* On/Off Control */
+	/* 0x94 - 0xFFFF Reserved */
+	kHIDUsage_GD_Reserved = 0xFFFF
+};
+
+/* Simulation Page (0x02) */
+/* This section provides detailed descriptions of the usages employed by simulation devices. */
+enum
+{
+	kHIDUsage_Sim_FlightSimulationDevice	= 0x01,	/* Application Collection */
+	kHIDUsage_Sim_AutomobileSimulationDevice	= 0x02,	/* Application Collection */
+	kHIDUsage_Sim_TankSimulationDevice	= 0x03,	/* Application Collection */
+	kHIDUsage_Sim_SpaceshipSimulationDevice	= 0x04,	/* Application Collection */
+	kHIDUsage_Sim_SubmarineSimulationDevice	= 0x05,	/* Application Collection */
+	kHIDUsage_Sim_SailingSimulationDevice	= 0x06,	/* Application Collection */
+	kHIDUsage_Sim_MotorcycleSimulationDevice	= 0x07,	/* Application Collection */
+	kHIDUsage_Sim_SportsSimulationDevice	= 0x08,	/* Application Collection */
+	kHIDUsage_Sim_AirplaneSimulationDevice	= 0x09,	/* Application Collection */
+	kHIDUsage_Sim_HelicopterSimulationDevice	= 0x0A,	/* Application Collection */
+	kHIDUsage_Sim_MagicCarpetSimulationDevice	= 0x0B,	/* Application Collection */
+	kHIDUsage_Sim_BicycleSimulationDevice	= 0x0C,	/* Application Collection */
+	/* 0x0D - 0x1F Reserved */
+	kHIDUsage_Sim_FlightControlStick	= 0x20,	/* Application Collection */
+	kHIDUsage_Sim_FlightStick	= 0x21,	/* Application Collection */
+	kHIDUsage_Sim_CyclicControl	= 0x22,	/* Physical Collection */
+	kHIDUsage_Sim_CyclicTrim	= 0x23,	/* Physical Collection */
+	kHIDUsage_Sim_FlightYoke	= 0x24,	/* Application Collection */
+	kHIDUsage_Sim_TrackControl	= 0x25,	/* Physical Collection */
+	/* 0x26 - 0xAF Reserved */
+	kHIDUsage_Sim_Aileron	= 0xB0,	/* Dynamic Value */
+	kHIDUsage_Sim_AileronTrim	= 0xB1,	/* Dynamic Value */
+	kHIDUsage_Sim_AntiTorqueControl	= 0xB2,	/* Dynamic Value */
+	kHIDUsage_Sim_AutopilotEnable	= 0xB3,	/* On/Off Control */
+	kHIDUsage_Sim_ChaffRelease	= 0xB4,	/* One-Shot Control */
+	kHIDUsage_Sim_CollectiveControl	= 0xB5,	/* Dynamic Value */
+	kHIDUsage_Sim_DiveBrake	= 0xB6,	/* Dynamic Value */
+	kHIDUsage_Sim_ElectronicCountermeasures	= 0xB7,	/* On/Off Control */
+	kHIDUsage_Sim_Elevator	= 0xB8,	/* Dynamic Value */
+	kHIDUsage_Sim_ElevatorTrim	= 0xB9,	/* Dynamic Value */
+	kHIDUsage_Sim_Rudder	= 0xBA,	/* Dynamic Value */
+	kHIDUsage_Sim_Throttle	= 0xBB,	/* Dynamic Value */
+	kHIDUsage_Sim_FlightCommunications	= 0xBC,	/* On/Off Control */
+	kHIDUsage_Sim_FlareRelease	= 0xBD,	/* One-Shot Control */
+	kHIDUsage_Sim_LandingGear	= 0xBE,	/* On/Off Control */
+	kHIDUsage_Sim_ToeBrake	= 0xBF,	/* Dynamic Value */
+	kHIDUsage_Sim_Trigger	= 0xC0,	/* Momentary Control */
+	kHIDUsage_Sim_WeaponsArm	= 0xC1,	/* On/Off Control */
+	kHIDUsage_Sim_Weapons	= 0xC2,	/* Selector */
+	kHIDUsage_Sim_WingFlaps	= 0xC3,	/* Dynamic Value */
+	kHIDUsage_Sim_Accelerator	= 0xC4,	/* Dynamic Value */
+	kHIDUsage_Sim_Brake	= 0xC5,	/* Dynamic Value */
+	kHIDUsage_Sim_Clutch	= 0xC6,	/* Dynamic Value */
+	kHIDUsage_Sim_Shifter	= 0xC7,	/* Dynamic Value */
+	kHIDUsage_Sim_Steering	= 0xC8,	/* Dynamic Value */
+	kHIDUsage_Sim_TurretDirection	= 0xC9,	/* Dynamic Value */
+	kHIDUsage_Sim_BarrelElevation	= 0xCA,	/* Dynamic Value */
+	kHIDUsage_Sim_DivePlane	= 0xCB,	/* Dynamic Value */
+	kHIDUsage_Sim_Ballast	= 0xCC,	/* Dynamic Value */
+	kHIDUsage_Sim_BicycleCrank	= 0xCD,	/* Dynamic Value */
+	kHIDUsage_Sim_HandleBars	= 0xCE,	/* Dynamic Value */
+	kHIDUsage_Sim_FrontBrake	= 0xCF,	/* Dynamic Value */
+	kHIDUsage_Sim_RearBrake	= 0xD0,	/* Dynamic Value */
+	/* 0xD1 - 0xFFFF Reserved */
+	kHIDUsage_Sim_Reserved = 0xFFFF
+};
+
+/* VR Page (0x03) */
+/* Virtual Reality controls depend on designators to identify the individual controls. Most of the following are */
+/* usages are applied to the collections of entities that comprise the actual device. */
+enum
+{
+	kHIDUsage_VR_Belt	= 0x01,	/* Application Collection */
+	kHIDUsage_VR_BodySuit	= 0x02,	/* Application Collection */
+	kHIDUsage_VR_Flexor	= 0x03,	/* Physical Collection */
+	kHIDUsage_VR_Glove	= 0x04,	/* Application Collection */
+	kHIDUsage_VR_HeadTracker	= 0x05,	/* Physical Collection */
+	kHIDUsage_VR_HeadMountedDisplay	= 0x06,	/* Application Collection */
+	kHIDUsage_VR_HandTracker	= 0x07,	/* Application Collection */
+	kHIDUsage_VR_Oculometer	= 0x08,	/* Application Collection */
+	kHIDUsage_VR_Vest	= 0x09,	/* Application Collection */
+	kHIDUsage_VR_AnimatronicDevice	= 0x0A,	/* Application Collection */
+	/* 0x0B - 0x1F Reserved */
+	kHIDUsage_VR_StereoEnable	= 0x20,	/* On/Off Control */
+	kHIDUsage_VR_DisplayEnable	= 0x21,	/* On/Off Control */
+	/* 0x22 - 0xFFFF Reserved */
+	kHIDUsage_VR_Reserved = 0xFFFF
+};
+
+/* Sport Page (0x04) */
+enum
+{
+	kHIDUsage_Sprt_BaseballBat	= 0x01,	/* Application Collection */
+	kHIDUsage_Sprt_GolfClub	= 0x02,	/* Application Collection */
+	kHIDUsage_Sprt_RowingMachine	= 0x03,	/* Application Collection */
+	kHIDUsage_Sprt_Treadmill	= 0x04,	/* Application Collection */
+	/* 0x05 - 0x2F Reserved */
+	kHIDUsage_Sprt_Oar	= 0x30,	/* Dynamic Value */
+	kHIDUsage_Sprt_Slope	= 0x31,	/* Dynamic Value */
+	kHIDUsage_Sprt_Rate	= 0x32,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickSpeed	= 0x33,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickFaceAngle	= 0x34,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickHeelOrToe	= 0x35,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickFollowThrough	= 0x36,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickTempo	= 0x37,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickType	= 0x38,	/* Named Array */
+	kHIDUsage_Sprt_StickHeight	= 0x39,	/* Dynamic Value */
+	/* 0x3A - 0x4F Reserved */
+	kHIDUsage_Sprt_Putter	= 0x50,	/* Selector */
+	kHIDUsage_Sprt_1Iron	= 0x51,	/* Selector */
+	kHIDUsage_Sprt_2Iron	= 0x52,	/* Selector */
+	kHIDUsage_Sprt_3Iron	= 0x53,	/* Selector */
+	kHIDUsage_Sprt_4Iron	= 0x54,	/* Selector */
+	kHIDUsage_Sprt_5Iron	= 0x55,	/* Selector */
+	kHIDUsage_Sprt_6Iron	= 0x56,	/* Selector */
+	kHIDUsage_Sprt_7Iron	= 0x57,	/* Selector */
+	kHIDUsage_Sprt_8Iron	= 0x58,	/* Selector */
+	kHIDUsage_Sprt_9Iron	= 0x59,	/* Selector */
+	kHIDUsage_Sprt_10Iron	= 0x5A,	/* Selector */
+	kHIDUsage_Sprt_11Iron	= 0x5B,	/* Selector */
+	kHIDUsage_Sprt_SandWedge	= 0x5C,	/* Selector */
+	kHIDUsage_Sprt_LoftWedge	= 0x5D,	/* Selector */
+	kHIDUsage_Sprt_PowerWedge	= 0x5E,	/* Selector */
+	kHIDUsage_Sprt_1Wood	= 0x5F,	/* Selector */
+	kHIDUsage_Sprt_3Wood	= 0x60,	/* Selector */
+	kHIDUsage_Sprt_5Wood	= 0x61,	/* Selector */
+	kHIDUsage_Sprt_7Wood	= 0x62,	/* Selector */
+	kHIDUsage_Sprt_9Wood	= 0x63,	/* Selector */
+	/* 0x64 - 0xFFFF Reserved */
+	kHIDUsage_Sprt_Reserved = 0xFFFF
+};
+
+/* Game Page (0x05) */
+enum
+{
+	kHIDUsage_Game_3DGameController	= 0x01,	/* Application Collection */
+	kHIDUsage_Game_PinballDevice	= 0x02,	/* Application Collection */
+	kHIDUsage_Game_GunDevice	= 0x03,	/* Application Collection */
+	/* 0x04 - 0x1F Reserved */
+	kHIDUsage_Game_PointofView	= 0x20,	/* Physical Collection */
+	kHIDUsage_Game_TurnRightOrLeft	= 0x21,	/* Dynamic Value */
+	kHIDUsage_Game_PitchUpOrDown	= 0x22,	/* Dynamic Value */
+	kHIDUsage_Game_RollRightOrLeft	= 0x23,	/* Dynamic Value */
+	kHIDUsage_Game_MoveRightOrLeft	= 0x24,	/* Dynamic Value */
+	kHIDUsage_Game_MoveForwardOrBackward	= 0x25,	/* Dynamic Value */
+	kHIDUsage_Game_MoveUpOrDown	= 0x26,	/* Dynamic Value */
+	kHIDUsage_Game_LeanRightOrLeft	= 0x27,	/* Dynamic Value */
+	kHIDUsage_Game_LeanForwardOrBackward	= 0x28,	/* Dynamic Value */
+	kHIDUsage_Game_HeightOfPOV	= 0x29,	/* Dynamic Value */
+	kHIDUsage_Game_Flipper	= 0x2A,	/* Momentary Control */
+	kHIDUsage_Game_SecondaryFlipper	= 0x2B,	/* Momentary Control */
+	kHIDUsage_Game_Bump	= 0x2C,	/* Momentary Control */
+	kHIDUsage_Game_NewGame	= 0x2D,	/* One-Shot Control */
+	kHIDUsage_Game_ShootBall	= 0x2E,	/* One-Shot Control */
+	kHIDUsage_Game_Player	= 0x2F,	/* One-Shot Control */
+	kHIDUsage_Game_GunBolt	= 0x30,	/* On/Off Control */
+	kHIDUsage_Game_GunClip	= 0x31,	/* On/Off Control */
+	kHIDUsage_Game_Gun	= 0x32,	/* Selector */
+	kHIDUsage_Game_GunSingleShot	= 0x33,	/* Selector */
+	kHIDUsage_Game_GunBurst	= 0x34,	/* Selector */
+	kHIDUsage_Game_GunAutomatic	= 0x35,	/* Selector */
+	kHIDUsage_Game_GunSafety	= 0x36,	/* On/Off Control */
+	kHIDUsage_Game_GamepadFireOrJump	= 0x37,	/* Logical Collection */
+	kHIDUsage_Game_GamepadTrigger	= 0x39,	/* Logical Collection */
+	/* 0x3A - 0xFFFF Reserved */
+	kHIDUsage_Game_Reserved = 0xFFFF
+};
+
+/* KeyboardOrKeypad Page (0x07) */
+/* This section is the Usage Page for key codes to be used in implementing a USB keyboard. A Boot Keyboard (84-, 101- or 104-key) should at a minimum support all associated usage codes as indicated in the ÒBootÓ */
+/* column below. */
+/* The usage type of all key codes is Selectors (Sel), except for the modifier keys Keyboard Left Control (0x224) to Keyboard Right GUI (0x231) which are Dynamic Flags (DV). */
+/* Note: A general note on Usages and languages: Due to the variation of keyboards from language to language, it is not feasible to specify exact key mappings for every language. Where this list is not specific for a key function in a language, the closest equivalent key position should be used, so that a keyboard may be modified for a different language by simply printing different keycaps. One example is the Y key on a North American keyboard. In Germany this is typically Z. Rather than changing the keyboard firmware to put the Z Usage into that place in the descriptor list, the vendor should use the Y Usage on both the North American and German keyboards. This continues to be the existing practice in the industry, in order to minimize the number of changes to the electronics to accommodate otherlanguages. */
+enum
+{
+	kHIDUsage_KeyboardErrorRollOver	= 0x01,	/* ErrorRollOver */
+	kHIDUsage_KeyboardPOSTFail	= 0x02,	/* POSTFail */
+	kHIDUsage_KeyboardErrorUndefined	= 0x03,	/* ErrorUndefined */
+	kHIDUsage_KeyboardA	= 0x04,	/* a or A */
+	kHIDUsage_KeyboardB	= 0x05,	/* b or B */
+	kHIDUsage_KeyboardC	= 0x06,	/* c or C */
+	kHIDUsage_KeyboardD	= 0x07,	/* d or D */
+	kHIDUsage_KeyboardE	= 0x08,	/* e or E */
+	kHIDUsage_KeyboardF	= 0x09,	/* f or F */
+	kHIDUsage_KeyboardG	= 0x0A,	/* g or G */
+	kHIDUsage_KeyboardH	= 0x0B,	/* h or H */
+	kHIDUsage_KeyboardI	= 0x0C,	/* i or I */
+	kHIDUsage_KeyboardJ	= 0x0D,	/* j or J */
+	kHIDUsage_KeyboardK	= 0x0E,	/* k or K */
+	kHIDUsage_KeyboardL	= 0x0F,	/* l or L */
+	kHIDUsage_KeyboardM	= 0x10,	/* m or M */
+	kHIDUsage_KeyboardN	= 0x11,	/* n or N */
+	kHIDUsage_KeyboardO	= 0x12,	/* o or O */
+	kHIDUsage_KeyboardP	= 0x13,	/* p or P */
+	kHIDUsage_KeyboardQ	= 0x14,	/* q or Q */
+	kHIDUsage_KeyboardR	= 0x15,	/* r or R */
+	kHIDUsage_KeyboardS	= 0x16,	/* s or S */
+	kHIDUsage_KeyboardT	= 0x17,	/* t or T */
+	kHIDUsage_KeyboardU	= 0x18,	/* u or U */
+	kHIDUsage_KeyboardV	= 0x19,	/* v or V */
+	kHIDUsage_KeyboardW	= 0x1A,	/* w or W */
+	kHIDUsage_KeyboardX	= 0x1B,	/* x or X */
+	kHIDUsage_KeyboardY	= 0x1C,	/* y or Y */
+	kHIDUsage_KeyboardZ	= 0x1D,	/* z or Z */
+	kHIDUsage_Keyboard1	= 0x1E,	/* 1 or ! */
+	kHIDUsage_Keyboard2	= 0x1F,	/* 2 or @ */
+	kHIDUsage_Keyboard3	= 0x20,	/* 3 or # */
+	kHIDUsage_Keyboard4	= 0x21,	/* 4 or $ */
+	kHIDUsage_Keyboard5	= 0x22,	/* 5 or % */
+	kHIDUsage_Keyboard6	= 0x23,	/* 6 or ^ */
+	kHIDUsage_Keyboard7	= 0x24,	/* 7 or & */
+	kHIDUsage_Keyboard8	= 0x25,	/* 8 or * */
+	kHIDUsage_Keyboard9	= 0x26,	/* 9 or ( */
+	kHIDUsage_Keyboard0	= 0x27,	/* 0 or ) */
+	kHIDUsage_KeyboardReturnOrEnter	= 0x28,	/* Return (Enter) */
+	kHIDUsage_KeyboardEscape	= 0x29,	/* Escape */
+	kHIDUsage_KeyboardDeleteOrBackspace	= 0x2A,	/* Delete (Backspace) */
+	kHIDUsage_KeyboardTab	= 0x2B,	/* Tab */
+	kHIDUsage_KeyboardSpacebar	= 0x2C,	/* Spacebar */
+	kHIDUsage_KeyboardHyphen	= 0x2D,	/* - or _ */
+	kHIDUsage_KeyboardEqualSign	= 0x2E,	/* = or + */
+	kHIDUsage_KeyboardOpenBracket	= 0x2F,	/* [ or { */
+	kHIDUsage_KeyboardCloseBracket	= 0x30,	/* ] or } */
+	kHIDUsage_KeyboardBackslash	= 0x31,	/* \ or | */
+	kHIDUsage_KeyboardNonUSPound	= 0x32,	/* Non-US # or _ */
+	kHIDUsage_KeyboardSemicolon	= 0x33,	/* ; or : */
+	kHIDUsage_KeyboardQuote	= 0x34,	/* ' or " */
+	kHIDUsage_KeyboardGraveAccentAndTilde	= 0x35,	/* Grave Accent and Tilde */
+	kHIDUsage_KeyboardComma	= 0x36,	/* , or < */
+	kHIDUsage_KeyboardPeriod	= 0x37,	/* . or > */
+	kHIDUsage_KeyboardSlash	= 0x38,	/* / or ? */
+	kHIDUsage_KeyboardCapsLock	= 0x39,	/* Caps Lock */
+	kHIDUsage_KeyboardF1	= 0x3A,	/* F1 */
+	kHIDUsage_KeyboardF2	= 0x3B,	/* F2 */
+	kHIDUsage_KeyboardF3	= 0x3C,	/* F3 */
+	kHIDUsage_KeyboardF4	= 0x3D,	/* F4 */
+	kHIDUsage_KeyboardF5	= 0x3E,	/* F5 */
+	kHIDUsage_KeyboardF6	= 0x3F,	/* F6 */
+	kHIDUsage_KeyboardF7	= 0x40,	/* F7 */
+	kHIDUsage_KeyboardF8	= 0x41,	/* F8 */
+	kHIDUsage_KeyboardF9	= 0x42,	/* F9 */
+	kHIDUsage_KeyboardF10	= 0x43,	/* F10 */
+	kHIDUsage_KeyboardF11	= 0x44,	/* F11 */
+	kHIDUsage_KeyboardF12	= 0x45,	/* F12 */
+	kHIDUsage_KeyboardPrintScreen	= 0x46,	/* Print Screen */
+	kHIDUsage_KeyboardScrollLock	= 0x47,	/* Scroll Lock */
+	kHIDUsage_KeyboardPause	= 0x48,	/* Pause */
+	kHIDUsage_KeyboardInsert	= 0x49,	/* Insert */
+	kHIDUsage_KeyboardHome	= 0x4A,	/* Home */
+	kHIDUsage_KeyboardPageUp	= 0x4B,	/* Page Up */
+	kHIDUsage_KeyboardDeleteForward	= 0x4C,	/* Delete Forward */
+	kHIDUsage_KeyboardEnd	= 0x4D,	/* End */
+	kHIDUsage_KeyboardPageDown	= 0x4E,	/* Page Down */
+	kHIDUsage_KeyboardRightArrow	= 0x4F,	/* Right Arrow */
+	kHIDUsage_KeyboardLeftArrow	= 0x50,	/* Left Arrow */
+	kHIDUsage_KeyboardDownArrow	= 0x51,	/* Down Arrow */
+	kHIDUsage_KeyboardUpArrow	= 0x52,	/* Up Arrow */
+	kHIDUsage_KeypadNumLock	= 0x53,	/* Keypad NumLock or Clear */
+	kHIDUsage_KeypadSlash	= 0x54,	/* Keypad / */
+	kHIDUsage_KeypadAsterisk	= 0x55,	/* Keypad * */
+	kHIDUsage_KeypadHyphen	= 0x56,	/* Keypad - */
+	kHIDUsage_KeypadPlus	= 0x57,	/* Keypad + */
+	kHIDUsage_KeypadEnter	= 0x58,	/* Keypad Enter */
+	kHIDUsage_Keypad1	= 0x59,	/* Keypad 1 or End */
+	kHIDUsage_Keypad2	= 0x5A,	/* Keypad 2 or Down Arrow */
+	kHIDUsage_Keypad3	= 0x5B,	/* Keypad 3 or Page Down */
+	kHIDUsage_Keypad4	= 0x5C,	/* Keypad 4 or Left Arrow */
+	kHIDUsage_Keypad5	= 0x5D,	/* Keypad 5 */
+	kHIDUsage_Keypad6	= 0x5E,	/* Keypad 6 or Right Arrow */
+	kHIDUsage_Keypad7	= 0x5F,	/* Keypad 7 or Home */
+	kHIDUsage_Keypad8	= 0x60,	/* Keypad 8 or Up Arrow */
+	kHIDUsage_Keypad9	= 0x61,	/* Keypad 9 or Page Up */
+	kHIDUsage_Keypad0	= 0x62,	/* Keypad 0 or Insert */
+	kHIDUsage_KeypadPeriod	= 0x63,	/* Keypad . or Delete */
+	kHIDUsage_KeyboardNonUSBackslash	= 0x64,	/* Non-US \ or | */
+	kHIDUsage_KeyboardApplication	= 0x65,	/* Application */
+	kHIDUsage_KeyboardPower	= 0x66,	/* Power */
+	kHIDUsage_KeypadEqualSign	= 0x67,	/* Keypad = */
+	kHIDUsage_KeyboardF13	= 0x68,	/* F13 */
+	kHIDUsage_KeyboardF14	= 0x69,	/* F14 */
+	kHIDUsage_KeyboardF15	= 0x6A,	/* F15 */
+	kHIDUsage_KeyboardF16	= 0x6B,	/* F16 */
+	kHIDUsage_KeyboardF17	= 0x6C,	/* F17 */
+	kHIDUsage_KeyboardF18	= 0x6D,	/* F18 */
+	kHIDUsage_KeyboardF19	= 0x6E,	/* F19 */
+	kHIDUsage_KeyboardF20	= 0x6F,	/* F20 */
+	kHIDUsage_KeyboardF21	= 0x70,	/* F21 */
+	kHIDUsage_KeyboardF22	= 0x71,	/* F22 */
+	kHIDUsage_KeyboardF23	= 0x72,	/* F23 */
+	kHIDUsage_KeyboardF24	= 0x73,	/* F24 */
+	kHIDUsage_KeyboardExecute	= 0x74,	/* Execute */
+	kHIDUsage_KeyboardHelp	= 0x75,	/* Help */
+	kHIDUsage_KeyboardMenu	= 0x76,	/* Menu */
+	kHIDUsage_KeyboardSelect	= 0x77,	/* Select */
+	kHIDUsage_KeyboardStop	= 0x78,	/* Stop */
+	kHIDUsage_KeyboardAgain	= 0x79,	/* Again */
+	kHIDUsage_KeyboardUndo	= 0x7A,	/* Undo */
+	kHIDUsage_KeyboardCut	= 0x7B,	/* Cut */
+	kHIDUsage_KeyboardCopy	= 0x7C,	/* Copy */
+	kHIDUsage_KeyboardPaste	= 0x7D,	/* Paste */
+	kHIDUsage_KeyboardFind	= 0x7E,	/* Find */
+	kHIDUsage_KeyboardMute	= 0x7F,	/* Mute */
+	kHIDUsage_KeyboardVolumeUp	= 0x80,	/* Volume Up */
+	kHIDUsage_KeyboardVolumeDown	= 0x81,	/* Volume Down */
+	kHIDUsage_KeyboardLockingCapsLock	= 0x82,	/* Locking Caps Lock */
+	kHIDUsage_KeyboardLockingNumLock	= 0x83,	/* Locking Num Lock */
+	kHIDUsage_KeyboardLockingScrollLock	= 0x84,	/* Locking Scroll Lock */
+	kHIDUsage_KeypadComma	= 0x85,	/* Keypad Comma */
+	kHIDUsage_KeypadEqualSignAS400	= 0x86,	/* Keypad Equal Sign for AS/400 */
+	kHIDUsage_KeyboardInternational1	= 0x87,	/* International1 */
+	kHIDUsage_KeyboardInternational2	= 0x88,	/* International2 */
+	kHIDUsage_KeyboardInternational3	= 0x89,	/* International3 */
+	kHIDUsage_KeyboardInternational4	= 0x8A,	/* International4 */
+	kHIDUsage_KeyboardInternational5	= 0x8B,	/* International5 */
+	kHIDUsage_KeyboardInternational6	= 0x8C,	/* International6 */
+	kHIDUsage_KeyboardInternational7	= 0x8D,	/* International7 */
+	kHIDUsage_KeyboardInternational8	= 0x8E,	/* International8 */
+	kHIDUsage_KeyboardInternational9	= 0x8F,	/* International9 */
+	kHIDUsage_KeyboardLANG1	= 0x90,	/* LANG1 */
+	kHIDUsage_KeyboardLANG2	= 0x91,	/* LANG2 */
+	kHIDUsage_KeyboardLANG3	= 0x92,	/* LANG3 */
+	kHIDUsage_KeyboardLANG4	= 0x93,	/* LANG4 */
+	kHIDUsage_KeyboardLANG5	= 0x94,	/* LANG5 */
+	kHIDUsage_KeyboardLANG6	= 0x95,	/* LANG6 */
+	kHIDUsage_KeyboardLANG7	= 0x96,	/* LANG7 */
+	kHIDUsage_KeyboardLANG8	= 0x97,	/* LANG8 */
+	kHIDUsage_KeyboardLANG9	= 0x98,	/* LANG9 */
+	kHIDUsage_KeyboardAlternateErase	= 0x99,	/* AlternateErase */
+	kHIDUsage_KeyboardSysReqOrAttention	= 0x9A,	/* SysReq/Attention */
+	kHIDUsage_KeyboardCancel	= 0x9B,	/* Cancel */
+	kHIDUsage_KeyboardClear	= 0x9C,	/* Clear */
+	kHIDUsage_KeyboardPrior	= 0x9D,	/* Prior */
+	kHIDUsage_KeyboardReturn	= 0x9E,	/* Return */
+	kHIDUsage_KeyboardSeparator	= 0x9F,	/* Separator */
+	kHIDUsage_KeyboardOut	= 0xA0,	/* Out */
+	kHIDUsage_KeyboardOper	= 0xA1,	/* Oper */
+	kHIDUsage_KeyboardClearOrAgain	= 0xA2,	/* Clear/Again */
+	kHIDUsage_KeyboardCrSelOrProps	= 0xA3,	/* CrSel/Props */
+	kHIDUsage_KeyboardExSel	= 0xA4,	/* ExSel */
+	/* 0xA5-0xDF Reserved */
+	kHIDUsage_KeyboardLeftControl	= 0xE0,	/* Left Control */
+	kHIDUsage_KeyboardLeftShift	= 0xE1,	/* Left Shift */
+	kHIDUsage_KeyboardLeftAlt	= 0xE2,	/* Left Alt */
+	kHIDUsage_KeyboardLeftGUI	= 0xE3,	/* Left GUI */
+	kHIDUsage_KeyboardRightControl	= 0xE4,	/* Right Control */
+	kHIDUsage_KeyboardRightShift	= 0xE5,	/* Right Shift */
+	kHIDUsage_KeyboardRightAlt	= 0xE6,	/* Right Alt */
+	kHIDUsage_KeyboardRightGUI	= 0xE7,	/* Right GUI */
+	/* 0xE8-0xFFFF Reserved */
+	kHIDUsage_Keyboard_Reserved = 0xFFFF
+};
+
+/* LEDs Page (0x08) */
+/* An LED or indicator is implemented as an On/Off Control (OOF) using the ÒSingle button toggleÓ mode, where a value of 1 will turn on the indicator, and a value of 0 will turn it off. The exceptions are described below. */
+enum
+{
+	kHIDUsage_LED_NumLock	= 0x01,	/* On/Off Control */
+	kHIDUsage_LED_CapsLock	= 0x02,	/* On/Off Control */
+	kHIDUsage_LED_ScrollLock	= 0x03,	/* On/Off Control */
+	kHIDUsage_LED_Compose	= 0x04,	/* On/Off Control */
+	kHIDUsage_LED_Kana	= 0x05,	/* On/Off Control */
+	kHIDUsage_LED_Power	= 0x06,	/* On/Off Control */
+	kHIDUsage_LED_Shift	= 0x07,	/* On/Off Control */
+	kHIDUsage_LED_DoNotDisturb	= 0x08,	/* On/Off Control */
+	kHIDUsage_LED_Mute	= 0x09,	/* On/Off Control */
+	kHIDUsage_LED_ToneEnable	= 0x0A,	/* On/Off Control */
+	kHIDUsage_LED_HighCutFilter	= 0x0B,	/* On/Off Control */
+	kHIDUsage_LED_LowCutFilter	= 0x0C,	/* On/Off Control */
+	kHIDUsage_LED_EqualizerEnable	= 0x0D,	/* On/Off Control */
+	kHIDUsage_LED_SoundFieldOn	= 0x0E,	/* On/Off Control */
+	kHIDUsage_LED_SurroundOn	= 0x0F,	/* On/Off Control */
+	kHIDUsage_LED_Repeat	= 0x10,	/* On/Off Control */
+	kHIDUsage_LED_Stereo	= 0x11,	/* On/Off Control */
+	kHIDUsage_LED_SamplingRateDetect	= 0x12,	/* On/Off Control */
+	kHIDUsage_LED_Spinning	= 0x13,	/* On/Off Control */
+	kHIDUsage_LED_CAV	= 0x14,	/* On/Off Control */
+	kHIDUsage_LED_CLV	= 0x15,	/* On/Off Control */
+	kHIDUsage_LED_RecordingFormatDetect	= 0x16,	/* On/Off Control */
+	kHIDUsage_LED_OffHook	= 0x17,	/* On/Off Control */
+	kHIDUsage_LED_Ring	= 0x18,	/* On/Off Control */
+	kHIDUsage_LED_MessageWaiting	= 0x19,	/* On/Off Control */
+	kHIDUsage_LED_DataMode	= 0x1A,	/* On/Off Control */
+	kHIDUsage_LED_BatteryOperation	= 0x1B,	/* On/Off Control */
+	kHIDUsage_LED_BatteryOK	= 0x1C,	/* On/Off Control */
+	kHIDUsage_LED_BatteryLow	= 0x1D,	/* On/Off Control */
+	kHIDUsage_LED_Speaker	= 0x1E,	/* On/Off Control */
+	kHIDUsage_LED_HeadSet	= 0x1F,	/* On/Off Control */
+	kHIDUsage_LED_Hold	= 0x20,	/* On/Off Control */
+	kHIDUsage_LED_Microphone	= 0x21,	/* On/Off Control */
+	kHIDUsage_LED_Coverage	= 0x22,	/* On/Off Control */
+	kHIDUsage_LED_NightMode	= 0x23,	/* On/Off Control */
+	kHIDUsage_LED_SendCalls	= 0x24,	/* On/Off Control */
+	kHIDUsage_LED_CallPickup	= 0x25,	/* On/Off Control */
+	kHIDUsage_LED_Conference	= 0x26,	/* On/Off Control */
+	kHIDUsage_LED_StandBy	= 0x27,	/* On/Off Control */
+	kHIDUsage_LED_CameraOn	= 0x28,	/* On/Off Control */
+	kHIDUsage_LED_CameraOff	= 0x29,	/* On/Off Control */
+	kHIDUsage_LED_OnLine	= 0x2A,	/* On/Off Control */
+	kHIDUsage_LED_OffLine	= 0x2B,	/* On/Off Control */
+	kHIDUsage_LED_Busy	= 0x2C,	/* On/Off Control */
+	kHIDUsage_LED_Ready	= 0x2D,	/* On/Off Control */
+	kHIDUsage_LED_PaperOut	= 0x2E,	/* On/Off Control */
+	kHIDUsage_LED_PaperJam	= 0x2F,	/* On/Off Control */
+	kHIDUsage_LED_Remote	= 0x30,	/* On/Off Control */
+	kHIDUsage_LED_Forward	= 0x31,	/* On/Off Control */
+	kHIDUsage_LED_Reverse	= 0x32,	/* On/Off Control */
+	kHIDUsage_LED_Stop	= 0x33,	/* On/Off Control */
+	kHIDUsage_LED_Rewind	= 0x34,	/* On/Off Control */
+	kHIDUsage_LED_FastForward	= 0x35,	/* On/Off Control */
+	kHIDUsage_LED_Play	= 0x36,	/* On/Off Control */
+	kHIDUsage_LED_Pause	= 0x37,	/* On/Off Control */
+	kHIDUsage_LED_Record	= 0x38,	/* On/Off Control */
+	kHIDUsage_LED_Error	= 0x39,	/* On/Off Control */
+	kHIDUsage_LED_Usage	= 0x3A,	/* Selector */
+	kHIDUsage_LED_UsageInUseIndicator	= 0x3B,	/* Usage Switch */
+	kHIDUsage_LED_UsageMultiModeIndicator	= 0x3C,	/* Usage Modifier */
+	kHIDUsage_LED_IndicatorOn	= 0x3D,	/* Selector */
+	kHIDUsage_LED_IndicatorFlash	= 0x3E,	/* Selector */
+	kHIDUsage_LED_IndicatorSlowBlink	= 0x3F,	/* Selector */
+	kHIDUsage_LED_IndicatorFastBlink	= 0x40,	/* Selector */
+	kHIDUsage_LED_IndicatorOff	= 0x41,	/* Selector */
+	kHIDUsage_LED_FlashOnTime	= 0x42,	/* Dynamic Value */
+	kHIDUsage_LED_SlowBlinkOnTime	= 0x43,	/* Dynamic Value */
+	kHIDUsage_LED_SlowBlinkOffTime	= 0x44,	/* Dynamic Value */
+	kHIDUsage_LED_FastBlinkOnTime	= 0x45,	/* Dynamic Value */
+	kHIDUsage_LED_FastBlinkOffTime	= 0x46,	/* Dynamic Value */
+	kHIDUsage_LED_UsageIndicatorColor	= 0x47,	/* Usage Modifier */
+	kHIDUsage_LED_IndicatorRed	= 0x48,	/* Selector */
+	kHIDUsage_LED_IndicatorGreen	= 0x49,	/* Selector */
+	kHIDUsage_LED_IndicatorAmber	= 0x4A,	/* Selector */
+	kHIDUsage_LED_GenericIndicator	= 0x4B,	/* On/Off Control */
+	kHIDUsage_LED_SystemSuspend	= 0x4C,	/* On/Off Control */
+	kHIDUsage_LED_ExternalPowerConnected	= 0x4D,	/* On/Off Control */
+	/* 0x4E - 0xFFFF Reserved */
+	kHIDUsage_LED_Reserved = 0xFFFF
+};
+
+/* Button Page (0x09) */
+/* The Button page is the first place an application should look for user selection controls. System graphical user interfaces typically employ a pointer and a set of hierarchical selectors to select, move and otherwise manipulate their environment. For these purposes the following assignment of significance can be applied to the Button usages: */
+/* ¥ Button 1, Primary Button. Used for object selecting, dragging, and double click activation. On MacOS, this is the only button. Microsoft operating systems call this a logical left button, because it */
+/* is not necessarily physically located on the left of the pointing device. */
+/* ¥ Button 2, Secondary Button. Used by newer graphical user interfaces to browse object properties. Exposed by systems to applications that typically assign application-specific functionality. */
+/* ¥ Button 3, Tertiary Button. Optional control. Exposed to applications, but seldom assigned functionality due to prevalence of two- and one-button devices. */
+/* ¥ Buttons 4 -55. As the button number increases, its significance as a selector decreases. */
+/* In many ways the assignment of button numbers is similar to the assignment of Effort in Physical descriptors. Button 1 would be used to define the button a finger rests on when the hand is in the Òat restÓ position, that is, virtually no effort is required by the user to activate the button. Button values increment as the finger has to stretch to reach a control. See Section 6.2.3, ÒPhysical Descriptors,Ó in the HID Specification for methods of further qualifying buttons. */
+enum
+{
+	kHIDUsage_Button_1	= 0x01,	/* (primary/trigger) */
+	kHIDUsage_Button_2	= 0x02,	/* (secondary) */
+	kHIDUsage_Button_3	= 0x03,	/* (tertiary) */
+	kHIDUsage_Button_4	= 0x04, /* 4th button */
+	/* ... */
+	kHIDUsage_Button_65535	= 0xFFFF
+};
+
+/* Ordinal Page (0x0A) */
+/* The Ordinal page allows multiple instances of a control or sets of controls to be declared without requiring individual enumeration in the native usage page. For example, it is not necessary to declare usages of Pointer 1, Pointer 2, and so forth on the Generic Desktop page. When parsed, the ordinal instance number is, in essence, concatenated to the usages attached to the encompassing collection to create Pointer 1, Pointer 2, and so forth. */
+/* For an example, see Section A.5, ÒMultiple Instances of a Control,Ó in Appendix A, ÒUsage Examples.Ó By convention, an Ordinal collection is placed inside the collection for which it is declaring multiple instances. */
+/* Instances do not have to be identical. */
+enum
+{
+	/* 0x00 Reserved */
+	kHIDUsage_Ord_Instance1	= 0x01,	/* Usage Modifier */
+	kHIDUsage_Ord_Instance2	= 0x02,	/* Usage Modifier */
+	kHIDUsage_Ord_Instance3	= 0x03,	/* Usage Modifier */
+	kHIDUsage_Ord_Instance4	= 0x04,	/* Usage Modifier */
+	kHIDUsage_Ord_Instance65535	= 0xFFFF	/* Usage Modifier */
+};
+
+/* Telephony Page (0x0B) */
+/* This usage page defines the keytop and control usages for telephony devices. */
+/* Indicators on a phone are handled by wrapping them in LED: Usage In Use Indicator and LED: Usage Selected Indicator usages. For example, a message-indicator LED would be identified by a Telephony: Message usage declared as a Feature or Output in a LED: Usage In Use Indicator collection. */
+/* See Section 14, ÒConsumer Page (0x0C),Ó for audio volume and tone controls. */
+enum
+{
+	kHIDUsage_Tfon_Phone	= 0x01,	/* Application Collection */
+	kHIDUsage_Tfon_AnsweringMachine	= 0x02,	/* Application Collection */
+	kHIDUsage_Tfon_MessageControls	= 0x03,	/* Logical Collection */
+	kHIDUsage_Tfon_Handset	= 0x04,	/* Logical Collection */
+	kHIDUsage_Tfon_Headset	= 0x05,	/* Logical Collection */
+	kHIDUsage_Tfon_TelephonyKeyPad	= 0x06,	/* Named Array */
+	kHIDUsage_Tfon_ProgrammableButton	= 0x07,	/* Named Array */
+	/* 0x08 - 0x1F Reserved */
+	kHIDUsage_Tfon_HookSwitch	= 0x20,	/* On/Off Control */
+	kHIDUsage_Tfon_Flash	= 0x21,	/* Momentary Control */
+	kHIDUsage_Tfon_Feature	= 0x22,	/* One-Shot Control */
+	kHIDUsage_Tfon_Hold	= 0x23,	/* On/Off Control */
+	kHIDUsage_Tfon_Redial	= 0x24,	/* One-Shot Control */
+	kHIDUsage_Tfon_Transfer	= 0x25,	/* One-Shot Control */
+	kHIDUsage_Tfon_Drop	= 0x26,	/* One-Shot Control */
+	kHIDUsage_Tfon_Park	= 0x27,	/* On/Off Control */
+	kHIDUsage_Tfon_ForwardCalls	= 0x28,	/* On/Off Control */
+	kHIDUsage_Tfon_AlternateFunction	= 0x29,	/* Momentary Control */
+	kHIDUsage_Tfon_Line	= 0x2A,	/* One-Shot Control */
+	kHIDUsage_Tfon_SpeakerPhone	= 0x2B,	/* On/Off Control */
+	kHIDUsage_Tfon_Conference	= 0x2C,	/* On/Off Control */
+	kHIDUsage_Tfon_RingEnable	= 0x2D,	/* On/Off Control */
+	kHIDUsage_Tfon_Ring	= 0x2E,	/* Selector */
+	kHIDUsage_Tfon_PhoneMute	= 0x2F,	/* On/Off Control */
+	kHIDUsage_Tfon_CallerID	= 0x30,	/* Momentary Control */
+	/* 0x31 - 0x4F Reserved */
+	kHIDUsage_Tfon_SpeedDial	= 0x50,	/* One-Shot Control */
+	kHIDUsage_Tfon_StoreNumber	= 0x51,	/* One-Shot Control */
+	kHIDUsage_Tfon_RecallNumber	= 0x52,	/* One-Shot Control */
+	kHIDUsage_Tfon_PhoneDirectory	= 0x53,	/* On/Off Control */
+	/* 0x54 - 0x6F Reserved */
+	kHIDUsage_Tfon_VoiceMail	= 0x70,	/* On/Off Control */
+	kHIDUsage_Tfon_ScreenCalls	= 0x71,	/* On/Off Control */
+	kHIDUsage_Tfon_DoNotDisturb	= 0x72,	/* On/Off Control */
+	kHIDUsage_Tfon_Message	= 0x73,	/* One-Shot Control */
+	kHIDUsage_Tfon_AnswerOnOrOff	= 0x74,	/* On/Off Control */
+	/* 0x75 - 0x8F Reserved */
+	kHIDUsage_Tfon_InsideDialTone	= 0x90,	/* Momentary Control */
+	kHIDUsage_Tfon_OutsideDialTone	= 0x91,	/* Momentary Control */
+	kHIDUsage_Tfon_InsideRingTone	= 0x92,	/* Momentary Control */
+	kHIDUsage_Tfon_OutsideRingTone	= 0x93,	/* Momentary Control */
+	kHIDUsage_Tfon_PriorityRingTone	= 0x94,	/* Momentary Control */
+	kHIDUsage_Tfon_InsideRingback	= 0x95,	/* Momentary Control */
+	kHIDUsage_Tfon_PriorityRingback	= 0x96,	/* Momentary Control */
+	kHIDUsage_Tfon_LineBusyTone	= 0x97,	/* Momentary Control */
+	kHIDUsage_Tfon_ReorderTone	= 0x98,	/* Momentary Control */
+	kHIDUsage_Tfon_CallWaitingTone	= 0x99,	/* Momentary Control */
+	kHIDUsage_Tfon_ConfirmationTone1	= 0x9A,	/* Momentary Control */
+	kHIDUsage_Tfon_ConfirmationTone2	= 0x9B,	/* Momentary Control */
+	kHIDUsage_Tfon_TonesOff	= 0x9C,	/* On/Off Control */
+	kHIDUsage_Tfon_OutsideRingback	= 0x9D,	/* Momentary Control */
+	/* 0x9E - 0xAF Reserved */
+	kHIDUsage_Tfon_PhoneKey0	= 0xB0,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey1	= 0xB1,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey2	= 0xB2,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey3	= 0xB3,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey4	= 0xB4,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey5	= 0xB5,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey6	= 0xB6,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey7	= 0xB7,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey8	= 0xB8,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey9	= 0xB9,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyStar	= 0xBA,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyPound	= 0xBB,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyA	= 0xBC,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyB	= 0xBD,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyC	= 0xBE,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyD	= 0xBF,	/* Selector/One-Shot Control */
+	/* 0xC0 - 0xFFFF Reserved */
+	kHIDUsage_TFon_Reserved = 0xFFFF
+};
+
+/* Consumer Page (0x0C) */
+/* All controls on the Consumer page are application-specific. That is, they affect a specific device, not the system as a whole. */
+enum
+{
+	kHIDUsage_Csmr_ConsumerControl	= 0x01,	/* Application Collection */
+	kHIDUsage_Csmr_NumericKeyPad	= 0x02,	/* Named Array */
+	kHIDUsage_Csmr_ProgrammableButtons	= 0x03,	/* Named Array */
+	/* 0x03 - 0x1F Reserved */
+	kHIDUsage_Csmr_Plus10	= 0x20,	/* One-Shot Control */
+	kHIDUsage_Csmr_Plus100	= 0x21,	/* One-Shot Control */
+	kHIDUsage_Csmr_AMOrPM	= 0x22,	/* One-Shot Control */
+	/* 0x23 - 0x3F Reserved */
+	kHIDUsage_Csmr_Power	= 0x30,	/* On/Off Control */
+	kHIDUsage_Csmr_Reset	= 0x31,	/* One-Shot Control */
+	kHIDUsage_Csmr_Sleep	= 0x32,	/* One-Shot Control */
+	kHIDUsage_Csmr_SleepAfter	= 0x33,	/* One-Shot Control */
+	kHIDUsage_Csmr_SleepMode	= 0x34,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_Illumination	= 0x35,	/* On/Off Control */
+	kHIDUsage_Csmr_FunctionButtons	= 0x36,	/* Named Array */
+	/* 0x37 - 0x3F Reserved */
+	kHIDUsage_Csmr_Menu	= 0x40,	/* On/Off Control */
+	kHIDUsage_Csmr_MenuPick	= 0x41,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuUp	= 0x42,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuDown	= 0x43,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuLeft	= 0x44,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuRight	= 0x45,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuEscape	= 0x46,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuValueIncrease	= 0x47,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuValueDecrease	= 0x48,	/* One-Shot Control */
+	/* 0x49 - 0x5F Reserved */
+	kHIDUsage_Csmr_DataOnScreen	= 0x60,	/* On/Off Control */
+	kHIDUsage_Csmr_ClosedCaption	= 0x61,	/* On/Off Control */
+	kHIDUsage_Csmr_ClosedCaptionSelect	= 0x62,	/* Selector */
+	kHIDUsage_Csmr_VCROrTV	= 0x63,	/* On/Off Control */
+	kHIDUsage_Csmr_BroadcastMode	= 0x64,	/* One-Shot Control */
+	kHIDUsage_Csmr_Snapshot	= 0x65,	/* One-Shot Control */
+	kHIDUsage_Csmr_Still	= 0x66,	/* One-Shot Control */
+	/* 0x67 - 0x7F Reserved */
+	kHIDUsage_Csmr_Selection	= 0x80,	/* Named Array */
+	kHIDUsage_Csmr_Assign	= 0x81,	/* Selector */
+	kHIDUsage_Csmr_ModeStep	= 0x82,	/* One-Shot Control */
+	kHIDUsage_Csmr_RecallLast	= 0x83,	/* One-Shot Control */
+	kHIDUsage_Csmr_EnterChannel	= 0x84,	/* One-Shot Control */
+	kHIDUsage_Csmr_OrderMovie	= 0x85,	/* One-Shot Control */
+	kHIDUsage_Csmr_Channel	= 0x86,	/* Linear Control */
+	kHIDUsage_Csmr_MediaSelection	= 0x87,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectComputer	= 0x88,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectTV	= 0x89,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectWWW	= 0x8A,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectDVD	= 0x8B,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectTelephone	= 0x8C,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectProgramGuide	= 0x8D,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectVideoPhone	= 0x8E,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectGames	= 0x8F,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectMessages	= 0x90,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectCD	= 0x91,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectVCR	= 0x92,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectTuner	= 0x93,	/* Selector */
+	kHIDUsage_Csmr_Quit	= 0x94,	/* One-Shot Control */
+	kHIDUsage_Csmr_Help	= 0x95,	/* On/Off Control */
+	kHIDUsage_Csmr_MediaSelectTape	= 0x96,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectCable	= 0x97,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectSatellite	= 0x98,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectSecurity	= 0x99,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectHome	= 0x9A,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectCall	= 0x9B,	/* Selector */
+	kHIDUsage_Csmr_ChannelIncrement	= 0x9C,	/* One-Shot Control */
+	kHIDUsage_Csmr_ChannelDecrement	= 0x9D,	/* One-Shot Control */
+	kHIDUsage_Csmr_Media	= 0x9E,	/* Selector */
+	/* 0x9F Reserved */
+	kHIDUsage_Csmr_VCRPlus	= 0xA0,	/* One-Shot Control */
+	kHIDUsage_Csmr_Once	= 0xA1,	/* One-Shot Control */
+	kHIDUsage_Csmr_Daily	= 0xA2,	/* One-Shot Control */
+	kHIDUsage_Csmr_Weekly	= 0xA3,	/* One-Shot Control */
+	kHIDUsage_Csmr_Monthly	= 0xA4,	/* One-Shot Control */
+	/* 0xA5 - 0xAF Reserved */
+	kHIDUsage_Csmr_Play	= 0xB0,	/* On/Off Control */
+	kHIDUsage_Csmr_Pause	= 0xB1,	/* On/Off Control */
+	kHIDUsage_Csmr_Record	= 0xB2,	/* On/Off Control */
+	kHIDUsage_Csmr_FastForward	= 0xB3,	/* On/Off Control */
+	kHIDUsage_Csmr_Rewind	= 0xB4,	/* On/Off Control */
+	kHIDUsage_Csmr_ScanNextTrack	= 0xB5,	/* One-Shot Control */
+	kHIDUsage_Csmr_ScanPreviousTrack	= 0xB6,	/* One-Shot Control */
+	kHIDUsage_Csmr_Stop	= 0xB7,	/* One-Shot Control */
+	kHIDUsage_Csmr_Eject	= 0xB8,	/* One-Shot Control */
+	kHIDUsage_Csmr_RandomPlay	= 0xB9,	/* On/Off Control */
+	kHIDUsage_Csmr_SelectDisc	= 0xBA,	/* Named Array */
+	kHIDUsage_Csmr_EnterDisc	= 0xBB,	/* Momentary Control */
+	kHIDUsage_Csmr_Repeat	= 0xBC,	/* One-Shot Control */
+	kHIDUsage_Csmr_Tracking	= 0xBD,	/* Linear Control */
+	kHIDUsage_Csmr_TrackNormal	= 0xBE,	/* One-Shot Control */
+	kHIDUsage_Csmr_SlowTracking	= 0xBF,	/* Linear Control */
+	kHIDUsage_Csmr_FrameForward	= 0xC0,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_FrameBack	= 0xC1,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_Mark	= 0xC2,	/* One-Shot Control */
+	kHIDUsage_Csmr_ClearMark	= 0xC3,	/* One-Shot Control */
+	kHIDUsage_Csmr_RepeatFromMark	= 0xC4,	/* On/Off Control */
+	kHIDUsage_Csmr_ReturnToMark	= 0xC5,	/* One-Shot Control */
+	kHIDUsage_Csmr_SearchMarkForward	= 0xC6,	/* One-Shot Control */
+	kHIDUsage_Csmr_SearchMarkBackwards	= 0xC7,	/* One-Shot Control */
+	kHIDUsage_Csmr_CounterReset	= 0xC8,	/* One-Shot Control */
+	kHIDUsage_Csmr_ShowCounter	= 0xC9,	/* One-Shot Control */
+	kHIDUsage_Csmr_TrackingIncrement	= 0xCA,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_TrackingDecrement	= 0xCB,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_StopOrEject	= 0xCC,	/* One-Shot Control */
+	kHIDUsage_Csmr_PlayOrPause	= 0xCD,	/* One-Shot Control */
+	kHIDUsage_Csmr_PlayOrSkip	= 0xCE,	/* One-Shot Control */
+	/* 0xCF - 0xDF Reserved */
+	kHIDUsage_Csmr_Volume	= 0xE0,	/* Linear Control */
+	kHIDUsage_Csmr_Balance	= 0xE1,	/* Linear Control */
+	kHIDUsage_Csmr_Mute	= 0xE2,	/* On/Off Control */
+	kHIDUsage_Csmr_Bass	= 0xE3,	/* Linear Control */
+	kHIDUsage_Csmr_Treble	= 0xE4,	/* Linear Control */
+	kHIDUsage_Csmr_BassBoost	= 0xE5,	/* On/Off Control */
+	kHIDUsage_Csmr_SurroundMode	= 0xE6,	/* One-Shot Control */
+	kHIDUsage_Csmr_Loudness	= 0xE7,	/* On/Off Control */
+	kHIDUsage_Csmr_MPX	= 0xE8,	/* On/Off Control */
+	kHIDUsage_Csmr_VolumeIncrement	= 0xE9,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_VolumeDecrement	= 0xEA,	/* Re-Trigger Control */
+	/* 0xEB - 0xEF Reserved */
+	kHIDUsage_Csmr_Speed	= 0xF0,	/* Selector */
+	kHIDUsage_Csmr_PlaybackSpeed	= 0xF1,	/* Named Array */
+	kHIDUsage_Csmr_StandardPlay	= 0xF2,	/* Selector */
+	kHIDUsage_Csmr_LongPlay	= 0xF3,	/* Selector */
+	kHIDUsage_Csmr_ExtendedPlay	= 0xF4,	/* Selector */
+	kHIDUsage_Csmr_Slow	= 0xF5,	/* One-Shot Control */
+	/* 0xF6 - 0xFF Reserved */
+	kHIDUsage_Csmr_FanEnable	= 0x100,	/* On/Off Control */
+	kHIDUsage_Csmr_FanSpeed	= 0x101,	/* Linear Control */
+	kHIDUsage_Csmr_LightEnable	= 0x102,	/* On/Off Control */
+	kHIDUsage_Csmr_LightIlluminationLevel	= 0x103,	/* Linear Control */
+	kHIDUsage_Csmr_ClimateControlEnable	= 0x104,	/* On/Off Control */
+	kHIDUsage_Csmr_RoomTemperature	= 0x105,	/* Linear Control */
+	kHIDUsage_Csmr_SecurityEnable	= 0x106,	/* On/Off Control */
+	kHIDUsage_Csmr_FireAlarm	= 0x107,	/* One-Shot Control */
+	kHIDUsage_Csmr_PoliceAlarm	= 0x108,	/* One-Shot Control */
+	/* 0x109 - 0x14F Reserved */
+	kHIDUsage_Csmr_BalanceRight	= 0x150,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_BalanceLeft	= 0x151,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_BassIncrement	= 0x152,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_BassDecrement	= 0x153,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_TrebleIncrement	= 0x154,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_TrebleDecrement	= 0x155,	/* Re-Trigger Control */
+	/* 0x156 - 0x15F Reserved */
+	kHIDUsage_Csmr_SpeakerSystem	= 0x160,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelLeft	= 0x161,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelRight	= 0x162,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelCenter	= 0x163,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelFront	= 0x164,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelCenterFront	= 0x165,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelSide	= 0x166,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelSurround	= 0x167,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelLowFrequencyEnhancement	= 0x168,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelTop	= 0x169,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelUnknown	= 0x16A,	/* Logical Collection */
+	/* 0x16B - 0x16F Reserved */
+	kHIDUsage_Csmr_SubChannel	= 0x170,	/* Linear Control */
+	kHIDUsage_Csmr_SubChannelIncrement	= 0x171,	/* One-Shot Control */
+	kHIDUsage_Csmr_SubChannelDecrement	= 0x172,	/* One-Shot Control */
+	kHIDUsage_Csmr_AlternateAudioIncrement	= 0x173,	/* One-Shot Control */
+	kHIDUsage_Csmr_AlternateAudioDecrement	= 0x174,	/* One-Shot Control */
+	/* 0x175 - 0x17F Reserved */
+	kHIDUsage_Csmr_ApplicationLaunchButtons	= 0x180,	/* Named Array */
+	kHIDUsage_Csmr_ALLaunchButtonConfigurationTool	= 0x181,	/* Selector */
+	kHIDUsage_Csmr_ALProgrammableButtonConfiguration	= 0x182,	/* Selector */
+	kHIDUsage_Csmr_ALConsumerControlConfiguration	= 0x183,	/* Selector */
+	kHIDUsage_Csmr_ALWordProcessor	= 0x184,	/* Selector */
+	kHIDUsage_Csmr_ALTextEditor	= 0x185,	/* Selector */
+	kHIDUsage_Csmr_ALSpreadsheet	= 0x186,	/* Selector */
+	kHIDUsage_Csmr_ALGraphicsEditor	= 0x187,	/* Selector */
+	kHIDUsage_Csmr_ALPresentationApp	= 0x188,	/* Selector */
+	kHIDUsage_Csmr_ALDatabaseApp	= 0x189,	/* Selector */
+	kHIDUsage_Csmr_ALEmailReader	= 0x18A,	/* Selector */
+	kHIDUsage_Csmr_ALNewsreader	= 0x18B,	/* Selector */
+	kHIDUsage_Csmr_ALVoicemail	= 0x18C,	/* Selector */
+	kHIDUsage_Csmr_ALContactsOrAddressBook	= 0x18D,	/* Selector */
+	kHIDUsage_Csmr_ALCalendarOrSchedule	= 0x18E,	/* Selector */
+	kHIDUsage_Csmr_ALTaskOrProjectManager	= 0x18F,	/* Selector */
+	kHIDUsage_Csmr_ALLogOrJournalOrTimecard	= 0x190,	/* Selector */
+	kHIDUsage_Csmr_ALCheckbookOrFinance	= 0x191,	/* Selector */
+	kHIDUsage_Csmr_ALCalculator	= 0x192,	/* Selector */
+	kHIDUsage_Csmr_ALAOrVCaptureOrPlayback	= 0x193,	/* Selector */
+	kHIDUsage_Csmr_ALLocalMachineBrowser	= 0x194,	/* Selector */
+	kHIDUsage_Csmr_ALLANOrWANBrowser	= 0x195,	/* Selector */
+	kHIDUsage_Csmr_ALInternetBrowser	= 0x196,	/* Selector */
+	kHIDUsage_Csmr_ALRemoteNetworkingOrISPConnect	= 0x197,	/* Selector */
+	kHIDUsage_Csmr_ALNetworkConference	= 0x198,	/* Selector */
+	kHIDUsage_Csmr_ALNetworkChat	= 0x199,	/* Selector */
+	kHIDUsage_Csmr_ALTelephonyOrDialer	= 0x19A,	/* Selector */
+	kHIDUsage_Csmr_ALLogon	= 0x19B,	/* Selector */
+	kHIDUsage_Csmr_ALLogoff	= 0x19C,	/* Selector */
+	kHIDUsage_Csmr_ALLogonOrLogoff	= 0x19D,	/* Selector */
+	kHIDUsage_Csmr_ALTerminalLockOrScreensaver	= 0x19E,	/* Selector */
+	kHIDUsage_Csmr_ALControlPanel	= 0x19F,	/* Selector */
+	kHIDUsage_Csmr_ALCommandLineProcessorOrRun	= 0x1A0,	/* Selector */
+	kHIDUsage_Csmr_ALProcessOrTaskManager	= 0x1A1,	/* Selector */
+	kHIDUsage_Csmr_AL	= 0x1A2,	/* Selector */
+	kHIDUsage_Csmr_ALNextTaskOrApplication	= 0x1A3,	/* Selector */
+	kHIDUsage_Csmr_ALPreviousTaskOrApplication	= 0x1A4,	/* Selector */
+	kHIDUsage_Csmr_ALPreemptiveHaltTaskOrApplication	= 0x1A5,	/* Selector */
+    kHIDUsage_Csmr_ALIntegratedHelpCenter   = 0x1A6, /* Selector */
+    kHIDUsage_Csmr_ALDocuments   = 0x1A7, /* Selector */
+    kHIDUsage_Csmr_ALThesaurus   = 0x1A8, /* Selector */
+    kHIDUsage_Csmr_ALDictionary   = 0x1A9, /* Selector */
+    kHIDUsage_Csmr_ALDesktop   = 0x1AA, /* Selector */
+    kHIDUsage_Csmr_ALSpellCheck   = 0x1AB, /* Selector */
+    kHIDUsage_Csmr_ALGrammerCheck   = 0x1AC, /* Selector */
+    kHIDUsage_Csmr_ALWirelessStatus   = 0x1AD, /* Selector */
+    kHIDUsage_Csmr_ALKeyboardLayout   = 0x1AE, /* Selector */
+    kHIDUsage_Csmr_ALVirusProtection   = 0x1AF, /* Selector */
+    kHIDUsage_Csmr_ALEncryption   = 0x1B0, /* Selector */
+    kHIDUsage_Csmr_ALScreenSaver   = 0x1B1, /* Selector */
+    kHIDUsage_Csmr_ALAlarms   = 0x1B2, /* Selector */
+    kHIDUsage_Csmr_ALClock   = 0x1B3, /* Selector */
+    kHIDUsage_Csmr_ALFileBrowser   = 0x1B4, /* Selector */
+    kHIDUsage_Csmr_ALPowerStatus   = 0x1B5, /* Selector */
+	/* 0x1A6 - 0x1FF Reserved */
+	kHIDUsage_Csmr_GenericGUIApplicationControls	= 0x200,	/* Named Array */
+	kHIDUsage_Csmr_ACNew	= 0x201,	/* Selector */
+	kHIDUsage_Csmr_ACOpen	= 0x202,	/* Selector */
+	kHIDUsage_Csmr_ACClose	= 0x203,	/* Selector */
+	kHIDUsage_Csmr_ACExit	= 0x204,	/* Selector */
+	kHIDUsage_Csmr_ACMaximize	= 0x205,	/* Selector */
+	kHIDUsage_Csmr_ACMinimize	= 0x206,	/* Selector */
+	kHIDUsage_Csmr_ACSave	= 0x207,	/* Selector */
+	kHIDUsage_Csmr_ACPrint	= 0x208,	/* Selector */
+	kHIDUsage_Csmr_ACProperties	= 0x209,	/* Selector */
+	kHIDUsage_Csmr_ACUndo	= 0x21A,	/* Selector */
+	kHIDUsage_Csmr_ACCopy	= 0x21B,	/* Selector */
+	kHIDUsage_Csmr_ACCut	= 0x21C,	/* Selector */
+	kHIDUsage_Csmr_ACPaste	= 0x21D,	/* Selector */
+	kHIDUsage_Csmr_AC	= 0x21E,	/* Selector */
+	kHIDUsage_Csmr_ACFind	= 0x21F,	/* Selector */
+	kHIDUsage_Csmr_ACFindandReplace	= 0x220,	/* Selector */
+	kHIDUsage_Csmr_ACSearch	= 0x221,	/* Selector */
+	kHIDUsage_Csmr_ACGoTo	= 0x222,	/* Selector */
+	kHIDUsage_Csmr_ACHome	= 0x223,	/* Selector */
+	kHIDUsage_Csmr_ACBack	= 0x224,	/* Selector */
+	kHIDUsage_Csmr_ACForward	= 0x225,	/* Selector */
+	kHIDUsage_Csmr_ACStop	= 0x226,	/* Selector */
+	kHIDUsage_Csmr_ACRefresh	= 0x227,	/* Selector */
+	kHIDUsage_Csmr_ACPreviousLink	= 0x228,	/* Selector */
+	kHIDUsage_Csmr_ACNextLink	= 0x229,	/* Selector */
+	kHIDUsage_Csmr_ACBookmarks	= 0x22A,	/* Selector */
+	kHIDUsage_Csmr_ACHistory	= 0x22B,	/* Selector */
+	kHIDUsage_Csmr_ACSubscriptions	= 0x22C,	/* Selector */
+	kHIDUsage_Csmr_ACZoomIn	= 0x22D,	/* Selector */
+	kHIDUsage_Csmr_ACZoomOut	= 0x22E,	/* Selector */
+	kHIDUsage_Csmr_ACZoom	= 0x22F,	/* Selector */
+	kHIDUsage_Csmr_ACFullScreenView	= 0x230,	/* Selector */
+	kHIDUsage_Csmr_ACNormalView	= 0x231,	/* Selector */
+	kHIDUsage_Csmr_ACViewToggle	= 0x232,	/* Selector */
+	kHIDUsage_Csmr_ACScrollUp	= 0x233,	/* Selector */
+	kHIDUsage_Csmr_ACScrollDown	= 0x234,	/* Selector */
+	kHIDUsage_Csmr_ACScroll	= 0x235,	/* Selector */
+	kHIDUsage_Csmr_ACPanLeft	= 0x236,	/* Selector */
+	kHIDUsage_Csmr_ACPanRight	= 0x237,	/* Selector */
+	kHIDUsage_Csmr_ACPan	= 0x238,	/* Selector */
+	kHIDUsage_Csmr_ACNewWindow	= 0x239,	/* Selector */
+	kHIDUsage_Csmr_ACTileHorizontally	= 0x23A,	/* Selector */
+	kHIDUsage_Csmr_ACTileVertically	= 0x23B,	/* Selector */
+	kHIDUsage_Csmr_ACFormat	= 0x23C,	/* Selector */
+	/* 0x23D - 0xFFFF Reserved */
+	kHIDUsage_Csmr_Reserved = 0xFFFF
+};
+
+/* Physical Interface Device Page (0x0F) */
+/* This section provides detailed descriptions of the usages employed by Digitizer Devices. */
+enum
+{
+	kHIDUsage_PID_PhysicalInterfaceDevice = 0x01,		/* CA - A collection of PID usages */
+	/* 0x02 - 0x1F Reserved */
+	kHIDUsage_PID_Normal = 0x20,						/* DV - A force applied perpendicular to the surface of an object */
+	kHIDUsage_PID_SetEffectReport = 0x21,				/* XXX */
+	kHIDUsage_PID_EffectBlockIndex = 0x22,				/* XXX */
+	kHIDUsage_PID_ParamBlockOffset = 0x23,				/* XXX */
+	kHIDUsage_PID_ROM_Flag = 0x24,						/* XXX */
+	kHIDUsage_PID_EffectType = 0x25,					/* XXX */
+	kHIDUsage_PID_ET_ConstantForce = 0x26,				/* XXX */
+	kHIDUsage_PID_ET_Ramp = 0x27,						/* XXX */
+	kHIDUsage_PID_ET_CustomForceData = 0x28,			/* XXX */
+	/* 0x29 - 0x2F Reserved */
+	kHIDUsage_PID_ET_Square = 0x30,						/* XXX */
+	kHIDUsage_PID_ET_Sine = 0x31,						/* XXX */
+	kHIDUsage_PID_ET_Triangle = 0x32,					/* XXX */
+	kHIDUsage_PID_ET_SawtoothUp = 0x33,					/* XXX */
+	kHIDUsage_PID_ET_SawtoothDown = 0x34,				/* XXX */
+	/* 0x35 - 0x3F Reserved */
+	kHIDUsage_PID_ET_Spring = 0x40,						/* XXX */
+	kHIDUsage_PID_ET_Damper = 0x41,						/* XXX */
+	kHIDUsage_PID_ET_Inertia = 0x42,					/* XXX */
+	kHIDUsage_PID_ET_Friction = 0x43,					/* XXX */
+	/* 0x44 - 0x4F Reserved */
+	kHIDUsage_PID_Duration = 0x50,						/* XXX */
+	kHIDUsage_PID_SamplePeriod = 0x51,					/* XXX */
+	kHIDUsage_PID_Gain = 0x52,							/* XXX */
+	kHIDUsage_PID_TriggerButton = 0x53,					/* XXX */
+	kHIDUsage_PID_TriggerRepeatInterval = 0x54,			/* XXX */
+	kHIDUsage_PID_AxesEnable = 0x55,					/* XXX */
+	kHIDUsage_PID_DirectionEnable = 0x56,				/* XXX */
+	kHIDUsage_PID_Direction = 0x57,						/* XXX */
+	kHIDUsage_PID_TypeSpecificBlockOffset = 0x58,		/* XXX */
+	kHIDUsage_PID_BlockType = 0x59,						/* XXX */
+	kHIDUsage_PID_SetEnvelopeReport = 0x5A,				/* XXX */
+	kHIDUsage_PID_AttackLevel = 0x5B,					/* XXX */
+	kHIDUsage_PID_AttackTime = 0x5C,					/* XXX */
+	kHIDUsage_PID_FadeLevel = 0x5D,						/* XXX */
+	kHIDUsage_PID_FadeTime = 0x5E,						/* XXX */
+	kHIDUsage_PID_SetConditionReport = 0x5F,			/* XXX */
+
+	kHIDUsage_PID_CP_Offset = 0x60,						/* XXX */
+	kHIDUsage_PID_PositiveCoefficient = 0x61,			/* XXX */
+	kHIDUsage_PID_NegativeCoefficient = 0x62,			/* XXX */
+	kHIDUsage_PID_PositiveSaturation = 0x63,			/* XXX */
+	kHIDUsage_PID_NegativeSaturation = 0x64,			/* XXX */
+	kHIDUsage_PID_DeadBand = 0x65,						/* XXX */
+	kHIDUsage_PID_DownloadForceSample = 0x66,			/* XXX */
+	kHIDUsage_PID_IsochCustomForceEnable = 0x67,		/* XXX */
+	kHIDUsage_PID_CustomForceDataReport = 0x68,			/* XXX */
+	kHIDUsage_PID_CustomForceData = 0x69,				/* XXX */
+	kHIDUsage_PID_CustomForceVendorDefinedData = 0x6A,	/* XXX */
+	kHIDUsage_PID_SetCustomForceReport = 0x6B,			/* XXX */
+	kHIDUsage_PID_CustomForceDataOffset = 0x6C,			/* XXX */
+	kHIDUsage_PID_SampleCount = 0x6D,					/* XXX */
+	kHIDUsage_PID_SetPeriodicReport = 0x6E,				/* XXX */
+	kHIDUsage_PID_Offset = 0x6F,						/* XXX */
+
+	kHIDUsage_PID_Magnitude = 0x70,						/* XXX */
+	kHIDUsage_PID_Phase = 0x71,							/* XXX */
+	kHIDUsage_PID_Period = 0x72,						/* XXX */
+	kHIDUsage_PID_SetConstantForceReport = 0x73,		/* XXX */
+	kHIDUsage_PID_SetRampForceReport = 0x74,			/* XXX */
+	kHIDUsage_PID_RampStart = 0x75,						/* XXX */
+	kHIDUsage_PID_RampEnd = 0x76,						/* XXX */
+	kHIDUsage_PID_EffectOperationReport = 0x77,			/* XXX */
+	kHIDUsage_PID_EffectOperation = 0x78,				/* XXX */
+	kHIDUsage_PID_OpEffectStart = 0x79,					/* XXX */
+	kHIDUsage_PID_OpEffectStartSolo = 0x7A,				/* XXX */
+	kHIDUsage_PID_OpEffectStop = 0x7B,					/* XXX */
+	kHIDUsage_PID_LoopCount = 0x7C,						/* XXX */
+	kHIDUsage_PID_DeviceGainReport = 0x7D,				/* XXX */
+	kHIDUsage_PID_DeviceGain = 0x7E,					/* XXX */
+	kHIDUsage_PID_PoolReport = 0x7F,					/* XXX */
+
+	kHIDUsage_PID_RAM_PoolSize = 0x80,					/* XXX */
+	kHIDUsage_PID_ROM_PoolSize = 0x81,					/* XXX */
+	kHIDUsage_PID_ROM_EffectBlockCount = 0x82,			/* XXX */
+	kHIDUsage_PID_SimultaneousEffectsMax = 0x83,		/* XXX */
+	kHIDUsage_PID_PoolAlignment = 0x84,					/* XXX */
+	kHIDUsage_PID_PoolMoveReport = 0x85,				/* XXX */
+	kHIDUsage_PID_MoveSource = 0x86,					/* XXX */
+	kHIDUsage_PID_MoveDestination = 0x87,				/* XXX */
+	kHIDUsage_PID_MoveLength = 0x88,					/* XXX */
+	kHIDUsage_PID_BlockLoadReport = 0x89,				/* XXX */
+	/* 0x8A Reserved */
+	kHIDUsage_PID_BlockLoadStatus = 0x8B,				/* XXX */
+	kHIDUsage_PID_BlockLoadSuccess = 0x8C,				/* XXX */
+	kHIDUsage_PID_BlockLoadFull = 0x8D,					/* XXX */
+	kHIDUsage_PID_BlockLoadError = 0x8E,				/* XXX */
+	kHIDUsage_PID_BlockHandle = 0x8F,					/* XXX */
+
+	kHIDUsage_PID_BlockFreeReport = 0x90,				/* XXX */
+	kHIDUsage_PID_TypeSpecificBlockHandle = 0x91,		/* XXX */
+	kHIDUsage_PID_StateReport = 0x92,					/* XXX */
+	/* 0x93 Reserved */
+	kHIDUsage_PID_EffectPlaying = 0x94,					/* XXX */
+	kHIDUsage_PID_DeviceControlReport = 0x95,			/* XXX */
+	kHIDUsage_PID_DeviceControl = 0x96,					/* XXX */
+	kHIDUsage_PID_DC_EnableActuators = 0x97,			/* XXX */
+	kHIDUsage_PID_DC_DisableActuators = 0x98,			/* XXX */
+	kHIDUsage_PID_DC_StopAllEffects = 0x99,				/* XXX */
+	kHIDUsage_PID_DC_DeviceReset = 0x9A,				/* XXX */
+	kHIDUsage_PID_DC_DevicePause = 0x9B,				/* XXX */
+	kHIDUsage_PID_DC_DeviceContinue = 0x9C,				/* XXX */
+	/* 0x9d - 0x9E Reserved */
+	kHIDUsage_PID_DevicePaused = 0x9F,					/* XXX */
+
+	kHIDUsage_PID_ActuatorsEnabled = 0xA0,				/* XXX */
+	/* 0xA1 - 0xA3 Reserved */
+	kHIDUsage_PID_SafetySwitch = 0xA4,					/* XXX */
+	kHIDUsage_PID_ActuatorOverrideSwitch = 0xA5,		/* XXX */
+	kHIDUsage_PID_ActuatorPower = 0xA6,					/* XXX */
+	kHIDUsage_PID_StartDelay = 0xA7,					/* XXX */
+	kHIDUsage_PID_ParameterBlockSize = 0xA8,			/* XXX */
+	kHIDUsage_PID_DeviceManagedPool = 0xA9,				/* XXX */
+	kHIDUsage_PID_SharedParameterBlocks = 0xAA,			/* XXX */
+	kHIDUsage_PID_CreateNewEffectReport = 0xAB,			/* XXX */
+	kHIDUsage_PID_RAM_PoolAvailable = 0xAC,				/* XXX */
+	/* 0xAD - 0xFFFF Reserved */
+	kHIDUsage_PID_Reserved = 0xFFFF
+};
+
+/* Digitizer Page (0x0D) */
+/* This section provides detailed descriptions of the usages employed by Digitizer Devices. */
+enum
+{
+	kHIDUsage_Dig_Digitizer	= 0x01,	/* Application Collection */
+	kHIDUsage_Dig_Pen	= 0x02,	/* Application Collection */
+	kHIDUsage_Dig_LightPen	= 0x03,	/* Application Collection */
+	kHIDUsage_Dig_TouchScreen	= 0x04,	/* Application Collection */
+	kHIDUsage_Dig_TouchPad	= 0x05,	/* Application Collection */
+	kHIDUsage_Dig_WhiteBoard	= 0x06,	/* Application Collection */
+	kHIDUsage_Dig_CoordinateMeasuringMachine	= 0x07,	/* Application Collection */
+	kHIDUsage_Dig_3DDigitizer	= 0x08,	/* Application Collection */
+	kHIDUsage_Dig_StereoPlotter	= 0x09,	/* Application Collection */
+	kHIDUsage_Dig_ArticulatedArm	= 0x0A,	/* Application Collection */
+	kHIDUsage_Dig_Armature	= 0x0B,	/* Application Collection */
+	kHIDUsage_Dig_MultiplePointDigitizer	= 0x0C,	/* Application Collection */
+	kHIDUsage_Dig_FreeSpaceWand	= 0x0D,	/* Application Collection */
+	/* 0x0E - 0x1F Reserved */
+	kHIDUsage_Dig_Stylus	= 0x20,	/* Logical Collection */
+	kHIDUsage_Dig_Puck	= 0x21,	/* Logical Collection */
+	kHIDUsage_Dig_Finger	= 0x22,	/* Logical Collection */
+	/* 0x23 - 0x2F Reserved */
+	kHIDUsage_Dig_TipPressure	= 0x30,	/* Dynamic Value */
+	kHIDUsage_Dig_BarrelPressure	= 0x31,	/* Dynamic Value */
+	kHIDUsage_Dig_InRange	= 0x32,	/* Momentary Control */
+	kHIDUsage_Dig_Touch	= 0x33,	/* Momentary Control */
+	kHIDUsage_Dig_Untouch	= 0x34,	/* One-Shot Control */
+	kHIDUsage_Dig_Tap	= 0x35,	/* One-Shot Control */
+	kHIDUsage_Dig_Quality	= 0x36,	/* Dynamic Value */
+	kHIDUsage_Dig_DataValid	= 0x37,	/* Momentary Control */
+	kHIDUsage_Dig_TransducerIndex	= 0x38,	/* Dynamic Value */
+	kHIDUsage_Dig_TabletFunctionKeys	= 0x39,	/* Logical Collection */
+	kHIDUsage_Dig_ProgramChangeKeys	= 0x3A,	/* Logical Collection */
+	kHIDUsage_Dig_BatteryStrength	= 0x3B,	/* Dynamic Value */
+	kHIDUsage_Dig_Invert	= 0x3C,	/* Momentary Control */
+	kHIDUsage_Dig_XTilt	= 0x3D,	/* Dynamic Value */
+	kHIDUsage_Dig_YTilt	= 0x3E,	/* Dynamic Value */
+	kHIDUsage_Dig_Azimuth	= 0x3F,	/* Dynamic Value */
+	kHIDUsage_Dig_Altitude	= 0x40,	/* Dynamic Value */
+	kHIDUsage_Dig_Twist	= 0x41,	/* Dynamic Value */
+	kHIDUsage_Dig_TipSwitch	= 0x42,	/* Momentary Control */
+	kHIDUsage_Dig_SecondaryTipSwitch	= 0x43,	/* Momentary Control */
+	kHIDUsage_Dig_BarrelSwitch	= 0x44,	/* Momentary Control */
+	kHIDUsage_Dig_Eraser	= 0x45,	/* Momentary Control */
+	kHIDUsage_Dig_TabletPick	= 0x46,	/* Momentary Control */
+	/* 0x47 - 0xFFFF Reserved */
+	kHIDUsage_Dig_Reserved = 0xFFFF
+};
+
+/* AlphanumericDisplay Page (0x14) */
+/* The Alphanumeric Display page is intended for use by simple alphanumeric displays that are used on consumer devices. */
+enum
+{
+	kHIDUsage_AD_AlphanumericDisplay	= 0x01,	/* Application Collection */
+	/* 0x02 - 0x1F Reserved */
+	kHIDUsage_AD_DisplayAttributesReport	= 0x20,	/* Logical Collection */
+	kHIDUsage_AD_ASCIICharacterSet	= 0x21,	/* Static Flag */
+	kHIDUsage_AD_DataReadBack	= 0x22,	/* Static Flag */
+	kHIDUsage_AD_FontReadBack	= 0x23,	/* Static Flag */
+	kHIDUsage_AD_DisplayControlReport	= 0x24,	/* Logical Collection */
+	kHIDUsage_AD_ClearDisplay	= 0x25,	/* Dynamic Flag */
+	kHIDUsage_AD_DisplayEnable	= 0x26,	/* Dynamic Flag */
+	kHIDUsage_AD_ScreenSaverDelay	= 0x27,	/* Static Value */
+	kHIDUsage_AD_ScreenSaverEnable	= 0x28,	/* Dynamic Flag */
+	kHIDUsage_AD_VerticalScroll	= 0x29,	/* Static Flag */
+	kHIDUsage_AD_HorizontalScroll	= 0x2A,	/* Static Flag */
+	kHIDUsage_AD_CharacterReport	= 0x2B,	/* Logical Collection */
+	kHIDUsage_AD_DisplayData	= 0x2C,	/* Dynamic Value */
+	kHIDUsage_AD_DisplayStatus	= 0x2D,	/* Logical Collection */
+	kHIDUsage_AD_StatNotReady	= 0x2E,	/* Selector */
+	kHIDUsage_AD_StatReady	= 0x2F,	/* Selector */
+	kHIDUsage_AD_ErrNotaloadablecharacter	= 0x30,	/* Selector */
+	kHIDUsage_AD_ErrFontdatacannotberead	= 0x31,	/* Selector */
+	kHIDUsage_AD_CursorPositionReport	= 0x32,	/* Logical Collection */
+	kHIDUsage_AD_Row	= 0x33,	/* Dynamic Value */
+	kHIDUsage_AD_Column	= 0x34,	/* Dynamic Value */
+	kHIDUsage_AD_Rows	= 0x35,	/* Static Value */
+	kHIDUsage_AD_Columns	= 0x36,	/* Static Value */
+	kHIDUsage_AD_CursorPixelPositioning	= 0x37,	/* Static Flag */
+	kHIDUsage_AD_CursorMode	= 0x38,	/* Dynamic Flag */
+	kHIDUsage_AD_CursorEnable	= 0x39,	/* Dynamic Flag */
+	kHIDUsage_AD_CursorBlink	= 0x3A,	/* Dynamic Flag */
+	kHIDUsage_AD_FontReport	= 0x3B,	/* Logical Collection */
+	kHIDUsage_AD_FontData	= 0x3C,	/* Buffered Byte */
+	kHIDUsage_AD_CharacterWidth	= 0x3D,	/* Static Value */
+	kHIDUsage_AD_CharacterHeight	= 0x3E,	/* Static Value */
+	kHIDUsage_AD_CharacterSpacingHorizontal	= 0x3F,	/* Static Value */
+	kHIDUsage_AD_CharacterSpacingVertical	= 0x40,	/* Static Value */
+	kHIDUsage_AD_UnicodeCharacterSet	= 0x41,	/* Static Flag */
+	/* 0x42 - 0xFFFF Reserved */
+	kHIDUsage_AD_Reserved = 0xFFFF
+};
+
+/* Power Device Page (0x84) */
+/* This section provides detailed descriptions of the usages employed by Power Devices. */
+enum
+{
+	
+	kHIDUsage_PD_Undefined = 0x00,				/* Power Device Undefined Usage */
+	kHIDUsage_PD_iName = 0x01,					/* CL- Power Device Name Index */
+	kHIDUsage_PD_PresentStatus = 0x02,			/* CL- Power Device Present Status */
+	kHIDUsage_PD_ChangedStatus = 0x03,			/* CA- Power Device Changed Status */
+	kHIDUsage_PD_UPS = 0x04,					/* CA- Uninterruptible Power Supply */
+	kHIDUsage_PD_PowerSupply = 0x05,			/* CA- Power Supply */
+	/* Reserved 0x06 - 0x0F */
+	kHIDUsage_PD_BatterySystem = 0x10,			/* CP- Battery System power module */
+	kHIDUsage_PD_BatterySystemID = 0x11,		/* SV IF- Battery System ID */
+	kHIDUsage_PD_Battery = 0x12,				/* CP- Battery */
+	kHIDUsage_PD_BatteryID = 0x13,				/* SV IF- Battery ID */
+	kHIDUsage_PD_Charger = 0x14,				/* CP- Charger */
+	kHIDUsage_PD_ChargerID = 0x15,				/* SV IF- Charger ID */
+	kHIDUsage_PD_PowerConverter = 0x16,			/* CP- Power Converter power module */
+	kHIDUsage_PD_PowerConverterID = 0x17,		/* SV IF- Power Converter ID */
+	kHIDUsage_PD_OutletSystem = 0x18,			/* CP- Outlet System power module */
+	kHIDUsage_PD_OutletSystemID = 0x19,			/* SV IF-Outlet System ID */
+	kHIDUsage_PD_Input = 0x1A,					/* CP- Power Device Input */
+	kHIDUsage_PD_InputID = 0x1B,				/* SV IF- Power Device Input ID */
+	kHIDUsage_PD_Output = 0x1C,					/* CP- Power Device Output */
+	kHIDUsage_PD_OutputID = 0x1D,				/* SV IF- Power Device Output ID */
+	kHIDUsage_PD_Flow = 0x1E,					/* CP- Power Device Flow */
+	kHIDUsage_PD_FlowID = 0x1F,					/* Item IF- Power Device Flow ID */
+	kHIDUsage_PD_Outlet = 0x20,					/* CP- Power Device Outlet */
+	kHIDUsage_PD_OutletID = 0x21,				/* SV IF- Power Device Outlet ID */
+	kHIDUsage_PD_Gang = 0x22,					/* CL/CP- Power Device Gang */
+	kHIDUsage_PD_GangID = 0x23,					/* SV IF- Power Device Gang ID */
+	kHIDUsage_PD_PowerSummary = 0x24,			/* CL/CP- Power Device Power Summary */
+	kHIDUsage_PD_PowerSummaryID = 0x25,			/* SV IF- Power Device Power Summary ID */
+	/* Reserved 0x26 - 0x2F */
+	kHIDUsage_PD_Voltage = 0x30,				/* DV IF- Power Device Voltage */
+	kHIDUsage_PD_Current = 0x31,				/* DV IF- Power Device Current */
+	kHIDUsage_PD_Frequency = 0x32,				/* DV IF- Power Device Frequency */
+	kHIDUsage_PD_ApparentPower = 0x33,			/* DV IF- Power Device Apparent Power */
+	kHIDUsage_PD_ActivePower = 0x34,			/* DV IF- Power Device RMS Power */
+	kHIDUsage_PD_PercentLoad = 0x35,			/* DV IF- Power Device Percent Load */
+	kHIDUsage_PD_Temperature = 0x36,			/* DV IF- Power Device Temperature */
+	kHIDUsage_PD_Humidity = 0x37,				/* DV IF- Power Device Humidity */
+	kHIDUsage_PD_BadCount = 0x38,				/* DV IF- Power Device Bad Condition Count */
+	/* Reserved 0x39 - 0x3F */
+	kHIDUsage_PD_ConfigVoltage = 0x40,			/* SV/DV F- Power Device Nominal Voltage */
+	kHIDUsage_PD_ConfigCurrent = 0x41,			/* SV/DV F- Power Device Nominal Current */
+	kHIDUsage_PD_ConfigFrequency = 0x42,		/* SV/DV F- Power Device Nominal Frequency */
+	kHIDUsage_PD_ConfigApparentPower = 0x43,	/* SV/DV F- Power Device Nominal Apparent Power */
+	kHIDUsage_PD_ConfigActivePower = 0x44,		/* SV/DV F- Power Device Nominal RMS Power */
+	kHIDUsage_PD_ConfigPercentLoad = 0x45,		/* SV/DV F- Power Device Nominal Percent Load */
+	kHIDUsage_PD_ConfigTemperature = 0x46,		/* SV/DV F- Power Device Nominal Temperature */
+	kHIDUsage_PD_ConfigHumidity = 0x47,			/* SV/DV F- Power Device Nominal Humidity */
+	/* Reserved 0x48 - 0x4F */
+	kHIDUsage_PD_SwitchOnControl = 0x50,		/* DV F- Power Device Switch On Control */
+	kHIDUsage_PD_SwitchOffControl = 0x51,		/* DV F- Power Device Switch Off Control */
+	kHIDUsage_PD_ToggleControl = 0x52,			/* DV F- Power Device Toogle Sequence Control */
+	kHIDUsage_PD_LowVoltageTransfer = 0x53,		/* DV F- Power Device Min Transfer Voltage */
+	kHIDUsage_PD_HighVoltageTransfer = 0x54,	/* DV F- Power Device Max Transfer Voltage */
+	kHIDUsage_PD_DelayBeforeReboot = 0x55,		/* DV F- Power Device Delay Before Reboot */
+	kHIDUsage_PD_DelayBeforeStartup = 0x56,		/* DV F- Power Device Delay Before Startup */
+	kHIDUsage_PD_DelayBeforeShutdown = 0x57,	/* DV F- Power Device Delay Before Shutdown */
+	kHIDUsage_PD_Test = 0x58,					/* DV F- Power Device Test Request/Result */
+	kHIDUsage_PD_ModuleReset = 0x59,			/* DV F- Power Device Reset Request/Result */
+	kHIDUsage_PD_AudibleAlarmControl = 0x5A,	/* DV F- Power Device Audible Alarm Control */
+	/* Reserved 0x5B - 0x5F */
+	kHIDUsage_PD_Present = 0x60,				/* DV IOF- Power Device Present */
+	kHIDUsage_PD_Good = 0x61,					/* DV IOF- Power Device Good */
+	kHIDUsage_PD_InternalFailure = 0x62,		/* DV IOF- Power Device Internal Failure */
+	kHIDUsage_PD_VoltageOutOfRange = 0x63,		/* DV IOF- Power Device Voltage Out Of Range */
+	kHIDUsage_PD_FrequencyOutOfRange = 0x64,	/* DV IOF- Power Device Frequency Out Of Range */
+	kHIDUsage_PD_Overload = 0x65,				/* DV IOF- Power Device Overload */
+	kHIDUsage_PD_OverCharged = 0x66,			/* DV IOF- Power Device Over Charged */
+	kHIDUsage_PD_OverTemperature = 0x67,		/* DV IOF- Power Device Over Temperature */
+	kHIDUsage_PD_ShutdownRequested = 0x68,		/* DV IOF- Power Device Shutdown Requested */
+	kHIDUsage_PD_ShutdownImminent = 0x69,		/* DV IOF- Power Device Shutdown Imminent */
+	/* Reserved 0x6A */
+	kHIDUsage_PD_SwitchOnOff = 0x6B,			/* DV IOF- Power Device On/Off Switch Status */
+	kHIDUsage_PD_Switchable = 0x6C,				/* DV IOF- Power Device Switchable */
+	kHIDUsage_PD_Used = 0x6D,					/* DV IOF- Power Device Used */
+	kHIDUsage_PD_Boost = 0x6E,					/* DV IOF- Power Device Boosted */
+	kHIDUsage_PD_Buck = 0x6F,					/* DV IOF- Power Device Bucked */
+	kHIDUsage_PD_Initialized = 0x70,			/* DV IOF- Power Device Initialized */
+	kHIDUsage_PD_Tested = 0x71,					/* DV IOF- Power Device Tested */
+	kHIDUsage_PD_AwaitingPower = 0x72,			/* DV IOF- Power Device Awaiting Power */
+	kHIDUsage_PD_CommunicationLost = 0x73,		/* DV IOF- Power Device Communication Lost */
+	/* Reserved 0x74 - 0xFC */
+	kHIDUsage_PD_iManufacturer = 0xFD,			/* SV F- Power Device Manufacturer String Index */
+	kHIDUsage_PD_iProduct = 0xFE,				/* SV F- Power Device Product String Index */
+	kHIDUsage_PD_iserialNumber = 0xFF			/* SV F- Power Device Serial Number String Index */
+};
+
+/* Battery System Page (x85) */
+/* This section provides detailed descriptions of the usages employed by Battery Systems. */	
+enum
+{
+	kHIDUsage_BS_Undefined = 0x00,				/* Battery System Undefined */
+	kHIDUsage_BS_SMBBatteryMode = 0x01,			/* CL - SMB Mode */
+	kHIDUsage_BS_SMBBatteryStatus = 0x02,		/* CL - SMB Status */
+	kHIDUsage_BS_SMBAlarmWarning = 0x03,		/* CL - SMB Alarm Warning */
+	kHIDUsage_BS_SMBChargerMode = 0x04,			/* CL - SMB Charger Mode */
+	kHIDUsage_BS_SMBChargerStatus = 0x05,		/* CL - SMB Charger Status */
+	kHIDUsage_BS_SMBChargerSpecInfo = 0x06,		/* CL - SMB Charger Extended Status */
+	kHIDUsage_BS_SMBSelectorState = 0x07,		/* CL - SMB Selector State */
+	kHIDUsage_BS_SMBSelectorPresets = 0x08,		/* CL - SMB Selector Presets */
+	kHIDUsage_BS_SMBSelectorInfo = 0x09,		/* CL - SMB Selector Info */
+	/* Reserved 0x0A - 0x0F */
+	kHIDUsage_BS_OptionalMfgFunction1 = 0x10,	/* DV F - Battery System Optional SMB Mfg Function 1 */
+	kHIDUsage_BS_OptionalMfgFunction2 = 0x11,	/* DV F - Battery System Optional SMB Mfg Function 2 */
+	kHIDUsage_BS_OptionalMfgFunction3 = 0x12,	/* DV F - Battery System Optional SMB Mfg Function 3 */
+	kHIDUsage_BS_OptionalMfgFunction4 = 0x13,	/* DV F - Battery System Optional SMB Mfg Function 4 */
+	kHIDUsage_BS_OptionalMfgFunction5 = 0x14,	/* DV F - Battery System Optional SMB Mfg Function 5 */
+	kHIDUsage_BS_ConnectionToSMBus = 0x15,		/* DF F - Battery System Connection To System Management Bus */
+	kHIDUsage_BS_OutputConnection = 0x16,		/* DF F - Battery System Output Connection Status */
+	kHIDUsage_BS_ChargerConnection = 0x17,		/* DF F - Battery System Charger Connection */
+	kHIDUsage_BS_BatteryInsertion = 0x18,		/* DF F - Battery System Battery Insertion */
+	kHIDUsage_BS_Usenext = 0x19,				/* DF F - Battery System Use Next */
+	kHIDUsage_BS_OKToUse = 0x1A,				/* DF F - Battery System OK To Use */
+	kHIDUsage_BS_BatterySupported = 0x1B,		/* DF F - Battery System Battery Supported */
+	kHIDUsage_BS_SelectorRevision = 0x1C,		/* DF F - Battery System Selector Revision */
+	kHIDUsage_BS_ChargingIndicator = 0x1D,		/* DF F - Battery System Charging Indicator */
+	/* Reserved 0x1E - 0x27 */
+	kHIDUsage_BS_ManufacturerAccess = 0x28,		/* DV F - Battery System Manufacturer Access */
+	kHIDUsage_BS_RemainingCapacityLimit = 0x29,	/* DV F - Battery System Remaining Capacity Limit */
+	kHIDUsage_BS_RemainingTimeLimit = 0x2A,		/* DV F - Battery System Remaining Time Limit */
+	kHIDUsage_BS_AtRate = 0x2B,					/* DV F - Battery System At Rate... */
+	kHIDUsage_BS_CapacityMode = 0x2C,			/* DV F - Battery System Capacity Mode */
+	kHIDUsage_BS_BroadcastToCharger = 0x2D,		/* DV F - Battery System Broadcast To Charger */
+	kHIDUsage_BS_PrimaryBattery = 0x2E,			/* DV F - Battery System Primary Battery */
+	kHIDUsage_BS_ChargeController = 0x2F,		/* DV F - Battery System Charge Controller */
+	/* Reserved 0x30 - 0x3F */
+	kHIDUsage_BS_TerminateCharge = 0x40,		/* DF IOF - Battery System Terminate Charge */
+	kHIDUsage_BS_TerminateDischarge = 0x41,		/* DF IOF - Battery System Terminate Discharge */
+	kHIDUsage_BS_BelowRemainingCapacityLimit = 0x42, /* DF IOF - Battery System Below Remaining Capacity Limit */
+	kHIDUsage_BS_RemainingTimeLimitExpired = 0x43, /* DF IOF - Battery System Remaining Time Limit Expired */
+	kHIDUsage_BS_Charging = 0x44,				/* DF IOF - Battery System Charging */
+	kHIDUsage_BS_Discharging = 0x45,			/* DV IOF - Battery System Discharging */
+	kHIDUsage_BS_FullyCharged = 0x46,			/* DF IOF - Battery System Fully Charged */
+	kHIDUsage_BS_FullyDischarged = 0x47,		/* DV IOF - Battery System Fully Discharged */
+	kHIDUsage_BS_ConditioningFlag = 0x48,		/* DV IOF - Battery System Conditioning Flag */
+	kHIDUsage_BS_AtRateOK = 0x49,				/* DV IOF - Battery System At Rate OK */
+	kHIDUsage_BS_SMBErrorCode = 0x4A,			/* DF IOF - Battery System SMB Error Code */
+	kHIDUsage_BS_NeedReplacement = 0x4B,		/* DF IOF - Battery System Need Replacement */
+	/* Reserved 0x4C - 0x5F */
+	kHIDUsage_BS_AtRateTimeToFull = 0x60,		/* DV IF - Battery System At Rate Time To Full */
+	kHIDUsage_BS_AtRateTimeToEmpty = 0x61,		/* DV IF - Battery System At Rate Time To Empty */
+	kHIDUsage_BS_AverageCurrent = 0x62,			/* DV IF - Battery System Average Current */
+	kHIDUsage_BS_Maxerror = 0x63,				/* DV IF - Battery System Max Error */
+	kHIDUsage_BS_RelativeStateOfCharge = 0x64,	/* DV IF - Battery System Relative State Of Charge */
+	kHIDUsage_BS_AbsoluteStateOfCharge = 0x65,	/* DV IF - Battery System Absolute State Of Charge */
+	kHIDUsage_BS_RemainingCapacity = 0x66,		/* DV IF - Battery System Remaining Capacity */
+	kHIDUsage_BS_FullChargeCapacity = 0x67,		/* DV IF - Battery System Full Charge Capacity */
+	kHIDUsage_BS_RunTimeToEmpty = 0x68,			/* DV IF - Battery System Run Time To Empty */
+	kHIDUsage_BS_AverageTimeToEmpty = 0x69,		/* DV IF - Battery System Average Time To Empty */
+	kHIDUsage_BS_AverageTimeToFull = 0x6A,		/* DV IF - Battery System Average Time To Full */
+	kHIDUsage_BS_CycleCount = 0x6B,				/* DV IF - Battery System Cycle Count */
+	/* Reserved 0x6C - 0x7F */
+	kHIDUsage_BS_BattPackModelLevel = 0x80,		/* SV F - Battery System Batt Pack Model Level */
+	kHIDUsage_BS_InternalChargeController = 0x81, /* SF F - Battery System Internal Charge Controller */
+	kHIDUsage_BS_PrimaryBatterySupport = 0x82,	/* SF F - Battery System Primary Battery Support */
+	kHIDUsage_BS_DesignCapacity = 0x83,			/* SV F - Battery System Design Capacity */
+	kHIDUsage_BS_SpecificationInfo = 0x84,		/* SV F - Battery System Specification Info */
+	kHIDUsage_BS_ManufacturerDate = 0x85,		/* SV F - Battery System Manufacturer Date */
+	kHIDUsage_BS_SerialNumber = 0x86,			/* SV F - Battery System Serial Number */
+	kHIDUsage_BS_iManufacturerName = 0x87,		/* SV F - Battery System Manufacturer Name Index */
+	kHIDUsage_BS_iDevicename = 0x88,			/* SV F - Battery System Device Name Index */
+	kHIDUsage_BS_iDeviceChemistry = 0x89,		/* SV F - Battery System Device Chemistry Index */
+	kHIDUsage_BS_ManufacturerData = 0x8A,		/* SV F - Battery System Manufacturer Data */
+	kHIDUsage_BS_Rechargable = 0x8B,			/* SV F - Battery System Rechargable */
+	kHIDUsage_BS_WarningCapacityLimit = 0x8C,	/* SV F - Battery System Warning Capacity Limit */
+	kHIDUsage_BS_CapacityGranularity1 = 0x8D,	/* SV F - Battery System Capacity Granularity 1 */
+	kHIDUsage_BS_CapacityGranularity2 = 0x8E,	/* SV F - Battery System Capacity Granularity 2 */
+	kHIDUsage_BS_iOEMInformation = 0x8F,		/* SV F - Battery System OEM Information Index */
+	/* Reserved 0x90 - 0xBF */
+	kHIDUsage_BS_InhibitCharge = 0xC0,			/* DF IOF - Battery System Inhibit Charge */
+	kHIDUsage_BS_EnablePolling = 0xC1,			/* DF IOF - Battery System Enable Polling */
+	kHIDUsage_BS_ResetToZero = 0xC2,			/* DF IOF - Battery System Reset To Zero */
+	/* Reserved 0xC3 - 0xCF */
+	kHIDUsage_BS_ACPresent = 0xD0,				/* DF IOF - Battery System AC Present */
+	kHIDUsage_BS_BatteryPresent = 0xD1,			/* DF IOF - Battery System Battery Present */
+	kHIDUsage_BS_PowerFail = 0xD2,				/* DF IOF - Battery System Power Fail */
+	kHIDUsage_BS_AlarmInhibited = 0xD3,			/* DF IOF - Battery System Alarm Inhibited */
+	kHIDUsage_BS_ThermistorUnderRange = 0xD4,	/* DF IOF - Battery System Thermistor Under Range */
+	kHIDUsage_BS_ThermistorHot = 0xD5,			/* DF IOF - Battery System Thermistor Hot */
+	kHIDUsage_BS_ThermistorCold = 0xD6,			/* DF IOF - Battery System Thermistor Cold */
+	kHIDUsage_BS_ThermistorOverRange = 0xD7,	/* DF IOF - Battery System Thermistor Over Range */
+	kHIDUsage_BS_VoltageOutOfRange = 0xD8,		/* DF IOF - Battery System Voltage Out Of Range */
+	kHIDUsage_BS_CurrentOutOfRange = 0xD9,		/* DF IOF - Battery System Current Out Of Range */
+	kHIDUsage_BS_CurrentNotRegulated = 0xDA,	/* DF IOF - Battery System Current Not Regulated */
+	kHIDUsage_BS_VoltageNotRegulated = 0xDB,	/* DF IOF - Battery System Voltage Not Regulated */
+	kHIDUsage_BS_MasterMode = 0xDC,				/* DF IOF - Battery System Master Mode */
+	/* Reserved 0xDD - 0xEF */
+	kHIDUsage_BS_ChargerSelectorSupport = 0xF0,	/* SF F- Battery System Charger Support Selector */
+	kHIDUsage_BS_ChargerSpec = 0xF1,			/* SF F- Battery System Charger Specification */
+	kHIDUsage_BS_Level2 = 0xF2,					/* SF F- Battery System Charger Level 2 */
+	kHIDUsage_BS_Level3 = 0xF3					/* SF F- Battery System Charger Level 3 */
+	/* Reserved 0xF2 - 0xFF */
+};
+
+/* Bar Code Scanner Page (0x8C) */
+/* This section provides detailed descriptions of the usages employed by Bar Code Scanner Devices. */
+enum
+{
+    kHIDUsage_BCS_Undefined = 0x00,                     /* Bar Code Scanner Undefined Usage */
+    kHIDUsage_BCS_BadgeReader = 0x01,                   /* CA - Bar Code Badge Reader */
+    kHIDUsage_BCS_BarCodeScanner = 0x02,                /* CA -Bar Code Scanner */
+    kHIDUsage_BCS_DumbBarCodeScanner = 0x03,            /* CA -Dumb Bar Code Scanner  Usage */
+    kHIDUsage_BCS_CordlessScannerBase = 0x04,           /* CA -Cordless Base Usage */
+    kHIDUsage_BCS_BarCodeScannerCradle = 0x05,          /* CA -Bar Code Scanner Cradle Usage */
+    /* Reserved 0x06 - 0x0F */
+    kHIDUsage_BCS_AttributeReport = 0x10,               /* CL - Attribute Report */
+    kHIDUsage_BCS_SettingsReport = 0x11,                /* CL - Settings Report */
+    kHIDUsage_BCS_ScannedDataReport = 0x12,             /* CL - Scanned Data Report */
+    kHIDUsage_BCS_RawScannedDataReport = 0x13,          /* CL - Raw Scanned Data Report */
+    kHIDUsage_BCS_TriggerReport = 0x14,                 /* CL - Trigger Report */
+    kHIDUsage_BCS_StatusReport = 0x15,                  /* CL - Status Report */
+    kHIDUsage_BCS_UPC_EANControlReport = 0x16,          /* CL - UPC/EAN Control Report */
+    kHIDUsage_BCS_EAN2_3LabelControlReport = 0x17,      /* CL - EAN 2/3 Label Control Report */
+    kHIDUsage_BCS_Code39ControlReport = 0x18,           /* CL - Code 39 Control Report */
+    kHIDUsage_BCS_Interleaved2of5ControlReport = 0x19,  /* CL - Interleaved 2 of 5 Control Report */
+    kHIDUsage_BCS_Standard2of5ControlReport = 0x1A,     /* CL - Standard 2 of 5 Control Report */
+    kHIDUsage_BCS_MSIPlesseyControlReport = 0x1B,       /* CL - MSI Plessey Control Report */
+    kHIDUsage_BCS_CodabarControlReport = 0x1C,          /* CL - Codabar Control Report */
+    kHIDUsage_BCS_Code128ControlReport = 0x1D,          /* CL - Code 128 Control Report */
+    kHIDUsage_BCS_Misc1DControlReport = 0x1E,           /* CL - Misc 1D Control Report */
+    kHIDUsage_BCS_2DControlReport = 0x1F,               /* CL - 2D Control Report */
+    /* Reserved 0x20 - 0x2F */
+    kHIDUsage_BCS_Aiming_PointerMide = 0x30,            /* SF - Aiming Pointer Mode */
+    kHIDUsage_BCS_BarCodePresentSensor = 0x31,          /* SF - Bar Code Present Sensor */
+    kHIDUsage_BCS_Class1ALaser = 0x32,                  /* SF - Class 1A Laser */
+    kHIDUsage_BCS_Class2Laser = 0x33,                   /* SF - Class 2 Laser */
+    kHIDUsage_BCS_HeaterPresent = 0x34,                 /* SF - Heater Present */
+    kHIDUsage_BCS_ContactScanner = 0x35,                /* SF - Contact Scanner */
+    kHIDUsage_BCS_ElectronicArticleSurveillanceNotification = 0x36, /* SF - Electronic Article Surveillance Notification */
+    kHIDUsage_BCS_ConstantElectronicArticleSurveillance = 0x37, /* SF - Constant Electronic Article Surveillance */
+    kHIDUsage_BCS_ErrorIndication = 0x38,               /* SF - Error Indication */
+    kHIDUsage_BCS_FixedBeeper = 0x39,                   /* SF - Fixed Beeper */
+    kHIDUsage_BCS_GoodDecodeIndication = 0x3A,          /* SF - Good Decode Indication */
+    kHIDUsage_BCS_HandsFreeScanning = 0x3B,             /* SF - Hands Free Scanning */
+    kHIDUsage_BCS_IntrinsicallySafe = 0x3C,             /* SF - Intrinsically Safe */
+    kHIDUsage_BCS_KlasseEinsLaser = 0x3D,               /* SF - Klasse Eins Laser */
+    kHIDUsage_BCS_LongRangeScanner = 0x3E,              /* SF - Long Range Scanner */
+    kHIDUsage_BCS_MirrorSpeedControl = 0x3F,            /* SF - Mirror Speed Control */
+    kHIDUsage_BCS_NotOnFileIndication = 0x40,           /* SF - Not On File Indication */
+    kHIDUsage_BCS_ProgrammableBeeper = 0x41,            /* SF - Programmable Beeper */
+    kHIDUsage_BCS_Triggerless = 0x42,                   /* SF - Triggerless */
+    kHIDUsage_BCS_Wand = 0x43,                          /* SF - Wand */
+    kHIDUsage_BCS_WaterResistant = 0x44,                /* SF - Water Resistant */
+    kHIDUsage_BCS_MultiRangeScanner = 0x45,             /* SF - Multi-Range Scanner */
+    kHIDUsage_BCS_ProximitySensor = 0x46,               /* SF - Proximity Sensor */
+    /* Reserved 0x47 - 0x4C */
+    kHIDUsage_BCS_FragmentDecoding = 0x4D,              /* DF - Fragment Decoding */
+    kHIDUsage_BCS_ScannerReadConfidence = 0x4E,         /* DV - Scanner Read Confidence */
+    kHIDUsage_BCS_DataPrefix = 0x4F,                    /* NAry - Data Prefix  */
+    kHIDUsage_BCS_PrefixAIMI = 0x50,                    /* SEL - Prefix AIMI */
+    kHIDUsage_BCS_PrefixNone = 0x51,                    /* SEL - Prefix None */
+    kHIDUsage_BCS_PrefixProprietary = 0x52,             /* SEL - Prefix Proprietary */
+    /* Reserved 0x53 - 0x54 */
+    kHIDUsage_BCS_ActiveTime = 0x55,                    /* DV - Active Time */
+    kHIDUsage_BCS_AimingLaserPattern = 0x56,            /* DF - Aiming Laser Pattern */
+    kHIDUsage_BCS_BarCodePresent = 0x57,                /* OOC - Bar Code Present */
+    kHIDUsage_BCS_BeeperState = 0x58,                   /* OOC - Beeper State */
+    kHIDUsage_BCS_LaserOnTime = 0x59,                   /* DV - Laser On Time */
+    kHIDUsage_BCS_LaserState = 0x5A,                    /* OOC - Laser State */
+    kHIDUsage_BCS_LockoutTime = 0x5B,                   /* DV - Lockout Time */
+    kHIDUsage_BCS_MotorState = 0x5C,                    /* OOC - Motor State */
+    kHIDUsage_BCS_MotorTimeout = 0x5D,                  /* DV - Motor Timeout */
+    kHIDUsage_BCS_PowerOnResetScanner = 0x5E,           /* DF - Power On Reset Scanner */
+    kHIDUsage_BCS_PreventReadOfBarcodes = 0x5F,         /* DF - Prevent Read of Barcodes */
+    kHIDUsage_BCS_InitiateBarcodeRead = 0x60,           /* DF - Initiate Barcode Read */
+    kHIDUsage_BCS_TriggerState = 0x61,                  /* DF - Trigger State */
+    kHIDUsage_BCS_TriggerMode = 0x62,                   /* NAry - Trigger Mode */
+    kHIDUsage_BCS_TriggerModeBlinkingLaserOn = 0x63,    /* SEL - Trigger Mode Blinking Laser On */
+    kHIDUsage_BCS_TriggerModeContinuousLaserOn = 0x64,  /* SEL - Trigger Mode Continuous Laser On */
+    kHIDUsage_BCS_TriggerModeLaserOnWhilePulled = 0x65, /* SEL - Trigger Mode Laser on while Pulled */
+    kHIDUsage_BCS_TriggerModeLaserStaysOnAfterTriggerRelease = 0x66, /* SEL - Trigger Mode Laser stays on after Trigger Release */
+    /* Reserved 0x67 - 0x6C */
+    kHIDUsage_BCS_CommitParametersToNVM = 0x6D,         /* DF - Commit Parameters to NVM */
+    kHIDUsage_BCS_ParameterScanning = 0x6E,             /* DF - Parameter Scanning */
+    kHIDUsage_BCS_ParametersChanged = 0x6F,             /* OOC - Parameters Changed */
+    kHIDUsage_BCS_SetParameterDefaultValues = 0x70,     /* DF - Set parameter default values */
+    /* Reserved 0x71 - 0x74 */
+    kHIDUsage_BCS_ScannerInCradle = 0x75,               /* OOC - Scanner In Cradle */
+    kHIDUsage_BCS_ScannerInRange = 0x76,                /* OOC - Scanner In Range */
+    /* Reserved 0x77 - 0x79 */
+    kHIDUsage_BCS_AimDuration = 0x7A,                   /* DV - Aim Duration */
+    kHIDUsage_BCS_GoodReadLampDuration = 0x7B,          /* DV - Good Read Lamp Duration */
+    kHIDUsage_BCS_GoodReadLampIntensity = 0x7C,         /* DV - Good Read Lamp Intensity */
+    kHIDUsage_BCS_GoodReadLED = 0x7D,                   /* DF - Good Read LED */
+    kHIDUsage_BCS_GoodReadToneFrequency = 0x7E,         /* DV - Good Read Tone Frequency*/
+    kHIDUsage_BCS_GoodReadToneLength = 0x7F,            /* DV - Good Read Tone Length */
+    kHIDUsage_BCS_GoodReadToneVolume = 0x80,            /* DV - Good Read Tone Volume */
+    /* Reserved 0x81 */
+    kHIDUsage_BCS_NoReadMessage = 0x82,                 /* DF - No Read Message */
+    kHIDUsage_BCS_NotOnFileVolume = 0x83,               /* DV - Not on File Volume */
+    kHIDUsage_BCS_PowerupBeep = 0x84,                   /* DF - Powerup Beep */
+    kHIDUsage_BCS_SoundErrorBeep = 0x85,               /* DF - Sound Error Beep */
+    kHIDUsage_BCS_SoundGoodReadBeep = 0x86,             /* DF - Sound Good Read Beep */
+    kHIDUsage_BCS_SoundNotOnFileBeep = 0x87,            /* DF - Sound Not On File Beep */
+    kHIDUsage_BCS_GoodReadWhenToWrite = 0x88,           /* NArry - Good Read When to Write */
+    kHIDUsage_BCS_GRWTIAfterDecode = 0x89,              /* SEL - GRWTI After Decode */
+    kHIDUsage_BCS_GRWTIBeep_LampAfterTransmit = 0x8A,   /* SEL - GRWTI Beep/Lamp after transmit */
+    kHIDUsage_BCS_GRWTINoBeep_LampUseAtAll = 0x8B,      /* SEL - GRWTI No Beep/Lamp at all */
+    /* Reserved 0x8C - 0x90 */
+    kHIDUsage_BCS_BooklandEAN = 0x91,                   /* DF - Bookland EAN */
+    kHIDUsage_BCS_ConvertEAN8To13Type = 0x92,           /* DF - Convert EAN 8 to 13 Type */
+    kHIDUsage_BCS_ConvertUPCAToEAN_13 = 0x93,           /* DF - Convert UPC A to EAN-13 */
+    kHIDUsage_BCS_ConvertUPC_EToA = 0x94,               /* DF - Convert UPC-E to A */
+    kHIDUsage_BCS_EAN_13 = 0x95,                        /* DF - EAN-13 */
+    kHIDUsage_BCS_EAN_8 = 0x96,                         /* DF - EAN_8 */
+    kHIDUsage_BCS_EAN_99_128_Mandatory  = 0x97,         /* DF - EAN-99 128_Mandatory  */
+    kHIDUsage_BCS_EAN_99_P5_128_Optional = 0x98,        /* DF - EAN-99 P5/128_Optional */
+    /* Reserved 0x99 */
+    kHIDUsage_BCS_UPC_EAN = 0x9A,                       /* DF - UPC/EAN */
+    kHIDUsage_BCS_UPC_EANCouponCode = 0x9B,             /* DF - UPC/EAN Coupon Code */
+    kHIDUsage_BCS_UPC_EANPeriodicals = 0x9C,            /* DV - UPC/EAN Periodicals */
+    kHIDUsage_BCS_UPC_A = 0x9D,                         /* DF - UPC-A */
+    kHIDUsage_BCS_UPC_AWith128Mandatory = 0x9E,         /* DF - UPC-A with 128 Mandatory */
+    kHIDUsage_BCS_UPC_AWith128Optical = 0x9F,           /* DF - UPC-A with 128 Optical */
+    kHIDUsage_BCS_UPC_AWithP5Optional = 0xA0,           /* DF - UPC-A with P5 Optional */
+    kHIDUsage_BCS_UPC_E = 0xA1,                         /* DF - UPC-E */
+    kHIDUsage_BCS_UPC_E1 = 0xA2,                        /* DF - UPC-E1 */
+    /* Reserved 0xA3 - 0xA8 */
+    kHIDUsage_BCS_Periodical = 0xA9,                    /* NArry - Periodical */
+    kHIDUsage_BCS_PeriodicalAutoDiscriminatePlus2 = 0xAA,/* SEL - Periodical Auto-Discriminate + 2 */
+    kHIDUsage_BCS_PeriodicalOnlyDecodeWithPlus2 = 0xAB, /* SEL - Periodical Only Decode with + 2 */
+    kHIDUsage_BCS_PeriodicalIgnorePlus2 = 0xAC,         /* SEL - Periodical Ignore + 2 */
+    kHIDUsage_BCS_PeriodicalAutoDiscriminatePlus5 = 0xAD,/* SEL - Periodical Auto-Discriminate + 5 */
+    kHIDUsage_BCS_PeriodicalOnlyDecodeWithPlus5 = 0xAE, /* SEL - Periodical Only Decode with + 5 */
+    kHIDUsage_BCS_PeriodicalIgnorePlus5 = 0xAF,         /* SEL - Periodical Ignore + 5 */
+    kHIDUsage_BCS_Check = 0xB0,                         /* NArry - Check */
+    kHIDUsage_BCS_CheckDisablePrice = 0xB1,             /* SEL - Check Disable Price */
+    kHIDUsage_BCS_CheckEnable4DigitPrice = 0xB2,        /* SEL - Check Enable 4 digit Price */
+    kHIDUsage_BCS_CheckEnable5DigitPrice = 0xB3,        /* SEL - Check Enable 5 digit Price */
+    kHIDUsage_BCS_CheckEnableEuropean4DigitPrice = 0xB4,/* SEL - Check Enable European 4 digit Price */
+    kHIDUsage_BCS_CheckEnableEuropean5DigitPrice = 0xB5,/* SEL - Check Enable European 5 digit Price */
+    /* Reserved 0xB6 */
+    kHIDUsage_BCS_EANTwoLabel = 0xB7,                   /* DF - EAN Two Label  */
+    kHIDUsage_BCS_EANThreeLabel  = 0xB8,                /* DF - EAN Thread Label */
+    kHIDUsage_BCS_EAN8FlagDigit1 = 0xB9,                /* DV - EAN 8 Flag Digit 1 */
+    kHIDUsage_BCS_EAN8FlagDigit2 = 0xBA,                /* DV - EAN 8 Flag Digit 2 */
+    kHIDUsage_BCS_EAN8FlagDigit3 = 0xBB,                /* DV - EAN 8 Flag Digit 3 */
+    kHIDUsage_BCS_EAN13FlagDigit1 = 0xBC,               /* DV - EAN 13 Flag Digit 1 */
+    kHIDUsage_BCS_EAN13FlagDigit2 = 0xBD,               /* DV - EAN 13 Flag Digit 2 */
+    kHIDUsage_BCS_EAN13FlagDigit3 = 0xBE,               /* DV - EAN 13 Flag Digit 3 */
+    kHIDUsage_BCS_AddEAN2_3LabelDefinition = 0xBF,      /* DF - Add EAN 2/3 Label Definition */
+    kHIDUsage_BCS_ClearAllEAN2_3LabelDefinitions = 0xC0,/* DF - Clear all EAN 2/3 Label Definitions */
+    /* Reserved 0xC1 - 0xC2 */
+    kHIDUsage_BCS_Codabar = 0xC3,                       /* DF - Codabar */
+    kHIDUsage_BCS_Code128 = 0xC4,                       /* DF - Code 128 */
+    /* Reserved 0xC5 - 0xC6 */
+    kHIDUsage_BCS_Code39 = 0xC7,                        /* DF - Code 39 */
+    kHIDUsage_BCS_Code93 = 0xC8,                        /* DF - Code 93 */
+    kHIDUsage_BCS_FullASCIIConversion = 0xC9,           /* DF - Full ASCII Conversion */
+    kHIDUsage_BCS_Interleaved2of5 = 0xCA,               /* DF - Interleaved 2 of 5 */
+    kHIDUsage_BCS_ItalianPharmacyCode = 0xCB,           /* DF - Italian Pharmacy Code */
+    kHIDUsage_BCS_MSI_Plessey = 0xCC,                   /* DF - MSI/Plessey */
+    kHIDUsage_BCS_Standard2of5IATA = 0xCD,              /* DF - Standard 2 of 5 IATA */
+    kHIDUsage_BCS_Standard2of5 = 0xCE,                  /* DF - Standard 2 of 5 */
+    /* Reserved 0xCF - 0xD2 */
+    kHIDUsage_BCS_TransmitStart_Stop = 0xD3,            /* DF - Transmit Start/Stop */
+    kHIDUsage_BCS_TriOptic = 0xD4,                      /* DF - Tri-Optic  */
+    kHIDUsage_BCS_UCC_EAN_128 = 0xD5,                   /* DF - UCC/EAN-128  */
+    kHIDUsage_BCS_CheckDigit = 0xD6,                    /* NArry - Check Digit */
+    kHIDUsage_BCS_CheckDigitDisable = 0xD7,             /* SEL - Check Digit Disable */
+    kHIDUsage_BCS_CheckDigitEnableInterleaved2of5OPCC = 0xD8, /* SEL - Check Digit Enable Interleaved 2 of 5 OPCC */
+    kHIDUsage_BCS_CheckDigitEnableInterleaved2of5USS = 0xD9, /* SEL - Check Digit Enable Interleaved 2 of 5 USS */
+    kHIDUsage_BCS_CheckDigitEnableStandard2of5OPCC = 0xD8, /* SEL - Check Digit Enable Standard 2 of 5 OPCC */
+    kHIDUsage_BCS_CheckDigitEnableStandard2of5USS = 0xD9, /* SEL - Check Digit Enable Standard 2 of 5 USS */
+    kHIDUsage_BCS_CheckDigitEnableOneMSIPlessey = 0xDC, /* SEL - Check Digit Enable One MSI Plessey */
+    kHIDUsage_BCS_CheckDigitEnableTwoMSIPlessey = 0xDD, /* SEL - Check Digit Enable Two MSI Plessey */
+    kHIDUsage_BCS_CheckDigitCodabarEnable = 0xDE,       /* SEL - Check Digit Codabar Enable */
+    kHIDUsage_BCS_CheckDigitCode99Enable = 0xDF,        /* SEL - Check Digit Code 99 Enable */
+    /* Reserved 0xE0 - 0xEF */
+    kHIDUsage_BCS_TransmitCheckDigit = 0xF0,            /* NArry - Transmit Check Digit */
+    kHIDUsage_BCS_DisableCheckDigitTransmit = 0xF1,     /* SEL - Disable Check Digit Transmit */
+    kHIDUsage_BCS_EnableCheckDigitTransmit = 0xF2,      /* SEL - Enable Check Digit Transmit */
+    /* Reserved 0xF3 - 0xFA */
+    kHIDUsage_BCS_SymbologyIdentifier1 = 0xFB,          /* DV - Symbology Identifier 1 */
+    kHIDUsage_BCS_SymbologyIdentifier2 = 0xFC,          /* DV - Symbology Identifier 2 */
+    kHIDUsage_BCS_SymbologyIdentifier3 = 0xFD,          /* DV - Symbology Identifier 3 */
+    kHIDUsage_BCS_DecodedData = 0xFE,                   /* DV - Decoded Data */
+    kHIDUsage_BCS_DecodeDataContinued = 0xFF,           /* DF - Decode Data Continued */
+    kHIDUsage_BCS_BarSpaceData = 0x100,                 /* DV - Bar Space Data */
+    kHIDUsage_BCS_ScannerDataAccuracy = 0x101,          /* DV - Scanner Data Accuracy */
+    kHIDUsage_BCS_RawDataPolarity = 0x102,              /* NArry - Raw Data Polarity */
+    kHIDUsage_BCS_PolarityInvertedBarCode = 0x103,      /* SEL - Polarity Inverted Bar Code */
+    kHIDUsage_BCS_PolarityNormalBarCode = 0x103,        /* SEL - Polarity Normal Bar Code */
+    /* Reserved 0x105 */
+    kHIDUsage_BCS_MinimumLengthToDecode = 0x106,        /* DV - Minimum Length to Decode */
+    kHIDUsage_BCS_MaximumLengthToDecode = 0x107,        /* DV - Maximum Length to Decode */
+    kHIDUsage_BCS_FirstDiscreteLengthToDecode = 0x108,  /* DV - First Discrete Length to Decode */
+    kHIDUsage_BCS_SecondDiscreteLengthToDecode = 0x109, /* DV - Second Discrete Length to Decode */
+    kHIDUsage_BCS_DataLengthMethod = 0x10A,             /* NArry - Data Length Method */
+    kHIDUsage_BCS_DLMethodReadAny = 0x10B,              /* DF - DL Method Read any */
+    kHIDUsage_BCS_DLMethodCheckInRange = 0x10C,         /* DF - DL Method Check in Range */
+    kHIDUsage_BCS_DLMethodCheckForDiscrete = 0x10D,     /* DF - DL Method Check for Discrete */
+    /* Reserved 0x10E - 0x10F */
+    kHIDUsage_BCS_AztecCode = 0x110,                    /* DF - Aztec Code */
+    kHIDUsage_BCS_BC412 = 0x111,                        /* DF - BC412 */
+    kHIDUsage_BCS_ChannelCode = 0x112,                  /* DF - Channel Code */
+    kHIDUsage_BCS_Code16 = 0x113,                       /* DF - Code 16 */
+    kHIDUsage_BCS_Code32 = 0x114,                       /* DF - Code 32 */
+    kHIDUsage_BCS_Code49 = 0x115,                       /* DF - Code 49 */
+    kHIDUsage_BCS_CodeOne = 0x116,                      /* DF - Code One */
+    kHIDUsage_BCS_Colorcode = 0x117,                    /* DF - Colorcode */
+    kHIDUsage_BCS_DataMatrix = 0x118,                   /* DF - Data Matrix */
+    kHIDUsage_BCS_MaxiCode = 0x119,                     /* DF - MaxiCode */
+    kHIDUsage_BCS_MicroPDF = 0x11A,                     /* DF - MicroPDF */
+    kHIDUsage_BCS_PDF_417 = 0x11B,                      /* DF - PDF-417 */
+    kHIDUsage_BCS_PosiCode = 0x11C,                     /* DF - PosiCode */
+    kHIDUsage_BCS_QRCode = 0x11D,                       /* DF - QR Code */
+    kHIDUsage_BCS_SuperCode = 0x11E,                    /* DF - SuperCode */
+    kHIDUsage_BCS_UltraCode = 0x11F,                    /* DF - UltraCode */
+    kHIDUsage_BCS_USB_5_SlugCode = 0x120,               /* DF - USD-5 (Slug Code) */
+    kHIDUsage_BCS_VeriCode = 0x121                      /* DF - VeriCode */
+    /* Reserved 0x122 - 0xFFFF */
+};
+
+/* Weighing Devices Page (0x8D) */
+/* This section provides detailed descriptions of the usages employed by Weighing Devices. */
+enum
+{
+    kHIDUsage_WD_Undefined = 0x00,                      /* Weighing Device Undefined Usage */
+    kHIDUsage_WD_WeighingDevice = 0x01,                 /* CA - Weighing Device */
+    /* Reserved 0x02 - 0x1F */
+    kHIDUsage_WD_ScaleScaleDevice = 0x20,               /* CL - Scale Device */
+    kHIDUsage_WD_ScaleScaleClassIMetricCL = 0x21,       /* CL - Scale Class I Metric */
+    kHIDUsage_WD_ScaleScaleClassIMetric = 0x22,         /* SEL - Scale Class I Metric */
+    kHIDUsage_WD_ScaleScaleClassIIMetric = 0x23,        /* SEL - Scale Class II Metric */
+    kHIDUsage_WD_ScaleScaleClassIIIMetric = 0x24,       /* SEL - Scale Class III Metric */
+    kHIDUsage_WD_ScaleScaleClassIIILMetric = 0x25,      /* SEL - Scale Class IIIL Metric */
+    kHIDUsage_WD_ScaleScaleClassIVMetric = 0x26,        /* SEL - Scale Class IV Metric */
+    kHIDUsage_WD_ScaleScaleClassIIIEnglish = 0x27,      /* SEL - Scale Class III English */
+    kHIDUsage_WD_ScaleScaleClassIIILEnglish = 0x28,     /* SEL - Scale Class IIIL English */
+    kHIDUsage_WD_ScaleScaleClassIVEnglish = 0x29,       /* SEL - Scale Class IV English */
+    kHIDUsage_WD_ScaleScaleClassGeneric = 0x2A,         /* SEL - Scale Class Generic */
+    /* Reserved 0x2B - 0x2F */
+    kHIDUsage_WD_ScaleAtrributeReport = 0x30,           /* CL - Scale Attribute Report */
+    kHIDUsage_WD_ScaleControlReport = 0x31,             /* CL - Scale Control Report */
+    kHIDUsage_WD_ScaleDataReport = 0x32,                /* CL - Scale Data Report */
+    kHIDUsage_WD_ScaleStatusReport = 0x33,              /* CL - Scale Status Report */
+    kHIDUsage_WD_ScaleWeightLimitReport = 0x34,         /* CL - Scale Weight Limit Report */
+    kHIDUsage_WD_ScaleStatisticsReport = 0x35,          /* CL - Scale Statistics Report */
+    /* Reserved 0x36 - 0x3F */
+    kHIDUsage_WD_DataWeight = 0x40,                     /* DV - Data Weight */
+    kHIDUsage_WD_DataScaling = 0x41,                    /* DV - Data Scaling */
+    /* Reserved 0x42 - 0x4F */
+    kHIDUsage_WD_WeightUnit = 0x50,                     /* CL - Weight Unit */
+    kHIDUsage_WD_WeightUnitMilligram = 0x51,            /* SEL - Weight Unit Milligram */
+    kHIDUsage_WD_WeightUnitGram = 0x52,                 /* SEL - Weight Unit Gram */
+    kHIDUsage_WD_WeightUnitKilogram = 0x53,             /* SEL - Weight Unit Kilogram */
+    kHIDUsage_WD_WeightUnitCarats = 0x54,               /* SEL - Weight Unit Carats */
+    kHIDUsage_WD_WeightUnitTaels = 0x55,                /* SEL - Weight Unit Taels */
+    kHIDUsage_WD_WeightUnitGrains = 0x56,               /* SEL - Weight Unit Grains */
+    kHIDUsage_WD_WeightUnitPennyweights = 0x57,         /* SEL - Weight Unit Pennyweights */
+    kHIDUsage_WD_WeightUnitMetricTon = 0x58,            /* SEL - Weight Unit Metric Ton */
+    kHIDUsage_WD_WeightUnitAvoirTon = 0x59,             /* SEL - Weight Unit Avoir Ton */
+    kHIDUsage_WD_WeightUnitTroyOunce = 0x5A,            /* SEL - Weight Unit Troy Ounce */
+    kHIDUsage_WD_WeightUnitOunce = 0x5B,                /* SEL - Weight Unit Ounce */
+    kHIDUsage_WD_WeightUnitPound = 0x5C,                /* SEL - Weight Unit Pound */
+    /* Reserved 0x5D - 0x5F */
+    kHIDUsage_WD_CalibrationCount = 0x60,               /* DV - Calibration Count */
+    kHIDUsage_WD_RezeroCount = 0x61,                    /* DV - Re-Zero Count*/
+    /* Reserved 0x62 - 0x6F */
+    kHIDUsage_WD_ScaleStatus = 0x70,                    /* CL - Scale Status */
+    kHIDUsage_WD_ScaleStatusFault = 0x71,               /* SEL - Scale Status Fault */
+    kHIDUsage_WD_ScaleStatusStableAtZero = 0x72,        /* SEL - Scale Status Stable at Center of  Zero */
+    kHIDUsage_WD_ScaleStatusInMotion = 0x73,            /* SEL - Scale Status In Motion */
+    kHIDUsage_WD_ScaleStatusWeightStable = 0x74,        /* SEL - Scale Status Weight Stable */
+    kHIDUsage_WD_ScaleStatusUnderZero = 0x75,           /* SEL - Scale Status Under Zero */
+    kHIDUsage_WD_ScaleStatusOverWeightLimit = 0x76,     /* SEL - Scale Status Over Weight Limit */
+    kHIDUsage_WD_ScaleStatusRequiresCalibration = 0x77, /* SEL - Scale Status Requires Calibration */
+    kHIDUsage_WD_ScaleStatusRequiresRezeroing = 0x78,   /* SEL - Scale Status Requires Re-zeroing */
+    /* Reserved 0x79 - 0x7F */
+    kHIDUsage_WD_ZeroScale = 0x80,                      /* OOC - Zero Scale */
+    kHIDUsage_WD_EnforcedZeroReturn = 0x81              /* OOC - Enforced Zero Return */
+    /* Reserved 0x82 - 0xFFFF */
+    
+};
+
+/* Magnetic Stripe Reader Page (0x8E) */
+/* This section provides detailed descriptions of the usages employed by Magnetic Stripe Reader Devices. */
+enum 
+{
+    kHIDUsage_MSR_Undefined = 0x00,                     /* MagStripe Undefined Usage */
+    kHIDUsage_MSR_DeviceReadOnly = 0x01,                /* CA - MSR Device Read-Only */
+    /* Reserved 0x02 - 0x10 */
+    kHIDUsage_MSR_Track1Length = 0x11,                     /* SF, DF, SEL - Track 1 Length */
+    kHIDUsage_MSR_Track2Length = 0x12,                     /* SF, DF, SEL - Track 2 Length */
+    kHIDUsage_MSR_Track3Length = 0x13,                     /* SF, DF, SEL - Track 3 Length */
+    kHIDUsage_MSR_TrackJISLength = 0x14,                   /* SF, DF, SEL - Track JIS Length */
+    /* Reserved 0x15 - 0x1F */
+    kHIDUsage_MSR_TrackData = 0x20,                        /* SF, DF, SEL - Track Data */
+    kHIDUsage_MSR_Track1Data = 0x21,                       /* SF, DF, SEL - Track 1 Data */
+    kHIDUsage_MSR_Track2Data = 0x22,                       /* SF, DF, SEL - Track 2 Data */
+    kHIDUsage_MSR_Track3Data = 0x23,                       /* SF, DF, SEL - Track 3 Data */
+    kHIDUsage_MSR_TrackJISData = 0x24                      /* SF, DF, SEL - Track JIS Data */
+    /* Reserved 0x25 - 0xFFFF */
+};
+
+#endif /* _IOHIDUSAGETABLES_H */
diff --git a/i386/include/IOKit/hidevent/IOHIDEventDriver.h b/i386/include/IOKit/hidevent/IOHIDEventDriver.h
new file mode 100644
index 0000000..9eddb24
--- /dev/null
+++ b/i386/include/IOKit/hidevent/IOHIDEventDriver.h
@@ -0,0 +1,171 @@
+/*
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_HID_IOHIDEVENTDRIVER_H
+#define _IOKIT_HID_IOHIDEVENTDRIVER_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/hidsystem/IOHIDTypes.h>
+#include <IOKit/hid/IOHIDInterface.h>
+#include <IOKit/hidevent/IOHIDEventService.h>
+
+
+/*! @class IOHIDEventDriver : public IOHIDEventService
+    @abstract
+    @discussion
+*/
+struct  IOHIDReportHandler;
+
+class IOHIDEventDriver: public IOHIDEventService
+{
+    OSDeclareDefaultStructors( IOHIDEventDriver )
+
+private:
+    IOHIDInterface *            _interface;
+    IOHIDReportHandler *        _reportHandlers;
+    
+    IOHIDElement *              _ledElements[2];
+    OSArray *                   _supportedElements;
+        
+    UInt32                      _bootSupport;
+    bool                        _multipleReports;
+    bool                        _relativeButtonCollection;
+    UInt32                      _cachedButtonState;
+    bool                        _cachedRangeState;
+    
+    struct ExpansionData { 
+    };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *             _reserved;
+    
+    bool                    findElements ( OSArray * elementArray, UInt32 bootProtocol );
+    
+    bool                    storeReportElement ( IOHIDElement * element );
+
+    void                    handleBootPointingReport (
+                                IOMemoryDescriptor *        report,
+                                SInt32 *                    dX,
+                                SInt32 *                    dY,
+                                UInt32 *                    buttonState);
+    
+    static void             _handleInterruptReport (
+                                OSObject *                  target,
+                                AbsoluteTime                timeStamp,
+                                IOMemoryDescriptor *        report,
+                                IOHIDReportType             reportType,
+                                UInt32                      reportID,
+                                void *                      refcon);
+    
+protected:
+
+    virtual void            free();
+    
+    virtual OSArray *       getReportElements();
+    
+    virtual bool            handleStart( IOService * provider );
+
+    virtual void            handleStop(  IOService * provider );
+    
+    virtual void            handleInterruptReport (
+                                AbsoluteTime                timeStamp,
+                                IOMemoryDescriptor *        report,
+                                IOHIDReportType             reportType,
+                                UInt32                      reportID);
+
+    virtual OSString *      getTransport ();
+
+    virtual UInt32          getLocationID ();
+
+    virtual UInt32          getVendorID ();
+
+    virtual UInt32          getVendorIDSource ();
+
+    virtual UInt32          getProductID ();
+
+    virtual UInt32          getVersion ();
+
+    virtual UInt32          getCountryCode ();
+
+    virtual OSString *      getManufacturer ();
+
+    virtual OSString *      getProduct ();
+
+    virtual OSString *      getSerialNumber ();
+
+    virtual void            setElementValue (
+                                UInt32                      usagePage,
+                                UInt32                      usage,
+                                UInt32                      value );
+    
+    virtual UInt32          getElementValue ( 
+                                UInt32                      usagePage,
+                                UInt32                      usage );
+
+public:
+
+
+    virtual bool            init( OSDictionary * dictionary = 0 );
+
+    virtual bool            didTerminate(
+                                IOService *                 provider,
+                                IOOptionBits                options,
+                                bool *                      defer );
+    
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  0);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  1);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  2);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  3);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  4);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  5);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  6);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  7);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  8);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  9);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 10);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 11);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 12);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 13);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 14);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 15);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 16);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 17);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 18);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 19);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 20);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 21);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 22);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 23);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 24);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 25);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 26);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 27);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 28);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 29);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 30);
+    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 31);
+
+};
+
+#endif /* !_IOKIT_HID_IOHIDEVENTDRIVER_H */
diff --git a/i386/include/IOKit/hidevent/IOHIDEventService.h b/i386/include/IOKit/hidevent/IOHIDEventService.h
new file mode 100644
index 0000000..bc82511
--- /dev/null
+++ b/i386/include/IOKit/hidevent/IOHIDEventService.h
@@ -0,0 +1,394 @@
+/*
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2009 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_HID_IOHIDEVENTSERVICE_H
+#define _IOKIT_HID_IOHIDEVENTSERVICE_H
+
+#include <TargetConditionals.h>
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOTimerEventSource.h>
+#include <IOKit/hidsystem/IOHIDTypes.h>
+#include <IOKit/hid/IOHIDInterface.h>
+#include <IOKit/hid/IOHIDElement.h>
+#include <IOKit/hid/IOHIDKeys.h>
+
+#if TARGET_OS_EMBEDDED
+    #include <IOKit/hid/IOHIDEvent.h>
+#endif
+
+enum 
+{
+    kHIDDispatchOptionPointerNoAcceleration            = 0x01,
+    kHIDDispatchOptionPointerAffixToScreen             = 0x02,
+    kHIDDispatchOptionPointerAbsolutToRelative         = 0x04
+};
+
+enum
+{
+    kHIDDispatchOptionScrollNoAcceleration             = 0x01,
+    kHIDDispatchOptionScrollMomentumContinue           = 0x02,
+    kHIDDispatchOptionScrollMomentumStart              = 0x04,
+    kHIDDispatchOptionScrollMomentumEnd                = 0x08,
+
+    kHIDDispatchOptionScrollMomentumAny                = kHIDDispatchOptionScrollMomentumContinue | kHIDDispatchOptionScrollMomentumStart | kHIDDispatchOptionScrollMomentumEnd
+};
+
+enum 
+{
+    kHIDDispatchOptionKeyboardNoRepeat                 = 0x01
+};
+
+/*! @class IOHIDEventService : public IOService
+    @abstract
+    @discussion
+*/
+class   IOHIDPointing;
+class   IOHIDKeyboard;
+class   IOHIDConsumer;
+struct  TransducerData;
+
+class IOHIDEventService: public IOService
+{
+    OSDeclareAbstractStructors( IOHIDEventService )
+    
+    friend class IOHIDPointing;
+    friend class IOHIDKeyboard;
+    friend class IOHIDConsumer;
+    friend class AppleEmbeddedKeyboard;
+    friend class IOHIDEventServiceUserClient;
+
+private:
+    IOHIDKeyboard *         _keyboardNub;
+    IOHIDPointing *         _pointingNub;
+    IOHIDConsumer *         _consumerNub;
+
+    IONotifier *			_publishNotify;
+    IORecursiveLock *       _nubLock;
+    
+    OSArray *               _transducerDataArray;
+    
+    bool                    _readyForInputReports;
+
+
+    struct ExpansionData { 
+		IOService *				provider;
+        IOWorkLoop *            workLoop;
+        UInt32                  ejectDelayMS;
+        IOTimerEventSource 	*   ejectTimerEventSource;
+        UInt32                  ejectState;
+        IOOptionBits            ejectOptions;
+        UInt32                  capsDelayMS;
+        IOTimerEventSource 	*   capsTimerEventSource;
+        UInt32                  capsState;
+        IOOptionBits            capsOptions;
+        OSArray *               deviceUsagePairs;
+        
+#if TARGET_OS_EMBEDDED
+        OSDictionary *          clientDict;
+        UInt32                  debuggerMask;
+        UInt32                  startDebuggerMask;
+        IOTimerEventSource *    debuggerTimerEventSource;
+        bool                    shouldSwapISO;
+#endif
+    };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *         _reserved;
+    
+    IOHIDPointing *         newPointingShim (
+                                UInt32          buttonCount         = 1,
+                                IOFixed         pointerResolution   = (400 << 16),
+                                IOFixed         scrollResolution    = 0,
+                                IOOptionBits    options             = 0 );
+                                
+    IOHIDKeyboard *         newKeyboardShim (
+                                UInt32          supportedModifiers  = 0,
+                                IOOptionBits    options             = 0 );
+
+    IOHIDConsumer *         newConsumerShim ( IOOptionBits options = 0 );
+    
+    void                    parseSupportedElements ( 
+                                OSArray *                   elementArray, 
+                                UInt32                      bootProtocol );
+                                
+    void                    processTabletElement ( IOHIDElement * element );
+
+    void                    processTransducerData ();
+    
+    TransducerData *        createTransducerData ( UInt32 tranducerID );
+    
+    TransducerData *        getTransducerData ( UInt32 tranducerID );
+                                
+    IOFixed                 determineResolution ( IOHIDElement * element );
+                                    
+    static bool 			_publishMatchingNotificationHandler(void * target, void * ref, IOService * newService, IONotifier * notifier);
+
+    void                    ejectTimerCallback(IOTimerEventSource *sender);
+
+    void                    capsTimerCallback(IOTimerEventSource *sender);
+    
+#if TARGET_OS_EMBEDDED
+    void                    debuggerTimerCallback(IOTimerEventSource *sender);
+#endif
+	void					calculateCapsLockDelay();
+    
+    void                    calculateStandardType();
+
+protected:
+
+    virtual void            free();
+        
+/*! @function handleOpen
+    @abstract Handle a client open on the interface.
+    @discussion This method is called by IOService::open() with the
+    arbitration lock held, and must return true to accept the client open.
+    This method will in turn call handleClientOpen() to qualify the client
+    requesting the open.
+    @param client The client object that requested the open.
+    @param options Options passed to IOService::open().
+    @param argument Argument passed to IOService::open().
+    @result true to accept the client open, false otherwise. */
+
+    virtual bool handleOpen(IOService *  client,
+                            IOOptionBits options,
+                            void *       argument);
+
+/*! @function handleClose
+    @abstract Handle a client close on the interface.
+    @discussion This method is called by IOService::close() with the
+    arbitration lock held. This method will in turn call handleClientClose()
+    to notify interested subclasses about the client close. If this represents
+    the last close, then the interface will also close the controller before
+    this method returns. The controllerWillClose() method will be called before
+    closing the controller. Subclasses should not override this method.
+    @param client The client object that requested the close.
+    @param options Options passed to IOService::close(). */
+
+    virtual void handleClose(IOService * client, IOOptionBits options);
+
+/*! @function handleIsOpen
+    @abstract Query whether a client has an open on the interface.
+    @discussion This method is always called by IOService with the
+    arbitration lock held. Subclasses should not override this method.
+    @result true if the specified client, or any client if none (0) is
+    specified, presently has an open on this object. */
+
+    virtual bool handleIsOpen(const IOService * client) const;
+
+/*! @function handleStart
+    @abstract Prepare the hardware and driver to support I/O operations.
+    @discussion IOHIDEventService will call this method from start() before
+    any I/O operations are issued to the concrete subclass. Methods
+    such as getReportElements() are only called after handleStart()
+    has returned true. A subclass that overrides this method should
+    begin its implementation by calling the version in super, and
+    then check the return value.
+    @param provider The provider argument passed to start().
+    @result True on success, or false otherwise. Returning false will
+    cause start() to fail and return false. */
+
+    virtual bool            handleStart( IOService * provider );
+
+/*! @function handleStop
+    @abstract Quiesce the hardware and stop the driver.
+    @discussion IOHIDEventService will call this method from stop() to
+    signal that the hardware should be quiesced and the driver stopped.
+    A subclass that overrides this method should end its implementation
+    by calling the version in super.
+    @param provider The provider argument passed to stop(). */
+
+    virtual void            handleStop(  IOService * provider );
+    
+    virtual OSString *      getTransport ();
+    virtual UInt32          getLocationID ();
+    virtual UInt32          getVendorID ();
+    virtual UInt32          getVendorIDSource ();
+    virtual UInt32          getProductID ();
+    virtual UInt32          getVersion ();
+    virtual UInt32          getCountryCode ();
+    virtual OSString *      getManufacturer ();
+    virtual OSString *      getProduct ();
+    virtual OSString *      getSerialNumber ();
+    
+    virtual OSArray *       getReportElements();
+
+    virtual void            setElementValue (
+                                UInt32                      usagePage,
+                                UInt32                      usage,
+                                UInt32                      value );
+    
+    virtual UInt32          getElementValue ( 
+                                UInt32                      usagePage,
+                                UInt32                      usage );
+                                
+    virtual void            dispatchKeyboardEvent(
+                                AbsoluteTime                timeStamp,
+                                UInt32                      usagePage,
+                                UInt32                      usage,
+                                UInt32                      value,
+                                IOOptionBits                options = 0 );
+
+    virtual void            dispatchRelativePointerEvent(
+                                AbsoluteTime                timeStamp,
+                                SInt32                      dx,
+                                SInt32                      dy,
+                                UInt32                      buttonState,
+                                IOOptionBits                options = 0 );
+    
+    virtual void            dispatchAbsolutePointerEvent(
+                                AbsoluteTime                timeStamp,
+                                SInt32                      x,
+                                SInt32                      y,
+                                IOGBounds *                 bounds,
+                                UInt32                      buttonState,
+                                bool                        inRange,
+                                SInt32                      tipPressure,
+                                SInt32                      tipPressureMin,
+                                SInt32                      tipPressureMax,
+                                IOOptionBits                options = 0 );
+
+    virtual void            dispatchScrollWheelEvent(
+                                AbsoluteTime                timeStamp,
+                                SInt32                      deltaAxis1,
+                                SInt32                      deltaAxis2,
+                                SInt32                      deltaAxis3,
+                                IOOptionBits                options = 0 );
+
+    virtual void            dispatchTabletPointerEvent(
+                                AbsoluteTime                timeStamp,
+                                UInt32                      tranducerID,
+                                SInt32                      x,
+                                SInt32                      y,
+                                SInt32                      z,
+                                IOGBounds *                 bounds,
+                                UInt32                      buttonState,
+                                SInt32                      tipPressure,
+                                SInt32                      tipPressureMin,
+                                SInt32                      tipPressureMax,
+                                SInt32                      barrelPressure,
+                                SInt32                      barrelPressureMin,
+                                SInt32                      barrelPressureMax,
+                                SInt32                      tiltX,
+                                SInt32                      tiltY,
+                                UInt32                      twist,
+                                IOOptionBits                options = 0 );
+
+    virtual void            dispatchTabletProximityEvent(
+                                AbsoluteTime                timeStamp,
+                                UInt32                      tranducerID,
+                                bool                        inRange,
+                                bool                        invert,
+                                UInt32                      vendorTransducerUniqueID        = 0,
+                                UInt32                      vendorTransducerSerialNumber    = 0,
+                                IOOptionBits                options                         = 0 );
+
+public:
+    bool                    readyForReports();
+
+    virtual bool            init(OSDictionary * properties = 0);
+
+    virtual bool            start( IOService * provider );
+    
+    virtual void            stop( IOService * provider );
+
+    virtual bool            matchPropertyTable(OSDictionary * table, SInt32 * score);    
+    
+    virtual IOReturn        setSystemProperties( OSDictionary * properties );
+    
+    virtual IOReturn        setProperties( OSObject * properties );
+    
+protected:
+    OSMetaClassDeclareReservedUsed(IOHIDEventService,  0);
+    virtual OSArray *       getDeviceUsagePairs();
+    
+        
+#if TARGET_OS_EMBEDDED
+public:
+    typedef void (*Action)(OSObject *target, OSObject * sender, void *context, OSObject *event, IOOptionBits options);
+
+    OSMetaClassDeclareReservedUsed(IOHIDEventService,  1);
+    virtual bool            open(
+                                IOService *                 client,
+                                IOOptionBits                options,
+                                void *                      context,
+                                Action                      action);
+                                
+protected:    
+    OSMetaClassDeclareReservedUsed(IOHIDEventService,  2);
+    virtual void            dispatchEvent(IOHIDEvent * event, IOOptionBits options=0);
+
+    OSMetaClassDeclareReservedUsed(IOHIDEventService,  3);
+    virtual UInt32          getPrimaryUsagePage();
+    
+    OSMetaClassDeclareReservedUsed(IOHIDEventService,  4);
+    virtual UInt32          getPrimaryUsage();
+    
+    OSMetaClassDeclareReservedUsed(IOHIDEventService,  5);
+    virtual UInt32          getReportInterval();
+
+public:    
+    OSMetaClassDeclareReservedUsed(IOHIDEventService,  6);
+    virtual IOHIDEvent *    copyEvent(
+                                IOHIDEventType              type, 
+                                IOHIDEvent *                matching = 0,
+                                IOOptionBits                options = 0);
+#else
+    OSMetaClassDeclareReservedUnused(IOHIDEventService,  1);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService,  2);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService,  3);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService,  4);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService,  5);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService,  6);
+#endif    
+    OSMetaClassDeclareReservedUnused(IOHIDEventService,  7);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService,  8);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService,  9);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 10);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 11);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 12);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 13);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 14);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 15);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 16);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 17);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 18);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 19);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 20);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 21);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 22);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 23);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 24);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 25);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 26);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 27);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 28);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 29);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 30);
+    OSMetaClassDeclareReservedUnused(IOHIDEventService, 31);
+
+};
+
+#endif /* !_IOKIT_HID_IOHIDEVENTSERVICE_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIDDescriptorParser.h b/i386/include/IOKit/hidsystem/IOHIDDescriptorParser.h
new file mode 100644
index 0000000..0a32647
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOHIDDescriptorParser.h
@@ -0,0 +1,939 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef __IOHIDDescriptorParser__
+#define __IOHIDDescriptorParser__
+
+#include <TargetConditionals.h>
+#include <IOKit/IOTypes.h>
+#include <IOKit/hidsystem/IOHIDUsageTables.h>
+#if !TARGET_OS_EMBEDDED
+    #include <IOKit/ndrvsupport/IOMacOSTypes.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if TARGET_OS_EMBEDDED
+/* Types and enums required by these functions but not in IOTypes.h */
+
+typedef UInt8		Byte;
+typedef SInt8		SignedByte;
+typedef unsigned long	FourCharCode;
+typedef FourCharCode	OSType;
+typedef UInt32		ByteCount;
+
+enum {
+	noErr	= 0
+};
+#endif
+
+/* End missing types and enums */
+
+enum
+{
+	kHIDSuccess						= 0,
+	
+/* HID assigned error numbers are -13949 .. -13900 */
+	kHIDBaseError					= -13950,
+
+	kHIDNullStateErr,
+	kHIDBufferTooSmallErr,
+	kHIDValueOutOfRangeErr,
+	kHIDUsageNotFoundErr,
+	kHIDNotValueArrayErr,
+	kHIDInvalidPreparsedDataErr,
+	kHIDIncompatibleReportErr,
+	kHIDBadLogPhysValuesErr,
+	kHIDInvalidReportTypeErr,
+	kHIDInvalidReportLengthErr,
+	kHIDNullPointerErr,
+	kHIDBadParameterErr,
+	kHIDNotEnoughMemoryErr,
+	kHIDEndOfDescriptorErr,
+	kHIDUsagePageZeroErr,
+	kHIDBadLogicalMinimumErr,
+	kHIDBadLogicalMaximumErr,
+	kHIDInvertedLogicalRangeErr,
+	kHIDInvertedPhysicalRangeErr,
+	kHIDUnmatchedUsageRangeErr,
+	kHIDInvertedUsageRangeErr,
+	kHIDUnmatchedStringRangeErr,
+	kHIDUnmatchedDesignatorRangeErr,
+	kHIDReportSizeZeroErr,
+	kHIDReportCountZeroErr,
+	kHIDReportIDZeroErr,
+	kHIDInvalidRangePageErr,
+
+	// 
+	// HID device driver errors 
+	//
+	
+	kHIDDeviceNotReady 		= -13910, 		// The device is still initializing, try again later
+	kHIDVersionIncompatibleErr,
+};
+
+// types of HID reports (input, output, feature)
+enum
+{
+	kHIDInputReport			= 	1,
+	kHIDOutputReport,
+	kHIDFeatureReport,
+	kHIDUnknownReport		=	255
+};
+
+// flags passed to HIDOpenReportDescriptor
+enum
+{
+	kHIDFlag_StrictErrorChecking = 0x00000001
+};
+
+typedef UInt32	HIDReportType;
+typedef UInt32	HIDUsage;
+
+typedef void *HIDPreparsedDataRef;
+
+/*!
+  @typedef HIDUsageAndPage
+  @abstract The HIDUsageAndPage data structure is used by HID clients when obtaining status of buttons to hold the usage page and usage of a button that is down.
+  @discussion Clients use the HIDUSageAndPage structure with the HIDGetButtonsEx function to obtain both the usage page and usage identifiers of each button that is down.
+  @field usage Specifies the usage identifier within the usage page specified by usagePage of a button that is down.
+  @field usagePage Specifies the usage page identifier of a button that is down.
+ */
+struct HIDUsageAndPage
+{
+	HIDUsage	usage;
+	HIDUsage	usagePage;
+};
+typedef struct HIDUsageAndPage HIDUsageAndPage, *HIDUsageAndPagePtr;
+
+/*!
+  @typedef HIDCaps
+  @abstract The HIDCaps data structure is used by HID clients to hold the capabilities of a HID device.
+  @discussion This structure holds the parsed capabilities and data maximums returned for a device by the HIDGetCaps function.
+  @field usage Specifies the specific class of functionality that this device provides.  This value is dependent and specific to the value provided in the usagePage field.  For example, a keyboard could have a usagePage of kHIDUsagePage_Generic and a usage of kHIDUsage_Generic_Keyboard.
+  @field usagePage Specifies the usage page identifier for this top level collection.
+  @field inputReportByteLength Specifies the maximum length, in bytes, of an input report for this device, including the report ID which is unilaterally prepended to the device data.
+  @field outputReportByteLength Specifies the maximum length, in bytes, of an output report for this device, including the report ID which is unilaterally prepended to the device data.
+  @field featureReportByteLength Specifies the maximum length, in bytes, of a feature report for this device, including the report ID which is unilaterally prepended to the device data.
+  @field numberCollectionNodes Specifies the number of HIDCollectionNode structures that are returned for this top level collection by the HIDGetConnectionNodes function.
+  @field numberInputButtonCaps Specifies the number of input buttons.
+  @field numberInputValueCaps Specifies the number of input values.
+  @field numberOutputButtonCaps Specifies the number of output buttons.
+  @field numberOutputValueCaps Specifies the number of output values
+  @field numberFeatureButtonCaps Specifies the number of feature buttons.
+  @field numberFeatureValueCaps Specifies the number of feature values.
+ */
+struct HIDCaps
+{
+	HIDUsage	usage;
+	HIDUsage	usagePage;
+	ByteCount	inputReportByteLength;
+	ByteCount	outputReportByteLength;
+	ByteCount	featureReportByteLength;
+	UInt32		numberCollectionNodes;
+	UInt32		numberInputButtonCaps;
+	UInt32		numberInputValueCaps;
+	UInt32		numberOutputButtonCaps;
+	UInt32		numberOutputValueCaps;
+	UInt32		numberFeatureButtonCaps;
+	UInt32		numberFeatureValueCaps;
+};
+typedef struct HIDCaps HIDCaps, * HIDCapsPtr;
+
+struct HIDCapabilities {
+    HIDUsage                        usage;
+    HIDUsage                        usagePage;
+    ByteCount                       inputReportByteLength;
+    ByteCount                       outputReportByteLength;
+    ByteCount                       featureReportByteLength;
+    UInt32                          numberCollectionNodes;
+    UInt32                          numberInputButtonCaps;
+    UInt32                          numberInputValueCaps;
+    UInt32                          numberOutputButtonCaps;
+    UInt32                          numberOutputValueCaps;
+    UInt32                          numberFeatureButtonCaps;
+    UInt32                          numberFeatureValueCaps;
+};
+typedef struct HIDCapabilities HIDCapabilities, * HIDCapabilitiesPtr;
+
+
+struct HIDCollectionNode
+{
+	HIDUsage	collectionUsage;
+	HIDUsage	collectionUsagePage;
+	UInt32		parent;
+	UInt32		numberOfChildren;
+	UInt32		nextSibling;
+	UInt32		firstChild;
+};
+typedef struct HIDCollectionNode HIDCollectionNode, * HIDCollectionNodePtr;
+
+struct HIDButtonCaps
+{
+	HIDUsage	usagePage;
+	UInt32		reportID;
+	UInt32		bitField;
+	UInt32		collection;
+	HIDUsage	collectionUsage;
+	HIDUsage	collectionUsagePage;
+	Boolean		isRange;
+	Boolean		isStringRange;
+	Boolean		isDesignatorRange;
+	Boolean		isAbsolute;
+        SInt32 startBit;	// Added esb 9-29-99
+
+	union
+	{
+		struct
+		{
+			HIDUsage		usageMin;
+			HIDUsage		usageMax;
+			UInt32			stringMin;
+			UInt32			stringMax;
+			UInt32			designatorMin;
+			UInt32			designatorMax;
+		} range;
+		struct
+		{
+			HIDUsage		usage;
+			HIDUsage		reserved1;
+			UInt32			stringIndex;
+			UInt32			reserved2;
+			UInt32			designatorIndex;
+			UInt32			reserved3;
+		} notRange;
+	} u;
+};
+typedef struct HIDButtonCaps HIDButtonCaps, * HIDButtonCapsPtr;
+
+struct HIDButtonCapabilities
+{
+	HIDUsage	usagePage;
+	UInt32		reportID;
+	UInt32		bitField;
+	UInt32		collection;
+	HIDUsage	collectionUsage;
+	HIDUsage	collectionUsagePage;
+	Boolean		isRange;
+	Boolean		isStringRange;
+	Boolean		isDesignatorRange;
+	Boolean		isAbsolute;
+
+    SInt32                          unitExponent;	// Added KH 1/25/01
+    SInt32                          units;			// Added KH 1/25/01
+//    UInt32                          reserved;		// Not added KH 1/25/01
+        SInt32 startBit;	// Added esb 9-29-99
+    UInt32                          pbVersion;		// Added KH 1/25/01
+
+	union
+	{
+		struct
+		{
+			HIDUsage		usageMin;
+			HIDUsage		usageMax;
+			UInt32			stringMin;
+			UInt32			stringMax;
+			UInt32			designatorMin;
+			UInt32			designatorMax;
+		} range;
+		struct
+		{
+			HIDUsage		usage;
+			HIDUsage		reserved1;
+			UInt32			stringIndex;
+			UInt32			reserved2;
+			UInt32			designatorIndex;
+			UInt32			reserved3;
+		} notRange;
+	} u;
+};
+typedef struct HIDButtonCapabilities HIDButtonCapabilities, * HIDButtonCapabilitiesPtr;
+
+struct HIDValueCaps
+{
+	HIDUsage	usagePage;
+	UInt32		reportID;
+	UInt32		bitField;
+	UInt32		collection;
+	HIDUsage	collectionUsage;
+	HIDUsage	collectionUsagePage;
+
+	Boolean		isRange;
+	Boolean		isStringRange;
+	Boolean		isDesignatorRange;
+	Boolean		isAbsolute;
+
+        UInt32		startBit;	// Added by esb 9-28-99
+	UInt32		bitSize;
+	UInt32		reportCount;
+
+	SInt32		logicalMin;
+	SInt32		logicalMax;
+	SInt32		physicalMin;
+	SInt32		physicalMax;
+	
+	union
+	{
+		struct
+		{
+			HIDUsage		usageMin;
+			HIDUsage		usageMax;
+			UInt32			stringMin;
+			UInt32			stringMax;
+			UInt32			designatorMin;
+			UInt32			designatorMax;
+		} range;
+		struct
+		{
+			HIDUsage		usage;
+			HIDUsage		reserved1;
+			UInt32			stringIndex;
+			UInt32			reserved2;
+			UInt32			designatorIndex;
+			UInt32			reserved3;
+		} notRange;
+	} u;
+};
+typedef struct HIDValueCaps HIDValueCaps, * HIDValueCapsPtr;
+
+struct HIDValueCapabilities
+{
+	HIDUsage	usagePage;
+	UInt32		reportID;
+	UInt32		bitField;
+	UInt32		collection;
+	HIDUsage	collectionUsage;
+	HIDUsage	collectionUsagePage;
+
+	Boolean		isRange;
+	Boolean		isStringRange;
+	Boolean		isDesignatorRange;
+	Boolean		isAbsolute;
+
+	UInt32		bitSize;
+	UInt32		reportCount;
+
+	SInt32		logicalMin;
+	SInt32		logicalMax;
+	SInt32		physicalMin;
+	SInt32		physicalMax;
+	
+    SInt32                          unitExponent;	// Added KH 1/25/01
+    SInt32                          units;			// Added KH 1/25/01
+//    UInt32                          reserved;		// Not added KH 1/25/01
+        SInt32 startBit;	// Added esb 9-29-99	// Moved here KH 1/25/01
+    UInt32                          pbVersion;		// Added KH 1/25/01
+
+	union
+	{
+		struct
+		{
+			HIDUsage		usageMin;
+			HIDUsage		usageMax;
+			UInt32			stringMin;
+			UInt32			stringMax;
+			UInt32			designatorMin;
+			UInt32			designatorMax;
+		} range;
+		struct
+		{
+			HIDUsage		usage;
+			HIDUsage		reserved1;
+			UInt32			stringIndex;
+			UInt32			reserved2;
+			UInt32			designatorIndex;
+			UInt32			reserved3;
+		} notRange;
+	} u;
+};
+typedef struct HIDValueCapabilities HIDValueCapabilities, * HIDValueCapabilitiesPtr;
+
+/*!
+  @function HIDOpenReportDescriptor
+  @abstract The HIDOpenReportDescriptor function allocates the memory the parser needs to handle the given report descriptor, and then parses the report descriptor.
+  @discussion When the parsed information is no longer needed, clients should call the HIDCloseReportDescriptor function.
+  @param hidReportDescriptor Contains a pointer to the actual HID report descriptor from the USB device's firmware
+  @param descriptorLength The length of the HID report descriptor
+  @param preparsedDataRef Preparsed data reference to be used for subsequent function calls
+  @param flags Flags for this runction are kHIDFlag_StrictErrorChecking = 0x00000001
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDOpenReportDescriptor	   (void *					hidReportDescriptor,
+							ByteCount				descriptorLength,
+							HIDPreparsedDataRef *	preparsedDataRef,
+							UInt32					flags);
+
+/*!
+  @function HIDCloseReportDescriptor
+  @abstract Disposes of the memory the parser allocated for the HIDOpenReportDescriptor function.
+  @param hidReportDescriptor Contains a pointer to the actual HID report descriptor from the USB device's firmware
+  @param preparsedDataRef Preparsed data reference for the report that is returned by the HIDOpenReportDescriptor function.  After making a call to the HIDCloseReportDescriptor function, the preparsedDataRef is invalid and should not be used.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDCloseReportDescriptor   (HIDPreparsedDataRef		preparsedDataRef);
+
+/*!
+  @function HIDGetButtonCaps
+  @abstract Returns the button capabilities structures for a HID device based on the given preparsed data.
+ @param reportType Specifies the type of report for which to retrieve the scaled value.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport
+  @param buttonCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDButtonCaps structures.  The structures contain information for all buttons that meet the search criteria
+  @param buttonCapsSize Contains the size of the buttonCaps array passed in to the function and is set to the number of elements actually placed in the array after the call completes.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetButtonCaps		   (HIDReportType			reportType,
+							HIDButtonCapsPtr		buttonCaps,
+							UInt32	*				buttonCapsSize,
+							HIDPreparsedDataRef		preparsedDataRef);
+
+/*!
+  @function HIDGetButtonCapabilities
+  @abstract Returns the button capabilities structures for a HID device based on the given preparsed data.
+ @param reportType Specifies the type of report for which to retrieve the scaled value.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport
+  @param buttonCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDButtonCapabilities structures.  The structures contain information for all buttons that meet the search criteria
+  @param buttonCapsSize Contains the size of the buttonCaps array passed in to the function and is set to the number of elements actually placed in the array after the call completes.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetButtonCapabilities   (HIDReportType			reportType,
+							HIDButtonCapabilitiesPtr	buttonCaps,
+							UInt32	*				buttonCapsSize,
+							HIDPreparsedDataRef		preparsedDataRef);
+
+/*!
+  @function HIDGetCaps
+  @abstract Returns the capabilities of a HID device based on the given preparsed data.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param capabilities Points to a caller allocated buffer, that upon return contains the parsed capability information for this HID device.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetCaps				   (HIDPreparsedDataRef		preparsedDataRef,
+							HIDCapsPtr				capabilities);
+
+/*!
+  @function HIDGetCapabilities
+  @abstract Returns the capabilities of a HID device based on the given preparsed data.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param capabilities Points to a caller allocated buffer, that upon return contains the parsed capability information for this HID device.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetCapabilities		   (HIDPreparsedDataRef		preparsedDataRef,
+							HIDCapabilitiesPtr		capabilities);
+
+/*!
+  @function HIDGetCollectionNodes
+  @abstract Returns an array of HIDCollectionNode structures that describe the relationships and layout of the link collections within this top level collection.
+  @discussion The length of the buffer required, in array elements, for an entire collection node array is found in the HIDCaps structure member numberCollectionNodes.  You obtain the HIDCaps information by calling the HIDGetCaps function.  For information on the relationships of link collections described by the data returned from this routine, see the descripton of the HIDCollectionNode structure.
+  @param collectionNodes Points to a caller-allocated array of HIDCollectionNode structures in which this routine returns an entry for each collection within the top level collection.  A collection is a group of corresponding HID descriptors containing input, output, and feature items that have some common relationship to one another.  For example, a pointer collection contains items for x and y position data, and button data.
+  @param collectionNodesSize On input, specifies the length in array elements of the buffer provided at collectionNodes.  On output, this parameter is set to the number of entries in the collectionNodes array that were initialized.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetCollectionNodes	   (HIDCollectionNodePtr	collectionNodes,
+							UInt32 *				collectionNodesSize,
+							HIDPreparsedDataRef		preparsedDataRef);
+
+/*!
+  @function HIDGetScaledUsageValue
+  @abstract The HIDGetScaledUsageValue function returns the capabilities for all buttons for a given top level collection.
+  @discussion Clients who which to obtain all capabilities for a usage that contains multiple data items for a single usage that corresponds to a HID byte array, must call the HIDGetUsageValueArray function.
+  @param reportType Specifies the type of report for which to retrieve the scaled value.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Specifies the usage page of the value to be retrieved.
+  @param collection Optionally specifies the link collection identifier of the value to be retrieved.
+  @param usage Specifies the usage of the scaled value to be retrieved.
+  @param usageValue Points to a variable, that on return from this routine holds the scaled value retrieved from the device report.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param report Points to the caller-allocated buffer that contains the device report data
+  @param reportLength Specifies the length, in bytes, of the report data provided at report
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetScaledUsageValue	   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							SInt32 *				usageValue,
+							HIDPreparsedDataRef		preparsedDataRef,
+							void *					report,
+							ByteCount				reportLength);
+
+/*!
+  @function HIDGetSpecificButtonCaps
+  @abstract Retrieves the capabilities for all buttons in a specific type of report that meet the search criteria.
+  @discussion The HIDGetSpecificButtonCaps function retrieves capability data for buttons that meet a given search criteria, as opposed to the HIDGetButtonCaps function which returns the capability data for all buttons on the device.  Calling this routine specifying zero for usagePage, usage and collection is equivalent to calling the HIDGetButtonCaps function.
+  @param reportType Specifies the type of report for which to retrieve the button capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Specifies a usage page identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that specify this usage page will be retrieved.
+  @param collection Specifies a link collection identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that are part of the specified link collection are retrieved.
+  @param usage Specifies a usage identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that match the value specified are retrieved.
+  @param buttonCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDButtonCaps structures.  The structures contain information for all buttons that meet the search criteria.
+  @param buttonCapsLength On input, specifies the length, in array elements, of the buffer provided in the buttonCaps parameter.  On output, this parameter is set to the actual number of elements that were returned by the function call, in the buffer provided in the buttonCaps parameter, if the routine completed without error.  The correct length necessary to retrieve the button capabilities can be found in the capability data returned for the device by the HIDGetCaps function.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetSpecificButtonCaps   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							HIDButtonCapsPtr		buttonCaps,
+							UInt32 *				buttonCapsSize,
+							HIDPreparsedDataRef		preparsedDataRef);
+
+/*!
+  @function HIDGetSpecificButtonCapabilities
+  @abstract Retrieves the capabilities for all buttons in a specific type of report that meet the search criteria.
+  @discussion The HIDGetSpecificButtonCapabilities function retrieves capability data for buttons that meet a given search criteria, as opposed to the HIDGetButtonCapabilities function which returns the capability data for all buttons on the device.  Calling this routine specifying zero for usagePage, usage and collection is equivalent to calling the HIDGetButtonCapabilities function.
+  @param reportType Specifies the type of report for which to retrieve the button capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Specifies a usage page identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that specify this usage page will be retrieved.
+  @param collection Specifies a link collection identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that are part of the specified link collection are retrieved.
+  @param usage Specifies a usage identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that match the value specified are retrieved.
+  @param buttonCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDButtonCapabilities structures.  The structures contain information for all buttons that meet the search criteria.
+  @param buttonCapsLength On input, specifies the length, in array elements, of the buffer provided in the buttonCaps parameter.  On output, this parameter is set to the actual number of elements that were returned by the function call, in the buffer provided in the buttonCaps parameter, if the routine completed without error.  The correct length necessary to retrieve the button capabilities can be found in the capability data returned for the device by the HIDGetCaps function.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetSpecificButtonCapabilities   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							HIDButtonCapabilitiesPtr	buttonCaps,
+							UInt32 *				buttonCapsSize,
+							HIDPreparsedDataRef		preparsedDataRef);
+
+/*!
+  @function HIDGetSpecificValueCaps
+  @abstract Retrieves the capabilities for all values in a specific type of report that meet the search criteria.
+  @discussion The HIDGetSpecificValueCaps function retrieves capability data for values that meet given search criteria, as opposed to the HIDGetValueCaps function, which returns the capability data for all values on the device.  Calling this routine with a value of zero for usagePage, usage and collection parameters is equivalent to calling the HIDGetValueCaps function.
+  @param reportType Specifies the type of report for which to retrieve the value capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport or kHIDFeatureReport.
+  @param usagePage Specifies a usage page identifier to use as a search criteria.  If this parameter is non-zero, then only values that specify this usage page will be retrieved.
+  @param collection Specifies a link collection identifier to use as a search criteria.  If this parameter is non-zero, then only values that are part of this link collection will be retrieved.
+  @param usage Specifies a usage identifier to use as a search criteria.  If this parameter is non-zero, then only values that specify this usage will be retrieved.
+  @param valueCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDValueCaps structures that contain information for all values that meet the search criteria.
+  @param valueCapsSize Specifies the length on input, in array elements, of the buffer provided in the valueCaps parameter.  On output, this parameter is set to the actual number of elements that were returned by this function call, in the buffer provided in the valueCaps parameter, if the routine completed without error.  The correct length necessary to retrieve the value capabilities can be found in the capability data returned for the device from the HIDGetCaps function.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetSpecificValueCaps	   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							HIDValueCapsPtr			valueCaps,
+							UInt32 *				valueCapsSize,
+							HIDPreparsedDataRef		preparsedDataRef);
+
+/*!
+  @function HIDGetSpecificValueCapabilities
+  @abstract Retrieves the capabilities for all values in a specific type of report that meet the search criteria.
+  @discussion The HIDGetSpecificValueCapabilities function retrieves capability data for values that meet given search criteria, as opposed to the HIDGetValueCapabilities function, which returns the capability data for all values on the device.  Calling this routine with a value of zero for usagePage, usage and collection parameters is equivalent to calling the HIDGetValueCapabilities function.
+  @param reportType Specifies the type of report for which to retrieve the value capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport or kHIDFeatureReport.
+  @param usagePage Specifies a usage page identifier to use as a search criteria.  If this parameter is non-zero, then only values that specify this usage page will be retrieved.
+  @param collection Specifies a link collection identifier to use as a search criteria.  If this parameter is non-zero, then only values that are part of this link collection will be retrieved.
+  @param usage Specifies a usage identifier to use as a search criteria.  If this parameter is non-zero, then only values that specify this usage will be retrieved.
+  @param valueCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDValueCapabilities structures that contain information for all values that meet the search criteria.
+  @param valueCapsSize Specifies the length on input, in array elements, of the buffer provided in the valueCaps parameter.  On output, this parameter is set to the actual number of elements that were returned by this function call, in the buffer provided in the valueCaps parameter, if the routine completed without error.  The correct length necessary to retrieve the value capabilities can be found in the capability data returned for the device from the HIDGetCaps function.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetSpecificValueCapabilities	   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							HIDValueCapabilitiesPtr	valueCaps,
+							UInt32 *				valueCapsSize,
+							HIDPreparsedDataRef		preparsedDataRef);
+
+/*!
+  @function HIDGetButtonsOnPage
+  @abstract Retrieves the button stat information for buttons on a specified usage page.
+  @param reportType Specifies the type of report, provided in the report parameter, from which to retrieve the buttons.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport or kHIDFeatureReport.
+  @param usagePage Specifies the usage page of the buttons for which to retrieve the current state.
+  @param collection Optionally specifies the link collection identifier used to retrieve only specific button states.  If this value is non-zero, only the buttons that are part of the given collection are returned.
+  @param usageList On return, points to a caller-allocated buffer that contains the usages of all the buttons that are perssed and belong to the usage page specified in the usagePage parameter.
+  @param usageListSize Is the size, in array elements, of the buffer provided in the usageList parameter.  On return, this parameter contains the number of button states that were set by this routine.  If the error kHIDBufferTooSmallErr was returned, this parameter contains the number of array elements required to hold all button data requested.  The maximum number of buttons that can ever be returned for a given type of report can be obtained by calling the HIDMaxUsageListLength function.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param report Points to the caller-allocated buffer that contains the device report data
+  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetButtonsOnPage		   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage *				usageList,
+							UInt32 *				usageListSize,
+							HIDPreparsedDataRef		preparsedDataRef,
+							void *					report,
+							ByteCount				reportLength);
+
+/*!
+  @function HIDGetButtons
+  @abstract The HIDGetButtons function takes a report from a HID device and gets the current state of the buttons in that report.
+  @param reportType Specifies the type of report, provided in the report parameter, from which to retrieve the buttons.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport or kHIDFeatureReport
+  @param collection Optionally specifies the link collection identifier used to retrieve only specific button states.  If this value is non-zero, only the buttons that are part of the given collection are returned.
+  @param usageList On return, points to a caller-allocated buffer that contains the usages of all the buttons that are pressed.
+  @param usageListSize Is the size, in array elements, of the buffer provided in the usageList parameter.  On return, this parameter contains the number of button states that were set by this routine.  If the error kHIDBufferToSmallErr was returned, this parameter contains the number of array elements required to hold all button data requested.  The maximum number of buttons that can ever be returned for a given type of report can be obtained by calling the HIDMaxUsageListLength function.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param report Points to the caller-allocated buffer that contains the device report data.
+  @param reportLength Specifies the length, in bytes, of the report data provided in the report parameter.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetButtons			   (HIDReportType			reportType,
+							UInt32					collection,
+							HIDUsageAndPagePtr		usageList,
+							UInt32 *				usageListSize,
+							HIDPreparsedDataRef		preparsedDataRef,
+							void *					report,
+							ByteCount				reportLength);
+
+extern 
+OSStatus
+HIDGetNextButtonInfo       (HIDReportType          reportType,
+                            HIDUsage               usagePage,
+                            HIDUsage               usage,
+                            UInt32 *               collection,
+                            UInt8 *                reportID,
+                            HIDPreparsedDataRef    preparsedDataRef);
+
+extern 
+OSStatus
+HIDGetNextUsageValueInfo   (HIDReportType          reportType,
+                            HIDUsage               usagePage,
+                            HIDUsage               usage,
+                            UInt32 *               collection,
+                            UInt8 *                reportID,
+                            HIDPreparsedDataRef    preparsedDataRef);
+
+extern 
+OSStatus
+HIDGetReportLength         (HIDReportType          reportType,
+                            UInt8                  reportID,
+                            ByteCount *            reportLength,
+                            HIDPreparsedDataRef    preparsedDataRef);
+
+/*!
+  @function HIDGetUsageValue
+  @abstract The HIDGetUsageValue function returns a value from a device data report given a selected search criteria.
+  @discussion The HIDGetUsageValue function does not sign the value.  To have the sign bit automatically applied, use the HIDGetScaledUsageValue function instead.  For manually assigning the sign bit, the position of the sign bit can be found in the HIDValueCaps structure for this value.  Clients who wish to obtain all data for a usage that contains multiple data items for a single usage, corresponding to a HID byte array, must call the HIDGetUsageValueArray function instead.
+  @param reportType Specifies the type of report, provided in report, from which to retrieve the value.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Specifies the usage page of the value to retrieve.
+  @param collection Optionally specifies the link collection identifier of the value to be retrieved.
+  @param usage Specifies the usage of the value to be retrieved.
+  @param usageValue Points to a variable, that on return from this routine holds the value retrieved from the device report.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param report Points to the caller-allocated buffer that contains the device report data.
+  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetUsageValue		   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							SInt32 *				usageValue,
+							HIDPreparsedDataRef		preparsedDataRef,
+							void *					report,
+							ByteCount				reportLength);
+
+/*!
+  @function HIDGetUsageValueArray
+  @abstract The HIDGetUsageValueArray function returns a value from a device data report given a selected search criteria.
+  @discussion When the HIDGetUsageValueArray function retrieves the data, it fills in the buffer in little-endian order beginning with the least significant bit of the data for this usage.  The data is filled in without regard to byte alignment and is shifted such that the least significant bit is placed as the 1st bit of the given buffer.
+  @param reportType Specifies the type of report, provided in report, from which to retrieve the value.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Specifies the usage page of the data to be retrieved.
+  @param collection Optionally specifies the link collection identifier of the data to be retrieved.
+  @param usage Specifies the usage identifier of the value to be retrieved.
+  @param usageValueBuffer Points to a caller-allocated buffer that contains, on output, the data from the device.  The correct length for this buffer can be found by multiplying the reportCount and bitSize fields of the HIDValueCaps structure for the value and rounding the resulting value up to the nearest byte.
+  @param usageValueBufferSize Specifies the size, in bytes, of the buffer in the usageValueBuffer parameter.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param report Points to the caller-allocated buffer that contains the device report data.
+  @param reportLength Specifies the size, in bytes, of the report data provided in report.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetUsageValueArray	   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							Byte *					usageValueBuffer,
+							ByteCount				usageValueBufferSize,
+							HIDPreparsedDataRef		preparsedDataRef,
+							void *					report,
+							ByteCount				reportLength);
+
+/*!
+  @function HIDGetValueCaps
+  @abstract The HIDGetValueCaps function retrieves the capabilities for all values for a specified top level collection.
+  @discussion The HIDGetValueCaps function retrieves the capability data for all values in a top level collection without regard for the usage, usage page or collection of the value.  To retrieve value capabilities for a specific usage, usage page or collection, use the HIDGetSpecificValueCaps function.
+  @param reportType Specifies the type of report for which to retrieve the value capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param valueCaps On return, points to a caller-allocated buffer that contains an array of HIDValueCaps structures containing information for all values in the top level collection.
+  @param valueCapsSize On input, specifies the size in array elements of the buffer provided in the valueCaps parameter.  On output, this parameter is set to the actual number of elements that were returned in the buffer provided in the valueCaps parameter, if the function completed without error.  The correct length necessary to retrieve the value capabilities can be found in the capability data returned for the device by the HIDGetCaps function.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetValueCaps			   (HIDReportType			reportType,
+							HIDValueCapsPtr			valueCaps,
+							UInt32 *				valueCapsSize,
+							HIDPreparsedDataRef		preparsedDataRef);
+
+/*!
+  @function HIDGetValueCapabilities
+  @abstract The HIDGetValueCapabilities function retrieves the capabilities for all values for a specified top level collection.
+  @discussion The HIDGetValueCapabilities function retrieves the capability data for all values in a top level collection without regard for the usage, usage page or collection of the value.  To retrieve value capabilities for a specific usage, usage page or collection, use the HIDGetSpecificValueCapabilities function.
+  @param reportType Specifies the type of report for which to retrieve the value capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param valueCaps On return, points to a caller-allocated buffer that contains an array of HIDValueCapabilities structures containing information for all values in the top level collection.
+  @param valueCapsSize On input, specifies the size in array elements of the buffer provided in the valueCaps parameter.  On output, this parameter is set to the actual number of elements that were returned in the buffer provided in the valueCaps parameter, if the function completed without error.  The correct length necessary to retrieve the value capabilities can be found in the capability data returned for the device by the HIDGetCapabilities function.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDGetValueCapabilities	   (HIDReportType			reportType,
+							HIDValueCapabilitiesPtr	valueCaps,
+							UInt32 *				valueCapsSize,
+							HIDPreparsedDataRef		preparsedDataRef);
+
+extern 
+OSStatus
+HIDInitReport              (HIDReportType          reportType,
+                            UInt8                  reportID,
+                            HIDPreparsedDataRef    preparsedDataRef,
+                            void *                 report,
+                            ByteCount              reportLength);
+
+/*!
+  @function HIDMaxUsageListLength
+  @abstract The HIDMaxUsageListLength function returns the maximum number of buttons that can be returned from a given report type for the top level collection.
+  @param reportType Specifies the type of report for which to get a maximum usage count.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Optionally specifies the usage page identifier to use as a search criteria.  If this parameter is zero, the function returns the number of buttons for the entire top-level collection regardless of the actual value of the usage page.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern  
+UInt32
+HIDMaxUsageListLength	   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							HIDPreparsedDataRef		preparsedDataRef);
+
+/*!
+  @function HIDSetScaledUsageValue
+  @abstract The HIDSetScaledUsageValue function takes a signed physical (scaled) number and converts it to the logical, or device representation and inserts it in a given report.
+  @discussion The HIDSetScaledUsageValue function automatically handles the setting of the signed bit in the data to be sent to the device.
+  @param reportType Specifies the type of report.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Specifies the usage page identifier of the value to be set in the report.
+  @param collection Optionally specifies the link collection identifier to distinguish between values that have the same usage page and usage identifiers.  If this parameter is zero, it will be ignored.
+  @param usage Specifies the usage identifier of the value to be set in the report.
+  @param usageValue Specifies the physical, or scaled, value to be set in the value for the given report.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param report Points to the caller-allocated buffer that contains the device report data.
+  @param Specifies the length, in bytes of the report data specified in the report parameter.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDSetScaledUsageValue	   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							SInt32					usageValue,
+							HIDPreparsedDataRef		preparsedDataRef,
+							void *					report,
+							ByteCount				reportLength);
+
+/*!
+  @function HIDSetButtons
+  @abstract The HIDSetButtons function takes a report from a HID device and returns the current state of the buttons in that report.
+  @param reportType Specifies the type of repor.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Specifies the usage page identifier of the value to be set in the report.
+  @param collection Optionally specifies the link collection identifier to distinguish between buttons.  If this parameter is zero, it is ignored.
+  @param usageList Points to a caller-allocated buffer that contains an array of button data to be set in the report in the report parameter.
+  @param usageListSize Specifies the size, in array elements, of the buffer provided in the usageList parameter.  If an error is returned by a call to this function, the usageListLength parameter contains the location in the array provided in the usageList parameter where the error was encountered.  All array entries encountered prior to the error location were successfully set in the report provided in the report parameter.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param report Points to the caller-allocated buffer that contains the device report data.
+  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDSetButtons			   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage *				usageList,
+							UInt32 *				usageListSize,
+							HIDPreparsedDataRef		preparsedDataRef,
+							void *					report,
+							ByteCount				reportLength);
+
+/*!
+  @function HIDSetUsageValue
+  @abstract The HIDSetUsageValue function sets a value in a give report.
+  @discussion The HIDSetUsageVlaue function does not automatically handle the sign bit.  Clients must either manually set the sign bit, at the position provided in the HIDValueCaps structure for this value, or call the HIDSetScaledUsageValue function.
+  @param reportType Specifies the type of report.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Specifies the usage page identifier of the value to be set in the report.
+  @param collection Optionally specifies the link collection identifier to distinguish between values that have the same usage page and usage identifiers.  If this parameter is zero, it is ignored.
+  @param usage Specifies the usage identifier of the value to be set in the report.
+  @param usageValue Specifies the data that is to be set in the value for the given report.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param report Points to the caller-allocated buffer that contains the device report data.
+  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDSetUsageValue		   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							SInt32					usageValue,
+							HIDPreparsedDataRef		preparsedDataRef,
+							void *					report,
+							ByteCount				reportLength);
+
+/*!
+  @function HIDSetUsageValueArray
+  @abstract The HIDSetUsageValueArray function sets an array of values in a given report.
+  @discussion The HIDSetUsageValue function does not automatically handle the sign bit.  Clients must either manually set the sign bit, at the position provided in the HIDValueCaps structure for this value, or call the HIDSetScaledUsageValue function.
+  @param reportType Specifies the type of report.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Specifies the usage page identifier of the value to be set in the report.
+  @param collection Optionally specifies the link collection identifier to distinguish between values that have the same usage page and usage identifiers.  If this parameter is zero, it is ignored.
+  @param usage Specifies the usage identifier of the value to be set in the report.
+  @param usageValueBuffer Points to a caller-allocated buffer that contains, on output, the data from the device.  The correct length for this buffer can be found by multiplying the reportCount and bitSize fields of the HIDValueCaps structure for this value and rounding the resulting value up to the nearest byte.
+  @param usageValueBufferLength Specifies the size, in bytes, of the buffer in the usageValueBuffer parameter.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param report Points to the caller-allocated buffer that contains the device report data.
+  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDSetUsageValueArray	   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							Byte *					usageValueBuffer,
+							ByteCount				usageValueBufferLength,
+							HIDPreparsedDataRef		preparsedDataRef,
+							void *					report,
+							ByteCount				reportLength);
+
+/*!
+  @function HIDUsageListDifference
+  @abstract The HIDUsageListDifference function compares and provides the differences between two lists of buttons.
+  @param previousUsageList Points to the older button list to be used for comparison.
+  @param currentUsageList Points to the newer button list to be used for comparison.
+  @param breakUsageList On return, points to a caller-allocated buffer that contains the buttons set in the older list, specified in the previousUsageList parameter, but not set in the new list, specified in the currentUsageList parameter.
+  @param makeUsageList On return, points to a caller-allocated buffer that contains the buttons set in the new list, specified in the currentUsageList parameter, but not set in the old list, specified in the previousUsageList parameter.
+  @param usageListsLength Specifies the length, in array elements, of the buffers provided in the currentUsageList and previousUssageList parameters.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDUsageListDifference	   (HIDUsage *				previousUsageList,
+							HIDUsage *				currentUsageList,
+							HIDUsage *				breakUsageList,
+							HIDUsage *				makeUsageList,
+							UInt32					usageListsSize);
+
+/*!
+  @function HIDSetButton
+  @abstract The HIDSetButton function takes a report from a HID device and sets the current state of the specified button in that report.
+  @param reportType Specifies the type of report.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
+  @param usagePage Specifies the usage page identifier of the value to be set in the report.
+  @param collection Optionally specifies the link collection identifier to distinguish between buttons.  If this parameter is zero, it is ignored.
+  @param usage Points to a caller-allocated buffer that contains the button data to be set in the report in the report parameter.
+  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
+  @param report Points to the caller-allocated buffer that contains the device report data.
+  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter.
+  @result OSStatus Returns an error code if an error was encountered or noErr on success.
+ */
+
+extern 
+OSStatus
+HIDSetButton			   (HIDReportType			reportType,
+							HIDUsage				usagePage,
+							UInt32					collection,
+							HIDUsage				usage,
+							HIDPreparsedDataRef		preparsedDataRef,
+							void *					report,
+							ByteCount				reportLength);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/i386/include/IOKit/hidsystem/IOHIDParameter.h b/i386/include/IOKit/hidsystem/IOHIDParameter.h
new file mode 100644
index 0000000..f528d03
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOHIDParameter.h
@@ -0,0 +1,310 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/* 	Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved. 
+ *
+ * evsio.h - Get/Set parameter calls for Event Status Driver.
+ *
+ *	CAUTION: Developers should stick to the API exported in
+ *		<drivers/event_status_driver.h> to guarantee
+ *		binary compatability of their applications in future
+ *		releases.
+ *
+ * HISTORY
+ * 22 May 1992    Mike Paquette at NeXT
+ *      Created. 
+ */
+#ifndef _DEV_EVSIO_H
+#define _DEV_EVSIO_H
+
+/* Public type definitions. */
+#include <IOKit/hidsystem/IOHIDTypes.h>
+#include <IOKit/hidsystem/IOLLEvent.h>
+
+/*
+ * Identify this driver as one that uses the new driverkit and messaging API
+ */
+#ifndef _NeXT_MACH_EVENT_DRIVER_
+#define _NeXT_MACH_EVENT_DRIVER_	(1)
+#endif /* !_NeXT_MACH_EVENT_DRIVER_ */
+
+/* * */
+
+#define kIOHIDKindKey					"HIDKind"
+#define kIOHIDInterfaceIDKey			"HIDInterfaceID"
+#define kIOHIDSubinterfaceIDKey			"HIDSubinterfaceID"
+
+#define kIOHIDParametersKey				"HIDParameters"
+
+#define kIOHIDVirtualHIDevice                   "HIDVirtualDevice"
+
+#define kIOHIDKeyRepeatKey				"HIDKeyRepeat"
+#define kIOHIDInitialKeyRepeatKey		"HIDInitialKeyRepeat"
+#define kIOHIDKeyMappingKey				"HIDKeyMapping"
+#define kIOHIDResetKeyboardKey			"HIDResetKeyboard"
+
+#define kIOHIDKeyboardModifierMappingPairsKey   "HIDKeyboardModifierMappingPairs"
+#define kIOHIDKeyboardModifierMappingSrcKey     "HIDKeyboardModifierMappingSrc"
+#define kIOHIDKeyboardModifierMappingDstKey     "HIDKeyboardModifierMappingDst"
+
+#define kIOHIDKeyboardCapsLockDoesLockKey       "HIDKeyboardCapsLockDoesLock"
+#define kIOHIDKeyboardSupportsF12EjectKey       "HIDKeyboardSupportsF12Eject"
+#define kIOHIDKeyboardSupportedModifiersKey     "HIDKeyboardSupportedModifiers"
+
+#define kIOHIDPointerResolutionKey		"HIDPointerResolution"
+#define kIOHIDResetPointerKey			"HIDResetPointer"
+#define kIOHIDPointerConvertAbsoluteKey	"HIDPointerConvertAbsolute"
+#define kIOHIDPointerContactToMoveKey	"HIDPointerContactToMove"
+#define kIOHIDPointerPressureToClickKey	"HIDPointerPressureToClick"
+#define kIOHIDPointerButtonMode			"HIDPointerButtonMode"
+#define kIOHIDPointerButtonCountKey	"HIDPointerButtonCount"
+
+#define kIOHIDPointerAccelerationKey	"HIDPointerAcceleration"
+#define kIOHIDPointerAccelerationSettingsKey	"HIDPointerAccelerationSettings"
+#define kIOHIDPointerAccelerationTypeKey	"HIDPointerAccelerationType"
+#define kIOHIDPointerAccelerationTableKey  "HIDPointerAccelerationTable"
+
+#define kIOHIDScrollResetKey			"HIDScrollReset"
+#define kIOHIDScrollResolutionKey		"HIDScrollResolution"
+#define kIOHIDScrollReportRateKey       "HIDScrollReportRate"
+#define kIOHIDScrollAccelerationKey		"HIDScrollAcceleration"
+#define kIOHIDScrollAccelerationTypeKey     "HIDScrollAccelerationType"
+#define kIOHIDScrollAccelerationTableKey	"HIDScrollAccelerationTable"
+
+#define kIOHIDScrollResolutionXKey		"HIDScrollResolutionX"
+#define kIOHIDScrollResolutionYKey		"HIDScrollResolutionY"
+#define kIOHIDScrollResolutionZKey		"HIDScrollResolutionZ"
+
+#define kIOHIDScrollAccelerationTableXKey	"HIDScrollAccelerationTableX"
+#define kIOHIDScrollAccelerationTableYKey	"HIDScrollAccelerationTableY"
+#define kIOHIDScrollAccelerationTableZKey	"HIDScrollAccelerationTableZ"
+
+#define kIOHIDScrollMouseButtonKey      "HIDScrollMouseButton"
+
+#define kIOHIDScrollZoomModifierMaskKey "HIDScrollZoomModifierMask"
+
+#define kIOHIDTrackpadScrollAccelerationKey "HIDTrackpadScrollAcceleration"
+#define kIOHIDMouseScrollAccelerationKey   "HIDMouseScrollAcceleration"
+
+#define kIOHIDTrackpadAccelerationType	"HIDTrackpadAcceleration"
+#define kIOHIDMouseAccelerationType		"HIDMouseAcceleration"
+
+#define kIOHIDClickTimeKey				"HIDClickTime"
+#define kIOHIDClickSpaceKey				"HIDClickSpace"
+
+#define kIOHIDWaitCursorFrameIntervalKey	"HIDWaitCursorFrameInterval"
+
+#define kIOHIDAutoDimThresholdKey		"HIDAutoDimThreshold"
+#define kIOHIDAutoDimStateKey			"HIDAutoDimState"
+#define kIOHIDAutoDimTimeKey			"HIDAutoDimTime"
+#define kIOHIDIdleTimeKey				"HIDIdleTime"
+
+#define kIOHIDBrightnessKey				"HIDBrightness"
+#define kIOHIDAutoDimBrightnessKey		"HIDAutoDimBrightness"
+
+#define kIOHIDFKeyModeKey			"HIDFKeyMode"
+
+// if kIOHIDStickyKeysDisabledKey is 1, then all sticky keys functionality
+// is completely turned off. Multiple shifts will have no effect.
+#define kIOHIDStickyKeysDisabledKey		"HIDStickyKeysDisabled"
+
+// if kIOHIDStickyKeysOnKey is 1 then a depressed modifier will stay down
+// until a non-modifer key is pressed (or sticky keys is turned off)
+#define kIOHIDStickyKeysOnKey			"HIDStickyKeysOn"
+
+// if kIOHIDStickyKeysShiftTogglesKey is 1, then a sequence of five
+// shift keys in sequence will toggle sticky keys on or off
+#define kIOHIDStickyKeysShiftTogglesKey	"HIDStickyKeysShiftToggles"
+
+// if kIOHIDMouseKeysOptionTogglesKey is 1, then a sequence of five
+// option keys in sequence will toggle mouse keys on or off
+#define kIOHIDMouseKeysOptionTogglesKey	"HIDMouseKeysOptionToggles"
+
+// kIOHIDSlowKeysDelayKey represents the delay used for slow keys.
+// if kIOHIDSlowKeysDelayKey is 0, then slow keys off
+#define kIOHIDSlowKeysDelayKey			"HIDSlowKeysDelay"
+
+#define kIOHIDF12EjectDelayKey			"HIDF12EjectDelay"
+
+#define kIOHIDMouseKeysOnKey			"HIDMouseKeysOn"
+
+#define kIOHIDUseKeyswitchKey           "HIDUseKeyswitch"
+
+#define kIOHIDDisallowRemappingOfPrimaryClickKey	"HIDDisallowRemappingOfPrimaryClick"
+#define kIOHIDMouseKeysEnablesVirtualNumPadKey	"HIDMouseKeysEnablesVirtualNumPad"
+
+#define kIOHIDResetLEDsKey          "HIDResetLEDs"
+
+
+#ifdef __ppc__
+    // the following are misspelled keys present in the system
+    // they are being kept around, but will eventually be deprecated
+    #define kIOHIDSickyKeysDisabledKey		kIOHIDStickyKeysDisabledKey
+    #define kIOHIDSickyKeysOnKey			kIOHIDStickyKeysOnKey
+    #define kIOHIDSickyKeysShiftTogglesKey	kIOHIDStickyKeysShiftTogglesKey
+#endif
+
+// the following values are used in kIOHIDPointerButtonMode
+typedef enum {
+	kIOHIDButtonMode_BothLeftClicks = 0,
+	kIOHIDButtonMode_ReverseLeftRightClicks = 1,
+	kIOHIDButtonMode_EnableRightClick = 2
+} IOHIDButtonModes;
+
+#ifdef _undef
+#define EVS_PREFIX	"Evs_"	/* All EVS calls start with this string */
+
+/* WaitCursor-related ioctls */
+
+#define EVSIOSWT "Evs_SetWaitThreshold"
+#define EVSIOSWT_SIZE	EVS_PACKED_TIME_SIZE
+
+#define EVSIOSWS "Evs_SetWaitSustain"
+#define EVSIOSWS_SIZE	EVS_PACKED_TIME_SIZE
+
+#define EVSIOSWFI "Evs_SetWaitFrameInterval"
+#define EVSIOSWFI_SIZE	EVS_PACKED_TIME_SIZE
+
+#define EVSIOCWINFO	"Evs_CurrentWaitCursorInfo"
+#define EVSIOCWINFO_THRESH	0
+#define EVSIOCWINFO_SUSTAIN	(EVSIOCWINFO_THRESH + EVS_PACKED_TIME_SIZE)
+#define EVSIOCWINFO_FINTERVAL	(EVSIOCWINFO_SUSTAIN + EVS_PACKED_TIME_SIZE)
+#define EVSIOCWINFO_SIZE	(EVSIOCWINFO_FINTERVAL + EVS_PACKED_TIME_SIZE)
+#endif
+
+#define EVS_PACKED_TIME_SIZE (sizeof(UInt64) / sizeof( unsigned int))
+
+/* Device control ioctls. Levels specified may be in the range 0 - 64. */
+
+#define EVSIOSB	  	kIOHIDBrightnessKey
+#define EVSIOSB_SIZE	1
+
+#define EVSIOSADB 	kIOHIDAutoDimBrightnessKey
+#define EVSIOSADB_SIZE	1
+
+#ifdef _undef
+#define EVSIOSA	  "Evs_SetAttenuation"
+#define EVIOSA_SIZE	1
+
+#define EVSIO_DCTLINFO	"Evs_DeviceControlInfo"
+typedef enum {
+	EVSIO_DCTLINFO_BRIGHT,
+	EVSIO_DCTLINFO_ATTEN,
+	EVSIO_DCTLINFO_AUTODIMBRIGHT
+} evsio_DCTLINFOIndices;
+#define EVSIO_DCTLINFO_SIZE	(EVSIO_DCTLINFO_AUTODIMBRIGHT + 1)
+#endif
+
+/*
+ * Device status request
+ */
+#define	EVSIOINFO  NX_EVS_DEVICE_INFO
+
+
+/* Keyboard-related ioctls - implemented within Event Sources */
+
+#define EVSIOSKR  	kIOHIDKeyRepeatKey
+#define EVSIOSKR_SIZE	EVS_PACKED_TIME_SIZE
+
+#define EVSIOSIKR 	kIOHIDInitialKeyRepeatKey
+#define EVSIOSIKR_SIZE	EVS_PACKED_TIME_SIZE
+
+#define EVSIORKBD 	kIOHIDResetKeyboardKey
+#define EVSIORKBD_SIZE	1
+
+#define EVSIOCKR_SIZE	EVS_PACKED_TIME_SIZE
+
+#define	EVSIOCKML 	kIOHIDKeyMappingKey
+#define EVSIOCKML_SIZE	1
+
+/* The following two tokens are for use with the get/set character routines. */
+#define EVSIOSKM  	kIOHIDKeyMappingKey
+#define EVSIOSKM_SIZE	4096
+
+#define	EVSIOCKM  	kIOHIDKeyMappingKey
+#define EVSIOCKM_SIZE	4096
+
+/* Mouse-related ioctls - implemented within Event Sources */
+
+#define	EVSIOSMS  	kIOHIDPointerAccelerationKey
+#define	EVSIOSMS_SIZE		(1)
+
+#define	EVSIOCMS  	kIOHIDPointerAccelerationKey
+#define	EVSIOCMS_SIZE		(1)
+
+#ifdef _undef
+#define EVSIOSMH  "Evs_SetMouseHandedness"
+#define EVSIOSMH_SIZE	1		// value from NXMouseButton enum
+
+#define EVSIOCMH  "Evs_CurrentMouseHandedness"
+#define EVSIOCMH_SIZE	1
+#endif
+
+/* Generic pointer device controls, implemented by the Event Driver. */
+#define	EVSIOSCT  	kIOHIDClickTimeKey
+#define EVSIOSCT_SIZE	EVS_PACKED_TIME_SIZE
+
+#define	EVSIOSCS  	kIOHIDClickSpaceKey
+typedef enum {
+	EVSIOSCS_X,
+	EVSIOSCS_Y
+} evsioEVSIOSCSIndices;
+#define EVSIOSCS_SIZE	(EVSIOSCS_Y + 1)
+
+#define EVSIOSADT	 kIOHIDAutoDimThresholdKey
+#define EVSIOSADT_SIZE	EVS_PACKED_TIME_SIZE
+
+#define EVSIOSADS 	kIOHIDAutoDimStateKey
+#define EVSIOSADS_SIZE	1
+
+#define EVSIORMS  	kIOHIDResetPointerKey
+#define EVSIORMS_SIZE	1
+
+#define	EVSIOCCT  	kIOHIDClickTimeKey
+#define EVSIOCCT_SIZE	EVS_PACKED_TIME_SIZE
+
+#define EVSIOCADT 	kIOHIDAutoDimThresholdKey
+#define EVSIOCADT_SIZE	EVS_PACKED_TIME_SIZE
+
+#define EVSIOGDADT 	kIOHIDAutoDimTimeKey
+#define EVSIOGDADT_SIZE	EVS_PACKED_TIME_SIZE
+
+#define EVSIOIDLE 	kIOHIDIdleTimeKey
+#define EVSIOIDLE_SIZE	EVS_PACKED_TIME_SIZE
+
+#define	EVSIOCCS  	kIOHIDClickSpaceKey
+typedef enum {
+	EVSIOCCS_X,
+	EVSIOCCS_Y
+} evsioEVSIOCCSIndices;
+#define EVSIOCCS_SIZE	(EVSIOCCS_Y + 1)
+
+#define EVSIOCADS 	kIOHIDAutoDimStateKey
+#define EVSIOCADS_SIZE	1
+
+enum {
+    // Selectors for IOHIDGetModifierLockState and IOHIDSetModifierLockState
+    kIOHIDCapsLockState             = 0x00000001,
+    kIOHIDNumLockState              = 0x00000002,
+};
+
+#endif /* !_DEV_EVSIO_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIDShared.h b/i386/include/IOKit/hidsystem/IOHIDShared.h
new file mode 100644
index 0000000..e7c5e3a
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOHIDShared.h
@@ -0,0 +1,341 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/******************************************************************************
+
+    evio.h
+    Ioctl calls for the events driver
+    Leovitch 02Jan88
+    
+    Copyright 1988 NeXT, Inc.
+    
+	CAUTION: Developers should stick to the API exported in
+		<drivers/event_status_driver.h> to guarantee
+		binary compatability of their applications in future
+		releases.
+
+    Modified:
+    
+    09Dec88 Leo  Broken out from evsio.h
+    24Aug89 Ted  ANSI function prototyping.
+    19Feb90 Ted  Major revision for multiple driver support.
+    26Feb90 Ted  New evioScreen structure and EVIOST ioctl.
+    12Mar90 Ted  New ev_unregister_screen function, SCREENTOKEN constant.
+    06May90 Ted  Added AALastEventSent and AALastEventConsumed to EvVars.
+    22May90 Trey More wait cursor vars in EvVars.
+    13Jun90 Ted  NXCursorData structure.
+    18Jun90 Ted  Default wait cursor constants.
+    26Sep90 Ted  Enhanced cursor system to support intelligent drivers.
+    26Nov90 Ted  Removed NXSaveCursor and NXCursorData structures
+    28Nov90 Ted  Remove EvVars, rolled into EventGlobals
+    28Nov90 Ted  Renamed EventGlobals -> EvGlobals, eventGlobals -> evg
+    05May92 Mike Reworked for NRW driver architecture.
+
+******************************************************************************/
+
+#ifndef _DEV_EVIO_H
+#define _DEV_EVIO_H
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+#if KERNEL
+#include <IOKit/system.h>
+#else /* !KERNEL */
+#include <mach/message.h>
+#include <IOKit/IOKitLib.h>
+#endif /* KERNEL */
+
+#include <IOKit/IOReturn.h>
+#include <IOKit/graphics/IOGraphicsTypes.h>
+#include <IOKit/hidsystem/IOHIDTypes.h>
+#include <IOKit/hidsystem/IOLLEvent.h>
+
+/*
+ * Identify this driver as one that uses the new driverkit and messaging API
+ */
+#ifndef _NeXT_MACH_EVENT_DRIVER_
+#define _NeXT_MACH_EVENT_DRIVER_	(1)
+#endif /* _NeXT_MACH_EVENT_DRIVER_ */
+
+
+/* Pressure Constants */
+#define MINPRESSURE EV_MINPRESSURE
+#define MAXPRESSURE EV_MAXPRESSURE
+
+#define	LLEQSIZE 240	/* Entries in low-level event queue */
+
+typedef struct _NXEQElStruct {
+    int	next;		/* Slot of lleq for next event */
+    ev_lock_data_t sema; /* Is high-level code reading this event now? */
+    NXEvent event;	/* The event itself */
+} NXEQElement;
+
+
+/******************************************************************************
+    SHARED MEMORY OVERVIEW
+    
+    PERSPECTIVE
+    The ev driver and PostScript share at least one page of wired memory.
+    This memory contains the low-level event queue which ev deposits events
+    into and PostScript reads events from. Also, this memory contains other
+    important data such as wait cursor state and some general cursor state.
+    This memory is critical for speed.  That is, we avoid having to make
+    system calls for common operations.
+    
+    SHARED MEMORY REGIONS
+    There are currently three "regions" or "zones" delineated within this
+    shared memory.  The first zone is the EvOffsets structure. This structure
+    contains two offsets from the beginning of shared memory. The first offset
+    is to the second zone, EvGlobals. The second offset is to the third
+    zone, private shmem for drivers.
+    
+    INITIALIZATION OF SHARED MEMORY
+    When the WindowServer starts up, it finds all screens that will be active.
+    It then opens the ev driver and calls the EVIOSSCR ioctl repeatedly for
+    each screen in use. This lets the ev driver set up the evScreen array
+    and fill in each element. This ioctl also returns to PostScript a running
+    total shared memory size with which to allocate. PostScript then allocates
+    a region of memory this size and calls evmmap to "map in" this shared
+    region.  Evmmap initializes and fills in the EvOffsets and EvGlobals.
+    Next the WindowServer calls each screen in turn to register itself with
+    the ev driver in the same sequence as presented to EVIOSSCR.  Each screen
+    driver calls ev_register_screen() which among other things allocates a
+    part of the private shmem (of the third shared memory zone) for the driver.
+    
+    DEBUGGING NOTES
+    You can easily display and set this shared memory from kgdb, but usually
+    cannot do so from within PostScript.  Gdb (or some weird interaction
+    between gdb and the os) chokes on this shmem.  So if you read or write
+    this area of memory, copy-on-write will occur and you'll get a completely
+    new page for PostScript.  This will render the shared memory scheme
+    useless and you will have to restart PostScript.  It was my understanding
+    that before, we were able to "read" this area from PS, but not write to
+    it (the idea behind copy-on-WRITE).  However, this seems to be broken
+    in 2.0.  We think this is a kernel bug.
+******************************************************************************/
+
+typedef volatile struct _evOffsets {
+    int	evGlobalsOffset;	/* Offset to EvGlobals structure */
+    int evShmemOffset;		/* Offset to private shmem regions */
+} EvOffsets;
+
+/******************************************************************************
+    EvGlobals
+    This structures defines the portion of the events driver data structure
+    that is exported to the PostScript server. It contains the event queue
+    which is in memory shared between the driver and the PostScript server.
+    All the variables necessary to read and process events from the queue are
+    contained here.
+******************************************************************************/
+
+#ifndef __ppc__
+typedef volatile struct _evGlobals {
+    ev_lock_data_t cursorSema; 	/* set to disable periodic code */
+    int eNum;			/* Unique id for mouse events */
+    int buttons;		/* State of the mouse buttons 1==down, 0==up */
+    int eventFlags;		/* The current value of event.flags */
+    int VertRetraceClock;	/* The current value of event.time */
+    IOGPoint cursorLoc;		/* The current location of the cursor */
+    int frame;			/* current cursor frame */
+    IOGBounds workBounds;	/* bounding box of all screens */
+    IOGBounds mouseRect;	/* Rect for mouse-exited events */
+    int version;		/* for run time checks */
+    int	structSize;		/* for run time checks */
+    int lastFrame;
+    unsigned int reservedA[31];
+
+    unsigned reserved:27;
+    unsigned wantPressure:1;	/* pressure in current mouseRect? */
+    unsigned wantPrecision:1;	/* precise coordinates in current mouseRect? */
+    unsigned dontWantCoalesce:1;/* coalesce within the current mouseRect? */
+    unsigned dontCoalesce:1;	/* actual flag which determines coalescing */
+    unsigned mouseRectValid:1;	/* If nonzero, post a mouse-exited
+				   whenever mouse outside mouseRect. */
+    int movedMask;		/* This contains an event mask for the
+				   three events MOUSEMOVED,
+				   LMOUSEDRAGGED,  and RMOUSEDRAGGED.
+				   It says whether driver should
+				   generate those events. */
+    ev_lock_data_t waitCursorSema; /* protects wait cursor fields */
+    int AALastEventSent;	/* timestamp for wait cursor */
+    int AALastEventConsumed;	/* timestamp for wait cursor */	
+    int waitCursorUp;		/* Is wait cursor up? */
+    char ctxtTimedOut;		/* Has wait cursor timer expired? */
+    char waitCursorEnabled;	/* Play wait cursor game (per ctxt)? */
+    char globalWaitCursorEnabled; /* Play wait cursor game (global)? */
+    int waitThreshold;		/* time before wait cursor appears */
+
+    int LLEHead;		/* The next event to be read */
+    int LLETail;		/* Where the next event will go */
+    int LLELast;		/* The last event entered */
+    NXEQElement lleq[LLEQSIZE];	/* The event queue itself */
+} EvGlobals;
+
+#else
+
+typedef volatile struct _evGlobals {
+    ev_lock_data_t cursorSema; 	/* set to disable periodic code */
+    int LLEHead;		/* The next event to be read */
+    int LLETail;		/* Where the next event will go */
+    int LLELast;		/* The last event entered */
+    int eNum;			/* Unique id for mouse events */
+    int buttons;		/* State of the mouse buttons 1==down, 0==up */
+    int eventFlags;		/* The current value of event.flags */
+    int VertRetraceClock;	/* The current value of event.time */
+    IOGPoint cursorLoc;		/* The current location of the cursor */
+    int frame;			/* current cursor frame */
+    IOGBounds workBounds;	/* bounding box of all screens */
+    IOGBounds mouseRect;	/* Rect for mouse-exited events */
+    int version;		/* for run time checks */
+    int	structSize;		/* for run time checks */
+    int lastFrame;
+    unsigned int reservedA[31];
+
+    unsigned reserved:27;
+    unsigned wantPressure:1;	/* pressure in current mouseRect? */
+    unsigned wantPrecision:1;	/* precise coordinates in current mouseRect? */
+    unsigned dontWantCoalesce:1;/* coalesce within the current mouseRect? */
+    unsigned dontCoalesce:1;	/* actual flag which determines coalescing */
+    unsigned mouseRectValid:1;	/* If nonzero, post a mouse-exited
+				   whenever mouse outside mouseRect. */
+    int movedMask;		/* This contains an event mask for the
+				   three events MOUSEMOVED,
+				   LMOUSEDRAGGED,  and RMOUSEDRAGGED.
+				   It says whether driver should
+				   generate those events. */
+    int AALastEventSent;	/* timestamp for wait cursor */
+    int AALastEventConsumed;	/* timestamp for wait cursor */	
+    ev_lock_data_t waitCursorSema; /* protects wait cursor fields */
+    int waitCursorUp;		/* Is wait cursor up? */
+    char ctxtTimedOut;		/* Has wait cursor timer expired? */
+    char waitCursorEnabled;	/* Play wait cursor game (per ctxt)? */
+    char globalWaitCursorEnabled; /* Play wait cursor game (global)? */
+    int waitThreshold;		/* time before wait cursor appears */
+    NXEQElement lleq[LLEQSIZE];	/* The event queue itself */
+} EvGlobals;
+#endif
+
+/* These evio structs are used in various calls supported by the ev driver. */
+
+struct evioLLEvent {
+    int setCursor;
+    int type;
+    IOGPoint location;
+    NXEventData data;
+    int setFlags;
+    int flags;
+};
+
+typedef struct evioLLEvent _NXLLEvent;
+
+#ifdef mach3xxx
+
+/*
+ * On a keypress of a VOL UP or VOL DOWN key, we send a message to the 
+ * sound server to notify it of the volume change.  The message includes
+ * a flag to indicate which key was pressed, and the machine independant
+ * flag bits to indicate which modifier keys were pressed.
+ */
+
+struct evioSpecialKeyMsg
+{
+	msg_header_t Head;
+	msg_type_t keyType;
+	int key;		// special key number, from bsd/dev/ev_keymap.h
+	msg_type_t directionType;
+	int direction;		// NX_KEYDOWN, NX_KEYUP from event.h
+	msg_type_t flagsType;
+	int flags;		// device independant flags from event.h
+	msg_type_t levelType;
+	int level;		// EV_AUDIO_MIN_VOLUME to EV_AUDIO_MAX_VOLUME
+};
+#else
+struct evioSpecialKeyMsg
+{
+	mach_msg_header_t Head;
+	int key;		// special key number, from bsd/dev/ev_keymap.h
+	int direction;		// NX_KEYDOWN, NX_KEYUP from event.h
+	int flags;		// device independant flags from event.h
+	int level;		// EV_AUDIO_MIN_VOLUME to EV_AUDIO_MAX_VOLUME
+};
+#endif
+
+#define EV_SPECIAL_KEY_MSG_ID	(('S'<<24) | ('k'<<16) | ('e'<<8) | ('y'))
+typedef struct evioSpecialKeyMsg *evioSpecialKeyMsg_t;
+
+/*
+ * Volume ranges
+ */
+#define EV_AUDIO_MIN_VOLUME	0
+#define EV_AUDIO_MAX_VOLUME	64
+
+#define kIOHIDSystemClass	"IOHIDSystem"
+#define kIOHIKeyboardClass	"IOHIKeyboard"
+#define kIOHIPointingClass	"IOHIPointing"
+
+#define IOHIDSYSTEM_CONFORMSTO	kIOHIDSystemClass
+
+enum {
+    kIOHIDCurrentShmemVersion	= 3,
+    kIOHIDEventNotification	= 0,
+};
+
+enum {
+    kIOHIDServerConnectType	= 0,
+    kIOHIDParamConnectType	= 1,
+    kIOHIDEventSystemConnectType = 3,
+};
+
+enum {
+    kIOHIDGlobalMemory          = 0
+};
+
+enum {
+    kIOHIDEventQueueTypeKernel  = 0,
+    kIOHIDEventQueueTypeUser    = 1
+};
+
+#ifdef KERNEL
+typedef UInt16 (*MasterVolumeUpdate)(void);
+typedef bool (*MasterMuteUpdate)(void);
+
+typedef struct {
+    MasterVolumeUpdate incrementMasterVolume;
+    MasterVolumeUpdate decrementMasterVolume;
+    MasterMuteUpdate toggleMasterMute;
+} MasterAudioFunctions;
+
+extern MasterAudioFunctions *masterAudioFunctions;
+#endif
+
+#ifndef KERNEL
+#ifndef _IOKIT_IOHIDLIB_H
+#include <IOKit/hidsystem/IOHIDLib.h>
+#endif
+#endif /* !KERNEL */
+
+__END_DECLS
+
+
+#endif /* !_DEV_EVIO_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIDSystem.h b/i386/include/IOKit/hidsystem/IOHIDSystem.h
new file mode 100644
index 0000000..1a78a38
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOHIDSystem.h
@@ -0,0 +1,785 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2009 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/* 	Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved. 
+ *
+ * EventDriver.h - Exported Interface Event Driver object.
+ *
+ *		The EventDriver is a pseudo-device driver.
+ *
+ * HISTORY
+ * 19 Mar 1992    Mike Paquette at NeXT
+ *      Created. 
+ * 4  Aug 1993	  Erik Kay at NeXT
+ *	API cleanup
+ */
+
+#ifndef	_IOHIDSYSTEM_H
+#define _IOHIDSYSTEM_H
+
+#include <TargetConditionals.h>
+#include <IOKit/IOTimerEventSource.h>
+#include <IOKit/IOInterruptEventSource.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/IOUserClient.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/pwr_mgt/IOPM.h>
+#if TARGET_OS_EMBEDDED
+class IOGraphicsDevice;
+#else
+#include <IOKit/graphics/IOGraphicsDevice.h>
+#endif
+#include <IOKit/hidsystem/IOHIDevice.h>
+#include <IOKit/hidsystem/IOHIDShared.h>
+#include <IOKit/hidsystem/IOHIDTypes.h>
+#include <IOKit/hidsystem/IOLLEvent.h>
+#include <IOKit/IODataQueue.h>
+#include <IOKit/hidsystem/ev_keymap.h>		/* For NX_NUM_SCANNED_SPECIALKEYS */
+
+           
+// The following messages should be unique across the entire system
+#ifndef sub_iokit_hidsystem
+#define sub_iokit_hidsystem                     err_sub(14)
+#endif
+
+#define kIOHIDSystem508MouseClickMessage        iokit_family_msg(sub_iokit_hidsystem, 1)
+#define kIOHIDSystemDeviceSeizeRequestMessage	iokit_family_msg(sub_iokit_hidsystem, 2)
+#define kIOHIDSystem508SpecialKeyDownMessage    iokit_family_msg(sub_iokit_hidsystem, 3)
+
+class IOHIDKeyboardDevice;
+class IOHIDPointingDevice;
+class IOHIDEvent;
+
+class IOHIDSystem : public IOService
+{
+	OSDeclareDefaultStructors(IOHIDSystem);
+
+	friend class IOHIDUserClient;
+	friend class IOHIDParamUserClient;
+	friend class IOHIDEventSystemUserClient;
+
+private:
+	IOWorkLoop *		workLoop;
+	IOTimerEventSource *  	timerES;
+	IOTimerEventSource *  	vblES;
+        IOInterruptEventSource * eventConsumerES;
+        IOInterruptEventSource * keyboardEQES;
+        IOCommandGate *		cmdGate;
+	IOUserClient *		serverConnect;
+	IOUserClient *		paramConnect;
+        IONotifier *		eventPublishNotify;
+        IONotifier *		eventTerminateNotify;
+        IONotifier *		publishNotify;
+        IONotifier *		terminateNotify;
+        
+        OSArray *		ioHIDevices;
+    OSSet             * touchEventPosters;
+
+	// Ports on which we hold send rights
+	mach_port_t	eventPort;	// Send msg here when event queue
+					// goes non-empty
+    mach_port_t stackShotPort;
+	mach_port_t	_specialKeyPort[NX_NUM_SCANNED_SPECIALKEYS]; // Special key msgs
+	void		*eventMsg;	// Msg to be sent to Window Server.
+	void		*stackShotMsg;	// Msg to be sent to Stack Shot.
+
+	// Shared memory area information
+    IOBufferMemoryDescriptor * globalMemory;
+	uintptr_t	shmem_addr;	// kernel address of shared memory
+	vm_size_t	shmem_size;	// size of shared memory
+    
+	// Pointers to structures which occupy the shared memory area.
+	volatile void	*evs;		// Pointer to private driver shmem
+	volatile EvGlobals *evg;	// Pointer to EvGlobals (shmem)
+	// Internal variables related to the shared memory area
+	int		lleqSize;	// # of entries in low-level queue
+                        // FIXME: why is this ivar lleqSize an ivar? {Dan]
+
+	// Screens list
+	vm_size_t	evScreenSize;	// Byte size of evScreen array
+	void		*evScreen;	// array of screens known to driver
+	volatile void	*lastShmemPtr;	// Pointer used to index thru shmem
+					// while assigning shared areas to
+					// drivers.
+	int		screens;	// running total of allocated screens
+	UInt32		cursorScreens;	// bit mask of screens with cursor present
+        UInt32		cursorPinScreen;// a screen to pin against
+	IOGBounds		cursorPin;	// Range to which cursor is pinned
+					// while on this screen.
+	IOGBounds		workSpace;	// IOGBounds of full workspace.
+	// Event Status state - This includes things like event timestamps,
+	// time til screen dim, and related things manipulated through the
+	// Event Status API.
+	//
+	IOGPoint	pointerLoc;	// Current pointing device location
+				// The value leads evg->cursorLoc.
+        IOGPoint	pointerDelta;	// The cumulative pointer delta values since
+                                // previous mouse move event was posted
+                                
+	IOGPoint	clickLoc;	// location of last mouse click
+	IOGPoint   clickSpaceThresh;	// max mouse delta to be a doubleclick
+	int	clickState;	// Current click state
+
+	bool evOpenCalled;	// Has the driver been opened?
+	bool evInitialized;	// Has the first-open-only initialization run?
+    bool evStateChanging;   // Is the event system state changing.
+	bool eventsOpen;	// Boolean: has evmmap been called yet?
+	bool cursorStarted;	// periodic events running?
+	bool cursorEnabled;	// cursor positioning ok?
+	bool cursorCoupled;	// cursor positioning on pointer moves ok?
+	bool cursorPinned;	// cursor positioning on pointer moves ok?
+
+	short leftENum;		// Unique ID for last left down event
+	short rightENum;	// Unique ID for last right down event
+	
+	// The periodic event mechanism timestamps and state
+	// are recorded here.
+	AbsoluteTime thisPeriodicRun;
+        AbsoluteTime periodicEventDelta;// Time between periodic events
+                                        // todo: make infinite
+        AbsoluteTime clickTime;		// Timestamps used to determine doubleclicks
+        AbsoluteTime clickTimeThresh;
+
+        AbsoluteTime waitSustain;	// Sustain time before removing cursor
+        AbsoluteTime waitSusTime;	// Sustain counter
+        AbsoluteTime waitFrameRate;	// Ticks per wait cursor frame
+        AbsoluteTime waitFrameTime;	// Wait cursor frame timer
+
+        AbsoluteTime lastRelativeEventTime;	// Used to post mouse events once per frame
+        AbsoluteTime lastRelativeMoveTime;
+        AbsoluteTime lastEventTime;
+        AbsoluteTime lastUndimEvent;
+        SInt32 postDeltaX, accumDX;
+        SInt32 postDeltaY, accumDY;
+
+	// Flags used in scheduling periodic event callbacks
+	bool		needSetCursorPosition;
+	bool		needToKickEventConsumer;
+        
+        IOService *	displayManager;	// points to display manager
+        IOPMPowerFlags	displayState;
+        
+        IOService *	rootDomain;
+        AbsoluteTime	stateChangeDeadline;
+        
+        OSDictionary *  savedParameters;	// keep user settings
+        
+        const char *    registryName;		// cache our name
+        UInt32		maxWaitCursorFrame;	// animation frames
+	UInt32		firstWaitCursorFrame;	//
+        
+        int		cachedEventFlags;
+        OSArray *  cachedButtonStates;
+        
+        OSArray * systemInfo;
+        
+        IOHIDPointingDevice * _hidPointingDevice;
+        IOHIDKeyboardDevice * _hidKeyboardDevice;
+
+        unsigned consumedKeyCode;
+        
+    OSObject * lastSender;
+    
+        UInt32 scrollZoomMask;
+        
+    bool setParamPropertiesInProgress;
+    
+    OSSet * dataQueueSet;
+        
+private:
+    void vblEvent(void);
+    UInt8 getSubtypeForSender(OSObject * sender);
+    void updateMouseEventForSender(OSObject * sender, NXEventData * evData);
+    void updateMouseMoveEventForSender(OSObject * sender, NXEventData * evData);
+    void updateScrollEventForSender(OSObject * sender, NXEventData * evData);
+    static void _vblEvent(OSObject *self, IOTimerEventSource *sender);
+
+  inline short getUniqueEventNum();
+
+  virtual IOReturn powerStateDidChangeTo( IOPMPowerFlags, unsigned long, IOService * );
+ /* Resets */
+  void _resetMouseParameters();
+
+  /* Initialize the shared memory area */
+  void     initShmem(bool clean);
+  /* Dispatch low level events through shared memory to the WindowServer */
+  void postEvent(int           what,
+          /* at */       IOGPoint *       location,
+          /* atTime */   AbsoluteTime  ts,
+          /* withData */ NXEventData * myData,
+          /* sender */   OSObject *    sender   = 0,
+          /* pid */      UInt32        extPID   = 0,
+          /* processKEQ*/bool          processKEQ = true);
+  /* Dispatch mechanisms for screen state changes */
+  void evDispatch(
+            /* command */ EvCmd evcmd);
+  /* Dispatch mechanism for special key press */
+  void evSpecialKeyMsg(unsigned key,
+               /* direction */ unsigned dir,
+               /* flags */     unsigned f,
+               /* level */     unsigned l);
+  /* Message the event consumer to process posted events */
+  void kickEventConsumer();
+  void sendStackShotMessage();
+  
+  OSDictionary * createFilteredParamPropertiesForService(IOService * service, OSDictionary * dict);
+
+  static void _periodicEvents(IOHIDSystem * self,
+                              IOTimerEventSource *timer);
+
+  static void doSpecialKeyMsg(IOHIDSystem * self,
+					struct evioSpecialKeyMsg *msg);
+  static void doKickEventConsumer(IOHIDSystem * self);
+
+  static void doProcessKeyboardEQ(IOHIDSystem * self);
+  static void processKeyboardEQ(IOHIDSystem * self, AbsoluteTime * deadline = 0);
+ 
+  static bool genericNotificationHandler( void * target, 
+				void * ref, IOService * newService );
+                
+  static bool handlePublishNotification( void * target, IOService * newService );
+
+  static bool handleTerminateNotification( void * target, IOService * service );
+
+  static void makeNumberParamProperty( OSDictionary * dict, const char * key,
+                            unsigned long long number, unsigned int bits );
+
+  static void makeInt32ArrayParamProperty( OSDictionary * dict, const char * key,
+                            UInt32 * array, unsigned int count );
+
+/*
+ * HISTORICAL NOTE:
+ *   The following methods were part of the IOHIDSystem(Input) category;
+ *   the declarations have now been merged directly into this class.
+ *
+ * Exported Interface Event Driver object input services.
+ */
+
+private:
+  // Schedule next periodic run based on current event system state.
+  void scheduleNextPeriodicEvent();
+  // Message invoked to run periodic events.  This method runs in the workloop.
+  void periodicEvents(IOTimerEventSource *timer);
+  // Start the cursor running.
+  bool startCursor();
+  // Repin cursor location.
+  bool resetCursor();
+  // Wait Cursor machinery.
+  void showWaitCursor();
+  void hideWaitCursor();
+  void animateWaitCursor();
+  void changeCursor(int frame);
+  // Return screen number a point lies on.
+  int  pointToScreen(IOGPoint * p);
+
+  inline void showCursor();
+  inline void hideCursor();
+  inline void moveCursor();
+  // Claim ownership of event sources.
+  void attachDefaultEventSources();
+  // Give up ownership of event sources.
+  void detachEventSources();
+  bool registerEventSource(IOService * source);
+
+  // Set abs cursor position.
+  void setCursorPosition(IOGPoint * newLoc, bool external, OSObject * sender=0);
+  void _setButtonState(int buttons,
+                       /* atTime */ AbsoluteTime ts,
+                       OSObject * sender);
+  void _setCursorPosition(IOGPoint * newLoc, bool external, bool proximityChange = false, OSObject * sender=0);
+
+  static bool _idleTimeSerializerCallback(void * target, void * ref, OSSerialize *s);
+
+  void _postMouseMoveEvent(int		what,
+                           IOGPoint *	location,
+                           AbsoluteTime	theClock,
+                           OSObject *	sender);
+  void createParameters( void );
+
+/* END HISTORICAL NOTE */
+
+public:
+  static IOHIDSystem * instance();     /* Return the current instance of the */
+				       /* EventDriver, or 0 if none. */
+  static void scaleLocationToCurrentScreen(IOGPoint *location, IOGBounds *bounds);
+
+  virtual bool init(OSDictionary * properties = 0);
+  virtual IOHIDSystem * probe(IOService *    provider,
+                              SInt32 * score);
+  virtual bool start(IOService * provider);
+  virtual IOReturn message(UInt32 type, IOService * provider,
+				void * argument);
+  virtual void free();
+  virtual bool attach( IOService * provider );
+  virtual void detach( IOService * provider );
+
+  virtual IOWorkLoop *getWorkLoop() const;
+
+  virtual IOReturn evOpen(void);
+  virtual IOReturn evClose(void);
+
+  virtual IOReturn  setProperties( OSObject * properties );
+  virtual IOReturn  setParamProperties(OSDictionary * dict);
+
+  /* Create the shared memory area */
+  virtual IOReturn createShmem(void*,void*,void*,void*,void*,void*);
+
+  /* register the IODataQueue for the new user events */
+  virtual IOReturn registerEventQueue(IODataQueue * queue);
+
+  /* Unregister the IODataQueue for the new user events */
+  virtual IOReturn unregisterEventQueue(IODataQueue * queue);
+
+  /* Set the port for event available notify msg */
+  virtual void     setEventPort(mach_port_t port);
+  /* Set the port for the special key keypress msg */
+  virtual IOReturn setSpecialKeyPort(
+                     /* keyFlavor */ int         special_key,
+                     /* keyPort */   mach_port_t key_port);
+  virtual mach_port_t specialKeyPort(int special_key);
+
+
+  virtual IOReturn newUserClient(task_t         owningTask,
+                 /* withToken */ void *         security_id,
+                 /* ofType */    UInt32         type,
+                 /* withProps*/  OSDictionary *  properties,
+                 /* client */    IOUserClient ** handler);
+
+/*
+ * HISTORICAL NOTE:
+ *   The following methods were part of the IOHIPointingEvents protocol;
+ *   the declarations have now been merged directly into this class.
+ */
+
+public: 
+  /* Mouse event reporting */
+  virtual void relativePointerEvent(int        buttons,
+                       /* deltaX */ int        dx,
+                       /* deltaY */ int        dy,
+                       /* atTime */ AbsoluteTime ts);
+
+  /* Tablet event reporting */
+  virtual void absolutePointerEvent(int        buttons,
+                 /* at */           IOGPoint *    newLoc,
+                 /* withBounds */   IOGBounds *bounds,
+                 /* inProximity */  bool       proximity,
+                 /* withPressure */ int        pressure,
+                 /* withAngle */    int        stylusAngle,
+                 /* atTime */       AbsoluteTime ts);
+
+  /* Mouse scroll wheel event reporting */
+  virtual void scrollWheelEvent(short deltaAxis1,
+                                short deltaAxis2,
+                                short deltaAxis3,
+                                AbsoluteTime ts);
+  
+
+  virtual void tabletEvent(NXEventData *tabletData,
+                           AbsoluteTime ts);
+
+  virtual void proximityEvent(NXEventData *proximityData,
+                              AbsoluteTime ts);
+
+/*
+ * HISTORICAL NOTE:
+ *   The following methods were part of the IOHIKeyboardEvents protocol;
+ *   the declarations have now been merged directly into this class.
+ */
+
+public:
+  virtual void keyboardEvent(unsigned   eventType,
+      /* flags */            unsigned   flags,
+      /* keyCode */          unsigned   key,
+      /* charCode */         unsigned   charCode,
+      /* charSet */          unsigned   charSet,
+      /* originalCharCode */ unsigned   origCharCode,
+      /* originalCharSet */  unsigned   origCharSet,
+      /* keyboardType */     unsigned   keyboardType,
+      /* repeat */           bool       repeat,
+      /* atTime */           AbsoluteTime ts);
+
+  virtual void keyboardSpecialEvent(   unsigned   eventType,
+                    /* flags */        unsigned   flags,
+                    /* keyCode  */     unsigned   key,
+                    /* specialty */    unsigned   flavor,
+                    /* guid */ 	       UInt64     guid,
+                    /* repeat */       bool       repeat,
+                    /* atTime */       AbsoluteTime ts);
+
+  virtual void updateEventFlags(unsigned flags);  /* Does not generate events */
+
+
+
+
+private:
+
+  /*
+   * statics for upstream callouts
+   */
+
+  void _scaleLocationToCurrentScreen(IOGPoint *location, IOGPoint *fraction, IOGBounds *bounds);  // Should this one be public???
+
+  static void _relativePointerEvent(IOHIDSystem * self,
+				    int        buttons,
+                       /* deltaX */ int        dx,
+                       /* deltaY */ int        dy,
+                       /* atTime */ AbsoluteTime ts,
+                                    OSObject * sender,
+                                    void *     refcon);
+
+  /* Tablet event reporting */
+  static void _absolutePointerEvent(IOHIDSystem * self,
+				    int        buttons,
+                 /* at */           IOGPoint *    newLoc,
+                 /* withBounds */   IOGBounds *bounds,
+                 /* inProximity */  bool       proximity,
+                 /* withPressure */ int        pressure,
+                 /* withAngle */    int        stylusAngle,
+                 /* atTime */       AbsoluteTime ts,
+                                    OSObject * sender,
+                                    void *     refcon);
+
+  /* Mouse scroll wheel event reporting */
+  static void _scrollWheelEvent(    IOHIDSystem *self,
+                                    short      deltaAxis1,
+                                    short      deltaAxis2,
+                                    short      deltaAxis3,
+                                    IOFixed    fixedDelta1,
+                                    IOFixed    fixedDelta2,
+                                    IOFixed    fixedDelta3,
+                                    SInt32  pointDeltaAxis1,
+                                    SInt32  pointDeltaAxis2,
+                                    SInt32  pointDeltaAxis3,
+                                    UInt32  options,
+                                    AbsoluteTime ts,
+                                    OSObject * sender,
+                                    void *     refcon);
+
+  static void _tabletEvent(         IOHIDSystem *self,
+                                    NXEventData *tabletData,
+                                    AbsoluteTime ts,
+                                    OSObject * sender,
+                                    void *     refcon);
+
+  static void _proximityEvent(      IOHIDSystem *self,
+                                    NXEventData *proximityData,
+                                    AbsoluteTime ts,
+                                    OSObject * sender,
+                                    void *     refcon);
+
+  static void _keyboardEvent(       IOHIDSystem * self,
+                                    unsigned   eventType,
+            /* flags */             unsigned   flags,
+            /* keyCode */           unsigned   key,
+            /* charCode */          unsigned   charCode,
+            /* charSet */           unsigned   charSet,
+            /* originalCharCode */  unsigned   origCharCode,
+            /* originalCharSet */   unsigned   origCharSet,
+            /* keyboardType */      unsigned   keyboardType,
+            /* repeat */            bool       repeat,
+            /* atTime */            AbsoluteTime ts,
+                                    OSObject * sender,
+                                    void *     refcon);
+            
+  static void _keyboardSpecialEvent(IOHIDSystem * self,
+                                    unsigned   eventType,
+                /* flags */         unsigned   flags,
+                /* keyCode  */      unsigned   key,
+                /* specialty */     unsigned   flavor,
+                /* guid */          UInt64     guid,
+                /* repeat */        bool       repeat,
+                /* atTime */        AbsoluteTime ts,
+                                    OSObject * sender,
+                                    void *     refcon);
+                
+  static void _updateEventFlags(    IOHIDSystem * self,
+                                    unsigned   flags,
+                                    OSObject * sender,
+                                    void *     refcon);  /* Does not generate events */
+
+
+/*
+ * HISTORICAL NOTE:
+ *   The following methods were part of the IOUserClient protocol;
+ *   the declarations have now been merged directly into this class.
+ */
+
+public:
+
+  virtual IOReturn setEventsEnable(void*,void*,void*,void*,void*,void*);
+  virtual IOReturn setCursorEnable(void*,void*,void*,void*,void*,void*);
+  virtual IOReturn extPostEvent(void*,void*,void*,void*,void*,void*);
+  virtual IOReturn extSetMouseLocation(void*,void*,void*,void*,void*,void*);
+  virtual IOReturn extGetButtonEventNum(void*,void*,void*,void*,void*,void*);
+  IOReturn extSetBounds( IOGBounds * bounds );
+    IOReturn extGetModifierLockState(void*,void*,void*,void*,void*,void*);
+    IOReturn extSetModifierLockState(void*,void*,void*,void*,void*,void*);
+
+/*
+ * HISTORICAL NOTE:
+ *   The following methods were part of the IOScreenRegistration protocol;
+ *   the declarations have now been merged directly into this class.
+ *
+ * Methods exported by the EventDriver for display systems.
+ *
+ *	The screenRegister protocol is used by frame buffer drivers to register
+ *	themselves with the Event Driver.  These methods are called in response
+ *	to an _IOGetParameterInIntArray() call with "IO_Framebuffer_Register" or
+ *	"IO_Framebuffer_Unregister".
+ */
+
+public:
+  virtual int registerScreen(IOGraphicsDevice * instance,
+             /* bounds */    IOGBounds * bp);
+//           /* shmem */     void **  addr,
+//           /* size */      int *    size)
+  virtual void unregisterScreen(int index);
+    
+/*
+ * HISTORICAL NOTE:
+ *   The following methods were part of the IOWorkspaceBounds protocol;
+ *   the declarations have now been merged directly into this class.
+ *
+ * Absolute position input devices and some specialized output devices
+ * may need to know the bounding rectangle for all attached displays.
+ * The following method returns a IOGBounds* for the workspace.  Please note
+ * that the bounds are kept as signed values, and that on a multi-display
+ * system the minx and miny values may very well be negative.
+ */
+
+public:
+  virtual IOGBounds * workspaceBounds();
+
+/* END HISTORICAL NOTES */
+
+private:
+void relativePointerEvent(          int        buttons,
+                 /* deltaX */       int        dx,
+                 /* deltaY */       int        dy,
+                 /* atTime */       AbsoluteTime ts,
+                 /* senderID */     OSObject * sender);
+
+  /* Tablet event reporting */
+void absolutePointerEvent(          int        buttons,
+                 /* at */           IOGPoint *    newLoc,
+                 /* withBounds */   IOGBounds *bounds,
+                 /* inProximity */  bool       proximity,
+                 /* withPressure */ int        pressure,
+                 /* withAngle */    int        stylusAngle,
+                 /* atTime */       AbsoluteTime ts,
+                 /* senderID */     OSObject * sender);
+
+  /* Mouse scroll wheel event reporting */
+void scrollWheelEvent(	        short 	       deltaAxis1,
+                                short          deltaAxis2,
+                                short          deltaAxis3,
+                                IOFixed        fixedDelta1,
+                                IOFixed        fixedDelta2,
+                                IOFixed        fixedDelta3,
+                                SInt32         pointDeltaAxis1,
+                                SInt32         pointDeltaAxis2,
+                                SInt32         pointDeltaAxis3,
+                                UInt32         options,
+                                AbsoluteTime   ts,
+                                OSObject *     sender);
+
+void tabletEvent(	NXEventData * tabletData,
+                                AbsoluteTime ts,
+                                OSObject * sender);
+
+void proximityEvent(	NXEventData * proximityData,
+                                AbsoluteTime ts,
+                                OSObject * sender);
+
+void keyboardEvent(unsigned   eventType,
+      /* flags */            unsigned   flags,
+      /* keyCode */          unsigned   key,
+      /* charCode */         unsigned   charCode,
+      /* charSet */          unsigned   charSet,
+      /* originalCharCode */ unsigned   origCharCode,
+      /* originalCharSet */  unsigned   origCharSet,
+      /* keyboardType */     unsigned   keyboardType,
+      /* repeat */           bool       repeat,
+      /* atTime */           AbsoluteTime ts,
+      /* sender */           OSObject * sender);
+
+void keyboardSpecialEvent(   unsigned   eventType,
+      /* flags */        unsigned   flags,
+      /* keyCode  */     unsigned   key,
+      /* specialty */    unsigned   flavor,
+      /* guid */         UInt64     guid,
+      /* repeat */       bool       repeat,
+      /* atTime */       AbsoluteTime ts,
+      /* sender */       OSObject * sender);
+
+void updateEventFlags(unsigned flags, OSObject * sender);
+
+/*
+ * COMMAND GATE COMPATIBILITY:
+ *   The following method is part of the work needed to make IOHIDSystem
+ *   compatible with IOCommandGate.  The use of IOCommandQueue has been
+ *   deprecated, thus requiring this move.  This should allow for less
+ *   context switching as all actions formerly run on the I/O Workloop
+ *   thread, will now be run on the caller thread.  The static methods
+ *   will be called from cmdGate->runAction and returns the appropriate 
+ *   non-static helper method.  Arguments are stored in the void* array, 
+ *   args, and are passed through.   Since we are returning in the static
+ *   function, gcc3 should translate that to one instruction, thus 
+ *   minimizing cost.
+ */ 
+
+static	IOReturn	doEvClose (IOHIDSystem *self);
+        IOReturn	evCloseGated (void);
+        
+static	IOReturn	doSetEventsEnablePre (IOHIDSystem *self, void *p1);
+        IOReturn	setEventsEnablePreGated (void *p1);
+
+static	IOReturn	doSetEventsEnablePost (IOHIDSystem *self, void *p1);
+        IOReturn	setEventsEnablePostGated (void *p1);
+        
+static	IOReturn	doUnregisterScreen (IOHIDSystem *self, void * arg0);
+        void		unregisterScreenGated (int index);
+
+static	IOReturn	doCreateShmem (IOHIDSystem *self, void * arg0);
+        IOReturn	createShmemGated (void * p1);
+
+static	IOReturn	doRegisterEventQueue (IOHIDSystem *self, void * arg0);
+        IOReturn	registerEventQueueGated (void * p1);
+
+static	IOReturn	doUnregisterEventQueue (IOHIDSystem *self, void * arg0);
+        IOReturn	unregisterEventQueueGated (void * p1);
+
+static	IOReturn	doRelativePointerEvent (IOHIDSystem *self, void * args);
+        void		relativePointerEventGated(int buttons, 
+                                                    int dx, 
+                                                    int dy, 
+                                                    AbsoluteTime ts,
+                                                    OSObject * sender);
+
+static	IOReturn	doAbsolutePointerEvent (IOHIDSystem *self, void * args);        
+        void 		absolutePointerEventGated (int buttons,
+                                                    IOGPoint *    newLoc,
+                                                    IOGBounds *bounds,
+                                                    bool       proximity,
+                                                    int        pressure,
+                                                    int        stylusAngle,
+                                                    AbsoluteTime ts,
+                                                    OSObject * sender);
+
+static	IOReturn	doScrollWheelEvent(IOHIDSystem *self, void * args);        
+        void		scrollWheelEventGated (short deltaAxis1,
+                                                short deltaAxis2,
+                                                short deltaAxis3,
+                                               IOFixed  fixedDelta1,
+                                               IOFixed  fixedDelta2,
+                                               IOFixed  fixedDelta3,
+                                               SInt32   pointDeltaAxis1,
+                                               SInt32   pointDeltaAxis2,
+                                               SInt32   pointDeltaAxis3,
+                                               UInt32   options,
+                                                AbsoluteTime ts,
+                                                OSObject * sender);
+
+static	IOReturn	doTabletEvent (IOHIDSystem *self, void * arg0, void * arg1, void * arg2);        
+        void		tabletEventGated (	NXEventData *tabletData, 
+                                                AbsoluteTime ts, 
+                                                OSObject * sender);
+
+static	IOReturn	doProximityEvent (IOHIDSystem *self, void * arg0, void * arg1, void * arg2);        
+        void		proximityEventGated (	NXEventData *proximityData, 
+                                                AbsoluteTime ts, 
+                                                OSObject * sender);
+
+static	IOReturn	doKeyboardEvent (IOHIDSystem *self, void * args);        
+        void		keyboardEventGated (unsigned   eventType,
+                                            unsigned   flags,
+                                            unsigned   key,
+                                            unsigned   charCode,
+                                            unsigned   charSet,
+                                            unsigned   origCharCode,
+                                            unsigned   origCharSet,
+                                            unsigned   keyboardType,
+                                            bool       repeat,
+                                            AbsoluteTime ts,
+                                            OSObject * sender);
+
+static	IOReturn	doKeyboardSpecialEvent (IOHIDSystem *self, void * args);        
+        void		keyboardSpecialEventGated (   
+                                            unsigned   eventType,
+                                            unsigned   flags,
+                                            unsigned   key,
+                                            unsigned   flavor,
+                                            UInt64     guid,
+                                            bool       repeat,
+                                            AbsoluteTime ts,
+                                            OSObject * sender);
+
+static	IOReturn	doUpdateEventFlags (IOHIDSystem *self, void * args);        
+        void		updateEventFlagsGated (unsigned flags, OSObject * sender);
+
+static	IOReturn	doNewUserClient (IOHIDSystem *self, void * args);        
+        IOReturn 	newUserClientGated (task_t owningTask,
+                                            void * security_id,
+                                            UInt32 type,
+                                            OSDictionary *  properties,
+                                            IOUserClient ** handler);
+
+static	IOReturn	doSetCursorEnable (IOHIDSystem *self, void * arg0);        
+        IOReturn	setCursorEnableGated (void * p1);
+
+static	IOReturn	doExtPostEvent(IOHIDSystem *self, void * arg0, void * arg1, void * arg2, void * arg3);        
+        IOReturn	extPostEventGated (void * p1, void * p2, void * p3);
+
+static	IOReturn	doExtSetMouseLocation (IOHIDSystem *self, void * args);        
+        IOReturn	extSetMouseLocationGated (void * args);
+
+static	IOReturn	doExtGetButtonEventNum (IOHIDSystem *self, void * arg0, void * arg1);        
+        IOReturn	extGetButtonEventNumGated (void * p1, void * p2);
+
+static	IOReturn	doSetParamPropertiesPre (IOHIDSystem *self, void * arg0, void * arg1);        
+        IOReturn	setParamPropertiesPreGated (OSDictionary * dict, OSIterator ** pOpenIter);
+
+static	IOReturn	doSetParamPropertiesPost (IOHIDSystem *self, void * arg0);        
+        IOReturn	setParamPropertiesPostGated (OSDictionary * dict);
+        
+static	IOReturn	doExtGetToggleState (IOHIDSystem *self, void *p1, void *p2);        
+static	IOReturn	doExtSetToggleState (IOHIDSystem *self, void *p1, void *p2);        
+        IOReturn    getCapsLockState(unsigned int *state_O);
+        IOReturn    setCapsLockState(unsigned int state_I);
+        IOReturn    getNumLockState(unsigned int *state_O);
+        IOReturn    setNumLockState(unsigned int state_I);
+
+/* END COMMAND GATE COMPATIBILITY */
+
+public:
+    virtual void setStackShotPort(mach_port_t port);
+    
+    virtual UInt32 eventFlags();
+    
+    virtual void dispatchEvent(IOHIDEvent *event, IOOptionBits options=0);
+
+};
+
+#endif /* !_IOHIDSYSTEM_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIDTypes.h b/i386/include/IOKit/hidsystem/IOHIDTypes.h
new file mode 100644
index 0000000..786af07
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOHIDTypes.h
@@ -0,0 +1,171 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/******************************************************************************
+	ev_types.h
+	Data types for the events status driver.
+	This file contains public API.
+	mpaque 11Oct91
+	
+	Copyright 1991 NeXT Computer, Inc.
+	
+	Modified:
+	
+******************************************************************************/
+
+#ifndef _DEV_EV_TYPES_H
+#define _DEV_EV_TYPES_H
+
+#include <mach/boolean.h>
+#include <IOKit/IOSharedLock.h>
+#include <IOKit/graphics/IOGraphicsTypes.h>
+
+/* Shared memory versions */
+#define EVENT_SYSTEM_VERSION   2
+
+/* Maximum length of SetMouseScaling arrays */
+#define NX_MAXMOUSESCALINGS 20
+
+typedef struct evsioKeymapping		/* Match old struct names in kernel */
+{
+    int size;
+    char *mapping;
+} NXKeyMapping;
+
+typedef struct evsioMouseScaling	/* Match old struct names in kernel */
+{
+    int numScaleLevels;
+    short scaleThresholds[NX_MAXMOUSESCALINGS];
+    short scaleFactors[NX_MAXMOUSESCALINGS];
+} NXMouseScaling;
+
+typedef enum {
+    NX_OneButton,
+    NX_LeftButton,
+    NX_RightButton
+} NXMouseButton;
+
+/*
+ * NXEventSystemInfo() information structures.  These are designed to
+ * allow for expansion.
+ *
+ * The current implementation of NXEventSystemInfo() uses an ioctl call.
+ * THIS WILL CHANGE.
+ */
+ 
+/*
+ * Generic query max size and typedefs.
+ *
+ *	The maximum size is selected to support anticipated future extensions
+ *	of request flavors.  Certain flavors planned for future releases may 
+ *	require roughtly 800 ints to represent.  We allow a little extra, in
+ *	case further growth is needed.
+ */
+typedef int *NXEventSystemInfoType;
+#define NX_EVS_INFO_MAX		(1024)	/* Max array size */
+typedef int NXEventSystemInfoData[NX_EVS_INFO_MAX];
+
+/* Event System Devices query */
+#define NX_EVS_DEVICE_MAX	16
+
+	/* Interface types */
+#define NX_EVS_DEVICE_INTERFACE_OTHER		0
+#define NX_EVS_DEVICE_INTERFACE_NeXT		1 // NeXT custom, in older sys
+#define NX_EVS_DEVICE_INTERFACE_ADB		2 // NeXT/fruit keybds/mice
+#define NX_EVS_DEVICE_INTERFACE_ACE		3 // For x86 PC keyboards
+#define NX_EVS_DEVICE_INTERFACE_SERIAL_ACE	4 // For PC serial mice 
+#define NX_EVS_DEVICE_INTERFACE_BUS_ACE		5 // For PC bus mice 
+#define NX_EVS_DEVICE_INTERFACE_HIL		6 // For HIL hp keyboard 
+#define NX_EVS_DEVICE_INTERFACE_TYPE5		7 // For Sun Type5 keyboard
+
+/*
+ * Note! if any new interface types are added above, the following
+ * definition of the number of interfaces supported must reflect this.
+ * This is used in the libkeymap project (storemap.c module) which needs
+ * to be cognizant of the number of new devices coming online
+ * via support for heterogeneous architecture platforms.
+ * e.g., PCs, HP's HIL, Sun's Type5 keyboard,...
+ */
+#define NUM_SUPPORTED_INTERFACES	(NX_EVS_DEVICE_INTERFACE_TYPE5 + 1)
+					// Other, NeXT, ADB, ACE,...
+
+	/* Device types */
+#define NX_EVS_DEVICE_TYPE_OTHER	0
+#define NX_EVS_DEVICE_TYPE_KEYBOARD	1
+#define NX_EVS_DEVICE_TYPE_MOUSE	2	// Relative position devices
+#define NX_EVS_DEVICE_TYPE_TABLET	3	// Absolute position devices
+
+typedef struct {
+	int	interface;	/* NeXT, ADB, other */
+	int	interface_addr;	/* Device address on the interface */
+	int	dev_type;	/* Keyboard, mouse, tablet, other */
+	int	id;		/* manufacturer's device handler ID */
+} NXEventSystemDevice;
+
+typedef struct {
+	NXEventSystemDevice	dev[NX_EVS_DEVICE_MAX];
+} NXEventSystemDeviceList;
+
+#define __OLD_NX_EVS_DEVICE_INFO		1
+#define NX_EVS_DEVICE_INFO			"Evs_EventDeviceInfo"
+#define NX_EVS_DEVICE_INFO_COUNT \
+	(sizeof (NXEventSystemDeviceList) / sizeof (int))
+
+/*
+ * Types used in evScreen protocol compliant operations.
+ */
+
+typedef enum {EVNOP, EVHIDE, EVSHOW, EVMOVE, EVLEVEL} EvCmd; /* Cursor state */
+
+#define EV_SCREEN_MIN_BRIGHTNESS	0
+#define EV_SCREEN_MAX_BRIGHTNESS	64
+/* Scale should lie between MIN_BRIGHTNESS and MAX_BRIGHTNESS */
+#define EV_SCALE_BRIGHTNESS( scale, datum ) \
+	((((UInt32)(datum))*((UInt32)scale)) >> 6)
+
+/*
+ * Definition of a tick, as a time in milliseconds. This controls how
+ * often the event system periodic jobs are run.  All actual tick times
+ * are derived from the nanosecond timer.  These values are typically used
+ * as part of computing mouse velocity for acceleration purposes.
+ */
+#define EV_TICK_TIME		16			/* 16 milliseconds */
+#define EV_TICKS_PER_SEC	(1000/EV_TICK_TIME)	/* ~ 62 Hz */
+
+/* Mouse Button bits, as passed from an EventSrc to the Event Driver */
+#define EV_RB			(0x01)
+#define EV_LB			(0x04)
+#define EV_MOUSEBUTTONMASK	(EV_LB | EV_RB)
+
+/* Tablet Pressure Constants, as passed from an EventSrc to the Event Driver */
+#define EV_MINPRESSURE 0
+#define EV_MAXPRESSURE 255
+
+/* Cursor size in pixels */
+#define EV_CURSOR_WIDTH		16
+#define EV_CURSOR_HEIGHT	16
+
+
+#define kAppleOnboardGUID 	0x0610000000000000ULL
+
+#endif /* !_DEV_EV_TYPES_H */
+
diff --git a/i386/include/IOKit/hidsystem/IOHIDUsageTables.h b/i386/include/IOKit/hidsystem/IOHIDUsageTables.h
new file mode 100644
index 0000000..ff0fd88
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOHIDUsageTables.h
@@ -0,0 +1,1665 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _IOHIDUSAGETABLES_H
+#define _IOHIDUSAGETABLES_H
+
+/* ******************************************************************************************
+ * HID Usage Tables
+ *
+ * The following constants are from the USB 'HID Usage Tables' specification, revision 1.1rc3
+ * ****************************************************************************************** */
+
+
+/* Usage Pages */
+enum
+{
+	kHIDPage_Undefined	= 0x00,
+	kHIDPage_GenericDesktop	= 0x01,
+	kHIDPage_Simulation	= 0x02,
+	kHIDPage_VR	= 0x03,
+	kHIDPage_Sport	= 0x04,
+	kHIDPage_Game	= 0x05,
+	/* Reserved 0x06 */
+	kHIDPage_KeyboardOrKeypad	= 0x07,	/* USB Device Class Definition for Human Interface Devices (HID). Note: the usage type for all key codes is Selector (Sel). */
+	kHIDPage_LEDs	= 0x08,
+	kHIDPage_Button	= 0x09,
+	kHIDPage_Ordinal	= 0x0A,
+	kHIDPage_Telephony	= 0x0B,
+	kHIDPage_Consumer	= 0x0C,
+	kHIDPage_Digitizer	= 0x0D,
+	/* Reserved 0x0E */
+	kHIDPage_PID	= 0x0F,	/* USB Physical Interface Device definitions for force feedback and related devices. */
+	kHIDPage_Unicode	= 0x10,
+	/* Reserved 0x11 - 0x13 */
+	kHIDPage_AlphanumericDisplay	= 0x14,
+	/* Reserved 0x15 - 0x7F */
+	/* Monitor 0x80 - 0x83	 USB Device Class Definition for Monitor Devices */
+	/* Power 0x84 - 0x87	 USB Device Class Definition for Power Devices */
+	kHIDPage_PowerDevice = 0x84, 				/* Power Device Page */
+	kHIDPage_BatterySystem = 0x85, 				/* Battery System Page */
+	/* Reserved 0x88 - 0x8B */
+	kHIDPage_BarCodeScanner	= 0x8C,	/* (Point of Sale) USB Device Class Definition for Bar Code Scanner Devices */
+	kHIDPage_WeighingDevice	= 0x8D,	/* (Point of Sale) USB Device Class Definition for Weighing Devices */
+	kHIDPage_Scale	= 0x8D,	/* (Point of Sale) USB Device Class Definition for Scale Devices */
+    kHIDPage_MagneticStripeReader = 0x8E,
+	/* ReservedPointofSalepages 0x8F */
+	kHIDPage_CameraControl	= 0x90,	/* USB Device Class Definition for Image Class Devices */
+	kHIDPage_Arcade	= 0x91,	/* OAAF Definitions for arcade and coinop related Devices */
+	/* Reserved 0x92 - 0xFEFF */
+	/* VendorDefined 0xFF00 - 0xFFFF */
+	kHIDPage_VendorDefinedStart	= 0xFF00
+};
+
+/* Undefined Usage for all usage pages */
+enum
+{
+	kHIDUsage_Undefined	= 0x00
+};
+
+/* GenericDesktop Page (0x01) */
+enum
+{
+	kHIDUsage_GD_Pointer	= 0x01,	/* Physical Collection */
+	kHIDUsage_GD_Mouse	= 0x02,	/* Application Collection */
+	/* 0x03 Reserved */
+	kHIDUsage_GD_Joystick	= 0x04,	/* Application Collection */
+	kHIDUsage_GD_GamePad	= 0x05,	/* Application Collection */
+	kHIDUsage_GD_Keyboard	= 0x06,	/* Application Collection */
+	kHIDUsage_GD_Keypad	= 0x07,	/* Application Collection */
+	kHIDUsage_GD_MultiAxisController	= 0x08,	/* Application Collection */
+	/* 0x09 - 0x2F Reserved */
+	kHIDUsage_GD_X	= 0x30,	/* Dynamic Value */
+	kHIDUsage_GD_Y	= 0x31,	/* Dynamic Value */
+	kHIDUsage_GD_Z	= 0x32,	/* Dynamic Value */
+	kHIDUsage_GD_Rx	= 0x33,	/* Dynamic Value */
+	kHIDUsage_GD_Ry	= 0x34,	/* Dynamic Value */
+	kHIDUsage_GD_Rz	= 0x35,	/* Dynamic Value */
+	kHIDUsage_GD_Slider	= 0x36,	/* Dynamic Value */
+	kHIDUsage_GD_Dial	= 0x37,	/* Dynamic Value */
+	kHIDUsage_GD_Wheel	= 0x38,	/* Dynamic Value */
+	kHIDUsage_GD_Hatswitch	= 0x39,	/* Dynamic Value */
+	kHIDUsage_GD_CountedBuffer	= 0x3A,	/* Logical Collection */
+	kHIDUsage_GD_ByteCount	= 0x3B,	/* Dynamic Value */
+	kHIDUsage_GD_MotionWakeup	= 0x3C,	/* One-Shot Control */
+	kHIDUsage_GD_Start	= 0x3D,	/* On/Off Control */
+	kHIDUsage_GD_Select	= 0x3E,	/* On/Off Control */
+	/* 0x3F Reserved */
+	kHIDUsage_GD_Vx	= 0x40,	/* Dynamic Value */
+	kHIDUsage_GD_Vy	= 0x41,	/* Dynamic Value */
+	kHIDUsage_GD_Vz	= 0x42,	/* Dynamic Value */
+	kHIDUsage_GD_Vbrx	= 0x43,	/* Dynamic Value */
+	kHIDUsage_GD_Vbry	= 0x44,	/* Dynamic Value */
+	kHIDUsage_GD_Vbrz	= 0x45,	/* Dynamic Value */
+	kHIDUsage_GD_Vno	= 0x46,	/* Dynamic Value */
+	/* 0x47 - 0x7F Reserved */
+	kHIDUsage_GD_SystemControl	= 0x80,	/* Application Collection */
+	kHIDUsage_GD_SystemPowerDown	= 0x81,	/* One-Shot Control */
+	kHIDUsage_GD_SystemSleep	= 0x82,	/* One-Shot Control */
+	kHIDUsage_GD_SystemWakeUp	= 0x83,	/* One-Shot Control */
+	kHIDUsage_GD_SystemContextMenu	= 0x84,	/* One-Shot Control */
+	kHIDUsage_GD_SystemMainMenu	= 0x85,	/* One-Shot Control */
+	kHIDUsage_GD_SystemAppMenu	= 0x86,	/* One-Shot Control */
+	kHIDUsage_GD_SystemMenuHelp	= 0x87,	/* One-Shot Control */
+	kHIDUsage_GD_SystemMenuExit	= 0x88,	/* One-Shot Control */
+	kHIDUsage_GD_SystemMenu	= 0x89,	/* Selector */
+	kHIDUsage_GD_SystemMenuRight	= 0x8A,	/* Re-Trigger Control */
+	kHIDUsage_GD_SystemMenuLeft	= 0x8B,	/* Re-Trigger Control */
+	kHIDUsage_GD_SystemMenuUp	= 0x8C,	/* Re-Trigger Control */
+	kHIDUsage_GD_SystemMenuDown	= 0x8D,	/* Re-Trigger Control */
+	/* 0x8E - 0x8F Reserved */
+	kHIDUsage_GD_DPadUp	= 0x90,	/* On/Off Control */
+	kHIDUsage_GD_DPadDown	= 0x91,	/* On/Off Control */
+	kHIDUsage_GD_DPadRight	= 0x92,	/* On/Off Control */
+	kHIDUsage_GD_DPadLeft	= 0x93,	/* On/Off Control */
+	/* 0x94 - 0xFFFF Reserved */
+	kHIDUsage_GD_Reserved = 0xFFFF
+};
+
+/* Simulation Page (0x02) */
+/* This section provides detailed descriptions of the usages employed by simulation devices. */
+enum
+{
+	kHIDUsage_Sim_FlightSimulationDevice	= 0x01,	/* Application Collection */
+	kHIDUsage_Sim_AutomobileSimulationDevice	= 0x02,	/* Application Collection */
+	kHIDUsage_Sim_TankSimulationDevice	= 0x03,	/* Application Collection */
+	kHIDUsage_Sim_SpaceshipSimulationDevice	= 0x04,	/* Application Collection */
+	kHIDUsage_Sim_SubmarineSimulationDevice	= 0x05,	/* Application Collection */
+	kHIDUsage_Sim_SailingSimulationDevice	= 0x06,	/* Application Collection */
+	kHIDUsage_Sim_MotorcycleSimulationDevice	= 0x07,	/* Application Collection */
+	kHIDUsage_Sim_SportsSimulationDevice	= 0x08,	/* Application Collection */
+	kHIDUsage_Sim_AirplaneSimulationDevice	= 0x09,	/* Application Collection */
+	kHIDUsage_Sim_HelicopterSimulationDevice	= 0x0A,	/* Application Collection */
+	kHIDUsage_Sim_MagicCarpetSimulationDevice	= 0x0B,	/* Application Collection */
+	kHIDUsage_Sim_BicycleSimulationDevice	= 0x0C,	/* Application Collection */
+	/* 0x0D - 0x1F Reserved */
+	kHIDUsage_Sim_FlightControlStick	= 0x20,	/* Application Collection */
+	kHIDUsage_Sim_FlightStick	= 0x21,	/* Application Collection */
+	kHIDUsage_Sim_CyclicControl	= 0x22,	/* Physical Collection */
+	kHIDUsage_Sim_CyclicTrim	= 0x23,	/* Physical Collection */
+	kHIDUsage_Sim_FlightYoke	= 0x24,	/* Application Collection */
+	kHIDUsage_Sim_TrackControl	= 0x25,	/* Physical Collection */
+	/* 0x26 - 0xAF Reserved */
+	kHIDUsage_Sim_Aileron	= 0xB0,	/* Dynamic Value */
+	kHIDUsage_Sim_AileronTrim	= 0xB1,	/* Dynamic Value */
+	kHIDUsage_Sim_AntiTorqueControl	= 0xB2,	/* Dynamic Value */
+	kHIDUsage_Sim_AutopilotEnable	= 0xB3,	/* On/Off Control */
+	kHIDUsage_Sim_ChaffRelease	= 0xB4,	/* One-Shot Control */
+	kHIDUsage_Sim_CollectiveControl	= 0xB5,	/* Dynamic Value */
+	kHIDUsage_Sim_DiveBrake	= 0xB6,	/* Dynamic Value */
+	kHIDUsage_Sim_ElectronicCountermeasures	= 0xB7,	/* On/Off Control */
+	kHIDUsage_Sim_Elevator	= 0xB8,	/* Dynamic Value */
+	kHIDUsage_Sim_ElevatorTrim	= 0xB9,	/* Dynamic Value */
+	kHIDUsage_Sim_Rudder	= 0xBA,	/* Dynamic Value */
+	kHIDUsage_Sim_Throttle	= 0xBB,	/* Dynamic Value */
+	kHIDUsage_Sim_FlightCommunications	= 0xBC,	/* On/Off Control */
+	kHIDUsage_Sim_FlareRelease	= 0xBD,	/* One-Shot Control */
+	kHIDUsage_Sim_LandingGear	= 0xBE,	/* On/Off Control */
+	kHIDUsage_Sim_ToeBrake	= 0xBF,	/* Dynamic Value */
+	kHIDUsage_Sim_Trigger	= 0xC0,	/* Momentary Control */
+	kHIDUsage_Sim_WeaponsArm	= 0xC1,	/* On/Off Control */
+	kHIDUsage_Sim_Weapons	= 0xC2,	/* Selector */
+	kHIDUsage_Sim_WingFlaps	= 0xC3,	/* Dynamic Value */
+	kHIDUsage_Sim_Accelerator	= 0xC4,	/* Dynamic Value */
+	kHIDUsage_Sim_Brake	= 0xC5,	/* Dynamic Value */
+	kHIDUsage_Sim_Clutch	= 0xC6,	/* Dynamic Value */
+	kHIDUsage_Sim_Shifter	= 0xC7,	/* Dynamic Value */
+	kHIDUsage_Sim_Steering	= 0xC8,	/* Dynamic Value */
+	kHIDUsage_Sim_TurretDirection	= 0xC9,	/* Dynamic Value */
+	kHIDUsage_Sim_BarrelElevation	= 0xCA,	/* Dynamic Value */
+	kHIDUsage_Sim_DivePlane	= 0xCB,	/* Dynamic Value */
+	kHIDUsage_Sim_Ballast	= 0xCC,	/* Dynamic Value */
+	kHIDUsage_Sim_BicycleCrank	= 0xCD,	/* Dynamic Value */
+	kHIDUsage_Sim_HandleBars	= 0xCE,	/* Dynamic Value */
+	kHIDUsage_Sim_FrontBrake	= 0xCF,	/* Dynamic Value */
+	kHIDUsage_Sim_RearBrake	= 0xD0,	/* Dynamic Value */
+	/* 0xD1 - 0xFFFF Reserved */
+	kHIDUsage_Sim_Reserved = 0xFFFF
+};
+
+/* VR Page (0x03) */
+/* Virtual Reality controls depend on designators to identify the individual controls. Most of the following are */
+/* usages are applied to the collections of entities that comprise the actual device. */
+enum
+{
+	kHIDUsage_VR_Belt	= 0x01,	/* Application Collection */
+	kHIDUsage_VR_BodySuit	= 0x02,	/* Application Collection */
+	kHIDUsage_VR_Flexor	= 0x03,	/* Physical Collection */
+	kHIDUsage_VR_Glove	= 0x04,	/* Application Collection */
+	kHIDUsage_VR_HeadTracker	= 0x05,	/* Physical Collection */
+	kHIDUsage_VR_HeadMountedDisplay	= 0x06,	/* Application Collection */
+	kHIDUsage_VR_HandTracker	= 0x07,	/* Application Collection */
+	kHIDUsage_VR_Oculometer	= 0x08,	/* Application Collection */
+	kHIDUsage_VR_Vest	= 0x09,	/* Application Collection */
+	kHIDUsage_VR_AnimatronicDevice	= 0x0A,	/* Application Collection */
+	/* 0x0B - 0x1F Reserved */
+	kHIDUsage_VR_StereoEnable	= 0x20,	/* On/Off Control */
+	kHIDUsage_VR_DisplayEnable	= 0x21,	/* On/Off Control */
+	/* 0x22 - 0xFFFF Reserved */
+	kHIDUsage_VR_Reserved = 0xFFFF
+};
+
+/* Sport Page (0x04) */
+enum
+{
+	kHIDUsage_Sprt_BaseballBat	= 0x01,	/* Application Collection */
+	kHIDUsage_Sprt_GolfClub	= 0x02,	/* Application Collection */
+	kHIDUsage_Sprt_RowingMachine	= 0x03,	/* Application Collection */
+	kHIDUsage_Sprt_Treadmill	= 0x04,	/* Application Collection */
+	/* 0x05 - 0x2F Reserved */
+	kHIDUsage_Sprt_Oar	= 0x30,	/* Dynamic Value */
+	kHIDUsage_Sprt_Slope	= 0x31,	/* Dynamic Value */
+	kHIDUsage_Sprt_Rate	= 0x32,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickSpeed	= 0x33,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickFaceAngle	= 0x34,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickHeelOrToe	= 0x35,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickFollowThrough	= 0x36,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickTempo	= 0x37,	/* Dynamic Value */
+	kHIDUsage_Sprt_StickType	= 0x38,	/* Named Array */
+	kHIDUsage_Sprt_StickHeight	= 0x39,	/* Dynamic Value */
+	/* 0x3A - 0x4F Reserved */
+	kHIDUsage_Sprt_Putter	= 0x50,	/* Selector */
+	kHIDUsage_Sprt_1Iron	= 0x51,	/* Selector */
+	kHIDUsage_Sprt_2Iron	= 0x52,	/* Selector */
+	kHIDUsage_Sprt_3Iron	= 0x53,	/* Selector */
+	kHIDUsage_Sprt_4Iron	= 0x54,	/* Selector */
+	kHIDUsage_Sprt_5Iron	= 0x55,	/* Selector */
+	kHIDUsage_Sprt_6Iron	= 0x56,	/* Selector */
+	kHIDUsage_Sprt_7Iron	= 0x57,	/* Selector */
+	kHIDUsage_Sprt_8Iron	= 0x58,	/* Selector */
+	kHIDUsage_Sprt_9Iron	= 0x59,	/* Selector */
+	kHIDUsage_Sprt_10Iron	= 0x5A,	/* Selector */
+	kHIDUsage_Sprt_11Iron	= 0x5B,	/* Selector */
+	kHIDUsage_Sprt_SandWedge	= 0x5C,	/* Selector */
+	kHIDUsage_Sprt_LoftWedge	= 0x5D,	/* Selector */
+	kHIDUsage_Sprt_PowerWedge	= 0x5E,	/* Selector */
+	kHIDUsage_Sprt_1Wood	= 0x5F,	/* Selector */
+	kHIDUsage_Sprt_3Wood	= 0x60,	/* Selector */
+	kHIDUsage_Sprt_5Wood	= 0x61,	/* Selector */
+	kHIDUsage_Sprt_7Wood	= 0x62,	/* Selector */
+	kHIDUsage_Sprt_9Wood	= 0x63,	/* Selector */
+	/* 0x64 - 0xFFFF Reserved */
+	kHIDUsage_Sprt_Reserved = 0xFFFF
+};
+
+/* Game Page (0x05) */
+enum
+{
+	kHIDUsage_Game_3DGameController	= 0x01,	/* Application Collection */
+	kHIDUsage_Game_PinballDevice	= 0x02,	/* Application Collection */
+	kHIDUsage_Game_GunDevice	= 0x03,	/* Application Collection */
+	/* 0x04 - 0x1F Reserved */
+	kHIDUsage_Game_PointofView	= 0x20,	/* Physical Collection */
+	kHIDUsage_Game_TurnRightOrLeft	= 0x21,	/* Dynamic Value */
+	kHIDUsage_Game_PitchUpOrDown	= 0x22,	/* Dynamic Value */
+	kHIDUsage_Game_RollRightOrLeft	= 0x23,	/* Dynamic Value */
+	kHIDUsage_Game_MoveRightOrLeft	= 0x24,	/* Dynamic Value */
+	kHIDUsage_Game_MoveForwardOrBackward	= 0x25,	/* Dynamic Value */
+	kHIDUsage_Game_MoveUpOrDown	= 0x26,	/* Dynamic Value */
+	kHIDUsage_Game_LeanRightOrLeft	= 0x27,	/* Dynamic Value */
+	kHIDUsage_Game_LeanForwardOrBackward	= 0x28,	/* Dynamic Value */
+	kHIDUsage_Game_HeightOfPOV	= 0x29,	/* Dynamic Value */
+	kHIDUsage_Game_Flipper	= 0x2A,	/* Momentary Control */
+	kHIDUsage_Game_SecondaryFlipper	= 0x2B,	/* Momentary Control */
+	kHIDUsage_Game_Bump	= 0x2C,	/* Momentary Control */
+	kHIDUsage_Game_NewGame	= 0x2D,	/* One-Shot Control */
+	kHIDUsage_Game_ShootBall	= 0x2E,	/* One-Shot Control */
+	kHIDUsage_Game_Player	= 0x2F,	/* One-Shot Control */
+	kHIDUsage_Game_GunBolt	= 0x30,	/* On/Off Control */
+	kHIDUsage_Game_GunClip	= 0x31,	/* On/Off Control */
+	kHIDUsage_Game_Gun	= 0x32,	/* Selector */
+	kHIDUsage_Game_GunSingleShot	= 0x33,	/* Selector */
+	kHIDUsage_Game_GunBurst	= 0x34,	/* Selector */
+	kHIDUsage_Game_GunAutomatic	= 0x35,	/* Selector */
+	kHIDUsage_Game_GunSafety	= 0x36,	/* On/Off Control */
+	kHIDUsage_Game_GamepadFireOrJump	= 0x37,	/* Logical Collection */
+	kHIDUsage_Game_GamepadTrigger	= 0x39,	/* Logical Collection */
+	/* 0x3A - 0xFFFF Reserved */
+	kHIDUsage_Game_Reserved = 0xFFFF
+};
+
+/* KeyboardOrKeypad Page (0x07) */
+/* This section is the Usage Page for key codes to be used in implementing a USB keyboard. A Boot Keyboard (84-, 101- or 104-key) should at a minimum support all associated usage codes as indicated in the ÒBootÓ */
+/* column below. */
+/* The usage type of all key codes is Selectors (Sel), except for the modifier keys Keyboard Left Control (0x224) to Keyboard Right GUI (0x231) which are Dynamic Flags (DV). */
+/* Note: A general note on Usages and languages: Due to the variation of keyboards from language to language, it is not feasible to specify exact key mappings for every language. Where this list is not specific for a key function in a language, the closest equivalent key position should be used, so that a keyboard may be modified for a different language by simply printing different keycaps. One example is the Y key on a North American keyboard. In Germany this is typically Z. Rather than changing the keyboard firmware to put the Z Usage into that place in the descriptor list, the vendor should use the Y Usage on both the North American and German keyboards. This continues to be the existing practice in the industry, in order to minimize the number of changes to the electronics to accommodate otherlanguages. */
+enum
+{
+	kHIDUsage_KeyboardErrorRollOver	= 0x01,	/* ErrorRollOver */
+	kHIDUsage_KeyboardPOSTFail	= 0x02,	/* POSTFail */
+	kHIDUsage_KeyboardErrorUndefined	= 0x03,	/* ErrorUndefined */
+	kHIDUsage_KeyboardA	= 0x04,	/* a or A */
+	kHIDUsage_KeyboardB	= 0x05,	/* b or B */
+	kHIDUsage_KeyboardC	= 0x06,	/* c or C */
+	kHIDUsage_KeyboardD	= 0x07,	/* d or D */
+	kHIDUsage_KeyboardE	= 0x08,	/* e or E */
+	kHIDUsage_KeyboardF	= 0x09,	/* f or F */
+	kHIDUsage_KeyboardG	= 0x0A,	/* g or G */
+	kHIDUsage_KeyboardH	= 0x0B,	/* h or H */
+	kHIDUsage_KeyboardI	= 0x0C,	/* i or I */
+	kHIDUsage_KeyboardJ	= 0x0D,	/* j or J */
+	kHIDUsage_KeyboardK	= 0x0E,	/* k or K */
+	kHIDUsage_KeyboardL	= 0x0F,	/* l or L */
+	kHIDUsage_KeyboardM	= 0x10,	/* m or M */
+	kHIDUsage_KeyboardN	= 0x11,	/* n or N */
+	kHIDUsage_KeyboardO	= 0x12,	/* o or O */
+	kHIDUsage_KeyboardP	= 0x13,	/* p or P */
+	kHIDUsage_KeyboardQ	= 0x14,	/* q or Q */
+	kHIDUsage_KeyboardR	= 0x15,	/* r or R */
+	kHIDUsage_KeyboardS	= 0x16,	/* s or S */
+	kHIDUsage_KeyboardT	= 0x17,	/* t or T */
+	kHIDUsage_KeyboardU	= 0x18,	/* u or U */
+	kHIDUsage_KeyboardV	= 0x19,	/* v or V */
+	kHIDUsage_KeyboardW	= 0x1A,	/* w or W */
+	kHIDUsage_KeyboardX	= 0x1B,	/* x or X */
+	kHIDUsage_KeyboardY	= 0x1C,	/* y or Y */
+	kHIDUsage_KeyboardZ	= 0x1D,	/* z or Z */
+	kHIDUsage_Keyboard1	= 0x1E,	/* 1 or ! */
+	kHIDUsage_Keyboard2	= 0x1F,	/* 2 or @ */
+	kHIDUsage_Keyboard3	= 0x20,	/* 3 or # */
+	kHIDUsage_Keyboard4	= 0x21,	/* 4 or $ */
+	kHIDUsage_Keyboard5	= 0x22,	/* 5 or % */
+	kHIDUsage_Keyboard6	= 0x23,	/* 6 or ^ */
+	kHIDUsage_Keyboard7	= 0x24,	/* 7 or & */
+	kHIDUsage_Keyboard8	= 0x25,	/* 8 or * */
+	kHIDUsage_Keyboard9	= 0x26,	/* 9 or ( */
+	kHIDUsage_Keyboard0	= 0x27,	/* 0 or ) */
+	kHIDUsage_KeyboardReturnOrEnter	= 0x28,	/* Return (Enter) */
+	kHIDUsage_KeyboardEscape	= 0x29,	/* Escape */
+	kHIDUsage_KeyboardDeleteOrBackspace	= 0x2A,	/* Delete (Backspace) */
+	kHIDUsage_KeyboardTab	= 0x2B,	/* Tab */
+	kHIDUsage_KeyboardSpacebar	= 0x2C,	/* Spacebar */
+	kHIDUsage_KeyboardHyphen	= 0x2D,	/* - or _ */
+	kHIDUsage_KeyboardEqualSign	= 0x2E,	/* = or + */
+	kHIDUsage_KeyboardOpenBracket	= 0x2F,	/* [ or { */
+	kHIDUsage_KeyboardCloseBracket	= 0x30,	/* ] or } */
+	kHIDUsage_KeyboardBackslash	= 0x31,	/* \ or | */
+	kHIDUsage_KeyboardNonUSPound	= 0x32,	/* Non-US # or _ */
+	kHIDUsage_KeyboardSemicolon	= 0x33,	/* ; or : */
+	kHIDUsage_KeyboardQuote	= 0x34,	/* ' or " */
+	kHIDUsage_KeyboardGraveAccentAndTilde	= 0x35,	/* Grave Accent and Tilde */
+	kHIDUsage_KeyboardComma	= 0x36,	/* , or < */
+	kHIDUsage_KeyboardPeriod	= 0x37,	/* . or > */
+	kHIDUsage_KeyboardSlash	= 0x38,	/* / or ? */
+	kHIDUsage_KeyboardCapsLock	= 0x39,	/* Caps Lock */
+	kHIDUsage_KeyboardF1	= 0x3A,	/* F1 */
+	kHIDUsage_KeyboardF2	= 0x3B,	/* F2 */
+	kHIDUsage_KeyboardF3	= 0x3C,	/* F3 */
+	kHIDUsage_KeyboardF4	= 0x3D,	/* F4 */
+	kHIDUsage_KeyboardF5	= 0x3E,	/* F5 */
+	kHIDUsage_KeyboardF6	= 0x3F,	/* F6 */
+	kHIDUsage_KeyboardF7	= 0x40,	/* F7 */
+	kHIDUsage_KeyboardF8	= 0x41,	/* F8 */
+	kHIDUsage_KeyboardF9	= 0x42,	/* F9 */
+	kHIDUsage_KeyboardF10	= 0x43,	/* F10 */
+	kHIDUsage_KeyboardF11	= 0x44,	/* F11 */
+	kHIDUsage_KeyboardF12	= 0x45,	/* F12 */
+	kHIDUsage_KeyboardPrintScreen	= 0x46,	/* Print Screen */
+	kHIDUsage_KeyboardScrollLock	= 0x47,	/* Scroll Lock */
+	kHIDUsage_KeyboardPause	= 0x48,	/* Pause */
+	kHIDUsage_KeyboardInsert	= 0x49,	/* Insert */
+	kHIDUsage_KeyboardHome	= 0x4A,	/* Home */
+	kHIDUsage_KeyboardPageUp	= 0x4B,	/* Page Up */
+	kHIDUsage_KeyboardDeleteForward	= 0x4C,	/* Delete Forward */
+	kHIDUsage_KeyboardEnd	= 0x4D,	/* End */
+	kHIDUsage_KeyboardPageDown	= 0x4E,	/* Page Down */
+	kHIDUsage_KeyboardRightArrow	= 0x4F,	/* Right Arrow */
+	kHIDUsage_KeyboardLeftArrow	= 0x50,	/* Left Arrow */
+	kHIDUsage_KeyboardDownArrow	= 0x51,	/* Down Arrow */
+	kHIDUsage_KeyboardUpArrow	= 0x52,	/* Up Arrow */
+	kHIDUsage_KeypadNumLock	= 0x53,	/* Keypad NumLock or Clear */
+	kHIDUsage_KeypadSlash	= 0x54,	/* Keypad / */
+	kHIDUsage_KeypadAsterisk	= 0x55,	/* Keypad * */
+	kHIDUsage_KeypadHyphen	= 0x56,	/* Keypad - */
+	kHIDUsage_KeypadPlus	= 0x57,	/* Keypad + */
+	kHIDUsage_KeypadEnter	= 0x58,	/* Keypad Enter */
+	kHIDUsage_Keypad1	= 0x59,	/* Keypad 1 or End */
+	kHIDUsage_Keypad2	= 0x5A,	/* Keypad 2 or Down Arrow */
+	kHIDUsage_Keypad3	= 0x5B,	/* Keypad 3 or Page Down */
+	kHIDUsage_Keypad4	= 0x5C,	/* Keypad 4 or Left Arrow */
+	kHIDUsage_Keypad5	= 0x5D,	/* Keypad 5 */
+	kHIDUsage_Keypad6	= 0x5E,	/* Keypad 6 or Right Arrow */
+	kHIDUsage_Keypad7	= 0x5F,	/* Keypad 7 or Home */
+	kHIDUsage_Keypad8	= 0x60,	/* Keypad 8 or Up Arrow */
+	kHIDUsage_Keypad9	= 0x61,	/* Keypad 9 or Page Up */
+	kHIDUsage_Keypad0	= 0x62,	/* Keypad 0 or Insert */
+	kHIDUsage_KeypadPeriod	= 0x63,	/* Keypad . or Delete */
+	kHIDUsage_KeyboardNonUSBackslash	= 0x64,	/* Non-US \ or | */
+	kHIDUsage_KeyboardApplication	= 0x65,	/* Application */
+	kHIDUsage_KeyboardPower	= 0x66,	/* Power */
+	kHIDUsage_KeypadEqualSign	= 0x67,	/* Keypad = */
+	kHIDUsage_KeyboardF13	= 0x68,	/* F13 */
+	kHIDUsage_KeyboardF14	= 0x69,	/* F14 */
+	kHIDUsage_KeyboardF15	= 0x6A,	/* F15 */
+	kHIDUsage_KeyboardF16	= 0x6B,	/* F16 */
+	kHIDUsage_KeyboardF17	= 0x6C,	/* F17 */
+	kHIDUsage_KeyboardF18	= 0x6D,	/* F18 */
+	kHIDUsage_KeyboardF19	= 0x6E,	/* F19 */
+	kHIDUsage_KeyboardF20	= 0x6F,	/* F20 */
+	kHIDUsage_KeyboardF21	= 0x70,	/* F21 */
+	kHIDUsage_KeyboardF22	= 0x71,	/* F22 */
+	kHIDUsage_KeyboardF23	= 0x72,	/* F23 */
+	kHIDUsage_KeyboardF24	= 0x73,	/* F24 */
+	kHIDUsage_KeyboardExecute	= 0x74,	/* Execute */
+	kHIDUsage_KeyboardHelp	= 0x75,	/* Help */
+	kHIDUsage_KeyboardMenu	= 0x76,	/* Menu */
+	kHIDUsage_KeyboardSelect	= 0x77,	/* Select */
+	kHIDUsage_KeyboardStop	= 0x78,	/* Stop */
+	kHIDUsage_KeyboardAgain	= 0x79,	/* Again */
+	kHIDUsage_KeyboardUndo	= 0x7A,	/* Undo */
+	kHIDUsage_KeyboardCut	= 0x7B,	/* Cut */
+	kHIDUsage_KeyboardCopy	= 0x7C,	/* Copy */
+	kHIDUsage_KeyboardPaste	= 0x7D,	/* Paste */
+	kHIDUsage_KeyboardFind	= 0x7E,	/* Find */
+	kHIDUsage_KeyboardMute	= 0x7F,	/* Mute */
+	kHIDUsage_KeyboardVolumeUp	= 0x80,	/* Volume Up */
+	kHIDUsage_KeyboardVolumeDown	= 0x81,	/* Volume Down */
+	kHIDUsage_KeyboardLockingCapsLock	= 0x82,	/* Locking Caps Lock */
+	kHIDUsage_KeyboardLockingNumLock	= 0x83,	/* Locking Num Lock */
+	kHIDUsage_KeyboardLockingScrollLock	= 0x84,	/* Locking Scroll Lock */
+	kHIDUsage_KeypadComma	= 0x85,	/* Keypad Comma */
+	kHIDUsage_KeypadEqualSignAS400	= 0x86,	/* Keypad Equal Sign for AS/400 */
+	kHIDUsage_KeyboardInternational1	= 0x87,	/* International1 */
+	kHIDUsage_KeyboardInternational2	= 0x88,	/* International2 */
+	kHIDUsage_KeyboardInternational3	= 0x89,	/* International3 */
+	kHIDUsage_KeyboardInternational4	= 0x8A,	/* International4 */
+	kHIDUsage_KeyboardInternational5	= 0x8B,	/* International5 */
+	kHIDUsage_KeyboardInternational6	= 0x8C,	/* International6 */
+	kHIDUsage_KeyboardInternational7	= 0x8D,	/* International7 */
+	kHIDUsage_KeyboardInternational8	= 0x8E,	/* International8 */
+	kHIDUsage_KeyboardInternational9	= 0x8F,	/* International9 */
+	kHIDUsage_KeyboardLANG1	= 0x90,	/* LANG1 */
+	kHIDUsage_KeyboardLANG2	= 0x91,	/* LANG2 */
+	kHIDUsage_KeyboardLANG3	= 0x92,	/* LANG3 */
+	kHIDUsage_KeyboardLANG4	= 0x93,	/* LANG4 */
+	kHIDUsage_KeyboardLANG5	= 0x94,	/* LANG5 */
+	kHIDUsage_KeyboardLANG6	= 0x95,	/* LANG6 */
+	kHIDUsage_KeyboardLANG7	= 0x96,	/* LANG7 */
+	kHIDUsage_KeyboardLANG8	= 0x97,	/* LANG8 */
+	kHIDUsage_KeyboardLANG9	= 0x98,	/* LANG9 */
+	kHIDUsage_KeyboardAlternateErase	= 0x99,	/* AlternateErase */
+	kHIDUsage_KeyboardSysReqOrAttention	= 0x9A,	/* SysReq/Attention */
+	kHIDUsage_KeyboardCancel	= 0x9B,	/* Cancel */
+	kHIDUsage_KeyboardClear	= 0x9C,	/* Clear */
+	kHIDUsage_KeyboardPrior	= 0x9D,	/* Prior */
+	kHIDUsage_KeyboardReturn	= 0x9E,	/* Return */
+	kHIDUsage_KeyboardSeparator	= 0x9F,	/* Separator */
+	kHIDUsage_KeyboardOut	= 0xA0,	/* Out */
+	kHIDUsage_KeyboardOper	= 0xA1,	/* Oper */
+	kHIDUsage_KeyboardClearOrAgain	= 0xA2,	/* Clear/Again */
+	kHIDUsage_KeyboardCrSelOrProps	= 0xA3,	/* CrSel/Props */
+	kHIDUsage_KeyboardExSel	= 0xA4,	/* ExSel */
+	/* 0xA5-0xDF Reserved */
+	kHIDUsage_KeyboardLeftControl	= 0xE0,	/* Left Control */
+	kHIDUsage_KeyboardLeftShift	= 0xE1,	/* Left Shift */
+	kHIDUsage_KeyboardLeftAlt	= 0xE2,	/* Left Alt */
+	kHIDUsage_KeyboardLeftGUI	= 0xE3,	/* Left GUI */
+	kHIDUsage_KeyboardRightControl	= 0xE4,	/* Right Control */
+	kHIDUsage_KeyboardRightShift	= 0xE5,	/* Right Shift */
+	kHIDUsage_KeyboardRightAlt	= 0xE6,	/* Right Alt */
+	kHIDUsage_KeyboardRightGUI	= 0xE7,	/* Right GUI */
+	/* 0xE8-0xFFFF Reserved */
+	kHIDUsage_Keyboard_Reserved = 0xFFFF
+};
+
+/* LEDs Page (0x08) */
+/* An LED or indicator is implemented as an On/Off Control (OOF) using the ÒSingle button toggleÓ mode, where a value of 1 will turn on the indicator, and a value of 0 will turn it off. The exceptions are described below. */
+enum
+{
+	kHIDUsage_LED_NumLock	= 0x01,	/* On/Off Control */
+	kHIDUsage_LED_CapsLock	= 0x02,	/* On/Off Control */
+	kHIDUsage_LED_ScrollLock	= 0x03,	/* On/Off Control */
+	kHIDUsage_LED_Compose	= 0x04,	/* On/Off Control */
+	kHIDUsage_LED_Kana	= 0x05,	/* On/Off Control */
+	kHIDUsage_LED_Power	= 0x06,	/* On/Off Control */
+	kHIDUsage_LED_Shift	= 0x07,	/* On/Off Control */
+	kHIDUsage_LED_DoNotDisturb	= 0x08,	/* On/Off Control */
+	kHIDUsage_LED_Mute	= 0x09,	/* On/Off Control */
+	kHIDUsage_LED_ToneEnable	= 0x0A,	/* On/Off Control */
+	kHIDUsage_LED_HighCutFilter	= 0x0B,	/* On/Off Control */
+	kHIDUsage_LED_LowCutFilter	= 0x0C,	/* On/Off Control */
+	kHIDUsage_LED_EqualizerEnable	= 0x0D,	/* On/Off Control */
+	kHIDUsage_LED_SoundFieldOn	= 0x0E,	/* On/Off Control */
+	kHIDUsage_LED_SurroundOn	= 0x0F,	/* On/Off Control */
+	kHIDUsage_LED_Repeat	= 0x10,	/* On/Off Control */
+	kHIDUsage_LED_Stereo	= 0x11,	/* On/Off Control */
+	kHIDUsage_LED_SamplingRateDetect	= 0x12,	/* On/Off Control */
+	kHIDUsage_LED_Spinning	= 0x13,	/* On/Off Control */
+	kHIDUsage_LED_CAV	= 0x14,	/* On/Off Control */
+	kHIDUsage_LED_CLV	= 0x15,	/* On/Off Control */
+	kHIDUsage_LED_RecordingFormatDetect	= 0x16,	/* On/Off Control */
+	kHIDUsage_LED_OffHook	= 0x17,	/* On/Off Control */
+	kHIDUsage_LED_Ring	= 0x18,	/* On/Off Control */
+	kHIDUsage_LED_MessageWaiting	= 0x19,	/* On/Off Control */
+	kHIDUsage_LED_DataMode	= 0x1A,	/* On/Off Control */
+	kHIDUsage_LED_BatteryOperation	= 0x1B,	/* On/Off Control */
+	kHIDUsage_LED_BatteryOK	= 0x1C,	/* On/Off Control */
+	kHIDUsage_LED_BatteryLow	= 0x1D,	/* On/Off Control */
+	kHIDUsage_LED_Speaker	= 0x1E,	/* On/Off Control */
+	kHIDUsage_LED_HeadSet	= 0x1F,	/* On/Off Control */
+	kHIDUsage_LED_Hold	= 0x20,	/* On/Off Control */
+	kHIDUsage_LED_Microphone	= 0x21,	/* On/Off Control */
+	kHIDUsage_LED_Coverage	= 0x22,	/* On/Off Control */
+	kHIDUsage_LED_NightMode	= 0x23,	/* On/Off Control */
+	kHIDUsage_LED_SendCalls	= 0x24,	/* On/Off Control */
+	kHIDUsage_LED_CallPickup	= 0x25,	/* On/Off Control */
+	kHIDUsage_LED_Conference	= 0x26,	/* On/Off Control */
+	kHIDUsage_LED_StandBy	= 0x27,	/* On/Off Control */
+	kHIDUsage_LED_CameraOn	= 0x28,	/* On/Off Control */
+	kHIDUsage_LED_CameraOff	= 0x29,	/* On/Off Control */
+	kHIDUsage_LED_OnLine	= 0x2A,	/* On/Off Control */
+	kHIDUsage_LED_OffLine	= 0x2B,	/* On/Off Control */
+	kHIDUsage_LED_Busy	= 0x2C,	/* On/Off Control */
+	kHIDUsage_LED_Ready	= 0x2D,	/* On/Off Control */
+	kHIDUsage_LED_PaperOut	= 0x2E,	/* On/Off Control */
+	kHIDUsage_LED_PaperJam	= 0x2F,	/* On/Off Control */
+	kHIDUsage_LED_Remote	= 0x30,	/* On/Off Control */
+	kHIDUsage_LED_Forward	= 0x31,	/* On/Off Control */
+	kHIDUsage_LED_Reverse	= 0x32,	/* On/Off Control */
+	kHIDUsage_LED_Stop	= 0x33,	/* On/Off Control */
+	kHIDUsage_LED_Rewind	= 0x34,	/* On/Off Control */
+	kHIDUsage_LED_FastForward	= 0x35,	/* On/Off Control */
+	kHIDUsage_LED_Play	= 0x36,	/* On/Off Control */
+	kHIDUsage_LED_Pause	= 0x37,	/* On/Off Control */
+	kHIDUsage_LED_Record	= 0x38,	/* On/Off Control */
+	kHIDUsage_LED_Error	= 0x39,	/* On/Off Control */
+	kHIDUsage_LED_Usage	= 0x3A,	/* Selector */
+	kHIDUsage_LED_UsageInUseIndicator	= 0x3B,	/* Usage Switch */
+	kHIDUsage_LED_UsageMultiModeIndicator	= 0x3C,	/* Usage Modifier */
+	kHIDUsage_LED_IndicatorOn	= 0x3D,	/* Selector */
+	kHIDUsage_LED_IndicatorFlash	= 0x3E,	/* Selector */
+	kHIDUsage_LED_IndicatorSlowBlink	= 0x3F,	/* Selector */
+	kHIDUsage_LED_IndicatorFastBlink	= 0x40,	/* Selector */
+	kHIDUsage_LED_IndicatorOff	= 0x41,	/* Selector */
+	kHIDUsage_LED_FlashOnTime	= 0x42,	/* Dynamic Value */
+	kHIDUsage_LED_SlowBlinkOnTime	= 0x43,	/* Dynamic Value */
+	kHIDUsage_LED_SlowBlinkOffTime	= 0x44,	/* Dynamic Value */
+	kHIDUsage_LED_FastBlinkOnTime	= 0x45,	/* Dynamic Value */
+	kHIDUsage_LED_FastBlinkOffTime	= 0x46,	/* Dynamic Value */
+	kHIDUsage_LED_UsageIndicatorColor	= 0x47,	/* Usage Modifier */
+	kHIDUsage_LED_IndicatorRed	= 0x48,	/* Selector */
+	kHIDUsage_LED_IndicatorGreen	= 0x49,	/* Selector */
+	kHIDUsage_LED_IndicatorAmber	= 0x4A,	/* Selector */
+	kHIDUsage_LED_GenericIndicator	= 0x4B,	/* On/Off Control */
+	kHIDUsage_LED_SystemSuspend	= 0x4C,	/* On/Off Control */
+	kHIDUsage_LED_ExternalPowerConnected	= 0x4D,	/* On/Off Control */
+	/* 0x4E - 0xFFFF Reserved */
+	kHIDUsage_LED_Reserved = 0xFFFF
+};
+
+/* Button Page (0x09) */
+/* The Button page is the first place an application should look for user selection controls. System graphical user interfaces typically employ a pointer and a set of hierarchical selectors to select, move and otherwise manipulate their environment. For these purposes the following assignment of significance can be applied to the Button usages: */
+/* ¥ Button 1, Primary Button. Used for object selecting, dragging, and double click activation. On MacOS, this is the only button. Microsoft operating systems call this a logical left button, because it */
+/* is not necessarily physically located on the left of the pointing device. */
+/* ¥ Button 2, Secondary Button. Used by newer graphical user interfaces to browse object properties. Exposed by systems to applications that typically assign application-specific functionality. */
+/* ¥ Button 3, Tertiary Button. Optional control. Exposed to applications, but seldom assigned functionality due to prevalence of two- and one-button devices. */
+/* ¥ Buttons 4 -55. As the button number increases, its significance as a selector decreases. */
+/* In many ways the assignment of button numbers is similar to the assignment of Effort in Physical descriptors. Button 1 would be used to define the button a finger rests on when the hand is in the Òat restÓ position, that is, virtually no effort is required by the user to activate the button. Button values increment as the finger has to stretch to reach a control. See Section 6.2.3, ÒPhysical Descriptors,Ó in the HID Specification for methods of further qualifying buttons. */
+enum
+{
+	kHIDUsage_Button_1	= 0x01,	/* (primary/trigger) */
+	kHIDUsage_Button_2	= 0x02,	/* (secondary) */
+	kHIDUsage_Button_3	= 0x03,	/* (tertiary) */
+	kHIDUsage_Button_4	= 0x04, /* 4th button */
+	/* ... */
+	kHIDUsage_Button_65535	= 0xFFFF
+};
+
+/* Ordinal Page (0x0A) */
+/* The Ordinal page allows multiple instances of a control or sets of controls to be declared without requiring individual enumeration in the native usage page. For example, it is not necessary to declare usages of Pointer 1, Pointer 2, and so forth on the Generic Desktop page. When parsed, the ordinal instance number is, in essence, concatenated to the usages attached to the encompassing collection to create Pointer 1, Pointer 2, and so forth. */
+/* For an example, see Section A.5, ÒMultiple Instances of a Control,Ó in Appendix A, ÒUsage Examples.Ó By convention, an Ordinal collection is placed inside the collection for which it is declaring multiple instances. */
+/* Instances do not have to be identical. */
+enum
+{
+	/* 0x00 Reserved */
+	kHIDUsage_Ord_Instance1	= 0x01,	/* Usage Modifier */
+	kHIDUsage_Ord_Instance2	= 0x02,	/* Usage Modifier */
+	kHIDUsage_Ord_Instance3	= 0x03,	/* Usage Modifier */
+	kHIDUsage_Ord_Instance4	= 0x04,	/* Usage Modifier */
+	kHIDUsage_Ord_Instance65535	= 0xFFFF	/* Usage Modifier */
+};
+
+/* Telephony Page (0x0B) */
+/* This usage page defines the keytop and control usages for telephony devices. */
+/* Indicators on a phone are handled by wrapping them in LED: Usage In Use Indicator and LED: Usage Selected Indicator usages. For example, a message-indicator LED would be identified by a Telephony: Message usage declared as a Feature or Output in a LED: Usage In Use Indicator collection. */
+/* See Section 14, ÒConsumer Page (0x0C),Ó for audio volume and tone controls. */
+enum
+{
+	kHIDUsage_Tfon_Phone	= 0x01,	/* Application Collection */
+	kHIDUsage_Tfon_AnsweringMachine	= 0x02,	/* Application Collection */
+	kHIDUsage_Tfon_MessageControls	= 0x03,	/* Logical Collection */
+	kHIDUsage_Tfon_Handset	= 0x04,	/* Logical Collection */
+	kHIDUsage_Tfon_Headset	= 0x05,	/* Logical Collection */
+	kHIDUsage_Tfon_TelephonyKeyPad	= 0x06,	/* Named Array */
+	kHIDUsage_Tfon_ProgrammableButton	= 0x07,	/* Named Array */
+	/* 0x08 - 0x1F Reserved */
+	kHIDUsage_Tfon_HookSwitch	= 0x20,	/* On/Off Control */
+	kHIDUsage_Tfon_Flash	= 0x21,	/* Momentary Control */
+	kHIDUsage_Tfon_Feature	= 0x22,	/* One-Shot Control */
+	kHIDUsage_Tfon_Hold	= 0x23,	/* On/Off Control */
+	kHIDUsage_Tfon_Redial	= 0x24,	/* One-Shot Control */
+	kHIDUsage_Tfon_Transfer	= 0x25,	/* One-Shot Control */
+	kHIDUsage_Tfon_Drop	= 0x26,	/* One-Shot Control */
+	kHIDUsage_Tfon_Park	= 0x27,	/* On/Off Control */
+	kHIDUsage_Tfon_ForwardCalls	= 0x28,	/* On/Off Control */
+	kHIDUsage_Tfon_AlternateFunction	= 0x29,	/* Momentary Control */
+	kHIDUsage_Tfon_Line	= 0x2A,	/* One-Shot Control */
+	kHIDUsage_Tfon_SpeakerPhone	= 0x2B,	/* On/Off Control */
+	kHIDUsage_Tfon_Conference	= 0x2C,	/* On/Off Control */
+	kHIDUsage_Tfon_RingEnable	= 0x2D,	/* On/Off Control */
+	kHIDUsage_Tfon_Ring	= 0x2E,	/* Selector */
+	kHIDUsage_Tfon_PhoneMute	= 0x2F,	/* On/Off Control */
+	kHIDUsage_Tfon_CallerID	= 0x30,	/* Momentary Control */
+	/* 0x31 - 0x4F Reserved */
+	kHIDUsage_Tfon_SpeedDial	= 0x50,	/* One-Shot Control */
+	kHIDUsage_Tfon_StoreNumber	= 0x51,	/* One-Shot Control */
+	kHIDUsage_Tfon_RecallNumber	= 0x52,	/* One-Shot Control */
+	kHIDUsage_Tfon_PhoneDirectory	= 0x53,	/* On/Off Control */
+	/* 0x54 - 0x6F Reserved */
+	kHIDUsage_Tfon_VoiceMail	= 0x70,	/* On/Off Control */
+	kHIDUsage_Tfon_ScreenCalls	= 0x71,	/* On/Off Control */
+	kHIDUsage_Tfon_DoNotDisturb	= 0x72,	/* On/Off Control */
+	kHIDUsage_Tfon_Message	= 0x73,	/* One-Shot Control */
+	kHIDUsage_Tfon_AnswerOnOrOff	= 0x74,	/* On/Off Control */
+	/* 0x75 - 0x8F Reserved */
+	kHIDUsage_Tfon_InsideDialTone	= 0x90,	/* Momentary Control */
+	kHIDUsage_Tfon_OutsideDialTone	= 0x91,	/* Momentary Control */
+	kHIDUsage_Tfon_InsideRingTone	= 0x92,	/* Momentary Control */
+	kHIDUsage_Tfon_OutsideRingTone	= 0x93,	/* Momentary Control */
+	kHIDUsage_Tfon_PriorityRingTone	= 0x94,	/* Momentary Control */
+	kHIDUsage_Tfon_InsideRingback	= 0x95,	/* Momentary Control */
+	kHIDUsage_Tfon_PriorityRingback	= 0x96,	/* Momentary Control */
+	kHIDUsage_Tfon_LineBusyTone	= 0x97,	/* Momentary Control */
+	kHIDUsage_Tfon_ReorderTone	= 0x98,	/* Momentary Control */
+	kHIDUsage_Tfon_CallWaitingTone	= 0x99,	/* Momentary Control */
+	kHIDUsage_Tfon_ConfirmationTone1	= 0x9A,	/* Momentary Control */
+	kHIDUsage_Tfon_ConfirmationTone2	= 0x9B,	/* Momentary Control */
+	kHIDUsage_Tfon_TonesOff	= 0x9C,	/* On/Off Control */
+	kHIDUsage_Tfon_OutsideRingback	= 0x9D,	/* Momentary Control */
+	/* 0x9E - 0xAF Reserved */
+	kHIDUsage_Tfon_PhoneKey0	= 0xB0,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey1	= 0xB1,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey2	= 0xB2,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey3	= 0xB3,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey4	= 0xB4,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey5	= 0xB5,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey6	= 0xB6,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey7	= 0xB7,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey8	= 0xB8,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKey9	= 0xB9,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyStar	= 0xBA,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyPound	= 0xBB,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyA	= 0xBC,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyB	= 0xBD,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyC	= 0xBE,	/* Selector/One-Shot Control */
+	kHIDUsage_Tfon_PhoneKeyD	= 0xBF,	/* Selector/One-Shot Control */
+	/* 0xC0 - 0xFFFF Reserved */
+	kHIDUsage_TFon_Reserved = 0xFFFF
+};
+
+/* Consumer Page (0x0C) */
+/* All controls on the Consumer page are application-specific. That is, they affect a specific device, not the system as a whole. */
+enum
+{
+	kHIDUsage_Csmr_ConsumerControl	= 0x01,	/* Application Collection */
+	kHIDUsage_Csmr_NumericKeyPad	= 0x02,	/* Named Array */
+	kHIDUsage_Csmr_ProgrammableButtons	= 0x03,	/* Named Array */
+	/* 0x03 - 0x1F Reserved */
+	kHIDUsage_Csmr_Plus10	= 0x20,	/* One-Shot Control */
+	kHIDUsage_Csmr_Plus100	= 0x21,	/* One-Shot Control */
+	kHIDUsage_Csmr_AMOrPM	= 0x22,	/* One-Shot Control */
+	/* 0x23 - 0x3F Reserved */
+	kHIDUsage_Csmr_Power	= 0x30,	/* On/Off Control */
+	kHIDUsage_Csmr_Reset	= 0x31,	/* One-Shot Control */
+	kHIDUsage_Csmr_Sleep	= 0x32,	/* One-Shot Control */
+	kHIDUsage_Csmr_SleepAfter	= 0x33,	/* One-Shot Control */
+	kHIDUsage_Csmr_SleepMode	= 0x34,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_Illumination	= 0x35,	/* On/Off Control */
+	kHIDUsage_Csmr_FunctionButtons	= 0x36,	/* Named Array */
+	/* 0x37 - 0x3F Reserved */
+	kHIDUsage_Csmr_Menu	= 0x40,	/* On/Off Control */
+	kHIDUsage_Csmr_MenuPick	= 0x41,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuUp	= 0x42,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuDown	= 0x43,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuLeft	= 0x44,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuRight	= 0x45,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuEscape	= 0x46,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuValueIncrease	= 0x47,	/* One-Shot Control */
+	kHIDUsage_Csmr_MenuValueDecrease	= 0x48,	/* One-Shot Control */
+	/* 0x49 - 0x5F Reserved */
+	kHIDUsage_Csmr_DataOnScreen	= 0x60,	/* On/Off Control */
+	kHIDUsage_Csmr_ClosedCaption	= 0x61,	/* On/Off Control */
+	kHIDUsage_Csmr_ClosedCaptionSelect	= 0x62,	/* Selector */
+	kHIDUsage_Csmr_VCROrTV	= 0x63,	/* On/Off Control */
+	kHIDUsage_Csmr_BroadcastMode	= 0x64,	/* One-Shot Control */
+	kHIDUsage_Csmr_Snapshot	= 0x65,	/* One-Shot Control */
+	kHIDUsage_Csmr_Still	= 0x66,	/* One-Shot Control */
+	/* 0x67 - 0x7F Reserved */
+	kHIDUsage_Csmr_Selection	= 0x80,	/* Named Array */
+	kHIDUsage_Csmr_Assign	= 0x81,	/* Selector */
+	kHIDUsage_Csmr_ModeStep	= 0x82,	/* One-Shot Control */
+	kHIDUsage_Csmr_RecallLast	= 0x83,	/* One-Shot Control */
+	kHIDUsage_Csmr_EnterChannel	= 0x84,	/* One-Shot Control */
+	kHIDUsage_Csmr_OrderMovie	= 0x85,	/* One-Shot Control */
+	kHIDUsage_Csmr_Channel	= 0x86,	/* Linear Control */
+	kHIDUsage_Csmr_MediaSelection	= 0x87,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectComputer	= 0x88,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectTV	= 0x89,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectWWW	= 0x8A,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectDVD	= 0x8B,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectTelephone	= 0x8C,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectProgramGuide	= 0x8D,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectVideoPhone	= 0x8E,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectGames	= 0x8F,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectMessages	= 0x90,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectCD	= 0x91,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectVCR	= 0x92,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectTuner	= 0x93,	/* Selector */
+	kHIDUsage_Csmr_Quit	= 0x94,	/* One-Shot Control */
+	kHIDUsage_Csmr_Help	= 0x95,	/* On/Off Control */
+	kHIDUsage_Csmr_MediaSelectTape	= 0x96,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectCable	= 0x97,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectSatellite	= 0x98,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectSecurity	= 0x99,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectHome	= 0x9A,	/* Selector */
+	kHIDUsage_Csmr_MediaSelectCall	= 0x9B,	/* Selector */
+	kHIDUsage_Csmr_ChannelIncrement	= 0x9C,	/* One-Shot Control */
+	kHIDUsage_Csmr_ChannelDecrement	= 0x9D,	/* One-Shot Control */
+	kHIDUsage_Csmr_Media	= 0x9E,	/* Selector */
+	/* 0x9F Reserved */
+	kHIDUsage_Csmr_VCRPlus	= 0xA0,	/* One-Shot Control */
+	kHIDUsage_Csmr_Once	= 0xA1,	/* One-Shot Control */
+	kHIDUsage_Csmr_Daily	= 0xA2,	/* One-Shot Control */
+	kHIDUsage_Csmr_Weekly	= 0xA3,	/* One-Shot Control */
+	kHIDUsage_Csmr_Monthly	= 0xA4,	/* One-Shot Control */
+	/* 0xA5 - 0xAF Reserved */
+	kHIDUsage_Csmr_Play	= 0xB0,	/* On/Off Control */
+	kHIDUsage_Csmr_Pause	= 0xB1,	/* On/Off Control */
+	kHIDUsage_Csmr_Record	= 0xB2,	/* On/Off Control */
+	kHIDUsage_Csmr_FastForward	= 0xB3,	/* On/Off Control */
+	kHIDUsage_Csmr_Rewind	= 0xB4,	/* On/Off Control */
+	kHIDUsage_Csmr_ScanNextTrack	= 0xB5,	/* One-Shot Control */
+	kHIDUsage_Csmr_ScanPreviousTrack	= 0xB6,	/* One-Shot Control */
+	kHIDUsage_Csmr_Stop	= 0xB7,	/* One-Shot Control */
+	kHIDUsage_Csmr_Eject	= 0xB8,	/* One-Shot Control */
+	kHIDUsage_Csmr_RandomPlay	= 0xB9,	/* On/Off Control */
+	kHIDUsage_Csmr_SelectDisc	= 0xBA,	/* Named Array */
+	kHIDUsage_Csmr_EnterDisc	= 0xBB,	/* Momentary Control */
+	kHIDUsage_Csmr_Repeat	= 0xBC,	/* One-Shot Control */
+	kHIDUsage_Csmr_Tracking	= 0xBD,	/* Linear Control */
+	kHIDUsage_Csmr_TrackNormal	= 0xBE,	/* One-Shot Control */
+	kHIDUsage_Csmr_SlowTracking	= 0xBF,	/* Linear Control */
+	kHIDUsage_Csmr_FrameForward	= 0xC0,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_FrameBack	= 0xC1,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_Mark	= 0xC2,	/* One-Shot Control */
+	kHIDUsage_Csmr_ClearMark	= 0xC3,	/* One-Shot Control */
+	kHIDUsage_Csmr_RepeatFromMark	= 0xC4,	/* On/Off Control */
+	kHIDUsage_Csmr_ReturnToMark	= 0xC5,	/* One-Shot Control */
+	kHIDUsage_Csmr_SearchMarkForward	= 0xC6,	/* One-Shot Control */
+	kHIDUsage_Csmr_SearchMarkBackwards	= 0xC7,	/* One-Shot Control */
+	kHIDUsage_Csmr_CounterReset	= 0xC8,	/* One-Shot Control */
+	kHIDUsage_Csmr_ShowCounter	= 0xC9,	/* One-Shot Control */
+	kHIDUsage_Csmr_TrackingIncrement	= 0xCA,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_TrackingDecrement	= 0xCB,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_StopOrEject	= 0xCC,	/* One-Shot Control */
+	kHIDUsage_Csmr_PlayOrPause	= 0xCD,	/* One-Shot Control */
+	kHIDUsage_Csmr_PlayOrSkip	= 0xCE,	/* One-Shot Control */
+	/* 0xCF - 0xDF Reserved */
+	kHIDUsage_Csmr_Volume	= 0xE0,	/* Linear Control */
+	kHIDUsage_Csmr_Balance	= 0xE1,	/* Linear Control */
+	kHIDUsage_Csmr_Mute	= 0xE2,	/* On/Off Control */
+	kHIDUsage_Csmr_Bass	= 0xE3,	/* Linear Control */
+	kHIDUsage_Csmr_Treble	= 0xE4,	/* Linear Control */
+	kHIDUsage_Csmr_BassBoost	= 0xE5,	/* On/Off Control */
+	kHIDUsage_Csmr_SurroundMode	= 0xE6,	/* One-Shot Control */
+	kHIDUsage_Csmr_Loudness	= 0xE7,	/* On/Off Control */
+	kHIDUsage_Csmr_MPX	= 0xE8,	/* On/Off Control */
+	kHIDUsage_Csmr_VolumeIncrement	= 0xE9,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_VolumeDecrement	= 0xEA,	/* Re-Trigger Control */
+	/* 0xEB - 0xEF Reserved */
+	kHIDUsage_Csmr_Speed	= 0xF0,	/* Selector */
+	kHIDUsage_Csmr_PlaybackSpeed	= 0xF1,	/* Named Array */
+	kHIDUsage_Csmr_StandardPlay	= 0xF2,	/* Selector */
+	kHIDUsage_Csmr_LongPlay	= 0xF3,	/* Selector */
+	kHIDUsage_Csmr_ExtendedPlay	= 0xF4,	/* Selector */
+	kHIDUsage_Csmr_Slow	= 0xF5,	/* One-Shot Control */
+	/* 0xF6 - 0xFF Reserved */
+	kHIDUsage_Csmr_FanEnable	= 0x100,	/* On/Off Control */
+	kHIDUsage_Csmr_FanSpeed	= 0x101,	/* Linear Control */
+	kHIDUsage_Csmr_LightEnable	= 0x102,	/* On/Off Control */
+	kHIDUsage_Csmr_LightIlluminationLevel	= 0x103,	/* Linear Control */
+	kHIDUsage_Csmr_ClimateControlEnable	= 0x104,	/* On/Off Control */
+	kHIDUsage_Csmr_RoomTemperature	= 0x105,	/* Linear Control */
+	kHIDUsage_Csmr_SecurityEnable	= 0x106,	/* On/Off Control */
+	kHIDUsage_Csmr_FireAlarm	= 0x107,	/* One-Shot Control */
+	kHIDUsage_Csmr_PoliceAlarm	= 0x108,	/* One-Shot Control */
+	/* 0x109 - 0x14F Reserved */
+	kHIDUsage_Csmr_BalanceRight	= 0x150,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_BalanceLeft	= 0x151,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_BassIncrement	= 0x152,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_BassDecrement	= 0x153,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_TrebleIncrement	= 0x154,	/* Re-Trigger Control */
+	kHIDUsage_Csmr_TrebleDecrement	= 0x155,	/* Re-Trigger Control */
+	/* 0x156 - 0x15F Reserved */
+	kHIDUsage_Csmr_SpeakerSystem	= 0x160,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelLeft	= 0x161,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelRight	= 0x162,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelCenter	= 0x163,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelFront	= 0x164,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelCenterFront	= 0x165,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelSide	= 0x166,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelSurround	= 0x167,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelLowFrequencyEnhancement	= 0x168,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelTop	= 0x169,	/* Logical Collection */
+	kHIDUsage_Csmr_ChannelUnknown	= 0x16A,	/* Logical Collection */
+	/* 0x16B - 0x16F Reserved */
+	kHIDUsage_Csmr_SubChannel	= 0x170,	/* Linear Control */
+	kHIDUsage_Csmr_SubChannelIncrement	= 0x171,	/* One-Shot Control */
+	kHIDUsage_Csmr_SubChannelDecrement	= 0x172,	/* One-Shot Control */
+	kHIDUsage_Csmr_AlternateAudioIncrement	= 0x173,	/* One-Shot Control */
+	kHIDUsage_Csmr_AlternateAudioDecrement	= 0x174,	/* One-Shot Control */
+	/* 0x175 - 0x17F Reserved */
+	kHIDUsage_Csmr_ApplicationLaunchButtons	= 0x180,	/* Named Array */
+	kHIDUsage_Csmr_ALLaunchButtonConfigurationTool	= 0x181,	/* Selector */
+	kHIDUsage_Csmr_ALProgrammableButtonConfiguration	= 0x182,	/* Selector */
+	kHIDUsage_Csmr_ALConsumerControlConfiguration	= 0x183,	/* Selector */
+	kHIDUsage_Csmr_ALWordProcessor	= 0x184,	/* Selector */
+	kHIDUsage_Csmr_ALTextEditor	= 0x185,	/* Selector */
+	kHIDUsage_Csmr_ALSpreadsheet	= 0x186,	/* Selector */
+	kHIDUsage_Csmr_ALGraphicsEditor	= 0x187,	/* Selector */
+	kHIDUsage_Csmr_ALPresentationApp	= 0x188,	/* Selector */
+	kHIDUsage_Csmr_ALDatabaseApp	= 0x189,	/* Selector */
+	kHIDUsage_Csmr_ALEmailReader	= 0x18A,	/* Selector */
+	kHIDUsage_Csmr_ALNewsreader	= 0x18B,	/* Selector */
+	kHIDUsage_Csmr_ALVoicemail	= 0x18C,	/* Selector */
+	kHIDUsage_Csmr_ALContactsOrAddressBook	= 0x18D,	/* Selector */
+	kHIDUsage_Csmr_ALCalendarOrSchedule	= 0x18E,	/* Selector */
+	kHIDUsage_Csmr_ALTaskOrProjectManager	= 0x18F,	/* Selector */
+	kHIDUsage_Csmr_ALLogOrJournalOrTimecard	= 0x190,	/* Selector */
+	kHIDUsage_Csmr_ALCheckbookOrFinance	= 0x191,	/* Selector */
+	kHIDUsage_Csmr_ALCalculator	= 0x192,	/* Selector */
+	kHIDUsage_Csmr_ALAOrVCaptureOrPlayback	= 0x193,	/* Selector */
+	kHIDUsage_Csmr_ALLocalMachineBrowser	= 0x194,	/* Selector */
+	kHIDUsage_Csmr_ALLANOrWANBrowser	= 0x195,	/* Selector */
+	kHIDUsage_Csmr_ALInternetBrowser	= 0x196,	/* Selector */
+	kHIDUsage_Csmr_ALRemoteNetworkingOrISPConnect	= 0x197,	/* Selector */
+	kHIDUsage_Csmr_ALNetworkConference	= 0x198,	/* Selector */
+	kHIDUsage_Csmr_ALNetworkChat	= 0x199,	/* Selector */
+	kHIDUsage_Csmr_ALTelephonyOrDialer	= 0x19A,	/* Selector */
+	kHIDUsage_Csmr_ALLogon	= 0x19B,	/* Selector */
+	kHIDUsage_Csmr_ALLogoff	= 0x19C,	/* Selector */
+	kHIDUsage_Csmr_ALLogonOrLogoff	= 0x19D,	/* Selector */
+	kHIDUsage_Csmr_ALTerminalLockOrScreensaver	= 0x19E,	/* Selector */
+	kHIDUsage_Csmr_ALControlPanel	= 0x19F,	/* Selector */
+	kHIDUsage_Csmr_ALCommandLineProcessorOrRun	= 0x1A0,	/* Selector */
+	kHIDUsage_Csmr_ALProcessOrTaskManager	= 0x1A1,	/* Selector */
+	kHIDUsage_Csmr_AL	= 0x1A2,	/* Selector */
+	kHIDUsage_Csmr_ALNextTaskOrApplication	= 0x1A3,	/* Selector */
+	kHIDUsage_Csmr_ALPreviousTaskOrApplication	= 0x1A4,	/* Selector */
+	kHIDUsage_Csmr_ALPreemptiveHaltTaskOrApplication	= 0x1A5,	/* Selector */
+    kHIDUsage_Csmr_ALIntegratedHelpCenter   = 0x1A6, /* Selector */
+    kHIDUsage_Csmr_ALDocuments   = 0x1A7, /* Selector */
+    kHIDUsage_Csmr_ALThesaurus   = 0x1A8, /* Selector */
+    kHIDUsage_Csmr_ALDictionary   = 0x1A9, /* Selector */
+    kHIDUsage_Csmr_ALDesktop   = 0x1AA, /* Selector */
+    kHIDUsage_Csmr_ALSpellCheck   = 0x1AB, /* Selector */
+    kHIDUsage_Csmr_ALGrammerCheck   = 0x1AC, /* Selector */
+    kHIDUsage_Csmr_ALWirelessStatus   = 0x1AD, /* Selector */
+    kHIDUsage_Csmr_ALKeyboardLayout   = 0x1AE, /* Selector */
+    kHIDUsage_Csmr_ALVirusProtection   = 0x1AF, /* Selector */
+    kHIDUsage_Csmr_ALEncryption   = 0x1B0, /* Selector */
+    kHIDUsage_Csmr_ALScreenSaver   = 0x1B1, /* Selector */
+    kHIDUsage_Csmr_ALAlarms   = 0x1B2, /* Selector */
+    kHIDUsage_Csmr_ALClock   = 0x1B3, /* Selector */
+    kHIDUsage_Csmr_ALFileBrowser   = 0x1B4, /* Selector */
+    kHIDUsage_Csmr_ALPowerStatus   = 0x1B5, /* Selector */
+	/* 0x1A6 - 0x1FF Reserved */
+	kHIDUsage_Csmr_GenericGUIApplicationControls	= 0x200,	/* Named Array */
+	kHIDUsage_Csmr_ACNew	= 0x201,	/* Selector */
+	kHIDUsage_Csmr_ACOpen	= 0x202,	/* Selector */
+	kHIDUsage_Csmr_ACClose	= 0x203,	/* Selector */
+	kHIDUsage_Csmr_ACExit	= 0x204,	/* Selector */
+	kHIDUsage_Csmr_ACMaximize	= 0x205,	/* Selector */
+	kHIDUsage_Csmr_ACMinimize	= 0x206,	/* Selector */
+	kHIDUsage_Csmr_ACSave	= 0x207,	/* Selector */
+	kHIDUsage_Csmr_ACPrint	= 0x208,	/* Selector */
+	kHIDUsage_Csmr_ACProperties	= 0x209,	/* Selector */
+	kHIDUsage_Csmr_ACUndo	= 0x21A,	/* Selector */
+	kHIDUsage_Csmr_ACCopy	= 0x21B,	/* Selector */
+	kHIDUsage_Csmr_ACCut	= 0x21C,	/* Selector */
+	kHIDUsage_Csmr_ACPaste	= 0x21D,	/* Selector */
+	kHIDUsage_Csmr_AC	= 0x21E,	/* Selector */
+	kHIDUsage_Csmr_ACFind	= 0x21F,	/* Selector */
+	kHIDUsage_Csmr_ACFindandReplace	= 0x220,	/* Selector */
+	kHIDUsage_Csmr_ACSearch	= 0x221,	/* Selector */
+	kHIDUsage_Csmr_ACGoTo	= 0x222,	/* Selector */
+	kHIDUsage_Csmr_ACHome	= 0x223,	/* Selector */
+	kHIDUsage_Csmr_ACBack	= 0x224,	/* Selector */
+	kHIDUsage_Csmr_ACForward	= 0x225,	/* Selector */
+	kHIDUsage_Csmr_ACStop	= 0x226,	/* Selector */
+	kHIDUsage_Csmr_ACRefresh	= 0x227,	/* Selector */
+	kHIDUsage_Csmr_ACPreviousLink	= 0x228,	/* Selector */
+	kHIDUsage_Csmr_ACNextLink	= 0x229,	/* Selector */
+	kHIDUsage_Csmr_ACBookmarks	= 0x22A,	/* Selector */
+	kHIDUsage_Csmr_ACHistory	= 0x22B,	/* Selector */
+	kHIDUsage_Csmr_ACSubscriptions	= 0x22C,	/* Selector */
+	kHIDUsage_Csmr_ACZoomIn	= 0x22D,	/* Selector */
+	kHIDUsage_Csmr_ACZoomOut	= 0x22E,	/* Selector */
+	kHIDUsage_Csmr_ACZoom	= 0x22F,	/* Selector */
+	kHIDUsage_Csmr_ACFullScreenView	= 0x230,	/* Selector */
+	kHIDUsage_Csmr_ACNormalView	= 0x231,	/* Selector */
+	kHIDUsage_Csmr_ACViewToggle	= 0x232,	/* Selector */
+	kHIDUsage_Csmr_ACScrollUp	= 0x233,	/* Selector */
+	kHIDUsage_Csmr_ACScrollDown	= 0x234,	/* Selector */
+	kHIDUsage_Csmr_ACScroll	= 0x235,	/* Selector */
+	kHIDUsage_Csmr_ACPanLeft	= 0x236,	/* Selector */
+	kHIDUsage_Csmr_ACPanRight	= 0x237,	/* Selector */
+	kHIDUsage_Csmr_ACPan	= 0x238,	/* Selector */
+	kHIDUsage_Csmr_ACNewWindow	= 0x239,	/* Selector */
+	kHIDUsage_Csmr_ACTileHorizontally	= 0x23A,	/* Selector */
+	kHIDUsage_Csmr_ACTileVertically	= 0x23B,	/* Selector */
+	kHIDUsage_Csmr_ACFormat	= 0x23C,	/* Selector */
+	/* 0x23D - 0xFFFF Reserved */
+	kHIDUsage_Csmr_Reserved = 0xFFFF
+};
+
+/* Physical Interface Device Page (0x0F) */
+/* This section provides detailed descriptions of the usages employed by Digitizer Devices. */
+enum
+{
+	kHIDUsage_PID_PhysicalInterfaceDevice = 0x01,		/* CA - A collection of PID usages */
+	/* 0x02 - 0x1F Reserved */
+	kHIDUsage_PID_Normal = 0x20,						/* DV - A force applied perpendicular to the surface of an object */
+	kHIDUsage_PID_SetEffectReport = 0x21,				/* XXX */
+	kHIDUsage_PID_EffectBlockIndex = 0x22,				/* XXX */
+	kHIDUsage_PID_ParamBlockOffset = 0x23,				/* XXX */
+	kHIDUsage_PID_ROM_Flag = 0x24,						/* XXX */
+	kHIDUsage_PID_EffectType = 0x25,					/* XXX */
+	kHIDUsage_PID_ET_ConstantForce = 0x26,				/* XXX */
+	kHIDUsage_PID_ET_Ramp = 0x27,						/* XXX */
+	kHIDUsage_PID_ET_CustomForceData = 0x28,			/* XXX */
+	/* 0x29 - 0x2F Reserved */
+	kHIDUsage_PID_ET_Square = 0x30,						/* XXX */
+	kHIDUsage_PID_ET_Sine = 0x31,						/* XXX */
+	kHIDUsage_PID_ET_Triangle = 0x32,					/* XXX */
+	kHIDUsage_PID_ET_SawtoothUp = 0x33,					/* XXX */
+	kHIDUsage_PID_ET_SawtoothDown = 0x34,				/* XXX */
+	/* 0x35 - 0x3F Reserved */
+	kHIDUsage_PID_ET_Spring = 0x40,						/* XXX */
+	kHIDUsage_PID_ET_Damper = 0x41,						/* XXX */
+	kHIDUsage_PID_ET_Inertia = 0x42,					/* XXX */
+	kHIDUsage_PID_ET_Friction = 0x43,					/* XXX */
+	/* 0x44 - 0x4F Reserved */
+	kHIDUsage_PID_Duration = 0x50,						/* XXX */
+	kHIDUsage_PID_SamplePeriod = 0x51,					/* XXX */
+	kHIDUsage_PID_Gain = 0x52,							/* XXX */
+	kHIDUsage_PID_TriggerButton = 0x53,					/* XXX */
+	kHIDUsage_PID_TriggerRepeatInterval = 0x54,			/* XXX */
+	kHIDUsage_PID_AxesEnable = 0x55,					/* XXX */
+	kHIDUsage_PID_DirectionEnable = 0x56,				/* XXX */
+	kHIDUsage_PID_Direction = 0x57,						/* XXX */
+	kHIDUsage_PID_TypeSpecificBlockOffset = 0x58,		/* XXX */
+	kHIDUsage_PID_BlockType = 0x59,						/* XXX */
+	kHIDUsage_PID_SetEnvelopeReport = 0x5A,				/* XXX */
+	kHIDUsage_PID_AttackLevel = 0x5B,					/* XXX */
+	kHIDUsage_PID_AttackTime = 0x5C,					/* XXX */
+	kHIDUsage_PID_FadeLevel = 0x5D,						/* XXX */
+	kHIDUsage_PID_FadeTime = 0x5E,						/* XXX */
+	kHIDUsage_PID_SetConditionReport = 0x5F,			/* XXX */
+
+	kHIDUsage_PID_CP_Offset = 0x60,						/* XXX */
+	kHIDUsage_PID_PositiveCoefficient = 0x61,			/* XXX */
+	kHIDUsage_PID_NegativeCoefficient = 0x62,			/* XXX */
+	kHIDUsage_PID_PositiveSaturation = 0x63,			/* XXX */
+	kHIDUsage_PID_NegativeSaturation = 0x64,			/* XXX */
+	kHIDUsage_PID_DeadBand = 0x65,						/* XXX */
+	kHIDUsage_PID_DownloadForceSample = 0x66,			/* XXX */
+	kHIDUsage_PID_IsochCustomForceEnable = 0x67,		/* XXX */
+	kHIDUsage_PID_CustomForceDataReport = 0x68,			/* XXX */
+	kHIDUsage_PID_CustomForceData = 0x69,				/* XXX */
+	kHIDUsage_PID_CustomForceVendorDefinedData = 0x6A,	/* XXX */
+	kHIDUsage_PID_SetCustomForceReport = 0x6B,			/* XXX */
+	kHIDUsage_PID_CustomForceDataOffset = 0x6C,			/* XXX */
+	kHIDUsage_PID_SampleCount = 0x6D,					/* XXX */
+	kHIDUsage_PID_SetPeriodicReport = 0x6E,				/* XXX */
+	kHIDUsage_PID_Offset = 0x6F,						/* XXX */
+
+	kHIDUsage_PID_Magnitude = 0x70,						/* XXX */
+	kHIDUsage_PID_Phase = 0x71,							/* XXX */
+	kHIDUsage_PID_Period = 0x72,						/* XXX */
+	kHIDUsage_PID_SetConstantForceReport = 0x73,		/* XXX */
+	kHIDUsage_PID_SetRampForceReport = 0x74,			/* XXX */
+	kHIDUsage_PID_RampStart = 0x75,						/* XXX */
+	kHIDUsage_PID_RampEnd = 0x76,						/* XXX */
+	kHIDUsage_PID_EffectOperationReport = 0x77,			/* XXX */
+	kHIDUsage_PID_EffectOperation = 0x78,				/* XXX */
+	kHIDUsage_PID_OpEffectStart = 0x79,					/* XXX */
+	kHIDUsage_PID_OpEffectStartSolo = 0x7A,				/* XXX */
+	kHIDUsage_PID_OpEffectStop = 0x7B,					/* XXX */
+	kHIDUsage_PID_LoopCount = 0x7C,						/* XXX */
+	kHIDUsage_PID_DeviceGainReport = 0x7D,				/* XXX */
+	kHIDUsage_PID_DeviceGain = 0x7E,					/* XXX */
+	kHIDUsage_PID_PoolReport = 0x7F,					/* XXX */
+
+	kHIDUsage_PID_RAM_PoolSize = 0x80,					/* XXX */
+	kHIDUsage_PID_ROM_PoolSize = 0x81,					/* XXX */
+	kHIDUsage_PID_ROM_EffectBlockCount = 0x82,			/* XXX */
+	kHIDUsage_PID_SimultaneousEffectsMax = 0x83,		/* XXX */
+	kHIDUsage_PID_PoolAlignment = 0x84,					/* XXX */
+	kHIDUsage_PID_PoolMoveReport = 0x85,				/* XXX */
+	kHIDUsage_PID_MoveSource = 0x86,					/* XXX */
+	kHIDUsage_PID_MoveDestination = 0x87,				/* XXX */
+	kHIDUsage_PID_MoveLength = 0x88,					/* XXX */
+	kHIDUsage_PID_BlockLoadReport = 0x89,				/* XXX */
+	/* 0x8A Reserved */
+	kHIDUsage_PID_BlockLoadStatus = 0x8B,				/* XXX */
+	kHIDUsage_PID_BlockLoadSuccess = 0x8C,				/* XXX */
+	kHIDUsage_PID_BlockLoadFull = 0x8D,					/* XXX */
+	kHIDUsage_PID_BlockLoadError = 0x8E,				/* XXX */
+	kHIDUsage_PID_BlockHandle = 0x8F,					/* XXX */
+
+	kHIDUsage_PID_BlockFreeReport = 0x90,				/* XXX */
+	kHIDUsage_PID_TypeSpecificBlockHandle = 0x91,		/* XXX */
+	kHIDUsage_PID_StateReport = 0x92,					/* XXX */
+	/* 0x93 Reserved */
+	kHIDUsage_PID_EffectPlaying = 0x94,					/* XXX */
+	kHIDUsage_PID_DeviceControlReport = 0x95,			/* XXX */
+	kHIDUsage_PID_DeviceControl = 0x96,					/* XXX */
+	kHIDUsage_PID_DC_EnableActuators = 0x97,			/* XXX */
+	kHIDUsage_PID_DC_DisableActuators = 0x98,			/* XXX */
+	kHIDUsage_PID_DC_StopAllEffects = 0x99,				/* XXX */
+	kHIDUsage_PID_DC_DeviceReset = 0x9A,				/* XXX */
+	kHIDUsage_PID_DC_DevicePause = 0x9B,				/* XXX */
+	kHIDUsage_PID_DC_DeviceContinue = 0x9C,				/* XXX */
+	/* 0x9d - 0x9E Reserved */
+	kHIDUsage_PID_DevicePaused = 0x9F,					/* XXX */
+
+	kHIDUsage_PID_ActuatorsEnabled = 0xA0,				/* XXX */
+	/* 0xA1 - 0xA3 Reserved */
+	kHIDUsage_PID_SafetySwitch = 0xA4,					/* XXX */
+	kHIDUsage_PID_ActuatorOverrideSwitch = 0xA5,		/* XXX */
+	kHIDUsage_PID_ActuatorPower = 0xA6,					/* XXX */
+	kHIDUsage_PID_StartDelay = 0xA7,					/* XXX */
+	kHIDUsage_PID_ParameterBlockSize = 0xA8,			/* XXX */
+	kHIDUsage_PID_DeviceManagedPool = 0xA9,				/* XXX */
+	kHIDUsage_PID_SharedParameterBlocks = 0xAA,			/* XXX */
+	kHIDUsage_PID_CreateNewEffectReport = 0xAB,			/* XXX */
+	kHIDUsage_PID_RAM_PoolAvailable = 0xAC,				/* XXX */
+	/* 0xAD - 0xFFFF Reserved */
+	kHIDUsage_PID_Reserved = 0xFFFF
+};
+
+/* Digitizer Page (0x0D) */
+/* This section provides detailed descriptions of the usages employed by Digitizer Devices. */
+enum
+{
+	kHIDUsage_Dig_Digitizer	= 0x01,	/* Application Collection */
+	kHIDUsage_Dig_Pen	= 0x02,	/* Application Collection */
+	kHIDUsage_Dig_LightPen	= 0x03,	/* Application Collection */
+	kHIDUsage_Dig_TouchScreen	= 0x04,	/* Application Collection */
+	kHIDUsage_Dig_TouchPad	= 0x05,	/* Application Collection */
+	kHIDUsage_Dig_WhiteBoard	= 0x06,	/* Application Collection */
+	kHIDUsage_Dig_CoordinateMeasuringMachine	= 0x07,	/* Application Collection */
+	kHIDUsage_Dig_3DDigitizer	= 0x08,	/* Application Collection */
+	kHIDUsage_Dig_StereoPlotter	= 0x09,	/* Application Collection */
+	kHIDUsage_Dig_ArticulatedArm	= 0x0A,	/* Application Collection */
+	kHIDUsage_Dig_Armature	= 0x0B,	/* Application Collection */
+	kHIDUsage_Dig_MultiplePointDigitizer	= 0x0C,	/* Application Collection */
+	kHIDUsage_Dig_FreeSpaceWand	= 0x0D,	/* Application Collection */
+	/* 0x0E - 0x1F Reserved */
+	kHIDUsage_Dig_Stylus	= 0x20,	/* Logical Collection */
+	kHIDUsage_Dig_Puck	= 0x21,	/* Logical Collection */
+	kHIDUsage_Dig_Finger	= 0x22,	/* Logical Collection */
+	/* 0x23 - 0x2F Reserved */
+	kHIDUsage_Dig_TipPressure	= 0x30,	/* Dynamic Value */
+	kHIDUsage_Dig_BarrelPressure	= 0x31,	/* Dynamic Value */
+	kHIDUsage_Dig_InRange	= 0x32,	/* Momentary Control */
+	kHIDUsage_Dig_Touch	= 0x33,	/* Momentary Control */
+	kHIDUsage_Dig_Untouch	= 0x34,	/* One-Shot Control */
+	kHIDUsage_Dig_Tap	= 0x35,	/* One-Shot Control */
+	kHIDUsage_Dig_Quality	= 0x36,	/* Dynamic Value */
+	kHIDUsage_Dig_DataValid	= 0x37,	/* Momentary Control */
+	kHIDUsage_Dig_TransducerIndex	= 0x38,	/* Dynamic Value */
+	kHIDUsage_Dig_TabletFunctionKeys	= 0x39,	/* Logical Collection */
+	kHIDUsage_Dig_ProgramChangeKeys	= 0x3A,	/* Logical Collection */
+	kHIDUsage_Dig_BatteryStrength	= 0x3B,	/* Dynamic Value */
+	kHIDUsage_Dig_Invert	= 0x3C,	/* Momentary Control */
+	kHIDUsage_Dig_XTilt	= 0x3D,	/* Dynamic Value */
+	kHIDUsage_Dig_YTilt	= 0x3E,	/* Dynamic Value */
+	kHIDUsage_Dig_Azimuth	= 0x3F,	/* Dynamic Value */
+	kHIDUsage_Dig_Altitude	= 0x40,	/* Dynamic Value */
+	kHIDUsage_Dig_Twist	= 0x41,	/* Dynamic Value */
+	kHIDUsage_Dig_TipSwitch	= 0x42,	/* Momentary Control */
+	kHIDUsage_Dig_SecondaryTipSwitch	= 0x43,	/* Momentary Control */
+	kHIDUsage_Dig_BarrelSwitch	= 0x44,	/* Momentary Control */
+	kHIDUsage_Dig_Eraser	= 0x45,	/* Momentary Control */
+	kHIDUsage_Dig_TabletPick	= 0x46,	/* Momentary Control */
+	/* 0x47 - 0xFFFF Reserved */
+	kHIDUsage_Dig_Reserved = 0xFFFF
+};
+
+/* AlphanumericDisplay Page (0x14) */
+/* The Alphanumeric Display page is intended for use by simple alphanumeric displays that are used on consumer devices. */
+enum
+{
+	kHIDUsage_AD_AlphanumericDisplay	= 0x01,	/* Application Collection */
+	/* 0x02 - 0x1F Reserved */
+	kHIDUsage_AD_DisplayAttributesReport	= 0x20,	/* Logical Collection */
+	kHIDUsage_AD_ASCIICharacterSet	= 0x21,	/* Static Flag */
+	kHIDUsage_AD_DataReadBack	= 0x22,	/* Static Flag */
+	kHIDUsage_AD_FontReadBack	= 0x23,	/* Static Flag */
+	kHIDUsage_AD_DisplayControlReport	= 0x24,	/* Logical Collection */
+	kHIDUsage_AD_ClearDisplay	= 0x25,	/* Dynamic Flag */
+	kHIDUsage_AD_DisplayEnable	= 0x26,	/* Dynamic Flag */
+	kHIDUsage_AD_ScreenSaverDelay	= 0x27,	/* Static Value */
+	kHIDUsage_AD_ScreenSaverEnable	= 0x28,	/* Dynamic Flag */
+	kHIDUsage_AD_VerticalScroll	= 0x29,	/* Static Flag */
+	kHIDUsage_AD_HorizontalScroll	= 0x2A,	/* Static Flag */
+	kHIDUsage_AD_CharacterReport	= 0x2B,	/* Logical Collection */
+	kHIDUsage_AD_DisplayData	= 0x2C,	/* Dynamic Value */
+	kHIDUsage_AD_DisplayStatus	= 0x2D,	/* Logical Collection */
+	kHIDUsage_AD_StatNotReady	= 0x2E,	/* Selector */
+	kHIDUsage_AD_StatReady	= 0x2F,	/* Selector */
+	kHIDUsage_AD_ErrNotaloadablecharacter	= 0x30,	/* Selector */
+	kHIDUsage_AD_ErrFontdatacannotberead	= 0x31,	/* Selector */
+	kHIDUsage_AD_CursorPositionReport	= 0x32,	/* Logical Collection */
+	kHIDUsage_AD_Row	= 0x33,	/* Dynamic Value */
+	kHIDUsage_AD_Column	= 0x34,	/* Dynamic Value */
+	kHIDUsage_AD_Rows	= 0x35,	/* Static Value */
+	kHIDUsage_AD_Columns	= 0x36,	/* Static Value */
+	kHIDUsage_AD_CursorPixelPositioning	= 0x37,	/* Static Flag */
+	kHIDUsage_AD_CursorMode	= 0x38,	/* Dynamic Flag */
+	kHIDUsage_AD_CursorEnable	= 0x39,	/* Dynamic Flag */
+	kHIDUsage_AD_CursorBlink	= 0x3A,	/* Dynamic Flag */
+	kHIDUsage_AD_FontReport	= 0x3B,	/* Logical Collection */
+	kHIDUsage_AD_FontData	= 0x3C,	/* Buffered Byte */
+	kHIDUsage_AD_CharacterWidth	= 0x3D,	/* Static Value */
+	kHIDUsage_AD_CharacterHeight	= 0x3E,	/* Static Value */
+	kHIDUsage_AD_CharacterSpacingHorizontal	= 0x3F,	/* Static Value */
+	kHIDUsage_AD_CharacterSpacingVertical	= 0x40,	/* Static Value */
+	kHIDUsage_AD_UnicodeCharacterSet	= 0x41,	/* Static Flag */
+	/* 0x42 - 0xFFFF Reserved */
+	kHIDUsage_AD_Reserved = 0xFFFF
+};
+
+/* Power Device Page (0x84) */
+/* This section provides detailed descriptions of the usages employed by Power Devices. */
+enum
+{
+	
+	kHIDUsage_PD_Undefined = 0x00,				/* Power Device Undefined Usage */
+	kHIDUsage_PD_iName = 0x01,					/* CL- Power Device Name Index */
+	kHIDUsage_PD_PresentStatus = 0x02,			/* CL- Power Device Present Status */
+	kHIDUsage_PD_ChangedStatus = 0x03,			/* CA- Power Device Changed Status */
+	kHIDUsage_PD_UPS = 0x04,					/* CA- Uninterruptible Power Supply */
+	kHIDUsage_PD_PowerSupply = 0x05,			/* CA- Power Supply */
+	/* Reserved 0x06 - 0x0F */
+	kHIDUsage_PD_BatterySystem = 0x10,			/* CP- Battery System power module */
+	kHIDUsage_PD_BatterySystemID = 0x11,		/* SV IF- Battery System ID */
+	kHIDUsage_PD_Battery = 0x12,				/* CP- Battery */
+	kHIDUsage_PD_BatteryID = 0x13,				/* SV IF- Battery ID */
+	kHIDUsage_PD_Charger = 0x14,				/* CP- Charger */
+	kHIDUsage_PD_ChargerID = 0x15,				/* SV IF- Charger ID */
+	kHIDUsage_PD_PowerConverter = 0x16,			/* CP- Power Converter power module */
+	kHIDUsage_PD_PowerConverterID = 0x17,		/* SV IF- Power Converter ID */
+	kHIDUsage_PD_OutletSystem = 0x18,			/* CP- Outlet System power module */
+	kHIDUsage_PD_OutletSystemID = 0x19,			/* SV IF-Outlet System ID */
+	kHIDUsage_PD_Input = 0x1A,					/* CP- Power Device Input */
+	kHIDUsage_PD_InputID = 0x1B,				/* SV IF- Power Device Input ID */
+	kHIDUsage_PD_Output = 0x1C,					/* CP- Power Device Output */
+	kHIDUsage_PD_OutputID = 0x1D,				/* SV IF- Power Device Output ID */
+	kHIDUsage_PD_Flow = 0x1E,					/* CP- Power Device Flow */
+	kHIDUsage_PD_FlowID = 0x1F,					/* Item IF- Power Device Flow ID */
+	kHIDUsage_PD_Outlet = 0x20,					/* CP- Power Device Outlet */
+	kHIDUsage_PD_OutletID = 0x21,				/* SV IF- Power Device Outlet ID */
+	kHIDUsage_PD_Gang = 0x22,					/* CL/CP- Power Device Gang */
+	kHIDUsage_PD_GangID = 0x23,					/* SV IF- Power Device Gang ID */
+	kHIDUsage_PD_PowerSummary = 0x24,			/* CL/CP- Power Device Power Summary */
+	kHIDUsage_PD_PowerSummaryID = 0x25,			/* SV IF- Power Device Power Summary ID */
+	/* Reserved 0x26 - 0x2F */
+	kHIDUsage_PD_Voltage = 0x30,				/* DV IF- Power Device Voltage */
+	kHIDUsage_PD_Current = 0x31,				/* DV IF- Power Device Current */
+	kHIDUsage_PD_Frequency = 0x32,				/* DV IF- Power Device Frequency */
+	kHIDUsage_PD_ApparentPower = 0x33,			/* DV IF- Power Device Apparent Power */
+	kHIDUsage_PD_ActivePower = 0x34,			/* DV IF- Power Device RMS Power */
+	kHIDUsage_PD_PercentLoad = 0x35,			/* DV IF- Power Device Percent Load */
+	kHIDUsage_PD_Temperature = 0x36,			/* DV IF- Power Device Temperature */
+	kHIDUsage_PD_Humidity = 0x37,				/* DV IF- Power Device Humidity */
+	kHIDUsage_PD_BadCount = 0x38,				/* DV IF- Power Device Bad Condition Count */
+	/* Reserved 0x39 - 0x3F */
+	kHIDUsage_PD_ConfigVoltage = 0x40,			/* SV/DV F- Power Device Nominal Voltage */
+	kHIDUsage_PD_ConfigCurrent = 0x41,			/* SV/DV F- Power Device Nominal Current */
+	kHIDUsage_PD_ConfigFrequency = 0x42,		/* SV/DV F- Power Device Nominal Frequency */
+	kHIDUsage_PD_ConfigApparentPower = 0x43,	/* SV/DV F- Power Device Nominal Apparent Power */
+	kHIDUsage_PD_ConfigActivePower = 0x44,		/* SV/DV F- Power Device Nominal RMS Power */
+	kHIDUsage_PD_ConfigPercentLoad = 0x45,		/* SV/DV F- Power Device Nominal Percent Load */
+	kHIDUsage_PD_ConfigTemperature = 0x46,		/* SV/DV F- Power Device Nominal Temperature */
+	kHIDUsage_PD_ConfigHumidity = 0x47,			/* SV/DV F- Power Device Nominal Humidity */
+	/* Reserved 0x48 - 0x4F */
+	kHIDUsage_PD_SwitchOnControl = 0x50,		/* DV F- Power Device Switch On Control */
+	kHIDUsage_PD_SwitchOffControl = 0x51,		/* DV F- Power Device Switch Off Control */
+	kHIDUsage_PD_ToggleControl = 0x52,			/* DV F- Power Device Toogle Sequence Control */
+	kHIDUsage_PD_LowVoltageTransfer = 0x53,		/* DV F- Power Device Min Transfer Voltage */
+	kHIDUsage_PD_HighVoltageTransfer = 0x54,	/* DV F- Power Device Max Transfer Voltage */
+	kHIDUsage_PD_DelayBeforeReboot = 0x55,		/* DV F- Power Device Delay Before Reboot */
+	kHIDUsage_PD_DelayBeforeStartup = 0x56,		/* DV F- Power Device Delay Before Startup */
+	kHIDUsage_PD_DelayBeforeShutdown = 0x57,	/* DV F- Power Device Delay Before Shutdown */
+	kHIDUsage_PD_Test = 0x58,					/* DV F- Power Device Test Request/Result */
+	kHIDUsage_PD_ModuleReset = 0x59,			/* DV F- Power Device Reset Request/Result */
+	kHIDUsage_PD_AudibleAlarmControl = 0x5A,	/* DV F- Power Device Audible Alarm Control */
+	/* Reserved 0x5B - 0x5F */
+	kHIDUsage_PD_Present = 0x60,				/* DV IOF- Power Device Present */
+	kHIDUsage_PD_Good = 0x61,					/* DV IOF- Power Device Good */
+	kHIDUsage_PD_InternalFailure = 0x62,		/* DV IOF- Power Device Internal Failure */
+	kHIDUsage_PD_VoltageOutOfRange = 0x63,		/* DV IOF- Power Device Voltage Out Of Range */
+	kHIDUsage_PD_FrequencyOutOfRange = 0x64,	/* DV IOF- Power Device Frequency Out Of Range */
+	kHIDUsage_PD_Overload = 0x65,				/* DV IOF- Power Device Overload */
+	kHIDUsage_PD_OverCharged = 0x66,			/* DV IOF- Power Device Over Charged */
+	kHIDUsage_PD_OverTemperature = 0x67,		/* DV IOF- Power Device Over Temperature */
+	kHIDUsage_PD_ShutdownRequested = 0x68,		/* DV IOF- Power Device Shutdown Requested */
+	kHIDUsage_PD_ShutdownImminent = 0x69,		/* DV IOF- Power Device Shutdown Imminent */
+	/* Reserved 0x6A */
+	kHIDUsage_PD_SwitchOnOff = 0x6B,			/* DV IOF- Power Device On/Off Switch Status */
+	kHIDUsage_PD_Switchable = 0x6C,				/* DV IOF- Power Device Switchable */
+	kHIDUsage_PD_Used = 0x6D,					/* DV IOF- Power Device Used */
+	kHIDUsage_PD_Boost = 0x6E,					/* DV IOF- Power Device Boosted */
+	kHIDUsage_PD_Buck = 0x6F,					/* DV IOF- Power Device Bucked */
+	kHIDUsage_PD_Initialized = 0x70,			/* DV IOF- Power Device Initialized */
+	kHIDUsage_PD_Tested = 0x71,					/* DV IOF- Power Device Tested */
+	kHIDUsage_PD_AwaitingPower = 0x72,			/* DV IOF- Power Device Awaiting Power */
+	kHIDUsage_PD_CommunicationLost = 0x73,		/* DV IOF- Power Device Communication Lost */
+	/* Reserved 0x74 - 0xFC */
+	kHIDUsage_PD_iManufacturer = 0xFD,			/* SV F- Power Device Manufacturer String Index */
+	kHIDUsage_PD_iProduct = 0xFE,				/* SV F- Power Device Product String Index */
+	kHIDUsage_PD_iserialNumber = 0xFF			/* SV F- Power Device Serial Number String Index */
+};
+
+/* Battery System Page (x85) */
+/* This section provides detailed descriptions of the usages employed by Battery Systems. */	
+enum
+{
+	kHIDUsage_BS_Undefined = 0x00,				/* Battery System Undefined */
+	kHIDUsage_BS_SMBBatteryMode = 0x01,			/* CL - SMB Mode */
+	kHIDUsage_BS_SMBBatteryStatus = 0x02,		/* CL - SMB Status */
+	kHIDUsage_BS_SMBAlarmWarning = 0x03,		/* CL - SMB Alarm Warning */
+	kHIDUsage_BS_SMBChargerMode = 0x04,			/* CL - SMB Charger Mode */
+	kHIDUsage_BS_SMBChargerStatus = 0x05,		/* CL - SMB Charger Status */
+	kHIDUsage_BS_SMBChargerSpecInfo = 0x06,		/* CL - SMB Charger Extended Status */
+	kHIDUsage_BS_SMBSelectorState = 0x07,		/* CL - SMB Selector State */
+	kHIDUsage_BS_SMBSelectorPresets = 0x08,		/* CL - SMB Selector Presets */
+	kHIDUsage_BS_SMBSelectorInfo = 0x09,		/* CL - SMB Selector Info */
+	/* Reserved 0x0A - 0x0F */
+	kHIDUsage_BS_OptionalMfgFunction1 = 0x10,	/* DV F - Battery System Optional SMB Mfg Function 1 */
+	kHIDUsage_BS_OptionalMfgFunction2 = 0x11,	/* DV F - Battery System Optional SMB Mfg Function 2 */
+	kHIDUsage_BS_OptionalMfgFunction3 = 0x12,	/* DV F - Battery System Optional SMB Mfg Function 3 */
+	kHIDUsage_BS_OptionalMfgFunction4 = 0x13,	/* DV F - Battery System Optional SMB Mfg Function 4 */
+	kHIDUsage_BS_OptionalMfgFunction5 = 0x14,	/* DV F - Battery System Optional SMB Mfg Function 5 */
+	kHIDUsage_BS_ConnectionToSMBus = 0x15,		/* DF F - Battery System Connection To System Management Bus */
+	kHIDUsage_BS_OutputConnection = 0x16,		/* DF F - Battery System Output Connection Status */
+	kHIDUsage_BS_ChargerConnection = 0x17,		/* DF F - Battery System Charger Connection */
+	kHIDUsage_BS_BatteryInsertion = 0x18,		/* DF F - Battery System Battery Insertion */
+	kHIDUsage_BS_Usenext = 0x19,				/* DF F - Battery System Use Next */
+	kHIDUsage_BS_OKToUse = 0x1A,				/* DF F - Battery System OK To Use */
+	kHIDUsage_BS_BatterySupported = 0x1B,		/* DF F - Battery System Battery Supported */
+	kHIDUsage_BS_SelectorRevision = 0x1C,		/* DF F - Battery System Selector Revision */
+	kHIDUsage_BS_ChargingIndicator = 0x1D,		/* DF F - Battery System Charging Indicator */
+	/* Reserved 0x1E - 0x27 */
+	kHIDUsage_BS_ManufacturerAccess = 0x28,		/* DV F - Battery System Manufacturer Access */
+	kHIDUsage_BS_RemainingCapacityLimit = 0x29,	/* DV F - Battery System Remaining Capacity Limit */
+	kHIDUsage_BS_RemainingTimeLimit = 0x2A,		/* DV F - Battery System Remaining Time Limit */
+	kHIDUsage_BS_AtRate = 0x2B,					/* DV F - Battery System At Rate... */
+	kHIDUsage_BS_CapacityMode = 0x2C,			/* DV F - Battery System Capacity Mode */
+	kHIDUsage_BS_BroadcastToCharger = 0x2D,		/* DV F - Battery System Broadcast To Charger */
+	kHIDUsage_BS_PrimaryBattery = 0x2E,			/* DV F - Battery System Primary Battery */
+	kHIDUsage_BS_ChargeController = 0x2F,		/* DV F - Battery System Charge Controller */
+	/* Reserved 0x30 - 0x3F */
+	kHIDUsage_BS_TerminateCharge = 0x40,		/* DF IOF - Battery System Terminate Charge */
+	kHIDUsage_BS_TerminateDischarge = 0x41,		/* DF IOF - Battery System Terminate Discharge */
+	kHIDUsage_BS_BelowRemainingCapacityLimit = 0x42, /* DF IOF - Battery System Below Remaining Capacity Limit */
+	kHIDUsage_BS_RemainingTimeLimitExpired = 0x43, /* DF IOF - Battery System Remaining Time Limit Expired */
+	kHIDUsage_BS_Charging = 0x44,				/* DF IOF - Battery System Charging */
+	kHIDUsage_BS_Discharging = 0x45,			/* DV IOF - Battery System Discharging */
+	kHIDUsage_BS_FullyCharged = 0x46,			/* DF IOF - Battery System Fully Charged */
+	kHIDUsage_BS_FullyDischarged = 0x47,		/* DV IOF - Battery System Fully Discharged */
+	kHIDUsage_BS_ConditioningFlag = 0x48,		/* DV IOF - Battery System Conditioning Flag */
+	kHIDUsage_BS_AtRateOK = 0x49,				/* DV IOF - Battery System At Rate OK */
+	kHIDUsage_BS_SMBErrorCode = 0x4A,			/* DF IOF - Battery System SMB Error Code */
+	kHIDUsage_BS_NeedReplacement = 0x4B,		/* DF IOF - Battery System Need Replacement */
+	/* Reserved 0x4C - 0x5F */
+	kHIDUsage_BS_AtRateTimeToFull = 0x60,		/* DV IF - Battery System At Rate Time To Full */
+	kHIDUsage_BS_AtRateTimeToEmpty = 0x61,		/* DV IF - Battery System At Rate Time To Empty */
+	kHIDUsage_BS_AverageCurrent = 0x62,			/* DV IF - Battery System Average Current */
+	kHIDUsage_BS_Maxerror = 0x63,				/* DV IF - Battery System Max Error */
+	kHIDUsage_BS_RelativeStateOfCharge = 0x64,	/* DV IF - Battery System Relative State Of Charge */
+	kHIDUsage_BS_AbsoluteStateOfCharge = 0x65,	/* DV IF - Battery System Absolute State Of Charge */
+	kHIDUsage_BS_RemainingCapacity = 0x66,		/* DV IF - Battery System Remaining Capacity */
+	kHIDUsage_BS_FullChargeCapacity = 0x67,		/* DV IF - Battery System Full Charge Capacity */
+	kHIDUsage_BS_RunTimeToEmpty = 0x68,			/* DV IF - Battery System Run Time To Empty */
+	kHIDUsage_BS_AverageTimeToEmpty = 0x69,		/* DV IF - Battery System Average Time To Empty */
+	kHIDUsage_BS_AverageTimeToFull = 0x6A,		/* DV IF - Battery System Average Time To Full */
+	kHIDUsage_BS_CycleCount = 0x6B,				/* DV IF - Battery System Cycle Count */
+	/* Reserved 0x6C - 0x7F */
+	kHIDUsage_BS_BattPackModelLevel = 0x80,		/* SV F - Battery System Batt Pack Model Level */
+	kHIDUsage_BS_InternalChargeController = 0x81, /* SF F - Battery System Internal Charge Controller */
+	kHIDUsage_BS_PrimaryBatterySupport = 0x82,	/* SF F - Battery System Primary Battery Support */
+	kHIDUsage_BS_DesignCapacity = 0x83,			/* SV F - Battery System Design Capacity */
+	kHIDUsage_BS_SpecificationInfo = 0x84,		/* SV F - Battery System Specification Info */
+	kHIDUsage_BS_ManufacturerDate = 0x85,		/* SV F - Battery System Manufacturer Date */
+	kHIDUsage_BS_SerialNumber = 0x86,			/* SV F - Battery System Serial Number */
+	kHIDUsage_BS_iManufacturerName = 0x87,		/* SV F - Battery System Manufacturer Name Index */
+	kHIDUsage_BS_iDevicename = 0x88,			/* SV F - Battery System Device Name Index */
+	kHIDUsage_BS_iDeviceChemistry = 0x89,		/* SV F - Battery System Device Chemistry Index */
+	kHIDUsage_BS_ManufacturerData = 0x8A,		/* SV F - Battery System Manufacturer Data */
+	kHIDUsage_BS_Rechargable = 0x8B,			/* SV F - Battery System Rechargable */
+	kHIDUsage_BS_WarningCapacityLimit = 0x8C,	/* SV F - Battery System Warning Capacity Limit */
+	kHIDUsage_BS_CapacityGranularity1 = 0x8D,	/* SV F - Battery System Capacity Granularity 1 */
+	kHIDUsage_BS_CapacityGranularity2 = 0x8E,	/* SV F - Battery System Capacity Granularity 2 */
+	kHIDUsage_BS_iOEMInformation = 0x8F,		/* SV F - Battery System OEM Information Index */
+	/* Reserved 0x90 - 0xBF */
+	kHIDUsage_BS_InhibitCharge = 0xC0,			/* DF IOF - Battery System Inhibit Charge */
+	kHIDUsage_BS_EnablePolling = 0xC1,			/* DF IOF - Battery System Enable Polling */
+	kHIDUsage_BS_ResetToZero = 0xC2,			/* DF IOF - Battery System Reset To Zero */
+	/* Reserved 0xC3 - 0xCF */
+	kHIDUsage_BS_ACPresent = 0xD0,				/* DF IOF - Battery System AC Present */
+	kHIDUsage_BS_BatteryPresent = 0xD1,			/* DF IOF - Battery System Battery Present */
+	kHIDUsage_BS_PowerFail = 0xD2,				/* DF IOF - Battery System Power Fail */
+	kHIDUsage_BS_AlarmInhibited = 0xD3,			/* DF IOF - Battery System Alarm Inhibited */
+	kHIDUsage_BS_ThermistorUnderRange = 0xD4,	/* DF IOF - Battery System Thermistor Under Range */
+	kHIDUsage_BS_ThermistorHot = 0xD5,			/* DF IOF - Battery System Thermistor Hot */
+	kHIDUsage_BS_ThermistorCold = 0xD6,			/* DF IOF - Battery System Thermistor Cold */
+	kHIDUsage_BS_ThermistorOverRange = 0xD7,	/* DF IOF - Battery System Thermistor Over Range */
+	kHIDUsage_BS_VoltageOutOfRange = 0xD8,		/* DF IOF - Battery System Voltage Out Of Range */
+	kHIDUsage_BS_CurrentOutOfRange = 0xD9,		/* DF IOF - Battery System Current Out Of Range */
+	kHIDUsage_BS_CurrentNotRegulated = 0xDA,	/* DF IOF - Battery System Current Not Regulated */
+	kHIDUsage_BS_VoltageNotRegulated = 0xDB,	/* DF IOF - Battery System Voltage Not Regulated */
+	kHIDUsage_BS_MasterMode = 0xDC,				/* DF IOF - Battery System Master Mode */
+	/* Reserved 0xDD - 0xEF */
+	kHIDUsage_BS_ChargerSelectorSupport = 0xF0,	/* SF F- Battery System Charger Support Selector */
+	kHIDUsage_BS_ChargerSpec = 0xF1,			/* SF F- Battery System Charger Specification */
+	kHIDUsage_BS_Level2 = 0xF2,					/* SF F- Battery System Charger Level 2 */
+	kHIDUsage_BS_Level3 = 0xF3					/* SF F- Battery System Charger Level 3 */
+	/* Reserved 0xF2 - 0xFF */
+};
+
+/* Bar Code Scanner Page (0x8C) */
+/* This section provides detailed descriptions of the usages employed by Bar Code Scanner Devices. */
+enum
+{
+    kHIDUsage_BCS_Undefined = 0x00,                     /* Bar Code Scanner Undefined Usage */
+    kHIDUsage_BCS_BadgeReader = 0x01,                   /* CA - Bar Code Badge Reader */
+    kHIDUsage_BCS_BarCodeScanner = 0x02,                /* CA -Bar Code Scanner */
+    kHIDUsage_BCS_DumbBarCodeScanner = 0x03,            /* CA -Dumb Bar Code Scanner  Usage */
+    kHIDUsage_BCS_CordlessScannerBase = 0x04,           /* CA -Cordless Base Usage */
+    kHIDUsage_BCS_BarCodeScannerCradle = 0x05,          /* CA -Bar Code Scanner Cradle Usage */
+    /* Reserved 0x06 - 0x0F */
+    kHIDUsage_BCS_AttributeReport = 0x10,               /* CL - Attribute Report */
+    kHIDUsage_BCS_SettingsReport = 0x11,                /* CL - Settings Report */
+    kHIDUsage_BCS_ScannedDataReport = 0x12,             /* CL - Scanned Data Report */
+    kHIDUsage_BCS_RawScannedDataReport = 0x13,          /* CL - Raw Scanned Data Report */
+    kHIDUsage_BCS_TriggerReport = 0x14,                 /* CL - Trigger Report */
+    kHIDUsage_BCS_StatusReport = 0x15,                  /* CL - Status Report */
+    kHIDUsage_BCS_UPC_EANControlReport = 0x16,          /* CL - UPC/EAN Control Report */
+    kHIDUsage_BCS_EAN2_3LabelControlReport = 0x17,      /* CL - EAN 2/3 Label Control Report */
+    kHIDUsage_BCS_Code39ControlReport = 0x18,           /* CL - Code 39 Control Report */
+    kHIDUsage_BCS_Interleaved2of5ControlReport = 0x19,  /* CL - Interleaved 2 of 5 Control Report */
+    kHIDUsage_BCS_Standard2of5ControlReport = 0x1A,     /* CL - Standard 2 of 5 Control Report */
+    kHIDUsage_BCS_MSIPlesseyControlReport = 0x1B,       /* CL - MSI Plessey Control Report */
+    kHIDUsage_BCS_CodabarControlReport = 0x1C,          /* CL - Codabar Control Report */
+    kHIDUsage_BCS_Code128ControlReport = 0x1D,          /* CL - Code 128 Control Report */
+    kHIDUsage_BCS_Misc1DControlReport = 0x1E,           /* CL - Misc 1D Control Report */
+    kHIDUsage_BCS_2DControlReport = 0x1F,               /* CL - 2D Control Report */
+    /* Reserved 0x20 - 0x2F */
+    kHIDUsage_BCS_Aiming_PointerMide = 0x30,            /* SF - Aiming Pointer Mode */
+    kHIDUsage_BCS_BarCodePresentSensor = 0x31,          /* SF - Bar Code Present Sensor */
+    kHIDUsage_BCS_Class1ALaser = 0x32,                  /* SF - Class 1A Laser */
+    kHIDUsage_BCS_Class2Laser = 0x33,                   /* SF - Class 2 Laser */
+    kHIDUsage_BCS_HeaterPresent = 0x34,                 /* SF - Heater Present */
+    kHIDUsage_BCS_ContactScanner = 0x35,                /* SF - Contact Scanner */
+    kHIDUsage_BCS_ElectronicArticleSurveillanceNotification = 0x36, /* SF - Electronic Article Surveillance Notification */
+    kHIDUsage_BCS_ConstantElectronicArticleSurveillance = 0x37, /* SF - Constant Electronic Article Surveillance */
+    kHIDUsage_BCS_ErrorIndication = 0x38,               /* SF - Error Indication */
+    kHIDUsage_BCS_FixedBeeper = 0x39,                   /* SF - Fixed Beeper */
+    kHIDUsage_BCS_GoodDecodeIndication = 0x3A,          /* SF - Good Decode Indication */
+    kHIDUsage_BCS_HandsFreeScanning = 0x3B,             /* SF - Hands Free Scanning */
+    kHIDUsage_BCS_IntrinsicallySafe = 0x3C,             /* SF - Intrinsically Safe */
+    kHIDUsage_BCS_KlasseEinsLaser = 0x3D,               /* SF - Klasse Eins Laser */
+    kHIDUsage_BCS_LongRangeScanner = 0x3E,              /* SF - Long Range Scanner */
+    kHIDUsage_BCS_MirrorSpeedControl = 0x3F,            /* SF - Mirror Speed Control */
+    kHIDUsage_BCS_NotOnFileIndication = 0x40,           /* SF - Not On File Indication */
+    kHIDUsage_BCS_ProgrammableBeeper = 0x41,            /* SF - Programmable Beeper */
+    kHIDUsage_BCS_Triggerless = 0x42,                   /* SF - Triggerless */
+    kHIDUsage_BCS_Wand = 0x43,                          /* SF - Wand */
+    kHIDUsage_BCS_WaterResistant = 0x44,                /* SF - Water Resistant */
+    kHIDUsage_BCS_MultiRangeScanner = 0x45,             /* SF - Multi-Range Scanner */
+    kHIDUsage_BCS_ProximitySensor = 0x46,               /* SF - Proximity Sensor */
+    /* Reserved 0x47 - 0x4C */
+    kHIDUsage_BCS_FragmentDecoding = 0x4D,              /* DF - Fragment Decoding */
+    kHIDUsage_BCS_ScannerReadConfidence = 0x4E,         /* DV - Scanner Read Confidence */
+    kHIDUsage_BCS_DataPrefix = 0x4F,                    /* NAry - Data Prefix  */
+    kHIDUsage_BCS_PrefixAIMI = 0x50,                    /* SEL - Prefix AIMI */
+    kHIDUsage_BCS_PrefixNone = 0x51,                    /* SEL - Prefix None */
+    kHIDUsage_BCS_PrefixProprietary = 0x52,             /* SEL - Prefix Proprietary */
+    /* Reserved 0x53 - 0x54 */
+    kHIDUsage_BCS_ActiveTime = 0x55,                    /* DV - Active Time */
+    kHIDUsage_BCS_AimingLaserPattern = 0x56,            /* DF - Aiming Laser Pattern */
+    kHIDUsage_BCS_BarCodePresent = 0x57,                /* OOC - Bar Code Present */
+    kHIDUsage_BCS_BeeperState = 0x58,                   /* OOC - Beeper State */
+    kHIDUsage_BCS_LaserOnTime = 0x59,                   /* DV - Laser On Time */
+    kHIDUsage_BCS_LaserState = 0x5A,                    /* OOC - Laser State */
+    kHIDUsage_BCS_LockoutTime = 0x5B,                   /* DV - Lockout Time */
+    kHIDUsage_BCS_MotorState = 0x5C,                    /* OOC - Motor State */
+    kHIDUsage_BCS_MotorTimeout = 0x5D,                  /* DV - Motor Timeout */
+    kHIDUsage_BCS_PowerOnResetScanner = 0x5E,           /* DF - Power On Reset Scanner */
+    kHIDUsage_BCS_PreventReadOfBarcodes = 0x5F,         /* DF - Prevent Read of Barcodes */
+    kHIDUsage_BCS_InitiateBarcodeRead = 0x60,           /* DF - Initiate Barcode Read */
+    kHIDUsage_BCS_TriggerState = 0x61,                  /* DF - Trigger State */
+    kHIDUsage_BCS_TriggerMode = 0x62,                   /* NAry - Trigger Mode */
+    kHIDUsage_BCS_TriggerModeBlinkingLaserOn = 0x63,    /* SEL - Trigger Mode Blinking Laser On */
+    kHIDUsage_BCS_TriggerModeContinuousLaserOn = 0x64,  /* SEL - Trigger Mode Continuous Laser On */
+    kHIDUsage_BCS_TriggerModeLaserOnWhilePulled = 0x65, /* SEL - Trigger Mode Laser on while Pulled */
+    kHIDUsage_BCS_TriggerModeLaserStaysOnAfterTriggerRelease = 0x66, /* SEL - Trigger Mode Laser stays on after Trigger Release */
+    /* Reserved 0x67 - 0x6C */
+    kHIDUsage_BCS_CommitParametersToNVM = 0x6D,         /* DF - Commit Parameters to NVM */
+    kHIDUsage_BCS_ParameterScanning = 0x6E,             /* DF - Parameter Scanning */
+    kHIDUsage_BCS_ParametersChanged = 0x6F,             /* OOC - Parameters Changed */
+    kHIDUsage_BCS_SetParameterDefaultValues = 0x70,     /* DF - Set parameter default values */
+    /* Reserved 0x71 - 0x74 */
+    kHIDUsage_BCS_ScannerInCradle = 0x75,               /* OOC - Scanner In Cradle */
+    kHIDUsage_BCS_ScannerInRange = 0x76,                /* OOC - Scanner In Range */
+    /* Reserved 0x77 - 0x79 */
+    kHIDUsage_BCS_AimDuration = 0x7A,                   /* DV - Aim Duration */
+    kHIDUsage_BCS_GoodReadLampDuration = 0x7B,          /* DV - Good Read Lamp Duration */
+    kHIDUsage_BCS_GoodReadLampIntensity = 0x7C,         /* DV - Good Read Lamp Intensity */
+    kHIDUsage_BCS_GoodReadLED = 0x7D,                   /* DF - Good Read LED */
+    kHIDUsage_BCS_GoodReadToneFrequency = 0x7E,         /* DV - Good Read Tone Frequency*/
+    kHIDUsage_BCS_GoodReadToneLength = 0x7F,            /* DV - Good Read Tone Length */
+    kHIDUsage_BCS_GoodReadToneVolume = 0x80,            /* DV - Good Read Tone Volume */
+    /* Reserved 0x81 */
+    kHIDUsage_BCS_NoReadMessage = 0x82,                 /* DF - No Read Message */
+    kHIDUsage_BCS_NotOnFileVolume = 0x83,               /* DV - Not on File Volume */
+    kHIDUsage_BCS_PowerupBeep = 0x84,                   /* DF - Powerup Beep */
+    kHIDUsage_BCS_SoundErrorBeep = 0x85,               /* DF - Sound Error Beep */
+    kHIDUsage_BCS_SoundGoodReadBeep = 0x86,             /* DF - Sound Good Read Beep */
+    kHIDUsage_BCS_SoundNotOnFileBeep = 0x87,            /* DF - Sound Not On File Beep */
+    kHIDUsage_BCS_GoodReadWhenToWrite = 0x88,           /* NArry - Good Read When to Write */
+    kHIDUsage_BCS_GRWTIAfterDecode = 0x89,              /* SEL - GRWTI After Decode */
+    kHIDUsage_BCS_GRWTIBeep_LampAfterTransmit = 0x8A,   /* SEL - GRWTI Beep/Lamp after transmit */
+    kHIDUsage_BCS_GRWTINoBeep_LampUseAtAll = 0x8B,      /* SEL - GRWTI No Beep/Lamp at all */
+    /* Reserved 0x8C - 0x90 */
+    kHIDUsage_BCS_BooklandEAN = 0x91,                   /* DF - Bookland EAN */
+    kHIDUsage_BCS_ConvertEAN8To13Type = 0x92,           /* DF - Convert EAN 8 to 13 Type */
+    kHIDUsage_BCS_ConvertUPCAToEAN_13 = 0x93,           /* DF - Convert UPC A to EAN-13 */
+    kHIDUsage_BCS_ConvertUPC_EToA = 0x94,               /* DF - Convert UPC-E to A */
+    kHIDUsage_BCS_EAN_13 = 0x95,                        /* DF - EAN-13 */
+    kHIDUsage_BCS_EAN_8 = 0x96,                         /* DF - EAN_8 */
+    kHIDUsage_BCS_EAN_99_128_Mandatory  = 0x97,         /* DF - EAN-99 128_Mandatory  */
+    kHIDUsage_BCS_EAN_99_P5_128_Optional = 0x98,        /* DF - EAN-99 P5/128_Optional */
+    /* Reserved 0x99 */
+    kHIDUsage_BCS_UPC_EAN = 0x9A,                       /* DF - UPC/EAN */
+    kHIDUsage_BCS_UPC_EANCouponCode = 0x9B,             /* DF - UPC/EAN Coupon Code */
+    kHIDUsage_BCS_UPC_EANPeriodicals = 0x9C,            /* DV - UPC/EAN Periodicals */
+    kHIDUsage_BCS_UPC_A = 0x9D,                         /* DF - UPC-A */
+    kHIDUsage_BCS_UPC_AWith128Mandatory = 0x9E,         /* DF - UPC-A with 128 Mandatory */
+    kHIDUsage_BCS_UPC_AWith128Optical = 0x9F,           /* DF - UPC-A with 128 Optical */
+    kHIDUsage_BCS_UPC_AWithP5Optional = 0xA0,           /* DF - UPC-A with P5 Optional */
+    kHIDUsage_BCS_UPC_E = 0xA1,                         /* DF - UPC-E */
+    kHIDUsage_BCS_UPC_E1 = 0xA2,                        /* DF - UPC-E1 */
+    /* Reserved 0xA3 - 0xA8 */
+    kHIDUsage_BCS_Periodical = 0xA9,                    /* NArry - Periodical */
+    kHIDUsage_BCS_PeriodicalAutoDiscriminatePlus2 = 0xAA,/* SEL - Periodical Auto-Discriminate + 2 */
+    kHIDUsage_BCS_PeriodicalOnlyDecodeWithPlus2 = 0xAB, /* SEL - Periodical Only Decode with + 2 */
+    kHIDUsage_BCS_PeriodicalIgnorePlus2 = 0xAC,         /* SEL - Periodical Ignore + 2 */
+    kHIDUsage_BCS_PeriodicalAutoDiscriminatePlus5 = 0xAD,/* SEL - Periodical Auto-Discriminate + 5 */
+    kHIDUsage_BCS_PeriodicalOnlyDecodeWithPlus5 = 0xAE, /* SEL - Periodical Only Decode with + 5 */
+    kHIDUsage_BCS_PeriodicalIgnorePlus5 = 0xAF,         /* SEL - Periodical Ignore + 5 */
+    kHIDUsage_BCS_Check = 0xB0,                         /* NArry - Check */
+    kHIDUsage_BCS_CheckDisablePrice = 0xB1,             /* SEL - Check Disable Price */
+    kHIDUsage_BCS_CheckEnable4DigitPrice = 0xB2,        /* SEL - Check Enable 4 digit Price */
+    kHIDUsage_BCS_CheckEnable5DigitPrice = 0xB3,        /* SEL - Check Enable 5 digit Price */
+    kHIDUsage_BCS_CheckEnableEuropean4DigitPrice = 0xB4,/* SEL - Check Enable European 4 digit Price */
+    kHIDUsage_BCS_CheckEnableEuropean5DigitPrice = 0xB5,/* SEL - Check Enable European 5 digit Price */
+    /* Reserved 0xB6 */
+    kHIDUsage_BCS_EANTwoLabel = 0xB7,                   /* DF - EAN Two Label  */
+    kHIDUsage_BCS_EANThreeLabel  = 0xB8,                /* DF - EAN Thread Label */
+    kHIDUsage_BCS_EAN8FlagDigit1 = 0xB9,                /* DV - EAN 8 Flag Digit 1 */
+    kHIDUsage_BCS_EAN8FlagDigit2 = 0xBA,                /* DV - EAN 8 Flag Digit 2 */
+    kHIDUsage_BCS_EAN8FlagDigit3 = 0xBB,                /* DV - EAN 8 Flag Digit 3 */
+    kHIDUsage_BCS_EAN13FlagDigit1 = 0xBC,               /* DV - EAN 13 Flag Digit 1 */
+    kHIDUsage_BCS_EAN13FlagDigit2 = 0xBD,               /* DV - EAN 13 Flag Digit 2 */
+    kHIDUsage_BCS_EAN13FlagDigit3 = 0xBE,               /* DV - EAN 13 Flag Digit 3 */
+    kHIDUsage_BCS_AddEAN2_3LabelDefinition = 0xBF,      /* DF - Add EAN 2/3 Label Definition */
+    kHIDUsage_BCS_ClearAllEAN2_3LabelDefinitions = 0xC0,/* DF - Clear all EAN 2/3 Label Definitions */
+    /* Reserved 0xC1 - 0xC2 */
+    kHIDUsage_BCS_Codabar = 0xC3,                       /* DF - Codabar */
+    kHIDUsage_BCS_Code128 = 0xC4,                       /* DF - Code 128 */
+    /* Reserved 0xC5 - 0xC6 */
+    kHIDUsage_BCS_Code39 = 0xC7,                        /* DF - Code 39 */
+    kHIDUsage_BCS_Code93 = 0xC8,                        /* DF - Code 93 */
+    kHIDUsage_BCS_FullASCIIConversion = 0xC9,           /* DF - Full ASCII Conversion */
+    kHIDUsage_BCS_Interleaved2of5 = 0xCA,               /* DF - Interleaved 2 of 5 */
+    kHIDUsage_BCS_ItalianPharmacyCode = 0xCB,           /* DF - Italian Pharmacy Code */
+    kHIDUsage_BCS_MSI_Plessey = 0xCC,                   /* DF - MSI/Plessey */
+    kHIDUsage_BCS_Standard2of5IATA = 0xCD,              /* DF - Standard 2 of 5 IATA */
+    kHIDUsage_BCS_Standard2of5 = 0xCE,                  /* DF - Standard 2 of 5 */
+    /* Reserved 0xCF - 0xD2 */
+    kHIDUsage_BCS_TransmitStart_Stop = 0xD3,            /* DF - Transmit Start/Stop */
+    kHIDUsage_BCS_TriOptic = 0xD4,                      /* DF - Tri-Optic  */
+    kHIDUsage_BCS_UCC_EAN_128 = 0xD5,                   /* DF - UCC/EAN-128  */
+    kHIDUsage_BCS_CheckDigit = 0xD6,                    /* NArry - Check Digit */
+    kHIDUsage_BCS_CheckDigitDisable = 0xD7,             /* SEL - Check Digit Disable */
+    kHIDUsage_BCS_CheckDigitEnableInterleaved2of5OPCC = 0xD8, /* SEL - Check Digit Enable Interleaved 2 of 5 OPCC */
+    kHIDUsage_BCS_CheckDigitEnableInterleaved2of5USS = 0xD9, /* SEL - Check Digit Enable Interleaved 2 of 5 USS */
+    kHIDUsage_BCS_CheckDigitEnableStandard2of5OPCC = 0xD8, /* SEL - Check Digit Enable Standard 2 of 5 OPCC */
+    kHIDUsage_BCS_CheckDigitEnableStandard2of5USS = 0xD9, /* SEL - Check Digit Enable Standard 2 of 5 USS */
+    kHIDUsage_BCS_CheckDigitEnableOneMSIPlessey = 0xDC, /* SEL - Check Digit Enable One MSI Plessey */
+    kHIDUsage_BCS_CheckDigitEnableTwoMSIPlessey = 0xDD, /* SEL - Check Digit Enable Two MSI Plessey */
+    kHIDUsage_BCS_CheckDigitCodabarEnable = 0xDE,       /* SEL - Check Digit Codabar Enable */
+    kHIDUsage_BCS_CheckDigitCode99Enable = 0xDF,        /* SEL - Check Digit Code 99 Enable */
+    /* Reserved 0xE0 - 0xEF */
+    kHIDUsage_BCS_TransmitCheckDigit = 0xF0,            /* NArry - Transmit Check Digit */
+    kHIDUsage_BCS_DisableCheckDigitTransmit = 0xF1,     /* SEL - Disable Check Digit Transmit */
+    kHIDUsage_BCS_EnableCheckDigitTransmit = 0xF2,      /* SEL - Enable Check Digit Transmit */
+    /* Reserved 0xF3 - 0xFA */
+    kHIDUsage_BCS_SymbologyIdentifier1 = 0xFB,          /* DV - Symbology Identifier 1 */
+    kHIDUsage_BCS_SymbologyIdentifier2 = 0xFC,          /* DV - Symbology Identifier 2 */
+    kHIDUsage_BCS_SymbologyIdentifier3 = 0xFD,          /* DV - Symbology Identifier 3 */
+    kHIDUsage_BCS_DecodedData = 0xFE,                   /* DV - Decoded Data */
+    kHIDUsage_BCS_DecodeDataContinued = 0xFF,           /* DF - Decode Data Continued */
+    kHIDUsage_BCS_BarSpaceData = 0x100,                 /* DV - Bar Space Data */
+    kHIDUsage_BCS_ScannerDataAccuracy = 0x101,          /* DV - Scanner Data Accuracy */
+    kHIDUsage_BCS_RawDataPolarity = 0x102,              /* NArry - Raw Data Polarity */
+    kHIDUsage_BCS_PolarityInvertedBarCode = 0x103,      /* SEL - Polarity Inverted Bar Code */
+    kHIDUsage_BCS_PolarityNormalBarCode = 0x103,        /* SEL - Polarity Normal Bar Code */
+    /* Reserved 0x105 */
+    kHIDUsage_BCS_MinimumLengthToDecode = 0x106,        /* DV - Minimum Length to Decode */
+    kHIDUsage_BCS_MaximumLengthToDecode = 0x107,        /* DV - Maximum Length to Decode */
+    kHIDUsage_BCS_FirstDiscreteLengthToDecode = 0x108,  /* DV - First Discrete Length to Decode */
+    kHIDUsage_BCS_SecondDiscreteLengthToDecode = 0x109, /* DV - Second Discrete Length to Decode */
+    kHIDUsage_BCS_DataLengthMethod = 0x10A,             /* NArry - Data Length Method */
+    kHIDUsage_BCS_DLMethodReadAny = 0x10B,              /* DF - DL Method Read any */
+    kHIDUsage_BCS_DLMethodCheckInRange = 0x10C,         /* DF - DL Method Check in Range */
+    kHIDUsage_BCS_DLMethodCheckForDiscrete = 0x10D,     /* DF - DL Method Check for Discrete */
+    /* Reserved 0x10E - 0x10F */
+    kHIDUsage_BCS_AztecCode = 0x110,                    /* DF - Aztec Code */
+    kHIDUsage_BCS_BC412 = 0x111,                        /* DF - BC412 */
+    kHIDUsage_BCS_ChannelCode = 0x112,                  /* DF - Channel Code */
+    kHIDUsage_BCS_Code16 = 0x113,                       /* DF - Code 16 */
+    kHIDUsage_BCS_Code32 = 0x114,                       /* DF - Code 32 */
+    kHIDUsage_BCS_Code49 = 0x115,                       /* DF - Code 49 */
+    kHIDUsage_BCS_CodeOne = 0x116,                      /* DF - Code One */
+    kHIDUsage_BCS_Colorcode = 0x117,                    /* DF - Colorcode */
+    kHIDUsage_BCS_DataMatrix = 0x118,                   /* DF - Data Matrix */
+    kHIDUsage_BCS_MaxiCode = 0x119,                     /* DF - MaxiCode */
+    kHIDUsage_BCS_MicroPDF = 0x11A,                     /* DF - MicroPDF */
+    kHIDUsage_BCS_PDF_417 = 0x11B,                      /* DF - PDF-417 */
+    kHIDUsage_BCS_PosiCode = 0x11C,                     /* DF - PosiCode */
+    kHIDUsage_BCS_QRCode = 0x11D,                       /* DF - QR Code */
+    kHIDUsage_BCS_SuperCode = 0x11E,                    /* DF - SuperCode */
+    kHIDUsage_BCS_UltraCode = 0x11F,                    /* DF - UltraCode */
+    kHIDUsage_BCS_USB_5_SlugCode = 0x120,               /* DF - USD-5 (Slug Code) */
+    kHIDUsage_BCS_VeriCode = 0x121                      /* DF - VeriCode */
+    /* Reserved 0x122 - 0xFFFF */
+};
+
+/* Weighing Devices Page (0x8D) */
+/* This section provides detailed descriptions of the usages employed by Weighing Devices. */
+enum
+{
+    kHIDUsage_WD_Undefined = 0x00,                      /* Weighing Device Undefined Usage */
+    kHIDUsage_WD_WeighingDevice = 0x01,                 /* CA - Weighing Device */
+    /* Reserved 0x02 - 0x1F */
+    kHIDUsage_WD_ScaleScaleDevice = 0x20,               /* CL - Scale Device */
+    kHIDUsage_WD_ScaleScaleClassIMetricCL = 0x21,       /* CL - Scale Class I Metric */
+    kHIDUsage_WD_ScaleScaleClassIMetric = 0x22,         /* SEL - Scale Class I Metric */
+    kHIDUsage_WD_ScaleScaleClassIIMetric = 0x23,        /* SEL - Scale Class II Metric */
+    kHIDUsage_WD_ScaleScaleClassIIIMetric = 0x24,       /* SEL - Scale Class III Metric */
+    kHIDUsage_WD_ScaleScaleClassIIILMetric = 0x25,      /* SEL - Scale Class IIIL Metric */
+    kHIDUsage_WD_ScaleScaleClassIVMetric = 0x26,        /* SEL - Scale Class IV Metric */
+    kHIDUsage_WD_ScaleScaleClassIIIEnglish = 0x27,      /* SEL - Scale Class III English */
+    kHIDUsage_WD_ScaleScaleClassIIILEnglish = 0x28,     /* SEL - Scale Class IIIL English */
+    kHIDUsage_WD_ScaleScaleClassIVEnglish = 0x29,       /* SEL - Scale Class IV English */
+    kHIDUsage_WD_ScaleScaleClassGeneric = 0x2A,         /* SEL - Scale Class Generic */
+    /* Reserved 0x2B - 0x2F */
+    kHIDUsage_WD_ScaleAtrributeReport = 0x30,           /* CL - Scale Attribute Report */
+    kHIDUsage_WD_ScaleControlReport = 0x31,             /* CL - Scale Control Report */
+    kHIDUsage_WD_ScaleDataReport = 0x32,                /* CL - Scale Data Report */
+    kHIDUsage_WD_ScaleStatusReport = 0x33,              /* CL - Scale Status Report */
+    kHIDUsage_WD_ScaleWeightLimitReport = 0x34,         /* CL - Scale Weight Limit Report */
+    kHIDUsage_WD_ScaleStatisticsReport = 0x35,          /* CL - Scale Statistics Report */
+    /* Reserved 0x36 - 0x3F */
+    kHIDUsage_WD_DataWeight = 0x40,                     /* DV - Data Weight */
+    kHIDUsage_WD_DataScaling = 0x41,                    /* DV - Data Scaling */
+    /* Reserved 0x42 - 0x4F */
+    kHIDUsage_WD_WeightUnit = 0x50,                     /* CL - Weight Unit */
+    kHIDUsage_WD_WeightUnitMilligram = 0x51,            /* SEL - Weight Unit Milligram */
+    kHIDUsage_WD_WeightUnitGram = 0x52,                 /* SEL - Weight Unit Gram */
+    kHIDUsage_WD_WeightUnitKilogram = 0x53,             /* SEL - Weight Unit Kilogram */
+    kHIDUsage_WD_WeightUnitCarats = 0x54,               /* SEL - Weight Unit Carats */
+    kHIDUsage_WD_WeightUnitTaels = 0x55,                /* SEL - Weight Unit Taels */
+    kHIDUsage_WD_WeightUnitGrains = 0x56,               /* SEL - Weight Unit Grains */
+    kHIDUsage_WD_WeightUnitPennyweights = 0x57,         /* SEL - Weight Unit Pennyweights */
+    kHIDUsage_WD_WeightUnitMetricTon = 0x58,            /* SEL - Weight Unit Metric Ton */
+    kHIDUsage_WD_WeightUnitAvoirTon = 0x59,             /* SEL - Weight Unit Avoir Ton */
+    kHIDUsage_WD_WeightUnitTroyOunce = 0x5A,            /* SEL - Weight Unit Troy Ounce */
+    kHIDUsage_WD_WeightUnitOunce = 0x5B,                /* SEL - Weight Unit Ounce */
+    kHIDUsage_WD_WeightUnitPound = 0x5C,                /* SEL - Weight Unit Pound */
+    /* Reserved 0x5D - 0x5F */
+    kHIDUsage_WD_CalibrationCount = 0x60,               /* DV - Calibration Count */
+    kHIDUsage_WD_RezeroCount = 0x61,                    /* DV - Re-Zero Count*/
+    /* Reserved 0x62 - 0x6F */
+    kHIDUsage_WD_ScaleStatus = 0x70,                    /* CL - Scale Status */
+    kHIDUsage_WD_ScaleStatusFault = 0x71,               /* SEL - Scale Status Fault */
+    kHIDUsage_WD_ScaleStatusStableAtZero = 0x72,        /* SEL - Scale Status Stable at Center of  Zero */
+    kHIDUsage_WD_ScaleStatusInMotion = 0x73,            /* SEL - Scale Status In Motion */
+    kHIDUsage_WD_ScaleStatusWeightStable = 0x74,        /* SEL - Scale Status Weight Stable */
+    kHIDUsage_WD_ScaleStatusUnderZero = 0x75,           /* SEL - Scale Status Under Zero */
+    kHIDUsage_WD_ScaleStatusOverWeightLimit = 0x76,     /* SEL - Scale Status Over Weight Limit */
+    kHIDUsage_WD_ScaleStatusRequiresCalibration = 0x77, /* SEL - Scale Status Requires Calibration */
+    kHIDUsage_WD_ScaleStatusRequiresRezeroing = 0x78,   /* SEL - Scale Status Requires Re-zeroing */
+    /* Reserved 0x79 - 0x7F */
+    kHIDUsage_WD_ZeroScale = 0x80,                      /* OOC - Zero Scale */
+    kHIDUsage_WD_EnforcedZeroReturn = 0x81              /* OOC - Enforced Zero Return */
+    /* Reserved 0x82 - 0xFFFF */
+    
+};
+
+/* Magnetic Stripe Reader Page (0x8E) */
+/* This section provides detailed descriptions of the usages employed by Magnetic Stripe Reader Devices. */
+enum 
+{
+    kHIDUsage_MSR_Undefined = 0x00,                     /* MagStripe Undefined Usage */
+    kHIDUsage_MSR_DeviceReadOnly = 0x01,                /* CA - MSR Device Read-Only */
+    /* Reserved 0x02 - 0x10 */
+    kHIDUsage_MSR_Track1Length = 0x11,                     /* SF, DF, SEL - Track 1 Length */
+    kHIDUsage_MSR_Track2Length = 0x12,                     /* SF, DF, SEL - Track 2 Length */
+    kHIDUsage_MSR_Track3Length = 0x13,                     /* SF, DF, SEL - Track 3 Length */
+    kHIDUsage_MSR_TrackJISLength = 0x14,                   /* SF, DF, SEL - Track JIS Length */
+    /* Reserved 0x15 - 0x1F */
+    kHIDUsage_MSR_TrackData = 0x20,                        /* SF, DF, SEL - Track Data */
+    kHIDUsage_MSR_Track1Data = 0x21,                       /* SF, DF, SEL - Track 1 Data */
+    kHIDUsage_MSR_Track2Data = 0x22,                       /* SF, DF, SEL - Track 2 Data */
+    kHIDUsage_MSR_Track3Data = 0x23,                       /* SF, DF, SEL - Track 3 Data */
+    kHIDUsage_MSR_TrackJISData = 0x24                      /* SF, DF, SEL - Track JIS Data */
+    /* Reserved 0x25 - 0xFFFF */
+};
+
+#endif /* _IOHIDUSAGETABLES_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIDevice.h b/i386/include/IOKit/hidsystem/IOHIDevice.h
new file mode 100644
index 0000000..bb705a8
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOHIDevice.h
@@ -0,0 +1,71 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2009 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/* 	Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved. 
+ *
+ * IOHIDevice.h - Common Event Source object class.
+ *
+ * HISTORY
+ * 22 May 1992    Mike Paquette at NeXT
+ *      Created. 
+ * 4  Aug 1993	  Erik Kay at NeXT
+ *	API cleanup
+ * 5  Aug 1993	  Erik Kay at NeXT
+ *	added ivar space for future expansion
+ */
+
+#ifndef _IOHIDEVICE_H
+#define _IOHIDEVICE_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOLocks.h>
+
+typedef enum {
+  kHIUnknownDevice          = 0,
+  kHIKeyboardDevice         = 1,
+  kHIRelativePointingDevice = 2
+} IOHIDKind;
+
+class IOHIDevice : public IOService
+{
+  OSDeclareDefaultStructors(IOHIDevice);
+
+public:
+  virtual bool init(OSDictionary * properties = 0);
+  virtual void free();
+  virtual bool start(IOService * provider);
+  virtual bool open(  IOService *    forClient,
+                      IOOptionBits   options = 0,
+                      void *         arg = 0 );
+
+  virtual UInt32    deviceType();
+  virtual IOHIDKind hidKind();
+  virtual UInt32    interfaceID();
+  virtual bool 	    updateProperties(void);
+  virtual IOReturn  setProperties( OSObject * properties );
+  virtual IOReturn  setParamProperties(OSDictionary * dict);
+  virtual UInt64    getGUID();
+  
+  static SInt32		GenerateKey(OSObject *object);
+};
+
+#endif /* !_IOHIDEVICE_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIKeyboard.h b/i386/include/IOKit/hidsystem/IOHIKeyboard.h
new file mode 100644
index 0000000..f6db152
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOHIKeyboard.h
@@ -0,0 +1,268 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/* 	Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved. 
+ *
+ * EventSrcPCKeyboard.h - PC Keyboard EventSrc subclass definition
+ *
+ * HISTORY
+ * 28 Aug 1992    Joe Pasqua
+ *      Created. 
+ */
+
+#ifndef _IOHIKEYBOARD_H
+#define _IOHIKEYBOARD_H
+
+#include <IOKit/hidsystem/IOHIDevice.h>
+#include <IOKit/hidsystem/IOHIKeyboardMapper.h>
+
+/* Start Action Definitions */
+
+/*
+ * HISTORICAL NOTE:
+ *   The following entry points were part of the IOHIKeyboardEvents
+ *   protocol.
+ */
+
+typedef void (*KeyboardEventAction)(       OSObject * target,
+                    /* eventFlags  */      unsigned   eventType,
+                    /* flags */            unsigned   flags,
+                    /* keyCode */          unsigned   key,
+                    /* charCode */         unsigned   charCode,
+                    /* charSet */          unsigned   charSet,
+                    /* originalCharCode */ unsigned   origCharCode,
+                    /* originalCharSet */  unsigned   origCharSet,
+                    /* keyboardType */     unsigned   keyboardType,
+                    /* repeat */           bool       repeat,
+                    /* atTime */           AbsoluteTime ts);
+
+typedef void (*KeyboardSpecialEventAction)(OSObject * target,
+                    /* eventType */        unsigned   eventType,
+                    /* flags */            unsigned   flags,
+                    /* keyCode */          unsigned   key,
+                    /* specialty */        unsigned   flavor,
+                    /* source id */        UInt64     guid,
+                    /* repeat */           bool       repeat,
+                    /* atTime */           AbsoluteTime ts);
+
+typedef void (*UpdateEventFlagsAction)(    OSObject * target,
+                     /* flags */           unsigned   flags);
+
+/* Event Callback Definitions */
+
+typedef void (*KeyboardEventCallback)(
+                    /* target */           OSObject * target,
+                    /* eventFlags  */      unsigned   eventType,
+                    /* flags */            unsigned   flags,
+                    /* keyCode */          unsigned   key,
+                    /* charCode */         unsigned   charCode,
+                    /* charSet */          unsigned   charSet,
+                    /* originalCharCode */ unsigned   origCharCode,
+                    /* originalCharSet */  unsigned   origCharSet,
+                    /* keyboardType */     unsigned   keyboardType,
+                    /* repeat */           bool       repeat,
+                    /* atTime */           AbsoluteTime ts,
+                    /* sender */           OSObject * sender,
+                    /* refcon */           void *     refcon);
+
+typedef void (*KeyboardSpecialEventCallback)(
+                    /* target */           OSObject * target,
+                    /* eventType */        unsigned   eventType,
+                    /* flags */            unsigned   flags,
+                    /* keyCode */          unsigned   key,
+                    /* specialty */        unsigned   flavor,
+                    /* source id */        UInt64     guid,
+                    /* repeat */           bool       repeat,
+                    /* atTime */           AbsoluteTime ts,
+                    /* sender */           OSObject * sender,
+                    /* refcon */           void *     refcon);
+                    
+typedef void (*UpdateEventFlagsCallback)(
+                    /* target */           OSObject * target,
+                    /* flags */            unsigned   flags,
+                    /* sender */           OSObject * sender,
+                    /* refcon */           void *     refcon);
+
+/* End Action Definitions */
+
+
+
+/* Default key repeat parameters */
+#define EV_DEFAULTINITIALREPEAT 500000000ULL    // 1/2 sec in nanoseconds
+#define EV_DEFAULTKEYREPEAT     83333333ULL     // 1/12 sec in nanoseconds
+#define EV_MINKEYREPEAT         16700000ULL     // 1/60 sec
+
+class IOHIKeyboard : public IOHIDevice
+{
+    OSDeclareDefaultStructors(IOHIKeyboard);
+
+    friend class IOHIDKeyboardDevice;
+	friend class IOHIDKeyboard;
+	friend class IOHIDConsumer;
+
+protected:
+    IOLock *	         _deviceLock;	// Lock for all device access
+    IOHIKeyboardMapper * _keyMap;	// KeyMap instance
+
+    // The following fields describe the kind of keyboard
+    UInt32		_interfaceType;
+    UInt32		_deviceType;
+
+    // The following fields describe the state of the keyboard
+    UInt32 *	_keyState;		// kbdBitVector
+    IOByteCount _keyStateSize;		// kbdBitVector allocated size
+    unsigned	_eventFlags;		// Current eventFlags
+    bool	_alphaLock;		// true means alpha lock is on
+    bool	_numLock;		// true means num lock is on
+    bool	_charKeyActive;		// true means char gen. key active
+
+    // The following fields are used in performing key repeats
+    bool 	_isRepeat;		// true means we're generating repeat
+    unsigned	_codeToRepeat;		// What we are repeating
+    bool	_calloutPending;	// true means we've sched. a callout
+    AbsoluteTime	_lastEventTime;		// Time last event was dispatched
+    AbsoluteTime	_downRepeatTime;	// Time when we should next repeat
+    AbsoluteTime	_keyRepeat;		// Delay between key repeats
+    AbsoluteTime	_initialKeyRepeat;	// Delay before initial key repeat
+    UInt64		_guid;
+
+    OSObject *                 _keyboardEventTarget;
+    KeyboardEventAction        _keyboardEventAction;
+    OSObject *                 _keyboardSpecialEventTarget;
+    KeyboardSpecialEventAction _keyboardSpecialEventAction;
+    OSObject *                 _updateEventFlagsTarget;
+    UpdateEventFlagsAction     _updateEventFlagsAction;
+
+protected:
+  virtual void dispatchKeyboardEvent(unsigned int keyCode,
+		     /* direction */ bool         goingDown,
+		     /* timeStamp */ AbsoluteTime time);
+
+public:
+  virtual bool init(OSDictionary * properties = 0);
+  virtual bool start(IOService * provider);
+  virtual void stop(IOService * provider);
+  virtual void free();
+
+  virtual bool open(IOService *                client,
+		    IOOptionBits	       options,
+                    KeyboardEventAction        keAction,
+                    KeyboardSpecialEventAction kseAction,
+                    UpdateEventFlagsAction     uefAction);
+                    
+  bool open(        IOService *                  client,
+		    IOOptionBits	         options,
+                    void *,
+                    KeyboardEventCallback        keCallback,
+                    KeyboardSpecialEventCallback kseCallback,
+                    UpdateEventFlagsCallback     uefCallback);
+
+  virtual void close(IOService * client, IOOptionBits );
+
+  virtual IOReturn message( UInt32 type, IOService * provider,
+                    void * argument = 0 );
+
+  virtual IOHIDKind hidKind();
+  virtual bool 	    updateProperties( void );
+  virtual IOReturn  setParamProperties(OSDictionary * dict);
+  virtual IOReturn  setProperties( OSObject * properties );
+  
+  inline  bool	    isRepeat() {return _isRepeat;}
+
+protected: // for subclasses to implement
+  virtual const unsigned char * defaultKeymapOfLength(UInt32 * length);
+  virtual void setAlphaLockFeedback(bool val);
+  virtual void setNumLockFeedback(bool val);
+  virtual UInt32 maxKeyCodes();
+
+
+private:
+  virtual bool resetKeyboard();
+  virtual void scheduleAutoRepeat();
+  static void _autoRepeat(void * arg, void *);
+  virtual void autoRepeat();
+  virtual void setRepeat(unsigned eventType, unsigned keyCode);
+  void setRepeatMode(bool repeat);
+  static void _createKeyboardNub(thread_call_param_t param0, thread_call_param_t param1);
+
+/*
+ * HISTORICAL NOTE:
+ *   The following methods were part of the KeyMapDelegate protocol;
+ *   the declarations have now been merged directly into this class.
+ */
+
+public:
+  virtual void keyboardEvent(unsigned eventType,
+      /* flags */            unsigned flags,
+      /* keyCode */          unsigned keyCode,
+      /* charCode */         unsigned charCode,
+      /* charSet */          unsigned charSet,
+      /* originalCharCode */ unsigned origCharCode,
+      /* originalCharSet */  unsigned origCharSet);
+
+  virtual void keyboardSpecialEvent(unsigned eventType,
+		    /* flags */     unsigned flags,
+		    /* keyCode */   unsigned keyCode,
+		    /* specialty */ unsigned flavor);
+
+  virtual void updateEventFlags(unsigned flags); // Does not generate events
+
+  virtual unsigned eventFlags();           // Global event flags
+  virtual unsigned deviceFlags();          // per-device event flags
+  virtual void setDeviceFlags(unsigned flags); // Set device event flags
+  virtual bool alphaLock();                // current alpha-lock state
+  virtual void setAlphaLock(bool val);     // Set current alpha-lock state
+  virtual bool numLock();                
+  virtual void setNumLock(bool val);     
+  virtual bool charKeyActive();            // Is a character gen. key down?
+  virtual void setCharKeyActive(bool val); // Note that a char gen key is down.
+  virtual bool doesKeyLock(unsigned key);  //does key lock physically
+  virtual unsigned getLEDStatus();  //check hardware for LED status
+
+private:
+  static void _keyboardEvent( IOHIKeyboard * self,
+			     unsigned   eventType,
+      /* flags */            unsigned   flags,
+      /* keyCode */          unsigned   key,
+      /* charCode */         unsigned   charCode,
+      /* charSet */          unsigned   charSet,
+      /* originalCharCode */ unsigned   origCharCode,
+      /* originalCharSet */  unsigned   origCharSet,
+      /* keyboardType */     unsigned   keyboardType,
+      /* repeat */           bool       repeat,
+      /* atTime */           AbsoluteTime ts);
+  static void _keyboardSpecialEvent( 	
+                             IOHIKeyboard * self,
+                             unsigned   eventType,
+        /* flags */          unsigned   flags,
+        /* keyCode  */       unsigned   key,
+        /* specialty */      unsigned   flavor,
+        /* guid */           UInt64     guid,
+        /* repeat */         bool       repeat,
+        /* atTime */         AbsoluteTime ts);
+        
+  static void _updateEventFlags( IOHIKeyboard * self,
+				unsigned flags);  /* Does not generate events */
+
+};
+
+#endif /* !_IOHIKEYBOARD_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIKeyboardMapper.h b/i386/include/IOKit/hidsystem/IOHIKeyboardMapper.h
new file mode 100644
index 0000000..374d25c
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOHIKeyboardMapper.h
@@ -0,0 +1,350 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _IOHIKEYBOARDMAPPER_H
+#define _IOHIKEYBOARDMAPPER_H
+
+#include <IOKit/hidsystem/ev_keymap.h>
+#include <IOKit/hidsystem/IOLLEvent.h>
+#include <IOKit/IOTimerEventSource.h>
+#include <IOKit/IOInterruptEventSource.h>
+
+class IOHIKeyboard;
+class IOHIDSystem;
+
+/*
+ * Key ip/down state is tracked in a bit list.  Bits are set
+ * for key-down, and cleared for key-up.  The bit vector and macros
+ * for it's manipulation are defined here.
+ */
+
+typedef	UInt32 * kbdBitVector;
+
+#define EVK_BITS_PER_UNIT	32
+#define EVK_BITS_MASK		31
+#define EVK_BITS_SHIFT		5	// 1<<5 == 32, for cheap divide
+
+#define EVK_KEYDOWN(n, bits) \
+	(bits)[((n)>>EVK_BITS_SHIFT)] |= (1 << ((n) & EVK_BITS_MASK))
+
+#define EVK_KEYUP(n, bits) \
+	(bits)[((n)>>EVK_BITS_SHIFT)] &= ~(1 << ((n) & EVK_BITS_MASK))
+
+#define EVK_IS_KEYDOWN(n, bits) \
+	(((bits)[((n)>>EVK_BITS_SHIFT)] & (1 << ((n) & EVK_BITS_MASK))) != 0)
+
+/* the maximum number of modifier keys sticky keys can hold at once */
+#define kMAX_MODIFIERS					5
+
+/* the number of shift keys in a row that must be depressed to toggle state */
+#define kNUM_SHIFTS_TO_ACTIVATE			5
+
+/* the number of milliseconds all the shifts must be pressed in - 30 seconds (30000 mS)*/
+#define kDEFAULT_SHIFTEXPIREINTERVAL	30000
+
+
+// sticky keys state flags
+enum
+{
+    kState_Disabled_Flag	= 0x0001,	// disabled and will do nothing until this is changed
+    kState_ShiftActivates_Flag	= 0x0002,	// the 'on' gesture (5 shifts) will activate
+    kState_On			= 0x0004,	// currently on, will hold down modifiers when pressed
+    kState_On_ModifiersDown	= 0x0008,	// one or more modifiers being held down
+
+    kState_Mask			= 0x00FF,	// mask for all states
+};
+
+typedef struct _stickyKeys_ToggleInfo
+{
+	// size of this allocation
+	IOByteCount		size;
+
+	// which modifier key we are tracking (using NX_WHICHMODMASK)
+	unsigned		toggleModifier;
+
+	// the number of times the modifier must be pressed to toggle
+	unsigned		repetitionsToToggle;
+
+	// how long the user has to press the modifier repetitionsToToggle times
+	// the default is 30 seconds
+	AbsoluteTime	expireInterval;
+
+	// the number of times the modifier used within the alloted time
+	unsigned		currentCount;
+
+	// the times that the last shift must occer for this one to be used
+	// this array will actually be of size repetitionsToToggle
+	AbsoluteTime	deadlines[1];
+} StickyKeys_ToggleInfo;
+
+// Flags for each sticky key modifier
+// This will allow for chording of keys
+// and for key locking
+enum
+{
+    kModifier_DidPerformModifiy	= 0x01,
+    kModifier_DidKeyUp		= 0x02,
+    kModifier_Locked		= 0x04,
+};
+typedef struct _stickyKeys_ModifierInfo
+{
+	UInt8		key;		// Key code of the sticky modifier
+        UInt8		state;		// The state of the sticky modifier
+        UInt8		leftModBit;	// System Mod bit of the sticky modifier
+} StickyKeys_ModifierInfo;
+
+class IOHIDKeyboardDevice;
+
+class IOHIKeyboardMapper : public OSObject
+{
+  OSDeclareDefaultStructors(IOHIKeyboardMapper);
+
+private:
+	IOHIKeyboard *		_delegate;					// KeyMap delegate
+	bool				_mappingShouldBeFreed;		// true if map can be IOFree'd
+	NXParsedKeyMapping	_parsedMapping;				// current system-wide keymap
+	IOHIDSystem	 *		_hidSystem;					// target of IOHIKeyboard (should be IOHIDSystem)
+	
+	// binary compatibility padding
+    struct ExpansionData { 
+    
+        // This is for F12 eject
+	UInt16 			f12Eject_State;
+	UInt32 			eject_Delay_MS;
+	IOTimerEventSource 	*ejectTimerEventSource;
+
+        // This is for sticky keys
+        kbdBitVector		cached_KeyBits;
+        StickyKeys_ModifierInfo stickyKeys_StuckModifiers[kMAX_MODIFIERS];
+        IOInterruptEventSource  *stickyKeysMouseClickEventSource;
+        IOInterruptEventSource	*stickyKeysSetFnStateEventSource;
+        // The following should really be statics, but placing here 
+        // to match design by predecesor.
+        OSDictionary		*offFnParamDict;
+        OSDictionary		*onFnParamDict;
+
+        // This is for SlowKeys
+        UInt16			slowKeys_State;
+        UInt32 			slowKeys_Delay_MS;
+        IOTimerEventSource	*slowKeysTimerEventSource;
+        
+        // stored for slowKeysPostProcess
+        UInt8		slowKeys_Aborted_Key;
+        UInt8		slowKeys_Current_Key;        
+        
+        UInt32		specialKeyModifierFlags;
+        
+        bool		supportsF12Eject;
+        
+        SInt32      modifierSwap_Modifiers[NX_NUMMODIFIERS];
+		
+		unsigned char * cachedAlphaLockModDefs;
+    };
+    ExpansionData * _reserved;				    // Reserved for future use.  (Internal use only)
+    
+public:
+	static IOHIKeyboardMapper * keyboardMapper(
+										IOHIKeyboard * delegate,
+										const UInt8 *  mapping,
+										UInt32         mappingLength,
+										bool           mappingShouldBeFreed );
+	
+	virtual bool init(IOHIKeyboard * delegate,
+					const UInt8 *  mapping,
+					  UInt32         mappingLength,
+					  bool           mappingShouldBeFreed);
+	virtual void free();
+	
+	virtual const UInt8 *   mapping();
+	virtual UInt32          mappingLength();
+	virtual bool 		  	serialize(OSSerialize *s) const;
+	
+	virtual void 		translateKeyCode(UInt8 key, bool keyDown, kbdBitVector keyBits);
+	virtual UInt8  		getParsedSpecialKey(UInt8 logical);   //retrieve a key from _parsedMapping
+
+	virtual	void		setKeyboardTarget (IOService * keyboardTarget);
+	
+	virtual bool 	    updateProperties (void);
+	virtual IOReturn  	setParamProperties (OSDictionary * dict);
+	
+	// keyEventPostProcess is called while a lock is not held, so a recursive
+	// call back into HIKeyboard is possible
+	virtual void 	    keyEventPostProcess (void);
+
+private:
+	static void makeNumberParamProperty( OSDictionary * dict, const char * key,
+                            unsigned long long number, unsigned int bits );
+
+
+	virtual bool parseKeyMapping(const UInt8 *        mapping,
+								 UInt32               mappingLength,
+							     NXParsedKeyMapping * parsedMapping) const;
+	
+	virtual void calcModBit(int bit, kbdBitVector keyBits);
+	virtual void doModCalc(int key, kbdBitVector keyBits);
+	virtual void doCharGen(int keyCode, bool down);
+
+	/* sticky keys functionality */
+private:
+	// original translateKeyCode
+	void rawTranslateKeyCode (UInt8 key, bool keyDown, kbdBitVector keyBits);
+    bool modifierSwapFilterKey(UInt8 * key);
+
+	// the current state of stickyKeys
+	UInt32            	_stickyKeys_State; 
+	
+	// the number of modifiers being held down by stickyKeys
+	int		    		_stickyKeys_NumModifiersDown;
+        
+        //////////////////////////////////////////////////////////////
+        // THE FOLLOWING CLASS VARIABLE HAS BEEN DEPRECATED
+        //
+        // PLEASE USE _stickyKeys_StuckModifiers
+        //
+	UInt8		    	_stickyKeys_Modifiers[kMAX_MODIFIERS];
+        //////////////////////////////////////////////////////////////
+	
+	// contains the info needed to keep track of shift repetitions
+	StickyKeys_ToggleInfo * _stickyKeys_ShiftToggle;
+
+	// contains the info needed to keep track of option repetitions
+	StickyKeys_ToggleInfo * _stickyKeys_OptionToggle;
+
+	// dictionaries with cached on and off states, used to set params when state changes
+	bool				_stateDirty;
+	OSDictionary *		_onParamDict;
+	OSDictionary *		_offParamDict;
+
+	// init/free vars
+	bool stickyKeysinit (void);
+	void stickyKeysfree (void);
+
+	// allocate/free a StickyKeys_ToggleInfo struct
+	static StickyKeys_ToggleInfo * stickyKeysAllocToggleInfo (unsigned maxCount);
+	static void stickyKeysFreeToggleInfo (StickyKeys_ToggleInfo * toggleInfo);
+
+	// create on/off dicts as part of init
+	bool createParamDicts (void);
+  
+	// post special keyboard events thru the event system
+	void postKeyboardSpecialEvent (unsigned subtype, unsigned eventType=NX_SYSDEFINED);
+
+	// check any modifier to see if it is pressed 5 times
+	// based on StickyKeys_ToggleInfo
+	bool stickyKeysModifierToggleCheck(
+							StickyKeys_ToggleInfo * toggleInfo,
+							UInt8        key,
+							bool         keyDown,
+							kbdBitVector keyBits,
+                                                        bool 	     mouseClick = false);
+
+	// non-modifier key pressed
+	void stickyKeysNonModifierKey (UInt8 key, bool keyDown, kbdBitVector keyBits, bool mouseClick = false);
+
+	// modifier key pressed (shift, command, option, control)
+	bool stickyKeysModifierKey (UInt8 key, bool keyDown, kbdBitVector keyBits);
+
+	// main entry point, called for all keys (returns true if key handled)
+	bool stickyKeysFilterKey (UInt8 key, bool keyDown, kbdBitVector keyBits, bool mouseClick = false);
+
+        // called by interrupt event source to inform sticky keys of mouse down event
+        static void stickyKeysMouseUp(IOHIKeyboardMapper *owner, IOEventSource *sender);
+
+	void stickyKeysCleanup();
+
+        // called by interrupt event source to restore prior fn state
+	static void stickyKeysSetFnState(IOHIKeyboardMapper *owner, IOEventSource *sender);
+
+        /* F12 Eject Functionality */ 
+private:
+        
+        // Determining f12 eject key press
+        // Returns true if f12 held down for a predetermined period of time.
+        bool f12EjectFilterKey (UInt8 key, bool keyDown, kbdBitVector keyBits);
+        
+        // Timer function for eject
+        static void performF12Eject(IOHIKeyboardMapper *owner, IOTimerEventSource *sender);
+        
+        /* SlowKeys Functionality */
+private:
+        // Slow keys methods
+        bool slowKeysFilterKey (UInt8 key, bool keyDown, kbdBitVector keyBits);
+        
+        static void slowKeysPostProcess (IOHIKeyboardMapper *owner, IOTimerEventSource *sender);
+
+	
+public:	
+    OSMetaClassDeclareReservedUsed(IOHIKeyboardMapper,  0);
+    virtual IOReturn message( UInt32 type, IOService * provider, void * argument = 0 );
+
+	// binary compatibility padding
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  1);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  2);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  3);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  4);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  5);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  6);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  7);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  8);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  9);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 10);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 11);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 12);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 13);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 14);
+    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 15);
+};
+
+#endif _IOHIKEYBOARDMAPPER_H
+
+/*
+ * HISTORICAL NOTE:
+ *   The "delegate" object had to respond to the following protocol;
+ *   this protocol has since been merged into the IOHIKeyboard class.
+ *
+ * @protocol KeyMapDelegate
+ *
+ * - keyboardEvent	:(unsigned)eventType
+ * 	flags	:(unsigned)flags
+ *	keyCode	:(unsigned)keyCode
+ *	charCode:(unsigned)charCode
+ *	charSet	:(unsigned)charSet
+ *	originalCharCode:(unsigned)origCharCode
+ *	originalCharSet:(unsigned)origCharSet;
+ * 
+ * - keyboardSpecialEvent:(unsigned)eventType
+ *	flags	 :(unsigned)flags
+ *	keyCode	:(unsigned)keyCode
+ *	specialty:(unsigned)flavor;
+ *
+ * - updateEventFlags:(unsigned)flags;	// Does not generate events
+ *
+ * - (unsigned)eventFlags;		// Global event flags
+ * - (unsigned)deviceFlags;		// per-device event flags
+ * - setDeviceFlags:(unsigned)flags;	// Set device event flags
+ * - (bool)alphaLock;			// current alpha-lock state
+ * - setAlphaLock:(bool)val;		// Set current alpha-lock state
+ * - (bool)charKeyActive;		// Is a character gen. key down?
+ * - setCharKeyActive:(bool)val;	// Note that a char gen key is down.
+ *
+ * @end
+ */
diff --git a/i386/include/IOKit/hidsystem/IOHIPointing.h b/i386/include/IOKit/hidsystem/IOHIPointing.h
new file mode 100644
index 0000000..1df225a
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOHIPointing.h
@@ -0,0 +1,280 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2009 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _IOHIPOINTING_H
+#define _IOHIPOINTING_H
+
+#include <IOKit/hidsystem/IOHIPointing.h>
+#include <IOKit/hidsystem/IOHIDevice.h>
+#include <IOKit/hidsystem/IOHIDTypes.h>
+
+/* Start Action Definitions */
+
+/*
+ * HISTORICAL NOTE:
+ *   The following entry points were part of the IOHIPointingEvents
+ *   protocol.
+ */
+typedef void (*RelativePointerEventAction)(OSObject * target,
+                        /* buttons */      int        buttons,
+                        /* deltaX */       int        dx,
+                        /* deltaY */       int        dy,
+                        /* atTime */       AbsoluteTime ts);
+
+typedef void (*AbsolutePointerEventAction)(OSObject * target,
+                        /* buttons */      int        buttons,
+                        /* at */           IOGPoint * newLoc,
+                        /* withBounds */   IOGBounds *bounds,
+                        /* inProximity */  bool       proximity,
+                        /* withPressure */ int        pressure,
+                        /* withAngle */    int        stylusAngle,
+                        /* atTime */       AbsoluteTime ts);
+
+typedef void (*ScrollWheelEventAction)(OSObject * target,
+                                       short      deltaAxis1,
+                                       short      deltaAxis2,
+                                       short      deltaAxis3,
+                                       AbsoluteTime ts);
+
+/* Event Callback Definitions */
+
+typedef void (*RelativePointerEventCallback)(
+                        /* target */       OSObject * target,
+                        /* buttons */      int        buttons,
+                        /* deltaX */       int        dx,
+                        /* deltaY */       int        dy,
+                        /* atTime */       AbsoluteTime ts,
+                        /* sender */       OSObject * sender,
+                        /* refcon */       void *     refcon);
+
+typedef void (*AbsolutePointerEventCallback)(
+                        /* target */       OSObject * target,
+                        /* buttons */      int        buttons,
+                        /* at */           IOGPoint * newLoc,
+                        /* withBounds */   IOGBounds *bounds,
+                        /* inProximity */  bool       proximity,
+                        /* withPressure */ int        pressure,
+                        /* withAngle */    int        stylusAngle,
+                        /* atTime */       AbsoluteTime ts,
+                        /* sender */       OSObject * sender,
+                        /* refcon */       void *     refcon);
+
+typedef void (*ScrollWheelEventCallback)(
+                        /* target */       OSObject * target,
+                        /* delta1 */       short      deltaAxis1,
+                        /* delta2 */       short      deltaAxis2,
+                        /* delta3 */       short      deltaAxis3,
+                        /* fixedDelta1 */  IOFixed    fixedDelta1,
+                        /* fixedDelta2 */  IOFixed    fixedDelta2,
+                        /* fixedDelta3 */  IOFixed    fixedDelta3,
+                        /* pointDelta1 */  SInt32     pointDelta1,
+                        /* pointDelta2 */  SInt32     pointDelta2,
+                        /* pointDelta3 */  SInt32     pointDelta3,
+                        /* reserved */     SInt32     options,
+                        /* atTime */       AbsoluteTime ts,
+                        /* sender */       OSObject * sender,
+                        /* refcon */       void *     refcon);
+
+/* End Action Definitions */
+
+/* Default accel level parameters */
+#define EV_DEFAULTPOINTERACCELLEVEL 0x0000b000
+#define EV_DEFAULTSCROLLACCELLEVEL  0x00005000
+
+class IOHIDPointingDevice;
+struct ScrollAccelInfo;
+
+class IOHIPointing : public IOHIDevice
+{
+    OSDeclareDefaultStructors(IOHIPointing);
+    
+    friend class IOHITablet;
+    friend class IOHIDPointing;
+
+private:
+    IOLock *		_deviceLock;  // Lock for all device access
+    int			_buttonMode;  // The "handedness" of the pointer
+    IOFixed		_acceleration;
+    bool		_convertAbsoluteToRelative;
+    bool		_contactToMove;
+    bool		_hadContact;
+    IOGPoint    _previousLocation;
+    UInt8		_pressureThresholdToClick;	// A scale factor of 0 to 255 to determine how much pressure is necessary to generate a primary mouse click - a value of 255 means no click will be generated
+    void *		_scaleSegments;
+    IOItemCount		_scaleSegCount;
+    IOFixed		_fractX;
+    IOFixed		_fractY;
+
+    OSObject *                 _relativePointerEventTarget;
+    RelativePointerEventAction _relativePointerEventAction;
+    OSObject *                 _absolutePointerEventTarget;
+    AbsolutePointerEventAction _absolutePointerEventAction;
+    OSObject *                 _scrollWheelEventTarget;
+    ScrollWheelEventAction     _scrollWheelEventAction;
+    
+    struct ExpansionData { 
+        UInt32      scrollType;
+                
+        ScrollAccelInfo * scrollWheelInfo;
+        ScrollAccelInfo * scrollPointerInfo;
+
+        IOFixed		scrollFixedDeltaAxis1;
+        IOFixed		scrollFixedDeltaAxis2;
+        IOFixed		scrollFixedDeltaAxis3;
+        SInt32		scrollPointDeltaAxis1;
+        SInt32		scrollPointDeltaAxis2;
+        SInt32		scrollPointDeltaAxis3;
+        UInt32      scrollButtonMask;
+
+        // Added to post events to the HID Manager
+        IOHIDPointingDevice	* hidPointingNub;
+        IOService 		* openClient;
+        
+        bool		isSeized;
+        UInt32        accelerateMode;
+        
+        UInt32      scrollZoomMask;
+        bool        lastScrollWasZoom;
+        bool        scrollOff;
+    };
+
+    ExpansionData *  _reserved;
+    
+    void    setPointingMode(UInt32 accelerateMode);
+    UInt32  getPointingMode ();
+    void    setScrollType(UInt32 scrollType);
+    UInt32  getScrollType();
+
+    void dispatchScrollWheelEventWithAccelInfo(
+                                SInt32              deltaAxis1,
+                                SInt32              deltaAxis2,
+                                SInt32              deltaAxis3,
+                                ScrollAccelInfo *   info,
+                                AbsoluteTime        ts);
+    
+    
+protected:
+  virtual void dispatchRelativePointerEvent(int        dx,
+                                            int        dy,
+                                            UInt32     buttonState,
+                                            AbsoluteTime ts);
+    
+  virtual void dispatchAbsolutePointerEvent(IOGPoint *	newLoc,
+                                            IOGBounds *	bounds,
+                                            UInt32	buttonState,
+                                            bool	proximity,
+                                            int		pressure,
+                                            int		pressureMin,
+                                            int		pressureMax,
+                                            int		stylusAngle,
+                                            AbsoluteTime	ts);
+
+  virtual void dispatchScrollWheelEvent(short deltaAxis1,
+                                        short deltaAxis2,
+                                        short deltaAxis3,
+                                        AbsoluteTime ts);
+
+public:
+  virtual bool init(OSDictionary * properties = 0);
+  virtual bool start(IOService * provider);
+  virtual void free();
+
+  virtual bool open(IOService *                client,
+		    IOOptionBits	       options,
+                    RelativePointerEventAction rpeAction,
+                    AbsolutePointerEventAction apeAction,
+                    ScrollWheelEventAction     sweAction);
+                    
+  bool open(        IOService *				client,
+                    IOOptionBits			options,
+                    void *,
+                    RelativePointerEventCallback	rpeCallback,
+                    AbsolutePointerEventCallback	apeCallback,
+                    ScrollWheelEventCallback		sweCallback);
+
+  virtual void close(IOService * client, IOOptionBits );
+  virtual IOReturn message( UInt32 type, IOService * provider,
+                              void * argument = 0 );
+
+  virtual IOHIDKind hidKind();
+  virtual bool 	    updateProperties( void );
+  virtual IOReturn  setParamProperties( OSDictionary * dict );
+  virtual IOReturn  powerStateWillChangeTo( IOPMPowerFlags powerFlags,
+                        unsigned long newState, IOService * device);
+  virtual IOReturn  powerStateDidChangeTo( IOPMPowerFlags powerFlags,
+                        unsigned long newState, IOService * device);
+
+protected: // for subclasses to implement
+  virtual OSData *    copyAccelerationTable();
+  virtual IOItemCount buttonCount();
+  virtual IOFixed     resolution();
+
+  // RY: Adding method to copy scroll wheel accel table.
+  // Unfortunately, we don't have any padding, so this
+  // is going to be non-virtual.
+  /*virtual*/ OSData * copyScrollAccelerationTable();
+
+private:
+  virtual bool resetPointer();
+  virtual void scalePointer(int * dxp, int * dyp);
+  virtual void setupForAcceleration(IOFixed accl);
+  
+  // RY: Adding methods to support scroll wheel accel.
+  // Unfortunately, we don't have any padding, so these
+  // are going to be non-virtual.
+  /*virtual*/ bool 	resetScroll();
+  /*virtual*/ void 	setupScrollForAcceleration(IOFixed accl);
+  
+  // RY: We have to make sure that subclasses that will 
+  // take advantage of this have their defined resolution 
+  // in their property table.
+  /*virtual*/ IOFixed	scrollResolutionForType(SInt32 type=-1);
+  /*virtual*/ IOFixed   scrollReportRate();
+  /*virtual*/ OSData *  copyScrollAccelerationTableForType(SInt32 type=-1);
+  
+private:
+  static void _relativePointerEvent( IOHIPointing * self,
+				    int        buttons,
+                       /* deltaX */ int        dx,
+                       /* deltaY */ int        dy,
+                       /* atTime */ AbsoluteTime ts);
+
+  /* Tablet event reporting */
+  static void _absolutePointerEvent(IOHIPointing * self,
+				    int        buttons,
+                 /* at */           IOGPoint * newLoc,
+                 /* withBounds */   IOGBounds *bounds,
+                 /* inProximity */  bool       proximity,
+                 /* withPressure */ int        pressure,
+                 /* withAngle */    int        stylusAngle,
+                 /* atTime */       AbsoluteTime ts);
+
+  /* Mouse scroll wheel event reporting */
+  static void _scrollWheelEvent(IOHIPointing *self,
+                                short deltaAxis1,
+                                short deltaAxis2,
+                                short deltaAxis3,
+                                AbsoluteTime ts);
+
+};
+
+#endif /* !_IOHIPOINTING_H */
diff --git a/i386/include/IOKit/hidsystem/IOLLEvent.h b/i386/include/IOKit/hidsystem/IOLLEvent.h
new file mode 100644
index 0000000..53fd70c
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/IOLLEvent.h
@@ -0,0 +1,558 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2009 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/******************************************************************************
+	event.h (PostScript side version)
+	
+	CONFIDENTIAL
+	Copyright (c) 1988 NeXT, Inc. as an unpublished work.
+	All Rights Reserved.
+
+	Created Leo 01Mar88
+
+	Modified:
+	04May88 Leo  Final event types and record
+	22Aug88 Leo  Change short -> int for window, add reserved
+	26May90 Ted  Added NX_UNDIMMASK to correct triggering of UndoAutoDim
+	12Dec91 Mike Brought into sync with dpsclient/event.h, and fixed
+		     the #ifndef interlock with dpsclient/event.h that was
+		     broken during the Great Header Revision.
+
+	The PostScript version of this file differs from the
+	Window Kit version in that the coordinates here are
+	ints instead of floats.
+******************************************************************************/
+
+#ifndef _DEV_EVENT_H
+#define _DEV_EVENT_H
+
+#include <libkern/OSTypes.h>
+#include <IOKit/hidsystem/IOHIDTypes.h>
+
+#ifdef EVENT_H		/* Interlock with dpsclient/event.h */
+#if !defined(_NXSIZE_)	/* Work around patch for old event.h in Phase 3 projs*/
+#define _NXSIZE_	1	/* NXCoord, NXPoint, NXSize decl seen */
+#define _NXSize_	NXSize
+#endif /* _NXSIZE_ */
+#else  /* EVENT_H */		/* Haven't seen dpsclient/event.h, so define away */
+#define EVENT_H
+
+#ifdef	KERNEL
+#else	/* KERNEL */
+
+#if !defined(_NXSIZE_)	/* Work around patch for old event.h in Phase 3 projs*/
+#define _NXSIZE_	1	/* NXCoord, NXPoint, NXSize decl seen */
+typedef float   NXCoord;
+
+typedef struct _NXPoint {	/* point */
+    NXCoord         x, y;
+} NXPoint;
+
+typedef struct _NXSize {	/* size */
+    NXCoord         width, height;
+} NXSize;
+#define _NXSize_	NXSize	/* Correct usage in event_status_driver.h */
+#endif /* _NXSIZE_ */
+
+#endif	/* KERNEL */
+
+/* Event types */
+
+#define NX_NULLEVENT		0	/* internal use */
+
+/* mouse events */
+
+#define NX_LMOUSEDOWN		1	/* left mouse-down event */
+#define NX_LMOUSEUP		2	/* left mouse-up event */
+#define NX_RMOUSEDOWN		3	/* right mouse-down event */
+#define NX_RMOUSEUP		4	/* right mouse-up event */
+#define NX_MOUSEMOVED		5	/* mouse-moved event */
+#define NX_LMOUSEDRAGGED	6	/* left mouse-dragged event */
+#define NX_RMOUSEDRAGGED	7	/* right mouse-dragged event */
+#define NX_MOUSEENTERED		8	/* mouse-entered event */
+#define NX_MOUSEEXITED		9	/* mouse-exited event */
+
+/* other mouse events
+ *
+ * event.data.mouse.buttonNumber should contain the 
+ * button number (2-31) changing state.
+ */
+#define NX_OMOUSEDOWN		25	/* other mouse-down event */
+#define NX_OMOUSEUP		26	/* other mouse-up event */
+#define NX_OMOUSEDRAGGED	27	/* other mouse-dragged event */
+
+/* keyboard events */
+
+#define NX_KEYDOWN		10	/* key-down event */
+#define NX_KEYUP		11	/* key-up event */
+#define NX_FLAGSCHANGED		12	/* flags-changed event */
+
+/* composite events */
+
+#define NX_KITDEFINED		13	/* application-kit-defined event */
+#define NX_SYSDEFINED		14	/* system-defined event */
+#define NX_APPDEFINED		15	/* application-defined event */
+/* There are additional DPS client defined events past this point. */
+
+/* Scroll wheel events */
+
+#define NX_SCROLLWHEELMOVED	22
+
+/* Zoom events */
+#define NX_ZOOM             28
+
+/* tablet events */
+
+#define NX_TABLETPOINTER	23	/* for non-mousing transducers */
+#define NX_TABLETPROXIMITY	24  /* for non-mousing transducers */
+
+/* event range */
+
+#define NX_FIRSTEVENT		0
+#define NX_LASTEVENT		28
+#define NX_NUMPROCS		(NX_LASTEVENT-NX_FIRSTEVENT+1)
+
+/* Event masks */
+#define NX_NULLEVENTMASK        (1 << NX_NULLEVENT)     /* NULL event */
+#define NX_LMOUSEDOWNMASK       (1 << NX_LMOUSEDOWN)	/* left mouse-down */
+#define NX_LMOUSEUPMASK         (1 << NX_LMOUSEUP)      /* left mouse-up */
+#define NX_RMOUSEDOWNMASK       (1 << NX_RMOUSEDOWN)	/* right mouse-down */
+#define NX_RMOUSEUPMASK         (1 << NX_RMOUSEUP)      /* right mouse-up */
+#define NX_OMOUSEDOWNMASK       (1 << NX_OMOUSEDOWN)	/* other mouse-down */
+#define NX_OMOUSEUPMASK         (1 << NX_OMOUSEUP)      /* other mouse-up  */
+#define NX_MOUSEMOVEDMASK       (1 << NX_MOUSEMOVED)	/* mouse-moved */
+#define NX_LMOUSEDRAGGEDMASK	(1 << NX_LMOUSEDRAGGED)	/* left-dragged */
+#define NX_RMOUSEDRAGGEDMASK	(1 << NX_RMOUSEDRAGGED)	/* right-dragged */
+#define NX_OMOUSEDRAGGEDMASK	(1 << NX_OMOUSEDRAGGED)	/* other-dragged */
+#define NX_MOUSEENTEREDMASK     (1 << NX_MOUSEENTERED)	/* mouse-entered */
+#define NX_MOUSEEXITEDMASK      (1 << NX_MOUSEEXITED)	/* mouse-exited */
+#define NX_KEYDOWNMASK          (1 << NX_KEYDOWN)       /* key-down */
+#define NX_KEYUPMASK            (1 << NX_KEYUP)         /* key-up */
+#define NX_FLAGSCHANGEDMASK     (1 << NX_FLAGSCHANGED)	/* flags-changed */
+#define NX_KITDEFINEDMASK       (1 << NX_KITDEFINED)	/* kit-defined */
+#define NX_SYSDEFINEDMASK       (1 << NX_SYSDEFINED)	/* system-defined */
+#define NX_APPDEFINEDMASK       (1 << NX_APPDEFINED)	/* app-defined */
+#define NX_SCROLLWHEELMOVEDMASK	(1 << NX_SCROLLWHEELMOVED)	/* scroll wheel moved */
+#define NX_ZOOMMASK             (1 << NX_ZOOM)          /* Zoom */
+#define NX_TABLETPOINTERMASK	(1 << NX_TABLETPOINTER)	/* tablet pointer moved */
+#define NX_TABLETPROXIMITYMASK	(1 << NX_TABLETPROXIMITY)	/* tablet pointer proximity */
+
+#define EventCodeMask(type)	(1 << (type))
+#define NX_ALLEVENTS		-1	/* Check for all events */
+
+/* sub types for mouse and move events */
+
+#define NX_SUBTYPE_DEFAULT					0
+#define NX_SUBTYPE_TABLET_POINT				1
+#define NX_SUBTYPE_TABLET_PROXIMITY			2
+#define NX_SUBTYPE_MOUSE_TOUCH              3
+
+/* sub types for system defined events */
+
+#define NX_SUBTYPE_POWER_KEY				1
+#define NX_SUBTYPE_AUX_MOUSE_BUTTONS		7
+
+/* 
+ * NX_SUBTYPE_AUX_CONTROL_BUTTONS usage
+ *
+ * The incoming NXEvent for other mouse button down/up has event.type 
+ * NX_SYSDEFINED and event.data.compound.subtype NX_SUBTYPE_AUX_MOUSE_BUTTONS.
+ * Within the event.data.compound.misc.L[0] contains bits for all the buttons 
+ * that have changed state, and event.data.compound.misc.L[1] contains the 
+ * current button state as a bitmask, with 1 representing down, and 0
+ * representing up.  Bit 0 is the left button, bit one is the right button, 
+ * bit 2 is the center button and so forth.
+ */
+#define NX_SUBTYPE_AUX_CONTROL_BUTTONS		8
+
+#define NX_SUBTYPE_EJECT_KEY				10
+#define NX_SUBTYPE_SLEEP_EVENT				11
+#define NX_SUBTYPE_RESTART_EVENT			12
+#define NX_SUBTYPE_SHUTDOWN_EVENT			13
+
+#define NX_SUBTYPE_STICKYKEYS_ON			100
+#define NX_SUBTYPE_STICKYKEYS_OFF			101
+#define NX_SUBTYPE_STICKYKEYS_SHIFT			102
+#define NX_SUBTYPE_STICKYKEYS_CONTROL			103
+#define NX_SUBTYPE_STICKYKEYS_ALTERNATE			104
+#define NX_SUBTYPE_STICKYKEYS_COMMAND			105
+#define NX_SUBTYPE_STICKYKEYS_RELEASE			106
+#define NX_SUBTYPE_STICKYKEYS_TOGGLEMOUSEDRIVING	107
+
+// New stickykeys key events
+// These were created to send an event describing the 
+// different state of the modifiers
+#define NX_SUBTYPE_STICKYKEYS_SHIFT_DOWN		110
+#define NX_SUBTYPE_STICKYKEYS_CONTROL_DOWN		111
+#define NX_SUBTYPE_STICKYKEYS_ALTERNATE_DOWN		112
+#define NX_SUBTYPE_STICKYKEYS_COMMAND_DOWN		113
+#define NX_SUBTYPE_STICKYKEYS_FN_DOWN			114
+
+#define NX_SUBTYPE_STICKYKEYS_SHIFT_LOCK		120
+#define NX_SUBTYPE_STICKYKEYS_CONTROL_LOCK		121
+#define NX_SUBTYPE_STICKYKEYS_ALTERNATE_LOCK		122
+#define NX_SUBTYPE_STICKYKEYS_COMMAND_LOCK		123
+#define NX_SUBTYPE_STICKYKEYS_FN_LOCK			124
+
+#define NX_SUBTYPE_STICKYKEYS_SHIFT_UP			130
+#define NX_SUBTYPE_STICKYKEYS_CONTROL_UP		131
+#define NX_SUBTYPE_STICKYKEYS_ALTERNATE_UP		132
+#define NX_SUBTYPE_STICKYKEYS_COMMAND_UP		133
+#define NX_SUBTYPE_STICKYKEYS_FN_UP			134
+
+
+
+// SlowKeys 
+#define NX_SUBTYPE_SLOWKEYS_START			200
+#define NX_SUBTYPE_SLOWKEYS_ABORT			201
+#define NX_SUBTYPE_SLOWKEYS_END				202
+
+// HID Parameter Property Modified
+#define NX_SUBTYPE_HIDPARAMETER_MODIFIED		210
+
+/* Masks for the bits in event.flags */
+
+/* device-independent */
+
+#define	NX_ALPHASHIFTMASK	0x00010000
+#define	NX_SHIFTMASK		0x00020000
+#define	NX_CONTROLMASK		0x00040000
+#define	NX_ALTERNATEMASK	0x00080000
+#define	NX_COMMANDMASK		0x00100000
+#define	NX_NUMERICPADMASK	0x00200000
+#define	NX_HELPMASK		0x00400000
+#define	NX_SECONDARYFNMASK	0x00800000
+
+/* device-dependent (really?) */
+
+#define	NX_DEVICELCTLKEYMASK	0x00000001
+#define	NX_DEVICELSHIFTKEYMASK	0x00000002
+#define	NX_DEVICERSHIFTKEYMASK	0x00000004
+#define	NX_DEVICELCMDKEYMASK	0x00000008
+#define	NX_DEVICERCMDKEYMASK	0x00000010
+#define	NX_DEVICELALTKEYMASK	0x00000020
+#define	NX_DEVICERALTKEYMASK	0x00000040
+#define NX_DEVICERCTLKEYMASK	0x00002000
+
+/* 
+ * Additional reserved bits in event.flags
+ */
+
+#define NX_STYLUSPROXIMITYMASK	0x00000080	/* deprecated */
+#define NX_NONCOALSESCEDMASK	0x00000100
+
+/* click state values
+ * If you have the following events in close succession, the click
+ * field has the indicated value:
+ *	
+ *  Event	Click Value	Comments
+ *  mouse-down	1		Not part of any click yet
+ *  mouse-up	1		Aha! A click!
+ *  mouse-down	2		Doing a double-click
+ *  mouse-up	2		It's finished
+ *  mouse-down	3		A triple
+ *  mouse-up	3
+ */
+
+/* Values for the character set in event.data.key.charSet */
+
+#define	NX_ASCIISET		0
+#define NX_SYMBOLSET		1
+#define	NX_DINGBATSSET		2
+
+/* tablet button masks
+ * Mask bits for the tablet barrel buttons placed in tablet.buttons.
+ * The buttons field uses adopts the following convention:
+ *
+ * Bit      Comments
+ * 0        Left Mouse Button ( kHIDUsage_Button_1 )
+ * 1        Right Mouse Button ( kHIDUsage_Button_2 )
+ * 2        Middle Mouse Button ( kHIDUsage_Button_3 )
+ * 3        4th Mouse Button ( kHIDUsage_Button_4 )
+ * ...
+ * 15       15th Mouse Button
+ *
+ * For your convenience, the following mask bits have been defined
+ * for tablet specific application:
+ */
+ 
+#define NX_TABLET_BUTTON_PENTIPMASK             0x0001
+#define NX_TABLET_BUTTON_PENLOWERSIDEMASK       0x0002
+#define NX_TABLET_BUTTON_PENUPPERSIDEMASK       0x0004
+
+
+/* tablet capability masks
+ * Mask bits for the tablet capabilities field.   Use these 
+ * masks with the capabilities field of a proximity event to 
+ * determine what fields in a Tablet Event are valid for this 
+ * device.
+ */
+#define NX_TABLET_CAPABILITY_DEVICEIDMASK           0x0001
+#define NX_TABLET_CAPABILITY_ABSXMASK               0x0002
+#define NX_TABLET_CAPABILITY_ABSYMASK               0x0004
+#define NX_TABLET_CAPABILITY_VENDOR1MASK            0x0008
+#define NX_TABLET_CAPABILITY_VENDOR2MASK            0x0010
+#define NX_TABLET_CAPABILITY_VENDOR3MASK            0x0020
+#define NX_TABLET_CAPABILITY_BUTTONSMASK            0x0040
+#define NX_TABLET_CAPABILITY_TILTXMASK              0x0080
+#define NX_TABLET_CAPABILITY_TILTYMASK              0x0100
+#define NX_TABLET_CAPABILITY_ABSZMASK               0x0200
+#define NX_TABLET_CAPABILITY_PRESSUREMASK           0x0400
+#define NX_TABLET_CAPABILITY_TANGENTIALPRESSUREMASK 0x0800
+#define NX_TABLET_CAPABILITY_ORIENTINFOMASK         0x1000
+#define NX_TABLET_CAPABILITY_ROTATIONMASK           0x2000
+
+/* proximity pointer types
+ * Value that describes the type of pointing device placed in
+ * proximity.pointerType.
+ */
+ 
+#define NX_TABLET_POINTER_UNKNOWN               0
+#define NX_TABLET_POINTER_PEN                   1
+#define NX_TABLET_POINTER_CURSOR                2
+#define NX_TABLET_POINTER_ERASER                3
+
+/* TabletPointData type: defines the tablet data for points included
+ * in mouse events created by a tablet driver.
+ */
+
+typedef struct _NXTabletPointData {
+	SInt32  x;  /* absolute x coordinate in tablet space at full tablet resolution */
+    SInt32  y;  /* absolute y coordinate in tablet space at full tablet resolution */
+	SInt32  z;  /* absolute z coordinate in tablet space at full tablet resolution */
+    UInt16  buttons;   /* one bit per button - bit 0 is first button - 1 = closed  */
+    UInt16  pressure;  /* scaled pressure value; MAX=(2^16)-1, MIN=0 */
+    struct {           /* tilt range is -((2^15)-1) to (2^15)-1 (-32767 to 32767)  */
+        SInt16 x;      /* scaled tilt x value */
+        SInt16 y;      /* scaled tilt y value */
+	} tilt;
+	UInt16  rotation;  /* Fixed-point representation of device rotation in a 10.6 format */
+	SInt16  tangentialPressure; /* tangential pressure on the device; same range as tilt */
+	UInt16  deviceID;  /* system-assigned unique device ID */
+	SInt16  vendor1;   /* vendor-defined signed 16-bit integer */
+	SInt16  vendor2;   /* vendor-defined signed 16-bit integer */
+	SInt16  vendor3;   /* vendor-defined signed 16-bit integer */
+} NXTabletPointData, *NXTabletPointDataPtr;
+
+/* TabletProximityData type: defines the tablet data for proximity
+ * events included in mouse events created by a tablet driver.
+ */
+
+typedef struct _NXTabletProximityData {
+    UInt16  vendorID;             /* vendor-defined ID - typically the USB vendor ID */
+	UInt16  tabletID;             /* vendor-defined tablet ID - typically the USB product ID */
+	UInt16  pointerID;            /* vendor-defined ID of the specific pointing device */
+	UInt16  deviceID;             /* system-assigned unique device ID */
+	UInt16  systemTabletID;       /* system-assigned unique tablet ID */
+	UInt16  vendorPointerType;    /* vendor-defined pointer type */
+	UInt32  pointerSerialNumber;  /* vendor-defined serial number */
+	UInt64  uniqueID __attribute__ ((packed));             /* vendor-defined unique ID */
+	UInt32  capabilityMask;       /* capabilities mask of the device */
+	UInt8   pointerType;          /* type of pointing device */
+	UInt8   enterProximity;       /* non-zero = entering; zero = leaving */
+	SInt16  reserved1;
+} NXTabletProximityData, *NXTabletProximityDataPtr;
+
+/* EventData type: defines the data field of an event */
+
+typedef	union {
+    struct {    /* For mouse-down and mouse-up events */
+        UInt8   subx;       /* sub-pixel position for x */
+        UInt8   suby;       /* sub-pixel position for y */
+        SInt16  eventNum;   /* unique identifier for this button */
+        SInt32  click;      /* click state of this event */
+        UInt8   pressure;   /* pressure value: 0=none, 255=full */
+        UInt8   buttonNumber;/* button generating other button event (0-31) */
+        UInt8   subType;
+        UInt8   reserved2;
+        SInt32  reserved3;
+        union {
+            NXTabletPointData      point;     /* tablet point data */
+            NXTabletProximityData  proximity; /* tablet proximity data */
+        } tablet;
+    } mouse;
+    struct {
+        SInt32  dx;
+        SInt32  dy;
+        UInt8   subx;
+        UInt8   suby;
+        UInt8   subType;
+        UInt8   reserved1;
+        SInt32  reserved2;
+        union {
+            NXTabletPointData      point;     /* tablet point data */
+            NXTabletProximityData  proximity; /* tablet proximity data */
+        } tablet;
+    } mouseMove;
+    struct {    /* For key-down and key-up events */
+        UInt16  origCharSet;    /* unmodified character set code */
+        SInt16  repeat;         /* for key-down: nonzero if really a repeat */
+        UInt16  charSet;        /* character set code */
+        UInt16  charCode;       /* character code in that set */
+        UInt16  keyCode;        /* device-dependent key number */
+        UInt16  origCharCode;   /* unmodified character code */
+        SInt32  reserved1;
+        UInt32  keyboardType;
+        SInt32  reserved2;
+        SInt32  reserved3;
+        SInt32  reserved4;
+        SInt32  reserved5[4];
+    } key;
+    struct {    /* For mouse-entered and mouse-exited events */
+        SInt16  reserved;
+        SInt16  eventNum;       /* unique identifier from mouse down event */
+        SInt32  trackingNum;    /* unique identifier from settrackingrect */
+        SInt32  userData;       /* uninterpreted integer from settrackingrect */
+        SInt32  reserved1;
+        SInt32  reserved2;
+        SInt32  reserved3;
+        SInt32  reserved4;
+        SInt32  reserved5;
+        SInt32  reserved6[4];
+    } tracking;
+    struct {
+        SInt16  deltaAxis1;
+        SInt16  deltaAxis2;
+        SInt16  deltaAxis3;
+        SInt16  reserved1;
+        SInt32  fixedDeltaAxis1;
+        SInt32  fixedDeltaAxis2;
+        SInt32  fixedDeltaAxis3;
+        SInt32  pointDeltaAxis1;
+        SInt32  pointDeltaAxis2;
+        SInt32  pointDeltaAxis3;
+        SInt32  reserved8[4];
+    } scrollWheel, zoom;
+    struct {    /* For window-changed, sys-defined, and app-defined events */
+        SInt16  reserved;
+        SInt16  subType;    /* event subtype for compound events */
+        union {
+            float   F[11];  /* for use in compound events */
+            SInt32  L[11];  /* for use in compound events */
+            SInt16  S[22];  /* for use in compound events */
+            char    C[44];  /* for use in compound events */
+        } misc;
+    } compound;
+    struct {
+        SInt32  x;  /* absolute x coordinate in tablet space at full tablet resolution */
+        SInt32  y;  /* absolute y coordinate in tablet space at full tablet resolution */
+        SInt32  z;  /* absolute z coordinate in tablet space at full tablet resolution */
+        UInt16  buttons;   /* one bit per button - bit 0 is first button - 1 = closed  */
+        UInt16  pressure;  /* scaled pressure value; MAX=(2^16)-1, MIN=0 */
+        struct {           /* tilt range is -((2^15)-1) to (2^15)-1 (-32767 to 32767)  */
+            SInt16 x;      /* scaled tilt x value */
+            SInt16 y;      /* scaled tilt y value */
+        } tilt;
+        UInt16  rotation;  /* Fixed-point representation of device rotation in a 10.6 format */
+        SInt16  tangentialPressure; /* tangential pressure on the device; same range as tilt */
+        UInt16  deviceID;  /* system-assigned unique device ID */
+        SInt16  vendor1;   /* vendor-defined signed 16-bit integer */
+        SInt16  vendor2;   /* vendor-defined signed 16-bit integer */
+        SInt16  vendor3;   /* vendor-defined signed 16-bit integer */
+        SInt32  reserved[4];
+    } tablet;
+    struct {
+        UInt16  vendorID;  /* vendor-defined ID - typically the USB vendor ID */
+        UInt16  tabletID;  /* vendor-defined tablet ID - typically the USB product ID */
+        UInt16  pointerID; /* vendor-defined ID of the specific pointing device */
+        UInt16  deviceID;             /* system-assigned unique device ID */
+        UInt16  systemTabletID;       /* system-assigned unique tablet ID */
+        UInt16  vendorPointerType;    /* vendor-defined pointer type */
+        UInt32  pointerSerialNumber;  /* vendor-defined serial number */
+        UInt64  uniqueID __attribute__ ((packed));             /* vendor-defined unique ID */
+        UInt32  capabilityMask;       /* capabilities mask of the device */
+        UInt8   pointerType;          /* type of pointing device */
+        UInt8   enterProximity;       /* non-zero = entering; zero = leaving */
+        SInt16  reserved1;
+        SInt32  reserved2[4];
+    } proximity;
+} NXEventData;
+
+/* The current version number of the NXEventData structure. */
+
+#define kNXEventDataVersion		2
+
+/* Finally! The event record! */
+#ifndef __ppc__
+typedef struct _NXEvent {
+	SInt32              type;		/* An event type from above */
+    struct {
+        SInt32	x, y;					/* Base coordinates in window, */
+    } 					location;	/* from bottom left */
+    UInt64              time __attribute__ ((packed));		/* time since launch */
+    SInt32              flags;		/* key state flags */
+    UInt32              window;		/* window number of assigned window */
+    UInt64              service_id __attribute__ ((packed)); /* service id */
+    SInt32              ext_pid;    /* external pid */
+    NXEventData			data;		/* type-dependent data */
+} NXEvent, *NXEventPtr;
+
+#else
+
+typedef struct _NXEvent {
+	SInt32              type;		/* An event type from above */
+    struct {
+        SInt32	x, y;					/* Base coordinates in window, */
+    } 					location;	/* from bottom left */
+    UInt64              time __attribute__ ((packed));		/* time since launch */
+    SInt32              flags;		/* key state flags */
+    UInt32              window;		/* window number of assigned window */
+    NXEventData			data;		/* type-dependent data */
+    UInt64              service_id __attribute__ ((packed)); /* service id */
+    SInt32              ext_pid;    /* external pid */
+} NXEvent, *NXEventPtr;
+#endif
+
+/* The current version number of the NXEvent structure. */
+
+#define kNXEventVersion		2
+
+/* How to pick window(s) for event (for PostEvent) */
+#define NX_NOWINDOW		-1
+#define NX_BYTYPE		0
+#define NX_BROADCAST		1
+#define NX_TOPWINDOW		2
+#define NX_FIRSTWINDOW		3
+#define NX_MOUSEWINDOW		4
+#define NX_NEXTWINDOW		5
+#define NX_LASTLEFT		6
+#define NX_LASTRIGHT		7
+#define NX_LASTKEY		8
+#define NX_EXPLICIT		9
+#define NX_TRANSMIT		10
+#define NX_BYPSCONTEXT		11
+
+#endif /* EVENT_H */	/* End of defs common with dpsclient/event.h */
+
+/* Mask of events that cause screen to undim */
+
+#define NX_UNDIMMASK		(NX_KEYDOWNMASK | NX_KEYUPMASK | \
+				 NX_LMOUSEDOWNMASK | NX_LMOUSEUPMASK | \
+				 NX_RMOUSEDOWNMASK | NX_RMOUSEUPMASK | \
+				 NX_MOUSEMOVEDMASK | NX_FLAGSCHANGEDMASK | \
+				 NX_MOUSEENTEREDMASK | NX_MOUSEEXITEDMASK | \
+				 NX_LMOUSEDRAGGEDMASK | NX_RMOUSEDRAGGEDMASK | \
+                                 NX_SCROLLWHEELMOVEDMASK | NX_TABLETPOINTERMASK | \
+                                 NX_TABLETPROXIMITYMASK | NX_NULLEVENTMASK)
+
+#endif /* !_DEV_EVENT_H */
+
diff --git a/i386/include/IOKit/hidsystem/ev_keymap.h b/i386/include/IOKit/hidsystem/ev_keymap.h
new file mode 100644
index 0000000..a94cf11
--- /dev/null
+++ b/i386/include/IOKit/hidsystem/ev_keymap.h
@@ -0,0 +1,166 @@
+/*
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/* 	Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved. 
+ *
+ *	ev_keymap.h
+ *	Defines the structure used for parsing keymappings.  These structures
+ *	and definitions are used by event sources in the kernel and by
+ *	applications and utilities which manipulate keymaps.
+ *	
+ * HISTORY
+ * 02-Jun-1992    Mike Paquette at NeXT
+ *      Created. 
+ */
+
+#ifndef _DEV_EV_KEYMAP_H
+#define _DEV_EV_KEYMAP_H
+
+#define	NX_NUMKEYCODES	256	/* Highest key code is 0xff. ADB used to use 0x80 for keydown state, but who the heck uses adb anymore. */
+#define NX_NUMSEQUENCES	128	/* Maximum possible number of sequences */
+#define	NX_NUMMODIFIERS	16	/* Maximum number of modifier bits */
+#define	NX_BYTE_CODES	0	/* If first short 0, all are bytes (else shorts) */
+
+#define	NX_WHICHMODMASK	0x0f 	/* bits out of keyBits for bucky bits */
+#define	NX_MODMASK	0x10	/* Bit out of keyBits indicates modifier bit */
+#define	NX_CHARGENMASK	0x20	/* bit out of keyBits for char gen */
+#define	NX_SPECIALKEYMASK 0x40	/* bit out of keyBits for specialty key */
+#define	NX_KEYSTATEMASK	0x80	/* OBSOLETE - DO NOT USE IN NEW DESIGNS */
+
+/*
+ * Special keys currently known to and understood by the system.
+ * If new specialty keys are invented, extend this list as appropriate.
+ * The presence of these keys in a particular implementation is not
+ * guaranteed.
+ */
+#define NX_NOSPECIALKEY			0xFFFF
+#define NX_KEYTYPE_SOUND_UP		0
+#define NX_KEYTYPE_SOUND_DOWN		1
+#define NX_KEYTYPE_BRIGHTNESS_UP	2
+#define NX_KEYTYPE_BRIGHTNESS_DOWN	3
+#define NX_KEYTYPE_CAPS_LOCK		4
+#define NX_KEYTYPE_HELP			5
+#define NX_POWER_KEY			6
+#define	NX_KEYTYPE_MUTE			7
+#define NX_UP_ARROW_KEY			8
+#define NX_DOWN_ARROW_KEY		9
+#define NX_KEYTYPE_NUM_LOCK		10
+
+#define NX_KEYTYPE_CONTRAST_UP		11
+#define NX_KEYTYPE_CONTRAST_DOWN	12
+#define NX_KEYTYPE_LAUNCH_PANEL		13
+#define NX_KEYTYPE_EJECT		14
+#define NX_KEYTYPE_VIDMIRROR		15
+
+#define NX_KEYTYPE_PLAY			16
+#define NX_KEYTYPE_NEXT			17
+#define NX_KEYTYPE_PREVIOUS		18
+#define NX_KEYTYPE_FAST			19
+#define NX_KEYTYPE_REWIND		20
+
+#define NX_KEYTYPE_ILLUMINATION_UP	21
+#define NX_KEYTYPE_ILLUMINATION_DOWN	22
+#define NX_KEYTYPE_ILLUMINATION_TOGGLE	23
+
+#define	NX_NUMSPECIALKEYS		24 /* Maximum number of special keys */
+#define NX_NUM_SCANNED_SPECIALKEYS	24 /* First 24 special keys are */
+					  /* actively scanned in kernel */
+
+/* Mask of special keys that are posted as events */
+
+#define NX_SPECIALKEY_POST_MASK		\
+                                ((1 << NX_KEYTYPE_SOUND_UP) | (1 << NX_KEYTYPE_SOUND_DOWN) | \
+                                (1 << NX_POWER_KEY) | (1 << NX_KEYTYPE_MUTE) | \
+                                (1 << NX_KEYTYPE_BRIGHTNESS_UP) | (1 << NX_KEYTYPE_BRIGHTNESS_DOWN) | \
+                                (1 << NX_KEYTYPE_CONTRAST_UP) | (1 << NX_KEYTYPE_CONTRAST_UP) | \
+                                (1 << NX_KEYTYPE_LAUNCH_PANEL) | (1 << NX_KEYTYPE_EJECT) | \
+                                (1 << NX_KEYTYPE_VIDMIRROR) | (1 << NX_KEYTYPE_PLAY) | \
+                                (1 << NX_KEYTYPE_NEXT) | (1 << NX_KEYTYPE_PREVIOUS) | \
+                                (1 << NX_KEYTYPE_FAST) | (1 << NX_KEYTYPE_REWIND) | \
+                                (1 << NX_KEYTYPE_ILLUMINATION_UP) | \
+                                (1 << NX_KEYTYPE_ILLUMINATION_DOWN) | \
+                                (1 << NX_KEYTYPE_ILLUMINATION_TOGGLE) | 0)
+
+/* Modifier key indices into modDefs[] */
+#define NX_MODIFIERKEY_ALPHALOCK	0
+#define NX_MODIFIERKEY_SHIFT		1
+#define NX_MODIFIERKEY_CONTROL		2
+#define NX_MODIFIERKEY_ALTERNATE	3
+#define NX_MODIFIERKEY_COMMAND		4
+#define NX_MODIFIERKEY_NUMERICPAD	5
+#define NX_MODIFIERKEY_HELP		6
+#define NX_MODIFIERKEY_SECONDARYFN     	7
+#define NX_MODIFIERKEY_NUMLOCK		8
+
+/* support for right hand modifier */
+#define NX_MODIFIERKEY_RSHIFT		9
+#define NX_MODIFIERKEY_RCONTROL		10
+#define NX_MODIFIERKEY_RALTERNATE	11
+#define NX_MODIFIERKEY_RCOMMAND		12
+
+
+typedef struct _NXParsedKeyMapping_ {
+ 	/* If nonzero, all numbers are shorts; if zero, all numbers are bytes*/
+	short	shorts;
+	
+	/*
+	 *  For each keycode, low order bit says if the key
+	 *  generates characters.
+	 *  High order bit says if the key is assigned to a modifier bit.
+	 *  The second to low order bit gives the current state of the key.
+	 */
+	char	keyBits[NX_NUMKEYCODES];
+	
+	/* Bit number of highest numbered modifier bit */
+	int			maxMod;
+	
+	/* Pointers to where the list of keys for each modifiers bit begins,
+	 * or NULL.
+	 */
+	unsigned char *modDefs[NX_NUMMODIFIERS];
+	
+	/* Key code of highest key deinfed to generate characters */
+	int			numDefs;
+	
+	/* Pointer into the keyMapping where this key's definitions begin */
+	unsigned char *keyDefs[NX_NUMKEYCODES];
+	
+	/* number of sequence definitions */
+	int			numSeqs;
+	
+	/* pointers to sequences */
+	unsigned char *seqDefs[NX_NUMSEQUENCES];
+	
+	/* Special key definitions */
+	int			numSpecialKeys;
+	
+	/* Special key values, or 0xFFFF if none */
+	unsigned short specialKeys[NX_NUMSPECIALKEYS];
+	
+	/* Pointer to the original keymapping string */	
+	const unsigned char *mapping;
+	
+	/* Length of the original string */
+	int	mappingLen;	
+} NXParsedKeyMapping;
+
+#endif /* !_DEV_EV_KEYMAP_H */
diff --git a/i386/include/IOKit/i2c/IOI2CInterface.h b/i386/include/IOKit/i2c/IOI2CInterface.h
new file mode 100644
index 0000000..70a38e2
--- /dev/null
+++ b/i386/include/IOKit/i2c/IOI2CInterface.h
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOI2CINTERFACE_H
+#define _IOKIT_IOI2CINTERFACE_H
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+typedef struct IOI2CRequest IOI2CRequest;
+typedef struct IOI2CBuffer IOI2CBuffer;
+
+typedef void (*IOI2CRequestCompletion) (IOI2CRequest * request);
+
+// IOI2CRequest.sendTransactionType, IOI2CRequest.replyTransactionType
+enum {
+    kIOI2CNoTransactionType         = 0,
+    kIOI2CSimpleTransactionType     = 1,
+    kIOI2CDDCciReplyTransactionType = 2,
+    kIOI2CCombinedTransactionType   = 3,
+    kIOI2CDisplayPortNativeTransactionType = 4
+};
+
+// IOI2CRequest.commFlags
+enum {
+    kIOI2CUseSubAddressCommFlag     = 0x00000002
+};
+
+/*!
+ * @struct IOI2CRequest
+ * @abstract A structure defining an I2C bus transaction.
+ * @discussion This structure is used to request an I2C transaction consisting of a send (write) to and reply (read) from a device, either of which is optional, to be carried out atomically on an I2C bus.
+ * @field __reservedA Set to zero.
+ * @field result The result of the transaction. Common errors are kIOReturnNoDevice if there is no device responding at the given address, kIOReturnUnsupportedMode if the type of transaction is unsupported on the requested bus.
+ * @field completion A completion routine to be executed when the request completes. If NULL is passed, the request is synchronous, otherwise it may execute asynchronously.
+ * @field commFlags Flags that modify the I2C transaction type. The following flags are defined:<br>
+ *      kIOI2CUseSubAddressCommFlag Transaction includes a subaddress.<br>
+ * @field minReplyDelay Minimum delay as absolute time between send and reply transactions.
+ * @field sendAddress I2C address to write.
+ * @field sendSubAddress I2C subaddress to write.
+ * @field __reservedB Set to zero.
+ * @field sendTransactionType The following types of transaction are defined for the send part of the request:<br>
+ *      kIOI2CNoTransactionType No send transaction to perform. <br>
+ *      kIOI2CSimpleTransactionType Simple I2C message. <br>
+ *      kIOI2CCombinedTransactionType Combined format I2C R/~W transaction. <br>
+ * @field sendBuffer Pointer to the send buffer.
+ * @field sendBytes Number of bytes to send. Set to actual bytes sent on completion of the request.
+ * @field replyAddress I2C Address from which to read.
+ * @field replySubAddress I2C Address from which to read.
+ * @field __reservedC Set to zero.
+ * @field replyTransactionType The following types of transaction are defined for the reply part of the request:<br>
+ *      kIOI2CNoTransactionType No reply transaction to perform. <br>
+ *      kIOI2CSimpleTransactionType Simple I2C message. <br>
+ *      kIOI2CDDCciReplyTransactionType DDC/ci message (with embedded length). See VESA DDC/ci specification. <br>
+ *      kIOI2CCombinedTransactionType Combined format I2C R/~W transaction. <br>
+ * @field replyBuffer Pointer to the reply buffer.
+ * @field replyBytes Max bytes to reply (size of replyBuffer). Set to actual bytes received on completion of the request.
+ * @field __reservedD Set to zero.
+ */
+
+#pragma pack(push, 4)
+struct IOI2CRequest
+{
+    IOOptionBits                sendTransactionType;
+    IOOptionBits                replyTransactionType;
+    uint32_t                    sendAddress;
+    uint32_t                    replyAddress;
+    uint8_t                     sendSubAddress;
+    uint8_t                     replySubAddress;
+    uint8_t                     __reservedA[2];
+
+    uint64_t                    minReplyDelay;
+
+    IOReturn                    result;
+    IOOptionBits                commFlags;
+
+#if defined(__LP64__)
+    uint32_t                    __padA;
+#else
+    vm_address_t                sendBuffer;
+#endif
+    uint32_t                    sendBytes;
+
+    uint32_t                    __reservedB[2];
+
+#if defined(__LP64__)
+    uint32_t                    __padB;
+#else
+    vm_address_t                replyBuffer;
+#endif
+    uint32_t                    replyBytes;
+
+    IOI2CRequestCompletion      completion;
+#if !defined(__LP64__)
+    uint32_t                    __padC[5];
+#else
+    vm_address_t                sendBuffer;
+    vm_address_t                replyBuffer;
+#endif
+
+    uint32_t                    __reservedC[10];
+#ifdef __ppc__
+    uint32_t                    __reservedD;
+#endif
+};
+#pragma pack(pop)
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#define kIOI2CInterfaceClassName        "IOI2CInterface"
+
+#define kIOI2CInterfaceIDKey            "IOI2CInterfaceID"
+#define kIOI2CBusTypeKey                "IOI2CBusType"
+#define kIOI2CTransactionTypesKey       "IOI2CTransactionTypes"
+#define kIOI2CSupportedCommFlagsKey     "IOI2CSupportedCommFlags"
+
+#define kIOFBI2CInterfaceInfoKey        "IOFBI2CInterfaceInfo"
+#define kIOFBI2CInterfaceIDsKey         "IOFBI2CInterfaceIDs"
+
+// kIOI2CBusTypeKey values
+enum {
+    kIOI2CBusTypeI2C            = 1,
+    kIOI2CBusTypeDisplayPort    = 2
+};
+
+/*!
+ * @struct IOI2CBusTiming
+ * @abstract A structure defining low level timing for an I2C bus.
+ * @discussion This structure is used to specify timeouts and pulse widths for an I2C bus implementation.
+ * @field bitTimeout Maximum time a slave can delay (by pulling the clock line low) a single bit response.
+ * @field byteTimeout Maximum time a slave can delay (by pulling the clock line low) the first bit of a byte response.
+ * @field acknowledgeTimeout Maximum time to wait for a slave to respond with an ACK after writing a byte.
+ * @field startTimeout Maximum time to wait for a slave to respond after a start signal.
+ * @field riseFallTime Time to wait after any change in output signal.
+ * @field __reservedA Set to zero.
+ */
+
+struct IOI2CBusTiming
+{
+    AbsoluteTime                bitTimeout;
+    AbsoluteTime                byteTimeout;
+    AbsoluteTime                acknowledgeTimeout;
+    AbsoluteTime                startTimeout;
+    AbsoluteTime                holdTime;
+    AbsoluteTime                riseFallTime;
+    UInt32                      __reservedA[8];
+};
+typedef struct IOI2CBusTiming IOI2CBusTiming;
+
+#ifndef KERNEL
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+// options for IOFBCopyI2CInterfaceForBus()
+enum {
+    kIOI2CBusNumberMask                 = 0x000000ff
+};
+
+
+/*! @function IOFBGetI2CInterfaceCount
+    @abstract Returns a count of I2C interfaces available associated with an IOFramebuffer instance.
+    @discussion Returns a count of I2C interfaces available associated with an IOFramebuffer instance.
+    @param framebuffer The io_service_t of an IOFramebuffer instance. CoreGraphics will provide this for a CGDisplay with the CGDisplayIOServicePort() call.
+    @param count Interface count is returned.
+    @result An IOReturn code. */
+
+IOReturn IOFBGetI2CInterfaceCount( io_service_t framebuffer, IOItemCount * count );
+
+/*! @function IOFBCopyI2CInterfaceForBus
+    @abstract Returns an instance of an I2C bus interface, associated with an IOFramebuffer instance / bus index pair.
+    @discussion Some graphics devices will allow access to an I2C bus routed through a display connector in order to control external devices on that bus. This function returns an instance of an I2C bus interface, associated with an IOFramebuffer instance / bus index pair. The number of I2C buses is available from the IOFBGetI2CInterfaceCount() call. The interface may be used with the IOI2CInterfaceOpen/Close/SendRequest() calls to carry out I2C transactions on that bus. Not all graphics devices support this functionality.
+    @param bus The zero based index of the bus on the requested framebuffer.
+    @param interface The interface instance is returned. The caller should release this instance with IOObjectRelease().
+    @result An IOReturn code. */
+
+IOReturn IOFBCopyI2CInterfaceForBus( io_service_t framebuffer, IOOptionBits bus, io_service_t * interface );
+
+typedef struct IOI2CConnect * IOI2CConnectRef;  /* struct IOI2CConnect is opaque */
+
+IOReturn IOI2CCopyInterfaceForID( CFTypeRef identifier, io_service_t * interface );
+
+/*! @function IOI2CInterfaceOpen
+    @abstract Opens an instance of an I2C bus interface, allowing I2C requests to be made.
+    @discussion An instance of an I2C bus interface, obtained by IOFBCopyI2CInterfaceForBus, is opened with this function allowing I2C requests to be made.
+    @param interface An I2C bus interface (see IOFBCopyI2CInterfaceForBus). The interface may be released after this call is made.
+    @param options Pass kNilOptions.
+    @param connect The opaque IOI2CConnectRef is returned, for use with IOI2CSendRequest() and IOI2CInterfaceClose().
+    @result An IOReturn code. */
+
+IOReturn IOI2CInterfaceOpen( io_service_t interface, IOOptionBits options,
+                             IOI2CConnectRef * connect );
+
+/*! @function IOI2CInterfaceClose
+    @abstract Closes an IOI2CConnectRef.
+    @discussion Frees the resources associated with an IOI2CConnectRef.
+    @param connect The opaque IOI2CConnectRef returned by IOI2CInterfaceOpen().
+    @param options Pass kNilOptions.
+    @result An IOReturn code. */
+
+IOReturn IOI2CInterfaceClose( IOI2CConnectRef connect, IOOptionBits options );
+
+/*! @function IOI2CSendRequest
+    @abstract Carries out the I2C transaction specified by an IOI2CRequest structure.
+    @discussion Frees the resources associated with an IOI2CConnectRef.
+    @param connect The opaque IOI2CConnectRef returned by IOI2CInterfaceOpen().
+    @param options Pass kNilOptions.
+    @param request Pass a pointer to a IOI2CRequest structure describing the request. If an asynchronous request (with a non-NULL completion routine) the request structure must be valid for the life of the request.
+    @result An IOReturn code reflecting only the result of starting the transaction. If the result of IOI2CSendRequest() is kIOReturnSuccess, the I2C transaction result is returned in the result field of the request structure. */
+
+IOReturn IOI2CSendRequest( IOI2CConnectRef connect, IOOptionBits options, 
+                           IOI2CRequest * request );
+
+#else
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*! @class IOI2CInterface
+    @abstract The base class for an I2C bus interface.
+    @discussion The IOI2CInterface base class defines an I2C bus interface. Not useful for developers. */
+
+class IOI2CInterface : public IOService
+{
+    OSDeclareDefaultStructors(IOI2CInterface)
+    
+protected:
+    UInt64      fID;
+
+public:
+    IOReturn newUserClient( task_t              owningTask,
+                            void *              security_id,
+                            UInt32              type,
+                            IOUserClient **     handler );
+
+    bool registerI2C( UInt64 id );
+
+    virtual IOReturn startIO( IOI2CRequest * request ) = 0;
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#endif /* KERNEL */
+
+#endif /* ! _IOKIT_IOI2CINTERFACE_H */
+
diff --git a/i386/include/IOKit/ndrvsupport/IOMacOSTypes.h b/i386/include/IOKit/ndrvsupport/IOMacOSTypes.h
new file mode 100644
index 0000000..0a2aae7
--- /dev/null
+++ b/i386/include/IOKit/ndrvsupport/IOMacOSTypes.h
@@ -0,0 +1,441 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1997 Apple Computer, Inc.
+ *
+ *
+ * HISTORY
+ *
+ * sdouglas  22 Oct 97 - first checked in.
+ * sdouglas  21 July 98 - start IOKit
+ */
+
+/*
+    File:       Types.h
+ 
+    Contains:   Basic Macintosh data types.
+ 
+    Version:    Technology: PowerSurge 1.0.2.
+                Package:    Universal Interfaces 2.1.2 on ETO #20
+ 
+    Copyright:  � 1984-1995 by Apple Computer, Inc.
+                All rights reserved.
+ 
+    Bugs?:      If you find a problem with this file, use the Apple Bug Reporter
+                stack.  Include the file and version information (from above)
+                in the problem description and send to:
+                    Internet:   apple.bugs@applelink.apple.com
+                    AppleLink:  APPLE.BUGS
+ 
+*/
+
+#ifndef _IOKIT_IOMACOSTYPES_H
+#define _IOKIT_IOMACOSTYPES_H
+#ifndef __MACTYPES__
+
+#include <IOKit/IOTypes.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef __LP64__
+#pragma options align=mac68k
+#endif
+
+#ifndef NULL
+#if !defined(__cplusplus) && (defined(__SC__) || defined(THINK_C))
+#define NULL ((void *) 0)
+#else
+#define NULL 0
+#endif
+#endif
+
+enum {
+    noErr                       = 0
+};
+
+typedef uintptr_t KernelProcessID;
+typedef uintptr_t AddressSpaceID;
+
+#if 0
+#ifndef __cplusplus
+enum { false, true };
+#endif
+#endif
+
+typedef unsigned char Byte;
+
+typedef signed char SignedByte;
+
+typedef UInt16 UniChar;
+
+typedef char *Ptr;
+
+typedef Ptr *Handle;
+
+typedef UInt32 Fixed;
+
+typedef Fixed *FixedPtr;
+
+typedef UInt32 Fract;
+
+typedef Fract *FractPtr;
+
+struct _extended80 {
+    short                           exp;
+    short                           man[4];
+};
+struct _extended96 {
+    short                           exp[2];
+    short                           man[4];
+};
+typedef struct wide                             *WidePtr;
+
+typedef struct UnsignedWide             *UnsignedWidePtr;
+
+
+/*
+enum {
+    false,
+    true
+};
+#if !__option(bool)
+    #ifndef true
+        #define true            1
+    #endif
+    #ifndef false
+        #define false           0
+    #endif
+#endif
+
+typedef unsigned char Boolean;
+*/
+
+
+typedef short OSErr;
+
+typedef unsigned int FourCharCode;
+
+typedef FourCharCode OSType;
+
+typedef FourCharCode ResType;
+
+typedef OSType *OSTypePtr;
+
+typedef ResType *ResTypePtr;
+
+struct Rect {
+    short                           top;
+    short                           left;
+    short                           bottom;
+    short                           right;
+};
+typedef struct Rect Rect;
+
+typedef Rect *RectPtr;
+
+// Quickdraw.i
+
+/*
+    kVariableLengthArray is used in array bounds to specify a variable length array.
+    It is ususally used in variable length structs when the last field is an array
+    of any size.  Before ANSI C, we used zero as the bounds of variable length 
+    array, but that is illegal in ANSI C.  Example:
+    
+        struct FooList 
+        {
+            short   listLength;
+            Foo     elements[kVariableLengthArray];
+        };
+*/
+
+enum {
+    kVariableLengthArray        = 1
+};
+
+/* Numeric version part of 'vers' resource */
+struct NumVersion {
+    UInt8                           majorRev;                   /*1st part of version number in BCD*/
+    UInt8                           minorAndBugRev;             /*2nd & 3rd part of version number share a byte*/
+    UInt8                           stage;                      /*stage code: dev, alpha, beta, final*/
+    UInt8                           nonRelRev;                  /*revision level of non-released version*/
+};
+typedef struct NumVersion NumVersion;
+
+typedef struct OpaqueRef *KernelID;
+
+typedef UInt8 *BytePtr;
+
+typedef IOByteCount ByteCount;
+
+typedef IOItemCount ItemCount;
+
+typedef void *LogicalAddress;
+
+#if !defined(__LP64__)
+typedef void *PhysicalAddress;
+#endif
+
+typedef UInt32 PBVersion;
+
+typedef SInt32 Duration;
+
+#define kInvalidID 0
+
+enum {
+    kNilOptions                 = 0
+};
+
+
+typedef unsigned char Str31[32];
+
+
+/*
+From:
+        File:           DriverFamilyMatching.i <18>
+        Copyright:      � 1995-1996 by Apple Computer, Inc., all rights reserved.
+*/
+
+//##############################################
+// Well known properties in the Name Registry
+//##############################################
+
+#define kPropertyName                                   "name"
+#define kPropertyCompatible                             "compatible"
+#define kPropertyDriverPtr                              "driver-ptr"
+#define kPropertyDriverDesc                             "driver-description"
+#define kPropertyReg                                    "reg"
+#define kPropertyAAPLAddress                            "AAPL,address"
+#define kPropertyMatching                               "matching"
+
+
+//#########################################################
+// Descriptor for Drivers and NDRVs
+//#########################################################
+/* Driver Typing Information Used to Match Drivers With Devices */
+struct DriverType {
+        Str31                                                   nameInfoStr;                            /* Driver Name/Info String*/
+        NumVersion                                              version;                                        /* Driver Version Number*/
+};
+typedef struct DriverType                       DriverType;
+typedef DriverType *                            DriverTypePtr;
+
+/* OS Runtime Information Used to Setup and Maintain a Driver's Runtime Environment */
+typedef OptionBits RuntimeOptions;
+
+
+enum {
+        kDriverIsLoadedUponDiscovery = 0x00000001,                                      /* auto-load driver when discovered*/
+        kDriverIsOpenedUponLoad         =  0x00000002,                                  /* auto-open driver when loaded*/
+        kDriverIsUnderExpertControl     =  0x00000004,                                  /* I/O expert handles loads/opens*/
+        kDriverIsConcurrent                     =  0x00000008,                                  /* supports concurrent requests*/
+        kDriverQueuesIOPB                       =  0x00000010,                                  /* device manager doesn't queue IOPB*/
+        kDriverIsLoadedAtBoot           =  0x00000020,                                  /* Driver is loaded at the boot time */
+        kDriverIsForVirtualDevice       =  0x00000040,                                  /* Driver is for a virtual Device */ 
+        kDriverSupportDMSuspendAndResume = 0x00000080                           /* Driver supports Device Manager Suspend and Resume command */
+};
+
+struct DriverOSRuntime {
+        RuntimeOptions                                  driverRuntime;                          /* Options for OS Runtime*/
+        Str31                                                   driverName;                                     /* Driver's name to the OS*/
+        UInt32                                                  driverDescReserved[8];          /* Reserved area*/
+};
+typedef struct DriverOSRuntime          DriverOSRuntime;
+typedef DriverOSRuntime *                       DriverOSRuntimePtr;
+
+/* OS Service Information Used To Declare What APIs a Driver Supports */
+typedef UInt32 ServiceCount;
+
+struct DriverServiceInfo {
+        OSType                                                  serviceCategory;                        /* Service Category Name*/
+        OSType                                                  serviceType;                            /* Type within Category*/
+        NumVersion                                              serviceVersion;                         /* Version of service*/
+};
+typedef struct DriverServiceInfo        DriverServiceInfo;
+typedef DriverServiceInfo *                     DriverServiceInfoPtr;
+
+struct DriverOSService {
+        ServiceCount                                    nServices;                                      /* Number of Services Supported*/
+        DriverServiceInfo                               service[1];                                     /* The List of Services (at least one)*/
+};
+typedef struct DriverOSService          DriverOSService;
+typedef DriverOSService *                       DriverOSServicePtr;
+
+/* Categories */
+
+enum {
+        kServiceCategoryDisplay                 = 'disp',                                               /* Display Manager*/
+        kServiceCategoryOpenTransport   = 'otan',                                               /* Open Transport*/
+        kServiceCategoryBlockStorage    = 'blok',                                               /* Block Storage*/
+        kServiceCategoryNdrvDriver              = 'ndrv',                                               /* Generic Native Driver*/
+        kServiceCategoryScsiSIM                 = 'scsi',                                               /* SCSI */
+        kServiceCategoryFileManager             = 'file',                                               /* File Manager */
+        kServiceCategoryIDE                             = 'ide-',                                               /* ide */
+        kServiceCategoryADB                             = 'adb-',                                               /* adb */
+        kServiceCategoryPCI                             = 'pci-',                                               /* pci bus */
+                                                                                                                                        /* Nu Bus */
+        kServiceCategoryDFM                             = 'dfm-',                                               /* DFM */
+        kServiceCategoryMotherBoard             = 'mrbd',                                               /* mother Board */
+        kServiceCategoryKeyboard                = 'kybd',                                               /* Keyboard */
+        kServiceCategoryPointing                = 'poit',                                               /* Pointing */
+        kServiceCategoryRTC                             = 'rtc-',                                               /* RTC */
+        kServiceCategoryNVRAM                   = 'nram',                                               /* NVRAM */
+        kServiceCategorySound                   = 'sond',                                               /* Sound (1/3/96 MCS) */
+        kServiceCategoryPowerMgt                = 'pgmt',                                               /* Power Management */
+        kServiceCategoryGeneric                 = 'genr'                                                /* Generic Service Category to receive general Events */
+};
+
+/* Ndrv ServiceCategory Types */
+enum {
+        kNdrvTypeIsGeneric                      = 'genr',                                               /* generic*/
+        kNdrvTypeIsVideo                        = 'vido',                                               /* video*/
+        kNdrvTypeIsBlockStorage         = 'blok',                                               /* block storage*/
+        kNdrvTypeIsNetworking           = 'netw',                                               /* networking*/
+        kNdrvTypeIsSerial                       = 'serl',                                               /* serial*/
+        kNdrvTypeIsParallel                     = 'parl',                                               /* parallel */
+        kNdrvTypeIsSound                        = 'sond',                                               /* sound*/
+        kNdrvTypeIsBusBridge            = 'brdg'
+};
+
+typedef UInt32 DriverDescVersion;
+
+/*      The Driver Description */
+enum {
+        kInitialDriverDescriptor        = 0,
+        kVersionOneDriverDescriptor     = 1
+};
+
+enum {
+        kTheDescriptionSignature        = 'mtej',
+        kDriverDescriptionSignature     = 'pdes'                                                
+};
+
+
+struct DriverDescription {
+        OSType                                                  driverDescSignature;            /* Signature field of this structure*/
+        DriverDescVersion                               driverDescVersion;                      /* Version of this data structure*/
+        DriverType                                              driverType;                                     /* Type of Driver*/
+        DriverOSRuntime                                 driverOSRuntimeInfo;            /* OS Runtime Requirements of Driver*/
+        DriverOSService                                 driverServices;                         /* Apple Service API Membership*/
+};
+typedef struct DriverDescription        DriverDescription;
+typedef DriverDescription *                     DriverDescriptionPtr;
+
+
+#ifndef __LP64__
+#pragma options align=reset
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MACTYPES__ */
+
+#ifndef __QUICKDRAW__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef __LP64__
+#pragma options align=mac68k
+#endif
+
+struct RGBColor {
+ unsigned short red;                /*magnitude of red component*/
+ unsigned short green;              /*magnitude of green component*/
+ unsigned short blue;               /*magnitude of blue component*/
+};
+typedef struct RGBColor     RGBColor;
+typedef RGBColor            *RGBColorPtr;
+typedef RGBColorPtr         *RGBColorHdl;
+
+struct ColorSpec {
+ short value;                       /*index or other value*/
+ RGBColor rgb;                      /*true color*/
+};
+
+typedef struct ColorSpec    ColorSpec;
+typedef ColorSpec           *ColorSpecPtr;
+
+struct GammaTbl {
+ short gVersion;                    /*gamma version number*/
+ short gType;                       /*gamma data type*/
+ short gFormulaSize;                /*Formula data size*/
+ short gChanCnt;                    /*number of channels of data*/
+ short gDataCnt;                    /*number of values/channel*/
+ short gDataWidth;                  /*bits/corrected value (data packed to next larger byte size)*/
+ short gFormulaData[1];             /*data for formulas followed by gamma values*/
+};
+typedef struct GammaTbl     GammaTbl;
+typedef GammaTbl            *GammaTblPtr;
+
+struct RegEntryID
+{
+    void * opaque[4];
+};
+typedef struct RegEntryID RegEntryID;
+typedef RegEntryID *                    RegEntryIDPtr;
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+struct IONDRVControlParameters {
+    UInt8       __reservedA[0x1a];
+    UInt16      code;
+    void *      params;
+    UInt8       __reservedB[0x12];
+};
+
+enum {
+    kIONDRVOpenCommand                = 128 + 0,
+    kIONDRVCloseCommand               = 128 + 1,
+    kIONDRVReadCommand                = 128 + 2,
+    kIONDRVWriteCommand               = 128 + 3,
+    kIONDRVControlCommand             = 128 + 4,
+    kIONDRVStatusCommand              = 128 + 5,
+    kIONDRVKillIOCommand              = 128 + 6,
+    kIONDRVInitializeCommand          = 128 + 7,                /* init driver and device*/
+    kIONDRVFinalizeCommand            = 128 + 8,                /* shutdown driver and device*/
+    kIONDRVReplaceCommand             = 128 + 9,                /* replace an old driver*/
+    kIONDRVSupersededCommand          = 128 + 10                /* prepare to be replaced by a new driver*/
+};
+enum {
+    kIONDRVSynchronousIOCommandKind   = 0x00000001,
+    kIONDRVAsynchronousIOCommandKind  = 0x00000002,
+    kIONDRVImmediateIOCommandKind     = 0x00000004
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef __LP64__
+#pragma options align=reset
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __QUICKDRAW__ */
+
+#endif /* _IOKIT_IOMACOSTYPES_H */
diff --git a/i386/include/IOKit/ndrvsupport/IOMacOSVideo.h b/i386/include/IOKit/ndrvsupport/IOMacOSVideo.h
new file mode 100644
index 0000000..795072b
--- /dev/null
+++ b/i386/include/IOKit/ndrvsupport/IOMacOSVideo.h
@@ -0,0 +1,1391 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+     File:       Video.h
+ 
+     Contains:   Video Driver Interfaces.
+ 
+     Copyright:  (c) 1986-2000 by Apple Computer, Inc., all rights reserved
+ 
+     Bugs?:      For bug reports, consult the following page on
+                 the World Wide Web:
+ 
+                     http://developer.apple.com/bugreporter/
+ 
+*/
+#ifndef __IOMACOSVIDEO__
+#define __IOMACOSVIDEO__
+
+#define PRAGMA_STRUCT_ALIGN 1
+#define FOUR_CHAR_CODE(x)           (x)
+#include <IOKit/ndrvsupport/IOMacOSTypes.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef __LP64__
+#pragma options align=mac68k
+#endif
+
+enum {
+    mBaseOffset                 = 1,                            /*Id of mBaseOffset.*/
+    mRowBytes                   = 2,                            /*Video sResource parameter Id's */
+    mBounds                     = 3,                            /*Video sResource parameter Id's */
+    mVersion                    = 4,                            /*Video sResource parameter Id's */
+    mHRes                       = 5,                            /*Video sResource parameter Id's */
+    mVRes                       = 6,                            /*Video sResource parameter Id's */
+    mPixelType                  = 7,                            /*Video sResource parameter Id's */
+    mPixelSize                  = 8,                            /*Video sResource parameter Id's */
+    mCmpCount                   = 9,                            /*Video sResource parameter Id's */
+    mCmpSize                    = 10,                           /*Video sResource parameter Id's */
+    mPlaneBytes                 = 11,                           /*Video sResource parameter Id's */
+    mVertRefRate                = 14,                           /*Video sResource parameter Id's */
+    mVidParams                  = 1,                            /*Video parameter block id.*/
+    mTable                      = 2,                            /*Offset to the table.*/
+    mPageCnt                    = 3,                            /*Number of pages*/
+    mDevType                    = 4,                            /*Device Type*/
+    oneBitMode                  = 128,                          /*Id of OneBitMode Parameter list.*/
+    twoBitMode                  = 129,                          /*Id of TwoBitMode Parameter list.*/
+    fourBitMode                 = 130,                          /*Id of FourBitMode Parameter list.*/
+    eightBitMode                = 131                           /*Id of EightBitMode Parameter list.*/
+};
+
+enum {
+    sixteenBitMode              = 132,                          /*Id of SixteenBitMode Parameter list.*/
+    thirtyTwoBitMode            = 133,                          /*Id of ThirtyTwoBitMode Parameter list.*/
+    firstVidMode                = 128,                          /*The new, better way to do the above. */
+    secondVidMode               = 129,                          /* QuickDraw only supports six video */
+    thirdVidMode                = 130,                          /* at this time.      */
+    fourthVidMode               = 131,
+    fifthVidMode                = 132,
+    sixthVidMode                = 133,
+    spGammaDir                  = 64,
+    spVidNamesDir               = 65
+};
+
+typedef UInt32                          AVIDType;
+typedef AVIDType                        DisplayIDType;
+typedef IODisplayModeID                 DisplayModeID;
+typedef UInt16                          DepthMode;
+typedef UInt32                          VideoDeviceType;
+typedef UInt32                          GammaTableID;
+
+/* csTimingFormat values in VDTimingInfo */
+/* look in the declaration rom for timing info */
+enum {
+    kDeclROMtables              = FOUR_CHAR_CODE('decl'),
+    kDetailedTimingFormat       = FOUR_CHAR_CODE('arba')        /* Timing is a detailed timing*/
+};
+
+/* Size of a block of EDID (Extended Display Identification Data) */
+enum {
+    kDDCBlockSize               = 128
+};
+
+/* ddcBlockType constants*/
+enum {
+    kDDCBlockTypeEDID           = 0                             /* EDID block type. */
+};
+
+/* ddcFlags constants*/
+enum {
+    kDDCForceReadBit            = 0,                            /* Force a new read of the EDID. */
+    kDDCForceReadMask           = (1 << kDDCForceReadBit)       /* Mask for kddcForceReadBit. */
+};
+
+
+/* Timing mode constants for Display Manager MultiMode support
+    Corresponding   .h equates are in Video.h
+                    .a equates are in Video.a
+                    .r equates are in DepVideoEqu.r
+    
+    The second enum is the old names (for compatibility).
+    The first enum is the new names.
+*/
+enum {
+    timingInvalid               = 0,                            /*    Unknown timing... force user to confirm. */
+    timingInvalid_SM_T24        = 8,                            /*    Work around bug in SM Thunder24 card.*/
+    timingApple_FixedRateLCD    = 42,                           /*    Lump all fixed-rate LCDs into one category.*/
+    timingApple_512x384_60hz    = 130,                          /*  512x384  (60 Hz) Rubik timing. */
+    timingApple_560x384_60hz    = 135,                          /*  560x384  (60 Hz) Rubik-560 timing. */
+    timingApple_640x480_67hz    = 140,                          /*  640x480  (67 Hz) HR timing. */
+    timingApple_640x400_67hz    = 145,                          /*  640x400  (67 Hz) HR-400 timing. */
+    timingVESA_640x480_60hz     = 150,                          /*  640x480  (60 Hz) VGA timing. */
+    timingVESA_640x480_72hz     = 152,                          /*  640x480  (72 Hz) VGA timing. */
+    timingVESA_640x480_75hz     = 154,                          /*  640x480  (75 Hz) VGA timing. */
+    timingVESA_640x480_85hz     = 158,                          /*  640x480  (85 Hz) VGA timing. */
+    timingGTF_640x480_120hz     = 159,                          /*  640x480  (120 Hz) VESA Generalized Timing Formula */
+    timingApple_640x870_75hz    = 160,                          /*  640x870  (75 Hz) FPD timing.*/
+    timingApple_640x818_75hz    = 165,                          /*  640x818  (75 Hz) FPD-818 timing.*/
+    timingApple_832x624_75hz    = 170,                          /*  832x624  (75 Hz) GoldFish timing.*/
+    timingVESA_800x600_56hz     = 180,                          /*  800x600  (56 Hz) SVGA timing. */
+    timingVESA_800x600_60hz     = 182,                          /*  800x600  (60 Hz) SVGA timing. */
+    timingVESA_800x600_72hz     = 184,                          /*  800x600  (72 Hz) SVGA timing. */
+    timingVESA_800x600_75hz     = 186,                          /*  800x600  (75 Hz) SVGA timing. */
+    timingVESA_800x600_85hz     = 188,                          /*  800x600  (85 Hz) SVGA timing. */
+    timingVESA_1024x768_60hz    = 190,                          /* 1024x768  (60 Hz) VESA 1K-60Hz timing. */
+    timingVESA_1024x768_70hz    = 200,                          /* 1024x768  (70 Hz) VESA 1K-70Hz timing. */
+    timingVESA_1024x768_75hz    = 204,                          /* 1024x768  (75 Hz) VESA 1K-75Hz timing (very similar to timingApple_1024x768_75hz). */
+    timingVESA_1024x768_85hz    = 208,                          /* 1024x768  (85 Hz) VESA timing. */
+    timingApple_1024x768_75hz   = 210,                          /* 1024x768  (75 Hz) Apple 19" RGB. */
+    timingApple_1152x870_75hz   = 220,                          /* 1152x870  (75 Hz) Apple 21" RGB. */
+    timingAppleNTSC_ST          = 230,                          /*  512x384  (60 Hz, interlaced, non-convolved). */
+    timingAppleNTSC_FF          = 232,                          /*  640x480  (60 Hz, interlaced, non-convolved). */
+    timingAppleNTSC_STconv      = 234,                          /*  512x384  (60 Hz, interlaced, convolved). */
+    timingAppleNTSC_FFconv      = 236,                          /*  640x480  (60 Hz, interlaced, convolved). */
+    timingApplePAL_ST           = 238,                          /*  640x480  (50 Hz, interlaced, non-convolved). */
+    timingApplePAL_FF           = 240,                          /*  768x576  (50 Hz, interlaced, non-convolved). */
+    timingApplePAL_STconv       = 242,                          /*  640x480  (50 Hz, interlaced, convolved). */
+    timingApplePAL_FFconv       = 244,                          /*  768x576  (50 Hz, interlaced, convolved). */
+    timingVESA_1280x960_75hz    = 250,                          /* 1280x960  (75 Hz) */
+    timingVESA_1280x960_60hz    = 252,                          /* 1280x960  (60 Hz) */
+    timingVESA_1280x960_85hz    = 254,                          /* 1280x960  (85 Hz) */
+    timingVESA_1280x1024_60hz   = 260,                          /* 1280x1024 (60 Hz) */
+    timingVESA_1280x1024_75hz   = 262,                          /* 1280x1024 (75 Hz) */
+    timingVESA_1280x1024_85hz   = 268,                          /* 1280x1024 (85 Hz) */
+    timingVESA_1600x1200_60hz   = 280,                          /* 1600x1200 (60 Hz) VESA timing. */
+    timingVESA_1600x1200_65hz   = 282,                          /* 1600x1200 (65 Hz) VESA timing. */
+    timingVESA_1600x1200_70hz   = 284,                          /* 1600x1200 (70 Hz) VESA timing. */
+    timingVESA_1600x1200_75hz   = 286,                          /* 1600x1200 (75 Hz) VESA timing (pixel clock is 189.2 Mhz dot clock). */
+    timingVESA_1600x1200_80hz   = 288,                          /* 1600x1200 (80 Hz) VESA timing (pixel clock is 216>? Mhz dot clock) - proposed only. */
+    timingVESA_1600x1200_85hz   = 289,                          /* 1600x1200 (85 Hz) VESA timing (pixel clock is 229.5 Mhz dot clock). */
+    timingVESA_1792x1344_60hz   = 296,                          /* 1792x1344 (60 Hz) VESA timing (204.75 Mhz dot clock). */
+    timingVESA_1792x1344_75hz   = 298,                          /* 1792x1344 (75 Hz) VESA timing (261.75 Mhz dot clock). */
+    timingVESA_1856x1392_60hz   = 300,                          /* 1856x1392 (60 Hz) VESA timing (218.25 Mhz dot clock). */
+    timingVESA_1856x1392_75hz   = 302,                          /* 1856x1392 (75 Hz) VESA timing (288 Mhz dot clock). */
+    timingVESA_1920x1440_60hz   = 304,                          /* 1920x1440 (60 Hz) VESA timing (234 Mhz dot clock). */
+    timingVESA_1920x1440_75hz   = 306,                          /* 1920x1440 (75 Hz) VESA timing (297 Mhz dot clock). */
+    timingSMPTE240M_60hz        = 400,                          /* 60Hz V, 33.75KHz H, interlaced timing, 16:9 aspect, typical resolution of 1920x1035. */
+    timingFilmRate_48hz         = 410,                          /* 48Hz V, 25.20KHz H, non-interlaced timing, typical resolution of 640x480. */
+    timingSony_1600x1024_76hz   = 500,                          /* 1600x1024 (76 Hz) Sony timing (pixel clock is 170.447 Mhz dot clock). */
+    timingSony_1920x1080_60hz   = 510,                          /* 1920x1080 (60 Hz) Sony timing (pixel clock is 159.84 Mhz dot clock). */
+    timingSony_1920x1080_72hz   = 520,                          /* 1920x1080 (72 Hz) Sony timing (pixel clock is 216.023 Mhz dot clock). */
+    timingSony_1920x1200_76hz   = 540,                          /* 1900x1200 (76 Hz) Sony timing (pixel clock is 243.20 Mhz dot clock). */
+    timingApple_0x0_0hz_Offline = 550                           /* Indicates that this timing will take the display off-line and remove it from the system. */
+};
+
+
+/* Deprecated timing names.*/
+enum {
+    timingApple12               = timingApple_512x384_60hz,
+    timingApple12x              = timingApple_560x384_60hz,
+    timingApple13               = timingApple_640x480_67hz,
+    timingApple13x              = timingApple_640x400_67hz,
+    timingAppleVGA              = timingVESA_640x480_60hz,
+    timingApple15               = timingApple_640x870_75hz,
+    timingApple15x              = timingApple_640x818_75hz,
+    timingApple16               = timingApple_832x624_75hz,
+    timingAppleSVGA             = timingVESA_800x600_56hz,
+    timingApple1Ka              = timingVESA_1024x768_60hz,
+    timingApple1Kb              = timingVESA_1024x768_70hz,
+    timingApple19               = timingApple_1024x768_75hz,
+    timingApple21               = timingApple_1152x870_75hz,
+    timingSony_1900x1200_74hz   = 530,                          /* 1900x1200 (74 Hz) Sony timing (pixel clock is 236.25 Mhz dot clock). */
+    timingSony_1900x1200_76hz   = timingSony_1920x1200_76hz     /* 1900x1200 (76 Hz) Sony timing (pixel clock is 245.48 Mhz dot clock). */
+};
+
+/* csConnectFlags values in VDDisplayConnectInfo */
+enum {
+    kAllModesValid              = 0,                            /* All modes not trimmed by primary init are good close enough to try */
+    kAllModesSafe               = 1,                            /* All modes not trimmed by primary init are know to be safe */
+    kReportsTagging             = 2,                            /* Can detect tagged displays (to identify smart monitors) */
+    kHasDirectConnection        = 3,                            /* True implies that driver can talk directly to device (e.g. serial data link via sense lines) */
+    kIsMonoDev                  = 4,                            /* Says whether there's an RGB (0) or Monochrome (1) connection. */
+    kUncertainConnection        = 5,                            /* There may not be a display (no sense lines?). */
+    kTaggingInfoNonStandard     = 6,                            /* Set when csConnectTaggedType/csConnectTaggedData are non-standard (i.e., not the Apple CRT sense codes). */
+    kReportsDDCConnection       = 7,                            /* Card can do ddc (set kHasDirectConnect && kHasDDCConnect if you actually found a ddc display). */
+    kHasDDCConnection           = 8,                            /* Card has ddc connect now. */
+    kConnectionInactive         = 9,                            /* Set when the connection is NOT currently active (generally used in a multiconnection environment). */
+    kDependentConnection        = 10,                           /* Set when some ascpect of THIS connection depends on another (will generally be set in a kModeSimulscan environment). */
+    kBuiltInConnection          = 11,                           /* Set when connection is KNOWN to be built-in (this is not the same as kHasDirectConnection). */
+    kOverrideConnection         = 12,                           /* Set when the reported connection is not the true one, but is one that has been forced through a SetConnection call */
+    kFastCheckForDDC            = 13,                           /* Set when all 3 are true: 1) sense codes indicate DDC display could be attached 2) attempted fast check 3) DDC failed */
+    kReportsHotPlugging         = 14,                           /* Detects and reports hot pluggging on connector (via VSL also implies DDC will be up to date w/o force read) */
+    kStereoSyncConnection       = 15                            /* Connection supports stereo sync signalling */
+};
+
+
+/* csDisplayType values in VDDisplayConnectInfo */
+enum {
+    kUnknownConnect             = 1,                            /* Not sure how we'll use this, but seems like a good idea. */
+    kPanelConnect               = 2,                            /* For use with fixed-in-place LCD panels. */
+    kPanelTFTConnect            = 2,                            /* Alias for kPanelConnect */
+    kFixedModeCRTConnect        = 3,                            /*  For use with fixed-mode (i.e., very limited range) displays. */
+    kMultiModeCRT1Connect       = 4,                            /* 320x200 maybe, 12" maybe, 13" (default), 16" certain, 19" maybe, 21" maybe */
+    kMultiModeCRT2Connect       = 5,                            /* 320x200 maybe, 12" maybe, 13" certain, 16" (default), 19" certain, 21" maybe */
+    kMultiModeCRT3Connect       = 6,                            /* 320x200 maybe, 12" maybe, 13" certain, 16" certain, 19" default, 21" certain */
+    kMultiModeCRT4Connect       = 7,                            /* Expansion to large multi mode (not yet used) */
+    kModelessConnect            = 8,                            /* Expansion to modeless model (not yet used) */
+    kFullPageConnect            = 9,                            /* 640x818 (to get 8bpp in 512K case) and 640x870 (these two only) */
+    kVGAConnect                 = 10,                           /* 640x480 VGA default -- question everything else */
+    kNTSCConnect                = 11,                           /* NTSC ST (default), FF, STconv, FFconv */
+    kPALConnect                 = 12,                           /* PAL ST (default), FF, STconv, FFconv */
+    kHRConnect                  = 13,                           /* Straight-6 connect -- 640x480 and 640x400 (to get 8bpp in 256K case) (these two only) */
+    kPanelFSTNConnect           = 14,                           /* For use with fixed-in-place LCD FSTN (aka "Supertwist") panels */
+    kMonoTwoPageConnect         = 15,                           /* 1152x870 Apple color two-page display */
+    kColorTwoPageConnect        = 16,                           /* 1152x870 Apple B&W two-page display */
+    kColor16Connect             = 17,                           /* 832x624 Apple B&W two-page display */
+    kColor19Connect             = 18,                           /* 1024x768 Apple B&W two-page display */
+    kGenericCRT                 = 19,                           /* Indicates nothing except that connection is CRT in nature. */
+    kGenericLCD                 = 20,                           /* Indicates nothing except that connection is LCD in nature. */
+    kDDCConnect                 = 21,                           /* DDC connection, always set kHasDDCConnection */
+    kNoConnect                  = 22                            /* No display is connected - load sensing or similar level of hardware detection is assumed (used by resident drivers that support hot plugging when nothing is currently connected) */
+};
+
+/* csTimingFlags values in VDTimingInfoRec */
+enum {
+    kModeValid                  = 0,                            /* Says that this mode should NOT be trimmed. */
+    kModeSafe                   = 1,                            /* This mode does not need confirmation */
+    kModeDefault                = 2,                            /* This is the default mode for this type of connection */
+    kModeShowNow                = 3,                            /* This mode should always be shown (even though it may require a confirm) */
+    kModeNotResize              = 4,                            /* This mode should not be used to resize the display (eg. mode selects a different connector on card) */
+    kModeRequiresPan            = 5,                            /* This mode has more pixels than are actually displayed */
+    kModeInterlaced             = 6,                            /* This mode is interlaced (single pixel lines look bad). */
+    kModeShowNever              = 7,                            /* This mode should not be shown in the user interface. */
+    kModeSimulscan              = 8,                            /* Indicates that more than one display connection can be driven from a single framebuffer controller. */
+    kModeNotPreset              = 9,                            /* Indicates that the timing is not a factory preset for the current display (geometry may need correction) */
+    kModeBuiltIn                = 10,                           /* Indicates that the display mode is for the built-in connect only (on multiconnect devices like the PB 3400) Only the driver is quieried */
+    kModeStretched              = 11,                           /* Indicates that the display mode will be stretched/distorted to match the display aspect ratio */
+    kModeNotGraphicsQuality     = 12,                           /* Indicates that the display mode is not the highest quality (eg. stretching artifacts).  Intended as a hint */
+    kModeValidateAgainstDisplay = 13                            /* Indicates that this mode should be validated against the display EDID */
+};
+
+/* csDepthFlags in VDVideoParametersInfoRec */
+enum {
+    kDepthDependent             = 0,                            /* Says that this depth mode may cause dependent changes in other framebuffers (and . */
+    kDepthDependentMask         = (1 << kDepthDependent)        /* mask for kDepthDependent */    
+};
+
+/* csResolutionFlags bit flags for VDResolutionInfoRec */
+enum {
+    kResolutionHasMultipleDepthSizes = 0                        /* Says that this mode has different csHorizontalPixels, csVerticalLines at different depths (usually slightly larger at lower depths) */
+};
+
+
+enum {
+                                                                /*    Power Mode constants for VDPowerStateRec.powerState.  Note the numeric order does not match the power state order */
+    kAVPowerOff                 = 0,                            /* Power fully off*/
+    kAVPowerStandby             = 1,
+    kAVPowerSuspend             = 2,
+    kAVPowerOn                  = 3,
+    kHardwareSleep              = 128,
+    kHardwareWake               = 129,
+    kHardwareWakeFromSuspend    = 130,
+    kHardwareWakeToDoze         = 131,
+    kHardwareWakeToDozeFromSuspend = 132,
+    kHardwarePark               = 133,
+    kHardwareDrive              = 134
+};
+
+/* Reduced perf level, for GetPowerState, SetPowerState*/
+enum {
+    kPowerStateReducedPowerMask   = 0x00000300,
+    kPowerStateFullPower          = 0x00000000,
+    kPowerStateReducedPower1      = 0x00000100,
+    kPowerStateReducedPower2      = 0x00000200,
+    kPowerStateReducedPower3      = 0x00000300
+};
+
+enum {
+                                                                /*    Power Mode masks and bits for VDPowerStateRec.powerFlags.  */
+    kPowerStateNeedsRefresh     = 0,                            /* When leaving this power mode, a display will need refreshing   */
+    kPowerStateSleepAwareBit    = 1,                            /* if gestaltPCCardDockingSelectorFix, Docking mgr checks this bit before checking kPowerStateSleepAllowedBit */
+    kPowerStateSleepForbiddenBit = 2,                           /* if kPowerStateSleepAwareBit, Docking mgr checks this bit before sleeping */
+    kPowerStateSleepCanPowerOffBit = 3,                         /* supports power down sleep (ie PCI power off)*/
+    kPowerStateSleepNoDPMSBit   = 4,                            /* Bug #2425210.  Do not use DPMS with this display.*/
+    kPowerStateSleepWaketoDozeBit = 5,                          /* Supports Wake to Doze */
+    kPowerStateSleepWakeNeedsProbeBit = 6,                      /* Does not sense connection changes on wake */
+
+    kPowerStateNeedsRefreshMask = (1 << kPowerStateNeedsRefresh),
+    kPowerStateSleepAwareMask   = (1 << kPowerStateSleepAwareBit),
+    kPowerStateSleepForbiddenMask = (1 << kPowerStateSleepForbiddenBit),
+    kPowerStateSleepCanPowerOffMask = (1 << kPowerStateSleepCanPowerOffBit),
+    kPowerStateSleepNoDPMSMask  = (1 << kPowerStateSleepNoDPMSBit),
+    kPowerStateSleepWaketoDozeMask = (1 << kPowerStateSleepWaketoDozeBit),
+    kPowerStateSleepWakeNeedsProbeMask = (1 << kPowerStateSleepWakeNeedsProbeBit),
+
+    kPowerStateSupportsReducedPower1Bit = 10,
+    kPowerStateSupportsReducedPower2Bit = 11,
+    kPowerStateSupportsReducedPower3Bit = 12,
+    kPowerStateSupportsReducedPower1BitMask = (1 << 10),
+    kPowerStateSupportsReducedPower2BitMask = (1 << 11),
+    kPowerStateSupportsReducedPower3BitMask = (1 << 12)
+};
+
+
+enum {
+                                                                /* Control Codes */
+    cscReset                    = 0,
+    cscKillIO                   = 1,
+    cscSetMode                  = 2,
+    cscSetEntries               = 3,
+    cscSetGamma                 = 4,
+    cscGrayPage                 = 5,
+    cscGrayScreen               = 5,
+    cscSetGray                  = 6,
+    cscSetInterrupt             = 7,
+    cscDirectSetEntries         = 8,
+    cscSetDefaultMode           = 9,
+    cscSwitchMode               = 10,                           /* Takes a VDSwitchInfoPtr */         
+    cscSetSync                  = 11,                           /* Takes a VDSyncInfoPtr */           
+    cscSavePreferredConfiguration = 16,                         /* Takes a VDSwitchInfoPtr */         
+    cscSetHardwareCursor        = 22,                           /* Takes a VDSetHardwareCursorPtr */  
+    cscDrawHardwareCursor       = 23,                           /* Takes a VDDrawHardwareCursorPtr */ 
+    cscSetConvolution           = 24,                           /* Takes a VDConvolutionInfoPtr */    
+    cscSetPowerState            = 25,                           /* Takes a VDPowerStatePtr */         
+    cscPrivateControlCall       = 26,                           /* Takes a VDPrivateSelectorDataRec*/
+    cscSetMultiConnect          = 28,                           /* From a GDI point of view, this call should be implemented completely in the HAL and not at all in the core.*/
+    cscSetClutBehavior          = 29,                           /* Takes a VDClutBehavior */
+    cscSetDetailedTiming        = 31,                           /* Takes a VDDetailedTimingPtr */
+    cscDoCommunication          = 33,                           /* Takes a VDCommunicationPtr */
+    cscProbeConnection          = 34,                           /* Takes nil pointer */
+                                                                /* (may generate a kFBConnectInterruptServiceType service interrupt) */
+    cscSetScaler                = 36,                           /* Takes a VDScalerPtr */
+    cscSetMirror                = 37,                           /* Takes a VDMirrorPtr*/
+    cscSetFeatureConfiguration  = 38,                           /* Takes a VDConfigurationPtr*/
+    cscUnusedCall               = 127                           /* This call used to expand the scrn resource.  Its imbedded data contains more control info */
+};
+
+enum {
+                                                                /* Status Codes */
+    cscGetMode                  = 2,
+    cscGetEntries               = 3,
+    cscGetPageCnt               = 4,
+    cscGetPages                 = 4,                            /* This is what C&D 2 calls it. */
+    cscGetPageBase              = 5,
+    cscGetBaseAddr              = 5,                            /* This is what C&D 2 calls it. */
+    cscGetGray                  = 6,
+    cscGetInterrupt             = 7,
+    cscGetGamma                 = 8,
+    cscGetDefaultMode           = 9,
+    cscGetCurMode               = 10,                           /* Takes a VDSwitchInfoPtr */
+    cscGetSync                  = 11,                           /* Takes a VDSyncInfoPtr */  
+    cscGetConnection            = 12,                           /* Return information about the connection to the display */
+    cscGetModeTiming            = 13,                           /* Return timing info for a mode */
+    cscGetModeBaseAddress       = 14,                           /* Return base address information about a particular mode */
+    cscGetScanProc              = 15,                           /* QuickTime scan chasing routine */
+    cscGetPreferredConfiguration = 16,                          /* Takes a VDSwitchInfoPtr */               
+    cscGetNextResolution        = 17,                           /* Takes a VDResolutionInfoPtr */           
+    cscGetVideoParameters       = 18,                           /* Takes a VDVideoParametersInfoPtr */      
+    cscGetGammaInfoList         = 20,                           /* Takes a VDGetGammaListPtr */             
+    cscRetrieveGammaTable       = 21,                           /* Takes a VDRetrieveGammaPtr */            
+    cscSupportsHardwareCursor   = 22,                           /* Takes a VDSupportsHardwareCursorPtr */   
+    cscGetHardwareCursorDrawState = 23,                         /* Takes a VDHardwareCursorDrawStatePtr */  
+    cscGetConvolution           = 24,                           /* Takes a VDConvolutionInfoPtr */          
+    cscGetPowerState            = 25,                           /* Takes a VDPowerStatePtr */               
+    cscPrivateStatusCall        = 26,                           /* Takes a VDPrivateSelectorDataRec*/
+    cscGetDDCBlock              = 27,                           /* Takes a VDDDCBlockRec  */
+    cscGetMultiConnect          = 28,                           /* From a GDI point of view, this call should be implemented completely in the HAL and not at all in the core.*/
+    cscGetClutBehavior          = 29,                           /* Takes a VDClutBehavior */
+    cscGetTimingRanges          = 30,                           /* Takes a VDDisplayTimingRangePtr */
+    cscGetDetailedTiming        = 31,                           /* Takes a VDDetailedTimingPtr */
+    cscGetCommunicationInfo     = 32,                           /* Takes a VDCommunicationInfoPtr */
+    cscGetScalerInfo            = 35,                           /* Takes a VDScalerInfoPtr */
+    cscGetScaler                = 36,                           /* Takes a VDScalerPtr */
+    cscGetMirror                = 37,                           /* Takes a VDMirrorPtr*/
+    cscGetFeatureConfiguration  = 38,                           /* Takes a VDConfigurationPtr*/
+    cscGetFeatureList           = 39
+};
+
+/* Bit definitions for the Get/Set Sync call*/
+enum {
+    kDisableHorizontalSyncBit   = 0,
+    kDisableVerticalSyncBit     = 1,
+    kDisableCompositeSyncBit    = 2,
+    kEnableSyncOnBlue           = 3,
+    kEnableSyncOnGreen          = 4,
+    kEnableSyncOnRed            = 5,
+    kNoSeparateSyncControlBit   = 6,
+    kTriStateSyncBit            = 7,
+    kHorizontalSyncMask         = 0x01,
+    kVerticalSyncMask           = 0x02,
+    kCompositeSyncMask          = 0x04,
+    kDPMSSyncMask               = 0x07,
+    kTriStateSyncMask           = 0x80,
+    kSyncOnBlueMask             = 0x08,
+    kSyncOnGreenMask            = 0x10,
+    kSyncOnRedMask              = 0x20,
+    kSyncOnMask                 = 0x38
+};
+
+enum {
+                                                                /*    Power Mode constants for translating DPMS modes to Get/SetSync calls.  */
+    kDPMSSyncOn                 = 0,
+    kDPMSSyncStandby            = 1,
+    kDPMSSyncSuspend            = 2,
+    kDPMSSyncOff                = 7
+};
+
+/* Bit definitions for the Get/Set Convolution call*/
+enum {
+    kConvolved                  = 0,
+    kLiveVideoPassThru          = 1,
+    kConvolvedMask              = 0x01,
+    kLiveVideoPassThruMask      = 0x02
+};
+
+
+
+struct VPBlock {
+    UInt32                           vpBaseOffset;               /*Offset to page zero of video RAM (From minorBaseOS).*/
+#if __LP64__
+    UInt32                           vpRowBytes;                 /*Width of each row of video memory.*/
+#else
+    SInt16                           vpRowBytes;                 /*Width of each row of video memory.*/
+#endif
+    Rect                            vpBounds;                   /*BoundsRect for the video display (gives dimensions).*/
+    SInt16                           vpVersion;                  /*PixelMap version number.*/
+    SInt16                           vpPackType;
+    UInt32                           vpPackSize;
+    UInt32                            vpHRes;                     /*Horizontal resolution of the device (pixels per inch).*/
+    UInt32                            vpVRes;                     /*Vertical resolution of the device (pixels per inch).*/
+    SInt16                           vpPixelType;                /*Defines the pixel type.*/
+    SInt16                           vpPixelSize;                /*Number of bits in pixel.*/
+    SInt16                           vpCmpCount;                 /*Number of components in pixel.*/
+    SInt16                           vpCmpSize;                  /*Number of bits per component*/
+    UInt32                            vpPlaneBytes;               /*Offset from one plane to the next.*/
+};
+typedef struct VPBlock                  VPBlock;
+typedef VPBlock *                       VPBlockPtr;
+
+struct VDEntryRecord {
+    Ptr                             csTable;                    /* pointer to color table entry=value, r,g,b:INTEGER*/
+};
+typedef struct VDEntryRecord            VDEntryRecord;
+
+typedef VDEntryRecord *                 VDEntRecPtr;
+/* Parm block for SetGray control call */
+
+struct VDGrayRecord {
+    Boolean                         csMode;                     /*Same as GDDevType value (0=color, 1=mono)*/
+    SInt8                           filler;
+};
+typedef struct VDGrayRecord             VDGrayRecord;
+
+typedef VDGrayRecord *                  VDGrayPtr;
+/* Parm block for SetInterrupt call */
+
+struct VDFlagRecord {
+    SInt8                           csMode;
+    SInt8                           filler;
+};
+typedef struct VDFlagRecord             VDFlagRecord;
+
+typedef VDFlagRecord *                  VDFlagRecPtr;
+/* Parm block for SetEntries control call */
+
+struct VDSetEntryRecord {
+    ColorSpec *                     csTable;                    /*Pointer to an array of color specs*/
+    SInt16                           csStart;                    /*Which spec in array to start with, or -1*/
+    SInt16                           csCount;                    /*Number of color spec entries to set*/
+};
+typedef struct VDSetEntryRecord         VDSetEntryRecord;
+
+typedef VDSetEntryRecord *              VDSetEntryPtr;
+/* Parm block for SetGamma control call */
+
+struct VDGammaRecord {
+    Ptr                             csGTable;                   /*pointer to gamma table*/
+};
+typedef struct VDGammaRecord            VDGammaRecord;
+
+typedef VDGammaRecord *                 VDGamRecPtr;
+
+struct VDSwitchInfoRec {
+    DepthMode                  csMode;                     /* mode depth*/
+    DisplayModeID                   csData;                     /* functional sResource of mode*/
+    UInt16                  csPage;                     /* page to switch in*/
+    Ptr                             csBaseAddr;                 /* base address of page (return value)*/
+    uintptr_t                   csReserved;                 /* Reserved (set to 0) */
+};
+typedef struct VDSwitchInfoRec          VDSwitchInfoRec;
+
+typedef VDSwitchInfoRec *               VDSwitchInfoPtr;
+
+struct VDTimingInfoRec {
+    DisplayModeID                   csTimingMode;               /* timing mode (a la InitGDevice) */
+    uintptr_t                   csTimingReserved;           /* reserved */
+    UInt32                   csTimingFormat;             /* what format is the timing info */
+    UInt32                   csTimingData;               /* data supplied by driver */
+    UInt32                   csTimingFlags;              /* mode within device */
+};
+typedef struct VDTimingInfoRec          VDTimingInfoRec;
+
+typedef VDTimingInfoRec *               VDTimingInfoPtr;
+
+struct VDDisplayConnectInfoRec {
+    UInt16                  csDisplayType;              /* Type of display connected */
+    UInt8                   csConnectTaggedType;        /* type of tagging */
+    UInt8                   csConnectTaggedData;        /* tagging data */
+    UInt32                   csConnectFlags;             /* tell us about the connection */
+    uintptr_t                   csDisplayComponent;         /* if the card has a direct connection to the display, it returns the display component here (FUTURE) */
+    uintptr_t                   csConnectReserved;          /* reserved */
+};
+typedef struct VDDisplayConnectInfoRec  VDDisplayConnectInfoRec;
+
+typedef VDDisplayConnectInfoRec *       VDDisplayConnectInfoPtr;
+
+struct VDMultiConnectInfoRec {
+    UInt32                   csDisplayCountOrNumber;     /* For GetMultiConnect, returns count n of 1..n connections; otherwise, indicates the ith connection.*/
+    VDDisplayConnectInfoRec         csConnectInfo;              /* Standard VDDisplayConnectionInfo for connection i.*/
+};
+typedef struct VDMultiConnectInfoRec    VDMultiConnectInfoRec;
+
+typedef VDMultiConnectInfoRec *         VDMultiConnectInfoPtr;
+/* RawSenseCode
+    This abstract data type is not exactly abstract.  Rather, it is merely enumerated constants
+    for the possible raw sense code values when 'standard' sense code hardware is implemented.
+
+    For 'standard' sense code hardware, the raw sense is obtained as follows:
+        o Instruct the frame buffer controller NOT to actively drive any of the monitor sense lines
+        o Read the state of the monitor sense lines 2, 1, and 0.  (2 is the MSB, 0 the LSB)
+
+    IMPORTANT Note: 
+    When the 'kTaggingInfoNonStandard' bit of 'csConnectFlags' is FALSE, then these constants 
+    are valid 'csConnectTaggedType' values in 'VDDisplayConnectInfo' 
+
+*/
+typedef UInt8                   RawSenseCode;
+enum {
+    kRSCZero                    = 0,
+    kRSCOne                     = 1,
+    kRSCTwo                     = 2,
+    kRSCThree                   = 3,
+    kRSCFour                    = 4,
+    kRSCFive                    = 5,
+    kRSCSix                     = 6,
+    kRSCSeven                   = 7
+};
+
+
+/* ExtendedSenseCode
+    This abstract data type is not exactly abstract.  Rather, it is merely enumerated constants
+    for the values which are possible when the extended sense algorithm is applied to hardware
+    which implements 'standard' sense code hardware.
+
+    For 'standard' sense code hardware, the extended sense code algorithm is as follows:
+    (Note:  as described here, sense line 'A' corresponds to '2', 'B' to '1', and 'C' to '0')
+        o Drive sense line 'A' low and read the values of 'B' and 'C'.  
+        o Drive sense line 'B' low and read the values of 'A' and 'C'.
+        o Drive sense line 'C' low and read the values of 'A' and 'B'.
+
+    In this way, a six-bit number of the form BC/AC/AB is generated. 
+
+    IMPORTANT Note: 
+    When the 'kTaggingInfoNonStandard' bit of 'csConnectFlags' is FALSE, then these constants 
+    are valid 'csConnectTaggedData' values in 'VDDisplayConnectInfo' 
+
+*/
+typedef UInt8                   ExtendedSenseCode;
+enum {
+    kESCZero21Inch              = 0x00,                         /* 21" RGB                     */
+    kESCOnePortraitMono         = 0x14,                         /* Portrait Monochrome              */
+    kESCTwo12Inch               = 0x21,                         /* 12" RGB                    */
+    kESCThree21InchRadius       = 0x31,                         /* 21" RGB (Radius)               */
+    kESCThree21InchMonoRadius   = 0x34,                         /* 21" Monochrome (Radius)           */
+    kESCThree21InchMono         = 0x35,                         /* 21" Monochrome               */
+    kESCFourNTSC                = 0x0A,                         /* NTSC                     */
+    kESCFivePortrait            = 0x1E,                         /* Portrait RGB              */
+    kESCSixMSB1                 = 0x03,                         /* MultiScan Band-1 (12" thru 1Six")  */
+    kESCSixMSB2                 = 0x0B,                         /* MultiScan Band-2 (13" thru 19")       */
+    kESCSixMSB3                 = 0x23,                         /* MultiScan Band-3 (13" thru 21")       */
+    kESCSixStandard             = 0x2B,                         /* 13"/14" RGB or 12" Monochrome   */
+    kESCSevenPAL                = 0x00,                         /* PAL                        */
+    kESCSevenNTSC               = 0x14,                         /* NTSC                     */
+    kESCSevenVGA                = 0x17,                         /* VGA                        */
+    kESCSeven16Inch             = 0x2D,                         /* 16" RGB (GoldFish)               */
+    kESCSevenPALAlternate       = 0x30,                         /* PAL (Alternate)                */
+    kESCSeven19Inch             = 0x3A,                         /* Third-Party 19"                 */
+    kESCSevenDDC                = 0x3E,                         /* DDC display                   */
+    kESCSevenNoDisplay          = 0x3F                          /* No display connected           */
+};
+
+/* DepthMode
+    This abstract data type is used to to reference RELATIVE pixel depths.
+    Its definition is largely derived from its past usage, analogous to 'xxxVidMode'
+
+    Bits per pixel DOES NOT directly map to 'DepthMode'  For example, on some
+    graphics hardware, 'kDepthMode1' may represent 1 BPP, whereas on other
+    hardware, 'kDepthMode1' may represent 8BPP.
+
+    DepthMode IS considered to be ordinal, i.e., operations such as <, >, ==, etc.
+    behave as expected.  The values of the constants which comprise the set are such
+    that 'kDepthMode4 < kDepthMode6' behaves as expected.
+*/
+enum {
+    kDepthMode1                 = 128,
+    kDepthMode2                 = 129,
+    kDepthMode3                 = 130,
+    kDepthMode4                 = 131,
+    kDepthMode5                 = 132,
+    kDepthMode6                 = 133
+};
+
+enum {
+    kFirstDepthMode             = 128,                          /* These constants are obsolete, and just included    */
+    kSecondDepthMode            = 129,                          /* for clients that have converted to the above     */
+    kThirdDepthMode             = 130,                          /* kDepthModeXXX constants.                */
+    kFourthDepthMode            = 131,
+    kFifthDepthMode             = 132,
+    kSixthDepthMode             = 133
+};
+
+
+
+struct VDPageInfo {
+    DepthMode                           csMode;                     /* mode within device*/
+    DisplayModeID                            csData;                     /* data supplied by driver*/
+    SInt16                           csPage;                     /* page to switch in*/
+    Ptr                             csBaseAddr;                 /* base address of page*/
+};
+typedef struct VDPageInfo               VDPageInfo;
+
+typedef VDPageInfo *                    VDPgInfoPtr;
+
+struct VDSizeInfo {
+    SInt16                           csHSize;                    /* desired/returned h size*/
+    SInt16                           csHPos;                     /* desired/returned h position*/
+    SInt16                           csVSize;                    /* desired/returned v size*/
+    SInt16                           csVPos;                     /* desired/returned v position*/
+};
+typedef struct VDSizeInfo               VDSizeInfo;
+
+typedef VDSizeInfo *                    VDSzInfoPtr;
+
+struct VDSettings {
+    SInt16                           csParamCnt;                 /* number of params*/
+    SInt16                           csBrightMax;                /* max brightness*/
+    SInt16                           csBrightDef;                /* default brightness*/
+    SInt16                           csBrightVal;                /* current brightness*/
+    SInt16                           csCntrstMax;                /* max contrast*/
+    SInt16                           csCntrstDef;                /* default contrast*/
+    SInt16                           csCntrstVal;                /* current contrast*/
+    SInt16                           csTintMax;                  /* max tint*/
+    SInt16                           csTintDef;                  /* default tint*/
+    SInt16                           csTintVal;                  /* current tint*/
+    SInt16                           csHueMax;                   /* max hue*/
+    SInt16                           csHueDef;                   /* default hue*/
+    SInt16                           csHueVal;                   /* current hue*/
+    SInt16                           csHorizDef;                 /* default horizontal*/
+    SInt16                           csHorizVal;                 /* current horizontal*/
+    SInt16                           csHorizMax;                 /* max horizontal*/
+    SInt16                           csVertDef;                  /* default vertical*/
+    SInt16                           csVertVal;                  /* current vertical*/
+    SInt16                           csVertMax;                  /* max vertical*/
+};
+typedef struct VDSettings               VDSettings;
+typedef VDSettings *                    VDSettingsPtr;
+
+struct VDDefMode {
+    UInt8                           csID;
+    SInt8                           filler;
+};
+typedef struct VDDefMode                VDDefMode;
+typedef VDDefMode *                     VDDefModePtr;
+
+struct VDSyncInfoRec {
+    UInt8                           csMode;
+    UInt8                           csFlags;
+};
+typedef struct VDSyncInfoRec            VDSyncInfoRec;
+
+typedef VDSyncInfoRec *                 VDSyncInfoPtr;
+/*
+   All displayModeID values from 0x80000000 to 0xFFFFFFFF and 0x00
+   are reserved for Apple Computer.
+*/
+/* Constants for the cscGetNextResolution call */
+enum {
+    kDisplayModeIDCurrent       = 0x00,                         /* Reference the Current DisplayModeID */
+    kDisplayModeIDInvalid       = (IODisplayModeID)0xFFFFFFFF,             /* A bogus DisplayModeID in all cases */
+    kDisplayModeIDFindFirstResolution = (IODisplayModeID)0xFFFFFFFE,       /* Used in cscGetNextResolution to reset iterator */
+    kDisplayModeIDNoMoreResolutions = (IODisplayModeID)0xFFFFFFFD,         /* Used in cscGetNextResolution to indicate End Of List */
+    kDisplayModeIDFindFirstProgrammable = (IODisplayModeID)0xFFFFFFFC,     /* Used in cscGetNextResolution to find unused programmable timing */
+    kDisplayModeIDBootProgrammable = (IODisplayModeID)0xFFFFFFFB,          /* This is the ID given at boot time by the OF driver to a programmable timing */
+    kDisplayModeIDReservedBase  = (IODisplayModeID)0x80000000              /* Lowest (unsigned) DisplayModeID reserved by Apple */
+};
+
+/* Constants for the GetGammaInfoList call */
+enum {
+    kGammaTableIDFindFirst      = (GammaTableID)0xFFFFFFFE,             /* Get the first gamma table ID */
+    kGammaTableIDNoMoreTables   = (GammaTableID)0xFFFFFFFD,             /* Used to indicate end of list */
+    kGammaTableIDSpecific       = 0x00                          /* Return the info for the given table id */
+};
+
+/* Constants for GetMultiConnect call*/
+enum {
+    kGetConnectionCount         = 0xFFFFFFFF,             /* Used to get the number of possible connections in a "multi-headed" framebuffer environment.*/
+    kActivateConnection         = (0 << kConnectionInactive),   /* Used for activating a connection (csConnectFlags value).*/
+    kDeactivateConnection       = (1 << kConnectionInactive)    /* Used for deactivating a connection (csConnectFlags value.)*/
+};
+
+/* VDCommunicationRec.csBusID values*/
+enum {
+    kVideoDefaultBus            = 0
+};
+
+
+/* VDCommunicationInfoRec.csBusType values*/
+enum {
+    kVideoBusTypeInvalid        = 0,
+    kVideoBusTypeI2C            = 1,
+    kVideoBusTypeDisplayPort    = 2
+};
+
+
+/* VDCommunicationRec.csSendType and VDCommunicationRec.csReplyType values*/
+enum {
+    kVideoNoTransactionType     = 0,    /* No transaction*/
+    kVideoNoTransactionTypeMask = (1 << kVideoNoTransactionType),
+    kVideoSimpleI2CType         = 1,    /* Simple I2C message*/
+    kVideoSimpleI2CTypeMask     = (1 << kVideoSimpleI2CType),
+    kVideoDDCciReplyType        = 2,    /* DDC/ci message (with imbedded length)*/
+    kVideoDDCciReplyTypeMask    = (1 << kVideoDDCciReplyType),
+    kVideoCombinedI2CType       = 3,    /* Combined format I2C R/~W transaction*/
+    kVideoCombinedI2CTypeMask   = (1 << kVideoCombinedI2CType),
+    kVideoDisplayPortNativeType       = 4,    /* DisplayPort Native */
+    kVideoDisplayPortNativeTypeMask   = (1 << kVideoDisplayPortNativeType)
+};
+
+// VDCommunicationRec.csCommFlags and VDCommunicationInfoRec.csSupportedCommFlags
+enum {
+    kVideoReplyMicroSecDelayBit   = 0,    /* If bit set, the driver should delay csMinReplyDelay micro seconds between send and receive*/
+    kVideoReplyMicroSecDelayMask  = (1 << kVideoReplyMicroSecDelayBit),
+    kVideoUsageAddrSubAddrBit     = 1,    /* If bit set, the driver understands to use the lower 16 bits of the address field as two 8 bit values (address/subaddress) for the I2C transaction*/
+    kVideoUsageAddrSubAddrMask    = (1 << kVideoUsageAddrSubAddrBit)
+};
+
+
+struct VDResolutionInfoRec {
+    DisplayModeID                   csPreviousDisplayModeID;    /* ID of the previous resolution in a chain */
+    DisplayModeID                   csDisplayModeID;            /* ID of the next resolution */
+    UInt32                   csHorizontalPixels;         /* # of pixels in a horizontal line at the max depth */
+    UInt32                   csVerticalLines;            /* # of lines in a screen at the max depth */
+    Fixed                           csRefreshRate;              /* Vertical Refresh Rate in Hz */
+    DepthMode                       csMaxDepthMode;             /* 0x80-based number representing max bit depth */
+    UInt32                   csResolutionFlags;          /* Reserved - flag bits */
+    uintptr_t                   csReserved;                 /* Reserved */
+};
+typedef struct VDResolutionInfoRec      VDResolutionInfoRec;
+
+typedef VDResolutionInfoRec *           VDResolutionInfoPtr;
+
+struct VDVideoParametersInfoRec {
+    DisplayModeID                   csDisplayModeID;            /* the ID of the resolution we want info on */
+    DepthMode                       csDepthMode;                /* The bit depth we want the info on (0x80 based) */
+    VPBlockPtr                      csVPBlockPtr;               /* Pointer to a video parameter block */
+    UInt32                   csPageCount;                /* Number of pages supported by the resolution */
+    VideoDeviceType                 csDeviceType;               /* Device Type:  Direct, Fixed or CLUT; */
+    UInt32                          csDepthFlags;               /* Flags */
+};
+typedef struct VDVideoParametersInfoRec VDVideoParametersInfoRec;
+
+typedef VDVideoParametersInfoRec *      VDVideoParametersInfoPtr;
+
+struct VDGammaInfoRec {
+    GammaTableID                    csLastGammaID;              /* the ID of the previous gamma table */
+    GammaTableID                    csNextGammaID;              /* the ID of the next gamma table */
+    Ptr                             csGammaPtr;                 /* Ptr to a gamma table data */
+    uintptr_t                   csReserved;                 /* Reserved */
+};
+typedef struct VDGammaInfoRec           VDGammaInfoRec;
+
+typedef VDGammaInfoRec *                VDGammaInfoPtr;
+
+struct VDGetGammaListRec {
+    GammaTableID                    csPreviousGammaTableID;     /* ID of the previous gamma table */
+    GammaTableID                    csGammaTableID;             /* ID of the gamma table following csPreviousDisplayModeID */
+    UInt32                   csGammaTableSize;           /* Size of the gamma table in bytes */
+    char *                          csGammaTableName;           /* Gamma table name (c-string) */
+};
+typedef struct VDGetGammaListRec        VDGetGammaListRec;
+
+typedef VDGetGammaListRec *             VDGetGammaListPtr;
+
+struct VDRetrieveGammaRec {
+    GammaTableID                    csGammaTableID;             /* ID of gamma table to retrieve */
+    GammaTbl *                      csGammaTablePtr;            /* Location to copy desired gamma to */
+};
+typedef struct VDRetrieveGammaRec       VDRetrieveGammaRec;
+
+typedef VDRetrieveGammaRec *            VDRetrieveGammaPtr;
+
+struct VDSetHardwareCursorRec {
+    void *                          csCursorRef;                /* reference to cursor data */
+    UInt32                          csReserved1;                /* reserved for future use */
+    UInt32                          csReserved2;                /* should be ignored */
+};
+typedef struct VDSetHardwareCursorRec   VDSetHardwareCursorRec;
+
+typedef VDSetHardwareCursorRec *        VDSetHardwareCursorPtr;
+
+struct VDDrawHardwareCursorRec {
+    SInt32                          csCursorX;                  /* x coordinate */
+    SInt32                          csCursorY;                  /* y coordinate */
+    UInt32                          csCursorVisible;            /* true if cursor is must be visible */
+    UInt32                          csReserved1;                /* reserved for future use */
+    UInt32                          csReserved2;                /* should be ignored */
+};
+typedef struct VDDrawHardwareCursorRec  VDDrawHardwareCursorRec;
+
+typedef VDDrawHardwareCursorRec *       VDDrawHardwareCursorPtr;
+
+struct VDSupportsHardwareCursorRec {
+    UInt32                          csSupportsHardwareCursor;
+                                                                /* true if hardware cursor is supported */
+    UInt32                          csReserved1;                /* reserved for future use */
+    UInt32                          csReserved2;                /* must be zero */
+};
+typedef struct VDSupportsHardwareCursorRec VDSupportsHardwareCursorRec;
+
+typedef VDSupportsHardwareCursorRec *   VDSupportsHardwareCursorPtr;
+
+struct VDHardwareCursorDrawStateRec {
+    SInt32                          csCursorX;                  /* x coordinate */
+    SInt32                          csCursorY;                  /* y coordinate */
+    UInt32                          csCursorVisible;            /* true if cursor is visible */
+    UInt32                          csCursorSet;                /* true if cursor successfully set by last set control call */
+    UInt32                          csReserved1;                /* reserved for future use */
+    UInt32                          csReserved2;                /* must be zero */
+};
+typedef struct VDHardwareCursorDrawStateRec VDHardwareCursorDrawStateRec;
+
+typedef VDHardwareCursorDrawStateRec *  VDHardwareCursorDrawStatePtr;
+
+struct VDConvolutionInfoRec {
+    DisplayModeID                   csDisplayModeID;            /* the ID of the resolution we want info on */
+    DepthMode                       csDepthMode;                /* The bit depth we want the info on (0x80 based) */
+    UInt32                   csPage;
+    UInt32                          csFlags;
+    UInt32                          csReserved;
+};
+typedef struct VDConvolutionInfoRec     VDConvolutionInfoRec;
+
+typedef VDConvolutionInfoRec *          VDConvolutionInfoPtr;
+
+struct VDPowerStateRec {
+    UInt32                   powerState;
+    UInt32                   powerFlags;
+
+    uintptr_t                powerReserved1;
+    uintptr_t                powerReserved2;
+};
+typedef struct VDPowerStateRec          VDPowerStateRec;
+
+typedef VDPowerStateRec *               VDPowerStatePtr;
+/*
+    Private Data to video drivers.
+    
+    In versions of MacOS with multiple address spaces (System 8), the OS 
+    must know the extent of parameters in order to move them between the caller
+    and driver.  The old private-selector model for video drivers does not have
+    this information so:
+    
+    For post-7.x Systems private calls should be implemented using the cscPrivateCall
+*/
+
+struct VDPrivateSelectorDataRec {
+    LogicalAddress                  privateParameters;          /* Caller's parameters*/
+    ByteCount                       privateParametersSize;      /* Size of data sent from caller to driver*/
+    LogicalAddress                  privateResults;             /* Caller's return area. Can be nil, or same as privateParameters.*/
+    ByteCount                       privateResultsSize;         /* Size of data driver returns to caller. Can be nil, or same as privateParametersSize.*/
+};
+typedef struct VDPrivateSelectorDataRec VDPrivateSelectorDataRec;
+
+
+struct VDPrivateSelectorRec {
+    UInt32                          reserved;                   /* Reserved (set to 0). */
+    VDPrivateSelectorDataRec        data[1];
+};
+typedef struct VDPrivateSelectorRec     VDPrivateSelectorRec;
+
+struct VDDDCBlockRec {
+    UInt32                          ddcBlockNumber;             /* Input -- DDC EDID (Extended Display Identification Data) number (1-based) */
+    ResType                         ddcBlockType;               /* Input -- DDC block type (EDID/VDIF) */
+    UInt32                          ddcFlags;                   /* Input -- DDC Flags*/
+    UInt32                          ddcReserved;                /* Reserved */
+    Byte                            ddcBlockData[128];          /* Output -- DDC EDID/VDIF data (kDDCBlockSize) */
+};
+typedef struct VDDDCBlockRec            VDDDCBlockRec;
+
+typedef VDDDCBlockRec *                 VDDDCBlockPtr;
+
+enum {
+                                                                /* timingSyncConfiguration*/
+    kSyncInterlaceMask          = (1 << 7),
+    kSyncAnalogCompositeMask    = 0,
+    kSyncAnalogCompositeSerrateMask = (1 << 2),
+    kSyncAnalogCompositeRGBSyncMask = (1 << 1),
+    kSyncAnalogBipolarMask      = (1 << 3),
+    kSyncAnalogBipolarSerrateMask = (1 << 2),
+    kSyncAnalogBipolarSRGBSyncMask = (1 << 1),
+    kSyncDigitalCompositeMask   = (1 << 4),
+    kSyncDigitalCompositeSerrateMask = (1 << 2),
+    kSyncDigitalCompositeMatchHSyncMask = (1 << 2),
+    kSyncDigitalSeperateMask    = (1 << 4) + (1 << 3),
+    kSyncDigitalVSyncPositiveMask = (1 << 2),
+    kSyncDigitalHSyncPositiveMask = (1 << 1)
+};
+
+
+
+
+struct VDDisplayTimingRangeRec {
+    UInt32                          csRangeSize;                /* Init to sizeof(VDDisplayTimingRangeRec) */
+    UInt32                          csRangeType;                /* Init to 0 */
+    UInt32                          csRangeVersion;             /* Init to 0 */
+    UInt32                          csRangeReserved;            /* Init to 0 */
+
+    UInt32                          csRangeBlockIndex;          /* Requested block (first index is 0)*/
+    UInt32                          csRangeGroup;               /* set to 0 */
+    UInt32                          csRangeBlockCount;          /* # blocks */
+    UInt32                          csRangeFlags;               /* dependent video */
+
+    UInt64                          csMinPixelClock;            /* Min dot clock in Hz */
+    UInt64                          csMaxPixelClock;            /* Max dot clock in Hz */
+
+    UInt32                          csMaxPixelError;            /* Max dot clock error */
+    UInt32                          csTimingRangeSyncFlags;
+    UInt32                          csTimingRangeSignalLevels;
+    UInt32                          csTimingRangeSupportedSignalConfigs;
+
+    UInt32                          csMinFrameRate;             /* Hz */
+    UInt32                          csMaxFrameRate;             /* Hz */
+    UInt32                          csMinLineRate;              /* Hz */
+    UInt32                          csMaxLineRate;              /* Hz */
+
+
+    UInt32                          csMaxHorizontalTotal;       /* Clocks - Maximum total (active + blanking) */
+    UInt32                          csMaxVerticalTotal;         /* Clocks - Maximum total (active + blanking) */
+    UInt32                          csMaxTotalReserved1;        /* Reserved */
+    UInt32                          csMaxTotalReserved2;        /* Reserved */
+
+
+
+                                                                /* Some cards require that some timing elements*/
+                                                                /* be multiples of a "character size" (often 8*/
+                                                                /* clocks).  The "xxxxCharSize" fields document*/
+                                                                /* those requirements.*/
+
+
+    UInt8                           csCharSizeHorizontalActive; /* Character size */
+    UInt8                           csCharSizeHorizontalBlanking; /* Character size */
+    UInt8                           csCharSizeHorizontalSyncOffset; /* Character size */
+    UInt8                           csCharSizeHorizontalSyncPulse; /* Character size */
+
+    UInt8                           csCharSizeVerticalActive;   /* Character size */
+    UInt8                           csCharSizeVerticalBlanking; /* Character size */
+    UInt8                           csCharSizeVerticalSyncOffset; /* Character size */
+    UInt8                           csCharSizeVerticalSyncPulse; /* Character size */
+
+    UInt8                           csCharSizeHorizontalBorderLeft; /* Character size */
+    UInt8                           csCharSizeHorizontalBorderRight; /* Character size */
+    UInt8                           csCharSizeVerticalBorderTop; /* Character size */
+    UInt8                           csCharSizeVerticalBorderBottom; /* Character size */
+
+    UInt8                           csCharSizeHorizontalTotal;  /* Character size for active + blanking */
+    UInt8                           csCharSizeVerticalTotal;    /* Character size for active + blanking */
+    UInt16                          csCharSizeReserved1;        /* Reserved (Init to 0) */
+
+
+    UInt32                          csMinHorizontalActiveClocks;
+    UInt32                          csMaxHorizontalActiveClocks;
+    UInt32                          csMinHorizontalBlankingClocks;
+    UInt32                          csMaxHorizontalBlankingClocks;
+
+    UInt32                          csMinHorizontalSyncOffsetClocks;
+    UInt32                          csMaxHorizontalSyncOffsetClocks;
+    UInt32                          csMinHorizontalPulseWidthClocks;
+    UInt32                          csMaxHorizontalPulseWidthClocks;
+
+    UInt32                          csMinVerticalActiveClocks;
+    UInt32                          csMaxVerticalActiveClocks;
+    UInt32                          csMinVerticalBlankingClocks;
+    UInt32                          csMaxVerticalBlankingClocks;
+
+    UInt32                          csMinVerticalSyncOffsetClocks;
+    UInt32                          csMaxVerticalSyncOffsetClocks;
+    UInt32                          csMinVerticalPulseWidthClocks;
+    UInt32                          csMaxVerticalPulseWidthClocks;
+
+
+    UInt32                          csMinHorizontalBorderLeft;
+    UInt32                          csMaxHorizontalBorderLeft;
+    UInt32                          csMinHorizontalBorderRight;
+    UInt32                          csMaxHorizontalBorderRight;
+
+    UInt32                          csMinVerticalBorderTop;
+    UInt32                          csMaxVerticalBorderTop;
+    UInt32                          csMinVerticalBorderBottom;
+    UInt32                          csMaxVerticalBorderBottom;
+
+    UInt32                          csMaxNumLinks;                /* number of links, if zero, assume link 1 */
+    UInt32                          csMinLink0PixelClock;         /* min pixel clock for link 0 (kHz) */
+    UInt32                          csMaxLink0PixelClock;         /* max pixel clock for link 0 (kHz) */
+    UInt32                          csMinLink1PixelClock;         /* min pixel clock for link 1 (kHz) */
+    UInt32                          csMaxLink1PixelClock;         /* max pixel clock for link 1 (kHz) */
+
+    UInt32                          csReserved6;                /* Reserved (Init to 0)*/
+    UInt32                          csReserved7;                /* Reserved (Init to 0)*/
+    UInt32                          csReserved8;                /* Reserved (Init to 0)*/
+};
+typedef struct VDDisplayTimingRangeRec  VDDisplayTimingRangeRec;
+
+typedef VDDisplayTimingRangeRec *       VDDisplayTimingRangePtr;
+
+enum {
+                                                                /* csDisplayModeState*/
+    kDMSModeReady               = 0,                            /* Display Mode ID is configured and ready*/
+    kDMSModeNotReady            = 1,                            /* Display Mode ID is is being programmed*/
+    kDMSModeFree                = 2                             /* Display Mode ID is not associated with a timing*/
+};
+
+
+/* Video driver Errors -10930 to -10959 */
+enum {
+    kTimingChangeRestrictedErr  = -10930,
+    kVideoI2CReplyPendingErr    = -10931,
+    kVideoI2CTransactionErr     = -10932,
+    kVideoI2CBusyErr            = -10933,
+    kVideoI2CTransactionTypeErr = -10934,
+    kVideoBufferSizeErr         = -10935,
+    kVideoCannotMirrorErr       = -10936
+};
+
+
+enum {
+                                                                /* csTimingRangeSignalLevels*/
+    kRangeSupportsSignal_0700_0300_Bit = 0,
+    kRangeSupportsSignal_0714_0286_Bit = 1,
+    kRangeSupportsSignal_1000_0400_Bit = 2,
+    kRangeSupportsSignal_0700_0000_Bit = 3,
+    kRangeSupportsSignal_0700_0300_Mask = (1 << kRangeSupportsSignal_0700_0300_Bit),
+    kRangeSupportsSignal_0714_0286_Mask = (1 << kRangeSupportsSignal_0714_0286_Bit),
+    kRangeSupportsSignal_1000_0400_Mask = (1 << kRangeSupportsSignal_1000_0400_Bit),
+    kRangeSupportsSignal_0700_0000_Mask = (1 << kRangeSupportsSignal_0700_0000_Bit)
+};
+
+
+enum {
+                                                                /* csSignalConfig*/
+    kDigitalSignalBit            = 0,                            /* Do not set.  Mac OS does not currently support arbitrary digital timings*/
+    kAnalogSetupExpectedBit      = 1,                            /* Analog displays - display expects a blank-to-black setup or pedestal.  See VESA signal standards.*/
+    kInterlacedCEA861SyncModeBit = 2,
+
+    kDigitalSignalMask            = (1 << kDigitalSignalBit),
+    kAnalogSetupExpectedMask      = (1 << kAnalogSetupExpectedBit),
+    kInterlacedCEA861SyncModeMask = (1 << kInterlacedCEA861SyncModeBit)
+};
+
+
+enum {
+                                                                /* csSignalLevels for analog*/
+    kAnalogSignalLevel_0700_0300 = 0,
+    kAnalogSignalLevel_0714_0286 = 1,
+    kAnalogSignalLevel_1000_0400 = 2,
+    kAnalogSignalLevel_0700_0000 = 3
+};
+
+
+enum {
+                                                                /* csTimingRangeSyncFlags*/
+    kRangeSupportsSeperateSyncsBit = 0,
+    kRangeSupportsSyncOnGreenBit = 1,
+    kRangeSupportsCompositeSyncBit = 2,
+    kRangeSupportsVSyncSerrationBit = 3,
+    kRangeSupportsSeperateSyncsMask = (1 << kRangeSupportsSeperateSyncsBit),
+    kRangeSupportsSyncOnGreenMask = (1 << kRangeSupportsSyncOnGreenBit),
+    kRangeSupportsCompositeSyncMask = (1 << kRangeSupportsCompositeSyncBit),
+    kRangeSupportsVSyncSerrationMask = (1 << kRangeSupportsVSyncSerrationBit)
+};
+
+
+
+enum {
+                                                                /* csHorizontalSyncConfig and csVerticalSyncConfig*/
+    kSyncPositivePolarityBit    = 0,                            /* Digital separate sync polarity for analog interfaces (0 => negative polarity)*/
+    kSyncPositivePolarityMask   = (1 << kSyncPositivePolarityBit)
+};
+
+
+
+
+/* For timings with kDetailedTimingFormat.*/
+
+struct VDDetailedTimingRec {
+    UInt32                          csTimingSize;               /* Init to sizeof(VDDetailedTimingRec)*/
+    UInt32                          csTimingType;               /* Init to 0*/
+    UInt32                          csTimingVersion;            /* Init to 0*/
+    UInt32                          csTimingReserved;           /* Init to 0*/
+
+    DisplayModeID                   csDisplayModeID;            /* Init to 0*/
+    UInt32                          csDisplayModeSeed;          /* */
+    UInt32                          csDisplayModeState;         /* Display Mode state*/
+    UInt32                          csDisplayModeAlias;         /* Mode to use when programmed.*/
+
+    UInt32                          csSignalConfig;
+    UInt32                          csSignalLevels;
+
+    UInt64                          csPixelClock;               /* Hz*/
+
+    UInt64                          csMinPixelClock;            /* Hz - With error what is slowest actual clock */
+    UInt64                          csMaxPixelClock;            /* Hz - With error what is fasted actual clock */
+
+
+    UInt32                          csHorizontalActive;         /* Pixels*/
+    UInt32                          csHorizontalBlanking;       /* Pixels*/
+    UInt32                          csHorizontalSyncOffset;     /* Pixels*/
+    UInt32                          csHorizontalSyncPulseWidth; /* Pixels*/
+
+    UInt32                          csVerticalActive;           /* Lines*/
+    UInt32                          csVerticalBlanking;         /* Lines*/
+    UInt32                          csVerticalSyncOffset;       /* Lines*/
+    UInt32                          csVerticalSyncPulseWidth;   /* Lines*/
+
+    UInt32                          csHorizontalBorderLeft;     /* Pixels*/
+    UInt32                          csHorizontalBorderRight;    /* Pixels*/
+    UInt32                          csVerticalBorderTop;        /* Lines*/
+    UInt32                          csVerticalBorderBottom;     /* Lines*/
+
+    UInt32                          csHorizontalSyncConfig;
+    UInt32                          csHorizontalSyncLevel;      /* Future use (init to 0)*/
+    UInt32                          csVerticalSyncConfig;
+    UInt32                          csVerticalSyncLevel;        /* Future use (init to 0)*/
+
+    UInt32                          csNumLinks;                 /* number of links, if 0 = assume link - 0 */
+
+    UInt32                          csReserved2;                /* Init to 0*/
+    UInt32                          csReserved3;                /* Init to 0*/
+    UInt32                          csReserved4;                /* Init to 0*/
+
+    UInt32                          csReserved5;                /* Init to 0*/
+    UInt32                          csReserved6;                /* Init to 0*/
+    UInt32                          csReserved7;                /* Init to 0*/
+    UInt32                          csReserved8;                /* Init to 0*/
+};
+typedef struct VDDetailedTimingRec      VDDetailedTimingRec;
+
+typedef VDDetailedTimingRec *           VDDetailedTimingPtr;
+
+/* csScalerFeatures */
+enum {
+    kScaleStretchOnlyMask         = (1<<0),                     /* True means the driver cannot add borders to avoid non-square pixels */
+    kScaleCanUpSamplePixelsMask   = (1<<1),                     /* True means timings with more active clocks than pixels (ie 640x480 pixels on a 1600x1200 timing) */
+    kScaleCanDownSamplePixelsMask = (1<<2),                     /* True means timings with fewer active clocks than pixels (ie 1600x1200  pixels on a 640x480 timing) */
+    kScaleCanScaleInterlacedMask  = (1<<3),                     /* True means can scale an interlaced timing */
+    kScaleCanSupportInsetMask     = (1<<4),                     /* True means can scale a timing with insets */
+    kScaleCanRotateMask           = (1<<5),                     /* True means can rotate image */
+    kScaleCanBorderInsetOnlyMask  = (1<<6)                      /* True means can scale a timing with insets */
+};
+
+/* csScalerFlags */
+enum {
+    kScaleStretchToFitMask      = 0x00000001,                   /* True means the driver should avoid borders and allow non-square pixels */
+
+    kScaleRotateFlagsMask       = 0x000000f0,
+
+    kScaleSwapAxesMask          = 0x00000010,
+    kScaleInvertXMask           = 0x00000020,
+    kScaleInvertYMask           = 0x00000040,
+
+    kScaleRotate0Mask           = 0x00000000,
+    kScaleRotate90Mask          = kScaleSwapAxesMask | kScaleInvertXMask,
+    kScaleRotate180Mask         = kScaleInvertXMask  | kScaleInvertYMask,
+    kScaleRotate270Mask         = kScaleSwapAxesMask | kScaleInvertYMask
+};
+
+typedef UInt32                  VDClutBehavior;
+typedef VDClutBehavior *        VDClutBehaviorPtr;
+enum {
+    kSetClutAtSetEntries        = 0,                            /* SetEntries behavior is to update clut during SetEntries call*/
+    kSetClutAtVBL               = 1                             /* SetEntries behavior is to upate clut at next vbl*/
+};
+
+
+struct VDCommunicationRec {
+    SInt32                          csBusID;                    /* kVideoDefaultBus for single headed cards.*/
+    UInt32                          csCommFlags;                /* Always zero*/
+    UInt32                          csMinReplyDelay;            /* Minimum delay between send and reply transactions (units depend on csCommFlags)*/
+    UInt32                          csReserved2;                /* Always zero*/
+
+    UInt32                          csSendAddress;              /* Usually I2C address (eg 0x6E)*/
+    UInt32                          csSendType;                 /* See kVideoSimpleI2CType etc.*/
+    LogicalAddress                  csSendBuffer;               /* Pointer to the send buffer*/
+    ByteCount                       csSendSize;                 /* Number of bytes to send*/
+
+    UInt32                          csReplyAddress;             /* Address from which to read (eg 0x6F for kVideoDDCciReplyType I2C address)*/
+    UInt32                          csReplyType;                /* See kVideoDDCciReplyType etc.*/
+    LogicalAddress                  csReplyBuffer;              /* Pointer to the reply buffer*/
+    ByteCount                       csReplySize;                /* Max bytes to reply (size of csReplyBuffer)*/
+
+    UInt32                          csReserved3;
+    UInt32                          csReserved4;
+    UInt32                          csReserved5;                /* Always zero*/
+    UInt32                          csReserved6;                /* Always zero*/
+};
+typedef struct VDCommunicationRec       VDCommunicationRec;
+
+typedef VDCommunicationRec *            VDCommunicationPtr;
+
+struct VDCommunicationInfoRec {
+    SInt32                          csBusID;                    /* kVideoDefaultBus for single headed cards. */
+    UInt32                          csBusType;                  /* See kVideoBusI2C etc.*/
+    SInt32                          csMinBus;                   /* Minimum bus (usually kVideoDefaultBus).  Used to probe additional busses*/
+    SInt32                          csMaxBus;                   /* Max bus (usually kVideoDefaultBus).  Used to probe additional busses*/
+
+    UInt32                          csSupportedTypes;           /* Bit field for first 32 supported transaction types.  Eg. 0x07 => support for kVideoNoTransactionType, kVideoSimpleI2CType and kVideoDDCciReplyType.*/
+    UInt32                          csSupportedCommFlags;       /* Return the flags csCommFlags understood by this driver. */
+    UInt32                          csReserved2;                /* Always zero*/
+    UInt32                          csReserved3;                /* Always zero*/
+
+    UInt32                          csReserved4;                /* Always zero*/
+    UInt32                          csReserved5;                /* Always zero*/
+    UInt32                          csReserved6;                /* Always zero*/
+    UInt32                          csReserved7;                /* Always zero*/
+};
+typedef struct VDCommunicationInfoRec   VDCommunicationInfoRec;
+
+typedef VDCommunicationInfoRec *        VDCommunicationInfoPtr;
+
+
+struct VDScalerRec {
+    UInt32                          csScalerSize;               /* Init to sizeof(VDScalerRec) */
+    UInt32                          csScalerVersion;            /* Init to 0 */
+    UInt32                          csReserved1;                /* Init to 0 */
+    UInt32                          csReserved2;                /* Init to 0 */
+    
+    DisplayModeID                   csDisplayModeID;            /* Display Mode ID modified by this call. */
+    UInt32                          csDisplayModeSeed;          /*  */
+    UInt32                          csDisplayModeState;         /* Display Mode state */
+    UInt32                          csReserved3;                /* Init to 0 */
+    
+    UInt32                          csScalerFlags;              /* Init to 0 */
+    UInt32                          csHorizontalPixels;         /* Graphics system addressable pixels */
+    UInt32                          csVerticalPixels;           /* Graphics system addressable lines */
+    UInt32                          csHorizontalInset;          /* Border pixels for underscan */
+    UInt32                          csVerticalInset;            /* Border lines for underscan */
+    UInt32                          csReserved6;                /* Init to 0 */
+    UInt32                          csReserved7;                /* Init to 0 */
+    UInt32                          csReserved8;                /* Init to 0 */
+};
+typedef struct VDScalerRec   VDScalerRec;
+typedef VDScalerRec  *VDScalerPtr;
+
+struct VDScalerInfoRec {
+    UInt32                          csScalerInfoSize;           /* Init to sizeof(VDScalerInfoRec) */
+    UInt32                          csScalerInfoVersion;        /* Init to 0 */
+    UInt32                          csReserved1;                /* Init to 0 */
+    UInt32                          csReserved2;                /* Init to 0 */
+    
+    UInt32                          csScalerFeatures;           /* Feature flags */
+    UInt32                          csMaxHorizontalPixels;      /* limit to horizontal scaled pixels */
+    UInt32                          csMaxVerticalPixels;        /* limit to vertical scaled pixels */
+    UInt32                          csReserved3;                /* Init to 0 */
+
+    UInt32                          csReserved4;                /* Init to 0 */
+    UInt32                          csReserved5;                /* Init to 0 */
+    UInt32                          csReserved6;                /* Init to 0 */
+    UInt32                          csReserved7;                /* Init to 0 */
+};
+typedef struct VDScalerInfoRec   VDScalerInfoRec;
+typedef VDScalerInfoRec *VDScalerInfoPtr;
+
+enum {
+    /* csMirrorFeatures*/
+    kMirrorSameDepthOnlyMirrorMask = (1 << 0),                  /* Commonly true - Mirroring can only be done if the displays are the same bitdepth*/
+    kMirrorSameSizeOnlyMirrorMask = (1 << 1),                   /* Commonly false - Mirroring can only be done if the displays are the same size*/
+    kMirrorSameTimingOnlyMirrorMask = (1 << 2),                 /* Sometimes true - Mirroring can only be done if the displays are the same timing*/
+    kMirrorCommonGammaMask        = (1 << 3)                    /* Sometimes true - Only one gamma correction LUT.*/
+};
+
+enum {
+    /* csMirrorSupportedFlags and csMirrorFlags*/
+    kMirrorCanMirrorMask          = (1 << 0),                   /* Set means we can HW mirrored right now (uses csMirrorEntryID)*/
+    kMirrorAreMirroredMask        = (1 << 1),                   /* Set means we are HW mirrored right now (uses csMirrorEntryID)*/
+    kMirrorUnclippedMirrorMask    = (1 << 2),                   /* Set means mirrored displays are not clipped to their intersection*/
+    kMirrorHAlignCenterMirrorMask = (1 << 3),                   /* Set means mirrored displays can/should be centered horizontally*/
+    kMirrorVAlignCenterMirrorMask = (1 << 4),                   /* Set means mirrored displays can/should be centered vertically*/
+    kMirrorCanChangePixelFormatMask = (1 << 5),                 /* Set means mirrored the device should change the pixel format of mirrored displays to allow mirroring.*/
+    kMirrorCanChangeTimingMask    = (1 << 6),                   /* Set means mirrored the device should change the timing of mirrored displays to allow mirroring.*/
+    kMirrorClippedMirrorMask      = (1 << 7)                    /* Set means mirrored displays are clipped to their intersection (driver handles blacking and base address adjustment)*/
+};
+
+struct VDMirrorRec {
+    UInt32              csMirrorSize;           /* Init to sizeof(VDMirrorRec)*/
+    UInt32              csMirrorVersion;        /* Init to 0*/
+    
+    RegEntryID          csMirrorRequestID;   /* Input RegEntryID to check for mirroring support and state*/
+    RegEntryID          csMirrorResultID;    /* Output RegEntryID of the next mirrored device*/
+    
+    UInt32              csMirrorFeatures;       /* Output summary features of the driver*/
+    UInt32              csMirrorSupportedFlags; /* Output configuration options supported by the driver*/
+    UInt32              csMirrorFlags;          /* Output configuration options active now*/
+    UInt32              csReserved1;            /* Init to 0*/
+    
+    
+    UInt32              csReserved2;            /* Init to 0*/
+    UInt32              csReserved3;            /* Init to 0*/
+    UInt32              csReserved4;            /* Init to 0*/
+    UInt32              csReserved5;            /* Init to 0*/
+};
+typedef struct VDMirrorRec VDMirrorRec;
+typedef VDMirrorRec * VDMirrorPtr;
+
+struct VDConfigurationRec {
+    UInt32              csConfigFeature;        /* input what feature to config - always input*/
+    UInt32              csConfigSupport;        /* output support value - always output*/
+    uintptr_t           csConfigValue;          /* input/output feature value - input on Control(), output on Status()*/
+    uintptr_t           csReserved1;
+    uintptr_t           csReserved2;
+};
+typedef struct VDConfigurationRec       VDConfigurationRec;
+typedef VDConfigurationRec *            VDConfigurationPtr;
+
+enum
+{
+    kDVIPowerSwitchFeature        = (1 << 0),   /* Used for csConfigFeature*/
+    kDVIPowerSwitchSupportMask    = (1 << 0),   /* Read-only*/
+    kDVIPowerSwitchActiveMask     = (1 << 0),   /* Read/write for csConfigValue*/
+};
+
+struct VDConfigurationFeatureListRec
+{
+    OSType *    csConfigFeatureList;
+    ItemCount   csNumConfigFeatures;
+    uintptr_t   csReserved1;
+    uintptr_t   csReserved2;
+};
+typedef struct VDConfigurationFeatureListRec   VDConfigurationFeatureListRec;
+typedef VDConfigurationFeatureListRec *        VDConfigurationFeatureListRecPtr;
+
+
+#ifndef __LP64__
+#pragma options align=reset
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IOMACOSVIDEO__ */
+
diff --git a/i386/include/IOKit/ndrvsupport/IONDRVFramebuffer.h b/i386/include/IOKit/ndrvsupport/IONDRVFramebuffer.h
new file mode 100644
index 0000000..ca65891
--- /dev/null
+++ b/i386/include/IOKit/ndrvsupport/IONDRVFramebuffer.h
@@ -0,0 +1,352 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1997-1998 Apple Computer, Inc.
+ *
+ *
+ * HISTORY
+ *
+ * sdouglas  22 Oct 97 - first checked in.
+ * sdouglas  24 Jul 98 - start IOKit.
+ * sdouglas  15 Dec 98 - cpp.
+ *
+ */
+
+#ifndef _IOKIT_IONDRVFRAMEBUFFER_H
+#define _IOKIT_IONDRVFRAMEBUFFER_H
+
+#include <IOKit/graphics/IOFramebuffer.h>
+#include <IOKit/ndrvsupport/IOMacOSVideo.h>
+#include <IOKit/ndrvsupport/IONDRVSupport.h>
+
+#define kIONDRVDisableKey       "AAPL,disable-ndrv"
+
+class IONDRVFramebuffer : public IOFramebuffer
+{
+    OSDeclareDefaultStructors(IONDRVFramebuffer)
+
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of this class in the future.
+    */    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData * reserved;
+
+protected:
+
+    IOService *                 nub;
+    class IONDRV *              ndrv;
+
+    // current configuration
+    IODisplayModeID             currentDisplayMode;
+    IOIndex                     currentDepth;
+    IOIndex                     currentPage;
+    UInt8                       __reservedE;
+
+    IOPhysicalAddress           physicalFramebuffer;
+    IODeviceMemory      *       vramRange;
+
+    UInt8                       gammaWidth;
+    UInt8                       __reservedD;
+    UInt8                       lastGrayMode;
+    VDClutBehavior              lastClutSetting;
+    UInt8                       __reservedC;
+
+    bool                        consoleDevice;
+    UInt32                      powerState;
+    UInt32                      ndrvState;
+    SInt32                      ndrvEnter;
+    OSArray *                   detailedTimings;
+    UInt32                      detailedTimingsSeed;
+    UInt32 *                    detailedTimingsCurrent;
+
+    IODeviceMemory *            vramMemory;
+
+    VDResolutionInfoRec         cachedVDResolution;
+
+    struct _VSLService *        vslServices;
+
+    UInt32                      accessFlags;
+    unsigned int                shouldDoI2CPower:1;
+    unsigned int                online:1;
+    unsigned int                avJackState:1;
+    unsigned int                grayMode:1;
+    unsigned int                platformSleep:1;
+    unsigned int                forceReadEDID:1;
+    unsigned int                supportsProbe:1;
+    unsigned int                __reservedB:25;
+
+    IOService *                 device;
+
+    UInt32                      __reservedA[29];
+
+private:
+    struct IONDRVFramebufferPrivate * __private;
+
+public:
+    virtual IOReturn doDriverIO( UInt32 commandID, void * contents,
+                                 UInt32 commandCode, UInt32 commandKind );
+private:
+    OSMetaClassDeclareReservedUsed(IONDRVFramebuffer, 0);
+
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 1);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 2);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 3);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 4);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 5);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 6);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 7);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 8);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 9);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 10);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 11);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 12);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 13);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 14);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 15);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 16);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 17);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 18);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 19);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 20);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 21);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 22);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 23);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 24);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 25);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 26);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 27);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 28);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 29);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 30);
+    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 31);
+
+private:
+
+    void initForPM ( void );
+
+    virtual unsigned long maxCapabilityForDomainState( IOPMPowerFlags domainState );
+    virtual unsigned long initialPowerStateForDomainState( IOPMPowerFlags domainState );
+    virtual unsigned long powerStateForDomainState( IOPMPowerFlags domainState );
+
+    virtual IOReturn checkDriver( void );
+    virtual UInt32 iterateAllModes( IODisplayModeID * displayModeIDs );
+    virtual IOReturn getResInfoForMode( IODisplayModeID modeID,
+                                    IODisplayModeInformation * theInfo );
+    virtual IOReturn getResInfoForArbMode( IODisplayModeID modeID,
+                                    IODisplayModeInformation * theInfo );
+    IOReturn getResInfoForDetailed( IODisplayModeID modeID,
+                                    VDDetailedTimingRec * detailed,
+                                    IODisplayModeInformation * info );
+    IOIndex mapDepthIndex( IODisplayModeID modeID, IOIndex depth, bool fromDepthMode );
+    virtual IOReturn validateDisplayMode(
+            IODisplayModeID mode, IOOptionBits flags,
+            VDDetailedTimingRec ** detailed );
+    virtual IOReturn setDetailedTiming(
+            IODisplayModeID mode, IOOptionBits options,
+            void * description, IOByteCount descripSize );
+    virtual void getCurrentConfiguration( void );
+    static const IOTVector * _undefinedSymbolHandler( void * self, 
+                            const char * libraryName, const char * symbolName );
+    static bool _videoJackStateChangeHandler( void * target, void * ref,
+                            IOService * newService, IONotifier * notifier );
+    static void _avProbeAction( OSObject * p0, IOTimerEventSource * evtSrc );
+    void displayI2CPower( bool enable );
+    IOReturn ndrvSetPowerState( UInt32 newState );
+    IOReturn ndrvUpdatePowerState( void );
+    IOReturn ndrvSetDisplayPowerState( UInt32 newState );
+    static IOReturn _probeAction( IONDRVFramebuffer * self, IOOptionBits options );
+    bool searchOfflineMode( IODisplayModeID * offlineMode );
+    IOReturn processConnectChange( uintptr_t * value );
+    IOReturn setMirror( IONDRVFramebuffer * other );
+    IOReturn setConnectionFlags( void );
+    bool getOnlineState( void );
+    IOReturn ndrvGetSetFeature( UInt32 feature, uintptr_t newValue, uintptr_t * currentValue );
+    static IOReturn _doControl( IONDRVFramebuffer * self, UInt32 code, void * params );
+    static IOReturn _doStatus( IONDRVFramebuffer * self, UInt32 code, void * params );
+    static IOReturn extControl( OSObject * owner, void * code, void * params );
+    static IOReturn extStatus( OSObject * owner, void * code, void * params );
+    IOReturn createI2C( void );
+    void setInfoProperties( void );
+
+public:
+    virtual IOReturn doControl( UInt32 code, void * params );
+    virtual IOReturn doStatus( UInt32 code, void * params );
+
+public:
+
+    virtual IOService * probe(  IOService *     provider,
+                                SInt32 *        score );
+
+    virtual bool start( IOService * provider );
+
+    virtual void stop( IOService * provider );
+
+    virtual void free( void );
+
+    virtual IOReturn setProperties( OSObject * properties );
+
+    virtual IOReturn requestProbe( IOOptionBits options );
+
+    virtual IOReturn enableController( void );
+
+    virtual IODeviceMemory * makeSubRange( IOPhysicalAddress start,
+                                           IOPhysicalLength length );
+    virtual IODeviceMemory * getApertureRange( IOPixelAperture aperture );
+    virtual IODeviceMemory * getVRAMRange( void );
+
+    virtual IODeviceMemory * findVRAM( void );
+
+    virtual bool isConsoleDevice( void );
+
+    virtual const IOTVector * undefinedSymbolHandler( const char * libraryName,
+                                                      const char * symbolName );
+
+    virtual const char * getPixelFormats( void );
+
+    // Array of supported display modes
+    virtual IOItemCount getDisplayModeCount( void );
+    virtual IOReturn getDisplayModes( IODisplayModeID * allDisplayModes );
+
+    // Info about a display mode
+    virtual IOReturn getInformationForDisplayMode( IODisplayModeID displayMode,
+                    IODisplayModeInformation * info );
+
+    // Mask of pixel formats available in mode and depth
+    virtual UInt64  getPixelFormatsForDisplayMode( IODisplayModeID displayMode,
+                    IOIndex depth );
+
+    virtual IOReturn getPixelInformation(
+        IODisplayModeID displayMode, IOIndex depth,
+        IOPixelAperture aperture, IOPixelInformation * pixelInfo );
+
+    // Framebuffer info
+
+    // Current display mode and depth
+    virtual IOReturn getCurrentDisplayMode( IODisplayModeID * displayMode,
+                            IOIndex * depth );
+
+    // Set display mode and depth
+    virtual IOReturn setDisplayMode( IODisplayModeID displayMode,
+                            IOIndex depth );
+
+    // For pages
+    virtual IOReturn setApertureEnable( IOPixelAperture aperture,
+                    IOOptionBits enable );
+
+    virtual IOReturn setStartupDisplayMode( IODisplayModeID displayMode,
+                            IOIndex depth );
+    virtual IOReturn getStartupDisplayMode( IODisplayModeID * displayMode,
+                            IOIndex * depth );
+
+    //// CLUTs
+
+    virtual IOReturn setCLUTWithEntries( IOColorEntry * colors, UInt32 index,
+                UInt32 numEntries, IOOptionBits options );
+
+    //// Gamma
+
+    virtual IOReturn setGammaTable( UInt32 channelCount, UInt32 dataCount,
+                    UInt32 dataWidth, void * data );
+
+    //// Display mode timing information
+
+    virtual IOReturn getTimingInfoForDisplayMode( IODisplayModeID displayMode,
+                IOTimingInformation * info );
+
+    //// Detailed timing information
+
+    virtual IOReturn validateDetailedTiming(
+                    void * description, IOByteCount descripSize );
+
+    virtual IOReturn setDetailedTimings( OSArray * array );
+
+    //// Controller attributes
+
+    virtual IOReturn setAttribute( IOSelect attribute, uintptr_t value );
+    virtual IOReturn getAttribute( IOSelect attribute, uintptr_t * value );
+
+    //// Connections
+
+    virtual IOItemCount getConnectionCount( void );
+
+    virtual IOReturn getAttributeForConnection( IOIndex connectIndex,
+                    IOSelect attribute, uintptr_t  * value );
+    
+    virtual IOReturn setAttributeForConnection( IOIndex connectIndex,
+                    IOSelect attribute, uintptr_t  info );
+
+    // Apple sensing
+
+    virtual IOReturn getAppleSense( IOIndex connectIndex,
+            UInt32 * senseType,
+            UInt32 * primary,
+            UInt32 * extended,
+            UInt32 * displayType );
+
+    virtual IOReturn connectFlags( IOIndex connectIndex,
+                    IODisplayModeID displayMode, IOOptionBits * flags );
+
+    //// IOHighLevelDDCSense
+
+    virtual bool hasDDCConnect( IOIndex connectIndex );
+    virtual IOReturn getDDCBlock( IOIndex connectIndex, UInt32 blockNumber,
+                    IOSelect blockType, IOOptionBits options,
+                    UInt8 * data, IOByteCount * length );
+
+    //// Interrupts
+
+    virtual IOReturn registerForInterruptType( IOSelect interruptType,
+                        IOFBInterruptProc proc, OSObject * target, void * ref,
+                        void ** interruptRef );
+    virtual IOReturn unregisterInterrupt( void * interruptRef );
+    virtual IOReturn setInterruptState( void * interruptRef, UInt32 state );
+
+    //// HW Cursors
+
+    virtual IOReturn setCursorImage( void * cursorImage );
+    virtual IOReturn setCursorState( SInt32 x, SInt32 y, bool visible );
+
+    //// I2C calls
+
+    virtual IOReturn doI2CRequest( UInt32 bus, IOI2CBusTiming * timing, IOI2CRequest * request );
+
+    //// VSL calls
+
+    static OSStatus VSLNewInterruptService(
+                            void * entryID,
+                            UInt32 serviceType,
+                            _VSLService ** serviceID );
+    static OSStatus VSLDisposeInterruptService( _VSLService * serviceID );
+    static OSStatus VSLDoInterruptService( _VSLService * serviceID );
+    static Boolean  VSLPrepareCursorForHardwareCursor(
+                            void * cursorRef,
+                            IOHardwareCursorDescriptor * hwDesc,
+                            IOHardwareCursorInfo * hwCursorInfo );
+};
+
+#endif /* ! _IOKIT_IONDRVFRAMEBUFFER_H */
+
+
diff --git a/i386/include/IOKit/ndrvsupport/IONDRVLibraries.h b/i386/include/IOKit/ndrvsupport/IONDRVLibraries.h
new file mode 100644
index 0000000..ad4a26d
--- /dev/null
+++ b/i386/include/IOKit/ndrvsupport/IONDRVLibraries.h
@@ -0,0 +1,696 @@
+
+#ifndef __IONDRVLIBRARIES__
+#define __IONDRVLIBRARIES__
+
+#include <libkern/OSByteOrder.h>
+#include <libkern/OSAtomic.h>
+#include <IOKit/ndrvsupport/IOMacOSTypes.h>
+#include <IOKit/graphics/IOGraphicsTypes.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* NameRegistry error codes */
+enum {
+    nrLockedErr                         = -2536,
+    nrNotEnoughMemoryErr                = -2537,
+    nrInvalidNodeErr                    = -2538,
+    nrNotFoundErr                       = -2539,
+    nrNotCreatedErr                     = -2540,
+    nrNameErr                           = -2541,
+    nrNotSlotDeviceErr                  = -2542,
+    nrDataTruncatedErr                  = -2543,
+    nrPowerErr                          = -2544,
+    nrPowerSwitchAbortErr               = -2545,
+    nrTypeMismatchErr                   = -2546,
+    nrNotModifiedErr                    = -2547,
+    nrOverrunErr                        = -2548,
+    nrResultCodeBase                    = -2549,
+    nrPathNotFound                      = -2550,    /* a path component lookup failed */
+    nrPathBufferTooSmall                = -2551,    /* buffer for path is too small */
+    nrInvalidEntryIterationOp           = -2552,    /* invalid entry iteration operation */
+    nrPropertyAlreadyExists             = -2553,    /* property already exists */
+    nrIterationDone                     = -2554,    /* iteration operation is done */
+    nrExitedIteratorScope               = -2555,    /* outer scope of iterator was exited */
+    nrTransactionAborted                = -2556,        /* transaction was aborted */
+
+    gestaltUndefSelectorErr             = -5551 /*undefined selector was passed to Gestalt*/
+};
+
+enum {
+    kNVRAMProperty                      = 0x00000020,            // matches NR
+};
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef _IOKIT_IOSERVICE_H
+typedef struct IOService IOService;
+#endif
+
+IOReturn _IONDRVLibrariesInitialize( IOService * provider );
+IOReturn _IONDRVLibrariesFinalize( IOService * provider );
+
+#ifndef kAAPLRegEntryIDKey
+#define kAAPLRegEntryIDKey      "AAPL,RegEntryID"
+#endif
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+UInt32 EndianSwap32Bit( UInt32 data );
+
+UInt16 EndianSwap16Bit( UInt16 data );
+
+void SynchronizeIO(void);
+
+OSErr ExpMgrConfigReadLong(
+  RegEntryIDPtr    node,
+  LogicalAddress   configAddr,
+  UInt32 *         valuePtr);
+
+OSErr ExpMgrConfigWriteLong(
+  RegEntryIDPtr    node,
+  LogicalAddress   configAddr,
+  UInt32           value);
+
+OSErr ExpMgrConfigReadWord(
+  RegEntryIDPtr    node,
+  LogicalAddress   configAddr,
+  UInt16 *         valuePtr);
+
+OSErr ExpMgrConfigWriteWord(
+  RegEntryIDPtr    node,
+  LogicalAddress   configAddr,
+  UInt16           value);
+
+OSErr ExpMgrConfigReadByte(
+  RegEntryIDPtr    node,
+  LogicalAddress   configAddr,
+  UInt8 *          valuePtr);
+
+OSErr ExpMgrConfigWriteByte(
+  RegEntryIDPtr    node,
+  LogicalAddress   configAddr,
+  UInt8            value);
+
+OSErr ExpMgrIOReadLong(
+  RegEntryIDPtr    node,
+  LogicalAddress   ioAddr,
+  UInt32 *         valuePtr);
+
+OSErr ExpMgrIOWriteLong(
+  RegEntryIDPtr    node,
+  LogicalAddress   ioAddr,
+  UInt32           value);
+
+OSErr ExpMgrIOReadWord(
+  RegEntryIDPtr    node,
+  LogicalAddress   ioAddr,
+  UInt16 *         valuePtr);
+
+OSErr ExpMgrIOWriteWord(
+  RegEntryIDPtr    node,
+  LogicalAddress   ioAddr,
+  UInt16           value);
+
+OSErr ExpMgrIOReadByte(
+  RegEntryIDPtr    node,
+  LogicalAddress   ioAddr,
+  UInt8 *          valuePtr);
+
+OSErr ExpMgrIOWriteByte(
+  RegEntryIDPtr    node,
+  LogicalAddress   ioAddr,
+  UInt8            value);
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/*******************************************************************************
+ * 
+ * Foundation Types
+ *
+ */
+/* Value of a property */
+typedef void *                          RegPropertyValue;
+/* Length of property value */
+typedef UInt32                          RegPropertyValueSize;
+
+/*******************************************************************************/
+
+/*******************************************************************************
+ *
+ * Root Entry Name Definitions  (Applies to all Names in the RootNameSpace)
+ *
+ *  + Names are a colon-separated list of name components.  Name components
+ *    may not themselves contain colons.  
+ *  + Names are presented as null-terminated ASCII character strings.
+ *  + Names follow similar parsing rules to Apple file system absolute
+ *    and relative paths.  However the '::' parent directory syntax is
+ *    not currently supported.
+ */
+/* Max length of Entry Name */
+enum {
+  kRegCStrMaxEntryNameLength    = 47
+};
+
+/* Entry Names are single byte ASCII */
+typedef char                            RegCStrEntryName;
+typedef char *                          RegCStrEntryNamePtr;
+/* length of RegCStrEntryNameBuf =  kRegCStrMaxEntryNameLength+1*/
+typedef char                            RegCStrEntryNameBuf[48];
+typedef char                            RegCStrPathName;
+typedef UInt32                          RegPathNameSize;
+enum {
+  kRegPathNameSeparator         = ':',  /* 0x3A */
+  kRegEntryNameTerminator       = 0x00, /* '\0' */
+  kRegPathNameTerminator        = 0x00  /* '\0' */
+};
+
+/*******************************************************************************
+ *
+ * Property Name and ID Definitions
+ *  (Applies to all Properties Regardless of NameSpace)
+ */
+enum {
+  kRegMaximumPropertyNameLength = 31,   /* Max length of Property Name */
+  kRegPropertyNameTerminator    = 0x00  /* '\0' */
+};
+
+typedef char                            RegPropertyNameBuf[32];
+typedef char                            RegPropertyName;
+typedef char *                          RegPropertyNamePtr;
+enum {
+  kRegMaxPropertyNameLength     = kRegMaximumPropertyNameLength
+};
+
+/*******************************************************************************
+ *
+ * Iteration Operations
+ *
+ *  These specify direction when traversing the name relationships
+ */
+typedef UInt32                          RegIterationOp;
+typedef RegIterationOp                  RegEntryIterationOp;
+enum {
+                                        /* Absolute locations*/
+  kRegIterRoot                  = 0x00000002, /* "Upward" Relationships */
+  kRegIterParents               = 0x00000003, /* include all  parent(s) of entry */
+                                        /* "Downward" Relationships*/
+  kRegIterChildren              = 0x00000004, /* include all children */
+  kRegIterSubTrees              = 0x00000005, /* include all sub trees of entry */
+  kRegIterDescendants           = 0x00000005, /* include all descendants of entry */
+                                        /* "Horizontal" Relationships */
+  kRegIterSibling               = 0x00000006, /* include all siblings */
+                                        /* Keep doing the same thing*/
+  kRegIterContinue              = 0x00000001
+};
+
+/*******************************************************************************
+ *
+ * Name Entry and Property Modifiers
+ *
+ *
+ *
+ * Modifiers describe special characteristics of names
+ * and properties.  Modifiers might be supported for
+ * some names and not others.
+ * 
+ * Device Drivers should not rely on functionality
+ * specified as a modifier.
+ */
+typedef UInt32                          RegModifiers;
+typedef RegModifiers                    RegEntryModifiers;
+typedef RegModifiers                    RegPropertyModifiers;
+enum {
+  kRegNoModifiers               = 0x00000000, /* no entry modifiers in place */
+  kRegUniversalModifierMask     = 0x0000FFFF, /* mods to all entries */
+  kRegNameSpaceModifierMask     = 0x00FF0000, /* mods to all entries within namespace */
+  kRegModifierMask              = (RegModifiers)0xFF000000 /* mods to just this entry */
+};
+
+/* Universal Property Modifiers */
+enum {
+  kRegPropertyValueIsSavedToNVRAM = 0x00000020, /* property is non-volatile (saved in NVRAM) */
+  kRegPropertyValueIsSavedToDisk = 0x00000040 /* property is non-volatile (saved on disk) */
+};
+
+typedef size_t Size;
+
+#ifndef _IOKIT_IOREGISTRYENTRY_H
+typedef struct IORegistryIterator IORegistryIterator;
+typedef struct OSIterator OSIterator;
+#endif /* _IOKIT_IOREGISTRYENTRY_H */
+typedef IORegistryIterator * RegEntryIter;
+typedef OSIterator * RegPropertyIter;
+
+OSStatus RegistryEntryIDCopy( const RegEntryID * entryID, RegEntryID * to );
+
+OSStatus RegistryEntryIDInit( RegEntryID * entryID );
+
+Boolean RegistryEntryIDCompare( const RegEntryID * id1, const RegEntryID * id2);
+
+OSStatus RegistryPropertyGetSize(
+  const RegEntryID *       entryID,
+  const RegPropertyName *  propertyName,
+  RegPropertyValueSize *   propertySize);
+
+OSStatus RegistryPropertyGet(
+  const RegEntryID *       entryID,
+  const RegPropertyName *  propertyName,
+  void *                   propertyValue,
+  RegPropertyValueSize *   propertySize);
+
+OSStatus RegistryPropertyCreate(
+  const RegEntryID *       entryID,
+  const RegPropertyName *  propertyName,
+  const void *             propertyValue,
+  RegPropertyValueSize     propertySize);
+
+OSStatus RegistryPropertyDelete(
+  const RegEntryID *       entryID,
+  const RegPropertyName *  propertyName);
+
+OSStatus RegistryPropertySet(
+  const RegEntryID *       entryID,
+  const RegPropertyName *  propertyName,
+  const void *             propertyValue,
+  RegPropertyValueSize     propertySize);
+
+OSStatus RegistryPropertyGetMod(
+  const RegEntryID *       entry,
+  const RegPropertyName *  name,
+  RegPropertyModifiers *   modifiers);
+
+OSStatus RegistryPropertySetMod(
+  const RegEntryID *       entry,
+  const RegPropertyName *  name,
+  RegPropertyModifiers     modifiers);
+
+OSStatus RegistryPropertyIterateCreate(
+  const RegEntryID *  entry,
+  RegPropertyIter *   cookie);
+
+OSStatus RegistryPropertyIterateDispose( RegPropertyIter * cookie);
+
+OSStatus RegistryPropertyIterate(
+  RegPropertyIter *  cookie,
+  RegPropertyName *  foundProperty,
+  Boolean *          done);
+
+OSStatus RegistryEntryIterateCreate( RegEntryIter * cookie);
+
+OSStatus RegistryEntryIterateDispose( RegEntryIter * cookie);
+
+OSStatus RegistryEntryIterateSet( RegEntryIter * cookie,
+                                    const RegEntryID * startEntryID);
+
+OSStatus RegistryEntryIterate( RegEntryIter *   cookie,
+                        RegEntryIterationOp     relationship,
+                        RegEntryID *    foundEntry,
+                        Boolean *       done);
+
+OSStatus RegistryCStrEntryToName( const RegEntryID *    entryID,
+                            RegEntryID *                parentEntry,
+                            RegCStrEntryName *          nameComponent,
+                            Boolean *                   done );
+
+OSStatus RegistryCStrEntryLookup(  const RegEntryID *   parentEntry,
+                            const RegCStrPathName *     path,
+                            RegEntryID *                newEntry);
+
+OSStatus RegistryCStrEntryCreate(  const RegEntryID *   parentEntry,
+                            const RegCStrPathName *     name,
+                            RegEntryID *                newEntry);
+
+OSStatus RegistryEntryDelete(const RegEntryID * entryID);
+
+OSStatus RegistryEntryIDDispose(RegEntryID * entryID);
+
+//
+
+OSStatus RegistryEntryCopy(
+  RegEntryID *  parentEntryID,
+  RegEntryID *  sourceDevice,
+  RegEntryID *  destDevice);
+
+OSStatus RegistryEntrySearch(
+  RegEntryIter *           cookie,
+  RegEntryIterationOp      relationship,
+  RegEntryID *             foundEntry,
+  Boolean *                done,
+  const RegPropertyName *  propertyName,
+  const void *             propertyValue,
+  RegPropertyValueSize     propertySize);
+
+OSStatus RegistryEntryToPathSize(
+  const RegEntryID *  entryID,
+  RegPathNameSize *   pathSize);
+
+OSStatus RegistryCStrEntryToPath(
+  const RegEntryID *  entryID,
+  RegCStrPathName *   pathName,
+  RegPathNameSize     pathSize);
+
+OSStatus RegistryPropertyRename(
+  const RegEntryID *       entry,
+  const RegPropertyName *  oldName,
+  const RegPropertyName *  newName);
+
+OSStatus RegistryEntryGetMod(
+  const RegEntryID *   entry,
+  RegEntryModifiers *  modifiers);
+
+OSStatus RegistryEntrySetMod(
+  const RegEntryID *  entry,
+  RegEntryModifiers   modifiers);
+
+OSStatus RegistryEntryMod(
+  RegEntryIter *        cookie,
+  RegEntryIterationOp   relationship,
+  RegEntryID *          foundEntry,
+  Boolean *             done,
+  RegEntryModifiers     matchingModifiers);
+
+OSStatus RegistryEntryPropertyMod(
+  RegEntryIter *         cookie,
+  RegEntryIterationOp    relationship,
+  RegEntryID *           foundEntry,
+  Boolean *              done,
+  RegPropertyModifiers   matchingModifiers);
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+void SynchronizeIO(void);
+
+Boolean CompareAndSwap(
+  UInt32    oldVvalue,
+  UInt32    newValue,
+  UInt32 *  OldValueAdr);
+
+UInt32 CStrLen(const char * src);
+
+char * CStrCopy( char * dst, const char * src);
+
+SInt16 CStrCmp(
+  const char *  s1,
+  const char *  s2);
+
+char * CStrCat(
+  char *        dst,
+  const char *  src);
+char * CStrNCopy(
+  char *        dst,
+  const char *  src,
+  UInt32        max);
+SInt16 CStrNCmp(
+  const char *  s1,
+  const char *  s2,
+  UInt32        max);
+char * CStrNCat(
+  char *        dst,
+  const char *  src,
+  UInt32        max);
+
+void BlockCopy(
+  const void *  srcPtr,
+  void *        destPtr,
+  Size          byteCount);
+void BlockMove(
+  const void *  srcPtr,
+  void *        destPtr,
+  Size          byteCount);
+void BlockMoveData(
+  const void *  srcPtr,
+  void *        destPtr,
+  Size          byteCount);
+void BlockMoveDataUncached(
+  const void *  srcPtr,
+  void *        destPtr,
+  Size          byteCount);
+void BlockMoveUncached(
+  const void *  srcPtr,
+  void *        destPtr,
+  Size          byteCount);
+void BlockZero(
+  const void *  srcPtr,
+  Size          byteCount);
+void BlockZeroUncached(
+  const void *  srcPtr,
+  Size          byteCount);
+
+char * PStrCopy( char *to, const char *from );
+
+void PStrToCStr( char *to, const char *from );
+
+void CStrToPStr( char *to, const char *from );
+
+LogicalAddress PoolAllocateResident(ByteCount byteSize, Boolean clear);
+
+OSStatus PoolDeallocate( LogicalAddress address );
+
+UInt32  CurrentExecutionLevel(void);
+
+UnsignedWide UpTime( void );
+
+UnsignedWide AddAbsoluteToAbsolute(UnsignedWide left, UnsignedWide right);
+
+UnsignedWide SubAbsoluteFromAbsolute(UnsignedWide left, UnsignedWide right);
+
+UnsignedWide DurationToAbsolute( Duration theDuration);
+
+UnsignedWide AddDurationToAbsolute( Duration duration, UnsignedWide absolute );
+
+UnsignedWide NanosecondsToAbsolute ( UnsignedWide theNanoseconds);
+
+UnsignedWide AbsoluteToNanoseconds( UnsignedWide absolute );
+
+Duration AbsoluteDeltaToDuration( UnsignedWide left, UnsignedWide right );
+
+Duration AbsoluteToDuration( UnsignedWide result );
+
+OSStatus DelayForHardware( UnsignedWide time );
+
+OSStatus DelayUntil( UnsignedWide time );
+
+OSStatus DelayFor( Duration theDuration );
+
+void SysDebugStr( const char * from );
+
+void SysDebug( void );
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+enum {
+  paramErr                      = -50,  /*error in user parameter list*/
+  noHardwareErr                 = -200, /*Sound Manager Error Returns*/
+  notEnoughHardwareErr          = -201, /*Sound Manager Error Returns*/
+  userCanceledErr               = -128,
+  qErr                          = -1,   /*queue element not found during deletion*/
+  vTypErr                       = -2,   /*invalid queue element*/
+  corErr                        = -3,   /*core routine number out of range*/
+  unimpErr                      = -4,   /*unimplemented core routine*/
+  SlpTypeErr                    = -5,   /*invalid queue element*/
+  seNoDB                        = -8,   /*no debugger installed to handle debugger command*/
+  controlErr                    = -17,  /*I/O System Errors*/
+  statusErr                     = -18,  /*I/O System Errors*/
+  readErr                       = -19,  /*I/O System Errors*/
+  writErr                       = -20,  /*I/O System Errors*/
+  badUnitErr                    = -21,  /*I/O System Errors*/
+  unitEmptyErr                  = -22,  /*I/O System Errors*/
+  openErr                       = -23,  /*I/O System Errors*/
+  closErr                       = -24,  /*I/O System Errors*/
+  dRemovErr                     = -25,  /*tried to remove an open driver*/
+  dInstErr                      = -26,   /*DrvrInstall couldn't find driver in resources*/
+
+  badCksmErr                    = -69,  /*addr mark checksum didn't check*/
+};
+enum {
+  durationMicrosecond           = -1,  /* Microseconds are negative*/
+  durationMillisecond           = 1,   /* Milliseconds are positive*/
+  durationSecond                = 1000, /* 1000 * durationMillisecond*/
+  durationMinute                = 60000, /* 60 * durationSecond,*/
+  durationHour                  = 3600000, /* 60 * durationMinute,*/
+  durationDay                   = 86400000, /* 24 * durationHour,*/
+  durationNoWait                = 0,   /* don't block*/
+  durationForever               = 0x7FFFFFFF /* no time limit*/
+};
+#ifndef NULL
+    #if !defined(__cplusplus) && (defined(__SC__) || defined(THINK_C))
+        /* Symantec C compilers (but not C++) want NULL and nil to be (void*)0  */
+        #define NULL ((void *) 0)
+    #else
+        /* in case int is 16-bits, make sure NULL is 32-bits */
+        #define NULL 0L
+    #endif
+#endif
+
+#ifndef nil
+    #define nil NULL
+#endif
+
+typedef ResType                         VSLGestaltType;
+
+enum {
+  clutType                      = 0,    /*0 if lookup table*/
+  fixedType                     = 1,    /*1 if fixed table*/
+  directType                    = 2,    /*2 if direct values*/
+  RGBDirect                     = 16   /* 16 & 32 bits/pixel pixelType value */
+};
+typedef UInt32 *                        UInt32Ptr;
+
+typedef struct IOHardwareCursorDescriptor HardwareCursorDescriptorRec;
+typedef HardwareCursorDescriptorRec *     HardwareCursorDescriptorPtr;
+typedef struct IOHardwareCursorInfo       HardwareCursorInfoRec;
+typedef HardwareCursorInfoRec *           HardwareCursorInfoPtr;
+
+typedef ResType                         InterruptServiceType;
+typedef struct _VSLService *            InterruptServiceIDType;
+typedef InterruptServiceIDType *        InterruptServiceIDPtr;
+
+enum {
+  kVBLInterruptServiceType      = 'vbl ',
+  kHBLInterruptServiceType      = 'hbl ',
+  kFrameInterruptServiceType    = 'fram',
+  kConnectInterruptServiceType  = 'dci ', /* Renamed -- Use kFBCheckInterruptServiceType*/
+  kFBConnectInterruptServiceType = kConnectInterruptServiceType, /* Demand to check configuration (Hardware unchanged)*/
+  kFBChangedInterruptServiceType = 'chng', /* Demand to rebuild (Hardware has reinitialized on dependent change)*/
+  kFBOfflineInterruptServiceType = 'remv', /* Demand to remove framebuffer (Hardware not available on dependent change -- but must not buserror)*/
+  kFBOnlineInterruptServiceType = 'add ' /* Notice that hardware is available (after being removed)*/
+};
+
+enum {
+    kVSLClamshellStateGestaltType = 'clam',
+};
+
+OSStatus
+VSLGestalt( VSLGestaltType selector, UInt32 * response );
+
+OSStatus 
+VSLSetDisplayConfiguration(RegEntryID * entryID,
+                                        RegPropertyName *  propertyName,
+                                        RegPropertyValue        configData,
+                                        RegPropertyValueSize configDataSize);
+OSErr
+VSLNewInterruptService(
+  RegEntryID *            serviceDevice,
+  InterruptServiceType    serviceType,
+  InterruptServiceIDPtr   serviceID);
+
+OSErr
+VSLWaitOnInterruptService(
+  InterruptServiceIDType   serviceID,
+  Duration                 timeout);
+
+OSErr
+VSLDisposeInterruptService(InterruptServiceIDType serviceID);
+
+OSErr
+VSLDoInterruptService(InterruptServiceIDType serviceID);
+
+Boolean
+VSLPrepareCursorForHardwareCursor(
+  void *                        cursorRef,
+  IOHardwareCursorDescriptor *  hardwareDescriptor,
+  IOHardwareCursorInfo *        hwCursorInfo);
+
+typedef UnsignedWide Nanoseconds;
+enum {
+                                        /* Version Release Stage Codes */
+  developStage                  = 0x20,
+  alphaStage                    = 0x40,
+  betaStage                     = 0x60,
+  finalStage                    = 0x80
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+typedef struct OpaqueIOCommandID*       IOCommandID;
+
+typedef UInt32 IOCommandKind;
+typedef UInt32 IOCommandCode;
+
+OSErr IOCommandIsComplete( IOCommandID commandID, OSErr result);
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#ifndef __IONDRV__
+typedef struct OpaqueInterruptSetID*    InterruptSetID;
+#else
+typedef class IONDRVInterruptSet *      InterruptSetID;
+#endif /* __IONDRV__ */
+
+typedef long                            InterruptMemberNumber;
+struct InterruptSetMember {
+  InterruptSetID      setID;
+  InterruptMemberNumber  member;
+};
+typedef struct InterruptSetMember       InterruptSetMember;
+enum {
+  kISTChipInterruptSource       = 0,
+  kISTOutputDMAInterruptSource  = 1,
+  kISTInputDMAInterruptSource   = 2,
+  kISTPropertyMemberCount       = 3
+};
+
+typedef InterruptSetMember              ISTProperty[3];
+#define kISTPropertyName    "driver-ist" 
+
+typedef long                            InterruptReturnValue;
+enum {
+  kFirstMemberNumber            = 1,
+  kIsrIsComplete                = 0,
+  kIsrIsNotComplete             = -1,
+  kMemberNumberParent           = -2
+};
+
+typedef Boolean                         InterruptSourceState;
+enum {
+  kSourceWasEnabled             = true,
+  kSourceWasDisabled            = false
+};
+
+typedef InterruptMemberNumber   (*InterruptHandler) (InterruptSetMember ISTmember, void *refCon, UInt32 theIntCount);
+typedef void                    (*InterruptEnabler) (InterruptSetMember ISTmember, void *refCon);
+typedef InterruptSourceState    (*InterruptDisabler)(InterruptSetMember ISTmember, void *refCon);
+
+enum {
+  kReturnToParentWhenComplete   = 0x00000001,
+  kReturnToParentWhenNotComplete = 0x00000002
+};
+
+typedef OptionBits      InterruptSetOptions;
+
+
+OSStatus GetInterruptFunctions(
+  InterruptSetID          setID,
+  InterruptMemberNumber   member,
+  void **                 refCon,
+  InterruptHandler *      handlerFunction,
+  InterruptEnabler *      enableFunction,
+  InterruptDisabler *     disableFunction);
+
+OSStatus InstallInterruptFunctions(
+  InterruptSetID          setID,
+  InterruptMemberNumber   member,
+  void *                  refCon,
+  InterruptHandler        handlerFunction,
+  InterruptEnabler        enableFunction,
+  InterruptDisabler       disableFunction);
+
+OSStatus CreateInterruptSet(
+  InterruptSetID          parentSet,
+  InterruptMemberNumber   parentMember,
+  InterruptMemberNumber   setSize,
+  InterruptSetID *        setID,
+  InterruptSetOptions     options);
+
+OSStatus DeleteInterruptSet( InterruptSetID setID );
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IONDRVLIBRARIES__ */
+
diff --git a/i386/include/IOKit/ndrvsupport/IONDRVSupport.h b/i386/include/IOKit/ndrvsupport/IONDRVSupport.h
new file mode 100644
index 0000000..2fdfcb6
--- /dev/null
+++ b/i386/include/IOKit/ndrvsupport/IONDRVSupport.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __IONDRVSUPPORT__
+#define __IONDRVSUPPORT__
+
+#include <libkern/OSTypes.h>
+
+#ifndef __LP64__
+#pragma options align=mac68k
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define kIONDRVIgnoreKey        "AAPL,iokit-ignore-ndrv"
+#define kIONDRVForXKey          "AAPL,iokit-ndrv"
+
+struct IOTVector {
+    void *      pc;
+    UInt32      toc;
+};
+typedef struct IOTVector IOTVector;
+
+struct IONDRVInterruptSetMember {
+        void *          setID;
+        UInt32          member;
+};
+typedef struct IONDRVInterruptSetMember IONDRVInterruptSetMember;
+
+typedef SInt32  (*IONDRVInterruptHandler)( IONDRVInterruptSetMember setMember, void *refCon, UInt32 theIntCount);
+typedef void    (*IONDRVInterruptEnabler)( IONDRVInterruptSetMember setMember, void *refCon);
+typedef Boolean (*IONDRVInterruptDisabler)( IONDRVInterruptSetMember setMember, void *refCon);
+
+enum {
+    kIONDRVFirstMemberNumber                    = 1,
+    kIONDRVIsrIsComplete                        = 0,
+    kIONDRVIsrIsNotComplete                     = -1,
+    kIONDRVMemberNumberParent                   = -2
+};
+
+enum {
+    kIONDRVReturnToParentWhenComplete           = 0x00000001,
+    kIONDRVReturnToParentWhenNotComplete        = 0x00000002
+};
+
+enum {
+    kIONDRVISTChipInterruptSource               = 0,
+    kIONDRVISTOutputDMAInterruptSource          = 1,
+    kIONDRVISTInputDMAInterruptSource           = 2,
+    kIONDRVISTPropertyMemberCount               = 3
+};
+
+#define kIONDRVISTPropertyName  "driver-ist" 
+
+IOReturn
+IONDRVInstallInterruptFunctions(void *  setID,
+                                UInt32  member,
+                                void *  refCon,
+                                IOTVector * handler,
+                                IOTVector * enabler,
+                                IOTVector * disabler );
+
+typedef const IOTVector * (*IONDRVUndefinedSymbolHandler)( void * self, 
+                            const char * libraryName, const char * symbolName );
+
+#ifndef __LP64__
+#pragma options align=reset
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __IONDRVSUPPORT__ */
diff --git a/i386/include/IOKit/network/IOBasicOutputQueue.h b/i386/include/IOKit/network/IOBasicOutputQueue.h
new file mode 100644
index 0000000..3519805
--- /dev/null
+++ b/i386/include/IOKit/network/IOBasicOutputQueue.h
@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOBASICOUTPUTQUEUE_H
+#define _IOBASICOUTPUTQUEUE_H
+
+#include <IOKit/IOLocks.h>
+#include <IOKit/network/IOOutputQueue.h>
+#include <IOKit/network/IOPacketQueue.h>  // FIXME - remove
+
+struct IOMbufQueue;
+
+/*! @class IOBasicOutputQueue
+    @abstract A concrete implementation of an IOOutputQueue. 
+    @discussion This object uses a spinlock to protect the packet queue from multiple producers.
+    A single producer is promoted to become a consumer when the queue is
+    not active. Otherwise, the producer will simply queue the packet and
+    return without blocking.
+
+    The flow of packets from the queue to its target can be controlled
+    by calling methods such as start(), stop(), or service(). The target
+    is expected to call those methods from a single threaded context,
+    i.e. the work loop context in a network driver. In addition, the
+    target must also return a status for every packet delivered by the
+    consumer thread. This return value is the only mechanism that the
+    target can use to manage the queue when it is running on the
+    consumer thread. 
+*/
+
+class IOBasicOutputQueue : public IOOutputQueue
+{
+    OSDeclareDefaultStructors( IOBasicOutputQueue )
+
+private:
+	static IOReturn dispatchNetworkDataNotification(void *          target,
+                                                    void *          param,
+                                                    IONetworkData * data,
+                                                    UInt32          type);
+
+    void dequeue();
+    
+protected:
+    OSObject *            _target;
+    IOOutputAction        _action;
+    IOOutputQueueStats *  _stats;
+    IONetworkData *       _statsData;
+	IOSimpleLock *        _spinlock;
+    IOMbufQueue *         _inQueue;
+    IOMbufQueue *         _queues[2];
+    volatile bool         _waitDequeueDone;
+    volatile UInt32       _state;
+    volatile UInt32       _serviceCount;
+
+/*! @function serviceThread
+    @abstract Provides an implementation for the serviceThread() method
+    defined in IOOutputQueue.
+    @discussion This method is called by the scheduled service thread when it
+    starts to run. The service thread is scheduled by service()
+    to restart a stalled queue when the kServiceAsync option is given.
+    @param param A parameter that was given to scheduleServiceThread().
+    This parameter is not used. 
+*/
+
+    virtual void serviceThread(void * param);
+
+/*! @function output
+    @abstract Transfers all packets in the mbuf queue to the target.
+    @param queue A queue of output packets.
+    @param state Returns a state bit defined by IOBasicOutputQueue that
+    declares the new state of the queue following this method call.
+    A kStateStalled is returned if the queue should stall, otherwise 0
+    is returned. 
+*/
+
+    virtual void output(IOMbufQueue * queue, UInt32 * state);
+
+/*! @function free
+    @abstract Frees the IOBasicOutputQueue object.
+    @discussion This function releases allocated resources, then call super::free(). 
+*/
+
+    virtual void free();
+
+/*! @function handleNetworkDataAccess
+    @abstract Handles an external access to the IONetworkData object
+    returned by getStatisticsData().
+    @param data The IONetworkData object being accessed.
+    @param type Description of the type of access being performed.
+    @param param An optional parameter for the handler.
+    @result Returns kIOReturnSuccess on success, or an error code otherwise.
+*/
+
+    virtual IOReturn handleNetworkDataAccess(IONetworkData * data,
+                                             UInt32          type,
+                                             void *          param);
+
+public:
+
+/*! @function init
+    @abstract Initializes an IOBasicOutputQueue object.
+    @param target The object that will handle packets removed from the
+    queue, which is usually a subclass of IONetworkController.
+    @param action The function that will handle packets removed from the
+    queue.
+    @param capacity The initial capacity of the output queue.
+    @result Returns true if initialized successfully, false otherwise. 
+*/
+
+    virtual bool init(OSObject *     target,
+                      IOOutputAction action,
+                      UInt32         capacity = 0);
+
+/*! @function withTarget
+    @abstract Factory method that constructs and initializes an
+    IOBasicOutputQueue object.
+    @param target An IONetworkController object that will handle packets
+    removed from the queue.
+    @param capacity The initial capacity of the output queue.
+    @result Returns an IOBasicOutputQueue object on success, or 0 otherwise. 
+*/
+
+    static IOBasicOutputQueue * withTarget(IONetworkController * target,
+                                           UInt32                capacity = 0);
+
+/*! @function withTarget
+    @abstract Factory method that constructs and initializes an
+    IOBasicOutputQueue object.
+    @param target The object that will handle packets removed from the
+    queue.
+    @param action The function that will handle packets removed from the
+    queue.
+    @param capacity The initial capacity of the output queue.
+    @result Returns an IOBasicOutputQueue object on success, or 0 otherwise. 
+*/
+
+    static IOBasicOutputQueue * withTarget(OSObject *     target,
+                                           IOOutputAction action,
+                                           UInt32         capacity = 0);
+
+/*! @function enqueue
+    @abstract Adds a packet, or a chain of packets,
+    to the queue.
+    @discussion This method is called by a client to add a packet, or a chain of packets,
+    to the queue.  A packet is described by an mbuf chain, while a chain
+    of packets is constructed by linking multiple mbuf chains via the
+    m_nextpkt field. This method can be called by multiple client
+    threads.
+    @param m A single packet, or a chain of packets.
+    @param param A parameter provided by the caller.
+    @result Always returns 0. 
+*/
+
+    virtual UInt32 enqueue(mbuf_t m, void * param);
+
+/*! @function start
+    @abstract Starts up the packet flow between the queue and its target.
+    @discussion Called by the target to start the queue. This will allow
+    packets to be removed from the queue, and then delivered to the target.
+    @result Returns true if the queue was started successfully, false otherwise. */
+
+    virtual bool start();
+
+/*! @function stop
+    @abstract Stops the packet flow between the queue and its target.
+    @discussion This method stops the queue and prevents it from sending packets to its
+    target. This call is synchronous and it may block. After this method
+    returns, the queue will no longer call the registered target/action,
+    even as new packets are added to the queue. The queue will continue to
+    absorb new packets until the size of the queue reaches its capacity.
+    The registered action must never call stop(), or a deadlock will occur.
+    @result Returns the previous running state of the queue,
+    true if the queue was running, false if the queue was already stopped. 
+*/
+
+    virtual bool stop();
+
+/*! @enum ServiceAsync
+    @abstract The option bits recognized by service().
+    @constant kServiceAsync Set this option to service the queue in
+    an asynchronous manner. The service() call will not block, but a
+    scheduling latency will be introduced before the queue is serviced. 
+*/
+
+    enum {
+        kServiceAsync = 0x1
+    };
+
+/*! @function service
+    @abstract Services a queue that was stalled by the target.
+    @discussion A target that stalls the queue must call service() when
+    it becomes ready to accept more packets. Calling this method when the
+    queue is not stalled is harmless.
+    @result Returns true if the queue was stalled and there were packets sitting in
+    the queue awaiting delivery, false otherwise. 
+*/
+
+    virtual bool service(IOOptionBits options = 0);
+
+/*! @function flush
+    @abstract Drops and frees all packets currently held by the queue.
+    @discussion To ensure that all packets are removed from the queue,
+    stop() should be called prior to flush(), to make sure there are
+    no packets in-flight and being delivered to the target.
+    @result Returns the number of packets that were dropped and freed. 
+*/
+
+    virtual UInt32 flush();
+
+/*! @function setCapacity
+    @abstract Changes the number of packets that the queue can hold
+    before it begins to drop excess packets.
+    @param capacity The new desired capacity.
+    @result Returns true if the new capacity was accepted, false otherwise. 
+*/
+
+    virtual bool setCapacity(UInt32 capacity);
+
+/*! @function getCapacity
+    @abstract Gets the number of packets that the queue can hold.
+    @discussion The queue will begin to drop incoming packets when the
+    size of the queue reaches its capacity.
+    @result Returns the current queue capacity. 
+*/
+
+    virtual UInt32 getCapacity() const;
+
+/*! @function getSize
+    @abstract Gets the number of packets currently held in the queue.
+    @result Returns the size of the queue. 
+*/
+
+    virtual UInt32 getSize() const;
+
+/*! @function getDropCount
+    @abstract Gets the number of packets dropped by the queue.
+    @result Returns the number of packets dropped due to over-capacity, or by
+    external calls to the flush() method. 
+*/
+
+    virtual UInt32 getDropCount();
+
+/*! @function getOutputCount
+    @abstract Gets the number of packets accepted by the target.
+    @result Returns the number of times that kIOOutputStatusAccepted is returned by
+    the target. 
+*/
+
+    virtual UInt32 getOutputCount();
+
+/*! @function getRetryCount
+    @abstract Gets the number of instances when the target has refused to
+    accept the packet provided.
+    @result Returns the number of times that kIOOutputStatusRetry is returned by the
+    target. 
+*/
+
+    virtual UInt32 getRetryCount();
+
+/*! @function getStallCount
+    @abstract Gets the number of instances when the target has stalled the
+    queue.
+    @result Returns the number of times that kIOOutputCommandStall is returned by the
+    target. 
+*/
+
+    virtual UInt32 getStallCount();
+
+/*! @enum GetStateBits
+    @abstract The bits in the value returned by getState().
+    @constant kStateRunning Set when the queue is running. Calling start()
+    and stop() will set or clear this bit.
+    @constant kStateStalled Set when the queue is stalled by the target.
+    @constant kStateActive  Set when a consumer thread is actively removing
+    packets from the queue and passing them to the target. 
+*/
+
+    enum {
+        kStateRunning            = 0x1,
+        kStateOutputStalled      = 0x2,
+        kStateOutputActive       = 0x4,
+        kStateOutputServiceMask  = 0xff00
+    };
+
+/*! @function getState
+    @abstract Gets the state of the queue object.
+    @result Returns the current state of the queue object. 
+*/ 
+
+    virtual UInt32 getState() const;
+
+/*! @function getStatisticsData
+    @abstract Returns an IONetworkData object containing statistics counters
+    updated by the queue.
+    @result Returns an IONetworkData object. 
+*/
+
+	virtual IONetworkData * getStatisticsData() const;
+};
+
+#endif /* !_IOBASICOUTPUTQUEUE_H */
diff --git a/i386/include/IOKit/network/IOEthernetController.h b/i386/include/IOKit/network/IOEthernetController.h
new file mode 100644
index 0000000..c2f85e7
--- /dev/null
+++ b/i386/include/IOKit/network/IOEthernetController.h
@@ -0,0 +1,502 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOETHERNETCONTROLLER_H
+#define _IOETHERNETCONTROLLER_H
+
+#include <IOKit/network/IONetworkController.h>
+
+/*! @defined kIOEthernetControllerClass
+    @abstract kIOEthernetControllerClass is the name of the
+        IOEthernetController class. */
+
+#define kIOEthernetControllerClass        "IOEthernetController"
+
+/*! @defined kIOEthernetAddressSize
+    @abstract The number of bytes in an Ethernet hardware address. */
+
+#define kIOEthernetAddressSize            6
+
+/*! @defined kIOEthernetMaxPacketSize
+    @abstract The maximum size of an Ethernet packet, including
+        the FCS bytes. */
+
+#define kIOEthernetMaxPacketSize          1518
+
+/*! @defined kIOEthernetMinPacketSize
+    @abstract The minimum size of an Ethernet packet, including
+        the FCS bytes. */
+
+#define kIOEthernetMinPacketSize          64
+
+/*! @defined kIOEthernetCRCSize
+    @abstract The size in bytes of the 32-bit CRC value appended
+        to the end of each Ethernet frame. */
+
+#define kIOEthernetCRCSize                4
+
+/*! @defined kIOEthernetWakeOnLANFilterGroup
+    @abstract kIOEthernetWakeOnLANFilterGroup describes the name assigned
+        to the Ethernet Wake-On-LAN filter group. This group represents
+        wake filters that are supported by the controller. */
+
+#define kIOEthernetWakeOnLANFilterGroup   "IOEthernetWakeOnLANFilterGroup"
+
+/*! @defined kIOEthernetDisabledWakeOnLANFilterGroup
+    @abstract kIOEthernetDisabledWakeOnLANFilterGroup describes the name
+        assigned to the disabled Ethernet Wake-On-LAN filter group. This
+        group represents wake filters that are currently disabled.
+        Membership in this group is dynamic. */
+
+#define kIOEthernetDisabledWakeOnLANFilterGroup \
+        "IOEthernetDisabledWakeOnLANFilterGroup"
+
+/*! @enum WakeOnLANFilters.
+    @abstract All filters in the Wake-on-LAN filter group.
+    @discussion Each filter listed will respond to a network event that
+        will trigger a system wake-up.
+    @constant kIOEthernetWakeOnMagicPacket Reception of a Magic Packet.
+    @constant kIOEthernetWakeOnPacketAddressMatch Reception of a packet
+    which passes through any of the address filtering mechanisms based
+    on its destination Ethernet address. This may include unicast,
+    broadcast, or multicast addresses depending on the current state
+    and setting of the corresponding packet filters. */
+
+enum {
+    kIOEthernetWakeOnMagicPacket         = 0x00000001,
+    kIOEthernetWakeOnPacketAddressMatch  = 0x00000002
+};
+
+/*
+ * Kernel
+ */
+#if defined(KERNEL) && defined(__cplusplus)
+
+struct IOEthernetAddress {
+	UInt8 bytes[kIOEthernetAddressSize];
+};
+
+/*! @const gIOEthernetWakeOnLANFilterGroup
+    @discussion gIOEthernetWakeOnLANFilterGroup is an OSSymbol object
+    that contains the name of the Ethernet Wake-on-LAN filter group
+    defined by kIOEthernetWakeOnLANFilterGroup. */
+
+extern const OSSymbol * gIOEthernetWakeOnLANFilterGroup;
+
+/*! @const gIOEthernetDisabledWakeOnLANFilterGroup
+    @discussion gIOEthernetDisabledWakeOnLANFilterGroup is an OSSymbol object
+    that contains the name of the disabled Ethernet Wake-on-LAN filter group
+    defined by kIOEthernetDisabledWakeOnLANFilterGroup. */
+
+extern const OSSymbol * gIOEthernetDisabledWakeOnLANFilterGroup;
+
+/*! @class IOEthernetController
+    @abstract Abstract superclass for Ethernet controllers. 
+    @discussion Ethernet controller drivers should subclass IOEthernetController, and implement
+    or override the hardware specific methods to create an Ethernet driver.
+    An interface object (an IOEthernetInterface instance) must be
+    instantiated by the driver, through attachInterface(), to connect
+    the controller driver to the data link layer. 
+*/
+
+class IOEthernetController : public IONetworkController
+{
+    OSDeclareAbstractStructors( IOEthernetController )
+
+protected:
+    struct ExpansionData { };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *  _reserved;
+
+
+public:
+
+/*! @function initialize
+    @abstract IOEthernetController class initializer.
+    @discussion Creates global OSSymbol objects that are used as keys. */
+
+    static void initialize();
+
+/*! @function init
+    @abstract Initializes an IOEthernetController object.
+    @param properties A dictionary object containing a property table
+        associated with this instance.
+    @result Returns true on success, false otherwise. 
+*/ 
+
+    virtual bool init(OSDictionary * properties);
+
+/*! @function getPacketFilters
+    @abstract Gets the set of packet filters supported by the Ethernet 
+    controller in the given filter group.
+    @discussion The default implementation of the abstract method inherited
+    from IONetworkController. When the filter group specified is
+    gIONetworkFilterGroup, then this method will return a value formed by
+    a bitwise OR of kIOPacketFilterUnicast, kIOPacketFilterBroadcast,
+    kIOPacketFilterMulticast, kIOPacketFilterPromiscuous. Otherwise, the 
+    return value will be set to zero (0). Subclasses must override this
+    method if their filtering capability differs from what is reported by
+    this default implementation. This method is called from the workloop
+    context, and the result is published to the I/O Kit Registry.
+    @param group The name of the filter group.
+    @param filters Pointer to the mask of supported filters returned by
+    	this method.
+    @result Returns kIOReturnSuccess. Drivers that override this
+    method must return kIOReturnSuccess to indicate success, or an error 
+    return code otherwise. 
+*/
+
+    virtual IOReturn getPacketFilters(const OSSymbol * group,
+                                      UInt32 *         filters) const;
+
+/*! @function enablePacketFilter
+    @abstract Enables one of the supported packet filters from the
+    given filter group.
+    @discussion The default implementation of the abstract method inherited
+    from IONetworkController. This method will call setMulticastMode() or
+    setPromiscuousMode() when the multicast or the promiscuous filter is to be
+    enabled. Requests to disable the Unicast or Broadcast filters are handled
+    silently, without informing the subclass. Subclasses can override this
+    method to change this default behavior, or to extend it to handle
+    additional filter types or filter groups. This method call is synchronized
+    by the workloop's gate.
+    @param group The name of the filter group containing the filter to be
+    enabled.
+    @param aFilter The filter to enable.
+    @param enabledFilters All filters currently enabled by the client.
+    @param options Optional flags for the enable request.
+    @result Returns the value returned by setMulticastMode() or setPromiscuousMode() if
+    either of those two methods are called. Returns kIOReturnSuccess if the filter
+    specified is kIOPacketFilterUnicast or kIOPacketFilterBroadcast.
+    Returns kIOReturnUnsupported if the filter group specified is not
+    gIONetworkFilterGroup. 
+*/
+
+    virtual IOReturn enablePacketFilter(const OSSymbol * group,
+                                        UInt32           aFilter,
+                                        UInt32           enabledFilters,
+                                        IOOptionBits     options = 0);
+
+/*! @function disablePacketFilter
+    @abstract Disables a packet filter that is currently enabled from the
+    given filter group.
+    @discussion The default implementation of the abstract method inherited
+    from IONetworkController. This method will call setMulticastMode() or
+    setPromiscuousMode() when the multicast or the promiscuous filter is to be
+    disabled. Requests to disable the Unicast or Broadcast filters are handled
+    silently, without informing the subclass. Subclasses can override this
+    method to change this default behavior, or to extend it to handle
+    additional filter types or filter groups. This method call is synchronized
+    by the workloop's gate.
+    @param group The name of the filter group containing the filter to be
+    disabled.
+    @param aFilter The filter to disable.
+    @param enabledFilters All filters currently enabled by the client.
+    @param options Optional flags for the disable request.
+    @result Returns the value returned by setMulticastMode() or setPromiscuousMode() if
+    either of those two methods are called. Returns kIOReturnSuccess if the filter
+    specified is kIOPacketFilterUnicast or kIOPacketFilterBroadcast.
+    Returns kIOReturnUnsupported if the filter group specified is not
+    gIONetworkFilterGroup. 
+*/
+
+    virtual IOReturn disablePacketFilter(const OSSymbol * group,
+                                         UInt32           aFilter,
+                                         UInt32           enabledFilters,
+                                         IOOptionBits     options = 0);
+
+/*! @function getHardwareAddress
+    @abstract Gets the Ethernet controller's station address.
+    @discussion The default implementation of the abstract method inherited
+    from IONetworkController. This method will call the overloaded form
+    IOEthernetController::getHardwareAddress() that subclasses are expected
+    to override.
+    @param addr The buffer where the controller's hardware address should
+           be written.
+    @param inOutAddrBytes The size of the address buffer provided by the
+           client, and replaced by this method with the actual size of
+           the hardware address in bytes.
+    @result Returns kIOReturnSuccess on success, or an error otherwise. 
+*/
+
+    virtual IOReturn getHardwareAddress(void *   addr,
+                                        UInt32 * inOutAddrBytes);
+
+/*! @function setHardwareAddress
+    @abstract Sets or changes the station address used by the Ethernet
+    controller.
+    @discussion The default implementation of the abstract method inherited
+    from IONetworkController. This method will call the overloaded form
+    IOEthernetController::setHardwareAddress() that subclasses are expected
+    to override.
+    @param addr The buffer containing the hardware address provided by
+    the client.
+    @param addrBytes The size of the address buffer provided by the
+    client in bytes.
+    @result Returns kIOReturnSuccess on success, or an error otherwise. 
+*/
+
+    virtual IOReturn setHardwareAddress(const void * addr,
+                                        UInt32       addrBytes);
+
+/*! @function getMaxPacketSize
+    @abstract Gets the maximum packet size supported by the Ethernet
+        controller, including the frame header and FCS.
+    @param maxSize Pointer to the return value.
+    @result Returns kIOReturnSuccess on success, or an error code otherwise. 
+*/
+
+    virtual IOReturn getMaxPacketSize(UInt32 * maxSize) const;
+
+/*! @function getMinPacketSize
+    @abstract Gets the minimum packet size supported by the Ethernet
+        controller, including the frame header and FCS.
+    @param minSize Pointer to the return value.
+    @result Returns kIOReturnSuccess on success, or an error code otherwise. 
+*/
+
+    virtual IOReturn getMinPacketSize(UInt32 * minSize) const;
+
+/*! @function getPacketFilters
+    @abstract Gets the set of packet filters supported by the Ethernet 
+    controller in the network filter group.
+    @param filters Pointer to the return value containing a mask of
+    supported filters.
+    @result Returns kIOReturnSuccess. Drivers that override this
+    method must return kIOReturnSuccess to indicate success, or an error 
+    return code otherwise. 
+*/
+
+    virtual IOReturn getPacketFilters(UInt32 * filters) const;
+
+/*! @function getHardwareAddress
+    @abstract Gets the Ethernet controller's permanent station address.
+    @discussion Ethernet drivers must implement this method, by reading the
+    address from hardware and writing it to the buffer provided. This method
+    is called from the workloop context.
+    @param addrP Pointer to an IOEthernetAddress where the hardware address
+    should be returned.
+    @result Returns kIOReturnSuccess on success, or an error return code otherwise. 
+*/
+
+    virtual IOReturn getHardwareAddress(IOEthernetAddress * addrP) = 0;
+
+/*! @function setHardwareAddress
+    @abstract Sets or changes the station address used by the Ethernet
+        controller.
+    @discussion This method is called in response to a client command to
+    change the station address used by the Ethernet controller. Implementation
+    of this method is optional. This method is called from the workloop context.
+    @param addrP Pointer to an IOEthernetAddress containing the new station
+    address.
+    @result The default implementation will always return kIOReturnUnsupported.
+    If overridden, drivers must return kIOReturnSuccess on success, or an error
+    return code otherwise. 
+*/
+
+    virtual IOReturn setHardwareAddress(const IOEthernetAddress * addrP);
+
+/*! @function setMulticastMode
+    @abstract Enables or disables multicast mode.
+    @discussion Called by enablePacketFilter() or disablePacketFilter()
+    when there is a change in the activation state of the multicast filter
+    identified by kIOPacketFilterMulticast. This method is called from the
+    workloop context.
+    @param active True to enable multicast mode, false to disable it.
+    @result Returns kIOReturnUnsupported. If overridden, drivers must return
+    kIOReturnSuccess on success, or an error return code otherwise. 
+*/
+
+    virtual IOReturn setMulticastMode(bool active);
+
+/*! @function setMulticastList
+    @abstract Sets the list of multicast addresses a multicast filter
+    should use to match against the destination address of an incoming frame.
+    @discussion This method sets the list of multicast addresses that the multicast filter
+    should use to match against the destination address of an incoming frame.
+    The frame should be accepted when a match occurs.  Called when the multicast group membership of an interface
+    object is changed. Drivers that support kIOPacketFilterMulticast should
+    override this method and update the hardware multicast filter using the
+    list of Ethernet addresses provided. Perfect multicast filtering is
+    preferred if supported by the hardware, in order to reduce the number of
+    unwanted packets received. If the number of multicast addresses in the
+    list exceeds what the hardware is capable of supporting, or if perfect
+    filtering is not supported, then ideally the hardware should be programmed
+    to perform imperfect filtering, through some form of hash filtering
+    mechanism. Only as a last resort should the driver enable reception of
+    all multicast packets to satisfy this request. This method is called
+    from the workloop context, and only if the driver reports
+    kIOPacketFilterMulticast support in getPacketFilters().
+    @param addrs An array of Ethernet addresses. This argument must be
+        ignored if the count argument is 0.
+    @param count The number of Ethernet addresses in the list. This value
+        will be zero when the list becomes empty.
+    @result Returns kIOReturnUnsupported. Drivers must return kIOReturnSuccess to
+    indicate success, or an error return code otherwise. 
+*/
+
+    virtual IOReturn setMulticastList(IOEthernetAddress * addrs, 
+                                      UInt32              count);
+
+/*! @function setPromiscuousMode
+    @abstract Enables or disables promiscuous mode.
+    @discussion Called by enablePacketFilter() or disablePacketFilter()
+    when there is a change in the activation state of the promiscuous
+    filter identified by kIOPacketFilterPromiscuous. This method is 
+    called from the workloop context.
+    @param active True to enable promiscuous mode, false to disable it.
+    @result Returns kIOReturnUnsupported. If overridden, drivers must return
+    kIOReturnSuccess on success, or an error return code otherwise. 
+*/
+
+    virtual IOReturn setPromiscuousMode(bool active);
+
+/*! @function setWakeOnMagicPacket
+    @abstract Enables or disables the wake on Magic Packet support.
+    @discussion Called by enablePacketFilter() or disablePacketFilter()
+    when there is a change in the activation state of the Wake-on-LAN
+    filter identified by kIOEthernetWakeOnMagicPacket. This method is
+    called from the workloop context.
+    @param active True to enable support for system wake on reception
+    of a Magic Packet, false to disable it.
+    @result Returns kIOReturnUnsupported. If overridden, drivers must return
+    kIOReturnSuccess on success, or an error return code otherwise. 
+*/
+
+    virtual IOReturn setWakeOnMagicPacket(bool active);
+
+protected:
+
+/*! @function createInterface
+    @abstract Creates an IOEthernetInterface object.
+    @discussion This method allocates and returns a new IOEthernetInterface instance.
+    A subclass of IONetworkController must implement this method and return
+    a matching interface object. The implementation in IOEthernetController
+    will return an IOEthernetInterface object. Subclasses of
+    IOEthernetController, such as Ethernet controller drivers, will have
+    little reason to override this implementation.
+    @result Returns a newly allocated and initialized IOEthernetInterface object. 
+*/
+
+    virtual IONetworkInterface * createInterface();
+
+/*! @function free
+    @abstract Frees the IOEthernetController instance. 
+    @discussion This method releases resources, and is
+    then followed by a call to super::free(). */
+
+    virtual void free();
+
+/*! @function publishProperties
+    @abstract Publishes Ethernet controller properties and capabilities.
+    @discussion This method publishes Ethernet controller properties to the property
+    table. For instance, getHardwareAddress() is called to fetch the
+    hardware address, and the address is then published to the property
+    table. This method call is synchronized by the workloop's gate,
+    and must never be called directly by subclasses.
+    @result Returns true if all properties and capabilities were discovered,
+    and published successfully, false otherwise. Returning false will
+    prevent client objects from attaching to the Ethernet controller
+    since a property that a client relies upon may be missing. 
+*/
+
+    virtual bool publishProperties();
+
+	/*! @function getVlanTagDemand
+		@abstract Fetch the demand for hardware vlan tag stuffing
+		for the given packet before it is transmitted on the network.
+		@discussion A network controller that can insert 802.1Q vlan tags for output
+		packets must call this method to obtain vlan tag information that it must
+		insert into the given output packet.
+		@param packet A mbuf containing a packet that may require vlan tag stuffing.
+		@param vlanTag After calling, the low order 16 bits contain the 802.1Q priority and
+		vlan ID tag in host order.  The hi-order 16 bits are currently unused and should be ignored.
+		@result true if vlanTag has been set and should be used.
+		false if no vlan tag stuffing is required for this packet. */
+
+    OSMetaClassDeclareReservedUsed( IOEthernetController,  0);
+	virtual bool getVlanTagDemand(mbuf_t m, UInt32 *vlanTag);
+
+	/*! @function setVlanTag
+		@abstract Encode a received packet with the vlan tag result reported
+		by the hardware.
+		@discussion A network controller that can strip 802.1Q vlan tag information for a
+		received packet should call this method to encode the result on the
+		packet, before passing it up towards the protocol stacks.
+		@param packet A mbuf containing a packet that has had its 802.1q vlan tag stripped by
+		the hardware.
+		@param vlanTag A value in host order that contains the 802.1q vlan tag and priority
+		in the low order 16 bits.  The hi order word is currently unused and should be set to 0. */
+
+	OSMetaClassDeclareReservedUsed( IOEthernetController,  1);
+	virtual void setVlanTag(mbuf_t m, UInt32 vlanTag);
+	
+    // Virtual function padding
+    OSMetaClassDeclareReservedUnused( IOEthernetController,  2);
+    OSMetaClassDeclareReservedUnused( IOEthernetController,  3);
+    OSMetaClassDeclareReservedUnused( IOEthernetController,  4);
+    OSMetaClassDeclareReservedUnused( IOEthernetController,  5);
+    OSMetaClassDeclareReservedUnused( IOEthernetController,  6);
+    OSMetaClassDeclareReservedUnused( IOEthernetController,  7);
+    OSMetaClassDeclareReservedUnused( IOEthernetController,  8);
+    OSMetaClassDeclareReservedUnused( IOEthernetController,  9);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 10);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 11);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 12);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 13);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 14);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 15);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 16);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 17);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 18);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 19);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 20);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 21);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 22);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 23);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 24);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 25);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 26);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 27);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 28);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 29);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 30);
+    OSMetaClassDeclareReservedUnused( IOEthernetController, 31);
+};
+
+/*
+ * FIXME: remove this.
+ */
+enum {
+    kIOEnetPromiscuousModeOff   = false,
+    kIOEnetPromiscuousModeOn    = true,
+    kIOEnetPromiscuousModeAll   = true,
+    kIOEnetMulticastModeOff     = false,
+    kIOEnetMulticastModeFilter  = true
+};
+typedef bool IOEnetPromiscuousMode;
+typedef bool IOEnetMulticastMode;
+
+#endif /* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* !_IOETHERNETCONTROLLER_H */
diff --git a/i386/include/IOKit/network/IOEthernetInterface.h b/i386/include/IOKit/network/IOEthernetInterface.h
new file mode 100644
index 0000000..96c7d95
--- /dev/null
+++ b/i386/include/IOKit/network/IOEthernetInterface.h
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOETHERNETINTERFACE_H
+#define _IOETHERNETINTERFACE_H
+
+/*! @defined kIOEthernetInterfaceClass
+    @abstract The name of the
+        IOEthernetInterface class. 
+*/
+
+#define kIOEthernetInterfaceClass     "IOEthernetInterface"
+
+/*! @defined kIOActivePacketFilters
+    @abstract A property of IOEthernetInterface objects.
+    @discussion The kIOActivePacketFilters property has an OSDictionary value that describes the current
+        set of packet filters that have been successfully activated. Each
+        entry in the dictionary is a key/value pair consisting of the filter
+        group name, and an OSNumber describing the set of active filters for
+        that group. Entries in this dictionary will mirror those in
+        kIORequiredPacketFilters if the controller has reported success for
+        all filter change requests from the IOEthernetInterface object. 
+*/
+
+#define kIOActivePacketFilters        "IOActivePacketFilters"
+
+/*! @defined kIORequiredPacketFilters
+    @abstract A property of IOEthernetInterface objects.
+    @discussion The kIORequiredPacketFilters property has an OSDictionary value that describes the current
+        set of required packet filters. Each entry in the dictionary is a
+        key/value pair consisting of the filter group name, and an OSNumber
+        describing the set of required filters for that group. 
+*/
+
+#define kIORequiredPacketFilters      "IORequiredPacketFilters"
+
+/*! @defined kIOMulticastAddressList
+    @abstract A property of IOEthernetInterface objects.
+    @discussion The kIOMulticastAddressList property is an OSData object that describes the
+        list of multicast addresses that are being used by the
+        controller to match against the destination address of an
+        incoming frame. 
+*/
+
+#define kIOMulticastAddressList       "IOMulticastAddressList"
+#define kIOMulticastFilterData        kIOMulticastAddressList    
+
+/*
+ * Kernel
+ */
+#if defined(KERNEL) && defined(__cplusplus)
+
+#include <IOKit/network/IONetworkInterface.h>
+#include <IOKit/network/IOEthernetController.h>
+#include <IOKit/network/IOEthernetStats.h>
+
+/*! @class IOEthernetInterface
+    @abstract The Ethernet interface object. 
+    @discussion An Ethernet controller driver,
+    that is a subclass of IOEthernetController, will instantiate an object
+    of this class when the driver calls the attachInterface() method.
+    This interface object will then vend an Ethernet interface to DLIL,
+    and manage the connection between the controller driver and the upper
+    networking layers. Drivers will seldom need to subclass
+    IOEthernetInterface. 
+*/
+
+class IOEthernetInterface : public IONetworkInterface
+{
+    OSDeclareDefaultStructors( IOEthernetInterface )
+
+private:
+    thread_call_t    _inputEventThreadCall; // inputEvent() thread call
+    UInt32           _mcAddrCount;          // # of multicast addresses
+    bool             _ctrEnabled;           // Is controller enabled?
+    OSDictionary *   _supportedFilters;     // Controller's supported filters
+    OSDictionary *   _requiredFilters;      // The required filters
+    OSDictionary *   _activeFilters;        // Currently active filters    
+    bool             _controllerLostPower;  // true if controller is unusable
+
+    struct ExpansionData { 
+		UInt32      altMTU;                 // track the physical mtu of controller
+		UInt32      publishedFeatureID;     // id for published wake packet
+        uint32_t    supportedWakeFilters;   // bitmask of supported wake filters
+        OSNumber *  disabledWakeFilters;    // OSNumber of disabled wake filters
+	};
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *  _reserved;
+
+
+    IOReturn enableController(IONetworkController * ctr);
+    IOReturn setupMulticastFilter(IONetworkController * ctr);
+
+    UInt32 getFilters(const OSDictionary * dict,
+                      const OSSymbol *     group);
+
+    bool setFilters(OSDictionary *   dict,
+                    const OSSymbol * group,
+                    UInt32           filters);
+                                     
+    IOReturn disableFilter(IONetworkController * ctr,
+                           const OSSymbol *      group,
+                           UInt32                filter,
+                           IOOptionBits          options = 0);
+
+    IOReturn enableFilter(IONetworkController * ctr,
+                          const OSSymbol *      group,
+                          UInt32                filter,
+                          IOOptionBits          options = 0);
+
+    int syncSIOCSIFFLAGS(IONetworkController * ctr);
+    int syncSIOCSIFADDR(IONetworkController * ctr);
+    int syncSIOCADDMULTI(IONetworkController * ctr);
+    int syncSIOCDELMULTI(IONetworkController * ctr);
+    int syncSIOCSIFMTU(IONetworkController * ctr, struct ifreq * ifr, bool);
+    int syncSIOCGIFDEVMTU(IONetworkController * ctr, struct ifreq * ifr);
+    int syncSIOCSIFLLADDR(IONetworkController * ctr, const char * lladdr, int len);
+	void _fixupVlanPacket(mbuf_t, u_int16_t, int);
+    void reportInterfaceWakeFlags(void);
+
+    static void handleEthernetInputEvent(thread_call_param_t param0, thread_call_param_t param1);
+    static int performGatedCommand(void *, void *, void *, void *, void *);
+	static IOReturn enableFilter_Wrapper(
+        IOEthernetInterface *, IONetworkController *, const OSSymbol *, UInt32 , IOOptionBits);
+
+public:
+
+/*! @function init
+    @abstract Initializes an IOEthernetInterface instance.
+    @discussion Instance variables are initialized, and an arpcom
+    structure is allocated.
+    @param controller A network controller object that will service
+    the interface object being initialized.
+    @result Returns true on success, false otherwise. 
+*/
+
+    virtual bool init( IONetworkController * controller );
+
+/*! @function getNamePrefix
+    @abstract Returns a string containing the prefix to use when
+    creating a BSD name for this interface.
+    @discussion The BSD name for each interface object is created by
+    concatenating a string returned by this method, with an unique
+    unit number assigned by IONetworkStack.
+    @result Returns a pointer to a constant C string "en". Therefore, Ethernet
+    interfaces will be registered with BSD as en0, en1, etc. 
+*/
+
+    virtual const char * getNamePrefix() const;
+
+/*! @function setProperties
+    @abstract Handles a request to set Ethernet interface properties from
+    kernel or non-kernel clients. 
+    @discussion For non-kernel clients, the preferred
+    access mechanism is through a user client connection.
+    @param properties An OSDictionary containing a collection of
+    properties.
+    @result Returns kIOReturnUnsupported if the interface did not
+    recognize any of the properties provided. Otherwise, the return
+    code will be kIOReturnSuccess to indicate no errors, or an
+    IOReturn error code to indicate that an error occurred while
+    handling one of the properties. 
+*/
+
+    virtual IOReturn setProperties( OSObject * properties );
+
+protected:
+
+/*! @function free
+    @abstract Frees the IOEthernetInterface instance.
+    @discussion The memory allocated for the arpcom structure is released,
+    followed by a call to super::free(). 
+*/
+
+    virtual void free();
+
+/*! @function performCommand
+    @abstract Handles an ioctl command sent to the Ethernet interface.
+    @discussion This method handles socket ioctl commands sent to the Ethernet
+    interface from DLIL. Commands recognized and processed by this method are
+    SIOCSIFADDR, SIOCSIFFLAGS, SIOCADDMULTI, and SIOCDELMULTI. Other commands
+    are passed to the superclass.
+    @param controller The controller object.
+    @param cmd  The ioctl command code.
+    @param arg0 Command argument 0. Generally a pointer to an ifnet structure
+        associated with the interface.
+    @param arg1 Command argument 1.
+    @result Returns a BSD return value defined in bsd/sys/errno.h. 
+*/
+
+    virtual SInt32 performCommand(IONetworkController * controller,
+                                  unsigned long         cmd,
+                                  void *                arg0,
+                                  void *                arg1);
+
+/*! @function controllerDidOpen
+    @abstract A notification that the interface has opened the network
+    controller.
+    @discussion This method will be called by IONetworkInterface after a
+    network controller has accepted an open from this interface object.
+    IOEthernetInterface will first call the implementation in its
+    superclass, then inspect the controller through properties published
+    in the registry. This method is called with the arbitration lock held.
+    @param controller The controller object that was opened.
+    @result Returns true on success, false otherwise. Returning false will
+    cause the controller to be closed, and any pending client opens to be
+    rejected. 
+*/
+
+    virtual bool controllerDidOpen(IONetworkController * controller);
+
+/*! @function controllerWillClose
+    @abstract A notification that the interface will close the network
+    controller.
+    @discussion This method will simply call super to propagate the method
+    call. This method is called with the arbitration lock held.
+    @param controller The controller that is about to be closed. 
+*/
+
+    virtual void controllerWillClose(IONetworkController * controller);
+
+
+/*! @function controllerWillChangePowerState
+    @abstract Handles a notification that the network controller 
+    servicing this interface object is about to transition to a new power state.
+    @discussion If the controller is about to transition to an unusable state,
+    and it is currently enabled, then the disable() method on the controller is
+    called.
+    @param controller The network controller object.
+    @param flags Flags that describe the capability of the controller in the new
+    power state.
+    @param stateNumber An index to a state in the network controller's
+    power state array that the controller is switching to.
+    @param policyMaker A reference to the network controller's policy-maker,
+    and is also the originator of this notification.
+    @result Always returns kIOReturnSuccess. 
+*/
+
+    virtual IOReturn controllerWillChangePowerState(
+                               IONetworkController * controller,
+                               IOPMPowerFlags        flags,
+                               UInt32                stateNumber,
+                               IOService *           policyMaker);
+
+/*! @function controllerDidChangePowerState
+    @abstract Handles a notification that the network controller servicing
+    this interface object has transitioned to a new power state.
+    @discussion If the controller did transition to a usable state, and it was
+    previously disabled due to a previous power change, then it is re-enabled.
+    @param controller The network controller object.
+    @param flags Flags that describe the capability of the controller in the new
+    power state.
+    @param stateNumber An index to a state in the network controller's
+    power state array that the controller has switched to.
+    @param policyMaker A reference to the network controller's policy-maker,
+    and is also the originator of this notification.
+    @result Always returns kIOReturnSuccess. 
+*/
+
+    virtual IOReturn controllerDidChangePowerState( 
+                               IONetworkController * controller,
+                               IOPMPowerFlags        flags,
+                               UInt32                stateNumber,
+                               IOService *           policyMaker);
+
+public:
+    /* Override IONetworkInterface::willTerminate() */
+
+    virtual bool willTerminate( IOService *  provider,
+                                IOOptionBits options );
+
+    /* Override IONetworkInterface::attachToDataLinkLayer() */
+
+    virtual IOReturn attachToDataLinkLayer( IOOptionBits options,
+                                            void *       parameter );
+
+    /* Override IONetworkInterface::inputEvent() */
+
+    virtual bool inputEvent( UInt32 type, void * data );
+
+protected:
+	virtual void feedPacketInputTap(mbuf_t);
+	virtual void feedPacketOutputTap(mbuf_t);
+	virtual bool initIfnetParams(struct ifnet_init_params *params);
+
+public:
+    // Virtual function padding
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  0);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  1);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  2);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  3);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  4);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  5);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  6);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  7);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  8);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  9);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 10);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 11);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 12);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 13);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 14);
+    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 15);
+};
+
+#endif /* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* !_IOETHERNETINTERFACE_H */
diff --git a/i386/include/IOKit/network/IOEthernetStats.h b/i386/include/IOKit/network/IOEthernetStats.h
new file mode 100644
index 0000000..6125c2d
--- /dev/null
+++ b/i386/include/IOKit/network/IOEthernetStats.h
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * IOEthernetStats.h - Ethernet MIB statistics definitions.
+ *
+ * HISTORY
+ */
+
+#ifndef _IOETHERNETSTATS_H
+#define _IOETHERNETSTATS_H
+
+/*! @header IOEthernetStats.h
+    @discussion Ethernet statistics. */
+
+//---------------------------------------------------------------------------
+// Ethernet-like statistics group.
+
+/*! @typedef IODot3StatsEntry
+    @discussion Ethernet MIB statistics structure.
+    @field alignmentErrors            dot3StatsAlignmentErrors.
+    @field fcsErrors                  dot3StatsFCSErrors.
+    @field singleCollisionFrames      dot3StatsSingleCollisionFrames.
+    @field multipleCollisionFrames    dot3StatsMultipleCollisionFrames.
+    @field sqeTestErrors              dot3StatsSQETestErrors.
+    @field deferredTransmissions      dot3StatsDeferredTransmissions.
+    @field lateCollisions             dot3StatsLateCollisions.
+    @field excessiveCollisions        dot3StatsExcessiveCollisions.
+    @field internalMacTransmitErrors  dot3StatsInternalMacTransmitErrors.
+    @field carrierSenseErrors         dot3StatsCarrierSenseErrors.
+    @field frameTooLongs              dot3StatsFrameTooLongs.
+    @field internalMacReceiveErrors   dot3StatsInternalMacReceiveErrors.
+    @field etherChipSet               dot3StatsEtherChipSet.
+    @field missedFrames               dot3StatsMissedFrames (not in RFC1650).
+    */
+
+typedef struct {
+    UInt32 alignmentErrors;
+    UInt32 fcsErrors;
+    UInt32 singleCollisionFrames;
+    UInt32 multipleCollisionFrames;
+    UInt32 sqeTestErrors;
+    UInt32 deferredTransmissions;
+    UInt32 lateCollisions;
+    UInt32 excessiveCollisions;
+    UInt32 internalMacTransmitErrors;
+    UInt32 carrierSenseErrors;
+    UInt32 frameTooLongs;
+    UInt32 internalMacReceiveErrors;
+    UInt32 etherChipSet;
+    UInt32 missedFrames;
+} IODot3StatsEntry;
+
+//---------------------------------------------------------------------------
+// Ethernet-like collision statistics group (optional).
+
+/*! @typedef IODot3CollEntry
+    @discussion Collision statistics structure.
+    @field collFrequencies            dot3StatsCollFrequencies. */
+
+typedef struct {
+    UInt32 collFrequencies[16];
+} IODot3CollEntry;
+
+//---------------------------------------------------------------------------
+// Receiver extra statistics group (not defined by RFC 1650).
+
+/*! @typedef IODot3RxExtraEntry
+    @discussion Extra receiver statistics not defined by RFC1650.
+    @field overruns            receiver overruns.
+    @field watchdogTimeouts    watchdog timer expirations.
+    @field frameTooShorts      runt frames.
+    @field collisionErrors     frames damages by late collision.
+    @field phyErrors           PHY receive errors.
+    @field timeouts            receiver timeouts.
+    @field interrupts          receiver interrupts.
+    @field resets              receiver resets.
+    @field resourceErrors      receiver resource shortages.
+    */
+
+typedef struct {
+    UInt32 overruns;
+    UInt32 watchdogTimeouts;
+    UInt32 frameTooShorts;
+    UInt32 collisionErrors;
+    UInt32 phyErrors;
+    UInt32 timeouts;
+    UInt32 interrupts;
+    UInt32 resets;
+    UInt32 resourceErrors;
+    UInt32 reserved[4];
+} IODot3RxExtraEntry;
+
+//---------------------------------------------------------------------------
+// Transmitter extra statistics group (not defined by RFC 1650).
+
+/*! @typedef IODot3TxExtraEntry
+    @discussion Extra transmitter statistics not defined by RFC1650.
+    @field underruns           transmit underruns.
+    @field jabbers             jabber events.
+    @field phyErrors           PHY transmit errors.
+    @field timeouts            transmitter timeouts.
+    @field interrupts          transmitter interrupts.
+    @field resets              transmitter resets.
+    @field resourceErrors      transmitter resource shortages.
+    */
+
+typedef struct {
+    UInt32 underruns;
+    UInt32 jabbers;
+    UInt32 phyErrors;
+    UInt32 timeouts;
+    UInt32 interrupts;
+    UInt32 resets;
+    UInt32 resourceErrors;
+    UInt32 reserved[4];
+} IODot3TxExtraEntry;
+
+//---------------------------------------------------------------------------
+// Aggregate Ethernet statistics.
+
+/*! @typedef IOEthernetStats
+    @discussion Aggregate Ethernet statistics structure.
+    @field dot3StatsEntry      IODot3StatsEntry statistics group.
+    @field dot3CollEntry       IODot3CollEntry statistics group.
+    @field dot3RxExtraEntry    IODot3RxExtraEntry statistics group.
+    @field dot3TxExtraEntry    IODot3TxExtraEntry statistics group.
+    */
+
+typedef struct {
+    IODot3StatsEntry    dot3StatsEntry;
+    IODot3CollEntry     dot3CollEntry;
+    IODot3RxExtraEntry  dot3RxExtraEntry;
+    IODot3TxExtraEntry  dot3TxExtraEntry;   
+} IOEthernetStats;
+
+/*! @defined kIOEthernetStatsKey
+    @discussion Defines the name of an IONetworkData that contains
+    an IOEthernetStats. */
+
+#define kIOEthernetStatsKey             "IOEthernetStatsKey"
+
+#endif /* !_IOETHERNETSTATS_H */
diff --git a/i386/include/IOKit/network/IOGatedOutputQueue.h b/i386/include/IOKit/network/IOGatedOutputQueue.h
new file mode 100644
index 0000000..48e9f79
--- /dev/null
+++ b/i386/include/IOKit/network/IOGatedOutputQueue.h
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOGATEDOUTPUTQUEUE_H
+#define _IOGATEDOUTPUTQUEUE_H
+
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IOInterruptEventSource.h>
+#include <IOKit/network/IOBasicOutputQueue.h>
+
+/*! @class IOGatedOutputQueue
+    @abstract An extension of an IOBasicOutputQueue. 
+    @discussion An IOCommandGate
+    object is created by this queue and added to a work loop as an
+    event source. All calls to the target by the consumer thread must
+    occur with the gate closed. Therefore, all calls to the target of
+    this type of queue will be serialized with any other thread that
+    runs on the same work loop context. This is useful for network
+    drivers that have a tight hardware coupling between the transmit
+    and receive engines, and a single-threaded hardware access model
+    is desirable. 
+*/
+
+class IOGatedOutputQueue : public IOBasicOutputQueue
+{
+    OSDeclareDefaultStructors( IOGatedOutputQueue )
+
+private:
+    static void gatedOutput(OSObject *           owner,
+                            IOGatedOutputQueue * self,
+                            IOMbufQueue *        queue,
+                            UInt32 *             state);
+
+    static void restartDeferredOutput(OSObject *               owner,
+                                      IOInterruptEventSource * sender,
+                                      int                      count);
+
+protected:
+    IOCommandGate *           _gate;
+    IOInterruptEventSource *  _interruptSrc;
+
+/*! @function output
+    @abstract Transfers all packets in the mbuf queue to the target.
+    @param queue A queue of output packets.
+    @param state Return a state bit defined by IOBasicOutputQueue that
+    declares the new state of the queue following this method call.
+    A kStateStalled is returned if the queue should stall, otherwise 0
+    is returned. 
+*/
+
+    virtual void output(IOMbufQueue * queue, UInt32 * state);
+
+/*! @function free
+    @abstract Frees the IOGatedOutputQueue object.
+    @discussion Release allocated resources, then call super::free(). */
+
+    virtual void free();
+
+/*! @function output
+    @abstract Overrides the method inherited from IOOutputQueue.
+    @result Returns true if a thread was successfully scheduled to service
+    the queue. 
+*/
+
+    virtual bool scheduleServiceThread(void * param);
+
+public:
+
+/*! @function init
+    @abstract Initializes an IOGatedOutputQueue object.
+    @param target The object that will handle packets removed from the
+    queue, and is usually a subclass of IONetworkController.
+    @param action The function that will handle packets removed from the
+    queue.
+    @param workloop A workloop object. An IOCommandGate object is created
+    and added to this workloop as an event source.
+    @param capacity The initial capacity of the output queue.
+    @result Returns true if initialized successfully, false otherwise. 
+*/
+
+    virtual bool init(OSObject *     target,
+                      IOOutputAction action,
+                      IOWorkLoop *   workloop,
+                      UInt32         capacity = 0);
+
+/*! @function withTarget
+    @abstract Factory method that constructs and initializes an
+    IOGatedOutputQueue object.
+    @param target An IONetworkController object that will handle packets
+    removed from the queue.
+    @param workloop A workloop object. An IOCommandGate object is created
+    and added to this workloop as an event source.
+    @param capacity The initial capacity of the output queue.
+    @result Returns an IOGatedOutputQueue object on success, or 0 otherwise. 
+*/
+
+    static IOGatedOutputQueue * withTarget(IONetworkController * target,
+                                           IOWorkLoop *          workloop,
+                                           UInt32                capacity = 0);
+
+/*! @function withTarget
+    @abstract Factory method that constructs and initializes an
+    IOGatedOutputQueue object.
+    @param target The object that will handle packets removed from the
+    queue.
+    @param action The function that will handle packets removed from the
+    queue.
+    @param workloop A workloop object. An IOCommandGate object is created
+    and added to this workloop as an event source.
+    @param capacity The initial capacity of the output queue.
+    @result Returns an IOGatedOutputQueue object on success, or 0 otherwise. 
+*/
+
+    static IOGatedOutputQueue * withTarget(OSObject *     target,
+                                           IOOutputAction action,
+                                           IOWorkLoop *   workloop,
+                                           UInt32         capacity = 0);
+};
+
+#endif /* !_IOGATEDOUTPUTQUEUE_H */
diff --git a/i386/include/IOKit/network/IOKernelDebugger.h b/i386/include/IOKit/network/IOKernelDebugger.h
new file mode 100644
index 0000000..97fc905
--- /dev/null
+++ b/i386/include/IOKit/network/IOKernelDebugger.h
@@ -0,0 +1,324 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKERNELDEBUGGER_H
+#define _IOKERNELDEBUGGER_H
+
+#include <IOKit/IOService.h>
+
+/*! @typedef IODebuggerRxHandler
+    @discussion Defines the receive handler that must be implemented
+    by the target to service KDP receive requests. This handler is called
+    by kdpReceiveDispatcher().
+    @param target The target object.
+    @param buffer KDP receive buffer. The buffer allocated has room for
+           1518 bytes. The receive handler must not overflow this buffer.
+    @param length The amount of data received and placed into the buffer.
+           Set to 0 if no frame was received during the poll interval.
+    @param timeout The amount of time to poll in milliseconds while waiting
+           for a frame to arrive. */
+
+typedef void (*IODebuggerRxHandler)( IOService * target,
+                                     void *      buffer,
+                                     UInt32 *    length,
+                                     UInt32      timeout );
+
+/*! @typedef IODebuggerTxHandler
+    @discussion Defines the transmit handler that must be implemented
+    by the target to service KDP transmit requests. This handler is called
+    by kdpTransmitDispatcher().
+    @param target The target object.
+    @param buffer KDP transmit buffer. This buffer contains a KDP frame
+           to be sent on the network.
+    @param length The number of bytes in the transmit buffer. */
+
+typedef void (*IODebuggerTxHandler)( IOService * target,
+                                     void *      buffer,
+                                     UInt32      length );
+
+/*! @typedef IODebuggerLockState
+    @discussion Defines flags returned by IOKernelDebugger::lock().
+    @constant kIODebuggerLockTaken Set if the debugger lock was taken. */
+
+typedef enum {
+    kIODebuggerLockTaken = 0x1
+} IODebuggerLockState;
+
+/*! @class IOKernelDebugger
+    @abstract Kernel debugger nub.
+    @discussion This object interfaces with the KDP
+    (kernel debugger protocol) module and dispatches KDP requests to its
+    target (provider). The target, designated as the debugger device, must 
+    implement a pair of handler functions that are called to handle KDP 
+    transmit and receive requests during a debugging session. Only a single
+    IOKernelDebugger in the system can be active at a given time. The
+    active IOKernelDebugger is the one that has an IOKDP object attached
+    as a client.
+
+    The debugger device is usually a subclass of IOEthernetController.
+    However, any IOService can service an IOKernelDebugger client,
+    implement the two polled mode handlers, and transport the KDP
+    packets through a data channel. However, KDP assumes that the
+    debugger device is an Ethernet interface and therefore it will
+    always send, and expect to receive, an Ethernet frame. */
+
+class IOKernelDebugger : public IOService
+{
+    OSDeclareDefaultStructors( IOKernelDebugger )
+
+protected:
+    IOService *             _target;      // target (provider)
+    IODebuggerTxHandler     _txHandler;   // target's transmit handler.
+    IODebuggerRxHandler     _rxHandler;   // target's receive handler.
+    IOService *             _client;      // client that has opened us.
+    bool                    _pmDisabled;  // true if disabled by PM.
+
+    struct ExpansionData {
+        thread_call_t  activationChangeThreadCall;
+        UInt32         stateVars[2];
+		IONotifier  *  interfaceNotifier;
+    };
+
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *         _reserved;
+
+/*! @function kdpReceiveDispatcher
+    @abstract The KDP receive dispatch function.
+    @discussion Field KDP receives requests, then dispatches the call to the
+    registered receiver handler.
+    @param buffer KDP receive buffer. The buffer allocated by KDP has room
+           for 1518 bytes. The receive handler must not overflow this buffer.
+    @param length The amount of data received and placed into the buffer.
+           Set to 0 if a frame was not received during the poll interval.
+    @param timeout The amount of time to poll in milliseconds while waiting
+           for a frame to arrive. 
+*/
+
+    static void kdpReceiveDispatcher(void *   buffer,
+                                     UInt32 * length,
+                                     UInt32   timeout);
+
+/*! @function kdpTransmitDispatcher
+    @abstract The KDP transmit dispatch function.
+    @discussion Field KDP transmit requests, then dispatches the call to the
+    registered transmit handler.
+    @param buffer KDP transmit buffer. This buffer contains a KDP frame to
+           be sent on the network.
+    @param length The number of bytes in the transmit buffer. 
+*/
+
+    static void kdpTransmitDispatcher(void * buffer, UInt32 length);
+
+/*! @function free
+    @abstract Frees the IOKernelDebugger instance. */
+
+    virtual void free();
+
+/*! @function nullTxHandler
+    @abstract Null transmit handler.
+    @discussion This function is registered as the transmit handler when an
+    IOKernelDebugger object surrenders its status as the active debugger nub.
+    Until another IOKernelDebugger object gets promoted, this function will
+    handle polled transmit requests from KDP. This function does nothing
+    useful. 
+*/
+
+    static void nullTxHandler( IOService * target,
+                               void *      buffer,
+                               UInt32      length );
+
+/*! @function nullRxHandler
+    @abstract Null receive handler.
+    @discussion This function is registered as the receive handler when an
+    IOKernelDebugger object surrenders its status as the active debugger nub.
+    Until another IOKernelDebugger object gets promoted, this function will
+    handle polled receive requests from KDP. This function does nothing
+    except to log a warning message. 
+*/
+
+    static void nullRxHandler( IOService * target,
+                               void *      buffer,
+                               UInt32 *    length,
+                               UInt32      timeout );
+
+/*! @function registerHandler
+    @abstract Registers the target and the handler functions.
+    @discussion This method is called by handleOpen() and handleClose()
+    to register or unregister the target and its handler functions.
+    @param target The target object.
+    @param txHandler The transmit handler function. The null handler is
+    registered if the argument is zero.
+    @param rxHandler The receive handler function. The null handler is
+    registered if the argument is zero. 
+*/
+
+    static void registerHandler( IOService *          target,
+                                 IODebuggerTxHandler  txHandler = 0,
+                                 IODebuggerRxHandler  rxHandler = 0 );
+
+/*! @function powerStateWillChangeTo
+    @abstract Handles notification that the network controller will change
+    power state.
+    @discussion If the controller is about to become unusable, then the
+    controller's handlers are unregistered, and the controller is disabled.
+    @param flags Describe the capability of the controller in the new power 
+           state.
+    @param stateNumber The number of the state in the state array that the 
+           controller is switching to.
+    @param policyMaker The policy maker that manages the controller's
+           power state.
+    @result Returns the constant 3000000, to indicate a maximum of 3 seconds for the 
+            preparation to complete, and an acknowledgement delivered to the
+            policy maker. 
+*/
+
+    virtual IOReturn powerStateWillChangeTo( IOPMPowerFlags  flags,
+                                             unsigned long   stateNumber,
+                                             IOService *     policyMaker );
+
+/*! @function powerStateDidChangeTo
+    @abstract Handles notification that the network controller did change
+    power state.
+    @discussion If the controller became usable, then the controller is 
+    re-enabled, and the controller's handlers are re-registered.
+    @param flags Description of the capability of the controller in the new power 
+           state.
+    @param stateNumber The number of the state in the state array that the 
+           controller is switching to.
+    @param policyMaker The policy maker that manages the controller's
+           power state.
+    @result Returns the constant 3000000, to indicate a maximum of 3 seconds for the 
+            preparation to complete, and an acknowledgement delivered to the
+            policy maker. 
+*/
+
+    virtual IOReturn powerStateDidChangeTo( IOPMPowerFlags  flags,
+                                            unsigned long   stateNumber,
+                                            IOService *     policyMaker );
+
+/*! @function handleOpen
+    @abstract Handles a client open.
+    @discussion This method is called by IOService::open() to handle an
+    open from a client (IOKDP) with the arbitration lock held.
+    @param forClient The client (IOKDP) requesting the open.
+    @param options Options passed to the open() call. Not used.
+    @param arg A family defined argument passed to the open() call. Not used.
+    @result Returns true on success, false otherwise. 
+*/
+
+    virtual bool handleOpen( IOService *    forClient,
+                             IOOptionBits   options,
+                             void *         arg );
+
+/*! @function handleClose
+    @abstract Handles a client close.
+    @discussion This method is called by IOService::close() to handle a
+    close from a client with the arbitration lock held.
+    @param forClient The client (IOKDP) requesting the close.
+    @param options Options passed to the close() call. Not used. 
+*/
+
+    virtual void handleClose( IOService *   forClient,
+                              IOOptionBits  options );
+
+/*! @function handleIsOpen
+    @abstract Queries whether a client has an open on this object.
+    @discussion This method is called by IOService::isOpen() with the
+    arbitration lock held.
+    @result Returns true if the specified client, or any client if none (0) is
+    specified, presently has an open on this object. 
+*/
+
+    virtual bool handleIsOpen( const IOService * forClient ) const;
+
+	static bool interfacePublished( void *target, void *param, IOService *service );
+
+public:
+
+/*! @function lock
+    @abstract Takes the debugger lock conditionally.
+    @discussion This method takes the debugger lock if the object given matches the
+    target registered by registerHandler().
+    @param target The target or provider of an IOKernelDebugger object.
+    @result Returns kIODebuggerLockTaken if the lock was taken, or 0 otherwise. 
+*/
+
+    static IODebuggerLockState lock( IOService * target );
+
+/*! @function unlock
+    @abstract Releases the debugger lock.
+    @discussion This method releases the debugger lock if the kIODebuggerLockTaken flag is
+    set in the argument. 
+*/
+
+    static void unlock( IODebuggerLockState state );
+
+/*! @function init
+    @abstract Initializes an IOKernelDebugger instance.
+    @param target The target object that implements the debugger handlers.
+    @param txHandler The target's transmit handler. A pointer to a 'C' function.
+    @param rxHandler The target's receive handler. A pointer to a 'C' function.
+    @result Returns true if the instance initialized successfully, false otherwise. 
+*/
+
+    virtual bool init( IOService *          target,
+                       IODebuggerTxHandler  txHandler,
+                       IODebuggerRxHandler  rxHandler );
+
+/*! @function debugger
+    @abstract Factory method that performs allocation and initialization
+    of an IOKernelDebugger object.
+    @param target The target object that implements the debugger handlers.
+    @param txHandler The target's transmit handler. A pointer to a 'C' function.
+    @param rxHandler The target's receive handler. A pointer to a 'C' function.
+    @result Returns an IOKernelDebugger instance on success, 0 otherwise. 
+*/
+
+    static IOKernelDebugger * debugger( IOService *          target,
+                                        IODebuggerTxHandler  txHandler,
+                                        IODebuggerRxHandler  rxHandler );
+
+    /*
+     * Entry point for generic messages delivered from the provider.
+     */
+
+    virtual IOReturn message( UInt32 type, IOService * provider, void * arg );
+
+/*! @function signalDebugger
+    @abstract Signal the kernel to enter the debugger when safe.
+*/
+    static void signalDebugger(void);
+
+    // Virtual function padding
+    OSMetaClassDeclareReservedUnused( IOKernelDebugger,  0);
+    OSMetaClassDeclareReservedUnused( IOKernelDebugger,  1);
+    OSMetaClassDeclareReservedUnused( IOKernelDebugger,  2);
+    OSMetaClassDeclareReservedUnused( IOKernelDebugger,  3);
+};
+
+// Concise form of the lock()/unlock() static member functions.
+//
+#define IODebuggerLock    IOKernelDebugger::lock
+#define IODebuggerUnlock  IOKernelDebugger::unlock
+
+#endif /* !_IOKERNELDEBUGGER_H */
diff --git a/i386/include/IOKit/network/IOMbufMemoryCursor.h b/i386/include/IOKit/network/IOMbufMemoryCursor.h
new file mode 100644
index 0000000..4e40173
--- /dev/null
+++ b/i386/include/IOKit/network/IOMbufMemoryCursor.h
@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_NETWORK_IOMBUFMEMORYCURSOR_H
+#define _IOKIT_NETWORK_IOMBUFMEMORYCURSOR_H
+
+#include <IOKit/IOMemoryCursor.h>
+
+
+/*! @class IOMbufMemoryCursor
+    @abstract A mechanism to convert mbuf chains to physical addresses.
+    @discussion The IOMbufMemoryCursor defines the super class that all
+    specific mbuf cursors must inherit from, but a mbuf cursor can be created   
+    without a specific formal subclass by just providing a segment function to
+    the initializers. This class performs the task of walking a given
+    mbuf chain and creating a physical scatter/gather list appropriate for
+    the target hardware. When necessary, this class may also coalesce
+    mbuf chains when the generated scatter/gather list exceeds the specified 
+    hardware limit. However, this should be avoided since it exacts a 
+    performance cost.
+    <br><br>
+    A driver is expected to create a mbuf cursor and configure it to match the
+    limitations of it's DMA hardware; for instance the mbuf cursor used by
+    an Ethernet controller driver may have a maximum physical segment size
+    of 1520, and allow for up to 6 physical segments. Thus it would create a 
+    mbuf cursor with a maxSegmentSize of 1520 and a maxNumSegments of 6.
+    The driver may choose to supply an OutputSegmentFunc function to
+    format the output of each scatter/gather segment to match the
+    hardware descriptor format, or it may use a subclass of 
+    IOMbufMemoryCursor to generate IOPhysicalSegment segments with 
+    various byte orders.
+    <br><br>
+    A driver may also create more than one mbuf cursor, perhaps one
+    dedicated for the transmit thread, and the other for the receive thread.
+    This becomes a requirement when the driver is multi-threaded, since the 
+    mbuf cursor maintains state and does not support reentrancy. */
+
+class IOMbufMemoryCursor : public IOMemoryCursor
+{
+    OSDeclareDefaultStructors(IOMbufMemoryCursor)
+
+protected:
+    UInt32 maxNumSegments;
+    UInt32 coalesceCount;
+    UInt32 packetTooBigErrors;
+
+    struct ExpansionData { };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+
+    virtual bool initWithSpecification(OutputSegmentFunc outSeg,
+                                       UInt32 maxSegmentSize,
+                                       UInt32 maxTransferSize,
+                                       UInt32 align);
+
+public:
+/*! @function initWithSpecification
+    @abstract Primary initializer for the IOMbufMemoryCursor class.
+    @param outSeg Function to call to output one physical segment.
+    @param maxSegmentSize Maximum allowable size for one segment.
+    @param maxNumSegments Maximum number of segments.
+    @result Returns true if the inherited classes and this instance initialized
+    successfully.
+*/
+
+    virtual bool initWithSpecification(OutputSegmentFunc outSeg,
+                                       UInt32 maxSegmentSize,
+                                       UInt32 maxNumSegments);
+
+/*! @function genPhysicalSegments
+    @abstract Generates a physical scatter/gather list given a mbuf packet.
+    @discussion Generates a list of physical segments from the given mbuf.
+    @param packet The mbuf packet.
+    @param vector Void pointer to base of output physical scatter/gather list.
+    Always passed directly onto the OutputSegmentFunc without interpretation
+    by the cursor. 
+    @param maxSegs Maximum number of segments that can be written to segments
+    array.
+    @param doCoalesce Set to true to perform coalescing when the required 
+    number of segments exceeds the specified limit, otherwise abort and
+    return 0.
+    @result Returns the number of segments that were filled in, or
+    0 if an error occurred. 
+*/
+
+    virtual UInt32 genPhysicalSegments(mbuf_t packet, void * vector,
+                                       UInt32 maxSegs, bool doCoalesce);
+
+/*! @function getAndResetCoalesceCount
+    @abstract Returns a count of the total number of mbuf chains coalesced
+    by genPhysicalSegments().
+    @discussion This method returns a count of the total number of mbuf chains coalesced
+    by genPhysicalSegments(). The counter is then reset to 0.
+    @result Returns the coalesce count. 
+*/
+
+    UInt32 getAndResetCoalesceCount();
+
+    // Virtual function padding
+    OSMetaClassDeclareReservedUnused( IOMbufMemoryCursor,  0);
+    OSMetaClassDeclareReservedUnused( IOMbufMemoryCursor,  1);
+    OSMetaClassDeclareReservedUnused( IOMbufMemoryCursor,  2);
+    OSMetaClassDeclareReservedUnused( IOMbufMemoryCursor,  3);
+};
+
+
+/*! @class IOMbufNaturalMemoryCursor
+    @abstract An IOMbufMemoryCursor subclass that outputs a vector of
+    IOPhysicalSegments in the natural byte orientation for the cpu.  
+    @discussion The IOMbufNaturalMemoryCursor would be used when it is too
+    difficult to implement an OutputSegmentFunc that is more appropriate for
+    your hardware.  This cursor just outputs an array of IOPhysicalSegments. 
+*/
+
+class IOMbufNaturalMemoryCursor : public IOMbufMemoryCursor
+{
+    OSDeclareDefaultStructors(IOMbufNaturalMemoryCursor)
+
+public:
+
+/*! @function withSpecification
+    @abstract Factory function that creates and initializes an 
+    IOMbufNaturalMemoryCursor in one operation. 
+    @discussion See also IOMbufMemoryCursor::initWithSpecification.
+    @param maxSegmentSize Maximum allowable size for one segment.
+    @param maxNumSegments Maximum number of segments.
+    @result Returns a new mbuf cursor if successfully created and initialized,
+    0 otherwise. 
+*/
+
+    static IOMbufNaturalMemoryCursor * withSpecification(UInt32 maxSegmentSize, 
+                                                         UInt32 maxNumSegments);
+
+/*! @function getPhysicalSegments
+    @abstract Generates a cpu natural physical scatter/gather list from a given
+    mbuf.
+    @param packet The mbuf packet.
+    @param vector Pointer to an array of IOPhysicalSegments for the output 
+    physical scatter/gather list.
+    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
+    @result Returns the number of segments that were filled in, or
+    0 if an error occurred. 
+*/
+
+    UInt32 getPhysicalSegments(mbuf_t packet,
+                               struct IOPhysicalSegment * vector,
+                               UInt32 numVectorSegments = 0);
+
+/*! @function getPhysicalSegmentsWithCoalesce
+    @abstract Generates a cpu natural physical scatter/gather list from a given
+    mbuf.
+    @discussion Generate a cpu natural physical scatter/gather list from a 
+    given mbuf. Coalesce mbuf chain when the number of segments in the 
+    scatter/gather list exceeds numVectorSegments.
+    @param packet The mbuf packet.
+    @param vector Pointer to an array of IOPhysicalSegments for the output 
+    physical scatter/gather list.
+    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
+    @result Returns the number of segments that were filled in, or
+    0 if an error occurred. 
+*/
+
+    UInt32 getPhysicalSegmentsWithCoalesce(mbuf_t packet,
+                                           struct IOPhysicalSegment * vector,
+                                           UInt32 numVectorSegments = 0);
+};
+
+//===========================================================================
+//===========================================================================
+
+/*! @class IOMbufBigMemoryCursor
+    @abstract An IOMbufMemoryCursor subclass that outputs a vector of 
+    IOPhysicalSegments in the big endian byte order.  
+    @discussion The IOMbufBigMemoryCursor would be used when the DMA hardware 
+    requires a big endian address and length pair.  This cursor outputs an 
+    array of IOPhysicalSegments that are encoded in big-endian format. 
+*/
+
+class IOMbufBigMemoryCursor : public IOMbufMemoryCursor
+{
+    OSDeclareDefaultStructors(IOMbufBigMemoryCursor)
+
+public:
+
+/*! @function withSpecification
+    @abstract Factory function that creates and initializes an 
+    IOMbufBigMemoryCursor in one operation.
+    @discussion See also IOMbufMemoryCursor::initWithSpecification.
+    @param maxSegmentSize Maximum allowable size for one segment.
+    @param maxNumSegments Maximum number of segments.
+    @result Returns a new mbuf cursor if successfully created and initialized,
+    0 otherwise. 
+*/
+
+    static IOMbufBigMemoryCursor * withSpecification(UInt32 maxSegmentSize,
+                                                     UInt32 maxNumSegments);
+
+/*! @function getPhysicalSegments
+    @abstract Generates a big endian physical scatter/gather list from a given
+    mbuf.
+    @param packet The mbuf packet.
+    @param vector Pointer to an array of IOPhysicalSegments for the output 
+    physical scatter/gather list.
+    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
+    @result Returns the number of segments that were filled in, or
+    0 if an error occurred. 
+*/
+
+    UInt32 getPhysicalSegments(mbuf_t packet,
+                               struct IOPhysicalSegment * vector,
+                               UInt32 numVectorSegments = 0);
+
+/*! @function getPhysicalSegmentsWithCoalesce
+    @abstract Generates a big endian physical scatter/gather list from a given
+    mbuf.
+    @discussion Generate a big endian physical scatter/gather list from a 
+    given mbuf. Coalesce mbuf chain when the number of segments in the 
+    scatter/gather list exceeds numVectorSegments.
+    @param packet The mbuf packet.
+    @param vector Pointer to an array of IOPhysicalSegments for the output 
+    physical scatter/gather list.
+    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
+    @result Returns the number of segments that were filled in, or
+    0 if an error occurred. 
+*/
+
+    UInt32 getPhysicalSegmentsWithCoalesce(mbuf_t packet,
+                                           struct IOPhysicalSegment * vector,
+                                           UInt32 numVectorSegments = 0);
+};
+
+//===========================================================================
+//===========================================================================
+
+/*! @class IOMbufLittleMemoryCursor
+    @abstract An IOMbufMemoryCursor subclass that outputs a vector of 
+    IOPhysicalSegments in the little endian byte order.  
+    @discussion The IOMbufLittleMemoryCursor would be used when the DMA 
+    hardware requires a little endian address and length pair.  This cursor 
+    outputs an array of IOPhysicalSegments that are encoded in little endian 
+    format. 
+*/
+
+class IOMbufLittleMemoryCursor : public IOMbufMemoryCursor
+{
+    OSDeclareDefaultStructors(IOMbufLittleMemoryCursor)
+
+public:
+
+/*! @function withSpecification
+    @abstract Factory function that creates and initializes an 
+    IOMbufLittleMemoryCursor in one operation.
+    @discussion See also IOMbufMemoryCursor::initWithSpecification.
+    @param maxSegmentSize Maximum allowable size for one segment.
+    @param maxNumSegments Maximum number of segments.
+    @result Returns a new mbuf cursor if successfully created and initialized,
+    0 otherwise. 
+*/
+
+    static IOMbufLittleMemoryCursor * withSpecification(UInt32 maxSegmentSize, 
+                                                        UInt32 maxNumSegments);
+
+/*! @function getPhysicalSegments
+    @abstract Generates a little endian physical scatter/gather list from a 
+    given mbuf.
+    @param packet The mbuf packet.
+    @param vector Pointer to an array of IOPhysicalSegments for the output 
+    physical scatter/gather list.
+    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
+    @result Returns the number of segments that were filled in, or
+    0 if an error occurred. 
+*/
+
+    UInt32 getPhysicalSegments(mbuf_t packet,
+                               struct IOPhysicalSegment * vector,
+                               UInt32 numVectorSegments = 0);
+
+/*! @function getPhysicalSegmentsWithCoalesce
+    @abstract Generates a little endian physical scatter/gather list from a 
+    given mbuf.
+    @discussion Generate a little endian physical scatter/gather list from a 
+    given mbuf. Coalesce mbuf chain when the number of segments in the 
+    scatter/gather list exceeds numVectorSegments.
+    @param packet The mbuf packet.
+    @param vector Pointer to an array of IOPhysicalSegments for the output 
+    physical scatter/gather list.
+    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
+    @result Returns the number of segments that were filled in, or
+    0 if an error occurred. 
+*/
+
+    UInt32 getPhysicalSegmentsWithCoalesce(mbuf_t packet,
+                                           struct IOPhysicalSegment * vector,
+                                           UInt32 numVectorSegments = 0);
+};
+
+#ifdef __ppc__
+
+struct IODBDMADescriptor;
+
+//===========================================================================
+//===========================================================================
+
+/*! @class IOMbufDBDMAMemoryCursor
+    @abstract An IOMbufMemoryCursor subclass that outputs a vector of 
+    IODBDMADescriptors. 
+*/
+
+class IOMbufDBDMAMemoryCursor : public IOMbufMemoryCursor
+{
+    OSDeclareDefaultStructors(IOMbufDBDMAMemoryCursor)
+
+public:
+
+/*! @function withSpecification
+    @abstract Factory function that creates and initializes an 
+    IOMbufDBDMAMemoryCursor in one operation.
+    @discussion See also IOMbufMemoryCursor::initWithSpecification.
+    @param maxSegmentSize Maximum allowable size for one segment.
+    @param maxNumSegments Maximum number of segments.
+    @result Returns a new mbuf cursor if successfully created and initialized,
+    0 otherwise. 
+*/
+
+    static IOMbufDBDMAMemoryCursor * withSpecification(UInt32 maxSegmentSize, 
+                                                       UInt32 maxNumSegments);
+
+/*! @function getPhysicalSegments
+    @abstract Generates a DBDMA descriptor list from a given mbuf.
+    @param packet The mbuf packet.
+    @param vector Pointer to an array of IODBDMADescriptor for the output list.
+    @param numVectorSegments Maximum number of IODBDMADescriptors accepted.
+    @result Returns the number of segments that were filled in, or
+    0 if an error occurred. 
+*/
+
+    UInt32 getPhysicalSegments(mbuf_t packet,
+                               struct IODBDMADescriptor *vector,
+                               UInt32 numVectorSegments = 0);
+
+/*! @function getPhysicalSegmentsWithCoalesce
+    @abstract Generates a DBDMA descriptor list from a given mbuf.
+    @discussion Generate a DBDMA descriptor list from a given mbuf.
+    Coalesce mbuf chain when the number of elements in the list exceeds
+    numVectorSegments.
+    @param packet The mbuf packet.
+    @param vector Pointer to an array of IODBDMADescriptor for the output list.
+    @param numVectorSegments Maximum number of IODBDMADescriptors accepted.
+    @result Returns the number of segments that were filled in, or
+    0 if an error occurred. 
+*/
+
+    UInt32 getPhysicalSegmentsWithCoalesce(mbuf_t packet,
+                                           struct IODBDMADescriptor * vector,
+                                           UInt32 numVectorSegments = 0);
+};
+
+#endif /* __ppc__ */
+
+#endif /* !_IOKIT_NETWORK_IOMBUFMEMORYCURSOR_H */
+
diff --git a/i386/include/IOKit/network/IONetworkController.h b/i386/include/IOKit/network/IONetworkController.h
new file mode 100644
index 0000000..05b12d3
--- /dev/null
+++ b/i386/include/IOKit/network/IONetworkController.h
@@ -0,0 +1,1452 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IONETWORKCONTROLLER_H
+#define _IONETWORKCONTROLLER_H
+
+/*! @defined kIONetworkControllerClass
+    @abstract The name of the IONetworkController class. */
+
+#define kIONetworkControllerClass   "IONetworkController"
+
+/*! @defined kIOVendor
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOVendor property is a property of IONetworkController objects.  It has an OSString value 	that describes the vendor of the network controller. */
+
+#define kIOVendor                "IOVendor"
+
+/*! @defined kIOModel
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOModel property is a property of IONetworkController objects.  It has an OSString value that 	describes the model of the network controller. */
+
+#define kIOModel                 "IOModel"
+
+/*! @defined kIORevision
+    @abstract A property of IONetworkController objects.
+    @discussion The kIORevision property is a property of IONetworkController objects.  It has an OSString value 	that describes the revision level of the network controller. */
+
+#define kIORevision              "IORevision"
+
+/*! @defined kIOFeatures
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOFeatures property is a property of IONetworkController objects. It has an OSNumber value 	that describes generic features defined by IONetworkController that are supported by the
+        network controller. */
+
+#define kIOFeatures              "IOFeatures"
+
+/*! @defined kIOMediumDictionary
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOMediumDictionary property is a property of IONetworkController
+        objects.  It has an OSDictionary value that is a container for the
+        collection of IONetworkMedium objects that represent the media
+        types supported by the network controller.
+        Each entry in the dictionary is a key/value pair consisting of
+        the medium name, and a dictionary value that contains the
+        properties for that medium entry. */
+
+#define kIOMediumDictionary      "IOMediumDictionary"
+
+/*! @defined kIODefaultMedium
+    @abstract A property of IONetworkController objects.
+    @discussion The kIODefaultMedium property is a property of IONetworkController
+        objects.  It has an OSString value that describes the name of the
+        default medium. This definition may change or disappear in the
+        future. */
+
+#define kIODefaultMedium         "IODefaultMedium"
+
+/*! @defined kIOSelectedMedium
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOSelectedMedium property is a property of IONetworkController
+        objects.  It has an OSSymbol value that describes the name of the
+        current selected medium. This name can be used as a key into the
+        medium dictionary to gather additional information about the
+        selected medium. */
+
+#define kIOSelectedMedium         "IOSelectedMedium"
+
+/*! @defined kIOActiveMedium
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOActiveMedium property is a property of IONetworkController
+        objects.  It has an OSSymbol value that describes the name of the
+        active medium. This is the name of the medium where an active
+        link has been established. This name can be used as a key into
+        the medium dictionary to gather additional information about the
+        active medium. */
+
+#define kIOActiveMedium          "IOActiveMedium"
+
+/*! @defined kIOLinkSpeed
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOLinkSpeed property is a property of IONetworkController
+        objects. It has an OSNumber value that describes the speed of the
+    	link established over the active medium in bits per second. */
+
+#define kIOLinkSpeed             "IOLinkSpeed"
+
+/*! @defined kIOLinkStatus
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOLinkStatus property is a property of IONetworkController
+        objects. It has an OSNumber value that describes the current network
+        link status. See IONetworkMedium for the definition of the link
+        status bits. */
+
+#define kIOLinkStatus            "IOLinkStatus"
+
+/*! @defined kIOLinkData
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOLinkData property is a property of IONetworkController
+        objects. It has an OSData value that contains additional information
+        describing the active link that was established.
+        Its interpretation is not defined. */
+
+#define kIOLinkData              "IOLinkData"
+
+/*! @defined kIOPacketFilters
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOPacketFilters property is a property of IONetworkController
+        objects. It has an OSDictionary value that describes the entire
+        set of packet filters supported by the controller. Each entry
+        in the dictionary is a key/value pair consisting of the filter
+        group name, and an OSNumber describing the set of supported
+        filters for that group. */
+
+#define kIOPacketFilters         "IOPacketFilters"
+
+/*! @defined kIOMACAddress
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOMACAddress property is a property of IONetworkController
+        objects. It has an OSData value that describes the hardware
+        MAC (media access controller) address, or station address,
+        of the network controller. */
+
+#define kIOMACAddress            "IOMACAddress"
+
+/*! @defined kIOMaxPacketSize
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOMaxPacketSize property is a property of IONetworkController
+        objects. It has an OSNumber value that describes the maximum
+        packet size supported by the controller. */
+
+#define kIOMaxPacketSize         "IOMaxPacketSize"
+
+/*! @defined kIOMinPacketSize
+    @abstract A property of IONetworkController objects.
+    @discussion The kIOMinPacketSize property is a property of IONetworkController
+        objects. It has an OSNumber value that describes the minimum
+        packet size supported by the controller. */
+
+#define kIOMinPacketSize         "IOMinPacketSize"
+
+/*! @defined kIONetworkFilterGroup
+    @abstract The name assigned to the standard network filter group. */
+
+#define kIONetworkFilterGroup    "IONetworkFilterGroup"
+
+/*! @enum StandardPacketFilters
+    @abstract All standard packet filters. 
+    @discussion Each filter will allow the reception of certain class of packets
+        depending on its destination MAC address.
+    @constant kIOPacketFilterUnicast Reception of unicast packets.
+    @constant kIOPacketFilterBroadcast Reception of broadcast packets.
+    @constant kIOPacketFilterMulticast Reception of multicast packets
+        addressed to a set of multicast addresses.
+    @constant kIOPacketFilterMulticastAll Reception of all multicast
+        packets.
+    @constant kIOPacketFilterPromiscuous Reception of all packets.
+    @constant kIOPacketFilterPromiscuousAll Reception of all packets,
+        including bad packets. */
+
+enum {
+    kIOPacketFilterUnicast         = 0x1,
+    kIOPacketFilterBroadcast       = 0x2,
+    kIOPacketFilterMulticast       = 0x10,
+    kIOPacketFilterMulticastAll    = 0x20,
+    kIOPacketFilterPromiscuous     = 0x100,
+    kIOPacketFilterPromiscuousAll  = 0x200
+};
+
+/*! @enum NetworkFeatureFlags
+    @abstract Feature flags returned by the getFeatures() method.
+    @constant kIONetworkFeatureNoBSDWait Set this bit in the value
+        returned by getFeatures() to disable the automatic wait for
+        "IOBSD" resource by the IONetworkController::start() method. 
+    @constant kIONetworkFeaturesHardwareVlan Set this bit in the value
+        returned by getFeatures() to indicate the controller supports hardware
+        stripping and stuffing of 802.1q vlan tags.  If the controller supports
+        this feature it must enable it when initializing so that all received
+        packets delivered to higher layers have the tag stripped.  The controller
+        should use setVlanTag() to provide the tag information out of band.
+    @constant kIONetworkFeaturesSoftwareVlan Set this bit in the value
+        returned by getFeatures() to indicate that the controller can support software
+        based vlan by transmitting and receiving packets 4 bytes longer that normal. 
+    @constant kIONetworkFeatureMultiPages Set this bit if the driver is
+	capable of handling packets coming down from the network stack that
+	reside in virtually, but not in physically contiguous span of the
+	external mbuf clusters.  In this case, the data area of a packet in
+	the external mbuf cluster might cross one or more physical pages that
+	are disjoint, depending on the interface MTU and the packet size.
+	Such a use of larger than system page size clusters by the network
+	stack is done for better system efficiency.  Drivers that utilize the
+	IOMbufNaturalMemoryCursor with the getPhysicalSegmentsWithCoalesce
+	interfaces and enumerate the list of vectors should set this flag
+	for possible gain in performance during bulk data transfer.
+    @constant kIONetworkFeatureTSOIPv4 Set this bit to advertise support
+        for TCP/IPv4 segmentation offload.
+    @constant kIONetworkFeatureTSOIPv6 Set this bit to advertise support
+        for TCP/IPv6 segmentation offload.
+*/
+
+enum {
+    kIONetworkFeatureNoBSDWait    = 0x01,
+	kIONetworkFeatureHardwareVlan = 0x02,
+	kIONetworkFeatureSoftwareVlan = 0x04,
+	kIONetworkFeatureMultiPages   = 0x08,
+	kIONetworkFeatureTSOIPv4      = 0x10,
+	kIONetworkFeatureTSOIPv6      = 0x20
+};
+
+/*
+ * Kernel
+ */
+#if defined(KERNEL) && defined(__cplusplus)
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/network/IONetworkInterface.h>
+#include <IOKit/network/IOKernelDebugger.h>
+
+class  IOCommandGate;
+class  IOOutputQueue;
+class  IONetworkMedium;
+
+/*! @typedef IOPacketBufferConstraints
+    @discussion Constraint parameters, specified by a driver,
+    for the data buffer in a packet mbuf. This is observed by
+    allocatePacket() to satisfy the stated requirements.
+    @field alignStart Starting address byte alignment.
+    @field alignLength Buffer length byte alignment. */
+
+typedef struct {
+    UInt32  alignStart;
+    UInt32  alignLength;
+    UInt32  reserved[6];
+} IOPacketBufferConstraints;
+
+// Some frequently used alignment constants.
+//
+enum {
+    kIOPacketBufferAlign1   = 1,
+    kIOPacketBufferAlign2   = 2,
+    kIOPacketBufferAlign4   = 4,
+    kIOPacketBufferAlign8   = 8,
+    kIOPacketBufferAlign16  = 16,
+    kIOPacketBufferAlign32  = 32
+};
+
+/*!	@const gIONetworkFilterGroup
+    @discussion gIONetworkFilterGroup is an OSSymbol object that contains
+        the name of the standard network filter group as defined by
+        kIONetworkFilterGroup. */
+
+extern const OSSymbol *  gIONetworkFilterGroup;
+
+/*! @class IONetworkController
+    @abstract Implements the framework for a generic 
+    network controller.
+    @discussion A subclass of IONetworkController must provide
+    additional functionality specific for a particular networking type.
+    In addition, the driver must implement (override) a basic set of 
+    hardware dependent methods to create a working driver.
+
+    IONetworkController attaches itself to the data link layer (DLIL) via
+    an IONetworkInterface object. A controller object without a companion
+    interface is not accessible to the networking system. The controller
+    interacts with DLIL by calling methods defined by the interface object.
+    And conversely, DLIL will issue commands and packets to the controller
+    through the interface object.
+
+    IONetworkController will create an IOCommandGate and attach this
+    event source to an IOWorkLoop object. All commands sent from the
+    interface object are handled through the IOCommandGate object,
+    which will serialize access to the controller. Outbound packets sent
+    from the interface to the controller have no implicit serialization. 
+    Drivers must implement an output function that is thread safe, or use
+    an IOOutputQueue object which will provide a serialization model.
+
+	Note: IONetworkController internally uses some private messaging constants
+	in the sys_iokit | sub_iokit_networking range defined in 
+	"IONetworkControllerPrivate.h".	If you create a client for your controller
+	(for example an IOUserClient), and it overrides the IOService::message 
+	method, your client may receive these messages.  It should ignore these 
+	messages and pass them to super::message() 	
+    */
+
+class IONetworkController : public IOService
+{
+    OSDeclareAbstractStructors( IONetworkController )
+
+private:
+
+    IOWorkLoop *             _workLoop;
+    IOCommandGate *          _cmdGate;
+    IOOutputQueue *          _outputQueue;
+    OSSet *                  _clientSet;
+    OSCollectionIterator *   _clientSetIter;
+    OSObject *               _cmdClient;
+    UInt32                   _alignStart;
+    UInt32                   _alignLength;
+    UInt32                   _alignPadding;
+    bool                     _propertiesPublished;
+    IOLock *                 _mediumLock;
+    IODebuggerLockState      _debugLockState;
+    SInt32                   _debugLockCount;
+    OSNumber *               _linkStatus;
+    OSNumber *               _linkSpeed;
+    const OSData *           _lastLinkData;
+    const OSSymbol *         _lastActiveMediumName;
+    const OSSymbol *         _lastCurrentMediumName;
+    mbuf_t                   _freeList;
+
+    struct ExpansionData { };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *	    _reserved;
+
+
+    bool _broadcastEvent(UInt32 type, void * data = 0);
+
+    static void debugRxHandler(IOService * handler,
+                               void *      buffer,
+                               UInt32 *    length,
+                               UInt32      timeout);
+
+    static void debugTxHandler(IOService * handler,
+                               void *      buffer,
+                               UInt32      length);
+
+    static IOReturn executeCommandAction(OSObject * owner,
+                                         void *     arg0,
+                                         void *     arg1,
+                                         void *     arg2,
+                                         void *     arg3);
+
+    static IOReturn handleCommand(void * target,
+                                  void * param0,
+                                  void * param1,
+                                  void * param2,
+                                  void * param3);
+
+public:
+
+/*! @function init
+    @abstract Initializes the IONetworkController object.
+    @discussion Instance variables are initialized, then super::init()
+    is called.
+    @param properties A dictionary object containing a property table
+        associated with this instance.
+    @result Returns true on success, false otherwise. 
+*/ 
+
+    virtual bool init(OSDictionary * properties);
+
+/*! @function start
+    @abstract Starts the network controller.
+    @discussion After the controller driver has successfully matched
+    to a provider, this method is called to start the network controller. 
+    IONetworkController will allocate resources and gather controller
+    properties in its implementation. No I/O will be performed until
+    the subclass tries to attach a client object. A driver must override
+    this method, and call super::start() at the beginning of its own
+    implementation. Then check the return value to make sure that its
+    superclass was started successfully before proceeding. Tasks that
+    are usually performed by a driver's start method are: resource
+    allocation, hardware initialization, allocation of IOEventSources
+    and attaching them to a workloop, publishing a medium dictionary,
+    and finally, attaching an interface object when it is ready to
+    handle client requests.
+    @param provider The provider that the controller was matched
+    (and attached) to.
+    @result Returns true on success, false otherwise. 
+*/
+
+    virtual bool start(IOService * provider);
+
+/*! @function stop
+    @abstract Stops the network controller.
+    @discussion The counterpart of start(). The controller has been
+    instructed to stop running. The stop() method should release
+    resources and undo actions performed by the start() method.
+    Subclasses must override this method and call super::stop()
+    at the end of its implementation.
+    @param provider The provider that the controller was matched
+    (and attached) to. */
+
+    virtual void stop(IOService * provider);
+
+/*! @typedef IONetworkController::Action
+    @discussion Definition of a C function that can be called
+    through executeCommand().
+    @param target The first argument passed to action.
+    @param param0 Action parameter 0.
+    @param param1 Action parameter 1.
+    @param param2 Action parameter 2.
+    @param param3 Action parameter 3. */
+
+    typedef IOReturn (*Action)(void * target, void * param0,
+                                              void * param1,
+                                              void * param2,
+                                              void * param3);
+
+/*! @function executeCommand
+    @abstract Makes a C function call through the command gate.
+    @discussion This method makes a call to a C function that will be synchronized 
+    with the workloop thread, and any other threads that are called
+    with the workloop's gate closed.
+    @param client The client requesting the action. This parameter is not
+    passed to the function.
+    @param action Pointer to a C function to be executed.
+    @param target The first parameter in the action callout.
+    @param param0 Action parameter 0.
+    @param param1 Action parameter 1.
+    @param param2 Action parameter 2.
+    @param param3 Action parameter 3.
+    @result Returns the value returned by the action. 
+*/
+
+    virtual IOReturn executeCommand(OSObject * client,
+                                    Action     action,
+                                    void *     target,
+                                    void *     param0 = 0,
+                                    void *     param1 = 0,
+                                    void *     param2 = 0,
+                                    void *     param3 = 0);
+
+/*! @function outputPacket
+    @abstract Transmits an output packet.
+    @discussion If an IOOutputQueue was created by createOutputQueue(),
+    then this method will be called by the output queue object.
+    Otherwise, an interface object will call this method directly when
+    it receives an output packet from the data link layer.
+
+    There is no upper limit on the number of mbufs, hence the number of
+    memory fragments, in the mbuf chain provided. Drivers must be able to
+    handle cases when the mbuf count might exceed the limit supported by their
+    DMA engines, and perform coalescing to copy the various memory fragments
+    into a lesser number of fragments. This complexity can be hidden from
+    the driver when an IOMbufMemoryCursor is used, which is able to convert
+    an mbuf chain into a physical address scatter-gather list that will not
+    exceed a specified number of physically contiguous memory segments.
+    See IOMbufMemoryCursor.
+
+    The implementation in IONetworkController performs no useful action
+    and will drop all packets. A driver must override this method and
+    process the output packet provided. The implementation in the driver
+    must not block, since this may cause the network stack to be reentered
+    from an unsafe point.
+    @param packet An mbuf chain containing the output packet to be sent on
+    the network.
+    @param param A parameter provided by the caller.
+    @result Returns a return code defined by the caller. 
+*/
+
+    virtual UInt32 outputPacket(mbuf_t, void * param);
+
+/*! @function getFeatures
+    @abstract Reports generic features supported by the controller and/or
+    the driver.
+    @result This method will always return 0. Subclasses may override
+    this method and return a bit mask of all supported features. */
+
+    virtual UInt32 getFeatures() const;
+
+/*! @function newVendorString
+    @result Returns a string describing the vendor of the network controller.
+    The caller is responsible for releasing the string object returned. */
+
+    virtual const OSString * newVendorString() const;
+
+/*! @function newModelString
+    @result Returns a string describing the model of the network controller.
+    The caller is responsible for releasing the string object returned. */
+
+    virtual const OSString * newModelString() const;
+
+/*! @function newRevisionString
+    @result Returns a string describing the hardware revision of the
+    network controller. The caller is responsible for releasing the
+    string object returned. */
+
+    virtual const OSString * newRevisionString() const;
+
+/*! @function getSelectedMedium
+    @abstract Gets the current selected medium.
+    @discussion If the driver has previously called setSelectedMedium() 
+    to indicate its current media selection, then this method will return
+    that medium object. Otherwise, the driver's property table is
+    consulted and a default medium property is examined, and the
+    corresponding entry in the medium dictionary is returned.
+    @result Returns the current selected medium, the default medium, or 0. 
+*/
+
+    virtual const IONetworkMedium * getSelectedMedium() const;
+	const IONetworkMedium * getCurrentMedium() const;
+
+/*! @function getMediumDictionary
+    @abstract Returns the medium dictionary published by the driver.
+    @discussion Returns the medium dictionary published by the driver
+    through publishMediumDictionary(). Use copyMediumDictionary() to
+    create and get a copy of the medium dictionary.
+    @result Returns the published medium dictionary, or 0 if the driver has not
+    yet published a medium dictionary through publishMediumDictionary(). 
+*/
+
+    virtual const OSDictionary * getMediumDictionary() const;
+
+/*! @function copyMediumDictionary
+    @abstract Returns a copy of the medium dictionary published by the
+    driver.
+    @discussion The caller is responsible for releasing the dictionary
+    object returned. Use getMediumDictionary() to get a reference to the
+    published medium dictionary instead of creating a copy.
+    @result Returns a copy of the medium dictionary, or 0 if the driver has not
+    published a medium dictionary through publishMediumDictionary().
+*/
+
+    virtual OSDictionary * copyMediumDictionary() const;
+
+/*! @function getOutputHandler
+    @abstract Gets the address of the method designated to handle output 
+    packets for the network controller.
+    @result Returns a pointer to the outputPacket() method. 
+*/
+
+    virtual IOOutputAction getOutputHandler() const;
+
+/*! @function doEnable
+    @abstract Makes a synchronized call to enable() through executeCommand().
+    @discussion Do not use this method, it may be removed in the future.
+    See enable(). 
+*/
+
+    virtual IOReturn doEnable(IOService * client);
+
+/*! @function doDisable
+    @abstract Makes a synchronized call to disable() through executeCommand().
+    @discussion Do not use this method, it may be removed in the future.
+    See disable(). 
+*/
+
+    virtual IOReturn doDisable(IOService * client);
+
+/*! @function getCommandGate
+    @abstract Gets the IOCommandGate object created by IONetworkController.
+    @discussion When IONetworkController is started, an IOCommandGate object
+    is instantiated and attached to the workloop returned by getWorkLoop().
+    This IOCommandGate object is used internally to synchronize client
+    commands handled through executeCommand(). Subclasses that need an
+    IOCommandGate should try to reuse the object returned by this method,
+    rather than creating a new instance. See IOCommandGate documentation.
+    @result Returns the IOCommandGate object created by IONetworkController. 
+*/
+
+    virtual IOCommandGate * getCommandGate() const;
+
+/*! @function getHardwareAddress
+    @abstract Gets the network controller's permanent hardware/station
+    address. 
+    @discussion This method call is synchronized by the workloop's gate.
+    @param addr The buffer where the controller's hardware address should
+           be stored.
+    @param inOutAddrBytes The size of the address buffer provided by the
+           client, and replaced by this method with the actual size of
+           the hardware address in bytes.
+    @result Returns kIOReturnSuccess on success, or an error otherwise. 
+*/
+
+    virtual IOReturn getHardwareAddress(void *   addr,
+                                        UInt32 * inOutAddrBytes) = 0;
+
+/*! @function setHardwareAddress
+    @abstract Sets or changes the station address used by the network
+    controller. 
+    @discussion This method call is synchronized by the workloop's gate.
+    @param buffer The buffer containing the hardware address provided by
+    the client.
+    @param addrBytes The size of the address buffer provided by the
+    client in bytes.
+    @result Returns kIOReturnSuccess on success, or an error otherwise. 
+*/
+
+    virtual IOReturn setHardwareAddress(const void * addr,
+                                        UInt32       addrBytes) = 0;
+
+/*! @function enable
+    @abstract Handles an enable request from a client.
+    @discussion This method handles an enable request from a client. A client will call
+    enable after it has opened the controller, and before it starts to use
+    the controller to send and to receive packets over the network. The
+    client object provided is typecasted using OSDynamicCast, and depending
+    on whether the client is an IOKernelDebugger or an IONetworkInterface,
+    then an overloaded enable method that takes a more specific argument
+    type is called. If the client matches neither type, then
+    kIOReturnBadArgument is returned. A driver has the option of overriding
+    this base enable method, or the overloaded form. This method call is
+    synchronized by the workloop's gate.
+    @param client The client object requesting the enable.
+    @result Returns the return value from the overloaded enable() method, or
+    kIOReturnBadArgument if the client type is unknown. 
+*/
+
+    virtual IOReturn enable(IOService * client);
+
+/*! @function disable
+    @abstract Handles a disable request from a client.
+    @discussion This method handles a disable request from a client. A client will call
+    disable if it has previously enabled the controller, and it no longer
+    needs to transport packets or perform I/O using the controller.
+    The client object is typecasted using OSDynamicCast, and depending on
+    whether the client is an IOKernelDebugger or an IONetworkInterface,
+    then an overloaded disable method that takes a more specific argument
+    type is called. If the client matches neither type, then
+    kIOReturnBadArgument is returned. A driver has the option of overriding
+    this base disable method, or the overloaded form. This method call is
+    synchronized by the workloop's gate.
+    @param client The client object requesting the disable.
+    @result Returns the return from the overloaded disable() method, or
+    kIOReturnBadArgument if the client type is unknown.
+*/
+    
+    virtual IOReturn disable(IOService * client);
+
+/*! @function setMaxPacketSize
+    @abstract A client request to change the maximum packet size.
+    @discussion This method call is synchronized by the workloop's gate.
+    @param maxSize The new maximum packet size.
+    @result Returns kIOReturnUnsupported. Drivers may override this method
+    and return either kIOReturnSuccess to indicate that the new size
+    was accepted and is in effect, or an error code to indicate failure. 
+*/
+
+    virtual IOReturn setMaxPacketSize(UInt32 maxSize);
+
+/*! @function getMaxPacketSize
+    @abstract Gets the maximum packet size supported by the controller.
+    @param maxSize Pointer to the return value.
+    @result Returns kIOReturnSuccess on success, or an error code otherwise. 
+*/
+
+    virtual IOReturn getMaxPacketSize(UInt32 * maxSize) const = 0;
+
+/*! @function getMinPacketSize
+    @abstract Gets the minimum packet size supported by the controller.
+    @param minSize Pointer to the return value.
+    @result Returns kIOReturnSuccess on success, or an error code otherwise. 
+*/
+
+    virtual IOReturn getMinPacketSize(UInt32 * minSize) const = 0;
+
+/*! @function selectMedium
+    @abstract A client request to change the medium selection.
+    @discussion This method is called when a client issues a command
+    for the controller to change its current medium selection.
+    The implementation must call setSelectedMedium() after the change
+    has occurred. This method call is synchronized by the workloop's
+    gate.
+    @param medium An entry from the published medium dictionary that
+    represents the selection chosen by the client.
+    @result Returns kIOReturnUnsupported. Drivers may override this method and
+    return kIOReturnSuccess if the selection was successful,
+    or an error code otherwise. 
+*/
+
+    virtual IOReturn selectMedium(const IONetworkMedium * medium);
+
+/*! @function selectMediumWithName
+    @abstract A client request to change the medium selection.
+    @discussion This method is called when a client issues a command
+    for the controller to change its current medium selection.
+    This implementation will look for an entry in the medium
+    dictionary published by the driver that is associated with the
+    key given. If a match is found, then selectMedium() is called to
+    perform the selection, otherwise an error is reported back to the
+    client. Subclasses should override selectMedium() and not this
+    method. This method call is synchronized by the workloop's gate.
+    @param mediumName An OSSymbol object that describes the name of the
+    new medium selected by the client.
+    @result Returns the return from selectMedium() if a matching entry was found
+    from the medium dictionary. Returns kIOReturnUnsupported if a medium
+    dictionary does not exist, or kIOReturnBadArgument if the name given
+    does not match any entry in the medium dictionary. 
+*/
+
+    virtual IOReturn selectMediumWithName(const OSSymbol * mediumName);
+
+/*! @function getPacketFilters
+    @abstract Gets the set of packet filters supported by the network 
+    controller for the given filter group.
+    @discussion A subclass must implement this method and report the
+    set of filters that are supported for the given filter group.
+    This method call is synchronized by the workloop's gate.
+    @param group The name of the filter group.
+    @param filters Pointer to the mask of supported filters returned by
+    	this method.
+    @result Returns kIOReturnSuccess on success, or an error to indicate a
+    failure to discover the set of supported filters. 
+*/
+
+    virtual IOReturn getPacketFilters(const OSSymbol * group,
+                                      UInt32 *         filters) const = 0;
+
+/*! @function enablePacketFilter
+    @abstract Enables one of the supported packet filters from the
+    given filter group.
+    @discussion A client will call this method to enable a supported filter
+    from the filter group specified. If the client wishes to enable more
+    than one filter, it must call this method multiple times to enable the
+    desired set of filters. This method call is synchronized by the
+    workloop's gate.
+    @param group The name of the filter group containing the filter to be
+    enabled.
+    @param aFilter The filter to enable.
+    @param enabledFilters All filters currently enabled by the client.
+    @param options Optional flags for the enable request.
+    @result Returns kIOReturnSuccess on success, or an error otherwise. 
+*/
+
+    virtual IOReturn enablePacketFilter(const OSSymbol * group,
+                                        UInt32           aFilter,
+                                        UInt32           enabledFilters,
+                                        IOOptionBits     options = 0) = 0;
+
+/*! @function disablePacketFilter
+    @abstract Disables a packet filter that is currently enabled from the
+    given filter group.
+    @discussion After a supported filter has been successfully enabled,
+    a client can call this method to disable that filter. This method call
+    is synchronized by the workloop's gate.
+    @param group The name of the filter group containing the filter to be
+    disabled.
+    @param aFilter The filter to disable.
+    @param enabledFilters All filters currently enabled by the client.
+    @param options Optional flags for the disable request.
+    @result Returns kIOReturnSuccess on success, or an error otherwise. 
+*/
+
+    virtual IOReturn disablePacketFilter(const OSSymbol * group,
+                                         UInt32           aFilter,
+                                         UInt32           enabledFilters,
+                                         IOOptionBits     options = 0) = 0;
+
+/*! @function getOutputQueue
+    @abstract Gets the IOOutputQueue object created by createOutputQueue().
+    @result Returns a reference to the output queue object created by
+    createOutputQueue(). 
+*/
+
+    virtual IOOutputQueue * getOutputQueue() const;
+
+/*! @function getPacketBufferConstraints
+    @abstract Gets the controller's packet buffer constraints.
+    @discussion Called by start() to obtain the constraints on the
+    memory buffer for each mbuf packet allocated through allocatePacket().
+    Drivers can override this method to specify the buffer constraints
+    imposed by their bus master hardware. Note that outbound packets,
+    those that originate from the network stack, are not currently
+    subject to the constraints reported here.
+    @param constraints A pointer to an IOPacketBufferConstraints
+    structure that this method is expected to initialize.
+    See IOPacketBufferConstraints structure definition. 
+*/
+
+    virtual void getPacketBufferConstraints(
+                    IOPacketBufferConstraints * constraints) const;
+
+/*! @function allocatePacket
+    @abstract Allocates a packet with a data buffer that is larger than
+    or equal to the size specified.
+    @discussion This method will always return a single mbuf unless the
+    size requested (plus the alignment padding) is greater than MCLBYTES.
+    The data buffer for the mbuf (or an mbuf chain) returned is aligned
+    according to the constraints reported by getPacketBufferConstraints().
+    The length fields in each mbuf returned are set by this method, thus
+    allowing the mbuf to be passed directly to an IOMbufMemoryCursor object
+    in order to convert the mbuf to a physical address scatter-gather list.
+    @param size The minimum size of the data buffer for the mbuf
+    packet allocated.
+    @result Returns an mbuf packet, or 0 if allocation failed. 
+*/
+
+    virtual mbuf_t allocatePacket(UInt32 size);
+
+/*! @function copyPacket
+    @abstract Allocates a new packet, containing data copied from an
+    existing source packet.
+    @discussion The source packet is not modified by this method.
+    @param m The source packet.
+    @param size The number of bytes to copy. If set to 0, then the
+    entire data buffer from the source packet is copied.
+    @result Returns a new packet containing the same data as the source packet. 
+*/
+
+    virtual mbuf_t copyPacket(const mbuf_t m, UInt32 size = 0);
+
+/*! @function replacePacket
+    @abstract Allocates a new packet to replace an existing packet, the
+    existing packet is then returned.
+    @param mp A handle to the existing packet.
+    @param size If size is 0, then the new packet shall have the same buffer
+    size as the original packet that is being replaced. Otherwise, the new
+    packet shall have the buffer size specified by this value.
+    @result If packet allocation was successful, then a replacement will
+    take place and the original packet will be returned. Otherwise, 0
+    is returned, and the original packet will be left untouched.
+*/
+
+    virtual mbuf_t replacePacket(mbuf_t * mp, UInt32 size = 0);
+
+/*! @function replaceOrCopyPacket
+    @abstract A helper method that combines the functionality of
+    copyPacket() and replacePacket() to process a packet containing
+    a received frame.
+    @discussion This method will either make a copy or replace the existing
+    packet, whichever is more time efficient. Packets containing small frames
+    are copied, otherwise they are replaced. If replaced, then the existing
+    packet is returned, and a new packet with the same buffer size is created
+    to take its place. If copied, the existing packet is left intact, while a
+    copy is returned that will hold a copy of the data from the source packet.
+    @param mp A handle to the existing packet that may be replaced.
+    @param length The number of bytes received held in the packet.
+        Must be greater than zero.
+    @param replaced Pointer to a return value that is set to true to indicate
+        that the existing packet was replaced, or false to indicate that the
+        existing packet was not replaced, and a copy was created.
+    @result Returns a replacement or a copy of the existing packet, or 0 if packet
+    allocation failed. 
+*/
+
+    virtual mbuf_t replaceOrCopyPacket(mbuf_t * mp,
+                                       UInt32   length,
+                                       bool *   replaced);
+
+    enum {
+        kDelayFree = 0x01
+    };
+
+/*! @function freePacket
+    @abstract Releases the packet given back to the free pool.
+    @param m The packet to be freed.
+    @param options When kDelayFree option is set, then the packet
+    provided to this function will be queued on the free packet queue.
+    A subsequent call to releaseFreePackets() will release all queued
+    packets by making a single BSD function call. Without the kDelayFree
+    option, the packet provided will be released immediately. 
+*/
+
+    virtual void freePacket(mbuf_t, IOOptionBits options = 0);
+
+/*! @function releaseFreePackets
+    @abstract Releases all packets held in the free packet queue.
+    @discussion The free packet queue is not protected by a lock. This
+    function must be called in a single-threaded manner with respect to
+    all calls to freePacket() with the kDelayFree option set.
+    @result Returns the number of packets queued and released. 
+*/
+
+    virtual UInt32 releaseFreePackets();
+
+/*! @enum TCP/IPChecksums
+    @abstract TCP/IP checksums that may be supported by the
+    hardware.
+    @constant kChecksumFamilyTCPIP A value that describes the collection
+    of TCP/IP checksums.
+    @constant kChecksumIP An IP header checksum.
+    @constant kChecksumTCP A TCP checksum that covers the TCP header and TCP
+    data.
+    @constant kChecksumUDP A UDP checksum that covers the UDP header and UDP
+    data.
+    @constant kChecksumTCPNoPseudoHeader A TCP checksum that covers the TCP
+    header and the TCP data, but the pseudo header is not included in the
+    checksum computation. A partial 16-bit checksum value must be provided
+    to allow the protocol stacks to calculate and verify the final checksum.
+    This type of checksum is not currently supported on the output path.
+    @constant kChecksumUDPNoPseudoHeader A UDP checksum that covers the UDP
+    header and the UDP data, but the pseudo header is not included in the
+    checksum computation. A partial 16-bit checksum value must be provided
+    to allow the protocol stacks to calculate and verify the final checksum.
+    This type of checksum is not currently supported on the output path.
+    @constant kChecksumTCPSum16 The hardware has a simple checksum engine
+    that can perform a TCP style ones complement sum of 16-bit words over 
+    a certain range of bytes in a packet. The hardware does not have the
+    ability to scan for IP or TCP headers, and the driver must pass/get
+    additional parameter(s) to or from the protocol stack to coordinate
+    the checksumming effort. 
+*/
+
+    enum {
+        kChecksumFamilyTCPIP         = 0x00000001,
+        kChecksumIP                  = 0x0001,
+        kChecksumTCP                 = 0x0002,
+        kChecksumUDP                 = 0x0004,
+        kChecksumTCPNoPseudoHeader   = 0x0100,
+        kChecksumUDPNoPseudoHeader   = 0x0200,
+        kChecksumTCPSum16            = 0x1000
+    };
+
+/*! @function getChecksumSupport
+    @abstract Gets checksums that are supported by the network controller for
+    the given checksum family.
+    @discussion A network controller that is capable of inserting and verifying
+    checksums on output and input packets, should override this method and
+    advertise its capability in order to assist or offload the software checksum
+    calculations performed by the protocol stacks.
+    @param checksumMask A pointer to the mask of supported checksums returned
+    by this method.
+    @param checksumFamily A value that specifies the checksum family.
+    @param isOutput Set to true to query the support for checksum insertion on
+    output packets, or false to query the support for checksum verification
+    on input packets. Controllers that have symmetric hardware checksum support 
+    can return a fixed checksum mask value, and ignore this argument.
+    @result Default return is kIOReturnUnsupported. Controllers that override
+    this method must return kIOReturnSuccess. Any other return value will be
+    interpretated as a lack of checksum support, regardless of the value
+    returned through the first argument. 
+*/
+
+    virtual IOReturn getChecksumSupport( UInt32 * checksumMask,
+                                         UInt32   checksumFamily,
+                                         bool     isOutput );
+
+/*! @function setChecksumResult
+    @abstract Encodes a received packet with the checksum result reported
+    by the hardware.
+    @discussion A network controller that can verify the checksum(s) for a
+    received packet, should call this method to encode the result on the
+    packet, before passing it up towards the protocol stacks.
+    @param packet An mbuf containing a packet that has been checksummed by
+    the hardware.
+    @param checksumFamily A value that specifies the checksum family.
+    @param resultMask A mask of all checksums that were checked or computed.
+    Setting a bit implies that the driver is able to report the result of
+    the checksum computation, by asserting the validity of the checksum,
+    or by returning a partial checksum value.
+    @param validMask A mask of all checksums are were computed and verified
+    by the hardware as valid. Certain types of checksum performed by the
+    hardware are inheritely incomplete, and therefore should never be marked
+    as valid. A checksum cannot be marked valid unless it has also been
+    checked.
+    @param param0 Optional parameter 0, defaults to 0.
+    @param param1 Optional parameter 1, defaults to 0.
+    @result Returns true if the checksum family is valid and the packet has been
+    encoded with the checksum result provided, false otherwise. 
+*/
+
+    virtual bool setChecksumResult( mbuf_t  packet,
+                                    UInt32  checksumFamily,
+                                    UInt32  resultMask,
+                                    UInt32  validMask,
+                                    UInt32  param0 = 0,
+                                    UInt32  param1 = 0 );
+
+/*! @function getChecksumDemand
+    @abstract Fetches the demand for hardware checksum computation and insertion
+    for the given packet before it is transmitted on the network.
+    @discussion A network controller that can insert a checksum for output
+    packets must call this method to obtain the set of checksums that it must
+    compute, and insert into the appropriate fields in the given output packet.
+    @param packet An mbuf containing a packet that may be missing one or more
+    checksums in the specified checksum family.
+    @param checksumFamily A value that specifies the checksum family.
+    @param demandMask A mask of all checksums that the hardware must compute
+    and insert into the appropriate checksum fields in the packet.
+    @param param0 Optional parameter 0, defaults to 0.
+    @param param1 Optional parameter 1, defaults to 0. 
+*/
+
+    virtual void getChecksumDemand( const mbuf_t packet,
+                                    UInt32       checksumFamily,
+                                    UInt32 *     demandMask,
+                                    void *       param0 = 0,
+                                    void *       param1 = 0 );
+
+/*! @function publishMediumDictionary
+    @abstract Publishes a dictionary of IONetworkMedium objects to
+    advertise the media selection supported by the network controller.
+    @discussion Called by drivers to publish their medium dictionary.
+    Each entry in the dictionary is an IONetworkMedium object that
+    represents a single medium that is supported by the controller.
+    This method will make a copy of the dictionary provided, then add
+    the copy to the driver's property table. The dictionary provided
+    can be released by the caller upon returning from this method.
+    It is permissible to call this method multiple times, which may be
+    necessary if the hardware's media capability changes dynamically.
+    However, if the capability is static, which is often the case,
+    then a driver will typically call this method only once from
+    its start() method.
+
+    Several methods depend on the presence of a medium dictionary.
+    They should be called after the medium dictionary has been
+    published. Those methods are:
+        setSelectedMedium()
+        getSelectedMedium()
+        getMediumDictionary()
+        copyMediumDictionary()
+
+    @param mediumDict A dictionary of IONetworkMedium objects.
+    @result Returns true if the dictionary is valid, and was successfully
+    exported to the property table, false otherwise. 
+*/
+
+    virtual bool publishMediumDictionary(const OSDictionary * mediumDict);
+
+/*! @function setSelectedMedium
+    @abstract Designates an entry in the published medium dictionary as
+    the current selected medium.
+    @discussion After the driver has configured the hardware to select
+    one of its supported media types, it must call this method to inform
+    its parent about the change that has occurred. IONetworkController
+    will update a property in the registry to reflect the current selection.
+    @param medium A medium object representing the current selection.
+    @result Returns true if the property table update was successful,
+    false if the update failed, or if the medium provided does not match
+    any entry from the published medium dictionary. 
+*/
+
+    virtual bool setSelectedMedium(const IONetworkMedium * medium);
+    bool setCurrentMedium(const IONetworkMedium * medium);
+
+/*! @function setLinkStatus
+    @abstract Reports the link status and the active medium.
+    @discussion Drivers must call this method when a link change is
+    detected. IONetworkController will update the link status properties
+    in the registry, and generate an event to inform the upper layers
+    about the change.
+    @param status Link status bits.
+           See IONetworkMedium for the definition of the link status bits.
+    @param activeMedium An object in the published medium dictionary
+    	   that represents the active medium. This may not be the same as
+    	   the selected medium. Set this to 0 if the link is inactive.
+    @param speed Link speed in units of bits per second. If zero, then
+           the link speed is taken from the medium object provided.
+    @param data An OSData containing any additional link parameter that
+           the driver wishes to publish to the registry.
+    @result Returns true if all link properties were successfully updated,
+    false otherwise. 
+*/
+
+    virtual bool setLinkStatus(
+                           UInt32                  status,
+                           const IONetworkMedium * activeMedium = 0,
+                           UInt64                  speed        = 0,
+                           OSData *                data         = 0);
+
+/*! @function systemWillShutdown
+    @abstract Handles system shutdown and restart notifications.
+    @discussion Overrides <code>IOService::systemWillShutdown</code> in order
+    to notify network clients that the power-managed controller should be disabled.
+    As a result, drivers can expect their <code>disable</code> method to be called
+    before system shutdown or restart. This implementation is synchronous and can
+    block before calling <code>IOService::systemWillShutdown</code> and return.
+    @param See <code>IOService::systemWillShutdown</code>.
+*/
+
+    virtual void systemWillShutdown( IOOptionBits specifier );
+
+    /* Override IOService::setAggressiveness() */
+
+    virtual IOReturn setAggressiveness(
+            unsigned long type, unsigned long newLevel );
+
+protected:
+
+/*! @function free
+    @abstract Frees the IONetworkController object.
+    @discussion Frees the IONetworkController object by releasing all
+    allocated resources, followed by a call to super::free(). 
+*/
+
+    virtual void free();
+
+/*! @function registerWithPolicyMaker
+    @abstract Implemented by controller drivers to register with
+    the power management policy-maker.
+    @discussion Drivers that are able to power manage their hardware
+    should override this method and register with the policy-maker
+    provided by calling IOService::registerPowerDriver().
+    IONetworkController will call this method before the initial
+    attempt is made to attach a client.
+    @param policyMaker The policy-maker chosen to manage power for
+    this network controller.
+    @result Returns kIOReturnSuccess on success, kIOReturnUnsupported if the
+    driver does not support power management, or an appropriate error
+    return code. The default return is kIOReturnUnsupported. */
+
+    virtual IOReturn registerWithPolicyMaker(IOService * policyMaker);
+
+/*! @function createWorkLoop
+    @abstract Method called by IONetworkController prior to the initial
+    getWorkLoop() call.
+    @discussion Before IONetworkController calls getWorkLoop() in its
+    start() method, it will call createWorkLoop() to make sure that a
+    subclass that wants to create a workloop, will do so before its
+    first use.
+    @result Returns true to indicate success, false otherwise. Returning false
+    will fail IONetworkController::start(). 
+*/
+
+    virtual bool createWorkLoop();
+
+/*! @function prepare
+    @abstract Prepares the controller before an IOService is created and
+    attached as a client.
+    @discussion This method is called by attachInterface() or
+    attachDebuggerClient() to prepare the controller before the new client
+    object is attached. This method will call publishProperties() to publish
+    controller capabilities and properties that may be used by client objects.
+    However, publishProperties() will be called only once, even if prepare()
+    is called multiple times. This method call is synchronized by the
+    workloop's gate.
+    @result Returns kIOReturnSuccess on success, or an error code otherwise.
+        Returning an error will fail the client attach. 
+*/
+
+    virtual IOReturn prepare();
+
+/*! @function publishProperties
+    @abstract Publishes controller properties and capabilities.
+    @discussion Called by IONetworkController to discover controller
+    properties, and publish them to the property table in the I/O Kit
+    Registry. This method is called once by prepare().
+    @result Returns true if all properties were discovered and published
+    successfully, false otherwise. Returning false will prevent client
+    objects from attaching to the controller, since a property that
+    a client relies upon may be missing. */
+
+    virtual bool publishProperties();
+
+/*! @function getCommandClient
+    @abstract Gets the command client object.
+    @discussion Methods called on the workloop context to service a
+    client request can call this method to get the client object that
+    initiated the command.
+    @result Returns the command client. If the caller is not running on the
+    workloop thread, or if the thread does not have the workloop's gate
+    closed, then 0 is returned. 
+*/
+
+    virtual OSObject * getCommandClient() const;
+
+/*! @function handleOpen
+    @abstract Handles a client open.
+    @discussion This method handles a client open on the controller object. IOService
+    calls this method with the arbitration lock held. Subclasses
+    should not override this method.
+    @param client The client that is attempting to open the controller.
+    @param options Not used. See IOService.
+    @param argument Not used. See IOService.
+    @result Returns true to accept the client open, false to refuse it. 
+*/
+
+    virtual bool handleOpen(IOService *  client,
+                            IOOptionBits options,
+                            void *       argument);
+
+/*! @function handleClose
+    @abstract Handles a client close.
+    @discussion This method handles a close from one of the client objects. IOService
+    calls this method with the arbitration lock held. Subclasses
+    should not override this method.
+    @param client The client that is closing the controller.
+    @param options Not used. See IOService. 
+*/
+
+    virtual void handleClose(IOService * client, IOOptionBits options);
+
+/*! @function handleIsOpen
+    @abstract Queries whether a client has an open on the controller.
+    @discussion This method is always called by IOService with the
+    arbitration lock held. Subclasses should not override this method.
+    @result Returns true if the specified client, or any client if none (0) is
+    specified, presently has an open on this object. 
+*/
+
+    virtual bool handleIsOpen(const IOService * client) const;
+
+/*! @function enable
+    @abstract A request from an interface client to enable the controller.
+    @discussion This method is called by an interface client to enable the controller.
+    Upon receiving this command, the controller driver must bring up the
+    hardware and become ready to transmit and receive packets. A driver
+    should also delay the allocation of most runtime resources until this
+    method is called in order to conserve system resources. This method call
+    is synchronized by the workloop's gate.
+    @param interface The interface client object that requested the enable.
+    @result Returns kIOReturnUnsupported. Drivers that override this method must
+    return kIOReturnSuccess on success, or an error code otherwise. 
+*/
+
+    virtual IOReturn enable(IONetworkInterface * interface);
+
+/*! @function disable
+    @abstract A request from an interface client to disable the controller.
+    @discussion This method is called by an interface client to disable the controller.
+    This method should stop the hardware and disable hardware interrupt
+    sources. Any resources allocated by enable() should also be deallocated.
+    This method call is synchronized by the workloop's gate.
+    @param interface The interface object that requested the disable.
+    @result kIOReturnUnsupported. Drivers that override this method must
+    return Returns kIOReturnSuccess on success, or an error code otherwise. 
+*/
+
+    virtual IOReturn disable(IONetworkInterface * interface);
+
+/*! @function attachInterface
+    @abstract Attaches a new interface client object.
+    @discussion This method creates a new interface object and attaches it to the
+    controller. The createInterface() method is called to perform
+    the interface allocation and initialization, followed by a call to 
+    configureInterface() to configure it. Subclasses can override those
+    two methods to customize the interface client attached. Drivers will
+    usually call this method from start(), after they are ready to process
+    client requests. Since most drivers will have a single interface
+    client, this method will likely be called only once.
+    @param interface Upon success (return value is true), the
+    interface object will be written to the handle provided.
+    @param doRegister If true, then registerService() is called to register
+    the interface, which will trigger the matching process, and will ultimately
+    cause the interface to become registered with the data link layer.
+    Drivers that wish to delay the registration can set doRegister to false,
+    and call registerService() on the interface object when the controller
+    becomes ready. This allows the driver to attach an interface without
+    making its services available to the rest of the system.
+    @result Returns true on success, false otherwise. 
+*/
+
+    virtual bool attachInterface(IONetworkInterface ** interface,
+                                 bool                  doRegister = true);
+
+/*! @function detachInterface
+    @abstract Detaches an interface client object.
+    @discussion This method will verify that the object provided is indeed
+    an IONetworkInterface instance, and then call its terminate() method.
+    Note that an interface object will close and detach from its 
+    controller after the data link layer has removed all references to 
+    all data structures exposed by the interface. The interface object
+    should be released following this call.
+    @param interface An interface object to be detached and terminated.
+    @param sync If true, the interface is terminated synchronously.
+           This may cause this method to block for an indeterminate
+           amount of time. */
+
+    virtual void detachInterface(IONetworkInterface * interface,
+                                 bool                 sync = false);
+
+/*! @function createInterface
+    @abstract Creates a new network interface object.
+    @discussion This method is called by attachInterface() to perform
+    allocation and initialization of a new interface object. A subclass of
+    IONetworkController must implement this method and return a matching
+    interface object. For example, IOEthernetController's implementation
+    will return an IOEthernetInterface object when createInterface() is
+    called.
+    @result Returns a newly allocated and initialized interface object. 
+*/
+
+    virtual IONetworkInterface * createInterface() = 0;
+
+/*! @function configureInterface
+    @abstract Configures a newly created network interface object.
+    @discussion This method configures an interface object that was created by
+    createInterface(). Subclasses can override this method to customize
+    and examine the interface object that will be attached to the
+    controller as a client.
+    @param interface The interface object to be configured.
+    @result Returns true if the operation was successful, false otherwise
+    (this will cause attachInterface() to fail and return 0). 
+*/
+
+    virtual bool configureInterface(IONetworkInterface * interface);
+
+/*! @function createOutputQueue
+    @abstract Creates an IOOutputQueue to handle output packet queueing,
+    and also to resolve contention for the controller's transmitter from
+    multiple client threads.
+    @discussion This method is called by start() to create an IOOutputQueue object to
+    handle output packet queueing. The default implementation will always
+    return 0, hence no output queue will be created. A driver may override
+    this method and return a subclass of IOOutputQueue. IONetworkController
+    will keep a reference to the queue created, and will release this
+    object when IONetworkController is freed. Also see getOutputQueue().
+    @result Returns a newly allocated and initialized IOOutputQueue object. 
+*/
+
+    virtual IOOutputQueue * createOutputQueue();
+
+/*! @function enable
+    @abstract An enable request from an IOKernelDebugger client.
+    @discussion Drivers that provide debugging support may either override
+    this method and set up the hardware to support the polled-mode send and
+    receive methods, receivePacket() and sendPacket(), or override the base
+    enable() and disable() methods that take an IOService argument.
+    @param debugger The IOKernelDebugger client requesting the enable.
+    @result Returns kIOReturnSuccess. Drivers must return kIOReturnSuccess
+    on success, or an error otherwise. 
+*/
+
+    virtual IOReturn enable(IOKernelDebugger * debugger);
+
+/*! @function disable
+    @abstract A disable request from an IOKernelDebugger client.
+    @discussion Drivers that provide debugging support may either override
+    this method to disable support for the polled-mode send and receive
+    methods, or override the base enable() and disable() methods that
+    take an IOService argument.
+    @param debugger The IOKernelDebugger client requesting the disable.
+    @result Returns kIOReturnSuccess. Drivers must return kIOReturnSuccess
+    on success, or an error otherwise. 
+*/
+
+    virtual IOReturn disable(IOKernelDebugger * debugger);
+
+/*! @function attachDebuggerClient
+    @abstract Attaches a new IOKernelDebugger client object.
+    @discussion This method allocates an IOKernelDebugger object and attaches it as
+    a client. Having a debugger client implies that the controller
+    supports kernel debugging, and therefore must implement the two
+    polled-mode methods that are called by the debugger client. See
+    sendPacket() and receivePacket(). Only a single debugger client
+    should be attached to each controller.
+    @param debuggerP A handle that will return the new
+           IOKernelDebugger object created.
+    @result Returns true on success, false otherwise. 
+*/
+
+    virtual bool attachDebuggerClient(IOKernelDebugger ** debuggerP);
+
+/*! @function detachDebuggerClient
+    @abstract Detaches an IOKernelDebugger client object.
+    @discussion This method detaches and terminates the IOKernelDebugger client object
+    provided. A synchronous termination is issued, and this method will
+    return after the debugger client has been terminated. The debugger
+    client should be released following this call.
+    @param debugger The IOKernelDebugger object to be detached and
+           terminated. If the argument provided is NULL or is not an
+           IOKernelDebugger, this method will return immediately. 
+*/
+
+    virtual void detachDebuggerClient(IOKernelDebugger * debugger);
+
+/*! @function reserveDebuggerLock
+    @abstract Takes the global debugger lock.
+    @discussion This method should not be used. Instead, call the
+    lock() method provided by IOKernelDebugger. 
+*/
+
+    void reserveDebuggerLock();
+
+/*! @function releaseDebuggerLock
+    @abstract Releases the global debugger lock.
+    @discussion This method should not be used. Instead, call the
+    unlock() method provided by IOKernelDebugger. 
+*/
+
+    void releaseDebuggerLock();
+
+/*! @function receivePacket
+    @abstract Debugger polled-mode receive handler.
+    @discussion This method must be implemented by a driver that supports
+    kernel debugging. After a debugger client has been attached through
+    attachDebuggerClient(), this method will be called by the debugger
+    client to poll for an incoming packet when the kernel debugger is active.
+    This method may be called from the primary interrupt context, and the
+    implementation must avoid any memory allocation, and must never block.
+    The receivePacket() method in IONetworkController is used as a placeholder,
+    it performs no useful action, and should not be called. A driver that
+    attaches a debugger client must override this method.
+    @param pkt Address of a receive buffer where the received packet should
+           be stored. This buffer has room for 1518 bytes.
+    @param pktSize Address where the number of bytes received must be
+           recorded. Set this to zero if no packets were received during
+           the timeout interval.
+    @param timeout The maximum amount of time in milliseconds to poll for
+           a packet to arrive before this method must return. 
+*/ 
+
+    virtual void receivePacket(void * pkt, UInt32 * pktSize, UInt32 timeout);
+
+/*! @function sendPacket
+    @abstract Debugger polled-mode transmit handler.
+    @discussion This method must be implemented by a driver that supports
+    kernel debugging. After a debugger client has been attached through
+    attachDebuggerClient(), this method will be called by the debugger
+    to send an outbound packet only when the kernel debugger is active.
+    This method may be called from the primary interrupt context, and the
+    implementation must avoid any memory allocation, and must never block.
+    The sendPacket() method in IONetworkController is used as a placeholder,
+    it performs no useful action, and should not be called. A driver that
+    attaches a debugger client must override this method.
+    @param pkt Pointer to a transmit buffer containing the packet to be
+        sent on the network.
+    @param pktSize The size of the transmit buffer in bytes. 
+*/
+
+    virtual void sendPacket(void * pkt, UInt32 pktSize);
+
+    // Virtual function padding
+    OSMetaClassDeclareReservedUnused( IONetworkController,  0);
+    OSMetaClassDeclareReservedUnused( IONetworkController,  1);
+    OSMetaClassDeclareReservedUnused( IONetworkController,  2);
+    OSMetaClassDeclareReservedUnused( IONetworkController,  3);
+    OSMetaClassDeclareReservedUnused( IONetworkController,  4);
+    OSMetaClassDeclareReservedUnused( IONetworkController,  5);
+    OSMetaClassDeclareReservedUnused( IONetworkController,  6);
+    OSMetaClassDeclareReservedUnused( IONetworkController,  7);
+    OSMetaClassDeclareReservedUnused( IONetworkController,  8);
+    OSMetaClassDeclareReservedUnused( IONetworkController,  9);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 10);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 11);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 12);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 13);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 14);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 15);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 16);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 17);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 18);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 19);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 20);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 21);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 22);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 23);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 24);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 25);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 26);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 27);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 28);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 29);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 30);
+    OSMetaClassDeclareReservedUnused( IONetworkController, 31);
+};
+
+#endif /* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* !_IONETWORKCONTROLLER_H */
+
diff --git a/i386/include/IOKit/network/IONetworkData.h b/i386/include/IOKit/network/IONetworkData.h
new file mode 100644
index 0000000..c0d2de4
--- /dev/null
+++ b/i386/include/IOKit/network/IONetworkData.h
@@ -0,0 +1,477 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IONETWORKDATA_H
+#define _IONETWORKDATA_H
+
+#define IONetworkParameter IONetworkData  // FIXME
+
+/*! @enum NetworkDataAccessTypes
+    @abstract Constants that describe access types.
+    @constant kIONetworkDataAccessTypeRead  Read access.
+    @constant kIONetworkDataAccessTypeWrite Write access.
+    @constant kIONetworkDataAccessTypeReset Reset access.
+    @constant kIONetworkDataAccessTypeSerialize Serialization access. 
+*/
+
+enum {
+    kIONetworkDataAccessTypeRead        = 0x01,
+    kIONetworkDataAccessTypeWrite       = 0x02,
+    kIONetworkDataAccessTypeReset       = 0x04,
+    kIONetworkDataAccessTypeSerialize   = 0x08,
+    kIONetworkDataAccessTypeMask        = 0xff
+};
+
+/*! @define kIONetworkDataBasicAccessTypes
+    @discussion The default access types supported by an IONetworkData
+    object. Allow read() and serialize(). */
+
+#define kIONetworkDataBasicAccessTypes \
+       (kIONetworkDataAccessTypeRead | kIONetworkDataAccessTypeSerialize)
+
+/*! @enum NetworkDataBufferTypes
+    @abstract The types of data buffers that can be managed by an IONetworkData object.
+    @constant kIONetworkDataBufferTypeInternal An internal data buffer
+              allocated by the init() method.
+    @constant kIONetworkDataBufferTypeExternal An external (persistent) data
+              buffer.
+    @constant kIONetworkDataBufferTypeNone No data buffer. The only useful 
+              action perfomed by an IONetworkData object with this buffer type 
+              is to call the access notification handler. 
+*/
+
+enum {
+    kIONetworkDataBufferTypeInternal = 0,
+    kIONetworkDataBufferTypeExternal,
+    kIONetworkDataBufferTypeNone
+};
+
+/*! @defined kIONetworkDataBytes
+    @abstract A property of IONetworkData objects.
+    @discussion The kIONetworkDataBytes property is an OSData that describes
+        the data buffer of an IONetworkData object. This property is present
+        only if kIONetworkDataAccessTypeSerialize access is supported. 
+*/
+
+#define kIONetworkDataBytes             "Data"
+
+/*! @defined kIONetworkDataAccessTypes
+    @abstract A property of IONetworkData objects.
+    @discussion The kIONetworkDataAccessTypes property is an OSNumber that
+        describes the supported access types of an IONetworkData object. 
+*/
+
+#define kIONetworkDataAccessTypes       "Access Types"
+
+/*! @defined kIONetworkDataSize
+    @abstract A property of IONetworkData objects.
+    @discussion The kIONetworkDataSize property is an OSNumber that
+        describes the size of the data buffer of an IONetworkData object. 
+*/
+
+#define kIONetworkDataSize              "Size"
+
+#ifdef KERNEL
+
+#include <libkern/c++/OSSymbol.h>
+#include <libkern/c++/OSSerialize.h>
+
+/*! @class IONetworkData
+    @abstract An object that manages a fixed-size named buffer.
+    @discussion An IONetworkData object manages a fixed-size named buffer.
+    This object provides external access methods that can be used to
+    access the contents of the data buffer. In addition, serialization
+    is supported, and therefore this object can be added to a property
+    table to publish the data object. An unique name must be assigned to
+    the object during initialization. An OSSymbol key will be created
+    based on the assigned name, and this key can be used when the object
+    is added to a dictionary.
+
+    The level of access granted to the access methods can be restricted,
+    by specifying a set of supported access types when the object is
+    initialized, or modified later by calling setAccessTypes(). By default,
+    each IONetworkData object created will support serialization, and will
+    also allow its data buffer to be read through the read() access method.
+
+    An access notification handler, in the form of a 'C' function, can
+    be registered to receive a call each time the data buffer is accessed
+    through an access method. Arguments provided to the handler will identify 
+    the data object and the type of access that triggered the notification.
+    The handler can therefore perform lazy update of the data buffer until
+    an interested party tries to read or serialize the data. The notification
+    handler can also take over the default action performed by the access
+    methods when the buffer type is set to kIONetworkDataBufferTypeNone.
+    This will prevent the access methods from accessing the data buffer,
+    and allow the handler to override the access protocol.
+
+    This object is primarily used by IONetworkInterface to export interface
+    properties to user space. 
+*/
+
+
+class IONetworkData : public OSObject
+{
+    OSDeclareDefaultStructors( IONetworkData )
+
+public:
+
+/*! @typedef Action
+    @abstract Defines a C function that may be called by an IONetworkData object
+    when one of its access methods is called.
+    @param target The target of the notification.
+    @param param A parameter that was provided when the notification
+           handler was registered.
+    @param data The IONetworkData object being accessed, and the
+           sender of the notification.
+    @param accessType A bit will be set indicating the type of access
+           which triggered the notification.
+    @param buffer Pointer to the accessor's buffer. Only valid for
+           read() and write() accesses.
+    @param bufferSize Pointer to the size of the accessor's buffer.
+    @param offset An offset from the start of the data buffer to begin
+           reading or writing. 
+*/
+
+    typedef IOReturn (*Action)(void *           target,
+                               void *           param,
+                               IONetworkData *  data,
+                               UInt32           accessType,
+                               void *           buffer,
+                               UInt32 *         bufferSize,
+                               UInt32           offset);
+
+protected:
+    const OSSymbol *  _key;        // key associated with this object.
+    UInt32            _access;     // supported access types.
+    void *            _buffer;     // Data buffer.
+    UInt32            _bufType;    // buffer type
+    UInt32            _size;       // data buffer size.
+    void *            _tapTarget;  // target for access notification.
+    Action            _tapAction;  // the function to call.
+    void *            _tapParam;   // arbitrary notification param.
+
+    struct ExpansionData { };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *	_reserved;
+
+
+/*! @function free
+    @abstract Frees the IONetworkData object. 
+*/
+
+    virtual void free();
+
+/*! @function writeBytes
+    @abstract Writes to the data buffer with data from a source buffer
+    provided by the caller.
+    @param srcBuffer Pointer to a source buffer provided by the caller.
+    @param srcBufferSize The size of the source buffer.
+    @param writeOffset A byte offset from the start of the data buffer
+           to begin writting.
+    @result Returns true if the operation was successful, false otherwise. 
+*/
+
+    virtual bool writeBytes(const void * srcBuffer,
+                            UInt32       srcBufferSize,
+                            UInt32       writeOffset = 0);
+
+/*! @function readBytes
+    @abstract Reads from the data buffer and copies the data to a destination
+    buffer provided by the caller.
+    @param dstBuffer Pointer to the destination buffer.
+    @param dstBufferSize Pointer to an integer containing the size of the
+    destination buffer. And is overwritten by this method with the actual
+    number of bytes copied to the destination buffer.
+    @param readOffset A byte offset from the start of the data buffer
+           to begin reading.
+    @result Returns true if the operation was successful, false otherwise. 
+*/
+
+    virtual bool readBytes(void *   dstBuffer,
+                           UInt32 * dstBufferSize,
+                           UInt32   readOffset = 0) const;
+
+/*! @function clearBuffer
+    @abstract Clears the data buffer by filling it with zeroes.
+    @result Returns true if the operation was successful, false otherwise. 
+*/
+
+    virtual bool clearBuffer();
+
+public:
+
+/*! @function withInternalBuffer
+    @abstract Factory method that constructs and initializes an
+    IONetworkData object with an internal data buffer.
+    @param name A name to assign to this object.
+    @param bufferSize The number of bytes to allocate for the internal data
+           buffer.
+    @param accessTypes The initial supported access types.
+    @param target The notification target.
+    @param action The notification action.
+    @param param A parameter to pass to the notification action.
+    @result Returns an IONetworkData object on success, or 0 otherwise. 
+*/
+
+    static IONetworkData *
+           withInternalBuffer(const char * name,
+                              UInt32       bufferSize,
+                              UInt32       accessTypes = 
+                                           kIONetworkDataBasicAccessTypes,
+                              void *       target = 0,
+                              Action       action = 0,
+                              void *       param  = 0);
+
+/*! @function withExternalBuffer
+    @abstract Factory method that constructs and initializes an
+    IONetworkData object with an external data buffer.
+    @param name A name to assign to this object.
+    @param bufferSize The size of the external data buffer.
+    @param externalBuffer Pointer to the external data buffer.
+    @param accessTypes The initial supported access types.
+    @param target The notification target.
+    @param action The notification action.
+    @param param A parameter to pass to the notification action.
+    @result Returns an IONetworkData object on success, or 0 otherwise. 
+*/
+
+    static IONetworkData *
+           withExternalBuffer(const char * name,
+                              UInt32       bufferSize,
+                              void *       externalBuffer,
+                              UInt32       accessTypes =
+                                           kIONetworkDataBasicAccessTypes,
+                              void *       target = 0,
+                              Action       action = 0,
+                              void *       param  = 0);
+
+/*! @function withNoBuffer
+    @abstract Factory method that constructs and initializes an
+    IONetworkData object without a data buffer. 
+    @discussion The notification handler
+    must intervene when the IONetworkData is accessed.
+    @param name A name to assign to this object.
+    @param bufferSize The size of the phantom data buffer.
+    @param accessTypes The initial supported access types.
+    @param target The notification target.
+    @param action The notification action.
+    @param param A parameter to pass to the notification action.
+    @result Returns an IONetworkData object on success, or 0 otherwise. 
+*/
+
+    static IONetworkData * withNoBuffer(const char * name,
+                                        UInt32       bufferSize,
+                                        UInt32       accessTypes,
+                                        void *       target,
+                                        Action       action,
+                                        void *       param = 0);
+
+/*! @function init
+    @abstract Initializes an IONetworkData object.
+    @param name A name to assign to this object.
+    @param bufferType The type of buffer associated with this object.
+    @param bufferSize The size of the data buffer.
+    @param externalBuffer Pointer to an external data buffer.
+    @param accessTypes The initial supported access types.
+           Can be later modified by calling setAccessTypes().
+    @param target The notification target.
+    @param action The notification action.
+    @param param A parameter to pass to the notification action.
+    @result Returns true if initialized successfully, false otherwise. 
+*/
+
+    virtual bool init(const char * name,
+                      UInt32       bufferType,
+                      UInt32       bufferSize,
+                      void *       externalBuffer = 0,
+                      UInt32       accessTypes    =
+                                   kIONetworkDataBasicAccessTypes,
+                      void *       target         = 0,
+                      Action       action         = 0,
+                      void *       param          = 0);
+
+/*! @function setAccessTypes
+    @abstract Sets the types of access that are permitted on the data buffer.
+    @param types A mask of access types indicating the supported access
+                 types. 
+*/
+
+    virtual void setAccessTypes(UInt32 types);
+
+/*! @function setNotificationTarget
+    @abstract Registers a C function to handle access notifications sent
+    from this object.
+    @discussion A notification is sent by an IONetworkData object to the
+    registered notification handler, when an access method is called to
+    modify the contents of the data buffer.
+    @param target The first parameter passed to the notification handler.
+    @param action A pointer to a C function that will handle the notification.
+           If 0, then notification is disabled.
+    @param param An optional parameter passed to the notification handler. 
+*/
+
+    virtual void setNotificationTarget(void *  target,
+                                       Action  action,
+                                       void *  param = 0);
+
+/*! @function getBuffer
+    @abstract Gets a pointer to the data buffer.
+    @result Returns a pointer to the data buffer. Returns 0 if the buffer type is
+            kIONetworkDataBufferTypeNone. 
+*/
+
+    virtual const void *     getBuffer() const;
+
+/*! @function getBufferType
+    @abstract Gets the type of data buffer managed by this object.
+    @result Returns a constant that describes the type of the data buffer. 
+*/
+
+    virtual UInt32           getBufferType() const;
+
+/*! @function getAccessTypes
+    @abstract Gets the types of data access supported by this object.
+    @result Returns a mask of supported access types. 
+*/
+
+    virtual UInt32           getAccessTypes() const;
+
+/*! @function getNotificationTarget
+    @abstract Gets the first parameter that will be passed to the access
+              notification handler.
+    @result Returns the first parameter that will be passed to the access notification
+            handler. 
+*/
+
+    virtual void *           getNotificationTarget() const;
+
+/*! @function getNotificationAction
+    @abstract Gets the C function that was registered to handle access
+              notifications sent from this object.
+    @result Returns a pointer to a C function, or 0 if notification is disabled. 
+*/
+
+    virtual Action           getNotificationAction() const;
+
+/*! @function getNotificationParameter
+    @abstract Gets the parameter that will be passed to the access
+              notification handler.
+    @result Returns the parameter that will be passed to the access notification
+            handler. 
+*/
+
+    virtual void *           getNotificationParameter() const;
+
+/*! @function getKey
+    @abstract Gets a unique OSSymbol key associated with this object.
+    @discussion During initialization, IONetworkData will create an
+    OSSymbol key based on its assigned name.
+    @result Returns an OSSymbol key that was generated from the name assigned to
+    this object. 
+*/
+
+    virtual const OSSymbol * getKey() const;
+
+/*! @function getSize
+    @abstract Gets the size of the data buffer.
+    @result Returns the size of the data buffer managed by this object in bytes. 
+*/
+
+    virtual UInt32           getSize() const;
+
+/*! @function reset
+    @abstract An access method that resets the data buffer.
+    @discussion This method handles an external request to reset the data buffer.
+    If notification is enabled, then the notification handler is called
+    after the data buffer has been cleared.
+    @result Returns kIOReturnSuccess on success,
+            kIOReturnNotWritable if reset access is not permitted,
+            or an error from the notification handler. 
+*/
+
+    virtual IOReturn reset();
+
+/*! @function read
+    @abstract An access method that reads from the data buffer.
+    @discussion This method handles an external request to read from the data buffer
+    and copy it to the destination buffer provided by the accessor.
+    If notification is enabled, then the notification handler is called
+    before the data buffer is copied to the destination buffer. The 
+    notification handler may use this opportunity to intervene and
+    to update the contents of the data buffer.
+    @param dstBuffer Pointer to the destination buffer.
+    @param dstBufferSize Pointer to an integer containing the size of the
+    destination buffer. And is overwritten by this method to the actual number
+    of bytes copied to the destination buffer.
+    @param readOffset An offset from the start of the source data buffer to
+    begin reading.
+    @result Returns kIOReturnSuccess on success,
+            kIOReturnBadArgument if any of the arguments provided is invalid,
+            kIOReturnNotReadable if read access is not permitted,
+            or an error from the notification handler. 
+*/
+
+    virtual IOReturn read(void *   dstBuffer,
+                          UInt32 * dstBufferSize,
+                          UInt32   readOffset = 0);
+
+/*! @function write
+    @abstract An access method that writes to the data buffer.
+    @discussion This method handles an external request to write to the data buffer
+    from a source buffer provided by the accessor. After checking that
+    the data object supports write accesses, the data buffer is updated
+    if it exists. Then the registered notification handler is called.
+    @param srcBuffer Pointer to the source buffer.
+    @param srcBufferSize The number of bytes to write to the data buffer.
+    @param writeOffset An offset from the start of the destination data buffer
+    to begin writing.
+    @result Returns kIOReturnSuccess on success,
+            kIOReturnBadArgument if any of the arguments provided is invalid,
+            kIOReturnNotWritable if write access is not permitted,
+            or an error from the notification handler. 
+*/
+
+    virtual IOReturn write(void *  srcBuffer,
+                           UInt32  srcBufferSize,
+                           UInt32  writeOffset = 0);
+
+/*! @function serialize
+    @abstract Serializes the IONetworkData object.
+    @discussion If notification is enabled, then the notification
+    handler is called just before the data buffer is serialized.
+    @param s An OSSerialize object.
+    @result Returns true on success, false otherwise. 
+*/
+
+    virtual bool serialize(OSSerialize * s) const;
+
+    // Virtual function padding
+    OSMetaClassDeclareReservedUnused( IONetworkData,  0);
+    OSMetaClassDeclareReservedUnused( IONetworkData,  1);
+    OSMetaClassDeclareReservedUnused( IONetworkData,  2);
+    OSMetaClassDeclareReservedUnused( IONetworkData,  3);
+};
+
+#endif /* KERNEL */
+
+#endif /* !_IONETWORKDATA_H */
diff --git a/i386/include/IOKit/network/IONetworkInterface.h b/i386/include/IOKit/network/IONetworkInterface.h
new file mode 100644
index 0000000..af02364
--- /dev/null
+++ b/i386/include/IOKit/network/IONetworkInterface.h
@@ -0,0 +1,1104 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IONETWORKINTERFACE_H
+#define _IONETWORKINTERFACE_H
+
+/*! @defined kIONetworkInterfaceClass
+    @abstract The name of the IONetworkInterface class. 
+*/
+
+#define kIONetworkInterfaceClass  "IONetworkInterface"
+
+/*! @defined kIONetworkData
+    @abstract A property of IONetworkInterface
+        objects. 
+    @discussion The kIONetworkData property has an OSDictionary value and is a container for the
+        set of IONetworkData objects managed by the interface.
+        Each entry in the dictionary is a key/value pair consisting of
+        the network data name, and an OSDictionary describing the
+        contents of the network data. 
+*/
+
+#define kIONetworkData            "IONetworkData"
+
+/*! @defined kIOInterfaceType
+    @abstract A property of IONetworkInterface objects.
+    @discussion The kIOInterfaceType property has an OSNumber value that specifies the type of
+        network interface that this interface represents. The type
+        constants are defined in bsd/net/if_types.h. 
+*/
+
+#define kIOInterfaceType          "IOInterfaceType"
+
+/*! @defined kIOMaxTransferUnit
+    @abstract A property of IONetworkInterface objects.
+    @discussion The kIOMaxTransferUnit property has an OSNumber value that specifies the maximum
+        transfer unit for the interface in bytes.
+*/
+
+#define kIOMaxTransferUnit        "IOMaxTransferUnit"
+
+/*! @defined kIOMediaAddressLength
+    @abstract A property of IONetworkInterface objects.
+    @discussion The kIOMediaAddressLength property has an OSNumber value that specifies the size of the
+        media address in bytes. 
+*/
+
+#define kIOMediaAddressLength     "IOMediaAddressLength"
+
+/*! @defined kIOMediaHeaderLength
+    @abstract A property of IONetworkInterface objects.
+    @discussion The kIOMediaHeaderLength property has an OSNumber value that specifies the size of the
+        media header in bytes. 
+*/
+
+#define kIOMediaHeaderLength      "IOMediaHeaderLength"
+
+/*! @defined kIOInterfaceFlags
+    @abstract A property of IONetworkInterface objects.
+    @discussion The kIOInterfaceFlags property has an OSNumber value that specifies the current value
+        of the interface flags. The flag constants are defined in
+        bsd/net/if.h. 
+*/
+
+#define kIOInterfaceFlags         "IOInterfaceFlags"
+
+/*! @defined kIOInterfaceExtraFlags
+    @abstract A property of IONetworkInterface objects.
+    @discussion The kIOInterfaceExtraFlags property has an OSNumber value that specifies the current
+        value of the interface extra flags. The extra flag constants are
+        defined in bsd/net/if.h. 
+*/
+
+#define kIOInterfaceExtraFlags    "IOInterfaceExtraFlags"
+
+/*! @defined kIOInterfaceUnit
+    @abstract A property of IONetworkInterface objects.
+    @discussion The kIOInterfaceUnit property has an OSNumber value that describes the unit number
+        assigned to the interface object. 
+*/
+
+#define kIOInterfaceUnit          "IOInterfaceUnit"
+
+/*! @defined kIOInterfaceState
+    @abstract A property of IONetworkInterface objects.
+    @discussion The kIOInterfaceState property has an OSNumber value that describes the current state
+        of the interface object. This property is not exported to BSD via
+        the ifnet structure. 
+*/
+
+#define kIOInterfaceState         "IOInterfaceState"
+
+/*! @defined kIOInterfaceNamePrefix
+    @abstract A property of IONetworkInterface objects.
+    @discussion The kIOInterfaceNamePrefix property has an OSString value that describes the string
+        prefix for the BSD name assigned to the interface. 
+*/
+
+#define kIOInterfaceNamePrefix    "IOInterfaceNamePrefix"
+
+/*! @defined kIOPrimaryInterface
+    @abstract A property of IONetworkInterface objects.
+    @discussion The kIOInterfaceNamePrefix property has an OSBoolean value that describes whether the
+        interface is the primary or the built-in network interface. 
+*/
+
+#define kIOPrimaryInterface       "IOPrimaryInterface"
+
+/*! @defined kIOBuiltin
+    @abstract kIOBuiltin is a property of IONetworkInterface
+        objects. It has an OSBoolean value.
+    @discussion The kIOBuiltin property describes whether the
+        interface is built-in. 
+*/
+
+#define kIOBuiltin                "IOBuiltin"
+
+/*! @defined kIOLocation
+    @abstract kIOLocation is a property of IONetworkInterface
+        objects. It has an OSString value.
+    @discussion The kIOLocation property describes the physical 
+        location of built-in interfaces. 
+*/
+
+#define kIOLocation               "IOLocation"
+
+/*! @enum InterfaceObjectStates
+    @discussion Constants used to encode the state of the interface object.
+   @constant kIONetworkInterfaceRegisteredState The interface object has
+        registered with the data link layer.
+    @constant kIONetworkInterfaceOpenedState One or more clients have an
+        open on the interface object.
+    @constant kIONetworkInterfaceDisabledState The interface is temporarily
+        unable to service its clients. This will occur when the network
+        controller that is servicing the interface has entered a low power
+        state that renders it unusable. 
+*/
+
+enum {
+    kIONetworkInterfaceRegisteredState  = 0x1,
+    kIONetworkInterfaceOpenedState      = 0x2,
+    kIONetworkInterfaceDisabledState    = 0x4
+};
+
+/*
+ * Kernel
+ */
+#if defined(KERNEL) && defined(__cplusplus)
+
+#include <IOKit/IOService.h>
+#include <IOKit/network/IONetworkData.h>
+#include <IOKit/network/IONetworkStats.h>
+#include <IOKit/network/IONetworkMedium.h>
+#include <net/kpi_interface.h>
+
+class  IONetworkController;
+class  IONetworkStack;
+class  IOCommandGate;
+
+/*! @typedef IOOutputAction
+    @discussion Prototype for an output packet handler that will process
+    all outbound packets sent to the interface from the data link layer.
+    An output handler is registered with the interface by calling
+    registerOutputHandler().
+    @param m A packet mbuf.
+    @param param A parameter for the output request. */
+
+typedef UInt32 (OSObject::*IOOutputAction)(mbuf_t, void * param);
+
+/*! @typedef BPF_FUNC
+    @discussion Prototype for the BPF tap handler. This will disappear
+    when the correct DLIL header file is included. */
+
+typedef int (*BPF_FUNC)(struct ifnet *, struct mbuf *);
+
+// Network event types recognized by inputEvent().
+//
+enum {
+    /* DLIL defined event, argument must be a pointer to a
+       kern_event_msg structure. */
+    kIONetworkEventTypeDLIL      = 0xff000001,
+
+    /* Link up event, no argument */
+    kIONetworkEventTypeLinkUp    = 0xff000002,
+
+    /* Link down event, no argument */
+    kIONetworkEventTypeLinkDown  = 0xff000003,
+
+    /* Wake on LAN support changed, no argument */
+    kIONetworkEventWakeOnLANSupportChanged = 0xff000004
+};
+
+/*! @class IONetworkInterface
+    @abstract Abstract class that manages the connection between an IONetworkController and the data link interface layer.
+    @discussion An IONetworkInterface object manages the connection between
+    an IONetworkController and the data link interface layer (DLIL).
+    All interactions between the controller and DLIL must go through an
+    interface object. Any data structures that are required by DLIL for a
+    particular interface type shall be allocated and mantained by the
+    interface object. IONetworkInterface is an abstract class that must be
+    extended by a concrete subclass to specialize for a particular network
+    type.
+
+    Although most drivers will allocate a single interface object,
+    it is possible for multiple interfaces to be attached to a single
+    controller. This controller driver will be responsible for arbitrating
+    access among its multiple interface clients.
+    
+    IONetworkInterface also maintains a dictionary of IONetworkData
+    objects containing statistics structures. Controller drivers can
+    ask for a particular data object by name and update the
+    statistics counters within directly. This dictionary is added to
+    the interface's property table and is visible outside of the kernel. 
+*/
+
+class IONetworkInterface : public IOService
+{
+    OSDeclareAbstractStructors( IONetworkInterface )
+
+    friend class IONetworkStack;
+
+private:
+    IONetworkController *   _controller;
+    ifnet_t                 _backingIfnet;
+    IORecursiveLock *       _ifLock;
+    OSSet *                 _clientSet;
+    OSNumber *              _stateBits;
+	bpf_packet_func         _inputFilterFunc;
+    bpf_packet_func         _outputFilterFunc;
+	OSObject *              _outTarget;
+    IOOutputAction          _outAction;
+    UInt32                  _clientVar[4];
+    OSDictionary *          _dataDict;
+    mbuf_t                  _inputQHead;
+    mbuf_t                  _inputQTail;
+    UInt32                  _inputQCount;
+
+    struct ExpansionData {
+		int				unit;
+		int				type;
+		int				mtu;
+		int				flags;
+		int				eflags;
+		int				addrlen;
+		int				hdrlen;
+		IONetworkStats  driverStats;
+		IONetworkStats  lastDriverStats;
+		struct ifnet_stat_increment_param inputDeltas;
+		IOLock			*detachLock;
+                char                          *remote_NMI_pattern;
+                unsigned int                   remote_NMI_len;
+    };
+
+    ExpansionData *         _reserved;
+
+	void _syncFromBackingIfnet() const;
+	void _syncToBackingIfnet();
+
+    bool _syncNetworkDataDict();
+    bool _setInterfaceProperty(UInt32   value,
+                               UInt32   mask,
+                               UInt32   bytes,
+                               void *   addr,
+                               char *   name);
+
+    SInt32 syncSIOCSIFMEDIA(IONetworkController * ctlr, struct ifreq * ifr);
+    SInt32 syncSIOCGIFMEDIA(IONetworkController * ctlr, struct ifreq * ifr, unsigned long cmd);
+    SInt32 syncSIOCSIFMTU(IONetworkController * ctlr, struct ifreq * ifr);
+	
+    static int  performGatedCommand(void *, void *, void *, void *, void *);
+    static errno_t  ioctl_shim(ifnet_t ifp, unsigned long cmd, void * data);
+    static errno_t  set_bpf_tap_shim(ifnet_t ifn, bpf_tap_mode mode, bpf_packet_func func);
+    static int  output_shim(ifnet_t ifp, mbuf_t);
+	void DLIL_INPUT(mbuf_t m_head);
+	static void  detach_shim(ifnet_t ifp);
+    static void powerChangeHandler(void *, void *, void *);
+
+public:
+
+/*! @function isPrimaryInterface
+    @abstract Queries whether the interface object provided represents
+    the "primary" network interface for the system.
+    @result Returns true if the interface provided is the primary inteface,
+    false otherwise. 
+*/
+
+    virtual bool isPrimaryInterface() const;
+
+/*! @function init
+    @abstract Initializes an IONetworkInterface object.
+    @discussion Initializes instance variables, and allocates resources.
+    @param controller A network controller object that will service
+    the interface object being initialized.
+    @result Returns true on success, false otherwise. 
+*/
+
+    virtual bool init( IONetworkController * controller );
+
+/*! @function isRegistered
+    @abstract Returns true if the interface has been registered with
+    the data link layer.
+    @discussion Once registered, the interface will be assigned a
+    BSD name (such as en0), and a kIOBSDNameKey property is added to the
+    property table containing this name. Calling this method performs
+    the same function as checking for the kIONetworkInterfaceRegisteredState
+    bit in the value returned by getInterfaceState().
+    @result Returns true if interface is registered. Returns false if the data link layer
+    has no references to this network interface, which implies that either the
+    interface has yet to attach to the data link layer, or the interface has
+    been detached. 
+*/
+
+    virtual bool isRegistered() const;
+
+/*! @function getInterfaceState
+    @abstract Reports the current state of the interface object by returning
+    the interface state flags.
+    @result Returns the interface state flags. 
+*/
+
+    virtual UInt32 getInterfaceState() const;
+
+/*! @function matchPropertyTable
+    @abstract Overrides the implementation in IOService to
+    implement family-specific matching.
+    @discussion When the gIOLocationMatchKey property is present in the
+    dictionary provided, then fail the match unless the kIOBSDNameKey property
+    is found. This is to prevent a premature match when hunting for a root
+    device for BSD. The presence of the kIOBSDNameKey property indicates that
+    the interface has registered with BSD, and is a valid candidate for
+    matching against the gIOLocationMatchKey property. If the
+    gIOLocationMatchKey property is absent, then this method will always
+    return true.
+    @param table The dictionary of properties to match against.
+    @param score Pointer to the current driver's probe score, not used.
+    @result Returns true for a positive match, false otherwise. 
+*/
+
+    virtual bool matchPropertyTable( OSDictionary * table,
+                                     SInt32       * score );
+
+/*! @function getController
+    @abstract Returns the provider, an IONetworkController object, that
+    is servicing this interface object.
+    @discussion This is the same controller object that was supplied as
+    an argument to the init() method.
+    @result Returns the IONetworkController object that is providing service to
+    this interface object. 
+*/
+
+    virtual IONetworkController * getController() const;
+
+/*! @function inputPacket
+    @abstract Submits a single packet received from the network to the data link layer.
+    @discussion This method is called by the network controller to submit a single packet
+    received from the network to the data link layer.  The packet received by this method may be added to an input
+    queue on the interface object, which the controller can use to postpone
+    the packet handoff to the upper layers, until all received packets have
+    been transferred to the input queue. A subsequent call to flushInputQueue(),
+    will transfer the entire contents of the queue to the data link layer,
+    by making a single call to dlil_input(). Other methods that can be used
+    to manage the input queue are flushInputQueue() and clearInputQueue().
+    This input queue is not protected by a lock. Access to the queue by the
+    controller must be serialized, otherwise its use must be avoided.
+    @param m The mbuf containing the received packet.
+    @param length Specify the size of the received packet in the mbuf.
+           The mbuf length fields are updated with this value. If zero,
+           then the mbuf length fields are not updated.
+    @param options Options defined by inputPacket() that the caller
+           can use to specify this method call.
+    @param param A parameter provided by the caller. Not used by
+           IONetworkInterface.
+    @result Returns the number of packets that were submitted to the data link layer,
+            or 0 if the packet was queued. 
+*/
+
+    virtual UInt32 inputPacket(mbuf_t,
+                               UInt32        length  = 0,
+                               IOOptionBits  options = 0,
+                               void *        param   = 0);
+
+/*! @enum InputOptionQueuePacket
+    @discussion The option bits that can be specified
+    in the options argument when calling inputPacket().
+    @constant kInputOptionQueuePacket Keep the packet provided in the
+    input packet queue. No packets are sent to the data link layers,
+    and the caller's thread will not venture outside the interface
+    object. Calls to inputPacket() must be serialized. 
+*/
+
+    enum {
+        kInputOptionQueuePacket = 0x1
+    };
+
+/*! @function flushInputQueue
+    @abstract Sends all packets held in the input queue to the data
+    link layer.
+    @discussion Remove all packets from the input queue and
+    send them to the data link layer by calling dlil_input(). This
+    method should be used in connection with the inputPacket() method,
+    to flush the input queue after inputPacket() was used to queue up
+    some number of received packets. See inputPacket() and clearInputQueue().
+    @result Returns the number of packets that were submitted to the data link layer.
+            May be zero if the queue was empty. 
+*/
+
+    virtual UInt32 flushInputQueue();
+
+/*! @function clearInputQueue
+    @abstract Removes and discards all packets in the input queue.
+    @discussion This method removes all packets from the input queue and
+    releases them back to the free mbuf pool. Also see flushInputQueue().
+    @result Returns the number of packets freed. 
+*/
+
+    virtual UInt32 clearInputQueue();
+
+/*! @function inputEvent
+    @abstract Sends an event to the data link layer.
+    @discussion This method can be used by the network controller to
+    send an event to the data link layer.
+    @param type A constant describing the event type.
+    @param data Data associated with the event.
+    @result Returns true if the event was delivered, false if the event type
+    specified is invalid, or if the event delivery was unsuccesful. 
+*/
+
+    virtual bool inputEvent(UInt32 type, void * data);
+
+/*! @function registerOutputHandler
+    @abstract Registers a target/action to handle output packets.
+    @discussion The interface object will forward all output packets,
+    received from the data link layer, to the output handler registered
+    through this method. The default target and action are set by the init()
+    method to the controller, and the handler returned by the controller's
+    getOutputHandler() method. Once the interface becomes registered with
+    the data link layer, this method will return false and will reject any
+    further changes.
+    @param target Target object that implements the output handler.
+    @param action The function that will process output packets.
+    @result Returns true if the target/action provided was accepted,
+    false otherwise. 
+*/
+
+    virtual bool registerOutputHandler(OSObject *      target,
+                                       IOOutputAction  action);
+
+/*! @function getNamePrefix
+    @abstract Returns a string containing the prefix to use when
+    creating a BSD name for this interface.
+    @discussion The BSD name for each interface object is generated by
+    concatenating a string returned by this method, with an unique
+    unit number assigned by IONetworkStack.
+    A concrete subclass of IONetworkInterface must implement this method
+    and enforce a consistent name for all of its instances.
+    @result Returns a pointer to a constant C string.
+*/
+
+    virtual const char * getNamePrefix() const = 0;
+
+/*! @function getInterfaceType
+    @abstract Gets the interface type.
+    @discussion This method returns the value in the if_type field in the ifnet structure.
+    @result Returns a constant defined in bsd/net/if_types.h header file
+    that describes the interface type. 
+*/
+
+    virtual UInt8  getInterfaceType() const;
+
+/*! @function getMaxTransferUnit
+    @abstract Gets the maximum transfer unit for this interface.
+    @discussion This method returns the value in the if_mtu field in the ifnet structure.
+    @result Returns the interface MTU size in bytes. 
+*/
+
+    virtual UInt32 getMaxTransferUnit() const;
+
+/*! @function getFlags
+    @abstract Gets the value of the interface flags.
+    @discussion This method returns the value in the if_flags field in the ifnet structure.
+    @result Returns the value of the interface flags. 
+*/
+
+    virtual UInt16 getFlags() const;
+
+/*! @function getExtraFlags
+    @abstract Gets the value of the interface extra flags.
+    @discussion This method returns the value in the if_eflags field in the ifnet structure.
+    @result Returns the value of the interface extra flags. 
+*/
+
+    virtual UInt32 getExtraFlags() const;
+
+/*! @function getMediaAddressLength
+    @abstract Gets the size of the media (MAC-layer) address.
+    @discussion This method returns the value in the if_addrlen field in the ifnet structure.
+    @result Returns the size of the media address in bytes. 
+*/
+
+    virtual UInt8  getMediaAddressLength() const;
+
+/*! @function getMediaHeaderLength
+    @abstract Gets the size of the media header.
+    @discussion This method returns the value in the if_hdrlen field in the ifnet structure.
+    @result Returns the size of the media header in bytes. 
+*/
+
+    virtual UInt8  getMediaHeaderLength() const;
+
+/*! @function getUnitNumber
+    @abstract Gets the unit number assigned to this interface object.
+    @discussion This method returns the value in the if_unit field in the ifnet structure.
+    @result Returns the assigned interface unit number. 
+*/
+
+    virtual UInt16 getUnitNumber() const;
+
+/*! @function addNetworkData
+    @abstract Adds an IONetworkData object to a dictionary managed by
+    the interface.
+    @param aData An IONetworkData object to be added to a dictionary
+    managed by the interface. This object is retained by the dictionary.
+    @result Returns true if the operation was successful, false otherwise. 
+*/
+
+    virtual bool addNetworkData(IONetworkData * aData);
+
+/*! @function removeNetworkData
+    @abstract Removes an entry from the IONetworkData dictionary
+    managed by the interface.
+    @discussion This method removes an entry from the IONetworkData dictionary
+    managed by the interface. The removed object is released.
+    @param aKey A unique OSSymbol identifying the IONetworkData object
+           to be removed from the dictionary.
+    @result Returns true if the operation was successful, false otherwise. 
+*/
+
+    virtual bool removeNetworkData(const OSSymbol * aKey);
+
+/*! @function removeNetworkData
+    @abstract Removes an entry from the IONetworkData dictionary
+    managed by the interface.
+    @discussion This method removes an entry from the IONetworkData dictionary
+    managed by the interface. The removed object is released.
+    @param aKey A unique string identifying the IONetworkData object
+           to be removed from the dictionary.
+    @result Returns true if the operation was successful, false otherwise. 
+*/
+
+    virtual bool removeNetworkData(const char * aKey);
+
+/*! @function getNetworkData
+    @abstract Gets an IONetworkData object from the interface that is
+    associated with the given key.
+    @param aKey The unique string identifying the IONetworkData object to be
+    returned to caller.
+    @result Returns a reference to the matching IONetworkData object,
+    or 0 if no match was found.
+*/
+
+    virtual IONetworkData * getNetworkData(const char * aKey) const;
+
+/*! @function getNetworkData
+    @abstract Gets an IONetworkData object from the interface that is
+    associated with the given key.
+    @param aKey The unique OSSymbol identifying the IONetworkData object to be
+    returned to caller.
+    @result Returns a reference to the matching IONetworkData object,
+    or 0 if no match was found. 
+*/
+
+    virtual IONetworkData * getNetworkData(const OSSymbol * aKey) const;
+
+/*! @function setProperties
+    @abstract Handles a request to set network interface properties from
+    kernel or non-kernel clients. 
+    @discussion For non-kernel clients, the preferred
+    access mechanism is through a user client connection.
+    @param properties An OSDictionary containing a collection of
+    properties.
+    @result Returns kIOReturnUnsupported if the interface did not
+    recognize any of the properties provided. Otherwise, the return
+    code will be kIOReturnSuccess to indicate no errors, or an
+    IOReturn error code to indicate that an error occurred while
+    handling one of the properties. 
+*/
+
+    virtual IOReturn setProperties( OSObject * properties );
+
+    // FIXME - Compatibility methods (to be removed)
+    IONetworkData * getParameter(const char * aKey) const;
+	bool setExtendedFlags(UInt32 flags, UInt32 clear = 0);
+
+    virtual IOReturn message( UInt32 type, IOService * provider, void * argument );
+
+/*! @function debuggerRegistered
+    @abstract Tells the IONetworkInterface that this interface will be used
+    by the debugger.
+*/
+    void debuggerRegistered(void);
+
+protected:
+
+/*! @function setInterfaceType
+    @abstract Sest the interface type.
+    @discussion Both the if_type field in the ifnet structure, and the
+    kIOInterfaceType property are updated with the value provided.
+    @param type A constant defined in bsd/net/if_types.h header file
+    that describes the interface type.
+    @result Returns true if the update was successful, false otherwise. 
+*/
+
+    virtual bool setInterfaceType(UInt8 type);
+
+/*! @function setMaxTransferUnit
+    @abstract Sets the maximum transfer unit for this interface.
+    @discussion Both the if_mtu field in the ifnet structure, and the
+    kIOMaxTransferUnit property are updated with the value provided.
+    @param mtu The interface MTU size in bytes.
+    @result Returns true if the update was successful, false otherwise. 
+*/
+
+    virtual bool setMaxTransferUnit(UInt32 mtu);
+
+/*! @function setFlags
+    @abstract Performs a read-modify-write operation on the current
+    interface flags value.
+    @discussion See bsd/net/if.h header file for the definition of the
+    flag constants. Both the if_flags field in the ifnet structure, and
+    the kIOInterfaceFlags property are updated with the value provided.
+    @param flags The bits that should be set.
+    @param clear The bits that should be cleared. If 0, then non
+    of the flags are cleared and the result is formed by OR'ing the
+    original flags value with the new flags.
+    @result Returns true if the update was successful, false otherwise. 
+*/
+
+    virtual bool setFlags(UInt16 flags, UInt16 clear = 0);
+
+/*! @function setExtraFlags
+    @abstract Performs a read-modify-write operation on the current
+    interface extra flags value.
+    @discussion See bsd/net/if.h header file for the definition of the
+    extra flag constants. Both the if_eflags field in the ifnet structure,
+    and the kIOInterfaceExtraFlags property are updated with the value
+    provided.
+    @param flags The bits that should be set.
+    @param flags The bits that should be set.
+    @param clear The bits that should be cleared. If 0, then non
+    of the flags are cleared and the result is formed by OR'ing the
+    original flags with the new flags.
+    @result Returns true if the update was successful, false otherwise. 
+*/
+
+    virtual bool setExtraFlags(UInt32 flags, UInt32 clear = 0);
+
+/*! @function setMediaAddressLength
+    @abstract Sets the size of the media (MAC-layer) address.
+    @discussion Both the if_addrlen field in the ifnet structure, and the
+    kIOMediaAddressLength property are updated with the value provided.
+    @param length The size of the media address in bytes.
+    @result Returns true if the update was successful, false otherwise.
+*/
+
+    virtual bool setMediaAddressLength(UInt8 length);
+
+/*! @function setMediaHeaderLength
+    @abstract Sets the size of the media header.
+    @discussion Both the if_hdrlen field in the ifnet structure, and the
+    kIOMediaHeaderLength property are updated with the value provided.
+    @param length The size of the media header in bytes.
+    @result Returns true if the update was successful, false otherwise. 
+*/
+
+    virtual bool setMediaHeaderLength(UInt8 length);
+
+/*! @function setUnitNumber
+    @abstract Assigns a unique unit number to this interface.
+    @discussion This method is called by IONetworkStack before the
+    interface is registered with the data link layer, to assign a
+    unique unit number to the interface object. Both the if_unit field
+    in the ifnet structure, and the kIOInterfaceUnit property are updated
+    with the value provided.
+    @param unit The unit number assigned to this interface object.
+    @result Returns true if the update was successful, false otherwise. 
+*/
+
+    virtual bool setUnitNumber(UInt16 unit);
+
+/*! @function free
+    @abstract Frees the IONetworkInterface object.
+    @discussion Resource allocated by init() are released, and
+    clearInputQueue() is called to ensure that the input queue is empty.
+*/
+
+    virtual void free();
+
+/*! @function handleOpen
+    @abstract Handles a client open on the interface.
+    @discussion This method is called by IOService::open() with the
+    arbitration lock held, and must return true to accept the client open.
+    This method will in turn call handleClientOpen() to qualify the client
+    requesting the open. Since the controller is opened by the interface
+    in a lazy fashion, the interface may also perform an open on the
+    controller before this method returns. If the controller was opened,
+    then controllerDidOpen() is called to notify interested subclasses.
+    Subclasses should not override this method.
+    @param client The client object that requested the open.
+    @param options Options passed to IOService::open().
+    @param argument Argument passed to IOService::open().
+    @result Returns true to accept the client open, false otherwise. 
+*/
+
+    virtual bool handleOpen(IOService *  client,
+                            IOOptionBits options,
+                            void *       argument);
+
+/*! @function handleClose
+    @abstract Handles a client close on the interface.
+    @discussion This method is called by IOService::close() with the
+    arbitration lock held. This method will in turn call handleClientClose()
+    to notify interested subclasses about the client close. If this represents
+    the last close, then the interface will also close the controller before
+    this method returns. The controllerWillClose() method will be called before
+    closing the controller. Subclasses should not override this method.
+    @param client The client object that requested the close.
+    @param options Options passed to IOService::close().
+*/
+
+    virtual void handleClose(IOService * client, IOOptionBits options);
+
+/*! @function handleIsOpen
+    @abstract Queries whether a client has an open on the interface.
+    @discussion This method is always called by IOService with the
+    arbitration lock held. Subclasses should not override this method.
+    @result Returns true if the specified client, or any client if none (0) is
+    specified, presently has an open on this object. 
+*/
+
+    virtual bool handleIsOpen(const IOService * client) const;
+
+/*! @function lock
+    @abstract Takes the network interface lock.
+    @discussion This method takes the recursive lock that protects the interface
+    state. All updates to the interface state and to the ifnet structure
+    must be performed while holding this lock. This call must be balanced
+    by a subsequent call to unlock(). 
+*/
+
+    virtual void lock();
+
+/*! @function unlock
+    @abstract Releases the network interface lock.
+    @discussion This method releases the recursive lock that protects the interface
+    state to balance a previous lock() call. 
+*/
+
+    virtual void unlock();
+
+/*! @function controllerDidOpen
+    @abstract Sends a notification that the interface has opened the network
+    controller.
+    @discussion This method is called by handleOpen() to notify subclasses that the
+    controller has been opened. The open on the controller is done when
+    the interface receives the initial open request from a client.
+    Subclasses can override this method and inspect the controller before
+    allowing the client open. The implementation in the subclass must first
+    call the method in super and check the return value. This method is
+    called with our arbitration lock held, hence issuing I/O to the
+    controller must be avoided to eliminate the possibility of a
+    deadlock.
+    @param controller The controller that was opened.
+    @result Must return true in order for handleOpen() to accept 
+    the client open. If the return is false, then the controller will be
+    closed and the client open will be refused. 
+*/
+
+    virtual bool controllerDidOpen(IONetworkController * controller);
+
+/*! @function controllerWillClose
+    @abstract Sends a notification that the interface will close the network
+    controller.
+    @discussion This method is called by handleClose() after receiving a close from the
+    last client, and just before the controller is closed. Subclasses
+    can override this method to perform any cleanup action before the 
+    controller is closed. This method is called with our arbitration lock
+    held, hence issuing I/O to the controller must be avoided to eliminate
+    the possibility of a deadlock.
+    @param controller The controller that is about to be closed. 
+*/
+
+    virtual void controllerWillClose(IONetworkController * controller);
+
+/*! @function performCommand
+    @abstract Handles an ioctl command sent to the network interface.
+    @discussion This method handles socket ioctl commands sent to the
+    network interface from DLIL.
+    IONetworkInterface handles commands that are common for all network
+    interface types. A subclass of IONetworkInterface may override this
+    method to override the command handling in IONetworkInterface, or
+    to extend the command processing to handle additional commands,
+    and then call super for any commands not handled in the subclass.
+    The ioctl commands handled by IONetworkInterface are
+        SIOCGIFMTU (Get interface MTU size),
+        SIOCSIFMTU (Set interface MTU size),
+        SIOCSIFMEDIA (Set media), and
+        SIOCGIFMEDIA (Get media and link status).
+    @param controller The controller object.
+    @param cmd The ioctl command code.
+    @param arg0 Command argument 0. Generally a pointer to an ifnet structure
+        associated with the interface.
+    @param arg1 Command argument 1.
+    @result Returns a BSD return value defined in bsd/sys/errno.h. 
+*/
+
+    virtual SInt32 performCommand(IONetworkController * controller,
+                                  unsigned long         cmd,
+                                  void *                arg0,
+                                  void *                arg1);
+
+public:
+
+/*! @function getIfnet
+    @abstract Gets the ifnet_t allocated by the interface object.
+    @discussion Reveal the interface's ifnet_t.  The ifnet_t is managed
+		primarily by IONetworkInterface, however sub-classes or drivers
+        can use this method to get a reference to the ifnet_t object for
+        interface KPI calls.
+    @result Returns the ifnet_t object that is attached to the datalink layer.
+*/
+
+    virtual ifnet_t getIfnet() const ;
+
+protected:
+
+/*! @function initIfnet
+    @abstract Initializes the ifnet structure given.
+    @discussion A concrete subclass must override this method and initialize
+    the ifnet structure given. The implementation in the subclass must call
+    super before it returns, to allow IONetworkInterface to complete the
+    initialization, and to insert the BSD shim functions implemented in
+    IONetworkInterface to the appropriate function pointer fields in the
+    ifnet structure. IONetworkInterface will call this method during its
+    init() method. Subclasses are encouraged to use the ifnet accessor
+    methods to update the ifnet structure when possible, since this will
+    ensure that properties in the registry will also be updated to reflect
+    any changes made.
+    @param ifp Pointer to an ifnet structure obtained earlier through
+               the getIfnet() method call.
+    @result Returns true on success, false otherwise. 
+*/
+
+    virtual bool initIfnet(struct ifnet * ifp);
+
+/*! @function handleClientOpen
+    @abstract Handles a client open on the interface.
+    @discussion This method is called by handleOpen() to handle an open from a client object.
+    Unlike handleOpen(), subclasses may override this method to catch an open
+    request from a client. This method is called with the arbitration lock held.
+    @param client The client object requesting the open.
+    @param options Options passed to IONetworkInterface::handleOpen().
+    @param argument Argument passed to IONetworkInterface::handleOpen().
+    @result Returns true to accept the client open, false to refuse it. 
+*/
+
+    virtual bool handleClientOpen(IOService *  client,
+                                  IOOptionBits options,
+                                  void *       argument);
+
+/*! @function handleClientClose
+    @abstract Handles a client close on the interface.
+    @discussion This method is called by handleClose() to handle a close from a client object.
+    Unlike handleClose(), subclasses may override this method to catch a close
+    reuqest from a client. This method is called with the arbitration lock held.
+    @param client The client object requesting the close.
+    @param options Options passed to IONetworkInterface::handleClose(). 
+*/
+
+    virtual void handleClientClose(IOService *  client,
+                                   IOOptionBits options);
+
+/*! @function newUserClient
+    @abstract Creates a connection for a non kernel client.
+    @discussion This method creates a new IOUserClient to service a connection to a
+    non kernel client.
+    @param owningTask The mach task requesting the connection.
+    @param security_id A token representing the access level for the task.
+    @param type A constant specifying the type of connection to be created.
+    An IONetworkUserClient object is created if the type specified is
+    kIONetworkUserClientTypeID.
+    @param handler The IOUserClient object returned.
+    @result Returns kIOReturnSuccess if an IONetworkUserClient was created,
+    kIOReturnNoMemory for a memory allocation error, or
+    kIOReturnBadArgument if the type specified is unknown. 
+*/
+
+    virtual IOReturn newUserClient(task_t           owningTask,
+                                   void *           security_id,
+                                   UInt32           type,
+                                   IOUserClient **  handler);
+
+/*! @function setInterfaceState
+    @abstract Updates the interface object state flags.
+    @discussion The kIOInterfaceState property is updated with the value
+    provided.
+    @param flags The bits that should be set.
+    @param clear The bits that should be cleared.
+    @result Returns the resulting interface state flags following any changes
+    made by this method. 
+*/
+
+    virtual UInt32 setInterfaceState( UInt32 set, UInt32 clear = 0 );
+
+/*! @function powerStateWillChangeTo
+    @abstract Handles a notification that the network controller servicing
+    this interface object is about to transition to a new power state.
+    @discussion This method will call the controllerWillChangePowerState() method
+    on the controller's work loop context to prepare for the power state change.
+    Subclasses should not override this method.
+    @param flags Flags that describe the capability of the controller in the new
+    power state.
+    @param stateNumber An index to a state in the network controller's
+    power state array that the controller is switching to.
+    @param policyMaker A reference to the network controller's policy-maker,
+    and is also the originator of this notification.
+    @result The return will always be IOPMAckImplied to indicate that the
+    preparation for the power change has already completed when this method
+    returns. 
+*/
+
+    virtual IOReturn powerStateWillChangeTo( IOPMPowerFlags  flags,
+                                             unsigned long   stateNumber,
+                                             IOService *     policyMaker );
+
+/*! @function powerStateDidChangeTo
+    @abstract Handles a notification that the network controller servicing
+    this interface object has transitioned to a new power state.
+    @discussion This method will call the controllerDidChangePowerState() method
+    on the controller's work loop context to prepare for the power state change.
+    Subclasses should not override this method.
+    @param flags Flags that describe the capability of the controller in the new
+    power state.
+    @param stateNumber An index to a state in the network controller's
+    power state array that the controller has switched to.
+    @param policyMaker A reference to the network controller's policy-maker,
+    and is also the originator of this notification.
+    @result The return will always be IOPMAckImplied to indicate that the
+    preparation for the power change has already completed when this method
+    returns. 
+*/
+
+    virtual IOReturn powerStateDidChangeTo( IOPMPowerFlags  flags,
+                                            unsigned long   stateNumber,
+                                            IOService *     policyMaker );
+
+/*! @function controllerWillChangePowerState
+    @abstract Handles a notification that the network controller servicing
+    this interface object is about to transition to a new power state.
+    @param controller The network controller object.
+    @param flags Flags that describe the capability of the controller in the new
+    power state.
+    @param stateNumber An index to a state in the network controller's
+    power state array that the controller is switching to.
+    @param policyMaker A reference to the network controller's policy-maker,
+    and is also the originator of this notification.
+    @result The return value is always kIOReturnSuccess. 
+*/
+
+    virtual IOReturn controllerWillChangePowerState(
+                               IONetworkController * controller,
+                               IOPMPowerFlags        flags,
+                               UInt32                stateNumber,
+                               IOService *           policyMaker);
+
+/*! @function controllerDidChangePowerState
+    @abstract Handles a notification that the network controller servicing
+    this interface object has transitioned to a new power state.
+    @param controller The network controller object.
+    @param flags Flags that describe the capability of the controller in the new
+    power state.
+    @param stateNumber An index to a state in the network controller's
+    power state array that the controller has switched to.
+    @param policyMaker A reference to the network controller's policy-maker,
+    and is also the originator of this notification.
+    @result The return value is always kIOReturnSuccess. 
+*/
+
+    virtual IOReturn controllerDidChangePowerState(
+                               IONetworkController * controller,
+                               IOPMPowerFlags        flags,
+                               UInt32                stateNumber,
+                               IOService *           policyMaker);
+
+public:
+    /* Override IOService::willTerminate() */
+
+    virtual bool willTerminate( IOService *  provider,
+                                IOOptionBits options );
+
+    /* Override IOService::serializeProperties() */
+
+    virtual bool serializeProperties( OSSerialize * s ) const;
+
+/*! @function attachToDataLinkLayer
+    @abstract Attaches the network interface to the BSD data link layer.
+    @discussion This function is called by the family to attach the network
+    interface managed by an IONetworkInterface to the BSD data link layer.
+    This call occurs after the interface initialization and setup, and the
+    assignment of an interface unit number. The family does not implicitly
+    close the gate on the network controller's work loop when calling this
+    function. Prior to the data link attachment, services provided by an
+    IONetworkInterface will be inaccessible to BSD networking, though the
+    object can be found in the I/O Kit Registry. Subclasses can override
+    this function to perform interface specific work.
+    @param options Options for the attach call. None are currently defined.
+    @param parameter Parameter for the attach call. Not currently used.
+    @result Returns kIOReturnSuccess on success. 
+*/
+
+    virtual IOReturn attachToDataLinkLayer( IOOptionBits options,
+                                            void *       parameter );
+
+    OSMetaClassDeclareReservedUsed(IONetworkInterface, 0);
+
+/*! @function detachFromDataLinkLayer
+    @abstract Detaches the network interface from the BSD data link layer.
+    @discussion This function is called by the family to detach the network
+    interface managed by an IONetworkInterface from the BSD data link layer.
+    This call is made when the interface is terminated, before the last close.
+    The family does not implicitly close the gate on the network controller's
+    work loop when calling this function. Subclasses can override this function
+    to perform additional interface specific work.
+    @param options Options for the detach call. None are currently defined.
+    @param parameter Parameter for the detach call. Not currently used. 
+*/
+
+    virtual void detachFromDataLinkLayer( IOOptionBits options,
+                                          void *       parameter );
+
+    OSMetaClassDeclareReservedUsed(IONetworkInterface, 1);
+
+protected:
+/*! @function feedInputPacketTap
+    @abstract Feed received packets to the BPF
+    @discussion This function is called by the family for each inbound packet
+    to feed it to the BPF function.  Interface classes can override if they
+    need to provide class specific functionality or modifications to the BPF tap.
+    @param mbuf Pointer to the packet.
+*/
+    virtual void feedPacketInputTap(mbuf_t);
+
+	OSMetaClassDeclareReservedUsed( IONetworkInterface,  2);
+
+/*! @function feedOutputPacketTap
+    @abstract Feed sent packets to the BPF
+    @discussion This function is called by the family for each outbound packet
+    to feed it to the BPF function.  Interface classes can override if they
+    need to provide class specific functionality or modifications to the BPF tap.
+    @param mbuf Pointer to the packet.
+*/
+	virtual void feedPacketOutputTap(mbuf_t);
+
+	OSMetaClassDeclareReservedUsed( IONetworkInterface,  3);
+	
+	virtual bool initIfnetParams(struct ifnet_init_params *params);
+    OSMetaClassDeclareReservedUsed( IONetworkInterface,  4);
+	
+public:
+    // Virtual function padding
+	OSMetaClassDeclareReservedUnused( IONetworkInterface,  5);
+	OSMetaClassDeclareReservedUnused( IONetworkInterface,  6);
+    OSMetaClassDeclareReservedUnused( IONetworkInterface,  7);
+    OSMetaClassDeclareReservedUnused( IONetworkInterface,  8);
+    OSMetaClassDeclareReservedUnused( IONetworkInterface,  9);
+    OSMetaClassDeclareReservedUnused( IONetworkInterface, 10);
+    OSMetaClassDeclareReservedUnused( IONetworkInterface, 11);
+    OSMetaClassDeclareReservedUnused( IONetworkInterface, 12);
+    OSMetaClassDeclareReservedUnused( IONetworkInterface, 13);
+    OSMetaClassDeclareReservedUnused( IONetworkInterface, 14);
+    OSMetaClassDeclareReservedUnused( IONetworkInterface, 15);
+};
+
+#endif /* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* !_IONETWORKINTERFACE_H */
diff --git a/i386/include/IOKit/network/IONetworkMedium.h b/i386/include/IOKit/network/IONetworkMedium.h
new file mode 100644
index 0000000..2a64f3d
--- /dev/null
+++ b/i386/include/IOKit/network/IONetworkMedium.h
@@ -0,0 +1,426 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IONETWORKMEDIUM_H
+#define _IONETWORKMEDIUM_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <net/if_media.h>
+
+/*! @typedef IOMediumType
+    @discussion A 32-bit value divided into fields which describes
+    a single medium type. */
+
+typedef UInt32 IOMediumType;
+
+/*! @defined kIOMediumType
+    @abstract A property of IONetworkMedium objects.
+    @discussion The kIOMediumType property is an OSNumber object that describes the type of
+        medium that this object represents. 
+*/
+
+#define kIOMediumType           "Type"
+
+/*! @defined kIOMediumFlags
+    @abstract A property of IONetworkMedium objects.
+    @discussion The kIOMediumFlags property is an OSNumber object that describes a set of
+        attributes assigned to the medium. 
+*/
+
+#define kIOMediumFlags          "Flags"
+
+/*! @defined kIOMediumSpeed
+    @abstract A property of IONetworkMedium objects.
+    @discussion The kIOMediumSpeed property is an OSNumber object that describes the maximum link
+        speed supported by the medium in bits per second. 
+*/
+
+#define kIOMediumSpeed          "Speed"
+
+/*! @defined kIOMediumIndex
+    @abstract A property of IONetworkMedium objects.
+    @discussion The kIOMediumIndex property is an OSNumber object that describes an index assigned
+        by the owner of the medium object. Its interpretation is driver
+        specific.
+*/
+
+#define kIOMediumIndex          "Index"
+
+//===========================================================================
+// Medium Type (IOMediumType).
+//
+// The medium type is encoded by a 32-bit value. The definitions of
+// the fields and the encoding for each field is adapted from FreeBSD.
+//
+// Bits     Definition
+// -------------------
+//  4-0     medium subtype
+//  7-5     network type
+// 15-8     network specific options
+// 19-16    reserved
+// 27-20    common options
+// 31-28    instance number
+
+// Ethernet.
+//
+enum {
+    kIOMediumEthernet             =  IFM_ETHER,
+    kIOMediumEthernetAuto         =  ( IFM_AUTO    | IFM_ETHER ),
+    kIOMediumEthernetManual       =  ( IFM_MANUAL  | IFM_ETHER ),
+    kIOMediumEthernetNone         =  ( IFM_NONE    | IFM_ETHER ),
+    kIOMediumEthernet10BaseT      =  ( IFM_10_T    | IFM_ETHER ),
+    kIOMediumEthernet10Base2      =  ( IFM_10_2    | IFM_ETHER ),
+    kIOMediumEthernet10Base5      =  ( IFM_10_5    | IFM_ETHER ),
+    kIOMediumEthernet100BaseTX    =  ( IFM_100_TX  | IFM_ETHER ),
+    kIOMediumEthernet100BaseFX    =  ( IFM_100_FX  | IFM_ETHER ),
+    kIOMediumEthernet100BaseT4    =  ( IFM_100_T4  | IFM_ETHER ),
+    kIOMediumEthernet100BaseVG    =  ( IFM_100_VG  | IFM_ETHER ),
+    kIOMediumEthernet100BaseT2    =  ( IFM_100_T2  | IFM_ETHER ),
+    kIOMediumEthernet1000BaseSX   =  ( IFM_1000_SX | IFM_ETHER ),
+    kIOMediumEthernet10BaseSTP    =  ( IFM_10_STP  | IFM_ETHER ),
+    kIOMediumEthernet10BaseFL     =  ( IFM_10_FL   | IFM_ETHER ),
+    kIOMediumEthernet1000BaseLX   =  ( IFM_1000_LX | IFM_ETHER ),
+    kIOMediumEthernet1000BaseCX   =  ( IFM_1000_CX | IFM_ETHER ),
+    kIOMediumEthernet1000BaseTX   =  ( IFM_1000_T  | IFM_ETHER ), //deprecated- use kIOMediumEthernet1000BaseT instead
+    kIOMediumEthernet1000BaseT    =  ( IFM_1000_T  | IFM_ETHER ),
+    kIOMediumEthernetHomePNA1     =  ( IFM_HPNA_1  | IFM_ETHER ),
+	kIOMediumEthernet10GBaseSR    =  ( IFM_10G_SR  | IFM_ETHER ),
+	kIOMediumEthernet10GBaseLR    =  ( IFM_10G_LR  | IFM_ETHER ),
+    kIOMediumEthernet10GBaseCX4   =  ( IFM_10G_CX4 | IFM_ETHER ),
+    kIOMediumEthernet10GBaseT     =  ( IFM_10G_T   | IFM_ETHER )
+};
+
+// IEEE 802.11 Wireless.
+//
+enum {
+    kIOMediumIEEE80211            =  IFM_IEEE80211,
+    kIOMediumIEEE80211Auto        =  ( IFM_AUTO           | IFM_IEEE80211 ),
+    kIOMediumIEEE80211Manual      =  ( IFM_MANUAL         | IFM_IEEE80211 ),
+    kIOMediumIEEE80211None        =  ( IFM_NONE           | IFM_IEEE80211 ),
+    kIOMediumIEEE80211FH1         =  ( IFM_IEEE80211_FH1  | IFM_IEEE80211 ),
+    kIOMediumIEEE80211FH2         =  ( IFM_IEEE80211_FH2  | IFM_IEEE80211 ),
+    kIOMediumIEEE80211DS2         =  ( IFM_IEEE80211_DS2  | IFM_IEEE80211 ),
+    kIOMediumIEEE80211DS5         =  ( IFM_IEEE80211_DS5  | IFM_IEEE80211 ),
+    kIOMediumIEEE80211DS11        =  ( IFM_IEEE80211_DS11 | IFM_IEEE80211 ),
+    kIOMediumIEEE80211DS1         =  ( IFM_IEEE80211_DS1  | IFM_IEEE80211 ),
+    kIOMediumIEEE80211OptionAdhoc =  IFM_IEEE80211_ADHOC
+};
+
+// Common options.
+//
+enum {
+    kIOMediumOptionFullDuplex     = IFM_FDX,
+    kIOMediumOptionHalfDuplex     = IFM_HDX,
+    kIOMediumOptionFlowControl    = IFM_FLOW,
+    kIOMediumOptionFlag0          = IFM_FLAG0,
+    kIOMediumOptionFlag1          = IFM_FLAG1,
+    kIOMediumOptionFlag2          = IFM_FLAG2,
+    kIOMediumOptionLoopback       = IFM_LOOP
+};
+
+// Medium type masks.
+//
+#define kIOMediumSubTypeMask        IFM_TMASK
+#define kIOMediumNetworkTypeMask    IFM_NMASK
+#define kIOMediumOptionsMask        IFM_OMASK
+#define kIOMediumCommonOptionsMask  IFM_GMASK
+#define kIOMediumInstanceShift      IFM_ISHIFT
+#define kIOMediumInstanceMask       IFM_IMASK
+
+// Medium type field accessors.
+//
+#define IOMediumGetSubType(x)       ((x)  & kIOMediumSubTypeMask)
+#define IOMediumGetNetworkType(x)   ((x)  & kIOMediumNetworkMask)
+#define IOMediumGetInstance(x)      (((x) & kIOMediumInstanceMask) >> \
+                                            kIOMediumInstanceShift)
+
+//===========================================================================
+// Medium flags.
+
+
+//===========================================================================
+// Link status bits.
+//
+enum {
+    kIONetworkLinkValid        = IFM_AVALID,    // link status is valid
+    kIONetworkLinkActive       = IFM_ACTIVE     // link is up/active.
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+//===========================================================================
+// IONetworkMedium class.
+
+#ifdef KERNEL
+
+#include <libkern/c++/OSObject.h>
+#include <libkern/c++/OSSymbol.h>
+
+/*! @class IONetworkMedium
+    @abstract An object that encapsulates information about a network
+    medium (i.e. 10Base-T, or 100Base-T Full Duplex). 
+    @discussion The main purpose of
+    this object is for a network driver to advertise its media capability,
+    through a collection of IONetworkMedium objects stored in a dictionary
+    in its property table. IONetworkMedium supports serialization, and will
+    encode its properties in the form of a dictionary to the serialization
+    stream when instructed. This will allow a user-space application to
+    browse the set of media types supported by the controller. 
+*/
+
+class IONetworkMedium : public OSObject
+{
+    OSDeclareDefaultStructors( IONetworkMedium )
+
+protected:
+    IOMediumType      _type;
+    UInt32            _flags;
+    UInt64            _speed;
+    UInt32            _index;
+    const OSSymbol *  _name;
+
+    struct ExpansionData { };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *_reserved;
+
+
+/*! @function free
+    @abstract Frees the IONetworkMedium object. 
+*/
+
+    virtual void free();
+
+public:
+
+/*! @function nameForType
+    @abstract Creates a name that describes a medium type.
+    @discussion Given a medium type, creates an OSymbol object that
+    describes the medium type. There is a 1-to-1 mapping between the
+    medium type, and the medium name created by this method. The caller
+    is responsible for releasing the OSSymbol object returned.
+    @param type A medium type. See IONetworkMedium.h for type encoding.
+    @result Returns an OSSymbol object is created based on the type provided. 
+*/
+
+    static const OSSymbol * nameForType(IOMediumType type);
+
+/*! @function addMedium
+    @abstract Adds an IONetworkMedium object to a dictionary.
+    @discussion A helper function to add an IONetworkMedium object to a
+    given dictionary. The name of the medium is used as the key for the
+    new dictionary entry.
+    @param dict An OSDictionary object where the medium object should be
+    added as a new entry.
+    @param medium The IONetworkMedium object to add to the dictionary.
+    @result Returns true on success, false otherwise. 
+*/
+
+    static bool addMedium(OSDictionary *          dict,
+                          const IONetworkMedium * medium);
+
+/*! @function removeMedium
+    @abstract Removes an IONetworkMedium object from a dictionary.
+    @discussion A helper function to remove an entry in a dictionary.
+    @param dict The OSDictionary object where the medium object should be
+    removed from.
+    @param medium The name of this medium object is used as the key. 
+*/
+
+    static void removeMedium(OSDictionary *          dict,
+                             const IONetworkMedium * medium);
+
+/*! @function getMediumWithType
+    @abstract Finds a medium object from a dictionary with a given type.
+    @discussion This method iterates through a dictionary and returns an IONetworkMedium
+    entry with the given type. An optional mask supplies the don't care bits.
+    @param dict The dictionary to look for a matching entry.
+    @param type Search for an entry with this type.
+    @param mask The don't care bits in IOMediumType. Defaults to 0, which
+    implies that a perfect match is desired.
+    @result Returns the first matching IONetworkMedium entry found,
+    or 0 if no match was found. 
+*/
+
+    static IONetworkMedium * getMediumWithType(const OSDictionary * dict,
+                                               IOMediumType         type,
+                                               IOMediumType         mask = 0);
+
+/*! @function getMediumWithIndex
+    @abstract Finds a medium object from a dictionary with a given index.
+    @discussion This method iterates through a dictionary and returns an IONetworkMedium
+    entry with the given index. An optional mask supplies the don't care bits.
+    @param dict The dictionary to look for a matching entry.
+    @param index Search for an entry with the given index.
+    @param mask The don't care bits in index. Defaults to 0, which
+    implies that a perfect match is desired.
+    @result Returns the first matching IONetworkMedium entry found,
+    or 0 if no match was found. 
+*/
+
+    static IONetworkMedium * getMediumWithIndex(const OSDictionary * dict,
+                                                UInt32               index,
+                                                UInt32               mask = 0);
+
+/*! @function init
+    @abstract Initializes an IONetworkMedium object.
+    @param type The medium type, this value is encoded with bits defined in
+           IONetworkMedium.h.
+    @param speed The maximum (or the only) link speed supported over this 
+           medium in units of bits per second.
+    @param flags An optional flag for the medium object.
+           See IONetworkMedium.h for defined flags.
+    @param index An optional index number assigned by the owner.
+           Drivers can use this to store an index to a media table in
+           the driver, or it may map to a driver-defined media type.
+    @param name An optional name assigned to this medium object. If 0,
+           then a name will be created based on the medium type by
+           calling IONetworkMedium::nameForType(). Since the name of
+           the medium is used as a key when inserted into a dictionary,
+           the name chosen must be unique within the scope of the owner.
+    @result Returns true on success, false otherwise. 
+*/
+
+    virtual bool init(IOMediumType  type,
+                      UInt64        speed,
+                      UInt32        flags = 0,
+                      UInt32        index = 0,
+                      const char *  name  = 0);
+
+/*! @function medium
+    @abstract Factory method that allocates and initializes an IONetworkMedium object.
+    @param type The medium type, this value is encoded with bits defined in
+           IONetworkMedium.h.
+    @param speed The maximum (or the only) link speed supported over this 
+           medium in units of bits per second.
+    @param flags An optional flag for the medium object.
+           See IONetworkMedium.h for defined flags.
+    @param index An optional index number assigned by the owner.
+           Drivers can use this to store an index to a media table in
+           the driver, or it may map to a driver-defined media type.
+    @param name An optional name assigned to this medium object. If 0,
+           then a name will be created based on the medium type by
+           calling IONetworkMedium::nameForType(). Since the name of
+           the medium is used as a key when inserted into a dictionary,
+           the name chosen must be unique within the scope of the owner.
+    @result Returns an IONetworkMedium instance on success, or 0 otherwise. 
+*/
+
+    static IONetworkMedium * medium(IOMediumType  type,
+                                    UInt64        speed,
+                                    UInt32        flags = 0,
+                                    UInt32        index = 0,
+                                    const char *  name  = 0);
+
+/*! @function getType
+    @result Returns the medium type assigned to this medium object. 
+*/
+
+    virtual IOMediumType  getType() const;
+
+/*! @function getSpeed
+    @result Returns the maximum link speed supported by this medium. 
+*/
+
+    virtual UInt64        getSpeed() const;
+
+/*! @function getFlags
+    @result Returns the medium flags. 
+*/
+
+    virtual UInt32        getFlags() const;
+
+/*! @function getIndex
+    @result Returns the assigned medium index. 
+*/
+
+    virtual UInt32        getIndex() const;
+
+/*! @function getName
+    @result Returns the name assigned to this medium object. 
+*/
+
+    virtual const OSSymbol * getName() const;
+
+/*! @function getKey
+    @result Returns the key to use for this medium object. This key should be
+    used when this object is added to a dictionary. Same as getName(). 
+*/
+
+    virtual const OSSymbol * getKey() const;
+
+/*! @function isEqualTo
+    @abstract Tests for equality between two IONetworkMedium objects.
+    @discussion Two IONetworkMedium objects are considered equal if
+    they have similar properties assigned to them during initialization.
+    @param medium An IONetworkMedium to test against the IONetworkMedium
+    object being called.
+    @result Returns true if equal, false otherwise. 
+*/
+
+    virtual bool isEqualTo(const IONetworkMedium * medium) const;
+
+/*! @function isEqualTo
+    @abstract Tests for equality between a IONetworkMedium object and an
+    OSObject.
+    @discussion The OSObject is considered equal to the IONetworkMedium
+    object if the OSObject is an IONetworkMedium, and they have
+    similar properties assigned to them during initialization.
+    @param obj An OSObject to test against an IONetworkMedium object.
+    @result Returns true if equal, false otherwise. 
+*/
+
+    virtual bool isEqualTo(const OSMetaClassBase * obj) const;
+
+/*! @function serialize
+    @abstract Serializes the IONetworkMedium object.
+    @discussion A dictionary is created containing the properties
+    assigned to this medium object, and this dictionary is then
+    serialized using the OSSerialize object provided.
+    @param s An OSSerialize object.
+    @result Returns true on success, false otherwise. 
+*/
+
+    virtual bool serialize(OSSerialize * s) const;
+
+    // Virtual function padding
+    OSMetaClassDeclareReservedUnused( IONetworkMedium,  0);
+    OSMetaClassDeclareReservedUnused( IONetworkMedium,  1);
+    OSMetaClassDeclareReservedUnused( IONetworkMedium,  2);
+    OSMetaClassDeclareReservedUnused( IONetworkMedium,  3);
+};
+
+// Translate getKey() to getName().
+//
+inline const OSSymbol * IONetworkMedium::getKey() const
+{
+    return getName();
+}
+
+#endif /* KERNEL */
+
+#endif /* !_IONETWORKMEDIUM_H */
diff --git a/i386/include/IOKit/network/IONetworkStats.h b/i386/include/IOKit/network/IONetworkStats.h
new file mode 100644
index 0000000..f6e6f9f
--- /dev/null
+++ b/i386/include/IOKit/network/IONetworkStats.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IONETWORKSTATS_H
+#define _IONETWORKSTATS_H
+
+/*! @header IONetworkStats.h
+    @discussion Generic network statistics. */
+
+//------------------------------------------------------------------------
+// Generic network statistics. Common to all network interfaces.
+//
+// WARNING: This structure must match the statistics field in
+// ifnet->if_data. This structure will overlay a portion of ifnet.
+
+/*! @typedef IONetworkStats
+        @discussion Generic network statistics structure.
+        @field inputPackets count input packets.
+        @field inputErrors count input errors.
+        @field outputPackets count output packets.
+        @field outputErrors count output errors.
+        @field collisions count collisions on CDMA networks. */
+
+typedef struct {
+        UInt32  inputPackets;
+        UInt32  inputErrors;
+        UInt32  outputPackets;
+        UInt32  outputErrors;
+        UInt32  collisions;
+} IONetworkStats;
+
+/*! @defined kIONetworkStatsKey
+        @discussion Defines the name of an IONetworkData that contains
+        an IONetworkStats. */
+
+#define kIONetworkStatsKey              "IONetworkStatsKey"
+
+//------------------------------------------------------------------------
+// Output queue statistics.
+
+/*! @typedef IOOutputQueueStats
+        @discussion Statistics recorded by IOOutputQueue objects.
+        @field capacity queue capacity.
+        @field size current size of the queue.
+        @field peakSize peak size of the queue.
+        @field dropCount number of packets dropped.
+        @field outputCount number of output packets.
+        @field retryCount number of retries.
+        @field stallCount number of queue stalls. */
+
+typedef struct {
+        UInt32  capacity;
+        UInt32  size;
+        UInt32  peakSize;
+        UInt32  dropCount;
+        UInt32  outputCount;
+        UInt32  retryCount;
+        UInt32  stallCount;
+        UInt32  reserved[4];
+} IOOutputQueueStats;
+
+/*! @defined kIOOutputQueueStatsKey
+        @discussion Defines the name of an IONetworkData that contains
+        an IOOutputQueueStats. */
+
+#define kIOOutputQueueStatsKey          "IOOutputQueueStatsKey"
+
+#endif /* !_IONETWORKSTATS_H */
diff --git a/i386/include/IOKit/network/IOOutputQueue.h b/i386/include/IOKit/network/IOOutputQueue.h
new file mode 100644
index 0000000..cb40702
--- /dev/null
+++ b/i386/include/IOKit/network/IOOutputQueue.h
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOOUTPUTQUEUE_H
+#define _IOOUTPUTQUEUE_H
+
+#include <IOKit/network/IONetworkInterface.h>
+
+// Forward declarations.
+//
+struct mbuf;
+class  IONetworkData;
+
+// FIXME - We do not want the enqueue/dequeue macros defined in queue.h.
+//
+#undef enqueue(queue,elt)
+#undef dequeue(queue)
+
+// FIXME - Belongs in IOBasicOutputQueue.h
+//
+/*! @enum OutputPacketStatus
+    @abstract The status of the packet sent to the target.
+    @constant kIOOutputStatusMask Define the status field in the return code.
+    @constant kIOOutputStatusAccept Packet was accepted by the target.
+    @constant kIOOutputStatusDropped Packet accepted, but was also dropped.
+    @constant kIOOutputStatusRetry Target ran out of resources, and is unable
+    to accept the packet. The ownership of the packet reverts back to the
+    queue. 
+*/
+
+enum {
+    kIOOutputStatusMask     = 0x00ff,
+    kIOOutputStatusAccepted = 0x0000,
+    kIOOutputStatusDropped  = 0x0001,
+    kIOOutputStatusRetry    = 0x0002
+};
+
+/*! @enum OutputCommands
+    @abstract A command requested by the target.
+    @constant kIOOutputCommandMask Define the command field in the return code.
+    @constant kIOOutputCommandNone No command.
+    @constant kIOOutputCommandStall A command to stall the queue. 
+*/
+
+enum {
+    kIOOutputCommandMask    = 0xff00,
+    kIOOutputCommandNone    = 0x0000,
+    kIOOutputCommandStall   = 0x0100
+};
+
+/*! @enum OutputHandlerReturnCodes
+    @abstract Common return codes returned by the target's output handler.
+    @constant kIOReturnOutputSuccess Packet was accepted.
+    @constant kIOReturnOutputDropped Packet was dropped.
+    @constant kIOReturnOutputStall   Stall the queue and retry the same packet
+              when the queue is restarted. 
+*/
+
+enum {
+    kIOReturnOutputSuccess = (kIOOutputStatusAccepted | kIOOutputCommandNone),
+    kIOReturnOutputDropped = (kIOOutputStatusDropped  | kIOOutputCommandNone),
+    kIOReturnOutputStall   = (kIOOutputStatusRetry    | kIOOutputCommandStall)
+};
+
+/*! @class IOOutputQueue
+    @abstract A packet queue that supports multiple producers and a single
+    consumer. 
+    @discussion Each producer, or a client thread, will deliver a chain of packets
+    to the queue. A single consumer will remove packets from the queue one at a
+    time and forward it to the registered target/action. This object may be used
+    by an IONetworkController on the output (transmit) side to handle the output
+    packet flow downstream from an IONetworkInterface, and then call the driver's
+    output function. IOOutputQueue is an abstract class that provides an interface
+    for its subclasses. Concrete subclasses will complete the implementation, and
+    specify the context that the target is called for packets removed from
+    the queue. 
+*/
+
+class IOOutputQueue : public OSObject
+{
+    OSDeclareAbstractStructors( IOOutputQueue )
+
+private:
+
+    static void runServiceThread(thread_call_param_t, thread_call_param_t);
+
+protected:
+
+    thread_call_t  _callEntry;  // callout entry structure.
+
+    struct ExpansionData { };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *_reserved;
+
+
+/*! @function init
+    @abstract Initializes an IOOutputQueue object.
+    @result Returns true if initialized successfully, false otherwise. 
+*/
+
+    virtual bool init();
+
+/*! @function free
+    @abstract Frees the IOOutputQueue object.
+    @discussion Release allocated resources, then call super::free(). 
+*/
+
+    virtual void free();
+
+/*! @function scheduleServiceThread
+    @abstract Schedules a service thread callout.
+    @discussion This method can be called by service() to schedule
+    a thread that will call serviceThread() when it starts running.
+    @param param A parameter to pass to the serviceThread() method.
+    @result Returns true if a thread callout was scheduled, false otherwise. 
+*/
+
+    virtual bool scheduleServiceThread(void * param);
+
+/*! @function cancelServiceThread
+    @abstract Cancels any pending service thread callout.
+    @result Returns true if a previously scheduled thread callout was canceled,
+    false otherwise. 
+*/
+
+    virtual bool cancelServiceThread();
+
+/*! @function serviceThread
+    @abstract Method called by the scheduled service thread when it
+    starts to run.
+    @discussion Must be implemented by a subclass that calls
+    scheduleServiceThread(). The default implementation does nothing.
+    @param param A parameter that was given to scheduleServiceThread()
+    when the service thread was scheduled. 
+*/
+
+    virtual void serviceThread(void * param);
+                                             
+public:
+
+/*! @function start
+    @abstract Starts up the queue.
+    @discussion This method is called by the target to start the queue. This will allow
+    packets to be removed from the queue, then delivered to the target.
+    @result Returns true if the queue was started successfully, false otherwise. 
+*/
+
+    virtual bool start() = 0;
+
+/*! @function stop
+    @abstract Stops the queue.
+    @discussion Stop the queue and prevent it from sending packets to its
+    target.
+    @result Returns the previous running state of the queue,
+    true if the queue was running, false if the queue was already stopped. 
+*/
+
+    virtual bool stop() = 0;
+
+/*! @function service
+    @abstract Services the queue.
+    @discussion Manage the queue after it has been started.
+    @param options Options for the service request.
+    @result Returns a return value to indicate the service result. 
+*/
+
+    virtual bool service(IOOptionBits options = 0) = 0;
+
+/*! @function flush
+    @abstract Drops and frees all packets currently held by the queue.
+    @result Returns the number of packets that were dropped and freed. 
+*/
+
+    virtual UInt32 flush() = 0;
+
+/*! @function setCapacity
+    @abstract Changes the number of packets that the queue can hold
+    before it begins to drop excess packets.
+    @param capacity The new desired capacity.
+    @result Returns true if the new capacity was accepted, false otherwise.
+*/
+
+    virtual bool setCapacity(UInt32 capacity) = 0;
+
+/*! @function getCapacity
+    @abstract Gets the number of packets that the queue can hold.
+    @discussion The queue will begin to drop incoming packets when the
+    size of queue reaches its capacity.
+    @result Returns the current queue capacity. 
+*/
+
+    virtual UInt32 getCapacity() const = 0;
+
+/*! @function getSize
+    @abstract Gets the number of packets currently held in the queue.
+    @result Returns the size of the queue. 
+*/
+
+    virtual UInt32 getSize() const = 0;
+
+/*! @function enqueue
+    @abstract Adds a packet, or a chain of packets, to the queue.
+    @discussion This method is called by a client to add a packet, or a chain of packets,
+    to the queue.  A packet is described by an mbuf chain, while a chain
+    of packets is constructed by linking multiple mbuf chains via the
+    m_nextpkt field.
+    @param m A single packet, or a chain of packets.
+    @param param A parameter provided by the caller.
+    @result Returns a return code. 
+*/
+
+    virtual UInt32 enqueue(mbuf_t m, void * param) = 0;
+
+/*! @function getOutputHandler
+    @abstract Returns the address of a function that is designated to handle
+    incoming packets sent to the queue object.
+    @result Returns the address of the enqueue() method. 
+*/
+
+    virtual IOOutputAction getOutputHandler() const;
+
+/*! @function getStatisticsData
+    @abstract Returns an IONetworkData object containing statistics counters
+    updated by the queue.
+    @result Returns an IONetworkData object. This implementation will always return
+    0. 
+*/
+
+    virtual IONetworkData * getStatisticsData() const;
+
+    // Virtual function padding
+    OSMetaClassDeclareReservedUnused( IOOutputQueue,  0);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue,  1);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue,  2);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue,  3);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue,  4);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue,  5);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue,  6);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue,  7);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue,  8);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue,  9);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue, 10);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue, 11);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue, 12);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue, 13);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue, 14);
+    OSMetaClassDeclareReservedUnused( IOOutputQueue, 15);
+};
+
+#endif /* !_IOOUTPUTQUEUE_H */
diff --git a/i386/include/IOKit/network/IOPacketQueue.h b/i386/include/IOKit/network/IOPacketQueue.h
new file mode 100644
index 0000000..88d8c21
--- /dev/null
+++ b/i386/include/IOKit/network/IOPacketQueue.h
@@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOPACKETQUEUE_H
+#define _IOPACKETQUEUE_H
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOLocks.h>
+extern "C" {
+#include <sys/kpi_mbuf.h>
+}
+// Forward declarations.
+//
+struct mbuf;
+struct IOMbufQueue;
+
+// We do not want the enqueue/dequeue macros defined in queue.h.
+//
+// #warning queue.h should not be included
+#undef enqueue(queue,elt)
+#undef dequeue(queue)
+
+/*! @class IOPacketQueue
+    @abstract Implements a bounded FIFO queue of mbuf packets. 
+    @discussion Packets are
+    removed from the head of the queue (dequeue), and new packets are added
+    to the tail of the queue (enqueue). A spinlock is used to synchronize
+    access to the queue between methods that have a "lock" prefix. 
+*/
+
+class IOPacketQueue : public OSObject
+{   
+    OSDeclareDefaultStructors( IOPacketQueue )
+
+protected:
+    IOMbufQueue *   _queue;   // mbuf queue
+    IOSimpleLock *  _lock;    // spinlock for synchronized methods
+
+    struct ExpansionData { };
+    /*! @var reserved
+        Reserved for future use.  (Internal use only)  */
+    ExpansionData *_reserved;
+
+/*! @function free
+    @abstract Frees the IOPacketQueue object.
+    @discussion All packets held by the queue are released back to the free
+    pool, resource are deallocated, then super::free() is called. 
+*/
+
+    virtual void free();
+
+/*! @var IOPacketQueueDefaultCapacity 
+    @abstract Describes the default capacity of the 
+    queue object. 
+    @discussion The capacity is only observed by the enqueue() method.
+    Therefore, it is possible for the size of the queue to exceed its
+    capacity when other methods, such as prepend(), are used to add packets
+    to the queue. 
+*/
+
+    static const UInt32 IOPacketQueueDefaultCapacity = 100;
+
+public:
+
+/*! @function withCapacity
+    @abstract Factory method that constructs and initializes an
+    IOPacketQueue object.
+    @param capacity The initial capacity of the queue object. Can be
+    later changed by calling the setCapacity() method.
+    @result Returns an IOPacketQueue instance on success, or 0 otherwise. 
+*/
+
+    static IOPacketQueue * withCapacity(UInt32 capacity = 
+                                        IOPacketQueueDefaultCapacity);
+
+/*! @function initWithCapacity
+    @abstract Initializes an IOPacketQueue object.
+    @discussion This method initializes an IOPacketQueue object with the given capacity.
+    @param capacity The initial capacity of the queue. Can be later changed
+    by calling the setCapacity() method.
+    @result Returns true if initialized successfully, false otherwise. 
+*/
+
+    virtual bool initWithCapacity(UInt32 capacity = 
+                                  IOPacketQueueDefaultCapacity);
+
+/*! @function getSize
+    @abstract Gets the size of the queue.
+    @result Returns the number of packets currently held by the queue. 
+*/
+
+    virtual UInt32 getSize() const;
+
+/*! @function setCapacity
+    @abstract Changes the capacity of the queue.
+    @param capacity The new capacity.
+    @result Returns true if the new capacity was accepted, false otherwise. 
+*/
+
+    virtual bool setCapacity(UInt32 capacity);
+
+/*! @function getCapacity
+    @abstract Gets the current capacity of the queue.
+    @result Returns the current queue capacity. 
+*/
+
+    virtual UInt32 getCapacity() const;
+
+/*! @function peek
+    @abstract Examines the packet at the head of the queue without
+    removing it from the queue.
+    @discussion A following call to peek() or dequeue() will return
+    the same packet. The caller must never modify the mbuf packet returned.
+    @result Returns the packet at the head of the queue. 
+*/
+
+    virtual const mbuf_t peek() const;
+
+/*! @function prepend
+    @abstract Adds a chain of packets to the head of the queue.
+    @param m A chain of packets to add to the head of the queue. 
+*/
+
+    virtual void prepend(mbuf_t m);
+
+/*! @function prepend
+    @abstract Removes all packets from the specified queue, and adds them
+    to the head of this queue.
+    @param queue The source IOPacketQueue object containing the packets to
+    be transferred. 
+*/
+
+    virtual void prepend(IOPacketQueue * queue);
+
+/*! @function lockPrepend
+    @abstract Adds a chain of packets to the head of a synchronized queue.
+    @discussion A spinlock is used to synchronize access to the queue.
+    @param m A chain of packets to add to the head of the queue.
+    @result Always returns true. 
+*/
+
+    virtual void lockPrepend(mbuf_t m);
+
+/*! @function enqueue
+    @abstract Adds a chain of packets to the tail of the queue.
+    @discussion Packets are not added if the size of the queue has reached
+    its capacity.
+    @param m A chain of packets to add to the tail of the queue.
+    @result Returns true on success, or false to indicate over-capacity and refusal
+    to accept the packet chain provided. 
+*/
+
+    virtual bool enqueue(mbuf_t m);
+
+/*! @function enqueue
+    @abstract Removes all packets from the specified queue, and adds them
+    to the tail of this queue.
+    @param queue The source IOPacketQueue object containing the packets to
+    be transferred.
+    @result Always returns true. 
+*/
+
+    virtual bool enqueue(IOPacketQueue * queue);
+
+/*! @function enqueueWithDrop
+    @abstract Adds a chain of packets to the tail of the queue. 
+    @discussion Packets are
+    dropped if the size of the queue has reached its capacity.
+    @param m A chain of packets to add to the tail of the queue.
+    @result Returns the number of packets dropped and freed by the queue. 
+*/
+
+    virtual UInt32 enqueueWithDrop(mbuf_t m);
+
+/*! @function lockEnqueue
+    @abstract Adds a chain of packets to the tail of a synchronized queue.
+    @discussion Packets are not added if the size of the queue has reached
+    its capacity. A spinlock is used to synchronize access to the queue.
+    @param m A chain of packets to add to the tail of the queue.
+    @result Returns true on success, or false to indicate over-capacity and refusal
+    to accept the packet chain provided.
+*/
+
+    virtual bool lockEnqueue(mbuf_t m);
+
+/*! @function lockEnqueueWithDrop
+    @abstract Adds a chain of packets to the tail of a synchronized queue.
+    @discussion Packets are dropped if the size of the queue has reached its capacity.  A spinlock is used to synchronize access to the queue.
+    @param m A chain of packets to add to the tail of the queue.
+    @result Returns the number of packets dropped and freed by the queue. 
+*/
+
+    virtual UInt32 lockEnqueueWithDrop(mbuf_t m);
+
+/*! @function dequeue
+    @abstract Removes a single packet from the head of the queue.
+    @result Returns a packet removed from the head of the queue, or NULL if the
+    queue was empty. 
+*/
+
+    virtual mbuf_t dequeue();
+
+/*! @function lockDequeue
+    @abstract Removes a single packet from the head of a synchronized queue.
+    @discussion A spinlock is used to synchronize access to the queue.
+    @result Returns a packet removed from the head of the queue, or NULL if the
+    queue was empty. 
+*/
+
+    virtual mbuf_t lockDequeue();
+
+/*! @function dequeueAll
+    @abstract Removes all packets from the queue and returns the head of the
+    packet chain.
+    @discussion The size of the queue is cleared to zero.
+    @result Returns the head of a packet chain linking all packets that were held
+    in the queue, or NULL if the queue was empty. 
+*/
+
+    virtual mbuf_t dequeueAll();
+
+/*! @function lockDequeueAll
+    @abstract Removes all packets from a synchronized queue and returns the
+    head of the packet chain.
+    @discussion The size of the queue is cleared to zero. A spinlock is used
+    to synchronize access to the queue.
+    @result Returns the head of a packet chain linking all packets that were held
+    in the queue, or NULL if the queue was empty. 
+*/
+
+    virtual mbuf_t lockDequeueAll();
+
+/*! @function flush
+    @abstract Frees all packets currently held in the queue and releases them
+    back to the free mbuf pool.
+    @discussion The size of the queue is cleared to zero.
+    @result Returns the number of packets freed. 
+*/
+
+    virtual UInt32 flush();
+
+/*! @function lockFlush
+    @abstract Frees all packets currently held in a synchronized queue and
+    releases them back to the free mbuf pool.
+    @discussion The size of the queue is cleared to zero. A spinlock is used
+    to synchronize access to the queue.
+    @result Returns the number of packets freed. 
+*/
+
+    virtual UInt32 lockFlush();
+
+    // Virtual Pad functions
+    OSMetaClassDeclareReservedUnused( IOPacketQueue,  0);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue,  1);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue,  2);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue,  3);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue,  4);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue,  5);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue,  6);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue,  7);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue,  8);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue,  9);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue, 10);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue, 11);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue, 12);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue, 13);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue, 14);
+    OSMetaClassDeclareReservedUnused( IOPacketQueue, 15);
+};
+
+#endif /* !_IOPACKETQUEUE_H */
diff --git a/i386/include/IOKit/nvram/IONVRAMController.h b/i386/include/IOKit/nvram/IONVRAMController.h
new file mode 100644
index 0000000..307d666
--- /dev/null
+++ b/i386/include/IOKit/nvram/IONVRAMController.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IONVRAMCONTROLLER_H
+#define _IOKIT_IONVRAMCONTROLLER_H
+
+#include <IOKit/IOService.h>
+
+class IONVRAMController: public IOService
+{
+  OSDeclareAbstractStructors(IONVRAMController);
+  
+public:
+  virtual bool start(IOService *provider);
+  
+  virtual void sync(void);
+  
+  virtual IOReturn read(IOByteCount offset, UInt8 *buffer,
+			IOByteCount length) = 0;
+  virtual IOReturn write(IOByteCount offset, UInt8 *buffer,
+			 IOByteCount length) = 0;
+};
+
+#endif /* !_IOKIT_IONVRAMCONTROLLER_H */
diff --git a/i386/include/IOKit/pci/IOAGPDevice.h b/i386/include/IOKit/pci/IOAGPDevice.h
new file mode 100644
index 0000000..c3a7d90
--- /dev/null
+++ b/i386/include/IOKit/pci/IOAGPDevice.h
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOAGPDEVICE_H
+#define _IOKIT_IOAGPDEVICE_H
+
+#include <IOKit/IORangeAllocator.h>
+#include <IOKit/pci/IOPCIDevice.h>
+
+/* Definitions of AGP config registers */
+enum {
+    kIOPCIConfigAGPStatusOffset  = 4,
+    kIOPCIConfigAGPCommandOffset = 8
+};
+
+/* Definitions of AGP Command & Status registers */
+enum {
+    kIOAGPRequestQueueMask      = 0xff000000,
+    kIOAGPSideBandAddresssing   = 0x00000200,
+    kIOAGPEnable                = 0x00000100,
+    kIOAGP4GbAddressing         = 0x00000020,
+    kIOAGPFastWrite             = 0x00000010,
+    kIOAGP4xDataRate            = 0x00000004,
+    kIOAGP2xDataRate            = 0x00000002,
+    kIOAGP1xDataRate            = 0x00000001
+};
+
+enum {
+    kIOAGPGartInvalidate        = 0x00000001
+};
+
+// getAGPStatus() defines
+enum {
+    kIOAGPDefaultStatus         = 0
+};
+enum {
+    kIOAGPIdle                  = 0x00000001,
+    kIOAGPInvalidGARTEntry      = 0x00000002,
+    kIOAGPAccessOutOfRange      = 0x00000004
+};
+
+#define kIOAGPBusFlagsKey       "IOAGPFlags"
+enum {
+    // the AGP target must be idle before invalidating its gart tlb
+    kIOAGPGartIdleInvalidate    = 0x00000001,
+
+    // the AGP target cannot handle operations that cross page boundaries
+    kIOAGPDisablePageSpans      = 0x00000002,
+
+    // the AGP target cannot handle master -> target AGP writes
+    kIOAGPDisableAGPWrites      = 0x00000004,
+
+    // the AGP target cannot handle target -> master PCI reads
+    kIOAGPDisablePCIReads       = 0x00000008,
+
+    // the AGP target cannot handle master -> target PCI writes
+    kIOAGPDisablePCIWrites      = 0x00000010,
+
+    // the AGP target cannot handle all unaligned transactions 
+    kIOAGPDisableUnaligned      = 0x00000020,
+
+    kIOAGPDisableFeature6       = 0x00000040,
+    kIOAGPDisableFeature7       = 0x00000080,
+    kIOAGPDisableFeature8       = 0x00000100,
+    kIOAGPDisableFeature9       = 0x00000200
+};
+
+// masterState
+enum {
+    kIOAGPStateEnabled          = 0x00000001,
+    kIOAGPStateEnablePending    = 0x00010000
+};
+
+
+/*! @class IOAGPDevice
+    @abstract An IOService class representing an AGP master device.
+    @discussion The discovery of an AGP master device by the PCI bus family results in an instance of the IOAGPDevice being created and published. It provides services specific to AGP, in addition to the PCI services supplied by its superclass IOPCIDevice.
+*/
+
+class IOAGPDevice : public IOPCIDevice
+{
+    OSDeclareDefaultStructors(IOAGPDevice)
+
+protected:
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+*/    
+    struct ExpansionData { };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  
+*/
+    ExpansionData *reserved;
+
+public:
+    UInt32      masterState;
+    UInt8       masterAGPRegisters;
+
+/*! @function createAGPSpace
+    @abstract Allocates the AGP space, and enables AGP transactions on the master and slave.
+    @discussion This method should be called by the driver for the AGP master device to set the size of the space and enable AGP transactions. It will destroy any AGP space currently allocated.
+    @param options No options are currently defined, pass zero.
+    @param address The physical range allocated for the AGP space is passed back to the caller.
+    @param length An in/out parameter - the caller sets the devices maximum AGP addressing and the actual size created is passed back.
+    @result Returns an IOReturn code indicating success or failure. 
+*/
+
+    virtual IOReturn createAGPSpace( IOOptionBits options,
+                                    IOPhysicalAddress * address, 
+                                    IOPhysicalLength * length );
+
+/*! @function destroyAGPSpace
+    @abstract Destroys the AGP space, and disables AGP transactions on the master and slave.
+    @discussion This method should be called by the driver to shutdown AGP transactions and release resources. 
+*/
+
+    virtual IOReturn destroyAGPSpace( void );
+
+/*! @function getAGPRangeAllocator
+    @abstract Accessor to obtain the AGP range allocator.
+    @discussion To allocate ranges in AGP space, obtain a range allocator for the space with this method. It is retained while the space is created (until destroyAGPSpace is called) and should not be released by the caller.
+    @result Returns a pointer to the range allocator for the AGP space. 
+*/
+
+    virtual IORangeAllocator * getAGPRangeAllocator( void );
+
+/*! @function getAGPStatus
+    @abstract Returns the current state of the AGP bus.
+    @discussion Returns state bits for the AGP bus. Only one type of status is currently defined. 
+    @param which Type of status - only kIOAGPDefaultStatus is currently valid.
+    @result Returns mask of status bits for the AGP bus.
+*/
+
+    virtual IOOptionBits getAGPStatus( IOOptionBits which = kIOAGPDefaultStatus );
+
+/*! @function commitAGPMemory
+    @abstract Makes memory addressable by AGP transactions.
+    @discussion Makes the memory described by the IOMemoryDescriptor object addressable by AGP by entering its pages into the GART array, given an offset into AGP space supplied by the caller (usually allocated by the AGP range allocator). It is the caller's responsibility to prepare non-kernel pageable memory before calling this method, with IOMemoryDescriptor::prepare.
+    @param memory A IOMemoryDescriptor object describing the memory to add to the GART.
+    @param agpOffset An offset into AGP space that the caller has allocated - usually allocated by the AGP range allocator.
+    @param options Pass kIOAGPGartInvalidate if the AGP target should invalidate any GART TLB.
+    @result Returns an IOReturn code indicating success or failure.
+*/
+
+    virtual IOReturn commitAGPMemory( IOMemoryDescriptor * memory,
+                                        IOByteCount agpOffset,
+                                        IOOptionBits options = 0 );
+
+/*! @function releaseAGPMemory
+    @abstract Releases memory addressable by AGP transactions.
+    @discussion Makes the memory described by the IOMemoryDescriptor object unaddressable by AGP by removing its pages from the GART array, given an offset into AGP space supplied by the caller (usually allocated by the AGP range allocator). It is the caller's responsibility to complete non-kernel pageable memory before calling this method, with IOMemoryDescriptor::complete.
+    @param memory A IOMemoryDescriptor object describing the memory to remove from the GART.
+    @param agpOffset An offset into AGP space that the caller has allocated - usually allocated by the AGP range allocator.
+    @param options Pass kIOAGPGartInvalidate if the AGP target should invalidate any GART TLB.
+    @result Returns an IOReturn code indicating success or failure.
+*/
+
+    virtual IOReturn releaseAGPMemory( IOMemoryDescriptor * memory, 
+                                        IOByteCount agpOffset,
+                                        IOOptionBits options = 0 );
+
+    virtual IOReturn resetAGP( IOOptionBits options = 0 );
+
+/*! @function getAGPSpace
+    @abstract Returns the allocated AGP space.
+    @discussion This method can be called by the driver for the AGP master device to retrieve the physical address and size of the space created with createAGPSpace.
+    @param address The physical range allocated for the AGP space is passed back to the caller. Zero may be passed if the address is not needed by the caller.
+    @param length The size of the the AGP space created is passed back.  Zero may be passed if the length is not needed by the caller.
+    @result Returns an IOReturn code indicating success or failure. 
+*/
+
+    virtual IOReturn getAGPSpace( IOPhysicalAddress * address, 
+                                    IOPhysicalLength * length );
+
+    // Unused Padding
+    OSMetaClassDeclareReservedUnused(IOAGPDevice,  0);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice,  1);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice,  2);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice,  3);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice,  4);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice,  5);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice,  6);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice,  7);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice,  8);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice,  9);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice, 10);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice, 11);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice, 12);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice, 13);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice, 14);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice, 15);
+    OSMetaClassDeclareReservedUnused(IOAGPDevice, 16);
+};
+
+#endif /* ! _IOKIT_IOAGPDEVICE_H */
diff --git a/i386/include/IOKit/pci/IOPCIBridge.h b/i386/include/IOKit/pci/IOPCIBridge.h
new file mode 100644
index 0000000..2fac052
--- /dev/null
+++ b/i386/include/IOKit/pci/IOPCIBridge.h
@@ -0,0 +1,381 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOPCIBRIDGE_H
+#define _IOKIT_IOPCIBRIDGE_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IODeviceMemory.h>
+#include <IOKit/IOFilterInterruptEventSource.h>
+#include <IOKit/pci/IOAGPDevice.h>
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+typedef uint64_t IOPCIScalar;
+
+struct IOPCIRange
+{
+    IOPCIScalar         start;
+    IOPCIScalar         size;
+    IOPCIScalar         alignment;
+    UInt32              type;
+    UInt32              flags;
+    struct IOPCIRange * next;
+    struct IOPCIRange * nextSubRange;
+    struct IOPCIRange * subRange;
+};
+
+enum {
+    kIOPCIResourceTypeMemory = 0,
+    kIOPCIResourceTypePrefetchMemory,
+    kIOPCIResourceTypeIO,
+    kIOPCIResourceTypeBusNumber,
+    kIOPCIResourceTypeCount
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/*!
+    @class IOPCIBridge
+    @abstract   Base class for all PCI bridge drivers.
+*/
+class IOPCIConfigurator;
+class IOPCIDevice;
+
+class IOPCIBridge : public IOService
+{
+    friend class IOPCIDevice;
+    friend class IOPCIConfigurator;
+
+    OSDeclareAbstractStructors(IOPCIBridge)
+
+private:
+    static void initialize(void);
+    IORegistryEntry * findMatching( OSIterator * in, IOPCIAddressSpace space );
+    virtual bool isDTNub( IOPCIDevice * nub );
+    bool checkProperties( IOPCIDevice * entry );
+
+    void removeDevice( IOPCIDevice * device, IOOptionBits options = 0 );
+    IOReturn restoreMachineState( IOOptionBits options = 0);
+    IOReturn _restoreDeviceState( IOPCIDevice * device, IOOptionBits options );
+    IOReturn resolveLegacyInterrupts( IOService * provider, IOPCIDevice * nub );
+    IOReturn resolveMSIInterrupts   ( IOService * provider, IOPCIDevice * nub );
+
+protected:
+    static void nvLocation( IORegistryEntry * entry,
+                            UInt8 * busNum, UInt8 * deviceNum, UInt8 * functionNum );
+    static SInt32 compareAddressCell( UInt32 cellCount, UInt32 cleft[], UInt32 cright[] );
+        void checkTerminateChildren(IOService * bridgeDevice, bool eject);
+    IOReturn setDeviceASPMBits(IOPCIDevice * device, IOOptionBits state);
+
+    IORangeAllocator *  bridgeMemoryRanges;
+    IORangeAllocator *  bridgeIORanges;
+
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOPCIBridge in the future.
+*/    
+    struct ExpansionData
+    {
+        friend class IOPCIConfigurator;
+        IORangeAllocator * cardBusMemoryRanges;
+        IOPCIRange *       rangeLists[kIOPCIResourceTypeCount];
+    };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  
+*/
+    ExpansionData *reserved;
+
+protected:
+public:
+    virtual void probeBus( IOService * provider, UInt8 busNum );
+
+    virtual UInt8 firstBusNum( void );
+    virtual UInt8 lastBusNum( void );
+
+    virtual void spaceFromProperties( OSDictionary * propTable,
+                                        IOPCIAddressSpace * space );
+    virtual OSDictionary * constructProperties( IOPCIAddressSpace space );
+
+    virtual IOPCIDevice * createNub( OSDictionary * from );
+
+    virtual bool initializeNub( IOPCIDevice * nub, OSDictionary * from );
+
+    virtual bool publishNub( IOPCIDevice * nub, UInt32 index );
+
+    virtual bool addBridgeMemoryRange( IOPhysicalAddress start,
+                                        IOPhysicalLength length, bool host );
+
+    virtual bool addBridgeIORange( IOByteCount start, IOByteCount length );
+
+    virtual bool constructRange( IOPCIAddressSpace * flags,
+                                 IOPhysicalAddress phys, IOPhysicalLength len,
+                                 OSArray * array );
+
+    virtual bool matchNubWithPropertyTable( IOService * nub,
+                                            OSDictionary * propertyTable,
+                                            SInt32 * score );
+
+    virtual bool compareNubName( const IOService * nub, OSString * name,
+                                 OSString ** matched = 0 ) const;
+
+    virtual bool pciMatchNub( IOPCIDevice * nub,
+                                OSDictionary * table, SInt32 * score);
+
+    virtual bool matchKeys( IOPCIDevice * nub, const char * keys,
+                                UInt32 defaultMask, UInt8 regNum );
+
+    virtual IOReturn getNubResources( IOService * nub );
+
+    virtual IOReturn getNubAddressing( IOPCIDevice * nub );
+
+    virtual IOReturn getDTNubAddressing( IOPCIDevice * nub );
+
+public:
+    virtual void free( void );
+
+    virtual bool start( IOService * provider );
+
+    virtual void stop( IOService * provider );
+
+    virtual bool configure( IOService * provider );
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    virtual IODeviceMemory * ioDeviceMemory( void ) = 0;
+
+    virtual UInt32 configRead32( IOPCIAddressSpace space, UInt8 offset ) = 0;
+    virtual void configWrite32( IOPCIAddressSpace space,
+                                        UInt8 offset, UInt32 data ) = 0;
+    virtual UInt16 configRead16( IOPCIAddressSpace space, UInt8 offset ) = 0;
+    virtual void configWrite16( IOPCIAddressSpace space,
+                                        UInt8 offset, UInt16 data ) = 0;
+    virtual UInt8 configRead8( IOPCIAddressSpace space, UInt8 offset ) = 0;
+    virtual void configWrite8( IOPCIAddressSpace space,
+                                        UInt8 offset, UInt8 data ) = 0;
+
+    virtual IOPCIAddressSpace getBridgeSpace( void ) = 0;
+
+    virtual UInt32 findPCICapability( IOPCIAddressSpace space,
+                                      UInt8 capabilityID, UInt8 * offset = 0 );
+
+    virtual IOReturn setDevicePowerState( IOPCIDevice * device,
+                                          unsigned long whatToDo );
+    virtual IOReturn saveDeviceState( IOPCIDevice * device,
+                                      IOOptionBits options = 0 );
+    virtual IOReturn restoreDeviceState( IOPCIDevice * device,
+                                         IOOptionBits options = 0 );
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+    virtual IOReturn createAGPSpace( IOAGPDevice * master,
+                                     IOOptionBits options,
+                                     IOPhysicalAddress * address, 
+                                     IOPhysicalLength * length );
+
+    virtual IOReturn destroyAGPSpace( IOAGPDevice * master );
+
+    virtual IORangeAllocator * getAGPRangeAllocator( IOAGPDevice * master );
+
+    virtual IOOptionBits getAGPStatus( IOAGPDevice * master,
+                                       IOOptionBits options = 0 );
+    virtual IOReturn resetAGPDevice( IOAGPDevice * master,
+                                     IOOptionBits options = 0 );
+
+    virtual IOReturn getAGPSpace( IOAGPDevice * master,
+                                  IOPhysicalAddress * address, 
+                                  IOPhysicalLength * length );
+
+    virtual IOReturn commitAGPMemory( IOAGPDevice * master, 
+                                      IOMemoryDescriptor * memory,
+                                      IOByteCount agpOffset,
+                                      IOOptionBits options );
+
+    virtual IOReturn releaseAGPMemory(  IOAGPDevice * master, 
+                                        IOMemoryDescriptor * memory, 
+                                        IOByteCount agpOffset,
+                                        IOOptionBits options );
+
+protected:
+    OSMetaClassDeclareReservedUsed(IOPCIBridge, 0);
+    virtual bool addBridgePrefetchableMemoryRange( IOPhysicalAddress start,
+                                                   IOPhysicalLength length,
+                                                   bool host );
+
+    OSMetaClassDeclareReservedUsed(IOPCIBridge, 1);
+    virtual UInt32 extendedFindPCICapability( IOPCIAddressSpace space,
+                                              UInt32 capabilityID, IOByteCount * offset = 0 );
+
+    OSMetaClassDeclareReservedUsed(IOPCIBridge, 2);
+    virtual IOReturn setDeviceASPMState(IOPCIDevice * device,
+                                IOService * client, IOOptionBits state);
+
+    // Unused Padding
+    OSMetaClassDeclareReservedUnused(IOPCIBridge,  3);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge,  4);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge,  5);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge,  6);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge,  7);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge,  8);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge,  9);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 10);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 11);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 12);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 13);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 14);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 15);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 16);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 17);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 18);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 19);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 20);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 21);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 22);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 23);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 24);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 25);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 26);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 27);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 28);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 29);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 30);
+    OSMetaClassDeclareReservedUnused(IOPCIBridge, 31);
+
+
+
+};
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#define kIOPCIBridgeRegs (32)
+/*!
+    @class IOPCI2PCIBridge
+    @abstract Base class for all PCI-to-PCI bridge drivers.
+*/
+
+class IOPCI2PCIBridge : public IOPCIBridge
+{
+    OSDeclareDefaultStructors(IOPCI2PCIBridge)
+
+private:
+
+    IOPCIDevice * bridgeDevice;
+    UInt32        bridgeState[kIOPCIBridgeRegs];
+
+protected:
+/*! @struct ExpansionData
+    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
+    */    
+    struct ExpansionData
+    {
+    // /hotp
+        IOByteCount                 xpressCapability;
+        IOFilterInterruptEventSource *    bridgeInterruptSource;
+        IOWorkLoop *                workLoop;
+        uint32_t                    hotplugCount;
+        uint8_t                     presence;
+        uint8_t                     waitingLinkEnable;
+        uint8_t                     linkChangeOnly;
+        uint8_t                     interruptEnablePending;
+        uint8_t                     __reserved[4];
+    // hotp/
+    };
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    ExpansionData *reserved;
+public:
+
+    virtual UInt8 firstBusNum( void );
+    virtual UInt8 lastBusNum( void );
+
+public:
+    virtual void free();
+
+    virtual bool serializeProperties( OSSerialize * serialize ) const;
+
+    virtual IOService * probe(  IOService *     provider,
+                                SInt32 *        score );
+
+    virtual bool start( IOService * provider );
+
+    virtual void stop( IOService * provider );
+
+    virtual bool configure( IOService * provider );
+
+    virtual void probeBus( IOService * provider, UInt8 busNum );
+
+    virtual IOReturn requestProbe( IOOptionBits options );
+
+    virtual void saveBridgeState( void );
+
+    virtual void restoreBridgeState( void );
+
+    IOReturn setPowerState( unsigned long powerState,
+                            IOService * whatDevice );
+
+    virtual bool publishNub( IOPCIDevice * nub, UInt32 index );
+
+    virtual IODeviceMemory * ioDeviceMemory( void );
+
+    virtual IOPCIAddressSpace getBridgeSpace( void );
+
+    virtual UInt32 configRead32( IOPCIAddressSpace space, UInt8 offset );
+    virtual void configWrite32( IOPCIAddressSpace space,
+                                        UInt8 offset, UInt32 data );
+    virtual UInt16 configRead16( IOPCIAddressSpace space, UInt8 offset );
+    virtual void configWrite16( IOPCIAddressSpace space,
+                                        UInt8 offset, UInt16 data );
+    virtual UInt8 configRead8( IOPCIAddressSpace space, UInt8 offset );
+    virtual void configWrite8( IOPCIAddressSpace space,
+                                        UInt8 offset, UInt8 data );
+
+    virtual IOReturn setDeviceASPMState(IOPCIDevice * device,
+                                IOService * client, IOOptionBits state);
+
+    // Unused Padding
+    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  0);
+    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  1);
+    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  2);
+    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  3);
+    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  4);
+    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  5);
+    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  6);
+    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  7);
+    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  8);
+
+protected:
+    bool filterInterrupt( IOFilterInterruptEventSource * source);
+                            
+    void handleInterrupt( IOInterruptEventSource * source,
+                             int                      count );
+
+};
+
+#endif /* ! _IOKIT_IOPCIBRIDGE_H */
diff --git a/i386/include/IOKit/pci/IOPCIDevice.h b/i386/include/IOKit/pci/IOPCIDevice.h
new file mode 100644
index 0000000..d031a06
--- /dev/null
+++ b/i386/include/IOKit/pci/IOPCIDevice.h
@@ -0,0 +1,673 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IOPCIDEVICE_H
+#define _IOKIT_IOPCIDEVICE_H
+
+#include <IOKit/IOService.h>
+
+/* Definitions of PCI Config Registers */
+enum {
+    kIOPCIConfigVendorID                = 0x00,
+    kIOPCIConfigDeviceID                = 0x02,
+    kIOPCIConfigCommand                 = 0x04,
+    kIOPCIConfigStatus                  = 0x06,
+    kIOPCIConfigRevisionID              = 0x08,
+    kIOPCIConfigClassCode               = 0x09,
+    kIOPCIConfigCacheLineSize           = 0x0C,
+    kIOPCIConfigLatencyTimer            = 0x0D,
+    kIOPCIConfigHeaderType              = 0x0E,
+    kIOPCIConfigBIST                    = 0x0F,
+    kIOPCIConfigBaseAddress0            = 0x10,
+    kIOPCIConfigBaseAddress1            = 0x14,
+    kIOPCIConfigBaseAddress2            = 0x18,
+    kIOPCIConfigBaseAddress3            = 0x1C,
+    kIOPCIConfigBaseAddress4            = 0x20,
+    kIOPCIConfigBaseAddress5            = 0x24,
+    kIOPCIConfigCardBusCISPtr           = 0x28,
+    kIOPCIConfigSubSystemVendorID       = 0x2C,
+    kIOPCIConfigSubSystemID             = 0x2E,
+    kIOPCIConfigExpansionROMBase        = 0x30,
+    kIOPCIConfigCapabilitiesPtr         = 0x34,
+    kIOPCIConfigInterruptLine           = 0x3C,
+    kIOPCIConfigInterruptPin            = 0x3D,
+    kIOPCIConfigMinimumGrant            = 0x3E,
+    kIOPCIConfigMaximumLatency          = 0x3F
+};
+
+/* Definitions of Capabilities PCI Config Register */
+enum {
+    kIOPCICapabilityIDOffset            = 0x00,
+    kIOPCINextCapabilityOffset          = 0x01,
+
+    kIOPCIPowerManagementCapability     = 0x01,
+    kIOPCIAGPCapability                 = 0x02,
+    kIOPCIVitalProductDataCapability    = 0x03,
+    kIOPCISlotIDCapability              = 0x04,
+    kIOPCIMSICapability                 = 0x05,
+    kIOPCICPCIHotswapCapability         = 0x06,
+    kIOPCIPCIXCapability                = 0x07,
+    kIOPCILDTCapability                 = 0x08,
+    kIOPCIVendorSpecificCapability      = 0x09,
+    kIOPCIDebugPortCapability           = 0x0a,
+    kIOPCICPCIResourceControlCapability = 0x0b,
+    kIOPCIHotplugCapability             = 0x0c,
+    kIOPCIAGP8Capability                = 0x0e,
+    kIOPCISecureCapability              = 0x0f,
+    kIOPCIPCIExpressCapability          = 0x10,
+    kIOPCIMSIXCapability                = 0x11,
+
+    kIOPCIExpressErrorReportingCapability     = -1UL,
+    kIOPCIExpressVirtualChannelCapability     = -2UL,
+    kIOPCIExpressDeviceSerialNumberCapability = -3UL,
+    kIOPCIExpressPowerBudgetCapability        = -4UL
+};
+
+/* Space definitions */
+enum {
+    kIOPCIConfigSpace           = 0,
+    kIOPCIIOSpace               = 1,
+    kIOPCI32BitMemorySpace      = 2,
+    kIOPCI64BitMemorySpace      = 3
+};
+
+/* Command register definitions */
+enum {
+    kIOPCICommandIOSpace                = 0x0001,
+    kIOPCICommandMemorySpace            = 0x0002,
+    kIOPCICommandBusMaster              = 0x0004,
+    kIOPCICommandSpecialCycles          = 0x0008,
+    kIOPCICommandMemWrInvalidate        = 0x0010,
+    kIOPCICommandPaletteSnoop           = 0x0020,
+    kIOPCICommandParityError            = 0x0040,
+    kIOPCICommandAddressStepping        = 0x0080,
+    kIOPCICommandSERR                   = 0x0100,
+    kIOPCICommandFastBack2Back          = 0x0200,
+    kIOPCICommandInterruptDisable       = 0x0400
+};
+
+/* Status register definitions */
+enum {
+    kIOPCIStatusCapabilities            = 0x0010,
+    kIOPCIStatusPCI66                   = 0x0020,
+    kIOPCIStatusUDF                     = 0x0040,
+    kIOPCIStatusFastBack2Back           = 0x0080,
+    kIOPCIStatusDevSel0                 = 0x0000,
+    kIOPCIStatusDevSel1                 = 0x0200,
+    kIOPCIStatusDevSel2                 = 0x0400,
+    kIOPCIStatusDevSel3                 = 0x0600,
+    kIOPCIStatusTargetAbortCapable      = 0x0800,
+    kIOPCIStatusTargetAbortActive       = 0x1000,
+    kIOPCIStatusMasterAbortActive       = 0x2000,
+    kIOPCIStatusSERRActive              = 0x4000,
+    kIOPCIStatusParityErrActive         = 0x8000
+};
+
+// constants which are part of the PCI Bus Power Management Spec.
+enum
+{
+    // capabilities bits in the 16 bit capabilities register
+    kPCIPMCPMESupportFromD3Cold = 0x8000,
+    kPCIPMCPMESupportFromD3Hot  = 0x4000,
+    kPCIPMCPMESupportFromD2             = 0x2000,
+    kPCIPMCPMESupportFromD1             = 0x1000,
+    kPCIPMCPMESupportFromD0             = 0x0800,
+    kPCIPMCD2Support                    = 0x0400,
+    kPCIPMCD1Support                    = 0x0200,
+ 
+    kPCIPMCD3Support                    = 0x0001
+};
+
+enum
+{
+    // bits in the power management control/status register
+    kPCIPMCSPMEStatus                   = 0x8000,
+    kPCIPMCSPMEEnable                   = 0x0100,
+    kPCIPMCSPowerStateMask              = 0x0003,
+    kPCIPMCSPowerStateD3                = 0x0003,
+    kPCIPMCSPowerStateD2                = 0x0002,
+    kPCIPMCSPowerStateD1                = 0x0001,
+    kPCIPMCSPowerStateD0                = 0x0000,
+    
+    kPCIPMCSDefaultEnableBits           = (~(IOOptionBits)0)
+};
+
+union IOPCIAddressSpace {
+    UInt32              bits;
+    struct {
+#if __BIG_ENDIAN__
+        unsigned int    reloc:1;
+        unsigned int    prefetch:1;
+        unsigned int    t:1;
+        unsigned int    resv:3;
+        unsigned int    space:2;
+        unsigned int    busNum:8;
+        unsigned int    deviceNum:5;
+        unsigned int    functionNum:3;
+        unsigned int    registerNum:8;
+#elif __LITTLE_ENDIAN__
+        unsigned int    registerNum:8;
+        unsigned int    functionNum:3;
+        unsigned int    deviceNum:5;
+        unsigned int    busNum:8;
+        unsigned int    space:2;
+        unsigned int    resv:3;
+        unsigned int    t:1;
+        unsigned int    prefetch:1;
+        unsigned int    reloc:1;
+#endif
+    } s;
+    struct {
+#if __BIG_ENDIAN__
+        unsigned int    resv:4;
+        unsigned int    registerNumExtended:4;
+        unsigned int    busNum:8;
+        unsigned int    deviceNum:5;
+        unsigned int    functionNum:3;
+        unsigned int    registerNum:8;
+#elif __LITTLE_ENDIAN__
+        unsigned int    registerNum:8;
+        unsigned int    functionNum:3;
+        unsigned int    deviceNum:5;
+        unsigned int    busNum:8;
+        unsigned int    registerNumExtended:4;
+        unsigned int    resv:4;
+#endif
+    } es;
+};
+
+struct IOPCIPhysicalAddress {
+    IOPCIAddressSpace   physHi;
+    UInt32              physMid;
+    UInt32              physLo;
+    UInt32              lengthHi;
+    UInt32              lengthLo;
+};
+
+// IOPCIDevice matching property names
+#define kIOPCIMatchKey                  "IOPCIMatch"
+#define kIOPCIPrimaryMatchKey           "IOPCIPrimaryMatch"
+#define kIOPCISecondaryMatchKey         "IOPCISecondaryMatch"
+#define kIOPCIClassMatchKey             "IOPCIClassMatch"
+
+// property to control PCI default config space save on sleep
+#define kIOPMPCIConfigSpaceVolatileKey  "IOPMPCIConfigSpaceVolatile"
+
+// pci express link status
+#define kIOPCIExpressLinkStatusKey       "IOPCIExpressLinkStatus"
+// pci express link capabilities
+#define kIOPCIExpressLinkCapabilitiesKey "IOPCIExpressLinkCapabilities"
+
+#ifndef kIOPlatformDeviceASPMEnableKey
+#define kIOPlatformDeviceASPMEnableKey  "IOPlatformDeviceASPMEnable"
+#endif
+
+#ifndef kIOPCIDeviceASPMSupportedKey
+#define kIOPCIDeviceASPMSupportedKey    "pci-aspm-supported"
+#endif
+
+#define kIOPCIPMEOptionsKey             "IOPCIPMEOptions"
+
+
+enum {
+    kIOPCIDevicePowerStateCount = 3,
+    kIOPCIDeviceOffState        = 0,
+    kIOPCIDeviceDozeState       = 1,
+    kIOPCIDeviceOnState         = 2,
+};
+
+enum
+{
+    // bits getInterruptType result
+    kIOInterruptTypePCIMessaged = 0x00010000
+};
+
+class IOPCIBridge;
+class IOPCI2PCIBridge;
+class IOPCIMessagedInterruptController;
+
+/*! @class IOPCIDevice : public IOService
+    @abstract An IOService class representing a PCI device.
+    @discussion The discovery of a PCI device by the PCI bus family results in an instance of the IOPCIDevice being created and published. It provides services for looking up and mapping memory mapped hardware, and access to the PCI configuration and I/O spaces. 
+
+<br><br>Matching Supported by IOPCIDevice<br><br>
+
+Two types of matching are available, OpenFirmware name matching and PCI register matching. Currently, only one of these two matching schemes can be used in the same property table.
+
+<br><br>OpenFirmware Name Matching<br><br>
+
+IOService performs matching based on the IONameMatch property (see IOService). IOPCIDevices created with OpenFirmware device tree entries will name match based on the standard OpenFirmware name matching properties.
+
+<br><br>PCI Register Matching<br><br>
+
+A PCI device driver can also match on the values of certain config space registers.
+
+In each case, several matching values can be specified, and an optional mask for the value of the config space register may follow the value, preceded by an '&' character.
+<br>
+<br>
+        kIOPCIMatchKey, "IOPCIMatch"
+<br>
+The kIOPCIMatchKey property matches the vendor and device ID (0x00) register, or the subsystem register (0x2c).
+<br>
+<br>
+        kIOPCIPrimaryMatchKey, "IOPCIPrimaryMatch"
+<br>
+The kIOPCIPrimaryMatchKey property matches the vendor and device ID (0x00) register.
+<br>
+<br>
+        kIOPCISecondaryMatchKey, "IOPCISecondaryMatch"
+<br>
+The kIOPCISecondaryMatchKey property matches the subsystem register (0x2c).
+<br>
+<br>
+        kIOPCIClassMatchKey, "IOPCIClassMatch"
+<br>
+The kIOPCIClassMatchKey property matches the class code register (0x08). The default mask for this register is 0xffffff00.
+<br>
+<br>
+Examples:
+<br>
+<br>
+      &ltkey&gtIOPCIMatch&lt/key&gt             <br>
+        &ltstring&gt0x00261011&lt/string&gt
+<br>
+Matches a device whose vendor ID is 0x1011, and device ID is 0x0026, including subsystem IDs.
+<br>
+<br>
+      &ltkey&gtIOPCIMatch&lt/key&gt             <br>
+        &ltstring&gt0x00789004&0x00ffffff 0x78009004&0x0xff00ffff&lt/string&gt
+<br>
+Matches with any device with a vendor ID of 0x9004, and a device ID of 0xzz78 or 0x78zz, where 'z' is don't care.
+<br>
+<br>
+      &ltkey&gtIOPCIClassMatch&lt/key&gt        <br>
+        &ltstring&gt0x02000000&0xffff0000&lt/string&gt
+<br>
+<br>
+Matches a device whose class code is 0x0200zz, an ethernet device.
+
+*/
+
+class IOPCIDevice : public IOService
+{
+    OSDeclareDefaultStructors(IOPCIDevice)
+
+    friend class IOPCIBridge;
+    friend class IOPCI2PCIBridge;
+    friend class IOPCIMessagedInterruptController;
+
+protected:
+    IOPCIBridge *       parent;
+    IOMemoryMap *       ioMap;
+    OSObject *          slotNameProperty;
+
+/*! @var reserved
+    Reserved for future use.  (Internal use only)  */
+    struct IOPCIDeviceExpansionData * reserved;
+
+public:
+    IOPCIAddressSpace   space;
+    UInt32      *       savedConfig;
+
+public:
+    /* IOService/IORegistryEntry methods */
+
+    virtual bool init( OSDictionary *  propTable );
+    virtual bool init( IORegistryEntry * from,
+                                const IORegistryPlane * inPlane );
+    virtual void free();
+    virtual bool attach( IOService * provider );
+    virtual void detach( IOService * provider );
+
+    virtual IOReturn newUserClient( task_t owningTask, void * securityID,
+                                    UInt32 type,  OSDictionary * properties,
+                                    IOUserClient ** handler );
+
+    virtual IOReturn powerStateWillChangeTo (IOPMPowerFlags  capabilities, 
+                                             unsigned long   stateNumber, 
+                                             IOService*      whatDevice);
+    virtual IOReturn setPowerState( unsigned long, IOService * );
+
+    virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
+    virtual bool matchPropertyTable( OSDictionary *     table,
+                                     SInt32       *     score );
+    virtual IOService * matchLocation( IOService * client );
+    virtual IOReturn getResources( void );
+    virtual IOReturn setProperties(OSObject * properties);
+    virtual IOReturn callPlatformFunction(const OSSymbol * functionName,
+                                          bool waitForFunction,
+                                          void * p1, void * p2,
+                                          void * p3, void * p4);
+    virtual IOReturn callPlatformFunction(const char * functionName,
+                                          bool waitForFunction,
+                                          void * p1, void * p2,
+                                          void * p3, void * p4);
+
+    /* Config space accessors */
+
+    virtual UInt32 configRead32( IOPCIAddressSpace space, UInt8 offset );
+    virtual void configWrite32( IOPCIAddressSpace space,
+                                        UInt8 offset, UInt32 data );
+    virtual UInt16 configRead16( IOPCIAddressSpace space, UInt8 offset );
+    virtual void configWrite16( IOPCIAddressSpace space,
+                                        UInt8 offset, UInt16 data );
+    virtual UInt8 configRead8( IOPCIAddressSpace space, UInt8 offset );
+    virtual void configWrite8( IOPCIAddressSpace space,
+                                        UInt8 offset, UInt8 data );
+
+/*! @function configRead32
+    @abstract Reads a 32-bit value from the PCI device's configuration space.
+    @discussion This method reads a 32-bit configuration space register on the device and returns its value.
+    @param offset An 8-bit offset into configuration space, of which bits 0-1 are ignored.
+    @result An 32-bit value in host byte order (big endian on PPC). */
+
+    virtual UInt32 configRead32( UInt8 offset );
+
+/*! @function configRead16
+    @abstract Reads a 16-bit value from the PCI device's configuration space.
+    @discussion This method reads a 16-bit configuration space register on the device and returns its value.
+    @param offset An 8-bit offset into configuration space, of which bit 0 is ignored.
+    @result An 16-bit value in host byte order (big endian on PPC). */
+
+    virtual UInt16 configRead16( UInt8 offset );
+
+/*! @function configRead8
+    @abstract Reads a 8-bit value from the PCI device's configuration space.
+    @discussion This method reads a 8-bit configuration space register on the device and returns its value.
+    @param offset An 8-bit offset into configuration space.
+    @result An 8-bit value. */
+
+    virtual UInt8 configRead8( UInt8 offset );
+
+/*! @function configWrite32
+    @abstract Writes a 32-bit value to the PCI device's configuration space.
+    @discussion This method write a 32-bit value to a configuration space register on the device.
+    @param offset An 8-bit offset into configuration space, of which bits 0-1 are ignored.
+    @param data An 32-bit value to be written in host byte order (big endian on PPC). */
+
+    virtual void configWrite32( UInt8 offset, UInt32 data );
+
+/*! @function configWrite16
+    @abstract Writes a 16-bit value to the PCI device's configuration space.
+    @discussion This method write a 16-bit value to a configuration space register on the device.
+    @param offset An 8-bit offset into configuration space, of which bit 0 is ignored.
+    @param data An 16-bit value to be written in host byte order (big endian on PPC). */
+
+    virtual void configWrite16( UInt8 offset, UInt16 data );
+
+/*! @function configWrite8
+    @abstract Writes a 8-bit value to the PCI device's configuration space.
+    @discussion This method write a 8-bit value to a configuration space register on the device.
+    @param offset An 8-bit offset into configuration space.
+    @param data An 8-bit value to be written. */
+
+    virtual void configWrite8( UInt8 offset, UInt8 data );
+
+    virtual IOReturn saveDeviceState( IOOptionBits options = 0 );
+    virtual IOReturn restoreDeviceState( IOOptionBits options = 0 );
+
+/*! @function setConfigBits
+    @abstract Sets masked bits in a configuration space register.
+    @discussion This method sets masked bits in a configuration space register on the device by reading and writing the register. The value of the masked bits before the write is returned.
+    @param offset An 8-bit offset into configuration space, of which bits 0-1 are ignored.
+    @param mask An 32-bit mask indicating which bits in the value parameter are valid.
+    @param data An 32-bit value to be written in host byte order (big endian on PPC).
+    @result The value of the register masked with the mask before the write. */
+    
+    virtual UInt32 setConfigBits( UInt8 offset, UInt32 mask, UInt32 value );
+
+/*! @function setMemoryEnable
+    @abstract Sets the device's memory space response.
+    @discussion This method sets the memory space response bit in the device's command config space register to the passed value, and returns the previous state of the enable.
+    @param enable True or false to enable or disable the memory space response.
+    @result True if the memory space response was previously enabled, false otherwise. */
+
+    virtual bool setMemoryEnable( bool enable );
+
+/*! @function setIOEnable
+    @abstract Sets the device's I/O space response.
+    @discussion This method sets the I/O space response bit in the device's command config space register to the passed value, and returns the previous state of the enable. The exclusive option allows only one exclusive device on the bus to be enabled concurrently, this should be only for temporary access.
+    @param enable True or false to enable or disable the I/O space response.
+    @param exclusive If true, only one setIOEnable with the exclusive flag set will be allowed at a time on the bus, this should be only for temporary access.
+    @result True if the I/O space response was previously enabled, false otherwise. */
+
+    virtual bool setIOEnable( bool enable, bool exclusive = false );
+
+/*! @function setBusMasterEnable
+    @abstract Sets the device's bus master enable.
+    @discussion This method sets the bus master enable bit in the device's command config space register to the passed value, and returns the previous state of the enable.
+    @param enable True or false to enable or disable bus mastering.
+    @result True if bus mastering was previously enabled, false otherwise. */
+
+    virtual bool setBusMasterEnable( bool enable );
+
+/*! @function findPCICapability
+    @abstract Search configuration space for a PCI capability register.
+    @discussion This method searches the device's config space for a PCI capability register matching the passed capability ID, if the device supports PCI capabilities. To search for PCI Express extended capabilities or for multiple capablities with the same ID, use the extendedFindPCICapability() method.
+    @param capabilityID An 8-bit PCI capability ID.
+    @param offset An optional pointer to return the offset into config space where the capability was found.
+    @result The 32-bit value of the capability register if one was found, zero otherwise. */
+
+    virtual UInt32 findPCICapability( UInt8 capabilityID, UInt8 * offset = 0 );
+
+/*! @function getBusNumber
+    @abstract Accessor to return the PCI device's assigned bus number.
+    @discussion This method is an accessor to return the PCI device's assigned bus number.
+    @result The 8-bit value of device's PCI bus number. */
+
+    virtual UInt8 getBusNumber( void );
+
+/*! @function getDeviceNumber
+    @abstract Accessor to return the PCI device's device number.
+    @discussion This method is an accessor to return the PCI device's device number.
+    @result The 5-bit value of device's device number. */
+
+    virtual UInt8 getDeviceNumber( void );
+
+/*! @function getFunctionNumber
+    @abstract Accessor to return the PCI device's function number.
+    @discussion This method is an accessor to return the PCI device's function number.
+    @result The 3-bit value of device's function number. */
+
+    virtual UInt8 getFunctionNumber( void );
+
+    /* Device memory accessors */
+
+/*! @function getDeviceMemoryWithRegister
+    @abstract Returns an instance of IODeviceMemory representing one of the device's memory mapped ranges.
+    @discussion This method will return a pointer to an instance of IODeviceMemory for the physical memory range that was assigned to the configuration space base address register passed in. It is analogous to IOService::getDeviceMemoryWithIndex.
+    @param reg The 8-bit configuration space register that is the base address register for the desired range.
+    @result A pointer to an instance of IODeviceMemory, or zero no such range was found. The IODeviceMemory is retained by the provider, so is valid while attached, or while any mappings to it exist. It should not be released by the caller. */
+
+    virtual IODeviceMemory * getDeviceMemoryWithRegister( UInt8 reg );
+
+/*! @function mapDeviceMemoryWithRegister
+    @abstract Maps a physical range of the device.
+    @discussion This method will create a mapping for the IODeviceMemory for the physical memory range that was assigned to the configuration space base address register passed in, with IODeviceMemory::map(options). The mapping is represented by the returned instance of IOMemoryMap, which should not be released until the mapping is no longer required. This method is analogous to IOService::mapDeviceMemoryWithIndex.
+    @param reg The 8-bit configuration space register that is the base address register for the desired range.
+    @param options Options to be passed to the IOMemoryDescriptor::map() method.
+    @result An instance of IOMemoryMap, or zero if the index is beyond the count available. The mapping should be released only when access to it is no longer required. */
+
+    virtual IOMemoryMap * mapDeviceMemoryWithRegister( UInt8 reg,
+                                                IOOptionBits options = 0 );
+
+/*! @function ioDeviceMemory
+    @abstract Accessor to the I/O space aperture for the bus.
+    @discussion This method will return a reference to the IODeviceMemory for the I/O aperture of the bus the device is on.
+    @result A pointer to an IODeviceMemory object for the I/O aperture. The IODeviceMemory is retained by the provider, so is valid while attached, or while any mappings to it exist. It should not be released by the caller. */
+
+    virtual IODeviceMemory * ioDeviceMemory( void );
+
+    /* I/O space accessors */
+
+/*! @function ioWrite32
+    @abstract Writes a 32-bit value to an I/O space aperture.
+    @discussion This method will write a 32-bit value to a 4 byte aligned offset in an I/O space aperture. If a map object is passed in, the value is written relative to it, otherwise to the value is written relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
+    @param offset An offset into a bus or device's I/O space aperture.
+    @param value The value to be written in host byte order (big endian on PPC).
+    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space. */
+
+    virtual void ioWrite32( UInt16 offset, UInt32 value,
+                                IOMemoryMap * map = 0 );
+
+/*! @function ioWrite16
+    @abstract Writes a 16-bit value to an I/O space aperture.
+    @discussion This method will write a 16-bit value to a 2 byte aligned offset in an I/O space aperture. If a map object is passed in, the value is written relative to it, otherwise to the value is written relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
+    @param offset An offset into a bus or device's I/O space aperture.
+    @param value The value to be written in host byte order (big endian on PPC).
+    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space. */
+
+    virtual void ioWrite16( UInt16 offset, UInt16 value,
+                                IOMemoryMap * map = 0 );
+
+/*! @function ioWrite8
+    @abstract Writes a 8-bit value to an I/O space aperture.
+    @discussion This method will write a 8-bit value to an offset in an I/O space aperture. If a map object is passed in, the value is written relative to it, otherwise to the value is written relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
+    @param offset An offset into a bus or device's I/O space aperture.
+    @param value The value to be written in host byte order (big endian on PPC).
+    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space. */
+
+    virtual void ioWrite8( UInt16 offset, UInt8 value,
+                                IOMemoryMap * map = 0 );
+
+/*! @function ioRead32
+    @abstract Reads a 32-bit value from an I/O space aperture.
+    @discussion This method will read a 32-bit value from a 4 byte aligned offset in an I/O space aperture. If a map object is passed in, the value is read relative to it, otherwise to the value is read relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
+    @param offset An offset into a bus or device's I/O space aperture.
+    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space.
+    @result The value read in host byte order (big endian on PPC). */
+
+    virtual UInt32 ioRead32( UInt16 offset, IOMemoryMap * map = 0 );
+
+/*! @function ioRead16
+    @abstract Reads a 16-bit value from an I/O space aperture.
+    @discussion This method will read a 16-bit value from a 2 byte aligned offset in an I/O space aperture. If a map object is passed in, the value is read relative to it, otherwise to the value is read relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
+    @param offset An offset into a bus or device's I/O space aperture.
+    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space.
+    @result The value read in host byte order (big endian on PPC). */
+
+    virtual UInt16 ioRead16( UInt16 offset, IOMemoryMap * map = 0 );
+
+/*! @function ioRead8
+    @abstract Reads a 8-bit value from an I/O space aperture.
+    @discussion This method will read a 8-bit value from an offset in an I/O space aperture. If a map object is passed in, the value is read relative to it, otherwise to the value is read relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
+    @param offset An offset into a bus or device's I/O space aperture.
+    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space.
+    @result The value read. */
+
+    virtual UInt8 ioRead8( UInt16 offset, IOMemoryMap * map = 0 );
+
+    OSMetaClassDeclareReservedUsed(IOPCIDevice,  0);
+/*! @function hasPCIPowerManagement
+    @abstract determine whether or not the device supports PCI Bus Power Management.
+    @discussion This method will look at the device's capabilties registers and determine whether or not the device supports the PCI BUS Power Management Specification.
+    @param state(optional) Check for support of a specific state (e.g. kPCIPMCPMESupportFromD3Cold). If state is not suuplied or is 0, then check for a property in the registry which tells which state the hardware expects the device to go to during sleep.
+    @result true if the specified state is supported */
+    virtual bool hasPCIPowerManagement(IOOptionBits state = 0);
+    
+    OSMetaClassDeclareReservedUsed(IOPCIDevice,  1);
+/*! @function enablePCIPowerManagement
+    @abstract enable PCI power management for sleep state
+    @discussion This method will enable PCI Bus Powermanagement when going to sleep mode.
+    @param state(optional) Enables PCI Power Management by placing the function in the given state (e.g. kPCIPMCSPowerStateD3). If state is not specified or is 0xffffffff, then the IOPCIDevice determines the desired state. If state is kPCIPMCSPowerStateD0 (0) then PCI Power Management is disabled.
+    @result kIOReturnSuccess if there were no errors */
+    virtual IOReturn enablePCIPowerManagement(IOOptionBits state = 0xffffffff);
+    
+    OSMetaClassDeclareReservedUsed(IOPCIDevice,  2);
+/*! @function extendedFindPCICapability
+    @abstract Search configuration space for a PCI capability register.
+    @discussion This method searches the device's config space for a PCI capability register matching the passed capability ID, if the device supports PCI capabilities.
+    @param capabilityID A PCI capability ID. PCI Express devices may support extended capabilities in config space starting at offset 0x100. To search this space, the ID passed should be the negated value of the PCI-SIG assigned ID for the extended capability.
+    @param offset An optional in/out parameter to return the offset into config space where the capability was found, and to set the start point of the next search. Initialize the offset to zero before the first call to extendedFindPCICapability() and subsequent calls will find all capabilty blocks that may exist on the device with the same ID.
+    @result The 32-bit value of the capability register if one was found, zero otherwise. */
+
+    virtual UInt32 extendedFindPCICapability( UInt32 capabilityID, IOByteCount * offset = 0 );
+
+    // Unused Padding
+    OSMetaClassDeclareReservedUnused(IOPCIDevice,  3);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice,  4);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice,  5);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice,  6);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice,  7);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice,  8);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice,  9);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice, 10);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice, 11);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice, 12);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice, 13);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice, 14);
+    OSMetaClassDeclareReservedUnused(IOPCIDevice, 15);
+
+public:
+
+/*! @function extendedConfigRead32
+    @abstract Reads a 32-bit value from the PCI device's configuration space.
+    @discussion This method reads a 32-bit configuration space register on the device and returns its value.
+    @param offset A byte offset into configuration space, of which bits 0-1 are ignored.
+    @result An 32-bit value in host byte order (big endian on PPC). */
+
+    UInt32 extendedConfigRead32( IOByteCount offset );
+
+/*! @function extendedConfigRead16
+    @abstract Reads a 16-bit value from the PCI device's configuration space.
+    @discussion This method reads a 16-bit configuration space register on the device and returns its value.
+    @param offset A byte offset into configuration space, of which bit 0 is ignored.
+    @result An 16-bit value in host byte order (big endian on PPC). */
+
+    UInt16 extendedConfigRead16( IOByteCount offset );
+
+/*! @function extendedConfigRead8
+    @abstract Reads a 8-bit value from the PCI device's configuration space.
+    @discussion This method reads a 8-bit configuration space register on the device and returns its value.
+    @param offset A byte offset into configuration space.
+    @result An 8-bit value. */
+
+    UInt8 extendedConfigRead8( IOByteCount offset );
+
+/*! @function extendedConfigWrite32
+    @abstract Writes a 32-bit value to the PCI device's configuration space.
+    @discussion This method writes a 32-bit value to a configuration space register on the device.
+    @param offset A byte offset into configuration space, of which bits 0-1 are ignored.
+    @param data An 32-bit value to be written in host byte order (big endian on PPC). */
+
+    void extendedConfigWrite32( IOByteCount offset, UInt32 data );
+
+/*! @function extendedConfigWrite16
+    @abstract Writes a 16-bit value to the PCI device's configuration space.
+    @discussion This method writes a 16-bit value to a configuration space register on the device.
+    @param offset A byte offset into configuration space, of which bit 0 is ignored.
+    @param data An 16-bit value to be written in host byte order (big endian on PPC). */
+
+    void extendedConfigWrite16( IOByteCount offset, UInt16 data );
+
+/*! @function extendedConfigWrite8
+    @abstract Writes a 8-bit value to the PCI device's configuration space.
+    @discussion This method writes a 8-bit value to a configuration space register on the device.
+    @param offset A byte offset into configuration space.
+    @param data An 8-bit value to be written. */
+
+    void extendedConfigWrite8( IOByteCount offset, UInt8 data );
+};
+
+#endif /* ! _IOKIT_IOPCIDEVICE_H */
+
diff --git a/i386/include/IOKit/platform/.svn/all-wcprops b/i386/include/IOKit/platform/.svn/all-wcprops
new file mode 100644
index 0000000..895fe9d
--- /dev/null
+++ b/i386/include/IOKit/platform/.svn/all-wcprops
@@ -0,0 +1,29 @@
+K 25
+svn:wc:ra_dav:version-url
+V 61
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/platform
+END
+AppleMacIO.h
+K 25
+svn:wc:ra_dav:version-url
+V 74
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/platform/AppleMacIO.h
+END
+AppleMacIODevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 80
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/platform/AppleMacIODevice.h
+END
+ApplePlatformExpert.h
+K 25
+svn:wc:ra_dav:version-url
+V 83
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/platform/ApplePlatformExpert.h
+END
+AppleNMI.h
+K 25
+svn:wc:ra_dav:version-url
+V 72
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/platform/AppleNMI.h
+END
diff --git a/i386/include/IOKit/platform/.svn/entries b/i386/include/IOKit/platform/.svn/entries
new file mode 100644
index 0000000..51b93d8
--- /dev/null
+++ b/i386/include/IOKit/platform/.svn/entries
@@ -0,0 +1,164 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/platform
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+AppleMacIO.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+e9614e104fdb0969eeaab8f5878c15db
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2553
+
+AppleMacIODevice.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+da33d4bcb4363ccb7d832f9b7019b3c9
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2153
+
+ApplePlatformExpert.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+227f5a69a8d7c83855c4dff7a0bdd68f
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2744
+
+AppleNMI.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+65ddf2ae2939f64b26b164cf5301970c
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2542
+
diff --git a/i386/include/IOKit/platform/.svn/text-base/AppleMacIO.h.svn-base b/i386/include/IOKit/platform/.svn/text-base/AppleMacIO.h.svn-base
new file mode 100644
index 0000000..ae12eca
--- /dev/null
+++ b/i386/include/IOKit/platform/.svn/text-base/AppleMacIO.h.svn-base
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_APPLEMACIO_H
+#define _IOKIT_APPLEMACIO_H
+
+#include <IOKit/IOService.h>
+
+#include <IOKit/platform/AppleMacIODevice.h>
+
+class AppleMacIO : public IOService
+{
+    OSDeclareAbstractStructors(AppleMacIO);
+
+    IOService *		fNub;
+    IOMemoryMap *	fMemory;
+
+    struct ExpansionData { };
+    ExpansionData *fReserved;
+    
+protected:
+    virtual bool selfTest( void );
+
+public:
+    virtual bool start(	IOService * provider );
+
+    virtual IOService * createNub( IORegistryEntry * from );
+
+    virtual void processNub( IOService * nub );
+
+    virtual void publishBelow( IORegistryEntry * root );
+
+    virtual const char * deleteList( void );
+    virtual const char * excludeList( void );
+
+    virtual bool compareNubName( const IOService * nub, OSString * name,
+				 OSString ** matched = 0 ) const;
+
+    virtual IOReturn getNubResources( IOService * nub );
+
+    OSMetaClassDeclareReservedUnused(AppleMacIO,  0);
+    OSMetaClassDeclareReservedUnused(AppleMacIO,  1);
+    OSMetaClassDeclareReservedUnused(AppleMacIO,  2);
+    OSMetaClassDeclareReservedUnused(AppleMacIO,  3);
+};
+
+#endif /* ! _IOKIT_APPLEMACIO_H */
diff --git a/i386/include/IOKit/platform/.svn/text-base/AppleMacIODevice.h.svn-base b/i386/include/IOKit/platform/.svn/text-base/AppleMacIODevice.h.svn-base
new file mode 100644
index 0000000..8d033fd
--- /dev/null
+++ b/i386/include/IOKit/platform/.svn/text-base/AppleMacIODevice.h.svn-base
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_APPLEMACIODEVICE_H
+#define _IOKIT_APPLEMACIODEVICE_H
+
+#include <IOKit/IOService.h>
+
+class AppleMacIODevice : public IOService
+{
+  OSDeclareDefaultStructors(AppleMacIODevice);
+
+private:  
+  struct ExpansionData { };
+  ExpansionData *reserved;
+
+public:
+  virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
+  virtual IOService *matchLocation(IOService *client);
+  virtual IOReturn getResources( void );
+    
+  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  0);
+  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  1);
+  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  2);
+  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  3);
+};
+
+#endif /* ! _IOKIT_APPLEMACIODEVICE_H */
diff --git a/i386/include/IOKit/platform/.svn/text-base/AppleNMI.h.svn-base b/i386/include/IOKit/platform/.svn/text-base/AppleNMI.h.svn-base
new file mode 100644
index 0000000..14cd1ed
--- /dev/null
+++ b/i386/include/IOKit/platform/.svn/text-base/AppleNMI.h.svn-base
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998-9 Apple Computer, Inc.  All rights reserved.
+ *
+ *  DRI: Josh de Cesare
+ *
+ */
+
+#ifndef _IOKIT_APPLENMI_H
+#define _IOKIT_APPLENMI_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOInterrupts.h>
+
+// NMI Interrupt Constants
+enum
+{
+    kExtInt9_NMIIntSource      = 0x800506E0,
+    kNMIIntLevelMask           = 0x00004000,
+    kNMIIntMask                = 0x00000080
+};
+
+
+class AppleNMI : public IOService
+{
+  OSDeclareDefaultStructors(AppleNMI);
+
+private:
+  bool enable_debugger;
+  bool mask_NMI;
+
+  struct ExpansionData { };
+  ExpansionData * reserved;	// Reserved for future use
+
+public:
+  IOService *rootDomain;
+  virtual bool start(IOService *provider);
+  virtual IOReturn initNMI(IOInterruptController *parentController, OSData *parentSource);
+  virtual IOReturn handleInterrupt(void *refCon, IOService *nub, int source);
+
+  // Power handling methods:
+  virtual IOReturn powerStateWillChangeTo(IOPMPowerFlags, unsigned long, IOService*);
+
+  OSMetaClassDeclareReservedUnused(AppleNMI,  0);
+  OSMetaClassDeclareReservedUnused(AppleNMI,  1);
+  OSMetaClassDeclareReservedUnused(AppleNMI,  2);
+  OSMetaClassDeclareReservedUnused(AppleNMI,  3);
+};
+
+#endif /* ! _IOKIT_APPLENMI_H */
diff --git a/i386/include/IOKit/platform/.svn/text-base/ApplePlatformExpert.h.svn-base b/i386/include/IOKit/platform/.svn/text-base/ApplePlatformExpert.h.svn-base
new file mode 100644
index 0000000..59728d2
--- /dev/null
+++ b/i386/include/IOKit/platform/.svn/text-base/ApplePlatformExpert.h.svn-base
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_APPLEPLATFORM_H
+#define _IOKIT_APPLEPLATFORM_H
+
+#include <IOKit/IOPlatformExpert.h>
+
+enum {
+  kBootROMTypeOldWorld = 0,
+  kBootROMTypeNewWorld
+};
+
+enum {
+  kChipSetTypePowerSurge = 0,
+  kChipSetTypePowerStar,
+  kChipSetTypeGossamer,
+  kChipSetTypePowerExpress,
+  kChipSetTypeCore99,
+  kChipSetTypeCore2001
+};
+
+enum {
+  kMachineTypeUnknown = 0
+};
+
+extern const OSSymbol *gGetDefaultBusSpeedsKey;
+
+class ApplePlatformExpert : public IODTPlatformExpert
+{
+  OSDeclareAbstractStructors(ApplePlatformExpert);
+  
+private:    
+  SInt32 _timeToGMT;
+
+  struct ExpansionData { };
+  ExpansionData *reserved;
+
+public:
+  virtual bool start( IOService * provider );
+  virtual bool configure( IOService * provider );
+  virtual const char * deleteList( void );
+  virtual const char * excludeList( void );
+  
+  virtual void registerNVRAMController( IONVRAMController * nvram );
+  
+  virtual long getGMTTimeOfDay(void);
+  virtual void setGMTTimeOfDay(long secs);
+  
+  virtual bool getMachineName(char *name, int maxLength);
+
+  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  0);
+  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  1);
+  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  2);
+  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  3);
+};
+
+
+#endif /* ! _IOKIT_APPLEPLATFORM_H */
diff --git a/i386/include/IOKit/platform/AppleMacIO.h b/i386/include/IOKit/platform/AppleMacIO.h
new file mode 100644
index 0000000..ae12eca
--- /dev/null
+++ b/i386/include/IOKit/platform/AppleMacIO.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_APPLEMACIO_H
+#define _IOKIT_APPLEMACIO_H
+
+#include <IOKit/IOService.h>
+
+#include <IOKit/platform/AppleMacIODevice.h>
+
+class AppleMacIO : public IOService
+{
+    OSDeclareAbstractStructors(AppleMacIO);
+
+    IOService *		fNub;
+    IOMemoryMap *	fMemory;
+
+    struct ExpansionData { };
+    ExpansionData *fReserved;
+    
+protected:
+    virtual bool selfTest( void );
+
+public:
+    virtual bool start(	IOService * provider );
+
+    virtual IOService * createNub( IORegistryEntry * from );
+
+    virtual void processNub( IOService * nub );
+
+    virtual void publishBelow( IORegistryEntry * root );
+
+    virtual const char * deleteList( void );
+    virtual const char * excludeList( void );
+
+    virtual bool compareNubName( const IOService * nub, OSString * name,
+				 OSString ** matched = 0 ) const;
+
+    virtual IOReturn getNubResources( IOService * nub );
+
+    OSMetaClassDeclareReservedUnused(AppleMacIO,  0);
+    OSMetaClassDeclareReservedUnused(AppleMacIO,  1);
+    OSMetaClassDeclareReservedUnused(AppleMacIO,  2);
+    OSMetaClassDeclareReservedUnused(AppleMacIO,  3);
+};
+
+#endif /* ! _IOKIT_APPLEMACIO_H */
diff --git a/i386/include/IOKit/platform/AppleMacIODevice.h b/i386/include/IOKit/platform/AppleMacIODevice.h
new file mode 100644
index 0000000..8d033fd
--- /dev/null
+++ b/i386/include/IOKit/platform/AppleMacIODevice.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_APPLEMACIODEVICE_H
+#define _IOKIT_APPLEMACIODEVICE_H
+
+#include <IOKit/IOService.h>
+
+class AppleMacIODevice : public IOService
+{
+  OSDeclareDefaultStructors(AppleMacIODevice);
+
+private:  
+  struct ExpansionData { };
+  ExpansionData *reserved;
+
+public:
+  virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
+  virtual IOService *matchLocation(IOService *client);
+  virtual IOReturn getResources( void );
+    
+  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  0);
+  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  1);
+  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  2);
+  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  3);
+};
+
+#endif /* ! _IOKIT_APPLEMACIODEVICE_H */
diff --git a/i386/include/IOKit/platform/AppleNMI.h b/i386/include/IOKit/platform/AppleNMI.h
new file mode 100644
index 0000000..14cd1ed
--- /dev/null
+++ b/i386/include/IOKit/platform/AppleNMI.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998-9 Apple Computer, Inc.  All rights reserved.
+ *
+ *  DRI: Josh de Cesare
+ *
+ */
+
+#ifndef _IOKIT_APPLENMI_H
+#define _IOKIT_APPLENMI_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOInterrupts.h>
+
+// NMI Interrupt Constants
+enum
+{
+    kExtInt9_NMIIntSource      = 0x800506E0,
+    kNMIIntLevelMask           = 0x00004000,
+    kNMIIntMask                = 0x00000080
+};
+
+
+class AppleNMI : public IOService
+{
+  OSDeclareDefaultStructors(AppleNMI);
+
+private:
+  bool enable_debugger;
+  bool mask_NMI;
+
+  struct ExpansionData { };
+  ExpansionData * reserved;	// Reserved for future use
+
+public:
+  IOService *rootDomain;
+  virtual bool start(IOService *provider);
+  virtual IOReturn initNMI(IOInterruptController *parentController, OSData *parentSource);
+  virtual IOReturn handleInterrupt(void *refCon, IOService *nub, int source);
+
+  // Power handling methods:
+  virtual IOReturn powerStateWillChangeTo(IOPMPowerFlags, unsigned long, IOService*);
+
+  OSMetaClassDeclareReservedUnused(AppleNMI,  0);
+  OSMetaClassDeclareReservedUnused(AppleNMI,  1);
+  OSMetaClassDeclareReservedUnused(AppleNMI,  2);
+  OSMetaClassDeclareReservedUnused(AppleNMI,  3);
+};
+
+#endif /* ! _IOKIT_APPLENMI_H */
diff --git a/i386/include/IOKit/platform/ApplePlatformExpert.h b/i386/include/IOKit/platform/ApplePlatformExpert.h
new file mode 100644
index 0000000..59728d2
--- /dev/null
+++ b/i386/include/IOKit/platform/ApplePlatformExpert.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_APPLEPLATFORM_H
+#define _IOKIT_APPLEPLATFORM_H
+
+#include <IOKit/IOPlatformExpert.h>
+
+enum {
+  kBootROMTypeOldWorld = 0,
+  kBootROMTypeNewWorld
+};
+
+enum {
+  kChipSetTypePowerSurge = 0,
+  kChipSetTypePowerStar,
+  kChipSetTypeGossamer,
+  kChipSetTypePowerExpress,
+  kChipSetTypeCore99,
+  kChipSetTypeCore2001
+};
+
+enum {
+  kMachineTypeUnknown = 0
+};
+
+extern const OSSymbol *gGetDefaultBusSpeedsKey;
+
+class ApplePlatformExpert : public IODTPlatformExpert
+{
+  OSDeclareAbstractStructors(ApplePlatformExpert);
+  
+private:    
+  SInt32 _timeToGMT;
+
+  struct ExpansionData { };
+  ExpansionData *reserved;
+
+public:
+  virtual bool start( IOService * provider );
+  virtual bool configure( IOService * provider );
+  virtual const char * deleteList( void );
+  virtual const char * excludeList( void );
+  
+  virtual void registerNVRAMController( IONVRAMController * nvram );
+  
+  virtual long getGMTTimeOfDay(void);
+  virtual void setGMTTimeOfDay(long secs);
+  
+  virtual bool getMachineName(char *name, int maxLength);
+
+  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  0);
+  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  1);
+  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  2);
+  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  3);
+};
+
+
+#endif /* ! _IOKIT_APPLEPLATFORM_H */
diff --git a/i386/include/IOKit/power/.svn/all-wcprops b/i386/include/IOKit/power/.svn/all-wcprops
new file mode 100644
index 0000000..3d3be10
--- /dev/null
+++ b/i386/include/IOKit/power/.svn/all-wcprops
@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 58
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/power
+END
+IOPwrController.h
+K 25
+svn:wc:ra_dav:version-url
+V 76
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/power/IOPwrController.h
+END
diff --git a/i386/include/IOKit/power/.svn/entries b/i386/include/IOKit/power/.svn/entries
new file mode 100644
index 0000000..3875525
--- /dev/null
+++ b/i386/include/IOKit/power/.svn/entries
@@ -0,0 +1,62 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/power
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IOPwrController.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+9c95987a30b51b9e00dd6f7400e645fb
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1513
+
diff --git a/i386/include/IOKit/power/.svn/text-base/IOPwrController.h.svn-base b/i386/include/IOKit/power/.svn/text-base/IOPwrController.h.svn-base
new file mode 100644
index 0000000..709a0fb
--- /dev/null
+++ b/i386/include/IOKit/power/.svn/text-base/IOPwrController.h.svn-base
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * 24 Nov  1998 suurballe  Created.
+ */
+
+#include <IOKit/IOService.h>
+
+class IOPwrController: public IOService
+{
+OSDeclareAbstractStructors(IOPwrController)
+
+public:
+
+};
+
diff --git a/i386/include/IOKit/power/IOPwrController.h b/i386/include/IOKit/power/IOPwrController.h
new file mode 100644
index 0000000..709a0fb
--- /dev/null
+++ b/i386/include/IOKit/power/IOPwrController.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * 24 Nov  1998 suurballe  Created.
+ */
+
+#include <IOKit/IOService.h>
+
+class IOPwrController: public IOService
+{
+OSDeclareAbstractStructors(IOPwrController)
+
+public:
+
+};
+
diff --git a/i386/include/IOKit/ppc/.svn/all-wcprops b/i386/include/IOKit/ppc/.svn/all-wcprops
new file mode 100644
index 0000000..419eea0
--- /dev/null
+++ b/i386/include/IOKit/ppc/.svn/all-wcprops
@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 56
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/ppc
+END
+IODBDMA.h
+K 25
+svn:wc:ra_dav:version-url
+V 66
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/ppc/IODBDMA.h
+END
diff --git a/i386/include/IOKit/ppc/.svn/entries b/i386/include/IOKit/ppc/.svn/entries
new file mode 100644
index 0000000..c49eb0a
--- /dev/null
+++ b/i386/include/IOKit/ppc/.svn/entries
@@ -0,0 +1,62 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/ppc
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IODBDMA.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+15a4a0c26bd1a9295d2de0f0544051f1
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12529
+
diff --git a/i386/include/IOKit/ppc/.svn/text-base/IODBDMA.h.svn-base b/i386/include/IOKit/ppc/.svn/text-base/IODBDMA.h.svn-base
new file mode 100644
index 0000000..afe1337
--- /dev/null
+++ b/i386/include/IOKit/ppc/.svn/text-base/IODBDMA.h.svn-base
@@ -0,0 +1,367 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1997 Apple Computer, Inc.
+ *
+ *
+ * HISTORY
+ *
+ * Simon Douglas  10 Nov 97
+ * - first checked in, mostly from MacOS DBDMA.i, machdep/ppc/dbdma.h
+ *	but use byte reverse ops.
+ */
+
+#ifndef _IODBDMA_H_
+#define _IODBDMA_H_
+
+#include <IOKit/IOTypes.h>
+#include <libkern/OSByteOrder.h>
+
+
+/* DBDMA definitions */
+
+struct IODBDMAChannelRegisters {
+    volatile unsigned long 	channelControl;
+    volatile unsigned long 	channelStatus;
+    volatile unsigned long 	commandPtrHi;		/* implementation optional*/
+    volatile unsigned long 	commandPtrLo;
+    volatile unsigned long 	interruptSelect;	/* implementation optional*/
+    volatile unsigned long 	branchSelect;		/* implementation optional*/
+    volatile unsigned long 	waitSelect;		/* implementation optional*/
+    volatile unsigned long 	transferModes;		/* implementation optional*/
+    volatile unsigned long 	data2PtrHi;		/* implementation optional*/
+    volatile unsigned long 	data2PtrLo;		/* implementation optional*/
+
+    volatile unsigned long 	reserved1;
+    volatile unsigned long 	addressHi;		/* implementation optional*/
+    volatile unsigned long 	reserved2[4];
+    volatile unsigned long 	unimplemented[16];
+
+/* This structure must remain fully padded to 256 bytes.*/
+    volatile unsigned long 	undefined[32];
+};
+typedef struct IODBDMAChannelRegisters IODBDMAChannelRegisters;
+
+/* These constants define the DB-DMA channel control words and status flags.*/
+
+enum {
+	kdbdmaRun	= 0x00008000,
+	kdbdmaPause	= 0x00004000,
+	kdbdmaFlush	= 0x00002000,
+	kdbdmaWake	= 0x00001000,
+	kdbdmaDead	= 0x00000800,
+	kdbdmaActive	= 0x00000400,
+	kdbdmaBt	= 0x00000100,
+	kdbdmaS7	= 0x00000080,
+	kdbdmaS6	= 0x00000040,
+	kdbdmaS5	= 0x00000020,
+	kdbdmaS4	= 0x00000010,
+	kdbdmaS3	= 0x00000008,
+	kdbdmaS2	= 0x00000004,
+	kdbdmaS1	= 0x00000002,
+	kdbdmaS0	= 0x00000001
+};
+
+
+#define	IOSetDBDMAChannelControlBits(mask)	( ((mask) | (mask) << 16) )
+#define	IOClearDBDMAChannelControlBits(mask)	( (mask) << 16)
+
+
+/* This structure defines the DB-DMA channel command descriptor.*/
+
+/*
+   *** WARNING:	Endian-ness issues must be considered when performing load/store! ***
+*/
+
+struct IODBDMADescriptor {
+	unsigned long            operation;   /* cmd || key || i || b || w || reqCount*/
+	unsigned long            address;
+	volatile unsigned long   cmdDep;
+	volatile unsigned long   result;      /* xferStatus || resCount*/
+};
+typedef struct IODBDMADescriptor IODBDMADescriptor;
+
+/* These constants define the DB-DMA channel command operations and modifiers.*/
+
+
+enum {
+/* Command.cmd operations*/
+	kdbdmaOutputMore	= 0,
+	kdbdmaOutputLast	= 1,
+	kdbdmaInputMore		= 2,
+	kdbdmaInputLast		= 3,
+	kdbdmaStoreQuad		= 4,
+	kdbdmaLoadQuad		= 5,
+	kdbdmaNop		= 6,
+	kdbdmaStop		= 7
+};
+
+
+enum {
+/* Command.key modifiers (choose one for INPUT, OUTPUT, LOAD, and STORE)*/
+	kdbdmaKeyStream0	= 0,	/* default modifier*/
+	kdbdmaKeyStream1	= 1,
+	kdbdmaKeyStream2	= 2,
+	kdbdmaKeyStream3	= 3,
+	kdbdmaKeyRegs		= 5,
+	kdbdmaKeySystem		= 6,
+	kdbdmaKeyDevice		= 7,
+
+	kdbdmaIntNever		= 0,	/* default modifier*/
+	kdbdmaIntIfTrue		= 1,
+	kdbdmaIntIfFalse	= 2,
+	kdbdmaIntAlways		= 3,
+
+	kdbdmaBranchNever	= 0,	/* default modifier*/
+	kdbdmaBranchIfTrue	= 1,
+	kdbdmaBranchIfFalse	= 2,
+	kdbdmaBranchAlways	= 3,
+
+	kdbdmaWaitNever		= 0,	/* default modifier*/
+	kdbdmaWaitIfTrue	= 1,
+	kdbdmaWaitIfFalse	= 2,
+	kdbdmaWaitAlways	= 3,
+
+	kdbdmaCommandMask	= (long)0xFFFF0000,
+	kdbdmaReqCountMask	= 0x0000FFFF
+};
+
+
+/* These constants define the DB-DMA channel command results.*/
+
+enum {
+	/* result masks*/
+	kdbdmaStatusRun		= kdbdmaRun << 16,
+	kdbdmaStatusPause	= kdbdmaPause << 16,
+	kdbdmaStatusFlush	= kdbdmaFlush << 16,
+	kdbdmaStatusWake	= kdbdmaWake << 16,
+	kdbdmaStatusDead	= kdbdmaDead << 16,
+	kdbdmaStatusActive	= kdbdmaActive << 16,
+	kdbdmaStatusBt		= kdbdmaBt << 16,
+	kdbdmaStatusS7		= kdbdmaS7 << 16,
+	kdbdmaStatusS6		= kdbdmaS6 << 16,
+	kdbdmaStatusS5		= kdbdmaS5 << 16,
+	kdbdmaStatusS4		= kdbdmaS4 << 16,
+	kdbdmaStatusS3		= kdbdmaS3 << 16,
+	kdbdmaStatusS2		= kdbdmaS2 << 16,
+	kdbdmaStatusS1		= kdbdmaS1 << 16,
+	kdbdmaStatusS0		= kdbdmaS0 << 16,
+	kdbdmaResCountMask	= 0x0000FFFF,
+	kdbdmaXferStatusMask	= 0xFFFF0000
+};
+
+
+/*  These macros are are IODBDMAChannelRegisters accessor functions. */
+
+#define IOSetDBDMAChannelRegister(registerSetPtr,field,value)	\
+OSWriteSwapInt32(registerSetPtr,offsetof(IODBDMAChannelRegisters,field),value)
+
+#define IOGetDBDMAChannelRegister(registerSetPtr, field)	\
+OSReadSwapInt32(registerSetPtr,offsetof(IODBDMAChannelRegisters, field))
+
+
+/* 	void IOSetDBDMAChannelControl (IODBDMAChannelRegisters *registerSetPtr, unsigned long ctlValue); */
+
+#define IOSetDBDMAChannelControl(registerSetPtr,ctlValue)		\
+do {									\
+    eieio();								\
+    IOSetDBDMAChannelRegister(registerSetPtr,channelControl,ctlValue);	\
+    eieio();								\
+} while(0)
+
+/* 	unsigned long IOGetDBDMAChannelStatus (IODBDMAChannelRegisters *registerSetPtr); */
+
+#define IOGetDBDMAChannelStatus(registerSetPtr)		\
+	IOGetDBDMAChannelRegister(registerSetPtr,channelStatus)
+
+/* 	unsigned long IOGetDBDMACommandPtr (IODBDMAChannelRegisters *registerSetPtr); */
+
+#define IOGetDBDMACommandPtr(registerSetPtr)			\
+	IOGetDBDMAChannelRegister(registerSetPtr,commandPtrLo)
+
+/* 	void IOSetDBDMACommandPtr (IODBDMAChannelRegisters *registerSetPtr, unsigned long cclPtr); */
+
+#define IOSetDBDMACommandPtr(registerSetPtr,cclPtr)			\
+do {									\
+    IOSetDBDMAChannelRegister(registerSetPtr,commandPtrHi,0);		\
+    eieio();								\
+    IOSetDBDMAChannelRegister(registerSetPtr,commandPtrLo,cclPtr);	\
+    eieio();								\
+} while(0)
+
+
+/* 	unsigned long IOGetDBDMAInterruptSelect (IODBDMAChannelRegisters *registerSetPtr); */
+
+#define IOGetDBDMAInterruptSelect(registerSetPtr)		\
+        IOGetDBDMAChannelRegister(registerSetPtr,interruptSelect)
+
+/* 	void IOSetDBDMAInterruptSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long intSelValue); */
+
+#define IOSetDBDMAInterruptSelect(registerSetPtr,intSelValue)		   \
+do {									   \
+    IOSetDBDMAChannelRegister(registerSetPtr,interruptSelect,intSelValue); \
+    eieio();								   \
+} while(0)
+
+/* 	unsigned long IOGetDBDMABranchSelect (IODBDMAChannelRegisters *registerSetPtr); */
+
+#define IOGetDBDMABranchSelect(registerSetPtr)				\
+	IOGetDBDMAChannelRegister(registerSetPtr,branchSelect)
+
+/* 	void IOSetDBDMABranchSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long braSelValue); */
+
+#define IOSetDBDMABranchSelect(registerSetPtr,braSelValue)		\
+do {									\
+    IOSetDBDMAChannelRegister(registerSetPtr,branchSelect,braSelValue);	\
+    eieio();								\
+} while(0)
+
+/* 	unsigned long IOGetDBDMAWaitSelect (IODBDMAChannelRegisters *registerSetPtr); */
+
+#define IOGetDBDMAWaitSelect(registerSetPtr)				\
+	IOGetDBDMAChannelRegister(registerSetPtr,waitSelect)
+
+/* 	void IOSetDBDMAWaitSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long waitSelValue); */
+
+#define IOSetDBDMAWaitSelect(registerSetPtr,waitSelValue)		\
+do {									\
+    IOSetDBDMAChannelRegister(registerSetPtr,waitSelect,waitSelValue);	\
+    eieio();								\
+} while(0)
+
+
+/*  These macros are IODBDMADescriptor accessor functions. */
+
+#define IOSetDBDMADescriptor(descPtr,field,value)		\
+OSWriteSwapInt32( descPtr, offsetof( IODBDMADescriptor, field), value)
+
+#define IOGetDBDMADescriptor(descPtr,field)	\
+OSReadSwapInt32( descPtr, offsetof( IODBDMADescriptor, field))
+
+#define	IOMakeDBDMAOperation(cmd,key,interrupt,branch,wait,count)	\
+    ( ((cmd) << 28) | ((key) << 24) | ((interrupt) << 20)		\
+      | ((branch) << 18) | ( (wait) << 16) | (count) )
+
+/* void  IOMakeDBDMADescriptor (IODBDMADescriptor *descPtr,
+				unsigned long cmd,
+				unsigned long key,
+				unsigned long interrupt,
+				unsigned long branch,
+				unsigned long wait,
+				unsigned long count,
+				unsigned long addr); */
+
+#define IOMakeDBDMADescriptor(descPtr,cmd,key,interrupt,branch,wait,count,addr)\
+do {									       \
+    IOSetDBDMADescriptor(descPtr, address, addr);			       \
+    IOSetDBDMADescriptor(descPtr, cmdDep,  0);				       \
+    IOSetDBDMADescriptor(descPtr, result,  0);				       \
+    eieio();								       \
+    IOSetDBDMADescriptor(descPtr, operation,				       \
+        IOMakeDBDMAOperation(cmd,key,interrupt,branch,wait,count));	       \
+    eieio();								       \
+} while(0)
+
+/* void IOMakeDBDMADescriptorDep (IODBDMADescriptor *descPtr,
+				unsigned long cmd,
+				unsigned long key,
+				unsigned long interrupt,
+				unsigned long branch,
+				unsigned long wait,
+				unsigned long count,
+				unsigned long addr,
+				unsigned long dep); */
+
+#define IOMakeDBDMADescriptorDep(descPtr,cmd,key,interrupt,branch,wait,count,addr,dep) \
+do {									       \
+    IOSetDBDMADescriptor(descPtr, address, addr);			       \
+    IOSetDBDMADescriptor(descPtr, cmdDep, dep);				       \
+    IOSetDBDMADescriptor(descPtr, result, 0);				       \
+    eieio();								       \
+    IOSetDBDMADescriptor(descPtr, operation,				       \
+        IOMakeDBDMAOperation(cmd, key, interrupt, branch, wait, count));       \
+    eieio();								       \
+} while(0)
+
+/*	Field accessors - NOTE: unsynchronized */
+
+/* 	unsigned long IOGetDBDMAOperation (IODBDMADescriptor *descPtr) */
+
+#define IOGetCCOperation(descPtr)				\
+	IOGetDBDMADescriptor(descPtr,operation)
+
+/* 	void IOSetCCOperation (IODBDMADescriptor *descPtr, unsigned long operationValue) */
+
+#define IOSetCCOperation(descPtr,operationValue)		\
+	IOSetDBDMADescriptor(descPtr,operation,operationValue)
+
+/* 	unsigned long IOGetCCAddress (IODBDMADescriptor *descPtr) */
+
+#define IOGetCCAddress(descPtr)				\
+	IOGetDBDMADescriptor(descPtr,address)
+
+/* 	void IOSetCCAddress (IODBDMADescriptor *descPtr, unsigned long addressValue) */
+
+#define IOSetCCAddress(descPtr,addressValue)		\
+	IOSetDBDMADescriptor(descPtr,address, addressValue)
+
+/* 	unsigned long IOGetCCCmdDep (IODBDMADescriptor *descPtr) */
+
+#define IOGetCCCmdDep(descPtr)				\
+	IOGetDBDMADescriptor(descPtr,cmdDep)
+
+/* 	void IOSetCCCmdDep (IODBDMADescriptor *descPtr, unsigned long cmdDepValue) */
+
+#define IOSetCCCmdDep(descPtr,cmdDepValue)		\
+	IOSetDBDMADescriptor(descPtr,cmdDep,cmdDepValue)
+
+/* 	unsigned long IOGetCCResult (IODBDMADescriptor *descPtr) */
+
+#define IOGetCCResult(descPtr)				\
+	IOGetDBDMADescriptor(descPtr,result)
+
+/* 	void IOSetCCResult (IODBDMADescriptor *descPtr, unsigned long resultValue) */
+
+#define IOSetCCResult(descPtr,resultValue)		\
+	IOSetDBDMADescriptor(descPtr,result,resultValue)
+
+
+/* DBDMA routines */
+
+extern void	IODBDMAStart( volatile IODBDMAChannelRegisters *registerSetPtr, volatile IODBDMADescriptor *physicalDescPtr);
+extern void	IODBDMAStop( volatile IODBDMAChannelRegisters *registerSetPtr);
+extern void	IODBDMAFlush( volatile IODBDMAChannelRegisters *registerSetPtr);
+extern void	IODBDMAReset( volatile IODBDMAChannelRegisters *registerSetPtr);
+extern void	IODBDMAContinue( volatile IODBDMAChannelRegisters *registerSetPtr);
+extern void	IODBDMAPause( volatile IODBDMAChannelRegisters *registerSetPtr);
+
+extern IOReturn	IOAllocatePhysicallyContiguousMemory( unsigned int size, unsigned int options,
+				     IOVirtualAddress * logical, IOPhysicalAddress * physical );
+extern IOReturn IOFreePhysicallyContiguousMemory( IOVirtualAddress * logical, unsigned int size);
+
+#endif /* !defined(_IODBDMA_H_) */
diff --git a/i386/include/IOKit/ppc/IODBDMA.h b/i386/include/IOKit/ppc/IODBDMA.h
new file mode 100644
index 0000000..afe1337
--- /dev/null
+++ b/i386/include/IOKit/ppc/IODBDMA.h
@@ -0,0 +1,367 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1997 Apple Computer, Inc.
+ *
+ *
+ * HISTORY
+ *
+ * Simon Douglas  10 Nov 97
+ * - first checked in, mostly from MacOS DBDMA.i, machdep/ppc/dbdma.h
+ *	but use byte reverse ops.
+ */
+
+#ifndef _IODBDMA_H_
+#define _IODBDMA_H_
+
+#include <IOKit/IOTypes.h>
+#include <libkern/OSByteOrder.h>
+
+
+/* DBDMA definitions */
+
+struct IODBDMAChannelRegisters {
+    volatile unsigned long 	channelControl;
+    volatile unsigned long 	channelStatus;
+    volatile unsigned long 	commandPtrHi;		/* implementation optional*/
+    volatile unsigned long 	commandPtrLo;
+    volatile unsigned long 	interruptSelect;	/* implementation optional*/
+    volatile unsigned long 	branchSelect;		/* implementation optional*/
+    volatile unsigned long 	waitSelect;		/* implementation optional*/
+    volatile unsigned long 	transferModes;		/* implementation optional*/
+    volatile unsigned long 	data2PtrHi;		/* implementation optional*/
+    volatile unsigned long 	data2PtrLo;		/* implementation optional*/
+
+    volatile unsigned long 	reserved1;
+    volatile unsigned long 	addressHi;		/* implementation optional*/
+    volatile unsigned long 	reserved2[4];
+    volatile unsigned long 	unimplemented[16];
+
+/* This structure must remain fully padded to 256 bytes.*/
+    volatile unsigned long 	undefined[32];
+};
+typedef struct IODBDMAChannelRegisters IODBDMAChannelRegisters;
+
+/* These constants define the DB-DMA channel control words and status flags.*/
+
+enum {
+	kdbdmaRun	= 0x00008000,
+	kdbdmaPause	= 0x00004000,
+	kdbdmaFlush	= 0x00002000,
+	kdbdmaWake	= 0x00001000,
+	kdbdmaDead	= 0x00000800,
+	kdbdmaActive	= 0x00000400,
+	kdbdmaBt	= 0x00000100,
+	kdbdmaS7	= 0x00000080,
+	kdbdmaS6	= 0x00000040,
+	kdbdmaS5	= 0x00000020,
+	kdbdmaS4	= 0x00000010,
+	kdbdmaS3	= 0x00000008,
+	kdbdmaS2	= 0x00000004,
+	kdbdmaS1	= 0x00000002,
+	kdbdmaS0	= 0x00000001
+};
+
+
+#define	IOSetDBDMAChannelControlBits(mask)	( ((mask) | (mask) << 16) )
+#define	IOClearDBDMAChannelControlBits(mask)	( (mask) << 16)
+
+
+/* This structure defines the DB-DMA channel command descriptor.*/
+
+/*
+   *** WARNING:	Endian-ness issues must be considered when performing load/store! ***
+*/
+
+struct IODBDMADescriptor {
+	unsigned long            operation;   /* cmd || key || i || b || w || reqCount*/
+	unsigned long            address;
+	volatile unsigned long   cmdDep;
+	volatile unsigned long   result;      /* xferStatus || resCount*/
+};
+typedef struct IODBDMADescriptor IODBDMADescriptor;
+
+/* These constants define the DB-DMA channel command operations and modifiers.*/
+
+
+enum {
+/* Command.cmd operations*/
+	kdbdmaOutputMore	= 0,
+	kdbdmaOutputLast	= 1,
+	kdbdmaInputMore		= 2,
+	kdbdmaInputLast		= 3,
+	kdbdmaStoreQuad		= 4,
+	kdbdmaLoadQuad		= 5,
+	kdbdmaNop		= 6,
+	kdbdmaStop		= 7
+};
+
+
+enum {
+/* Command.key modifiers (choose one for INPUT, OUTPUT, LOAD, and STORE)*/
+	kdbdmaKeyStream0	= 0,	/* default modifier*/
+	kdbdmaKeyStream1	= 1,
+	kdbdmaKeyStream2	= 2,
+	kdbdmaKeyStream3	= 3,
+	kdbdmaKeyRegs		= 5,
+	kdbdmaKeySystem		= 6,
+	kdbdmaKeyDevice		= 7,
+
+	kdbdmaIntNever		= 0,	/* default modifier*/
+	kdbdmaIntIfTrue		= 1,
+	kdbdmaIntIfFalse	= 2,
+	kdbdmaIntAlways		= 3,
+
+	kdbdmaBranchNever	= 0,	/* default modifier*/
+	kdbdmaBranchIfTrue	= 1,
+	kdbdmaBranchIfFalse	= 2,
+	kdbdmaBranchAlways	= 3,
+
+	kdbdmaWaitNever		= 0,	/* default modifier*/
+	kdbdmaWaitIfTrue	= 1,
+	kdbdmaWaitIfFalse	= 2,
+	kdbdmaWaitAlways	= 3,
+
+	kdbdmaCommandMask	= (long)0xFFFF0000,
+	kdbdmaReqCountMask	= 0x0000FFFF
+};
+
+
+/* These constants define the DB-DMA channel command results.*/
+
+enum {
+	/* result masks*/
+	kdbdmaStatusRun		= kdbdmaRun << 16,
+	kdbdmaStatusPause	= kdbdmaPause << 16,
+	kdbdmaStatusFlush	= kdbdmaFlush << 16,
+	kdbdmaStatusWake	= kdbdmaWake << 16,
+	kdbdmaStatusDead	= kdbdmaDead << 16,
+	kdbdmaStatusActive	= kdbdmaActive << 16,
+	kdbdmaStatusBt		= kdbdmaBt << 16,
+	kdbdmaStatusS7		= kdbdmaS7 << 16,
+	kdbdmaStatusS6		= kdbdmaS6 << 16,
+	kdbdmaStatusS5		= kdbdmaS5 << 16,
+	kdbdmaStatusS4		= kdbdmaS4 << 16,
+	kdbdmaStatusS3		= kdbdmaS3 << 16,
+	kdbdmaStatusS2		= kdbdmaS2 << 16,
+	kdbdmaStatusS1		= kdbdmaS1 << 16,
+	kdbdmaStatusS0		= kdbdmaS0 << 16,
+	kdbdmaResCountMask	= 0x0000FFFF,
+	kdbdmaXferStatusMask	= 0xFFFF0000
+};
+
+
+/*  These macros are are IODBDMAChannelRegisters accessor functions. */
+
+#define IOSetDBDMAChannelRegister(registerSetPtr,field,value)	\
+OSWriteSwapInt32(registerSetPtr,offsetof(IODBDMAChannelRegisters,field),value)
+
+#define IOGetDBDMAChannelRegister(registerSetPtr, field)	\
+OSReadSwapInt32(registerSetPtr,offsetof(IODBDMAChannelRegisters, field))
+
+
+/* 	void IOSetDBDMAChannelControl (IODBDMAChannelRegisters *registerSetPtr, unsigned long ctlValue); */
+
+#define IOSetDBDMAChannelControl(registerSetPtr,ctlValue)		\
+do {									\
+    eieio();								\
+    IOSetDBDMAChannelRegister(registerSetPtr,channelControl,ctlValue);	\
+    eieio();								\
+} while(0)
+
+/* 	unsigned long IOGetDBDMAChannelStatus (IODBDMAChannelRegisters *registerSetPtr); */
+
+#define IOGetDBDMAChannelStatus(registerSetPtr)		\
+	IOGetDBDMAChannelRegister(registerSetPtr,channelStatus)
+
+/* 	unsigned long IOGetDBDMACommandPtr (IODBDMAChannelRegisters *registerSetPtr); */
+
+#define IOGetDBDMACommandPtr(registerSetPtr)			\
+	IOGetDBDMAChannelRegister(registerSetPtr,commandPtrLo)
+
+/* 	void IOSetDBDMACommandPtr (IODBDMAChannelRegisters *registerSetPtr, unsigned long cclPtr); */
+
+#define IOSetDBDMACommandPtr(registerSetPtr,cclPtr)			\
+do {									\
+    IOSetDBDMAChannelRegister(registerSetPtr,commandPtrHi,0);		\
+    eieio();								\
+    IOSetDBDMAChannelRegister(registerSetPtr,commandPtrLo,cclPtr);	\
+    eieio();								\
+} while(0)
+
+
+/* 	unsigned long IOGetDBDMAInterruptSelect (IODBDMAChannelRegisters *registerSetPtr); */
+
+#define IOGetDBDMAInterruptSelect(registerSetPtr)		\
+        IOGetDBDMAChannelRegister(registerSetPtr,interruptSelect)
+
+/* 	void IOSetDBDMAInterruptSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long intSelValue); */
+
+#define IOSetDBDMAInterruptSelect(registerSetPtr,intSelValue)		   \
+do {									   \
+    IOSetDBDMAChannelRegister(registerSetPtr,interruptSelect,intSelValue); \
+    eieio();								   \
+} while(0)
+
+/* 	unsigned long IOGetDBDMABranchSelect (IODBDMAChannelRegisters *registerSetPtr); */
+
+#define IOGetDBDMABranchSelect(registerSetPtr)				\
+	IOGetDBDMAChannelRegister(registerSetPtr,branchSelect)
+
+/* 	void IOSetDBDMABranchSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long braSelValue); */
+
+#define IOSetDBDMABranchSelect(registerSetPtr,braSelValue)		\
+do {									\
+    IOSetDBDMAChannelRegister(registerSetPtr,branchSelect,braSelValue);	\
+    eieio();								\
+} while(0)
+
+/* 	unsigned long IOGetDBDMAWaitSelect (IODBDMAChannelRegisters *registerSetPtr); */
+
+#define IOGetDBDMAWaitSelect(registerSetPtr)				\
+	IOGetDBDMAChannelRegister(registerSetPtr,waitSelect)
+
+/* 	void IOSetDBDMAWaitSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long waitSelValue); */
+
+#define IOSetDBDMAWaitSelect(registerSetPtr,waitSelValue)		\
+do {									\
+    IOSetDBDMAChannelRegister(registerSetPtr,waitSelect,waitSelValue);	\
+    eieio();								\
+} while(0)
+
+
+/*  These macros are IODBDMADescriptor accessor functions. */
+
+#define IOSetDBDMADescriptor(descPtr,field,value)		\
+OSWriteSwapInt32( descPtr, offsetof( IODBDMADescriptor, field), value)
+
+#define IOGetDBDMADescriptor(descPtr,field)	\
+OSReadSwapInt32( descPtr, offsetof( IODBDMADescriptor, field))
+
+#define	IOMakeDBDMAOperation(cmd,key,interrupt,branch,wait,count)	\
+    ( ((cmd) << 28) | ((key) << 24) | ((interrupt) << 20)		\
+      | ((branch) << 18) | ( (wait) << 16) | (count) )
+
+/* void  IOMakeDBDMADescriptor (IODBDMADescriptor *descPtr,
+				unsigned long cmd,
+				unsigned long key,
+				unsigned long interrupt,
+				unsigned long branch,
+				unsigned long wait,
+				unsigned long count,
+				unsigned long addr); */
+
+#define IOMakeDBDMADescriptor(descPtr,cmd,key,interrupt,branch,wait,count,addr)\
+do {									       \
+    IOSetDBDMADescriptor(descPtr, address, addr);			       \
+    IOSetDBDMADescriptor(descPtr, cmdDep,  0);				       \
+    IOSetDBDMADescriptor(descPtr, result,  0);				       \
+    eieio();								       \
+    IOSetDBDMADescriptor(descPtr, operation,				       \
+        IOMakeDBDMAOperation(cmd,key,interrupt,branch,wait,count));	       \
+    eieio();								       \
+} while(0)
+
+/* void IOMakeDBDMADescriptorDep (IODBDMADescriptor *descPtr,
+				unsigned long cmd,
+				unsigned long key,
+				unsigned long interrupt,
+				unsigned long branch,
+				unsigned long wait,
+				unsigned long count,
+				unsigned long addr,
+				unsigned long dep); */
+
+#define IOMakeDBDMADescriptorDep(descPtr,cmd,key,interrupt,branch,wait,count,addr,dep) \
+do {									       \
+    IOSetDBDMADescriptor(descPtr, address, addr);			       \
+    IOSetDBDMADescriptor(descPtr, cmdDep, dep);				       \
+    IOSetDBDMADescriptor(descPtr, result, 0);				       \
+    eieio();								       \
+    IOSetDBDMADescriptor(descPtr, operation,				       \
+        IOMakeDBDMAOperation(cmd, key, interrupt, branch, wait, count));       \
+    eieio();								       \
+} while(0)
+
+/*	Field accessors - NOTE: unsynchronized */
+
+/* 	unsigned long IOGetDBDMAOperation (IODBDMADescriptor *descPtr) */
+
+#define IOGetCCOperation(descPtr)				\
+	IOGetDBDMADescriptor(descPtr,operation)
+
+/* 	void IOSetCCOperation (IODBDMADescriptor *descPtr, unsigned long operationValue) */
+
+#define IOSetCCOperation(descPtr,operationValue)		\
+	IOSetDBDMADescriptor(descPtr,operation,operationValue)
+
+/* 	unsigned long IOGetCCAddress (IODBDMADescriptor *descPtr) */
+
+#define IOGetCCAddress(descPtr)				\
+	IOGetDBDMADescriptor(descPtr,address)
+
+/* 	void IOSetCCAddress (IODBDMADescriptor *descPtr, unsigned long addressValue) */
+
+#define IOSetCCAddress(descPtr,addressValue)		\
+	IOSetDBDMADescriptor(descPtr,address, addressValue)
+
+/* 	unsigned long IOGetCCCmdDep (IODBDMADescriptor *descPtr) */
+
+#define IOGetCCCmdDep(descPtr)				\
+	IOGetDBDMADescriptor(descPtr,cmdDep)
+
+/* 	void IOSetCCCmdDep (IODBDMADescriptor *descPtr, unsigned long cmdDepValue) */
+
+#define IOSetCCCmdDep(descPtr,cmdDepValue)		\
+	IOSetDBDMADescriptor(descPtr,cmdDep,cmdDepValue)
+
+/* 	unsigned long IOGetCCResult (IODBDMADescriptor *descPtr) */
+
+#define IOGetCCResult(descPtr)				\
+	IOGetDBDMADescriptor(descPtr,result)
+
+/* 	void IOSetCCResult (IODBDMADescriptor *descPtr, unsigned long resultValue) */
+
+#define IOSetCCResult(descPtr,resultValue)		\
+	IOSetDBDMADescriptor(descPtr,result,resultValue)
+
+
+/* DBDMA routines */
+
+extern void	IODBDMAStart( volatile IODBDMAChannelRegisters *registerSetPtr, volatile IODBDMADescriptor *physicalDescPtr);
+extern void	IODBDMAStop( volatile IODBDMAChannelRegisters *registerSetPtr);
+extern void	IODBDMAFlush( volatile IODBDMAChannelRegisters *registerSetPtr);
+extern void	IODBDMAReset( volatile IODBDMAChannelRegisters *registerSetPtr);
+extern void	IODBDMAContinue( volatile IODBDMAChannelRegisters *registerSetPtr);
+extern void	IODBDMAPause( volatile IODBDMAChannelRegisters *registerSetPtr);
+
+extern IOReturn	IOAllocatePhysicallyContiguousMemory( unsigned int size, unsigned int options,
+				     IOVirtualAddress * logical, IOPhysicalAddress * physical );
+extern IOReturn IOFreePhysicallyContiguousMemory( IOVirtualAddress * logical, unsigned int size);
+
+#endif /* !defined(_IODBDMA_H_) */
diff --git a/i386/include/IOKit/pwr_mgt/.svn/all-wcprops b/i386/include/IOKit/pwr_mgt/.svn/all-wcprops
new file mode 100644
index 0000000..3ea4d10
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/all-wcprops
@@ -0,0 +1,59 @@
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt
+END
+RootDomain.h
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/RootDomain.h
+END
+IOPMLibDefs.h
+K 25
+svn:wc:ra_dav:version-url
+V 74
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMLibDefs.h
+END
+IOPMPowerSourceList.h
+K 25
+svn:wc:ra_dav:version-url
+V 82
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMPowerSourceList.h
+END
+IOPMPrivate.h
+K 25
+svn:wc:ra_dav:version-url
+V 74
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMPrivate.h
+END
+IOPMPowerSource.h
+K 25
+svn:wc:ra_dav:version-url
+V 78
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMPowerSource.h
+END
+IOPMpowerState.h
+K 25
+svn:wc:ra_dav:version-url
+V 77
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMpowerState.h
+END
+IOPM.h
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPM.h
+END
+IOPowerConnection.h
+K 25
+svn:wc:ra_dav:version-url
+V 80
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPowerConnection.h
+END
+IOPMDeprecated.h
+K 25
+svn:wc:ra_dav:version-url
+V 77
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMDeprecated.h
+END
diff --git a/i386/include/IOKit/pwr_mgt/.svn/entries b/i386/include/IOKit/pwr_mgt/.svn/entries
new file mode 100644
index 0000000..decf7eb
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/entries
@@ -0,0 +1,334 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/pwr_mgt
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+RootDomain.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+bdf4cb75458bc85f1bbb7f9d25e0b25b
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+10815
+
+IOPMLibDefs.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+2f6d1ceef422ff8f504e009c9554720b
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1762
+
+IOPMPowerSourceList.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+ba4d08c61820252a5ed6241fd8b3c13a
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2024
+
+IOPMPrivate.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+875e737556ada49d86b951e79209bc3a
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11099
+
+IOPMPowerSource.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+8ec726b34101aecbd930216a9d944510
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9439
+
+IOPMpowerState.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+eb4e9833e8dc27f552ed3fa7704a0b8d
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3760
+
+IOPM.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+6e0b70a4a16a7c280dcfbe0c99e1c06c
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+27180
+
+IOPowerConnection.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+05e49f8d6c51a982ce29d3e16cb0c161
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6011
+
+IOPMDeprecated.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+ebebd77a291987f315e9719e9f1f53e9
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9112
+
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPM.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPM.h.svn-base
new file mode 100644
index 0000000..7d78225
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPM.h.svn-base
@@ -0,0 +1,654 @@
+/*
+ * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOKIT_IOPM_H
+#define _IOKIT_IOPM_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/IOReturn.h>
+
+#ifdef __ppc__
+#include <IOKit/pwr_mgt/IOPMDeprecated.h>
+#endif
+
+/*! @header IOPM.h
+    @abstract Defines power management constants and keys used by both in-kernel and user space power management.
+    @discussion IOPM.h defines a range of power management constants used in several in-kernel and user space APIs. Most significantly, the IOPMPowerFlags used to specify the fields of an IOPMPowerState struct are defined here.
+
+    Most of the constants defined in IOPM.h are deprecated or for Apple internal use only, and are not elaborated on in headerdoc.
+*/
+
+enum {
+    kIOPMMaxPowerStates = 10,
+    IOPMMaxPowerStates = kIOPMMaxPowerStates
+};
+
+/*! @enum IOPMPowerFlags
+    @abstract Bits are used in defining capabilityFlags, inputPowerRequirements, and outputPowerCharacter in the IOPMPowerState structure.
+    @discussion These bits may be bitwise-OR'd together in the IOPMPowerState capabilityFlags field, the outputPowerCharacter field, and/or the inputPowerRequirement field. 
+    
+    The comments clearly mark whether each flag should be used in the capabilityFlags field, outputPowerCharacter field, and inputPowerRequirement field, or all three.
+    
+    The value of capabilityFlags, inputPowerRequirement or outputPowerCharacter may be 0. Most drivers implement their 'OFF' state, used when asleep, by defininf each of the 3 fields as 0.
+    
+    The bits listed below are only the most common bits used to define a device's power states. Your device's IO family may require that your device specify other input or output power flags to interact properly. Consult family-specific documentation to determine if your IOPower plane parents or children require other power flags; they probably don't.
+
+    @constant kIOPMPowerOn Indicates the device is on, requires power, and provides power. Useful as a: Capability, InputPowerRequirement, OutputPowerCharacter
+
+    @constant kIOPMDeviceUsable Indicates the device is usable in this state. Useful only as a Capability
+
+    @constant kIOPMLowPower 
+    Indicates device is in a low power state. May be bitwis-OR'd together
+    with kIOPMDeviceUsable flag, to indicate the device is still usable.
+    
+    A device with a capability of kIOPMLowPower may:
+       Require either 0 or kIOPMPowerOn from its power parent
+       Offer either kIOPMLowPower, kIOPMPowerOn, or 0 (no power at all)
+         to its power plane children.
+
+    Useful only as a Capability, although USB drivers should consult USB family documentation for other valid circumstances to use the kIOPMLowPower bit.
+
+    @constant kIOPMPreventIdleSleep
+    In the capability field of a power state, disallows idle system sleep while the device is in that state.
+    
+    For example, displays and disks set this capability for their ON power state; since the system may not idle sleep while the display (and thus keyboard or mouse) or the disk is active.
+
+    Useful only as a Capability.
+    
+    @constant kIOPMSleepCapability 
+    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
+    
+    @constant kIOPMRestartCapability
+    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
+    
+    @constant kIOPMSleep
+    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
+
+    @constant kIOPMRestart
+    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
+*/
+typedef unsigned long IOPMPowerFlags;
+enum {
+    kIOPMPowerOn                    = 0x00000002,
+    kIOPMDeviceUsable               = 0x00008000,
+    kIOPMLowPower                   = 0x00010000,
+    kIOPMPreventIdleSleep           = 0x00000040,
+    kIOPMSleepCapability            = 0x00000004,
+    kIOPMRestartCapability          = 0x00000080,
+    kIOPMSleep                      = 0x00000001,
+    kIOPMRestart                    = 0x00000080
+};
+
+/*
+ * Private IOPMPowerFlags
+ *
+ * For Apple use only
+ * Not for use with non-Apple drivers
+ * Their behavior is undefined
+ */
+enum {
+    kIOPMClockNormal                = 0x0004,
+    kIOPMClockRunning               = 0x0008,
+    kIOPMPreventSystemSleep         = 0x0010,
+    kIOPMDoze                       = 0x0400,
+    kIOPMChildClamp                 = 0x0080,
+    kIOPMChildClamp2                = 0x0200,
+    kIOPMNotPowerManaged            = 0x0800
+};
+
+
+/*
+ * Deprecated IOPMPowerFlags
+ * Their behavior is undefined when used in IOPMPowerState
+ * Capability, InputPowerRequirement, or OutputPowerCharacter fields.
+ */
+enum {
+    kIOPMMaxPerformance             = 0x4000,
+    kIOPMPassThrough                = 0x0100,
+    kIOPMAuxPowerOn                 = 0x0020,
+    kIOPMNotAttainable              = 0x0001,
+    kIOPMContextRetained            = 0x2000,
+    kIOPMConfigRetained             = 0x1000,
+    kIOPMStaticPowerValid           = 0x0800,
+    kIOPMSoftSleep                  = 0x0400,
+    kIOPMCapabilitiesMask =     kIOPMPowerOn | kIOPMDeviceUsable | 
+                                kIOPMMaxPerformance | kIOPMContextRetained | 
+                                kIOPMConfigRetained | kIOPMSleepCapability |
+                                kIOPMRestartCapability
+};
+
+/*
+ * Support for old names of IOPMPowerFlag constants
+ */
+enum {
+    IOPMNotAttainable           = kIOPMNotAttainable,
+    IOPMPowerOn                 = kIOPMPowerOn,
+    IOPMClockNormal             = kIOPMClockNormal,
+    IOPMClockRunning            = kIOPMClockRunning,
+    IOPMAuxPowerOn              = kIOPMAuxPowerOn,
+    IOPMDeviceUsable            = kIOPMDeviceUsable,
+    IOPMMaxPerformance          = kIOPMMaxPerformance,
+    IOPMContextRetained         = kIOPMContextRetained,
+    IOPMConfigRetained          = kIOPMConfigRetained,
+    IOPMNotPowerManaged         = kIOPMNotPowerManaged,
+    IOPMSoftSleep               = kIOPMSoftSleep
+};
+
+
+enum {
+    kIOPMNextHigherState        = 1,
+    kIOPMHighestState           = 2,
+    kIOPMNextLowerState         = 3,
+    kIOPMLowestState            = 4
+};
+
+enum {
+    IOPMNextHigherState         = kIOPMNextHigherState,
+    IOPMHighestState            = kIOPMHighestState,
+    IOPMNextLowerState          = kIOPMNextLowerState,
+    IOPMLowestState             = kIOPMLowestState
+};
+
+// Internal commands used by power managment command queue
+enum {
+    kIOPMBroadcastAggressiveness = 1,
+    kIOPMUnidleDevice
+};
+
+// Power consumption unknown value
+enum {
+    kIOPMUnknown = 0xFFFF
+};
+
+/*******************************************************************************
+ *
+ * Root Domain property keys of interest
+ *
+ ******************************************************************************/
+
+/* AppleClamshellState 
+ * reflects the state of the clamshell (lid) on a portable.
+ * It has a boolean value.
+ *  true        == clamshell is closed
+ *  false       == clamshell is open
+ *  not present == no clamshell on this hardware
+ */
+#define kAppleClamshellStateKey             "AppleClamshellState"
+
+/* AppleClamshellCausesSleep 
+ * reflects the clamshell close behavior on a portable. 
+ * It has a boolean value.
+ *  true        == system will sleep when clamshell is closed
+ *  false       == system will not sleep on clamshell close 
+ *                  (typically external display mode)
+ *  not present == no clamshell on this hardware
+ */
+#define kAppleClamshellCausesSleepKey       "AppleClamshellCausesSleep"
+
+/* kIOPMSleepWakeUUIDKey
+ * Key refers to a CFStringRef that will uniquely identify
+ * a sleep/wake cycle for logging & tracking.
+ * The key becomes valid at the beginning of a sleep cycle - before we
+ * initiate any sleep/wake notifications.
+ * The key becomes invalid at the completion of a system wakeup. The
+ * property will not be present in the IOPMrootDomain's registry entry
+ * when it is invalid.
+ * 
+ * See IOPMrootDomain notification kIOPMMessageSleepWakeUUIDChange
+ */
+ #define kIOPMSleepWakeUUIDKey              "SleepWakeUUID"
+
+/*******************************************************************************
+ *
+ * Root Domain general interest messages
+ *
+ * Available by registering for interest type 'gIOGeneralInterest' 
+ * on IOPMrootDomain. 
+ *
+ ******************************************************************************/
+
+/* kIOPMMessageClamshellStateChange
+ * Delivered as a general interest notification on the IOPMrootDomain
+ * IOPMrootDomain sends this message when state of either AppleClamshellState
+ * or AppleClamshellCausesSleep changes. If this clamshell change results in
+ * a sleep, the sleep will initiate soon AFTER delivery of this message.
+ * The state of both variables is encoded in a bitfield argument sent with
+ * the message. Check bits 0 and 1 using kClamshellStateBit & kClamshellSleepBit
+ */
+enum {
+    kClamshellStateBit = (1 << 0),
+    kClamshellSleepBit = (1 << 1)
+};
+
+#define kIOPMMessageClamshellStateChange   \
+                iokit_family_msg(sub_iokit_powermanagement, 0x100)
+
+/* kIOPMMessageFeatureChange
+ * Delivered when the set of supported features ("Supported Features" dictionary
+ * under IOPMrootDomain registry) changes in some way. Typically addition or
+ * removal of a supported feature.
+ * RootDomain passes no argument with this message.
+ */
+#define kIOPMMessageFeatureChange           \
+                iokit_family_msg(sub_iokit_powermanagement, 0x110)
+
+/* kIOPMMessageInflowDisableCancelled
+ * The battery has drained completely to its "Fully Discharged" state. 
+ * If a user process has disabled battery inflow for battery 
+ * calibration, we forcibly re-enable Inflow at this point.
+ * If inflow HAS been forcibly re-enabled, bit 0
+ * (kInflowForciblyEnabledBit) will be set.
+ */
+enum {
+    kInflowForciblyEnabledBit = (1 << 0)
+};
+
+/* kIOPMMessageInternalBatteryFullyDischarged
+ * The battery has drained completely to its "Fully Discharged" state. 
+ */
+#define kIOPMMessageInternalBatteryFullyDischarged  \
+                iokit_family_msg(sub_iokit_powermanagement, 0x120)
+
+/* kIOPMMessageSystemPowerEventOccurred
+ * Some major system thermal property has changed, and interested clients may
+ * modify their behavior.
+ */
+#define kIOPMMessageSystemPowerEventOccurred  \
+                iokit_family_msg(sub_iokit_powermanagement, 0x130)
+
+/* kIOPMMessageSleepWakeUUIDChange
+ * Either a new SleepWakeUUID has been specified at the beginning of a sleep,
+ * or we're removing the existing property upon completion of a wakeup.
+ */
+#define kIOPMMessageSleepWakeUUIDChange  \
+                iokit_family_msg(sub_iokit_powermanagement, 0x140)
+                
+/* kIOPMMessageSleepWakeUUIDSet
+ * Argument accompanying the kIOPMMessageSleepWakeUUIDChange notification when 
+ * a new UUID has been specified.
+ */
+#define kIOPMMessageSleepWakeUUIDSet                    ((void *)1)
+
+/* kIOPMMessageSleepWakeUUIDCleared
+ * Argument accompanying the kIOPMMessageSleepWakeUUIDChange notification when 
+ * the current UUID has been removed.
+ */
+#define kIOPMMessageSleepWakeUUIDCleared                ((void *)0)
+
+/*******************************************************************************
+ *
+ * Power commands issued to root domain
+ * Use with IOPMrootDomain::receivePowerNotification()
+ *
+ * These commands are issued from system drivers only:
+ *      ApplePMU, AppleSMU, IOGraphics, AppleACPIFamily
+ *
+ ******************************************************************************/
+enum {
+  kIOPMSleepNow                 = (1<<0),  // put machine to sleep now
+  kIOPMAllowSleep               = (1<<1),  // allow idle sleep
+  kIOPMPreventSleep             = (1<<2),  // do not allow idle sleep
+  kIOPMPowerButton              = (1<<3),  // power button was pressed
+  kIOPMClamshellClosed          = (1<<4),  // clamshell was closed
+  kIOPMPowerEmergency           = (1<<5),  // battery dangerously low
+  kIOPMDisableClamshell         = (1<<6),  // do not sleep on clamshell closure
+  kIOPMEnableClamshell          = (1<<7),  // sleep on clamshell closure
+  kIOPMProcessorSpeedChange     = (1<<8),  // change the processor speed
+  kIOPMOverTemp                 = (1<<9),  // system dangerously hot
+  kIOPMClamshellOpened          = (1<<10)  // clamshell was opened
+};
+
+
+/*******************************************************************************
+ *
+ * Power Management Return Codes
+ *
+ ******************************************************************************/
+enum {
+    kIOPMNoErr                  = 0,
+
+    // Returned by driver's setPowerState(), powerStateWillChangeTo(),
+    // powerStateDidChangeTo(), or acknowledgeSetPowerState() to
+    // implicitly acknowledge power change upon function return.
+    kIOPMAckImplied             = 0,
+
+    // Deprecated
+    kIOPMWillAckLater           = 1,
+
+    // Returned by requestPowerDomainState() to indicate
+    // unrecognized specification parameter.
+    kIOPMBadSpecification       = 4,
+
+    // Returned by requestPowerDomainState() to indicate
+    // no power state matches search specification.
+    kIOPMNoSuchState            = 5,
+
+    // Deprecated
+    kIOPMCannotRaisePower       = 6,
+
+    // Deprecated
+    kIOPMParameterError         = 7,
+
+    // Returned when power management state is accessed
+    // before driver has called PMinit().
+    kIOPMNotYetInitialized      = 8,
+
+    // And the old constants; deprecated
+    IOPMNoErr = kIOPMNoErr,
+    IOPMAckImplied = kIOPMAckImplied, 
+    IOPMWillAckLater = kIOPMWillAckLater,
+    IOPMBadSpecification = kIOPMBadSpecification,
+    IOPMNoSuchState = kIOPMNoSuchState,
+    IOPMCannotRaisePower = kIOPMCannotRaisePower,
+    IOPMParameterError = kIOPMParameterError,
+    IOPMNotYetInitialized = kIOPMNotYetInitialized
+};
+
+
+// IOPMPowerSource class descriptive strings
+// Power Source state is published as properties to the IORegistry under these 
+// keys.
+#define kIOPMPSExternalConnectedKey                 "ExternalConnected"
+#define kIOPMPSExternalChargeCapableKey             "ExternalChargeCapable"
+#define kIOPMPSBatteryInstalledKey                  "BatteryInstalled"
+#define kIOPMPSIsChargingKey                        "IsCharging"
+#define kIOPMFullyChargedKey                        "FullyCharged"
+#define kIOPMPSAtWarnLevelKey                       "AtWarnLevel"
+#define kIOPMPSAtCriticalLevelKey                   "AtCriticalLevel"
+#define kIOPMPSCurrentCapacityKey                   "CurrentCapacity"
+#define kIOPMPSMaxCapacityKey                       "MaxCapacity"
+#define kIOPMPSDesignCapacityKey                    "DesignCapacity"
+#define kIOPMPSTimeRemainingKey                     "TimeRemaining"
+#define kIOPMPSAmperageKey                          "Amperage"
+#define kIOPMPSVoltageKey                           "Voltage"
+#define kIOPMPSCycleCountKey                        "CycleCount"
+#define kIOPMPSMaxErrKey                            "MaxErr"
+#define kIOPMPSAdapterInfoKey                       "AdapterInfo"
+#define kIOPMPSLocationKey                          "Location"
+#define kIOPMPSErrorConditionKey                    "ErrorCondition"
+#define kIOPMPSManufacturerKey                      "Manufacturer"
+#define kIOPMPSManufactureDateKey                   "ManufactureDate"
+#define kIOPMPSModelKey                             "Model"
+#define kIOPMPSSerialKey                            "Serial"
+#define kIOPMDeviceNameKey                          "DeviceName"
+#define kIOPMPSLegacyBatteryInfoKey                 "LegacyBatteryInfo"
+#define kIOPMPSBatteryHealthKey                     "BatteryHealth"
+#define kIOPMPSHealthConfidenceKey                  "HealthConfidence"
+#define kIOPMPSCapacityEstimatedKey	                "CapacityEstimated"
+#define kIOPMPSBatteryChargeStatusKey               "ChargeStatus"
+#define kIOPMPSBatteryTemperatureKey                "Temperature"
+
+// kIOPMPSBatteryChargeStatusKey may have one of the following values, or may have
+// no value. If kIOPMBatteryChargeStatusKey has a NULL value (or no value) associated with it
+// then charge is proceeding normally. If one of these battery charge status reasons is listed,
+// then the charge may have been interrupted.
+#define kIOPMBatteryChargeStatusTooHot              "HighTemperature"
+#define kIOPMBatteryChargeStatusTooCold             "LowTemperature"
+#define kIOPMBatteryChargeStatusGradient            "BatteryTemperatureGradient"
+
+// Definitions for battery location, in case of multiple batteries.
+// A location of 0 is unspecified
+// Location is undefined for single battery systems
+enum {
+    kIOPMPSLocationLeft = 1001,
+    kIOPMPSLocationRight = 1002
+};
+
+// Battery quality health types, specified by BatteryHealth and HealthConfidence
+// properties in an IOPMPowerSource battery kext.
+enum {
+    kIOPMUndefinedValue = 0,
+    kIOPMPoorValue      = 1,
+    kIOPMFairValue      = 2,
+    kIOPMGoodValue      = 3
+};
+
+// Battery's time remaining estimate is invalid this long (seconds) after a wake
+#define kIOPMPSInvalidWakeSecondsKey           "BatteryInvalidWakeSeconds"
+
+// Battery must wait this long (seconds) after being completely charged before
+// the battery is settled.
+#define kIOPMPSPostChargeWaitSecondsKey        "PostChargeWaitSeconds"
+
+// Battery must wait this long (seconds) after being completely discharged 
+// before the battery is settled.
+#define kIOPMPSPostDishargeWaitSecondsKey      "PostDischargeWaitSeconds"
+
+
+/* CPU Power Management status keys
+ * Pass as arguments to IOPMrootDomain::systemPowerEventOccurred
+ * Or as arguments to IOPMSystemPowerEventOccurred()
+ * Or to decode the dictionary obtained from IOPMCopyCPUPowerStatus()
+ * These keys reflect restrictions placed on the CPU by the system
+ * to bring the CPU's power consumption within allowable thermal and 
+ * power constraints.
+ */
+
+
+/* kIOPMGraphicsPowerLimitsKey
+ *   The key representing the dictionary of graphics power limits.
+ *   The dictionary contains the other kIOPMCPUPower keys & their associated
+ *   values (e.g. Speed limit, Processor Count, and Schedule limits).
+ */
+#define kIOPMGraphicsPowerLimitsKey                     "Graphics_Power_Limits"
+
+/* kIOPMGraphicsPowerLimitPerformanceKey
+ *   The key representing the percent of overall performance made available
+ *   by the graphics chip as a percentage (integer 0 - 100).
+ */
+#define kIOPMGraphicsPowerLimitPerformanceKey           "Graphics_Power_Performance"
+
+
+
+/* kIOPMCPUPowerLimitsKey
+ *   The key representing the dictionary of CPU Power Limits.
+ *   The dictionary contains the other kIOPMCPUPower keys & their associated
+ *   values (e.g. Speed limit, Processor Count, and Schedule limits).
+ */
+#define kIOPMCPUPowerLimitsKey                          "CPU_Power_Limits"
+
+/* kIOPMCPUPowerLimitProcessorSpeedKey defines the speed & voltage limits placed 
+ *   on the CPU.
+ *   Represented as a percentage (0-100) of maximum CPU speed.
+ */
+#define kIOPMCPUPowerLimitProcessorSpeedKey             "CPU_Speed_Limit"
+
+/* kIOPMCPUPowerLimitProcessorCountKey reflects how many, if any, CPUs have been
+ *   taken offline. Represented as an integer number of CPUs (0 - Max CPUs).
+ */
+#define kIOPMCPUPowerLimitProcessorCountKey             "CPU_Available_CPUs"
+
+/* kIOPMCPUPowerLimitSchedulerTimeKey represents the percentage (0-100) of CPU time 
+ *   available. 100% at normal operation. The OS may limit this time for a percentage
+ *   less than 100%.
+ */
+#define kIOPMCPUPowerLimitSchedulerTimeKey              "CPU_Scheduler_Limit"
+
+
+/* Thermal Level Warning Key
+ * Indicates the thermal constraints placed on the system. This value may 
+ * cause clients to action to consume fewer system resources.
+ * The value associated with this warning is defined by the platform.
+ */
+#define kIOPMThermalLevelWarningKey                     "Thermal_Level_Warning"
+
+/* Thermal Warning Level values
+ *      kIOPMThermalWarningLevelNormal - under normal operating conditions
+ *      kIOPMThermalWarningLevelDanger - thermal pressure may cause system slowdown
+ *      kIOPMThermalWarningLevelCrisis - thermal conditions may cause imminent shutdown
+ *
+ * The platform may define additional thermal levels if necessary.
+ */
+enum {
+  kIOPMThermalWarningLevelNormal    = 0,
+  kIOPMThermalWarningLevelDanger    = 5,
+  kIOPMThermalWarningLevelCrisis    = 10
+};
+
+
+// PM Settings Controller setting types
+// Settings types used primarily with:
+//      IOPMrootDomain::registerPMSettingController
+// The values are identical to the similarly named keys for use in user space
+// PM settings work. Those keys are defined in IOPMLibPrivate.h.
+#define kIOPMSettingWakeOnRingKey                   "Wake On Modem Ring"
+#define kIOPMSettingRestartOnPowerLossKey           "Automatic Restart On Power Loss"
+#define kIOPMSettingWakeOnACChangeKey               "Wake On AC Change"
+#define kIOPMSettingSleepOnPowerButtonKey           "Sleep On Power Button"
+#define kIOPMSettingWakeOnClamshellKey              "Wake On Clamshell Open"
+#define kIOPMSettingReduceBrightnessKey             "ReduceBrightness"
+#define kIOPMSettingDisplaySleepUsesDimKey          "Display Sleep Uses Dim"
+#define kIOPMSettingTimeZoneOffsetKey               "TimeZoneOffsetSeconds"
+#define kIOPMSettingMobileMotionModuleKey           "MobileMotionModule"
+#define kIOPMSettingGraphicsSwitchKey               "GPUSwitch"
+
+// Setting controlling drivers can register to receive scheduled wake data
+// Either in "CF seconds" type, or structured calendar data in a formatted
+// IOPMCalendarStruct defined below.
+#define kIOPMSettingAutoWakeSecondsKey              "wake"
+#define kIOPMSettingAutoWakeCalendarKey             "WakeByCalendarDate"
+#define kIOPMSettingAutoPowerSecondsKey             "poweron"
+#define kIOPMSettingAutoPowerCalendarKey            "PowerByCalendarDate"
+
+// Debug seconds auto wake
+// Used by sleep cycling debug tools
+#define kIOPMSettingDebugWakeRelativeKey            "WakeRelativeToSleep"
+#define kIOPMSettingDebugPowerRelativeKey           "PowerRelativeToShutdown"
+
+// Maintenance wake calendar.
+#define kIOPMSettingMaintenanceWakeCalendarKey      "MaintenanceWakeCalendarDate"
+
+struct IOPMCalendarStruct {
+    UInt32      year;
+    UInt8       month;
+    UInt8       day;
+    UInt8       hour;
+    UInt8       minute;
+    UInt8       second;
+};
+typedef struct IOPMCalendarStruct IOPMCalendarStruct;
+
+// SetAggressiveness types
+enum {
+    kPMGeneralAggressiveness = 0,
+    kPMMinutesToDim,
+    kPMMinutesToSpinDown,
+    kPMMinutesToSleep,
+    kPMEthernetWakeOnLANSettings,
+    kPMSetProcessorSpeed,
+    kPMPowerSource,
+    kPMMotionSensor,
+    kPMLastAggressivenessType
+};
+#define kMaxType (kPMLastAggressivenessType-1)
+
+// SetAggressiveness values for the kPMPowerSource aggressiveness type
+enum {
+    kIOPMInternalPower = 1,
+    kIOPMExternalPower
+};
+
+#define kIOREMSleepEnabledKey               "REMSleepEnabled"
+
+// Strings for deciphering the dictionary returned from IOPMCopyBatteryInfo
+#define kIOBatteryInfoKey                   "IOBatteryInfo"
+#define kIOBatteryCurrentChargeKey          "Current"
+#define kIOBatteryCapacityKey               "Capacity"
+#define kIOBatteryFlagsKey                  "Flags"
+#define kIOBatteryVoltageKey                "Voltage"
+#define kIOBatteryAmperageKey               "Amperage"
+#define kIOBatteryCycleCountKey             "Cycle Count"
+
+enum {
+    kIOBatteryInstalled         = (1 << 2),
+    kIOBatteryCharge            = (1 << 1),
+    kIOBatteryChargerConnect    = (1 << 0)
+};
+
+
+// Private power management message indicating battery data has changed
+// Indicates new data resides in the IORegistry
+#define kIOPMMessageBatteryStatusHasChanged         iokit_family_msg(sub_iokit_pmu, 0x100)
+
+// Apple private Legacy messages for re-routing AutoWake and AutoPower messages to the PMU
+// through newer user space IOPMSchedulePowerEvent API
+#define kIOPMUMessageLegacyAutoWake                 iokit_family_msg(sub_iokit_pmu, 0x200)
+#define kIOPMUMessageLegacyAutoPower                iokit_family_msg(sub_iokit_pmu, 0x210)
+
+// For use with IOPMPowerSource bFlags
+#define IOPM_POWER_SOURCE_REV   2
+enum {
+  kIOPMACInstalled      = kIOBatteryChargerConnect,
+  kIOPMBatteryCharging  = kIOBatteryCharge,
+  kIOPMBatteryInstalled = kIOBatteryInstalled,
+  kIOPMUPSInstalled     = (1<<3),
+  kIOPMBatteryAtWarn    = (1<<4),
+  kIOPMBatteryDepleted  = (1<<5),
+  kIOPMACnoChargeCapability = (1<<6),     // AC adapter cannot charge battery
+  kIOPMRawLowBattery    = (1<<7),         // used only by  Platform Expert
+  kIOPMForceLowSpeed    = (1<<8),         // set by Platfm Expert, chk'd by Pwr Plugin
+  kIOPMClosedClamshell  = (1<<9),         // set by PMU - reflects state of the clamshell
+  kIOPMClamshellStateOnWake = (1<<10)     // used only by Platform Expert
+};
+
+
+// **********************************************
+// Internal power management data structures
+// **********************************************
+
+#if KERNEL && __cplusplus
+class IOService;
+
+enum {
+    kIOPowerEmergencyLevel = 1000
+};
+
+enum {
+    kIOPMSubclassPolicy,
+    kIOPMSuperclassPolicy1
+};
+
+struct stateChangeNote{
+    IOPMPowerFlags    stateFlags;
+    unsigned long    stateNum;
+    void *         powerRef;
+};
+typedef struct stateChangeNote stateChangeNote;
+
+struct IOPowerStateChangeNotification {
+    void *        powerRef;
+    unsigned long    returnValue;
+    unsigned long    stateNumber;
+    IOPMPowerFlags    stateFlags;
+};
+typedef struct IOPowerStateChangeNotification IOPowerStateChangeNotification;
+typedef IOPowerStateChangeNotification sleepWakeNote;
+#endif /* KERNEL && __cplusplus */
+
+#endif /* ! _IOKIT_IOPM_H */
+
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMDeprecated.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMDeprecated.h.svn-base
new file mode 100644
index 0000000..3bee01a
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMDeprecated.h.svn-base
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOPMDeprecated_h_
+#define _IOPMDeprecated_h_
+
+#ifdef __ppc__
+
+// Power events
+enum {
+  kClamshellClosedEventMask  = (1<<0),  // User closed lid
+  kDockingBarEventMask       = (1<<1),  // OBSOLETE
+  kACPlugEventMask           = (1<<2),  // User plugged or unplugged adapter
+  kFrontPanelButtonEventMask = (1<<3),  // User hit the front panel button
+  kBatteryStatusEventMask    = (1<<4)   // Battery status has changed
+};
+
+// PUBLIC power management features
+// NOTE: this is a direct port from classic, some of these bits
+//       are obsolete but are included for completeness
+enum {
+  kPMHasWakeupTimerMask        = (1<<0),  // 1=wake timer is supported
+  kPMHasSharedModemPortMask    = (1<<1),  // Not used
+  kPMHasProcessorCyclingMask   = (1<<2),  // 1=processor cycling supported
+  kPMMustProcessorCycleMask    = (1<<3),  // Not used
+  kPMHasReducedSpeedMask       = (1<<4),  // 1=supports reduced processor speed
+  kPMDynamicSpeedChangeMask    = (1<<5),  // 1=supports changing processor speed on the fly
+  kPMHasSCSIDiskModeMask       = (1<<6),  // 1=supports using machine as SCSI drive
+  kPMCanGetBatteryTimeMask     = (1<<7),  // 1=battery time can be calculated
+  kPMCanWakeupOnRingMask       = (1<<8),  // 1=machine can wake on modem ring
+  kPMHasDimmingSupportMask     = (1<<9),  // 1=has monitor dimming support
+  kPMHasStartupTimerMask       = (1<<10), // 1=can program startup timer
+  kPMHasChargeNotificationMask = (1<<11), // 1=client can determine charger status/get notifications
+  kPMHasDimSuspendSupportMask  = (1<<12), // 1=can dim diplay to DPMS ('off') state
+  kPMHasWakeOnNetActivityMask  = (1<<13), // 1=supports waking upon receipt of net packet
+  kPMHasWakeOnLidMask          = (1<<14), // 1=can wake upon lid/case opening
+  kPMCanPowerOffPCIBusMask     = (1<<15), // 1=can remove power from PCI bus on sleep
+  kPMHasDeepSleepMask          = (1<<16), // 1=supports deep (hibernation) sleep
+  kPMHasSleepMask              = (1<<17), // 1=machine support low power sleep (ala powerbooks)
+  kPMSupportsServerModeAPIMask = (1<<18), // 1=supports reboot on AC resume for unexpected power loss
+  kPMHasUPSIntegrationMask     = (1<<19)  // 1=supports incorporating UPS devices into power source calcs
+};
+
+// PRIVATE power management features
+// NOTE: this is a direct port from classic, some of these bits
+//       are obsolete but are included for completeness.
+enum {
+  kPMHasExtdBattInfoMask       = (1<<0),  // Not used
+  kPMHasBatteryIDMask          = (1<<1),  // Not used
+  kPMCanSwitchPowerMask        = (1<<2),  // Not used 
+  kPMHasCelsiusCyclingMask     = (1<<3),  // Not used
+  kPMHasBatteryPredictionMask  = (1<<4),  // Not used
+  kPMHasPowerLevelsMask        = (1<<5),  // Not used
+  kPMHasSleepCPUSpeedMask      = (1<<6),  // Not used
+  kPMHasBtnIntHandlersMask     = (1<<7),  // 1=supports individual button interrupt handlers
+  kPMHasSCSITermPowerMask      = (1<<8),  // 1=supports SCSI termination power switch
+  kPMHasADBButtonHandlersMask  = (1<<9),  // 1=supports button handlers via ADB
+  kPMHasICTControlMask         = (1<<10), // 1=supports ICT control
+  kPMHasLegacyDesktopSleepMask = (1<<11), // 1=supports 'doze' style sleep
+  kPMHasDeepIdleMask           = (1<<12), // 1=supports Idle2 in hardware
+  kPMOpenLidPreventsSleepMask  = (1<<13), // 1=open case prevent machine from sleeping
+  kPMClosedLidCausesSleepMask  = (1<<14), // 1=case closed (clamshell closed) causes sleep
+  kPMHasFanControlMask         = (1<<15), // 1=machine has software-programmable fan/thermostat controls
+  kPMHasThermalControlMask     = (1<<16), // 1=machine supports thermal monitoring
+  kPMHasVStepSpeedChangeMask   = (1<<17), // 1=machine supports processor voltage/clock change
+  kPMEnvironEventsPolledMask   = (1<<18)  // 1=machine doesn't generate pmu env ints, we must poll instead 
+};
+
+// DEFAULT public and private features for machines whose device tree
+// does NOT contain this information (pre-Core99).
+
+// For Cuda-based Desktops
+
+#define kStdDesktopPMFeatures   kPMHasWakeupTimerMask         |\
+                                kPMHasProcessorCyclingMask    |\
+                                kPMHasDimmingSupportMask      |\
+                                kPMHasStartupTimerMask        |\
+                                kPMSupportsServerModeAPIMask  |\
+                                kPMHasUPSIntegrationMask
+
+#define kStdDesktopPrivPMFeatures  kPMHasExtdBattInfoMask     |\
+                                   kPMHasICTControlMask       |\
+                                   kPMHasLegacyDesktopSleepMask
+
+#define kStdDesktopNumBatteries 0
+
+// For Wallstreet (PowerBook G3 Series 1998)
+
+#define kWallstreetPMFeatures   kPMHasWakeupTimerMask         |\
+                                kPMHasProcessorCyclingMask    |\
+                                kPMHasReducedSpeedMask        |\
+                                kPMDynamicSpeedChangeMask     |\
+                                kPMHasSCSIDiskModeMask        |\
+                                kPMCanGetBatteryTimeMask      |\
+                                kPMHasDimmingSupportMask      |\
+                                kPMHasChargeNotificationMask  |\
+                                kPMHasDimSuspendSupportMask   |\
+                                kPMHasSleepMask
+
+#define kWallstreetPrivPMFeatures  kPMHasExtdBattInfoMask      |\
+                                   kPMHasBatteryIDMask         |\
+                                   kPMCanSwitchPowerMask       |\
+                                   kPMHasADBButtonHandlersMask |\
+                                   kPMHasSCSITermPowerMask     |\
+                                   kPMHasICTControlMask        |\
+                                   kPMClosedLidCausesSleepMask |\
+                                   kPMEnvironEventsPolledMask
+
+#define kStdPowerBookPMFeatures      kWallstreetPMFeatures
+#define kStdPowerBookPrivPMFeatures  kWallstreetPrivPMFeatures
+
+#define kStdPowerBookNumBatteries 2
+
+// For 101 (PowerBook G3 Series 1999)
+
+#define k101PMFeatures          kPMHasWakeupTimerMask         |\
+                                kPMHasProcessorCyclingMask    |\
+                                kPMHasReducedSpeedMask        |\
+                                kPMDynamicSpeedChangeMask     |\
+                                kPMHasSCSIDiskModeMask        |\
+                                kPMCanGetBatteryTimeMask      |\
+                                kPMHasDimmingSupportMask      |\
+                                kPMHasChargeNotificationMask  |\
+                                kPMHasDimSuspendSupportMask   |\
+                                kPMHasSleepMask               |\
+                                kPMHasUPSIntegrationMask
+
+#define k101PrivPMFeatures      kPMHasExtdBattInfoMask        |\
+                                kPMHasBatteryIDMask           |\
+                                kPMCanSwitchPowerMask         |\
+                                kPMHasADBButtonHandlersMask   |\
+                                kPMHasSCSITermPowerMask       |\
+                                kPMHasICTControlMask          |\
+                                kPMClosedLidCausesSleepMask   |\
+                                kPMEnvironEventsPolledMask
+
+
+// These flags are deprecated. Use the version with the kIOPM prefix in IOPM.h
+enum {
+  kACInstalled      = (1<<0),
+  kBatteryCharging  = (1<<1),
+  kBatteryInstalled = (1<<2),
+  kUPSInstalled     = (1<<3),
+  kBatteryAtWarn    = (1<<4),
+  kBatteryDepleted  = (1<<5),
+  kACnoChargeCapability = (1<<6),     // AC adapter cannot charge battery
+  kRawLowBattery    = (1<<7),         // used only by  Platform Expert
+  kForceLowSpeed    = (1<<8)         // set by Platfm Expert, chk'd by Pwr Plugin};
+};
+
+#endif /* __ppc32 */
+#endif /* _IOPMDeprecated_h_ */
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMLibDefs.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMLibDefs.h.svn-base
new file mode 100644
index 0000000..ff25bf3
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMLibDefs.h.svn-base
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+
+#define	kPMSetAggressiveness            0
+#define	kPMGetAggressiveness            1
+#define	kPMSleepSystem                  2
+#define	kPMAllowPowerChange             3
+#define	kPMCancelPowerChange            4
+#define	kPMShutdownSystem               5
+#define	kPMRestartSystem                6
+#define kPMSleepSystemOptions           7
+#define kPMSetMaintenanceWakeCalendar   8
+
+#define kNumPMMethods                   9
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSource.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSource.h.svn-base
new file mode 100644
index 0000000..ed68918
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSource.h.svn-base
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+ 
+#ifndef _IOPMPowerSource_h_
+#define _IOPMPowerSource_h_
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/pwr_mgt/IOPM.h>
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOReturn.h>
+#include <IOKit/IOService.h>
+
+enum {
+    kSecondsPerHour = 3600,
+    kTenMinutesInSeconds = 600
+};
+
+/* class IOPMPowerSource
+ *
+ * See IOKit/pwr_mgt/IOPM.h for power source keys relevant to this class. These
+ * report-type keys are required for calls to IOPMPowerSource::setReportables(),
+ * and they define the IORegistry interface through which data is passed back
+ * up to the rest of the system.
+ *
+ * A subclassing driver that doesn't want to do anything fancy should:
+ *   1. Subclass IOPMPowerSource
+ *   3. Install its own battery change notifications or polling routine that can
+ *          converse with actual battery hardware.
+ *   4. When battery state changes, change the relevant member variables
+ *          through setCurrentCapacity() style accessors.
+ *   5. Call updateStatus() on itself when all such settings have been updated.
+ *   
+ * The subclass driver should also initially populate its settings and call
+ * updateStatus() on launch.
+ *
+ *
+ * Settings
+ *
+ * ExternalConnected
+ * Type: bool
+ * IORegistry Key: kIOPMPSExternalConnectedKey
+ * True if computer is drawing external power 
+ *
+ * ExternalChargeCapable
+ * Type: bool
+ * IORegistry Key: kIOPMPSExternalChargeCapableKey
+ * True if external power is capable of charging internal battery
+ *
+ * BatteryInstalled
+ * Type: bool
+ * IORegistry Key: kIOPMPSBatteryInstalledKey
+ * True if a battery is present; false if removed
+ *
+ * IsCharging
+ * Type: bool
+ * IORegistry Key: kIOPMPSIsChargingKey
+ * True if battery is charging itself from external power
+ *
+ * AtWarnLevel
+ * Type: bool
+ * IORegistry Key: kIOPMPSAtWarnLevelKey
+ * True if draining battery capacity and past warn level
+ *
+ * AtCriticalLevel
+ * Type: bool
+ * IORegistry Key: kIOPMPSAtCriticalLevelKey
+ * True if draining battery capacity and past critical level
+ *
+ * CurrentCapacity
+ * MaxCapacity
+ * Type: unsigned int
+ * IORegistry Key: kIOPMPSCurrentCapacityKey, kIOPMPSMaxCapacityKey
+ * Capacity measured in mAh
+ *
+ * TimeRemaining
+ * Type: int
+ * IORegistry Key: kIOPMPSTimeRemainingKey
+ * Time remaining measured in minutes
+ *
+ * Amperage
+ * Type: int
+ * IORegistry Key: kIOPMPSAmperageKey
+ * Current is measured in mA
+ *
+ * Voltage
+ * Type: unsigned int
+ * IORegistry Key: kIOPMPSVoltageKey
+ * Voltage measured in mV
+ *
+ * CycleCount
+ * Type: unsigned int
+ * IORegistry Key: kIOPMPSCycleCountKey
+ * Number of charge/discharge cycles
+ *
+ * AdapterInfo
+ * Type: int
+ * IORegistry Key: kIOPMPSAdapterInfoKey
+ * Power adapter information
+ *
+ * Location
+ * Type: int
+ * IORegistry Key: kIOPMPSLocationKey
+ * Clue about battery's location in machine - Left vs. Right
+ *
+ * ErrorCondition
+ * Type: OSSymbol
+ * IORegistry Key: kIOPMPSErrorConditionKey
+ * String describing error state of battery
+ *
+ * Manufacturer
+ * Type: OSSymbol
+ * IORegistry Key: kIOPMPSManufacturerKey
+ * String describing battery manufacturer
+ *
+ * Manufactured Date
+ * Type: unsigned 16-bit bitfield
+ * IORegistry Key: kIOPMPSManufactureDateKey
+ * Date is published in a bitfield per the Smart Battery Data spec rev 1.1 
+ * in section 5.1.26
+ *   Bits 0...4 => day (value 1-31; 5 bits)
+ *   Bits 5...8 => month (value 1-12; 4 bits)
+ *   Bits 9...15 => years since 1980 (value 0-127; 7 bits)
+ *
+ * Model
+ * Type: OSSymbol
+ * IORegistry Key: kIOPMPSModelKey
+ * String describing model number
+ *
+ * Serial
+ * Type: OSSymbol
+ * IORegistry Key: kIOPMPSSerialKey
+ * String describing serial number or unique info
+ * The serial number published hear bears no correspondence to the Apple serial
+ * number printed on each battery. This is a manufacturer serial number with 
+ * no correlation to the printed serial number.
+ *
+ * LegacyIOBatteryInfo
+ * Type: OSDictionary
+ * IORegistry Key: kIOPMPSLegacyBatteryInfoKey
+ * Dictionary conforming to the OS X 10.0-10.4 
+ */
+
+class IOPMPowerSource : public IOService
+{
+    OSDeclareDefaultStructors(IOPMPowerSource)
+
+    friend class IOPMPowerSourceList;
+
+ protected:
+
+/* bool settingsChangedSinceLastUpdate
+ * Used by subclasses to determine if any settings have been modified via the
+ * accessors below since last call to update(). true is settings have changed;
+ * false otherwise.
+ */
+    bool settingsChangedSinceUpdate;
+    
+/* OSDictionary properties
+ * Stores power source state
+ */
+    OSDictionary            *properties;
+
+    const OSSymbol *externalConnectedKey;
+    const OSSymbol *externalChargeCapableKey;
+    const OSSymbol *batteryInstalledKey;
+    const OSSymbol *chargingKey;
+    const OSSymbol *warnLevelKey;
+    const OSSymbol *criticalLevelKey;
+    const OSSymbol *currentCapacityKey;
+    const OSSymbol *maxCapacityKey;
+    const OSSymbol *timeRemainingKey;
+    const OSSymbol *amperageKey;
+    const OSSymbol *voltageKey;
+    const OSSymbol *cycleCountKey;
+    const OSSymbol *adapterInfoKey;
+    const OSSymbol *locationKey;
+    const OSSymbol *errorConditionKey;
+    const OSSymbol *manufacturerKey;
+    const OSSymbol *modelKey;
+    const OSSymbol *serialKey;
+    const OSSymbol *batteryInfoKey;
+
+    // Tracking for IOPMPowerSourceList
+    IOPMPowerSource         *nextInList;
+
+ public:
+
+/*! @function powerSource
+    @abstract Creates a new IOPMPowerSource nub. Must be attached to IORegistry,
+        and registered by provider.
+*/
+    static IOPMPowerSource *powerSource(void);
+
+    virtual bool init(void);
+    
+    virtual void free(void);
+
+/*! @function updateStatus
+    @abstract Must be called by physical battery controller when battery state
+                has changed significantly.
+    @discussion The system will not poll this object for battery updates. Rather \
+    the battery's controller must call updateStatus() every time state changes \
+    and the settings will be relayed to higher levels of power management. \
+    The subclassing driver should override this only if the driver needs to add \
+    new settings to the base class.
+*/
+    virtual void updateStatus(void);
+
+/* Public accessors for battery state
+ */
+    bool externalConnected(void);
+    bool externalChargeCapable(void);
+    bool batteryInstalled(void);
+    bool isCharging(void);
+    bool atWarnLevel(void);
+    bool atCriticalLevel(void);
+
+    unsigned int currentCapacity(void);
+    unsigned int maxCapacity(void);
+    unsigned int capacityPercentRemaining(void);
+    int timeRemaining(void);
+    int amperage(void);
+    unsigned int voltage(void);
+    unsigned int cycleCount(void);
+    int adapterInfo(void);
+    int location(void);
+    
+    OSSymbol *errorCondition(void);
+    OSSymbol *manufacturer(void);
+    OSSymbol *model(void);
+    OSSymbol *serial(void);
+    OSDictionary *legacyIOBatteryInfo(void);
+    
+    OSObject *getPSProperty(const OSSymbol *);
+    
+protected:
+
+/* Protected "setter" methods for subclasses
+ * Subclasses should use these setters to modify all battery properties.
+ * 
+ * Subclasses must follow all property changes with a call to updateStatus() 
+ * to flush settings changes to upper level battery API clients.
+ *
+ */
+    void setExternalConnected(bool);
+    void setExternalChargeCapable(bool);
+    void setBatteryInstalled(bool);
+    void setIsCharging(bool);
+    void setAtWarnLevel(bool);
+    void setAtCriticalLevel(bool);
+
+    void setCurrentCapacity(unsigned int);
+    void setMaxCapacity(unsigned int);    
+    void setTimeRemaining(int);
+    void setAmperage(int);    
+    void setVoltage(unsigned int);
+    void setCycleCount(unsigned int);
+    void setAdapterInfo(int);
+    void setLocation(int);
+
+    void setErrorCondition(OSSymbol *);
+    void setManufacturer(OSSymbol *);
+    void setModel(OSSymbol *);
+    void setSerial(OSSymbol *);
+    void setLegacyIOBatteryInfo(OSDictionary *);
+
+/* All of these methods funnel through the generic accessor method
+   setPSProperty. Caller can pass in any arbitrary OSSymbol key, and
+   that value will be stored in the PM settings dictionary, and relayed
+   onto the IORegistry at update time.
+ */
+    void setPSProperty(const OSSymbol *, OSObject *);
+};
+
+#endif
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSourceList.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSourceList.h.svn-base
new file mode 100644
index 0000000..cb1c8ea
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSourceList.h.svn-base
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOReturn.h>
+
+class IOPMPowerSource;
+
+class IOPMPowerSourceList : public OSObject
+{
+    OSDeclareDefaultStructors(IOPMPowerSourceList)
+ private:
+    // pointer to first power source in list
+    IOPMPowerSource         *firstItem;
+
+    // how many power sources are in the list
+    unsigned long           length;
+
+  public:
+    void initialize(void);
+    void free(void);
+
+    unsigned long numberOfItems(void);
+    IOReturn addToList(IOPMPowerSource *newPowerSource);
+    IOReturn removeFromList(IOPMPowerSource *theItem);
+    
+    IOPMPowerSource *firstInList(void);
+    IOPMPowerSource *nextInList(IOPMPowerSource *currentItem);
+};
+
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPrivate.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPrivate.h.svn-base
new file mode 100644
index 0000000..bf50d78
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPrivate.h.svn-base
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOKIT_IOPMPRIVATE_H
+#define _IOKIT_IOPMPRIVATE_H
+
+#include <IOKit/pwr_mgt/IOPM.h>
+
+/*****************************************************************************/
+
+// Private power commands issued to root domain
+// bits 0-7 in IOPM.h
+
+enum {
+    kIOPMSetValue                   = (1<<16),
+    // don't sleep on clamshell closure on a portable with AC connected
+    kIOPMSetDesktopMode             = (1<<17),
+    // set state of AC adaptor connected
+    kIOPMSetACAdaptorConnected      = (1<<18)
+};
+
+/*****************************************************************************/
+/*****************************************************************************/
+
+/*
+ * PM notification types
+ */
+
+/* @constant kIOPMStateConsoleUserShutdown
+ * @abstract Notification of GUI shutdown state available to kexts.
+ * @discussion This type can be passed as arguments to registerPMSettingController()
+ * to receive callbacks.
+ */
+#define kIOPMStateConsoleShutdown   "ConsoleShutdown"
+
+/* @enum ShutdownValues
+ * @abstract Potential values shared with key kIOPMStateConsoleUserShutdown
+ */
+enum {
+/* @constant kIOPMStateConsoleShutdownNone
+ * @abstract System shutdown (or restart) hasn't started; system is ON.
+ * @discussion Next state: 2
+ */
+    kIOPMStateConsoleShutdownNone   = 1,
+/* @constant kIOPMStateConsoleShutdownPossible
+ * @abstract User has been presented with the option to shutdown or restart. Shutdown may be cancelled.
+ * @discussion Next state may be: 1, 4
+ */
+    kIOPMStateConsoleShutdownPossible = 2,
+/* @constant kIOPMStateConsoleShutdownUnderway
+ * @abstract Shutdown or restart is proceeding. It may still be cancelled.
+ * @discussion Next state may be: 1, 4. This state is currently unused.
+ */
+    kIOPMStateConsoleShutdownUnderway = 3,
+/* @constant kIOPMStateConsoleShutdownCertain
+ * @abstract Shutdown is in progress and irrevocable.
+ * @discussion State remains 4 until power is removed from CPU.
+ */
+    kIOPMStateConsoleShutdownCertain = 4
+};
+
+/*****************************************************************************/
+/*****************************************************************************/
+
+/* PM Statistics - event indices 
+ * These are arguments to IOPMrootDomain::pmStatsRecordEvent().
+ */
+enum {
+    kIOPMStatsHibernateImageWrite         = 1,
+    kIOPMStatsHibernateImageRead,
+    kIOPMStatsDriversNotify,
+    kIOPMStatsApplicationNotify,
+    kIOPMStatsLateDriverAcknowledge,
+    kIOPMStatsLateAppAcknowledge,
+    
+    // To designate if you're specifying the start or stop end of 
+    // each of the above events, do a bitwise OR of the appropriate
+    // Start/Stop flag and pass the result to IOPMrootDomain to record
+    // the event.
+    kIOPMStatsEventStartFlag              = (1 << 24),
+    kIOPMStatsEventStopFlag               = (1 << 25)
+};
+
+// Keys for IOPMrootDomain registry properties
+#define kIOPMSleepStatisticsKey                 "SleepStatistics"
+#define kIOPMSleepStatisticsAppsKey             "AppStatistics"
+
+// Application response statistics
+#define kIOPMStatsNameKey                       "Name"
+#define kIOPMStatsPIDKey                        "Pid"
+#define kIOPMStatsTimeMSKey                     "TimeMS"
+#define kIOPMStatsApplicationResponseTypeKey    "ResponseType"
+#define kIOPMStatsMessageTypeKey                "MessageType"
+ 
+// PM Statistics: potential values for the key kIOPMStatsApplicationResponseTypeKey
+// entry in the application results array.
+#define kIOPMStatsResponseTimedOut      "ResponseTimedOut"
+#define kIOPMStatsResponseCancel        "ResponseCancel"
+#define kIOPMStatsResponseSlow          "ResponseSlow"
+
+typedef struct {
+    struct bounds{
+        uint64_t start;
+        uint64_t stop;
+    };
+    
+    struct bounds    hibWrite;
+    struct bounds    hibRead;
+//    bounds    driverNotifySleep;
+//    bounds    driverNotifyWake;
+//    bounds    appNotifySleep;
+//    bounds    appNotifyWake;  
+//    OSDictionary    *tardyApps;    
+//    OSDictionary    *tardyDrivers;
+} PMStatsStruct;
+
+/*****************************************************************************/
+
+/* PM RootDomain tracePoints
+ *
+ * In the sleep/wake process, we expect the sleep trace points to proceed
+ * in increasing order. Once sleep begins with code kIOPMTracePointSleepStarted = 0x11,
+ * we expect sleep to continue in a monotonically increasing order of tracepoints
+ * to kIOPMTracePointSystemLoginwindowPhase = 0x30. After trace point SystemLoginWindowPhase,
+ * the system will return to kIOPMTracePointSystemUp = 0x00.
+ *
+ * If the trace point decreases (instead of increasing) before reaching kIOPMTracePointSystemUp,
+ * that indicates that the sleep process was cancelled. The cancel reason shall be indicated
+ * in the cancel tracepoint. (TBD)
+ */
+
+enum {
+/* When kTracePointSystemUp is the latest tracePoint,
+   the system is awake. It is not asleep, sleeping, or waking.
+   
+   * Phase begins: At boot, at completion of wake from sleep,
+          immediately following kIOPMTracePointSystemLoginwindowPhase.
+   * Phase ends: When a sleep attempt is initiated.
+ */
+    kIOPMTracePointSystemUp                     = 0,
+
+/* When kIOPMTracePointSleepStarted we have just initiated sleep.
+
+    Note: The state prior to kIOPMTracePointSleepStarted may be only one of:
+        * kIOPMTracePointSystemUp
+        * kIOPMTracePointSystemLoginwindowPhase or 
+
+   * Phase begins: At initiation of system sleep (idle or forced).
+   * Phase ends: As we start to notify applications of system sleep.
+ */
+    kIOPMTracePointSleepStarted             = 0x11,
+
+/* When kTracePointSystemSleepAppsPhase is the latest tracePoint,
+   a system sleep has been irrevocably inititated and PM waits
+   for responses from notified applications.
+
+   * Phase begins: Begin to asynchronously fire kIOMessageSystemWillSleep notifications,
+   *        and in the case of an idle sleep kIOMessageCanSystemSleep as well.
+   * Phase ends: When we have received all user & interested kernel acknowledgements.
+ */
+    kIOPMTracePointSystemSleepAppsPhase         = 0x12,
+
+
+/* When kIOPMTracePointSystemHibernatePhase is the latest tracePoint,
+    PM is writing the hiernate image to disk.
+ */
+    kIOPMTracePointSystemHibernatePhase         = 0x13,
+
+/* When kTracePointSystemSleepDriversPhase is the latest tracePoint,
+    PM is iterating the driver tree powering off devices individually.
+
+   * Phase begins: When IOPMrootDomain has received all of its power acknowledgements and begins
+   *        executing IOService::powerDomainWillChangeTo()
+   * Phase ends: When IOPMrootDomain::powerChangeDone begins executing CPU shutoff code.
+ */
+    kIOPMTracePointSystemSleepDriversPhase      = 0x14,
+
+/* When kTracePointSystemSleepPlatformPhase is the latest tracePoint,
+    all apps and drivers have notified of sleep. Plotfarm is powering
+    off CPU; or system is asleep; or low level wakeup is underway.
+
+    Note: If a system is asleep and then loses power, and it does not have a hibernate
+        image to restore from (e.g. hibernatemode = 0), then OS X may interpret this power
+        loss as a system crash in the kTracePointSystemSleepPlatformPhase, since the
+        power loss resembles a hang or crash, and the power being removed by the user.
+
+   * Phase begins: IOPMrootDomain has already shut off drivers, and is now powering off CPU.
+   * Phase ends: Immediately after CPU's are powered back on during wakeup.
+ */
+    kIOPMTracePointSystemSleepPlatformPhase     = 0x15,
+
+/* When kTracePointSystemWakeDriversPhase is the latest tracePoint,
+    System CPU is powered, PM is notifying drivers of system wake.
+
+   * Phase begins: CPU's have successfully powered up and OS is executing.
+   * Phase ends: All drivers have handled power events & acknowledged completion.
+        IOPMrootDomain is about to deliver kIOMessageSystemHasPoweredOn.
+ */
+    kIOPMTracePointSystemWakeDriversPhase       = 0x21,
+
+/* When kTracePointSystemWakeAppsPhase is the latest tracePoint,
+   System CPU is powered, PM has powered on each driver.
+
+   * Phase begins: IOPMrootDomain::tellChangeUp before sending asynchronous 
+        kIOMessageSystemHasPoweredOn notifications
+   * Phase ends: IOPMrootDomain::tellChangeUp after sending asynchronous notifications
+ */
+    kIOPMTracePointSystemWakeAppsPhase          = 0x22,
+
+/* kIOPMTracePointSystemLoginwindowPhase
+    This phase represents a several minute window after the system has powered on.
+    Higher levels of system diagnostics are in a heightened state of alert in this phase,
+    in case any user errors occurred that we could not detect in software.
+    
+    This several minute window  
+
+   * Phase begins: After IOPMrootDomain sends kIOMessageSystemHasPoweredOn message.
+   * Phase ends: When loginwindow calls IOPMSleepWakeSetUUID(NULL) the system shall 
+        be considered awake and usable. The next phase shall be kIOPMTracePointSystemUp.
+ */
+    kIOPMTracePointSystemLoginwindowPhase       = 0x30 
+};
+
+/*****************************************************************************/
+
+/*
+Ê* kIOPMLoginWindowSecurityDebugKey - identifies PM debug data specific to LoginWindow
+ *  for use with IOPMrootDomain.
+Ê*/
+#define kIOPMLoginWindowSecurityDebugKey        "LoginWindowSecurity"
+
+// For PM internal use only - key to locate sleep failure results within SCDynamicStore.
+#define kIOPMDynamicStoreSleepFailureKey        "SleepFailure"
+
+/*****************************************************************************/
+
+// For IOPMLibPrivate.h
+#define kIOPMSleepWakeFailureKey            "PMFailurePhase"
+#define kIOPMSleepWakeFailureCodeKey        "PMStatusCode"
+#define kIOPMSleepWakeFailureLoginKey       "LWFailurePhase"
+#define kIOPMSleepWakeFailureUUIDKey        "UUID"
+#define kIOPMSleepWakeFailureDateKey        "Date"
+
+#endif /* ! _IOKIT_IOPMPRIVATE_H */
+
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMpowerState.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMpowerState.h.svn-base
new file mode 100644
index 0000000..f7f4c8a
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMpowerState.h.svn-base
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#include <IOKit/pwr_mgt/IOPM.h>
+
+/*! @header IOPMpowerState.h
+    @abstract Defines the struct IOPMPowerState that power managed drivers should use to describe their power states.
+*/
+
+/*! @struct IOPMPowerState
+    @abstract Describes a device's power state.
+    @discussion To take part in system power management, drivers should define an array of 2 or more power states and pass it to kernel power management through IOService::registerPowerDriver.
+    @field version Defines version number of this struct. Just use the value "1" when defining an IOPMPowerState.
+    @field	capabilityFlags Describes the capability of the device in this state.
+    @field	outputPowerCharacter Describes the power provided in this state.
+    @field	inputPowerRequirement Describes the input power required in this state.
+    @field	staticPower Describes average consumption in milliwatts. Unused; drivers may specify 0.
+    @field	unbudgetedPower Describes additional consumption from separate power supply (milliWatts). Unused; drivers may specify 0.
+    @field	powerToAttain Describes dditional power to attain this state from next lower state (in milliWatts). Unused; drivers may specify 0.
+    @field	timeToAttain Describes time required to enter this state from next lower state (in microseconds). Unused; drivers may specify 0.
+    @field	settleUpTime Describes settle time required after entering this state from next lower state (microseconds). Unused; drivers may specify 0.
+    @field timeToLower Describes time required to enter next lower state from this one (microseconds). Unused; drivers may specify 0.
+    @field	settleDownTime Settle time required after entering next lower state from this state (microseconds). Unused; drivers may specify 0.
+    @field	powerDomainBudget Describes power in milliWatts a domain in this state can deliver to its children. Unused; drivers may specify 0.
+}
+*/
+
+struct IOPMPowerState
+{
+    unsigned long	version;
+    IOPMPowerFlags	capabilityFlags;
+    IOPMPowerFlags	outputPowerCharacter;
+    IOPMPowerFlags	inputPowerRequirement;
+    unsigned long	staticPower;
+    unsigned long	unbudgetedPower;
+    unsigned long	powerToAttain;
+    unsigned long	timeToAttain;
+    unsigned long	settleUpTime;
+    unsigned long	timeToLower;
+    unsigned long	settleDownTime;
+    unsigned long	powerDomainBudget;
+};
+
+typedef struct IOPMPowerState IOPMPowerState;
+
+enum {
+    kIOPMPowerStateVersion1 = 1
+};
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPowerConnection.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPowerConnection.h.svn-base
new file mode 100644
index 0000000..179035b
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPowerConnection.h.svn-base
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOPOWERCONNECTION_H
+#define _IOKIT_IOPOWERCONNECTION_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/pwr_mgt/IOPM.h>
+
+class IOPowerConnection : public IOService
+{
+    OSDeclareDefaultStructors(IOPowerConnection)
+
+protected:
+    /*! @field parentKnowsState	true: parent knows state of its domain
+					used by child */
+    bool		stateKnown;
+    /*! @field currentPowerFlags	power flags which describe  the current state of the power domain
+					used by child */
+    IOPMPowerFlags 	currentPowerFlags;
+    /*! @field desiredDomainState	state number which corresponds to the child's desire
+					used by parent */
+    unsigned long	desiredDomainState;
+
+    /*! @field requestFlag		set to true when desiredDomainState is set */
+    bool		requestFlag;
+
+    /*! @field preventIdleSleepFlag	true if child has this bit set in its desired state
+					used by parent */
+    unsigned long	preventIdleSleepFlag;
+
+    /*! @field preventSystemSleepFlag	true if child has this bit set in its desired state
+					used by parent */
+    unsigned long	preventSystemSleepFlag;
+
+    /*! @field awaitingAck		true if child has not yet acked our notification
+					used by parent */
+    bool		awaitingAck;
+
+    /*! @field readyFlag		true if the child has been added as a power child
+					used by parent */
+	bool		readyFlag;
+
+public:
+        /*! @function setParentKnowsState
+            @abstract Sets the stateKnown variable.
+            @discussion Called by the parent when the object is created and called by the child when it discovers that the parent now knows its state. */
+    void setParentKnowsState (bool );
+
+    /*! @function setParentCurrentPowerFlags
+        @abstract Sets the currentPowerFlags variable.
+        @discussion Called by the parent when the object is created and called by the child when it discovers that the parent state is changing. */
+    void setParentCurrentPowerFlags (IOPMPowerFlags );
+
+    /*! @function parentKnowsState
+        @abstract Returns the stateKnown variable. */
+    bool parentKnowsState (void );
+
+    /*! @function parentCurrentPowerFlags
+        @abstract Returns the currentPowerFlags variable. */
+    IOPMPowerFlags parentCurrentPowerFlags (void );
+
+    /*! @function setDesiredDomainState
+        @abstract Sets the desiredDomainState variable.
+        @discussion Called by the parent. */
+    void setDesiredDomainState (unsigned long );
+
+    /*! @function getDesiredDomainState
+        @abstract Returns the desiredDomainState variable.
+    @discussion Called by the parent. */
+    unsigned long getDesiredDomainState ( void );
+
+    /*! @function setChildHasRequestedPower
+        @abstract Set the flag that says that the child has called requestPowerDomainState.
+    @discussion Called by the parent. */
+    void setChildHasRequestedPower ( void );
+
+
+    /*! @function childHasRequestedPower
+        @abstract Return the flag that says whether the child has called requestPowerDomainState.
+    @discussion Called by the PCI Aux Power Supply Driver to see if a device driver
+        is power managed. */
+    bool childHasRequestedPower ( void );
+    
+    /*! @function setPreventIdleSleepFlag
+        @abstract Sets the preventIdleSleepFlag variable.
+        @discussion Called by the parent. */
+    void setPreventIdleSleepFlag (unsigned long );
+
+    /*! @function getPreventIdleSleepFlag
+        @abstract Returns the preventIdleSleepFlag variable.
+    @discussion Called by the parent. */
+    bool getPreventIdleSleepFlag ( void );
+    
+    /*! @function setPreventSystemSleepFlag
+        @abstract Sets the preventSystemSleepFlag variable.
+        @discussion Called by the parent. */
+    void setPreventSystemSleepFlag (unsigned long );
+
+    /*! @function getPreventSystemSleepFlag
+        @abstract Returns the preventSystemSleepFlag variable.
+        @discussion Called by the parent. */
+    bool getPreventSystemSleepFlag ( void );
+    
+    /*! @function setAwaitingAck
+        @abstract Sets the awaitingAck variable.
+        @discussion Called by the parent. */
+    void setAwaitingAck ( bool );
+
+    /*! @function getAwaitingAck
+        @abstract Returns the awaitingAck variable.
+        @discussion Called by the parent. */
+    bool getAwaitingAck ( void );
+
+    /*! @function setReadyFlag
+        @abstract Sets the readyFlag variable.
+        @discussion Called by the parent. */
+	void setReadyFlag( bool flag );
+
+    /*! @function getReadyFlag
+        @abstract Returns the readyFlag variable.
+        @discussion Called by the parent. */
+	bool getReadyFlag( void ) const;
+};
+
+#endif /* ! _IOKIT_IOPOWERCONNECTION_H */
+
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/RootDomain.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/RootDomain.h.svn-base
new file mode 100644
index 0000000..6f4ebee
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/.svn/text-base/RootDomain.h.svn-base
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOKIT_ROOTDOMAIN_H
+#define _IOKIT_ROOTDOMAIN_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/pwr_mgt/IOPM.h>
+#include "IOKit/pwr_mgt/IOPMPrivate.h"
+
+
+class IOPMPowerStateQueue;
+class RootDomainUserClient;
+class PMTraceWorker;
+
+/*
+ * Flags for get/setSleepSupported()
+ */
+enum {
+    kRootDomainSleepNotSupported	= 0x00000000,
+    kRootDomainSleepSupported 		= 0x00000001,
+    kFrameBufferDeepSleepSupported	= 0x00000002,
+    kPCICantSleep                   = 0x00000004
+};
+
+/* 
+ *IOPMrootDomain registry property keys
+ */
+#define kRootDomainSupportedFeatures        "Supported Features"
+#define kRootDomainSleepReasonKey           "Last Sleep Reason"
+#define kRootDomainSleepOptionsKey          "Last Sleep Options"
+#define kIOPMRootDomainWakeReasonKey        "Wake Reason"
+#define kIOPMRootDomainWakeTypeKey          "Wake Type"
+#define kIOPMRootDomainPowerStatusKey       "Power Status"
+
+/*
+ * Possible sleep reasons found under kRootDomainSleepReasonsKey
+ */
+#define kIOPMClamshellSleepKey              "Clamshell Sleep"
+#define kIOPMPowerButtonSleepKey            "Power Button Sleep"
+#define kIOPMSoftwareSleepKey               "Software Sleep"
+#define kIOPMOSSwitchHibernationKey         "OS Switch Sleep"
+#define kIOPMIdleSleepKey                   "Idle Sleep"
+#define kIOPMLowPowerSleepKey               "Low Power Sleep"
+#define kIOPMThermalEmergencySleepKey       "Thermal Emergency Sleep"
+#define kIOPMMaintenanceSleepKey            "Maintenance Sleep"
+
+/*
+ * String constants for communication with PM CPU
+ */
+#define kIOPMRootDomainLidCloseCString      "LidClose"
+#define kIOPMRootDomainBatPowerCString      "BatPower"
+
+/*
+ * Supported Feature bitfields for IOPMrootDomain::publishFeature()
+ */
+enum {
+    kIOPMSupportedOnAC      = (1<<0),
+    kIOPMSupportedOnBatt    = (1<<1),
+    kIOPMSupportedOnUPS     = (1<<2)
+};
+
+typedef IOReturn (*IOPMSettingControllerCallback)
+                    (OSObject *target, const OSSymbol *type,
+                     OSObject *val, uintptr_t refcon);
+
+__BEGIN_DECLS
+IONotifier *    registerSleepWakeInterest(
+                    IOServiceInterestHandler, void *, void * = 0);
+               
+IONotifier *    registerPrioritySleepWakeInterest(
+                    IOServiceInterestHandler handler, 
+                    void * self, void * ref = 0);
+
+IOReturn        acknowledgeSleepWakeNotification(void * );
+
+IOReturn        vetoSleepWakeNotification(void * PMrefcon);
+__END_DECLS
+
+#define IOPM_ROOTDOMAIN_REV		2
+
+class IOPMrootDomain: public IOService
+{
+    OSDeclareFinalStructors(IOPMrootDomain)
+
+public:
+    static IOPMrootDomain * construct( void );
+
+    virtual bool        start( IOService * provider );
+    virtual IOReturn    setAggressiveness( unsigned long, unsigned long );
+    virtual IOReturn    getAggressiveness( unsigned long, unsigned long * );
+
+    virtual IOReturn    sleepSystem( void );
+    IOReturn            sleepSystemOptions( OSDictionary *options );
+
+    virtual IOReturn    setProperties( OSObject * );
+
+/*! @function systemPowerEventOccurred
+    @abstract Other drivers may inform IOPMrootDomain of system PM events
+    @discussion systemPowerEventOccurred is a richer alternative to receivePowerNotification()
+        Only Apple-owned kexts should have reason to call systemPowerEventOccurred.
+    @param event An OSSymbol describing the type of power event.
+    @param value A 32-bit integer value associated with the event.
+    @param shouldUpdate indicates whether the root domain should send a notification
+        to interested parties. Pass false if you're calling systemPowerEventOccurred
+        several times in succession; and pass true only on the last invocatino.
+    @result kIOReturnSuccess on success */
+
+    IOReturn            systemPowerEventOccurred(
+                                    const OSSymbol *event, 
+                                    uint32_t intValue );
+
+    IOReturn            systemPowerEventOccurred(
+                                    const OSSymbol *event, 
+                                    OSObject *value );
+
+    virtual IOReturn    receivePowerNotification( UInt32 msg );
+
+    virtual void        setSleepSupported( IOOptionBits flags );
+
+    virtual IOOptionBits getSleepSupported( void );
+
+    void                wakeFromDoze( void );
+
+    // KEXT driver announces support of power management feature
+
+    void                publishFeature( const char *feature );
+    
+    // KEXT driver announces support of power management feature
+    // And specifies power sources with kIOPMSupportedOn{AC/Batt/UPS} bitfield.
+    // Returns a unique uint32_t identifier for later removing support for this
+    // feature. 
+    // NULL is acceptable for uniqueFeatureID for kexts without plans to unload.
+
+    void                publishFeature( const char *feature, 
+                                        uint32_t supportedWhere,
+                                        uint32_t *uniqueFeatureID);
+
+    // KEXT driver announces removal of a previously published power management 
+    // feature. Pass 'uniqueFeatureID' returned from publishFeature()
+
+    IOReturn            removePublishedFeature( uint32_t removeFeatureID );
+
+/*! @function copyPMSetting
+    @abstract Copy the current value for a PM setting. Returns an OSNumber or
+        OSData depending on the setting.
+    @param whichSetting Name of the desired setting.
+    @result OSObject value if valid, NULL otherwise. */
+
+    OSObject *          copyPMSetting( OSSymbol *whichSetting );
+
+/*! @function registerPMSettingController
+    @abstract Register for callbacks on changes to certain PM settings.
+    @param settings NULL terminated array of C strings, each string for a PM 
+        setting that the caller is interested in and wants to get callbacks for. 
+    @param callout C function ptr or member function cast as such.
+    @param target The target of the callback, usually 'this'
+    @param refcon Will be passed to caller in callback; for caller's use.
+    @param handle Caller should keep the OSObject * returned here. If non-NULL,
+        handle will have a retain count of 1 on return. To deregister, pass to
+        unregisterPMSettingController()
+    @result kIOReturnSuccess on success. */
+
+    IOReturn            registerPMSettingController(
+                                 const OSSymbol *settings[],
+                                 IOPMSettingControllerCallback callout,
+                                 OSObject   *target,
+                                 uintptr_t  refcon,
+                                 OSObject   **handle);    // out param
+
+/*! @function registerPMSettingController
+    @abstract Register for callbacks on changes to certain PM settings.
+    @param settings NULL terminated array of C strings, each string for a PM 
+        setting that the caller is interested in and wants to get callbacks for. 
+    @param supportedPowerSources bitfield indicating which power sources these
+        settings are supported for (kIOPMSupportedOnAC, etc.)
+    @param callout C function ptr or member function cast as such.
+    @param target The target of the callback, usually 'this'
+    @param refcon Will be passed to caller in callback; for caller's use.
+    @param handle Caller should keep the OSObject * returned here. If non-NULL,
+        handle will have a retain count of 1 on return. To deregister, pass to
+        unregisterPMSettingController()
+    @result kIOReturnSuccess on success. */
+
+    IOReturn            registerPMSettingController(
+                                 const OSSymbol *settings[],
+                                 uint32_t   supportedPowerSources,
+                                 IOPMSettingControllerCallback callout,
+                                 OSObject   *target,
+                                 uintptr_t  refcon,
+                                 OSObject   **handle);    // out param
+
+    virtual IONotifier * registerInterest(
+                                const OSSymbol * typeOfInterest,
+                                IOServiceInterestHandler handler,
+                                void * target, void * ref = 0 );
+                                
+    void                pmStatsRecordEvent(
+                                int             eventIndex,
+                                AbsoluteTime    timestamp);
+
+    void                pmStatsRecordApplicationResponse(
+                            const OSSymbol		*response,
+                            const char 		    *name,
+                            int                 messageType,
+                            uint32_t			delay_ms,
+                            int     			app_pid);
+
+    virtual IOReturn    callPlatformFunction(
+                                const OSSymbol *functionName,
+                                bool waitForFunction,
+                                void *param1, void *param2,
+                                void *param3, void *param4 );
+
+private:
+    virtual IOReturn    changePowerStateTo( unsigned long ordinal );
+    virtual IOReturn    changePowerStateToPriv( unsigned long ordinal );
+    virtual IOReturn    requestPowerDomainState( IOPMPowerFlags, IOPowerConnection *, unsigned long );
+    virtual void        powerChangeDone( unsigned long );
+    virtual bool        tellChangeDown( unsigned long );
+    virtual bool        askChangeDown( unsigned long );
+    virtual void        tellChangeUp( unsigned long );
+    virtual void        tellNoChangeDown( unsigned long );
+};
+
+
+#endif /* _IOKIT_ROOTDOMAIN_H */
diff --git a/i386/include/IOKit/pwr_mgt/IOPM.h b/i386/include/IOKit/pwr_mgt/IOPM.h
new file mode 100644
index 0000000..7d78225
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/IOPM.h
@@ -0,0 +1,654 @@
+/*
+ * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOKIT_IOPM_H
+#define _IOKIT_IOPM_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/IOReturn.h>
+
+#ifdef __ppc__
+#include <IOKit/pwr_mgt/IOPMDeprecated.h>
+#endif
+
+/*! @header IOPM.h
+    @abstract Defines power management constants and keys used by both in-kernel and user space power management.
+    @discussion IOPM.h defines a range of power management constants used in several in-kernel and user space APIs. Most significantly, the IOPMPowerFlags used to specify the fields of an IOPMPowerState struct are defined here.
+
+    Most of the constants defined in IOPM.h are deprecated or for Apple internal use only, and are not elaborated on in headerdoc.
+*/
+
+enum {
+    kIOPMMaxPowerStates = 10,
+    IOPMMaxPowerStates = kIOPMMaxPowerStates
+};
+
+/*! @enum IOPMPowerFlags
+    @abstract Bits are used in defining capabilityFlags, inputPowerRequirements, and outputPowerCharacter in the IOPMPowerState structure.
+    @discussion These bits may be bitwise-OR'd together in the IOPMPowerState capabilityFlags field, the outputPowerCharacter field, and/or the inputPowerRequirement field. 
+    
+    The comments clearly mark whether each flag should be used in the capabilityFlags field, outputPowerCharacter field, and inputPowerRequirement field, or all three.
+    
+    The value of capabilityFlags, inputPowerRequirement or outputPowerCharacter may be 0. Most drivers implement their 'OFF' state, used when asleep, by defininf each of the 3 fields as 0.
+    
+    The bits listed below are only the most common bits used to define a device's power states. Your device's IO family may require that your device specify other input or output power flags to interact properly. Consult family-specific documentation to determine if your IOPower plane parents or children require other power flags; they probably don't.
+
+    @constant kIOPMPowerOn Indicates the device is on, requires power, and provides power. Useful as a: Capability, InputPowerRequirement, OutputPowerCharacter
+
+    @constant kIOPMDeviceUsable Indicates the device is usable in this state. Useful only as a Capability
+
+    @constant kIOPMLowPower 
+    Indicates device is in a low power state. May be bitwis-OR'd together
+    with kIOPMDeviceUsable flag, to indicate the device is still usable.
+    
+    A device with a capability of kIOPMLowPower may:
+       Require either 0 or kIOPMPowerOn from its power parent
+       Offer either kIOPMLowPower, kIOPMPowerOn, or 0 (no power at all)
+         to its power plane children.
+
+    Useful only as a Capability, although USB drivers should consult USB family documentation for other valid circumstances to use the kIOPMLowPower bit.
+
+    @constant kIOPMPreventIdleSleep
+    In the capability field of a power state, disallows idle system sleep while the device is in that state.
+    
+    For example, displays and disks set this capability for their ON power state; since the system may not idle sleep while the display (and thus keyboard or mouse) or the disk is active.
+
+    Useful only as a Capability.
+    
+    @constant kIOPMSleepCapability 
+    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
+    
+    @constant kIOPMRestartCapability
+    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
+    
+    @constant kIOPMSleep
+    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
+
+    @constant kIOPMRestart
+    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
+*/
+typedef unsigned long IOPMPowerFlags;
+enum {
+    kIOPMPowerOn                    = 0x00000002,
+    kIOPMDeviceUsable               = 0x00008000,
+    kIOPMLowPower                   = 0x00010000,
+    kIOPMPreventIdleSleep           = 0x00000040,
+    kIOPMSleepCapability            = 0x00000004,
+    kIOPMRestartCapability          = 0x00000080,
+    kIOPMSleep                      = 0x00000001,
+    kIOPMRestart                    = 0x00000080
+};
+
+/*
+ * Private IOPMPowerFlags
+ *
+ * For Apple use only
+ * Not for use with non-Apple drivers
+ * Their behavior is undefined
+ */
+enum {
+    kIOPMClockNormal                = 0x0004,
+    kIOPMClockRunning               = 0x0008,
+    kIOPMPreventSystemSleep         = 0x0010,
+    kIOPMDoze                       = 0x0400,
+    kIOPMChildClamp                 = 0x0080,
+    kIOPMChildClamp2                = 0x0200,
+    kIOPMNotPowerManaged            = 0x0800
+};
+
+
+/*
+ * Deprecated IOPMPowerFlags
+ * Their behavior is undefined when used in IOPMPowerState
+ * Capability, InputPowerRequirement, or OutputPowerCharacter fields.
+ */
+enum {
+    kIOPMMaxPerformance             = 0x4000,
+    kIOPMPassThrough                = 0x0100,
+    kIOPMAuxPowerOn                 = 0x0020,
+    kIOPMNotAttainable              = 0x0001,
+    kIOPMContextRetained            = 0x2000,
+    kIOPMConfigRetained             = 0x1000,
+    kIOPMStaticPowerValid           = 0x0800,
+    kIOPMSoftSleep                  = 0x0400,
+    kIOPMCapabilitiesMask =     kIOPMPowerOn | kIOPMDeviceUsable | 
+                                kIOPMMaxPerformance | kIOPMContextRetained | 
+                                kIOPMConfigRetained | kIOPMSleepCapability |
+                                kIOPMRestartCapability
+};
+
+/*
+ * Support for old names of IOPMPowerFlag constants
+ */
+enum {
+    IOPMNotAttainable           = kIOPMNotAttainable,
+    IOPMPowerOn                 = kIOPMPowerOn,
+    IOPMClockNormal             = kIOPMClockNormal,
+    IOPMClockRunning            = kIOPMClockRunning,
+    IOPMAuxPowerOn              = kIOPMAuxPowerOn,
+    IOPMDeviceUsable            = kIOPMDeviceUsable,
+    IOPMMaxPerformance          = kIOPMMaxPerformance,
+    IOPMContextRetained         = kIOPMContextRetained,
+    IOPMConfigRetained          = kIOPMConfigRetained,
+    IOPMNotPowerManaged         = kIOPMNotPowerManaged,
+    IOPMSoftSleep               = kIOPMSoftSleep
+};
+
+
+enum {
+    kIOPMNextHigherState        = 1,
+    kIOPMHighestState           = 2,
+    kIOPMNextLowerState         = 3,
+    kIOPMLowestState            = 4
+};
+
+enum {
+    IOPMNextHigherState         = kIOPMNextHigherState,
+    IOPMHighestState            = kIOPMHighestState,
+    IOPMNextLowerState          = kIOPMNextLowerState,
+    IOPMLowestState             = kIOPMLowestState
+};
+
+// Internal commands used by power managment command queue
+enum {
+    kIOPMBroadcastAggressiveness = 1,
+    kIOPMUnidleDevice
+};
+
+// Power consumption unknown value
+enum {
+    kIOPMUnknown = 0xFFFF
+};
+
+/*******************************************************************************
+ *
+ * Root Domain property keys of interest
+ *
+ ******************************************************************************/
+
+/* AppleClamshellState 
+ * reflects the state of the clamshell (lid) on a portable.
+ * It has a boolean value.
+ *  true        == clamshell is closed
+ *  false       == clamshell is open
+ *  not present == no clamshell on this hardware
+ */
+#define kAppleClamshellStateKey             "AppleClamshellState"
+
+/* AppleClamshellCausesSleep 
+ * reflects the clamshell close behavior on a portable. 
+ * It has a boolean value.
+ *  true        == system will sleep when clamshell is closed
+ *  false       == system will not sleep on clamshell close 
+ *                  (typically external display mode)
+ *  not present == no clamshell on this hardware
+ */
+#define kAppleClamshellCausesSleepKey       "AppleClamshellCausesSleep"
+
+/* kIOPMSleepWakeUUIDKey
+ * Key refers to a CFStringRef that will uniquely identify
+ * a sleep/wake cycle for logging & tracking.
+ * The key becomes valid at the beginning of a sleep cycle - before we
+ * initiate any sleep/wake notifications.
+ * The key becomes invalid at the completion of a system wakeup. The
+ * property will not be present in the IOPMrootDomain's registry entry
+ * when it is invalid.
+ * 
+ * See IOPMrootDomain notification kIOPMMessageSleepWakeUUIDChange
+ */
+ #define kIOPMSleepWakeUUIDKey              "SleepWakeUUID"
+
+/*******************************************************************************
+ *
+ * Root Domain general interest messages
+ *
+ * Available by registering for interest type 'gIOGeneralInterest' 
+ * on IOPMrootDomain. 
+ *
+ ******************************************************************************/
+
+/* kIOPMMessageClamshellStateChange
+ * Delivered as a general interest notification on the IOPMrootDomain
+ * IOPMrootDomain sends this message when state of either AppleClamshellState
+ * or AppleClamshellCausesSleep changes. If this clamshell change results in
+ * a sleep, the sleep will initiate soon AFTER delivery of this message.
+ * The state of both variables is encoded in a bitfield argument sent with
+ * the message. Check bits 0 and 1 using kClamshellStateBit & kClamshellSleepBit
+ */
+enum {
+    kClamshellStateBit = (1 << 0),
+    kClamshellSleepBit = (1 << 1)
+};
+
+#define kIOPMMessageClamshellStateChange   \
+                iokit_family_msg(sub_iokit_powermanagement, 0x100)
+
+/* kIOPMMessageFeatureChange
+ * Delivered when the set of supported features ("Supported Features" dictionary
+ * under IOPMrootDomain registry) changes in some way. Typically addition or
+ * removal of a supported feature.
+ * RootDomain passes no argument with this message.
+ */
+#define kIOPMMessageFeatureChange           \
+                iokit_family_msg(sub_iokit_powermanagement, 0x110)
+
+/* kIOPMMessageInflowDisableCancelled
+ * The battery has drained completely to its "Fully Discharged" state. 
+ * If a user process has disabled battery inflow for battery 
+ * calibration, we forcibly re-enable Inflow at this point.
+ * If inflow HAS been forcibly re-enabled, bit 0
+ * (kInflowForciblyEnabledBit) will be set.
+ */
+enum {
+    kInflowForciblyEnabledBit = (1 << 0)
+};
+
+/* kIOPMMessageInternalBatteryFullyDischarged
+ * The battery has drained completely to its "Fully Discharged" state. 
+ */
+#define kIOPMMessageInternalBatteryFullyDischarged  \
+                iokit_family_msg(sub_iokit_powermanagement, 0x120)
+
+/* kIOPMMessageSystemPowerEventOccurred
+ * Some major system thermal property has changed, and interested clients may
+ * modify their behavior.
+ */
+#define kIOPMMessageSystemPowerEventOccurred  \
+                iokit_family_msg(sub_iokit_powermanagement, 0x130)
+
+/* kIOPMMessageSleepWakeUUIDChange
+ * Either a new SleepWakeUUID has been specified at the beginning of a sleep,
+ * or we're removing the existing property upon completion of a wakeup.
+ */
+#define kIOPMMessageSleepWakeUUIDChange  \
+                iokit_family_msg(sub_iokit_powermanagement, 0x140)
+                
+/* kIOPMMessageSleepWakeUUIDSet
+ * Argument accompanying the kIOPMMessageSleepWakeUUIDChange notification when 
+ * a new UUID has been specified.
+ */
+#define kIOPMMessageSleepWakeUUIDSet                    ((void *)1)
+
+/* kIOPMMessageSleepWakeUUIDCleared
+ * Argument accompanying the kIOPMMessageSleepWakeUUIDChange notification when 
+ * the current UUID has been removed.
+ */
+#define kIOPMMessageSleepWakeUUIDCleared                ((void *)0)
+
+/*******************************************************************************
+ *
+ * Power commands issued to root domain
+ * Use with IOPMrootDomain::receivePowerNotification()
+ *
+ * These commands are issued from system drivers only:
+ *      ApplePMU, AppleSMU, IOGraphics, AppleACPIFamily
+ *
+ ******************************************************************************/
+enum {
+  kIOPMSleepNow                 = (1<<0),  // put machine to sleep now
+  kIOPMAllowSleep               = (1<<1),  // allow idle sleep
+  kIOPMPreventSleep             = (1<<2),  // do not allow idle sleep
+  kIOPMPowerButton              = (1<<3),  // power button was pressed
+  kIOPMClamshellClosed          = (1<<4),  // clamshell was closed
+  kIOPMPowerEmergency           = (1<<5),  // battery dangerously low
+  kIOPMDisableClamshell         = (1<<6),  // do not sleep on clamshell closure
+  kIOPMEnableClamshell          = (1<<7),  // sleep on clamshell closure
+  kIOPMProcessorSpeedChange     = (1<<8),  // change the processor speed
+  kIOPMOverTemp                 = (1<<9),  // system dangerously hot
+  kIOPMClamshellOpened          = (1<<10)  // clamshell was opened
+};
+
+
+/*******************************************************************************
+ *
+ * Power Management Return Codes
+ *
+ ******************************************************************************/
+enum {
+    kIOPMNoErr                  = 0,
+
+    // Returned by driver's setPowerState(), powerStateWillChangeTo(),
+    // powerStateDidChangeTo(), or acknowledgeSetPowerState() to
+    // implicitly acknowledge power change upon function return.
+    kIOPMAckImplied             = 0,
+
+    // Deprecated
+    kIOPMWillAckLater           = 1,
+
+    // Returned by requestPowerDomainState() to indicate
+    // unrecognized specification parameter.
+    kIOPMBadSpecification       = 4,
+
+    // Returned by requestPowerDomainState() to indicate
+    // no power state matches search specification.
+    kIOPMNoSuchState            = 5,
+
+    // Deprecated
+    kIOPMCannotRaisePower       = 6,
+
+    // Deprecated
+    kIOPMParameterError         = 7,
+
+    // Returned when power management state is accessed
+    // before driver has called PMinit().
+    kIOPMNotYetInitialized      = 8,
+
+    // And the old constants; deprecated
+    IOPMNoErr = kIOPMNoErr,
+    IOPMAckImplied = kIOPMAckImplied, 
+    IOPMWillAckLater = kIOPMWillAckLater,
+    IOPMBadSpecification = kIOPMBadSpecification,
+    IOPMNoSuchState = kIOPMNoSuchState,
+    IOPMCannotRaisePower = kIOPMCannotRaisePower,
+    IOPMParameterError = kIOPMParameterError,
+    IOPMNotYetInitialized = kIOPMNotYetInitialized
+};
+
+
+// IOPMPowerSource class descriptive strings
+// Power Source state is published as properties to the IORegistry under these 
+// keys.
+#define kIOPMPSExternalConnectedKey                 "ExternalConnected"
+#define kIOPMPSExternalChargeCapableKey             "ExternalChargeCapable"
+#define kIOPMPSBatteryInstalledKey                  "BatteryInstalled"
+#define kIOPMPSIsChargingKey                        "IsCharging"
+#define kIOPMFullyChargedKey                        "FullyCharged"
+#define kIOPMPSAtWarnLevelKey                       "AtWarnLevel"
+#define kIOPMPSAtCriticalLevelKey                   "AtCriticalLevel"
+#define kIOPMPSCurrentCapacityKey                   "CurrentCapacity"
+#define kIOPMPSMaxCapacityKey                       "MaxCapacity"
+#define kIOPMPSDesignCapacityKey                    "DesignCapacity"
+#define kIOPMPSTimeRemainingKey                     "TimeRemaining"
+#define kIOPMPSAmperageKey                          "Amperage"
+#define kIOPMPSVoltageKey                           "Voltage"
+#define kIOPMPSCycleCountKey                        "CycleCount"
+#define kIOPMPSMaxErrKey                            "MaxErr"
+#define kIOPMPSAdapterInfoKey                       "AdapterInfo"
+#define kIOPMPSLocationKey                          "Location"
+#define kIOPMPSErrorConditionKey                    "ErrorCondition"
+#define kIOPMPSManufacturerKey                      "Manufacturer"
+#define kIOPMPSManufactureDateKey                   "ManufactureDate"
+#define kIOPMPSModelKey                             "Model"
+#define kIOPMPSSerialKey                            "Serial"
+#define kIOPMDeviceNameKey                          "DeviceName"
+#define kIOPMPSLegacyBatteryInfoKey                 "LegacyBatteryInfo"
+#define kIOPMPSBatteryHealthKey                     "BatteryHealth"
+#define kIOPMPSHealthConfidenceKey                  "HealthConfidence"
+#define kIOPMPSCapacityEstimatedKey	                "CapacityEstimated"
+#define kIOPMPSBatteryChargeStatusKey               "ChargeStatus"
+#define kIOPMPSBatteryTemperatureKey                "Temperature"
+
+// kIOPMPSBatteryChargeStatusKey may have one of the following values, or may have
+// no value. If kIOPMBatteryChargeStatusKey has a NULL value (or no value) associated with it
+// then charge is proceeding normally. If one of these battery charge status reasons is listed,
+// then the charge may have been interrupted.
+#define kIOPMBatteryChargeStatusTooHot              "HighTemperature"
+#define kIOPMBatteryChargeStatusTooCold             "LowTemperature"
+#define kIOPMBatteryChargeStatusGradient            "BatteryTemperatureGradient"
+
+// Definitions for battery location, in case of multiple batteries.
+// A location of 0 is unspecified
+// Location is undefined for single battery systems
+enum {
+    kIOPMPSLocationLeft = 1001,
+    kIOPMPSLocationRight = 1002
+};
+
+// Battery quality health types, specified by BatteryHealth and HealthConfidence
+// properties in an IOPMPowerSource battery kext.
+enum {
+    kIOPMUndefinedValue = 0,
+    kIOPMPoorValue      = 1,
+    kIOPMFairValue      = 2,
+    kIOPMGoodValue      = 3
+};
+
+// Battery's time remaining estimate is invalid this long (seconds) after a wake
+#define kIOPMPSInvalidWakeSecondsKey           "BatteryInvalidWakeSeconds"
+
+// Battery must wait this long (seconds) after being completely charged before
+// the battery is settled.
+#define kIOPMPSPostChargeWaitSecondsKey        "PostChargeWaitSeconds"
+
+// Battery must wait this long (seconds) after being completely discharged 
+// before the battery is settled.
+#define kIOPMPSPostDishargeWaitSecondsKey      "PostDischargeWaitSeconds"
+
+
+/* CPU Power Management status keys
+ * Pass as arguments to IOPMrootDomain::systemPowerEventOccurred
+ * Or as arguments to IOPMSystemPowerEventOccurred()
+ * Or to decode the dictionary obtained from IOPMCopyCPUPowerStatus()
+ * These keys reflect restrictions placed on the CPU by the system
+ * to bring the CPU's power consumption within allowable thermal and 
+ * power constraints.
+ */
+
+
+/* kIOPMGraphicsPowerLimitsKey
+ *   The key representing the dictionary of graphics power limits.
+ *   The dictionary contains the other kIOPMCPUPower keys & their associated
+ *   values (e.g. Speed limit, Processor Count, and Schedule limits).
+ */
+#define kIOPMGraphicsPowerLimitsKey                     "Graphics_Power_Limits"
+
+/* kIOPMGraphicsPowerLimitPerformanceKey
+ *   The key representing the percent of overall performance made available
+ *   by the graphics chip as a percentage (integer 0 - 100).
+ */
+#define kIOPMGraphicsPowerLimitPerformanceKey           "Graphics_Power_Performance"
+
+
+
+/* kIOPMCPUPowerLimitsKey
+ *   The key representing the dictionary of CPU Power Limits.
+ *   The dictionary contains the other kIOPMCPUPower keys & their associated
+ *   values (e.g. Speed limit, Processor Count, and Schedule limits).
+ */
+#define kIOPMCPUPowerLimitsKey                          "CPU_Power_Limits"
+
+/* kIOPMCPUPowerLimitProcessorSpeedKey defines the speed & voltage limits placed 
+ *   on the CPU.
+ *   Represented as a percentage (0-100) of maximum CPU speed.
+ */
+#define kIOPMCPUPowerLimitProcessorSpeedKey             "CPU_Speed_Limit"
+
+/* kIOPMCPUPowerLimitProcessorCountKey reflects how many, if any, CPUs have been
+ *   taken offline. Represented as an integer number of CPUs (0 - Max CPUs).
+ */
+#define kIOPMCPUPowerLimitProcessorCountKey             "CPU_Available_CPUs"
+
+/* kIOPMCPUPowerLimitSchedulerTimeKey represents the percentage (0-100) of CPU time 
+ *   available. 100% at normal operation. The OS may limit this time for a percentage
+ *   less than 100%.
+ */
+#define kIOPMCPUPowerLimitSchedulerTimeKey              "CPU_Scheduler_Limit"
+
+
+/* Thermal Level Warning Key
+ * Indicates the thermal constraints placed on the system. This value may 
+ * cause clients to action to consume fewer system resources.
+ * The value associated with this warning is defined by the platform.
+ */
+#define kIOPMThermalLevelWarningKey                     "Thermal_Level_Warning"
+
+/* Thermal Warning Level values
+ *      kIOPMThermalWarningLevelNormal - under normal operating conditions
+ *      kIOPMThermalWarningLevelDanger - thermal pressure may cause system slowdown
+ *      kIOPMThermalWarningLevelCrisis - thermal conditions may cause imminent shutdown
+ *
+ * The platform may define additional thermal levels if necessary.
+ */
+enum {
+  kIOPMThermalWarningLevelNormal    = 0,
+  kIOPMThermalWarningLevelDanger    = 5,
+  kIOPMThermalWarningLevelCrisis    = 10
+};
+
+
+// PM Settings Controller setting types
+// Settings types used primarily with:
+//      IOPMrootDomain::registerPMSettingController
+// The values are identical to the similarly named keys for use in user space
+// PM settings work. Those keys are defined in IOPMLibPrivate.h.
+#define kIOPMSettingWakeOnRingKey                   "Wake On Modem Ring"
+#define kIOPMSettingRestartOnPowerLossKey           "Automatic Restart On Power Loss"
+#define kIOPMSettingWakeOnACChangeKey               "Wake On AC Change"
+#define kIOPMSettingSleepOnPowerButtonKey           "Sleep On Power Button"
+#define kIOPMSettingWakeOnClamshellKey              "Wake On Clamshell Open"
+#define kIOPMSettingReduceBrightnessKey             "ReduceBrightness"
+#define kIOPMSettingDisplaySleepUsesDimKey          "Display Sleep Uses Dim"
+#define kIOPMSettingTimeZoneOffsetKey               "TimeZoneOffsetSeconds"
+#define kIOPMSettingMobileMotionModuleKey           "MobileMotionModule"
+#define kIOPMSettingGraphicsSwitchKey               "GPUSwitch"
+
+// Setting controlling drivers can register to receive scheduled wake data
+// Either in "CF seconds" type, or structured calendar data in a formatted
+// IOPMCalendarStruct defined below.
+#define kIOPMSettingAutoWakeSecondsKey              "wake"
+#define kIOPMSettingAutoWakeCalendarKey             "WakeByCalendarDate"
+#define kIOPMSettingAutoPowerSecondsKey             "poweron"
+#define kIOPMSettingAutoPowerCalendarKey            "PowerByCalendarDate"
+
+// Debug seconds auto wake
+// Used by sleep cycling debug tools
+#define kIOPMSettingDebugWakeRelativeKey            "WakeRelativeToSleep"
+#define kIOPMSettingDebugPowerRelativeKey           "PowerRelativeToShutdown"
+
+// Maintenance wake calendar.
+#define kIOPMSettingMaintenanceWakeCalendarKey      "MaintenanceWakeCalendarDate"
+
+struct IOPMCalendarStruct {
+    UInt32      year;
+    UInt8       month;
+    UInt8       day;
+    UInt8       hour;
+    UInt8       minute;
+    UInt8       second;
+};
+typedef struct IOPMCalendarStruct IOPMCalendarStruct;
+
+// SetAggressiveness types
+enum {
+    kPMGeneralAggressiveness = 0,
+    kPMMinutesToDim,
+    kPMMinutesToSpinDown,
+    kPMMinutesToSleep,
+    kPMEthernetWakeOnLANSettings,
+    kPMSetProcessorSpeed,
+    kPMPowerSource,
+    kPMMotionSensor,
+    kPMLastAggressivenessType
+};
+#define kMaxType (kPMLastAggressivenessType-1)
+
+// SetAggressiveness values for the kPMPowerSource aggressiveness type
+enum {
+    kIOPMInternalPower = 1,
+    kIOPMExternalPower
+};
+
+#define kIOREMSleepEnabledKey               "REMSleepEnabled"
+
+// Strings for deciphering the dictionary returned from IOPMCopyBatteryInfo
+#define kIOBatteryInfoKey                   "IOBatteryInfo"
+#define kIOBatteryCurrentChargeKey          "Current"
+#define kIOBatteryCapacityKey               "Capacity"
+#define kIOBatteryFlagsKey                  "Flags"
+#define kIOBatteryVoltageKey                "Voltage"
+#define kIOBatteryAmperageKey               "Amperage"
+#define kIOBatteryCycleCountKey             "Cycle Count"
+
+enum {
+    kIOBatteryInstalled         = (1 << 2),
+    kIOBatteryCharge            = (1 << 1),
+    kIOBatteryChargerConnect    = (1 << 0)
+};
+
+
+// Private power management message indicating battery data has changed
+// Indicates new data resides in the IORegistry
+#define kIOPMMessageBatteryStatusHasChanged         iokit_family_msg(sub_iokit_pmu, 0x100)
+
+// Apple private Legacy messages for re-routing AutoWake and AutoPower messages to the PMU
+// through newer user space IOPMSchedulePowerEvent API
+#define kIOPMUMessageLegacyAutoWake                 iokit_family_msg(sub_iokit_pmu, 0x200)
+#define kIOPMUMessageLegacyAutoPower                iokit_family_msg(sub_iokit_pmu, 0x210)
+
+// For use with IOPMPowerSource bFlags
+#define IOPM_POWER_SOURCE_REV   2
+enum {
+  kIOPMACInstalled      = kIOBatteryChargerConnect,
+  kIOPMBatteryCharging  = kIOBatteryCharge,
+  kIOPMBatteryInstalled = kIOBatteryInstalled,
+  kIOPMUPSInstalled     = (1<<3),
+  kIOPMBatteryAtWarn    = (1<<4),
+  kIOPMBatteryDepleted  = (1<<5),
+  kIOPMACnoChargeCapability = (1<<6),     // AC adapter cannot charge battery
+  kIOPMRawLowBattery    = (1<<7),         // used only by  Platform Expert
+  kIOPMForceLowSpeed    = (1<<8),         // set by Platfm Expert, chk'd by Pwr Plugin
+  kIOPMClosedClamshell  = (1<<9),         // set by PMU - reflects state of the clamshell
+  kIOPMClamshellStateOnWake = (1<<10)     // used only by Platform Expert
+};
+
+
+// **********************************************
+// Internal power management data structures
+// **********************************************
+
+#if KERNEL && __cplusplus
+class IOService;
+
+enum {
+    kIOPowerEmergencyLevel = 1000
+};
+
+enum {
+    kIOPMSubclassPolicy,
+    kIOPMSuperclassPolicy1
+};
+
+struct stateChangeNote{
+    IOPMPowerFlags    stateFlags;
+    unsigned long    stateNum;
+    void *         powerRef;
+};
+typedef struct stateChangeNote stateChangeNote;
+
+struct IOPowerStateChangeNotification {
+    void *        powerRef;
+    unsigned long    returnValue;
+    unsigned long    stateNumber;
+    IOPMPowerFlags    stateFlags;
+};
+typedef struct IOPowerStateChangeNotification IOPowerStateChangeNotification;
+typedef IOPowerStateChangeNotification sleepWakeNote;
+#endif /* KERNEL && __cplusplus */
+
+#endif /* ! _IOKIT_IOPM_H */
+
diff --git a/i386/include/IOKit/pwr_mgt/IOPMDeprecated.h b/i386/include/IOKit/pwr_mgt/IOPMDeprecated.h
new file mode 100644
index 0000000..3bee01a
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/IOPMDeprecated.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOPMDeprecated_h_
+#define _IOPMDeprecated_h_
+
+#ifdef __ppc__
+
+// Power events
+enum {
+  kClamshellClosedEventMask  = (1<<0),  // User closed lid
+  kDockingBarEventMask       = (1<<1),  // OBSOLETE
+  kACPlugEventMask           = (1<<2),  // User plugged or unplugged adapter
+  kFrontPanelButtonEventMask = (1<<3),  // User hit the front panel button
+  kBatteryStatusEventMask    = (1<<4)   // Battery status has changed
+};
+
+// PUBLIC power management features
+// NOTE: this is a direct port from classic, some of these bits
+//       are obsolete but are included for completeness
+enum {
+  kPMHasWakeupTimerMask        = (1<<0),  // 1=wake timer is supported
+  kPMHasSharedModemPortMask    = (1<<1),  // Not used
+  kPMHasProcessorCyclingMask   = (1<<2),  // 1=processor cycling supported
+  kPMMustProcessorCycleMask    = (1<<3),  // Not used
+  kPMHasReducedSpeedMask       = (1<<4),  // 1=supports reduced processor speed
+  kPMDynamicSpeedChangeMask    = (1<<5),  // 1=supports changing processor speed on the fly
+  kPMHasSCSIDiskModeMask       = (1<<6),  // 1=supports using machine as SCSI drive
+  kPMCanGetBatteryTimeMask     = (1<<7),  // 1=battery time can be calculated
+  kPMCanWakeupOnRingMask       = (1<<8),  // 1=machine can wake on modem ring
+  kPMHasDimmingSupportMask     = (1<<9),  // 1=has monitor dimming support
+  kPMHasStartupTimerMask       = (1<<10), // 1=can program startup timer
+  kPMHasChargeNotificationMask = (1<<11), // 1=client can determine charger status/get notifications
+  kPMHasDimSuspendSupportMask  = (1<<12), // 1=can dim diplay to DPMS ('off') state
+  kPMHasWakeOnNetActivityMask  = (1<<13), // 1=supports waking upon receipt of net packet
+  kPMHasWakeOnLidMask          = (1<<14), // 1=can wake upon lid/case opening
+  kPMCanPowerOffPCIBusMask     = (1<<15), // 1=can remove power from PCI bus on sleep
+  kPMHasDeepSleepMask          = (1<<16), // 1=supports deep (hibernation) sleep
+  kPMHasSleepMask              = (1<<17), // 1=machine support low power sleep (ala powerbooks)
+  kPMSupportsServerModeAPIMask = (1<<18), // 1=supports reboot on AC resume for unexpected power loss
+  kPMHasUPSIntegrationMask     = (1<<19)  // 1=supports incorporating UPS devices into power source calcs
+};
+
+// PRIVATE power management features
+// NOTE: this is a direct port from classic, some of these bits
+//       are obsolete but are included for completeness.
+enum {
+  kPMHasExtdBattInfoMask       = (1<<0),  // Not used
+  kPMHasBatteryIDMask          = (1<<1),  // Not used
+  kPMCanSwitchPowerMask        = (1<<2),  // Not used 
+  kPMHasCelsiusCyclingMask     = (1<<3),  // Not used
+  kPMHasBatteryPredictionMask  = (1<<4),  // Not used
+  kPMHasPowerLevelsMask        = (1<<5),  // Not used
+  kPMHasSleepCPUSpeedMask      = (1<<6),  // Not used
+  kPMHasBtnIntHandlersMask     = (1<<7),  // 1=supports individual button interrupt handlers
+  kPMHasSCSITermPowerMask      = (1<<8),  // 1=supports SCSI termination power switch
+  kPMHasADBButtonHandlersMask  = (1<<9),  // 1=supports button handlers via ADB
+  kPMHasICTControlMask         = (1<<10), // 1=supports ICT control
+  kPMHasLegacyDesktopSleepMask = (1<<11), // 1=supports 'doze' style sleep
+  kPMHasDeepIdleMask           = (1<<12), // 1=supports Idle2 in hardware
+  kPMOpenLidPreventsSleepMask  = (1<<13), // 1=open case prevent machine from sleeping
+  kPMClosedLidCausesSleepMask  = (1<<14), // 1=case closed (clamshell closed) causes sleep
+  kPMHasFanControlMask         = (1<<15), // 1=machine has software-programmable fan/thermostat controls
+  kPMHasThermalControlMask     = (1<<16), // 1=machine supports thermal monitoring
+  kPMHasVStepSpeedChangeMask   = (1<<17), // 1=machine supports processor voltage/clock change
+  kPMEnvironEventsPolledMask   = (1<<18)  // 1=machine doesn't generate pmu env ints, we must poll instead 
+};
+
+// DEFAULT public and private features for machines whose device tree
+// does NOT contain this information (pre-Core99).
+
+// For Cuda-based Desktops
+
+#define kStdDesktopPMFeatures   kPMHasWakeupTimerMask         |\
+                                kPMHasProcessorCyclingMask    |\
+                                kPMHasDimmingSupportMask      |\
+                                kPMHasStartupTimerMask        |\
+                                kPMSupportsServerModeAPIMask  |\
+                                kPMHasUPSIntegrationMask
+
+#define kStdDesktopPrivPMFeatures  kPMHasExtdBattInfoMask     |\
+                                   kPMHasICTControlMask       |\
+                                   kPMHasLegacyDesktopSleepMask
+
+#define kStdDesktopNumBatteries 0
+
+// For Wallstreet (PowerBook G3 Series 1998)
+
+#define kWallstreetPMFeatures   kPMHasWakeupTimerMask         |\
+                                kPMHasProcessorCyclingMask    |\
+                                kPMHasReducedSpeedMask        |\
+                                kPMDynamicSpeedChangeMask     |\
+                                kPMHasSCSIDiskModeMask        |\
+                                kPMCanGetBatteryTimeMask      |\
+                                kPMHasDimmingSupportMask      |\
+                                kPMHasChargeNotificationMask  |\
+                                kPMHasDimSuspendSupportMask   |\
+                                kPMHasSleepMask
+
+#define kWallstreetPrivPMFeatures  kPMHasExtdBattInfoMask      |\
+                                   kPMHasBatteryIDMask         |\
+                                   kPMCanSwitchPowerMask       |\
+                                   kPMHasADBButtonHandlersMask |\
+                                   kPMHasSCSITermPowerMask     |\
+                                   kPMHasICTControlMask        |\
+                                   kPMClosedLidCausesSleepMask |\
+                                   kPMEnvironEventsPolledMask
+
+#define kStdPowerBookPMFeatures      kWallstreetPMFeatures
+#define kStdPowerBookPrivPMFeatures  kWallstreetPrivPMFeatures
+
+#define kStdPowerBookNumBatteries 2
+
+// For 101 (PowerBook G3 Series 1999)
+
+#define k101PMFeatures          kPMHasWakeupTimerMask         |\
+                                kPMHasProcessorCyclingMask    |\
+                                kPMHasReducedSpeedMask        |\
+                                kPMDynamicSpeedChangeMask     |\
+                                kPMHasSCSIDiskModeMask        |\
+                                kPMCanGetBatteryTimeMask      |\
+                                kPMHasDimmingSupportMask      |\
+                                kPMHasChargeNotificationMask  |\
+                                kPMHasDimSuspendSupportMask   |\
+                                kPMHasSleepMask               |\
+                                kPMHasUPSIntegrationMask
+
+#define k101PrivPMFeatures      kPMHasExtdBattInfoMask        |\
+                                kPMHasBatteryIDMask           |\
+                                kPMCanSwitchPowerMask         |\
+                                kPMHasADBButtonHandlersMask   |\
+                                kPMHasSCSITermPowerMask       |\
+                                kPMHasICTControlMask          |\
+                                kPMClosedLidCausesSleepMask   |\
+                                kPMEnvironEventsPolledMask
+
+
+// These flags are deprecated. Use the version with the kIOPM prefix in IOPM.h
+enum {
+  kACInstalled      = (1<<0),
+  kBatteryCharging  = (1<<1),
+  kBatteryInstalled = (1<<2),
+  kUPSInstalled     = (1<<3),
+  kBatteryAtWarn    = (1<<4),
+  kBatteryDepleted  = (1<<5),
+  kACnoChargeCapability = (1<<6),     // AC adapter cannot charge battery
+  kRawLowBattery    = (1<<7),         // used only by  Platform Expert
+  kForceLowSpeed    = (1<<8)         // set by Platfm Expert, chk'd by Pwr Plugin};
+};
+
+#endif /* __ppc32 */
+#endif /* _IOPMDeprecated_h_ */
diff --git a/i386/include/IOKit/pwr_mgt/IOPMLibDefs.h b/i386/include/IOKit/pwr_mgt/IOPMLibDefs.h
new file mode 100644
index 0000000..ff25bf3
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/IOPMLibDefs.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+
+#define	kPMSetAggressiveness            0
+#define	kPMGetAggressiveness            1
+#define	kPMSleepSystem                  2
+#define	kPMAllowPowerChange             3
+#define	kPMCancelPowerChange            4
+#define	kPMShutdownSystem               5
+#define	kPMRestartSystem                6
+#define kPMSleepSystemOptions           7
+#define kPMSetMaintenanceWakeCalendar   8
+
+#define kNumPMMethods                   9
diff --git a/i386/include/IOKit/pwr_mgt/IOPMPowerSource.h b/i386/include/IOKit/pwr_mgt/IOPMPowerSource.h
new file mode 100644
index 0000000..ed68918
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/IOPMPowerSource.h
@@ -0,0 +1,300 @@
+/*
+ * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+ 
+#ifndef _IOPMPowerSource_h_
+#define _IOPMPowerSource_h_
+
+#include <libkern/c++/OSObject.h>
+#include <IOKit/pwr_mgt/IOPM.h>
+#include <IOKit/IOTypes.h>
+#include <IOKit/IOReturn.h>
+#include <IOKit/IOService.h>
+
+enum {
+    kSecondsPerHour = 3600,
+    kTenMinutesInSeconds = 600
+};
+
+/* class IOPMPowerSource
+ *
+ * See IOKit/pwr_mgt/IOPM.h for power source keys relevant to this class. These
+ * report-type keys are required for calls to IOPMPowerSource::setReportables(),
+ * and they define the IORegistry interface through which data is passed back
+ * up to the rest of the system.
+ *
+ * A subclassing driver that doesn't want to do anything fancy should:
+ *   1. Subclass IOPMPowerSource
+ *   3. Install its own battery change notifications or polling routine that can
+ *          converse with actual battery hardware.
+ *   4. When battery state changes, change the relevant member variables
+ *          through setCurrentCapacity() style accessors.
+ *   5. Call updateStatus() on itself when all such settings have been updated.
+ *   
+ * The subclass driver should also initially populate its settings and call
+ * updateStatus() on launch.
+ *
+ *
+ * Settings
+ *
+ * ExternalConnected
+ * Type: bool
+ * IORegistry Key: kIOPMPSExternalConnectedKey
+ * True if computer is drawing external power 
+ *
+ * ExternalChargeCapable
+ * Type: bool
+ * IORegistry Key: kIOPMPSExternalChargeCapableKey
+ * True if external power is capable of charging internal battery
+ *
+ * BatteryInstalled
+ * Type: bool
+ * IORegistry Key: kIOPMPSBatteryInstalledKey
+ * True if a battery is present; false if removed
+ *
+ * IsCharging
+ * Type: bool
+ * IORegistry Key: kIOPMPSIsChargingKey
+ * True if battery is charging itself from external power
+ *
+ * AtWarnLevel
+ * Type: bool
+ * IORegistry Key: kIOPMPSAtWarnLevelKey
+ * True if draining battery capacity and past warn level
+ *
+ * AtCriticalLevel
+ * Type: bool
+ * IORegistry Key: kIOPMPSAtCriticalLevelKey
+ * True if draining battery capacity and past critical level
+ *
+ * CurrentCapacity
+ * MaxCapacity
+ * Type: unsigned int
+ * IORegistry Key: kIOPMPSCurrentCapacityKey, kIOPMPSMaxCapacityKey
+ * Capacity measured in mAh
+ *
+ * TimeRemaining
+ * Type: int
+ * IORegistry Key: kIOPMPSTimeRemainingKey
+ * Time remaining measured in minutes
+ *
+ * Amperage
+ * Type: int
+ * IORegistry Key: kIOPMPSAmperageKey
+ * Current is measured in mA
+ *
+ * Voltage
+ * Type: unsigned int
+ * IORegistry Key: kIOPMPSVoltageKey
+ * Voltage measured in mV
+ *
+ * CycleCount
+ * Type: unsigned int
+ * IORegistry Key: kIOPMPSCycleCountKey
+ * Number of charge/discharge cycles
+ *
+ * AdapterInfo
+ * Type: int
+ * IORegistry Key: kIOPMPSAdapterInfoKey
+ * Power adapter information
+ *
+ * Location
+ * Type: int
+ * IORegistry Key: kIOPMPSLocationKey
+ * Clue about battery's location in machine - Left vs. Right
+ *
+ * ErrorCondition
+ * Type: OSSymbol
+ * IORegistry Key: kIOPMPSErrorConditionKey
+ * String describing error state of battery
+ *
+ * Manufacturer
+ * Type: OSSymbol
+ * IORegistry Key: kIOPMPSManufacturerKey
+ * String describing battery manufacturer
+ *
+ * Manufactured Date
+ * Type: unsigned 16-bit bitfield
+ * IORegistry Key: kIOPMPSManufactureDateKey
+ * Date is published in a bitfield per the Smart Battery Data spec rev 1.1 
+ * in section 5.1.26
+ *   Bits 0...4 => day (value 1-31; 5 bits)
+ *   Bits 5...8 => month (value 1-12; 4 bits)
+ *   Bits 9...15 => years since 1980 (value 0-127; 7 bits)
+ *
+ * Model
+ * Type: OSSymbol
+ * IORegistry Key: kIOPMPSModelKey
+ * String describing model number
+ *
+ * Serial
+ * Type: OSSymbol
+ * IORegistry Key: kIOPMPSSerialKey
+ * String describing serial number or unique info
+ * The serial number published hear bears no correspondence to the Apple serial
+ * number printed on each battery. This is a manufacturer serial number with 
+ * no correlation to the printed serial number.
+ *
+ * LegacyIOBatteryInfo
+ * Type: OSDictionary
+ * IORegistry Key: kIOPMPSLegacyBatteryInfoKey
+ * Dictionary conforming to the OS X 10.0-10.4 
+ */
+
+class IOPMPowerSource : public IOService
+{
+    OSDeclareDefaultStructors(IOPMPowerSource)
+
+    friend class IOPMPowerSourceList;
+
+ protected:
+
+/* bool settingsChangedSinceLastUpdate
+ * Used by subclasses to determine if any settings have been modified via the
+ * accessors below since last call to update(). true is settings have changed;
+ * false otherwise.
+ */
+    bool settingsChangedSinceUpdate;
+    
+/* OSDictionary properties
+ * Stores power source state
+ */
+    OSDictionary            *properties;
+
+    const OSSymbol *externalConnectedKey;
+    const OSSymbol *externalChargeCapableKey;
+    const OSSymbol *batteryInstalledKey;
+    const OSSymbol *chargingKey;
+    const OSSymbol *warnLevelKey;
+    const OSSymbol *criticalLevelKey;
+    const OSSymbol *currentCapacityKey;
+    const OSSymbol *maxCapacityKey;
+    const OSSymbol *timeRemainingKey;
+    const OSSymbol *amperageKey;
+    const OSSymbol *voltageKey;
+    const OSSymbol *cycleCountKey;
+    const OSSymbol *adapterInfoKey;
+    const OSSymbol *locationKey;
+    const OSSymbol *errorConditionKey;
+    const OSSymbol *manufacturerKey;
+    const OSSymbol *modelKey;
+    const OSSymbol *serialKey;
+    const OSSymbol *batteryInfoKey;
+
+    // Tracking for IOPMPowerSourceList
+    IOPMPowerSource         *nextInList;
+
+ public:
+
+/*! @function powerSource
+    @abstract Creates a new IOPMPowerSource nub. Must be attached to IORegistry,
+        and registered by provider.
+*/
+    static IOPMPowerSource *powerSource(void);
+
+    virtual bool init(void);
+    
+    virtual void free(void);
+
+/*! @function updateStatus
+    @abstract Must be called by physical battery controller when battery state
+                has changed significantly.
+    @discussion The system will not poll this object for battery updates. Rather \
+    the battery's controller must call updateStatus() every time state changes \
+    and the settings will be relayed to higher levels of power management. \
+    The subclassing driver should override this only if the driver needs to add \
+    new settings to the base class.
+*/
+    virtual void updateStatus(void);
+
+/* Public accessors for battery state
+ */
+    bool externalConnected(void);
+    bool externalChargeCapable(void);
+    bool batteryInstalled(void);
+    bool isCharging(void);
+    bool atWarnLevel(void);
+    bool atCriticalLevel(void);
+
+    unsigned int currentCapacity(void);
+    unsigned int maxCapacity(void);
+    unsigned int capacityPercentRemaining(void);
+    int timeRemaining(void);
+    int amperage(void);
+    unsigned int voltage(void);
+    unsigned int cycleCount(void);
+    int adapterInfo(void);
+    int location(void);
+    
+    OSSymbol *errorCondition(void);
+    OSSymbol *manufacturer(void);
+    OSSymbol *model(void);
+    OSSymbol *serial(void);
+    OSDictionary *legacyIOBatteryInfo(void);
+    
+    OSObject *getPSProperty(const OSSymbol *);
+    
+protected:
+
+/* Protected "setter" methods for subclasses
+ * Subclasses should use these setters to modify all battery properties.
+ * 
+ * Subclasses must follow all property changes with a call to updateStatus() 
+ * to flush settings changes to upper level battery API clients.
+ *
+ */
+    void setExternalConnected(bool);
+    void setExternalChargeCapable(bool);
+    void setBatteryInstalled(bool);
+    void setIsCharging(bool);
+    void setAtWarnLevel(bool);
+    void setAtCriticalLevel(bool);
+
+    void setCurrentCapacity(unsigned int);
+    void setMaxCapacity(unsigned int);    
+    void setTimeRemaining(int);
+    void setAmperage(int);    
+    void setVoltage(unsigned int);
+    void setCycleCount(unsigned int);
+    void setAdapterInfo(int);
+    void setLocation(int);
+
+    void setErrorCondition(OSSymbol *);
+    void setManufacturer(OSSymbol *);
+    void setModel(OSSymbol *);
+    void setSerial(OSSymbol *);
+    void setLegacyIOBatteryInfo(OSDictionary *);
+
+/* All of these methods funnel through the generic accessor method
+   setPSProperty. Caller can pass in any arbitrary OSSymbol key, and
+   that value will be stored in the PM settings dictionary, and relayed
+   onto the IORegistry at update time.
+ */
+    void setPSProperty(const OSSymbol *, OSObject *);
+};
+
+#endif
diff --git a/i386/include/IOKit/pwr_mgt/IOPMPowerSourceList.h b/i386/include/IOKit/pwr_mgt/IOPMPowerSourceList.h
new file mode 100644
index 0000000..cb1c8ea
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/IOPMPowerSourceList.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#include <libkern/c++/OSObject.h>
+#include <IOKit/IOReturn.h>
+
+class IOPMPowerSource;
+
+class IOPMPowerSourceList : public OSObject
+{
+    OSDeclareDefaultStructors(IOPMPowerSourceList)
+ private:
+    // pointer to first power source in list
+    IOPMPowerSource         *firstItem;
+
+    // how many power sources are in the list
+    unsigned long           length;
+
+  public:
+    void initialize(void);
+    void free(void);
+
+    unsigned long numberOfItems(void);
+    IOReturn addToList(IOPMPowerSource *newPowerSource);
+    IOReturn removeFromList(IOPMPowerSource *theItem);
+    
+    IOPMPowerSource *firstInList(void);
+    IOPMPowerSource *nextInList(IOPMPowerSource *currentItem);
+};
+
diff --git a/i386/include/IOKit/pwr_mgt/IOPMPrivate.h b/i386/include/IOKit/pwr_mgt/IOPMPrivate.h
new file mode 100644
index 0000000..bf50d78
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/IOPMPrivate.h
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOKIT_IOPMPRIVATE_H
+#define _IOKIT_IOPMPRIVATE_H
+
+#include <IOKit/pwr_mgt/IOPM.h>
+
+/*****************************************************************************/
+
+// Private power commands issued to root domain
+// bits 0-7 in IOPM.h
+
+enum {
+    kIOPMSetValue                   = (1<<16),
+    // don't sleep on clamshell closure on a portable with AC connected
+    kIOPMSetDesktopMode             = (1<<17),
+    // set state of AC adaptor connected
+    kIOPMSetACAdaptorConnected      = (1<<18)
+};
+
+/*****************************************************************************/
+/*****************************************************************************/
+
+/*
+ * PM notification types
+ */
+
+/* @constant kIOPMStateConsoleUserShutdown
+ * @abstract Notification of GUI shutdown state available to kexts.
+ * @discussion This type can be passed as arguments to registerPMSettingController()
+ * to receive callbacks.
+ */
+#define kIOPMStateConsoleShutdown   "ConsoleShutdown"
+
+/* @enum ShutdownValues
+ * @abstract Potential values shared with key kIOPMStateConsoleUserShutdown
+ */
+enum {
+/* @constant kIOPMStateConsoleShutdownNone
+ * @abstract System shutdown (or restart) hasn't started; system is ON.
+ * @discussion Next state: 2
+ */
+    kIOPMStateConsoleShutdownNone   = 1,
+/* @constant kIOPMStateConsoleShutdownPossible
+ * @abstract User has been presented with the option to shutdown or restart. Shutdown may be cancelled.
+ * @discussion Next state may be: 1, 4
+ */
+    kIOPMStateConsoleShutdownPossible = 2,
+/* @constant kIOPMStateConsoleShutdownUnderway
+ * @abstract Shutdown or restart is proceeding. It may still be cancelled.
+ * @discussion Next state may be: 1, 4. This state is currently unused.
+ */
+    kIOPMStateConsoleShutdownUnderway = 3,
+/* @constant kIOPMStateConsoleShutdownCertain
+ * @abstract Shutdown is in progress and irrevocable.
+ * @discussion State remains 4 until power is removed from CPU.
+ */
+    kIOPMStateConsoleShutdownCertain = 4
+};
+
+/*****************************************************************************/
+/*****************************************************************************/
+
+/* PM Statistics - event indices 
+ * These are arguments to IOPMrootDomain::pmStatsRecordEvent().
+ */
+enum {
+    kIOPMStatsHibernateImageWrite         = 1,
+    kIOPMStatsHibernateImageRead,
+    kIOPMStatsDriversNotify,
+    kIOPMStatsApplicationNotify,
+    kIOPMStatsLateDriverAcknowledge,
+    kIOPMStatsLateAppAcknowledge,
+    
+    // To designate if you're specifying the start or stop end of 
+    // each of the above events, do a bitwise OR of the appropriate
+    // Start/Stop flag and pass the result to IOPMrootDomain to record
+    // the event.
+    kIOPMStatsEventStartFlag              = (1 << 24),
+    kIOPMStatsEventStopFlag               = (1 << 25)
+};
+
+// Keys for IOPMrootDomain registry properties
+#define kIOPMSleepStatisticsKey                 "SleepStatistics"
+#define kIOPMSleepStatisticsAppsKey             "AppStatistics"
+
+// Application response statistics
+#define kIOPMStatsNameKey                       "Name"
+#define kIOPMStatsPIDKey                        "Pid"
+#define kIOPMStatsTimeMSKey                     "TimeMS"
+#define kIOPMStatsApplicationResponseTypeKey    "ResponseType"
+#define kIOPMStatsMessageTypeKey                "MessageType"
+ 
+// PM Statistics: potential values for the key kIOPMStatsApplicationResponseTypeKey
+// entry in the application results array.
+#define kIOPMStatsResponseTimedOut      "ResponseTimedOut"
+#define kIOPMStatsResponseCancel        "ResponseCancel"
+#define kIOPMStatsResponseSlow          "ResponseSlow"
+
+typedef struct {
+    struct bounds{
+        uint64_t start;
+        uint64_t stop;
+    };
+    
+    struct bounds    hibWrite;
+    struct bounds    hibRead;
+//    bounds    driverNotifySleep;
+//    bounds    driverNotifyWake;
+//    bounds    appNotifySleep;
+//    bounds    appNotifyWake;  
+//    OSDictionary    *tardyApps;    
+//    OSDictionary    *tardyDrivers;
+} PMStatsStruct;
+
+/*****************************************************************************/
+
+/* PM RootDomain tracePoints
+ *
+ * In the sleep/wake process, we expect the sleep trace points to proceed
+ * in increasing order. Once sleep begins with code kIOPMTracePointSleepStarted = 0x11,
+ * we expect sleep to continue in a monotonically increasing order of tracepoints
+ * to kIOPMTracePointSystemLoginwindowPhase = 0x30. After trace point SystemLoginWindowPhase,
+ * the system will return to kIOPMTracePointSystemUp = 0x00.
+ *
+ * If the trace point decreases (instead of increasing) before reaching kIOPMTracePointSystemUp,
+ * that indicates that the sleep process was cancelled. The cancel reason shall be indicated
+ * in the cancel tracepoint. (TBD)
+ */
+
+enum {
+/* When kTracePointSystemUp is the latest tracePoint,
+   the system is awake. It is not asleep, sleeping, or waking.
+   
+   * Phase begins: At boot, at completion of wake from sleep,
+          immediately following kIOPMTracePointSystemLoginwindowPhase.
+   * Phase ends: When a sleep attempt is initiated.
+ */
+    kIOPMTracePointSystemUp                     = 0,
+
+/* When kIOPMTracePointSleepStarted we have just initiated sleep.
+
+    Note: The state prior to kIOPMTracePointSleepStarted may be only one of:
+        * kIOPMTracePointSystemUp
+        * kIOPMTracePointSystemLoginwindowPhase or 
+
+   * Phase begins: At initiation of system sleep (idle or forced).
+   * Phase ends: As we start to notify applications of system sleep.
+ */
+    kIOPMTracePointSleepStarted             = 0x11,
+
+/* When kTracePointSystemSleepAppsPhase is the latest tracePoint,
+   a system sleep has been irrevocably inititated and PM waits
+   for responses from notified applications.
+
+   * Phase begins: Begin to asynchronously fire kIOMessageSystemWillSleep notifications,
+   *        and in the case of an idle sleep kIOMessageCanSystemSleep as well.
+   * Phase ends: When we have received all user & interested kernel acknowledgements.
+ */
+    kIOPMTracePointSystemSleepAppsPhase         = 0x12,
+
+
+/* When kIOPMTracePointSystemHibernatePhase is the latest tracePoint,
+    PM is writing the hiernate image to disk.
+ */
+    kIOPMTracePointSystemHibernatePhase         = 0x13,
+
+/* When kTracePointSystemSleepDriversPhase is the latest tracePoint,
+    PM is iterating the driver tree powering off devices individually.
+
+   * Phase begins: When IOPMrootDomain has received all of its power acknowledgements and begins
+   *        executing IOService::powerDomainWillChangeTo()
+   * Phase ends: When IOPMrootDomain::powerChangeDone begins executing CPU shutoff code.
+ */
+    kIOPMTracePointSystemSleepDriversPhase      = 0x14,
+
+/* When kTracePointSystemSleepPlatformPhase is the latest tracePoint,
+    all apps and drivers have notified of sleep. Plotfarm is powering
+    off CPU; or system is asleep; or low level wakeup is underway.
+
+    Note: If a system is asleep and then loses power, and it does not have a hibernate
+        image to restore from (e.g. hibernatemode = 0), then OS X may interpret this power
+        loss as a system crash in the kTracePointSystemSleepPlatformPhase, since the
+        power loss resembles a hang or crash, and the power being removed by the user.
+
+   * Phase begins: IOPMrootDomain has already shut off drivers, and is now powering off CPU.
+   * Phase ends: Immediately after CPU's are powered back on during wakeup.
+ */
+    kIOPMTracePointSystemSleepPlatformPhase     = 0x15,
+
+/* When kTracePointSystemWakeDriversPhase is the latest tracePoint,
+    System CPU is powered, PM is notifying drivers of system wake.
+
+   * Phase begins: CPU's have successfully powered up and OS is executing.
+   * Phase ends: All drivers have handled power events & acknowledged completion.
+        IOPMrootDomain is about to deliver kIOMessageSystemHasPoweredOn.
+ */
+    kIOPMTracePointSystemWakeDriversPhase       = 0x21,
+
+/* When kTracePointSystemWakeAppsPhase is the latest tracePoint,
+   System CPU is powered, PM has powered on each driver.
+
+   * Phase begins: IOPMrootDomain::tellChangeUp before sending asynchronous 
+        kIOMessageSystemHasPoweredOn notifications
+   * Phase ends: IOPMrootDomain::tellChangeUp after sending asynchronous notifications
+ */
+    kIOPMTracePointSystemWakeAppsPhase          = 0x22,
+
+/* kIOPMTracePointSystemLoginwindowPhase
+    This phase represents a several minute window after the system has powered on.
+    Higher levels of system diagnostics are in a heightened state of alert in this phase,
+    in case any user errors occurred that we could not detect in software.
+    
+    This several minute window  
+
+   * Phase begins: After IOPMrootDomain sends kIOMessageSystemHasPoweredOn message.
+   * Phase ends: When loginwindow calls IOPMSleepWakeSetUUID(NULL) the system shall 
+        be considered awake and usable. The next phase shall be kIOPMTracePointSystemUp.
+ */
+    kIOPMTracePointSystemLoginwindowPhase       = 0x30 
+};
+
+/*****************************************************************************/
+
+/*
+Ê* kIOPMLoginWindowSecurityDebugKey - identifies PM debug data specific to LoginWindow
+ *  for use with IOPMrootDomain.
+Ê*/
+#define kIOPMLoginWindowSecurityDebugKey        "LoginWindowSecurity"
+
+// For PM internal use only - key to locate sleep failure results within SCDynamicStore.
+#define kIOPMDynamicStoreSleepFailureKey        "SleepFailure"
+
+/*****************************************************************************/
+
+// For IOPMLibPrivate.h
+#define kIOPMSleepWakeFailureKey            "PMFailurePhase"
+#define kIOPMSleepWakeFailureCodeKey        "PMStatusCode"
+#define kIOPMSleepWakeFailureLoginKey       "LWFailurePhase"
+#define kIOPMSleepWakeFailureUUIDKey        "UUID"
+#define kIOPMSleepWakeFailureDateKey        "Date"
+
+#endif /* ! _IOKIT_IOPMPRIVATE_H */
+
diff --git a/i386/include/IOKit/pwr_mgt/IOPMpowerState.h b/i386/include/IOKit/pwr_mgt/IOPMpowerState.h
new file mode 100644
index 0000000..f7f4c8a
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/IOPMpowerState.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#include <IOKit/pwr_mgt/IOPM.h>
+
+/*! @header IOPMpowerState.h
+    @abstract Defines the struct IOPMPowerState that power managed drivers should use to describe their power states.
+*/
+
+/*! @struct IOPMPowerState
+    @abstract Describes a device's power state.
+    @discussion To take part in system power management, drivers should define an array of 2 or more power states and pass it to kernel power management through IOService::registerPowerDriver.
+    @field version Defines version number of this struct. Just use the value "1" when defining an IOPMPowerState.
+    @field	capabilityFlags Describes the capability of the device in this state.
+    @field	outputPowerCharacter Describes the power provided in this state.
+    @field	inputPowerRequirement Describes the input power required in this state.
+    @field	staticPower Describes average consumption in milliwatts. Unused; drivers may specify 0.
+    @field	unbudgetedPower Describes additional consumption from separate power supply (milliWatts). Unused; drivers may specify 0.
+    @field	powerToAttain Describes dditional power to attain this state from next lower state (in milliWatts). Unused; drivers may specify 0.
+    @field	timeToAttain Describes time required to enter this state from next lower state (in microseconds). Unused; drivers may specify 0.
+    @field	settleUpTime Describes settle time required after entering this state from next lower state (microseconds). Unused; drivers may specify 0.
+    @field timeToLower Describes time required to enter next lower state from this one (microseconds). Unused; drivers may specify 0.
+    @field	settleDownTime Settle time required after entering next lower state from this state (microseconds). Unused; drivers may specify 0.
+    @field	powerDomainBudget Describes power in milliWatts a domain in this state can deliver to its children. Unused; drivers may specify 0.
+}
+*/
+
+struct IOPMPowerState
+{
+    unsigned long	version;
+    IOPMPowerFlags	capabilityFlags;
+    IOPMPowerFlags	outputPowerCharacter;
+    IOPMPowerFlags	inputPowerRequirement;
+    unsigned long	staticPower;
+    unsigned long	unbudgetedPower;
+    unsigned long	powerToAttain;
+    unsigned long	timeToAttain;
+    unsigned long	settleUpTime;
+    unsigned long	timeToLower;
+    unsigned long	settleDownTime;
+    unsigned long	powerDomainBudget;
+};
+
+typedef struct IOPMPowerState IOPMPowerState;
+
+enum {
+    kIOPMPowerStateVersion1 = 1
+};
diff --git a/i386/include/IOKit/pwr_mgt/IOPowerConnection.h b/i386/include/IOKit/pwr_mgt/IOPowerConnection.h
new file mode 100644
index 0000000..179035b
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/IOPowerConnection.h
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.
+ *
+ * HISTORY
+ *
+ */
+
+
+#ifndef _IOKIT_IOPOWERCONNECTION_H
+#define _IOKIT_IOPOWERCONNECTION_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/pwr_mgt/IOPM.h>
+
+class IOPowerConnection : public IOService
+{
+    OSDeclareDefaultStructors(IOPowerConnection)
+
+protected:
+    /*! @field parentKnowsState	true: parent knows state of its domain
+					used by child */
+    bool		stateKnown;
+    /*! @field currentPowerFlags	power flags which describe  the current state of the power domain
+					used by child */
+    IOPMPowerFlags 	currentPowerFlags;
+    /*! @field desiredDomainState	state number which corresponds to the child's desire
+					used by parent */
+    unsigned long	desiredDomainState;
+
+    /*! @field requestFlag		set to true when desiredDomainState is set */
+    bool		requestFlag;
+
+    /*! @field preventIdleSleepFlag	true if child has this bit set in its desired state
+					used by parent */
+    unsigned long	preventIdleSleepFlag;
+
+    /*! @field preventSystemSleepFlag	true if child has this bit set in its desired state
+					used by parent */
+    unsigned long	preventSystemSleepFlag;
+
+    /*! @field awaitingAck		true if child has not yet acked our notification
+					used by parent */
+    bool		awaitingAck;
+
+    /*! @field readyFlag		true if the child has been added as a power child
+					used by parent */
+	bool		readyFlag;
+
+public:
+        /*! @function setParentKnowsState
+            @abstract Sets the stateKnown variable.
+            @discussion Called by the parent when the object is created and called by the child when it discovers that the parent now knows its state. */
+    void setParentKnowsState (bool );
+
+    /*! @function setParentCurrentPowerFlags
+        @abstract Sets the currentPowerFlags variable.
+        @discussion Called by the parent when the object is created and called by the child when it discovers that the parent state is changing. */
+    void setParentCurrentPowerFlags (IOPMPowerFlags );
+
+    /*! @function parentKnowsState
+        @abstract Returns the stateKnown variable. */
+    bool parentKnowsState (void );
+
+    /*! @function parentCurrentPowerFlags
+        @abstract Returns the currentPowerFlags variable. */
+    IOPMPowerFlags parentCurrentPowerFlags (void );
+
+    /*! @function setDesiredDomainState
+        @abstract Sets the desiredDomainState variable.
+        @discussion Called by the parent. */
+    void setDesiredDomainState (unsigned long );
+
+    /*! @function getDesiredDomainState
+        @abstract Returns the desiredDomainState variable.
+    @discussion Called by the parent. */
+    unsigned long getDesiredDomainState ( void );
+
+    /*! @function setChildHasRequestedPower
+        @abstract Set the flag that says that the child has called requestPowerDomainState.
+    @discussion Called by the parent. */
+    void setChildHasRequestedPower ( void );
+
+
+    /*! @function childHasRequestedPower
+        @abstract Return the flag that says whether the child has called requestPowerDomainState.
+    @discussion Called by the PCI Aux Power Supply Driver to see if a device driver
+        is power managed. */
+    bool childHasRequestedPower ( void );
+    
+    /*! @function setPreventIdleSleepFlag
+        @abstract Sets the preventIdleSleepFlag variable.
+        @discussion Called by the parent. */
+    void setPreventIdleSleepFlag (unsigned long );
+
+    /*! @function getPreventIdleSleepFlag
+        @abstract Returns the preventIdleSleepFlag variable.
+    @discussion Called by the parent. */
+    bool getPreventIdleSleepFlag ( void );
+    
+    /*! @function setPreventSystemSleepFlag
+        @abstract Sets the preventSystemSleepFlag variable.
+        @discussion Called by the parent. */
+    void setPreventSystemSleepFlag (unsigned long );
+
+    /*! @function getPreventSystemSleepFlag
+        @abstract Returns the preventSystemSleepFlag variable.
+        @discussion Called by the parent. */
+    bool getPreventSystemSleepFlag ( void );
+    
+    /*! @function setAwaitingAck
+        @abstract Sets the awaitingAck variable.
+        @discussion Called by the parent. */
+    void setAwaitingAck ( bool );
+
+    /*! @function getAwaitingAck
+        @abstract Returns the awaitingAck variable.
+        @discussion Called by the parent. */
+    bool getAwaitingAck ( void );
+
+    /*! @function setReadyFlag
+        @abstract Sets the readyFlag variable.
+        @discussion Called by the parent. */
+	void setReadyFlag( bool flag );
+
+    /*! @function getReadyFlag
+        @abstract Returns the readyFlag variable.
+        @discussion Called by the parent. */
+	bool getReadyFlag( void ) const;
+};
+
+#endif /* ! _IOKIT_IOPOWERCONNECTION_H */
+
diff --git a/i386/include/IOKit/pwr_mgt/RootDomain.h b/i386/include/IOKit/pwr_mgt/RootDomain.h
new file mode 100644
index 0000000..6f4ebee
--- /dev/null
+++ b/i386/include/IOKit/pwr_mgt/RootDomain.h
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _IOKIT_ROOTDOMAIN_H
+#define _IOKIT_ROOTDOMAIN_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/pwr_mgt/IOPM.h>
+#include "IOKit/pwr_mgt/IOPMPrivate.h"
+
+
+class IOPMPowerStateQueue;
+class RootDomainUserClient;
+class PMTraceWorker;
+
+/*
+ * Flags for get/setSleepSupported()
+ */
+enum {
+    kRootDomainSleepNotSupported	= 0x00000000,
+    kRootDomainSleepSupported 		= 0x00000001,
+    kFrameBufferDeepSleepSupported	= 0x00000002,
+    kPCICantSleep                   = 0x00000004
+};
+
+/* 
+ *IOPMrootDomain registry property keys
+ */
+#define kRootDomainSupportedFeatures        "Supported Features"
+#define kRootDomainSleepReasonKey           "Last Sleep Reason"
+#define kRootDomainSleepOptionsKey          "Last Sleep Options"
+#define kIOPMRootDomainWakeReasonKey        "Wake Reason"
+#define kIOPMRootDomainWakeTypeKey          "Wake Type"
+#define kIOPMRootDomainPowerStatusKey       "Power Status"
+
+/*
+ * Possible sleep reasons found under kRootDomainSleepReasonsKey
+ */
+#define kIOPMClamshellSleepKey              "Clamshell Sleep"
+#define kIOPMPowerButtonSleepKey            "Power Button Sleep"
+#define kIOPMSoftwareSleepKey               "Software Sleep"
+#define kIOPMOSSwitchHibernationKey         "OS Switch Sleep"
+#define kIOPMIdleSleepKey                   "Idle Sleep"
+#define kIOPMLowPowerSleepKey               "Low Power Sleep"
+#define kIOPMThermalEmergencySleepKey       "Thermal Emergency Sleep"
+#define kIOPMMaintenanceSleepKey            "Maintenance Sleep"
+
+/*
+ * String constants for communication with PM CPU
+ */
+#define kIOPMRootDomainLidCloseCString      "LidClose"
+#define kIOPMRootDomainBatPowerCString      "BatPower"
+
+/*
+ * Supported Feature bitfields for IOPMrootDomain::publishFeature()
+ */
+enum {
+    kIOPMSupportedOnAC      = (1<<0),
+    kIOPMSupportedOnBatt    = (1<<1),
+    kIOPMSupportedOnUPS     = (1<<2)
+};
+
+typedef IOReturn (*IOPMSettingControllerCallback)
+                    (OSObject *target, const OSSymbol *type,
+                     OSObject *val, uintptr_t refcon);
+
+__BEGIN_DECLS
+IONotifier *    registerSleepWakeInterest(
+                    IOServiceInterestHandler, void *, void * = 0);
+               
+IONotifier *    registerPrioritySleepWakeInterest(
+                    IOServiceInterestHandler handler, 
+                    void * self, void * ref = 0);
+
+IOReturn        acknowledgeSleepWakeNotification(void * );
+
+IOReturn        vetoSleepWakeNotification(void * PMrefcon);
+__END_DECLS
+
+#define IOPM_ROOTDOMAIN_REV		2
+
+class IOPMrootDomain: public IOService
+{
+    OSDeclareFinalStructors(IOPMrootDomain)
+
+public:
+    static IOPMrootDomain * construct( void );
+
+    virtual bool        start( IOService * provider );
+    virtual IOReturn    setAggressiveness( unsigned long, unsigned long );
+    virtual IOReturn    getAggressiveness( unsigned long, unsigned long * );
+
+    virtual IOReturn    sleepSystem( void );
+    IOReturn            sleepSystemOptions( OSDictionary *options );
+
+    virtual IOReturn    setProperties( OSObject * );
+
+/*! @function systemPowerEventOccurred
+    @abstract Other drivers may inform IOPMrootDomain of system PM events
+    @discussion systemPowerEventOccurred is a richer alternative to receivePowerNotification()
+        Only Apple-owned kexts should have reason to call systemPowerEventOccurred.
+    @param event An OSSymbol describing the type of power event.
+    @param value A 32-bit integer value associated with the event.
+    @param shouldUpdate indicates whether the root domain should send a notification
+        to interested parties. Pass false if you're calling systemPowerEventOccurred
+        several times in succession; and pass true only on the last invocatino.
+    @result kIOReturnSuccess on success */
+
+    IOReturn            systemPowerEventOccurred(
+                                    const OSSymbol *event, 
+                                    uint32_t intValue );
+
+    IOReturn            systemPowerEventOccurred(
+                                    const OSSymbol *event, 
+                                    OSObject *value );
+
+    virtual IOReturn    receivePowerNotification( UInt32 msg );
+
+    virtual void        setSleepSupported( IOOptionBits flags );
+
+    virtual IOOptionBits getSleepSupported( void );
+
+    void                wakeFromDoze( void );
+
+    // KEXT driver announces support of power management feature
+
+    void                publishFeature( const char *feature );
+    
+    // KEXT driver announces support of power management feature
+    // And specifies power sources with kIOPMSupportedOn{AC/Batt/UPS} bitfield.
+    // Returns a unique uint32_t identifier for later removing support for this
+    // feature. 
+    // NULL is acceptable for uniqueFeatureID for kexts without plans to unload.
+
+    void                publishFeature( const char *feature, 
+                                        uint32_t supportedWhere,
+                                        uint32_t *uniqueFeatureID);
+
+    // KEXT driver announces removal of a previously published power management 
+    // feature. Pass 'uniqueFeatureID' returned from publishFeature()
+
+    IOReturn            removePublishedFeature( uint32_t removeFeatureID );
+
+/*! @function copyPMSetting
+    @abstract Copy the current value for a PM setting. Returns an OSNumber or
+        OSData depending on the setting.
+    @param whichSetting Name of the desired setting.
+    @result OSObject value if valid, NULL otherwise. */
+
+    OSObject *          copyPMSetting( OSSymbol *whichSetting );
+
+/*! @function registerPMSettingController
+    @abstract Register for callbacks on changes to certain PM settings.
+    @param settings NULL terminated array of C strings, each string for a PM 
+        setting that the caller is interested in and wants to get callbacks for. 
+    @param callout C function ptr or member function cast as such.
+    @param target The target of the callback, usually 'this'
+    @param refcon Will be passed to caller in callback; for caller's use.
+    @param handle Caller should keep the OSObject * returned here. If non-NULL,
+        handle will have a retain count of 1 on return. To deregister, pass to
+        unregisterPMSettingController()
+    @result kIOReturnSuccess on success. */
+
+    IOReturn            registerPMSettingController(
+                                 const OSSymbol *settings[],
+                                 IOPMSettingControllerCallback callout,
+                                 OSObject   *target,
+                                 uintptr_t  refcon,
+                                 OSObject   **handle);    // out param
+
+/*! @function registerPMSettingController
+    @abstract Register for callbacks on changes to certain PM settings.
+    @param settings NULL terminated array of C strings, each string for a PM 
+        setting that the caller is interested in and wants to get callbacks for. 
+    @param supportedPowerSources bitfield indicating which power sources these
+        settings are supported for (kIOPMSupportedOnAC, etc.)
+    @param callout C function ptr or member function cast as such.
+    @param target The target of the callback, usually 'this'
+    @param refcon Will be passed to caller in callback; for caller's use.
+    @param handle Caller should keep the OSObject * returned here. If non-NULL,
+        handle will have a retain count of 1 on return. To deregister, pass to
+        unregisterPMSettingController()
+    @result kIOReturnSuccess on success. */
+
+    IOReturn            registerPMSettingController(
+                                 const OSSymbol *settings[],
+                                 uint32_t   supportedPowerSources,
+                                 IOPMSettingControllerCallback callout,
+                                 OSObject   *target,
+                                 uintptr_t  refcon,
+                                 OSObject   **handle);    // out param
+
+    virtual IONotifier * registerInterest(
+                                const OSSymbol * typeOfInterest,
+                                IOServiceInterestHandler handler,
+                                void * target, void * ref = 0 );
+                                
+    void                pmStatsRecordEvent(
+                                int             eventIndex,
+                                AbsoluteTime    timestamp);
+
+    void                pmStatsRecordApplicationResponse(
+                            const OSSymbol		*response,
+                            const char 		    *name,
+                            int                 messageType,
+                            uint32_t			delay_ms,
+                            int     			app_pid);
+
+    virtual IOReturn    callPlatformFunction(
+                                const OSSymbol *functionName,
+                                bool waitForFunction,
+                                void *param1, void *param2,
+                                void *param3, void *param4 );
+
+private:
+    virtual IOReturn    changePowerStateTo( unsigned long ordinal );
+    virtual IOReturn    changePowerStateToPriv( unsigned long ordinal );
+    virtual IOReturn    requestPowerDomainState( IOPMPowerFlags, IOPowerConnection *, unsigned long );
+    virtual void        powerChangeDone( unsigned long );
+    virtual bool        tellChangeDown( unsigned long );
+    virtual bool        askChangeDown( unsigned long );
+    virtual void        tellChangeUp( unsigned long );
+    virtual void        tellNoChangeDown( unsigned long );
+};
+
+
+#endif /* _IOKIT_ROOTDOMAIN_H */
diff --git a/i386/include/IOKit/rtc/.svn/all-wcprops b/i386/include/IOKit/rtc/.svn/all-wcprops
new file mode 100644
index 0000000..b3140e1
--- /dev/null
+++ b/i386/include/IOKit/rtc/.svn/all-wcprops
@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 56
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/rtc
+END
+IORTCController.h
+K 25
+svn:wc:ra_dav:version-url
+V 74
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/rtc/IORTCController.h
+END
diff --git a/i386/include/IOKit/rtc/.svn/entries b/i386/include/IOKit/rtc/.svn/entries
new file mode 100644
index 0000000..73fa41a
--- /dev/null
+++ b/i386/include/IOKit/rtc/.svn/entries
@@ -0,0 +1,62 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/rtc
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IORTCController.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+44a0b2efb5c45175a1ba6782cedb471c
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1708
+
diff --git a/i386/include/IOKit/rtc/.svn/text-base/IORTCController.h.svn-base b/i386/include/IOKit/rtc/.svn/text-base/IORTCController.h.svn-base
new file mode 100644
index 0000000..eaf681d
--- /dev/null
+++ b/i386/include/IOKit/rtc/.svn/text-base/IORTCController.h.svn-base
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * 24 Nov  1998 suurballe  Created.
+ */
+
+#include <IOKit/IOService.h>
+
+typedef void (*RTC_tick_handler)( IOService * );
+
+
+class IORTCController: public IOService
+{
+OSDeclareAbstractStructors(IORTCController)
+
+public:
+
+virtual IOReturn getRealTimeClock ( UInt8 * currentTime, IOByteCount * length ) = 0;
+virtual IOReturn setRealTimeClock ( UInt8 * newTime ) = 0;
+};
+
diff --git a/i386/include/IOKit/rtc/IORTCController.h b/i386/include/IOKit/rtc/IORTCController.h
new file mode 100644
index 0000000..eaf681d
--- /dev/null
+++ b/i386/include/IOKit/rtc/IORTCController.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * 24 Nov  1998 suurballe  Created.
+ */
+
+#include <IOKit/IOService.h>
+
+typedef void (*RTC_tick_handler)( IOService * );
+
+
+class IORTCController: public IOService
+{
+OSDeclareAbstractStructors(IORTCController)
+
+public:
+
+virtual IOReturn getRealTimeClock ( UInt8 * currentTime, IOByteCount * length ) = 0;
+virtual IOReturn setRealTimeClock ( UInt8 * newTime ) = 0;
+};
+
diff --git a/i386/include/IOKit/sbp2/.svn/all-wcprops b/i386/include/IOKit/sbp2/.svn/all-wcprops
new file mode 100644
index 0000000..8860e60
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/all-wcprops
@@ -0,0 +1,59 @@
+K 25
+svn:wc:ra_dav:version-url
+V 57
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2
+END
+IOFireWireSBP2UserClient.h
+K 25
+svn:wc:ra_dav:version-url
+V 84
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2UserClient.h
+END
+IOFireWireSBP2LUN.h
+K 25
+svn:wc:ra_dav:version-url
+V 77
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h
+END
+IOFireWireSBP2ManagementORB.h
+K 25
+svn:wc:ra_dav:version-url
+V 87
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2ManagementORB.h
+END
+IOFireWireSerialBusProtocolTransport.h
+K 25
+svn:wc:ra_dav:version-url
+V 96
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSerialBusProtocolTransport.h
+END
+IOFireWireSBP2LSIWorkaroundDescriptor.h
+K 25
+svn:wc:ra_dav:version-url
+V 97
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2LSIWorkaroundDescriptor.h
+END
+IOFireWireSBP2ORB.h
+K 25
+svn:wc:ra_dav:version-url
+V 77
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h
+END
+IOFireWireSBP2Target.h
+K 25
+svn:wc:ra_dav:version-url
+V 80
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2Target.h
+END
+IOFireWireSBP2UserClientCommon.h
+K 25
+svn:wc:ra_dav:version-url
+V 90
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2UserClientCommon.h
+END
+IOFireWireSBP2Login.h
+K 25
+svn:wc:ra_dav:version-url
+V 79
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2Login.h
+END
diff --git a/i386/include/IOKit/sbp2/.svn/entries b/i386/include/IOKit/sbp2/.svn/entries
new file mode 100644
index 0000000..57b7f83
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/entries
@@ -0,0 +1,334 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/sbp2
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IOFireWireSBP2UserClient.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+abe67641efef3cf326ce18b1de817d57
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8267
+
+IOFireWireSBP2LUN.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+8fab521ac7af386c7d2772a0f69444b3
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+10404
+
+IOFireWireSBP2ManagementORB.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+df7f1948a7790ed3d08f53f0426095f2
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11075
+
+IOFireWireSerialBusProtocolTransport.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+6e7bdeac9a9690b47e47421abda8d3c1
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+14111
+
+IOFireWireSBP2LSIWorkaroundDescriptor.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+8c4d66f15c56537e975892bec0dd721b
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12217
+
+IOFireWireSBP2ORB.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+387c5f66e2949189fc62b07fc183c7c3
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+21217
+
+IOFireWireSBP2Target.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+e7cdf79c998d9b81359b7c6adc3b1881
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7550
+
+IOFireWireSBP2UserClientCommon.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+96d96ad9f1106c7237f0485867e3f509
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4524
+
+IOFireWireSBP2Login.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+b78759007f3ff7e9e66d595d31ac6cf8
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+41499
+
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LSIWorkaroundDescriptor.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LSIWorkaroundDescriptor.h.svn-base
new file mode 100644
index 0000000..178ef00
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LSIWorkaroundDescriptor.h.svn-base
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#if __ppc__
+
+/*!
+  @header IOFireWireSBP2LSIWorkaroundDescriptor
+  Contains the class definition for IOFireWireSBP2LSIWorkaroundDescriptor.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2LSIWORKAROUNDDESCRIPTOR_H
+#define _IOKIT_IOFIREWIRESBP2LSIWORKAROUNDDESCRIPTOR_H
+
+#include <IOKit/IOMemoryDescriptor.h>
+
+class IOFireWireSBP2LSIRange;
+
+/*!
+    @class IOFireWireSBP2LSIWorkaroundDescriptor
+    @abstract This is a subclass of IOGeneralMemoryDescriptor. It is designed to work around
+    a hardware problem in a common SBP2 target.  It takes a memory descriptor as
+	an argument.  It retains this descriptor and returns a new one with resegmented
+	physical segments and potentially some "unfixable" segments double buffered.
+
+    If the transfer will cause data to be sent from the Mac, syncBuffersForOutput
+    must be called before the transfer.
+    
+    If the transfer will cause data to be recieve by the Mac, syncBuffersForInput
+    must be called after the transfer.
+
+    This class calculates the new segmentation only once when it is created.
+    Any changes to the structure of the original memory descriptor will render
+    this one useless.  It must be released and a new IOFireWireSBP2LSIWorkaroundDescriptor
+    can be created.
+    
+    LSI Bridge Workaround Algorithm Details
+    
+    Goals:
+    1. Avoid LSI Logic "< 16 byte" bug - prevent any data packet smaller than 16 bytes
+    2. Minimize double-buffering
+    3. Support non-multiple-of-512-byte devices, e.g. CD Audio
+    
+    Solution:
+    Write a page table such that the bridge will nor use packets smaller than 16 bytes.
+    In other words, rearrange the memory descriptor to avoid the bug, and do it such
+    that the SBP-2 layer will not break up a segment (du ro the 64k-1 limit) and
+    re-introduces the problem
+
+    SBP-2 defines the kFWSBP2MaxPageClusterSize constant.   We simply make sure
+    none of our segments are larger than this size and SBP-2 will not break them
+    up when it writes the SBP-2 page table.
+    
+    Notes:
+    - Some double buffering is unavoidable.  Discontiguous pages may yield page
+    fragments at the start or end of the buffer (or both, with non-512x buffers).
+    solution uses less than 33 bytes of double-buffer per segment in original
+    memory descriptor.
+    - If driver must break up IO to meet ATA limit of 255 (250?) blocks, assume
+    the driver does this at a higher level (before applying workaround).
+    - It is expected that the original memory descriptor has been prepared (wired)
+*/
+
+class IOFireWireSBP2LSIWorkaroundDescriptor : public IOGeneralMemoryDescriptor
+{
+	OSDeclareDefaultStructors(IOFireWireSBP2LSIWorkaroundDescriptor)
+
+	friend class IOFireWireSBP2LSIRange;
+
+protected:
+
+    // reserved for future use
+    struct ExpansionData { };
+    ExpansionData *reserved; 
+    
+	bool	fFixedCapacity; 	// for both allocators
+	
+	//////////////////////////////////////
+	// for range allocator
+
+	OSArray *				fPermanentRanges;
+	UInt32					fAllocatedRangesCount;
+
+	virtual IOReturn rangeAllocatorInitialize( UInt32 rangeCount );
+	virtual void rangeAllocatorDeallocateAllRanges( void );
+	virtual IOFireWireSBP2LSIRange * rangeAllocatorNewRange( void );
+	virtual void rangeAllocatorFree( void );
+
+	//////////////////////////////////////
+	// for buffer allocator
+	
+	OSArray *				fBufferDescriptors;
+	UInt32					fPermanentPages;
+	IOByteCount				fAllocatedBytesCount;
+
+	virtual IOReturn bufferAllocatorInitialize( IOByteCount requestedBufferSize );
+	virtual void bufferAllocatorDeallocateAllBuffers( void );
+	virtual void * bufferAllocatorNewBuffer( IOPhysicalAddress * address );
+	virtual void bufferAllocatorFree( void );
+
+	//////////////////////////////////////
+	// for range table allocator
+	
+	IOPhysicalRange * 		fRangeTable;
+	IOByteCount				fRangeTableSize;
+
+	virtual IOReturn rangeTableAllocatorInitialize( UInt32 requestedBufferSize );
+	virtual IOPhysicalRange * rangeTableAllocatorNewTable( UInt32 entries );
+	virtual void rangeTableAllocatorFree( void );
+
+	//////////////////////////////////////
+	// for workaround
+
+	IOMemoryDescriptor * 	fOriginalDesc;	
+	OSArray *				fRanges;	
+	IOByteCount 			fOffset;
+	IOByteCount				fLength;
+	IODirection				fDirection;
+	
+						  
+	virtual bool initWithCapacity
+					( UInt32 permanentRanges, IOByteCount permanentBufferSpace, bool fixedCapacity );
+
+	virtual void free();
+	
+	virtual IOReturn resetToInitialCapacity( void );
+	virtual IOReturn initializeRangesArray( void );
+	virtual IOReturn recalculateSmallSegments( void );
+	virtual IOReturn splitLargeSegments( void );
+	virtual IOReturn resegmentOddLengthSegments( void );
+	virtual IOReturn initializeBuffers( void );
+
+	virtual bool initWithAddress( void *      address,       /* not supported */
+                                  IOByteCount withLength,
+                                  IODirection withDirection );
+
+    virtual bool initWithAddress( vm_address_t address,      /* not supported */
+                                  IOByteCount  withLength,
+                                  IODirection  withDirection,
+                                  task_t       withTask );
+
+    virtual bool initWithPhysicalAddress( 
+                                  IOPhysicalAddress address, /* not supported */
+                                  IOByteCount       withLength,
+                                  IODirection       withDirection );
+
+    virtual bool initWithPhysicalRanges( 
+                                  IOPhysicalRange * ranges,  /* not supported */
+                                  UInt32            withCount,
+                                  IODirection       withDirection,
+                                  bool              asReference = false );
+
+    virtual bool initWithRanges(  IOVirtualRange * ranges,   /* not supported */
+                                  UInt32           withCount,
+                                  IODirection      withDirection,
+                                  task_t           withTask,
+                                  bool             asReference = false );
+
+public:
+	
+	// static factory methods and intializers 
+	
+	//
+	// create a new instance
+	//
+	
+	
+    /*!
+		@function withDescriptor
+		@abstract Creates a new IOFireWireSBP2LSIWorkaroundDescriptor.
+		@discussion	Create a IOFireWireSBP2LSIWorkaroundDescriptor with no permanent capacity then 
+        inits it the given descriptor. This is basicly a short cut for calling 
+        withCapacity( 0, 0, false) and the initWithDescriptor()
+        @param desc Original memory descriptor.
+        @param offset Offset of data to "fix" in bytes from beginning of descriptor.
+        @param len Length of data in bytes to "fix"
+        @param direction IODirection of data transfer.
+        @result Returns a new IOFireWireSBP2LSIWorkaroundDescriptor if successful.
+	*/
+    
+	static IOFireWireSBP2LSIWorkaroundDescriptor * withDescriptor
+					( IOMemoryDescriptor * desc, IOByteCount offset = 0,  
+					  IOByteCount len = 0, IODirection direction = kIODirectionOutIn );
+	
+	// initialize with descriptor				  
+	
+    /*!
+		@function initWithDescriptor
+		@abstract Initialize an IOFireWireSBP2LSIWorkaroundDescriptor with the given descriptor.
+		@discussion	Initialize the workaround descriptor with the given descriptor. 
+        @param desc Original memory descriptor.
+        @param offset Offset of data to "fix" in bytes from beginning of descriptor.
+        @param len Length of data in bytes to "fix"
+        @param direction IODirection of data transfer.
+        @result Returns true if the initialization was successful.
+	*/
+    
+    virtual bool initWithDescriptor( IOMemoryDescriptor * desc, IOByteCount offset = 0,  
+								     IOByteCount len = 0, IODirection direction = kIODirectionOutIn );
+	
+	
+	///////////////////////////////////
+	
+    
+    /*!
+		@function withCapacity
+		@abstract Create a new descriptor with possibly a permanent capacity.
+		@discussion	Create and IOFireWireSBP2LSIWorkaroundDescriptor with a permanent fixed capacity. 
+        You should call initWithDescriptor afterward. permanentRanges is number of ranges to keep 
+        permanently allocated for use by the algorithm.  If fixedCapacity is false additional ranges 
+        may be allocated and deallocated dyanmicly if needed. The algorithm may require more or less 
+        ranges than either the original descriptor or the final fixed may decriptor contain.
+        permanentBufferSpace is the number of bytes of permanent buffer to keep arround. If fixedCapacity 
+        is false additional buffer space may be allocated and deallocated dynamically. permanentBufferSpace 
+        should generally be set to 32 * maximum number of ranges. fixedCapacity is a flag indicating 
+        whether dynamic allocations are allowed. When making decisions about the maximum amount of 
+        buffer space to keep around, it should be noted tha the maximum number of ranges maybe different 
+        from permanentRanges if fixedCapcity is false.
+        @param permanentRanges Count of permanent ranges.
+        @param permanentBufferSpace Byte count of permanent buffers.
+        @param fixedCapacity bool indicating if dynamic allocations can be made.
+        @result Returns true if the initialization was successful.
+	*/
+    
+	static IOFireWireSBP2LSIWorkaroundDescriptor * withCapacity
+						( UInt32 permanentRanges, IOByteCount permanentBufferSpace, bool fixedCapacity );
+
+
+	///////////////////////////////////
+
+	//
+	// manipulate buffers for IO
+	//
+
+    /*!
+		@function syncBuffersForOutput
+		@abstract Synchronize the buffers for output.
+		@discussion	Since double buffering may be invovled in the workaround.  The driver needs to 
+        indicate when these buffers should be syncronized with the original descriptor.  For data 
+        that will be output syncBuffersForOutput should be called before submiting the ORB.
+        @result Returns kIOReturnSuccess if sync was successful.
+	*/
+    	
+	virtual IOReturn syncBuffersForOutput( void );  // call before output
+
+    /*!
+		@function syncBuffersForInput
+		@abstract Synchronize the buffers for input.
+		@discussion	Since double buffering may be invovled in the workaround.  The driver needs to 
+        indicate when these buffers should be syncronized with the original descriptor.  For data 
+        that will be input syncBuffersForOutput should be called after receiving completion status 
+        for the ORB.
+        @result Returns kIOReturnSuccess if sync was successful.
+	*/
+    
+    virtual IOReturn syncBuffersForInput( void );	// call after input
+    
+private:
+
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 8);
+    
+};
+
+#endif
+
+#endif
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LUN.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LUN.h.svn-base
new file mode 100644
index 0000000..e6c97de
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LUN.h.svn-base
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOFireWireSBP2LUN
+  Contains the class definition for IOFireWireSBP2LUN.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2LUN_H
+#define _IOKIT_IOFIREWIRESBP2LUN_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOCommandGate.h>
+
+#include <IOKit/firewire/IOFireWireUnit.h>
+
+#include <IOKit/sbp2/IOFireWireSBP2Login.h>
+#include <IOKit/sbp2/IOFireWireSBP2ManagementORB.h>
+
+class IOFireWireSBP2Target;
+
+/*!
+    @class IOFireWireSBP2LUN
+    @abstract Provider for most drivers. 
+    @discussion IOFireWireSBP2LUN objects are created by IOFireWireSBP2Target objects.  Each target may have zero or more IOFireWireSBP2LUN children. The LUN object serves as the matching nub for most drivers and therefore will be the provider for most drivers.  It supplies the methods that control the operation of the LUN as a whole.  Methods that control the behavior and execution of an SBP2 login session are supplied in a separate IOFireWireSBP2Login object. The LUN can be used to create one of these login objects.
+    The LUN can also create IOFireWireSBP2ManagementORBs for configuring and appending non-login related management functions.  Login related management functions (ie. Login, Logout, Reconnect) are supplied by the IOFireWireSBP2Login.
+    Finally the LUN can supply a reference to the IOFireWireUnit.  This can be useful if a driver wishes to access the standard FireWire APIs.  
+*/
+
+class IOFireWireSBP2LUN : public IOService
+{
+    OSDeclareDefaultStructors( IOFireWireSBP2LUN );
+
+	friend class IOFireWireSBP2ManagementORB;
+	friend class IOFireWireSBP2Login;
+	friend class IOFireWireSBP2UserClient;
+	
+protected: 
+
+    // reserved for future use
+    struct ExpansionData { };
+    ExpansionData *reserved;
+
+	////////////////////////////////////////////
+	// methods called by friend classes
+
+	// IOFireWireSBP2Login methods
+    virtual void removeLogin( IOFireWireSBP2Login * login );
+	virtual IOFireWireSBP2Target * getTarget( void );
+	
+	// IOFireWireSBP2ManagementORB methods
+	virtual void clearAllTasksInSet( void );  // assumes caller is on workloop
+	virtual void removeManagementORB( IOFireWireSBP2ManagementORB * orb ); 
+	
+	// IOFireWireSBP2UserClient methods
+	virtual void flushAllManagementORBs( void );
+
+public:
+
+	////////////////////////////////////////////
+	// IOService overrides
+
+    /*! @function attach
+        @abstract Attaches an IOService client to a provider in the registry.
+        @discussion See IOService for discussion.
+        @param provider The IOService object which will serve as this objects provider.
+        @result false if the provider is inactive or on a resource failure, otherwise true. 
+    */
+    
+    virtual bool attach( IOService *provider );
+
+	/*! @function handleOpen
+		@abstract Overrideable method to control the open / close behaviour of an IOService.
+		@discussion See IOService for discussion.		
+		@param forClient Designates the client of the provider requesting the open.
+		@param options Options for the open, may be interpreted by the implementor of handleOpen.
+		@result Return true if the open was successful, false otherwise. */
+
+    virtual bool handleOpen(  IOService *	  forClient,
+                              IOOptionBits	  options,
+                              void *		  arg );
+	/*! 
+		@function handleClose
+		@abstract Overrideable method to control the open / close behaviour of an IOService.
+		@discussion See IOService for discussion.
+		@param forClient Designates the client of the provider requesting the close.
+		@param options Options for the close, may be interpreted by the implementor of handleOpen. 
+	*/
+
+    virtual void handleClose(   IOService *		forClient,
+                                IOOptionBits	options );
+    
+ 	/*! 
+		@function matchPropertyTable
+		@abstract Implements SBP2 specific matching.
+		@discussion See IOService for discussion.
+	    @param table The dictionary of properties to be matched against.
+		@result Returns false if the family considers the matching dictionary does not match in properties it 			understands, true otherwise.
+	*/
+    	
+	virtual bool matchPropertyTable(OSDictionary * table);
+																	
+protected:
+
+	////////////////////////////////////////////
+	// private fields
+	
+    IOFireWireSBP2Target * 	fProviderTarget;
+    UInt32					fLUNumber;
+    OSSet *					fLoginSet;
+    OSIterator *			fLoginSetIterator;
+	IOCommandGate * 		fGate;
+	OSSet *					fORBSet;
+    OSIterator *			fORBSetIterator;
+	OSObject * 				fDiagnostics;
+	
+	////////////////////////////////////////////
+	// private methods
+	
+	// IOService methods
+    virtual void free( void );
+    virtual IOReturn message( UInt32 type, IOService * provider, void * argument = 0 );
+    
+	// create management orb internals
+	static IOReturn staticCreateManagementORBAction( OSObject *self,
+													 void * refCon,
+													 void * completion, 
+													 void * orb, 
+													 void * );
+	virtual IOReturn createManagementORBAction( void * refCon,
+												FWSBP2ManagementCallback completion, 
+												IOFireWireSBP2ManagementORB ** orb );
+
+	// remove management orb internals
+	static IOReturn staticRemoveManagementORBAction( OSObject * self, void * orb, 
+													void *, void *, void * );
+	virtual IOReturn removeManagementORBAction( IOFireWireSBP2ManagementORB * orb );
+
+	// flush all management orb internals
+	static IOReturn staticExecuteFlushAllMgmtORBs( OSObject * self, void *, 
+													void *, void *, void * );
+	virtual IOReturn executeFlushAllMgmtORBs( void );
+
+	// IOFireWireSBP2ManagementORB friend class wrappers
+    virtual bool initMgmtORBWithLUN( IOFireWireSBP2ManagementORB * orb, IOFireWireSBP2LUN * lun, 
+									 void * refCon, 
+									 FWSBP2ManagementCallback completion );
+									 		
+	// IOFireWireSBP2Login friend class wrappers
+    virtual bool initLoginWithLUN( IOFireWireSBP2Login * login, IOFireWireSBP2LUN * lun );
+	virtual void suspendedNotify( void );
+	virtual void resumeNotify( void );
+		
+private:
+
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 0);
+
+public:
+
+	////////////////////////////////////////////
+    // client methods
+
+	// getters
+	
+    /*!
+		@function getFireWireUnit
+		@abstract Returns an IOFireWireUnit object.
+		@discussion An IOFireWireUnit is the provider of an IOFireWireSBP2Target.  In order to 
+        use the base FireWire services you will need a reference to the unit.  This method 
+        returns that reference.
+		@result Returns a pointer to an IOFireWireUnit.
+	*/
+    
+    virtual IOFireWireUnit * getFireWireUnit( void );
+    
+    /*!
+		@function getLUNumber
+		@abstract Returns the LUNs number.
+		@discussion Each LUN has a number to uniquely identify it on a device.  This method returns 
+        this value in a UInt32.		
+        @result Returns a UInt32 containing the Logical Unit Number.
+	*/
+    
+	virtual UInt32 getLUNumber( void );
+    
+	// factory methods
+    
+    /*!
+		@function createLogin
+		@abstract Creates a new IOFireWireSBP2Login object.
+		@discussion	Creates a new IOFireWireSBP2Login object for the LUN.  Login objects supply most 
+        of the SBP2 APIs related to login maintenance and Normal Command ORB execution.
+        @result Returns a pointer to a new IOFireWireSBP2Login.
+	*/
+
+    virtual IOFireWireSBP2Login *createLogin( void );	
+
+    /*!
+		@function createManagementORB
+		@abstract Creates a new IOFireWireSBP2ManagementORB object.
+		@discussion	Creates a new IOFireWireSBP2ManagementORB object.  Management objects let you 
+        execute commands like QueryLogins, LogicalUnitReset, and AbortTask.  These commands are 
+        configured after they are created here.  When they are done executing (after a call to submit) 
+        the supplied completion routine will be called with the supplied refcon.  Usually this refCon
+        is the "this" pointer of completion method's object.
+        @param refCon The refcon passed to the completion routine.
+        @param completion The completion routine.  Called when the ORB finishes execution.	
+        @result Returns a pointer to a new IOFireWireSBP2Login.
+	*/
+        
+    virtual IOFireWireSBP2ManagementORB * createManagementORB( void * refCon, FWSBP2ManagementCallback completion );
+
+protected:
+
+    static IOReturn staticCreateLogin( OSObject *self, void * login, void *, void *, void * );
+    virtual IOReturn createLoginAction( IOFireWireSBP2Login ** login );
+
+    static IOReturn staticRemoveLoginAction( OSObject *self, void * login, void *, void *, void * );
+    virtual IOReturn removeLoginAction( IOFireWireSBP2Login * login );
+
+public:
+
+    /*!
+		@function getDiagnostics
+		@abstract Debug-only method.
+		@discussion	Returns a reference to the internal diagnostics object when the services are built 
+        in debug mode. Should be a no-op in release builds.
+        @result Returns a pointer to the diagnostics object (if any).
+	*/
+    	
+	virtual OSObject * getDiagnostics( void );
+
+    virtual bool finalize( IOOptionBits options );
+
+protected:
+
+	void terminateNotify( void );
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 8);
+
+};
+
+#endif 
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Login.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Login.h.svn-base
new file mode 100644
index 0000000..42a838c
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Login.h.svn-base
@@ -0,0 +1,1078 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOFireWireSBP2Login
+  Contains the class definition for IOFireWireSBP2Login.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2LOGIN_H
+#define _IOKIT_IOFIREWIRESBP2LOGIN_H
+
+#include <IOKit/IOCommandGate.h>
+
+#include <IOKit/firewire/IOFireWireUnit.h>
+
+#include <IOKit/sbp2/IOFireWireSBP2ORB.h>
+#include <IOKit/sbp2/IOFireWireSBP2Target.h>
+
+// login option flags
+enum
+{
+	kFWSBP2DontSynchronizeMgmtAgent = (1 << 0),
+    kFWSBP2ExclusiveLogin 			= (1 << 5)
+};
+
+// notification events
+enum
+{
+    kFWSBP2NormalCommandStatus	= 6,
+    kFWSBP2NormalCommandTimeout	= 7,
+    kFWSBP2UnsolicitedStatus	= 8,
+    kFWSBP2NormalCommandReset	= 9
+};
+
+#define kIOMessageFWSBP2ReconnectComplete	iokit_fw_err(0x3E8)
+#define kIOMessageFWSBP2ReconnectFailed		iokit_fw_err(0x3E9)
+
+/*! 
+    @typedef FWSBP2LoginResponse
+    @param length Length of login response.
+    @param loginID Unique id representing this login. 
+    @param commandBlockAgentAddressHi High 32 bits of command block agent address.
+    @param commandBlockAgentAddressLo Low 32 bits of command block agent address.
+    @param reserved Reserved.
+    @param reconnectHold Reconnect timeout encoded as 2^reconnectHold seconds.
+*/
+
+typedef struct
+{
+    UInt16		length;
+    UInt16		loginID;
+    UInt32		commandBlockAgentAddressHi;
+    UInt32		commandBlockAgentAddressLo;
+    UInt16		reserved;
+    UInt16		reconnectHold;
+} FWSBP2LoginResponse, *FWSBP2LoginResponsePtr;
+
+/*! 
+    @typedef FWSBP2StatusBlock
+    @param details Src, Resp, D, Len fields of status block format
+    @param sbpStatus SBP2 specific status
+    @param orbOffsetHi High 32 bits of address of orb status is for.
+    @param orbOffsetLo Low 32 bits of address of orb status is for.
+    @param status[6] Up to 48 bytes of additional data. Length is determined by len field.
+*/
+
+typedef struct
+{
+    UInt8		details;
+    UInt8		sbpStatus;
+    UInt16		orbOffsetHi;
+    UInt32		orbOffsetLo;
+    UInt32		status[6];	
+} FWSBP2StatusBlock;
+
+class IOFireWireSBP2LUN;
+class IOFireWireSBP2Login;
+
+// struct sent to login complete handler
+
+/*! 
+    @typedef FWSBP2LoginCompleteParams
+    @param login Pointer to IOFireWireSBP2Login object.
+    @param generation FireWire generation value.
+    @param status Status of login attempt.
+    @param loginResponse Pointer to login response struct.
+    @param statusBlock Pointer to status block buffer.
+    @param statusBlockLength Length of entire status block.
+*/
+
+typedef struct
+{
+    IOFireWireSBP2Login * 	login;			// login object this param is sent from
+    UInt32					generation;		// generation this login was attempted in 
+  
+    IOReturn				status;			// status of login attempt
+	
+    FWSBP2LoginResponsePtr	loginResponse;		// pointer to loginResponse buffer
+    FWSBP2StatusBlock *		statusBlock;		// pointer to statusBlock buffer
+    UInt32					statusBlockLength;	// size of statusBlock buffer
+	
+} FWSBP2LoginCompleteParams, *FWSBP2LoginCompleteParamsPtr;
+
+// struct sent to logout complete handler
+
+/*! 
+    @typedef FWSBP2LogoutCompleteParams
+    @param login Pointer to IOFireWireSBP2Login object.
+    @param generation FireWire generation value.
+    @param status Status of login attempt.
+    @param statusBlock Pointer to status block buffer.
+    @param statusBlockLength Length of entire status block.
+*/
+
+typedef struct
+{
+    IOFireWireSBP2Login * 	login;			// login object this param is sent from
+    UInt32					generation;		// generation this login was attempted in
+
+    IOReturn				status;			// status of login attempt
+	
+    FWSBP2StatusBlock *		statusBlock;		// pointer to statusBlock buffer
+    UInt32					statusBlockLength;	// size of statusBlock buffer
+	
+} FWSBP2LogoutCompleteParams, *FWSBP2LogoutCompleteParamsPtr;
+
+// struct sent with reconnect notification
+
+/*! 
+    @typedef FWSBP2LogoutCompleteParams
+    @param login Pointer to IOFireWireSBP2Login object.
+    @param generation FireWire generation value.
+    @param status Status of login attempt.
+    @param reconnectStatusBlock Pointer to status block buffer.
+    @param reconnectStatusBlockLength Length of entire status block.
+*/
+
+typedef struct
+{
+    IOFireWireSBP2Login * 	login;			// login object this param is sent from
+    UInt32					generation;		// generation this login was attempted in
+
+    IOReturn			status;			// status of reconnect attempt
+
+    void *			reconnectStatusBlock;		// pointer to statusBlock buffer
+    UInt32			reconnectStatusBlockLength;	// size of statusBlock buffer
+} FWSBP2ReconnectParams, *FWSBP2ReconnectParamsPtr;
+
+// Callback when login and logout commands complete asynchronously
+
+/*! 
+    @typedef FWSBP2LoginCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param params Structure containing additional information about the status of the login. 
+*/
+    
+typedef void (*FWSBP2LoginCallback)(void * refCon, FWSBP2LoginCompleteParamsPtr params);
+
+/*! 
+    @typedef FWSBP2LogoutCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param params Structure containing additional information about the status of the logout. 
+*/
+
+typedef void (*FWSBP2LogoutCallback)(void * refCon, FWSBP2LogoutCompleteParamsPtr params);
+
+/*! 
+    @typedef FWSBP2StatusCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param status Indicates success or failure of operation. 
+*/
+
+typedef void (*FWSBP2StatusCallback)(void * refCon, IOReturn status);
+
+/*! 
+    @typedef FWSBP2FetchAgentWriteCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param status Indicates success or failure of operation. 
+    @param orb Indicates current last orb in chain.
+*/
+
+typedef void (*FWSBP2FetchAgentWriteCallback)(void * refCon, IOReturn status, IOFireWireSBP2ORB * orb);
+
+/*! 
+    @typedef FWSBP2NotifyParams
+    @param notificationEvent Type of event we are being notified of.
+    @param message buffer containing message.
+    @param length length of message field.
+    @param generation FireWire generation value.
+*/
+
+typedef struct
+{
+    void *				commandObject;
+    UInt32 				notificationEvent;
+    const void * 		message;
+    UInt32				length;
+    UInt32				generation;
+} FWSBP2NotifyParams, *FWSBP2NotifyParamsPtr;
+
+
+/*! 
+    @typedef FWSBP2NotifyCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param params FWSBP2NotifyParams containing notification information.
+*/
+
+typedef void (*FWSBP2NotifyCallback)(void * refCon, FWSBP2NotifyParamsPtr params);
+
+/*!
+    @class IOFireWireSBP2Login
+    @abstract Supplies the login maintenance and Normal Command ORB execution portions of the API.
+    @discussion Supplies APIs for login maintenance and command execution.  Drivers can use this 
+    object to create IOFireWireSBP2ORB objects and execute them.  Solicited and unsolicited status 
+    callback routines can be registered and the SBP2 services will notify the driver when the 
+    appropriate status arrives.
+    This class also handles login maintenance.  Supplies APIs for logging in and logging out and 
+    attempts to reconnect to the LUN after bus resets.  The base FireWire services deliver bus 
+    reset notification via the IOKit message routine.  The SBP2 services build on this behavior 
+    and deliver reconnectFailed and reconnectComplete through the message routine as well.
+*/
+
+class IOFireWireSBP2Login : public OSObject
+{
+    OSDeclareDefaultStructors( IOFireWireSBP2Login )
+
+	friend class IOFireWireSBP2ORB;
+	friend class IOFireWireSBP2LUN;
+	friend class IOFireWireSBP2UserClient;
+	
+protected:
+
+    // command selectors
+    enum
+    {
+        kLoginCommandIdle		= 0,
+        kLoginCommandDoLogin 	= 1,
+        kLoginCommandDoLogout	= 2,
+        kLoginAddORB			= 3,
+        kLoginRemoveORB			= 4,
+		kLoginFetchAgentReset	= 5
+     };
+
+    // internal login states
+    enum
+    {
+        kLoginStateIdle			= 0,
+        kLoginStateLoggingIn	= 1,
+        kLoginStateConnected	= 2,
+        kLoginStateReconnect	= 3,
+        kLoginStateLoggingOut	= 4,
+		kLoginStateTerminated	= 5
+    };
+
+    // rom keys
+    enum
+    {
+        kUnitCharacteristicsKey 	= 0x3A,
+        kManagementAgentOffsetKey	= 0x54
+    };
+
+    // sbp2 defs
+    enum
+    {
+        kFWSBP2RequestComplete 	= 0,
+        kFWSBP2TransportFailure	= 1,
+        kFWSBP2IllegalRequest	= 2,
+        kFWSBP2VendorDependent	= 3
+    };
+
+    enum
+    {
+        kFWSBP2NoSense					= 0,
+        kFWSBP2RequestTypeNotSupported	= 1,
+        kFWSBP2SpeedNotSupported		= 2,
+        kFWSBP2PageSizeNotSupported		= 3,
+        kFWSBP2AccessDenied				= 4,
+        kFWSBP2LogicalUnitNotSupported	= 5,
+        kFWSBP2MaxPayloadTooSmall		= 6,
+        kFWSBP2FunctionRejected			= 9,
+        kFWSBP2LoginIDNotRecognized		= 10,
+        kFWSBP2DummyORBCompleted		= 11,
+        kFWSBP2RequestAborted			= 12,
+        kFWSBP2UnspecifiedError			= 0xFF
+    };
+
+    typedef struct
+    {
+        UInt32		password[2];
+        UInt32		loginResponseAddressHi;
+        UInt32		loginResponseAddressLo;
+        UInt16		options;
+        UInt16		lun;
+        UInt16		passwordLength;
+        UInt16		loginResponseLength;
+        UInt32		statusFIFOAddressHi;
+        UInt32		statusFIFOAddressLo;
+    } FWSBP2LoginORB;
+
+    typedef struct
+    {
+        UInt32		reserved1[4];
+        UInt16		options;
+        UInt16		loginID;
+        UInt32		reserved2;
+        UInt32		statusFIFOAddressHi;
+        UInt32		statusFIFOAddressLo;
+    } FWSBP2ReconnectORB;
+    
+    typedef struct
+    {
+        UInt32		reserved1[4];
+        UInt16		options;
+        UInt16		loginID;
+        UInt32		reserved2;
+        UInt32		statusFIFOAddressHi;
+        UInt32		statusFIFOAddressLo;
+    } FWSBP2LogoutORB;
+
+protected:
+
+    ///////////////////////////////////////////////////////////////////
+    // private interface methods
+
+	// IOFireWireSBP2LUN methods
+	virtual void clearAllTasksInSet( void );
+    virtual bool initWithLUN( IOFireWireSBP2LUN * lun );
+    virtual void suspendedNotify( void );
+    virtual void resumeNotify( void );
+	
+	// IOFireWireSBP2ORB methods
+	virtual IOFireWireUnit * getFireWireUnit( void );
+    virtual IOFireWireSBP2LUN * getFireWireLUN( void );
+    virtual bool isFetchAgentWriteInProgress( void );
+    virtual bool isConnected( void );
+    virtual IOReturn removeORB( IOFireWireSBP2ORB * orb );
+    virtual IOReturn appendORBImmediate( IOFireWireSBP2ORB * orb );
+    virtual IOReturn appendORB( IOFireWireSBP2ORB * orb );
+    virtual void sendTimeoutNotification( IOFireWireSBP2ORB * orb );
+     
+protected:
+  
+    // reserved for future use
+    struct ExpansionData { };
+    ExpansionData *reserved; 
+          
+    IOFireWireSBP2LUN * 	fLUN;
+    IOFireWireUnit *		fUnit;
+	IOFireWireController *	fControl;
+	IOCommandGate * 		fGate;
+
+    FWSBP2LoginCallback		fLoginCompletionCallback;
+    void *	  				fLoginCompletionRefCon;
+
+    FWSBP2LogoutCallback	fLogoutCompletionCallback;
+    void *					fLogoutCompletionRefCon;
+    
+    FWSBP2NotifyCallback	fStatusNotifyCallback;
+    void *					fStatusNotifyRefCon;
+
+    FWSBP2NotifyCallback	fUnsolicitedStatusNotifyCallback;
+    void *					fUnsolicitedStatusNotifyRefCon;
+    
+    UInt32					fLoginFlags;
+    UInt32					fReconnectTime;
+    
+    UInt32					fLoginState;
+    UInt32					fManagementOffset;
+    UInt32					fManagementTimeout;
+    UInt32					fMaxORBSize;
+    UInt32					fMaxCommandBlockSize;
+    UInt16					fLoginNodeID;
+    UInt32					fLoginGeneration;
+    UInt32					fLoginID;
+    UInt32					fReconnectHold;
+    UInt32					fMaxPayloadSize;
+    void *					fRefCon;
+    
+    // resources
+    
+    FWSBP2LoginORB			fLoginORB;
+    IOFWAddressSpace *		fLoginORBAddressSpace;
+    FWAddress				fLoginORBAddress;
+
+    FWSBP2LoginResponse		fLoginResponse;
+    IOFWAddressSpace *		fLoginResponseAddressSpace;
+    FWAddress				fLoginResponseAddress;
+
+    FWSBP2ReconnectORB		fReconnectORB;
+    IOFWAddressSpace *		fReconnectORBAddressSpace;
+    FWAddress				fReconnectORBAddress;
+    
+    FWSBP2StatusBlock		fStatusBlock;
+    IOFWAddressSpace *		fStatusBlockAddressSpace;
+    FWAddress				fStatusBlockAddress;
+
+    FWSBP2StatusBlock		fReconnectStatusBlock;
+    IOFWAddressSpace *		fReconnectStatusBlockAddressSpace;
+    FWAddress				fReconnectStatusBlockAddress;
+
+    FWSBP2LogoutORB			fLogoutORB;
+    IOFWAddressSpace *		fLogoutORBAddressSpace;
+    FWAddress				fLogoutORBAddress;
+    bool					fLogoutPending;
+	
+    IOFWWriteCommand *		fLoginWriteCommand;
+    IOMemoryDescriptor *	fLoginWriteCommandMemory;
+    bool					fLoginWriteInProgress;
+     
+    IOFWWriteCommand *		fReconnectWriteCommand;
+    IOMemoryDescriptor *	fReconnectWriteCommandMemory;
+    bool					fReconnectWriteInProgress;
+    bool					fReconnectWriteInterrupted;
+    
+    IOFWWriteCommand *		fLogoutWriteCommand;
+    IOMemoryDescriptor *	fLogoutWriteCommandMemory;
+    bool					fLogoutWriteInProgress;
+    
+    IOFWCommand *			fLoginTimeoutCommand;
+    bool					fLoginTimeoutTimerSet;
+
+    IOFWDelayCommand *		fReconnectTimeoutCommand;
+    bool					fReconnectTimeoutTimerSet;
+
+    IOFWCommand *			fLogoutTimeoutCommand;
+    bool					fLogoutTimeoutTimerSet;
+
+    FWAddress 				fFetchAgentAddress;
+    IOMemoryDescriptor *	fFetchAgentWriteCommandMemory;
+    FWAddress 				fLastORBAddress;
+    IOFireWireSBP2ORB *		fLastORB;
+    IOFWWriteCommand *		fFetchAgentWriteCommand;
+    bool					fFetchAgentWriteCommandInUse;
+	FWSBP2FetchAgentWriteCallback 	fFetchAgentWriteCompletion;
+	void * 							fFetchAgentWriteRefCon;
+	IOFireWireSBP2ORB *		fORBToWrite;
+	
+    OSSet *					fORBSet;
+    OSIterator *			fORBSetIterator;
+ 
+    void *					fPasswordBuf;
+    UInt32					fPasswordLen;
+    IOFWAddressSpace *		fPasswordAddressSpace;
+    FWAddress				fPasswordAddress;
+	IOMemoryDescriptor *	fPasswordDescriptor;
+
+	bool fSuspended;
+	
+	UInt32					fLoginRetryDelay;
+	UInt32					fLoginRetryCount;
+	UInt32					fLoginRetryMax;
+	IOFWDelayCommand *		fLoginRetryTimeoutCommand;
+    bool					fLoginRetryTimeoutTimerSet;
+	IOFireWireSBP2Target * 	fTarget;
+	
+	bool					fUnsolicitedStatusEnableRequested;
+	
+	IOFWDelayCommand *		fReconnectRetryTimeoutCommand;
+    bool					fReconnectRetryTimeoutTimerSet;	
+
+	int						fCriticalSectionCount;
+	
+	// init / destroy
+    virtual IOReturn getUnitInformation( void );
+    virtual IOReturn allocateResources( void );
+    virtual void free( void );
+        	
+	// orb add / remove
+	virtual IOReturn addORB( IOFireWireSBP2ORB * orb );
+	static IOReturn staticExecuteAddORB( OSObject *self, void * orb, void *, void *, void * );
+	virtual IOReturn executeAddORB( IOFireWireSBP2ORB * orb );
+
+	static IOReturn staticExecuteRemoveORB( OSObject *self, void * orb, void *, void *, void * );
+	virtual IOReturn executeRemoveORB( IOFireWireSBP2ORB * orb );
+
+    //
+    // login
+    //
+
+    static IOReturn staticExecuteLogin( OSObject *self, void *, void *, void *, void * );
+    virtual IOReturn executeLogin( void );
+    virtual void abortLogin( void );
+    
+    // login write complete handler
+    static void loginWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+    virtual void loginWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+    // login timeout handler
+    static void loginTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+    virtual void loginTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+
+    // status block write handler
+    static UInt32 statusBlockWriteStatic(void *refcon, UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
+                                         const void *buf, IOFWRequestRefCon lockRead);
+   	virtual UInt32 statusBlockWrite( UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len, const void *buf, IOFWRequestRefCon lockRead);
+	virtual void completeLogin( IOReturn state, const void *buf = NULL, UInt32 len = 0, void * buf2 = NULL );
+
+    //
+    // reconnect
+    //
+    
+    virtual void doReconnect( void );
+    virtual void restartReconnect( void );
+    virtual void startReconnectTimer( void );
+
+    // reconnect write complete handler
+    static void reconnectWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+    virtual void reconnectWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+    // reconnect timeout handler
+    static void reconnectTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+    virtual void reconnectTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+
+    // reconnect status block
+    static UInt32 reconnectStatusBlockWriteStatic(void *refcon, UInt16 nodeID, IOFWSpeed &speed, FWAddress addr,
+                                                  UInt32 len, const void *buf, IOFWRequestRefCon lockRead);
+   	virtual UInt32 reconnectStatusBlockWrite( UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
+                                              const void *buf, IOFWRequestRefCon lockRead);
+
+    virtual void sendReconnectNotification( UInt32 event );
+    virtual void sendReconnectNotificationWithStatusBlock( UInt32 event );
+
+    //
+    // logout
+    //
+    
+	static IOReturn staticExecuteLogout( OSObject *self, void *, void *, void *, void * );
+    virtual IOReturn executeLogout( void );
+    
+    // logout write complete handler
+    static void logoutWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+    virtual void logoutWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+    // logout timeout handler
+    static void logoutTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+    virtual void logoutTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+	
+	virtual void completeLogout( IOReturn state, const void *buf = NULL, UInt32 len = 0);
+
+	// fetch agent write complete handler
+    static void fetchAgentWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+    virtual void fetchAgentWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+    //
+    // fetch agent
+    //
+
+	bool 							fFetchAgentResetInProgress;
+	UInt32 							fFetchAgentResetBuffer;
+	FWAddress 						fFetchAgentResetAddress;
+	IOFWWriteQuadCommand *			fFetchAgentResetCommand;
+	void * 							fFetchAgentResetRefCon;
+	FWSBP2StatusCallback 			fFetchAgentResetCompletion;
+
+	static IOReturn staticExecuteFetchAgentReset( OSObject *self, void *, void *, void *, void * );
+	virtual IOReturn executeFetchAgentReset( void );
+	static void fetchAgentResetCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+	virtual void fetchAgentResetComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+	//
+	// doorbell
+	//
+	
+	bool 							fDoorbellInProgress;
+	bool							fDoorbellRingAgain;
+	UInt32 							fDoorbellBuffer;
+	FWAddress 						fDoorbellAddress;
+	IOFWWriteQuadCommand *			fDoorbellCommand;
+	
+	static IOReturn staticExecuteDoorbell( OSObject *self, void *, void *, void *, void * );
+	virtual IOReturn executeDoorbell( void );
+	static void doorbellCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+	virtual void doorbellComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+	//
+	// enable unsolicited satus
+	//
+
+	bool 							fUnsolicitedStatusEnableInProgress;
+	UInt32 							fUnsolicitedStatusEnableBuffer;
+	FWAddress 						fUnsolicitedStatusEnableAddress;
+	IOFWWriteQuadCommand *			fUnsolicitedStatusEnableCommand;
+
+	static IOReturn staticExecuteUnsolicitedStatusEnable( OSObject *self, void *, void *, void *, void * );
+	virtual IOReturn executeUnsolicitedStatusEnable( void );
+	static void unsolicitedStatusEnableCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+	virtual void unsolicitedStatusEnableComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+	//
+	// busy timeout stuff
+	//
+	
+	bool 							fSetBusyTimeoutInProgress;
+	UInt32 							fSetBusyTimeoutBuffer;
+	FWAddress 						fSetBusyTimeoutAddress;
+	IOFWWriteQuadCommand *			fSetBusyTimeoutCommand;
+	
+	bool							fInCriticalSection;
+
+	UInt16					fLocalNodeID;
+	bool					fFastStartSupported;
+	UInt32					fFastStartOffset;
+	UInt32					fFastStartMaxPayload;
+	
+	UInt32					fUserLoginGeneration;
+	bool					fUserLoginGenerationSet;
+	
+	IOFWDelayCommand *		fFetchAgentRetryTimerCommand;
+    bool					fFetchAgentRetryTimerSet;	
+	
+	virtual IOReturn executeSetBusyTimeout( void );
+	static void setBusyTimeoutCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+	virtual void setBusyTimeoutComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+private:
+	// IOFireWireSBP2ORB friend class wrappers
+	OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 0);
+
+protected: 									
+	virtual bool initORBWithLogin( IOFireWireSBP2ORB * orb, IOFireWireSBP2Login * login );
+	virtual void setNextORBAddress( IOFireWireSBP2ORB * orb, FWAddress address );
+    virtual void fetchAgentWriteComplete( IOFireWireSBP2ORB * orb, IOReturn status );
+    virtual bool isORBTimerSet( IOFireWireSBP2ORB * orb );
+    virtual void cancelORBTimer( IOFireWireSBP2ORB * orb );
+	
+	// IOFireWireSBP2LUN friend class wrappers
+	virtual void removeLogin( void );
+	virtual IOFireWireSBP2Target * getTarget( void );
+	
+	UInt32		fARDMAMax;
+	bool		fPhysicalAccessEnabled;
+
+	bool					fLoginStatusReceived;
+	FWSBP2StatusBlock		fLoginStatusBlock;
+	UInt32					fLoginStatusBlockLen;
+		
+private:
+
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 4);
+	OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 5);
+
+public:
+
+	//////////////////////////////
+
+    /*!
+		@function createORB
+		@abstract Creates a new IOFireWireSBP2ORB for this login.
+		@discussion	Create a new IOFireWireSBP2ORB for this login.  It can be configured 
+        with it's accessors and executed with submitORB below.
+        @result Returns a pointer to the new ORB object.
+	*/
+    	
+	virtual IOFireWireSBP2ORB * createORB( void );
+	
+    /*!
+		@function submitORB
+		@abstract Submits the given orb
+		@discussion	Starts execution of the given ORB.  If the ORB is an immediate ORB it's 
+        addresss is written to the fetch agent.  If it is a non immediate orb its address 
+        is appended to the last orb of the currently processing chain.  The doorbell is not 
+        rung automatically it must be run manually with the ringDoorbell command described below.
+        @param orb The orb to be executed.	
+        @result Returns kIOReturnSuccess if the ORB has been started successfully.
+	*/
+    
+    virtual IOReturn submitORB( IOFireWireSBP2ORB * orb );
+
+    // set callbacks
+    
+    /*!
+		@function setStatusNotifyProc
+		@abstract Sets the callback to be called on normal command status.
+		@discussion The supplied callback is called when normal command status is recieved, when 
+        a normal command times out, or when a normal command is aborted. 
+        "notificationEvent" in the callback's params will indicate what happened.
+        It will be set to one of the following values: kFWSBP2NormalCommandReset, kFWSBP2NormalCommandStatus, 
+        or kFWSBP2NormalCommandTimeout.  If the event type is kFWSBP2NormalCommandTimeout and "len" is 
+        non-zero then "message" contains the data written to the status block.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2NotifyCallback.
+	*/
+    
+    virtual void setStatusNotifyProc( void * refCon, FWSBP2NotifyCallback callback );
+
+    /*!
+		@function getStatusNotifyProc
+		@abstract Returns the callback to be called on normal command status.
+		@discussion Returns the refCon and callback address of the status notify callback.
+        @param refCon output parameter returning the refCon to be passed to the callback.	
+        @param callback output parameter returning the address of the callback.
+	*/
+    
+    virtual void getStatusNotifyProc( void ** refCon, FWSBP2NotifyCallback * callback );
+
+    /*!
+		@function setUnsolicitedStatusNotifyProc
+		@abstract Sets the callback to be called on normal command status.
+		@discussion The supplied callback is called when unsolicited status is recieved.
+        "notificationEvent" in the callback's params will indicate what happened.  In this 
+        case it will be set to kFWSBP2UnsolicitedStatus. If "len" is 
+        non-zero then "message" contains the data written to the status block. Note: any buffers 
+        returned by callbacks are only valid for the duration of the login and should not have 
+        their contents modified.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2NotifyCallback.
+	*/
+    
+    virtual void setUnsolicitedStatusNotifyProc( void * refCon, FWSBP2NotifyCallback callback );
+    
+    /*!
+		@function getUnsolicitedStatusNotifyProc
+		@abstract Returns the callback to be called on unsolicited status.
+		@discussion Returns the refCon and callback address of the unsolicited status notify callback.
+        @param refCon output parameter returning the refCon to be passed to the callback.	
+        @param callback output parameter returning the address of the callback.
+	*/
+    
+    virtual void getUnsolicitedStatusNotifyProc( void ** refCon, FWSBP2NotifyCallback * callback );
+
+    // command handling
+    
+    /*!
+		@function setLoginCompletion
+		@abstract Sets the callback to be called when a login attempt is complete.
+		@discussion The supplied callback is called when a login attempt has completed. "status" in the
+        callback's params should be checked to determine the success or failure of the login attempt.  
+        If "statusBlock" is non-null then login status was written and it has been supplied here.  If 
+        the login attempt was successful then the login response will be supplied in the "loginResponse" 
+        buffer.  Note: all buffers supplied to callbacks are only valid for the duration of the callback.  
+        Also, you are not to modify the contents of any supplied buffer.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2LoginCallback.
+	*/
+    
+	virtual void setLoginCompletion( void * refCon, FWSBP2LoginCallback completion );
+    
+    /*!
+		@function submitLogin
+		@abstract Attempts to login to the LUN.		
+        @discussion This call begins the login process.  The login object should be configured prior 
+        to this call. If kIOReturnSuccess is returned from this call then the loginCompletion routine 
+        will be called when the login completes (successfully or unsuccesfully). 
+        @result Returns kIOReturnSuccess login has successlly begun.
+	*/
+    
+    virtual IOReturn submitLogin( void );
+	
+    /*!
+		@function submitLogout
+		@abstract Attempts to logout of the LUN.		
+        @discussion This call begins the logout process.  If kIOReturnSuccess is returned from this call then
+        the logoutCompletion routine will be called when the logout completes (successfully or unsuccesfully). 
+        @result Returns kIOReturnSuccess if logout has successfully begun.
+	*/
+    
+    virtual IOReturn submitLogout( void );
+ 
+    /*!
+		@function setLogoutCompletion
+		@abstract Sets the callback to be called when a logout attempt is complete.
+		@discussion The supplied callback is called when a logout attempt has completed. "status" in the
+        callback's params should be checked to determine the success or failure of the logout attempt.  
+        If "statusBlock" is non-null then logout status was written and it has been supplied here. 
+        Note: all buffers supplied to callbacks are only valid for the duration of the callback.  
+        Also, you are not to modify the contents of any supplied buffer.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2LogoutCallback.
+	*/
+   
+    virtual void setLogoutCompletion( void * refCon, FWSBP2LogoutCallback completion );
+ 
+    /*!
+		@function setFetchAgentWriteCompletion
+		@abstract Sets the callback to be called when the fetch agent write completes.
+		@discussion When an immediate orb is executed with submitORB, it's address is written to a 
+        specific address on the device.  This address is called the fetch agent.  The device the 
+        reads that orb from the Mac's memory and executes it.  With this call you can register to 
+        be called back when this write to the fetch agent completes.  The SBP2 services guarantee 
+        that the fetch agent write will be complete before status is reported for an ORB, so for 
+        most drivers this notification is not required.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2FetchAgentWriteCallback.
+	*/
+       
+	virtual void setFetchAgentWriteCompletion( void * refCon, FWSBP2FetchAgentWriteCallback completion );
+
+    /*!
+		@function setFetchAgentResetCompletion
+		@abstract Sets the callback to be called when a fetch agent reset completes.
+		@discussion The fetch agent state machine on the device can be reset by a write to a specific 
+        register.  The SBP2 services offer a utility method to reset the fetch agent.  You can register 
+        a callback routine here to be notified when this rest write completes.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2FetchAgentWriteCallback.
+	*/
+    
+    virtual void setFetchAgentResetCompletion( void * refCon, FWSBP2StatusCallback completion );
+
+    /*!
+		@function submitFetchAgentReset
+		@abstract Resets the LUN's fetch agent.
+		@discussion The fetch agent state machine on the device can be reset by a write to a specific 
+        register.  This reset can be intiated by a call to this method.  Notification of the completion 
+        of this write can be had by registering a callback with the setFetchAgentResetCompletion method.
+        @result Returns kIOReturnSuccess if the reset started successfully.
+	*/
+    
+	virtual IOReturn submitFetchAgentReset( void );
+
+    /*!
+		@function ringDoorbell
+		@abstract Rings the doorbell on the LUN.
+		@discussion Non-immediate appends to the ORB chain may require the fetch agent state machine 
+        to be notified of the new ORB's presence.  This is accomplished by writing to the so called 
+        doorbell register.  This method begins one of those writes.
+        @result Returns kIOReturnSuccess if the ring started successfully.
+	*/
+    
+ 	virtual IOReturn ringDoorbell( void );
+    
+    /*!
+		@function enableUnsolicitedStatus
+		@abstract Enables unsolicited status.
+		@discussion After unsolicited is sent the device will not send any additional unsolicited status 
+        until a specific register is written.  This serves as a sort of flow-control for unsolicited status.  
+        After unsolicited status is recieved and processed drivers will want to reenable the delivery 
+        of unsolicted status by a call to this method.
+        @result Returns kIOReturnSuccess if the status enable write started successfully.
+	*/
+        
+	virtual IOReturn enableUnsolicitedStatus( void );
+	
+    // accessors
+    
+    /*!
+		@function getMaxCommandBlockSize
+		@abstract Returns the maximum command block size.
+		@discussion The device publishes an upper limit on the size of command block that it can 
+        accept.  That value can be accessed via this method.
+        @result Returns a UInt32 containing the maximum command block size.
+	*/
+    
+    virtual UInt32 getMaxCommandBlockSize( void );
+    
+    /*!
+		@function getLoginID
+		@abstract Returns the current login ID.
+		@discussion When we successfully login to a device.  The device gives us a unique login id.  
+        This is used internally for reconnecting to the device after bus resets and for certain other 
+        management ORBs.  Most drivers are probably not interested in this value.
+        @result Returns a UInt32 containing the current login ID.
+	*/
+    
+    virtual UInt32 getLoginID( void );
+
+    /*!
+		@function setLoginFlags
+		@abstract Sets login configuration flags.
+		@discussion Configures the login behavior according to the provided flags.  Currently two 
+        flags are defined for this API.  kFWSBP2ExclusiveLogin sets the exclusive login bit in the 
+        login ORB. kFWSBP2DontSynchronizeMgmtAgent allows simultaneous logins or reconnects to LUNs
+        with a common management agent (ie LUNs in the same unit directory).
+        @param loginFlags the login configuration flags.
+	*/
+    
+    virtual void setLoginFlags( UInt32 loginFlags );
+    
+    /*!
+		@function getLoginFlags
+		@abstract Returns the currently set login flags.
+		@discussion Returns the current state of the login flags.  Currently there is only one
+        flag defined for this API.  kFWSBP2ExclusiveLogin indicates that the exclusive login bit
+        should be set in the login ORB.
+        @result Returns a UInt32 containing the currently set login flags.
+	*/
+    
+    virtual UInt32 getLoginFlags( void );
+
+    /*!
+		@function setReconnectTime
+		@abstract Sets the desired reconnect duration.
+		@discussion The target and initiator arbitrate the duration of the reconnect timeout.  Here 
+        the initiator specifies its desired timeout time in 2^reconnectTime seconds.  After a 
+        successful login the device returns the actual timeout value it wishes to use.  This value 
+        may be less than the reconnect timeout that the intiator specified if this is all that the 
+        device can support.
+        @param reconnectTime The desired reconnect timeout encoded as 2^reconnectTime seconds.
+	*/
+    
+    virtual void setReconnectTime( UInt32 reconnectTime );
+    
+    /*!
+		@function getReconnectTime
+		@abstract Returns the currently set reconnect time.
+		@discussion Returns the currently desired initiator reconnect time encoded as 2^time seconds.
+        @result Returns a UInt32 containing the currently set reconnect time.
+	*/
+    
+    virtual UInt32 getReconnectTime( void );
+
+    /*!
+		@function setMaxPayloadSize
+		@abstract Sets the maximum data transfer length for a normal command ORB.
+		@discussion Sets the maximum data transfer length for a normal command ORB.  This value is 
+        the maximum for all ORBs sent to this LUN.  This can be trimmed further on an ORB by ORB basis, 
+        by a similar call in the IOFireWireSBP2ORB itself.
+        @param reconnectTime The desired maximum payload size in bytes.
+	*/
+    
+    virtual void setMaxPayloadSize( UInt32 maxPayloadSize );
+    
+    /*!
+		@function getMaxPayloadSize
+		@abstract Returns the currently set maximum payload size.
+		@discussion Returns the currently global maximum payload size in bytes.
+        @result Returns a UInt32 containing the currently set maximum payload size.
+	*/
+
+    virtual UInt32 getMaxPayloadSize( void );
+
+    /*!
+		@function setPassword
+		@abstract Sets the login password.
+		@discussion Sets the login password using a buffer and a length.  An alternate version exists 
+        that accepts an IOMemoryDescriptor.  If the password length is 8 or less the password is copied 
+        directly into the login orb.  If the length is greater than 8 the buffer is referenced by address 
+        in the login ORB.  In this case the buffer is not copied and should remain allocated for the 
+        duration of the login attempt.
+        @param buf a pointer to the password buffer.
+        @param len the length in bytes of the password buffer.
+        @result Returns kIOReturnSuccess on success.
+	*/
+
+    virtual IOReturn setPassword( void * buf, UInt32 len );
+
+    /*!
+		@function setPassword
+		@abstract Sets the login password.
+		@discussion Sets the login password using an IOMemoryDescriptor.  An alternate version exists 
+        that accepts a buffer and a length.  If the password length is 8 or less the password is copied 
+        directly into the login orb.  If the length is greater than 8 the buffer is referenced by address 
+        in the login ORB.
+        @param memory an IOMemoryDescriptor referencing the password.
+        @result Returns kIOReturnSuccess on success.
+	*/
+    
+    virtual IOReturn setPassword( IOMemoryDescriptor * memory );
+
+
+    /*!
+		@function setRefCon
+		@abstract Sets the login refCon.
+		@discussion Sets a user defined value on the login that can be retrieved later with the 
+        method getRefCon.
+        @param refCon a user defined value.
+    */
+    
+    virtual void setRefCon( void * refCon );
+    
+    /*!
+		@function getRefCon
+		@abstract Returns the refCon set with setRefCon.
+		@discussion Returns the user defined value previously stored in the login with setRefCon.
+        @result Returns the previously stored user defined value.
+	*/
+    
+    virtual void * getRefCon( void );
+	
+    /*!
+		@function setBusyTimeoutRegisterValue
+		@abstract Sets the value to be written to the BUSY_TIMEOUT register.
+		@discussion 1394-1995 defines a register known as the BUSY_TIMEOUT register. This register 
+        controls the busy retry behavior of your device.  The initial value for this register is 
+        0x00000000.  Which means busied transactions will not be retried.  Since most devices want 
+        their transactions retired on busy acks, the SBP2 service automatically updates the 
+        BUSY_TIMEOUT register with the value specified here whenever necessary.  Most drivers should 
+        set this value to 0x0000000f.
+        @param timeout desired value of the BUSY_TIMEOUT register.
+    */
+    
+	virtual void setBusyTimeoutRegisterValue( UInt32 timeout );
+    
+protected:
+
+    virtual void startORBTimer( IOFireWireSBP2ORB * orb );
+    virtual void prepareORBForExecution( IOFireWireSBP2ORB * orb );
+
+    static IOReturn staticExecuteORB( OSObject *self, void * orb, void *, void *, void * );
+    virtual IOReturn executeORB( IOFireWireSBP2ORB * orb );
+
+public:
+
+    /*! 
+        @function release
+        @abstract Primary implementation of the release mechanism.
+        @discussion See OSObject.h for more information.  When retainCount == when then call free(). 
+    */
+    
+    virtual void release() const;
+	
+	/*! 
+        @function setLoginRetryCountAndDelayTime
+        @abstract Sets login retry behavior.
+        @discussion Sets login retry behavior.
+        @param retryCount number of times to retry logins
+		@param uSecs delay time in microseconds between login retries
+    */
+	
+	virtual void setLoginRetryCountAndDelayTime( UInt32 retryCount, UInt32 uSecs );
+	
+protected:
+	virtual IOReturn initialExecuteLogin( void );
+	virtual void startLoginRetryTimer( void );
+	virtual void stopLoginRetryTimer( void );
+	static void loginRetryTimeoutStatic( void *refcon, IOReturn status,
+										 IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+	virtual void loginRetryTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd);
+
+	virtual void startReconnectRetryTimer( void );
+	virtual void stopReconnectRetryTimer( void );
+	static void reconnectRetryTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+	virtual void reconnectRetryTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+
+	virtual bool isORBAppended( IOFireWireSBP2ORB * orb );
+	virtual void setORBIsAppended( IOFireWireSBP2ORB * orb, bool state );
+
+public:    
+	virtual void setAddressLoForLoginORBAndResponse( UInt32 addressLoORB, UInt32 addresLoResponse );
+	
+	virtual void setLoginGeneration( UInt32 generation );
+	virtual void clearLoginGeneration( void );
+
+protected:
+	void startFetchAgentRetryTimer( UInt32 duration );
+	void stopFetchAgentRetryTimer( void );
+	static void fetchAgentRetryTimerStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+	void fetchAgentRetryTimer( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+	
+	void terminateNotify( void );
+	void processLoginWrite( void );
+
+public:
+	
+	bool	isPhysicalAccessEnabled( void );
+	UInt32	getARDMMax( void );
+	
+private:
+    
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 8);
+
+ };
+
+#endif
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ManagementORB.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ManagementORB.h.svn-base
new file mode 100644
index 0000000..9455383
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ManagementORB.h.svn-base
@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOFireWireSBP2ManagementORB
+  Contains the class definition for IOFireWireSBP2ManagementORB.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2MANAGEMENTORB_H
+#define _IOKIT_IOFIREWIRESBP2MANAGEMENTORB_H
+
+#include <IOKit/firewire/IOFWCommand.h>
+#include <IOKit/firewire/IOFireWireUnit.h>
+
+#include <IOKit/IOUserClient.h>
+
+class IOFireWireSBP2LUN;
+class IOFireWireSBP2ManagementORB;
+class IOFireWireSBP2ORB;
+
+enum
+{
+    kFWSBP2QueryLogins			= 1,
+    kFWSBP2AbortTask			= 0xb,
+    kFWSBP2AbortTaskSet			= 0xc,
+    kFWSBP2LogicalUnitReset		= 0xe,
+    kFWSBP2TargetReset			= 0xf
+};
+
+// Callback when management command completes asynchronously
+
+/*! 
+    @typedef FWSBP2ManagementCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param status Indicates success or failure of operation. 
+    @param orb Indicates current orb status is for.
+*/
+
+typedef void (*FWSBP2ManagementCallback)(void * refCon, IOReturn status, IOFireWireSBP2ManagementORB * orb);
+
+/*!
+    @class IOFireWireSBP2ManagementORB
+    @abstract Supplies non login related management ORBs.  Management ORBs can be executed independent 
+    of a login, if necessary.  Management ORBs are created using the IOFireWireSBP2LUN interface.
+*/
+
+class IOFireWireSBP2ManagementORB : public IOFWCommand
+{
+    OSDeclareDefaultStructors( IOFireWireSBP2ManagementORB )
+
+	friend class IOFireWireSBP2LUN;
+	friend class IOFireWireSBP2UserClient;
+	
+protected:
+
+	////////////////////////////////////////            
+    // rom keys
+	
+    enum
+    {
+        kUnitCharacteristicsKey 	= 0x3A,
+        kManagementAgentOffsetKey	= 0x54
+    };
+
+	////////////////////////////////////////        
+	// structs
+	
+    typedef struct
+    {
+        UInt32		orbOffsetHi;
+        UInt32		orbOffsetLo;
+        UInt32		reserved1[2];
+        UInt16		options;
+        UInt16		loginID;
+        UInt32		reserved2;
+        UInt32		statusFIFOAddressHi;
+        UInt32		statusFIFOAddressLo;
+    } FWSBP2TaskManagementORB;
+
+    typedef struct
+    {
+        UInt32		reserved1[2];
+        UInt32		queryResponseAddressHi;
+        UInt32		queryResponseAddressLo;
+        UInt16		options;
+        UInt16		lun;
+        UInt16		reserved2;
+        UInt16		queryResponseLength;
+        UInt32		statusFIFOAddressHi;
+        UInt32		statusFIFOAddressLo;
+    } FWSBP2QueryLoginsORB;
+    
+    typedef struct
+    {
+        UInt8		details;
+        UInt8		sbpStatus;
+        UInt16		orbOffsetHi;
+        UInt32		orbOffsetLo;
+        UInt32		status[6];
+    } FWSBP2StatusBlock;
+
+protected:
+
+	////////////////////////////////////////        
+	// friend methods
+	
+    // IOFireWireSBP2LUN methods
+    virtual bool initWithLUN( 	IOFireWireSBP2LUN * lun, 
+								void * refCon,
+								FWSBP2ManagementCallback completion  );
+	
+	// IOFireWireSBP2UserClient methods
+    virtual void setAsyncCallbackReference( void * asyncRef );
+    virtual void getAsyncCallbackReference( void * asyncRef );
+
+protected:
+   
+    // reserved for future use
+    struct ExpansionData 
+	{
+		bool fInCriticalSection; 
+	};
+    ExpansionData * fExpansionData; 
+         
+    IOFireWireSBP2LUN * 		fLUN;
+    IOFireWireUnit *			fUnit;
+    
+    UInt32						fManagementOffset;
+    UInt32						fManagementTimeout;
+    UInt32						fFunction;
+    OSObject * 					fManageeCommand;
+    
+	// our orb
+    FWSBP2TaskManagementORB		fManagementORB;
+    IOFWAddressSpace *			fManagementORBAddressSpace;
+    FWAddress					fManagementORBAddress;
+
+	// command to write management agent
+    IOFWWriteCommand *			fWriteCommand;
+    IOMemoryDescriptor *		fWriteCommandMemory;
+
+	// timeout
+    IOFWCommand *				fTimeoutCommand;
+    bool						fTimeoutTimerSet;
+
+	// status block
+    FWSBP2StatusBlock			fStatusBlock;
+    IOFWAddressSpace *			fStatusBlockAddressSpace;
+    FWAddress					fStatusBlockAddress;
+
+	// response buffer
+    void *						fResponseBuf;
+    UInt32						fResponseLen;
+    IOFWAddressSpace *			fResponseAddressSpace;
+    FWAddress					fResponseAddress;
+
+	// competion routine
+	FWSBP2ManagementCallback	fCompletionCallback;
+    void * 						fCompletionRefCon;
+
+    // for user client
+    OSAsyncReference64			fCallbackAsyncRef;
+	
+	IOMemoryMap *				fResponseMap;
+	
+	bool						fCompleting;
+	
+	////////////////////////////////////////        
+
+    // init / destroy
+    virtual IOReturn getUnitInformation( void );
+    virtual IOReturn allocateResources( void );
+    virtual void free( void );
+        
+    // command execution
+    virtual IOReturn execute( void );
+    virtual IOReturn complete( IOReturn state );
+
+    // write complete handler
+    static void writeCompleteStatic( 	void *refcon, 
+										IOReturn status, 
+										IOFireWireNub *device, 
+										IOFWCommand *fwCmd );
+    virtual void writeComplete( IOReturn status, 
+								IOFireWireNub *device, 
+								IOFWCommand *fwCmd );
+
+    // timeout handler
+    static void handleTimeoutStatic( 	void *refcon, 
+										IOReturn status, 
+										IOFireWireBus *bus, 
+										IOFWBusCommand *fwCmd );
+    virtual void handleTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+
+    // status block write handler
+    static UInt32 statusBlockWriteStatic( 	void *refcon, 
+											UInt16 nodeID, 
+											IOFWSpeed &speed, 
+											FWAddress addr, 
+											UInt32 len,
+											const void *buf, 
+											IOFWRequestRefCon lockRead );
+    virtual UInt32 statusBlockWrite( 	UInt16 nodeID, 
+										FWAddress addr, 
+										UInt32 len, 
+										const void *buf, 
+										IOFWRequestRefCon lockRead );
+
+	// IOFireWireSBP2LUN friend class wrappers
+	virtual void clearAllTasksInSet( void );
+	virtual void removeManagementORB( IOFireWireSBP2ManagementORB * orb );
+	
+public:
+    
+	////////////////////////////////////////        
+    // client methods
+
+    /*!
+		@function setCommandFunction
+		@abstract Sets the function of the management ORB.
+		@discussion Sets the the function of the management ORB.  Legal values are kFWSBP2QueryLogins,
+        kFWSBP2AbortTask, kFWSBP2AbortTaskSet,  kFWSBP2LogicalUnitReset, and kFWSBP2TargetReset.
+        @param function a value indicating the desired management function.
+        @result Returns kIOReturnSuccess if function was a legal function.
+	*/
+    	
+    virtual IOReturn setCommandFunction( UInt32 function );
+    
+    /*!
+		@function getCommandFunction
+		@abstract Returns the current function of the management ORB.
+		@discussion Returns the function of the management ORB.  This is the same value that was 
+        set with setCommandFunction.
+        @result Returns the function of the management ORB.
+	*/
+    
+    virtual UInt32 getCommandFunction( void );
+
+    /*!
+		@function setManageeCommand
+		@abstract Sets the command to be managed by the management ORB.
+		@discussion All management functions except kFWSBP2QueryLogins require a reference to an ORB of 
+        some sort.  kFWSBP2AbortTaskSet,  kFWSBP2LogicalUnitReset, and kFWSBP2TargetReset require a 
+        reference to the login ORB.  kFWSBP2AbortTask requires a reference to the ORB to be aborted.  
+        This method allows you to set the ORB to be managed.
+        @param command a reference to an IOFireWireSBP2Login or an IOFireWireSBP2ORB.
+ 	*/
+    
+    virtual void setManageeCommand( OSObject * command );
+    
+    /*!
+		@function getCommandFunction
+		@abstract Returns the current managee command of the management ORB.
+		@discussion Returns the current managee command of the management ORB.  This is the same value that was 
+        set with setManageeCommand.
+        @result  Returns the current managee command of the management ORB.
+	*/
+    
+    virtual OSObject* getManageeCommand( void );
+
+    /*!
+		@function setResponseBuffer
+		@abstract Sets the response buffer for the management ORB.
+		@discussion Sets the response buffer for the management ORB.  kFWSBP2QueryLogins returns 
+        a response to its query and needs to write it somewhere.  This routine allows you to 
+        specify the location.
+        @param desc memory descriptor for buffer.
+        @result Returns kIOReturnSuccess on a success.
+	*/
+    
+	virtual IOReturn setResponseBuffer( IOMemoryDescriptor * desc );
+    
+    /*!
+		@function setResponseBuffer
+		@abstract Sets the response buffer for the management ORB.
+		@discussion Sets the response buffer for the management ORB.  kFWSBP2QueryLogins returns 
+        a response to its query and needs to write it somewhere.  This routine allows you to 
+        specify the location.        
+        @param buf backing store for buffer
+        @param len length of buffer.
+        @result Returns kIOReturnSuccess on a success.
+	*/
+    
+    virtual IOReturn setResponseBuffer( void * buf, UInt32 len );
+    
+    /*!
+		@function getResponseBuffer
+		@abstract Returns the response buffer for the management ORB.
+		@discussion Returns the response buffer set in setResponseBuffer above        
+        @param desc memory descriptor for buffer.
+        @param buf output parameter for backing store for buffer
+        @param len output parameter for length of buffer.
+	*/
+    
+    virtual void getResponseBuffer( void ** buf, UInt32 * len );
+
+    /*! 
+        @function release
+        @abstract Primary implementation of the release mechanism.
+        @discussion See OSObject.h for more information. 
+        @param when When retainCount == when then call free(). 
+    */
+    
+	virtual void release() const;
+
+protected:
+
+	virtual void setORBToDummy( IOFireWireSBP2ORB * orb );
+
+	virtual void suspendedNotify();
+
+private:
+
+    OSMetaClassDeclareReservedUsed(IOFireWireSBP2ManagementORB, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 8);
+    
+};
+
+#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ORB.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ORB.h.svn-base
new file mode 100644
index 0000000..5c11593
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ORB.h.svn-base
@@ -0,0 +1,547 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOFireWireSBP2ORB
+  Contains the class definition for IOFireWireSBP2ORB.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2ORB_H
+#define _IOKIT_IOFIREWIRESBP2ORB_H
+
+#include <IOKit/firewire/IOFireWireUnit.h>
+
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/IOUserClient.h>
+#include <IOKit/IODMACommand.h>
+
+enum
+{
+    kFWSBP2ConstraintForceDoubleBuffer		= (1 << 0)
+};
+
+// login option flags
+enum
+{
+    kFWSBP2CommandCompleteNotify			= (1 << 0),
+    kFWSBP2CommandTransferDataFromTarget	= (1 << 1),
+    kFWSBP2CommandImmediate					= (1 << 2),
+    
+    kFWSBP2CommandNormalORB					= (1 << 5),
+    kFWSBP2CommandReservedORB				= (1 << 6),
+    kFWSBP2CommandVendorORB					= (1 << 7),
+    kFWSBP2CommandDummyORB					= (1 << 8),
+    kFWSBP2CommandCheckGeneration			= (1 << 9),
+	
+	kFWSBP2CommandFixedSize					= (1 << 10),
+	kFWSBP2CommandVirtualORBs				= (1 << 11)     // handy for debugging
+};
+
+enum
+{
+    kFWSBP2MaxPageClusterSize = 0xf000
+};
+
+class IOFireWireSBP2ORB;
+class IOFireWireSBP2LUN;
+class IOFireWireSBP2Login;
+
+/*!
+    @class IOFireWireSBP2ORB
+    @abstract Represents an SBP2 normal command ORB.  Supplies the APIs for configuring normal
+    command ORBs.  This includes setting the command block and writing the page tables for I/O.
+    The ORBs are executed using the submitORB method in IOFireWireSBP2Login.
+*/
+
+class IOFireWireSBP2ORB : public IOCommand
+{
+    OSDeclareDefaultStructors( IOFireWireSBP2ORB )
+
+	friend class IOFireWireSBP2Login;
+	friend class IOFireWireSBP2ManagementORB;
+	
+protected:
+    
+    typedef struct
+    {
+        UInt32		nextORBAddressHi;
+        UInt32		nextORBAddressLo;
+        UInt32		dataDescriptorHi;
+        UInt32		dataDescriptorLo;
+        UInt16		options;
+        UInt16		dataSize;
+        UInt32		commandBlock[1];  // will be variable sized
+     } FWSBP2ORB;
+
+    typedef struct
+    {
+        UInt16		segmentLength;
+        UInt16		segmentBaseAddressHi;
+        UInt32		segmentBaseAddressLo;
+    } FWSBP2PTE;
+
+private:
+
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 8);
+
+protected:    
+
+    virtual void deallocateBufferAddressSpace( void );
+    virtual IOReturn allocateTimer( void );
+    virtual void deallocateTimer( void );
+    
+    /*!
+		@function deallocatePageTable
+		@abstract Frees up memory allocated for the page table.
+		@discussion	Frees all memory associated with the page table.  Undoes what allocatePageTable does. 
+        Calling allocatePageTable again will automatically deallocate the existing page table before 
+        allocating a new one, so this method is not used in most cases.
+	*/
+    
+    virtual void deallocatePageTable( void );
+
+protected:
+	
+    // IOFireWireSBP2Login methods
+	virtual bool initWithLogin( IOFireWireSBP2Login * login );
+    virtual void setNextORBAddress( FWAddress address );
+
+public:
+
+    /*!
+		@function allocatePageTable
+		@abstract Allocates memory for the page table.
+		@discussion	Page table allocation is handle automatically by the ORB, except if the 
+        kFWSBP2CommandFixedSize flags is set.  In this case we will fail to write a page table if we 
+        need more page table space than we have already.  This method is exposed so these drivers 
+        can preallocate as much page table as they need.  This is useful if your driver is part of 
+        the paging path and cannot allow allocations to occur.
+        @param entryCount number of entries of page table to be allocated.
+	*/
+
+    virtual IOReturn allocatePageTable( UInt32 entryCount );
+
+protected:
+
+    virtual bool isTimerSet( void );
+    virtual void cancelTimer( void );
+    
+protected:
+  
+    // reserved for future use
+    struct ExpansionData { };
+    ExpansionData *reserved; 
+       
+    IOFireWireSBP2Login *	fLogin;
+    IOFireWireSBP2LUN * 	fLUN;
+    IOFireWireUnit *		fUnit;
+    IOFireWireController *	fControl;
+    IODMACommand *			fDMACommand;
+	void *					fUnused2;
+	
+    UInt32			fCommandFlags;
+    UInt32			fMaxPayloadSize;
+    UInt32			fTimeoutDuration;
+    UInt32			fGeneration;
+    UInt64			fRefCon;
+
+	//
+    // orb
+    //
+	
+	IOMemoryDescriptor *		fORBDescriptor;
+    FWSBP2ORB *					fORBBuffer;
+	
+    FWAddress 					fORBPseudoAddress;
+    IOFWAddressSpace *			fORBPseudoAddressSpace;
+
+    IOFWAddressSpace *			fORBPhysicalAddressSpace;
+	FWAddress					fORBPhysicalAddress;
+
+	//
+    // page table
+    //
+	
+	UInt32						fPageTableSize;
+    IOBufferMemoryDescriptor *	fPageTableDescriptor;
+
+    IOFWAddressSpace *			fPageTablePhysicalAddressSpace;
+	FWAddress					fPageTablePhysicalAddress;
+	UInt32						fPageTablePhysicalLength;
+	
+	IOFWAddressSpace *			fPageTablePseudoAddressSpace;   
+	FWAddress					fPageTablePseudoAddress;
+
+	//
+    // buffers
+    //
+	
+	IOFWAddressSpace *		fBufferAddressSpace;
+    bool					fBufferAddressSpaceAllocated;
+    IOMemoryDescriptor *	fBufferDescriptor;
+    
+	//
+    // timer
+    //
+	
+	IOFWDelayCommand *		fTimeoutCommand;
+    bool					fTimeoutTimerSet;
+
+	bool					fInProgress;
+	bool					fIsAppended;
+	
+    UInt32					fFetchAgentWriteRetries;
+    UInt32					fPTECount;
+    UInt32					fFetchAgentWriteRetryInterval;
+
+	UInt32					fConstraintOptions;
+
+    virtual IOReturn allocateResources( void );
+    virtual void free( void );
+
+    // orb timeout handler
+    static void orbTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+    virtual void orbTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+
+	// login friend class wrappers
+	virtual IOFireWireUnit * getFireWireUnit( void );
+	virtual IOFireWireSBP2LUN * getFireWireLUN( void );
+  	virtual void deallocateORB( void );
+	virtual IOReturn allocateORB( UInt32 orbSize );
+    virtual IOReturn removeORB( IOFireWireSBP2ORB * orb );
+    virtual void prepareORBForExecution( void );
+    virtual void startTimer( void );
+    virtual void sendTimeoutNotification( IOFireWireSBP2ORB * orb );
+
+public:
+ 
+    /*! 
+        @function release
+        @abstract Primary implementation of the release mechanism.
+        @discussion See OSObject.h for more information. 
+        @param when When retainCount == when then call free(). 
+    */
+       
+	virtual void release() const;
+
+    /*! 
+        @function getLogin
+        @abstract Gets the login associated with this ORB.
+        @discussion Returns the IOFireWireSBP2Login object associated with this ORB.
+        @result Returns a pointer to an IOFireWireSBP2Login. 
+    */
+    
+    virtual IOFireWireSBP2Login * getLogin( void );
+
+    /*! 
+        @function setCommandBuffersAsRanges
+        @abstract Creates a page table from a list of ranges.
+        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
+        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
+        The SBP2 services do not release references to the command buffers just because the command 
+        has completed.
+        @param ranges An array of ranges representing the data to be transfered.
+        @param withCount The number of ranges in the ranges array.
+        @param withDirection An IODirection indicating the direction of data transfer.
+        @param withTask The task that these adressses reside in.
+        @param offset Offset in bytes into data to begin writing table at.
+        @param length Number of bytes of data to map from offset.
+        @result Returns KIOReturnSuccess if the page table was written successfully. 
+    */
+    
+    virtual IOReturn setCommandBuffersAsRanges(  IOVirtualRange * ranges,
+                                                 UInt32           withCount,
+                                                 IODirection      withDirection,
+                                                 task_t           withTask,
+                                                 UInt32		offset = 0,
+                                                 UInt32		length = 0 );
+    /*! 
+        @function setCommandBuffersAsRanges
+        @abstract Creates a page table from a list of ranges.
+        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
+        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
+        The SBP2 services do not release references to the command buffers just because the command 
+        has completed.
+        @param memoryDescriptor IOMemoryDescriptor describe ranges to be written to a page table.
+        @param offset Offset in bytes into data to begin writing table at.
+        @param length Number of bytes of data to map from offset.
+        @result Returns KIOReturnSuccess if the page table was written successfully. 
+    */
+    
+    virtual IOReturn setCommandBuffers( IOMemoryDescriptor * memoryDescriptor, UInt32 offset = 0, 
+																				UInt32 length = 0 );
+
+
+    /*! 
+        @function releaseCommandBuffers
+        @abstract Releases SBP2's reference to the command buffers.
+        @discussion When you create a page table with one of the variants of setCommandBuffers.  
+        SBP2 holds on to a reference to the buffers until this method is called.  This means that 
+        if a command completed and you manipulated the memory descriptor or released the buffers 
+        without calling this method you could leave FW in an inconsistent state.  
+        @result Returns KIOReturnSuccess if the page table was cleared successfully. 
+    */
+
+    virtual IOReturn releaseCommandBuffers( void );
+    
+    /*! 
+        @function setCommandBlock
+        @abstract Sets the command block portion of the ORB.
+        @discussion Copys the data provided in the buffer to the command block portion of the ORB.
+        @param buffer Pointer to buffer to copy command block from.
+        @param length Number of bytes of data to copy.
+        @result Returns KIOReturnSuccess if the command block was updated successfully. 
+    */
+    
+    virtual IOReturn setCommandBlock( void * buffer, UInt32 length );
+    
+    /*! 
+        @function setCommandBlock
+        @abstract Sets the command block portion of the ORB.
+        @discussion Copys the data provided in the buffer to the command block portion of the ORB.
+        @param memory IOMemoryDescriptor representing the command block buffer.
+        @result Returns KIOReturnSuccess if the command block was updated successfully. 
+    */
+    
+    virtual IOReturn setCommandBlock( IOMemoryDescriptor * memory );
+    
+    /*! 
+        @function getCommandBufferDescriptor
+        @abstract Returns the memory descriptor representing the command buffer.
+        @discussion Returns the IOMemoryDescriptor for the data mapped by setCommandBuffer variants.  
+        Works for setCommandBuffersAsRanges too.
+        @result Returns memory descriptor representing mapped data buffers. 
+    */
+    
+	virtual IOMemoryDescriptor * getCommandBufferDescriptor( void );
+	
+    // accessors
+    
+    /*! 
+        @function setCommandFlags
+        @abstract Sets configuration flags for the ORB.
+        @discussion Sets the configuration flags for the ORB.  These can be any of the following:
+		<p>kFWSBP2CommandCompleteNotify - Set the notify bit as specified in SBP2 standard. Set to receive completion/timeout notification on this ORB.  You almost always want to set this.</p>
+		<p>kFWSBP2CommandTransferDataFromTarget - Transfer direction as specified in SBP2 standard.  Set if data is to be written by the device into the host's memory.</p>
+		<p>kFWSBP2CommandImmediate - Immediate Append.  ORB address will be written to fetch agent and not chained.  It is only legal to have one immediate ORB in progress at a time.</p>
+		<p>kFWSBP2CommandNormalORB - ORB format 0 - Format specified by SBP2 standard.  Set this for most ORBs.</p>
+		<p>kFWSBP2CommandReservedORB - ORB format 1 - Format reserved by SBP2 standard for future standardization.</p>
+		<p>kFWSBP2CommandVendorORB - ORB format 2 - Format specified by SBP2 standard for vendor dependent ORBs.</p>
+		<p>kFWSBP2CommandDummyORB - ORB format 3 - Format specified by SBP2 standard for dummy ORBs.</p>
+		<p>kFWSBP2CommandCheckGeneration - If set upon submitORB, the ORB will only be appended if generation set with setCommandGeneration() matches the current generation.  Pretty much all SBP2 drivers need sophisticated logic to track login state, so this is generally not used. </p>
+		<p>kFWSBP2CommandFixedSize - Do not allocate more memory for page table if needed.  If there is not enough space in the currently allocated page table, the setCommandBuffers call will fail.  This is important to set if your device is the backing store, as we don't want to cause memory allocations on the paging path. </p>
+		<p>kFWSBP2CommandVirtualORBs - Normally ORBs are backed by physical address spaces.  Setting this flag makes this ORB backed by a pseudo address space.  This can make ORBs easier to see in a bus trace.  Virtual ORBs will have an address in the form of ffcX.XXXX.0000.0000.  Pseudo address space backed ORBs are slower, so you won't want to set for deployment builds.</p>
+        @param flags The flags to be set.
+    */
+    
+    virtual void setCommandFlags( UInt32 flags );
+
+    /*! 
+        @function getCommandFlags
+        @abstract Sets configuration flags for the ORB.
+        @discussion Returns the current configuration flags set on this ORB.
+        @result Return The current ORB flags.
+    */
+    
+    virtual UInt32 getCommandFlags( void );
+
+    /*! 
+        @function setMaxPayloadSize
+        @abstract Sets max payload size for the ORB.
+        @discussion This sets the maximum payload size for this ORB only.  This size is clipped by 
+        the global max payload size set in the login object.
+        @param maxPayloadSize The maximum payload size in bytes.
+    */
+    
+    virtual void setMaxPayloadSize( UInt32 maxPayloadSize );
+
+    /*! 
+        @function getMaxPayloadSize
+        @abstract Gets max payload size for the ORB.
+        @discussion This gets the maximum payload size for this ORB only.
+        @result Returns the maximum payload size in bytes.
+    */
+    
+    virtual UInt32 getMaxPayloadSize( void );
+
+    /*! 
+        @function setCommandTimeout
+        @abstract Sets the timeout of the ORB.
+        @discussion This sets the timeout for the ORB in milliseconds. Note that ORBs without timeouts 
+        can be "lost."  You will obviously not recieve timeout notification for timeouts of zero.  But 
+        perhaps less obviously you will not recieve orb reset notification, which is really a sort of
+        accelerated timeout notification for bus reset situations.  
+        @param timeout The timeout duration in milliseconds.
+    */
+    
+    virtual void setCommandTimeout( UInt32 timeout );
+    
+    /*! 
+        @function getCommandTimeout
+        @abstract Gets the timeout of the ORB.
+        @discussion This method gets the timeout for this ORB in milliseconds.
+        @result Returns the timeout for the orb in milliseconds.
+    */
+    
+    virtual UInt32 getCommandTimeout( void );
+
+
+    /*! 
+        @function setCommandGeneration
+        @abstract Sets the command generation.
+        @discussion This sets the bus generation this ORB should be appended in.  It is only meaningful 
+        when combined with the kFWSBP2CommandCheckGeneration flags above.
+        @param gen The bus generation for command execution.
+    */
+    
+    virtual void setCommandGeneration( UInt32 gen );
+    
+    /*! 
+        @function getCommandGeneration
+        @abstract Gets the command generation.
+        @discussion This gets the bus generation this ORB should be appended in.
+        @result Returns the bus generation for command execution.
+    */
+    
+    virtual UInt32 getCommandGeneration( void );
+
+    /*!
+		@function setRefCon
+		@abstract Sets the ORB refCon.
+		@discussion Sets a user defined value on the ORB that can be retrieved later with the 
+        method getRefCon.
+        @param refCon a user defined value.
+    */
+    
+    virtual void setRefCon( void * refCon );
+
+    /*!
+		@function getRefCon
+		@abstract Returns the refCon set with setRefCon.
+		@discussion Returns the user defined value previously stored in the ORB with setRefCon.
+        @result Returns the previously stored user defined value.
+	*/
+    
+    virtual void * getRefCon( void );
+
+protected:    
+
+    virtual void setToDummy( void );
+
+public:	
+    /*!
+		@function getORBAddress
+		@abstract Returns the FireWire address of this ORB.
+		@discussion Returns the FireWire bus address of this ORB.  This is not the same as the Macintosh 
+        address for the IOFireWireSBP2ORB.
+        @result Returns the FireWire address of this ORB.
+	*/
+    
+    virtual void getORBAddress( FWAddress * address );
+
+protected:
+	
+	virtual bool isAppended( void );
+	virtual void setIsAppended( bool state );
+	virtual UInt32 getFetchAgentWriteRetries( void );
+    virtual void setFetchAgentWriteRetries( UInt32 retries );
+
+    virtual void prepareFastStartPacket( IOBufferMemoryDescriptor * descriptor );
+
+	UInt32 getFetchAgentWriteRetryInterval( void );
+    void setFetchAgentWriteRetryInterval( UInt32 interval );
+
+	IOReturn completeBufferAddressSpace( void );
+	IOReturn prepareBufferAddressSpace( IOMemoryDescriptor * memoryDescriptor );
+
+public:
+
+    /*!
+		@function setBufferConstraints
+		@abstract Configures page table generation parameters
+		@discussion Sets the maximums size of any page table segment and the required alignemnt.  Double buffering
+		may be used to satisfy these constraints. The only supported option is kFWSBP2ConstraintForceDoubleBuffer which
+		forces a page aligned double buffering of the entire descriptor.
+        @result May return an error if there is a problem allocating the underlying resources or if buffers are currently attached.
+	*/
+
+	IOReturn setBufferConstraints( UInt64 maxSegmentSize, UInt32 alignment, UInt32 options = 0);
+
+
+    /*! 
+        @function setCommandBuffersAsRanges64
+        @abstract Creates a page table from a list of 64 bit ranges.
+        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
+        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
+        The SBP2 services do not release references to the command buffers just because the command 
+        has completed. This is a 64 bit compatible version of setCommandBuffersAsRanges.
+        @param ranges An array of ranges representing the data to be transfered.
+        @param withCount The number of ranges in the ranges array.
+        @param withDirection An IODirection indicating the direction of data transfer.
+        @param withTask The task that these adressses reside in.
+        @param offset Offset in bytes into data to begin writing table at.
+        @param length Number of bytes of data to map from offset.
+        @result Returns KIOReturnSuccess if the page table was written successfully. 
+    */
+	   
+    IOReturn setCommandBuffersAsRanges64(	IOAddressRange *	ranges,
+											uint64_t			withCount,
+											IODirection			withDirection,
+											task_t				withTask,
+											uint64_t			offset = 0,
+											uint64_t			length = 0);
+
+    /*!
+		@function setRefCon64
+		@abstract Sets the ORB refCon as a 64 bit value.
+		@discussion Sets a user defined value on the ORB that can be retrieved later with the 
+        method getRefCon.
+        @param refCon a user defined value.
+    */
+    
+    virtual void setRefCon64( UInt64 refCon );
+
+    /*!
+		@function getRefCon64
+		@abstract Returns the 64 bit refCon set with setRefCon64.
+		@discussion Returns the user defined value previously stored in the ORB with setRefCon.
+        @result Returns the previously stored user defined value.
+	*/
+    
+    virtual UInt64 getRefCon64( void );
+
+protected:
+	
+	UInt32	calculateTransferSizeLog( bool * clipping );
+
+
+};
+    
+#endif
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Target.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Target.h.svn-base
new file mode 100644
index 0000000..4288ce9
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Target.h.svn-base
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOFireWireSBP2Target
+  Contains the class definition for IOFireWireSBP2Target.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2TARGET_H
+#define _IOKIT_IOFIREWIRESBP2TARGET_H
+
+#include <IOKit/firewire/IOFireWireUnit.h>
+#include <IOKit/IOService.h>
+
+enum
+{
+    kIOFWSBP2FailsOnAckBusy = (1 << 0),
+	kIOFWSBP2FailsOnBusResetsDuringIO = (1 << 1),
+	kIOFWSBP2DontUsePTPacketLimit = (1 << 2)
+};
+
+/*!
+    @class IOFireWireSBP2Target
+    @abstract Serves as bridge between IOFireWireUnit and IOFireWireLUN.
+    @discussion Matches against IOFireWireUnits supporting the SBP2 protocol.  Creates IOFireWireSBP2LUN nubs 	for matching. Most drivers will match against an IOFireWireSBP2LUN, but matching against an 	IOFireWireSBP2Target is also supported. This can be useful in cases where a single driver wishes to 
+    control all LUNs on a device. Support for this technique is minimal, however, and the driver will be
+    required to discover it's LUNs through the registry.
+*/
+
+class IOFireWireSBP2Target : public IOService
+{
+    OSDeclareDefaultStructors(IOFireWireSBP2Target);
+
+protected:
+	
+	/////////////////////////////////////////
+    // rom keys
+	
+    enum
+    {
+        kCmdSpecIDKey 				= 0x38,
+        kCmdSetKey					= 0x39,
+        kSoftwareRevKey				= 0x3b,
+        kFirmwareRevKey	 			= 0x3c,
+        kLUNKey						= 0x14,
+        kLUNDirectoryKey			= 0xd4,
+        kManagementAgentOffsetKey	= 0x54,
+		kUnitCharacteristicsKey 	= 0x3A,
+		kRevisionKey				= 0x21,
+		kFastStartKey				= 0x3E
+    };
+
+    typedef struct
+    {
+		UInt32 cmdSpecID; 
+		UInt32 cmdSet;
+		UInt32 vendorID;
+		UInt32 softwareRev;
+		UInt32 firmwareRev; 
+		UInt32 lun;
+		UInt32 devType;
+		UInt32 unitCharacteristics;
+		UInt32 managementOffset;
+		UInt32 revision;
+		bool fastStartSupported;
+		UInt32 fastStart;
+    } LUNInfo;
+	
+    // reserved for future use
+    struct ExpansionData 
+	{
+		bool				fStarted;
+		OSArray *			fPendingMgtAgentCommands ;
+		UInt32				fNumberPendingMgtAgentOrbs;
+		UInt32				fNumLUNs;
+	};
+    ExpansionData * fExpansionData; 
+    
+	/////////////////////////////////////////
+	// private fields
+	
+    bool 				fOpenFromTarget;
+    UInt32				fOpenFromLUNCount;    
+    IOFireWireUnit * 	fProviderUnit;
+    UInt32				fFlags;
+    
+	IOFireWireController * fControl;
+	
+	UInt32 				fIOCriticalSectionCount;
+	
+	/////////////////////////////////////////
+	// private internals
+
+    virtual void free( void );	
+    virtual IOReturn message( 	UInt32 type, 
+								IOService * provider,
+								void * argument = 0);
+    
+    virtual void scanForLUNs( void );
+    IOReturn createLUN( LUNInfo * info );
+
+public:
+
+	/////////////////////////////////////////
+	// public methods
+	
+	/*! @function handleOpen
+		@abstract Overrideable method to control the open / close behaviour of an IOService.
+		@discussion See IOService for discussion.		
+		@param forClient Designates the client of the provider requesting the open.
+		@param options Options for the open, may be interpreted by the implementor of handleOpen.
+		@result Return true if the open was successful, false otherwise. */
+
+    virtual bool handleOpen( IOService * forClient, IOOptionBits options, void * arg );
+	
+	/*! 
+		@function handleClose
+		@abstract Overrideable method to control the open / close behaviour of an IOService.
+		@discussion See IOService for discussion.
+		@param forClient Designates the client of the provider requesting the close.
+		@param options Options for the close, may be interpreted by the implementor of handleOpen. 
+	*/
+
+	virtual void handleClose( IOService * forClient, IOOptionBits options );
+
+	/*! 
+		@function handleIsOpen
+		@abstract Overrideable method to control the open / close behaviour of an IOService.
+		@discussion See IOService for discussion.		
+		@param forClient If non-zero, isOpen returns the open state for that client. If zero is passed, isOpen returns the open state for all clients.
+		@result Returns true if the specific, or any, client has the IOService open. 
+	*/
+	
+    virtual bool handleIsOpen(  const IOService * forClient ) const;
+    
+	/*! 
+		@function start
+		@abstract During an IOService instantiation, the start method is called when the IOService has been selected to run on the provider.
+		@discussion See IOService for discussion.
+		@result Return true if the start was successful, false otherwise (which will cause the instance to be detached and usually freed).
+	*/
+	
+    virtual bool start( IOService *provider );
+ 
+	/*! 
+		@function stop
+		@abstract During an IOService termination, the stop method is called in its clients before they are detached & it is destroyed.
+		@discussion See IOService for discussion.
+	*/
+   
+	virtual void stop( IOService *provider );
+
+	/*!
+		@function getFireWireUnit
+		@abstract Returns an IOFireWireUnit object.
+		@discussion An IOFireWireUnit is the provider of an IOFireWireSBP2Target.  In order to use the base FireWire services
+		you will need a reference to the unit.  This method returns that reference.
+		@result Returns a pointer to an IOFireWireUnit.
+	*/
+	
+    virtual IOFireWireUnit * getFireWireUnit( void );
+	
+	/*! 
+		@function matchPropertyTable
+		@abstract Implements SBP2 specific matching.
+		@discussion See IOService for discussion.
+	    @param table The dictionary of properties to be matched against.
+		@result Returns false if the family considers the matching dictionary does not match in properties it understands, true otherwise.
+	*/
+	
+	virtual bool matchPropertyTable( OSDictionary * table );
+
+    virtual void setTargetFlags( UInt32 flags );
+    virtual UInt32 getTargetFlags( void );
+
+protected:
+    virtual void configurePhysicalFilter( void );
+
+public:
+    virtual void clearTargetFlags( UInt32 flags );
+	virtual IOReturn beginIOCriticalSection( void );
+	virtual void endIOCriticalSection( void );
+
+    virtual bool finalize( IOOptionBits options );
+    
+    IOReturn 	synchMgmtAgentAccess( IOFWCommand * mgmtOrbCommand );
+	void		completeMgmtAgentAccess( );
+	void 		clearMgmtAgentAccess( );
+	void		cancelMgmtAgentAccess( IOFWCommand * mgmtOrbCommand );
+
+protected:
+
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 8);	
+    
+};
+
+#endif
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClient.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClient.h.svn-base
new file mode 100644
index 0000000..939dbf0
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClient.h.svn-base
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOFIREWIRESBP2USERCLIENT_H
+#define _IOKIT_IOFIREWIRESBP2USERCLIENT_H
+
+#include <IOKit/IOUserClient.h>
+
+#define FIREWIREPRIVATE
+#include <IOKit/firewire/IOFireWireController.h>
+#undef FIREWIREPRIVATE
+
+#include <IOKit/firewire/IOFWUserObjectExporter.h>
+
+#include <IOKit/sbp2/IOFireWireSBP2UserClientCommon.h>
+#include <IOKit/sbp2/IOFireWireSBP2LUN.h>
+
+class IOFireWireSBP2UserClient : public IOUserClient
+{
+    OSDeclareDefaultStructors(IOFireWireSBP2UserClient)
+
+protected:
+
+    bool					fOpened;
+	bool					fStarted;
+    IOFireWireSBP2Login * 	fLogin;
+    task_t					fTask;
+	
+    IOFireWireSBP2LUN *		fProviderLUN;
+    OSAsyncReference64		fMessageCallbackAsyncRef;
+    OSAsyncReference64		fLoginCallbackAsyncRef;
+    OSAsyncReference64		fLogoutCallbackAsyncRef;
+    OSAsyncReference64		fUnsolicitedStatusNotifyAsyncRef;
+    OSAsyncReference64		fStatusNotifyAsyncRef;
+    OSAsyncReference64		fFetchAgentResetAsyncRef;
+	OSAsyncReference64		fFetchAgentWriteAsyncRef;
+	
+	IOFWUserObjectExporter	*	fExporter;
+	
+	IOFireWireLib::UserObjectHandle		fSessionRef;
+	
+ 	virtual IOReturn externalMethod(	uint32_t selector, 
+										IOExternalMethodArguments * args,
+										IOExternalMethodDispatch * dispatch, 
+										OSObject * target, 
+										void * reference );
+public:
+
+	virtual bool initWithTask( task_t owningTask, void * securityToken, UInt32 type, OSDictionary * properties );
+	virtual void free ();
+				
+    virtual bool start( IOService * provider );
+
+    virtual IOReturn clientClose( void );
+    virtual IOReturn clientDied( void );
+
+	// IOFireWireSBP2ManagementORB friend class wrappers
+	virtual void flushAllManagementORBs( void );
+
+    /////////////////////////////////////////////////
+    // IOFireWireSBP2LUN
+
+    IOReturn open( IOExternalMethodArguments * arguments );
+	IOReturn openWithSessionRef( IOExternalMethodArguments * arguments );
+	IOReturn getSessionRef( IOExternalMethodArguments * arguments );
+    IOReturn close( IOExternalMethodArguments * arguments );
+
+    // callbacks
+	IOReturn setMessageCallback( IOExternalMethodArguments * arguments );
+    virtual IOReturn message( UInt32 type, IOService * provider, void * arg );
+
+    /////////////////////////////////////////////////
+    // IOFireWireSBP2Login
+    
+    IOReturn setLoginCallback( IOExternalMethodArguments * arguments );
+	IOReturn setLogoutCallback( IOExternalMethodArguments * arguments );
+    IOReturn setUnsolicitedStatusNotify( IOExternalMethodArguments * arguments );
+    IOReturn setStatusNotify( IOExternalMethodArguments * arguments );
+	IOReturn createLogin( IOExternalMethodArguments * arguments );
+    IOReturn releaseLogin( IOExternalMethodArguments * arguments );
+    IOReturn submitLogin( IOExternalMethodArguments * arguments );
+    IOReturn submitLogout( IOExternalMethodArguments * arguments );
+	IOReturn setLoginFlags( IOExternalMethodArguments * arguments );
+    IOReturn getMaxCommandBlockSize( IOExternalMethodArguments * arguments );
+    IOReturn getLoginID( IOExternalMethodArguments * arguments );
+    IOReturn setReconnectTime( IOExternalMethodArguments * arguments );
+	IOReturn setMaxPayloadSize( IOExternalMethodArguments * arguments );
+    
+	IOReturn submitFetchAgentReset( IOExternalMethodArguments * arguments );
+	IOReturn setFetchAgentWriteCompletion( IOExternalMethodArguments * arguments );
+	IOReturn ringDoorbell( IOExternalMethodArguments * arguments );
+	IOReturn enableUnsolicitedStatus( IOExternalMethodArguments * arguments );
+	IOReturn setBusyTimeoutRegisterValue( IOExternalMethodArguments * arguments );
+    IOReturn setPassword( IOExternalMethodArguments * arguments );
+
+	// callbacks
+	
+	static void staticLoginCallback( void * refCon, FWSBP2LoginCompleteParamsPtr params );
+    virtual void loginCallback( FWSBP2LoginCompleteParamsPtr params );
+
+	static void staticLogoutCallback( void * refCon, FWSBP2LogoutCompleteParamsPtr params );
+    virtual void logoutCallback( FWSBP2LogoutCompleteParamsPtr params );
+
+	static void staticStatusNotify( void * refCon, FWSBP2NotifyParams * params );
+    virtual void statusNotify( FWSBP2NotifyParams * params );
+
+	static void staticUnsolicitedNotify( void * refCon, FWSBP2NotifyParams * params );
+    virtual void unsolicitedNotify( FWSBP2NotifyParams * params );
+
+	static void staticFetchAgentWriteComplete( void * refCon, IOReturn status, IOFireWireSBP2ORB * orb );
+	virtual void fetchAgentWriteComplete( IOReturn status, IOFireWireSBP2ORB * orb );
+
+    static void staticFetchAgentResetComplete( void * refCon, IOReturn status );
+    virtual void fetchAgentResetComplete( IOReturn status );
+	
+    /////////////////////////////////////////////////
+    // IOFireWireSBP2ORB
+
+    IOReturn createORB(  IOExternalMethodArguments * arguments );
+    IOReturn releaseORB(  IOExternalMethodArguments * arguments );
+	IOReturn submitORB(  IOExternalMethodArguments * arguments );
+    IOReturn setCommandFlags(  IOExternalMethodArguments * arguments );
+    IOReturn setORBRefCon(  IOExternalMethodArguments * arguments );
+	IOReturn setMaxORBPayloadSize(  IOExternalMethodArguments * arguments );
+    IOReturn setCommandTimeout(  IOExternalMethodArguments * arguments );
+	IOReturn setCommandGeneration(  IOExternalMethodArguments * arguments );
+    IOReturn setToDummy(  IOExternalMethodArguments * arguments );
+    IOReturn setCommandBuffersAsRanges(  IOExternalMethodArguments * arguments );
+    IOReturn releaseCommandBuffers(  IOExternalMethodArguments * arguments );
+    IOReturn setCommandBlock(  IOExternalMethodArguments * arguments );
+	
+	// LSI workaround
+    IOReturn LSIWorkaroundSetCommandBuffersAsRanges(  IOExternalMethodArguments * arguments );
+	IOReturn LSIWorkaroundSyncBuffersForOutput(  IOExternalMethodArguments * arguments );
+	IOReturn LSIWorkaroundSyncBuffersForInput(  IOExternalMethodArguments * arguments );
+															
+    /////////////////////////////////////////////////
+    // IOFireWireSBP2MgmtORB
+
+	IOReturn createMgmtORB(  IOExternalMethodArguments * arguments );
+    IOReturn releaseMgmtORB(  IOExternalMethodArguments * arguments );
+    IOReturn setMgmtORBCallback(  IOExternalMethodArguments * arguments );
+    IOReturn submitMgmtORB(  IOExternalMethodArguments * arguments );	
+	IOReturn setMgmtORBCommandFunction(  IOExternalMethodArguments * arguments );
+	IOReturn setMgmtORBManageeORB(  IOExternalMethodArguments * arguments );
+	IOReturn setMgmtORBManageeLogin(  IOExternalMethodArguments * arguments );
+	IOReturn setMgmtORBResponseBuffer(  IOExternalMethodArguments * arguments );
+
+	// callbacks
+    static void staticMgmtORBCallback( void * refCon, IOReturn status, IOFireWireSBP2ManagementORB * orb );
+    virtual void mgmtORBCallback( IOReturn status, IOFireWireSBP2ManagementORB * orb );
+	
+	// IOFireWireSBP2MgmtORB friend class wrappers
+	virtual void setMgmtORBAsyncCallbackReference( IOFireWireSBP2ManagementORB * orb, void * asyncRef );    
+	virtual void getMgmtORBAsyncCallbackReference( IOFireWireSBP2ManagementORB * orb, void * asyncRef );
+
+	    uint32_t		   checkScalarInputCount;
+    uint32_t		   checkStructureInputSize;
+    uint32_t		   checkScalarOutputCount;
+    uint32_t		   checkStructureOutputSize;
+    
+    IOReturn checkArguments( IOExternalMethodArguments * args, uint32_t scalarInCount, uint32_t structInCount, 
+    													uint32_t scalarOutCount, uint32_t structOutCount );
+
+};
+
+#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClientCommon.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClientCommon.h.svn-base
new file mode 100644
index 0000000..cb114ba
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClientCommon.h.svn-base
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOFIREWIRESBP2USERCLIENTCOMMON_H_
+#define _IOKIT_IOFIREWIRESBP2USERCLIENTCOMMON_H_
+
+#define kIOFireWireSBP2LibConnection 12
+
+enum IOFWSBP2UserClientCommandCodes {
+    kIOFWSBP2UserClientOpen,						// kIOUCScalarIScalarO 0,0
+    kIOFWSBP2UserClientClose,						// kIOUCScalarIScalarO 0,0
+    kIOFWSBP2UserClientCreateLogin,					// kIOUCScalarIScalarO 0,1
+    kIOFWSBP2UserClientReleaseLogin,				// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSubmitLogin,					// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSubmitLogout,				// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSetLoginFlags,				// kIOUCScalarIScalarO 2,0
+    kIOFWSBP2UserClientGetMaxCommandBlockSize,		// kIOUCScalarIScalarO 1,1
+    kIOFWSBP2UserClientGetLoginID,					// kIOUCScalarIScalarO 1,1
+    kIOFWSBP2UserClientSetReconnectTime,			// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSetMaxPayloadSize,			// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientCreateORB,					// kIOUCScalarIScalarO 0,1
+    kIOFWSBP2UserClientReleaseORB,					// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSubmitORB,					// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSetCommandFlags,  			// kIOUCScalarIScalarO 2,0
+    kIOFWSBP2UserClientSetMaxORBPayloadSize, 		// kIOUCScalarIScalarO 2,0
+    kIOFWSBP2UserClientSetCommandTimeout, 			// kIOUCScalarIScalarO 2,0
+    kIOFWSBP2UserClientSetCommandGeneration, 		// kIOUCScalarIScalarO 2,0
+    kIOFWSBP2UserClientSetToDummy,	  				// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSetCommandBuffersAsRanges,	// kIOUCScalarIScalarO 6,0
+    kIOFWSBP2UserClientReleaseCommandBuffers, 		// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSetCommandBlock,	  			// kIOUCScalarIScalarO 3,0
+	kIOFWSBP2UserClientCreateMgmtORB,     			// kIOUCScalarIScalarO 0,1
+	kIOFWSBP2UserClientReleaseMgmtORB,   			// kIOUCScalarIScalarO 1,0
+	kIOFWSBP2UserClientSubmitMgmtORB,    			// kIOUCScalarIScalarO 1,0
+	kIOFWSBP2UserClientMgmtORBSetCommandFunction,   // kIOUCScalarIScalarO 2,0
+	kIOFWSBP2UserClientMgmtORBSetManageeORB,  		// kIOUCScalarIScalarO 2,0
+	kIOFWSBP2UserClientMgmtORBSetManageeLogin,    	// kIOUCScalarIScalarO 2,0
+	kIOFWSBP2UserClientMgmtORBSetResponseBuffer,    // kIOUCScalarIScalarO 3,0
+	kIOFWSBP2UserClientLSIWorkaroundSetCommandBuffersAsRanges, // kIOUCScalarIScalarO 6,0
+	kIOFWSBP2UserClientMgmtORBLSIWorkaroundSyncBuffersForOutput, // kIOUCScalarIScalarO 1,0
+	kIOFWSBP2UserClientMgmtORBLSIWorkaroundSyncBuffersForInput, // kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientOpenWithSessionRef,			// kIOUCScalarIScalarO 1,0
+	kIOFWSBP2UserClientGetSessionRef,				// kIOUCScalarIScalarO 0,1
+	kIOFWSBP2UserClientRingDoorbell,				// kIOUCScalarIScalarO 1, 0
+	kIOFWSBP2UserClientEnableUnsolicitedStatus, // kIOUCScalarIScalarO 1, 0
+	kIOFWSBP2UserClientSetBusyTimeoutRegisterValue,   // kIOUCScalarIScalarO 2, 0
+	kIOFWSBP2UserClientSetORBRefCon, 				// kIOUCScalarIScalarO 2, 0
+	kIOFWSBP2UserClientSetPassword,					// kIOUCScalarIScalarO 3, 0
+    kIOFWSBP2UserClientSetMessageCallback,   		// kIOUCScalarIScalarO 2, 0
+    kIOFWSBP2UserClientSetLoginCallback,			// kIOUCScalarIScalarO 2, 0
+    kIOFWSBP2UserClientSetLogoutCallback,			// kIOUCScalarIScalarO 2, 0
+    kIOFWSBP2UserClientSetUnsolicitedStatusNotify, 	// kIOUCScalarIScalarO 2, 0
+    kIOFWSBP2UserClientSetStatusNotify, 			// kIOUCScalarIScalarO 2, 0
+	kIOFWSBP2UserClientSetMgmtORBCallback,  		// kIOUCScalarIScalarO 3, 0
+	kIOFWSBP2UserClientSubmitFetchAgentReset,  		// kIOUCScalarIScalarO 3, 0
+	kIOFWSBP2UserClientSetFetchAgentWriteCompletion, // kIOUCScalarIScalaO 2, 0
+    kIOFWSBP2UserClientNumCommands
+};
+
+#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSerialBusProtocolTransport.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSerialBusProtocolTransport.h.svn-base
new file mode 100644
index 0000000..53e6195
--- /dev/null
+++ b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSerialBusProtocolTransport.h.svn-base
@@ -0,0 +1,449 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+/*!
+  @header IOFireWireSerialBusProtocolTransport
+  Contains the class definition for IOFireWireSerialBusProtocolTransport.
+*/
+
+
+#ifndef _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_
+#define _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_
+
+
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/IOLib.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOCommandPool.h>
+#include <IOKit/firewire/IOFireWireUnit.h>
+#include <IOKit/sbp2/IOFireWireSBP2LUN.h>
+
+#include <IOKit/scsi/IOSCSIProtocolServices.h>
+
+/*!
+	@class IOFireWireSerialBusProtocolTransport
+	@abstract SCSI Protocol Driver Family for FireWire SBP2 Devices. 
+	@discussion IOFireWireSerialBusProtocolTransport contains all the bus specific support for FireWire
+	SBP2 compliant devices. To add vendor specific features or workarounds you will sub-class the appropriate
+	methods of this family. 
+*/
+
+class IOFireWireSerialBusProtocolTransport : public IOSCSIProtocolServices
+{
+	
+	OSDeclareDefaultStructors ( IOFireWireSerialBusProtocolTransport )
+	
+private:
+	
+	IOFireWireUnit *				fUnit;
+	IOFireWireSBP2LUN *				fSBPTarget;
+	IOFireWireSBP2Login *			fLogin;
+	IOFireWireSBP2ORB *				fORB;
+	IOFireWireSBP2ManagementORB * 	fLUNResetORB;
+	
+	// /!\ WARNING! NOT USED left behind for legacy binary reasons
+	IOSimpleLock *					fQueueLock;
+	
+	UInt32							fLoginRetryCount;
+	bool							fDeferRegisterService;
+	bool							fNeedLogin;
+    
+    // /!\ WARNING! NOT USED left behind for legacy binary reasons
+	bool							fPhysicallyConnected;
+	
+	static void
+	StatusNotifyStatic ( void * refCon, FWSBP2NotifyParamsPtr params );
+	
+	static void
+	UnsolicitedStatusNotifyStatic (	void * 					refCon,
+									FWSBP2NotifyParamsPtr 	params );
+	
+	static void
+	LunResetCompleteStatic (	void * 							refCon,
+								IOReturn						status,
+								IOFireWireSBP2ManagementORB * 	orb );
+	
+	static void
+	FetchAgentResetCompleteStatic (	void * refcon,
+									IOReturn status );
+	
+	static IOReturn
+	ConnectToDeviceStatic (	OSObject * refCon, void *, void *, void *, void * );
+	
+	virtual void
+	FetchAgentResetComplete ( IOReturn status );
+	
+	static void LoginCompletionStatic ( void * refCon, FWSBP2LoginCompleteParams * params );
+	
+	static void
+	LogoutCompletionStatic ( void * refCon, FWSBP2LogoutCompleteParams * params );
+	
+	/*!
+		@function CoalesceSenseData
+		@abstract CoalesceSenseData convert a SBP-2 status block into a SPC-2 sense block.
+		@discussion	CoalesceSenseData pulls the appropriate bits out of the SBP2 sense block
+		as defined in SBP-2 Annex B section B.2 and dynamically builds a sense data block as
+		defined in SPC-2 section 7.23.2.
+	*/
+	
+	SCSITaskStatus
+	CoalesceSenseData (	FWSBP2StatusBlock *	sourceData,
+						UInt8				quadletCount,
+						SCSI_Sense_Data *	targetData );
+	
+	virtual void ConnectToDevice ( void );
+	
+	virtual void DisconnectFromDevice ( void );
+	
+	virtual bool IsDeviceCPUInDiskMode ( void );
+
+protected:
+    
+	/*!
+		@function AllocateResources
+		@abstract Allocate Resources.
+		@discussion	Called from start method to allocate needed resources.
+	*/
+    
+	virtual IOReturn AllocateResources ( void );
+    
+	/*!
+		@function DeallocateResources
+		@abstract Deallocate Resources.
+		@discussion	Called from cleanUp method to deallocate resources.
+	*/
+    
+	virtual void DeallocateResources ( void );
+	
+	enum SBP2LoginState
+	{
+		kFirstTimeLoggingInState,
+		kLogginSucceededState,
+		kLogginFailedState
+	};
+	
+	/*! 
+		@typedef SBP2ClientOrbData
+		@param orb IOFireWireSBP2ORB for request.
+		@param scsiTask SCSITaskIdentifier of request. 
+		@param serviceResponse SCSIServiceResponse of request.
+		@param taskStatus SCSITaskStatus of request.
+		@discussion This structure is stuffed into the refcon so we can associate which
+		IOFireWireSBP2ORB and SCSITaskIdentifier is completing.
+	*/
+	
+	typedef struct {
+		IOFireWireSBP2ORB *				orb;
+		SCSITaskIdentifier 				scsiTask;
+		SCSIServiceResponse 			serviceResponse;
+		SCSITaskStatus					taskStatus;
+		IOBufferMemoryDescriptor *		quadletAlignedBuffer;
+	} SBP2ClientOrbData;
+	
+	static const UInt32 kDefaultBusyTimeoutValue	= 0x0000000F;
+	static const UInt64 kMaxFireWireLUN				= 0xFFFF;
+	static const UInt32 kMaxFireWirePayload			= 4096;
+	static const UInt32 kMaxLoginRetryCount			= 8;
+	static const UInt32 kMaxReconnectCount			= 128;
+	static const UInt32 kCSRModelInfoKey			= 0x17;
+
+	UInt32	fReconnectCount;
+	bool 	fLoggedIn;
+	
+	// binary compatibility instance variable expansion
+	struct ExpansionData
+	{ 
+		IOCommandPool *		fCommandPool;
+		IOCommandPool *		fSubmitQueue;
+		SBP2LoginState		fLoginState;
+		bool				fLUNResetPathFlag;
+		int					fLUNResetCount;
+		bool				fAlwaysSetSenseData;
+		bool				fAutonomousSpinDownWorkAround;
+	};
+	
+	ExpansionData * reserved;
+	
+	bool fObjectIsOpen;
+
+	/*!
+		@function CommandORBAccessor
+		@abstract accessor function for fORB.
+		@discussion	xxx.
+	*/
+
+	IOFireWireSBP2ORB * CommandORBAccessor ( void );
+   
+	/*!
+		@function SBP2LoginAccessor
+		@abstract accessor function for fLogin.
+		@discussion	xxx.
+	*/
+
+	IOFireWireSBP2Login * SBP2LoginAccessor ( void );
+
+	virtual IOReturn
+	message ( UInt32 type, IOService * provider, void * argument = 0 );
+
+	/*!
+		@function SendSCSICommand
+		@abstract Prepare and send a SCSI command to the device.
+		@discussion	The incoming SCSITaskIdentifier gets turned into a IOFireWireSBP2ORB
+		and is submitted to the SBP2 layer. See IOSCSIProtocolServices.h for more details
+		regarding SendSCSICommand. Also see IOFireWireSBP2Lib.h for details regarding the
+		IOFireWireSBP2ORB structure and the submitORB method.
+		@result If the command was sent to the device and is pending completion, the
+		subclass should return true and return back the kSCSIServiceResponse_Request_In_Process response.
+		If the command completes immediately with an error, the subclass will return true
+		and return back the appropriate status. If the subclass is currently processing all the
+		commands it can, the subclass will return false and the command will be resent next time
+		CommandCompleted is called.
+	*/
+
+	virtual bool 
+	SendSCSICommand (	SCSITaskIdentifier 		request,
+						SCSIServiceResponse *	serviceResponse,
+						SCSITaskStatus *		taskStatus );
+
+	/*!
+		@function SetCommandBuffers
+		@abstract Method to set orb's buffers.
+		@discussion	This method was added so that subclasses can override and massage buffers as
+		needed. The default simply calls setCommandBuffers. See IOFireWireSBP2Lib.h for details
+		regarding the setCommandBuffers method.
+		@result xxx.
+	*/
+	
+	virtual IOReturn
+	SetCommandBuffers (	IOFireWireSBP2ORB * orb, SCSITaskIdentifier request );
+
+	/*!
+		@function CompleteSCSITask
+		@abstract This qualifies and sets appropriate data then calls CommandCompleted.
+		@discussion	See IOSCSIProtocolServices.h for more details
+		regarding CommandCompleted.
+	*/
+	
+	virtual void 
+	CompleteSCSITask ( IOFireWireSBP2ORB * orb );
+
+	/*!
+		@function AbortSCSICommand
+		@abstract This method is intended to abort an in progress SCSI Task.
+		@discussion	Currently not implemented in super class. This is a stub method for adding
+		the abort command in the near future.
+		@result See SCSITask.h for SCSIServiceResponse codes.
+	*/
+	
+	virtual SCSIServiceResponse 
+	AbortSCSICommand ( SCSITaskIdentifier request );
+
+	/*!
+		@function StatusNotify
+		@abstract This is our handler for status.
+		@discussion See IOFireWireSBP2Lib.h for details regarding the FWSBP2NotifyParams
+		structure that is passed in to the completion..
+	*/
+	
+	virtual void
+	StatusNotify ( FWSBP2NotifyParams * params );
+
+	/*!
+		@function SetValidAutoSenseData
+		@abstract Set the auto sense data that was returned for a given SCSI Task.
+		@discussion	SetValidAutoSenseData is called to qualify sense data that is copied to the
+		client via the SetAutoSenseData method. See IOSCSIProtocolServices.h for more details
+		regarding SetAutoSenseData.
+	*/
+	
+	void
+	SetValidAutoSenseData (	SBP2ClientOrbData *	clientData,
+							FWSBP2StatusBlock *	statusBlock,
+							SCSI_Sense_Data *	targetData );
+	
+	/*!
+		@function UnsolicitedStatusNotify
+		@abstract This is our handler for unsolicited status.
+		@discussion	After we have parsed and handled the unsolicited status we call 
+		enableUnsolicitedStatus. See IOFireWireSBP2Lib.h for details regarding the
+		enableUnsolicitedStatus method.
+	*/
+	
+	virtual void
+	UnsolicitedStatusNotify ( FWSBP2NotifyParamsPtr params );
+
+	/*!
+		@function LoginCompletion
+		@abstract Completion routine for login complete.
+		@discussion	See IOFireWireSBP2Lib.h for details regarding the FWSBP2LogoutCompleteParams
+		structure that is passed in to the completion.
+	*/
+	
+	virtual void 
+	LoginCompletion ( FWSBP2LoginCompleteParams * params );
+
+	/*!
+		@function LogoutCompletion
+		@abstract Completion routine for logout complete.
+		@discussion	See IOFireWireSBP2Lib.h for details regarding the FWSBP2LogoutCompleteParams
+		structure that is passed in to the completion.
+	*/
+	
+	virtual void 
+	LogoutCompletion ( FWSBP2LogoutCompleteParams * params );
+
+	/*!
+		@function IsProtocolServiceSupported
+		@abstract Determine is specified feature is supported by the protocol layer.
+		@discussion	If the service has a value that must be returned, it will be returned in the
+		serviceValue output parameter. See IOSCSIProtocolServices.h for more details regarding
+		IsProtocolServiceSupported.
+		@result Will return true if the specified feature is supported by the protocol layer.
+	*/
+
+	virtual bool
+	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
+
+	/*!
+		@function HandleProtocolServiceFeature
+		@abstract Handle specified feature supported by the protocol layer.
+		@discussion	See IOSCSIProtocolServices.h for more details regarding HandleProtocolServiceFeature.
+		@result Will return true if the specified feature is supported by the protocol layer.
+	*/
+
+	virtual bool
+	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
+   
+	/*!
+		@function LunResetComplete
+		@abstract Callback to submit Fetch Agent Reset.
+		@discussion	See IOFireWireSBP2Lib.h for details regarding the submitFetchAgentReset
+		method.
+	*/
+	
+	virtual void
+	LunResetComplete ( IOReturn status, IOFireWireSBP2ManagementORB * orb );
+
+public:
+
+	/*!
+		@function init
+		@abstract See IOService for discussion.
+		@discussion	Setup and prime class into known state.
+	*/
+	
+	bool init ( OSDictionary * propTable );
+
+	/*! 
+		@function start
+		@discussion See IOService for discussion.
+		@result Return true if the start was successful, false otherwise ( which will
+		cause the instance to be detached and usually freed ).
+	*/
+
+	virtual bool start ( IOService * provider );
+	
+	/*!
+	 	@function cleanUp
+		@abstract cleanUp is called to tear down IOFireWireSerialBusProtocolTransport.
+		@discussion	cleanUp is called when we receive a kIOFWMessageServiceIsRequestingClose
+		message or if we fail our initialization.
+	*/
+	
+	virtual void cleanUp ( void );
+	
+	/*!
+		@function finalize
+		@abstract See IOService for discussion.
+		@result Returns true.
+	*/
+	
+	virtual bool finalize ( IOOptionBits options );
+
+	/*! 
+		@function free
+		@discussion See IOService for discussion.
+		@result none.
+	*/
+	
+	virtual void free ( void );
+		
+protected:
+	
+	virtual IOReturn login ( void );
+    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 1 );
+    
+	virtual IOReturn submitLogin ( void );
+    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 2 );
+    
+	virtual void loginLost ( void );
+    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 3 );
+    
+    void loginSuspended ( void );
+	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 4 );
+   
+	virtual void loginResumed ( void );
+	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 5 );
+
+	static IOReturn CriticalOrbSubmissionStatic ( 
+			OSObject * refCon, 
+			void * val1,
+			void * val2,
+			void * val3,
+			void * val4 );
+
+	/*!
+		@function CriticalOrbSubmission
+		@abstract xxx.
+		@discussion	xxx.
+		@result none.
+	*/
+	
+	void
+		CriticalOrbSubmission (
+			IOFireWireSBP2ORB * orb,
+			SCSITaskIdentifier request );
+	
+	virtual void submitOrbFromQueue ( void );
+	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 6 );
+	
+private:
+	
+	// binary compatibility reserved method space
+    
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 7 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 8 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 9 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 10 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 11 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 12 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 13 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 14 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 15 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 16 );
+	
+};
+
+#endif	/* _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2LSIWorkaroundDescriptor.h b/i386/include/IOKit/sbp2/IOFireWireSBP2LSIWorkaroundDescriptor.h
new file mode 100644
index 0000000..178ef00
--- /dev/null
+++ b/i386/include/IOKit/sbp2/IOFireWireSBP2LSIWorkaroundDescriptor.h
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#if __ppc__
+
+/*!
+  @header IOFireWireSBP2LSIWorkaroundDescriptor
+  Contains the class definition for IOFireWireSBP2LSIWorkaroundDescriptor.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2LSIWORKAROUNDDESCRIPTOR_H
+#define _IOKIT_IOFIREWIRESBP2LSIWORKAROUNDDESCRIPTOR_H
+
+#include <IOKit/IOMemoryDescriptor.h>
+
+class IOFireWireSBP2LSIRange;
+
+/*!
+    @class IOFireWireSBP2LSIWorkaroundDescriptor
+    @abstract This is a subclass of IOGeneralMemoryDescriptor. It is designed to work around
+    a hardware problem in a common SBP2 target.  It takes a memory descriptor as
+	an argument.  It retains this descriptor and returns a new one with resegmented
+	physical segments and potentially some "unfixable" segments double buffered.
+
+    If the transfer will cause data to be sent from the Mac, syncBuffersForOutput
+    must be called before the transfer.
+    
+    If the transfer will cause data to be recieve by the Mac, syncBuffersForInput
+    must be called after the transfer.
+
+    This class calculates the new segmentation only once when it is created.
+    Any changes to the structure of the original memory descriptor will render
+    this one useless.  It must be released and a new IOFireWireSBP2LSIWorkaroundDescriptor
+    can be created.
+    
+    LSI Bridge Workaround Algorithm Details
+    
+    Goals:
+    1. Avoid LSI Logic "< 16 byte" bug - prevent any data packet smaller than 16 bytes
+    2. Minimize double-buffering
+    3. Support non-multiple-of-512-byte devices, e.g. CD Audio
+    
+    Solution:
+    Write a page table such that the bridge will nor use packets smaller than 16 bytes.
+    In other words, rearrange the memory descriptor to avoid the bug, and do it such
+    that the SBP-2 layer will not break up a segment (du ro the 64k-1 limit) and
+    re-introduces the problem
+
+    SBP-2 defines the kFWSBP2MaxPageClusterSize constant.   We simply make sure
+    none of our segments are larger than this size and SBP-2 will not break them
+    up when it writes the SBP-2 page table.
+    
+    Notes:
+    - Some double buffering is unavoidable.  Discontiguous pages may yield page
+    fragments at the start or end of the buffer (or both, with non-512x buffers).
+    solution uses less than 33 bytes of double-buffer per segment in original
+    memory descriptor.
+    - If driver must break up IO to meet ATA limit of 255 (250?) blocks, assume
+    the driver does this at a higher level (before applying workaround).
+    - It is expected that the original memory descriptor has been prepared (wired)
+*/
+
+class IOFireWireSBP2LSIWorkaroundDescriptor : public IOGeneralMemoryDescriptor
+{
+	OSDeclareDefaultStructors(IOFireWireSBP2LSIWorkaroundDescriptor)
+
+	friend class IOFireWireSBP2LSIRange;
+
+protected:
+
+    // reserved for future use
+    struct ExpansionData { };
+    ExpansionData *reserved; 
+    
+	bool	fFixedCapacity; 	// for both allocators
+	
+	//////////////////////////////////////
+	// for range allocator
+
+	OSArray *				fPermanentRanges;
+	UInt32					fAllocatedRangesCount;
+
+	virtual IOReturn rangeAllocatorInitialize( UInt32 rangeCount );
+	virtual void rangeAllocatorDeallocateAllRanges( void );
+	virtual IOFireWireSBP2LSIRange * rangeAllocatorNewRange( void );
+	virtual void rangeAllocatorFree( void );
+
+	//////////////////////////////////////
+	// for buffer allocator
+	
+	OSArray *				fBufferDescriptors;
+	UInt32					fPermanentPages;
+	IOByteCount				fAllocatedBytesCount;
+
+	virtual IOReturn bufferAllocatorInitialize( IOByteCount requestedBufferSize );
+	virtual void bufferAllocatorDeallocateAllBuffers( void );
+	virtual void * bufferAllocatorNewBuffer( IOPhysicalAddress * address );
+	virtual void bufferAllocatorFree( void );
+
+	//////////////////////////////////////
+	// for range table allocator
+	
+	IOPhysicalRange * 		fRangeTable;
+	IOByteCount				fRangeTableSize;
+
+	virtual IOReturn rangeTableAllocatorInitialize( UInt32 requestedBufferSize );
+	virtual IOPhysicalRange * rangeTableAllocatorNewTable( UInt32 entries );
+	virtual void rangeTableAllocatorFree( void );
+
+	//////////////////////////////////////
+	// for workaround
+
+	IOMemoryDescriptor * 	fOriginalDesc;	
+	OSArray *				fRanges;	
+	IOByteCount 			fOffset;
+	IOByteCount				fLength;
+	IODirection				fDirection;
+	
+						  
+	virtual bool initWithCapacity
+					( UInt32 permanentRanges, IOByteCount permanentBufferSpace, bool fixedCapacity );
+
+	virtual void free();
+	
+	virtual IOReturn resetToInitialCapacity( void );
+	virtual IOReturn initializeRangesArray( void );
+	virtual IOReturn recalculateSmallSegments( void );
+	virtual IOReturn splitLargeSegments( void );
+	virtual IOReturn resegmentOddLengthSegments( void );
+	virtual IOReturn initializeBuffers( void );
+
+	virtual bool initWithAddress( void *      address,       /* not supported */
+                                  IOByteCount withLength,
+                                  IODirection withDirection );
+
+    virtual bool initWithAddress( vm_address_t address,      /* not supported */
+                                  IOByteCount  withLength,
+                                  IODirection  withDirection,
+                                  task_t       withTask );
+
+    virtual bool initWithPhysicalAddress( 
+                                  IOPhysicalAddress address, /* not supported */
+                                  IOByteCount       withLength,
+                                  IODirection       withDirection );
+
+    virtual bool initWithPhysicalRanges( 
+                                  IOPhysicalRange * ranges,  /* not supported */
+                                  UInt32            withCount,
+                                  IODirection       withDirection,
+                                  bool              asReference = false );
+
+    virtual bool initWithRanges(  IOVirtualRange * ranges,   /* not supported */
+                                  UInt32           withCount,
+                                  IODirection      withDirection,
+                                  task_t           withTask,
+                                  bool             asReference = false );
+
+public:
+	
+	// static factory methods and intializers 
+	
+	//
+	// create a new instance
+	//
+	
+	
+    /*!
+		@function withDescriptor
+		@abstract Creates a new IOFireWireSBP2LSIWorkaroundDescriptor.
+		@discussion	Create a IOFireWireSBP2LSIWorkaroundDescriptor with no permanent capacity then 
+        inits it the given descriptor. This is basicly a short cut for calling 
+        withCapacity( 0, 0, false) and the initWithDescriptor()
+        @param desc Original memory descriptor.
+        @param offset Offset of data to "fix" in bytes from beginning of descriptor.
+        @param len Length of data in bytes to "fix"
+        @param direction IODirection of data transfer.
+        @result Returns a new IOFireWireSBP2LSIWorkaroundDescriptor if successful.
+	*/
+    
+	static IOFireWireSBP2LSIWorkaroundDescriptor * withDescriptor
+					( IOMemoryDescriptor * desc, IOByteCount offset = 0,  
+					  IOByteCount len = 0, IODirection direction = kIODirectionOutIn );
+	
+	// initialize with descriptor				  
+	
+    /*!
+		@function initWithDescriptor
+		@abstract Initialize an IOFireWireSBP2LSIWorkaroundDescriptor with the given descriptor.
+		@discussion	Initialize the workaround descriptor with the given descriptor. 
+        @param desc Original memory descriptor.
+        @param offset Offset of data to "fix" in bytes from beginning of descriptor.
+        @param len Length of data in bytes to "fix"
+        @param direction IODirection of data transfer.
+        @result Returns true if the initialization was successful.
+	*/
+    
+    virtual bool initWithDescriptor( IOMemoryDescriptor * desc, IOByteCount offset = 0,  
+								     IOByteCount len = 0, IODirection direction = kIODirectionOutIn );
+	
+	
+	///////////////////////////////////
+	
+    
+    /*!
+		@function withCapacity
+		@abstract Create a new descriptor with possibly a permanent capacity.
+		@discussion	Create and IOFireWireSBP2LSIWorkaroundDescriptor with a permanent fixed capacity. 
+        You should call initWithDescriptor afterward. permanentRanges is number of ranges to keep 
+        permanently allocated for use by the algorithm.  If fixedCapacity is false additional ranges 
+        may be allocated and deallocated dyanmicly if needed. The algorithm may require more or less 
+        ranges than either the original descriptor or the final fixed may decriptor contain.
+        permanentBufferSpace is the number of bytes of permanent buffer to keep arround. If fixedCapacity 
+        is false additional buffer space may be allocated and deallocated dynamically. permanentBufferSpace 
+        should generally be set to 32 * maximum number of ranges. fixedCapacity is a flag indicating 
+        whether dynamic allocations are allowed. When making decisions about the maximum amount of 
+        buffer space to keep around, it should be noted tha the maximum number of ranges maybe different 
+        from permanentRanges if fixedCapcity is false.
+        @param permanentRanges Count of permanent ranges.
+        @param permanentBufferSpace Byte count of permanent buffers.
+        @param fixedCapacity bool indicating if dynamic allocations can be made.
+        @result Returns true if the initialization was successful.
+	*/
+    
+	static IOFireWireSBP2LSIWorkaroundDescriptor * withCapacity
+						( UInt32 permanentRanges, IOByteCount permanentBufferSpace, bool fixedCapacity );
+
+
+	///////////////////////////////////
+
+	//
+	// manipulate buffers for IO
+	//
+
+    /*!
+		@function syncBuffersForOutput
+		@abstract Synchronize the buffers for output.
+		@discussion	Since double buffering may be invovled in the workaround.  The driver needs to 
+        indicate when these buffers should be syncronized with the original descriptor.  For data 
+        that will be output syncBuffersForOutput should be called before submiting the ORB.
+        @result Returns kIOReturnSuccess if sync was successful.
+	*/
+    	
+	virtual IOReturn syncBuffersForOutput( void );  // call before output
+
+    /*!
+		@function syncBuffersForInput
+		@abstract Synchronize the buffers for input.
+		@discussion	Since double buffering may be invovled in the workaround.  The driver needs to 
+        indicate when these buffers should be syncronized with the original descriptor.  For data 
+        that will be input syncBuffersForOutput should be called after receiving completion status 
+        for the ORB.
+        @result Returns kIOReturnSuccess if sync was successful.
+	*/
+    
+    virtual IOReturn syncBuffersForInput( void );	// call after input
+    
+private:
+
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 8);
+    
+};
+
+#endif
+
+#endif
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h b/i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h
new file mode 100644
index 0000000..e6c97de
--- /dev/null
+++ b/i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOFireWireSBP2LUN
+  Contains the class definition for IOFireWireSBP2LUN.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2LUN_H
+#define _IOKIT_IOFIREWIRESBP2LUN_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOCommandGate.h>
+
+#include <IOKit/firewire/IOFireWireUnit.h>
+
+#include <IOKit/sbp2/IOFireWireSBP2Login.h>
+#include <IOKit/sbp2/IOFireWireSBP2ManagementORB.h>
+
+class IOFireWireSBP2Target;
+
+/*!
+    @class IOFireWireSBP2LUN
+    @abstract Provider for most drivers. 
+    @discussion IOFireWireSBP2LUN objects are created by IOFireWireSBP2Target objects.  Each target may have zero or more IOFireWireSBP2LUN children. The LUN object serves as the matching nub for most drivers and therefore will be the provider for most drivers.  It supplies the methods that control the operation of the LUN as a whole.  Methods that control the behavior and execution of an SBP2 login session are supplied in a separate IOFireWireSBP2Login object. The LUN can be used to create one of these login objects.
+    The LUN can also create IOFireWireSBP2ManagementORBs for configuring and appending non-login related management functions.  Login related management functions (ie. Login, Logout, Reconnect) are supplied by the IOFireWireSBP2Login.
+    Finally the LUN can supply a reference to the IOFireWireUnit.  This can be useful if a driver wishes to access the standard FireWire APIs.  
+*/
+
+class IOFireWireSBP2LUN : public IOService
+{
+    OSDeclareDefaultStructors( IOFireWireSBP2LUN );
+
+	friend class IOFireWireSBP2ManagementORB;
+	friend class IOFireWireSBP2Login;
+	friend class IOFireWireSBP2UserClient;
+	
+protected: 
+
+    // reserved for future use
+    struct ExpansionData { };
+    ExpansionData *reserved;
+
+	////////////////////////////////////////////
+	// methods called by friend classes
+
+	// IOFireWireSBP2Login methods
+    virtual void removeLogin( IOFireWireSBP2Login * login );
+	virtual IOFireWireSBP2Target * getTarget( void );
+	
+	// IOFireWireSBP2ManagementORB methods
+	virtual void clearAllTasksInSet( void );  // assumes caller is on workloop
+	virtual void removeManagementORB( IOFireWireSBP2ManagementORB * orb ); 
+	
+	// IOFireWireSBP2UserClient methods
+	virtual void flushAllManagementORBs( void );
+
+public:
+
+	////////////////////////////////////////////
+	// IOService overrides
+
+    /*! @function attach
+        @abstract Attaches an IOService client to a provider in the registry.
+        @discussion See IOService for discussion.
+        @param provider The IOService object which will serve as this objects provider.
+        @result false if the provider is inactive or on a resource failure, otherwise true. 
+    */
+    
+    virtual bool attach( IOService *provider );
+
+	/*! @function handleOpen
+		@abstract Overrideable method to control the open / close behaviour of an IOService.
+		@discussion See IOService for discussion.		
+		@param forClient Designates the client of the provider requesting the open.
+		@param options Options for the open, may be interpreted by the implementor of handleOpen.
+		@result Return true if the open was successful, false otherwise. */
+
+    virtual bool handleOpen(  IOService *	  forClient,
+                              IOOptionBits	  options,
+                              void *		  arg );
+	/*! 
+		@function handleClose
+		@abstract Overrideable method to control the open / close behaviour of an IOService.
+		@discussion See IOService for discussion.
+		@param forClient Designates the client of the provider requesting the close.
+		@param options Options for the close, may be interpreted by the implementor of handleOpen. 
+	*/
+
+    virtual void handleClose(   IOService *		forClient,
+                                IOOptionBits	options );
+    
+ 	/*! 
+		@function matchPropertyTable
+		@abstract Implements SBP2 specific matching.
+		@discussion See IOService for discussion.
+	    @param table The dictionary of properties to be matched against.
+		@result Returns false if the family considers the matching dictionary does not match in properties it 			understands, true otherwise.
+	*/
+    	
+	virtual bool matchPropertyTable(OSDictionary * table);
+																	
+protected:
+
+	////////////////////////////////////////////
+	// private fields
+	
+    IOFireWireSBP2Target * 	fProviderTarget;
+    UInt32					fLUNumber;
+    OSSet *					fLoginSet;
+    OSIterator *			fLoginSetIterator;
+	IOCommandGate * 		fGate;
+	OSSet *					fORBSet;
+    OSIterator *			fORBSetIterator;
+	OSObject * 				fDiagnostics;
+	
+	////////////////////////////////////////////
+	// private methods
+	
+	// IOService methods
+    virtual void free( void );
+    virtual IOReturn message( UInt32 type, IOService * provider, void * argument = 0 );
+    
+	// create management orb internals
+	static IOReturn staticCreateManagementORBAction( OSObject *self,
+													 void * refCon,
+													 void * completion, 
+													 void * orb, 
+													 void * );
+	virtual IOReturn createManagementORBAction( void * refCon,
+												FWSBP2ManagementCallback completion, 
+												IOFireWireSBP2ManagementORB ** orb );
+
+	// remove management orb internals
+	static IOReturn staticRemoveManagementORBAction( OSObject * self, void * orb, 
+													void *, void *, void * );
+	virtual IOReturn removeManagementORBAction( IOFireWireSBP2ManagementORB * orb );
+
+	// flush all management orb internals
+	static IOReturn staticExecuteFlushAllMgmtORBs( OSObject * self, void *, 
+													void *, void *, void * );
+	virtual IOReturn executeFlushAllMgmtORBs( void );
+
+	// IOFireWireSBP2ManagementORB friend class wrappers
+    virtual bool initMgmtORBWithLUN( IOFireWireSBP2ManagementORB * orb, IOFireWireSBP2LUN * lun, 
+									 void * refCon, 
+									 FWSBP2ManagementCallback completion );
+									 		
+	// IOFireWireSBP2Login friend class wrappers
+    virtual bool initLoginWithLUN( IOFireWireSBP2Login * login, IOFireWireSBP2LUN * lun );
+	virtual void suspendedNotify( void );
+	virtual void resumeNotify( void );
+		
+private:
+
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 0);
+
+public:
+
+	////////////////////////////////////////////
+    // client methods
+
+	// getters
+	
+    /*!
+		@function getFireWireUnit
+		@abstract Returns an IOFireWireUnit object.
+		@discussion An IOFireWireUnit is the provider of an IOFireWireSBP2Target.  In order to 
+        use the base FireWire services you will need a reference to the unit.  This method 
+        returns that reference.
+		@result Returns a pointer to an IOFireWireUnit.
+	*/
+    
+    virtual IOFireWireUnit * getFireWireUnit( void );
+    
+    /*!
+		@function getLUNumber
+		@abstract Returns the LUNs number.
+		@discussion Each LUN has a number to uniquely identify it on a device.  This method returns 
+        this value in a UInt32.		
+        @result Returns a UInt32 containing the Logical Unit Number.
+	*/
+    
+	virtual UInt32 getLUNumber( void );
+    
+	// factory methods
+    
+    /*!
+		@function createLogin
+		@abstract Creates a new IOFireWireSBP2Login object.
+		@discussion	Creates a new IOFireWireSBP2Login object for the LUN.  Login objects supply most 
+        of the SBP2 APIs related to login maintenance and Normal Command ORB execution.
+        @result Returns a pointer to a new IOFireWireSBP2Login.
+	*/
+
+    virtual IOFireWireSBP2Login *createLogin( void );	
+
+    /*!
+		@function createManagementORB
+		@abstract Creates a new IOFireWireSBP2ManagementORB object.
+		@discussion	Creates a new IOFireWireSBP2ManagementORB object.  Management objects let you 
+        execute commands like QueryLogins, LogicalUnitReset, and AbortTask.  These commands are 
+        configured after they are created here.  When they are done executing (after a call to submit) 
+        the supplied completion routine will be called with the supplied refcon.  Usually this refCon
+        is the "this" pointer of completion method's object.
+        @param refCon The refcon passed to the completion routine.
+        @param completion The completion routine.  Called when the ORB finishes execution.	
+        @result Returns a pointer to a new IOFireWireSBP2Login.
+	*/
+        
+    virtual IOFireWireSBP2ManagementORB * createManagementORB( void * refCon, FWSBP2ManagementCallback completion );
+
+protected:
+
+    static IOReturn staticCreateLogin( OSObject *self, void * login, void *, void *, void * );
+    virtual IOReturn createLoginAction( IOFireWireSBP2Login ** login );
+
+    static IOReturn staticRemoveLoginAction( OSObject *self, void * login, void *, void *, void * );
+    virtual IOReturn removeLoginAction( IOFireWireSBP2Login * login );
+
+public:
+
+    /*!
+		@function getDiagnostics
+		@abstract Debug-only method.
+		@discussion	Returns a reference to the internal diagnostics object when the services are built 
+        in debug mode. Should be a no-op in release builds.
+        @result Returns a pointer to the diagnostics object (if any).
+	*/
+    	
+	virtual OSObject * getDiagnostics( void );
+
+    virtual bool finalize( IOOptionBits options );
+
+protected:
+
+	void terminateNotify( void );
+	
+private:
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 8);
+
+};
+
+#endif 
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2Login.h b/i386/include/IOKit/sbp2/IOFireWireSBP2Login.h
new file mode 100644
index 0000000..42a838c
--- /dev/null
+++ b/i386/include/IOKit/sbp2/IOFireWireSBP2Login.h
@@ -0,0 +1,1078 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOFireWireSBP2Login
+  Contains the class definition for IOFireWireSBP2Login.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2LOGIN_H
+#define _IOKIT_IOFIREWIRESBP2LOGIN_H
+
+#include <IOKit/IOCommandGate.h>
+
+#include <IOKit/firewire/IOFireWireUnit.h>
+
+#include <IOKit/sbp2/IOFireWireSBP2ORB.h>
+#include <IOKit/sbp2/IOFireWireSBP2Target.h>
+
+// login option flags
+enum
+{
+	kFWSBP2DontSynchronizeMgmtAgent = (1 << 0),
+    kFWSBP2ExclusiveLogin 			= (1 << 5)
+};
+
+// notification events
+enum
+{
+    kFWSBP2NormalCommandStatus	= 6,
+    kFWSBP2NormalCommandTimeout	= 7,
+    kFWSBP2UnsolicitedStatus	= 8,
+    kFWSBP2NormalCommandReset	= 9
+};
+
+#define kIOMessageFWSBP2ReconnectComplete	iokit_fw_err(0x3E8)
+#define kIOMessageFWSBP2ReconnectFailed		iokit_fw_err(0x3E9)
+
+/*! 
+    @typedef FWSBP2LoginResponse
+    @param length Length of login response.
+    @param loginID Unique id representing this login. 
+    @param commandBlockAgentAddressHi High 32 bits of command block agent address.
+    @param commandBlockAgentAddressLo Low 32 bits of command block agent address.
+    @param reserved Reserved.
+    @param reconnectHold Reconnect timeout encoded as 2^reconnectHold seconds.
+*/
+
+typedef struct
+{
+    UInt16		length;
+    UInt16		loginID;
+    UInt32		commandBlockAgentAddressHi;
+    UInt32		commandBlockAgentAddressLo;
+    UInt16		reserved;
+    UInt16		reconnectHold;
+} FWSBP2LoginResponse, *FWSBP2LoginResponsePtr;
+
+/*! 
+    @typedef FWSBP2StatusBlock
+    @param details Src, Resp, D, Len fields of status block format
+    @param sbpStatus SBP2 specific status
+    @param orbOffsetHi High 32 bits of address of orb status is for.
+    @param orbOffsetLo Low 32 bits of address of orb status is for.
+    @param status[6] Up to 48 bytes of additional data. Length is determined by len field.
+*/
+
+typedef struct
+{
+    UInt8		details;
+    UInt8		sbpStatus;
+    UInt16		orbOffsetHi;
+    UInt32		orbOffsetLo;
+    UInt32		status[6];	
+} FWSBP2StatusBlock;
+
+class IOFireWireSBP2LUN;
+class IOFireWireSBP2Login;
+
+// struct sent to login complete handler
+
+/*! 
+    @typedef FWSBP2LoginCompleteParams
+    @param login Pointer to IOFireWireSBP2Login object.
+    @param generation FireWire generation value.
+    @param status Status of login attempt.
+    @param loginResponse Pointer to login response struct.
+    @param statusBlock Pointer to status block buffer.
+    @param statusBlockLength Length of entire status block.
+*/
+
+typedef struct
+{
+    IOFireWireSBP2Login * 	login;			// login object this param is sent from
+    UInt32					generation;		// generation this login was attempted in 
+  
+    IOReturn				status;			// status of login attempt
+	
+    FWSBP2LoginResponsePtr	loginResponse;		// pointer to loginResponse buffer
+    FWSBP2StatusBlock *		statusBlock;		// pointer to statusBlock buffer
+    UInt32					statusBlockLength;	// size of statusBlock buffer
+	
+} FWSBP2LoginCompleteParams, *FWSBP2LoginCompleteParamsPtr;
+
+// struct sent to logout complete handler
+
+/*! 
+    @typedef FWSBP2LogoutCompleteParams
+    @param login Pointer to IOFireWireSBP2Login object.
+    @param generation FireWire generation value.
+    @param status Status of login attempt.
+    @param statusBlock Pointer to status block buffer.
+    @param statusBlockLength Length of entire status block.
+*/
+
+typedef struct
+{
+    IOFireWireSBP2Login * 	login;			// login object this param is sent from
+    UInt32					generation;		// generation this login was attempted in
+
+    IOReturn				status;			// status of login attempt
+	
+    FWSBP2StatusBlock *		statusBlock;		// pointer to statusBlock buffer
+    UInt32					statusBlockLength;	// size of statusBlock buffer
+	
+} FWSBP2LogoutCompleteParams, *FWSBP2LogoutCompleteParamsPtr;
+
+// struct sent with reconnect notification
+
+/*! 
+    @typedef FWSBP2LogoutCompleteParams
+    @param login Pointer to IOFireWireSBP2Login object.
+    @param generation FireWire generation value.
+    @param status Status of login attempt.
+    @param reconnectStatusBlock Pointer to status block buffer.
+    @param reconnectStatusBlockLength Length of entire status block.
+*/
+
+typedef struct
+{
+    IOFireWireSBP2Login * 	login;			// login object this param is sent from
+    UInt32					generation;		// generation this login was attempted in
+
+    IOReturn			status;			// status of reconnect attempt
+
+    void *			reconnectStatusBlock;		// pointer to statusBlock buffer
+    UInt32			reconnectStatusBlockLength;	// size of statusBlock buffer
+} FWSBP2ReconnectParams, *FWSBP2ReconnectParamsPtr;
+
+// Callback when login and logout commands complete asynchronously
+
+/*! 
+    @typedef FWSBP2LoginCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param params Structure containing additional information about the status of the login. 
+*/
+    
+typedef void (*FWSBP2LoginCallback)(void * refCon, FWSBP2LoginCompleteParamsPtr params);
+
+/*! 
+    @typedef FWSBP2LogoutCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param params Structure containing additional information about the status of the logout. 
+*/
+
+typedef void (*FWSBP2LogoutCallback)(void * refCon, FWSBP2LogoutCompleteParamsPtr params);
+
+/*! 
+    @typedef FWSBP2StatusCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param status Indicates success or failure of operation. 
+*/
+
+typedef void (*FWSBP2StatusCallback)(void * refCon, IOReturn status);
+
+/*! 
+    @typedef FWSBP2FetchAgentWriteCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param status Indicates success or failure of operation. 
+    @param orb Indicates current last orb in chain.
+*/
+
+typedef void (*FWSBP2FetchAgentWriteCallback)(void * refCon, IOReturn status, IOFireWireSBP2ORB * orb);
+
+/*! 
+    @typedef FWSBP2NotifyParams
+    @param notificationEvent Type of event we are being notified of.
+    @param message buffer containing message.
+    @param length length of message field.
+    @param generation FireWire generation value.
+*/
+
+typedef struct
+{
+    void *				commandObject;
+    UInt32 				notificationEvent;
+    const void * 		message;
+    UInt32				length;
+    UInt32				generation;
+} FWSBP2NotifyParams, *FWSBP2NotifyParamsPtr;
+
+
+/*! 
+    @typedef FWSBP2NotifyCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param params FWSBP2NotifyParams containing notification information.
+*/
+
+typedef void (*FWSBP2NotifyCallback)(void * refCon, FWSBP2NotifyParamsPtr params);
+
+/*!
+    @class IOFireWireSBP2Login
+    @abstract Supplies the login maintenance and Normal Command ORB execution portions of the API.
+    @discussion Supplies APIs for login maintenance and command execution.  Drivers can use this 
+    object to create IOFireWireSBP2ORB objects and execute them.  Solicited and unsolicited status 
+    callback routines can be registered and the SBP2 services will notify the driver when the 
+    appropriate status arrives.
+    This class also handles login maintenance.  Supplies APIs for logging in and logging out and 
+    attempts to reconnect to the LUN after bus resets.  The base FireWire services deliver bus 
+    reset notification via the IOKit message routine.  The SBP2 services build on this behavior 
+    and deliver reconnectFailed and reconnectComplete through the message routine as well.
+*/
+
+class IOFireWireSBP2Login : public OSObject
+{
+    OSDeclareDefaultStructors( IOFireWireSBP2Login )
+
+	friend class IOFireWireSBP2ORB;
+	friend class IOFireWireSBP2LUN;
+	friend class IOFireWireSBP2UserClient;
+	
+protected:
+
+    // command selectors
+    enum
+    {
+        kLoginCommandIdle		= 0,
+        kLoginCommandDoLogin 	= 1,
+        kLoginCommandDoLogout	= 2,
+        kLoginAddORB			= 3,
+        kLoginRemoveORB			= 4,
+		kLoginFetchAgentReset	= 5
+     };
+
+    // internal login states
+    enum
+    {
+        kLoginStateIdle			= 0,
+        kLoginStateLoggingIn	= 1,
+        kLoginStateConnected	= 2,
+        kLoginStateReconnect	= 3,
+        kLoginStateLoggingOut	= 4,
+		kLoginStateTerminated	= 5
+    };
+
+    // rom keys
+    enum
+    {
+        kUnitCharacteristicsKey 	= 0x3A,
+        kManagementAgentOffsetKey	= 0x54
+    };
+
+    // sbp2 defs
+    enum
+    {
+        kFWSBP2RequestComplete 	= 0,
+        kFWSBP2TransportFailure	= 1,
+        kFWSBP2IllegalRequest	= 2,
+        kFWSBP2VendorDependent	= 3
+    };
+
+    enum
+    {
+        kFWSBP2NoSense					= 0,
+        kFWSBP2RequestTypeNotSupported	= 1,
+        kFWSBP2SpeedNotSupported		= 2,
+        kFWSBP2PageSizeNotSupported		= 3,
+        kFWSBP2AccessDenied				= 4,
+        kFWSBP2LogicalUnitNotSupported	= 5,
+        kFWSBP2MaxPayloadTooSmall		= 6,
+        kFWSBP2FunctionRejected			= 9,
+        kFWSBP2LoginIDNotRecognized		= 10,
+        kFWSBP2DummyORBCompleted		= 11,
+        kFWSBP2RequestAborted			= 12,
+        kFWSBP2UnspecifiedError			= 0xFF
+    };
+
+    typedef struct
+    {
+        UInt32		password[2];
+        UInt32		loginResponseAddressHi;
+        UInt32		loginResponseAddressLo;
+        UInt16		options;
+        UInt16		lun;
+        UInt16		passwordLength;
+        UInt16		loginResponseLength;
+        UInt32		statusFIFOAddressHi;
+        UInt32		statusFIFOAddressLo;
+    } FWSBP2LoginORB;
+
+    typedef struct
+    {
+        UInt32		reserved1[4];
+        UInt16		options;
+        UInt16		loginID;
+        UInt32		reserved2;
+        UInt32		statusFIFOAddressHi;
+        UInt32		statusFIFOAddressLo;
+    } FWSBP2ReconnectORB;
+    
+    typedef struct
+    {
+        UInt32		reserved1[4];
+        UInt16		options;
+        UInt16		loginID;
+        UInt32		reserved2;
+        UInt32		statusFIFOAddressHi;
+        UInt32		statusFIFOAddressLo;
+    } FWSBP2LogoutORB;
+
+protected:
+
+    ///////////////////////////////////////////////////////////////////
+    // private interface methods
+
+	// IOFireWireSBP2LUN methods
+	virtual void clearAllTasksInSet( void );
+    virtual bool initWithLUN( IOFireWireSBP2LUN * lun );
+    virtual void suspendedNotify( void );
+    virtual void resumeNotify( void );
+	
+	// IOFireWireSBP2ORB methods
+	virtual IOFireWireUnit * getFireWireUnit( void );
+    virtual IOFireWireSBP2LUN * getFireWireLUN( void );
+    virtual bool isFetchAgentWriteInProgress( void );
+    virtual bool isConnected( void );
+    virtual IOReturn removeORB( IOFireWireSBP2ORB * orb );
+    virtual IOReturn appendORBImmediate( IOFireWireSBP2ORB * orb );
+    virtual IOReturn appendORB( IOFireWireSBP2ORB * orb );
+    virtual void sendTimeoutNotification( IOFireWireSBP2ORB * orb );
+     
+protected:
+  
+    // reserved for future use
+    struct ExpansionData { };
+    ExpansionData *reserved; 
+          
+    IOFireWireSBP2LUN * 	fLUN;
+    IOFireWireUnit *		fUnit;
+	IOFireWireController *	fControl;
+	IOCommandGate * 		fGate;
+
+    FWSBP2LoginCallback		fLoginCompletionCallback;
+    void *	  				fLoginCompletionRefCon;
+
+    FWSBP2LogoutCallback	fLogoutCompletionCallback;
+    void *					fLogoutCompletionRefCon;
+    
+    FWSBP2NotifyCallback	fStatusNotifyCallback;
+    void *					fStatusNotifyRefCon;
+
+    FWSBP2NotifyCallback	fUnsolicitedStatusNotifyCallback;
+    void *					fUnsolicitedStatusNotifyRefCon;
+    
+    UInt32					fLoginFlags;
+    UInt32					fReconnectTime;
+    
+    UInt32					fLoginState;
+    UInt32					fManagementOffset;
+    UInt32					fManagementTimeout;
+    UInt32					fMaxORBSize;
+    UInt32					fMaxCommandBlockSize;
+    UInt16					fLoginNodeID;
+    UInt32					fLoginGeneration;
+    UInt32					fLoginID;
+    UInt32					fReconnectHold;
+    UInt32					fMaxPayloadSize;
+    void *					fRefCon;
+    
+    // resources
+    
+    FWSBP2LoginORB			fLoginORB;
+    IOFWAddressSpace *		fLoginORBAddressSpace;
+    FWAddress				fLoginORBAddress;
+
+    FWSBP2LoginResponse		fLoginResponse;
+    IOFWAddressSpace *		fLoginResponseAddressSpace;
+    FWAddress				fLoginResponseAddress;
+
+    FWSBP2ReconnectORB		fReconnectORB;
+    IOFWAddressSpace *		fReconnectORBAddressSpace;
+    FWAddress				fReconnectORBAddress;
+    
+    FWSBP2StatusBlock		fStatusBlock;
+    IOFWAddressSpace *		fStatusBlockAddressSpace;
+    FWAddress				fStatusBlockAddress;
+
+    FWSBP2StatusBlock		fReconnectStatusBlock;
+    IOFWAddressSpace *		fReconnectStatusBlockAddressSpace;
+    FWAddress				fReconnectStatusBlockAddress;
+
+    FWSBP2LogoutORB			fLogoutORB;
+    IOFWAddressSpace *		fLogoutORBAddressSpace;
+    FWAddress				fLogoutORBAddress;
+    bool					fLogoutPending;
+	
+    IOFWWriteCommand *		fLoginWriteCommand;
+    IOMemoryDescriptor *	fLoginWriteCommandMemory;
+    bool					fLoginWriteInProgress;
+     
+    IOFWWriteCommand *		fReconnectWriteCommand;
+    IOMemoryDescriptor *	fReconnectWriteCommandMemory;
+    bool					fReconnectWriteInProgress;
+    bool					fReconnectWriteInterrupted;
+    
+    IOFWWriteCommand *		fLogoutWriteCommand;
+    IOMemoryDescriptor *	fLogoutWriteCommandMemory;
+    bool					fLogoutWriteInProgress;
+    
+    IOFWCommand *			fLoginTimeoutCommand;
+    bool					fLoginTimeoutTimerSet;
+
+    IOFWDelayCommand *		fReconnectTimeoutCommand;
+    bool					fReconnectTimeoutTimerSet;
+
+    IOFWCommand *			fLogoutTimeoutCommand;
+    bool					fLogoutTimeoutTimerSet;
+
+    FWAddress 				fFetchAgentAddress;
+    IOMemoryDescriptor *	fFetchAgentWriteCommandMemory;
+    FWAddress 				fLastORBAddress;
+    IOFireWireSBP2ORB *		fLastORB;
+    IOFWWriteCommand *		fFetchAgentWriteCommand;
+    bool					fFetchAgentWriteCommandInUse;
+	FWSBP2FetchAgentWriteCallback 	fFetchAgentWriteCompletion;
+	void * 							fFetchAgentWriteRefCon;
+	IOFireWireSBP2ORB *		fORBToWrite;
+	
+    OSSet *					fORBSet;
+    OSIterator *			fORBSetIterator;
+ 
+    void *					fPasswordBuf;
+    UInt32					fPasswordLen;
+    IOFWAddressSpace *		fPasswordAddressSpace;
+    FWAddress				fPasswordAddress;
+	IOMemoryDescriptor *	fPasswordDescriptor;
+
+	bool fSuspended;
+	
+	UInt32					fLoginRetryDelay;
+	UInt32					fLoginRetryCount;
+	UInt32					fLoginRetryMax;
+	IOFWDelayCommand *		fLoginRetryTimeoutCommand;
+    bool					fLoginRetryTimeoutTimerSet;
+	IOFireWireSBP2Target * 	fTarget;
+	
+	bool					fUnsolicitedStatusEnableRequested;
+	
+	IOFWDelayCommand *		fReconnectRetryTimeoutCommand;
+    bool					fReconnectRetryTimeoutTimerSet;	
+
+	int						fCriticalSectionCount;
+	
+	// init / destroy
+    virtual IOReturn getUnitInformation( void );
+    virtual IOReturn allocateResources( void );
+    virtual void free( void );
+        	
+	// orb add / remove
+	virtual IOReturn addORB( IOFireWireSBP2ORB * orb );
+	static IOReturn staticExecuteAddORB( OSObject *self, void * orb, void *, void *, void * );
+	virtual IOReturn executeAddORB( IOFireWireSBP2ORB * orb );
+
+	static IOReturn staticExecuteRemoveORB( OSObject *self, void * orb, void *, void *, void * );
+	virtual IOReturn executeRemoveORB( IOFireWireSBP2ORB * orb );
+
+    //
+    // login
+    //
+
+    static IOReturn staticExecuteLogin( OSObject *self, void *, void *, void *, void * );
+    virtual IOReturn executeLogin( void );
+    virtual void abortLogin( void );
+    
+    // login write complete handler
+    static void loginWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+    virtual void loginWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+    // login timeout handler
+    static void loginTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+    virtual void loginTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+
+    // status block write handler
+    static UInt32 statusBlockWriteStatic(void *refcon, UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
+                                         const void *buf, IOFWRequestRefCon lockRead);
+   	virtual UInt32 statusBlockWrite( UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len, const void *buf, IOFWRequestRefCon lockRead);
+	virtual void completeLogin( IOReturn state, const void *buf = NULL, UInt32 len = 0, void * buf2 = NULL );
+
+    //
+    // reconnect
+    //
+    
+    virtual void doReconnect( void );
+    virtual void restartReconnect( void );
+    virtual void startReconnectTimer( void );
+
+    // reconnect write complete handler
+    static void reconnectWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+    virtual void reconnectWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+    // reconnect timeout handler
+    static void reconnectTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+    virtual void reconnectTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+
+    // reconnect status block
+    static UInt32 reconnectStatusBlockWriteStatic(void *refcon, UInt16 nodeID, IOFWSpeed &speed, FWAddress addr,
+                                                  UInt32 len, const void *buf, IOFWRequestRefCon lockRead);
+   	virtual UInt32 reconnectStatusBlockWrite( UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
+                                              const void *buf, IOFWRequestRefCon lockRead);
+
+    virtual void sendReconnectNotification( UInt32 event );
+    virtual void sendReconnectNotificationWithStatusBlock( UInt32 event );
+
+    //
+    // logout
+    //
+    
+	static IOReturn staticExecuteLogout( OSObject *self, void *, void *, void *, void * );
+    virtual IOReturn executeLogout( void );
+    
+    // logout write complete handler
+    static void logoutWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+    virtual void logoutWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+    // logout timeout handler
+    static void logoutTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+    virtual void logoutTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+	
+	virtual void completeLogout( IOReturn state, const void *buf = NULL, UInt32 len = 0);
+
+	// fetch agent write complete handler
+    static void fetchAgentWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+    virtual void fetchAgentWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+    //
+    // fetch agent
+    //
+
+	bool 							fFetchAgentResetInProgress;
+	UInt32 							fFetchAgentResetBuffer;
+	FWAddress 						fFetchAgentResetAddress;
+	IOFWWriteQuadCommand *			fFetchAgentResetCommand;
+	void * 							fFetchAgentResetRefCon;
+	FWSBP2StatusCallback 			fFetchAgentResetCompletion;
+
+	static IOReturn staticExecuteFetchAgentReset( OSObject *self, void *, void *, void *, void * );
+	virtual IOReturn executeFetchAgentReset( void );
+	static void fetchAgentResetCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+	virtual void fetchAgentResetComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+	//
+	// doorbell
+	//
+	
+	bool 							fDoorbellInProgress;
+	bool							fDoorbellRingAgain;
+	UInt32 							fDoorbellBuffer;
+	FWAddress 						fDoorbellAddress;
+	IOFWWriteQuadCommand *			fDoorbellCommand;
+	
+	static IOReturn staticExecuteDoorbell( OSObject *self, void *, void *, void *, void * );
+	virtual IOReturn executeDoorbell( void );
+	static void doorbellCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+	virtual void doorbellComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+	//
+	// enable unsolicited satus
+	//
+
+	bool 							fUnsolicitedStatusEnableInProgress;
+	UInt32 							fUnsolicitedStatusEnableBuffer;
+	FWAddress 						fUnsolicitedStatusEnableAddress;
+	IOFWWriteQuadCommand *			fUnsolicitedStatusEnableCommand;
+
+	static IOReturn staticExecuteUnsolicitedStatusEnable( OSObject *self, void *, void *, void *, void * );
+	virtual IOReturn executeUnsolicitedStatusEnable( void );
+	static void unsolicitedStatusEnableCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+	virtual void unsolicitedStatusEnableComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+	//
+	// busy timeout stuff
+	//
+	
+	bool 							fSetBusyTimeoutInProgress;
+	UInt32 							fSetBusyTimeoutBuffer;
+	FWAddress 						fSetBusyTimeoutAddress;
+	IOFWWriteQuadCommand *			fSetBusyTimeoutCommand;
+	
+	bool							fInCriticalSection;
+
+	UInt16					fLocalNodeID;
+	bool					fFastStartSupported;
+	UInt32					fFastStartOffset;
+	UInt32					fFastStartMaxPayload;
+	
+	UInt32					fUserLoginGeneration;
+	bool					fUserLoginGenerationSet;
+	
+	IOFWDelayCommand *		fFetchAgentRetryTimerCommand;
+    bool					fFetchAgentRetryTimerSet;	
+	
+	virtual IOReturn executeSetBusyTimeout( void );
+	static void setBusyTimeoutCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+	virtual void setBusyTimeoutComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
+
+private:
+	// IOFireWireSBP2ORB friend class wrappers
+	OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 0);
+
+protected: 									
+	virtual bool initORBWithLogin( IOFireWireSBP2ORB * orb, IOFireWireSBP2Login * login );
+	virtual void setNextORBAddress( IOFireWireSBP2ORB * orb, FWAddress address );
+    virtual void fetchAgentWriteComplete( IOFireWireSBP2ORB * orb, IOReturn status );
+    virtual bool isORBTimerSet( IOFireWireSBP2ORB * orb );
+    virtual void cancelORBTimer( IOFireWireSBP2ORB * orb );
+	
+	// IOFireWireSBP2LUN friend class wrappers
+	virtual void removeLogin( void );
+	virtual IOFireWireSBP2Target * getTarget( void );
+	
+	UInt32		fARDMAMax;
+	bool		fPhysicalAccessEnabled;
+
+	bool					fLoginStatusReceived;
+	FWSBP2StatusBlock		fLoginStatusBlock;
+	UInt32					fLoginStatusBlockLen;
+		
+private:
+
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 4);
+	OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 5);
+
+public:
+
+	//////////////////////////////
+
+    /*!
+		@function createORB
+		@abstract Creates a new IOFireWireSBP2ORB for this login.
+		@discussion	Create a new IOFireWireSBP2ORB for this login.  It can be configured 
+        with it's accessors and executed with submitORB below.
+        @result Returns a pointer to the new ORB object.
+	*/
+    	
+	virtual IOFireWireSBP2ORB * createORB( void );
+	
+    /*!
+		@function submitORB
+		@abstract Submits the given orb
+		@discussion	Starts execution of the given ORB.  If the ORB is an immediate ORB it's 
+        addresss is written to the fetch agent.  If it is a non immediate orb its address 
+        is appended to the last orb of the currently processing chain.  The doorbell is not 
+        rung automatically it must be run manually with the ringDoorbell command described below.
+        @param orb The orb to be executed.	
+        @result Returns kIOReturnSuccess if the ORB has been started successfully.
+	*/
+    
+    virtual IOReturn submitORB( IOFireWireSBP2ORB * orb );
+
+    // set callbacks
+    
+    /*!
+		@function setStatusNotifyProc
+		@abstract Sets the callback to be called on normal command status.
+		@discussion The supplied callback is called when normal command status is recieved, when 
+        a normal command times out, or when a normal command is aborted. 
+        "notificationEvent" in the callback's params will indicate what happened.
+        It will be set to one of the following values: kFWSBP2NormalCommandReset, kFWSBP2NormalCommandStatus, 
+        or kFWSBP2NormalCommandTimeout.  If the event type is kFWSBP2NormalCommandTimeout and "len" is 
+        non-zero then "message" contains the data written to the status block.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2NotifyCallback.
+	*/
+    
+    virtual void setStatusNotifyProc( void * refCon, FWSBP2NotifyCallback callback );
+
+    /*!
+		@function getStatusNotifyProc
+		@abstract Returns the callback to be called on normal command status.
+		@discussion Returns the refCon and callback address of the status notify callback.
+        @param refCon output parameter returning the refCon to be passed to the callback.	
+        @param callback output parameter returning the address of the callback.
+	*/
+    
+    virtual void getStatusNotifyProc( void ** refCon, FWSBP2NotifyCallback * callback );
+
+    /*!
+		@function setUnsolicitedStatusNotifyProc
+		@abstract Sets the callback to be called on normal command status.
+		@discussion The supplied callback is called when unsolicited status is recieved.
+        "notificationEvent" in the callback's params will indicate what happened.  In this 
+        case it will be set to kFWSBP2UnsolicitedStatus. If "len" is 
+        non-zero then "message" contains the data written to the status block. Note: any buffers 
+        returned by callbacks are only valid for the duration of the login and should not have 
+        their contents modified.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2NotifyCallback.
+	*/
+    
+    virtual void setUnsolicitedStatusNotifyProc( void * refCon, FWSBP2NotifyCallback callback );
+    
+    /*!
+		@function getUnsolicitedStatusNotifyProc
+		@abstract Returns the callback to be called on unsolicited status.
+		@discussion Returns the refCon and callback address of the unsolicited status notify callback.
+        @param refCon output parameter returning the refCon to be passed to the callback.	
+        @param callback output parameter returning the address of the callback.
+	*/
+    
+    virtual void getUnsolicitedStatusNotifyProc( void ** refCon, FWSBP2NotifyCallback * callback );
+
+    // command handling
+    
+    /*!
+		@function setLoginCompletion
+		@abstract Sets the callback to be called when a login attempt is complete.
+		@discussion The supplied callback is called when a login attempt has completed. "status" in the
+        callback's params should be checked to determine the success or failure of the login attempt.  
+        If "statusBlock" is non-null then login status was written and it has been supplied here.  If 
+        the login attempt was successful then the login response will be supplied in the "loginResponse" 
+        buffer.  Note: all buffers supplied to callbacks are only valid for the duration of the callback.  
+        Also, you are not to modify the contents of any supplied buffer.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2LoginCallback.
+	*/
+    
+	virtual void setLoginCompletion( void * refCon, FWSBP2LoginCallback completion );
+    
+    /*!
+		@function submitLogin
+		@abstract Attempts to login to the LUN.		
+        @discussion This call begins the login process.  The login object should be configured prior 
+        to this call. If kIOReturnSuccess is returned from this call then the loginCompletion routine 
+        will be called when the login completes (successfully or unsuccesfully). 
+        @result Returns kIOReturnSuccess login has successlly begun.
+	*/
+    
+    virtual IOReturn submitLogin( void );
+	
+    /*!
+		@function submitLogout
+		@abstract Attempts to logout of the LUN.		
+        @discussion This call begins the logout process.  If kIOReturnSuccess is returned from this call then
+        the logoutCompletion routine will be called when the logout completes (successfully or unsuccesfully). 
+        @result Returns kIOReturnSuccess if logout has successfully begun.
+	*/
+    
+    virtual IOReturn submitLogout( void );
+ 
+    /*!
+		@function setLogoutCompletion
+		@abstract Sets the callback to be called when a logout attempt is complete.
+		@discussion The supplied callback is called when a logout attempt has completed. "status" in the
+        callback's params should be checked to determine the success or failure of the logout attempt.  
+        If "statusBlock" is non-null then logout status was written and it has been supplied here. 
+        Note: all buffers supplied to callbacks are only valid for the duration of the callback.  
+        Also, you are not to modify the contents of any supplied buffer.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2LogoutCallback.
+	*/
+   
+    virtual void setLogoutCompletion( void * refCon, FWSBP2LogoutCallback completion );
+ 
+    /*!
+		@function setFetchAgentWriteCompletion
+		@abstract Sets the callback to be called when the fetch agent write completes.
+		@discussion When an immediate orb is executed with submitORB, it's address is written to a 
+        specific address on the device.  This address is called the fetch agent.  The device the 
+        reads that orb from the Mac's memory and executes it.  With this call you can register to 
+        be called back when this write to the fetch agent completes.  The SBP2 services guarantee 
+        that the fetch agent write will be complete before status is reported for an ORB, so for 
+        most drivers this notification is not required.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2FetchAgentWriteCallback.
+	*/
+       
+	virtual void setFetchAgentWriteCompletion( void * refCon, FWSBP2FetchAgentWriteCallback completion );
+
+    /*!
+		@function setFetchAgentResetCompletion
+		@abstract Sets the callback to be called when a fetch agent reset completes.
+		@discussion The fetch agent state machine on the device can be reset by a write to a specific 
+        register.  The SBP2 services offer a utility method to reset the fetch agent.  You can register 
+        a callback routine here to be notified when this rest write completes.
+        @param refCon refCon passed to callback.	
+        @param callback address of callback method of type FWSBP2FetchAgentWriteCallback.
+	*/
+    
+    virtual void setFetchAgentResetCompletion( void * refCon, FWSBP2StatusCallback completion );
+
+    /*!
+		@function submitFetchAgentReset
+		@abstract Resets the LUN's fetch agent.
+		@discussion The fetch agent state machine on the device can be reset by a write to a specific 
+        register.  This reset can be intiated by a call to this method.  Notification of the completion 
+        of this write can be had by registering a callback with the setFetchAgentResetCompletion method.
+        @result Returns kIOReturnSuccess if the reset started successfully.
+	*/
+    
+	virtual IOReturn submitFetchAgentReset( void );
+
+    /*!
+		@function ringDoorbell
+		@abstract Rings the doorbell on the LUN.
+		@discussion Non-immediate appends to the ORB chain may require the fetch agent state machine 
+        to be notified of the new ORB's presence.  This is accomplished by writing to the so called 
+        doorbell register.  This method begins one of those writes.
+        @result Returns kIOReturnSuccess if the ring started successfully.
+	*/
+    
+ 	virtual IOReturn ringDoorbell( void );
+    
+    /*!
+		@function enableUnsolicitedStatus
+		@abstract Enables unsolicited status.
+		@discussion After unsolicited is sent the device will not send any additional unsolicited status 
+        until a specific register is written.  This serves as a sort of flow-control for unsolicited status.  
+        After unsolicited status is recieved and processed drivers will want to reenable the delivery 
+        of unsolicted status by a call to this method.
+        @result Returns kIOReturnSuccess if the status enable write started successfully.
+	*/
+        
+	virtual IOReturn enableUnsolicitedStatus( void );
+	
+    // accessors
+    
+    /*!
+		@function getMaxCommandBlockSize
+		@abstract Returns the maximum command block size.
+		@discussion The device publishes an upper limit on the size of command block that it can 
+        accept.  That value can be accessed via this method.
+        @result Returns a UInt32 containing the maximum command block size.
+	*/
+    
+    virtual UInt32 getMaxCommandBlockSize( void );
+    
+    /*!
+		@function getLoginID
+		@abstract Returns the current login ID.
+		@discussion When we successfully login to a device.  The device gives us a unique login id.  
+        This is used internally for reconnecting to the device after bus resets and for certain other 
+        management ORBs.  Most drivers are probably not interested in this value.
+        @result Returns a UInt32 containing the current login ID.
+	*/
+    
+    virtual UInt32 getLoginID( void );
+
+    /*!
+		@function setLoginFlags
+		@abstract Sets login configuration flags.
+		@discussion Configures the login behavior according to the provided flags.  Currently two 
+        flags are defined for this API.  kFWSBP2ExclusiveLogin sets the exclusive login bit in the 
+        login ORB. kFWSBP2DontSynchronizeMgmtAgent allows simultaneous logins or reconnects to LUNs
+        with a common management agent (ie LUNs in the same unit directory).
+        @param loginFlags the login configuration flags.
+	*/
+    
+    virtual void setLoginFlags( UInt32 loginFlags );
+    
+    /*!
+		@function getLoginFlags
+		@abstract Returns the currently set login flags.
+		@discussion Returns the current state of the login flags.  Currently there is only one
+        flag defined for this API.  kFWSBP2ExclusiveLogin indicates that the exclusive login bit
+        should be set in the login ORB.
+        @result Returns a UInt32 containing the currently set login flags.
+	*/
+    
+    virtual UInt32 getLoginFlags( void );
+
+    /*!
+		@function setReconnectTime
+		@abstract Sets the desired reconnect duration.
+		@discussion The target and initiator arbitrate the duration of the reconnect timeout.  Here 
+        the initiator specifies its desired timeout time in 2^reconnectTime seconds.  After a 
+        successful login the device returns the actual timeout value it wishes to use.  This value 
+        may be less than the reconnect timeout that the intiator specified if this is all that the 
+        device can support.
+        @param reconnectTime The desired reconnect timeout encoded as 2^reconnectTime seconds.
+	*/
+    
+    virtual void setReconnectTime( UInt32 reconnectTime );
+    
+    /*!
+		@function getReconnectTime
+		@abstract Returns the currently set reconnect time.
+		@discussion Returns the currently desired initiator reconnect time encoded as 2^time seconds.
+        @result Returns a UInt32 containing the currently set reconnect time.
+	*/
+    
+    virtual UInt32 getReconnectTime( void );
+
+    /*!
+		@function setMaxPayloadSize
+		@abstract Sets the maximum data transfer length for a normal command ORB.
+		@discussion Sets the maximum data transfer length for a normal command ORB.  This value is 
+        the maximum for all ORBs sent to this LUN.  This can be trimmed further on an ORB by ORB basis, 
+        by a similar call in the IOFireWireSBP2ORB itself.
+        @param reconnectTime The desired maximum payload size in bytes.
+	*/
+    
+    virtual void setMaxPayloadSize( UInt32 maxPayloadSize );
+    
+    /*!
+		@function getMaxPayloadSize
+		@abstract Returns the currently set maximum payload size.
+		@discussion Returns the currently global maximum payload size in bytes.
+        @result Returns a UInt32 containing the currently set maximum payload size.
+	*/
+
+    virtual UInt32 getMaxPayloadSize( void );
+
+    /*!
+		@function setPassword
+		@abstract Sets the login password.
+		@discussion Sets the login password using a buffer and a length.  An alternate version exists 
+        that accepts an IOMemoryDescriptor.  If the password length is 8 or less the password is copied 
+        directly into the login orb.  If the length is greater than 8 the buffer is referenced by address 
+        in the login ORB.  In this case the buffer is not copied and should remain allocated for the 
+        duration of the login attempt.
+        @param buf a pointer to the password buffer.
+        @param len the length in bytes of the password buffer.
+        @result Returns kIOReturnSuccess on success.
+	*/
+
+    virtual IOReturn setPassword( void * buf, UInt32 len );
+
+    /*!
+		@function setPassword
+		@abstract Sets the login password.
+		@discussion Sets the login password using an IOMemoryDescriptor.  An alternate version exists 
+        that accepts a buffer and a length.  If the password length is 8 or less the password is copied 
+        directly into the login orb.  If the length is greater than 8 the buffer is referenced by address 
+        in the login ORB.
+        @param memory an IOMemoryDescriptor referencing the password.
+        @result Returns kIOReturnSuccess on success.
+	*/
+    
+    virtual IOReturn setPassword( IOMemoryDescriptor * memory );
+
+
+    /*!
+		@function setRefCon
+		@abstract Sets the login refCon.
+		@discussion Sets a user defined value on the login that can be retrieved later with the 
+        method getRefCon.
+        @param refCon a user defined value.
+    */
+    
+    virtual void setRefCon( void * refCon );
+    
+    /*!
+		@function getRefCon
+		@abstract Returns the refCon set with setRefCon.
+		@discussion Returns the user defined value previously stored in the login with setRefCon.
+        @result Returns the previously stored user defined value.
+	*/
+    
+    virtual void * getRefCon( void );
+	
+    /*!
+		@function setBusyTimeoutRegisterValue
+		@abstract Sets the value to be written to the BUSY_TIMEOUT register.
+		@discussion 1394-1995 defines a register known as the BUSY_TIMEOUT register. This register 
+        controls the busy retry behavior of your device.  The initial value for this register is 
+        0x00000000.  Which means busied transactions will not be retried.  Since most devices want 
+        their transactions retired on busy acks, the SBP2 service automatically updates the 
+        BUSY_TIMEOUT register with the value specified here whenever necessary.  Most drivers should 
+        set this value to 0x0000000f.
+        @param timeout desired value of the BUSY_TIMEOUT register.
+    */
+    
+	virtual void setBusyTimeoutRegisterValue( UInt32 timeout );
+    
+protected:
+
+    virtual void startORBTimer( IOFireWireSBP2ORB * orb );
+    virtual void prepareORBForExecution( IOFireWireSBP2ORB * orb );
+
+    static IOReturn staticExecuteORB( OSObject *self, void * orb, void *, void *, void * );
+    virtual IOReturn executeORB( IOFireWireSBP2ORB * orb );
+
+public:
+
+    /*! 
+        @function release
+        @abstract Primary implementation of the release mechanism.
+        @discussion See OSObject.h for more information.  When retainCount == when then call free(). 
+    */
+    
+    virtual void release() const;
+	
+	/*! 
+        @function setLoginRetryCountAndDelayTime
+        @abstract Sets login retry behavior.
+        @discussion Sets login retry behavior.
+        @param retryCount number of times to retry logins
+		@param uSecs delay time in microseconds between login retries
+    */
+	
+	virtual void setLoginRetryCountAndDelayTime( UInt32 retryCount, UInt32 uSecs );
+	
+protected:
+	virtual IOReturn initialExecuteLogin( void );
+	virtual void startLoginRetryTimer( void );
+	virtual void stopLoginRetryTimer( void );
+	static void loginRetryTimeoutStatic( void *refcon, IOReturn status,
+										 IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+	virtual void loginRetryTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd);
+
+	virtual void startReconnectRetryTimer( void );
+	virtual void stopReconnectRetryTimer( void );
+	static void reconnectRetryTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+	virtual void reconnectRetryTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+
+	virtual bool isORBAppended( IOFireWireSBP2ORB * orb );
+	virtual void setORBIsAppended( IOFireWireSBP2ORB * orb, bool state );
+
+public:    
+	virtual void setAddressLoForLoginORBAndResponse( UInt32 addressLoORB, UInt32 addresLoResponse );
+	
+	virtual void setLoginGeneration( UInt32 generation );
+	virtual void clearLoginGeneration( void );
+
+protected:
+	void startFetchAgentRetryTimer( UInt32 duration );
+	void stopFetchAgentRetryTimer( void );
+	static void fetchAgentRetryTimerStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+	void fetchAgentRetryTimer( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+	
+	void terminateNotify( void );
+	void processLoginWrite( void );
+
+public:
+	
+	bool	isPhysicalAccessEnabled( void );
+	UInt32	getARDMMax( void );
+	
+private:
+    
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 8);
+
+ };
+
+#endif
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2ManagementORB.h b/i386/include/IOKit/sbp2/IOFireWireSBP2ManagementORB.h
new file mode 100644
index 0000000..9455383
--- /dev/null
+++ b/i386/include/IOKit/sbp2/IOFireWireSBP2ManagementORB.h
@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOFireWireSBP2ManagementORB
+  Contains the class definition for IOFireWireSBP2ManagementORB.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2MANAGEMENTORB_H
+#define _IOKIT_IOFIREWIRESBP2MANAGEMENTORB_H
+
+#include <IOKit/firewire/IOFWCommand.h>
+#include <IOKit/firewire/IOFireWireUnit.h>
+
+#include <IOKit/IOUserClient.h>
+
+class IOFireWireSBP2LUN;
+class IOFireWireSBP2ManagementORB;
+class IOFireWireSBP2ORB;
+
+enum
+{
+    kFWSBP2QueryLogins			= 1,
+    kFWSBP2AbortTask			= 0xb,
+    kFWSBP2AbortTaskSet			= 0xc,
+    kFWSBP2LogicalUnitReset		= 0xe,
+    kFWSBP2TargetReset			= 0xf
+};
+
+// Callback when management command completes asynchronously
+
+/*! 
+    @typedef FWSBP2ManagementCallback
+    @param refCon Reference constant supplied when the notification was registered.
+    @param status Indicates success or failure of operation. 
+    @param orb Indicates current orb status is for.
+*/
+
+typedef void (*FWSBP2ManagementCallback)(void * refCon, IOReturn status, IOFireWireSBP2ManagementORB * orb);
+
+/*!
+    @class IOFireWireSBP2ManagementORB
+    @abstract Supplies non login related management ORBs.  Management ORBs can be executed independent 
+    of a login, if necessary.  Management ORBs are created using the IOFireWireSBP2LUN interface.
+*/
+
+class IOFireWireSBP2ManagementORB : public IOFWCommand
+{
+    OSDeclareDefaultStructors( IOFireWireSBP2ManagementORB )
+
+	friend class IOFireWireSBP2LUN;
+	friend class IOFireWireSBP2UserClient;
+	
+protected:
+
+	////////////////////////////////////////            
+    // rom keys
+	
+    enum
+    {
+        kUnitCharacteristicsKey 	= 0x3A,
+        kManagementAgentOffsetKey	= 0x54
+    };
+
+	////////////////////////////////////////        
+	// structs
+	
+    typedef struct
+    {
+        UInt32		orbOffsetHi;
+        UInt32		orbOffsetLo;
+        UInt32		reserved1[2];
+        UInt16		options;
+        UInt16		loginID;
+        UInt32		reserved2;
+        UInt32		statusFIFOAddressHi;
+        UInt32		statusFIFOAddressLo;
+    } FWSBP2TaskManagementORB;
+
+    typedef struct
+    {
+        UInt32		reserved1[2];
+        UInt32		queryResponseAddressHi;
+        UInt32		queryResponseAddressLo;
+        UInt16		options;
+        UInt16		lun;
+        UInt16		reserved2;
+        UInt16		queryResponseLength;
+        UInt32		statusFIFOAddressHi;
+        UInt32		statusFIFOAddressLo;
+    } FWSBP2QueryLoginsORB;
+    
+    typedef struct
+    {
+        UInt8		details;
+        UInt8		sbpStatus;
+        UInt16		orbOffsetHi;
+        UInt32		orbOffsetLo;
+        UInt32		status[6];
+    } FWSBP2StatusBlock;
+
+protected:
+
+	////////////////////////////////////////        
+	// friend methods
+	
+    // IOFireWireSBP2LUN methods
+    virtual bool initWithLUN( 	IOFireWireSBP2LUN * lun, 
+								void * refCon,
+								FWSBP2ManagementCallback completion  );
+	
+	// IOFireWireSBP2UserClient methods
+    virtual void setAsyncCallbackReference( void * asyncRef );
+    virtual void getAsyncCallbackReference( void * asyncRef );
+
+protected:
+   
+    // reserved for future use
+    struct ExpansionData 
+	{
+		bool fInCriticalSection; 
+	};
+    ExpansionData * fExpansionData; 
+         
+    IOFireWireSBP2LUN * 		fLUN;
+    IOFireWireUnit *			fUnit;
+    
+    UInt32						fManagementOffset;
+    UInt32						fManagementTimeout;
+    UInt32						fFunction;
+    OSObject * 					fManageeCommand;
+    
+	// our orb
+    FWSBP2TaskManagementORB		fManagementORB;
+    IOFWAddressSpace *			fManagementORBAddressSpace;
+    FWAddress					fManagementORBAddress;
+
+	// command to write management agent
+    IOFWWriteCommand *			fWriteCommand;
+    IOMemoryDescriptor *		fWriteCommandMemory;
+
+	// timeout
+    IOFWCommand *				fTimeoutCommand;
+    bool						fTimeoutTimerSet;
+
+	// status block
+    FWSBP2StatusBlock			fStatusBlock;
+    IOFWAddressSpace *			fStatusBlockAddressSpace;
+    FWAddress					fStatusBlockAddress;
+
+	// response buffer
+    void *						fResponseBuf;
+    UInt32						fResponseLen;
+    IOFWAddressSpace *			fResponseAddressSpace;
+    FWAddress					fResponseAddress;
+
+	// competion routine
+	FWSBP2ManagementCallback	fCompletionCallback;
+    void * 						fCompletionRefCon;
+
+    // for user client
+    OSAsyncReference64			fCallbackAsyncRef;
+	
+	IOMemoryMap *				fResponseMap;
+	
+	bool						fCompleting;
+	
+	////////////////////////////////////////        
+
+    // init / destroy
+    virtual IOReturn getUnitInformation( void );
+    virtual IOReturn allocateResources( void );
+    virtual void free( void );
+        
+    // command execution
+    virtual IOReturn execute( void );
+    virtual IOReturn complete( IOReturn state );
+
+    // write complete handler
+    static void writeCompleteStatic( 	void *refcon, 
+										IOReturn status, 
+										IOFireWireNub *device, 
+										IOFWCommand *fwCmd );
+    virtual void writeComplete( IOReturn status, 
+								IOFireWireNub *device, 
+								IOFWCommand *fwCmd );
+
+    // timeout handler
+    static void handleTimeoutStatic( 	void *refcon, 
+										IOReturn status, 
+										IOFireWireBus *bus, 
+										IOFWBusCommand *fwCmd );
+    virtual void handleTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+
+    // status block write handler
+    static UInt32 statusBlockWriteStatic( 	void *refcon, 
+											UInt16 nodeID, 
+											IOFWSpeed &speed, 
+											FWAddress addr, 
+											UInt32 len,
+											const void *buf, 
+											IOFWRequestRefCon lockRead );
+    virtual UInt32 statusBlockWrite( 	UInt16 nodeID, 
+										FWAddress addr, 
+										UInt32 len, 
+										const void *buf, 
+										IOFWRequestRefCon lockRead );
+
+	// IOFireWireSBP2LUN friend class wrappers
+	virtual void clearAllTasksInSet( void );
+	virtual void removeManagementORB( IOFireWireSBP2ManagementORB * orb );
+	
+public:
+    
+	////////////////////////////////////////        
+    // client methods
+
+    /*!
+		@function setCommandFunction
+		@abstract Sets the function of the management ORB.
+		@discussion Sets the the function of the management ORB.  Legal values are kFWSBP2QueryLogins,
+        kFWSBP2AbortTask, kFWSBP2AbortTaskSet,  kFWSBP2LogicalUnitReset, and kFWSBP2TargetReset.
+        @param function a value indicating the desired management function.
+        @result Returns kIOReturnSuccess if function was a legal function.
+	*/
+    	
+    virtual IOReturn setCommandFunction( UInt32 function );
+    
+    /*!
+		@function getCommandFunction
+		@abstract Returns the current function of the management ORB.
+		@discussion Returns the function of the management ORB.  This is the same value that was 
+        set with setCommandFunction.
+        @result Returns the function of the management ORB.
+	*/
+    
+    virtual UInt32 getCommandFunction( void );
+
+    /*!
+		@function setManageeCommand
+		@abstract Sets the command to be managed by the management ORB.
+		@discussion All management functions except kFWSBP2QueryLogins require a reference to an ORB of 
+        some sort.  kFWSBP2AbortTaskSet,  kFWSBP2LogicalUnitReset, and kFWSBP2TargetReset require a 
+        reference to the login ORB.  kFWSBP2AbortTask requires a reference to the ORB to be aborted.  
+        This method allows you to set the ORB to be managed.
+        @param command a reference to an IOFireWireSBP2Login or an IOFireWireSBP2ORB.
+ 	*/
+    
+    virtual void setManageeCommand( OSObject * command );
+    
+    /*!
+		@function getCommandFunction
+		@abstract Returns the current managee command of the management ORB.
+		@discussion Returns the current managee command of the management ORB.  This is the same value that was 
+        set with setManageeCommand.
+        @result  Returns the current managee command of the management ORB.
+	*/
+    
+    virtual OSObject* getManageeCommand( void );
+
+    /*!
+		@function setResponseBuffer
+		@abstract Sets the response buffer for the management ORB.
+		@discussion Sets the response buffer for the management ORB.  kFWSBP2QueryLogins returns 
+        a response to its query and needs to write it somewhere.  This routine allows you to 
+        specify the location.
+        @param desc memory descriptor for buffer.
+        @result Returns kIOReturnSuccess on a success.
+	*/
+    
+	virtual IOReturn setResponseBuffer( IOMemoryDescriptor * desc );
+    
+    /*!
+		@function setResponseBuffer
+		@abstract Sets the response buffer for the management ORB.
+		@discussion Sets the response buffer for the management ORB.  kFWSBP2QueryLogins returns 
+        a response to its query and needs to write it somewhere.  This routine allows you to 
+        specify the location.        
+        @param buf backing store for buffer
+        @param len length of buffer.
+        @result Returns kIOReturnSuccess on a success.
+	*/
+    
+    virtual IOReturn setResponseBuffer( void * buf, UInt32 len );
+    
+    /*!
+		@function getResponseBuffer
+		@abstract Returns the response buffer for the management ORB.
+		@discussion Returns the response buffer set in setResponseBuffer above        
+        @param desc memory descriptor for buffer.
+        @param buf output parameter for backing store for buffer
+        @param len output parameter for length of buffer.
+	*/
+    
+    virtual void getResponseBuffer( void ** buf, UInt32 * len );
+
+    /*! 
+        @function release
+        @abstract Primary implementation of the release mechanism.
+        @discussion See OSObject.h for more information. 
+        @param when When retainCount == when then call free(). 
+    */
+    
+	virtual void release() const;
+
+protected:
+
+	virtual void setORBToDummy( IOFireWireSBP2ORB * orb );
+
+	virtual void suspendedNotify();
+
+private:
+
+    OSMetaClassDeclareReservedUsed(IOFireWireSBP2ManagementORB, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 8);
+    
+};
+
+#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h b/i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h
new file mode 100644
index 0000000..5c11593
--- /dev/null
+++ b/i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h
@@ -0,0 +1,547 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOFireWireSBP2ORB
+  Contains the class definition for IOFireWireSBP2ORB.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2ORB_H
+#define _IOKIT_IOFIREWIRESBP2ORB_H
+
+#include <IOKit/firewire/IOFireWireUnit.h>
+
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/IOUserClient.h>
+#include <IOKit/IODMACommand.h>
+
+enum
+{
+    kFWSBP2ConstraintForceDoubleBuffer		= (1 << 0)
+};
+
+// login option flags
+enum
+{
+    kFWSBP2CommandCompleteNotify			= (1 << 0),
+    kFWSBP2CommandTransferDataFromTarget	= (1 << 1),
+    kFWSBP2CommandImmediate					= (1 << 2),
+    
+    kFWSBP2CommandNormalORB					= (1 << 5),
+    kFWSBP2CommandReservedORB				= (1 << 6),
+    kFWSBP2CommandVendorORB					= (1 << 7),
+    kFWSBP2CommandDummyORB					= (1 << 8),
+    kFWSBP2CommandCheckGeneration			= (1 << 9),
+	
+	kFWSBP2CommandFixedSize					= (1 << 10),
+	kFWSBP2CommandVirtualORBs				= (1 << 11)     // handy for debugging
+};
+
+enum
+{
+    kFWSBP2MaxPageClusterSize = 0xf000
+};
+
+class IOFireWireSBP2ORB;
+class IOFireWireSBP2LUN;
+class IOFireWireSBP2Login;
+
+/*!
+    @class IOFireWireSBP2ORB
+    @abstract Represents an SBP2 normal command ORB.  Supplies the APIs for configuring normal
+    command ORBs.  This includes setting the command block and writing the page tables for I/O.
+    The ORBs are executed using the submitORB method in IOFireWireSBP2Login.
+*/
+
+class IOFireWireSBP2ORB : public IOCommand
+{
+    OSDeclareDefaultStructors( IOFireWireSBP2ORB )
+
+	friend class IOFireWireSBP2Login;
+	friend class IOFireWireSBP2ManagementORB;
+	
+protected:
+    
+    typedef struct
+    {
+        UInt32		nextORBAddressHi;
+        UInt32		nextORBAddressLo;
+        UInt32		dataDescriptorHi;
+        UInt32		dataDescriptorLo;
+        UInt16		options;
+        UInt16		dataSize;
+        UInt32		commandBlock[1];  // will be variable sized
+     } FWSBP2ORB;
+
+    typedef struct
+    {
+        UInt16		segmentLength;
+        UInt16		segmentBaseAddressHi;
+        UInt32		segmentBaseAddressLo;
+    } FWSBP2PTE;
+
+private:
+
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 8);
+
+protected:    
+
+    virtual void deallocateBufferAddressSpace( void );
+    virtual IOReturn allocateTimer( void );
+    virtual void deallocateTimer( void );
+    
+    /*!
+		@function deallocatePageTable
+		@abstract Frees up memory allocated for the page table.
+		@discussion	Frees all memory associated with the page table.  Undoes what allocatePageTable does. 
+        Calling allocatePageTable again will automatically deallocate the existing page table before 
+        allocating a new one, so this method is not used in most cases.
+	*/
+    
+    virtual void deallocatePageTable( void );
+
+protected:
+	
+    // IOFireWireSBP2Login methods
+	virtual bool initWithLogin( IOFireWireSBP2Login * login );
+    virtual void setNextORBAddress( FWAddress address );
+
+public:
+
+    /*!
+		@function allocatePageTable
+		@abstract Allocates memory for the page table.
+		@discussion	Page table allocation is handle automatically by the ORB, except if the 
+        kFWSBP2CommandFixedSize flags is set.  In this case we will fail to write a page table if we 
+        need more page table space than we have already.  This method is exposed so these drivers 
+        can preallocate as much page table as they need.  This is useful if your driver is part of 
+        the paging path and cannot allow allocations to occur.
+        @param entryCount number of entries of page table to be allocated.
+	*/
+
+    virtual IOReturn allocatePageTable( UInt32 entryCount );
+
+protected:
+
+    virtual bool isTimerSet( void );
+    virtual void cancelTimer( void );
+    
+protected:
+  
+    // reserved for future use
+    struct ExpansionData { };
+    ExpansionData *reserved; 
+       
+    IOFireWireSBP2Login *	fLogin;
+    IOFireWireSBP2LUN * 	fLUN;
+    IOFireWireUnit *		fUnit;
+    IOFireWireController *	fControl;
+    IODMACommand *			fDMACommand;
+	void *					fUnused2;
+	
+    UInt32			fCommandFlags;
+    UInt32			fMaxPayloadSize;
+    UInt32			fTimeoutDuration;
+    UInt32			fGeneration;
+    UInt64			fRefCon;
+
+	//
+    // orb
+    //
+	
+	IOMemoryDescriptor *		fORBDescriptor;
+    FWSBP2ORB *					fORBBuffer;
+	
+    FWAddress 					fORBPseudoAddress;
+    IOFWAddressSpace *			fORBPseudoAddressSpace;
+
+    IOFWAddressSpace *			fORBPhysicalAddressSpace;
+	FWAddress					fORBPhysicalAddress;
+
+	//
+    // page table
+    //
+	
+	UInt32						fPageTableSize;
+    IOBufferMemoryDescriptor *	fPageTableDescriptor;
+
+    IOFWAddressSpace *			fPageTablePhysicalAddressSpace;
+	FWAddress					fPageTablePhysicalAddress;
+	UInt32						fPageTablePhysicalLength;
+	
+	IOFWAddressSpace *			fPageTablePseudoAddressSpace;   
+	FWAddress					fPageTablePseudoAddress;
+
+	//
+    // buffers
+    //
+	
+	IOFWAddressSpace *		fBufferAddressSpace;
+    bool					fBufferAddressSpaceAllocated;
+    IOMemoryDescriptor *	fBufferDescriptor;
+    
+	//
+    // timer
+    //
+	
+	IOFWDelayCommand *		fTimeoutCommand;
+    bool					fTimeoutTimerSet;
+
+	bool					fInProgress;
+	bool					fIsAppended;
+	
+    UInt32					fFetchAgentWriteRetries;
+    UInt32					fPTECount;
+    UInt32					fFetchAgentWriteRetryInterval;
+
+	UInt32					fConstraintOptions;
+
+    virtual IOReturn allocateResources( void );
+    virtual void free( void );
+
+    // orb timeout handler
+    static void orbTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+    virtual void orbTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
+
+	// login friend class wrappers
+	virtual IOFireWireUnit * getFireWireUnit( void );
+	virtual IOFireWireSBP2LUN * getFireWireLUN( void );
+  	virtual void deallocateORB( void );
+	virtual IOReturn allocateORB( UInt32 orbSize );
+    virtual IOReturn removeORB( IOFireWireSBP2ORB * orb );
+    virtual void prepareORBForExecution( void );
+    virtual void startTimer( void );
+    virtual void sendTimeoutNotification( IOFireWireSBP2ORB * orb );
+
+public:
+ 
+    /*! 
+        @function release
+        @abstract Primary implementation of the release mechanism.
+        @discussion See OSObject.h for more information. 
+        @param when When retainCount == when then call free(). 
+    */
+       
+	virtual void release() const;
+
+    /*! 
+        @function getLogin
+        @abstract Gets the login associated with this ORB.
+        @discussion Returns the IOFireWireSBP2Login object associated with this ORB.
+        @result Returns a pointer to an IOFireWireSBP2Login. 
+    */
+    
+    virtual IOFireWireSBP2Login * getLogin( void );
+
+    /*! 
+        @function setCommandBuffersAsRanges
+        @abstract Creates a page table from a list of ranges.
+        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
+        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
+        The SBP2 services do not release references to the command buffers just because the command 
+        has completed.
+        @param ranges An array of ranges representing the data to be transfered.
+        @param withCount The number of ranges in the ranges array.
+        @param withDirection An IODirection indicating the direction of data transfer.
+        @param withTask The task that these adressses reside in.
+        @param offset Offset in bytes into data to begin writing table at.
+        @param length Number of bytes of data to map from offset.
+        @result Returns KIOReturnSuccess if the page table was written successfully. 
+    */
+    
+    virtual IOReturn setCommandBuffersAsRanges(  IOVirtualRange * ranges,
+                                                 UInt32           withCount,
+                                                 IODirection      withDirection,
+                                                 task_t           withTask,
+                                                 UInt32		offset = 0,
+                                                 UInt32		length = 0 );
+    /*! 
+        @function setCommandBuffersAsRanges
+        @abstract Creates a page table from a list of ranges.
+        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
+        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
+        The SBP2 services do not release references to the command buffers just because the command 
+        has completed.
+        @param memoryDescriptor IOMemoryDescriptor describe ranges to be written to a page table.
+        @param offset Offset in bytes into data to begin writing table at.
+        @param length Number of bytes of data to map from offset.
+        @result Returns KIOReturnSuccess if the page table was written successfully. 
+    */
+    
+    virtual IOReturn setCommandBuffers( IOMemoryDescriptor * memoryDescriptor, UInt32 offset = 0, 
+																				UInt32 length = 0 );
+
+
+    /*! 
+        @function releaseCommandBuffers
+        @abstract Releases SBP2's reference to the command buffers.
+        @discussion When you create a page table with one of the variants of setCommandBuffers.  
+        SBP2 holds on to a reference to the buffers until this method is called.  This means that 
+        if a command completed and you manipulated the memory descriptor or released the buffers 
+        without calling this method you could leave FW in an inconsistent state.  
+        @result Returns KIOReturnSuccess if the page table was cleared successfully. 
+    */
+
+    virtual IOReturn releaseCommandBuffers( void );
+    
+    /*! 
+        @function setCommandBlock
+        @abstract Sets the command block portion of the ORB.
+        @discussion Copys the data provided in the buffer to the command block portion of the ORB.
+        @param buffer Pointer to buffer to copy command block from.
+        @param length Number of bytes of data to copy.
+        @result Returns KIOReturnSuccess if the command block was updated successfully. 
+    */
+    
+    virtual IOReturn setCommandBlock( void * buffer, UInt32 length );
+    
+    /*! 
+        @function setCommandBlock
+        @abstract Sets the command block portion of the ORB.
+        @discussion Copys the data provided in the buffer to the command block portion of the ORB.
+        @param memory IOMemoryDescriptor representing the command block buffer.
+        @result Returns KIOReturnSuccess if the command block was updated successfully. 
+    */
+    
+    virtual IOReturn setCommandBlock( IOMemoryDescriptor * memory );
+    
+    /*! 
+        @function getCommandBufferDescriptor
+        @abstract Returns the memory descriptor representing the command buffer.
+        @discussion Returns the IOMemoryDescriptor for the data mapped by setCommandBuffer variants.  
+        Works for setCommandBuffersAsRanges too.
+        @result Returns memory descriptor representing mapped data buffers. 
+    */
+    
+	virtual IOMemoryDescriptor * getCommandBufferDescriptor( void );
+	
+    // accessors
+    
+    /*! 
+        @function setCommandFlags
+        @abstract Sets configuration flags for the ORB.
+        @discussion Sets the configuration flags for the ORB.  These can be any of the following:
+		<p>kFWSBP2CommandCompleteNotify - Set the notify bit as specified in SBP2 standard. Set to receive completion/timeout notification on this ORB.  You almost always want to set this.</p>
+		<p>kFWSBP2CommandTransferDataFromTarget - Transfer direction as specified in SBP2 standard.  Set if data is to be written by the device into the host's memory.</p>
+		<p>kFWSBP2CommandImmediate - Immediate Append.  ORB address will be written to fetch agent and not chained.  It is only legal to have one immediate ORB in progress at a time.</p>
+		<p>kFWSBP2CommandNormalORB - ORB format 0 - Format specified by SBP2 standard.  Set this for most ORBs.</p>
+		<p>kFWSBP2CommandReservedORB - ORB format 1 - Format reserved by SBP2 standard for future standardization.</p>
+		<p>kFWSBP2CommandVendorORB - ORB format 2 - Format specified by SBP2 standard for vendor dependent ORBs.</p>
+		<p>kFWSBP2CommandDummyORB - ORB format 3 - Format specified by SBP2 standard for dummy ORBs.</p>
+		<p>kFWSBP2CommandCheckGeneration - If set upon submitORB, the ORB will only be appended if generation set with setCommandGeneration() matches the current generation.  Pretty much all SBP2 drivers need sophisticated logic to track login state, so this is generally not used. </p>
+		<p>kFWSBP2CommandFixedSize - Do not allocate more memory for page table if needed.  If there is not enough space in the currently allocated page table, the setCommandBuffers call will fail.  This is important to set if your device is the backing store, as we don't want to cause memory allocations on the paging path. </p>
+		<p>kFWSBP2CommandVirtualORBs - Normally ORBs are backed by physical address spaces.  Setting this flag makes this ORB backed by a pseudo address space.  This can make ORBs easier to see in a bus trace.  Virtual ORBs will have an address in the form of ffcX.XXXX.0000.0000.  Pseudo address space backed ORBs are slower, so you won't want to set for deployment builds.</p>
+        @param flags The flags to be set.
+    */
+    
+    virtual void setCommandFlags( UInt32 flags );
+
+    /*! 
+        @function getCommandFlags
+        @abstract Sets configuration flags for the ORB.
+        @discussion Returns the current configuration flags set on this ORB.
+        @result Return The current ORB flags.
+    */
+    
+    virtual UInt32 getCommandFlags( void );
+
+    /*! 
+        @function setMaxPayloadSize
+        @abstract Sets max payload size for the ORB.
+        @discussion This sets the maximum payload size for this ORB only.  This size is clipped by 
+        the global max payload size set in the login object.
+        @param maxPayloadSize The maximum payload size in bytes.
+    */
+    
+    virtual void setMaxPayloadSize( UInt32 maxPayloadSize );
+
+    /*! 
+        @function getMaxPayloadSize
+        @abstract Gets max payload size for the ORB.
+        @discussion This gets the maximum payload size for this ORB only.
+        @result Returns the maximum payload size in bytes.
+    */
+    
+    virtual UInt32 getMaxPayloadSize( void );
+
+    /*! 
+        @function setCommandTimeout
+        @abstract Sets the timeout of the ORB.
+        @discussion This sets the timeout for the ORB in milliseconds. Note that ORBs without timeouts 
+        can be "lost."  You will obviously not recieve timeout notification for timeouts of zero.  But 
+        perhaps less obviously you will not recieve orb reset notification, which is really a sort of
+        accelerated timeout notification for bus reset situations.  
+        @param timeout The timeout duration in milliseconds.
+    */
+    
+    virtual void setCommandTimeout( UInt32 timeout );
+    
+    /*! 
+        @function getCommandTimeout
+        @abstract Gets the timeout of the ORB.
+        @discussion This method gets the timeout for this ORB in milliseconds.
+        @result Returns the timeout for the orb in milliseconds.
+    */
+    
+    virtual UInt32 getCommandTimeout( void );
+
+
+    /*! 
+        @function setCommandGeneration
+        @abstract Sets the command generation.
+        @discussion This sets the bus generation this ORB should be appended in.  It is only meaningful 
+        when combined with the kFWSBP2CommandCheckGeneration flags above.
+        @param gen The bus generation for command execution.
+    */
+    
+    virtual void setCommandGeneration( UInt32 gen );
+    
+    /*! 
+        @function getCommandGeneration
+        @abstract Gets the command generation.
+        @discussion This gets the bus generation this ORB should be appended in.
+        @result Returns the bus generation for command execution.
+    */
+    
+    virtual UInt32 getCommandGeneration( void );
+
+    /*!
+		@function setRefCon
+		@abstract Sets the ORB refCon.
+		@discussion Sets a user defined value on the ORB that can be retrieved later with the 
+        method getRefCon.
+        @param refCon a user defined value.
+    */
+    
+    virtual void setRefCon( void * refCon );
+
+    /*!
+		@function getRefCon
+		@abstract Returns the refCon set with setRefCon.
+		@discussion Returns the user defined value previously stored in the ORB with setRefCon.
+        @result Returns the previously stored user defined value.
+	*/
+    
+    virtual void * getRefCon( void );
+
+protected:    
+
+    virtual void setToDummy( void );
+
+public:	
+    /*!
+		@function getORBAddress
+		@abstract Returns the FireWire address of this ORB.
+		@discussion Returns the FireWire bus address of this ORB.  This is not the same as the Macintosh 
+        address for the IOFireWireSBP2ORB.
+        @result Returns the FireWire address of this ORB.
+	*/
+    
+    virtual void getORBAddress( FWAddress * address );
+
+protected:
+	
+	virtual bool isAppended( void );
+	virtual void setIsAppended( bool state );
+	virtual UInt32 getFetchAgentWriteRetries( void );
+    virtual void setFetchAgentWriteRetries( UInt32 retries );
+
+    virtual void prepareFastStartPacket( IOBufferMemoryDescriptor * descriptor );
+
+	UInt32 getFetchAgentWriteRetryInterval( void );
+    void setFetchAgentWriteRetryInterval( UInt32 interval );
+
+	IOReturn completeBufferAddressSpace( void );
+	IOReturn prepareBufferAddressSpace( IOMemoryDescriptor * memoryDescriptor );
+
+public:
+
+    /*!
+		@function setBufferConstraints
+		@abstract Configures page table generation parameters
+		@discussion Sets the maximums size of any page table segment and the required alignemnt.  Double buffering
+		may be used to satisfy these constraints. The only supported option is kFWSBP2ConstraintForceDoubleBuffer which
+		forces a page aligned double buffering of the entire descriptor.
+        @result May return an error if there is a problem allocating the underlying resources or if buffers are currently attached.
+	*/
+
+	IOReturn setBufferConstraints( UInt64 maxSegmentSize, UInt32 alignment, UInt32 options = 0);
+
+
+    /*! 
+        @function setCommandBuffersAsRanges64
+        @abstract Creates a page table from a list of 64 bit ranges.
+        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
+        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
+        The SBP2 services do not release references to the command buffers just because the command 
+        has completed. This is a 64 bit compatible version of setCommandBuffersAsRanges.
+        @param ranges An array of ranges representing the data to be transfered.
+        @param withCount The number of ranges in the ranges array.
+        @param withDirection An IODirection indicating the direction of data transfer.
+        @param withTask The task that these adressses reside in.
+        @param offset Offset in bytes into data to begin writing table at.
+        @param length Number of bytes of data to map from offset.
+        @result Returns KIOReturnSuccess if the page table was written successfully. 
+    */
+	   
+    IOReturn setCommandBuffersAsRanges64(	IOAddressRange *	ranges,
+											uint64_t			withCount,
+											IODirection			withDirection,
+											task_t				withTask,
+											uint64_t			offset = 0,
+											uint64_t			length = 0);
+
+    /*!
+		@function setRefCon64
+		@abstract Sets the ORB refCon as a 64 bit value.
+		@discussion Sets a user defined value on the ORB that can be retrieved later with the 
+        method getRefCon.
+        @param refCon a user defined value.
+    */
+    
+    virtual void setRefCon64( UInt64 refCon );
+
+    /*!
+		@function getRefCon64
+		@abstract Returns the 64 bit refCon set with setRefCon64.
+		@discussion Returns the user defined value previously stored in the ORB with setRefCon.
+        @result Returns the previously stored user defined value.
+	*/
+    
+    virtual UInt64 getRefCon64( void );
+
+protected:
+	
+	UInt32	calculateTransferSizeLog( bool * clipping );
+
+
+};
+    
+#endif
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2Target.h b/i386/include/IOKit/sbp2/IOFireWireSBP2Target.h
new file mode 100644
index 0000000..4288ce9
--- /dev/null
+++ b/i386/include/IOKit/sbp2/IOFireWireSBP2Target.h
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOFireWireSBP2Target
+  Contains the class definition for IOFireWireSBP2Target.
+*/
+
+#ifndef _IOKIT_IOFIREWIRESBP2TARGET_H
+#define _IOKIT_IOFIREWIRESBP2TARGET_H
+
+#include <IOKit/firewire/IOFireWireUnit.h>
+#include <IOKit/IOService.h>
+
+enum
+{
+    kIOFWSBP2FailsOnAckBusy = (1 << 0),
+	kIOFWSBP2FailsOnBusResetsDuringIO = (1 << 1),
+	kIOFWSBP2DontUsePTPacketLimit = (1 << 2)
+};
+
+/*!
+    @class IOFireWireSBP2Target
+    @abstract Serves as bridge between IOFireWireUnit and IOFireWireLUN.
+    @discussion Matches against IOFireWireUnits supporting the SBP2 protocol.  Creates IOFireWireSBP2LUN nubs 	for matching. Most drivers will match against an IOFireWireSBP2LUN, but matching against an 	IOFireWireSBP2Target is also supported. This can be useful in cases where a single driver wishes to 
+    control all LUNs on a device. Support for this technique is minimal, however, and the driver will be
+    required to discover it's LUNs through the registry.
+*/
+
+class IOFireWireSBP2Target : public IOService
+{
+    OSDeclareDefaultStructors(IOFireWireSBP2Target);
+
+protected:
+	
+	/////////////////////////////////////////
+    // rom keys
+	
+    enum
+    {
+        kCmdSpecIDKey 				= 0x38,
+        kCmdSetKey					= 0x39,
+        kSoftwareRevKey				= 0x3b,
+        kFirmwareRevKey	 			= 0x3c,
+        kLUNKey						= 0x14,
+        kLUNDirectoryKey			= 0xd4,
+        kManagementAgentOffsetKey	= 0x54,
+		kUnitCharacteristicsKey 	= 0x3A,
+		kRevisionKey				= 0x21,
+		kFastStartKey				= 0x3E
+    };
+
+    typedef struct
+    {
+		UInt32 cmdSpecID; 
+		UInt32 cmdSet;
+		UInt32 vendorID;
+		UInt32 softwareRev;
+		UInt32 firmwareRev; 
+		UInt32 lun;
+		UInt32 devType;
+		UInt32 unitCharacteristics;
+		UInt32 managementOffset;
+		UInt32 revision;
+		bool fastStartSupported;
+		UInt32 fastStart;
+    } LUNInfo;
+	
+    // reserved for future use
+    struct ExpansionData 
+	{
+		bool				fStarted;
+		OSArray *			fPendingMgtAgentCommands ;
+		UInt32				fNumberPendingMgtAgentOrbs;
+		UInt32				fNumLUNs;
+	};
+    ExpansionData * fExpansionData; 
+    
+	/////////////////////////////////////////
+	// private fields
+	
+    bool 				fOpenFromTarget;
+    UInt32				fOpenFromLUNCount;    
+    IOFireWireUnit * 	fProviderUnit;
+    UInt32				fFlags;
+    
+	IOFireWireController * fControl;
+	
+	UInt32 				fIOCriticalSectionCount;
+	
+	/////////////////////////////////////////
+	// private internals
+
+    virtual void free( void );	
+    virtual IOReturn message( 	UInt32 type, 
+								IOService * provider,
+								void * argument = 0);
+    
+    virtual void scanForLUNs( void );
+    IOReturn createLUN( LUNInfo * info );
+
+public:
+
+	/////////////////////////////////////////
+	// public methods
+	
+	/*! @function handleOpen
+		@abstract Overrideable method to control the open / close behaviour of an IOService.
+		@discussion See IOService for discussion.		
+		@param forClient Designates the client of the provider requesting the open.
+		@param options Options for the open, may be interpreted by the implementor of handleOpen.
+		@result Return true if the open was successful, false otherwise. */
+
+    virtual bool handleOpen( IOService * forClient, IOOptionBits options, void * arg );
+	
+	/*! 
+		@function handleClose
+		@abstract Overrideable method to control the open / close behaviour of an IOService.
+		@discussion See IOService for discussion.
+		@param forClient Designates the client of the provider requesting the close.
+		@param options Options for the close, may be interpreted by the implementor of handleOpen. 
+	*/
+
+	virtual void handleClose( IOService * forClient, IOOptionBits options );
+
+	/*! 
+		@function handleIsOpen
+		@abstract Overrideable method to control the open / close behaviour of an IOService.
+		@discussion See IOService for discussion.		
+		@param forClient If non-zero, isOpen returns the open state for that client. If zero is passed, isOpen returns the open state for all clients.
+		@result Returns true if the specific, or any, client has the IOService open. 
+	*/
+	
+    virtual bool handleIsOpen(  const IOService * forClient ) const;
+    
+	/*! 
+		@function start
+		@abstract During an IOService instantiation, the start method is called when the IOService has been selected to run on the provider.
+		@discussion See IOService for discussion.
+		@result Return true if the start was successful, false otherwise (which will cause the instance to be detached and usually freed).
+	*/
+	
+    virtual bool start( IOService *provider );
+ 
+	/*! 
+		@function stop
+		@abstract During an IOService termination, the stop method is called in its clients before they are detached & it is destroyed.
+		@discussion See IOService for discussion.
+	*/
+   
+	virtual void stop( IOService *provider );
+
+	/*!
+		@function getFireWireUnit
+		@abstract Returns an IOFireWireUnit object.
+		@discussion An IOFireWireUnit is the provider of an IOFireWireSBP2Target.  In order to use the base FireWire services
+		you will need a reference to the unit.  This method returns that reference.
+		@result Returns a pointer to an IOFireWireUnit.
+	*/
+	
+    virtual IOFireWireUnit * getFireWireUnit( void );
+	
+	/*! 
+		@function matchPropertyTable
+		@abstract Implements SBP2 specific matching.
+		@discussion See IOService for discussion.
+	    @param table The dictionary of properties to be matched against.
+		@result Returns false if the family considers the matching dictionary does not match in properties it understands, true otherwise.
+	*/
+	
+	virtual bool matchPropertyTable( OSDictionary * table );
+
+    virtual void setTargetFlags( UInt32 flags );
+    virtual UInt32 getTargetFlags( void );
+
+protected:
+    virtual void configurePhysicalFilter( void );
+
+public:
+    virtual void clearTargetFlags( UInt32 flags );
+	virtual IOReturn beginIOCriticalSection( void );
+	virtual void endIOCriticalSection( void );
+
+    virtual bool finalize( IOOptionBits options );
+    
+    IOReturn 	synchMgmtAgentAccess( IOFWCommand * mgmtOrbCommand );
+	void		completeMgmtAgentAccess( );
+	void 		clearMgmtAgentAccess( );
+	void		cancelMgmtAgentAccess( IOFWCommand * mgmtOrbCommand );
+
+protected:
+
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 0);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 1);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 2);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 3);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 4);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 5);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 6);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 7);
+    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 8);	
+    
+};
+
+#endif
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2UserClient.h b/i386/include/IOKit/sbp2/IOFireWireSBP2UserClient.h
new file mode 100644
index 0000000..939dbf0
--- /dev/null
+++ b/i386/include/IOKit/sbp2/IOFireWireSBP2UserClient.h
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOFIREWIRESBP2USERCLIENT_H
+#define _IOKIT_IOFIREWIRESBP2USERCLIENT_H
+
+#include <IOKit/IOUserClient.h>
+
+#define FIREWIREPRIVATE
+#include <IOKit/firewire/IOFireWireController.h>
+#undef FIREWIREPRIVATE
+
+#include <IOKit/firewire/IOFWUserObjectExporter.h>
+
+#include <IOKit/sbp2/IOFireWireSBP2UserClientCommon.h>
+#include <IOKit/sbp2/IOFireWireSBP2LUN.h>
+
+class IOFireWireSBP2UserClient : public IOUserClient
+{
+    OSDeclareDefaultStructors(IOFireWireSBP2UserClient)
+
+protected:
+
+    bool					fOpened;
+	bool					fStarted;
+    IOFireWireSBP2Login * 	fLogin;
+    task_t					fTask;
+	
+    IOFireWireSBP2LUN *		fProviderLUN;
+    OSAsyncReference64		fMessageCallbackAsyncRef;
+    OSAsyncReference64		fLoginCallbackAsyncRef;
+    OSAsyncReference64		fLogoutCallbackAsyncRef;
+    OSAsyncReference64		fUnsolicitedStatusNotifyAsyncRef;
+    OSAsyncReference64		fStatusNotifyAsyncRef;
+    OSAsyncReference64		fFetchAgentResetAsyncRef;
+	OSAsyncReference64		fFetchAgentWriteAsyncRef;
+	
+	IOFWUserObjectExporter	*	fExporter;
+	
+	IOFireWireLib::UserObjectHandle		fSessionRef;
+	
+ 	virtual IOReturn externalMethod(	uint32_t selector, 
+										IOExternalMethodArguments * args,
+										IOExternalMethodDispatch * dispatch, 
+										OSObject * target, 
+										void * reference );
+public:
+
+	virtual bool initWithTask( task_t owningTask, void * securityToken, UInt32 type, OSDictionary * properties );
+	virtual void free ();
+				
+    virtual bool start( IOService * provider );
+
+    virtual IOReturn clientClose( void );
+    virtual IOReturn clientDied( void );
+
+	// IOFireWireSBP2ManagementORB friend class wrappers
+	virtual void flushAllManagementORBs( void );
+
+    /////////////////////////////////////////////////
+    // IOFireWireSBP2LUN
+
+    IOReturn open( IOExternalMethodArguments * arguments );
+	IOReturn openWithSessionRef( IOExternalMethodArguments * arguments );
+	IOReturn getSessionRef( IOExternalMethodArguments * arguments );
+    IOReturn close( IOExternalMethodArguments * arguments );
+
+    // callbacks
+	IOReturn setMessageCallback( IOExternalMethodArguments * arguments );
+    virtual IOReturn message( UInt32 type, IOService * provider, void * arg );
+
+    /////////////////////////////////////////////////
+    // IOFireWireSBP2Login
+    
+    IOReturn setLoginCallback( IOExternalMethodArguments * arguments );
+	IOReturn setLogoutCallback( IOExternalMethodArguments * arguments );
+    IOReturn setUnsolicitedStatusNotify( IOExternalMethodArguments * arguments );
+    IOReturn setStatusNotify( IOExternalMethodArguments * arguments );
+	IOReturn createLogin( IOExternalMethodArguments * arguments );
+    IOReturn releaseLogin( IOExternalMethodArguments * arguments );
+    IOReturn submitLogin( IOExternalMethodArguments * arguments );
+    IOReturn submitLogout( IOExternalMethodArguments * arguments );
+	IOReturn setLoginFlags( IOExternalMethodArguments * arguments );
+    IOReturn getMaxCommandBlockSize( IOExternalMethodArguments * arguments );
+    IOReturn getLoginID( IOExternalMethodArguments * arguments );
+    IOReturn setReconnectTime( IOExternalMethodArguments * arguments );
+	IOReturn setMaxPayloadSize( IOExternalMethodArguments * arguments );
+    
+	IOReturn submitFetchAgentReset( IOExternalMethodArguments * arguments );
+	IOReturn setFetchAgentWriteCompletion( IOExternalMethodArguments * arguments );
+	IOReturn ringDoorbell( IOExternalMethodArguments * arguments );
+	IOReturn enableUnsolicitedStatus( IOExternalMethodArguments * arguments );
+	IOReturn setBusyTimeoutRegisterValue( IOExternalMethodArguments * arguments );
+    IOReturn setPassword( IOExternalMethodArguments * arguments );
+
+	// callbacks
+	
+	static void staticLoginCallback( void * refCon, FWSBP2LoginCompleteParamsPtr params );
+    virtual void loginCallback( FWSBP2LoginCompleteParamsPtr params );
+
+	static void staticLogoutCallback( void * refCon, FWSBP2LogoutCompleteParamsPtr params );
+    virtual void logoutCallback( FWSBP2LogoutCompleteParamsPtr params );
+
+	static void staticStatusNotify( void * refCon, FWSBP2NotifyParams * params );
+    virtual void statusNotify( FWSBP2NotifyParams * params );
+
+	static void staticUnsolicitedNotify( void * refCon, FWSBP2NotifyParams * params );
+    virtual void unsolicitedNotify( FWSBP2NotifyParams * params );
+
+	static void staticFetchAgentWriteComplete( void * refCon, IOReturn status, IOFireWireSBP2ORB * orb );
+	virtual void fetchAgentWriteComplete( IOReturn status, IOFireWireSBP2ORB * orb );
+
+    static void staticFetchAgentResetComplete( void * refCon, IOReturn status );
+    virtual void fetchAgentResetComplete( IOReturn status );
+	
+    /////////////////////////////////////////////////
+    // IOFireWireSBP2ORB
+
+    IOReturn createORB(  IOExternalMethodArguments * arguments );
+    IOReturn releaseORB(  IOExternalMethodArguments * arguments );
+	IOReturn submitORB(  IOExternalMethodArguments * arguments );
+    IOReturn setCommandFlags(  IOExternalMethodArguments * arguments );
+    IOReturn setORBRefCon(  IOExternalMethodArguments * arguments );
+	IOReturn setMaxORBPayloadSize(  IOExternalMethodArguments * arguments );
+    IOReturn setCommandTimeout(  IOExternalMethodArguments * arguments );
+	IOReturn setCommandGeneration(  IOExternalMethodArguments * arguments );
+    IOReturn setToDummy(  IOExternalMethodArguments * arguments );
+    IOReturn setCommandBuffersAsRanges(  IOExternalMethodArguments * arguments );
+    IOReturn releaseCommandBuffers(  IOExternalMethodArguments * arguments );
+    IOReturn setCommandBlock(  IOExternalMethodArguments * arguments );
+	
+	// LSI workaround
+    IOReturn LSIWorkaroundSetCommandBuffersAsRanges(  IOExternalMethodArguments * arguments );
+	IOReturn LSIWorkaroundSyncBuffersForOutput(  IOExternalMethodArguments * arguments );
+	IOReturn LSIWorkaroundSyncBuffersForInput(  IOExternalMethodArguments * arguments );
+															
+    /////////////////////////////////////////////////
+    // IOFireWireSBP2MgmtORB
+
+	IOReturn createMgmtORB(  IOExternalMethodArguments * arguments );
+    IOReturn releaseMgmtORB(  IOExternalMethodArguments * arguments );
+    IOReturn setMgmtORBCallback(  IOExternalMethodArguments * arguments );
+    IOReturn submitMgmtORB(  IOExternalMethodArguments * arguments );	
+	IOReturn setMgmtORBCommandFunction(  IOExternalMethodArguments * arguments );
+	IOReturn setMgmtORBManageeORB(  IOExternalMethodArguments * arguments );
+	IOReturn setMgmtORBManageeLogin(  IOExternalMethodArguments * arguments );
+	IOReturn setMgmtORBResponseBuffer(  IOExternalMethodArguments * arguments );
+
+	// callbacks
+    static void staticMgmtORBCallback( void * refCon, IOReturn status, IOFireWireSBP2ManagementORB * orb );
+    virtual void mgmtORBCallback( IOReturn status, IOFireWireSBP2ManagementORB * orb );
+	
+	// IOFireWireSBP2MgmtORB friend class wrappers
+	virtual void setMgmtORBAsyncCallbackReference( IOFireWireSBP2ManagementORB * orb, void * asyncRef );    
+	virtual void getMgmtORBAsyncCallbackReference( IOFireWireSBP2ManagementORB * orb, void * asyncRef );
+
+	    uint32_t		   checkScalarInputCount;
+    uint32_t		   checkStructureInputSize;
+    uint32_t		   checkScalarOutputCount;
+    uint32_t		   checkStructureOutputSize;
+    
+    IOReturn checkArguments( IOExternalMethodArguments * args, uint32_t scalarInCount, uint32_t structInCount, 
+    													uint32_t scalarOutCount, uint32_t structOutCount );
+
+};
+
+#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2UserClientCommon.h b/i386/include/IOKit/sbp2/IOFireWireSBP2UserClientCommon.h
new file mode 100644
index 0000000..cb114ba
--- /dev/null
+++ b/i386/include/IOKit/sbp2/IOFireWireSBP2UserClientCommon.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOFIREWIRESBP2USERCLIENTCOMMON_H_
+#define _IOKIT_IOFIREWIRESBP2USERCLIENTCOMMON_H_
+
+#define kIOFireWireSBP2LibConnection 12
+
+enum IOFWSBP2UserClientCommandCodes {
+    kIOFWSBP2UserClientOpen,						// kIOUCScalarIScalarO 0,0
+    kIOFWSBP2UserClientClose,						// kIOUCScalarIScalarO 0,0
+    kIOFWSBP2UserClientCreateLogin,					// kIOUCScalarIScalarO 0,1
+    kIOFWSBP2UserClientReleaseLogin,				// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSubmitLogin,					// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSubmitLogout,				// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSetLoginFlags,				// kIOUCScalarIScalarO 2,0
+    kIOFWSBP2UserClientGetMaxCommandBlockSize,		// kIOUCScalarIScalarO 1,1
+    kIOFWSBP2UserClientGetLoginID,					// kIOUCScalarIScalarO 1,1
+    kIOFWSBP2UserClientSetReconnectTime,			// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSetMaxPayloadSize,			// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientCreateORB,					// kIOUCScalarIScalarO 0,1
+    kIOFWSBP2UserClientReleaseORB,					// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSubmitORB,					// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSetCommandFlags,  			// kIOUCScalarIScalarO 2,0
+    kIOFWSBP2UserClientSetMaxORBPayloadSize, 		// kIOUCScalarIScalarO 2,0
+    kIOFWSBP2UserClientSetCommandTimeout, 			// kIOUCScalarIScalarO 2,0
+    kIOFWSBP2UserClientSetCommandGeneration, 		// kIOUCScalarIScalarO 2,0
+    kIOFWSBP2UserClientSetToDummy,	  				// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSetCommandBuffersAsRanges,	// kIOUCScalarIScalarO 6,0
+    kIOFWSBP2UserClientReleaseCommandBuffers, 		// kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientSetCommandBlock,	  			// kIOUCScalarIScalarO 3,0
+	kIOFWSBP2UserClientCreateMgmtORB,     			// kIOUCScalarIScalarO 0,1
+	kIOFWSBP2UserClientReleaseMgmtORB,   			// kIOUCScalarIScalarO 1,0
+	kIOFWSBP2UserClientSubmitMgmtORB,    			// kIOUCScalarIScalarO 1,0
+	kIOFWSBP2UserClientMgmtORBSetCommandFunction,   // kIOUCScalarIScalarO 2,0
+	kIOFWSBP2UserClientMgmtORBSetManageeORB,  		// kIOUCScalarIScalarO 2,0
+	kIOFWSBP2UserClientMgmtORBSetManageeLogin,    	// kIOUCScalarIScalarO 2,0
+	kIOFWSBP2UserClientMgmtORBSetResponseBuffer,    // kIOUCScalarIScalarO 3,0
+	kIOFWSBP2UserClientLSIWorkaroundSetCommandBuffersAsRanges, // kIOUCScalarIScalarO 6,0
+	kIOFWSBP2UserClientMgmtORBLSIWorkaroundSyncBuffersForOutput, // kIOUCScalarIScalarO 1,0
+	kIOFWSBP2UserClientMgmtORBLSIWorkaroundSyncBuffersForInput, // kIOUCScalarIScalarO 1,0
+    kIOFWSBP2UserClientOpenWithSessionRef,			// kIOUCScalarIScalarO 1,0
+	kIOFWSBP2UserClientGetSessionRef,				// kIOUCScalarIScalarO 0,1
+	kIOFWSBP2UserClientRingDoorbell,				// kIOUCScalarIScalarO 1, 0
+	kIOFWSBP2UserClientEnableUnsolicitedStatus, // kIOUCScalarIScalarO 1, 0
+	kIOFWSBP2UserClientSetBusyTimeoutRegisterValue,   // kIOUCScalarIScalarO 2, 0
+	kIOFWSBP2UserClientSetORBRefCon, 				// kIOUCScalarIScalarO 2, 0
+	kIOFWSBP2UserClientSetPassword,					// kIOUCScalarIScalarO 3, 0
+    kIOFWSBP2UserClientSetMessageCallback,   		// kIOUCScalarIScalarO 2, 0
+    kIOFWSBP2UserClientSetLoginCallback,			// kIOUCScalarIScalarO 2, 0
+    kIOFWSBP2UserClientSetLogoutCallback,			// kIOUCScalarIScalarO 2, 0
+    kIOFWSBP2UserClientSetUnsolicitedStatusNotify, 	// kIOUCScalarIScalarO 2, 0
+    kIOFWSBP2UserClientSetStatusNotify, 			// kIOUCScalarIScalarO 2, 0
+	kIOFWSBP2UserClientSetMgmtORBCallback,  		// kIOUCScalarIScalarO 3, 0
+	kIOFWSBP2UserClientSubmitFetchAgentReset,  		// kIOUCScalarIScalarO 3, 0
+	kIOFWSBP2UserClientSetFetchAgentWriteCompletion, // kIOUCScalarIScalaO 2, 0
+    kIOFWSBP2UserClientNumCommands
+};
+
+#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/IOFireWireSerialBusProtocolTransport.h b/i386/include/IOKit/sbp2/IOFireWireSerialBusProtocolTransport.h
new file mode 100644
index 0000000..53e6195
--- /dev/null
+++ b/i386/include/IOKit/sbp2/IOFireWireSerialBusProtocolTransport.h
@@ -0,0 +1,449 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+/*!
+  @header IOFireWireSerialBusProtocolTransport
+  Contains the class definition for IOFireWireSerialBusProtocolTransport.
+*/
+
+
+#ifndef _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_
+#define _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_
+
+
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/IOLib.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOCommandPool.h>
+#include <IOKit/firewire/IOFireWireUnit.h>
+#include <IOKit/sbp2/IOFireWireSBP2LUN.h>
+
+#include <IOKit/scsi/IOSCSIProtocolServices.h>
+
+/*!
+	@class IOFireWireSerialBusProtocolTransport
+	@abstract SCSI Protocol Driver Family for FireWire SBP2 Devices. 
+	@discussion IOFireWireSerialBusProtocolTransport contains all the bus specific support for FireWire
+	SBP2 compliant devices. To add vendor specific features or workarounds you will sub-class the appropriate
+	methods of this family. 
+*/
+
+class IOFireWireSerialBusProtocolTransport : public IOSCSIProtocolServices
+{
+	
+	OSDeclareDefaultStructors ( IOFireWireSerialBusProtocolTransport )
+	
+private:
+	
+	IOFireWireUnit *				fUnit;
+	IOFireWireSBP2LUN *				fSBPTarget;
+	IOFireWireSBP2Login *			fLogin;
+	IOFireWireSBP2ORB *				fORB;
+	IOFireWireSBP2ManagementORB * 	fLUNResetORB;
+	
+	// /!\ WARNING! NOT USED left behind for legacy binary reasons
+	IOSimpleLock *					fQueueLock;
+	
+	UInt32							fLoginRetryCount;
+	bool							fDeferRegisterService;
+	bool							fNeedLogin;
+    
+    // /!\ WARNING! NOT USED left behind for legacy binary reasons
+	bool							fPhysicallyConnected;
+	
+	static void
+	StatusNotifyStatic ( void * refCon, FWSBP2NotifyParamsPtr params );
+	
+	static void
+	UnsolicitedStatusNotifyStatic (	void * 					refCon,
+									FWSBP2NotifyParamsPtr 	params );
+	
+	static void
+	LunResetCompleteStatic (	void * 							refCon,
+								IOReturn						status,
+								IOFireWireSBP2ManagementORB * 	orb );
+	
+	static void
+	FetchAgentResetCompleteStatic (	void * refcon,
+									IOReturn status );
+	
+	static IOReturn
+	ConnectToDeviceStatic (	OSObject * refCon, void *, void *, void *, void * );
+	
+	virtual void
+	FetchAgentResetComplete ( IOReturn status );
+	
+	static void LoginCompletionStatic ( void * refCon, FWSBP2LoginCompleteParams * params );
+	
+	static void
+	LogoutCompletionStatic ( void * refCon, FWSBP2LogoutCompleteParams * params );
+	
+	/*!
+		@function CoalesceSenseData
+		@abstract CoalesceSenseData convert a SBP-2 status block into a SPC-2 sense block.
+		@discussion	CoalesceSenseData pulls the appropriate bits out of the SBP2 sense block
+		as defined in SBP-2 Annex B section B.2 and dynamically builds a sense data block as
+		defined in SPC-2 section 7.23.2.
+	*/
+	
+	SCSITaskStatus
+	CoalesceSenseData (	FWSBP2StatusBlock *	sourceData,
+						UInt8				quadletCount,
+						SCSI_Sense_Data *	targetData );
+	
+	virtual void ConnectToDevice ( void );
+	
+	virtual void DisconnectFromDevice ( void );
+	
+	virtual bool IsDeviceCPUInDiskMode ( void );
+
+protected:
+    
+	/*!
+		@function AllocateResources
+		@abstract Allocate Resources.
+		@discussion	Called from start method to allocate needed resources.
+	*/
+    
+	virtual IOReturn AllocateResources ( void );
+    
+	/*!
+		@function DeallocateResources
+		@abstract Deallocate Resources.
+		@discussion	Called from cleanUp method to deallocate resources.
+	*/
+    
+	virtual void DeallocateResources ( void );
+	
+	enum SBP2LoginState
+	{
+		kFirstTimeLoggingInState,
+		kLogginSucceededState,
+		kLogginFailedState
+	};
+	
+	/*! 
+		@typedef SBP2ClientOrbData
+		@param orb IOFireWireSBP2ORB for request.
+		@param scsiTask SCSITaskIdentifier of request. 
+		@param serviceResponse SCSIServiceResponse of request.
+		@param taskStatus SCSITaskStatus of request.
+		@discussion This structure is stuffed into the refcon so we can associate which
+		IOFireWireSBP2ORB and SCSITaskIdentifier is completing.
+	*/
+	
+	typedef struct {
+		IOFireWireSBP2ORB *				orb;
+		SCSITaskIdentifier 				scsiTask;
+		SCSIServiceResponse 			serviceResponse;
+		SCSITaskStatus					taskStatus;
+		IOBufferMemoryDescriptor *		quadletAlignedBuffer;
+	} SBP2ClientOrbData;
+	
+	static const UInt32 kDefaultBusyTimeoutValue	= 0x0000000F;
+	static const UInt64 kMaxFireWireLUN				= 0xFFFF;
+	static const UInt32 kMaxFireWirePayload			= 4096;
+	static const UInt32 kMaxLoginRetryCount			= 8;
+	static const UInt32 kMaxReconnectCount			= 128;
+	static const UInt32 kCSRModelInfoKey			= 0x17;
+
+	UInt32	fReconnectCount;
+	bool 	fLoggedIn;
+	
+	// binary compatibility instance variable expansion
+	struct ExpansionData
+	{ 
+		IOCommandPool *		fCommandPool;
+		IOCommandPool *		fSubmitQueue;
+		SBP2LoginState		fLoginState;
+		bool				fLUNResetPathFlag;
+		int					fLUNResetCount;
+		bool				fAlwaysSetSenseData;
+		bool				fAutonomousSpinDownWorkAround;
+	};
+	
+	ExpansionData * reserved;
+	
+	bool fObjectIsOpen;
+
+	/*!
+		@function CommandORBAccessor
+		@abstract accessor function for fORB.
+		@discussion	xxx.
+	*/
+
+	IOFireWireSBP2ORB * CommandORBAccessor ( void );
+   
+	/*!
+		@function SBP2LoginAccessor
+		@abstract accessor function for fLogin.
+		@discussion	xxx.
+	*/
+
+	IOFireWireSBP2Login * SBP2LoginAccessor ( void );
+
+	virtual IOReturn
+	message ( UInt32 type, IOService * provider, void * argument = 0 );
+
+	/*!
+		@function SendSCSICommand
+		@abstract Prepare and send a SCSI command to the device.
+		@discussion	The incoming SCSITaskIdentifier gets turned into a IOFireWireSBP2ORB
+		and is submitted to the SBP2 layer. See IOSCSIProtocolServices.h for more details
+		regarding SendSCSICommand. Also see IOFireWireSBP2Lib.h for details regarding the
+		IOFireWireSBP2ORB structure and the submitORB method.
+		@result If the command was sent to the device and is pending completion, the
+		subclass should return true and return back the kSCSIServiceResponse_Request_In_Process response.
+		If the command completes immediately with an error, the subclass will return true
+		and return back the appropriate status. If the subclass is currently processing all the
+		commands it can, the subclass will return false and the command will be resent next time
+		CommandCompleted is called.
+	*/
+
+	virtual bool 
+	SendSCSICommand (	SCSITaskIdentifier 		request,
+						SCSIServiceResponse *	serviceResponse,
+						SCSITaskStatus *		taskStatus );
+
+	/*!
+		@function SetCommandBuffers
+		@abstract Method to set orb's buffers.
+		@discussion	This method was added so that subclasses can override and massage buffers as
+		needed. The default simply calls setCommandBuffers. See IOFireWireSBP2Lib.h for details
+		regarding the setCommandBuffers method.
+		@result xxx.
+	*/
+	
+	virtual IOReturn
+	SetCommandBuffers (	IOFireWireSBP2ORB * orb, SCSITaskIdentifier request );
+
+	/*!
+		@function CompleteSCSITask
+		@abstract This qualifies and sets appropriate data then calls CommandCompleted.
+		@discussion	See IOSCSIProtocolServices.h for more details
+		regarding CommandCompleted.
+	*/
+	
+	virtual void 
+	CompleteSCSITask ( IOFireWireSBP2ORB * orb );
+
+	/*!
+		@function AbortSCSICommand
+		@abstract This method is intended to abort an in progress SCSI Task.
+		@discussion	Currently not implemented in super class. This is a stub method for adding
+		the abort command in the near future.
+		@result See SCSITask.h for SCSIServiceResponse codes.
+	*/
+	
+	virtual SCSIServiceResponse 
+	AbortSCSICommand ( SCSITaskIdentifier request );
+
+	/*!
+		@function StatusNotify
+		@abstract This is our handler for status.
+		@discussion See IOFireWireSBP2Lib.h for details regarding the FWSBP2NotifyParams
+		structure that is passed in to the completion..
+	*/
+	
+	virtual void
+	StatusNotify ( FWSBP2NotifyParams * params );
+
+	/*!
+		@function SetValidAutoSenseData
+		@abstract Set the auto sense data that was returned for a given SCSI Task.
+		@discussion	SetValidAutoSenseData is called to qualify sense data that is copied to the
+		client via the SetAutoSenseData method. See IOSCSIProtocolServices.h for more details
+		regarding SetAutoSenseData.
+	*/
+	
+	void
+	SetValidAutoSenseData (	SBP2ClientOrbData *	clientData,
+							FWSBP2StatusBlock *	statusBlock,
+							SCSI_Sense_Data *	targetData );
+	
+	/*!
+		@function UnsolicitedStatusNotify
+		@abstract This is our handler for unsolicited status.
+		@discussion	After we have parsed and handled the unsolicited status we call 
+		enableUnsolicitedStatus. See IOFireWireSBP2Lib.h for details regarding the
+		enableUnsolicitedStatus method.
+	*/
+	
+	virtual void
+	UnsolicitedStatusNotify ( FWSBP2NotifyParamsPtr params );
+
+	/*!
+		@function LoginCompletion
+		@abstract Completion routine for login complete.
+		@discussion	See IOFireWireSBP2Lib.h for details regarding the FWSBP2LogoutCompleteParams
+		structure that is passed in to the completion.
+	*/
+	
+	virtual void 
+	LoginCompletion ( FWSBP2LoginCompleteParams * params );
+
+	/*!
+		@function LogoutCompletion
+		@abstract Completion routine for logout complete.
+		@discussion	See IOFireWireSBP2Lib.h for details regarding the FWSBP2LogoutCompleteParams
+		structure that is passed in to the completion.
+	*/
+	
+	virtual void 
+	LogoutCompletion ( FWSBP2LogoutCompleteParams * params );
+
+	/*!
+		@function IsProtocolServiceSupported
+		@abstract Determine is specified feature is supported by the protocol layer.
+		@discussion	If the service has a value that must be returned, it will be returned in the
+		serviceValue output parameter. See IOSCSIProtocolServices.h for more details regarding
+		IsProtocolServiceSupported.
+		@result Will return true if the specified feature is supported by the protocol layer.
+	*/
+
+	virtual bool
+	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
+
+	/*!
+		@function HandleProtocolServiceFeature
+		@abstract Handle specified feature supported by the protocol layer.
+		@discussion	See IOSCSIProtocolServices.h for more details regarding HandleProtocolServiceFeature.
+		@result Will return true if the specified feature is supported by the protocol layer.
+	*/
+
+	virtual bool
+	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
+   
+	/*!
+		@function LunResetComplete
+		@abstract Callback to submit Fetch Agent Reset.
+		@discussion	See IOFireWireSBP2Lib.h for details regarding the submitFetchAgentReset
+		method.
+	*/
+	
+	virtual void
+	LunResetComplete ( IOReturn status, IOFireWireSBP2ManagementORB * orb );
+
+public:
+
+	/*!
+		@function init
+		@abstract See IOService for discussion.
+		@discussion	Setup and prime class into known state.
+	*/
+	
+	bool init ( OSDictionary * propTable );
+
+	/*! 
+		@function start
+		@discussion See IOService for discussion.
+		@result Return true if the start was successful, false otherwise ( which will
+		cause the instance to be detached and usually freed ).
+	*/
+
+	virtual bool start ( IOService * provider );
+	
+	/*!
+	 	@function cleanUp
+		@abstract cleanUp is called to tear down IOFireWireSerialBusProtocolTransport.
+		@discussion	cleanUp is called when we receive a kIOFWMessageServiceIsRequestingClose
+		message or if we fail our initialization.
+	*/
+	
+	virtual void cleanUp ( void );
+	
+	/*!
+		@function finalize
+		@abstract See IOService for discussion.
+		@result Returns true.
+	*/
+	
+	virtual bool finalize ( IOOptionBits options );
+
+	/*! 
+		@function free
+		@discussion See IOService for discussion.
+		@result none.
+	*/
+	
+	virtual void free ( void );
+		
+protected:
+	
+	virtual IOReturn login ( void );
+    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 1 );
+    
+	virtual IOReturn submitLogin ( void );
+    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 2 );
+    
+	virtual void loginLost ( void );
+    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 3 );
+    
+    void loginSuspended ( void );
+	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 4 );
+   
+	virtual void loginResumed ( void );
+	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 5 );
+
+	static IOReturn CriticalOrbSubmissionStatic ( 
+			OSObject * refCon, 
+			void * val1,
+			void * val2,
+			void * val3,
+			void * val4 );
+
+	/*!
+		@function CriticalOrbSubmission
+		@abstract xxx.
+		@discussion	xxx.
+		@result none.
+	*/
+	
+	void
+		CriticalOrbSubmission (
+			IOFireWireSBP2ORB * orb,
+			SCSITaskIdentifier request );
+	
+	virtual void submitOrbFromQueue ( void );
+	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 6 );
+	
+private:
+	
+	// binary compatibility reserved method space
+    
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 7 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 8 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 9 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 10 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 11 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 12 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 13 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 14 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 15 );
+	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 16 );
+	
+};
+
+#endif	/* _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/scsi/.svn/all-wcprops b/i386/include/IOKit/scsi/.svn/all-wcprops
new file mode 100644
index 0000000..5e074ca
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/all-wcprops
@@ -0,0 +1,155 @@
+K 25
+svn:wc:ra_dav:version-url
+V 57
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi
+END
+IOSCSIPeripheralDeviceNub.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceNub.h
+END
+IOSCSIProtocolInterface.h
+K 25
+svn:wc:ra_dav:version-url
+V 83
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIProtocolInterface.h
+END
+IOSCSIPeripheralDeviceType05.h
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType05.h
+END
+SCSICommandDefinitions.h
+K 25
+svn:wc:ra_dav:version-url
+V 82
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICommandDefinitions.h
+END
+IOSCSIPeripheralDeviceType07.h
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType07.h
+END
+IOSCSIPrimaryCommandsDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 87
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPrimaryCommandsDevice.h
+END
+SCSICmds_REPORT_LUNS_Definitions.h
+K 25
+svn:wc:ra_dav:version-url
+V 92
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICmds_REPORT_LUNS_Definitions.h
+END
+SCSICommandOperationCodes.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICommandOperationCodes.h
+END
+IOSCSIReducedBlockCommandsDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 92
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h
+END
+IOSCSIMultimediaCommandsDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 90
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIMultimediaCommandsDevice.h
+END
+IOSCSIBlockCommandsDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIBlockCommandsDevice.h
+END
+SCSIPort.h
+K 25
+svn:wc:ra_dav:version-url
+V 68
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSIPort.h
+END
+SCSICmds_MODE_Definitions.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICmds_MODE_Definitions.h
+END
+IODVDServices.h
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IODVDServices.h
+END
+SCSICmds_READ_CAPACITY_Definitions.h
+K 25
+svn:wc:ra_dav:version-url
+V 94
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICmds_READ_CAPACITY_Definitions.h
+END
+IOBlockStorageServices.h
+K 25
+svn:wc:ra_dav:version-url
+V 82
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOBlockStorageServices.h
+END
+IOSCSIPeripheralDeviceType0E.h
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType0E.h
+END
+SCSICmds_REQUEST_SENSE_Defs.h
+K 25
+svn:wc:ra_dav:version-url
+V 87
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h
+END
+IOSCSIProtocolServices.h
+K 25
+svn:wc:ra_dav:version-url
+V 82
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIProtocolServices.h
+END
+IOBDServices.h
+K 25
+svn:wc:ra_dav:version-url
+V 72
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOBDServices.h
+END
+IOReducedBlockServices.h
+K 25
+svn:wc:ra_dav:version-url
+V 82
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOReducedBlockServices.h
+END
+SCSICmds_INQUIRY_Definitions.h
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICmds_INQUIRY_Definitions.h
+END
+SCSITask.h
+K 25
+svn:wc:ra_dav:version-url
+V 68
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSITask.h
+END
+IOCompactDiscServices.h
+K 25
+svn:wc:ra_dav:version-url
+V 81
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOCompactDiscServices.h
+END
+IOSCSIPeripheralDeviceType00.h
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType00.h
+END
diff --git a/i386/include/IOKit/scsi/.svn/entries b/i386/include/IOKit/scsi/.svn/entries
new file mode 100644
index 0000000..ff8f8bc
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/entries
@@ -0,0 +1,881 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/scsi
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IOSCSIPeripheralDeviceNub.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+41004b82709f5c563fa2c10264853dd1
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8628
+
+IOSCSIProtocolInterface.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+3dc4c00e753dcf3fd49d0cfdac02faef
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+35912
+
+IOSCSIPeripheralDeviceType05.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+7943859208badb3751dbf4ffea748f66
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2852
+
+SCSICommandDefinitions.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+6d33c5041ea6862346397f9e30a91dbd
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12845
+
+IOSCSIPeripheralDeviceType07.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+0e53abdb3759ef029098176c7b372012
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2792
+
+IOSCSIPrimaryCommandsDevice.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+fbc3c7570862069f2faeb236d5b2ff80
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+28729
+
+SCSICmds_REPORT_LUNS_Definitions.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+cbb458517cee16286d9b71b82ff8ca70
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4122
+
+SCSICommandOperationCodes.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+f9c55b591e06c0fc73a8f0c46850d142
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+51055
+
+IOSCSIReducedBlockCommandsDevice.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+7e8c5ee237fa3d53e59c8742aa21ec29
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+15569
+
+spi
+dir
+
+IOSCSIMultimediaCommandsDevice.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+c4523e2a816d92b1a21bab51e554f3c3
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+37497
+
+IOSCSIBlockCommandsDevice.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+9524329c076b5320b814e3c7e4c8af9a
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+38443
+
+SCSIPort.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+3023213196d2d300e6427aed35b87293
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2037
+
+SCSICmds_MODE_Definitions.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+6bba8330f0f798e8a696d1b9aa84dcfc
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+14817
+
+IODVDServices.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+81e92ebecd5deed264767c5a704c1f31
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8553
+
+IOBlockStorageServices.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+f8ceba9851285be5ab564838e387d3b2
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5384
+
+SCSICmds_READ_CAPACITY_Definitions.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+b023866fc55360a68903eeb70772e116
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3642
+
+IOSCSIPeripheralDeviceType0E.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+b6fa75f60eb13eeb00333a44a40eddff
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2909
+
+SCSICmds_REQUEST_SENSE_Defs.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+2195af654461960fd9c521835ae05059
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7152
+
+IOSCSIProtocolServices.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+8a1ac65d04de801e378c58362ff162bc
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+15109
+
+IOBDServices.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+75fa500daf479f56138fa835c1f7647e
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8045
+
+IOReducedBlockServices.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+3dc85f77ebd728e36274c154c0640593
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5077
+
+SCSICmds_INQUIRY_Definitions.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+ca84e5d42cea279808d672eb093d3594
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+29732
+
+SCSITask.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+b9a85db4a5adf25cab94ad27fdb533b5
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+14455
+
+IOCompactDiscServices.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+c61102d918a2bc4d6211ecc704a97c55
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7947
+
+IOSCSIPeripheralDeviceType00.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+81de59f70dd7471492d42f58c176a6f0
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3475
+
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOBDServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOBDServices.h.svn-base
new file mode 100644
index 0000000..70482d7
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOBDServices.h.svn-base
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_BD_SERVICES_H_
+#define _IOKIT_IO_BD_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// IOKit includes
+#include <IOKit/IOTypes.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOBDTypes.h>
+#include <IOKit/storage/IOBDBlockStorageDevice.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
+
+class IOMemoryDescriptor;
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOBDServices : public IOBDBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IOBDServices )
+		
+protected:
+	
+	OSSet *								fClients;
+	IOSCSIPeripheralDeviceType05 *		fProvider;
+	
+	virtual void	free ( void );			
+	
+    // Reserve space for future expansion.
+    struct IOBDServicesExpansionData { };
+    IOBDServicesExpansionData *		fIOBDServicesReserved;
+	
+public:
+	
+	static void			AsyncReadWriteComplete ( void * 		clientData,
+		                          				 IOReturn		status,
+		                      					 UInt64 		actualByteCount );
+	
+	// Deprecated
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageCompletion		completion );
+											
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageAttributes *   attributes,
+											IOStorageCompletion *	completion );
+
+    virtual IOReturn	doEjectMedia ( void );
+
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+
+    virtual IOReturn	doSynchronizeCache ( void );
+	
+	virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+        
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+    
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+        
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+
+	/* CD Specific */
+	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
+										UInt32 block,
+										UInt32 nblks,
+										CDSectorArea sectorArea,
+										CDSectorType sectorType,
+										IOStorageCompletion completion );
+	
+	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
+	
+	virtual IOReturn	readMCN ( CDMCN mcn);
+	
+	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
+	
+	virtual IOReturn	audioPause ( bool pause );
+	
+	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
+	
+	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
+	
+	virtual IOReturn	audioStop ( void );
+	
+	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
+	
+	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
+	
+	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
+
+	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
+	
+	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
+	
+	/* DVD Specific */
+	virtual UInt32			getMediaType		( void );
+    
+	virtual IOReturn		reportKey			( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt32 lba,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+												  
+	virtual IOReturn		sendKey				( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+
+	virtual IOReturn		readDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
+													const UInt8					structureFormat,
+													const UInt32				logicalBlockAddress,
+													const UInt8					layer,
+													const UInt8 				agid );
+
+	/* BD Specific */
+    virtual IOReturn		readDiscStructure	(	IOMemoryDescriptor * buffer,
+													UInt8                structureFormat,
+													UInt32               logicalBlockAddress,
+													UInt8                layer,
+													UInt8                agid,
+													UInt8                mediaType );
+
+	/* 10.6.0 */
+    virtual IOReturn		requestIdle ( void );
+	
+	/* System Specific */
+	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
+    virtual IOReturn	setProperties ( OSObject * properties );
+
+	/* User Client Specific */
+	virtual bool start ( IOService * provider );
+	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
+	
+	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
+	virtual void handleClose ( IOService * client, IOOptionBits options );
+	virtual bool handleIsOpen ( const IOService * client ) const;
+
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
+									CDTOCFormat				format,
+									UInt8					msf,
+									UInt8					trackSessionNumber,
+									UInt16 *				actualByteCount ); 
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
+										UInt32					address,
+										CDTrackInfoAddressType	addressType,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.5 */
+	virtual IOReturn	splitTrack ( UInt32 address );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 1 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 2 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 3 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 4 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 5 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 6 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 7 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_BD_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOBlockStorageServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOBlockStorageServices.h.svn-base
new file mode 100644
index 0000000..d62a02b
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOBlockStorageServices.h.svn-base
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_
+#define _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// IOKit includes
+#include <IOKit/IOTypes.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOBlockStorageDevice.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOBlockStorageServices : public IOBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IOBlockStorageServices )
+	
+private:
+	
+	bool							fMediaChanged;  /* DEPRECATED */
+	bool							fMediaPresent;
+	
+protected:
+	
+    IOSCSIBlockCommandsDevice *     fProvider;
+	
+	UInt64							fMaxReadBlocks;
+	UInt64							fMaxWriteBlocks;
+	
+	virtual bool		attach ( IOService * provider );
+	virtual void		detach ( IOService * provider );
+    virtual IOReturn	newUserClient (
+    						   task_t			owningTask,
+    						   void *			securityID,
+    						   UInt32			type,
+    						   OSDictionary * 	properties,
+    						   IOUserClient **	handler );
+	
+    // Reserve space for future expansion.
+    struct IOBlockStorageServicesExpansionData { };
+    IOBlockStorageServicesExpansionData * fIOBlockStorageServicesReserved;
+	
+public:
+	
+	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
+	
+	static void 		AsyncReadWriteComplete ( void * 			clientData,
+                                				 IOReturn			status,
+                                				 UInt64 			actualByteCount );
+	
+	// Deprecated
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+											
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageCompletion 	completion );
+
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageAttributes *   attributes,
+											IOStorageCompletion *	completion );
+													
+    virtual IOReturn	doEjectMedia ( void );
+	
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+	
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+	
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+	
+    virtual IOReturn	doSynchronizeCache ( void );
+	
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+        
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+        
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+	
+	virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 1 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 2 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 3 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 4 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 5 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 6 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 7 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOCompactDiscServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOCompactDiscServices.h.svn-base
new file mode 100644
index 0000000..a9d4a31
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOCompactDiscServices.h.svn-base
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_COMPACT_DISC_SERVICES_H_
+#define _IOKIT_IO_COMPACT_DISC_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// IOKit includes
+#include <IOKit/IOTypes.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOCDTypes.h>
+#include <IOKit/storage/IOCDBlockStorageDevice.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
+
+class IOMemoryDescriptor;
+
+// Use this switch to turn off the data cache.
+#define _USE_DATA_CACHING_		1
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOCompactDiscServices : public IOCDBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IOCompactDiscServices )
+	
+#if (_USE_DATA_CACHING_)
+	// Data Cache members
+	bool				fUseDataCache;			// Indicates if cache should be used.  This
+												// will be set to false if all the necessary support
+												// for the data cache could not be allocated or
+												// initialized.
+	UInt8 *				fDataCacheStorage;		// Storage space for the cache
+	UInt32				fDataCacheStartBlock;	// Starting block of the data in the cache.
+	UInt32				fDataCacheBlockCount;	// Number of contiguous blocks in the cache  
+												// starting with fDataCacheStartBlock. A value of
+												// zero in this member indicates that all data
+												// in the cache is invalid.
+	
+	IOSimpleLock *		fDataCacheLock; 		// This is the lock for preventing multiple access 
+												// while manipulating the data cache.
+#endif
+
+protected:
+	
+	OSSet *								fClients;
+	IOSCSIPeripheralDeviceType05 *		fProvider;
+	
+	virtual void	free ( void );			
+
+    // Reserve space for future expansion.
+    struct IOCompactDiscServicesExpansionData { };
+    IOCompactDiscServicesExpansionData * fIOCompactDiscServicesReserved;
+
+public:
+
+	static 	void 		AsyncReadWriteComplete ( 	void * 			clientData,
+                                					IOReturn		status,
+                                					UInt64 			actualByteCount );
+
+	// Deprecated
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageCompletion		completion );
+											
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageAttributes *   attributes,
+											IOStorageCompletion *	completion );
+
+    virtual IOReturn	doEjectMedia ( void );
+
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+
+    virtual IOReturn	doSynchronizeCache ( void );
+
+	virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+        
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+        
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+        
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+
+	/* CD Specific */
+	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
+										UInt32 block,
+										UInt32 nblks,
+										CDSectorArea sectorArea,
+										CDSectorType sectorType,
+										IOStorageCompletion completion );
+	
+	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
+	
+	virtual IOReturn	readMCN ( CDMCN mcn);
+	
+	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
+	
+	virtual IOReturn	audioPause ( bool pause );
+	
+	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
+	
+	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
+	
+	virtual IOReturn	audioStop ( void );
+	
+	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
+	
+	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
+	
+	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
+
+	virtual UInt32		getMediaType ( void );
+	
+	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
+	
+	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
+			
+	/* System Specific */
+	virtual IOReturn message ( UInt32 type, IOService * provider, void * argument );
+    virtual IOReturn setProperties ( OSObject * properties );
+	
+	/* User Client Specific */
+	virtual bool start ( IOService * provider );
+	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
+	
+	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
+	virtual void handleClose ( IOService * client, IOOptionBits options );
+	virtual bool handleIsOpen ( const IOService * client ) const;
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
+									CDTOCFormat				format,
+									UInt8					msf,
+									UInt8					trackSessionNumber,
+									UInt16 *				actualByteCount ); 
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
+										UInt32					address,
+										CDTrackInfoAddressType	addressType,
+										UInt16 *				actualByteCount );
+
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 1 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 2 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 3 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 4 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 5 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 6 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 7 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_COMPACT_DISC_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IODVDServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IODVDServices.h.svn-base
new file mode 100644
index 0000000..8dccb17
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IODVDServices.h.svn-base
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_DVD_SERVICES_H_
+#define _IOKIT_IO_DVD_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// IOKit includes
+#include <IOKit/IOTypes.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IODVDTypes.h>
+#include <IOKit/storage/IODVDBlockStorageDevice.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
+
+class IOMemoryDescriptor;
+
+// Use this switch to turn off the data cache.
+#define _DVD_USE_DATA_CACHING_		1
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IODVDServices : public IODVDBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IODVDServices )
+	
+#if (_DVD_USE_DATA_CACHING_)
+	// Data Cache members
+	bool				fUseDataCache;			// Indicates if cache should be used.  This
+												// will be set to false if all the necessary support
+												// for the data cache could not be allocated or
+												// initialized.
+	UInt8 *				fDataCacheStorage;		// Storage space for the cache
+	UInt32				fDataCacheStartBlock;	// Starting block of the data in the cache.
+	UInt32				fDataCacheBlockCount;	// Number of contiguous blocks in the cache  
+												// starting with fDataCacheStartBlock. A value of
+												// zero in this member indicates that all data
+												// in the cache is invalid.
+	
+	IOSimpleLock *		fDataCacheLock; 		// This is the lock for preventing multiple access 
+												// while manipulating the data cache.
+#endif
+	
+protected:
+	
+	OSSet *								fClients;
+	IOSCSIPeripheralDeviceType05 *		fProvider;
+	
+	virtual void	free ( void );			
+	
+    // Reserve space for future expansion.
+    struct IODVDServicesExpansionData { };
+    IODVDServicesExpansionData * fIODVDServicesReserved;
+	
+public:
+	
+	static void			AsyncReadWriteComplete ( void * 		clientData,
+		                          				 IOReturn		status,
+		                      					 UInt64 		actualByteCount );
+	
+	// Deprecated
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageCompletion		completion );
+											
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageAttributes *   attributes,
+											IOStorageCompletion *	completion );
+
+    virtual IOReturn	doEjectMedia ( void );
+
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+
+    virtual IOReturn	doSynchronizeCache ( void );
+	
+	virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+        
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+        
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+        
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+
+	/* CD Specific */
+	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
+										UInt32 block,
+										UInt32 nblks,
+										CDSectorArea sectorArea,
+										CDSectorType sectorType,
+										IOStorageCompletion completion );
+	
+	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
+	
+	virtual IOReturn	readMCN ( CDMCN mcn);
+	
+	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
+	
+	virtual IOReturn	audioPause ( bool pause );
+	
+	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
+	
+	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
+	
+	virtual IOReturn	audioStop ( void );
+	
+	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
+	
+	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
+	
+	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
+
+	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
+	
+	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
+	
+	/* DVD Specific */
+	virtual UInt32			getMediaType		( void );
+    
+	virtual IOReturn		reportKey			( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt32 lba,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+												  
+	virtual IOReturn		sendKey				( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+
+	virtual IOReturn		readDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
+													const UInt8					structureFormat,
+													const UInt32				logicalBlockAddress,
+													const UInt8					layer,
+													const UInt8 				agid );
+
+	/* 10.6.0 */
+    virtual IOReturn		requestIdle ( void );
+	
+	/* System Specific */
+	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
+    virtual IOReturn	setProperties ( OSObject * properties );
+
+	/* User Client Specific */
+	virtual bool start ( IOService * provider );
+	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
+	
+	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
+	virtual void handleClose ( IOService * client, IOOptionBits options );
+	virtual bool handleIsOpen ( const IOService * client ) const;
+
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
+									CDTOCFormat				format,
+									UInt8					msf,
+									UInt8					trackSessionNumber,
+									UInt16 *				actualByteCount ); 
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
+										UInt32					address,
+										CDTrackInfoAddressType	addressType,
+										UInt16 *				actualByteCount );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 1 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 2 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 3 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 4 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 5 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 6 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 7 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_DVD_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOReducedBlockServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOReducedBlockServices.h.svn-base
new file mode 100644
index 0000000..87ad8ed
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOReducedBlockServices.h.svn-base
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_
+#define _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// Generic IOKit related headers
+#include <IOKit/IOTypes.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOBlockStorageDevice.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPeripheralDeviceType0E.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOReducedBlockServices : public IOBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IOReducedBlockServices )
+	
+	
+protected:
+    // Reserve space for future expansion.
+    struct IOReducedBlockServicesExpansionData { };
+    IOReducedBlockServicesExpansionData * fIOReducedBlockServicesReserved;
+	
+	IOSCSIPeripheralDeviceType0E *     fProvider;
+	
+	virtual bool	attach ( IOService * provider );
+	virtual void	detach ( IOService * provider );
+	
+	
+public:
+
+	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
+	
+	static void			AsyncReadWriteComplete ( void * 			clientData,
+                                				 IOReturn			status,
+                                				 UInt64 			actualByteCount );
+                                				
+	// Deprecated
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageCompletion		completion );
+											
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageAttributes *   attributes,
+											IOStorageCompletion *	completion );
+
+    virtual IOReturn	doEjectMedia ( void );
+
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+
+    virtual IOReturn	doSynchronizeCache ( void );
+	
+	virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+        
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+        
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+        
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 1 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 2 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 3 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 4 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 5 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 6 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 7 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 8 );
+    
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIBlockCommandsDevice.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIBlockCommandsDevice.h.svn-base
new file mode 100644
index 0000000..2cb4a6d
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIBlockCommandsDevice.h.svn-base
@@ -0,0 +1,1146 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_
+#define _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+// SBC power states as defined in T10:996D SCSI Block Commands - 3 (SBC-3)
+// Revision 8c, November 13, 1997, pages 10-11.
+enum
+{
+	kSBCPowerStateSystemSleep 	= 0,
+	kSBCPowerStateSleep 		= 1,
+	kSBCPowerStateStandby 		= 2,
+	kSBCPowerStateIdle			= 3,
+	kSBCPowerStateActive		= 4,
+	kSBCNumPowerStates			= 5
+};
+
+enum
+{
+	kMediaStateUnlocked	= 0,
+	kMediaStateLocked 	= 1
+};
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOUserClient.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOStorage.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
+
+
+// Forward declaration for the SCSIBlockCommands that is used internally by the
+// IOSCSIBlockCommandsDevice class.
+class SCSIBlockCommands;
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIBlockCommandsDevice : public IOSCSIPrimaryCommandsDevice
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIBlockCommandsDevice )
+	
+private:
+	
+
+#ifndef __LP64__
+	
+	SCSIBlockCommands *		fSCSIBlockCommandObject;
+	SCSIBlockCommands *		GetSCSIBlockCommandObject ( void );
+	
+#endif	/* !__LP64__ */
+
+	IOReturn				GetWriteCacheState ( IOMemoryDescriptor * 	buffer,
+												 UInt8					modePageControlValue );
+	
+	static void				AsyncReadWriteComplete ( SCSITaskIdentifier	completedTask );
+	
+protected:
+	
+	// Reserve space for future expansion.
+    struct IOSCSIBlockCommandsDeviceExpansionData
+	{
+		IONotifier *		fPowerDownNotifier;
+		bool				fWriteCacheEnabled;
+		bool				fDeviceIsShared;
+		UInt64				fMediumBlockCount64;
+		bool				fDeviceHasSATTranslation;
+		bool				fProtocolSpecificPowerControl;
+		bool				fRequiresEjectWithStartStopUnit;
+	};
+    IOSCSIBlockCommandsDeviceExpansionData * fIOSCSIBlockCommandsDeviceReserved;
+	
+	#define fPowerDownNotifier	fIOSCSIBlockCommandsDeviceReserved->fPowerDownNotifier
+	#define fWriteCacheEnabled	fIOSCSIBlockCommandsDeviceReserved->fWriteCacheEnabled
+	
+	// The fDeviceIsShared is used to indicate whether this device exists on a Physical
+	// Interconnect that allows multiple initiators to access it.  This is used mainly
+	// by the power management code to not send power state related START_STOP_UNIT
+	// commands to the device.
+	// The fDeviceIsShared value is also used to prevent power state commands from being
+	// sent to manual eject device since these devices behave better when allowed to
+	// manage their own power.
+	#define fDeviceIsShared	fIOSCSIBlockCommandsDeviceReserved->fDeviceIsShared
+	
+	// The fMediumBlockCount64 provides support for 64 bit LBAs and
+	// replaces fMediumBlockCount which only supports 32 bits.
+	// This value should not be directly accessed and instead the member routine 
+	// ReportMediumTotalBlockCount() should be used to retrieve it and the member routine
+	// SetMediumCharacteristics() should be used to set it.
+	#define fMediumBlockCount64	fIOSCSIBlockCommandsDeviceReserved->fMediumBlockCount64
+	
+	#define fDeviceHasSATTranslation fIOSCSIBlockCommandsDeviceReserved->fDeviceHasSATTranslation
+	
+	// Device support protocol specific power off
+	#define fProtocolSpecificPowerControl fIOSCSIBlockCommandsDeviceReserved->fProtocolSpecificPowerControl
+	
+	// Device requires START_STOP_UNIT for ejects, regardless if PREVENT_ALLOW_MEIDUMREMOVAL
+	// failed. 
+	#define fRequiresEjectWithStartStopUnit fIOSCSIBlockCommandsDeviceReserved->fRequiresEjectWithStartStopUnit
+	
+private:
+	/* OBSOLETE. Use IOSCSIPrimaryCommandsDevice::Get/SetANSIVersion */
+	UInt8				fANSIVersion;
+
+protected:
+	// ---- Device Characteristics ----
+	bool				fMediaIsRemovable;
+	
+	// ---- Medium Characteristics ----
+	bool				fMediumPresent;
+	
+private:
+	// The byte count of each physical block on the medium.
+	// This value should not be directly accessed and instead the member routine 
+	// ReportMediumBlockSize() should be used to retrieve it and the member routine
+	// SetMediumCharacteristics() should be used to set it.
+	UInt32				fMediumBlockSize;
+	
+	// The total number of blocks of fMediumBlockSize on the medium.
+	// OBSOLETE.  Use fMediumBlockCount64 instead which allows for support of
+	// devices that have 33 through 64 bit LBA values.
+	UInt32				fMediumBlockCount;
+	
+protected:
+	// Whether the installed medium is protected from writes
+	bool				fMediumIsWriteProtected;
+	
+	// Whether user removal of medium has been prevented	
+	bool				fMediumRemovalPrevented;
+	
+	// Indicates whether this is a known manual eject device
+	bool				fKnownManualEject;
+	
+	// Polling thread variables
+	thread_call_t		fPollingThread;
+	UInt32				fPollingMode;
+	enum
+	{
+		kPollingMode_Suspended		= 0,
+		kPollingMode_NewMedia 		= 1,
+		kPollingMode_MediaRemoval	= 2
+	};
+	
+	// ---- Methods for controlling the current state of device support ----
+	virtual bool		InitializeDeviceSupport ( void );
+	virtual void		StartDeviceSupport ( void );
+	virtual void		SuspendDeviceSupport ( void );
+	virtual void		ResumeDeviceSupport ( void );
+	virtual void		StopDeviceSupport ( void );
+	virtual void		TerminateDeviceSupport ( void );
+
+	virtual void 		free ( void );
+
+#ifndef __LP64__
+	
+	// This method will retrieve the SCSI Primary Command Set object for
+	// the class.  For subclasses, this will be overridden using a
+	// dynamic cast on the subclasses base command set object.
+	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
+	
+	virtual bool		CreateCommandSetObjects ( void );
+	virtual void		FreeCommandSetObjects ( void );
+	
+#endif	/* !__LP64__ */
+
+	virtual bool		ClearNotReadyStatus ( void );
+	virtual void 		CreateStorageServiceNub ( void );
+	virtual bool		DetermineDeviceCharacteristics ( void );
+	
+	// ---- Methods used for controlling the polling thread ----
+	virtual void		ProcessPoll ( void );
+	virtual void		EnablePolling ( void );
+	virtual void		DisablePolling ( void );
+	
+	// Main and support methods for polling for new Media
+	virtual void		PollForNewMedia ( void );
+	virtual bool		DetermineMediaPresence ( void );
+	virtual bool		PreventMediumRemoval ( void );
+	virtual bool		DetermineMediumCapacity (
+							UInt64 * 				blockSize,
+							UInt64 * 				blockCount );
+	virtual bool		DetermineMediumWriteProtectState ( void );
+	
+	// Main and support methods for polling for Media removal
+	virtual void		PollForMediaRemoval ( void );
+	
+	// ---- Methods used for handling medium characteristics ----
+	
+	// OBSOLETE - Use the version compatible with 64 bit LBAs instead.
+	virtual void		SetMediumCharacteristics (
+							UInt32 					blockSize,
+							UInt32 					blockCount );
+
+	void				SetMediumCharacteristics (
+							UInt64 					blockSize,
+							UInt64 					blockCount );
+	
+	virtual void		ResetMediumCharacteristics ( void );
+
+	virtual IOReturn	IssueRead (
+							IOMemoryDescriptor *	buffer,
+						 	UInt64					startBlock,
+					 		UInt64					blockCount );
+	
+	virtual IOReturn	IssueRead (
+							IOMemoryDescriptor *	buffer,
+					  		UInt64					startBlock,
+					 		UInt64					blockCount,
+					   		void * 					clientData );
+	
+	virtual IOReturn	IssueWrite (
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+					   		UInt64					blockCount );
+	
+	virtual IOReturn	IssueWrite (
+							IOMemoryDescriptor *	buffer,
+						 	UInt64					startBlock,
+					  		UInt64					blockCount,
+							void * 					clientData );
+	
+	// ----- Power Management Support ------
+	
+	// We override this method to set our power states and register ourselves
+	// as a power policy maker.
+	virtual void 		InitializePowerManagement ( IOService * provider );
+	
+	// We override this method so that when we register for power management,
+	// we go to our active power state (which the drive is definitely in
+	// at startup time).
+	virtual UInt32		GetInitialPowerState ( void );
+	
+	// We override this method in order to provide the number of transitions
+	// from Fully active to Sleep state so that the idle timer can be adjusted
+	// to the appropriate time period based on the disk spindown time set in
+	// the Energy Saver prefs panel.
+	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
+	
+	// The TicklePowerManager method is called to tell the power manager that
+	// the device needs to be in a certain power state to handle requests.
+	virtual void		TicklePowerManager ( void );
+	
+	// The HandlePowerChange method is the state machine for power management.
+	// It is guaranteed to be on its own thread of execution (different from
+	// the power manager thread AND the workloop thread. This routine can
+	// send sync or async calls to the drive without worrying about threading
+	// issues.
+	virtual void		HandlePowerChange ( void );
+	
+	// The HandleCheckPowerState (void) method is on the serialized side of the
+	// command gate and can change member variables safely without
+	// multi-threading issues. It's main purpose is to call the superclass'
+	// HandleCheckPowerState ( UInt32 maxPowerState ) with the max power state
+	// the class registered with.
+	virtual void		HandleCheckPowerState ( void );
+	
+	// The VerifyMediumPresence method is called to see if the medium which we
+	// anticipated being there is still there.
+	virtual bool		VerifyMediumPresence ( void );
+	
+public:
+	
+	static 	void		sProcessPoll ( void * pdtDriver, void * refCon );
+	
+	// ---- Methods for controlling the device ----
+	virtual IOReturn	SyncReadWrite (
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+							UInt64					blockCount,
+							UInt64					blockSize );
+	
+	virtual IOReturn	AsyncReadWrite (
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+							UInt64					blockCount,
+							UInt64					blockSize,
+							void * 					clientData );
+	
+	IOReturn	GetWriteCacheState ( bool * enabled );	
+	IOReturn	SetWriteCacheState ( bool enabled );
+	void		DetermineMediumGeometry ( void );
+	
+	// ---- Methods for controlling medium state ----
+	virtual IOReturn	EjectTheMedium ( void );
+	virtual IOReturn	LockUnlockMedium ( bool doLock );
+	virtual IOReturn	SynchronizeCache ( void );
+	
+	// ---- Methods for controlling media format ----
+	virtual IOReturn	FormatMedium (
+							UInt64 					blockCount,
+							UInt64 					blockSize );
+	virtual UInt32		GetFormatCapacities (
+							UInt64 * 				capacities,
+			 				UInt32   				capacitiesMaxCount ) const;
+	
+	// ---- Query methods to report device characteristics ----
+	
+	// Report the maximum number of blocks that the device can handle per
+	// read or write.  A value of 0 (zero) indicates there is no limit aside
+	// from the size of the method's return parameter.
+	virtual UInt64		ReportDeviceMaxBlocksReadTransfer ( void );
+	virtual UInt64		ReportDeviceMaxBlocksWriteTransfer ( void );
+	
+	// Report whether the device supports removal of the media.
+	virtual bool		ReportDeviceMediaRemovability ( void );
+	
+	// ---- Query methods to report installed medium characteristics ----
+	virtual UInt64		ReportMediumBlockSize ( void );
+	virtual UInt64		ReportMediumTotalBlockCount ( void );
+	virtual bool		ReportMediumWriteProtection ( void );
+	
+	
+protected:
+	
+
+#ifndef __LP64__
+	
+	// Command methods to access all commands available to SBC based devices.
+	virtual bool ERASE_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			ERA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool ERASE_12 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			ERA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool FORMAT_UNIT (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						IOByteCount					defectListSize,
+						SCSICmdField1Bit 			FMTDATA,
+						SCSICmdField1Bit 			CMPLST,
+						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
+						SCSICmdField1Byte 			VENDOR_SPECIFIC,
+						SCSICmdField2Byte 			INTERLEAVE,
+						SCSICmdField1Byte 			CONTROL );
+	
+	//  Defined in SBC-2 Section 5.41
+	bool FORMAT_UNIT (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						IOByteCount					defectListSize,
+						SCSICmdField1Bit			FMTPINFO,
+						SCSICmdField1Bit			RTO_REQ,
+						SCSICmdField1Bit			LONGLIST,
+						SCSICmdField1Bit 			FMTDATA, 
+						SCSICmdField1Bit 			CMPLST,
+						SCSICmdField3Bit 			DEFECT_LIST_FORMAT, 
+						SCSICmdField1Byte 			VENDOR_SPECIFIC, 
+						SCSICmdField1Byte 			CONTROL );
+	  	  
+	virtual bool LOCK_UNLOCK_CACHE (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			LOCK,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.5
+	bool LOCK_UNLOCK_CACHE (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			LOCK,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool LOCK_UNLOCK_CACHE_16 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit			LOCK,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte			CONTROL );
+						
+	virtual bool MEDIUM_SCAN (
+						SCSITaskIdentifier			request,
+			 			IOMemoryDescriptor *		dataBuffer,
+		   				SCSICmdField1Bit 			WBS,
+		   				SCSICmdField1Bit 			ASA,
+		   				SCSICmdField1Bit 			PSD,
+		   				SCSICmdField1Bit 			PRA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool PREFETCH (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	// Defined in SBC-2 section 5.7
+	bool PREFETCH (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool PREFETCH_16 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit			IMMED,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+	
+	virtual bool READ_6 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField21Bit 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+#endif	/* __LP64__ */
+	
+	virtual bool READ_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	// Defined in SBC-2 section 5.10
+	bool READ_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit 			RDPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool READ_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	// Defined in SBC-2 section 5.11
+	bool READ_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			RDPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool READ_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			RDPROTECT,
+						SCSICmdField1Bit			DPO,
+						SCSICmdField1Bit			FUA,
+						SCSICmdField1Bit			FUA_NV,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+	
+	virtual bool READ_CAPACITY (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Bit 			PMI,
+						SCSICmdField1Byte 			CONTROL );
+	
+	bool READ_CAPACITY_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			ALLOCATION_LENGTH,
+						SCSICmdField1Bit 			PMI,
+						SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+	virtual bool READ_DEFECT_DATA_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			PLIST,
+						SCSICmdField1Bit 			GLIST,
+						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool READ_DEFECT_DATA_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			PLIST,
+						SCSICmdField1Bit 			GLIST,
+						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
+						SCSICmdField4Byte 			ALLOCATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool READ_GENERATION (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			ALLOCATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool READ_LONG (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			CORRCT,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			BYTE_TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool READ_LONG_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte			BYTE_TRANSFER_LENGTH,
+						SCSICmdField1Bit			CORRCT,
+						SCSICmdField1Byte			CONTROL );
+		
+	virtual bool READ_UPDATED_BLOCK_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+					 	SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Bit 			LATEST,
+					 	SCSICmdField15Bit 			GENERATION_ADDRESS,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool REASSIGN_BLOCKS (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.20
+	bool REASSIGN_BLOCKS (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit			LONGLBA,
+						SCSICmdField1Bit			LONGLIST,
+						SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool REBUILD (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+					 	SCSICmdField1Bit 			INTDATA,
+						SCSICmdField2Bit 			PORT_CONTROL,
+					 	SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			REBUILD_LENGTH,
+						SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool REGENERATE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit			DPO,
+						SCSICmdField1Bit 			FUA,
+					 	SCSICmdField1Bit 			INTDATA,
+					 	SCSICmdField2Bit 			PORT_CONTROL,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			REBUILD_LENGTH,
+						SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool REZERO_UNIT (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SEARCH_DATA_EQUAL_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			INVERT,
+						SCSICmdField1Bit 			SPNDAT,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SEARCH_DATA_HIGH_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			INVERT,
+						SCSICmdField1Bit 			SPNDAT,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SEARCH_DATA_LOW_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			INVERT,
+						SCSICmdField1Bit 			SPNDAT,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SEEK_6 (
+						SCSITaskIdentifier			request,
+						SCSICmdField21Bit 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SEEK_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SET_LIMITS_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			RDINH,
+						SCSICmdField1Bit 			WRINH,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SET_LIMITS_12 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			RDINH,
+						SCSICmdField1Bit 			WRINH,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+#endif	/* __LP64__ */
+	
+	virtual bool START_STOP_UNIT (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED,
+						SCSICmdField4Bit 			POWER_CONDITIONS,
+						SCSICmdField1Bit 			LOEJ,
+						SCSICmdField1Bit 			START,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SYNCHRONIZE_CACHE (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+	// Defined in SBC-2 section 5.22
+	bool SYNCHRONIZE_CACHE (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED,
+						SCSICmdField1Bit 			SYNC_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool SYNCRONIZE_CACHE_16 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit			SYNC_NV,
+						SCSICmdField1Bit			IMMED,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			NUMBER_OF_BLOCKS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+						
+#ifndef __LP64__
+
+	virtual bool UPDATE_BLOCK (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool VERIFY_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BLKVFY,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			VERIFICATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+	
+	//  Defined in SBC-2 section 5.24
+	bool VERIFY_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField3Bit 			VRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			VERIFICATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool VERIFY_12 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BLKVFY,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			VERIFICATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.25
+	bool VERIFY_12 (
+						SCSITaskIdentifier			request,
+						SCSICmdField3Bit 			VRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField4Byte 			VERIFICATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool VERIFY_16 (
+						SCSITaskIdentifier			request,
+						SCSICmdField3Bit			VRPROTECT,
+						SCSICmdField1Bit			DPO,
+						SCSICmdField1Bit			BYTCHK,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			VERIFICATION_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+	
+	virtual bool WRITE_6 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField2Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+	
+#endif	/* __LP64__ */
+
+	virtual bool WRITE_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			EBP,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.29
+	bool WRITE_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool WRITE_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			EBP,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.30
+	bool WRITE_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool WRITE_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit			DPO,
+						SCSICmdField1Bit			FUA,
+						SCSICmdField1Bit			FUA_NV,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+
+#ifndef __LP64__
+				
+	virtual bool WRITE_AND_VERIFY_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			EBP,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.33
+	bool WRITE_AND_VERIFY_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool WRITE_AND_VERIFY_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			EBP,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+	
+	//  Defined in SBC-2 section 5.34
+	bool WRITE_AND_VERIFY_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool WRITE_AND_VERIFY_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte 			CONTROL );
+
+
+	virtual bool WRITE_LONG (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool WRITE_LONG_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Bit			CORRCT,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool WRITE_SAME (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			PBDATA,
+						SCSICmdField1Bit 			LBDATA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.39
+	bool WRITE_SAME (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			PBDATA,
+						SCSICmdField1Bit 			LBDATA,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool WRITE_SAME_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit			PBDATA,
+						SCSICmdField1Bit			LBDATA,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+
+	virtual bool XDREAD (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.42
+	bool XDREAD (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit			XORPINFO,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool XDWRITE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			DISABLE_WRITE,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.43
+	bool XDWRITE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			DISABLE_WRITE,
+						SCSICmdField1Bit			FUA_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool XDWRITE_EXTENDED (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			TABLE_ADDRESS,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			DISABLE_WRITE,
+						SCSICmdField2Bit 			PORT_CONTROL,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			SECONDARY_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			SECONDARY_ADDRESS,
+						SCSICmdField1Byte 			CONTROL );
+	
+	//  Defined in SBC-2 section 5.46
+	bool XDWRITEREAD_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			DISABLE_WRITE,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField1Bit 			XORPINFO,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool XPWRITE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.48
+	bool XPWRITE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField1Bit 			XORPINFO,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+#endif	/* __LP64__ */
+	
+	
+	/* Added with 10.2 */	
+	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 1 );
+	
+public:
+	
+	virtual IOReturn	PowerDownHandler (	void * 			refCon,
+											UInt32 			messageType,
+											IOService * 	provider,
+											void * 			messageArgument,
+											vm_size_t 		argSize );
+	
+
+	/* Added with 10.2 */	
+	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 2 );
+	
+protected:
+	
+	virtual	void		SetMediumIcon ( void );
+	
+	
+	/* Added with 10.3.3 */		
+	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 3 );
+	
+protected:
+
+	virtual	void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
+	
+	
+	/* Added with 10.6.0 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 4 );
+	
+public:
+	
+	virtual	IOReturn AsyncReadWrite (
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+							UInt64					blockCount,
+							UInt64					blockSize,
+							IOStorageAttributes *	attributes,
+							void * 					clientData );
+	
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 16 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIMultimediaCommandsDevice.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIMultimediaCommandsDevice.h.svn-base
new file mode 100644
index 0000000..f812a39
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIMultimediaCommandsDevice.h.svn-base
@@ -0,0 +1,1057 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_
+#define _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+
+// Message constants
+#define kIOMessageTrayStateChange			0x69000035
+#define kIOMessageTrayStateHasChanged		kIOMessageTrayStateChange // DEPRECATED, use kIOMessageTrayStateChange instead
+
+// Message values for kIOMessageTrayStateChange
+enum
+{
+	kMessageTrayStateChangeRequestAccepted	= 0,
+	kMessageTrayStateChangeRequestRejected	= 1
+};
+
+#define kIOMessageMediaAccessChange			0x69000036
+
+// Message values for kIOMessageMediaAccessChange
+enum
+{
+	kMessageDeterminingMediaPresence	= 0,
+	kMessageFoundMedia					= 1,
+	kMessageMediaTypeDetermined			= 2
+};
+
+// IOKit property keys and constants
+#define	kIOPropertySupportedCDFeatures		kIOPropertySupportedCDFeaturesKey
+#define	kIOPropertySupportedDVDFeatures		kIOPropertySupportedDVDFeaturesKey
+#define	kIOPropertySupportedBDFeatures		kIOPropertySupportedBDFeaturesKey
+#define kIOPropertyLowPowerPolling			"Low Power Polling"
+
+typedef UInt32 CDFeatures;
+enum
+{
+	kCDFeaturesAnalogAudioBit			= 0,	// Analog Audio playback
+	kCDFeaturesReadStructuresBit		= 1,	// CD-ROM
+	kCDFeaturesWriteOnceBit				= 2,	// CD-R
+	kCDFeaturesReWriteableBit			= 3,	// CD-R/W
+	kCDFeaturesCDDAStreamAccurateBit	= 4,	// CD-DA stream accurate
+	kCDFeaturesPacketWriteBit			= 5,	// Packet Writing
+	kCDFeaturesTAOWriteBit				= 6,	// CD Track At Once
+	kCDFeaturesSAOWriteBit				= 7,	// CD Mastering - Session At Once
+	kCDFeaturesRawWriteBit				= 8,	// CD Mastering - Raw
+	kCDFeaturesTestWriteBit				= 9,	// CD Mastering/TAO - Test Write
+	kCDFeaturesBUFWriteBit				= 10	// CD Mastering/TAO - Buffer Underrun Free
+};
+
+enum
+{
+	kCDFeaturesAnalogAudioMask 			= (1 << kCDFeaturesAnalogAudioBit),
+	kCDFeaturesReadStructuresMask		= (1 << kCDFeaturesReadStructuresBit),
+	kCDFeaturesWriteOnceMask			= (1 << kCDFeaturesWriteOnceBit),
+	kCDFeaturesReWriteableMask			= (1 << kCDFeaturesReWriteableBit),
+	kCDFeaturesCDDAStreamAccurateMask	= (1 << kCDFeaturesCDDAStreamAccurateBit),
+	kCDFeaturesPacketWriteMask			= (1 << kCDFeaturesPacketWriteBit),
+	kCDFeaturesTAOWriteMask				= (1 << kCDFeaturesTAOWriteBit),
+	kCDFeaturesSAOWriteMask				= (1 << kCDFeaturesSAOWriteBit),
+	kCDFeaturesRawWriteMask				= (1 << kCDFeaturesRawWriteBit),
+	kCDFeaturesTestWriteMask			= (1 << kCDFeaturesTestWriteBit),
+	kCDFeaturesBUFWriteMask				= (1 << kCDFeaturesBUFWriteBit)
+};
+
+typedef	UInt32 DVDFeatures;
+enum
+{
+	kDVDFeaturesCSSBit 					= 0,	// DVD-CSS
+	kDVDFeaturesReadStructuresBit 		= 1,	// DVD-ROM
+	kDVDFeaturesWriteOnceBit			= 2,	// DVD-R
+	kDVDFeaturesRandomWriteableBit		= 3,	// DVD-RAM
+	kDVDFeaturesReWriteableBit			= 4,	// DVD-RW
+	kDVDFeaturesTestWriteBit			= 5,	// DVD-R Write - Test Write
+	kDVDFeaturesBUFWriteBit				= 6,	// DVD-R Write - Buffer Underrun Free
+	kDVDFeaturesPlusRBit				= 7,	// DVD+R
+	kDVDFeaturesPlusRWBit				= 8,	// DVD+RW (implies backgound format support)
+	kDVDFeaturesHDReadBit				= 9,	// HD DVD-ROM
+	kDVDFeaturesHDRBit					= 10,	// HD DVD-R
+	kDVDFeaturesHDRAMBit				= 11,	// HD DVD-RAM
+	kDVDFeaturesHDRWBit					= 12	// HD DVD-RW
+};
+
+enum
+{
+	kDVDFeaturesCSSMask 				= (1 << kDVDFeaturesCSSBit),
+	kDVDFeaturesReadStructuresMask 		= (1 << kDVDFeaturesReadStructuresBit),
+	kDVDFeaturesWriteOnceMask			= (1 << kDVDFeaturesWriteOnceBit),
+	kDVDFeaturesRandomWriteableMask		= (1 << kDVDFeaturesRandomWriteableBit),
+	kDVDFeaturesReWriteableMask			= (1 << kDVDFeaturesReWriteableBit),
+	kDVDFeaturesTestWriteMask			= (1 << kDVDFeaturesTestWriteBit),
+	kDVDFeaturesBUFWriteMask			= (1 << kDVDFeaturesBUFWriteBit),
+	kDVDFeaturesPlusRMask				= (1 << kDVDFeaturesPlusRBit),
+	kDVDFeaturesPlusRWMask				= (1 << kDVDFeaturesPlusRWBit),
+	kDVDFeaturesHDReadMask				= (1 << kDVDFeaturesHDReadBit),
+	kDVDFeaturesHDRMask					= (1 << kDVDFeaturesHDRBit),
+	kDVDFeaturesHDRAMMask				= (1 << kDVDFeaturesHDRAMBit),
+	kDVDFeaturesHDRWMask				= (1 << kDVDFeaturesHDRWBit)
+};
+
+typedef	UInt32 BDFeatures;
+enum
+{
+	kBDFeaturesReadBit					= 0,	// BD-ROM
+	kBDFeaturesWriteBit					= 1		// BD-R / BD-RE
+};
+
+enum
+{
+	kBDFeaturesReadMask					= (1 << kBDFeaturesReadBit),
+	kBDFeaturesWriteMask				= (1 << kBDFeaturesWriteBit)
+};
+
+enum
+{
+	kDiscStatusEmpty 					= 0,
+	kDiscStatusIncomplete				= 1,
+	kDiscStatusComplete					= 2,
+	kDiscStatusOther					= 3,
+	kDiscStatusMask						= 0x03,
+	kDiscStatusErasableMask				= 0x10
+};
+
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+// MMC power states as defined in T10:1228D SCSI Multimedia Commands - 2 (MMC-2)
+// Revision 11a, August 30, 1999, page 312 (Annex F).
+enum
+{
+	kMMCPowerStateSystemSleep	= 0,
+	kMMCPowerStateSleep 		= 1,
+	kMMCPowerStateStandby 		= 2,
+	kMMCPowerStateIdle			= 3,
+	kMMCPowerStateActive		= 4,
+	kMMCNumPowerStates			= 5
+};
+
+enum
+{
+	kMediaStateUnlocked	= 0,
+	kMediaStateLocked 	= 1
+};
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOMemoryDescriptor.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOStorage.h>
+#include <IOKit/storage/IOCDTypes.h>
+#include <IOKit/storage/IODVDTypes.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
+
+// Forward definitions for internal use only classes
+class SCSIMultimediaCommands;
+class SCSIBlockCommands;
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIMultimediaCommandsDevice : public IOSCSIPrimaryCommandsDevice
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIMultimediaCommandsDevice )
+	
+private:
+
+#ifndef __LP64__
+
+    SCSIMultimediaCommands *	fSCSIMultimediaCommandObject;
+    SCSIMultimediaCommands *	GetSCSIMultimediaCommandObject ( void );
+	
+    SCSIBlockCommands *			fSCSIBlockCommandObject;			/* OBSOLETE */
+    SCSIBlockCommands *			GetSCSIBlockCommandObject ( void );	/* OBSOLETE */
+
+#endif	/* !__LP64__ */
+	
+	static void		AsyncReadWriteComplete ( SCSITaskIdentifier completedTask );
+	
+protected:
+	
+    // Reserve space for future expansion.
+    struct IOSCSIMultimediaCommandsDeviceExpansionData
+	{
+		IONotifier *		fPowerDownNotifier;
+		bool				fDeviceSupportsPowerOff;
+		BDFeatures			fSupportedBDFeatures;
+		bool				fDeviceSupportsAsyncNotification;
+		bool				fDeviceSupportsFastSpindown;
+		UInt8				fCDLoadingMechanism;
+	};
+    IOSCSIMultimediaCommandsDeviceExpansionData * fIOSCSIMultimediaCommandsDeviceReserved;
+	
+	#define fPowerDownNotifier 					fIOSCSIMultimediaCommandsDeviceReserved->fPowerDownNotifier
+	#define fDeviceSupportsPowerOff 			fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsPowerOff
+	#define fSupportedBDFeatures				fIOSCSIMultimediaCommandsDeviceReserved->fSupportedBDFeatures
+	#define fDeviceSupportsAsyncNotification	fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsAsyncNotification
+	#define fDeviceSupportsFastSpindown			fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsFastSpindown
+	#define fCDLoadingMechanism					fIOSCSIMultimediaCommandsDeviceReserved->fCDLoadingMechanism
+	
+#ifndef __LP64__
+	
+	// This method will retreive the SCSI Primary Command Set object for
+	// the class.  For subclasses, this will be overridden using a
+	// dynamic cast on the subclasses base command set object.
+	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
+	
+#endif	/* !__LP64__ */
+	
+	CDFeatures						fSupportedCDFeatures;
+	DVDFeatures						fSupportedDVDFeatures;
+
+	UInt16							fCurrentDiscSpeed;	
+	bool							fMediaChanged; 
+	bool							fMediaPresent;
+	
+	// The byte count of each physical block on the media.
+	UInt32							fMediaBlockSize;
+	
+	// The total number of blocks of fMediaBlockSize on the media.
+	UInt32							fMediaBlockCount;
+	
+	// Flags used to indicate device feature
+	bool							fMediaIsRemovable;
+	bool							fMediaIsWriteProtected;
+	UInt32							fMediaType;
+	
+	thread_call_t					fPollingThread;
+	bool							fDeviceSupportsLowPowerPolling;
+	bool							fLowPowerPollingEnabled;
+	UInt32							fPollingMode;
+	
+	enum
+	{
+		kPollingMode_Suspended		= 0,
+		kPollingMode_NewMedia 		= 1,
+		kPollingMode_MediaRemoval	= 2
+	};
+	
+	virtual IOReturn	setProperties ( OSObject * properties );
+	
+	virtual void 		CreateStorageServiceNub ( void );
+	virtual bool		DetermineDeviceCharacteristics ( void );
+	virtual IOReturn	DetermineIfMediaIsRemovable ( void );
+	virtual IOReturn	DetermineDeviceFeatures ( void );
+	virtual void		DetermineMediaType ( void );
+	virtual bool		CheckForDVDMediaType ( void );
+	virtual bool		CheckForCDMediaType ( void );
+	virtual void		PollForMedia ( void );
+	virtual void		EnablePolling ( void );
+	virtual void		DisablePolling ( void );
+	virtual void		CheckWriteProtection ( void );
+	virtual bool		ClearNotReadyStatus ( void );
+		
+	virtual IOReturn	GetDeviceConfiguration ( void );
+	virtual IOReturn	GetDeviceConfigurationSize ( UInt32 * size );
+	virtual IOReturn	ParseFeatureList ( UInt32 numProfiles, UInt8 * firstFeaturePtr );
+	
+	virtual IOReturn	GetMechanicalCapabilities ( void );
+	virtual IOReturn	GetMechanicalCapabilitiesSize ( UInt32 * size );
+	virtual IOReturn	ParseMechanicalCapabilities ( UInt8 * mechanicalCapabilitiesPtr );
+
+	virtual IOReturn	CheckForLowPowerPollingSupport ( void );
+	virtual IOReturn	GetCurrentPowerStateOfDrive ( UInt32 * powerState );
+
+	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
+									UInt64					startBlock,
+									UInt64					blockCount );
+
+	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
+									void *					clientData,
+									UInt64					startBlock,
+									UInt64					blockCount );
+	
+	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
+									UInt64					startBlock,
+									UInt64					blockCount );
+	
+	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
+									void *					clientData,
+									UInt64					startBlock,
+									UInt64					blockCount );
+
+    virtual void		SetMediaCharacteristics ( UInt32 blockSize, UInt32 blockCount );
+ 	virtual void		ResetMediaCharacteristics ( void );
+
+	UInt8				ConvertBCDToHex ( UInt8 binaryCodedDigit );
+
+	// ------ User Client Support ------
+	
+	virtual IOReturn 	HandleSetUserClientExclusivityState ( IOService * userClient, bool state );
+
+	// ----- Power Management Support ------
+	
+	// We override this method to set our power states and register ourselves
+	// as a power policy maker.
+	virtual void 		InitializePowerManagement ( IOService * provider );
+	
+	// We override this method so that when we register for power management,
+	// we go to our active power state (which the drive is definitely in
+	// at startup time).
+	virtual UInt32		GetInitialPowerState ( void );
+
+	// We override this method in order to provide the number of transitions
+	// from Fully active to Sleep state so that the idle timer can be adjusted
+	// to the appropriate time period based on the disk spindown time set in
+	// the Energy Saver prefs panel.
+	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
+	
+	// The TicklePowerManager method is called to tell the power manager that the
+	// device needs to be in a certain power state to handle requests.
+	virtual void		TicklePowerManager ( void );
+
+	// The HandlePowerChange method is the state machine for power management.
+	// It is guaranteed to be on its own thread of execution (different from
+	// the power manager thread AND the workloop thread. This routine can
+	// send sync or async calls to the drive without worrying about threading
+	// issues.
+	virtual void		HandlePowerChange ( void );
+
+	// The HandleCheckPowerState (void) method is on the serialized side of the command
+	// gate and can change member variables safely without multi-threading issues.
+	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
+	// with the max power state the class registered with.
+	virtual void		HandleCheckPowerState ( void );
+
+	// The CheckMediaPresence method is called to see if the media which we
+	// anticipated being there is still there.
+	virtual bool		CheckMediaPresence ( void );
+	
+	virtual bool		InitializeDeviceSupport ( void );
+	virtual void		StartDeviceSupport ( void );
+	virtual void		SuspendDeviceSupport ( void );
+	virtual void		ResumeDeviceSupport ( void );
+	virtual void		StopDeviceSupport ( void );
+	virtual void		TerminateDeviceSupport ( void );
+	
+	virtual void		free ( void );
+	
+#ifndef __LP64__
+
+	virtual bool 		CreateCommandSetObjects ( void );
+	virtual void 		FreeCommandSetObjects ( void );
+
+#endif	/* !__LP64__ */
+
+	virtual IOReturn	VerifyDeviceState ( void );
+
+
+public:
+	
+	virtual IOReturn 	setAggressiveness ( unsigned long type, unsigned long minutes );
+	
+	virtual IOReturn	SyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					startBlock,
+											UInt64					blockCount );
+	
+	virtual IOReturn	AsyncReadWrite (	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											void *					clientData );
+
+	virtual IOReturn	EjectTheMedia ( void );
+	virtual IOReturn	GetTrayState ( UInt8 * trayState );
+	virtual IOReturn	SetTrayState ( UInt8 trayState );
+	virtual IOReturn	FormatMedia ( UInt64 byteCapacity );
+	virtual UInt32		GetFormatCapacities ( 	UInt64 * capacities,
+												UInt32   capacitiesMaxCount ) const;
+	virtual IOReturn	LockUnlockMedia ( bool doLock );
+	virtual IOReturn	SynchronizeCache ( void );
+	virtual IOReturn	ReportBlockSize ( UInt64 * blockSize );
+	virtual IOReturn	ReportEjectability ( bool * isEjectable );
+	virtual IOReturn	ReportLockability ( bool * isLockable );
+	virtual IOReturn	ReportPollRequirements ( bool * pollIsRequired,
+												 bool * pollIsExpensive );
+	virtual IOReturn	ReportMaxReadTransfer (  UInt64 	blockSize,
+												 UInt64 * 	max );
+	virtual IOReturn	ReportMaxValidBlock ( UInt64 * maxBlock );
+	virtual IOReturn	ReportMaxWriteTransfer ( UInt64	blockSize,
+												UInt64 * max );
+	virtual IOReturn	ReportMediaState ( 	bool * mediaPresent,
+											bool * changed );
+	virtual IOReturn	ReportRemovability ( bool * isRemovable );
+	virtual IOReturn	ReportWriteProtection ( bool * isWriteProtected );
+	
+	static 	void		sPollForMedia ( void * pdtDriver, void * refCon );
+
+	/* CD Specific */
+	virtual IOReturn	SetMediaAccessSpeed ( UInt16 kilobytesPerSecond );
+	
+	virtual IOReturn	GetMediaAccessSpeed ( UInt16 * kilobytesPerSecond );
+
+	virtual IOReturn	AsyncReadCD ( 	IOMemoryDescriptor * buffer,
+										UInt32 block,
+										UInt32 nblks,
+										CDSectorArea sectorArea,
+										CDSectorType sectorType,
+										void *	clientData );
+	
+	virtual IOReturn	ReadISRC ( UInt8 track, CDISRC isrc );
+	
+	virtual IOReturn	ReadMCN ( CDMCN mcn);
+	
+	virtual IOReturn	ReadTOC ( IOMemoryDescriptor * buffer );
+
+#ifndef __LP64__
+	
+	virtual IOReturn	AudioPause ( bool pause );
+	
+	virtual IOReturn	AudioPlay ( CDMSF timeStart, CDMSF timeStop );
+	
+	virtual IOReturn	AudioScan ( CDMSF timeStart, bool reverse );
+	
+	virtual IOReturn	AudioStop ( void );
+	
+	virtual IOReturn	GetAudioStatus ( CDAudioStatus * status );
+	
+	virtual IOReturn	GetAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
+	
+	virtual IOReturn	SetAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
+
+#endif	/* !__LP64__ */
+	
+	/* DVD Specific */
+	virtual UInt32			GetMediaType		( void );
+    
+	virtual IOReturn		ReportKey			( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt32 lba,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+												  
+	virtual IOReturn		SendKey				( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+												  
+	virtual IOReturn		ReadDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
+													const UInt32 				length,
+													const UInt8					structureFormat,
+													const UInt32				logicalBlockAddress,
+													const UInt8					layer,
+													const UInt8 				agid );
+
+	// The block size decoding for Read CD and Read CD MSF  as defined in table 255
+    bool	GetBlockSize (
+						UInt32 *					requestedByteCount,
+						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
+						SCSICmdField1Bit 			SYNC,
+						SCSICmdField2Bit 			HEADER_CODES,
+						SCSICmdField1Bit 			USER_DATA,
+						SCSICmdField1Bit 			EDC_ECC,
+						SCSICmdField2Bit 			ERROR_FIELD,
+						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS );
+	
+	SCSICmdField4Byte ConvertMSFToLBA ( SCSICmdField3Byte MSF );
+
+#ifndef __LP64__
+
+	// Command methods to access all commands available to MMC based devices.
+	// The BLANK command as defined in section 6.1.1
+	virtual bool BLANK (
+						SCSITaskIdentifier			request,
+		    			SCSICmdField1Bit 			IMMED, 
+						SCSICmdField3Bit 			BLANKING_TYPE, 
+						SCSICmdField4Byte 			START_ADDRESS_TRACK_NUMBER, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The CLOSE TRACK/SESSION command as defined in section 6.1.2
+    virtual bool CLOSE_TRACK_SESSION (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField1Bit 			SESSION, 
+						SCSICmdField1Bit 			TRACK, 
+						SCSICmdField2Byte 			TRACK_NUMBER, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The FORMAT UNIT command as defined in section 6.1.3
+    virtual bool FORMAT_UNIT (
+						SCSITaskIdentifier			request,
+		    			IOMemoryDescriptor *		dataBuffer,
+		    			IOByteCount					parameterListSize,
+						SCSICmdField1Bit 			FMT_DATA, 
+						SCSICmdField1Bit 			CMP_LIST, 
+						SCSICmdField3Bit 			FORMAT_CODE, 
+						SCSICmdField2Byte 			INTERLEAVE_VALUE, 
+						SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	
+	// The GET CONFIGURATION command as defined in section 6.1.4
+    virtual bool GET_CONFIGURATION (
+						SCSITaskIdentifier			request,
+   						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField2Bit 			RT, 
+						SCSICmdField2Byte 			STARTING_FEATURE_NUMBER, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The GET EVENT/STATUS NOTIFICATION command as defined in section 6.1.5
+    virtual bool GET_EVENT_STATUS_NOTIFICATION (
+						SCSITaskIdentifier			request,
+	    				IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField1Byte 			NOTIFICATION_CLASS_REQUEST, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The GET PERFORMANCE command as defined in section 6.1.6
+    virtual bool GET_PERFORMANCE (
+						SCSITaskIdentifier			request,
+	   					IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Bit 			TOLERANCE, 
+						SCSICmdField1Bit 			WRITE, 
+						SCSICmdField2Bit 			EXCEPT, 
+						SCSICmdField4Byte 			STARTING_LBA, 
+						SCSICmdField2Byte 			MAXIMUM_NUMBER_OF_DESCRIPTORS, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The LOAD/UNLOAD MEDIUM command as defined in section 6.1.7
+    virtual bool LOAD_UNLOAD_MEDIUM (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField1Bit 			LO_UNLO, 
+						SCSICmdField1Bit 			START, 
+						SCSICmdField1Byte 			SLOT, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The MECHANISM STATUS command as defined in section 6.1.8
+    virtual bool MECHANISM_STATUS (
+						SCSITaskIdentifier			request,
+	   					IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+	// The PAUSE/RESUME command as defined in section 6.1.9
+    virtual bool PAUSE_RESUME (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			RESUME, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The PLAY AUDIO (10) command as defined in section 6.1.10
+    virtual bool PLAY_AUDIO_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField2Byte 			PLAY_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The PLAY AUDIO (12) command as defined in section 6.1.11
+    virtual bool PLAY_AUDIO_12 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField4Byte 			PLAY_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The PLAY AUDIO MSF command as defined in section 6.1.12
+    virtual bool PLAY_AUDIO_MSF (
+						SCSITaskIdentifier			request,
+						SCSICmdField3Byte 			STARTING_MSF, 
+						SCSICmdField3Byte 			ENDING_MSF, 
+						SCSICmdField1Byte 			CONTROL );
+	
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The PLAY CD command as defined in section 6.1.13
+    virtual bool PLAY_CD (
+						SCSITaskIdentifier			request,
+						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
+						SCSICmdField1Bit 			CMSF,
+						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField4Byte 			PLAY_LENGTH_IN_BLOCKS, 
+						SCSICmdField1Bit 			SPEED,
+						SCSICmdField1Bit 			PORT2,
+						SCSICmdField1Bit 			PORT1,
+						SCSICmdField1Bit 			COMPOSITE,
+						SCSICmdField1Bit 			AUDIO,
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT *******************/
+
+#endif	/* !__LP64__ */
+	
+	virtual bool READ_10 (
+						SCSITaskIdentifier			request,
+		    			IOMemoryDescriptor 			*dataBuffer, 
+		    			UInt32						blockSize,
+		    			SCSICmdField1Bit 			DPO, 
+		    			SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField2Byte 			TRANSFER_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	
+#ifndef __LP64__
+	
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The READ BUFFER CAPACITY command as defined in section 6.1.14
+    virtual bool READ_BUFFER_CAPACITY (
+						SCSITaskIdentifier			request,
+    					IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT *******************/
+	
+#endif	/* !__LP64__ */
+	
+	// The READ CD command as defined in section 6.1.15
+    virtual bool READ_CD (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField3Byte 			TRANSFER_LENGTH, 
+						SCSICmdField1Bit 			SYNC,
+						SCSICmdField2Bit 			HEADER_CODES,
+						SCSICmdField1Bit 			USER_DATA,
+						SCSICmdField1Bit 			EDC_ECC,
+						SCSICmdField2Bit 			ERROR_FIELD,
+						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ CD MSF command as defined in section 6.1.16
+    virtual bool READ_CD_MSF (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
+						SCSICmdField3Byte 			STARTING_MSF, 
+						SCSICmdField3Byte 			ENDING_MSF, 
+						SCSICmdField1Bit 			SYNC,
+						SCSICmdField2Bit 			HEADER_CODES,
+						SCSICmdField1Bit 			USER_DATA,
+						SCSICmdField1Bit 			EDC_ECC,
+						SCSICmdField2Bit 			ERROR_FIELD,
+						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ CAPACITY command as defined in section 6.1.17
+    virtual bool READ_CAPACITY (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Bit 			PMI,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ DISC INFORMATION command as defined in section 6.1.18
+    virtual bool READ_DISC_INFORMATION (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ DVD STRUCTURE command as defined in section 6.1.19
+    virtual bool READ_DVD_STRUCTURE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField4Byte 			ADDRESS,
+						SCSICmdField1Byte 			LAYER_NUMBER, 
+						SCSICmdField1Byte 			FORMAT, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField2Bit 			AGID,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ FORMAT CAPACITIES command as defined in section 6.1.20
+    virtual bool READ_FORMAT_CAPACITIES (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+	
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The READ HEADER command as defined in section 6.1.21
+    virtual bool READ_HEADER (
+						SCSITaskIdentifier			request,
+    					IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			MSF,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT ***********************/
+
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The READ MASTER CUE command as defined in section 6.1.22
+    virtual bool READ_MASTER_CUE (
+						SCSITaskIdentifier			request,
+   						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Byte 			SHEET_NUMBER, 
+						SCSICmdField3Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT ***********************/
+
+#endif	/* !__LP64__ */
+	
+	// The READ SUB-CHANNEL command as defined in section 6.1.23
+    virtual bool READ_SUB_CHANNEL (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			MSF,
+						SCSICmdField1Bit 			SUBQ,
+						SCSICmdField1Byte 			SUB_CHANNEL_PARAMETER_LIST, 
+						SCSICmdField1Byte 			TRACK_NUMBER, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ TOC/PMA/ATIP command as defined in section 6.1.24/25
+    virtual bool READ_TOC_PMA_ATIP (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField1Bit 			MSF,
+						SCSICmdField4Bit 			FORMAT,
+						SCSICmdField1Byte			TRACK_SESSION_NUMBER,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ TRACK INFORMATION command as defined in section 6.1.26
+    virtual bool READ_TRACK_INFORMATION (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Bit 			ADDRESS_NUMBER_TYPE,
+						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS_TRACK_SESSION_NUMBER,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The REPAIR TRACK command as defined in section 6.1.27
+    virtual bool REPAIR_TRACK (
+						SCSITaskIdentifier			request,
+						SCSICmdField2Byte 			TRACK_NUMBER, 
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT ***********************/
+	
+	// The REPORT KEY command as defined in section 6.1.28
+    virtual bool REPORT_KEY (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField2Bit 			AGID,
+						SCSICmdField6Bit 			KEY_FORMAT,
+						SCSICmdField1Byte 			CONTROL );
+	
+	// The RESERVE TRACK command as defined in section 6.1.29
+    virtual bool RESERVE_TRACK (
+						SCSITaskIdentifier			request,
+						SCSICmdField4Byte			RESERVATION_SIZE,
+						SCSICmdField1Byte 			CONTROL );
+	
+	// The SCAN command as defined in section 6.1.30
+    virtual bool SCAN (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			DIRECT,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte			SCAN_STARTING_ADDRESS_FIELD,
+						SCSICmdField2Bit 			TYPE,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The SEND CUE SHEET command as defined in section 6.1.31
+    virtual bool SEND_CUE_SHEET (
+						SCSITaskIdentifier			request,
+	    				IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField3Byte			CUE_SHEET_SIZE,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The SEND DVD STRUCTURE command as defined in section 6.1.32
+    virtual bool SEND_DVD_STRUCTURE (
+						SCSITaskIdentifier			request,
+	   	 				IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Byte			FORMAT,
+						SCSICmdField2Byte 			STRUCTURE_DATA_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The SEND EVENT command as defined in section 6.1.33
+    virtual bool SEND_EVENT (
+						SCSITaskIdentifier			request,
+	   		 			IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	
+	// The SEND KEY command as defined in section 6.1.34
+    virtual bool SEND_KEY (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
+						SCSICmdField2Bit 			AGID,
+						SCSICmdField6Bit 			KEY_FORMAT,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The SEND OPC INFORMATION command as defined in section 6.1.35
+    virtual bool SEND_OPC_INFORMATION (
+						SCSITaskIdentifier			request,
+	    				IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DO_OPC, 
+						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+#endif	/* !__LP64__ */
+
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The SET CD SPEED command as defined in section 6.1.36
+    virtual bool SET_CD_SPEED (
+						SCSITaskIdentifier			request,
+						SCSICmdField2Byte 			LOGICAL_UNIT_READ_SPEED, 
+						SCSICmdField2Byte 			LOGICAL_UNIT_WRITE_SPEED, 
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT ***********************/
+
+	// The SET READ AHEAD command as defined in section 6.1.37
+    virtual bool SET_READ_AHEAD (
+						SCSITaskIdentifier			request,
+						SCSICmdField4Byte 			TRIGGER_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField4Byte 			READ_AHEAD_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The SET STREAMING command as defined in section 6.1.38
+    virtual bool SET_STREAMING (
+						SCSITaskIdentifier			request,
+	 		   			IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool START_STOP_UNIT ( 
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField4Bit 			POWER_CONDITIONS, 
+						SCSICmdField1Bit 			LOEJ, 
+						SCSICmdField1Bit 			START, 
+						SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+	
+	// The STOP PLAY/SCAN command as defined in section 6.1.39
+    virtual bool STOP_PLAY_SCAN (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+
+	// The SYNCHRONIZE CACHE command as defined in section 6.1.40
+    virtual bool SYNCHRONIZE_CACHE (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The WRITE (10) command as defined in section 6.1.41
+    virtual bool WRITE_10 (
+						SCSITaskIdentifier			request,
+		    			IOMemoryDescriptor *		dataBuffer, 
+		    			UInt32						blockSize,
+						SCSICmdField1Bit 			DPO, 
+						SCSICmdField1Bit 			FUA, 
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField2Byte 			TRANSFER_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The WRITE AND VERIFY (10) command as defined in section 6.1.42
+    virtual bool WRITE_AND_VERIFY_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+		    			UInt32						blockSize,
+						SCSICmdField1Bit 			DPO, 
+						SCSICmdField1Bit 			BYT_CHK, 
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField4Byte 			TRANSFER_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	
+	/* Added with 10.1.3 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 1 );
+	
+	virtual IOReturn	ReadTOC (	IOMemoryDescriptor *	buffer,
+									CDTOCFormat				format,
+									UInt8					msf,
+									UInt32					trackSessionNumber,
+									UInt16 *				actualByteCount );
+	
+	/* Added with 10.1.3 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 2 );
+    
+	virtual IOReturn	ReadDiscInfo (	IOMemoryDescriptor *	buffer,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.1.3 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 3 );
+	
+	virtual IOReturn	ReadTrackInfo (	IOMemoryDescriptor *	buffer,
+										UInt32					address,
+										CDTrackInfoAddressType	addressType,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.2 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 4 );
+	
+	virtual IOReturn	PowerDownHandler ( void * 		refCon,
+										   UInt32 		messageType,
+										   IOService * 	provider,
+										   void * 		messageArgument,
+										   vm_size_t 	argSize );
+	
+	/* Added with 10.3.3 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 5 );
+	
+	
+protected:
+	
+	
+	virtual void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
+	
+	
+public:
+	
+	
+	/* Added with 10.5 */
+    OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 6 );
+	
+	virtual	IOReturn	ReadDiscStructure (	IOMemoryDescriptor * 		buffer,
+											const UInt32 				length,
+											const UInt8					structureFormat,
+											const UInt32				logicalBlockAddress,
+											const UInt8					layer,
+											const UInt8 				agid,
+											const UInt8					mediaType );
+	
+	
+	bool		CheckForBDMediaType ( void );
+	
+	
+    bool		READ_DISC_STRUCTURE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField4Bit 			MEDIA_TYPE,
+						SCSICmdField4Byte 			ADDRESS,
+						SCSICmdField1Byte 			LAYER_NUMBER, 
+						SCSICmdField1Byte 			FORMAT, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField2Bit 			AGID,
+						SCSICmdField1Byte 			CONTROL );
+	
+	
+    OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 7 );
+	
+	virtual	IOReturn	ReserveTrack (	UInt8		reservationType,
+										UInt8		reservationFormat,
+										UInt64		ReservationParameter );
+	
+	
+	bool		RESERVE_TRACK_V2 (	SCSITaskIdentifier		request,
+									SCSICmdField1Bit		RMZ,
+									SCSICmdField1Bit		ARSV,
+									SCSICmdField7Byte		RESERVATION_PARAMETER,
+									SCSICmdField1Byte 		CONTROL					);
+	
+	
+	bool		REPORT_KEY_V2 (	SCSITaskIdentifier			request,
+								IOMemoryDescriptor *		dataBuffer,
+								SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
+								SCSICmdField1Byte			KEY_CLASS,
+								SCSICmdField2Byte 			ALLOCATION_LENGTH,
+								SCSICmdField2Bit 			AGID,
+								SCSICmdField6Bit 			KEY_FORMAT,
+								SCSICmdField1Byte 			CONTROL					);
+	
+	
+	bool		SEND_KEY_V2 (	SCSITaskIdentifier			request,
+								IOMemoryDescriptor *		dataBuffer,
+								SCSICmdField1Byte			KEY_CLASS,
+								SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+								SCSICmdField2Bit 			AGID,
+								SCSICmdField6Bit 			KEY_FORMAT,
+								SCSICmdField1Byte 			CONTROL					);
+	
+	
+protected:
+	
+	
+	void		SetPollingMode ( UInt32 newPollingMode );
+	
+	
+public:
+	
+	
+	/* 10.6.0 */
+	
+	IOReturn	RequestIdle ( void );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 	8 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 	9 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 10 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 11 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 12 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 13 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 14 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 15 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 16 );
+    
+};
+
+#endif /* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceNub.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceNub.h.svn-base
new file mode 100644
index 0000000..f88a1e9
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceNub.h.svn-base
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_
+#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+// Probe score values
+enum
+{
+	kPeripheralDeviceTypeNoMatch 	= 0,
+	kDefaultProbeRanking 			= 5000,
+	kFirstOrderRanking 				= 10000,
+	kSecondOrderRanking 			= 15000,
+	kThirdOrderRanking 				= 20000
+};
+
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOSyncer.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIProtocolServices.h>
+
+
+// Forward definitions for internal use only classes.
+class SCSIPrimaryCommands;
+
+//-----------------------------------------------------------------------------
+//	Class Declarations
+//-----------------------------------------------------------------------------
+
+class IOSCSIPeripheralDeviceNub : public IOSCSIProtocolServices
+{
+	
+	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceNub )
+	
+private:
+	
+	static bool		sCompareIOProperty (
+										IOService *		object,
+										OSDictionary *	table,
+										char *			propertyKeyName,
+										bool *			matches );
+	
+	static void		TaskCallback ( SCSITaskIdentifier completedTask );
+	void			TaskCompletion ( SCSITaskIdentifier completedTask );
+	
+	static IOReturn	sWaitForTask ( void * object, SCSITask * request );
+	IOReturn		GatedWaitForTask ( SCSITask * request );
+	
+protected:
+
+	SCSIServiceResponse SendTask ( SCSITask * request );
+	
+	bool			InterrogateDevice ( void );										
+
+	// Reserve space for future expansion.
+	struct IOSCSIPeripheralDeviceNubExpansionData { };
+	IOSCSIPeripheralDeviceNubExpansionData * fIOSCSIPeripheralDeviceNubReserved;
+	
+	IOSCSIProtocolInterface *		fProvider;
+#ifndef __LP64__
+	SCSIPrimaryCommands *			fSCSIPrimaryCommandObject;
+#endif
+	UInt8							fDefaultInquiryCount;
+	
+	virtual bool		SendSCSICommand ( 	SCSITaskIdentifier 		request, 
+											SCSIServiceResponse * 	serviceResponse,
+											SCSITaskStatus * 		taskStatus );
+	
+	virtual SCSIServiceResponse	AbortSCSICommand ( SCSITaskIdentifier request );
+	
+	// The IsProtocolServiceSupported will return true if the specified
+	// feature is supported by the protocol layer.  If the service has a value that must be
+	// returned, it will be returned in the serviceValue output parameter.
+	virtual bool	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
+	
+	virtual bool	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
+	
+	// We override this method in order to NOT do power management
+	virtual void	InitializePowerManagement ( IOService * provider );
+	
+public:
+	
+	bool				init	( OSDictionary * propTable );
+	virtual bool		start	( IOService * provider );
+	virtual void		free	( void );
+	
+	virtual IOReturn	message ( UInt32 type, IOService * nub, void * arg );
+										
+	virtual bool		matchPropertyTable ( OSDictionary * table,
+											 SInt32 * score );
+	
+	// The ExecuteCommand method will take a SCSITask object and transport
+	// it across the physical wires to the device
+	virtual	void		ExecuteCommand ( SCSITaskIdentifier	request );
+	
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a specific task be aborted.
+	virtual SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
+
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a all tasks curerntly in the task set be aborted.
+	virtual SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
+
+	virtual SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
+
+	virtual SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
+    
+	virtual SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
+
+	virtual SCSIServiceResponse		TargetReset ( void );
+
+    // ************* Obsoleted Member Routine ****************
+    // The AbortCommand method is replaced by the AbortTask Management function and
+    // should no longer be called.
+	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier abortTask );
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  1 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  2 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 16 );
+	
+};
+
+
+
+class IOSCSILogicalUnitNub : public IOSCSIPeripheralDeviceNub
+{
+	
+	OSDeclareDefaultStructors ( IOSCSILogicalUnitNub )
+	
+private:
+	
+	UInt8				fLogicalUnitNumber;
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSILogicalUnitNubExpansionData { };
+	IOSCSILogicalUnitNubExpansionData * fIOSCSILogicalUnitNubReserved;
+	
+public:
+	
+	virtual bool		start	( IOService * provider );
+	
+	virtual void		SetLogicalUnitNumber ( UInt8 newLUN );
+	
+	UInt8				GetLogicalUnitNumber ( void );
+	
+	// The ExecuteCommand method will take a SCSITask object and transport
+	// it across the physical wires to the device
+	virtual	void		ExecuteCommand ( SCSITaskIdentifier	request );
+	
+	// The AbortCommand method will abort the indicated SCSI Task object,
+	// if it is possible and the SCSI Task has not already completed.
+	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier	abortTask );
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  1 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  2 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 16 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType00.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType00.h.svn-base
new file mode 100644
index 0000000..34fdb18
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType00.h.svn-base
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_
+#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIPeripheralDeviceType00 : public IOSCSIBlockCommandsDevice
+{
+	
+	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType00 )
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSIPeripheralDeviceType00ExpansionData
+	{
+		OSSet *	fClients;
+	};
+	IOSCSIPeripheralDeviceType00ExpansionData * fIOSCSIPeripheralDeviceType00Reserved;
+	
+public:
+	
+	bool				init ( OSDictionary * propTable );
+	virtual bool		start ( IOService * provider );
+	virtual void		free ( void );
+
+	virtual bool		handleOpen (
+							  IOService * 	client,
+							  IOOptionBits 	options,
+							  void * 		access );
+	
+	virtual void		handleClose (
+							IOService * 	client,
+							IOOptionBits 	options );
+	
+	virtual bool		handleIsOpen ( const IOService * client ) const;
+	
+    virtual IOReturn	newUserClient (
+    						   task_t			owningTask,
+    						   void *			securityID,
+    						   UInt32			type,
+    						   OSDictionary * 	properties,
+    						   IOUserClient **	handler );
+	virtual void 		CreateStorageServiceNub ( void );
+
+	virtual char *		GetVendorString ( void );
+	virtual char *		GetProductString ( void );
+	virtual char *		GetRevisionString ( void );
+	
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 1 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 2 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType05.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType05.h.svn-base
new file mode 100644
index 0000000..22066f0
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType05.h.svn-base
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_
+#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIPeripheralDeviceType05 : public IOSCSIMultimediaCommandsDevice
+{
+	
+	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType05 )
+	
+protected:
+    
+    // Reserve space for future expansion.
+    struct IOSCSIPeripheralDeviceType05ExpansionData { };
+    IOSCSIPeripheralDeviceType05ExpansionData * fIOSCSIPeripheralDeviceType05Reserved;
+	
+public:
+    
+    bool			init	( OSDictionary * propTable );
+    virtual bool	start	( IOService * provider );
+    virtual void 	stop	( IOService *  provider );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 1 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 2 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 3 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 4 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 5 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 6 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 7 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 8 );
+    
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType07.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType07.h.svn-base
new file mode 100644
index 0000000..661136d
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType07.h.svn-base
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_
+#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIPeripheralDeviceType07 : public IOSCSIBlockCommandsDevice
+{
+	
+	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType07 )
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSIPeripheralDeviceType07ExpansionData { };
+	IOSCSIPeripheralDeviceType07ExpansionData * fIOSCSIPeripheralDeviceType07Reserved;
+	
+public:
+	
+	bool			init ( OSDictionary * propTable );
+	virtual bool	start ( IOService * provider );
+	virtual void 	stop ( IOService *  provider );
+		
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 1 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 2 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType0E.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType0E.h.svn-base
new file mode 100644
index 0000000..cc9ec06
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType0E.h.svn-base
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_
+#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIPeripheralDeviceType0E : public IOSCSIReducedBlockCommandsDevice
+{
+	
+	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType0E )
+	
+protected:
+    
+    // Reserve space for future expansion.
+    struct IOSCSIPeripheralDeviceType0EExpansionData { };
+    IOSCSIPeripheralDeviceType0EExpansionData * fIOSCSIPeripheralDeviceType0EReserved;
+	
+public:
+    
+    bool			init 	( OSDictionary * propTable );
+    virtual bool	start 	( IOService * provider );
+    virtual void 	stop 	( IOService *  provider );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 1 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 2 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 3 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 4 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 5 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 6 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 7 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 8 );
+    
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPrimaryCommandsDevice.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPrimaryCommandsDevice.h.svn-base
new file mode 100644
index 0000000..ba0f1a0
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPrimaryCommandsDevice.h.svn-base
@@ -0,0 +1,805 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_
+#define _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOReturn.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOSyncer.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/SCSICommandDefinitions.h>
+#include <IOKit/scsi/SCSICmds_INQUIRY_Definitions.h>
+#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
+#include <IOKit/scsi/IOSCSIProtocolInterface.h>
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+// Notification messages
+enum
+{
+	kSCSIServicesNotification_Suspend	= 0x69000080,
+	kSCSIServicesNotification_Resume	= 0x69000090
+};
+
+
+// Timeout values
+enum
+{
+	kOneSecondTimeoutInMS 		= 1000,
+	kTenSecondTimeoutInMS 		= 10 * kOneSecondTimeoutInMS,
+	kThirtySecondTimeoutInMS	= 30 * kOneSecondTimeoutInMS,
+    kFortyFiveSecondTimeoutInMS	= 45 * kOneSecondTimeoutInMS
+};
+
+// Mode page values for page control field
+enum
+{
+	kModePageControlCurrentValues		= 0x00,
+	kModePageControlChangeableValues	= 0x01,
+	kModePageControlDefaultValues		= 0x02,
+	kModePageControlSavedValues			= 0x03
+};
+
+// The command should be tried 5 times.  The original attempt 
+// plus 4 retries.
+#define kDefaultRetryCount		4
+
+// Forward declarations for internal use only classes
+class SCSIPrimaryCommands;
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIPrimaryCommandsDevice : public IOSCSIProtocolInterface
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIPrimaryCommandsDevice )
+	
+private:
+	
+#ifndef __LP64__
+	SCSIPrimaryCommands *			fSCSIPrimaryCommandObject;
+#endif
+
+	IOSCSIProtocolInterface *		fProtocolDriver;
+	
+	// The fProtocolAccessEnabled member variable indicates whether
+	// requests coming from the client can be sent to the device.
+	// This will be set to true after the Protocol Service driver is successfully 
+	// opened and before the call to InitializeDeviceSupport and set to false before 
+	// TerminateDeviceSupport is called.
+	bool							fProtocolAccessEnabled;
+	
+	// The fDeviceAccessEnabled member variable indicates whether
+	// requests coming from the client can be sent to the device.
+	// This will be set to true after InitializeDeviceSupport is called and
+	// set to false before StopDeviceSupport is called.
+	bool							fDeviceAccessEnabled;
+	bool							fDeviceAccessSuspended;
+	
+	static bool		ServerKeyswitchCallback ( void *		target,
+											  void *		refCon,
+											  IOService *	newService );
+	
+	static void		TaskCallback ( SCSITaskIdentifier completedTask );
+	void			TaskCompletion ( SCSITaskIdentifier completedTask );
+	
+	static IOReturn	sWaitForTask ( void * object, SCSITaskIdentifier request );
+	IOReturn		GatedWaitForTask ( SCSITaskIdentifier request );
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSIPrimaryCommandsDeviceExpansionData
+	{
+		IONotifier *				fKeySwitchNotifier;
+		UInt8						fANSIVersion;
+		UInt32						fReadTimeoutDuration;
+		UInt32						fWriteTimeoutDuration;
+		bool						fCMDQUE;
+		SCSITaggedTaskIdentifier	fTaskID;
+		IOSimpleLock *				fTaskIDLock;
+		UInt32						fRetryCount;
+	};
+	IOSCSIPrimaryCommandsDeviceExpansionData * fIOSCSIPrimaryCommandsDeviceReserved;
+	
+	#define	fReadTimeoutDuration		fIOSCSIPrimaryCommandsDeviceReserved->fReadTimeoutDuration
+	#define	fWriteTimeoutDuration		fIOSCSIPrimaryCommandsDeviceReserved->fWriteTimeoutDuration
+	#define	fRetryCount					fIOSCSIPrimaryCommandsDeviceReserved->fRetryCount
+	
+	
+	UInt8							fDefaultInquiryCount;
+	OSDictionary *					fDeviceCharacteristicsDictionary;
+	UInt32							fNumCommandsOutstanding;
+	
+	virtual void 					free ( void );
+	void							SetANSIVersion ( UInt8 );
+	void							SetCMDQUE ( bool value );
+	IOReturn						GetModeSense ( 
+										IOMemoryDescriptor *		dataBuffer,
+										SCSICmdField6Bit 			PAGE_CODE,
+										SCSICmdField2Byte 			ALLOCATION_LENGTH,
+										bool *						use10ByteModeSense );
+	bool							RetrieveINQUIRYData (
+										UInt8						EVPD,
+										UInt8						inquiryPage,
+										UInt8 *						inquiryBuffer,
+										UInt16 *					dataSize );
+	
+	// This flag is set if the device responds to a MODE_SENSE_10 command
+	// with the page code set to 0x1A (Power Conditions Mode Page)
+	bool							fDeviceSupportsPowerConditions;
+	
+	// This method will retreive the SCSI Primary Command Set object for
+	// the class.  For subclasses, this will be overridden using a
+	// dynamic cast on the base command set object of the subclass.
+
+#ifndef __LP64__
+	
+	// ------ DEPRECATED API ----------
+	// This should no longer be called by subclasses as the command builder
+	// objects will be removed in a later release.
+	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );	
+	
+	// This method is called by the start method to create all the command
+	// objects needed by the class.  For subclasses, this will be overridden
+	// to create its needed command set objects.
+	virtual bool					CreateCommandSetObjects ( void );
+	
+	// This method is called by the free method to free all the command
+	// objects needed by the class.  For subclasses, this will be overridden
+	// to free its needed command set objects.
+	virtual void					FreeCommandSetObjects ( void );
+
+#endif
+	
+	
+	// This method is called by the start method to obtain information from
+	// the device with regards to whether it supports the power conditions mode page.
+	virtual void					CheckPowerConditionsModePage ( void );
+	
+	// This will return back the Protocol driver that is used to
+	// send service requests to the device.
+	virtual IOSCSIProtocolInterface * GetProtocolDriver ( void );
+	
+	// This will get a new SCSITask for the caller
+	virtual SCSITaskIdentifier		GetSCSITask ( void );
+	
+	// This will release a SCSITask (eventually return it to a pool)
+	virtual void					ReleaseSCSITask ( SCSITaskIdentifier request );
+	
+	// This will return a unique value for the tagged task identifier
+	SCSITaggedTaskIdentifier		GetUniqueTagID ( void );
+	
+	// Call for executing the command synchronously	
+	SCSIServiceResponse 			SendCommand ( 	
+										SCSITaskIdentifier 	request,
+										UInt32 				timeoutDuration );
+														
+	// Call for executing the command asycnchronously	
+	void 							SendCommand ( 
+										SCSITaskIdentifier 	request,
+										UInt32 				timeoutDuration,
+										SCSITaskCompletion 	taskCompletion );
+	
+	
+	virtual bool 					InitializeDeviceSupport ( void ) = 0;
+	virtual void 					StartDeviceSupport ( void ) = 0;
+	virtual void 					SuspendDeviceSupport ( void ) = 0;
+	virtual void 					ResumeDeviceSupport ( void ) = 0;
+	virtual void 					StopDeviceSupport ( void ) = 0;
+	virtual void 					TerminateDeviceSupport ( void ) = 0;
+	virtual UInt32					GetNumberOfPowerStateTransitions ( void ) = 0;
+	
+	virtual IOReturn				VerifyDeviceState ( void );
+	// Called to clear any power-on/reset status in the drive
+	virtual bool					ClearPowerOnReset ( void );
+	virtual bool					ClearNotReadyStatus ( void ) = 0;
+	
+	bool							IsProtocolAccessEnabled ( void );
+	bool							IsDeviceAccessEnabled ( void );
+	bool							IsDeviceAccessSuspended ( void );
+
+	// Accessors for saving and retrieving data from an SCSITask object.
+	bool 							ResetForNewTask(	
+										SCSITaskIdentifier 		request );
+	bool							SetTaskAttribute ( 
+										SCSITaskIdentifier 		request, 
+										SCSITaskAttribute 		newAttribute );
+	SCSITaskAttribute				GetTaskAttribute ( 
+										SCSITaskIdentifier 		request );
+	bool							SetTaggedTaskIdentifier ( 
+										SCSITaskIdentifier 			request, 
+										SCSITaggedTaskIdentifier	taggedTaskIdentifier );
+	SCSITaggedTaskIdentifier		GetTaggedTaskIdentifier ( 
+										SCSITaskIdentifier 		request );
+	bool							SetTaskState ( 	
+										SCSITaskIdentifier 		request,
+										SCSITaskState 			newTaskState );
+	SCSITaskState					GetTaskState ( 
+										SCSITaskIdentifier 		request );
+	bool							SetTaskStatus ( 
+										SCSITaskIdentifier 		request, 
+										SCSITaskStatus 			newStatus );
+	SCSITaskStatus					GetTaskStatus ( 
+										SCSITaskIdentifier 		request );
+	bool 							SetCommandDescriptorBlock ( 
+										SCSITaskIdentifier 		request,
+										UInt8					cdbByte0,
+										UInt8					cdbByte1,
+										UInt8					cdbByte2,
+										UInt8					cdbByte3,
+										UInt8					cdbByte4,
+										UInt8					cdbByte5 );
+	
+	// Populate the 10 Byte Command Descriptor Block
+	bool 							SetCommandDescriptorBlock ( 
+										SCSITaskIdentifier 		request,
+										UInt8					cdbByte0,
+										UInt8					cdbByte1,
+										UInt8					cdbByte2,
+										UInt8					cdbByte3,
+										UInt8					cdbByte4,
+										UInt8					cdbByte5,
+										UInt8					cdbByte6,
+										UInt8					cdbByte7,
+										UInt8					cdbByte8,
+										UInt8					cdbByte9 );
+	
+	// Populate the 12 Byte Command Descriptor Block
+	bool 							SetCommandDescriptorBlock ( 
+										SCSITaskIdentifier 		request,
+										UInt8					cdbByte0,
+										UInt8					cdbByte1,
+										UInt8					cdbByte2,
+										UInt8					cdbByte3,
+										UInt8					cdbByte4,
+										UInt8					cdbByte5,
+										UInt8					cdbByte6,
+										UInt8					cdbByte7,
+										UInt8					cdbByte8,
+										UInt8					cdbByte9,
+										UInt8					cdbByte10,
+										UInt8					cdbByte11 );
+	
+	// Populate the 16 Byte Command Descriptor Block
+	bool 							SetCommandDescriptorBlock ( 
+										SCSITaskIdentifier 		request,
+										UInt8					cdbByte0,
+										UInt8					cdbByte1,
+										UInt8					cdbByte2,
+										UInt8					cdbByte3,
+										UInt8					cdbByte4,
+										UInt8					cdbByte5,
+										UInt8					cdbByte6,
+										UInt8					cdbByte7,
+										UInt8					cdbByte8,
+										UInt8					cdbByte9,
+										UInt8					cdbByte10,
+										UInt8					cdbByte11,
+										UInt8					cdbByte12,
+										UInt8					cdbByte13,
+										UInt8					cdbByte14,
+										UInt8					cdbByte15 );
+										
+	bool							SetDataTransferDirection ( 
+										SCSITaskIdentifier 		request, 
+										UInt8 					newDirection );
+	UInt8							GetDataTransferDirection ( 
+										SCSITaskIdentifier 		request );
+	bool							SetRequestedDataTransferCount (
+										SCSITaskIdentifier 		request, 
+										UInt64 					newRequestedCount );
+	UInt64							GetRequestedDataTransferCount (
+										SCSITaskIdentifier 		request );
+	bool							SetRealizedDataTransferCount (
+										SCSITaskIdentifier 		request,
+										UInt64 					newRealizedDataCount );
+	UInt64							GetRealizedDataTransferCount ( 
+										SCSITaskIdentifier 		request );
+	bool							SetDataBuffer ( 
+										SCSITaskIdentifier 		request, 
+										IOMemoryDescriptor * 	newBuffer );
+	IOMemoryDescriptor *			GetDataBuffer ( 
+										SCSITaskIdentifier 		request );
+	bool							SetTimeoutDuration ( 
+										SCSITaskIdentifier 		request, 
+										UInt32 					newTimeout );
+	UInt32							GetTimeoutDuration ( 
+										SCSITaskIdentifier 		request );
+	bool							SetTaskCompletionCallback ( 
+										SCSITaskIdentifier 		request,
+										SCSITaskCompletion 		newCallback );
+	void							TaskCompletedNotification ( 
+										SCSITaskIdentifier 		request );
+	
+	bool							SetServiceResponse (
+										SCSITaskIdentifier 		request,
+										SCSIServiceResponse 	serviceResponse );
+	SCSIServiceResponse 			GetServiceResponse (
+										SCSITaskIdentifier 		request );
+	bool							SetAutosenseCommand (
+										SCSITaskIdentifier 		request,
+										UInt8					cdbByte0,
+										UInt8					cdbByte1,
+										UInt8					cdbByte2,
+										UInt8					cdbByte3,
+										UInt8					cdbByte4,
+										UInt8					cdbByte5 );
+	bool							GetAutoSenseData (
+										SCSITaskIdentifier 		request,
+										SCSI_Sense_Data * 		senseData ); // DEPRECATED, use below function instead
+	bool							GetAutoSenseData (
+										SCSITaskIdentifier 		request,
+										SCSI_Sense_Data * 		senseData,
+										UInt8					senseDataSize );
+	UInt8							GetAutoSenseDataSize (
+										SCSITaskIdentifier 		request );
+	
+	bool							SetApplicationLayerReference (
+										SCSITaskIdentifier 		request,
+										void * 					newReferenceValue );
+	void *							GetApplicationLayerReference (
+										SCSITaskIdentifier 		request );
+	
+	void 							IncrementOutstandingCommandsCount ( void );
+	static void						sIncrementOutstandingCommandsCount ( 
+										IOSCSIPrimaryCommandsDevice * self );
+	virtual void					HandleIncrementOutstandingCommandsCount ( void );	
+	
+
+	// This static member routine provides a mechanism for retrieving a pointer to
+	// the object that is claimed as the owner of the specified SCSITask.
+	static OSObject *				sGetOwnerForTask ( SCSITaskIdentifier request );
+	
+public:
+	
+	bool				init ( OSDictionary * propTable );
+	virtual bool		start ( IOService * provider );
+	virtual void		stop ( IOService *  provider );
+	virtual IOReturn 	message ( UInt32 type, IOService * nub, void * arg );
+	
+	// The setAgressiveness method is called by the power manager
+	// to notify us of certain power management settings. We override
+	// this method in order to catch the kPMMinutesToSpinDown message
+	// in order to set our idle timer.
+	virtual IOReturn 	setAggressiveness ( unsigned long type, unsigned long minutes );
+	
+	// Methods for getting device information strings
+	virtual char *		GetVendorString ( void );
+	virtual char *		GetProductString ( void );
+	virtual char *		GetRevisionString ( void );
+	OSDictionary *		GetProtocolCharacteristicsDictionary ( void );
+	OSDictionary *		GetDeviceCharacteristicsDictionary ( void );	
+	UInt8				GetANSIVersion ( void );
+	bool				GetCMDQUE ( void );
+    OSString *          MapINQUIRYDataToIconFile ( void );
+	UInt32				GetRetryCount ( void );
+	
+	// -- SCSI Protocol Interface Methods	--
+	// The ExecuteCommand method will take a SCSI Task and transport
+	// it across the physical wire(s) to the device
+	virtual void		ExecuteCommand ( SCSITaskIdentifier request );
+	
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a specific task be aborted.
+	SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
+
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a all tasks curerntly in the task set be aborted.
+	SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
+    
+	SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		TargetReset ( void );
+
+	// The AbortCommand method will abort the indicated SCSI Task,
+	// if it is possible and the task has not already completed.
+	virtual SCSIServiceResponse	AbortCommand ( SCSITaskIdentifier request );
+	
+	// The IsProtocolServiceSupported will return true if the specified
+	// feature is supported by the protocol layer.  If the service has a value that must be
+	// returned, it will be returned in the serviceValue output parameter.
+	virtual bool		IsProtocolServiceSupported (
+											SCSIProtocolFeature feature,
+											void *				serviceValue );
+	
+	// The HandleProtocolServiceFeature will return true if the specified feature could
+	// be handled properly by the protocol layer.
+	virtual bool		HandleProtocolServiceFeature (
+											SCSIProtocolFeature	feature,
+											void *				serviceValue );
+	
+	// Utility methods for use by all peripheral device objects.
+
+	// isParameterValid are used to validate that the parameter passed into
+	// the command methods are of the correct value.
+	
+	// Validate Parameter used for 1 bit to 1 byte paramaters
+    bool 				IsParameterValid ( 
+							SCSICmdField1Byte 			param,
+							SCSICmdField1Byte 			mask );
+	
+	// Validate Parameter used for 9 bit to 2 byte paramaters
+	bool 				IsParameterValid ( 
+							SCSICmdField2Byte 			param,
+							SCSICmdField2Byte 			mask );
+	
+	// Validate Parameter used for 17 bit to 4 byte paramaters
+	bool 				IsParameterValid ( 
+							SCSICmdField4Byte 			param,
+							SCSICmdField4Byte 			mask );
+	
+	// Validate Parameter used for 33 bit to 8 byte paramaters
+	bool 				IsParameterValid ( 
+							SCSICmdField8Byte 			param,
+							SCSICmdField8Byte 			mask );
+	
+
+	bool 				IsMemoryDescriptorValid (
+							IOMemoryDescriptor * 		dataBuffer );
+	
+	bool 				IsMemoryDescriptorValid (
+							IOMemoryDescriptor * 		dataBuffer,
+							UInt64						requiredSize );
+
+#ifndef __LP64__
+	
+	// SCSI Primary command implementations
+	virtual bool		CHANGE_DEFINITION (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			SAVE,
+							SCSICmdField7Bit 			DEFINITION_PARAMETER,
+							SCSICmdField1Byte 			PARAMETER_DATA_LENGTH,
+			 				SCSICmdField1Byte 			CONTROL );
+	  
+	virtual bool		COMPARE (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+	 						SCSICmdField1Bit 			PAD,
+							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+			
+	virtual bool		COPY (
+							SCSITaskIdentifier			request,
+   							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PAD,
+							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+	  
+	virtual bool		COPY_AND_VERIFY (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			BYTCHK,
+							SCSICmdField1Bit 			PAD,
+							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		EXTENDED_COPY (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	virtual bool		INQUIRY (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			CMDDT,
+							SCSICmdField1Bit 			EVPD,
+							SCSICmdField1Byte 			PAGE_OR_OPERATION_CODE,
+							SCSICmdField1Byte 			ALLOCATION_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		LOG_SELECT (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PCR,
+							SCSICmdField1Bit 			SP,
+							SCSICmdField2Bit 			PC,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );  
+
+	virtual bool		LOG_SENSE (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PPC,
+							SCSICmdField1Bit 			SP,
+							SCSICmdField2Bit 			PC,
+							SCSICmdField6Bit 			PAGE_CODE,
+							SCSICmdField2Byte 			PARAMETER_POINTER,
+							SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );  
+	
+	virtual bool		MODE_SELECT_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PF,
+							SCSICmdField1Bit 			SP,
+							SCSICmdField1Byte 			PARAMETER_LIST_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );  
+
+   	virtual bool		MODE_SELECT_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PF,
+							SCSICmdField1Bit 			SP,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );  
+
+   	virtual bool		MODE_SENSE_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			DBD,
+	   						SCSICmdField2Bit 			PC,
+	   						SCSICmdField6Bit 			PAGE_CODE,
+	   						SCSICmdField1Byte 			ALLOCATION_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+   	virtual bool		MODE_SENSE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			LLBAA,
+							SCSICmdField1Bit 			DBD,
+	   						SCSICmdField2Bit 			PC,
+	   						SCSICmdField6Bit 			PAGE_CODE,
+	   						SCSICmdField2Byte 			ALLOCATION_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+  	virtual bool		PERSISTENT_RESERVE_IN (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+	   						SCSICmdField5Bit 			SERVICE_ACTION,
+	   						SCSICmdField2Byte 			ALLOCATION_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+   	virtual bool		PERSISTENT_RESERVE_OUT (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+	   						SCSICmdField5Bit 			SERVICE_ACTION,
+	   						SCSICmdField4Bit 			SCOPE,
+	   						SCSICmdField4Bit 			TYPE,
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		PREVENT_ALLOW_MEDIUM_REMOVAL (
+							SCSITaskIdentifier			request,
+		 					SCSICmdField2Bit 			PREVENT, 
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		READ_BUFFER (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField4Bit 			MODE,
+							SCSICmdField1Byte 			BUFFER_ID,
+							SCSICmdField3Byte 			BUFFER_OFFSET,
+							SCSICmdField3Byte 			ALLOCATION_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		RECEIVE (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+		 					SCSICmdField3Byte 			TRANSFER_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		RECEIVE_DIAGNOSTICS_RESULTS (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+		 					SCSICmdField1Bit 			PCV,
+		 					SCSICmdField1Byte			PAGE_CODE,
+		 					SCSICmdField2Byte 			ALLOCATION_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		RELEASE_6 (
+							SCSITaskIdentifier			request,
+							SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+	virtual bool		RELEASE_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			EXTENT,
+							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
+							SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	virtual bool		RELEASE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			THRDPTY,
+							SCSICmdField1Bit 			LONGID,
+							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+	virtual bool		RELEASE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			THRDPTY,
+							SCSICmdField1Bit 			LONGID,
+							SCSICmdField1Bit 			EXTENT,
+							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
+							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	virtual bool		REPORT_DEVICE_IDENTIFIER ( 
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField4Byte 			ALLOCATION_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+   	virtual bool		REPORT_LUNS ( 
+							SCSITaskIdentifier			request,
+   							IOMemoryDescriptor *		dataBuffer,
+				   			SCSICmdField4Byte 			ALLOCATION_LENGTH,
+				   			SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool		REQUEST_SENSE (
+							SCSITaskIdentifier			request,
+   							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Byte 			ALLOCATION_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );
+ 	
+ 	virtual bool		RESERVE_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+ 	virtual bool		RESERVE_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			EXTENT,
+							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	virtual bool		RESERVE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			THRDPTY,
+							SCSICmdField1Bit 			LONGID,
+							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+	virtual bool		RESERVE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			THRDPTY,
+							SCSICmdField1Bit 			LONGID,
+							SCSICmdField1Bit 			EXTENT,
+							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
+							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	virtual bool		SEND (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit			AER,
+		 					SCSICmdField3Byte 			TRANSFER_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+  	virtual bool		SEND_DIAGNOSTICS (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+				  		 	SCSICmdField3Bit 			SELF_TEST_CODE,
+				  		 	SCSICmdField1Bit 			PF,
+				  		 	SCSICmdField1Bit 			SELF_TEST,
+				  		 	SCSICmdField1Bit 			DEVOFFL,
+				  		 	SCSICmdField1Bit 			UNITOFFL,
+				  	 		SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+				  	 		SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool		SET_DEVICE_IDENTIFIER (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField5Bit 			SERVICE_ACTION,
+							SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool		TEST_UNIT_READY (
+							SCSITaskIdentifier			request,
+							SCSICmdField1Byte 			CONTROL );
+ 	
+	virtual bool		WRITE_BUFFER (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField4Bit 			MODE,
+							SCSICmdField1Byte 			BUFFER_ID,
+							SCSICmdField3Byte 			BUFFER_OFFSET,
+							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+	
+	// The SPC-3 INQUIRY command as defined in section 6.4.1 of SPC-3.
+	bool				INQUIRY (
+							SCSITaskIdentifier			request,
+  							IOMemoryDescriptor *		dataBuffer,
+    						SCSICmdField1Bit 			EVPD,
+    						SCSICmdField1Byte 			PAGE_CODE,
+    						SCSICmdField2Byte 			ALLOCATION_LENGTH,
+    						SCSICmdField1Byte 			CONTROL );
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  1 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  2 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 16 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolInterface.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolInterface.h.svn-base
new file mode 100644
index 0000000..bb74ce4
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolInterface.h.svn-base
@@ -0,0 +1,854 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_
+#define _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_
+
+
+/*! @header SCSI Protocol Interface
+	@discussion
+	This file contains definitions for the IOSCSIProtocolInterface class,
+	SCSI Protocol Features used by this interface, and additional constants
+	used by this interface.
+*/
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+/*
+SCSI Device Characteristics - Defined between SCSI Application Layer and
+							  SCSI Protocol Layer only.
+*/
+
+/*!
+@constant kIOPropertySCSIDeviceCharacteristicsKey
+@discussion
+This key is used to define SCSI Device Characteristics for a particular device.
+It is the key for the dictionary containing the keys of characteristics. These keys
+are only defined between the SCSI Protocol Layer and the SCSI Applicaiton Layer. Some
+properties may be copied from this dictionary to the more generic Device Characteristics
+or Protocol Characteristics dictionaries.
+*/
+#define kIOPropertySCSIDeviceCharacteristicsKey		"SCSI Device Characteristics"
+
+/*!
+@constant kIOPropertySCSIInquiryLengthKey
+@discussion
+This key is used to define a default INQUIRY length to issue to the device. The
+value is a UInt32 corresponding to the number of bytes to request in the INQUIRY
+command.
+*/
+#define kIOPropertySCSIInquiryLengthKey				"Inquiry Length"
+
+/*!
+@constant kIOPropertySCSIManualEjectKey
+@discussion
+This key is used to indicate that the device is known to be a manual ejectable media
+device.  This property overrides all of the driver checks for determining this capability.
+This property is a string, although if it exists it should always be true.
+*/
+#define kIOPropertySCSIManualEjectKey				"Manual Eject"
+
+/*!
+@constant kIOPropertyReadTimeOutDurationKey
+@discussion
+This key is used to define the Read Time Out for a particular device.
+This property overrides all of the protocol defaults.
+This property is a value, in milliseconds.
+*/
+#define kIOPropertyReadTimeOutDurationKey			"Read Time Out Duration"
+
+/*!
+@constant kIOPropertyWriteTimeOutDurationKey
+@discussion
+This key is used to define the Write Time Out for a particular device.
+This property overrides all of the protocol defaults.
+This property is a value, in milliseconds.
+*/
+#define kIOPropertyWriteTimeOutDurationKey			"Write Time Out Duration"
+
+/*!
+@constant kIOPropertyRetryCountKey
+@discussion
+This key is used to define the number of Read/Write retries for a particular device.
+This property overrides all of the protocol defaults.
+The value is a UInt32 corresponding to the number of retries.
+*/
+#define kIOPropertyRetryCountKey					"Retry Count"
+
+/*!
+ @constant kIOPropertyAutonomousSpinDownKey
+ @discussion
+ This key is used to indicate that the device is known to have its own internal logic
+ for idle disk spin down. This key is used to mark device which respon poorly to our
+ efforts to manually spin down or spin up the device when it is already in the desired 
+ state. 
+ */
+#define kIOPropertyAutonomousSpinDownKey			"Autonomous Spin Down"
+
+/*!
+ @constant kIOPropertyEjectRequireStartStopUnitKey
+ @discussion
+ This key is used to indicate that while the device may have failed PREVENT_ALLOW_MEDIUM
+ REMOVAL it still requires a START_STOP_UNIT to eject/unload media. 
+ */
+#define kIOPropertyEjectRequireStartStopUnitKey		"Eject Requires START_STOP_UNIT"
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+/*!
+@constant kCFBundleIdentifierKey
+@discussion
+Property key for CFBundleIdentifier.
+*/
+#define kCFBundleIdentifierKey					"CFBundleIdentifier"
+
+/*!
+@constant kIOSCSIArchitectureBundleIdentifierKey
+@discussion
+IOSCSIArchitectureModelFamily's CFBundle identifier.
+*/
+#define kIOSCSIArchitectureBundleIdentifierKey	"com.apple.iokit.IOSCSIArchitectureModelFamily"
+
+
+// General kernel headers
+#include <kern/thread.h>
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IOWorkLoop.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/SCSITask.h>
+
+
+/*!
+@enum SCSI Protocol Interface Device Notification values
+@discussion
+Message values for SCSI Protocol Interface Device Notifications.
+@constant kSCSIProtocolNotification_DeviceRemoved
+Private message sent between a SCSI protocol service provider and
+SCSI application layer driver to indicate device removal.
+@constant kSCSIProtocolNotification_VerifyDeviceState
+Private message sent between a SCSI protocol service provider and
+SCSI application layer driver to indicate device state may have
+changed and the device state should be re-verified by the SCSI
+Application Layer driver. An example would be a bus reset which clears
+the tray locking state of an ATAPI device.
+@constant kSCSIServicesNotification_ExclusivityChanged
+Message sent when a change in exclusivity state occurs. Usually in
+response to acquiring/releasing exclusive access to a device via a user client.
+*/
+enum
+{
+	kSCSIProtocolNotification_DeviceRemoved			= 0x69000010,
+	kSCSIProtocolNotification_VerifyDeviceState		= 0x69000020,
+	kSCSIServicesNotification_ExclusivityChanged	= 0x69000030
+};
+
+
+/*!
+@typedef SCSIProtocolFeature
+@discussion
+Typedef for SCSIProtocolFeature, a 32-bit quantity.
+*/
+typedef UInt32 SCSIProtocolFeature;
+
+/*!
+@enum SCSI Protocol Features
+@discussion
+The list of SCSI Protocol Features currently supported.
+*/
+enum
+{
+	
+	/*!
+	@constant kSCSIProtocolFeature_ACA Not yet used.
+	*/
+	kSCSIProtocolFeature_ACA								= 1,
+	
+	/*!
+	@constant kSCSIProtocolFeature_CPUInDiskMode Used to determine
+	if the SCSI Protocol Services Driver supports a CPU which is in
+	target disk mode.
+	*/
+	kSCSIProtocolFeature_CPUInDiskMode						= 2,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolSpecificPolling Used
+	to determine if the SCSI Protocol Services Driver supports
+	protocol specific polling for media. This is used for low-power
+	polling specifically for ATAPI devices on ATA buses
+	*/
+	kSCSIProtocolFeature_ProtocolSpecificPolling			= 3,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolSpecificSleepCommand Used
+	to determine if the SCSI Protocol Services Driver supports
+	protocol specific sleep commands to a drive. This is used for
+	sleeping drives specifically ATAPI devices on ATA buses.
+	*/
+	kSCSIProtocolFeature_ProtocolSpecificSleepCommand		= 4,
+	
+	/*!
+	@constant kSCSIProtocolFeature_GetMaximumLogicalUnitNumber If
+	the SCSI Protocol Services Driver supports logical units, it will
+	report the maximum addressable ID that it supports in the UInt32 pointer
+	that is passed in as the serviceValue. If only one unit is supported,
+	the driver should return false for this query.
+	*/
+	kSCSIProtocolFeature_GetMaximumLogicalUnitNumber		= 5,
+	
+	/*!
+	@constant kSCSIProtocolFeature_MaximumReadBlockTransferCount If
+	the SCSI Protocol Services Driver has a maximum number of
+	blocks that can be transfered in a read request, it will return
+	true to this query and return the block count in the UInt32 pointer
+	that is passed in as the serviceValue.
+	*/
+	kSCSIProtocolFeature_MaximumReadBlockTransferCount		= 6,
+
+	/*!
+	@constant kSCSIProtocolFeature_MaximumWriteBlockTransferCount If
+	the SCSI Protocol Services Driver has a maximum number of
+	blocks that can be transferred in a write request, it will return
+	true to this query and return the block count in the UInt32 pointer
+	that is passed in as the serviceValue.
+	*/
+	kSCSIProtocolFeature_MaximumWriteBlockTransferCount		= 7,
+
+	/*!
+	@constant kSCSIProtocolFeature_MaximumReadTransferByteCount If
+	the SCSI Protocol Services Driver has a maximum byte count
+	that can be transferred in a read request, it will return
+	true to this query and return the byte count in the UInt64 pointer
+	that is passed in as the serviceValue.
+	*/
+	kSCSIProtocolFeature_MaximumReadTransferByteCount		= 8,
+
+	/*!
+	@constant kSCSIProtocolFeature_MaximumWriteTransferByteCount If
+	the SCSI Protocol Services Driver has a maximum byte count
+	that can be transferred in a write request, it will return
+	true to this query and return the byte count in the UInt64 pointer
+	that is passed in as the serviceValue.
+	*/
+	kSCSIProtocolFeature_MaximumWriteTransferByteCount		= 9,
+	
+	/*!
+	@constant kSCSIProtocolFeature_SubmitDefaultInquiryData If
+	the SCSI Protocol Services Driver needs any extra information to
+	make any negotiation settings from the standard INQUIRY data, this 
+	will be called to set that appropriately. The serviceValue will
+	point to a SCSICmd_INQUIRY_StandardData buffer. The size
+	of the buffer depends on the SCSI Device Characteristics
+	dictionary for the device or bus. If there is no
+	kIOPropertySCSIInquiryLengthKey value set in the dictionary
+	or if it doesn't exist, then the size of the data will be
+	the size of the full amount of Inquiry retrieved from the device.
+	*/
+	kSCSIProtocolFeature_SubmitDefaultInquiryData			= 10,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolAlwaysReportsAutosenseData If
+	the SCSI Protocol Services Driver always reports available
+	autosense data when a kSCSITaskStatus_CHECK_CONDITION is set,
+	then the protocol layer should return true. E.g. FireWire
+	transport drivers should respond true to this.
+	*/
+	kSCSIProtocolFeature_ProtocolAlwaysReportsAutosenseData	= 11,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolSpecificPowerOff If
+	the SCSI Protocol Services Driver supports removing the power
+	to the drive, then the protocol layer should return true. This is
+	used for aggressive power management, specifically for ATAPI
+	devices on ATA buses.
+	*/
+	kSCSIProtocolFeature_ProtocolSpecificPowerOff			= 12,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolSpecificPowerControl
+	Used to determine if the SCSI Protocol Services Driver supports
+	switching the power to the drive on and off. This is used for aggressive
+	power management, specifically for SATAPI devices on AHCI buses.
+	*/
+	kSCSIProtocolFeature_ProtocolSpecificPowerControl		= 13,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolSpecificAsyncNotification
+	Used to determine if the SCSI Protocol Services Driver supports
+	asynchronous notifications from the drive. This is used to prevent
+	polling for media, specifically for SATAPI devices on AHCI buses.
+	*/
+	kSCSIProtocolFeature_ProtocolSpecificAsyncNotification	= 14
+	
+};
+
+
+/*!
+@typedef SCSIProtocolPowerState
+@discussion
+Typedef for SCSIProtocolPowerState, a 32-bit quantity.
+*/
+typedef UInt32 SCSIProtocolPowerState;
+
+/*!
+@enum SCSI Protocol Power States
+@discussion
+The list of SCSI Protocol Power States.
+*/
+enum
+{
+	/*!
+	@constant kSCSIProtocolPowerStateOff
+	Off power state.
+	*/
+	kSCSIProtocolPowerStateOff			= 0,
+
+	/*!
+	@constant kSCSIProtocolPowerStateOn
+	On power state.
+	*/
+	kSCSIProtocolPowerStateOn			= 1
+};
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+/*!
+@class IOSCSIProtocolInterface
+@superclass IOService
+@discussion
+This class defines the public SCSI Protocol Layer API for any class that
+provides Protocol services or needs to provide the Protocol Service API
+for passing service requests to a Protocol Service driver.
+*/
+class IOSCSIProtocolInterface : public IOService
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIProtocolInterface )
+	
+public:
+	
+	/*!
+	@function start
+	@abstract During an IOService object's instantiation, starts the IOService object that has been selected to run on the provider.
+	@discussion See IOService.h for details.
+	@result <code>true</code> if the start was successful; <code>false</code> otherwise (which will cause the instance to be detached and usually freed).
+	*/
+	virtual bool	start ( IOService * provider );
+	
+	/*!
+	@function free
+	@abstract Called to release all resources held by the object.
+	@discussion Release all resources held by the object, then call super::free().  
+	*/	
+	virtual void	free ( void );
+
+	/*!
+	@function willTerminate
+	@abstract Passes a termination up the stack.
+	@discussion Notification that a provider has been terminated, sent before recursing up the stack, in root-to-leaf order.
+	@param provider The terminated provider of this object.
+	@param options Options originally passed to terminate().
+	@result <code>true</code>.
+	*/
+	virtual bool	willTerminate ( IOService * provider, IOOptionBits options );
+	
+	/*!
+	@function GetUserClientExclusivityState
+	@abstract Gets the current exclusivity state of the user client.
+	@discussion The GetUserClientExclusivityState() method is called by the SCSITaskUserClient
+	to determine if any user client is holding exclusive access at the current time. This is simply
+	a preflight check and a return value of <code>false</code> does not guarantee that a subsequent
+	call to SetUserClientExclusivityState() will return successfully.
+	@result <code>true</code> if a user client is in exclusive control of the device, <code>false</code> otherwise.
+	*/
+	virtual bool 		GetUserClientExclusivityState ( void );
+	
+	/*!
+	@function SetUserClientExclusivityState
+	@abstract Sets the current exclusivity state of the user client.
+	@discussion The SetUserClientExclusivityState() method is called by the SCSITaskUserClient
+	to set the exclusive access mode.
+	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
+	@param state Exclusivity state. <code>true</code> means exclusive access is desired, <code>false</code>
+	means exclusive access is being released.
+	@result A valid IOReturn code indicating success or the type of failure.
+	*/
+	virtual IOReturn	SetUserClientExclusivityState ( IOService * userClient, bool state );
+	
+	
+	/*!
+	@function initialPowerStateForDomainState
+	@abstract Determines which power state a device is in, given the current power domain state.
+	@discussion Power management calls this method once, when the driver is initializing power management.
+	Subclasses should not need to override this method.
+	@param flags Flags that describe the character of "domain power"; they represent the <code>outputPowerCharacter</code> field of a state in the power domain's power state array. 
+	@result A state number. 
+	*/
+	virtual unsigned long	initialPowerStateForDomainState ( IOPMPowerFlags flags );
+	
+	/*!
+	@function setPowerState
+	@abstract Requests a power managed driver to change the power state of its device.
+	@discussion Requests a power managed driver to change the power state of its device. Most subclasses
+	of IOSCSIProtocolInterface have class-specific mechanisms and should not override this routine.
+	See IOSCSIProtocolServices.h, IOSCSIBlockCommandsDevice.h, IOSCSIReducedBlockCommandsDevice.h, and
+	IOSCSIMultimediaCommandsDevice.h for more information about power management changes.
+	Subclasses should not need to override this method.
+	@param powerStateOrdinal The number in the power state array to which the drive is being instructed to change.
+	@param whichDevice A pointer to the power management object which registered to manage power for this device.
+	The whichDevice field is not pertinent to us since the driver is both the "policy maker" for the device,
+	and the "policy implementor" for the device.
+	@result See IOService.h for details.
+	*/
+	virtual IOReturn 	setPowerState ( unsigned long powerStateOrdinal, IOService * whichDevice );
+	
+	/*!
+	@function IsPowerManagementIntialized
+	@abstract Called to determine if power management is initialized.
+	@discussion Called to determine if power management is initialized.
+	Subclasses should not need to override this method.
+	@result <code>true</code> if power management has been initialized, <code>false</code> otherwise.
+	*/
+	virtual bool		IsPowerManagementIntialized ( void );
+	
+	/*!
+	@function CheckPowerState
+	@abstract Called by clients to ensure device is in correct power state before issuing I/O.
+	@discussion Called by clients to ensure device is in correct power state before issuing I/O.
+	If the device is not ready to handle such requests, it gives the driver a chance to block the
+	thread until the device is ready. Subclasses should not need to override this method.
+	*/
+	virtual void 		CheckPowerState ( void );
+	
+	/*!
+	@function ExecuteCommand
+	@abstract Called to send a SCSITask and transport it across the physical wire(s) to the device.
+	@discussion Called to send a SCSITask and transport it across the physical wire(s) to the device.
+	Subclasses internal to IOSCSIArchitectureModelFamily will need to override this method. Third
+	party subclasses should not need to override this method.
+	@param request A valid SCSITaskIdentifier representing the task to transport across the wire(s).
+	*/
+	virtual void		ExecuteCommand ( SCSITaskIdentifier request ) = 0;
+	
+	/*!
+	@function AbortCommand
+	@abstract Obsolete. Do not use this method.
+	@discussion Obsolete. Do not use this method.
+	*/
+	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier request ) = 0;
+	
+	/*!
+	@function IsProtocolServiceSupported
+	@abstract This method is called to query for support of a protocol specific service feature.
+	@discussion This method is called to query for support of a protocol specific service feature.
+	Subclasses of IOSCSIProtocolServices should override this method.
+	@param feature A valid SCSIProtocolFeature. See enums for SCSIProtocolFeature.
+	@param serviceValue A pointer to a structure/value that is used in conjunction with the feature
+	requested. See enums for SCSIProtocolFeature. NB: This parameter may be NULL for certain
+	feature requests.
+	@result <code>true</code> if the feature is supported, <code>false</code> otherwise.
+	*/
+	virtual bool		IsProtocolServiceSupported ( 
+								SCSIProtocolFeature 	feature, 
+								void * 					serviceValue ) = 0;
+	
+	/*!
+	@function HandleProtocolServiceFeature
+	@abstract This method is called to enact support of a protocol specific service feature.
+	@discussion This method is called to enact support of a protocol specific service feature.
+	Subclasses of IOSCSIProtocolServices should override this method.
+	@param feature A valid SCSIProtocolFeature. See enums for SCSIProtocolFeature.
+	@param serviceValue A pointer to a structure/value that is used in conjunction with the feature
+	requested. See enums for SCSIProtocolFeature. NB: This parameter may be NULL for certain
+	feature requests.
+	@result <code>true</code> if the service feature request succeeded, <code>false</code> otherwise.
+	*/
+	virtual bool		HandleProtocolServiceFeature ( 
+								SCSIProtocolFeature 	feature, 
+								void * 					serviceValue ) = 0;
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSIProtocolInterfaceExpansionData
+	{
+		IOWorkLoop *	fWorkLoop;
+	};
+	IOSCSIProtocolInterfaceExpansionData * fIOSCSIProtocolInterfaceReserved;
+	
+	// ------ Power Management Support ------
+	
+	thread_call_t		fPowerManagementThread;
+	IOCommandGate *		fCommandGate;
+	UInt32				fCurrentPowerState;
+	UInt32				fProposedPowerState;
+	bool				fPowerTransitionInProgress;
+	bool				fPowerAckInProgress;
+	bool				fPowerManagementInitialized;
+	
+	/*!
+	@function GetCommandGate
+	@abstract Accessor method to obtain the IOCommandGate.
+	@discussion Accessor method to obtain the IOCommandGate.
+	@result The IOCommandGate for this instance. May return NULL.
+	*/
+	IOCommandGate *		GetCommandGate ( void );
+	
+	/*!
+	@function InitializePowerManagement
+	@abstract This method is called to initialize power management.
+	@discussion This method is called to initialize power management. It will call PMinit(), joinPMTree(),
+	setIdleTimerPeriod(), and makeUsable(). This method does not call registerPowerDriver().
+	Subclasses may override this method to change the behavior (such as the number of power states).
+	@param provider The power management provider (i.e. the provider to attach to in the PowerManagement
+	tree). This may be a device that is not in the PM Tree itself, in which case, the IOService plane
+	is traversed towards the root node in an effort to find a node in the PM Tree.
+	*/
+	virtual void		InitializePowerManagement ( IOService * provider );
+	
+	/*!
+	@function GetInitialPowerState
+	@abstract This method is called to obtain the initial power state of the device (usually the highest).
+	@discussion This method is called to obtain the initial power state of the device (usually the highest).
+	Subclasses must override this method.
+	@result A power state ordinal.
+	*/
+	virtual UInt32		GetInitialPowerState ( void ) = 0;
+	
+	/*!
+	@function finalize
+	@abstract Finalizes the destruction of an IOService object.
+	@discussion See IOService.h
+	Subclasses may override this method, but should call super::finalize().
+    @result <code>true</code>.
+	*/
+	virtual bool		finalize ( IOOptionBits options );
+	
+	/*!
+	@function sHandleSetPowerState
+	@abstract The sHandleSetPowerState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@discussion The sHandleSetPowerState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@param self The 'this' pointer for the class.
+	@param powerStateOrdinal The power state to which device shall be changed.
+    @result A valid IOReturn code indicating success or failure.
+	*/
+	static IOReturn 	sHandleSetPowerState ( IOSCSIProtocolInterface * self, UInt32 powerStateOrdinal );
+	
+	/*!
+	@function sGetPowerTransistionInProgress
+	@abstract The sGetPowerTransistionInProgress method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@discussion The sGetPowerTransistionInProgress method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@param self The 'this' pointer for the class.
+    @result <code>true</code> if a power state is in progress, otherwise <code>false</code>.
+	*/
+	static bool sGetPowerTransistionInProgress ( IOSCSIProtocolInterface * 	self );
+	
+	/*!
+	@function HandleSetPowerState
+	@abstract The HandleSetPowerState method is called by the glue code and is on the
+	serialized side of the command gate.
+	@discussion The HandleSetPowerState method is called by the glue code and is on the
+	serialized side of the command gate. This allows us to touch any member
+	variables as necessary without any multi-threading issues.
+	Subclasses may override this method to change behavior. Third party subclasses
+	should not need to override this method, but may.
+	@param powerStateOrdinal The power state to which device shall be changed.
+	*/
+	virtual void		HandleSetPowerState ( UInt32 powerStateOrdinal );
+	
+	/*!
+	@function sPowerManagement
+	@abstract The sPowerManagement method is a static C-function which is called using
+	mach's thread_call API. It guarantees us a thread of execution which is
+	different than the power management thread and the workloop thread on which
+	we can issue commands to the device synchronously or asynchronously without
+	worrying about deadlocks. It calls through to HandlePowerChange, which is
+	a state machine used to direct power management.
+	@discussion The sPowerManagement method is a static C-function which is called using
+	mach's thread_call API. It guarantees us a thread of execution which is
+	different than the power management thread and the workloop thread on which
+	we can issue commands to the device synchronously or asynchronously without
+	worrying about deadlocks. It calls through to HandlePowerChange, which is
+	a state machine used to direct power management.
+	@param whichDevice The 'this' pointer.
+	*/
+	static void			sPowerManagement ( thread_call_param_t whichDevice );
+	
+	/*!
+	@function HandlePowerChange
+	@abstract The HandlePowerChange method is pure virtual and is left to each protocol or
+	application layer driver to implement. It is guaranteed to be called on its
+	own thread of execution and can make synchronous or asynchronous calls.
+	@discussion The HandlePowerChange method is pure virtual and is left to each protocol or
+	application layer driver to implement. It is guaranteed to be called on its
+	own thread of execution and can make synchronous or asynchronous calls.
+	Subclasses must override this method. Third party subclasses shouldn't need to override
+	this method but can to alter the default behavior.
+	*/
+	virtual void		HandlePowerChange ( void ) = 0;
+		
+	/*!
+	@function sHandleCheckPowerState
+	@abstract The sHandleCheckPowerState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@discussion The sHandleCheckPowerState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@param self The 'this' pointer for the class.
+	*/
+	static void			sHandleCheckPowerState ( IOSCSIProtocolInterface * self );
+	
+	/*!
+	@function HandleCheckPowerState(void)
+	@abstract The HandleCheckPowerState (void) method is on the serialized side of the command
+	gate and can change member variables safely without multi-threading issues.
+	It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
+	with the max power state the class registered with.
+	@discussion The HandleCheckPowerState (void) method is on the serialized side of the command
+	gate and can change member variables safely without multi-threading issues.
+	It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
+	with the max power state the class registered with.
+	Subclasses must override this method. Third party subclasses shouldn't need to override
+	this method but can to alter the default behavior.
+	*/
+	virtual void		HandleCheckPowerState ( void ) = 0;
+	
+	/*!
+	@function HandleCheckPowerState(UInt32 maxPowerState)
+	@abstract The HandleCheckPowerState(UInt32 maxPowerState) method is called by
+	the subclasses and is passed the maxPowerState number given to the power
+	manager at initialization time. This guarantees the threads block until that
+	power state has been achieved.
+	@discussion The HandleCheckPowerState(UInt32 maxPowerState) method is called by
+	the subclasses and is passed the maxPowerState number given to the power
+	manager at initialization time. This guarantees the threads block until that
+	power state has been achieved.
+	@param maxPowerState The maximum power state in the power state array.
+	*/
+	void 				HandleCheckPowerState ( UInt32 maxPowerState );
+	
+	/*!
+	@function TicklePowerManager(void)
+	@abstract The TicklePowerManager(void) method is called by CheckPowerState and
+	sends an activity tickle to the power manager so that the idle timer is
+	reset.
+	@discussion The TicklePowerManager(void) method is called by CheckPowerState and
+	sends an activity tickle to the power manager so that the idle timer is
+	reset.
+	Subclasses must override this method. Third party subclasses shouldn't need to override
+	this method but can to alter the default behavior.
+	*/
+	virtual void		TicklePowerManager ( void ) = 0;
+	
+	/*!
+	@function TicklePowerManager(UInt32 maxPowerState)
+	@abstract The TicklePowerManager(UInt32 maxPowerState) method is a convenience
+	function which can be called by subclasses in TicklePowerManager (void)
+	in order to tell the power manager to reset idle timer or bring the device
+	into the requested state. It returns whatever is returned by activityTickle
+	(true if device is in the requested state, false if it is not).
+	@discussion The TicklePowerManager(UInt32 maxPowerState) method is a convenience
+	function which can be called by subclasses in TicklePowerManager(void)
+	in order to tell the power manager to reset idle timer or bring the device
+	into the requested state. It returns whatever is returned by activityTickle
+	(true if device is in the requested state, false if it is not).
+	@param maxPowerState The maximum power state in the power state array.
+	@result The result of the call to activityTickle(). See IOService.h for details.
+	*/
+	bool				TicklePowerManager ( UInt32 maxPowerState );
+	
+	// ------ User Client Support ------
+	
+	bool				fUserClientExclusiveControlled;
+	IOService *			fUserClient;
+	
+	/*!
+	@function sGetUserClientExclusivityState
+	@abstract The sGetUserClientExclusivityState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@discussion The sGetUserClientExclusivityState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@param self The 'this' pointer for the class.
+	@param state A pointer to a bool in which the state should be set.
+	*/
+	static void 	sGetUserClientExclusivityState ( IOSCSIProtocolInterface * self, bool * state );
+	
+	/*!
+	@function sSetUserClientExclusivityState
+	@abstract The sSetUserClientExclusivityState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@discussion The sSetUserClientExclusivityState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@param self The 'this' pointer for the class.
+	@param result A pointer to an IOReturn for the resulting status.
+	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
+	@param state A bool indicating the desired state to set.
+	*/
+	static void		sSetUserClientExclusivityState ( IOSCSIProtocolInterface * self, IOReturn * result, IOService * userClient, bool state );
+
+	/*!
+	@function HandleGetUserClientExclusivityState
+	@abstract Gets the current exclusivity state of the user client.
+	@discussion The HandleGetUserClientExclusivityState() method is called on the serialized side
+	of the command gate to determine if any user client is holding exclusive access at the current
+	time. See discussion for GetUserClientExclusivityState().
+	Subclasses may override this method to alter default behavior. Third party subclasses should
+	not need to override this method.
+	@result <code>true</code> if a user client is in exclusive control of the device, <code>false</code> otherwise.
+	*/
+	virtual bool	HandleGetUserClientExclusivityState ( void );
+
+	/*!
+	@function HandleSetUserClientExclusivityState
+	@abstract Sets the current exclusivity state of the user client.
+	@discussion The HandleSetUserClientExclusivityState() method is called on the serialized side
+	of the command gate to set the exclusive access mode.
+	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
+	@param state Exclusivity state. <code>true</code> means exclusive access is desired, <code>false</code>
+	means exclusive access is being released.
+	@result A valid IOReturn code indicating success or the type of failure.
+	*/
+	virtual IOReturn	HandleSetUserClientExclusivityState ( IOService * userClient, bool state );
+	
+public:
+	
+	// ------- SCSI Architecture Model Task Management Functions ------
+
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 1 );
+	/*!
+	@function AbortTask
+	@abstract Aborts a task based on the Logical Unit and tagged task identifier.
+	@discussion Aborts a task based on the Logical Unit and tagged task identifier.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@param theLogicalUnit This value should be zero unless the device driver is
+	more complex and managing multiple Logical Units.
+	@param theTag A valid SCSITaggedTaskIdentifier representing an outstanding SCSITask.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag ) = 0;
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 2 );
+	/*!
+	@function AbortTaskSet
+	@abstract Aborts a task set based on the Logical Unit.
+	@discussion Aborts a task set based on the Logical Unit.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@param theLogicalUnit This value should be zero unless the device driver is
+	more complex and managing multiple Logical Units.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit ) = 0;
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 3 );
+	/*!
+	@function ClearACA
+	@abstract Clears an Auto-Contingent Allegiance (ACA) for the specified Logical Unit.
+	@discussion Clears an Auto-Contingent Allegiance (ACA) for the specified Logical Unit.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@param theLogicalUnit This value should be zero unless the device driver is
+	more complex and managing multiple Logical Units.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit ) = 0;
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 4 );
+	/*!
+	@function ClearTaskSet
+	@abstract Clears a task set for the specified Logical Unit.
+	@discussion Clears a task set for the specified Logical Unit.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@param theLogicalUnit This value should be zero unless the device driver is
+	more complex and managing multiple Logical Units.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit ) = 0;
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 5 );
+	/*!
+	@function LogicalUnitReset
+	@abstract Resets the specified Logical Unit.
+	@discussion Resets the specified Logical Unit.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@param theLogicalUnit This value should be zero unless the device driver is
+	more complex and managing multiple Logical Units.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit ) = 0;
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 6 );
+	
+	/*!
+	@function TargetReset
+	@abstract Resets the target device.
+	@discussion Resets the target device.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		TargetReset ( void ) = 0;
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 16 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolServices.h.svn-base
new file mode 100644
index 0000000..6b9df79
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolServices.h.svn-base
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_
+#define _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// Mach includes
+#include <kern/queue.h>
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOCommandGate.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/SCSITask.h>
+#include <IOKit/scsi/IOSCSIProtocolInterface.h>
+#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+// Power Management values
+enum
+{
+	kSCSIProtocolLayerPowerStateOff				= 0,
+	kSCSIProtocolLayerPowerStateOn				= 1,
+	kSCSIProtocolLayerNumDefaultStates			= 2
+};
+
+// Forward definitions of internal use only classes
+class SCSITask;
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIProtocolServices : public IOSCSIProtocolInterface
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIProtocolServices )
+	
+private:
+	
+	// The head pointer for the queue of waiting SCSI Tasks.
+	SCSITask *		fSCSITaskQueueHead;		/* OBSOLETE */
+	
+	// This is the lock for preventing multiple access while
+	// manipulating the SCSI Task queue.
+	IOSimpleLock *	fQueueLock;
+	
+	// The internal flag to indicate whether service requests should be
+	// executed or immediately errored, such as when a device is removed.
+	bool			fAllowServiceRequests;
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSIProtocolServicesExpansionData
+	{
+		// For internal use only. Do not use.
+		UInt32				fSemaphore;
+		bool				fRequiresAutosenseDescriptor;
+		SCSITaskCompletion	fCompletionRoutine;
+		queue_head_t		fTaskQueueHead;
+		queue_head_t		fAutoSenseQueueHead;
+	};
+	IOSCSIProtocolServicesExpansionData * fIOSCSIProtocolServicesReserved;
+	
+	// ---- Protocol transport methods overridden by each subclass ----
+	
+	// Send a SCSI Command to the device.  If the command was sent to the
+	// device and is pending completion, the subclass should return true and
+	// return back the kSCSIServiceResponse_Request_In_Process response. 
+	// If the command completes immediately with an error, the subclass will
+	// return true and return back the appropriate status.
+	// if the subclass is currently processing all the commands it can, the
+	// subclass will return false and the command will be resent next time
+	// CommandCompleted is called.  
+	virtual bool		SendSCSICommand ( 	SCSITaskIdentifier 		request, 
+											SCSIServiceResponse *	serviceResponse,
+											SCSITaskStatus *		taskStatus ) = 0;
+	
+	virtual SCSIServiceResponse	AbortSCSICommand ( SCSITaskIdentifier request ) = 0;
+	
+	// ---- Command completion notification method ---------
+	// Subclasses will call this inherited method when the command
+	// executed by SendSCSICommand has completed.
+	// The subclasses will return a service response that is derived
+	// from protocol specific status information and as specified in 
+	// the specification for that protocol.
+	// If the service response is kSCSIServiceResponse_TASK_COMPLETE,
+	// the subclass will also return a SCSI status value.
+	void	CommandCompleted ( 	SCSITaskIdentifier 	request, 
+								SCSIServiceResponse serviceResponse,
+								SCSITaskStatus		taskStatus );
+	
+	// ---- Utility methods for accessing SCSITask attributes ----
+	// Method for retreiving the attribute for a task.
+	SCSITaskAttribute	GetTaskAttribute ( SCSITaskIdentifier request );
+	
+	bool			SetTaskState ( 	SCSITaskIdentifier request, 
+									SCSITaskState newTaskState );
+	SCSITaskState	GetTaskState ( 	SCSITaskIdentifier request );
+	
+	UInt8			GetLogicalUnitNumber ( SCSITaskIdentifier request );
+	
+	// Method to determine the size of the command descriptor block.
+	UInt8	GetCommandDescriptorBlockSize ( SCSITaskIdentifier request );
+	
+	// This will always return the define max CDB size.  If the Protocol Layer
+	// driver only supports a smaller size CDB, it will have to create a local
+	// SCSICommandDescriptorBlock variable to get the CDB data and then 
+	// transfer the needed bytes from there.
+	bool	GetCommandDescriptorBlock ( SCSITaskIdentifier 				request, 
+										SCSICommandDescriptorBlock * 	cdbData );
+	
+	// Get the transfer direction for the request.
+	UInt8	GetDataTransferDirection ( SCSITaskIdentifier request );
+	
+	UInt64	GetRequestedDataTransferCount ( SCSITaskIdentifier request );
+	
+	bool	SetRealizedDataTransferCount ( SCSITaskIdentifier request,
+										   UInt64 newRealizedDataCount );
+	
+	UInt64	GetRealizedDataTransferCount ( SCSITaskIdentifier request );
+	
+	IOMemoryDescriptor *	GetDataBuffer ( SCSITaskIdentifier request );
+	
+	UInt64	GetDataBufferOffset ( SCSITaskIdentifier request );
+	
+	UInt32	GetTimeoutDuration ( SCSITaskIdentifier request );
+	
+	UInt64	GetAutosenseRequestedDataTransferCount ( SCSITaskIdentifier	request );
+	
+	// Set the auto sense data that was returned for the SCSI Task.
+	// A return value of true indicates that the data was copied to the member 
+	// sense data structure, false indicates that the data could not be copied.
+	bool	SetAutoSenseData ( SCSITaskIdentifier	request,
+							   SCSI_Sense_Data *	senseData ); // DEPRECATED, use the one on the line below.
+	
+	bool	SetAutoSenseData ( SCSITaskIdentifier	request,
+							   SCSI_Sense_Data *	senseData,
+							   UInt8				senseDataSize );
+	
+	void	EnsureAutosenseDescriptorExists ( SCSITaskIdentifier request );
+	
+	bool	SetProtocolLayerReference ( 
+				SCSITaskIdentifier 		request, 
+				void *					newReferenceValue );
+	void *	GetProtocolLayerReference ( SCSITaskIdentifier request );
+	
+	
+	bool	SetTaskExecutionMode (
+				SCSITaskIdentifier 		request, 
+				SCSITaskMode 			newTaskMode );
+	SCSITaskMode	GetTaskExecutionMode ( SCSITaskIdentifier request );
+	
+	// ---- Method calls for messaging device connectedness ----
+	void 	SendNotification_DeviceRemoved ( void );
+	
+	void 	SendNotification_VerifyDeviceState ( void );   
+	
+	// -- SCSI Task Queue Management Methods --
+	// Following are the commands used to manipulate the queue of pending SCSI Tasks.
+	
+	// Add the SCSI Task to the queue.  The Task's Attribute determines where in
+	// the queue the Task is placed.
+	void 	AddSCSITaskToQueue ( SCSITaskIdentifier request );
+	
+	// Add the SCSI Task to the head of the queue.  This is used when the task
+	// has been removed from the head of the queue, but the subclass indicates
+	// that it can not yet process this task.
+	void 	AddSCSITaskToHeadOfQueue ( SCSITask * request );
+	
+	// Remove the next SCSI Task for the queue and return it.
+	SCSITask * RetrieveNextSCSITaskFromQueue ( void );
+	
+	// Check to see if the SCSI Task resides in the queue and abort it if it does.
+	bool 	AbortSCSITaskFromQueue ( SCSITask * request );
+	
+	// Methods for sending and completing SCSI tasks
+	void	SendSCSITasksFromQueue ( void );
+	
+	void	RejectSCSITasksCurrentlyQueued ( void );
+	
+	void	ProcessCompletedTask ( 	SCSITaskIdentifier 	request, 
+									SCSIServiceResponse serviceResponse,
+									SCSITaskStatus		taskStatus );
+	void	RejectTask ( SCSITaskIdentifier		request );
+	
+	// ------ Power Management Support ------
+	
+	// The InitializePowerManagement method is called to initialize power management.
+	// In the protocol services layer, this method calls the protocol interface layer
+	// to initialize power management state variables and then registers the protocol
+	// layer driver with the power manager with two(2) states, ON and OFF.	
+	virtual void		InitializePowerManagement ( IOService * provider );
+	
+	// The GetInitialPowerState method is called once, right after InitializePowerManagement()
+	// in order to determine what state the device is initially in at startup time (usually
+	// the highest power mode).
+	virtual UInt32		GetInitialPowerState ( void );
+	
+	// The HandlePowerChange method is pure virtual and is left to each protocol or
+	// application layer driver to implement. It is guaranteed to be called on its
+	// own thread of execution and can make synchronous or asynchronous calls.
+	virtual void		HandlePowerChange ( void );
+	
+	// The HandleCheckPowerState (void) method is on the serialized side of the command
+	// gate and can change member variables safely without multi-threading issues.
+	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
+	// with the max power state the class registered with.
+	virtual void		HandleCheckPowerState ( void );
+	
+	// The TicklePowerManager ( void ) method is called by CheckPowerState and
+	// sends an activity tickle to the power manager so that the idle timer is
+	// reset.
+	virtual void		TicklePowerManager ( void );
+	
+	// The HandlePowerOff method is called to do any bus specific activity
+	// necessary before shutting down and going to sleep.
+	virtual IOReturn	HandlePowerOff ( void );
+	
+	// The HandlePowerOn method is called to do any bus specific activity
+	// necessary to recover from power-on/wake from sleep (e.g. bus reset on ATAPI)
+	virtual IOReturn	HandlePowerOn ( void );
+	
+public:
+	
+	virtual bool	start	( IOService * provider );
+	virtual void	free	( void );
+	
+	void RegisterSCSITaskCompletionRoutine ( SCSITaskCompletion completion );
+	
+	// ------- SCSI Architecture Model Task Management Functions ------
+	// The ExecuteCommand method will take a SCSI Task and transport
+	// it across the physical wire(s) to the device
+	void					ExecuteCommand ( SCSITaskIdentifier	request );
+	
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a specific task be aborted.
+	SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
+
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a all tasks curerntly in the task set be aborted.
+	SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
+    
+	SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		TargetReset ( void );
+	
+    // ************* Obsoleted Member Routine ****************
+    // The AbortCommand method is replaced by the AbortTask Management function and
+    // should no longer be called.
+	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier	request );
+
+	
+	// ---- Method used for determining protocol or physical interconnect characteristics. ----
+	// The IsProtocolServiceSupported will return true if the specified
+	// feature is supported by the protocol layer.  If the service has a value that must be
+	// returned, it will be returned in the serviceValue output parameter.
+	virtual bool	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue ) = 0;
+
+	// The HandleProtocolServiceFeature instructs the Protocol Services driver to perform the necessary 
+	// tasks for the indicated feature.
+	virtual bool	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue ) = 0;
+
+protected:
+	
+	// ----- Protocol Services Driver request handlers for Task Management functions -----
+	// These should be abstract so that every Protocol Services Driver would have to
+	// override them, but since they are new member routines, this class will provide
+	// a default implementation.
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 1 );
+	virtual SCSIServiceResponse		HandleAbortTask ( 
+											UInt8 						theLogicalUnit, 
+											SCSITaggedTaskIdentifier 	theTag );
+    
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 2 );
+	virtual SCSIServiceResponse		HandleAbortTaskSet ( 
+											UInt8 						theLogicalUnit );
+	
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 3 );
+	virtual SCSIServiceResponse		HandleClearACA ( 
+											UInt8 						theLogicalUnit );
+	
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 4 );
+	virtual SCSIServiceResponse		HandleClearTaskSet (
+											UInt8 						theLogicalUnit );
+	
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 5 );
+	virtual SCSIServiceResponse		HandleLogicalUnitReset (
+											UInt8 						theLogicalUnit );
+											
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 6 );
+    // The HandleTargetReset member routine requests that the Protocol Services Driver
+    // perform the necessary steps detailed in the specification that defines the 
+    // protocol the driver represents for the TargetReset management function.
+	virtual SCSIServiceResponse		HandleTargetReset ( void );
+
+
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices,  7 );
+    // The CreateSCSITargetDevice member routine will create the appropriate object
+    // to represent the Target portion of a SCSI Device.  This object is responsible
+    // for managing the Target functions of the SCSI Device including the Task Manager and
+    // Logical Units.
+    // If the SCSITargetDevice object was successfully created, a true value will be
+    // returned, otherwisw, this will return false.
+	virtual bool					CreateSCSITargetDevice ( void );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices,  8 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 	9 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 10 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 11 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 12 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 13 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 14 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 15 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 16 );
+    
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIReducedBlockCommandsDevice.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIReducedBlockCommandsDevice.h.svn-base
new file mode 100644
index 0000000..955fd6e
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIReducedBlockCommandsDevice.h.svn-base
@@ -0,0 +1,438 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_
+#define _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOMemoryDescriptor.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOStorage.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+
+// RBC power states as defined in T10:1240D SCSI Reduced Block Commands (RBC)
+// Revision 10a, August 18, 1999, page 13.
+enum
+{
+	kRBCPowerStateSystemSleep	= 0,
+	kRBCPowerStateSleep 		= 1,
+	kRBCPowerStateStandby 		= 2,
+	kRBCPowerStateIdle			= 3,
+	kRBCPowerStateActive		= 4,
+	kRBCNumPowerStates			= 5
+};
+
+enum
+{
+	kMediaStateUnlocked	= 0,
+	kMediaStateLocked 	= 1
+};
+
+#define kCapacityDataBufferSize				8
+
+// Forward declaration for the SCSIReducedBlockCommands that is used internally by the
+// IOSCSIReducedBlockCommandsDevice class.
+class SCSIReducedBlockCommands;
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIReducedBlockCommandsDevice : public IOSCSIPrimaryCommandsDevice
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIReducedBlockCommandsDevice );
+	
+private:
+	
+#ifndef __LP64__
+	
+    SCSIReducedBlockCommands *		fSCSIReducedBlockCommandObject;
+    SCSIReducedBlockCommands *		GetSCSIReducedBlockCommandObject ( void );
+	
+#endif	/* !__LP64__ */
+	
+	static void			AsyncReadWriteComplete ( SCSITaskIdentifier completedTask );
+	
+protected:
+    
+    // Reserve space for future expansion.
+    struct IOSCSIReducedBlockCommandsDeviceExpansionData
+	{
+		IONotifier *	fPowerDownNotifier;
+        bool			fMediumRemovalPrevented;
+        bool			fKnownManualEject;
+        UInt32			fPollingMode;
+		bool			fProtocolSpecificPowerControl;
+	};
+    IOSCSIReducedBlockCommandsDeviceExpansionData * fIOSCSIReducedBlockCommandsDeviceReserved;
+	
+	#define fPowerDownNotifier				fIOSCSIReducedBlockCommandsDeviceReserved->fPowerDownNotifier
+	#define fMediumRemovalPrevented			fIOSCSIReducedBlockCommandsDeviceReserved->fMediumRemovalPrevented
+	#define fKnownManualEject				fIOSCSIReducedBlockCommandsDeviceReserved->fKnownManualEject
+	#define fPollingMode					fIOSCSIReducedBlockCommandsDeviceReserved->fPollingMode
+	#define fProtocolSpecificPowerControl	fIOSCSIReducedBlockCommandsDeviceReserved->fProtocolSpecificPowerControl
+	
+	bool				fMediaChanged;
+	bool				fMediaPresent;
+	
+	// The byte count of each physical block on the media.
+	UInt32				fMediaBlockSize;
+	
+	// The total number of blocks of mediaBlockSize on the media.
+	UInt32				fMediaBlockCount;
+	
+	// Flags used to indicate device feature
+	bool				fMediaIsRemovable;
+	bool				fMediaIsWriteProtected;
+	
+	thread_call_t		fPollingThread;
+	
+	enum
+	{
+		kPollingMode_Suspended			= 0,
+		kPollingMode_NewMedia 			= 1,
+		kPollingMode_MediaRemoval		= 2
+	};
+	
+	virtual void 		CreateStorageServiceNub ( void );
+	virtual bool		DetermineDeviceCharacteristics ( void );	
+	virtual void		PollForMedia ( void );
+	virtual void		EnablePolling ( void );
+	virtual void		DisablePolling ( void );
+	virtual void		CheckWriteProtection ( void );
+	virtual void		SetMediaCharacteristics ( UInt32 blockSize, UInt32 blockCount );
+ 	virtual void		ResetMediaCharacteristics ( void );
+	virtual bool		ClearNotReadyStatus ( void );
+	
+	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
+									UInt64					startBlock,
+									UInt64					blockCount );
+	
+	virtual IOReturn	IssueWrite ( IOMemoryDescriptor*	buffer,
+									 UInt64					startBlock,
+									 UInt64					blockCount );
+	
+	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
+									UInt64					startBlock,
+									UInt64					blockCount,
+									void *					clientData );
+	
+	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
+									 UInt64					startBlock,
+									 UInt64					blockCount,
+									 void *					clientData );
+
+#ifndef __LP64__
+	
+	// This method will retreive the SCSI Primary Command Set object for
+	// the class.  For subclasses, this will be overridden using a
+	// dynamic cast on the subclasses base command set object.
+	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
+
+#endif	/* !__LP64__ */
+	
+	// ----- Power Management Support ------
+		
+	// We override this method to set our power states and register ourselves
+	// as a power policy maker.
+	virtual void 		InitializePowerManagement ( IOService * provider );
+	
+	// We override this method so that when we register for power management,
+	// we go to our active power state (which the drive is definitely in
+	// at startup time).
+	virtual UInt32		GetInitialPowerState ( void );
+	
+	// We override this method in order to provide the number of transitions
+	// from Fully active to Sleep state so that the idle timer can be adjusted
+	// to the appropriate time period based on the disk spindown time set in
+	// the Energy Saver prefs panel.
+	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
+	
+	// The TicklePowerManager method is called to tell the power manager that the
+	// device needs to be in a certain power state to handle requests.
+	virtual void		TicklePowerManager ( void );
+	
+	// The HandlePowerChange method is the state machine for power management.
+	// It is guaranteed to be on its own thread of execution (different from
+	// the power manager thread AND the workloop thread. This routine can
+	// send sync or async calls to the drive without worrying about threading
+	// issues.
+	virtual void		HandlePowerChange ( void );
+	
+	// The HandleCheckPowerState (void) method is on the serialized side of the command
+	// gate and can change member variables safely without multi-threading issues.
+	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
+	// with the max power state the class registered with.
+	virtual void		HandleCheckPowerState ( void );
+	
+	// The CheckMediaPresence method is called to see if the media which we
+	// anticipated being there is still there.
+	virtual bool		CheckMediaPresence ( void );
+	
+	virtual bool		InitializeDeviceSupport ( void );
+	virtual void		StartDeviceSupport ( void );
+	virtual void		SuspendDeviceSupport ( void );
+	virtual void		ResumeDeviceSupport ( void );
+	virtual void		StopDeviceSupport ( void );
+	virtual void		TerminateDeviceSupport ( void );
+	
+	virtual void 		free ( void );
+	
+#ifndef __LP64__
+	
+	virtual bool		CreateCommandSetObjects ( void );
+	virtual void		FreeCommandSetObjects ( void );
+
+#endif	/* !__LP64__ */
+	
+public:
+	
+	virtual IOReturn	SyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					startBlock,
+											UInt64					blockCount );
+	
+	virtual IOReturn	AsyncReadWrite (	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											void *					clientData );
+	
+	
+	virtual IOReturn	EjectTheMedia ( void );	
+	virtual IOReturn	FormatMedia ( UInt64 byteCapacity );
+	virtual UInt32		GetFormatCapacities ( 	UInt64 * capacities,
+												UInt32   capacitiesMaxCount ) const;
+	virtual IOReturn	LockUnlockMedia ( bool doLock );
+	virtual IOReturn	SynchronizeCache ( void );
+	virtual IOReturn	ReportBlockSize ( UInt64 * blockSize );
+	virtual IOReturn	ReportEjectability ( bool * isEjectable );
+	virtual IOReturn	ReportLockability ( bool * isLockable );
+	virtual IOReturn	ReportPollRequirements ( bool * pollIsRequired,
+												 bool * pollIsExpensive );
+	virtual IOReturn	ReportMaxReadTransfer (  UInt64 	blockSize,
+												 UInt64 * 	max );
+	virtual IOReturn	ReportMaxValidBlock ( UInt64 * maxBlock );
+	virtual IOReturn	ReportMaxWriteTransfer ( UInt64	blockSize,
+												UInt64 * max );
+	virtual IOReturn	ReportMediaState ( 	bool * mediaPresent,
+											bool * changed );
+	virtual IOReturn	ReportRemovability ( bool * isRemovable );
+	virtual IOReturn	ReportWriteProtection ( bool * isWriteProtected );
+	
+	static 	void		sPollForMedia ( void * pdtDriver, void * refCon );
+	
+	
+protected:
+	
+	
+	// The FORMAT_UNIT command as defined in section 5.1
+	virtual bool FORMAT_UNIT (
+							SCSITaskIdentifier			request,
+							SCSICmdField1Bit			IMMED,
+	   						SCSICmdField1Bit			PROGRESS,
+	   						SCSICmdField1Bit			PERCENT_TIME,
+	   						SCSICmdField1Bit			INCREMENT );
+	
+	// The INQUIRY command as defined in SPC-2 w/o CONTROL byte
+	virtual bool INQUIRY (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit			CMDDT,
+							SCSICmdField1Bit			EVPD,
+							SCSICmdField1Byte			PAGE_OR_OPERATION_CODE,
+							SCSICmdField1Byte			ALLOCATION_LENGTH );
+	
+	// The MODE_SELECT(6) command as defined in SPC-2 w/o CONTROL byte
+	virtual bool MODE_SELECT_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PF,
+							SCSICmdField1Bit 			SP,
+							SCSICmdField1Byte 			PARAMETER_LIST_LENGTH );
+	
+	// The MODE_SENSE(6) command as defined in SPC-2 w/o CONTROL byte
+	virtual bool MODE_SENSE_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			DBD,
+		   					SCSICmdField2Bit 			PC,
+		   					SCSICmdField6Bit 			PAGE_CODE,
+		   					SCSICmdField1Byte 			ALLOCATION_LENGTH );
+	
+	// The PERSISTENT_RESERVE_IN command as defined in SPC-2 w/o CONTROL byte
+	virtual bool PERSISTENT_RESERVE_IN (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+		   					SCSICmdField5Bit 			SERVICE_ACTION,
+		   					SCSICmdField2Byte 			ALLOCATION_LENGTH );
+	
+	// The PERSISTENT_RESERVE_OUT command as defined in SPC-2 w/o CONTROL byte
+	virtual bool PERSISTENT_RESERVE_OUT (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+		   					SCSICmdField5Bit			SERVICE_ACTION,
+		   					SCSICmdField4Bit			SCOPE,
+		   					SCSICmdField4Bit			TYPE );
+	
+	// The PREVENT_ALLOW_MEDIUM_REMOVAL command as defined in SPC-2 w/o CONTROL byte
+	virtual bool PREVENT_ALLOW_MEDIUM_REMOVAL ( 
+							SCSITaskIdentifier			request,
+	 						SCSICmdField2Bit			PREVENT );
+	
+   	// The READ_10 command as defined in section 5.2
+	virtual bool READ_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							UInt32						blockSize,
+							SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
+							SCSICmdField2Byte			TRANSFER_LENGTH );
+	
+	// The READ_CAPACITY command as defined in section 5.3
+	virtual bool READ_CAPACITY (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer );
+	
+	// The RELEASE(6) command as defined in SPC-2 w/o CONTROL byte
+	virtual bool RELEASE_6 (								
+							SCSITaskIdentifier			request );
+	
+	// The REQUEST_SENSE command as defined in SPC-2 w/o CONTROL byte
+	virtual bool REQUEST_SENSE (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Byte 			ALLOCATION_LENGTH );
+	
+	// The RESERVE(6) command as defined in SPC-2 w/o CONTROL byte
+	virtual bool RESERVE_6 (	
+							SCSITaskIdentifier			request );
+	
+	// The START_STOP_UNIT command as defined in section 5.4
+	virtual bool START_STOP_UNIT (
+							SCSITaskIdentifier			request,
+							SCSICmdField1Bit			IMMED,
+							SCSICmdField4Bit			POWER_CONDITIONS,
+							SCSICmdField1Bit			LEOJ,
+							SCSICmdField1Bit			START );
+	
+	// The SYNCRONIZE_CACHE command as defined in section 5.5
+	virtual bool SYNCHRONIZE_CACHE (
+							SCSITaskIdentifier			request );
+	
+	// The TEST_UNIT_READY command as defined in SPC-2 w/o CONTROL byte
+	virtual bool TEST_UNIT_READY (
+							SCSITaskIdentifier			request );
+	
+	// The VERIFY command as defined in section 5.7
+	virtual bool VERIFY (
+							SCSITaskIdentifier			request,
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+							SCSICmdField2Byte 			VERIFICATION_LENGTH );
+	
+	// The WRITE_10 command	as defined in section 5.6
+	virtual bool WRITE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							UInt32						blockSize,
+							SCSICmdField1Bit			FUA,
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+							SCSICmdField2Byte 			TRANSFER_LENGTH );
+	
+	// The WRITE_BUFFER command as defined in SPC-2 w/o CONTROL byte
+	virtual bool WRITE_BUFFER ( 
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField4Bit 			MODE,
+							SCSICmdField1Byte 			BUFFER_ID,
+							SCSICmdField3Byte 			BUFFER_OFFSET,
+							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH );
+	
+	
+
+	/* Added with 10.2 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 1 );
+	
+public:
+	
+	virtual IOReturn	PowerDownHandler (	void * 			refCon,
+											UInt32 			messageType,
+											IOService * 	provider,
+											void * 			messageArgument,
+											vm_size_t 		argSize );
+	
+	
+	/* Added with 10.2 */	
+	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 2 );
+	
+protected:
+
+	virtual	void		SetMediaIcon ( void );
+	
+
+	/* Added with 10.3.3 */		
+	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 3 );
+	
+protected:
+
+	virtual	void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
+	
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 16 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_INQUIRY_Definitions.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_INQUIRY_Definitions.h.svn-base
new file mode 100644
index 0000000..55a6a4c
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_INQUIRY_Definitions.h.svn-base
@@ -0,0 +1,923 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_CMDS_INQUIRY_H_
+#define _IOKIT_SCSI_CMDS_INQUIRY_H_
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSI Inquiry Definitions
+	@discussion
+	This file contains all definitions for the data returned from
+	the INQUIRY (0x12) command.
+*/
+
+
+/*!
+ * @enum Payload sizes
+ * @discussion
+ * Definitions for sizes related to the INQUIRY data.
+ * @constant kINQUIRY_StandardDataHeaderSize
+ * INQUIRY data header size.
+ * @constant kINQUIRY_MaximumDataSize
+ * Maximum size for INQUIRY data.
+*/
+enum
+{
+	kINQUIRY_StandardDataHeaderSize			= 5,
+	kINQUIRY_MaximumDataSize				= 255	
+};
+
+
+/*!
+@enum INQUIRY field sizes
+@discussion
+Sizes for some of the inquiry data fields.
+@constant kINQUIRY_VENDOR_IDENTIFICATION_Length
+Size of VENDOR_IDENTIFICATION field.
+@constant kINQUIRY_PRODUCT_IDENTIFICATION_Length
+Size of PRODUCT_IDENTIFICATION field.
+@constant kINQUIRY_PRODUCT_REVISION_LEVEL_Length
+Size of PRODUCT_REVISION_LEVEL field.
+*/
+enum
+{
+	kINQUIRY_VENDOR_IDENTIFICATION_Length	= 8,
+	kINQUIRY_PRODUCT_IDENTIFICATION_Length	= 16,
+	kINQUIRY_PRODUCT_REVISION_LEVEL_Length	= 4
+};
+
+
+/*!
+@struct SCSICmd_INQUIRY_StandardData
+@discussion
+This structure defines the format of the required standard data that is 
+returned for the INQUIRY command.  This is the data that is required to
+be returned from all devices.
+*/
+typedef struct SCSICmd_INQUIRY_StandardData
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		RMB;								// 7 = removable
+	UInt8		VERSION;							// 7/6 = ISO/IEC, 5-3 = ECMA, 2-0 = ANSI.
+	UInt8		RESPONSE_DATA_FORMAT;				// 7 = AERC, 6 = Obsolete, 5 = NormACA, 4 = HiSup 3-0 = Response data format. (SPC-3 obsoletes AERC)
+													// If ANSI Version = 0, this is ATAPI and bits 7-4 = ATAPI version.
+	UInt8		ADDITIONAL_LENGTH;					// Number of additional bytes available in inquiry data
+	UInt8		SCCSReserved;						// SCC-2 device flag and reserved fields (SPC-3 adds PROTECT 3PC TPGS, and ACC)
+	UInt8		flags1;								// First byte of support flags (See SPC-3 section 6.4.2)
+	UInt8		flags2;								// Second byte of support flags (Byte 7) (See SPC-3 section 6.4.2)
+	char		VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
+	char		PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
+	char		PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
+} SCSICmd_INQUIRY_StandardData;
+typedef SCSICmd_INQUIRY_StandardData * SCSICmd_INQUIRY_StandardDataPtr;
+
+
+/*!
+@struct SCSICmd_INQUIRY_StandardDataAll
+@discussion
+This structure defines the all of the fields that can be returned in
+repsonse to the INQUIRy request for the standard data.  There is no
+requirement as to how much of the additional data must be returned by a device.
+*/
+typedef struct SCSICmd_INQUIRY_StandardDataAll
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		RMB;								// 7 = removable
+	UInt8		VERSION;							// 7/6 = ISO/IEC, 5-3 = ECMA, 2-0 = ANSI.
+	UInt8		RESPONSE_DATA_FORMAT;				// 7 = AERC, 6 = Obsolete, 5 = NormACA, 4 = HiSup 3-0 = Response data format.
+													// If ANSI Version = 0, this is ATAPI and bits 7-4 = ATAPI version.
+	UInt8		ADDITIONAL_LENGTH;					// Number of additional bytes available in inquiry data
+	UInt8		SCCSReserved;						// SCC-2 device flag and reserved fields
+	UInt8		flags1;								// First byte of support flags (Byte 6)
+	UInt8		flags2;								// Second byte of support flags (Byte 7)
+	char		VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
+	char		PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
+	char		PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
+	
+	// Following is the optional data that may be returned by a device.
+	UInt8		VendorSpecific1[20];
+	UInt8		flags3;								// Third byte of support flags, mainly SPI-3 (Byte 56)
+	UInt8		Reserved1;
+	UInt16		VERSION_DESCRIPTOR[8];
+	UInt8		Reserved2[22];
+	UInt8		VendorSpecific2[160];
+} SCSICmd_INQUIRY_StandardDataAll;
+
+
+/*!
+@enum Peripheral Qualifier
+@discussion
+Inquiry Peripheral Qualifier definitions
+@constant kINQUIRY_PERIPHERAL_QUALIFIER_Connected
+Peripheral Device is connected.
+@constant kINQUIRY_PERIPHERAL_QUALIFIER_SupportedButNotConnected
+Peripheral Device is supported, but not connected.
+@constant kINQUIRY_PERIPHERAL_QUALIFIER_NotSupported
+Peripheral Device is not supported.
+@constant kINQUIRY_PERIPHERAL_QUALIFIER_Mask
+Mask to use for PERIPHERAL_DEVICE_TYPE field.
+*/
+enum
+{
+	kINQUIRY_PERIPHERAL_QUALIFIER_Connected					= 0x00,
+	kINQUIRY_PERIPHERAL_QUALIFIER_SupportedButNotConnected	= 0x20,
+	kINQUIRY_PERIPHERAL_QUALIFIER_NotSupported				= 0x60,
+	kINQUIRY_PERIPHERAL_QUALIFIER_Mask						= 0xE0
+};
+
+
+/*!
+@enum Peripheral Device types
+@discussion
+Inquiry Peripheral Device type definitions
+@constant kINQUIRY_PERIPHERAL_TYPE_DirectAccessSBCDevice
+SBC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_SequentialAccessSSCDevice
+Sequential Access (Tape) SSC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_PrinterSSCDevice
+SSC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_ProcessorSPCDevice
+SPC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_WriteOnceSBCDevice
+SBC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_CDROM_MMCDevice
+MMC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_ScannerSCSI2Device
+SCSI2 Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_OpticalMemorySBCDevice
+SBC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_MediumChangerSMCDevice
+SMC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_CommunicationsSSCDevice
+Comms SSC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_StorageArrayControllerSCC2Device
+SCC2 Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_EnclosureServicesSESDevice
+SES Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_SimplifiedDirectAccessRBCDevice
+RBC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_OpticalCardReaderOCRWDevice
+OCRW Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_ObjectBasedStorageDevice
+OSD device.
+@constant kINQUIRY_PERIPHERAL_TYPE_AutomationDriveInterface
+Automation Drive Interface device.
+@constant kINQUIRY_PERIPHERAL_TYPE_WellKnownLogicalUnit
+Well known logical unit.
+@constant kINQUIRY_PERIPHERAL_TYPE_UnknownOrNoDeviceType
+Unknown or no device.
+@constant kINQUIRY_PERIPHERAL_TYPE_Mask
+Mask to use for PERIPHERAL_DEVICE_TYPE field.
+*/
+enum
+{
+	kINQUIRY_PERIPHERAL_TYPE_DirectAccessSBCDevice				= 0x00,
+	kINQUIRY_PERIPHERAL_TYPE_SequentialAccessSSCDevice			= 0x01,
+	kINQUIRY_PERIPHERAL_TYPE_PrinterSSCDevice					= 0x02,
+	kINQUIRY_PERIPHERAL_TYPE_ProcessorSPCDevice					= 0x03,
+	kINQUIRY_PERIPHERAL_TYPE_WriteOnceSBCDevice					= 0x04,
+	kINQUIRY_PERIPHERAL_TYPE_CDROM_MMCDevice					= 0x05,
+	kINQUIRY_PERIPHERAL_TYPE_ScannerSCSI2Device					= 0x06,
+	kINQUIRY_PERIPHERAL_TYPE_OpticalMemorySBCDevice				= 0x07,
+	kINQUIRY_PERIPHERAL_TYPE_MediumChangerSMCDevice				= 0x08,
+	kINQUIRY_PERIPHERAL_TYPE_CommunicationsSSCDevice			= 0x09,
+	/* 0x0A - 0x0B ASC IT8 Graphic Arts Prepress Devices */
+	kINQUIRY_PERIPHERAL_TYPE_StorageArrayControllerSCC2Device	= 0x0C,
+	kINQUIRY_PERIPHERAL_TYPE_EnclosureServicesSESDevice			= 0x0D,
+	kINQUIRY_PERIPHERAL_TYPE_SimplifiedDirectAccessRBCDevice	= 0x0E,
+	kINQUIRY_PERIPHERAL_TYPE_OpticalCardReaderOCRWDevice		= 0x0F,
+	/* 0x10 - 0x1E Reserved Device Types */
+	kINQUIRY_PERIPHERAL_TYPE_ObjectBasedStorageDevice			= 0x11,
+	kINQUIRY_PERIPHERAL_TYPE_AutomationDriveInterface			= 0x12,
+	kINQUIRY_PERIPHERAL_TYPE_WellKnownLogicalUnit				= 0x1E,
+	kINQUIRY_PERIPHERAL_TYPE_UnknownOrNoDeviceType				= 0x1F,
+	
+	
+	kINQUIRY_PERIPHERAL_TYPE_Mask								= 0x1F
+};
+
+
+/*!
+@enum Removable Bit field definitions
+@discussion
+Inquiry Removable Bit field definitions
+@constant kINQUIRY_PERIPHERAL_RMB_MediumFixed
+Medium type is fixed disk.
+@constant kINQUIRY_PERIPHERAL_RMB_MediumRemovable
+Medium type is removable disk.
+@constant kINQUIRY_PERIPHERAL_RMB_BitMask
+Mask to use for RMB field.
+*/
+enum
+{
+	kINQUIRY_PERIPHERAL_RMB_MediumFixed 						= 0x00,
+	kINQUIRY_PERIPHERAL_RMB_MediumRemovable 					= 0x80,
+	kINQUIRY_PERIPHERAL_RMB_BitMask 							= 0x80
+};
+
+
+/*!
+@enum Version field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY Version field.
+@constant kINQUIRY_ISO_IEC_VERSION_Mask
+Mask for valid bits for ISO/IEC Version.
+@constant kINQUIRY_ECMA_VERSION_Mask
+Mask for valid bits for ECMA Version.
+@constant kINQUIRY_ANSI_VERSION_NoClaimedConformance
+No ANSI conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_SCSI_1_Compliant
+SCSI-1 conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_SCSI_2_Compliant
+SCSI-2 conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant
+SPC conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_2_Compliant
+SPC-2 conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_3_Compliant
+SPC-3 conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_Mask
+Mask for valid bits for ANSI Version.
+*/
+enum
+{
+	kINQUIRY_ISO_IEC_VERSION_Mask								= 0xC0,
+	
+	kINQUIRY_ECMA_VERSION_Mask									= 0x38,
+	
+	kINQUIRY_ANSI_VERSION_NoClaimedConformance					= 0x00,
+	kINQUIRY_ANSI_VERSION_SCSI_1_Compliant						= 0x01,
+	kINQUIRY_ANSI_VERSION_SCSI_2_Compliant						= 0x02,
+	kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant					= 0x03,
+	kINQUIRY_ANSI_VERSION_SCSI_SPC_2_Compliant					= 0x04,
+	kINQUIRY_ANSI_VERSION_SCSI_SPC_3_Compliant					= 0x05,
+	kINQUIRY_ANSI_VERSION_Mask									= 0x07
+};
+
+
+/*!
+@enum Response Data Format field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY RESPONSE_DATA_FORMAT field.
+@constant kINQUIRY_Byte3_HISUP_Bit
+HISUP bit definition.
+@constant kINQUIRY_Byte3_NORMACA_Bit
+NORMACA bit definition.
+@constant kINQUIRY_Byte3_AERC_Bit
+AERC bit definition.
+@constant kINQUIRY_RESPONSE_DATA_FORMAT_Mask
+Mask for valid bits for RESPONSE_DATA_FORMAT.
+@constant kINQUIRY_Byte3_HISUP_Mask
+Mask to use to test the HISUP bit.
+@constant kINQUIRY_Byte3_NORMACA_Mask
+Mask to use to test the NORMACA bit.
+@constant kINQUIRY_Byte3_AERC_Mask
+Mask to use to test the AERC bit.
+*/
+enum
+{
+	// Bit definitions
+	// Bits 0-3: RESPONSE DATA FORMAT
+	kINQUIRY_Byte3_HISUP_Bit				= 4,
+	kINQUIRY_Byte3_NORMACA_Bit				= 5,
+	// Bit 6 is Obsolete
+	kINQUIRY_Byte3_AERC_Bit					= 7,
+	
+	// Masks
+	kINQUIRY_RESPONSE_DATA_FORMAT_Mask		= 0x0F, // Bits 0-3
+	kINQUIRY_Byte3_HISUP_Mask				= (1 << kINQUIRY_Byte3_HISUP_Bit),
+	kINQUIRY_Byte3_NORMACA_Mask				= (1 << kINQUIRY_Byte3_NORMACA_Bit),
+	// Bit 6 is Obsolete
+	kINQUIRY_Byte3_AERC_Mask				= (1 << kINQUIRY_Byte3_AERC_Bit)
+};
+
+
+/*!
+@enum SCCS field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY SCCSReserved field.
+@constant kINQUIRY_Byte5_SCCS_Bit
+SCCS bit definition.
+@constant kINQUIRY_Byte5_ACC_Bit
+ACC bit definition.
+@constant kINQUIRY_Byte5_3PC_Bit
+3PC bit definition.
+@constant kINQUIRY_Byte5_PROTECT_Bit
+PROTECT bit definition.
+@constant kINQUIRY_Byte5_SCCS_Mask
+Mask to use to test the SCCS bit.
+@constant kINQUIRY_Byte5_ACC_Mask
+Mask to use to test the ACC bit.
+@constant kINQUIRY_Byte5_TPGS_Mask
+Mask to use for the TPGS bits.
+@constant kINQUIRY_Byte5_3PC_Mask
+Mask to use to test the 3PC bit.
+@constant kINQUIRY_Byte5_PROTECT_Mask
+Mask to use to test the PROTECT bit.
+*/
+enum
+{
+	// Bit definitions
+	kINQUIRY_Byte5_SCCS_Bit					= 7,
+	kINQUIRY_Byte5_ACC_Bit					= 6,
+	// Bits 4-5: TPGS
+	kINQUIRY_Byte5_3PC_Bit					= 3,
+	// Bits 1-2: Reserved
+	kINQUIRY_Byte5_PROTECT_Bit				= 0,
+	
+	// Masks
+	kINQUIRY_Byte5_SCCS_Mask				= (1 << kINQUIRY_Byte5_SCCS_Bit),
+	kINQUIRY_Byte5_ACC_Mask					= (1 << kINQUIRY_Byte5_ACC_Bit),
+	kINQUIRY_Byte5_TPGS_Mask				= 0x18,
+	kINQUIRY_Byte5_3PC_Mask					= (1 << kINQUIRY_Byte5_3PC_Bit),
+	// Bits 1-2: Reserved
+	kINQUIRY_Byte5_PROTECT_Mask				= (1 << kINQUIRY_Byte5_PROTECT_Bit)
+};
+
+
+/*!
+@enum flags1 field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY flags1 field.
+@constant kINQUIRY_Byte6_ADDR16_Bit
+ADDR16 bit definition.
+@constant kINQUIRY_Byte6_MCHNGR_Bit
+MCHNGR bit definition.
+@constant kINQUIRY_Byte6_MULTIP_Bit
+MULTIP bit definition.
+@constant kINQUIRY_Byte6_VS_Bit
+VS bit definition.
+@constant kINQUIRY_Byte6_ENCSERV_Bit
+ENCSERV bit definition.
+@constant kINQUIRY_Byte6_BQUE_Bit
+BQUE bit definition.
+@constant kINQUIRY_Byte6_ADDR16_Mask
+Mask to use to test the ADDR16 bit.
+@constant kINQUIRY_Byte6_MCHNGR_Mask
+Mask to use to test the MCHNGR bit.
+@constant kINQUIRY_Byte6_MULTIP_Mask
+Mask to use to test the MULTIP bit.
+@constant kINQUIRY_Byte6_VS_Mask
+Mask to use to test the VS bit.
+@constant kINQUIRY_Byte6_ENCSERV_Mask
+Mask to use to test the ENCSERV bit.
+@constant kINQUIRY_Byte6_BQUE_Mask
+Mask to use to test the BQUE bit.
+*/
+enum
+{
+	// Byte offset
+	kINQUIRY_Byte6_Offset					= 6,
+	
+	// Bit definitions
+	kINQUIRY_Byte6_ADDR16_Bit				= 0,	// SPI Specific
+	// Bit 1 is Obsolete
+	// Bit 2 is Obsolete
+	kINQUIRY_Byte6_MCHNGR_Bit				= 3,
+	kINQUIRY_Byte6_MULTIP_Bit				= 4,
+	kINQUIRY_Byte6_VS_Bit					= 5,	
+	kINQUIRY_Byte6_ENCSERV_Bit				= 6,	
+	kINQUIRY_Byte6_BQUE_Bit					= 7,	
+
+	// Masks
+	kINQUIRY_Byte6_ADDR16_Mask				= (1 << kINQUIRY_Byte6_ADDR16_Bit),	// SPI Specific
+	// Bit 1 is Obsolete
+	// Bit 2 is Obsolete
+	kINQUIRY_Byte6_MCHNGR_Mask				= (1 << kINQUIRY_Byte6_MCHNGR_Bit),
+	kINQUIRY_Byte6_MULTIP_Mask				= (1 << kINQUIRY_Byte6_MULTIP_Bit),
+	kINQUIRY_Byte6_VS_Mask					= (1 << kINQUIRY_Byte6_VS_Bit),
+	kINQUIRY_Byte6_ENCSERV_Mask				= (1 << kINQUIRY_Byte6_ENCSERV_Bit),
+	kINQUIRY_Byte6_BQUE_Mask				= (1 << kINQUIRY_Byte6_BQUE_Bit)
+};
+
+
+/*!
+@enum flags2 field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY flags2 field.
+@constant kINQUIRY_Byte7_VS_Bit
+VS bit definition.
+@constant kINQUIRY_Byte7_CMDQUE_Bit
+CMDQUE bit definition.
+@constant kINQUIRY_Byte7_TRANDIS_Bit
+TRANDIS bit definition.
+@constant kINQUIRY_Byte7_LINKED_Bit
+LINKED bit definition.
+@constant kINQUIRY_Byte7_SYNC_Bit
+SYNC bit definition.
+@constant kINQUIRY_Byte7_WBUS16_Bit
+WBUS16 bit definition.
+@constant kINQUIRY_Byte7_RELADR_Bit
+RELADR bit definition.
+@constant kINQUIRY_Byte7_VS_Mask
+Mask to use to test the VS bit.
+@constant kINQUIRY_Byte7_CMDQUE_Mask
+Mask to use to test the CMDQUE bit.
+@constant kINQUIRY_Byte7_TRANDIS_Mask
+Mask to use to test the TRANDIS bit.
+@constant kINQUIRY_Byte7_LINKED_Mask
+Mask to use to test the LINKED bit.
+@constant kINQUIRY_Byte7_SYNC_Mask
+Mask to use to test the SYNC bit.
+@constant kINQUIRY_Byte7_WBUS16_Mask
+Mask to use to test the WBUS16 bit.
+@constant kINQUIRY_Byte7_RELADR_Mask
+Mask to use to test the RELADR bit.
+*/
+enum
+{
+	// Byte offset
+	kINQUIRY_Byte7_Offset					= 7,
+	
+	// Bit definitions
+	kINQUIRY_Byte7_VS_Bit					= 0,
+	kINQUIRY_Byte7_CMDQUE_Bit				= 1,
+	kINQUIRY_Byte7_TRANDIS_Bit				= 2,	// SPI Specific
+	kINQUIRY_Byte7_LINKED_Bit				= 3,
+	kINQUIRY_Byte7_SYNC_Bit					= 4,	// SPI Specific
+	kINQUIRY_Byte7_WBUS16_Bit				= 5,	// SPI Specific
+	// Bit 6 is Obsolete
+	kINQUIRY_Byte7_RELADR_Bit				= 7,
+	
+	// Masks
+	kINQUIRY_Byte7_VS_Mask					= (1 << kINQUIRY_Byte7_VS_Bit),
+	kINQUIRY_Byte7_CMDQUE_Mask				= (1 << kINQUIRY_Byte7_CMDQUE_Bit),
+	kINQUIRY_Byte7_TRANDIS_Mask				= (1 << kINQUIRY_Byte7_TRANDIS_Bit),// SPI Specific
+	kINQUIRY_Byte7_LINKED_Mask				= (1 << kINQUIRY_Byte7_LINKED_Bit),
+	kINQUIRY_Byte7_SYNC_Mask				= (1 << kINQUIRY_Byte7_SYNC_Bit),	// SPI Specific
+	kINQUIRY_Byte7_WBUS16_Mask				= (1 << kINQUIRY_Byte7_WBUS16_Bit),	// SPI Specific
+	// Bit 6 is Obsolete
+	kINQUIRY_Byte7_RELADR_Mask				= (1 << kINQUIRY_Byte7_RELADR_Bit)
+};
+
+
+/*!
+@enum Byte 56 features field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY Byte 56 field.
+Inquiry Byte 56 features (for devices that report an ANSI VERSION of
+kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant or later).
+These are SPI-3 Specific.
+@constant kINQUIRY_Byte56_IUS_Bit
+IUS bit definition.
+@constant kINQUIRY_Byte56_QAS_Bit
+QAS bit definition.
+@constant kINQUIRY_Byte56_IUS_Mask
+Mask to use to test the IUS bit.
+@constant kINQUIRY_Byte56_QAS_Mask
+Mask to use to test the QAS bit.
+@constant kINQUIRY_Byte56_CLOCKING_Mask
+Mask to use to test CLOCKING bits.
+@constant kINQUIRY_Byte56_CLOCKING_ONLY_ST
+Single-transition clocking only.
+@constant kINQUIRY_Byte56_CLOCKING_ONLY_DT
+Double-transition clocking only.
+@constant kINQUIRY_Byte56_CLOCKING_ST_AND_DT
+Single-transition and double-transition clocking.
+*/
+enum
+{
+	// Byte offset
+	kINQUIRY_Byte56_Offset					= 56,
+
+	// Bit definitions
+	kINQUIRY_Byte56_IUS_Bit					= 0,
+	kINQUIRY_Byte56_QAS_Bit					= 1,
+	// Bits 2 and 3 are the CLOCKING bits
+	// All other bits are reserved
+	
+	kINQUIRY_Byte56_IUS_Mask				= (1 << kINQUIRY_Byte56_IUS_Bit),
+	kINQUIRY_Byte56_QAS_Mask				= (1 << kINQUIRY_Byte56_QAS_Bit),
+	kINQUIRY_Byte56_CLOCKING_Mask			= 0x0C,
+
+	// Definitions for the CLOCKING bits
+	kINQUIRY_Byte56_CLOCKING_ONLY_ST		= 0x00,
+	kINQUIRY_Byte56_CLOCKING_ONLY_DT		= 0x04,
+	// kINQUIRY_Byte56_CLOCKING_RESERVED	= 0x08,
+	kINQUIRY_Byte56_CLOCKING_ST_AND_DT		= 0x0C
+};
+
+
+/*!
+@define kINQUIRY_VERSION_DESCRIPTOR_MaxCount
+Maximum number of INQUIRY version descriptors supported.
+*/
+#define	kINQUIRY_VERSION_DESCRIPTOR_MaxCount		8
+
+
+/*!
+@enum kINQUIRY_VERSION_DESCRIPTOR_SAT
+SAT specification version descriptor.
+*/
+enum
+{
+	kINQUIRY_VERSION_DESCRIPTOR_SAT					= 0x1EA0
+};
+
+
+/*
+IORegistry property names for information derived from the Inquiry data.
+The Peripheral Device Type is the only property that the 
+generic Logical Unit Drivers will use to match. These properties are
+listed in order of matching priority. First is the Peripheral Device Type.
+Second is the Vendor Identification. Third is the Product Identification.
+Last is the Product Revision Level. To match a particular product, you would
+specify the Peripheral Device Type, Vendor Identification, and Product
+Identification. To restrict the match to a particular firmware revision, you
+would add the Product Revision Level. To not match on a particular product,
+but on a particular vendor's products, you would only include the 
+Peripheral Device Type and the Vendor Identification.
+*/
+
+/*!
+@define kIOPropertySCSIPeripheralDeviceType
+SCSI Peripheral Device Type as reported in the INQUIRY data.
+*/
+#define kIOPropertySCSIPeripheralDeviceType			"Peripheral Device Type"
+
+/*!
+@define kIOPropertySCSIPeripheralDeviceTypeSize
+Size of the kIOPropertySCSIPeripheralDeviceType key.
+*/
+#define kIOPropertySCSIPeripheralDeviceTypeSize		8
+
+/* These properties are listed in order of matching priority */
+
+/*!
+@define kIOPropertySCSIVendorIdentification
+Vendor ID as reported in the INQUIRY data. Additional space characters (0x20)
+are truncated.
+*/
+#define kIOPropertySCSIVendorIdentification			"Vendor Identification"
+
+/*!
+@define kIOPropertySCSIProductIdentification
+Product ID as reported in the INQUIRY data. Additional space characters (0x20)
+are truncated.
+*/
+#define kIOPropertySCSIProductIdentification		"Product Identification"
+
+/*!
+@define kIOPropertySCSIProductRevisionLevel
+Product Revision Level as reported in the INQUIRY data.
+*/
+#define kIOPropertySCSIProductRevisionLevel			"Product Revision Level"
+
+
+/*!
+@enum INQUIRY Page Codes
+@discussion INQUIRY Page Codes to be used when EVPD is set in the
+INQUIRY command.
+@constant kINQUIRY_Page00_PageCode
+Page Code 00h.
+@constant kINQUIRY_Page80_PageCode
+Page Code 80h.
+@constant kINQUIRY_Page83_PageCode
+Page Code 83h.
+@constant kINQUIRY_Page89_PageCode
+Page Code 89h.
+*/
+enum
+{
+	kINQUIRY_Page00_PageCode				= 0x00,
+	kINQUIRY_Page80_PageCode				= 0x80,
+	kINQUIRY_Page83_PageCode				= 0x83,
+	kINQUIRY_Page89_PageCode				= 0x89
+};	
+
+
+/*!
+@struct SCSICmd_INQUIRY_Page00_Header
+@discussion INQUIRY Page 00h Header.
+*/
+typedef struct SCSICmd_INQUIRY_Page00_Header
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		PAGE_CODE;							// Must be equal to 00h
+	UInt8		RESERVED;							// reserved field
+	UInt8		PAGE_LENGTH;						// n-3 bytes
+} SCSICmd_INQUIRY_Page00_Header;
+
+
+/*!
+@struct SCSICmd_INQUIRY_Page80_Header
+@discussion INQUIRY Page 80h Header.
+*/
+typedef struct SCSICmd_INQUIRY_Page80_Header
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		PAGE_CODE;							// Must be equal to 80h
+	UInt8		RESERVED;							// reserved field
+	UInt8		PAGE_LENGTH;						// n-3 bytes
+	UInt8		PRODUCT_SERIAL_NUMBER;				// 4-n
+} SCSICmd_INQUIRY_Page80_Header;
+
+
+/*!
+@define kIOPropertySCSIINQUIRYUnitSerialNumber
+Key that describes the INQUIRY Unit Serial Number in the IORegistry.
+*/
+#define kIOPropertySCSIINQUIRYUnitSerialNumber		"INQUIRY Unit Serial Number"
+
+
+/*!
+@struct SCSICmd_INQUIRY_Page83_Header
+@discussion INQUIRY Page 83h Header.
+*/
+typedef struct SCSICmd_INQUIRY_Page83_Header
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		PAGE_CODE;							// Must be equal to 83h
+	UInt8		RESERVED;							// reserved field
+	UInt8		PAGE_LENGTH;						// n-3 bytes
+} SCSICmd_INQUIRY_Page83_Header;
+
+
+/*!
+@struct SCSICmd_INQUIRY_Page83_Header_SPC_16
+@discussion INQUIRY Page 83h Header used with the 16 byte INQUIRY command.
+*/
+typedef struct SCSICmd_INQUIRY_Page83_Header_SPC_16
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		PAGE_CODE;							// Must be equal to 83h
+	UInt16		PAGE_LENGTH;						// n-3 bytes
+} SCSICmd_INQUIRY_Page83_Header_SPC_16;
+
+
+/*!
+@struct SCSICmd_INQUIRY_Page83_Identification_Descriptor
+@discussion INQUIRY Page 83h Identification Descriptor.
+*/
+typedef struct SCSICmd_INQUIRY_Page83_Identification_Descriptor
+{
+	UInt8		CODE_SET;							// 7-4 = Protocol Identifier. 3-0 = Code Set
+	UInt8		IDENTIFIER_TYPE;					// 7 = PIV 5-4 = ASSOCIATION 3-0 = Identifier
+	UInt8		RESERVED;							
+	UInt8		IDENTIFIER_LENGTH;
+	UInt8		IDENTIFIER;
+} SCSICmd_INQUIRY_Page83_Identification_Descriptor;
+
+
+/*!
+@enum INQUIRY Page 83h Code Set
+@discussion
+Definitions for the Code Set field.
+@constant kINQUIRY_Page83_CodeSetBinaryData
+The identifier contains binary data.
+@constant kINQUIRY_Page83_CodeSetASCIIData
+The identifier contains ASCII data.
+@constant kINQUIRY_Page83_CodeSetUTF8Data
+The identifier contains UTF-8 data.
+*/
+enum
+{
+	kINQUIRY_Page83_CodeSetReserved			= 0x0,
+	kINQUIRY_Page83_CodeSetBinaryData		= 0x1,
+	kINQUIRY_Page83_CodeSetASCIIData		= 0x2,
+	kINQUIRY_Page83_CodeSetUTF8Data			= 0x3,
+	// 0x4 - 0xF reserved
+	kINQUIRY_Page83_CodeSetMask				= 0xF
+};	
+
+
+/*!
+@enum INQUIRY Page 83h Association
+@discussion
+Definitions for the Association field.
+@constant kINQUIRY_Page83_AssociationLogicalUnit
+Association of the identifier is with the logical unit.
+@constant kINQUIRY_Page83_AssociationDevice
+Association of the identifier is with the device (same as logical unit in SPC-2).
+@constant kINQUIRY_Page83_AssociationTargetPort
+Association of the identifier is with the target port.
+@constant kINQUIRY_Page83_AssociationTargetDevice
+Association of the identifier is with the target device (i.e. all ports).
+@constant kINQUIRY_Page83_AssociationMask
+Mask to use to determine association.
+*/
+enum
+{	
+	// SPC-3 - Association is changed to be specific to 
+	// Logical Units
+	kINQUIRY_Page83_AssociationLogicalUnit	= 0x00,
+	
+	// Backwards compatibility for SPC-2
+	kINQUIRY_Page83_AssociationDevice 		= kINQUIRY_Page83_AssociationLogicalUnit,
+	
+	// Association is related to a Target Port
+	kINQUIRY_Page83_AssociationTargetPort	= 0x10,
+	
+	// SPC-3 - Added as specific association to
+	// a Target device.
+	kINQUIRY_Page83_AssociationTargetDevice	= 0x20,
+	
+	kINQUIRY_Page83_AssociationMask			= 0x30
+};	
+		
+
+/*!
+@enum INQUIRY Page 83h Identifier Type
+@discussion
+Definitions for the Identifier Type field.
+@constant kINQUIRY_Page83_IdentifierTypeUndefined
+Undefined Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeVendorID
+Vendor Specific Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeIEEE_EUI64
+EUI-64 Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeNAAIdentifier
+NAA Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeRelativePortIdentifier
+Relative Target Port Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeTargetPortGroup
+Target Port Group Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeLogicalUnitGroup
+Logical Unit Group Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeMD5LogicalUnitIdentifier
+MD5 Logical Unit Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeSCSINameString
+SCSI Name String Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeMask
+Mask to use to determine association.
+@constant kINQUIRY_Page83_ProtocolIdentifierValidBit
+PIV Bit definition.
+@constant kINQUIRY_Page83_ProtocolIdentifierValidMask
+Mask to use to determine if PIV is set.
+*/
+enum
+{
+	kINQUIRY_Page83_IdentifierTypeUndefined					= 0,
+	kINQUIRY_Page83_IdentifierTypeVendorID					= 1,
+	kINQUIRY_Page83_IdentifierTypeIEEE_EUI64				= 2,
+	kINQUIRY_Page83_IdentifierTypeNAAIdentifier				= 3,
+	kINQUIRY_Page83_IdentifierTypeRelativePortIdentifier	= 4,
+	kINQUIRY_Page83_IdentifierTypeTargetPortGroup			= 5,
+	kINQUIRY_Page83_IdentifierTypeLogicalUnitGroup			= 6,
+	kINQUIRY_Page83_IdentifierTypeMD5LogicalUnitIdentifier  = 7,
+	kINQUIRY_Page83_IdentifierTypeSCSINameString			= 8,
+	// 0x9 - 0xF Reserved
+	
+	kINQUIRY_Page83_IdentifierTypeMask						= 0xF,
+	
+	kINQUIRY_Page83_ProtocolIdentifierValidBit				= 7,
+	kINQUIRY_Page83_ProtocolIdentifierValidMask				= (1 << kINQUIRY_Page83_ProtocolIdentifierValidBit)
+	
+};	
+
+// Backwards compatibility
+#define kINQUIRY_Page83_IdentifierTypeFCNameIdentifier		kINQUIRY_Page83_IdentifierTypeNAAIdentifier
+
+
+/*!
+@enum Protocol Identifier values
+@discussion
+Definitions for the protocol identifier values.
+@constant kSCSIProtocolIdentifier_FibreChannel
+FibreChannel Protocol Identifier.
+@constant kSCSIProtocolIdentifier_ParallelSCSI
+Parallel SCSI Protocol Identifier.
+@constant kSCSIProtocolIdentifier_SSA
+SSA Protocol Identifier.
+@constant kSCSIProtocolIdentifier_FireWire
+FireWire (IEEE-1394) Protocol Identifier.
+@constant kSCSIProtocolIdentifier_RDMA
+RDMA Protocol Identifier.
+@constant kSCSIProtocolIdentifier_iSCSI
+iSCSI Protocol Identifier.
+@constant kSCSIProtocolIdentifier_SAS
+SAS Protocol Identifier.
+@constant kSCSIProtocolIdentifier_ADT
+ADT Protocol Identifier.
+@constant kSCSIProtocolIdentifier_ATAPI
+ATAPI Protocol Identifier.
+@constant kSCSIProtocolIdentifier_None
+No Protocol Identifier.
+*/
+enum
+{
+	kSCSIProtocolIdentifier_FibreChannel					= 0,
+	kSCSIProtocolIdentifier_ParallelSCSI					= 1,
+	kSCSIProtocolIdentifier_SSA								= 2,
+	kSCSIProtocolIdentifier_FireWire						= 3,
+	kSCSIProtocolIdentifier_RDMA							= 4,
+	kSCSIProtocolIdentifier_iSCSI							= 5,
+	kSCSIProtocolIdentifier_SAS								= 6,
+	kSCSIProtocolIdentifier_ADT								= 7,
+	kSCSIProtocolIdentifier_ATAPI							= 8,
+	// 0x9-0xE Reserved
+	kSCSIProtocolIdentifier_None							= 0xF
+};
+
+
+/*!
+@define kIOPropertySCSIINQUIRYDeviceIdentification
+Device Identification key.
+*/
+#define kIOPropertySCSIINQUIRYDeviceIdentification		"INQUIRY Device Identification"
+
+
+/*!
+@define kIOPropertySCSIINQUIRYDeviceIdCodeSet
+Code Set type key.
+*/
+#define kIOPropertySCSIINQUIRYDeviceIdCodeSet			"Code Set"
+
+
+/*!
+@define kIOPropertySCSIINQUIRYDeviceIdType
+Identifier Type key.
+*/
+#define kIOPropertySCSIINQUIRYDeviceIdType				"Identifier Type"
+
+
+/*!
+@define kIOPropertySCSIINQUIRYDeviceIdAssociation
+Association key.
+*/
+#define kIOPropertySCSIINQUIRYDeviceIdAssociation		"Association"
+
+
+/*!
+@define kIOPropertySCSIINQUIRYDeviceIdentifier
+Identifier key (data or string).
+*/
+#define kIOPropertySCSIINQUIRYDeviceIdentifier			"Identifier"
+		
+
+/*!
+@struct SCSICmd_INQUIRY_Page89_Data
+@discussion INQUIRY Page 89h data as defined in the SAT 1.0
+specification. This section contians all structures and
+definitions used by the INQUIRY command in response to a request
+for page 89h - ATA information VPD Page.
+*/
+typedef struct SCSICmd_INQUIRY_Page89_Data
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		PAGE_CODE;							// Must be equal to 89h
+	UInt16		PAGE_LENGTH;						// Must be equal to 238h
+	UInt32		Reserved;
+	UInt8		SAT_VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
+	UInt8		SAT_PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
+	UInt8		SAT_PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
+	UInt8		ATA_DEVICE_SIGNATURE[20];
+	UInt8		COMMAND_CODE;
+	UInt8		Reserved2[3];
+	UInt8		IDENTIFY_DATA[512];
+} SCSICmd_INQUIRY_Page89_Data;
+
+
+/*!
+@define kIOPropertySATVendorIdentification
+Vendor Identification of the SATL.
+*/
+#define kIOPropertySATVendorIdentification			"SAT Vendor Identification"
+
+
+/*!
+@define kIOPropertySATProductIdentification
+Product Identification of the SATL.
+*/
+#define kIOPropertySATProductIdentification			"SAT Product Identification"
+
+
+/*!
+@define kIOPropertySATProductRevisonLevel
+Product Revision Level of the SATL.
+*/
+#define kIOPropertySATProductRevisonLevel			"SAT Product Revision Level"
+
+
+#endif	/* _IOKIT_SCSI_CMDS_INQUIRY_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_MODE_Definitions.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_MODE_Definitions.h.svn-base
new file mode 100644
index 0000000..8d9c250
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_MODE_Definitions.h.svn-base
@@ -0,0 +1,559 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_
+#define _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSI Request Sense Definitions
+	@discussion
+	This file contains all definitions for the data returned from
+	the MODE_SENSE_6 and MODE_SENSE_10 commands.
+*/
+
+#pragma pack(1)
+
+/*!
+@struct SPCModeParameterHeader6
+@discussion
+Mode Parameter Header for the MODE_SENSE_6 command.
+*/
+typedef struct SPCModeParameterHeader6
+{
+	UInt8		MODE_DATA_LENGTH;
+	UInt8		MEDIUM_TYPE;
+	UInt8		DEVICE_SPECIFIC_PARAMETER;
+	UInt8		BLOCK_DESCRIPTOR_LENGTH;
+} SPCModeParameterHeader6;
+
+
+/*!
+@struct SPCModeParameterHeader10
+@discussion
+Mode Parameter Header for the MODE_SENSE_10 command.
+*/
+typedef struct SPCModeParameterHeader10
+{
+	UInt16		MODE_DATA_LENGTH;
+	UInt8		MEDIUM_TYPE;
+	UInt8		DEVICE_SPECIFIC_PARAMETER;
+	UInt8		LONGLBA;
+	UInt8		RESERVED;
+	UInt16		BLOCK_DESCRIPTOR_LENGTH;
+} SPCModeParameterHeader10;
+
+
+/*!
+@enum Long LBA Bitfield definitions
+@discussion
+Long LBA Bitfield definitions for Mode Parameter Header
+for MODE_SENSE_10 command.
+@constant kModeSenseParameterHeader10_LongLBABit
+Bit to indicate Long LBA block descriptors follow.
+@constant kModeSenseParameterHeader10_LongLBAMask
+Mask to test for kModeSenseParameterHeader10_LongLBABit.
+*/
+enum
+{
+	kModeSenseParameterHeader10_LongLBABit	=  0,
+	kModeSenseParameterHeader10_LongLBAMask	=  (1 << kModeSenseParameterHeader10_LongLBABit),
+};
+
+
+/*!
+@enum Device Specific Parameter Bitfield definitions
+@discussion
+SBC definitions for Device Specific Parameter in the
+Mode Sense Header Block.
+@constant kModeSenseSBCDeviceSpecific_DPOFUABit
+Bit to indicate DPO and FUA bits are accepted by the device server.
+@constant kModeSenseSBCDeviceSpecific_WriteProtectBit
+Bit to indicate medium is write protected.
+@constant kModeSenseSBCDeviceSpecific_DPOFUAMask
+Mask to test for kModeSenseSBCDeviceSpecific_DPOFUABit.
+@constant kModeSenseSBCDeviceSpecific_WriteProtectMask
+Mask to test for kModeSenseSBCDeviceSpecific_WriteProtectBit.
+*/
+enum
+{
+	kModeSenseSBCDeviceSpecific_DPOFUABit	 		=  4,
+	kModeSenseSBCDeviceSpecific_WriteProtectBit	 	=  7,
+	kModeSenseSBCDeviceSpecific_DPOFUAMask 			=  (1 << kModeSenseSBCDeviceSpecific_DPOFUABit),
+	kModeSenseSBCDeviceSpecific_WriteProtectMask 	=  (1 << kModeSenseSBCDeviceSpecific_WriteProtectBit)
+};
+
+
+/*!
+@struct ModeParameterBlockDescriptor
+@discussion
+General mode parameter block descriptor.
+*/
+typedef struct ModeParameterBlockDescriptor
+{
+	UInt8		DENSITY_CODE;
+	UInt8		NUMBER_OF_BLOCKS[3];
+	UInt8		RESERVED;
+	UInt8		BLOCK_LENGTH[3];
+} ModeParameterBlockDescriptor;
+
+
+/*!
+@struct DASDModeParameterBlockDescriptor
+@discussion
+Direct Access Storage Device mode parameter block descriptor.
+*/
+typedef struct DASDModeParameterBlockDescriptor
+{
+	UInt32		NUMBER_OF_BLOCKS;
+	UInt8		DENSITY_CODE;
+	UInt8		BLOCK_LENGTH[3];
+} DASDModeParameterBlockDescriptor;
+
+
+/*!
+@struct LongLBAModeParameterBlockDescriptor
+@discussion
+Long LBA mode parameter block descriptor.
+*/
+typedef struct LongLBAModeParameterBlockDescriptor
+{
+	UInt64		NUMBER_OF_BLOCKS;
+	UInt8		DENSITY_CODE;
+	UInt8		RESERVED[3];
+	UInt32		BLOCK_LENGTH;
+} LongLBAModeParameterBlockDescriptor;
+
+
+/*!
+@struct ModePageFormatHeader
+@discussion
+Mode Page format header.
+*/
+typedef struct ModePageFormatHeader
+{
+	UInt8		PS_PAGE_CODE;
+	UInt8		PAGE_LENGTH;
+} ModePageFormatHeader;
+
+
+/*!
+@enum Mode Page Format bit definitions
+@discussion
+Mode Page Format bit definitions.
+@constant kModePageFormat_PS_Bit
+Bit to indicate Parameters Saveable.
+@constant kModePageFormat_PAGE_CODE_Mask
+Mask to obtain the PAGE_CODE from the PS_PAGE_CODE field.
+@constant kModePageFormat_PS_Mask
+Mask to test for kModePageFormat_PS_Bit.
+*/
+enum
+{
+	kModePageFormat_PS_Bit			= 7,
+	
+	kModePageFormat_PAGE_CODE_Mask	= 0x3F,
+	kModePageFormat_PS_Mask			= (1 << kModePageFormat_PS_Bit)
+};
+
+
+#if 0
+#pragma mark -
+#pragma mark SPC Mode Pages
+#pragma mark -
+#endif
+
+
+/*!
+@enum SPC Mode Pages
+@discussion
+SPC Mode Page definitions.
+@constant kSPCModePagePowerConditionCode
+Power Conditions Mode Page value.
+@constant kSPCModePageAllPagesCode
+All Mode Pages value.
+*/
+enum
+{
+	kSPCModePagePowerConditionCode		= 0x1A,
+	kSPCModePageAllPagesCode			= 0x3F
+};
+
+/*!
+@struct SPCModePagePowerCondition
+@discussion
+Power Conditions Mode Page (PAGE CODE 0x1A) format.
+*/
+typedef struct SPCModePagePowerCondition
+{
+	ModePageFormatHeader	header;
+	UInt8					RESERVED;
+	UInt8					IDLE_STANDBY;
+	UInt32					IDLE_CONDITION_TIMER;
+	UInt32					STANDBY_CONDITION_TIMER;
+} SPCModePagePowerCondition;
+
+
+#if 0
+#pragma mark -
+#pragma mark 0x00 SBC Direct Access Mode Pages
+#pragma mark -
+#endif
+
+
+/*!
+@enum SBC Mode Pages
+@discussion
+SBC Mode Page definitions.
+@constant kSBCModePageFormatDeviceCode
+Format Device Mode Page value.
+@constant kSBCModePageRigidDiskGeometryCode
+Rigid Disk Geometry Page value.
+@constant kSBCModePageFlexibleDiskCode
+Flexible Disk Page value.
+@constant kSBCModePageCachingCode
+Caching Page value.
+*/
+enum
+{
+	kSBCModePageFormatDeviceCode		= 0x03,
+	kSBCModePageRigidDiskGeometryCode	= 0x04,
+	kSBCModePageFlexibleDiskCode		= 0x05,
+	kSBCModePageCachingCode				= 0x08
+};
+
+
+/*!
+@struct SBCModePageFormatDevice
+@discussion
+Format Device Mode Page (PAGE CODE 0x03) format.
+*/
+typedef struct SBCModePageFormatDevice
+{
+	ModePageFormatHeader	header;
+	UInt16					TRACKS_PER_ZONE;
+	UInt16					ALTERNATE_SECTORS_PER_ZONE;
+	UInt16					ALTERNATE_TRACKS_PER_ZONE;
+	UInt16					ALTERNATE_TRACKS_PER_LOGICAL_UNIT;
+	UInt16					SECTORS_PER_TRACK;
+	UInt16					DATA_BYTES_PER_PHYSICAL_SECTOR;
+	UInt16					INTERLEAVE;
+	UInt16					TRACK_SKEW_FACTOR;
+	UInt16					CYLINDER_SKEW_FACTOR;
+	UInt8					SSEC_HSEC_RMB_SURF;
+	UInt8					RESERVED[3];
+} SBCModePageFormatDevice;
+
+
+/*!
+@struct SBCModePageRigidDiskGeometry
+@discussion
+Rigid Disk Geometry Mode Page (PAGE CODE 0x04) format.
+*/
+typedef struct SBCModePageRigidDiskGeometry
+{
+	ModePageFormatHeader	header;
+	UInt8					NUMBER_OF_CYLINDERS[3];
+	UInt8					NUMBER_OF_HEADS;
+	UInt8					STARTING_CYLINDER_WRITE_PRECOMPENSATION[3];
+	UInt8					STARTING_CYLINDER_REDUCED_WRITE_CURRENT[3];
+	UInt16					DEVICE_STEP_RATE;
+	UInt8					LANDING_ZONE_CYLINDER[3];
+	UInt8					RPL;
+	UInt8					ROTATIONAL_OFFSET;
+	UInt8					RESERVED;
+	UInt16					MEDIUM_ROTATION_RATE;
+	UInt8					RESERVED1[2];
+} SBCModePageRigidDiskGeometry;
+
+
+/*!
+@enum Rigid Disk Geometry bitfields
+@discussion
+Bit field masks for Rigid Disk Geometry structure fields.
+@constant kSBCModePageRigidDiskGeometry_RPL_Mask
+Mask for use with the RPL field.
+*/
+enum
+{
+	kSBCModePageRigidDiskGeometry_RPL_Mask	= 0x03
+};
+
+
+/*!
+@struct SBCModePageFlexibleDisk
+@discussion
+Flexible Disk Mode Page (PAGE CODE 0x05) format.
+*/
+typedef struct SBCModePageFlexibleDisk
+{
+	ModePageFormatHeader	header;
+	UInt16					TRANSFER_RATE;
+	UInt8					NUMBER_OF_HEADS;
+	UInt8					SECTORS_PER_TRACK;
+	UInt16					DATA_BYTES_PER_SECTOR;
+	UInt16					NUMBER_OF_CYLINDERS;
+	UInt16					STARTING_CYLINDER_WRITE_PRECOMPENSATION;
+	UInt16					STARTING_CYLINDER_REDUCED_WRITE_CURRENT;
+	UInt16					DEVICE_STEP_RATE;
+	UInt8					DEVICE_STEP_PULSE_WIDTH;
+	UInt16					HEAD_SETTLE_DELAY;
+	UInt8					MOTOR_ON_DELAY;
+	UInt8					MOTOR_OFF_DELAY;
+	UInt8					TRDY_SSN_MO;
+	UInt8					SPC;
+	UInt8					WRITE_COMPENSATION;
+	UInt8					HEAD_LOAD_DELAY;
+	UInt8					HEAD_UNLOAD_DELAY;
+	UInt8					PIN_34_PIN_2;
+	UInt8					PIN_4_PIN_1;
+	UInt16					MEDIUM_ROTATION_RATE;
+	UInt8					RESERVED[2];
+} SBCModePageFlexibleDisk;
+
+
+/*!
+@enum TRDY_SSN_MO bitfields
+@discussion
+Bit field definitions and masks for Flexible Disk TRDY_SSN_MO field.
+@constant kSBCModePageFlexibleDisk_MO_Bit
+MO Bit definition.
+@constant kSBCModePageFlexibleDisk_SSN_Bit
+SSN Bit definition.
+@constant kSBCModePageFlexibleDisk_TRDY_Bit
+TRDY Bit definition.
+@constant kSBCModePageFlexibleDisk_MO_Mask
+Mask for use with TRDY_SSN_MO field.
+@constant kSBCModePageFlexibleDisk_SSN_Mask
+Mask for use with TRDY_SSN_MO field.
+@constant kSBCModePageFlexibleDisk_TRDY_Mask
+Mask for use with TRDY_SSN_MO field.
+*/
+enum
+{
+	// Bits 0:4 Reserved
+	kSBCModePageFlexibleDisk_MO_Bit		= 5,
+	kSBCModePageFlexibleDisk_SSN_Bit	= 6,
+	kSBCModePageFlexibleDisk_TRDY_Bit	= 7,
+	
+	kSBCModePageFlexibleDisk_MO_Mask	= (1 << kSBCModePageFlexibleDisk_MO_Bit),
+	kSBCModePageFlexibleDisk_SSN_Mask	= (1 << kSBCModePageFlexibleDisk_SSN_Bit),
+	kSBCModePageFlexibleDisk_TRDY_Mask	= (1 << kSBCModePageFlexibleDisk_TRDY_Bit)
+};
+
+
+/*!
+@enum SPC bitfields
+@discussion
+Bit field definitions and masks for Flexible Disk SPC field.
+@constant kSBCModePageFlexibleDisk_SPC_Mask
+Mask for use with SPC field.
+*/
+enum
+{
+	kSBCModePageFlexibleDisk_SPC_Mask	= 0x0F
+};
+
+
+/*!
+@enum PIN_34_PIN_2 bitfields
+@discussion
+Bit field definitions and masks for Flexible Disk PIN_34_PIN_2 field.
+@constant kSBCModePageFlexibleDisk_PIN_2_Mask
+Mask for use with PIN_34_PIN_2 field.
+@constant kSBCModePageFlexibleDisk_PIN_34_Mask
+Mask for use with PIN_34_PIN_2 field.
+*/
+enum
+{
+	kSBCModePageFlexibleDisk_PIN_2_Mask		= 0x0F,
+	kSBCModePageFlexibleDisk_PIN_34_Mask	= 0xF0
+};
+
+
+/*!
+@enum PIN_4_PIN_1 bitfields
+@discussion
+Bit field definitions and masks for Flexible Disk PIN_4_PIN_1 field.
+@constant kSBCModePageFlexibleDisk_PIN_1_Mask
+Mask for use with PIN_4_PIN_1 field.
+@constant kSBCModePageFlexibleDisk_PIN_4_Mask
+Mask for use with PIN_4_PIN_1 field.
+*/
+enum
+{
+	kSBCModePageFlexibleDisk_PIN_1_Mask		= 0x0F,
+	kSBCModePageFlexibleDisk_PIN_4_Mask		= 0xF0
+};
+
+
+/*!
+@struct SBCModePageCaching
+@discussion
+Caching Mode Page (PAGE CODE 0x08) format.
+*/
+typedef struct SBCModePageCaching
+{
+	ModePageFormatHeader	header;
+	UInt8					flags;
+	UInt8					DEMAND_READ_WRITE_RETENTION_PRIORITY;
+	UInt16					DISABLE_PREFETCH_TRANSFER_LENGTH;
+	UInt16					MINIMUM_PREFETCH;
+	UInt16					MAXIMUM_PREFETCH;
+	UInt16					MAXIMUM_PREFETCH_CEILING;
+	UInt8					flags2;
+	UInt8					NUMBER_OF_CACHE_SEGMENTS;
+	UInt16					CACHE_SEGMENT_SIZE;
+	UInt8					RESERVED;
+	UInt8					NON_CACHE_SEGMENT_SIZE[3];
+} SBCModePageCaching;
+
+
+/*!
+@enum Caching flags bitfields
+@discussion
+Bit field definitions and masks for Caching flags field.
+@constant kSBCModePageCaching_RCD_Bit
+RCD Bit definition.
+@constant kSBCModePageCaching_MF_Bit
+MF Bit definition.
+@constant kSBCModePageCaching_WCE_Bit
+WCE Bit definition.
+@constant kSBCModePageCaching_SIZE_Bit
+SIZE Bit definition.
+@constant kSBCModePageCaching_DISC_Bit
+DISC Bit definition.
+@constant kSBCModePageCaching_CAP_Bit
+CAP Bit definition.
+@constant kSBCModePageCaching_ABPF_Bit
+ABPF Bit definition.
+@constant kSBCModePageCaching_IC_Bit
+IC Bit definition.
+@constant kSBCModePageCaching_RCD_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_MF_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_WCE_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_SIZE_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_DISC_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_CAP_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_ABPF_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_IC_Mask
+Mask for use with flags field.
+*/
+enum
+{
+	kSBCModePageCaching_RCD_Bit		= 0,
+	kSBCModePageCaching_MF_Bit		= 1,
+	kSBCModePageCaching_WCE_Bit		= 2,
+	kSBCModePageCaching_SIZE_Bit	= 3,
+	kSBCModePageCaching_DISC_Bit	= 4,
+	kSBCModePageCaching_CAP_Bit		= 5,
+	kSBCModePageCaching_ABPF_Bit	= 6,
+	kSBCModePageCaching_IC_Bit		= 7,
+
+	kSBCModePageCaching_RCD_Mask	= (1 << kSBCModePageCaching_RCD_Bit),
+	kSBCModePageCaching_MF_Mask		= (1 << kSBCModePageCaching_MF_Bit),
+	kSBCModePageCaching_WCE_Mask	= (1 << kSBCModePageCaching_WCE_Bit),
+	kSBCModePageCaching_SIZE_Mask	= (1 << kSBCModePageCaching_SIZE_Bit),
+	kSBCModePageCaching_DISC_Mask	= (1 << kSBCModePageCaching_DISC_Bit),
+	kSBCModePageCaching_CAP_Mask	= (1 << kSBCModePageCaching_CAP_Bit),
+	kSBCModePageCaching_ABPF_Mask	= (1 << kSBCModePageCaching_ABPF_Bit),
+	kSBCModePageCaching_IC_Mask		= (1 << kSBCModePageCaching_IC_Bit)
+};
+
+
+/*!
+@enum Demand Read/Write Retention masks
+@discussion
+Demand Read/Write Retention masks.
+@constant kSBCModePageCaching_DEMAND_WRITE_Mask
+Mask for the DEMAND_READ_WRITE_RETENTION_PRIORITY field.
+@constant kSBCModePageCaching_DEMAND_READ_Mask
+Mask for the DEMAND_READ_WRITE_RETENTION_PRIORITY field.
+*/
+enum
+{
+	kSBCModePageCaching_DEMAND_WRITE_Mask	= 0x00FF,
+	kSBCModePageCaching_DEMAND_READ_Mask 	= 0xFF00
+};
+
+/*!
+@enum Caching flags2 bitfields
+@discussion
+Bit field definitions and masks for Caching flags2 field.
+@constant kSBCModePageCaching_VS1_Bit
+VS1 Bit definition.
+@constant kSBCModePageCaching_VS2_Bit
+VS2 Bit definition.
+@constant kSBCModePageCaching_DRA_Bit
+DRA Bit definition.
+@constant kSBCModePageCaching_LBCSS_Bit
+LBCSS Bit definition.
+@constant kSBCModePageCaching_FSW_Bit
+FSW Bit definition.
+@constant kSBCModePageCaching_VS1_Mask
+Mask for use with flags2 field.
+@constant kSBCModePageCaching_VS2_Mask
+Mask for use with flags2 field.
+@constant kSBCModePageCaching_DRA_Mask
+Mask for use with flags2 field.
+@constant kSBCModePageCaching_LBCSS_Mask
+Mask for use with flags2 field.
+@constant kSBCModePageCaching_FSW_Mask
+Mask for use with flags2 field.
+*/
+enum
+{
+	// Bits 0:2 Reserved
+	kSBCModePageCaching_VS1_Bit		= 3,
+	kSBCModePageCaching_VS2_Bit		= 4,
+	kSBCModePageCaching_DRA_Bit		= 5,
+	kSBCModePageCaching_LBCSS_Bit	= 6,
+	kSBCModePageCaching_FSW_Bit		= 7,
+
+	kSBCModePageCaching_VS1_Mask	= (1 << kSBCModePageCaching_VS1_Bit),
+	kSBCModePageCaching_VS2_Mask	= (1 << kSBCModePageCaching_VS2_Bit),
+	kSBCModePageCaching_DRA_Mask	= (1 << kSBCModePageCaching_DRA_Bit),
+	kSBCModePageCaching_LBCSS_Mask	= (1 << kSBCModePageCaching_LBCSS_Bit),
+	kSBCModePageCaching_FSW_Mask	= (1 << kSBCModePageCaching_FSW_Bit)
+};
+
+#pragma options align=reset
+
+#endif	/* _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_READ_CAPACITY_Definitions.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_READ_CAPACITY_Definitions.h.svn-base
new file mode 100644
index 0000000..59abde3
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_READ_CAPACITY_Definitions.h.svn-base
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_CMDS_READ_CAPACITY_H_
+#define _IOKIT_SCSI_CMDS_READ_CAPACITY_H_
+
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSI Request Sense Definitions
+	@discussion
+	This file contains all definitions for the data returned from
+	the READ CAPACITY 10 (0x25) and READ CAPACITY 16 (0x9E) commands.
+*/
+
+/*!
+@enum READ CAPACITY Payload Sizes
+@discussion
+Sizes of the payload for the READ CAPACITY 10 and
+READ CAPACITY 16 commands.
+@constant kREPORT_CAPACITY_DataSize
+Data size for a READ_CAPACITY command.
+@constant kREPORT_CAPACITY_16_DataSize
+Data size for a READ_CAPACITY_16 command.
+*/
+enum
+{
+	kREPORT_CAPACITY_DataSize		= 8,
+	kREPORT_CAPACITY_16_DataSize	= 32
+};
+
+
+/*!
+@constant kREPORT_CAPACITY_MaximumLBA
+@discussion
+Maximum LBA supported via READ CAPACITY 10 command.
+*/
+#define 	kREPORT_CAPACITY_MaximumLBA			0xFFFFFFFFUL
+
+
+/*!
+@constant kREPORT_CAPACITY_16_MaximumLBA
+@discussion
+Maximum LBA supported via READ CAPACITY 16 command.
+*/
+#define 	kREPORT_CAPACITY_16_MaximumLBA		0xFFFFFFFFFFFFFFFFULL
+
+
+/*!
+@struct SCSI_Capacity_Data
+@discussion
+Capacity return structure for READ CAPACITY 10 command.
+*/
+typedef struct SCSI_Capacity_Data
+{
+	UInt32		RETURNED_LOGICAL_BLOCK_ADDRESS;
+	UInt32		BLOCK_LENGTH_IN_BYTES;
+} SCSI_Capacity_Data;
+
+
+/*!
+@struct SCSI_Capacity_Data_Long
+@discussion
+Capacity return structure for READ CAPACITY 16 command.
+*/
+typedef struct SCSI_Capacity_Data_Long
+{
+	UInt64		RETURNED_LOGICAL_BLOCK_ADDRESS;
+	UInt32		BLOCK_LENGTH_IN_BYTES;
+	UInt8		RTO_EN_PROT_EN;
+	UInt8		Reserved[19];
+} SCSI_Capacity_Data_Long;
+
+
+/*!
+@enum RTO_EN definitions
+@discussion
+Values for the REFERENCE TAG OWN (RTO_EN) bit in the
+READ CAPACITY Long Data structure.
+@constant kREAD_CAPACITY_RTO_Enabled
+Reference Tag Own enabled.
+@constant kREAD_CAPACITY_RTO_Disabled
+Reference Tag Own disabled.
+@constant kREAD_CAPACITY_RTO_Mask
+Mask to use when checking the RTO_EN_PROT_EN field.
+*/
+enum
+{
+	kREAD_CAPACITY_RTO_Enabled								= 0x02,
+	kREAD_CAPACITY_RTO_Disabled								= 0x00,
+	kREAD_CAPACITY_RTO_Mask									= 0x02
+};
+
+
+/*!
+@enum PROTECTION INFORMATION definitions
+@discussion
+Values for the PROTECTION INFORMATION (PROT_EN) bit in the
+READ CAPACITY Long Data structure.
+@constant kREAD_CAPACITY_PROT_Enabled
+Protection Information enabled.
+@constant kREAD_CAPACITY_PROT_Disabled
+Protection Information disabled.
+@constant kREAD_CAPACITY_PROT_Mask
+Mask to use when checking the RTO_EN_PROT_EN field.
+*/
+
+enum
+{
+	kREAD_CAPACITY_PROT_Enabled								= 0x01,
+	kREAD_CAPACITY_PROT_Disabled							= 0x00,
+	kREAD_CAPACITY_PROT_Mask								= 0x01
+};
+
+
+#endif	/* _IOKIT_SCSI_CMDS_READ_CAPACITY_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REPORT_LUNS_Definitions.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REPORT_LUNS_Definitions.h.svn-base
new file mode 100644
index 0000000..6616e84
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REPORT_LUNS_Definitions.h.svn-base
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_
+#define _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_
+
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSI Request Sense Definitions
+	@discussion
+	This file contains all definitions for the data returned from
+	the REPORT_LUNS (0xA0) command.
+*/
+
+
+/*!
+@struct SCSICmd_REPORT_LUNS_LUN_ENTRY
+@discussion
+This structure represents a single LUN entry in a LUN list
+returned via the REPORT_LUNS command.
+*/
+typedef struct SCSICmd_REPORT_LUNS_LUN_ENTRY
+{
+	UInt16		FIRST_LEVEL_ADDRESSING;
+	UInt16		SECOND_LEVEL_ADDRESSING;
+	UInt16		THIRD_LEVEL_ADDRESSING;
+	UInt16		FOURTH_LEVEL_ADDRESSING;
+} SCSICmd_REPORT_LUNS_LUN_ENTRY;
+
+
+/*!
+@constant kREPORT_LUNS_HeaderSize
+@discussion
+Size of the REPORT_LUNS header as defined in the SPC-3 specification.
+*/
+#define kREPORT_LUNS_HeaderSize		8
+
+/*!
+@enum REPORT_LUNS addressing methods.
+@discussion
+REPORT_LUNS addressing methods described in
+SAM-2 documents.
+@constant kREPORT_LUNS_ADDRESS_METHOD_PERIPHERAL_DEVICE
+Peripheral Device Addressing Method.
+@constant kREPORT_LUNS_ADDRESS_DEVICE_TYPE_SPECIFIC
+Device Type Specific Addressing Method.
+@constant kREPORT_LUNS_ADDRESS_METHOD_LOGICAL_UNIT
+Logical Unit Specific Addressing Method.
+@constant kREPORT_LUNS_ADDRESS_METHOD_OFFSET
+Offset to the address method data.
+*/
+enum
+{
+	kREPORT_LUNS_ADDRESS_METHOD_PERIPHERAL_DEVICE	= 0,
+	kREPORT_LUNS_ADDRESS_DEVICE_TYPE_SPECIFIC		= 1,
+	kREPORT_LUNS_ADDRESS_METHOD_LOGICAL_UNIT 		= 2,
+	// Reserved [3]
+	kREPORT_LUNS_ADDRESS_METHOD_OFFSET				= 14
+};
+
+
+/*!
+@struct REPORT_LUNS_LOGICAL_UNIT_ADDRESSING
+@discussion
+This structure represents a LUN Addressing scheme.
+*/
+typedef struct REPORT_LUNS_LOGICAL_UNIT_ADDRESSING
+{
+#ifdef __LITTLE_ENDIAN__
+	UInt16		LUN			: 5;
+	UInt16		BUS_NUMBER	: 3;
+	UInt16		TARGET		: 6;
+	UInt16		reserved2	: 1;
+	UInt16		reserved	: 1;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt16		reserved	: 1;
+	UInt16		reserved2	: 1;
+	UInt16		TARGET		: 6;
+	UInt16		BUS_NUMBER	: 3;
+	UInt16		LUN			: 5;
+#endif /* !__LITTLE_ENDIAN__ */
+} REPORT_LUNS_LOGICAL_UNIT_ADDRESSING;
+
+
+/*!
+@struct REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING
+@discussion
+This structure represents a Peripheral Device Addressing scheme.
+*/
+typedef struct REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING
+{
+#ifdef __LITTLE_ENDIAN__
+	UInt16		TARGET_LUN		: 8;
+	UInt16		BUS_IDENTIFIER	: 6;
+	UInt16		reserved2		: 1;
+	UInt16		reserved		: 1;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt16		reserved		: 1;
+	UInt16		reserved2		: 1;
+	UInt16		BUS_IDENTIFIER	: 6;
+	UInt16		TARGET_LUN		: 8;
+#endif /* !__LITTLE_ENDIAN__ */
+} REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING;
+
+
+/*!
+@struct SCSICmd_REPORT_LUNS_Header
+@discussion
+This structure defines the format of the data that is returned for
+the REPORT_LUNS command.
+*/
+typedef struct SCSICmd_REPORT_LUNS_Header
+{
+	UInt32							LUN_LIST_LENGTH;	// LUN list length in bytes.
+	UInt32							RESERVED;
+	SCSICmd_REPORT_LUNS_LUN_ENTRY	LUN[1];				// Variable length list. Must have at least LUN 0 if
+} SCSICmd_REPORT_LUNS_Header;							// Target supports REPORT_LUNS command.
+
+
+#endif	/* _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REQUEST_SENSE_Defs.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REQUEST_SENSE_Defs.h.svn-base
new file mode 100644
index 0000000..8cfabb0
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REQUEST_SENSE_Defs.h.svn-base
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_
+#define _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_
+
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSI Request Sense Definitions
+	@discussion
+	This file contains all definitions for the data returned from
+	the REQUEST SENSE (0x03) command and from auto sense on protocols
+	that support it.
+*/
+
+
+/*!
+@enum kSenseDefaultSize
+@discussion
+The default size for SCSI Request Sense data.
+*/
+enum
+{
+	kSenseDefaultSize	= 18
+};
+
+
+/*!
+@struct SCSI_Sense_Data
+@discussion
+The basic SCSI Request Sense data structure.
+*/
+typedef struct SCSI_Sense_Data
+{
+	UInt8		VALID_RESPONSE_CODE;				// 7 = Valid. 6-0 = Response Code.
+	UInt8		SEGMENT_NUMBER;						// Segment number
+	UInt8		SENSE_KEY;							// 7 = FILEMARK, 6 = EOM, 5 = ILI, 3-0 = SENSE KEY.
+	UInt8		INFORMATION_1;						// INFORMATION.
+	UInt8		INFORMATION_2;						// INFORMATION.
+	UInt8		INFORMATION_3;						// INFORMATION.
+	UInt8		INFORMATION_4;						// INFORMATION.
+	UInt8		ADDITIONAL_SENSE_LENGTH;			// Number of additional bytes available in sense data
+	UInt8		COMMAND_SPECIFIC_INFORMATION_1;		// Command Specific Information
+	UInt8		COMMAND_SPECIFIC_INFORMATION_2;		// Command Specific Information
+	UInt8		COMMAND_SPECIFIC_INFORMATION_3;		// Command Specific Information
+	UInt8		COMMAND_SPECIFIC_INFORMATION_4;		// Command Specific Information
+	UInt8		ADDITIONAL_SENSE_CODE;				// Additional Sense Code
+	UInt8		ADDITIONAL_SENSE_CODE_QUALIFIER;	// Additional Sense Code Qualifier
+	UInt8		FIELD_REPLACEABLE_UNIT_CODE;		// Field Replaceable Unit Code
+	UInt8		SKSV_SENSE_KEY_SPECIFIC_MSB;		// 7 = Sense Key Specific Valid bit, 6-0 Sense Key Specific MSB
+	UInt8		SENSE_KEY_SPECIFIC_MID;				// Sense Key Specific Middle
+	UInt8		SENSE_KEY_SPECIFIC_LSB;				// Sense Key Specific LSB
+} SCSI_Sense_Data;
+
+
+/*!
+@enum Sense Valid
+@discussion
+Masks to use to determine if sense data is valid or not.
+@constant kSENSE_DATA_VALID
+Sense data is valid.
+@constant kSENSE_NOT_DATA_VALID
+Sense data is not valid.
+@constant kSENSE_DATA_VALID_Mask
+Validity mask to use when checking the VALID_RESPONSE_CODE field.
+*/
+enum
+{
+	kSENSE_DATA_VALID										= 0x80,
+	kSENSE_NOT_DATA_VALID									= 0x00,
+	kSENSE_DATA_VALID_Mask									= 0x80
+};
+
+
+/*!
+@enum Sense Response Codes
+@discussion
+Masks and values to determine the Response Code.
+@constant kSENSE_RESPONSE_CODE_Current_Errors
+Response code indicating current errors are reported.
+@constant kSENSE_RESPONSE_CODE_Deferred_Errors
+Response code indicating deferred errors are reported.
+@constant kSENSE_RESPONSE_CODE_Mask
+Mask to use when checking the VALID_RESPONSE_CODE field.
+*/
+enum
+{
+	kSENSE_RESPONSE_CODE_Current_Errors						= 0x70,
+	kSENSE_RESPONSE_CODE_Deferred_Errors					= 0x71,
+	kSENSE_RESPONSE_CODE_Mask								= 0x7F
+};
+
+
+/*!
+@enum FILEMARK bit field definitions
+@discussion
+Masks and values to determine the FileMark bit field.
+@constant kSENSE_FILEMARK_Set
+Filemark bit is set.
+@constant kSENSE_FILEMARK_Not_Set
+Filemark bit is not set.
+@constant kSENSE_FILEMARK_Mask
+Mask to use when checking the SENSE_KEY field for the FILEMARK bit.
+*/
+enum
+{
+	kSENSE_FILEMARK_Set										= 0x80,
+	kSENSE_FILEMARK_Not_Set 								= 0x00,
+	kSENSE_FILEMARK_Mask 									= 0x80
+};
+
+
+/*!
+@enum EOM bit field definitions
+@discussion
+Masks and values to determine the End Of Medium bit field.
+@constant kSENSE_EOM_Set
+End Of Medium bit is set.
+@constant kSENSE_EOM_Not_Set
+End Of Medium bit is not set.
+@constant kSENSE_EOM_Mask
+Mask to use when checking the SENSE_KEY field for the EOM bit.
+*/
+enum
+{
+	kSENSE_EOM_Set											= 0x40,
+	kSENSE_EOM_Not_Set 										= 0x00,
+	kSENSE_EOM_Mask 										= 0x40
+};
+
+
+/*!
+@enum ILI bit field definitions
+@discussion
+Masks and values to determine the Incorrect Length Indicator bit field.
+@constant kSENSE_ILI_Set
+Incorrect Length Indicator bit is set.
+@constant kSENSE_ILI_Not_Set
+Incorrect Length Indicator bit is not set.
+@constant kSENSE_ILI_Mask
+Mask to use when checking the SENSE_KEY field for the ILI bit.
+*/
+enum
+{
+	kSENSE_ILI_Set											= 0x20,
+	kSENSE_ILI_Not_Set 										= 0x00,
+	kSENSE_ILI_Mask 										= 0x20
+};
+
+
+/*!
+@enum Sense Key definitions
+@discussion
+Masks and values to determine the SENSE_KEY.
+@constant kSENSE_KEY_NO_SENSE
+No sense data is present.
+@constant kSENSE_KEY_RECOVERED_ERROR
+A recovered error has occurred.
+@constant kSENSE_KEY_NOT_READY
+Device server is not ready.
+@constant kSENSE_KEY_MEDIUM_ERROR
+Device server detected a medium error.
+@constant kSENSE_KEY_HARDWARE_ERROR
+Device server detected a hardware error.
+@constant kSENSE_KEY_ILLEGAL_REQUEST
+Device server detected an illegal request.
+@constant kSENSE_KEY_UNIT_ATTENTION
+Device server indicates a unit attention condition.
+@constant kSENSE_KEY_DATA_PROTECT
+Device server indicates a data protect condition.
+@constant kSENSE_KEY_BLANK_CHECK
+Device server indicates a blank check condition.
+@constant kSENSE_KEY_VENDOR_SPECIFIC
+Device server indicates a vendor specific condition.
+@constant kSENSE_KEY_COPY_ABORTED
+Device server indicates a copy aborted condition.
+@constant kSENSE_KEY_ABORTED_COMMAND
+Device server indicates an aborted command condition.
+@constant kSENSE_KEY_VOLUME_OVERFLOW
+Device server indicates a volume overflow condition.
+@constant kSENSE_KEY_MISCOMPARE
+Device server indicates a miscompare condition.
+@constant kSENSE_KEY_Mask
+Mask to use when checking the SENSE_KEY field for the SENSE_KEY value.
+*/
+enum
+{
+	kSENSE_KEY_NO_SENSE										= 0x00,
+	kSENSE_KEY_RECOVERED_ERROR								= 0x01,
+	kSENSE_KEY_NOT_READY									= 0x02,
+	kSENSE_KEY_MEDIUM_ERROR									= 0x03,
+	kSENSE_KEY_HARDWARE_ERROR								= 0x04,
+	kSENSE_KEY_ILLEGAL_REQUEST								= 0x05,
+	kSENSE_KEY_UNIT_ATTENTION								= 0x06,
+	kSENSE_KEY_DATA_PROTECT									= 0x07,
+	kSENSE_KEY_BLANK_CHECK									= 0x08,
+	kSENSE_KEY_VENDOR_SPECIFIC								= 0x09,
+	kSENSE_KEY_COPY_ABORTED									= 0x0A,
+	kSENSE_KEY_ABORTED_COMMAND								= 0x0B,
+	/* SENSE KEY 0x0C is obsoleted */
+	kSENSE_KEY_VOLUME_OVERFLOW								= 0x0D,
+	kSENSE_KEY_MISCOMPARE									= 0x0E,
+	/* SENSE KEY 0x0F is reserved */
+	kSENSE_KEY_Mask 										= 0x0F
+};
+
+
+#endif	/* _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICommandDefinitions.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICommandDefinitions.h.svn-base
new file mode 100644
index 0000000..d33aed6
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/SCSICommandDefinitions.h.svn-base
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 2001-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_COMMAND_DEFINITIONS_H_
+#define _IOKIT_SCSI_COMMAND_DEFINITIONS_H_
+
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSICommandDefinitions
+	@discussion
+	This file contains all the definitions for types and constants that are
+	used by the command set classes for building CDBs. The field type
+	definitions are used for the parameters passed to a method that builds and
+	sends any SCSI defined command to clearly identify the type of value
+	expected for a parameter.
+	
+	The command methods will then use the appropriate mask to verify that the
+	value passed into a parameter is of the specified type.
+	
+	Currently only types and masks are defined for 8 bytes and smaller fields.
+	If a command is defined that uses a larger field, these should be expanded
+	to include those sizes.
+*/ 
+
+#pragma mark Field Type Definitions
+/* These are the type definitions used for the parameters of methods that
+ * build and send Command Descriptor Blocks.
+ */
+
+/* 1 Byte or smaller fields. */
+
+/*! @typedef SCSICmdField1Bit */
+typedef UInt8	SCSICmdField1Bit;
+
+/*! @typedef SCSICmdField2Bit */
+typedef UInt8	SCSICmdField2Bit;
+
+/*! @typedef SCSICmdField3Bit */
+typedef UInt8	SCSICmdField3Bit;
+
+/*! @typedef SCSICmdField4Bit */
+typedef UInt8	SCSICmdField4Bit;
+
+/*! @typedef SCSICmdField5Bit */
+typedef UInt8	SCSICmdField5Bit;
+
+/*! @typedef SCSICmdField6Bit */
+typedef UInt8	SCSICmdField6Bit;
+
+/*! @typedef SCSICmdField7Bit */
+typedef UInt8	SCSICmdField7Bit;
+
+/*! @typedef SCSICmdField1Byte */
+typedef UInt8	SCSICmdField1Byte;
+
+/* 2 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField9Bit */
+typedef UInt16	SCSICmdField9Bit;
+
+/*! @typedef SCSICmdField10Bit */
+typedef UInt16	SCSICmdField10Bit;
+
+/*! @typedef SCSICmdField11Bit */
+typedef UInt16	SCSICmdField11Bit;
+
+/*! @typedef SCSICmdField12Bit */
+typedef UInt16	SCSICmdField12Bit;
+
+/*! @typedef SCSICmdField13Bit */
+typedef UInt16	SCSICmdField13Bit;
+
+/*! @typedef SCSICmdField14Bit */
+typedef UInt16	SCSICmdField14Bit;
+
+/*! @typedef SCSICmdField15Bit */
+typedef UInt16	SCSICmdField15Bit;
+
+/*! @typedef SCSICmdField2Byte */
+typedef UInt16	SCSICmdField2Byte;
+
+/* 3 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField17Bit */
+typedef UInt32	SCSICmdField17Bit;
+
+/*! @typedef SCSICmdField18Bit */
+typedef UInt32	SCSICmdField18Bit;
+
+/*! @typedef SCSICmdField19Bit */
+typedef UInt32	SCSICmdField19Bit;
+
+/*! @typedef SCSICmdField20Bit */
+typedef UInt32	SCSICmdField20Bit;
+
+/*! @typedef SCSICmdField21Bit */
+typedef UInt32	SCSICmdField21Bit;
+
+/*! @typedef SCSICmdField22Bit */
+typedef UInt32	SCSICmdField22Bit;
+
+/*! @typedef SCSICmdField23Bit */
+typedef UInt32	SCSICmdField23Bit;
+
+/*! @typedef SCSICmdField3Byte */
+typedef UInt32	SCSICmdField3Byte;
+
+/* 4 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField25Bit */
+typedef UInt32	SCSICmdField25Bit;
+
+/*! @typedef SCSICmdField26Bit */
+typedef UInt32	SCSICmdField26Bit;
+
+/*! @typedef SCSICmdField27Bit */
+typedef UInt32	SCSICmdField27Bit;
+
+/*! @typedef SCSICmdField28Bit */
+typedef UInt32	SCSICmdField28Bit;
+
+/*! @typedef SCSICmdField29Bit */
+typedef UInt32	SCSICmdField29Bit;
+
+/*! @typedef SCSICmdField30Bit */
+typedef UInt32	SCSICmdField30Bit;
+
+/*! @typedef SCSICmdField31Bit */
+typedef UInt32	SCSICmdField31Bit;
+
+/*! @typedef SCSICmdField4Byte */
+typedef UInt32	SCSICmdField4Byte;
+
+/* 5 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField33Bit */
+typedef UInt64	SCSICmdField33Bit;
+
+/*! @typedef SCSICmdField34Bit */
+typedef UInt64	SCSICmdField34Bit;
+
+/*! @typedef SCSICmdField35Bit */
+typedef UInt64	SCSICmdField35Bit;
+
+/*! @typedef SCSICmdField36Bit */
+typedef UInt64	SCSICmdField36Bit;
+
+/*! @typedef SCSICmdField37Bit */
+typedef UInt64	SCSICmdField37Bit;
+
+/*! @typedef SCSICmdField38Bit */
+typedef UInt64	SCSICmdField38Bit;
+
+/*! @typedef SCSICmdField39Bit */
+typedef UInt64	SCSICmdField39Bit;
+
+/*! @typedef SCSICmdField5Byte */
+typedef UInt64	SCSICmdField5Byte;
+
+/* 6 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField41Bit */
+typedef UInt64	SCSICmdField41Bit;
+
+/*! @typedef SCSICmdField42Bit */
+typedef UInt64	SCSICmdField42Bit;
+
+/*! @typedef SCSICmdField43Bit */
+typedef UInt64	SCSICmdField43Bit;
+
+/*! @typedef SCSICmdField44Bit */
+typedef UInt64	SCSICmdField44Bit;
+
+/*! @typedef SCSICmdField45Bit */
+typedef UInt64	SCSICmdField45Bit;
+
+/*! @typedef SCSICmdField46Bit */
+typedef UInt64	SCSICmdField46Bit;
+
+/*! @typedef SCSICmdField47Bit */
+typedef UInt64	SCSICmdField47Bit;
+
+/*! @typedef SCSICmdField6Byte */
+typedef UInt64	SCSICmdField6Byte;
+
+/* 7 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField49Bit */
+typedef UInt64	SCSICmdField49Bit;
+
+/*! @typedef SCSICmdField50Bit */
+typedef UInt64	SCSICmdField50Bit;
+
+/*! @typedef SCSICmdField51Bit */
+typedef UInt64	SCSICmdField51Bit;
+
+/*! @typedef SCSICmdField52Bit */
+typedef UInt64	SCSICmdField52Bit;
+
+/*! @typedef SCSICmdField53Bit */
+typedef UInt64	SCSICmdField53Bit;
+
+/*! @typedef SCSICmdField54Bit */
+typedef UInt64	SCSICmdField54Bit;
+
+/*! @typedef SCSICmdField55Bit */
+typedef UInt64	SCSICmdField55Bit;
+
+/*! @typedef SCSICmdField7Byte */
+typedef UInt64	SCSICmdField7Byte;
+
+/* 8 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField57Bit */
+typedef UInt64	SCSICmdField57Bit;
+
+/*! @typedef SCSICmdField58Bit */
+typedef UInt64	SCSICmdField58Bit;
+
+/*! @typedef SCSICmdField59Bit */
+typedef UInt64	SCSICmdField59Bit;
+
+/*! @typedef SCSICmdField60Bit */
+typedef UInt64	SCSICmdField60Bit;
+
+/*! @typedef SCSICmdField61Bit */
+typedef UInt64	SCSICmdField61Bit;
+
+/*! @typedef SCSICmdField62Bit */
+typedef UInt64	SCSICmdField62Bit;
+
+/*! @typedef SCSICmdField63Bit */
+typedef UInt64	SCSICmdField63Bit;
+
+/*! @typedef SCSICmdField8Byte */
+typedef UInt64	SCSICmdField8Byte;
+
+
+#pragma mark Field Mask Definitions
+/* These are masks that are used to verify that the values passed into the
+ * parameters for the fields are not larger than the field size.
+ *
+ * NB: These have changed from enums to #define since enums greater than
+ * 32 bits in size are not well-defined in C99.
+ */
+
+/* 1 Byte or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask1Bit */
+#define 	kSCSICmdFieldMask1Bit		0x01
+
+/*! @constant kSCSICmdFieldMask2Bit */
+#define 	kSCSICmdFieldMask2Bit		0x03
+
+/*! @constant kSCSICmdFieldMask3Bit */
+#define 	kSCSICmdFieldMask3Bit		0x07
+
+/*! @constant kSCSICmdFieldMask4Bit */
+#define 	kSCSICmdFieldMask4Bit		0x0F
+
+/*! @constant kSCSICmdFieldMask5Bit */
+#define 	kSCSICmdFieldMask5Bit		0x1F
+
+/*! @constant kSCSICmdFieldMask6Bit */
+#define 	kSCSICmdFieldMask6Bit		0x3F
+
+/*! @constant kSCSICmdFieldMask7Bit */
+#define 	kSCSICmdFieldMask7Bit		0x7F
+
+#define 	kSCSICmdFieldMask1Byte		0xFF
+
+/* 2 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask9Bit */
+#define 	kSCSICmdFieldMask9Bit		0x01FF
+
+/*! @constant kSCSICmdFieldMask10Bit */
+#define 	kSCSICmdFieldMask10Bit		0x03FF
+
+/*! @constant kSCSICmdFieldMask11Bit */
+#define 	kSCSICmdFieldMask11Bit		0x07FF
+
+/*! @constant kSCSICmdFieldMask12Bit */
+#define 	kSCSICmdFieldMask12Bit		0x0FFF
+
+/*! @constant kSCSICmdFieldMask13Bit */
+#define 	kSCSICmdFieldMask13Bit		0x1FFF
+
+/*! @constant kSCSICmdFieldMask14Bit */
+#define 	kSCSICmdFieldMask14Bit		0x3FFF
+
+/*! @constant kSCSICmdFieldMask15Bit */
+#define 	kSCSICmdFieldMask15Bit		0x7FFF
+
+/*! @constant kSCSICmdFieldMask2Byte */
+#define 	kSCSICmdFieldMask2Byte		0xFFFF
+
+/* 3 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask17Bit */
+#define 	kSCSICmdFieldMask17Bit		0x01FFFF
+
+/*! @constant kSCSICmdFieldMask18Bit */
+#define 	kSCSICmdFieldMask18Bit		0x03FFFF
+
+/*! @constant kSCSICmdFieldMask19Bit */
+#define 	kSCSICmdFieldMask19Bit		0x07FFFF
+
+/*! @constant kSCSICmdFieldMask20Bit */
+#define 	kSCSICmdFieldMask20Bit		0x0FFFFF
+
+/*! @constant kSCSICmdFieldMask21Bit */
+#define 	kSCSICmdFieldMask21Bit		0x1FFFFF
+
+/*! @constant kSCSICmdFieldMask22Bit */
+#define 	kSCSICmdFieldMask22Bit		0x3FFFFF
+
+/*! @constant kSCSICmdFieldMask23Bit */
+#define 	kSCSICmdFieldMask23Bit		0x7FFFFF
+
+/*! @constant kSCSICmdFieldMask3Byte */
+#define 	kSCSICmdFieldMask3Byte		0xFFFFFF
+
+/* 4 Bytes or smaller fields. */
+/*! @constant kSCSICmdFieldMask25Bit */
+#define 	kSCSICmdFieldMask25Bit		0x01FFFFFFUL
+
+/*! @constant kSCSICmdFieldMask26Bit */
+#define 	kSCSICmdFieldMask26Bit		0x03FFFFFFUL
+
+/*! @constant kSCSICmdFieldMask27Bit */
+#define 	kSCSICmdFieldMask27Bit		0x07FFFFFFUL
+
+/*! @constant kSCSICmdFieldMask28Bit */
+#define 	kSCSICmdFieldMask28Bit		0x0FFFFFFFUL
+
+/*! @constant kSCSICmdFieldMask29Bit */
+#define 	kSCSICmdFieldMask29Bit		0x1FFFFFFFUL
+
+/*! @constant kSCSICmdFieldMask30Bit */
+#define 	kSCSICmdFieldMask30Bit		0x3FFFFFFFUL
+
+/*! @constant kSCSICmdFieldMask31Bit */
+#define 	kSCSICmdFieldMask31Bit		0x7FFFFFFFUL
+
+/*! @constant kSCSICmdFieldMask4Byte */
+#define 	kSCSICmdFieldMask4Byte		0xFFFFFFFFUL
+
+/* 5 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask33Bit */
+#define 	kSCSICmdFieldMask33Bit		0x01FFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask34Bit */
+#define 	kSCSICmdFieldMask34Bit		0x03FFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask35Bit */
+#define 	kSCSICmdFieldMask35Bit		0x07FFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask36Bit */
+#define 	kSCSICmdFieldMask36Bit		0x0FFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask37Bit */
+#define 	kSCSICmdFieldMask37Bit		0x1FFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask38Bit */
+#define 	kSCSICmdFieldMask38Bit		0x3FFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask39Bit */
+#define 	kSCSICmdFieldMask39Bit		0x7FFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask5Byte */
+#define 	kSCSICmdFieldMask5Byte		0xFFFFFFFFFFULL
+
+/* 6 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask41Bit */
+#define 	kSCSICmdFieldMask41Bit		0x01FFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask42Bit */
+#define 	kSCSICmdFieldMask42Bit		0x03FFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask43Bit */
+#define 	kSCSICmdFieldMask43Bit		0x07FFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask44Bit */
+#define 	kSCSICmdFieldMask44Bit		0x0FFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask45Bit */
+#define 	kSCSICmdFieldMask45Bit		0x1FFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask46Bit */
+#define 	kSCSICmdFieldMask46Bit		0x3FFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask47Bit */
+#define 	kSCSICmdFieldMask47Bit		0x7FFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask6Byte */
+#define 	kSCSICmdFieldMask6Byte		0xFFFFFFFFFFFFULL
+
+/* 7 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask49Bit */
+#define 	kSCSICmdFieldMask49Bit		0x01FFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask50Bit */
+#define 	kSCSICmdFieldMask50Bit		0x03FFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask51Bit */
+#define 	kSCSICmdFieldMask51Bit		0x07FFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask52Bit */
+#define 	kSCSICmdFieldMask52Bit		0x0FFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask53Bit */
+#define 	kSCSICmdFieldMask53Bit		0x1FFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask54Bit */
+#define 	kSCSICmdFieldMask54Bit		0x3FFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask55Bit */
+#define 	kSCSICmdFieldMask55Bit		0x7FFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask7Byte */
+#define 	kSCSICmdFieldMask7Byte		0xFFFFFFFFFFFFFFULL
+
+/* 8 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask57Bit */
+#define 	kSCSICmdFieldMask57Bit		0x01FFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask58Bit */
+#define 	kSCSICmdFieldMask58Bit		0x03FFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask59Bit */
+#define 	kSCSICmdFieldMask59Bit		0x07FFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask60Bit */
+#define 	kSCSICmdFieldMask60Bit		0x0FFFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask61Bit */
+#define 	kSCSICmdFieldMask61Bit		0x1FFFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask62Bit */
+#define 	kSCSICmdFieldMask62Bit		0x3FFFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask63Bit */
+#define 	kSCSICmdFieldMask63Bit		0x7FFFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask8Byte */
+#define 	kSCSICmdFieldMask8Byte		0xFFFFFFFFFFFFFFFFULL
+
+#endif	/* _IOKIT_SCSI_COMMAND_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICommandOperationCodes.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICommandOperationCodes.h.svn-base
new file mode 100644
index 0000000..21d9d1e
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/SCSICommandOperationCodes.h.svn-base
@@ -0,0 +1,941 @@
+/*
+ * Copyright (c) 2001-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _SCSI_COMMAND_OPERATION_CODES_H_
+#define _SCSI_COMMAND_OPERATION_CODES_H_
+
+#pragma mark About this file
+/* This file contains the operation code definitions for all commands defined
+ * by the SCSI specifications.  The commands are listed in three formats:
+ * 1) All commands are listed in alphabetical order.  This list is the live
+ * enumeration for all of the command constants.
+ * 2) The commands are listed in ascending numerical order.
+ * 3) The commands are grouped by Peripheral Device Type.
+ * 
+ * In the command listings by Peripheral Device Type, there will be a comment
+ * following each command.  This comment indentifies the section of the related
+ * specification where the commands is defined and the requirement type of the
+ * command, Mandatory or Optional.
+ * If a specification redefines an optional command from SPC as mandatory,
+ * the command will be relisted in the Peripheral Device Type command list with
+ * the mandatory tag next to it.
+ * All commands that are listed in SPC as Device Type Specifc will be relisted
+ * as a comment in all specifications lists that support that command with the
+ * appropriate Mandatory or Optional tag for that specification.
+ *
+ * The section number and the requirement type of the command are based on the 
+ * version of the specification listed in the header comment for the Peripheral
+ * Device Type.  This data is provided for informational purposes only.  The 
+ * specification document and version that the device adheres to as indicated 
+ * by the data returned in response to the INQUIRY command should be used as
+ * the authorative source for supported and required behavior of the device.
+ * 
+ * The SPC set is listed before all other Peripheral Device Type commands as
+ * this is the base document from which all of the other documents are derived.  
+ *
+ * The Peripheral Device Types and associated command sets as defined by SPC-2,
+ * section 7.4.1 are as follows:
+ *  Peripheral Device Type                  Associated Command Specification
+ *  ------------------------------------    -----------------------------------
+ *  0x00 Direct Access Device               SBC - SCSI-3 Block Commands
+ *  0x01 Sequential Access Device           SSC - SCSI-3 Stream Commands
+ *  0x02 Printer Device                     SSC - SCSI-3 Stream Commands
+ *  0x03 Processor Device                   SPC - SCSI Primary Commands-2
+ *  0x04 Write Once Device                  SBC - SCSI-3 Block Commands
+ *  0x05 CD-ROM Device                      MMC - SCSI Multimedia Commands-2
+ *  0x06 Scanner Device                     SGC - SCSI-3 Graphics Commands
+ *  0x07 Optical Memory Device              SBC - SCSI-3 Block Commands
+ *  0x08 Medium Changer Device              SMC - SCSI-3 Medium Changer Cmds
+ *  0x09 Communications Device              SSC - SCSI-3 Stream Commands
+ *  0x0A - 0x0B Graphic Arts Prepress Dev   ASC IT8
+ *  0x0C Storage Array Controller Device    SCC-2 - SCSI Controller Commands-2
+ *  0x0D Enclosure Services                 SES - SCSI-3 Enclosure Services
+ *  0x0E Simplified Direct Access Device    RBC - SCSI Reduced Block Commands
+ *  0x0F Optical Card Reader/Writer Device  OCRW - SCSI Specification for 
+ *                                              Optical Card Reader/Writer
+ *  0x10 Reserved                    		No command specification
+ *	0x11 Object-Based Storage Device		OSD - SCSI Object Based Storage 
+ *												Device Commands
+ *  0x12 - 0x14 Reserved                    No command specification
+ *  0x15 Multimedia Media Access Engine     RMC - Reduced Multimedia Commands
+ *  0x16 - 0x1E Reserved                    No command specification
+ *  0x1F Unknown or No Device               No command specification
+ */ 
+
+#pragma mark -
+#pragma mark Command Definitions by Name
+/* All SCSI Commands listed in alphabetical order.  These are the live
+ * definitions of the commands.  All other command lists are informative.
+ */
+enum 
+{
+    kSCSICmd_ACCESS_CONTROL_IN              = 0x86,
+    kSCSICmd_ACCESS_CONTROL_OUT             = 0x87,
+    kSCSICmd_BLANK                          = 0xA1,
+    kSCSICmd_CHANGE_DEFINITION              = 0x40,
+    kSCSICmd_CLOSE_TRACK_SESSION            = 0x5B,
+    kSCSICmd_COMPARE                        = 0x39,
+    kSCSICmd_COPY                           = 0x18,
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A,
+    kSCSICmd_ERASE_10						= 0x2C,
+    kSCSICmd_ERASE_12						= 0xAC,
+    kSCSICmd_EXTENDED_COPY                  = 0x83,
+    kSCSICmd_FORMAT_UNIT                    = 0x04,
+    kSCSICmd_GET_CONFIGURATION              = 0x46,
+    kSCSICmd_GET_EVENT_STATUS_NOTIFICATION  = 0x4A,
+    kSCSICmd_GET_PERFORMANCE                = 0xAC,
+    kSCSICmd_INQUIRY                        = 0x12,
+    kSCSICmd_LOAD_UNLOAD_MEDIUM             = 0xA6,
+    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36,
+    kSCSICmd_LOCK_UNLOCK_CACHE_16           = 0x92,
+    kSCSICmd_LOG_SELECT                     = 0x4C,
+    kSCSICmd_LOG_SENSE                      = 0x4D,
+    kSCSICmd_MAINTENANCE_IN               	= 0xA3,
+    kSCSICmd_MAINTENANCE_OUT                = 0xA4,
+    kSCSICmd_MECHANISM_STATUS               = 0xBD,
+    kSCSICmd_MEDIUM_SCAN                    = 0x38,
+    kSCSICmd_MODE_SELECT_6                  = 0x15,
+    kSCSICmd_MODE_SELECT_10                 = 0x55,
+    kSCSICmd_MODE_SENSE_6                   = 0x1A,
+    kSCSICmd_MODE_SENSE_10                  = 0x5A,
+    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7,
+    kSCSICmd_PAUSE_RESUME                   = 0x4B,
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E,
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F,
+    kSCSICmd_PLAY_AUDIO_10                  = 0x45,
+    kSCSICmd_PLAY_AUDIO_12                  = 0xA5,
+    kSCSICmd_PLAY_AUDIO_MSF                 = 0x47,
+    kSCSICmd_PLAY_AUDIO_TRACK_INDEX         = 0x48,
+    kSCSICmd_PLAY_CD                        = 0xBC,
+    kSCSICmd_PLAY_RELATIVE_10               = 0x49,
+    kSCSICmd_PLAY_RELATIVE_12               = 0xA9,
+    kSCSICmd_PREFETCH                       = 0x34,
+    kSCSICmd_PREFETCH_16                    = 0x90,
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E,
+    kSCSICmd_READ_6                         = 0x08,
+    kSCSICmd_READ_10                        = 0x28,
+    kSCSICmd_READ_12                        = 0xA8,
+    kSCSICmd_READ_16                        = 0x88,
+    kSCSICmd_READ_ATTRIBUTE                 = 0x8C,
+    kSCSICmd_READ_BUFFER                    = 0x3C,
+    kSCSICmd_READ_BUFFER_CAPACITY           = 0x5C,
+    kSCSICmd_READ_CAPACITY                  = 0x25,
+    kSCSICmd_READ_CD                        = 0xBE,
+    kSCSICmd_READ_CD_MSF                    = 0xB9,
+    kSCSICmd_READ_DEFECT_DATA_10            = 0x37,
+    kSCSICmd_READ_DEFECT_DATA_12            = 0xB7,
+    kSCSICmd_READ_DISC_INFORMATION          = 0x51,
+    kSCSICmd_READ_DVD_STRUCTURE             = 0xAD,
+    kSCSICmd_READ_DISC_STRUCTURE            = 0xAD,
+    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4,
+    kSCSICmd_READ_FORMAT_CAPACITIES         = 0x23,
+    kSCSICmd_READ_GENERATION				= 0x29,
+    kSCSICmd_READ_HEADER                    = 0x44,
+    kSCSICmd_READ_LONG                      = 0x3E,
+    kSCSICmd_READ_MASTER_CUE                = 0x59,
+    kSCSICmd_READ_SUB_CHANNEL               = 0x42,
+    kSCSICmd_READ_TOC_PMA_ATIP              = 0x43,
+    kSCSICmd_READ_TRACK_INFORMATION         = 0x52,
+    kSCSICmd_READ_UPDATED_BLOCK_10			= 0x2D,
+    kSCSICmd_REASSIGN_BLOCKS                = 0x07,
+    kSCSICmd_REBUILD                        = 0x81,
+    kSCSICmd_RECEIVE                        = 0x08,
+    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84,
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C,
+    kSCSICmd_REDUNDANCY_GROUP_IN			= 0xBA,
+    kSCSICmd_REDUNDANCY_GROUP_OUT			= 0xBB,
+    kSCSICmd_REGENERATE                     = 0x82,
+    kSCSICmd_RELEASE_6                      = 0x17,
+    kSCSICmd_RELEASE_10                     = 0x57,
+    kSCSICmd_REPAIR_TRACK                   = 0x58,
+    kSCSICmd_REPORT_DEVICE_IDENTIFIER    	= 0xA3,
+    kSCSICmd_REPORT_KEY                     = 0xA4,
+    kSCSICmd_REPORT_LUNS                    = 0xA0, 
+    kSCSICmd_REQUEST_SENSE                  = 0x03,
+    kSCSICmd_RESERVE_6                      = 0x16,
+    kSCSICmd_RESERVE_10                     = 0x56,
+    kSCSICmd_RESERVE_TRACK                  = 0x53,
+    kSCSICmd_REZERO_UNIT                    = 0x01,
+    kSCSICmd_SCAN_MMC                       = 0xBA,
+    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31,
+    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1,
+    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30,
+    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0,
+    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32,
+    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2,
+    kSCSICmd_SEEK_6                         = 0x0B,
+    kSCSICmd_SEEK_10                        = 0x2B,
+    kSCSICmd_SEND                           = 0x0A,
+    kSCSICmd_SEND_CUE_SHEET                 = 0x5D,
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D,
+    kSCSICmd_SEND_DVD_STRUCTURE             = 0xBF,
+    kSCSICmd_SEND_EVENT                     = 0xA2,
+    kSCSICmd_SEND_KEY                       = 0xA3,
+    kSCSICmd_SEND_OPC_INFORMATION           = 0x54,
+    kSCSICmd_SERVICE_ACTION_IN		        = 0x9E,
+    kSCSICmd_SERVICE_ACTION_OUT		        = 0x9F,
+    kSCSICmd_SET_CD_SPEED                   = 0xBB,
+    kSCSICmd_SET_DEVICE_IDENTIFIER      	= 0xA4,
+    kSCSICmd_SET_LIMITS_10                  = 0x33,
+    kSCSICmd_SET_LIMITS_12                  = 0xB3,
+    kSCSICmd_SET_READ_AHEAD                 = 0xA7,
+    kSCSICmd_SET_STREAMING                  = 0xB6,
+    kSCSICmd_SPARE_IN		                = 0xBC,
+    kSCSICmd_SPARE_OUT		                = 0xBD,
+    kSCSICmd_START_STOP_UNIT                = 0x1B,
+    kSCSICmd_STOP_PLAY_SCAN                 = 0x4E,
+    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35,
+    kSCSICmd_SYNCHRONIZE_CACHE_16           = 0x91,
+    kSCSICmd_TEST_UNIT_READY                = 0x00,
+	kSCSICmd_UPDATE_BLOCK					= 0x3D,
+    kSCSICmd_VERIFY_10                      = 0x2F,
+    kSCSICmd_VERIFY_12                      = 0xAF,
+    kSCSICmd_VERIFY_16                      = 0x8F,
+    kSCSICmd_VOLUME_SET_IN                  = 0xBE,
+    kSCSICmd_VOLUME_SET_OUT                 = 0xBF,
+    kSCSICmd_WRITE_6                        = 0x0A,
+    kSCSICmd_WRITE_10                       = 0x2A,
+    kSCSICmd_WRITE_12                       = 0xAA,
+    kSCSICmd_WRITE_16                       = 0x8A,
+    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E,
+	kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE,
+	kSCSICmd_WRITE_AND_VERIFY_16            = 0x8E,
+	kSCSICmd_WRITE_ATTRIBUTE	            = 0x8D,
+    kSCSICmd_WRITE_BUFFER                   = 0x3B,
+    kSCSICmd_WRITE_LONG                     = 0x3F,
+    kSCSICmd_WRITE_SAME                     = 0x41,
+    kSCSICmd_WRITE_SAME_16                  = 0x93,
+    kSCSICmd_XDREAD                         = 0x52,
+    kSCSICmd_XDWRITE                        = 0x50,
+    kSCSICmd_XDWRITE_EXTENDED               = 0x80,
+    kSCSICmd_XDWRITEREAD_10           		= 0x53,
+    kSCSICmd_XPWRITE                        = 0x51,
+    
+    kSCSICmdVariableLengthCDB				= 0x7F
+};
+
+/* Service Action Definitions for the Variable Length CDB (7Fh) command */
+enum
+{
+	kSCSIServiceAction_READ_32				= 0x0009,
+	kSCSIServiceAction_VERIFY_32			= 0x000A,
+	kSCSIServiceAction_WRITE_32				= 0x000B,
+	kSCSIServiceAction_WRITE_AND_VERIFY_32	= 0x000C,
+	kSCSIServiceAction_WRITE_SAME_32		= 0x000D,
+	kSCSIServiceAction_XDREAD_32			= 0x0003,
+	kSCSIServiceAction_XDWRITE_32			= 0x0004,
+	kSCSIServiceAction_XDWRITEREAD_32		= 0x0007,
+	kSCSIServiceAction_XPWRITE_32			= 0x0006
+};
+
+/* Service Action Definitions for the MAINTENANCE IN (A3h) command */
+enum
+{
+	kSCSIServiceAction_REPORT_ALIASES								= 0x0B,
+	kSCSIServiceAction_REPORT_DEVICE_IDENTIFIER						= 0x05,
+	kSCSIServiceAction_REPORT_PRIORITY								= 0x0E,
+	kSCSIServiceAction_REPORT_SUPPORTED_OPERATION_CODES				= 0x0C,
+	kSCSIServiceAction_REPORT_SUPPORTED_TASK_MANAGEMENT_FUNCTIONS	= 0x0D,
+	kSCSIServiceAction_REPORT_TARGET_PORT_GROUPS					= 0x0A
+};
+
+/* Service Action Definitions for the MAINTENANCE OUT (A4h) command */
+enum
+{
+	kSCSIServiceAction_CHANGE_ALIASES			= 0x0B,
+	kSCSIServiceAction_SET_DEVICE_IDENTIFIER	= 0x06,
+	kSCSIServiceAction_SET_PRIORITY				= 0x0E,
+	kSCSIServiceAction_SET_TARGET_PORT_GROUPS	= 0x0A	
+};
+
+/* Service Action Definitions for the SERVICE ACTION IN (9Eh) command */
+enum
+{
+	kSCSIServiceAction_READ_CAPACITY_16		= 0x10,
+	kSCSIServiceAction_READ_LONG_16			= 0x11	
+};
+
+/* Service Action Definitions for the SERVICE ACTION OUT (9Fh) command */
+enum
+{
+	kSCSIServiceAction_WRITE_LONG_16		= 0x11	
+};
+
+#pragma mark -
+#pragma mark Command Definitions by Number
+#if 0
+enum 
+{
+};
+#endif
+
+
+#pragma mark -
+#pragma mark All Types SPC Commands
+/* Commands defined by the T10:1236-D SCSI Primary Commands-2 (SPC-2) 
+ * command specification.  The definitions and section numbers are based on
+ * section 7 of the revision 18, 21 May 2000 version of the specification.
+ *
+ * These commands are defined for all devices.
+ */
+#if 0
+enum 
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_COMPARE                        = 0x39, /* Sec. 7.2: Optional */
+    kSCSICmd_COPY                           = 0x18, /* Sec. 7.3: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* Sec. 7.4: Optional */
+    kSCSICmd_EXTENDED_COPY                  = 0x83, /* Sec. 7.5: Optional */
+    kSCSICmd_INQUIRY                        = 0x12, /* Sec. 7.6: Mandatory */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* Sec. 7.7: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* Sec. 7.8: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Sec. 7.9: Device Type
+                                                     * Specific */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Sec. 7.10: Device Type
+                                                     * Specific */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Sec. 7.11: Device Type
+                                                     * Specific */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Sec. 7.12: Device Type
+                                                     * Specific */
+    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* Defined in SMC */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Sec. 7.13: Device Type
+                                                     * Specific */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Sec. 7.14: Device Type
+                                                     * Specific */
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* Sec. 7.15: Device Type
+                                                     * Specific */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* Sec. 7.16: Optional */
+    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* Defined in SMC */
+    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84, /* Sec. 7.17: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Sec. 7.18: Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* Sec. 7.19: Device Type
+                                                     * Specific */
+    kSCSICmd_RELEASE_6                      = 0x17, /* Sec. 7.20: Device Type
+                                                     * Specific */
+    kSCSICmd_REPORT_DEVICE_IDENTIFIER    	= 0xA3, /* Sec. 7.21: Optional */
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Sec. 7.22: Mandatory for
+                                                     * LUN Supporting devices*/
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Sec. 7.23: Device Type
+                                                     * Specific */
+    kSCSICmd_RESERVE_10                     = 0x56, /* Sec. 7.24: Device Type
+                                                     * Specific */
+    kSCSICmd_RESERVE_6                      = 0x16, /* Sec. 7.25: Device Type
+                                                     * Specific */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Sec. 7.26: Optional */
+    kSCSICmd_SET_DEVICE_IDENTIFIER       	= 0xA4, /* Sec. 7.27: Optional */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Sec. 7.28: Mandatory */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Sec. 7.29: Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x00 SBC Direct Access Commands
+/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) command
+ * specification.  The definitions and section numbers are based on section 6.1
+ * of the revision 8c, 13 November 1997 version of the specification. 
+ */
+#if 0
+enum
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional*/
+    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Sec. 6.1.1: Mandatory */
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36, /* Sec. 6.1.2: Optional */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
+    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* SMC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
+    kSCSICmd_PREFETCH                       = 0x34, /* Sec. 6.1.3: Optional */
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
+    kSCSICmd_READ_6                         = 0x08, /* Sec. 6.1.4: Mandatory */
+    kSCSICmd_READ_10                        = 0x28, /* Sec. 6.1.5: Mandatory */
+    kSCSICmd_READ_12                        = 0xA8, /* Sec. 6.2.4: Optional */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
+    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.6: Mandatory */
+    kSCSICmd_READ_DEFECT_DATA_10            = 0x37, /* Sec. 6.1.7: Optional */
+    kSCSICmd_READ_DEFECT_DATA_12            = 0xB7, /* Sec. 6.2.5: Optional */
+    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* SMC: Optional */
+    kSCSICmd_READ_GENERATION				= 0x29,	/* Sec. 6.2.6: Optional */
+    kSCSICmd_READ_LONG                      = 0x3E, /* Sec. 6.1.8: Optional */
+    kSCSICmd_READ_UPDATED_BLOCK_10			= 0x2D, /* Sec. 6.2.7: Optional */
+    kSCSICmd_REASSIGN_BLOCKS                = 0x07, /* Sec. 6.1.9: Optional */
+    kSCSICmd_REBUILD                        = 0x81, /* Sec. 6.1.10: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
+    kSCSICmd_REGENERATE                     = 0x82, /* Sec. 6.1.11: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Optional */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Optional */
+    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
+    kSCSICmd_REZERO_UNIT                    = 0x01, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
+    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
+    kSCSICmd_SEEK_10                        = 0x2B, /* Sec. 6.1.12: Optional */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
+    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Sec. 6.1.13: Optional */
+    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Sec. 6.2.8: Optional */
+    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Sec. 6.1.14: Optional */
+    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.15: Optional */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
+	kSCSICmd_UPDATE_BLOCK					= 0x3D,	/* Sec. 6.2.9: Optional */
+    kSCSICmd_VERIFY_10                      = 0x2F, /* Sec. 6.1.16: Optional */
+    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 6.1.17: Optional */
+    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.1.18: Optional */
+    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.2.13: Optional */
+    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.1.19: Optional */
+    kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE, /* Sec. 6.2.15: Optional */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
+    kSCSICmd_WRITE_LONG                     = 0x3F, /* Sec. 6.1.20: Optional */
+    kSCSICmd_WRITE_SAME                     = 0x41, /* Sec. 6.1.21: Optional */
+    kSCSICmd_XDREAD                         = 0x52, /* Sec. 6.1.22: Optional */
+    kSCSICmd_XDWRITE                        = 0x50, /* Sec. 6.1.23: Optional */
+    kSCSICmd_XDWRITE_EXTENDED               = 0x80, /* Sec. 6.1.24: Optional */
+    kSCSICmd_XPWRITE                        = 0x51  /* Sec. 6.1.25: Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x01 SSC Sequential Access Commands
+/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) command
+ * specification.  The definitions and section numbers are based on section 5
+ * of the revision 22, January 1, 2000 version of the specification. 
+ */
+#if 0
+enum
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
+    kSCSICmd_ERASE                          = 0x19, /* Sec. 5.3.1: Mandatory */
+    kSCSICmd_FORMAT_MEDIUM                  = 0x04, /* Sec. 5.3.2: Optional */
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOAD_UNLOAD                    = 0x1B, /* Sec. 5.3.3: Optional */
+    kSCSICmd_LOCATE                         = 0x2B, /* Sec. 5.3.4: Optional */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
+    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* SMC: Optional */
+    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* SMC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
+    kSCSICmd_READ_6                         = 0x08, /* Sec. 5.3.5: Mandatory */
+    kSCSICmd_READ_BLOCK_LIMITS              = 0x05, /* Sec. 5.3.6: Mandatory */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
+    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* SMC: Optional */
+    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* SMC: Optional */
+    kSCSICmd_READ_POSITION                  = 0x34, /* Sec. 5.3.7: Mandatory */
+    kSCSICmd_READ_REVERSE                   = 0x0F, /* Sec. 5.3.8: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
+    kSCSICmd_RECOVER_BUFFERED_DATA          = 0x14, /* Sec. 5.3.9: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
+    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
+    kSCSICmd_REPORT_DENSITY_SUPPORT         = 0x44, /* Sec. 5.3.10: Mandatory*/
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Mandatory */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
+    kSCSICmd_REWIND                         = 0x01, /* Sec. 5.3.11: Mandatory*/
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
+    kSCSICmd_SPACE                          = 0x11, /* Sec. 5.3.12: Mandatory*/
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
+    kSCSICmd_VERIFY_6                       = 0x13, /* Sec. 5.3.13: Optional */
+    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 5.3.14: Mandatory*/
+    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
+    kSCSICmd_WRITE_FILEMARKS                = 0x10  /* Sec. 5.3.15: Mandatory*/
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x02 SSC Printer Commands
+/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) command
+ * specification.  The definitions and section numbers are based on section 6
+ * of the revision 22, January 1, 2000 version of the specification. 
+ */
+#if 0
+enum 
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
+    kSCSICmd_FORMAT                         = 0x04, /* Sec. 6.2.1: Optional */
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
+    kSCSICmd_PRINT                          = 0x0A, /* Sec. 6.2.2: Mandatory */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
+    kSCSICmd_RECOVER_BUFFERED_DATA          = 0x14, /* Sec. 6.2.3: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
+    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Mandatory */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
+    kSCSICmd_SLEW_AND_PRINT                 = 0x0B, /* Sec. 6.2.4: Optional */
+    kSCSICmd_STOP_PRINT                     = 0x1B, /* Sec. 6.2.5: Optional */
+    kSCSICmd_SYNCHRONIZE_BUFFER             = 0x10, /* Sec. 6.2.6: Optional */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* SPC: Optional */
+};
+#endif
+  
+#pragma mark -
+#pragma mark 0x03 SPC Processor Commands
+/* Commands defined by the T10:1236-D SCSI Primary Commands-2 (SPC-2) 
+ * command specification.  The definitions and section numbers are based on
+ * section 9 of the revision 18, 21 May 2000 version of the specification.
+ */
+#if 0
+enum 
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_COMPARE                        = 0x39, /* Sec. 7.2: Optional */
+    kSCSICmd_COPY                           = 0x18, /* Sec. 7.3: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* Sec. 7.4: Optional */
+    kSCSICmd_EXTENDED_COPY                  = 0x83, /* Sec. 7.5: Optional */
+    kSCSICmd_INQUIRY                        = 0x12, /* Sec. 7.6: Mandatory */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* Sec. 7.7: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* Sec. 7.8: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Sec. 7.13: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Sec. 7.14: Optional */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* Sec. 7.16: Optional */
+    kSCSICmd_RECEIVE                        = 0x08, /* Sec. 9.2: Optional */
+    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84, /* Sec. 7.17: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Sec. 7.18: Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* Sec. 7.19: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* Sec. 7.20: Optional */
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Sec. 7.22: Optional */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Sec. 7.23: Mandatory */
+    kSCSICmd_RESERVE_10                     = 0x56, /* Sec. 7.24: Optional */
+    kSCSICmd_RESERVE_6                      = 0x16, /* Sec. 7.25: Optional */
+    kSCSICmd_SEND                           = 0x0A, /* Sec. 9.3: Optional */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Sec. 7.26: Mandatory */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Sec. 7.27: Mandatory */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Sec. 7.29: Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x04 SBC Write Once Commands
+/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) command
+ * specification.  The definitions and section numbers are based on section 6.3
+ * of the revision 8c, 13 November 1997 version of the specification. 
+ */
+#if 0
+enum
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* SPC: Optional */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional*/
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36, /* Sec. 6.1.2: Optional */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MEDIUM_SCAN                    = 0x38, /* Sec. 6.2.3: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
+    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* SMC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
+    kSCSICmd_PREFETCH                       = 0x34, /* Sec. 6.1.3: Optional */
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
+    kSCSICmd_READ_6                         = 0x08, /* Sec. 6.1.4: Optional */
+    kSCSICmd_READ_10                        = 0x28, /* Sec. 6.1.5: Mandatory */
+    kSCSICmd_READ_12                        = 0xA8, /* Sec. 6.2.4: Optional */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
+    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.6: Mandatory */
+    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* SMC: Optional */
+    kSCSICmd_READ_LONG                      = 0x3E, /* Sec. 6.1.8: Optional */
+    kSCSICmd_REASSIGN_BLOCKS                = 0x07, /* Sec. 6.1.9: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Optional */
+    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
+    kSCSICmd_REZERO_UNIT                    = 0x01, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2, /* Obsolete */
+    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
+    kSCSICmd_SEEK_10                        = 0x2B, /* Sec. 6.1.12: Optional */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
+    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Sec. 6.1.13: Optional */
+    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Sec. 6.2.8: Optional */
+    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Sec. 6.1.14: Optional */
+    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.15: Optional */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
+    kSCSICmd_VERIFY_10                      = 0x2F, /* Sec. 6.2.10: Optional */
+    kSCSICmd_VERIFY_12                      = 0xAF, /* Sec. 6.2.11: Optional */
+    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 6.1.17: Optional */
+    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.2.10: Mandatory*/
+    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.2.13: Optional */
+    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.2.14: Optional */
+    kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE, /* Sec. 6.2.15: Optional */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
+    kSCSICmd_WRITE_LONG                     = 0x3F  /* Sec. 6.1.20: Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x05 MMC CD-ROM Commands
+/* Commands defined by the T10:1363-D SCSI Multimedia Commands-3 (MMC-3) 
+ * specification.  The definitions and section numbers are based on section 6.1
+ * of the revision 01, March 03, 2000 version of the specification. 
+ *
+ * NOTE: The comments following each command may not be accurate.  These are
+ * not from the MMC-3 specification, but have been derived from the SCSI-2 and
+ * original MMC specifications.  Unlike the other SCSI command specifications,
+ * MMC-2 and MMC-3 do not provide a command requirement type and therefore does
+ * not relist the SPC commands with these requirements as they apply to MMC
+ * devices.  The MMC-2 and MMC-3 specifications also refer back to the SBC
+ * specification which seems invalid since MMC devices do not represent a
+ * Peripheral Device Type defined by SBC.  It is assumed that the SBC
+ * references refer to the Peripheral Device Type 0x00 - Direct Access Commands
+ * definitions from that specification.
+ */
+#if 0
+enum 
+{
+    kSCSICmd_BLANK                          = 0xA1, /* Sec. 6.1.1: */
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_CLOSE_TRACK_SESSION            = 0x5B, /* Sec. 6.1.2: */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
+    kSCSICmd_ERASE                          = 0x2C, /* SBC: */
+    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Sec. 6.1.3: */
+    kSCSICmd_GET_CONFIGURATION              = 0x46, /* Sec. 6.1.4: */
+    kSCSICmd_GET_EVENT_STATUS_NOTIFICATION  = 0x4A, /* Sec. 6.1.5: */
+    kSCSICmd_GET_PERFORMANCE                = 0xAC, /* Sec. 6.1.6: */
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOAD_UNLOAD_MEDIUM             = 0xA6, /* Sec. 6.1.7: */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MECHANISM_STATUS               = 0xBD, /* Sec. 6.1.8: */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Mandatory */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Mandatory */
+    kSCSICmd_PAUSE_RESUME                   = 0x4B, /* Sec. 6.1.9: */
+    kSCSICmd_PLAY_AUDIO_10                  = 0x45, /* Sec. 6.1.10: */
+    kSCSICmd_PLAY_AUDIO_12                  = 0xA5, /* Sec. 6.1.11: */
+    kSCSICmd_PLAY_AUDIO_MSF                 = 0x47, /* Sec. 6.1.12: */
+    kSCSICmd_PLAY_AUDIO_TRACK_INDEX         = 0x48, /* Obsolete */
+    kSCSICmd_PLAY_CD                        = 0xBC, /* Sec. 6.1.13: */
+    kSCSICmd_PLAY_RELATIVE_10               = 0x49, /* Obsolete */
+    kSCSICmd_PLAY_RELATIVE_12               = 0xA9, /* Obsolete */
+    kSCSICmd_PREFETCH                       = 0x34, /* Optional */
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* Optional */
+    kSCSICmd_READ_6                         = 0x08, /* Optional */
+    kSCSICmd_READ_10                        = 0x28, /* Mandatory */
+    kSCSICmd_READ_12                        = 0xA8, /* Optional */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* Optional */
+    kSCSICmd_READ_BUFFER_CAPACITY           = 0x5C, /* Sec. 6.1.15: */
+    kSCSICmd_READ_CD                        = 0xBE, /* Sec. 6.1.16: */
+    kSCSICmd_READ_CD_MSF                    = 0xB9, /* Sec. 6.1.17: */
+    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.18: */
+    kSCSICmd_READ_DISC_INFORMATION          = 0x51, /* Sec. 6.1.19: */
+    kSCSICmd_READ_DVD_STRUCTURE             = 0xAD, /* Sec. 6.1.20: */
+    kSCSICmd_READ_DISC_STRUCTURE            = 0xAD, /* Sec. 6.1.20: */
+    kSCSICmd_READ_FORMAT_CAPACITIES         = 0x23, /* Sec. 6.1.21: */
+    kSCSICmd_READ_HEADER                    = 0x44, /* Sec. 6.1.22: */
+    kSCSICmd_READ_LONG                      = 0x3E, /* Optional */
+    kSCSICmd_READ_MASTER_CUE                = 0x59, /* Sec. 6.1.23: */
+    kSCSICmd_READ_SUB_CHANNEL               = 0x42, /* Sec. 6.1.24: */
+    kSCSICmd_READ_TOC_PMA_ATIP              = 0x43, /* Sec. 6.1.25: */
+    kSCSICmd_READ_TRACK_INFORMATION         = 0x52, /* Sec. 6.1.27: */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* Mandatory */
+    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
+    kSCSICmd_REPAIR_TRACK                   = 0x58, /* Sec. 6.1.28: */
+    kSCSICmd_REPORT_KEY                     = 0xA4, /* Sec. 6.1.29: */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* Mandatory */
+    kSCSICmd_RESERVE_10                     = 0x56, /* Optional */
+    kSCSICmd_RESERVE_TRACK                  = 0x53, /* Sec. 6.1.30: */
+    kSCSICmd_SCAN_MMC                       = 0xBA, /* Sec. 6.1.31: */
+    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2, /* Obsolete */
+    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
+    kSCSICmd_SEEK_10                        = 0x2B, /* SBC: */
+    kSCSICmd_SEND_CUE_SHEET                 = 0x5D, /* Sec. 6.1.32: */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Mandatory */
+    kSCSICmd_SEND_DVD_STRUCTURE             = 0xBF, /* Sec. 6.1.33: */
+    kSCSICmd_SEND_EVENT                     = 0xA2, /* Sec. 6.1.34: */
+    kSCSICmd_SEND_KEY                       = 0xA3, /* Sec. 6.1.35: */
+    kSCSICmd_SEND_OPC_INFORMATION           = 0x54, /* Sec. 6.1.36: */
+    kSCSICmd_SET_CD_SPEED                   = 0xBB, /* Sec. 6.1.37: */
+    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Optional */
+    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Optional */
+    kSCSICmd_SET_READ_AHEAD                 = 0xA7, /* Sec. 6.1.38: */
+    kSCSICmd_SET_STREAMING                  = 0xB6, /* Sec. 6.1.39: */
+    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Optional */
+    kSCSICmd_STOP_PLAY_SCAN                 = 0x4E, /* Sec. 6.1.40: */
+    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.41: */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Mandatory */
+    kSCSICmd_VERIFY_10                      = 0x2F, /* Optional */
+    kSCSICmd_VERIFY_12                      = 0xAF, /* Optional */
+    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.1.42: */
+    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.1.43: */
+    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.1.44: */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x06 SGC Scanner Commands
+/* Commands defined by the T10:998-D SCSI-3 Graphics Commands (SGC)
+ * specification.  The definitions and section numbers are based on section 6
+ * of the revision 0, April 1995 version of the specification. 
+ */
+#if 0
+enum 
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* SPC: Optional */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
+    kSCSICmd_GET_DATA_BUFFER_STATUS         = 0x34, /* Sec. 6.1.1: Optional */
+    kSCSICmd_GET_WINDOW                     = 0x25, /* Sec. 6.1.2: Optional */
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
+    kSCSICmd_OBJECT_POSITION                = 0x31, /* Sec. 6.1.3: Optional */
+    kSCSICmd_PORT_STATUS                    = 0x11, /* SPC (??): Mandatory
+                                                     * for dual port devices */
+    kSCSICmd_READ                           = 0x28, /* Sec. 6.1.4: Mandatory */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
+    kSCSICmd_SCAN                           = 0x1B, /* Sec. 6.1.5: Optional */
+    kSCSICmd_SEND                           = 0x1B, /* Sec. 6.1.6: Optional */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
+    kSCSICmd_SET_WINDOW                     = 0x24, /* Sec. 6.1.7: Mandatory */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* SPC: Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x07 SBC Optical Media Commands
+/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) 
+ * (revision 8c, 13 November 1998) command specification.  
+ */
+
+#pragma mark -
+#pragma mark 0x08 SMC Medium Changer Commands
+/* Commands defined by the T10:1228-D SCSI-3 Medium Changer Commands-2 (SMC-2)
+ * (revision 0, March 16, 2000) command specification.  
+ */
+#if 0
+enum
+{
+    /* Commands For Independent Medium Changers */
+    kSCSICmd_EXCHANGE_MEDIUM                = 0xA6, /* Optional */
+    kSCSICmd_INITIALIZE_ELEMENT_STATUS      = 0x07, /* Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
+    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* Mandatory */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
+    kSCSICmd_POSITION_TO_ELEMENT            = 0x2B, /* Optional */
+    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* Mandatory */
+    kSCSICmd_RELEASE_ELEMENT_6              = 0x16, /* Optional */
+    kSCSICmd_RELEASE_ELEMENT_10             = 0x56, /* Optional */
+    kSCSICmd_REQUEST_VOLUME_ELEMENT_ADDRESS = 0xB5, /* Optional */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
+    kSCSICmd_RESERVE_ELEMENT_6              = 0x16, /* Optional */
+    kSCSICmd_RESERVE_ELEMENT_10             = 0x56  /* Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x09 SSC Communications Commands
+/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) 
+ * (revision 22, January 1, 2000) command specification. 
+ */
+  
+#pragma mark -
+#pragma mark 0x0A ASC IT8 Prepress Commands
+#pragma mark 0x0B ASC IT8 Prepress Commands
+/* Commands defined by the ASC IT8 <title goes here> specification
+ * (revision xx, month day, year) command specification.  
+ */
+#if 0
+enum
+{
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x0C SCC Array Controller Commands
+/* Commands defined by the ANSI NCITS.318-199x SCSI Controller
+ * Commands (SCC-2) ratified command specification.  
+ */
+#if 0
+enum
+{
+    kSCSICmd_MAINTENANCE_IN                 = 0xA3, /* Mandatory */
+    kSCSICmd_MAINTENANCE_OUT                = 0xA4, /* Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
+    kSCSICmd_PORT_STATUS                    = 0x1F, /* Optional */
+    kSCSICmd_REDUNDANCY_GROUP_IN            = 0xBA, /* Mandatory */
+    kSCSICmd_REDUNDANCY_GROUP_OUT           = 0xBB, /* Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Mandatory */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* Optional */
+    kSCSICmd_RESERVE_10                     = 0x56, /* Optional*/
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Optional */
+    kSCSICmd_SPARE_IN                       = 0xBC, /* Mandatory */
+    kSCSICmd_SPARE_OUT                      = 0xBD  /* Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x0D SES Enclosure Services Commands
+/* Commands defined by the T10:1212-D SCSI-3 Enclosure Services (SES) 
+ * (revision 8b, February 11, 1998) command specification.  
+ */
+#if 0
+enum
+{
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x17, /* Mandatory */
+    kSCSICmd_RELEASE_6                      = 0x17, /* Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* Optional */
+    kSCSICmd_RESERVE_10                     = 0x56, /* Optional */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D  /* Mandatory */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x0E RBC Reduced Block Commands
+/* Commands defined by the T10:1240-D Reduced Block Commands (RBC) 
+ * (revision 10a, August 18, 1999) command specification.  
+ */
+#if 0
+enum
+{
+    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Optional */
+    kSCSICmd_READ_10                        = 0x28, /* Mandatory */
+    kSCSICmd_READ_CAPACITY                  = 0x25, /* Mandatory */
+    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Mandatory */
+    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Optional */
+    kSCSICmd_VERIFY_10                      = 0x2F, /* Mandatory */
+    kSCSICmd_WRITE_10                       = 0x2A, /* Mandatory */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Mandatory for fixed media
+     *                                              Optional for removable */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x0F OCRW Optical Card Commands
+/* Commands defined by the ISO/IEC 14776-381 SCSI Specification for
+ * Optical Card Reader/Writer (OCRW) ratified command specification.  
+ */
+#if 0
+enum
+{
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x11 OSD Object-based Storage Commands
+/* Commands defined by the T10:1355-D Object-based Storage Commands (OSD) 
+ * (revision 1, 18 May 2000) command specification.  
+ */
+#if 0
+enum
+{
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x15 RMC Simplified Multimedia Commands
+/* Commands defined by the T10:1364-D Reduced Multimedia Commands (RMC) 
+ * (revision 1, November 11, 1999) command specification.  
+ */
+#if 0
+enum
+{
+};
+#endif
+
+#endif	/* _SCSI_COMMAND_OPERATION_CODES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSIPort.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSIPort.h.svn-base
new file mode 100644
index 0000000..8eefbeb
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/SCSIPort.h.svn-base
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_PORTS_H_
+#define _IOKIT_SCSI_PORTS_H_
+
+
+/*! @header SCSIPort
+	@discussion
+	This file contains all the definitions for SCSIPort notifications and status.
+*/
+
+
+/*!
+@enum kSCSIPort_NotificationStatusChange
+@discussion
+Message definition to be used with the messageClients
+call to inform of a change in port status.
+*/
+enum
+{
+	kSCSIPort_NotificationStatusChange		= 0x68000001
+};
+
+
+/*! @typedef SCSIPortStatus
+	@abstract 32-bit number to represent a SCSIPortStatus.
+	@discussion Type for SCSIPortStatus.
+*/
+
+typedef UInt32 SCSIPortStatus;
+
+/*! @enum SCSI Port Status Values
+	@discussion Definitions for the possible port status values
+*/
+enum
+{
+	/*!
+	@constant kSCSIPort_StatusOnline
+	The port is online.
+	*/
+	kSCSIPort_StatusOnline	= 0,
+
+	/*!
+	@constant kSCSIPort_StatusOffline
+	The port is offline (e.g. unplugged cable).
+	*/
+	kSCSIPort_StatusOffline	= 1,
+
+	/*!
+	@constant kSCSIPort_StatusFailure
+	Driver has detected unrecoverable port failure (e.g. hardware port failure)
+	*/
+	kSCSIPort_StatusFailure	= 2
+};
+
+#endif	/* _IOKIT_SCSI_PORTS_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSITask.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSITask.h.svn-base
new file mode 100644
index 0000000..154c187
--- /dev/null
+++ b/i386/include/IOKit/scsi/.svn/text-base/SCSITask.h.svn-base
@@ -0,0 +1,456 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_SCSI_TASK_H_
+#define _IOKIT_SCSI_TASK_H_
+
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSITask
+SCSITask typedefs and constants used inside the kernel and user space.
+
+Note that the SCSITaskIdentifier is an opaque object and that directly
+casting the SCSITaskIdentifier to any other type is discouraged. The SCSITask
+implementation changes when necessary to accomodate architectural changes,
+performance improvements, and bug fixes.
+
+Device and protocol layer drivers that need to access information
+contained in a SCSITask should use the appropriate accessor methods in
+IOSCSIPrimaryCommandsDevice.h or IOSCSIProtocolServices.h
+*/
+
+
+/*! @typedef SCSIDeviceIdentifier
+    @abstract 64-bit number to represent a SCSI Device.
+	@discussion If the identifier can either be that of an initiator or a target,
+    SCSIDeviceIdentifier should be used.
+*/
+
+typedef UInt64 					SCSIDeviceIdentifier;
+
+/*! @typedef SCSITargetIdentifier
+    @abstract 64-bit number to represent a SCSI Target Device.
+	@discussion If the identifier is for a target only and not an initiator, then
+	SCSITargetIdentifier should be used.
+*/
+
+typedef SCSIDeviceIdentifier 	SCSITargetIdentifier;
+
+/*! @typedef SCSIInitiatorIdentifier
+    @abstract 64-bit number to represent a SCSI Initiator Device.
+	@discussion If the identifier is for an initiator only and not a target, then
+	SCSIInitiatorIdentifier should be used.
+*/
+
+typedef SCSIDeviceIdentifier 	SCSIInitiatorIdentifier;
+
+/*! @typedef SCSILogicalUnitNumber
+    @abstract 64-bit number to represent a logical unit.
+	@discussion 64-bit number to represent a logical unit.
+*/
+
+typedef UInt64 					SCSILogicalUnitNumber;
+
+/*! @typedef SCSITaggedTaskIdentifier
+    @abstract 64-bit number to represent a unique task identifier.
+	@discussion The Tagged Task Identifier is used when a Task has a Task Attribute other
+	than SIMPLE. The SCSI Application Layer client that controls the Logical
+	Unit for which a Task is intended is required to guarantee that the Task
+	Tag Identifier is unique. Zero cannot be used a a Tag value as this is used
+	to when a Tagged Task Identifier value is needed for a Task with a SIMPLE 
+	attribute.
+*/
+
+typedef UInt64 SCSITaggedTaskIdentifier;
+
+/*!
+	@enum Untagged Task Identifier
+	@discussion The Untagged Task Identifier is used to indicate no unique tag
+	is associated with the Task.
+	@constant kSCSIUntaggedTaskIdentifier This value means the task is untagged.
+ */
+
+enum
+{
+	kSCSIUntaggedTaskIdentifier = 0
+};
+
+/*!
+	@typedef SCSITaskAttribute
+	@abstract Attributes for task delivery.
+	@discussion The Task Attribute defines how this task should be managed
+	when determing order for queueing and submission to the 
+	appropriate device server. The Task Attribute is set by the SCSI
+	Application Layer and cannot be modified by the SCSI Protocol Layer.
+	@constant kSCSITask_SIMPLE The task has a simple attribute.
+	@constant kSCSITask_ORDERED The task has an ordered attribute.
+	@constant kSCSITask_HEAD_OF_QUEUE The task has a head-of-queue attribute.
+	@constant kSCSITask_ACA The task has an auto-contingent-allegiance attribute.
+ */
+
+typedef enum SCSITaskAttribute
+{
+	kSCSITask_SIMPLE			= 0,
+	kSCSITask_ORDERED			= 1,
+	kSCSITask_HEAD_OF_QUEUE		= 2,
+	kSCSITask_ACA				= 3
+} SCSITaskAttribute;
+
+/*!
+	@typedef SCSITaskState
+	@abstract Attributes for task state.
+	@discussion The Task State represents the current state of the task.
+	The state is set to NEW_TASK when the task is created.  The SCSI Protocol
+	Layer will then adjust the state as the task is queued and during
+	execution. The SCSI Application Layer can examine the state to monitor
+	the progress of a task. The Task State can only be modified by the SCSI
+	Protocol Layer.  The SCSI Application Layer can only read the state.
+	@constant kSCSITaskState_NEW_TASK The task state is new task.
+	@constant kSCSITaskState_ENABLED The task is enabled and queued.
+	@constant kSCSITaskState_BLOCKED The task is blocked.
+	@constant kSCSITaskState_DORMANT The task is dormant.
+	@constant kSCSITaskState_ENDED The task is complete.
+ */
+
+typedef enum SCSITaskState
+{
+	kSCSITaskState_NEW_TASK		= 0,
+	kSCSITaskState_ENABLED		= 1,
+	kSCSITaskState_BLOCKED		= 2,
+	kSCSITaskState_DORMANT		= 3,
+	kSCSITaskState_ENDED		= 4
+} SCSITaskState;
+
+
+/*!
+	@typedef SCSIServiceResponse
+	@abstract Attributes for task service response.
+	@discussion The Service Response represents the execution status of
+	a service request made to a Protocol Services Driver. The Service
+	Response can only be modified by the SCSI Protocol Layer. The SCSI
+	Application Layer can only read the state.
+ */
+
+typedef enum SCSIServiceResponse
+{
+	/*!
+	@constant kSCSIServiceResponse_Request_In_Process
+	Not defined in SAM specification, but is a service response used
+	for asynchronous commands that are not yet completed.
+	*/
+	kSCSIServiceResponse_Request_In_Process					= 0,
+
+	/*!
+	@constant kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE
+	The service request failed because of a delivery or target failure.
+	*/
+	kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE	= 1,
+
+	/*!
+	@constant kSCSIServiceResponse_TASK_COMPLETE
+	The task completed.
+	*/
+	kSCSIServiceResponse_TASK_COMPLETE 						= 2,
+	
+	/*!
+	@constant kSCSIServiceResponse_LINK_COMMAND_COMPLETE
+	The linked command completed.
+	*/
+	kSCSIServiceResponse_LINK_COMMAND_COMPLETE				= 3,
+	
+	/*!
+	@constant kSCSIServiceResponse_FUNCTION_COMPLETE
+	The task management function completed.
+	*/
+	kSCSIServiceResponse_FUNCTION_COMPLETE					= 4,
+	
+	/*!
+	@constant kSCSIServiceResponse_FUNCTION_REJECTED
+	The task management function was rejected.
+	*/
+	kSCSIServiceResponse_FUNCTION_REJECTED					= 5
+} SCSIServiceResponse;
+
+/*!
+	@typedef SCSITaskStatus
+	@abstract Attributes for task status.
+	@discussion The Task Status represents the completion status
+	of the task which provides the  SCSI Application Layer with
+	additional information about how to procede in handling a
+	completed task.
+	
+	The SCSI Architecture Model specification only defines task
+	status values for when a task completes with a service response
+	of either TASK_COMPLETED or LINK_COMMAND_COMPLETE.
+	
+	Since additional information will aid in error recovery when
+	a task fails to be completed by a device due to a service
+	response of kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE,
+	additional values have been defined that can be returned by the
+	SCSI Protocol Layer to inform the SCSI Application Layer of the
+	cause of the delivery failure.
+	
+	The Task Status can only be modified by the SCSI Protocol Layer.
+	The SCSI Application Layer can only read the status
+*/
+typedef enum SCSITaskStatus
+{
+	
+	/*!
+	@constant kSCSITaskStatus_GOOD
+	The task completed with a status of GOOD.
+	*/
+	
+	kSCSITaskStatus_GOOD						= 0x00,
+
+	/*!
+	@constant kSCSITaskStatus_CHECK_CONDITION
+	The task completed with a status of CHECK_CONDITION. Additional
+	information about the condition should be available in the sense data.
+	*/
+	
+	kSCSITaskStatus_CHECK_CONDITION				= 0x02,
+	
+	/*!
+	@constant kSCSITaskStatus_CONDITION_MET
+	The task completed with a status of CONDITION_MET.
+	*/
+	
+	kSCSITaskStatus_CONDITION_MET				= 0x04,
+	
+	/*!
+	@constant kSCSITaskStatus_BUSY
+	The task completed with a status of BUSY. The device server might need
+	time to process a request and a delay may be required.
+	*/
+	kSCSITaskStatus_BUSY						= 0x08,
+
+	/*!
+	@constant kSCSITaskStatus_INTERMEDIATE
+	The task completed with a status of INTERMEDIATE.
+	*/
+	kSCSITaskStatus_INTERMEDIATE				= 0x10,
+
+	/*!
+	@constant kSCSITaskStatus_INTERMEDIATE_CONDITION_MET
+	The task completed with a status of INTERMEDIATE_CONDITION_MET.
+	*/
+	kSCSITaskStatus_INTERMEDIATE_CONDITION_MET	= 0x14,
+
+	/*!
+	@constant kSCSITaskStatus_RESERVATION_CONFLICT
+	The task completed with a status of RESERVATION_CONFLICT.
+	*/
+	kSCSITaskStatus_RESERVATION_CONFLICT		= 0x18,
+
+	/*!
+	@constant kSCSITaskStatus_TASK_SET_FULL
+	The task completed with a status of TASK_SET_FULL. The device server
+	may need to complete a task before the initiator sends another.
+	*/
+	kSCSITaskStatus_TASK_SET_FULL				= 0x28,
+	
+	/*!
+	@constant kSCSITaskStatus_ACA_ACTIVE
+	The task completed with a status of ACA_ACTIVE. The device server may
+	need the initiator to clear the Auto-Contingent Allegiance condition
+	before it will respond to new commands.
+	*/
+	kSCSITaskStatus_ACA_ACTIVE					= 0x30,
+	
+	/*!
+	@constant kSCSITaskStatus_TaskTimeoutOccurred
+	If a task is aborted by the SCSI Protocol Layer due to it exceeding
+	the timeout value specified by the task, the task status shall be
+	set to kSCSITaskStatus_TaskTimeoutOccurred.
+	*/
+	
+	kSCSITaskStatus_TaskTimeoutOccurred			= 0x01,
+	
+	/*!
+	@constant kSCSITaskStatus_ProtocolTimeoutOccurred
+	If a task is aborted by the SCSI Protocol Layer due to it exceeding a
+	timeout value specified by the support for the protocol or a related
+	specification, the task status shall be set to
+	kSCSITaskStatus_ProtocolTimeoutOccurred.
+	*/
+	
+	kSCSITaskStatus_ProtocolTimeoutOccurred		= 0x02,
+	
+	/*!
+	@constant kSCSITaskStatus_DeviceNotResponding
+	If a task is unable to be delivered due to a failure of the device not
+	accepting the task or the device acknowledging the attempt to send it the
+	device the task status shall be set to kSCSITaskStatus_DeviceNotResponding.
+	This will allow the SCSI Application driver to perform the necessary steps
+	to try to recover the device. This shall only be reported after the SCSI
+	Protocol Layer driver has attempted all protocol specific attempts to recover
+	the device.
+	*/
+	
+	kSCSITaskStatus_DeviceNotResponding			= 0x03,
+	
+	/*!
+	@constant kSCSITaskStatus_DeviceNotPresent
+	If the task is unable to be delivered because the device has been
+	detached, the task status shall be set to kSCSITaskStatus_DeviceNotPresent.
+	This will allow the SCSI Application Layer to halt the sending of tasks
+	to the device and, if supported, perform any device failover or system
+	cleanup.
+	*/
+	kSCSITaskStatus_DeviceNotPresent			= 0x04,
+	
+	/*!
+	@constant kSCSITaskStatus_DeliveryFailure
+	If the task is unable to be
+	delivered to the device due to a failure in the SCSI Protocol Layer,
+	such as a bus reset or communications error, but the device is is
+	known to be functioning properly, the task status shall be set to 
+	kSCSITaskStatus_DeliveryFailure. This can also be reported if the
+	task could not be delivered due to a protocol error that has since
+	been corrected.
+	 */
+	kSCSITaskStatus_DeliveryFailure				= 0x05,
+	
+	/*!
+	@constant kSCSITaskStatus_No_Status
+	This status is not defined by
+	the SCSI specifications, but is here to provide a status that can
+	be returned in cases where there is not status available from the
+	device or protocol, for example, when the service response is
+	neither TASK_COMPLETED nor LINK_COMMAND_COMPLETE or when the
+	service response is SERVICE_DELIVERY_OR_TARGET_FAILURE and the
+	reason for failure could not be determined.
+	*/
+	kSCSITaskStatus_No_Status					= 0xFF
+} SCSITaskStatus;
+
+/*!
+	@enum Command Descriptor Block Size
+	@discussion Command Descriptor Block Size constants.
+*/
+enum
+{
+	/*!
+	@constant kSCSICDBSize_Maximum This is the largest size a Command Descriptor
+	Block can be as specified in SPC-2.
+	*/
+	kSCSICDBSize_Maximum 	= 16,
+
+	/*!
+	@constant kSCSICDBSize_6Byte Use this for a 6-byte CDB.
+	*/
+	kSCSICDBSize_6Byte 		= 6,
+
+	/*!
+	@constant kSCSICDBSize_10Byte Use this for a 10-byte CDB.
+	*/
+	kSCSICDBSize_10Byte 	= 10,
+
+	/*!
+	@constant kSCSICDBSize_12Byte Use this for a 12-byte CDB.
+	*/
+	kSCSICDBSize_12Byte 	= 12,
+
+	/*!
+	@constant kSCSICDBSize_16Byte Use this for a 16-byte CDB.
+	*/
+	kSCSICDBSize_16Byte 	= 16
+};
+
+typedef UInt8 SCSICommandDescriptorBlock[kSCSICDBSize_Maximum];
+
+/*!
+	@enum Data Transfer Direction
+	@discussion DataTransferDirection constants.
+*/
+enum
+{
+	/*!
+	@constant kSCSIDataTransfer_NoDataTransfer Use this for tasks
+	that transfer no data.
+	*/
+	kSCSIDataTransfer_NoDataTransfer		= 0x00,
+
+	/*!
+	@constant kSCSIDataTransfer_FromInitiatorToTarget Use this for tasks that transfer
+	data from the initiator to the target.
+	*/
+	kSCSIDataTransfer_FromInitiatorToTarget	= 0x01,
+
+	/*!
+	@constant kSCSIDataTransfer_FromTargetToInitiator Use this for tasks that transfer
+	data from the target to the initiator.
+	*/
+	kSCSIDataTransfer_FromTargetToInitiator	= 0x02
+};
+
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+/* Libkern includes */
+#include <libkern/c++/OSObject.h>
+
+
+/*!
+	@enum SCSITaskMode
+	@discussion The SCSI Task mode is used by the SCSI
+	Protocol Layer to indicate what mode the task is executing.
+*/
+typedef enum SCSITaskMode
+{
+	kSCSITaskMode_CommandExecution	= 1,
+	kSCSITaskMode_Autosense			= 2
+} SCSITaskMode;
+
+/*!
+	@typedef SCSITaskIdentifier
+	@discussion This is an opaque object that represents a task.
+	This is used so that drivers for both the SCSI Protocol Layer
+	and the SCSI  Application Layer cannot modify the SCSITask object
+	directly but must instead use the inherited methods to do so. This
+	allows the implementation of SCSITask to change without directly
+	impacting device and protocol layer drivers. In addition, it
+	prevents changing of properties that are not allowed to be
+	changed by a given layer.
+*/
+typedef OSObject *	SCSITaskIdentifier;
+
+
+/*!
+	@typedef SCSITaskCompletion
+	@discussion This is the typedef for completion routines that
+	work with SCSITaskIdentifiers.
+*/
+typedef void ( *SCSITaskCompletion )( SCSITaskIdentifier completedTask );
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_SCSI_TASK_H_ */
diff --git a/i386/include/IOKit/scsi/IOBDServices.h b/i386/include/IOKit/scsi/IOBDServices.h
new file mode 100644
index 0000000..70482d7
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOBDServices.h
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_BD_SERVICES_H_
+#define _IOKIT_IO_BD_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// IOKit includes
+#include <IOKit/IOTypes.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOBDTypes.h>
+#include <IOKit/storage/IOBDBlockStorageDevice.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
+
+class IOMemoryDescriptor;
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOBDServices : public IOBDBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IOBDServices )
+		
+protected:
+	
+	OSSet *								fClients;
+	IOSCSIPeripheralDeviceType05 *		fProvider;
+	
+	virtual void	free ( void );			
+	
+    // Reserve space for future expansion.
+    struct IOBDServicesExpansionData { };
+    IOBDServicesExpansionData *		fIOBDServicesReserved;
+	
+public:
+	
+	static void			AsyncReadWriteComplete ( void * 		clientData,
+		                          				 IOReturn		status,
+		                      					 UInt64 		actualByteCount );
+	
+	// Deprecated
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageCompletion		completion );
+											
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageAttributes *   attributes,
+											IOStorageCompletion *	completion );
+
+    virtual IOReturn	doEjectMedia ( void );
+
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+
+    virtual IOReturn	doSynchronizeCache ( void );
+	
+	virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+        
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+    
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+        
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+
+	/* CD Specific */
+	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
+										UInt32 block,
+										UInt32 nblks,
+										CDSectorArea sectorArea,
+										CDSectorType sectorType,
+										IOStorageCompletion completion );
+	
+	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
+	
+	virtual IOReturn	readMCN ( CDMCN mcn);
+	
+	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
+	
+	virtual IOReturn	audioPause ( bool pause );
+	
+	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
+	
+	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
+	
+	virtual IOReturn	audioStop ( void );
+	
+	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
+	
+	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
+	
+	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
+
+	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
+	
+	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
+	
+	/* DVD Specific */
+	virtual UInt32			getMediaType		( void );
+    
+	virtual IOReturn		reportKey			( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt32 lba,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+												  
+	virtual IOReturn		sendKey				( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+
+	virtual IOReturn		readDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
+													const UInt8					structureFormat,
+													const UInt32				logicalBlockAddress,
+													const UInt8					layer,
+													const UInt8 				agid );
+
+	/* BD Specific */
+    virtual IOReturn		readDiscStructure	(	IOMemoryDescriptor * buffer,
+													UInt8                structureFormat,
+													UInt32               logicalBlockAddress,
+													UInt8                layer,
+													UInt8                agid,
+													UInt8                mediaType );
+
+	/* 10.6.0 */
+    virtual IOReturn		requestIdle ( void );
+	
+	/* System Specific */
+	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
+    virtual IOReturn	setProperties ( OSObject * properties );
+
+	/* User Client Specific */
+	virtual bool start ( IOService * provider );
+	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
+	
+	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
+	virtual void handleClose ( IOService * client, IOOptionBits options );
+	virtual bool handleIsOpen ( const IOService * client ) const;
+
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
+									CDTOCFormat				format,
+									UInt8					msf,
+									UInt8					trackSessionNumber,
+									UInt16 *				actualByteCount ); 
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
+										UInt32					address,
+										CDTrackInfoAddressType	addressType,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.5 */
+	virtual IOReturn	splitTrack ( UInt32 address );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 1 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 2 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 3 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 4 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 5 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 6 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 7 );
+    OSMetaClassDeclareReservedUnused ( IOBDServices, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_BD_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IOBlockStorageServices.h b/i386/include/IOKit/scsi/IOBlockStorageServices.h
new file mode 100644
index 0000000..d62a02b
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOBlockStorageServices.h
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_
+#define _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// IOKit includes
+#include <IOKit/IOTypes.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOBlockStorageDevice.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOBlockStorageServices : public IOBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IOBlockStorageServices )
+	
+private:
+	
+	bool							fMediaChanged;  /* DEPRECATED */
+	bool							fMediaPresent;
+	
+protected:
+	
+    IOSCSIBlockCommandsDevice *     fProvider;
+	
+	UInt64							fMaxReadBlocks;
+	UInt64							fMaxWriteBlocks;
+	
+	virtual bool		attach ( IOService * provider );
+	virtual void		detach ( IOService * provider );
+    virtual IOReturn	newUserClient (
+    						   task_t			owningTask,
+    						   void *			securityID,
+    						   UInt32			type,
+    						   OSDictionary * 	properties,
+    						   IOUserClient **	handler );
+	
+    // Reserve space for future expansion.
+    struct IOBlockStorageServicesExpansionData { };
+    IOBlockStorageServicesExpansionData * fIOBlockStorageServicesReserved;
+	
+public:
+	
+	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
+	
+	static void 		AsyncReadWriteComplete ( void * 			clientData,
+                                				 IOReturn			status,
+                                				 UInt64 			actualByteCount );
+	
+	// Deprecated
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+											
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageCompletion 	completion );
+
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageAttributes *   attributes,
+											IOStorageCompletion *	completion );
+													
+    virtual IOReturn	doEjectMedia ( void );
+	
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+	
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+	
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+	
+    virtual IOReturn	doSynchronizeCache ( void );
+	
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+        
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+        
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+	
+	virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 1 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 2 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 3 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 4 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 5 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 6 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 7 );
+    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IOCompactDiscServices.h b/i386/include/IOKit/scsi/IOCompactDiscServices.h
new file mode 100644
index 0000000..a9d4a31
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOCompactDiscServices.h
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_COMPACT_DISC_SERVICES_H_
+#define _IOKIT_IO_COMPACT_DISC_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// IOKit includes
+#include <IOKit/IOTypes.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOCDTypes.h>
+#include <IOKit/storage/IOCDBlockStorageDevice.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
+
+class IOMemoryDescriptor;
+
+// Use this switch to turn off the data cache.
+#define _USE_DATA_CACHING_		1
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOCompactDiscServices : public IOCDBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IOCompactDiscServices )
+	
+#if (_USE_DATA_CACHING_)
+	// Data Cache members
+	bool				fUseDataCache;			// Indicates if cache should be used.  This
+												// will be set to false if all the necessary support
+												// for the data cache could not be allocated or
+												// initialized.
+	UInt8 *				fDataCacheStorage;		// Storage space for the cache
+	UInt32				fDataCacheStartBlock;	// Starting block of the data in the cache.
+	UInt32				fDataCacheBlockCount;	// Number of contiguous blocks in the cache  
+												// starting with fDataCacheStartBlock. A value of
+												// zero in this member indicates that all data
+												// in the cache is invalid.
+	
+	IOSimpleLock *		fDataCacheLock; 		// This is the lock for preventing multiple access 
+												// while manipulating the data cache.
+#endif
+
+protected:
+	
+	OSSet *								fClients;
+	IOSCSIPeripheralDeviceType05 *		fProvider;
+	
+	virtual void	free ( void );			
+
+    // Reserve space for future expansion.
+    struct IOCompactDiscServicesExpansionData { };
+    IOCompactDiscServicesExpansionData * fIOCompactDiscServicesReserved;
+
+public:
+
+	static 	void 		AsyncReadWriteComplete ( 	void * 			clientData,
+                                					IOReturn		status,
+                                					UInt64 			actualByteCount );
+
+	// Deprecated
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageCompletion		completion );
+											
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageAttributes *   attributes,
+											IOStorageCompletion *	completion );
+
+    virtual IOReturn	doEjectMedia ( void );
+
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+
+    virtual IOReturn	doSynchronizeCache ( void );
+
+	virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+        
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+        
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+        
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+
+	/* CD Specific */
+	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
+										UInt32 block,
+										UInt32 nblks,
+										CDSectorArea sectorArea,
+										CDSectorType sectorType,
+										IOStorageCompletion completion );
+	
+	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
+	
+	virtual IOReturn	readMCN ( CDMCN mcn);
+	
+	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
+	
+	virtual IOReturn	audioPause ( bool pause );
+	
+	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
+	
+	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
+	
+	virtual IOReturn	audioStop ( void );
+	
+	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
+	
+	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
+	
+	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
+
+	virtual UInt32		getMediaType ( void );
+	
+	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
+	
+	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
+			
+	/* System Specific */
+	virtual IOReturn message ( UInt32 type, IOService * provider, void * argument );
+    virtual IOReturn setProperties ( OSObject * properties );
+	
+	/* User Client Specific */
+	virtual bool start ( IOService * provider );
+	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
+	
+	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
+	virtual void handleClose ( IOService * client, IOOptionBits options );
+	virtual bool handleIsOpen ( const IOService * client ) const;
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
+									CDTOCFormat				format,
+									UInt8					msf,
+									UInt8					trackSessionNumber,
+									UInt16 *				actualByteCount ); 
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
+										UInt32					address,
+										CDTrackInfoAddressType	addressType,
+										UInt16 *				actualByteCount );
+
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 1 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 2 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 3 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 4 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 5 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 6 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 7 );
+    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_COMPACT_DISC_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IODVDServices.h b/i386/include/IOKit/scsi/IODVDServices.h
new file mode 100644
index 0000000..8dccb17
--- /dev/null
+++ b/i386/include/IOKit/scsi/IODVDServices.h
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_DVD_SERVICES_H_
+#define _IOKIT_IO_DVD_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// IOKit includes
+#include <IOKit/IOTypes.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IODVDTypes.h>
+#include <IOKit/storage/IODVDBlockStorageDevice.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
+
+class IOMemoryDescriptor;
+
+// Use this switch to turn off the data cache.
+#define _DVD_USE_DATA_CACHING_		1
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IODVDServices : public IODVDBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IODVDServices )
+	
+#if (_DVD_USE_DATA_CACHING_)
+	// Data Cache members
+	bool				fUseDataCache;			// Indicates if cache should be used.  This
+												// will be set to false if all the necessary support
+												// for the data cache could not be allocated or
+												// initialized.
+	UInt8 *				fDataCacheStorage;		// Storage space for the cache
+	UInt32				fDataCacheStartBlock;	// Starting block of the data in the cache.
+	UInt32				fDataCacheBlockCount;	// Number of contiguous blocks in the cache  
+												// starting with fDataCacheStartBlock. A value of
+												// zero in this member indicates that all data
+												// in the cache is invalid.
+	
+	IOSimpleLock *		fDataCacheLock; 		// This is the lock for preventing multiple access 
+												// while manipulating the data cache.
+#endif
+	
+protected:
+	
+	OSSet *								fClients;
+	IOSCSIPeripheralDeviceType05 *		fProvider;
+	
+	virtual void	free ( void );			
+	
+    // Reserve space for future expansion.
+    struct IODVDServicesExpansionData { };
+    IODVDServicesExpansionData * fIODVDServicesReserved;
+	
+public:
+	
+	static void			AsyncReadWriteComplete ( void * 		clientData,
+		                          				 IOReturn		status,
+		                      					 UInt64 		actualByteCount );
+	
+	// Deprecated
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageCompletion		completion );
+											
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageAttributes *   attributes,
+											IOStorageCompletion *	completion );
+
+    virtual IOReturn	doEjectMedia ( void );
+
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+
+    virtual IOReturn	doSynchronizeCache ( void );
+	
+	virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+        
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+        
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+        
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+
+	/* CD Specific */
+	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
+										UInt32 block,
+										UInt32 nblks,
+										CDSectorArea sectorArea,
+										CDSectorType sectorType,
+										IOStorageCompletion completion );
+	
+	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
+	
+	virtual IOReturn	readMCN ( CDMCN mcn);
+	
+	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
+	
+	virtual IOReturn	audioPause ( bool pause );
+	
+	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
+	
+	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
+	
+	virtual IOReturn	audioStop ( void );
+	
+	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
+	
+	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
+	
+	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
+
+	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
+	
+	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
+	
+	/* DVD Specific */
+	virtual UInt32			getMediaType		( void );
+    
+	virtual IOReturn		reportKey			( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt32 lba,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+												  
+	virtual IOReturn		sendKey				( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+
+	virtual IOReturn		readDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
+													const UInt8					structureFormat,
+													const UInt32				logicalBlockAddress,
+													const UInt8					layer,
+													const UInt8 				agid );
+
+	/* 10.6.0 */
+    virtual IOReturn		requestIdle ( void );
+	
+	/* System Specific */
+	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
+    virtual IOReturn	setProperties ( OSObject * properties );
+
+	/* User Client Specific */
+	virtual bool start ( IOService * provider );
+	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
+	
+	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
+	virtual void handleClose ( IOService * client, IOOptionBits options );
+	virtual bool handleIsOpen ( const IOService * client ) const;
+
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
+									CDTOCFormat				format,
+									UInt8					msf,
+									UInt8					trackSessionNumber,
+									UInt16 *				actualByteCount ); 
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.1.3 */
+	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
+										UInt32					address,
+										CDTrackInfoAddressType	addressType,
+										UInt16 *				actualByteCount );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 1 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 2 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 3 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 4 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 5 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 6 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 7 );
+    OSMetaClassDeclareReservedUnused ( IODVDServices, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_DVD_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IOReducedBlockServices.h b/i386/include/IOKit/scsi/IOReducedBlockServices.h
new file mode 100644
index 0000000..87ad8ed
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOReducedBlockServices.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_
+#define _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// Generic IOKit related headers
+#include <IOKit/IOTypes.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOBlockStorageDevice.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPeripheralDeviceType0E.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOReducedBlockServices : public IOBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IOReducedBlockServices )
+	
+	
+protected:
+    // Reserve space for future expansion.
+    struct IOReducedBlockServicesExpansionData { };
+    IOReducedBlockServicesExpansionData * fIOReducedBlockServicesReserved;
+	
+	IOSCSIPeripheralDeviceType0E *     fProvider;
+	
+	virtual bool	attach ( IOService * provider );
+	virtual void	detach ( IOService * provider );
+	
+	
+public:
+
+	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
+	
+	static void			AsyncReadWriteComplete ( void * 			clientData,
+                                				 IOReturn			status,
+                                				 UInt64 			actualByteCount );
+                                				
+	// Deprecated
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageCompletion		completion );
+											
+	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											IOStorageAttributes *   attributes,
+											IOStorageCompletion *	completion );
+
+    virtual IOReturn	doEjectMedia ( void );
+
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+
+    virtual IOReturn	doSynchronizeCache ( void );
+	
+	virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+        
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+        
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+        
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 1 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 2 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 3 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 4 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 5 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 6 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 7 );
+    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 8 );
+    
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIBlockCommandsDevice.h b/i386/include/IOKit/scsi/IOSCSIBlockCommandsDevice.h
new file mode 100644
index 0000000..2cb4a6d
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIBlockCommandsDevice.h
@@ -0,0 +1,1146 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_
+#define _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+// SBC power states as defined in T10:996D SCSI Block Commands - 3 (SBC-3)
+// Revision 8c, November 13, 1997, pages 10-11.
+enum
+{
+	kSBCPowerStateSystemSleep 	= 0,
+	kSBCPowerStateSleep 		= 1,
+	kSBCPowerStateStandby 		= 2,
+	kSBCPowerStateIdle			= 3,
+	kSBCPowerStateActive		= 4,
+	kSBCNumPowerStates			= 5
+};
+
+enum
+{
+	kMediaStateUnlocked	= 0,
+	kMediaStateLocked 	= 1
+};
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOUserClient.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOStorage.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
+
+
+// Forward declaration for the SCSIBlockCommands that is used internally by the
+// IOSCSIBlockCommandsDevice class.
+class SCSIBlockCommands;
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIBlockCommandsDevice : public IOSCSIPrimaryCommandsDevice
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIBlockCommandsDevice )
+	
+private:
+	
+
+#ifndef __LP64__
+	
+	SCSIBlockCommands *		fSCSIBlockCommandObject;
+	SCSIBlockCommands *		GetSCSIBlockCommandObject ( void );
+	
+#endif	/* !__LP64__ */
+
+	IOReturn				GetWriteCacheState ( IOMemoryDescriptor * 	buffer,
+												 UInt8					modePageControlValue );
+	
+	static void				AsyncReadWriteComplete ( SCSITaskIdentifier	completedTask );
+	
+protected:
+	
+	// Reserve space for future expansion.
+    struct IOSCSIBlockCommandsDeviceExpansionData
+	{
+		IONotifier *		fPowerDownNotifier;
+		bool				fWriteCacheEnabled;
+		bool				fDeviceIsShared;
+		UInt64				fMediumBlockCount64;
+		bool				fDeviceHasSATTranslation;
+		bool				fProtocolSpecificPowerControl;
+		bool				fRequiresEjectWithStartStopUnit;
+	};
+    IOSCSIBlockCommandsDeviceExpansionData * fIOSCSIBlockCommandsDeviceReserved;
+	
+	#define fPowerDownNotifier	fIOSCSIBlockCommandsDeviceReserved->fPowerDownNotifier
+	#define fWriteCacheEnabled	fIOSCSIBlockCommandsDeviceReserved->fWriteCacheEnabled
+	
+	// The fDeviceIsShared is used to indicate whether this device exists on a Physical
+	// Interconnect that allows multiple initiators to access it.  This is used mainly
+	// by the power management code to not send power state related START_STOP_UNIT
+	// commands to the device.
+	// The fDeviceIsShared value is also used to prevent power state commands from being
+	// sent to manual eject device since these devices behave better when allowed to
+	// manage their own power.
+	#define fDeviceIsShared	fIOSCSIBlockCommandsDeviceReserved->fDeviceIsShared
+	
+	// The fMediumBlockCount64 provides support for 64 bit LBAs and
+	// replaces fMediumBlockCount which only supports 32 bits.
+	// This value should not be directly accessed and instead the member routine 
+	// ReportMediumTotalBlockCount() should be used to retrieve it and the member routine
+	// SetMediumCharacteristics() should be used to set it.
+	#define fMediumBlockCount64	fIOSCSIBlockCommandsDeviceReserved->fMediumBlockCount64
+	
+	#define fDeviceHasSATTranslation fIOSCSIBlockCommandsDeviceReserved->fDeviceHasSATTranslation
+	
+	// Device support protocol specific power off
+	#define fProtocolSpecificPowerControl fIOSCSIBlockCommandsDeviceReserved->fProtocolSpecificPowerControl
+	
+	// Device requires START_STOP_UNIT for ejects, regardless if PREVENT_ALLOW_MEIDUMREMOVAL
+	// failed. 
+	#define fRequiresEjectWithStartStopUnit fIOSCSIBlockCommandsDeviceReserved->fRequiresEjectWithStartStopUnit
+	
+private:
+	/* OBSOLETE. Use IOSCSIPrimaryCommandsDevice::Get/SetANSIVersion */
+	UInt8				fANSIVersion;
+
+protected:
+	// ---- Device Characteristics ----
+	bool				fMediaIsRemovable;
+	
+	// ---- Medium Characteristics ----
+	bool				fMediumPresent;
+	
+private:
+	// The byte count of each physical block on the medium.
+	// This value should not be directly accessed and instead the member routine 
+	// ReportMediumBlockSize() should be used to retrieve it and the member routine
+	// SetMediumCharacteristics() should be used to set it.
+	UInt32				fMediumBlockSize;
+	
+	// The total number of blocks of fMediumBlockSize on the medium.
+	// OBSOLETE.  Use fMediumBlockCount64 instead which allows for support of
+	// devices that have 33 through 64 bit LBA values.
+	UInt32				fMediumBlockCount;
+	
+protected:
+	// Whether the installed medium is protected from writes
+	bool				fMediumIsWriteProtected;
+	
+	// Whether user removal of medium has been prevented	
+	bool				fMediumRemovalPrevented;
+	
+	// Indicates whether this is a known manual eject device
+	bool				fKnownManualEject;
+	
+	// Polling thread variables
+	thread_call_t		fPollingThread;
+	UInt32				fPollingMode;
+	enum
+	{
+		kPollingMode_Suspended		= 0,
+		kPollingMode_NewMedia 		= 1,
+		kPollingMode_MediaRemoval	= 2
+	};
+	
+	// ---- Methods for controlling the current state of device support ----
+	virtual bool		InitializeDeviceSupport ( void );
+	virtual void		StartDeviceSupport ( void );
+	virtual void		SuspendDeviceSupport ( void );
+	virtual void		ResumeDeviceSupport ( void );
+	virtual void		StopDeviceSupport ( void );
+	virtual void		TerminateDeviceSupport ( void );
+
+	virtual void 		free ( void );
+
+#ifndef __LP64__
+	
+	// This method will retrieve the SCSI Primary Command Set object for
+	// the class.  For subclasses, this will be overridden using a
+	// dynamic cast on the subclasses base command set object.
+	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
+	
+	virtual bool		CreateCommandSetObjects ( void );
+	virtual void		FreeCommandSetObjects ( void );
+	
+#endif	/* !__LP64__ */
+
+	virtual bool		ClearNotReadyStatus ( void );
+	virtual void 		CreateStorageServiceNub ( void );
+	virtual bool		DetermineDeviceCharacteristics ( void );
+	
+	// ---- Methods used for controlling the polling thread ----
+	virtual void		ProcessPoll ( void );
+	virtual void		EnablePolling ( void );
+	virtual void		DisablePolling ( void );
+	
+	// Main and support methods for polling for new Media
+	virtual void		PollForNewMedia ( void );
+	virtual bool		DetermineMediaPresence ( void );
+	virtual bool		PreventMediumRemoval ( void );
+	virtual bool		DetermineMediumCapacity (
+							UInt64 * 				blockSize,
+							UInt64 * 				blockCount );
+	virtual bool		DetermineMediumWriteProtectState ( void );
+	
+	// Main and support methods for polling for Media removal
+	virtual void		PollForMediaRemoval ( void );
+	
+	// ---- Methods used for handling medium characteristics ----
+	
+	// OBSOLETE - Use the version compatible with 64 bit LBAs instead.
+	virtual void		SetMediumCharacteristics (
+							UInt32 					blockSize,
+							UInt32 					blockCount );
+
+	void				SetMediumCharacteristics (
+							UInt64 					blockSize,
+							UInt64 					blockCount );
+	
+	virtual void		ResetMediumCharacteristics ( void );
+
+	virtual IOReturn	IssueRead (
+							IOMemoryDescriptor *	buffer,
+						 	UInt64					startBlock,
+					 		UInt64					blockCount );
+	
+	virtual IOReturn	IssueRead (
+							IOMemoryDescriptor *	buffer,
+					  		UInt64					startBlock,
+					 		UInt64					blockCount,
+					   		void * 					clientData );
+	
+	virtual IOReturn	IssueWrite (
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+					   		UInt64					blockCount );
+	
+	virtual IOReturn	IssueWrite (
+							IOMemoryDescriptor *	buffer,
+						 	UInt64					startBlock,
+					  		UInt64					blockCount,
+							void * 					clientData );
+	
+	// ----- Power Management Support ------
+	
+	// We override this method to set our power states and register ourselves
+	// as a power policy maker.
+	virtual void 		InitializePowerManagement ( IOService * provider );
+	
+	// We override this method so that when we register for power management,
+	// we go to our active power state (which the drive is definitely in
+	// at startup time).
+	virtual UInt32		GetInitialPowerState ( void );
+	
+	// We override this method in order to provide the number of transitions
+	// from Fully active to Sleep state so that the idle timer can be adjusted
+	// to the appropriate time period based on the disk spindown time set in
+	// the Energy Saver prefs panel.
+	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
+	
+	// The TicklePowerManager method is called to tell the power manager that
+	// the device needs to be in a certain power state to handle requests.
+	virtual void		TicklePowerManager ( void );
+	
+	// The HandlePowerChange method is the state machine for power management.
+	// It is guaranteed to be on its own thread of execution (different from
+	// the power manager thread AND the workloop thread. This routine can
+	// send sync or async calls to the drive without worrying about threading
+	// issues.
+	virtual void		HandlePowerChange ( void );
+	
+	// The HandleCheckPowerState (void) method is on the serialized side of the
+	// command gate and can change member variables safely without
+	// multi-threading issues. It's main purpose is to call the superclass'
+	// HandleCheckPowerState ( UInt32 maxPowerState ) with the max power state
+	// the class registered with.
+	virtual void		HandleCheckPowerState ( void );
+	
+	// The VerifyMediumPresence method is called to see if the medium which we
+	// anticipated being there is still there.
+	virtual bool		VerifyMediumPresence ( void );
+	
+public:
+	
+	static 	void		sProcessPoll ( void * pdtDriver, void * refCon );
+	
+	// ---- Methods for controlling the device ----
+	virtual IOReturn	SyncReadWrite (
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+							UInt64					blockCount,
+							UInt64					blockSize );
+	
+	virtual IOReturn	AsyncReadWrite (
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+							UInt64					blockCount,
+							UInt64					blockSize,
+							void * 					clientData );
+	
+	IOReturn	GetWriteCacheState ( bool * enabled );	
+	IOReturn	SetWriteCacheState ( bool enabled );
+	void		DetermineMediumGeometry ( void );
+	
+	// ---- Methods for controlling medium state ----
+	virtual IOReturn	EjectTheMedium ( void );
+	virtual IOReturn	LockUnlockMedium ( bool doLock );
+	virtual IOReturn	SynchronizeCache ( void );
+	
+	// ---- Methods for controlling media format ----
+	virtual IOReturn	FormatMedium (
+							UInt64 					blockCount,
+							UInt64 					blockSize );
+	virtual UInt32		GetFormatCapacities (
+							UInt64 * 				capacities,
+			 				UInt32   				capacitiesMaxCount ) const;
+	
+	// ---- Query methods to report device characteristics ----
+	
+	// Report the maximum number of blocks that the device can handle per
+	// read or write.  A value of 0 (zero) indicates there is no limit aside
+	// from the size of the method's return parameter.
+	virtual UInt64		ReportDeviceMaxBlocksReadTransfer ( void );
+	virtual UInt64		ReportDeviceMaxBlocksWriteTransfer ( void );
+	
+	// Report whether the device supports removal of the media.
+	virtual bool		ReportDeviceMediaRemovability ( void );
+	
+	// ---- Query methods to report installed medium characteristics ----
+	virtual UInt64		ReportMediumBlockSize ( void );
+	virtual UInt64		ReportMediumTotalBlockCount ( void );
+	virtual bool		ReportMediumWriteProtection ( void );
+	
+	
+protected:
+	
+
+#ifndef __LP64__
+	
+	// Command methods to access all commands available to SBC based devices.
+	virtual bool ERASE_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			ERA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool ERASE_12 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			ERA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool FORMAT_UNIT (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						IOByteCount					defectListSize,
+						SCSICmdField1Bit 			FMTDATA,
+						SCSICmdField1Bit 			CMPLST,
+						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
+						SCSICmdField1Byte 			VENDOR_SPECIFIC,
+						SCSICmdField2Byte 			INTERLEAVE,
+						SCSICmdField1Byte 			CONTROL );
+	
+	//  Defined in SBC-2 Section 5.41
+	bool FORMAT_UNIT (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						IOByteCount					defectListSize,
+						SCSICmdField1Bit			FMTPINFO,
+						SCSICmdField1Bit			RTO_REQ,
+						SCSICmdField1Bit			LONGLIST,
+						SCSICmdField1Bit 			FMTDATA, 
+						SCSICmdField1Bit 			CMPLST,
+						SCSICmdField3Bit 			DEFECT_LIST_FORMAT, 
+						SCSICmdField1Byte 			VENDOR_SPECIFIC, 
+						SCSICmdField1Byte 			CONTROL );
+	  	  
+	virtual bool LOCK_UNLOCK_CACHE (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			LOCK,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.5
+	bool LOCK_UNLOCK_CACHE (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			LOCK,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool LOCK_UNLOCK_CACHE_16 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit			LOCK,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte			CONTROL );
+						
+	virtual bool MEDIUM_SCAN (
+						SCSITaskIdentifier			request,
+			 			IOMemoryDescriptor *		dataBuffer,
+		   				SCSICmdField1Bit 			WBS,
+		   				SCSICmdField1Bit 			ASA,
+		   				SCSICmdField1Bit 			PSD,
+		   				SCSICmdField1Bit 			PRA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool PREFETCH (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	// Defined in SBC-2 section 5.7
+	bool PREFETCH (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool PREFETCH_16 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit			IMMED,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+	
+	virtual bool READ_6 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField21Bit 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+#endif	/* __LP64__ */
+	
+	virtual bool READ_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	// Defined in SBC-2 section 5.10
+	bool READ_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit 			RDPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool READ_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	// Defined in SBC-2 section 5.11
+	bool READ_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			RDPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool READ_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			RDPROTECT,
+						SCSICmdField1Bit			DPO,
+						SCSICmdField1Bit			FUA,
+						SCSICmdField1Bit			FUA_NV,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+	
+	virtual bool READ_CAPACITY (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Bit 			PMI,
+						SCSICmdField1Byte 			CONTROL );
+	
+	bool READ_CAPACITY_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			ALLOCATION_LENGTH,
+						SCSICmdField1Bit 			PMI,
+						SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+	virtual bool READ_DEFECT_DATA_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			PLIST,
+						SCSICmdField1Bit 			GLIST,
+						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool READ_DEFECT_DATA_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			PLIST,
+						SCSICmdField1Bit 			GLIST,
+						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
+						SCSICmdField4Byte 			ALLOCATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool READ_GENERATION (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			ALLOCATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool READ_LONG (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			CORRCT,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			BYTE_TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool READ_LONG_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte			BYTE_TRANSFER_LENGTH,
+						SCSICmdField1Bit			CORRCT,
+						SCSICmdField1Byte			CONTROL );
+		
+	virtual bool READ_UPDATED_BLOCK_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+					 	SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Bit 			LATEST,
+					 	SCSICmdField15Bit 			GENERATION_ADDRESS,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool REASSIGN_BLOCKS (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.20
+	bool REASSIGN_BLOCKS (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit			LONGLBA,
+						SCSICmdField1Bit			LONGLIST,
+						SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool REBUILD (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+					 	SCSICmdField1Bit 			INTDATA,
+						SCSICmdField2Bit 			PORT_CONTROL,
+					 	SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			REBUILD_LENGTH,
+						SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool REGENERATE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit			DPO,
+						SCSICmdField1Bit 			FUA,
+					 	SCSICmdField1Bit 			INTDATA,
+					 	SCSICmdField2Bit 			PORT_CONTROL,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			REBUILD_LENGTH,
+						SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool REZERO_UNIT (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SEARCH_DATA_EQUAL_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			INVERT,
+						SCSICmdField1Bit 			SPNDAT,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SEARCH_DATA_HIGH_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			INVERT,
+						SCSICmdField1Bit 			SPNDAT,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SEARCH_DATA_LOW_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			INVERT,
+						SCSICmdField1Bit 			SPNDAT,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SEEK_6 (
+						SCSITaskIdentifier			request,
+						SCSICmdField21Bit 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SEEK_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SET_LIMITS_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			RDINH,
+						SCSICmdField1Bit 			WRINH,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SET_LIMITS_12 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			RDINH,
+						SCSICmdField1Bit 			WRINH,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+#endif	/* __LP64__ */
+	
+	virtual bool START_STOP_UNIT (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED,
+						SCSICmdField4Bit 			POWER_CONDITIONS,
+						SCSICmdField1Bit 			LOEJ,
+						SCSICmdField1Bit 			START,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool SYNCHRONIZE_CACHE (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+	// Defined in SBC-2 section 5.22
+	bool SYNCHRONIZE_CACHE (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED,
+						SCSICmdField1Bit 			SYNC_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool SYNCRONIZE_CACHE_16 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit			SYNC_NV,
+						SCSICmdField1Bit			IMMED,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			NUMBER_OF_BLOCKS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+						
+#ifndef __LP64__
+
+	virtual bool UPDATE_BLOCK (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool VERIFY_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BLKVFY,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			VERIFICATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+	
+	//  Defined in SBC-2 section 5.24
+	bool VERIFY_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField3Bit 			VRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			VERIFICATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool VERIFY_12 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BLKVFY,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			VERIFICATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.25
+	bool VERIFY_12 (
+						SCSITaskIdentifier			request,
+						SCSICmdField3Bit 			VRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField4Byte 			VERIFICATION_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool VERIFY_16 (
+						SCSITaskIdentifier			request,
+						SCSICmdField3Bit			VRPROTECT,
+						SCSICmdField1Bit			DPO,
+						SCSICmdField1Bit			BYTCHK,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			VERIFICATION_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+	
+	virtual bool WRITE_6 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField2Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+	
+#endif	/* __LP64__ */
+
+	virtual bool WRITE_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			EBP,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.29
+	bool WRITE_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool WRITE_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			EBP,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.30
+	bool WRITE_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool WRITE_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit			DPO,
+						SCSICmdField1Bit			FUA,
+						SCSICmdField1Bit			FUA_NV,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+
+#ifndef __LP64__
+				
+	virtual bool WRITE_AND_VERIFY_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			EBP,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.33
+	bool WRITE_AND_VERIFY_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool WRITE_AND_VERIFY_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			EBP,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+	
+	//  Defined in SBC-2 section 5.34
+	bool WRITE_AND_VERIFY_12 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool WRITE_AND_VERIFY_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						UInt32						blockSize,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			BYTCHK,
+						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte 			CONTROL );
+
+
+	virtual bool WRITE_LONG (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool WRITE_LONG_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Bit			CORRCT,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool WRITE_SAME (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			PBDATA,
+						SCSICmdField1Bit 			LBDATA,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.39
+	bool WRITE_SAME (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			PBDATA,
+						SCSICmdField1Bit 			LBDATA,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	bool WRITE_SAME_16 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit			PBDATA,
+						SCSICmdField1Bit			LBDATA,
+						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte			TRANSFER_LENGTH,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField1Byte			CONTROL );
+
+	virtual bool XDREAD (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.42
+	bool XDREAD (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit			XORPINFO,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool XDWRITE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			DISABLE_WRITE,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.43
+	bool XDWRITE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			DISABLE_WRITE,
+						SCSICmdField1Bit			FUA_NV,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	virtual bool XDWRITE_EXTENDED (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			TABLE_ADDRESS,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			DISABLE_WRITE,
+						SCSICmdField2Bit 			PORT_CONTROL,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			SECONDARY_BLOCK_ADDRESS,
+						SCSICmdField4Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			SECONDARY_ADDRESS,
+						SCSICmdField1Byte 			CONTROL );
+	
+	//  Defined in SBC-2 section 5.46
+	bool XDWRITEREAD_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField3Bit			WRPROTECT,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			DISABLE_WRITE,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField1Bit 			XORPINFO,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool XPWRITE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+	//  Defined in SBC-2 section 5.48
+	bool XPWRITE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DPO,
+						SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			FUA_NV,
+						SCSICmdField1Bit 			XORPINFO,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField5Bit			GROUP_NUMBER,
+						SCSICmdField2Byte 			TRANSFER_LENGTH,
+						SCSICmdField1Byte 			CONTROL );
+
+#endif	/* __LP64__ */
+	
+	
+	/* Added with 10.2 */	
+	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 1 );
+	
+public:
+	
+	virtual IOReturn	PowerDownHandler (	void * 			refCon,
+											UInt32 			messageType,
+											IOService * 	provider,
+											void * 			messageArgument,
+											vm_size_t 		argSize );
+	
+
+	/* Added with 10.2 */	
+	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 2 );
+	
+protected:
+	
+	virtual	void		SetMediumIcon ( void );
+	
+	
+	/* Added with 10.3.3 */		
+	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 3 );
+	
+protected:
+
+	virtual	void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
+	
+	
+	/* Added with 10.6.0 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 4 );
+	
+public:
+	
+	virtual	IOReturn AsyncReadWrite (
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+							UInt64					blockCount,
+							UInt64					blockSize,
+							IOStorageAttributes *	attributes,
+							void * 					clientData );
+	
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 16 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIMultimediaCommandsDevice.h b/i386/include/IOKit/scsi/IOSCSIMultimediaCommandsDevice.h
new file mode 100644
index 0000000..f812a39
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIMultimediaCommandsDevice.h
@@ -0,0 +1,1057 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_
+#define _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+
+// Message constants
+#define kIOMessageTrayStateChange			0x69000035
+#define kIOMessageTrayStateHasChanged		kIOMessageTrayStateChange // DEPRECATED, use kIOMessageTrayStateChange instead
+
+// Message values for kIOMessageTrayStateChange
+enum
+{
+	kMessageTrayStateChangeRequestAccepted	= 0,
+	kMessageTrayStateChangeRequestRejected	= 1
+};
+
+#define kIOMessageMediaAccessChange			0x69000036
+
+// Message values for kIOMessageMediaAccessChange
+enum
+{
+	kMessageDeterminingMediaPresence	= 0,
+	kMessageFoundMedia					= 1,
+	kMessageMediaTypeDetermined			= 2
+};
+
+// IOKit property keys and constants
+#define	kIOPropertySupportedCDFeatures		kIOPropertySupportedCDFeaturesKey
+#define	kIOPropertySupportedDVDFeatures		kIOPropertySupportedDVDFeaturesKey
+#define	kIOPropertySupportedBDFeatures		kIOPropertySupportedBDFeaturesKey
+#define kIOPropertyLowPowerPolling			"Low Power Polling"
+
+typedef UInt32 CDFeatures;
+enum
+{
+	kCDFeaturesAnalogAudioBit			= 0,	// Analog Audio playback
+	kCDFeaturesReadStructuresBit		= 1,	// CD-ROM
+	kCDFeaturesWriteOnceBit				= 2,	// CD-R
+	kCDFeaturesReWriteableBit			= 3,	// CD-R/W
+	kCDFeaturesCDDAStreamAccurateBit	= 4,	// CD-DA stream accurate
+	kCDFeaturesPacketWriteBit			= 5,	// Packet Writing
+	kCDFeaturesTAOWriteBit				= 6,	// CD Track At Once
+	kCDFeaturesSAOWriteBit				= 7,	// CD Mastering - Session At Once
+	kCDFeaturesRawWriteBit				= 8,	// CD Mastering - Raw
+	kCDFeaturesTestWriteBit				= 9,	// CD Mastering/TAO - Test Write
+	kCDFeaturesBUFWriteBit				= 10	// CD Mastering/TAO - Buffer Underrun Free
+};
+
+enum
+{
+	kCDFeaturesAnalogAudioMask 			= (1 << kCDFeaturesAnalogAudioBit),
+	kCDFeaturesReadStructuresMask		= (1 << kCDFeaturesReadStructuresBit),
+	kCDFeaturesWriteOnceMask			= (1 << kCDFeaturesWriteOnceBit),
+	kCDFeaturesReWriteableMask			= (1 << kCDFeaturesReWriteableBit),
+	kCDFeaturesCDDAStreamAccurateMask	= (1 << kCDFeaturesCDDAStreamAccurateBit),
+	kCDFeaturesPacketWriteMask			= (1 << kCDFeaturesPacketWriteBit),
+	kCDFeaturesTAOWriteMask				= (1 << kCDFeaturesTAOWriteBit),
+	kCDFeaturesSAOWriteMask				= (1 << kCDFeaturesSAOWriteBit),
+	kCDFeaturesRawWriteMask				= (1 << kCDFeaturesRawWriteBit),
+	kCDFeaturesTestWriteMask			= (1 << kCDFeaturesTestWriteBit),
+	kCDFeaturesBUFWriteMask				= (1 << kCDFeaturesBUFWriteBit)
+};
+
+typedef	UInt32 DVDFeatures;
+enum
+{
+	kDVDFeaturesCSSBit 					= 0,	// DVD-CSS
+	kDVDFeaturesReadStructuresBit 		= 1,	// DVD-ROM
+	kDVDFeaturesWriteOnceBit			= 2,	// DVD-R
+	kDVDFeaturesRandomWriteableBit		= 3,	// DVD-RAM
+	kDVDFeaturesReWriteableBit			= 4,	// DVD-RW
+	kDVDFeaturesTestWriteBit			= 5,	// DVD-R Write - Test Write
+	kDVDFeaturesBUFWriteBit				= 6,	// DVD-R Write - Buffer Underrun Free
+	kDVDFeaturesPlusRBit				= 7,	// DVD+R
+	kDVDFeaturesPlusRWBit				= 8,	// DVD+RW (implies backgound format support)
+	kDVDFeaturesHDReadBit				= 9,	// HD DVD-ROM
+	kDVDFeaturesHDRBit					= 10,	// HD DVD-R
+	kDVDFeaturesHDRAMBit				= 11,	// HD DVD-RAM
+	kDVDFeaturesHDRWBit					= 12	// HD DVD-RW
+};
+
+enum
+{
+	kDVDFeaturesCSSMask 				= (1 << kDVDFeaturesCSSBit),
+	kDVDFeaturesReadStructuresMask 		= (1 << kDVDFeaturesReadStructuresBit),
+	kDVDFeaturesWriteOnceMask			= (1 << kDVDFeaturesWriteOnceBit),
+	kDVDFeaturesRandomWriteableMask		= (1 << kDVDFeaturesRandomWriteableBit),
+	kDVDFeaturesReWriteableMask			= (1 << kDVDFeaturesReWriteableBit),
+	kDVDFeaturesTestWriteMask			= (1 << kDVDFeaturesTestWriteBit),
+	kDVDFeaturesBUFWriteMask			= (1 << kDVDFeaturesBUFWriteBit),
+	kDVDFeaturesPlusRMask				= (1 << kDVDFeaturesPlusRBit),
+	kDVDFeaturesPlusRWMask				= (1 << kDVDFeaturesPlusRWBit),
+	kDVDFeaturesHDReadMask				= (1 << kDVDFeaturesHDReadBit),
+	kDVDFeaturesHDRMask					= (1 << kDVDFeaturesHDRBit),
+	kDVDFeaturesHDRAMMask				= (1 << kDVDFeaturesHDRAMBit),
+	kDVDFeaturesHDRWMask				= (1 << kDVDFeaturesHDRWBit)
+};
+
+typedef	UInt32 BDFeatures;
+enum
+{
+	kBDFeaturesReadBit					= 0,	// BD-ROM
+	kBDFeaturesWriteBit					= 1		// BD-R / BD-RE
+};
+
+enum
+{
+	kBDFeaturesReadMask					= (1 << kBDFeaturesReadBit),
+	kBDFeaturesWriteMask				= (1 << kBDFeaturesWriteBit)
+};
+
+enum
+{
+	kDiscStatusEmpty 					= 0,
+	kDiscStatusIncomplete				= 1,
+	kDiscStatusComplete					= 2,
+	kDiscStatusOther					= 3,
+	kDiscStatusMask						= 0x03,
+	kDiscStatusErasableMask				= 0x10
+};
+
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+// MMC power states as defined in T10:1228D SCSI Multimedia Commands - 2 (MMC-2)
+// Revision 11a, August 30, 1999, page 312 (Annex F).
+enum
+{
+	kMMCPowerStateSystemSleep	= 0,
+	kMMCPowerStateSleep 		= 1,
+	kMMCPowerStateStandby 		= 2,
+	kMMCPowerStateIdle			= 3,
+	kMMCPowerStateActive		= 4,
+	kMMCNumPowerStates			= 5
+};
+
+enum
+{
+	kMediaStateUnlocked	= 0,
+	kMediaStateLocked 	= 1
+};
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOMemoryDescriptor.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOStorage.h>
+#include <IOKit/storage/IOCDTypes.h>
+#include <IOKit/storage/IODVDTypes.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
+
+// Forward definitions for internal use only classes
+class SCSIMultimediaCommands;
+class SCSIBlockCommands;
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIMultimediaCommandsDevice : public IOSCSIPrimaryCommandsDevice
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIMultimediaCommandsDevice )
+	
+private:
+
+#ifndef __LP64__
+
+    SCSIMultimediaCommands *	fSCSIMultimediaCommandObject;
+    SCSIMultimediaCommands *	GetSCSIMultimediaCommandObject ( void );
+	
+    SCSIBlockCommands *			fSCSIBlockCommandObject;			/* OBSOLETE */
+    SCSIBlockCommands *			GetSCSIBlockCommandObject ( void );	/* OBSOLETE */
+
+#endif	/* !__LP64__ */
+	
+	static void		AsyncReadWriteComplete ( SCSITaskIdentifier completedTask );
+	
+protected:
+	
+    // Reserve space for future expansion.
+    struct IOSCSIMultimediaCommandsDeviceExpansionData
+	{
+		IONotifier *		fPowerDownNotifier;
+		bool				fDeviceSupportsPowerOff;
+		BDFeatures			fSupportedBDFeatures;
+		bool				fDeviceSupportsAsyncNotification;
+		bool				fDeviceSupportsFastSpindown;
+		UInt8				fCDLoadingMechanism;
+	};
+    IOSCSIMultimediaCommandsDeviceExpansionData * fIOSCSIMultimediaCommandsDeviceReserved;
+	
+	#define fPowerDownNotifier 					fIOSCSIMultimediaCommandsDeviceReserved->fPowerDownNotifier
+	#define fDeviceSupportsPowerOff 			fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsPowerOff
+	#define fSupportedBDFeatures				fIOSCSIMultimediaCommandsDeviceReserved->fSupportedBDFeatures
+	#define fDeviceSupportsAsyncNotification	fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsAsyncNotification
+	#define fDeviceSupportsFastSpindown			fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsFastSpindown
+	#define fCDLoadingMechanism					fIOSCSIMultimediaCommandsDeviceReserved->fCDLoadingMechanism
+	
+#ifndef __LP64__
+	
+	// This method will retreive the SCSI Primary Command Set object for
+	// the class.  For subclasses, this will be overridden using a
+	// dynamic cast on the subclasses base command set object.
+	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
+	
+#endif	/* !__LP64__ */
+	
+	CDFeatures						fSupportedCDFeatures;
+	DVDFeatures						fSupportedDVDFeatures;
+
+	UInt16							fCurrentDiscSpeed;	
+	bool							fMediaChanged; 
+	bool							fMediaPresent;
+	
+	// The byte count of each physical block on the media.
+	UInt32							fMediaBlockSize;
+	
+	// The total number of blocks of fMediaBlockSize on the media.
+	UInt32							fMediaBlockCount;
+	
+	// Flags used to indicate device feature
+	bool							fMediaIsRemovable;
+	bool							fMediaIsWriteProtected;
+	UInt32							fMediaType;
+	
+	thread_call_t					fPollingThread;
+	bool							fDeviceSupportsLowPowerPolling;
+	bool							fLowPowerPollingEnabled;
+	UInt32							fPollingMode;
+	
+	enum
+	{
+		kPollingMode_Suspended		= 0,
+		kPollingMode_NewMedia 		= 1,
+		kPollingMode_MediaRemoval	= 2
+	};
+	
+	virtual IOReturn	setProperties ( OSObject * properties );
+	
+	virtual void 		CreateStorageServiceNub ( void );
+	virtual bool		DetermineDeviceCharacteristics ( void );
+	virtual IOReturn	DetermineIfMediaIsRemovable ( void );
+	virtual IOReturn	DetermineDeviceFeatures ( void );
+	virtual void		DetermineMediaType ( void );
+	virtual bool		CheckForDVDMediaType ( void );
+	virtual bool		CheckForCDMediaType ( void );
+	virtual void		PollForMedia ( void );
+	virtual void		EnablePolling ( void );
+	virtual void		DisablePolling ( void );
+	virtual void		CheckWriteProtection ( void );
+	virtual bool		ClearNotReadyStatus ( void );
+		
+	virtual IOReturn	GetDeviceConfiguration ( void );
+	virtual IOReturn	GetDeviceConfigurationSize ( UInt32 * size );
+	virtual IOReturn	ParseFeatureList ( UInt32 numProfiles, UInt8 * firstFeaturePtr );
+	
+	virtual IOReturn	GetMechanicalCapabilities ( void );
+	virtual IOReturn	GetMechanicalCapabilitiesSize ( UInt32 * size );
+	virtual IOReturn	ParseMechanicalCapabilities ( UInt8 * mechanicalCapabilitiesPtr );
+
+	virtual IOReturn	CheckForLowPowerPollingSupport ( void );
+	virtual IOReturn	GetCurrentPowerStateOfDrive ( UInt32 * powerState );
+
+	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
+									UInt64					startBlock,
+									UInt64					blockCount );
+
+	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
+									void *					clientData,
+									UInt64					startBlock,
+									UInt64					blockCount );
+	
+	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
+									UInt64					startBlock,
+									UInt64					blockCount );
+	
+	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
+									void *					clientData,
+									UInt64					startBlock,
+									UInt64					blockCount );
+
+    virtual void		SetMediaCharacteristics ( UInt32 blockSize, UInt32 blockCount );
+ 	virtual void		ResetMediaCharacteristics ( void );
+
+	UInt8				ConvertBCDToHex ( UInt8 binaryCodedDigit );
+
+	// ------ User Client Support ------
+	
+	virtual IOReturn 	HandleSetUserClientExclusivityState ( IOService * userClient, bool state );
+
+	// ----- Power Management Support ------
+	
+	// We override this method to set our power states and register ourselves
+	// as a power policy maker.
+	virtual void 		InitializePowerManagement ( IOService * provider );
+	
+	// We override this method so that when we register for power management,
+	// we go to our active power state (which the drive is definitely in
+	// at startup time).
+	virtual UInt32		GetInitialPowerState ( void );
+
+	// We override this method in order to provide the number of transitions
+	// from Fully active to Sleep state so that the idle timer can be adjusted
+	// to the appropriate time period based on the disk spindown time set in
+	// the Energy Saver prefs panel.
+	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
+	
+	// The TicklePowerManager method is called to tell the power manager that the
+	// device needs to be in a certain power state to handle requests.
+	virtual void		TicklePowerManager ( void );
+
+	// The HandlePowerChange method is the state machine for power management.
+	// It is guaranteed to be on its own thread of execution (different from
+	// the power manager thread AND the workloop thread. This routine can
+	// send sync or async calls to the drive without worrying about threading
+	// issues.
+	virtual void		HandlePowerChange ( void );
+
+	// The HandleCheckPowerState (void) method is on the serialized side of the command
+	// gate and can change member variables safely without multi-threading issues.
+	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
+	// with the max power state the class registered with.
+	virtual void		HandleCheckPowerState ( void );
+
+	// The CheckMediaPresence method is called to see if the media which we
+	// anticipated being there is still there.
+	virtual bool		CheckMediaPresence ( void );
+	
+	virtual bool		InitializeDeviceSupport ( void );
+	virtual void		StartDeviceSupport ( void );
+	virtual void		SuspendDeviceSupport ( void );
+	virtual void		ResumeDeviceSupport ( void );
+	virtual void		StopDeviceSupport ( void );
+	virtual void		TerminateDeviceSupport ( void );
+	
+	virtual void		free ( void );
+	
+#ifndef __LP64__
+
+	virtual bool 		CreateCommandSetObjects ( void );
+	virtual void 		FreeCommandSetObjects ( void );
+
+#endif	/* !__LP64__ */
+
+	virtual IOReturn	VerifyDeviceState ( void );
+
+
+public:
+	
+	virtual IOReturn 	setAggressiveness ( unsigned long type, unsigned long minutes );
+	
+	virtual IOReturn	SyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					startBlock,
+											UInt64					blockCount );
+	
+	virtual IOReturn	AsyncReadWrite (	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											void *					clientData );
+
+	virtual IOReturn	EjectTheMedia ( void );
+	virtual IOReturn	GetTrayState ( UInt8 * trayState );
+	virtual IOReturn	SetTrayState ( UInt8 trayState );
+	virtual IOReturn	FormatMedia ( UInt64 byteCapacity );
+	virtual UInt32		GetFormatCapacities ( 	UInt64 * capacities,
+												UInt32   capacitiesMaxCount ) const;
+	virtual IOReturn	LockUnlockMedia ( bool doLock );
+	virtual IOReturn	SynchronizeCache ( void );
+	virtual IOReturn	ReportBlockSize ( UInt64 * blockSize );
+	virtual IOReturn	ReportEjectability ( bool * isEjectable );
+	virtual IOReturn	ReportLockability ( bool * isLockable );
+	virtual IOReturn	ReportPollRequirements ( bool * pollIsRequired,
+												 bool * pollIsExpensive );
+	virtual IOReturn	ReportMaxReadTransfer (  UInt64 	blockSize,
+												 UInt64 * 	max );
+	virtual IOReturn	ReportMaxValidBlock ( UInt64 * maxBlock );
+	virtual IOReturn	ReportMaxWriteTransfer ( UInt64	blockSize,
+												UInt64 * max );
+	virtual IOReturn	ReportMediaState ( 	bool * mediaPresent,
+											bool * changed );
+	virtual IOReturn	ReportRemovability ( bool * isRemovable );
+	virtual IOReturn	ReportWriteProtection ( bool * isWriteProtected );
+	
+	static 	void		sPollForMedia ( void * pdtDriver, void * refCon );
+
+	/* CD Specific */
+	virtual IOReturn	SetMediaAccessSpeed ( UInt16 kilobytesPerSecond );
+	
+	virtual IOReturn	GetMediaAccessSpeed ( UInt16 * kilobytesPerSecond );
+
+	virtual IOReturn	AsyncReadCD ( 	IOMemoryDescriptor * buffer,
+										UInt32 block,
+										UInt32 nblks,
+										CDSectorArea sectorArea,
+										CDSectorType sectorType,
+										void *	clientData );
+	
+	virtual IOReturn	ReadISRC ( UInt8 track, CDISRC isrc );
+	
+	virtual IOReturn	ReadMCN ( CDMCN mcn);
+	
+	virtual IOReturn	ReadTOC ( IOMemoryDescriptor * buffer );
+
+#ifndef __LP64__
+	
+	virtual IOReturn	AudioPause ( bool pause );
+	
+	virtual IOReturn	AudioPlay ( CDMSF timeStart, CDMSF timeStop );
+	
+	virtual IOReturn	AudioScan ( CDMSF timeStart, bool reverse );
+	
+	virtual IOReturn	AudioStop ( void );
+	
+	virtual IOReturn	GetAudioStatus ( CDAudioStatus * status );
+	
+	virtual IOReturn	GetAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
+	
+	virtual IOReturn	SetAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
+
+#endif	/* !__LP64__ */
+	
+	/* DVD Specific */
+	virtual UInt32			GetMediaType		( void );
+    
+	virtual IOReturn		ReportKey			( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt32 lba,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+												  
+	virtual IOReturn		SendKey				( IOMemoryDescriptor * buffer,
+												  const DVDKeyClass keyClass,
+												  const UInt8 agid,
+												  const DVDKeyFormat keyFormat );
+												  
+	virtual IOReturn		ReadDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
+													const UInt32 				length,
+													const UInt8					structureFormat,
+													const UInt32				logicalBlockAddress,
+													const UInt8					layer,
+													const UInt8 				agid );
+
+	// The block size decoding for Read CD and Read CD MSF  as defined in table 255
+    bool	GetBlockSize (
+						UInt32 *					requestedByteCount,
+						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
+						SCSICmdField1Bit 			SYNC,
+						SCSICmdField2Bit 			HEADER_CODES,
+						SCSICmdField1Bit 			USER_DATA,
+						SCSICmdField1Bit 			EDC_ECC,
+						SCSICmdField2Bit 			ERROR_FIELD,
+						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS );
+	
+	SCSICmdField4Byte ConvertMSFToLBA ( SCSICmdField3Byte MSF );
+
+#ifndef __LP64__
+
+	// Command methods to access all commands available to MMC based devices.
+	// The BLANK command as defined in section 6.1.1
+	virtual bool BLANK (
+						SCSITaskIdentifier			request,
+		    			SCSICmdField1Bit 			IMMED, 
+						SCSICmdField3Bit 			BLANKING_TYPE, 
+						SCSICmdField4Byte 			START_ADDRESS_TRACK_NUMBER, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The CLOSE TRACK/SESSION command as defined in section 6.1.2
+    virtual bool CLOSE_TRACK_SESSION (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField1Bit 			SESSION, 
+						SCSICmdField1Bit 			TRACK, 
+						SCSICmdField2Byte 			TRACK_NUMBER, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The FORMAT UNIT command as defined in section 6.1.3
+    virtual bool FORMAT_UNIT (
+						SCSITaskIdentifier			request,
+		    			IOMemoryDescriptor *		dataBuffer,
+		    			IOByteCount					parameterListSize,
+						SCSICmdField1Bit 			FMT_DATA, 
+						SCSICmdField1Bit 			CMP_LIST, 
+						SCSICmdField3Bit 			FORMAT_CODE, 
+						SCSICmdField2Byte 			INTERLEAVE_VALUE, 
+						SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	
+	// The GET CONFIGURATION command as defined in section 6.1.4
+    virtual bool GET_CONFIGURATION (
+						SCSITaskIdentifier			request,
+   						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField2Bit 			RT, 
+						SCSICmdField2Byte 			STARTING_FEATURE_NUMBER, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The GET EVENT/STATUS NOTIFICATION command as defined in section 6.1.5
+    virtual bool GET_EVENT_STATUS_NOTIFICATION (
+						SCSITaskIdentifier			request,
+	    				IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField1Byte 			NOTIFICATION_CLASS_REQUEST, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The GET PERFORMANCE command as defined in section 6.1.6
+    virtual bool GET_PERFORMANCE (
+						SCSITaskIdentifier			request,
+	   					IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Bit 			TOLERANCE, 
+						SCSICmdField1Bit 			WRITE, 
+						SCSICmdField2Bit 			EXCEPT, 
+						SCSICmdField4Byte 			STARTING_LBA, 
+						SCSICmdField2Byte 			MAXIMUM_NUMBER_OF_DESCRIPTORS, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The LOAD/UNLOAD MEDIUM command as defined in section 6.1.7
+    virtual bool LOAD_UNLOAD_MEDIUM (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField1Bit 			LO_UNLO, 
+						SCSICmdField1Bit 			START, 
+						SCSICmdField1Byte 			SLOT, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The MECHANISM STATUS command as defined in section 6.1.8
+    virtual bool MECHANISM_STATUS (
+						SCSITaskIdentifier			request,
+	   					IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+	// The PAUSE/RESUME command as defined in section 6.1.9
+    virtual bool PAUSE_RESUME (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			RESUME, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The PLAY AUDIO (10) command as defined in section 6.1.10
+    virtual bool PLAY_AUDIO_10 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField2Byte 			PLAY_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The PLAY AUDIO (12) command as defined in section 6.1.11
+    virtual bool PLAY_AUDIO_12 (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField4Byte 			PLAY_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The PLAY AUDIO MSF command as defined in section 6.1.12
+    virtual bool PLAY_AUDIO_MSF (
+						SCSITaskIdentifier			request,
+						SCSICmdField3Byte 			STARTING_MSF, 
+						SCSICmdField3Byte 			ENDING_MSF, 
+						SCSICmdField1Byte 			CONTROL );
+	
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The PLAY CD command as defined in section 6.1.13
+    virtual bool PLAY_CD (
+						SCSITaskIdentifier			request,
+						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
+						SCSICmdField1Bit 			CMSF,
+						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField4Byte 			PLAY_LENGTH_IN_BLOCKS, 
+						SCSICmdField1Bit 			SPEED,
+						SCSICmdField1Bit 			PORT2,
+						SCSICmdField1Bit 			PORT1,
+						SCSICmdField1Bit 			COMPOSITE,
+						SCSICmdField1Bit 			AUDIO,
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT *******************/
+
+#endif	/* !__LP64__ */
+	
+	virtual bool READ_10 (
+						SCSITaskIdentifier			request,
+		    			IOMemoryDescriptor 			*dataBuffer, 
+		    			UInt32						blockSize,
+		    			SCSICmdField1Bit 			DPO, 
+		    			SCSICmdField1Bit 			FUA,
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField2Byte 			TRANSFER_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	
+#ifndef __LP64__
+	
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The READ BUFFER CAPACITY command as defined in section 6.1.14
+    virtual bool READ_BUFFER_CAPACITY (
+						SCSITaskIdentifier			request,
+    					IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT *******************/
+	
+#endif	/* !__LP64__ */
+	
+	// The READ CD command as defined in section 6.1.15
+    virtual bool READ_CD (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField3Byte 			TRANSFER_LENGTH, 
+						SCSICmdField1Bit 			SYNC,
+						SCSICmdField2Bit 			HEADER_CODES,
+						SCSICmdField1Bit 			USER_DATA,
+						SCSICmdField1Bit 			EDC_ECC,
+						SCSICmdField2Bit 			ERROR_FIELD,
+						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ CD MSF command as defined in section 6.1.16
+    virtual bool READ_CD_MSF (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
+						SCSICmdField3Byte 			STARTING_MSF, 
+						SCSICmdField3Byte 			ENDING_MSF, 
+						SCSICmdField1Bit 			SYNC,
+						SCSICmdField2Bit 			HEADER_CODES,
+						SCSICmdField1Bit 			USER_DATA,
+						SCSICmdField1Bit 			EDC_ECC,
+						SCSICmdField2Bit 			ERROR_FIELD,
+						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ CAPACITY command as defined in section 6.1.17
+    virtual bool READ_CAPACITY (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField1Bit 			PMI,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ DISC INFORMATION command as defined in section 6.1.18
+    virtual bool READ_DISC_INFORMATION (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ DVD STRUCTURE command as defined in section 6.1.19
+    virtual bool READ_DVD_STRUCTURE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField4Byte 			ADDRESS,
+						SCSICmdField1Byte 			LAYER_NUMBER, 
+						SCSICmdField1Byte 			FORMAT, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField2Bit 			AGID,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ FORMAT CAPACITIES command as defined in section 6.1.20
+    virtual bool READ_FORMAT_CAPACITIES (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+	
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The READ HEADER command as defined in section 6.1.21
+    virtual bool READ_HEADER (
+						SCSITaskIdentifier			request,
+    					IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			MSF,
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT ***********************/
+
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The READ MASTER CUE command as defined in section 6.1.22
+    virtual bool READ_MASTER_CUE (
+						SCSITaskIdentifier			request,
+   						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Byte 			SHEET_NUMBER, 
+						SCSICmdField3Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT ***********************/
+
+#endif	/* !__LP64__ */
+	
+	// The READ SUB-CHANNEL command as defined in section 6.1.23
+    virtual bool READ_SUB_CHANNEL (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			MSF,
+						SCSICmdField1Bit 			SUBQ,
+						SCSICmdField1Byte 			SUB_CHANNEL_PARAMETER_LIST, 
+						SCSICmdField1Byte 			TRACK_NUMBER, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ TOC/PMA/ATIP command as defined in section 6.1.24/25
+    virtual bool READ_TOC_PMA_ATIP (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer, 
+						SCSICmdField1Bit 			MSF,
+						SCSICmdField4Bit 			FORMAT,
+						SCSICmdField1Byte			TRACK_SESSION_NUMBER,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The READ TRACK INFORMATION command as defined in section 6.1.26
+    virtual bool READ_TRACK_INFORMATION (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Bit 			ADDRESS_NUMBER_TYPE,
+						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS_TRACK_SESSION_NUMBER,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The REPAIR TRACK command as defined in section 6.1.27
+    virtual bool REPAIR_TRACK (
+						SCSITaskIdentifier			request,
+						SCSICmdField2Byte 			TRACK_NUMBER, 
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT ***********************/
+	
+	// The REPORT KEY command as defined in section 6.1.28
+    virtual bool REPORT_KEY (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField2Bit 			AGID,
+						SCSICmdField6Bit 			KEY_FORMAT,
+						SCSICmdField1Byte 			CONTROL );
+	
+	// The RESERVE TRACK command as defined in section 6.1.29
+    virtual bool RESERVE_TRACK (
+						SCSITaskIdentifier			request,
+						SCSICmdField4Byte			RESERVATION_SIZE,
+						SCSICmdField1Byte 			CONTROL );
+	
+	// The SCAN command as defined in section 6.1.30
+    virtual bool SCAN (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			DIRECT,
+						SCSICmdField1Bit 			RELADR,
+						SCSICmdField4Byte			SCAN_STARTING_ADDRESS_FIELD,
+						SCSICmdField2Bit 			TYPE,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The SEND CUE SHEET command as defined in section 6.1.31
+    virtual bool SEND_CUE_SHEET (
+						SCSITaskIdentifier			request,
+	    				IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField3Byte			CUE_SHEET_SIZE,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The SEND DVD STRUCTURE command as defined in section 6.1.32
+    virtual bool SEND_DVD_STRUCTURE (
+						SCSITaskIdentifier			request,
+	   	 				IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Byte			FORMAT,
+						SCSICmdField2Byte 			STRUCTURE_DATA_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The SEND EVENT command as defined in section 6.1.33
+    virtual bool SEND_EVENT (
+						SCSITaskIdentifier			request,
+	   		 			IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	
+	// The SEND KEY command as defined in section 6.1.34
+    virtual bool SEND_KEY (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
+						SCSICmdField2Bit 			AGID,
+						SCSICmdField6Bit 			KEY_FORMAT,
+						SCSICmdField1Byte 			CONTROL );
+
+	// The SEND OPC INFORMATION command as defined in section 6.1.35
+    virtual bool SEND_OPC_INFORMATION (
+						SCSITaskIdentifier			request,
+	    				IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField1Bit 			DO_OPC, 
+						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+#endif	/* !__LP64__ */
+
+	/*********************** LEGACY COMMAND SUPPORT ***********************/
+	// The SET CD SPEED command as defined in section 6.1.36
+    virtual bool SET_CD_SPEED (
+						SCSITaskIdentifier			request,
+						SCSICmdField2Byte 			LOGICAL_UNIT_READ_SPEED, 
+						SCSICmdField2Byte 			LOGICAL_UNIT_WRITE_SPEED, 
+						SCSICmdField1Byte 			CONTROL );
+	/*********************** END LEGACY COMMAND SUPPORT ***********************/
+
+	// The SET READ AHEAD command as defined in section 6.1.37
+    virtual bool SET_READ_AHEAD (
+						SCSITaskIdentifier			request,
+						SCSICmdField4Byte 			TRIGGER_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField4Byte 			READ_AHEAD_LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The SET STREAMING command as defined in section 6.1.38
+    virtual bool SET_STREAMING (
+						SCSITaskIdentifier			request,
+	 		   			IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool START_STOP_UNIT ( 
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField4Bit 			POWER_CONDITIONS, 
+						SCSICmdField1Bit 			LOEJ, 
+						SCSICmdField1Bit 			START, 
+						SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+	
+	// The STOP PLAY/SCAN command as defined in section 6.1.39
+    virtual bool STOP_PLAY_SCAN (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+
+	// The SYNCHRONIZE CACHE command as defined in section 6.1.40
+    virtual bool SYNCHRONIZE_CACHE (
+						SCSITaskIdentifier			request,
+						SCSICmdField1Bit 			IMMED, 
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField2Byte 			NUMBER_OF_BLOCKS, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The WRITE (10) command as defined in section 6.1.41
+    virtual bool WRITE_10 (
+						SCSITaskIdentifier			request,
+		    			IOMemoryDescriptor *		dataBuffer, 
+		    			UInt32						blockSize,
+						SCSICmdField1Bit 			DPO, 
+						SCSICmdField1Bit 			FUA, 
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField2Byte 			TRANSFER_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+
+	// The WRITE AND VERIFY (10) command as defined in section 6.1.42
+    virtual bool WRITE_AND_VERIFY_10 (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+		    			UInt32						blockSize,
+						SCSICmdField1Bit 			DPO, 
+						SCSICmdField1Bit 			BYT_CHK, 
+						SCSICmdField1Bit 			RELADR, 
+						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+						SCSICmdField4Byte 			TRANSFER_LENGTH, 
+						SCSICmdField1Byte 			CONTROL );
+	
+	/* Added with 10.1.3 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 1 );
+	
+	virtual IOReturn	ReadTOC (	IOMemoryDescriptor *	buffer,
+									CDTOCFormat				format,
+									UInt8					msf,
+									UInt32					trackSessionNumber,
+									UInt16 *				actualByteCount );
+	
+	/* Added with 10.1.3 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 2 );
+    
+	virtual IOReturn	ReadDiscInfo (	IOMemoryDescriptor *	buffer,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.1.3 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 3 );
+	
+	virtual IOReturn	ReadTrackInfo (	IOMemoryDescriptor *	buffer,
+										UInt32					address,
+										CDTrackInfoAddressType	addressType,
+										UInt16 *				actualByteCount );
+	
+	/* Added with 10.2 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 4 );
+	
+	virtual IOReturn	PowerDownHandler ( void * 		refCon,
+										   UInt32 		messageType,
+										   IOService * 	provider,
+										   void * 		messageArgument,
+										   vm_size_t 	argSize );
+	
+	/* Added with 10.3.3 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 5 );
+	
+	
+protected:
+	
+	
+	virtual void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
+	
+	
+public:
+	
+	
+	/* Added with 10.5 */
+    OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 6 );
+	
+	virtual	IOReturn	ReadDiscStructure (	IOMemoryDescriptor * 		buffer,
+											const UInt32 				length,
+											const UInt8					structureFormat,
+											const UInt32				logicalBlockAddress,
+											const UInt8					layer,
+											const UInt8 				agid,
+											const UInt8					mediaType );
+	
+	
+	bool		CheckForBDMediaType ( void );
+	
+	
+    bool		READ_DISC_STRUCTURE (
+						SCSITaskIdentifier			request,
+						IOMemoryDescriptor *		dataBuffer,
+						SCSICmdField4Bit 			MEDIA_TYPE,
+						SCSICmdField4Byte 			ADDRESS,
+						SCSICmdField1Byte 			LAYER_NUMBER, 
+						SCSICmdField1Byte 			FORMAT, 
+						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+						SCSICmdField2Bit 			AGID,
+						SCSICmdField1Byte 			CONTROL );
+	
+	
+    OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 7 );
+	
+	virtual	IOReturn	ReserveTrack (	UInt8		reservationType,
+										UInt8		reservationFormat,
+										UInt64		ReservationParameter );
+	
+	
+	bool		RESERVE_TRACK_V2 (	SCSITaskIdentifier		request,
+									SCSICmdField1Bit		RMZ,
+									SCSICmdField1Bit		ARSV,
+									SCSICmdField7Byte		RESERVATION_PARAMETER,
+									SCSICmdField1Byte 		CONTROL					);
+	
+	
+	bool		REPORT_KEY_V2 (	SCSITaskIdentifier			request,
+								IOMemoryDescriptor *		dataBuffer,
+								SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
+								SCSICmdField1Byte			KEY_CLASS,
+								SCSICmdField2Byte 			ALLOCATION_LENGTH,
+								SCSICmdField2Bit 			AGID,
+								SCSICmdField6Bit 			KEY_FORMAT,
+								SCSICmdField1Byte 			CONTROL					);
+	
+	
+	bool		SEND_KEY_V2 (	SCSITaskIdentifier			request,
+								IOMemoryDescriptor *		dataBuffer,
+								SCSICmdField1Byte			KEY_CLASS,
+								SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+								SCSICmdField2Bit 			AGID,
+								SCSICmdField6Bit 			KEY_FORMAT,
+								SCSICmdField1Byte 			CONTROL					);
+	
+	
+protected:
+	
+	
+	void		SetPollingMode ( UInt32 newPollingMode );
+	
+	
+public:
+	
+	
+	/* 10.6.0 */
+	
+	IOReturn	RequestIdle ( void );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 	8 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 	9 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 10 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 11 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 12 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 13 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 14 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 15 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 16 );
+    
+};
+
+#endif /* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceNub.h b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceNub.h
new file mode 100644
index 0000000..f88a1e9
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceNub.h
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_
+#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+// Probe score values
+enum
+{
+	kPeripheralDeviceTypeNoMatch 	= 0,
+	kDefaultProbeRanking 			= 5000,
+	kFirstOrderRanking 				= 10000,
+	kSecondOrderRanking 			= 15000,
+	kThirdOrderRanking 				= 20000
+};
+
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOSyncer.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIProtocolServices.h>
+
+
+// Forward definitions for internal use only classes.
+class SCSIPrimaryCommands;
+
+//-----------------------------------------------------------------------------
+//	Class Declarations
+//-----------------------------------------------------------------------------
+
+class IOSCSIPeripheralDeviceNub : public IOSCSIProtocolServices
+{
+	
+	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceNub )
+	
+private:
+	
+	static bool		sCompareIOProperty (
+										IOService *		object,
+										OSDictionary *	table,
+										char *			propertyKeyName,
+										bool *			matches );
+	
+	static void		TaskCallback ( SCSITaskIdentifier completedTask );
+	void			TaskCompletion ( SCSITaskIdentifier completedTask );
+	
+	static IOReturn	sWaitForTask ( void * object, SCSITask * request );
+	IOReturn		GatedWaitForTask ( SCSITask * request );
+	
+protected:
+
+	SCSIServiceResponse SendTask ( SCSITask * request );
+	
+	bool			InterrogateDevice ( void );										
+
+	// Reserve space for future expansion.
+	struct IOSCSIPeripheralDeviceNubExpansionData { };
+	IOSCSIPeripheralDeviceNubExpansionData * fIOSCSIPeripheralDeviceNubReserved;
+	
+	IOSCSIProtocolInterface *		fProvider;
+#ifndef __LP64__
+	SCSIPrimaryCommands *			fSCSIPrimaryCommandObject;
+#endif
+	UInt8							fDefaultInquiryCount;
+	
+	virtual bool		SendSCSICommand ( 	SCSITaskIdentifier 		request, 
+											SCSIServiceResponse * 	serviceResponse,
+											SCSITaskStatus * 		taskStatus );
+	
+	virtual SCSIServiceResponse	AbortSCSICommand ( SCSITaskIdentifier request );
+	
+	// The IsProtocolServiceSupported will return true if the specified
+	// feature is supported by the protocol layer.  If the service has a value that must be
+	// returned, it will be returned in the serviceValue output parameter.
+	virtual bool	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
+	
+	virtual bool	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
+	
+	// We override this method in order to NOT do power management
+	virtual void	InitializePowerManagement ( IOService * provider );
+	
+public:
+	
+	bool				init	( OSDictionary * propTable );
+	virtual bool		start	( IOService * provider );
+	virtual void		free	( void );
+	
+	virtual IOReturn	message ( UInt32 type, IOService * nub, void * arg );
+										
+	virtual bool		matchPropertyTable ( OSDictionary * table,
+											 SInt32 * score );
+	
+	// The ExecuteCommand method will take a SCSITask object and transport
+	// it across the physical wires to the device
+	virtual	void		ExecuteCommand ( SCSITaskIdentifier	request );
+	
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a specific task be aborted.
+	virtual SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
+
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a all tasks curerntly in the task set be aborted.
+	virtual SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
+
+	virtual SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
+
+	virtual SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
+    
+	virtual SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
+
+	virtual SCSIServiceResponse		TargetReset ( void );
+
+    // ************* Obsoleted Member Routine ****************
+    // The AbortCommand method is replaced by the AbortTask Management function and
+    // should no longer be called.
+	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier abortTask );
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  1 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  2 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 16 );
+	
+};
+
+
+
+class IOSCSILogicalUnitNub : public IOSCSIPeripheralDeviceNub
+{
+	
+	OSDeclareDefaultStructors ( IOSCSILogicalUnitNub )
+	
+private:
+	
+	UInt8				fLogicalUnitNumber;
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSILogicalUnitNubExpansionData { };
+	IOSCSILogicalUnitNubExpansionData * fIOSCSILogicalUnitNubReserved;
+	
+public:
+	
+	virtual bool		start	( IOService * provider );
+	
+	virtual void		SetLogicalUnitNumber ( UInt8 newLUN );
+	
+	UInt8				GetLogicalUnitNumber ( void );
+	
+	// The ExecuteCommand method will take a SCSITask object and transport
+	// it across the physical wires to the device
+	virtual	void		ExecuteCommand ( SCSITaskIdentifier	request );
+	
+	// The AbortCommand method will abort the indicated SCSI Task object,
+	// if it is possible and the SCSI Task has not already completed.
+	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier	abortTask );
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  1 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  2 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 16 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType00.h b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType00.h
new file mode 100644
index 0000000..34fdb18
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType00.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_
+#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIPeripheralDeviceType00 : public IOSCSIBlockCommandsDevice
+{
+	
+	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType00 )
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSIPeripheralDeviceType00ExpansionData
+	{
+		OSSet *	fClients;
+	};
+	IOSCSIPeripheralDeviceType00ExpansionData * fIOSCSIPeripheralDeviceType00Reserved;
+	
+public:
+	
+	bool				init ( OSDictionary * propTable );
+	virtual bool		start ( IOService * provider );
+	virtual void		free ( void );
+
+	virtual bool		handleOpen (
+							  IOService * 	client,
+							  IOOptionBits 	options,
+							  void * 		access );
+	
+	virtual void		handleClose (
+							IOService * 	client,
+							IOOptionBits 	options );
+	
+	virtual bool		handleIsOpen ( const IOService * client ) const;
+	
+    virtual IOReturn	newUserClient (
+    						   task_t			owningTask,
+    						   void *			securityID,
+    						   UInt32			type,
+    						   OSDictionary * 	properties,
+    						   IOUserClient **	handler );
+	virtual void 		CreateStorageServiceNub ( void );
+
+	virtual char *		GetVendorString ( void );
+	virtual char *		GetProductString ( void );
+	virtual char *		GetRevisionString ( void );
+	
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 1 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 2 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType05.h b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType05.h
new file mode 100644
index 0000000..22066f0
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType05.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_
+#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIPeripheralDeviceType05 : public IOSCSIMultimediaCommandsDevice
+{
+	
+	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType05 )
+	
+protected:
+    
+    // Reserve space for future expansion.
+    struct IOSCSIPeripheralDeviceType05ExpansionData { };
+    IOSCSIPeripheralDeviceType05ExpansionData * fIOSCSIPeripheralDeviceType05Reserved;
+	
+public:
+    
+    bool			init	( OSDictionary * propTable );
+    virtual bool	start	( IOService * provider );
+    virtual void 	stop	( IOService *  provider );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 1 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 2 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 3 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 4 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 5 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 6 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 7 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 8 );
+    
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType07.h b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType07.h
new file mode 100644
index 0000000..661136d
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType07.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_
+#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIPeripheralDeviceType07 : public IOSCSIBlockCommandsDevice
+{
+	
+	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType07 )
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSIPeripheralDeviceType07ExpansionData { };
+	IOSCSIPeripheralDeviceType07ExpansionData * fIOSCSIPeripheralDeviceType07Reserved;
+	
+public:
+	
+	bool			init ( OSDictionary * propTable );
+	virtual bool	start ( IOService * provider );
+	virtual void 	stop ( IOService *  provider );
+		
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 1 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 2 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 8 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType0E.h b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType0E.h
new file mode 100644
index 0000000..cc9ec06
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType0E.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_
+#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIPeripheralDeviceType0E : public IOSCSIReducedBlockCommandsDevice
+{
+	
+	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType0E )
+	
+protected:
+    
+    // Reserve space for future expansion.
+    struct IOSCSIPeripheralDeviceType0EExpansionData { };
+    IOSCSIPeripheralDeviceType0EExpansionData * fIOSCSIPeripheralDeviceType0EReserved;
+	
+public:
+    
+    bool			init 	( OSDictionary * propTable );
+    virtual bool	start 	( IOService * provider );
+    virtual void 	stop 	( IOService *  provider );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 1 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 2 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 3 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 4 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 5 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 6 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 7 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 8 );
+    
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPrimaryCommandsDevice.h b/i386/include/IOKit/scsi/IOSCSIPrimaryCommandsDevice.h
new file mode 100644
index 0000000..ba0f1a0
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIPrimaryCommandsDevice.h
@@ -0,0 +1,805 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_
+#define _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOReturn.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOSyncer.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/SCSICommandDefinitions.h>
+#include <IOKit/scsi/SCSICmds_INQUIRY_Definitions.h>
+#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
+#include <IOKit/scsi/IOSCSIProtocolInterface.h>
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+// Notification messages
+enum
+{
+	kSCSIServicesNotification_Suspend	= 0x69000080,
+	kSCSIServicesNotification_Resume	= 0x69000090
+};
+
+
+// Timeout values
+enum
+{
+	kOneSecondTimeoutInMS 		= 1000,
+	kTenSecondTimeoutInMS 		= 10 * kOneSecondTimeoutInMS,
+	kThirtySecondTimeoutInMS	= 30 * kOneSecondTimeoutInMS,
+    kFortyFiveSecondTimeoutInMS	= 45 * kOneSecondTimeoutInMS
+};
+
+// Mode page values for page control field
+enum
+{
+	kModePageControlCurrentValues		= 0x00,
+	kModePageControlChangeableValues	= 0x01,
+	kModePageControlDefaultValues		= 0x02,
+	kModePageControlSavedValues			= 0x03
+};
+
+// The command should be tried 5 times.  The original attempt 
+// plus 4 retries.
+#define kDefaultRetryCount		4
+
+// Forward declarations for internal use only classes
+class SCSIPrimaryCommands;
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIPrimaryCommandsDevice : public IOSCSIProtocolInterface
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIPrimaryCommandsDevice )
+	
+private:
+	
+#ifndef __LP64__
+	SCSIPrimaryCommands *			fSCSIPrimaryCommandObject;
+#endif
+
+	IOSCSIProtocolInterface *		fProtocolDriver;
+	
+	// The fProtocolAccessEnabled member variable indicates whether
+	// requests coming from the client can be sent to the device.
+	// This will be set to true after the Protocol Service driver is successfully 
+	// opened and before the call to InitializeDeviceSupport and set to false before 
+	// TerminateDeviceSupport is called.
+	bool							fProtocolAccessEnabled;
+	
+	// The fDeviceAccessEnabled member variable indicates whether
+	// requests coming from the client can be sent to the device.
+	// This will be set to true after InitializeDeviceSupport is called and
+	// set to false before StopDeviceSupport is called.
+	bool							fDeviceAccessEnabled;
+	bool							fDeviceAccessSuspended;
+	
+	static bool		ServerKeyswitchCallback ( void *		target,
+											  void *		refCon,
+											  IOService *	newService );
+	
+	static void		TaskCallback ( SCSITaskIdentifier completedTask );
+	void			TaskCompletion ( SCSITaskIdentifier completedTask );
+	
+	static IOReturn	sWaitForTask ( void * object, SCSITaskIdentifier request );
+	IOReturn		GatedWaitForTask ( SCSITaskIdentifier request );
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSIPrimaryCommandsDeviceExpansionData
+	{
+		IONotifier *				fKeySwitchNotifier;
+		UInt8						fANSIVersion;
+		UInt32						fReadTimeoutDuration;
+		UInt32						fWriteTimeoutDuration;
+		bool						fCMDQUE;
+		SCSITaggedTaskIdentifier	fTaskID;
+		IOSimpleLock *				fTaskIDLock;
+		UInt32						fRetryCount;
+	};
+	IOSCSIPrimaryCommandsDeviceExpansionData * fIOSCSIPrimaryCommandsDeviceReserved;
+	
+	#define	fReadTimeoutDuration		fIOSCSIPrimaryCommandsDeviceReserved->fReadTimeoutDuration
+	#define	fWriteTimeoutDuration		fIOSCSIPrimaryCommandsDeviceReserved->fWriteTimeoutDuration
+	#define	fRetryCount					fIOSCSIPrimaryCommandsDeviceReserved->fRetryCount
+	
+	
+	UInt8							fDefaultInquiryCount;
+	OSDictionary *					fDeviceCharacteristicsDictionary;
+	UInt32							fNumCommandsOutstanding;
+	
+	virtual void 					free ( void );
+	void							SetANSIVersion ( UInt8 );
+	void							SetCMDQUE ( bool value );
+	IOReturn						GetModeSense ( 
+										IOMemoryDescriptor *		dataBuffer,
+										SCSICmdField6Bit 			PAGE_CODE,
+										SCSICmdField2Byte 			ALLOCATION_LENGTH,
+										bool *						use10ByteModeSense );
+	bool							RetrieveINQUIRYData (
+										UInt8						EVPD,
+										UInt8						inquiryPage,
+										UInt8 *						inquiryBuffer,
+										UInt16 *					dataSize );
+	
+	// This flag is set if the device responds to a MODE_SENSE_10 command
+	// with the page code set to 0x1A (Power Conditions Mode Page)
+	bool							fDeviceSupportsPowerConditions;
+	
+	// This method will retreive the SCSI Primary Command Set object for
+	// the class.  For subclasses, this will be overridden using a
+	// dynamic cast on the base command set object of the subclass.
+
+#ifndef __LP64__
+	
+	// ------ DEPRECATED API ----------
+	// This should no longer be called by subclasses as the command builder
+	// objects will be removed in a later release.
+	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );	
+	
+	// This method is called by the start method to create all the command
+	// objects needed by the class.  For subclasses, this will be overridden
+	// to create its needed command set objects.
+	virtual bool					CreateCommandSetObjects ( void );
+	
+	// This method is called by the free method to free all the command
+	// objects needed by the class.  For subclasses, this will be overridden
+	// to free its needed command set objects.
+	virtual void					FreeCommandSetObjects ( void );
+
+#endif
+	
+	
+	// This method is called by the start method to obtain information from
+	// the device with regards to whether it supports the power conditions mode page.
+	virtual void					CheckPowerConditionsModePage ( void );
+	
+	// This will return back the Protocol driver that is used to
+	// send service requests to the device.
+	virtual IOSCSIProtocolInterface * GetProtocolDriver ( void );
+	
+	// This will get a new SCSITask for the caller
+	virtual SCSITaskIdentifier		GetSCSITask ( void );
+	
+	// This will release a SCSITask (eventually return it to a pool)
+	virtual void					ReleaseSCSITask ( SCSITaskIdentifier request );
+	
+	// This will return a unique value for the tagged task identifier
+	SCSITaggedTaskIdentifier		GetUniqueTagID ( void );
+	
+	// Call for executing the command synchronously	
+	SCSIServiceResponse 			SendCommand ( 	
+										SCSITaskIdentifier 	request,
+										UInt32 				timeoutDuration );
+														
+	// Call for executing the command asycnchronously	
+	void 							SendCommand ( 
+										SCSITaskIdentifier 	request,
+										UInt32 				timeoutDuration,
+										SCSITaskCompletion 	taskCompletion );
+	
+	
+	virtual bool 					InitializeDeviceSupport ( void ) = 0;
+	virtual void 					StartDeviceSupport ( void ) = 0;
+	virtual void 					SuspendDeviceSupport ( void ) = 0;
+	virtual void 					ResumeDeviceSupport ( void ) = 0;
+	virtual void 					StopDeviceSupport ( void ) = 0;
+	virtual void 					TerminateDeviceSupport ( void ) = 0;
+	virtual UInt32					GetNumberOfPowerStateTransitions ( void ) = 0;
+	
+	virtual IOReturn				VerifyDeviceState ( void );
+	// Called to clear any power-on/reset status in the drive
+	virtual bool					ClearPowerOnReset ( void );
+	virtual bool					ClearNotReadyStatus ( void ) = 0;
+	
+	bool							IsProtocolAccessEnabled ( void );
+	bool							IsDeviceAccessEnabled ( void );
+	bool							IsDeviceAccessSuspended ( void );
+
+	// Accessors for saving and retrieving data from an SCSITask object.
+	bool 							ResetForNewTask(	
+										SCSITaskIdentifier 		request );
+	bool							SetTaskAttribute ( 
+										SCSITaskIdentifier 		request, 
+										SCSITaskAttribute 		newAttribute );
+	SCSITaskAttribute				GetTaskAttribute ( 
+										SCSITaskIdentifier 		request );
+	bool							SetTaggedTaskIdentifier ( 
+										SCSITaskIdentifier 			request, 
+										SCSITaggedTaskIdentifier	taggedTaskIdentifier );
+	SCSITaggedTaskIdentifier		GetTaggedTaskIdentifier ( 
+										SCSITaskIdentifier 		request );
+	bool							SetTaskState ( 	
+										SCSITaskIdentifier 		request,
+										SCSITaskState 			newTaskState );
+	SCSITaskState					GetTaskState ( 
+										SCSITaskIdentifier 		request );
+	bool							SetTaskStatus ( 
+										SCSITaskIdentifier 		request, 
+										SCSITaskStatus 			newStatus );
+	SCSITaskStatus					GetTaskStatus ( 
+										SCSITaskIdentifier 		request );
+	bool 							SetCommandDescriptorBlock ( 
+										SCSITaskIdentifier 		request,
+										UInt8					cdbByte0,
+										UInt8					cdbByte1,
+										UInt8					cdbByte2,
+										UInt8					cdbByte3,
+										UInt8					cdbByte4,
+										UInt8					cdbByte5 );
+	
+	// Populate the 10 Byte Command Descriptor Block
+	bool 							SetCommandDescriptorBlock ( 
+										SCSITaskIdentifier 		request,
+										UInt8					cdbByte0,
+										UInt8					cdbByte1,
+										UInt8					cdbByte2,
+										UInt8					cdbByte3,
+										UInt8					cdbByte4,
+										UInt8					cdbByte5,
+										UInt8					cdbByte6,
+										UInt8					cdbByte7,
+										UInt8					cdbByte8,
+										UInt8					cdbByte9 );
+	
+	// Populate the 12 Byte Command Descriptor Block
+	bool 							SetCommandDescriptorBlock ( 
+										SCSITaskIdentifier 		request,
+										UInt8					cdbByte0,
+										UInt8					cdbByte1,
+										UInt8					cdbByte2,
+										UInt8					cdbByte3,
+										UInt8					cdbByte4,
+										UInt8					cdbByte5,
+										UInt8					cdbByte6,
+										UInt8					cdbByte7,
+										UInt8					cdbByte8,
+										UInt8					cdbByte9,
+										UInt8					cdbByte10,
+										UInt8					cdbByte11 );
+	
+	// Populate the 16 Byte Command Descriptor Block
+	bool 							SetCommandDescriptorBlock ( 
+										SCSITaskIdentifier 		request,
+										UInt8					cdbByte0,
+										UInt8					cdbByte1,
+										UInt8					cdbByte2,
+										UInt8					cdbByte3,
+										UInt8					cdbByte4,
+										UInt8					cdbByte5,
+										UInt8					cdbByte6,
+										UInt8					cdbByte7,
+										UInt8					cdbByte8,
+										UInt8					cdbByte9,
+										UInt8					cdbByte10,
+										UInt8					cdbByte11,
+										UInt8					cdbByte12,
+										UInt8					cdbByte13,
+										UInt8					cdbByte14,
+										UInt8					cdbByte15 );
+										
+	bool							SetDataTransferDirection ( 
+										SCSITaskIdentifier 		request, 
+										UInt8 					newDirection );
+	UInt8							GetDataTransferDirection ( 
+										SCSITaskIdentifier 		request );
+	bool							SetRequestedDataTransferCount (
+										SCSITaskIdentifier 		request, 
+										UInt64 					newRequestedCount );
+	UInt64							GetRequestedDataTransferCount (
+										SCSITaskIdentifier 		request );
+	bool							SetRealizedDataTransferCount (
+										SCSITaskIdentifier 		request,
+										UInt64 					newRealizedDataCount );
+	UInt64							GetRealizedDataTransferCount ( 
+										SCSITaskIdentifier 		request );
+	bool							SetDataBuffer ( 
+										SCSITaskIdentifier 		request, 
+										IOMemoryDescriptor * 	newBuffer );
+	IOMemoryDescriptor *			GetDataBuffer ( 
+										SCSITaskIdentifier 		request );
+	bool							SetTimeoutDuration ( 
+										SCSITaskIdentifier 		request, 
+										UInt32 					newTimeout );
+	UInt32							GetTimeoutDuration ( 
+										SCSITaskIdentifier 		request );
+	bool							SetTaskCompletionCallback ( 
+										SCSITaskIdentifier 		request,
+										SCSITaskCompletion 		newCallback );
+	void							TaskCompletedNotification ( 
+										SCSITaskIdentifier 		request );
+	
+	bool							SetServiceResponse (
+										SCSITaskIdentifier 		request,
+										SCSIServiceResponse 	serviceResponse );
+	SCSIServiceResponse 			GetServiceResponse (
+										SCSITaskIdentifier 		request );
+	bool							SetAutosenseCommand (
+										SCSITaskIdentifier 		request,
+										UInt8					cdbByte0,
+										UInt8					cdbByte1,
+										UInt8					cdbByte2,
+										UInt8					cdbByte3,
+										UInt8					cdbByte4,
+										UInt8					cdbByte5 );
+	bool							GetAutoSenseData (
+										SCSITaskIdentifier 		request,
+										SCSI_Sense_Data * 		senseData ); // DEPRECATED, use below function instead
+	bool							GetAutoSenseData (
+										SCSITaskIdentifier 		request,
+										SCSI_Sense_Data * 		senseData,
+										UInt8					senseDataSize );
+	UInt8							GetAutoSenseDataSize (
+										SCSITaskIdentifier 		request );
+	
+	bool							SetApplicationLayerReference (
+										SCSITaskIdentifier 		request,
+										void * 					newReferenceValue );
+	void *							GetApplicationLayerReference (
+										SCSITaskIdentifier 		request );
+	
+	void 							IncrementOutstandingCommandsCount ( void );
+	static void						sIncrementOutstandingCommandsCount ( 
+										IOSCSIPrimaryCommandsDevice * self );
+	virtual void					HandleIncrementOutstandingCommandsCount ( void );	
+	
+
+	// This static member routine provides a mechanism for retrieving a pointer to
+	// the object that is claimed as the owner of the specified SCSITask.
+	static OSObject *				sGetOwnerForTask ( SCSITaskIdentifier request );
+	
+public:
+	
+	bool				init ( OSDictionary * propTable );
+	virtual bool		start ( IOService * provider );
+	virtual void		stop ( IOService *  provider );
+	virtual IOReturn 	message ( UInt32 type, IOService * nub, void * arg );
+	
+	// The setAgressiveness method is called by the power manager
+	// to notify us of certain power management settings. We override
+	// this method in order to catch the kPMMinutesToSpinDown message
+	// in order to set our idle timer.
+	virtual IOReturn 	setAggressiveness ( unsigned long type, unsigned long minutes );
+	
+	// Methods for getting device information strings
+	virtual char *		GetVendorString ( void );
+	virtual char *		GetProductString ( void );
+	virtual char *		GetRevisionString ( void );
+	OSDictionary *		GetProtocolCharacteristicsDictionary ( void );
+	OSDictionary *		GetDeviceCharacteristicsDictionary ( void );	
+	UInt8				GetANSIVersion ( void );
+	bool				GetCMDQUE ( void );
+    OSString *          MapINQUIRYDataToIconFile ( void );
+	UInt32				GetRetryCount ( void );
+	
+	// -- SCSI Protocol Interface Methods	--
+	// The ExecuteCommand method will take a SCSI Task and transport
+	// it across the physical wire(s) to the device
+	virtual void		ExecuteCommand ( SCSITaskIdentifier request );
+	
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a specific task be aborted.
+	SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
+
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a all tasks curerntly in the task set be aborted.
+	SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
+    
+	SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		TargetReset ( void );
+
+	// The AbortCommand method will abort the indicated SCSI Task,
+	// if it is possible and the task has not already completed.
+	virtual SCSIServiceResponse	AbortCommand ( SCSITaskIdentifier request );
+	
+	// The IsProtocolServiceSupported will return true if the specified
+	// feature is supported by the protocol layer.  If the service has a value that must be
+	// returned, it will be returned in the serviceValue output parameter.
+	virtual bool		IsProtocolServiceSupported (
+											SCSIProtocolFeature feature,
+											void *				serviceValue );
+	
+	// The HandleProtocolServiceFeature will return true if the specified feature could
+	// be handled properly by the protocol layer.
+	virtual bool		HandleProtocolServiceFeature (
+											SCSIProtocolFeature	feature,
+											void *				serviceValue );
+	
+	// Utility methods for use by all peripheral device objects.
+
+	// isParameterValid are used to validate that the parameter passed into
+	// the command methods are of the correct value.
+	
+	// Validate Parameter used for 1 bit to 1 byte paramaters
+    bool 				IsParameterValid ( 
+							SCSICmdField1Byte 			param,
+							SCSICmdField1Byte 			mask );
+	
+	// Validate Parameter used for 9 bit to 2 byte paramaters
+	bool 				IsParameterValid ( 
+							SCSICmdField2Byte 			param,
+							SCSICmdField2Byte 			mask );
+	
+	// Validate Parameter used for 17 bit to 4 byte paramaters
+	bool 				IsParameterValid ( 
+							SCSICmdField4Byte 			param,
+							SCSICmdField4Byte 			mask );
+	
+	// Validate Parameter used for 33 bit to 8 byte paramaters
+	bool 				IsParameterValid ( 
+							SCSICmdField8Byte 			param,
+							SCSICmdField8Byte 			mask );
+	
+
+	bool 				IsMemoryDescriptorValid (
+							IOMemoryDescriptor * 		dataBuffer );
+	
+	bool 				IsMemoryDescriptorValid (
+							IOMemoryDescriptor * 		dataBuffer,
+							UInt64						requiredSize );
+
+#ifndef __LP64__
+	
+	// SCSI Primary command implementations
+	virtual bool		CHANGE_DEFINITION (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			SAVE,
+							SCSICmdField7Bit 			DEFINITION_PARAMETER,
+							SCSICmdField1Byte 			PARAMETER_DATA_LENGTH,
+			 				SCSICmdField1Byte 			CONTROL );
+	  
+	virtual bool		COMPARE (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+	 						SCSICmdField1Bit 			PAD,
+							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+			
+	virtual bool		COPY (
+							SCSITaskIdentifier			request,
+   							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PAD,
+							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+	  
+	virtual bool		COPY_AND_VERIFY (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			BYTCHK,
+							SCSICmdField1Bit 			PAD,
+							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		EXTENDED_COPY (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	virtual bool		INQUIRY (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			CMDDT,
+							SCSICmdField1Bit 			EVPD,
+							SCSICmdField1Byte 			PAGE_OR_OPERATION_CODE,
+							SCSICmdField1Byte 			ALLOCATION_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		LOG_SELECT (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PCR,
+							SCSICmdField1Bit 			SP,
+							SCSICmdField2Bit 			PC,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );  
+
+	virtual bool		LOG_SENSE (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PPC,
+							SCSICmdField1Bit 			SP,
+							SCSICmdField2Bit 			PC,
+							SCSICmdField6Bit 			PAGE_CODE,
+							SCSICmdField2Byte 			PARAMETER_POINTER,
+							SCSICmdField2Byte 			ALLOCATION_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );  
+	
+	virtual bool		MODE_SELECT_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PF,
+							SCSICmdField1Bit 			SP,
+							SCSICmdField1Byte 			PARAMETER_LIST_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );  
+
+   	virtual bool		MODE_SELECT_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PF,
+							SCSICmdField1Bit 			SP,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );  
+
+   	virtual bool		MODE_SENSE_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			DBD,
+	   						SCSICmdField2Bit 			PC,
+	   						SCSICmdField6Bit 			PAGE_CODE,
+	   						SCSICmdField1Byte 			ALLOCATION_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+   	virtual bool		MODE_SENSE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			LLBAA,
+							SCSICmdField1Bit 			DBD,
+	   						SCSICmdField2Bit 			PC,
+	   						SCSICmdField6Bit 			PAGE_CODE,
+	   						SCSICmdField2Byte 			ALLOCATION_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+  	virtual bool		PERSISTENT_RESERVE_IN (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+	   						SCSICmdField5Bit 			SERVICE_ACTION,
+	   						SCSICmdField2Byte 			ALLOCATION_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+   	virtual bool		PERSISTENT_RESERVE_OUT (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+	   						SCSICmdField5Bit 			SERVICE_ACTION,
+	   						SCSICmdField4Bit 			SCOPE,
+	   						SCSICmdField4Bit 			TYPE,
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		PREVENT_ALLOW_MEDIUM_REMOVAL (
+							SCSITaskIdentifier			request,
+		 					SCSICmdField2Bit 			PREVENT, 
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		READ_BUFFER (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField4Bit 			MODE,
+							SCSICmdField1Byte 			BUFFER_ID,
+							SCSICmdField3Byte 			BUFFER_OFFSET,
+							SCSICmdField3Byte 			ALLOCATION_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		RECEIVE (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+		 					SCSICmdField3Byte 			TRANSFER_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		RECEIVE_DIAGNOSTICS_RESULTS (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+		 					SCSICmdField1Bit 			PCV,
+		 					SCSICmdField1Byte			PAGE_CODE,
+		 					SCSICmdField2Byte 			ALLOCATION_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+	virtual bool		RELEASE_6 (
+							SCSITaskIdentifier			request,
+							SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+	virtual bool		RELEASE_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			EXTENT,
+							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
+							SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	virtual bool		RELEASE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			THRDPTY,
+							SCSICmdField1Bit 			LONGID,
+							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+	virtual bool		RELEASE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			THRDPTY,
+							SCSICmdField1Bit 			LONGID,
+							SCSICmdField1Bit 			EXTENT,
+							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
+							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	virtual bool		REPORT_DEVICE_IDENTIFIER ( 
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField4Byte 			ALLOCATION_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+   	virtual bool		REPORT_LUNS ( 
+							SCSITaskIdentifier			request,
+   							IOMemoryDescriptor *		dataBuffer,
+				   			SCSICmdField4Byte 			ALLOCATION_LENGTH,
+				   			SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool		REQUEST_SENSE (
+							SCSITaskIdentifier			request,
+   							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Byte 			ALLOCATION_LENGTH, 
+							SCSICmdField1Byte 			CONTROL );
+ 	
+ 	virtual bool		RESERVE_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+ 	virtual bool		RESERVE_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			EXTENT,
+							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	virtual bool		RESERVE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			THRDPTY,
+							SCSICmdField1Bit 			LONGID,
+							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#ifndef __LP64__
+
+	virtual bool		RESERVE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			THRDPTY,
+							SCSICmdField1Bit 			LONGID,
+							SCSICmdField1Bit 			EXTENT,
+							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
+							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
+							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+#endif	/* !__LP64__ */
+	
+	virtual bool		SEND (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit			AER,
+		 					SCSICmdField3Byte 			TRANSFER_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+
+  	virtual bool		SEND_DIAGNOSTICS (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+				  		 	SCSICmdField3Bit 			SELF_TEST_CODE,
+				  		 	SCSICmdField1Bit 			PF,
+				  		 	SCSICmdField1Bit 			SELF_TEST,
+				  		 	SCSICmdField1Bit 			DEVOFFL,
+				  		 	SCSICmdField1Bit 			UNITOFFL,
+				  	 		SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
+				  	 		SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool		SET_DEVICE_IDENTIFIER (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField5Bit 			SERVICE_ACTION,
+							SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+	
+	virtual bool		TEST_UNIT_READY (
+							SCSITaskIdentifier			request,
+							SCSICmdField1Byte 			CONTROL );
+ 	
+	virtual bool		WRITE_BUFFER (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField4Bit 			MODE,
+							SCSICmdField1Byte 			BUFFER_ID,
+							SCSICmdField3Byte 			BUFFER_OFFSET,
+							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
+							SCSICmdField1Byte 			CONTROL );
+	
+	// The SPC-3 INQUIRY command as defined in section 6.4.1 of SPC-3.
+	bool				INQUIRY (
+							SCSITaskIdentifier			request,
+  							IOMemoryDescriptor *		dataBuffer,
+    						SCSICmdField1Bit 			EVPD,
+    						SCSICmdField1Byte 			PAGE_CODE,
+    						SCSICmdField2Byte 			ALLOCATION_LENGTH,
+    						SCSICmdField1Byte 			CONTROL );
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  1 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  2 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 16 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIProtocolInterface.h b/i386/include/IOKit/scsi/IOSCSIProtocolInterface.h
new file mode 100644
index 0000000..bb74ce4
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIProtocolInterface.h
@@ -0,0 +1,854 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_
+#define _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_
+
+
+/*! @header SCSI Protocol Interface
+	@discussion
+	This file contains definitions for the IOSCSIProtocolInterface class,
+	SCSI Protocol Features used by this interface, and additional constants
+	used by this interface.
+*/
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+/*
+SCSI Device Characteristics - Defined between SCSI Application Layer and
+							  SCSI Protocol Layer only.
+*/
+
+/*!
+@constant kIOPropertySCSIDeviceCharacteristicsKey
+@discussion
+This key is used to define SCSI Device Characteristics for a particular device.
+It is the key for the dictionary containing the keys of characteristics. These keys
+are only defined between the SCSI Protocol Layer and the SCSI Applicaiton Layer. Some
+properties may be copied from this dictionary to the more generic Device Characteristics
+or Protocol Characteristics dictionaries.
+*/
+#define kIOPropertySCSIDeviceCharacteristicsKey		"SCSI Device Characteristics"
+
+/*!
+@constant kIOPropertySCSIInquiryLengthKey
+@discussion
+This key is used to define a default INQUIRY length to issue to the device. The
+value is a UInt32 corresponding to the number of bytes to request in the INQUIRY
+command.
+*/
+#define kIOPropertySCSIInquiryLengthKey				"Inquiry Length"
+
+/*!
+@constant kIOPropertySCSIManualEjectKey
+@discussion
+This key is used to indicate that the device is known to be a manual ejectable media
+device.  This property overrides all of the driver checks for determining this capability.
+This property is a string, although if it exists it should always be true.
+*/
+#define kIOPropertySCSIManualEjectKey				"Manual Eject"
+
+/*!
+@constant kIOPropertyReadTimeOutDurationKey
+@discussion
+This key is used to define the Read Time Out for a particular device.
+This property overrides all of the protocol defaults.
+This property is a value, in milliseconds.
+*/
+#define kIOPropertyReadTimeOutDurationKey			"Read Time Out Duration"
+
+/*!
+@constant kIOPropertyWriteTimeOutDurationKey
+@discussion
+This key is used to define the Write Time Out for a particular device.
+This property overrides all of the protocol defaults.
+This property is a value, in milliseconds.
+*/
+#define kIOPropertyWriteTimeOutDurationKey			"Write Time Out Duration"
+
+/*!
+@constant kIOPropertyRetryCountKey
+@discussion
+This key is used to define the number of Read/Write retries for a particular device.
+This property overrides all of the protocol defaults.
+The value is a UInt32 corresponding to the number of retries.
+*/
+#define kIOPropertyRetryCountKey					"Retry Count"
+
+/*!
+ @constant kIOPropertyAutonomousSpinDownKey
+ @discussion
+ This key is used to indicate that the device is known to have its own internal logic
+ for idle disk spin down. This key is used to mark device which respon poorly to our
+ efforts to manually spin down or spin up the device when it is already in the desired 
+ state. 
+ */
+#define kIOPropertyAutonomousSpinDownKey			"Autonomous Spin Down"
+
+/*!
+ @constant kIOPropertyEjectRequireStartStopUnitKey
+ @discussion
+ This key is used to indicate that while the device may have failed PREVENT_ALLOW_MEDIUM
+ REMOVAL it still requires a START_STOP_UNIT to eject/unload media. 
+ */
+#define kIOPropertyEjectRequireStartStopUnitKey		"Eject Requires START_STOP_UNIT"
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+/*!
+@constant kCFBundleIdentifierKey
+@discussion
+Property key for CFBundleIdentifier.
+*/
+#define kCFBundleIdentifierKey					"CFBundleIdentifier"
+
+/*!
+@constant kIOSCSIArchitectureBundleIdentifierKey
+@discussion
+IOSCSIArchitectureModelFamily's CFBundle identifier.
+*/
+#define kIOSCSIArchitectureBundleIdentifierKey	"com.apple.iokit.IOSCSIArchitectureModelFamily"
+
+
+// General kernel headers
+#include <kern/thread.h>
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IOWorkLoop.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/SCSITask.h>
+
+
+/*!
+@enum SCSI Protocol Interface Device Notification values
+@discussion
+Message values for SCSI Protocol Interface Device Notifications.
+@constant kSCSIProtocolNotification_DeviceRemoved
+Private message sent between a SCSI protocol service provider and
+SCSI application layer driver to indicate device removal.
+@constant kSCSIProtocolNotification_VerifyDeviceState
+Private message sent between a SCSI protocol service provider and
+SCSI application layer driver to indicate device state may have
+changed and the device state should be re-verified by the SCSI
+Application Layer driver. An example would be a bus reset which clears
+the tray locking state of an ATAPI device.
+@constant kSCSIServicesNotification_ExclusivityChanged
+Message sent when a change in exclusivity state occurs. Usually in
+response to acquiring/releasing exclusive access to a device via a user client.
+*/
+enum
+{
+	kSCSIProtocolNotification_DeviceRemoved			= 0x69000010,
+	kSCSIProtocolNotification_VerifyDeviceState		= 0x69000020,
+	kSCSIServicesNotification_ExclusivityChanged	= 0x69000030
+};
+
+
+/*!
+@typedef SCSIProtocolFeature
+@discussion
+Typedef for SCSIProtocolFeature, a 32-bit quantity.
+*/
+typedef UInt32 SCSIProtocolFeature;
+
+/*!
+@enum SCSI Protocol Features
+@discussion
+The list of SCSI Protocol Features currently supported.
+*/
+enum
+{
+	
+	/*!
+	@constant kSCSIProtocolFeature_ACA Not yet used.
+	*/
+	kSCSIProtocolFeature_ACA								= 1,
+	
+	/*!
+	@constant kSCSIProtocolFeature_CPUInDiskMode Used to determine
+	if the SCSI Protocol Services Driver supports a CPU which is in
+	target disk mode.
+	*/
+	kSCSIProtocolFeature_CPUInDiskMode						= 2,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolSpecificPolling Used
+	to determine if the SCSI Protocol Services Driver supports
+	protocol specific polling for media. This is used for low-power
+	polling specifically for ATAPI devices on ATA buses
+	*/
+	kSCSIProtocolFeature_ProtocolSpecificPolling			= 3,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolSpecificSleepCommand Used
+	to determine if the SCSI Protocol Services Driver supports
+	protocol specific sleep commands to a drive. This is used for
+	sleeping drives specifically ATAPI devices on ATA buses.
+	*/
+	kSCSIProtocolFeature_ProtocolSpecificSleepCommand		= 4,
+	
+	/*!
+	@constant kSCSIProtocolFeature_GetMaximumLogicalUnitNumber If
+	the SCSI Protocol Services Driver supports logical units, it will
+	report the maximum addressable ID that it supports in the UInt32 pointer
+	that is passed in as the serviceValue. If only one unit is supported,
+	the driver should return false for this query.
+	*/
+	kSCSIProtocolFeature_GetMaximumLogicalUnitNumber		= 5,
+	
+	/*!
+	@constant kSCSIProtocolFeature_MaximumReadBlockTransferCount If
+	the SCSI Protocol Services Driver has a maximum number of
+	blocks that can be transfered in a read request, it will return
+	true to this query and return the block count in the UInt32 pointer
+	that is passed in as the serviceValue.
+	*/
+	kSCSIProtocolFeature_MaximumReadBlockTransferCount		= 6,
+
+	/*!
+	@constant kSCSIProtocolFeature_MaximumWriteBlockTransferCount If
+	the SCSI Protocol Services Driver has a maximum number of
+	blocks that can be transferred in a write request, it will return
+	true to this query and return the block count in the UInt32 pointer
+	that is passed in as the serviceValue.
+	*/
+	kSCSIProtocolFeature_MaximumWriteBlockTransferCount		= 7,
+
+	/*!
+	@constant kSCSIProtocolFeature_MaximumReadTransferByteCount If
+	the SCSI Protocol Services Driver has a maximum byte count
+	that can be transferred in a read request, it will return
+	true to this query and return the byte count in the UInt64 pointer
+	that is passed in as the serviceValue.
+	*/
+	kSCSIProtocolFeature_MaximumReadTransferByteCount		= 8,
+
+	/*!
+	@constant kSCSIProtocolFeature_MaximumWriteTransferByteCount If
+	the SCSI Protocol Services Driver has a maximum byte count
+	that can be transferred in a write request, it will return
+	true to this query and return the byte count in the UInt64 pointer
+	that is passed in as the serviceValue.
+	*/
+	kSCSIProtocolFeature_MaximumWriteTransferByteCount		= 9,
+	
+	/*!
+	@constant kSCSIProtocolFeature_SubmitDefaultInquiryData If
+	the SCSI Protocol Services Driver needs any extra information to
+	make any negotiation settings from the standard INQUIRY data, this 
+	will be called to set that appropriately. The serviceValue will
+	point to a SCSICmd_INQUIRY_StandardData buffer. The size
+	of the buffer depends on the SCSI Device Characteristics
+	dictionary for the device or bus. If there is no
+	kIOPropertySCSIInquiryLengthKey value set in the dictionary
+	or if it doesn't exist, then the size of the data will be
+	the size of the full amount of Inquiry retrieved from the device.
+	*/
+	kSCSIProtocolFeature_SubmitDefaultInquiryData			= 10,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolAlwaysReportsAutosenseData If
+	the SCSI Protocol Services Driver always reports available
+	autosense data when a kSCSITaskStatus_CHECK_CONDITION is set,
+	then the protocol layer should return true. E.g. FireWire
+	transport drivers should respond true to this.
+	*/
+	kSCSIProtocolFeature_ProtocolAlwaysReportsAutosenseData	= 11,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolSpecificPowerOff If
+	the SCSI Protocol Services Driver supports removing the power
+	to the drive, then the protocol layer should return true. This is
+	used for aggressive power management, specifically for ATAPI
+	devices on ATA buses.
+	*/
+	kSCSIProtocolFeature_ProtocolSpecificPowerOff			= 12,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolSpecificPowerControl
+	Used to determine if the SCSI Protocol Services Driver supports
+	switching the power to the drive on and off. This is used for aggressive
+	power management, specifically for SATAPI devices on AHCI buses.
+	*/
+	kSCSIProtocolFeature_ProtocolSpecificPowerControl		= 13,
+	
+	/*!
+	@constant kSCSIProtocolFeature_ProtocolSpecificAsyncNotification
+	Used to determine if the SCSI Protocol Services Driver supports
+	asynchronous notifications from the drive. This is used to prevent
+	polling for media, specifically for SATAPI devices on AHCI buses.
+	*/
+	kSCSIProtocolFeature_ProtocolSpecificAsyncNotification	= 14
+	
+};
+
+
+/*!
+@typedef SCSIProtocolPowerState
+@discussion
+Typedef for SCSIProtocolPowerState, a 32-bit quantity.
+*/
+typedef UInt32 SCSIProtocolPowerState;
+
+/*!
+@enum SCSI Protocol Power States
+@discussion
+The list of SCSI Protocol Power States.
+*/
+enum
+{
+	/*!
+	@constant kSCSIProtocolPowerStateOff
+	Off power state.
+	*/
+	kSCSIProtocolPowerStateOff			= 0,
+
+	/*!
+	@constant kSCSIProtocolPowerStateOn
+	On power state.
+	*/
+	kSCSIProtocolPowerStateOn			= 1
+};
+
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+/*!
+@class IOSCSIProtocolInterface
+@superclass IOService
+@discussion
+This class defines the public SCSI Protocol Layer API for any class that
+provides Protocol services or needs to provide the Protocol Service API
+for passing service requests to a Protocol Service driver.
+*/
+class IOSCSIProtocolInterface : public IOService
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIProtocolInterface )
+	
+public:
+	
+	/*!
+	@function start
+	@abstract During an IOService object's instantiation, starts the IOService object that has been selected to run on the provider.
+	@discussion See IOService.h for details.
+	@result <code>true</code> if the start was successful; <code>false</code> otherwise (which will cause the instance to be detached and usually freed).
+	*/
+	virtual bool	start ( IOService * provider );
+	
+	/*!
+	@function free
+	@abstract Called to release all resources held by the object.
+	@discussion Release all resources held by the object, then call super::free().  
+	*/	
+	virtual void	free ( void );
+
+	/*!
+	@function willTerminate
+	@abstract Passes a termination up the stack.
+	@discussion Notification that a provider has been terminated, sent before recursing up the stack, in root-to-leaf order.
+	@param provider The terminated provider of this object.
+	@param options Options originally passed to terminate().
+	@result <code>true</code>.
+	*/
+	virtual bool	willTerminate ( IOService * provider, IOOptionBits options );
+	
+	/*!
+	@function GetUserClientExclusivityState
+	@abstract Gets the current exclusivity state of the user client.
+	@discussion The GetUserClientExclusivityState() method is called by the SCSITaskUserClient
+	to determine if any user client is holding exclusive access at the current time. This is simply
+	a preflight check and a return value of <code>false</code> does not guarantee that a subsequent
+	call to SetUserClientExclusivityState() will return successfully.
+	@result <code>true</code> if a user client is in exclusive control of the device, <code>false</code> otherwise.
+	*/
+	virtual bool 		GetUserClientExclusivityState ( void );
+	
+	/*!
+	@function SetUserClientExclusivityState
+	@abstract Sets the current exclusivity state of the user client.
+	@discussion The SetUserClientExclusivityState() method is called by the SCSITaskUserClient
+	to set the exclusive access mode.
+	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
+	@param state Exclusivity state. <code>true</code> means exclusive access is desired, <code>false</code>
+	means exclusive access is being released.
+	@result A valid IOReturn code indicating success or the type of failure.
+	*/
+	virtual IOReturn	SetUserClientExclusivityState ( IOService * userClient, bool state );
+	
+	
+	/*!
+	@function initialPowerStateForDomainState
+	@abstract Determines which power state a device is in, given the current power domain state.
+	@discussion Power management calls this method once, when the driver is initializing power management.
+	Subclasses should not need to override this method.
+	@param flags Flags that describe the character of "domain power"; they represent the <code>outputPowerCharacter</code> field of a state in the power domain's power state array. 
+	@result A state number. 
+	*/
+	virtual unsigned long	initialPowerStateForDomainState ( IOPMPowerFlags flags );
+	
+	/*!
+	@function setPowerState
+	@abstract Requests a power managed driver to change the power state of its device.
+	@discussion Requests a power managed driver to change the power state of its device. Most subclasses
+	of IOSCSIProtocolInterface have class-specific mechanisms and should not override this routine.
+	See IOSCSIProtocolServices.h, IOSCSIBlockCommandsDevice.h, IOSCSIReducedBlockCommandsDevice.h, and
+	IOSCSIMultimediaCommandsDevice.h for more information about power management changes.
+	Subclasses should not need to override this method.
+	@param powerStateOrdinal The number in the power state array to which the drive is being instructed to change.
+	@param whichDevice A pointer to the power management object which registered to manage power for this device.
+	The whichDevice field is not pertinent to us since the driver is both the "policy maker" for the device,
+	and the "policy implementor" for the device.
+	@result See IOService.h for details.
+	*/
+	virtual IOReturn 	setPowerState ( unsigned long powerStateOrdinal, IOService * whichDevice );
+	
+	/*!
+	@function IsPowerManagementIntialized
+	@abstract Called to determine if power management is initialized.
+	@discussion Called to determine if power management is initialized.
+	Subclasses should not need to override this method.
+	@result <code>true</code> if power management has been initialized, <code>false</code> otherwise.
+	*/
+	virtual bool		IsPowerManagementIntialized ( void );
+	
+	/*!
+	@function CheckPowerState
+	@abstract Called by clients to ensure device is in correct power state before issuing I/O.
+	@discussion Called by clients to ensure device is in correct power state before issuing I/O.
+	If the device is not ready to handle such requests, it gives the driver a chance to block the
+	thread until the device is ready. Subclasses should not need to override this method.
+	*/
+	virtual void 		CheckPowerState ( void );
+	
+	/*!
+	@function ExecuteCommand
+	@abstract Called to send a SCSITask and transport it across the physical wire(s) to the device.
+	@discussion Called to send a SCSITask and transport it across the physical wire(s) to the device.
+	Subclasses internal to IOSCSIArchitectureModelFamily will need to override this method. Third
+	party subclasses should not need to override this method.
+	@param request A valid SCSITaskIdentifier representing the task to transport across the wire(s).
+	*/
+	virtual void		ExecuteCommand ( SCSITaskIdentifier request ) = 0;
+	
+	/*!
+	@function AbortCommand
+	@abstract Obsolete. Do not use this method.
+	@discussion Obsolete. Do not use this method.
+	*/
+	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier request ) = 0;
+	
+	/*!
+	@function IsProtocolServiceSupported
+	@abstract This method is called to query for support of a protocol specific service feature.
+	@discussion This method is called to query for support of a protocol specific service feature.
+	Subclasses of IOSCSIProtocolServices should override this method.
+	@param feature A valid SCSIProtocolFeature. See enums for SCSIProtocolFeature.
+	@param serviceValue A pointer to a structure/value that is used in conjunction with the feature
+	requested. See enums for SCSIProtocolFeature. NB: This parameter may be NULL for certain
+	feature requests.
+	@result <code>true</code> if the feature is supported, <code>false</code> otherwise.
+	*/
+	virtual bool		IsProtocolServiceSupported ( 
+								SCSIProtocolFeature 	feature, 
+								void * 					serviceValue ) = 0;
+	
+	/*!
+	@function HandleProtocolServiceFeature
+	@abstract This method is called to enact support of a protocol specific service feature.
+	@discussion This method is called to enact support of a protocol specific service feature.
+	Subclasses of IOSCSIProtocolServices should override this method.
+	@param feature A valid SCSIProtocolFeature. See enums for SCSIProtocolFeature.
+	@param serviceValue A pointer to a structure/value that is used in conjunction with the feature
+	requested. See enums for SCSIProtocolFeature. NB: This parameter may be NULL for certain
+	feature requests.
+	@result <code>true</code> if the service feature request succeeded, <code>false</code> otherwise.
+	*/
+	virtual bool		HandleProtocolServiceFeature ( 
+								SCSIProtocolFeature 	feature, 
+								void * 					serviceValue ) = 0;
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSIProtocolInterfaceExpansionData
+	{
+		IOWorkLoop *	fWorkLoop;
+	};
+	IOSCSIProtocolInterfaceExpansionData * fIOSCSIProtocolInterfaceReserved;
+	
+	// ------ Power Management Support ------
+	
+	thread_call_t		fPowerManagementThread;
+	IOCommandGate *		fCommandGate;
+	UInt32				fCurrentPowerState;
+	UInt32				fProposedPowerState;
+	bool				fPowerTransitionInProgress;
+	bool				fPowerAckInProgress;
+	bool				fPowerManagementInitialized;
+	
+	/*!
+	@function GetCommandGate
+	@abstract Accessor method to obtain the IOCommandGate.
+	@discussion Accessor method to obtain the IOCommandGate.
+	@result The IOCommandGate for this instance. May return NULL.
+	*/
+	IOCommandGate *		GetCommandGate ( void );
+	
+	/*!
+	@function InitializePowerManagement
+	@abstract This method is called to initialize power management.
+	@discussion This method is called to initialize power management. It will call PMinit(), joinPMTree(),
+	setIdleTimerPeriod(), and makeUsable(). This method does not call registerPowerDriver().
+	Subclasses may override this method to change the behavior (such as the number of power states).
+	@param provider The power management provider (i.e. the provider to attach to in the PowerManagement
+	tree). This may be a device that is not in the PM Tree itself, in which case, the IOService plane
+	is traversed towards the root node in an effort to find a node in the PM Tree.
+	*/
+	virtual void		InitializePowerManagement ( IOService * provider );
+	
+	/*!
+	@function GetInitialPowerState
+	@abstract This method is called to obtain the initial power state of the device (usually the highest).
+	@discussion This method is called to obtain the initial power state of the device (usually the highest).
+	Subclasses must override this method.
+	@result A power state ordinal.
+	*/
+	virtual UInt32		GetInitialPowerState ( void ) = 0;
+	
+	/*!
+	@function finalize
+	@abstract Finalizes the destruction of an IOService object.
+	@discussion See IOService.h
+	Subclasses may override this method, but should call super::finalize().
+    @result <code>true</code>.
+	*/
+	virtual bool		finalize ( IOOptionBits options );
+	
+	/*!
+	@function sHandleSetPowerState
+	@abstract The sHandleSetPowerState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@discussion The sHandleSetPowerState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@param self The 'this' pointer for the class.
+	@param powerStateOrdinal The power state to which device shall be changed.
+    @result A valid IOReturn code indicating success or failure.
+	*/
+	static IOReturn 	sHandleSetPowerState ( IOSCSIProtocolInterface * self, UInt32 powerStateOrdinal );
+	
+	/*!
+	@function sGetPowerTransistionInProgress
+	@abstract The sGetPowerTransistionInProgress method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@discussion The sGetPowerTransistionInProgress method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@param self The 'this' pointer for the class.
+    @result <code>true</code> if a power state is in progress, otherwise <code>false</code>.
+	*/
+	static bool sGetPowerTransistionInProgress ( IOSCSIProtocolInterface * 	self );
+	
+	/*!
+	@function HandleSetPowerState
+	@abstract The HandleSetPowerState method is called by the glue code and is on the
+	serialized side of the command gate.
+	@discussion The HandleSetPowerState method is called by the glue code and is on the
+	serialized side of the command gate. This allows us to touch any member
+	variables as necessary without any multi-threading issues.
+	Subclasses may override this method to change behavior. Third party subclasses
+	should not need to override this method, but may.
+	@param powerStateOrdinal The power state to which device shall be changed.
+	*/
+	virtual void		HandleSetPowerState ( UInt32 powerStateOrdinal );
+	
+	/*!
+	@function sPowerManagement
+	@abstract The sPowerManagement method is a static C-function which is called using
+	mach's thread_call API. It guarantees us a thread of execution which is
+	different than the power management thread and the workloop thread on which
+	we can issue commands to the device synchronously or asynchronously without
+	worrying about deadlocks. It calls through to HandlePowerChange, which is
+	a state machine used to direct power management.
+	@discussion The sPowerManagement method is a static C-function which is called using
+	mach's thread_call API. It guarantees us a thread of execution which is
+	different than the power management thread and the workloop thread on which
+	we can issue commands to the device synchronously or asynchronously without
+	worrying about deadlocks. It calls through to HandlePowerChange, which is
+	a state machine used to direct power management.
+	@param whichDevice The 'this' pointer.
+	*/
+	static void			sPowerManagement ( thread_call_param_t whichDevice );
+	
+	/*!
+	@function HandlePowerChange
+	@abstract The HandlePowerChange method is pure virtual and is left to each protocol or
+	application layer driver to implement. It is guaranteed to be called on its
+	own thread of execution and can make synchronous or asynchronous calls.
+	@discussion The HandlePowerChange method is pure virtual and is left to each protocol or
+	application layer driver to implement. It is guaranteed to be called on its
+	own thread of execution and can make synchronous or asynchronous calls.
+	Subclasses must override this method. Third party subclasses shouldn't need to override
+	this method but can to alter the default behavior.
+	*/
+	virtual void		HandlePowerChange ( void ) = 0;
+		
+	/*!
+	@function sHandleCheckPowerState
+	@abstract The sHandleCheckPowerState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@discussion The sHandleCheckPowerState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@param self The 'this' pointer for the class.
+	*/
+	static void			sHandleCheckPowerState ( IOSCSIProtocolInterface * self );
+	
+	/*!
+	@function HandleCheckPowerState(void)
+	@abstract The HandleCheckPowerState (void) method is on the serialized side of the command
+	gate and can change member variables safely without multi-threading issues.
+	It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
+	with the max power state the class registered with.
+	@discussion The HandleCheckPowerState (void) method is on the serialized side of the command
+	gate and can change member variables safely without multi-threading issues.
+	It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
+	with the max power state the class registered with.
+	Subclasses must override this method. Third party subclasses shouldn't need to override
+	this method but can to alter the default behavior.
+	*/
+	virtual void		HandleCheckPowerState ( void ) = 0;
+	
+	/*!
+	@function HandleCheckPowerState(UInt32 maxPowerState)
+	@abstract The HandleCheckPowerState(UInt32 maxPowerState) method is called by
+	the subclasses and is passed the maxPowerState number given to the power
+	manager at initialization time. This guarantees the threads block until that
+	power state has been achieved.
+	@discussion The HandleCheckPowerState(UInt32 maxPowerState) method is called by
+	the subclasses and is passed the maxPowerState number given to the power
+	manager at initialization time. This guarantees the threads block until that
+	power state has been achieved.
+	@param maxPowerState The maximum power state in the power state array.
+	*/
+	void 				HandleCheckPowerState ( UInt32 maxPowerState );
+	
+	/*!
+	@function TicklePowerManager(void)
+	@abstract The TicklePowerManager(void) method is called by CheckPowerState and
+	sends an activity tickle to the power manager so that the idle timer is
+	reset.
+	@discussion The TicklePowerManager(void) method is called by CheckPowerState and
+	sends an activity tickle to the power manager so that the idle timer is
+	reset.
+	Subclasses must override this method. Third party subclasses shouldn't need to override
+	this method but can to alter the default behavior.
+	*/
+	virtual void		TicklePowerManager ( void ) = 0;
+	
+	/*!
+	@function TicklePowerManager(UInt32 maxPowerState)
+	@abstract The TicklePowerManager(UInt32 maxPowerState) method is a convenience
+	function which can be called by subclasses in TicklePowerManager (void)
+	in order to tell the power manager to reset idle timer or bring the device
+	into the requested state. It returns whatever is returned by activityTickle
+	(true if device is in the requested state, false if it is not).
+	@discussion The TicklePowerManager(UInt32 maxPowerState) method is a convenience
+	function which can be called by subclasses in TicklePowerManager(void)
+	in order to tell the power manager to reset idle timer or bring the device
+	into the requested state. It returns whatever is returned by activityTickle
+	(true if device is in the requested state, false if it is not).
+	@param maxPowerState The maximum power state in the power state array.
+	@result The result of the call to activityTickle(). See IOService.h for details.
+	*/
+	bool				TicklePowerManager ( UInt32 maxPowerState );
+	
+	// ------ User Client Support ------
+	
+	bool				fUserClientExclusiveControlled;
+	IOService *			fUserClient;
+	
+	/*!
+	@function sGetUserClientExclusivityState
+	@abstract The sGetUserClientExclusivityState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@discussion The sGetUserClientExclusivityState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@param self The 'this' pointer for the class.
+	@param state A pointer to a bool in which the state should be set.
+	*/
+	static void 	sGetUserClientExclusivityState ( IOSCSIProtocolInterface * self, bool * state );
+	
+	/*!
+	@function sSetUserClientExclusivityState
+	@abstract The sSetUserClientExclusivityState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@discussion The sSetUserClientExclusivityState method is a static function used as C->C++ glue
+	for going behind the command gate.
+	@param self The 'this' pointer for the class.
+	@param result A pointer to an IOReturn for the resulting status.
+	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
+	@param state A bool indicating the desired state to set.
+	*/
+	static void		sSetUserClientExclusivityState ( IOSCSIProtocolInterface * self, IOReturn * result, IOService * userClient, bool state );
+
+	/*!
+	@function HandleGetUserClientExclusivityState
+	@abstract Gets the current exclusivity state of the user client.
+	@discussion The HandleGetUserClientExclusivityState() method is called on the serialized side
+	of the command gate to determine if any user client is holding exclusive access at the current
+	time. See discussion for GetUserClientExclusivityState().
+	Subclasses may override this method to alter default behavior. Third party subclasses should
+	not need to override this method.
+	@result <code>true</code> if a user client is in exclusive control of the device, <code>false</code> otherwise.
+	*/
+	virtual bool	HandleGetUserClientExclusivityState ( void );
+
+	/*!
+	@function HandleSetUserClientExclusivityState
+	@abstract Sets the current exclusivity state of the user client.
+	@discussion The HandleSetUserClientExclusivityState() method is called on the serialized side
+	of the command gate to set the exclusive access mode.
+	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
+	@param state Exclusivity state. <code>true</code> means exclusive access is desired, <code>false</code>
+	means exclusive access is being released.
+	@result A valid IOReturn code indicating success or the type of failure.
+	*/
+	virtual IOReturn	HandleSetUserClientExclusivityState ( IOService * userClient, bool state );
+	
+public:
+	
+	// ------- SCSI Architecture Model Task Management Functions ------
+
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 1 );
+	/*!
+	@function AbortTask
+	@abstract Aborts a task based on the Logical Unit and tagged task identifier.
+	@discussion Aborts a task based on the Logical Unit and tagged task identifier.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@param theLogicalUnit This value should be zero unless the device driver is
+	more complex and managing multiple Logical Units.
+	@param theTag A valid SCSITaggedTaskIdentifier representing an outstanding SCSITask.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag ) = 0;
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 2 );
+	/*!
+	@function AbortTaskSet
+	@abstract Aborts a task set based on the Logical Unit.
+	@discussion Aborts a task set based on the Logical Unit.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@param theLogicalUnit This value should be zero unless the device driver is
+	more complex and managing multiple Logical Units.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit ) = 0;
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 3 );
+	/*!
+	@function ClearACA
+	@abstract Clears an Auto-Contingent Allegiance (ACA) for the specified Logical Unit.
+	@discussion Clears an Auto-Contingent Allegiance (ACA) for the specified Logical Unit.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@param theLogicalUnit This value should be zero unless the device driver is
+	more complex and managing multiple Logical Units.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit ) = 0;
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 4 );
+	/*!
+	@function ClearTaskSet
+	@abstract Clears a task set for the specified Logical Unit.
+	@discussion Clears a task set for the specified Logical Unit.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@param theLogicalUnit This value should be zero unless the device driver is
+	more complex and managing multiple Logical Units.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit ) = 0;
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 5 );
+	/*!
+	@function LogicalUnitReset
+	@abstract Resets the specified Logical Unit.
+	@discussion Resets the specified Logical Unit.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@param theLogicalUnit This value should be zero unless the device driver is
+	more complex and managing multiple Logical Units.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit ) = 0;
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 6 );
+	
+	/*!
+	@function TargetReset
+	@abstract Resets the target device.
+	@discussion Resets the target device.
+	Subclasses must override this method. Third party subclasses should not need to override
+	this method.
+	@result A valid SCSIServiceResponse code.
+	*/
+	virtual SCSIServiceResponse		TargetReset ( void ) = 0;
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 16 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIProtocolServices.h b/i386/include/IOKit/scsi/IOSCSIProtocolServices.h
new file mode 100644
index 0000000..6b9df79
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIProtocolServices.h
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_
+#define _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// Mach includes
+#include <kern/queue.h>
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOCommandGate.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/SCSITask.h>
+#include <IOKit/scsi/IOSCSIProtocolInterface.h>
+#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+// Power Management values
+enum
+{
+	kSCSIProtocolLayerPowerStateOff				= 0,
+	kSCSIProtocolLayerPowerStateOn				= 1,
+	kSCSIProtocolLayerNumDefaultStates			= 2
+};
+
+// Forward definitions of internal use only classes
+class SCSITask;
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIProtocolServices : public IOSCSIProtocolInterface
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIProtocolServices )
+	
+private:
+	
+	// The head pointer for the queue of waiting SCSI Tasks.
+	SCSITask *		fSCSITaskQueueHead;		/* OBSOLETE */
+	
+	// This is the lock for preventing multiple access while
+	// manipulating the SCSI Task queue.
+	IOSimpleLock *	fQueueLock;
+	
+	// The internal flag to indicate whether service requests should be
+	// executed or immediately errored, such as when a device is removed.
+	bool			fAllowServiceRequests;
+	
+protected:
+	
+	// Reserve space for future expansion.
+	struct IOSCSIProtocolServicesExpansionData
+	{
+		// For internal use only. Do not use.
+		UInt32				fSemaphore;
+		bool				fRequiresAutosenseDescriptor;
+		SCSITaskCompletion	fCompletionRoutine;
+		queue_head_t		fTaskQueueHead;
+		queue_head_t		fAutoSenseQueueHead;
+	};
+	IOSCSIProtocolServicesExpansionData * fIOSCSIProtocolServicesReserved;
+	
+	// ---- Protocol transport methods overridden by each subclass ----
+	
+	// Send a SCSI Command to the device.  If the command was sent to the
+	// device and is pending completion, the subclass should return true and
+	// return back the kSCSIServiceResponse_Request_In_Process response. 
+	// If the command completes immediately with an error, the subclass will
+	// return true and return back the appropriate status.
+	// if the subclass is currently processing all the commands it can, the
+	// subclass will return false and the command will be resent next time
+	// CommandCompleted is called.  
+	virtual bool		SendSCSICommand ( 	SCSITaskIdentifier 		request, 
+											SCSIServiceResponse *	serviceResponse,
+											SCSITaskStatus *		taskStatus ) = 0;
+	
+	virtual SCSIServiceResponse	AbortSCSICommand ( SCSITaskIdentifier request ) = 0;
+	
+	// ---- Command completion notification method ---------
+	// Subclasses will call this inherited method when the command
+	// executed by SendSCSICommand has completed.
+	// The subclasses will return a service response that is derived
+	// from protocol specific status information and as specified in 
+	// the specification for that protocol.
+	// If the service response is kSCSIServiceResponse_TASK_COMPLETE,
+	// the subclass will also return a SCSI status value.
+	void	CommandCompleted ( 	SCSITaskIdentifier 	request, 
+								SCSIServiceResponse serviceResponse,
+								SCSITaskStatus		taskStatus );
+	
+	// ---- Utility methods for accessing SCSITask attributes ----
+	// Method for retreiving the attribute for a task.
+	SCSITaskAttribute	GetTaskAttribute ( SCSITaskIdentifier request );
+	
+	bool			SetTaskState ( 	SCSITaskIdentifier request, 
+									SCSITaskState newTaskState );
+	SCSITaskState	GetTaskState ( 	SCSITaskIdentifier request );
+	
+	UInt8			GetLogicalUnitNumber ( SCSITaskIdentifier request );
+	
+	// Method to determine the size of the command descriptor block.
+	UInt8	GetCommandDescriptorBlockSize ( SCSITaskIdentifier request );
+	
+	// This will always return the define max CDB size.  If the Protocol Layer
+	// driver only supports a smaller size CDB, it will have to create a local
+	// SCSICommandDescriptorBlock variable to get the CDB data and then 
+	// transfer the needed bytes from there.
+	bool	GetCommandDescriptorBlock ( SCSITaskIdentifier 				request, 
+										SCSICommandDescriptorBlock * 	cdbData );
+	
+	// Get the transfer direction for the request.
+	UInt8	GetDataTransferDirection ( SCSITaskIdentifier request );
+	
+	UInt64	GetRequestedDataTransferCount ( SCSITaskIdentifier request );
+	
+	bool	SetRealizedDataTransferCount ( SCSITaskIdentifier request,
+										   UInt64 newRealizedDataCount );
+	
+	UInt64	GetRealizedDataTransferCount ( SCSITaskIdentifier request );
+	
+	IOMemoryDescriptor *	GetDataBuffer ( SCSITaskIdentifier request );
+	
+	UInt64	GetDataBufferOffset ( SCSITaskIdentifier request );
+	
+	UInt32	GetTimeoutDuration ( SCSITaskIdentifier request );
+	
+	UInt64	GetAutosenseRequestedDataTransferCount ( SCSITaskIdentifier	request );
+	
+	// Set the auto sense data that was returned for the SCSI Task.
+	// A return value of true indicates that the data was copied to the member 
+	// sense data structure, false indicates that the data could not be copied.
+	bool	SetAutoSenseData ( SCSITaskIdentifier	request,
+							   SCSI_Sense_Data *	senseData ); // DEPRECATED, use the one on the line below.
+	
+	bool	SetAutoSenseData ( SCSITaskIdentifier	request,
+							   SCSI_Sense_Data *	senseData,
+							   UInt8				senseDataSize );
+	
+	void	EnsureAutosenseDescriptorExists ( SCSITaskIdentifier request );
+	
+	bool	SetProtocolLayerReference ( 
+				SCSITaskIdentifier 		request, 
+				void *					newReferenceValue );
+	void *	GetProtocolLayerReference ( SCSITaskIdentifier request );
+	
+	
+	bool	SetTaskExecutionMode (
+				SCSITaskIdentifier 		request, 
+				SCSITaskMode 			newTaskMode );
+	SCSITaskMode	GetTaskExecutionMode ( SCSITaskIdentifier request );
+	
+	// ---- Method calls for messaging device connectedness ----
+	void 	SendNotification_DeviceRemoved ( void );
+	
+	void 	SendNotification_VerifyDeviceState ( void );   
+	
+	// -- SCSI Task Queue Management Methods --
+	// Following are the commands used to manipulate the queue of pending SCSI Tasks.
+	
+	// Add the SCSI Task to the queue.  The Task's Attribute determines where in
+	// the queue the Task is placed.
+	void 	AddSCSITaskToQueue ( SCSITaskIdentifier request );
+	
+	// Add the SCSI Task to the head of the queue.  This is used when the task
+	// has been removed from the head of the queue, but the subclass indicates
+	// that it can not yet process this task.
+	void 	AddSCSITaskToHeadOfQueue ( SCSITask * request );
+	
+	// Remove the next SCSI Task for the queue and return it.
+	SCSITask * RetrieveNextSCSITaskFromQueue ( void );
+	
+	// Check to see if the SCSI Task resides in the queue and abort it if it does.
+	bool 	AbortSCSITaskFromQueue ( SCSITask * request );
+	
+	// Methods for sending and completing SCSI tasks
+	void	SendSCSITasksFromQueue ( void );
+	
+	void	RejectSCSITasksCurrentlyQueued ( void );
+	
+	void	ProcessCompletedTask ( 	SCSITaskIdentifier 	request, 
+									SCSIServiceResponse serviceResponse,
+									SCSITaskStatus		taskStatus );
+	void	RejectTask ( SCSITaskIdentifier		request );
+	
+	// ------ Power Management Support ------
+	
+	// The InitializePowerManagement method is called to initialize power management.
+	// In the protocol services layer, this method calls the protocol interface layer
+	// to initialize power management state variables and then registers the protocol
+	// layer driver with the power manager with two(2) states, ON and OFF.	
+	virtual void		InitializePowerManagement ( IOService * provider );
+	
+	// The GetInitialPowerState method is called once, right after InitializePowerManagement()
+	// in order to determine what state the device is initially in at startup time (usually
+	// the highest power mode).
+	virtual UInt32		GetInitialPowerState ( void );
+	
+	// The HandlePowerChange method is pure virtual and is left to each protocol or
+	// application layer driver to implement. It is guaranteed to be called on its
+	// own thread of execution and can make synchronous or asynchronous calls.
+	virtual void		HandlePowerChange ( void );
+	
+	// The HandleCheckPowerState (void) method is on the serialized side of the command
+	// gate and can change member variables safely without multi-threading issues.
+	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
+	// with the max power state the class registered with.
+	virtual void		HandleCheckPowerState ( void );
+	
+	// The TicklePowerManager ( void ) method is called by CheckPowerState and
+	// sends an activity tickle to the power manager so that the idle timer is
+	// reset.
+	virtual void		TicklePowerManager ( void );
+	
+	// The HandlePowerOff method is called to do any bus specific activity
+	// necessary before shutting down and going to sleep.
+	virtual IOReturn	HandlePowerOff ( void );
+	
+	// The HandlePowerOn method is called to do any bus specific activity
+	// necessary to recover from power-on/wake from sleep (e.g. bus reset on ATAPI)
+	virtual IOReturn	HandlePowerOn ( void );
+	
+public:
+	
+	virtual bool	start	( IOService * provider );
+	virtual void	free	( void );
+	
+	void RegisterSCSITaskCompletionRoutine ( SCSITaskCompletion completion );
+	
+	// ------- SCSI Architecture Model Task Management Functions ------
+	// The ExecuteCommand method will take a SCSI Task and transport
+	// it across the physical wire(s) to the device
+	void					ExecuteCommand ( SCSITaskIdentifier	request );
+	
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a specific task be aborted.
+	SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
+
+	// The Task Management function to allow the SCSI Application Layer client to request
+	// that a all tasks curerntly in the task set be aborted.
+	SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
+    
+	SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
+
+	SCSIServiceResponse		TargetReset ( void );
+	
+    // ************* Obsoleted Member Routine ****************
+    // The AbortCommand method is replaced by the AbortTask Management function and
+    // should no longer be called.
+	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier	request );
+
+	
+	// ---- Method used for determining protocol or physical interconnect characteristics. ----
+	// The IsProtocolServiceSupported will return true if the specified
+	// feature is supported by the protocol layer.  If the service has a value that must be
+	// returned, it will be returned in the serviceValue output parameter.
+	virtual bool	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue ) = 0;
+
+	// The HandleProtocolServiceFeature instructs the Protocol Services driver to perform the necessary 
+	// tasks for the indicated feature.
+	virtual bool	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue ) = 0;
+
+protected:
+	
+	// ----- Protocol Services Driver request handlers for Task Management functions -----
+	// These should be abstract so that every Protocol Services Driver would have to
+	// override them, but since they are new member routines, this class will provide
+	// a default implementation.
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 1 );
+	virtual SCSIServiceResponse		HandleAbortTask ( 
+											UInt8 						theLogicalUnit, 
+											SCSITaggedTaskIdentifier 	theTag );
+    
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 2 );
+	virtual SCSIServiceResponse		HandleAbortTaskSet ( 
+											UInt8 						theLogicalUnit );
+	
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 3 );
+	virtual SCSIServiceResponse		HandleClearACA ( 
+											UInt8 						theLogicalUnit );
+	
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 4 );
+	virtual SCSIServiceResponse		HandleClearTaskSet (
+											UInt8 						theLogicalUnit );
+	
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 5 );
+	virtual SCSIServiceResponse		HandleLogicalUnitReset (
+											UInt8 						theLogicalUnit );
+											
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 6 );
+    // The HandleTargetReset member routine requests that the Protocol Services Driver
+    // perform the necessary steps detailed in the specification that defines the 
+    // protocol the driver represents for the TargetReset management function.
+	virtual SCSIServiceResponse		HandleTargetReset ( void );
+
+
+    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices,  7 );
+    // The CreateSCSITargetDevice member routine will create the appropriate object
+    // to represent the Target portion of a SCSI Device.  This object is responsible
+    // for managing the Target functions of the SCSI Device including the Task Manager and
+    // Logical Units.
+    // If the SCSITargetDevice object was successfully created, a true value will be
+    // returned, otherwisw, this will return false.
+	virtual bool					CreateSCSITargetDevice ( void );
+	
+private:
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices,  8 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 	9 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 10 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 11 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 12 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 13 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 14 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 15 );
+    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 16 );
+    
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h b/i386/include/IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h
new file mode 100644
index 0000000..955fd6e
--- /dev/null
+++ b/i386/include/IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h
@@ -0,0 +1,438 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_
+#define _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit headers
+#include <IOKit/IOLib.h>
+#include <IOKit/IOMemoryDescriptor.h>
+
+// Generic IOKit storage related headers
+#include <IOKit/storage/IOStorage.h>
+
+// SCSI Architecture Model Family includes
+#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
+
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+
+// RBC power states as defined in T10:1240D SCSI Reduced Block Commands (RBC)
+// Revision 10a, August 18, 1999, page 13.
+enum
+{
+	kRBCPowerStateSystemSleep	= 0,
+	kRBCPowerStateSleep 		= 1,
+	kRBCPowerStateStandby 		= 2,
+	kRBCPowerStateIdle			= 3,
+	kRBCPowerStateActive		= 4,
+	kRBCNumPowerStates			= 5
+};
+
+enum
+{
+	kMediaStateUnlocked	= 0,
+	kMediaStateLocked 	= 1
+};
+
+#define kCapacityDataBufferSize				8
+
+// Forward declaration for the SCSIReducedBlockCommands that is used internally by the
+// IOSCSIReducedBlockCommandsDevice class.
+class SCSIReducedBlockCommands;
+
+//-----------------------------------------------------------------------------
+//	Class Declaration
+//-----------------------------------------------------------------------------
+
+class IOSCSIReducedBlockCommandsDevice : public IOSCSIPrimaryCommandsDevice
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIReducedBlockCommandsDevice );
+	
+private:
+	
+#ifndef __LP64__
+	
+    SCSIReducedBlockCommands *		fSCSIReducedBlockCommandObject;
+    SCSIReducedBlockCommands *		GetSCSIReducedBlockCommandObject ( void );
+	
+#endif	/* !__LP64__ */
+	
+	static void			AsyncReadWriteComplete ( SCSITaskIdentifier completedTask );
+	
+protected:
+    
+    // Reserve space for future expansion.
+    struct IOSCSIReducedBlockCommandsDeviceExpansionData
+	{
+		IONotifier *	fPowerDownNotifier;
+        bool			fMediumRemovalPrevented;
+        bool			fKnownManualEject;
+        UInt32			fPollingMode;
+		bool			fProtocolSpecificPowerControl;
+	};
+    IOSCSIReducedBlockCommandsDeviceExpansionData * fIOSCSIReducedBlockCommandsDeviceReserved;
+	
+	#define fPowerDownNotifier				fIOSCSIReducedBlockCommandsDeviceReserved->fPowerDownNotifier
+	#define fMediumRemovalPrevented			fIOSCSIReducedBlockCommandsDeviceReserved->fMediumRemovalPrevented
+	#define fKnownManualEject				fIOSCSIReducedBlockCommandsDeviceReserved->fKnownManualEject
+	#define fPollingMode					fIOSCSIReducedBlockCommandsDeviceReserved->fPollingMode
+	#define fProtocolSpecificPowerControl	fIOSCSIReducedBlockCommandsDeviceReserved->fProtocolSpecificPowerControl
+	
+	bool				fMediaChanged;
+	bool				fMediaPresent;
+	
+	// The byte count of each physical block on the media.
+	UInt32				fMediaBlockSize;
+	
+	// The total number of blocks of mediaBlockSize on the media.
+	UInt32				fMediaBlockCount;
+	
+	// Flags used to indicate device feature
+	bool				fMediaIsRemovable;
+	bool				fMediaIsWriteProtected;
+	
+	thread_call_t		fPollingThread;
+	
+	enum
+	{
+		kPollingMode_Suspended			= 0,
+		kPollingMode_NewMedia 			= 1,
+		kPollingMode_MediaRemoval		= 2
+	};
+	
+	virtual void 		CreateStorageServiceNub ( void );
+	virtual bool		DetermineDeviceCharacteristics ( void );	
+	virtual void		PollForMedia ( void );
+	virtual void		EnablePolling ( void );
+	virtual void		DisablePolling ( void );
+	virtual void		CheckWriteProtection ( void );
+	virtual void		SetMediaCharacteristics ( UInt32 blockSize, UInt32 blockCount );
+ 	virtual void		ResetMediaCharacteristics ( void );
+	virtual bool		ClearNotReadyStatus ( void );
+	
+	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
+									UInt64					startBlock,
+									UInt64					blockCount );
+	
+	virtual IOReturn	IssueWrite ( IOMemoryDescriptor*	buffer,
+									 UInt64					startBlock,
+									 UInt64					blockCount );
+	
+	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
+									UInt64					startBlock,
+									UInt64					blockCount,
+									void *					clientData );
+	
+	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
+									 UInt64					startBlock,
+									 UInt64					blockCount,
+									 void *					clientData );
+
+#ifndef __LP64__
+	
+	// This method will retreive the SCSI Primary Command Set object for
+	// the class.  For subclasses, this will be overridden using a
+	// dynamic cast on the subclasses base command set object.
+	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
+
+#endif	/* !__LP64__ */
+	
+	// ----- Power Management Support ------
+		
+	// We override this method to set our power states and register ourselves
+	// as a power policy maker.
+	virtual void 		InitializePowerManagement ( IOService * provider );
+	
+	// We override this method so that when we register for power management,
+	// we go to our active power state (which the drive is definitely in
+	// at startup time).
+	virtual UInt32		GetInitialPowerState ( void );
+	
+	// We override this method in order to provide the number of transitions
+	// from Fully active to Sleep state so that the idle timer can be adjusted
+	// to the appropriate time period based on the disk spindown time set in
+	// the Energy Saver prefs panel.
+	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
+	
+	// The TicklePowerManager method is called to tell the power manager that the
+	// device needs to be in a certain power state to handle requests.
+	virtual void		TicklePowerManager ( void );
+	
+	// The HandlePowerChange method is the state machine for power management.
+	// It is guaranteed to be on its own thread of execution (different from
+	// the power manager thread AND the workloop thread. This routine can
+	// send sync or async calls to the drive without worrying about threading
+	// issues.
+	virtual void		HandlePowerChange ( void );
+	
+	// The HandleCheckPowerState (void) method is on the serialized side of the command
+	// gate and can change member variables safely without multi-threading issues.
+	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
+	// with the max power state the class registered with.
+	virtual void		HandleCheckPowerState ( void );
+	
+	// The CheckMediaPresence method is called to see if the media which we
+	// anticipated being there is still there.
+	virtual bool		CheckMediaPresence ( void );
+	
+	virtual bool		InitializeDeviceSupport ( void );
+	virtual void		StartDeviceSupport ( void );
+	virtual void		SuspendDeviceSupport ( void );
+	virtual void		ResumeDeviceSupport ( void );
+	virtual void		StopDeviceSupport ( void );
+	virtual void		TerminateDeviceSupport ( void );
+	
+	virtual void 		free ( void );
+	
+#ifndef __LP64__
+	
+	virtual bool		CreateCommandSetObjects ( void );
+	virtual void		FreeCommandSetObjects ( void );
+
+#endif	/* !__LP64__ */
+	
+public:
+	
+	virtual IOReturn	SyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt64					startBlock,
+											UInt64					blockCount );
+	
+	virtual IOReturn	AsyncReadWrite (	IOMemoryDescriptor *	buffer,
+											UInt64					block,
+											UInt64					nblks,
+											void *					clientData );
+	
+	
+	virtual IOReturn	EjectTheMedia ( void );	
+	virtual IOReturn	FormatMedia ( UInt64 byteCapacity );
+	virtual UInt32		GetFormatCapacities ( 	UInt64 * capacities,
+												UInt32   capacitiesMaxCount ) const;
+	virtual IOReturn	LockUnlockMedia ( bool doLock );
+	virtual IOReturn	SynchronizeCache ( void );
+	virtual IOReturn	ReportBlockSize ( UInt64 * blockSize );
+	virtual IOReturn	ReportEjectability ( bool * isEjectable );
+	virtual IOReturn	ReportLockability ( bool * isLockable );
+	virtual IOReturn	ReportPollRequirements ( bool * pollIsRequired,
+												 bool * pollIsExpensive );
+	virtual IOReturn	ReportMaxReadTransfer (  UInt64 	blockSize,
+												 UInt64 * 	max );
+	virtual IOReturn	ReportMaxValidBlock ( UInt64 * maxBlock );
+	virtual IOReturn	ReportMaxWriteTransfer ( UInt64	blockSize,
+												UInt64 * max );
+	virtual IOReturn	ReportMediaState ( 	bool * mediaPresent,
+											bool * changed );
+	virtual IOReturn	ReportRemovability ( bool * isRemovable );
+	virtual IOReturn	ReportWriteProtection ( bool * isWriteProtected );
+	
+	static 	void		sPollForMedia ( void * pdtDriver, void * refCon );
+	
+	
+protected:
+	
+	
+	// The FORMAT_UNIT command as defined in section 5.1
+	virtual bool FORMAT_UNIT (
+							SCSITaskIdentifier			request,
+							SCSICmdField1Bit			IMMED,
+	   						SCSICmdField1Bit			PROGRESS,
+	   						SCSICmdField1Bit			PERCENT_TIME,
+	   						SCSICmdField1Bit			INCREMENT );
+	
+	// The INQUIRY command as defined in SPC-2 w/o CONTROL byte
+	virtual bool INQUIRY (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit			CMDDT,
+							SCSICmdField1Bit			EVPD,
+							SCSICmdField1Byte			PAGE_OR_OPERATION_CODE,
+							SCSICmdField1Byte			ALLOCATION_LENGTH );
+	
+	// The MODE_SELECT(6) command as defined in SPC-2 w/o CONTROL byte
+	virtual bool MODE_SELECT_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			PF,
+							SCSICmdField1Bit 			SP,
+							SCSICmdField1Byte 			PARAMETER_LIST_LENGTH );
+	
+	// The MODE_SENSE(6) command as defined in SPC-2 w/o CONTROL byte
+	virtual bool MODE_SENSE_6 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Bit 			DBD,
+		   					SCSICmdField2Bit 			PC,
+		   					SCSICmdField6Bit 			PAGE_CODE,
+		   					SCSICmdField1Byte 			ALLOCATION_LENGTH );
+	
+	// The PERSISTENT_RESERVE_IN command as defined in SPC-2 w/o CONTROL byte
+	virtual bool PERSISTENT_RESERVE_IN (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+		   					SCSICmdField5Bit 			SERVICE_ACTION,
+		   					SCSICmdField2Byte 			ALLOCATION_LENGTH );
+	
+	// The PERSISTENT_RESERVE_OUT command as defined in SPC-2 w/o CONTROL byte
+	virtual bool PERSISTENT_RESERVE_OUT (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+		   					SCSICmdField5Bit			SERVICE_ACTION,
+		   					SCSICmdField4Bit			SCOPE,
+		   					SCSICmdField4Bit			TYPE );
+	
+	// The PREVENT_ALLOW_MEDIUM_REMOVAL command as defined in SPC-2 w/o CONTROL byte
+	virtual bool PREVENT_ALLOW_MEDIUM_REMOVAL ( 
+							SCSITaskIdentifier			request,
+	 						SCSICmdField2Bit			PREVENT );
+	
+   	// The READ_10 command as defined in section 5.2
+	virtual bool READ_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							UInt32						blockSize,
+							SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
+							SCSICmdField2Byte			TRANSFER_LENGTH );
+	
+	// The READ_CAPACITY command as defined in section 5.3
+	virtual bool READ_CAPACITY (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer );
+	
+	// The RELEASE(6) command as defined in SPC-2 w/o CONTROL byte
+	virtual bool RELEASE_6 (								
+							SCSITaskIdentifier			request );
+	
+	// The REQUEST_SENSE command as defined in SPC-2 w/o CONTROL byte
+	virtual bool REQUEST_SENSE (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField1Byte 			ALLOCATION_LENGTH );
+	
+	// The RESERVE(6) command as defined in SPC-2 w/o CONTROL byte
+	virtual bool RESERVE_6 (	
+							SCSITaskIdentifier			request );
+	
+	// The START_STOP_UNIT command as defined in section 5.4
+	virtual bool START_STOP_UNIT (
+							SCSITaskIdentifier			request,
+							SCSICmdField1Bit			IMMED,
+							SCSICmdField4Bit			POWER_CONDITIONS,
+							SCSICmdField1Bit			LEOJ,
+							SCSICmdField1Bit			START );
+	
+	// The SYNCRONIZE_CACHE command as defined in section 5.5
+	virtual bool SYNCHRONIZE_CACHE (
+							SCSITaskIdentifier			request );
+	
+	// The TEST_UNIT_READY command as defined in SPC-2 w/o CONTROL byte
+	virtual bool TEST_UNIT_READY (
+							SCSITaskIdentifier			request );
+	
+	// The VERIFY command as defined in section 5.7
+	virtual bool VERIFY (
+							SCSITaskIdentifier			request,
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+							SCSICmdField2Byte 			VERIFICATION_LENGTH );
+	
+	// The WRITE_10 command	as defined in section 5.6
+	virtual bool WRITE_10 (
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							UInt32						blockSize,
+							SCSICmdField1Bit			FUA,
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
+							SCSICmdField2Byte 			TRANSFER_LENGTH );
+	
+	// The WRITE_BUFFER command as defined in SPC-2 w/o CONTROL byte
+	virtual bool WRITE_BUFFER ( 
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer,
+							SCSICmdField4Bit 			MODE,
+							SCSICmdField1Byte 			BUFFER_ID,
+							SCSICmdField3Byte 			BUFFER_OFFSET,
+							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH );
+	
+	
+
+	/* Added with 10.2 */
+	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 1 );
+	
+public:
+	
+	virtual IOReturn	PowerDownHandler (	void * 			refCon,
+											UInt32 			messageType,
+											IOService * 	provider,
+											void * 			messageArgument,
+											vm_size_t 		argSize );
+	
+	
+	/* Added with 10.2 */	
+	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 2 );
+	
+protected:
+
+	virtual	void		SetMediaIcon ( void );
+	
+
+	/* Added with 10.3.3 */		
+	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 3 );
+	
+protected:
+
+	virtual	void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
+	
+	
+private:
+	
+	// Space reserved for future expansion.
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  8 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  9 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 10 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 11 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 12 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 16 );
+	
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICmds_INQUIRY_Definitions.h b/i386/include/IOKit/scsi/SCSICmds_INQUIRY_Definitions.h
new file mode 100644
index 0000000..55a6a4c
--- /dev/null
+++ b/i386/include/IOKit/scsi/SCSICmds_INQUIRY_Definitions.h
@@ -0,0 +1,923 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_CMDS_INQUIRY_H_
+#define _IOKIT_SCSI_CMDS_INQUIRY_H_
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSI Inquiry Definitions
+	@discussion
+	This file contains all definitions for the data returned from
+	the INQUIRY (0x12) command.
+*/
+
+
+/*!
+ * @enum Payload sizes
+ * @discussion
+ * Definitions for sizes related to the INQUIRY data.
+ * @constant kINQUIRY_StandardDataHeaderSize
+ * INQUIRY data header size.
+ * @constant kINQUIRY_MaximumDataSize
+ * Maximum size for INQUIRY data.
+*/
+enum
+{
+	kINQUIRY_StandardDataHeaderSize			= 5,
+	kINQUIRY_MaximumDataSize				= 255	
+};
+
+
+/*!
+@enum INQUIRY field sizes
+@discussion
+Sizes for some of the inquiry data fields.
+@constant kINQUIRY_VENDOR_IDENTIFICATION_Length
+Size of VENDOR_IDENTIFICATION field.
+@constant kINQUIRY_PRODUCT_IDENTIFICATION_Length
+Size of PRODUCT_IDENTIFICATION field.
+@constant kINQUIRY_PRODUCT_REVISION_LEVEL_Length
+Size of PRODUCT_REVISION_LEVEL field.
+*/
+enum
+{
+	kINQUIRY_VENDOR_IDENTIFICATION_Length	= 8,
+	kINQUIRY_PRODUCT_IDENTIFICATION_Length	= 16,
+	kINQUIRY_PRODUCT_REVISION_LEVEL_Length	= 4
+};
+
+
+/*!
+@struct SCSICmd_INQUIRY_StandardData
+@discussion
+This structure defines the format of the required standard data that is 
+returned for the INQUIRY command.  This is the data that is required to
+be returned from all devices.
+*/
+typedef struct SCSICmd_INQUIRY_StandardData
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		RMB;								// 7 = removable
+	UInt8		VERSION;							// 7/6 = ISO/IEC, 5-3 = ECMA, 2-0 = ANSI.
+	UInt8		RESPONSE_DATA_FORMAT;				// 7 = AERC, 6 = Obsolete, 5 = NormACA, 4 = HiSup 3-0 = Response data format. (SPC-3 obsoletes AERC)
+													// If ANSI Version = 0, this is ATAPI and bits 7-4 = ATAPI version.
+	UInt8		ADDITIONAL_LENGTH;					// Number of additional bytes available in inquiry data
+	UInt8		SCCSReserved;						// SCC-2 device flag and reserved fields (SPC-3 adds PROTECT 3PC TPGS, and ACC)
+	UInt8		flags1;								// First byte of support flags (See SPC-3 section 6.4.2)
+	UInt8		flags2;								// Second byte of support flags (Byte 7) (See SPC-3 section 6.4.2)
+	char		VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
+	char		PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
+	char		PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
+} SCSICmd_INQUIRY_StandardData;
+typedef SCSICmd_INQUIRY_StandardData * SCSICmd_INQUIRY_StandardDataPtr;
+
+
+/*!
+@struct SCSICmd_INQUIRY_StandardDataAll
+@discussion
+This structure defines the all of the fields that can be returned in
+repsonse to the INQUIRy request for the standard data.  There is no
+requirement as to how much of the additional data must be returned by a device.
+*/
+typedef struct SCSICmd_INQUIRY_StandardDataAll
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		RMB;								// 7 = removable
+	UInt8		VERSION;							// 7/6 = ISO/IEC, 5-3 = ECMA, 2-0 = ANSI.
+	UInt8		RESPONSE_DATA_FORMAT;				// 7 = AERC, 6 = Obsolete, 5 = NormACA, 4 = HiSup 3-0 = Response data format.
+													// If ANSI Version = 0, this is ATAPI and bits 7-4 = ATAPI version.
+	UInt8		ADDITIONAL_LENGTH;					// Number of additional bytes available in inquiry data
+	UInt8		SCCSReserved;						// SCC-2 device flag and reserved fields
+	UInt8		flags1;								// First byte of support flags (Byte 6)
+	UInt8		flags2;								// Second byte of support flags (Byte 7)
+	char		VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
+	char		PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
+	char		PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
+	
+	// Following is the optional data that may be returned by a device.
+	UInt8		VendorSpecific1[20];
+	UInt8		flags3;								// Third byte of support flags, mainly SPI-3 (Byte 56)
+	UInt8		Reserved1;
+	UInt16		VERSION_DESCRIPTOR[8];
+	UInt8		Reserved2[22];
+	UInt8		VendorSpecific2[160];
+} SCSICmd_INQUIRY_StandardDataAll;
+
+
+/*!
+@enum Peripheral Qualifier
+@discussion
+Inquiry Peripheral Qualifier definitions
+@constant kINQUIRY_PERIPHERAL_QUALIFIER_Connected
+Peripheral Device is connected.
+@constant kINQUIRY_PERIPHERAL_QUALIFIER_SupportedButNotConnected
+Peripheral Device is supported, but not connected.
+@constant kINQUIRY_PERIPHERAL_QUALIFIER_NotSupported
+Peripheral Device is not supported.
+@constant kINQUIRY_PERIPHERAL_QUALIFIER_Mask
+Mask to use for PERIPHERAL_DEVICE_TYPE field.
+*/
+enum
+{
+	kINQUIRY_PERIPHERAL_QUALIFIER_Connected					= 0x00,
+	kINQUIRY_PERIPHERAL_QUALIFIER_SupportedButNotConnected	= 0x20,
+	kINQUIRY_PERIPHERAL_QUALIFIER_NotSupported				= 0x60,
+	kINQUIRY_PERIPHERAL_QUALIFIER_Mask						= 0xE0
+};
+
+
+/*!
+@enum Peripheral Device types
+@discussion
+Inquiry Peripheral Device type definitions
+@constant kINQUIRY_PERIPHERAL_TYPE_DirectAccessSBCDevice
+SBC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_SequentialAccessSSCDevice
+Sequential Access (Tape) SSC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_PrinterSSCDevice
+SSC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_ProcessorSPCDevice
+SPC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_WriteOnceSBCDevice
+SBC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_CDROM_MMCDevice
+MMC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_ScannerSCSI2Device
+SCSI2 Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_OpticalMemorySBCDevice
+SBC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_MediumChangerSMCDevice
+SMC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_CommunicationsSSCDevice
+Comms SSC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_StorageArrayControllerSCC2Device
+SCC2 Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_EnclosureServicesSESDevice
+SES Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_SimplifiedDirectAccessRBCDevice
+RBC Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_OpticalCardReaderOCRWDevice
+OCRW Device.
+@constant kINQUIRY_PERIPHERAL_TYPE_ObjectBasedStorageDevice
+OSD device.
+@constant kINQUIRY_PERIPHERAL_TYPE_AutomationDriveInterface
+Automation Drive Interface device.
+@constant kINQUIRY_PERIPHERAL_TYPE_WellKnownLogicalUnit
+Well known logical unit.
+@constant kINQUIRY_PERIPHERAL_TYPE_UnknownOrNoDeviceType
+Unknown or no device.
+@constant kINQUIRY_PERIPHERAL_TYPE_Mask
+Mask to use for PERIPHERAL_DEVICE_TYPE field.
+*/
+enum
+{
+	kINQUIRY_PERIPHERAL_TYPE_DirectAccessSBCDevice				= 0x00,
+	kINQUIRY_PERIPHERAL_TYPE_SequentialAccessSSCDevice			= 0x01,
+	kINQUIRY_PERIPHERAL_TYPE_PrinterSSCDevice					= 0x02,
+	kINQUIRY_PERIPHERAL_TYPE_ProcessorSPCDevice					= 0x03,
+	kINQUIRY_PERIPHERAL_TYPE_WriteOnceSBCDevice					= 0x04,
+	kINQUIRY_PERIPHERAL_TYPE_CDROM_MMCDevice					= 0x05,
+	kINQUIRY_PERIPHERAL_TYPE_ScannerSCSI2Device					= 0x06,
+	kINQUIRY_PERIPHERAL_TYPE_OpticalMemorySBCDevice				= 0x07,
+	kINQUIRY_PERIPHERAL_TYPE_MediumChangerSMCDevice				= 0x08,
+	kINQUIRY_PERIPHERAL_TYPE_CommunicationsSSCDevice			= 0x09,
+	/* 0x0A - 0x0B ASC IT8 Graphic Arts Prepress Devices */
+	kINQUIRY_PERIPHERAL_TYPE_StorageArrayControllerSCC2Device	= 0x0C,
+	kINQUIRY_PERIPHERAL_TYPE_EnclosureServicesSESDevice			= 0x0D,
+	kINQUIRY_PERIPHERAL_TYPE_SimplifiedDirectAccessRBCDevice	= 0x0E,
+	kINQUIRY_PERIPHERAL_TYPE_OpticalCardReaderOCRWDevice		= 0x0F,
+	/* 0x10 - 0x1E Reserved Device Types */
+	kINQUIRY_PERIPHERAL_TYPE_ObjectBasedStorageDevice			= 0x11,
+	kINQUIRY_PERIPHERAL_TYPE_AutomationDriveInterface			= 0x12,
+	kINQUIRY_PERIPHERAL_TYPE_WellKnownLogicalUnit				= 0x1E,
+	kINQUIRY_PERIPHERAL_TYPE_UnknownOrNoDeviceType				= 0x1F,
+	
+	
+	kINQUIRY_PERIPHERAL_TYPE_Mask								= 0x1F
+};
+
+
+/*!
+@enum Removable Bit field definitions
+@discussion
+Inquiry Removable Bit field definitions
+@constant kINQUIRY_PERIPHERAL_RMB_MediumFixed
+Medium type is fixed disk.
+@constant kINQUIRY_PERIPHERAL_RMB_MediumRemovable
+Medium type is removable disk.
+@constant kINQUIRY_PERIPHERAL_RMB_BitMask
+Mask to use for RMB field.
+*/
+enum
+{
+	kINQUIRY_PERIPHERAL_RMB_MediumFixed 						= 0x00,
+	kINQUIRY_PERIPHERAL_RMB_MediumRemovable 					= 0x80,
+	kINQUIRY_PERIPHERAL_RMB_BitMask 							= 0x80
+};
+
+
+/*!
+@enum Version field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY Version field.
+@constant kINQUIRY_ISO_IEC_VERSION_Mask
+Mask for valid bits for ISO/IEC Version.
+@constant kINQUIRY_ECMA_VERSION_Mask
+Mask for valid bits for ECMA Version.
+@constant kINQUIRY_ANSI_VERSION_NoClaimedConformance
+No ANSI conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_SCSI_1_Compliant
+SCSI-1 conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_SCSI_2_Compliant
+SCSI-2 conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant
+SPC conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_2_Compliant
+SPC-2 conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_3_Compliant
+SPC-3 conformance claimed by the device server.
+@constant kINQUIRY_ANSI_VERSION_Mask
+Mask for valid bits for ANSI Version.
+*/
+enum
+{
+	kINQUIRY_ISO_IEC_VERSION_Mask								= 0xC0,
+	
+	kINQUIRY_ECMA_VERSION_Mask									= 0x38,
+	
+	kINQUIRY_ANSI_VERSION_NoClaimedConformance					= 0x00,
+	kINQUIRY_ANSI_VERSION_SCSI_1_Compliant						= 0x01,
+	kINQUIRY_ANSI_VERSION_SCSI_2_Compliant						= 0x02,
+	kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant					= 0x03,
+	kINQUIRY_ANSI_VERSION_SCSI_SPC_2_Compliant					= 0x04,
+	kINQUIRY_ANSI_VERSION_SCSI_SPC_3_Compliant					= 0x05,
+	kINQUIRY_ANSI_VERSION_Mask									= 0x07
+};
+
+
+/*!
+@enum Response Data Format field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY RESPONSE_DATA_FORMAT field.
+@constant kINQUIRY_Byte3_HISUP_Bit
+HISUP bit definition.
+@constant kINQUIRY_Byte3_NORMACA_Bit
+NORMACA bit definition.
+@constant kINQUIRY_Byte3_AERC_Bit
+AERC bit definition.
+@constant kINQUIRY_RESPONSE_DATA_FORMAT_Mask
+Mask for valid bits for RESPONSE_DATA_FORMAT.
+@constant kINQUIRY_Byte3_HISUP_Mask
+Mask to use to test the HISUP bit.
+@constant kINQUIRY_Byte3_NORMACA_Mask
+Mask to use to test the NORMACA bit.
+@constant kINQUIRY_Byte3_AERC_Mask
+Mask to use to test the AERC bit.
+*/
+enum
+{
+	// Bit definitions
+	// Bits 0-3: RESPONSE DATA FORMAT
+	kINQUIRY_Byte3_HISUP_Bit				= 4,
+	kINQUIRY_Byte3_NORMACA_Bit				= 5,
+	// Bit 6 is Obsolete
+	kINQUIRY_Byte3_AERC_Bit					= 7,
+	
+	// Masks
+	kINQUIRY_RESPONSE_DATA_FORMAT_Mask		= 0x0F, // Bits 0-3
+	kINQUIRY_Byte3_HISUP_Mask				= (1 << kINQUIRY_Byte3_HISUP_Bit),
+	kINQUIRY_Byte3_NORMACA_Mask				= (1 << kINQUIRY_Byte3_NORMACA_Bit),
+	// Bit 6 is Obsolete
+	kINQUIRY_Byte3_AERC_Mask				= (1 << kINQUIRY_Byte3_AERC_Bit)
+};
+
+
+/*!
+@enum SCCS field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY SCCSReserved field.
+@constant kINQUIRY_Byte5_SCCS_Bit
+SCCS bit definition.
+@constant kINQUIRY_Byte5_ACC_Bit
+ACC bit definition.
+@constant kINQUIRY_Byte5_3PC_Bit
+3PC bit definition.
+@constant kINQUIRY_Byte5_PROTECT_Bit
+PROTECT bit definition.
+@constant kINQUIRY_Byte5_SCCS_Mask
+Mask to use to test the SCCS bit.
+@constant kINQUIRY_Byte5_ACC_Mask
+Mask to use to test the ACC bit.
+@constant kINQUIRY_Byte5_TPGS_Mask
+Mask to use for the TPGS bits.
+@constant kINQUIRY_Byte5_3PC_Mask
+Mask to use to test the 3PC bit.
+@constant kINQUIRY_Byte5_PROTECT_Mask
+Mask to use to test the PROTECT bit.
+*/
+enum
+{
+	// Bit definitions
+	kINQUIRY_Byte5_SCCS_Bit					= 7,
+	kINQUIRY_Byte5_ACC_Bit					= 6,
+	// Bits 4-5: TPGS
+	kINQUIRY_Byte5_3PC_Bit					= 3,
+	// Bits 1-2: Reserved
+	kINQUIRY_Byte5_PROTECT_Bit				= 0,
+	
+	// Masks
+	kINQUIRY_Byte5_SCCS_Mask				= (1 << kINQUIRY_Byte5_SCCS_Bit),
+	kINQUIRY_Byte5_ACC_Mask					= (1 << kINQUIRY_Byte5_ACC_Bit),
+	kINQUIRY_Byte5_TPGS_Mask				= 0x18,
+	kINQUIRY_Byte5_3PC_Mask					= (1 << kINQUIRY_Byte5_3PC_Bit),
+	// Bits 1-2: Reserved
+	kINQUIRY_Byte5_PROTECT_Mask				= (1 << kINQUIRY_Byte5_PROTECT_Bit)
+};
+
+
+/*!
+@enum flags1 field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY flags1 field.
+@constant kINQUIRY_Byte6_ADDR16_Bit
+ADDR16 bit definition.
+@constant kINQUIRY_Byte6_MCHNGR_Bit
+MCHNGR bit definition.
+@constant kINQUIRY_Byte6_MULTIP_Bit
+MULTIP bit definition.
+@constant kINQUIRY_Byte6_VS_Bit
+VS bit definition.
+@constant kINQUIRY_Byte6_ENCSERV_Bit
+ENCSERV bit definition.
+@constant kINQUIRY_Byte6_BQUE_Bit
+BQUE bit definition.
+@constant kINQUIRY_Byte6_ADDR16_Mask
+Mask to use to test the ADDR16 bit.
+@constant kINQUIRY_Byte6_MCHNGR_Mask
+Mask to use to test the MCHNGR bit.
+@constant kINQUIRY_Byte6_MULTIP_Mask
+Mask to use to test the MULTIP bit.
+@constant kINQUIRY_Byte6_VS_Mask
+Mask to use to test the VS bit.
+@constant kINQUIRY_Byte6_ENCSERV_Mask
+Mask to use to test the ENCSERV bit.
+@constant kINQUIRY_Byte6_BQUE_Mask
+Mask to use to test the BQUE bit.
+*/
+enum
+{
+	// Byte offset
+	kINQUIRY_Byte6_Offset					= 6,
+	
+	// Bit definitions
+	kINQUIRY_Byte6_ADDR16_Bit				= 0,	// SPI Specific
+	// Bit 1 is Obsolete
+	// Bit 2 is Obsolete
+	kINQUIRY_Byte6_MCHNGR_Bit				= 3,
+	kINQUIRY_Byte6_MULTIP_Bit				= 4,
+	kINQUIRY_Byte6_VS_Bit					= 5,	
+	kINQUIRY_Byte6_ENCSERV_Bit				= 6,	
+	kINQUIRY_Byte6_BQUE_Bit					= 7,	
+
+	// Masks
+	kINQUIRY_Byte6_ADDR16_Mask				= (1 << kINQUIRY_Byte6_ADDR16_Bit),	// SPI Specific
+	// Bit 1 is Obsolete
+	// Bit 2 is Obsolete
+	kINQUIRY_Byte6_MCHNGR_Mask				= (1 << kINQUIRY_Byte6_MCHNGR_Bit),
+	kINQUIRY_Byte6_MULTIP_Mask				= (1 << kINQUIRY_Byte6_MULTIP_Bit),
+	kINQUIRY_Byte6_VS_Mask					= (1 << kINQUIRY_Byte6_VS_Bit),
+	kINQUIRY_Byte6_ENCSERV_Mask				= (1 << kINQUIRY_Byte6_ENCSERV_Bit),
+	kINQUIRY_Byte6_BQUE_Mask				= (1 << kINQUIRY_Byte6_BQUE_Bit)
+};
+
+
+/*!
+@enum flags2 field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY flags2 field.
+@constant kINQUIRY_Byte7_VS_Bit
+VS bit definition.
+@constant kINQUIRY_Byte7_CMDQUE_Bit
+CMDQUE bit definition.
+@constant kINQUIRY_Byte7_TRANDIS_Bit
+TRANDIS bit definition.
+@constant kINQUIRY_Byte7_LINKED_Bit
+LINKED bit definition.
+@constant kINQUIRY_Byte7_SYNC_Bit
+SYNC bit definition.
+@constant kINQUIRY_Byte7_WBUS16_Bit
+WBUS16 bit definition.
+@constant kINQUIRY_Byte7_RELADR_Bit
+RELADR bit definition.
+@constant kINQUIRY_Byte7_VS_Mask
+Mask to use to test the VS bit.
+@constant kINQUIRY_Byte7_CMDQUE_Mask
+Mask to use to test the CMDQUE bit.
+@constant kINQUIRY_Byte7_TRANDIS_Mask
+Mask to use to test the TRANDIS bit.
+@constant kINQUIRY_Byte7_LINKED_Mask
+Mask to use to test the LINKED bit.
+@constant kINQUIRY_Byte7_SYNC_Mask
+Mask to use to test the SYNC bit.
+@constant kINQUIRY_Byte7_WBUS16_Mask
+Mask to use to test the WBUS16 bit.
+@constant kINQUIRY_Byte7_RELADR_Mask
+Mask to use to test the RELADR bit.
+*/
+enum
+{
+	// Byte offset
+	kINQUIRY_Byte7_Offset					= 7,
+	
+	// Bit definitions
+	kINQUIRY_Byte7_VS_Bit					= 0,
+	kINQUIRY_Byte7_CMDQUE_Bit				= 1,
+	kINQUIRY_Byte7_TRANDIS_Bit				= 2,	// SPI Specific
+	kINQUIRY_Byte7_LINKED_Bit				= 3,
+	kINQUIRY_Byte7_SYNC_Bit					= 4,	// SPI Specific
+	kINQUIRY_Byte7_WBUS16_Bit				= 5,	// SPI Specific
+	// Bit 6 is Obsolete
+	kINQUIRY_Byte7_RELADR_Bit				= 7,
+	
+	// Masks
+	kINQUIRY_Byte7_VS_Mask					= (1 << kINQUIRY_Byte7_VS_Bit),
+	kINQUIRY_Byte7_CMDQUE_Mask				= (1 << kINQUIRY_Byte7_CMDQUE_Bit),
+	kINQUIRY_Byte7_TRANDIS_Mask				= (1 << kINQUIRY_Byte7_TRANDIS_Bit),// SPI Specific
+	kINQUIRY_Byte7_LINKED_Mask				= (1 << kINQUIRY_Byte7_LINKED_Bit),
+	kINQUIRY_Byte7_SYNC_Mask				= (1 << kINQUIRY_Byte7_SYNC_Bit),	// SPI Specific
+	kINQUIRY_Byte7_WBUS16_Mask				= (1 << kINQUIRY_Byte7_WBUS16_Bit),	// SPI Specific
+	// Bit 6 is Obsolete
+	kINQUIRY_Byte7_RELADR_Mask				= (1 << kINQUIRY_Byte7_RELADR_Bit)
+};
+
+
+/*!
+@enum Byte 56 features field definitions
+@discussion
+Definitions for bits/masks in the INQUIRY Byte 56 field.
+Inquiry Byte 56 features (for devices that report an ANSI VERSION of
+kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant or later).
+These are SPI-3 Specific.
+@constant kINQUIRY_Byte56_IUS_Bit
+IUS bit definition.
+@constant kINQUIRY_Byte56_QAS_Bit
+QAS bit definition.
+@constant kINQUIRY_Byte56_IUS_Mask
+Mask to use to test the IUS bit.
+@constant kINQUIRY_Byte56_QAS_Mask
+Mask to use to test the QAS bit.
+@constant kINQUIRY_Byte56_CLOCKING_Mask
+Mask to use to test CLOCKING bits.
+@constant kINQUIRY_Byte56_CLOCKING_ONLY_ST
+Single-transition clocking only.
+@constant kINQUIRY_Byte56_CLOCKING_ONLY_DT
+Double-transition clocking only.
+@constant kINQUIRY_Byte56_CLOCKING_ST_AND_DT
+Single-transition and double-transition clocking.
+*/
+enum
+{
+	// Byte offset
+	kINQUIRY_Byte56_Offset					= 56,
+
+	// Bit definitions
+	kINQUIRY_Byte56_IUS_Bit					= 0,
+	kINQUIRY_Byte56_QAS_Bit					= 1,
+	// Bits 2 and 3 are the CLOCKING bits
+	// All other bits are reserved
+	
+	kINQUIRY_Byte56_IUS_Mask				= (1 << kINQUIRY_Byte56_IUS_Bit),
+	kINQUIRY_Byte56_QAS_Mask				= (1 << kINQUIRY_Byte56_QAS_Bit),
+	kINQUIRY_Byte56_CLOCKING_Mask			= 0x0C,
+
+	// Definitions for the CLOCKING bits
+	kINQUIRY_Byte56_CLOCKING_ONLY_ST		= 0x00,
+	kINQUIRY_Byte56_CLOCKING_ONLY_DT		= 0x04,
+	// kINQUIRY_Byte56_CLOCKING_RESERVED	= 0x08,
+	kINQUIRY_Byte56_CLOCKING_ST_AND_DT		= 0x0C
+};
+
+
+/*!
+@define kINQUIRY_VERSION_DESCRIPTOR_MaxCount
+Maximum number of INQUIRY version descriptors supported.
+*/
+#define	kINQUIRY_VERSION_DESCRIPTOR_MaxCount		8
+
+
+/*!
+@enum kINQUIRY_VERSION_DESCRIPTOR_SAT
+SAT specification version descriptor.
+*/
+enum
+{
+	kINQUIRY_VERSION_DESCRIPTOR_SAT					= 0x1EA0
+};
+
+
+/*
+IORegistry property names for information derived from the Inquiry data.
+The Peripheral Device Type is the only property that the 
+generic Logical Unit Drivers will use to match. These properties are
+listed in order of matching priority. First is the Peripheral Device Type.
+Second is the Vendor Identification. Third is the Product Identification.
+Last is the Product Revision Level. To match a particular product, you would
+specify the Peripheral Device Type, Vendor Identification, and Product
+Identification. To restrict the match to a particular firmware revision, you
+would add the Product Revision Level. To not match on a particular product,
+but on a particular vendor's products, you would only include the 
+Peripheral Device Type and the Vendor Identification.
+*/
+
+/*!
+@define kIOPropertySCSIPeripheralDeviceType
+SCSI Peripheral Device Type as reported in the INQUIRY data.
+*/
+#define kIOPropertySCSIPeripheralDeviceType			"Peripheral Device Type"
+
+/*!
+@define kIOPropertySCSIPeripheralDeviceTypeSize
+Size of the kIOPropertySCSIPeripheralDeviceType key.
+*/
+#define kIOPropertySCSIPeripheralDeviceTypeSize		8
+
+/* These properties are listed in order of matching priority */
+
+/*!
+@define kIOPropertySCSIVendorIdentification
+Vendor ID as reported in the INQUIRY data. Additional space characters (0x20)
+are truncated.
+*/
+#define kIOPropertySCSIVendorIdentification			"Vendor Identification"
+
+/*!
+@define kIOPropertySCSIProductIdentification
+Product ID as reported in the INQUIRY data. Additional space characters (0x20)
+are truncated.
+*/
+#define kIOPropertySCSIProductIdentification		"Product Identification"
+
+/*!
+@define kIOPropertySCSIProductRevisionLevel
+Product Revision Level as reported in the INQUIRY data.
+*/
+#define kIOPropertySCSIProductRevisionLevel			"Product Revision Level"
+
+
+/*!
+@enum INQUIRY Page Codes
+@discussion INQUIRY Page Codes to be used when EVPD is set in the
+INQUIRY command.
+@constant kINQUIRY_Page00_PageCode
+Page Code 00h.
+@constant kINQUIRY_Page80_PageCode
+Page Code 80h.
+@constant kINQUIRY_Page83_PageCode
+Page Code 83h.
+@constant kINQUIRY_Page89_PageCode
+Page Code 89h.
+*/
+enum
+{
+	kINQUIRY_Page00_PageCode				= 0x00,
+	kINQUIRY_Page80_PageCode				= 0x80,
+	kINQUIRY_Page83_PageCode				= 0x83,
+	kINQUIRY_Page89_PageCode				= 0x89
+};	
+
+
+/*!
+@struct SCSICmd_INQUIRY_Page00_Header
+@discussion INQUIRY Page 00h Header.
+*/
+typedef struct SCSICmd_INQUIRY_Page00_Header
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		PAGE_CODE;							// Must be equal to 00h
+	UInt8		RESERVED;							// reserved field
+	UInt8		PAGE_LENGTH;						// n-3 bytes
+} SCSICmd_INQUIRY_Page00_Header;
+
+
+/*!
+@struct SCSICmd_INQUIRY_Page80_Header
+@discussion INQUIRY Page 80h Header.
+*/
+typedef struct SCSICmd_INQUIRY_Page80_Header
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		PAGE_CODE;							// Must be equal to 80h
+	UInt8		RESERVED;							// reserved field
+	UInt8		PAGE_LENGTH;						// n-3 bytes
+	UInt8		PRODUCT_SERIAL_NUMBER;				// 4-n
+} SCSICmd_INQUIRY_Page80_Header;
+
+
+/*!
+@define kIOPropertySCSIINQUIRYUnitSerialNumber
+Key that describes the INQUIRY Unit Serial Number in the IORegistry.
+*/
+#define kIOPropertySCSIINQUIRYUnitSerialNumber		"INQUIRY Unit Serial Number"
+
+
+/*!
+@struct SCSICmd_INQUIRY_Page83_Header
+@discussion INQUIRY Page 83h Header.
+*/
+typedef struct SCSICmd_INQUIRY_Page83_Header
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		PAGE_CODE;							// Must be equal to 83h
+	UInt8		RESERVED;							// reserved field
+	UInt8		PAGE_LENGTH;						// n-3 bytes
+} SCSICmd_INQUIRY_Page83_Header;
+
+
+/*!
+@struct SCSICmd_INQUIRY_Page83_Header_SPC_16
+@discussion INQUIRY Page 83h Header used with the 16 byte INQUIRY command.
+*/
+typedef struct SCSICmd_INQUIRY_Page83_Header_SPC_16
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		PAGE_CODE;							// Must be equal to 83h
+	UInt16		PAGE_LENGTH;						// n-3 bytes
+} SCSICmd_INQUIRY_Page83_Header_SPC_16;
+
+
+/*!
+@struct SCSICmd_INQUIRY_Page83_Identification_Descriptor
+@discussion INQUIRY Page 83h Identification Descriptor.
+*/
+typedef struct SCSICmd_INQUIRY_Page83_Identification_Descriptor
+{
+	UInt8		CODE_SET;							// 7-4 = Protocol Identifier. 3-0 = Code Set
+	UInt8		IDENTIFIER_TYPE;					// 7 = PIV 5-4 = ASSOCIATION 3-0 = Identifier
+	UInt8		RESERVED;							
+	UInt8		IDENTIFIER_LENGTH;
+	UInt8		IDENTIFIER;
+} SCSICmd_INQUIRY_Page83_Identification_Descriptor;
+
+
+/*!
+@enum INQUIRY Page 83h Code Set
+@discussion
+Definitions for the Code Set field.
+@constant kINQUIRY_Page83_CodeSetBinaryData
+The identifier contains binary data.
+@constant kINQUIRY_Page83_CodeSetASCIIData
+The identifier contains ASCII data.
+@constant kINQUIRY_Page83_CodeSetUTF8Data
+The identifier contains UTF-8 data.
+*/
+enum
+{
+	kINQUIRY_Page83_CodeSetReserved			= 0x0,
+	kINQUIRY_Page83_CodeSetBinaryData		= 0x1,
+	kINQUIRY_Page83_CodeSetASCIIData		= 0x2,
+	kINQUIRY_Page83_CodeSetUTF8Data			= 0x3,
+	// 0x4 - 0xF reserved
+	kINQUIRY_Page83_CodeSetMask				= 0xF
+};	
+
+
+/*!
+@enum INQUIRY Page 83h Association
+@discussion
+Definitions for the Association field.
+@constant kINQUIRY_Page83_AssociationLogicalUnit
+Association of the identifier is with the logical unit.
+@constant kINQUIRY_Page83_AssociationDevice
+Association of the identifier is with the device (same as logical unit in SPC-2).
+@constant kINQUIRY_Page83_AssociationTargetPort
+Association of the identifier is with the target port.
+@constant kINQUIRY_Page83_AssociationTargetDevice
+Association of the identifier is with the target device (i.e. all ports).
+@constant kINQUIRY_Page83_AssociationMask
+Mask to use to determine association.
+*/
+enum
+{	
+	// SPC-3 - Association is changed to be specific to 
+	// Logical Units
+	kINQUIRY_Page83_AssociationLogicalUnit	= 0x00,
+	
+	// Backwards compatibility for SPC-2
+	kINQUIRY_Page83_AssociationDevice 		= kINQUIRY_Page83_AssociationLogicalUnit,
+	
+	// Association is related to a Target Port
+	kINQUIRY_Page83_AssociationTargetPort	= 0x10,
+	
+	// SPC-3 - Added as specific association to
+	// a Target device.
+	kINQUIRY_Page83_AssociationTargetDevice	= 0x20,
+	
+	kINQUIRY_Page83_AssociationMask			= 0x30
+};	
+		
+
+/*!
+@enum INQUIRY Page 83h Identifier Type
+@discussion
+Definitions for the Identifier Type field.
+@constant kINQUIRY_Page83_IdentifierTypeUndefined
+Undefined Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeVendorID
+Vendor Specific Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeIEEE_EUI64
+EUI-64 Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeNAAIdentifier
+NAA Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeRelativePortIdentifier
+Relative Target Port Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeTargetPortGroup
+Target Port Group Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeLogicalUnitGroup
+Logical Unit Group Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeMD5LogicalUnitIdentifier
+MD5 Logical Unit Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeSCSINameString
+SCSI Name String Identifier Type.
+@constant kINQUIRY_Page83_IdentifierTypeMask
+Mask to use to determine association.
+@constant kINQUIRY_Page83_ProtocolIdentifierValidBit
+PIV Bit definition.
+@constant kINQUIRY_Page83_ProtocolIdentifierValidMask
+Mask to use to determine if PIV is set.
+*/
+enum
+{
+	kINQUIRY_Page83_IdentifierTypeUndefined					= 0,
+	kINQUIRY_Page83_IdentifierTypeVendorID					= 1,
+	kINQUIRY_Page83_IdentifierTypeIEEE_EUI64				= 2,
+	kINQUIRY_Page83_IdentifierTypeNAAIdentifier				= 3,
+	kINQUIRY_Page83_IdentifierTypeRelativePortIdentifier	= 4,
+	kINQUIRY_Page83_IdentifierTypeTargetPortGroup			= 5,
+	kINQUIRY_Page83_IdentifierTypeLogicalUnitGroup			= 6,
+	kINQUIRY_Page83_IdentifierTypeMD5LogicalUnitIdentifier  = 7,
+	kINQUIRY_Page83_IdentifierTypeSCSINameString			= 8,
+	// 0x9 - 0xF Reserved
+	
+	kINQUIRY_Page83_IdentifierTypeMask						= 0xF,
+	
+	kINQUIRY_Page83_ProtocolIdentifierValidBit				= 7,
+	kINQUIRY_Page83_ProtocolIdentifierValidMask				= (1 << kINQUIRY_Page83_ProtocolIdentifierValidBit)
+	
+};	
+
+// Backwards compatibility
+#define kINQUIRY_Page83_IdentifierTypeFCNameIdentifier		kINQUIRY_Page83_IdentifierTypeNAAIdentifier
+
+
+/*!
+@enum Protocol Identifier values
+@discussion
+Definitions for the protocol identifier values.
+@constant kSCSIProtocolIdentifier_FibreChannel
+FibreChannel Protocol Identifier.
+@constant kSCSIProtocolIdentifier_ParallelSCSI
+Parallel SCSI Protocol Identifier.
+@constant kSCSIProtocolIdentifier_SSA
+SSA Protocol Identifier.
+@constant kSCSIProtocolIdentifier_FireWire
+FireWire (IEEE-1394) Protocol Identifier.
+@constant kSCSIProtocolIdentifier_RDMA
+RDMA Protocol Identifier.
+@constant kSCSIProtocolIdentifier_iSCSI
+iSCSI Protocol Identifier.
+@constant kSCSIProtocolIdentifier_SAS
+SAS Protocol Identifier.
+@constant kSCSIProtocolIdentifier_ADT
+ADT Protocol Identifier.
+@constant kSCSIProtocolIdentifier_ATAPI
+ATAPI Protocol Identifier.
+@constant kSCSIProtocolIdentifier_None
+No Protocol Identifier.
+*/
+enum
+{
+	kSCSIProtocolIdentifier_FibreChannel					= 0,
+	kSCSIProtocolIdentifier_ParallelSCSI					= 1,
+	kSCSIProtocolIdentifier_SSA								= 2,
+	kSCSIProtocolIdentifier_FireWire						= 3,
+	kSCSIProtocolIdentifier_RDMA							= 4,
+	kSCSIProtocolIdentifier_iSCSI							= 5,
+	kSCSIProtocolIdentifier_SAS								= 6,
+	kSCSIProtocolIdentifier_ADT								= 7,
+	kSCSIProtocolIdentifier_ATAPI							= 8,
+	// 0x9-0xE Reserved
+	kSCSIProtocolIdentifier_None							= 0xF
+};
+
+
+/*!
+@define kIOPropertySCSIINQUIRYDeviceIdentification
+Device Identification key.
+*/
+#define kIOPropertySCSIINQUIRYDeviceIdentification		"INQUIRY Device Identification"
+
+
+/*!
+@define kIOPropertySCSIINQUIRYDeviceIdCodeSet
+Code Set type key.
+*/
+#define kIOPropertySCSIINQUIRYDeviceIdCodeSet			"Code Set"
+
+
+/*!
+@define kIOPropertySCSIINQUIRYDeviceIdType
+Identifier Type key.
+*/
+#define kIOPropertySCSIINQUIRYDeviceIdType				"Identifier Type"
+
+
+/*!
+@define kIOPropertySCSIINQUIRYDeviceIdAssociation
+Association key.
+*/
+#define kIOPropertySCSIINQUIRYDeviceIdAssociation		"Association"
+
+
+/*!
+@define kIOPropertySCSIINQUIRYDeviceIdentifier
+Identifier key (data or string).
+*/
+#define kIOPropertySCSIINQUIRYDeviceIdentifier			"Identifier"
+		
+
+/*!
+@struct SCSICmd_INQUIRY_Page89_Data
+@discussion INQUIRY Page 89h data as defined in the SAT 1.0
+specification. This section contians all structures and
+definitions used by the INQUIRY command in response to a request
+for page 89h - ATA information VPD Page.
+*/
+typedef struct SCSICmd_INQUIRY_Page89_Data
+{
+	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
+	UInt8		PAGE_CODE;							// Must be equal to 89h
+	UInt16		PAGE_LENGTH;						// Must be equal to 238h
+	UInt32		Reserved;
+	UInt8		SAT_VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
+	UInt8		SAT_PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
+	UInt8		SAT_PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
+	UInt8		ATA_DEVICE_SIGNATURE[20];
+	UInt8		COMMAND_CODE;
+	UInt8		Reserved2[3];
+	UInt8		IDENTIFY_DATA[512];
+} SCSICmd_INQUIRY_Page89_Data;
+
+
+/*!
+@define kIOPropertySATVendorIdentification
+Vendor Identification of the SATL.
+*/
+#define kIOPropertySATVendorIdentification			"SAT Vendor Identification"
+
+
+/*!
+@define kIOPropertySATProductIdentification
+Product Identification of the SATL.
+*/
+#define kIOPropertySATProductIdentification			"SAT Product Identification"
+
+
+/*!
+@define kIOPropertySATProductRevisonLevel
+Product Revision Level of the SATL.
+*/
+#define kIOPropertySATProductRevisonLevel			"SAT Product Revision Level"
+
+
+#endif	/* _IOKIT_SCSI_CMDS_INQUIRY_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICmds_MODE_Definitions.h b/i386/include/IOKit/scsi/SCSICmds_MODE_Definitions.h
new file mode 100644
index 0000000..8d9c250
--- /dev/null
+++ b/i386/include/IOKit/scsi/SCSICmds_MODE_Definitions.h
@@ -0,0 +1,559 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_
+#define _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSI Request Sense Definitions
+	@discussion
+	This file contains all definitions for the data returned from
+	the MODE_SENSE_6 and MODE_SENSE_10 commands.
+*/
+
+#pragma pack(1)
+
+/*!
+@struct SPCModeParameterHeader6
+@discussion
+Mode Parameter Header for the MODE_SENSE_6 command.
+*/
+typedef struct SPCModeParameterHeader6
+{
+	UInt8		MODE_DATA_LENGTH;
+	UInt8		MEDIUM_TYPE;
+	UInt8		DEVICE_SPECIFIC_PARAMETER;
+	UInt8		BLOCK_DESCRIPTOR_LENGTH;
+} SPCModeParameterHeader6;
+
+
+/*!
+@struct SPCModeParameterHeader10
+@discussion
+Mode Parameter Header for the MODE_SENSE_10 command.
+*/
+typedef struct SPCModeParameterHeader10
+{
+	UInt16		MODE_DATA_LENGTH;
+	UInt8		MEDIUM_TYPE;
+	UInt8		DEVICE_SPECIFIC_PARAMETER;
+	UInt8		LONGLBA;
+	UInt8		RESERVED;
+	UInt16		BLOCK_DESCRIPTOR_LENGTH;
+} SPCModeParameterHeader10;
+
+
+/*!
+@enum Long LBA Bitfield definitions
+@discussion
+Long LBA Bitfield definitions for Mode Parameter Header
+for MODE_SENSE_10 command.
+@constant kModeSenseParameterHeader10_LongLBABit
+Bit to indicate Long LBA block descriptors follow.
+@constant kModeSenseParameterHeader10_LongLBAMask
+Mask to test for kModeSenseParameterHeader10_LongLBABit.
+*/
+enum
+{
+	kModeSenseParameterHeader10_LongLBABit	=  0,
+	kModeSenseParameterHeader10_LongLBAMask	=  (1 << kModeSenseParameterHeader10_LongLBABit),
+};
+
+
+/*!
+@enum Device Specific Parameter Bitfield definitions
+@discussion
+SBC definitions for Device Specific Parameter in the
+Mode Sense Header Block.
+@constant kModeSenseSBCDeviceSpecific_DPOFUABit
+Bit to indicate DPO and FUA bits are accepted by the device server.
+@constant kModeSenseSBCDeviceSpecific_WriteProtectBit
+Bit to indicate medium is write protected.
+@constant kModeSenseSBCDeviceSpecific_DPOFUAMask
+Mask to test for kModeSenseSBCDeviceSpecific_DPOFUABit.
+@constant kModeSenseSBCDeviceSpecific_WriteProtectMask
+Mask to test for kModeSenseSBCDeviceSpecific_WriteProtectBit.
+*/
+enum
+{
+	kModeSenseSBCDeviceSpecific_DPOFUABit	 		=  4,
+	kModeSenseSBCDeviceSpecific_WriteProtectBit	 	=  7,
+	kModeSenseSBCDeviceSpecific_DPOFUAMask 			=  (1 << kModeSenseSBCDeviceSpecific_DPOFUABit),
+	kModeSenseSBCDeviceSpecific_WriteProtectMask 	=  (1 << kModeSenseSBCDeviceSpecific_WriteProtectBit)
+};
+
+
+/*!
+@struct ModeParameterBlockDescriptor
+@discussion
+General mode parameter block descriptor.
+*/
+typedef struct ModeParameterBlockDescriptor
+{
+	UInt8		DENSITY_CODE;
+	UInt8		NUMBER_OF_BLOCKS[3];
+	UInt8		RESERVED;
+	UInt8		BLOCK_LENGTH[3];
+} ModeParameterBlockDescriptor;
+
+
+/*!
+@struct DASDModeParameterBlockDescriptor
+@discussion
+Direct Access Storage Device mode parameter block descriptor.
+*/
+typedef struct DASDModeParameterBlockDescriptor
+{
+	UInt32		NUMBER_OF_BLOCKS;
+	UInt8		DENSITY_CODE;
+	UInt8		BLOCK_LENGTH[3];
+} DASDModeParameterBlockDescriptor;
+
+
+/*!
+@struct LongLBAModeParameterBlockDescriptor
+@discussion
+Long LBA mode parameter block descriptor.
+*/
+typedef struct LongLBAModeParameterBlockDescriptor
+{
+	UInt64		NUMBER_OF_BLOCKS;
+	UInt8		DENSITY_CODE;
+	UInt8		RESERVED[3];
+	UInt32		BLOCK_LENGTH;
+} LongLBAModeParameterBlockDescriptor;
+
+
+/*!
+@struct ModePageFormatHeader
+@discussion
+Mode Page format header.
+*/
+typedef struct ModePageFormatHeader
+{
+	UInt8		PS_PAGE_CODE;
+	UInt8		PAGE_LENGTH;
+} ModePageFormatHeader;
+
+
+/*!
+@enum Mode Page Format bit definitions
+@discussion
+Mode Page Format bit definitions.
+@constant kModePageFormat_PS_Bit
+Bit to indicate Parameters Saveable.
+@constant kModePageFormat_PAGE_CODE_Mask
+Mask to obtain the PAGE_CODE from the PS_PAGE_CODE field.
+@constant kModePageFormat_PS_Mask
+Mask to test for kModePageFormat_PS_Bit.
+*/
+enum
+{
+	kModePageFormat_PS_Bit			= 7,
+	
+	kModePageFormat_PAGE_CODE_Mask	= 0x3F,
+	kModePageFormat_PS_Mask			= (1 << kModePageFormat_PS_Bit)
+};
+
+
+#if 0
+#pragma mark -
+#pragma mark SPC Mode Pages
+#pragma mark -
+#endif
+
+
+/*!
+@enum SPC Mode Pages
+@discussion
+SPC Mode Page definitions.
+@constant kSPCModePagePowerConditionCode
+Power Conditions Mode Page value.
+@constant kSPCModePageAllPagesCode
+All Mode Pages value.
+*/
+enum
+{
+	kSPCModePagePowerConditionCode		= 0x1A,
+	kSPCModePageAllPagesCode			= 0x3F
+};
+
+/*!
+@struct SPCModePagePowerCondition
+@discussion
+Power Conditions Mode Page (PAGE CODE 0x1A) format.
+*/
+typedef struct SPCModePagePowerCondition
+{
+	ModePageFormatHeader	header;
+	UInt8					RESERVED;
+	UInt8					IDLE_STANDBY;
+	UInt32					IDLE_CONDITION_TIMER;
+	UInt32					STANDBY_CONDITION_TIMER;
+} SPCModePagePowerCondition;
+
+
+#if 0
+#pragma mark -
+#pragma mark 0x00 SBC Direct Access Mode Pages
+#pragma mark -
+#endif
+
+
+/*!
+@enum SBC Mode Pages
+@discussion
+SBC Mode Page definitions.
+@constant kSBCModePageFormatDeviceCode
+Format Device Mode Page value.
+@constant kSBCModePageRigidDiskGeometryCode
+Rigid Disk Geometry Page value.
+@constant kSBCModePageFlexibleDiskCode
+Flexible Disk Page value.
+@constant kSBCModePageCachingCode
+Caching Page value.
+*/
+enum
+{
+	kSBCModePageFormatDeviceCode		= 0x03,
+	kSBCModePageRigidDiskGeometryCode	= 0x04,
+	kSBCModePageFlexibleDiskCode		= 0x05,
+	kSBCModePageCachingCode				= 0x08
+};
+
+
+/*!
+@struct SBCModePageFormatDevice
+@discussion
+Format Device Mode Page (PAGE CODE 0x03) format.
+*/
+typedef struct SBCModePageFormatDevice
+{
+	ModePageFormatHeader	header;
+	UInt16					TRACKS_PER_ZONE;
+	UInt16					ALTERNATE_SECTORS_PER_ZONE;
+	UInt16					ALTERNATE_TRACKS_PER_ZONE;
+	UInt16					ALTERNATE_TRACKS_PER_LOGICAL_UNIT;
+	UInt16					SECTORS_PER_TRACK;
+	UInt16					DATA_BYTES_PER_PHYSICAL_SECTOR;
+	UInt16					INTERLEAVE;
+	UInt16					TRACK_SKEW_FACTOR;
+	UInt16					CYLINDER_SKEW_FACTOR;
+	UInt8					SSEC_HSEC_RMB_SURF;
+	UInt8					RESERVED[3];
+} SBCModePageFormatDevice;
+
+
+/*!
+@struct SBCModePageRigidDiskGeometry
+@discussion
+Rigid Disk Geometry Mode Page (PAGE CODE 0x04) format.
+*/
+typedef struct SBCModePageRigidDiskGeometry
+{
+	ModePageFormatHeader	header;
+	UInt8					NUMBER_OF_CYLINDERS[3];
+	UInt8					NUMBER_OF_HEADS;
+	UInt8					STARTING_CYLINDER_WRITE_PRECOMPENSATION[3];
+	UInt8					STARTING_CYLINDER_REDUCED_WRITE_CURRENT[3];
+	UInt16					DEVICE_STEP_RATE;
+	UInt8					LANDING_ZONE_CYLINDER[3];
+	UInt8					RPL;
+	UInt8					ROTATIONAL_OFFSET;
+	UInt8					RESERVED;
+	UInt16					MEDIUM_ROTATION_RATE;
+	UInt8					RESERVED1[2];
+} SBCModePageRigidDiskGeometry;
+
+
+/*!
+@enum Rigid Disk Geometry bitfields
+@discussion
+Bit field masks for Rigid Disk Geometry structure fields.
+@constant kSBCModePageRigidDiskGeometry_RPL_Mask
+Mask for use with the RPL field.
+*/
+enum
+{
+	kSBCModePageRigidDiskGeometry_RPL_Mask	= 0x03
+};
+
+
+/*!
+@struct SBCModePageFlexibleDisk
+@discussion
+Flexible Disk Mode Page (PAGE CODE 0x05) format.
+*/
+typedef struct SBCModePageFlexibleDisk
+{
+	ModePageFormatHeader	header;
+	UInt16					TRANSFER_RATE;
+	UInt8					NUMBER_OF_HEADS;
+	UInt8					SECTORS_PER_TRACK;
+	UInt16					DATA_BYTES_PER_SECTOR;
+	UInt16					NUMBER_OF_CYLINDERS;
+	UInt16					STARTING_CYLINDER_WRITE_PRECOMPENSATION;
+	UInt16					STARTING_CYLINDER_REDUCED_WRITE_CURRENT;
+	UInt16					DEVICE_STEP_RATE;
+	UInt8					DEVICE_STEP_PULSE_WIDTH;
+	UInt16					HEAD_SETTLE_DELAY;
+	UInt8					MOTOR_ON_DELAY;
+	UInt8					MOTOR_OFF_DELAY;
+	UInt8					TRDY_SSN_MO;
+	UInt8					SPC;
+	UInt8					WRITE_COMPENSATION;
+	UInt8					HEAD_LOAD_DELAY;
+	UInt8					HEAD_UNLOAD_DELAY;
+	UInt8					PIN_34_PIN_2;
+	UInt8					PIN_4_PIN_1;
+	UInt16					MEDIUM_ROTATION_RATE;
+	UInt8					RESERVED[2];
+} SBCModePageFlexibleDisk;
+
+
+/*!
+@enum TRDY_SSN_MO bitfields
+@discussion
+Bit field definitions and masks for Flexible Disk TRDY_SSN_MO field.
+@constant kSBCModePageFlexibleDisk_MO_Bit
+MO Bit definition.
+@constant kSBCModePageFlexibleDisk_SSN_Bit
+SSN Bit definition.
+@constant kSBCModePageFlexibleDisk_TRDY_Bit
+TRDY Bit definition.
+@constant kSBCModePageFlexibleDisk_MO_Mask
+Mask for use with TRDY_SSN_MO field.
+@constant kSBCModePageFlexibleDisk_SSN_Mask
+Mask for use with TRDY_SSN_MO field.
+@constant kSBCModePageFlexibleDisk_TRDY_Mask
+Mask for use with TRDY_SSN_MO field.
+*/
+enum
+{
+	// Bits 0:4 Reserved
+	kSBCModePageFlexibleDisk_MO_Bit		= 5,
+	kSBCModePageFlexibleDisk_SSN_Bit	= 6,
+	kSBCModePageFlexibleDisk_TRDY_Bit	= 7,
+	
+	kSBCModePageFlexibleDisk_MO_Mask	= (1 << kSBCModePageFlexibleDisk_MO_Bit),
+	kSBCModePageFlexibleDisk_SSN_Mask	= (1 << kSBCModePageFlexibleDisk_SSN_Bit),
+	kSBCModePageFlexibleDisk_TRDY_Mask	= (1 << kSBCModePageFlexibleDisk_TRDY_Bit)
+};
+
+
+/*!
+@enum SPC bitfields
+@discussion
+Bit field definitions and masks for Flexible Disk SPC field.
+@constant kSBCModePageFlexibleDisk_SPC_Mask
+Mask for use with SPC field.
+*/
+enum
+{
+	kSBCModePageFlexibleDisk_SPC_Mask	= 0x0F
+};
+
+
+/*!
+@enum PIN_34_PIN_2 bitfields
+@discussion
+Bit field definitions and masks for Flexible Disk PIN_34_PIN_2 field.
+@constant kSBCModePageFlexibleDisk_PIN_2_Mask
+Mask for use with PIN_34_PIN_2 field.
+@constant kSBCModePageFlexibleDisk_PIN_34_Mask
+Mask for use with PIN_34_PIN_2 field.
+*/
+enum
+{
+	kSBCModePageFlexibleDisk_PIN_2_Mask		= 0x0F,
+	kSBCModePageFlexibleDisk_PIN_34_Mask	= 0xF0
+};
+
+
+/*!
+@enum PIN_4_PIN_1 bitfields
+@discussion
+Bit field definitions and masks for Flexible Disk PIN_4_PIN_1 field.
+@constant kSBCModePageFlexibleDisk_PIN_1_Mask
+Mask for use with PIN_4_PIN_1 field.
+@constant kSBCModePageFlexibleDisk_PIN_4_Mask
+Mask for use with PIN_4_PIN_1 field.
+*/
+enum
+{
+	kSBCModePageFlexibleDisk_PIN_1_Mask		= 0x0F,
+	kSBCModePageFlexibleDisk_PIN_4_Mask		= 0xF0
+};
+
+
+/*!
+@struct SBCModePageCaching
+@discussion
+Caching Mode Page (PAGE CODE 0x08) format.
+*/
+typedef struct SBCModePageCaching
+{
+	ModePageFormatHeader	header;
+	UInt8					flags;
+	UInt8					DEMAND_READ_WRITE_RETENTION_PRIORITY;
+	UInt16					DISABLE_PREFETCH_TRANSFER_LENGTH;
+	UInt16					MINIMUM_PREFETCH;
+	UInt16					MAXIMUM_PREFETCH;
+	UInt16					MAXIMUM_PREFETCH_CEILING;
+	UInt8					flags2;
+	UInt8					NUMBER_OF_CACHE_SEGMENTS;
+	UInt16					CACHE_SEGMENT_SIZE;
+	UInt8					RESERVED;
+	UInt8					NON_CACHE_SEGMENT_SIZE[3];
+} SBCModePageCaching;
+
+
+/*!
+@enum Caching flags bitfields
+@discussion
+Bit field definitions and masks for Caching flags field.
+@constant kSBCModePageCaching_RCD_Bit
+RCD Bit definition.
+@constant kSBCModePageCaching_MF_Bit
+MF Bit definition.
+@constant kSBCModePageCaching_WCE_Bit
+WCE Bit definition.
+@constant kSBCModePageCaching_SIZE_Bit
+SIZE Bit definition.
+@constant kSBCModePageCaching_DISC_Bit
+DISC Bit definition.
+@constant kSBCModePageCaching_CAP_Bit
+CAP Bit definition.
+@constant kSBCModePageCaching_ABPF_Bit
+ABPF Bit definition.
+@constant kSBCModePageCaching_IC_Bit
+IC Bit definition.
+@constant kSBCModePageCaching_RCD_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_MF_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_WCE_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_SIZE_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_DISC_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_CAP_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_ABPF_Mask
+Mask for use with flags field.
+@constant kSBCModePageCaching_IC_Mask
+Mask for use with flags field.
+*/
+enum
+{
+	kSBCModePageCaching_RCD_Bit		= 0,
+	kSBCModePageCaching_MF_Bit		= 1,
+	kSBCModePageCaching_WCE_Bit		= 2,
+	kSBCModePageCaching_SIZE_Bit	= 3,
+	kSBCModePageCaching_DISC_Bit	= 4,
+	kSBCModePageCaching_CAP_Bit		= 5,
+	kSBCModePageCaching_ABPF_Bit	= 6,
+	kSBCModePageCaching_IC_Bit		= 7,
+
+	kSBCModePageCaching_RCD_Mask	= (1 << kSBCModePageCaching_RCD_Bit),
+	kSBCModePageCaching_MF_Mask		= (1 << kSBCModePageCaching_MF_Bit),
+	kSBCModePageCaching_WCE_Mask	= (1 << kSBCModePageCaching_WCE_Bit),
+	kSBCModePageCaching_SIZE_Mask	= (1 << kSBCModePageCaching_SIZE_Bit),
+	kSBCModePageCaching_DISC_Mask	= (1 << kSBCModePageCaching_DISC_Bit),
+	kSBCModePageCaching_CAP_Mask	= (1 << kSBCModePageCaching_CAP_Bit),
+	kSBCModePageCaching_ABPF_Mask	= (1 << kSBCModePageCaching_ABPF_Bit),
+	kSBCModePageCaching_IC_Mask		= (1 << kSBCModePageCaching_IC_Bit)
+};
+
+
+/*!
+@enum Demand Read/Write Retention masks
+@discussion
+Demand Read/Write Retention masks.
+@constant kSBCModePageCaching_DEMAND_WRITE_Mask
+Mask for the DEMAND_READ_WRITE_RETENTION_PRIORITY field.
+@constant kSBCModePageCaching_DEMAND_READ_Mask
+Mask for the DEMAND_READ_WRITE_RETENTION_PRIORITY field.
+*/
+enum
+{
+	kSBCModePageCaching_DEMAND_WRITE_Mask	= 0x00FF,
+	kSBCModePageCaching_DEMAND_READ_Mask 	= 0xFF00
+};
+
+/*!
+@enum Caching flags2 bitfields
+@discussion
+Bit field definitions and masks for Caching flags2 field.
+@constant kSBCModePageCaching_VS1_Bit
+VS1 Bit definition.
+@constant kSBCModePageCaching_VS2_Bit
+VS2 Bit definition.
+@constant kSBCModePageCaching_DRA_Bit
+DRA Bit definition.
+@constant kSBCModePageCaching_LBCSS_Bit
+LBCSS Bit definition.
+@constant kSBCModePageCaching_FSW_Bit
+FSW Bit definition.
+@constant kSBCModePageCaching_VS1_Mask
+Mask for use with flags2 field.
+@constant kSBCModePageCaching_VS2_Mask
+Mask for use with flags2 field.
+@constant kSBCModePageCaching_DRA_Mask
+Mask for use with flags2 field.
+@constant kSBCModePageCaching_LBCSS_Mask
+Mask for use with flags2 field.
+@constant kSBCModePageCaching_FSW_Mask
+Mask for use with flags2 field.
+*/
+enum
+{
+	// Bits 0:2 Reserved
+	kSBCModePageCaching_VS1_Bit		= 3,
+	kSBCModePageCaching_VS2_Bit		= 4,
+	kSBCModePageCaching_DRA_Bit		= 5,
+	kSBCModePageCaching_LBCSS_Bit	= 6,
+	kSBCModePageCaching_FSW_Bit		= 7,
+
+	kSBCModePageCaching_VS1_Mask	= (1 << kSBCModePageCaching_VS1_Bit),
+	kSBCModePageCaching_VS2_Mask	= (1 << kSBCModePageCaching_VS2_Bit),
+	kSBCModePageCaching_DRA_Mask	= (1 << kSBCModePageCaching_DRA_Bit),
+	kSBCModePageCaching_LBCSS_Mask	= (1 << kSBCModePageCaching_LBCSS_Bit),
+	kSBCModePageCaching_FSW_Mask	= (1 << kSBCModePageCaching_FSW_Bit)
+};
+
+#pragma options align=reset
+
+#endif	/* _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICmds_READ_CAPACITY_Definitions.h b/i386/include/IOKit/scsi/SCSICmds_READ_CAPACITY_Definitions.h
new file mode 100644
index 0000000..59abde3
--- /dev/null
+++ b/i386/include/IOKit/scsi/SCSICmds_READ_CAPACITY_Definitions.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_CMDS_READ_CAPACITY_H_
+#define _IOKIT_SCSI_CMDS_READ_CAPACITY_H_
+
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSI Request Sense Definitions
+	@discussion
+	This file contains all definitions for the data returned from
+	the READ CAPACITY 10 (0x25) and READ CAPACITY 16 (0x9E) commands.
+*/
+
+/*!
+@enum READ CAPACITY Payload Sizes
+@discussion
+Sizes of the payload for the READ CAPACITY 10 and
+READ CAPACITY 16 commands.
+@constant kREPORT_CAPACITY_DataSize
+Data size for a READ_CAPACITY command.
+@constant kREPORT_CAPACITY_16_DataSize
+Data size for a READ_CAPACITY_16 command.
+*/
+enum
+{
+	kREPORT_CAPACITY_DataSize		= 8,
+	kREPORT_CAPACITY_16_DataSize	= 32
+};
+
+
+/*!
+@constant kREPORT_CAPACITY_MaximumLBA
+@discussion
+Maximum LBA supported via READ CAPACITY 10 command.
+*/
+#define 	kREPORT_CAPACITY_MaximumLBA			0xFFFFFFFFUL
+
+
+/*!
+@constant kREPORT_CAPACITY_16_MaximumLBA
+@discussion
+Maximum LBA supported via READ CAPACITY 16 command.
+*/
+#define 	kREPORT_CAPACITY_16_MaximumLBA		0xFFFFFFFFFFFFFFFFULL
+
+
+/*!
+@struct SCSI_Capacity_Data
+@discussion
+Capacity return structure for READ CAPACITY 10 command.
+*/
+typedef struct SCSI_Capacity_Data
+{
+	UInt32		RETURNED_LOGICAL_BLOCK_ADDRESS;
+	UInt32		BLOCK_LENGTH_IN_BYTES;
+} SCSI_Capacity_Data;
+
+
+/*!
+@struct SCSI_Capacity_Data_Long
+@discussion
+Capacity return structure for READ CAPACITY 16 command.
+*/
+typedef struct SCSI_Capacity_Data_Long
+{
+	UInt64		RETURNED_LOGICAL_BLOCK_ADDRESS;
+	UInt32		BLOCK_LENGTH_IN_BYTES;
+	UInt8		RTO_EN_PROT_EN;
+	UInt8		Reserved[19];
+} SCSI_Capacity_Data_Long;
+
+
+/*!
+@enum RTO_EN definitions
+@discussion
+Values for the REFERENCE TAG OWN (RTO_EN) bit in the
+READ CAPACITY Long Data structure.
+@constant kREAD_CAPACITY_RTO_Enabled
+Reference Tag Own enabled.
+@constant kREAD_CAPACITY_RTO_Disabled
+Reference Tag Own disabled.
+@constant kREAD_CAPACITY_RTO_Mask
+Mask to use when checking the RTO_EN_PROT_EN field.
+*/
+enum
+{
+	kREAD_CAPACITY_RTO_Enabled								= 0x02,
+	kREAD_CAPACITY_RTO_Disabled								= 0x00,
+	kREAD_CAPACITY_RTO_Mask									= 0x02
+};
+
+
+/*!
+@enum PROTECTION INFORMATION definitions
+@discussion
+Values for the PROTECTION INFORMATION (PROT_EN) bit in the
+READ CAPACITY Long Data structure.
+@constant kREAD_CAPACITY_PROT_Enabled
+Protection Information enabled.
+@constant kREAD_CAPACITY_PROT_Disabled
+Protection Information disabled.
+@constant kREAD_CAPACITY_PROT_Mask
+Mask to use when checking the RTO_EN_PROT_EN field.
+*/
+
+enum
+{
+	kREAD_CAPACITY_PROT_Enabled								= 0x01,
+	kREAD_CAPACITY_PROT_Disabled							= 0x00,
+	kREAD_CAPACITY_PROT_Mask								= 0x01
+};
+
+
+#endif	/* _IOKIT_SCSI_CMDS_READ_CAPACITY_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICmds_REPORT_LUNS_Definitions.h b/i386/include/IOKit/scsi/SCSICmds_REPORT_LUNS_Definitions.h
new file mode 100644
index 0000000..6616e84
--- /dev/null
+++ b/i386/include/IOKit/scsi/SCSICmds_REPORT_LUNS_Definitions.h
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_
+#define _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_
+
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSI Request Sense Definitions
+	@discussion
+	This file contains all definitions for the data returned from
+	the REPORT_LUNS (0xA0) command.
+*/
+
+
+/*!
+@struct SCSICmd_REPORT_LUNS_LUN_ENTRY
+@discussion
+This structure represents a single LUN entry in a LUN list
+returned via the REPORT_LUNS command.
+*/
+typedef struct SCSICmd_REPORT_LUNS_LUN_ENTRY
+{
+	UInt16		FIRST_LEVEL_ADDRESSING;
+	UInt16		SECOND_LEVEL_ADDRESSING;
+	UInt16		THIRD_LEVEL_ADDRESSING;
+	UInt16		FOURTH_LEVEL_ADDRESSING;
+} SCSICmd_REPORT_LUNS_LUN_ENTRY;
+
+
+/*!
+@constant kREPORT_LUNS_HeaderSize
+@discussion
+Size of the REPORT_LUNS header as defined in the SPC-3 specification.
+*/
+#define kREPORT_LUNS_HeaderSize		8
+
+/*!
+@enum REPORT_LUNS addressing methods.
+@discussion
+REPORT_LUNS addressing methods described in
+SAM-2 documents.
+@constant kREPORT_LUNS_ADDRESS_METHOD_PERIPHERAL_DEVICE
+Peripheral Device Addressing Method.
+@constant kREPORT_LUNS_ADDRESS_DEVICE_TYPE_SPECIFIC
+Device Type Specific Addressing Method.
+@constant kREPORT_LUNS_ADDRESS_METHOD_LOGICAL_UNIT
+Logical Unit Specific Addressing Method.
+@constant kREPORT_LUNS_ADDRESS_METHOD_OFFSET
+Offset to the address method data.
+*/
+enum
+{
+	kREPORT_LUNS_ADDRESS_METHOD_PERIPHERAL_DEVICE	= 0,
+	kREPORT_LUNS_ADDRESS_DEVICE_TYPE_SPECIFIC		= 1,
+	kREPORT_LUNS_ADDRESS_METHOD_LOGICAL_UNIT 		= 2,
+	// Reserved [3]
+	kREPORT_LUNS_ADDRESS_METHOD_OFFSET				= 14
+};
+
+
+/*!
+@struct REPORT_LUNS_LOGICAL_UNIT_ADDRESSING
+@discussion
+This structure represents a LUN Addressing scheme.
+*/
+typedef struct REPORT_LUNS_LOGICAL_UNIT_ADDRESSING
+{
+#ifdef __LITTLE_ENDIAN__
+	UInt16		LUN			: 5;
+	UInt16		BUS_NUMBER	: 3;
+	UInt16		TARGET		: 6;
+	UInt16		reserved2	: 1;
+	UInt16		reserved	: 1;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt16		reserved	: 1;
+	UInt16		reserved2	: 1;
+	UInt16		TARGET		: 6;
+	UInt16		BUS_NUMBER	: 3;
+	UInt16		LUN			: 5;
+#endif /* !__LITTLE_ENDIAN__ */
+} REPORT_LUNS_LOGICAL_UNIT_ADDRESSING;
+
+
+/*!
+@struct REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING
+@discussion
+This structure represents a Peripheral Device Addressing scheme.
+*/
+typedef struct REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING
+{
+#ifdef __LITTLE_ENDIAN__
+	UInt16		TARGET_LUN		: 8;
+	UInt16		BUS_IDENTIFIER	: 6;
+	UInt16		reserved2		: 1;
+	UInt16		reserved		: 1;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt16		reserved		: 1;
+	UInt16		reserved2		: 1;
+	UInt16		BUS_IDENTIFIER	: 6;
+	UInt16		TARGET_LUN		: 8;
+#endif /* !__LITTLE_ENDIAN__ */
+} REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING;
+
+
+/*!
+@struct SCSICmd_REPORT_LUNS_Header
+@discussion
+This structure defines the format of the data that is returned for
+the REPORT_LUNS command.
+*/
+typedef struct SCSICmd_REPORT_LUNS_Header
+{
+	UInt32							LUN_LIST_LENGTH;	// LUN list length in bytes.
+	UInt32							RESERVED;
+	SCSICmd_REPORT_LUNS_LUN_ENTRY	LUN[1];				// Variable length list. Must have at least LUN 0 if
+} SCSICmd_REPORT_LUNS_Header;							// Target supports REPORT_LUNS command.
+
+
+#endif	/* _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h b/i386/include/IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h
new file mode 100644
index 0000000..8cfabb0
--- /dev/null
+++ b/i386/include/IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_
+#define _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_
+
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSI Request Sense Definitions
+	@discussion
+	This file contains all definitions for the data returned from
+	the REQUEST SENSE (0x03) command and from auto sense on protocols
+	that support it.
+*/
+
+
+/*!
+@enum kSenseDefaultSize
+@discussion
+The default size for SCSI Request Sense data.
+*/
+enum
+{
+	kSenseDefaultSize	= 18
+};
+
+
+/*!
+@struct SCSI_Sense_Data
+@discussion
+The basic SCSI Request Sense data structure.
+*/
+typedef struct SCSI_Sense_Data
+{
+	UInt8		VALID_RESPONSE_CODE;				// 7 = Valid. 6-0 = Response Code.
+	UInt8		SEGMENT_NUMBER;						// Segment number
+	UInt8		SENSE_KEY;							// 7 = FILEMARK, 6 = EOM, 5 = ILI, 3-0 = SENSE KEY.
+	UInt8		INFORMATION_1;						// INFORMATION.
+	UInt8		INFORMATION_2;						// INFORMATION.
+	UInt8		INFORMATION_3;						// INFORMATION.
+	UInt8		INFORMATION_4;						// INFORMATION.
+	UInt8		ADDITIONAL_SENSE_LENGTH;			// Number of additional bytes available in sense data
+	UInt8		COMMAND_SPECIFIC_INFORMATION_1;		// Command Specific Information
+	UInt8		COMMAND_SPECIFIC_INFORMATION_2;		// Command Specific Information
+	UInt8		COMMAND_SPECIFIC_INFORMATION_3;		// Command Specific Information
+	UInt8		COMMAND_SPECIFIC_INFORMATION_4;		// Command Specific Information
+	UInt8		ADDITIONAL_SENSE_CODE;				// Additional Sense Code
+	UInt8		ADDITIONAL_SENSE_CODE_QUALIFIER;	// Additional Sense Code Qualifier
+	UInt8		FIELD_REPLACEABLE_UNIT_CODE;		// Field Replaceable Unit Code
+	UInt8		SKSV_SENSE_KEY_SPECIFIC_MSB;		// 7 = Sense Key Specific Valid bit, 6-0 Sense Key Specific MSB
+	UInt8		SENSE_KEY_SPECIFIC_MID;				// Sense Key Specific Middle
+	UInt8		SENSE_KEY_SPECIFIC_LSB;				// Sense Key Specific LSB
+} SCSI_Sense_Data;
+
+
+/*!
+@enum Sense Valid
+@discussion
+Masks to use to determine if sense data is valid or not.
+@constant kSENSE_DATA_VALID
+Sense data is valid.
+@constant kSENSE_NOT_DATA_VALID
+Sense data is not valid.
+@constant kSENSE_DATA_VALID_Mask
+Validity mask to use when checking the VALID_RESPONSE_CODE field.
+*/
+enum
+{
+	kSENSE_DATA_VALID										= 0x80,
+	kSENSE_NOT_DATA_VALID									= 0x00,
+	kSENSE_DATA_VALID_Mask									= 0x80
+};
+
+
+/*!
+@enum Sense Response Codes
+@discussion
+Masks and values to determine the Response Code.
+@constant kSENSE_RESPONSE_CODE_Current_Errors
+Response code indicating current errors are reported.
+@constant kSENSE_RESPONSE_CODE_Deferred_Errors
+Response code indicating deferred errors are reported.
+@constant kSENSE_RESPONSE_CODE_Mask
+Mask to use when checking the VALID_RESPONSE_CODE field.
+*/
+enum
+{
+	kSENSE_RESPONSE_CODE_Current_Errors						= 0x70,
+	kSENSE_RESPONSE_CODE_Deferred_Errors					= 0x71,
+	kSENSE_RESPONSE_CODE_Mask								= 0x7F
+};
+
+
+/*!
+@enum FILEMARK bit field definitions
+@discussion
+Masks and values to determine the FileMark bit field.
+@constant kSENSE_FILEMARK_Set
+Filemark bit is set.
+@constant kSENSE_FILEMARK_Not_Set
+Filemark bit is not set.
+@constant kSENSE_FILEMARK_Mask
+Mask to use when checking the SENSE_KEY field for the FILEMARK bit.
+*/
+enum
+{
+	kSENSE_FILEMARK_Set										= 0x80,
+	kSENSE_FILEMARK_Not_Set 								= 0x00,
+	kSENSE_FILEMARK_Mask 									= 0x80
+};
+
+
+/*!
+@enum EOM bit field definitions
+@discussion
+Masks and values to determine the End Of Medium bit field.
+@constant kSENSE_EOM_Set
+End Of Medium bit is set.
+@constant kSENSE_EOM_Not_Set
+End Of Medium bit is not set.
+@constant kSENSE_EOM_Mask
+Mask to use when checking the SENSE_KEY field for the EOM bit.
+*/
+enum
+{
+	kSENSE_EOM_Set											= 0x40,
+	kSENSE_EOM_Not_Set 										= 0x00,
+	kSENSE_EOM_Mask 										= 0x40
+};
+
+
+/*!
+@enum ILI bit field definitions
+@discussion
+Masks and values to determine the Incorrect Length Indicator bit field.
+@constant kSENSE_ILI_Set
+Incorrect Length Indicator bit is set.
+@constant kSENSE_ILI_Not_Set
+Incorrect Length Indicator bit is not set.
+@constant kSENSE_ILI_Mask
+Mask to use when checking the SENSE_KEY field for the ILI bit.
+*/
+enum
+{
+	kSENSE_ILI_Set											= 0x20,
+	kSENSE_ILI_Not_Set 										= 0x00,
+	kSENSE_ILI_Mask 										= 0x20
+};
+
+
+/*!
+@enum Sense Key definitions
+@discussion
+Masks and values to determine the SENSE_KEY.
+@constant kSENSE_KEY_NO_SENSE
+No sense data is present.
+@constant kSENSE_KEY_RECOVERED_ERROR
+A recovered error has occurred.
+@constant kSENSE_KEY_NOT_READY
+Device server is not ready.
+@constant kSENSE_KEY_MEDIUM_ERROR
+Device server detected a medium error.
+@constant kSENSE_KEY_HARDWARE_ERROR
+Device server detected a hardware error.
+@constant kSENSE_KEY_ILLEGAL_REQUEST
+Device server detected an illegal request.
+@constant kSENSE_KEY_UNIT_ATTENTION
+Device server indicates a unit attention condition.
+@constant kSENSE_KEY_DATA_PROTECT
+Device server indicates a data protect condition.
+@constant kSENSE_KEY_BLANK_CHECK
+Device server indicates a blank check condition.
+@constant kSENSE_KEY_VENDOR_SPECIFIC
+Device server indicates a vendor specific condition.
+@constant kSENSE_KEY_COPY_ABORTED
+Device server indicates a copy aborted condition.
+@constant kSENSE_KEY_ABORTED_COMMAND
+Device server indicates an aborted command condition.
+@constant kSENSE_KEY_VOLUME_OVERFLOW
+Device server indicates a volume overflow condition.
+@constant kSENSE_KEY_MISCOMPARE
+Device server indicates a miscompare condition.
+@constant kSENSE_KEY_Mask
+Mask to use when checking the SENSE_KEY field for the SENSE_KEY value.
+*/
+enum
+{
+	kSENSE_KEY_NO_SENSE										= 0x00,
+	kSENSE_KEY_RECOVERED_ERROR								= 0x01,
+	kSENSE_KEY_NOT_READY									= 0x02,
+	kSENSE_KEY_MEDIUM_ERROR									= 0x03,
+	kSENSE_KEY_HARDWARE_ERROR								= 0x04,
+	kSENSE_KEY_ILLEGAL_REQUEST								= 0x05,
+	kSENSE_KEY_UNIT_ATTENTION								= 0x06,
+	kSENSE_KEY_DATA_PROTECT									= 0x07,
+	kSENSE_KEY_BLANK_CHECK									= 0x08,
+	kSENSE_KEY_VENDOR_SPECIFIC								= 0x09,
+	kSENSE_KEY_COPY_ABORTED									= 0x0A,
+	kSENSE_KEY_ABORTED_COMMAND								= 0x0B,
+	/* SENSE KEY 0x0C is obsoleted */
+	kSENSE_KEY_VOLUME_OVERFLOW								= 0x0D,
+	kSENSE_KEY_MISCOMPARE									= 0x0E,
+	/* SENSE KEY 0x0F is reserved */
+	kSENSE_KEY_Mask 										= 0x0F
+};
+
+
+#endif	/* _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICommandDefinitions.h b/i386/include/IOKit/scsi/SCSICommandDefinitions.h
new file mode 100644
index 0000000..d33aed6
--- /dev/null
+++ b/i386/include/IOKit/scsi/SCSICommandDefinitions.h
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 2001-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_COMMAND_DEFINITIONS_H_
+#define _IOKIT_SCSI_COMMAND_DEFINITIONS_H_
+
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSICommandDefinitions
+	@discussion
+	This file contains all the definitions for types and constants that are
+	used by the command set classes for building CDBs. The field type
+	definitions are used for the parameters passed to a method that builds and
+	sends any SCSI defined command to clearly identify the type of value
+	expected for a parameter.
+	
+	The command methods will then use the appropriate mask to verify that the
+	value passed into a parameter is of the specified type.
+	
+	Currently only types and masks are defined for 8 bytes and smaller fields.
+	If a command is defined that uses a larger field, these should be expanded
+	to include those sizes.
+*/ 
+
+#pragma mark Field Type Definitions
+/* These are the type definitions used for the parameters of methods that
+ * build and send Command Descriptor Blocks.
+ */
+
+/* 1 Byte or smaller fields. */
+
+/*! @typedef SCSICmdField1Bit */
+typedef UInt8	SCSICmdField1Bit;
+
+/*! @typedef SCSICmdField2Bit */
+typedef UInt8	SCSICmdField2Bit;
+
+/*! @typedef SCSICmdField3Bit */
+typedef UInt8	SCSICmdField3Bit;
+
+/*! @typedef SCSICmdField4Bit */
+typedef UInt8	SCSICmdField4Bit;
+
+/*! @typedef SCSICmdField5Bit */
+typedef UInt8	SCSICmdField5Bit;
+
+/*! @typedef SCSICmdField6Bit */
+typedef UInt8	SCSICmdField6Bit;
+
+/*! @typedef SCSICmdField7Bit */
+typedef UInt8	SCSICmdField7Bit;
+
+/*! @typedef SCSICmdField1Byte */
+typedef UInt8	SCSICmdField1Byte;
+
+/* 2 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField9Bit */
+typedef UInt16	SCSICmdField9Bit;
+
+/*! @typedef SCSICmdField10Bit */
+typedef UInt16	SCSICmdField10Bit;
+
+/*! @typedef SCSICmdField11Bit */
+typedef UInt16	SCSICmdField11Bit;
+
+/*! @typedef SCSICmdField12Bit */
+typedef UInt16	SCSICmdField12Bit;
+
+/*! @typedef SCSICmdField13Bit */
+typedef UInt16	SCSICmdField13Bit;
+
+/*! @typedef SCSICmdField14Bit */
+typedef UInt16	SCSICmdField14Bit;
+
+/*! @typedef SCSICmdField15Bit */
+typedef UInt16	SCSICmdField15Bit;
+
+/*! @typedef SCSICmdField2Byte */
+typedef UInt16	SCSICmdField2Byte;
+
+/* 3 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField17Bit */
+typedef UInt32	SCSICmdField17Bit;
+
+/*! @typedef SCSICmdField18Bit */
+typedef UInt32	SCSICmdField18Bit;
+
+/*! @typedef SCSICmdField19Bit */
+typedef UInt32	SCSICmdField19Bit;
+
+/*! @typedef SCSICmdField20Bit */
+typedef UInt32	SCSICmdField20Bit;
+
+/*! @typedef SCSICmdField21Bit */
+typedef UInt32	SCSICmdField21Bit;
+
+/*! @typedef SCSICmdField22Bit */
+typedef UInt32	SCSICmdField22Bit;
+
+/*! @typedef SCSICmdField23Bit */
+typedef UInt32	SCSICmdField23Bit;
+
+/*! @typedef SCSICmdField3Byte */
+typedef UInt32	SCSICmdField3Byte;
+
+/* 4 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField25Bit */
+typedef UInt32	SCSICmdField25Bit;
+
+/*! @typedef SCSICmdField26Bit */
+typedef UInt32	SCSICmdField26Bit;
+
+/*! @typedef SCSICmdField27Bit */
+typedef UInt32	SCSICmdField27Bit;
+
+/*! @typedef SCSICmdField28Bit */
+typedef UInt32	SCSICmdField28Bit;
+
+/*! @typedef SCSICmdField29Bit */
+typedef UInt32	SCSICmdField29Bit;
+
+/*! @typedef SCSICmdField30Bit */
+typedef UInt32	SCSICmdField30Bit;
+
+/*! @typedef SCSICmdField31Bit */
+typedef UInt32	SCSICmdField31Bit;
+
+/*! @typedef SCSICmdField4Byte */
+typedef UInt32	SCSICmdField4Byte;
+
+/* 5 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField33Bit */
+typedef UInt64	SCSICmdField33Bit;
+
+/*! @typedef SCSICmdField34Bit */
+typedef UInt64	SCSICmdField34Bit;
+
+/*! @typedef SCSICmdField35Bit */
+typedef UInt64	SCSICmdField35Bit;
+
+/*! @typedef SCSICmdField36Bit */
+typedef UInt64	SCSICmdField36Bit;
+
+/*! @typedef SCSICmdField37Bit */
+typedef UInt64	SCSICmdField37Bit;
+
+/*! @typedef SCSICmdField38Bit */
+typedef UInt64	SCSICmdField38Bit;
+
+/*! @typedef SCSICmdField39Bit */
+typedef UInt64	SCSICmdField39Bit;
+
+/*! @typedef SCSICmdField5Byte */
+typedef UInt64	SCSICmdField5Byte;
+
+/* 6 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField41Bit */
+typedef UInt64	SCSICmdField41Bit;
+
+/*! @typedef SCSICmdField42Bit */
+typedef UInt64	SCSICmdField42Bit;
+
+/*! @typedef SCSICmdField43Bit */
+typedef UInt64	SCSICmdField43Bit;
+
+/*! @typedef SCSICmdField44Bit */
+typedef UInt64	SCSICmdField44Bit;
+
+/*! @typedef SCSICmdField45Bit */
+typedef UInt64	SCSICmdField45Bit;
+
+/*! @typedef SCSICmdField46Bit */
+typedef UInt64	SCSICmdField46Bit;
+
+/*! @typedef SCSICmdField47Bit */
+typedef UInt64	SCSICmdField47Bit;
+
+/*! @typedef SCSICmdField6Byte */
+typedef UInt64	SCSICmdField6Byte;
+
+/* 7 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField49Bit */
+typedef UInt64	SCSICmdField49Bit;
+
+/*! @typedef SCSICmdField50Bit */
+typedef UInt64	SCSICmdField50Bit;
+
+/*! @typedef SCSICmdField51Bit */
+typedef UInt64	SCSICmdField51Bit;
+
+/*! @typedef SCSICmdField52Bit */
+typedef UInt64	SCSICmdField52Bit;
+
+/*! @typedef SCSICmdField53Bit */
+typedef UInt64	SCSICmdField53Bit;
+
+/*! @typedef SCSICmdField54Bit */
+typedef UInt64	SCSICmdField54Bit;
+
+/*! @typedef SCSICmdField55Bit */
+typedef UInt64	SCSICmdField55Bit;
+
+/*! @typedef SCSICmdField7Byte */
+typedef UInt64	SCSICmdField7Byte;
+
+/* 8 Bytes or smaller fields. */
+
+/*! @typedef SCSICmdField57Bit */
+typedef UInt64	SCSICmdField57Bit;
+
+/*! @typedef SCSICmdField58Bit */
+typedef UInt64	SCSICmdField58Bit;
+
+/*! @typedef SCSICmdField59Bit */
+typedef UInt64	SCSICmdField59Bit;
+
+/*! @typedef SCSICmdField60Bit */
+typedef UInt64	SCSICmdField60Bit;
+
+/*! @typedef SCSICmdField61Bit */
+typedef UInt64	SCSICmdField61Bit;
+
+/*! @typedef SCSICmdField62Bit */
+typedef UInt64	SCSICmdField62Bit;
+
+/*! @typedef SCSICmdField63Bit */
+typedef UInt64	SCSICmdField63Bit;
+
+/*! @typedef SCSICmdField8Byte */
+typedef UInt64	SCSICmdField8Byte;
+
+
+#pragma mark Field Mask Definitions
+/* These are masks that are used to verify that the values passed into the
+ * parameters for the fields are not larger than the field size.
+ *
+ * NB: These have changed from enums to #define since enums greater than
+ * 32 bits in size are not well-defined in C99.
+ */
+
+/* 1 Byte or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask1Bit */
+#define 	kSCSICmdFieldMask1Bit		0x01
+
+/*! @constant kSCSICmdFieldMask2Bit */
+#define 	kSCSICmdFieldMask2Bit		0x03
+
+/*! @constant kSCSICmdFieldMask3Bit */
+#define 	kSCSICmdFieldMask3Bit		0x07
+
+/*! @constant kSCSICmdFieldMask4Bit */
+#define 	kSCSICmdFieldMask4Bit		0x0F
+
+/*! @constant kSCSICmdFieldMask5Bit */
+#define 	kSCSICmdFieldMask5Bit		0x1F
+
+/*! @constant kSCSICmdFieldMask6Bit */
+#define 	kSCSICmdFieldMask6Bit		0x3F
+
+/*! @constant kSCSICmdFieldMask7Bit */
+#define 	kSCSICmdFieldMask7Bit		0x7F
+
+#define 	kSCSICmdFieldMask1Byte		0xFF
+
+/* 2 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask9Bit */
+#define 	kSCSICmdFieldMask9Bit		0x01FF
+
+/*! @constant kSCSICmdFieldMask10Bit */
+#define 	kSCSICmdFieldMask10Bit		0x03FF
+
+/*! @constant kSCSICmdFieldMask11Bit */
+#define 	kSCSICmdFieldMask11Bit		0x07FF
+
+/*! @constant kSCSICmdFieldMask12Bit */
+#define 	kSCSICmdFieldMask12Bit		0x0FFF
+
+/*! @constant kSCSICmdFieldMask13Bit */
+#define 	kSCSICmdFieldMask13Bit		0x1FFF
+
+/*! @constant kSCSICmdFieldMask14Bit */
+#define 	kSCSICmdFieldMask14Bit		0x3FFF
+
+/*! @constant kSCSICmdFieldMask15Bit */
+#define 	kSCSICmdFieldMask15Bit		0x7FFF
+
+/*! @constant kSCSICmdFieldMask2Byte */
+#define 	kSCSICmdFieldMask2Byte		0xFFFF
+
+/* 3 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask17Bit */
+#define 	kSCSICmdFieldMask17Bit		0x01FFFF
+
+/*! @constant kSCSICmdFieldMask18Bit */
+#define 	kSCSICmdFieldMask18Bit		0x03FFFF
+
+/*! @constant kSCSICmdFieldMask19Bit */
+#define 	kSCSICmdFieldMask19Bit		0x07FFFF
+
+/*! @constant kSCSICmdFieldMask20Bit */
+#define 	kSCSICmdFieldMask20Bit		0x0FFFFF
+
+/*! @constant kSCSICmdFieldMask21Bit */
+#define 	kSCSICmdFieldMask21Bit		0x1FFFFF
+
+/*! @constant kSCSICmdFieldMask22Bit */
+#define 	kSCSICmdFieldMask22Bit		0x3FFFFF
+
+/*! @constant kSCSICmdFieldMask23Bit */
+#define 	kSCSICmdFieldMask23Bit		0x7FFFFF
+
+/*! @constant kSCSICmdFieldMask3Byte */
+#define 	kSCSICmdFieldMask3Byte		0xFFFFFF
+
+/* 4 Bytes or smaller fields. */
+/*! @constant kSCSICmdFieldMask25Bit */
+#define 	kSCSICmdFieldMask25Bit		0x01FFFFFFUL
+
+/*! @constant kSCSICmdFieldMask26Bit */
+#define 	kSCSICmdFieldMask26Bit		0x03FFFFFFUL
+
+/*! @constant kSCSICmdFieldMask27Bit */
+#define 	kSCSICmdFieldMask27Bit		0x07FFFFFFUL
+
+/*! @constant kSCSICmdFieldMask28Bit */
+#define 	kSCSICmdFieldMask28Bit		0x0FFFFFFFUL
+
+/*! @constant kSCSICmdFieldMask29Bit */
+#define 	kSCSICmdFieldMask29Bit		0x1FFFFFFFUL
+
+/*! @constant kSCSICmdFieldMask30Bit */
+#define 	kSCSICmdFieldMask30Bit		0x3FFFFFFFUL
+
+/*! @constant kSCSICmdFieldMask31Bit */
+#define 	kSCSICmdFieldMask31Bit		0x7FFFFFFFUL
+
+/*! @constant kSCSICmdFieldMask4Byte */
+#define 	kSCSICmdFieldMask4Byte		0xFFFFFFFFUL
+
+/* 5 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask33Bit */
+#define 	kSCSICmdFieldMask33Bit		0x01FFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask34Bit */
+#define 	kSCSICmdFieldMask34Bit		0x03FFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask35Bit */
+#define 	kSCSICmdFieldMask35Bit		0x07FFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask36Bit */
+#define 	kSCSICmdFieldMask36Bit		0x0FFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask37Bit */
+#define 	kSCSICmdFieldMask37Bit		0x1FFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask38Bit */
+#define 	kSCSICmdFieldMask38Bit		0x3FFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask39Bit */
+#define 	kSCSICmdFieldMask39Bit		0x7FFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask5Byte */
+#define 	kSCSICmdFieldMask5Byte		0xFFFFFFFFFFULL
+
+/* 6 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask41Bit */
+#define 	kSCSICmdFieldMask41Bit		0x01FFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask42Bit */
+#define 	kSCSICmdFieldMask42Bit		0x03FFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask43Bit */
+#define 	kSCSICmdFieldMask43Bit		0x07FFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask44Bit */
+#define 	kSCSICmdFieldMask44Bit		0x0FFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask45Bit */
+#define 	kSCSICmdFieldMask45Bit		0x1FFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask46Bit */
+#define 	kSCSICmdFieldMask46Bit		0x3FFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask47Bit */
+#define 	kSCSICmdFieldMask47Bit		0x7FFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask6Byte */
+#define 	kSCSICmdFieldMask6Byte		0xFFFFFFFFFFFFULL
+
+/* 7 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask49Bit */
+#define 	kSCSICmdFieldMask49Bit		0x01FFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask50Bit */
+#define 	kSCSICmdFieldMask50Bit		0x03FFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask51Bit */
+#define 	kSCSICmdFieldMask51Bit		0x07FFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask52Bit */
+#define 	kSCSICmdFieldMask52Bit		0x0FFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask53Bit */
+#define 	kSCSICmdFieldMask53Bit		0x1FFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask54Bit */
+#define 	kSCSICmdFieldMask54Bit		0x3FFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask55Bit */
+#define 	kSCSICmdFieldMask55Bit		0x7FFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask7Byte */
+#define 	kSCSICmdFieldMask7Byte		0xFFFFFFFFFFFFFFULL
+
+/* 8 Bytes or smaller fields. */
+
+/*! @constant kSCSICmdFieldMask57Bit */
+#define 	kSCSICmdFieldMask57Bit		0x01FFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask58Bit */
+#define 	kSCSICmdFieldMask58Bit		0x03FFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask59Bit */
+#define 	kSCSICmdFieldMask59Bit		0x07FFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask60Bit */
+#define 	kSCSICmdFieldMask60Bit		0x0FFFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask61Bit */
+#define 	kSCSICmdFieldMask61Bit		0x1FFFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask62Bit */
+#define 	kSCSICmdFieldMask62Bit		0x3FFFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask63Bit */
+#define 	kSCSICmdFieldMask63Bit		0x7FFFFFFFFFFFFFFFULL
+
+/*! @constant kSCSICmdFieldMask8Byte */
+#define 	kSCSICmdFieldMask8Byte		0xFFFFFFFFFFFFFFFFULL
+
+#endif	/* _IOKIT_SCSI_COMMAND_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICommandOperationCodes.h b/i386/include/IOKit/scsi/SCSICommandOperationCodes.h
new file mode 100644
index 0000000..21d9d1e
--- /dev/null
+++ b/i386/include/IOKit/scsi/SCSICommandOperationCodes.h
@@ -0,0 +1,941 @@
+/*
+ * Copyright (c) 2001-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _SCSI_COMMAND_OPERATION_CODES_H_
+#define _SCSI_COMMAND_OPERATION_CODES_H_
+
+#pragma mark About this file
+/* This file contains the operation code definitions for all commands defined
+ * by the SCSI specifications.  The commands are listed in three formats:
+ * 1) All commands are listed in alphabetical order.  This list is the live
+ * enumeration for all of the command constants.
+ * 2) The commands are listed in ascending numerical order.
+ * 3) The commands are grouped by Peripheral Device Type.
+ * 
+ * In the command listings by Peripheral Device Type, there will be a comment
+ * following each command.  This comment indentifies the section of the related
+ * specification where the commands is defined and the requirement type of the
+ * command, Mandatory or Optional.
+ * If a specification redefines an optional command from SPC as mandatory,
+ * the command will be relisted in the Peripheral Device Type command list with
+ * the mandatory tag next to it.
+ * All commands that are listed in SPC as Device Type Specifc will be relisted
+ * as a comment in all specifications lists that support that command with the
+ * appropriate Mandatory or Optional tag for that specification.
+ *
+ * The section number and the requirement type of the command are based on the 
+ * version of the specification listed in the header comment for the Peripheral
+ * Device Type.  This data is provided for informational purposes only.  The 
+ * specification document and version that the device adheres to as indicated 
+ * by the data returned in response to the INQUIRY command should be used as
+ * the authorative source for supported and required behavior of the device.
+ * 
+ * The SPC set is listed before all other Peripheral Device Type commands as
+ * this is the base document from which all of the other documents are derived.  
+ *
+ * The Peripheral Device Types and associated command sets as defined by SPC-2,
+ * section 7.4.1 are as follows:
+ *  Peripheral Device Type                  Associated Command Specification
+ *  ------------------------------------    -----------------------------------
+ *  0x00 Direct Access Device               SBC - SCSI-3 Block Commands
+ *  0x01 Sequential Access Device           SSC - SCSI-3 Stream Commands
+ *  0x02 Printer Device                     SSC - SCSI-3 Stream Commands
+ *  0x03 Processor Device                   SPC - SCSI Primary Commands-2
+ *  0x04 Write Once Device                  SBC - SCSI-3 Block Commands
+ *  0x05 CD-ROM Device                      MMC - SCSI Multimedia Commands-2
+ *  0x06 Scanner Device                     SGC - SCSI-3 Graphics Commands
+ *  0x07 Optical Memory Device              SBC - SCSI-3 Block Commands
+ *  0x08 Medium Changer Device              SMC - SCSI-3 Medium Changer Cmds
+ *  0x09 Communications Device              SSC - SCSI-3 Stream Commands
+ *  0x0A - 0x0B Graphic Arts Prepress Dev   ASC IT8
+ *  0x0C Storage Array Controller Device    SCC-2 - SCSI Controller Commands-2
+ *  0x0D Enclosure Services                 SES - SCSI-3 Enclosure Services
+ *  0x0E Simplified Direct Access Device    RBC - SCSI Reduced Block Commands
+ *  0x0F Optical Card Reader/Writer Device  OCRW - SCSI Specification for 
+ *                                              Optical Card Reader/Writer
+ *  0x10 Reserved                    		No command specification
+ *	0x11 Object-Based Storage Device		OSD - SCSI Object Based Storage 
+ *												Device Commands
+ *  0x12 - 0x14 Reserved                    No command specification
+ *  0x15 Multimedia Media Access Engine     RMC - Reduced Multimedia Commands
+ *  0x16 - 0x1E Reserved                    No command specification
+ *  0x1F Unknown or No Device               No command specification
+ */ 
+
+#pragma mark -
+#pragma mark Command Definitions by Name
+/* All SCSI Commands listed in alphabetical order.  These are the live
+ * definitions of the commands.  All other command lists are informative.
+ */
+enum 
+{
+    kSCSICmd_ACCESS_CONTROL_IN              = 0x86,
+    kSCSICmd_ACCESS_CONTROL_OUT             = 0x87,
+    kSCSICmd_BLANK                          = 0xA1,
+    kSCSICmd_CHANGE_DEFINITION              = 0x40,
+    kSCSICmd_CLOSE_TRACK_SESSION            = 0x5B,
+    kSCSICmd_COMPARE                        = 0x39,
+    kSCSICmd_COPY                           = 0x18,
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A,
+    kSCSICmd_ERASE_10						= 0x2C,
+    kSCSICmd_ERASE_12						= 0xAC,
+    kSCSICmd_EXTENDED_COPY                  = 0x83,
+    kSCSICmd_FORMAT_UNIT                    = 0x04,
+    kSCSICmd_GET_CONFIGURATION              = 0x46,
+    kSCSICmd_GET_EVENT_STATUS_NOTIFICATION  = 0x4A,
+    kSCSICmd_GET_PERFORMANCE                = 0xAC,
+    kSCSICmd_INQUIRY                        = 0x12,
+    kSCSICmd_LOAD_UNLOAD_MEDIUM             = 0xA6,
+    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36,
+    kSCSICmd_LOCK_UNLOCK_CACHE_16           = 0x92,
+    kSCSICmd_LOG_SELECT                     = 0x4C,
+    kSCSICmd_LOG_SENSE                      = 0x4D,
+    kSCSICmd_MAINTENANCE_IN               	= 0xA3,
+    kSCSICmd_MAINTENANCE_OUT                = 0xA4,
+    kSCSICmd_MECHANISM_STATUS               = 0xBD,
+    kSCSICmd_MEDIUM_SCAN                    = 0x38,
+    kSCSICmd_MODE_SELECT_6                  = 0x15,
+    kSCSICmd_MODE_SELECT_10                 = 0x55,
+    kSCSICmd_MODE_SENSE_6                   = 0x1A,
+    kSCSICmd_MODE_SENSE_10                  = 0x5A,
+    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7,
+    kSCSICmd_PAUSE_RESUME                   = 0x4B,
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E,
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F,
+    kSCSICmd_PLAY_AUDIO_10                  = 0x45,
+    kSCSICmd_PLAY_AUDIO_12                  = 0xA5,
+    kSCSICmd_PLAY_AUDIO_MSF                 = 0x47,
+    kSCSICmd_PLAY_AUDIO_TRACK_INDEX         = 0x48,
+    kSCSICmd_PLAY_CD                        = 0xBC,
+    kSCSICmd_PLAY_RELATIVE_10               = 0x49,
+    kSCSICmd_PLAY_RELATIVE_12               = 0xA9,
+    kSCSICmd_PREFETCH                       = 0x34,
+    kSCSICmd_PREFETCH_16                    = 0x90,
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E,
+    kSCSICmd_READ_6                         = 0x08,
+    kSCSICmd_READ_10                        = 0x28,
+    kSCSICmd_READ_12                        = 0xA8,
+    kSCSICmd_READ_16                        = 0x88,
+    kSCSICmd_READ_ATTRIBUTE                 = 0x8C,
+    kSCSICmd_READ_BUFFER                    = 0x3C,
+    kSCSICmd_READ_BUFFER_CAPACITY           = 0x5C,
+    kSCSICmd_READ_CAPACITY                  = 0x25,
+    kSCSICmd_READ_CD                        = 0xBE,
+    kSCSICmd_READ_CD_MSF                    = 0xB9,
+    kSCSICmd_READ_DEFECT_DATA_10            = 0x37,
+    kSCSICmd_READ_DEFECT_DATA_12            = 0xB7,
+    kSCSICmd_READ_DISC_INFORMATION          = 0x51,
+    kSCSICmd_READ_DVD_STRUCTURE             = 0xAD,
+    kSCSICmd_READ_DISC_STRUCTURE            = 0xAD,
+    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4,
+    kSCSICmd_READ_FORMAT_CAPACITIES         = 0x23,
+    kSCSICmd_READ_GENERATION				= 0x29,
+    kSCSICmd_READ_HEADER                    = 0x44,
+    kSCSICmd_READ_LONG                      = 0x3E,
+    kSCSICmd_READ_MASTER_CUE                = 0x59,
+    kSCSICmd_READ_SUB_CHANNEL               = 0x42,
+    kSCSICmd_READ_TOC_PMA_ATIP              = 0x43,
+    kSCSICmd_READ_TRACK_INFORMATION         = 0x52,
+    kSCSICmd_READ_UPDATED_BLOCK_10			= 0x2D,
+    kSCSICmd_REASSIGN_BLOCKS                = 0x07,
+    kSCSICmd_REBUILD                        = 0x81,
+    kSCSICmd_RECEIVE                        = 0x08,
+    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84,
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C,
+    kSCSICmd_REDUNDANCY_GROUP_IN			= 0xBA,
+    kSCSICmd_REDUNDANCY_GROUP_OUT			= 0xBB,
+    kSCSICmd_REGENERATE                     = 0x82,
+    kSCSICmd_RELEASE_6                      = 0x17,
+    kSCSICmd_RELEASE_10                     = 0x57,
+    kSCSICmd_REPAIR_TRACK                   = 0x58,
+    kSCSICmd_REPORT_DEVICE_IDENTIFIER    	= 0xA3,
+    kSCSICmd_REPORT_KEY                     = 0xA4,
+    kSCSICmd_REPORT_LUNS                    = 0xA0, 
+    kSCSICmd_REQUEST_SENSE                  = 0x03,
+    kSCSICmd_RESERVE_6                      = 0x16,
+    kSCSICmd_RESERVE_10                     = 0x56,
+    kSCSICmd_RESERVE_TRACK                  = 0x53,
+    kSCSICmd_REZERO_UNIT                    = 0x01,
+    kSCSICmd_SCAN_MMC                       = 0xBA,
+    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31,
+    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1,
+    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30,
+    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0,
+    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32,
+    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2,
+    kSCSICmd_SEEK_6                         = 0x0B,
+    kSCSICmd_SEEK_10                        = 0x2B,
+    kSCSICmd_SEND                           = 0x0A,
+    kSCSICmd_SEND_CUE_SHEET                 = 0x5D,
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D,
+    kSCSICmd_SEND_DVD_STRUCTURE             = 0xBF,
+    kSCSICmd_SEND_EVENT                     = 0xA2,
+    kSCSICmd_SEND_KEY                       = 0xA3,
+    kSCSICmd_SEND_OPC_INFORMATION           = 0x54,
+    kSCSICmd_SERVICE_ACTION_IN		        = 0x9E,
+    kSCSICmd_SERVICE_ACTION_OUT		        = 0x9F,
+    kSCSICmd_SET_CD_SPEED                   = 0xBB,
+    kSCSICmd_SET_DEVICE_IDENTIFIER      	= 0xA4,
+    kSCSICmd_SET_LIMITS_10                  = 0x33,
+    kSCSICmd_SET_LIMITS_12                  = 0xB3,
+    kSCSICmd_SET_READ_AHEAD                 = 0xA7,
+    kSCSICmd_SET_STREAMING                  = 0xB6,
+    kSCSICmd_SPARE_IN		                = 0xBC,
+    kSCSICmd_SPARE_OUT		                = 0xBD,
+    kSCSICmd_START_STOP_UNIT                = 0x1B,
+    kSCSICmd_STOP_PLAY_SCAN                 = 0x4E,
+    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35,
+    kSCSICmd_SYNCHRONIZE_CACHE_16           = 0x91,
+    kSCSICmd_TEST_UNIT_READY                = 0x00,
+	kSCSICmd_UPDATE_BLOCK					= 0x3D,
+    kSCSICmd_VERIFY_10                      = 0x2F,
+    kSCSICmd_VERIFY_12                      = 0xAF,
+    kSCSICmd_VERIFY_16                      = 0x8F,
+    kSCSICmd_VOLUME_SET_IN                  = 0xBE,
+    kSCSICmd_VOLUME_SET_OUT                 = 0xBF,
+    kSCSICmd_WRITE_6                        = 0x0A,
+    kSCSICmd_WRITE_10                       = 0x2A,
+    kSCSICmd_WRITE_12                       = 0xAA,
+    kSCSICmd_WRITE_16                       = 0x8A,
+    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E,
+	kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE,
+	kSCSICmd_WRITE_AND_VERIFY_16            = 0x8E,
+	kSCSICmd_WRITE_ATTRIBUTE	            = 0x8D,
+    kSCSICmd_WRITE_BUFFER                   = 0x3B,
+    kSCSICmd_WRITE_LONG                     = 0x3F,
+    kSCSICmd_WRITE_SAME                     = 0x41,
+    kSCSICmd_WRITE_SAME_16                  = 0x93,
+    kSCSICmd_XDREAD                         = 0x52,
+    kSCSICmd_XDWRITE                        = 0x50,
+    kSCSICmd_XDWRITE_EXTENDED               = 0x80,
+    kSCSICmd_XDWRITEREAD_10           		= 0x53,
+    kSCSICmd_XPWRITE                        = 0x51,
+    
+    kSCSICmdVariableLengthCDB				= 0x7F
+};
+
+/* Service Action Definitions for the Variable Length CDB (7Fh) command */
+enum
+{
+	kSCSIServiceAction_READ_32				= 0x0009,
+	kSCSIServiceAction_VERIFY_32			= 0x000A,
+	kSCSIServiceAction_WRITE_32				= 0x000B,
+	kSCSIServiceAction_WRITE_AND_VERIFY_32	= 0x000C,
+	kSCSIServiceAction_WRITE_SAME_32		= 0x000D,
+	kSCSIServiceAction_XDREAD_32			= 0x0003,
+	kSCSIServiceAction_XDWRITE_32			= 0x0004,
+	kSCSIServiceAction_XDWRITEREAD_32		= 0x0007,
+	kSCSIServiceAction_XPWRITE_32			= 0x0006
+};
+
+/* Service Action Definitions for the MAINTENANCE IN (A3h) command */
+enum
+{
+	kSCSIServiceAction_REPORT_ALIASES								= 0x0B,
+	kSCSIServiceAction_REPORT_DEVICE_IDENTIFIER						= 0x05,
+	kSCSIServiceAction_REPORT_PRIORITY								= 0x0E,
+	kSCSIServiceAction_REPORT_SUPPORTED_OPERATION_CODES				= 0x0C,
+	kSCSIServiceAction_REPORT_SUPPORTED_TASK_MANAGEMENT_FUNCTIONS	= 0x0D,
+	kSCSIServiceAction_REPORT_TARGET_PORT_GROUPS					= 0x0A
+};
+
+/* Service Action Definitions for the MAINTENANCE OUT (A4h) command */
+enum
+{
+	kSCSIServiceAction_CHANGE_ALIASES			= 0x0B,
+	kSCSIServiceAction_SET_DEVICE_IDENTIFIER	= 0x06,
+	kSCSIServiceAction_SET_PRIORITY				= 0x0E,
+	kSCSIServiceAction_SET_TARGET_PORT_GROUPS	= 0x0A	
+};
+
+/* Service Action Definitions for the SERVICE ACTION IN (9Eh) command */
+enum
+{
+	kSCSIServiceAction_READ_CAPACITY_16		= 0x10,
+	kSCSIServiceAction_READ_LONG_16			= 0x11	
+};
+
+/* Service Action Definitions for the SERVICE ACTION OUT (9Fh) command */
+enum
+{
+	kSCSIServiceAction_WRITE_LONG_16		= 0x11	
+};
+
+#pragma mark -
+#pragma mark Command Definitions by Number
+#if 0
+enum 
+{
+};
+#endif
+
+
+#pragma mark -
+#pragma mark All Types SPC Commands
+/* Commands defined by the T10:1236-D SCSI Primary Commands-2 (SPC-2) 
+ * command specification.  The definitions and section numbers are based on
+ * section 7 of the revision 18, 21 May 2000 version of the specification.
+ *
+ * These commands are defined for all devices.
+ */
+#if 0
+enum 
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_COMPARE                        = 0x39, /* Sec. 7.2: Optional */
+    kSCSICmd_COPY                           = 0x18, /* Sec. 7.3: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* Sec. 7.4: Optional */
+    kSCSICmd_EXTENDED_COPY                  = 0x83, /* Sec. 7.5: Optional */
+    kSCSICmd_INQUIRY                        = 0x12, /* Sec. 7.6: Mandatory */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* Sec. 7.7: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* Sec. 7.8: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Sec. 7.9: Device Type
+                                                     * Specific */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Sec. 7.10: Device Type
+                                                     * Specific */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Sec. 7.11: Device Type
+                                                     * Specific */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Sec. 7.12: Device Type
+                                                     * Specific */
+    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* Defined in SMC */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Sec. 7.13: Device Type
+                                                     * Specific */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Sec. 7.14: Device Type
+                                                     * Specific */
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* Sec. 7.15: Device Type
+                                                     * Specific */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* Sec. 7.16: Optional */
+    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* Defined in SMC */
+    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84, /* Sec. 7.17: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Sec. 7.18: Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* Sec. 7.19: Device Type
+                                                     * Specific */
+    kSCSICmd_RELEASE_6                      = 0x17, /* Sec. 7.20: Device Type
+                                                     * Specific */
+    kSCSICmd_REPORT_DEVICE_IDENTIFIER    	= 0xA3, /* Sec. 7.21: Optional */
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Sec. 7.22: Mandatory for
+                                                     * LUN Supporting devices*/
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Sec. 7.23: Device Type
+                                                     * Specific */
+    kSCSICmd_RESERVE_10                     = 0x56, /* Sec. 7.24: Device Type
+                                                     * Specific */
+    kSCSICmd_RESERVE_6                      = 0x16, /* Sec. 7.25: Device Type
+                                                     * Specific */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Sec. 7.26: Optional */
+    kSCSICmd_SET_DEVICE_IDENTIFIER       	= 0xA4, /* Sec. 7.27: Optional */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Sec. 7.28: Mandatory */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Sec. 7.29: Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x00 SBC Direct Access Commands
+/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) command
+ * specification.  The definitions and section numbers are based on section 6.1
+ * of the revision 8c, 13 November 1997 version of the specification. 
+ */
+#if 0
+enum
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional*/
+    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Sec. 6.1.1: Mandatory */
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36, /* Sec. 6.1.2: Optional */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
+    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* SMC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
+    kSCSICmd_PREFETCH                       = 0x34, /* Sec. 6.1.3: Optional */
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
+    kSCSICmd_READ_6                         = 0x08, /* Sec. 6.1.4: Mandatory */
+    kSCSICmd_READ_10                        = 0x28, /* Sec. 6.1.5: Mandatory */
+    kSCSICmd_READ_12                        = 0xA8, /* Sec. 6.2.4: Optional */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
+    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.6: Mandatory */
+    kSCSICmd_READ_DEFECT_DATA_10            = 0x37, /* Sec. 6.1.7: Optional */
+    kSCSICmd_READ_DEFECT_DATA_12            = 0xB7, /* Sec. 6.2.5: Optional */
+    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* SMC: Optional */
+    kSCSICmd_READ_GENERATION				= 0x29,	/* Sec. 6.2.6: Optional */
+    kSCSICmd_READ_LONG                      = 0x3E, /* Sec. 6.1.8: Optional */
+    kSCSICmd_READ_UPDATED_BLOCK_10			= 0x2D, /* Sec. 6.2.7: Optional */
+    kSCSICmd_REASSIGN_BLOCKS                = 0x07, /* Sec. 6.1.9: Optional */
+    kSCSICmd_REBUILD                        = 0x81, /* Sec. 6.1.10: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
+    kSCSICmd_REGENERATE                     = 0x82, /* Sec. 6.1.11: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Optional */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Optional */
+    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
+    kSCSICmd_REZERO_UNIT                    = 0x01, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
+    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
+    kSCSICmd_SEEK_10                        = 0x2B, /* Sec. 6.1.12: Optional */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
+    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Sec. 6.1.13: Optional */
+    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Sec. 6.2.8: Optional */
+    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Sec. 6.1.14: Optional */
+    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.15: Optional */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
+	kSCSICmd_UPDATE_BLOCK					= 0x3D,	/* Sec. 6.2.9: Optional */
+    kSCSICmd_VERIFY_10                      = 0x2F, /* Sec. 6.1.16: Optional */
+    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 6.1.17: Optional */
+    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.1.18: Optional */
+    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.2.13: Optional */
+    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.1.19: Optional */
+    kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE, /* Sec. 6.2.15: Optional */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
+    kSCSICmd_WRITE_LONG                     = 0x3F, /* Sec. 6.1.20: Optional */
+    kSCSICmd_WRITE_SAME                     = 0x41, /* Sec. 6.1.21: Optional */
+    kSCSICmd_XDREAD                         = 0x52, /* Sec. 6.1.22: Optional */
+    kSCSICmd_XDWRITE                        = 0x50, /* Sec. 6.1.23: Optional */
+    kSCSICmd_XDWRITE_EXTENDED               = 0x80, /* Sec. 6.1.24: Optional */
+    kSCSICmd_XPWRITE                        = 0x51  /* Sec. 6.1.25: Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x01 SSC Sequential Access Commands
+/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) command
+ * specification.  The definitions and section numbers are based on section 5
+ * of the revision 22, January 1, 2000 version of the specification. 
+ */
+#if 0
+enum
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
+    kSCSICmd_ERASE                          = 0x19, /* Sec. 5.3.1: Mandatory */
+    kSCSICmd_FORMAT_MEDIUM                  = 0x04, /* Sec. 5.3.2: Optional */
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOAD_UNLOAD                    = 0x1B, /* Sec. 5.3.3: Optional */
+    kSCSICmd_LOCATE                         = 0x2B, /* Sec. 5.3.4: Optional */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
+    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* SMC: Optional */
+    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* SMC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
+    kSCSICmd_READ_6                         = 0x08, /* Sec. 5.3.5: Mandatory */
+    kSCSICmd_READ_BLOCK_LIMITS              = 0x05, /* Sec. 5.3.6: Mandatory */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
+    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* SMC: Optional */
+    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* SMC: Optional */
+    kSCSICmd_READ_POSITION                  = 0x34, /* Sec. 5.3.7: Mandatory */
+    kSCSICmd_READ_REVERSE                   = 0x0F, /* Sec. 5.3.8: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
+    kSCSICmd_RECOVER_BUFFERED_DATA          = 0x14, /* Sec. 5.3.9: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
+    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
+    kSCSICmd_REPORT_DENSITY_SUPPORT         = 0x44, /* Sec. 5.3.10: Mandatory*/
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Mandatory */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
+    kSCSICmd_REWIND                         = 0x01, /* Sec. 5.3.11: Mandatory*/
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
+    kSCSICmd_SPACE                          = 0x11, /* Sec. 5.3.12: Mandatory*/
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
+    kSCSICmd_VERIFY_6                       = 0x13, /* Sec. 5.3.13: Optional */
+    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 5.3.14: Mandatory*/
+    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
+    kSCSICmd_WRITE_FILEMARKS                = 0x10  /* Sec. 5.3.15: Mandatory*/
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x02 SSC Printer Commands
+/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) command
+ * specification.  The definitions and section numbers are based on section 6
+ * of the revision 22, January 1, 2000 version of the specification. 
+ */
+#if 0
+enum 
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
+    kSCSICmd_FORMAT                         = 0x04, /* Sec. 6.2.1: Optional */
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
+    kSCSICmd_PRINT                          = 0x0A, /* Sec. 6.2.2: Mandatory */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
+    kSCSICmd_RECOVER_BUFFERED_DATA          = 0x14, /* Sec. 6.2.3: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
+    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Mandatory */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
+    kSCSICmd_SLEW_AND_PRINT                 = 0x0B, /* Sec. 6.2.4: Optional */
+    kSCSICmd_STOP_PRINT                     = 0x1B, /* Sec. 6.2.5: Optional */
+    kSCSICmd_SYNCHRONIZE_BUFFER             = 0x10, /* Sec. 6.2.6: Optional */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* SPC: Optional */
+};
+#endif
+  
+#pragma mark -
+#pragma mark 0x03 SPC Processor Commands
+/* Commands defined by the T10:1236-D SCSI Primary Commands-2 (SPC-2) 
+ * command specification.  The definitions and section numbers are based on
+ * section 9 of the revision 18, 21 May 2000 version of the specification.
+ */
+#if 0
+enum 
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_COMPARE                        = 0x39, /* Sec. 7.2: Optional */
+    kSCSICmd_COPY                           = 0x18, /* Sec. 7.3: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* Sec. 7.4: Optional */
+    kSCSICmd_EXTENDED_COPY                  = 0x83, /* Sec. 7.5: Optional */
+    kSCSICmd_INQUIRY                        = 0x12, /* Sec. 7.6: Mandatory */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* Sec. 7.7: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* Sec. 7.8: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Sec. 7.13: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Sec. 7.14: Optional */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* Sec. 7.16: Optional */
+    kSCSICmd_RECEIVE                        = 0x08, /* Sec. 9.2: Optional */
+    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84, /* Sec. 7.17: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Sec. 7.18: Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* Sec. 7.19: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* Sec. 7.20: Optional */
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Sec. 7.22: Optional */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Sec. 7.23: Mandatory */
+    kSCSICmd_RESERVE_10                     = 0x56, /* Sec. 7.24: Optional */
+    kSCSICmd_RESERVE_6                      = 0x16, /* Sec. 7.25: Optional */
+    kSCSICmd_SEND                           = 0x0A, /* Sec. 9.3: Optional */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Sec. 7.26: Mandatory */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Sec. 7.27: Mandatory */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Sec. 7.29: Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x04 SBC Write Once Commands
+/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) command
+ * specification.  The definitions and section numbers are based on section 6.3
+ * of the revision 8c, 13 November 1997 version of the specification. 
+ */
+#if 0
+enum
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* SPC: Optional */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional*/
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36, /* Sec. 6.1.2: Optional */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MEDIUM_SCAN                    = 0x38, /* Sec. 6.2.3: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
+    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* SMC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
+    kSCSICmd_PREFETCH                       = 0x34, /* Sec. 6.1.3: Optional */
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
+    kSCSICmd_READ_6                         = 0x08, /* Sec. 6.1.4: Optional */
+    kSCSICmd_READ_10                        = 0x28, /* Sec. 6.1.5: Mandatory */
+    kSCSICmd_READ_12                        = 0xA8, /* Sec. 6.2.4: Optional */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
+    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.6: Mandatory */
+    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* SMC: Optional */
+    kSCSICmd_READ_LONG                      = 0x3E, /* Sec. 6.1.8: Optional */
+    kSCSICmd_REASSIGN_BLOCKS                = 0x07, /* Sec. 6.1.9: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Optional */
+    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
+    kSCSICmd_REZERO_UNIT                    = 0x01, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2, /* Obsolete */
+    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
+    kSCSICmd_SEEK_10                        = 0x2B, /* Sec. 6.1.12: Optional */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
+    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Sec. 6.1.13: Optional */
+    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Sec. 6.2.8: Optional */
+    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Sec. 6.1.14: Optional */
+    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.15: Optional */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
+    kSCSICmd_VERIFY_10                      = 0x2F, /* Sec. 6.2.10: Optional */
+    kSCSICmd_VERIFY_12                      = 0xAF, /* Sec. 6.2.11: Optional */
+    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 6.1.17: Optional */
+    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.2.10: Mandatory*/
+    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.2.13: Optional */
+    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.2.14: Optional */
+    kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE, /* Sec. 6.2.15: Optional */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
+    kSCSICmd_WRITE_LONG                     = 0x3F  /* Sec. 6.1.20: Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x05 MMC CD-ROM Commands
+/* Commands defined by the T10:1363-D SCSI Multimedia Commands-3 (MMC-3) 
+ * specification.  The definitions and section numbers are based on section 6.1
+ * of the revision 01, March 03, 2000 version of the specification. 
+ *
+ * NOTE: The comments following each command may not be accurate.  These are
+ * not from the MMC-3 specification, but have been derived from the SCSI-2 and
+ * original MMC specifications.  Unlike the other SCSI command specifications,
+ * MMC-2 and MMC-3 do not provide a command requirement type and therefore does
+ * not relist the SPC commands with these requirements as they apply to MMC
+ * devices.  The MMC-2 and MMC-3 specifications also refer back to the SBC
+ * specification which seems invalid since MMC devices do not represent a
+ * Peripheral Device Type defined by SBC.  It is assumed that the SBC
+ * references refer to the Peripheral Device Type 0x00 - Direct Access Commands
+ * definitions from that specification.
+ */
+#if 0
+enum 
+{
+    kSCSICmd_BLANK                          = 0xA1, /* Sec. 6.1.1: */
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
+    kSCSICmd_CLOSE_TRACK_SESSION            = 0x5B, /* Sec. 6.1.2: */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
+    kSCSICmd_ERASE                          = 0x2C, /* SBC: */
+    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Sec. 6.1.3: */
+    kSCSICmd_GET_CONFIGURATION              = 0x46, /* Sec. 6.1.4: */
+    kSCSICmd_GET_EVENT_STATUS_NOTIFICATION  = 0x4A, /* Sec. 6.1.5: */
+    kSCSICmd_GET_PERFORMANCE                = 0xAC, /* Sec. 6.1.6: */
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOAD_UNLOAD_MEDIUM             = 0xA6, /* Sec. 6.1.7: */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MECHANISM_STATUS               = 0xBD, /* Sec. 6.1.8: */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Mandatory */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Mandatory */
+    kSCSICmd_PAUSE_RESUME                   = 0x4B, /* Sec. 6.1.9: */
+    kSCSICmd_PLAY_AUDIO_10                  = 0x45, /* Sec. 6.1.10: */
+    kSCSICmd_PLAY_AUDIO_12                  = 0xA5, /* Sec. 6.1.11: */
+    kSCSICmd_PLAY_AUDIO_MSF                 = 0x47, /* Sec. 6.1.12: */
+    kSCSICmd_PLAY_AUDIO_TRACK_INDEX         = 0x48, /* Obsolete */
+    kSCSICmd_PLAY_CD                        = 0xBC, /* Sec. 6.1.13: */
+    kSCSICmd_PLAY_RELATIVE_10               = 0x49, /* Obsolete */
+    kSCSICmd_PLAY_RELATIVE_12               = 0xA9, /* Obsolete */
+    kSCSICmd_PREFETCH                       = 0x34, /* Optional */
+    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* Optional */
+    kSCSICmd_READ_6                         = 0x08, /* Optional */
+    kSCSICmd_READ_10                        = 0x28, /* Mandatory */
+    kSCSICmd_READ_12                        = 0xA8, /* Optional */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* Optional */
+    kSCSICmd_READ_BUFFER_CAPACITY           = 0x5C, /* Sec. 6.1.15: */
+    kSCSICmd_READ_CD                        = 0xBE, /* Sec. 6.1.16: */
+    kSCSICmd_READ_CD_MSF                    = 0xB9, /* Sec. 6.1.17: */
+    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.18: */
+    kSCSICmd_READ_DISC_INFORMATION          = 0x51, /* Sec. 6.1.19: */
+    kSCSICmd_READ_DVD_STRUCTURE             = 0xAD, /* Sec. 6.1.20: */
+    kSCSICmd_READ_DISC_STRUCTURE            = 0xAD, /* Sec. 6.1.20: */
+    kSCSICmd_READ_FORMAT_CAPACITIES         = 0x23, /* Sec. 6.1.21: */
+    kSCSICmd_READ_HEADER                    = 0x44, /* Sec. 6.1.22: */
+    kSCSICmd_READ_LONG                      = 0x3E, /* Optional */
+    kSCSICmd_READ_MASTER_CUE                = 0x59, /* Sec. 6.1.23: */
+    kSCSICmd_READ_SUB_CHANNEL               = 0x42, /* Sec. 6.1.24: */
+    kSCSICmd_READ_TOC_PMA_ATIP              = 0x43, /* Sec. 6.1.25: */
+    kSCSICmd_READ_TRACK_INFORMATION         = 0x52, /* Sec. 6.1.27: */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* Mandatory */
+    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
+    kSCSICmd_REPAIR_TRACK                   = 0x58, /* Sec. 6.1.28: */
+    kSCSICmd_REPORT_KEY                     = 0xA4, /* Sec. 6.1.29: */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* Mandatory */
+    kSCSICmd_RESERVE_10                     = 0x56, /* Optional */
+    kSCSICmd_RESERVE_TRACK                  = 0x53, /* Sec. 6.1.30: */
+    kSCSICmd_SCAN_MMC                       = 0xBA, /* Sec. 6.1.31: */
+    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
+    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2, /* Obsolete */
+    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
+    kSCSICmd_SEEK_10                        = 0x2B, /* SBC: */
+    kSCSICmd_SEND_CUE_SHEET                 = 0x5D, /* Sec. 6.1.32: */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Mandatory */
+    kSCSICmd_SEND_DVD_STRUCTURE             = 0xBF, /* Sec. 6.1.33: */
+    kSCSICmd_SEND_EVENT                     = 0xA2, /* Sec. 6.1.34: */
+    kSCSICmd_SEND_KEY                       = 0xA3, /* Sec. 6.1.35: */
+    kSCSICmd_SEND_OPC_INFORMATION           = 0x54, /* Sec. 6.1.36: */
+    kSCSICmd_SET_CD_SPEED                   = 0xBB, /* Sec. 6.1.37: */
+    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Optional */
+    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Optional */
+    kSCSICmd_SET_READ_AHEAD                 = 0xA7, /* Sec. 6.1.38: */
+    kSCSICmd_SET_STREAMING                  = 0xB6, /* Sec. 6.1.39: */
+    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Optional */
+    kSCSICmd_STOP_PLAY_SCAN                 = 0x4E, /* Sec. 6.1.40: */
+    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.41: */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Mandatory */
+    kSCSICmd_VERIFY_10                      = 0x2F, /* Optional */
+    kSCSICmd_VERIFY_12                      = 0xAF, /* Optional */
+    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.1.42: */
+    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.1.43: */
+    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.1.44: */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x06 SGC Scanner Commands
+/* Commands defined by the T10:998-D SCSI-3 Graphics Commands (SGC)
+ * specification.  The definitions and section numbers are based on section 6
+ * of the revision 0, April 1995 version of the specification. 
+ */
+#if 0
+enum 
+{
+    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* SPC: Optional */
+    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
+    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
+    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
+    kSCSICmd_GET_DATA_BUFFER_STATUS         = 0x34, /* Sec. 6.1.1: Optional */
+    kSCSICmd_GET_WINDOW                     = 0x25, /* Sec. 6.1.2: Optional */
+    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
+    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
+    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
+    kSCSICmd_OBJECT_POSITION                = 0x31, /* Sec. 6.1.3: Optional */
+    kSCSICmd_PORT_STATUS                    = 0x11, /* SPC (??): Mandatory
+                                                     * for dual port devices */
+    kSCSICmd_READ                           = 0x28, /* Sec. 6.1.4: Mandatory */
+    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
+    kSCSICmd_SCAN                           = 0x1B, /* Sec. 6.1.5: Optional */
+    kSCSICmd_SEND                           = 0x1B, /* Sec. 6.1.6: Optional */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
+    kSCSICmd_SET_WINDOW                     = 0x24, /* Sec. 6.1.7: Mandatory */
+    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* SPC: Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x07 SBC Optical Media Commands
+/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) 
+ * (revision 8c, 13 November 1998) command specification.  
+ */
+
+#pragma mark -
+#pragma mark 0x08 SMC Medium Changer Commands
+/* Commands defined by the T10:1228-D SCSI-3 Medium Changer Commands-2 (SMC-2)
+ * (revision 0, March 16, 2000) command specification.  
+ */
+#if 0
+enum
+{
+    /* Commands For Independent Medium Changers */
+    kSCSICmd_EXCHANGE_MEDIUM                = 0xA6, /* Optional */
+    kSCSICmd_INITIALIZE_ELEMENT_STATUS      = 0x07, /* Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
+    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* Mandatory */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
+    kSCSICmd_POSITION_TO_ELEMENT            = 0x2B, /* Optional */
+    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* Mandatory */
+    kSCSICmd_RELEASE_ELEMENT_6              = 0x16, /* Optional */
+    kSCSICmd_RELEASE_ELEMENT_10             = 0x56, /* Optional */
+    kSCSICmd_REQUEST_VOLUME_ELEMENT_ADDRESS = 0xB5, /* Optional */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
+    kSCSICmd_RESERVE_ELEMENT_6              = 0x16, /* Optional */
+    kSCSICmd_RESERVE_ELEMENT_10             = 0x56  /* Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x09 SSC Communications Commands
+/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) 
+ * (revision 22, January 1, 2000) command specification. 
+ */
+  
+#pragma mark -
+#pragma mark 0x0A ASC IT8 Prepress Commands
+#pragma mark 0x0B ASC IT8 Prepress Commands
+/* Commands defined by the ASC IT8 <title goes here> specification
+ * (revision xx, month day, year) command specification.  
+ */
+#if 0
+enum
+{
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x0C SCC Array Controller Commands
+/* Commands defined by the ANSI NCITS.318-199x SCSI Controller
+ * Commands (SCC-2) ratified command specification.  
+ */
+#if 0
+enum
+{
+    kSCSICmd_MAINTENANCE_IN                 = 0xA3, /* Mandatory */
+    kSCSICmd_MAINTENANCE_OUT                = 0xA4, /* Optional */
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
+    kSCSICmd_PORT_STATUS                    = 0x1F, /* Optional */
+    kSCSICmd_REDUNDANCY_GROUP_IN            = 0xBA, /* Mandatory */
+    kSCSICmd_REDUNDANCY_GROUP_OUT           = 0xBB, /* Optional */
+    kSCSICmd_RELEASE_6                      = 0x17, /* Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
+    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Mandatory */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* Optional */
+    kSCSICmd_RESERVE_10                     = 0x56, /* Optional*/
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Optional */
+    kSCSICmd_SPARE_IN                       = 0xBC, /* Mandatory */
+    kSCSICmd_SPARE_OUT                      = 0xBD  /* Optional */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x0D SES Enclosure Services Commands
+/* Commands defined by the T10:1212-D SCSI-3 Enclosure Services (SES) 
+ * (revision 8b, February 11, 1998) command specification.  
+ */
+#if 0
+enum
+{
+    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
+    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
+    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
+    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
+    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
+    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
+    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x17, /* Mandatory */
+    kSCSICmd_RELEASE_6                      = 0x17, /* Optional */
+    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
+    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
+    kSCSICmd_RESERVE_6                      = 0x16, /* Optional */
+    kSCSICmd_RESERVE_10                     = 0x56, /* Optional */
+    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D  /* Mandatory */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x0E RBC Reduced Block Commands
+/* Commands defined by the T10:1240-D Reduced Block Commands (RBC) 
+ * (revision 10a, August 18, 1999) command specification.  
+ */
+#if 0
+enum
+{
+    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Optional */
+    kSCSICmd_READ_10                        = 0x28, /* Mandatory */
+    kSCSICmd_READ_CAPACITY                  = 0x25, /* Mandatory */
+    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Mandatory */
+    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Optional */
+    kSCSICmd_VERIFY_10                      = 0x2F, /* Mandatory */
+    kSCSICmd_WRITE_10                       = 0x2A, /* Mandatory */
+    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Mandatory for fixed media
+     *                                              Optional for removable */
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x0F OCRW Optical Card Commands
+/* Commands defined by the ISO/IEC 14776-381 SCSI Specification for
+ * Optical Card Reader/Writer (OCRW) ratified command specification.  
+ */
+#if 0
+enum
+{
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x11 OSD Object-based Storage Commands
+/* Commands defined by the T10:1355-D Object-based Storage Commands (OSD) 
+ * (revision 1, 18 May 2000) command specification.  
+ */
+#if 0
+enum
+{
+};
+#endif
+
+#pragma mark -
+#pragma mark 0x15 RMC Simplified Multimedia Commands
+/* Commands defined by the T10:1364-D Reduced Multimedia Commands (RMC) 
+ * (revision 1, November 11, 1999) command specification.  
+ */
+#if 0
+enum
+{
+};
+#endif
+
+#endif	/* _SCSI_COMMAND_OPERATION_CODES_H_ */
diff --git a/i386/include/IOKit/scsi/SCSIPort.h b/i386/include/IOKit/scsi/SCSIPort.h
new file mode 100644
index 0000000..8eefbeb
--- /dev/null
+++ b/i386/include/IOKit/scsi/SCSIPort.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_SCSI_PORTS_H_
+#define _IOKIT_SCSI_PORTS_H_
+
+
+/*! @header SCSIPort
+	@discussion
+	This file contains all the definitions for SCSIPort notifications and status.
+*/
+
+
+/*!
+@enum kSCSIPort_NotificationStatusChange
+@discussion
+Message definition to be used with the messageClients
+call to inform of a change in port status.
+*/
+enum
+{
+	kSCSIPort_NotificationStatusChange		= 0x68000001
+};
+
+
+/*! @typedef SCSIPortStatus
+	@abstract 32-bit number to represent a SCSIPortStatus.
+	@discussion Type for SCSIPortStatus.
+*/
+
+typedef UInt32 SCSIPortStatus;
+
+/*! @enum SCSI Port Status Values
+	@discussion Definitions for the possible port status values
+*/
+enum
+{
+	/*!
+	@constant kSCSIPort_StatusOnline
+	The port is online.
+	*/
+	kSCSIPort_StatusOnline	= 0,
+
+	/*!
+	@constant kSCSIPort_StatusOffline
+	The port is offline (e.g. unplugged cable).
+	*/
+	kSCSIPort_StatusOffline	= 1,
+
+	/*!
+	@constant kSCSIPort_StatusFailure
+	Driver has detected unrecoverable port failure (e.g. hardware port failure)
+	*/
+	kSCSIPort_StatusFailure	= 2
+};
+
+#endif	/* _IOKIT_SCSI_PORTS_H_ */
diff --git a/i386/include/IOKit/scsi/SCSITask.h b/i386/include/IOKit/scsi/SCSITask.h
new file mode 100644
index 0000000..154c187
--- /dev/null
+++ b/i386/include/IOKit/scsi/SCSITask.h
@@ -0,0 +1,456 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_SCSI_TASK_H_
+#define _IOKIT_SCSI_TASK_H_
+
+
+#if KERNEL
+#include <IOKit/IOTypes.h>
+#else
+#include <CoreFoundation/CoreFoundation.h>
+#endif
+
+
+/*! @header SCSITask
+SCSITask typedefs and constants used inside the kernel and user space.
+
+Note that the SCSITaskIdentifier is an opaque object and that directly
+casting the SCSITaskIdentifier to any other type is discouraged. The SCSITask
+implementation changes when necessary to accomodate architectural changes,
+performance improvements, and bug fixes.
+
+Device and protocol layer drivers that need to access information
+contained in a SCSITask should use the appropriate accessor methods in
+IOSCSIPrimaryCommandsDevice.h or IOSCSIProtocolServices.h
+*/
+
+
+/*! @typedef SCSIDeviceIdentifier
+    @abstract 64-bit number to represent a SCSI Device.
+	@discussion If the identifier can either be that of an initiator or a target,
+    SCSIDeviceIdentifier should be used.
+*/
+
+typedef UInt64 					SCSIDeviceIdentifier;
+
+/*! @typedef SCSITargetIdentifier
+    @abstract 64-bit number to represent a SCSI Target Device.
+	@discussion If the identifier is for a target only and not an initiator, then
+	SCSITargetIdentifier should be used.
+*/
+
+typedef SCSIDeviceIdentifier 	SCSITargetIdentifier;
+
+/*! @typedef SCSIInitiatorIdentifier
+    @abstract 64-bit number to represent a SCSI Initiator Device.
+	@discussion If the identifier is for an initiator only and not a target, then
+	SCSIInitiatorIdentifier should be used.
+*/
+
+typedef SCSIDeviceIdentifier 	SCSIInitiatorIdentifier;
+
+/*! @typedef SCSILogicalUnitNumber
+    @abstract 64-bit number to represent a logical unit.
+	@discussion 64-bit number to represent a logical unit.
+*/
+
+typedef UInt64 					SCSILogicalUnitNumber;
+
+/*! @typedef SCSITaggedTaskIdentifier
+    @abstract 64-bit number to represent a unique task identifier.
+	@discussion The Tagged Task Identifier is used when a Task has a Task Attribute other
+	than SIMPLE. The SCSI Application Layer client that controls the Logical
+	Unit for which a Task is intended is required to guarantee that the Task
+	Tag Identifier is unique. Zero cannot be used a a Tag value as this is used
+	to when a Tagged Task Identifier value is needed for a Task with a SIMPLE 
+	attribute.
+*/
+
+typedef UInt64 SCSITaggedTaskIdentifier;
+
+/*!
+	@enum Untagged Task Identifier
+	@discussion The Untagged Task Identifier is used to indicate no unique tag
+	is associated with the Task.
+	@constant kSCSIUntaggedTaskIdentifier This value means the task is untagged.
+ */
+
+enum
+{
+	kSCSIUntaggedTaskIdentifier = 0
+};
+
+/*!
+	@typedef SCSITaskAttribute
+	@abstract Attributes for task delivery.
+	@discussion The Task Attribute defines how this task should be managed
+	when determing order for queueing and submission to the 
+	appropriate device server. The Task Attribute is set by the SCSI
+	Application Layer and cannot be modified by the SCSI Protocol Layer.
+	@constant kSCSITask_SIMPLE The task has a simple attribute.
+	@constant kSCSITask_ORDERED The task has an ordered attribute.
+	@constant kSCSITask_HEAD_OF_QUEUE The task has a head-of-queue attribute.
+	@constant kSCSITask_ACA The task has an auto-contingent-allegiance attribute.
+ */
+
+typedef enum SCSITaskAttribute
+{
+	kSCSITask_SIMPLE			= 0,
+	kSCSITask_ORDERED			= 1,
+	kSCSITask_HEAD_OF_QUEUE		= 2,
+	kSCSITask_ACA				= 3
+} SCSITaskAttribute;
+
+/*!
+	@typedef SCSITaskState
+	@abstract Attributes for task state.
+	@discussion The Task State represents the current state of the task.
+	The state is set to NEW_TASK when the task is created.  The SCSI Protocol
+	Layer will then adjust the state as the task is queued and during
+	execution. The SCSI Application Layer can examine the state to monitor
+	the progress of a task. The Task State can only be modified by the SCSI
+	Protocol Layer.  The SCSI Application Layer can only read the state.
+	@constant kSCSITaskState_NEW_TASK The task state is new task.
+	@constant kSCSITaskState_ENABLED The task is enabled and queued.
+	@constant kSCSITaskState_BLOCKED The task is blocked.
+	@constant kSCSITaskState_DORMANT The task is dormant.
+	@constant kSCSITaskState_ENDED The task is complete.
+ */
+
+typedef enum SCSITaskState
+{
+	kSCSITaskState_NEW_TASK		= 0,
+	kSCSITaskState_ENABLED		= 1,
+	kSCSITaskState_BLOCKED		= 2,
+	kSCSITaskState_DORMANT		= 3,
+	kSCSITaskState_ENDED		= 4
+} SCSITaskState;
+
+
+/*!
+	@typedef SCSIServiceResponse
+	@abstract Attributes for task service response.
+	@discussion The Service Response represents the execution status of
+	a service request made to a Protocol Services Driver. The Service
+	Response can only be modified by the SCSI Protocol Layer. The SCSI
+	Application Layer can only read the state.
+ */
+
+typedef enum SCSIServiceResponse
+{
+	/*!
+	@constant kSCSIServiceResponse_Request_In_Process
+	Not defined in SAM specification, but is a service response used
+	for asynchronous commands that are not yet completed.
+	*/
+	kSCSIServiceResponse_Request_In_Process					= 0,
+
+	/*!
+	@constant kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE
+	The service request failed because of a delivery or target failure.
+	*/
+	kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE	= 1,
+
+	/*!
+	@constant kSCSIServiceResponse_TASK_COMPLETE
+	The task completed.
+	*/
+	kSCSIServiceResponse_TASK_COMPLETE 						= 2,
+	
+	/*!
+	@constant kSCSIServiceResponse_LINK_COMMAND_COMPLETE
+	The linked command completed.
+	*/
+	kSCSIServiceResponse_LINK_COMMAND_COMPLETE				= 3,
+	
+	/*!
+	@constant kSCSIServiceResponse_FUNCTION_COMPLETE
+	The task management function completed.
+	*/
+	kSCSIServiceResponse_FUNCTION_COMPLETE					= 4,
+	
+	/*!
+	@constant kSCSIServiceResponse_FUNCTION_REJECTED
+	The task management function was rejected.
+	*/
+	kSCSIServiceResponse_FUNCTION_REJECTED					= 5
+} SCSIServiceResponse;
+
+/*!
+	@typedef SCSITaskStatus
+	@abstract Attributes for task status.
+	@discussion The Task Status represents the completion status
+	of the task which provides the  SCSI Application Layer with
+	additional information about how to procede in handling a
+	completed task.
+	
+	The SCSI Architecture Model specification only defines task
+	status values for when a task completes with a service response
+	of either TASK_COMPLETED or LINK_COMMAND_COMPLETE.
+	
+	Since additional information will aid in error recovery when
+	a task fails to be completed by a device due to a service
+	response of kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE,
+	additional values have been defined that can be returned by the
+	SCSI Protocol Layer to inform the SCSI Application Layer of the
+	cause of the delivery failure.
+	
+	The Task Status can only be modified by the SCSI Protocol Layer.
+	The SCSI Application Layer can only read the status
+*/
+typedef enum SCSITaskStatus
+{
+	
+	/*!
+	@constant kSCSITaskStatus_GOOD
+	The task completed with a status of GOOD.
+	*/
+	
+	kSCSITaskStatus_GOOD						= 0x00,
+
+	/*!
+	@constant kSCSITaskStatus_CHECK_CONDITION
+	The task completed with a status of CHECK_CONDITION. Additional
+	information about the condition should be available in the sense data.
+	*/
+	
+	kSCSITaskStatus_CHECK_CONDITION				= 0x02,
+	
+	/*!
+	@constant kSCSITaskStatus_CONDITION_MET
+	The task completed with a status of CONDITION_MET.
+	*/
+	
+	kSCSITaskStatus_CONDITION_MET				= 0x04,
+	
+	/*!
+	@constant kSCSITaskStatus_BUSY
+	The task completed with a status of BUSY. The device server might need
+	time to process a request and a delay may be required.
+	*/
+	kSCSITaskStatus_BUSY						= 0x08,
+
+	/*!
+	@constant kSCSITaskStatus_INTERMEDIATE
+	The task completed with a status of INTERMEDIATE.
+	*/
+	kSCSITaskStatus_INTERMEDIATE				= 0x10,
+
+	/*!
+	@constant kSCSITaskStatus_INTERMEDIATE_CONDITION_MET
+	The task completed with a status of INTERMEDIATE_CONDITION_MET.
+	*/
+	kSCSITaskStatus_INTERMEDIATE_CONDITION_MET	= 0x14,
+
+	/*!
+	@constant kSCSITaskStatus_RESERVATION_CONFLICT
+	The task completed with a status of RESERVATION_CONFLICT.
+	*/
+	kSCSITaskStatus_RESERVATION_CONFLICT		= 0x18,
+
+	/*!
+	@constant kSCSITaskStatus_TASK_SET_FULL
+	The task completed with a status of TASK_SET_FULL. The device server
+	may need to complete a task before the initiator sends another.
+	*/
+	kSCSITaskStatus_TASK_SET_FULL				= 0x28,
+	
+	/*!
+	@constant kSCSITaskStatus_ACA_ACTIVE
+	The task completed with a status of ACA_ACTIVE. The device server may
+	need the initiator to clear the Auto-Contingent Allegiance condition
+	before it will respond to new commands.
+	*/
+	kSCSITaskStatus_ACA_ACTIVE					= 0x30,
+	
+	/*!
+	@constant kSCSITaskStatus_TaskTimeoutOccurred
+	If a task is aborted by the SCSI Protocol Layer due to it exceeding
+	the timeout value specified by the task, the task status shall be
+	set to kSCSITaskStatus_TaskTimeoutOccurred.
+	*/
+	
+	kSCSITaskStatus_TaskTimeoutOccurred			= 0x01,
+	
+	/*!
+	@constant kSCSITaskStatus_ProtocolTimeoutOccurred
+	If a task is aborted by the SCSI Protocol Layer due to it exceeding a
+	timeout value specified by the support for the protocol or a related
+	specification, the task status shall be set to
+	kSCSITaskStatus_ProtocolTimeoutOccurred.
+	*/
+	
+	kSCSITaskStatus_ProtocolTimeoutOccurred		= 0x02,
+	
+	/*!
+	@constant kSCSITaskStatus_DeviceNotResponding
+	If a task is unable to be delivered due to a failure of the device not
+	accepting the task or the device acknowledging the attempt to send it the
+	device the task status shall be set to kSCSITaskStatus_DeviceNotResponding.
+	This will allow the SCSI Application driver to perform the necessary steps
+	to try to recover the device. This shall only be reported after the SCSI
+	Protocol Layer driver has attempted all protocol specific attempts to recover
+	the device.
+	*/
+	
+	kSCSITaskStatus_DeviceNotResponding			= 0x03,
+	
+	/*!
+	@constant kSCSITaskStatus_DeviceNotPresent
+	If the task is unable to be delivered because the device has been
+	detached, the task status shall be set to kSCSITaskStatus_DeviceNotPresent.
+	This will allow the SCSI Application Layer to halt the sending of tasks
+	to the device and, if supported, perform any device failover or system
+	cleanup.
+	*/
+	kSCSITaskStatus_DeviceNotPresent			= 0x04,
+	
+	/*!
+	@constant kSCSITaskStatus_DeliveryFailure
+	If the task is unable to be
+	delivered to the device due to a failure in the SCSI Protocol Layer,
+	such as a bus reset or communications error, but the device is is
+	known to be functioning properly, the task status shall be set to 
+	kSCSITaskStatus_DeliveryFailure. This can also be reported if the
+	task could not be delivered due to a protocol error that has since
+	been corrected.
+	 */
+	kSCSITaskStatus_DeliveryFailure				= 0x05,
+	
+	/*!
+	@constant kSCSITaskStatus_No_Status
+	This status is not defined by
+	the SCSI specifications, but is here to provide a status that can
+	be returned in cases where there is not status available from the
+	device or protocol, for example, when the service response is
+	neither TASK_COMPLETED nor LINK_COMMAND_COMPLETE or when the
+	service response is SERVICE_DELIVERY_OR_TARGET_FAILURE and the
+	reason for failure could not be determined.
+	*/
+	kSCSITaskStatus_No_Status					= 0xFF
+} SCSITaskStatus;
+
+/*!
+	@enum Command Descriptor Block Size
+	@discussion Command Descriptor Block Size constants.
+*/
+enum
+{
+	/*!
+	@constant kSCSICDBSize_Maximum This is the largest size a Command Descriptor
+	Block can be as specified in SPC-2.
+	*/
+	kSCSICDBSize_Maximum 	= 16,
+
+	/*!
+	@constant kSCSICDBSize_6Byte Use this for a 6-byte CDB.
+	*/
+	kSCSICDBSize_6Byte 		= 6,
+
+	/*!
+	@constant kSCSICDBSize_10Byte Use this for a 10-byte CDB.
+	*/
+	kSCSICDBSize_10Byte 	= 10,
+
+	/*!
+	@constant kSCSICDBSize_12Byte Use this for a 12-byte CDB.
+	*/
+	kSCSICDBSize_12Byte 	= 12,
+
+	/*!
+	@constant kSCSICDBSize_16Byte Use this for a 16-byte CDB.
+	*/
+	kSCSICDBSize_16Byte 	= 16
+};
+
+typedef UInt8 SCSICommandDescriptorBlock[kSCSICDBSize_Maximum];
+
+/*!
+	@enum Data Transfer Direction
+	@discussion DataTransferDirection constants.
+*/
+enum
+{
+	/*!
+	@constant kSCSIDataTransfer_NoDataTransfer Use this for tasks
+	that transfer no data.
+	*/
+	kSCSIDataTransfer_NoDataTransfer		= 0x00,
+
+	/*!
+	@constant kSCSIDataTransfer_FromInitiatorToTarget Use this for tasks that transfer
+	data from the initiator to the target.
+	*/
+	kSCSIDataTransfer_FromInitiatorToTarget	= 0x01,
+
+	/*!
+	@constant kSCSIDataTransfer_FromTargetToInitiator Use this for tasks that transfer
+	data from the target to the initiator.
+	*/
+	kSCSIDataTransfer_FromTargetToInitiator	= 0x02
+};
+
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+/* Libkern includes */
+#include <libkern/c++/OSObject.h>
+
+
+/*!
+	@enum SCSITaskMode
+	@discussion The SCSI Task mode is used by the SCSI
+	Protocol Layer to indicate what mode the task is executing.
+*/
+typedef enum SCSITaskMode
+{
+	kSCSITaskMode_CommandExecution	= 1,
+	kSCSITaskMode_Autosense			= 2
+} SCSITaskMode;
+
+/*!
+	@typedef SCSITaskIdentifier
+	@discussion This is an opaque object that represents a task.
+	This is used so that drivers for both the SCSI Protocol Layer
+	and the SCSI  Application Layer cannot modify the SCSITask object
+	directly but must instead use the inherited methods to do so. This
+	allows the implementation of SCSITask to change without directly
+	impacting device and protocol layer drivers. In addition, it
+	prevents changing of properties that are not allowed to be
+	changed by a given layer.
+*/
+typedef OSObject *	SCSITaskIdentifier;
+
+
+/*!
+	@typedef SCSITaskCompletion
+	@discussion This is the typedef for completion routines that
+	work with SCSITaskIdentifiers.
+*/
+typedef void ( *SCSITaskCompletion )( SCSITaskIdentifier completedTask );
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif /* _IOKIT_SCSI_TASK_H_ */
diff --git a/i386/include/IOKit/scsi/spi/.svn/all-wcprops b/i386/include/IOKit/scsi/spi/.svn/all-wcprops
new file mode 100644
index 0000000..b14b4a8
--- /dev/null
+++ b/i386/include/IOKit/scsi/spi/.svn/all-wcprops
@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 61
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/spi
+END
+IOSCSIParallelInterfaceController.h
+K 25
+svn:wc:ra_dav:version-url
+V 97
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/spi/IOSCSIParallelInterfaceController.h
+END
diff --git a/i386/include/IOKit/scsi/spi/.svn/entries b/i386/include/IOKit/scsi/spi/.svn/entries
new file mode 100644
index 0000000..49bbda1
--- /dev/null
+++ b/i386/include/IOKit/scsi/spi/.svn/entries
@@ -0,0 +1,62 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/scsi/spi
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IOSCSIParallelInterfaceController.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+bce86d456d916867cf05e6e916d27b7f
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+59066
+
diff --git a/i386/include/IOKit/scsi/spi/.svn/text-base/IOSCSIParallelInterfaceController.h.svn-base b/i386/include/IOKit/scsi/spi/.svn/text-base/IOSCSIParallelInterfaceController.h.svn-base
new file mode 100644
index 0000000..0bd7981
--- /dev/null
+++ b/i386/include/IOKit/scsi/spi/.svn/text-base/IOSCSIParallelInterfaceController.h.svn-base
@@ -0,0 +1,1568 @@
+/*
+ * Copyright (c) 2002-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__
+#define __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__
+
+
+ /*!
+  @header IOSCSIParallelInterfaceController
+	The IOSCSIParallelInterfaceController class and the associated HBA child
+	class is responsible for the management of all related hardware. This
+	includes the onboard HBA controller chip and the physical state of the
+	bus. These classes are not responsible for any of the management of
+	the SCSI Devices on the bus with the exception of maintaining the queue that 
+	holds the objects representing those SCSI Devices.
+*/
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit includes
+#include <IOKit/IOService.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IODMACommand.h>
+#include <IOKit/IOInterruptEventSource.h>
+#include <IOKit/IOFilterInterruptEventSource.h>
+#include <IOKit/IOTimerEventSource.h>
+#include <IOKit/IOCommandPool.h>
+
+// IOKit SCSI ArchitectureModel Family includes
+#include <IOKit/scsi/SCSITask.h>
+#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
+#include <IOKit/scsi/SCSIPort.h>
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+
+#define kIOPropertySCSIDeviceFeaturesKey			"SCSI Device Features"
+#define kIOPropertySCSI_I_T_NexusFeaturesKey		"SCSI I_T Nexus Features"
+
+// This is the alignment mask used when allocating per-task HBA data. It allows
+// the HBA to declare whether or not it supports 64-bit addressability and what the
+// minimum byte alignment is for the data. E.g. By specifying 0x0000FFFFFFFFFFFEULL,
+// the controller would be indicating that it supports 48-bits of addressability, but
+// at a minimum of being 2-byte aligned.
+#define kIOMinimumHBADataAlignmentMaskKey			"HBA Data Alignment"
+
+// The Feature Selectors used to identify features of the SCSI Parallel
+// Interface.  These are used by the DoesHBASupportSCSIParallelFeature
+// to report whether the HBA supports a given SCSI Parallel Interface
+// feature and are used for requesting negotiation and reporting negotiation
+// results between the controller and the device.
+
+// When the DoesHBASupportSCSIParallelFeature() member routine of the controller 
+// child class is called, it will return true if the HBA that it controls 
+// supports the specified SCSIParallelFeature or false if it does not.
+typedef enum SCSIParallelFeature
+{
+	// The selector for support of Wide Data Transfers.  Only Wide16 is supported 
+	// as Wide32 has been obsoleted by the SPI-3 specification.
+	kSCSIParallelFeature_WideDataTransfer 					= 0,
+	
+	// The selector for support of Synchronous Data Transfers.
+	kSCSIParallelFeature_SynchronousDataTransfer 			= 1,
+	
+	// The selector for support of Quick Arbitration and Selection (QAS).
+	kSCSIParallelFeature_QuickArbitrationAndSelection 		= 2,
+	
+	// The selector for support of Double Transition (DT) data transfers.
+	kSCSIParallelFeature_DoubleTransitionDataTransfers 		= 3,
+	
+	// The selector for SPI Information Unit (IU) transfers.
+	kSCSIParallelFeature_InformationUnitTransfers 			= 4,
+	
+	// Since the Feature selectors are zero base, this will always have the 
+	// correct total.
+	kSCSIParallelFeature_TotalFeatureCount	
+} SCSIParallelFeature;
+
+
+typedef enum SCSIParallelFeatureRequest
+{
+	// This selector indicates that current negotiation 
+	// should be used. 
+	kSCSIParallelFeature_NoNegotiation 			= 0,
+	
+	// This selector indicates that the controller
+	// should attempt negotiation for the feature
+	kSCSIParallelFeature_AttemptNegotiation 	= 1,
+	
+	// This selector indicates that the controller
+	// should clear any negotiation for the feature
+	kSCSIParallelFeature_ClearNegotiation 		= 2
+};
+	
+typedef enum SCSIParallelFeatureResult
+{
+	kSCSIParallelFeature_NegotitiationUnchanged	= 0,
+	kSCSIParallelFeature_NegotitiationCleared	= 1,
+	kSCSIParallelFeature_NegotitiationSuccess	= 2
+};
+
+
+// The SCSI Message Codes used for MESSAGE IN and MESSAGE OUT phases.
+enum SCSIParallelMessages
+{
+	// Link Control Messages
+	kSCSIParallelMessage_TASK_COMPLETE						= 0x00,
+	kSCSIParallelMessage_EXTENDED_MESSAGE					= 0x01,
+	kSCSIParallelMessage_SAVE_DATA_POINTER	 				= 0x02,
+	kSCSIParallelMessage_RESTORE_POINTERS					= 0x03,
+	kSCSIParallelMessage_DISCONNECT							= 0x04,
+	kSCSIParallelMessage_INITIATOR_DETECTED_ERROR 			= 0x05,
+	kSCSIParallelMessage_MESSAGE_REJECT		 				= 0x07,
+	kSCSIParallelMessage_NO_OPERATION		 				= 0x08,
+	kSCSIParallelMessage_MESSAGE_PARITY_ERROR 				= 0x09,
+	kSCSIParallelMessage_IGNORE_WIDE_RESIDUE				= 0x23,
+	kSCSIParallelMessage_QAS_REQUEST		 				= 0x55,
+	kSCSIParallelMessage_IDENTIFY							= 0x80,
+	
+	// The Message Codes used in the EXTENDED_MESSAGE message.
+	kSCSIParallelMessage_MODIFY_DATA_POINTER				= 0x00,
+	kSCSIParallelMessage_SYNCHONOUS_DATA_TRANSFER_REQUEST	= 0x01,
+	// Reserved												= 0x02
+	kSCSIParallelMessage_WIDE_DATA_TRANSFER_REQUEST			= 0x03,
+	kSCSIParallelMessage_PARALLEL_PROTOCOL_REQUEST			= 0x04,
+	// Reserved												= 0x05 through 0xFF
+	
+	// Task Attribute Message Codes
+	kSCSIParallelMessage_ACA								= 0x24,
+	kSCSIParallelMessage_HEAD_OF_QUEUE						= 0x21,
+	kSCSIParallelMessage_LINKED_COMMAND_COMPLETE			= 0x0A,
+	kSCSIParallelMessage_ORDERED							= 0x22,
+	kSCSIParallelMessage_SIMPLE								= 0x20,
+	
+	// Task Management Message Codes
+	kSCSIParallelMessage_ABORT_TASK							= 0x0D,
+	kSCSIParallelMessage_ABORT_TASK_SET						= 0x06,
+	kSCSIParallelMessage_CLEAR_ACA							= 0x16,
+	kSCSIParallelMessage_CLEAR_TASK_SET						= 0x0E,
+	kSCSIParallelMessage_LOGICAL_UNIT_RESET					= 0x17,
+	kSCSIParallelMessage_TARGET_RESET						= 0x0C
+};
+
+enum
+{
+	kSCSIParallelTaskControllerIDQueueHead 		= 0
+};
+
+// Notifications
+enum
+{
+	kSCSIControllerNotificationBusReset			= 0x68000000
+};
+
+// Forward declaration for the internally used Parallel Device object.
+class IOSCSIParallelInterfaceDevice;
+
+// This is the identifier that is used to specify a given parallel Task.
+typedef OSObject *	SCSIParallelTaskIdentifier;
+
+
+//-----------------------------------------------------------------------------
+//	Class Declarations
+//-----------------------------------------------------------------------------
+
+/*! @class IOSCSIParallelInterfaceController
+	@abstract Class that represents a SCSI Host Bus Adapter.
+	@discussion Class that represents a SCSI Host Bus Adapter.
+*/
+class IOSCSIParallelInterfaceController : public IOService
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIParallelInterfaceController )
+	
+#if 0
+#pragma mark -
+#pragma mark Client API
+#endif
+	
+	
+public:
+	
+	/*!
+		@function GetSCSIParallelTask
+		@abstract Method to allow the client to get a SCSIParallelTask
+		@discussion Get a SCSIParallelTask from the controller so that a request
+		can be issued to the HBA driver.
+		@param blockForCommand If the blockForCommand parameter is set to false
+		and there are no free SCSIParallelTasks, this method will return NULL, 
+		otherwise it will wait for one to become available before returning.
+		@result If there is a SCSI Parallel Task available, a reference to it 
+		will be returned.
+	*/
+	
+	SCSIParallelTaskIdentifier	GetSCSIParallelTask ( bool blockForCommand );
+	
+	/*!
+		@function FreeSCSIParallelTask
+		@abstract Method to allow the client to release a SCSIParallelTask
+		@discussion	The FreeSCSIParallelTask method is called by the client when 
+		a SCSIParallelTask has been completed and the associated returnTask
+		needs to be returned to the pool.
+		@param returnTask is a reference to the SCSIParallelTaskIdentifier to be 
+		returned.
+	*/
+	
+	void FreeSCSIParallelTask ( SCSIParallelTaskIdentifier returnTask );
+	
+	/*!
+		@function FindTaskForAddress
+		@abstract Find a task for a given Task Address, if one exists.
+		@discussion If a valid Tagged Task Identifier is specified, this method 
+		will return the task specified by the Tagged Task Address if one is 
+		found, or else NULL will be returned.  If zero is used as the Tagged 
+		Task Identifier, then this routine will search for an outstanding task 
+		based on the Untagged Task Address and return the task or else, if one 
+		is not found, return NULL.
+		@param theT is the Target component of the I_T_L or I_T_L_Q nexus.
+		@param theL is the Logical Unit component of the I_T_L or I_T_L_Q nexus.
+		@param theQ is the Queue Tag component of the I_T_L_Q nexus.  If this is
+		an I_T_L nexus, then the kSCSIUntaggedTaskIdentifier constant should be
+		used for theQ.
+		@result returns a valid SCSIParallelTaskIdentifier or NULL if none 
+		found.
+	*/
+	
+	SCSIParallelTaskIdentifier	FindTaskForAddress ( 
+							SCSIDeviceIdentifier 		theT,
+							SCSILogicalUnitNumber		theL,
+							SCSITaggedTaskIdentifier	theQ );
+	
+	
+	/*!
+		@function FindTaskForControllerIdentifier
+		@abstract Find a task for a given Target and Controller Task Identifier
+		@discussion Allows the controller child class to find an outstanding task
+		for a specified target and controller task identifier
+		@param theTarget is the Target that the task .
+		@param theIdentifier is the controller task identifier set using the SCSI
+		Parallel Task's SetControllerTaskIdentifier() method.
+		@result returns a valid SCSIParallelTaskIdentifier or NULL if none 
+		found.
+	*/
+	
+	SCSIParallelTaskIdentifier	FindTaskForControllerIdentifier ( 
+							SCSIDeviceIdentifier 		theTarget,
+							UInt64						theIdentifier );
+	
+	
+	/*!
+		@function ExecuteParallelTask
+		@abstract Submit a SCSIParallelTask for execution.
+		@discussion	The ExecuteParallelTask call is made by the client to submit 
+		a SCSIParallelTask for execution.
+		@param parallelRequest is a reference to the SCSIParallelTaskIdentifier
+		to be executed.
+		@result is an appropriate SCSIServiceResponse which are defined in the
+		file <IOKit/scsi/SCSITask.h>.
+	*/
+	
+	SCSIServiceResponse ExecuteParallelTask ( 
+							SCSIParallelTaskIdentifier	parallelRequest );
+	
+	// --- Public API methods provided by HBA child classes ----
+	
+	/*!
+		@function ReportHBAHighestLogicalUnitNumber
+		@abstract Gets the Highest Logical Unit Number.
+		@discussion	This method is used to query the HBA child class to 
+		determine what the highest Logical Unit Number that the controller can 
+		address.
+		@result returns a valid 64-bit logical unit number.
+	*/
+	
+	virtual SCSILogicalUnitNumber	ReportHBAHighestLogicalUnitNumber ( void ) = 0;
+	
+	/*!
+		@function DoesHBASupportSCSIParallelFeature
+		@abstract Queries the HBA child class to determine if it supports a 
+		specific SPI feature.
+		@discussion	Queries the HBA child class to determine if it supports the 
+		specified feature as defined by the SCSI Parallel Interconnect 
+		specifications.
+		@result Returns true if requested feature is supported.
+	*/
+	
+	virtual bool	DoesHBASupportSCSIParallelFeature ( 
+							SCSIParallelFeature 		theFeature ) = 0;
+	
+	/*!
+		@function InitializeTargetForID
+		@abstract Called to initialize a target device.
+		@discussion	This method will be called to initialize a target device in 
+		a single-threaded manner.  The HBA can use this method to probe the 
+		target or do anything else necessary before the device object is 
+		registered with IOKit for matching.
+		@result Returns true if the target was successfully initialized.
+	*/
+	
+	virtual bool	InitializeTargetForID (  
+							SCSITargetIdentifier 		targetID ) = 0;
+	
+	// The SCSI Task Management Functions as defined in the SCSI Architecture
+	// Model - 2 (SAM-2) specification.  These are used by the client to request
+	// the specified function.  The controller can complete these immmediately 
+	// by returning the appropriate SCSIServiceResponse, or these can be completed
+	// asyncronously by the controller returning a SCSIServiceResponse of
+	// kSCSIServiceResponse_Request_In_Process and then calling the appropriate
+	// function complete member routine listed in the child class API section.
+	
+	virtual SCSIServiceResponse	AbortTaskRequest ( 	
+							SCSITargetIdentifier 		theT,
+							SCSILogicalUnitNumber		theL,
+							SCSITaggedTaskIdentifier	theQ ) = 0;
+	
+	virtual	SCSIServiceResponse AbortTaskSetRequest (
+							SCSITargetIdentifier 		theT,
+							SCSILogicalUnitNumber		theL ) = 0;
+	
+	virtual	SCSIServiceResponse ClearACARequest (
+							SCSITargetIdentifier 		theT,
+							SCSILogicalUnitNumber		theL ) = 0;
+	
+	virtual	SCSIServiceResponse ClearTaskSetRequest (
+							SCSITargetIdentifier 		theT,
+							SCSILogicalUnitNumber		theL ) = 0;
+	
+	virtual	SCSIServiceResponse LogicalUnitResetRequest (
+							SCSITargetIdentifier 		theT,
+							SCSILogicalUnitNumber		theL ) = 0;
+	
+	virtual	SCSIServiceResponse TargetResetRequest (
+							SCSITargetIdentifier 		theT ) = 0;
+	
+	
+
+	/*!
+		@function DoesHBAPerformAutoSense
+		@abstract Queries the HBA child class to determine if it automatically
+		performs AutoSense and provides AutoSense data for each I/O. If the HBA
+		allocates space for AutoSense in its HBA specific data region on a per
+		task basis, the HBA should respond true.
+		@discussion	Queries the HBA child class to determine if it automatically
+		performs AutoSense and provides AutoSense data for each I/O. If the HBA
+		allocates space for AutoSense in its HBA specific data region on a per
+		task basis, the HBA should respond true.
+		@result Return true if HBA performs AutoSense into its own private data
+		buffer.
+	*/
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 1 );
+	
+	virtual bool	DoesHBAPerformAutoSense ( void );
+	
+	/*!
+		@function ReportHBAConstraints
+		@abstract Called to report the I/O constraints for this controller.
+		A list of valid keys includes:
+			kIOMaximumSegmentCountReadKey, (required)
+			kIOMaximumSegmentCountWriteKey, (required)
+			kIOMaximumSegmentByteCountReadKey, (required)
+			kIOMaximumSegmentByteCountWriteKey, (required)
+			kIOMinimumSegmentAlignmentByteCountKey, (required)
+			kIOMaximumSegmentAddressableBitCountKey, (required)
+			kIOMinimumHBADataAlignmentMaskKey (required).
+		NB: These keys and their values are described in this header and <IOKit/IOKitKeys.h>
+		@param constraints. An OSDictionary object used to aggregate the key/value pairs.
+		Subclasses must set the required keys if they override this method. If a subclass does
+		not provide the required keys, the system will panic.
+	*/
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 2 );
+	
+	virtual void	ReportHBAConstraints ( OSDictionary * constraints );
+	
+	// Padding for the Client API
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 8 );
+	
+	
+#if 0
+#pragma mark -
+#pragma mark Child Class API
+#endif
+	
+	
+protected:
+	
+	// ---- Target Creation and Destruction methods ---
+	
+	/*!
+		@function CreateTargetForID
+		@abstract Method to perform device creation.
+		@discussion	For HBA child classes that report true to the 
+		DoesHBAPerformDeviceManagement() method, the child class will be 
+		responsible for all device management by using these methods;
+		otherwise, the superclass will be responsible for all device management.
+		This method must be used to perform SCSI Parallel Device creation and 
+		cannot be overridden.
+		@param  targetID SCSIDeviceIdentifier of desired targetID.
+		@result returns true if successful.
+	*/
+	
+	bool	CreateTargetForID ( SCSIDeviceIdentifier targetID );
+	
+	 /*!
+		@function CreateTargetForID
+		@abstract Method to perform device creation.
+		@discussion	For HBA child classes that report true to the
+		DoesHBAPerformDeviceManagement() method, the child class will be
+		responsible for all device management by using these methods;
+		otherwise, the superclass will be responsible for all device management.
+		This method must be used to perform SCSI Parallel Device creation and
+		cannot be overridden.
+		@param  targetID SCSIDeviceIdentifier of desired targetID.
+		@param	properties A dictionary of properties to associate with the device
+				upon creation. The list of valid property keys is as follows:
+				kIOPropertySASAddressKey,
+				kIOPropertyFibreChannelNodeWorldWideNameKey,
+				kIOPropertyFibreChannelPortWorldWideNameKey,
+				kIOPropertyFibreChannelAddressIdentifierKey, and
+				kIOPropertyFibreChannelALPAKey.
+				These keys are defined in
+				<IOKit/storage/IOStorageProtocolCharacteristics.h> and the values
+				associated with these keys must be of the proper type/size,
+				or the target creation will not succeed.
+		@result returns true if successful.
+	*/
+	
+	bool	CreateTargetForID ( SCSIDeviceIdentifier 	targetID,
+								OSDictionary * 			properties );
+	
+	 /*!
+		@function DestroyTargetForID
+		@abstract Method to perform device destruction.
+		@discussion	For HBA child classes that report true to the 
+		DoesHBAPerformDeviceManagement() method, the child class will be 
+		responsible for all device management by using these methods; otherwise, 
+		the superclass will be responsible for all device management.
+		This method must be used to perform SCSI Parallel Device destruction and
+		cannot be overridden.
+		@param  targetID SCSIDeviceIdentifier of desired targetID.
+	*/
+	
+	void	DestroyTargetForID ( SCSIDeviceIdentifier targetID );
+	
+	/*!
+		@function GetTargetForID
+		@abstract Accessor for getting pointer to IOSCSIParallelInterfaceDevice.
+		@param targetID SCSIDeviceIdentifier of desired targetID.
+		@result returns pointer to IOSCSIParallelInterfaceDevice or NULL if not 
+		found.
+	*/
+	
+	IOSCSIParallelInterfaceDevice *	GetTargetForID ( 
+							SCSIDeviceIdentifier 		targetID ); 
+	
+	/*!
+		@function SetTargetProperty
+		@abstract Accessor for setting a property for a specific target.
+		@param device A pointer to a valid IOSCSIParallelInterfaceDevice.
+		@param key A pointer to a valid OSString object which represents the key.
+		A list of valid keys includes:
+			kIOPropertySASAddressKey,
+			kIOPropertyFibreChannelNodeWorldWideNameKey,
+			kIOPropertyFibreChannelPortWorldWideNameKey,
+			kIOPropertyFibreChannelAddressIdentifierKey, and
+			kIOPropertyFibreChannelALPAKey.
+		NB: These keys and their values are described in <IOKit/storage/IOStorageProtocolCharacteristics.h>
+		@param value Pointer to an OSObject (one of type OSData, OSString, etc.)
+		which represents the value for the property. The value must be of the proper type
+		and size for the specified key.
+		@result returns true if identifier was properly set, otherwise false. 
+	*/
+	
+	bool	SetTargetProperty ( SCSIDeviceIdentifier 		targetID,
+								const char *		 		key,
+								OSObject *					value );
+
+	/*!
+		@function RemoveTargetProperty
+		@abstract Accessor for removing a property from a specific target.
+		@param device A pointer to a valid IOSCSIParallelInterfaceDevice.
+		@param key A pointer to a valid OSString object which represents the key.
+	*/
+	
+	void	RemoveTargetProperty ( SCSIDeviceIdentifier 		targetID,
+								   const char *		 			key );
+	
+	// ---- Methods for HBA specifics. ----
+	
+	/*!
+		@function SetHBAProperty
+		@abstract Accessor for setting a property for this object.
+		@param key A pointer to a valid OSString object which represents the key.
+		A list of valid keys includes:
+			kIOPropertyVendorNameKey,
+			kIOPropertyProductNameKey,
+			kIOPropertyProductRevisionLevelKey,
+			kIOPropertyPortDescriptionKey,
+			kIOPropertyPortSpeedKey,
+			kIOPropertyPortTopologyKey,
+			kIOPropertySCSIParallelSignalingTypeKey,
+			kIOPropertyFibreChannelCableDescriptionKey,
+			kIOPropertyFibreChannelNodeWorldWideNameKey,
+			kIOPropertyFibreChannelPortWorldWideNameKey,
+			kIOPropertyFibreChannelAddressIdentifierKey, and
+			kIOPropertyFibreChannelALPAKey.
+		NB: These keys and their values are described in <IOKit/storage/IOStorageDeviceCharacteristics.h>
+		and <IOKit/storage/IOStorageProtocolCharacteristics.h>
+		@param value Pointer to an OSObject (one of type OSData, OSString, etc.)
+		which represents the value for the property. The value must be of the proper type,
+		and/or size for the specified key.
+		@result returns true if identifier was properly set, otherwise false. 
+	*/
+	
+	bool	SetHBAProperty ( const char *	key,
+							 OSObject *	 	value );
+
+	/*!
+		@function RemoveHBAProperty
+		@abstract Accessor for removing a property for this object.
+		@param key A pointer to a valid OSString object which represents the key.
+		See the SetHBAProperty() method for a list of valid keys.
+	*/
+	
+	void	RemoveHBAProperty ( const char * key );
+	
+	// These methods will not be called before the InitializeController() call,
+	// and will not be called after the TerminateController() call.  But in the
+	// interval between those calls, they shall report the correct requested
+	// information. They are implemented as seperate pure virtual methods
+	// instead of a selector driven method because the HBA child class is
+	// required to report this information.
+	
+	/*!
+		@function ReportInitiatorIdentifier
+		@abstract Get the SCSI Device Identifier for the HBA.
+		@discussion This method will be called to determine the SCSI Device 
+		Identifier that the Initiator has assigned for this HBA.
+		@result returns SCSIInitiatorIdentifier.
+	*/
+	
+	virtual SCSIInitiatorIdentifier	ReportInitiatorIdentifier ( void ) = 0;
+	
+	/*!
+		@function ReportHighestSupportedDeviceID
+		@abstract Get the highest supported SCSI Device Identifier.
+		@discussion This method will be called to determine the value of the 
+		highest SCSI Device Identifier supported by the HBA. This value will be 
+		used to determine the last ID to process.
+		@result returns highest SCSIDeviceIdentifier
+	*/
+	
+	virtual SCSIDeviceIdentifier	ReportHighestSupportedDeviceID ( void ) = 0;
+	
+	/*!
+		@function ReportMaximumTaskCount
+		@abstract Report Maximum Task Count
+		@discussion This method will be called to retrieve the maximum number of
+		outstanding tasks the HBA can process. This number must be greater than
+		zero or the controller driver will fail to match and load.
+		@result returns maximum (non-zero) task count.
+	*/
+	
+	virtual UInt32		ReportMaximumTaskCount ( void ) = 0;
+	
+  	/*!
+		@function ReportHBASpecificTaskDataSize
+		@abstract Determine memory needed for HBA Task specific use.
+		@discussion This method is used to retrieve the amount of memory that 
+		will be allocated in the SCSI Parallel Task for HBA specific use.
+		@result returns memory required in bytes
+	*/
+	
+	virtual UInt32		ReportHBASpecificTaskDataSize ( void ) = 0;
+	
+  	/*!
+		@function ReportHBASpecificDeviceDataSize
+		@abstract  Determine memory needed for HBA Device specific use.
+		@discussion This method is used to retrieve the amount of memory that 
+		will be allocated in the SCSI Parallel Device for HBA specific use.
+		@result  returns memory required in bytes
+	*/
+	
+	virtual UInt32		ReportHBASpecificDeviceDataSize ( void ) = 0;
+	
+  	/*!
+		@function DoesHBAPerformDeviceManagement
+		@abstract  Determine if HBA will manage devices.
+		@discussion This method is used to determine if the HBA will manage 
+		target device creation and destruction.  
+		@result return true means objects for target devices will only be 	
+		created when the child class calls the CreateTargetForID method.
+	*/
+	
+	virtual bool		DoesHBAPerformDeviceManagement ( void ) = 0;
+	
+	// ---- Initialize and Terminate methods for the subclass to implement -----
+	// The subclass shall not override the IOKit init and terminate methods,
+	// but shall instead rely on these methods for initialization and
+	// termination.
+	
+	// This is done to allow for this superclass to manage all IOKit specifics 
+	// and to require only a Family specific API to be implemented by the
+	// subclass drivers.
+	
+  	/*!
+		@function InitializeController
+		@abstract  Called to initialize the controller
+		@discussion It is guaranteed that the InitializeController() will only be 
+		called once per instantiation.  The InitializeController() methods allows 
+		the subclass driver to do all the necessary initialization required by 
+		the hardware before it is able to accept requests to execute. All 
+		necessary allocation of resources should be made during this method 
+		call. This is the first method that will be called in the subclass.
+		@result return true means that initialization was successful.
+	*/
+	
+	virtual bool	InitializeController ( void ) = 0;
+	
+  	/*!
+		@function TerminateController
+		@abstract  Called to terminate the controller
+		@discussion It is guaranteed that the TerminateController() will only be 
+		called once and only after the InitializeController() method and only if 
+		true was returned in response to the InitializeController() method.
+		The TerminateController() method allows the subclass to release all 
+		resources that were acquired for operation of the hardware and shutdown 
+		all hardware services.
+		This is the last method of the subclass that will be called before the 		
+		class is destroyed.
+	*/
+	
+	virtual void	TerminateController ( void ) = 0;
+	
+	// ---- Start and Stop methods for the subclass ----
+	
+	/*!
+		@function StartController
+		@abstract Called to start the controller
+		@discussion The StartController will always be called before any 
+		requests are sent to the driver for execution. This method is called 
+		after an initialize to start the services provided by the specific HBA 
+		driver or called after a StopController call to restart those services. 
+		After this call completes, all services provided by the HBA driver are 
+		available to the client.
+		@result return true means that start was successful.
+	*/
+	
+	virtual bool	StartController ( void ) = 0;
+	
+	/*!
+		@function StopController
+		@abstract Called to stop the controller
+		@discussion The StopController method will be called any time that the 
+		system wants the card to stop accepting requests. ( See StartController 
+		discussion ). The subclass should disable the hardware interrupt for
+		the particular controller (if possible) in this method.
+	*/
+	
+	virtual void	StopController ( void ) = 0;
+	
+	// ---- Suspend and Resume Methods for the subclass ----
+	
+	/*!
+		@function SuspendServices
+		@abstract Called to suspend controller services
+		@discussion Method will be called when the system wants to suspend the
+		services that are provided by the HBA driver. This call is not a reset
+		and the driver shall retain all state data between this so that if a
+		ResumeServices call is received, the driver can continue providing
+		services without a visible difference to the client. The driver may 
+		receive multiple SuspendServices calls without receiving a 
+		ResumeServices call and should ignore any after the first until a 
+		ResumeServices call is received.
+	*/
+	
+	virtual void	SuspendServices ( void );
+	
+	/*!
+		@function ResumeServices
+		@abstract Called to resume controller services
+		@discussion Method that will be called to resume services
+		provided by the driver. ( See SuspendServices discussion )
+	*/
+	
+	virtual void	ResumeServices ( void );
+	
+	/*!
+		@function HandleInterruptRequest
+		@abstract Handle Interrupt Request
+		@discussion The HandleInterruptRequest is used to notify an HBA 
+		specific subclass that an interrupt request needs to be serviced. It is 
+		called on the workloop (it holds the gate) at secondary interrupt level.
+	*/
+	
+	virtual void	HandleInterruptRequest ( void ) = 0;
+	
+	/*!
+		@function EnableInterrupt
+		@abstract Enable Interrupt
+		@discussion Method that the HBA child class can call to enable 
+		the associated IOInterruptEventSource.
+	*/
+	
+	void	EnableInterrupt ( void );
+	
+	/*!
+		@function DisableInterrupt
+		@abstract Disable Interrupt
+		@discussion Method that the HBA child class can call to disable 
+		the associated IOInterruptEventSource.
+	*/
+	
+	void	DisableInterrupt ( void );
+	
+	/*!
+		@function SignalInterrupt
+		@abstract Signals that an interrupt has occurred.
+		@discussion Subclasses of IOSCSIParallelInterfaceController
+		should call this method in order to get the secondary interrupt
+		thread scheduled if and only if they will be returning false from
+		their overriden FilterInterruptRequest() method. See the
+		discussion for the FilterInterruptRequest() method for more
+		details.
+		
+		NOTE: This method should only be called from within the
+		FilterInterruptRequest() method and at no other time.
+		
+		Available in 10.3.3 or later.
+		
+	*/
+	
+	void	SignalInterrupt ( void );
+	
+	/*!
+		@function ProcessParallelTask
+		@abstract Called by client to process a parallel task.
+		@discussion This method is called to process a parallel task (i.e. put
+		the command on the bus). The HBA specific sublcass must implement this 
+		method.
+		@param parallelRequest A valid SCSIParallelTaskIdentifier.
+		@result serviceResponse (see <IOKit/scsi/SCSITask.h>)
+	*/
+	
+	virtual SCSIServiceResponse ProcessParallelTask (
+							SCSIParallelTaskIdentifier parallelRequest ) = 0;
+	
+	/*!
+		@function CompleteParallelTask
+		@abstract Parallel Task Completion
+		@discussion The HBA specific sublcass inherits the CompleteParallelTask() 
+		method which shall be called when the HBA has completed the processing 
+		of a parallel task.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param completionStatus The status of the SCSI bus.
+		@param serviceResponse (see <IOKit/scsi/SCSITask.h>)
+	*/
+	
+	void	CompleteParallelTask (
+						SCSIParallelTaskIdentifier	parallelRequest,
+						SCSITaskStatus 				completionStatus,
+						SCSIServiceResponse 		serviceResponse );
+	
+	
+	// Completion routines for the SCSI Task Management functions as described
+	// in the SCSI ArchitectureModel - 2 (SAM-2) specification.  Each of these
+	// correspond to a client request for the specific Task Management functions.
+	// If the Controller Child Class completed the request by returning a 
+	// SCSIServiceResponse of anything other than kSCSIServiceResponse_Request_In_Process,
+	// then the controller class does not need to call the completion member routine.
+	// If the controller did not complete the request immediately, then it will
+	// need to call the appropriate completion member routine listed here.
+	void	CompleteAbortTask ( 	
+						SCSITargetIdentifier 		theT,
+						SCSILogicalUnitNumber		theL,
+						SCSITaggedTaskIdentifier	theQ,
+						SCSIServiceResponse 		serviceResponse );
+	
+	void 	CompleteAbortTaskSet (
+						SCSITargetIdentifier 		theT,
+						SCSILogicalUnitNumber		theL,
+						SCSIServiceResponse 		serviceResponse );
+	
+	void 	CompleteClearACA (
+						SCSITargetIdentifier 		theT,
+						SCSILogicalUnitNumber		theL,
+						SCSIServiceResponse 		serviceResponse );
+	
+	void 	CompleteClearTaskSet (
+						SCSITargetIdentifier 		theT,
+						SCSILogicalUnitNumber		theL,
+						SCSIServiceResponse 		serviceResponse );
+	
+	void 	CompleteLogicalUnitReset (
+						SCSITargetIdentifier 		theT,
+						SCSILogicalUnitNumber		theL,
+						SCSIServiceResponse 		serviceResponse );
+	
+	void 	CompleteTargetReset (
+						SCSITargetIdentifier 		theT,
+						SCSIServiceResponse 		serviceResponse );
+	
+	/*!
+		@function NotifyClientsOfBusReset
+		@abstract Method called to notify clients that a bus reset has occurred.
+		@discussion This method is used by the HBA child class to inform the 
+		parent class and any clients that a bus reset has occurred.
+	*/
+	
+	void	NotifyClientsOfBusReset ( void );
+	
+	/*!
+		@function NotifyClientsOfPortStatusChange
+		@abstract Method called to notify clients of port status change events.
+		@discussion This method is used by the HBA child class to inform the 
+		parent class and any clients that a port has changed status.
+	*/
+	
+	void	NotifyClientsOfPortStatusChange ( SCSIPortStatus newStatus );
+	
+	/*!
+		@function GetSCSIDomainIdentifier
+		@abstract Accessor method to get the SCSI Domain Identifier.
+		@discussion Accessor method to get the SCSI Domain Identifier.
+		@result returns SCSI Domain Identifier.
+	*/
+	
+	SInt32	GetSCSIDomainIdentifier ( void );
+	
+	/*!
+		@function GetProvider
+		@abstract Accessor method to get the IOService which is the controller's
+		provider.
+		@discussion Accessor method to get the IOService which is the 
+		controller's provider.
+		@result returns pointer to IOService.
+	*/
+	
+	IOService *		GetProvider ( void );
+	
+	/*!
+		@function GetWorkLoop
+		@abstract Accessor method to get the IOWorkLoop associated with this 
+		HBA.
+		@discussion Accessor method to get the IOWorkLoop associated with this 
+		HBA.
+		@result returns pointer to IOWorkLoop.
+	*/
+	
+	IOWorkLoop *	GetWorkLoop ( void ) const;
+	
+	/*!
+		@function GetCommandGate
+		@abstract Accessor to get an IOCommandGate associated with the workloop.
+		@discussion Accessor to get an IOCommandGate associated with the 
+		workloop.
+		@result returns pointer to IOCommandGate.
+	*/
+	
+	IOCommandGate *		GetCommandGate ( void );
+	
+	// ---- SCSI Parallel Task Object Accessors ----
+	
+	/*!
+		@function GetSCSITaskIdentifier
+		@abstract Method to retrieve a SCSITaskIdentifier from a valid 
+		SCSIParallelTaskIdentifier.
+		@discussion Method to retrieve a SCSITaskIdentifier from a valid 
+		SCSIParallelTaskIdentifier.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns SCSITaskIdentifier that represents the original request 
+		from the SCSI Application Layer client.
+	*/
+	
+	SCSITaskIdentifier	GetSCSITaskIdentifier ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetTargetIdentifier
+		@abstract Method to get the SCSITargetIdentifier associated with a 
+		request.
+		@discussion	Method to get the SCSITargetIdentifier associated with a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns SCSITargetIdentifier 
+	*/
+	
+	SCSITargetIdentifier	GetTargetIdentifier ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	// ---- Methods for Accessing data in the client's SCSI Task Object ----	
+	// Method to retrieve the LUN that identifies the Logical Unit whose Task
+	// Set to which this task is to be added.
+	
+	/*!
+		@function GetLogicalUnitNumber
+		@abstract Method to get the logical unit number associated with a 
+		request.
+		@discussion Method to get the logical unit number associated with a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns a valid 64-bit logical unit number.
+	*/
+	
+	SCSILogicalUnitNumber	GetLogicalUnitNumber ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetTaggedTaskIdentifier
+		@abstract Method to retrieve the SCSI Tagged Task Identifier of the 
+		task.  If the returned value is equal to kSCSIUntaggedTaskIdentifier,
+		then this task is untagged.  
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result an SCSITaskAttribute value.
+	*/
+	
+	SCSITaggedTaskIdentifier GetTaggedTaskIdentifier (
+							SCSIParallelTaskIdentifier	parallelTask );
+	
+	/*!
+		@function GetTaskAttribute
+		@abstract Method to retrieve the SCSI Task Attribute of the task 
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result an SCSITaskAttribute value.
+	*/
+	
+	SCSITaskAttribute		GetTaskAttribute (
+							SCSIParallelTaskIdentifier	parallelTask );
+	
+	/*!
+		@function GetCommandDescriptorBlockSize
+		@abstract Method to retrieve the size of the SCSI Command Descriptor 
+		Block (CDB).
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns the size of the SCSI Command Descriptor Block in bytes.
+	*/
+	
+	UInt8	GetCommandDescriptorBlockSize ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetCommandDescriptorBlock
+		@abstract Method to retrieve the SCSI Command Descriptor Block (CDB).
+		@discussion This will always return a 16 Byte CDB. If the Protocol Layer 
+		driver does not support 16 Byte CDBs, it will have to create a local 
+		SCSICommandDescriptorBlock variable to get the CDB data and then 
+		transfer the needed bytes from there.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param cdbData is a SCSICommandDescriptorBlock pointer to 16 byte CDB
+		@result returns true if data was copied to cdbData pointer
+	*/
+	
+	bool	GetCommandDescriptorBlock (
+							SCSIParallelTaskIdentifier 		parallelTask,
+							SCSICommandDescriptorBlock * 	cdbData );
+	
+	/*!
+		@function GetDataTransferDirection
+		@abstract Retrieves the data transfer direction for any data associated
+		with the request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result One of the valid data transfer directions described in 
+		<IOKit/scsi/SCSITask.h>
+	*/
+	
+	UInt8	GetDataTransferDirection ( SCSIParallelTaskIdentifier parallelTask );
+	
+	/*!
+		@function GetRequestedDataTransferCount
+		@abstract Retrieves the requested data transfer count for any data 
+		associated with the request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result The requested data transfer count in bytes.
+	*/
+	
+	UInt64	GetRequestedDataTransferCount ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetRealizedDataTransferCount
+		@abstract Retrieves the realized data transfer count for any data 
+		associated with the request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result The realized data transfer count in bytes.
+	*/
+	
+	UInt64	GetRealizedDataTransferCount (
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function SetRealizedDataTransferCount
+		@abstract Sets the realized data transfer count in bytes.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param realizedTransferCountInBytes is the number of bytes actually 
+		transferred.
+		@result true means the data transfer count was successfully set.
+	*/
+	
+	bool	SetRealizedDataTransferCount ( 
+							SCSIParallelTaskIdentifier 	parallelTask,
+							UInt64 		realizedTransferCountInBytes );
+	
+	/*!
+		@function IncrementRealizedDataTransferCount
+		@abstract Increments the realized data transfer count. This method is
+		helpful for when the HBA has to do multiple passes of DMA because there 
+		are more scatter-gather elements than it can process in one pass.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param realizedTransferCountInBytes is the number of bytes to add to the
+		realized data count for the task.
+	*/
+	
+	void	IncrementRealizedDataTransferCount (
+							SCSIParallelTaskIdentifier 	parallelTask,
+							UInt64 		realizedTransferCountInBytes );
+	
+	/*!
+		@function GetDataBuffer
+		@abstract Method to retrieve client buffer from the request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns pointer to an IOMemoryDescriptor which represents the 
+		buffer.
+	*/
+	
+	IOMemoryDescriptor * GetDataBuffer ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetDataBufferOffset
+		@abstract Method to retrieve offset into client buffer at which to start
+		processing.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns offset in bytes
+	*/
+	
+	UInt64	GetDataBufferOffset ( SCSIParallelTaskIdentifier parallelTask );
+
+	/*!
+		@function GetDMACommand
+		@abstract Method to retrieve a pointer to an IODMACommand from the request.
+		@discussion For devices utilizing DMA, the IODMACommand object should be 
+		obtained via GetDMACommand(). The subclass is responsible for calling prepare()
+		on the IODMACommand object using the proper offset obtained via GetDataBufferOffset()
+		and correct size obtained via GetRequestedDataTransferCount(). The subclass
+		is further responsible for calling complete() on the IODMACommand object once
+		all DMA operations have finished.
+		NB: Subclasses should not call IODMACommand::setMemoryDescriptor().
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns pointer to an IODMACommand which is used in conjunction
+		with the task.
+	*/
+	
+	IODMACommand * GetDMACommand ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetTimeoutDuration
+		@abstract Method to retrieve the timeout duration in milliseconds for a 
+		request.
+		@discussion Method to retrieve the timeout duration in milliseconds for
+		a request. A value of zero represents an infinite timeout, or on 
+		hardware where infinite timeouts are not possible, substitute the 
+		longest timeout possible.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns timeout duration in milliseconds
+	*/
+	
+	UInt32	GetTimeoutDuration ( SCSIParallelTaskIdentifier parallelTask );
+
+	/*!
+		@function SetAutoSenseData
+		@abstract Method to set the auto sense data buffer associated with a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param newSensedata pointer to auto sense data buffer
+		@result returns true if data in newSenseData was succesfully into the 
+		task object
+	*/
+	
+	bool	SetAutoSenseData ( 
+							SCSIParallelTaskIdentifier 	parallelTask,
+							SCSI_Sense_Data * 			newSenseData,
+							UInt8						senseDataSize );
+	
+	/*!
+		@function GetAutoSenseData
+		@abstract Method to retrieve auto sense data buffer associated with a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param receivingBuffer pointer to auto sense data buffer
+		@result returns true if successfully copied data into receivingBuffer
+	*/
+	
+ 	bool	GetAutoSenseData ( 
+ 							SCSIParallelTaskIdentifier 	parallelTask,
+ 							SCSI_Sense_Data * 			receivingBuffer,
+ 							UInt8						senseDataSize );
+ 	
+	/*!
+		@function GetAutoSenseDataSize
+		@abstract Method to retrieve auto sense data buffer size associated with a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns Size of auto sense data buffer.
+	*/
+	
+ 	UInt8	GetAutoSenseDataSize ( 
+ 							SCSIParallelTaskIdentifier 	parallelTask );
+ 	
+	
+	/*!
+		@function GetSCSIParallelFeatureNegotiation
+		@abstract Method to retrieve the requested value for negotiation of the.
+		@discussion Query as to whether the SCSI Parallel Device object has 
+		negotiated wide data transfers.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result A valid SCSIParallelFeatureControl.
+	*/
+	
+	SCSIParallelFeatureRequest		GetSCSIParallelFeatureNegotiation ( 
+							SCSIParallelTaskIdentifier 	parallelTask,
+							SCSIParallelFeature 		requestedFeature );
+	
+	/*!
+		@function GetSCSIParallelFeatureNegotiationCount
+		@abstract Method to retrieve the number of requested negotiations.
+		@discussion Query as to the number of SCSI Parallel Features that are
+		requested to either be negotitated or cleared.  These are all features
+		that are set to either kSCSIParallelFeature_AttemptNegotiation or 
+		kSCSIParallelFeature_ClearNegotiation.  If the return value is zero,
+		then all features are set to kSCSIParallelFeature_NoNegotiation
+		and all feature negotiations are to remain as they currently exist.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result an unsigned integer up to 64 bits in size.
+	*/
+	
+	UInt64		GetSCSIParallelFeatureNegotiationCount ( 
+							SCSIParallelTaskIdentifier 	parallelTask);
+	
+	/*!
+		@function SetSCSIParallelFeatureNegotiationResult
+		@abstract Method to set the wide data transfer negotiation result.
+		@discussion Method to set the wide data transfer negotiation result.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param requestedFeature The SCSIParallelFeature that the has been set to 	
+		newResult.
+		@param newResult A valid SCSIParallelFeatureResult value.
+	*/
+	
+	void		SetSCSIParallelFeatureNegotiationResult ( 
+							SCSIParallelTaskIdentifier 	parallelTask,
+							SCSIParallelFeature 		requestedFeature, 
+							SCSIParallelFeatureResult 	newResult );
+	
+	/*!
+		@function GetSCSIParallelFeatureNegotiationResult
+		@abstract Method to retrieve the result of any wide transfer 
+		negotiations.
+		@discussion Query as to whether the SCSI Parallel Controller object has 
+		negotiated wide data transfers.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result A valid SCSIParallelFeatureResult.
+	*/
+	
+	SCSIParallelFeatureResult		GetSCSIParallelFeatureNegotiationResult ( 
+							SCSIParallelTaskIdentifier 	parallelTask,
+							SCSIParallelFeature 		requestedFeature );
+	
+	/*!
+		@function GetSCSIParallelFeatureNegotiationResultCount
+		@abstract Method to retrieve the number of changed negotiations.
+		@discussion Query as to the number of SCSI Parallel Features that have
+		been changed to either negotitated or cleared.  These are all features
+		that are set to either kSCSIParallelFeature_NegotitiationCleared or 
+		kSCSIParallelFeature_NegotitiationSuccess.  If the return value is zero,
+		then all features are set to kSCSIParallelFeature_NegotitiationUnchanged.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result an unsigned integer up to 64 bits in size.
+	*/
+	
+	UInt64		GetSCSIParallelFeatureNegotiationResultCount ( 
+							SCSIParallelTaskIdentifier 	parallelTask);
+	
+	// Controller Task Identifier related member routines
+	
+	/*!
+		@function SetControllerTaskIdentifier
+		@abstract Method to set the Controller Task Identifier.
+		@discussion This method allows the Controller Child Class
+		driver to set a unique identifier to associate with the specified
+		SCSI Parallel Task.  This identifier is designed to be used by
+		controllers that do not have access to the LUN and Tag information
+		when notified by the HBA that a request has completed.
+		If the kSCSIParallelTaskControllerIDQueueHead is used, this
+		member routine will return the first Task on the queue.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param newIdentifier unsigned 64 bit integer token.
+		@result none
+	*/
+	
+	void	SetControllerTaskIdentifier (
+							SCSIParallelTaskIdentifier 	parallelTask,
+							UInt64 						newIdentifier );
+	
+	UInt64	GetControllerTaskIdentifier (
+							SCSIParallelTaskIdentifier 	parallelTask);
+	
+	
+	// The HBA Data related fields
+	
+	/*!
+		@function GetHBADataSize
+		@abstract Method to retrieve the HBA Data Size in bytes.
+		@discussion Method to retrieve the HBA Data Size in bytes.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns HBA Data size in bytes.
+	*/
+	
+	UInt32	GetHBADataSize ( SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetHBADataPointer
+		@abstract Method to retrieve the HBA Data pointer.
+		@discussion Method to retrieve the HBA Data pointer.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns pointer to buffer for HBA specific data, NULL if 
+		none found or GetHBADataSize() returns zero.
+	*/
+	
+	void *	GetHBADataPointer ( SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetHBADataDescriptor
+		@abstract Method to retrieve the IOMemoryDescriptor associated with
+		the HBA Data.
+		@discussion Method to retrieve the IOMemoryDescriptor associated with
+		the HBA Data.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns pointer to an IOMemoryDescriptor that wraps the HBA 
+		specific data buffer, NULL if none found or GetHBADataSize() returns zero.
+	*/
+	
+	IOMemoryDescriptor *	GetHBADataDescriptor (
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	// ---- SCSI Parallel Device Object Accessors ----
+	
+	// The HBA Data related fields
+	
+	/*!
+		@function GetHBATargetDataSize
+		@abstract Method to retrieve the HBA Data Size in bytes.
+		@discussion Method to retrieve the HBA Data Size in bytes.
+		@param targetDevice A valid SCSITargetIdentifier.
+		@result returns HBA Data size in bytes.
+	*/
+	
+	UInt32	GetHBATargetDataSize ( SCSITargetIdentifier 	targetID );
+	
+	/*!
+		@function GetHBATargetDataPointer
+		@abstract Method to retrieve the HBA Data pointer.
+		@discussion Method to retrieve the HBA Data pointer.
+		@param targetDevice A valid SCSITargetIdentifier.
+		@result returns pointer to buffer for HBA specific data, NULL if 
+		none found or GetHBADataSize is zero.
+	*/
+	
+	void *	GetHBATargetDataPointer ( SCSITargetIdentifier 	targetID );
+	
+	
+#if 0
+#pragma mark -
+#pragma mark Additional Child Class APIs
+#endif
+	
+	
+	// ---- Timeout Related Methods ----
+	
+	/*!
+		@function SetTimeoutForTask
+		@abstract Method to set the timeout duration in milliseconds for a 
+		request.
+		@discussion Method to set the timeout duration in milliseconds for a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param timeoutOverride A timeout value in milliseconds in case the
+		HBA driver wishes to override the default value provided in the
+		parallelTask.
+	*/
+	
+	void	SetTimeoutForTask ( SCSIParallelTaskIdentifier 	parallelTask,
+								UInt32						timeoutOverride = 0 );
+	
+	/*!
+		@function HandleTimeout
+		@abstract Method to handle command timeouts.
+		@discussion Method to handle command timeouts. This should
+		be overridden by the child class in order to clean up HBA
+		specific structures after a timeout has occurred. This method
+		is called on the workloop (it holds the gate).
+		@param parallelRequest A valid SCSIParallelTaskIdentifier.
+	*/
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 9 );
+	
+	virtual void		HandleTimeout (
+							SCSIParallelTaskIdentifier parallelRequest );
+	
+	
+	// ---- Filter Interrupt ----
+	
+	/*!
+		@function FilterInterruptRequest
+		@abstract Filter method called at primary interrupt time.
+		@discussion Filter method called at primary interrupt time.
+		This should only be overridden by the child class in order
+		to determine if an interrupt occurred for this controller instance.
+		Since all work occurs at primary interrupt time, this routine
+		should be quick and efficient and defer as much processing as
+		possible to the HandleInterruptRequest() method.
+		
+		NOTE: Unlike the HandleInterruptRequest() and HandleTimeout()
+		methods, FilterInterruptRequest() is NOT called with the
+		workloop lock held.
+		
+		If the value returned by FilterInterruptRequest() is true, the
+		secondary interrupt thread will be scheduled and the hardware
+		interrupt line will be disabled. If the controller instance shares
+		that interrupt line with other devices, it can cause large
+		interrupt latencies. If the controller instance can disable the
+		interrupt in the chip itself, the following can be done to reduce
+		interrupt latencies:
+		
+		- Interrupt occurs
+		- FilterInterruptRequest() method is called.
+			- If the interrupt is not for this controller, return false
+			  immediately.
+			- If the interrupt is for this controller, and the controller
+			  can disable interrupts for this chip, the controller should
+			  disable the interrupts for this chip, call SignalInterrupt(),
+			  and return false. This causes the secondary interrupt thread
+			  to get scheduled, yet does not disable the interrupt line for
+			  all devices tied to that interrupt. This effectively allows
+			  other devices to process their interrrupts, thus reducing
+			  interrupt latency for those devices.
+		- HandleInterruptRequest() method is called.
+			- Controller processes interrupt and completes I/O requests.
+			- Controller re-enables interrupts for the device.
+		
+		NOTE: If you use this approach, the interrupting condition MUST be
+		cleared from the hardware, otherwise an infinite process interrupt
+		loop will occur.
+		
+		If the controller cannot disable interrupts on the chip, it should
+		simply return true if an interrupt has occurred for its device.
+		
+		@result True if the hardware interrupt line should be disabled,
+		otherwise false.
+	*/
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 10 );
+	
+	virtual bool		FilterInterruptRequest ( void );
+	
+	/*!
+		@function InitializeDMASpecification
+		@abstract Called to initialize an IODMACommand with a DMA specification.
+		@param command A pointer to a valid IODMACommand object. Subclasses
+		should override this method and call IODMACommand::initWithSpecification()
+		supplying the proper arguments to that method based on the DMA strategy.
+		@result boolean value indicating success or failure.
+	*/
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 11 );
+	
+	virtual bool	InitializeDMASpecification ( IODMACommand * command );
+	
+	/*!
+		@function CreateDeviceInterrupt
+		@abstract Called to create an IOInterruptEventSource for the device. Subclasses
+		may wish to use a different interrupt index than 0 (e.g. for using PCI Message
+		Signaled Interrupts) or might not need an interrupt at all (virtual HBA).
+		@param action A pointer to the action routine that should be passed to either
+		IOInterruptEventSource::interruptEventSource() or
+		IOFilterInterruptEventSource::filterInterruptEventSource as the method to call
+		when an interrupt occurs for the device (sometimes called the "deferred procedure call"
+		or the "secondary context method". By passing this routine along, it will
+		properly wire up the HandleInterruptRequest() method you should override to handle
+		interrupts.
+		@param filter A pointer to the filter routine that should be passed to
+		IOFilterInterruptEventSource::filterInterruptEventSource as the method to call
+		at primary interrupt time when an interrupt occurs for the device.
+		By passing this routine along, it will properly wire up the
+		FilterInterruptRequest() method you may override to handle primary interrupts.
+		@result IOInterruptEventSource. May return NULL if and only if there is no
+		hardware interrupt associated with this device.
+	*/
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 12 );
+	
+	virtual IOInterruptEventSource *	CreateDeviceInterrupt (
+											IOInterruptEventSource::Action			action,
+											IOFilterInterruptEventSource::Filter	filter,
+											IOService *								provider );
+	
+	// Padding for the Child Class API
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 16 );
+	
+	
+#if 0
+#pragma mark -
+#pragma mark Internal Use Only
+#endif
+	
+private:
+	
+	// binary compatibility instance variable expansion
+	struct ExpansionData { };
+	ExpansionData * fIOSCSIParallelInterfaceControllerExpansionData;
+	
+	IOService *					fProvider;
+	OSSet *						fClients;
+	
+	static SInt32				fSCSIParallelDomainCount;
+	SInt32						fSCSIDomainIdentifier;
+	
+	// The HBA attributes
+	SCSIInitiatorIdentifier		fInitiatorIdentifier;
+	
+	// The maximum SCSI Device Identifier support by the HBA
+	// This is retreived from the child class via the 
+	SCSIDeviceIdentifier		fHighestSupportedDeviceID;
+	
+	// The total number of tasks that the HBA can proccess at a time.
+	// This is retrieved from the child class via ReportMaximumTaskCount
+	UInt32						fSupportedTaskCount;
+	
+	// The Number of requests that are currently outstanding for the current
+	// instantiation.
+	UInt16						fOutstandingRequests;
+	
+	// The member variable to indicate if the current instantiation has been
+	// succesfully intialized.
+	bool						fHBAHasBeenInitialized;
+	
+	// The member variable to indicate if the current instantiation is running.
+	// A true means that the last or only Start call made was successful.  A
+	// false value means that either a successful Start has not been made or a
+	// Stop call has been made.
+	bool						fHBACanAcceptClientRequests;
+	
+	// The pool for the available SCSI Parallel Task objects
+	IOCommandPool *				fParallelTaskPool;
+	
+	// WorkLoop variables
+	IOWorkLoop *				fWorkLoop;
+	IOTimerEventSource *		fTimerEvent;
+	IOInterruptEventSource *	fDispatchEvent;
+	
+	IOCommandGate *				fControllerGate;
+	
+	bool						AllocateSCSIParallelTasks ( void );
+	void						DeallocateSCSIParallelTasks ( void );
+	
+	IOWorkLoop *				getWorkLoop ( void ) const;
+	bool 						CreateWorkLoop ( IOService * provider );
+	void 						ReleaseWorkLoop ( void );
+	
+	// SCSI Parallel Device List
+	// The SCSI Parallel Device List will consist of 16 elements to represent 
+	// identifiers that end in 0h through Fh.  Each array element will point
+	// to a device object that represents the beginning of a linked list of
+	// device objects.  By using an array of linked lists, the traversal time
+	// to find an object on a bus that supports a large number of devices, such
+	// as Fibre Channel, will be significantly lower than having to walk a list 
+	// that is comprised of all devices on the bus.  For parallel wide and 
+	// narrow busses, which support 16 and 8 devices respectively, this will act 
+	// like a simple array of device objects.
+	enum
+	{
+		kSCSIParallelDeviceListArrayCount 	= 16,
+		kSCSIParallelDeviceListIndexMask	= 0x0F
+	};
+	
+	IOSimpleLock * 					fDeviceLock;
+	IOSCSIParallelInterfaceDevice *	
+					fParallelDeviceList[kSCSIParallelDeviceListArrayCount];
+	
+	void			InitializeDeviceList ( void );
+	void			AddDeviceToTargetList ( 
+							IOSCSIParallelInterfaceDevice *	newDevice );
+	void			RemoveDeviceFromTargetList ( 
+							IOSCSIParallelInterfaceDevice * victimDevice );
+	
+	// The Interrupt Service Routine for the controller.
+	static void		ServiceInterrupt (
+							OSObject *					theObject, 
+							IOInterruptEventSource *	theSource,
+							int							count );
+	
+	static void		TimeoutOccurred ( OSObject * owner, IOTimerEventSource * sender );
+	
+	static bool		FilterInterrupt (
+							OSObject *						theObject,
+							IOFilterInterruptEventSource *	theSource );
+	
+	// IOService support methods
+	// These shall not be overridden by the HBA child classes.
+	bool			start ( IOService * 				provider );
+	void			stop ( 	IOService *  				provider );
+
+
+protected:
+	
+	// These may be overriden by the HBA child classes if necessary, but should
+	// call the superclass implementation.
+	virtual bool	handleOpen ( 
+							IOService * 				client, 
+							IOOptionBits 				options, 
+							void * 						arg );
+
+	virtual void	handleClose ( 
+							IOService * 				client, 
+							IOOptionBits 				options );
+
+	virtual bool	handleIsOpen ( 
+							const IOService * 			client ) const;
+	
+	virtual bool	willTerminate ( IOService * provider, IOOptionBits options );
+	virtual bool	didTerminate ( IOService * provider, IOOptionBits options, bool * defer );
+	
+};
+
+
+#endif	/* __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__ */
\ No newline at end of file
diff --git a/i386/include/IOKit/scsi/spi/IOSCSIParallelInterfaceController.h b/i386/include/IOKit/scsi/spi/IOSCSIParallelInterfaceController.h
new file mode 100644
index 0000000..0bd7981
--- /dev/null
+++ b/i386/include/IOKit/scsi/spi/IOSCSIParallelInterfaceController.h
@@ -0,0 +1,1568 @@
+/*
+ * Copyright (c) 2002-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__
+#define __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__
+
+
+ /*!
+  @header IOSCSIParallelInterfaceController
+	The IOSCSIParallelInterfaceController class and the associated HBA child
+	class is responsible for the management of all related hardware. This
+	includes the onboard HBA controller chip and the physical state of the
+	bus. These classes are not responsible for any of the management of
+	the SCSI Devices on the bus with the exception of maintaining the queue that 
+	holds the objects representing those SCSI Devices.
+*/
+
+
+//-----------------------------------------------------------------------------
+//	Includes
+//-----------------------------------------------------------------------------
+
+// General IOKit includes
+#include <IOKit/IOService.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IODMACommand.h>
+#include <IOKit/IOInterruptEventSource.h>
+#include <IOKit/IOFilterInterruptEventSource.h>
+#include <IOKit/IOTimerEventSource.h>
+#include <IOKit/IOCommandPool.h>
+
+// IOKit SCSI ArchitectureModel Family includes
+#include <IOKit/scsi/SCSITask.h>
+#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
+#include <IOKit/scsi/SCSIPort.h>
+
+//-----------------------------------------------------------------------------
+//	Constants
+//-----------------------------------------------------------------------------
+
+
+#define kIOPropertySCSIDeviceFeaturesKey			"SCSI Device Features"
+#define kIOPropertySCSI_I_T_NexusFeaturesKey		"SCSI I_T Nexus Features"
+
+// This is the alignment mask used when allocating per-task HBA data. It allows
+// the HBA to declare whether or not it supports 64-bit addressability and what the
+// minimum byte alignment is for the data. E.g. By specifying 0x0000FFFFFFFFFFFEULL,
+// the controller would be indicating that it supports 48-bits of addressability, but
+// at a minimum of being 2-byte aligned.
+#define kIOMinimumHBADataAlignmentMaskKey			"HBA Data Alignment"
+
+// The Feature Selectors used to identify features of the SCSI Parallel
+// Interface.  These are used by the DoesHBASupportSCSIParallelFeature
+// to report whether the HBA supports a given SCSI Parallel Interface
+// feature and are used for requesting negotiation and reporting negotiation
+// results between the controller and the device.
+
+// When the DoesHBASupportSCSIParallelFeature() member routine of the controller 
+// child class is called, it will return true if the HBA that it controls 
+// supports the specified SCSIParallelFeature or false if it does not.
+typedef enum SCSIParallelFeature
+{
+	// The selector for support of Wide Data Transfers.  Only Wide16 is supported 
+	// as Wide32 has been obsoleted by the SPI-3 specification.
+	kSCSIParallelFeature_WideDataTransfer 					= 0,
+	
+	// The selector for support of Synchronous Data Transfers.
+	kSCSIParallelFeature_SynchronousDataTransfer 			= 1,
+	
+	// The selector for support of Quick Arbitration and Selection (QAS).
+	kSCSIParallelFeature_QuickArbitrationAndSelection 		= 2,
+	
+	// The selector for support of Double Transition (DT) data transfers.
+	kSCSIParallelFeature_DoubleTransitionDataTransfers 		= 3,
+	
+	// The selector for SPI Information Unit (IU) transfers.
+	kSCSIParallelFeature_InformationUnitTransfers 			= 4,
+	
+	// Since the Feature selectors are zero base, this will always have the 
+	// correct total.
+	kSCSIParallelFeature_TotalFeatureCount	
+} SCSIParallelFeature;
+
+
+typedef enum SCSIParallelFeatureRequest
+{
+	// This selector indicates that current negotiation 
+	// should be used. 
+	kSCSIParallelFeature_NoNegotiation 			= 0,
+	
+	// This selector indicates that the controller
+	// should attempt negotiation for the feature
+	kSCSIParallelFeature_AttemptNegotiation 	= 1,
+	
+	// This selector indicates that the controller
+	// should clear any negotiation for the feature
+	kSCSIParallelFeature_ClearNegotiation 		= 2
+};
+	
+typedef enum SCSIParallelFeatureResult
+{
+	kSCSIParallelFeature_NegotitiationUnchanged	= 0,
+	kSCSIParallelFeature_NegotitiationCleared	= 1,
+	kSCSIParallelFeature_NegotitiationSuccess	= 2
+};
+
+
+// The SCSI Message Codes used for MESSAGE IN and MESSAGE OUT phases.
+enum SCSIParallelMessages
+{
+	// Link Control Messages
+	kSCSIParallelMessage_TASK_COMPLETE						= 0x00,
+	kSCSIParallelMessage_EXTENDED_MESSAGE					= 0x01,
+	kSCSIParallelMessage_SAVE_DATA_POINTER	 				= 0x02,
+	kSCSIParallelMessage_RESTORE_POINTERS					= 0x03,
+	kSCSIParallelMessage_DISCONNECT							= 0x04,
+	kSCSIParallelMessage_INITIATOR_DETECTED_ERROR 			= 0x05,
+	kSCSIParallelMessage_MESSAGE_REJECT		 				= 0x07,
+	kSCSIParallelMessage_NO_OPERATION		 				= 0x08,
+	kSCSIParallelMessage_MESSAGE_PARITY_ERROR 				= 0x09,
+	kSCSIParallelMessage_IGNORE_WIDE_RESIDUE				= 0x23,
+	kSCSIParallelMessage_QAS_REQUEST		 				= 0x55,
+	kSCSIParallelMessage_IDENTIFY							= 0x80,
+	
+	// The Message Codes used in the EXTENDED_MESSAGE message.
+	kSCSIParallelMessage_MODIFY_DATA_POINTER				= 0x00,
+	kSCSIParallelMessage_SYNCHONOUS_DATA_TRANSFER_REQUEST	= 0x01,
+	// Reserved												= 0x02
+	kSCSIParallelMessage_WIDE_DATA_TRANSFER_REQUEST			= 0x03,
+	kSCSIParallelMessage_PARALLEL_PROTOCOL_REQUEST			= 0x04,
+	// Reserved												= 0x05 through 0xFF
+	
+	// Task Attribute Message Codes
+	kSCSIParallelMessage_ACA								= 0x24,
+	kSCSIParallelMessage_HEAD_OF_QUEUE						= 0x21,
+	kSCSIParallelMessage_LINKED_COMMAND_COMPLETE			= 0x0A,
+	kSCSIParallelMessage_ORDERED							= 0x22,
+	kSCSIParallelMessage_SIMPLE								= 0x20,
+	
+	// Task Management Message Codes
+	kSCSIParallelMessage_ABORT_TASK							= 0x0D,
+	kSCSIParallelMessage_ABORT_TASK_SET						= 0x06,
+	kSCSIParallelMessage_CLEAR_ACA							= 0x16,
+	kSCSIParallelMessage_CLEAR_TASK_SET						= 0x0E,
+	kSCSIParallelMessage_LOGICAL_UNIT_RESET					= 0x17,
+	kSCSIParallelMessage_TARGET_RESET						= 0x0C
+};
+
+enum
+{
+	kSCSIParallelTaskControllerIDQueueHead 		= 0
+};
+
+// Notifications
+enum
+{
+	kSCSIControllerNotificationBusReset			= 0x68000000
+};
+
+// Forward declaration for the internally used Parallel Device object.
+class IOSCSIParallelInterfaceDevice;
+
+// This is the identifier that is used to specify a given parallel Task.
+typedef OSObject *	SCSIParallelTaskIdentifier;
+
+
+//-----------------------------------------------------------------------------
+//	Class Declarations
+//-----------------------------------------------------------------------------
+
+/*! @class IOSCSIParallelInterfaceController
+	@abstract Class that represents a SCSI Host Bus Adapter.
+	@discussion Class that represents a SCSI Host Bus Adapter.
+*/
+class IOSCSIParallelInterfaceController : public IOService
+{
+	
+	OSDeclareAbstractStructors ( IOSCSIParallelInterfaceController )
+	
+#if 0
+#pragma mark -
+#pragma mark Client API
+#endif
+	
+	
+public:
+	
+	/*!
+		@function GetSCSIParallelTask
+		@abstract Method to allow the client to get a SCSIParallelTask
+		@discussion Get a SCSIParallelTask from the controller so that a request
+		can be issued to the HBA driver.
+		@param blockForCommand If the blockForCommand parameter is set to false
+		and there are no free SCSIParallelTasks, this method will return NULL, 
+		otherwise it will wait for one to become available before returning.
+		@result If there is a SCSI Parallel Task available, a reference to it 
+		will be returned.
+	*/
+	
+	SCSIParallelTaskIdentifier	GetSCSIParallelTask ( bool blockForCommand );
+	
+	/*!
+		@function FreeSCSIParallelTask
+		@abstract Method to allow the client to release a SCSIParallelTask
+		@discussion	The FreeSCSIParallelTask method is called by the client when 
+		a SCSIParallelTask has been completed and the associated returnTask
+		needs to be returned to the pool.
+		@param returnTask is a reference to the SCSIParallelTaskIdentifier to be 
+		returned.
+	*/
+	
+	void FreeSCSIParallelTask ( SCSIParallelTaskIdentifier returnTask );
+	
+	/*!
+		@function FindTaskForAddress
+		@abstract Find a task for a given Task Address, if one exists.
+		@discussion If a valid Tagged Task Identifier is specified, this method 
+		will return the task specified by the Tagged Task Address if one is 
+		found, or else NULL will be returned.  If zero is used as the Tagged 
+		Task Identifier, then this routine will search for an outstanding task 
+		based on the Untagged Task Address and return the task or else, if one 
+		is not found, return NULL.
+		@param theT is the Target component of the I_T_L or I_T_L_Q nexus.
+		@param theL is the Logical Unit component of the I_T_L or I_T_L_Q nexus.
+		@param theQ is the Queue Tag component of the I_T_L_Q nexus.  If this is
+		an I_T_L nexus, then the kSCSIUntaggedTaskIdentifier constant should be
+		used for theQ.
+		@result returns a valid SCSIParallelTaskIdentifier or NULL if none 
+		found.
+	*/
+	
+	SCSIParallelTaskIdentifier	FindTaskForAddress ( 
+							SCSIDeviceIdentifier 		theT,
+							SCSILogicalUnitNumber		theL,
+							SCSITaggedTaskIdentifier	theQ );
+	
+	
+	/*!
+		@function FindTaskForControllerIdentifier
+		@abstract Find a task for a given Target and Controller Task Identifier
+		@discussion Allows the controller child class to find an outstanding task
+		for a specified target and controller task identifier
+		@param theTarget is the Target that the task .
+		@param theIdentifier is the controller task identifier set using the SCSI
+		Parallel Task's SetControllerTaskIdentifier() method.
+		@result returns a valid SCSIParallelTaskIdentifier or NULL if none 
+		found.
+	*/
+	
+	SCSIParallelTaskIdentifier	FindTaskForControllerIdentifier ( 
+							SCSIDeviceIdentifier 		theTarget,
+							UInt64						theIdentifier );
+	
+	
+	/*!
+		@function ExecuteParallelTask
+		@abstract Submit a SCSIParallelTask for execution.
+		@discussion	The ExecuteParallelTask call is made by the client to submit 
+		a SCSIParallelTask for execution.
+		@param parallelRequest is a reference to the SCSIParallelTaskIdentifier
+		to be executed.
+		@result is an appropriate SCSIServiceResponse which are defined in the
+		file <IOKit/scsi/SCSITask.h>.
+	*/
+	
+	SCSIServiceResponse ExecuteParallelTask ( 
+							SCSIParallelTaskIdentifier	parallelRequest );
+	
+	// --- Public API methods provided by HBA child classes ----
+	
+	/*!
+		@function ReportHBAHighestLogicalUnitNumber
+		@abstract Gets the Highest Logical Unit Number.
+		@discussion	This method is used to query the HBA child class to 
+		determine what the highest Logical Unit Number that the controller can 
+		address.
+		@result returns a valid 64-bit logical unit number.
+	*/
+	
+	virtual SCSILogicalUnitNumber	ReportHBAHighestLogicalUnitNumber ( void ) = 0;
+	
+	/*!
+		@function DoesHBASupportSCSIParallelFeature
+		@abstract Queries the HBA child class to determine if it supports a 
+		specific SPI feature.
+		@discussion	Queries the HBA child class to determine if it supports the 
+		specified feature as defined by the SCSI Parallel Interconnect 
+		specifications.
+		@result Returns true if requested feature is supported.
+	*/
+	
+	virtual bool	DoesHBASupportSCSIParallelFeature ( 
+							SCSIParallelFeature 		theFeature ) = 0;
+	
+	/*!
+		@function InitializeTargetForID
+		@abstract Called to initialize a target device.
+		@discussion	This method will be called to initialize a target device in 
+		a single-threaded manner.  The HBA can use this method to probe the 
+		target or do anything else necessary before the device object is 
+		registered with IOKit for matching.
+		@result Returns true if the target was successfully initialized.
+	*/
+	
+	virtual bool	InitializeTargetForID (  
+							SCSITargetIdentifier 		targetID ) = 0;
+	
+	// The SCSI Task Management Functions as defined in the SCSI Architecture
+	// Model - 2 (SAM-2) specification.  These are used by the client to request
+	// the specified function.  The controller can complete these immmediately 
+	// by returning the appropriate SCSIServiceResponse, or these can be completed
+	// asyncronously by the controller returning a SCSIServiceResponse of
+	// kSCSIServiceResponse_Request_In_Process and then calling the appropriate
+	// function complete member routine listed in the child class API section.
+	
+	virtual SCSIServiceResponse	AbortTaskRequest ( 	
+							SCSITargetIdentifier 		theT,
+							SCSILogicalUnitNumber		theL,
+							SCSITaggedTaskIdentifier	theQ ) = 0;
+	
+	virtual	SCSIServiceResponse AbortTaskSetRequest (
+							SCSITargetIdentifier 		theT,
+							SCSILogicalUnitNumber		theL ) = 0;
+	
+	virtual	SCSIServiceResponse ClearACARequest (
+							SCSITargetIdentifier 		theT,
+							SCSILogicalUnitNumber		theL ) = 0;
+	
+	virtual	SCSIServiceResponse ClearTaskSetRequest (
+							SCSITargetIdentifier 		theT,
+							SCSILogicalUnitNumber		theL ) = 0;
+	
+	virtual	SCSIServiceResponse LogicalUnitResetRequest (
+							SCSITargetIdentifier 		theT,
+							SCSILogicalUnitNumber		theL ) = 0;
+	
+	virtual	SCSIServiceResponse TargetResetRequest (
+							SCSITargetIdentifier 		theT ) = 0;
+	
+	
+
+	/*!
+		@function DoesHBAPerformAutoSense
+		@abstract Queries the HBA child class to determine if it automatically
+		performs AutoSense and provides AutoSense data for each I/O. If the HBA
+		allocates space for AutoSense in its HBA specific data region on a per
+		task basis, the HBA should respond true.
+		@discussion	Queries the HBA child class to determine if it automatically
+		performs AutoSense and provides AutoSense data for each I/O. If the HBA
+		allocates space for AutoSense in its HBA specific data region on a per
+		task basis, the HBA should respond true.
+		@result Return true if HBA performs AutoSense into its own private data
+		buffer.
+	*/
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 1 );
+	
+	virtual bool	DoesHBAPerformAutoSense ( void );
+	
+	/*!
+		@function ReportHBAConstraints
+		@abstract Called to report the I/O constraints for this controller.
+		A list of valid keys includes:
+			kIOMaximumSegmentCountReadKey, (required)
+			kIOMaximumSegmentCountWriteKey, (required)
+			kIOMaximumSegmentByteCountReadKey, (required)
+			kIOMaximumSegmentByteCountWriteKey, (required)
+			kIOMinimumSegmentAlignmentByteCountKey, (required)
+			kIOMaximumSegmentAddressableBitCountKey, (required)
+			kIOMinimumHBADataAlignmentMaskKey (required).
+		NB: These keys and their values are described in this header and <IOKit/IOKitKeys.h>
+		@param constraints. An OSDictionary object used to aggregate the key/value pairs.
+		Subclasses must set the required keys if they override this method. If a subclass does
+		not provide the required keys, the system will panic.
+	*/
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 2 );
+	
+	virtual void	ReportHBAConstraints ( OSDictionary * constraints );
+	
+	// Padding for the Client API
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 3 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 4 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 5 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 6 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 7 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 8 );
+	
+	
+#if 0
+#pragma mark -
+#pragma mark Child Class API
+#endif
+	
+	
+protected:
+	
+	// ---- Target Creation and Destruction methods ---
+	
+	/*!
+		@function CreateTargetForID
+		@abstract Method to perform device creation.
+		@discussion	For HBA child classes that report true to the 
+		DoesHBAPerformDeviceManagement() method, the child class will be 
+		responsible for all device management by using these methods;
+		otherwise, the superclass will be responsible for all device management.
+		This method must be used to perform SCSI Parallel Device creation and 
+		cannot be overridden.
+		@param  targetID SCSIDeviceIdentifier of desired targetID.
+		@result returns true if successful.
+	*/
+	
+	bool	CreateTargetForID ( SCSIDeviceIdentifier targetID );
+	
+	 /*!
+		@function CreateTargetForID
+		@abstract Method to perform device creation.
+		@discussion	For HBA child classes that report true to the
+		DoesHBAPerformDeviceManagement() method, the child class will be
+		responsible for all device management by using these methods;
+		otherwise, the superclass will be responsible for all device management.
+		This method must be used to perform SCSI Parallel Device creation and
+		cannot be overridden.
+		@param  targetID SCSIDeviceIdentifier of desired targetID.
+		@param	properties A dictionary of properties to associate with the device
+				upon creation. The list of valid property keys is as follows:
+				kIOPropertySASAddressKey,
+				kIOPropertyFibreChannelNodeWorldWideNameKey,
+				kIOPropertyFibreChannelPortWorldWideNameKey,
+				kIOPropertyFibreChannelAddressIdentifierKey, and
+				kIOPropertyFibreChannelALPAKey.
+				These keys are defined in
+				<IOKit/storage/IOStorageProtocolCharacteristics.h> and the values
+				associated with these keys must be of the proper type/size,
+				or the target creation will not succeed.
+		@result returns true if successful.
+	*/
+	
+	bool	CreateTargetForID ( SCSIDeviceIdentifier 	targetID,
+								OSDictionary * 			properties );
+	
+	 /*!
+		@function DestroyTargetForID
+		@abstract Method to perform device destruction.
+		@discussion	For HBA child classes that report true to the 
+		DoesHBAPerformDeviceManagement() method, the child class will be 
+		responsible for all device management by using these methods; otherwise, 
+		the superclass will be responsible for all device management.
+		This method must be used to perform SCSI Parallel Device destruction and
+		cannot be overridden.
+		@param  targetID SCSIDeviceIdentifier of desired targetID.
+	*/
+	
+	void	DestroyTargetForID ( SCSIDeviceIdentifier targetID );
+	
+	/*!
+		@function GetTargetForID
+		@abstract Accessor for getting pointer to IOSCSIParallelInterfaceDevice.
+		@param targetID SCSIDeviceIdentifier of desired targetID.
+		@result returns pointer to IOSCSIParallelInterfaceDevice or NULL if not 
+		found.
+	*/
+	
+	IOSCSIParallelInterfaceDevice *	GetTargetForID ( 
+							SCSIDeviceIdentifier 		targetID ); 
+	
+	/*!
+		@function SetTargetProperty
+		@abstract Accessor for setting a property for a specific target.
+		@param device A pointer to a valid IOSCSIParallelInterfaceDevice.
+		@param key A pointer to a valid OSString object which represents the key.
+		A list of valid keys includes:
+			kIOPropertySASAddressKey,
+			kIOPropertyFibreChannelNodeWorldWideNameKey,
+			kIOPropertyFibreChannelPortWorldWideNameKey,
+			kIOPropertyFibreChannelAddressIdentifierKey, and
+			kIOPropertyFibreChannelALPAKey.
+		NB: These keys and their values are described in <IOKit/storage/IOStorageProtocolCharacteristics.h>
+		@param value Pointer to an OSObject (one of type OSData, OSString, etc.)
+		which represents the value for the property. The value must be of the proper type
+		and size for the specified key.
+		@result returns true if identifier was properly set, otherwise false. 
+	*/
+	
+	bool	SetTargetProperty ( SCSIDeviceIdentifier 		targetID,
+								const char *		 		key,
+								OSObject *					value );
+
+	/*!
+		@function RemoveTargetProperty
+		@abstract Accessor for removing a property from a specific target.
+		@param device A pointer to a valid IOSCSIParallelInterfaceDevice.
+		@param key A pointer to a valid OSString object which represents the key.
+	*/
+	
+	void	RemoveTargetProperty ( SCSIDeviceIdentifier 		targetID,
+								   const char *		 			key );
+	
+	// ---- Methods for HBA specifics. ----
+	
+	/*!
+		@function SetHBAProperty
+		@abstract Accessor for setting a property for this object.
+		@param key A pointer to a valid OSString object which represents the key.
+		A list of valid keys includes:
+			kIOPropertyVendorNameKey,
+			kIOPropertyProductNameKey,
+			kIOPropertyProductRevisionLevelKey,
+			kIOPropertyPortDescriptionKey,
+			kIOPropertyPortSpeedKey,
+			kIOPropertyPortTopologyKey,
+			kIOPropertySCSIParallelSignalingTypeKey,
+			kIOPropertyFibreChannelCableDescriptionKey,
+			kIOPropertyFibreChannelNodeWorldWideNameKey,
+			kIOPropertyFibreChannelPortWorldWideNameKey,
+			kIOPropertyFibreChannelAddressIdentifierKey, and
+			kIOPropertyFibreChannelALPAKey.
+		NB: These keys and their values are described in <IOKit/storage/IOStorageDeviceCharacteristics.h>
+		and <IOKit/storage/IOStorageProtocolCharacteristics.h>
+		@param value Pointer to an OSObject (one of type OSData, OSString, etc.)
+		which represents the value for the property. The value must be of the proper type,
+		and/or size for the specified key.
+		@result returns true if identifier was properly set, otherwise false. 
+	*/
+	
+	bool	SetHBAProperty ( const char *	key,
+							 OSObject *	 	value );
+
+	/*!
+		@function RemoveHBAProperty
+		@abstract Accessor for removing a property for this object.
+		@param key A pointer to a valid OSString object which represents the key.
+		See the SetHBAProperty() method for a list of valid keys.
+	*/
+	
+	void	RemoveHBAProperty ( const char * key );
+	
+	// These methods will not be called before the InitializeController() call,
+	// and will not be called after the TerminateController() call.  But in the
+	// interval between those calls, they shall report the correct requested
+	// information. They are implemented as seperate pure virtual methods
+	// instead of a selector driven method because the HBA child class is
+	// required to report this information.
+	
+	/*!
+		@function ReportInitiatorIdentifier
+		@abstract Get the SCSI Device Identifier for the HBA.
+		@discussion This method will be called to determine the SCSI Device 
+		Identifier that the Initiator has assigned for this HBA.
+		@result returns SCSIInitiatorIdentifier.
+	*/
+	
+	virtual SCSIInitiatorIdentifier	ReportInitiatorIdentifier ( void ) = 0;
+	
+	/*!
+		@function ReportHighestSupportedDeviceID
+		@abstract Get the highest supported SCSI Device Identifier.
+		@discussion This method will be called to determine the value of the 
+		highest SCSI Device Identifier supported by the HBA. This value will be 
+		used to determine the last ID to process.
+		@result returns highest SCSIDeviceIdentifier
+	*/
+	
+	virtual SCSIDeviceIdentifier	ReportHighestSupportedDeviceID ( void ) = 0;
+	
+	/*!
+		@function ReportMaximumTaskCount
+		@abstract Report Maximum Task Count
+		@discussion This method will be called to retrieve the maximum number of
+		outstanding tasks the HBA can process. This number must be greater than
+		zero or the controller driver will fail to match and load.
+		@result returns maximum (non-zero) task count.
+	*/
+	
+	virtual UInt32		ReportMaximumTaskCount ( void ) = 0;
+	
+  	/*!
+		@function ReportHBASpecificTaskDataSize
+		@abstract Determine memory needed for HBA Task specific use.
+		@discussion This method is used to retrieve the amount of memory that 
+		will be allocated in the SCSI Parallel Task for HBA specific use.
+		@result returns memory required in bytes
+	*/
+	
+	virtual UInt32		ReportHBASpecificTaskDataSize ( void ) = 0;
+	
+  	/*!
+		@function ReportHBASpecificDeviceDataSize
+		@abstract  Determine memory needed for HBA Device specific use.
+		@discussion This method is used to retrieve the amount of memory that 
+		will be allocated in the SCSI Parallel Device for HBA specific use.
+		@result  returns memory required in bytes
+	*/
+	
+	virtual UInt32		ReportHBASpecificDeviceDataSize ( void ) = 0;
+	
+  	/*!
+		@function DoesHBAPerformDeviceManagement
+		@abstract  Determine if HBA will manage devices.
+		@discussion This method is used to determine if the HBA will manage 
+		target device creation and destruction.  
+		@result return true means objects for target devices will only be 	
+		created when the child class calls the CreateTargetForID method.
+	*/
+	
+	virtual bool		DoesHBAPerformDeviceManagement ( void ) = 0;
+	
+	// ---- Initialize and Terminate methods for the subclass to implement -----
+	// The subclass shall not override the IOKit init and terminate methods,
+	// but shall instead rely on these methods for initialization and
+	// termination.
+	
+	// This is done to allow for this superclass to manage all IOKit specifics 
+	// and to require only a Family specific API to be implemented by the
+	// subclass drivers.
+	
+  	/*!
+		@function InitializeController
+		@abstract  Called to initialize the controller
+		@discussion It is guaranteed that the InitializeController() will only be 
+		called once per instantiation.  The InitializeController() methods allows 
+		the subclass driver to do all the necessary initialization required by 
+		the hardware before it is able to accept requests to execute. All 
+		necessary allocation of resources should be made during this method 
+		call. This is the first method that will be called in the subclass.
+		@result return true means that initialization was successful.
+	*/
+	
+	virtual bool	InitializeController ( void ) = 0;
+	
+  	/*!
+		@function TerminateController
+		@abstract  Called to terminate the controller
+		@discussion It is guaranteed that the TerminateController() will only be 
+		called once and only after the InitializeController() method and only if 
+		true was returned in response to the InitializeController() method.
+		The TerminateController() method allows the subclass to release all 
+		resources that were acquired for operation of the hardware and shutdown 
+		all hardware services.
+		This is the last method of the subclass that will be called before the 		
+		class is destroyed.
+	*/
+	
+	virtual void	TerminateController ( void ) = 0;
+	
+	// ---- Start and Stop methods for the subclass ----
+	
+	/*!
+		@function StartController
+		@abstract Called to start the controller
+		@discussion The StartController will always be called before any 
+		requests are sent to the driver for execution. This method is called 
+		after an initialize to start the services provided by the specific HBA 
+		driver or called after a StopController call to restart those services. 
+		After this call completes, all services provided by the HBA driver are 
+		available to the client.
+		@result return true means that start was successful.
+	*/
+	
+	virtual bool	StartController ( void ) = 0;
+	
+	/*!
+		@function StopController
+		@abstract Called to stop the controller
+		@discussion The StopController method will be called any time that the 
+		system wants the card to stop accepting requests. ( See StartController 
+		discussion ). The subclass should disable the hardware interrupt for
+		the particular controller (if possible) in this method.
+	*/
+	
+	virtual void	StopController ( void ) = 0;
+	
+	// ---- Suspend and Resume Methods for the subclass ----
+	
+	/*!
+		@function SuspendServices
+		@abstract Called to suspend controller services
+		@discussion Method will be called when the system wants to suspend the
+		services that are provided by the HBA driver. This call is not a reset
+		and the driver shall retain all state data between this so that if a
+		ResumeServices call is received, the driver can continue providing
+		services without a visible difference to the client. The driver may 
+		receive multiple SuspendServices calls without receiving a 
+		ResumeServices call and should ignore any after the first until a 
+		ResumeServices call is received.
+	*/
+	
+	virtual void	SuspendServices ( void );
+	
+	/*!
+		@function ResumeServices
+		@abstract Called to resume controller services
+		@discussion Method that will be called to resume services
+		provided by the driver. ( See SuspendServices discussion )
+	*/
+	
+	virtual void	ResumeServices ( void );
+	
+	/*!
+		@function HandleInterruptRequest
+		@abstract Handle Interrupt Request
+		@discussion The HandleInterruptRequest is used to notify an HBA 
+		specific subclass that an interrupt request needs to be serviced. It is 
+		called on the workloop (it holds the gate) at secondary interrupt level.
+	*/
+	
+	virtual void	HandleInterruptRequest ( void ) = 0;
+	
+	/*!
+		@function EnableInterrupt
+		@abstract Enable Interrupt
+		@discussion Method that the HBA child class can call to enable 
+		the associated IOInterruptEventSource.
+	*/
+	
+	void	EnableInterrupt ( void );
+	
+	/*!
+		@function DisableInterrupt
+		@abstract Disable Interrupt
+		@discussion Method that the HBA child class can call to disable 
+		the associated IOInterruptEventSource.
+	*/
+	
+	void	DisableInterrupt ( void );
+	
+	/*!
+		@function SignalInterrupt
+		@abstract Signals that an interrupt has occurred.
+		@discussion Subclasses of IOSCSIParallelInterfaceController
+		should call this method in order to get the secondary interrupt
+		thread scheduled if and only if they will be returning false from
+		their overriden FilterInterruptRequest() method. See the
+		discussion for the FilterInterruptRequest() method for more
+		details.
+		
+		NOTE: This method should only be called from within the
+		FilterInterruptRequest() method and at no other time.
+		
+		Available in 10.3.3 or later.
+		
+	*/
+	
+	void	SignalInterrupt ( void );
+	
+	/*!
+		@function ProcessParallelTask
+		@abstract Called by client to process a parallel task.
+		@discussion This method is called to process a parallel task (i.e. put
+		the command on the bus). The HBA specific sublcass must implement this 
+		method.
+		@param parallelRequest A valid SCSIParallelTaskIdentifier.
+		@result serviceResponse (see <IOKit/scsi/SCSITask.h>)
+	*/
+	
+	virtual SCSIServiceResponse ProcessParallelTask (
+							SCSIParallelTaskIdentifier parallelRequest ) = 0;
+	
+	/*!
+		@function CompleteParallelTask
+		@abstract Parallel Task Completion
+		@discussion The HBA specific sublcass inherits the CompleteParallelTask() 
+		method which shall be called when the HBA has completed the processing 
+		of a parallel task.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param completionStatus The status of the SCSI bus.
+		@param serviceResponse (see <IOKit/scsi/SCSITask.h>)
+	*/
+	
+	void	CompleteParallelTask (
+						SCSIParallelTaskIdentifier	parallelRequest,
+						SCSITaskStatus 				completionStatus,
+						SCSIServiceResponse 		serviceResponse );
+	
+	
+	// Completion routines for the SCSI Task Management functions as described
+	// in the SCSI ArchitectureModel - 2 (SAM-2) specification.  Each of these
+	// correspond to a client request for the specific Task Management functions.
+	// If the Controller Child Class completed the request by returning a 
+	// SCSIServiceResponse of anything other than kSCSIServiceResponse_Request_In_Process,
+	// then the controller class does not need to call the completion member routine.
+	// If the controller did not complete the request immediately, then it will
+	// need to call the appropriate completion member routine listed here.
+	void	CompleteAbortTask ( 	
+						SCSITargetIdentifier 		theT,
+						SCSILogicalUnitNumber		theL,
+						SCSITaggedTaskIdentifier	theQ,
+						SCSIServiceResponse 		serviceResponse );
+	
+	void 	CompleteAbortTaskSet (
+						SCSITargetIdentifier 		theT,
+						SCSILogicalUnitNumber		theL,
+						SCSIServiceResponse 		serviceResponse );
+	
+	void 	CompleteClearACA (
+						SCSITargetIdentifier 		theT,
+						SCSILogicalUnitNumber		theL,
+						SCSIServiceResponse 		serviceResponse );
+	
+	void 	CompleteClearTaskSet (
+						SCSITargetIdentifier 		theT,
+						SCSILogicalUnitNumber		theL,
+						SCSIServiceResponse 		serviceResponse );
+	
+	void 	CompleteLogicalUnitReset (
+						SCSITargetIdentifier 		theT,
+						SCSILogicalUnitNumber		theL,
+						SCSIServiceResponse 		serviceResponse );
+	
+	void 	CompleteTargetReset (
+						SCSITargetIdentifier 		theT,
+						SCSIServiceResponse 		serviceResponse );
+	
+	/*!
+		@function NotifyClientsOfBusReset
+		@abstract Method called to notify clients that a bus reset has occurred.
+		@discussion This method is used by the HBA child class to inform the 
+		parent class and any clients that a bus reset has occurred.
+	*/
+	
+	void	NotifyClientsOfBusReset ( void );
+	
+	/*!
+		@function NotifyClientsOfPortStatusChange
+		@abstract Method called to notify clients of port status change events.
+		@discussion This method is used by the HBA child class to inform the 
+		parent class and any clients that a port has changed status.
+	*/
+	
+	void	NotifyClientsOfPortStatusChange ( SCSIPortStatus newStatus );
+	
+	/*!
+		@function GetSCSIDomainIdentifier
+		@abstract Accessor method to get the SCSI Domain Identifier.
+		@discussion Accessor method to get the SCSI Domain Identifier.
+		@result returns SCSI Domain Identifier.
+	*/
+	
+	SInt32	GetSCSIDomainIdentifier ( void );
+	
+	/*!
+		@function GetProvider
+		@abstract Accessor method to get the IOService which is the controller's
+		provider.
+		@discussion Accessor method to get the IOService which is the 
+		controller's provider.
+		@result returns pointer to IOService.
+	*/
+	
+	IOService *		GetProvider ( void );
+	
+	/*!
+		@function GetWorkLoop
+		@abstract Accessor method to get the IOWorkLoop associated with this 
+		HBA.
+		@discussion Accessor method to get the IOWorkLoop associated with this 
+		HBA.
+		@result returns pointer to IOWorkLoop.
+	*/
+	
+	IOWorkLoop *	GetWorkLoop ( void ) const;
+	
+	/*!
+		@function GetCommandGate
+		@abstract Accessor to get an IOCommandGate associated with the workloop.
+		@discussion Accessor to get an IOCommandGate associated with the 
+		workloop.
+		@result returns pointer to IOCommandGate.
+	*/
+	
+	IOCommandGate *		GetCommandGate ( void );
+	
+	// ---- SCSI Parallel Task Object Accessors ----
+	
+	/*!
+		@function GetSCSITaskIdentifier
+		@abstract Method to retrieve a SCSITaskIdentifier from a valid 
+		SCSIParallelTaskIdentifier.
+		@discussion Method to retrieve a SCSITaskIdentifier from a valid 
+		SCSIParallelTaskIdentifier.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns SCSITaskIdentifier that represents the original request 
+		from the SCSI Application Layer client.
+	*/
+	
+	SCSITaskIdentifier	GetSCSITaskIdentifier ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetTargetIdentifier
+		@abstract Method to get the SCSITargetIdentifier associated with a 
+		request.
+		@discussion	Method to get the SCSITargetIdentifier associated with a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns SCSITargetIdentifier 
+	*/
+	
+	SCSITargetIdentifier	GetTargetIdentifier ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	// ---- Methods for Accessing data in the client's SCSI Task Object ----	
+	// Method to retrieve the LUN that identifies the Logical Unit whose Task
+	// Set to which this task is to be added.
+	
+	/*!
+		@function GetLogicalUnitNumber
+		@abstract Method to get the logical unit number associated with a 
+		request.
+		@discussion Method to get the logical unit number associated with a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns a valid 64-bit logical unit number.
+	*/
+	
+	SCSILogicalUnitNumber	GetLogicalUnitNumber ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetTaggedTaskIdentifier
+		@abstract Method to retrieve the SCSI Tagged Task Identifier of the 
+		task.  If the returned value is equal to kSCSIUntaggedTaskIdentifier,
+		then this task is untagged.  
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result an SCSITaskAttribute value.
+	*/
+	
+	SCSITaggedTaskIdentifier GetTaggedTaskIdentifier (
+							SCSIParallelTaskIdentifier	parallelTask );
+	
+	/*!
+		@function GetTaskAttribute
+		@abstract Method to retrieve the SCSI Task Attribute of the task 
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result an SCSITaskAttribute value.
+	*/
+	
+	SCSITaskAttribute		GetTaskAttribute (
+							SCSIParallelTaskIdentifier	parallelTask );
+	
+	/*!
+		@function GetCommandDescriptorBlockSize
+		@abstract Method to retrieve the size of the SCSI Command Descriptor 
+		Block (CDB).
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns the size of the SCSI Command Descriptor Block in bytes.
+	*/
+	
+	UInt8	GetCommandDescriptorBlockSize ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetCommandDescriptorBlock
+		@abstract Method to retrieve the SCSI Command Descriptor Block (CDB).
+		@discussion This will always return a 16 Byte CDB. If the Protocol Layer 
+		driver does not support 16 Byte CDBs, it will have to create a local 
+		SCSICommandDescriptorBlock variable to get the CDB data and then 
+		transfer the needed bytes from there.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param cdbData is a SCSICommandDescriptorBlock pointer to 16 byte CDB
+		@result returns true if data was copied to cdbData pointer
+	*/
+	
+	bool	GetCommandDescriptorBlock (
+							SCSIParallelTaskIdentifier 		parallelTask,
+							SCSICommandDescriptorBlock * 	cdbData );
+	
+	/*!
+		@function GetDataTransferDirection
+		@abstract Retrieves the data transfer direction for any data associated
+		with the request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result One of the valid data transfer directions described in 
+		<IOKit/scsi/SCSITask.h>
+	*/
+	
+	UInt8	GetDataTransferDirection ( SCSIParallelTaskIdentifier parallelTask );
+	
+	/*!
+		@function GetRequestedDataTransferCount
+		@abstract Retrieves the requested data transfer count for any data 
+		associated with the request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result The requested data transfer count in bytes.
+	*/
+	
+	UInt64	GetRequestedDataTransferCount ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetRealizedDataTransferCount
+		@abstract Retrieves the realized data transfer count for any data 
+		associated with the request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result The realized data transfer count in bytes.
+	*/
+	
+	UInt64	GetRealizedDataTransferCount (
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function SetRealizedDataTransferCount
+		@abstract Sets the realized data transfer count in bytes.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param realizedTransferCountInBytes is the number of bytes actually 
+		transferred.
+		@result true means the data transfer count was successfully set.
+	*/
+	
+	bool	SetRealizedDataTransferCount ( 
+							SCSIParallelTaskIdentifier 	parallelTask,
+							UInt64 		realizedTransferCountInBytes );
+	
+	/*!
+		@function IncrementRealizedDataTransferCount
+		@abstract Increments the realized data transfer count. This method is
+		helpful for when the HBA has to do multiple passes of DMA because there 
+		are more scatter-gather elements than it can process in one pass.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param realizedTransferCountInBytes is the number of bytes to add to the
+		realized data count for the task.
+	*/
+	
+	void	IncrementRealizedDataTransferCount (
+							SCSIParallelTaskIdentifier 	parallelTask,
+							UInt64 		realizedTransferCountInBytes );
+	
+	/*!
+		@function GetDataBuffer
+		@abstract Method to retrieve client buffer from the request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns pointer to an IOMemoryDescriptor which represents the 
+		buffer.
+	*/
+	
+	IOMemoryDescriptor * GetDataBuffer ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetDataBufferOffset
+		@abstract Method to retrieve offset into client buffer at which to start
+		processing.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns offset in bytes
+	*/
+	
+	UInt64	GetDataBufferOffset ( SCSIParallelTaskIdentifier parallelTask );
+
+	/*!
+		@function GetDMACommand
+		@abstract Method to retrieve a pointer to an IODMACommand from the request.
+		@discussion For devices utilizing DMA, the IODMACommand object should be 
+		obtained via GetDMACommand(). The subclass is responsible for calling prepare()
+		on the IODMACommand object using the proper offset obtained via GetDataBufferOffset()
+		and correct size obtained via GetRequestedDataTransferCount(). The subclass
+		is further responsible for calling complete() on the IODMACommand object once
+		all DMA operations have finished.
+		NB: Subclasses should not call IODMACommand::setMemoryDescriptor().
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns pointer to an IODMACommand which is used in conjunction
+		with the task.
+	*/
+	
+	IODMACommand * GetDMACommand ( 
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetTimeoutDuration
+		@abstract Method to retrieve the timeout duration in milliseconds for a 
+		request.
+		@discussion Method to retrieve the timeout duration in milliseconds for
+		a request. A value of zero represents an infinite timeout, or on 
+		hardware where infinite timeouts are not possible, substitute the 
+		longest timeout possible.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns timeout duration in milliseconds
+	*/
+	
+	UInt32	GetTimeoutDuration ( SCSIParallelTaskIdentifier parallelTask );
+
+	/*!
+		@function SetAutoSenseData
+		@abstract Method to set the auto sense data buffer associated with a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param newSensedata pointer to auto sense data buffer
+		@result returns true if data in newSenseData was succesfully into the 
+		task object
+	*/
+	
+	bool	SetAutoSenseData ( 
+							SCSIParallelTaskIdentifier 	parallelTask,
+							SCSI_Sense_Data * 			newSenseData,
+							UInt8						senseDataSize );
+	
+	/*!
+		@function GetAutoSenseData
+		@abstract Method to retrieve auto sense data buffer associated with a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param receivingBuffer pointer to auto sense data buffer
+		@result returns true if successfully copied data into receivingBuffer
+	*/
+	
+ 	bool	GetAutoSenseData ( 
+ 							SCSIParallelTaskIdentifier 	parallelTask,
+ 							SCSI_Sense_Data * 			receivingBuffer,
+ 							UInt8						senseDataSize );
+ 	
+	/*!
+		@function GetAutoSenseDataSize
+		@abstract Method to retrieve auto sense data buffer size associated with a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns Size of auto sense data buffer.
+	*/
+	
+ 	UInt8	GetAutoSenseDataSize ( 
+ 							SCSIParallelTaskIdentifier 	parallelTask );
+ 	
+	
+	/*!
+		@function GetSCSIParallelFeatureNegotiation
+		@abstract Method to retrieve the requested value for negotiation of the.
+		@discussion Query as to whether the SCSI Parallel Device object has 
+		negotiated wide data transfers.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result A valid SCSIParallelFeatureControl.
+	*/
+	
+	SCSIParallelFeatureRequest		GetSCSIParallelFeatureNegotiation ( 
+							SCSIParallelTaskIdentifier 	parallelTask,
+							SCSIParallelFeature 		requestedFeature );
+	
+	/*!
+		@function GetSCSIParallelFeatureNegotiationCount
+		@abstract Method to retrieve the number of requested negotiations.
+		@discussion Query as to the number of SCSI Parallel Features that are
+		requested to either be negotitated or cleared.  These are all features
+		that are set to either kSCSIParallelFeature_AttemptNegotiation or 
+		kSCSIParallelFeature_ClearNegotiation.  If the return value is zero,
+		then all features are set to kSCSIParallelFeature_NoNegotiation
+		and all feature negotiations are to remain as they currently exist.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result an unsigned integer up to 64 bits in size.
+	*/
+	
+	UInt64		GetSCSIParallelFeatureNegotiationCount ( 
+							SCSIParallelTaskIdentifier 	parallelTask);
+	
+	/*!
+		@function SetSCSIParallelFeatureNegotiationResult
+		@abstract Method to set the wide data transfer negotiation result.
+		@discussion Method to set the wide data transfer negotiation result.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param requestedFeature The SCSIParallelFeature that the has been set to 	
+		newResult.
+		@param newResult A valid SCSIParallelFeatureResult value.
+	*/
+	
+	void		SetSCSIParallelFeatureNegotiationResult ( 
+							SCSIParallelTaskIdentifier 	parallelTask,
+							SCSIParallelFeature 		requestedFeature, 
+							SCSIParallelFeatureResult 	newResult );
+	
+	/*!
+		@function GetSCSIParallelFeatureNegotiationResult
+		@abstract Method to retrieve the result of any wide transfer 
+		negotiations.
+		@discussion Query as to whether the SCSI Parallel Controller object has 
+		negotiated wide data transfers.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result A valid SCSIParallelFeatureResult.
+	*/
+	
+	SCSIParallelFeatureResult		GetSCSIParallelFeatureNegotiationResult ( 
+							SCSIParallelTaskIdentifier 	parallelTask,
+							SCSIParallelFeature 		requestedFeature );
+	
+	/*!
+		@function GetSCSIParallelFeatureNegotiationResultCount
+		@abstract Method to retrieve the number of changed negotiations.
+		@discussion Query as to the number of SCSI Parallel Features that have
+		been changed to either negotitated or cleared.  These are all features
+		that are set to either kSCSIParallelFeature_NegotitiationCleared or 
+		kSCSIParallelFeature_NegotitiationSuccess.  If the return value is zero,
+		then all features are set to kSCSIParallelFeature_NegotitiationUnchanged.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result an unsigned integer up to 64 bits in size.
+	*/
+	
+	UInt64		GetSCSIParallelFeatureNegotiationResultCount ( 
+							SCSIParallelTaskIdentifier 	parallelTask);
+	
+	// Controller Task Identifier related member routines
+	
+	/*!
+		@function SetControllerTaskIdentifier
+		@abstract Method to set the Controller Task Identifier.
+		@discussion This method allows the Controller Child Class
+		driver to set a unique identifier to associate with the specified
+		SCSI Parallel Task.  This identifier is designed to be used by
+		controllers that do not have access to the LUN and Tag information
+		when notified by the HBA that a request has completed.
+		If the kSCSIParallelTaskControllerIDQueueHead is used, this
+		member routine will return the first Task on the queue.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param newIdentifier unsigned 64 bit integer token.
+		@result none
+	*/
+	
+	void	SetControllerTaskIdentifier (
+							SCSIParallelTaskIdentifier 	parallelTask,
+							UInt64 						newIdentifier );
+	
+	UInt64	GetControllerTaskIdentifier (
+							SCSIParallelTaskIdentifier 	parallelTask);
+	
+	
+	// The HBA Data related fields
+	
+	/*!
+		@function GetHBADataSize
+		@abstract Method to retrieve the HBA Data Size in bytes.
+		@discussion Method to retrieve the HBA Data Size in bytes.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns HBA Data size in bytes.
+	*/
+	
+	UInt32	GetHBADataSize ( SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetHBADataPointer
+		@abstract Method to retrieve the HBA Data pointer.
+		@discussion Method to retrieve the HBA Data pointer.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns pointer to buffer for HBA specific data, NULL if 
+		none found or GetHBADataSize() returns zero.
+	*/
+	
+	void *	GetHBADataPointer ( SCSIParallelTaskIdentifier 	parallelTask );
+	
+	/*!
+		@function GetHBADataDescriptor
+		@abstract Method to retrieve the IOMemoryDescriptor associated with
+		the HBA Data.
+		@discussion Method to retrieve the IOMemoryDescriptor associated with
+		the HBA Data.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@result returns pointer to an IOMemoryDescriptor that wraps the HBA 
+		specific data buffer, NULL if none found or GetHBADataSize() returns zero.
+	*/
+	
+	IOMemoryDescriptor *	GetHBADataDescriptor (
+							SCSIParallelTaskIdentifier 	parallelTask );
+	
+	// ---- SCSI Parallel Device Object Accessors ----
+	
+	// The HBA Data related fields
+	
+	/*!
+		@function GetHBATargetDataSize
+		@abstract Method to retrieve the HBA Data Size in bytes.
+		@discussion Method to retrieve the HBA Data Size in bytes.
+		@param targetDevice A valid SCSITargetIdentifier.
+		@result returns HBA Data size in bytes.
+	*/
+	
+	UInt32	GetHBATargetDataSize ( SCSITargetIdentifier 	targetID );
+	
+	/*!
+		@function GetHBATargetDataPointer
+		@abstract Method to retrieve the HBA Data pointer.
+		@discussion Method to retrieve the HBA Data pointer.
+		@param targetDevice A valid SCSITargetIdentifier.
+		@result returns pointer to buffer for HBA specific data, NULL if 
+		none found or GetHBADataSize is zero.
+	*/
+	
+	void *	GetHBATargetDataPointer ( SCSITargetIdentifier 	targetID );
+	
+	
+#if 0
+#pragma mark -
+#pragma mark Additional Child Class APIs
+#endif
+	
+	
+	// ---- Timeout Related Methods ----
+	
+	/*!
+		@function SetTimeoutForTask
+		@abstract Method to set the timeout duration in milliseconds for a 
+		request.
+		@discussion Method to set the timeout duration in milliseconds for a 
+		request.
+		@param parallelTask A valid SCSIParallelTaskIdentifier.
+		@param timeoutOverride A timeout value in milliseconds in case the
+		HBA driver wishes to override the default value provided in the
+		parallelTask.
+	*/
+	
+	void	SetTimeoutForTask ( SCSIParallelTaskIdentifier 	parallelTask,
+								UInt32						timeoutOverride = 0 );
+	
+	/*!
+		@function HandleTimeout
+		@abstract Method to handle command timeouts.
+		@discussion Method to handle command timeouts. This should
+		be overridden by the child class in order to clean up HBA
+		specific structures after a timeout has occurred. This method
+		is called on the workloop (it holds the gate).
+		@param parallelRequest A valid SCSIParallelTaskIdentifier.
+	*/
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 9 );
+	
+	virtual void		HandleTimeout (
+							SCSIParallelTaskIdentifier parallelRequest );
+	
+	
+	// ---- Filter Interrupt ----
+	
+	/*!
+		@function FilterInterruptRequest
+		@abstract Filter method called at primary interrupt time.
+		@discussion Filter method called at primary interrupt time.
+		This should only be overridden by the child class in order
+		to determine if an interrupt occurred for this controller instance.
+		Since all work occurs at primary interrupt time, this routine
+		should be quick and efficient and defer as much processing as
+		possible to the HandleInterruptRequest() method.
+		
+		NOTE: Unlike the HandleInterruptRequest() and HandleTimeout()
+		methods, FilterInterruptRequest() is NOT called with the
+		workloop lock held.
+		
+		If the value returned by FilterInterruptRequest() is true, the
+		secondary interrupt thread will be scheduled and the hardware
+		interrupt line will be disabled. If the controller instance shares
+		that interrupt line with other devices, it can cause large
+		interrupt latencies. If the controller instance can disable the
+		interrupt in the chip itself, the following can be done to reduce
+		interrupt latencies:
+		
+		- Interrupt occurs
+		- FilterInterruptRequest() method is called.
+			- If the interrupt is not for this controller, return false
+			  immediately.
+			- If the interrupt is for this controller, and the controller
+			  can disable interrupts for this chip, the controller should
+			  disable the interrupts for this chip, call SignalInterrupt(),
+			  and return false. This causes the secondary interrupt thread
+			  to get scheduled, yet does not disable the interrupt line for
+			  all devices tied to that interrupt. This effectively allows
+			  other devices to process their interrrupts, thus reducing
+			  interrupt latency for those devices.
+		- HandleInterruptRequest() method is called.
+			- Controller processes interrupt and completes I/O requests.
+			- Controller re-enables interrupts for the device.
+		
+		NOTE: If you use this approach, the interrupting condition MUST be
+		cleared from the hardware, otherwise an infinite process interrupt
+		loop will occur.
+		
+		If the controller cannot disable interrupts on the chip, it should
+		simply return true if an interrupt has occurred for its device.
+		
+		@result True if the hardware interrupt line should be disabled,
+		otherwise false.
+	*/
+	
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 10 );
+	
+	virtual bool		FilterInterruptRequest ( void );
+	
+	/*!
+		@function InitializeDMASpecification
+		@abstract Called to initialize an IODMACommand with a DMA specification.
+		@param command A pointer to a valid IODMACommand object. Subclasses
+		should override this method and call IODMACommand::initWithSpecification()
+		supplying the proper arguments to that method based on the DMA strategy.
+		@result boolean value indicating success or failure.
+	*/
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 11 );
+	
+	virtual bool	InitializeDMASpecification ( IODMACommand * command );
+	
+	/*!
+		@function CreateDeviceInterrupt
+		@abstract Called to create an IOInterruptEventSource for the device. Subclasses
+		may wish to use a different interrupt index than 0 (e.g. for using PCI Message
+		Signaled Interrupts) or might not need an interrupt at all (virtual HBA).
+		@param action A pointer to the action routine that should be passed to either
+		IOInterruptEventSource::interruptEventSource() or
+		IOFilterInterruptEventSource::filterInterruptEventSource as the method to call
+		when an interrupt occurs for the device (sometimes called the "deferred procedure call"
+		or the "secondary context method". By passing this routine along, it will
+		properly wire up the HandleInterruptRequest() method you should override to handle
+		interrupts.
+		@param filter A pointer to the filter routine that should be passed to
+		IOFilterInterruptEventSource::filterInterruptEventSource as the method to call
+		at primary interrupt time when an interrupt occurs for the device.
+		By passing this routine along, it will properly wire up the
+		FilterInterruptRequest() method you may override to handle primary interrupts.
+		@result IOInterruptEventSource. May return NULL if and only if there is no
+		hardware interrupt associated with this device.
+	*/
+	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 12 );
+	
+	virtual IOInterruptEventSource *	CreateDeviceInterrupt (
+											IOInterruptEventSource::Action			action,
+											IOFilterInterruptEventSource::Filter	filter,
+											IOService *								provider );
+	
+	// Padding for the Child Class API
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 13 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 14 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 15 );
+	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 16 );
+	
+	
+#if 0
+#pragma mark -
+#pragma mark Internal Use Only
+#endif
+	
+private:
+	
+	// binary compatibility instance variable expansion
+	struct ExpansionData { };
+	ExpansionData * fIOSCSIParallelInterfaceControllerExpansionData;
+	
+	IOService *					fProvider;
+	OSSet *						fClients;
+	
+	static SInt32				fSCSIParallelDomainCount;
+	SInt32						fSCSIDomainIdentifier;
+	
+	// The HBA attributes
+	SCSIInitiatorIdentifier		fInitiatorIdentifier;
+	
+	// The maximum SCSI Device Identifier support by the HBA
+	// This is retreived from the child class via the 
+	SCSIDeviceIdentifier		fHighestSupportedDeviceID;
+	
+	// The total number of tasks that the HBA can proccess at a time.
+	// This is retrieved from the child class via ReportMaximumTaskCount
+	UInt32						fSupportedTaskCount;
+	
+	// The Number of requests that are currently outstanding for the current
+	// instantiation.
+	UInt16						fOutstandingRequests;
+	
+	// The member variable to indicate if the current instantiation has been
+	// succesfully intialized.
+	bool						fHBAHasBeenInitialized;
+	
+	// The member variable to indicate if the current instantiation is running.
+	// A true means that the last or only Start call made was successful.  A
+	// false value means that either a successful Start has not been made or a
+	// Stop call has been made.
+	bool						fHBACanAcceptClientRequests;
+	
+	// The pool for the available SCSI Parallel Task objects
+	IOCommandPool *				fParallelTaskPool;
+	
+	// WorkLoop variables
+	IOWorkLoop *				fWorkLoop;
+	IOTimerEventSource *		fTimerEvent;
+	IOInterruptEventSource *	fDispatchEvent;
+	
+	IOCommandGate *				fControllerGate;
+	
+	bool						AllocateSCSIParallelTasks ( void );
+	void						DeallocateSCSIParallelTasks ( void );
+	
+	IOWorkLoop *				getWorkLoop ( void ) const;
+	bool 						CreateWorkLoop ( IOService * provider );
+	void 						ReleaseWorkLoop ( void );
+	
+	// SCSI Parallel Device List
+	// The SCSI Parallel Device List will consist of 16 elements to represent 
+	// identifiers that end in 0h through Fh.  Each array element will point
+	// to a device object that represents the beginning of a linked list of
+	// device objects.  By using an array of linked lists, the traversal time
+	// to find an object on a bus that supports a large number of devices, such
+	// as Fibre Channel, will be significantly lower than having to walk a list 
+	// that is comprised of all devices on the bus.  For parallel wide and 
+	// narrow busses, which support 16 and 8 devices respectively, this will act 
+	// like a simple array of device objects.
+	enum
+	{
+		kSCSIParallelDeviceListArrayCount 	= 16,
+		kSCSIParallelDeviceListIndexMask	= 0x0F
+	};
+	
+	IOSimpleLock * 					fDeviceLock;
+	IOSCSIParallelInterfaceDevice *	
+					fParallelDeviceList[kSCSIParallelDeviceListArrayCount];
+	
+	void			InitializeDeviceList ( void );
+	void			AddDeviceToTargetList ( 
+							IOSCSIParallelInterfaceDevice *	newDevice );
+	void			RemoveDeviceFromTargetList ( 
+							IOSCSIParallelInterfaceDevice * victimDevice );
+	
+	// The Interrupt Service Routine for the controller.
+	static void		ServiceInterrupt (
+							OSObject *					theObject, 
+							IOInterruptEventSource *	theSource,
+							int							count );
+	
+	static void		TimeoutOccurred ( OSObject * owner, IOTimerEventSource * sender );
+	
+	static bool		FilterInterrupt (
+							OSObject *						theObject,
+							IOFilterInterruptEventSource *	theSource );
+	
+	// IOService support methods
+	// These shall not be overridden by the HBA child classes.
+	bool			start ( IOService * 				provider );
+	void			stop ( 	IOService *  				provider );
+
+
+protected:
+	
+	// These may be overriden by the HBA child classes if necessary, but should
+	// call the superclass implementation.
+	virtual bool	handleOpen ( 
+							IOService * 				client, 
+							IOOptionBits 				options, 
+							void * 						arg );
+
+	virtual void	handleClose ( 
+							IOService * 				client, 
+							IOOptionBits 				options );
+
+	virtual bool	handleIsOpen ( 
+							const IOService * 			client ) const;
+	
+	virtual bool	willTerminate ( IOService * provider, IOOptionBits options );
+	virtual bool	didTerminate ( IOService * provider, IOOptionBits options, bool * defer );
+	
+};
+
+
+#endif	/* __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__ */
\ No newline at end of file
diff --git a/i386/include/IOKit/serial/.svn/all-wcprops b/i386/include/IOKit/serial/.svn/all-wcprops
new file mode 100644
index 0000000..26769b8
--- /dev/null
+++ b/i386/include/IOKit/serial/.svn/all-wcprops
@@ -0,0 +1,35 @@
+K 25
+svn:wc:ra_dav:version-url
+V 59
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial
+END
+IORS232SerialStreamSync.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial/IORS232SerialStreamSync.h
+END
+IOSerialDriverSync.h
+K 25
+svn:wc:ra_dav:version-url
+V 80
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial/IOSerialDriverSync.h
+END
+IOSerialStreamSync.h
+K 25
+svn:wc:ra_dav:version-url
+V 80
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial/IOSerialStreamSync.h
+END
+IOModemSerialStreamSync.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial/IOModemSerialStreamSync.h
+END
+IOSerialKeys.h
+K 25
+svn:wc:ra_dav:version-url
+V 74
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial/IOSerialKeys.h
+END
diff --git a/i386/include/IOKit/serial/.svn/entries b/i386/include/IOKit/serial/.svn/entries
new file mode 100644
index 0000000..20342de
--- /dev/null
+++ b/i386/include/IOKit/serial/.svn/entries
@@ -0,0 +1,198 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/serial
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IORS232SerialStreamSync.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+0c2a5b36af70b8a5fc48f9f984e42b8f
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7628
+
+IOSerialDriverSync.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+1de76939037928e06b59a471b77174ea
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3579
+
+IOSerialStreamSync.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+91e7b9256b39f31244ba4cfa14404a6c
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11947
+
+IOModemSerialStreamSync.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+9ef1d5116b75c1c73a3ccb151f3eec13
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1425
+
+IOSerialKeys.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+85af242f0159d91cac30a3e340bb7ffb
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2856
+
diff --git a/i386/include/IOKit/serial/.svn/text-base/IOModemSerialStreamSync.h.svn-base b/i386/include/IOKit/serial/.svn/text-base/IOModemSerialStreamSync.h.svn-base
new file mode 100644
index 0000000..be75287
--- /dev/null
+++ b/i386/include/IOKit/serial/.svn/text-base/IOModemSerialStreamSync.h.svn-base
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *
+ * IOModemSerialStreamSync.h
+ * This file contains Modem specific extensions to the IOSerialStreamSync class.
+ *
+ * 2000-10-21	gvdl	Initial real change to IOKit serial family.
+ *
+ */  
+
+#ifndef _SERIAL_IOMODEMSERIALSTREAMSYNC_H
+#define _SERIAL_IOMODEMSERIALSTREAMSYNC_H
+
+#include <IOKit/serial/IOSerialStreamSync.h>
+
+class IOModemSerialStreamSync : public IOSerialStreamSync
+{
+    OSDeclareDefaultStructors(IOModemSerialStreamSync)
+};
+
+#endif /* !_SERIAL_IOMODEMSERIALSTREAMSYNC_H */
+
diff --git a/i386/include/IOKit/serial/.svn/text-base/IORS232SerialStreamSync.h.svn-base b/i386/include/IOKit/serial/.svn/text-base/IORS232SerialStreamSync.h.svn-base
new file mode 100644
index 0000000..15d520a
--- /dev/null
+++ b/i386/include/IOKit/serial/.svn/text-base/IORS232SerialStreamSync.h.svn-base
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * IORS232SerialStreamSync.h
+ * This file contains RS232 specific extensions to the IOSerialStreamSync class.
+ *
+ * 2000-10-21	gvdl	Initial real change to IOKit serial family.
+ */  
+
+#ifndef _SERIAL_IORS232SERIALSTREAMSYNC_H
+#define _SERIAL_IORS232SERIALSTREAMSYNC_H
+
+#include <sys/ioctl.h>
+#include <IOKit/serial/IOSerialStreamSync.h>
+
+/*
+ * Extra events for RS232 based PortDevices
+ */  
+
+#define PD_RS232_E_RX_LINE_BREAK      (PD_DATA_VOID|PD_OP(63))  // line break was received
+#define PD_RS232_E_LINE_BREAK         (PD_DATA_BYTE|PD_OP(62))  // BOOL set/clear line break    
+
+#define PD_RS232_E_RX_STOP_BITS       (PD_DATA_LONG|PD_OP(61))  // half stop bits
+#define PD_RS232_E_STOP_BITS          (PD_DATA_LONG|PD_OP(60))  // half stop bits
+
+#define PD_RS232_E_XON_BYTE           (PD_DATA_BYTE|PD_OP(59))  // The XON char for TX&RX
+#define PD_RS232_E_XOFF_BYTE          (PD_DATA_BYTE|PD_OP(58))  // The XOFF char for TX&RX
+
+#define PD_RS232_E_MIN_LATENCY        (PD_DATA_BYTE|PD_OP(57))  // BOOL true if low latency req
+
+/*
+ * RS232 Parity stuff, used with the DATA_INTEGRITY event
+ */  
+#define PD_RS232_PARITY_DEFAULT	0	// Valid only for RX, means follow TX
+#define PD_RS232_PARITY_NONE	1	// No Parity bit inserted or expected
+#define PD_RS232_PARITY_ODD	2	// Odd Parity bit inserted or expected
+#define PD_RS232_PARITY_EVEN	3	// Even Parity bit inserted or expected
+#define PD_RS232_PARITY_MARK	4	// Mark inserted or expected
+#define PD_RS232_PARITY_SPACE	5	// Space inserted or expected
+#define PD_RS232_PARITY_ANY	6	// Valid only for RX, means discard parity
+
+/*
+ * RS232 Flow Control specifiers, used with the FLOW_CONTROL event
+ * NB. The XON  character is set with FLOW_START_DATA
+ * and the XOFF character is set with FLOW_STOP_DATA.
+ *
+ * Signal  Name                          Direction
+ *  RFR     Ready For Receive             Output generated by UART
+ *  RTS     Ready To Send (alias of RFR)  Output generated by UART
+ *  CTS     Clear To Send		  Input sensed by UART
+ *  DTR     Data Terminal Ready           Output generated by UART
+ *  DSR     Data Set Ready                Input sensed by UART
+ *  TXO     XON/XOFF/XANY protocol        Characters received by UART
+ *  RXO     XON/XOFF protocol             Characters transmitted by UART
+ *  DCD     Data Carrier Detect           Input sensed by UART
+ */
+
+/*
+ * RS232 State Word extensions, based on <bsd/sys/ioctl.h>
+ * Also the 'current state' bits for enq/deq of Flow Control event
+ */  
+#define PD_RS232_S_MASK   0x0000ffffUL
+#define PD_RS232_S_SHIFT  0	// to align State bits for enq/deq event
+#define PD_RS232_D_MASK   0xffff0000UL
+#define PD_RS232_D_SHIFT  16	// to align Delta bits for enq/deq event
+#define PD_RS232_A_MASK   0x0000ffffUL
+#define PD_RS232_A_SHIFT  0	// to align Auto bits for req/exec event
+#define PD_RS232_N_MASK   0xffff0000UL
+#define PD_RS232_N_SHIFT  16	// to align Notify bits for req/exec event
+
+#define	PD_RS232_S_LE	TIOCM_LE	// line enable
+#define	PD_RS232_S_DTR	TIOCM_DTR	// data terminal ready
+#define	PD_RS232_S_RTS	TIOCM_RTS	// request to send
+#define	PD_RS232_S_RFR	PD_RS232_S_RTS	// ready for receive
+#define	PD_RS232_S_TXO	TIOCM_ST	// TX XON/XOFF
+#define	PD_RS232_S_RXO	TIOCM_SR	// RX XON/XOFF
+#define	PD_RS232_S_CTS	TIOCM_CTS	// clear to send
+#define	PD_RS232_S_CAR	TIOCM_CAR	// carrier detect
+#define	PD_RS232_S_DCD	PD_RS232_S_CAR
+#define	PD_RS232_S_RNG	TIOCM_RNG	// ring
+#define	PD_RS232_S_RI	PD_RS232_S_RNG
+#define	PD_RS232_S_DSR	TIOCM_DSR	// data set ready
+
+#define	PD_RS232_S_BRK	0x00000800UL	// break active Extension to TIOCM   
+#define	PD_RS232_S_LOOP	0x00001000UL	// LOOP back Extension to TIOCM
+#define PD_RS232_S_TXQ	0x00002000UL	// User flowcontrol bit
+#define PD_RS232_S_RXQ	0x00004000UL	// User flowcontrol bit
+
+// The 'delta' bits for enq/deq of Flow Control event
+#define	PD_RS232_D_LE	(PD_RS232_S_LE  << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_DTR	(PD_RS232_S_DTR << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_RTS	(PD_RS232_S_RTS << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_RFR	(PD_RS232_S_RFR << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_TXO	(PD_RS232_S_TXO << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_RXO	(PD_RS232_S_RXO << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_CTS	(PD_RS232_S_CTS << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_CAR	(PD_RS232_S_CAR << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_DCD	(PD_RS232_S_DCD << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_RNG	(PD_RS232_S_RNG << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_RI	(PD_RS232_S_RI  << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_DSR	(PD_RS232_S_DSR << PD_RS232_D_SHIFT)
+ 
+#define	PD_RS232_D_BRK	(PD_RS232_S_BRK  << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_LOOP (PD_RS232_S_LOOP << PD_RS232_D_SHIFT)
+#define PD_RS232_D_TXQ	(PD_RS232_S_TXQ  << PD_RS232_D_SHIFT)
+#define PD_RS232_D_RXQ	(PD_RS232_S_RXQ  << PD_RS232_D_SHIFT)
+
+// The 'auto' bits for exec/req of Flow Control event
+#define	PD_RS232_A_LE	PD_RS232_S_LE
+#define	PD_RS232_A_DTR	PD_RS232_S_DTR
+#define	PD_RS232_A_RTS	PD_RS232_S_RTS
+#define	PD_RS232_A_RFR	PD_RS232_S_RFR
+#define	PD_RS232_A_TXO	PD_RS232_S_TXO
+#define	PD_RS232_A_RXO	PD_RS232_S_RXO
+#define	PD_RS232_A_CTS	PD_RS232_S_CTS
+#define	PD_RS232_A_CAR	PD_RS232_S_CAR
+#define	PD_RS232_A_DCD	PD_RS232_S_DCD
+#define	PD_RS232_A_RNG	PD_RS232_S_RNG
+#define	PD_RS232_A_RI	PD_RS232_S_RI
+#define	PD_RS232_A_DSR	PD_RS232_S_DSR
+#define PD_RS232_A_XANY	0x00000400	// changes _A_TXO from XON/XOFF to XANY/XOFF
+#define	PD_RS232_A_BRK	PD_RS232_S_BRK   
+#define	PD_RS232_A_LOOP PD_RS232_S_LOOP
+#define PD_RS232_A_TXQ	PD_RS232_S_TXQ
+#define PD_RS232_A_RXQ	PD_RS232_S_RXQ
+
+// The 'notify' bits for exec/req of Flow Control event
+#define	PD_RS232_N_LE	(PD_RS232_S_LE  << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_DTR	(PD_RS232_S_DTR << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_RTS	(PD_RS232_S_RTS << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_RFR	(PD_RS232_S_RFR << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_TXO	(PD_RS232_S_TXO << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_RXO	(PD_RS232_S_RXO << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_CTS	(PD_RS232_S_CTS << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_CAR	(PD_RS232_S_CAR << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_DCD	(PD_RS232_S_DCD << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_RNG	(PD_RS232_S_RNG << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_RI	(PD_RS232_S_RI  << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_DSR	(PD_RS232_S_DSR << PD_RS232_N_SHIFT)
+
+#define	PD_RS232_N_BRK	(PD_RS232_S_BRK  << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_LOOP (PD_RS232_S_LOOP << PD_RS232_N_SHIFT)
+#define PD_RS232_N_TXQ	(PD_RS232_S_TXQ  << PD_RS232_N_SHIFT)
+#define PD_RS232_N_RXQ	(PD_RS232_S_RXQ  << PD_RS232_N_SHIFT)
+
+class IORS232SerialStreamSync : public IOSerialStreamSync
+{
+    OSDeclareDefaultStructors(IORS232SerialStreamSync)
+};
+
+#endif /* !_SERIAL_IORS232SERIALSTREAMSYNC_H */
+
diff --git a/i386/include/IOKit/serial/.svn/text-base/IOSerialDriverSync.h.svn-base b/i386/include/IOKit/serial/.svn/text-base/IOSerialDriverSync.h.svn-base
new file mode 100644
index 0000000..92f69df
--- /dev/null
+++ b/i386/include/IOKit/serial/.svn/text-base/IOSerialDriverSync.h.svn-base
@@ -0,0 +1,91 @@
+/*
+ *Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ *@APPLE_LICENSE_HEADER_START@
+ *
+ *The contents of this file constitute Original Code as defined in and
+ *are subject to the Apple Public Source License Version 1.1 (the
+ *"License").  You may not use this file except in compliance with the
+ *License.  Please obtain a copy of the License at
+ *http://www.apple.com/publicsource and read it before using this file.
+ *
+ *This Original Code and all software distributed under the License are
+ *distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ *EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ *INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ *FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ *License for the specific language governing rights and limitations
+ *under the License.
+ *
+ *@APPLE_LICENSE_HEADER_END@
+ */
+
+/*  
+ * IOSerialDriverSync.h
+ * This file contains the abstract parent class for any IOSerialDriver
+ * interface, which is a generic serial interface, designed for devices
+ * that do character oriented transfers (async) rather than block or
+ * packet transfers.  Most notably RS-232, Printer, Mouse, and Keyboard
+ * type devices.
+ *
+ * 2000-10-21	gvdl	Initial real change to IOKit serial family.
+ */
+
+#ifndef _SERIAL_IOSERIALDRIVERSYNC_H
+#define _SERIAL_IOSERIALDRIVERSYNC_H
+
+#include <IOKit/IOService.h>
+
+class IOSerialDriverSync : public IOService
+{
+    OSDeclareAbstractStructors(IOSerialDriverSync);
+
+public:
+    virtual IOReturn acquirePort(bool sleep, void *refCon) = 0;
+
+    virtual IOReturn releasePort(void *refCon) = 0;
+
+    virtual IOReturn setState(UInt32 state, UInt32 mask, void *refCon) = 0;
+
+    virtual UInt32 getState(void *refCon) = 0;
+
+    virtual IOReturn watchState(UInt32 *state, UInt32 mask, void *refCon) = 0;
+
+    virtual UInt32 nextEvent(void *refCon) = 0;
+
+    virtual IOReturn executeEvent(UInt32 event, UInt32 data, void *refCon) = 0;
+
+    virtual IOReturn requestEvent(UInt32 event, UInt32 *data, void *refCon) = 0;
+
+    virtual IOReturn enqueueEvent(UInt32 event, UInt32 data,
+                                  bool sleep, void *refCon) = 0;
+
+    virtual IOReturn dequeueEvent(UInt32 *event, UInt32 *data,
+                                  bool sleep, void *refCon) = 0;
+
+    virtual IOReturn enqueueData(UInt8 *buffer, UInt32 size, UInt32 *count,
+                                 bool sleep, void *refCon) = 0;
+
+    virtual IOReturn dequeueData(UInt8 *buffer, UInt32 size, UInt32 *count,
+                                 UInt32 min, void *refCon) = 0;
+
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  0);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  1);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  2);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  3);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  4);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  5);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  6);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  7);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  8);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  9);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 10);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 11);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 12);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 13);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 14);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 15);
+
+};
+
+#endif /* !_SERIAL_IOSERIALDRIVERSYNC_H */
diff --git a/i386/include/IOKit/serial/.svn/text-base/IOSerialKeys.h.svn-base b/i386/include/IOKit/serial/.svn/text-base/IOSerialKeys.h.svn-base
new file mode 100644
index 0000000..9538a24
--- /dev/null
+++ b/i386/include/IOKit/serial/.svn/text-base/IOSerialKeys.h.svn-base
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * IOSerialKeys.h
+ *
+ * 2000-10-21	gvdl	Initial real change to IOKit serial family.
+ *
+ */
+
+/*
+Sample Matching dictionary
+{
+    IOProviderClass = kIOSerialBSDServiceValue;
+    kIOSerialBSDTypeKey = kIOSerialBSDAllTypes
+			| kIOSerialBSDModemType
+			| kIOSerialBSDRS232Type;
+    kIOTTYDeviceKey = <Raw Unique Device Name>;
+    kIOTTYBaseNameKey = <Raw Unique Device Name>;
+    kIOTTYSuffixKey = <Raw Unique Device Name>;
+    kIOCalloutDeviceKey = <Callout Device Name>;
+    kIODialinDeviceKey = <Dialin Device Name>;
+}
+
+Note only the IOProviderClass is mandatory.  The other keys allow the searcher to reduce the size of the set of matching devices.
+*/
+
+/* Service Matching That is the 'IOProviderClass' */
+#define kIOSerialBSDServiceValue	"IOSerialBSDClient"
+
+/* Matching keys */
+#define kIOSerialBSDTypeKey		"IOSerialBSDClientType"
+
+/* Currently possible kIOSerialBSDTypeKey values. */
+#define kIOSerialBSDAllTypes		"IOSerialStream"
+#define kIOSerialBSDModemType		"IOModemSerialStream"
+#define kIOSerialBSDRS232Type		"IORS232SerialStream"
+
+// Properties that resolve to a /dev device node to open for
+// a particular service
+#define kIOTTYDeviceKey			"IOTTYDevice"
+#define kIOTTYBaseNameKey		"IOTTYBaseName"
+#define kIOTTYSuffixKey			"IOTTYSuffix"
+
+#define kIOCalloutDeviceKey		"IOCalloutDevice"
+#define kIODialinDeviceKey		"IODialinDevice"
+
+// Property 'ioctl' wait for the tty device to go idle.
+#define kIOTTYWaitForIdleKey		"IOTTYWaitForIdle"
+
+#if KERNEL
+extern const OSSymbol *gIOSerialBSDServiceValue;
+extern const OSSymbol *gIOSerialBSDTypeKey;
+extern const OSSymbol *gIOSerialBSDAllTypes;
+extern const OSSymbol *gIOSerialBSDModemType;
+extern const OSSymbol *gIOSerialBSDRS232Type;
+extern const OSSymbol *gIOTTYDeviceKey;
+extern const OSSymbol *gIOTTYBaseNameKey;
+extern const OSSymbol *gIOTTYSuffixKey;
+extern const OSSymbol *gIOCalloutDeviceKey;
+extern const OSSymbol *gIODialinDeviceKey;
+#endif /* KERNEL */
diff --git a/i386/include/IOKit/serial/.svn/text-base/IOSerialStreamSync.h.svn-base b/i386/include/IOKit/serial/.svn/text-base/IOSerialStreamSync.h.svn-base
new file mode 100644
index 0000000..b654adb
--- /dev/null
+++ b/i386/include/IOKit/serial/.svn/text-base/IOSerialStreamSync.h.svn-base
@@ -0,0 +1,275 @@
+/*
+ *Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ *@APPLE_LICENSE_HEADER_START@
+ *
+ *The contents of this file constitute Original Code as defined in and
+ *are subject to the Apple Public Source License Version 1.1 (the
+ *"License").  You may not use this file except in compliance with the
+ *License.  Please obtain a copy of the License at
+ *http://www.apple.com/publicsource and read it before using this file.
+ *
+ *This Original Code and all software distributed under the License are
+ *distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ *EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ *INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ *FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ *License for the specific language governing rights and limitations
+ *under the License.
+ *
+ *@APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *  IOSerialStreamSync.h
+ *
+ *  2000-10-21	gvdl	Initial real change to IOKit serial family.
+ *
+ */
+
+#ifndef	_SERIAL_IOSERIALSTREAMSYNC_H
+#define	_SERIAL_IOSERIALSTREAMSYNC_H
+
+#include <IOKit/IOService.h>
+
+#ifdef __LP64__
+
+#define PD_DATA_MASK 0x03U
+#define PD_DATA_VOID 0x00U
+#define PD_DATA_BYTE 0x01U
+#define PD_DATA_WORD 0x02U
+#define PD_DATA_LONG 0x03U
+
+#else
+
+#define PD_DATA_MASK 0x03UL
+#define PD_DATA_VOID 0x00UL
+#define PD_DATA_BYTE 0x01UL
+#define PD_DATA_WORD 0x02UL
+#define PD_DATA_LONG 0x03UL
+
+#endif
+
+#define PD_OP(x)	((x) << 2)
+#define PD_E_MASK	(~PD_DATA_MASK)
+
+/* General Command & Status events */
+#define PD_E_EOQ		(PD_DATA_VOID|PD_OP( 0))	// Always nextEvent on empty queue
+#define PD_E_ACTIVE		(PD_DATA_BYTE|PD_OP( 1))	// BOOL start/shutdown chip
+
+/* Queue management events - all units are multiples of characters
+ *based on the current character size
+ */
+#define PD_E_TXQ_SIZE 		(PD_DATA_LONG|PD_OP( 2))
+#define PD_E_RXQ_SIZE		(PD_DATA_LONG|PD_OP( 3))
+#define PD_E_TXQ_LOW_WATER	(PD_DATA_LONG|PD_OP( 4))
+#define PD_E_RXQ_LOW_WATER	(PD_DATA_LONG|PD_OP( 5))
+#define PD_E_TXQ_HIGH_WATER	(PD_DATA_LONG|PD_OP( 6))
+#define PD_E_RXQ_HIGH_WATER	(PD_DATA_LONG|PD_OP( 7))
+#define PD_E_TXQ_AVAILABLE	(PD_DATA_LONG|PD_OP( 8))
+#define PD_E_RXQ_AVAILABLE	(PD_DATA_LONG|PD_OP( 9))
+#define PD_E_TXQ_FLUSH 		(PD_DATA_VOID|PD_OP(10))
+#define PD_E_RXQ_FLUSH		(PD_DATA_LONG|PD_OP(11))
+
+/* port & link characteristics - units are half bits */
+#define PD_E_DATA_RATE 		(PD_DATA_LONG|PD_OP(12))	// raw bits of symbols per second
+#define PD_E_RX_DATA_RATE	(PD_DATA_LONG|PD_OP(13))
+#define PD_E_DATA_SIZE 		(PD_DATA_LONG|PD_OP(14))	// raw bits per symbol
+#define PD_E_RX_DATA_SIZE	(PD_DATA_LONG|PD_OP(15))
+#define PD_E_DATA_INTEGRITY	(PD_DATA_LONG|PD_OP(16))	// parity or ECC method
+#define PD_E_RX_DATA_INTEGRITY	(PD_DATA_LONG|PD_OP(17))
+#define PD_E_EXTERNAL_CLOCK_MODE (PD_DATA_LONG|PD_OP(28))	// multiplier between clock and data rates
+
+/* timeout events */
+#define PD_E_DELAY		(PD_DATA_LONG|PD_OP(18))	// inter-character delay (us)
+#define PD_E_DATA_LATENCY	(PD_DATA_LONG|PD_OP(19))	// A dequeueData Latency timeout
+								// rcs Secondary Timer mainly to fix performance 
+								// problems with MIDI and IRDA drivers.
+								// Midi and Irda drivers will issue an IOCTL
+								// call with this as the selector and
+								// the Data as the value they want the rate set
+								// to (Typically 1 for IrDA devices) 
+#define PD_E_FLOW_CONTROL       (PD_DATA_LONG|PD_OP(20))  	// enable/disable each flow mechanism
+
+/* I/O events */
+#define PD_E_VALID_DATA 	(PD_DATA_VOID|PD_OP(21))	// A valid frame was received
+#define PD_E_VALID_DATA_BYTE 	(PD_DATA_BYTE|PD_E_VALID_DATA)
+#define PD_E_VALID_DATA_WORD 	(PD_DATA_WORD|PD_E_VALID_DATA)
+#define PD_E_VALID_DATA_LONG 	(PD_DATA_LONG|PD_E_VALID_DATA)
+
+#define PD_E_SPECIAL		(PD_DATA_VOID|PD_OP(22))	// valid data received with 'special' value
+#define PD_E_SPECIAL_BYTE 	(PD_DATA_BYTE|PD_E_SPECIAL)
+#define PD_E_SPECIAL_WORD 	(PD_DATA_WORD|PD_E_SPECIAL)
+#define PD_E_SPECIAL_LONG 	(PD_DATA_LONG|PD_E_SPECIAL)
+
+#define PD_E_FRAMING_ERROR 	(PD_DATA_VOID|PD_OP(23))	// Failure occured assembling frame
+#define PD_E_FRAMING_BYTE 	(PD_DATA_BYTE|PD_E_FRAMING_ERROR)
+#define PD_E_FRAMING_WORD 	(PD_DATA_WORD|PD_E_FRAMING_ERROR)
+#define PD_E_FRAMING_LONG 	(PD_DATA_LONG|PD_E_FRAMING_ERROR)
+
+#define PD_E_INTEGRITY_ERROR 	(PD_DATA_VOID|PD_OP(24))	// An uncorrectable frame was received
+#define PD_E_INTEGRITY_BYTE 	(PD_DATA_BYTE|PD_E_INTEGRITY_ERROR)
+#define PD_E_INTEGRITY_WORD 	(PD_DATA_WORD|PD_E_INTEGRITY_ERROR)
+#define PD_E_INTEGRITY_LONG 	(PD_DATA_LONG|PD_E_INTEGRITY_ERROR)
+
+#define PD_E_INTEGRITY_WARNING 	(PD_DATA_VOID|PD_OP(25))	// A correctable frame was received
+#define PD_E_HW_OVERRUN_ERROR 	(PD_DATA_VOID|PD_OP(26))	// Hardware's buffer overflowed, data lost
+#define PD_E_SW_OVERRUN_ERROR 	(PD_DATA_VOID|PD_OP(27))	// Driver's buffer overflowed, data lost
+
+/*
+ *The variables below make up the bits returned
+ *by the State methods:- getState, setState, watchState
+ */
+#define PD_S_MASK		0xffff0000UL
+#define PD_S_RX_OFFSET		7
+
+#define PD_S_ACQUIRED		0x80000000UL
+#define PD_S_ACTIVE		0x40000000UL
+
+#define PD_S_TX_ENABLE		0x20000000UL
+#define PD_S_TX_BUSY		0x10000000UL
+#define PD_S_TX_EVENT 		0x08000000UL
+#define PD_S_TXQ_EMPTY 		0x04000000UL
+#define PD_S_TXQ_LOW_WATER 	0x02000000UL
+#define PD_S_TXQ_HIGH_WATER 	0x01000000UL
+#define PD_S_TXQ_FULL 		0x00800000UL
+#define PD_S_TXQ_MASK		( PD_S_TXQ_EMPTY | PD_S_TXQ_LOW_WATER \
+                                | PD_S_TXQ_FULL  | PD_S_TXQ_HIGH_WATER )
+
+#define PD_S_RX_ENABLE		(PD_S_TX_ENABLE      >> PD_S_RX_OFFSET)
+#define PD_S_RX_BUSY		(PD_S_TX_BUSY        >> PD_S_RX_OFFSET)
+#define PD_S_RX_EVENT		(PD_S_TX_EVENT       >> PD_S_RX_OFFSET)
+#define PD_S_RXQ_EMPTY 		(PD_S_TXQ_EMPTY      >> PD_S_RX_OFFSET)
+#define PD_S_RXQ_LOW_WATER	(PD_S_TXQ_LOW_WATER  >> PD_S_RX_OFFSET)
+#define PD_S_RXQ_HIGH_WATER	(PD_S_TXQ_HIGH_WATER >> PD_S_RX_OFFSET)
+#define PD_S_RXQ_FULL 		(PD_S_TXQ_FULL       >> PD_S_RX_OFFSET)
+#define PD_S_RXQ_MASK		(PD_S_TXQ_MASK       >> PD_S_RX_OFFSET)
+
+class IOSerialDriverSync;
+class IOSerialStreamSync : public IOService
+{
+    OSDeclareDefaultStructors(IOSerialStreamSync);
+
+protected:
+    IOSerialDriverSync *fProvider;
+    void *fRefCon;
+
+public:
+    /* acquire tests and sets the state of the port object.  If the port was
+    *available, then the state is set to busy, and kIOReturnSuccess is returned.
+    *If the port was already busy and sleep is YES, then the thread will sleep
+    *until the port is freed, then re-attempts the acquire.  If the port was
+    *already busy and sleep in NO, then kIOReturnExclusiveAccess is returned.
+    */   
+    virtual IOReturn acquirePort(bool sleep);
+    
+    /* release sets the state of the port object to available and wakes up any
+    *threads sleeping for access to this port.  It will return kIOReturnSuccess
+    *if the port was in a busy state, and kIOReturnNotOpen if it was available.
+    */
+    virtual IOReturn releasePort();
+    
+    /*
+     *Set the state for the port device.
+     */
+    virtual IOReturn setState(UInt32 state, UInt32 mask);
+
+    /*
+     *Get the state for the port device.
+     */
+    virtual UInt32 getState();
+    
+    /*
+     *Wait for the at least one of the state bits defined in mask to be equal
+     *to the value defined in state.
+     *Check on entry then sleep until necessary.
+     */
+    virtual IOReturn watchState(UInt32 *state, UInt32 mask);
+
+    /* nextEvent returns the type of the next event on the RX queue.  If no
+     *events are present on the RX queue, then EOQ is returned.
+     */
+    virtual UInt32 nextEvent();
+
+    /* executeEvent causes the specified event to be processed immediately.
+     *This is primarily used for channel control commands like START & STOP
+     */
+    virtual IOReturn executeEvent(UInt32 event, UInt32 data);
+
+    /* requestEvent processes the specified event as an immediate request and
+     *returns the results in data.  This is primarily used for getting link
+     *status information and verifying baud rate and such.
+     */
+    virtual IOReturn requestEvent(UInt32 event, UInt32 *data);
+
+    /* enqueueEvent will place the specified event into the TX queue.  The
+     *sleep argument allows the caller to specify the enqueueEvent's
+     *behaviour when the TX queue is full.  If sleep is true, then this
+     *method will sleep until the event is enqueued.  If sleep is false,
+     *then enqueueEvent will immediatly return kIOReturnNoResources.
+     */
+    virtual IOReturn enqueueEvent(UInt32 event, UInt32 data, bool sleep);
+
+    /* dequeueEvent will remove the oldest event from the RX queue and return
+     *it in event & data.  The sleep argument defines the behaviour if the RX
+     *queue is empty.  If sleep is true, then this method will sleep until an
+     *event is available.  If sleep is false, then an EOQ event will be
+     *returned.  In either case kIOReturnSuccess is returned.
+     */
+    virtual IOReturn dequeueEvent(UInt32 *event, UInt32 *data, bool sleep);
+
+    /* enqueueData will attempt to copy data from the specified buffer to the
+     *TX queue as a sequence of VALID_DATA events.  The argument bufferSize
+     *specifies the number of bytes to be sent.  The actual number of bytes
+     *transferred is returned in transferCount.  If sleep is true, then this
+     *method will sleep until all bytes can be transferred.  If sleep is
+     *false, then as many bytes as possible will be copied to the TX queue.
+     */
+    virtual IOReturn enqueueData(UInt8 *buffer,  UInt32 size, UInt32 *count, bool sleep );
+
+    /* dequeueData will attempt to copy data from the RX queue to the specified
+     *buffer.  No more than bufferSize VALID_DATA events will be transferred.
+     *In other words, copying will continue until either a non-data event is
+     *encountered or the transfer buffer is full.  The actual number of bytes
+     *transferred is returned in transferCount.
+     *
+     *The sleep semantics of this method are slightly more complicated than
+     *other methods in this API:  Basically, this method will continue to
+     *sleep until either minCount characters have been received or a non
+     *data event is next in the RX queue.  If minCount is zero, then this
+     *method never sleeps and will return immediatly if the queue is empty.
+     *
+     *The latency parameter specifies the maximum amount of time that should
+     *pass after the first character is available before the routine returns.
+     *This allows the caller to specify a 'packet' timeout.  The unit of the
+     *latency parameter is microseconds, though the exact delay may vary
+     *depending on the granularity of the timeout services available to the
+     *driver.
+     */
+    virtual IOReturn dequeueData(UInt8 *buffer, UInt32 size, UInt32 *count, UInt32 min);
+
+    /*	Internal for IOSerialDriver only */
+    virtual bool init(OSDictionary *dictionary = 0, void *refCon = 0);
+    virtual bool attach(IOService *provider);
+    void *getRefCon() const { return fRefCon; }
+
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  0);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  1);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  2);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  3);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  4);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  5);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  6);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  7);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  8);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  9);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 10);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 11);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 12);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 13);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 14);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 15);
+};
+
+#endif /* !_SERIAL_IOSERIALSTREAMSYNC_H */
+
+
diff --git a/i386/include/IOKit/serial/IOModemSerialStreamSync.h b/i386/include/IOKit/serial/IOModemSerialStreamSync.h
new file mode 100644
index 0000000..be75287
--- /dev/null
+++ b/i386/include/IOKit/serial/IOModemSerialStreamSync.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *
+ * IOModemSerialStreamSync.h
+ * This file contains Modem specific extensions to the IOSerialStreamSync class.
+ *
+ * 2000-10-21	gvdl	Initial real change to IOKit serial family.
+ *
+ */  
+
+#ifndef _SERIAL_IOMODEMSERIALSTREAMSYNC_H
+#define _SERIAL_IOMODEMSERIALSTREAMSYNC_H
+
+#include <IOKit/serial/IOSerialStreamSync.h>
+
+class IOModemSerialStreamSync : public IOSerialStreamSync
+{
+    OSDeclareDefaultStructors(IOModemSerialStreamSync)
+};
+
+#endif /* !_SERIAL_IOMODEMSERIALSTREAMSYNC_H */
+
diff --git a/i386/include/IOKit/serial/IORS232SerialStreamSync.h b/i386/include/IOKit/serial/IORS232SerialStreamSync.h
new file mode 100644
index 0000000..15d520a
--- /dev/null
+++ b/i386/include/IOKit/serial/IORS232SerialStreamSync.h
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * IORS232SerialStreamSync.h
+ * This file contains RS232 specific extensions to the IOSerialStreamSync class.
+ *
+ * 2000-10-21	gvdl	Initial real change to IOKit serial family.
+ */  
+
+#ifndef _SERIAL_IORS232SERIALSTREAMSYNC_H
+#define _SERIAL_IORS232SERIALSTREAMSYNC_H
+
+#include <sys/ioctl.h>
+#include <IOKit/serial/IOSerialStreamSync.h>
+
+/*
+ * Extra events for RS232 based PortDevices
+ */  
+
+#define PD_RS232_E_RX_LINE_BREAK      (PD_DATA_VOID|PD_OP(63))  // line break was received
+#define PD_RS232_E_LINE_BREAK         (PD_DATA_BYTE|PD_OP(62))  // BOOL set/clear line break    
+
+#define PD_RS232_E_RX_STOP_BITS       (PD_DATA_LONG|PD_OP(61))  // half stop bits
+#define PD_RS232_E_STOP_BITS          (PD_DATA_LONG|PD_OP(60))  // half stop bits
+
+#define PD_RS232_E_XON_BYTE           (PD_DATA_BYTE|PD_OP(59))  // The XON char for TX&RX
+#define PD_RS232_E_XOFF_BYTE          (PD_DATA_BYTE|PD_OP(58))  // The XOFF char for TX&RX
+
+#define PD_RS232_E_MIN_LATENCY        (PD_DATA_BYTE|PD_OP(57))  // BOOL true if low latency req
+
+/*
+ * RS232 Parity stuff, used with the DATA_INTEGRITY event
+ */  
+#define PD_RS232_PARITY_DEFAULT	0	// Valid only for RX, means follow TX
+#define PD_RS232_PARITY_NONE	1	// No Parity bit inserted or expected
+#define PD_RS232_PARITY_ODD	2	// Odd Parity bit inserted or expected
+#define PD_RS232_PARITY_EVEN	3	// Even Parity bit inserted or expected
+#define PD_RS232_PARITY_MARK	4	// Mark inserted or expected
+#define PD_RS232_PARITY_SPACE	5	// Space inserted or expected
+#define PD_RS232_PARITY_ANY	6	// Valid only for RX, means discard parity
+
+/*
+ * RS232 Flow Control specifiers, used with the FLOW_CONTROL event
+ * NB. The XON  character is set with FLOW_START_DATA
+ * and the XOFF character is set with FLOW_STOP_DATA.
+ *
+ * Signal  Name                          Direction
+ *  RFR     Ready For Receive             Output generated by UART
+ *  RTS     Ready To Send (alias of RFR)  Output generated by UART
+ *  CTS     Clear To Send		  Input sensed by UART
+ *  DTR     Data Terminal Ready           Output generated by UART
+ *  DSR     Data Set Ready                Input sensed by UART
+ *  TXO     XON/XOFF/XANY protocol        Characters received by UART
+ *  RXO     XON/XOFF protocol             Characters transmitted by UART
+ *  DCD     Data Carrier Detect           Input sensed by UART
+ */
+
+/*
+ * RS232 State Word extensions, based on <bsd/sys/ioctl.h>
+ * Also the 'current state' bits for enq/deq of Flow Control event
+ */  
+#define PD_RS232_S_MASK   0x0000ffffUL
+#define PD_RS232_S_SHIFT  0	// to align State bits for enq/deq event
+#define PD_RS232_D_MASK   0xffff0000UL
+#define PD_RS232_D_SHIFT  16	// to align Delta bits for enq/deq event
+#define PD_RS232_A_MASK   0x0000ffffUL
+#define PD_RS232_A_SHIFT  0	// to align Auto bits for req/exec event
+#define PD_RS232_N_MASK   0xffff0000UL
+#define PD_RS232_N_SHIFT  16	// to align Notify bits for req/exec event
+
+#define	PD_RS232_S_LE	TIOCM_LE	// line enable
+#define	PD_RS232_S_DTR	TIOCM_DTR	// data terminal ready
+#define	PD_RS232_S_RTS	TIOCM_RTS	// request to send
+#define	PD_RS232_S_RFR	PD_RS232_S_RTS	// ready for receive
+#define	PD_RS232_S_TXO	TIOCM_ST	// TX XON/XOFF
+#define	PD_RS232_S_RXO	TIOCM_SR	// RX XON/XOFF
+#define	PD_RS232_S_CTS	TIOCM_CTS	// clear to send
+#define	PD_RS232_S_CAR	TIOCM_CAR	// carrier detect
+#define	PD_RS232_S_DCD	PD_RS232_S_CAR
+#define	PD_RS232_S_RNG	TIOCM_RNG	// ring
+#define	PD_RS232_S_RI	PD_RS232_S_RNG
+#define	PD_RS232_S_DSR	TIOCM_DSR	// data set ready
+
+#define	PD_RS232_S_BRK	0x00000800UL	// break active Extension to TIOCM   
+#define	PD_RS232_S_LOOP	0x00001000UL	// LOOP back Extension to TIOCM
+#define PD_RS232_S_TXQ	0x00002000UL	// User flowcontrol bit
+#define PD_RS232_S_RXQ	0x00004000UL	// User flowcontrol bit
+
+// The 'delta' bits for enq/deq of Flow Control event
+#define	PD_RS232_D_LE	(PD_RS232_S_LE  << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_DTR	(PD_RS232_S_DTR << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_RTS	(PD_RS232_S_RTS << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_RFR	(PD_RS232_S_RFR << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_TXO	(PD_RS232_S_TXO << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_RXO	(PD_RS232_S_RXO << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_CTS	(PD_RS232_S_CTS << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_CAR	(PD_RS232_S_CAR << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_DCD	(PD_RS232_S_DCD << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_RNG	(PD_RS232_S_RNG << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_RI	(PD_RS232_S_RI  << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_DSR	(PD_RS232_S_DSR << PD_RS232_D_SHIFT)
+ 
+#define	PD_RS232_D_BRK	(PD_RS232_S_BRK  << PD_RS232_D_SHIFT)
+#define	PD_RS232_D_LOOP (PD_RS232_S_LOOP << PD_RS232_D_SHIFT)
+#define PD_RS232_D_TXQ	(PD_RS232_S_TXQ  << PD_RS232_D_SHIFT)
+#define PD_RS232_D_RXQ	(PD_RS232_S_RXQ  << PD_RS232_D_SHIFT)
+
+// The 'auto' bits for exec/req of Flow Control event
+#define	PD_RS232_A_LE	PD_RS232_S_LE
+#define	PD_RS232_A_DTR	PD_RS232_S_DTR
+#define	PD_RS232_A_RTS	PD_RS232_S_RTS
+#define	PD_RS232_A_RFR	PD_RS232_S_RFR
+#define	PD_RS232_A_TXO	PD_RS232_S_TXO
+#define	PD_RS232_A_RXO	PD_RS232_S_RXO
+#define	PD_RS232_A_CTS	PD_RS232_S_CTS
+#define	PD_RS232_A_CAR	PD_RS232_S_CAR
+#define	PD_RS232_A_DCD	PD_RS232_S_DCD
+#define	PD_RS232_A_RNG	PD_RS232_S_RNG
+#define	PD_RS232_A_RI	PD_RS232_S_RI
+#define	PD_RS232_A_DSR	PD_RS232_S_DSR
+#define PD_RS232_A_XANY	0x00000400	// changes _A_TXO from XON/XOFF to XANY/XOFF
+#define	PD_RS232_A_BRK	PD_RS232_S_BRK   
+#define	PD_RS232_A_LOOP PD_RS232_S_LOOP
+#define PD_RS232_A_TXQ	PD_RS232_S_TXQ
+#define PD_RS232_A_RXQ	PD_RS232_S_RXQ
+
+// The 'notify' bits for exec/req of Flow Control event
+#define	PD_RS232_N_LE	(PD_RS232_S_LE  << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_DTR	(PD_RS232_S_DTR << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_RTS	(PD_RS232_S_RTS << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_RFR	(PD_RS232_S_RFR << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_TXO	(PD_RS232_S_TXO << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_RXO	(PD_RS232_S_RXO << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_CTS	(PD_RS232_S_CTS << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_CAR	(PD_RS232_S_CAR << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_DCD	(PD_RS232_S_DCD << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_RNG	(PD_RS232_S_RNG << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_RI	(PD_RS232_S_RI  << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_DSR	(PD_RS232_S_DSR << PD_RS232_N_SHIFT)
+
+#define	PD_RS232_N_BRK	(PD_RS232_S_BRK  << PD_RS232_N_SHIFT)
+#define	PD_RS232_N_LOOP (PD_RS232_S_LOOP << PD_RS232_N_SHIFT)
+#define PD_RS232_N_TXQ	(PD_RS232_S_TXQ  << PD_RS232_N_SHIFT)
+#define PD_RS232_N_RXQ	(PD_RS232_S_RXQ  << PD_RS232_N_SHIFT)
+
+class IORS232SerialStreamSync : public IOSerialStreamSync
+{
+    OSDeclareDefaultStructors(IORS232SerialStreamSync)
+};
+
+#endif /* !_SERIAL_IORS232SERIALSTREAMSYNC_H */
+
diff --git a/i386/include/IOKit/serial/IOSerialDriverSync.h b/i386/include/IOKit/serial/IOSerialDriverSync.h
new file mode 100644
index 0000000..92f69df
--- /dev/null
+++ b/i386/include/IOKit/serial/IOSerialDriverSync.h
@@ -0,0 +1,91 @@
+/*
+ *Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ *@APPLE_LICENSE_HEADER_START@
+ *
+ *The contents of this file constitute Original Code as defined in and
+ *are subject to the Apple Public Source License Version 1.1 (the
+ *"License").  You may not use this file except in compliance with the
+ *License.  Please obtain a copy of the License at
+ *http://www.apple.com/publicsource and read it before using this file.
+ *
+ *This Original Code and all software distributed under the License are
+ *distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ *EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ *INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ *FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ *License for the specific language governing rights and limitations
+ *under the License.
+ *
+ *@APPLE_LICENSE_HEADER_END@
+ */
+
+/*  
+ * IOSerialDriverSync.h
+ * This file contains the abstract parent class for any IOSerialDriver
+ * interface, which is a generic serial interface, designed for devices
+ * that do character oriented transfers (async) rather than block or
+ * packet transfers.  Most notably RS-232, Printer, Mouse, and Keyboard
+ * type devices.
+ *
+ * 2000-10-21	gvdl	Initial real change to IOKit serial family.
+ */
+
+#ifndef _SERIAL_IOSERIALDRIVERSYNC_H
+#define _SERIAL_IOSERIALDRIVERSYNC_H
+
+#include <IOKit/IOService.h>
+
+class IOSerialDriverSync : public IOService
+{
+    OSDeclareAbstractStructors(IOSerialDriverSync);
+
+public:
+    virtual IOReturn acquirePort(bool sleep, void *refCon) = 0;
+
+    virtual IOReturn releasePort(void *refCon) = 0;
+
+    virtual IOReturn setState(UInt32 state, UInt32 mask, void *refCon) = 0;
+
+    virtual UInt32 getState(void *refCon) = 0;
+
+    virtual IOReturn watchState(UInt32 *state, UInt32 mask, void *refCon) = 0;
+
+    virtual UInt32 nextEvent(void *refCon) = 0;
+
+    virtual IOReturn executeEvent(UInt32 event, UInt32 data, void *refCon) = 0;
+
+    virtual IOReturn requestEvent(UInt32 event, UInt32 *data, void *refCon) = 0;
+
+    virtual IOReturn enqueueEvent(UInt32 event, UInt32 data,
+                                  bool sleep, void *refCon) = 0;
+
+    virtual IOReturn dequeueEvent(UInt32 *event, UInt32 *data,
+                                  bool sleep, void *refCon) = 0;
+
+    virtual IOReturn enqueueData(UInt8 *buffer, UInt32 size, UInt32 *count,
+                                 bool sleep, void *refCon) = 0;
+
+    virtual IOReturn dequeueData(UInt8 *buffer, UInt32 size, UInt32 *count,
+                                 UInt32 min, void *refCon) = 0;
+
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  0);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  1);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  2);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  3);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  4);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  5);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  6);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  7);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  8);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  9);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 10);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 11);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 12);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 13);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 14);
+OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 15);
+
+};
+
+#endif /* !_SERIAL_IOSERIALDRIVERSYNC_H */
diff --git a/i386/include/IOKit/serial/IOSerialKeys.h b/i386/include/IOKit/serial/IOSerialKeys.h
new file mode 100644
index 0000000..9538a24
--- /dev/null
+++ b/i386/include/IOKit/serial/IOSerialKeys.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * IOSerialKeys.h
+ *
+ * 2000-10-21	gvdl	Initial real change to IOKit serial family.
+ *
+ */
+
+/*
+Sample Matching dictionary
+{
+    IOProviderClass = kIOSerialBSDServiceValue;
+    kIOSerialBSDTypeKey = kIOSerialBSDAllTypes
+			| kIOSerialBSDModemType
+			| kIOSerialBSDRS232Type;
+    kIOTTYDeviceKey = <Raw Unique Device Name>;
+    kIOTTYBaseNameKey = <Raw Unique Device Name>;
+    kIOTTYSuffixKey = <Raw Unique Device Name>;
+    kIOCalloutDeviceKey = <Callout Device Name>;
+    kIODialinDeviceKey = <Dialin Device Name>;
+}
+
+Note only the IOProviderClass is mandatory.  The other keys allow the searcher to reduce the size of the set of matching devices.
+*/
+
+/* Service Matching That is the 'IOProviderClass' */
+#define kIOSerialBSDServiceValue	"IOSerialBSDClient"
+
+/* Matching keys */
+#define kIOSerialBSDTypeKey		"IOSerialBSDClientType"
+
+/* Currently possible kIOSerialBSDTypeKey values. */
+#define kIOSerialBSDAllTypes		"IOSerialStream"
+#define kIOSerialBSDModemType		"IOModemSerialStream"
+#define kIOSerialBSDRS232Type		"IORS232SerialStream"
+
+// Properties that resolve to a /dev device node to open for
+// a particular service
+#define kIOTTYDeviceKey			"IOTTYDevice"
+#define kIOTTYBaseNameKey		"IOTTYBaseName"
+#define kIOTTYSuffixKey			"IOTTYSuffix"
+
+#define kIOCalloutDeviceKey		"IOCalloutDevice"
+#define kIODialinDeviceKey		"IODialinDevice"
+
+// Property 'ioctl' wait for the tty device to go idle.
+#define kIOTTYWaitForIdleKey		"IOTTYWaitForIdle"
+
+#if KERNEL
+extern const OSSymbol *gIOSerialBSDServiceValue;
+extern const OSSymbol *gIOSerialBSDTypeKey;
+extern const OSSymbol *gIOSerialBSDAllTypes;
+extern const OSSymbol *gIOSerialBSDModemType;
+extern const OSSymbol *gIOSerialBSDRS232Type;
+extern const OSSymbol *gIOTTYDeviceKey;
+extern const OSSymbol *gIOTTYBaseNameKey;
+extern const OSSymbol *gIOTTYSuffixKey;
+extern const OSSymbol *gIOCalloutDeviceKey;
+extern const OSSymbol *gIODialinDeviceKey;
+#endif /* KERNEL */
diff --git a/i386/include/IOKit/serial/IOSerialStreamSync.h b/i386/include/IOKit/serial/IOSerialStreamSync.h
new file mode 100644
index 0000000..b654adb
--- /dev/null
+++ b/i386/include/IOKit/serial/IOSerialStreamSync.h
@@ -0,0 +1,275 @@
+/*
+ *Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ *@APPLE_LICENSE_HEADER_START@
+ *
+ *The contents of this file constitute Original Code as defined in and
+ *are subject to the Apple Public Source License Version 1.1 (the
+ *"License").  You may not use this file except in compliance with the
+ *License.  Please obtain a copy of the License at
+ *http://www.apple.com/publicsource and read it before using this file.
+ *
+ *This Original Code and all software distributed under the License are
+ *distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ *EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ *INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ *FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ *License for the specific language governing rights and limitations
+ *under the License.
+ *
+ *@APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *  IOSerialStreamSync.h
+ *
+ *  2000-10-21	gvdl	Initial real change to IOKit serial family.
+ *
+ */
+
+#ifndef	_SERIAL_IOSERIALSTREAMSYNC_H
+#define	_SERIAL_IOSERIALSTREAMSYNC_H
+
+#include <IOKit/IOService.h>
+
+#ifdef __LP64__
+
+#define PD_DATA_MASK 0x03U
+#define PD_DATA_VOID 0x00U
+#define PD_DATA_BYTE 0x01U
+#define PD_DATA_WORD 0x02U
+#define PD_DATA_LONG 0x03U
+
+#else
+
+#define PD_DATA_MASK 0x03UL
+#define PD_DATA_VOID 0x00UL
+#define PD_DATA_BYTE 0x01UL
+#define PD_DATA_WORD 0x02UL
+#define PD_DATA_LONG 0x03UL
+
+#endif
+
+#define PD_OP(x)	((x) << 2)
+#define PD_E_MASK	(~PD_DATA_MASK)
+
+/* General Command & Status events */
+#define PD_E_EOQ		(PD_DATA_VOID|PD_OP( 0))	// Always nextEvent on empty queue
+#define PD_E_ACTIVE		(PD_DATA_BYTE|PD_OP( 1))	// BOOL start/shutdown chip
+
+/* Queue management events - all units are multiples of characters
+ *based on the current character size
+ */
+#define PD_E_TXQ_SIZE 		(PD_DATA_LONG|PD_OP( 2))
+#define PD_E_RXQ_SIZE		(PD_DATA_LONG|PD_OP( 3))
+#define PD_E_TXQ_LOW_WATER	(PD_DATA_LONG|PD_OP( 4))
+#define PD_E_RXQ_LOW_WATER	(PD_DATA_LONG|PD_OP( 5))
+#define PD_E_TXQ_HIGH_WATER	(PD_DATA_LONG|PD_OP( 6))
+#define PD_E_RXQ_HIGH_WATER	(PD_DATA_LONG|PD_OP( 7))
+#define PD_E_TXQ_AVAILABLE	(PD_DATA_LONG|PD_OP( 8))
+#define PD_E_RXQ_AVAILABLE	(PD_DATA_LONG|PD_OP( 9))
+#define PD_E_TXQ_FLUSH 		(PD_DATA_VOID|PD_OP(10))
+#define PD_E_RXQ_FLUSH		(PD_DATA_LONG|PD_OP(11))
+
+/* port & link characteristics - units are half bits */
+#define PD_E_DATA_RATE 		(PD_DATA_LONG|PD_OP(12))	// raw bits of symbols per second
+#define PD_E_RX_DATA_RATE	(PD_DATA_LONG|PD_OP(13))
+#define PD_E_DATA_SIZE 		(PD_DATA_LONG|PD_OP(14))	// raw bits per symbol
+#define PD_E_RX_DATA_SIZE	(PD_DATA_LONG|PD_OP(15))
+#define PD_E_DATA_INTEGRITY	(PD_DATA_LONG|PD_OP(16))	// parity or ECC method
+#define PD_E_RX_DATA_INTEGRITY	(PD_DATA_LONG|PD_OP(17))
+#define PD_E_EXTERNAL_CLOCK_MODE (PD_DATA_LONG|PD_OP(28))	// multiplier between clock and data rates
+
+/* timeout events */
+#define PD_E_DELAY		(PD_DATA_LONG|PD_OP(18))	// inter-character delay (us)
+#define PD_E_DATA_LATENCY	(PD_DATA_LONG|PD_OP(19))	// A dequeueData Latency timeout
+								// rcs Secondary Timer mainly to fix performance 
+								// problems with MIDI and IRDA drivers.
+								// Midi and Irda drivers will issue an IOCTL
+								// call with this as the selector and
+								// the Data as the value they want the rate set
+								// to (Typically 1 for IrDA devices) 
+#define PD_E_FLOW_CONTROL       (PD_DATA_LONG|PD_OP(20))  	// enable/disable each flow mechanism
+
+/* I/O events */
+#define PD_E_VALID_DATA 	(PD_DATA_VOID|PD_OP(21))	// A valid frame was received
+#define PD_E_VALID_DATA_BYTE 	(PD_DATA_BYTE|PD_E_VALID_DATA)
+#define PD_E_VALID_DATA_WORD 	(PD_DATA_WORD|PD_E_VALID_DATA)
+#define PD_E_VALID_DATA_LONG 	(PD_DATA_LONG|PD_E_VALID_DATA)
+
+#define PD_E_SPECIAL		(PD_DATA_VOID|PD_OP(22))	// valid data received with 'special' value
+#define PD_E_SPECIAL_BYTE 	(PD_DATA_BYTE|PD_E_SPECIAL)
+#define PD_E_SPECIAL_WORD 	(PD_DATA_WORD|PD_E_SPECIAL)
+#define PD_E_SPECIAL_LONG 	(PD_DATA_LONG|PD_E_SPECIAL)
+
+#define PD_E_FRAMING_ERROR 	(PD_DATA_VOID|PD_OP(23))	// Failure occured assembling frame
+#define PD_E_FRAMING_BYTE 	(PD_DATA_BYTE|PD_E_FRAMING_ERROR)
+#define PD_E_FRAMING_WORD 	(PD_DATA_WORD|PD_E_FRAMING_ERROR)
+#define PD_E_FRAMING_LONG 	(PD_DATA_LONG|PD_E_FRAMING_ERROR)
+
+#define PD_E_INTEGRITY_ERROR 	(PD_DATA_VOID|PD_OP(24))	// An uncorrectable frame was received
+#define PD_E_INTEGRITY_BYTE 	(PD_DATA_BYTE|PD_E_INTEGRITY_ERROR)
+#define PD_E_INTEGRITY_WORD 	(PD_DATA_WORD|PD_E_INTEGRITY_ERROR)
+#define PD_E_INTEGRITY_LONG 	(PD_DATA_LONG|PD_E_INTEGRITY_ERROR)
+
+#define PD_E_INTEGRITY_WARNING 	(PD_DATA_VOID|PD_OP(25))	// A correctable frame was received
+#define PD_E_HW_OVERRUN_ERROR 	(PD_DATA_VOID|PD_OP(26))	// Hardware's buffer overflowed, data lost
+#define PD_E_SW_OVERRUN_ERROR 	(PD_DATA_VOID|PD_OP(27))	// Driver's buffer overflowed, data lost
+
+/*
+ *The variables below make up the bits returned
+ *by the State methods:- getState, setState, watchState
+ */
+#define PD_S_MASK		0xffff0000UL
+#define PD_S_RX_OFFSET		7
+
+#define PD_S_ACQUIRED		0x80000000UL
+#define PD_S_ACTIVE		0x40000000UL
+
+#define PD_S_TX_ENABLE		0x20000000UL
+#define PD_S_TX_BUSY		0x10000000UL
+#define PD_S_TX_EVENT 		0x08000000UL
+#define PD_S_TXQ_EMPTY 		0x04000000UL
+#define PD_S_TXQ_LOW_WATER 	0x02000000UL
+#define PD_S_TXQ_HIGH_WATER 	0x01000000UL
+#define PD_S_TXQ_FULL 		0x00800000UL
+#define PD_S_TXQ_MASK		( PD_S_TXQ_EMPTY | PD_S_TXQ_LOW_WATER \
+                                | PD_S_TXQ_FULL  | PD_S_TXQ_HIGH_WATER )
+
+#define PD_S_RX_ENABLE		(PD_S_TX_ENABLE      >> PD_S_RX_OFFSET)
+#define PD_S_RX_BUSY		(PD_S_TX_BUSY        >> PD_S_RX_OFFSET)
+#define PD_S_RX_EVENT		(PD_S_TX_EVENT       >> PD_S_RX_OFFSET)
+#define PD_S_RXQ_EMPTY 		(PD_S_TXQ_EMPTY      >> PD_S_RX_OFFSET)
+#define PD_S_RXQ_LOW_WATER	(PD_S_TXQ_LOW_WATER  >> PD_S_RX_OFFSET)
+#define PD_S_RXQ_HIGH_WATER	(PD_S_TXQ_HIGH_WATER >> PD_S_RX_OFFSET)
+#define PD_S_RXQ_FULL 		(PD_S_TXQ_FULL       >> PD_S_RX_OFFSET)
+#define PD_S_RXQ_MASK		(PD_S_TXQ_MASK       >> PD_S_RX_OFFSET)
+
+class IOSerialDriverSync;
+class IOSerialStreamSync : public IOService
+{
+    OSDeclareDefaultStructors(IOSerialStreamSync);
+
+protected:
+    IOSerialDriverSync *fProvider;
+    void *fRefCon;
+
+public:
+    /* acquire tests and sets the state of the port object.  If the port was
+    *available, then the state is set to busy, and kIOReturnSuccess is returned.
+    *If the port was already busy and sleep is YES, then the thread will sleep
+    *until the port is freed, then re-attempts the acquire.  If the port was
+    *already busy and sleep in NO, then kIOReturnExclusiveAccess is returned.
+    */   
+    virtual IOReturn acquirePort(bool sleep);
+    
+    /* release sets the state of the port object to available and wakes up any
+    *threads sleeping for access to this port.  It will return kIOReturnSuccess
+    *if the port was in a busy state, and kIOReturnNotOpen if it was available.
+    */
+    virtual IOReturn releasePort();
+    
+    /*
+     *Set the state for the port device.
+     */
+    virtual IOReturn setState(UInt32 state, UInt32 mask);
+
+    /*
+     *Get the state for the port device.
+     */
+    virtual UInt32 getState();
+    
+    /*
+     *Wait for the at least one of the state bits defined in mask to be equal
+     *to the value defined in state.
+     *Check on entry then sleep until necessary.
+     */
+    virtual IOReturn watchState(UInt32 *state, UInt32 mask);
+
+    /* nextEvent returns the type of the next event on the RX queue.  If no
+     *events are present on the RX queue, then EOQ is returned.
+     */
+    virtual UInt32 nextEvent();
+
+    /* executeEvent causes the specified event to be processed immediately.
+     *This is primarily used for channel control commands like START & STOP
+     */
+    virtual IOReturn executeEvent(UInt32 event, UInt32 data);
+
+    /* requestEvent processes the specified event as an immediate request and
+     *returns the results in data.  This is primarily used for getting link
+     *status information and verifying baud rate and such.
+     */
+    virtual IOReturn requestEvent(UInt32 event, UInt32 *data);
+
+    /* enqueueEvent will place the specified event into the TX queue.  The
+     *sleep argument allows the caller to specify the enqueueEvent's
+     *behaviour when the TX queue is full.  If sleep is true, then this
+     *method will sleep until the event is enqueued.  If sleep is false,
+     *then enqueueEvent will immediatly return kIOReturnNoResources.
+     */
+    virtual IOReturn enqueueEvent(UInt32 event, UInt32 data, bool sleep);
+
+    /* dequeueEvent will remove the oldest event from the RX queue and return
+     *it in event & data.  The sleep argument defines the behaviour if the RX
+     *queue is empty.  If sleep is true, then this method will sleep until an
+     *event is available.  If sleep is false, then an EOQ event will be
+     *returned.  In either case kIOReturnSuccess is returned.
+     */
+    virtual IOReturn dequeueEvent(UInt32 *event, UInt32 *data, bool sleep);
+
+    /* enqueueData will attempt to copy data from the specified buffer to the
+     *TX queue as a sequence of VALID_DATA events.  The argument bufferSize
+     *specifies the number of bytes to be sent.  The actual number of bytes
+     *transferred is returned in transferCount.  If sleep is true, then this
+     *method will sleep until all bytes can be transferred.  If sleep is
+     *false, then as many bytes as possible will be copied to the TX queue.
+     */
+    virtual IOReturn enqueueData(UInt8 *buffer,  UInt32 size, UInt32 *count, bool sleep );
+
+    /* dequeueData will attempt to copy data from the RX queue to the specified
+     *buffer.  No more than bufferSize VALID_DATA events will be transferred.
+     *In other words, copying will continue until either a non-data event is
+     *encountered or the transfer buffer is full.  The actual number of bytes
+     *transferred is returned in transferCount.
+     *
+     *The sleep semantics of this method are slightly more complicated than
+     *other methods in this API:  Basically, this method will continue to
+     *sleep until either minCount characters have been received or a non
+     *data event is next in the RX queue.  If minCount is zero, then this
+     *method never sleeps and will return immediatly if the queue is empty.
+     *
+     *The latency parameter specifies the maximum amount of time that should
+     *pass after the first character is available before the routine returns.
+     *This allows the caller to specify a 'packet' timeout.  The unit of the
+     *latency parameter is microseconds, though the exact delay may vary
+     *depending on the granularity of the timeout services available to the
+     *driver.
+     */
+    virtual IOReturn dequeueData(UInt8 *buffer, UInt32 size, UInt32 *count, UInt32 min);
+
+    /*	Internal for IOSerialDriver only */
+    virtual bool init(OSDictionary *dictionary = 0, void *refCon = 0);
+    virtual bool attach(IOService *provider);
+    void *getRefCon() const { return fRefCon; }
+
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  0);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  1);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  2);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  3);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  4);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  5);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  6);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  7);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  8);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  9);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 10);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 11);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 12);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 13);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 14);
+OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 15);
+};
+
+#endif /* !_SERIAL_IOSERIALSTREAMSYNC_H */
+
+
diff --git a/i386/include/IOKit/storage/.svn/all-wcprops b/i386/include/IOKit/storage/.svn/all-wcprops
new file mode 100644
index 0000000..394531d
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/all-wcprops
@@ -0,0 +1,185 @@
+K 25
+svn:wc:ra_dav:version-url
+V 60
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage
+END
+IOBDBlockStorageDriver.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOBDBlockStorageDriver.h
+END
+IOCDBlockStorageDriver.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOCDBlockStorageDriver.h
+END
+IODVDTypes.h
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IODVDTypes.h
+END
+IOStorage.h
+K 25
+svn:wc:ra_dav:version-url
+V 72
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOStorage.h
+END
+IOCDPartitionScheme.h
+K 25
+svn:wc:ra_dav:version-url
+V 82
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOCDPartitionScheme.h
+END
+IOBDBlockStorageDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOBDBlockStorageDevice.h
+END
+IODVDMediaBSDClient.h
+K 25
+svn:wc:ra_dav:version-url
+V 82
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IODVDMediaBSDClient.h
+END
+IOCDBlockStorageDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOCDBlockStorageDevice.h
+END
+IOGUIDPartitionScheme.h
+K 25
+svn:wc:ra_dav:version-url
+V 84
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOGUIDPartitionScheme.h
+END
+IOMediaBSDClient.h
+K 25
+svn:wc:ra_dav:version-url
+V 79
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOMediaBSDClient.h
+END
+IOBDTypes.h
+K 25
+svn:wc:ra_dav:version-url
+V 72
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOBDTypes.h
+END
+IOFilterScheme.h
+K 25
+svn:wc:ra_dav:version-url
+V 77
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOFilterScheme.h
+END
+IOCDTypes.h
+K 25
+svn:wc:ra_dav:version-url
+V 72
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOCDTypes.h
+END
+IOBDMediaBSDClient.h
+K 25
+svn:wc:ra_dav:version-url
+V 81
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOBDMediaBSDClient.h
+END
+IODVDMedia.h
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IODVDMedia.h
+END
+IOCDMediaBSDClient.h
+K 25
+svn:wc:ra_dav:version-url
+V 81
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOCDMediaBSDClient.h
+END
+IOFDiskPartitionScheme.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOFDiskPartitionScheme.h
+END
+IOMedia.h
+K 25
+svn:wc:ra_dav:version-url
+V 70
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOMedia.h
+END
+IOApplePartitionScheme.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOApplePartitionScheme.h
+END
+IOStorageDeviceCharacteristics.h
+K 25
+svn:wc:ra_dav:version-url
+V 93
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOStorageDeviceCharacteristics.h
+END
+IOStorageProtocolCharacteristics.h
+K 25
+svn:wc:ra_dav:version-url
+V 95
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOStorageProtocolCharacteristics.h
+END
+IOBDMedia.h
+K 25
+svn:wc:ra_dav:version-url
+V 72
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOBDMedia.h
+END
+IOCDMedia.h
+K 25
+svn:wc:ra_dav:version-url
+V 72
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOCDMedia.h
+END
+IOAppleLabelScheme.h
+K 25
+svn:wc:ra_dav:version-url
+V 81
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOAppleLabelScheme.h
+END
+IODVDBlockStorageDriver.h
+K 25
+svn:wc:ra_dav:version-url
+V 86
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IODVDBlockStorageDriver.h
+END
+IOBlockStorageDriver.h
+K 25
+svn:wc:ra_dav:version-url
+V 83
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOBlockStorageDriver.h
+END
+IODVDBlockStorageDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 86
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IODVDBlockStorageDevice.h
+END
+IOFireWireStorageCharacteristics.h
+K 25
+svn:wc:ra_dav:version-url
+V 95
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOFireWireStorageCharacteristics.h
+END
+IOPartitionScheme.h
+K 25
+svn:wc:ra_dav:version-url
+V 80
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOPartitionScheme.h
+END
+IOBlockStorageDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 83
+/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOBlockStorageDevice.h
+END
diff --git a/i386/include/IOKit/storage/.svn/entries b/i386/include/IOKit/storage/.svn/entries
new file mode 100644
index 0000000..a1d8a49
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/entries
@@ -0,0 +1,1051 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/storage
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IODVDTypes.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+e483ef56f42ffa0797fc8f07728e977b
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+10778
+
+IOCDBlockStorageDriver.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+7e573eee203505f040b6c91952fd27ed
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1784
+
+IOStorage.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+6861395312a6c4d8504025439259a31d
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6542
+
+IOCDBlockStorageDevice.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+be4d88548b1a690ae872cd2bf28b314f
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1824
+
+IOMediaBSDClient.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+a223d0e3c33fa4525eed3f70692b2d17
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1089
+
+IOBDMediaBSDClient.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+a69c6652c046f1a8e2f067ee0e24abc3
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5362
+
+IODVDMedia.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+ae6b1b0b9061f9a228168c7e85b9c301
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11327
+
+IOApplePartitionScheme.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+a056bad5bd21b62813749928b63112e8
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5490
+
+IOBlockStorageDriver.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+91aa9b08fb435bcbe41cd3c05ac1c928
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8744
+
+IOPartitionScheme.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+0860e541b3aff31008ce2090fb58f93a
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+13964
+
+IOBlockStorageDevice.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+6f8ecd4d8450d6756ab68814db44e1ce
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2369
+
+IOBDBlockStorageDriver.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+7cf5b5bb3b93251c88ce55e0df8066a8
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6051
+
+IODVDMediaBSDClient.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+08191d1ae4cc6a238b9316ab3b38b716
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5926
+
+IOBDBlockStorageDevice.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+2c1c0ef6332409dae6b2795d999febbd
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5189
+
+IOCDPartitionScheme.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+844d9d0d2381539689b148fd89410116
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+8152
+
+IOGUIDPartitionScheme.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+530816f5541c8445445c5fea0f26732f
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2402
+
+IOFilterScheme.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+e33b7cb7900db1f675747ebcce9eabac
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11039
+
+IOBDTypes.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+f925111d2be6068af39a1455b650c50e
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3423
+
+IOCDTypes.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+568a8b5033fcc89b9bf5e2f5477f3898
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12304
+
+IOCDMediaBSDClient.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+a923162dc13ec3c65bf9a8630545768b
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6004
+
+IOMedia.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+81f4dba74563d2f012e1f1132ff141e5
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6890
+
+IOFDiskPartitionScheme.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+f9744ba40c80f31b76dd1dffad9efd77
+2011-05-29T20:31:39.361475Z
+916
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4057
+
+IOStorageDeviceCharacteristics.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+8684062918e25591b2a0428cee9832b2
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+14734
+
+IOStorageProtocolCharacteristics.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+325514be8136f0b9e64be88e35e9fe8d
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+40195
+
+IOBDMedia.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+1ebd0da1f4d15c3942b7afad837f8401
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9148
+
+IOAppleLabelScheme.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+5694e06bb45c5a8e4be155f216878cc8
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5461
+
+IOCDMedia.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+6678a0743a966704a1b36bc02b9d5703
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+21272
+
+ata
+dir
+
+IODVDBlockStorageDriver.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+e4adcc63709c7d75558955fb8607ba2d
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9113
+
+IOFireWireStorageCharacteristics.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+c2f19d1a81610ee239cb252b99f75f74
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2057
+
+IODVDBlockStorageDevice.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+c7b8a53c5a82f8f283d2da92e6d3f903
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5839
+
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOAppleLabelScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOAppleLabelScheme.h.svn-base
new file mode 100644
index 0000000..6e290a4
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOAppleLabelScheme.h.svn-base
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * This header contains the IOAppleLabelScheme class definition.
+ */
+
+#ifndef _IOAPPLELABELSCHEME_H
+#define _IOAPPLELABELSCHEME_H
+
+#include <IOKit/IOTypes.h>
+
+/*
+ * kIOAppleLabelSchemeClass is the name of the IOAppleLabelScheme class.
+ */
+
+#define kIOAppleLabelSchemeClass "IOAppleLabelScheme"
+
+/*
+ * Apple Label Scheme Definitions
+ */
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/* Label scheme. */
+
+struct applelabel
+{
+    uint8_t  al_boot0[416];               /* (reserved for boot area)         */
+    uint16_t al_magic;                    /* (the magic number)               */
+    uint16_t al_type;                     /* (label type)                     */
+    uint32_t al_flags;                    /* (generic flags)                  */
+    uint64_t al_offset;                   /* (offset of property area, bytes) */
+    uint32_t al_size;                     /* (size of property area, bytes)   */
+    uint32_t al_checksum;                 /* (checksum of property area)      */
+    uint8_t  al_boot1[72];                /* (reserved for boot area)         */
+};
+
+/* Label scheme signature (al_magic). */
+
+#define AL_MAGIC 0x414C
+
+/* Label scheme version (al_type). */
+
+#define AL_TYPE_DEFAULT 0x0000
+
+/* Label scheme flags (al_flags). */
+
+#define AL_FLAG_DEFAULT 0x00000000
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOFilterScheme.h>
+
+/*
+ * Class
+ */
+
+class IOAppleLabelScheme : public IOFilterScheme
+{
+    OSDeclareDefaultStructors(IOAppleLabelScheme);
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    IOMedia * _content;
+
+    /*
+     * Free all of this object's outstanding resources.
+     */
+
+    virtual void free(void);
+
+    /*
+     * Scan the provider media for an Apple label scheme.
+     */
+
+    virtual IOMedia * scan(SInt32 * score);
+
+    /*
+     * Ask whether the given content appears to be corrupt.
+     */
+
+    virtual bool isContentCorrupt(OSDictionary * properties);
+
+    /*
+     * Ask whether the given content appears to be invalid.
+     */
+
+    virtual bool isContentInvalid(OSDictionary * properties);
+
+    /*
+     * Instantiate a new media object to represent the given content.
+     */
+
+    virtual IOMedia * instantiateMediaObject(OSDictionary * properties);
+
+    /*
+     * Allocate a new media object (called from instantiateMediaObject).
+     */
+
+    virtual IOMedia * instantiateDesiredMediaObject(OSDictionary * properties);
+
+    /*
+     * Attach the given media object to the device tree plane.
+     */
+
+    virtual bool attachMediaObjectToDeviceTree(IOMedia * media);
+
+    /*
+     * Detach the given media object from the device tree plane.
+     */
+
+    virtual void detachMediaObjectFromDeviceTree(IOMedia * media);
+
+public:
+
+    /*
+     * Initialize this object's minimal state.
+     */
+
+    virtual bool init(OSDictionary * properties = 0);
+
+    /*
+     * Determine whether the provider media contains an Apple label scheme.
+     */
+
+    virtual IOService * probe(IOService * provider, SInt32 * score);
+
+    /*
+     * Publish the new media object which represents our content.
+     */
+
+    virtual bool start(IOService * provider);
+
+    /*
+     * Clean up after the media object we published before terminating.
+     */
+
+    virtual void stop(IOService * provider);
+
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  0);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  1);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  2);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  3);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  4);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  5);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  6);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  7);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  8);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  9);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 10);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 11);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 12);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 13);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 14);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 15);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOAPPLELABELSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOApplePartitionScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOApplePartitionScheme.h.svn-base
new file mode 100644
index 0000000..ace1f3b
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOApplePartitionScheme.h.svn-base
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * This header contains the IOApplePartitionScheme class definition.
+ */
+
+#ifndef _IOAPPLEPARTITIONSCHEME_H
+#define _IOAPPLEPARTITIONSCHEME_H
+
+#include <IOKit/IOTypes.h>
+
+/*
+ * kIOApplePartitionSchemeClass is the name of the IOApplePartitionScheme class.
+ */
+
+#define kIOApplePartitionSchemeClass "IOApplePartitionScheme"
+
+/*
+ * Apple Partition Map Definitions
+ */
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/* Structure constants. */
+
+#define DPISTRLEN 32
+
+/* Partition map entry, as found in blocks 1 to dpme_map_entries of the disk. */
+
+typedef struct dpme
+{
+    UInt16  dpme_signature;       /* (unique value for partition entry, 'PM') */
+    UInt16  dpme_reserved_1;      /* (reserved for future use)                */
+    UInt32  dpme_map_entries;     /* (number of partition entries)            */
+    UInt32  dpme_pblock_start;    /* (physical block start of partition)      */
+    UInt32  dpme_pblocks;         /* (physical block count of partition)      */
+    char    dpme_name[DPISTRLEN]; /* (name of partition)                      */
+    char    dpme_type[DPISTRLEN]; /* (type of partition, eg. Apple_HFS)       */
+    UInt32  dpme_lblock_start;    /* (logical block start of partition)       */
+    UInt32  dpme_lblocks;         /* (logical block count of partition)       */
+    UInt32  dpme_flags;           /* (partition flags, see defines below)     */
+    UInt32  dpme_boot_block;      /* (logical block start of boot code)       */
+    UInt32  dpme_boot_bytes;      /* (byte count of boot code)                */
+    UInt32  dpme_load_addr;       /* (load address in memory of boot code)    */
+    UInt32  dpme_load_addr_2;     /* (reserved for future use)                */
+    UInt32  dpme_goto_addr;       /* (jump address in memory of boot code)    */
+    UInt32  dpme_goto_addr_2;     /* (reserved for future use)                */
+    UInt32  dpme_checksum;        /* (checksum of boot code)                  */
+    UInt8   dpme_process_id[16];  /* (processor type)                         */
+    UInt32  dpme_reserved_2[32];  /* (reserved for future use)                */
+    UInt32  dpme_reserved_3[62];  /* (reserved for future use)                */
+} DPME;
+
+/* Driver descriptor map entry. */
+
+typedef struct DDMap
+{
+    UInt32  ddBlock;              /* (driver's block start, sbBlkSize-blocks) */
+    UInt16  ddSize;               /* (driver's block count, 512-blocks)       */
+    UInt16  ddType;               /* (driver's system type)                   */
+} DDMap;
+
+/* Driver descriptor map, as found in block zero of the disk. */
+
+typedef struct Block0
+{
+    UInt16  sbSig;                     /* (unique value for block zero, 'ER') */
+    UInt16  sbBlkSize;                 /* (block size for this device)        */
+    UInt32  sbBlkCount;                /* (block count for this device)       */
+    UInt16  sbDevType;                 /* (device type)                       */
+    UInt16  sbDevId;                   /* (device id)                         */
+    UInt32  sbDrvrData;                /* (driver data)                       */
+    UInt16  sbDrvrCount;               /* (driver descriptor count)           */
+    DDMap   sbDrvrMap[8];              /* (driver descriptor table)           */
+    UInt8   sbReserved[430];           /* (reserved for future use)           */
+} Block0;
+
+/* Partition map signature (sbSig). */
+
+#define BLOCK0_SIGNATURE 0x4552
+
+/* Partition map entry signature (dpme_signature). */
+
+#define DPME_SIGNATURE 0x504D
+
+/* Partition map entry flags (dpme_flags). */
+
+#define DPME_FLAGS_VALID          0x00000001                   /* (bit 0)     */
+#define DPME_FLAGS_ALLOCATED      0x00000002                   /* (bit 1)     */
+#define DPME_FLAGS_IN_USE         0x00000004                   /* (bit 2)     */
+#define DPME_FLAGS_BOOTABLE       0x00000008                   /* (bit 3)     */
+#define DPME_FLAGS_READABLE       0x00000010                   /* (bit 4)     */
+#define DPME_FLAGS_WRITABLE       0x00000020                   /* (bit 5)     */
+#define DPME_FLAGS_OS_PIC_CODE    0x00000040                   /* (bit 6)     */
+#define DPME_FLAGS_OS_SPECIFIC_2  0x00000080                   /* (bit 7)     */
+#define DPME_FLAGS_OS_SPECIFIC_1  0x00000100                   /* (bit 8)     */
+#define DPME_FLAGS_RESERVED_2     0xFFFFFE00                   /* (bit 9..31) */
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* !_IOAPPLEPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDevice.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDevice.h.svn-base
new file mode 100644
index 0000000..66a09d7
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDevice.h.svn-base
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOBDBlockStorageDevice
+ * @abstract
+ * This header contains the IOBDBlockStorageDevice class definition.
+ */
+
+#ifndef	_IOBDBLOCKSTORAGEDEVICE_H
+#define	_IOBDBLOCKSTORAGEDEVICE_H
+
+#include <IOKit/storage/IOBDTypes.h>
+
+/*!
+ * @defined kIOBDBlockStorageDeviceClass
+ * @abstract
+ * kIOBDBlockStorageDeviceClass is the name of the IOBDBlockStorageDevice class.
+ * @discussion
+ * kIOBDBlockStorageDeviceClass is the name of the IOBDBlockStorageDevice class.
+ */
+
+#define kIOBDBlockStorageDeviceClass "IOBDBlockStorageDevice"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IODVDBlockStorageDevice.h>
+
+/* Property used for matching, so the generic driver gets the nub it wants. */
+#define	kIOBlockStorageDeviceTypeBD	"BD"
+
+/*!
+ * @class
+ * IOBDBlockStorageDevice
+ * @abstract
+ * The IOBDBlockStorageDevice class is a generic BD block storage device
+ * abstraction.
+ * @discussion
+ * This class is the protocol for generic BD functionality, independent of
+ * the physical connection protocol (e.g. SCSI, ATA, USB).
+ *
+ * The APIs are the union of CD APIs, DVD APIs, and all
+ * necessary new low-level BD APIs.
+ *
+ * A subclass implements relay methods that translate our requests into
+ * calls to a protocol- and device-specific provider.
+ */
+
+class IOBDBlockStorageDevice : public IODVDBlockStorageDevice
+{
+    OSDeclareAbstractStructors(IOBDBlockStorageDevice)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*!
+     * @function init
+     * @discussion
+     * Initialize this object's minimal state.
+     * @param properties
+     * Substitute property table for this object (optional).
+     * @result
+     * Returns true on success, false otherwise.
+     */
+
+    virtual bool init(OSDictionary * properties);
+
+    /*!
+     * @function readDiscStructure
+     * @discussion
+     * Issue an MMC READ DISC STRUCTURE command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param format
+     * As documented by MMC.
+     * @param address
+     * As documented by MMC.
+     * @param layer
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @param type
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readDiscStructure( IOMemoryDescriptor * buffer,
+                                        UInt8                format,
+                                        UInt32               address,
+                                        UInt8                layer,
+                                        UInt8                grantID,
+                                        UInt8                type ) = 0;
+
+    /*!
+     * @function splitTrack
+     * @discussion
+     * Issue an MMC RESERVE TRACK command with the ARSV bit.
+     * @param address
+     * As documented by MMC.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn splitTrack(UInt32 address) = 0;
+
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  0);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  1);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  2);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  3);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  4);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  5);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  6);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  7);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  8);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  9);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 10);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 11);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 12);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 13);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 14);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 15);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOBDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDriver.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDriver.h.svn-base
new file mode 100644
index 0000000..199218c
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDriver.h.svn-base
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOBDBlockStorageDriver
+ * @abstract
+ * This header contains the IOBDBlockStorageDriver class definition.
+ * @discussion
+ * This class implements BD functionality, independent of
+ * the physical connection protocol (e.g. SCSI, ATA, USB).
+ *
+ * A protocol-specific provider implements the functionality using an appropriate
+ * protocol and commands.
+ */
+
+#ifndef	_IOBDBLOCKSTORAGEDRIVER_H
+#define	_IOBDBLOCKSTORAGEDRIVER_H
+
+#include <IOKit/storage/IOBDBlockStorageDevice.h>
+#include <IOKit/storage/IODVDBlockStorageDriver.h>
+
+/*!
+ * @defined kIOBDBlockStorageDriverClass
+ * @abstract
+ * kIOBDBlockStorageDriverClass is the name of the IOBDBlockStorageDriver class.
+ * @discussion
+ * kIOBDBlockStorageDriverClass is the name of the IOBDBlockStorageDriver class.
+ */
+
+#define kIOBDBlockStorageDriverClass "IOBDBlockStorageDriver"
+
+/*!
+ * @class
+ * IOBDBlockStorageDriver
+ * @abstract
+ * Generic BD Driver.
+ * @discussion
+ * Storage drivers are split into two parts: the Generic Driver handles
+ * all generic device issues, independent of the lower-level transport
+ * mechanism (e.g. SCSI, ATA, USB, FireWire). All storage operations
+ * at the Generic Driver level are translated into a series of generic
+ * device operations. These operations are passed via the Device Nub
+ * to a Transport Driver, which implements the appropriate
+ * transport-dependent protocol to execute these operations.
+ * 
+ * To determine the write-protect state of a device (or media), for
+ * example, the generic driver would issue a call to the
+ * Transport Driver's reportWriteProtection method. If this were a SCSI
+ * device, its Transport Driver would issue a Mode Sense command to
+ * extract the write-protection status bit. The Transport Driver then
+ * reports true or false to the generic driver.
+ * 
+ * The generic driver therefore has no knowledge of, or involvement
+ * with, the actual commands and mechanisms used to communicate with
+ * the device. It is expected that the generic driver will rarely, if
+ * ever, need to be subclassed to handle device idiosyncrasies; rather,
+ * the Transport Driver should be changed via overrides.
+ * 
+ * A generic driver could be subclassed to create a different type of
+ * generic device. The generic driver IOBDBlockStorageDriver class is a subclass
+ * of IODVDBlockStorageDriver, adding BD functions. Similarly, the Transport Driver
+ * IOBDBlockStorageDevice is a subclass of IODVDBlockStorageDevice, adding BD 
+ * functions.
+*/
+
+class IOBDBlockStorageDriver : public IODVDBlockStorageDriver
+{
+    OSDeclareDefaultStructors(IOBDBlockStorageDriver)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    /* Overrides of IODVDBlockStorageDriver. */
+
+    virtual IOReturn acceptNewMedia(void);
+
+    /* End of IODVDBlockStorageDriver overrides. */
+
+public:
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method to
+     * return a more specific subclass of IOService -- IOBDBlockStorageDevice.
+     * This method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOBDBlockStorageDevice * getProvider() const;
+
+    /* Overrides of IODVDBlockStorageDriver: */
+
+    virtual const char * getDeviceTypeName(void);
+    virtual IOMedia * instantiateDesiredMediaObject(void);
+    virtual IOMedia * instantiateMediaObject(UInt64 base,UInt64 byteSize,
+                                            UInt32 blockSize,char *mediaName);
+    virtual IOReturn readStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
+                                        const UInt32 address,const UInt8 layer,const UInt8 agid);
+
+    /* End of IODVDBlockStorageDriver overrides. */
+
+    /*!
+     * @function splitTrack
+     * @discussion
+     * Issue an MMC RESERVE TRACK command with the ARSV bit.
+     * @param address
+     * As documented by MMC.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn splitTrack(UInt32 address);
+
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  0);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  1);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  2);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  3);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  4);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  5);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  6);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  7);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  8);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  9);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 10);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 11);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 12);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 13);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 14);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 15);
+};
+
+#endif  /* !_IOBDBLOCKSTORAGEDRIVER_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBDMedia.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBDMedia.h.svn-base
new file mode 100644
index 0000000..e204a1e
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOBDMedia.h.svn-base
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOBDMedia
+ * @abstract
+ * This header contains the IOBDMedia class definition.
+ */
+
+#ifndef _IOBDMEDIA_H
+#define _IOBDMEDIA_H
+
+/*!
+ * @defined kIOBDMediaClass
+ * @abstract
+ * kIOBDMediaClass is the name of the IOBDMedia class.
+ * @discussion
+ * kIOBDMediaClass is the name of the IOBDMedia class.
+ */
+
+#define kIOBDMediaClass "IOBDMedia"
+
+/*!
+ * @defined kIOBDMediaTypeKey
+ * @abstract
+ * kIOBDMediaTypeKey is a property of IOBDMedia objects.  It has an OSString
+ * value.
+ * @discussion
+ * The kIOBDMediaTypeKey property identifies the BD media type (BD-ROM, BD-R,
+ * BD-RE, etc).  See the kIOBDMediaType contants for possible values.
+ */
+
+#define kIOBDMediaTypeKey "Type"
+
+/*!
+ * @defined kIOBDMediaTypeROM
+ * The kIOBDMediaTypeKey constant for BD-ROM media.
+ */
+
+#define kIOBDMediaTypeROM "BD-ROM"
+
+/*!
+ * @defined kIOBDMediaTypeR
+ * The kIOBDMediaTypeKey constant for BD-R media.
+ */
+
+#define kIOBDMediaTypeR "BD-R"
+
+/*!
+ * @defined kIOBDMediaTypeRE
+ * The kIOBDMediaTypeKey constant for BD-RE media.
+ */
+
+#define kIOBDMediaTypeRE "BD-RE"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOBDBlockStorageDriver.h>
+#include <IOKit/storage/IOMedia.h>
+
+/*!
+ * @class IOBDMedia
+ * @abstract
+ * The IOBDMedia class is a random-access disk device abstraction for BDs.
+ * @discussion
+ * The IOBDMedia class is a random-access disk device abstraction for BDs.
+ */
+
+class IOBDMedia : public IOMedia
+{
+    OSDeclareDefaultStructors(IOBDMedia)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*
+     * Obtain this object's provider.   We override the superclass's method to
+     * return a more specific subclass of IOService -- IOBDBlockStorageDriver.
+     * This method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOBDBlockStorageDriver * getProvider() const;
+
+    /*
+     * Compare the properties in the supplied table to this object's properties.
+     */
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
+
+    /*!
+     * @function reportKey
+     * @discussion
+     * Issue an MMC REPORT KEY command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param keyClass
+     * As documented by MMC.
+     * @param address
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @param format
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn reportKey( IOMemoryDescriptor * buffer,
+                                UInt8                keyClass,
+                                UInt32               address,
+                                UInt8                grantID,
+                                UInt8                format );
+
+    /*!
+     * @function sendKey
+     * @discussion
+     * Issue an MMC SEND KEY command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param keyClass
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @param format
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn sendKey( IOMemoryDescriptor * buffer,
+                              UInt8                keyClass,
+                              UInt8                grantID,
+                              UInt8                format );
+
+    /*!
+     * @function readStructure
+     * @discussion
+     * Issue an MMC READ DISC STRUCTURE command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param format
+     * As documented by MMC.
+     * @param address
+     * As documented by MMC.
+     * @param layer
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readStructure( IOMemoryDescriptor *     buffer,
+                                    UInt8                    format,
+                                    UInt32                   address,
+                                    UInt8                    layer,
+                                    UInt8                    grantID );
+
+    /*!
+     * @function getSpeed
+     * @discussion
+     * Get the current speed used for data transfers.
+     * @param kilobytesPerSecond
+     * Returns the current speed used for data transfers, in kB/s.
+     *
+     * kBDSpeedMin specifies the minimum speed for all BD media (1X).
+     * kBDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond);
+
+    /*!
+     * @function setSpeed
+     * @discussion
+     * Set the speed to be used for data transfers.
+     * @param kilobytesPerSecond
+     * Speed to be used for data transfers, in kB/s.
+     *
+     * kBDSpeedMin specifies the minimum speed for all BD media (1X).
+     * kBDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond);
+
+    /*!
+     * @function readDiscInfo
+     * @discussion
+     * Issue an MMC READ DISC INFORMATION command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param type
+     * Reserved for future use.  Set to zero.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readDiscInfo( IOMemoryDescriptor * buffer,
+                                   UInt8                type,
+                                   UInt16 *             actualByteCount );
+
+    /*!
+     * @function readTrackInfo
+     * @discussion
+     * Issue an MMC READ TRACK INFORMATION command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param address
+     * As documented by MMC.
+     * @param addressType
+     * As documented by MMC.
+     * @param open
+     * Reserved for future use.  Set to zero.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readTrackInfo( IOMemoryDescriptor * buffer,
+                                    UInt32               address,
+                                    UInt8                addressType,
+                                    UInt8                open,
+                                    UInt16 *             actualByteCount );
+
+    /*!
+     * @function splitTrack
+     * @discussion
+     * Issue an MMC RESERVE TRACK command with the ARSV bit.
+     * @param address
+     * As documented by MMC.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn splitTrack(UInt32 address);
+
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  0);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  1);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  2);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  3);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  4);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  5);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  6);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  7);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  8);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  9);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 10);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 11);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 12);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 13);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 14);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 15);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOBDMEDIA_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBDMediaBSDClient.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBDMediaBSDClient.h.svn-base
new file mode 100644
index 0000000..ee356f5
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOBDMediaBSDClient.h.svn-base
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOBDMEDIABSDCLIENT_H
+#define _IOBDMEDIABSDCLIENT_H
+
+#include <sys/ioctl.h>
+#include <sys/types.h>
+
+#include <IOKit/storage/IOBDTypes.h>
+
+/*
+ * Definitions
+ *
+ * ioctl                        description
+ * ---------------------------- ------------------------------------------------
+ * DKIOCBDREADSTRUCTURE         see IOBDMedia::readStructure()    in IOBDMedia.h
+ *
+ * DKIOCBDREADDISCINFO          see IOBDMedia::readDiscInfo()     in IOBDMedia.h
+ * DKIOCBDREADTRACKINFO         see IOBDMedia::readTrackInfo()    in IOBDMedia.h
+ *
+ * DKIOCBDREPORTKEY             see IOBDMedia::reportKey()        in IOBDMedia.h
+ * DKIOCBDSENDKEY               see IOBDMedia::sendKey()          in IOBDMedia.h
+ *
+ * DKIOCBDGETSPEED              see IOBDMedia::getSpeed()         in IOBDMedia.h
+ * DKIOCBDSETSPEED              see IOBDMedia::setSpeed()         in IOBDMedia.h
+ *
+ *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
+ */
+
+typedef struct
+{
+    uint8_t  format;
+
+    uint8_t  reserved0008[3];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  grantID;
+    uint8_t  layer;
+
+    uint8_t  reserved0080[4];                      /* reserved, clear to zero */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_bd_read_structure_t;
+
+typedef struct
+{
+    uint8_t  format;
+    uint8_t  keyClass;
+
+    uint8_t  reserved0016[2];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  grantID;
+
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_bd_report_key_t;
+
+typedef struct
+{
+    uint8_t  format;
+    uint8_t  keyClass;
+
+    uint8_t  reserved0016[6];                      /* reserved, clear to zero */
+
+    uint8_t  grantID;
+
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_bd_send_key_t;
+
+typedef struct
+{
+    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_bd_read_disc_info_t;
+
+typedef struct
+{
+    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  addressType;
+
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_bd_read_track_info_t;
+
+#define DKIOCBDREADSTRUCTURE _IOW('d', 160, dk_bd_read_structure_t)
+#define DKIOCBDREPORTKEY     _IOW('d', 161, dk_bd_report_key_t)
+#define DKIOCBDSENDKEY       _IOW('d', 162, dk_bd_send_key_t)
+
+#define DKIOCBDGETSPEED      _IOR('d', 163, uint16_t)
+#define DKIOCBDSETSPEED      _IOW('d', 163, uint16_t)
+
+#define DKIOCBDREADDISCINFO  _IOWR('d', 164, dk_bd_read_disc_info_t)
+#define DKIOCBDREADTRACKINFO _IOWR('d', 165, dk_bd_read_track_info_t)
+
+#define DKIOCBDSPLITTRACK    _IOW('d', 166, uint32_t)
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOBDMedia.h>
+#include <IOKit/storage/IOMediaBSDClient.h>
+
+/*
+ * Class
+ */
+
+class IOBDMediaBSDClient : public IOMediaBSDClient
+{
+    OSDeclareDefaultStructors(IOBDMediaBSDClient)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method
+     * to return a more specific subclass of IOService -- IOBDMedia.  This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOBDMedia * getProvider() const;
+
+    /*
+     * Process a BD-specific ioctl.
+     */
+
+    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
+
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 0);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 1);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 2);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 3);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 4);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 5);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 6);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 7);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOBDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBDTypes.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBDTypes.h.svn-base
new file mode 100644
index 0000000..f5b7927
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOBDTypes.h.svn-base
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_BDTYPES_H
+#define	_BDTYPES_H
+
+#include <IOKit/IOTypes.h>
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/*
+ * Media Types
+ */
+
+enum
+{
+    kBDMediaTypeUnknown   = 0x0300,
+    kBDMediaTypeROM       = 0x0302, /* BD-ROM */
+    kBDMediaTypeRE        = 0x0303, /* BD-RE  */
+    kBDMediaTypeR         = 0x0304, /* BD-R   */
+
+    kBDMediaTypeMin       = 0x0300,
+    kBDMediaTypeMax       = 0x03FF
+};
+
+typedef UInt32 BDMediaType;
+
+/*
+ * Media Speed (kB/s)
+ */
+
+#define kBDSpeedMin 0x1126
+#define kBDSpeedMax 0xFFFF
+
+/*
+ * MMC Formats
+ */
+
+// Read Disc Information Format
+struct BDDiscInfo
+{
+    UInt16 dataLength;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  discStatus:2;
+    UInt8  stateOfLastSession:2;
+    UInt8  erasable:1;
+    UInt8  dataType:3;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  dataType:3;
+    UInt8  erasable:1;
+    UInt8  stateOfLastSession:2;
+    UInt8  discStatus:2;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved2;
+    UInt8  numberOfSessionsLSB;
+    UInt8  firstTrackNumberInLastSessionLSB;
+    UInt8  lastTrackNumberInLastSessionLSB;
+    UInt8  reserved4[2];
+    UInt8  numberOfSessionsMSB;
+    UInt8  firstTrackNumberInLastSessionMSB;
+    UInt8  lastTrackNumberInLastSessionMSB;
+    UInt8  reserved6[22];
+};
+typedef struct BDDiscInfo BDDiscInfo;
+
+// Read Track Information Format
+struct BDTrackInfo
+{
+    UInt16 dataLength;
+    UInt8  trackNumberLSB;
+    UInt8  sessionNumberLSB;
+    UInt8  reserved;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  reserved2:5;
+    UInt8  damage:1;
+    UInt8  reserved3:2;
+
+    UInt8  reserved4:6;
+    UInt8  blank:1;
+    UInt8  reservedTrack:1;
+
+    UInt8  nextWritableAddressValid:1;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  reserved5:6;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved3:2;
+    UInt8  damage:1;
+    UInt8  reserved2:5;
+
+    UInt8  reservedTrack:1;
+    UInt8  blank:1;
+    UInt8  reserved4:6;
+
+    UInt8  reserved5:6;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  nextWritableAddressValid:1;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt32 trackStartAddress;
+    UInt32 nextWritableAddress;
+    UInt32 freeBlocks;
+    UInt32 clusterSize;
+    UInt32 trackSize;
+    UInt32 lastRecordedAddress;
+    UInt8  trackNumberMSB;
+    UInt8  sessionNumberMSB;
+    UInt8  reserved6;
+    UInt8  reserved7;
+};
+typedef struct BDTrackInfo BDTrackInfo;
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* _BDTYPES_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDevice.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDevice.h.svn-base
new file mode 100644
index 0000000..bbec146
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDevice.h.svn-base
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOBlockStorageDevice
+ * @abstract
+ * This header contains the IOBlockStorageDevice class definition.
+ */
+
+#ifndef _IOBLOCKSTORAGEDEVICE_H
+#define _IOBLOCKSTORAGEDEVICE_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
+
+/*!
+ * @defined kIOBlockStorageDeviceClass
+ * @abstract
+ * The name of the IOBlockStorageDevice class.
+ */
+
+#define kIOBlockStorageDeviceClass "IOBlockStorageDevice"
+
+/*!
+ * @defined kIOBlockStorageDeviceWriteCacheStateKey
+ * @abstract
+ * The name of the property used to get or set the write cache state of the
+ * block storage device.
+ */
+#define kIOBlockStorageDeviceWriteCacheStateKey	"WriteCacheState"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/IOService.h>
+#include <IOKit/storage/IOMedia.h>
+
+/* Property used for matching, so the generic driver gets the nub it wants. */
+/*!
+ * @defined kIOBlockStorageDeviceTypeKey
+ * @abstract The name of the property tested for nub type matching by the generic block
+ * storage driver.
+ */
+#define	kIOBlockStorageDeviceTypeKey	"device-type"
+/*!
+ * @defined kIOBlockStorageDeviceTypeGeneric
+ * @abstract A character string used for nub matching.
+ */
+#define	kIOBlockStorageDeviceTypeGeneric	"Generic"
+
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDriver.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDriver.h.svn-base
new file mode 100644
index 0000000..24ac3c2
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDriver.h.svn-base
@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOBlockStorageDriver
+ * @abstract
+ * This header contains the IOBlockStorageDriver class definition.
+ */
+
+#ifndef _IOBLOCKSTORAGEDRIVER_H
+#define _IOBLOCKSTORAGEDRIVER_H
+
+#include <IOKit/IOTypes.h>
+
+/*!
+ * @defined kIOBlockStorageDriverClass
+ * @abstract
+ * The name of the IOBlockStorageDriver class.
+ */
+
+#define kIOBlockStorageDriverClass "IOBlockStorageDriver"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsKey
+ * @abstract
+ * Holds a table of numeric values describing the driver's
+ * operating statistics.
+ * @discussion
+ * This property holds a table of numeric values describing the driver's
+ * operating statistics.  The table is an OSDictionary, where each entry
+ * describes one given statistic.
+ */
+
+#define kIOBlockStorageDriverStatisticsKey "Statistics"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsBytesReadKey
+ * @abstract
+ * Describes the number of bytes read since the block storage
+ * driver was instantiated.
+ * @discussion
+ * This property describes the number of bytes read since the block storage
+ * driver was instantiated.  It is one of the statistic entries listed under
+ * the top-level kIOBlockStorageDriverStatisticsKey property table.  It has
+ * an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsBytesReadKey "Bytes (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsBytesWrittenKey
+ * @abstract
+ * Describes the number of bytes written since the block storage
+ * driver was instantiated. 
+ * @discussion
+ * This property describes the number of bytes written since the block storage
+ * driver was instantiated.  It is one of the statistic entries listed under the
+ * top-level kIOBlockStorageDriverStatisticsKey property table.  It has an
+ * OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsBytesWrittenKey "Bytes (Write)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsReadErrorsKey
+ * @abstract
+ * Describes the number of read errors encountered since the block
+ * storage driver was instantiated. 
+ * @discussion
+ * This property describes the number of read errors encountered since the block
+ * storage driver was instantiated.  It is one of the statistic entries listed
+ * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
+ * has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsReadErrorsKey "Errors (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsWriteErrorsKey
+ * @abstract
+ * Describes the number of write errors encountered since the
+ * block storage driver was instantiated.
+ * @discussion
+ * This property describes the number of write errors encountered since the
+ * block storage driver was instantiated.  It is one of the statistic entries
+ * listed under the top-level kIOBlockStorageDriverStatisticsKey property table. 
+ * It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsWriteErrorsKey "Errors (Write)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsLatentReadTimeKey
+ * @abstract
+ * Describes the number of nanoseconds of latency during reads
+ * since the block storage driver was instantiated. 
+ * @discussion
+ * This property describes the number of nanoseconds of latency during reads
+ * since the block storage driver was instantiated.  It is one of the statistic
+ * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
+ * property table.  It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsLatentReadTimeKey "Latency Time (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsLatentWriteTimeKey
+ * @abstract
+ * Describes the number of nanoseconds of latency during writes
+ * since the block storage driver was instantiated. 
+ * @discussion
+ * This property describes the number of nanoseconds of latency during writes
+ * since the block storage driver was instantiated.  It is one of the statistic
+ * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
+ * property table.  It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsLatentWriteTimeKey "Latency Time (Write)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsReadsKey
+ * @abstract
+ * Describes the number of read operations processed since the
+ * block storage driver was instantiated.
+ * @discussion
+ * This property describes the number of read operations processed since the
+ * block storage driver was instantiated.  It is one of the statistic entries
+ * listed under the top-level kIOBlockStorageDriverStatisticsKey property table.
+ * It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsReadsKey "Operations (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsWritesKey
+ * @abstract
+ * Describes the number of write operations processed since the
+ * block storage driver was instantiated.
+ * @discussion
+ * This property describes the number of write operations processed since the
+ * block storage driver was instantiated.  It is one of the statistic entries
+ * listed under the top-level kIOBlockStorageDriverStatisticsKey property table.
+ * It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsWritesKey "Operations (Write)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsReadRetriesKey
+ * @abstract
+ * Describes the number of read retries required since the block
+ * storage driver was instantiated.
+ * @discussion
+ * This property describes the number of read retries required since the block
+ * storage driver was instantiated.  It is one of the statistic entries listed
+ * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
+ * has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsReadRetriesKey "Retries (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsWriteRetriesKey
+ * @abstract
+ * Describes the number of write retries required since the block
+ * storage driver was instantiated.
+ * @discussion
+ * This property describes the number of write retries required since the block
+ * storage driver was instantiated.  It is one of the statistic entries listed
+ * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
+ * has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsWriteRetriesKey "Retries (Write)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsTotalReadTimeKey
+ * @abstract
+ * Describes the number of nanoseconds spent performing reads
+ * since the block storage driver was instantiated.
+ * @discussion
+ * This property describes the number of nanoseconds spent performing reads
+ * since the block storage driver was instantiated.  It is one of the statistic
+ * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
+ * property table.  It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsTotalReadTimeKey "Total Time (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsTotalWriteTimeKey
+ * @abstract
+ * Describes the number of nanoseconds spent performing writes
+ * since the block storage driver was instantiated.
+ * @discussion
+ * This property describes the number of nanoseconds spent performing writes
+ * since the block storage driver was instantiated.  It is one of the statistic
+ * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
+ * property table.  It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsTotalWriteTimeKey "Total Time (Write)"
+
+/*!
+ * @enum IOMediaState
+ * @abstract
+ * The different states that getMediaState() can report.
+ * @constant kIOMediaStateOffline
+ * Media is not available.
+ * @constant kIOMediaStateOnline
+ * Media is available and ready for operations.
+ * @constant kIOMediaStateBusy
+ * Media is available, but not ready for operations.
+ */
+
+enum
+{
+    kIOMediaStateOffline = 0,
+    kIOMediaStateOnline  = 1,
+    kIOMediaStateBusy    = 2
+};
+
+typedef UInt32 IOMediaState;
+
+#endif /* !_IOBLOCKSTORAGEDRIVER_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDevice.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDevice.h.svn-base
new file mode 100644
index 0000000..706da40
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDevice.h.svn-base
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOCDBlockStorageDevice
+ * @abstract
+ * This header contains the IOCDBlockStorageDevice class definition.
+ */
+
+#ifndef _IOCDBLOCKSTORAGEDEVICE_H
+#define _IOCDBLOCKSTORAGEDEVICE_H
+
+#include <IOKit/storage/IOCDTypes.h>
+
+/*!
+ * @defined kIOCDBlockStorageDeviceClass
+ * @abstract
+ * kIOCDBlockStorageDeviceClass is the name of the IOCDBlockStorageDevice class.
+ * @discussion
+ * kIOCDBlockStorageDeviceClass is the name of the IOCDBlockStorageDevice class.
+ */
+
+#define kIOCDBlockStorageDeviceClass "IOCDBlockStorageDevice"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOBlockStorageDevice.h>
+
+/* Property used for matching, so the generic driver gets the nub it wants. */
+#define	kIOBlockStorageDeviceTypeCDROM	"CDROM"
+
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOCDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDriver.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDriver.h.svn-base
new file mode 100644
index 0000000..f88a406
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDriver.h.svn-base
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * IOCDBlockStorageDriver.h
+ *
+ * This class implements  CD functionality, independent of
+ * the physical connection protocol (e.g. SCSI, ATA, USB).
+ *
+ * A protocol-specific provider implements the functionality using an appropriate
+ * protocol and commands.
+ */
+
+#ifndef	_IOCDBLOCKSTORAGEDRIVER_H
+#define	_IOCDBLOCKSTORAGEDRIVER_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/storage/IOCDBlockStorageDevice.h>
+#include <IOKit/storage/IOCDTypes.h>
+#include <IOKit/storage/IOBlockStorageDriver.h>
+
+/*!
+ * @defined kIOCDBlockStorageDriverClass
+ * @abstract
+ * kIOCDBlockStorageDriverClass is the name of the IOCDBlockStorageDriver class.
+ * @discussion
+ * kIOCDBlockStorageDriverClass is the name of the IOCDBlockStorageDriver class.
+ */
+
+#define kIOCDBlockStorageDriverClass "IOCDBlockStorageDriver"
+
+#endif
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDMedia.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDMedia.h.svn-base
new file mode 100644
index 0000000..85ad72d
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOCDMedia.h.svn-base
@@ -0,0 +1,553 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOCDMedia
+ * @abstract
+ * This header contains the IOCDMedia class definition.
+ */
+
+#ifndef _IOCDMEDIA_H
+#define _IOCDMEDIA_H
+
+/*!
+ * @defined kIOCDMediaClass
+ * @abstract
+ * kIOCDMediaClass is the name of the IOCDMedia class.
+ * @discussion
+ * kIOCDMediaClass is the name of the IOCDMedia class.
+ */
+
+#define kIOCDMediaClass "IOCDMedia"
+
+/*!
+ * @defined kIOCDMediaTOCKey
+ * @abstract
+ * kIOCDMediaTOCKey is a property of IOCDMedia objects.  It has an OSData value
+ * and a CDTOC structure.
+ * @discussion
+ * The kIOCDMediaTOCKey property contains the CD's full table of contents,
+ * formatted as a CDTOC structure.  The CDTOC structure is same as what is
+ * returned by a READ TOC command, format 0x02.  All fields in the TOC are
+ * guaranteed to be binary-encoded (no BCD-encoded numbers are ever passed).
+ */
+
+#define kIOCDMediaTOCKey "TOC"
+
+/*!
+ * @defined kIOCDMediaTypeKey
+ * @abstract
+ * kIOCDMediaTypeKey is a property of IOCDMedia objects.  It has an OSString
+ * value.
+ * @discussion
+ * The kIOCDMediaTypeKey property identifies the CD media type (CD-ROM, CD-R,
+ * CD-RW, etc).  See the kIOCDMediaType contants for possible values.
+ */
+
+#define kIOCDMediaTypeKey "Type"
+
+/*!
+ * @defined kIOCDMediaTypeROM
+ * The kIOCDMediaTypeKey constant for CD-ROM media (inclusive of the CD-I,
+ * CD-ROM XA, and CD Audio standards, and mixed mode combinations thereof).
+ */
+
+#define kIOCDMediaTypeROM "CD-ROM"
+
+/*!
+ * @defined kIOCDMediaTypeR
+ * The kIOCDMediaTypeKey constant for CD Recordable (CD-R) media.
+ */
+
+#define kIOCDMediaTypeR "CD-R"
+
+/*!
+ * @defined kIOCDMediaTypeRW
+ * The kIOCDMediaTypeKey constant for CD ReWritable (CD-RW) media.
+ */
+
+#define kIOCDMediaTypeRW "CD-RW"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOCDBlockStorageDriver.h>
+#include <IOKit/storage/IOMedia.h>
+
+/*!
+ * @class IOCDMedia
+ * @abstract
+ * The IOCDMedia class is a random-access disk device abstraction for CDs.
+ * @discussion
+ * The IOCDMedia class is a random-access disk device abstraction for CDs. It
+ * extends the IOMedia class by implementing special CD APIs, such as readCD,
+ * and publishing the TOC as a property of the IOCDMedia object.
+ */
+
+class IOCDMedia : public IOMedia
+{
+    OSDeclareDefaultStructors(IOCDMedia)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    using IOStorage::read;
+    using IOStorage::write;
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method to
+     * return a more specific subclass of IOService -- IOCDBlockStorageDriver.  
+     * This method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOCDBlockStorageDriver * getProvider() const;
+
+    /*
+     * Compare the properties in the supplied table to this object's properties.
+     */
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
+
+    /*!
+     * @function read
+     * @discussion
+     * Read data from the storage object at the specified byte offset into the
+     * specified buffer, asynchronously.   When the read completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the read.
+     * @param client
+     * Client requesting the read.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void read(IOService *           client,
+                      UInt64                byteStart,
+                      IOMemoryDescriptor *  buffer,
+                      IOStorageAttributes * attributes,
+                      IOStorageCompletion * completion);
+
+    /*
+     * @function write
+     * @discussion
+     * Write data into the storage object at the specified byte offset from the
+     * specified buffer, asynchronously.   When the write completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the write.
+     * @param client
+     * Client requesting the write.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void write(IOService *           client,
+                       UInt64                byteStart,
+                       IOMemoryDescriptor *  buffer,
+                       IOStorageAttributes * attributes,
+                       IOStorageCompletion * completion);
+
+    /*!
+     * @function readCD
+     * @discussion
+     * Read data from the CD media object at the specified byte offset into the
+     * specified buffer, asynchronously.  Special areas of the CD sector can be
+     * read via this method, such as the header and subchannel data.   When the
+     * read completes, the caller will be notified via the specified completion
+     * action.
+     *
+     * The buffer will be retained for the duration of the read.
+     * @param client
+     * Client requesting the read.
+     * @param byteStart
+     * Starting byte offset for the data transfer (see sectorArea parameter).
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param sectorArea
+     * Sector area(s) to read.  The sum of each area's size defines the natural
+     * block size of the media for the call.  This should be taken into account
+     * when computing the address of byteStart.  See IOCDTypes.h.
+     * @param sectorType
+     * Sector type that is expected.  The data transfer is terminated as soon as
+     * data is encountered that does not match the expected type.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+#ifdef __LP64__
+    virtual void readCD(IOService *           client,
+                        UInt64                byteStart,
+                        IOMemoryDescriptor *  buffer,
+                        CDSectorArea          sectorArea,
+                        CDSectorType          sectorType,
+                        IOStorageAttributes * attributes,
+                        IOStorageCompletion * completion);
+#else /* !__LP64__ */
+    virtual void readCD(IOService *           client,
+                        UInt64                byteStart,
+                        IOMemoryDescriptor *  buffer,
+                        CDSectorArea          sectorArea,
+                        CDSectorType          sectorType,
+                        IOStorageCompletion   completion);
+#endif /* !__LP64__ */
+
+    /*!
+     * @function readCD
+     * @discussion
+     * Read data from the CD media object at the specified byte offset into the
+     * specified buffer, synchronously.   Special areas of the CD sector can be
+     * read via this method, such as the header and subchannel data.   When the
+     * read completes, this method will return to the caller.   The actual byte
+     * count field is optional.
+     * @param client
+     * Client requesting the read.
+     * @param byteStart
+     * Starting byte offset for the data transfer (see sectorArea parameter).
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param sectorArea
+     * Sector area(s) to read.  The sum of each area's size defines the natural
+     * block size of the media for the call.  This should be taken into account
+     * when computing the address of byteStart.  See IOCDTypes.h.
+     * @param sectorType
+     * Sector type that is expected.  The data transfer is terminated as soon as
+     * data is encountered that does not match the expected type.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+#ifdef __LP64__
+    virtual IOReturn readCD(IOService *           client,
+                            UInt64                byteStart,
+                            IOMemoryDescriptor *  buffer,
+                            CDSectorArea          sectorArea,
+                            CDSectorType          sectorType,
+                            IOStorageAttributes * attributes      = 0,
+                            UInt64 *              actualByteCount = 0);
+#else /* !__LP64__ */
+    virtual IOReturn readCD(IOService *           client,
+                            UInt64                byteStart,
+                            IOMemoryDescriptor *  buffer,
+                            CDSectorArea          sectorArea,
+                            CDSectorType          sectorType,
+                            UInt64 *              actualByteCount = 0);
+#endif /* !__LP64__ */
+
+    /*!
+     * @function readISRC
+     * @discussion
+     * Read the International Standard Recording Code for the specified track.
+     * @param track
+     * Track number from which to read the ISRC.
+     * @param isrc
+     * Buffer for the ISRC data.  Buffer contents will be zero-terminated.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn readISRC(UInt8 track, CDISRC isrc);
+    
+    /*!
+     * @function readMCN
+     * @discussion
+     * Read the Media Catalog Number (also known as the Universal Product Code).
+     * @param mcn
+     * Buffer for the MCN data.  Buffer contents will be zero-terminated.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn readMCN(CDMCN mcn);
+
+    /*!
+     * @function getTOC
+     * @discussion
+     * Get the full Table Of Contents.
+     *
+     * All CDTOC fields passed across I/O Kit APIs are guaranteed to be
+     * binary-encoded (no BCD-encoded numbers are ever passed).
+     * @result
+     * Returns a pointer to the TOC buffer (do not deallocate).
+     */
+     
+    virtual CDTOC * getTOC();
+
+    /*!
+     * @function getSpeed
+     * @discussion
+     * Get the current speed used for data transfers.
+     * @param kilobytesPerSecond
+     * Returns the current speed used for data transfers, in kB/s.
+     *
+     * kCDSpeedMin specifies the minimum speed for all CD media (1X).
+     * kCDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond); /* 10.1.0 */
+
+    /*!
+     * @function setSpeed
+     * @discussion
+     * Set the speed to be used for data transfers.
+     * @param kilobytesPerSecond
+     * Speed to be used for data transfers, in kB/s.
+     *
+     * kCDSpeedMin specifies the minimum speed for all CD media (1X).
+     * kCDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond); /* 10.1.0 */
+
+    /*!
+     * @function readTOC
+     * @discussion
+     * Issue an MMC READ TOC/PMA/ATIP command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param format
+     * As documented by MMC.
+     * @param formatAsTime
+     * As documented by MMC.
+     * @param trackOrSessionNumber
+     * As documented by MMC.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readTOC(IOMemoryDescriptor * buffer,
+                             CDTOCFormat          format,
+                             UInt8                formatAsTime,
+                             UInt8                trackOrSessionNumber,
+                             UInt16 *             actualByteCount); /* 10.1.3 */
+
+    /*!
+     * @function readDiscInfo
+     * @discussion
+     * Issue an MMC READ DISC INFORMATION command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readDiscInfo(IOMemoryDescriptor * buffer,
+                                  UInt16 *             actualByteCount); /* 10.1.3 */
+
+    /*!
+     * @function readTrackInfo
+     * @discussion
+     * Issue an MMC READ TRACK INFORMATION command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param address
+     * As documented by MMC.
+     * @param addressType
+     * As documented by MMC.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readTrackInfo(IOMemoryDescriptor *   buffer,
+                                   UInt32                 address,
+                                   CDTrackInfoAddressType addressType,
+                                   UInt16 *               actualByteCount); /* 10.1.3 */
+
+    /*
+     * @function writeCD
+     * @discussion
+     * Write data into the CD media object at the specified byte offset from the
+     * specified buffer, asynchronously.    When the write completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the write.
+     * @param client
+     * Client requesting the write.
+     * @param byteStart
+     * Starting byte offset for the data transfer (see sectorArea parameter).
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param sectorArea
+     * Sector area(s) to write.  The sum of each area's size defines the natural
+     * block size of the media for the call.   This should be taken into account
+     * when computing the address of byteStart.  See IOCDTypes.h.
+     * @param sectorType
+     * Sector type that is expected.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+#ifdef __LP64__
+    virtual void writeCD(IOService *           client,
+                         UInt64                byteStart,
+                         IOMemoryDescriptor *  buffer,
+                         CDSectorArea          sectorArea,
+                         CDSectorType          sectorType,
+                         IOStorageAttributes * attributes,
+                         IOStorageCompletion * completion);
+#else /* !__LP64__ */
+    virtual void writeCD(IOService *           client,
+                         UInt64                byteStart,
+                         IOMemoryDescriptor *  buffer,
+                         CDSectorArea          sectorArea,
+                         CDSectorType          sectorType,
+                         IOStorageCompletion   completion); /* 10.2.0 */
+#endif /* !__LP64__ */
+
+    /*
+     * @function writeCD
+     * @discussion
+     * Write data into the CD media object at the specified byte offset from the
+     * specified buffer, synchronously.    When the write completes, this method
+     * will return to the caller.  The actual byte count field is optional.
+     * @param client
+     * Client requesting the write.
+     * @param byteStart
+     * Starting byte offset for the data transfer (see sectorArea parameter).
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param sectorArea
+     * Sector area(s) to write.  The sum of each area's size defines the natural
+     * block size of the media for the call.   This should be taken into account
+     * when computing the address of byteStart.  See IOCDTypes.h.
+     * @param sectorType
+     * Sector type that is expected.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+#ifdef __LP64__
+    virtual IOReturn writeCD(IOService *           client,
+                             UInt64                byteStart,
+                             IOMemoryDescriptor *  buffer,
+                             CDSectorArea          sectorArea,
+                             CDSectorType          sectorType,
+                             IOStorageAttributes * attributes      = 0,
+                             UInt64 *              actualByteCount = 0);
+#else /* !__LP64__ */
+    virtual IOReturn writeCD(IOService *           client,
+                             UInt64                byteStart,
+                             IOMemoryDescriptor *  buffer,
+                             CDSectorArea          sectorArea,
+                             CDSectorType          sectorType,
+                             UInt64 *              actualByteCount = 0); /* 10.2.0 */
+#endif /* !__LP64__ */
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  0);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  1);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  2);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  3);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  4);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  5);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  6);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  0);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  1);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  2);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  3);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  4);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  5);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  6);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  7);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  8);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  9);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 10);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 11);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 12);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 13);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 14);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 15);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOCDMEDIA_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDMediaBSDClient.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDMediaBSDClient.h.svn-base
new file mode 100644
index 0000000..ce31863
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOCDMediaBSDClient.h.svn-base
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOCDMEDIABSDCLIENT_H
+#define _IOCDMEDIABSDCLIENT_H
+
+#include <sys/ioctl.h>
+
+#include <IOKit/storage/IOCDTypes.h>
+
+/*
+ * Definitions
+ *
+ * ioctl                        description
+ * ---------------------------- ------------------------------------------------
+ * DKIOCCDREAD                  see IOCDMedia::readCD()           in IOCDMedia.h
+ * DKIOCCDREADTOC               see IOCDMedia::readTOC()          in IOCDMedia.h
+ *
+ * DKIOCCDREADDISCINFO          see IOCDMedia::readDiscInfo()     in IOCDMedia.h
+ * DKIOCCDREADTRACKINFO         see IOCDMedia::readTrackInfo()    in IOCDMedia.h
+ *
+ * DKIOCCDREADISRC              see IOCDMedia::readISRC()         in IOCDMedia.h
+ * DKIOCCDREADMCN               see IOCDMedia::readMCN()          in IOCDMedia.h
+ *
+ * DKIOCCDGETSPEED              see IOCDMedia::getSpeed()         in IOCDMedia.h
+ * DKIOCCDSETSPEED              see IOCDMedia::setSpeed()         in IOCDMedia.h
+ *
+ *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
+ */
+
+typedef struct
+{
+    uint64_t offset;
+
+    uint8_t  sectorArea;
+    uint8_t  sectorType;
+
+#ifdef __LP64__
+    uint8_t  reserved0080[10];                     /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0080[6];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint32_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_cd_read_t;
+
+typedef struct
+{
+    CDISRC   isrc;
+    uint8_t  track;
+
+    uint8_t  reserved0112[2];                      /* reserved, clear to zero */
+} dk_cd_read_isrc_t;
+
+typedef struct
+{
+    CDMCN    mcn;
+
+    uint8_t  reserved0112[2];                      /* reserved, clear to zero */
+} dk_cd_read_mcn_t;
+
+typedef struct
+{
+    uint8_t  format;
+    uint8_t  formatAsTime;
+
+    uint8_t  reserved0016[5];                      /* reserved, clear to zero */
+
+    union
+    {
+        uint8_t session;
+        uint8_t track;
+    } address;
+
+#ifdef __LP64__
+    uint8_t  reserved0064[6];                      /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0064[2];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_cd_read_toc_t;
+
+typedef struct
+{
+#ifdef __LP64__
+    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0000[10];                     /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_cd_read_disc_info_t;
+
+typedef struct
+{
+    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  addressType;
+
+#ifdef __LP64__
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_cd_read_track_info_t;
+
+#define DKIOCCDREAD          _IOWR('d', 96, dk_cd_read_t)
+
+#define DKIOCCDREADISRC      _IOWR('d', 97, dk_cd_read_isrc_t)
+#define DKIOCCDREADMCN       _IOWR('d', 98, dk_cd_read_mcn_t)
+
+#define DKIOCCDGETSPEED      _IOR('d', 99, uint16_t)
+#define DKIOCCDSETSPEED      _IOW('d', 99, uint16_t)
+
+#define DKIOCCDREADTOC       _IOWR('d', 100, dk_cd_read_toc_t)
+
+#define DKIOCCDREADDISCINFO  _IOWR('d', 101, dk_cd_read_disc_info_t)
+#define DKIOCCDREADTRACKINFO _IOWR('d', 102, dk_cd_read_track_info_t)
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOCDMedia.h>
+#include <IOKit/storage/IOMediaBSDClient.h>
+
+/*
+ * Class
+ */
+
+class IOCDMediaBSDClient : public IOMediaBSDClient
+{
+    OSDeclareDefaultStructors(IOCDMediaBSDClient)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method
+     * to return a more specific subclass of IOService -- IOCDMedia.  This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOCDMedia * getProvider() const;
+
+    /*
+     * Process a CD-specific ioctl.
+     */
+
+    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
+
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 0);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 1);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 2);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 3);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 4);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 5);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 6);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 7);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOCDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDPartitionScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDPartitionScheme.h.svn-base
new file mode 100644
index 0000000..1ff58c4
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOCDPartitionScheme.h.svn-base
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOCDPartitionScheme
+ * @abstract
+ * This header contains the IOCDPartitionScheme class definition.
+ */
+
+#ifndef _IOCDPARTITIONSCHEME_H
+#define _IOCDPARTITIONSCHEME_H
+
+#include <IOKit/storage/IOCDTypes.h>
+
+/*!
+ * @defined kIOCDPartitionSchemeClass
+ * @abstract
+ * kIOCDPartitionSchemeClass is the name of the IOCDPartitionScheme class.
+ * @discussion
+ * kIOCDPartitionSchemeClass is the name of the IOCDPartitionScheme class.
+ */
+
+#define kIOCDPartitionSchemeClass "IOCDPartitionScheme"
+
+/*!
+ * @defined kIOMediaSessionIDKey
+ * @abstract
+ * kIOMediaSessionIDKey is property of IOMedia objects.  It has an OSNumber
+ * value.
+ * @discussion
+ * The kIOMediaSessionIDKey property is placed into each IOMedia instance
+ * created by the CD partition scheme.  It identifies the session number
+ * the track was recorded on.
+ */
+
+#define kIOMediaSessionIDKey "Session ID"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOCDMedia.h>
+#include <IOKit/storage/IOPartitionScheme.h>
+
+/*
+ * Class
+ */
+
+class IOCDPartitionScheme : public IOPartitionScheme
+{
+    OSDeclareDefaultStructors(IOCDPartitionScheme);
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    OSSet * _partitions;    /* (set of media objects representing partitions) */
+
+    /*
+     * Free all of this object's outstanding resources.
+     */
+
+    virtual void free(void);
+
+    /*
+     * Scan the provider media for CD partitions (in TOC).  Returns the set
+     * of media objects representing each of the partitions (the retain for
+     * the set is passed to the caller), or null should no CD partitions be
+     * found.  The default probe score can be adjusted up or down, based on
+     * the confidence of the scan.
+     */
+
+    virtual OSSet * scan(SInt32 * score);
+
+    /*
+     * Ask whether the given partition appears to be corrupt.  A partition that
+     * is corrupt will cause the failure of the CD partition scheme altogether.
+     */
+
+    virtual bool isPartitionCorrupt( CDTOCDescriptor * partition,
+                                     UInt64            partitionSize,
+                                     UInt32            partitionBlockSize,
+                                     CDSectorType      partitionBlockType,
+                                     CDTOC *           toc );
+
+    /*
+     * Ask whether the given partition appears to be invalid.  A partition that
+     * is invalid will cause it to be skipped in the scan, but will not cause a
+     * failure of the CD partition scheme.
+     */
+
+    virtual bool isPartitionInvalid( CDTOCDescriptor * partition,
+                                     UInt64            partitionSize,
+                                     UInt32            partitionBlockSize,
+                                     CDSectorType      partitionBlockType,
+                                     CDTOC *           toc );
+
+    /*
+     * Instantiate a new media object to represent the given partition.
+     */
+
+    virtual IOMedia * instantiateMediaObject(
+                                           CDTOCDescriptor * partition,
+                                           UInt64            partitionSize,
+                                           UInt32            partitionBlockSize,
+                                           CDSectorType      partitionBlockType,
+                                           CDTOC *           toc );
+
+    /*
+     * Allocate a new media object (called from instantiateMediaObject).
+     */
+
+    virtual IOMedia * instantiateDesiredMediaObject(
+                                           CDTOCDescriptor * partition,
+                                           UInt64            partitionSize,
+                                           UInt32            partitionBlockSize,
+                                           CDSectorType      partitionBlockType,
+                                           CDTOC *           toc );
+
+public:
+
+    /*
+     * Initialize this object's minimal state.
+     */
+
+    virtual bool init(OSDictionary * properties = 0);
+
+    /*
+     * Scan the provider media for CD partitions.
+     */
+
+    virtual IOService * probe(IOService * provider, SInt32 * score);
+
+    /*
+     * Determine whether the provider media contains CD partitions.
+     */
+
+    virtual bool start(IOService * provider);
+
+    /*
+     * Read data from the storage object at the specified byte offset into the
+     * specified buffer, asynchronously.   When the read completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the read.
+     *
+     * For the CD partition scheme, we convert the read from a partition
+     * object into the appropriate readCD command to our provider media.
+     */
+
+    virtual void read(IOService *           client,
+                      UInt64                byteStart,
+                      IOMemoryDescriptor *  buffer,
+                      IOStorageAttributes * attributes,
+                      IOStorageCompletion * completion);
+
+    /*
+     * Write data into the storage object at the specified byte offset from the
+     * specified buffer, asynchronously.   When the write completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the write.
+     *
+     * For the CD partition scheme, we convert the write from a partition
+     * object into the appropriate writeCD command to our provider media.
+     */
+
+    virtual void write(IOService *           client,
+                       UInt64                byteStart,
+                       IOMemoryDescriptor *  buffer,
+                       IOStorageAttributes * attributes,
+                       IOStorageCompletion * completion);
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method
+     * to return a more specific subclass of OSObject -- IOCDMedia.   This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOCDMedia * getProvider() const;
+
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  0);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  1);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  2);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  3);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  4);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  5);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  6);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  7);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  8);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  9);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 10);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 11);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 12);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 13);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 14);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 15);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOCDPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDTypes.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDTypes.h.svn-base
new file mode 100644
index 0000000..6b1af29
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOCDTypes.h.svn-base
@@ -0,0 +1,492 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_IOCDTYPES_H
+#define	_IOCDTYPES_H
+
+#include <IOKit/IOTypes.h>
+#include <libkern/OSByteOrder.h>
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/*
+ * Minutes, Seconds, Frames (M:S:F)
+ *
+ * All M:S:F values passed across I/O Kit APIs are guaranteed to be
+ * binary-encoded numbers (no BCD-encoded numbers are ever passed).
+ */
+
+typedef struct
+{
+    UInt8 minute;
+    UInt8 second;
+    UInt8 frame;
+} CDMSF;
+
+/*
+ * Media Catalogue Numbers (MCN), International Standard Recording Codes (ISRC)
+ *
+ * All MCN and ISRC values passed across I/O Kit APIs are guaranteed
+ * to have a zero-terminating byte, for convenient use as C strings.
+ */
+
+#define kCDMCNMaxLength  13
+#define kCDISRCMaxLength 12
+
+typedef char CDMCN [kCDMCNMaxLength  + 1];
+typedef char CDISRC[kCDISRCMaxLength + 1];
+
+/*
+ * Audio Status
+ *
+ * All CDAudioStatus fields passed across I/O Kit APIs are guaranteed to
+ * be binary-encoded numbers (no BCD-encoded numbers are ever passed).
+ */
+
+#define kCDAudioStatusUnsupported 0x00
+#define kCDAudioStatusActive      0x11
+#define kCDAudioStatusPaused      0x12
+#define kCDAudioStatusSuccess     0x13
+#define kCDAudioStatusFailure     0x14
+#define kCDAudioStatusNone        0x15
+
+typedef struct
+{
+    UInt8 status;
+    struct
+    {
+        CDMSF time;
+        struct
+        {
+            UInt8 index;
+            UInt8 number;
+            CDMSF time;
+        } track;
+    } position;
+} CDAudioStatus;
+
+/*
+ * Table Of Contents
+ *
+ * All CDTOC fields passed across I/O Kit APIs are guaranteed to be
+ * binary-encoded numbers (no BCD-encoded numbers are ever passed).
+ */
+
+typedef struct
+{
+    UInt8 session;
+#ifdef __LITTLE_ENDIAN__
+    UInt8 control:4, adr:4;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8 adr:4, control:4;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8 tno;
+    UInt8 point;
+    CDMSF address;
+    UInt8 zero;
+    CDMSF p;
+} CDTOCDescriptor;
+
+typedef struct
+{
+    UInt16          length;
+    UInt8           sessionFirst;
+    UInt8           sessionLast;
+    CDTOCDescriptor descriptors[0];
+} CDTOC;
+
+/*
+ * Table Of Contents Descriptor Count Convenience Function
+ */
+
+static inline UInt32 CDTOCGetDescriptorCount(CDTOC * toc)
+{
+    UInt32 tocSize = OSSwapBigToHostInt16(toc->length) + (UInt32) sizeof(toc->length);
+
+    return (tocSize < (UInt32) sizeof(CDTOC)) ? 0 : 
+           (tocSize - (UInt32) sizeof(CDTOC)) / (UInt32) sizeof(CDTOCDescriptor);
+}
+
+/*
+ * M:S:F To LBA Convenience Function
+ */
+
+static inline UInt32 CDConvertMSFToLBA(CDMSF msf)
+{
+    return (((msf.minute * 60U) + msf.second) * 75U) + msf.frame - 150U;
+}
+
+/*
+ * M:S:F To Clipped LBA Convenience Function
+ */
+
+static inline UInt32 CDConvertMSFToClippedLBA(CDMSF msf)
+{
+    return (msf.minute == 0 && msf.second <= 1) ? 0 : CDConvertMSFToLBA(msf);
+}
+
+/*
+ * LBA To M:S:F Convenience Function
+ */
+
+static inline CDMSF CDConvertLBAToMSF(UInt32 lba)
+{
+    CDMSF msf;
+
+    lba += 150;
+    msf.minute = (lba / (75 * 60));
+    msf.second = (lba % (75 * 60)) / 75;
+    msf.frame  = (lba % (75     ));
+    
+    return msf;
+}
+
+/*
+ * Track Number To M:S:F Convenience Function
+ *
+ * The CDTOC structure is assumed to be complete, that is, none of
+ * the descriptors are missing or clipped due to an insufficiently
+ * sized buffer holding the CDTOC contents.
+ */
+
+static inline CDMSF CDConvertTrackNumberToMSF(UInt8 track, CDTOC * toc)
+{
+    UInt32 count = CDTOCGetDescriptorCount(toc);
+    UInt32 i;
+    CDMSF  msf   = { 0xFF, 0xFF, 0xFF };
+
+    for (i = 0; i < count; i++)
+    {
+        if (toc->descriptors[i].point == track && toc->descriptors[i].adr == 1)
+        {
+            msf = toc->descriptors[i].p;
+            break;
+        }
+    }
+
+    return msf;
+}
+
+/*
+ * Sector Areas, Sector Types
+ *
+ * Bytes Per Type      CDDA       Mode1      Mode2   Mode2Form1 Mode2Form2
+ *       Per Area  +----------+----------+----------+----------+----------+
+ * Sync            | 0        | 12       | 12       | 12       | 12       |
+ * Header          | 0        | 4        | 4        | 4        | 4        |
+ * SubHeader       | 0        | 0        | 0        | 8        | 8        |
+ * User            | 2352     | 2048     | 2336     | 2048     | 2328     |
+ * Auxiliary       | 0        | 288      | 0        | 280      | 0        |
+ * ErrorFlags      | 294      | 294      | 294      | 294      | 294      |
+ * SubChannel      | 96       | 96       | 96       | 96       | 96       |
+ * SubChannelQ     | 16       | 16       | 16       | 16       | 16       |
+ *                 +----------+----------+----------+----------+----------+
+ */
+
+typedef enum
+{
+    kCDSectorAreaSync        = 0x80,
+    kCDSectorAreaHeader      = 0x20,
+    kCDSectorAreaSubHeader   = 0x40,
+    kCDSectorAreaUser        = 0x10,
+    kCDSectorAreaAuxiliary   = 0x08,
+    kCDSectorAreaErrorFlags  = 0x02,
+    kCDSectorAreaSubChannel  = 0x01,
+    kCDSectorAreaSubChannelQ = 0x04
+} CDSectorArea;
+
+typedef enum
+{
+    kCDSectorTypeUnknown     = 0x00,
+    kCDSectorTypeCDDA        = 0x01,
+    kCDSectorTypeMode1       = 0x02,
+    kCDSectorTypeMode2       = 0x03,
+    kCDSectorTypeMode2Form1  = 0x04,
+    kCDSectorTypeMode2Form2  = 0x05,
+    kCDSectorTypeCount       = 0x06
+} CDSectorType;
+
+typedef enum
+{
+    kCDSectorSizeCDDA        = 2352,
+    kCDSectorSizeMode1       = 2048,
+    kCDSectorSizeMode2       = 2336,
+    kCDSectorSizeMode2Form1  = 2048,
+    kCDSectorSizeMode2Form2  = 2328,
+    kCDSectorSizeWhole       = 2352
+} CDSectorSize;
+
+/*
+ * Media Types
+ */
+
+typedef enum
+{
+    kCDMediaTypeUnknown      = 0x0100,
+    kCDMediaTypeROM          = 0x0102, /* CD-ROM */
+    kCDMediaTypeR            = 0x0104, /* CD-R   */
+    kCDMediaTypeRW           = 0x0105, /* CD-RW  */
+
+    kCDMediaTypeMin          = 0x0100,
+    kCDMediaTypeMax          = 0x01FF
+};
+
+typedef UInt32 CDMediaType;
+
+/*
+ * Media Speed (kB/s)
+ */
+
+#define kCDSpeedMin 0x00B0
+#define kCDSpeedMax 0xFFFF
+
+/*
+ * MMC Formats
+ */
+
+// Read Table Of Contents Format Types
+typedef UInt8 CDTOCFormat;
+enum
+{
+    kCDTOCFormatTOC  = 0x02, // CDTOC
+    kCDTOCFormatPMA  = 0x03, // CDPMA
+    kCDTOCFormatATIP = 0x04, // CDATIP
+    kCDTOCFormatTEXT = 0x05  // CDTEXT
+};
+
+// Read Table Of Contents Format 0x03
+struct CDPMADescriptor
+{
+    UInt8 reserved;
+#ifdef __LITTLE_ENDIAN__
+    UInt8 control:4, adr:4;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8 adr:4, control:4;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8 tno;
+    UInt8 point;
+    CDMSF address;
+    UInt8 zero;
+    CDMSF p;
+};
+typedef struct CDPMADescriptor CDPMADescriptor;
+
+struct CDPMA
+{
+    UInt16          dataLength;
+    UInt8           reserved;
+    UInt8           reserved2;
+    CDPMADescriptor descriptors[0];
+};
+typedef struct CDPMA CDPMA;
+
+// Read Table Of Contents Format 0x04
+struct CDATIP
+{
+    UInt16 dataLength;
+    UInt8  reserved[2];
+#ifdef __LITTLE_ENDIAN__
+    UInt8  referenceSpeed:3;
+    UInt8  reserved3:1;
+    UInt8  indicativeTargetWritingPower:3;
+    UInt8  reserved2:1;
+
+    UInt8  reserved5:6;
+    UInt8  unrestrictedUse:1;
+    UInt8  reserved4:1;
+
+    UInt8  a3Valid:1;
+    UInt8  a2Valid:1;
+    UInt8  a1Valid:1;
+    UInt8  discSubType:3;
+    UInt8  discType:1;
+    UInt8  reserved6:1;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved2:1;
+    UInt8  indicativeTargetWritingPower:3;
+    UInt8  reserved3:1;
+    UInt8  referenceSpeed:3;
+
+    UInt8  reserved4:1;
+    UInt8  unrestrictedUse:1;
+    UInt8  reserved5:6;
+
+    UInt8  reserved6:1;
+    UInt8  discType:1;
+    UInt8  discSubType:3;
+    UInt8  a1Valid:1;
+    UInt8  a2Valid:1;
+    UInt8  a3Valid:1;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved7;
+    CDMSF  startTimeOfLeadIn;
+    UInt8  reserved8;
+    CDMSF  lastPossibleStartTimeOfLeadOut;
+    UInt8  reserved9;
+    UInt8  a1[3];
+    UInt8  reserved10;
+    UInt8  a2[3];
+    UInt8  reserved11;
+    UInt8  a3[3];
+    UInt8  reserved12;
+};
+typedef struct CDATIP CDATIP;
+
+// Read Table Of Contents Format 0x05
+struct CDTEXTDescriptor
+{
+    UInt8 packType;
+    UInt8 trackNumber;
+    UInt8 sequenceNumber;
+#ifdef __LITTLE_ENDIAN__
+    UInt8 characterPosition:4;
+    UInt8 blockNumber:3;
+    UInt8 doubleByteCharacterCode:1;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8 doubleByteCharacterCode:1;
+    UInt8 blockNumber:3;
+    UInt8 characterPosition:4;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8 textData[12];
+    UInt8 reserved[2];
+};
+typedef struct CDTEXTDescriptor CDTEXTDescriptor;
+
+struct CDTEXT
+{
+    UInt16           dataLength;
+    UInt8            reserved;
+    UInt8            reserved2;
+    CDTEXTDescriptor descriptors[0];
+};
+typedef struct CDTEXT CDTEXT;
+
+// Read Disc Information Format
+struct CDDiscInfo
+{
+    UInt16 dataLength;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  discStatus:2;
+    UInt8  stateOfLastSession:2;
+    UInt8  erasable:1;
+    UInt8  reserved:3;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved:3;
+    UInt8  erasable:1;
+    UInt8  stateOfLastSession:2;
+    UInt8  discStatus:2;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  numberOfFirstTrack;
+    UInt8  numberOfSessionsLSB;
+    UInt8  firstTrackNumberInLastSessionLSB;
+    UInt8  lastTrackNumberInLastSessionLSB;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  reserved3:5;
+    UInt8  unrestrictedUse:1;
+    UInt8  discBarCodeValid:1;
+    UInt8  discIdentificationValid:1;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  discIdentificationValid:1;
+    UInt8  discBarCodeValid:1;
+    UInt8  unrestrictedUse:1;
+    UInt8  reserved3:5;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  discType;
+    UInt8  numberOfSessionsMSB;
+    UInt8  firstTrackNumberInLastSessionMSB;
+    UInt8  lastTrackNumberInLastSessionMSB;
+    UInt32 discIdentification;
+    UInt8  reserved7;
+    CDMSF  lastSessionLeadInStartTime;
+    UInt8  reserved8;
+    CDMSF  lastPossibleStartTimeOfLeadOut;
+    UInt8  discBarCode[8];
+    UInt8  reserved9;
+    UInt8  numberOfOPCTableEntries;
+    UInt8  opcTableEntries[0];
+};
+typedef struct CDDiscInfo CDDiscInfo;
+
+// Read Track Information Address Types
+typedef UInt8 CDTrackInfoAddressType;
+enum
+{
+    kCDTrackInfoAddressTypeLBA           = 0x00,
+    kCDTrackInfoAddressTypeTrackNumber   = 0x01,
+    kCDTrackInfoAddressTypeSessionNumber = 0x02,
+};
+
+// Read Track Information Format
+struct CDTrackInfo
+{
+    UInt16 dataLength;
+    UInt8  trackNumberLSB;
+    UInt8  sessionNumberLSB;
+    UInt8  reserved;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  trackMode:4;
+    UInt8  copy:1;
+    UInt8  damage:1;
+    UInt8  reserved3:2;
+
+    UInt8  dataMode:4;
+    UInt8  fixedPacket:1;
+    UInt8  packet:1;
+    UInt8  blank:1;
+    UInt8  reservedTrack:1;
+
+    UInt8  nextWritableAddressValid:1;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  reserved5:6;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved3:2;
+    UInt8  damage:1;
+    UInt8  copy:1;
+    UInt8  trackMode:4;
+
+    UInt8  reservedTrack:1;
+    UInt8  blank:1;
+    UInt8  packet:1;
+    UInt8  fixedPacket:1;
+    UInt8  dataMode:4;
+
+    UInt8  reserved5:6;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  nextWritableAddressValid:1;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt32 trackStartAddress;
+    UInt32 nextWritableAddress;
+    UInt32 freeBlocks;
+    UInt32 fixedPacketSize;
+    UInt32 trackSize;
+    UInt32 lastRecordedAddress;
+    UInt8  trackNumberMSB;
+    UInt8  sessionNumberMSB;
+    UInt8  reserved6;
+    UInt8  reserved7;
+};
+typedef struct CDTrackInfo CDTrackInfo;
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* _IOCDTYPES_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDevice.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDevice.h.svn-base
new file mode 100644
index 0000000..161651c
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDevice.h.svn-base
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IODVDBlockStorageDevice
+ * @abstract
+ * This header contains the IODVDBlockStorageDevice class definition.
+ */
+
+#ifndef	_IODVDBLOCKSTORAGEDEVICE_H
+#define	_IODVDBLOCKSTORAGEDEVICE_H
+
+#include <IOKit/storage/IODVDTypes.h>
+
+/*!
+ * @defined kIODVDBlockStorageDeviceClass
+ * @abstract
+ * kIODVDBlockStorageDeviceClass is the name of the IODVDBlockStorageDevice class.
+ * @discussion
+ * kIODVDBlockStorageDeviceClass is the name of the IODVDBlockStorageDevice class.
+ */
+
+#define kIODVDBlockStorageDeviceClass "IODVDBlockStorageDevice"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOCDBlockStorageDevice.h>
+
+/* Property used for matching, so the generic driver gets the nub it wants. */
+#define	kIOBlockStorageDeviceTypeDVD	"DVD"
+
+/*!
+ * @class
+ * IODVDBlockStorageDevice : public IOCDBlockStorageDevice
+ * @abstract
+ * The IODVDBlockStorageDevice class is a generic DVD block storage device
+ * abstraction.
+ * @discussion
+ * This class is the protocol for generic DVD functionality, independent of
+ * the physical connection protocol (e.g. SCSI, ATA, USB).
+ *
+ * The APIs are the union of CD APIs and all
+ * necessary new low-level DVD APIs.
+ *
+ * A subclass implements relay methods that translate our requests into
+ * calls to a protocol- and device-specific provider.
+ */
+
+class IODVDBlockStorageDevice : public IOCDBlockStorageDevice {
+
+    OSDeclareAbstractStructors(IODVDBlockStorageDevice)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /* Overrides from IORegistryEntry */
+    
+    virtual bool	init(OSDictionary * properties);
+
+    /* New APIs for DVD */
+
+    virtual IOReturn	reportKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
+                                        const UInt32 lba,const UInt8 agid,const DVDKeyFormat keyFormat)	= 0;
+
+    virtual IOReturn	sendKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
+                                        const UInt8 agid,const DVDKeyFormat keyFormat)	= 0;
+
+#ifdef __LP64__
+    virtual IOReturn	readDVDStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
+                                        const UInt32 address,const UInt8 layer,const UInt8 agid)	= 0;
+#else /* !__LP64__ */
+    virtual IOReturn	readDVDStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
+                                        const UInt32 address,const UInt8 layer,const UInt8 agid); /* 10.1.0 */
+#endif /* !__LP64__ */
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  0);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IODVDBlockStorageDevice,  0);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  1);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  2);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  3);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  4);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  5);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  6);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  7);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  8);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  9);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 10);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 11);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 12);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 13);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 14);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 15);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 16);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 17);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 18);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 19);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 20);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 21);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 22);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 23);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 24);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 25);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 26);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 27);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 28);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 29);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 30);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 31);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IODVDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDriver.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDriver.h.svn-base
new file mode 100644
index 0000000..d9471f6
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDriver.h.svn-base
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * IODVDBlockStorageDriver.h
+ *
+ * This class implements DVD functionality, independent of
+ * the physical connection protocol (e.g. SCSI, ATA, USB).
+ *
+ * A protocol-specific provider implements the functionality using an appropriate
+ * protocol and commands.
+ */
+
+#ifndef	_IODVDBLOCKSTORAGEDRIVER_H
+#define	_IODVDBLOCKSTORAGEDRIVER_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/storage/IOCDBlockStorageDriver.h>
+#include <IOKit/storage/IODVDBlockStorageDevice.h>
+#include <IOKit/storage/IODVDTypes.h>
+
+/*!
+ * @defined kIODVDBlockStorageDriverClass
+ * @abstract
+ * kIODVDBlockStorageDriverClass is the name of the IODVDBlockStorageDriver class.
+ * @discussion
+ * kIODVDBlockStorageDriverClass is the name of the IODVDBlockStorageDriver class.
+ */
+
+#define kIODVDBlockStorageDriverClass "IODVDBlockStorageDriver"
+
+class IODVDBlockStorageDevice;
+
+/*!
+ * @class
+ * IODVDBlockStorageDriver : public IOCDBlockStorageDriver
+ * @abstract
+ * Generic DVD Driver.
+ * @discussion
+ * Storage drivers are split into two parts: the Generic Driver handles
+ * all generic device issues, independent of the lower-level transport
+ * mechanism (e.g. SCSI, ATA, USB, FireWire). All storage operations
+ * at the Generic Driver level are translated into a series of generic
+ * device operations. These operations are passed via the Device Nub
+ * to a Transport Driver, which implements the appropriate
+ * transport-dependent protocol to execute these operations.
+ * 
+ * To determine the write-protect state of a device (or media), for
+ * example, the generic driver would issue a call to the
+ * Transport Driver's reportWriteProtection method. If this were a SCSI
+ * device, its Transport Driver would issue a Mode Sense command to
+ * extract the write-protection status bit. The Transport Driver then
+ * reports true or false to the generic driver.
+ * 
+ * The generic driver therefore has no knowledge of, or involvement
+ * with, the actual commands and mechanisms used to communicate with
+ * the device. It is expected that the generic driver will rarely, if
+ * ever, need to be subclassed to handle device idiosyncrasies; rather,
+ * the Transport Driver should be changed via overrides.
+ * 
+ * A generic driver could be subclassed to create a different type of
+ * generic device. The generic driver IODVDBlockStorageDriver class is a subclass
+ * of IOCDBlockStorageDriver, adding DVD functions. Similarly, the Transport Driver
+ * IODVDBlockStorageDevice is a subclass of IOCDBlockStorageDevice, adding DVD 
+ * functions.
+*/
+
+class IODVDBlockStorageDriver : public IOCDBlockStorageDriver {
+
+    OSDeclareDefaultStructors(IODVDBlockStorageDriver)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    /* Overrides of IOCDBlockStorageDriver. */
+
+    virtual IOReturn	acceptNewMedia(void);
+
+    /* End of IOCDBlockStorageDriver overrides. */
+
+public:
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method to
+     * return a more specific subclass of IOService -- IODVDBlockStorageDevice.
+     * This method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IODVDBlockStorageDevice * getProvider() const;
+
+    /* Overrides of IOCDBlockStorageDriver: */
+
+    virtual const char * getDeviceTypeName(void);
+    virtual IOMedia *	instantiateDesiredMediaObject(void);
+    virtual IOMedia *	instantiateMediaObject(UInt64 base,UInt64 byteSize,
+                                            UInt32 blockSize,char *mediaName);
+
+    /* End of IOCDBlockStorageDriver overrides. */
+
+    /*!
+     * @function reportKey
+     * @abstract
+     * Get key info from the DVD drive.
+     * @discussion
+     * This function handles the getting of key- and encryption-related data for the drive.
+     * @param buffer
+     * A buffer containing information, as documented in the specification
+     * "MtFuji Commands For Multimedia Devices."
+     * @param keyClass
+     * As documented by MtFuji. See DVDKeyClass.
+     * @param lba
+     * As documented by MtFuji.
+     * @param agid
+     * As documented by MtFuji.
+     * @param keyFormat
+     * As documented by MtFuji. See DVDKeyFormat.
+     */
+    virtual IOReturn	reportKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
+                                        const UInt32 lba,const UInt8 agid,const DVDKeyFormat keyFormat);
+
+    /*!
+     * @function sendKey
+     * @abstract
+     * Send key info to the DVD drive.
+     * @discussion
+     * This function handles the setting of key- and encryption-related data for the drive.
+     * @param buffer
+     * A buffer containing information, as documented in the specification
+     * "MtFuji Commands For Multimedia Devices."
+     * @param keyClass
+     * As documented by MtFuji. See DVDKeyClass.
+     * @param agid
+     * As documented by MtFuji.
+     * @param keyFormat
+     * As documented by MtFuji. See DVDKeyFormat.
+     */
+    virtual IOReturn	sendKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
+                                        const UInt8 agid,const DVDKeyFormat keyFormat);
+
+    /*!
+     * @function readStructure
+     * @abstract
+     * Get control structures from the DVD media.
+     * @discussion
+     * This function handles the getting of control structure data for the media.
+     * @param buffer
+     * A buffer containing information, as documented in the specification
+     * "MtFuji Commands For Multimedia Devices."
+     * @param format
+     * As documented by MtFuji. See DVDStructureFormat.
+     * @param address
+     * As documented by MtFuji.
+     * @param layer
+     * As documented by MtFuji.
+     * @param agid
+     * As documented by MtFuji.
+     */
+    virtual IOReturn	readStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
+                                        const UInt32 address,const UInt8 layer,const UInt8 agid); /* 10.1.0 */
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  0);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IODVDBlockStorageDriver,  0);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  1);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  2);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  3);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  4);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  5);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  6);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  7);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  8);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  9);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 10);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 11);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 12);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 13);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 14);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 15);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 16);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 17);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 18);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 19);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 20);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 21);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 22);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 23);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 24);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 25);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 26);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 27);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 28);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 29);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 30);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 31);
+};
+#endif
diff --git a/i386/include/IOKit/storage/.svn/text-base/IODVDMedia.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IODVDMedia.h.svn-base
new file mode 100644
index 0000000..02119c3
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IODVDMedia.h.svn-base
@@ -0,0 +1,357 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IODVDMedia
+ * @abstract
+ * This header contains the IODVDMedia class definition.
+ */
+
+#ifndef _IODVDMEDIA_H
+#define _IODVDMEDIA_H
+
+/*!
+ * @defined kIODVDMediaClass
+ * @abstract
+ * kIODVDMediaClass is the name of the IODVDMedia class.
+ * @discussion
+ * kIODVDMediaClass is the name of the IODVDMedia class.
+ */
+
+#define kIODVDMediaClass "IODVDMedia"
+
+/*!
+ * @defined kIODVDMediaTypeKey
+ * @abstract
+ * kIODVDMediaTypeKey is a property of IODVDMedia objects.  It has an OSString
+ * value.
+ * @discussion
+ * The kIODVDMediaTypeKey property identifies the DVD media type (DVD-ROM,
+ * DVD-R, DVD-RW, DVD+RW, DVD-RAM, etc).  See the kIODVDMediaType contants
+ * for possible values.
+ */
+
+#define kIODVDMediaTypeKey "Type"
+
+/*!
+ * @defined kIODVDMediaTypeROM
+ * The kIODVDMediaTypeKey constant for DVD-ROM media.
+ */
+
+#define kIODVDMediaTypeROM "DVD-ROM"
+
+/*!
+ * @defined kIODVDMediaTypeR
+ * The kIODVDMediaTypeKey constant for DVD Recordable (DVD-R) media.
+ */
+
+#define kIODVDMediaTypeR "DVD-R"
+
+/*!
+ * @defined kIODVDMediaTypeRW
+ * The kIODVDMediaTypeKey constant for DVD ReWritable (DVD-RW) media.
+ */
+
+#define kIODVDMediaTypeRW "DVD-RW"
+
+/*!
+ * @defined kIODVDMediaTypePlusR
+ * The kIODVDMediaTypeKey constant for DVD "Plus" Recordable (DVD+R) media.
+ */
+
+#define kIODVDMediaTypePlusR "DVD+R"
+
+/*!
+ * @defined kIODVDMediaTypePlusRW
+ * The kIODVDMediaTypeKey constant for DVD "Plus" ReWritable (DVD+RW) media.
+ */
+
+#define kIODVDMediaTypePlusRW "DVD+RW"
+
+/*!
+ * @defined kIODVDMediaTypeRAM
+ * The kIODVDMediaTypeKey constant for DVD-RAM media.
+ */
+
+#define kIODVDMediaTypeRAM "DVD-RAM"
+
+/*!
+ * @defined kIODVDMediaTypeHDROM
+ * The kIODVDMediaTypeKey constant for HD DVD-ROM media.
+ */
+
+#define kIODVDMediaTypeHDROM "HD DVD-ROM"
+
+/*!
+ * @defined kIODVDMediaTypeHDR
+ * The kIODVDMediaTypeKey constant for HD DVD Recordable (HD DVD-R) media.
+ */
+
+#define kIODVDMediaTypeHDR "HD DVD-R"
+
+/*!
+ * @defined kIODVDMediaTypeHDRW
+ * The kIODVDMediaTypeKey constant for HD DVD ReWritable (HD DVD-RW) media.
+ */
+
+#define kIODVDMediaTypeHDRW "HD DVD-RW"
+
+/*!
+ * @defined kIODVDMediaTypeHDRAM
+ * The kIODVDMediaTypeKey constant for HD DVD-RAM media.
+ */
+
+#define kIODVDMediaTypeHDRAM "HD DVD-RAM"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IODVDBlockStorageDriver.h>
+#include <IOKit/storage/IOMedia.h>
+
+/*!
+ * @class IODVDMedia
+ * @abstract
+ * The IODVDMedia class is a random-access disk device abstraction for DVDs.
+ * @discussion
+ * The IODVDMedia class is a random-access disk device abstraction for DVDs.
+ */
+
+class IODVDMedia : public IOMedia
+{
+    OSDeclareDefaultStructors(IODVDMedia)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*
+     * Obtain this object's provider.   We override the superclass's method to
+     * return a more specific subclass of IOService -- IODVDBlockStorageDriver.
+     * This method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IODVDBlockStorageDriver * getProvider() const;
+
+    /*
+     * Compare the properties in the supplied table to this object's properties.
+     */
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
+
+    /*!
+     * @function reportKey
+     * @discussion
+     * Issue an MMC REPORT KEY command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.  Pass null for the kDVDKeyFormatAGID_Invalidate format
+     * case.
+     * @param keyClass
+     * As documented by MMC.
+     * @param address
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @param format
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn reportKey( IOMemoryDescriptor * buffer,
+                                const DVDKeyClass    keyClass,
+                                const UInt32         address,
+                                const UInt8          grantID,
+                                const DVDKeyFormat   format ); /* 10.1.0 */
+
+    /*!
+     * @function sendKey
+     * @discussion
+     * Issue an MMC SEND KEY command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.  Pass null for the kDVDKeyFormatAGID_Invalidate format
+     * case.
+     * @param keyClass
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @param format
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn sendKey( IOMemoryDescriptor * buffer,
+                              const DVDKeyClass    keyClass,
+                              const UInt8          grantID,
+                              const DVDKeyFormat   format ); /* 10.1.0 */
+
+    /*!
+     * @function readStructure
+     * @discussion
+     * Issue an MMC READ DVD STRUCTURE command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param format
+     * As documented by MMC.
+     * @param address
+     * As documented by MMC.
+     * @param layer
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readStructure( IOMemoryDescriptor *     buffer,
+                                    const DVDStructureFormat format,
+                                    const UInt32             address,
+                                    const UInt8              layer,
+                                    const UInt8              grantID ); /* 10.1.0 */
+
+    /*!
+     * @function getSpeed
+     * @discussion
+     * Get the current speed used for data transfers.
+     * @param kilobytesPerSecond
+     * Returns the current speed used for data transfers, in kB/s.
+     *
+     * kDVDSpeedMin specifies the minimum speed for all DVD media (1X).
+     * kDVDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond); /* 10.1.0 */
+
+    /*!
+     * @function setSpeed
+     * @discussion
+     * Set the speed to be used for data transfers.
+     * @param kilobytesPerSecond
+     * Speed to be used for data transfers, in kB/s.
+     *
+     * kDVDSpeedMin specifies the minimum speed for all DVD media (1X).
+     * kDVDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond); /* 10.1.0 */
+
+    /*!
+     * @function readDiscInfo
+     * @discussion
+     * Issue an MMC READ DISC INFORMATION command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readDiscInfo( IOMemoryDescriptor * buffer,
+                                   UInt16 *             actualByteCount ); /* 10.2.0 */
+
+    /*!
+     * @function readRZoneInfo
+     * @discussion
+     * Issue an MMC READ RZONE INFORMATION (READ TRACK INFORMATION) command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param address
+     * As documented by MMC.
+     * @param addressType
+     * As documented by MMC.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readRZoneInfo( IOMemoryDescriptor *    buffer,
+                                    UInt32                  address,
+                                    DVDRZoneInfoAddressType addressType,
+                                    UInt16 *                actualByteCount ); /* 10.2.0 */
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  0);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  1);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  2);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  3);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  4);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  5);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  6);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  0);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  1);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  2);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  3);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  4);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  5);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  6);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  7);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  8);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  9);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 10);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 11);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 12);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 13);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 14);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 15);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 16);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 17);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 18);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 19);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 20);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 21);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 22);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 23);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 24);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 25);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 26);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 27);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 28);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 29);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 30);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 31);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IODVDMEDIA_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IODVDMediaBSDClient.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IODVDMediaBSDClient.h.svn-base
new file mode 100644
index 0000000..2258bf6
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IODVDMediaBSDClient.h.svn-base
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IODVDMEDIABSDCLIENT_H
+#define _IODVDMEDIABSDCLIENT_H
+
+#include <sys/ioctl.h>
+
+#include <IOKit/storage/IODVDTypes.h>
+
+/*
+ * Definitions
+ *
+ * ioctl                        description
+ * ---------------------------- ------------------------------------------------
+ * DKIOCDVDREADSTRUCTURE        see IODVDMedia::readStructure()  in IODVDMedia.h
+ *
+ * DKIOCDVDREADDISCINFO         see IODVDMedia::readDiscInfo()   in IODVDMedia.h
+ * DKIOCDVDREADRZONEINFO        see IODVDMedia::readRZoneInfo()  in IODVDMedia.h
+ *
+ * DKIOCDVDREPORTKEY            see IODVDMedia::reportKey()      in IODVDMedia.h
+ * DKIOCDVDSENDKEY              see IODVDMedia::sendKey()        in IODVDMedia.h
+ *
+ * DKIOCDVDGETSPEED             see IODVDMedia::getSpeed()       in IODVDMedia.h
+ * DKIOCDVDSETSPEED             see IODVDMedia::setSpeed()       in IODVDMedia.h
+ *
+ *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
+ */
+
+typedef struct
+{
+    uint8_t  format;
+
+    uint8_t  reserved0008[3];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  grantID;
+    uint8_t  layer;
+
+#ifdef __LP64__
+    uint8_t  reserved0080[4];                      /* reserved, clear to zero */
+#endif /* __LP64__ */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_dvd_read_structure_t;
+
+typedef struct
+{
+    uint8_t  format;
+    uint8_t  keyClass;
+
+    uint8_t  reserved0016[2];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  grantID;
+
+#ifdef __LP64__
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_dvd_report_key_t;
+
+typedef struct
+{
+    uint8_t  format;
+    uint8_t  keyClass;
+
+    uint8_t  reserved0016[6];                      /* reserved, clear to zero */
+
+    uint8_t  grantID;
+
+#ifdef __LP64__
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_dvd_send_key_t;
+
+typedef struct
+{
+#ifdef __LP64__
+    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0000[10];                     /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_dvd_read_disc_info_t;
+
+typedef struct
+{
+    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  addressType;
+
+#ifdef __LP64__
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_dvd_read_rzone_info_t;
+
+#define DKIOCDVDREADSTRUCTURE _IOW('d', 128, dk_dvd_read_structure_t)
+#define DKIOCDVDREPORTKEY     _IOW('d', 129, dk_dvd_report_key_t)
+#define DKIOCDVDSENDKEY       _IOW('d', 130, dk_dvd_send_key_t)
+
+#define DKIOCDVDGETSPEED      _IOR('d', 131, uint16_t)
+#define DKIOCDVDSETSPEED      _IOW('d', 131, uint16_t)
+
+#define DKIOCDVDREADDISCINFO  _IOWR('d', 132, dk_dvd_read_disc_info_t)
+#define DKIOCDVDREADRZONEINFO _IOWR('d', 133, dk_dvd_read_rzone_info_t)
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IODVDMedia.h>
+#include <IOKit/storage/IOMediaBSDClient.h>
+
+/*
+ * Class
+ */
+
+class IODVDMediaBSDClient : public IOMediaBSDClient
+{
+    OSDeclareDefaultStructors(IODVDMediaBSDClient)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*
+     * Obtain this object's provider.   We override the superclass's method
+     * to return a more specific subclass of IOService -- IODVDMedia.  This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IODVDMedia * getProvider() const;
+
+    /*
+     * Process a DVD-specific ioctl.
+     */
+
+    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
+
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 0);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 1);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 2);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 3);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 4);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 5);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 6);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 7);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IODVDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IODVDTypes.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IODVDTypes.h.svn-base
new file mode 100644
index 0000000..039b8fb
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IODVDTypes.h.svn-base
@@ -0,0 +1,451 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_IODVDTYPES_H
+#define	_IODVDTYPES_H
+
+#include <IOKit/IOTypes.h>
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/*
+ * Media Types
+ */
+
+enum
+{
+    kDVDMediaTypeUnknown   = 0x0200,
+    kDVDMediaTypeROM       = 0x0202, /* DVD-ROM    */
+    kDVDMediaTypeRAM       = 0x0203, /* DVD-RAM    */
+    kDVDMediaTypeR         = 0x0204, /* DVD-R      */
+    kDVDMediaTypeRW        = 0x0205, /* DVD-RW     */
+    kDVDMediaTypePlusRW    = 0x0206, /* DVD+RW     */
+    kDVDMediaTypePlusR     = 0x0207, /* DVD+R      */
+    kDVDMediaTypeHDROM     = 0x0212, /* HD DVD-ROM */
+    kDVDMediaTypeHDRAM     = 0x0213, /* HD DVD-RAM */
+    kDVDMediaTypeHDR       = 0x0214, /* HD DVD-R   */
+    kDVDMediaTypeHDRW      = 0x0215, /* HD DVD-RW  */
+
+    kDVDMediaTypeMin       = 0x0200,
+    kDVDMediaTypeMax       = 0x02FF
+};
+
+typedef UInt32 DVDMediaType;
+
+/*
+ * Media Speed (kB/s)
+ */
+
+#define kDVDSpeedMin 0x0546
+#define kDVDSpeedMax 0xFFFF
+
+/*
+ * MMC Formats
+ */
+
+typedef UInt8	DVDCPRMRegionCode;
+enum
+{
+	kDVDCPRMRegion1		= 0xFE,
+	kDVDCPRMRegion2		= 0xFD,
+	kDVDCPRMRegion3		= 0xFB,
+	kDVDCPRMRegion4		= 0xF7,
+	kDVDCPRMRegion5		= 0xEF,
+	kDVDCPRMRegion6		= 0xDF
+};
+
+typedef UInt8	DVDRegionalPlaybackControlScheme;
+enum
+{
+	kDVDRegionalPlaybackControlSchemePhase1		= 0x00,
+	kDVDRegionalPlaybackControlSchemePhase2		= 0x01
+};
+
+typedef UInt8	DVDBookType;
+enum
+{
+	kDVDBookTypeROM					= 0x0,
+	kDVDBookTypeRAM					= 0x1,
+	kDVDBookTypeR					= 0x2,
+	kDVDBookTypeRW					= 0x3,
+	kDVDBookTypeHDROM				= 0x4,
+	kDVDBookTypeHDRAM				= 0x5,
+	kDVDBookTypeHDR					= 0x6,
+	kDVDBookTypeHDRW				= 0x7,
+	kDVDBookTypePlusRW				= 0x9,
+	kDVDBookTypePlusR				= 0xA,
+	kDVDBookTypePlusRWDoubleLayer	= 0xD,
+	kDVDBookTypePlusRDoubleLayer	= 0xE
+};
+
+#ifdef __LP64__
+typedef UInt8	DVDKeyClass;
+enum
+#else /* !__LP64__ */
+enum DVDKeyClass
+#endif /* !__LP64__ */
+{
+	kDVDKeyClassCSS_CPPM_CPRM	= 0x00,
+	kDVDKeyClassRSSA			= 0x01
+};
+#ifndef __LP64__
+typedef enum DVDKeyClass DVDKeyClass;
+#endif /* !__LP64__ */
+
+#ifdef __LP64__
+typedef UInt8	DVDKeyFormat;
+enum
+#else /* !__LP64__ */
+enum DVDKeyFormat
+#endif /* !__LP64__ */
+{
+	kDVDKeyFormatAGID_CSS			= 0x00,
+	kDVDKeyFormatChallengeKey		= 0x01,
+	kDVDKeyFormatKey1				= 0x02,
+	kDVDKeyFormatKey2				= 0x03,
+	kDVDKeyFormatTitleKey			= 0x04,
+	kDVDKeyFormatASF				= 0x05,
+	kDVDKeyFormatSetRegion			= 0x06,
+	kDVDKeyFormatRegionState		= 0x08,
+	kDVDKeyFormatAGID_CSS2			= 0x10,
+	kDVDKeyFormatAGID_CPRM			= 0x11,
+	kDVDKeyFormatAGID_Invalidate	= 0x3F
+};	
+#ifndef __LP64__
+typedef enum DVDKeyFormat DVDKeyFormat;
+#endif /* !__LP64__ */
+
+typedef UInt8	DVDStructureFormat;
+enum
+{
+	kDVDStructureFormatPhysicalFormatInfo			= 0x00,
+	kDVDStructureFormatCopyrightInfo				= 0x01,
+	kDVDStructureFormatDiscKeyInfo					= 0x02,
+	// skip BCA
+	kDVDStructureFormatManufacturingInfo			= 0x04
+};
+
+// Read DVD Structures Format 0x00
+struct DVDPhysicalFormatInfo
+{
+	UInt8		dataLength[2];
+	UInt8		reserved[2];
+#ifdef __LITTLE_ENDIAN__
+	// Byte 0
+	UInt8		partVersion:4;
+	UInt8		bookType:4;
+	
+	// Byte 1
+	UInt8		minimumRate:4;
+	UInt8		discSize:4;
+	
+	// Byte 2
+	UInt8		layerType:4;
+	UInt8		trackPath:1;
+	UInt8		numberOfLayers:2;
+	UInt8		reserved2:1;
+	
+	// Byte 3
+	UInt8		trackDensity:4;
+	UInt8		linearDensity:4;
+#else /* !__LITTLE_ENDIAN__ */
+	// Byte 0
+	UInt8		bookType:4;
+	UInt8		partVersion:4;
+	
+	// Byte 1
+	UInt8		discSize:4;
+	UInt8		minimumRate:4;
+	
+	// Byte 2
+	UInt8		reserved2:1;
+	UInt8		numberOfLayers:2;
+	UInt8		trackPath:1;
+	UInt8		layerType:4;
+	
+	// Byte 3
+	UInt8		linearDensity:4;
+	UInt8		trackDensity:4;
+#endif /* !__LITTLE_ENDIAN__ */
+	
+	// Bytes 4-15
+	UInt8		zero1;		// always 0x00
+	UInt8		startingPhysicalSectorNumberOfDataArea[3];
+	UInt8		zero2;		// always 0x00
+	UInt8		endPhysicalSectorNumberOfDataArea[3];
+	UInt8		zero3;		// always 0x00
+	UInt8		endSectorNumberInLayerZero[3];
+	
+	// Byte 16
+#ifdef __LITTLE_ENDIAN__
+	UInt8		reserved1:7;
+	UInt8		bcaFlag:1;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt8		bcaFlag:1;
+	UInt8		reserved1:7;
+#endif /* !__LITTLE_ENDIAN__ */
+	
+	// Bytes 17-2047
+	UInt8		mediaSpecific[2031];
+};
+typedef struct DVDPhysicalFormatInfo DVDPhysicalFormatInfo;
+
+// Read DVD Structures Format 0x01
+struct DVDCopyrightInfo
+{
+	UInt8				dataLength[2];
+	UInt8				reserved[2];
+	UInt8				copyrightProtectionSystemType;
+	DVDCPRMRegionCode	regionMask;
+	UInt8				reserved2[2];
+};
+typedef struct DVDCopyrightInfo DVDCopyrightInfo;
+
+// Read DVD Structures Format 0x02
+struct DVDDiscKeyInfo
+{
+	UInt8		dataLength[2];
+	UInt8		reserved[2];
+	UInt8		discKeyStructures[2048];
+};
+typedef struct DVDDiscKeyInfo DVDDiscKeyInfo;
+
+// Read DVD Structures Format 0x04
+struct DVDManufacturingInfo
+{
+	UInt8		dataLength[2];
+	UInt8		reserved[2];
+	UInt8		discManufacturingInfo[2048];
+};
+typedef struct DVDManufacturingInfo DVDManufacturingInfo;
+
+// ReportKey Format 0x00
+struct DVDAuthenticationGrantIDInfo
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+	UInt8	reserved2[3];
+#ifdef __LITTLE_ENDIAN__
+	UInt8	reservedBits:6;
+	UInt8	grantID:2;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt8	grantID:2;
+	UInt8	reservedBits:6;
+#endif /* !__LITTLE_ENDIAN__ */
+};
+typedef struct DVDAuthenticationGrantIDInfo DVDAuthenticationGrantIDInfo;
+
+// ReportKey and SendKey Format 0x01
+struct DVDChallengeKeyInfo
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+	UInt8	challengeKeyValue[10];
+	UInt8	reserved2[2];
+};
+typedef struct DVDChallengeKeyInfo DVDChallengeKeyInfo;
+
+// ReportKey Format 0x02
+struct DVDKey1Info
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+	UInt8	key1Value[5];
+	UInt8	reserved2[3];
+};
+typedef struct DVDKey1Info DVDKey1Info;
+
+// SendKey Format 0x03
+struct DVDKey2Info
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+	UInt8	key2Value[5];
+	UInt8	reserved2[3];
+};
+typedef struct DVDKey2Info DVDKey2Info;
+
+// ReportKey Format 0x04
+struct DVDTitleKeyInfo
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+#ifdef __LITTLE_ENDIAN__
+	UInt8	CP_MOD:4;
+	UInt8	CGMS:2;
+	UInt8	CP_SEC:1;
+	UInt8	CPM:1;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt8	CPM:1;
+	UInt8	CP_SEC:1;
+	UInt8	CGMS:2;
+	UInt8	CP_MOD:4;
+#endif /* !__LITTLE_ENDIAN__ */
+	UInt8	titleKeyValue[5];
+	UInt8	reserved2[2];
+};
+typedef struct DVDTitleKeyInfo DVDTitleKeyInfo;
+
+// ReportKey Format 0x05
+struct DVDAuthenticationSuccessFlagInfo
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+	UInt8	reserved2[3];
+#ifdef __LITTLE_ENDIAN__
+	UInt8	successFlag:1;
+	UInt8	reservedBits:7;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt8	reservedBits:7;
+	UInt8	successFlag:1;
+#endif /* !__LITTLE_ENDIAN__ */
+};
+typedef struct DVDAuthenticationSuccessFlagInfo DVDAuthenticationSuccessFlagInfo;
+
+// ReportKey Format 0x08
+struct DVDRegionPlaybackControlInfo
+{
+	UInt8									dataLength[2];
+	UInt8									reserved[2];
+#ifdef __LITTLE_ENDIAN__
+	UInt8									numberUserResets:3;
+	UInt8									numberVendorResets:3;
+	UInt8									typeCode:2;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt8									typeCode:2;
+	UInt8									numberVendorResets:3;
+	UInt8									numberUserResets:3;
+#endif /* !__LITTLE_ENDIAN__ */
+	DVDCPRMRegionCode						driveRegion;
+	DVDRegionalPlaybackControlScheme		rpcScheme;
+	UInt8									reserved2;
+};
+typedef struct DVDRegionPlaybackControlInfo DVDRegionPlaybackControlInfo;
+
+// Read Disc Information Format
+struct DVDDiscInfo
+{
+    UInt16 dataLength;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  discStatus:2;
+    UInt8  stateOfLastBorder:2;
+    UInt8  erasable:1;
+    UInt8  reserved:3;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved:3;
+    UInt8  erasable:1;
+    UInt8  stateOfLastBorder:2;
+    UInt8  discStatus:2;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved2;
+    UInt8  numberOfBordersLSB;
+    UInt8  firstRZoneNumberInLastBorderLSB;
+    UInt8  lastRZoneNumberInLastBorderLSB;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  reserved3:5;
+    UInt8  unrestrictedUse:1;
+    UInt8  discBarCodeValid:1;
+    UInt8  reserved4:1;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved4:1;
+    UInt8  discBarCodeValid:1;
+    UInt8  unrestrictedUse:1;
+    UInt8  reserved3:5;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved5;
+    UInt8  numberOfBordersMSB;
+    UInt8  firstRZoneNumberInLastBorderMSB;
+    UInt8  lastRZoneNumberInLastBorderMSB;
+    UInt8  reserved6[4];
+    UInt8  reserved7[4];
+    UInt8  reserved8[4];
+    UInt8  discBarCode[8];
+    UInt8  reserved9;
+    UInt8  numberOfOPCTableEntries;
+    UInt8  opcTableEntries[0];
+};
+typedef struct DVDDiscInfo DVDDiscInfo;
+
+// Read RZone Information Address Types
+typedef UInt8 DVDRZoneInfoAddressType;
+enum
+{
+    kDVDRZoneInfoAddressTypeLBA          = 0x00,
+    kDVDRZoneInfoAddressTypeRZoneNumber  = 0x01,
+    kDVDRZoneInfoAddressTypeBorderNumber = 0x02,
+};
+
+// Read RZone Information Format
+struct DVDRZoneInfo
+{
+    UInt16 dataLength;
+    UInt8  rzoneNumberLSB;
+    UInt8  borderNumberLSB;
+    UInt8  reserved;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  reserved2:4;
+    UInt8  copy:1;
+    UInt8  damage:1;
+    UInt8  reserved3:2;
+
+    UInt8  reserved4:4;
+    UInt8  restrictedOverwrite:1;
+    UInt8  incremental:1;
+    UInt8  blank:1;
+    UInt8  reservedRZone:1;
+
+    UInt8  nextWritableAddressValid:1;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  reserved5:6;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved3:2;
+    UInt8  damage:1;
+    UInt8  copy:1;
+    UInt8  reserved2:4;
+
+    UInt8  reservedRZone:1;
+    UInt8  blank:1;
+    UInt8  incremental:1;
+    UInt8  restrictedOverwrite:1;
+    UInt8  reserved4:4;
+
+    UInt8  reserved5:6;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  nextWritableAddressValid:1;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt32 rzoneStartAddress;
+    UInt32 nextWritableAddress;
+    UInt32 freeBlocks;
+    UInt32 blockingFactor;
+    UInt32 rzoneSize;
+    UInt32 lastRecordedAddress;
+    UInt8  rzoneNumberMSB;
+    UInt8  borderNumberMSB;
+    UInt8  reserved6;
+    UInt8  reserved7;
+};
+typedef struct DVDRZoneInfo DVDRZoneInfo;
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* _IODVDTYPES_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOFDiskPartitionScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOFDiskPartitionScheme.h.svn-base
new file mode 100644
index 0000000..7f96255
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOFDiskPartitionScheme.h.svn-base
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * This header contains the IOFDiskPartitionScheme class definition.
+ */
+
+#ifndef _IOFDISKPARTITIONSCHEME_H
+#define _IOFDISKPARTITIONSCHEME_H
+
+#include <IOKit/IOTypes.h>
+
+/*
+ * kIOFDiskPartitionSchemeClass is the name of the IOFDiskPartitionScheme class.
+ */
+
+#define kIOFDiskPartitionSchemeClass "IOFDiskPartitionScheme"
+
+/*
+ * FDisk Partition Map Definitions
+ */
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/* Structure constants. */
+
+#define DISK_BLK0SZ sizeof(struct disk_blk0)    /* (size of partition map)    */
+#define DISK_BOOTSZ 446                         /* (size of boot code in map) */
+#define DISK_NPART  4                           /* (number of entries in map) */
+
+/* Partition map entry. */
+
+struct fdisk_part
+{
+    UInt8   bootid;    /* (is active boot partition?)                         */
+    UInt8   beghead;   /* (beginning head)                                    */
+    UInt8   begsect;   /* (beginning sector; beginning cylinder, high 2 bits) */
+    UInt8   begcyl;    /* (beginning cylinder, low 8 bits)                    */
+    UInt8   systid;    /* (type)                                              */
+    UInt8   endhead;   /* (ending head)                                       */
+    UInt8   endsect;   /* (ending sector; ending cylinder, high 2 bits)       */
+    UInt8   endcyl;    /* (ending cylinder, low 8 bits)                       */
+    UInt32  relsect;   /* (block start)                                       */
+    UInt32  numsect;   /* (block count)                                       */
+};
+
+/* Partition map, as found in block zero of the disk (or extended partition). */
+
+struct disk_blk0
+{
+    UInt8             bootcode[DISK_BOOTSZ];    /* (boot code)                */
+    struct fdisk_part parts[DISK_NPART];        /* (partition entries)        */
+    UInt16            signature;                /* (unique signature for map) */
+};
+
+/* Partition map signature (signature). */
+
+#define DISK_SIGNATURE 0xAA55
+
+/* Partition map entry types (systid). */
+
+#define FDISK_PARTITION_TYPE_01 "DOS_FAT_12"
+#define FDISK_PARTITION_TYPE_04 "DOS_FAT_16_S"
+#define FDISK_PARTITION_TYPE_06 "DOS_FAT_16"
+#define FDISK_PARTITION_TYPE_07 "Windows_NTFS"
+#define FDISK_PARTITION_TYPE_0B "DOS_FAT_32"
+#define FDISK_PARTITION_TYPE_0C "Windows_FAT_32"
+#define FDISK_PARTITION_TYPE_0E "Windows_FAT_16"
+#define FDISK_PARTITION_TYPE_42 "Windows_LDM"
+#define FDISK_PARTITION_TYPE_82 "Linux_Swap"
+#define FDISK_PARTITION_TYPE_83 "Linux"
+#define FDISK_PARTITION_TYPE_8E "Linux_LVM"
+#define FDISK_PARTITION_TYPE_A5 "FreeBSD"
+#define FDISK_PARTITION_TYPE_A6 "OpenBSD"
+#define FDISK_PARTITION_TYPE_A7 "Apple_Rhapsody_UFS"
+#define FDISK_PARTITION_TYPE_A8 "Apple_UFS"
+#define FDISK_PARTITION_TYPE_A9 "NetBSD"
+#define FDISK_PARTITION_TYPE_AB "Apple_Boot"
+#define FDISK_PARTITION_TYPE_AE "Apple_Encrypted"
+#define FDISK_PARTITION_TYPE_AF "Apple_HFS"
+#define FDISK_PARTITION_TYPE_FD "Linux_RAID"
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* !_IOFDISKPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOFilterScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOFilterScheme.h.svn-base
new file mode 100644
index 0000000..406b596
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOFilterScheme.h.svn-base
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOFilterScheme
+ * @abstract
+ * This header contains the IOFilterScheme class definition.
+ */
+
+#ifndef _IOFILTERSCHEME_H
+#define _IOFILTERSCHEME_H
+
+/*!
+ * @defined kIOFilterSchemeClass
+ * @abstract
+ * The name of the IOFilterScheme class.
+ * @discussion
+ * kIOFilterSchemeClass is the name of the IOFilterScheme class.
+ */
+
+#define kIOFilterSchemeClass "IOFilterScheme"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOMedia.h>
+#include <IOKit/storage/IOStorage.h>
+
+/*!
+ * @class IOFilterScheme
+ * @abstract
+ * The common base class for all filter scheme
+ * objects.
+ * @discussion
+ * The IOFilterScheme class is the common base class for all filter scheme
+ * objects.  It extends the IOStorage class by implementing the appropriate
+ * open and close semantics for filter objects (standard semantics are act
+ * as a relay for incoming opens, producing one outgoing open for each
+ * incoming open).  It also implements the default read and write semantics,
+ * which pass all reads and writes through to the provider media unprocessed.
+ * For simple schemes, the default behavior is sufficient.  More complex
+ * filter schemes such as RAID will want to do extra processing for reads
+ * and writes.
+ */
+
+class IOFilterScheme : public IOStorage
+{
+    OSDeclareDefaultStructors(IOFilterScheme);
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    /*!
+     * @function handleOpen
+     * @discussion
+     * The handleOpen method grants or denies permission to access this object
+     * to an interested client.  The argument is an IOStorageAccess value that
+     * specifies the level of access desired -- reader or reader-writer.
+     *
+     * This method can be invoked to upgrade or downgrade the access level for
+     * an existing client as well.  The previous access level will prevail for
+     * upgrades that fail, of course.   A downgrade should never fail.  If the
+     * new access level should be the same as the old for a given client, this
+     * method will do nothing and return success.  In all cases, one, singular
+     * close-per-client is expected for all opens-per-client received.
+     *
+     * This implementation replaces the IOService definition of handleOpen().
+     * @param client
+     * Client requesting the open.
+     * @param options
+     * Options for the open.  Set to zero.
+     * @param access
+     * Access level for the open.  Set to kIOStorageAccessReader or
+     * kIOStorageAccessReaderWriter.
+     * @result
+     * Returns true if the open was successful, false otherwise.
+     */
+
+    virtual bool handleOpen(IOService *  client,
+                            IOOptionBits options,
+                            void *       access);
+
+    /*!
+     * @function handleIsOpen
+     * @discussion
+     * The handleIsOpen method determines whether the specified client, or any
+     * client if none is specified, presently has an open on this object.
+     *
+     * This implementation replaces the IOService definition of handleIsOpen().
+     * @param client
+     * Client to check the open state of.  Set to zero to check the open state
+     * of all clients.
+     * @result
+     * Returns true if the client was (or clients were) open, false otherwise.
+     */
+
+    virtual bool handleIsOpen(const IOService * client) const;
+
+    /*!
+     * @function handleClose
+     * @discussion
+     * The handleClose method closes the client's access to this object.
+     *
+     * This implementation replaces the IOService definition of handleClose().
+     * @param client
+     * Client requesting the close.
+     * @param options
+     * Options for the close.  Set to zero.
+     */
+
+    virtual void handleClose(IOService * client, IOOptionBits options);
+
+public:
+
+    using IOStorage::read;
+    using IOStorage::write;
+
+    /*!
+     * @function read
+     * @discussion
+     * Read data from the storage object at the specified byte offset into the
+     * specified buffer, asynchronously.   When the read completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the read.
+     *
+     * For simple filter schemes, the default behavior is to simply pass the
+     * read through to the provider media.  More complex filter schemes such
+     * as RAID will need to do extra processing here.
+     * @param client
+     * Client requesting the read.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void read(IOService *           client,
+                      UInt64                byteStart,
+                      IOMemoryDescriptor *  buffer,
+                      IOStorageAttributes * attributes,
+                      IOStorageCompletion * completion);
+
+    /*!
+     * @function write
+     * @discussion
+     * Write data into the storage object at the specified byte offset from the
+     * specified buffer, asynchronously.   When the write completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the write.
+     *
+     * For simple filter schemes, the default behavior is to simply pass the
+     * write through to the provider media. More complex filter schemes such
+     * as RAID will need to do extra processing here.
+     * @param client
+     * Client requesting the write.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void write(IOService *           client,
+                       UInt64                byteStart,
+                       IOMemoryDescriptor *  buffer,
+                       IOStorageAttributes * attributes,
+                       IOStorageCompletion * completion);
+
+    /*!
+     * @function synchronizeCache
+     * @discussion
+     * Flush the cached data in the storage object, if any, synchronously.
+     * @param client
+     * Client requesting the cache synchronization.
+     * @result
+     * Returns the status of the cache synchronization.
+     */
+
+    virtual IOReturn synchronizeCache(IOService * client);
+
+    /*!
+     * @function discard
+     * @discussion
+     * Delete unused data from the storage object at the specified byte offset,
+     * synchronously.
+     * @param client
+     * Client requesting the operation.
+     * @param byteStart
+     * Starting byte offset for the operation.
+     * @param byteCount
+     * Size of the operation.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn discard(IOService * client,
+                             UInt64      byteStart,
+                             UInt64      byteCount);
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method
+     * to return a more specific subclass of OSObject -- an IOMedia.  This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOMedia * getProvider() const;
+
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  0);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  1);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  2);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  3);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  4);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  5);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  6);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  7);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  8);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  9);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 10);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 11);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 12);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 13);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 14);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 15);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 16);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 17);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 18);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 19);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 20);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 21);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 22);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 23);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 24);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 25);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 26);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 27);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 28);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 29);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 30);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 31);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOFILTERSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOFireWireStorageCharacteristics.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOFireWireStorageCharacteristics.h.svn-base
new file mode 100644
index 0000000..710f29f
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOFireWireStorageCharacteristics.h.svn-base
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_
+#define _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_
+
+//
+//	Bridge Characteristics - Characteristics defined for FireWire bridges.
+//
+
+/*!
+@defined kIOPropertyBridgeCharacteristicsKey
+@discussion This key is used to define Bridge Characteristics for a particular
+devices's bridge chipset. It has an associated dictionary which lists the
+bridge characteristics.
+
+Requirement: Optional
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Bridge Characteristics</key>
+	<dict>
+		<key>Bridge Vendor Name</key>
+		<string>Oxford Semiconductor</string>
+		<key>Bridge Model Name</key>
+		<string>FW911</string>
+		<key>Bridge Revision Level</key>
+		<string>3.7</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+
+#define kIOPropertyBridgeCharacteristicsKey		"Bridge Characteristics"
+#define kIOPropertyBridgeVendorNameKey			"Bridge Vendor Name"
+#define kIOPropertyBridgeModelNameKey			"Bridge Model Name"
+#define kIOPropertyBridgeRevisionLevelKey		"Bridge Revision Level"
+
+#endif	/* _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOGUIDPartitionScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOGUIDPartitionScheme.h.svn-base
new file mode 100644
index 0000000..3e197d0
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOGUIDPartitionScheme.h.svn-base
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * This header contains the IOGUIDPartitionScheme class definition.
+ */
+
+#ifndef _IOGUIDPARTITIONSCHEME_H
+#define _IOGUIDPARTITIONSCHEME_H
+
+#include <IOKit/IOTypes.h>
+
+typedef unsigned char uuid_t[16];
+/*
+ * kIOGUIDPartitionSchemeClass is the name of the IOGUIDPartitionScheme class.
+ */
+
+#define kIOGUIDPartitionSchemeClass "IOGUIDPartitionScheme"
+
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/* Partition map. */
+
+struct gpt_hdr
+{
+    uint8_t  hdr_sig[8];
+    uint32_t hdr_revision;
+    uint32_t hdr_size;
+    uint32_t hdr_crc_self;
+    uint32_t __reserved;
+    uint64_t hdr_lba_self;
+    uint64_t hdr_lba_alt;
+    uint64_t hdr_lba_start;
+    uint64_t hdr_lba_end;
+    uuid_t   hdr_uuid;
+    uint64_t hdr_lba_table;
+    uint32_t hdr_entries;
+    uint32_t hdr_entsz;
+    uint32_t hdr_crc_table;
+    uint32_t padding;
+};
+
+/* Partition map entry. */
+
+struct gpt_ent
+{
+    uuid_t   ent_type;
+    uuid_t   ent_uuid;
+    uint64_t ent_lba_start;
+    uint64_t ent_lba_end;
+    uint64_t ent_attr;
+    uint16_t ent_name[36];
+};
+
+/* Partition map signature (hdr_sig). */
+
+#define GPT_HDR_SIG "EFI PART"
+
+/* Partition map version (hdr_revision). */
+
+#define GPT_HDR_REVISION 0x00010000
+
+/* Partition map entry flags (ent_attr). */
+
+#define GPT_ENT_ATTR_PLATFORM 0x00000001
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* !_IOGUIDPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOMedia.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOMedia.h.svn-base
new file mode 100644
index 0000000..64052ec
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOMedia.h.svn-base
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOMedia
+ * @abstract
+ * This header contains the IOMedia class definition.
+ */
+
+#ifndef _IOMEDIA_H
+#define _IOMEDIA_H
+
+#include <IOKit/IOTypes.h>
+
+/*!
+ * @defined kIOMediaClass
+ * @abstract
+ * The name of the IOMedia class.
+ */
+
+#define kIOMediaClass "IOMedia"
+
+/*!
+ * @defined kIOMediaContentKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaContentKey property has an OSString
+ * value and contains a description of the media's
+ * contents.  The description is the same as the hint at the time of the
+ * object's creation, but it is possible that the description has been overridden
+ * by a client (which has probed the media and identified the content correctly)
+ * of the media object.  It is more accurate than the hint for this reason.  The
+ * string is formed in the likeness of Apple's "Apple_HFS" strings or in the
+ * likeness of a UUID.
+ */
+
+#define kIOMediaContentKey "Content"
+
+/*!
+ * @defined kIOMediaContentHintKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaContentHintKey property has an OSString
+ * value and contains a hint of the media's contents.
+ * The hint is set at the time of the object's creation, should the creator have
+ * a clue as to what it may contain.  The hint string does not change for the
+ * lifetime of the object and is formed in the likeness of Apple's "Apple_HFS"
+ * strings or in the likeness of a UUID.
+ */
+
+#define kIOMediaContentHintKey "Content Hint"
+
+/*!
+ * @defined kIOMediaEjectableKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaEjectableKey property has an OSBoolean
+ * value and describes whether the media is ejectable
+ * from the drive mechanism under software control.  Implies IOMediaRemovable
+ * is also true.
+ */
+
+#define kIOMediaEjectableKey "Ejectable"
+
+/*!
+ * @defined kIOMediaLeafKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaLeafKey property has an OSBoolean value and describes whether the media is a leaf, that is,
+ * it is the deepest media object in this branch of the I/O Registry.
+ */
+
+#define kIOMediaLeafKey "Leaf"
+
+/*!
+ * @defined kIOMediaOpenKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaOpenKey property has an OSBoolean value and describes whether
+ * a client presently has an open on this media.
+ */
+
+#define kIOMediaOpenKey "Open"
+
+/*!
+ * @defined kIOMediaPreferredBlockSizeKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaPreferredBlockSizeKey property has an
+ * OSNumber value and describes the media's natural
+ * block size in bytes.  This information is useful to clients that want to
+ * optimize access to the media.
+ */
+
+#define kIOMediaPreferredBlockSizeKey "Preferred Block Size"
+
+/*!
+ * @defined kIOMediaRemovableKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaRemovableKey property has an OSBoolean
+ * value and describes whether the media is removable
+ * from the drive mechanism.
+ */
+
+#define kIOMediaRemovableKey "Removable"
+
+/*!
+ * @defined kIOMediaSizeKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaSizeKey property has an OSNumber value and describes the total length of the media in
+ * bytes.
+ */
+
+#define kIOMediaSizeKey "Size"
+
+/*!
+ * @defined kIOMediaUUIDKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaUUIDKey property has an OSString value and contains a persistent
+ * Universal Unique Identifier for the media if such an identifier is available.
+ */
+
+#define kIOMediaUUIDKey "UUID"
+
+/*!
+ * @defined kIOMediaWholeKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaWholeKey property has an OSBoolean
+ * value and describes whether the media is whole, that is,
+ * it represents the whole disk (the physical disk, or a virtual replica
+ * thereof).
+ */
+
+#define kIOMediaWholeKey "Whole"
+
+/*!
+ * @defined kIOMediaWritableKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaWritableKey property has an OSBoolean
+ * value and describes whether the media is writable.
+ */
+
+#define kIOMediaWritableKey "Writable"
+
+/*!
+ * @defined kIOMediaContentMaskKey
+ * @abstract
+ * A property of IOMedia clients.
+ * @discussion
+ * The kIOMediaContentMaskKey property has an OSString
+ * value and must exist in all IOMedia clients that
+ * drive new content (that is, produce new media objects).  When the client
+ * matches against the provider media, the value of the client's
+ * kIOMediaContentMaskKey property is used to replace the provider's
+ * kIOMediaContentKey property.
+ */
+
+#define kIOMediaContentMaskKey "Content Mask"
+
+/*!
+ * @defined kIOMediaIconKey
+ * @abstract
+ * A property of any object in the media stack.
+ * @discussion
+ * kIOMediaIconKey is a property of any object in the media stack that wishes
+ * to override the default icon shown for the media objects in the stack.  It
+ * is usually defined in a provider object below the media object.  It has an
+ * OSDictionary value, with properties identical to the kIOIconKey definition,
+ * that is, kCFBundleIdentifierKey and kIOBundleResourceFileKey.
+ */
+
+#define kIOMediaIconKey "IOMediaIcon"
+
+/*!
+ * @enum IOMediaAttributeMask
+ * @discussion
+ * The IOMediaAttributeMask bit mask describes various attributes of
+ * the media object, such as its ejectability and its removability.
+ * @constant kIOMediaAttributeEjectableMask
+ * Indicates whether the media is ejectable from the drive mechanism
+ * under software control.  Implies kIOMediaAttributeRemovableMask.
+ * @constant kIOMediaAttributeRemovableMask
+ * Indicates whether the media is removable from the drive mechanism.
+ */
+
+enum
+{
+    kIOMediaAttributeEjectableMask = 0x00000001,
+    kIOMediaAttributeRemovableMask = 0x00000002,
+    kIOMediaAttributeReservedMask  = 0xFFFFFFFC
+};
+
+typedef UInt32 IOMediaAttributeMask;
+
+#endif /* !_IOMEDIA_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOMediaBSDClient.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOMediaBSDClient.h.svn-base
new file mode 100644
index 0000000..56a3117
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOMediaBSDClient.h.svn-base
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOMEDIABSDCLIENT_H
+#define _IOMEDIABSDCLIENT_H
+
+#include <sys/disk.h>
+
+#endif /* !_IOMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOPartitionScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOPartitionScheme.h.svn-base
new file mode 100644
index 0000000..7a1de37
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOPartitionScheme.h.svn-base
@@ -0,0 +1,373 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOPartitionScheme
+ * @abstract
+ * This header contains the IOPartitionScheme class definition.
+ */
+
+#ifndef _IOPARTITIONSCHEME_H
+#define _IOPARTITIONSCHEME_H
+
+/*!
+ * @defined kIOPartitionSchemeClass
+ * @abstract
+ * The name of the IOPartitionScheme class.
+ * @discussion
+ * kIOPartitionSchemeClass is the name of the IOPartitionScheme class.
+ */
+
+#define kIOPartitionSchemeClass "IOPartitionScheme"
+
+/*!
+ * @defined kIOMediaLiveKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaLiveKey property has an OSBoolean
+ * value and is placed into an IOMedia instance
+ * created via the partition scheme.  It describes whether the
+ * partition is live, that is, it is up-to-date with respect
+ * to the on-disk partition table.
+ */
+
+#define kIOMediaLiveKey "Live"
+
+/*!
+ * @defined kIOMediaPartitionIDKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaPartitionIDKey property has an OSNumber
+ * value and is placed into an IOMedia instance
+ * created via the partition scheme.  It is an ID that differentiates one 
+ * partition from the other (within a given scheme).  It is typically an index
+ * into the on-disk partition table.
+ */
+
+#define kIOMediaPartitionIDKey "Partition ID"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOMedia.h>
+#include <IOKit/storage/IOStorage.h>
+
+/*!
+ * @class IOPartitionScheme
+ * @abstract
+ * The common base class for all partition scheme
+ * objects.
+ * @discussion
+ * The IOPartitionScheme class is the common base class for all partition scheme
+ * objects.  It extends the IOStorage class by implementing the appropriate open
+ * and close semantics for partition objects (standard semantics are to act as a
+ * multiplexor for incoming opens,  producing one outgoing open with the correct
+ * access).  It also implements the default read and write semantics, which pass
+ * all reads and writes through to the provider media unprocessed.    For simple
+ * schemes, the default behavior is sufficient.   More complex partition schemes
+ * such as RAID will want to do extra processing for reads and writes.
+ */
+
+class IOPartitionScheme : public IOStorage
+{
+    OSDeclareDefaultStructors(IOPartitionScheme);
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    IOStorageAccess _openLevel;
+    OSSet *         _openReaders;
+    OSSet *         _openReaderWriters;
+
+    /*
+     * Free all of this object's outstanding resources.
+     */
+
+    virtual void free();
+
+    /*!
+     * @function handleOpen
+     * @discussion
+     * The handleOpen method grants or denies permission to access this object
+     * to an interested client.  The argument is an IOStorageAccess value that
+     * specifies the level of access desired -- reader or reader-writer.
+     *
+     * This method can be invoked to upgrade or downgrade the access level for
+     * an existing client as well.  The previous access level will prevail for
+     * upgrades that fail, of course.   A downgrade should never fail.  If the
+     * new access level should be the same as the old for a given client, this
+     * method will do nothing and return success.  In all cases, one, singular
+     * close-per-client is expected for all opens-per-client received.
+     *
+     * This implementation replaces the IOService definition of handleOpen().
+     * @param client
+     * Client requesting the open.
+     * @param options
+     * Options for the open.  Set to zero.
+     * @param access
+     * Access level for the open.  Set to kIOStorageAccessReader or
+     * kIOStorageAccessReaderWriter.
+     * @result
+     * Returns true if the open was successful, false otherwise.
+     */
+
+    virtual bool handleOpen(IOService *  client,
+                            IOOptionBits options,
+                            void *       access);
+
+    /*!
+     * @function handleIsOpen
+     * @discussion
+     * The handleIsOpen method determines whether the specified client, or any
+     * client if none is specified, presently has an open on this object.
+     *
+     * This implementation replaces the IOService definition of handleIsOpen().
+     * @param client
+     * Client to check the open state of.  Set to zero to check the open state
+     * of all clients.
+     * @result
+     * Returns true if the client was (or clients were) open, false otherwise.
+     */
+
+    virtual bool handleIsOpen(const IOService * client) const;
+
+    /*!
+     * @function handleClose
+     * @discussion
+     * The handleClose method closes the client's access to this object.
+     *
+     * This implementation replaces the IOService definition of handleClose().
+     * @param client
+     * Client requesting the close.
+     * @param options
+     * Options for the close.  Set to zero.
+     */
+
+    virtual void handleClose(IOService * client, IOOptionBits options);
+
+    /*
+     * Attach the given media object to the device tree plane.
+     */
+
+#ifdef __LP64__
+    virtual bool attachMediaObjectToDeviceTree(IOMedia * media);
+#else /* !__LP64__ */
+    virtual bool attachMediaObjectToDeviceTree(IOMedia *    media,
+                                               IOOptionBits options = 0); /* 10.5.0 */
+#endif /* !__LP64__ */
+
+    /*
+     * Detach the given media object from the device tree plane.
+     */
+
+#ifdef __LP64__
+    virtual void detachMediaObjectFromDeviceTree(IOMedia * media);
+#else /* !__LP64__ */
+    virtual void detachMediaObjectFromDeviceTree(IOMedia *    media,
+                                                 IOOptionBits options = 0); /* 10.5.0 */
+#endif /* !__LP64__ */
+
+    /*
+     * Updates a set of existing partitions, represented by partitionsOld,
+     * with possible updates from a rescan of the disk, represented by
+     * partitionsNew.  It returns a new set of partitions with the results,
+     * removing partitions from partitionsOld where applicable, adding
+     * partitions from partitionsNew where applicable, and folding in property
+     * changes to partitions from partitionsNew into partitionsOld where
+     * applicable.
+     */
+
+    virtual OSSet * juxtaposeMediaObjects(OSSet * partitionsOld,
+                                          OSSet * partitionsNew); /* 10.5.0 */
+
+public:
+
+    using IOStorage::read;
+    using IOStorage::write;
+
+    /*
+     * Initialize this object's minimal state.
+     */
+
+    virtual bool init(OSDictionary * properties = 0);
+
+    /*!
+     * @function read
+     * @discussion
+     * Read data from the storage object at the specified byte offset into the
+     * specified buffer, asynchronously.   When the read completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the read.
+     *
+     * For simple partition schemes, the default behavior is to simply pass the
+     * read through to the provider media.  More complex partition schemes such
+     * as RAID will need to do extra processing here.
+     * @param client
+     * Client requesting the read.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void read(IOService *           client,
+                      UInt64                byteStart,
+                      IOMemoryDescriptor *  buffer,
+                      IOStorageAttributes * attributes,
+                      IOStorageCompletion * completion);
+
+    /*!
+     * @function write
+     * @discussion
+     * Write data into the storage object at the specified byte offset from the
+     * specified buffer, asynchronously.   When the write completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the write.
+     *
+     * For simple partition schemes, the default behavior is to simply pass the
+     * write through to the provider media. More complex partition schemes such
+     * as RAID will need to do extra processing here.
+     * @param client
+     * Client requesting the write.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void write(IOService *           client,
+                       UInt64                byteStart,
+                       IOMemoryDescriptor *  buffer,
+                       IOStorageAttributes * attributes,
+                       IOStorageCompletion * completion);
+
+    /*!
+     * @function synchronizeCache
+     * @discussion
+     * Flush the cached data in the storage object, if any, synchronously.
+     * @param client
+     * Client requesting the cache synchronization.
+     * @result
+     * Returns the status of the cache synchronization.
+     */
+
+    virtual IOReturn synchronizeCache(IOService * client);
+
+    /*!
+     * @function discard
+     * @discussion
+     * Delete unused data from the storage object at the specified byte offset,
+     * synchronously.
+     * @param client
+     * Client requesting the operation.
+     * @param byteStart
+     * Starting byte offset for the operation.
+     * @param byteCount
+     * Size of the operation.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn discard(IOService * client,
+                             UInt64      byteStart,
+                             UInt64      byteCount);
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method
+     * to return a more specific subclass of OSObject -- an IOMedia.  This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOMedia * getProvider() const;
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  0);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  1);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  2);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  0);
+    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  1);
+    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  2);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  3);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  4);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  5);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  6);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  7);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  8);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  9);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 10);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 11);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 12);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 13);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 14);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 15);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 16);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 17);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 18);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 19);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 20);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 21);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 22);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 23);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 24);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 25);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 26);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 27);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 28);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 29);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 30);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 31);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOStorage.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOStorage.h.svn-base
new file mode 100644
index 0000000..d5725c2
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOStorage.h.svn-base
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOStorage
+ * @abstract
+ * This header contains the IOStorage class definition.
+ */
+
+#ifndef _IOSTORAGE_H
+#define _IOSTORAGE_H
+
+#include <IOKit/IOTypes.h>
+
+/*!
+ * @defined kIOStorageClass
+ * @abstract
+ * The name of the IOStorage class.
+ */
+
+#define kIOStorageClass "IOStorage"
+
+/*!
+ * @defined kIOStorageCategory
+ * @abstract
+ * kIOStorageCategory is a value for IOService's kIOMatchCategoryKey property.
+ * @discussion
+ * The kIOStorageCategory value is the standard value for the IOService property
+ * kIOMatchCategoryKey ("IOMatchCategory") for all storage drivers.  All storage
+ * objects that expect to drive new content (that is, produce new media objects)
+ * are expected to compete within the kIOStorageCategory namespace.
+ *
+ * See the IOService documentation for more information on match categories.
+ */
+
+#define kIOStorageCategory "IOStorage"                /* (as IOMatchCategory) */
+
+/*!
+ * @defined kIOStorageFeaturesKey
+ * @abstract
+ * A property of any object in the storage stack.
+ * @discussion
+ * kIOStorageFeaturesKey is a property of any object in the storage stack that
+ * wishes to express support of additional features, such as Force Unit Access.
+ * It is typically defined in the device object below the block storage driver
+ * object.  It has an OSDictionary value, where each entry describes one given
+ * feature.
+ */
+
+#define kIOStorageFeaturesKey "IOStorageFeatures"
+
+/*!
+ * @defined kIOStorageFeatureDiscard
+ * @abstract
+ * Describes the presence of the Discard feature.
+ * @discussion
+ * This property describes the ability of the storage stack to delete unused
+ * data from the media.  It is one of the feature entries listed under the top-
+ * level kIOStorageFeaturesKey property table.  It has an OSBoolean value.
+ */
+
+#define kIOStorageFeatureDiscard "Discard"
+
+/*!
+ * @defined kIOStorageFeatureForceUnitAccess
+ * @abstract
+ * Describes the presence of the Force Unit Access feature.
+ * @discussion
+ * This property describes the ability of the storage stack to force a request
+ * to access the media.  It is one of the feature entries listed under the top-
+ * level kIOStorageFeaturesKey property table.  It has an OSBoolean value.
+ */
+
+#define kIOStorageFeatureForceUnitAccess "Force Unit Access"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/assert.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOService.h>
+
+/*!
+ * @enum IOStorageAccess
+ * @discussion
+ * The IOStorageAccess enumeration describes the possible access levels for open
+ * requests.
+ * @constant kIOStorageAccessNone
+ * No access is requested; should not be passed to open().
+ * @constant kIOStorageAccessReader
+ * Read-only access is requested.
+ * @constant kIOStorageAccessReaderWriter
+ * Read and write access is requested.
+ * @constant kIOStorageAccessSharedLock
+ * Shared access is requested.
+ * @constant kIOStorageAccessExclusiveLock
+ * Exclusive access is requested.
+ */
+
+enum
+{
+    kIOStorageAccessNone          = 0x00,
+    kIOStorageAccessReader        = 0x01,
+    kIOStorageAccessReaderWriter  = 0x03,
+    kIOStorageAccessSharedLock    = 0x04,
+    kIOStorageAccessExclusiveLock = 0x08
+};
+
+typedef UInt32 IOStorageAccess;
+
+/*!
+ * @enum IOStorageOptions
+ * @discussion
+ * Options for read and write storage requests.
+ * @constant kIOStorageOptionForceUnitAccess
+ * Force the request to access the media.
+ */
+
+enum
+{
+    kIOStorageOptionNone            = 0x00000000,
+    kIOStorageOptionForceUnitAccess = 0x00000001,
+    kIOStorageOptionReserved        = 0xFFFFFFFE
+};
+
+typedef UInt32 IOStorageOptions;
+
+/*!
+ * @struct IOStorageAttributes
+ * @discussion
+ * Attributes of read and write storage requests.
+ * @field options
+ * Options for the request.  See IOStorageOptions.
+ * @field reserved
+ * Reserved for future use.  Set to zero.
+ */
+
+struct IOStorageAttributes
+{
+    IOStorageOptions options;
+    UInt32           reserved0032;
+    UInt64           reserved0064;
+#ifdef __LP64__
+    UInt64           reserved0128;
+    UInt64           reserved0192;
+#endif /* __LP64__ */
+};
+
+/*!
+ * @typedef IOStorageCompletionAction
+ * @discussion
+ * The IOStorageCompletionAction declaration describes the C (or C++) completion
+ * routine that is called once an asynchronous storage operation completes.
+ * @param target
+ * Opaque client-supplied pointer (or an instance pointer for a C++ callback).
+ * @param parameter
+ * Opaque client-supplied pointer.
+ * @param status
+ * Status of the data transfer.
+ * @param actualByteCount
+ * Actual number of bytes transferred in the data transfer.
+ */
+
+typedef void (*IOStorageCompletionAction)(void *   target,
+                                          void *   parameter,
+                                          IOReturn status,
+                                          UInt64   actualByteCount);
+
+/*!
+ * @struct IOStorageCompletion
+ * @discussion
+ * The IOStorageCompletion structure describes the C (or C++) completion routine
+ * that is called once an asynchronous storage operation completes.   The values
+ * passed for the target and parameter fields will be passed to the routine when
+ * it is called.
+ * @field target
+ * Opaque client-supplied pointer (or an instance pointer for a C++ callback).
+ * @field action
+ * Completion routine to call on completion of the data transfer.
+ * @field parameter
+ * Opaque client-supplied pointer.
+ */
+
+struct IOStorageCompletion
+{
+    void *                    target;
+    IOStorageCompletionAction action;
+    void *                    parameter;
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOSTORAGE_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOStorageDeviceCharacteristics.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOStorageDeviceCharacteristics.h.svn-base
new file mode 100644
index 0000000..19a73a2
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOStorageDeviceCharacteristics.h.svn-base
@@ -0,0 +1,659 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_
+#define _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_
+
+#include <IOKit/storage/IOStorageProtocolCharacteristics.h>
+
+/*
+ *	Device Characteristics - Characteristics defined for devices.
+ */
+
+/*!
+@defined kIOPropertyDeviceCharacteristicsKey
+@discussion This key is used to define Device Characteristics for a particular
+device and it has an associated dictionary which lists the
+device characteristics. The device characteristics are Command Set specific
+and are listed in the header files for each command set.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyDeviceCharacteristicsKey		"Device Characteristics"
+
+
+/*!
+@defined kIOPropertyVendorNameKey
+@discussion This key is used to define the Vendor Name for a particular device
+and it has an associated string.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyVendorNameKey				"Vendor Name"
+
+
+/*!
+@defined kIOPropertyProductNameKey
+@discussion This key is used to define the Product Name for a particular device
+and it has an associated string.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyProductNameKey				"Product Name"
+
+
+/*!
+@defined kIOPropertyProductRevisionLevelKey
+@discussion This key is used to define the Product Revision Level for a
+particular device and it has an associated string.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyProductRevisionLevelKey		"Product Revision Level"
+
+
+/*!
+@defined kIOPropertyProductSerialNumberKey
+@discussion This key is used to define the Product Serial Number for a
+particular device and it has an associated data.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Serial Number</key>
+		<string>123456789</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyProductSerialNumberKey		"Serial Number"
+
+
+/*!
+@defined kIOPropertySupportedCDFeaturesKey
+@discussion This key is used to define the supported CD Features for a
+particular optical device and it has an associated bitfield. See
+<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
+bits and associated bitmasks.
+
+Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>SuperDrive</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>CD Features</key>
+		<integer>1663</integer>
+		<key>DVD Features</key>
+		<integer>103</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySupportedCDFeaturesKey		"CD Features"
+
+
+/*!
+@defined kIOPropertySupportedDVDFeaturesKey
+@discussion This key is used to define the supported DVD Features for a
+particular optical device and it has an associated bitfield. See
+<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
+bits and associated bitmasks.
+
+Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>SuperDrive</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>CD Features</key>
+		<integer>1663</integer>
+		<key>DVD Features</key>
+		<integer>103</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySupportedDVDFeaturesKey		"DVD Features"
+
+
+/*!
+@defined kIOPropertySupportedBDFeaturesKey
+@discussion This key is used to define the supported BD Features for a
+particular optical device and it has an associated bitfield. See
+<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
+bits and associated bitmasks.
+
+Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>SuperDrive</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>CD Features</key>
+		<integer>1663</integer>
+		<key>DVD Features</key>
+		<integer>103</integer>
+		<key>BD Features</key>
+		<integer>21</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySupportedBDFeaturesKey		"BD Features"
+
+
+/*!
+@defined kIOPropertyRigidDiskGeometryKey
+@discussion This key is used to define a dictionary containing
+rigid disk geometry information.
+
+Requirement: Optional. If a device publishes this dictionary, it
+must publish all key/value pairs which are deemed Mandatory.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Rigid Disk Geometry</key>
+		<dict>
+			<key>Sector Count per Track</key>
+			<integer>12345</integer>
+			<key>Head Count</key>
+			<integer>12</integer>
+			<key>Cylinder Count</key>
+			<integer>12345</integer>
+			<key>Bytes per Physical Sector</key>
+			<integer>512</integer>
+		</dict>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyRigidDiskGeometryKey			"Rigid Disk Geometry"
+
+
+/*!
+@defined kIOPropertySectorCountPerTrackKey
+@discussion This key is used to define the number of sectors per
+each track for a particular medium.
+
+Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Rigid Disk Geometry</key>
+		<dict>
+			<key>Sector Count per Track</key>
+			<integer>12345</integer>
+		</dict>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySectorCountPerTrackKey		"Sector Count per Track"
+
+
+/*!
+@defined kIOPropertyHeadCountKey
+@discussion This key is used to define the number of heads for
+a particular medium.
+
+Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Rigid Disk Geometry</key>
+		<dict>
+			<key>Sector Count per Track</key>
+			<integer>12345</integer>
+			<key>Head Count</key>
+			<integer>12</integer>
+			<key>Cylinder Count</key>
+			<integer>12345</integer>
+			<key>Bytes per Physical Sector</key>
+			<integer>512</integer>
+		</dict>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyHeadCountKey					"Head Count"
+
+
+/*!
+@defined kIOPropertyCylinderCountKey
+@discussion This key is used to define the number of heads for
+a particular medium.
+
+Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Rigid Disk Geometry</key>
+		<dict>
+			<key>Sector Count per Track</key>
+			<integer>12345</integer>
+			<key>Head Count</key>
+			<integer>12</integer>
+			<key>Cylinder Count</key>
+			<integer>12345</integer>
+			<key>Bytes per Physical Sector</key>
+			<integer>512</integer>
+		</dict>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyCylinderCountKey				"Cylinder Count"
+
+
+/*!
+@defined kIOPropertyBytesPerPhysicalSectorKey
+@discussion This key is used to define the number of heads for
+a particular medium.
+
+Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Rigid Disk Geometry</key>
+		<dict>
+			<key>Sector Count per Track</key>
+			<integer>12345</integer>
+			<key>Head Count</key>
+			<integer>12</integer>
+			<key>Cylinder Count</key>
+			<integer>12345</integer>
+			<key>Bytes per Physical Sector</key>
+			<integer>512</integer>
+		</dict>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyBytesPerPhysicalSectorKey	"Bytes per Physical Sector"
+
+
+/*!
+@defined kIOPropertyPhysicalBlockSizeKey
+@discussion This key is used to define the physical block size of a hard disk drive.
+
+Requirement: Mandatory for hard disk drives with physical block size other than 512 bytes.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Physical Block Size</key>
+		<integer>4096</integer>
+		<key>Logical Block Size</key>
+		<integer>512</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalBlockSizeKey		"Physical Block Size"
+
+
+/*!
+@defined kIOPropertyLogicalBlockSizeKey
+@discussion This key is used to define the logical block size of a hard disk drive.
+
+Requirement: Mandatory for hard disk drives with logical block size other than 512 bytes
+or that does not match its physical block size.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Physical Block Size</key>
+		<integer>4096</integer>
+		<key>Logical Block Size</key>
+		<integer>512</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyLogicalBlockSizeKey		"Logical Block Size"
+
+
+/*!
+@defined kIOPropertyTargetDiskModeKey
+@discussion This key is used to indicate the device is another computer in Target Disk Mode.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>AAPL</string>
+		<key>Product Name</key>
+		<string>FireWire Target</string>
+		<key>Product Revision Level</key>
+		<string>0000</string>
+		<key>Target Disk Mode</key>
+		<true/>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyTargetDiskModeKey		"Target Disk Mode"
+
+
+/*!
+@defined kIOPropertyMediumTypeKey
+@discussion This key is used to indicate the medium type of the device.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>AAPL</string>
+		<key>Product Name</key>
+		<string>FireWire Target</string>
+		<key>Product Revision Level</key>
+		<string>0000</string>
+		<key>Medium Type</key>
+		<string>Rotational</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyMediumTypeKey		"Medium Type"
+
+
+/*!
+@defined kIOPropertyMediumTypeRotationalKey
+@discussion This key is used to indicate the medium type of the device is rotational.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>AAPL</string>
+		<key>Product Name</key>
+		<string>FireWire Target</string>
+		<key>Product Revision Level</key>
+		<string>0000</string>
+		<key>Medium Type</key>
+		<string>Rotational</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyMediumTypeRotationalKey		"Rotational"
+
+
+/*!
+@defined kIOPropertyMediumTypeSolidStateKey
+@discussion This key is used to indicate the medium type of the device is solid state.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>AAPL</string>
+		<key>Product Name</key>
+		<string>FireWire Target</string>
+		<key>Product Revision Level</key>
+		<string>0000</string>
+		<key>Medium Type</key>
+		<string>Solid State</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyMediumTypeSolidStateKey		"Solid State"
+
+
+/*!
+@defined kIOPropertyMediumRotationRateKey
+@discussion This key is used to indicate the medium rotation rate in RPM of the device.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>AAPL</string>
+		<key>Product Name</key>
+		<string>FireWire Target</string>
+		<key>Product Revision Level</key>
+		<string>0000</string>
+		<key>Rotation Rate</key>
+		<integer>7200</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyMediumRotationRateKey		"Rotation Rate"
+
+
+#endif	/* _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_ */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOStorageProtocolCharacteristics.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOStorageProtocolCharacteristics.h.svn-base
new file mode 100644
index 0000000..18a726f
--- /dev/null
+++ b/i386/include/IOKit/storage/.svn/text-base/IOStorageProtocolCharacteristics.h.svn-base
@@ -0,0 +1,1758 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_
+#define _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_
+
+
+/*
+ *	Protocol Characteristics - Characteristics defined for protocols.
+ */
+
+
+/*!
+@defined kIOPropertyProtocolCharacteristicsKey
+@discussion This key is used to define Protocol Characteristics for a particular
+protocol and it has an associated dictionary which lists the
+protocol characteristics.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>ATAPI</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define	kIOPropertyProtocolCharacteristicsKey		"Protocol Characteristics"
+
+
+/*!
+@defined kIOPropertySCSIInitiatorIdentifierKey
+@discussion An identifier that will uniquely identify this SCSI Initiator for the
+SCSI Domain.
+
+Requirement: Mandatory for SCSI Parallel Interface, SAS,
+and Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+		<key>SCSI Initiator Identifier</key>
+		<integer>7</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIInitiatorIdentifierKey		"SCSI Initiator Identifier"
+
+
+/*!
+@defined kIOPropertySCSIDomainIdentifierKey
+@discussion An identifier that will uniquely identify this SCSI Domain for the
+Physical Interconnect type. This identifier is only guaranteed to be unique for
+any given Physical Interconnect and is not guaranteed to be the same across
+restarts or shutdowns.
+
+Requirement: Mandatory for SCSI Parallel Interface and Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+		<key>SCSI Domain Identifier</key>
+		<integer>0</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIDomainIdentifierKey			"SCSI Domain Identifier"
+
+
+/*!
+@defined kIOPropertySCSITargetIdentifierKey
+@discussion This is the SCSI Target Identifier for a given SCSI Target Device.
+
+Requirement: Mandatory for SCSI Parallel Interface and Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+		<key>SCSI Target Identifier</key>
+		<integer>3</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSITargetIdentifierKey			"SCSI Target Identifier"
+
+
+/*!
+@defined kIOPropertySCSILogicalUnitNumberKey
+@discussion This key is the SCSI Logical Unit Number for the device server
+controlled by the driver.
+
+Requirement: Mandatory for SCSI Parallel Interface, SAS, and Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+		<key>SCSI Logical Unit Number</key>
+		<integer>2</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSILogicalUnitNumberKey			"SCSI Logical Unit Number"
+
+
+/*!
+@defined kIOPropertySASAddressKey
+@discussion This key is the unique 64-bit SAS Address for the device server
+node located at this port, or for the initiating host port.
+
+Requirement: Mandatory for SAS.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SAS</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>SAS Address</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+
+Example2:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>SAS Address</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySASAddressKey					"SAS Address"
+
+
+/*!
+@defined kIOPropertyFibreChannelNodeWorldWideNameKey
+@discussion This key is the unique 64-bit World Wide Name for the device server
+node located at this port, or for the initiating host port.
+
+Requirement: Mandatory for Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>Node World Wide Name</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+
+Example2:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Node World Wide Name</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelNodeWorldWideNameKey		"Node World Wide Name"
+
+
+/*!
+@defined kIOPropertyFibreChannelPortWorldWideNameKey
+@discussion This key is the unique 64-bit World Wide Name for the port.
+
+Requirement: Mandatory for Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>Port World Wide Name</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+
+Example2:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port World Wide Name</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelPortWorldWideNameKey		"Port World Wide Name"
+
+
+/*!
+@defined kIOPropertyFibreChannelAddressIdentifierKey
+@discussion This key is the 24-bit Address Identifier (S_ID or D_ID) as
+defined in the FC-FS specification. It contains the address identifier
+of the source or destination Nx_Port.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional (only necessary for Fibre Channel Interface).
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>Address Identifier</key>
+		<data>001122</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+
+Example2:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Address Identifier</key>
+		<data>001122</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelAddressIdentifierKey		"Address Identifier"
+
+
+/*!
+@defined kIOPropertyFibreChannelALPAKey
+@discussion This key is the 8-bit Arbitrated Loop Physical Address
+(AL_PA) value as defined in the FC-AL-2 specification.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional (only necessary for Fibre Channel Interface).
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>AL_PA</key>
+		<data>04</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+
+Example2:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>AL_PA</key>
+		<data>04</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelALPAKey					"AL_PA"
+
+
+/*!
+@defined kIOPropertyPortStatusKey
+@discussion This key is associated with the current port
+status of the physical link. The port status is either
+"Link Established", "No Link Established", or "Link Failed".
+
+Note: This value can change when the port status changes. It
+is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Status</key>
+		<string>Link Established</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortStatusKey						"Port Status"
+
+
+/*!
+@defined kIOPropertyPortSpeedKey
+@discussion This key is associated with the current port
+speed. The port speed can be any valid speed for the interconnect.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (1 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedKey							"Port Speed"
+
+
+/*!
+@defined kIOPropertyPortTopologyKey
+@discussion This key is associated with the current port
+topology. The port topology can be any valid topology for the interconnect.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>Automatic (N_Port)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyKey						"Port Topology"
+
+
+/*!
+@defined kIOPropertyPortDescriptionKey
+@discussion This key is associated with an human
+readable port description. Examples include
+"Channel A", "Port 1", etc.
+
+Requirement: Optional for all interconnects.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Description</key>
+		<string>Channel A</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortDescriptionKey					"Port Description"
+
+
+/*!
+@defined kIOPropertySCSIParallelSignalingTypeKey
+@discussion This key is associated with the signaling type
+used for this SCSI Parallel bus. Valid values include
+"High Voltage Differential", "Low Voltage Differential",
+and "Single Ended".
+
+Requirement: Optional for SCSI Parallel Interface. Not
+defined for any other physical interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>SCSI Parallel Signaling Type</key>
+		<string>High Voltage Differential</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIParallelSignalingTypeKey			"SCSI Parallel Signaling Type"
+
+
+/*!
+@defined kIOPropertyFibreChannelCableDescriptionKey
+@discussion This key is associated with the cabling type
+used for this Fibre Channel port. Valid values include
+"Copper" and "Fiber Optic".
+
+Requirement: Optional for Fibre Channel Interface. Not
+defined for any other physical interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Fibre Channel Cabling Type</key>
+		<string>Copper</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelCableDescriptionKey		"Fibre Channel Cabling Type"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeKey
+@discussion This key is used to define the Physical Interconnect to which
+a device is attached.
+
+Requirement: Mandatory.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeKey		"Physical Interconnect"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectLocationKey
+@discussion This key is used to define the Physical Interconnect
+Location.
+
+Requirement: Mandatory.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectLocationKey	"Physical Interconnect Location"
+
+
+/*!
+@defined kIOPropertySCSIProtocolMultiInitKey
+@discussion This protocol characteristics key is used to inform the system
+that the protocol supports having multiple devices that act as initiators.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>Multiple Initiators</key>
+		<string>True</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIProtocolMultiInitKey			"Multiple Initiators"
+
+
+/*
+ *	Values - Values for the characteristics defined above.
+ */
+
+
+/*!
+@defined kIOPropertyInternalKey
+@discussion This key defines the value of Internal for the key
+kIOPropertyPhysicalInterconnectLocationKey. If the device is
+connected to an internal bus, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>ATA</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyInternalKey						"Internal"
+
+
+/*!
+@defined kIOPropertyExternalKey
+@discussion This key defines the value of External for the key
+kIOPropertyPhysicalInterconnectLocationKey. If the device is
+connected to an external bus, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyExternalKey						"External"
+
+
+/*!
+@defined kIOPropertyInternalExternalKey
+@discussion This key defines the value of Internal/External for the key
+kIOPropertyPhysicalInterconnectLocationKey. If the device is connected
+to a bus and it is indeterminate whether it is internal or external,
+this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal/External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyInternalExternalKey				"Internal/External"
+
+
+/*!
+@defined kIOPropertyInterconnectFileKey
+@discussion This key defines the value of File for the key
+kIOPropertyPhysicalInterconnectLocationKey. If the device is a file
+that is being represented as a storage device, this key should be set.
+
+NOTE: This key should only be used when the Physical Interconnect is set to
+Virtual Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Virtual Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>File</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyInterconnectFileKey						"File"
+
+
+/*!
+@defined kIOPropertyInterconnectRAMKey
+@discussion This key defines the value of RAM for the key
+kIOPropertyPhysicalInterconnectLocationKey. If the device is system memory
+that is being represented as a storage device, this key should be set.
+
+NOTE: This key should only be used when the Physical Interconnect is set to
+Virtual Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Virtual Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>RAM</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyInterconnectRAMKey						"RAM"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeATA
+@discussion This key defines the value of ATA for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to an ATA bus, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>ATA</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeATA				"ATA"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeSerialATA
+@discussion This key defines the value of SATA for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a SATA bus, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SATA</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeSerialATA		"SATA"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeSerialAttachedSCSI
+@discussion This key defines the value of SAS for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a SAS bus, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SAS</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeSerialAttachedSCSI	"SAS"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeATAPI
+@discussion This key defines the value of ATAPI for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to an ATA bus and follows the ATAPI command specification, this key
+should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>ATAPI</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeATAPI			"ATAPI"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeUSB
+@discussion This key defines the value of USB for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a USB port, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>USB</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeUSB				"USB"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeFireWire
+@discussion This key defines the value of USB for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a FireWire port, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>FireWire</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeFireWire			"FireWire"
+
+
+/*!
+ @defined kIOPropertyPhysicalInterconnectTypeSecureDigital
+ @discussion This key defines the value of Secure Digital for the key
+ kIOPropertyPhysicalInterconnectTypeSecureDigital. If the device is a
+ connected to a Secure Digital port and follows the Secure Digital 
+ specification, this key should be set. 
+ 
+ Example:
+ <pre>
+ @textblock
+ <dict>
+    <key>Protocol Characteristics</key>
+    <dict>
+        <key>Physical Interconnect</key>
+        <string>Secure Digital</string>
+        <key>Physical Interconnect Location</key>
+        <string>Internal</string>
+    </dict>
+ </dict>
+ @/textblock
+ </pre>
+ */
+#define kIOPropertyPhysicalInterconnectTypeSecureDigital	"Secure Digital"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeSCSIParallel
+@discussion This key defines the value of SCSI Parallel Interface for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a SCSI Parallel port, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeSCSIParallel		"SCSI Parallel Interface"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeFibreChannel
+@discussion This key defines the value of Fibre Channel Interface for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a Fibre Channel port, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeFibreChannel		"Fibre Channel Interface"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeVirtual
+@discussion This key defines the value of Virtual Interface for the key
+kIOPropertyPhysicalInterconnectTypeVirtual. If the device is being made to look
+like a storage device, but is not such in actuality, such as a File or RAM, this
+key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Virtual Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>File</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeVirtual		"Virtual Interface"
+
+
+/*!
+@defined kIOPropertyPortStatusLinkEstablishedKey
+@discussion This key defines the value of Link Established for the key
+kIOPropertyPortStatusKey.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Status</key>
+		<string>Link Established</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortStatusLinkEstablishedKey			"Link Established"
+
+
+/*!
+@defined kIOPropertyPortStatusNoLinkEstablishedKey
+@discussion This key defines the value of No Link Established for the key
+kIOPropertyPortStatusKey.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Status</key>
+		<string>No Link Established</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortStatusNoLinkEstablishedKey		"No Link Established"
+
+
+/*!
+@defined kIOPropertyPortStatusLinkFailedKey
+@discussion This key defines the value of Link Failed for the key
+kIOPropertyPortStatusKey.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Status</key>
+		<string>Link Failed</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortStatusLinkFailedKey				"Link Failed"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomaticKey
+@discussion This key defines the value of Automatic for the key
+kIOPropertyPortSpeedKey. If the speed of the port is automatically
+adjusted by the host/device and a definitive speed is not known,
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomaticKey				"Automatic"
+
+
+/*!
+@defined kIOPropertyPortSpeed1GigabitKey
+@discussion This key defines the value of 1 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 1 Gigabit
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>1 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed1GigabitKey					"1 Gigabit"
+
+/*!
+@defined kIOPropertyPortSpeed1_5GigabitKey
+@discussion This key defines the value of 1.5 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 1.5 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>1.5 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed1_5GigabitKey				"1.5 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeed2GigabitKey
+@discussion This key defines the value of 2 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 2 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>2 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed2GigabitKey					"2 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeed3GigabitKey
+@discussion This key defines the value of 3 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 3 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>3 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed3GigabitKey					"3 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeed4GigabitKey
+@discussion This key defines the value of 4 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 4 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>4 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed4GigabitKey					"4 Gigabit"
+
+/*!
+@defined kIOPropertyPortSpeed6GigabitKey
+@discussion This key defines the value of 6 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 6 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>6 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed6GigabitKey					"6 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeed8GigabitKey
+@discussion This key defines the value of 8 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 8 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>8 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed8GigabitKey					"8 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeed10GigabitKey
+@discussion This key defines the value of 10 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 10 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>10 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed10GigabitKey				"10 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic1GigabitKey
+@discussion This key defines the value of Automatic (1 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+1 Gigabit per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (1 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic1GigabitKey		"Automatic (1 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic1_5GigabitKey
+@discussion This key defines the value of Automatic (1.5 Gigabit) for the key
+kIOPropertyPortSpeedKey. If the speed of the port is
+1.5 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (1.5 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic1_5GigabitKey		"Automatic (1.5 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic2GigabitKey
+@discussion This key defines the value of Automatic (2 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+2 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (2 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic2GigabitKey		"Automatic (2 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic3GigabitKey
+@discussion This key defines the value of Automatic (3 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+3 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (3 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic3GigabitKey		"Automatic (3 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic4GigabitKey
+@discussion This key defines the value of Automatic (4 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+4 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (4 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic4GigabitKey		"Automatic (4 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic6GigabitKey
+@discussion This key defines the value of Automatic (6 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+6 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (6 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic6GigabitKey		"Automatic (6 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic8GigabitKey
+@discussion This key defines the value of Automatic (8 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+8 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (8 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic8GigabitKey		"Automatic (8 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic10GigabitKey
+@discussion This key defines the value of Automatic (10 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+10 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (10 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic10GigabitKey		"Automatic (10 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortTopologyAutomaticKey
+@discussion This key defines the value of Automatic for the key
+kIOPropertyPortTopologyKey. If the topology of the port is automatically
+adjusted by the host/device and a definitive topology is not known,
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>Automatic</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyAutomaticKey				"Automatic"
+
+
+/*!
+@defined kIOPropertyPortTopologyNPortKey
+@discussion This key defines the value of N_Port for the key
+kIOPropertyPortTopologyKey. If the topology of the port is an N_Port,
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>N_Port</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyNPortKey					"N_Port"
+
+
+/*!
+@defined kIOPropertyPortTopologyNLPortKey
+@discussion This key defines the value of NL_Port for the key
+kIOPropertyPortTopologyKey. If the topology of the port is an NL_Port,
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>NL_Port</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyNLPortKey				"NL_Port"
+
+
+/*!
+@defined kIOPropertyPortTopologyAutomaticNPortKey
+@discussion This key defines the value of Automatic (N_Port) for the key
+kIOPropertyPortTopologyKey. If the topology of the port is
+N_Port and is automatically determined by host software, this
+key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>Automatic (N_Port)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyAutomaticNPortKey		"Automatic (N_Port)"
+
+
+/*!
+@defined kIOPropertyPortTopologyAutomaticNLPortKey
+@discussion This key defines the value of Automatic (NL_Port) for the key
+kIOPropertyPortTopologyKey. If the topology of the port is
+NL_Port and is automatically determined by host software, this
+key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>Automatic (NL_Port)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyAutomaticNLPortKey		"Automatic (NL_Port)"
+
+
+/*!
+@defined kIOPropertySCSIParallelSignalingTypeHVDKey
+@discussion This key defines the value of High Voltage Differential for the key
+kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
+High Voltage Differential, this key should be used.
+
+Requirement: Optional for SCSI Parallel Interface interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>SCSI Parallel Signaling Type</key>
+		<string>High Voltage Differential</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIParallelSignalingTypeHVDKey		"High Voltage Differential"
+
+
+/*!
+@defined kIOPropertySCSIParallelSignalingTypeLVDKey
+@discussion This key defines the value of Low Voltage Differential for the key
+kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
+Low Voltage Differential, this key should be used.
+
+Requirement: Optional for SCSI Parallel Interface interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>SCSI Parallel Signaling Type</key>
+		<string>Low Voltage Differential</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIParallelSignalingTypeLVDKey		"Low Voltage Differential"
+
+
+/*!
+@defined kIOPropertySCSIParallelSignalingTypeSEKey
+@discussion This key defines the value of Single Ended for the key
+kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
+Single Ended, this key should be used.
+
+Requirement: Optional for SCSI Parallel Interface interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>SCSI Parallel Signaling Type</key>
+		<string>Single Ended</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIParallelSignalingTypeSEKey		"Single Ended"
+
+
+/*!
+@defined kIOPropertyFibreChannelCableDescriptionCopperKey
+@discussion This key defines the value of Copper for the key
+kIOPropertyFibreChannelCableDescriptionKey. If the cabling is
+Copper, this key should be used.
+
+Requirement: Optional for Fibre Channel Interface interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Fibre Channel Cabling Type</key>
+		<string>Copper</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelCableDescriptionCopperKey		"Copper"
+
+
+/*!
+@defined kIOPropertyFibreChannelCableDescriptionFiberOpticKey
+@discussion This key defines the value of Fiber Optic for the key
+kIOPropertyFibreChannelCableDescriptionKey. If the cabling is
+Fiber Optic, this key should be used.
+
+Requirement: Optional for Fibre Channel Interface interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Fibre Channel Cabling Type</key>
+		<string>Fiber Optic</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelCableDescriptionFiberOpticKey	"Fiber Optic"
+
+
+#endif	/* _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_ */
diff --git a/i386/include/IOKit/storage/IOAppleLabelScheme.h b/i386/include/IOKit/storage/IOAppleLabelScheme.h
new file mode 100644
index 0000000..6e290a4
--- /dev/null
+++ b/i386/include/IOKit/storage/IOAppleLabelScheme.h
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * This header contains the IOAppleLabelScheme class definition.
+ */
+
+#ifndef _IOAPPLELABELSCHEME_H
+#define _IOAPPLELABELSCHEME_H
+
+#include <IOKit/IOTypes.h>
+
+/*
+ * kIOAppleLabelSchemeClass is the name of the IOAppleLabelScheme class.
+ */
+
+#define kIOAppleLabelSchemeClass "IOAppleLabelScheme"
+
+/*
+ * Apple Label Scheme Definitions
+ */
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/* Label scheme. */
+
+struct applelabel
+{
+    uint8_t  al_boot0[416];               /* (reserved for boot area)         */
+    uint16_t al_magic;                    /* (the magic number)               */
+    uint16_t al_type;                     /* (label type)                     */
+    uint32_t al_flags;                    /* (generic flags)                  */
+    uint64_t al_offset;                   /* (offset of property area, bytes) */
+    uint32_t al_size;                     /* (size of property area, bytes)   */
+    uint32_t al_checksum;                 /* (checksum of property area)      */
+    uint8_t  al_boot1[72];                /* (reserved for boot area)         */
+};
+
+/* Label scheme signature (al_magic). */
+
+#define AL_MAGIC 0x414C
+
+/* Label scheme version (al_type). */
+
+#define AL_TYPE_DEFAULT 0x0000
+
+/* Label scheme flags (al_flags). */
+
+#define AL_FLAG_DEFAULT 0x00000000
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOFilterScheme.h>
+
+/*
+ * Class
+ */
+
+class IOAppleLabelScheme : public IOFilterScheme
+{
+    OSDeclareDefaultStructors(IOAppleLabelScheme);
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    IOMedia * _content;
+
+    /*
+     * Free all of this object's outstanding resources.
+     */
+
+    virtual void free(void);
+
+    /*
+     * Scan the provider media for an Apple label scheme.
+     */
+
+    virtual IOMedia * scan(SInt32 * score);
+
+    /*
+     * Ask whether the given content appears to be corrupt.
+     */
+
+    virtual bool isContentCorrupt(OSDictionary * properties);
+
+    /*
+     * Ask whether the given content appears to be invalid.
+     */
+
+    virtual bool isContentInvalid(OSDictionary * properties);
+
+    /*
+     * Instantiate a new media object to represent the given content.
+     */
+
+    virtual IOMedia * instantiateMediaObject(OSDictionary * properties);
+
+    /*
+     * Allocate a new media object (called from instantiateMediaObject).
+     */
+
+    virtual IOMedia * instantiateDesiredMediaObject(OSDictionary * properties);
+
+    /*
+     * Attach the given media object to the device tree plane.
+     */
+
+    virtual bool attachMediaObjectToDeviceTree(IOMedia * media);
+
+    /*
+     * Detach the given media object from the device tree plane.
+     */
+
+    virtual void detachMediaObjectFromDeviceTree(IOMedia * media);
+
+public:
+
+    /*
+     * Initialize this object's minimal state.
+     */
+
+    virtual bool init(OSDictionary * properties = 0);
+
+    /*
+     * Determine whether the provider media contains an Apple label scheme.
+     */
+
+    virtual IOService * probe(IOService * provider, SInt32 * score);
+
+    /*
+     * Publish the new media object which represents our content.
+     */
+
+    virtual bool start(IOService * provider);
+
+    /*
+     * Clean up after the media object we published before terminating.
+     */
+
+    virtual void stop(IOService * provider);
+
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  0);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  1);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  2);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  3);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  4);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  5);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  6);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  7);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  8);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  9);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 10);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 11);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 12);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 13);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 14);
+    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 15);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOAPPLELABELSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOApplePartitionScheme.h b/i386/include/IOKit/storage/IOApplePartitionScheme.h
new file mode 100644
index 0000000..ace1f3b
--- /dev/null
+++ b/i386/include/IOKit/storage/IOApplePartitionScheme.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * This header contains the IOApplePartitionScheme class definition.
+ */
+
+#ifndef _IOAPPLEPARTITIONSCHEME_H
+#define _IOAPPLEPARTITIONSCHEME_H
+
+#include <IOKit/IOTypes.h>
+
+/*
+ * kIOApplePartitionSchemeClass is the name of the IOApplePartitionScheme class.
+ */
+
+#define kIOApplePartitionSchemeClass "IOApplePartitionScheme"
+
+/*
+ * Apple Partition Map Definitions
+ */
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/* Structure constants. */
+
+#define DPISTRLEN 32
+
+/* Partition map entry, as found in blocks 1 to dpme_map_entries of the disk. */
+
+typedef struct dpme
+{
+    UInt16  dpme_signature;       /* (unique value for partition entry, 'PM') */
+    UInt16  dpme_reserved_1;      /* (reserved for future use)                */
+    UInt32  dpme_map_entries;     /* (number of partition entries)            */
+    UInt32  dpme_pblock_start;    /* (physical block start of partition)      */
+    UInt32  dpme_pblocks;         /* (physical block count of partition)      */
+    char    dpme_name[DPISTRLEN]; /* (name of partition)                      */
+    char    dpme_type[DPISTRLEN]; /* (type of partition, eg. Apple_HFS)       */
+    UInt32  dpme_lblock_start;    /* (logical block start of partition)       */
+    UInt32  dpme_lblocks;         /* (logical block count of partition)       */
+    UInt32  dpme_flags;           /* (partition flags, see defines below)     */
+    UInt32  dpme_boot_block;      /* (logical block start of boot code)       */
+    UInt32  dpme_boot_bytes;      /* (byte count of boot code)                */
+    UInt32  dpme_load_addr;       /* (load address in memory of boot code)    */
+    UInt32  dpme_load_addr_2;     /* (reserved for future use)                */
+    UInt32  dpme_goto_addr;       /* (jump address in memory of boot code)    */
+    UInt32  dpme_goto_addr_2;     /* (reserved for future use)                */
+    UInt32  dpme_checksum;        /* (checksum of boot code)                  */
+    UInt8   dpme_process_id[16];  /* (processor type)                         */
+    UInt32  dpme_reserved_2[32];  /* (reserved for future use)                */
+    UInt32  dpme_reserved_3[62];  /* (reserved for future use)                */
+} DPME;
+
+/* Driver descriptor map entry. */
+
+typedef struct DDMap
+{
+    UInt32  ddBlock;              /* (driver's block start, sbBlkSize-blocks) */
+    UInt16  ddSize;               /* (driver's block count, 512-blocks)       */
+    UInt16  ddType;               /* (driver's system type)                   */
+} DDMap;
+
+/* Driver descriptor map, as found in block zero of the disk. */
+
+typedef struct Block0
+{
+    UInt16  sbSig;                     /* (unique value for block zero, 'ER') */
+    UInt16  sbBlkSize;                 /* (block size for this device)        */
+    UInt32  sbBlkCount;                /* (block count for this device)       */
+    UInt16  sbDevType;                 /* (device type)                       */
+    UInt16  sbDevId;                   /* (device id)                         */
+    UInt32  sbDrvrData;                /* (driver data)                       */
+    UInt16  sbDrvrCount;               /* (driver descriptor count)           */
+    DDMap   sbDrvrMap[8];              /* (driver descriptor table)           */
+    UInt8   sbReserved[430];           /* (reserved for future use)           */
+} Block0;
+
+/* Partition map signature (sbSig). */
+
+#define BLOCK0_SIGNATURE 0x4552
+
+/* Partition map entry signature (dpme_signature). */
+
+#define DPME_SIGNATURE 0x504D
+
+/* Partition map entry flags (dpme_flags). */
+
+#define DPME_FLAGS_VALID          0x00000001                   /* (bit 0)     */
+#define DPME_FLAGS_ALLOCATED      0x00000002                   /* (bit 1)     */
+#define DPME_FLAGS_IN_USE         0x00000004                   /* (bit 2)     */
+#define DPME_FLAGS_BOOTABLE       0x00000008                   /* (bit 3)     */
+#define DPME_FLAGS_READABLE       0x00000010                   /* (bit 4)     */
+#define DPME_FLAGS_WRITABLE       0x00000020                   /* (bit 5)     */
+#define DPME_FLAGS_OS_PIC_CODE    0x00000040                   /* (bit 6)     */
+#define DPME_FLAGS_OS_SPECIFIC_2  0x00000080                   /* (bit 7)     */
+#define DPME_FLAGS_OS_SPECIFIC_1  0x00000100                   /* (bit 8)     */
+#define DPME_FLAGS_RESERVED_2     0xFFFFFE00                   /* (bit 9..31) */
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* !_IOAPPLEPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOBDBlockStorageDevice.h b/i386/include/IOKit/storage/IOBDBlockStorageDevice.h
new file mode 100644
index 0000000..66a09d7
--- /dev/null
+++ b/i386/include/IOKit/storage/IOBDBlockStorageDevice.h
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOBDBlockStorageDevice
+ * @abstract
+ * This header contains the IOBDBlockStorageDevice class definition.
+ */
+
+#ifndef	_IOBDBLOCKSTORAGEDEVICE_H
+#define	_IOBDBLOCKSTORAGEDEVICE_H
+
+#include <IOKit/storage/IOBDTypes.h>
+
+/*!
+ * @defined kIOBDBlockStorageDeviceClass
+ * @abstract
+ * kIOBDBlockStorageDeviceClass is the name of the IOBDBlockStorageDevice class.
+ * @discussion
+ * kIOBDBlockStorageDeviceClass is the name of the IOBDBlockStorageDevice class.
+ */
+
+#define kIOBDBlockStorageDeviceClass "IOBDBlockStorageDevice"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IODVDBlockStorageDevice.h>
+
+/* Property used for matching, so the generic driver gets the nub it wants. */
+#define	kIOBlockStorageDeviceTypeBD	"BD"
+
+/*!
+ * @class
+ * IOBDBlockStorageDevice
+ * @abstract
+ * The IOBDBlockStorageDevice class is a generic BD block storage device
+ * abstraction.
+ * @discussion
+ * This class is the protocol for generic BD functionality, independent of
+ * the physical connection protocol (e.g. SCSI, ATA, USB).
+ *
+ * The APIs are the union of CD APIs, DVD APIs, and all
+ * necessary new low-level BD APIs.
+ *
+ * A subclass implements relay methods that translate our requests into
+ * calls to a protocol- and device-specific provider.
+ */
+
+class IOBDBlockStorageDevice : public IODVDBlockStorageDevice
+{
+    OSDeclareAbstractStructors(IOBDBlockStorageDevice)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*!
+     * @function init
+     * @discussion
+     * Initialize this object's minimal state.
+     * @param properties
+     * Substitute property table for this object (optional).
+     * @result
+     * Returns true on success, false otherwise.
+     */
+
+    virtual bool init(OSDictionary * properties);
+
+    /*!
+     * @function readDiscStructure
+     * @discussion
+     * Issue an MMC READ DISC STRUCTURE command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param format
+     * As documented by MMC.
+     * @param address
+     * As documented by MMC.
+     * @param layer
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @param type
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readDiscStructure( IOMemoryDescriptor * buffer,
+                                        UInt8                format,
+                                        UInt32               address,
+                                        UInt8                layer,
+                                        UInt8                grantID,
+                                        UInt8                type ) = 0;
+
+    /*!
+     * @function splitTrack
+     * @discussion
+     * Issue an MMC RESERVE TRACK command with the ARSV bit.
+     * @param address
+     * As documented by MMC.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn splitTrack(UInt32 address) = 0;
+
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  0);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  1);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  2);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  3);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  4);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  5);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  6);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  7);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  8);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  9);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 10);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 11);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 12);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 13);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 14);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 15);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOBDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/IOBDBlockStorageDriver.h b/i386/include/IOKit/storage/IOBDBlockStorageDriver.h
new file mode 100644
index 0000000..199218c
--- /dev/null
+++ b/i386/include/IOKit/storage/IOBDBlockStorageDriver.h
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOBDBlockStorageDriver
+ * @abstract
+ * This header contains the IOBDBlockStorageDriver class definition.
+ * @discussion
+ * This class implements BD functionality, independent of
+ * the physical connection protocol (e.g. SCSI, ATA, USB).
+ *
+ * A protocol-specific provider implements the functionality using an appropriate
+ * protocol and commands.
+ */
+
+#ifndef	_IOBDBLOCKSTORAGEDRIVER_H
+#define	_IOBDBLOCKSTORAGEDRIVER_H
+
+#include <IOKit/storage/IOBDBlockStorageDevice.h>
+#include <IOKit/storage/IODVDBlockStorageDriver.h>
+
+/*!
+ * @defined kIOBDBlockStorageDriverClass
+ * @abstract
+ * kIOBDBlockStorageDriverClass is the name of the IOBDBlockStorageDriver class.
+ * @discussion
+ * kIOBDBlockStorageDriverClass is the name of the IOBDBlockStorageDriver class.
+ */
+
+#define kIOBDBlockStorageDriverClass "IOBDBlockStorageDriver"
+
+/*!
+ * @class
+ * IOBDBlockStorageDriver
+ * @abstract
+ * Generic BD Driver.
+ * @discussion
+ * Storage drivers are split into two parts: the Generic Driver handles
+ * all generic device issues, independent of the lower-level transport
+ * mechanism (e.g. SCSI, ATA, USB, FireWire). All storage operations
+ * at the Generic Driver level are translated into a series of generic
+ * device operations. These operations are passed via the Device Nub
+ * to a Transport Driver, which implements the appropriate
+ * transport-dependent protocol to execute these operations.
+ * 
+ * To determine the write-protect state of a device (or media), for
+ * example, the generic driver would issue a call to the
+ * Transport Driver's reportWriteProtection method. If this were a SCSI
+ * device, its Transport Driver would issue a Mode Sense command to
+ * extract the write-protection status bit. The Transport Driver then
+ * reports true or false to the generic driver.
+ * 
+ * The generic driver therefore has no knowledge of, or involvement
+ * with, the actual commands and mechanisms used to communicate with
+ * the device. It is expected that the generic driver will rarely, if
+ * ever, need to be subclassed to handle device idiosyncrasies; rather,
+ * the Transport Driver should be changed via overrides.
+ * 
+ * A generic driver could be subclassed to create a different type of
+ * generic device. The generic driver IOBDBlockStorageDriver class is a subclass
+ * of IODVDBlockStorageDriver, adding BD functions. Similarly, the Transport Driver
+ * IOBDBlockStorageDevice is a subclass of IODVDBlockStorageDevice, adding BD 
+ * functions.
+*/
+
+class IOBDBlockStorageDriver : public IODVDBlockStorageDriver
+{
+    OSDeclareDefaultStructors(IOBDBlockStorageDriver)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    /* Overrides of IODVDBlockStorageDriver. */
+
+    virtual IOReturn acceptNewMedia(void);
+
+    /* End of IODVDBlockStorageDriver overrides. */
+
+public:
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method to
+     * return a more specific subclass of IOService -- IOBDBlockStorageDevice.
+     * This method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOBDBlockStorageDevice * getProvider() const;
+
+    /* Overrides of IODVDBlockStorageDriver: */
+
+    virtual const char * getDeviceTypeName(void);
+    virtual IOMedia * instantiateDesiredMediaObject(void);
+    virtual IOMedia * instantiateMediaObject(UInt64 base,UInt64 byteSize,
+                                            UInt32 blockSize,char *mediaName);
+    virtual IOReturn readStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
+                                        const UInt32 address,const UInt8 layer,const UInt8 agid);
+
+    /* End of IODVDBlockStorageDriver overrides. */
+
+    /*!
+     * @function splitTrack
+     * @discussion
+     * Issue an MMC RESERVE TRACK command with the ARSV bit.
+     * @param address
+     * As documented by MMC.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn splitTrack(UInt32 address);
+
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  0);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  1);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  2);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  3);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  4);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  5);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  6);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  7);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  8);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  9);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 10);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 11);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 12);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 13);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 14);
+    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 15);
+};
+
+#endif  /* !_IOBDBLOCKSTORAGEDRIVER_H */
diff --git a/i386/include/IOKit/storage/IOBDMedia.h b/i386/include/IOKit/storage/IOBDMedia.h
new file mode 100644
index 0000000..e204a1e
--- /dev/null
+++ b/i386/include/IOKit/storage/IOBDMedia.h
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOBDMedia
+ * @abstract
+ * This header contains the IOBDMedia class definition.
+ */
+
+#ifndef _IOBDMEDIA_H
+#define _IOBDMEDIA_H
+
+/*!
+ * @defined kIOBDMediaClass
+ * @abstract
+ * kIOBDMediaClass is the name of the IOBDMedia class.
+ * @discussion
+ * kIOBDMediaClass is the name of the IOBDMedia class.
+ */
+
+#define kIOBDMediaClass "IOBDMedia"
+
+/*!
+ * @defined kIOBDMediaTypeKey
+ * @abstract
+ * kIOBDMediaTypeKey is a property of IOBDMedia objects.  It has an OSString
+ * value.
+ * @discussion
+ * The kIOBDMediaTypeKey property identifies the BD media type (BD-ROM, BD-R,
+ * BD-RE, etc).  See the kIOBDMediaType contants for possible values.
+ */
+
+#define kIOBDMediaTypeKey "Type"
+
+/*!
+ * @defined kIOBDMediaTypeROM
+ * The kIOBDMediaTypeKey constant for BD-ROM media.
+ */
+
+#define kIOBDMediaTypeROM "BD-ROM"
+
+/*!
+ * @defined kIOBDMediaTypeR
+ * The kIOBDMediaTypeKey constant for BD-R media.
+ */
+
+#define kIOBDMediaTypeR "BD-R"
+
+/*!
+ * @defined kIOBDMediaTypeRE
+ * The kIOBDMediaTypeKey constant for BD-RE media.
+ */
+
+#define kIOBDMediaTypeRE "BD-RE"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOBDBlockStorageDriver.h>
+#include <IOKit/storage/IOMedia.h>
+
+/*!
+ * @class IOBDMedia
+ * @abstract
+ * The IOBDMedia class is a random-access disk device abstraction for BDs.
+ * @discussion
+ * The IOBDMedia class is a random-access disk device abstraction for BDs.
+ */
+
+class IOBDMedia : public IOMedia
+{
+    OSDeclareDefaultStructors(IOBDMedia)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*
+     * Obtain this object's provider.   We override the superclass's method to
+     * return a more specific subclass of IOService -- IOBDBlockStorageDriver.
+     * This method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOBDBlockStorageDriver * getProvider() const;
+
+    /*
+     * Compare the properties in the supplied table to this object's properties.
+     */
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
+
+    /*!
+     * @function reportKey
+     * @discussion
+     * Issue an MMC REPORT KEY command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param keyClass
+     * As documented by MMC.
+     * @param address
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @param format
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn reportKey( IOMemoryDescriptor * buffer,
+                                UInt8                keyClass,
+                                UInt32               address,
+                                UInt8                grantID,
+                                UInt8                format );
+
+    /*!
+     * @function sendKey
+     * @discussion
+     * Issue an MMC SEND KEY command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param keyClass
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @param format
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn sendKey( IOMemoryDescriptor * buffer,
+                              UInt8                keyClass,
+                              UInt8                grantID,
+                              UInt8                format );
+
+    /*!
+     * @function readStructure
+     * @discussion
+     * Issue an MMC READ DISC STRUCTURE command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param format
+     * As documented by MMC.
+     * @param address
+     * As documented by MMC.
+     * @param layer
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readStructure( IOMemoryDescriptor *     buffer,
+                                    UInt8                    format,
+                                    UInt32                   address,
+                                    UInt8                    layer,
+                                    UInt8                    grantID );
+
+    /*!
+     * @function getSpeed
+     * @discussion
+     * Get the current speed used for data transfers.
+     * @param kilobytesPerSecond
+     * Returns the current speed used for data transfers, in kB/s.
+     *
+     * kBDSpeedMin specifies the minimum speed for all BD media (1X).
+     * kBDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond);
+
+    /*!
+     * @function setSpeed
+     * @discussion
+     * Set the speed to be used for data transfers.
+     * @param kilobytesPerSecond
+     * Speed to be used for data transfers, in kB/s.
+     *
+     * kBDSpeedMin specifies the minimum speed for all BD media (1X).
+     * kBDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond);
+
+    /*!
+     * @function readDiscInfo
+     * @discussion
+     * Issue an MMC READ DISC INFORMATION command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param type
+     * Reserved for future use.  Set to zero.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readDiscInfo( IOMemoryDescriptor * buffer,
+                                   UInt8                type,
+                                   UInt16 *             actualByteCount );
+
+    /*!
+     * @function readTrackInfo
+     * @discussion
+     * Issue an MMC READ TRACK INFORMATION command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param address
+     * As documented by MMC.
+     * @param addressType
+     * As documented by MMC.
+     * @param open
+     * Reserved for future use.  Set to zero.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readTrackInfo( IOMemoryDescriptor * buffer,
+                                    UInt32               address,
+                                    UInt8                addressType,
+                                    UInt8                open,
+                                    UInt16 *             actualByteCount );
+
+    /*!
+     * @function splitTrack
+     * @discussion
+     * Issue an MMC RESERVE TRACK command with the ARSV bit.
+     * @param address
+     * As documented by MMC.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn splitTrack(UInt32 address);
+
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  0);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  1);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  2);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  3);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  4);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  5);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  6);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  7);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  8);
+    OSMetaClassDeclareReservedUnused(IOBDMedia,  9);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 10);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 11);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 12);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 13);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 14);
+    OSMetaClassDeclareReservedUnused(IOBDMedia, 15);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOBDMEDIA_H */
diff --git a/i386/include/IOKit/storage/IOBDMediaBSDClient.h b/i386/include/IOKit/storage/IOBDMediaBSDClient.h
new file mode 100644
index 0000000..ee356f5
--- /dev/null
+++ b/i386/include/IOKit/storage/IOBDMediaBSDClient.h
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOBDMEDIABSDCLIENT_H
+#define _IOBDMEDIABSDCLIENT_H
+
+#include <sys/ioctl.h>
+#include <sys/types.h>
+
+#include <IOKit/storage/IOBDTypes.h>
+
+/*
+ * Definitions
+ *
+ * ioctl                        description
+ * ---------------------------- ------------------------------------------------
+ * DKIOCBDREADSTRUCTURE         see IOBDMedia::readStructure()    in IOBDMedia.h
+ *
+ * DKIOCBDREADDISCINFO          see IOBDMedia::readDiscInfo()     in IOBDMedia.h
+ * DKIOCBDREADTRACKINFO         see IOBDMedia::readTrackInfo()    in IOBDMedia.h
+ *
+ * DKIOCBDREPORTKEY             see IOBDMedia::reportKey()        in IOBDMedia.h
+ * DKIOCBDSENDKEY               see IOBDMedia::sendKey()          in IOBDMedia.h
+ *
+ * DKIOCBDGETSPEED              see IOBDMedia::getSpeed()         in IOBDMedia.h
+ * DKIOCBDSETSPEED              see IOBDMedia::setSpeed()         in IOBDMedia.h
+ *
+ *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
+ */
+
+typedef struct
+{
+    uint8_t  format;
+
+    uint8_t  reserved0008[3];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  grantID;
+    uint8_t  layer;
+
+    uint8_t  reserved0080[4];                      /* reserved, clear to zero */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_bd_read_structure_t;
+
+typedef struct
+{
+    uint8_t  format;
+    uint8_t  keyClass;
+
+    uint8_t  reserved0016[2];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  grantID;
+
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_bd_report_key_t;
+
+typedef struct
+{
+    uint8_t  format;
+    uint8_t  keyClass;
+
+    uint8_t  reserved0016[6];                      /* reserved, clear to zero */
+
+    uint8_t  grantID;
+
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_bd_send_key_t;
+
+typedef struct
+{
+    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_bd_read_disc_info_t;
+
+typedef struct
+{
+    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  addressType;
+
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_bd_read_track_info_t;
+
+#define DKIOCBDREADSTRUCTURE _IOW('d', 160, dk_bd_read_structure_t)
+#define DKIOCBDREPORTKEY     _IOW('d', 161, dk_bd_report_key_t)
+#define DKIOCBDSENDKEY       _IOW('d', 162, dk_bd_send_key_t)
+
+#define DKIOCBDGETSPEED      _IOR('d', 163, uint16_t)
+#define DKIOCBDSETSPEED      _IOW('d', 163, uint16_t)
+
+#define DKIOCBDREADDISCINFO  _IOWR('d', 164, dk_bd_read_disc_info_t)
+#define DKIOCBDREADTRACKINFO _IOWR('d', 165, dk_bd_read_track_info_t)
+
+#define DKIOCBDSPLITTRACK    _IOW('d', 166, uint32_t)
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOBDMedia.h>
+#include <IOKit/storage/IOMediaBSDClient.h>
+
+/*
+ * Class
+ */
+
+class IOBDMediaBSDClient : public IOMediaBSDClient
+{
+    OSDeclareDefaultStructors(IOBDMediaBSDClient)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method
+     * to return a more specific subclass of IOService -- IOBDMedia.  This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOBDMedia * getProvider() const;
+
+    /*
+     * Process a BD-specific ioctl.
+     */
+
+    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
+
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 0);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 1);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 2);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 3);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 4);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 5);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 6);
+    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 7);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOBDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/IOBDTypes.h b/i386/include/IOKit/storage/IOBDTypes.h
new file mode 100644
index 0000000..f5b7927
--- /dev/null
+++ b/i386/include/IOKit/storage/IOBDTypes.h
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_BDTYPES_H
+#define	_BDTYPES_H
+
+#include <IOKit/IOTypes.h>
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/*
+ * Media Types
+ */
+
+enum
+{
+    kBDMediaTypeUnknown   = 0x0300,
+    kBDMediaTypeROM       = 0x0302, /* BD-ROM */
+    kBDMediaTypeRE        = 0x0303, /* BD-RE  */
+    kBDMediaTypeR         = 0x0304, /* BD-R   */
+
+    kBDMediaTypeMin       = 0x0300,
+    kBDMediaTypeMax       = 0x03FF
+};
+
+typedef UInt32 BDMediaType;
+
+/*
+ * Media Speed (kB/s)
+ */
+
+#define kBDSpeedMin 0x1126
+#define kBDSpeedMax 0xFFFF
+
+/*
+ * MMC Formats
+ */
+
+// Read Disc Information Format
+struct BDDiscInfo
+{
+    UInt16 dataLength;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  discStatus:2;
+    UInt8  stateOfLastSession:2;
+    UInt8  erasable:1;
+    UInt8  dataType:3;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  dataType:3;
+    UInt8  erasable:1;
+    UInt8  stateOfLastSession:2;
+    UInt8  discStatus:2;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved2;
+    UInt8  numberOfSessionsLSB;
+    UInt8  firstTrackNumberInLastSessionLSB;
+    UInt8  lastTrackNumberInLastSessionLSB;
+    UInt8  reserved4[2];
+    UInt8  numberOfSessionsMSB;
+    UInt8  firstTrackNumberInLastSessionMSB;
+    UInt8  lastTrackNumberInLastSessionMSB;
+    UInt8  reserved6[22];
+};
+typedef struct BDDiscInfo BDDiscInfo;
+
+// Read Track Information Format
+struct BDTrackInfo
+{
+    UInt16 dataLength;
+    UInt8  trackNumberLSB;
+    UInt8  sessionNumberLSB;
+    UInt8  reserved;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  reserved2:5;
+    UInt8  damage:1;
+    UInt8  reserved3:2;
+
+    UInt8  reserved4:6;
+    UInt8  blank:1;
+    UInt8  reservedTrack:1;
+
+    UInt8  nextWritableAddressValid:1;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  reserved5:6;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved3:2;
+    UInt8  damage:1;
+    UInt8  reserved2:5;
+
+    UInt8  reservedTrack:1;
+    UInt8  blank:1;
+    UInt8  reserved4:6;
+
+    UInt8  reserved5:6;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  nextWritableAddressValid:1;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt32 trackStartAddress;
+    UInt32 nextWritableAddress;
+    UInt32 freeBlocks;
+    UInt32 clusterSize;
+    UInt32 trackSize;
+    UInt32 lastRecordedAddress;
+    UInt8  trackNumberMSB;
+    UInt8  sessionNumberMSB;
+    UInt8  reserved6;
+    UInt8  reserved7;
+};
+typedef struct BDTrackInfo BDTrackInfo;
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* _BDTYPES_H */
diff --git a/i386/include/IOKit/storage/IOBlockStorageDevice.h b/i386/include/IOKit/storage/IOBlockStorageDevice.h
new file mode 100644
index 0000000..bbec146
--- /dev/null
+++ b/i386/include/IOKit/storage/IOBlockStorageDevice.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOBlockStorageDevice
+ * @abstract
+ * This header contains the IOBlockStorageDevice class definition.
+ */
+
+#ifndef _IOBLOCKSTORAGEDEVICE_H
+#define _IOBLOCKSTORAGEDEVICE_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
+
+/*!
+ * @defined kIOBlockStorageDeviceClass
+ * @abstract
+ * The name of the IOBlockStorageDevice class.
+ */
+
+#define kIOBlockStorageDeviceClass "IOBlockStorageDevice"
+
+/*!
+ * @defined kIOBlockStorageDeviceWriteCacheStateKey
+ * @abstract
+ * The name of the property used to get or set the write cache state of the
+ * block storage device.
+ */
+#define kIOBlockStorageDeviceWriteCacheStateKey	"WriteCacheState"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/IOService.h>
+#include <IOKit/storage/IOMedia.h>
+
+/* Property used for matching, so the generic driver gets the nub it wants. */
+/*!
+ * @defined kIOBlockStorageDeviceTypeKey
+ * @abstract The name of the property tested for nub type matching by the generic block
+ * storage driver.
+ */
+#define	kIOBlockStorageDeviceTypeKey	"device-type"
+/*!
+ * @defined kIOBlockStorageDeviceTypeGeneric
+ * @abstract A character string used for nub matching.
+ */
+#define	kIOBlockStorageDeviceTypeGeneric	"Generic"
+
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/IOBlockStorageDriver.h b/i386/include/IOKit/storage/IOBlockStorageDriver.h
new file mode 100644
index 0000000..24ac3c2
--- /dev/null
+++ b/i386/include/IOKit/storage/IOBlockStorageDriver.h
@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOBlockStorageDriver
+ * @abstract
+ * This header contains the IOBlockStorageDriver class definition.
+ */
+
+#ifndef _IOBLOCKSTORAGEDRIVER_H
+#define _IOBLOCKSTORAGEDRIVER_H
+
+#include <IOKit/IOTypes.h>
+
+/*!
+ * @defined kIOBlockStorageDriverClass
+ * @abstract
+ * The name of the IOBlockStorageDriver class.
+ */
+
+#define kIOBlockStorageDriverClass "IOBlockStorageDriver"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsKey
+ * @abstract
+ * Holds a table of numeric values describing the driver's
+ * operating statistics.
+ * @discussion
+ * This property holds a table of numeric values describing the driver's
+ * operating statistics.  The table is an OSDictionary, where each entry
+ * describes one given statistic.
+ */
+
+#define kIOBlockStorageDriverStatisticsKey "Statistics"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsBytesReadKey
+ * @abstract
+ * Describes the number of bytes read since the block storage
+ * driver was instantiated.
+ * @discussion
+ * This property describes the number of bytes read since the block storage
+ * driver was instantiated.  It is one of the statistic entries listed under
+ * the top-level kIOBlockStorageDriverStatisticsKey property table.  It has
+ * an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsBytesReadKey "Bytes (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsBytesWrittenKey
+ * @abstract
+ * Describes the number of bytes written since the block storage
+ * driver was instantiated. 
+ * @discussion
+ * This property describes the number of bytes written since the block storage
+ * driver was instantiated.  It is one of the statistic entries listed under the
+ * top-level kIOBlockStorageDriverStatisticsKey property table.  It has an
+ * OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsBytesWrittenKey "Bytes (Write)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsReadErrorsKey
+ * @abstract
+ * Describes the number of read errors encountered since the block
+ * storage driver was instantiated. 
+ * @discussion
+ * This property describes the number of read errors encountered since the block
+ * storage driver was instantiated.  It is one of the statistic entries listed
+ * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
+ * has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsReadErrorsKey "Errors (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsWriteErrorsKey
+ * @abstract
+ * Describes the number of write errors encountered since the
+ * block storage driver was instantiated.
+ * @discussion
+ * This property describes the number of write errors encountered since the
+ * block storage driver was instantiated.  It is one of the statistic entries
+ * listed under the top-level kIOBlockStorageDriverStatisticsKey property table. 
+ * It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsWriteErrorsKey "Errors (Write)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsLatentReadTimeKey
+ * @abstract
+ * Describes the number of nanoseconds of latency during reads
+ * since the block storage driver was instantiated. 
+ * @discussion
+ * This property describes the number of nanoseconds of latency during reads
+ * since the block storage driver was instantiated.  It is one of the statistic
+ * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
+ * property table.  It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsLatentReadTimeKey "Latency Time (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsLatentWriteTimeKey
+ * @abstract
+ * Describes the number of nanoseconds of latency during writes
+ * since the block storage driver was instantiated. 
+ * @discussion
+ * This property describes the number of nanoseconds of latency during writes
+ * since the block storage driver was instantiated.  It is one of the statistic
+ * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
+ * property table.  It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsLatentWriteTimeKey "Latency Time (Write)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsReadsKey
+ * @abstract
+ * Describes the number of read operations processed since the
+ * block storage driver was instantiated.
+ * @discussion
+ * This property describes the number of read operations processed since the
+ * block storage driver was instantiated.  It is one of the statistic entries
+ * listed under the top-level kIOBlockStorageDriverStatisticsKey property table.
+ * It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsReadsKey "Operations (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsWritesKey
+ * @abstract
+ * Describes the number of write operations processed since the
+ * block storage driver was instantiated.
+ * @discussion
+ * This property describes the number of write operations processed since the
+ * block storage driver was instantiated.  It is one of the statistic entries
+ * listed under the top-level kIOBlockStorageDriverStatisticsKey property table.
+ * It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsWritesKey "Operations (Write)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsReadRetriesKey
+ * @abstract
+ * Describes the number of read retries required since the block
+ * storage driver was instantiated.
+ * @discussion
+ * This property describes the number of read retries required since the block
+ * storage driver was instantiated.  It is one of the statistic entries listed
+ * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
+ * has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsReadRetriesKey "Retries (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsWriteRetriesKey
+ * @abstract
+ * Describes the number of write retries required since the block
+ * storage driver was instantiated.
+ * @discussion
+ * This property describes the number of write retries required since the block
+ * storage driver was instantiated.  It is one of the statistic entries listed
+ * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
+ * has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsWriteRetriesKey "Retries (Write)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsTotalReadTimeKey
+ * @abstract
+ * Describes the number of nanoseconds spent performing reads
+ * since the block storage driver was instantiated.
+ * @discussion
+ * This property describes the number of nanoseconds spent performing reads
+ * since the block storage driver was instantiated.  It is one of the statistic
+ * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
+ * property table.  It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsTotalReadTimeKey "Total Time (Read)"
+
+/*!
+ * @defined kIOBlockStorageDriverStatisticsTotalWriteTimeKey
+ * @abstract
+ * Describes the number of nanoseconds spent performing writes
+ * since the block storage driver was instantiated.
+ * @discussion
+ * This property describes the number of nanoseconds spent performing writes
+ * since the block storage driver was instantiated.  It is one of the statistic
+ * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
+ * property table.  It has an OSNumber value.
+ */
+
+#define kIOBlockStorageDriverStatisticsTotalWriteTimeKey "Total Time (Write)"
+
+/*!
+ * @enum IOMediaState
+ * @abstract
+ * The different states that getMediaState() can report.
+ * @constant kIOMediaStateOffline
+ * Media is not available.
+ * @constant kIOMediaStateOnline
+ * Media is available and ready for operations.
+ * @constant kIOMediaStateBusy
+ * Media is available, but not ready for operations.
+ */
+
+enum
+{
+    kIOMediaStateOffline = 0,
+    kIOMediaStateOnline  = 1,
+    kIOMediaStateBusy    = 2
+};
+
+typedef UInt32 IOMediaState;
+
+#endif /* !_IOBLOCKSTORAGEDRIVER_H */
diff --git a/i386/include/IOKit/storage/IOCDBlockStorageDevice.h b/i386/include/IOKit/storage/IOCDBlockStorageDevice.h
new file mode 100644
index 0000000..706da40
--- /dev/null
+++ b/i386/include/IOKit/storage/IOCDBlockStorageDevice.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOCDBlockStorageDevice
+ * @abstract
+ * This header contains the IOCDBlockStorageDevice class definition.
+ */
+
+#ifndef _IOCDBLOCKSTORAGEDEVICE_H
+#define _IOCDBLOCKSTORAGEDEVICE_H
+
+#include <IOKit/storage/IOCDTypes.h>
+
+/*!
+ * @defined kIOCDBlockStorageDeviceClass
+ * @abstract
+ * kIOCDBlockStorageDeviceClass is the name of the IOCDBlockStorageDevice class.
+ * @discussion
+ * kIOCDBlockStorageDeviceClass is the name of the IOCDBlockStorageDevice class.
+ */
+
+#define kIOCDBlockStorageDeviceClass "IOCDBlockStorageDevice"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOBlockStorageDevice.h>
+
+/* Property used for matching, so the generic driver gets the nub it wants. */
+#define	kIOBlockStorageDeviceTypeCDROM	"CDROM"
+
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOCDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/IOCDBlockStorageDriver.h b/i386/include/IOKit/storage/IOCDBlockStorageDriver.h
new file mode 100644
index 0000000..f88a406
--- /dev/null
+++ b/i386/include/IOKit/storage/IOCDBlockStorageDriver.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * IOCDBlockStorageDriver.h
+ *
+ * This class implements  CD functionality, independent of
+ * the physical connection protocol (e.g. SCSI, ATA, USB).
+ *
+ * A protocol-specific provider implements the functionality using an appropriate
+ * protocol and commands.
+ */
+
+#ifndef	_IOCDBLOCKSTORAGEDRIVER_H
+#define	_IOCDBLOCKSTORAGEDRIVER_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/storage/IOCDBlockStorageDevice.h>
+#include <IOKit/storage/IOCDTypes.h>
+#include <IOKit/storage/IOBlockStorageDriver.h>
+
+/*!
+ * @defined kIOCDBlockStorageDriverClass
+ * @abstract
+ * kIOCDBlockStorageDriverClass is the name of the IOCDBlockStorageDriver class.
+ * @discussion
+ * kIOCDBlockStorageDriverClass is the name of the IOCDBlockStorageDriver class.
+ */
+
+#define kIOCDBlockStorageDriverClass "IOCDBlockStorageDriver"
+
+#endif
diff --git a/i386/include/IOKit/storage/IOCDMedia.h b/i386/include/IOKit/storage/IOCDMedia.h
new file mode 100644
index 0000000..85ad72d
--- /dev/null
+++ b/i386/include/IOKit/storage/IOCDMedia.h
@@ -0,0 +1,553 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOCDMedia
+ * @abstract
+ * This header contains the IOCDMedia class definition.
+ */
+
+#ifndef _IOCDMEDIA_H
+#define _IOCDMEDIA_H
+
+/*!
+ * @defined kIOCDMediaClass
+ * @abstract
+ * kIOCDMediaClass is the name of the IOCDMedia class.
+ * @discussion
+ * kIOCDMediaClass is the name of the IOCDMedia class.
+ */
+
+#define kIOCDMediaClass "IOCDMedia"
+
+/*!
+ * @defined kIOCDMediaTOCKey
+ * @abstract
+ * kIOCDMediaTOCKey is a property of IOCDMedia objects.  It has an OSData value
+ * and a CDTOC structure.
+ * @discussion
+ * The kIOCDMediaTOCKey property contains the CD's full table of contents,
+ * formatted as a CDTOC structure.  The CDTOC structure is same as what is
+ * returned by a READ TOC command, format 0x02.  All fields in the TOC are
+ * guaranteed to be binary-encoded (no BCD-encoded numbers are ever passed).
+ */
+
+#define kIOCDMediaTOCKey "TOC"
+
+/*!
+ * @defined kIOCDMediaTypeKey
+ * @abstract
+ * kIOCDMediaTypeKey is a property of IOCDMedia objects.  It has an OSString
+ * value.
+ * @discussion
+ * The kIOCDMediaTypeKey property identifies the CD media type (CD-ROM, CD-R,
+ * CD-RW, etc).  See the kIOCDMediaType contants for possible values.
+ */
+
+#define kIOCDMediaTypeKey "Type"
+
+/*!
+ * @defined kIOCDMediaTypeROM
+ * The kIOCDMediaTypeKey constant for CD-ROM media (inclusive of the CD-I,
+ * CD-ROM XA, and CD Audio standards, and mixed mode combinations thereof).
+ */
+
+#define kIOCDMediaTypeROM "CD-ROM"
+
+/*!
+ * @defined kIOCDMediaTypeR
+ * The kIOCDMediaTypeKey constant for CD Recordable (CD-R) media.
+ */
+
+#define kIOCDMediaTypeR "CD-R"
+
+/*!
+ * @defined kIOCDMediaTypeRW
+ * The kIOCDMediaTypeKey constant for CD ReWritable (CD-RW) media.
+ */
+
+#define kIOCDMediaTypeRW "CD-RW"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOCDBlockStorageDriver.h>
+#include <IOKit/storage/IOMedia.h>
+
+/*!
+ * @class IOCDMedia
+ * @abstract
+ * The IOCDMedia class is a random-access disk device abstraction for CDs.
+ * @discussion
+ * The IOCDMedia class is a random-access disk device abstraction for CDs. It
+ * extends the IOMedia class by implementing special CD APIs, such as readCD,
+ * and publishing the TOC as a property of the IOCDMedia object.
+ */
+
+class IOCDMedia : public IOMedia
+{
+    OSDeclareDefaultStructors(IOCDMedia)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    using IOStorage::read;
+    using IOStorage::write;
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method to
+     * return a more specific subclass of IOService -- IOCDBlockStorageDriver.  
+     * This method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOCDBlockStorageDriver * getProvider() const;
+
+    /*
+     * Compare the properties in the supplied table to this object's properties.
+     */
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
+
+    /*!
+     * @function read
+     * @discussion
+     * Read data from the storage object at the specified byte offset into the
+     * specified buffer, asynchronously.   When the read completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the read.
+     * @param client
+     * Client requesting the read.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void read(IOService *           client,
+                      UInt64                byteStart,
+                      IOMemoryDescriptor *  buffer,
+                      IOStorageAttributes * attributes,
+                      IOStorageCompletion * completion);
+
+    /*
+     * @function write
+     * @discussion
+     * Write data into the storage object at the specified byte offset from the
+     * specified buffer, asynchronously.   When the write completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the write.
+     * @param client
+     * Client requesting the write.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void write(IOService *           client,
+                       UInt64                byteStart,
+                       IOMemoryDescriptor *  buffer,
+                       IOStorageAttributes * attributes,
+                       IOStorageCompletion * completion);
+
+    /*!
+     * @function readCD
+     * @discussion
+     * Read data from the CD media object at the specified byte offset into the
+     * specified buffer, asynchronously.  Special areas of the CD sector can be
+     * read via this method, such as the header and subchannel data.   When the
+     * read completes, the caller will be notified via the specified completion
+     * action.
+     *
+     * The buffer will be retained for the duration of the read.
+     * @param client
+     * Client requesting the read.
+     * @param byteStart
+     * Starting byte offset for the data transfer (see sectorArea parameter).
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param sectorArea
+     * Sector area(s) to read.  The sum of each area's size defines the natural
+     * block size of the media for the call.  This should be taken into account
+     * when computing the address of byteStart.  See IOCDTypes.h.
+     * @param sectorType
+     * Sector type that is expected.  The data transfer is terminated as soon as
+     * data is encountered that does not match the expected type.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+#ifdef __LP64__
+    virtual void readCD(IOService *           client,
+                        UInt64                byteStart,
+                        IOMemoryDescriptor *  buffer,
+                        CDSectorArea          sectorArea,
+                        CDSectorType          sectorType,
+                        IOStorageAttributes * attributes,
+                        IOStorageCompletion * completion);
+#else /* !__LP64__ */
+    virtual void readCD(IOService *           client,
+                        UInt64                byteStart,
+                        IOMemoryDescriptor *  buffer,
+                        CDSectorArea          sectorArea,
+                        CDSectorType          sectorType,
+                        IOStorageCompletion   completion);
+#endif /* !__LP64__ */
+
+    /*!
+     * @function readCD
+     * @discussion
+     * Read data from the CD media object at the specified byte offset into the
+     * specified buffer, synchronously.   Special areas of the CD sector can be
+     * read via this method, such as the header and subchannel data.   When the
+     * read completes, this method will return to the caller.   The actual byte
+     * count field is optional.
+     * @param client
+     * Client requesting the read.
+     * @param byteStart
+     * Starting byte offset for the data transfer (see sectorArea parameter).
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param sectorArea
+     * Sector area(s) to read.  The sum of each area's size defines the natural
+     * block size of the media for the call.  This should be taken into account
+     * when computing the address of byteStart.  See IOCDTypes.h.
+     * @param sectorType
+     * Sector type that is expected.  The data transfer is terminated as soon as
+     * data is encountered that does not match the expected type.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+#ifdef __LP64__
+    virtual IOReturn readCD(IOService *           client,
+                            UInt64                byteStart,
+                            IOMemoryDescriptor *  buffer,
+                            CDSectorArea          sectorArea,
+                            CDSectorType          sectorType,
+                            IOStorageAttributes * attributes      = 0,
+                            UInt64 *              actualByteCount = 0);
+#else /* !__LP64__ */
+    virtual IOReturn readCD(IOService *           client,
+                            UInt64                byteStart,
+                            IOMemoryDescriptor *  buffer,
+                            CDSectorArea          sectorArea,
+                            CDSectorType          sectorType,
+                            UInt64 *              actualByteCount = 0);
+#endif /* !__LP64__ */
+
+    /*!
+     * @function readISRC
+     * @discussion
+     * Read the International Standard Recording Code for the specified track.
+     * @param track
+     * Track number from which to read the ISRC.
+     * @param isrc
+     * Buffer for the ISRC data.  Buffer contents will be zero-terminated.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn readISRC(UInt8 track, CDISRC isrc);
+    
+    /*!
+     * @function readMCN
+     * @discussion
+     * Read the Media Catalog Number (also known as the Universal Product Code).
+     * @param mcn
+     * Buffer for the MCN data.  Buffer contents will be zero-terminated.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn readMCN(CDMCN mcn);
+
+    /*!
+     * @function getTOC
+     * @discussion
+     * Get the full Table Of Contents.
+     *
+     * All CDTOC fields passed across I/O Kit APIs are guaranteed to be
+     * binary-encoded (no BCD-encoded numbers are ever passed).
+     * @result
+     * Returns a pointer to the TOC buffer (do not deallocate).
+     */
+     
+    virtual CDTOC * getTOC();
+
+    /*!
+     * @function getSpeed
+     * @discussion
+     * Get the current speed used for data transfers.
+     * @param kilobytesPerSecond
+     * Returns the current speed used for data transfers, in kB/s.
+     *
+     * kCDSpeedMin specifies the minimum speed for all CD media (1X).
+     * kCDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond); /* 10.1.0 */
+
+    /*!
+     * @function setSpeed
+     * @discussion
+     * Set the speed to be used for data transfers.
+     * @param kilobytesPerSecond
+     * Speed to be used for data transfers, in kB/s.
+     *
+     * kCDSpeedMin specifies the minimum speed for all CD media (1X).
+     * kCDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond); /* 10.1.0 */
+
+    /*!
+     * @function readTOC
+     * @discussion
+     * Issue an MMC READ TOC/PMA/ATIP command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param format
+     * As documented by MMC.
+     * @param formatAsTime
+     * As documented by MMC.
+     * @param trackOrSessionNumber
+     * As documented by MMC.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readTOC(IOMemoryDescriptor * buffer,
+                             CDTOCFormat          format,
+                             UInt8                formatAsTime,
+                             UInt8                trackOrSessionNumber,
+                             UInt16 *             actualByteCount); /* 10.1.3 */
+
+    /*!
+     * @function readDiscInfo
+     * @discussion
+     * Issue an MMC READ DISC INFORMATION command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readDiscInfo(IOMemoryDescriptor * buffer,
+                                  UInt16 *             actualByteCount); /* 10.1.3 */
+
+    /*!
+     * @function readTrackInfo
+     * @discussion
+     * Issue an MMC READ TRACK INFORMATION command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param address
+     * As documented by MMC.
+     * @param addressType
+     * As documented by MMC.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readTrackInfo(IOMemoryDescriptor *   buffer,
+                                   UInt32                 address,
+                                   CDTrackInfoAddressType addressType,
+                                   UInt16 *               actualByteCount); /* 10.1.3 */
+
+    /*
+     * @function writeCD
+     * @discussion
+     * Write data into the CD media object at the specified byte offset from the
+     * specified buffer, asynchronously.    When the write completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the write.
+     * @param client
+     * Client requesting the write.
+     * @param byteStart
+     * Starting byte offset for the data transfer (see sectorArea parameter).
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param sectorArea
+     * Sector area(s) to write.  The sum of each area's size defines the natural
+     * block size of the media for the call.   This should be taken into account
+     * when computing the address of byteStart.  See IOCDTypes.h.
+     * @param sectorType
+     * Sector type that is expected.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+#ifdef __LP64__
+    virtual void writeCD(IOService *           client,
+                         UInt64                byteStart,
+                         IOMemoryDescriptor *  buffer,
+                         CDSectorArea          sectorArea,
+                         CDSectorType          sectorType,
+                         IOStorageAttributes * attributes,
+                         IOStorageCompletion * completion);
+#else /* !__LP64__ */
+    virtual void writeCD(IOService *           client,
+                         UInt64                byteStart,
+                         IOMemoryDescriptor *  buffer,
+                         CDSectorArea          sectorArea,
+                         CDSectorType          sectorType,
+                         IOStorageCompletion   completion); /* 10.2.0 */
+#endif /* !__LP64__ */
+
+    /*
+     * @function writeCD
+     * @discussion
+     * Write data into the CD media object at the specified byte offset from the
+     * specified buffer, synchronously.    When the write completes, this method
+     * will return to the caller.  The actual byte count field is optional.
+     * @param client
+     * Client requesting the write.
+     * @param byteStart
+     * Starting byte offset for the data transfer (see sectorArea parameter).
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param sectorArea
+     * Sector area(s) to write.  The sum of each area's size defines the natural
+     * block size of the media for the call.   This should be taken into account
+     * when computing the address of byteStart.  See IOCDTypes.h.
+     * @param sectorType
+     * Sector type that is expected.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+#ifdef __LP64__
+    virtual IOReturn writeCD(IOService *           client,
+                             UInt64                byteStart,
+                             IOMemoryDescriptor *  buffer,
+                             CDSectorArea          sectorArea,
+                             CDSectorType          sectorType,
+                             IOStorageAttributes * attributes      = 0,
+                             UInt64 *              actualByteCount = 0);
+#else /* !__LP64__ */
+    virtual IOReturn writeCD(IOService *           client,
+                             UInt64                byteStart,
+                             IOMemoryDescriptor *  buffer,
+                             CDSectorArea          sectorArea,
+                             CDSectorType          sectorType,
+                             UInt64 *              actualByteCount = 0); /* 10.2.0 */
+#endif /* !__LP64__ */
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  0);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  1);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  2);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  3);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  4);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  5);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  6);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  0);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  1);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  2);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  3);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  4);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  5);
+    OSMetaClassDeclareReservedUsed(IOCDMedia,  6);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  7);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  8);
+    OSMetaClassDeclareReservedUnused(IOCDMedia,  9);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 10);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 11);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 12);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 13);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 14);
+    OSMetaClassDeclareReservedUnused(IOCDMedia, 15);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOCDMEDIA_H */
diff --git a/i386/include/IOKit/storage/IOCDMediaBSDClient.h b/i386/include/IOKit/storage/IOCDMediaBSDClient.h
new file mode 100644
index 0000000..ce31863
--- /dev/null
+++ b/i386/include/IOKit/storage/IOCDMediaBSDClient.h
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOCDMEDIABSDCLIENT_H
+#define _IOCDMEDIABSDCLIENT_H
+
+#include <sys/ioctl.h>
+
+#include <IOKit/storage/IOCDTypes.h>
+
+/*
+ * Definitions
+ *
+ * ioctl                        description
+ * ---------------------------- ------------------------------------------------
+ * DKIOCCDREAD                  see IOCDMedia::readCD()           in IOCDMedia.h
+ * DKIOCCDREADTOC               see IOCDMedia::readTOC()          in IOCDMedia.h
+ *
+ * DKIOCCDREADDISCINFO          see IOCDMedia::readDiscInfo()     in IOCDMedia.h
+ * DKIOCCDREADTRACKINFO         see IOCDMedia::readTrackInfo()    in IOCDMedia.h
+ *
+ * DKIOCCDREADISRC              see IOCDMedia::readISRC()         in IOCDMedia.h
+ * DKIOCCDREADMCN               see IOCDMedia::readMCN()          in IOCDMedia.h
+ *
+ * DKIOCCDGETSPEED              see IOCDMedia::getSpeed()         in IOCDMedia.h
+ * DKIOCCDSETSPEED              see IOCDMedia::setSpeed()         in IOCDMedia.h
+ *
+ *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
+ */
+
+typedef struct
+{
+    uint64_t offset;
+
+    uint8_t  sectorArea;
+    uint8_t  sectorType;
+
+#ifdef __LP64__
+    uint8_t  reserved0080[10];                     /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0080[6];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint32_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_cd_read_t;
+
+typedef struct
+{
+    CDISRC   isrc;
+    uint8_t  track;
+
+    uint8_t  reserved0112[2];                      /* reserved, clear to zero */
+} dk_cd_read_isrc_t;
+
+typedef struct
+{
+    CDMCN    mcn;
+
+    uint8_t  reserved0112[2];                      /* reserved, clear to zero */
+} dk_cd_read_mcn_t;
+
+typedef struct
+{
+    uint8_t  format;
+    uint8_t  formatAsTime;
+
+    uint8_t  reserved0016[5];                      /* reserved, clear to zero */
+
+    union
+    {
+        uint8_t session;
+        uint8_t track;
+    } address;
+
+#ifdef __LP64__
+    uint8_t  reserved0064[6];                      /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0064[2];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_cd_read_toc_t;
+
+typedef struct
+{
+#ifdef __LP64__
+    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0000[10];                     /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_cd_read_disc_info_t;
+
+typedef struct
+{
+    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  addressType;
+
+#ifdef __LP64__
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_cd_read_track_info_t;
+
+#define DKIOCCDREAD          _IOWR('d', 96, dk_cd_read_t)
+
+#define DKIOCCDREADISRC      _IOWR('d', 97, dk_cd_read_isrc_t)
+#define DKIOCCDREADMCN       _IOWR('d', 98, dk_cd_read_mcn_t)
+
+#define DKIOCCDGETSPEED      _IOR('d', 99, uint16_t)
+#define DKIOCCDSETSPEED      _IOW('d', 99, uint16_t)
+
+#define DKIOCCDREADTOC       _IOWR('d', 100, dk_cd_read_toc_t)
+
+#define DKIOCCDREADDISCINFO  _IOWR('d', 101, dk_cd_read_disc_info_t)
+#define DKIOCCDREADTRACKINFO _IOWR('d', 102, dk_cd_read_track_info_t)
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOCDMedia.h>
+#include <IOKit/storage/IOMediaBSDClient.h>
+
+/*
+ * Class
+ */
+
+class IOCDMediaBSDClient : public IOMediaBSDClient
+{
+    OSDeclareDefaultStructors(IOCDMediaBSDClient)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method
+     * to return a more specific subclass of IOService -- IOCDMedia.  This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOCDMedia * getProvider() const;
+
+    /*
+     * Process a CD-specific ioctl.
+     */
+
+    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
+
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 0);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 1);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 2);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 3);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 4);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 5);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 6);
+    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 7);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOCDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/IOCDPartitionScheme.h b/i386/include/IOKit/storage/IOCDPartitionScheme.h
new file mode 100644
index 0000000..1ff58c4
--- /dev/null
+++ b/i386/include/IOKit/storage/IOCDPartitionScheme.h
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOCDPartitionScheme
+ * @abstract
+ * This header contains the IOCDPartitionScheme class definition.
+ */
+
+#ifndef _IOCDPARTITIONSCHEME_H
+#define _IOCDPARTITIONSCHEME_H
+
+#include <IOKit/storage/IOCDTypes.h>
+
+/*!
+ * @defined kIOCDPartitionSchemeClass
+ * @abstract
+ * kIOCDPartitionSchemeClass is the name of the IOCDPartitionScheme class.
+ * @discussion
+ * kIOCDPartitionSchemeClass is the name of the IOCDPartitionScheme class.
+ */
+
+#define kIOCDPartitionSchemeClass "IOCDPartitionScheme"
+
+/*!
+ * @defined kIOMediaSessionIDKey
+ * @abstract
+ * kIOMediaSessionIDKey is property of IOMedia objects.  It has an OSNumber
+ * value.
+ * @discussion
+ * The kIOMediaSessionIDKey property is placed into each IOMedia instance
+ * created by the CD partition scheme.  It identifies the session number
+ * the track was recorded on.
+ */
+
+#define kIOMediaSessionIDKey "Session ID"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOCDMedia.h>
+#include <IOKit/storage/IOPartitionScheme.h>
+
+/*
+ * Class
+ */
+
+class IOCDPartitionScheme : public IOPartitionScheme
+{
+    OSDeclareDefaultStructors(IOCDPartitionScheme);
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    OSSet * _partitions;    /* (set of media objects representing partitions) */
+
+    /*
+     * Free all of this object's outstanding resources.
+     */
+
+    virtual void free(void);
+
+    /*
+     * Scan the provider media for CD partitions (in TOC).  Returns the set
+     * of media objects representing each of the partitions (the retain for
+     * the set is passed to the caller), or null should no CD partitions be
+     * found.  The default probe score can be adjusted up or down, based on
+     * the confidence of the scan.
+     */
+
+    virtual OSSet * scan(SInt32 * score);
+
+    /*
+     * Ask whether the given partition appears to be corrupt.  A partition that
+     * is corrupt will cause the failure of the CD partition scheme altogether.
+     */
+
+    virtual bool isPartitionCorrupt( CDTOCDescriptor * partition,
+                                     UInt64            partitionSize,
+                                     UInt32            partitionBlockSize,
+                                     CDSectorType      partitionBlockType,
+                                     CDTOC *           toc );
+
+    /*
+     * Ask whether the given partition appears to be invalid.  A partition that
+     * is invalid will cause it to be skipped in the scan, but will not cause a
+     * failure of the CD partition scheme.
+     */
+
+    virtual bool isPartitionInvalid( CDTOCDescriptor * partition,
+                                     UInt64            partitionSize,
+                                     UInt32            partitionBlockSize,
+                                     CDSectorType      partitionBlockType,
+                                     CDTOC *           toc );
+
+    /*
+     * Instantiate a new media object to represent the given partition.
+     */
+
+    virtual IOMedia * instantiateMediaObject(
+                                           CDTOCDescriptor * partition,
+                                           UInt64            partitionSize,
+                                           UInt32            partitionBlockSize,
+                                           CDSectorType      partitionBlockType,
+                                           CDTOC *           toc );
+
+    /*
+     * Allocate a new media object (called from instantiateMediaObject).
+     */
+
+    virtual IOMedia * instantiateDesiredMediaObject(
+                                           CDTOCDescriptor * partition,
+                                           UInt64            partitionSize,
+                                           UInt32            partitionBlockSize,
+                                           CDSectorType      partitionBlockType,
+                                           CDTOC *           toc );
+
+public:
+
+    /*
+     * Initialize this object's minimal state.
+     */
+
+    virtual bool init(OSDictionary * properties = 0);
+
+    /*
+     * Scan the provider media for CD partitions.
+     */
+
+    virtual IOService * probe(IOService * provider, SInt32 * score);
+
+    /*
+     * Determine whether the provider media contains CD partitions.
+     */
+
+    virtual bool start(IOService * provider);
+
+    /*
+     * Read data from the storage object at the specified byte offset into the
+     * specified buffer, asynchronously.   When the read completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the read.
+     *
+     * For the CD partition scheme, we convert the read from a partition
+     * object into the appropriate readCD command to our provider media.
+     */
+
+    virtual void read(IOService *           client,
+                      UInt64                byteStart,
+                      IOMemoryDescriptor *  buffer,
+                      IOStorageAttributes * attributes,
+                      IOStorageCompletion * completion);
+
+    /*
+     * Write data into the storage object at the specified byte offset from the
+     * specified buffer, asynchronously.   When the write completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the write.
+     *
+     * For the CD partition scheme, we convert the write from a partition
+     * object into the appropriate writeCD command to our provider media.
+     */
+
+    virtual void write(IOService *           client,
+                       UInt64                byteStart,
+                       IOMemoryDescriptor *  buffer,
+                       IOStorageAttributes * attributes,
+                       IOStorageCompletion * completion);
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method
+     * to return a more specific subclass of OSObject -- IOCDMedia.   This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOCDMedia * getProvider() const;
+
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  0);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  1);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  2);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  3);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  4);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  5);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  6);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  7);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  8);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  9);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 10);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 11);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 12);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 13);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 14);
+    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 15);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOCDPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOCDTypes.h b/i386/include/IOKit/storage/IOCDTypes.h
new file mode 100644
index 0000000..6b1af29
--- /dev/null
+++ b/i386/include/IOKit/storage/IOCDTypes.h
@@ -0,0 +1,492 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_IOCDTYPES_H
+#define	_IOCDTYPES_H
+
+#include <IOKit/IOTypes.h>
+#include <libkern/OSByteOrder.h>
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/*
+ * Minutes, Seconds, Frames (M:S:F)
+ *
+ * All M:S:F values passed across I/O Kit APIs are guaranteed to be
+ * binary-encoded numbers (no BCD-encoded numbers are ever passed).
+ */
+
+typedef struct
+{
+    UInt8 minute;
+    UInt8 second;
+    UInt8 frame;
+} CDMSF;
+
+/*
+ * Media Catalogue Numbers (MCN), International Standard Recording Codes (ISRC)
+ *
+ * All MCN and ISRC values passed across I/O Kit APIs are guaranteed
+ * to have a zero-terminating byte, for convenient use as C strings.
+ */
+
+#define kCDMCNMaxLength  13
+#define kCDISRCMaxLength 12
+
+typedef char CDMCN [kCDMCNMaxLength  + 1];
+typedef char CDISRC[kCDISRCMaxLength + 1];
+
+/*
+ * Audio Status
+ *
+ * All CDAudioStatus fields passed across I/O Kit APIs are guaranteed to
+ * be binary-encoded numbers (no BCD-encoded numbers are ever passed).
+ */
+
+#define kCDAudioStatusUnsupported 0x00
+#define kCDAudioStatusActive      0x11
+#define kCDAudioStatusPaused      0x12
+#define kCDAudioStatusSuccess     0x13
+#define kCDAudioStatusFailure     0x14
+#define kCDAudioStatusNone        0x15
+
+typedef struct
+{
+    UInt8 status;
+    struct
+    {
+        CDMSF time;
+        struct
+        {
+            UInt8 index;
+            UInt8 number;
+            CDMSF time;
+        } track;
+    } position;
+} CDAudioStatus;
+
+/*
+ * Table Of Contents
+ *
+ * All CDTOC fields passed across I/O Kit APIs are guaranteed to be
+ * binary-encoded numbers (no BCD-encoded numbers are ever passed).
+ */
+
+typedef struct
+{
+    UInt8 session;
+#ifdef __LITTLE_ENDIAN__
+    UInt8 control:4, adr:4;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8 adr:4, control:4;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8 tno;
+    UInt8 point;
+    CDMSF address;
+    UInt8 zero;
+    CDMSF p;
+} CDTOCDescriptor;
+
+typedef struct
+{
+    UInt16          length;
+    UInt8           sessionFirst;
+    UInt8           sessionLast;
+    CDTOCDescriptor descriptors[0];
+} CDTOC;
+
+/*
+ * Table Of Contents Descriptor Count Convenience Function
+ */
+
+static inline UInt32 CDTOCGetDescriptorCount(CDTOC * toc)
+{
+    UInt32 tocSize = OSSwapBigToHostInt16(toc->length) + (UInt32) sizeof(toc->length);
+
+    return (tocSize < (UInt32) sizeof(CDTOC)) ? 0 : 
+           (tocSize - (UInt32) sizeof(CDTOC)) / (UInt32) sizeof(CDTOCDescriptor);
+}
+
+/*
+ * M:S:F To LBA Convenience Function
+ */
+
+static inline UInt32 CDConvertMSFToLBA(CDMSF msf)
+{
+    return (((msf.minute * 60U) + msf.second) * 75U) + msf.frame - 150U;
+}
+
+/*
+ * M:S:F To Clipped LBA Convenience Function
+ */
+
+static inline UInt32 CDConvertMSFToClippedLBA(CDMSF msf)
+{
+    return (msf.minute == 0 && msf.second <= 1) ? 0 : CDConvertMSFToLBA(msf);
+}
+
+/*
+ * LBA To M:S:F Convenience Function
+ */
+
+static inline CDMSF CDConvertLBAToMSF(UInt32 lba)
+{
+    CDMSF msf;
+
+    lba += 150;
+    msf.minute = (lba / (75 * 60));
+    msf.second = (lba % (75 * 60)) / 75;
+    msf.frame  = (lba % (75     ));
+    
+    return msf;
+}
+
+/*
+ * Track Number To M:S:F Convenience Function
+ *
+ * The CDTOC structure is assumed to be complete, that is, none of
+ * the descriptors are missing or clipped due to an insufficiently
+ * sized buffer holding the CDTOC contents.
+ */
+
+static inline CDMSF CDConvertTrackNumberToMSF(UInt8 track, CDTOC * toc)
+{
+    UInt32 count = CDTOCGetDescriptorCount(toc);
+    UInt32 i;
+    CDMSF  msf   = { 0xFF, 0xFF, 0xFF };
+
+    for (i = 0; i < count; i++)
+    {
+        if (toc->descriptors[i].point == track && toc->descriptors[i].adr == 1)
+        {
+            msf = toc->descriptors[i].p;
+            break;
+        }
+    }
+
+    return msf;
+}
+
+/*
+ * Sector Areas, Sector Types
+ *
+ * Bytes Per Type      CDDA       Mode1      Mode2   Mode2Form1 Mode2Form2
+ *       Per Area  +----------+----------+----------+----------+----------+
+ * Sync            | 0        | 12       | 12       | 12       | 12       |
+ * Header          | 0        | 4        | 4        | 4        | 4        |
+ * SubHeader       | 0        | 0        | 0        | 8        | 8        |
+ * User            | 2352     | 2048     | 2336     | 2048     | 2328     |
+ * Auxiliary       | 0        | 288      | 0        | 280      | 0        |
+ * ErrorFlags      | 294      | 294      | 294      | 294      | 294      |
+ * SubChannel      | 96       | 96       | 96       | 96       | 96       |
+ * SubChannelQ     | 16       | 16       | 16       | 16       | 16       |
+ *                 +----------+----------+----------+----------+----------+
+ */
+
+typedef enum
+{
+    kCDSectorAreaSync        = 0x80,
+    kCDSectorAreaHeader      = 0x20,
+    kCDSectorAreaSubHeader   = 0x40,
+    kCDSectorAreaUser        = 0x10,
+    kCDSectorAreaAuxiliary   = 0x08,
+    kCDSectorAreaErrorFlags  = 0x02,
+    kCDSectorAreaSubChannel  = 0x01,
+    kCDSectorAreaSubChannelQ = 0x04
+} CDSectorArea;
+
+typedef enum
+{
+    kCDSectorTypeUnknown     = 0x00,
+    kCDSectorTypeCDDA        = 0x01,
+    kCDSectorTypeMode1       = 0x02,
+    kCDSectorTypeMode2       = 0x03,
+    kCDSectorTypeMode2Form1  = 0x04,
+    kCDSectorTypeMode2Form2  = 0x05,
+    kCDSectorTypeCount       = 0x06
+} CDSectorType;
+
+typedef enum
+{
+    kCDSectorSizeCDDA        = 2352,
+    kCDSectorSizeMode1       = 2048,
+    kCDSectorSizeMode2       = 2336,
+    kCDSectorSizeMode2Form1  = 2048,
+    kCDSectorSizeMode2Form2  = 2328,
+    kCDSectorSizeWhole       = 2352
+} CDSectorSize;
+
+/*
+ * Media Types
+ */
+
+typedef enum
+{
+    kCDMediaTypeUnknown      = 0x0100,
+    kCDMediaTypeROM          = 0x0102, /* CD-ROM */
+    kCDMediaTypeR            = 0x0104, /* CD-R   */
+    kCDMediaTypeRW           = 0x0105, /* CD-RW  */
+
+    kCDMediaTypeMin          = 0x0100,
+    kCDMediaTypeMax          = 0x01FF
+};
+
+typedef UInt32 CDMediaType;
+
+/*
+ * Media Speed (kB/s)
+ */
+
+#define kCDSpeedMin 0x00B0
+#define kCDSpeedMax 0xFFFF
+
+/*
+ * MMC Formats
+ */
+
+// Read Table Of Contents Format Types
+typedef UInt8 CDTOCFormat;
+enum
+{
+    kCDTOCFormatTOC  = 0x02, // CDTOC
+    kCDTOCFormatPMA  = 0x03, // CDPMA
+    kCDTOCFormatATIP = 0x04, // CDATIP
+    kCDTOCFormatTEXT = 0x05  // CDTEXT
+};
+
+// Read Table Of Contents Format 0x03
+struct CDPMADescriptor
+{
+    UInt8 reserved;
+#ifdef __LITTLE_ENDIAN__
+    UInt8 control:4, adr:4;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8 adr:4, control:4;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8 tno;
+    UInt8 point;
+    CDMSF address;
+    UInt8 zero;
+    CDMSF p;
+};
+typedef struct CDPMADescriptor CDPMADescriptor;
+
+struct CDPMA
+{
+    UInt16          dataLength;
+    UInt8           reserved;
+    UInt8           reserved2;
+    CDPMADescriptor descriptors[0];
+};
+typedef struct CDPMA CDPMA;
+
+// Read Table Of Contents Format 0x04
+struct CDATIP
+{
+    UInt16 dataLength;
+    UInt8  reserved[2];
+#ifdef __LITTLE_ENDIAN__
+    UInt8  referenceSpeed:3;
+    UInt8  reserved3:1;
+    UInt8  indicativeTargetWritingPower:3;
+    UInt8  reserved2:1;
+
+    UInt8  reserved5:6;
+    UInt8  unrestrictedUse:1;
+    UInt8  reserved4:1;
+
+    UInt8  a3Valid:1;
+    UInt8  a2Valid:1;
+    UInt8  a1Valid:1;
+    UInt8  discSubType:3;
+    UInt8  discType:1;
+    UInt8  reserved6:1;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved2:1;
+    UInt8  indicativeTargetWritingPower:3;
+    UInt8  reserved3:1;
+    UInt8  referenceSpeed:3;
+
+    UInt8  reserved4:1;
+    UInt8  unrestrictedUse:1;
+    UInt8  reserved5:6;
+
+    UInt8  reserved6:1;
+    UInt8  discType:1;
+    UInt8  discSubType:3;
+    UInt8  a1Valid:1;
+    UInt8  a2Valid:1;
+    UInt8  a3Valid:1;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved7;
+    CDMSF  startTimeOfLeadIn;
+    UInt8  reserved8;
+    CDMSF  lastPossibleStartTimeOfLeadOut;
+    UInt8  reserved9;
+    UInt8  a1[3];
+    UInt8  reserved10;
+    UInt8  a2[3];
+    UInt8  reserved11;
+    UInt8  a3[3];
+    UInt8  reserved12;
+};
+typedef struct CDATIP CDATIP;
+
+// Read Table Of Contents Format 0x05
+struct CDTEXTDescriptor
+{
+    UInt8 packType;
+    UInt8 trackNumber;
+    UInt8 sequenceNumber;
+#ifdef __LITTLE_ENDIAN__
+    UInt8 characterPosition:4;
+    UInt8 blockNumber:3;
+    UInt8 doubleByteCharacterCode:1;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8 doubleByteCharacterCode:1;
+    UInt8 blockNumber:3;
+    UInt8 characterPosition:4;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8 textData[12];
+    UInt8 reserved[2];
+};
+typedef struct CDTEXTDescriptor CDTEXTDescriptor;
+
+struct CDTEXT
+{
+    UInt16           dataLength;
+    UInt8            reserved;
+    UInt8            reserved2;
+    CDTEXTDescriptor descriptors[0];
+};
+typedef struct CDTEXT CDTEXT;
+
+// Read Disc Information Format
+struct CDDiscInfo
+{
+    UInt16 dataLength;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  discStatus:2;
+    UInt8  stateOfLastSession:2;
+    UInt8  erasable:1;
+    UInt8  reserved:3;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved:3;
+    UInt8  erasable:1;
+    UInt8  stateOfLastSession:2;
+    UInt8  discStatus:2;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  numberOfFirstTrack;
+    UInt8  numberOfSessionsLSB;
+    UInt8  firstTrackNumberInLastSessionLSB;
+    UInt8  lastTrackNumberInLastSessionLSB;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  reserved3:5;
+    UInt8  unrestrictedUse:1;
+    UInt8  discBarCodeValid:1;
+    UInt8  discIdentificationValid:1;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  discIdentificationValid:1;
+    UInt8  discBarCodeValid:1;
+    UInt8  unrestrictedUse:1;
+    UInt8  reserved3:5;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  discType;
+    UInt8  numberOfSessionsMSB;
+    UInt8  firstTrackNumberInLastSessionMSB;
+    UInt8  lastTrackNumberInLastSessionMSB;
+    UInt32 discIdentification;
+    UInt8  reserved7;
+    CDMSF  lastSessionLeadInStartTime;
+    UInt8  reserved8;
+    CDMSF  lastPossibleStartTimeOfLeadOut;
+    UInt8  discBarCode[8];
+    UInt8  reserved9;
+    UInt8  numberOfOPCTableEntries;
+    UInt8  opcTableEntries[0];
+};
+typedef struct CDDiscInfo CDDiscInfo;
+
+// Read Track Information Address Types
+typedef UInt8 CDTrackInfoAddressType;
+enum
+{
+    kCDTrackInfoAddressTypeLBA           = 0x00,
+    kCDTrackInfoAddressTypeTrackNumber   = 0x01,
+    kCDTrackInfoAddressTypeSessionNumber = 0x02,
+};
+
+// Read Track Information Format
+struct CDTrackInfo
+{
+    UInt16 dataLength;
+    UInt8  trackNumberLSB;
+    UInt8  sessionNumberLSB;
+    UInt8  reserved;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  trackMode:4;
+    UInt8  copy:1;
+    UInt8  damage:1;
+    UInt8  reserved3:2;
+
+    UInt8  dataMode:4;
+    UInt8  fixedPacket:1;
+    UInt8  packet:1;
+    UInt8  blank:1;
+    UInt8  reservedTrack:1;
+
+    UInt8  nextWritableAddressValid:1;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  reserved5:6;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved3:2;
+    UInt8  damage:1;
+    UInt8  copy:1;
+    UInt8  trackMode:4;
+
+    UInt8  reservedTrack:1;
+    UInt8  blank:1;
+    UInt8  packet:1;
+    UInt8  fixedPacket:1;
+    UInt8  dataMode:4;
+
+    UInt8  reserved5:6;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  nextWritableAddressValid:1;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt32 trackStartAddress;
+    UInt32 nextWritableAddress;
+    UInt32 freeBlocks;
+    UInt32 fixedPacketSize;
+    UInt32 trackSize;
+    UInt32 lastRecordedAddress;
+    UInt8  trackNumberMSB;
+    UInt8  sessionNumberMSB;
+    UInt8  reserved6;
+    UInt8  reserved7;
+};
+typedef struct CDTrackInfo CDTrackInfo;
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* _IOCDTYPES_H */
diff --git a/i386/include/IOKit/storage/IODVDBlockStorageDevice.h b/i386/include/IOKit/storage/IODVDBlockStorageDevice.h
new file mode 100644
index 0000000..161651c
--- /dev/null
+++ b/i386/include/IOKit/storage/IODVDBlockStorageDevice.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IODVDBlockStorageDevice
+ * @abstract
+ * This header contains the IODVDBlockStorageDevice class definition.
+ */
+
+#ifndef	_IODVDBLOCKSTORAGEDEVICE_H
+#define	_IODVDBLOCKSTORAGEDEVICE_H
+
+#include <IOKit/storage/IODVDTypes.h>
+
+/*!
+ * @defined kIODVDBlockStorageDeviceClass
+ * @abstract
+ * kIODVDBlockStorageDeviceClass is the name of the IODVDBlockStorageDevice class.
+ * @discussion
+ * kIODVDBlockStorageDeviceClass is the name of the IODVDBlockStorageDevice class.
+ */
+
+#define kIODVDBlockStorageDeviceClass "IODVDBlockStorageDevice"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOCDBlockStorageDevice.h>
+
+/* Property used for matching, so the generic driver gets the nub it wants. */
+#define	kIOBlockStorageDeviceTypeDVD	"DVD"
+
+/*!
+ * @class
+ * IODVDBlockStorageDevice : public IOCDBlockStorageDevice
+ * @abstract
+ * The IODVDBlockStorageDevice class is a generic DVD block storage device
+ * abstraction.
+ * @discussion
+ * This class is the protocol for generic DVD functionality, independent of
+ * the physical connection protocol (e.g. SCSI, ATA, USB).
+ *
+ * The APIs are the union of CD APIs and all
+ * necessary new low-level DVD APIs.
+ *
+ * A subclass implements relay methods that translate our requests into
+ * calls to a protocol- and device-specific provider.
+ */
+
+class IODVDBlockStorageDevice : public IOCDBlockStorageDevice {
+
+    OSDeclareAbstractStructors(IODVDBlockStorageDevice)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /* Overrides from IORegistryEntry */
+    
+    virtual bool	init(OSDictionary * properties);
+
+    /* New APIs for DVD */
+
+    virtual IOReturn	reportKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
+                                        const UInt32 lba,const UInt8 agid,const DVDKeyFormat keyFormat)	= 0;
+
+    virtual IOReturn	sendKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
+                                        const UInt8 agid,const DVDKeyFormat keyFormat)	= 0;
+
+#ifdef __LP64__
+    virtual IOReturn	readDVDStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
+                                        const UInt32 address,const UInt8 layer,const UInt8 agid)	= 0;
+#else /* !__LP64__ */
+    virtual IOReturn	readDVDStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
+                                        const UInt32 address,const UInt8 layer,const UInt8 agid); /* 10.1.0 */
+#endif /* !__LP64__ */
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  0);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IODVDBlockStorageDevice,  0);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  1);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  2);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  3);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  4);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  5);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  6);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  7);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  8);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  9);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 10);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 11);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 12);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 13);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 14);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 15);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 16);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 17);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 18);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 19);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 20);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 21);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 22);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 23);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 24);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 25);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 26);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 27);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 28);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 29);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 30);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 31);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IODVDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/IODVDBlockStorageDriver.h b/i386/include/IOKit/storage/IODVDBlockStorageDriver.h
new file mode 100644
index 0000000..d9471f6
--- /dev/null
+++ b/i386/include/IOKit/storage/IODVDBlockStorageDriver.h
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * IODVDBlockStorageDriver.h
+ *
+ * This class implements DVD functionality, independent of
+ * the physical connection protocol (e.g. SCSI, ATA, USB).
+ *
+ * A protocol-specific provider implements the functionality using an appropriate
+ * protocol and commands.
+ */
+
+#ifndef	_IODVDBLOCKSTORAGEDRIVER_H
+#define	_IODVDBLOCKSTORAGEDRIVER_H
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/storage/IOCDBlockStorageDriver.h>
+#include <IOKit/storage/IODVDBlockStorageDevice.h>
+#include <IOKit/storage/IODVDTypes.h>
+
+/*!
+ * @defined kIODVDBlockStorageDriverClass
+ * @abstract
+ * kIODVDBlockStorageDriverClass is the name of the IODVDBlockStorageDriver class.
+ * @discussion
+ * kIODVDBlockStorageDriverClass is the name of the IODVDBlockStorageDriver class.
+ */
+
+#define kIODVDBlockStorageDriverClass "IODVDBlockStorageDriver"
+
+class IODVDBlockStorageDevice;
+
+/*!
+ * @class
+ * IODVDBlockStorageDriver : public IOCDBlockStorageDriver
+ * @abstract
+ * Generic DVD Driver.
+ * @discussion
+ * Storage drivers are split into two parts: the Generic Driver handles
+ * all generic device issues, independent of the lower-level transport
+ * mechanism (e.g. SCSI, ATA, USB, FireWire). All storage operations
+ * at the Generic Driver level are translated into a series of generic
+ * device operations. These operations are passed via the Device Nub
+ * to a Transport Driver, which implements the appropriate
+ * transport-dependent protocol to execute these operations.
+ * 
+ * To determine the write-protect state of a device (or media), for
+ * example, the generic driver would issue a call to the
+ * Transport Driver's reportWriteProtection method. If this were a SCSI
+ * device, its Transport Driver would issue a Mode Sense command to
+ * extract the write-protection status bit. The Transport Driver then
+ * reports true or false to the generic driver.
+ * 
+ * The generic driver therefore has no knowledge of, or involvement
+ * with, the actual commands and mechanisms used to communicate with
+ * the device. It is expected that the generic driver will rarely, if
+ * ever, need to be subclassed to handle device idiosyncrasies; rather,
+ * the Transport Driver should be changed via overrides.
+ * 
+ * A generic driver could be subclassed to create a different type of
+ * generic device. The generic driver IODVDBlockStorageDriver class is a subclass
+ * of IOCDBlockStorageDriver, adding DVD functions. Similarly, the Transport Driver
+ * IODVDBlockStorageDevice is a subclass of IOCDBlockStorageDevice, adding DVD 
+ * functions.
+*/
+
+class IODVDBlockStorageDriver : public IOCDBlockStorageDriver {
+
+    OSDeclareDefaultStructors(IODVDBlockStorageDriver)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    /* Overrides of IOCDBlockStorageDriver. */
+
+    virtual IOReturn	acceptNewMedia(void);
+
+    /* End of IOCDBlockStorageDriver overrides. */
+
+public:
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method to
+     * return a more specific subclass of IOService -- IODVDBlockStorageDevice.
+     * This method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IODVDBlockStorageDevice * getProvider() const;
+
+    /* Overrides of IOCDBlockStorageDriver: */
+
+    virtual const char * getDeviceTypeName(void);
+    virtual IOMedia *	instantiateDesiredMediaObject(void);
+    virtual IOMedia *	instantiateMediaObject(UInt64 base,UInt64 byteSize,
+                                            UInt32 blockSize,char *mediaName);
+
+    /* End of IOCDBlockStorageDriver overrides. */
+
+    /*!
+     * @function reportKey
+     * @abstract
+     * Get key info from the DVD drive.
+     * @discussion
+     * This function handles the getting of key- and encryption-related data for the drive.
+     * @param buffer
+     * A buffer containing information, as documented in the specification
+     * "MtFuji Commands For Multimedia Devices."
+     * @param keyClass
+     * As documented by MtFuji. See DVDKeyClass.
+     * @param lba
+     * As documented by MtFuji.
+     * @param agid
+     * As documented by MtFuji.
+     * @param keyFormat
+     * As documented by MtFuji. See DVDKeyFormat.
+     */
+    virtual IOReturn	reportKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
+                                        const UInt32 lba,const UInt8 agid,const DVDKeyFormat keyFormat);
+
+    /*!
+     * @function sendKey
+     * @abstract
+     * Send key info to the DVD drive.
+     * @discussion
+     * This function handles the setting of key- and encryption-related data for the drive.
+     * @param buffer
+     * A buffer containing information, as documented in the specification
+     * "MtFuji Commands For Multimedia Devices."
+     * @param keyClass
+     * As documented by MtFuji. See DVDKeyClass.
+     * @param agid
+     * As documented by MtFuji.
+     * @param keyFormat
+     * As documented by MtFuji. See DVDKeyFormat.
+     */
+    virtual IOReturn	sendKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
+                                        const UInt8 agid,const DVDKeyFormat keyFormat);
+
+    /*!
+     * @function readStructure
+     * @abstract
+     * Get control structures from the DVD media.
+     * @discussion
+     * This function handles the getting of control structure data for the media.
+     * @param buffer
+     * A buffer containing information, as documented in the specification
+     * "MtFuji Commands For Multimedia Devices."
+     * @param format
+     * As documented by MtFuji. See DVDStructureFormat.
+     * @param address
+     * As documented by MtFuji.
+     * @param layer
+     * As documented by MtFuji.
+     * @param agid
+     * As documented by MtFuji.
+     */
+    virtual IOReturn	readStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
+                                        const UInt32 address,const UInt8 layer,const UInt8 agid); /* 10.1.0 */
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  0);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IODVDBlockStorageDriver,  0);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  1);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  2);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  3);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  4);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  5);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  6);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  7);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  8);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  9);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 10);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 11);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 12);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 13);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 14);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 15);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 16);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 17);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 18);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 19);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 20);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 21);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 22);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 23);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 24);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 25);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 26);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 27);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 28);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 29);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 30);
+    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 31);
+};
+#endif
diff --git a/i386/include/IOKit/storage/IODVDMedia.h b/i386/include/IOKit/storage/IODVDMedia.h
new file mode 100644
index 0000000..02119c3
--- /dev/null
+++ b/i386/include/IOKit/storage/IODVDMedia.h
@@ -0,0 +1,357 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IODVDMedia
+ * @abstract
+ * This header contains the IODVDMedia class definition.
+ */
+
+#ifndef _IODVDMEDIA_H
+#define _IODVDMEDIA_H
+
+/*!
+ * @defined kIODVDMediaClass
+ * @abstract
+ * kIODVDMediaClass is the name of the IODVDMedia class.
+ * @discussion
+ * kIODVDMediaClass is the name of the IODVDMedia class.
+ */
+
+#define kIODVDMediaClass "IODVDMedia"
+
+/*!
+ * @defined kIODVDMediaTypeKey
+ * @abstract
+ * kIODVDMediaTypeKey is a property of IODVDMedia objects.  It has an OSString
+ * value.
+ * @discussion
+ * The kIODVDMediaTypeKey property identifies the DVD media type (DVD-ROM,
+ * DVD-R, DVD-RW, DVD+RW, DVD-RAM, etc).  See the kIODVDMediaType contants
+ * for possible values.
+ */
+
+#define kIODVDMediaTypeKey "Type"
+
+/*!
+ * @defined kIODVDMediaTypeROM
+ * The kIODVDMediaTypeKey constant for DVD-ROM media.
+ */
+
+#define kIODVDMediaTypeROM "DVD-ROM"
+
+/*!
+ * @defined kIODVDMediaTypeR
+ * The kIODVDMediaTypeKey constant for DVD Recordable (DVD-R) media.
+ */
+
+#define kIODVDMediaTypeR "DVD-R"
+
+/*!
+ * @defined kIODVDMediaTypeRW
+ * The kIODVDMediaTypeKey constant for DVD ReWritable (DVD-RW) media.
+ */
+
+#define kIODVDMediaTypeRW "DVD-RW"
+
+/*!
+ * @defined kIODVDMediaTypePlusR
+ * The kIODVDMediaTypeKey constant for DVD "Plus" Recordable (DVD+R) media.
+ */
+
+#define kIODVDMediaTypePlusR "DVD+R"
+
+/*!
+ * @defined kIODVDMediaTypePlusRW
+ * The kIODVDMediaTypeKey constant for DVD "Plus" ReWritable (DVD+RW) media.
+ */
+
+#define kIODVDMediaTypePlusRW "DVD+RW"
+
+/*!
+ * @defined kIODVDMediaTypeRAM
+ * The kIODVDMediaTypeKey constant for DVD-RAM media.
+ */
+
+#define kIODVDMediaTypeRAM "DVD-RAM"
+
+/*!
+ * @defined kIODVDMediaTypeHDROM
+ * The kIODVDMediaTypeKey constant for HD DVD-ROM media.
+ */
+
+#define kIODVDMediaTypeHDROM "HD DVD-ROM"
+
+/*!
+ * @defined kIODVDMediaTypeHDR
+ * The kIODVDMediaTypeKey constant for HD DVD Recordable (HD DVD-R) media.
+ */
+
+#define kIODVDMediaTypeHDR "HD DVD-R"
+
+/*!
+ * @defined kIODVDMediaTypeHDRW
+ * The kIODVDMediaTypeKey constant for HD DVD ReWritable (HD DVD-RW) media.
+ */
+
+#define kIODVDMediaTypeHDRW "HD DVD-RW"
+
+/*!
+ * @defined kIODVDMediaTypeHDRAM
+ * The kIODVDMediaTypeKey constant for HD DVD-RAM media.
+ */
+
+#define kIODVDMediaTypeHDRAM "HD DVD-RAM"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IODVDBlockStorageDriver.h>
+#include <IOKit/storage/IOMedia.h>
+
+/*!
+ * @class IODVDMedia
+ * @abstract
+ * The IODVDMedia class is a random-access disk device abstraction for DVDs.
+ * @discussion
+ * The IODVDMedia class is a random-access disk device abstraction for DVDs.
+ */
+
+class IODVDMedia : public IOMedia
+{
+    OSDeclareDefaultStructors(IODVDMedia)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*
+     * Obtain this object's provider.   We override the superclass's method to
+     * return a more specific subclass of IOService -- IODVDBlockStorageDriver.
+     * This method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IODVDBlockStorageDriver * getProvider() const;
+
+    /*
+     * Compare the properties in the supplied table to this object's properties.
+     */
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
+
+    /*!
+     * @function reportKey
+     * @discussion
+     * Issue an MMC REPORT KEY command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.  Pass null for the kDVDKeyFormatAGID_Invalidate format
+     * case.
+     * @param keyClass
+     * As documented by MMC.
+     * @param address
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @param format
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn reportKey( IOMemoryDescriptor * buffer,
+                                const DVDKeyClass    keyClass,
+                                const UInt32         address,
+                                const UInt8          grantID,
+                                const DVDKeyFormat   format ); /* 10.1.0 */
+
+    /*!
+     * @function sendKey
+     * @discussion
+     * Issue an MMC SEND KEY command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.  Pass null for the kDVDKeyFormatAGID_Invalidate format
+     * case.
+     * @param keyClass
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @param format
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn sendKey( IOMemoryDescriptor * buffer,
+                              const DVDKeyClass    keyClass,
+                              const UInt8          grantID,
+                              const DVDKeyFormat   format ); /* 10.1.0 */
+
+    /*!
+     * @function readStructure
+     * @discussion
+     * Issue an MMC READ DVD STRUCTURE command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param format
+     * As documented by MMC.
+     * @param address
+     * As documented by MMC.
+     * @param layer
+     * As documented by MMC.
+     * @param grantID
+     * As documented by MMC.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readStructure( IOMemoryDescriptor *     buffer,
+                                    const DVDStructureFormat format,
+                                    const UInt32             address,
+                                    const UInt8              layer,
+                                    const UInt8              grantID ); /* 10.1.0 */
+
+    /*!
+     * @function getSpeed
+     * @discussion
+     * Get the current speed used for data transfers.
+     * @param kilobytesPerSecond
+     * Returns the current speed used for data transfers, in kB/s.
+     *
+     * kDVDSpeedMin specifies the minimum speed for all DVD media (1X).
+     * kDVDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond); /* 10.1.0 */
+
+    /*!
+     * @function setSpeed
+     * @discussion
+     * Set the speed to be used for data transfers.
+     * @param kilobytesPerSecond
+     * Speed to be used for data transfers, in kB/s.
+     *
+     * kDVDSpeedMin specifies the minimum speed for all DVD media (1X).
+     * kDVDSpeedMax specifies the maximum speed supported in hardware.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond); /* 10.1.0 */
+
+    /*!
+     * @function readDiscInfo
+     * @discussion
+     * Issue an MMC READ DISC INFORMATION command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readDiscInfo( IOMemoryDescriptor * buffer,
+                                   UInt16 *             actualByteCount ); /* 10.2.0 */
+
+    /*!
+     * @function readRZoneInfo
+     * @discussion
+     * Issue an MMC READ RZONE INFORMATION (READ TRACK INFORMATION) command.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param address
+     * As documented by MMC.
+     * @param addressType
+     * As documented by MMC.
+     * @param actualByteCount
+     * Returns the actual number of bytes transferred in the data transfer.
+     * @result
+     * Returns the status of the data transfer.
+     */
+
+    virtual IOReturn readRZoneInfo( IOMemoryDescriptor *    buffer,
+                                    UInt32                  address,
+                                    DVDRZoneInfoAddressType addressType,
+                                    UInt16 *                actualByteCount ); /* 10.2.0 */
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  0);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  1);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  2);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  3);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  4);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  5);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  6);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  0);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  1);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  2);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  3);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  4);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  5);
+    OSMetaClassDeclareReservedUsed(IODVDMedia,  6);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  7);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  8);
+    OSMetaClassDeclareReservedUnused(IODVDMedia,  9);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 10);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 11);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 12);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 13);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 14);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 15);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 16);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 17);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 18);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 19);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 20);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 21);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 22);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 23);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 24);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 25);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 26);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 27);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 28);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 29);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 30);
+    OSMetaClassDeclareReservedUnused(IODVDMedia, 31);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IODVDMEDIA_H */
diff --git a/i386/include/IOKit/storage/IODVDMediaBSDClient.h b/i386/include/IOKit/storage/IODVDMediaBSDClient.h
new file mode 100644
index 0000000..2258bf6
--- /dev/null
+++ b/i386/include/IOKit/storage/IODVDMediaBSDClient.h
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IODVDMEDIABSDCLIENT_H
+#define _IODVDMEDIABSDCLIENT_H
+
+#include <sys/ioctl.h>
+
+#include <IOKit/storage/IODVDTypes.h>
+
+/*
+ * Definitions
+ *
+ * ioctl                        description
+ * ---------------------------- ------------------------------------------------
+ * DKIOCDVDREADSTRUCTURE        see IODVDMedia::readStructure()  in IODVDMedia.h
+ *
+ * DKIOCDVDREADDISCINFO         see IODVDMedia::readDiscInfo()   in IODVDMedia.h
+ * DKIOCDVDREADRZONEINFO        see IODVDMedia::readRZoneInfo()  in IODVDMedia.h
+ *
+ * DKIOCDVDREPORTKEY            see IODVDMedia::reportKey()      in IODVDMedia.h
+ * DKIOCDVDSENDKEY              see IODVDMedia::sendKey()        in IODVDMedia.h
+ *
+ * DKIOCDVDGETSPEED             see IODVDMedia::getSpeed()       in IODVDMedia.h
+ * DKIOCDVDSETSPEED             see IODVDMedia::setSpeed()       in IODVDMedia.h
+ *
+ *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
+ */
+
+typedef struct
+{
+    uint8_t  format;
+
+    uint8_t  reserved0008[3];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  grantID;
+    uint8_t  layer;
+
+#ifdef __LP64__
+    uint8_t  reserved0080[4];                      /* reserved, clear to zero */
+#endif /* __LP64__ */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_dvd_read_structure_t;
+
+typedef struct
+{
+    uint8_t  format;
+    uint8_t  keyClass;
+
+    uint8_t  reserved0016[2];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  grantID;
+
+#ifdef __LP64__
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_dvd_report_key_t;
+
+typedef struct
+{
+    uint8_t  format;
+    uint8_t  keyClass;
+
+    uint8_t  reserved0016[6];                      /* reserved, clear to zero */
+
+    uint8_t  grantID;
+
+#ifdef __LP64__
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;
+    void *   buffer;
+} dk_dvd_send_key_t;
+
+typedef struct
+{
+#ifdef __LP64__
+    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0000[10];                     /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_dvd_read_disc_info_t;
+
+typedef struct
+{
+    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
+
+    uint32_t address;
+    uint8_t  addressType;
+
+#ifdef __LP64__
+    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
+#endif /* !__LP64__ */
+
+    uint16_t bufferLength;                         /* actual length on return */
+    void *   buffer;
+} dk_dvd_read_rzone_info_t;
+
+#define DKIOCDVDREADSTRUCTURE _IOW('d', 128, dk_dvd_read_structure_t)
+#define DKIOCDVDREPORTKEY     _IOW('d', 129, dk_dvd_report_key_t)
+#define DKIOCDVDSENDKEY       _IOW('d', 130, dk_dvd_send_key_t)
+
+#define DKIOCDVDGETSPEED      _IOR('d', 131, uint16_t)
+#define DKIOCDVDSETSPEED      _IOW('d', 131, uint16_t)
+
+#define DKIOCDVDREADDISCINFO  _IOWR('d', 132, dk_dvd_read_disc_info_t)
+#define DKIOCDVDREADRZONEINFO _IOWR('d', 133, dk_dvd_read_rzone_info_t)
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IODVDMedia.h>
+#include <IOKit/storage/IOMediaBSDClient.h>
+
+/*
+ * Class
+ */
+
+class IODVDMediaBSDClient : public IOMediaBSDClient
+{
+    OSDeclareDefaultStructors(IODVDMediaBSDClient)
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+public:
+
+    /*
+     * Obtain this object's provider.   We override the superclass's method
+     * to return a more specific subclass of IOService -- IODVDMedia.  This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IODVDMedia * getProvider() const;
+
+    /*
+     * Process a DVD-specific ioctl.
+     */
+
+    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
+
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 0);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 1);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 2);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 3);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 4);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 5);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 6);
+    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 7);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IODVDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/IODVDTypes.h b/i386/include/IOKit/storage/IODVDTypes.h
new file mode 100644
index 0000000..039b8fb
--- /dev/null
+++ b/i386/include/IOKit/storage/IODVDTypes.h
@@ -0,0 +1,451 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_IODVDTYPES_H
+#define	_IODVDTYPES_H
+
+#include <IOKit/IOTypes.h>
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/*
+ * Media Types
+ */
+
+enum
+{
+    kDVDMediaTypeUnknown   = 0x0200,
+    kDVDMediaTypeROM       = 0x0202, /* DVD-ROM    */
+    kDVDMediaTypeRAM       = 0x0203, /* DVD-RAM    */
+    kDVDMediaTypeR         = 0x0204, /* DVD-R      */
+    kDVDMediaTypeRW        = 0x0205, /* DVD-RW     */
+    kDVDMediaTypePlusRW    = 0x0206, /* DVD+RW     */
+    kDVDMediaTypePlusR     = 0x0207, /* DVD+R      */
+    kDVDMediaTypeHDROM     = 0x0212, /* HD DVD-ROM */
+    kDVDMediaTypeHDRAM     = 0x0213, /* HD DVD-RAM */
+    kDVDMediaTypeHDR       = 0x0214, /* HD DVD-R   */
+    kDVDMediaTypeHDRW      = 0x0215, /* HD DVD-RW  */
+
+    kDVDMediaTypeMin       = 0x0200,
+    kDVDMediaTypeMax       = 0x02FF
+};
+
+typedef UInt32 DVDMediaType;
+
+/*
+ * Media Speed (kB/s)
+ */
+
+#define kDVDSpeedMin 0x0546
+#define kDVDSpeedMax 0xFFFF
+
+/*
+ * MMC Formats
+ */
+
+typedef UInt8	DVDCPRMRegionCode;
+enum
+{
+	kDVDCPRMRegion1		= 0xFE,
+	kDVDCPRMRegion2		= 0xFD,
+	kDVDCPRMRegion3		= 0xFB,
+	kDVDCPRMRegion4		= 0xF7,
+	kDVDCPRMRegion5		= 0xEF,
+	kDVDCPRMRegion6		= 0xDF
+};
+
+typedef UInt8	DVDRegionalPlaybackControlScheme;
+enum
+{
+	kDVDRegionalPlaybackControlSchemePhase1		= 0x00,
+	kDVDRegionalPlaybackControlSchemePhase2		= 0x01
+};
+
+typedef UInt8	DVDBookType;
+enum
+{
+	kDVDBookTypeROM					= 0x0,
+	kDVDBookTypeRAM					= 0x1,
+	kDVDBookTypeR					= 0x2,
+	kDVDBookTypeRW					= 0x3,
+	kDVDBookTypeHDROM				= 0x4,
+	kDVDBookTypeHDRAM				= 0x5,
+	kDVDBookTypeHDR					= 0x6,
+	kDVDBookTypeHDRW				= 0x7,
+	kDVDBookTypePlusRW				= 0x9,
+	kDVDBookTypePlusR				= 0xA,
+	kDVDBookTypePlusRWDoubleLayer	= 0xD,
+	kDVDBookTypePlusRDoubleLayer	= 0xE
+};
+
+#ifdef __LP64__
+typedef UInt8	DVDKeyClass;
+enum
+#else /* !__LP64__ */
+enum DVDKeyClass
+#endif /* !__LP64__ */
+{
+	kDVDKeyClassCSS_CPPM_CPRM	= 0x00,
+	kDVDKeyClassRSSA			= 0x01
+};
+#ifndef __LP64__
+typedef enum DVDKeyClass DVDKeyClass;
+#endif /* !__LP64__ */
+
+#ifdef __LP64__
+typedef UInt8	DVDKeyFormat;
+enum
+#else /* !__LP64__ */
+enum DVDKeyFormat
+#endif /* !__LP64__ */
+{
+	kDVDKeyFormatAGID_CSS			= 0x00,
+	kDVDKeyFormatChallengeKey		= 0x01,
+	kDVDKeyFormatKey1				= 0x02,
+	kDVDKeyFormatKey2				= 0x03,
+	kDVDKeyFormatTitleKey			= 0x04,
+	kDVDKeyFormatASF				= 0x05,
+	kDVDKeyFormatSetRegion			= 0x06,
+	kDVDKeyFormatRegionState		= 0x08,
+	kDVDKeyFormatAGID_CSS2			= 0x10,
+	kDVDKeyFormatAGID_CPRM			= 0x11,
+	kDVDKeyFormatAGID_Invalidate	= 0x3F
+};	
+#ifndef __LP64__
+typedef enum DVDKeyFormat DVDKeyFormat;
+#endif /* !__LP64__ */
+
+typedef UInt8	DVDStructureFormat;
+enum
+{
+	kDVDStructureFormatPhysicalFormatInfo			= 0x00,
+	kDVDStructureFormatCopyrightInfo				= 0x01,
+	kDVDStructureFormatDiscKeyInfo					= 0x02,
+	// skip BCA
+	kDVDStructureFormatManufacturingInfo			= 0x04
+};
+
+// Read DVD Structures Format 0x00
+struct DVDPhysicalFormatInfo
+{
+	UInt8		dataLength[2];
+	UInt8		reserved[2];
+#ifdef __LITTLE_ENDIAN__
+	// Byte 0
+	UInt8		partVersion:4;
+	UInt8		bookType:4;
+	
+	// Byte 1
+	UInt8		minimumRate:4;
+	UInt8		discSize:4;
+	
+	// Byte 2
+	UInt8		layerType:4;
+	UInt8		trackPath:1;
+	UInt8		numberOfLayers:2;
+	UInt8		reserved2:1;
+	
+	// Byte 3
+	UInt8		trackDensity:4;
+	UInt8		linearDensity:4;
+#else /* !__LITTLE_ENDIAN__ */
+	// Byte 0
+	UInt8		bookType:4;
+	UInt8		partVersion:4;
+	
+	// Byte 1
+	UInt8		discSize:4;
+	UInt8		minimumRate:4;
+	
+	// Byte 2
+	UInt8		reserved2:1;
+	UInt8		numberOfLayers:2;
+	UInt8		trackPath:1;
+	UInt8		layerType:4;
+	
+	// Byte 3
+	UInt8		linearDensity:4;
+	UInt8		trackDensity:4;
+#endif /* !__LITTLE_ENDIAN__ */
+	
+	// Bytes 4-15
+	UInt8		zero1;		// always 0x00
+	UInt8		startingPhysicalSectorNumberOfDataArea[3];
+	UInt8		zero2;		// always 0x00
+	UInt8		endPhysicalSectorNumberOfDataArea[3];
+	UInt8		zero3;		// always 0x00
+	UInt8		endSectorNumberInLayerZero[3];
+	
+	// Byte 16
+#ifdef __LITTLE_ENDIAN__
+	UInt8		reserved1:7;
+	UInt8		bcaFlag:1;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt8		bcaFlag:1;
+	UInt8		reserved1:7;
+#endif /* !__LITTLE_ENDIAN__ */
+	
+	// Bytes 17-2047
+	UInt8		mediaSpecific[2031];
+};
+typedef struct DVDPhysicalFormatInfo DVDPhysicalFormatInfo;
+
+// Read DVD Structures Format 0x01
+struct DVDCopyrightInfo
+{
+	UInt8				dataLength[2];
+	UInt8				reserved[2];
+	UInt8				copyrightProtectionSystemType;
+	DVDCPRMRegionCode	regionMask;
+	UInt8				reserved2[2];
+};
+typedef struct DVDCopyrightInfo DVDCopyrightInfo;
+
+// Read DVD Structures Format 0x02
+struct DVDDiscKeyInfo
+{
+	UInt8		dataLength[2];
+	UInt8		reserved[2];
+	UInt8		discKeyStructures[2048];
+};
+typedef struct DVDDiscKeyInfo DVDDiscKeyInfo;
+
+// Read DVD Structures Format 0x04
+struct DVDManufacturingInfo
+{
+	UInt8		dataLength[2];
+	UInt8		reserved[2];
+	UInt8		discManufacturingInfo[2048];
+};
+typedef struct DVDManufacturingInfo DVDManufacturingInfo;
+
+// ReportKey Format 0x00
+struct DVDAuthenticationGrantIDInfo
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+	UInt8	reserved2[3];
+#ifdef __LITTLE_ENDIAN__
+	UInt8	reservedBits:6;
+	UInt8	grantID:2;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt8	grantID:2;
+	UInt8	reservedBits:6;
+#endif /* !__LITTLE_ENDIAN__ */
+};
+typedef struct DVDAuthenticationGrantIDInfo DVDAuthenticationGrantIDInfo;
+
+// ReportKey and SendKey Format 0x01
+struct DVDChallengeKeyInfo
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+	UInt8	challengeKeyValue[10];
+	UInt8	reserved2[2];
+};
+typedef struct DVDChallengeKeyInfo DVDChallengeKeyInfo;
+
+// ReportKey Format 0x02
+struct DVDKey1Info
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+	UInt8	key1Value[5];
+	UInt8	reserved2[3];
+};
+typedef struct DVDKey1Info DVDKey1Info;
+
+// SendKey Format 0x03
+struct DVDKey2Info
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+	UInt8	key2Value[5];
+	UInt8	reserved2[3];
+};
+typedef struct DVDKey2Info DVDKey2Info;
+
+// ReportKey Format 0x04
+struct DVDTitleKeyInfo
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+#ifdef __LITTLE_ENDIAN__
+	UInt8	CP_MOD:4;
+	UInt8	CGMS:2;
+	UInt8	CP_SEC:1;
+	UInt8	CPM:1;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt8	CPM:1;
+	UInt8	CP_SEC:1;
+	UInt8	CGMS:2;
+	UInt8	CP_MOD:4;
+#endif /* !__LITTLE_ENDIAN__ */
+	UInt8	titleKeyValue[5];
+	UInt8	reserved2[2];
+};
+typedef struct DVDTitleKeyInfo DVDTitleKeyInfo;
+
+// ReportKey Format 0x05
+struct DVDAuthenticationSuccessFlagInfo
+{
+	UInt8	dataLength[2];
+	UInt8	reserved[2];
+	UInt8	reserved2[3];
+#ifdef __LITTLE_ENDIAN__
+	UInt8	successFlag:1;
+	UInt8	reservedBits:7;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt8	reservedBits:7;
+	UInt8	successFlag:1;
+#endif /* !__LITTLE_ENDIAN__ */
+};
+typedef struct DVDAuthenticationSuccessFlagInfo DVDAuthenticationSuccessFlagInfo;
+
+// ReportKey Format 0x08
+struct DVDRegionPlaybackControlInfo
+{
+	UInt8									dataLength[2];
+	UInt8									reserved[2];
+#ifdef __LITTLE_ENDIAN__
+	UInt8									numberUserResets:3;
+	UInt8									numberVendorResets:3;
+	UInt8									typeCode:2;
+#else /* !__LITTLE_ENDIAN__ */
+	UInt8									typeCode:2;
+	UInt8									numberVendorResets:3;
+	UInt8									numberUserResets:3;
+#endif /* !__LITTLE_ENDIAN__ */
+	DVDCPRMRegionCode						driveRegion;
+	DVDRegionalPlaybackControlScheme		rpcScheme;
+	UInt8									reserved2;
+};
+typedef struct DVDRegionPlaybackControlInfo DVDRegionPlaybackControlInfo;
+
+// Read Disc Information Format
+struct DVDDiscInfo
+{
+    UInt16 dataLength;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  discStatus:2;
+    UInt8  stateOfLastBorder:2;
+    UInt8  erasable:1;
+    UInt8  reserved:3;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved:3;
+    UInt8  erasable:1;
+    UInt8  stateOfLastBorder:2;
+    UInt8  discStatus:2;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved2;
+    UInt8  numberOfBordersLSB;
+    UInt8  firstRZoneNumberInLastBorderLSB;
+    UInt8  lastRZoneNumberInLastBorderLSB;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  reserved3:5;
+    UInt8  unrestrictedUse:1;
+    UInt8  discBarCodeValid:1;
+    UInt8  reserved4:1;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved4:1;
+    UInt8  discBarCodeValid:1;
+    UInt8  unrestrictedUse:1;
+    UInt8  reserved3:5;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved5;
+    UInt8  numberOfBordersMSB;
+    UInt8  firstRZoneNumberInLastBorderMSB;
+    UInt8  lastRZoneNumberInLastBorderMSB;
+    UInt8  reserved6[4];
+    UInt8  reserved7[4];
+    UInt8  reserved8[4];
+    UInt8  discBarCode[8];
+    UInt8  reserved9;
+    UInt8  numberOfOPCTableEntries;
+    UInt8  opcTableEntries[0];
+};
+typedef struct DVDDiscInfo DVDDiscInfo;
+
+// Read RZone Information Address Types
+typedef UInt8 DVDRZoneInfoAddressType;
+enum
+{
+    kDVDRZoneInfoAddressTypeLBA          = 0x00,
+    kDVDRZoneInfoAddressTypeRZoneNumber  = 0x01,
+    kDVDRZoneInfoAddressTypeBorderNumber = 0x02,
+};
+
+// Read RZone Information Format
+struct DVDRZoneInfo
+{
+    UInt16 dataLength;
+    UInt8  rzoneNumberLSB;
+    UInt8  borderNumberLSB;
+    UInt8  reserved;
+#ifdef __LITTLE_ENDIAN__
+    UInt8  reserved2:4;
+    UInt8  copy:1;
+    UInt8  damage:1;
+    UInt8  reserved3:2;
+
+    UInt8  reserved4:4;
+    UInt8  restrictedOverwrite:1;
+    UInt8  incremental:1;
+    UInt8  blank:1;
+    UInt8  reservedRZone:1;
+
+    UInt8  nextWritableAddressValid:1;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  reserved5:6;
+#else /* !__LITTLE_ENDIAN__ */
+    UInt8  reserved3:2;
+    UInt8  damage:1;
+    UInt8  copy:1;
+    UInt8  reserved2:4;
+
+    UInt8  reservedRZone:1;
+    UInt8  blank:1;
+    UInt8  incremental:1;
+    UInt8  restrictedOverwrite:1;
+    UInt8  reserved4:4;
+
+    UInt8  reserved5:6;
+    UInt8  lastRecordedAddressValid:1;
+    UInt8  nextWritableAddressValid:1;
+#endif /* !__LITTLE_ENDIAN__ */
+    UInt32 rzoneStartAddress;
+    UInt32 nextWritableAddress;
+    UInt32 freeBlocks;
+    UInt32 blockingFactor;
+    UInt32 rzoneSize;
+    UInt32 lastRecordedAddress;
+    UInt8  rzoneNumberMSB;
+    UInt8  borderNumberMSB;
+    UInt8  reserved6;
+    UInt8  reserved7;
+};
+typedef struct DVDRZoneInfo DVDRZoneInfo;
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* _IODVDTYPES_H */
diff --git a/i386/include/IOKit/storage/IOFDiskPartitionScheme.h b/i386/include/IOKit/storage/IOFDiskPartitionScheme.h
new file mode 100644
index 0000000..7f96255
--- /dev/null
+++ b/i386/include/IOKit/storage/IOFDiskPartitionScheme.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * This header contains the IOFDiskPartitionScheme class definition.
+ */
+
+#ifndef _IOFDISKPARTITIONSCHEME_H
+#define _IOFDISKPARTITIONSCHEME_H
+
+#include <IOKit/IOTypes.h>
+
+/*
+ * kIOFDiskPartitionSchemeClass is the name of the IOFDiskPartitionScheme class.
+ */
+
+#define kIOFDiskPartitionSchemeClass "IOFDiskPartitionScheme"
+
+/*
+ * FDisk Partition Map Definitions
+ */
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/* Structure constants. */
+
+#define DISK_BLK0SZ sizeof(struct disk_blk0)    /* (size of partition map)    */
+#define DISK_BOOTSZ 446                         /* (size of boot code in map) */
+#define DISK_NPART  4                           /* (number of entries in map) */
+
+/* Partition map entry. */
+
+struct fdisk_part
+{
+    UInt8   bootid;    /* (is active boot partition?)                         */
+    UInt8   beghead;   /* (beginning head)                                    */
+    UInt8   begsect;   /* (beginning sector; beginning cylinder, high 2 bits) */
+    UInt8   begcyl;    /* (beginning cylinder, low 8 bits)                    */
+    UInt8   systid;    /* (type)                                              */
+    UInt8   endhead;   /* (ending head)                                       */
+    UInt8   endsect;   /* (ending sector; ending cylinder, high 2 bits)       */
+    UInt8   endcyl;    /* (ending cylinder, low 8 bits)                       */
+    UInt32  relsect;   /* (block start)                                       */
+    UInt32  numsect;   /* (block count)                                       */
+};
+
+/* Partition map, as found in block zero of the disk (or extended partition). */
+
+struct disk_blk0
+{
+    UInt8             bootcode[DISK_BOOTSZ];    /* (boot code)                */
+    struct fdisk_part parts[DISK_NPART];        /* (partition entries)        */
+    UInt16            signature;                /* (unique signature for map) */
+};
+
+/* Partition map signature (signature). */
+
+#define DISK_SIGNATURE 0xAA55
+
+/* Partition map entry types (systid). */
+
+#define FDISK_PARTITION_TYPE_01 "DOS_FAT_12"
+#define FDISK_PARTITION_TYPE_04 "DOS_FAT_16_S"
+#define FDISK_PARTITION_TYPE_06 "DOS_FAT_16"
+#define FDISK_PARTITION_TYPE_07 "Windows_NTFS"
+#define FDISK_PARTITION_TYPE_0B "DOS_FAT_32"
+#define FDISK_PARTITION_TYPE_0C "Windows_FAT_32"
+#define FDISK_PARTITION_TYPE_0E "Windows_FAT_16"
+#define FDISK_PARTITION_TYPE_42 "Windows_LDM"
+#define FDISK_PARTITION_TYPE_82 "Linux_Swap"
+#define FDISK_PARTITION_TYPE_83 "Linux"
+#define FDISK_PARTITION_TYPE_8E "Linux_LVM"
+#define FDISK_PARTITION_TYPE_A5 "FreeBSD"
+#define FDISK_PARTITION_TYPE_A6 "OpenBSD"
+#define FDISK_PARTITION_TYPE_A7 "Apple_Rhapsody_UFS"
+#define FDISK_PARTITION_TYPE_A8 "Apple_UFS"
+#define FDISK_PARTITION_TYPE_A9 "NetBSD"
+#define FDISK_PARTITION_TYPE_AB "Apple_Boot"
+#define FDISK_PARTITION_TYPE_AE "Apple_Encrypted"
+#define FDISK_PARTITION_TYPE_AF "Apple_HFS"
+#define FDISK_PARTITION_TYPE_FD "Linux_RAID"
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* !_IOFDISKPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOFilterScheme.h b/i386/include/IOKit/storage/IOFilterScheme.h
new file mode 100644
index 0000000..406b596
--- /dev/null
+++ b/i386/include/IOKit/storage/IOFilterScheme.h
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOFilterScheme
+ * @abstract
+ * This header contains the IOFilterScheme class definition.
+ */
+
+#ifndef _IOFILTERSCHEME_H
+#define _IOFILTERSCHEME_H
+
+/*!
+ * @defined kIOFilterSchemeClass
+ * @abstract
+ * The name of the IOFilterScheme class.
+ * @discussion
+ * kIOFilterSchemeClass is the name of the IOFilterScheme class.
+ */
+
+#define kIOFilterSchemeClass "IOFilterScheme"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOMedia.h>
+#include <IOKit/storage/IOStorage.h>
+
+/*!
+ * @class IOFilterScheme
+ * @abstract
+ * The common base class for all filter scheme
+ * objects.
+ * @discussion
+ * The IOFilterScheme class is the common base class for all filter scheme
+ * objects.  It extends the IOStorage class by implementing the appropriate
+ * open and close semantics for filter objects (standard semantics are act
+ * as a relay for incoming opens, producing one outgoing open for each
+ * incoming open).  It also implements the default read and write semantics,
+ * which pass all reads and writes through to the provider media unprocessed.
+ * For simple schemes, the default behavior is sufficient.  More complex
+ * filter schemes such as RAID will want to do extra processing for reads
+ * and writes.
+ */
+
+class IOFilterScheme : public IOStorage
+{
+    OSDeclareDefaultStructors(IOFilterScheme);
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    /*!
+     * @function handleOpen
+     * @discussion
+     * The handleOpen method grants or denies permission to access this object
+     * to an interested client.  The argument is an IOStorageAccess value that
+     * specifies the level of access desired -- reader or reader-writer.
+     *
+     * This method can be invoked to upgrade or downgrade the access level for
+     * an existing client as well.  The previous access level will prevail for
+     * upgrades that fail, of course.   A downgrade should never fail.  If the
+     * new access level should be the same as the old for a given client, this
+     * method will do nothing and return success.  In all cases, one, singular
+     * close-per-client is expected for all opens-per-client received.
+     *
+     * This implementation replaces the IOService definition of handleOpen().
+     * @param client
+     * Client requesting the open.
+     * @param options
+     * Options for the open.  Set to zero.
+     * @param access
+     * Access level for the open.  Set to kIOStorageAccessReader or
+     * kIOStorageAccessReaderWriter.
+     * @result
+     * Returns true if the open was successful, false otherwise.
+     */
+
+    virtual bool handleOpen(IOService *  client,
+                            IOOptionBits options,
+                            void *       access);
+
+    /*!
+     * @function handleIsOpen
+     * @discussion
+     * The handleIsOpen method determines whether the specified client, or any
+     * client if none is specified, presently has an open on this object.
+     *
+     * This implementation replaces the IOService definition of handleIsOpen().
+     * @param client
+     * Client to check the open state of.  Set to zero to check the open state
+     * of all clients.
+     * @result
+     * Returns true if the client was (or clients were) open, false otherwise.
+     */
+
+    virtual bool handleIsOpen(const IOService * client) const;
+
+    /*!
+     * @function handleClose
+     * @discussion
+     * The handleClose method closes the client's access to this object.
+     *
+     * This implementation replaces the IOService definition of handleClose().
+     * @param client
+     * Client requesting the close.
+     * @param options
+     * Options for the close.  Set to zero.
+     */
+
+    virtual void handleClose(IOService * client, IOOptionBits options);
+
+public:
+
+    using IOStorage::read;
+    using IOStorage::write;
+
+    /*!
+     * @function read
+     * @discussion
+     * Read data from the storage object at the specified byte offset into the
+     * specified buffer, asynchronously.   When the read completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the read.
+     *
+     * For simple filter schemes, the default behavior is to simply pass the
+     * read through to the provider media.  More complex filter schemes such
+     * as RAID will need to do extra processing here.
+     * @param client
+     * Client requesting the read.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void read(IOService *           client,
+                      UInt64                byteStart,
+                      IOMemoryDescriptor *  buffer,
+                      IOStorageAttributes * attributes,
+                      IOStorageCompletion * completion);
+
+    /*!
+     * @function write
+     * @discussion
+     * Write data into the storage object at the specified byte offset from the
+     * specified buffer, asynchronously.   When the write completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the write.
+     *
+     * For simple filter schemes, the default behavior is to simply pass the
+     * write through to the provider media. More complex filter schemes such
+     * as RAID will need to do extra processing here.
+     * @param client
+     * Client requesting the write.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void write(IOService *           client,
+                       UInt64                byteStart,
+                       IOMemoryDescriptor *  buffer,
+                       IOStorageAttributes * attributes,
+                       IOStorageCompletion * completion);
+
+    /*!
+     * @function synchronizeCache
+     * @discussion
+     * Flush the cached data in the storage object, if any, synchronously.
+     * @param client
+     * Client requesting the cache synchronization.
+     * @result
+     * Returns the status of the cache synchronization.
+     */
+
+    virtual IOReturn synchronizeCache(IOService * client);
+
+    /*!
+     * @function discard
+     * @discussion
+     * Delete unused data from the storage object at the specified byte offset,
+     * synchronously.
+     * @param client
+     * Client requesting the operation.
+     * @param byteStart
+     * Starting byte offset for the operation.
+     * @param byteCount
+     * Size of the operation.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn discard(IOService * client,
+                             UInt64      byteStart,
+                             UInt64      byteCount);
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method
+     * to return a more specific subclass of OSObject -- an IOMedia.  This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOMedia * getProvider() const;
+
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  0);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  1);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  2);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  3);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  4);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  5);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  6);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  7);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  8);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme,  9);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 10);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 11);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 12);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 13);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 14);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 15);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 16);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 17);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 18);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 19);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 20);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 21);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 22);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 23);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 24);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 25);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 26);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 27);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 28);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 29);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 30);
+    OSMetaClassDeclareReservedUnused(IOFilterScheme, 31);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOFILTERSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOFireWireStorageCharacteristics.h b/i386/include/IOKit/storage/IOFireWireStorageCharacteristics.h
new file mode 100644
index 0000000..710f29f
--- /dev/null
+++ b/i386/include/IOKit/storage/IOFireWireStorageCharacteristics.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_
+#define _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_
+
+//
+//	Bridge Characteristics - Characteristics defined for FireWire bridges.
+//
+
+/*!
+@defined kIOPropertyBridgeCharacteristicsKey
+@discussion This key is used to define Bridge Characteristics for a particular
+devices's bridge chipset. It has an associated dictionary which lists the
+bridge characteristics.
+
+Requirement: Optional
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Bridge Characteristics</key>
+	<dict>
+		<key>Bridge Vendor Name</key>
+		<string>Oxford Semiconductor</string>
+		<key>Bridge Model Name</key>
+		<string>FW911</string>
+		<key>Bridge Revision Level</key>
+		<string>3.7</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+
+#define kIOPropertyBridgeCharacteristicsKey		"Bridge Characteristics"
+#define kIOPropertyBridgeVendorNameKey			"Bridge Vendor Name"
+#define kIOPropertyBridgeModelNameKey			"Bridge Model Name"
+#define kIOPropertyBridgeRevisionLevelKey		"Bridge Revision Level"
+
+#endif	/* _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/storage/IOGUIDPartitionScheme.h b/i386/include/IOKit/storage/IOGUIDPartitionScheme.h
new file mode 100644
index 0000000..3e197d0
--- /dev/null
+++ b/i386/include/IOKit/storage/IOGUIDPartitionScheme.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * This header contains the IOGUIDPartitionScheme class definition.
+ */
+
+#ifndef _IOGUIDPARTITIONSCHEME_H
+#define _IOGUIDPARTITIONSCHEME_H
+
+#include <IOKit/IOTypes.h>
+
+typedef unsigned char uuid_t[16];
+/*
+ * kIOGUIDPartitionSchemeClass is the name of the IOGUIDPartitionScheme class.
+ */
+
+#define kIOGUIDPartitionSchemeClass "IOGUIDPartitionScheme"
+
+
+#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
+
+/* Partition map. */
+
+struct gpt_hdr
+{
+    uint8_t  hdr_sig[8];
+    uint32_t hdr_revision;
+    uint32_t hdr_size;
+    uint32_t hdr_crc_self;
+    uint32_t __reserved;
+    uint64_t hdr_lba_self;
+    uint64_t hdr_lba_alt;
+    uint64_t hdr_lba_start;
+    uint64_t hdr_lba_end;
+    uuid_t   hdr_uuid;
+    uint64_t hdr_lba_table;
+    uint32_t hdr_entries;
+    uint32_t hdr_entsz;
+    uint32_t hdr_crc_table;
+    uint32_t padding;
+};
+
+/* Partition map entry. */
+
+struct gpt_ent
+{
+    uuid_t   ent_type;
+    uuid_t   ent_uuid;
+    uint64_t ent_lba_start;
+    uint64_t ent_lba_end;
+    uint64_t ent_attr;
+    uint16_t ent_name[36];
+};
+
+/* Partition map signature (hdr_sig). */
+
+#define GPT_HDR_SIG "EFI PART"
+
+/* Partition map version (hdr_revision). */
+
+#define GPT_HDR_REVISION 0x00010000
+
+/* Partition map entry flags (ent_attr). */
+
+#define GPT_ENT_ATTR_PLATFORM 0x00000001
+
+#pragma pack(pop)                        /* (reset to default struct packing) */
+
+#endif /* !_IOGUIDPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOMedia.h b/i386/include/IOKit/storage/IOMedia.h
new file mode 100644
index 0000000..64052ec
--- /dev/null
+++ b/i386/include/IOKit/storage/IOMedia.h
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOMedia
+ * @abstract
+ * This header contains the IOMedia class definition.
+ */
+
+#ifndef _IOMEDIA_H
+#define _IOMEDIA_H
+
+#include <IOKit/IOTypes.h>
+
+/*!
+ * @defined kIOMediaClass
+ * @abstract
+ * The name of the IOMedia class.
+ */
+
+#define kIOMediaClass "IOMedia"
+
+/*!
+ * @defined kIOMediaContentKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaContentKey property has an OSString
+ * value and contains a description of the media's
+ * contents.  The description is the same as the hint at the time of the
+ * object's creation, but it is possible that the description has been overridden
+ * by a client (which has probed the media and identified the content correctly)
+ * of the media object.  It is more accurate than the hint for this reason.  The
+ * string is formed in the likeness of Apple's "Apple_HFS" strings or in the
+ * likeness of a UUID.
+ */
+
+#define kIOMediaContentKey "Content"
+
+/*!
+ * @defined kIOMediaContentHintKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaContentHintKey property has an OSString
+ * value and contains a hint of the media's contents.
+ * The hint is set at the time of the object's creation, should the creator have
+ * a clue as to what it may contain.  The hint string does not change for the
+ * lifetime of the object and is formed in the likeness of Apple's "Apple_HFS"
+ * strings or in the likeness of a UUID.
+ */
+
+#define kIOMediaContentHintKey "Content Hint"
+
+/*!
+ * @defined kIOMediaEjectableKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaEjectableKey property has an OSBoolean
+ * value and describes whether the media is ejectable
+ * from the drive mechanism under software control.  Implies IOMediaRemovable
+ * is also true.
+ */
+
+#define kIOMediaEjectableKey "Ejectable"
+
+/*!
+ * @defined kIOMediaLeafKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaLeafKey property has an OSBoolean value and describes whether the media is a leaf, that is,
+ * it is the deepest media object in this branch of the I/O Registry.
+ */
+
+#define kIOMediaLeafKey "Leaf"
+
+/*!
+ * @defined kIOMediaOpenKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaOpenKey property has an OSBoolean value and describes whether
+ * a client presently has an open on this media.
+ */
+
+#define kIOMediaOpenKey "Open"
+
+/*!
+ * @defined kIOMediaPreferredBlockSizeKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaPreferredBlockSizeKey property has an
+ * OSNumber value and describes the media's natural
+ * block size in bytes.  This information is useful to clients that want to
+ * optimize access to the media.
+ */
+
+#define kIOMediaPreferredBlockSizeKey "Preferred Block Size"
+
+/*!
+ * @defined kIOMediaRemovableKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaRemovableKey property has an OSBoolean
+ * value and describes whether the media is removable
+ * from the drive mechanism.
+ */
+
+#define kIOMediaRemovableKey "Removable"
+
+/*!
+ * @defined kIOMediaSizeKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaSizeKey property has an OSNumber value and describes the total length of the media in
+ * bytes.
+ */
+
+#define kIOMediaSizeKey "Size"
+
+/*!
+ * @defined kIOMediaUUIDKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaUUIDKey property has an OSString value and contains a persistent
+ * Universal Unique Identifier for the media if such an identifier is available.
+ */
+
+#define kIOMediaUUIDKey "UUID"
+
+/*!
+ * @defined kIOMediaWholeKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaWholeKey property has an OSBoolean
+ * value and describes whether the media is whole, that is,
+ * it represents the whole disk (the physical disk, or a virtual replica
+ * thereof).
+ */
+
+#define kIOMediaWholeKey "Whole"
+
+/*!
+ * @defined kIOMediaWritableKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaWritableKey property has an OSBoolean
+ * value and describes whether the media is writable.
+ */
+
+#define kIOMediaWritableKey "Writable"
+
+/*!
+ * @defined kIOMediaContentMaskKey
+ * @abstract
+ * A property of IOMedia clients.
+ * @discussion
+ * The kIOMediaContentMaskKey property has an OSString
+ * value and must exist in all IOMedia clients that
+ * drive new content (that is, produce new media objects).  When the client
+ * matches against the provider media, the value of the client's
+ * kIOMediaContentMaskKey property is used to replace the provider's
+ * kIOMediaContentKey property.
+ */
+
+#define kIOMediaContentMaskKey "Content Mask"
+
+/*!
+ * @defined kIOMediaIconKey
+ * @abstract
+ * A property of any object in the media stack.
+ * @discussion
+ * kIOMediaIconKey is a property of any object in the media stack that wishes
+ * to override the default icon shown for the media objects in the stack.  It
+ * is usually defined in a provider object below the media object.  It has an
+ * OSDictionary value, with properties identical to the kIOIconKey definition,
+ * that is, kCFBundleIdentifierKey and kIOBundleResourceFileKey.
+ */
+
+#define kIOMediaIconKey "IOMediaIcon"
+
+/*!
+ * @enum IOMediaAttributeMask
+ * @discussion
+ * The IOMediaAttributeMask bit mask describes various attributes of
+ * the media object, such as its ejectability and its removability.
+ * @constant kIOMediaAttributeEjectableMask
+ * Indicates whether the media is ejectable from the drive mechanism
+ * under software control.  Implies kIOMediaAttributeRemovableMask.
+ * @constant kIOMediaAttributeRemovableMask
+ * Indicates whether the media is removable from the drive mechanism.
+ */
+
+enum
+{
+    kIOMediaAttributeEjectableMask = 0x00000001,
+    kIOMediaAttributeRemovableMask = 0x00000002,
+    kIOMediaAttributeReservedMask  = 0xFFFFFFFC
+};
+
+typedef UInt32 IOMediaAttributeMask;
+
+#endif /* !_IOMEDIA_H */
diff --git a/i386/include/IOKit/storage/IOMediaBSDClient.h b/i386/include/IOKit/storage/IOMediaBSDClient.h
new file mode 100644
index 0000000..56a3117
--- /dev/null
+++ b/i386/include/IOKit/storage/IOMediaBSDClient.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOMEDIABSDCLIENT_H
+#define _IOMEDIABSDCLIENT_H
+
+#include <sys/disk.h>
+
+#endif /* !_IOMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/IOPartitionScheme.h b/i386/include/IOKit/storage/IOPartitionScheme.h
new file mode 100644
index 0000000..7a1de37
--- /dev/null
+++ b/i386/include/IOKit/storage/IOPartitionScheme.h
@@ -0,0 +1,373 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOPartitionScheme
+ * @abstract
+ * This header contains the IOPartitionScheme class definition.
+ */
+
+#ifndef _IOPARTITIONSCHEME_H
+#define _IOPARTITIONSCHEME_H
+
+/*!
+ * @defined kIOPartitionSchemeClass
+ * @abstract
+ * The name of the IOPartitionScheme class.
+ * @discussion
+ * kIOPartitionSchemeClass is the name of the IOPartitionScheme class.
+ */
+
+#define kIOPartitionSchemeClass "IOPartitionScheme"
+
+/*!
+ * @defined kIOMediaLiveKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaLiveKey property has an OSBoolean
+ * value and is placed into an IOMedia instance
+ * created via the partition scheme.  It describes whether the
+ * partition is live, that is, it is up-to-date with respect
+ * to the on-disk partition table.
+ */
+
+#define kIOMediaLiveKey "Live"
+
+/*!
+ * @defined kIOMediaPartitionIDKey
+ * @abstract
+ * A property of IOMedia objects.
+ * @discussion
+ * The kIOMediaPartitionIDKey property has an OSNumber
+ * value and is placed into an IOMedia instance
+ * created via the partition scheme.  It is an ID that differentiates one 
+ * partition from the other (within a given scheme).  It is typically an index
+ * into the on-disk partition table.
+ */
+
+#define kIOMediaPartitionIDKey "Partition ID"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/storage/IOMedia.h>
+#include <IOKit/storage/IOStorage.h>
+
+/*!
+ * @class IOPartitionScheme
+ * @abstract
+ * The common base class for all partition scheme
+ * objects.
+ * @discussion
+ * The IOPartitionScheme class is the common base class for all partition scheme
+ * objects.  It extends the IOStorage class by implementing the appropriate open
+ * and close semantics for partition objects (standard semantics are to act as a
+ * multiplexor for incoming opens,  producing one outgoing open with the correct
+ * access).  It also implements the default read and write semantics, which pass
+ * all reads and writes through to the provider media unprocessed.    For simple
+ * schemes, the default behavior is sufficient.   More complex partition schemes
+ * such as RAID will want to do extra processing for reads and writes.
+ */
+
+class IOPartitionScheme : public IOStorage
+{
+    OSDeclareDefaultStructors(IOPartitionScheme);
+
+protected:
+
+    struct ExpansionData { /* */ };
+    ExpansionData * _expansionData;
+
+    IOStorageAccess _openLevel;
+    OSSet *         _openReaders;
+    OSSet *         _openReaderWriters;
+
+    /*
+     * Free all of this object's outstanding resources.
+     */
+
+    virtual void free();
+
+    /*!
+     * @function handleOpen
+     * @discussion
+     * The handleOpen method grants or denies permission to access this object
+     * to an interested client.  The argument is an IOStorageAccess value that
+     * specifies the level of access desired -- reader or reader-writer.
+     *
+     * This method can be invoked to upgrade or downgrade the access level for
+     * an existing client as well.  The previous access level will prevail for
+     * upgrades that fail, of course.   A downgrade should never fail.  If the
+     * new access level should be the same as the old for a given client, this
+     * method will do nothing and return success.  In all cases, one, singular
+     * close-per-client is expected for all opens-per-client received.
+     *
+     * This implementation replaces the IOService definition of handleOpen().
+     * @param client
+     * Client requesting the open.
+     * @param options
+     * Options for the open.  Set to zero.
+     * @param access
+     * Access level for the open.  Set to kIOStorageAccessReader or
+     * kIOStorageAccessReaderWriter.
+     * @result
+     * Returns true if the open was successful, false otherwise.
+     */
+
+    virtual bool handleOpen(IOService *  client,
+                            IOOptionBits options,
+                            void *       access);
+
+    /*!
+     * @function handleIsOpen
+     * @discussion
+     * The handleIsOpen method determines whether the specified client, or any
+     * client if none is specified, presently has an open on this object.
+     *
+     * This implementation replaces the IOService definition of handleIsOpen().
+     * @param client
+     * Client to check the open state of.  Set to zero to check the open state
+     * of all clients.
+     * @result
+     * Returns true if the client was (or clients were) open, false otherwise.
+     */
+
+    virtual bool handleIsOpen(const IOService * client) const;
+
+    /*!
+     * @function handleClose
+     * @discussion
+     * The handleClose method closes the client's access to this object.
+     *
+     * This implementation replaces the IOService definition of handleClose().
+     * @param client
+     * Client requesting the close.
+     * @param options
+     * Options for the close.  Set to zero.
+     */
+
+    virtual void handleClose(IOService * client, IOOptionBits options);
+
+    /*
+     * Attach the given media object to the device tree plane.
+     */
+
+#ifdef __LP64__
+    virtual bool attachMediaObjectToDeviceTree(IOMedia * media);
+#else /* !__LP64__ */
+    virtual bool attachMediaObjectToDeviceTree(IOMedia *    media,
+                                               IOOptionBits options = 0); /* 10.5.0 */
+#endif /* !__LP64__ */
+
+    /*
+     * Detach the given media object from the device tree plane.
+     */
+
+#ifdef __LP64__
+    virtual void detachMediaObjectFromDeviceTree(IOMedia * media);
+#else /* !__LP64__ */
+    virtual void detachMediaObjectFromDeviceTree(IOMedia *    media,
+                                                 IOOptionBits options = 0); /* 10.5.0 */
+#endif /* !__LP64__ */
+
+    /*
+     * Updates a set of existing partitions, represented by partitionsOld,
+     * with possible updates from a rescan of the disk, represented by
+     * partitionsNew.  It returns a new set of partitions with the results,
+     * removing partitions from partitionsOld where applicable, adding
+     * partitions from partitionsNew where applicable, and folding in property
+     * changes to partitions from partitionsNew into partitionsOld where
+     * applicable.
+     */
+
+    virtual OSSet * juxtaposeMediaObjects(OSSet * partitionsOld,
+                                          OSSet * partitionsNew); /* 10.5.0 */
+
+public:
+
+    using IOStorage::read;
+    using IOStorage::write;
+
+    /*
+     * Initialize this object's minimal state.
+     */
+
+    virtual bool init(OSDictionary * properties = 0);
+
+    /*!
+     * @function read
+     * @discussion
+     * Read data from the storage object at the specified byte offset into the
+     * specified buffer, asynchronously.   When the read completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the read.
+     *
+     * For simple partition schemes, the default behavior is to simply pass the
+     * read through to the provider media.  More complex partition schemes such
+     * as RAID will need to do extra processing here.
+     * @param client
+     * Client requesting the read.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void read(IOService *           client,
+                      UInt64                byteStart,
+                      IOMemoryDescriptor *  buffer,
+                      IOStorageAttributes * attributes,
+                      IOStorageCompletion * completion);
+
+    /*!
+     * @function write
+     * @discussion
+     * Write data into the storage object at the specified byte offset from the
+     * specified buffer, asynchronously.   When the write completes, the caller
+     * will be notified via the specified completion action.
+     *
+     * The buffer will be retained for the duration of the write.
+     *
+     * For simple partition schemes, the default behavior is to simply pass the
+     * write through to the provider media. More complex partition schemes such
+     * as RAID will need to do extra processing here.
+     * @param client
+     * Client requesting the write.
+     * @param byteStart
+     * Starting byte offset for the data transfer.
+     * @param buffer
+     * Buffer for the data transfer.  The size of the buffer implies the size of
+     * the data transfer.
+     * @param attributes
+     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     * @param completion
+     * Completion routine to call once the data transfer is complete.  It is the
+     * responsibility of the callee to maintain the information for the duration
+     * of the data transfer, as necessary.
+     */
+
+    virtual void write(IOService *           client,
+                       UInt64                byteStart,
+                       IOMemoryDescriptor *  buffer,
+                       IOStorageAttributes * attributes,
+                       IOStorageCompletion * completion);
+
+    /*!
+     * @function synchronizeCache
+     * @discussion
+     * Flush the cached data in the storage object, if any, synchronously.
+     * @param client
+     * Client requesting the cache synchronization.
+     * @result
+     * Returns the status of the cache synchronization.
+     */
+
+    virtual IOReturn synchronizeCache(IOService * client);
+
+    /*!
+     * @function discard
+     * @discussion
+     * Delete unused data from the storage object at the specified byte offset,
+     * synchronously.
+     * @param client
+     * Client requesting the operation.
+     * @param byteStart
+     * Starting byte offset for the operation.
+     * @param byteCount
+     * Size of the operation.
+     * @result
+     * Returns the status of the operation.
+     */
+
+    virtual IOReturn discard(IOService * client,
+                             UInt64      byteStart,
+                             UInt64      byteCount);
+
+    /*
+     * Obtain this object's provider.  We override the superclass's method
+     * to return a more specific subclass of OSObject -- an IOMedia.  This
+     * method serves simply as a convenience to subclass developers.
+     */
+
+    virtual IOMedia * getProvider() const;
+
+#ifdef __LP64__
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  0);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  1);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  2);
+#else /* !__LP64__ */
+    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  0);
+    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  1);
+    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  2);
+#endif /* !__LP64__ */
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  3);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  4);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  5);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  6);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  7);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  8);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  9);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 10);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 11);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 12);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 13);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 14);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 15);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 16);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 17);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 18);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 19);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 20);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 21);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 22);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 23);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 24);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 25);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 26);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 27);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 28);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 29);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 30);
+    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 31);
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOStorage.h b/i386/include/IOKit/storage/IOStorage.h
new file mode 100644
index 0000000..d5725c2
--- /dev/null
+++ b/i386/include/IOKit/storage/IOStorage.h
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+ * @header IOStorage
+ * @abstract
+ * This header contains the IOStorage class definition.
+ */
+
+#ifndef _IOSTORAGE_H
+#define _IOSTORAGE_H
+
+#include <IOKit/IOTypes.h>
+
+/*!
+ * @defined kIOStorageClass
+ * @abstract
+ * The name of the IOStorage class.
+ */
+
+#define kIOStorageClass "IOStorage"
+
+/*!
+ * @defined kIOStorageCategory
+ * @abstract
+ * kIOStorageCategory is a value for IOService's kIOMatchCategoryKey property.
+ * @discussion
+ * The kIOStorageCategory value is the standard value for the IOService property
+ * kIOMatchCategoryKey ("IOMatchCategory") for all storage drivers.  All storage
+ * objects that expect to drive new content (that is, produce new media objects)
+ * are expected to compete within the kIOStorageCategory namespace.
+ *
+ * See the IOService documentation for more information on match categories.
+ */
+
+#define kIOStorageCategory "IOStorage"                /* (as IOMatchCategory) */
+
+/*!
+ * @defined kIOStorageFeaturesKey
+ * @abstract
+ * A property of any object in the storage stack.
+ * @discussion
+ * kIOStorageFeaturesKey is a property of any object in the storage stack that
+ * wishes to express support of additional features, such as Force Unit Access.
+ * It is typically defined in the device object below the block storage driver
+ * object.  It has an OSDictionary value, where each entry describes one given
+ * feature.
+ */
+
+#define kIOStorageFeaturesKey "IOStorageFeatures"
+
+/*!
+ * @defined kIOStorageFeatureDiscard
+ * @abstract
+ * Describes the presence of the Discard feature.
+ * @discussion
+ * This property describes the ability of the storage stack to delete unused
+ * data from the media.  It is one of the feature entries listed under the top-
+ * level kIOStorageFeaturesKey property table.  It has an OSBoolean value.
+ */
+
+#define kIOStorageFeatureDiscard "Discard"
+
+/*!
+ * @defined kIOStorageFeatureForceUnitAccess
+ * @abstract
+ * Describes the presence of the Force Unit Access feature.
+ * @discussion
+ * This property describes the ability of the storage stack to force a request
+ * to access the media.  It is one of the feature entries listed under the top-
+ * level kIOStorageFeaturesKey property table.  It has an OSBoolean value.
+ */
+
+#define kIOStorageFeatureForceUnitAccess "Force Unit Access"
+
+#ifdef KERNEL
+#ifdef __cplusplus
+
+/*
+ * Kernel
+ */
+
+#include <IOKit/assert.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOService.h>
+
+/*!
+ * @enum IOStorageAccess
+ * @discussion
+ * The IOStorageAccess enumeration describes the possible access levels for open
+ * requests.
+ * @constant kIOStorageAccessNone
+ * No access is requested; should not be passed to open().
+ * @constant kIOStorageAccessReader
+ * Read-only access is requested.
+ * @constant kIOStorageAccessReaderWriter
+ * Read and write access is requested.
+ * @constant kIOStorageAccessSharedLock
+ * Shared access is requested.
+ * @constant kIOStorageAccessExclusiveLock
+ * Exclusive access is requested.
+ */
+
+enum
+{
+    kIOStorageAccessNone          = 0x00,
+    kIOStorageAccessReader        = 0x01,
+    kIOStorageAccessReaderWriter  = 0x03,
+    kIOStorageAccessSharedLock    = 0x04,
+    kIOStorageAccessExclusiveLock = 0x08
+};
+
+typedef UInt32 IOStorageAccess;
+
+/*!
+ * @enum IOStorageOptions
+ * @discussion
+ * Options for read and write storage requests.
+ * @constant kIOStorageOptionForceUnitAccess
+ * Force the request to access the media.
+ */
+
+enum
+{
+    kIOStorageOptionNone            = 0x00000000,
+    kIOStorageOptionForceUnitAccess = 0x00000001,
+    kIOStorageOptionReserved        = 0xFFFFFFFE
+};
+
+typedef UInt32 IOStorageOptions;
+
+/*!
+ * @struct IOStorageAttributes
+ * @discussion
+ * Attributes of read and write storage requests.
+ * @field options
+ * Options for the request.  See IOStorageOptions.
+ * @field reserved
+ * Reserved for future use.  Set to zero.
+ */
+
+struct IOStorageAttributes
+{
+    IOStorageOptions options;
+    UInt32           reserved0032;
+    UInt64           reserved0064;
+#ifdef __LP64__
+    UInt64           reserved0128;
+    UInt64           reserved0192;
+#endif /* __LP64__ */
+};
+
+/*!
+ * @typedef IOStorageCompletionAction
+ * @discussion
+ * The IOStorageCompletionAction declaration describes the C (or C++) completion
+ * routine that is called once an asynchronous storage operation completes.
+ * @param target
+ * Opaque client-supplied pointer (or an instance pointer for a C++ callback).
+ * @param parameter
+ * Opaque client-supplied pointer.
+ * @param status
+ * Status of the data transfer.
+ * @param actualByteCount
+ * Actual number of bytes transferred in the data transfer.
+ */
+
+typedef void (*IOStorageCompletionAction)(void *   target,
+                                          void *   parameter,
+                                          IOReturn status,
+                                          UInt64   actualByteCount);
+
+/*!
+ * @struct IOStorageCompletion
+ * @discussion
+ * The IOStorageCompletion structure describes the C (or C++) completion routine
+ * that is called once an asynchronous storage operation completes.   The values
+ * passed for the target and parameter fields will be passed to the routine when
+ * it is called.
+ * @field target
+ * Opaque client-supplied pointer (or an instance pointer for a C++ callback).
+ * @field action
+ * Completion routine to call on completion of the data transfer.
+ * @field parameter
+ * Opaque client-supplied pointer.
+ */
+
+struct IOStorageCompletion
+{
+    void *                    target;
+    IOStorageCompletionAction action;
+    void *                    parameter;
+};
+
+#endif /* __cplusplus */
+#endif /* KERNEL */
+#endif /* !_IOSTORAGE_H */
diff --git a/i386/include/IOKit/storage/IOStorageDeviceCharacteristics.h b/i386/include/IOKit/storage/IOStorageDeviceCharacteristics.h
new file mode 100644
index 0000000..19a73a2
--- /dev/null
+++ b/i386/include/IOKit/storage/IOStorageDeviceCharacteristics.h
@@ -0,0 +1,659 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_
+#define _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_
+
+#include <IOKit/storage/IOStorageProtocolCharacteristics.h>
+
+/*
+ *	Device Characteristics - Characteristics defined for devices.
+ */
+
+/*!
+@defined kIOPropertyDeviceCharacteristicsKey
+@discussion This key is used to define Device Characteristics for a particular
+device and it has an associated dictionary which lists the
+device characteristics. The device characteristics are Command Set specific
+and are listed in the header files for each command set.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyDeviceCharacteristicsKey		"Device Characteristics"
+
+
+/*!
+@defined kIOPropertyVendorNameKey
+@discussion This key is used to define the Vendor Name for a particular device
+and it has an associated string.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyVendorNameKey				"Vendor Name"
+
+
+/*!
+@defined kIOPropertyProductNameKey
+@discussion This key is used to define the Product Name for a particular device
+and it has an associated string.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyProductNameKey				"Product Name"
+
+
+/*!
+@defined kIOPropertyProductRevisionLevelKey
+@discussion This key is used to define the Product Revision Level for a
+particular device and it has an associated string.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyProductRevisionLevelKey		"Product Revision Level"
+
+
+/*!
+@defined kIOPropertyProductSerialNumberKey
+@discussion This key is used to define the Product Serial Number for a
+particular device and it has an associated data.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Serial Number</key>
+		<string>123456789</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyProductSerialNumberKey		"Serial Number"
+
+
+/*!
+@defined kIOPropertySupportedCDFeaturesKey
+@discussion This key is used to define the supported CD Features for a
+particular optical device and it has an associated bitfield. See
+<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
+bits and associated bitmasks.
+
+Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>SuperDrive</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>CD Features</key>
+		<integer>1663</integer>
+		<key>DVD Features</key>
+		<integer>103</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySupportedCDFeaturesKey		"CD Features"
+
+
+/*!
+@defined kIOPropertySupportedDVDFeaturesKey
+@discussion This key is used to define the supported DVD Features for a
+particular optical device and it has an associated bitfield. See
+<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
+bits and associated bitmasks.
+
+Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>SuperDrive</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>CD Features</key>
+		<integer>1663</integer>
+		<key>DVD Features</key>
+		<integer>103</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySupportedDVDFeaturesKey		"DVD Features"
+
+
+/*!
+@defined kIOPropertySupportedBDFeaturesKey
+@discussion This key is used to define the supported BD Features for a
+particular optical device and it has an associated bitfield. See
+<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
+bits and associated bitmasks.
+
+Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>SuperDrive</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>CD Features</key>
+		<integer>1663</integer>
+		<key>DVD Features</key>
+		<integer>103</integer>
+		<key>BD Features</key>
+		<integer>21</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySupportedBDFeaturesKey		"BD Features"
+
+
+/*!
+@defined kIOPropertyRigidDiskGeometryKey
+@discussion This key is used to define a dictionary containing
+rigid disk geometry information.
+
+Requirement: Optional. If a device publishes this dictionary, it
+must publish all key/value pairs which are deemed Mandatory.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Rigid Disk Geometry</key>
+		<dict>
+			<key>Sector Count per Track</key>
+			<integer>12345</integer>
+			<key>Head Count</key>
+			<integer>12</integer>
+			<key>Cylinder Count</key>
+			<integer>12345</integer>
+			<key>Bytes per Physical Sector</key>
+			<integer>512</integer>
+		</dict>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyRigidDiskGeometryKey			"Rigid Disk Geometry"
+
+
+/*!
+@defined kIOPropertySectorCountPerTrackKey
+@discussion This key is used to define the number of sectors per
+each track for a particular medium.
+
+Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Rigid Disk Geometry</key>
+		<dict>
+			<key>Sector Count per Track</key>
+			<integer>12345</integer>
+		</dict>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySectorCountPerTrackKey		"Sector Count per Track"
+
+
+/*!
+@defined kIOPropertyHeadCountKey
+@discussion This key is used to define the number of heads for
+a particular medium.
+
+Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Rigid Disk Geometry</key>
+		<dict>
+			<key>Sector Count per Track</key>
+			<integer>12345</integer>
+			<key>Head Count</key>
+			<integer>12</integer>
+			<key>Cylinder Count</key>
+			<integer>12345</integer>
+			<key>Bytes per Physical Sector</key>
+			<integer>512</integer>
+		</dict>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyHeadCountKey					"Head Count"
+
+
+/*!
+@defined kIOPropertyCylinderCountKey
+@discussion This key is used to define the number of heads for
+a particular medium.
+
+Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Rigid Disk Geometry</key>
+		<dict>
+			<key>Sector Count per Track</key>
+			<integer>12345</integer>
+			<key>Head Count</key>
+			<integer>12</integer>
+			<key>Cylinder Count</key>
+			<integer>12345</integer>
+			<key>Bytes per Physical Sector</key>
+			<integer>512</integer>
+		</dict>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyCylinderCountKey				"Cylinder Count"
+
+
+/*!
+@defined kIOPropertyBytesPerPhysicalSectorKey
+@discussion This key is used to define the number of heads for
+a particular medium.
+
+Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Rigid Disk Geometry</key>
+		<dict>
+			<key>Sector Count per Track</key>
+			<integer>12345</integer>
+			<key>Head Count</key>
+			<integer>12</integer>
+			<key>Cylinder Count</key>
+			<integer>12345</integer>
+			<key>Bytes per Physical Sector</key>
+			<integer>512</integer>
+		</dict>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyBytesPerPhysicalSectorKey	"Bytes per Physical Sector"
+
+
+/*!
+@defined kIOPropertyPhysicalBlockSizeKey
+@discussion This key is used to define the physical block size of a hard disk drive.
+
+Requirement: Mandatory for hard disk drives with physical block size other than 512 bytes.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Physical Block Size</key>
+		<integer>4096</integer>
+		<key>Logical Block Size</key>
+		<integer>512</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalBlockSizeKey		"Physical Block Size"
+
+
+/*!
+@defined kIOPropertyLogicalBlockSizeKey
+@discussion This key is used to define the logical block size of a hard disk drive.
+
+Requirement: Mandatory for hard disk drives with logical block size other than 512 bytes
+or that does not match its physical block size.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>Apple</string>
+		<key>Product Name</key>
+		<string>iPod</string>
+		<key>Product Revision Level</key>
+		<string>1.0</string>
+		<key>Physical Block Size</key>
+		<integer>4096</integer>
+		<key>Logical Block Size</key>
+		<integer>512</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyLogicalBlockSizeKey		"Logical Block Size"
+
+
+/*!
+@defined kIOPropertyTargetDiskModeKey
+@discussion This key is used to indicate the device is another computer in Target Disk Mode.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>AAPL</string>
+		<key>Product Name</key>
+		<string>FireWire Target</string>
+		<key>Product Revision Level</key>
+		<string>0000</string>
+		<key>Target Disk Mode</key>
+		<true/>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyTargetDiskModeKey		"Target Disk Mode"
+
+
+/*!
+@defined kIOPropertyMediumTypeKey
+@discussion This key is used to indicate the medium type of the device.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>AAPL</string>
+		<key>Product Name</key>
+		<string>FireWire Target</string>
+		<key>Product Revision Level</key>
+		<string>0000</string>
+		<key>Medium Type</key>
+		<string>Rotational</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyMediumTypeKey		"Medium Type"
+
+
+/*!
+@defined kIOPropertyMediumTypeRotationalKey
+@discussion This key is used to indicate the medium type of the device is rotational.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>AAPL</string>
+		<key>Product Name</key>
+		<string>FireWire Target</string>
+		<key>Product Revision Level</key>
+		<string>0000</string>
+		<key>Medium Type</key>
+		<string>Rotational</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyMediumTypeRotationalKey		"Rotational"
+
+
+/*!
+@defined kIOPropertyMediumTypeSolidStateKey
+@discussion This key is used to indicate the medium type of the device is solid state.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>AAPL</string>
+		<key>Product Name</key>
+		<string>FireWire Target</string>
+		<key>Product Revision Level</key>
+		<string>0000</string>
+		<key>Medium Type</key>
+		<string>Solid State</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyMediumTypeSolidStateKey		"Solid State"
+
+
+/*!
+@defined kIOPropertyMediumRotationRateKey
+@discussion This key is used to indicate the medium rotation rate in RPM of the device.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Device Characteristics</key>
+	<dict>
+		<key>Vendor Name</key>
+		<string>AAPL</string>
+		<key>Product Name</key>
+		<string>FireWire Target</string>
+		<key>Product Revision Level</key>
+		<string>0000</string>
+		<key>Rotation Rate</key>
+		<integer>7200</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyMediumRotationRateKey		"Rotation Rate"
+
+
+#endif	/* _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_ */
diff --git a/i386/include/IOKit/storage/IOStorageProtocolCharacteristics.h b/i386/include/IOKit/storage/IOStorageProtocolCharacteristics.h
new file mode 100644
index 0000000..18a726f
--- /dev/null
+++ b/i386/include/IOKit/storage/IOStorageProtocolCharacteristics.h
@@ -0,0 +1,1758 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_
+#define _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_
+
+
+/*
+ *	Protocol Characteristics - Characteristics defined for protocols.
+ */
+
+
+/*!
+@defined kIOPropertyProtocolCharacteristicsKey
+@discussion This key is used to define Protocol Characteristics for a particular
+protocol and it has an associated dictionary which lists the
+protocol characteristics.
+
+Requirement: Mandatory
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>ATAPI</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define	kIOPropertyProtocolCharacteristicsKey		"Protocol Characteristics"
+
+
+/*!
+@defined kIOPropertySCSIInitiatorIdentifierKey
+@discussion An identifier that will uniquely identify this SCSI Initiator for the
+SCSI Domain.
+
+Requirement: Mandatory for SCSI Parallel Interface, SAS,
+and Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+		<key>SCSI Initiator Identifier</key>
+		<integer>7</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIInitiatorIdentifierKey		"SCSI Initiator Identifier"
+
+
+/*!
+@defined kIOPropertySCSIDomainIdentifierKey
+@discussion An identifier that will uniquely identify this SCSI Domain for the
+Physical Interconnect type. This identifier is only guaranteed to be unique for
+any given Physical Interconnect and is not guaranteed to be the same across
+restarts or shutdowns.
+
+Requirement: Mandatory for SCSI Parallel Interface and Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+		<key>SCSI Domain Identifier</key>
+		<integer>0</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIDomainIdentifierKey			"SCSI Domain Identifier"
+
+
+/*!
+@defined kIOPropertySCSITargetIdentifierKey
+@discussion This is the SCSI Target Identifier for a given SCSI Target Device.
+
+Requirement: Mandatory for SCSI Parallel Interface and Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+		<key>SCSI Target Identifier</key>
+		<integer>3</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSITargetIdentifierKey			"SCSI Target Identifier"
+
+
+/*!
+@defined kIOPropertySCSILogicalUnitNumberKey
+@discussion This key is the SCSI Logical Unit Number for the device server
+controlled by the driver.
+
+Requirement: Mandatory for SCSI Parallel Interface, SAS, and Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+		<key>SCSI Logical Unit Number</key>
+		<integer>2</integer>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSILogicalUnitNumberKey			"SCSI Logical Unit Number"
+
+
+/*!
+@defined kIOPropertySASAddressKey
+@discussion This key is the unique 64-bit SAS Address for the device server
+node located at this port, or for the initiating host port.
+
+Requirement: Mandatory for SAS.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SAS</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>SAS Address</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+
+Example2:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>SAS Address</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySASAddressKey					"SAS Address"
+
+
+/*!
+@defined kIOPropertyFibreChannelNodeWorldWideNameKey
+@discussion This key is the unique 64-bit World Wide Name for the device server
+node located at this port, or for the initiating host port.
+
+Requirement: Mandatory for Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>Node World Wide Name</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+
+Example2:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Node World Wide Name</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelNodeWorldWideNameKey		"Node World Wide Name"
+
+
+/*!
+@defined kIOPropertyFibreChannelPortWorldWideNameKey
+@discussion This key is the unique 64-bit World Wide Name for the port.
+
+Requirement: Mandatory for Fibre Channel Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>Port World Wide Name</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+
+Example2:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port World Wide Name</key>
+		<data>0011223344556677</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelPortWorldWideNameKey		"Port World Wide Name"
+
+
+/*!
+@defined kIOPropertyFibreChannelAddressIdentifierKey
+@discussion This key is the 24-bit Address Identifier (S_ID or D_ID) as
+defined in the FC-FS specification. It contains the address identifier
+of the source or destination Nx_Port.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional (only necessary for Fibre Channel Interface).
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>Address Identifier</key>
+		<data>001122</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+
+Example2:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Address Identifier</key>
+		<data>001122</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelAddressIdentifierKey		"Address Identifier"
+
+
+/*!
+@defined kIOPropertyFibreChannelALPAKey
+@discussion This key is the 8-bit Arbitrated Loop Physical Address
+(AL_PA) value as defined in the FC-AL-2 specification.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional (only necessary for Fibre Channel Interface).
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>AL_PA</key>
+		<data>04</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+
+Example2:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>AL_PA</key>
+		<data>04</data>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelALPAKey					"AL_PA"
+
+
+/*!
+@defined kIOPropertyPortStatusKey
+@discussion This key is associated with the current port
+status of the physical link. The port status is either
+"Link Established", "No Link Established", or "Link Failed".
+
+Note: This value can change when the port status changes. It
+is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Status</key>
+		<string>Link Established</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortStatusKey						"Port Status"
+
+
+/*!
+@defined kIOPropertyPortSpeedKey
+@discussion This key is associated with the current port
+speed. The port speed can be any valid speed for the interconnect.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (1 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedKey							"Port Speed"
+
+
+/*!
+@defined kIOPropertyPortTopologyKey
+@discussion This key is associated with the current port
+topology. The port topology can be any valid topology for the interconnect.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>Automatic (N_Port)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyKey						"Port Topology"
+
+
+/*!
+@defined kIOPropertyPortDescriptionKey
+@discussion This key is associated with an human
+readable port description. Examples include
+"Channel A", "Port 1", etc.
+
+Requirement: Optional for all interconnects.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Description</key>
+		<string>Channel A</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortDescriptionKey					"Port Description"
+
+
+/*!
+@defined kIOPropertySCSIParallelSignalingTypeKey
+@discussion This key is associated with the signaling type
+used for this SCSI Parallel bus. Valid values include
+"High Voltage Differential", "Low Voltage Differential",
+and "Single Ended".
+
+Requirement: Optional for SCSI Parallel Interface. Not
+defined for any other physical interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>SCSI Parallel Signaling Type</key>
+		<string>High Voltage Differential</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIParallelSignalingTypeKey			"SCSI Parallel Signaling Type"
+
+
+/*!
+@defined kIOPropertyFibreChannelCableDescriptionKey
+@discussion This key is associated with the cabling type
+used for this Fibre Channel port. Valid values include
+"Copper" and "Fiber Optic".
+
+Requirement: Optional for Fibre Channel Interface. Not
+defined for any other physical interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Fibre Channel Cabling Type</key>
+		<string>Copper</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelCableDescriptionKey		"Fibre Channel Cabling Type"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeKey
+@discussion This key is used to define the Physical Interconnect to which
+a device is attached.
+
+Requirement: Mandatory.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeKey		"Physical Interconnect"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectLocationKey
+@discussion This key is used to define the Physical Interconnect
+Location.
+
+Requirement: Mandatory.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectLocationKey	"Physical Interconnect Location"
+
+
+/*!
+@defined kIOPropertySCSIProtocolMultiInitKey
+@discussion This protocol characteristics key is used to inform the system
+that the protocol supports having multiple devices that act as initiators.
+
+Requirement: Optional.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+		<key>Multiple Initiators</key>
+		<string>True</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIProtocolMultiInitKey			"Multiple Initiators"
+
+
+/*
+ *	Values - Values for the characteristics defined above.
+ */
+
+
+/*!
+@defined kIOPropertyInternalKey
+@discussion This key defines the value of Internal for the key
+kIOPropertyPhysicalInterconnectLocationKey. If the device is
+connected to an internal bus, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>ATA</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyInternalKey						"Internal"
+
+
+/*!
+@defined kIOPropertyExternalKey
+@discussion This key defines the value of External for the key
+kIOPropertyPhysicalInterconnectLocationKey. If the device is
+connected to an external bus, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyExternalKey						"External"
+
+
+/*!
+@defined kIOPropertyInternalExternalKey
+@discussion This key defines the value of Internal/External for the key
+kIOPropertyPhysicalInterconnectLocationKey. If the device is connected
+to a bus and it is indeterminate whether it is internal or external,
+this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal/External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyInternalExternalKey				"Internal/External"
+
+
+/*!
+@defined kIOPropertyInterconnectFileKey
+@discussion This key defines the value of File for the key
+kIOPropertyPhysicalInterconnectLocationKey. If the device is a file
+that is being represented as a storage device, this key should be set.
+
+NOTE: This key should only be used when the Physical Interconnect is set to
+Virtual Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Virtual Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>File</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyInterconnectFileKey						"File"
+
+
+/*!
+@defined kIOPropertyInterconnectRAMKey
+@discussion This key defines the value of RAM for the key
+kIOPropertyPhysicalInterconnectLocationKey. If the device is system memory
+that is being represented as a storage device, this key should be set.
+
+NOTE: This key should only be used when the Physical Interconnect is set to
+Virtual Interface.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Virtual Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>RAM</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyInterconnectRAMKey						"RAM"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeATA
+@discussion This key defines the value of ATA for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to an ATA bus, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>ATA</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeATA				"ATA"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeSerialATA
+@discussion This key defines the value of SATA for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a SATA bus, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SATA</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeSerialATA		"SATA"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeSerialAttachedSCSI
+@discussion This key defines the value of SAS for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a SAS bus, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SAS</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeSerialAttachedSCSI	"SAS"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeATAPI
+@discussion This key defines the value of ATAPI for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to an ATA bus and follows the ATAPI command specification, this key
+should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>ATAPI</string>
+		<key>Physical Interconnect Location</key>
+		<string>Internal</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeATAPI			"ATAPI"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeUSB
+@discussion This key defines the value of USB for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a USB port, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>USB</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeUSB				"USB"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeFireWire
+@discussion This key defines the value of USB for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a FireWire port, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>FireWire</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeFireWire			"FireWire"
+
+
+/*!
+ @defined kIOPropertyPhysicalInterconnectTypeSecureDigital
+ @discussion This key defines the value of Secure Digital for the key
+ kIOPropertyPhysicalInterconnectTypeSecureDigital. If the device is a
+ connected to a Secure Digital port and follows the Secure Digital 
+ specification, this key should be set. 
+ 
+ Example:
+ <pre>
+ @textblock
+ <dict>
+    <key>Protocol Characteristics</key>
+    <dict>
+        <key>Physical Interconnect</key>
+        <string>Secure Digital</string>
+        <key>Physical Interconnect Location</key>
+        <string>Internal</string>
+    </dict>
+ </dict>
+ @/textblock
+ </pre>
+ */
+#define kIOPropertyPhysicalInterconnectTypeSecureDigital	"Secure Digital"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeSCSIParallel
+@discussion This key defines the value of SCSI Parallel Interface for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a SCSI Parallel port, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>SCSI Parallel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeSCSIParallel		"SCSI Parallel Interface"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeFibreChannel
+@discussion This key defines the value of Fibre Channel Interface for the key
+kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
+to a Fibre Channel port, this key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Fibre Channel Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>External</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeFibreChannel		"Fibre Channel Interface"
+
+
+/*!
+@defined kIOPropertyPhysicalInterconnectTypeVirtual
+@discussion This key defines the value of Virtual Interface for the key
+kIOPropertyPhysicalInterconnectTypeVirtual. If the device is being made to look
+like a storage device, but is not such in actuality, such as a File or RAM, this
+key should be set.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Protocol Characteristics</key>
+	<dict>
+		<key>Physical Interconnect</key>
+		<string>Virtual Interface</string>
+		<key>Physical Interconnect Location</key>
+		<string>File</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPhysicalInterconnectTypeVirtual		"Virtual Interface"
+
+
+/*!
+@defined kIOPropertyPortStatusLinkEstablishedKey
+@discussion This key defines the value of Link Established for the key
+kIOPropertyPortStatusKey.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Status</key>
+		<string>Link Established</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortStatusLinkEstablishedKey			"Link Established"
+
+
+/*!
+@defined kIOPropertyPortStatusNoLinkEstablishedKey
+@discussion This key defines the value of No Link Established for the key
+kIOPropertyPortStatusKey.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Status</key>
+		<string>No Link Established</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortStatusNoLinkEstablishedKey		"No Link Established"
+
+
+/*!
+@defined kIOPropertyPortStatusLinkFailedKey
+@discussion This key defines the value of Link Failed for the key
+kIOPropertyPortStatusKey.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Status</key>
+		<string>Link Failed</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortStatusLinkFailedKey				"Link Failed"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomaticKey
+@discussion This key defines the value of Automatic for the key
+kIOPropertyPortSpeedKey. If the speed of the port is automatically
+adjusted by the host/device and a definitive speed is not known,
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomaticKey				"Automatic"
+
+
+/*!
+@defined kIOPropertyPortSpeed1GigabitKey
+@discussion This key defines the value of 1 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 1 Gigabit
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>1 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed1GigabitKey					"1 Gigabit"
+
+/*!
+@defined kIOPropertyPortSpeed1_5GigabitKey
+@discussion This key defines the value of 1.5 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 1.5 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>1.5 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed1_5GigabitKey				"1.5 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeed2GigabitKey
+@discussion This key defines the value of 2 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 2 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>2 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed2GigabitKey					"2 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeed3GigabitKey
+@discussion This key defines the value of 3 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 3 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>3 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed3GigabitKey					"3 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeed4GigabitKey
+@discussion This key defines the value of 4 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 4 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>4 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed4GigabitKey					"4 Gigabit"
+
+/*!
+@defined kIOPropertyPortSpeed6GigabitKey
+@discussion This key defines the value of 6 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 6 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>6 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed6GigabitKey					"6 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeed8GigabitKey
+@discussion This key defines the value of 8 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 8 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>8 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed8GigabitKey					"8 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeed10GigabitKey
+@discussion This key defines the value of 10 Gigabit for the key
+kIOPropertyPortSpeedKey. If the speed of the port is 10 Gigabits
+per second and is not automatically determined (i.e. the user
+configured the port to be exactly this speed),
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>10 Gigabit</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeed10GigabitKey				"10 Gigabit"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic1GigabitKey
+@discussion This key defines the value of Automatic (1 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+1 Gigabit per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (1 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic1GigabitKey		"Automatic (1 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic1_5GigabitKey
+@discussion This key defines the value of Automatic (1.5 Gigabit) for the key
+kIOPropertyPortSpeedKey. If the speed of the port is
+1.5 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (1.5 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic1_5GigabitKey		"Automatic (1.5 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic2GigabitKey
+@discussion This key defines the value of Automatic (2 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+2 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (2 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic2GigabitKey		"Automatic (2 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic3GigabitKey
+@discussion This key defines the value of Automatic (3 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+3 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (3 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic3GigabitKey		"Automatic (3 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic4GigabitKey
+@discussion This key defines the value of Automatic (4 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+4 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (4 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic4GigabitKey		"Automatic (4 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic6GigabitKey
+@discussion This key defines the value of Automatic (6 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+6 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (6 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic6GigabitKey		"Automatic (6 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic8GigabitKey
+@discussion This key defines the value of Automatic (8 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+8 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (8 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic8GigabitKey		"Automatic (8 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortSpeedAutomatic10GigabitKey
+@discussion This key defines the value of Automatic (10 Gigabit)
+for the key kIOPropertyPortSpeedKey. If the speed of the port is
+10 Gigabits per second and is automatically determined by host
+software, this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Speed</key>
+		<string>Automatic (10 Gigabit)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortSpeedAutomatic10GigabitKey		"Automatic (10 Gigabit)"
+
+
+/*!
+@defined kIOPropertyPortTopologyAutomaticKey
+@discussion This key defines the value of Automatic for the key
+kIOPropertyPortTopologyKey. If the topology of the port is automatically
+adjusted by the host/device and a definitive topology is not known,
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>Automatic</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyAutomaticKey				"Automatic"
+
+
+/*!
+@defined kIOPropertyPortTopologyNPortKey
+@discussion This key defines the value of N_Port for the key
+kIOPropertyPortTopologyKey. If the topology of the port is an N_Port,
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>N_Port</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyNPortKey					"N_Port"
+
+
+/*!
+@defined kIOPropertyPortTopologyNLPortKey
+@discussion This key defines the value of NL_Port for the key
+kIOPropertyPortTopologyKey. If the topology of the port is an NL_Port,
+this key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>NL_Port</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyNLPortKey				"NL_Port"
+
+
+/*!
+@defined kIOPropertyPortTopologyAutomaticNPortKey
+@discussion This key defines the value of Automatic (N_Port) for the key
+kIOPropertyPortTopologyKey. If the topology of the port is
+N_Port and is automatically determined by host software, this
+key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>Automatic (N_Port)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyAutomaticNPortKey		"Automatic (N_Port)"
+
+
+/*!
+@defined kIOPropertyPortTopologyAutomaticNLPortKey
+@discussion This key defines the value of Automatic (NL_Port) for the key
+kIOPropertyPortTopologyKey. If the topology of the port is
+NL_Port and is automatically determined by host software, this
+key should be used.
+
+Note: This value can change. It is not a static value.
+
+Requirement: Optional for any interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Port Topology</key>
+		<string>Automatic (NL_Port)</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyPortTopologyAutomaticNLPortKey		"Automatic (NL_Port)"
+
+
+/*!
+@defined kIOPropertySCSIParallelSignalingTypeHVDKey
+@discussion This key defines the value of High Voltage Differential for the key
+kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
+High Voltage Differential, this key should be used.
+
+Requirement: Optional for SCSI Parallel Interface interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>SCSI Parallel Signaling Type</key>
+		<string>High Voltage Differential</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIParallelSignalingTypeHVDKey		"High Voltage Differential"
+
+
+/*!
+@defined kIOPropertySCSIParallelSignalingTypeLVDKey
+@discussion This key defines the value of Low Voltage Differential for the key
+kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
+Low Voltage Differential, this key should be used.
+
+Requirement: Optional for SCSI Parallel Interface interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>SCSI Parallel Signaling Type</key>
+		<string>Low Voltage Differential</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIParallelSignalingTypeLVDKey		"Low Voltage Differential"
+
+
+/*!
+@defined kIOPropertySCSIParallelSignalingTypeSEKey
+@discussion This key defines the value of Single Ended for the key
+kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
+Single Ended, this key should be used.
+
+Requirement: Optional for SCSI Parallel Interface interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>SCSI Parallel Signaling Type</key>
+		<string>Single Ended</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertySCSIParallelSignalingTypeSEKey		"Single Ended"
+
+
+/*!
+@defined kIOPropertyFibreChannelCableDescriptionCopperKey
+@discussion This key defines the value of Copper for the key
+kIOPropertyFibreChannelCableDescriptionKey. If the cabling is
+Copper, this key should be used.
+
+Requirement: Optional for Fibre Channel Interface interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Fibre Channel Cabling Type</key>
+		<string>Copper</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelCableDescriptionCopperKey		"Copper"
+
+
+/*!
+@defined kIOPropertyFibreChannelCableDescriptionFiberOpticKey
+@discussion This key defines the value of Fiber Optic for the key
+kIOPropertyFibreChannelCableDescriptionKey. If the cabling is
+Fiber Optic, this key should be used.
+
+Requirement: Optional for Fibre Channel Interface interconnect.
+
+Example:
+<pre>
+@textblock
+<dict>
+	<key>Controller Characteristics</key>
+	<dict>
+		<key>Fibre Channel Cabling Type</key>
+		<string>Fiber Optic</string>
+	</dict>
+</dict>
+@/textblock
+</pre>
+*/
+#define kIOPropertyFibreChannelCableDescriptionFiberOpticKey	"Fiber Optic"
+
+
+#endif	/* _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_ */
diff --git a/i386/include/IOKit/storage/ata/.svn/all-wcprops b/i386/include/IOKit/storage/ata/.svn/all-wcprops
new file mode 100644
index 0000000..730c632
--- /dev/null
+++ b/i386/include/IOKit/storage/ata/.svn/all-wcprops
@@ -0,0 +1,17 @@
+K 25
+svn:wc:ra_dav:version-url
+V 64
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/ata
+END
+IOATAStorageDefines.h
+K 25
+svn:wc:ra_dav:version-url
+V 86
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/ata/IOATAStorageDefines.h
+END
+IOATAPIProtocolTransport.h
+K 25
+svn:wc:ra_dav:version-url
+V 91
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/ata/IOATAPIProtocolTransport.h
+END
diff --git a/i386/include/IOKit/storage/ata/.svn/entries b/i386/include/IOKit/storage/ata/.svn/entries
new file mode 100644
index 0000000..dc54b6f
--- /dev/null
+++ b/i386/include/IOKit/storage/ata/.svn/entries
@@ -0,0 +1,96 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/storage/ata
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IOATAStorageDefines.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+2636f67bb1c6a3bf217e724e581bbc77
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9421
+
+IOATAPIProtocolTransport.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+216442f064c65df79d52e27fa6006097
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+14901
+
diff --git a/i386/include/IOKit/storage/ata/.svn/text-base/IOATAPIProtocolTransport.h.svn-base b/i386/include/IOKit/storage/ata/.svn/text-base/IOATAPIProtocolTransport.h.svn-base
new file mode 100644
index 0000000..3356ae7
--- /dev/null
+++ b/i386/include/IOKit/storage/ata/.svn/text-base/IOATAPIProtocolTransport.h.svn-base
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOATAPIProtocolTransport
+  Contains the class definition for IOATAPIProtocolTransport.
+*/
+
+
+#ifndef _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_
+#define _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_
+
+#define kIOPropertyATAPIMassStorageCharacteristics 		"ATAPI Mass Storage Characteristics"
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+/* General IOKit includes */
+#include <IOKit/IOLib.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOCommandPool.h>
+
+/* IOKit ATA Family includes */
+#include <IOKit/ata/IOATADevice.h>
+#include <IOKit/ata/IOATATypes.h>
+
+/* IOKit ATA Storage includes */
+#include <IOKit/storage/ata/IOATAStorageDefines.h>
+
+/* SCSI Architecture Model Family includes */
+#include <IOKit/scsi/IOSCSIProtocolServices.h>
+
+// Forward class declaration
+class IOATAPIProtocolTransport;
+
+/*! 
+	@typedef ATAPIClientData
+	@param cmd IOATACommand for request.
+	@param self Pointer to the object. 
+	@param scsiTask SCSITaskIdentifier of request. 
+	@discussion This structure is stuffed into the refcon so we can associate which
+	IOATACommand and SCSITaskIdentifier is completing.
+*/
+
+struct ATAPIClientData
+{
+	IOATACommand *				cmd;
+	IOATAPIProtocolTransport *	self;
+	SCSITaskIdentifier			scsiTask;
+};
+typedef struct ATAPIClientData ATAPIClientData;
+
+
+/*!
+	@class IOATAPIProtocolTransport
+	@abstract SCSI Protocol Driver Family for ATAPI Devices. 
+	@discussion IOATAPIProtocolTransport contains all the bus specific support for ATAPI compliant devices.
+	To add vendor specific features or workarounds you will sub-class the appropriate
+	methods of this family. 
+*/
+
+class IOATAPIProtocolTransport : public IOSCSIProtocolServices
+{
+	
+	OSDeclareDefaultStructors ( IOATAPIProtocolTransport )
+	
+public:
+
+	// ---- IOService methods overridden ----
+	
+	bool 			init 	( OSDictionary * propTable );
+	
+	// The start method is called to start our services. If the device
+	// can be controlled by this object, then we return true, else we
+	// return false. start() is usually used to allocate resources once
+	// it is determined that the device can be controlled by this object.
+	virtual bool 	start 	( IOService * provider );
+	
+	// The stop method is called to stop our services. It is primarily
+	// called for deallocation of resources.
+	virtual void 	stop 	( IOService *  provider );
+	
+	// This method is our last chance to free all resources allocated.
+	virtual void	free	( void );
+	
+	
+protected:
+
+	// ---- member variables ----
+	
+	IOATADevice *			fATADevice;
+	ataUnitID				fATAUnitID;
+	ataDeviceType			fATADeviceType;
+	ataSocketType			fATASocketType;
+	atapiConfig				fATAPIPacketConfig;
+	UInt8					fPIOMode;
+	UInt8					fDMAMode;
+	UInt8					fUltraDMAMode;
+	IOCommandGate *			fCommandGate;
+	IOCommandPool *			fCommandPool;
+	IOATACommand *			fResetCommand;
+	IOATACommand *			fConfigCommand;
+	IOATACommand *			fIdentifyCommand;
+	char					fRevision[kSizeOfATARevisionString + 1];
+	char					fModel[kSizeOfATAModelString + 1];
+	bool					fWakeUpResetOccurred;
+	bool					fPhysicallyConnected;
+	
+	// Used for low-power polling support
+	thread_call_t			fPollingThread;
+	
+	UInt16					fDeviceIdentifyData[256];
+	IOMemoryDescriptor *	fDeviceIdentifyBuffer;
+	bool					fResetInProgress;
+
+	// Binary Compatibility instance variable expansion
+	struct ExpansionData
+	{
+		UInt32		fSemaphore;
+		UInt32		fMediaNotifyValue;
+	};
+	ExpansionData * reserved;
+	
+	// ---- IOService methods overridden ----
+	
+	// The message method is used to listen to messages from our provider, the ATA controller.
+	// It sends messages for bus reset notifications and for device removal (such as MediaBay,
+	// PC card, etc.)
+	virtual IOReturn message ( UInt32 type, IOService * provider, void * argument = 0 );
+	
+	// ---- Protocol transport methods overridden ----
+
+	// Send a SCSI Command to the device.  If the command was sent to the
+	// device and is pending completion, the subclass should return true and
+	// return back the kSCSIServiceResponse_Request_In_Process response. 
+	// If the command completes immediately with an error, the subclass will
+	// return true and return back the appropriate status.
+	// if the subclass is currently processing all the commands it can, the
+	// subclass will return false and the command will be resent next time
+	// CommandCompleted is called.  
+	virtual bool SendSCSICommand ( 	SCSITaskIdentifier 		request,
+									SCSIServiceResponse * 	serviceResponse,
+									SCSITaskStatus *		taskStatus );
+		
+	// This is a stub - not implemented in upper layer yet. Eventually, there
+	// will be a way to abort a task or task set and this method will be called.
+	// It will abort any commands which have not been executed by the ATA controller
+	virtual SCSIServiceResponse AbortSCSICommand ( SCSITaskIdentifier request );
+	
+	// The IsProtocolServiceSupported method will return true if the protocol
+	// layer supports the specified feature.
+	virtual bool IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
+	
+	// The HandleProtocolServiceFeature method will return true if the protocol
+	// layer properly handled the specified feature.
+	virtual bool HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
+
+	// ------ Power Management Support ------
+
+	// The HandlePowerOff method is called to do any bus specific activity
+	// necessary before shutting down and going to sleep.
+	virtual IOReturn 		HandlePowerOff 	( void );
+
+	// The HandlePowerOn method is called to do any bus specific activity
+	// necessary to recover from power-on/wake from sleep (e.g. device reset on ATAPI)
+	virtual IOReturn 		HandlePowerOn 	( void );
+
+	
+	// ---- Methods defined by this class ----
+
+	// Static callback proc for all SCSITask objects, it calls through to
+	// SCSITaskCallbackFunction.
+	static void 			sSCSITaskCallbackProc ( IOATACommand * cmd );
+	
+	// Callback proc for synchronous ATA only type commands.
+	static void 			sATACallbackSync ( IOATACommand * cmd );
+
+	// Callback proc for asynchronous ATAPI resets.
+	static void 			sATAPIResetCallback ( IOATACommand * cmd );
+
+	// Callback proc that does nothing.
+	static void 			sATAPIVoidCallback ( IOATACommand * cmd );
+
+	// State machine for device configuration.
+	static void				sATAPIConfigStateMachine ( IOATACommand * cmd );
+	
+	// Used for low-power polling.
+	static void				sPollStatusRegister ( void * xptDriver, void * refCon );
+	
+	// Static callback for low-power polling.
+	static void				sPollStatusRegisterCallback ( IOATACommand * cmd );
+
+	// This method is called by the SCSITaskCallbackFunction and it calls the
+	// inherited CommandCompleted message with the results of the task.
+	virtual void CompleteSCSITask ( SCSITaskIdentifier 	scsiTask,
+									SCSIServiceResponse serviceResponse,
+									SCSITaskStatus		taskStatus );
+
+	// The SCSITaskCallbackFunction method is called by the static callback procedure
+	// to complete SCSITask operations. This method may be subclassed if a device
+	// workaround is necessary.
+	virtual void SCSITaskCallbackFunction ( IOATACommand * 		cmd,
+											SCSITaskIdentifier 	scsiTask );
+	
+	// The ReportATAPIDeviceType method returns the ataDeviceType for ATAPI
+	virtual ataDeviceType 	ReportATAPIDeviceType ( void ) const;
+	
+	// The InspectDevice method is called to inspect the ATA device and verify
+	// that it is a device which can be controlled by this object
+	virtual bool			InspectDevice ( IOATADevice * ataDevice );
+	
+	// The AllocateATACommandObjects method is called to allocate a pool of
+	// IOATACommands for general purpose I/O usage.
+	virtual void 			AllocateATACommandObjects ( void );
+	
+	// The DeallocateATACommandObjects method is called to deallocate a pool of
+	// IOATACommands for general purpose I/O usage.
+	virtual void 			DeallocateATACommandObjects ( void );
+	
+	// The GetATACommandObject method is called to retrieve a command from
+	// the pool. Pass true to allow the method to sleep waiting for a command,
+	// else pass false. If false is passed, there is NO guarantee that a valid
+	// command will be returned. If true is passed, it IS guaranteed that a
+	// valid command will be returned, but the thread may be slept waiting for
+	// those resources.
+	virtual IOATACommand *	GetATACommandObject	( bool okToSleep = true );
+	
+	// The ReturnATACommandObject method is called to return a command to
+	// the pool.
+	virtual void			ReturnATACommandObject	( IOATACommand * cmd );
+
+	// The sSwapBytes16 method is used to word-swap the Device Identify data
+	// on big endian systems. Since all identify data is returned in little endian
+	// values, it must be word-swapped before inspected.
+	static void				sSwapBytes16 ( UInt8 * buffer, IOByteCount numBytesToSwap );
+	
+	// The sConvertHighestBitToNumber method is used to find the highest bit in a
+	// word and return a numeric value.	This is used to find the highest possible
+	// values for PIO, DMA, and UltraDMA transfer modes.
+	static UInt8			sConvertHighestBitToNumber ( UInt16 bitField );
+
+	// The sSetWakeupResetOccurred method is used to safely set member variables
+	// behind the command gate.
+	static void				sSetWakeupResetOccurred ( IOATAPIProtocolTransport * driver,
+												   	  bool resetOccurred );
+
+	// The sCheckWakeupResetOccur method is used to safely check member variables
+	// behind the command gate.
+	static void				sCheckWakeupResetOccurred ( IOATAPIProtocolTransport * driver,
+														bool * resetOccurred );
+	
+	// The DidWakeupResetOccur method is used to safely find out if a reset
+	// occurred while we were asleep.
+	virtual bool			CheckWakeupResetOccurred ( void );
+	
+	// The WakeupResetOccurred method is used to safely set/clear the reset flag.
+	virtual void			SetWakeupResetOccurred ( bool resetOccurred );
+
+	// The SetPIOTransferMode method is used to set the programmed input-output (PIO)
+	// transfer mode. The highest value reported by the device is used.
+	virtual IOReturn		SetPIOTransferMode ( IOATACommand * cmd, bool forceSync );
+	
+	// The SetDMATransferMode method is used to set the direct memory access (DMA)
+	// transfer mode. The highest value reported by the device is used.
+	virtual IOReturn		SetDMATransferMode ( IOATACommand * cmd, bool forceSync );
+	
+	// The IdentifyAndConfigureATAPIDevice method is called to correctly identify
+	// and configure an ATAPI device.
+	virtual IOReturn 		IdentifyAndConfigureATAPIDevice ( void );
+	
+	// The ConfigureATAPIDevice method is called to correctly configure the ATAPI
+	// device. It currently configures any PIO/DMA/UDMA transfer modes but may be
+	// expanded in the future.
+	virtual IOReturn 		ConfigureATAPIDevice ( void );
+
+	// The ReconfigureATAPIDevice method is called to correctly reconfigure the ATAPI
+	// device after a reset event has occurred (bus reset or device reset). It
+	// currently reconfigures any PIO/DMA/UDMA transfer modes but may be expanded in
+	// the future.
+	virtual IOReturn 		ReconfigureATAPIDevice ( void );
+	
+	// The IdentifyATAPIDevice method is called to correctly identify the ATAPI
+	// device. It currently issues the Identify ATAPI Device packet command and
+	// uses the data to correctly configure the device.
+	virtual IOReturn 		IdentifyATAPIDevice ( void );
+	
+	// The ResetATAPIDevice method is called to issue a Device Reset (also known
+	// as a SOFT RESET). This method will only reset the specified device on the
+	// bus.
+	virtual IOReturn 		ResetATAPIDevice ( void );
+	
+	// The SendATASleepCommand method is called to put an ATAPI drive in sleep
+	// mode.
+	virtual IOReturn		SendATASleepCommand ( void );
+	
+	// The EnablePollingOfStatusRegister method is called to set up a timer for
+	// the call to PollStatusRegister. It is called when the SCSI Application Layer
+	// driver wants to enable low-power polling and after a poll which does not
+	// see a change in the register status.
+	virtual void			EnablePollingOfStatusRegister ( void );
+
+	// The DisablePollingOfStatusRegister method is called to cancel any thread
+	// call which is doing a poll and drop the retain count on the object.
+	virtual void			DisablePollingOfStatusRegister ( void );
+	
+	// The PollStatusRegister method is used to do low-power polling on drives which
+	// support it. This feature is enabled by the SCSI Application Layer driver.
+	virtual void			PollStatusRegister ( void * refCon );
+	
+	// Callback method for the polling of the status register.
+	virtual void			PollStatusRegisterCallback ( IOATACommand * cmd );
+	
+	// The TurnDrivePowerOff method is called to turn power to the drive OFF
+	IOReturn				TurnDrivePowerOff ( void );
+	
+	IOReturn				SendCommand ( IOATACommand * cmd );
+	IOReturn				GatedWaitForRequest ( void * data );
+	
+private:
+	
+	// Binary Compatibility reserved method space
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 1 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 2 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 3 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 4 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 5 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 6 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 7 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 8 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 9 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 10 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 11 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 12 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 13 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 14 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 15 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 16 );
+	
+};
+
+#endif /* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/storage/ata/.svn/text-base/IOATAStorageDefines.h.svn-base b/i386/include/IOKit/storage/ata/.svn/text-base/IOATAStorageDefines.h.svn-base
new file mode 100644
index 0000000..fdac8b3
--- /dev/null
+++ b/i386/include/IOKit/storage/ata/.svn/text-base/IOATAStorageDefines.h.svn-base
@@ -0,0 +1,321 @@
+/*
+ * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_ATA_STORAGE_DEFINES_H_
+#define _IOKIT_IO_ATA_STORAGE_DEFINES_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+	
+/*
+ * Important word offsets in device identify data as
+ * defined in ATA-5 standard
+ */
+	
+enum
+{
+	kATAIdentifyConfiguration				= 0,
+	kATAIdentifyLogicalCylinderCount 		= 1,
+	kATAIdentifyLogicalHeadCount			= 3,
+	kATAIdentifySectorsPerTrack				= 6,
+	kATAIdentifySerialNumber				= 10,
+	kATAIdentifyFirmwareRevision			= 23,
+	kATAIdentifyModelNumber					= 27,
+	kATAIdentifyMultipleSectorCount			= 47,
+	kATAIdentifyDriveCapabilities			= 49,
+	kATAIdentifyDriveCapabilitiesExtended	= 50,
+	kATAIdentifyPIOTiming					= 51,
+	kATAIdentifyExtendedInfoSupport			= 53,
+	kATAIdentifyCurrentCylinders			= 54,
+	kATAIdentifyCurrentHeads				= 55,
+	kATAIdentifyCurrentSectors				= 56,
+	kATAIdentifyCurrentCapacity				= 57,
+	kATAIdentifyCurrentMultipleSectors		= 59,
+	kATAIdentifyLBACapacity					= 60,
+	kATAIdentifySingleWordDMA				= 62,
+	kATAIdentifyMultiWordDMA				= 63,
+	kATAIdentifyAdvancedPIOModes			= 64,
+	kATAIdentifyMinMultiWordDMATime			= 65,
+	kATAIdentifyRecommendedMultiWordDMATime	= 66,
+	kATAIdentifyMinPIOTime					= 67,
+	kATAIdentifyMinPIOTimeWithIORDY			= 68,
+	kATAIdentifyQueueDepth					= 75,
+	kATAIdentifyMajorVersion				= 80,
+	kATAIdentifyMinorVersion				= 81,
+	kATAIdentifyCommandSetSupported			= 82,
+	kATAIdentifyCommandSetSupported2		= 83,
+	kATAIdentifyCommandExtension1			= 84,
+	kATAIdentifyCommandExtension2			= 85,
+	kATAIdentifyCommandsEnabled				= 86,
+	kATAIdentifyCommandsDefault				= 87,
+	kATAIdentifyUltraDMASupported			= 88,
+	kATAIdentifyPhysicalLogicalSectorSize	= 106,
+	kATAIdentifyWordsPerLogicalSector1		= 117,
+	kATAIdentifyWordsPerLogicalSector2		= 118,
+	kATAIdentifyLogicalSectorAlignment		= 209,
+	kATAIdentifyIntegrity					= 255
+};
+	
+
+/* 
+ * Important bits in device identify data
+ * as defined in ATA-5 standard
+ */
+ 
+enum
+{
+	// Configuration field (word 0)
+	kFixedDeviceBit			= 6,							// Fixed disk indicator bit
+	kRemoveableMediaBit		= 7,							// Removable media indicator bit
+	kNonMagneticDriveBit	= 15,							// Non-magnetic drive indicator bit
+	
+	kFixedDeviceMask		= (1 << kFixedDeviceBit),		// Mask for fixed disk indicator
+	kRemoveableMediaMask	= (1 << kRemoveableMediaBit),	// Mask for removable media indicator
+	kNonMagneticDriveMask	= (1 << kNonMagneticDriveBit),	// Mask for non-magnetic drive indicator
+
+	// Capabilities field (word 49)
+	kDMABit					= 8,							// DMA supported bit
+	kLBABit					= 9,							// LBA supported bit
+	kIORDYDisableBit		= 10,							// IORDY can be disabled bit
+	kIORDYBit				= 11,							// IORDY supported bit
+	kStandbyTimerBit		= 13,							// Standby timer supported bit
+
+	kDMASupportedMask		= (1 << kDMABit),				// Mask for DMA supported
+	kLBASupportedMask		= (1 << kLBABit),				// Mask for LBA supported
+	kDMADisableMask			= (1 << kIORDYDisableBit),		// Mask for DMA supported
+	kIORDYSupportedMask		= (1 << kIORDYBit),				// Mask for IORDY supported
+	kStandbySupportedMask	= (1 << kStandbyTimerBit),		// Mask for Standby Timer supported
+
+	// Extensions field (word 53)
+	kCurFieldsValidBit		= 0,							// Bit to show words 54-58 are valid
+	kExtFieldsValidBit		= 1,							// Bit to show words 64-70 are valid
+	kCurFieldsValidMask		= (1 << kCurFieldsValidBit),	// Mask for current fields valid
+	kExtFieldsValidMask		= (1 << kExtFieldsValidBit),	// Extension word valid
+
+	// Advanced PIO Transfer Modes field (word 64)
+	kMode3Bit				= 0,							// Bit to indicate mode 3 is supported
+	kMode3Mask				= (1 << kMode3Bit),				// Mask for mode 3 support
+	
+	// Integrity of Identify data (word 255)
+	kChecksumValidCookie	= 0xA5							// Bits 7:0 if device supports feature
+	
+};
+
+
+/* String size constants */
+enum
+{
+	kSizeOfATAModelString 		= 40,
+	kSizeOfATARevisionString	= 8
+};
+
+/* ATA Command timeout constants ( in milliseconds ) */
+enum
+{
+	kATATimeout10Seconds	= 10000,
+	kATATimeout30Seconds	= 30000,
+	kATATimeout45Seconds	= 45000,
+	kATATimeout1Minute		= 60000,
+	kATADefaultTimeout		= kATATimeout30Seconds
+};
+
+
+/* Retry constants */
+enum
+{
+	kATAZeroRetries		= 0,
+	kATADefaultRetries	= 4
+};
+
+/* max number of blocks supported in ATA transaction */
+enum
+{
+	kIOATASectorCount8Bit	= 8,
+	kIOATASectorCount16Bit	= 16
+};
+
+enum
+{
+	kIOATAMaximumBlockCount8Bit		= (1 << kIOATASectorCount8Bit),
+	kIOATAMaximumBlockCount16Bit	= (1 << kIOATASectorCount16Bit),
+	
+	// For backwards compatibility
+	kIOATAMaxBlocksPerXfer			= kIOATAMaximumBlockCount8Bit
+};
+
+
+
+/* Power Management time constants (in seconds) */
+enum
+{
+	kSecondsInAMinute	= 60,
+	k5Minutes			= 5 * kSecondsInAMinute
+};
+
+/* Bits for features published in Word 82 of device identify data */
+enum
+{
+	kATASupportsSMARTBit					= 0,
+	kATASupportsPowerManagementBit  		= 3,
+	kATASupportsWriteCacheBit				= 5
+};
+
+/* Masks for features published in Word 82 of device identify data */
+enum
+{
+	kATASupportsSMARTMask					= (1 << kATASupportsSMARTBit),
+	kATASupportsPowerManagementMask 		= (1 << kATASupportsPowerManagementBit),
+	kATASupportsWriteCacheMask				= (1 << kATASupportsWriteCacheBit)
+};
+
+/* Bits for features published in Word 83 of device identify data */
+enum
+{
+	kATASupportsCompactFlashBit				= 2,
+	kATASupportsAdvancedPowerManagementBit 	= 3,
+	
+	kATASupports48BitAddressingBit			= 10,
+	
+	kATASupportsFlushCacheBit				= 12,
+	kATASupportsFlushCacheExtendedBit		= 13
+};
+
+/* Masks for features published in Word 83 of device identify data */
+enum
+{
+	kATASupportsCompactFlashMask			= (1 << kATASupportsCompactFlashBit),
+	kATASupportsAdvancedPowerManagementMask = (1 << kATASupportsAdvancedPowerManagementBit),
+	
+	kATASupports48BitAddressingMask			= (1 << kATASupports48BitAddressingBit),
+	
+	kATASupportsFlushCacheMask				= (1 << kATASupportsFlushCacheBit),
+	kATASupportsFlushCacheExtendedMask		= (1 << kATASupportsFlushCacheExtendedBit),
+	
+	// Mask to ensure data is valid
+	kIdentifyWordValidationMask				= 0xC000,
+	kIdentifyWordValid						= 0x4000
+};
+
+/* Bits for features published in Word 84 of device identify data */
+enum
+{
+	kATAForceUnitAccessFeatureBit			= 6,
+};
+
+/* Masks for features published in Word 84 of device identify data */
+enum
+{
+	kATAForceUnitAccessFeatureMask			= (1 << kATAForceUnitAccessFeatureBit),
+};
+
+/* Bits for features published in Word 85 of device identify data */
+enum
+{
+	kATAWriteCacheEnabledBit				= 5
+};
+
+/* Masks for features published in Word 85 of device identify data */
+enum
+{
+	kATAWriteCacheEnabledMask				= (1 << kATAWriteCacheEnabledBit)
+};
+
+
+/* Bits for features published in Word 106 of device identify data */
+enum
+{
+	kATAPhysicalLogicalEnabledBit0			= 15,
+	kATAPhysicalLogicalEnabledBit1			= 14,
+	kATAMultipleLogicalSectorsBit			= 13,
+	kATAValidLogicalSectorSizeBit			= 12	
+};
+
+/* Masks for features published in Word 106 of device identify data */
+enum
+{
+	kATAPhysicalLogicalEnabledMask			= (1 << kATAPhysicalLogicalEnabledBit0) | (1 << kATAPhysicalLogicalEnabledBit1),
+	kATAPhysicalLogicalEnabledValue			= (0 << kATAPhysicalLogicalEnabledBit0) | (1 << kATAPhysicalLogicalEnabledBit1),
+	kATAMultipleLogicalSectorsMask			= (1 << kATAMultipleLogicalSectorsBit),
+	kATAValidLogicalSectorSizeMask			= (1 << kATAValidLogicalSectorSizeBit),
+	kATAPhysicalSectorSizeMask				= 0xF,
+	kATALogicalSectorAlignmentMask			= 0x3FFF
+};
+
+// Property table keys
+#define kIOATASupportedFeaturesKey		"ATA Features"
+
+/* ATA supported features */
+enum
+{
+	kIOATAFeaturePowerManagement			= 0x01,		/* OBSOLETE */
+	kIOATAFeatureWriteCache					= 0x02,		/* OBSOLETE */
+	kIOATAFeatureAdvancedPowerManagement 	= 0x04,
+	kIOATAFeatureCompactFlash				= 0x08,
+	kIOATAFeature48BitLBA					= 0x10,
+	kIOATAFeatureSMART						= 0x20
+};
+
+/* ATA Advanced Power Management settings (valid settings range from 1-254),
+the settings below are the more common settings */
+enum
+{
+	kIOATAMaxPerformance					= 0xFE,
+	kIOATADefaultPerformance			 	= 0x80,
+	kIOATAMaxPowerSavings					= 0x01
+};
+
+/* ATA Transfer Mode bit masks */
+enum
+{
+	kATAEnableUltraDMAModeMask 		= 0x40,
+	kATAEnableMultiWordDMAModeMask	= 0x20,
+	kATAEnablePIOModeMask			= 0x08
+};
+
+
+typedef uint32_t	ATAOperationType;
+enum
+{
+	kATAOperationTypeRead				= 0,
+	kATAOperationTypeWrite				= 1,
+	kATAOperationTypeFlushCache			= 2,
+	kATAOperationTypeSMART				= 3,
+	kATAOperationTypeConfiguration		= 4,
+	kATAOperationTypePowerManagement	= 5,
+	kATAOperationTypeSMS				= 6
+};
+
+#if defined(KERNEL)
+
+typedef struct __ATAIORequest *	ATARequestIdentifier;
+
+#endif	// defined(KERNEL)
+	
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _IOKIT_IO_ATA_STORAGE_DEFINES_H_ */
diff --git a/i386/include/IOKit/storage/ata/IOATAPIProtocolTransport.h b/i386/include/IOKit/storage/ata/IOATAPIProtocolTransport.h
new file mode 100644
index 0000000..3356ae7
--- /dev/null
+++ b/i386/include/IOKit/storage/ata/IOATAPIProtocolTransport.h
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*!
+  @header IOATAPIProtocolTransport
+  Contains the class definition for IOATAPIProtocolTransport.
+*/
+
+
+#ifndef _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_
+#define _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_
+
+#define kIOPropertyATAPIMassStorageCharacteristics 		"ATAPI Mass Storage Characteristics"
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+/* General IOKit includes */
+#include <IOKit/IOLib.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOCommandPool.h>
+
+/* IOKit ATA Family includes */
+#include <IOKit/ata/IOATADevice.h>
+#include <IOKit/ata/IOATATypes.h>
+
+/* IOKit ATA Storage includes */
+#include <IOKit/storage/ata/IOATAStorageDefines.h>
+
+/* SCSI Architecture Model Family includes */
+#include <IOKit/scsi/IOSCSIProtocolServices.h>
+
+// Forward class declaration
+class IOATAPIProtocolTransport;
+
+/*! 
+	@typedef ATAPIClientData
+	@param cmd IOATACommand for request.
+	@param self Pointer to the object. 
+	@param scsiTask SCSITaskIdentifier of request. 
+	@discussion This structure is stuffed into the refcon so we can associate which
+	IOATACommand and SCSITaskIdentifier is completing.
+*/
+
+struct ATAPIClientData
+{
+	IOATACommand *				cmd;
+	IOATAPIProtocolTransport *	self;
+	SCSITaskIdentifier			scsiTask;
+};
+typedef struct ATAPIClientData ATAPIClientData;
+
+
+/*!
+	@class IOATAPIProtocolTransport
+	@abstract SCSI Protocol Driver Family for ATAPI Devices. 
+	@discussion IOATAPIProtocolTransport contains all the bus specific support for ATAPI compliant devices.
+	To add vendor specific features or workarounds you will sub-class the appropriate
+	methods of this family. 
+*/
+
+class IOATAPIProtocolTransport : public IOSCSIProtocolServices
+{
+	
+	OSDeclareDefaultStructors ( IOATAPIProtocolTransport )
+	
+public:
+
+	// ---- IOService methods overridden ----
+	
+	bool 			init 	( OSDictionary * propTable );
+	
+	// The start method is called to start our services. If the device
+	// can be controlled by this object, then we return true, else we
+	// return false. start() is usually used to allocate resources once
+	// it is determined that the device can be controlled by this object.
+	virtual bool 	start 	( IOService * provider );
+	
+	// The stop method is called to stop our services. It is primarily
+	// called for deallocation of resources.
+	virtual void 	stop 	( IOService *  provider );
+	
+	// This method is our last chance to free all resources allocated.
+	virtual void	free	( void );
+	
+	
+protected:
+
+	// ---- member variables ----
+	
+	IOATADevice *			fATADevice;
+	ataUnitID				fATAUnitID;
+	ataDeviceType			fATADeviceType;
+	ataSocketType			fATASocketType;
+	atapiConfig				fATAPIPacketConfig;
+	UInt8					fPIOMode;
+	UInt8					fDMAMode;
+	UInt8					fUltraDMAMode;
+	IOCommandGate *			fCommandGate;
+	IOCommandPool *			fCommandPool;
+	IOATACommand *			fResetCommand;
+	IOATACommand *			fConfigCommand;
+	IOATACommand *			fIdentifyCommand;
+	char					fRevision[kSizeOfATARevisionString + 1];
+	char					fModel[kSizeOfATAModelString + 1];
+	bool					fWakeUpResetOccurred;
+	bool					fPhysicallyConnected;
+	
+	// Used for low-power polling support
+	thread_call_t			fPollingThread;
+	
+	UInt16					fDeviceIdentifyData[256];
+	IOMemoryDescriptor *	fDeviceIdentifyBuffer;
+	bool					fResetInProgress;
+
+	// Binary Compatibility instance variable expansion
+	struct ExpansionData
+	{
+		UInt32		fSemaphore;
+		UInt32		fMediaNotifyValue;
+	};
+	ExpansionData * reserved;
+	
+	// ---- IOService methods overridden ----
+	
+	// The message method is used to listen to messages from our provider, the ATA controller.
+	// It sends messages for bus reset notifications and for device removal (such as MediaBay,
+	// PC card, etc.)
+	virtual IOReturn message ( UInt32 type, IOService * provider, void * argument = 0 );
+	
+	// ---- Protocol transport methods overridden ----
+
+	// Send a SCSI Command to the device.  If the command was sent to the
+	// device and is pending completion, the subclass should return true and
+	// return back the kSCSIServiceResponse_Request_In_Process response. 
+	// If the command completes immediately with an error, the subclass will
+	// return true and return back the appropriate status.
+	// if the subclass is currently processing all the commands it can, the
+	// subclass will return false and the command will be resent next time
+	// CommandCompleted is called.  
+	virtual bool SendSCSICommand ( 	SCSITaskIdentifier 		request,
+									SCSIServiceResponse * 	serviceResponse,
+									SCSITaskStatus *		taskStatus );
+		
+	// This is a stub - not implemented in upper layer yet. Eventually, there
+	// will be a way to abort a task or task set and this method will be called.
+	// It will abort any commands which have not been executed by the ATA controller
+	virtual SCSIServiceResponse AbortSCSICommand ( SCSITaskIdentifier request );
+	
+	// The IsProtocolServiceSupported method will return true if the protocol
+	// layer supports the specified feature.
+	virtual bool IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
+	
+	// The HandleProtocolServiceFeature method will return true if the protocol
+	// layer properly handled the specified feature.
+	virtual bool HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
+
+	// ------ Power Management Support ------
+
+	// The HandlePowerOff method is called to do any bus specific activity
+	// necessary before shutting down and going to sleep.
+	virtual IOReturn 		HandlePowerOff 	( void );
+
+	// The HandlePowerOn method is called to do any bus specific activity
+	// necessary to recover from power-on/wake from sleep (e.g. device reset on ATAPI)
+	virtual IOReturn 		HandlePowerOn 	( void );
+
+	
+	// ---- Methods defined by this class ----
+
+	// Static callback proc for all SCSITask objects, it calls through to
+	// SCSITaskCallbackFunction.
+	static void 			sSCSITaskCallbackProc ( IOATACommand * cmd );
+	
+	// Callback proc for synchronous ATA only type commands.
+	static void 			sATACallbackSync ( IOATACommand * cmd );
+
+	// Callback proc for asynchronous ATAPI resets.
+	static void 			sATAPIResetCallback ( IOATACommand * cmd );
+
+	// Callback proc that does nothing.
+	static void 			sATAPIVoidCallback ( IOATACommand * cmd );
+
+	// State machine for device configuration.
+	static void				sATAPIConfigStateMachine ( IOATACommand * cmd );
+	
+	// Used for low-power polling.
+	static void				sPollStatusRegister ( void * xptDriver, void * refCon );
+	
+	// Static callback for low-power polling.
+	static void				sPollStatusRegisterCallback ( IOATACommand * cmd );
+
+	// This method is called by the SCSITaskCallbackFunction and it calls the
+	// inherited CommandCompleted message with the results of the task.
+	virtual void CompleteSCSITask ( SCSITaskIdentifier 	scsiTask,
+									SCSIServiceResponse serviceResponse,
+									SCSITaskStatus		taskStatus );
+
+	// The SCSITaskCallbackFunction method is called by the static callback procedure
+	// to complete SCSITask operations. This method may be subclassed if a device
+	// workaround is necessary.
+	virtual void SCSITaskCallbackFunction ( IOATACommand * 		cmd,
+											SCSITaskIdentifier 	scsiTask );
+	
+	// The ReportATAPIDeviceType method returns the ataDeviceType for ATAPI
+	virtual ataDeviceType 	ReportATAPIDeviceType ( void ) const;
+	
+	// The InspectDevice method is called to inspect the ATA device and verify
+	// that it is a device which can be controlled by this object
+	virtual bool			InspectDevice ( IOATADevice * ataDevice );
+	
+	// The AllocateATACommandObjects method is called to allocate a pool of
+	// IOATACommands for general purpose I/O usage.
+	virtual void 			AllocateATACommandObjects ( void );
+	
+	// The DeallocateATACommandObjects method is called to deallocate a pool of
+	// IOATACommands for general purpose I/O usage.
+	virtual void 			DeallocateATACommandObjects ( void );
+	
+	// The GetATACommandObject method is called to retrieve a command from
+	// the pool. Pass true to allow the method to sleep waiting for a command,
+	// else pass false. If false is passed, there is NO guarantee that a valid
+	// command will be returned. If true is passed, it IS guaranteed that a
+	// valid command will be returned, but the thread may be slept waiting for
+	// those resources.
+	virtual IOATACommand *	GetATACommandObject	( bool okToSleep = true );
+	
+	// The ReturnATACommandObject method is called to return a command to
+	// the pool.
+	virtual void			ReturnATACommandObject	( IOATACommand * cmd );
+
+	// The sSwapBytes16 method is used to word-swap the Device Identify data
+	// on big endian systems. Since all identify data is returned in little endian
+	// values, it must be word-swapped before inspected.
+	static void				sSwapBytes16 ( UInt8 * buffer, IOByteCount numBytesToSwap );
+	
+	// The sConvertHighestBitToNumber method is used to find the highest bit in a
+	// word and return a numeric value.	This is used to find the highest possible
+	// values for PIO, DMA, and UltraDMA transfer modes.
+	static UInt8			sConvertHighestBitToNumber ( UInt16 bitField );
+
+	// The sSetWakeupResetOccurred method is used to safely set member variables
+	// behind the command gate.
+	static void				sSetWakeupResetOccurred ( IOATAPIProtocolTransport * driver,
+												   	  bool resetOccurred );
+
+	// The sCheckWakeupResetOccur method is used to safely check member variables
+	// behind the command gate.
+	static void				sCheckWakeupResetOccurred ( IOATAPIProtocolTransport * driver,
+														bool * resetOccurred );
+	
+	// The DidWakeupResetOccur method is used to safely find out if a reset
+	// occurred while we were asleep.
+	virtual bool			CheckWakeupResetOccurred ( void );
+	
+	// The WakeupResetOccurred method is used to safely set/clear the reset flag.
+	virtual void			SetWakeupResetOccurred ( bool resetOccurred );
+
+	// The SetPIOTransferMode method is used to set the programmed input-output (PIO)
+	// transfer mode. The highest value reported by the device is used.
+	virtual IOReturn		SetPIOTransferMode ( IOATACommand * cmd, bool forceSync );
+	
+	// The SetDMATransferMode method is used to set the direct memory access (DMA)
+	// transfer mode. The highest value reported by the device is used.
+	virtual IOReturn		SetDMATransferMode ( IOATACommand * cmd, bool forceSync );
+	
+	// The IdentifyAndConfigureATAPIDevice method is called to correctly identify
+	// and configure an ATAPI device.
+	virtual IOReturn 		IdentifyAndConfigureATAPIDevice ( void );
+	
+	// The ConfigureATAPIDevice method is called to correctly configure the ATAPI
+	// device. It currently configures any PIO/DMA/UDMA transfer modes but may be
+	// expanded in the future.
+	virtual IOReturn 		ConfigureATAPIDevice ( void );
+
+	// The ReconfigureATAPIDevice method is called to correctly reconfigure the ATAPI
+	// device after a reset event has occurred (bus reset or device reset). It
+	// currently reconfigures any PIO/DMA/UDMA transfer modes but may be expanded in
+	// the future.
+	virtual IOReturn 		ReconfigureATAPIDevice ( void );
+	
+	// The IdentifyATAPIDevice method is called to correctly identify the ATAPI
+	// device. It currently issues the Identify ATAPI Device packet command and
+	// uses the data to correctly configure the device.
+	virtual IOReturn 		IdentifyATAPIDevice ( void );
+	
+	// The ResetATAPIDevice method is called to issue a Device Reset (also known
+	// as a SOFT RESET). This method will only reset the specified device on the
+	// bus.
+	virtual IOReturn 		ResetATAPIDevice ( void );
+	
+	// The SendATASleepCommand method is called to put an ATAPI drive in sleep
+	// mode.
+	virtual IOReturn		SendATASleepCommand ( void );
+	
+	// The EnablePollingOfStatusRegister method is called to set up a timer for
+	// the call to PollStatusRegister. It is called when the SCSI Application Layer
+	// driver wants to enable low-power polling and after a poll which does not
+	// see a change in the register status.
+	virtual void			EnablePollingOfStatusRegister ( void );
+
+	// The DisablePollingOfStatusRegister method is called to cancel any thread
+	// call which is doing a poll and drop the retain count on the object.
+	virtual void			DisablePollingOfStatusRegister ( void );
+	
+	// The PollStatusRegister method is used to do low-power polling on drives which
+	// support it. This feature is enabled by the SCSI Application Layer driver.
+	virtual void			PollStatusRegister ( void * refCon );
+	
+	// Callback method for the polling of the status register.
+	virtual void			PollStatusRegisterCallback ( IOATACommand * cmd );
+	
+	// The TurnDrivePowerOff method is called to turn power to the drive OFF
+	IOReturn				TurnDrivePowerOff ( void );
+	
+	IOReturn				SendCommand ( IOATACommand * cmd );
+	IOReturn				GatedWaitForRequest ( void * data );
+	
+private:
+	
+	// Binary Compatibility reserved method space
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 1 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 2 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 3 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 4 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 5 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 6 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 7 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 8 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 9 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 10 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 11 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 12 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 13 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 14 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 15 );
+	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 16 );
+	
+};
+
+#endif /* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/storage/ata/IOATAStorageDefines.h b/i386/include/IOKit/storage/ata/IOATAStorageDefines.h
new file mode 100644
index 0000000..fdac8b3
--- /dev/null
+++ b/i386/include/IOKit/storage/ata/IOATAStorageDefines.h
@@ -0,0 +1,321 @@
+/*
+ * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IO_ATA_STORAGE_DEFINES_H_
+#define _IOKIT_IO_ATA_STORAGE_DEFINES_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+	
+/*
+ * Important word offsets in device identify data as
+ * defined in ATA-5 standard
+ */
+	
+enum
+{
+	kATAIdentifyConfiguration				= 0,
+	kATAIdentifyLogicalCylinderCount 		= 1,
+	kATAIdentifyLogicalHeadCount			= 3,
+	kATAIdentifySectorsPerTrack				= 6,
+	kATAIdentifySerialNumber				= 10,
+	kATAIdentifyFirmwareRevision			= 23,
+	kATAIdentifyModelNumber					= 27,
+	kATAIdentifyMultipleSectorCount			= 47,
+	kATAIdentifyDriveCapabilities			= 49,
+	kATAIdentifyDriveCapabilitiesExtended	= 50,
+	kATAIdentifyPIOTiming					= 51,
+	kATAIdentifyExtendedInfoSupport			= 53,
+	kATAIdentifyCurrentCylinders			= 54,
+	kATAIdentifyCurrentHeads				= 55,
+	kATAIdentifyCurrentSectors				= 56,
+	kATAIdentifyCurrentCapacity				= 57,
+	kATAIdentifyCurrentMultipleSectors		= 59,
+	kATAIdentifyLBACapacity					= 60,
+	kATAIdentifySingleWordDMA				= 62,
+	kATAIdentifyMultiWordDMA				= 63,
+	kATAIdentifyAdvancedPIOModes			= 64,
+	kATAIdentifyMinMultiWordDMATime			= 65,
+	kATAIdentifyRecommendedMultiWordDMATime	= 66,
+	kATAIdentifyMinPIOTime					= 67,
+	kATAIdentifyMinPIOTimeWithIORDY			= 68,
+	kATAIdentifyQueueDepth					= 75,
+	kATAIdentifyMajorVersion				= 80,
+	kATAIdentifyMinorVersion				= 81,
+	kATAIdentifyCommandSetSupported			= 82,
+	kATAIdentifyCommandSetSupported2		= 83,
+	kATAIdentifyCommandExtension1			= 84,
+	kATAIdentifyCommandExtension2			= 85,
+	kATAIdentifyCommandsEnabled				= 86,
+	kATAIdentifyCommandsDefault				= 87,
+	kATAIdentifyUltraDMASupported			= 88,
+	kATAIdentifyPhysicalLogicalSectorSize	= 106,
+	kATAIdentifyWordsPerLogicalSector1		= 117,
+	kATAIdentifyWordsPerLogicalSector2		= 118,
+	kATAIdentifyLogicalSectorAlignment		= 209,
+	kATAIdentifyIntegrity					= 255
+};
+	
+
+/* 
+ * Important bits in device identify data
+ * as defined in ATA-5 standard
+ */
+ 
+enum
+{
+	// Configuration field (word 0)
+	kFixedDeviceBit			= 6,							// Fixed disk indicator bit
+	kRemoveableMediaBit		= 7,							// Removable media indicator bit
+	kNonMagneticDriveBit	= 15,							// Non-magnetic drive indicator bit
+	
+	kFixedDeviceMask		= (1 << kFixedDeviceBit),		// Mask for fixed disk indicator
+	kRemoveableMediaMask	= (1 << kRemoveableMediaBit),	// Mask for removable media indicator
+	kNonMagneticDriveMask	= (1 << kNonMagneticDriveBit),	// Mask for non-magnetic drive indicator
+
+	// Capabilities field (word 49)
+	kDMABit					= 8,							// DMA supported bit
+	kLBABit					= 9,							// LBA supported bit
+	kIORDYDisableBit		= 10,							// IORDY can be disabled bit
+	kIORDYBit				= 11,							// IORDY supported bit
+	kStandbyTimerBit		= 13,							// Standby timer supported bit
+
+	kDMASupportedMask		= (1 << kDMABit),				// Mask for DMA supported
+	kLBASupportedMask		= (1 << kLBABit),				// Mask for LBA supported
+	kDMADisableMask			= (1 << kIORDYDisableBit),		// Mask for DMA supported
+	kIORDYSupportedMask		= (1 << kIORDYBit),				// Mask for IORDY supported
+	kStandbySupportedMask	= (1 << kStandbyTimerBit),		// Mask for Standby Timer supported
+
+	// Extensions field (word 53)
+	kCurFieldsValidBit		= 0,							// Bit to show words 54-58 are valid
+	kExtFieldsValidBit		= 1,							// Bit to show words 64-70 are valid
+	kCurFieldsValidMask		= (1 << kCurFieldsValidBit),	// Mask for current fields valid
+	kExtFieldsValidMask		= (1 << kExtFieldsValidBit),	// Extension word valid
+
+	// Advanced PIO Transfer Modes field (word 64)
+	kMode3Bit				= 0,							// Bit to indicate mode 3 is supported
+	kMode3Mask				= (1 << kMode3Bit),				// Mask for mode 3 support
+	
+	// Integrity of Identify data (word 255)
+	kChecksumValidCookie	= 0xA5							// Bits 7:0 if device supports feature
+	
+};
+
+
+/* String size constants */
+enum
+{
+	kSizeOfATAModelString 		= 40,
+	kSizeOfATARevisionString	= 8
+};
+
+/* ATA Command timeout constants ( in milliseconds ) */
+enum
+{
+	kATATimeout10Seconds	= 10000,
+	kATATimeout30Seconds	= 30000,
+	kATATimeout45Seconds	= 45000,
+	kATATimeout1Minute		= 60000,
+	kATADefaultTimeout		= kATATimeout30Seconds
+};
+
+
+/* Retry constants */
+enum
+{
+	kATAZeroRetries		= 0,
+	kATADefaultRetries	= 4
+};
+
+/* max number of blocks supported in ATA transaction */
+enum
+{
+	kIOATASectorCount8Bit	= 8,
+	kIOATASectorCount16Bit	= 16
+};
+
+enum
+{
+	kIOATAMaximumBlockCount8Bit		= (1 << kIOATASectorCount8Bit),
+	kIOATAMaximumBlockCount16Bit	= (1 << kIOATASectorCount16Bit),
+	
+	// For backwards compatibility
+	kIOATAMaxBlocksPerXfer			= kIOATAMaximumBlockCount8Bit
+};
+
+
+
+/* Power Management time constants (in seconds) */
+enum
+{
+	kSecondsInAMinute	= 60,
+	k5Minutes			= 5 * kSecondsInAMinute
+};
+
+/* Bits for features published in Word 82 of device identify data */
+enum
+{
+	kATASupportsSMARTBit					= 0,
+	kATASupportsPowerManagementBit  		= 3,
+	kATASupportsWriteCacheBit				= 5
+};
+
+/* Masks for features published in Word 82 of device identify data */
+enum
+{
+	kATASupportsSMARTMask					= (1 << kATASupportsSMARTBit),
+	kATASupportsPowerManagementMask 		= (1 << kATASupportsPowerManagementBit),
+	kATASupportsWriteCacheMask				= (1 << kATASupportsWriteCacheBit)
+};
+
+/* Bits for features published in Word 83 of device identify data */
+enum
+{
+	kATASupportsCompactFlashBit				= 2,
+	kATASupportsAdvancedPowerManagementBit 	= 3,
+	
+	kATASupports48BitAddressingBit			= 10,
+	
+	kATASupportsFlushCacheBit				= 12,
+	kATASupportsFlushCacheExtendedBit		= 13
+};
+
+/* Masks for features published in Word 83 of device identify data */
+enum
+{
+	kATASupportsCompactFlashMask			= (1 << kATASupportsCompactFlashBit),
+	kATASupportsAdvancedPowerManagementMask = (1 << kATASupportsAdvancedPowerManagementBit),
+	
+	kATASupports48BitAddressingMask			= (1 << kATASupports48BitAddressingBit),
+	
+	kATASupportsFlushCacheMask				= (1 << kATASupportsFlushCacheBit),
+	kATASupportsFlushCacheExtendedMask		= (1 << kATASupportsFlushCacheExtendedBit),
+	
+	// Mask to ensure data is valid
+	kIdentifyWordValidationMask				= 0xC000,
+	kIdentifyWordValid						= 0x4000
+};
+
+/* Bits for features published in Word 84 of device identify data */
+enum
+{
+	kATAForceUnitAccessFeatureBit			= 6,
+};
+
+/* Masks for features published in Word 84 of device identify data */
+enum
+{
+	kATAForceUnitAccessFeatureMask			= (1 << kATAForceUnitAccessFeatureBit),
+};
+
+/* Bits for features published in Word 85 of device identify data */
+enum
+{
+	kATAWriteCacheEnabledBit				= 5
+};
+
+/* Masks for features published in Word 85 of device identify data */
+enum
+{
+	kATAWriteCacheEnabledMask				= (1 << kATAWriteCacheEnabledBit)
+};
+
+
+/* Bits for features published in Word 106 of device identify data */
+enum
+{
+	kATAPhysicalLogicalEnabledBit0			= 15,
+	kATAPhysicalLogicalEnabledBit1			= 14,
+	kATAMultipleLogicalSectorsBit			= 13,
+	kATAValidLogicalSectorSizeBit			= 12	
+};
+
+/* Masks for features published in Word 106 of device identify data */
+enum
+{
+	kATAPhysicalLogicalEnabledMask			= (1 << kATAPhysicalLogicalEnabledBit0) | (1 << kATAPhysicalLogicalEnabledBit1),
+	kATAPhysicalLogicalEnabledValue			= (0 << kATAPhysicalLogicalEnabledBit0) | (1 << kATAPhysicalLogicalEnabledBit1),
+	kATAMultipleLogicalSectorsMask			= (1 << kATAMultipleLogicalSectorsBit),
+	kATAValidLogicalSectorSizeMask			= (1 << kATAValidLogicalSectorSizeBit),
+	kATAPhysicalSectorSizeMask				= 0xF,
+	kATALogicalSectorAlignmentMask			= 0x3FFF
+};
+
+// Property table keys
+#define kIOATASupportedFeaturesKey		"ATA Features"
+
+/* ATA supported features */
+enum
+{
+	kIOATAFeaturePowerManagement			= 0x01,		/* OBSOLETE */
+	kIOATAFeatureWriteCache					= 0x02,		/* OBSOLETE */
+	kIOATAFeatureAdvancedPowerManagement 	= 0x04,
+	kIOATAFeatureCompactFlash				= 0x08,
+	kIOATAFeature48BitLBA					= 0x10,
+	kIOATAFeatureSMART						= 0x20
+};
+
+/* ATA Advanced Power Management settings (valid settings range from 1-254),
+the settings below are the more common settings */
+enum
+{
+	kIOATAMaxPerformance					= 0xFE,
+	kIOATADefaultPerformance			 	= 0x80,
+	kIOATAMaxPowerSavings					= 0x01
+};
+
+/* ATA Transfer Mode bit masks */
+enum
+{
+	kATAEnableUltraDMAModeMask 		= 0x40,
+	kATAEnableMultiWordDMAModeMask	= 0x20,
+	kATAEnablePIOModeMask			= 0x08
+};
+
+
+typedef uint32_t	ATAOperationType;
+enum
+{
+	kATAOperationTypeRead				= 0,
+	kATAOperationTypeWrite				= 1,
+	kATAOperationTypeFlushCache			= 2,
+	kATAOperationTypeSMART				= 3,
+	kATAOperationTypeConfiguration		= 4,
+	kATAOperationTypePowerManagement	= 5,
+	kATAOperationTypeSMS				= 6
+};
+
+#if defined(KERNEL)
+
+typedef struct __ATAIORequest *	ATARequestIdentifier;
+
+#endif	// defined(KERNEL)
+	
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _IOKIT_IO_ATA_STORAGE_DEFINES_H_ */
diff --git a/i386/include/IOKit/stream/.svn/all-wcprops b/i386/include/IOKit/stream/.svn/all-wcprops
new file mode 100644
index 0000000..cdf93a5
--- /dev/null
+++ b/i386/include/IOKit/stream/.svn/all-wcprops
@@ -0,0 +1,29 @@
+K 25
+svn:wc:ra_dav:version-url
+V 59
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/stream
+END
+IOStreamShared.h
+K 25
+svn:wc:ra_dav:version-url
+V 76
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/stream/IOStreamShared.h
+END
+IOStreamUserClient.h
+K 25
+svn:wc:ra_dav:version-url
+V 80
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/stream/IOStreamUserClient.h
+END
+IOStream.h
+K 25
+svn:wc:ra_dav:version-url
+V 70
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/stream/IOStream.h
+END
+IOStreamFamily.h
+K 25
+svn:wc:ra_dav:version-url
+V 76
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/stream/IOStreamFamily.h
+END
diff --git a/i386/include/IOKit/stream/.svn/entries b/i386/include/IOKit/stream/.svn/entries
new file mode 100644
index 0000000..1c63f86
--- /dev/null
+++ b/i386/include/IOKit/stream/.svn/entries
@@ -0,0 +1,164 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/stream
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IOStreamShared.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+925f10b148830bcae4312aa8a7ee2fea
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4647
+
+IOStreamUserClient.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+bdc9cf99229f3972604d4952b63a3aa2
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2502
+
+IOStream.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+3b670008c3567c9dc3699542b69dca37
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+21734
+
+IOStreamFamily.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+f66e1be35cc893be907e91b6bc0f76e7
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+256
+
diff --git a/i386/include/IOKit/stream/.svn/text-base/IOStream.h.svn-base b/i386/include/IOKit/stream/.svn/text-base/IOStream.h.svn-base
new file mode 100644
index 0000000..01efad4
--- /dev/null
+++ b/i386/include/IOKit/stream/.svn/text-base/IOStream.h.svn-base
@@ -0,0 +1,609 @@
+/*
+ *  Copyright 2006 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#if !defined(__IOKIT_IOSTREAM_H)
+#define __IOKIT_IOSTREAM_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/IOUserClient.h>
+
+#include <IOKit/stream/IOStreamShared.h>
+
+/*!
+    @header IOStream.h
+    Definitions for IOStream family.
+ */
+
+class IOStreamBuffer;
+
+/*!
+    @class IOStream
+    @abstract
+    A class representing a stream of data buffers passed from kernel to
+    user space and back again.
+    @discussion
+    The IOStream class defines a mechanism for moving buffers of data from
+    kernel space to user space or vice-versa.  The policy for which direction
+    the data flows and the nature of the data is left up the the implementer
+    of the driver which uses IOStream.
+
+    Although it is expected that the client of an IOStream will be in user space,
+    this is not required.
+ 
+    References to "output" mean "from the IOStream to the user client", and
+    "input" means "from the user client to the IOStream."
+
+ */
+
+class IOStream : public IOService
+{
+    OSDeclareDefaultStructors(IOStream);
+
+ protected:
+    OSArray *               _buffers;       // IOStreamBuffer objects in this stream
+
+    IOItemCount             _queueCount;    // Number of entries for the queues
+    
+    IOMemoryDescriptor *    _inputQueueDescriptor;
+    IOMemoryMap *           _inputQueueMap;
+    
+    IOMemoryDescriptor *    _outputQueueDescriptor;
+    IOMemoryMap *           _outputQueueMap;
+    
+    IOStreamBufferQueue *   _outputQueue;   // Shared memory for buffers out to user space
+    IOStreamBufferQueue *   _inputQueue;    // Shared memory for buffers in from user space
+    
+    mach_port_t             _outputPort;
+    mach_port_t             _inputPort;
+    
+    OSArray *               _memoryMaps;    // Maps for data queues
+    
+    IOStreamMode            _streamMode;
+    
+ public:
+        
+    /*!
+        @functiongroup Creating IOStream objects
+     */
+        
+    /*!
+        @function withBuffers
+     @param mode The initial mode of the stream, either output, input, or input/output.
+     @param queueLength The nuber of queue entries to reserve in the input and output queue.
+     Zero means to make the queues big enough to accommodate all the buffers at once.
+     @param properties
+     A dictionary of properties which will be set on the stream.
+     @param buffers
+     An array of IOStreamBuffer objects which will be the buffers for this stream.
+     */
+        
+    static IOStream *withBuffers(OSArray *buffers, IOStreamMode mode = kIOStreamModeOutput, IOItemCount queueLength = 0, OSDictionary *properties = 0);
+    
+    virtual bool init(OSDictionary *properties = 0);
+    
+    /*!
+        @function initWithBuffers
+     @param mode The initial mode of the stream, either output, input, or input/output.
+     @param queueLength The nuber of queue entries to reserve in the input and output queue.
+     Zero means to make the queues big enough to accommodate all the buffers at once.
+     @param properties
+     A dictionary of properties which will be set on the stream.
+     @param buffers
+     An array of IOStreamBuffer objects which will be the buffers for this stream.
+     */
+    virtual bool initWithBuffers(OSArray *buffers, IOStreamMode mode = kIOStreamModeOutput, IOItemCount queueLength = 0, OSDictionary *properties = 0);
+    
+    /*!
+        @function free
+     */
+    virtual void free(void);
+    
+    /*!
+        @functiongroup Opening and closing streams
+     */
+    
+    /*!
+        @function handleOpen
+        @abstract The handleOpen() method relies on the default IOService behavior
+        to ensure that
+        only one client has the stream open at a time.
+        The shared input and output queues are created at open time.
+     @param options
+     @param arg
+     */
+    virtual bool handleOpen( 	IOService *	  forClient,
+                                IOOptionBits	  options,
+                                void *		  arg );
+    
+    /*!
+        @function handleClose
+        @abstract The handleClose method destroys the shared input and output
+        queues.
+     @param options
+     */
+    virtual void handleClose(   IOService *	  forClient,
+                                IOOptionBits  options );
+
+    /*!
+        @functiongroup Managing shared queues
+     */
+    
+    /*!
+        @function createQueues
+        @abstract Creates the shared input and output queues, without regard
+        to whether the stream is open or not.
+        Normally this is called by handleOpen().
+     @param queueLength
+     @param options
+     @result Returns kIOReturnSuccess if the queues were successfully created.
+     */
+    virtual IOReturn createQueues( IOItemCount queueLength = 0, IOOptionBits options = 0 );
+    
+    /*!
+        @function destroyQueues
+        @abstract Releases the shared input and output queues.
+     @result Returns kIOReturnSuccess if the queues were successfully destroyed.
+     The queues cannot be destroyed while the stream is open by a client.
+     */
+    virtual IOReturn destroyQueues( void );
+    
+    /*!
+        @function getOutputQueue
+     @result A pointer to the output IOStreamBufferQueue structure for the stream,
+     or NULL if the stream is not open and the queue has not been created yet.
+     */
+    virtual IOStreamBufferQueue *getOutputQueue(void);           // get shared-memory output queue
+    
+    /*!
+        @function getOutputQueueMemoryDescriptor
+     @result An IOMemoryDescriptor object repesenting the shared memory
+     output queue buffer.
+     */
+    virtual IOMemoryDescriptor *getOutputQueueMemoryDescriptor(void);
+    
+    /*!
+        @function getInputQueue
+     @result A pointer to the input IOStreamBufferQueue structure for the stream,
+     or NULL if the stream is not open and the queue has not been created yet.
+     */
+    virtual IOStreamBufferQueue *getInputQueue(void);            // get shared-memory input queue
+    
+    /*!
+        @function getInputQueueMemoryDescriptor
+     @result An IOMemoryDescriptor object repesenting the shared memory
+     input queue buffer.
+     */
+    virtual IOMemoryDescriptor *getInputQueueMemoryDescriptor(void);
+    
+    
+    /*!
+        @functiongroup Managing buffers in an IOStream
+     */
+    
+    /*!
+        @function addBuffer
+        @abstract Add a buffer to an IOStream.
+        @param buffer
+        @discussion
+        Adds an IOStreamBuffer to an IOStream.  It will be added to the end
+     of the buffer array, so the buffer ID of existing buffers will not change.
+     */
+    virtual IOReturn addBuffer(IOStreamBuffer *buffer);  // add a new buffer to the stream
+    
+    /*!
+        @function addBuffers
+     @param buffers
+     @result
+     */
+    virtual IOReturn addBuffers(OSArray *buffers);
+
+    /*!
+        @function removeBuffer
+     @param buffer A pointer to an IOStreamBuffer object in the stream.
+     @result Returns kIOReturnSuccess if the buffer was removed, or kIOReturnNotFound
+     if the buffer was not in this stream.
+     @abstract
+     Removes a buffer from the stream.  Buffers cannot be removed
+     while the stream is open, as this will change the buffer IDs of existing
+     buffers.
+     */
+    virtual IOReturn removeBuffer(IOStreamBuffer *buffer);
+    
+    /*!
+        @function removeBuffer
+     @param bufferID The ID of the buffer to remove.
+     @result Returns kIOReturnSuccess if the buffer was removed.
+     @abstract
+     Removes a buffer from the stream.  Buffers cannot be removed
+     while the stream is open, as this will change the buffer IDs of existing
+     buffers.
+     */
+    
+    virtual IOReturn removeBuffer(IOStreamBufferID bufferID);
+    
+    /*!
+        @function removeAllBuffers
+     @result
+     */
+    virtual IOReturn removeAllBuffers( void );
+    
+    /*!
+        @function removeAllBuffers
+     @result Returns kIOReturnSuccess if all the buffers were successfully
+     removed.   Buffers cannot be removed
+     while the stream is open, as this will change the buffer IDs of existing
+     buffers.
+     
+     */
+    virtual IOItemCount getBufferCount( void );
+    
+    /*!
+        @function getBuffers
+        @abstract Get an array containing all the buffers in the stream.
+        @discussion
+        Returns an OSArray containing all the buffers in the stream in order of their buffer ID.
+     */
+    virtual OSArray *getBuffers( void );
+    
+    
+    /*!
+        @function getBufferWithID
+     @param bufferID
+     The ID of the buffer to get.
+     @result
+     A pointer to an IOStreamBuffer object, or NULL if the
+     buffer ID was invalid for this stream.
+     */
+    
+    virtual IOStreamBuffer *getBufferWithID(IOStreamBufferID bufferID);
+    
+    /*!
+        @functiongroup Managing notification ports
+     */
+    
+    /*!
+        @function getInputPort
+        @abstract Get the Mach port used to receive notifications
+        from user space that a buffer has been added to the input queue.
+     */
+    virtual mach_port_t getInputPort(void);
+    
+    /*!
+        @function setInputPort
+        @abstract Set the Mach port used to receive notifications from
+        user space that a buffer has been added to the input queue.
+        @param port
+
+     */
+    virtual IOReturn setInputPort(mach_port_t port);
+    
+    /*!
+        @function getOutputPort
+        @abstract Get the Mach port used to send notifications to user space
+        that a buffer has been added to the output queue.
+     */
+    virtual mach_port_t getOutputPort(void);
+    
+    /*!
+        @function setOutputPort
+        @abstract Set the Mach port used to send notifications to user space
+        that a buffer has been added to the output queue.
+        @param port
+     */
+    virtual IOReturn setOutputPort(mach_port_t port);
+    
+    /*!
+        @function sendOutputNotification
+     @abstract Send a notification to the user client that data is available
+     for reading on the output queue.  This will result in the user's output
+     handler being called, if they registered one.
+     @result Returns kIOReturnSuccess if the notification was successfully sent.
+     */
+    virtual IOReturn sendOutputNotification(void);
+    
+    /*!
+        @functiongroup Queueing and dequeueing buffers
+     */
+    
+    /*!
+        @function enqueueOutputBuffer
+        @abstract A convenience method for enqueueing a buffer.
+        @param buffer
+     @param dataOffset
+     @param dataLength
+     @param controlOffset
+     @param controlLength
+     @result
+     */
+    virtual IOReturn enqueueOutputBuffer(IOStreamBuffer *buffer,
+                                         IOByteCount dataOffset = 0,
+                                         IOByteCount dataLength = 0,
+                                         IOByteCount controlOffset = 0,
+                                         IOByteCount controlLength = 0);
+    
+    
+    /*!
+        @function enqueueOutputEntry
+        @param entry
+        @result
+     */
+    virtual IOReturn enqueueOutputEntry( IOStreamBufferQueueEntry *entry );
+    
+    /*!
+        @function dequeueInputEntry
+        @param entry
+     @result
+     */
+    virtual IOReturn dequeueInputEntry( IOStreamBufferQueueEntry *entry );
+    
+    /*!
+        @functiongroup Managing notifications
+     */
+    
+    /*!
+        @function inputCallback
+        @abstract Input callback function to be implemented by a subclass;
+        @param token
+        A 32-bit token value that can be used by convention to communicate
+        from user space to the stream.  The semantics of this value are
+        defined by the IOStream subclass.
+        @discussion
+        The inputCallback() method is called as a result of a fast trap
+        from user space.  It is called on the same thread as the user request,
+        but the subclass should implement this call as a notification sent
+        to a workloop so that the request is asynchronous.
+     */
+    virtual void inputCallback( UInt32 token );
+    
+    /*!
+        @function inputSyncCallback
+        @abstract Input callback function to be implemented by a subclass.
+        @param token
+        A 32-bit token value that can be used by convention to communicate
+        from user space to the stream.  The semantics of this value are
+        defined by the IOStream subclass.
+        @discussion
+        The inputSyncCallback() method is called as a result of a fast trap
+        from user space.  It is called on the same thread as the user request,
+        so no context switch is necessary.
+     */
+    virtual void inputSyncCallback( UInt32 token );
+    
+    /*!
+        @functiongroup Stream control
+     */
+    
+    /*!
+        @function getStreamMode
+     @abstract Returns the mode of the stream, either input or output.
+     @result The mode of the stream, either kIOStreamModeInput
+     (from user space to kernel space) or the default
+     kIOStreamModeOutput (from kernel space to user space).
+     */
+    virtual IOStreamMode getStreamMode(void);
+    
+    /*!
+        @function setStreamMode
+     @abstract Sets the mode of the stream, either input or output.
+     @discussion Subclasses may define whether it is possible
+     to change the mode of a stream.
+     */
+    virtual IOReturn setStreamMode(IOStreamMode mode);
+
+    /*!
+        @function startStream
+     @abstract Start sending data on a stream.
+     @result Returns kIOReturnSuccess if the stream was successfully started.
+     @discussion This must be implemented by a subclass.
+     */
+    virtual IOReturn startStream(void);
+    
+    /*!
+        @function stopStream
+     @abstract Stop sending data on a stream.
+     @result Returns kIOReturnSuccess if the stream was successfully stopped.
+     @discussion This must be implemented by a subclass.
+     */
+    virtual IOReturn stopStream(void);
+    
+    /*!
+        @function suspendStream
+     @abstract Temporarily suspend data flow on the stream.
+     @result Returns kIOReturnSuccess if the stream was successfully suspended.
+     @discussion This must be implemented by a subclass.
+     */
+    virtual IOReturn suspendStream(void);
+    
+    /*!
+        @functiongroup Managing user clients
+     */
+    
+    /*!
+        @function newUserClient
+     @abstract See the documentation for the IOService method newUserClient.
+     */
+    virtual IOReturn newUserClient( task_t owningTask, void * securityID,
+                                    UInt32 type,  OSDictionary * properties,
+                                    IOUserClient ** handler );
+    
+
+    /* Reserved slots */
+    
+    OSMetaClassDeclareReservedUnused(IOStream, 0);
+    OSMetaClassDeclareReservedUnused(IOStream, 1);
+    OSMetaClassDeclareReservedUnused(IOStream, 2);
+    OSMetaClassDeclareReservedUnused(IOStream, 3);
+    OSMetaClassDeclareReservedUnused(IOStream, 4);
+    OSMetaClassDeclareReservedUnused(IOStream, 5);
+    OSMetaClassDeclareReservedUnused(IOStream, 6);
+    OSMetaClassDeclareReservedUnused(IOStream, 7);
+    OSMetaClassDeclareReservedUnused(IOStream, 8);
+    OSMetaClassDeclareReservedUnused(IOStream, 9);
+    OSMetaClassDeclareReservedUnused(IOStream, 10);
+    OSMetaClassDeclareReservedUnused(IOStream, 11);
+    OSMetaClassDeclareReservedUnused(IOStream, 12);
+    OSMetaClassDeclareReservedUnused(IOStream, 13);
+    OSMetaClassDeclareReservedUnused(IOStream, 14);
+    OSMetaClassDeclareReservedUnused(IOStream, 15);
+    OSMetaClassDeclareReservedUnused(IOStream, 16);
+    OSMetaClassDeclareReservedUnused(IOStream, 17);
+    OSMetaClassDeclareReservedUnused(IOStream, 18);
+    OSMetaClassDeclareReservedUnused(IOStream, 19);
+    OSMetaClassDeclareReservedUnused(IOStream, 20);
+    OSMetaClassDeclareReservedUnused(IOStream, 21);
+    OSMetaClassDeclareReservedUnused(IOStream, 22);
+    OSMetaClassDeclareReservedUnused(IOStream, 23);
+    OSMetaClassDeclareReservedUnused(IOStream, 24);
+    OSMetaClassDeclareReservedUnused(IOStream, 25);
+    OSMetaClassDeclareReservedUnused(IOStream, 26);
+    OSMetaClassDeclareReservedUnused(IOStream, 27);
+    OSMetaClassDeclareReservedUnused(IOStream, 28);
+    OSMetaClassDeclareReservedUnused(IOStream, 29);
+    OSMetaClassDeclareReservedUnused(IOStream, 30);
+    OSMetaClassDeclareReservedUnused(IOStream, 31);
+    
+};
+
+
+/*!
+    @class IOStreamBuffer
+    A class representing a data buffer that is part of an IOStream.
+ */
+
+class IOStreamBuffer : public OSObject
+{
+    OSDeclareDefaultStructors(IOStreamBuffer);
+
+protected:
+    IOMemoryDescriptor *     _dataBuffer;        // The data buffer is expected to be filled by hardware.
+    IOMemoryDescriptor *     _controlBuffer;     // The control buffer is expected to be defined by the hardware driver.
+    
+    IOStreamBufferID         _bufferID;          // Client handle for this buffer.
+    
+    OSArray *                _clientMemoryMaps;  // Maps for clients who are sharing these buffers.
+    
+    SInt32                   _clientReferenceCount;    // Count of client uses of this buffer.  May be negative.
+    
+public:
+    /*!
+        @function initWithMemoryDescriptors
+     */        
+    virtual bool initWithMemoryDescriptors(IOMemoryDescriptor *dataBuffer,
+                                           IOMemoryDescriptor *controlBuffer,
+                                           IOStreamBufferID bufferID = 0);
+    
+    /*!
+        @function withMemoryDescriptors
+     */    
+    static IOStreamBuffer *withMemoryDescriptors(IOMemoryDescriptor *dataBuffer,
+                                                 IOMemoryDescriptor *controlBuffer,
+                                                 IOStreamBufferID bufferID = 0);
+    
+    virtual void free(void);
+    
+    /*!
+        @function getBufferID
+        @abstract Gets the buffer identifier for the IOStreamBuffer object.
+        @discussion The buffer identifier is unique across all buffers in a stream.
+     */
+    virtual IOStreamBufferID getBufferID(void);
+    
+    /*!
+        @function setBufferID
+        @abstract Sets the buffer identifier for the IOStreamBuffer object.
+     */
+    
+    virtual void setBufferID( IOStreamBufferID bufferID );
+    
+    /*!
+        @function setDataBuffer
+        @abstract Sets the data buffer for the IOStreamBuffer object.
+     */
+    virtual void setDataBuffer(IOMemoryDescriptor *dataBuffer);
+    
+    /*!
+        @function setControlBuffer
+        @abstract Sets the control buffer for the IOStreamBuffer object.
+     */
+    virtual void setControlBuffer(IOMemoryDescriptor *controlBuffer);
+    
+    /*!
+        @function getDataBuffer
+     @result A pointer to the IOMemoryDescriptor for the data buffer.
+     */
+    virtual IOMemoryDescriptor *getDataBuffer(void);
+    
+    /*!
+        @function getControlBuffer
+     @result A pointer to the IOMemoryDescriptor for the control buffer.
+     */
+    virtual IOMemoryDescriptor *getControlBuffer(void);
+    
+    /*!
+        @function getClientReferenceCount
+     @result The count of client references to this buffer.  It may be positive
+     or negative, depending on whether the client is sending data into the kernel,
+     or the kernel is sending data out to the client.
+     */
+    virtual SInt32 getClientReferenceCount( void );
+    
+    /*!
+        @function sendClientReference
+     @param offset The offset in the buffer of the data sent to the client.
+     @param length The length of the data sent to the client.
+     @result The new client reference count.
+     @abstract
+     */
+    virtual SInt32 sendClientReference( IOByteCount offset = 0, IOByteCount length = 0 );
+    
+    /*!
+        @function receiveClientReference
+     @param offset The offset in the buffer of the data from the client.
+     @param length The length of the data from the client.
+     @abstract
+     */
+    virtual SInt32 receiveClientReference( IOByteCount offset = 0, IOByteCount length = 0 );
+    
+    /* Reserved slots */
+    
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 0);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 1);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 2);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 3);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 4);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 5);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 6);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 7);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 8);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 9);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 10);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 11);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 12);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 13);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 14);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 15);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 16);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 17);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 18);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 19);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 20);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 21);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 22);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 23);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 24);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 25);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 26);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 27);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 28);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 29);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 30);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 31);
+    
+};
+
+#endif /* ! __IOKIT_IOSTREAM_H */
+
diff --git a/i386/include/IOKit/stream/.svn/text-base/IOStreamFamily.h.svn-base b/i386/include/IOKit/stream/.svn/text-base/IOStreamFamily.h.svn-base
new file mode 100644
index 0000000..a4eb7f0
--- /dev/null
+++ b/i386/include/IOKit/stream/.svn/text-base/IOStreamFamily.h.svn-base
@@ -0,0 +1,13 @@
+/*
+ *  Copyright 2006 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#ifndef __IOKIT_IOSTREAMFAMILY_H
+#define __IOKIT_IOSTREAMFAMILY_H
+
+#include <IOKit/stream/IOStream.h>
+#include <IOKit/stream/IOStreamShared.h>
+
+
+#endif /* !__IOKIT_IOSTREAMFAMILY_H */
diff --git a/i386/include/IOKit/stream/.svn/text-base/IOStreamShared.h.svn-base b/i386/include/IOKit/stream/.svn/text-base/IOStreamShared.h.svn-base
new file mode 100644
index 0000000..5b2c0a3
--- /dev/null
+++ b/i386/include/IOKit/stream/.svn/text-base/IOStreamShared.h.svn-base
@@ -0,0 +1,175 @@
+/*
+ *  IOStreamShared.h
+ *  IOStreamFamily
+ *
+ *  Copyright 2006 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#if !defined(__IOKIT_IOSTREAMSHARED_H)
+#define __IOKIT_IOSTREAMSHARED_H
+
+#include <sys/cdefs.h>
+
+#include <IOKit/IOTypes.h>
+
+/*!
+    @header IOStreamShared.h
+    IOStream definitions shared between kernel and user space.
+ */
+
+__BEGIN_DECLS    
+   
+// Buffer numbers are guaranteed to go from 0 to bufferCount - 1.
+/*!
+    @typedef IOStreamBufferID
+ */
+typedef UInt32 IOStreamBufferID;
+#define kIOStreamBufferIDInvalid (~0)
+
+// This is the header for the shared-memory queue used to send buffer notifications
+// from kernel to user space or vice versa.
+
+// Queue entry in input or output queue
+
+#ifdef __cplusplus
+
+/*!
+    @struct IOStreamBufferQueueEntry
+    @field bufferID     The ID of the buffer passed in this queue entry.
+    @field dataLength   The length of the valid data in the buffer.
+    @field reserved     Reserved for future use.
+*/
+    
+struct IOStreamBufferQueueEntry {
+    IOStreamBufferID    bufferID;
+    UInt32              dataOffset;
+    UInt32              dataLength;
+    UInt32              controlOffset;
+    UInt32              controlLength;
+    UInt32              reserved[3];
+};
+
+
+/*!
+    @struct IOStreamBufferQueue
+    @field entryCount   The number of queue entries in the queue.
+    @field headIndex    The index of the next queue slot that will be filled in by the queue writer.
+    @field tailIndex    The index of the next queue slot that can be read by the queue reader.
+    @field reserved     Reserved for future use.
+    @field queue        The array of queue entries.
+ */
+
+struct IOStreamBufferQueue {
+    UInt32                      entryCount;
+    volatile UInt32             headIndex;
+    volatile UInt32             tailIndex;
+    UInt32                      reserved;
+    IOStreamBufferQueueEntry    queue[0];
+};
+
+#else
+
+typedef struct __IOStreamBufferQueueEntry {
+    IOStreamBufferID    bufferID;
+    UInt32              dataOffset;
+    UInt32              dataLength;
+    UInt32              controlOffset;
+    UInt32              controlLength;
+    UInt32              reserved[3];
+} IOStreamBufferQueueEntry;
+
+typedef struct __IOStreamBufferQueue {
+    UInt32                      entryCount;
+    volatile UInt32             headIndex;
+    volatile UInt32             tailIndex;
+    UInt32                      reserved;
+    IOStreamBufferQueueEntry    queue[0];
+} IOStreamBufferQueue;
+
+#endif
+
+/*!
+    @enum Memory mapping types
+    @constant kIOStreamMemoryTypeOutputQueue
+    @constant kIOStreamMemoryTypeInputQueue
+    @constant kIOStreamMemoryTypeBufferData
+    @constant kIOStreamMemoryTypeBufferControl
+    @constant kIOStreamBufferIDMask
+    @constant kIOStreamMemoryTypeMask
+    @abstract Memory types used with IOConnectMapMemory().
+ */
+enum {
+    kIOStreamMemoryTypeOutputQueue   = 0x10000000,
+    kIOStreamMemoryTypeInputQueue    = 0x20000000,
+    kIOStreamMemoryTypeBufferData    = 0x30000000,
+    kIOStreamMemoryTypeBufferControl = 0x40000000,
+    kIOStreamBufferIDMask            = 0x0FFFFFFF,
+    kIOStreamMemoryTypeMask          = 0xF0000000
+};
+
+/*!
+    @enum Mach port types
+    @constant kIOStreamPortTypeOutput
+    @constant kIOStreamPortTypeInput
+    @abstract Port types used with IOConnectSetNotificationPort().
+ */
+enum {
+    kIOStreamPortTypeOutput,
+    kIOStreamPortTypeInput
+};
+
+/*!
+    @enum IOStream open options
+ */
+ 
+enum {
+    kIOStreamOptionOpenExclusive = 0x00010000,
+    kIOStreamOptionOpenShared    = 0x00020000
+};
+
+/*!
+    @enum User client methods
+    @constant kIOStreamMethodOpen
+    @constant kIOStreamMethodClose
+    @constant kIOStreamMethodStart
+    @constant kIOStreamMethodStop
+    @constant kIOStreamMethodSuspend
+    @constant kIOStreamMethodGetMode
+    @constant kIOStreamMethodSetMode
+ 
+    @abstract Client method numbers used with IOConnectMethod...() functions.
+ */
+enum {
+    kIOStreamMethodOpen,
+    kIOStreamMethodClose,
+    kIOStreamMethodStart,
+    kIOStreamMethodStop,
+    kIOStreamMethodSuspend,
+    kIOStreamMethodGetMode,
+    kIOStreamMethodSetMode,
+    kIOStreamMethodGetBufferCount
+};
+
+/*!
+    @enum User client traps
+    @constant kIOStreamEnqueueInputTrap
+    @constant kIOStreamEnqueueInputSyncTrap
+    @abstract Client trap numbers used with IOConnectTrap..() functions.
+ */
+enum {
+    kIOStreamEnqueueInputTrap,
+    kIOStreamEnqueueInputSyncTrap
+};
+
+typedef enum {
+    kIOStreamModeInput,         // From user to kernel space
+    kIOStreamModeOutput,        // From kernel to user space
+    kIOStreamModeInputOutput    // bidirectional
+} IOStreamMode;
+
+
+__END_DECLS
+
+#endif /* ! __IOKIT_IOSTREAMSHARED_H */
+
diff --git a/i386/include/IOKit/stream/.svn/text-base/IOStreamUserClient.h.svn-base b/i386/include/IOKit/stream/.svn/text-base/IOStreamUserClient.h.svn-base
new file mode 100644
index 0000000..887575a
--- /dev/null
+++ b/i386/include/IOKit/stream/.svn/text-base/IOStreamUserClient.h.svn-base
@@ -0,0 +1,76 @@
+/*
+ *  IOStreamUserClient.h
+ *  IOStreamFamily
+ *
+ *  Copyright 2006 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#if !defined( __IOKIT_IOSTREAMUSERCLIENT_H )
+#define __IOKIT_IOSTREAMUSERCLIENT_H
+
+
+#include <IOKit/IOUserClient.h>
+
+#include <IOKit/stream/IOStreamShared.h>
+#include <IOKit/stream/IOStream.h>
+
+class IOStreamUserClient : public IOUserClient
+{
+    OSDeclareDefaultStructors( IOStreamUserClient )
+    
+protected:
+    IOStream * _owner;
+    task_t     _task;
+    
+public:
+    virtual bool initWithTask(
+                                  task_t owningTask, void * securityToken, UInt32 type,
+                                  OSDictionary * properties);
+    virtual bool initWithTask(
+                              task_t owningTask, void * securityToken, UInt32 type);
+    
+    virtual IOReturn clientClose( void );
+    virtual IOReturn clientDied( void );
+
+    virtual IOService * getService( void );
+    
+    virtual IOReturn registerNotificationPort(
+                                              mach_port_t port, UInt32 type, UInt32 refCon );
+    
+    virtual IOReturn connectClient( IOUserClient * client );
+    
+    virtual IOExternalMethod * getTargetAndMethodForIndex(
+                                                          IOService ** targetP, UInt32 index );
+    
+    virtual IOExternalTrap *
+      getTargetAndTrapForIndex( IOService **targetP, UInt32 index );
+
+    virtual IOReturn clientMemoryForType( UInt32 type,
+                                          IOOptionBits * options,
+                                          IOMemoryDescriptor ** memory );
+    
+    virtual bool start( IOService * provider );
+    
+    
+protected:
+    virtual IOReturn openMethod(  char * dataIn, char * dataOut,
+                                  IOByteCount inputSize, IOByteCount * outputSize );
+    virtual IOReturn closeMethod( void );
+    virtual IOReturn startMethod( void );
+    virtual IOReturn stopMethod( void );
+    virtual IOReturn suspendMethod( void );
+    virtual IOReturn getModeMethod(  char * dataOut,
+                                     IOByteCount * outputSize );
+    virtual IOReturn setModeMethod(  char * dataIn, 
+                                     IOByteCount inputSize );
+    virtual IOReturn getBufferCountMethod(  char * dataOut,
+                                            IOByteCount * outputSize );
+    
+    virtual IOReturn inputTrap( UInt32 token );
+    virtual IOReturn inputSyncTrap( UInt32 token );
+
+};
+
+#endif /* ! __IOKIT_IOSTREAMUSERCLIENT_H */
+
diff --git a/i386/include/IOKit/stream/IOStream.h b/i386/include/IOKit/stream/IOStream.h
new file mode 100644
index 0000000..01efad4
--- /dev/null
+++ b/i386/include/IOKit/stream/IOStream.h
@@ -0,0 +1,609 @@
+/*
+ *  Copyright 2006 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#if !defined(__IOKIT_IOSTREAM_H)
+#define __IOKIT_IOSTREAM_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/IOUserClient.h>
+
+#include <IOKit/stream/IOStreamShared.h>
+
+/*!
+    @header IOStream.h
+    Definitions for IOStream family.
+ */
+
+class IOStreamBuffer;
+
+/*!
+    @class IOStream
+    @abstract
+    A class representing a stream of data buffers passed from kernel to
+    user space and back again.
+    @discussion
+    The IOStream class defines a mechanism for moving buffers of data from
+    kernel space to user space or vice-versa.  The policy for which direction
+    the data flows and the nature of the data is left up the the implementer
+    of the driver which uses IOStream.
+
+    Although it is expected that the client of an IOStream will be in user space,
+    this is not required.
+ 
+    References to "output" mean "from the IOStream to the user client", and
+    "input" means "from the user client to the IOStream."
+
+ */
+
+class IOStream : public IOService
+{
+    OSDeclareDefaultStructors(IOStream);
+
+ protected:
+    OSArray *               _buffers;       // IOStreamBuffer objects in this stream
+
+    IOItemCount             _queueCount;    // Number of entries for the queues
+    
+    IOMemoryDescriptor *    _inputQueueDescriptor;
+    IOMemoryMap *           _inputQueueMap;
+    
+    IOMemoryDescriptor *    _outputQueueDescriptor;
+    IOMemoryMap *           _outputQueueMap;
+    
+    IOStreamBufferQueue *   _outputQueue;   // Shared memory for buffers out to user space
+    IOStreamBufferQueue *   _inputQueue;    // Shared memory for buffers in from user space
+    
+    mach_port_t             _outputPort;
+    mach_port_t             _inputPort;
+    
+    OSArray *               _memoryMaps;    // Maps for data queues
+    
+    IOStreamMode            _streamMode;
+    
+ public:
+        
+    /*!
+        @functiongroup Creating IOStream objects
+     */
+        
+    /*!
+        @function withBuffers
+     @param mode The initial mode of the stream, either output, input, or input/output.
+     @param queueLength The nuber of queue entries to reserve in the input and output queue.
+     Zero means to make the queues big enough to accommodate all the buffers at once.
+     @param properties
+     A dictionary of properties which will be set on the stream.
+     @param buffers
+     An array of IOStreamBuffer objects which will be the buffers for this stream.
+     */
+        
+    static IOStream *withBuffers(OSArray *buffers, IOStreamMode mode = kIOStreamModeOutput, IOItemCount queueLength = 0, OSDictionary *properties = 0);
+    
+    virtual bool init(OSDictionary *properties = 0);
+    
+    /*!
+        @function initWithBuffers
+     @param mode The initial mode of the stream, either output, input, or input/output.
+     @param queueLength The nuber of queue entries to reserve in the input and output queue.
+     Zero means to make the queues big enough to accommodate all the buffers at once.
+     @param properties
+     A dictionary of properties which will be set on the stream.
+     @param buffers
+     An array of IOStreamBuffer objects which will be the buffers for this stream.
+     */
+    virtual bool initWithBuffers(OSArray *buffers, IOStreamMode mode = kIOStreamModeOutput, IOItemCount queueLength = 0, OSDictionary *properties = 0);
+    
+    /*!
+        @function free
+     */
+    virtual void free(void);
+    
+    /*!
+        @functiongroup Opening and closing streams
+     */
+    
+    /*!
+        @function handleOpen
+        @abstract The handleOpen() method relies on the default IOService behavior
+        to ensure that
+        only one client has the stream open at a time.
+        The shared input and output queues are created at open time.
+     @param options
+     @param arg
+     */
+    virtual bool handleOpen( 	IOService *	  forClient,
+                                IOOptionBits	  options,
+                                void *		  arg );
+    
+    /*!
+        @function handleClose
+        @abstract The handleClose method destroys the shared input and output
+        queues.
+     @param options
+     */
+    virtual void handleClose(   IOService *	  forClient,
+                                IOOptionBits  options );
+
+    /*!
+        @functiongroup Managing shared queues
+     */
+    
+    /*!
+        @function createQueues
+        @abstract Creates the shared input and output queues, without regard
+        to whether the stream is open or not.
+        Normally this is called by handleOpen().
+     @param queueLength
+     @param options
+     @result Returns kIOReturnSuccess if the queues were successfully created.
+     */
+    virtual IOReturn createQueues( IOItemCount queueLength = 0, IOOptionBits options = 0 );
+    
+    /*!
+        @function destroyQueues
+        @abstract Releases the shared input and output queues.
+     @result Returns kIOReturnSuccess if the queues were successfully destroyed.
+     The queues cannot be destroyed while the stream is open by a client.
+     */
+    virtual IOReturn destroyQueues( void );
+    
+    /*!
+        @function getOutputQueue
+     @result A pointer to the output IOStreamBufferQueue structure for the stream,
+     or NULL if the stream is not open and the queue has not been created yet.
+     */
+    virtual IOStreamBufferQueue *getOutputQueue(void);           // get shared-memory output queue
+    
+    /*!
+        @function getOutputQueueMemoryDescriptor
+     @result An IOMemoryDescriptor object repesenting the shared memory
+     output queue buffer.
+     */
+    virtual IOMemoryDescriptor *getOutputQueueMemoryDescriptor(void);
+    
+    /*!
+        @function getInputQueue
+     @result A pointer to the input IOStreamBufferQueue structure for the stream,
+     or NULL if the stream is not open and the queue has not been created yet.
+     */
+    virtual IOStreamBufferQueue *getInputQueue(void);            // get shared-memory input queue
+    
+    /*!
+        @function getInputQueueMemoryDescriptor
+     @result An IOMemoryDescriptor object repesenting the shared memory
+     input queue buffer.
+     */
+    virtual IOMemoryDescriptor *getInputQueueMemoryDescriptor(void);
+    
+    
+    /*!
+        @functiongroup Managing buffers in an IOStream
+     */
+    
+    /*!
+        @function addBuffer
+        @abstract Add a buffer to an IOStream.
+        @param buffer
+        @discussion
+        Adds an IOStreamBuffer to an IOStream.  It will be added to the end
+     of the buffer array, so the buffer ID of existing buffers will not change.
+     */
+    virtual IOReturn addBuffer(IOStreamBuffer *buffer);  // add a new buffer to the stream
+    
+    /*!
+        @function addBuffers
+     @param buffers
+     @result
+     */
+    virtual IOReturn addBuffers(OSArray *buffers);
+
+    /*!
+        @function removeBuffer
+     @param buffer A pointer to an IOStreamBuffer object in the stream.
+     @result Returns kIOReturnSuccess if the buffer was removed, or kIOReturnNotFound
+     if the buffer was not in this stream.
+     @abstract
+     Removes a buffer from the stream.  Buffers cannot be removed
+     while the stream is open, as this will change the buffer IDs of existing
+     buffers.
+     */
+    virtual IOReturn removeBuffer(IOStreamBuffer *buffer);
+    
+    /*!
+        @function removeBuffer
+     @param bufferID The ID of the buffer to remove.
+     @result Returns kIOReturnSuccess if the buffer was removed.
+     @abstract
+     Removes a buffer from the stream.  Buffers cannot be removed
+     while the stream is open, as this will change the buffer IDs of existing
+     buffers.
+     */
+    
+    virtual IOReturn removeBuffer(IOStreamBufferID bufferID);
+    
+    /*!
+        @function removeAllBuffers
+     @result
+     */
+    virtual IOReturn removeAllBuffers( void );
+    
+    /*!
+        @function removeAllBuffers
+     @result Returns kIOReturnSuccess if all the buffers were successfully
+     removed.   Buffers cannot be removed
+     while the stream is open, as this will change the buffer IDs of existing
+     buffers.
+     
+     */
+    virtual IOItemCount getBufferCount( void );
+    
+    /*!
+        @function getBuffers
+        @abstract Get an array containing all the buffers in the stream.
+        @discussion
+        Returns an OSArray containing all the buffers in the stream in order of their buffer ID.
+     */
+    virtual OSArray *getBuffers( void );
+    
+    
+    /*!
+        @function getBufferWithID
+     @param bufferID
+     The ID of the buffer to get.
+     @result
+     A pointer to an IOStreamBuffer object, or NULL if the
+     buffer ID was invalid for this stream.
+     */
+    
+    virtual IOStreamBuffer *getBufferWithID(IOStreamBufferID bufferID);
+    
+    /*!
+        @functiongroup Managing notification ports
+     */
+    
+    /*!
+        @function getInputPort
+        @abstract Get the Mach port used to receive notifications
+        from user space that a buffer has been added to the input queue.
+     */
+    virtual mach_port_t getInputPort(void);
+    
+    /*!
+        @function setInputPort
+        @abstract Set the Mach port used to receive notifications from
+        user space that a buffer has been added to the input queue.
+        @param port
+
+     */
+    virtual IOReturn setInputPort(mach_port_t port);
+    
+    /*!
+        @function getOutputPort
+        @abstract Get the Mach port used to send notifications to user space
+        that a buffer has been added to the output queue.
+     */
+    virtual mach_port_t getOutputPort(void);
+    
+    /*!
+        @function setOutputPort
+        @abstract Set the Mach port used to send notifications to user space
+        that a buffer has been added to the output queue.
+        @param port
+     */
+    virtual IOReturn setOutputPort(mach_port_t port);
+    
+    /*!
+        @function sendOutputNotification
+     @abstract Send a notification to the user client that data is available
+     for reading on the output queue.  This will result in the user's output
+     handler being called, if they registered one.
+     @result Returns kIOReturnSuccess if the notification was successfully sent.
+     */
+    virtual IOReturn sendOutputNotification(void);
+    
+    /*!
+        @functiongroup Queueing and dequeueing buffers
+     */
+    
+    /*!
+        @function enqueueOutputBuffer
+        @abstract A convenience method for enqueueing a buffer.
+        @param buffer
+     @param dataOffset
+     @param dataLength
+     @param controlOffset
+     @param controlLength
+     @result
+     */
+    virtual IOReturn enqueueOutputBuffer(IOStreamBuffer *buffer,
+                                         IOByteCount dataOffset = 0,
+                                         IOByteCount dataLength = 0,
+                                         IOByteCount controlOffset = 0,
+                                         IOByteCount controlLength = 0);
+    
+    
+    /*!
+        @function enqueueOutputEntry
+        @param entry
+        @result
+     */
+    virtual IOReturn enqueueOutputEntry( IOStreamBufferQueueEntry *entry );
+    
+    /*!
+        @function dequeueInputEntry
+        @param entry
+     @result
+     */
+    virtual IOReturn dequeueInputEntry( IOStreamBufferQueueEntry *entry );
+    
+    /*!
+        @functiongroup Managing notifications
+     */
+    
+    /*!
+        @function inputCallback
+        @abstract Input callback function to be implemented by a subclass;
+        @param token
+        A 32-bit token value that can be used by convention to communicate
+        from user space to the stream.  The semantics of this value are
+        defined by the IOStream subclass.
+        @discussion
+        The inputCallback() method is called as a result of a fast trap
+        from user space.  It is called on the same thread as the user request,
+        but the subclass should implement this call as a notification sent
+        to a workloop so that the request is asynchronous.
+     */
+    virtual void inputCallback( UInt32 token );
+    
+    /*!
+        @function inputSyncCallback
+        @abstract Input callback function to be implemented by a subclass.
+        @param token
+        A 32-bit token value that can be used by convention to communicate
+        from user space to the stream.  The semantics of this value are
+        defined by the IOStream subclass.
+        @discussion
+        The inputSyncCallback() method is called as a result of a fast trap
+        from user space.  It is called on the same thread as the user request,
+        so no context switch is necessary.
+     */
+    virtual void inputSyncCallback( UInt32 token );
+    
+    /*!
+        @functiongroup Stream control
+     */
+    
+    /*!
+        @function getStreamMode
+     @abstract Returns the mode of the stream, either input or output.
+     @result The mode of the stream, either kIOStreamModeInput
+     (from user space to kernel space) or the default
+     kIOStreamModeOutput (from kernel space to user space).
+     */
+    virtual IOStreamMode getStreamMode(void);
+    
+    /*!
+        @function setStreamMode
+     @abstract Sets the mode of the stream, either input or output.
+     @discussion Subclasses may define whether it is possible
+     to change the mode of a stream.
+     */
+    virtual IOReturn setStreamMode(IOStreamMode mode);
+
+    /*!
+        @function startStream
+     @abstract Start sending data on a stream.
+     @result Returns kIOReturnSuccess if the stream was successfully started.
+     @discussion This must be implemented by a subclass.
+     */
+    virtual IOReturn startStream(void);
+    
+    /*!
+        @function stopStream
+     @abstract Stop sending data on a stream.
+     @result Returns kIOReturnSuccess if the stream was successfully stopped.
+     @discussion This must be implemented by a subclass.
+     */
+    virtual IOReturn stopStream(void);
+    
+    /*!
+        @function suspendStream
+     @abstract Temporarily suspend data flow on the stream.
+     @result Returns kIOReturnSuccess if the stream was successfully suspended.
+     @discussion This must be implemented by a subclass.
+     */
+    virtual IOReturn suspendStream(void);
+    
+    /*!
+        @functiongroup Managing user clients
+     */
+    
+    /*!
+        @function newUserClient
+     @abstract See the documentation for the IOService method newUserClient.
+     */
+    virtual IOReturn newUserClient( task_t owningTask, void * securityID,
+                                    UInt32 type,  OSDictionary * properties,
+                                    IOUserClient ** handler );
+    
+
+    /* Reserved slots */
+    
+    OSMetaClassDeclareReservedUnused(IOStream, 0);
+    OSMetaClassDeclareReservedUnused(IOStream, 1);
+    OSMetaClassDeclareReservedUnused(IOStream, 2);
+    OSMetaClassDeclareReservedUnused(IOStream, 3);
+    OSMetaClassDeclareReservedUnused(IOStream, 4);
+    OSMetaClassDeclareReservedUnused(IOStream, 5);
+    OSMetaClassDeclareReservedUnused(IOStream, 6);
+    OSMetaClassDeclareReservedUnused(IOStream, 7);
+    OSMetaClassDeclareReservedUnused(IOStream, 8);
+    OSMetaClassDeclareReservedUnused(IOStream, 9);
+    OSMetaClassDeclareReservedUnused(IOStream, 10);
+    OSMetaClassDeclareReservedUnused(IOStream, 11);
+    OSMetaClassDeclareReservedUnused(IOStream, 12);
+    OSMetaClassDeclareReservedUnused(IOStream, 13);
+    OSMetaClassDeclareReservedUnused(IOStream, 14);
+    OSMetaClassDeclareReservedUnused(IOStream, 15);
+    OSMetaClassDeclareReservedUnused(IOStream, 16);
+    OSMetaClassDeclareReservedUnused(IOStream, 17);
+    OSMetaClassDeclareReservedUnused(IOStream, 18);
+    OSMetaClassDeclareReservedUnused(IOStream, 19);
+    OSMetaClassDeclareReservedUnused(IOStream, 20);
+    OSMetaClassDeclareReservedUnused(IOStream, 21);
+    OSMetaClassDeclareReservedUnused(IOStream, 22);
+    OSMetaClassDeclareReservedUnused(IOStream, 23);
+    OSMetaClassDeclareReservedUnused(IOStream, 24);
+    OSMetaClassDeclareReservedUnused(IOStream, 25);
+    OSMetaClassDeclareReservedUnused(IOStream, 26);
+    OSMetaClassDeclareReservedUnused(IOStream, 27);
+    OSMetaClassDeclareReservedUnused(IOStream, 28);
+    OSMetaClassDeclareReservedUnused(IOStream, 29);
+    OSMetaClassDeclareReservedUnused(IOStream, 30);
+    OSMetaClassDeclareReservedUnused(IOStream, 31);
+    
+};
+
+
+/*!
+    @class IOStreamBuffer
+    A class representing a data buffer that is part of an IOStream.
+ */
+
+class IOStreamBuffer : public OSObject
+{
+    OSDeclareDefaultStructors(IOStreamBuffer);
+
+protected:
+    IOMemoryDescriptor *     _dataBuffer;        // The data buffer is expected to be filled by hardware.
+    IOMemoryDescriptor *     _controlBuffer;     // The control buffer is expected to be defined by the hardware driver.
+    
+    IOStreamBufferID         _bufferID;          // Client handle for this buffer.
+    
+    OSArray *                _clientMemoryMaps;  // Maps for clients who are sharing these buffers.
+    
+    SInt32                   _clientReferenceCount;    // Count of client uses of this buffer.  May be negative.
+    
+public:
+    /*!
+        @function initWithMemoryDescriptors
+     */        
+    virtual bool initWithMemoryDescriptors(IOMemoryDescriptor *dataBuffer,
+                                           IOMemoryDescriptor *controlBuffer,
+                                           IOStreamBufferID bufferID = 0);
+    
+    /*!
+        @function withMemoryDescriptors
+     */    
+    static IOStreamBuffer *withMemoryDescriptors(IOMemoryDescriptor *dataBuffer,
+                                                 IOMemoryDescriptor *controlBuffer,
+                                                 IOStreamBufferID bufferID = 0);
+    
+    virtual void free(void);
+    
+    /*!
+        @function getBufferID
+        @abstract Gets the buffer identifier for the IOStreamBuffer object.
+        @discussion The buffer identifier is unique across all buffers in a stream.
+     */
+    virtual IOStreamBufferID getBufferID(void);
+    
+    /*!
+        @function setBufferID
+        @abstract Sets the buffer identifier for the IOStreamBuffer object.
+     */
+    
+    virtual void setBufferID( IOStreamBufferID bufferID );
+    
+    /*!
+        @function setDataBuffer
+        @abstract Sets the data buffer for the IOStreamBuffer object.
+     */
+    virtual void setDataBuffer(IOMemoryDescriptor *dataBuffer);
+    
+    /*!
+        @function setControlBuffer
+        @abstract Sets the control buffer for the IOStreamBuffer object.
+     */
+    virtual void setControlBuffer(IOMemoryDescriptor *controlBuffer);
+    
+    /*!
+        @function getDataBuffer
+     @result A pointer to the IOMemoryDescriptor for the data buffer.
+     */
+    virtual IOMemoryDescriptor *getDataBuffer(void);
+    
+    /*!
+        @function getControlBuffer
+     @result A pointer to the IOMemoryDescriptor for the control buffer.
+     */
+    virtual IOMemoryDescriptor *getControlBuffer(void);
+    
+    /*!
+        @function getClientReferenceCount
+     @result The count of client references to this buffer.  It may be positive
+     or negative, depending on whether the client is sending data into the kernel,
+     or the kernel is sending data out to the client.
+     */
+    virtual SInt32 getClientReferenceCount( void );
+    
+    /*!
+        @function sendClientReference
+     @param offset The offset in the buffer of the data sent to the client.
+     @param length The length of the data sent to the client.
+     @result The new client reference count.
+     @abstract
+     */
+    virtual SInt32 sendClientReference( IOByteCount offset = 0, IOByteCount length = 0 );
+    
+    /*!
+        @function receiveClientReference
+     @param offset The offset in the buffer of the data from the client.
+     @param length The length of the data from the client.
+     @abstract
+     */
+    virtual SInt32 receiveClientReference( IOByteCount offset = 0, IOByteCount length = 0 );
+    
+    /* Reserved slots */
+    
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 0);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 1);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 2);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 3);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 4);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 5);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 6);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 7);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 8);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 9);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 10);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 11);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 12);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 13);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 14);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 15);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 16);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 17);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 18);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 19);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 20);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 21);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 22);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 23);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 24);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 25);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 26);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 27);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 28);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 29);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 30);
+    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 31);
+    
+};
+
+#endif /* ! __IOKIT_IOSTREAM_H */
+
diff --git a/i386/include/IOKit/stream/IOStreamFamily.h b/i386/include/IOKit/stream/IOStreamFamily.h
new file mode 100644
index 0000000..a4eb7f0
--- /dev/null
+++ b/i386/include/IOKit/stream/IOStreamFamily.h
@@ -0,0 +1,13 @@
+/*
+ *  Copyright 2006 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#ifndef __IOKIT_IOSTREAMFAMILY_H
+#define __IOKIT_IOSTREAMFAMILY_H
+
+#include <IOKit/stream/IOStream.h>
+#include <IOKit/stream/IOStreamShared.h>
+
+
+#endif /* !__IOKIT_IOSTREAMFAMILY_H */
diff --git a/i386/include/IOKit/stream/IOStreamShared.h b/i386/include/IOKit/stream/IOStreamShared.h
new file mode 100644
index 0000000..5b2c0a3
--- /dev/null
+++ b/i386/include/IOKit/stream/IOStreamShared.h
@@ -0,0 +1,175 @@
+/*
+ *  IOStreamShared.h
+ *  IOStreamFamily
+ *
+ *  Copyright 2006 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#if !defined(__IOKIT_IOSTREAMSHARED_H)
+#define __IOKIT_IOSTREAMSHARED_H
+
+#include <sys/cdefs.h>
+
+#include <IOKit/IOTypes.h>
+
+/*!
+    @header IOStreamShared.h
+    IOStream definitions shared between kernel and user space.
+ */
+
+__BEGIN_DECLS    
+   
+// Buffer numbers are guaranteed to go from 0 to bufferCount - 1.
+/*!
+    @typedef IOStreamBufferID
+ */
+typedef UInt32 IOStreamBufferID;
+#define kIOStreamBufferIDInvalid (~0)
+
+// This is the header for the shared-memory queue used to send buffer notifications
+// from kernel to user space or vice versa.
+
+// Queue entry in input or output queue
+
+#ifdef __cplusplus
+
+/*!
+    @struct IOStreamBufferQueueEntry
+    @field bufferID     The ID of the buffer passed in this queue entry.
+    @field dataLength   The length of the valid data in the buffer.
+    @field reserved     Reserved for future use.
+*/
+    
+struct IOStreamBufferQueueEntry {
+    IOStreamBufferID    bufferID;
+    UInt32              dataOffset;
+    UInt32              dataLength;
+    UInt32              controlOffset;
+    UInt32              controlLength;
+    UInt32              reserved[3];
+};
+
+
+/*!
+    @struct IOStreamBufferQueue
+    @field entryCount   The number of queue entries in the queue.
+    @field headIndex    The index of the next queue slot that will be filled in by the queue writer.
+    @field tailIndex    The index of the next queue slot that can be read by the queue reader.
+    @field reserved     Reserved for future use.
+    @field queue        The array of queue entries.
+ */
+
+struct IOStreamBufferQueue {
+    UInt32                      entryCount;
+    volatile UInt32             headIndex;
+    volatile UInt32             tailIndex;
+    UInt32                      reserved;
+    IOStreamBufferQueueEntry    queue[0];
+};
+
+#else
+
+typedef struct __IOStreamBufferQueueEntry {
+    IOStreamBufferID    bufferID;
+    UInt32              dataOffset;
+    UInt32              dataLength;
+    UInt32              controlOffset;
+    UInt32              controlLength;
+    UInt32              reserved[3];
+} IOStreamBufferQueueEntry;
+
+typedef struct __IOStreamBufferQueue {
+    UInt32                      entryCount;
+    volatile UInt32             headIndex;
+    volatile UInt32             tailIndex;
+    UInt32                      reserved;
+    IOStreamBufferQueueEntry    queue[0];
+} IOStreamBufferQueue;
+
+#endif
+
+/*!
+    @enum Memory mapping types
+    @constant kIOStreamMemoryTypeOutputQueue
+    @constant kIOStreamMemoryTypeInputQueue
+    @constant kIOStreamMemoryTypeBufferData
+    @constant kIOStreamMemoryTypeBufferControl
+    @constant kIOStreamBufferIDMask
+    @constant kIOStreamMemoryTypeMask
+    @abstract Memory types used with IOConnectMapMemory().
+ */
+enum {
+    kIOStreamMemoryTypeOutputQueue   = 0x10000000,
+    kIOStreamMemoryTypeInputQueue    = 0x20000000,
+    kIOStreamMemoryTypeBufferData    = 0x30000000,
+    kIOStreamMemoryTypeBufferControl = 0x40000000,
+    kIOStreamBufferIDMask            = 0x0FFFFFFF,
+    kIOStreamMemoryTypeMask          = 0xF0000000
+};
+
+/*!
+    @enum Mach port types
+    @constant kIOStreamPortTypeOutput
+    @constant kIOStreamPortTypeInput
+    @abstract Port types used with IOConnectSetNotificationPort().
+ */
+enum {
+    kIOStreamPortTypeOutput,
+    kIOStreamPortTypeInput
+};
+
+/*!
+    @enum IOStream open options
+ */
+ 
+enum {
+    kIOStreamOptionOpenExclusive = 0x00010000,
+    kIOStreamOptionOpenShared    = 0x00020000
+};
+
+/*!
+    @enum User client methods
+    @constant kIOStreamMethodOpen
+    @constant kIOStreamMethodClose
+    @constant kIOStreamMethodStart
+    @constant kIOStreamMethodStop
+    @constant kIOStreamMethodSuspend
+    @constant kIOStreamMethodGetMode
+    @constant kIOStreamMethodSetMode
+ 
+    @abstract Client method numbers used with IOConnectMethod...() functions.
+ */
+enum {
+    kIOStreamMethodOpen,
+    kIOStreamMethodClose,
+    kIOStreamMethodStart,
+    kIOStreamMethodStop,
+    kIOStreamMethodSuspend,
+    kIOStreamMethodGetMode,
+    kIOStreamMethodSetMode,
+    kIOStreamMethodGetBufferCount
+};
+
+/*!
+    @enum User client traps
+    @constant kIOStreamEnqueueInputTrap
+    @constant kIOStreamEnqueueInputSyncTrap
+    @abstract Client trap numbers used with IOConnectTrap..() functions.
+ */
+enum {
+    kIOStreamEnqueueInputTrap,
+    kIOStreamEnqueueInputSyncTrap
+};
+
+typedef enum {
+    kIOStreamModeInput,         // From user to kernel space
+    kIOStreamModeOutput,        // From kernel to user space
+    kIOStreamModeInputOutput    // bidirectional
+} IOStreamMode;
+
+
+__END_DECLS
+
+#endif /* ! __IOKIT_IOSTREAMSHARED_H */
+
diff --git a/i386/include/IOKit/stream/IOStreamUserClient.h b/i386/include/IOKit/stream/IOStreamUserClient.h
new file mode 100644
index 0000000..887575a
--- /dev/null
+++ b/i386/include/IOKit/stream/IOStreamUserClient.h
@@ -0,0 +1,76 @@
+/*
+ *  IOStreamUserClient.h
+ *  IOStreamFamily
+ *
+ *  Copyright 2006 Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#if !defined( __IOKIT_IOSTREAMUSERCLIENT_H )
+#define __IOKIT_IOSTREAMUSERCLIENT_H
+
+
+#include <IOKit/IOUserClient.h>
+
+#include <IOKit/stream/IOStreamShared.h>
+#include <IOKit/stream/IOStream.h>
+
+class IOStreamUserClient : public IOUserClient
+{
+    OSDeclareDefaultStructors( IOStreamUserClient )
+    
+protected:
+    IOStream * _owner;
+    task_t     _task;
+    
+public:
+    virtual bool initWithTask(
+                                  task_t owningTask, void * securityToken, UInt32 type,
+                                  OSDictionary * properties);
+    virtual bool initWithTask(
+                              task_t owningTask, void * securityToken, UInt32 type);
+    
+    virtual IOReturn clientClose( void );
+    virtual IOReturn clientDied( void );
+
+    virtual IOService * getService( void );
+    
+    virtual IOReturn registerNotificationPort(
+                                              mach_port_t port, UInt32 type, UInt32 refCon );
+    
+    virtual IOReturn connectClient( IOUserClient * client );
+    
+    virtual IOExternalMethod * getTargetAndMethodForIndex(
+                                                          IOService ** targetP, UInt32 index );
+    
+    virtual IOExternalTrap *
+      getTargetAndTrapForIndex( IOService **targetP, UInt32 index );
+
+    virtual IOReturn clientMemoryForType( UInt32 type,
+                                          IOOptionBits * options,
+                                          IOMemoryDescriptor ** memory );
+    
+    virtual bool start( IOService * provider );
+    
+    
+protected:
+    virtual IOReturn openMethod(  char * dataIn, char * dataOut,
+                                  IOByteCount inputSize, IOByteCount * outputSize );
+    virtual IOReturn closeMethod( void );
+    virtual IOReturn startMethod( void );
+    virtual IOReturn stopMethod( void );
+    virtual IOReturn suspendMethod( void );
+    virtual IOReturn getModeMethod(  char * dataOut,
+                                     IOByteCount * outputSize );
+    virtual IOReturn setModeMethod(  char * dataIn, 
+                                     IOByteCount inputSize );
+    virtual IOReturn getBufferCountMethod(  char * dataOut,
+                                            IOByteCount * outputSize );
+    
+    virtual IOReturn inputTrap( UInt32 token );
+    virtual IOReturn inputSyncTrap( UInt32 token );
+
+};
+
+#endif /* ! __IOKIT_IOSTREAMUSERCLIENT_H */
+
diff --git a/i386/include/IOKit/system.h b/i386/include/IOKit/system.h
new file mode 100644
index 0000000..7092d59
--- /dev/null
+++ b/i386/include/IOKit/system.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 1998-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef __IOKIT_SYSTEM_H
+#define __IOKIT_SYSTEM_H
+
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+#include <mach/mach_types.h>
+#include <mach/mach_interface.h>
+#include <mach/memory_object_types.h>
+
+#include <stdarg.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <IOKit/assert.h>  /* Must be before other includes of kern/assert.h */
+
+#include <kern/kern_types.h>
+#include <kern/thread.h>
+#include <kern/debug.h>
+#include <kern/task.h>
+#include <kern/sched_prim.h>
+#include <kern/locks.h>
+#include <kern/queue.h>
+#include <kern/ipc_mig.h>
+#include <libkern/libkern.h>
+
+
+#ifndef	_MISC_PROTOS_H_
+extern void	_doprnt( const char *format, va_list *arg,
+			void (*lputc)(char), int radix );
+#endif
+
+__END_DECLS
+
+#endif /* !__IOKIT_SYSTEM_H */
diff --git a/i386/include/IOKit/system_management/.svn/all-wcprops b/i386/include/IOKit/system_management/.svn/all-wcprops
new file mode 100644
index 0000000..3d336c3
--- /dev/null
+++ b/i386/include/IOKit/system_management/.svn/all-wcprops
@@ -0,0 +1,11 @@
+K 25
+svn:wc:ra_dav:version-url
+V 70
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/system_management
+END
+IOWatchDogTimer.h
+K 25
+svn:wc:ra_dav:version-url
+V 88
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/system_management/IOWatchDogTimer.h
+END
diff --git a/i386/include/IOKit/system_management/.svn/entries b/i386/include/IOKit/system_management/.svn/entries
new file mode 100644
index 0000000..0e7985e
--- /dev/null
+++ b/i386/include/IOKit/system_management/.svn/entries
@@ -0,0 +1,62 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/system_management
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+IOWatchDogTimer.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+e2ec51de6352bd52efa9e10f4dcc69f0
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2076
+
diff --git a/i386/include/IOKit/system_management/.svn/text-base/IOWatchDogTimer.h.svn-base b/i386/include/IOKit/system_management/.svn/text-base/IOWatchDogTimer.h.svn-base
new file mode 100644
index 0000000..a89b95b
--- /dev/null
+++ b/i386/include/IOKit/system_management/.svn/text-base/IOWatchDogTimer.h.svn-base
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOWATCHDOGTIMER_H
+#define _IOWATCHDOGTIMER_H
+
+#include <IOKit/IOService.h>
+
+class IOWatchDogTimer : public IOService
+{
+  OSDeclareAbstractStructors(IOWatchDogTimer);
+  
+protected:
+  IONotifier *notifier;
+  struct ExpansionData { };
+  ExpansionData *reserved;
+  
+public:
+  virtual bool start(IOService *provider);
+  virtual void stop(IOService *provider);
+  virtual IOReturn setProperties(OSObject *properties);
+  virtual void setWatchDogTimer(UInt32 timeOut) = 0;
+  
+  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  0);
+  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  1);
+  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  2);
+  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  3);
+};
+
+#endif /* !_IOWATCHDOGTIMER_H */
diff --git a/i386/include/IOKit/system_management/IOWatchDogTimer.h b/i386/include/IOKit/system_management/IOWatchDogTimer.h
new file mode 100644
index 0000000..a89b95b
--- /dev/null
+++ b/i386/include/IOKit/system_management/IOWatchDogTimer.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOWATCHDOGTIMER_H
+#define _IOWATCHDOGTIMER_H
+
+#include <IOKit/IOService.h>
+
+class IOWatchDogTimer : public IOService
+{
+  OSDeclareAbstractStructors(IOWatchDogTimer);
+  
+protected:
+  IONotifier *notifier;
+  struct ExpansionData { };
+  ExpansionData *reserved;
+  
+public:
+  virtual bool start(IOService *provider);
+  virtual void stop(IOService *provider);
+  virtual IOReturn setProperties(OSObject *properties);
+  virtual void setWatchDogTimer(UInt32 timeOut) = 0;
+  
+  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  0);
+  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  1);
+  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  2);
+  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  3);
+};
+
+#endif /* !_IOWATCHDOGTIMER_H */
diff --git a/i386/include/IOKit/usb/.svn/all-wcprops b/i386/include/IOKit/usb/.svn/all-wcprops
new file mode 100644
index 0000000..2069f31
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/all-wcprops
@@ -0,0 +1,155 @@
+K 25
+svn:wc:ra_dav:version-url
+V 56
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb
+END
+USB.h
+K 25
+svn:wc:ra_dav:version-url
+V 62
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/USB.h
+END
+IOUSBControllerListElement.h
+K 25
+svn:wc:ra_dav:version-url
+V 85
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBControllerListElement.h
+END
+IOUSBBus.h
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBBus.h
+END
+IOUSBControllerV2.h
+K 25
+svn:wc:ra_dav:version-url
+V 76
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBControllerV2.h
+END
+IOUSBMassStorageUFISubclass.h
+K 25
+svn:wc:ra_dav:version-url
+V 86
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBMassStorageUFISubclass.h
+END
+IOUSBControllerV3.h
+K 25
+svn:wc:ra_dav:version-url
+V 76
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBControllerV3.h
+END
+IOUSBPipe.h
+K 25
+svn:wc:ra_dav:version-url
+V 68
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBPipe.h
+END
+IOUSBHubDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBHubDevice.h
+END
+IOUSBDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 70
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBDevice.h
+END
+IOUSBInterface.h
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBInterface.h
+END
+IOUFIStorageServices.h
+K 25
+svn:wc:ra_dav:version-url
+V 79
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUFIStorageServices.h
+END
+IOUSBRootHubDevice.h
+K 25
+svn:wc:ra_dav:version-url
+V 77
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBRootHubDevice.h
+END
+USBSpec.h
+K 25
+svn:wc:ra_dav:version-url
+V 66
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/USBSpec.h
+END
+USBTracepoints.h
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/USBTracepoints.h
+END
+IOUSBWorkLoop.h
+K 25
+svn:wc:ra_dav:version-url
+V 72
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBWorkLoop.h
+END
+IOUSBUserClient.h
+K 25
+svn:wc:ra_dav:version-url
+V 74
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBUserClient.h
+END
+IOUSBMassStorageClass.h
+K 25
+svn:wc:ra_dav:version-url
+V 80
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBMassStorageClass.h
+END
+IOUSBHubPolicyMaker.h
+K 25
+svn:wc:ra_dav:version-url
+V 78
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBHubPolicyMaker.h
+END
+IOUSBCompositeDriver.h
+K 25
+svn:wc:ra_dav:version-url
+V 79
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBCompositeDriver.h
+END
+IOUSBCommand.h
+K 25
+svn:wc:ra_dav:version-url
+V 71
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBCommand.h
+END
+IOUSBHIDDriver.h
+K 25
+svn:wc:ra_dav:version-url
+V 73
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBHIDDriver.h
+END
+IOUSBLog.h
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBLog.h
+END
+IOUSBController.h
+K 25
+svn:wc:ra_dav:version-url
+V 74
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBController.h
+END
+IOUSBNub.h
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBNub.h
+END
+USBHub.h
+K 25
+svn:wc:ra_dav:version-url
+V 65
+/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/USBHub.h
+END
diff --git a/i386/include/IOKit/usb/.svn/entries b/i386/include/IOKit/usb/.svn/entries
new file mode 100644
index 0000000..ffd827b
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/entries
@@ -0,0 +1,878 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/usb
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+USB.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+8bf23d0dad1a9225363c787a94ec58bc
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+45107
+
+IOUSBControllerListElement.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+e919de00cc53e1f24ba901f60aa320e3
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4738
+
+IOUSBBus.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+ad6cbbbb1af98d5a96673d2b761ba9e5
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1183
+
+IOUSBControllerV2.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+5883ee016e6e171b318462f148c4d64d
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+20855
+
+IOUSBMassStorageUFISubclass.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+378eb3a378af0fb004606ffed9d9136c
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11928
+
+IOUSBControllerV3.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+9932d9ac063d5f679fe298271057ead4
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12479
+
+IOUSBPipe.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+5b768a7a705b59ee7b8165ebb65fbcdf
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+17471
+
+IOUSBHubDevice.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+e2d30f06c2626b944387f533cd6d0828
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+10211
+
+IOUSBDevice.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+7e6687d8ebc8537c69885481626bcce5
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+28373
+
+IOUSBInterface.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+59d558e91299bdbcd54eca2005080b56
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12213
+
+IOUFIStorageServices.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+60a9064a8b4272e667e4a57281afbb3f
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4777
+
+IOUSBRootHubDevice.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+4c9f61f93aca3228f4c7556b0056821e
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3376
+
+USBSpec.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+3136341088b9dbc0e613e3beb7ba1af8
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+15028
+
+USBTracepoints.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+b1631300f3a48e7b698ab3e4baf60dd3
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+20349
+
+IOUSBWorkLoop.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+4b4594c45a9238ed70acee961217da1d
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2000
+
+IOUSBUserClient.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+f22ed4f18efbd8826acc1a651f368cca
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5331
+
+IOUSBMassStorageClass.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+51cb0b7ba0d53f61721664ef0325a539
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+17705
+
+IOUSBHubPolicyMaker.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+138fe70e48636d05d0b66dfc39842385
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9227
+
+IOUSBCompositeDriver.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+1de600100621201d642fb2bb395f9758
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+5382
+
+IOUSBCommand.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+af982f7c12ee99330cb6ffaa73b32a03
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+10859
+
+IOUSBHIDDriver.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+1d0f69397c09ecc6c1a685d252418bd6
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+11853
+
+IOUSBLog.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+79f3680f444a5eb350afeec515f05e49
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7979
+
+IOUSBController.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+e5238919996dfc66485bb3f01e35de2e
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+50775
+
+IOUSBNub.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+e436676a1824525edd3ef6f8ee62f088
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2165
+
+USBHub.h
+file
+
+
+
+
+2012-10-03T17:50:20.000000Z
+7f59dcf439d351c5f6e8b4bb4ecceb9b
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+7420
+
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUFIStorageServices.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUFIStorageServices.h.svn-base
new file mode 100644
index 0000000..cac43f4
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUFIStorageServices.h.svn-base
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+
+#ifndef _IOKIT_UFI_STORAGE_SERVICES_H_
+#define _IOKIT_UFI_STORAGE_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/storage/IOBlockStorageDevice.h>
+#include <IOKit/usb/IOUSBMassStorageUFISubclass.h>
+
+
+class IOUFIStorageServices : public IOBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IOUFIStorageServices )
+
+private:
+	bool							fMediaChanged;
+	bool							fMediaPresent;
+
+protected:
+	
+    IOUSBMassStorageUFIDevice *		fProvider;
+
+	UInt64							fMaxReadBlocks;
+	UInt64							fMaxWriteBlocks;
+	
+	virtual bool	attach ( IOService * provider );
+	virtual void	detach ( IOService * provider );
+	
+    // Reserve space for future expansion.
+    struct IOUFIStorageServicesExpansionData { };
+    IOUFIStorageServicesExpansionData *fIOUFIStorageServicesReserved;
+	
+public:
+
+	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
+
+	static void 		AsyncReadWriteComplete ( void * 			clientData,
+                                				 IOReturn			status,
+                                				 UInt64 			actualByteCount );
+
+    // Deprecated
+    virtual IOReturn    doAsyncReadWrite (	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+                                            
+	virtual IOReturn	doAsyncReadWrite (  IOMemoryDescriptor *    buffer,
+                                            UInt64                  block, 
+                                            UInt64                  nblks,
+                                            IOStorageAttributes *   attributes,
+                                            IOStorageCompletion *   completion );
+
+	virtual IOReturn	doSyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks );
+
+    virtual IOReturn	doEjectMedia ( void );
+
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+
+    virtual IOReturn	doSynchronizeCache ( void );
+        
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+    
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+    
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+
+    virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+    
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 1 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 2 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 3 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 4 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 5 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 6 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 7 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 8 );
+
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_UFI_STORAGE_SERVICES_H_ */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBBus.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBBus.h.svn-base
new file mode 100644
index 0000000..a42191a
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBBus.h.svn-base
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBBUS_H
+#define _IOKIT_IOUSBBUS_H
+
+#include <IOKit/IOService.h>
+
+class IOUSBBus : public IOService
+{
+    OSDeclareAbstractStructors(IOUSBBus)
+};
+
+#endif /* ! _IOKIT_IOUSBBUS_H */
+
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBCommand.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBCommand.h.svn-base
new file mode 100644
index 0000000..0f7c36b
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBCommand.h.svn-base
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBCOMMAND_H
+#define _IOKIT_IOUSBCOMMAND_H
+
+#include <IOKit/IOCommand.h>
+#include <IOKit/IOCommandPool.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IODMACommand.h>
+#include <IOKit/usb/USB.h>
+
+/*
+ * USB Command
+ * This is the command block for a USB command to be queued on the
+ * Command Gate of the WorkLoop.  Although the actual work of creating
+ * the command and enqueueing it is done for them via the deviceRequest,
+ * read, and write methods, this is the primary way that devices will get
+ * work done.
+ * Note: This is private to IOUSBController and should be moved to a
+ * private header.
+ */
+
+typedef enum {
+    DEVICE_REQUEST,						// Device request using pointer
+    READ,
+    WRITE,
+    CREATE_EP,
+    DELETE_EP,
+    DEVICE_REQUEST_DESC,				// Device request using descriptor
+	DEVICE_REQUEST_BUFFERCOMMAND		// Device request using a second IOUSBCommand in _bufferCommand
+} usbCommand;
+
+
+
+/*!
+ @class IOUSBCommand
+ @abstract A subclass of IOCommand that is used to add USB specific data.
+ */
+class IOUSBCommand : public IOCommand
+{
+    OSDeclareAbstractStructors(IOUSBCommand)
+
+protected:
+    usbCommand				_selector;
+    IOUSBDeviceRequestPtr	_request;
+    USBDeviceAddress		_address;
+    UInt8					_endpoint;
+    UInt8					_direction;
+    UInt8					_type;
+    bool					_bufferRounding;
+    IOMemoryDescriptor *	_buffer;
+    IOUSBCompletion			_uslCompletion;
+    IOUSBCompletion			_clientCompletion;
+    UInt32					_dataRemaining;							// For Control transfers
+    UInt8					_stage;									// For Control transfers
+    IOReturn				_status;
+    IOMemoryDescriptor *	_origBuffer;
+    IOUSBCompletion			_disjointCompletion;
+    IOByteCount				_dblBufLength;
+    UInt32					_noDataTimeout;
+    UInt32					_completionTimeout;
+    UInt32					_UIMScratch[10];
+    
+    struct ExpansionData
+    {
+        IOByteCount			_reqCount;
+		IOMemoryDescriptor *_requestMemoryDescriptor;
+		IOMemoryDescriptor *_bufferMemoryDescriptor;
+		bool				_multiTransferTransaction;
+		bool				_finalTransferInTransaction;
+        bool				_useTimeStamp;
+        AbsoluteTime		_timeStamp;
+		bool				_isSyncTransfer;						// Returns true if the command is used for a synchronous transfer
+		IODMACommand		*_dmaCommand;							// used to get memory mapping
+		IOUSBCommand		*_bufferUSBCommand;						// points to another IOUSBCommand used for phase 2 of control transactions
+		IOUSBCommand		*_masterUSBCommand;						// points from the bufferUSBCommand back to the parent command
+    };
+    ExpansionData * 		_expansionData;
+    
+    // we override these OSObject method in order to allocate and release our expansion data
+    virtual bool init();
+    virtual void free();
+
+public:
+
+    // static constructor
+    static IOUSBCommand *	NewCommand(void);
+
+    // Manipulators
+    void					SetSelector(usbCommand sel);
+    void  					SetRequest(IOUSBDeviceRequestPtr req);
+    void  					SetAddress(USBDeviceAddress addr);
+    void  					SetEndpoint(UInt8 ep);
+    void  					SetDirection(UInt8 dir);
+    void  					SetType(UInt8 type);
+    void  					SetBufferRounding(bool br);
+    void  					SetBuffer(IOMemoryDescriptor *buf);
+    void  					SetUSLCompletion(IOUSBCompletion completion);
+    void  					SetClientCompletion(IOUSBCompletion completion);
+    void  					SetDataRemaining(UInt32 dr);
+    void  					SetStage(UInt8 stage);
+    void 					SetStatus(IOReturn stat);
+    void 					SetOrigBuffer(IOMemoryDescriptor *buf);
+    void 					SetDisjointCompletion(IOUSBCompletion completion);
+    void 					SetDblBufLength(IOByteCount len);
+    void 					SetNoDataTimeout(UInt32 to);
+    void 					SetCompletionTimeout(UInt32 to);
+    void 					SetUIMScratch(UInt32 index, UInt32 value);
+    void 					SetReqCount(IOByteCount reqCount);
+    void					SetRequestMemoryDescriptor(IOMemoryDescriptor *requestMemoryDescriptor);
+    void					SetBufferMemoryDescriptor(IOMemoryDescriptor *bufferMemoryDescriptor);
+    void					SetMultiTransferTransaction(bool);
+    void					SetFinalTransferInTransaction(bool);
+    void					SetUseTimeStamp(bool);
+    void					SetTimeStamp(AbsoluteTime timeStamp);
+	void					SetIsSyncTransfer(bool);
+	inline void				SetDMACommand(IODMACommand *dmaCommand)					{ _expansionData->_dmaCommand = dmaCommand; }
+	void					SetBufferUSBCommand(IOUSBCommand *bufferUSBCommand);
+	
+	// Accessors
+    usbCommand					GetSelector(void);
+    IOUSBDeviceRequestPtr		GetRequest(void);
+    USBDeviceAddress			GetAddress(void);
+    UInt8						GetEndpoint(void);
+    UInt8						GetDirection(void);
+    UInt8						GetType(void);
+    bool						GetBufferRounding(void);
+    IOMemoryDescriptor *		GetBuffer(void);
+    IOUSBCompletion				GetUSLCompletion(void);
+    IOUSBCompletion				GetClientCompletion(void);
+    UInt32						GetDataRemaining(void);
+    UInt8						GetStage(void);
+    IOReturn					GetStatus(void);
+    IOMemoryDescriptor *		GetOrigBuffer(void);
+    IOUSBCompletion				GetDisjointCompletion(void);
+    IOByteCount					GetDblBufLength(void);
+    UInt32						GetNoDataTimeout(void);
+    UInt32						GetCompletionTimeout(void);
+    UInt32						GetUIMScratch(UInt32 index);
+    IOByteCount					GetReqCount(void);
+    IOMemoryDescriptor *		GetRequestMemoryDescriptor(void);
+    IOMemoryDescriptor *		GetBufferMemoryDescriptor(void);
+    bool						GetMultiTransferTransaction(void);
+    bool						GetFinalTransferInTransaction(void);
+    bool						GetUseTimeStamp(void);
+    AbsoluteTime				GetTimeStamp(void);
+	bool						GetIsSyncTransfer(void);
+	inline IODMACommand *		GetDMACommand(void)							{return _expansionData->_dmaCommand; }
+	inline IOUSBCommand *		GetBufferUSBCommand(void)					{return _expansionData->_bufferUSBCommand; }
+};
+
+
+class IOUSBIsocCommand : public IOCommand
+{
+    OSDeclareAbstractStructors(IOUSBIsocCommand)
+
+protected:
+    usbCommand				_selector;
+    USBDeviceAddress		_address;
+    UInt8					_endpoint;
+    UInt8					_direction;
+    IOMemoryDescriptor *	_buffer;
+    IOUSBIsocCompletion		_completion;
+    UInt64					_startFrame;
+    UInt32					_numFrames;
+    IOUSBIsocFrame *		_frameList;
+    IOReturn				_status;
+    
+    struct ExpansionData
+    {
+        UInt32				_updateFrequency;
+        bool				_useTimeStamp;
+        AbsoluteTime		_timeStamp;
+		bool				_isSyncTransfer;								// Returns true if the command is used for a synchronous transfer
+		bool				_rosettaClient;
+		IODMACommand *		_dmaCommand;
+		IOUSBIsocCompletion	_uslCompletion;
+		bool				_lowLatency;
+    };
+    ExpansionData * 		_expansionData;
+
+    // we override these OSObject method in order to allocate and release our expansion data
+    virtual bool init();
+    virtual void free();
+
+public:
+    // static constructor
+    static IOUSBIsocCommand *NewCommand(void);
+    
+    // Manipulators
+    void					SetSelector(usbCommand sel)							{_selector = sel; }
+    void					SetAddress(USBDeviceAddress addr)					{_address = addr; }
+    void					SetEndpoint(UInt8 ep)								{_endpoint = ep; }
+    void					SetDirection(UInt8 dir)								{_direction = dir; }
+    void					SetBuffer(IOMemoryDescriptor *buf)					{_buffer = buf; }
+    void					SetCompletion(IOUSBIsocCompletion completion)		{_completion = completion; }
+    void					SetStartFrame(UInt64 sf)							{_startFrame = sf; }
+    void					SetNumFrames(UInt32 nf)								{_numFrames = nf; }
+    void					SetFrameList(IOUSBIsocFrame *fl)					{_frameList = fl; }
+    void					SetStatus(IOReturn stat)							{_status = stat; }
+    void					SetUpdateFrequency( UInt32 fr)						{ _expansionData->_updateFrequency = fr; }
+    void					SetUseTimeStamp(bool useIt)							{ _expansionData->_useTimeStamp= useIt; }
+    void					SetTimeStamp(AbsoluteTime timeStamp)				{ _expansionData->_timeStamp= timeStamp; }
+ 	void					SetIsSyncTransfer(bool isSync)						{ _expansionData->_isSyncTransfer = isSync; }
+ 	void					SetRosettaClient(bool isRosetta)					{ _expansionData->_rosettaClient = isRosetta; }
+ 	void					SetDMACommand(IODMACommand *dmaCommand)				{ _expansionData->_dmaCommand = dmaCommand; }
+    void					SetUSLCompletion(IOUSBIsocCompletion completion)	{ _expansionData->_uslCompletion = completion; }
+ 	void					SetLowLatency(bool lowLatency)						{ _expansionData->_lowLatency = lowLatency; }
+
+	// Accessors
+    usbCommand				GetSelector(void)								{ return _selector; }
+    USBDeviceAddress		GetAddress(void)								{ return _address; }
+    UInt8					GetEndpoint(void)								{ return _endpoint; }
+    UInt8					GetDirection(void)								{ return _direction; }
+    IOMemoryDescriptor *	GetBuffer(void)									{ return _buffer; }
+    IOUSBIsocCompletion		GetCompletion(void)								{ return _completion; }
+    UInt64					GetStartFrame(void)								{ return _startFrame; }
+    UInt32					GetNumFrames(void)								{ return _numFrames; }
+    IOUSBIsocFrame *		GetFrameList(void)								{ return _frameList; }
+    UInt32					GetUpdateFrequency(void)						{ return _expansionData->_updateFrequency; }
+    IOReturn				GetStatus(void)									{ return _status; }
+    bool					GetUseTimeStamp(void)							{ return _expansionData->_useTimeStamp; }
+    AbsoluteTime			GetTimeStamp(void)								{ return _expansionData->_timeStamp; }
+	bool					GetIsSyncTransfer(void)							{ return _expansionData->_isSyncTransfer; }
+	bool					GetIsRosettaClient(void)						{ return _expansionData->_rosettaClient; }
+	IODMACommand *			GetDMACommand(void)								{ return _expansionData->_dmaCommand; }
+    IOUSBIsocCompletion		GetUSLCompletion(void)							{ return _expansionData->_uslCompletion; }
+	bool					GetLowLatency(void)								{ return _expansionData->_lowLatency; }
+};
+
+class IOUSBCommandPool : public IOCommandPool
+{
+    OSDeclareDefaultStructors( IOUSBCommandPool )
+	
+protected:
+    virtual IOReturn gatedReturnCommand(IOCommand * command);
+	virtual IOReturn gatedGetCommand(IOCommand ** command, bool blockForCommand);
+	
+public:
+    static IOCommandPool * withWorkLoop(IOWorkLoop * inWorkLoop);
+};
+
+
+#endif
+
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBCompositeDriver.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBCompositeDriver.h.svn-base
new file mode 100644
index 0000000..ef72cf4
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBCompositeDriver.h.svn-base
@@ -0,0 +1,127 @@
+/*
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1998-2006 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBCompositeDriver_H
+#define _IOKIT_IOUSBCompositeDriver_H
+
+//================================================================================================
+//
+//   Headers
+//
+//================================================================================================
+//
+#include <libkern/OSByteOrder.h>
+#include <IOKit/IOLib.h>
+#include <IOKit/IONotifier.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/usb/IOUSBBus.h>
+#include <IOKit/usb/IOUSBDevice.h>
+#include <IOKit/usb/IOUSBInterface.h>
+#include <IOKit/usb/IOUSBLog.h>
+#include <IOKit/usb/USB.h>
+
+
+//================================================================================================
+//
+//   Class Declaration for IOUSBCompositeDriver
+//
+//================================================================================================
+//
+/*!
+ @class IOUSBCompositeDriver
+ @abstract Driver that matches to USB composite devices.
+ @discussion This class can be overriden to provide for specific behaviors.  The driver itself essentially
+ just calls SetConfiguration().
+ */
+class IOUSBCompositeDriver : public IOService
+{
+    OSDeclareDefaultStructors(IOUSBCompositeDriver)
+    
+    IOUSBDevice	* 	fDevice;
+    IONotifier * 	fNotifier;
+    bool		fExpectingClose;
+    UInt8               fConfigValue;
+    UInt8               fConfigbmAttributes;
+    
+    struct IOUSBCompositeDriverExpansionData 
+    {
+    };
+    
+    IOUSBCompositeDriverExpansionData * fIOUSBCompositeExpansionData;
+    
+    static IOReturn         CompositeDriverInterestHandler(  void * target, void * refCon, UInt32 messageType, IOService * provider,  void * messageArgument, vm_size_t argSize );
+    
+public:
+        
+		// IOService Methods
+		//
+		virtual bool            start(IOService * provider);
+    virtual IOReturn        message( UInt32 type, IOService * provider,  void * argument = 0 );
+    virtual bool            willTerminate( IOService * provider, IOOptionBits options );
+    virtual bool            didTerminate( IOService * provider, IOOptionBits options, bool * defer );
+    
+    // IOUSBCompositeDriver Methods
+    //
+    virtual bool            ConfigureDevice();
+    virtual IOReturn        ReConfigureDevice();
+    /*!
+		@function SetConfiguration
+     @abstract Call IOUSBDevice to do a SetConfiguration call to the device.
+     @param configValue The desired configuration value.
+     @param startInterfaceMatching A boolean specifying whether IOKit should begin the process of finding
+     matching drivers for the new IOUSBInterface objects.
+     */
+    virtual IOReturn SetConfiguration(UInt8 configValue, bool startInterfaceMatching=true);
+    
+    // Getters
+    //
+    bool                                GetExpectingClose()         { return fExpectingClose; }
+    UInt8                               GetConfigValue()            { return fConfigValue; }
+    UInt8                               GetConfigbmAttributes()     { return fConfigbmAttributes; }
+    IONotifier *                        GetNotifier()               { return fNotifier; }
+	
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  0);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  1);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  2);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  3);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  4);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  5);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  6);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  7);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  8);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  9);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 10);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 11);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 12);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 13);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 14);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 15);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 16);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 17);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 18);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 19);
+};
+
+#endif _IOKIT_IOUSBCompositeDriver_H
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBController.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBController.h.svn-base
new file mode 100644
index 0000000..18940f2
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBController.h.svn-base
@@ -0,0 +1,1073 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.2 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBCONTROLLER_H
+#define _IOKIT_IOUSBCONTROLLER_H
+
+//================================================================================================
+//
+//   Headers
+//
+//================================================================================================
+//
+#include <libkern/c++/OSArray.h>
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IODeviceMemory.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IOCommandPool.h>
+
+#include <IOKit/usb/USB.h>
+#include <IOKit/usb/USBHub.h>
+#include <IOKit/usb/IOUSBBus.h>
+#include <IOKit/usb/IOUSBNub.h>
+#include <IOKit/usb/IOUSBCommand.h>
+#include <IOKit/usb/IOUSBWorkLoop.h>
+
+
+//================================================================================================
+//
+//   Types and Constants
+//
+//================================================================================================
+//
+enum
+{
+    kErrataCMDDisableTestMode					= (1 << 0),		// turn off UHCI test mode
+    kErrataOnlySinglePageTransfers				= (1 << 1),		// Don't cross page boundaries in a single transfer
+    kErrataRetryBufferUnderruns					= (1 << 2),		// Don't cross page boundaries in a single transfer
+    kErrataLSHSOpti								= (1 << 3),		// Don't cross page boundaries in a single transfer
+    kErrataDisableOvercurrent					= (1 << 4),		// Always set the NOCP bit in rhDescriptorA register
+    kErrataLucentSuspendResume					= (1 << 5),		// Don't allow port suspend at the root hub
+    kErrataNeedsWatchdogTimer					= (1 << 6),		// Use Watchdog timer to reset confused controllers
+    kErrataNeedsPortPowerOff					= (1 << 7),		// Power off the ports and back on again to clear weird status.
+    kErrataAgereEHCIAsyncSched					= (1 << 8),		// needs workaround for Async Sched bug
+    kErrataNECOHCIIsochWraparound				= (1 << 9),		// needs workaround for NEC isoch buffer wraparound problem
+	kErrataNECIncompleteWrite					= (1 << 10),	// needs workaround for NEC bits not sticking (errata IBB-2UE-00030 Jun 23 2005)
+	kErrataICH6PowerSequencing					= (1 << 11),	// needs special power sequencing for early Transition machines
+	kErrataICH7ISTBuffer						= (1 << 12),	// buffer for Isochronous Scheduling Threshold
+	kErrataUHCISupportsOvercurrent				= (1 << 13),	// UHCI controller supports overcurrent detection
+	kErrataNeedsOvercurrentDebounce				= (1 << 14),	// The overcurrent indicator should be debounced by 10ms
+	kErrataSupportsPortResumeEnable				= (1 << 15),	// UHCI has resume enable bits at config address 0xC4
+	kErrataNoCSonSplitIsoch						= (1 << 16),	// MCP79 - split iscoh is a little different
+	kErrataOHCINoGlobalSuspendOnSleep			= (1 << 17),	// when sleeping, do not put the OHCI controller in SUSPEND state. just leave it Operational with suspended downstream ports
+	kErrataMissingPortChangeInt					= (1 << 18),	// sometimes the port change interrupt may be missing
+	kErrataMCP79IgnoreDisconnect				= (1 << 19),	// MCP79 - need to ignore a connect/disconnect on wake
+	kErrataUse32bitEHCI							= (1 << 20)	,	// MCP79 - EHCI should only run with 32 bit DMA addresses
+	kErrataUHCISupportsResumeDetectOnConnect	= (1 << 21),	// UHCI controller will generate a ResumeDetect interrupt while in Global Suspend if a device is plugged in
+	kErrataDontUseCompanionController			= (1 << 22)		// For systems which will end up being EHCI only
+};
+
+enum
+{
+    kUSBWatchdogTimeoutMS = 1000
+};
+
+
+/*!
+    @struct
+    @discussion This table contains the list of errata that are necessary for known problems with particular devices.
+    The format is vendorID, product ID, lowest revisionID needing errata, highest rev needing errata, errataBits.
+    The result of all matches is ORed together, so more than one entry may match.
+    Typically for a given errata a list of revisions that this applies to is supplied.
+     @field vendID      The Vendor ID of the device
+     @field deviceID    Product ID of device
+     @field revisionLo  Lowest product revsion to apply errata to
+     @field revisionHi  Highest product revision to apply errata to
+     @field errata      Bit field flagging which errata to apply to device.
+*/
+
+struct ErrataListEntryStruct
+{
+    UInt16 				vendID;
+    UInt16 				deviceID;
+    UInt16 				revisionLo;
+    UInt16 				revisionHi;
+    UInt32 				errata;
+};
+
+typedef struct ErrataListEntryStruct  ErrataListEntry, *ErrataListEntryPtr;
+
+
+//================================================================================================
+//
+//   Routines used to implement synchronous I/O
+//
+//================================================================================================
+//
+void IOUSBSyncCompletion(void *target, void * parameter, IOReturn status, UInt32 bufferSizeRemaining);
+
+void  IOUSBSyncIsoCompletion(void *target, void * parameter, IOReturn status, IOUSBIsocFrame *pFrames);
+
+
+//================================================================================================
+//
+//   Forward Declarations
+//
+//================================================================================================
+//
+class IOUSBDevice;
+class IOUSBLog;
+class IOUSBHubDevice;
+class IOUSBRootHubDevice;
+class IOMemoryDescriptor;
+
+
+//================================================================================================
+//
+//   IOUSBController Class
+//
+//================================================================================================
+//
+/*!
+    @class IOUSBController
+    @abstract Base class for USB hardware driver
+    @discussion Not many directly useful methods for USB device driver writers,
+    IOUSBDevice, IOUSBInterface and IOUSBPipe provide more useful abstractions.
+    The bulk of this class interfaces between IOKit and the low-level UIM, which is
+    based on the MacOS9 UIM. To impliment a new controller type, subclass
+    IOUSBController and impiment all the "UIM functions". AppleUSBOHCI
+    is an example of this implementing all the functions necessary to drive an
+    OHCI controller.
+*/
+class IOUSBController : public IOUSBBus
+{
+    OSDeclareAbstractStructors(IOUSBController)
+    friend class IOUSBControllerV2;
+    friend class IOUSBControllerV3;
+
+protected:
+
+    IOUSBWorkLoop *			_workLoop;
+    IOCommandGate *			_commandGate;
+    IOUSBRootHubDevice *	_rootHubDevice;
+    UInt32					_devZeroLock;
+    static UInt32			_busCount;
+    static bool				gUsedBusIDs[256];
+    
+    struct ExpansionData 
+    {
+		IOCommandPool		*freeUSBCommandPool;
+		IOCommandPool		*freeUSBIsocCommandPool;
+        IOTimerEventSource	*watchdogUSBTimer;
+        bool				_terminating;
+        bool				_watchdogTimerActive;
+        bool				_pcCardEjected;						// Obsolete
+        UInt32				_busNumber;
+        UInt32				_currentSizeOfCommandPool;
+        UInt32				_currentSizeOfIsocCommandPool;
+        UInt8				_controllerSpeed;					// Controller speed, passed down for splits
+        thread_call_t		_terminatePCCardThread;				// Obsolete
+        bool				_addressPending[128];
+		SInt32				_activeIsochTransfers;				// isochronous transfers in the queue
+		IOService			*_provider;							// common name for our provider
+		bool				_controllerCanSleep;				// true iff the controller is able to support sleep/wake
+		bool				_needToClose;
+		UInt32				_isochMaxBusStall;					// value (in ns) of the maximum PCI bus stall allowed for Isoch..
+    };
+    ExpansionData *_expansionData;
+	
+    // The following methods do not use and upper case initial letter because they are part of IOKit
+    //
+
+public:
+    virtual bool 		init( OSDictionary *  propTable );
+    virtual bool 		start( IOService *  provider );
+    virtual void 		stop( IOService * provider );
+    virtual bool 		finalize(IOOptionBits options);
+    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
+    virtual bool		didTerminate( IOService * provider, IOOptionBits options, bool * defer );
+	
+protected:
+		
+    IOReturn			getNubResources( IOService *  regEntry );
+
+    virtual UInt32 		GetErrataBits(
+                                            UInt16 vendorID, 
+                                            UInt16 deviceID, 
+                                            UInt16 revisionID );    
+    
+
+    static IOReturn 		DoDeleteEP( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoAbortEP( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoClearEPStall( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoCreateEP( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+    static IOReturn 		DoControlTransfer( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoIOTransfer( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoIsocTransfer(	
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoLowLatencyIsocTransfer(	
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static void			ControlPacketHandler( 
+                                                    OSObject *	target,
+                                                    void *	parameter,
+                                                    IOReturn	status,
+                                                    UInt32	bufferSizeRemaining );
+                                                    
+    static void			InterruptPacketHandler(
+                                                    OSObject *	target,
+                                                    void * 	parameter,
+                                                    IOReturn	status,
+                                                    UInt32	bufferSizeRemaining );
+                                                    
+    static void			BulkPacketHandler(
+                                                    OSObject *	target,
+                                                    void * 	parameter,
+                                                    IOReturn	status,
+                                                    UInt32	bufferSizeRemaining );
+
+    static void			IsocCompletionHandler(
+                                                    OSObject *		target,
+                                                    void * 		parameter,
+                                                    IOReturn		status,
+                                                    IOUSBIsocFrame	*pFrames );
+                                                    
+    static void			LowLatencyIsocCompletionHandler(
+                                                    OSObject *		target,
+                                                    void * 		parameter,
+                                                    IOReturn		status,
+                                                    IOUSBLowLatencyIsocFrame	*pFrames );
+                                                    
+    static void			WatchdogTimer(OSObject *target, IOTimerEventSource *sender);
+
+	// Obsolete
+    static void 		TerminatePCCard(OSObject *target);
+
+    static IOReturn		ProtectedDevZeroLock(OSObject *target, void* lock, void *, void *, void*);
+
+
+    USBDeviceAddress		GetNewAddress( void );
+    
+    IOReturn    		ControlTransaction( IOUSBCommand *  command );
+    
+    IOReturn    		InterruptTransaction( IOUSBCommand *  command );
+    
+    IOReturn    		BulkTransaction( IOUSBCommand *	command );
+    
+    IOReturn    		IsocTransaction( IOUSBIsocCommand *  command );
+    
+    IOReturn    		LowLatencyIsocTransaction( IOUSBIsocCommand *  command );
+    
+    void 			FreeCommand( IOUSBCommand *  command );
+
+    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    // Invokes the specified completion action of the request.  If
+    // the completion action is unspecified, no action is taken.
+    void 			Complete(
+                     IOUSBCompletion	completion,
+                     IOReturn		status,
+                     UInt32		actualByteCount = 0 );
+
+    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    // Invokes the specified completion action of the request.  If
+    // the completion action is unspecified, no action is taken.
+    void	CompleteWithTimeStamp (
+                                IOUSBCompletionWithTimeStamp		completion,
+                                IOReturn				status,
+                                UInt32					actualByteCount,
+                                AbsoluteTime				timeStamp);
+
+    
+
+    //
+    // UIM methods
+    //
+
+/*!
+    @function UIMInitialize
+    @abstract UIM function, initialise the controller and UIM data structures.
+*/
+    virtual IOReturn 		UIMInitialize( IOService * provider ) = 0;
+    
+/*!
+    @function UIMFinalize
+    @abstract UIM function, finalise the controller and UIM data structures prior to removal.
+*/
+    virtual IOReturn 		UIMFinalize() = 0;
+
+    // Control
+/*!
+    @function UIMCreateControlEndpoint
+    @abstract UIM function, create a control endpoint for the controller.
+    @param functionNumber  The USB device ID of the device for this endpoint
+    @param endpointNumber  The endpoint number for this endpoint
+    @param maxPacketSize   Maximum packet size of this endpoint
+    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
+*/
+    virtual IOReturn 		UIMCreateControlEndpoint(
+                                                            UInt8	functionNumber,
+                                                            UInt8	endpointNumber,
+                                                            UInt16	maxPacketSize,
+                                                            UInt8	speed) = 0;
+
+/* Note: this function has been superceded. */
+    virtual IOReturn 		UIMCreateControlTransfer(   short		functionNumber,
+                                                            short		endpointNumber,
+                                                            IOUSBCompletion	completion,
+                                                            void *		CBP,
+                                                            bool		bufferRounding,
+                                                            UInt32		bufferSize,
+                                                            short		direction) = 0;
+
+/*!
+    @function UIMCreateControlTransfer
+    @abstract UIM function, Do a transfer on a control endpoint.
+                This method supercedes the method which takes a void * parameter.
+    @param functionNumber  The USB device ID of the device to perform the transaction with
+    @param endpointNumber  The endpoint number for the transaction
+    @param completion      Action to perform when I/O completes
+    @param CBP             Memory descriptor describing the buffer to transfer. Will never describe
+                             memory which has disjoint packets.
+    @param bufferRounding  If true, short packets are OK and do not cause an error
+    @param bufferSize      Size of the data to transfer in the data phase. (C
+    @param direction       Specifies direction and PID for transaction. kUSBIn, KUSBOut (DATA PID) or kUSBSetup (SETUP PID).
+*/
+    virtual IOReturn 		UIMCreateControlTransfer(   short			functionNumber,
+                                                            short			endpointNumber,
+                                                            IOUSBCompletion		completion,
+                                                            IOMemoryDescriptor *	CBP,
+                                                            bool			bufferRounding,
+                                                            UInt32			bufferSize,
+                                                            short			direction) = 0;
+    
+    // Bulk
+/*!
+    @function UIMCreateBulkEndpoint
+    @abstract UIM function, create a bulk endpoint for the controller.
+    @param functionNumber  The USB device ID of the device for this endpoint
+    @param endpointNumber  The endpoint number for this endpoint
+    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
+    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
+    @param maxPacketSize   Maximum packet size of this endpoint
+*/
+    virtual IOReturn 		UIMCreateBulkEndpoint(
+                                                        UInt8		functionNumber,
+                                                        UInt8		endpointNumber,
+                                                        UInt8		direction,
+                                                        UInt8		speed,
+                                                        UInt8		maxPacketSize) = 0;
+
+/* Note: this function has been superceded. */
+    virtual IOReturn 		UIMCreateBulkTransfer(  short			functionNumber,
+                                                        short			endpointNumber,
+                                                        IOUSBCompletion		completion,
+                                                        IOMemoryDescriptor *	CBP,
+                                                        bool			bufferRounding,
+                                                        UInt32			bufferSize,
+                                                        short			direction) = 0;
+
+    // Interrupt
+/*!
+    @function UIMCreateInterruptEndpoint
+    @abstract UIM function, create an interrupt endpoint for the controller.
+    @param functionNumber  The USB device ID of the device for this endpoint
+    @param endpointNumber  The endpoint number for this endpoint
+    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
+    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
+    @param maxPacketSize   Maximum packet size of this endpoint
+    @param pollingRate     The maximum polling interval from the endpoint descriptor.
+*/
+    virtual IOReturn		UIMCreateInterruptEndpoint(
+                                                                short		functionAddress,
+                                                                short		endpointNumber,
+                                                                UInt8		direction,
+                                                                short		speed,
+                                                                UInt16		maxPacketSize,
+                                                                short		pollingRate) = 0;
+
+/* Note: this function has been superceded. */
+    virtual IOReturn 		UIMCreateInterruptTransfer( short			functionNumber,
+                                                            short			endpointNumber,
+                                                            IOUSBCompletion		completion,
+                                                            IOMemoryDescriptor *	CBP,
+                                                            bool			bufferRounding,
+                                                            UInt32			bufferSize,
+                                                            short			direction) = 0;
+
+    // Isoch
+/*!
+	@function UIMCreateIsochEndpoint
+    @abstract Create an Isochronous endpoint in the controller.
+    @param functionNumber  The USB device ID of the device for this endpoint
+    @param endpointNumber  The endpoint number for this endpoint
+    @param maxPacketSize   Maximum packet size of this endpoint
+    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
+*/
+    virtual IOReturn 		UIMCreateIsochEndpoint(
+                                                        short		functionAddress,
+                                                        short		endpointNumber,
+                                                        UInt32		maxPacketSize,
+                                                        UInt8		direction) = 0;
+
+/*!
+    @function UIMCreateIsochTransfer
+    @abstract UIM function, Do a transfer on an Isocchronous endpoint.
+    @param functionNumber  The USB device ID of the device to perform the transaction with
+    @param endpointNumber  The endpoint number for the transaction
+    @param completion      Action to perform when I/O completes
+    @param direction       Specifies direction for transfer. kUSBIn or KUSBOut.
+    @param frameStart      The frame number in which to start the transactions
+    @param pBuffer         describes memory buffer. 
+    @param frameCount      number of frames to do transactions in
+    @param pFrames         Describes transactions in individual frames, gives sizes and reults for transactions.
+*/
+    virtual IOReturn 		UIMCreateIsochTransfer(
+                                                        short			functionAddress,
+                                                        short			endpointNumber,
+                                                        IOUSBIsocCompletion	completion,
+                                                        UInt8			direction,
+                                                        UInt64			frameStart,
+                                                        IOMemoryDescriptor *	pBuffer,
+                                                        UInt32			frameCount,
+                                                        IOUSBIsocFrame		*pFrames) = 0;
+
+/*!
+    @function UIMAbortEndpoint
+    @abstract UIM function  Abort the specified endpoint, return all transactions queued on it.
+    @param functionNumber  The USB device ID of the device to Abort
+    @param endpointNumber  The endpoint number to Abort
+    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
+*/
+    virtual IOReturn 		UIMAbortEndpoint(
+                                                short		functionNumber,
+                                                short		endpointNumber,
+                                                short		direction) = 0;
+
+/*!
+    @function UIMDeleteEndpoint
+    @abstract UIM function  Delete the specified endpoint, returning all transactions queued on it.
+    @param functionNumber  The USB device ID of the device to Delete
+    @param endpointNumber  The endpoint number to Delete
+    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
+*/
+    virtual IOReturn 		UIMDeleteEndpoint(
+                                                    short	functionNumber,
+                                                    short	endpointNumber,
+                                                    short	direction) = 0;
+    
+/*!
+    @function UIMClearEndpointStall
+    @abstract UIM function  Clear stall on the specified endpoint, set data toggle to zero,
+                              return all transactions queued on it.
+    @param functionNumber  The USB device ID of the device to Clear
+    @param endpointNumber  The endpoint number to Clear
+    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
+*/
+    virtual IOReturn 		UIMClearEndpointStall(
+                                                        short		functionNumber,
+                                                        short		endpointNumber,
+                                                        short		direction) = 0;
+
+/*!
+    @function UIMRootHubStatusChange
+    @abstract UIM function  UIMRootHubStatusChange - This method was internal to the UIM (never called by the superclass) until
+							IOUSBControllerV3. For UIMs which are a subclass of IOUSBController or IOUSBControllerV2, it can
+							still be used internally only. For subclasses of IOUSBControllerV3, however, the meaning has changed
+							slightly. Now, it is used to determine if there is a status change on the root hub, and if so, it 
+							needs to update the IOUSBControllerV3 instance variable _rootHubStatusChangedBitmap
+*/
+    virtual void 		UIMRootHubStatusChange(void) = 0;
+
+    static const IORegistryPlane	*gIOUSBPlane;
+    
+public:
+
+    static IOUSBLog		*_log;
+	
+    IOCommandGate *		GetCommandGate(void);
+
+    /*!
+	@struct Endpoint
+        Describes an endpoint of a device.
+	Simply an easier to use version of the endpoint descriptor.
+        @field descriptor The raw endpoint descriptor.
+        @field number Endpoint number
+	@field direction Endpoint direction: kUSBOut, kUSBIn, kUSBAnyDirn
+	@field transferType Type of endpoint: kUSBControl, kUSBIsoc, kUSBBulk, kUSBInterrupt
+	@field maxPacketSize Maximum packet size for endpoint
+	@field interval Polling interval in milliseconds (only relevent for Interrupt endpoints)
+    */
+    struct Endpoint {
+        IOUSBEndpointDescriptor	*	descriptor;
+        UInt8 				number;
+        UInt8				direction;	// in, out
+        UInt8				transferType;	// cntrl, bulk, isoc, int
+        UInt16				maxPacketSize;
+        UInt8				interval;
+    };
+
+    // Implements IOService::getWorkLoop const member function
+    virtual IOWorkLoop *	getWorkLoop() const;
+    
+    /*
+     * Root hub methods
+     * Only of interest to the IOUSBRootHubDevice object
+     */
+/*!
+    @function GetRootHubDeviceDescriptor
+    @abstract UIM function, return the device descriptor of the simulated root hub device
+                           As GET_DESCRIPTOR control request for device descrptor
+    @param  desc   Descriptor structure to return data in
+*/
+    virtual IOReturn 		GetRootHubDeviceDescriptor( IOUSBDeviceDescriptor *desc ) = 0;
+    
+/*!
+    @function GetRootHubDescriptor
+    @abstract UIM function, return the hub descriptor of the simulated root hub device
+                           As GET_DESCRIPTOR control request for hub descrptor
+    @param  desc   Descriptor structure to return data in
+*/
+    virtual IOReturn 		GetRootHubDescriptor( IOUSBHubDescriptor *desc ) = 0;
+    
+/*!
+    @function SetRootHubDescriptor
+    @abstract UIM function, optional. Set the hub descriptor data.
+                           As SET_DESCRIPTOR control request for hub descrptor
+    @param  buffer   Descriptor data
+*/
+    virtual IOReturn 		SetRootHubDescriptor( OSData *buffer ) = 0;
+    
+/*!
+    @function GetRootHubConfDescriptor
+    @abstract UIM function, retrun the configuration descriptor of the simulated root hub device
+                           As GET_DESCRIPTOR control request for configuration descrptor
+    @param  desc   Descriptor structure to return data in
+*/
+    virtual IOReturn 		GetRootHubConfDescriptor( OSData *desc ) = 0;
+    
+/*!
+    @function GetRootHubStatus
+    @abstract UIM function, get the status of the root hub. As GET_STATUS control request to device.
+    @param status  Status structure to return
+*/
+    virtual IOReturn 		GetRootHubStatus( IOUSBHubStatus *status ) = 0;
+    
+/*!
+    @function SetRootHubFeature
+    @abstract UIM function, set feature of root hub, As SET_FEATURE control request.
+    @param wValue  The feature to set, as would be transferred in wValue field of SETUP packet.
+*/
+    virtual IOReturn 		SetRootHubFeature( UInt16 wValue ) = 0;
+    
+/*!
+    @function ClearRootHubFeature
+    @abstract UIM function, set feature of root hub, As CLEAR_FEATURE control request.
+    @param wValue  The feature to clear, as would be transferred in wValue field of SETUP packet.
+*/
+    virtual IOReturn		ClearRootHubFeature( UInt16 wValue ) = 0;
+    
+/*!
+    @function GetRootHubPortStatus
+    @abstract UIM function, get the status of a root hub port. As GET_STATUS control request to the port.
+    @param status  Status structure to return
+    @param port    Port to get status for.
+*/
+    virtual IOReturn 		GetRootHubPortStatus( IOUSBHubPortStatus *status, UInt16 port ) = 0;
+    
+/*!
+    @function SetRootHubPortFeature
+    @abstract UIM function, set feature of a root hub port, As SET_FEATURE control request to a port.
+    @param wValue  The feature to set, as would be transferred in wValue field of SETUP packet.
+    @param port    Port to set feature for
+*/
+    virtual IOReturn 		SetRootHubPortFeature( UInt16 wValue, UInt16 port ) = 0;
+    
+/*!
+    @function ClearRootHubPortFeature
+    @abstract UIM function, clear feature of a root hub port, As CLEAR_FEATURE control request to a port.
+    @param wValue  The feature to clear, as would be transferred in wValue field of SETUP packet.
+    @param port    Port to clear feature for
+*/
+    virtual IOReturn 		ClearRootHubPortFeature( UInt16 wValue, UInt16 port ) = 0;
+    
+/*!
+    @function ClearRootHubPortFeature
+    @abstract UIM function, Impliments GET_BUS_STATE control request, now obsolete.
+*/
+    virtual IOReturn 		GetRootHubPortState( UInt8 *state, UInt16 port ) = 0;
+    
+/*!
+    @function SetHubAddress
+    @abstract UIM function, set the address of the simulated root hub device, as SET_ADDRESS
+    @param wValue	 New address for root hub.
+*/
+    virtual IOReturn 		SetHubAddress( UInt16 wValue ) = 0;
+    
+
+    /*!
+		@function openPipe
+        Open a pipe to the specified device endpoint
+        @param address Address of the device on the USB bus
+		@param speed of the device: kUSBHighSpeed or kUSBLowSpeed
+        @param endpoint description of endpoint to connect to
+    */
+    virtual IOReturn 		OpenPipe(   USBDeviceAddress 	address, 
+										UInt8				speed,
+                                        Endpoint *			endpoint );
+    /*!
+        @function closePipe
+        Close a pipe to the specified device endpoint
+        @param address Address of the device on the USB bus
+		@param endpoint description of endpoint
+    */
+    virtual IOReturn 		ClosePipe(	USBDeviceAddress 	address,
+                                        Endpoint *			endpoint );
+
+    // Controlling pipe state
+    /*!
+        @function abortPipe
+        Abort pending I/O to/from the specified endpoint, causing them to complete with return code kIOReturnAborted
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+    */
+    virtual IOReturn 		AbortPipe(
+                                            USBDeviceAddress 	address,
+                                            Endpoint *			endpoint );
+    /*!
+        @function resetPipe
+        Abort pending I/O and clear stalled state - this method is a combination of abortPipe and clearPipeStall
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+    */
+    virtual IOReturn 		ResetPipe(	USBDeviceAddress 	address,
+                                        Endpoint *			endpoint );
+    /*!
+        @function clearPipeStall
+        Clear a pipe stall.
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+    */
+    virtual IOReturn 		ClearPipeStall(	USBDeviceAddress 	address,
+											Endpoint *			endpoint );
+
+    // Transferring Data
+    /*!
+        @function read
+        Read from an interrupt or bulk endpoint
+		@param buffer place to put the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+		@param completion describes action to take when buffer has been filled 
+    */
+    virtual IOReturn 		Read(	IOMemoryDescriptor * 	buffer,
+									USBDeviceAddress		address,
+									Endpoint *				endpoint,
+									IOUSBCompletion *		completion );
+    /*!
+        @function write
+        Write to an interrupt or bulk endpoint
+        @param buffer place to get the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+        @param completion describes action to take when buffer has been emptied
+    */
+    virtual IOReturn 		Write(	IOMemoryDescriptor *	buffer,
+									USBDeviceAddress 	address,
+									Endpoint *		endpoint,
+									IOUSBCompletion *	completion );
+
+    /*!
+        @function isocIO
+        Read from or write to an isochronous endpoint
+        @param buffer place to put the transferred data
+        @param frameStart USB frame number of the frame to start transfer
+        @param numFrames Number of frames to transfer
+        @param frameList Bytes to transfer and result for each frame
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+        @param completion describes action to take when buffer has been filled
+    */
+    virtual IOReturn 		IsocIO(	IOMemoryDescriptor * 	buffer,
+									UInt64					frameStart,
+									UInt32					numFrames,
+									IOUSBIsocFrame *		frameList,
+									USBDeviceAddress		address,
+									Endpoint *				endpoint,
+									IOUSBIsocCompletion *	completion );
+    /*!
+        @function deviceRequest
+        Make a control request to the specified endpoint
+		There are two versions of this method, one uses a simple void *
+        to point to the data portion of the transfer, the other uses an
+		IOMemoryDescriptor to point to the data.
+		@param request parameter block for the control request
+		@param completion describes action to take when the request has been executed
+        @param address Address of the device on the USB bus
+		@param epNum endpoint number
+    */
+    virtual IOReturn 		DeviceRequest(	IOUSBDevRequest *	request,
+											IOUSBCompletion *	completion,
+											USBDeviceAddress 	address, 
+											UInt8				epNum );
+											
+    virtual IOReturn 		DeviceRequest(	IOUSBDevRequestDesc *	request,
+											IOUSBCompletion *		completion,
+											USBDeviceAddress		address, 
+											UInt8					epNum );
+
+    /*
+     * Methods used by the hub driver to initialize a device
+     */
+    /*!
+	@function AcquireDeviceZero
+	Get the device zero lock - call this before resetting a device, to ensure there's
+	only one device with address 0
+    */
+    virtual IOReturn 		AcquireDeviceZero( void );
+    /*!
+        @function ReleaseDeviceZero
+        Release the device zero lock - call this to release the device zero lock,
+		when there is no longer a device at address 0
+    */
+    virtual void			ReleaseDeviceZero( void );
+
+	// non-virtual methods
+    void				WaitForReleaseDeviceZero( void );
+    IOReturn			ConfigureDeviceZero( UInt8 maxPacketSize, UInt8 speed );
+    IOReturn			GetDeviceZeroDescriptor( IOUSBDeviceDescriptor *  desc, UInt16 size );
+    IOReturn			SetDeviceZeroAddress(USBDeviceAddress address);
+    IOUSBDevice *		MakeDevice(USBDeviceAddress *address); 
+    IOUSBHubDevice *	MakeHubDevice(USBDeviceAddress *address); 
+	IOReturn			CreateDevice(	IOUSBDevice *		device,
+										USBDeviceAddress	deviceAddress,
+										UInt8				maxPacketSize,
+										UInt8				speed,
+										UInt32				powerAvailable );
+
+   /*!
+	@function GetBandwidthAvailable
+        Returns the available bandwidth (in bytes) per frame or microframe for
+	isochronous transfers.
+	@result maximum number of bytes that a new iso pipe could transfer
+	per frame given current allocations.
+    */
+    virtual UInt32 		GetBandwidthAvailable( void ) = 0;
+
+    /*!
+        @function GetFrameNumber
+        Returns the full current frame number.
+        @result The frame number.
+    */
+    virtual UInt64 		GetFrameNumber( void ) = 0;
+
+    /*!
+        @function GetFrameNumber32
+        Returns the least significant 32 bits of the frame number.
+        @result The lsb 32 bits of the frame number.
+    */
+    virtual UInt32 		GetFrameNumber32( void ) = 0;
+
+    // Debugger polled mode
+    virtual void 		PollInterrupts( IOUSBCompletionAction safeAction = 0 ) = 0;
+ 
+    virtual IOReturn 		PolledRead(
+                                            short			functionNumber,
+                                            short			endpointNumber,
+                                            IOUSBCompletion		completion,
+                                            IOMemoryDescriptor *	CBP,
+                                            bool			bufferRounding,
+                                            UInt32			bufferSize);
+                                            
+    OSMetaClassDeclareReservedUsed(IOUSBController,  0);
+    virtual void UIMCheckForTimeouts(void);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBController,  1);
+    virtual IOReturn 		UIMCreateControlTransfer(   short		functionNumber,
+                                                            short		endpointNumber,
+                                                            IOUSBCommand*	command,
+                                                            void*		CBP,
+                                                            bool		bufferRounding,
+                                                            UInt32		bufferSize,
+                                                            short		direction);
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  2);
+    virtual IOReturn 		UIMCreateControlTransfer(   short			functionNumber,
+                                                            short			endpointNumber,
+                                                            IOUSBCommand*		command,
+                                                            IOMemoryDescriptor*		CBP,
+                                                            bool			bufferRounding,
+                                                            UInt32			bufferSize,
+                                                            short			direction);
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  3);
+/*!
+    @function UIMCreateBulkTransfer
+    @abstract UIM function, Do a transfer on a bulk endpoint.
+                This method supercedes the method which takes multiple parameters.
+    @param command  paramters for transfer.
+*/
+    virtual IOReturn 		UIMCreateBulkTransfer(IOUSBCommand* command);
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  4);
+/*!
+    @function UIMCreateInterruptTransfer
+    @abstract UIM function, Do a transfer on an interrupt endpoint.
+                This method supercedes the method which takes multiple parameters.
+    @param command  paramters for transfer.
+*/
+    virtual IOReturn 		UIMCreateInterruptTransfer(IOUSBCommand* command);
+
+    /*!
+        @function deviceRequest
+        Make a control request to the specified endpoint
+		There are two versions of this method, one uses a simple void *
+        to point to the data portion of the transfer, the other uses an
+		IOMemoryDescriptor to point to the data.
+		@param request parameter block for the control request
+		@param completion describes action to take when the request has been executed
+        @param address Address of the device on the USB bus
+		@param epNum endpoint number
+    */
+    OSMetaClassDeclareReservedUsed(IOUSBController,  5);
+    virtual IOReturn 		DeviceRequest(  IOUSBDevRequest *	request,
+                                                IOUSBCompletion *	completion,
+                                                USBDeviceAddress 	address, 
+                                                UInt8 			epNum,
+						UInt32			noDataTimeout,
+						UInt32			completionTimeout );
+						
+    OSMetaClassDeclareReservedUsed(IOUSBController,  6);
+    virtual IOReturn 		DeviceRequest(  IOUSBDevRequestDesc *	request,
+                                                IOUSBCompletion *	completion,
+                                                USBDeviceAddress 	address, 
+                                                UInt8 			epNum,
+						UInt32			noDataTimeout,
+						UInt32			completionTimeout );
+
+    
+    
+    OSMetaClassDeclareReservedUsed(IOUSBController,  7);
+    /*!
+        @function read
+        Read from an interrupt or bulk endpoint
+		@param buffer place to put the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+		@param completion describes action to take when buffer has been filled 
+    */
+    virtual IOReturn 		Read(   IOMemoryDescriptor * 	buffer,
+                                        USBDeviceAddress 	address,
+                                        Endpoint *		endpoint,
+                                        IOUSBCompletion *	completion,
+					UInt32			noDataTimeout,
+					UInt32			completionTimeout );
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  8);
+    /*!
+        @function write
+        Write to an interrupt or bulk endpoint
+        @param buffer place to get the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+        @param completion describes action to take when buffer has been emptied
+    */
+    virtual IOReturn 		Write(  IOMemoryDescriptor *	buffer,
+                                        USBDeviceAddress 	address,
+                                        Endpoint *		endpoint,
+                                        IOUSBCompletion *	completion,
+					UInt32			noDataTimeout,
+					UInt32			completionTimeout );
+
+    // this should really not be using a padding slot, since free is in our superclas, but we shipped this way so now we need to leave it.
+    OSMetaClassDeclareReservedUsed(IOUSBController,  9);
+    virtual void free();
+
+protected:
+    	
+/*!
+    @function UIMRootHubStatusChange(bool)
+    @abstract UIM function  UIMRootHubStatusChange(bool) - This method was internal to the UIM (never called by the superclass) until
+							IOUSBControllerV3. For UIMs which are a subclass of IOUSBController or IOUSBControllerV2, it can
+							still be used internally only. For subclasses of IOUSBControllerV3, however, it has become obsolete
+							(it still needs to be implemented since it is pure virtual)
+*/
+    OSMetaClassDeclareReservedUsed(IOUSBController,  10);
+    virtual void 		UIMRootHubStatusChange( bool abort ) = 0;
+
+public:
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  11);
+    virtual IOReturn CreateRootHubDevice( IOService * provider, IOUSBRootHubDevice ** rootHubDevice);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBController,  12);
+    /*!
+        @function Read
+        Read from an interrupt or bulk endpoint
+		@param buffer place to put the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+		@param completion describes action to take when buffer has been filled
+		@param noDataTimeout number of milliseconds of no data movement before the request is aborted
+		@param completionTimeout number of milliseonds after the command is on the bus in which it must complete
+		@param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
+    */
+    virtual IOReturn 		Read(   IOMemoryDescriptor * 	buffer,
+                                        USBDeviceAddress 	address,
+                                        Endpoint *		endpoint,
+                                        IOUSBCompletion *	completion,
+					UInt32			noDataTimeout,
+					UInt32			completionTimeout,
+					IOByteCount		reqCount );
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  13);
+    /*!
+        @function Write
+        Write to an interrupt or bulk endpoint
+        @param buffer place to get the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+        @param completion describes action to take when buffer has been emptied
+		@param noDataTimeout number of milliseconds of no data movement before the request is aborted
+		@param completionTimeout number of milliseonds after the command is on the bus in which it must complete
+		@param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
+    */
+    virtual IOReturn 		Write(  IOMemoryDescriptor *	buffer,
+                                        USBDeviceAddress 	address,
+                                        Endpoint *		endpoint,
+                                        IOUSBCompletion *	completion,
+					UInt32			noDataTimeout,
+					UInt32			completionTimeout,
+					IOByteCount		reqCount );
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  14);
+    
+    virtual IOReturn GetRootHubStringDescriptor(UInt8	index, OSData *desc) = 0;
+    
+    OSMetaClassDeclareReservedUsed(IOUSBController,  15);
+    /*!
+        @function IsocIO
+        Read from or write to an isochronous endpoint
+        @param buffer place to put the transferred data
+        @param frameStart USB frame number of the frame to start transfer
+        @param numFrames Number of frames to transfer
+        @param frameList Bytes to transfer and result for each frame
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+        @param completion describes action to take when buffer has been filled
+        @param updateFrequency describes how often to update the framelist once the transfer has completed (in ms)
+    */
+    virtual IOReturn IsocIO(  IOMemoryDescriptor * 			buffer,
+                                        UInt64 				frameStart,
+                                        UInt32 				numFrames,
+                                        IOUSBLowLatencyIsocFrame *	frameList,
+                                        USBDeviceAddress 		address,
+                                        Endpoint *			endpoint,
+                                        IOUSBLowLatencyIsocCompletion *	completion,
+                                        UInt32				updateFrequency );
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  16);
+    
+    /*!
+		@function UIMCreateIsochTransfer
+		@abstract UIM function, Do a transfer on an Isocchronous endpoint.
+		@param functionNumber  The USB device ID of the device to perform the transaction with
+		@param endpointNumber  The endpoint number for the transaction
+		@param completion      Action to perform when I/O completes
+		@param direction       Specifies direction for transfer. kUSBIn or KUSBOut.
+		@param frameStart      The frame number in which to start the transactions
+		@param pBuffer         describes memory buffer. 
+		@param frameCount      number of frames to do transactions in
+		@param pFrames         Describes transactions in individual frames, gives sizes and reults for transactions.
+		@param updateFrequency Describes how often we update the frameList parameters (in ms)
+	*/
+    virtual IOReturn 		UIMCreateIsochTransfer(
+                                                        short			functionAddress,
+                                                        short			endpointNumber,
+                                                        IOUSBIsocCompletion	completion,
+                                                        UInt8			direction,
+                                                        UInt64			frameStart,
+                                                        IOMemoryDescriptor *	pBuffer,
+                                                        UInt32			frameCount,
+                                                        IOUSBLowLatencyIsocFrame *pFrames,
+                                                        UInt32			updateFrequency);
+
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  17);
+    virtual IOReturn 		CheckForDisjointDescriptor(IOUSBCommand *command, UInt16 maxPacketSize);
+    
+    /*!
+		@function UIMCreateIsochTransfer
+		@abstract UIM function, Do a transfer on an Isocchronous endpoint.
+		@param command  an IOUSBIsocCommand object with all the necessary information
+	 */
+    OSMetaClassDeclareReservedUsed(IOUSBController,  18);
+	virtual IOReturn UIMCreateIsochTransfer(IOUSBIsocCommand *command);
+	
+	// do not use this slot without first checking bug rdar://6022420
+    OSMetaClassDeclareReservedUnused(IOUSBController,  19);
+    
+protected:
+    void	IncreaseIsocCommandPool();
+    void 	IncreaseCommandPool();
+    void	ParsePCILocation(const char *str, int *deviceNum, int *functionNum);
+    int		ValueOfHexDigit(char c);
+};
+
+#endif /* ! _IOKIT_IOUSBCONTROLLER_H */
+
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerListElement.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerListElement.h.svn-base
new file mode 100644
index 0000000..7351177
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerListElement.h.svn-base
@@ -0,0 +1,126 @@
+/*
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1998-2007 Apple Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOUSBCONTROLLERLISTELEMENT_H
+#define _IOUSBCONTROLLERLISTELEMENT_H
+
+
+#include <libkern/c++/OSObject.h>
+
+#include <IOKit/IOTypes.h>
+
+#include <IOKit/usb/USB.h>
+
+
+/*!
+ @class IOUSBControllerListElement
+ @abstract Used by the IOUSBController to manage the USB controller lists that are common between EHCI and UHCI.
+ */
+class IOUSBControllerListElement : public OSObject
+{
+    OSDeclareDefaultStructors(IOUSBControllerListElement)
+	
+private:    
+	
+public:
+	
+    virtual void					SetPhysicalLink(IOPhysicalAddress next) = 0;
+    virtual IOPhysicalAddress		GetPhysicalLink(void) = 0;
+    virtual IOPhysicalAddress		GetPhysicalAddrWithType(void) = 0;
+    virtual void					print(int level);
+	
+    IOPhysicalAddress				_sharedPhysical;			// phys address of the memory shared with the controller			
+    void *							_sharedLogical;				// logical address of the above
+    IOUSBControllerListElement		*_logicalNext;				// the next element in the list
+    
+};
+
+
+class IOUSBControllerV2;										// needed for a parameter
+class IOUSBControllerIsochEndpoint;
+
+class IOUSBControllerIsochListElement : public IOUSBControllerListElement
+{
+    OSDeclareDefaultStructors(IOUSBControllerIsochListElement)
+	
+private:
+    
+public:
+	
+    virtual void					SetPhysicalLink(IOPhysicalAddress next) = 0;
+    virtual IOPhysicalAddress		GetPhysicalLink(void) = 0;
+    virtual IOPhysicalAddress		GetPhysicalAddrWithType(void) = 0;
+    virtual void					print(int level);
+	
+    IOUSBControllerIsochEndpoint	*_pEndpoint;
+    IOUSBIsocFrame					*_pFrames;
+    IOUSBIsocCompletion				_completion;
+    Boolean							_lowLatency;
+	bool							_requestFromRosettaClient; // True if the request originated from a Rosetta client in user space
+	UInt8							_framesInTD;			// used for HS Isoch only
+    UInt64							_frameNumber;			// frame number for scheduling purposes
+    UInt32							_frameIndex;			// index into the myFrames array
+    IOUSBControllerIsochListElement *_doneQueueLink;		// linkage used by done queue processing
+	
+    // pure virtual methods which must be implemented by descendants
+    virtual IOReturn				UpdateFrameList(AbsoluteTime timeStamp) = 0;
+    virtual IOReturn				Deallocate(IOUSBControllerV2 *uim) = 0;
+};
+
+class IOUSBControllerIsochEndpoint : public OSObject
+{
+    OSDeclareDefaultStructors(IOUSBControllerIsochEndpoint)
+	
+public:
+	
+	virtual bool init();
+
+    IOUSBControllerIsochEndpoint		*nextEP;
+    IOUSBControllerIsochListElement  	*toDoList;					// ITD or SITD
+    IOUSBControllerIsochListElement  	*toDoEnd;					// ITD or SITD
+    IOUSBControllerIsochListElement  	*doneQueue;					// ITD or SITD
+    IOUSBControllerIsochListElement  	*doneEnd;					// ITD or SITD
+    IOUSBControllerIsochListElement  	*deferredQueue;				// ITD or SITD
+    IOUSBControllerIsochListElement  	*deferredEnd;				// ITD or SITD
+    UInt64								firstAvailableFrame;		// next frame available for a transfer on this EP
+    UInt32								maxPacketSize;
+    UInt32								activeTDs;					// + when added to todo list, - when taken from done queue
+    UInt32								onToDoList;					// + when added to todo list, - when taken from done queue
+    UInt32								onDoneQueue;					// + when added to todo list, - when taken from done queue
+	volatile SInt32						scheduledTDs;				// + when linked onto periodic list, - when unlinked
+	UInt32								deferredTDs;
+	UInt32								onProducerQ;
+	UInt32								onReversedList;
+    UInt16								inSlot;						// where Isoc TDs are being put in the periodic list 
+    short								functionAddress;
+    short								endpointNumber;
+    IOReturn							accumulatedStatus;
+	UInt32								interval;					// this is the decoded interval value for HS endpoints and is 1 for FS endpoints
+    UInt8								direction;
+	bool								aborting;
+};
+
+
+#endif
+
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV2.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV2.h.svn-base
new file mode 100644
index 0000000..4d2c306
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV2.h.svn-base
@@ -0,0 +1,374 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.2 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBCONTROLLERV2_H
+#define _IOKIT_IOUSBCONTROLLERV2_H
+
+#include <IOKit/IODMACommand.h>
+
+#include <IOKit/usb/IOUSBControllerListElement.h>
+#include <IOKit/usb/IOUSBController.h>
+
+enum
+{
+    kUSBHSHubCommandAddHub	= 1,
+    kUSBHSHubCommandRemoveHub	= 2,
+    
+    kUSBHSHubFlagsMultiTT	= 1
+};
+
+
+/*!
+    @class IOUSBControllerV2
+    @abstract subclass of the IOUSBController to provide support for high speed 
+                devices and split transactions.
+    @discussion The IOUSBController class provide sufficient functionality to 
+                work with full (12Mb/s) and low (1.5Mb/s) devices. IOUSBControllerV2
+                introduces the support for high (480Mb/s) speed devices from the
+                USB 2.0 spec. In particular IOUSBControllerV2 indicates the high
+                speed hub a full or low speed device is attached to so that split
+                transactions can be directed to the hub at high speed to be forwarded
+                to the full or low speed device by the hub.
+                It also gives support for bulk endoints of greater than 256 bytes.
+*/
+
+class IOUSBControllerV2 : public IOUSBController
+{
+    OSDeclareAbstractStructors(IOUSBControllerV2)
+
+protected:
+    
+    // These for keeping track of high speed ancestor to allow controller to do splits.
+    //
+    UInt8 _highSpeedHub[128];
+    UInt8 _highSpeedPort[128];
+
+    struct V2ExpansionData { 
+		UInt8										_multiTT[128];
+		IOUSBCommand								*ClearTTCommand;
+		IOUSBControllerIsochEndpoint				*_isochEPList;						// linked list of active Isoch "endpoints"
+		IOUSBControllerIsochEndpoint				*_freeIsochEPList;					// linked list of freed Isoch EP data structures
+		thread_call_t								_returnIsochDoneQueueThread;
+	};
+    V2ExpansionData *_v2ExpansionData;
+
+    // Super's expansion data
+    #define _freeUSBCommandPool					_expansionData->freeUSBCommandPool
+    #define _freeUSBIsocCommandPool				_expansionData->freeUSBIsocCommandPool
+    #define _watchdogUSBTimer					_expansionData->watchdogUSBTimer
+    #define _controllerTerminating				_expansionData->_terminating
+    #define _watchdogTimerActive				_expansionData->_watchdogTimerActive
+    #define _busNumber							_expansionData->_busNumber
+    #define _currentSizeOfCommandPool			_expansionData->_currentSizeOfCommandPool
+    #define _currentSizeOfIsocCommandPool		_expansionData->_currentSizeOfIsocCommandPool
+    #define _controllerSpeed					_expansionData->_controllerSpeed
+	#define _activeIsochTransfers				_expansionData->_activeIsochTransfers
+
+	// this class's expansion data
+	#define _isochEPList						_v2ExpansionData->_isochEPList
+	#define _freeIsochEPList					_v2ExpansionData->_freeIsochEPList
+	#define _returnIsochDoneQueueThread			_v2ExpansionData->_returnIsochDoneQueueThread
+	
+    virtual bool 		init( OSDictionary *  propTable );
+    virtual bool 		start( IOService *  provider );
+    virtual void		free();
+
+    static IOReturn  DoCreateEP(OSObject *owner,
+                           void *arg0, void *arg1,
+                           void *arg2, void *arg3);
+
+    static void		clearTTHandler( 
+							OSObject *	target,
+                            void *	parameter,
+                            IOReturn	status,
+                            UInt32	bufferSizeRemaining );
+
+public:
+
+        /*!
+        @function openPipe
+         Open a pipe to the specified device endpoint
+         @param address Address of the device on the USB bus
+         @param speed of the device: kUSBDeviceSpeedLow, kUSBDeviceSpeedFull or kUSBDeviceSpeedHigh
+         @param endpoint description of endpoint to connect to
+         */
+        virtual IOReturn 		OpenPipe(   USBDeviceAddress 	address,
+                                       UInt8 		speed,
+                                       Endpoint *		endpoint );
+
+    /*!
+    @function CreateDevice
+    @abstract Create a new device as IOUSBController, making a note of the
+                high speed hub device ID and port number the full/low speed
+                device is attached to.
+    @param newDevice       new device object to work with
+    @param deviceAddress   USB device ID
+    @param maxPacketSize   max packet size of endpoint zero
+    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
+    @param powerAvailable  power available to the device 
+    @param hub             USB ID of hub the device is immediatly attached to. (Not necessarily high speed)
+    @param port            port number of port the device is attached to.
+*/
+    virtual  IOReturn CreateDevice(	IOUSBDevice 		*newDevice,
+                                    USBDeviceAddress	deviceAddress,
+                                    UInt8		 	maxPacketSize,
+                                    UInt8			speed,
+                                    UInt32			powerAvailable,
+                                    USBDeviceAddress		hub,
+                                    int      port);
+
+/*!
+	@function ConfigureDeviceZero
+    @abstract configure pipe zero of device zero, as IOUSBController, but also keeping 
+                 note of high speed hub device is attached to.
+    @param maxPacketSize  max packet size for the pipe
+    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
+    @param hub            USB ID of hub the device is immediatly attached to.  (Not necessarily high speed)
+    @param port           port number of port the device is attached to.
+*/
+    virtual  IOReturn ConfigureDeviceZero(UInt8 maxPacketSize, UInt8 speed, USBDeviceAddress hub, int port);
+
+/*!
+	@function UIMCreateControlEndpoint
+    @abstract Create an endpoint in the controller to do control transactions.
+    @param functionNumber  USB device ID of device
+    @param endpointNumber  endpoint address of the endpoint in the device
+    @param maxPacketSize   maximum packet size of this endpoint
+    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
+    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
+                           address split transactions to.
+    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
+*/
+    virtual IOReturn 		UIMCreateControlEndpoint(
+                                                            UInt8	functionNumber,
+                                                            UInt8	endpointNumber,
+                                                            UInt16	maxPacketSize,
+                                                            UInt8	speed,
+                                                            USBDeviceAddress highSpeedHub,
+                                                            int      highSpeedPort) = 0;
+
+/*!
+	@function UIMCreateBulkEndpoint
+    @abstract Create an endpoint in the controller to do bulk transactions.
+    @param functionNumber  USB device ID of device
+    @param endpointNumber  endpoint address of the endpoint in the device
+    @param direction       Direction of data flow. kUSBIn or kUSBOut
+    @param maxPacketSize   maximum packet size of this endpoint
+    @param speed           speed of the device kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
+    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
+                           address split transactions to.
+    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
+*/
+    virtual IOReturn 		UIMCreateBulkEndpoint(
+                                                        UInt8		functionNumber,
+                                                        UInt8		endpointNumber,
+                                                        UInt8		direction,
+                                                        UInt8		speed,
+                                                        UInt16		maxPacketSize,
+                                                        USBDeviceAddress highSpeedHub,
+                                                        int      highSpeedPort) = 0;
+
+/*!
+	@function UIMCreateInterruptEndpoint
+    @abstract Create an endpoint in the controller to do interrupt transactions.
+    @param functionAddress USB device ID of device
+    @param endpointNumber  endpoint address of the endpoint in the device
+    @param direction       Direction of data flow. kUSBIn or kUSBOut
+    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
+    @param maxPacketSize   maximum packet size of this endpoint
+    @param pollingRate     The maximum polling interval from the endpoint descriptor.
+    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
+                           address split transactions to.
+    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
+*/
+    virtual IOReturn		UIMCreateInterruptEndpoint(
+                                                                short		functionAddress,
+                                                                short		endpointNumber,
+                                                                UInt8		direction,
+                                                                short		speed,
+                                                                UInt16		maxPacketSize,
+                                                                short		pollingRate,
+                                                                USBDeviceAddress highSpeedHub,
+                                                                int      highSpeedPort) = 0;
+
+/*!
+	@function UIMCreateIsochEndpoint
+    @abstract Create an endpoint in the controller to do Isochronous transactions.
+    @param functionAddress USB device ID of device
+    @param endpointNumber  endpoint address of the endpoint in the device
+    @param maxPacketSize   maximum packet size of this endpoint
+    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
+    @param highSpeedHub    If non zero, this is a full speed device, the address of the high speed hub to
+                           address split transactions to.
+    @param highSpeedPort   If highSpeedHub is non zero, the hub port to address split transactions to
+*/
+    virtual IOReturn 		UIMCreateIsochEndpoint(
+                                                        short				functionAddress,
+                                                        short				endpointNumber,
+                                                        UInt32				maxPacketSize,
+                                                        UInt8				direction,
+                                                        USBDeviceAddress	highSpeedHub,
+                                                        int					highSpeedPort) = 0;
+
+
+	static void 				ReturnIsochDoneQueueEntry(OSObject *target, thread_call_param_t endpointPtr);
+
+	
+	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  0);
+    virtual IOReturn		AddHSHub(USBDeviceAddress highSpeedHub, UInt32 flags);
+    
+    static IOReturn DOHSHubMaintenance(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  1);
+    virtual IOReturn 		UIMHubMaintenance(USBDeviceAddress highSpeedHub, UInt32 highSpeedPort, UInt32 command, UInt32 flags);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  2);
+    virtual IOReturn		RemoveHSHub(USBDeviceAddress highSpeedHub);
+    
+    static IOReturn DOSetTestMode(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  3);
+    virtual IOReturn		SetTestMode(UInt32 mode, UInt32 port);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  4);
+    virtual IOReturn		UIMSetTestMode(UInt32 mode, UInt32 port);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  5);
+    virtual UInt64		GetMicroFrameNumber( void );
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  6);
+    virtual void ClearTT(USBDeviceAddress addr, UInt8 endpt, Boolean IN);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  7);
+    /*!
+        @function Read
+     Read from an interrupt or bulk endpoint
+     @param buffer place to put the transferred data
+     @param address Address of the device on the USB bus
+     @param endpoint description of endpoint
+     @param completion describes action to take when buffer has been filled
+     @param noDataTimeout number of milliseconds of no data movement before the request is aborted
+     @param completionTimeout number of milliseonds after the command is on the bus in which it must complete
+     @param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
+     */
+    virtual IOReturn ReadV2( IOMemoryDescriptor *			buffer,
+                           USBDeviceAddress					address,
+                           Endpoint *						endpoint,
+                           IOUSBCompletionWithTimeStamp *	completion,
+                           UInt32							noDataTimeout,
+                           UInt32							completionTimeout,
+                           IOByteCount						reqCount );
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  8);
+/*!
+	@function UIMCreateIsochEndpoint
+    @abstract Create an endpoint in the controller to do Isochronous transactions.
+    @param functionAddress USB device ID of device
+    @param endpointNumber  endpoint address of the endpoint in the device
+    @param maxPacketSize   maximum packet size of this endpoint
+    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
+    @param highSpeedHub    If non zero, this is a full speed device, the address of the high speed hub to
+                           address split transactions to.
+    @param highSpeedPort   If highSpeedHub is non zero, the hub port to address split transactions to
+	@param interval		   The encoded interval value from the endpoint descriptor
+*/
+    virtual IOReturn 		UIMCreateIsochEndpoint(		short				functionAddress,
+                                                        short				endpointNumber,
+                                                        UInt32				maxPacketSize,
+                                                        UInt8				direction,
+                                                        USBDeviceAddress	highSpeedHub,
+                                                        int					highSpeedPort,
+														UInt8				interval);
+
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  9);
+	virtual IOUSBControllerIsochEndpoint*		AllocateIsochEP(void);	
+	
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  10);
+	virtual IOReturn							DeallocateIsochEP(IOUSBControllerIsochEndpoint *pEP);
+
+	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  11);
+    virtual IOUSBControllerIsochEndpoint* 	FindIsochronousEndpoint(short functionNumber, short endpointNumber, short direction, IOUSBControllerIsochEndpoint* *pEDBack);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  12);
+    virtual IOUSBControllerIsochEndpoint*	CreateIsochronousEndpoint(short functionNumber, short endpointNumber, short direction);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  13);
+    virtual void								PutTDonToDoList(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  14);
+    virtual IOUSBControllerIsochListElement		*GetTDfromToDoList(IOUSBControllerIsochEndpoint* pED);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  15);
+    virtual void								PutTDonDeferredQueue(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  16);
+	virtual IOUSBControllerIsochListElement		*GetTDfromDeferredQueue(IOUSBControllerIsochEndpoint* pED);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  17);
+    virtual void								PutTDonDoneQueue(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD, bool checkDeferred);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  18);
+    virtual IOUSBControllerIsochListElement		*GetTDfromDoneQueue(IOUSBControllerIsochEndpoint* pED);
+	
+	// 7185026 - this is to make this call from behind the gate
+    static IOReturn		GatedGetTDfromDoneQueue(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  19);
+    virtual void								ReturnIsochDoneQueue(IOUSBControllerIsochEndpoint*);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  20);
+	virtual IODMACommand						*GetNewDMACommand();
+	
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  21);
+	/*!
+	 @function GetLowLatencyOptionsAndPhysicalMask
+	 @abstract Low Latency transfers require that the client have access to the memory after the Isochronous I/O request has already been scheduled. This might be used, for example to fill in outgoing data "just in time." Some controllers, however, may have requirements which need to be followed in order to make sure that the memory buffer isn't moved after the call is made. This call will return an IOOptionBits and mach_vm_address_t which can be used in a call to IOBufferMemoryDescriptor::inTaskWithPhysicalMask which will help meet these requirements.
+	 @param optionBits Pointer to an an IOOptionBits. The only bit which may be returned is kIOMemoryPhysicallyContiguous. Other bits, e.g. direction bits, must be ORd in by the client as needed. This call replaces the old property based method of obtaining this information.
+	 @param physicalMask  Pointer to a mach_vm_address_t which should be used in the call to IOBufferMemoryDescriptor::inTaskWithPhysicalMask and will guarantee that when the memory is wired down it will be accessible by both the client and the USB controller at the same time.
+	 @result returns kIOReturnSuccess if the method is implemented by the controller, otherwise kIOReturnUnsupported
+	 */
+    virtual IOReturn 		GetLowLatencyOptionsAndPhysicalMask(IOOptionBits *optionBits, mach_vm_address_t *physicalMask);
+	
+	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  22);
+	/*!
+	 @function GetFrameNumberWithTime
+	 @abstract Real Time A/V applications send and receive Iscohronous data scheduled on certain USB frame numbers. The clock for these frame numbers is independent of the system clock, and drivers need to synchronize these two clocks. This routine will return a system time which corresponds to the beginning of a USB frame number. It is not necessarily the currrent frame, but it will be a frame in the recent past (within the past minute). The jitter between the start of the USB frame and the system time will be as low as possible, but due to hardware interrupt latencies could be as high as 200 microseconds.
+	 @param frameNumber A pointer to a UInt64 in which to hold the USB frame number corresponding to the given system time.
+	 @param theTime A pointer to an AbsoluteTime corresponding to the system time at the beginning of the given USB frame number.
+	 @result returns kIOReturnSuccess if the method is implemented by the controller, otherwise kIOReturnUnsupported
+	 */
+	virtual IOReturn		GetFrameNumberWithTime(UInt64* frameNumber, AbsoluteTime *theTime);
+	
+	
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  23);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  24);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  25);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  26);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  27);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  28);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  29);
+    
+};
+
+
+#endif /* ! _IOKIT_IOUSBCONTROLLERV2_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV3.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV3.h.svn-base
new file mode 100644
index 0000000..22da915
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV3.h.svn-base
@@ -0,0 +1,233 @@
+/*
+* Copyright (c) 2007-2008 Apple Inc. All rights reserved.
+*
+* @APPLE_LICENSE_HEADER_START@
+* 
+* The contents of this file constitute Original Code as defined in and
+* are subject to the Apple Public Source License Version 1.2 (the
+* "License").  You may not use this file except in compliance with the
+* License.  Please obtain a copy of the License at
+* http://www.apple.com/publicsource and read it before using this file.
+* 
+* This Original Code and all software distributed under the License are
+* distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
+* Please see the License for the specific language governing rights and 
+* limitations under the License.
+* 
+* @APPLE_LICENSE_HEADER_END@
+*/
+
+#ifndef _IOKIT_IOUSBCONTROLLERV3_H
+#define _IOKIT_IOUSBCONTROLLERV3_H
+
+#include <IOKit/pci/IOPCIDevice.h>
+
+#include <IOKit/usb/IOUSBControllerV2.h>
+#include <IOKit/usb/IOUSBHubDevice.h>
+
+// Constants that define the different power states in the setPowerState call
+enum
+{
+    kUSBPowerStateOff				= 0,				// controller is reset, nothing is attached
+    kUSBPowerStateRestart			= 1,				// same as OFF
+    kUSBPowerStateSleep				= 2,				// controller is suspended, preparing to lose main power
+    kUSBPowerStateLowPower			= 3,				// controller is suspended, power remains on
+    kUSBPowerStateOn				= 4,				// up and running
+	kUSBNumberBusPowerStates		= 5
+};
+
+#define kUSBPowerStateStable		-1
+
+enum
+{
+    kUSBBusStateReset				= 0,				// bus is in RESET
+    kUSBBusStateSuspended			= 1,				// bus is in SUSPEND mode
+    kUSBBusStateRunning				= 2					// bus is operational
+};
+
+
+// Root Hub things
+typedef struct IOUSBRootHubInterruptTransaction 
+{
+    IOMemoryDescriptor *		buf;
+    UInt32						bufLen;
+    IOUSBCompletion				completion;
+} IOUSBRootHubInterruptTransaction;
+
+enum 
+{
+	  kIOUSBMaxRootHubTransactions  = 2
+};
+
+
+
+/*!
+ @class IOUSBControllerV3
+ @abstract subclass of the IOUSBControllerV2 to provide support for new USB Power Management techniques.
+ @discussion With Leopard, we are providing more information to USB Device Drivers in the IOPower
+ tree to allow for more efficient Power Management. This controller class encapulates many of the changes
+ needed for that, without disturbing third party subclasses of IOUSBController or IOUSBControllerV2
+ */
+
+class IOUSBControllerV3 : public IOUSBControllerV2
+{	
+		OSDeclareAbstractStructors(IOUSBControllerV3)
+
+	protected:
+		// static variable shared by all instances
+		static uint32_t *				_gHibernateState;
+
+	
+		UInt8							_myBusState;					// kUSBBusStateReset, kUSBBusStateSuspended, kUSBBusStateRunning
+		bool							_wakingFromHibernation;			// True while the Hibernation Wake thread is active
+		bool							_needToAckPowerDown;			// True while we are changing power state due to shutdown/restart
+		bool							_onCardBus;						// OBSOLETE
+		bool							_controllerAvailable;			// true if we can talk to the controller
+		SInt32							_powerStateChangingTo;			// a power state that we are in the process of changing to, or -1 if we are stable
+		bool							_poweringDown;					// true is the controller is powering down because of a systemWillPowerDown message
+		bool							_restarting;					// true is the controller is restarting because of a systemWillPowerDown message
+		unsigned long					_myPowerState;					// my current state (since getPowerState doesn't always change in time)
+		IOUSBControllerV3				*_ehciController;				// set if I am a companion controller
+		unsigned long					_numPowerStates;				// how many power states do I support (defaults to kUSBNumDefaultPowerStates)
+		IOPMPowerState					*_myPowerStates;				// my power state array (allocated on the fly)
+		IOPCIDevice						*_device;						// my PCI device
+
+		// root hub support
+	    IOTimerEventSource					*_rootHubTimer;				// timer which fires at the rate of the root hub interrupt endpoint
+		UInt8								_rootHubPollingRate;		// Obsolete -- we need to have it be a uint32_t
+		UInt8								_rootHubNumPorts;			// number of root hub ports - should be 15 or fewer!
+		UInt16								_rootHubStatusChangedBitmap;	// support up to 15 ports for status changes
+		bool								_rootHubTimerActive;		// UNUSED
+		IOUSBRootHubInterruptTransaction	_outstandingRHTrans[4];		// Transactions for the Root Hub.  We need 2, one for the current transaction and one for the next.  This is declared as 4 for binary compatibility
+
+		struct V3ExpansionData { 
+			uint32_t				_rootHubPollingRate32;
+			bool					_rootHubTransactionWasAborted;
+		};
+		V3ExpansionData *_v3ExpansionData;
+
+		// IOKit methods
+		virtual bool					init( OSDictionary *  propTable );
+		virtual bool					start( IOService *  provider );
+		virtual void					stop( IOService * provider );
+		virtual unsigned long			maxCapabilityForDomainState ( IOPMPowerFlags domainState );
+		virtual unsigned long			initialPowerStateForDomainState ( IOPMPowerFlags domainState );
+		virtual IOReturn				powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+		virtual IOReturn				setPowerState( unsigned long powerStateOrdinal, IOService* whatDevice );
+		virtual IOReturn				powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+		virtual void					powerChangeDone ( unsigned long fromState);
+		virtual void					systemWillShutdown( IOOptionBits specifier );
+		virtual void					free(void);
+	
+		// IOUSBController methods
+		// we override these to deal with methods attempting to go through the workloop while we are in sleep
+		virtual IOReturn 		AcquireDeviceZero( void );
+		virtual void			ReleaseDeviceZero( void );
+		virtual IOReturn 		DeviceRequest(IOUSBDevRequest *request,  IOUSBCompletion *completion, USBDeviceAddress address, UInt8 epNum, UInt32 noDataTimeout, UInt32 completionTimeout);
+		virtual IOReturn 		DeviceRequest(IOUSBDevRequestDesc *request,  IOUSBCompletion *completion, USBDeviceAddress address, UInt8 epNum, UInt32 noDataTimeout, UInt32 completionTimeout);
+		virtual IOReturn 		ClosePipe(USBDeviceAddress address, Endpoint *endpoint);
+		virtual IOReturn 		AbortPipe(USBDeviceAddress address, Endpoint *endpoint);
+		virtual IOReturn 		ResetPipe(USBDeviceAddress address, Endpoint *endpoint);
+		virtual IOReturn 		ClearPipeStall(USBDeviceAddress address, Endpoint *endpoint);
+		virtual IOReturn 		Read(IOMemoryDescriptor *buffer, USBDeviceAddress address, Endpoint *endpoint, IOUSBCompletion *completion, UInt32 noDataTimeout, UInt32 completionTimeout, IOByteCount reqCount);
+		virtual IOReturn 		Write(IOMemoryDescriptor *buffer, USBDeviceAddress address, Endpoint *endpoint, IOUSBCompletion *completion, UInt32 noDataTimeout, UInt32 completionTimeout, IOByteCount reqCount);
+		virtual IOReturn		IsocIO(IOMemoryDescriptor *buffer, UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList, USBDeviceAddress address, Endpoint *endpoint, IOUSBIsocCompletion *completion );
+		virtual IOReturn		IsocIO(IOMemoryDescriptor *buffer, UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList, USBDeviceAddress address, Endpoint *endpoint, IOUSBLowLatencyIsocCompletion *completion, UInt32 updateFrequency );	
+
+		// IOUSBControllerV2 methods
+		// we override these to deal with methods attempting to go through the workloop while we are in sleep
+		virtual IOReturn 		OpenPipe(USBDeviceAddress address, UInt8 speed, Endpoint *endpoint);
+		virtual IOReturn		AddHSHub(USBDeviceAddress highSpeedHub, UInt32 flags);
+		virtual IOReturn		RemoveHSHub(USBDeviceAddress highSpeedHub);
+		virtual IOReturn		SetTestMode(UInt32 mode, UInt32 port);
+		virtual IOReturn		ReadV2(IOMemoryDescriptor *buffer, USBDeviceAddress	address, Endpoint *endpoint, IOUSBCompletionWithTimeStamp *completion, UInt32 noDataTimeout, UInt32	completionTimeout, IOByteCount reqCount);
+	
+		// IOUSBControllerV3 methods
+	
+		// these are called through the workloop
+		static IOReturn					DoEnableAddressEndpoints(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
+		static IOReturn					DoEnableAllEndpoints(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
+		static IOReturn					GatedPowerChange(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
+
+		// also on the workloop
+	    static void						RootHubTimerFired(OSObject *owner, IOTimerEventSource *sender);
+	
+		// subclassable methods
+		virtual IOReturn				CheckForEHCIController(IOService *provider);
+		virtual	IOReturn				AllocatePowerStateArray(void);
+		virtual	IOReturn				InitForPM(void);
+		virtual IOReturn				CheckPowerModeBeforeGatedCall(char *fromStr);
+		virtual IOReturn				EnableAllEndpoints(bool enable);
+		virtual IOReturn				EnableBusMastering(bool enable);
+		virtual IOReturn				EnsureUsability(void);
+		virtual IOReturn				CheckForRootHubChanges(void);
+		virtual IOReturn				RootHubQueueInterruptRead(IOMemoryDescriptor *buf, UInt32 bufLen, IOUSBCompletion completion);
+		virtual IOReturn				RootHubAbortInterruptRead(void);
+		virtual IOReturn				RootHubStartTimer(UInt8 pollingRate);			// Obsolete see RootHubStartTimer32
+		virtual IOReturn				RootHubStopTimer(void);
+	
+		// these methods have a default implementation using some of the virtual methods below
+		virtual	void					ControllerOff(void);
+		virtual	void					ControllerRestart(void);
+		virtual	void					ControllerSleep(void);
+		virtual	void					ControllerDoze(void);
+		virtual	void					ControllerOn(void);
+
+		// these methods are pure virtual, and need to be implemented in the subclass driver
+		virtual	IOReturn				ResetControllerState(void) = 0;
+		virtual IOReturn				RestartControllerFromReset(void) = 0;
+		virtual	IOReturn				SaveControllerStateForSleep(void) = 0;
+		virtual	IOReturn				RestoreControllerStateFromSleep(void) = 0;
+		virtual IOReturn				DozeController(void) = 0;
+		virtual IOReturn				WakeControllerFromDoze(void) = 0;
+		virtual IOReturn				UIMEnableAddressEndpoints(USBDeviceAddress address, bool enable) = 0;
+		virtual IOReturn				UIMEnableAllEndpoints(bool enable) = 0;
+		virtual IOReturn				EnableInterruptsFromController(bool enable) = 0;
+	
+	public:
+	
+		// public methods
+		virtual IOReturn				EnableAddressEndpoints(USBDeviceAddress address, bool enable);
+		virtual bool					IsControllerAvailable(void);
+		virtual IOReturn				HandlePowerChange(unsigned long powerStateOrdinal);
+		virtual	UInt32					AllocateExtraRootHubPortPower(UInt32 extraPowerRequested);
+		virtual	void					ReturnExtraRootHubPortPower(UInt32 extraPowerReturned);
+	
+	OSMetaClassDeclareReservedUsed(IOUSBControllerV3,  0);
+	virtual IOReturn				RootHubStartTimer32(uint32_t pollingRate);
+	
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  1);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  2);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  3);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  4);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  5);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  6);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  7);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  8);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  9);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  10);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  11);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  12);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  13);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  14);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  15);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  16);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  17);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  18);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  19);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  20);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  21);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  22);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  23);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  24);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  25);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  26);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  27);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  28);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  29);
+};
+
+#endif		// _IOKIT_IOUSBCONTROLLERV3_H
\ No newline at end of file
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBDevice.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBDevice.h.svn-base
new file mode 100644
index 0000000..58d73a0
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBDevice.h.svn-base
@@ -0,0 +1,639 @@
+/*
+ * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.2 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __OPEN_SOURCE__
+/*
+ *
+ *	$Log: IOUSBDevice.h,v $
+ *	Revision 1.65  2009/10/18 20:20:37  nano
+ *	Bring in fixes in 390.4.0 QL:  7310698 7301024 7307079 and 7310698
+ *
+ *	Revision 1.64.32.4  2009/10/15 21:17:43  nano
+ *	If OverrideAtLocationID does not see a override property, return true
+ *	
+ *	Revision 1.64.32.3.2.1  2009/10/15 21:36:27  nano
+ *	If OverrideAtLocationID does not see a override property, return true
+ *	
+ *	Revision 1.64.32.3  2009/10/14 19:16:15  nano
+ *	Minor name changes
+ *	
+ *	Revision 1.64.32.2  2009/10/14 19:05:21  nano
+ *	7284477 7293893 Simplify scheme to decide whether we want to override a property for a hub at a particular ID for a particular MacModel.  Added a IOUSBDevice API that tells us if we are in the right model and locationID to override a property
+ *	
+ *	Revision 1.64.32.1  2009/10/08 19:55:56  nano
+ *	rdar://7284477 Allow us to overide the config descriptor of a 2514 hub on a K23F
+ *	
+ *	Revision 1.64  2009/09/08 12:28:45  nano
+ *	<rdar://problem/7195788> IOUSBDevice headerdoc comment problem - GetNumConfigs name is wrong, should be GetNumConfigurations
+ *	
+ *	Revision 1.63  2009/05/07 19:43:09  nano
+ *	Move our SnowLeopard branch to TOT
+ *	
+ *	Revision 1.57.84.6  2009/03/13 22:45:11  nano
+ *	Bring in branches to fix 6676089 6675858 6567987 6490273
+ *	
+ *	Revision 1.57.84.5.4.1  2009/03/11 20:01:56  nano
+ *	rdar://6567987  Do not let a Reset or a ReEnumerate through while the other is executing.
+ *	
+ *	Revision 1.57.84.5  2009/02/26 13:44:32  nano
+ *	Bring in rdar://6536090&6586312 to SL branch
+ *	
+ *	Revision 1.57.84.4.10.1  2009/02/25 00:51:06  rhoads
+ *	change the mechanism of getConfigLock so as to prevent a deadlock
+ *	
+ *	Revision 1.57.84.4  2009/02/13 15:57:33  rhoads
+ *	roll in rdars: 6213394, 6489431, 6513000, 6515115, 6535200, 6567783
+ *	
+ *	Revision 1.57.84.3.48.3  2009/02/11 19:19:08  rhoads
+ *	add back an expansionData variable to preserve binary compatibility
+ *	
+ *	Revision 1.57.84.3.48.2  2009/02/11 03:05:56  arulchan
+ *	more ::SuspendDevice changes
+ *	
+ *	Revision 1.57.84.3.48.1  2009/01/23 21:34:15  arulchan
+ *	fix for rdar://6213394
+ *	
+ *	Revision 1.57.84.3  2008/06/16 21:31:16  nano
+ *	Bring in changes from Foxhound 320.2.17
+ *	
+ *	Revision 1.57.84.2  2008/04/22 22:38:01  nano
+ *	Bring in changes from Foxhound-320.2.9
+ *	
+ *	Revision 1.60.28.2  2008/05/22 17:36:18  nano
+ *	Fix the reporting of the internal bit for GetDeviceInformation
+ *	
+ *	Revision 1.60.28.1  2008/05/21 17:51:43  nano
+ *	<rdar://problem/5952635> GetDeviceInformation needs some fixes
+ *	
+ *	Revision 1.60  2008/04/18 22:03:28  nano
+ *	Bring in fix for rdar://5874560
+ *	
+ *	Revision 1.59.4.1  2008/04/18 21:55:55  nano
+ *	<rdar://problem/5874560> Need API to know how much extra power has been allocated
+ *	
+ *	Revision 1.59  2008/04/17 16:56:57  nano
+ *	Bring in branches for rdar://5867990 & rdar://5768343
+ *	
+ *	Revision 1.58.4.1  2008/04/16 20:26:13  nano
+ *	<rdar://problem/5867990> Add API to allocate sleep current, as well as making sure that we return any extra power if our client dies or our device is terminated without returning it
+ *	
+ *	Revision 1.58  2008/04/14 16:08:38  nano
+ *	Add new APIs for high power and for GetDeviceInformation.
+ *	
+ *	Revision 1.57.126.2  2008/04/13 05:25:40  nano
+ *	Call into PolicyMaker for the GetPortInformation
+ *	
+ *	Revision 1.57.126.1  2008/04/11 22:25:44  nano
+ *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
+ *	
+ *	Revision 1.57  2007/08/07 20:30:36  rhoads
+ *	rolled in a few branches to TOT
+ *	
+ *	Revision 1.56.92.1  2007/08/07 03:43:34  nano
+ *	Bring in more changes for M89 suppport -- like actually use the dang power if the properties are available
+ *	
+ *	Revision 1.56  2007/03/06 12:23:41  rhoads
+ *	roll in 5024412, 5035829, and 5039670
+ *	
+ *	Revision 1.55.30.1  2007/02/27 16:08:33  rhoads
+ *	some fine tuning of our IOService overrides, including not overriding willTerminate and didTerminate (5024412)
+ *	
+ *	Revision 1.55  2007/01/19 17:58:48  rhoads
+ *	roll in branches for a leopard build
+ *	
+ *	Revision 1.54.30.1  2007/01/17 16:37:02  rhoads
+ *	remove the IOUSBDevice::attach method which is not really useful
+ *	
+ *	Revision 1.54  2006/10/06 04:42:01  rhoads
+ *	roll in branches 4727961, 4758404, 4759810, 4760274, and 4762769
+ *	
+ *	Revision 1.53.4.1  2006/10/04 16:03:57  rhoads
+ *	better IOUSBHubDevice design
+ *	
+ */
+#endif
+
+#ifndef _IOKIT_IOUSBDEVICE_H
+#define _IOKIT_IOUSBDEVICE_H
+
+#include <IOKit/usb/IOUSBNub.h>
+#include <IOKit/usb/IOUSBPipe.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOCommandGate.h>
+
+#include <kern/thread_call.h>
+
+// The following are definitions for errata properties needed for different devices.  This
+// should be but in the dictionary of the IOUSBDevice in question.  This can be achieved
+// by using the AppleUSBMergeNub class and having an IOProviderMergeProperties dictionary
+// with the required properties.
+
+// This property allows a device to specify a configuration value of 0 in its configuration
+// descriptor.  This does not follow the spec, but we will allow it in order to get the device 
+// to work.  The property should be a Boolean
+//
+#define kAllowConfigValueOfZero		"kAllowZeroConfigValue"
+#define kAllowNumConfigsOfZero		"kAllowZeroNumConfigs"
+
+
+class IOUSBController;
+class IOUSBControllerV2;
+class IOUSBInterface;
+class IOUSBHubPolicyMaker;
+/*!
+    @class IOUSBDevice
+    @abstract The IOService object representing a device on the USB bus.
+    @discussion This class provides functionality to configure a device and to create
+	IOUSBInterface objects to represent the interfaces of the device.
+*/
+
+class IOUSBDevice : public IOUSBNub
+{
+    friend class IOUSBController;
+    friend class IOUSBControllerV2;
+    friend class IOUSBInterface;
+    friend class IOUSBPipe;
+   
+    OSDeclareDefaultStructors(IOUSBDevice)
+
+protected:
+
+    USBDeviceAddress				_address;
+    IOUSBController *	     		_controller;
+    IOUSBPipe *						_pipeZero;
+    IOUSBDeviceDescriptor			_descriptor;
+    UInt32							_busPowerAvailable;
+    UInt8							_speed;
+    IOUSBEndpointDescriptor			_endpointZero; 				// Fake ep for control pipe
+    void *							_port;					// Obsolete, do not use
+    IOBufferMemoryDescriptor**		_configList;
+    IOUSBInterface**				_interfaceList;
+    UInt8							_currentConfigValue;
+    UInt8							_numInterfaces;
+    
+    struct ExpansionData 
+    {
+        UInt32					_portNumber;
+        thread_call_t			_doPortResetThread;
+        IOUSBDevice *			_usbPlaneParent;
+        bool					_portResetThreadActive;
+        bool					_allowConfigValueOfZero;
+        thread_call_t			_doPortSuspendThread;
+        bool					_portSuspendThreadActive;
+        thread_call_t			_doPortReEnumerateThread;
+        bool					_resetInProgress;
+        bool					_portHasBeenReset;
+        IORecursiveLock*		_XgetConfigLock;				// Obsolete
+        bool					_doneWaiting;                   // Obsolete
+        bool					_notifiedWhileBooting;          // Obsolete
+        IOWorkLoop *			_workLoop;
+        IOTimerEventSource *	_notifierHandlerTimer;
+        UInt32					_notificationType;
+        bool					_suspendInProgress;
+        bool					_portHasBeenSuspendedOrResumed;
+        bool					_addExtraResetTime;
+		bool					_suspendCommand;
+		IOCommandGate *			_commandGate;
+		OSSet *					_openInterfaces;
+		bool					_resetCommand;
+		IOReturn				_resetError;
+		IOReturn				_suspendError;
+        thread_call_t			_doMessageClientsThread;
+		IOUSBHubPolicyMaker *	_hubPolicyMaker;
+		UInt32					_sleepPowerAllocated;				// how much sleep power we already gave to our client
+		UInt32					_wakePowerAllocated;				// how much extra power during wake did we already give our client
+		UInt32					_devicePortInfo;
+		bool					_deviceIsInternal;					// Will be set if all our upstream hubs are captive (internal to the computer)
+		bool					_deviceIsInternalIsValid;			// true if we have already determined whether the device is internal
+		bool					_newGetConfigLock;					// new lock, taken within the WL gate, when doing a GetConfig
+		UInt32					_resetAndReEnumerateLock;			// "Lock" to prevent us from doing a reset or a re-enumerate while the other one is in progress		
+		UInt32					_locationID;
+    };	
+    ExpansionData * _expansionData;
+
+    const IOUSBConfigurationDescriptor *FindConfig(UInt8 configValue, UInt8 *configIndex=0);
+
+    virtual IOUSBInterface * GetInterface(const IOUSBInterfaceDescriptor *interface);
+
+public:
+    virtual IOReturn SetFeature(UInt8 feature);
+
+protected:    
+    virtual IOReturn GetConfigDescriptor(UInt8 configIndex, void *data, UInt32 len);
+
+    virtual IOReturn GetDeviceDescriptor(IOUSBDeviceDescriptor *desc, UInt32 size);
+
+    virtual bool init(USBDeviceAddress deviceAddress, UInt32 powerAvaiable, UInt8 speed, UInt8 maxPacketSize );
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 *score);
+    
+public:
+    // IOService methods
+    virtual bool		init( void );
+    virtual bool		start( IOService *provider );	
+	virtual bool		handleIsOpen(const IOService *forClient) const;
+	virtual bool		handleOpen(IOService *forClient, IOOptionBits options, void *arg);
+	virtual void		handleClose(IOService *forClient, IOOptionBits options);
+    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
+    virtual bool		terminate( IOOptionBits options = 0 );
+    virtual bool		requestTerminate( IOService * provider, IOOptionBits options );
+    virtual void		stop( IOService *provider );
+    virtual bool		finalize(IOOptionBits options);
+	virtual void		free( void );	
+
+	// IOUSBDevice methods
+    virtual void SetProperties();
+    
+    static IOUSBDevice *NewDevice(void);
+    
+    virtual void SetPort(void *port);			// Obsolete, do NOT use
+
+    /*!
+	@function FindNextInterfaceDescriptor
+	return a pointer to the next interface descriptor within the given full configuration descriptor satisfying the requirements specified, or NULL if there aren't any.
+        @param configDescIn the configuration descriptor within which to search. obtained from GetFullConfigurationDescriptor(configIndex). use NULL to specify the current configuration's descriptor.
+        @param intfDesc interface descriptor from which to start the search. NULL for the first interface descriptor in the given configuration descriptor
+        @param request IOUSBFindInterfaceRequest specifying the desired interface. Not changed.
+        @param descOut pointer to placeholder for the returned descriptor ptr
+	@result returns kIOReturnBadArgument if configDesc is not correct, or if configDesc is NULL and the device is not configured, or if intfDesc is not in configDesc. Otherwise returns kIOReturnSuccess or kIOUSBInterfaceNotFound.
+    */
+    virtual IOReturn FindNextInterfaceDescriptor(const IOUSBConfigurationDescriptor *configDescIn, 
+                                                 const IOUSBInterfaceDescriptor *intfDesc,
+                                                 const IOUSBFindInterfaceRequest *request,
+                                                 IOUSBInterfaceDescriptor **descOut);
+    /*!
+	@function FindNextInterface
+	return an pointer to an IOUSBInterface object satisfying the requirements specified in request, or NULL if there aren't any. the device
+        must be configured for there to be any interfaces.
+        @param current interface to start searching from, NULL to start at the beginning of the device's interface list for the current configuration.
+	@param request specifies what properties an interface must have to match.
+	@result Pointer to a matching IOUSBInterface, or NULL if none match. Note: The IOUSBInterface is NOT retained for the caller. If the caller wishes to continue to use the returned object, it should call retain() on that object.
+    */
+    virtual IOUSBInterface *FindNextInterface(IOUSBInterface *current,
+                                              IOUSBFindInterfaceRequest *request);
+
+    /*!
+        @function CreateInterfaceIterator 
+        return an OSIterator to iterate through interfaces satisfying the requirements specified in request.                        
+        @param request specifies what properties an interface must have to match.
+        @result Pointer to an OSIterator.
+    */
+    virtual OSIterator *CreateInterfaceIterator(IOUSBFindInterfaceRequest *request);
+
+    // Get pointer to full config info (cached in device, don't free returned pointer)
+    /*!
+	@function GetFullConfigurationDescriptor
+	return a pointer to all the descriptors for the requested configuration.
+        @param configIndex The configuration index (not the configuration value)
+	@result Pointer to the descriptors, which are cached in the IOUSBDevice object.
+    */
+    virtual const IOUSBConfigurationDescriptor *GetFullConfigurationDescriptor(UInt8 configIndex);
+
+    /*!
+	@function GetConfigurationDescriptor
+        Copy the specified amount of data for a configuration into the suppled buffer.
+        @param configValue The configuration value
+	@param data Buffer to copy data into
+	@param len number of bytes to copy
+    */
+    virtual IOReturn GetConfigurationDescriptor(UInt8 configValue, void *data, UInt32 len);
+
+    /*!
+	@function ResetDevice
+	Reset the device, returning it to the addressed, unconfigured state.
+	This is useful if a device has got badly confused. Note that the AppleUSBComposite driver will automatically
+        reconfigure the device if it is a composite device.
+    */
+    virtual IOReturn ResetDevice();
+
+    /*!
+	@function SetConfiguration
+	Do a USB SetConfiguration call to the device. The caller must have the device open() in order to 
+	actually cause a configuration change. If the device is currently configured, all IOUSBInterface objects
+	associated with the device are freed. After the new configuration has been set, all of its IOUSBInterface objects are
+	instantiated automatically.
+	@param forClient The client requesting the configuration change
+	@param configValue The desired configuration value.
+	@param startInterfaceMatching A boolean specifying whether IOKit should begin the process of finding
+	matching drivers for the new IOUSBInterface objects.
+    */
+    virtual IOReturn SetConfiguration(IOService *forClient, UInt8 configValue, bool startInterfaceMatching=true);
+    
+    // Access to addressing and cached info
+    /*!
+        @function GetAddress
+        returns the bus address of the device
+    */
+    virtual USBDeviceAddress GetAddress(void);
+    
+    /*!
+        @function GetSpeed
+        returns the speed of the device
+    */
+    virtual UInt8 GetSpeed(void);
+    /*!
+        @function GetBus
+        returns a pointer to the IOUSBController object for the device
+    */
+    virtual IOUSBController *GetBus(void);
+    /*!
+        @function GetBusPowerAvailable
+        returns the power available to the device, in units of 2mA
+    */
+    virtual UInt32 GetBusPowerAvailable( void );
+    /*!
+        @function GetMaxPacketSize
+        returns the maximum packet size for endpoint zero (only 8, 16, 32, 64 are valid)
+    */
+    virtual UInt8 GetMaxPacketSize(void);
+    /*!
+        @function GetVendorID
+        returns the Vendor ID of the device
+    */
+    virtual UInt16 GetVendorID(void);
+    /*!
+        @function GetProductID
+        returns the Product ID of the device
+    */
+    virtual UInt16 GetProductID(void);
+    /*!
+        @function GetDeviceRelease
+        returns the DeviceRelease information
+    */
+    virtual UInt16 GetDeviceRelease(void);
+    /*!
+        @function GetNumConfigurations
+        returns the number of configs in the device config descriptor
+    */
+    virtual UInt8 GetNumConfigurations(void);
+    /*!
+        @function GetManufacturerStringIndex
+        returns the index of string descriptor describing manufacturer
+    */
+    virtual UInt8 GetManufacturerStringIndex(void );
+    /*!
+        @function GetProductStringIndex
+        returns the index of string descriptor describing product
+    */
+    virtual UInt8 GetProductStringIndex(void );
+    /*!
+        @function GetSerialNumberStringIndex
+        returns the index of string descriptor describing the device's serial number
+    */
+    virtual UInt8 GetSerialNumberStringIndex(void );
+    /*!
+        @function GetPipeZero
+        returns a pointer to the device's default control pipe
+    */
+    virtual IOUSBPipe * GetPipeZero(void);
+
+	// Deprecated but needed for binary compatibility
+    virtual IOUSBPipe*	MakePipe(const IOUSBEndpointDescriptor *ep);
+    
+    // this method is deprecated. use the other DeviceRequest methods
+    virtual IOReturn DeviceRequest(IOUSBDevRequest	*request,
+                                IOUSBCompletion	*completion = 0);
+
+    // Same but with a memory descriptor
+    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc	*request,
+                                   IOUSBCompletion	*completion = 0);
+
+    /*!
+	@function GetConfiguration
+	Gets the current configuration from the IOUSBDevice object.  Note that this call will send a control
+        request on the bus to get the current configuration from the physical device.
+	@param configNum Pointer to place to store configuration value.
+    */
+    virtual IOReturn GetConfiguration(UInt8 *configNumber);
+
+    /*!
+        @function GetDeviceStatus
+        Gets the device's status.  Note that this sends a control request to the physical device.
+        @param status Pointer to place to store the status.
+    */
+    virtual IOReturn GetDeviceStatus(USBStatus *status);
+
+    /*! 
+	@function GetStringDescriptor
+	Get a string descriptor as ASCII, in the specified language (default is US English)
+	@param index Index of the string descriptor to get.
+	@param buf Pointer to place to store ASCII string
+	@param maxLen Size of buffer pointed to by buf
+        @param lang Language to get string in (default is US English)
+    */
+    virtual IOReturn GetStringDescriptor(UInt8 index, char *buf, int maxLen, UInt16 lang=0x409);
+    
+    /*! 
+	@function GetChildLocationID
+	Get the locationID (UInt32) given the port number and the parent's location
+	@param parentLocationID locationID for the hub to which this device is attached.
+	@param port Port number of the hub where this device is attached
+    */
+    virtual UInt32 GetChildLocationID(UInt32 parentLocationID, int port);
+
+    virtual const IOUSBDescriptorHeader* FindNextDescriptor(const void *cur, UInt8 descType);
+
+    virtual void 	DisplayNotEnoughPowerNotice();
+    
+    // this is a non-virtual function so that we don't have to take up a binary compatibility slot.
+    UInt16	GetbcdUSB(void);
+    UInt8	GetProtocol(void);
+	void	SetBusPowerAvailable(UInt32 newPower);
+
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  0);
+    /*!
+	@function DeviceRequest
+        @abstract execute a control request to the default control pipe (pipe zero)
+        @param request The parameter block to send to the device
+        @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
+        if no data has been transferred on the bus.
+        @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
+        not been completed.
+		@param completion Function to call when request completes. If omitted then
+	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
+	 the IOUSBDevRequest is not released until the callback has occurred.
+
+    */
+    virtual IOReturn DeviceRequest(IOUSBDevRequest	*request,
+				UInt32 noDataTimeout,
+				UInt32 completionTimeout,
+                                IOUSBCompletion	*completion = 0);
+
+    /*!
+	 @function DeviceRequest
+	 @abstract execute a control request to the default control pipe (pipe zero)
+	 @param request The parameter block to send to the device (with the pData as an IOMemoryDesriptor)
+	 @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
+	 if no data has been transferred on the bus.
+	 @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
+	 not been completed.
+	 @param completion Function to call when request completes. If omitted then
+	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
+	 the IOUSBDevRequest is not released until the callback has occurred.
+	 
+	 */
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  1);
+    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc	*request,
+				    UInt32 noDataTimeout,
+				    UInt32 completionTimeout,
+				    IOUSBCompletion	*completion = 0);
+
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  2);
+    /*!
+	@function SuspendDevice
+        @abstract Instruct the hub to which this device is attached to suspend or resume the port to which the device is attached.
+        Note that if there are any outstanding transactions on any pipes in the device, those transactions will get returned with a 
+        kIOReturnNotResponding error.
+        @param suspend Boolean value. true = suspend, false = resume.
+    */
+    virtual IOReturn SuspendDevice( bool suspend);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  3);
+    /*!
+	@function ReEnumerateDevice
+        @abstract Instruct the hub to which this device is attached to reset the port to which this device is attached. This causes the
+        IOUSBDevice object and any child objects (IOUSBInterface objects or driver objects) to be terminated, and the device to be
+        completely reenumerated, as if it had been detached and reattached.
+        @param options Reserved for future use.
+    */
+    virtual IOReturn ReEnumerateDevice( UInt32 options );
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  4);
+    /*!
+        @function DisplayUserNotification
+        @abstract  Will use the KUNCUserNotification mechanism to display a notification to the user.
+        @param notificationType Which notification to display.
+     */
+    virtual void	DisplayUserNotification(UInt32 notificationType);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  5);
+	/*!
+        @function MakePipe
+	 @abstract build a pipe on a given endpoint
+	 @param ep A description of the endpoint
+	 @param interface The IOUSBInterface object requesting the pipe
+	 returns the desired IOUSBPipe object
+	 */
+    virtual IOUSBPipe*	MakePipe(const IOUSBEndpointDescriptor *ep, IOUSBInterface *interface);
+    
+	
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  6);
+	/*!
+	 @function SetHubParent
+	 @abstract Used by the hub driver to give the nub a pointer to its HubPolicyMaker object
+	 @param hubPolicyMaker	The object representing the Hub driver
+	 */
+    virtual void	SetHubParent(IOUSBHubPolicyMaker *hubParent);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  7);
+	/*!
+	 @function GetHubParent
+	 @abstract Used by the hub driver to give the nub a pointer to its HubPolicyMaker object
+	 @param hubPolicyMaker	The object representing the Hub driver
+	 */
+    virtual IOUSBHubPolicyMaker*	GetHubParent();
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  8);
+    /*!
+	 @function 	GetDeviceInformation
+	 @abstract 	Returns status information about the USB device, such as whether the device is captive or whether it is in the suspended state.
+	 @param requestedPower 	The desired amount of power that the client wishes to reserve
+	 @result 		Actual power that was reserved
+	 
+		*/
+	virtual IOReturn	GetDeviceInformation(UInt32 *info);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  9);
+    /*!
+	 @function				RequestExtraPower
+	 @abstract				Clients can use this API to reserve extra power for use by this device while the machine is asleep or while it is awake.  Units are milliAmps (mA).
+	 @param type			Indicates whether the power is to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
+	 @param requestedPower 	Amount of power desired, in mA
+	 @result				Amount of power actually reserved, in mA.  It can be less than the requested or zero.
+	 
+	 */
+	virtual UInt32	RequestExtraPower(UInt32 type, UInt32 requestedPower);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  10);
+    /*!
+	 @function				ReturnExtraPower
+	 @abstract				Clients can use this API to tell the system that they will not use power that was previously reserved by using the RequestExtraPower API.
+	 @param type			Indicates whether the power is to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
+	 @param returnedPower 	Amount of power that is no longer needed, in mA
+	 @result				If the returnedPower was not previously allocated, an error will be returned.  This will include the case for power that was requested for sleep but was returned for wake.
+	 
+	 */
+	virtual IOReturn		ReturnExtraPower(UInt32 type, UInt32 returnedPower);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  11);
+    /*!
+	 @function				GetExtraPowerAllocated
+	 @abstract				Clients can use this API to ask how much extra power has already been reserved by this device.  Units are milliAmps (mA).
+	 @param type			Indicates whether the allocated power was to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
+	 @result				Amount of power allocated, in mA.
+	 
+	 */
+	virtual UInt32			GetExtraPowerAllocated(UInt32 type);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  12);
+    /*!
+	 @function				DoLocationOverrideAndModelMatch
+	 @abstract				Will look for a kOverrideIfAtLocationID array proerty with locationID entries and a "MacModel" property.  If any of the locationIDs match to the Mac Model, will return true.
+	 						If there is no kOverrideAtLocationID property, it will also return true.
+	 @result				True if we have a match, false otherwise
+	 */
+	virtual	bool			DoLocationOverrideAndModelMatch();
+	
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  13);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  14);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  15);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  16);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  17);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  18);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  19);
+    
+private:
+
+    static void 	ProcessPortResetEntry(OSObject *target);
+    void 		ProcessPortReset(void);
+
+    void 		TerminateInterfaces(void);
+
+    static void 	ProcessPortReEnumerateEntry(OSObject *target, thread_call_param_t options);
+    void 		ProcessPortReEnumerate(UInt32 options);
+	
+    static void 	DoMessageClientsEntry(OSObject *target, thread_call_param_t messageStruct);
+    void 		DoMessageClients( void * messageStructPtr);
+	
+    static void 	DisplayUserNotificationForDeviceEntry (OSObject *owner, IOTimerEventSource *sender);
+    void		DisplayUserNotificationForDevice( );
+    
+    UInt32              SimpleUnicodeToUTF8(UInt16 uChar, UInt8 utf8Bytes[4]);
+    void                SwapUniWords (UInt16  **unicodeString, UInt32 uniSize);
+
+    IOReturn			TakeGetConfigLock(void);
+    IOReturn			ReleaseGetConfigLock(void);
+    static IOReturn		ChangeGetConfigLock(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+};
+
+#endif /* _IOKIT_IOUSBDEVICE_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBHIDDriver.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBHIDDriver.h.svn-base
new file mode 100644
index 0000000..5e76887
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBHIDDriver.h.svn-base
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef IOUSBHIDDRIVER_H
+#define IOUSBHIDDRIVER_H
+
+#include <IOKit/IOBufferMemoryDescriptor.h>
+
+#include <IOKit/hid/IOHIDDevice.h>
+
+#include <IOKit/usb/IOUSBBus.h>
+#include <IOKit/usb/IOUSBInterface.h>
+#include <IOKit/usb/USB.h>
+
+
+#define ENABLE_HIDREPORT_LOGGING	0
+
+// Report types from low level USB:
+//	from USBSpec.h:
+//    enum {
+//        kHIDRtInputReport		= 1,
+//        kHIDRtOutputReport		= 2,
+//        kHIDRtFeatureReport		= 3
+//    };
+//    
+//	from IOHIDDescriptorParser.h:
+//    // types of HID reports (input, output, feature)
+//    enum
+//    {
+//        kHIDInputReport			= 	1,
+//        kHIDOutputReport,
+//        kHIDFeatureReport,
+//        kHIDUnknownReport		=	255
+//    };
+//    
+// Report types from high level HID Manager:
+//	from IOHIDKeys.h:
+//    enum IOHIDReportType
+//    {
+//        kIOHIDReportTypeInput = 0,
+//        kIOHIDReportTypeOutput,
+//        kIOHIDReportTypeFeature,
+//        kIOHIDReportTypeCount
+//    };
+//
+#define HIDMGR2USBREPORTTYPE(x) (x + 1)
+#define USB2HIDMGRREPORTTYPE(x) (x - 1)
+
+
+// Note: In other Neptune files, kMaxHIDReportSize was defined as 64. But Ferg & Keithen were unable to
+// find that value in the USB HID 1.1 specs. Brent had previously changed it to 256 in the OS 9 HID Driver
+// to  allow for reports spanning multiple packets. 256 may be no more a hard and fast limit, but it's 
+// working for now in OS 9.
+#define kMaxHIDReportSize 256			// Max packet size = 8 for low speed & 64 for high speed.
+#define kHIDDriverRetryCount	3
+#define	kUSBHIDReportLoggingLevel	"USB HID Report Logging Level"
+
+
+// power states for the driver (awake or suspended)
+enum
+{
+	kUSBHIDPowerStateOff		= 0,
+	kUSBHIDPowerStateRestart	= 1,
+	kUSBHIDPowerStateSleep		= 2,			// this could be system sleep or idle sleep
+	kUSBHIDPowerStateLowPower	= 3,			// this is idling
+	kUSBHIDPowerStateOn			= 4,			// this is fully on
+	kUSBHIDNumberPowerStates	= 5
+};
+
+
+/*!
+ @class IOUSBHIDDriver
+ @abstract Driver that matches to USB HID devices.
+ @discussion This class can be overriden to provide for specific behaviors.
+ */
+class IOUSBHIDDriver : public IOHIDDevice
+{
+    OSDeclareDefaultStructors(IOUSBHIDDriver)
+
+    IOUSBInterface *			_interface;
+    IOUSBDevice	*				_device;
+    IOUSBPipe *					_interruptPipe;
+    UInt32						_maxReportSize;
+    IOBufferMemoryDescriptor *	_buffer;
+    IOUSBCompletion				_completion;
+    UInt32						_retryCount;
+    thread_call_t				_deviceDeadCheckThread;
+    thread_call_t				_clearFeatureEndpointHaltThread;
+    bool						_deviceDeadThreadActive;
+    bool						_deviceIsDead;                          // Should really be called "abort expected"
+    bool						_deviceHasBeenDisconnected;
+    bool						_needToClose;
+    UInt32						_outstandingIO;
+    IOCommandGate *				_gate;
+    IOUSBPipe *					_interruptOutPipe;
+    UInt32						_locationID; 	
+    IOBufferMemoryDescriptor *	_outBuffer;								// Obsolete
+    UInt32						_deviceUsage;							// Obsolete
+    UInt32						_deviceUsagePage;						// Obsolete
+
+    struct IOUSBHIDDriverExpansionData 
+    {
+        IOWorkLoop	*					_workLoop;
+        thread_call_t					_handleReportThread;
+        IOService *						_rootDomain;
+        AbsoluteTime					_wakeUpTime;
+        IOUSBCompletionWithTimeStamp	_completionWithTimeStamp;
+        bool							_checkForTimeStamp;
+        UInt32							_msToIgnoreTransactionsAfterWake;
+        IOTimerEventSource	*			_suspendPortTimer;
+		bool							_portSuspended;
+		UInt32							_suspendTimeoutInMS;
+		UInt8							_interfaceNumber;
+		bool							_logHIDReports;
+		UInt8							_hidLoggingLevel;
+		bool							_needToClearPipeStall;
+		SInt32							_queuedReports;
+		AbsoluteTime					_interruptTimeStamp;
+		bool							_powerStateChanging;
+		unsigned long					_myPowerState;
+		bool							_pendingRead;
+		UInt32							_deviceDeadCheckLock;			// "Lock" to prevent us from executing the device dead check while in progress		
+    };
+    IOUSBHIDDriverExpansionData *_usbHIDExpansionData;
+    
+    static void 		InterruptReadHandlerEntry(OSObject *target, void *param, IOReturn status, UInt32 bufferSizeRemaining);
+    static void 		InterruptReadHandlerWithTimeStampEntry(OSObject *target, void *param, IOReturn status, UInt32 bufferSizeRemaining, AbsoluteTime timeStamp);
+    void				InterruptReadHandler(IOReturn status, UInt32 bufferSizeRemaining, AbsoluteTime timeStamp);
+
+    static void 		CheckForDeadDeviceEntry(OSObject *target);
+    void				CheckForDeadDevice();
+
+    static void			ClearFeatureEndpointHaltEntry(OSObject *target);
+    void				ClearFeatureEndpointHalt(void);
+    
+    static void			HandleReportEntry(OSObject *target, thread_call_param_t timeStamp);
+    void				HandleReport(AbsoluteTime timeStamp);
+    
+    virtual void 		processPacket(void *data, UInt32 size);		// Obsolete
+
+    static IOReturn		ChangeOutstandingIO(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+    static IOReturn		ClaimPendingRead(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+
+    static void			SuspendPortTimer(OSObject *target, IOTimerEventSource *sender);
+
+public:
+        
+    // IOService methods
+    //
+    virtual bool			init(OSDictionary *properties);
+    virtual bool			start(IOService * provider);
+    virtual bool			didTerminate( IOService * provider, IOOptionBits options, bool * defer );
+    virtual bool			willTerminate( IOService * provider, IOOptionBits options );
+    virtual void			stop(IOService *  provider);
+    virtual void			free();
+    virtual IOReturn		message( UInt32 type, IOService * provider,  void * argument = 0 );
+	virtual unsigned long	maxCapabilityForDomainState ( IOPMPowerFlags domainState );
+	virtual IOReturn		powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+	virtual IOReturn		setPowerState ( unsigned long powerStateOrdinal, IOService* whatDevice );
+	virtual IOReturn		powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+ 	virtual void			powerChangeDone ( unsigned long fromState);
+  
+
+    // IOHIDDevice methods
+    //
+    virtual bool		handleStart(IOService * provider);
+    virtual void		handleStop(IOService *  provider);
+
+    virtual IOReturn 	newReportDescriptor( IOMemoryDescriptor ** descriptor ) const;
+                        
+    virtual OSString * 	newTransportString() const;
+
+    virtual OSNumber * 	newVendorIDNumber() const;
+
+    virtual OSNumber * 	newProductIDNumber() const;
+
+    virtual OSNumber * 	newVersionNumber() const;
+
+    virtual OSString * 	newManufacturerString() const;
+
+    virtual OSString * 	newProductString() const;
+
+    virtual OSString * 	newSerialNumberString() const;
+
+    virtual OSNumber * 	newLocationIDNumber() const;
+
+    virtual OSNumber * 	newCountryCodeNumber() const;
+
+    virtual IOReturn	getReport( IOMemoryDescriptor * report,
+                                IOHIDReportType      reportType,
+                                IOOptionBits         options = 0 );
+                                
+    virtual IOReturn 	setReport( IOMemoryDescriptor * report,
+                                IOHIDReportType      reportType,
+                                IOOptionBits         options = 0 );
+
+    // HID driver methods
+    //
+    virtual OSString * 	newIndexedString(UInt8 index) const;
+
+    virtual UInt32		getMaxReportSize();
+	
+    virtual void		DecrementOutstandingIO(void);
+    virtual void		IncrementOutstandingIO(void);
+    virtual IOReturn	StartFinalProcessing();
+    virtual IOReturn	SetIdleMillisecs(UInt16 msecs);
+    
+private:
+
+	IOReturn			GetHIDDescriptor(UInt8 inDescriptorType, UInt8 inDescriptorIndex, UInt8 *vOutBuf, UInt32 *vOutSize);
+	IOReturn			GetReport(UInt8 inReportType, UInt8 inReportID, UInt8 *vInBuf, UInt32 *vInSize);
+	IOReturn			SetReport(UInt8 outReportType, UInt8 outReportID, UInt8 *vOutBuf, UInt32 vOutSize);
+	IOReturn			GetIndexedString(UInt8 index, UInt8 *vOutBuf, UInt32 *vOutSize, UInt16 lang = 0x409) const;
+	IOReturn			SetProtocol(UInt32 protocolType);
+	char				GetHexChar(char hexChar);
+	IOReturn			AbortAndSuspend( bool suspend );
+	
+        
+
+#if ENABLE_HIDREPORT_LOGGING
+    void LogBufferReport(char *report, UInt32 len);
+    void LogMemReport(IOMemoryDescriptor * reportBuffer);
+    char GetHexChar(char hexChar);
+#endif
+
+public:
+    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  0);
+    virtual IOReturn    RearmInterruptRead();
+    
+    /*!
+		@function SuspendPort
+	 @abstract Suspends the port for this device or optionally sets a timeout to suspend after a period of inactivity.
+	 @discussion  This call can be used to immediately suspend/resume a port or to enable the suspension of the port after a period of inactivity.  If called with suspendPort = true (no timeout parameter), the HID driver
+	 will immediately suspend the port, after aborting any outstanding reads on the interrupt pipe.  If called with suspendPort = true and timeout != 0, it will suspend the port after the timeout number of ms have
+	 passed without any read completions.  If called with suspendPort = false, the port will be immediately resumed and the reads will be re-issued.  If a timeout was enabled, it will be cancelled.
+	 @param suspendPort Boolean value. true = suspend the port, false = resume the port.
+	 @param timeoutMS	Value in milliseconds If value is non-zero, the port will be suspended after the timeout milliseconds have passed without any read completions.
+	 @result The IOReturn value from the IOUSBDevice::Suspend() call. 
+	*/
+    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  1);
+	virtual IOReturn	SuspendPort(bool suspendPort, UInt32 timeoutMS = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  2);
+	virtual bool		IsPortSuspended();
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  3);
+    virtual void		LogMemReport(UInt8 level, IOMemoryDescriptor * reportBuffer, IOByteCount size);
+
+    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  4);
+	virtual IOReturn	InitializeUSBHIDPowerManagement(IOService *provider);
+	
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  5);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  6);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  7);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  8);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  9);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 10);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 11);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 12);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 13);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 14);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 15);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 16);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 17);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 18);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 19);
+};
+
+#endif	// IOUSBHIDDRIVER_H
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBHubDevice.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBHubDevice.h.svn-base
new file mode 100644
index 0000000..91c728c
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBHubDevice.h.svn-base
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __OPEN_SOURCE__
+/*
+ *
+ *	$Log: IOUSBHubDevice.h,v $
+ *	Revision 1.11  2009/09/12 03:42:16  rhoads
+ *	merge in the changes for the 390.3.4b QL
+ *
+ *	Revision 1.10.52.1  2009/09/10 18:50:52  nano
+ *	<rdar://problem/7134800> Task: Extra Current support for Ibex Peak RMHs -- look for a property that tells us to ask our USB plane parent for the extra current.  This will allow the RMH to pass on the request to it's parent.
+ *	
+ *	Revision 1.10  2009/05/07 19:43:09  nano
+ *	Move our SnowLeopard branch to TOT
+ *	
+ *	Revision 1.6.102.3  2008/06/16 22:02:16  nano
+ *	Bring in changes from Foxound 320.2.19
+ *	
+
+ *	Revision 1.6.102.2  2008/04/22 22:38:01  nano
+ *	Bring in changes from Foxhound-320.2.9
+ *	
+ *	Revision 1.8.62.2  2008/06/06 21:08:44  nano
+ *	Enable dynamic allocation of power for M89, so we don't reserve it if there isn't a high power device attached
+ *	
+ *	Revision 1.8.62.1  2008/06/06 04:14:32  nano
+ *	Fix SleepCurrent allocation so it will work with hub devices and root hub devices as well as consolidating it across all controllers
+ *	
+ *	Revision 1.8  2008/04/17 16:56:57  nano
+ *	Bring in branches for rdar://5867990 & rdar://5768343
+ *	
+ *	Revision 1.7.4.1  2008/04/17 15:54:07  nano
+ *	Merged PR-5768343 into this branch and fixed a couple of issues
+ *	
+ *	Revision 1.7.2.1  2008/04/16 00:48:49  ferg
+ *	Bug #: 5768343
+ *	Add support for hubs with high-power downstream port capability.  This is
+ *	controlled by the properties "AAPL,current-available" and "AAPL,current-extra".
+ *	
+ *	Revision 1.7  2008/04/14 16:08:38  nano
+ *	Add new APIs for high power and for GetDeviceInformation.
+ *	
+ *	Revision 1.6.144.1  2008/04/11 22:25:44  nano
+ *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
+ *	
+ *	Revision 1.6  2007/08/01 16:10:18  rhoads
+ *	roll in extra power changes
+ *	
+ *	Revision 1.5.118.1  2007/07/27 16:49:10  rhoads
+ *	merge the extra current stuff into Leopard, and add extra sleep current for self powered hubs
+ *	
+ *	Revision 1.5  2007/01/20 00:47:01  rhoads
+ *	roll in Hub Policy Maker changes
+ *	
+ *	Revision 1.4  2006/12/22 23:05:46  rhoads
+ *	roll in branches 4364835 and 4277683-2
+ *	
+ *	Revision 1.3.20.3  2007/01/15 19:58:07  rhoads
+ *	saving more changes
+ *	
+ *	Revision 1.3.20.2  2007/01/09 21:55:53  rhoads
+ *	commit some stuff to try to fix a permissions issue
+ *	
+ *	Revision 1.3.20.1  2006/12/18 19:13:56  rhoads
+ *	re-integrate the old branch into TOT
+ *	
+ *	Revision 1.3.12.4  2006/12/18 17:33:48  rhoads
+ *	looking good except for sleep/wake
+ *	
+ *	Revision 1.3.12.3  2006/12/08 05:42:40  rhoads
+ *	mostly working
+ *	
+ *	Revision 1.3.12.2  2006/11/14 22:37:06  rhoads
+ *	more changes with the root hubs
+ *	
+ *	Revision 1.3.12.1  2006/11/07 16:55:52  rhoads
+ *	change to get the IOUSBHubDevice nubs into the IOPower tree
+ *	
+ *	Revision 1.3  2006/10/06 04:42:02  rhoads
+ *	roll in branches 4727961, 4758404, 4759810, 4760274, and 4762769
+ *	
+ *	Revision 1.2.4.2  2006/10/04 23:01:24  rhoads
+ *	better naming
+ *	
+ *	Revision 1.2.4.1  2006/10/04 16:03:57  rhoads
+ *	better IOUSBHubDevice design
+ *	
+ */
+#endif
+
+
+#ifndef _IOKIT_IOUSBHUBDEVICE_H
+#define _IOKIT_IOUSBHUBDEVICE_H
+
+#include <IOKit/usb/IOUSBDevice.h>						// our superclass
+
+// forward refeference. we don't include the header file because it would cause a circular reference
+class IOUSBHubPolicyMaker;
+
+enum {
+	kIOUSBHubDeviceIsRootHub			=	0x0001,
+	kIOUSBHubDeviceIsOnHighSpeedBus		=	0x0002,
+	kIOUSBHubDeviceCanSleep				=	0x0004
+};
+
+/*!
+    @class IOUSBHubDevice
+    @abstract New in MAC OS X 10.5. The IOKit object representing a hub device on the USB bus. It is a subclass of IOUSBDevice.
+    @discussion With the exception of the IOUSBRootHubDevice objects representing the root hubs, every IOUSBDevice
+	will have an IOUSBHubDevice as its parent in the IOUSB plane. USB KEXT drivers will have the ability to 
+	query this device for characteristics of the hub into which they are connected. This class will also give a dive driver
+	the abilty to get an IOService* pointing to the hub driver itself, which can then be used as the parent in the power plane.
+*/
+
+class IOUSBHubDevice : public IOUSBDevice
+{
+	friend class IOUSBHubPolicyMaker;
+	friend class AppleUSBHub;
+	friend class IOUSBController;								// for the "can sleep" characteristic
+	
+private:
+    OSDeclareDefaultStructors(IOUSBHubDevice)
+
+	UInt32					_myCharacteristics;					// bitmap of my characteristics
+	IOUSBHubPolicyMaker		*_myPolicyMaker;					// pointer to the policy maker in the IOPower tree for this hub
+
+    struct ExpansionData 
+	{ 
+		UInt32					_maxPortCurrent;				// maximum current in milliamps per downstream port
+		UInt32					_totalExtraCurrent;				// total amount of current above the spec'ed current per port available (during normal operation)
+		UInt32					_totalSleepCurrent;				// total amount of current that can be drawn during sleep
+		UInt32					_canRequestExtraPower;			// If 0, this hub does not support requesting extra power from its parent, non-zero:  how much power we need to request in order to give out _extraPowerForPorts
+		UInt32					_extraPowerForPorts;			// Of the power requested from our parent, how much can we parcel out -- the rest is consumed by voltage drop thru the cable
+		UInt32					_extraPowerAllocated;			// Amount of power that we actually got from our parent
+		bool					_requestFromParent;				// True if we are to request the extra power from our parent, without modifying the request.  Used for RMHs
+	};
+    ExpansionData			*_expansionData;
+	
+protected:
+	// IOUSBHubDevice methods which will be used by the hub driver (which is also the Policy Maker)
+	virtual	void			SetPolicyMaker(IOUSBHubPolicyMaker *policyMaker);
+	virtual void			SetHubCharacteristics(UInt32);
+	virtual bool			InitializeCharacteristics(void);					// used at start
+	
+public:
+	// static constructor
+    static IOUSBHubDevice	*NewHubDevice(void);
+
+	// IOKit methods
+    virtual bool			init();
+	virtual bool			start( IOService * provider );
+    virtual void			stop( IOService *provider );
+    virtual void			free();
+	
+	// public IOUSBHubDevice methods
+
+	void					SetTotalSleepCurrent(UInt32 sleepCurrent);
+	UInt32					GetTotalSleepCurrent();
+	
+    /*!
+	 @function GetPolicyMaker
+	 returns a pointer to the policy maker for the hub, which can be used as the power plane parent.
+	 @result returns an IOUSBHubPolicyMaker* pointing to the policy maker for this hub. returns NULL is no policy maker is active on the hub device.
+	 */
+	virtual IOUSBHubPolicyMaker *GetPolicyMaker(void);
+	
+    /*!
+	@function GetHubCharacteristics
+	returns characteristics of the hub device which might be useful for the driver of a device connected to the hub.
+		kIOUSBHubDeviceIsRootHub indicates that the hub is a root hub
+		kIOUSBHubDeviceIsOnHighSpeedBus indicates that the hub is running on a High Speed bus. If this bit is set and kIOUSBHubDeviceIsHighSpeed is clear, then this is a Classic Speed hub running on a High Speed bus, which means that Split Transactions will be used to communicate with downstream devices.
+
+	@result returns a bitmap of characteristics
+    */
+	virtual	UInt32			GetHubCharacteristics();
+	
+    /*!
+	@function GetMaxProvidedPower
+	returns the maximum amount of power available on any downstream port of this hub
+	@result the power is returned in milliamps - usually 100ma or 500 ma.
+    */
+	virtual UInt32			GetMaxProvidedPower();
+
+    /*!
+	@function RequestProvidedPower
+	requests power from the hub device
+	@param requestedPower - the amount of power requested in milliamps (usually 100ma or 500 ma)
+	@result the amount of power allocated for this driver in milliamps (usually 100ma or 500 ma)
+    */
+	virtual UInt32			RequestProvidedPower(UInt32 requestedPower);
+
+	virtual UInt32			RequestExtraPower(UInt32 requestedPower);
+
+	virtual void			ReturnExtraPower(UInt32 returnedPower);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  0);
+	
+	virtual void			InitializeExtraPower(UInt32 maxPortCurrent, UInt32 totalExtraCurrent);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  1);
+	virtual UInt32			RequestSleepPower(UInt32 requestedPower);
+
+    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  2);
+	virtual void			ReturnSleepPower(UInt32 returnedPower);
+
+    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  3);
+	virtual void			SetSleepCurrent(UInt32 sleepCurrent);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  4);
+	virtual	UInt32			GetSleepCurrent();
+	
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  5);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  6);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  7);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  8);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  9);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  10);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  11);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  12);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  13);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  14);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  15);
+};
+
+#endif /* _IOKIT_IOUSBROOTHUBDEVICE_H */
+
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBHubPolicyMaker.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBHubPolicyMaker.h.svn-base
new file mode 100644
index 0000000..a0021d3
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBHubPolicyMaker.h.svn-base
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __OPEN_SOURCE__
+/*
+ *
+ *	$Log: IOUSBHubPolicyMaker.h,v $
+ *	Revision 1.10  2009/05/07 19:43:09  nano
+ *	Move our SnowLeopard branch to TOT
+ *
+ *	Revision 1.7.72.3  2008/07/23 17:43:32  nano
+ *	<rdar://problem/5939357> IOUSBHIDDriver, IOHIDEventService missing HeaderDoc class declarations
+ *	
+ *	Revision 1.7.72.2  2008/04/22 22:38:01  nano
+ *	Bring in changes from Foxhound-320.2.9
+ *	
+ *	Revision 1.9  2008/04/17 16:56:57  nano
+ *	Bring in branches for rdar://5867990 & rdar://5768343
+ *	
+ *	Revision 1.8.4.1  2008/04/16 20:26:15  nano
+ *	<rdar://problem/5867990> Add API to allocate sleep current, as well as making sure that we return any extra power if our client dies or our device is terminated without returning it
+ *	
+ *	Revision 1.8  2008/04/14 16:08:38  nano
+ *	Add new APIs for high power and for GetDeviceInformation.
+ *	
+ *	Revision 1.7.114.1  2008/04/11 22:25:44  nano
+ *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
+ *	
+ *	Revision 1.7  2007/08/17 22:41:11  nano
+ *	Bring in branch that fixes <rdar://problem/5414582> USB not honoring Resume recovery time (hub driver) and adds extra time for iPods
+ *	
+ *	Revision 1.6.30.1  2007/08/16 19:14:02  nano
+ *	ResumeRecovery additions.
+ *	
+ *	Revision 1.6  2007/08/01 16:10:18  rhoads
+ *	roll in extra power changes
+ *	
+ *	Revision 1.5.12.1  2007/07/27 16:49:10  rhoads
+ *	merge the extra current stuff into Leopard, and add extra sleep current for self powered hubs
+ *	
+ *	Revision 1.5  2007/07/20 22:31:22  rhoads
+ *	roll in branch300-3-2
+ *	
+ *	Revision 1.4.40.1  2007/07/18 18:44:24  rhoads
+ *	this is the 300.3.2g version plus some quieter logs
+ *	
+ *	Revision 1.4.34.2  2007/07/17 06:30:35  rhoads
+ *	more hub chain fixes
+ *	
+ *	Revision 1.4.34.1  2007/07/16 16:45:00  rhoads
+ *	more power management and termination tweaks
+ *	
+ *	Revision 1.4  2007/05/18 01:59:12  rhoads
+ *	roll in 5112084 and 5204170
+ *	
+ *	Revision 1.3.2.1  2007/05/15 18:23:48  rhoads
+ *	some initial power state bug fixes
+ *	
+ *	Revision 1.3  2007/05/10 22:25:35  rhoads
+ *	roll in branch 5113395 - the last major piece of the new power architecture
+ *	
+ *	Revision 1.2.64.4  2007/04/13 22:34:59  rhoads
+ *	fix restart and shutdown
+ *	
+ *	Revision 1.2.64.3  2007/04/11 23:56:23  rhoads
+ *	first mostly working dozing hub
+ *	
+ *	Revision 1.2.64.2  2007/04/10 02:09:09  rhoads
+ *	got UHCI almost working
+ *	
+ *	Revision 1.2.64.1  2007/04/05 02:57:50  rhoads
+ *	move power management out of AppleUSBHub and into IOUSBHubPolicyMaker
+ *	
+ *	Revision 1.2  2007/01/20 00:47:01  rhoads
+ *	roll in Hub Policy Maker changes
+ *	
+ *	Revision 1.1.2.4  2007/01/18 22:51:08  rhoads
+ *	add some padding
+ *	
+ *	Revision 1.1.2.3  2007/01/15 19:58:07  rhoads
+ *	saving more changes
+ *	
+ *	Revision 1.1.2.2  2007/01/09 23:55:36  rhoads
+ *	working version
+ *	
+ *	Revision 1.1.2.1  2007/01/09 21:57:02  rhoads
+ *	commit some stuff to try to fix a permissions issue
+ *	
+ *	
+ */
+#endif
+#ifndef _IOKIT_IOUSBHUBPOLICYMAKER_H
+#define _IOKIT_IOUSBHUBPOLICYMAKER_H
+
+#include	<IOKit/IOService.h>
+#include	<IOKit/usb/IOUSBController.h>
+#include	<IOKit/usb/IOUSBHubDevice.h>
+
+
+enum {
+	kIOUSBHubPowerStateOff		= 0,				// losing power
+	kIOUSBHubPowerStateRestart	= 1,				// reseting bus, but may maintain power
+	kIOUSBHubPowerStateSleep	= 2,				// upstream port and all downstream ports suspended (from the top)
+	kIOUSBHubPowerStateLowPower	= 3,				// upstream port and all downstream ports suspended (from the bottom)
+	kIOUSBHubPowerStateOn		= 4,				// upstream port and at least one downstream port on
+	kIOUSBHubNumberPowerStates	= 5
+};
+
+enum {
+	kHubResumeRecoveryTime	=	10,								// 10 ms to recover after I resume myself
+	kPortResumeRecoveryTime =	10								// 10 ms to recover another device
+};
+
+#define kIOUSBHubPowerStateStable	-1
+
+/*!
+ @class IOUSBHubPolicyMaker
+ @abstract Super class for Hub drivers to incorporate common Power Management code.
+ */
+class IOUSBHubPolicyMaker : public IOService
+{
+	OSDeclareAbstractStructors(IOUSBHubPolicyMaker)
+
+protected:
+    IOUSBControllerV2 *					_bus;
+    IOUSBHubDevice *					_device;					// our provider
+    IOUSBHubDevice *					_parentHubDevice;			// for non root hub drivers, this is the hub device that my hub device is connected to
+    bool								_isRootHub;					// this is a root hub
+	bool								_dozeEnabled;				// true if the controller has been enabled to go into doze mode
+	bool								_dontAllowLowPower;			// If true, we will not allow the hub to go into low power mode.
+	bool								_dontAllowSleepPower;		// If true, we will not allow extra sleep power for a self powered hub.
+	SInt32								_powerStateChangingTo;		// a power state if we are changing to one, or -1 if we are stable
+	unsigned long						_myPowerState;				// my current state (since getPowerState doesn't always change in time)
+	UInt32								_extraPower;				// how much extra power we might be able to get from our parent hub
+	UInt32								_extraPowerRemaining;		// how many milliamps we can still give to any one port
+	UInt32								_hubResumeRecoveryTime;		// # of ms that we will wait before issuing any transactions on our port (nominally 10ms)
+    struct ExpansionData 
+	{ 
+	};
+    ExpansionData			*_expansionData;
+
+public:
+	// IOService methods
+    virtual bool						start(IOService * provider);
+	virtual IOReturn					powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+	virtual unsigned long				powerStateForDomainState ( IOPMPowerFlags domainState );
+	virtual IOReturn					setPowerState ( unsigned long powerStateOrdinal, IOService* whatDevice );
+	virtual IOReturn					powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+	virtual unsigned long				maxCapabilityForDomainState ( IOPMPowerFlags domainState );
+	virtual void						powerChangeDone ( unsigned long fromState );
+
+	// public methods which MAY be implemented in subclass
+	virtual IOReturn					EnsureUsability(void);
+		
+	// Extra Port Power calls
+	void								AllocateExtraPower();
+	IOReturn							GetExtraPortPower(UInt32 portNum, UInt32 *extraPower);
+	IOReturn							ReturnExtraPortPower(UInt32 portNum, UInt32 extraPower);
+    
+	// virtual methods to be implemented in the controlling driver subclass
+	virtual bool						ConfigureHubDriver(void) = 0;
+	virtual IOReturn					HubPowerChange(unsigned long powerStateOrdinal) = 0;
+
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  0);
+	virtual	IOReturn					GetPortInformation(UInt32 portNum, UInt32 *info);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  1);
+	virtual	IOReturn					ResetPort(UInt32 portNum);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  2);
+	virtual	IOReturn					SuspendPort(UInt32 portNum, bool suspend);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  3);
+	virtual	IOReturn					ReEnumeratePort(UInt32 portNum, UInt32 options);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  4);
+	virtual UInt32						RequestExtraPower(UInt32 portNum, UInt32 type, UInt32 requestedPower);
+
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  5);
+	virtual IOReturn					ReturnExtraPower(UInt32 portNum, UInt32 type, UInt32 returnedPower);
+
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  6);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  7);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  8);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  9);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  10);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  11);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  12);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  13);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  14);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  15);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  16);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  17);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  18);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  19);
+};
+
+#endif _IOKIT_IOUSBHUBPOLICYMAKER_H
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBInterface.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBInterface.h.svn-base
new file mode 100644
index 0000000..4777e50
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBInterface.h.svn-base
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBINTERFACE_H
+#define _IOKIT_IOUSBINTERFACE_H
+
+#include <IOKit/IOService.h>
+#include <libkern/c++/OSData.h>
+
+#include <IOKit/usb/USB.h>
+#include <IOKit/usb/IOUSBNub.h>
+#include <IOKit/usb/IOUSBDevice.h>
+
+/*!
+    @class IOUSBInterface
+    @abstract The object representing an interface of a device on the USB bus.
+    @discussion This class provides functionality to find the pipes of an interface and
+	to read the descriptors associated with an interface. When an interface is open()ed,
+	all its pipes are created
+*/
+class IOUSBInterface : public IOUSBNub
+{
+    friend class IOUSBInterfaceUserClientV2;
+    
+    OSDeclareDefaultStructors(IOUSBInterface)
+
+protected:
+    IOUSBPipe * 			_pipeList[kUSBMaxPipes];
+    const IOUSBConfigurationDescriptor *_configDesc;
+    const IOUSBInterfaceDescriptor *	_interfaceDesc;
+    IOUSBDevice *			_device;
+
+    // these variable are the parsed interface descriptor
+    UInt8				_bInterfaceNumber;
+    UInt8				_bAlternateSetting;
+    UInt8				_bNumEndpoints;
+    UInt8				_bInterfaceClass;
+    UInt8				_bInterfaceSubClass;
+    UInt8				_bInterfaceProtocol;
+    UInt8				_iInterface;
+
+    struct ExpansionData {
+        IOCommandGate		*_gate;
+        IOWorkLoop			*_workLoop;
+		bool				_needToClose;
+		IOLock *			_pipeObjLock;											// Lock to synchronize accesses to our pipeObjects
+    };
+    ExpansionData * _expansionData;
+
+    // private methods
+    virtual void		ClosePipes(void);				// close all pipes (except pipe zero)
+    virtual IOReturn	CreatePipes(void);				// open all pipes in the current interface/alt interface
+    virtual void		SetProperties(void);			// update my property table with the correct properties		
+	
+public:
+	// static methods
+    static IOUSBInterface *withDescriptors(const IOUSBConfigurationDescriptor *cfDesc, const IOUSBInterfaceDescriptor *ifDesc);
+    static IOReturn	CallSuperOpen(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+    static IOReturn     CallSuperClose(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+	static UInt8 hex2char( UInt8 digit );
+    
+	// IOService methods
+    virtual bool		start(IOService * provider);
+    virtual bool		handleOpen(IOService *forClient, IOOptionBits options = 0, void *arg = 0 );
+    virtual bool		open(IOService *forClient, IOOptionBits options = 0, void *arg = 0 );
+    virtual void		close(IOService *forClient, IOOptionBits options = 0);
+    virtual void		handleClose(IOService *forClient, IOOptionBits options = 0);
+    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
+    virtual bool		finalize(IOOptionBits options);
+    virtual void		stop(IOService *  provider);
+    virtual bool		terminate( IOOptionBits options = 0 );
+    virtual void		free();	
+
+	// IOUSBInterface class methods
+	virtual bool		init(	const IOUSBConfigurationDescriptor *cfDesc,
+							 const IOUSBInterfaceDescriptor *ifDesc);
+   /*!
+        @function FindNextAltInterface
+        return alternate interface descriptor satisfying the requirements specified in request, or NULL if there aren't any.
+        request is updated with the properties of the returned interface.
+        @param current interface descriptor to start searching from, NULL to start at alternate interface 0.
+        @param request specifies what properties an interface must have to match.
+        @result Pointer to a matching interface descriptor, or NULL if none match.
+    */
+    virtual const IOUSBInterfaceDescriptor *FindNextAltInterface(const IOUSBInterfaceDescriptor *current,
+                                                                 IOUSBFindInterfaceRequest *request);
+
+    /*!
+	@function FindNextPipe
+	Find a pipe of the interface that matches the requirements, either
+	starting from the beginning of the interface's pipe list or from a specified
+	pipe.
+	@param current Pipe to start searching from, NULL to start from beginning of list.
+	@param request Requirements for pipe to match, updated with the found pipe's
+	properties.
+	@result Pointer to the pipe, or NULL if no pipe matches the request.
+    */
+    virtual IOUSBPipe *FindNextPipe(IOUSBPipe *current, IOUSBFindEndpointRequest *request);
+
+    /*!
+        @function FindNextAssociatedDescriptor
+        Find the next descriptor of the requested type associated with the interface.
+	@param current Descriptor to start searching from, NULL to start from beginning of list.
+	@param type Descriptor type to search for, or kUSBAnyDesc to return any descriptor type.
+	@result Pointer to the descriptor, or NULL if no matching descriptors found.
+    */
+    virtual const IOUSBDescriptorHeader * FindNextAssociatedDescriptor(const void *current, UInt8 type);
+
+    /*!
+        @function SetAlternateInterface
+        Select the specified alternate interface.
+        @param forClient The client requesting the alternate setting. This client must have the interface open in order to perform the request.
+	@param alternateSetting Alternate setting (from the alternate interface's interface descriptor).
+        @result exclusive access error if the interface is not open. otherwise the result of the transaction
+    */
+    virtual IOReturn SetAlternateInterface(IOService *forClient, UInt16 alternateSetting);
+
+     /*!
+        @function GetPipeObj
+	returns a handle to the pipe at the corresponding index
+        @param index value from zero to kUSBMaxPipes-1
+	@result The IOUSBPipe object. Note that the client does not own a reference to this pipe, so the client should retain() the IOUSBPipe object if necessary.
+    */
+    virtual IOUSBPipe *GetPipeObj(UInt8 index);
+    /*!
+        @function GetConfigValue
+	returns the device configuration value for the interface
+	@result The device configuration value.
+    */
+    virtual UInt8 GetConfigValue();
+    /*!
+        @function GetDevice
+        returns the device the interface is part of.
+	@result Pointer to the IOUSBDevice object which is the parent of this IOUSBInterface object.
+    */
+    virtual IOUSBDevice *GetDevice();
+    /*!
+        @function GetInterfaceNumber
+        returns the zero based value identifying the index in the array of concurrent
+        interfaces supported by the current configuration
+        @result the interface index
+    */
+    virtual UInt8 GetInterfaceNumber();
+    /*!
+        @function GetAlternateSetting
+        returns the alternate setting for this interface.
+        @result the alternate setting
+    */
+    virtual UInt8 GetAlternateSetting();
+    /*!
+        @function GetNumEndpoints
+        returns the number of endpoints used by this interface (excluding
+        device endpoint zero. If the value is zero, this interface only
+        uses endpoint zero.
+        @result the number of endpoints
+    */
+    virtual UInt8 GetNumEndpoints();
+    /*!
+        @function GetInterfaceClass
+        returns the class code for this interface (assigned by the USB)
+        a value of zero is reserved
+        if the value is FFh, the interface class is vendor-specific
+        all other values are reserved for assignment by the USB
+        @result the interface class
+    */
+    virtual UInt8 GetInterfaceClass();
+    /*!
+        @function GetInterfaceSubClass
+        returns the subclass code (assigned by the USB).
+        These codes are qualified by the value returned by GetInterfaceClass
+        @result the interface subclass
+    */
+    virtual UInt8 GetInterfaceSubClass();
+    /*!
+        @function GetInterfaceProtocol
+        returns the protocol code (assigned by the USB).
+        @result the interface index
+    */
+    virtual UInt8 GetInterfaceProtocol();
+    /*!
+        @function GetInterfaceStringIndex
+        returns the index of the string descriptor describing the interface
+        @result the string index
+    */
+    virtual UInt8 GetInterfaceStringIndex();
+    
+    /*!
+	@function DeviceRequest
+        @abstract Sends a control request to the default control pipe in the device (pipe zero)
+        @param request The parameter block to send to the device
+		@param completion Function to call when request completes. If omitted then
+        DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
+		the IOUSBDevRequest is not released until the callback has occurred.
+    */
+    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, IOUSBCompletion *completion = 0); 
+
+    /*!
+	 @function DeviceRequest
+	 @abstract Sends a control request to the default control pipe in the device (pipe zero)
+	 @param request The parameter block to send to the device (with the pData as an IOMemoryDesriptor)
+	 @param completion Function to call when request completes. If omitted then
+	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
+	 the IOUSBDevRequest is not released until the callback has occurred.
+	 */
+    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc *request, IOUSBCompletion *completion = 0);
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 *score);
+
+    OSMetaClassDeclareReservedUsed(IOUSBInterface,  0);
+    /*!
+	@function GetEndpointProperties
+        @abstract Returns the properties of an endpoint, possibly in an alternate interface.
+        @param alternateSetting specifies the desired alternate setting
+        @param endpointNumber specifies the endpoint number
+        @param direction specifies the direction (kUSBIn, kUSBOut)
+        @param transferType a pointer to hold the transfer type (kUSBControl, kUSBBulk, etc.) of the endpoint if found.
+        @param maxPacketSize a pointer to hold the maxPacketSize in the endpoint descriptor.
+        @param interval a pointer to hold the interval value in the endpoint descriptor.
+	@result returns kIOReturnSuccess if the endpoint is found, and kIOUSBEndpointNotFound if it is not.
+    */
+    virtual IOReturn GetEndpointProperties(UInt8 alternateSetting, UInt8 endpointNumber, UInt8 direction, UInt8 *transferType, UInt16 *maxPacketSize, UInt8 *interval);
+    
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  1);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  2);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  3);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  4);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  5);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  6);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  7);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  8);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  9);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  10);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  11);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  12);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  13);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  14);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  15);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  16);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  17);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  18);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  19);
+};
+
+#endif /* _IOKIT_IOUSBINTERFACE_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBLog.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBLog.h.svn-base
new file mode 100644
index 0000000..7f8f2a3
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBLog.h.svn-base
@@ -0,0 +1,240 @@
+/*
+ * Copyright © 1998-20010 Apple Inc.  All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBLOG_H
+#define _IOKIT_IOUSBLOG_H
+
+#include 	<IOKit/IOService.h>
+#include	<IOKit/IOLib.h>
+
+
+#ifdef	__cplusplus
+	extern "C" {
+#endif
+
+// USB Specific defines
+#define USBLog( LEVEL, ARGS...)		KernelDebugLogTag( LEVEL, 'USBF', ## ARGS )
+#define USBError( LEVEL, ARGS...)	KernelDebugLogInternal( ( LEVEL ), 'USBF', ## ARGS )
+#define USBStringFromReturn( IORETURN)	(IOUSBController::_log)->stringFromReturn( IORETURN )
+
+
+// Possible Debug levels. If DEBUG_LEVEL is set to DEBUG_LEVEL_PRODUCTION, all debug logs will be 
+// stripped of the final code. 
+
+#define	DEBUG_LEVEL_PRODUCTION		0
+#define	DEBUG_LEVEL_DEVELOPMENT		1
+#define	DEBUG_LEVEL_ALPHA			2
+#define	DEBUG_LEVEL_BETA			3
+#define	DEBUG_LEVEL_FINAL			DEBUG_LEVEL_PRODUCTION
+
+// Allow clients to define their own debug level.
+
+#if ( !defined( DEBUG_LEVEL ) )
+	#define	DEBUG_LEVEL			DEBUG_LEVEL_PRODUCTION
+#endif
+
+// Index for user client methods
+//
+enum
+{
+    kUSBControllerUserClientOpen = 0,
+    kUSBControllerUserClientClose,
+    kUSBControllerUserClientEnableLogger,
+    kUSBControllerUserClientSetDebuggingLevel,
+    kUSBControllerUserClientSetDebuggingType,
+    kUSBControllerUserClientGetDebuggingLevel,
+    kUSBControllerUserClientGetDebuggingType,
+#ifndef __OPEN_SOURCE__
+    kUSBControllerUserClientSetTestMode,
+    kUSBControllerUserClientReadRegister,
+    kUSBControllerUserClientWriteRegister,
+    kUSBControllerUserClientMessageController,
+#endif
+    kNumUSBControllerMethods
+};
+
+#ifndef __OPEN_SOURCE__
+// Enums for the private kIOUSBMessageController message
+enum
+{
+	kIOUSBMessageControllerDoGPIOReset = 0x00000001
+};
+#endif
+
+// Info Debug Output Types.
+
+typedef UInt32		KernelDebuggingOutputType;
+enum
+{
+	kKernelDebugOutputIOLogType		= 0x00000001, 
+	kKernelDebugOutputKextLoggerType	= 0x00000002
+};
+
+
+// Info Debug levels.
+
+typedef UInt32		KernelDebugLevel;
+enum
+{
+	kKernelDebugInfoLevel 		= 1000, 
+	kKernelDebugRareInfoLevel	= 2000, 
+	kKernelDebugAllowedErrorLevel	= 3000, 
+	kKernelDebugAssertLevel 	= 4000, 
+	kKernelDebugRequireLevel	= 5000, 
+	kKernelDebugErrorLevel		= 6000, 
+	kKernelDebugCriticalErrorLevel	= 7000, 
+	kKernelDebugTragicErrorLevel	= 8000, 
+	kKernelDebugAnyLevel		= 0
+};
+
+// Function prototypes.
+
+void			KernelDebugSetLevel( KernelDebugLevel inLevel );
+KernelDebugLevel	KernelDebugGetLevel();
+void			KernelDebugSetOutputType( KernelDebuggingOutputType inType );
+KernelDebuggingOutputType	KernelDebugGetOutputType();
+IOReturn 		KernelDebugFindKernelLogger();
+void			KernelDebugEnable( bool enable );
+
+//	Yes, you can call this directly. But, why? If you use the macros declared below, such as
+//	KernelIOLog, you get the benefit of having your logs compiled out when you set the
+//	DEBUG_LEVEL to production mode and recompile. Dude. Sweet. What's mine say?
+
+void			KernelDebugLogInternal( KernelDebugLevel inLevel, UInt32 inTag, char const *inFormatString, ... )  __attribute__ ((format(printf,3,4)));;
+void 			KernelDebugLogDataInternal( UInt32 inLevel,  UInt32 inTag, void *buffer, UInt32 byteCount, bool preBuffer);
+
+// Handy macros.
+
+#define REQUIRE_NO_ERR_PRINTF( VALUE, LABEL, ARGS... )							\
+	if ( VALUE != kIOReturnSuccess )									\
+	{												\
+		KernelDebugLogInternal( kDebugInfoLevel, 'BluD', ## ARGS );				\
+		goto LABEL;										\
+	}
+
+#define REQUIRE_PRINTF( TEST, LABEL, ARGS... )								\
+	do												\
+	{												\
+		if ( !( TEST ) )										\
+		{											\
+			KernelDebugLogInternal( kDebugInfoLevel, 'BluD',  ## ARGS );			\
+			goto LABEL;									\
+		}											\
+	} while( false )
+
+// Some macros to call the debugging outputs. We'll strip out the debug logs if we are production code.
+
+#if DEBUG_LEVEL != DEBUG_LEVEL_PRODUCTION
+#define	KernelDebugLog( LEVEL, ARGS... )			KernelDebugLogInternal( ( LEVEL ), 'KDbg', ## ARGS ) __attribute__ ((format(printf,1,2)));
+	#define	KernelDebugLogTag( LEVEL, TAG, ARGS... )		KernelDebugLogInternal( ( LEVEL ), ( TAG ),  ## ARGS )
+	#define KernelDebugLogData( LEVEL, TAG, BUFFER, SIZE, HOLD)	KernelDebugLogDataInternal( ( LEVEL ), ( TAG ), ( BUFFER ), ( SIZE ), ( HOLD ))
+#else
+	#define	KernelDebugLog( LEVEL, ARGS... )
+	#define	KernelDebugLogTag( LEVEL, TAG, ARGS... )
+	#define KernelDebugLogData( LEVEL, TAG, BUFFER, SIZE, HOLD)
+#endif
+
+
+#ifdef	__cplusplus
+	}
+        
+//================================================================================================
+//   Forward declarations
+//================================================================================================
+class com_apple_iokit_KLogClient;
+
+//================================================================================================
+//   Defines
+//================================================================================================
+#define kLogKextName 	"com_apple_iokit_KLog"
+#define MAXUSERS 	5
+
+//================================================================================================
+//   Custom Types
+//================================================================================================
+
+typedef UInt32 KLogLevel;
+typedef UInt32 KLogTag;
+
+//================================================================================================
+//   com_apple_iokit_KLog
+//================================================================================================
+
+class com_apple_iokit_KLog : public IOService
+{
+
+    OSDeclareDefaultStructors(com_apple_iokit_KLog)
+
+    com_apple_iokit_KLogClient *	mClientPtr[MAXUSERS+1];
+
+    unsigned char *			mMsgBuffer;
+    UInt8 				mClientCount;
+    UInt8 				mMsgSize;
+    bool 				mErrFlag;
+    struct timeval *			mTimeVal;
+    IOLock *				mLogLock;
+    
+public:
+
+    static com_apple_iokit_KLog	*	logger;
+    
+    virtual bool 			init(OSDictionary *dictionary = 0);
+    virtual void 			free(void);
+   
+    virtual IOService *			probe(IOService *provider, SInt32 *score);
+    virtual bool 			start(IOService *provider);
+    virtual void 			stop(IOService *provider);
+    virtual IOReturn 			newUserClient( task_t owningTask, void * securityID,
+                                                UInt32 type, IOUserClient ** handler );
+
+    virtual SInt8			Log( KLogLevel level, KLogTag tag, const char *format, ... );
+    virtual SInt8			vLog( KLogLevel level, KLogTag tag, const char *format, va_list in_va_list );
+	
+    void 				closeChild(com_apple_iokit_KLogClient *ptr);
+    void 				setErr(bool set);
+    
+};
+
+#define kMaxStatusBufSize	(8*1024)
+
+
+class IOUSBLog : public IOService
+{
+    OSDeclareAbstractStructors(IOUSBLog)
+
+private:
+public:
+    virtual bool	init( OSDictionary * dictionary = 0 );
+  	virtual const char *			stringFromReturn( IOReturn rtn );
+	static IOUSBLog	*usblog();
+    virtual void 	AddStatusLevel (UInt32 level, UInt32 ref, char *status, UInt32 value);
+    virtual void	AddStatus(char *message);
+    virtual void	AddStatus(UInt32 level, char *message);
+    virtual void 	USBLogPrintf(UInt32 level, char *format,...);
+	virtual char *	strstr(const char *in, const char *str);
+};
+
+
+#endif
+#endif /* ! _IOKIT_IOUSBLOG_H */
+
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageClass.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageClass.h.svn-base
new file mode 100644
index 0000000..02c8557
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageClass.h.svn-base
@@ -0,0 +1,507 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+
+#ifndef _IOKIT_IOUSBMASSSTORAGECLASS_H
+#define _IOKIT_IOUSBMASSSTORAGECLASS_H
+
+// Headers for general IOKit definitions
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOMessage.h>
+
+// Headers for USB specific definitions
+#include <IOKit/usb/IOUSBInterface.h>
+#include <IOKit/usb/IOUSBPipe.h>
+#include <IOKit/usb/USBSpec.h>
+#include <IOKit/usb/USB.h>
+
+// Headers for SCSI Protocol support definitions
+#include <IOKit/scsi/IOSCSIProtocolServices.h>
+
+// BSD includes
+#include <sys/sysctl.h>
+
+#define UNUSED(x) ((void)x)
+
+
+#pragma mark -
+#pragma mark Vendor Specific Device Support
+#define kIOUSBMassStorageCharacteristics		"USB Mass Storage Characteristics"
+#define kIOUSBMassStoragePreferredSubclass		"Preferred Subclass"
+#define kIOUSBMassStoragePreferredProtocol		"Preferred Protocol"
+#define kIOUSBMassStorageResetOnResume			"Reset On Resume"
+#define kIOUSBMassStorageUseStandardUSBReset	"Use Standard USB Reset"
+#define kIOUSBKnownCSWTagIssues					"Known CSW Tag Issues"
+#define kIOUSBMassStorageMaxLogicalUnitNumber	"Max Logical Unit Number"
+#define kIOPropertyIOUnitKey					"IOUnit"
+#define kIOUSBMassStorageDoNotMatch				"Do Not Match MSC"
+#define kIOUSBMassStorageDoNotOperate			"Do Not Operate"
+#define kIOUSBMassStorageEnableSuspendResumePM	"Enable Port Suspend-Resume PM"
+
+enum 
+{
+	kUSBDAddressLength = 10
+};
+
+#pragma mark -
+#pragma mark CBI Protocol Strutures
+// Structure for the global PB's
+struct CBIRequestBlock
+{
+	SCSITaskIdentifier			request;
+	IOUSBDevRequest				cbiDevRequest;
+	SCSICommandDescriptorBlock	cbiCDB;
+	IOUSBCompletion				cbiCompletion;
+	UInt32						currentState;
+	IOMemoryDescriptor *		cbiPhaseDesc;
+	UInt8						cbiGetStatusBuffer[2];	// 2 bytes as specified in the USB spec
+};
+
+typedef struct CBIRequestBlock	CBIRequestBlock;
+
+#pragma mark -
+#pragma mark Bulk Only Protocol Structures
+
+struct StorageBulkOnlyCBW
+{
+	UInt32		cbwSignature;
+	UInt32		cbwTag;
+	UInt32		cbwTransferLength;
+	UInt8		cbwFlags;
+	UInt8		cbwLUN;					// Bits 0-3: LUN, 4-7: Reserved
+	UInt8		cbwCDBLength;			// Bits 0-4: CDB Length, 5-7: Reserved
+	UInt8		cbwCDB[16];
+};
+
+typedef struct StorageBulkOnlyCBW	StorageBulkOnlyCBW;
+
+struct	StorageBulkOnlyCSW
+{
+	UInt32		cswSignature;
+	UInt32		cswTag;
+	UInt32		cswDataResidue;
+	UInt8		cswStatus;
+};
+
+typedef struct StorageBulkOnlyCSW	StorageBulkOnlyCSW;
+
+struct	BulkOnlyRequestBlock
+{
+	SCSITaskIdentifier		request;
+	IOUSBCompletion			boCompletion;
+	UInt32					currentState;
+	StorageBulkOnlyCBW		boCBW;
+	StorageBulkOnlyCSW		boCSW;
+	IOMemoryDescriptor *	boPhaseDesc;
+	UInt8					boGetStatusBuffer[2];	// 2 bytes as specified in the USB spec
+};
+
+typedef struct BulkOnlyRequestBlock		BulkOnlyRequestBlock;
+
+
+#pragma mark -
+#pragma mark IOUSBMassStorageClass definition
+
+class IOUSBMassStorageClass : public IOSCSIProtocolServices
+{
+    OSDeclareDefaultStructors(IOUSBMassStorageClass)
+
+private:
+	// ---- Member variables used by all protocols ----
+	// The interface object that provides the driver with access to the 
+	// USB so that it may talk to its device.
+    IOUSBInterface *			fInterface;
+
+	// The pipe objects that the driver uses to transport data through a
+	// pipe to the appropriate endpoint.
+    IOUSBPipe *					fBulkInPipe;
+    IOUSBPipe *					fBulkOutPipe;
+    IOUSBPipe *					fInterruptPipe;
+	IOUSBDevRequest				fUSBDeviceRequest;
+	UInt8						fPreferredSubclass;
+	UInt8						fPreferredProtocol;
+	
+  	// The maximum Logical Unit Number.  This is the highest valid LUN
+  	// that the USB device supports, so if the device only supports one
+  	// LUN, such as CBI and CB, this number will be zero.
+  	UInt8						fMaxLogicalUnitNumber;
+
+	// ---- Member variables used by CBI protocol ----
+	bool						fCBICommandStructInUse; 
+
+	CBIRequestBlock				fCBICommandRequestBlock;
+	
+	// ---- Member variables used by Bulk Only protocol ----
+ 	// Command tag, this driver just uses a sequential counter that is
+ 	// incremented for each CBW that is sent to the device.
+ 	UInt32 						fBulkOnlyCommandTag;
+
+	bool						fBulkOnlyCommandStructInUse; 
+    
+    // Dedicated CBW and CSW IOMemoryDescriptors are listed in the ExpansionData struct.
+		
+ 	// The Request block that contains all the necessary data for 
+ 	// transporting a Bulk Only request across the USB.
+ 	BulkOnlyRequestBlock		fBulkOnlyCommandRequestBlock;
+
+protected:
+    // Reserve space for future expansion.
+    struct ExpansionData
+	{
+		bool					fResetInProgress;
+		OSSet *					fClients;
+		IOUSBPipe *				fPotentiallyStalledPipe;
+		bool					fUseUSBResetNotBOReset;
+		bool					fAbortCurrentSCSITaskInProgress;
+		IOMemoryDescriptor *	fCBIMemoryDescriptor;
+		IOMemoryDescriptor *	fBulkOnlyCBWMemoryDescriptor;
+		IOMemoryDescriptor *	fBulkOnlyCSWMemoryDescriptor;
+        bool                    fDeviceAttached;
+		bool                    fWaitingForReconfigurationMessage;
+		bool					fTerminating;
+        bool                    fKnownCSWTagMismatchIssues;
+        bool                    fPortSuspendResumeForPMEnabled;
+        bool                    fPortIsSuspended;
+		bool					fRequiresResetOnResume;
+		bool					fAutonomousSpinDownWorkAround;
+		UInt8					fConsecutiveResetCount;
+		bool					fClearStallInProgress;				/* OBSOLETE */
+		bool					fTerminationDeferred;
+	};
+    ExpansionData *				reserved;
+	
+	#define fResetInProgress					reserved->fResetInProgress
+	#define fClients							reserved->fClients
+	#define fPotentiallyStalledPipe				reserved->fPotentiallyStalledPipe
+    #define fUseUSBResetNotBOReset				reserved->fUseUSBResetNotBOReset
+	#define fAbortCurrentSCSITaskInProgress		reserved->fAbortCurrentSCSITaskInProgress
+	#define fCBIMemoryDescriptor                reserved->fCBIMemoryDescriptor
+	#define	fBulkOnlyCBWMemoryDescriptor		reserved->fBulkOnlyCBWMemoryDescriptor
+	#define	fBulkOnlyCSWMemoryDescriptor		reserved->fBulkOnlyCSWMemoryDescriptor
+    #define fDeviceAttached                     reserved->fDeviceAttached
+	#define fWaitingForReconfigurationMessage	reserved->fWaitingForReconfigurationMessage
+	#define fTerminating						reserved->fTerminating
+    #define fKnownCSWTagMismatchIssues          reserved->fKnownCSWTagMismatchIssues
+    #define fPortSuspendResumeForPMEnabled      reserved->fPortSuspendResumeForPMEnabled
+    #define fPortIsSuspended                    reserved->fPortIsSuspended
+	#define fRequiresResetOnResume				reserved->fRequiresResetOnResume
+	#define fAutonomousSpinDownWorkAround		reserved->fAutonomousSpinDownWorkAround
+	#define fConsecutiveResetCount				reserved->fConsecutiveResetCount
+	#define fClearStallInProgress				reserved->fClearStallInProgress
+	#define fTerminationDeferred				reserved->fTerminationDeferred
+	
+	// Enumerated constants used to control various aspects of this
+	// driver.
+	
+	// Enumerations for Mass Storage Class Subclass types
+	enum
+	{
+		kUSBStorageRBCSubclass 				= 1,
+		kUSBStorageSFF8020iSubclass 		= 2,
+		kUSBStorageQIC157Subclass			= 3,
+		kUSBStorageUFISubclass				= 4,
+		kUSBStorageSFF8070iSubclass			= 5,
+		kUSBStorageSCSITransparentSubclass	= 6
+	};
+
+	// The supported USB Mass Storage Class transport protocols.
+	enum
+	{
+		kProtocolControlBulkInterrupt	= 0x00,
+		kProtocolControlBulk			= 0x01,
+		kProtocolBulkOnly				= 0x50
+	};
+
+	// ------- Protocol support functions ------------
+	// The SendSCSICommand function will take a SCSITask Object and transport
+	// it across the physical wire(s) to the device
+	virtual bool    		SendSCSICommand( 	
+								SCSITaskIdentifier 		request, 
+								SCSIServiceResponse *	serviceResponse,
+								SCSITaskStatus		*	taskStatus );
+
+	// The AbortSCSICommand function will abort the indicated SCSITask object,
+	// if it is possible and the SCSITask has not already completed.
+    virtual SCSIServiceResponse    	AbortSCSICommand( SCSITaskIdentifier abortTask );
+
+	virtual bool					IsProtocolServiceSupported( 
+										SCSIProtocolFeature 	feature, 
+										void * 					serviceValue );
+
+	virtual bool					HandleProtocolServiceFeature( 
+										SCSIProtocolFeature 	feature, 
+										void * 					serviceValue );
+ 
+	// Methods for retrieving and setting the object for the Interface
+	IOUSBInterface *		GetInterfaceReference( void );
+	void					SetInterfaceReference( IOUSBInterface * newInterface );
+	
+	UInt8					GetInterfaceSubclass( void );
+	UInt8					GetInterfaceProtocol( void );
+	
+	// Methods for retrieving an object for a Pipe.
+	IOUSBPipe *				GetControlPipe( void );
+	IOUSBPipe *				GetBulkInPipe( void );
+	IOUSBPipe *				GetBulkOutPipe( void );
+	IOUSBPipe *				GetInterruptPipe( void );
+	
+	// Methods for getting and setting the maximum LUN of a device.
+	UInt8					GetMaxLogicalUnitNumber( void ) const;
+	void					SetMaxLogicalUnitNumber( UInt8 maxLUN );
+	
+	virtual void 			CompleteSCSICommand( 
+								SCSITaskIdentifier request, 
+								IOReturn status );
+
+	virtual	bool			BeginProvidedServices( void );
+	virtual	bool			EndProvidedServices( void );
+	
+	// The Protocol specific helper methods for SendSCSICommand	
+	virtual IOReturn		SendSCSICommandForCBIProtocol(
+                  				SCSITaskIdentifier request );
+	
+	virtual IOReturn		SendSCSICommandForBulkOnlyProtocol(
+								SCSITaskIdentifier request );
+
+	// The Protocol specific helper methods for AbortSCSICommand	
+	virtual IOReturn		AbortSCSICommandForCBIProtocol(
+								SCSITaskIdentifier abortTask );
+	
+	virtual IOReturn		AbortSCSICommandForBulkOnlyProtocol(
+								SCSITaskIdentifier abortTask );
+
+	// Helper methods for performing general USB device requests
+	virtual IOReturn		ClearFeatureEndpointStall( 
+								IOUSBPipe *			thePipe,
+								IOUSBCompletion	*	completion );
+	virtual IOReturn 		GetStatusEndpointStatus(
+								IOUSBPipe *			thePipe,
+								void *				endpointStatus,
+								IOUSBCompletion	*	completion );
+	
+ 	/* All CBI transport related methods.
+ 	 */
+	// All definitions and structures for the CBI Protocol
+	enum
+	{
+ 		kUSBStorageAutoStatusSize	= 2		// Per the USB CBI Protocol
+ 	};
+
+ 	// Methods for accessing Bulk Only specific member variables.
+	CBIRequestBlock *		GetCBIRequestBlock( void );
+
+	void 					ReleaseCBIRequestBlock( 
+								CBIRequestBlock *	cbiRequestBlock );
+
+	// Methods used for CBI/CB command transportation.
+	static void		CBIProtocolUSBCompletionAction(
+						void *					target,
+		                void *					parameter,
+		                IOReturn				status,
+		                UInt32					bufferSizeRemaining);
+
+	IOReturn		CBIProtocolTransferData( 
+						CBIRequestBlock *		cbiRequestBlock,
+						UInt32					nextExecutionState );
+		                
+	IOReturn		CBIProtocolReadInterrupt( 
+						CBIRequestBlock *		cbiRequestBlock,
+						UInt32					nextExecutionState );
+
+	IOReturn		CBIGetStatusEndpointStatus( 
+						IOUSBPipe *				targetPipe,
+						CBIRequestBlock *		cbiRequestBlock,
+						UInt32					nextExecutionState );
+
+	IOReturn		CBIClearFeatureEndpointStall( 
+						IOUSBPipe *				targetPipe,
+						CBIRequestBlock *		cbiRequestBlock,
+						UInt32					nextExecutionState );
+						
+	void 			CBIProtocolCommandCompletion(
+						CBIRequestBlock *		cbiRequestBlock,
+		                IOReturn				resultingStatus,
+		                UInt32					bufferSizeRemaining );
+		                
+ 	/* All Bulk Only transport related methods, structures and enums.
+ 	 */
+ 	// All Bulk Only specific structures and enums.
+	
+	// All definitions and structures for the Bulk Only Protocol
+	// Command Block Wrapper (CBW)
+	enum
+	{
+		// CBW general struture definitions
+		kCommandBlockWrapperSignature	= OSSwapHostToBigConstInt32 ( 'USBC' ),
+		kByteCountOfCBW					= 31,
+
+		// CBW LUN related definitions
+		kCBWLUNMask						= 0x0F,
+
+		kCBWFlagsDataOut				= 0x00,
+		kCBWFlagsDataIn					= 0x80
+	};
+	
+	// All definitions and structures for the Bulk Only Protocol
+	// Command Status Wrapper (CSW)
+	enum
+	{
+		// CSW general struture definitions
+		kCommandStatusWrapperSignature	= OSSwapHostToBigConstInt32 ( 'USBS' ),
+		kByteCountOfCSW					= 13,
+
+		// CSW status definitions
+		kCSWCommandPassedError 			= 0x00,	// No error occurred
+		kCSWCommandFailedError			= 0x01,	/* An error occurred (probably a 
+											 	 * bad command or parameter ) */
+		kCSWPhaseError					= 0x02	/* A transfer was performed in 
+											 	 * the wrong sequence */
+	};
+
+ 	// Methods for accessing Bulk Only specific member variables.
+	BulkOnlyRequestBlock *	GetBulkOnlyRequestBlock( void );
+
+	void 			ReleaseBulkOnlyRequestBlock( 
+						BulkOnlyRequestBlock * 		boRequestBlock );
+
+	UInt32			GetNextBulkOnlyCommandTag( void );
+
+	// Methods for Bulk Only specific utility commands
+	IOReturn		BulkDeviceResetDevice(
+						BulkOnlyRequestBlock *		boRequestBlock,
+						UInt32						nextExecutionState );
+						
+	// Methods used for Bulk Only command transportation.
+	IOReturn		BulkOnlySendCBWPacket(
+						BulkOnlyRequestBlock *		boRequestBlock,
+						UInt32						nextExecutionState );
+	
+	IOReturn		BulkOnlyTransferData( 
+						BulkOnlyRequestBlock *		boRequestBlock,
+						UInt32						nextExecutionState );
+	
+	IOReturn		BulkOnlyReceiveCSWPacket(
+						BulkOnlyRequestBlock *		boRequestBlock,
+						UInt32						nextExecutionState );
+	
+	void			BulkOnlyExecuteCommandCompletion (
+						BulkOnlyRequestBlock *		boRequestBlock,
+		                IOReturn					resultingStatus,
+		                UInt32						bufferSizeRemaining );
+
+	static void		BulkOnlyUSBCompletionAction (
+		                void *			target,
+		                void *			parameter,
+		                IOReturn		status,
+		                UInt32			bufferSizeRemaining );
+	
+public:
+
+    bool				init( OSDictionary * 	propTable );
+    virtual bool		start( IOService *	 	provider );
+    virtual void 		stop( IOService * 		provider );
+	virtual void		free( void );
+	virtual	IOReturn	message( UInt32 type, IOService * provider, void * argument = 0 );
+	
+	virtual bool        willTerminate(  IOService *     provider, 
+                                        IOOptionBits    options );
+										
+	virtual bool        didTerminate(	IOService *     provider, 
+                                        IOOptionBits    options, 
+										bool *			defer );
+                                        
+	virtual bool		handleOpen( IOService *		client,
+									IOOptionBits	options,
+									void *			arg );
+	
+	virtual void		handleClose( IOService *	client,
+									 IOOptionBits	options );
+	
+	virtual bool		handleIsOpen(  const IOService * client ) const;
+	
+	virtual IOReturn	HandlePowerOn( void );
+	
+protected:
+
+	static IOReturn		sWaitForReset( void * refcon );
+	IOReturn			GatedWaitForReset( void );
+	
+	static IOReturn		sWaitForTaskAbort( void * refcon );			/* OBSOLETE */
+	IOReturn			GatedWaitForTaskAbort( void );				/* OBSOLETE */
+	
+	static void			sResetDevice( void * refcon );
+	
+	static void			sAbortCurrentSCSITask( void * refcon );		/* OBSOLETE */
+	
+    OSMetaClassDeclareReservedUsed( IOUSBMassStorageClass, 1 );
+	virtual IOReturn	StartDeviceRecovery( void );				/* OBSOLETE */
+
+    OSMetaClassDeclareReservedUsed( IOUSBMassStorageClass, 2 );
+	virtual void		FinishDeviceRecovery( IOReturn	status );	/* OBSOLETE */
+
+	static void			DeviceRecoveryCompletionAction(
+		                	void *			target,
+		                	void *			parameter,
+		                	IOReturn		status,
+		                	UInt32			bufferSizeRemaining );	/* OBSOLETE */
+
+    void                ResetDeviceNow( bool waitForReset );
+	
+	void                AbortCurrentSCSITask( void );
+	
+	bool                IsPhysicalInterconnectLocationInternal ( void );
+	    
+	IOReturn            SuspendPort ( bool suspend );
+	
+private:
+	
+	void				ClearPipeStall ( void );
+	
+	IOReturn			AcceptSCSITask ( SCSITaskIdentifier scsiTask, bool * pAccepted );
+	
+	void				CheckDeferredTermination ( void );
+	
+	void				GatedCompleteSCSICommand ( SCSITaskIdentifier request, SCSIServiceResponse * serviceResponse, SCSITaskStatus * taskStatus );
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 3 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 4 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 5 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 6 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 7 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 8 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 9 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 10 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 11 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 12 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 13 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 14 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 15 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 16 );
+	
+};
+
+
+#endif _IOKIT_IOUSBMASSSTORAGECLASS_H
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageUFISubclass.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageUFISubclass.h.svn-base
new file mode 100644
index 0000000..cbfe3c8
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageUFISubclass.h.svn-base
@@ -0,0 +1,355 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
+#define _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
+
+// This class' header file
+#include <IOKit/usb/IOUSBMassStorageClass.h>
+#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
+
+
+#pragma mark -
+#pragma mark IOUSBMassStorageUFIDevice declaration
+
+class IOUSBMassStorageUFIDevice : public IOSCSIPrimaryCommandsDevice
+{
+    OSDeclareDefaultStructors(IOUSBMassStorageUFIDevice)
+
+private:
+	static void			AsyncReadWriteComplete( SCSITaskIdentifier	completedTask );
+	
+protected:
+    // Reserve space for future expansion.
+    struct IOUSBMassStorageUFIDeviceExpansionData
+	{
+	};
+    IOUSBMassStorageUFIDeviceExpansionData *fIOUSBMassStorageUFIDeviceReserved;
+
+	// ---- Medium Characteristics ----
+	bool				fMediumPresent;
+
+	// The byte count of each physical block on the medium.
+	UInt32				fMediumBlockSize;
+
+	// The total number of blocks of fMediumBlockSize on the medium.
+	UInt32				fMediumBlockCount;
+
+	// Whether the installed medium is protected from writes
+	bool				fMediumIsWriteProtected;
+
+	// Polling thread variables
+	thread_call_t		fPollingThread;
+	UInt32				fPollingMode;
+	enum
+	{
+		kPollingMode_Suspended		= 0,
+		kPollingMode_NewMedia 		= 1,
+		kPollingMode_MediaRemoval	= 2
+	};
+	
+	// ---- Methods for controlling the current state of device support ----
+	virtual bool		InitializeDeviceSupport( void );
+	virtual void 		StartDeviceSupport ( void );
+	virtual void		SuspendDeviceSupport( void );
+	virtual void		ResumeDeviceSupport( void );
+	virtual void 		StopDeviceSupport ( void );
+	virtual void		TerminateDeviceSupport( void );
+
+	// ---- Methods used for misc  ----
+	virtual bool		ClearNotReadyStatus( void );
+	virtual void 		CreateStorageServiceNub( void );
+	virtual bool		DetermineDeviceCharacteristics( void );
+
+	// ---- Methods used for controlling the polling thread ----
+	virtual void		ProcessPoll( void );
+	virtual void		EnablePolling( void );
+	virtual void		DisablePolling( void );
+
+	// ---- Main and support methods for polling for new Media ----
+	virtual void		PollForNewMedia( void );
+	virtual bool		DetermineMediaPresence( void );
+	virtual bool		DetermineMediumCapacity( 
+							UInt64 * 				blockSize, 
+							UInt64 * 				blockCount );
+	virtual bool		DetermineMediumWriteProtectState( void );
+
+	// ---- Main and support methods for polling for Media removal ----
+	virtual void		PollForMediaRemoval( void );
+	
+	// ---- Methods used for power managment ----
+	virtual UInt32		GetInitialPowerState ( void );
+	virtual void 		InitializePowerManagement ( IOService * provider );
+	virtual void		HandlePowerChange ( void );
+	virtual void		HandleCheckPowerState ( void );
+	virtual void		TicklePowerManager ( void );
+	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
+
+	// ---- Methods used for handling medium characteristics ----
+    virtual void		SetMediumCharacteristics( 
+    						UInt32 					blockSize, 
+    						UInt32 					blockCount );
+	
+	virtual void		ResetMediumCharacteristics( void );
+
+	virtual IOReturn	IssueRead( 	
+							IOMemoryDescriptor *	buffer,
+                         	UInt64					startBlock,
+                     		UInt64					blockCount );
+	
+	virtual IOReturn	IssueRead(	
+							IOMemoryDescriptor *	buffer,
+                      		UInt64					startBlock,
+                     		UInt64					blockCount,
+                       		void * 					clientData );
+
+
+	virtual IOReturn	IssueWrite( 
+							IOMemoryDescriptor *	buffer,
+                    		UInt64					startBlock,
+                       		UInt64					blockCount );
+
+	virtual IOReturn	IssueWrite(	
+							IOMemoryDescriptor *	buffer,
+                         	UInt64					startBlock,
+                      		UInt64					blockCount,
+							void * 					clientData );
+
+public:
+											
+	static 	void		sProcessPoll( void * pdtDriver, void * refCon );
+
+	// Interface to the UFI Storage Services Driver
+	// ---- Methods for controlling the device ----
+	virtual IOReturn	SyncReadWrite(
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+							UInt64					blockCount,
+							UInt64					blockSize );
+
+	virtual IOReturn	AsyncReadWrite(
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+							UInt64					blockCount,
+							UInt64					blockSize,
+							void * 					clientData );
+
+	// ---- Methods for controlling medium state ----
+	virtual IOReturn	EjectTheMedium( void );
+
+	// ---- Methods for controlling media format ----
+	virtual IOReturn	FormatMedium( 
+							UInt64 					blockCount, 
+							UInt64 					blockSize );
+	virtual UInt32		GetFormatCapacities( 	
+							UInt64 * 				capacities,
+             				UInt32   				capacitiesMaxCount ) const;
+
+	// ---- Query methods to report device characteristics ----
+	// Report the maximum number of blocks that the device can handle per
+	// read or write.  A value of 0 (zero) indicates there is no limit aside
+	// from the size of the method's return parameter.
+	virtual UInt64		ReportDeviceMaxBlocksReadTransfer( void );
+	virtual UInt64		ReportDeviceMaxBlocksWriteTransfer( void );
+	
+	// ---- Query methods to report installed medium characteristics ----
+	virtual UInt64		ReportMediumBlockSize( void );
+	virtual UInt64		ReportMediumTotalBlockCount( void );
+	virtual bool		ReportMediumWriteProtection( void );
+        
+	// Methods for getting device information strings
+	virtual char *		GetVendorString( void );
+	virtual char *		GetProductString( void );
+	virtual char *		GetRevisionString( void );
+	OSDictionary *		GetProtocolCharacteristicsDictionary ( void );
+	OSDictionary *		GetDeviceCharacteristicsDictionary ( void );	
+	
+protected:
+	// Utility methods used by all SCSI Command Set objects
+	
+	// isParameterValid methods are used to validate that the parameter passed into
+	// the command methods are of the correct value.
+	
+	// Validate Parameter used for 1 bit to 1 byte paramaters
+    bool		 	IsParameterValid( 
+							SCSICmdField1Byte 			param,
+							SCSICmdField1Byte 			mask );
+	
+	// Validate Parameter used for 9 bit to 2 byte paramaters
+	bool		 	IsParameterValid( 
+							SCSICmdField2Byte 			param,
+							SCSICmdField2Byte 			mask );
+	
+	// Validate Parameter used for 17 bit to 4 byte paramaters
+	bool		 	IsParameterValid( 
+							SCSICmdField4Byte 			param,
+							SCSICmdField4Byte 			mask );
+	
+	// UFI Required Commands
+	virtual bool 	FORMAT_UNIT(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer,
+			    			IOByteCount					defectListSize,
+			    			SCSICmdField1Byte 			TRACK_NUMBER, 
+			    			SCSICmdField2Byte 			INTERLEAVE );
+
+	virtual bool	INQUIRY(
+							SCSITaskIdentifier			request,
+    						IOMemoryDescriptor 			*dataBuffer,
+    						SCSICmdField1Byte 			PAGE_OR_OPERATION_CODE,
+    						SCSICmdField1Byte 			ALLOCATION_LENGTH );
+
+   	virtual bool	MODE_SELECT_10(
+							SCSITaskIdentifier			request,
+    						IOMemoryDescriptor 			*dataBuffer,
+    						SCSICmdField1Bit 			PF,
+    						SCSICmdField1Bit 			SP,
+    						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH );  
+
+   	virtual bool	MODE_SENSE_10(
+							SCSITaskIdentifier			request,
+    						IOMemoryDescriptor 			*dataBuffer,
+    						SCSICmdField1Bit 			DBD,
+	   						SCSICmdField2Bit 			PC,
+	   						SCSICmdField6Bit 			PAGE_CODE,
+	   						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH );
+
+    virtual bool	PREVENT_ALLOW_MEDIUM_REMOVAL( 
+							SCSITaskIdentifier			request,
+	     					SCSICmdField1Bit 			PREVENT );
+
+	virtual bool 	READ_10(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			UInt32						blockSize,
+			    			SCSICmdField1Bit 			DPO, 
+			    			SCSICmdField1Bit 			FUA,
+							SCSICmdField1Bit 			RELADR, 
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField2Byte 			TRANSFER_LENGTH );
+
+	virtual bool 	READ_12(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			UInt32						blockSize,
+			    			SCSICmdField1Bit 			DPO, 
+			    			SCSICmdField1Bit 			FUA,
+							SCSICmdField1Bit 			RELADR, 
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField4Byte 			TRANSFER_LENGTH );
+
+	virtual bool 	READ_CAPACITY(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			SCSICmdField1Bit 			RELADR,
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField1Bit 			PMI );
+
+	virtual bool 	READ_FORMAT_CAPACITIES(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			SCSICmdField2Byte 			ALLOCATION_LENGTH );
+
+	virtual bool 	REQUEST_SENSE(
+							SCSITaskIdentifier			request,
+   							IOMemoryDescriptor 			*dataBuffer,
+			    			SCSICmdField1Byte 			ALLOCATION_LENGTH );
+ 	
+	virtual bool 	REZERO_UNIT( 
+							SCSITaskIdentifier			request );
+
+	virtual bool 	SEEK( 
+							SCSITaskIdentifier			request,
+			    			SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS );
+
+	virtual bool 	SEND_DIAGNOSTICS( 
+							SCSITaskIdentifier			request,
+							SCSICmdField1Bit 			PF, 
+							SCSICmdField1Bit 			SELF_TEST, 
+							SCSICmdField1Bit 			DEF_OFL, 
+							SCSICmdField1Bit 			UNIT_OFL );
+
+	virtual bool 	START_STOP_UNIT( 
+							SCSITaskIdentifier			request,
+							SCSICmdField1Bit 			IMMED, 
+							SCSICmdField1Bit 			LOEJ, 
+							SCSICmdField1Bit 			START );
+
+    virtual bool 	TEST_UNIT_READY(  
+							SCSITaskIdentifier			request );
+ 
+	virtual bool 	VERIFY( 
+							SCSITaskIdentifier			request,
+							SCSICmdField1Bit 			DPO, 
+							SCSICmdField1Bit 			BYTCHK, 
+							SCSICmdField1Bit 			RELADR,
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField2Byte 			VERIFICATION_LENGTH );
+
+	virtual bool 	WRITE_10(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			UInt32						blockSize,
+			    			SCSICmdField1Bit 			DPO, 
+			    			SCSICmdField1Bit 			FUA,
+							SCSICmdField1Bit 			RELADR, 
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField2Byte 			TRANSFER_LENGTH );
+
+	virtual bool 	WRITE_12(
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer, 
+			    			UInt32						blockSize,
+			    			SCSICmdField1Bit 			DPO, 
+							SCSICmdField1Bit 			EBP, 
+							SCSICmdField1Bit 			RELADR, 
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField4Byte 			TRANSFER_LENGTH );
+
+	virtual bool 	WRITE_AND_VERIFY(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			UInt32						blockSize,
+			    			SCSICmdField1Bit 			DPO,
+			    			SCSICmdField1Bit 			BYTCHK, 
+			    			SCSICmdField1Bit 			RELADR, 
+			    			SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS, 
+			    			SCSICmdField2Byte 			TRANSFER_LENGTH );
+};
+
+
+#pragma mark -
+#pragma mark IOUSBMassStorageUFISubclass declaration
+
+
+class IOUSBMassStorageUFISubclass : public IOUSBMassStorageClass
+{
+    OSDeclareDefaultStructors(IOUSBMassStorageUFISubclass)
+
+protected:
+	virtual	bool		BeginProvidedServices( void );
+	virtual	bool		EndProvidedServices( void );
+};
+
+#endif _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBNub.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBNub.h.svn-base
new file mode 100644
index 0000000..a998e5b
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBNub.h.svn-base
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBNUB_H
+#define _IOKIT_IOUSBNUB_H
+
+#include <IOKit/IOService.h>
+#include <libkern/c++/OSData.h>
+#include <IOKit/IOMemoryDescriptor.h>
+
+#include <IOKit/usb/USB.h>
+
+class IOUSBController;
+class IOUSBPipe;
+
+/*!
+ @class IOUSBNub
+ @abstract Super class for for IOUSBDevice and IOUSBInterface.
+ */
+class IOUSBNub : public IOService
+{
+    OSDeclareDefaultStructors(IOUSBNub)
+
+public:
+	
+	// IOKit method
+	virtual void					joinPMtree ( IOService * driver );
+
+    virtual bool					USBCompareProperty(OSDictionary   * matching, const char     * key );
+    
+    bool							IsWildCardMatch( OSDictionary   * matching, const char     * key );
+    bool							USBComparePropertyWithMask( OSDictionary *matching, const char *key, const char * maskKey );
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void printDescriptor(const IOUSBDescriptorHeader *desc);
+void printDeviceDescriptor(const IOUSBDeviceDescriptor *desc);
+void printConfigDescriptor(const IOUSBConfigurationDescriptor *cd);
+void printEndpointDescriptor(const IOUSBEndpointDescriptor *ed);
+void printInterfaceDescriptor(const IOUSBInterfaceDescriptor *id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _IOKIT_IOUSBNUB_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBPipe.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBPipe.h.svn-base
new file mode 100644
index 0000000..3286b92
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBPipe.h.svn-base
@@ -0,0 +1,387 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.2 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBPIPE_H
+#define _IOKIT_IOUSBPIPE_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOMemoryDescriptor.h>
+
+#include <IOKit/usb/USB.h>
+#include <IOKit/usb/IOUSBController.h>
+#include <IOKit/usb/IOUSBControllerV2.h>
+
+class IOUSBInterface;
+
+/*!
+    @class IOUSBPipe
+    @abstract The object representing an open pipe for a device.
+*/
+class IOUSBPipe : public OSObject
+{
+    friend class IOUSBInterface;
+    friend class IOUSBDevice;
+	
+    OSDeclareDefaultStructors(IOUSBPipe)
+		
+protected:
+	
+	const IOUSBEndpointDescriptor *	_descriptor;
+    IOUSBController::Endpoint		_endpoint;	// tidied up version of descriptor
+    IOUSBController *				_controller;
+    USBDeviceAddress				_address;
+    UInt8							_status;	// was previously used for status.  Now used to detect whether a property exists or not
+	
+    struct ExpansionData
+    {
+        IOReturn					_correctStatus;		
+		IOUSBDevice *				_device;	// Remember containing device for clearing TTs
+		UInt8						_speed;
+		IOUSBInterface	*			_interface;
+		bool						_crossEndianCompatible;
+		UInt32						_locationID;
+    };
+    ExpansionData * _expansionData;
+    
+    virtual void free();
+    
+    IOReturn ClosePipe(void);
+	
+public:
+		
+		virtual bool InitToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
+									USBDeviceAddress address, IOUSBController * controller);
+	
+    // The following 2 methods are obsolete
+    //
+    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
+                                 USBDeviceAddress address, IOUSBController * controller);
+	
+    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint,
+                                 IOUSBDevice * device, IOUSBController * controller);
+	
+    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint,
+                                 IOUSBDevice * device, IOUSBController * controller, IOUSBInterface *interface);
+	
+    // Controlling pipe state
+    /*!
+        @function GetStatus
+	 This method does NOT work.  Do not call it. See GetPipeStatus for the correct method.
+	 GetStatus will always return 0.
+	 */
+    virtual UInt8 GetStatus(void);
+    /*!
+        @function Abort
+	 This method causes all outstanding I/O on a pipe to complete with return code kIOReturnAborted. It  clears the halted bit but does NOT clear the
+	 toggle bit on the endpoint in the controller.  If you wish to clear the toggle bit, see ClearPipeStall
+	 */
+    virtual IOReturn Abort(void);
+    /*!
+        @function Reset
+	 This method is identical to ClearPipeStall(false). The use of that API is preferred.
+	 */
+    virtual IOReturn Reset(void);
+    /*!
+        @function ClearStall
+	 This method is equivalent to ClearPipeStall(false). This method is available before version 1.9.
+	 */
+    virtual IOReturn ClearStall(void);
+	
+    //
+    // Transferring Data
+    //
+    
+    // deprecated
+    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
+                          IOUSBCompletion *	completion = 0,
+						  IOByteCount *		bytesRead = 0);
+	
+    // deprecated
+    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
+                           IOUSBCompletion *	completion = 0);
+	
+    // Transfer data over Isochronous pipes
+    /*!
+        @function Read
+	 Read from an isochronous endpoint
+	 @param buffer place to put the transferred data
+	 @param frameStart USB frame number of the frame to start transfer
+	 @param numFrames Number of frames to transfer
+	 @param frameList Bytes to transfer and result for each frame
+	 @param completion describes action to take when buffer has been filled
+	 */
+    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
+                          UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList,
+                          IOUSBIsocCompletion *	completion = 0);
+    /*!
+        @function Write
+	 Write to an isochronous endpoint
+	 @param buffer place to get the transferred data
+	 @param frameStart USB frame number of the frame to start transfer
+	 @param numFrames Number of frames to transfer
+	 @param frameList Bytes to transfer and result for each frame
+	 @param completion describes action to take when buffer has been emptied
+	 */
+    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
+                           UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList,
+                           IOUSBIsocCompletion * completion = 0);
+	
+    // Do a control request over a Control pipe, using a memory descriptor
+    /*!
+        @function ControlRequest
+	 Make a control request
+	 There are two versions of this method, one uses a simple void *
+	 to point to the data portion of the transfer, the other uses an
+	 IOMemoryDescriptor to point to the data.
+	 @param request parameter block for the control request
+	 @param completion describes action to take when the request has been executed
+	 */
+    virtual IOReturn ControlRequest(IOUSBDevRequestDesc	*request,
+                                    IOUSBCompletion	*completion = 0);
+	
+    // Do a control request over a Control pipe, using a simple buffer
+    virtual IOReturn ControlRequest(IOUSBDevRequest	*request,
+                                    IOUSBCompletion	*completion = 0);
+	
+	/*
+	 *  Accessors
+	 */
+    /*!
+        @function GetEndpoint
+	 returns a pointer to the Endpoint structure for the pipe.
+	 */
+    virtual const IOUSBController::Endpoint *	GetEndpoint();
+    /*!
+        @function GetEndpointDescriptor
+	 returns the endpoint descriptor for the pipe.
+	 */
+    virtual const IOUSBEndpointDescriptor *	GetEndpointDescriptor();
+    /*!
+        @function GetDirection
+	 returns the direction of the pipe:kUSBOut/kUSBIn for a bulk or interrupt pipe,
+	 kUSBAnyDirn for a control pipe.
+	 */
+    virtual UInt8 GetDirection();
+    /*!
+        @function GetType
+	 returns the pipe type: kUSBControl, kUSBBulk or kUSBInterrupt.
+	 */
+    virtual UInt8 GetType();
+    /*!
+        @function GetEndpointNumber
+	 returns the endpoint number in the device that the pipe is connected to.
+	 */
+    virtual UInt8 GetEndpointNumber();
+    virtual USBDeviceAddress GetAddress();
+    virtual UInt16 GetMaxPacketSize();
+    virtual UInt8 GetInterval();
+	
+    // Transfer data over Bulk pipes with timeouts.
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  0);
+	
+    // deprecated
+    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
+						  UInt32		noDataTimeout,
+						  UInt32		completionTimeout,
+                          IOUSBCompletion *	completion = 0,
+						  IOByteCount *		bytesRead = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  1);
+	
+    // deprecated
+    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
+						   UInt32		noDataTimeout,
+						   UInt32		completionTimeout,
+                           IOUSBCompletion *	completion = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  2);
+    // Do a control request over a Control pipe, using a memory descriptor
+    /*!
+        @function ControlRequest
+	 Make a control request. 
+	 There are two versions of this method, one uses a simple void *
+	 to point to the data portion of the transfer, the other uses an
+	 IOMemoryDescriptor to point to the data.
+	 @param request parameter block for the control request
+	 @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
+	 if no data has been transferred on the bus.
+	 @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
+	 not been completed.
+	 @param completion describes action to take when the request has been executed
+	 */
+    virtual IOReturn ControlRequest(IOUSBDevRequestDesc	*request,
+									UInt32		noDataTimeout,
+									UInt32		completionTimeout,
+                                    IOUSBCompletion	*completion = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  3);
+    // Do a control request over a Control pipe, using a simple buffer
+    virtual IOReturn ControlRequest(IOUSBDevRequest	*request,
+									UInt32		noDataTimeout,
+									UInt32		completionTimeout,
+                                    IOUSBCompletion	*completion = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  4);
+    /*!
+        @function Read
+	 Read from an interrupt or bulk endpoint
+	 @param buffer place to put the transferred data
+	 @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
+	 the driver software may have to resynchronize the data toggle. See ClearPipeStall.
+	 @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
+	 @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
+	 @param completion describes action to take when buffer has been filled
+	 @param bytesRead returns total bytes read for synchronous reads
+	 */
+    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
+						  UInt32		noDataTimeout,
+						  UInt32		completionTimeout,
+						  IOByteCount		reqCount,
+						  IOUSBCompletion *	completion = 0,
+						  IOByteCount *		bytesRead = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  5);
+    /*!
+        @function Write
+	 Write to an interrupt or bulk endpoint
+	 @param buffer place to get the transferred data
+	 @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
+	 the driver software may have to resynchronize the data toggle. See ClearPipeStall.
+	 @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
+	 @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
+	 @param completion describes action to take when buffer has been emptied
+	 */
+    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
+						   UInt32		noDataTimeout,
+						   UInt32		completionTimeout,
+						   IOByteCount		reqCount,
+                           IOUSBCompletion *	completion = 0);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  6);
+    /*!
+        @function GetPipeStatus
+	 Returns the status of the pipe (kIOUSBPipeStalled of the pipe is stalled, else kIOReturnSuccess)
+	 */
+    virtual IOReturn GetPipeStatus(void);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  7);
+    /*!
+		@function ClearPipeStall
+	 AVAILABLE ONLY IN VERSION 1.9 AND ABOVE
+	 This method causes all outstanding I/O on a pipe to complete with return code kIOUSBTransactionReturned. It also clears both the halted bit and the
+	 toggle bit on the endpoint in the controller. The driver may need to reset the data toggle within the device to avoid losing any data. If the
+	 device correctly handles the ClearFeature(ENDPOINT_HALT) device request, then this API will handle that by sending the correct request to the
+	 device.
+	 @param withDeviceRequest if true, a ClearFeature(ENDPOINT_HALT) is sent to the appropriate endpoint on the device after the transactions on the 
+	 controllers endpoint are returned and the toggle bit on the controllers endpoint is cleared. if this parameter is false, then this is equivalent
+	 to the pre-1.9 API. This means that the endpoint on the controller is cleared, but no DeviceRequest is sent to the device's endpoint.
+	 */
+    virtual IOReturn ClearPipeStall(bool withDeviceRequest);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  8);
+    /*!
+		@function SetPipePolicy
+	 AVAILABLE ONLY IN VERSION 1.9 AND ABOVE
+	 This method allows a driver to change the maxPacketSize of an Isochronous pipe, or the polling interval for an interrupt pipe. There is a limited
+	 amount of bandwidth on any single bus, and isochronous pipes tend to use much of this bandwidth. The driver may know, however, that there
+	 will never be as much bandwidth used as is specified in the pipe's endpoint descriptor. Therefore, the driver may return some of this 
+	 bandwidth to the system by using this method. Additionally, if on an open of an IOUSBInterface any of the Isochronous pipes is unable to be 
+	 opened because of a lack of bandwidth, the pipe will be created with a bandwidth of zero, and the driver may get some of the limited bandwidth
+	 remaining by using this call.
+	 This method returns kIOReturnBadArgument if the pipe is a bulk on control pipe, or if the maxPacketSize parameter is larger than the amount specified
+	 in the endpoint descriptor. It returns kIOReturnNoBandwidth if the bandwidth requested cannot be allocated. Otherwise it returns kIOReturnSuccess.
+	 @param maxPacketSize specifies the maximum number of bytes to be used in any one millisecond frame by this pipe. The value must be less than or 
+	 equal to the maxPacketSize specified in the endpoint descriptor.
+	 @param maxInterval not currently used. reserved for future expansion
+	 
+	 */
+    virtual IOReturn SetPipePolicy(UInt16 maxPacketSize, UInt8 maxInterval);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  9);
+	
+    // Transfer data over Isochronous pipes and process the frame list at hardware interrupt time
+    /*!
+        @function Read
+	 AVAILABLE ONLY IN VERSION 1.9.2 AND ABOVE
+	 Read from an isochronous endpoint and process the IOUSBLowLatencyIsocFrame fields at 
+	 hardware interrupt time
+	 @param buffer place to put the transferred data
+	 @param frameStart USB frame number of the frame to start transfer
+	 @param numFrames Number of frames to transfer
+	 @param frameList Bytes to transfer, result, and time stamp for each frame
+	 @param completion describes action to take when buffer has been filled
+	 @param updateFrequency describes how often (in milliseconds) should the frame list be processed
+	 */
+    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
+                          UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList,
+                          IOUSBLowLatencyIsocCompletion *	completion = 0, UInt32 updateFrequency = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  10);
+    /*!
+        @function Write
+	 AVAILABLE ONLY IN VERSION 1.9.2 AND ABOVE
+	 Write to an isochronous endpoint
+	 @param buffer place to get the data to transfer
+	 @param frameStart USB frame number of the frame to start transfer
+	 @param numFrames Number of frames to transfer
+	 @param frameList Pointer to list of frames indicating bytes to transfer and result for each frame
+	 @param completion describes action to take when buffer has been emptied
+	 @param updateFrequency describes how often (in milliseconds) should the frame list be processed
+	 */
+    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
+                           UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList,
+                           IOUSBLowLatencyIsocCompletion * completion = 0, UInt32 updateFrequency = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  11);
+    /*!
+        @function Read
+     Read from an interrupt or bulk endpoint
+     @param buffer place to put the transferred data
+     @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
+     the driver software may have to resynchronize the data toggle. See ClearPipeStall.
+     @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
+     @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
+     @param completion describes action to take when buffer has been filled
+     @param bytesRead returns total bytes read for synchronous reads
+     */
+    virtual IOReturn Read(IOMemoryDescriptor *			buffer,
+                          UInt32				noDataTimeout,
+                          UInt32				completionTimeout,
+                          IOByteCount				reqCount,
+                          IOUSBCompletionWithTimeStamp *	completion = 0,
+                          IOByteCount *				bytesRead = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  12);
+	virtual bool InitToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
+								USBDeviceAddress address, IOUSBController * controller, IOUSBDevice * device, IOUSBInterface * interface);
+
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  13);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  14);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  15);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  16);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  17);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  18);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  19);
+	
+};
+
+#endif /* _IOKIT_IOUSBPIPE_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBRootHubDevice.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBRootHubDevice.h.svn-base
new file mode 100644
index 0000000..19a17c4
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBRootHubDevice.h.svn-base
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBROOTHUBDEVICE_H
+#define _IOKIT_IOUSBROOTHUBDEVICE_H
+
+#include <IOKit/usb/IOUSBHubDevice.h>
+
+/*!
+ @class IOUSBRootHubDevice
+ @abstract The object representing the Root Hub simulation.
+ */
+class IOUSBRootHubDevice : public IOUSBHubDevice
+{
+    OSDeclareDefaultStructors(IOUSBRootHubDevice)
+
+private:
+    UInt16				configuration;
+	IOCommandGate		*_commandGate;
+
+	// private method which overrides the same method in IOUSBHubDevice
+	virtual bool			InitializeCharacteristics(void);					// used at start
+	
+    struct ExpansionData 
+	{
+		IOService *		_IOResourcesEntry;
+	};
+    ExpansionData *_expansionData;
+
+public:
+	// static methods
+    static IOUSBRootHubDevice	*NewRootHubDevice(void);
+    static IOReturn				GatedDeviceRequest (OSObject *	owner, 
+												void *		arg0, 
+												void *		arg1, 
+												void *		arg2, 
+												void *		arg3 );
+    
+	// IOKit methods
+    virtual bool 	init();
+	virtual bool 	start( IOService * provider );
+    virtual void 	stop( IOService *provider );
+    virtual void	free();
+
+	// IOUSBHubDevice methods
+	virtual bool			IsRootHub(void);
+	virtual UInt32			RequestExtraPower(UInt32 requestedPower);
+	virtual void			ReturnExtraPower(UInt32 returnedPower);
+
+	// 
+	virtual UInt32			RequestSleepPower(UInt32 requestedPower);
+	virtual void			ReturnSleepPower(UInt32 returnedPower);
+	
+	// a non static but non-virtual function
+	IOReturn DeviceRequestWorker(IOUSBDevRequest *request, UInt32 noDataTimeout, UInt32 completionTimeout, IOUSBCompletion *completion);
+    
+	// IOUSBDevice methods overriden here
+    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, IOUSBCompletion *completion = 0);
+    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, UInt32 noDataTimeout, UInt32 completionTimeout, IOUSBCompletion *completion = 0);
+
+    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  0);
+	virtual IOReturn		GetDeviceInformation(UInt32 *info);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  1);
+	virtual void			InitializeExtraPower(UInt32 maxPortCurrent, UInt32 totalExtraCurrent);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  2);
+	virtual void			SetSleepCurrent(UInt32 sleepCurrent);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  3);
+	virtual UInt32			GetSleepCurrent();
+
+    OSMetaClassDeclareReservedUnused(IOUSBRootHubDevice,  4);
+};
+
+#endif /* _IOKIT_IOUSBROOTHUBDEVICE_H */
+
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBUserClient.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBUserClient.h.svn-base
new file mode 100644
index 0000000..1cd47a8
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBUserClient.h.svn-base
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBUSERCLIENT_H
+#define _IOKIT_IOUSBUSERCLIENT_H
+
+// these are the new User Client method names    
+enum {
+    kUSBDeviceUserClientOpen,
+    kUSBDeviceUserClientClose,
+    kUSBDeviceUserClientSetConfig,
+    kUSBDeviceUserClientGetConfig,
+    kUSBDeviceUserClientGetConfigDescriptor,
+    kUSBDeviceUserClientGetFrameNumber,
+    kUSBDeviceUserClientDeviceRequestOut,
+    kUSBDeviceUserClientDeviceRequestIn,
+    kUSBDeviceUserClientCreateInterfaceIterator,
+    kUSBDeviceUserClientResetDevice,
+    kUSBDeviceUserClientSuspend,
+    kUSBDeviceUserClientAbortPipeZero,
+    kUSBDeviceUserClientReEnumerateDevice,
+    kUSBDeviceUserClientGetMicroFrameNumber,
+    kUSBDeviceUserClientGetFrameNumberWithTime,
+    kUSBDeviceUserClientSetAsyncPort,
+	kUSBDeviceUserClientGetDeviceInformation,
+	kUSBDeviceUserClientRequestExtraPower,
+	kUSBDeviceUserClientReturnExtraPower,
+	kUSBDeviceUserClientGetExtraPowerAllocated,
+    kIOUSBLibDeviceUserClientNumCommands
+    };
+
+enum {
+    kUSBInterfaceUserClientOpen,
+    kUSBInterfaceUserClientClose,
+    kUSBInterfaceUserClientGetDevice,
+    kUSBInterfaceUserClientSetAlternateInterface,
+    kUSBInterfaceUserClientGetFrameNumber,
+    kUSBInterfaceUserClientGetPipeProperties,
+    kUSBInterfaceUserClientReadPipe,
+    kUSBInterfaceUserClientWritePipe,
+    kUSBInterfaceUserClientGetPipeStatus,
+    kUSBInterfaceUserClientAbortPipe,
+    kUSBInterfaceUserClientResetPipe,
+    kUSBInterfaceUserClientClearPipeStall,
+    kUSBInterfaceUserClientControlRequestOut,
+    kUSBInterfaceUserClientControlRequestIn,
+    kUSBInterfaceUserClientSetPipePolicy,
+    kUSBInterfaceUserClientGetBandwidthAvailable,
+    kUSBInterfaceUserClientGetEndpointProperties,
+    kUSBInterfaceUserClientLowLatencyPrepareBuffer,
+    kUSBInterfaceUserClientLowLatencyReleaseBuffer,
+    kUSBInterfaceUserClientGetMicroFrameNumber,
+    kUSBInterfaceUserClientGetFrameListTime,
+    kUSBInterfaceUserClientGetFrameNumberWithTime,
+    kUSBInterfaceUserClientSetAsyncPort,
+    kUSBInterfaceUserClientReadIsochPipe,
+    kUSBInterfaceUserClientWriteIsochPipe,
+    kUSBInterfaceUserClientLowLatencyReadIsochPipe,
+    kUSBInterfaceUserClientLowLatencyWriteIsochPipe,
+	kUSBInterfaceUserClientGetConfigDescriptor,
+    kIOUSBLibInterfaceUserClientNumCommands
+    };
+
+
+#if KERNEL
+#include <IOKit/IOService.h>
+#include <IOKit/IOUserClient.h>
+#include <IOKit/usb/USB.h>
+
+//================================================================================================
+//
+//   Structure declarations
+//
+//================================================================================================
+//
+typedef struct IOUSBUserClientAsyncParamBlock IOUSBUserClientAsyncParamBlock;
+
+struct IOUSBUserClientAsyncParamBlock 
+{
+    OSAsyncReference64			fAsyncRef;
+    uint32_t					fAsyncCount;
+    uint32_t					fMax;
+    IOMemoryDescriptor *		fMem;
+    IOUSBDevRequestDesc			req;
+};
+
+typedef struct IOUSBInterfaceUserClientISOAsyncParamBlock IOUSBInterfaceUserClientISOAsyncParamBlock;
+struct IOUSBInterfaceUserClientISOAsyncParamBlock 
+{
+    OSAsyncReference64			fAsyncRef;
+	uint32_t					fAsyncCount;
+    mach_vm_size_t				frameLen;	// In bytes
+    mach_vm_address_t           frameBase;	// In user task
+    IOMemoryDescriptor *        dataMem;
+    IOMemoryDescriptor *        countMem;
+	uint64_t					numFrames;
+    IOUSBIsocFrame              frames[0];  // Must be the last one
+};
+
+
+//================================================================================================
+//
+// This class is used to add an IOProviderMergeProperties dictionary entry to a provider's
+// property list, thus providing a tie between hardware and a CFBundle at hardware
+// load time.  This property usually contains the user client class name and the CFPlugInTypes UUID's
+// but it can contain other properties.
+//
+//================================================================================================
+//
+class IOUSBUserClientInit : public IOService 
+{
+    OSDeclareDefaultStructors(IOUSBUserClientInit);
+
+public:
+    
+    virtual bool		start(IOService *  provider) ;
+    virtual bool 		MergeDictionaryIntoProvider(IOService *  provider, OSDictionary *  mergeDict);
+    virtual bool		MergeDictionaryIntoDictionary(OSDictionary *  sourceDictionary,  OSDictionary *  targetDictionary);
+};
+
+#endif // KERNEL
+
+#endif /* ! _IOKIT_IOUSBUSERCLIENT_H */
+
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBWorkLoop.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBWorkLoop.h.svn-base
new file mode 100644
index 0000000..7630704
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/IOUSBWorkLoop.h.svn-base
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2001-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBWORKLOOP_H
+#define _IOKIT_IOUSBWORKLOOP_H
+
+#include <IOKit/IOWorkLoop.h>
+
+/*!
+ @class IOUSBWorkLoop
+ @abstract Subclass of IOWorkloop that allows the USB stack to more finely control sleep and wake.
+ */
+class IOUSBWorkLoop : public IOWorkLoop
+{    
+    OSDeclareDefaultStructors(IOUSBWorkLoop)
+    
+protected:
+    void *			fSleepToken;
+#ifndef __OPEN_SOURCE__
+	lck_grp_t *		fLockGroup;
+#endif
+	bool init ( const char * controllerLocation );
+	void free ( void );
+	
+    // Overrides to check for sleeping
+    virtual void closeGate();
+    virtual bool tryCloseGate();
+    
+public:
+    // Create a workloop
+    static IOUSBWorkLoop * workLoop(const char * controllerLocation);
+    
+    // Put workloop to sleep (Must have gate closed, opens gate if successful)
+    virtual IOReturn sleep(void *token);
+    
+    // Wake workloop up (closes gate if successful)
+    virtual IOReturn wake(void *token);
+    
+    void CloseGate(void);
+    void OpenGate(void);
+};
+
+#endif /* ! _IOKIT_IOUSBWORKLOOP_H */
+
diff --git a/i386/include/IOKit/usb/.svn/text-base/USB.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/USB.h.svn-base
new file mode 100644
index 0000000..8ba12bb
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/USB.h.svn-base
@@ -0,0 +1,1076 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _USB_H
+#define _USB_H
+
+#if KERNEL
+	#include <libkern/OSByteOrder.h>
+	#include <IOKit/IOMemoryDescriptor.h>
+#else
+	#include <libkern/OSByteOrder.h>
+#endif
+
+#include <IOKit/IOTypes.h>
+
+#if !defined(__USB__)
+#    include <IOKit/usb/USBSpec.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /*!
+    @header		USB.h
+     @abstract	Public Interfaces to the USB implementation in Mac OS X.
+     @discussion	This header file contains definitions and structures that are used in the different USB API's in Mac OS X, both in the kernel and in the user space.
+     */
+
+    /*!
+    @defined	Endian conversion definitions
+     @discussion The USB API's use a convention of specifying parameters in the host order.  The USB spec specifies that multi-byte items should be
+     formatted in little endian order.  The following macros allow one to translate multi-byte values from Host order to USB order and vice versa.  There are separate macros for
+     in-kernel use and for user space use.
+     */
+#define USBToHostWord OSSwapLittleToHostInt16
+#define HostToUSBWord OSSwapHostToLittleInt16
+#define USBToHostLong OSSwapLittleToHostInt32
+#define HostToUSBLong OSSwapHostToLittleInt32
+
+    /*!
+    @enum Miscellaneous Constants
+    @discussion 
+    */
+    enum {
+    kUSBDeviceIDShift = 7,
+    kUSBMaxDevices = 128,
+    kUSBMaxDevice = kUSBMaxDevices-1,
+    kUSBDeviceIDMask = 0x7f,
+
+    kUSBPipeIDMask = 0xf,
+    kUSBMaxPipes = 32,	// In and Out pipes can have same pipe number.
+
+    kUSBInterfaceIDShift = 8,
+    kUSBMaxInterfaces = 1 << kUSBInterfaceIDShift,
+    kUSBInterfaceIDMask = kUSBMaxInterfaces-1,
+
+    kUSBEndPtShift = 7,
+    kUSBDeviceMask = ((1 << kUSBEndPtShift) -1),
+
+    kUSBNoPipeIdx = -1
+};
+
+/*!
+@enum bRequest Shifts and Masks 
+@discussion These are used to create the macro to encode the bRequest filed of a Device Request
+*/
+enum {
+    kUSBRqDirnShift = 7,
+    kUSBRqDirnMask = 1,
+
+    kUSBRqTypeShift = 5,
+    kUSBRqTypeMask = 3,
+
+    kUSBRqRecipientMask = 0X1F
+};
+
+/*!
+@defined USBmakebmRequestType 
+@discussion Macro to encode the bRequest field of a Device Request.  It is used when constructing an IOUSBDevRequest.
+*/
+#define USBmakebmRequestType(direction, type, recipient)		\
+    ((direction & kUSBRqDirnMask) << kUSBRqDirnShift) |			\
+    ((type & kUSBRqTypeMask) << kUSBRqTypeShift) |			\
+    (recipient & kUSBRqRecipientMask)
+
+/*!
+@enum kUSBMaxIsocFrameReqCount 
+@discussion Maximum size in bytes allowed for one Isochronous frame
+*/
+enum {
+    kUSBMaxFSIsocEndpointReqCount = 1023,	// max size (bytes) of any one Isoc frame for 1 FS endpoint
+	kUSBMaxHSIsocEndpointReqCount = 3072,	// max size (bytes) of any one Isoc frame for 1 HS endpoint
+	kUSBMaxHSIsocFrameCount = 7168			// max size (bytes) of all Isoc transfers in a HS frame
+};
+
+/*!
+@defined EncodeRequest 
+@discussion Macro that encodes the bRequest and bRequestType fields of a IOUSBDevRequest into a single value.  It is useful when one needs
+to know what type of request the IOUSBDevRequest encodes and simplifies comparisons.
+*/
+#define EncodeRequest(request, direction, type, recipient)		\
+    (((UInt16)request << 8) +	    					\
+              ((UInt16)recipient +					\
+                        ((UInt16)type << kUSBRqTypeShift) +		\
+                        ((UInt16)direction << kUSBRqDirnShift)))
+
+
+/*!
+@enum Standard Device Requests
+@discussion Encoding of the standard device requests.
+<tt>
+<pre><b>
+bmRequestType bRequest          wValue        wIndex     wLength Data</b>
+00000000B     CLEAR_FEATURE     Feature       Zero       Zero    None (device)
+00000001B                       Feature       Interface  Zero    None (Interface)
+00000010B                       Feature       Endpoint   Zero    None (Endpoint)
+
+10000000B     GET_CONFIGURATION Zero          Zero       One     Configuration
+10000000B     GET_DESCRIPTOR    Type          LangID     Length  Descriptor
+10000001B     GET_INTERFACE     Zero          Interface  One     Alternate
+
+10000000B     GET_STATUS        Zero          Zero       Two     status (device)
+10000001B                       Zero          Interface  Two     status (Interface)
+10000010B                       Zero          Endpoint   Two     status (Endpoint)
+
+00000000B     SET_ADDRESS       Address       Zero       Zero    None
+00000000B     SET_CONFIGURATION Configuration Zero       Zero    None
+00000000B     SET_DESCRIPTOR    Type          LangID     Length  Descriptor
+
+00000000B     SET_FEATURE       Feature       Zero       Zero    None (device)
+00000001B                       Feature       Interface  Zero    None (Interface)
+00000010B                       Feature       Endpoint   Zero    None (Endpoint)
+
+00000001B     SET_INTERFACE     Alternate     Interface  Zero    None
+10000010B     SYNCH_FRAME       Zero          Endpoint   Two     Frame Number
+</pre>
+</tt>
+*/
+enum {
+    kClearDeviceFeature     = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBDevice),
+    kClearInterfaceFeature  = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBInterface),
+    kClearEndpointFeature   = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBEndpoint),
+    kGetConfiguration       = EncodeRequest(kUSBRqGetConfig,     kUSBIn,  kUSBStandard, kUSBDevice),
+    kGetDescriptor          = EncodeRequest(kUSBRqGetDescriptor, kUSBIn,  kUSBStandard, kUSBDevice),
+    kGetInterface           = EncodeRequest(kUSBRqGetInterface,  kUSBIn,  kUSBStandard, kUSBInterface),
+    kGetDeviceStatus        = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBDevice),
+    kGetInterfaceStatus     = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBInterface),
+    kGetEndpointStatus      = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBEndpoint),
+    kSetAddress             = EncodeRequest(kUSBRqSetAddress,    kUSBOut, kUSBStandard, kUSBDevice),
+    kSetConfiguration       = EncodeRequest(kUSBRqSetConfig,     kUSBOut, kUSBStandard, kUSBDevice),
+    kSetDescriptor          = EncodeRequest(kUSBRqSetDescriptor, kUSBOut, kUSBStandard, kUSBDevice),
+    kSetDeviceFeature       = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBDevice),
+    kSetInterfaceFeature    = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBInterface),
+    kSetEndpointFeature     = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBEndpoint),
+    kSetInterface           = EncodeRequest(kUSBRqSetInterface,  kUSBOut, kUSBStandard, kUSBInterface),
+    kSyncFrame              = EncodeRequest(kUSBRqSyncFrame,     kUSBIn,  kUSBStandard, kUSBEndpoint),
+};
+
+/*!
+@defined kCallInterfaceOpenWithGate
+ @discussion If the USB Device has this property, drivers for any of its interfaces will have their handleOpen method called while holding the workloop gate.
+ */
+#define kCallInterfaceOpenWithGate	"kCallInterfaceOpenWithGate"
+
+// TYPES
+
+typedef UInt16 USBDeviceAddress;
+
+typedef uint32_t USBPhysicalAddress32;
+
+/*!
+    @typedef IOUSBIsocFrame
+    @discussion Structure used to encode information about each isoc frame.
+    @param frStatus Returns status associated with the frame.
+    @param frReqCount Input specifiying how many bytes to read or write.
+    @param frActCount Actual # of bytes transferred.
+*/
+typedef struct IOUSBIsocFrame {
+    IOReturn                        frStatus;
+    UInt16                          frReqCount;
+    UInt16                          frActCount;
+} IOUSBIsocFrame;
+
+
+/*!
+    @typedef IOUSBLowLatencyIsocFrame
+    @discussion    Structure used to encode information about each isoc frame that is processed
+    at hardware interrupt time (low latency).
+    @param frStatus Returns status associated with the frame.
+    @param frReqCount Input specifiying how many bytes to read or write.
+    @param frActCount Actual # of bytes transferred.
+    @param frTimeStamp Time stamp that indicates time when frame was procesed.
+*/
+struct IOUSBLowLatencyIsocFrame {
+    IOReturn                        frStatus;
+    UInt16                          frReqCount;
+    UInt16                          frActCount;
+    AbsoluteTime		    frTimeStamp;
+};
+typedef struct IOUSBLowLatencyIsocFrame IOUSBLowLatencyIsocFrame;
+
+/*!
+@typedef IOUSBCompletionAction
+ @discussion Function called when USB I/O completes.
+ @param target The target specified in the IOUSBCompletion struct.
+ @param parameter The parameter specified in the IOUSBCompletion struct.
+ @param status Completion status.
+ @param bufferSizeRemaining Bytes left to be transferred.
+ */
+typedef void (*IOUSBCompletionAction)(
+                                      void *			target,
+                                      void *			parameter,
+                                      IOReturn		status,
+                                      UInt32			bufferSizeRemaining);
+
+/*!
+@typedef IOUSBCompletionActionWithTimeStamp
+ @discussion Function called when USB I/O completes.
+ @param target The target specified in the IOUSBCompletion struct.
+ @param parameter The parameter specified in the IOUSBCompletion struct.
+ @param status Completion status.
+ @param bufferSizeRemaining Bytes left to be transferred.
+ @param timeStamp Time at which the transaction was processed.
+ */
+typedef void (*IOUSBCompletionActionWithTimeStamp)(
+                                      void *		target,
+                                      void *		parameter,
+                                      IOReturn		status,
+                                      UInt32		bufferSizeRemaining,
+                                      AbsoluteTime	timeStamp);
+
+/*!
+    @typedef IOUSBIsocCompletionAction
+    @discussion Function called when Isochronous USB I/O completes.
+    @param target The target specified in the IOUSBIsocCompletionn struct.
+    @param parameter The parameter specified in the IOUSBIsocCompletion struct.
+    @param status Completion status.
+    @param pFrames Pointer to the frame list containing the status for each frame transferred.
+*/
+typedef void (*IOUSBIsocCompletionAction)(
+                void *			target,
+                void *			parameter,
+                IOReturn		status,
+                IOUSBIsocFrame		*pFrames);
+
+/*!
+    @typedef IOUSBLowLatencyIsocCompletionAction
+    @discussion Function called when Low Latency Isochronous USB I/O completes.
+    @param target The target specified in the IOUSBLowLatencyIsocCompletion struct.
+    @param parameter The parameter specified in the IOUSBLowLatencyIsocCompletion struct.
+    @param status Completion status.
+    @param pFrames Pointer to the low latency frame list containing the status for each frame transferred.
+*/
+typedef void (*IOUSBLowLatencyIsocCompletionAction)(
+                void *				target,
+                void *				parameter,
+                IOReturn			status,
+                IOUSBLowLatencyIsocFrame	*pFrames);
+
+/*!
+@typedef IOUSBCompletion
+ @discussion Struct specifying action to perform when a USB I/O completes.
+ @param target The target to pass to the action function.
+ @param action The function to call.
+ @param parameter The parameter to pass to the action function.
+ */
+typedef struct IOUSBCompletion {
+    void * 			target;
+    IOUSBCompletionAction	action;
+    void *			parameter;
+} IOUSBCompletion;
+
+/*!
+@typedef IOUSBCompletionWithTimeStamp
+ @discussion Struct specifying action to perform when a USB I/O completes.
+ @param target The target to pass to the action function.
+ @param action The function to call.
+ @param parameter The parameter to pass to the action function.
+ */
+typedef struct IOUSBCompletionWithTimeStamp {
+    void * 				target;
+    IOUSBCompletionActionWithTimeStamp	action;
+    void *				parameter;
+} IOUSBCompletionWithTimeStamp;
+
+/*!
+    @typedef IOUSBIsocCompletion
+    @discussion Struct specifying action to perform when an Isochronous USB I/O completes.
+    @param target The target to pass to the action function.
+    @param action The function to call.
+    @param parameter The parameter to pass to the action function.
+*/
+typedef struct IOUSBIsocCompletion {
+    void * 			target;
+    IOUSBIsocCompletionAction	action;
+    void *			parameter;
+} IOUSBIsocCompletion;
+
+/*!
+    @typedef IOUSBLowLatencyIsocCompletion
+    @discussion Struct specifying action to perform when an Low Latency Isochronous USB I/O completes.
+    @param target The target to pass to the action function.
+    @param action The function to call.
+    @param parameter The parameter to pass to the action function.
+*/
+typedef struct IOUSBLowLatencyIsocCompletion {
+    void * 				target;
+    IOUSBLowLatencyIsocCompletionAction	action;
+    void *				parameter;
+} IOUSBLowLatencyIsocCompletion;
+
+
+/*!
+@defined IOUSBFamily error codes
+@discussion  Errors specific to the IOUSBFamily.  Note that the iokit_usb_err(x) translates to 0xe0004xxx, where xxx is the value in parenthesis as a hex number.
+*/
+#define	iokit_usb_err(return)       (sys_iokit|sub_iokit_usb|return)
+#define kIOUSBUnknownPipeErr        iokit_usb_err(0x61)			// 0xe0004061  Pipe ref not recognized
+#define kIOUSBTooManyPipesErr       iokit_usb_err(0x60)			// 0xe0004060  Too many pipes
+#define kIOUSBNoAsyncPortErr        iokit_usb_err(0x5f)			// 0xe000405f  no async port
+#define kIOUSBNotEnoughPipesErr     iokit_usb_err(0x5e)			// 0xe000405e  not enough pipes in interface
+#define kIOUSBNotEnoughPowerErr     iokit_usb_err(0x5d)			// 0xe000405d  not enough power for selected configuration
+#define kIOUSBEndpointNotFound      iokit_usb_err(0x57)			// 0xe0004057  Endpoint Not found
+#define kIOUSBConfigNotFound        iokit_usb_err(0x56)			// 0xe0004056  Configuration Not found
+#define kIOUSBTransactionTimeout    iokit_usb_err(0x51)			// 0xe0004051  Transaction timed out
+#define kIOUSBTransactionReturned   iokit_usb_err(0x50)			// 0xe0004050  The transaction has been returned to the caller
+#define kIOUSBPipeStalled           iokit_usb_err(0x4f)			// 0xe000404f  Pipe has stalled, error needs to be cleared
+#define kIOUSBInterfaceNotFound     iokit_usb_err(0x4e)			// 0xe000404e  Interface ref not recognized
+#define kIOUSBLowLatencyBufferNotPreviouslyAllocated        iokit_usb_err(0x4d)			// 0xe000404d  Attempted to use user land low latency isoc calls w/out calling PrepareBuffer (on the data buffer) first 
+#define kIOUSBLowLatencyFrameListNotPreviouslyAllocated     iokit_usb_err(0x4c)			// 0xe000404c  Attempted to use user land low latency isoc calls w/out calling PrepareBuffer (on the frame list) first
+#define kIOUSBHighSpeedSplitError     iokit_usb_err(0x4b)		// 0xe000404b Error to hub on high speed bus trying to do split transaction
+#define kIOUSBSyncRequestOnWLThread	iokit_usb_err(0x4a)			// 0xe000404a  A synchronous USB request was made on the workloop thread (from a callback?).  Only async requests are permitted in that case
+#define kIOUSBDeviceNotHighSpeed	iokit_usb_err(0x49)			// 0xe0004049  The device is not a high speed device, so the EHCI driver returns an error
+#define kIOUSBDevicePortWasNotSuspended iokit_usb_err(0x50)		// 0xe0004050  Port was not suspended
+	
+/*!
+@defined IOUSBFamily hardware error codes
+@discussion These errors are returned by the OHCI controller.  The # in parenthesis (xx) corresponds to the OHCI Completion Code.
+For the following Completion codes, we return a generic IOKit error instead of a USB specific error.  
+<tt>
+<pre>
+Completion Code         Error Returned              Description
+9                       kIOReturnUnderrun           (Data Underrun) EP returned less data than max packet size
+8                       kIOReturnOverrun            (Data Overrun) Packet too large or more data than buffer
+5                       kIOReturnNotResponding      Device Not responding
+4                       kIOUSBPipeStalled           Endpoint returned a STALL PID
+</pre>
+</tt>
+*/
+#define kIOUSBLinkErr           iokit_usb_err(0x10)		// 0xe0004010
+#define kIOUSBNotSent2Err       iokit_usb_err(0x0f)		// 0xe000400f Transaction not sent
+#define kIOUSBNotSent1Err       iokit_usb_err(0x0e)		// 0xe000400e Transaction not sent
+#define kIOUSBBufferUnderrunErr iokit_usb_err(0x0d)		// 0xe000400d Buffer Underrun (Host hardware failure on data out, PCI busy?)
+#define kIOUSBBufferOverrunErr  iokit_usb_err(0x0c)		// 0xe000400c Buffer Overrun (Host hardware failure on data out, PCI busy?)
+#define kIOUSBReserved2Err      iokit_usb_err(0x0b)		// 0xe000400b Reserved
+#define kIOUSBReserved1Err      iokit_usb_err(0x0a)		// 0xe000400a Reserved
+#define kIOUSBWrongPIDErr       iokit_usb_err(0x07)		// 0xe0004007 Pipe stall, Bad or wrong PID
+#define kIOUSBPIDCheckErr       iokit_usb_err(0x06)		// 0xe0004006 Pipe stall, PID CRC error
+#define kIOUSBDataToggleErr     iokit_usb_err(0x03)		// 0xe0004003 Pipe stall, Bad data toggle
+#define kIOUSBBitstufErr        iokit_usb_err(0x02)		// 0xe0004002 Pipe stall, bitstuffing
+#define kIOUSBCRCErr            iokit_usb_err(0x01)		// 0xe0004001 Pipe stall, bad CRC
+
+/*!
+@defined IOUSBFamily message codes
+@discussion  Messages specific to the IOUSBFamily.  Note that the iokit_usb_msg(x) translates to 0xe0004xxx, where xxx is the value in parenthesis as a hex number.
+*/
+#define iokit_usb_msg(message)						(UInt32)(sys_iokit|sub_iokit_usb|message)
+#define kIOUSBMessageHubResetPort					iokit_usb_msg(0x01)		// 0xe0004001  Message sent to a hub to reset a particular port
+#define kIOUSBMessageHubSuspendPort					iokit_usb_msg(0x02)		// 0xe0004002  Message sent to a hub to suspend a particular port
+#define kIOUSBMessageHubResumePort					iokit_usb_msg(0x03)		// 0xe0004003  Message sent to a hub to resume a particular port
+#define kIOUSBMessageHubIsDeviceConnected			iokit_usb_msg(0x04)		// 0xe0004004  Message sent to a hub to inquire whether a particular port has a device connected or not
+#define kIOUSBMessageHubIsPortEnabled				iokit_usb_msg(0x05)		// 0xe0004005  Message sent to a hub to inquire whether a particular port is enabled or not
+#define kIOUSBMessageHubReEnumeratePort				iokit_usb_msg(0x06)		// 0xe0004006  Message sent to a hub to reenumerate the device attached to a particular port
+#define kIOUSBMessagePortHasBeenReset				iokit_usb_msg(0x0a)		// 0xe000400a  Message sent to a device indicating that the port it is attached to has been reset
+#define kIOUSBMessagePortHasBeenResumed				iokit_usb_msg(0x0b)		// 0xe000400b  Message sent to a device indicating that the port it is attached to has been resumed
+#define kIOUSBMessageHubPortClearTT					iokit_usb_msg(0x0c)		// 0xe000400c  Message sent to a hub to clear the transaction translator
+#define kIOUSBMessagePortHasBeenSuspended			iokit_usb_msg(0x0d)		// 0xe000400d  Message sent to a device indicating that the port it is attached to has been suspended
+#define kIOUSBMessageFromThirdParty					iokit_usb_msg(0x0e)		// 0xe000400e  Message sent from a third party.  Uses IOUSBThirdPartyParam to encode the sender's ID
+#define kIOUSBMessagePortWasNotSuspended			iokit_usb_msg(0x0f)		// 0xe000400f  Message indicating that the hub driver received a resume request for a port that was not suspended
+#define kIOUSBMessageExpressCardCantWake			iokit_usb_msg(0x10)		// 0xe0004010  Message from a driver to a bus that an express card will disconnect on sleep and thus shouldn't wake
+#define kIOUSBMessageCompositeDriverReconfigured    iokit_usb_msg(0x11)		// 0xe0004011  Message from the composite driver indicating that it has finished re-configuring the device after a reset
+#define kIOUSBMessageHubSetPortRecoveryTime			iokit_usb_msg(0x12)		// 0xe0004012  Message sent to a hub to set the # of ms required when resuming a particular port
+#define kIOUSBMessageOvercurrentCondition			iokit_usb_msg(0x13)     // 0xe0004013  Message sent to the clients of the device's hub parent, when a device causes an overcurrent condition.  The message argument contains the locationID of the device
+#define kIOUSBMessageNotEnoughPower					iokit_usb_msg(0x14)     // 0xe0004014  Message sent to the clients of the device's hub parent, when a device causes an low power notice to be displayed.  The message argument contains the locationID of the device
+#define kIOUSBMessageController						iokit_usb_msg(0x15)		// 0xe0004015  Generic message sent from controller user client to controllers 
+#define	kIOUSBMessageRootHubWakeEvent				iokit_usb_msg(0x16)		// 0xe0004016  Message from the HC Wakeup code indicating that a Root Hub port has a wake event
+
+// Obsolete
+//
+struct IOUSBMouseData {
+    UInt16 				buttons;
+    SInt16 				XDelta;
+    SInt16 				YDelta;
+};
+typedef struct IOUSBMouseData		IOUSBMouseData;
+typedef IOUSBMouseData *		IOUSBMouseDataPtr;
+
+// Obsolete
+//
+struct IOUSBKeyboardData {
+    UInt16 				keycount;
+    UInt16 				usbkeycode[32];
+};
+typedef struct IOUSBKeyboardData	IOUSBKeyboardData;
+typedef IOUSBKeyboardData *		IOUSBKeyboardDataPtr;
+
+// Obsolete
+//
+union IOUSBHIDData {
+    IOUSBKeyboardData 			kbd;
+    IOUSBMouseData 			mouse;
+};
+typedef union IOUSBHIDData		IOUSBHIDData;
+typedef IOUSBHIDData *			IOUSBHIDDataPtr;
+
+/*!
+    @typedef IOUSBDeviceDescriptor
+    @discussion Descriptor for a USB Device.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+struct IOUSBDeviceDescriptor {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt16 			bcdUSB;
+	UInt8 			bDeviceClass;
+	UInt8 			bDeviceSubClass;
+	UInt8 			bDeviceProtocol;
+	UInt8 			bMaxPacketSize0;
+	UInt16 			idVendor;
+	UInt16 			idProduct;
+	UInt16 			bcdDevice;
+	UInt8 			iManufacturer;
+	UInt8 			iProduct;
+	UInt8 			iSerialNumber;
+	UInt8 			bNumConfigurations;
+};
+typedef struct IOUSBDeviceDescriptor		IOUSBDeviceDescriptor;
+typedef IOUSBDeviceDescriptor *			IOUSBDeviceDescriptorPtr;
+
+/*!
+    @typedef IOUSBDescriptorHeader
+    @discussion Standard header used for all USB descriptors.  Used to read the length of a descriptor so that we can allocate storage for the whole descriptor later on.
+*/
+struct IOUSBDescriptorHeader {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+};
+typedef struct IOUSBDescriptorHeader		IOUSBDescriptorHeader;
+typedef IOUSBDescriptorHeader *			IOUSBDescriptorHeaderPtr;
+
+/*!
+    @typedef IOUSBConfigurationDescriptor
+    @discussion Standard USB Configuration Descriptor.  It is variable length, so this only specifies the known fields.  We use the wTotalLength field to read the whole descriptor.
+    See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+struct IOUSBConfigurationDescriptor {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt16 			wTotalLength;
+	UInt8 			bNumInterfaces;
+	UInt8 			bConfigurationValue;
+	UInt8 			iConfiguration;
+	UInt8 			bmAttributes;
+	UInt8 			MaxPower;
+};
+typedef struct IOUSBConfigurationDescriptor 	IOUSBConfigurationDescriptor;
+typedef IOUSBConfigurationDescriptor *		IOUSBConfigurationDescriptorPtr;
+
+/*!
+    @typedef IOUSBConfigurationDescHeader
+    @discussion Header of a IOUSBConfigurationDescriptor.  Used to get the total length of the descriptor.
+*/
+struct IOUSBConfigurationDescHeader {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt16 			wTotalLength;
+};
+typedef struct IOUSBConfigurationDescHeader 	IOUSBConfigurationDescHeader;
+typedef IOUSBConfigurationDescHeader *		IOUSBConfigurationDescHeaderPtr;
+
+/*!
+    @typedef IOUSBInterfaceDescriptor
+    @discussion Descriptor for a USB Interface.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+struct IOUSBInterfaceDescriptor {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt8 			bInterfaceNumber;
+	UInt8 			bAlternateSetting;
+	UInt8 			bNumEndpoints;
+	UInt8 			bInterfaceClass;
+	UInt8 			bInterfaceSubClass;
+	UInt8 			bInterfaceProtocol;
+	UInt8 			iInterface;
+};
+typedef struct IOUSBInterfaceDescriptor	IOUSBInterfaceDescriptor;
+typedef IOUSBInterfaceDescriptor *	IOUSBInterfaceDescriptorPtr;
+
+/*!
+    @typedef IOUSBEndpointDescriptor
+    @discussion Descriptor for a USB Endpoint.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+struct IOUSBEndpointDescriptor {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt8 			bEndpointAddress;
+	UInt8 			bmAttributes;
+	UInt16 			wMaxPacketSize;	
+	UInt8 			bInterval;
+};
+typedef struct IOUSBEndpointDescriptor	IOUSBEndpointDescriptor;
+typedef IOUSBEndpointDescriptor *	IOUSBEndpointDescriptorPtr;
+
+enum{addPacketShift = 11};  // Bits for additional packets in maxPacketField. (Table 9-13)
+#define mungeMaxPacketSize(w) ((w>1024)?(((w>>(addPacketShift))+1)*(w&((1<<addPacketShift)-1))):w)
+
+/*!
+    @typedef IOUSBHIDDescriptor
+    @discussion USB HID Descriptor.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.  (This structure
+    should have used the #pragma pack(1) compiler directive to get byte alignment.
+*/
+struct IOUSBHIDDescriptor {
+	UInt8 			descLen;
+	UInt8 			descType;
+	UInt16 			descVersNum;
+	UInt8 			hidCountryCode;
+	UInt8 			hidNumDescriptors;
+	UInt8 			hidDescriptorType;
+	UInt8 			hidDescriptorLengthLo;
+	UInt8 			hidDescriptorLengthHi;
+};
+typedef struct IOUSBHIDDescriptor	IOUSBHIDDescriptor;
+typedef IOUSBHIDDescriptor *IOUSBHIDDescriptorPtr;
+
+/*!
+    @typedef IOUSBHIDReportDesc
+    @discussion USB HID Report Descriptor header.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.  (This structure
+    should have used the #pragma pack(1) compiler directive to get byte alignment.
+*/
+struct IOUSBHIDReportDesc {
+	UInt8 			hidDescriptorType;
+	UInt8 			hidDescriptorLengthLo;	
+	UInt8 			hidDescriptorLengthHi;
+};
+typedef struct IOUSBHIDReportDesc	IOUSBHIDReportDesc;
+typedef IOUSBHIDReportDesc *		IOUSBHIDReportDescPtr;
+
+/*!
+    @typedef IOUSBDeviceQualifierDescriptor
+    @discussion USB Device Qualifier Descriptor.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+#pragma pack(1)
+struct IOUSBDeviceQualifierDescriptor
+{
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt16 			bcdUSB;
+	UInt8 			bDeviceClass;
+	UInt8 			bDeviceSubClass;
+	UInt8 			bDeviceProtocol;
+	UInt8 			bMaxPacketSize0;
+	UInt8 			bNumConfigurations;
+	UInt8 			bReserved;
+};
+typedef struct IOUSBDeviceQualifierDescriptor	IOUSBDeviceQualifierDescriptor;
+typedef IOUSBDeviceQualifierDescriptor *	IOUSBDeviceQualifierDescriptorPtr;
+#pragma options align=reset
+
+/*!
+    @typedef IOUSBDFUDescriptor
+    @discussion USB Device Firmware Update Descriptor.  See the USB Device Firmware Update Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+#pragma pack(1)
+struct IOUSBDFUDescriptor 
+{
+        UInt8 			bLength;
+        UInt8 			bDescriptorType;
+        UInt8 			bmAttributes;
+        UInt16 			wDetachTimeout;
+        UInt16 			wTransferSize;
+};
+typedef struct 	IOUSBDFUDescriptor 		IOUSBDFUDescriptor;
+typedef 		IOUSBDFUDescriptor *	IOUSBDFUDescriptorPtr;
+
+#pragma options align=reset
+
+/*!
+@typedef IOUSBInterfaceAssociationDescriptor
+ @discussion USB Inerface Association Descriptor.  ECN to the USB 2.0 Spec.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+ */
+#pragma pack(1)
+struct IOUSBInterfaceAssociationDescriptor
+{
+    UInt8 			bLength;
+    UInt8 			bDescriptorType;
+    UInt8 			bFirstInterface;
+    UInt8 			bInterfaceCount;
+    UInt8 			bFunctionClass;
+    UInt8 			bFunctionSubClass;
+    UInt8 			bFunctionProtocol;
+    UInt8			iFunction;
+};
+typedef struct IOUSBInterfaceAssociationDescriptor	IOUSBInterfaceAssociationDescriptor;
+typedef IOUSBInterfaceAssociationDescriptor *	IOUSBInterfaceAssociationDescriptorPtr;
+#pragma options align=reset
+
+/*!
+    @typedef USBStatus
+    @discussion Type used to get a DeviceStatus as a single quantity.
+*/
+typedef UInt16				USBStatus;
+typedef USBStatus *			USBStatusPtr;
+
+// These constants are obsolete
+//
+enum {
+    kIOUSBAnyClass	= 0xFFFF,
+    kIOUSBAnySubClass	= 0xFFFF,
+    kIOUSBAnyProtocol	= 0xFFFF,
+    kIOUSBAnyVendor	= 0xFFFF,
+    kIOUSBAnyProduct	= 0xFFFF
+};
+
+// This structure are obsolete
+//
+typedef struct IOUSBMatch {
+    UInt16	usbClass;
+    UInt16	usbSubClass;
+    UInt16	usbProtocol;
+    UInt16	usbVendor;
+    UInt16	usbProduct;
+} IOUSBMatch;
+
+/*!
+    @typedef IOUSBFindEndpointRequest
+    @discussion Struct used to find endpoints of an interface
+    type and direction are used to match endpoints,
+    type, direction, maxPacketSize and interval are updated
+    with the properties of the found endpoint.
+    @field type Type of endpoint: kUSBControl, kUSBIsoc, kUSBBulk, kUSBInterrupt, kUSBAnyType.  If kUSBAnyType is specified, this field is treated as a don't care.
+    @field direction Direction of endpoint: kUSBOut, kUSBIn, kUSBAnyDirn.   If kUSBAnyDirn is specified, this field is treated as a don't care.
+    @field maxPacketSize maximum packet size of endpoint.
+    @field interval Polling interval in mSec for endpoint.
+*/
+typedef struct {
+	UInt8 type;	
+	UInt8 direction;
+    UInt16 maxPacketSize;
+    UInt8 interval;
+} IOUSBFindEndpointRequest;
+
+/*!
+    @struct IOUSBDevRequest
+    @discussion Parameter block for control requests, using a simple pointer
+    for the data to be transferred.
+    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
+    @field bRequest Request code
+    @field wValue 16 bit parameter for request, host endianess
+    @field wIndex 16 bit parameter for request, host endianess
+    @field wLength Length of data part of request, 16 bits, host endianess
+    @field pData Pointer to data for request - data returned in bus endianess
+    @field wLenDone Set by standard completion routine to number of data bytes
+	actually transferred
+*/
+typedef struct {
+    UInt8       bmRequestType;
+    UInt8       bRequest;
+    UInt16      wValue;
+    UInt16      wIndex;
+    UInt16      wLength;
+    void *      pData;
+    UInt32      wLenDone;
+} IOUSBDevRequest;
+typedef IOUSBDevRequest * IOUSBDeviceRequestPtr;
+
+/*!
+    @struct IOUSBDevRequestTO
+    @discussion Parameter block for control requests with timeouts, using a simple pointer
+    for the data to be transferred.  Same as a IOUSBDevRequest except for the two extra timeout fields.
+    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
+    @field bRequest Request code
+    @field wValue 16 bit parameter for request, host endianess
+    @field wIndex 16 bit parameter for request, host endianess
+    @field wLength Length of data part of request, 16 bits, host endianess
+    @field pData Pointer to data for request - data returned in bus endianess
+    @field wLenDone Set by standard completion routine to number of data bytes
+	actually transferred
+    @field noDataTimeout Specifies a time value in milliseconds. Once the request is queued on the bus, if no data is transferred in this amount of time, the request will be aborted and returned.
+    @field completionTimeout Specifies a time value in milliseconds. Once the request is queued on the bus, if the entire request is not completed in this amount of time, the request will be aborted and returned 
+*/
+typedef struct {
+    UInt8       bmRequestType;
+    UInt8       bRequest;
+    UInt16      wValue;
+    UInt16      wIndex;
+    UInt16      wLength;
+    void *      pData;
+    UInt32      wLenDone;
+    UInt32      noDataTimeout;
+    UInt32      completionTimeout;
+} IOUSBDevRequestTO;
+
+/*!
+    @enum Default timeout values
+    @discussion default values used for data and completion timeouts.
+*/
+enum
+{
+    kUSBDefaultControlNoDataTimeoutMS = 5000,
+    kUSBDefaultControlCompletionTimeoutMS = 0
+};
+
+// Internal structure to pass parameters between IOUSBLib and UserClient
+//
+typedef struct
+{
+    UInt32      pipeRef;
+    void *      buf;
+    UInt32      size;
+    UInt32      noDataTimeout;
+    UInt32      completionTimeout;
+} IOUSBBulkPipeReq;
+
+
+#if KERNEL
+/*!
+    @struct IOUSBDevRequestDesc
+    @discussion Parameter block for control requests, using a memory descriptor
+    for the data to be transferred.  Only available in the kernel.
+    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
+    @field bRequest Request code
+    @field wValue 16 bit parameter for request, host endianess
+    @field wIndex 16 bit parameter for request, host endianess
+    @field wLength Length of data part of request, 16 bits, host endianess
+    @field pData Pointer to memory descriptor for data for request - data returned in bus endianess
+    @field wLenDone Set by standard completion routine to number of data bytes
+     actually transferred
+*/
+typedef struct {
+    UInt8                   bmRequestType;
+    UInt8                   bRequest;
+    UInt16                  wValue;
+    UInt16                  wIndex;
+    UInt16                  wLength;
+    IOMemoryDescriptor *    pData;
+    UInt32                  wLenDone;
+} IOUSBDevRequestDesc;
+
+
+/*!
+    @enum IOOptionBits
+    @discussion Parameter passed to an IOService::open() call.
+    @constant kIOUSBInterfaceOpenAlt Open the alternate interface specified when creating the interface.
+*/
+enum {
+    kIOUSBInterfaceOpenAlt	= 0x00010000
+};
+
+#endif
+
+// Internal structure to pass parameters between IOUSBLib and UserClient
+//
+// use a structure because there's a limit of 6 total arguments
+// to a user client method.
+typedef struct {
+    UInt8   	bmRequestType;
+    UInt8 	bRequest;
+    UInt16 	wValue;
+    UInt16 	wIndex;
+    UInt16	wLength;
+    void * 	pData;		// data pointer
+    UInt32	wLenDone;	// # bytes transferred
+    UInt8	pipeRef;
+} IOUSBDevReqOOL;
+
+// Internal structure to pass parameters between IOUSBLib and UserClient
+//
+typedef struct {
+    UInt8   	bmRequestType;
+    UInt8 	bRequest;
+    UInt16 	wValue;
+    UInt16 	wIndex;
+    UInt16	wLength;
+    void * 	pData;		// data pointer
+    UInt32	wLenDone;	// # bytes transferred
+    UInt8	pipeRef;
+    UInt32	noDataTimeout;
+    UInt32	completionTimeout;
+} IOUSBDevReqOOLTO;
+
+// Internal structure to pass parameters between IOUSBLib and UserClient
+//
+// Structure to request isochronous transfer
+//
+typedef struct {
+    UInt32 		fPipe;
+    void 		*fBuffer;
+    UInt32 		fBufSize;
+    UInt64 		fStartFrame;
+    UInt32 		fNumFrames;
+    IOUSBIsocFrame 	*fFrameCounts;
+} IOUSBIsocStruct;
+
+// Internal structure to pass parameters between IOUSBLib and UserClient
+//
+// Structure to request low latency isochronous transfer
+//
+struct IOUSBLowLatencyIsocStruct {
+    UInt32 			fPipe;
+    UInt32 			fBufSize;
+    UInt64 			fStartFrame;
+    UInt32 			fNumFrames;
+    UInt32			fUpdateFrequency;
+    UInt32			fDataBufferCookie;
+    UInt32			fDataBufferOffset;
+    UInt32			fFrameListBufferCookie;
+    UInt32			fFrameListBufferOffset;
+};
+
+typedef struct IOUSBLowLatencyIsocStruct IOUSBLowLatencyIsocStruct;
+
+
+/*!
+    @struct IOUSBGetFrameStruct
+    @discussion Structure used from user space to return the frame number and a timestamp on when the frame register was read.
+    @field frame frame number
+    @field timeStamp  AbsoluteTime when the frame was updated
+*/
+typedef struct {
+    UInt64			frame;
+    AbsoluteTime	timeStamp;
+} IOUSBGetFrameStruct;
+
+
+/*!
+    @struct IOUSBFindInterfaceRequest
+    @discussion Structure used with FindNextInterface.
+*/
+typedef struct {
+    UInt16	bInterfaceClass;		// requested class
+    UInt16 	bInterfaceSubClass;		// requested subclass
+    UInt16 	bInterfaceProtocol;		// requested protocol
+    UInt16	bAlternateSetting;		// requested alt setting
+} IOUSBFindInterfaceRequest;
+
+/*!
+    @enum kIOUSBFindInterfaceDontCare
+    @discussion Constant that can be used for the fields of IOUSBFindInterfaceRequest to specify that they should not be matched. 
+*/
+enum {
+        kIOUSBFindInterfaceDontCare		= 0xFFFF
+        };
+
+/*!
+    @enum kIOUSBVendorIDAppleComputer
+    @discussion USB Vendor ID for Apple Computer, Inc. 
+*/
+enum {
+	kIOUSBVendorIDAppleComputer		= 0x05AC
+        };
+
+/*!
+    @enum USBDeviceSpeed
+    @discussion Returns the speed of a particular USB device. 
+    @constant	kUSBDeviceSpeedLow	The device a low speed device.
+    @constant	kUSBDeviceSpeedFull	The device a full speed device.
+    @constant	kUSBDeviceSpeedHigh	The device a high speed device.
+*/
+enum {
+        kUSBDeviceSpeedLow		= 0,
+        kUSBDeviceSpeedFull		= 1,
+        kUSBDeviceSpeedHigh		= 2
+        };
+
+/*!
+    @enum MicrosecondsInFrame
+    @discussion Returns the number of microseconds in a USB frame. 
+    @constant	kUSBFullSpeedMicrosecondsInFrame	The device is attached to a bus running at full speed (1 ms / frame).
+    @constant	kUSBHighSpeedMicrosecondsInFrame	The device is attached to a bus running at high speed (125 microseconds / frame).
+*/
+enum {
+    kUSBFullSpeedMicrosecondsInFrame		= 1000,	
+    kUSBHighSpeedMicrosecondsInFrame		= 125
+};
+
+//  During low latency transfers, the stack will set the frStatus for each frame to this value.  A client can check that to see if the transfer has completed.  We set the frStatus to a 
+//  valid return code when the transfer completes.
+//
+enum {
+        kUSBLowLatencyIsochTransferKey	= 'llit'	// Set frStatus field of first frame in isoch transfer to designate as low latency
+    };
+    
+// This structure is DEPRECATED.  See the LowLatencyUserBufferInfoV2  
+//
+typedef struct LowLatencyUserBufferInfo LowLatencyUserBufferInfo;
+
+struct LowLatencyUserBufferInfo {
+    UInt32				cookie;
+    void *				bufferAddress;
+    IOByteCount			bufferSize;
+    UInt32				bufferType;
+    Boolean				isPrepared;
+    LowLatencyUserBufferInfo *	nextBuffer;
+};
+
+// This structure is DEPRECATED.  See the LowLatencyUserBufferInfoV3  
+
+typedef struct LowLatencyUserBufferInfoV2 LowLatencyUserBufferInfoV2;
+
+struct LowLatencyUserBufferInfoV2 
+{
+	UInt32							cookie;
+	void *							bufferAddress;
+	IOByteCount						bufferSize;
+	UInt32							bufferType;
+	Boolean							isPrepared;
+	void *							mappedUHCIAddress;
+	LowLatencyUserBufferInfoV2 *	nextBuffer;
+};
+
+	
+// This structure is used to pass information for the low latency calls between user space and the kernel.  
+//
+typedef struct LowLatencyUserBufferInfoV3 LowLatencyUserBufferInfoV3;
+
+struct LowLatencyUserBufferInfoV3 
+{
+	uint64_t						cookie;
+	mach_vm_address_t				bufferAddress;
+	mach_vm_size_t					bufferSize;
+	uint64_t						bufferType;
+	uint64_t						isPrepared;
+	mach_vm_address_t				mappedUHCIAddress;
+	LowLatencyUserBufferInfoV3 *	nextBuffer;
+};
+	
+	
+	/*!
+    @enum USBLowLatencyBufferType
+    @discussion Used to specify what kind of buffer to create when calling LowLatencyCreateBuffer(). 
+    @constant	kUSBLowLatencyWriteBuffer	The buffer will be used to write data out to a device.
+    @constant	kUSBLowLatencyReadBuffer	The buffer will be used to read data from a device.
+    @constant	kUSBLowLatencyFrameListBuffer	The buffer will be used for a low latency isoch frame list.
+*/
+typedef enum {
+    kUSBLowLatencyWriteBuffer 		= 0,
+    kUSBLowLatencyReadBuffer		= 1,
+    kUSBLowLatencyFrameListBuffer	= 2
+} USBLowLatencyBufferType;
+
+// USB User Notification Types
+//
+enum {
+    kUSBNoUserNotificationType			= 0,
+    kUSBNotEnoughPowerNotificationType		= 1,
+    kUSBIndividualOverCurrentNotificationType	= 2,
+    kUSBGangOverCurrentNotificationType		= 3
+};
+
+/*!
+    @defined Property Definitions
+    @discussion Useful property names in USB land. 
+*/
+#define kUSBDevicePropertySpeed                 "Device Speed"
+#define kUSBDevicePropertyBusPowerAvailable     "Bus Power Available"
+#define kUSBDevicePropertyAddress               "USB Address"
+#define kUSBDevicePropertyLocationID            "locationID"
+#define kUSBProductIDMask						"idProductMask"
+#define kUSBPreferredConfiguration				"Preferred Configuration"
+#define kUSBSuspendPort							"kSuspendPort"
+#define kUSBExpressCardCantWake					"ExpressCardCantWake"
+#define kUSBControllerNeedsContiguousMemoryForIsoch	"Need contiguous memory for isoch"
+#define kUSBHubDontAllowLowPower				"kUSBHubDontAllowLowPower"
+#define kUSBDeviceResumeRecoveryTime			"kUSBDeviceResumeRecoveryTime"
+#define kUSBOutOfSpecMPSOK						"Out of spec MPS OK"
+#define kConfigurationDescriptorOverride		"ConfigurationDescriptorOverride"
+#define kOverrideIfAtLocationID					"OverrideIfAtLocationID"
+
+/*!
+@enum USBReEnumerateOptions
+ @discussion Options used when calling ReEnumerateDevice. 
+ @constant	kUSBAddExtraResetTimeBit	Setting this bit will cause the Hub driver to wait 100ms before addressing the device after the reset following the re-enumeration.
+ */
+typedef enum {
+    kUSBAddExtraResetTimeBit 		= 31,
+    kUSBAddExtraResetTimeMask		= ( 1 << kUSBAddExtraResetTimeBit)
+} USBReEnumerateOptions;
+
+/*!
+ @enum USBDeviceInformationBits
+ @discussion 	GetUSBDeviceInformation will return a unit32_t value with bits set indicating that a particular state is present in the USB device.  These bits are described here 
+ 
+ @constant	kUSBInformationDeviceIsCaptiveBit			The USB device is directly attached to its hub and cannot be removed.
+ @constant	kUSBInformationDeviceIsAttachedToRootHubBit	The USB device is directly attached to the root hub
+ @constant	kUSBInformationDeviceIsInternalBit			The USB device is internal to the computer (all the hubs it attaches to are captive)
+ @constant	kUSBInformationDeviceIsConnectedBit			The USB device is connected to its hub
+ @constant	kUSBInformationDeviceIsEnabledBit			The hub port to which the USB device is attached is enabled
+ @constant	kUSBInformationDeviceIsSuspendedBit			The hub port to which the USB device is attached is suspended
+ @constant	kUSBInformationDeviceIsInResetBit			The hub port to which the USB device is attached is being reset
+ @constant	kUSBInformationDeviceOvercurrentBit			The USB device generated an overcurrent
+ @constant	kUSBInformationDevicePortIsInTestModeBit	The hub port to which the USB device is attached is in test mode
+ @constant  kUSBInformationDeviceIsRootHub				The device is actually the root hub simulation
+ @constant  kUSBInformationRootHubisBuiltIn				If this is a root hub simulation and it's built into the machine, this bit is set.  If it's on an expansion card, it will be cleared
+ 
+ */
+	typedef enum {
+		kUSBInformationDeviceIsCaptiveBit				= 0,
+		kUSBInformationDeviceIsAttachedToRootHubBit		= 1,
+		kUSBInformationDeviceIsInternalBit				= 2,
+		kUSBInformationDeviceIsConnectedBit				= 3,
+		kUSBInformationDeviceIsEnabledBit				= 4,
+		kUSBInformationDeviceIsSuspendedBit				= 5,
+		kUSBInformationDeviceIsInResetBit				= 6,
+		kUSBInformationDeviceOvercurrentBit				= 7,
+		kUSBInformationDevicePortIsInTestModeBit		= 8,
+		kUSBInformationDeviceIsRootHub					= 9,
+		kUSBInformationRootHubisBuiltIn					= 10,
+		kUSBInformationDeviceIsRemote					= 11,
+		kUSBInformationDeviceIsCaptiveMask				= (1 << kUSBInformationDeviceIsCaptiveBit),
+		kUSBInformationDeviceIsAttachedToRootHubMask	= (1 << kUSBInformationDeviceIsAttachedToRootHubBit),
+		kUSBInformationDeviceIsInternalMask				= (1 << kUSBInformationDeviceIsInternalBit),
+		kUSBInformationDeviceIsConnectedMask			= (1 << kUSBInformationDeviceIsConnectedBit),
+		kUSBInformationDeviceIsEnabledMask				= (1 << kUSBInformationDeviceIsEnabledBit),
+		kUSBInformationDeviceIsSuspendedMask			= (1 << kUSBInformationDeviceIsSuspendedBit),
+		kUSBInformationDeviceIsInResetMask				= (1 << kUSBInformationDeviceIsInResetBit),
+		kUSBInformationDeviceOvercurrentMask			= (1 << kUSBInformationDeviceOvercurrentBit),
+		kUSBInformationDevicePortIsInTestModeMask		= (1 << kUSBInformationDevicePortIsInTestModeBit),
+		kUSBInformationDeviceIsRootHubMask				= (1 << kUSBInformationDeviceIsRootHub),
+		kUSBInformationRootHubisBuiltInMask				= (1 << kUSBInformationRootHubisBuiltIn),
+		kUSBInformationDeviceIsRemoteMask				= (1 << kUSBInformationDeviceIsRemote)
+	} USBDeviceInformationBits;
+	
+	/*!
+	 @enum USBPowerRequestTypes
+	 @discussion Used to specify what kind of power will be reserved using the IOUSBDevice RequestExtraPower and ReturnExtraPower APIs. 
+	 @constant	kUSBPowerDuringSleep	The power is to be used during sleep.
+	 @constant	kUSBPowerDuringWake		The power is to be used while the system is awake (i.e not sleeping)
+	 */
+	typedef enum {
+		kUSBPowerDuringSleep 		= 0,
+		kUSBPowerDuringWake			= 1
+	} USBPowerRequestTypes;
+	
+	// Apple specific properties
+#define kAppleCurrentAvailable		"AAPL,current-available"
+#define kAppleCurrentInSleep		"AAPL,current-in-sleep"
+#define kAppleCurrentExtra			"AAPL,current-extra"
+#define kAppleInternalUSBDevice		"AAPL,device-internal"
+#define kUSBBusID					"AAPL,bus-id"
+	
+
+#ifdef __cplusplus
+}       
+#endif
+
+#endif /* _USB_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/USBHub.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/USBHub.h.svn-base
new file mode 100644
index 0000000..4bbda15
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/USBHub.h.svn-base
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _USBHUB_H
+#define _USBHUB_H
+
+#include <IOKit/usb/USB.h>
+#include <IOKit/usb/USBSpec.h>
+
+    /*!
+    @header     USBHub.h
+     @abstract  Constants and definitions used with Hub devices.
+     @discussion    
+     */
+
+    /*!
+    @enum Hub Descriptor Type
+    @discussion
+    */
+enum {
+    kUSBHubDescriptorType       = 0x29
+};
+
+    /*!
+    @enum HubFeatures
+    @discussion Used with SET_FEATURE to set hub and port features
+    */
+enum {
+                            
+    kUSBHubLocalPowerChangeFeature      = 0,    /* Hub features */
+    kUSBHubOverCurrentChangeFeature     = 1,
+
+    kUSBHubPortConnectionFeature        = 0,    /* port features */
+    kUSBHubPortEnableFeature            = 1,
+    kUSBHubPortSuspendFeature           = 2,
+    kUSBHubPortOverCurrentFeature       = 3,
+    kUSBHubPortResetFeature             = 4,
+    kUSBHubPortPowerFeature             = 8,
+    kUSBHubPortLowSpeedFeature          = 9,
+    kUSBHubPortConnectionChangeFeature  = 16,
+    kUSBHubPortEnableChangeFeature      = 17,
+    kUSBHubPortSuspendChangeFeature     = 18,
+    kUSBHubPortOverCurrentChangeFeature = 19,
+    kUSBHubPortResetChangeFeature       = 20,
+    kUSBHubPortTestFeature				= 21,
+	kUSBHubPortIndicatorFeature			= 22
+};
+
+    /*!
+    @enum HubPortStatus
+    @discussion Used to decode the Port Status and Change 
+    */
+enum {
+    kHubPortConnection		= 0x0001,
+    kHubPortEnabled			= 0x0002,
+    kHubPortSuspend			= 0x0004,
+    kHubPortOverCurrent		= 0x0008,
+    kHubPortBeingReset		= 0x0010,
+    kHubPortPower			= 0x0100,
+    kHubPortLowSpeed		= 0x0200,
+    kHubPortHighSpeed		= 0x0400,
+    kHubPortTestMode		= 0x0800,
+    kHubPortIndicator		= 0x1000,
+
+    // these are the bits which cause the hub port state machine to keep moving
+    kHubPortStateChangeMask		= kHubPortConnection | kHubPortEnabled | kHubPortSuspend | kHubPortOverCurrent | kHubPortBeingReset
+};
+
+
+    /*!
+    @enum HubStatus
+    @discussion Used to decode the Hub Status and Change 
+    */
+enum {
+    kHubLocalPowerStatus        = 1,
+    kHubOverCurrentIndicator    = 2,
+    kHubLocalPowerStatusChange  = 1,
+    kHubOverCurrentIndicatorChange  = 2
+};
+
+    /*!
+    @enum HubCharacteristics
+    @discussion 
+    */
+enum {
+    kPerPortSwitchingBit    = (1 << 0),
+    kNoPowerSwitchingBit    = (1 << 1),
+    kCompoundDeviceBit      = (1 << 2),
+    kPerPortOverCurrentBit  = (1 << 3),
+    kNoOverCurrentBit       = (1 << 4),
+	
+	kHubPortIndicatorBit	= 7,
+	kHubPortIndicatorMask	= 0x0080
+};
+
+/*!
+@enum PowerSwitching
+ @discussion 
+ */
+enum {
+	kHubSupportsGangPower	= 0,
+	kHubSupportsIndividualPortPower = 1,
+	kHubPortSetPowerOff		= 0,
+	kHubPortSetPowerOn		= 1
+};
+
+/*!
+@enum PortIndicatorSelectors
+ @discussion 
+ */
+enum {
+	kHubPortIndicatorAutomatic	= 0,
+	kHubPortIndicatorAmber,
+	kHubPortIndicatorGreen,
+	kHubPortIndicatorOff
+};
+
+/*!
+ @enum Root Hub specific 
+ @discussion 
+ */
+enum {
+	kPrdRootHubApple			= 0x8005,	// ProductID for classic speed root hubs
+	kPrdRootHubAppleE			= 0x8006,	// ProductID for high speed root hubs
+	kUSBRootHubPollingRate		= 32		// Enpoint polling rate interval for root hubs
+};
+
+/*!
+@enum Hub Device Requests
+@discussion  Encoding of the hub specific standard requests
+<tt>
+<pre><b>
+Request          bmRequestType bRequest       wValue  wIndex wLength Data</b>
+ClearHubFeature  0010 0000B    CLEAR_FEATURE  Feature Zero    Zero   None
+ClearPortFeature 0010 0011B                   Feature Port    Zero   None
+
+GetBusState      1010 0011B    GET_STATE      Zero    Port    One    Port Bus State
+
+GetHubDescriptor 1010 0000B    GET_DESCRIPTOR Type    Zero    Length Descriptor
+
+GetHubStatus     1010 0000B    GET_STATUS     Zero    Zero    Four   Hub Status
+GetPortStatus    1010 0011B                   Zero    Port    Four   Port Status
+
+SetHubDescriptor 0010 0000B    SET_DESCRIPTOR Type    Zero    Length Descriptor
+
+SetHubFeature    0010 0000B    SET_FEATURE    Feature Zero    Zero   None
+SetPortFeature   0010 0011B                   Feature Port    Zero   None
+</pre>
+</tt>
+    */
+enum {
+    kClearHubFeature  = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBClass, kUSBDevice),
+    kClearPortFeature = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBClass, kUSBOther),
+    kGetPortState     = EncodeRequest(kUSBRqGetState,      kUSBIn,  kUSBClass, kUSBOther),
+    kGetHubDescriptor = EncodeRequest(kUSBRqGetDescriptor, kUSBIn,  kUSBClass, kUSBDevice),
+    kGetHubStatus     = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBClass, kUSBDevice),
+    kGetPortStatus    = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBClass, kUSBOther),
+    kSetHubDescriptor = EncodeRequest(kUSBRqGetDescriptor, kUSBOut, kUSBClass, kUSBDevice),
+    kSetHubFeature    = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBClass, kUSBDevice),
+    kSetPortFeature   = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBClass, kUSBOther)
+};
+
+
+/*!
+    @typedef IOUSBHubDescriptor
+    @discussion USB Hub Descriptor.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+struct IOUSBHubDescriptor {
+    UInt8   length;
+    UInt8   hubType;
+    UInt8   numPorts;
+    UInt16  characteristics __attribute__((packed));
+    UInt8   powerOnToGood;  /* Port settling time, in 2ms */
+    UInt8   hubCurrent;
+    /* These are received packed, will have to be unpacked */
+    UInt8   removablePortFlags[8];
+    UInt8   pwrCtlPortFlags[8];
+};
+
+typedef struct IOUSBHubDescriptor IOUSBHubDescriptor;
+
+/*!
+    @typedef IOUSBHubStatus
+    @discussion Used to get the port status and change flags using GetPortStatus()
+*/
+struct IOUSBHubStatus {
+    UInt16          statusFlags;
+    UInt16          changeFlags;
+};
+typedef struct IOUSBHubStatus   IOUSBHubStatus;
+typedef IOUSBHubStatus *    IOUSBHubStatusPtr;
+
+typedef struct IOUSBHubStatus   IOUSBHubPortStatus;
+
+
+/*!
+    @typedef IOUSBHubPortReEnumerateParam
+    @discussion Used to specify the port that needs to be reenumerated
+*/
+typedef struct IOUSBHubPortReEnumerateParam IOUSBHubPortReEnumerateParam;
+
+struct IOUSBHubPortReEnumerateParam {
+    UInt32   portNumber;
+    UInt32   options;
+};
+
+typedef struct IOUSBHubPortClearTTParam IOUSBHubPortClearTTParam;
+
+struct IOUSBHubPortClearTTParam {
+    UInt32	 portNumber;
+    UInt32	 options;
+#if 0
+    UInt8 	 deviceAddress;  <<0
+	UInt8	 endpointNum;    <<8
+	UInt8 	 endpointType;	 <<16 // As split transaction. 00 Control, 10 Bulk
+	UInt8 	 IN;		 <<24 // Direction, 1 = IN, 0 = OUT
+#endif
+};
+
+#endif /* _USBHUB_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/USBSpec.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/USBSpec.h.svn-base
new file mode 100644
index 0000000..0665819
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/USBSpec.h.svn-base
@@ -0,0 +1,470 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+/*
+ * Constants that both OS9 and OSX want to define, and whose values are
+ * specified by the USB Standard.
+ * Put in a seperate file so they can be included if the OS9 include file isn't already
+ * included.
+ */
+#ifndef _USBSPEC_H
+#define _USBSPEC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /*!
+    @header     USBSpec.h
+     @abstract  Constants and definitions of parameters that are used in communcating with USB devices and interfaces.
+     @discussion    
+     */
+
+    /*!
+    @enum Endpoint type
+    @discussion Used in IOUSBFindEndpointRequest's type field
+    */
+enum {
+    kUSBControl     = 0,
+    kUSBIsoc        = 1,
+    kUSBBulk        = 2,
+    kUSBInterrupt   = 3,
+    kUSBAnyType     = 0xFF
+};
+
+    /*!
+    @enum Endpoint direction
+    @discussion Used in IOUSBFindEndpointRequest's direction field
+    */
+enum {
+    kUSBOut         = 0,
+    kUSBIn          = 1,
+    kUSBNone        = 2,
+    kUSBAnyDirn     = 3
+};
+
+    /*!
+    @enum Device Request Type
+    @discussion This type is encoded in the bmRequestType field of a Device Request.  It specifies the type of request: standard, class or vendor specific.
+    */
+enum {
+    kUSBStandard    = 0,
+    kUSBClass       = 1,
+    kUSBVendor      = 2
+};
+
+    /*!
+    @enum Device Request Recipient
+    @discussion This recipient is encoded in the bmRequestType field of a Device Request.  It specifies the type of recipient for a request:  the device, the interface, or an endpoint.
+    */
+enum {
+    kUSBDevice      = 0,
+    kUSBInterface   = 1,
+    kUSBEndpoint    = 2,
+    kUSBOther       = 3
+};
+
+    /*!
+    @enum Device Request
+    @discussion Specifies values for the bRequest field of a Device Request.
+    */
+enum {
+    kUSBRqGetStatus     = 0,
+    kUSBRqClearFeature  = 1,
+    kUSBRqGetState      = 2,
+    kUSBRqSetFeature    = 3,
+    kUSBRqReserved2     = 4,
+    kUSBRqSetAddress    = 5,
+    kUSBRqGetDescriptor = 6,
+    kUSBRqSetDescriptor = 7,
+    kUSBRqGetConfig     = 8,
+    kUSBRqSetConfig     = 9,
+    kUSBRqGetInterface  = 10,
+    kUSBRqSetInterface  = 11,
+    kUSBRqSyncFrame     = 12
+};
+
+    /*!
+    @enum USB Descriptors
+    @discussion Specifies values for diffent descriptor types.
+    */
+enum {
+    kUSBAnyDesc             = 0,    // Wildcard for searches
+    kUSBDeviceDesc          = 1,
+    kUSBConfDesc            = 2,
+    kUSBStringDesc          = 3,
+    kUSBInterfaceDesc       = 4,
+    kUSBEndpointDesc        = 5,
+    kUSBDeviceQualifierDesc = 6,
+    kUSBOtherSpeedConfDesc  = 7,
+    kUSBInterfacePowerDesc  = 8,
+    kUSBOnTheGoDesc	    = 9,
+    kUSDebugDesc	    = 10,
+    kUSBInterfaceAssociationDesc 	= 11,
+    kUSBHIDDesc             		= 0x21,
+    kUSBReportDesc          		= 0x22,
+    kUSBPhysicalDesc        		= 0x23,
+    kUSBHUBDesc             		= 0x29
+};
+
+    /*!
+    @enum Feature Selectors
+    @discussion Used with SET/CLEAR_FEATURE requests.
+    */
+enum {
+        kUSBFeatureEndpointStall = 0,
+        kUSBFeatureDeviceRemoteWakeup = 1
+}; 
+
+    /*!
+    @enum USB Power constants
+    @discussion Constants relating to USB Power.
+    */
+enum {
+    kUSB100mAAvailable  = 50,
+    kUSB500mAAvailable  = 250,
+    kUSB100mA           = 50,
+    kUSBAtrBusPowered   = 0x80,
+    kUSBAtrSelfPowered  = 0x40,
+    kUSBAtrRemoteWakeup = 0x20
+};
+
+    /*!
+    @enum USB Release constants
+    @discussion Constants relating to USB releases as found in the bcdUSB field of the Device Descriptor.
+    */
+enum {
+    kUSBRel10       = 0x0100,
+    kUSBRel11       = 0x0110,
+    kUSBRel20       = 0x0200
+};
+
+
+    /*!
+    @enum HID requests
+    @discussion Constants for HID requests.
+    */
+enum {
+    kHIDRqGetReport     = 1,
+    kHIDRqGetIdle       = 2,
+    kHIDRqGetProtocol   = 3,
+    kHIDRqSetReport     = 9,
+    kHIDRqSetIdle       = 10,
+    kHIDRqSetProtocol   = 11
+};
+
+    /*!
+    @enum HID report types
+    @discussion Constants for the three kinds of HID reports.
+    */
+enum {
+    kHIDRtInputReport       = 1,
+    kHIDRtOutputReport      = 2,
+    kHIDRtFeatureReport     = 3
+};
+
+
+    /*!
+    @enum HID Protocol
+    @discussion  Used in the SET_PROTOCOL device request
+    */
+enum {
+    kHIDBootProtocolValue   = 0,
+    kHIDReportProtocolValue = 1
+};
+
+
+
+enum {
+    kUSBCapsLockKey         = 0x39,
+    kUSBNumLockKey          = 0x53,
+    kUSBScrollLockKey       = 0x47
+};
+
+/*!
+@enum Device Class Codes
+ @discussion Constants for USB Device classes (bDeviceClass).
+ */
+enum {
+    kUSBCompositeClass          	= 0,
+    kUSBCommClass               	= 2,		// Deprecated
+    kUSBCommunicationClass			= 2,	
+    kUSBHubClass                	= 9,
+    kUSBDataClass               	= 10,
+	kUSBPersonalHealthcareClass		= 15,
+    kUSBDiagnosticClass				= 220,
+    kUSBWirelessControllerClass 	= 224,
+    kUSBMiscellaneousClass			= 239,
+    kUSBApplicationSpecificClass 	= 254,
+    kUSBVendorSpecificClass     	= 255
+};
+
+/*!
+@enum Interface Class
+ @discussion Constants for Interface classes (bInterfaceClass).
+ */
+enum {
+    kUSBAudioClass							= 1,		// Deprecated
+    kUSBAudioInterfaceClass					= 1,
+
+    kUSBCommunicationControlInterfaceClass	= 2,
+    kUSBCommunicationDataInterfaceClass		= 10,
+
+    kUSBHIDClass							= 3,
+    kUSBHIDInterfaceClass					= 3,
+
+    kUSBPhysicalInterfaceClass				= 5,
+
+    kUSBImageInterfaceClass					= 6,
+
+    kUSBPrintingClass						= 7,		// Deprecated
+    kUSBPrintingInterfaceClass				= 7,
+
+    kUSBMassStorageClass					= 8,		// Deprecated
+    kUSBMassStorageInterfaceClass			= 8,
+
+    kUSBChipSmartCardInterfaceClass			= 11,
+    
+    kUSBContentSecurityInterfaceClass 		= 13,
+    
+    kUSBVideoInterfaceClass					= 14,
+	
+	kUSBPersonalHealthcareInterfaceClass	= 15,
+    
+    kUSBDiagnosticDeviceInterfaceClass 		= 220,
+
+    kUSBWirelessControllerInterfaceClass	= 224,
+
+    kUSBApplicationSpecificInterfaceClass	= 254,
+    
+    kUSBVendorSpecificInterfaceClass     	= 255
+};
+
+// Obsolete
+enum {
+        
+    kUSBDisplayClass            = 4,		// Obsolete
+};
+
+/*!
+    @enum Interface SubClass
+    @discussion Constants for USB Interface SubClasses (bInterfaceSubClass).
+*/
+enum {
+    kUSBCompositeSubClass               = 0,
+    
+    kUSBHubSubClass                     = 0,
+
+    // For the kUSBAudioInterfaceClass
+    //
+    kUSBAudioControlSubClass		= 0x01,
+    kUSBAudioStreamingSubClass		= 0x02,
+    kUSBMIDIStreamingSubClass		= 0x03,
+    
+    // For the kUSBApplicationSpecificInterfaceClass
+    //
+    kUSBDFUSubClass                     = 0x01,
+    kUSBIrDABridgeSubClass              = 0x02,
+    kUSBTestMeasurementSubClass		= 0x03,
+
+    // For the kUSBMassStorageInterfaceClass
+    //
+    kUSBMassStorageRBCSubClass          = 0x01,
+    kUSBMassStorageATAPISubClass        = 0x02,
+    kUSBMassStorageQIC157SubClass       = 0x03,
+    kUSBMassStorageUFISubClass          = 0x04,
+    kUSBMassStorageSFF8070iSubClass     = 0x05,
+    kUSBMassStorageSCSISubClass         = 0x06,
+
+    // For the kUSBHIDInterfaceClass
+    //
+    kUSBHIDBootInterfaceSubClass        = 0x01,
+
+    // For the kUSBCommunicationDataInterfaceClass
+    //
+    kUSBCommDirectLineSubClass          = 0x01,
+    kUSBCommAbstractSubClass            = 0x02,
+    kUSBCommTelephoneSubClass           = 0x03,
+    kUSBCommMultiChannelSubClass        = 0x04,
+    kUSBCommCAPISubClass                = 0x05,
+    kUSBCommEthernetNetworkingSubClass  = 0x06,
+    kUSBATMNetworkingSubClass           = 0x07,
+
+    // For the kUSBDiagnosticDeviceInterfaceClass
+    //
+    kUSBReprogrammableDiagnosticSubClass	= 0x01,
+
+    // For the kUSBWirelessControllerInterfaceClass
+    //
+    kUSBRFControllerSubClass		= 0x01,
+
+    // For the kUSBMiscellaneousClass
+    //
+    kUSBCommonClassSubClass		= 0x02,
+
+    // For the kUSBVideoInterfaceClass
+    //
+    kUSBVideoControlSubClass		= 0x01,
+    kUSBVideoStreamingSubClass		= 0x02,
+    kUSBVideoInterfaceCollectionSubClass = 0x03
+    
+};
+
+/*!
+@enum	Interface Protocol
+ @discussion Reported in the bInterfaceProtocol field of the Interface Descriptor.
+ */
+enum {
+
+    // For kUSBHIDInterfaceClass
+    //
+    kHIDNoInterfaceProtocol		= 0,
+    kHIDKeyboardInterfaceProtocol	= 1,
+    kHIDMouseInterfaceProtocol		= 2,
+    kUSBVendorSpecificProtocol		= 0xff,
+
+    // For kUSBDiagnosticDeviceInterfaceClass
+    //
+    kUSB2ComplianceDeviceProtocol	= 0x01,
+
+    // For kUSBWirelessControllerInterfaceClass
+    //
+    kUSBBluetoothProgrammingInterfaceProtocol	= 0x01,
+
+    // For kUSBMiscellaneousClass
+    //
+    KUSBInterfaceAssociationDescriptorProtocol	= 0x01
+    
+};
+
+
+/*!
+    @enum DFU Class Attributes
+    @discussion 
+*/
+enum {
+    kUSBDFUAttributesMask       = 0x07,
+    kUSBDFUCanDownloadBit       = 0,
+    kUSBDFUCanUploadBit         = 1,
+    kUSBDFUManifestationTolerantBit     = 2
+};
+
+/*!
+ @enum Printer Class Requests
+ @discussion The bRequest parameter for Printing Class Sepcific Requests
+ */
+enum {
+	kUSPrintingClassGetDeviceID		= 0,
+	kUSPrintingClassGePortStatus	= 1,
+	kUSPrintingClassSoftReset		= 2
+};
+
+	/*!
+@enum Endpoint Descriptor bits
+ @discussion Bit definitions for endpoint descriptor fields
+ */
+enum {
+    kUSBbEndpointAddressMask				= 0x0f,
+    kUSBbEndpointDirectionBit				= 7,
+    kUSBbEndpointDirectionMask				= ( 1 << kUSBbEndpointDirectionBit ),
+    kUSBEndpointDirectionOut				= 0x00,
+    kUSBEndpointDirectionIn				= 0x80,
+    kUSBEndpointbmAttributesTransferTypeMask		= 0x03,
+    kUSBEndpointbmAttributesSynchronizationTypeMask	= 0x0c,
+    kUSBEndpointbmAttributesSynchronizationTypeShift	= 2,
+    kUSBEndpointbmAttributesUsageTypeMask		= 0x30,
+    kUSBEndpointbmAttributesUsageTypeShift		= 4
+};
+
+	/*!
+	 @defineblock USB Descriptor and IORegistry constants
+	 @discussion 	Various constants used to describe the fields in the various USB Device Descriptors and IORegistry names used for some of those fields 
+	 
+	 @define	kUSBDeviceClass				The field in the USB Device Descriptor corresponding to the device class
+	 @define	kUSBDeviceSubClass			The field in the USB Device Descriptor corresponding to the device sub class
+	 @define	kUSBDeviceProtocol			The field in the USB Device Descriptor corresponding to the device protocol
+	 @define	kUSBDeviceMaxPacketSize		The field in the USB Device Descriptor corresponding to the maximum packet size for endpoint 0
+	 @define	kUSBVendorID				The field in the USB Device Descriptor corresponding to the device USB Vendor ID
+	 @define	kUSBVendorName				Deprecated.  Use kUSBVendorID 
+	 @define	kUSBProductID				The field in the USB Device Descriptor corresponding to the device USB Product ID
+	 @define	kUSBProductName				Deprecated.  Use kUSBProductID
+	 @define	kUSBDeviceReleaseNumber		The field in the USB Device Descriptor corresponding to the device release version
+	 @define	kUSBManufacturerStringIndex	The field in the USB Device Descriptor corresponding to the index for the manufacturer's string
+	 @define	kUSBProductStringIndex		The field in the USB Device Descriptor corresponding to the index for the product name's string
+	 @define	kUSBSerialNumberStringIndex	The field in the USB Device Descriptor corresponding to the index for the serial number's string
+	 @define	kUSBDeviceNumConfigs		The field in the USB Configuration Descriptor corresponding to the number of configurations
+	 @define	kUSBInterfaceNumber			The field in the USB Configuration Descriptor corresponding to the number of configurations
+	 @define	kUSBAlternateSetting		The field in the USB Configuration Descriptor corresponding to the number of configurations
+	 @define	kUSBNumEndpoints			The field in the USB Configuration Descriptor corresponding to the number of configurations
+	 @define	kUSBInterfaceClass			The field in the USB Interface Descriptor corresponding to the interface class
+	 @define	kUSBInterfaceSubClass		The field in the USB Interface Descriptor corresponding to the interface sub class
+	 @define	kUSBInterfaceProtocol		The field in the USB Interface Descriptor corresponding to the interface protocol
+	 @define	kUSBInterfaceStringIndex	The field in the USB Interface Descriptor corresponding to the index for the interface name's string
+	 @define	kUSBConfigurationValue		The field in the USB Interface Descriptor corresponding to the configuration
+	 @define	kUSBProductString			IORegistry key for the device's USB Product string
+	 @define	kUSBVendorString			IORegistry key for the device's USB manufacturer string
+	 @define	kUSBSerialNumberString		IORegistry key for the device's USB serial number string
+	 @define	kUSB1284DeviceID			IORegistry key for the 1284 Device ID of a printer
+	 
+	 */
+#define kUSBDeviceClass             "bDeviceClass"
+#define kUSBDeviceSubClass          "bDeviceSubClass"
+#define kUSBDeviceProtocol          "bDeviceProtocol"
+#define kUSBDeviceMaxPacketSize     "bMaxPacketSize0"
+#define kUSBVendorID                "idVendor"          // good name
+#define kUSBVendorName              kUSBVendorID        // bad name - keep for backward compatibility
+#define kUSBProductID               "idProduct"         // good name
+#define kUSBProductName             kUSBProductID       // bad name - keep for backward compatibility
+#define kUSBDeviceReleaseNumber     "bcdDevice"
+#define kUSBManufacturerStringIndex "iManufacturer"
+#define kUSBProductStringIndex      "iProduct"
+#define kUSBSerialNumberStringIndex "iSerialNumber"
+#define kUSBDeviceNumConfigs        "bNumConfigurations"
+#define kUSBInterfaceNumber         "bInterfaceNumber"
+#define kUSBAlternateSetting        "bAlternateSetting"
+#define kUSBNumEndpoints            "bNumEndpoints"
+#define kUSBInterfaceClass          "bInterfaceClass"
+#define kUSBInterfaceSubClass       "bInterfaceSubClass"
+#define kUSBInterfaceProtocol       "bInterfaceProtocol"
+#define kUSBInterfaceStringIndex    "iInterface"
+#define kUSBConfigurationValue      "bConfigurationValue"
+#define kUSBProductString			"USB Product Name"	
+#define kUSBVendorString			"USB Vendor Name"
+#define kUSBSerialNumberString		"USB Serial Number"
+#define kUSB1284DeviceID			"1284 Device ID"
+ /*! @/defineblock */
+	
+	/*!
+    @enum Apple USB Vendor ID
+    @discussion Apple's vendor ID, assigned by the USB-IF
+*/
+enum {
+	kAppleVendorID      = 0x05AC
+};
+	
+#ifdef __cplusplus
+}       
+#endif
+
+#endif /* _USBSPEC_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/USBTracepoints.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/USBTracepoints.h.svn-base
new file mode 100644
index 0000000..f2fe81e
--- /dev/null
+++ b/i386/include/IOKit/usb/.svn/text-base/USBTracepoints.h.svn-base
@@ -0,0 +1,662 @@
+/*
+ * Copyright � 2009 Apple Inc.  All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __IOKIT_IO_USB_FAMILY_TRACEPOINTS__
+#define __IOKIT_IO_USB_FAMILY_TRACEPOINTS__
+
+#include <IOKit/IOTypes.h>
+
+#include <sys/kdebug.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+	
+#define USB_SYSCTL			"debug.USB"
+#define kUSBTypeDebug		'USBD'
+#define DEBUG_UNUSED( X )	( void )( X )
+	
+	extern UInt32 gUSBStackDebugFlags;
+	
+	typedef struct USBSysctlArgs
+		{
+			uint32_t		type;
+			uint32_t		operation;
+			uint32_t		debugFlags;
+		} USBSysctlArgs;
+	
+	enum
+	{
+		kUSBOperationGetFlags 	= 0,
+		kUSBOperationSetFlags	= 1
+	};
+	
+	// the following bits/masks are for use in the usb boot args
+	// e.g. boot-args="usb=0x102" will turn on Trace Points and set the EHCI retry count to 1
+	// the bits can also be set with a sysctl call
+	enum
+	{
+		kUSBEnableDebugLoggingBit		= 0,	// bit 0 currently not used
+		kUSBEnableTracePointsBit		= 1,	// bit 1 used to turn on Trace Points when a USB controller first loads
+		kUSBEnableErrorLogBit			= 2,	// bit 2 (4) turns level 1 log for errors
+		kUSBDebugRetryCountShift		= 8,	// bits 8 and 9 will set the retry count for low level bus transactions
+		kUSBDebugRetryCountReserved		= 9,	// must be 1, 2, or 3 (0 is invalid, 3 is the default)
+		
+		kUSBEnableDebugLoggingMask		= (1 << kUSBEnableDebugLoggingBit),
+		kUSBEnableTracePointsMask		= (1 << kUSBEnableTracePointsBit),
+		kUSBDebugRetryCountMask			= (3 << kUSBDebugRetryCountShift),
+		kUSBEnableErrorLogMask				= (1 << kUSBEnableErrorLogBit)
+	};
+	
+	
+	/* Kernel Tracepoints
+	 *
+	 * Kernel tracepoints are a logging mechanism reduces the size of a log-laden binary.
+	 * Codes are placed into a buffer, from the kernel, and picked up by a userspace
+	 * tool that displays a unique log message for each tracepoint. Additionally, each
+	 * tracepoint may contain up-to four 32-bit (may change with LP64) arguments. 
+	 *
+	 * To add a tracepoint, use the code below as an example:
+	 * USBTrace( kUSBTController, kTPControllerStart, (uintptr_t)myArgValue );
+	 * Next, add the corresponding tracepoint code in the USBTracer tool, using
+	 * the existing examples. Avoid using confidential information in the log strings.
+	 * Some functions have a argument counter, to signify which of the function's tracepoints
+	 * are actually being logged. When adding a tracepoint using an existing code, you
+	 * must verify that you increment this argument counter properly.
+	 *
+	 * The trace codes consist of the following:
+	 *
+	 * ----------------------------------------------------------------------
+	 *| Class (8)      | SubClass (8)   | USBGroup(6) | Code (8)    |Func   |
+	 *| DBG_IOKIT      | DBG_IOUSB      |             |             |Qual(2)|
+	 * ----------------------------------------------------------------------
+	 *
+	 * DBG_IOKIT(05h)  DBG_IOUSB(2Dh)
+	 *
+	 * See <sys/kdebug.h> and IOTimeStamp.h for more details.
+	 */
+	
+	
+	// USB groupings (max of 64)
+	enum
+	{
+		// Family groupings
+		kUSBTController				= 0,
+		kUSBTControllerUserClient	= 1,
+		
+		kUSBTDevice					= 2,
+		kUSBTDeviceUserClient		= 3,
+
+		kUSBTHub					= 4,
+		kUSBTHubPort				= 5,
+		kUSBTHSHubUserClient		= 6,
+		kUSBTHID					= 7,
+		kUSBTPipe					= 8,
+
+		kUSBTInterfaceUserClient	= 9,
+		
+		kUSBTEnumeration				= 10,		// Tracepoints in various components to debug USB enumeration
+
+		
+		// UIM groupings
+		kUSBTUHCI					= 11,
+		kUSBTUHCIUIM				= 12,
+		kUSBTUHCIInterrupts			= 13,
+
+		kUSBTOHCI					= 14,
+		kUSBTOHCIInterrupts			= 15,
+		
+		kUSBTEHCI					= 20,
+		kUSBTEHCIHubInfo			= 22,
+		kUSBTEHCIInterrupts			= 23,
+		
+		// 30-33 reserved
+
+		// 21-25 reserved
+		kUSBTHubPolicyMaker			= 35,
+		kUSBTCompositeDriver		= 36,
+		
+		// Actions
+		kUSBTOutstandingIO			= 42,
+
+		// kUSBAudio
+		kUSBAudio					= 50
+
+		// 61-63 reserved
+	};
+	
+	// USB Controller Tracepoints		0x052D0000 - 0x052D03FF
+	// kUSBTController
+	enum
+	{
+		kTPControllerStart							= 1,
+		kTPControllerControlPacketHandler			= 2,
+		kTPControllerMakeDevice						= 3,
+		kTPControllerMakeHubDevice					= 4,
+		kTPControllerCreateRootHubDevice			= 5,
+		kTPControllerClearTTHandler					= 6,
+		kTPControllerClearTT						= 7,
+		kTPControllerDoCreateEP						= 8,
+		kTPControllerReadV2							= 9,
+		kTPControllerReturnIsochDoneQueue			= 10,
+		kTPControllersetPowerState					= 11,
+		kTPControllerCheckPowerModeBeforeGatedCall	= 12,
+		kTPControllerGatedPowerChange				= 13,
+		kTPControllerCheckForRootHubChanges			= 14,
+		kTPControllerRootHubQueueInterruptRead		= 15,
+		kTPControllerRootHubTimer					= 16,
+		kTPControllerDisjointCompletion				= 17,
+		kTPControllerCheckForDisjointDescriptor		= 18,
+		kTPControllerRead							= 19,
+		kTPControllerV3Start						= 20,
+		kTPAllocatePowerStateArray					= 21,
+		kTPInitForPM								= 22,
+		kTPIsocIOLL									= 23,
+		kTPIsocIO									= 24,
+		kTPControllerWrite							= 25,
+		kTPCompletionCall							= 26,
+		kTPControlTransaction						= 27,
+		kTPInterruptTransaction						= 28,
+		kTPInterruptTransactionData					= 29,
+		kTPBulkTransaction							= 30,
+		kTPBulkTransactionData						= 31,
+		kTPIsocTransaction							= 32,
+		kTPInterruptPacketHandler					= 33,
+		kTPBulkPacketHandler						= 34,
+		kTPDevZeroLock								= 35,
+		kTPControlPacketHandlerData					= 36,
+		kTPDoIOTransferIntrSync						= 37,
+		kTPDoIOTransferBulkSync						= 38,
+		kTPBulkPacketHandlerData					= 39,
+		kTPInterruptPacketHandlerData				= 40
+	};
+	
+	// USB Device Tracepoints			
+	// kUSBTDevice
+	enum
+	{
+		kTPDeviceInit								= 1,
+		kTPDeviceMessage							= 2,
+		kTPDeviceResetDevice						= 3,
+		kTPDeviceGetFullConfigurationDescriptor		= 4,
+		kTPDeviceGetDeviceDescriptor				= 5,
+		kTPDeviceGetConfigDescriptor				= 6,
+		kTPDeviceSetConfiguration					= 7,
+		kTPDeviceSetFeature							= 8,
+		kTPDeviceDeviceRequest						= 9,
+		kTPDeviceGetConfiguration					= 10,
+		kTPDeviceGetDeviceStatus					= 11,
+		kTPDeviceSuspendDevice						= 12,
+		kTPDeviceReEnumerateDevice					= 13,
+		kTPDeviceConfigLock							= 14
+	};
+	
+	// USB Pipe Tracepoints			
+	// kUSBTPipe
+	enum
+	{
+		kTPPipeInitToEndpoint						= 1,
+		kTPBulkPipeRead								= 2,
+		kTPBulkPipeWrite							= 3,
+		kTPIsocPipeRead								= 4,
+		kTPIsocPipeWrite							= 5,
+		kTPIsocPipeReadLL							= 6,
+		kTPIsocPipeWriteLL							= 7,
+		kTPIBulkReadTS								= 8,
+		kTPPipeControlRequest						= 9,
+		kTPPipeControlRequestMemDesc				= 10
+	};
+	
+	
+	// USB kUSBTControllerUserClient Tracepoints			
+	// kUSBTControllerUserClient
+	enum
+	{
+		kTPControllerUCStart					= 1,
+		kTPControllerUCOpen						= 2,
+		kTPControllerUCReadRegister				= 3,
+		kTPControllerUCWriteRegister			= 4
+	};
+	
+	// USB kUSBTDeviceUserClient Tracepoints			
+	// kUSBTDeviceUserClient
+	enum
+	{
+		kTPDeviceUCDeviceRequestIn				= 1,
+		kTPDeviceUCDeviceRequestOut				= 2,
+		kTPDeviceUCChangeOutstandingIO			= 3,
+		kTPDeviceUCGetGatedOutstandingIO		= 4,
+		kTPDeviceUCReqComplete					= 5
+	};
+	
+	// USB InterfaceUserClient Tracepoints			
+	// kUSBTInterfaceUserClient
+	enum
+	{
+		kTPInterfaceUCReadPipe					= 1,
+		kTPInterfaceUCWritePipe					= 2,
+		kTPInterfaceUCControlRequestOut			= 3,
+		kTPInterfaceUCControlRequestIn			= 4,
+		kTPInterfaceUCDoIsochPipeAsync			= 5,
+		kTPInterfaceUCLowLatencyPrepareBuffer	= 6,
+		kTPInterfaceUCChangeOutstandingIO		= 7,
+		kTPInterfaceUCReqComplete				= 8,
+		kTPInterfaceUCIsoReqComplete			= 9,
+		kTPInterfaceUCLLIsoReqComplete			= 10
+	};
+	
+	
+	// USB HSHubUserClient Tracepoints			
+	// kUSBTHSHubUserClient
+	enum
+	{
+		kTPHSHubUCInitWithTask					= 1,
+		kTPHSHubUCStart							= 2,
+		kTPHSHubUCClose							= 3,
+		kTPHSHubUCGetNumberOfPorts				= 4,
+		kTPHSHubUCGetLocationID					= 5,
+		kTPHSHubUCPutPortIntoTestMode			= 6,
+		kTPHSHubUCSupportsIndicators			= 7,
+		kTPHSHubUCSetIndicatorForPort			= 8,
+		kTPHSHubUCGetPortIndicatorControl		= 9,
+		kTPHSHubUCSetIndicatorsToAutomatic		= 10,
+		kTPHSHubUCGetPowerSwitchingMode			= 11,
+		kTPHSHubUCGetPortPower					= 12,
+		kTPHSHubUCSetPortPower					= 13,
+		kTPHSHubUCDisablePwrMgmt				= 14
+	};
+	
+	// USB Hub Tracepoints			
+	// kUSBTHub
+	enum
+	{
+		kTPHubStart								= 1,
+		kTPHubMessage							= 2,
+		kTPHubWillTerminate						= 3,
+		kTPHubPowerStateWillChangeTo			= 4,
+		kTPHubPowerChangeDone					= 5,
+		kTPHubConfigureHub						= 6,
+		kTPHubCheckPowerPowerRequirements		= 7,
+		kTPHubHubPowerChange					= 8,
+		kTPHubAreAllPortsDisconnectedOrSuspended= 9,
+		kTPHubSuspendPorts						= 10,
+		kTPHubSetPortFeature					= 11,
+		kTPHubClearPortFeature					= 12,
+		kTPHubDoPortAction						= 13,
+		kTPHubInterruptReadHandler				= 14,
+		kTPHubResetPortZero						= 15,
+		kTPHubProcessStateChanged				= 16,
+		kTPHubRearmInterruptRead				= 17,
+		kTPHubDoDeviceRequest					= 18,
+		kTPHubWaitForPortResumes				= 19,
+		kTPHubResetMyPort						= 20,
+		kTPHubDecrementOutstandingIO			= 21,
+		kTPHubChangeOutstandingIO				= 22, 
+		kTPHubChangeRaisedPowerState			= 23,
+		kTPHubChangeOutstandingResumes			= 24,
+		kTPHubEnterTestMode						= 25,
+		kTPHubLeaveTestMode						= 26,
+		kTPHubPutPortIntoTestMode				= 27,
+		kTPHubGetPortIndicatorControl			= 28,
+		kTPHubSetIndicatorsToAutomatic			= 29,
+		kTPHubGetPortPower						= 30,
+		kTPHubEnsureUsability					= 31,
+		kTPHubCheckPowerRequirements			= 32,
+		kTPHubWaitForPowerOn					= 33,
+		kTPHubDoPortActionLock					= 34,
+		kTPHubCheckForDeadDevice				= 35
+	};
+	
+	// USB HubPort Tracepoints			
+	// kUSBTHubPort
+	enum
+	{
+		kTPHubPortStop								= 1,
+		kTPHubPortAddDevice							= 2,
+		kTPHubPortSuspendPort						= 3,
+		kTPHubPortFatalError						= 4,
+		kTPHubPortAddDeviceResetChangeHandler		= 5,
+		kTPHubPortHandleResetPortHandler			= 6,
+		kTPHubPortDefaultOverCrntChangeHandler		= 7,
+		kTPHubPortDefaultConnectionChangeHandler	= 8,
+		kTPHubPortReleaseDevZeroLock				= 9,
+		kTPHubPortDetachDevice						= 10,
+		kTPHubPortGetDevZeroDescriptorWithRetries	= 11,
+		kTPHubPortDisplayOverCurrentNotice			= 12,
+		kTPHubPortWakeSuspendCommand				= 13,
+		kTPHubPortWaitForSuspendCommand				= 14,
+		kTPHubPortEnablePowerAfterOvercurrent		= 15
+	};
+	
+	// USB HID Tracepoints			
+	// kUSBTHID
+	enum
+	{
+		kTPHIDStart							= 1,
+		kTPHIDpowerStateWillChangeTo		= 2,
+		kTPHIDsetPowerState					= 3,
+		kTPHIDpowerStateDidChangeTo			= 4,
+		kTPHIDpowerChangeDone				= 5,
+		kTPHIDhandleStart					= 6,
+		kTPHIDClearFeatureEndpointHalt		= 7,
+		kTPHIDHandleReport					= 8,
+		kTPHIDSuspendPort					= 9,
+		kTPHIDAbortAndSuspend				= 10,
+		kTPHIDClaimPendingRead				= 11,
+		kTPHIDChangeOutstandingIO			= 12,
+		kTPHIDRearmInterruptRead			= 13,
+		kTPHIDInitializeUSBHIDPowerManagement = 14,
+		kTPHIDInterruptRead					= 15,
+		kTPHIDInterruptReadError			= 16,
+		kTPHIDCheckForDeadDevice			= 17
+	};
+	
+	// USB Enumeration Tracepoints			
+	// kUSBTEnumeration
+	enum
+	{
+		kTPEnumerationProcessStatusChanged	= 1,
+		kTPEnumerationInitialGetPortStatus	= 2,
+		kTPEnumerationCallAddDevice			= 3,
+		kTPEnumerationAddDevice				= 4,
+		kTPEnumerationResetPort				= 5,
+		kTPEnumerationAddDeviceResetChangeHandler	= 6,
+		kTPEnumerationRegisterService		= 7,
+		kTPEnumerationLowSpeedDevice		= 8,
+		kTPEnumerationFullSpeedDevice		= 9
+		
+	};
+	
+	// USB UHCI Tracepoints			
+	// kUSBTUHCI
+	enum
+	{
+		kTPUHCIMessage						= 1,
+		kTPUHCIGetFrameNumber				= 2,
+		kTPUHCIScavengeIsocTransactions		= 3,
+		kTPUHCIScavengeQueueHeads			= 4,
+		kTPUHCIAllocateQH					= 5,
+		kTPUHCIRootHubStatusChange			= 6,
+		kTPUHCIRHSuspendPort				= 7,
+		kTPUHCIRHHoldPortReset				= 8,
+		kTPUHCIRHResumePortCompletion		= 9,
+		kTPUHCISuspendController			= 10,
+		KTPUHCIResumeController				= 11,
+		KTPUHCIResetControllerState			= 12,
+		KTPUHCIRestartControllerFromReset	= 13,
+		KTPUHCIEnableInterrupts				= 14,
+		KTPUHCIDozeController				= 15,
+		KTPUHCIWakeFromDoze					= 16,
+		KTPUHCIPowerState					= 17,
+	};
+
+	
+	// USB UHCI Tracepoints			
+	// kUSBTUHCIUIM
+	enum
+	{
+		kTPUHCIUIMCreateControlEndpoint		= 1,
+		kTPUHCIUIMCreateBulkEndpoint		= 2,
+		kTPUHCIUIMCreateInterruptEndpoint	= 3,
+		kTPUHCIUIMCreateIsochEndpoint		= 4,
+		kTPUHCIUIMCreateIsochTransfer		= 5,
+		kTPUHCIUIMDeleteEndpoint			= 6,
+		kTPUHCIUIMUnlinkQueueHead			= 7,
+		kTPUHCIUIMCheckForTimeouts			= 8,
+		kTPUHCIUIMReturnOneTransaction		= 9,
+		kTPUHCIUIMAllocateTDChain			= 10,
+		kTPUHCIUIMAddIsochFramesToSchedule	= 11,
+		kTPUHCIUIMAbortIsochEP				= 12,
+		kTPUHCIUIMCreateInterruptTransfer	= 13,
+		kTPUHCIUIMHandleEndpointAbort		= 14
+	};
+	
+	// USB UHCI Interrupt Tracepoints			
+	// kUSBTUHCIInterrupts
+	enum
+	{
+		kTPUHCIInterruptsGetFrameNumberInternal	= 1,
+		kTPUHCIInterruptsFilterInterrupt		= 2,
+		kTPUHCIInterruptsHandleInterrupt		= 3,
+		kTPUHCIUpdateFrameList					= 4
+	};
+	
+	// USB EHCI Tracepoints			
+	// kUSBTEHCI
+	enum
+	{
+		kTPEHCIRootHubResetPort					= 1,
+		kTPEHCIRootHubPortEnable				= 2,
+		kTPEHCIRootHubPortSuspend				= 3,
+		// kTPEHCIRootHubStatusChange			= 4,
+		kTPEHCIRHResumePortCompletion			= 5,
+		kTPEHCIUIMFinalize						= 6,
+		kTPEHCIGetFrameNumber32					= 7, 
+		kTPEHCIGetFrameNumber					= 8,
+		kTPEHCIAllocateQH						= 9,
+		kTPEHCIEnableAsyncSchedule				= 10,
+		kTPEHCIDisableAsyncSchedule				= 11,
+		kTPEHCIEnablePeriodicSchedule			= 12,
+		kTPEHCIDisablePeriodicSchedule			= 13,
+		kTPEHCIMessage							= 14,
+		kTPEHCIMakeEmptyEndPoint				= 15,
+		kTPEHCIAllocateTDs						= 16,
+		kTPEHCIMungeECHIStatus					= 17,
+		kTPEHCIScavengeIsocTransactions			= 18,
+		kTPEHCIScavengeAnEndpointQueue			= 19,
+		kTPEHCIScavengeCompletedTransactions	= 20,
+		kTPEHCICreateBulkEndpoint				= 21,
+		kTPEHCICreateBulkTransfer				= 22,
+
+		kTPEHCICreateInterruptEndpoint			= 24,
+		kTPEHCICreateIsochEndpoint				= 25,
+		kTPEHCIAbortIsochEP						= 26,
+		kTPEHCIHandleEndpointAbort				= 27,
+		kTPEHCICreateInterruptTransfer			= 28,
+		kTPEHCIUnlinkAsyncEndpoint				= 29,
+		kTPEHCIDeleteEndpoint					= 30,
+		kTPEHCICreateHSIsochTransfer			= 31,
+		kTPEHCICreateSplitIsochTransfer			= 32,
+		kTPEHCICreateIsochTransfer				= 33,
+		kTPEHCIAddIsocFramesToSchedule			= 34,
+		kTPEHCIReturnOneTransaction				= 35,
+		kTPEHCICheckEDListForTimeouts			= 36,
+		kTPEHCISuspendUSBBus					= 37,
+		kTPEHCICheckForTimeouts					= 38,
+		kTPEHCIResumeUSBBus						= 39,
+		kTPEHCIRestartUSBBus					= 40,
+		kTPEHCIResetControllerState				= 41,
+		kTPEHCIDozeController					= 42,
+		kTPEHCIWakeControllerFromDoze			= 43,
+		kTPEHCIEnableInterrupts					= 44,
+		kTPEHCIPowerState						= 45,
+		kTPEHCIStopUSBBus						= 46,
+		kTPEHCIRestartControllerFromReset		= 47
+	};
+
+	// USB EHCI Interrupt Tracepoints			
+	// kUSBTEHCIInterrupts
+	enum
+	{
+		kTPEHCIInterruptsPollInterrupts			= 1,
+		kTPEHCIInterruptsPrimaryInterruptFilter	= 2,
+		kTPEHCIUpdateFrameList					= 3,
+	};
+	
+	
+	// USB EHCI Interrupt Tracepoints			
+	// kUSBTEHCIHubInfo
+	enum
+	{
+		kTPEHCIAvailableIsochBandwidth			= 1,
+		kTPEHCIAllocateIsochBandwidth			= 2
+	};
+	
+	// USB OHCI Tracepoints			
+	// kUSBTOHCI
+	enum
+	{
+		kTPOHCIInitialize						= 1,
+		kTPOHCICreateGeneralTransfer			= 2,
+		kTPOHCIAbortEndpoint					= 3,
+		kTPOHCIDeleteEndpoint					= 4,
+		kTPOHCIEndpointStall					= 5,
+		kTPOHCICreateIsochTransfer				= 6,
+		kTPOHCIAllocateTD						= 7,
+		kTPOHCIAllocateITD						= 8,
+		kTPOHCIAllocateED						= 9,
+		kTPOHCIProcessCompletedITD				= 10,
+		kTPOHCIReturnTransactions				= 11,
+		kTPOHCIMessage							= 12,
+		KTPOHCISuspendUSBBus					= 13,
+		KTPOHCIResumeUSBBus						= 14,
+		KTPOHCIResetControllerState				= 15,
+		KTPOHCIRestartControllerFromReset		= 16,
+		KTPOHCIEnableInterrupts					= 17,
+		KTPOHCIDozeController					= 18,
+		KTPOHCIWakeControllerFromDoze			= 19,
+		KTPOHCIPowerState						= 20,
+		kTPOHCIDoneQueueCompletion				= 21
+	};
+		
+	// USB OHCI Interrupt Tracepoints			
+	// kUSBTOHCIInterrupts
+	enum
+	{
+		kTPOHCIInterruptsPollInterrupts			= 1,
+		kTPOHCIInterruptsPrimaryInterruptFilter	= 2,
+		kTPOHCIUpdateFrameList					= 3
+	};
+	
+
+	// USB HubPolicyMaker Tracepoints			
+	// kUSBTHubPolicyMaker
+	enum
+	{
+		kTPSetPowerState						 = 1
+	};
+	
+	// USB CompositeDriver Tracepoints			
+	// kUSBTCompositeDriver
+	enum
+	{
+		kTPCompositeDriverConfigureDevice		 = 1
+	};
+
+	// USB USB OutstandingIO Tracepoints			
+	// kUSBTOutstandingIO
+	enum
+	{
+		kTPDeviceUCDecrement	= 1,
+		kTPDeviceUCIncrement	= 2,
+		kTPInterfaceUCDecrement	= 3,
+		kTPInterfaceUCIncrement	= 4,
+		kTPHubDecrement			= 5,
+		kTPHubIncrement			= 6,
+		kTPHIDDecrement			= 7,
+		kTPHIDIncrement			= 8
+	};
+	
+	// USB Audio driver Tracepoints			
+	// kUSBAudio
+	enum
+	{
+		kTPAudioDriverRead						= 1,
+		kTPAudioDriverCoalesceInputSamples		= 2,
+		kTPAudioDriverCoalesceError				= 3,
+		kTPAudioDriverCoalesce					= 4,
+		kTPAudioDriverReadHandler				= 5,
+		kTPAudioDriverCoalesceError2			= 6,
+		kTPAudioDriverConvertInputSamples		= 7
+	};
+	
+	// Tracepoint macros.
+#define USB_TRACE(USBClass, code, funcQualifier)	( ( ( DBG_IOKIT & 0xFF ) << 24) | ( ( DBG_IOUSB & 0xFF ) << 16 ) | ( ( USBClass & 0x3F ) << 10 ) | ( ( code & 0xFF ) << 2 ) | ( funcQualifier & 0x3 ) )
+
+#define kTPAllUSB								USB_TRACE ( 0, 0, 0 )
+
+#define USB_CONTROLLER_TRACE(code)				USB_TRACE( kUSBTController, code, DBG_FUNC_NONE )
+#define USB_CONTROLLER_UC_TRACE(code)			USB_TRACE( kUSBTControllerUserClient, code, DBG_FUNC_NONE )
+#define USB_DEVICE_TRACE(code)					USB_TRACE( kUSBTDevice, code, DBG_FUNC_NONE )
+#define USB_DEVICE_UC_TRACE(code)				USB_TRACE( kUSBTDeviceUserClient, code, DBG_FUNC_NONE )
+
+#define USB_HUB_TRACE(code)						USB_TRACE( kUSBTHub, code, DBG_FUNC_NONE )
+#define USB_HUB_PORT_TRACE(code)				USB_TRACE( kUSBTHubPort, code, DBG_FUNC_NONE )
+#define USB_HUB_UC_TRACE(code)					USB_TRACE( kUSBTHSHubUserClient, code, DBG_FUNC_NONE )
+#define USB_HID_TRACE(code)						USB_TRACE( kUSBTHID, code, DBG_FUNC_NONE )
+#define USB_PIPE_TRACE(code)					USB_TRACE( kUSBTPipe, code, DBG_FUNC_NONE )
+
+#define USB_INTERFACE_UC_TRACE(code)			USB_TRACE( kUSBTInterfaceUserClient, code, DBG_FUNC_NONE )
+
+#define USB_ENUMERATION_TRACE(code)				USB_TRACE( kUSBTEnumeration, code, DBG_FUNC_NONE )
+
+#define USB_UHCI_TRACE(code)					USB_TRACE( kUSBTUHCI, code, DBG_FUNC_NONE )
+#define USB_UHCI_UIM_TRACE(code)				USB_TRACE( kUSBTUHCIUIM, code, DBG_FUNC_NONE )
+#define USB_UHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTUHCIInterrupts, code, DBG_FUNC_NONE )
+
+#define USB_OHCI_TRACE(code)					USB_TRACE( kUSBTOHCI, code, DBG_FUNC_NONE )
+#define USB_OHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTOHCIInterrupts, code, DBG_FUNC_NONE )
+
+#define USB_EHCI_TRACE(code)					USB_TRACE( kUSBTEHCI, code, DBG_FUNC_NONE )
+#define USB_EHCI_HUBINFO_TRACE(code)			USB_TRACE( kUSBTEHCIHubInfo, code, DBG_FUNC_NONE )
+#define USB_EHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTEHCIInterrupts, code, DBG_FUNC_NONE )
+
+#define USB_HUB_POLICYMAKER_TRACE(code)			USB_TRACE( kUSBTHubPolicyMaker, code, DBG_FUNC_NONE )
+#define USB_COMPOSITE_DRIVER_TRACE(code)		USB_TRACE( kUSBTCompositeDriver, code, DBG_FUNC_NONE )
+
+#define USB_OUTSTANDING_IO_TRACE(code)			USB_TRACE( kUSBTOutstandingIO, code, DBG_FUNC_NONE )	
+	
+#define USB_AUDIO_DRIVER_TRACE(code)			USB_TRACE( kUSBAudio, code, DBG_FUNC_NONE )	
+
+#ifdef KERNEL
+	
+#include <IOKit/IOTimeStamp.h>
+		
+#define USBTrace(USBClass, code, a, b, c, d) {														\
+			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
+				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_NONE), a, b, c, d );		\
+			}																						\
+		}
+
+#define USBTrace_Start(USBClass, code, a, b, c, d) {												\
+			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
+				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_START), a, b, c, d );		\
+			}																						\
+		}
+
+#define USBTrace_End(USBClass, code, a, b, c, d) {														\
+			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
+				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_END), a, b, c, d );			\
+			}																						\
+		}
+
+#endif
+	
+	
+	
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/* __IOKIT_IO_USB_FAMILY_TRACEPOINTS__ */
diff --git a/i386/include/IOKit/usb/IOUFIStorageServices.h b/i386/include/IOKit/usb/IOUFIStorageServices.h
new file mode 100644
index 0000000..cac43f4
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUFIStorageServices.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+
+#ifndef _IOKIT_UFI_STORAGE_SERVICES_H_
+#define _IOKIT_UFI_STORAGE_SERVICES_H_
+
+#if defined(KERNEL) && defined(__cplusplus)
+
+#include <IOKit/IOTypes.h>
+#include <IOKit/storage/IOBlockStorageDevice.h>
+#include <IOKit/usb/IOUSBMassStorageUFISubclass.h>
+
+
+class IOUFIStorageServices : public IOBlockStorageDevice
+{
+	
+	OSDeclareDefaultStructors ( IOUFIStorageServices )
+
+private:
+	bool							fMediaChanged;
+	bool							fMediaPresent;
+
+protected:
+	
+    IOUSBMassStorageUFIDevice *		fProvider;
+
+	UInt64							fMaxReadBlocks;
+	UInt64							fMaxWriteBlocks;
+	
+	virtual bool	attach ( IOService * provider );
+	virtual void	detach ( IOService * provider );
+	
+    // Reserve space for future expansion.
+    struct IOUFIStorageServicesExpansionData { };
+    IOUFIStorageServicesExpansionData *fIOUFIStorageServicesReserved;
+	
+public:
+
+	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
+
+	static void 		AsyncReadWriteComplete ( void * 			clientData,
+                                				 IOReturn			status,
+                                				 UInt64 			actualByteCount );
+
+    // Deprecated
+    virtual IOReturn    doAsyncReadWrite (	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks,
+											IOStorageCompletion		completion );
+                                            
+	virtual IOReturn	doAsyncReadWrite (  IOMemoryDescriptor *    buffer,
+                                            UInt64                  block, 
+                                            UInt64                  nblks,
+                                            IOStorageAttributes *   attributes,
+                                            IOStorageCompletion *   completion );
+
+	virtual IOReturn	doSyncReadWrite ( 	IOMemoryDescriptor *	buffer,
+											UInt32					block,
+											UInt32					nblks );
+
+    virtual IOReturn	doEjectMedia ( void );
+
+    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
+
+    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
+    											UInt32		capacitiesMaxCount ) const;
+
+    virtual IOReturn	doLockUnlockMedia ( bool doLock );
+
+    virtual IOReturn	doSynchronizeCache ( void );
+        
+    virtual char *		getVendorString ( void );
+    
+    virtual char *		getProductString ( void );
+    
+    virtual char *		getRevisionString ( void );
+    
+    virtual char *		getAdditionalDeviceInfoString ( void );
+    
+    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
+    
+    virtual IOReturn	reportEjectability ( bool * isEjectable );
+    
+    virtual IOReturn	reportLockability ( bool * isLockable );
+    
+    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
+    
+    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
+    												bool * pollIsExpensive );
+    
+    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
+    
+    virtual IOReturn	reportRemovability ( bool * isRemovable );
+    
+    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
+
+    virtual IOReturn	getWriteCacheState ( bool * enabled );
+	
+	virtual IOReturn	setWriteCacheState ( bool enabled );
+    
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 1 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 2 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 3 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 4 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 5 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 6 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 7 );
+    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 8 );
+
+};
+
+#endif	/* defined(KERNEL) && defined(__cplusplus) */
+
+#endif	/* _IOKIT_UFI_STORAGE_SERVICES_H_ */
diff --git a/i386/include/IOKit/usb/IOUSBBus.h b/i386/include/IOKit/usb/IOUSBBus.h
new file mode 100644
index 0000000..a42191a
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBBus.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBBUS_H
+#define _IOKIT_IOUSBBUS_H
+
+#include <IOKit/IOService.h>
+
+class IOUSBBus : public IOService
+{
+    OSDeclareAbstractStructors(IOUSBBus)
+};
+
+#endif /* ! _IOKIT_IOUSBBUS_H */
+
diff --git a/i386/include/IOKit/usb/IOUSBCommand.h b/i386/include/IOKit/usb/IOUSBCommand.h
new file mode 100644
index 0000000..0f7c36b
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBCommand.h
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBCOMMAND_H
+#define _IOKIT_IOUSBCOMMAND_H
+
+#include <IOKit/IOCommand.h>
+#include <IOKit/IOCommandPool.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IODMACommand.h>
+#include <IOKit/usb/USB.h>
+
+/*
+ * USB Command
+ * This is the command block for a USB command to be queued on the
+ * Command Gate of the WorkLoop.  Although the actual work of creating
+ * the command and enqueueing it is done for them via the deviceRequest,
+ * read, and write methods, this is the primary way that devices will get
+ * work done.
+ * Note: This is private to IOUSBController and should be moved to a
+ * private header.
+ */
+
+typedef enum {
+    DEVICE_REQUEST,						// Device request using pointer
+    READ,
+    WRITE,
+    CREATE_EP,
+    DELETE_EP,
+    DEVICE_REQUEST_DESC,				// Device request using descriptor
+	DEVICE_REQUEST_BUFFERCOMMAND		// Device request using a second IOUSBCommand in _bufferCommand
+} usbCommand;
+
+
+
+/*!
+ @class IOUSBCommand
+ @abstract A subclass of IOCommand that is used to add USB specific data.
+ */
+class IOUSBCommand : public IOCommand
+{
+    OSDeclareAbstractStructors(IOUSBCommand)
+
+protected:
+    usbCommand				_selector;
+    IOUSBDeviceRequestPtr	_request;
+    USBDeviceAddress		_address;
+    UInt8					_endpoint;
+    UInt8					_direction;
+    UInt8					_type;
+    bool					_bufferRounding;
+    IOMemoryDescriptor *	_buffer;
+    IOUSBCompletion			_uslCompletion;
+    IOUSBCompletion			_clientCompletion;
+    UInt32					_dataRemaining;							// For Control transfers
+    UInt8					_stage;									// For Control transfers
+    IOReturn				_status;
+    IOMemoryDescriptor *	_origBuffer;
+    IOUSBCompletion			_disjointCompletion;
+    IOByteCount				_dblBufLength;
+    UInt32					_noDataTimeout;
+    UInt32					_completionTimeout;
+    UInt32					_UIMScratch[10];
+    
+    struct ExpansionData
+    {
+        IOByteCount			_reqCount;
+		IOMemoryDescriptor *_requestMemoryDescriptor;
+		IOMemoryDescriptor *_bufferMemoryDescriptor;
+		bool				_multiTransferTransaction;
+		bool				_finalTransferInTransaction;
+        bool				_useTimeStamp;
+        AbsoluteTime		_timeStamp;
+		bool				_isSyncTransfer;						// Returns true if the command is used for a synchronous transfer
+		IODMACommand		*_dmaCommand;							// used to get memory mapping
+		IOUSBCommand		*_bufferUSBCommand;						// points to another IOUSBCommand used for phase 2 of control transactions
+		IOUSBCommand		*_masterUSBCommand;						// points from the bufferUSBCommand back to the parent command
+    };
+    ExpansionData * 		_expansionData;
+    
+    // we override these OSObject method in order to allocate and release our expansion data
+    virtual bool init();
+    virtual void free();
+
+public:
+
+    // static constructor
+    static IOUSBCommand *	NewCommand(void);
+
+    // Manipulators
+    void					SetSelector(usbCommand sel);
+    void  					SetRequest(IOUSBDeviceRequestPtr req);
+    void  					SetAddress(USBDeviceAddress addr);
+    void  					SetEndpoint(UInt8 ep);
+    void  					SetDirection(UInt8 dir);
+    void  					SetType(UInt8 type);
+    void  					SetBufferRounding(bool br);
+    void  					SetBuffer(IOMemoryDescriptor *buf);
+    void  					SetUSLCompletion(IOUSBCompletion completion);
+    void  					SetClientCompletion(IOUSBCompletion completion);
+    void  					SetDataRemaining(UInt32 dr);
+    void  					SetStage(UInt8 stage);
+    void 					SetStatus(IOReturn stat);
+    void 					SetOrigBuffer(IOMemoryDescriptor *buf);
+    void 					SetDisjointCompletion(IOUSBCompletion completion);
+    void 					SetDblBufLength(IOByteCount len);
+    void 					SetNoDataTimeout(UInt32 to);
+    void 					SetCompletionTimeout(UInt32 to);
+    void 					SetUIMScratch(UInt32 index, UInt32 value);
+    void 					SetReqCount(IOByteCount reqCount);
+    void					SetRequestMemoryDescriptor(IOMemoryDescriptor *requestMemoryDescriptor);
+    void					SetBufferMemoryDescriptor(IOMemoryDescriptor *bufferMemoryDescriptor);
+    void					SetMultiTransferTransaction(bool);
+    void					SetFinalTransferInTransaction(bool);
+    void					SetUseTimeStamp(bool);
+    void					SetTimeStamp(AbsoluteTime timeStamp);
+	void					SetIsSyncTransfer(bool);
+	inline void				SetDMACommand(IODMACommand *dmaCommand)					{ _expansionData->_dmaCommand = dmaCommand; }
+	void					SetBufferUSBCommand(IOUSBCommand *bufferUSBCommand);
+	
+	// Accessors
+    usbCommand					GetSelector(void);
+    IOUSBDeviceRequestPtr		GetRequest(void);
+    USBDeviceAddress			GetAddress(void);
+    UInt8						GetEndpoint(void);
+    UInt8						GetDirection(void);
+    UInt8						GetType(void);
+    bool						GetBufferRounding(void);
+    IOMemoryDescriptor *		GetBuffer(void);
+    IOUSBCompletion				GetUSLCompletion(void);
+    IOUSBCompletion				GetClientCompletion(void);
+    UInt32						GetDataRemaining(void);
+    UInt8						GetStage(void);
+    IOReturn					GetStatus(void);
+    IOMemoryDescriptor *		GetOrigBuffer(void);
+    IOUSBCompletion				GetDisjointCompletion(void);
+    IOByteCount					GetDblBufLength(void);
+    UInt32						GetNoDataTimeout(void);
+    UInt32						GetCompletionTimeout(void);
+    UInt32						GetUIMScratch(UInt32 index);
+    IOByteCount					GetReqCount(void);
+    IOMemoryDescriptor *		GetRequestMemoryDescriptor(void);
+    IOMemoryDescriptor *		GetBufferMemoryDescriptor(void);
+    bool						GetMultiTransferTransaction(void);
+    bool						GetFinalTransferInTransaction(void);
+    bool						GetUseTimeStamp(void);
+    AbsoluteTime				GetTimeStamp(void);
+	bool						GetIsSyncTransfer(void);
+	inline IODMACommand *		GetDMACommand(void)							{return _expansionData->_dmaCommand; }
+	inline IOUSBCommand *		GetBufferUSBCommand(void)					{return _expansionData->_bufferUSBCommand; }
+};
+
+
+class IOUSBIsocCommand : public IOCommand
+{
+    OSDeclareAbstractStructors(IOUSBIsocCommand)
+
+protected:
+    usbCommand				_selector;
+    USBDeviceAddress		_address;
+    UInt8					_endpoint;
+    UInt8					_direction;
+    IOMemoryDescriptor *	_buffer;
+    IOUSBIsocCompletion		_completion;
+    UInt64					_startFrame;
+    UInt32					_numFrames;
+    IOUSBIsocFrame *		_frameList;
+    IOReturn				_status;
+    
+    struct ExpansionData
+    {
+        UInt32				_updateFrequency;
+        bool				_useTimeStamp;
+        AbsoluteTime		_timeStamp;
+		bool				_isSyncTransfer;								// Returns true if the command is used for a synchronous transfer
+		bool				_rosettaClient;
+		IODMACommand *		_dmaCommand;
+		IOUSBIsocCompletion	_uslCompletion;
+		bool				_lowLatency;
+    };
+    ExpansionData * 		_expansionData;
+
+    // we override these OSObject method in order to allocate and release our expansion data
+    virtual bool init();
+    virtual void free();
+
+public:
+    // static constructor
+    static IOUSBIsocCommand *NewCommand(void);
+    
+    // Manipulators
+    void					SetSelector(usbCommand sel)							{_selector = sel; }
+    void					SetAddress(USBDeviceAddress addr)					{_address = addr; }
+    void					SetEndpoint(UInt8 ep)								{_endpoint = ep; }
+    void					SetDirection(UInt8 dir)								{_direction = dir; }
+    void					SetBuffer(IOMemoryDescriptor *buf)					{_buffer = buf; }
+    void					SetCompletion(IOUSBIsocCompletion completion)		{_completion = completion; }
+    void					SetStartFrame(UInt64 sf)							{_startFrame = sf; }
+    void					SetNumFrames(UInt32 nf)								{_numFrames = nf; }
+    void					SetFrameList(IOUSBIsocFrame *fl)					{_frameList = fl; }
+    void					SetStatus(IOReturn stat)							{_status = stat; }
+    void					SetUpdateFrequency( UInt32 fr)						{ _expansionData->_updateFrequency = fr; }
+    void					SetUseTimeStamp(bool useIt)							{ _expansionData->_useTimeStamp= useIt; }
+    void					SetTimeStamp(AbsoluteTime timeStamp)				{ _expansionData->_timeStamp= timeStamp; }
+ 	void					SetIsSyncTransfer(bool isSync)						{ _expansionData->_isSyncTransfer = isSync; }
+ 	void					SetRosettaClient(bool isRosetta)					{ _expansionData->_rosettaClient = isRosetta; }
+ 	void					SetDMACommand(IODMACommand *dmaCommand)				{ _expansionData->_dmaCommand = dmaCommand; }
+    void					SetUSLCompletion(IOUSBIsocCompletion completion)	{ _expansionData->_uslCompletion = completion; }
+ 	void					SetLowLatency(bool lowLatency)						{ _expansionData->_lowLatency = lowLatency; }
+
+	// Accessors
+    usbCommand				GetSelector(void)								{ return _selector; }
+    USBDeviceAddress		GetAddress(void)								{ return _address; }
+    UInt8					GetEndpoint(void)								{ return _endpoint; }
+    UInt8					GetDirection(void)								{ return _direction; }
+    IOMemoryDescriptor *	GetBuffer(void)									{ return _buffer; }
+    IOUSBIsocCompletion		GetCompletion(void)								{ return _completion; }
+    UInt64					GetStartFrame(void)								{ return _startFrame; }
+    UInt32					GetNumFrames(void)								{ return _numFrames; }
+    IOUSBIsocFrame *		GetFrameList(void)								{ return _frameList; }
+    UInt32					GetUpdateFrequency(void)						{ return _expansionData->_updateFrequency; }
+    IOReturn				GetStatus(void)									{ return _status; }
+    bool					GetUseTimeStamp(void)							{ return _expansionData->_useTimeStamp; }
+    AbsoluteTime			GetTimeStamp(void)								{ return _expansionData->_timeStamp; }
+	bool					GetIsSyncTransfer(void)							{ return _expansionData->_isSyncTransfer; }
+	bool					GetIsRosettaClient(void)						{ return _expansionData->_rosettaClient; }
+	IODMACommand *			GetDMACommand(void)								{ return _expansionData->_dmaCommand; }
+    IOUSBIsocCompletion		GetUSLCompletion(void)							{ return _expansionData->_uslCompletion; }
+	bool					GetLowLatency(void)								{ return _expansionData->_lowLatency; }
+};
+
+class IOUSBCommandPool : public IOCommandPool
+{
+    OSDeclareDefaultStructors( IOUSBCommandPool )
+	
+protected:
+    virtual IOReturn gatedReturnCommand(IOCommand * command);
+	virtual IOReturn gatedGetCommand(IOCommand ** command, bool blockForCommand);
+	
+public:
+    static IOCommandPool * withWorkLoop(IOWorkLoop * inWorkLoop);
+};
+
+
+#endif
+
diff --git a/i386/include/IOKit/usb/IOUSBCompositeDriver.h b/i386/include/IOKit/usb/IOUSBCompositeDriver.h
new file mode 100644
index 0000000..ef72cf4
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBCompositeDriver.h
@@ -0,0 +1,127 @@
+/*
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1998-2006 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBCompositeDriver_H
+#define _IOKIT_IOUSBCompositeDriver_H
+
+//================================================================================================
+//
+//   Headers
+//
+//================================================================================================
+//
+#include <libkern/OSByteOrder.h>
+#include <IOKit/IOLib.h>
+#include <IOKit/IONotifier.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/usb/IOUSBBus.h>
+#include <IOKit/usb/IOUSBDevice.h>
+#include <IOKit/usb/IOUSBInterface.h>
+#include <IOKit/usb/IOUSBLog.h>
+#include <IOKit/usb/USB.h>
+
+
+//================================================================================================
+//
+//   Class Declaration for IOUSBCompositeDriver
+//
+//================================================================================================
+//
+/*!
+ @class IOUSBCompositeDriver
+ @abstract Driver that matches to USB composite devices.
+ @discussion This class can be overriden to provide for specific behaviors.  The driver itself essentially
+ just calls SetConfiguration().
+ */
+class IOUSBCompositeDriver : public IOService
+{
+    OSDeclareDefaultStructors(IOUSBCompositeDriver)
+    
+    IOUSBDevice	* 	fDevice;
+    IONotifier * 	fNotifier;
+    bool		fExpectingClose;
+    UInt8               fConfigValue;
+    UInt8               fConfigbmAttributes;
+    
+    struct IOUSBCompositeDriverExpansionData 
+    {
+    };
+    
+    IOUSBCompositeDriverExpansionData * fIOUSBCompositeExpansionData;
+    
+    static IOReturn         CompositeDriverInterestHandler(  void * target, void * refCon, UInt32 messageType, IOService * provider,  void * messageArgument, vm_size_t argSize );
+    
+public:
+        
+		// IOService Methods
+		//
+		virtual bool            start(IOService * provider);
+    virtual IOReturn        message( UInt32 type, IOService * provider,  void * argument = 0 );
+    virtual bool            willTerminate( IOService * provider, IOOptionBits options );
+    virtual bool            didTerminate( IOService * provider, IOOptionBits options, bool * defer );
+    
+    // IOUSBCompositeDriver Methods
+    //
+    virtual bool            ConfigureDevice();
+    virtual IOReturn        ReConfigureDevice();
+    /*!
+		@function SetConfiguration
+     @abstract Call IOUSBDevice to do a SetConfiguration call to the device.
+     @param configValue The desired configuration value.
+     @param startInterfaceMatching A boolean specifying whether IOKit should begin the process of finding
+     matching drivers for the new IOUSBInterface objects.
+     */
+    virtual IOReturn SetConfiguration(UInt8 configValue, bool startInterfaceMatching=true);
+    
+    // Getters
+    //
+    bool                                GetExpectingClose()         { return fExpectingClose; }
+    UInt8                               GetConfigValue()            { return fConfigValue; }
+    UInt8                               GetConfigbmAttributes()     { return fConfigbmAttributes; }
+    IONotifier *                        GetNotifier()               { return fNotifier; }
+	
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  0);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  1);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  2);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  3);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  4);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  5);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  6);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  7);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  8);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  9);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 10);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 11);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 12);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 13);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 14);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 15);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 16);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 17);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 18);
+    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 19);
+};
+
+#endif _IOKIT_IOUSBCompositeDriver_H
diff --git a/i386/include/IOKit/usb/IOUSBController.h b/i386/include/IOKit/usb/IOUSBController.h
new file mode 100644
index 0000000..18940f2
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBController.h
@@ -0,0 +1,1073 @@
+/*
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.2 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBCONTROLLER_H
+#define _IOKIT_IOUSBCONTROLLER_H
+
+//================================================================================================
+//
+//   Headers
+//
+//================================================================================================
+//
+#include <libkern/c++/OSArray.h>
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IODeviceMemory.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOCommandGate.h>
+#include <IOKit/IOCommandPool.h>
+
+#include <IOKit/usb/USB.h>
+#include <IOKit/usb/USBHub.h>
+#include <IOKit/usb/IOUSBBus.h>
+#include <IOKit/usb/IOUSBNub.h>
+#include <IOKit/usb/IOUSBCommand.h>
+#include <IOKit/usb/IOUSBWorkLoop.h>
+
+
+//================================================================================================
+//
+//   Types and Constants
+//
+//================================================================================================
+//
+enum
+{
+    kErrataCMDDisableTestMode					= (1 << 0),		// turn off UHCI test mode
+    kErrataOnlySinglePageTransfers				= (1 << 1),		// Don't cross page boundaries in a single transfer
+    kErrataRetryBufferUnderruns					= (1 << 2),		// Don't cross page boundaries in a single transfer
+    kErrataLSHSOpti								= (1 << 3),		// Don't cross page boundaries in a single transfer
+    kErrataDisableOvercurrent					= (1 << 4),		// Always set the NOCP bit in rhDescriptorA register
+    kErrataLucentSuspendResume					= (1 << 5),		// Don't allow port suspend at the root hub
+    kErrataNeedsWatchdogTimer					= (1 << 6),		// Use Watchdog timer to reset confused controllers
+    kErrataNeedsPortPowerOff					= (1 << 7),		// Power off the ports and back on again to clear weird status.
+    kErrataAgereEHCIAsyncSched					= (1 << 8),		// needs workaround for Async Sched bug
+    kErrataNECOHCIIsochWraparound				= (1 << 9),		// needs workaround for NEC isoch buffer wraparound problem
+	kErrataNECIncompleteWrite					= (1 << 10),	// needs workaround for NEC bits not sticking (errata IBB-2UE-00030 Jun 23 2005)
+	kErrataICH6PowerSequencing					= (1 << 11),	// needs special power sequencing for early Transition machines
+	kErrataICH7ISTBuffer						= (1 << 12),	// buffer for Isochronous Scheduling Threshold
+	kErrataUHCISupportsOvercurrent				= (1 << 13),	// UHCI controller supports overcurrent detection
+	kErrataNeedsOvercurrentDebounce				= (1 << 14),	// The overcurrent indicator should be debounced by 10ms
+	kErrataSupportsPortResumeEnable				= (1 << 15),	// UHCI has resume enable bits at config address 0xC4
+	kErrataNoCSonSplitIsoch						= (1 << 16),	// MCP79 - split iscoh is a little different
+	kErrataOHCINoGlobalSuspendOnSleep			= (1 << 17),	// when sleeping, do not put the OHCI controller in SUSPEND state. just leave it Operational with suspended downstream ports
+	kErrataMissingPortChangeInt					= (1 << 18),	// sometimes the port change interrupt may be missing
+	kErrataMCP79IgnoreDisconnect				= (1 << 19),	// MCP79 - need to ignore a connect/disconnect on wake
+	kErrataUse32bitEHCI							= (1 << 20)	,	// MCP79 - EHCI should only run with 32 bit DMA addresses
+	kErrataUHCISupportsResumeDetectOnConnect	= (1 << 21),	// UHCI controller will generate a ResumeDetect interrupt while in Global Suspend if a device is plugged in
+	kErrataDontUseCompanionController			= (1 << 22)		// For systems which will end up being EHCI only
+};
+
+enum
+{
+    kUSBWatchdogTimeoutMS = 1000
+};
+
+
+/*!
+    @struct
+    @discussion This table contains the list of errata that are necessary for known problems with particular devices.
+    The format is vendorID, product ID, lowest revisionID needing errata, highest rev needing errata, errataBits.
+    The result of all matches is ORed together, so more than one entry may match.
+    Typically for a given errata a list of revisions that this applies to is supplied.
+     @field vendID      The Vendor ID of the device
+     @field deviceID    Product ID of device
+     @field revisionLo  Lowest product revsion to apply errata to
+     @field revisionHi  Highest product revision to apply errata to
+     @field errata      Bit field flagging which errata to apply to device.
+*/
+
+struct ErrataListEntryStruct
+{
+    UInt16 				vendID;
+    UInt16 				deviceID;
+    UInt16 				revisionLo;
+    UInt16 				revisionHi;
+    UInt32 				errata;
+};
+
+typedef struct ErrataListEntryStruct  ErrataListEntry, *ErrataListEntryPtr;
+
+
+//================================================================================================
+//
+//   Routines used to implement synchronous I/O
+//
+//================================================================================================
+//
+void IOUSBSyncCompletion(void *target, void * parameter, IOReturn status, UInt32 bufferSizeRemaining);
+
+void  IOUSBSyncIsoCompletion(void *target, void * parameter, IOReturn status, IOUSBIsocFrame *pFrames);
+
+
+//================================================================================================
+//
+//   Forward Declarations
+//
+//================================================================================================
+//
+class IOUSBDevice;
+class IOUSBLog;
+class IOUSBHubDevice;
+class IOUSBRootHubDevice;
+class IOMemoryDescriptor;
+
+
+//================================================================================================
+//
+//   IOUSBController Class
+//
+//================================================================================================
+//
+/*!
+    @class IOUSBController
+    @abstract Base class for USB hardware driver
+    @discussion Not many directly useful methods for USB device driver writers,
+    IOUSBDevice, IOUSBInterface and IOUSBPipe provide more useful abstractions.
+    The bulk of this class interfaces between IOKit and the low-level UIM, which is
+    based on the MacOS9 UIM. To impliment a new controller type, subclass
+    IOUSBController and impiment all the "UIM functions". AppleUSBOHCI
+    is an example of this implementing all the functions necessary to drive an
+    OHCI controller.
+*/
+class IOUSBController : public IOUSBBus
+{
+    OSDeclareAbstractStructors(IOUSBController)
+    friend class IOUSBControllerV2;
+    friend class IOUSBControllerV3;
+
+protected:
+
+    IOUSBWorkLoop *			_workLoop;
+    IOCommandGate *			_commandGate;
+    IOUSBRootHubDevice *	_rootHubDevice;
+    UInt32					_devZeroLock;
+    static UInt32			_busCount;
+    static bool				gUsedBusIDs[256];
+    
+    struct ExpansionData 
+    {
+		IOCommandPool		*freeUSBCommandPool;
+		IOCommandPool		*freeUSBIsocCommandPool;
+        IOTimerEventSource	*watchdogUSBTimer;
+        bool				_terminating;
+        bool				_watchdogTimerActive;
+        bool				_pcCardEjected;						// Obsolete
+        UInt32				_busNumber;
+        UInt32				_currentSizeOfCommandPool;
+        UInt32				_currentSizeOfIsocCommandPool;
+        UInt8				_controllerSpeed;					// Controller speed, passed down for splits
+        thread_call_t		_terminatePCCardThread;				// Obsolete
+        bool				_addressPending[128];
+		SInt32				_activeIsochTransfers;				// isochronous transfers in the queue
+		IOService			*_provider;							// common name for our provider
+		bool				_controllerCanSleep;				// true iff the controller is able to support sleep/wake
+		bool				_needToClose;
+		UInt32				_isochMaxBusStall;					// value (in ns) of the maximum PCI bus stall allowed for Isoch..
+    };
+    ExpansionData *_expansionData;
+	
+    // The following methods do not use and upper case initial letter because they are part of IOKit
+    //
+
+public:
+    virtual bool 		init( OSDictionary *  propTable );
+    virtual bool 		start( IOService *  provider );
+    virtual void 		stop( IOService * provider );
+    virtual bool 		finalize(IOOptionBits options);
+    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
+    virtual bool		didTerminate( IOService * provider, IOOptionBits options, bool * defer );
+	
+protected:
+		
+    IOReturn			getNubResources( IOService *  regEntry );
+
+    virtual UInt32 		GetErrataBits(
+                                            UInt16 vendorID, 
+                                            UInt16 deviceID, 
+                                            UInt16 revisionID );    
+    
+
+    static IOReturn 		DoDeleteEP( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoAbortEP( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoClearEPStall( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoCreateEP( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+    static IOReturn 		DoControlTransfer( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoIOTransfer( 
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoIsocTransfer(	
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static IOReturn 		DoLowLatencyIsocTransfer(	
+                                            OSObject *	owner, 
+                                            void *	arg0, 
+                                            void *	arg1, 
+                                            void *	arg2, 
+                                            void *	arg3 );
+                                            
+    static void			ControlPacketHandler( 
+                                                    OSObject *	target,
+                                                    void *	parameter,
+                                                    IOReturn	status,
+                                                    UInt32	bufferSizeRemaining );
+                                                    
+    static void			InterruptPacketHandler(
+                                                    OSObject *	target,
+                                                    void * 	parameter,
+                                                    IOReturn	status,
+                                                    UInt32	bufferSizeRemaining );
+                                                    
+    static void			BulkPacketHandler(
+                                                    OSObject *	target,
+                                                    void * 	parameter,
+                                                    IOReturn	status,
+                                                    UInt32	bufferSizeRemaining );
+
+    static void			IsocCompletionHandler(
+                                                    OSObject *		target,
+                                                    void * 		parameter,
+                                                    IOReturn		status,
+                                                    IOUSBIsocFrame	*pFrames );
+                                                    
+    static void			LowLatencyIsocCompletionHandler(
+                                                    OSObject *		target,
+                                                    void * 		parameter,
+                                                    IOReturn		status,
+                                                    IOUSBLowLatencyIsocFrame	*pFrames );
+                                                    
+    static void			WatchdogTimer(OSObject *target, IOTimerEventSource *sender);
+
+	// Obsolete
+    static void 		TerminatePCCard(OSObject *target);
+
+    static IOReturn		ProtectedDevZeroLock(OSObject *target, void* lock, void *, void *, void*);
+
+
+    USBDeviceAddress		GetNewAddress( void );
+    
+    IOReturn    		ControlTransaction( IOUSBCommand *  command );
+    
+    IOReturn    		InterruptTransaction( IOUSBCommand *  command );
+    
+    IOReturn    		BulkTransaction( IOUSBCommand *	command );
+    
+    IOReturn    		IsocTransaction( IOUSBIsocCommand *  command );
+    
+    IOReturn    		LowLatencyIsocTransaction( IOUSBIsocCommand *  command );
+    
+    void 			FreeCommand( IOUSBCommand *  command );
+
+    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    // Invokes the specified completion action of the request.  If
+    // the completion action is unspecified, no action is taken.
+    void 			Complete(
+                     IOUSBCompletion	completion,
+                     IOReturn		status,
+                     UInt32		actualByteCount = 0 );
+
+    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    // Invokes the specified completion action of the request.  If
+    // the completion action is unspecified, no action is taken.
+    void	CompleteWithTimeStamp (
+                                IOUSBCompletionWithTimeStamp		completion,
+                                IOReturn				status,
+                                UInt32					actualByteCount,
+                                AbsoluteTime				timeStamp);
+
+    
+
+    //
+    // UIM methods
+    //
+
+/*!
+    @function UIMInitialize
+    @abstract UIM function, initialise the controller and UIM data structures.
+*/
+    virtual IOReturn 		UIMInitialize( IOService * provider ) = 0;
+    
+/*!
+    @function UIMFinalize
+    @abstract UIM function, finalise the controller and UIM data structures prior to removal.
+*/
+    virtual IOReturn 		UIMFinalize() = 0;
+
+    // Control
+/*!
+    @function UIMCreateControlEndpoint
+    @abstract UIM function, create a control endpoint for the controller.
+    @param functionNumber  The USB device ID of the device for this endpoint
+    @param endpointNumber  The endpoint number for this endpoint
+    @param maxPacketSize   Maximum packet size of this endpoint
+    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
+*/
+    virtual IOReturn 		UIMCreateControlEndpoint(
+                                                            UInt8	functionNumber,
+                                                            UInt8	endpointNumber,
+                                                            UInt16	maxPacketSize,
+                                                            UInt8	speed) = 0;
+
+/* Note: this function has been superceded. */
+    virtual IOReturn 		UIMCreateControlTransfer(   short		functionNumber,
+                                                            short		endpointNumber,
+                                                            IOUSBCompletion	completion,
+                                                            void *		CBP,
+                                                            bool		bufferRounding,
+                                                            UInt32		bufferSize,
+                                                            short		direction) = 0;
+
+/*!
+    @function UIMCreateControlTransfer
+    @abstract UIM function, Do a transfer on a control endpoint.
+                This method supercedes the method which takes a void * parameter.
+    @param functionNumber  The USB device ID of the device to perform the transaction with
+    @param endpointNumber  The endpoint number for the transaction
+    @param completion      Action to perform when I/O completes
+    @param CBP             Memory descriptor describing the buffer to transfer. Will never describe
+                             memory which has disjoint packets.
+    @param bufferRounding  If true, short packets are OK and do not cause an error
+    @param bufferSize      Size of the data to transfer in the data phase. (C
+    @param direction       Specifies direction and PID for transaction. kUSBIn, KUSBOut (DATA PID) or kUSBSetup (SETUP PID).
+*/
+    virtual IOReturn 		UIMCreateControlTransfer(   short			functionNumber,
+                                                            short			endpointNumber,
+                                                            IOUSBCompletion		completion,
+                                                            IOMemoryDescriptor *	CBP,
+                                                            bool			bufferRounding,
+                                                            UInt32			bufferSize,
+                                                            short			direction) = 0;
+    
+    // Bulk
+/*!
+    @function UIMCreateBulkEndpoint
+    @abstract UIM function, create a bulk endpoint for the controller.
+    @param functionNumber  The USB device ID of the device for this endpoint
+    @param endpointNumber  The endpoint number for this endpoint
+    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
+    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
+    @param maxPacketSize   Maximum packet size of this endpoint
+*/
+    virtual IOReturn 		UIMCreateBulkEndpoint(
+                                                        UInt8		functionNumber,
+                                                        UInt8		endpointNumber,
+                                                        UInt8		direction,
+                                                        UInt8		speed,
+                                                        UInt8		maxPacketSize) = 0;
+
+/* Note: this function has been superceded. */
+    virtual IOReturn 		UIMCreateBulkTransfer(  short			functionNumber,
+                                                        short			endpointNumber,
+                                                        IOUSBCompletion		completion,
+                                                        IOMemoryDescriptor *	CBP,
+                                                        bool			bufferRounding,
+                                                        UInt32			bufferSize,
+                                                        short			direction) = 0;
+
+    // Interrupt
+/*!
+    @function UIMCreateInterruptEndpoint
+    @abstract UIM function, create an interrupt endpoint for the controller.
+    @param functionNumber  The USB device ID of the device for this endpoint
+    @param endpointNumber  The endpoint number for this endpoint
+    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
+    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
+    @param maxPacketSize   Maximum packet size of this endpoint
+    @param pollingRate     The maximum polling interval from the endpoint descriptor.
+*/
+    virtual IOReturn		UIMCreateInterruptEndpoint(
+                                                                short		functionAddress,
+                                                                short		endpointNumber,
+                                                                UInt8		direction,
+                                                                short		speed,
+                                                                UInt16		maxPacketSize,
+                                                                short		pollingRate) = 0;
+
+/* Note: this function has been superceded. */
+    virtual IOReturn 		UIMCreateInterruptTransfer( short			functionNumber,
+                                                            short			endpointNumber,
+                                                            IOUSBCompletion		completion,
+                                                            IOMemoryDescriptor *	CBP,
+                                                            bool			bufferRounding,
+                                                            UInt32			bufferSize,
+                                                            short			direction) = 0;
+
+    // Isoch
+/*!
+	@function UIMCreateIsochEndpoint
+    @abstract Create an Isochronous endpoint in the controller.
+    @param functionNumber  The USB device ID of the device for this endpoint
+    @param endpointNumber  The endpoint number for this endpoint
+    @param maxPacketSize   Maximum packet size of this endpoint
+    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
+*/
+    virtual IOReturn 		UIMCreateIsochEndpoint(
+                                                        short		functionAddress,
+                                                        short		endpointNumber,
+                                                        UInt32		maxPacketSize,
+                                                        UInt8		direction) = 0;
+
+/*!
+    @function UIMCreateIsochTransfer
+    @abstract UIM function, Do a transfer on an Isocchronous endpoint.
+    @param functionNumber  The USB device ID of the device to perform the transaction with
+    @param endpointNumber  The endpoint number for the transaction
+    @param completion      Action to perform when I/O completes
+    @param direction       Specifies direction for transfer. kUSBIn or KUSBOut.
+    @param frameStart      The frame number in which to start the transactions
+    @param pBuffer         describes memory buffer. 
+    @param frameCount      number of frames to do transactions in
+    @param pFrames         Describes transactions in individual frames, gives sizes and reults for transactions.
+*/
+    virtual IOReturn 		UIMCreateIsochTransfer(
+                                                        short			functionAddress,
+                                                        short			endpointNumber,
+                                                        IOUSBIsocCompletion	completion,
+                                                        UInt8			direction,
+                                                        UInt64			frameStart,
+                                                        IOMemoryDescriptor *	pBuffer,
+                                                        UInt32			frameCount,
+                                                        IOUSBIsocFrame		*pFrames) = 0;
+
+/*!
+    @function UIMAbortEndpoint
+    @abstract UIM function  Abort the specified endpoint, return all transactions queued on it.
+    @param functionNumber  The USB device ID of the device to Abort
+    @param endpointNumber  The endpoint number to Abort
+    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
+*/
+    virtual IOReturn 		UIMAbortEndpoint(
+                                                short		functionNumber,
+                                                short		endpointNumber,
+                                                short		direction) = 0;
+
+/*!
+    @function UIMDeleteEndpoint
+    @abstract UIM function  Delete the specified endpoint, returning all transactions queued on it.
+    @param functionNumber  The USB device ID of the device to Delete
+    @param endpointNumber  The endpoint number to Delete
+    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
+*/
+    virtual IOReturn 		UIMDeleteEndpoint(
+                                                    short	functionNumber,
+                                                    short	endpointNumber,
+                                                    short	direction) = 0;
+    
+/*!
+    @function UIMClearEndpointStall
+    @abstract UIM function  Clear stall on the specified endpoint, set data toggle to zero,
+                              return all transactions queued on it.
+    @param functionNumber  The USB device ID of the device to Clear
+    @param endpointNumber  The endpoint number to Clear
+    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
+*/
+    virtual IOReturn 		UIMClearEndpointStall(
+                                                        short		functionNumber,
+                                                        short		endpointNumber,
+                                                        short		direction) = 0;
+
+/*!
+    @function UIMRootHubStatusChange
+    @abstract UIM function  UIMRootHubStatusChange - This method was internal to the UIM (never called by the superclass) until
+							IOUSBControllerV3. For UIMs which are a subclass of IOUSBController or IOUSBControllerV2, it can
+							still be used internally only. For subclasses of IOUSBControllerV3, however, the meaning has changed
+							slightly. Now, it is used to determine if there is a status change on the root hub, and if so, it 
+							needs to update the IOUSBControllerV3 instance variable _rootHubStatusChangedBitmap
+*/
+    virtual void 		UIMRootHubStatusChange(void) = 0;
+
+    static const IORegistryPlane	*gIOUSBPlane;
+    
+public:
+
+    static IOUSBLog		*_log;
+	
+    IOCommandGate *		GetCommandGate(void);
+
+    /*!
+	@struct Endpoint
+        Describes an endpoint of a device.
+	Simply an easier to use version of the endpoint descriptor.
+        @field descriptor The raw endpoint descriptor.
+        @field number Endpoint number
+	@field direction Endpoint direction: kUSBOut, kUSBIn, kUSBAnyDirn
+	@field transferType Type of endpoint: kUSBControl, kUSBIsoc, kUSBBulk, kUSBInterrupt
+	@field maxPacketSize Maximum packet size for endpoint
+	@field interval Polling interval in milliseconds (only relevent for Interrupt endpoints)
+    */
+    struct Endpoint {
+        IOUSBEndpointDescriptor	*	descriptor;
+        UInt8 				number;
+        UInt8				direction;	// in, out
+        UInt8				transferType;	// cntrl, bulk, isoc, int
+        UInt16				maxPacketSize;
+        UInt8				interval;
+    };
+
+    // Implements IOService::getWorkLoop const member function
+    virtual IOWorkLoop *	getWorkLoop() const;
+    
+    /*
+     * Root hub methods
+     * Only of interest to the IOUSBRootHubDevice object
+     */
+/*!
+    @function GetRootHubDeviceDescriptor
+    @abstract UIM function, return the device descriptor of the simulated root hub device
+                           As GET_DESCRIPTOR control request for device descrptor
+    @param  desc   Descriptor structure to return data in
+*/
+    virtual IOReturn 		GetRootHubDeviceDescriptor( IOUSBDeviceDescriptor *desc ) = 0;
+    
+/*!
+    @function GetRootHubDescriptor
+    @abstract UIM function, return the hub descriptor of the simulated root hub device
+                           As GET_DESCRIPTOR control request for hub descrptor
+    @param  desc   Descriptor structure to return data in
+*/
+    virtual IOReturn 		GetRootHubDescriptor( IOUSBHubDescriptor *desc ) = 0;
+    
+/*!
+    @function SetRootHubDescriptor
+    @abstract UIM function, optional. Set the hub descriptor data.
+                           As SET_DESCRIPTOR control request for hub descrptor
+    @param  buffer   Descriptor data
+*/
+    virtual IOReturn 		SetRootHubDescriptor( OSData *buffer ) = 0;
+    
+/*!
+    @function GetRootHubConfDescriptor
+    @abstract UIM function, retrun the configuration descriptor of the simulated root hub device
+                           As GET_DESCRIPTOR control request for configuration descrptor
+    @param  desc   Descriptor structure to return data in
+*/
+    virtual IOReturn 		GetRootHubConfDescriptor( OSData *desc ) = 0;
+    
+/*!
+    @function GetRootHubStatus
+    @abstract UIM function, get the status of the root hub. As GET_STATUS control request to device.
+    @param status  Status structure to return
+*/
+    virtual IOReturn 		GetRootHubStatus( IOUSBHubStatus *status ) = 0;
+    
+/*!
+    @function SetRootHubFeature
+    @abstract UIM function, set feature of root hub, As SET_FEATURE control request.
+    @param wValue  The feature to set, as would be transferred in wValue field of SETUP packet.
+*/
+    virtual IOReturn 		SetRootHubFeature( UInt16 wValue ) = 0;
+    
+/*!
+    @function ClearRootHubFeature
+    @abstract UIM function, set feature of root hub, As CLEAR_FEATURE control request.
+    @param wValue  The feature to clear, as would be transferred in wValue field of SETUP packet.
+*/
+    virtual IOReturn		ClearRootHubFeature( UInt16 wValue ) = 0;
+    
+/*!
+    @function GetRootHubPortStatus
+    @abstract UIM function, get the status of a root hub port. As GET_STATUS control request to the port.
+    @param status  Status structure to return
+    @param port    Port to get status for.
+*/
+    virtual IOReturn 		GetRootHubPortStatus( IOUSBHubPortStatus *status, UInt16 port ) = 0;
+    
+/*!
+    @function SetRootHubPortFeature
+    @abstract UIM function, set feature of a root hub port, As SET_FEATURE control request to a port.
+    @param wValue  The feature to set, as would be transferred in wValue field of SETUP packet.
+    @param port    Port to set feature for
+*/
+    virtual IOReturn 		SetRootHubPortFeature( UInt16 wValue, UInt16 port ) = 0;
+    
+/*!
+    @function ClearRootHubPortFeature
+    @abstract UIM function, clear feature of a root hub port, As CLEAR_FEATURE control request to a port.
+    @param wValue  The feature to clear, as would be transferred in wValue field of SETUP packet.
+    @param port    Port to clear feature for
+*/
+    virtual IOReturn 		ClearRootHubPortFeature( UInt16 wValue, UInt16 port ) = 0;
+    
+/*!
+    @function ClearRootHubPortFeature
+    @abstract UIM function, Impliments GET_BUS_STATE control request, now obsolete.
+*/
+    virtual IOReturn 		GetRootHubPortState( UInt8 *state, UInt16 port ) = 0;
+    
+/*!
+    @function SetHubAddress
+    @abstract UIM function, set the address of the simulated root hub device, as SET_ADDRESS
+    @param wValue	 New address for root hub.
+*/
+    virtual IOReturn 		SetHubAddress( UInt16 wValue ) = 0;
+    
+
+    /*!
+		@function openPipe
+        Open a pipe to the specified device endpoint
+        @param address Address of the device on the USB bus
+		@param speed of the device: kUSBHighSpeed or kUSBLowSpeed
+        @param endpoint description of endpoint to connect to
+    */
+    virtual IOReturn 		OpenPipe(   USBDeviceAddress 	address, 
+										UInt8				speed,
+                                        Endpoint *			endpoint );
+    /*!
+        @function closePipe
+        Close a pipe to the specified device endpoint
+        @param address Address of the device on the USB bus
+		@param endpoint description of endpoint
+    */
+    virtual IOReturn 		ClosePipe(	USBDeviceAddress 	address,
+                                        Endpoint *			endpoint );
+
+    // Controlling pipe state
+    /*!
+        @function abortPipe
+        Abort pending I/O to/from the specified endpoint, causing them to complete with return code kIOReturnAborted
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+    */
+    virtual IOReturn 		AbortPipe(
+                                            USBDeviceAddress 	address,
+                                            Endpoint *			endpoint );
+    /*!
+        @function resetPipe
+        Abort pending I/O and clear stalled state - this method is a combination of abortPipe and clearPipeStall
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+    */
+    virtual IOReturn 		ResetPipe(	USBDeviceAddress 	address,
+                                        Endpoint *			endpoint );
+    /*!
+        @function clearPipeStall
+        Clear a pipe stall.
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+    */
+    virtual IOReturn 		ClearPipeStall(	USBDeviceAddress 	address,
+											Endpoint *			endpoint );
+
+    // Transferring Data
+    /*!
+        @function read
+        Read from an interrupt or bulk endpoint
+		@param buffer place to put the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+		@param completion describes action to take when buffer has been filled 
+    */
+    virtual IOReturn 		Read(	IOMemoryDescriptor * 	buffer,
+									USBDeviceAddress		address,
+									Endpoint *				endpoint,
+									IOUSBCompletion *		completion );
+    /*!
+        @function write
+        Write to an interrupt or bulk endpoint
+        @param buffer place to get the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+        @param completion describes action to take when buffer has been emptied
+    */
+    virtual IOReturn 		Write(	IOMemoryDescriptor *	buffer,
+									USBDeviceAddress 	address,
+									Endpoint *		endpoint,
+									IOUSBCompletion *	completion );
+
+    /*!
+        @function isocIO
+        Read from or write to an isochronous endpoint
+        @param buffer place to put the transferred data
+        @param frameStart USB frame number of the frame to start transfer
+        @param numFrames Number of frames to transfer
+        @param frameList Bytes to transfer and result for each frame
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+        @param completion describes action to take when buffer has been filled
+    */
+    virtual IOReturn 		IsocIO(	IOMemoryDescriptor * 	buffer,
+									UInt64					frameStart,
+									UInt32					numFrames,
+									IOUSBIsocFrame *		frameList,
+									USBDeviceAddress		address,
+									Endpoint *				endpoint,
+									IOUSBIsocCompletion *	completion );
+    /*!
+        @function deviceRequest
+        Make a control request to the specified endpoint
+		There are two versions of this method, one uses a simple void *
+        to point to the data portion of the transfer, the other uses an
+		IOMemoryDescriptor to point to the data.
+		@param request parameter block for the control request
+		@param completion describes action to take when the request has been executed
+        @param address Address of the device on the USB bus
+		@param epNum endpoint number
+    */
+    virtual IOReturn 		DeviceRequest(	IOUSBDevRequest *	request,
+											IOUSBCompletion *	completion,
+											USBDeviceAddress 	address, 
+											UInt8				epNum );
+											
+    virtual IOReturn 		DeviceRequest(	IOUSBDevRequestDesc *	request,
+											IOUSBCompletion *		completion,
+											USBDeviceAddress		address, 
+											UInt8					epNum );
+
+    /*
+     * Methods used by the hub driver to initialize a device
+     */
+    /*!
+	@function AcquireDeviceZero
+	Get the device zero lock - call this before resetting a device, to ensure there's
+	only one device with address 0
+    */
+    virtual IOReturn 		AcquireDeviceZero( void );
+    /*!
+        @function ReleaseDeviceZero
+        Release the device zero lock - call this to release the device zero lock,
+		when there is no longer a device at address 0
+    */
+    virtual void			ReleaseDeviceZero( void );
+
+	// non-virtual methods
+    void				WaitForReleaseDeviceZero( void );
+    IOReturn			ConfigureDeviceZero( UInt8 maxPacketSize, UInt8 speed );
+    IOReturn			GetDeviceZeroDescriptor( IOUSBDeviceDescriptor *  desc, UInt16 size );
+    IOReturn			SetDeviceZeroAddress(USBDeviceAddress address);
+    IOUSBDevice *		MakeDevice(USBDeviceAddress *address); 
+    IOUSBHubDevice *	MakeHubDevice(USBDeviceAddress *address); 
+	IOReturn			CreateDevice(	IOUSBDevice *		device,
+										USBDeviceAddress	deviceAddress,
+										UInt8				maxPacketSize,
+										UInt8				speed,
+										UInt32				powerAvailable );
+
+   /*!
+	@function GetBandwidthAvailable
+        Returns the available bandwidth (in bytes) per frame or microframe for
+	isochronous transfers.
+	@result maximum number of bytes that a new iso pipe could transfer
+	per frame given current allocations.
+    */
+    virtual UInt32 		GetBandwidthAvailable( void ) = 0;
+
+    /*!
+        @function GetFrameNumber
+        Returns the full current frame number.
+        @result The frame number.
+    */
+    virtual UInt64 		GetFrameNumber( void ) = 0;
+
+    /*!
+        @function GetFrameNumber32
+        Returns the least significant 32 bits of the frame number.
+        @result The lsb 32 bits of the frame number.
+    */
+    virtual UInt32 		GetFrameNumber32( void ) = 0;
+
+    // Debugger polled mode
+    virtual void 		PollInterrupts( IOUSBCompletionAction safeAction = 0 ) = 0;
+ 
+    virtual IOReturn 		PolledRead(
+                                            short			functionNumber,
+                                            short			endpointNumber,
+                                            IOUSBCompletion		completion,
+                                            IOMemoryDescriptor *	CBP,
+                                            bool			bufferRounding,
+                                            UInt32			bufferSize);
+                                            
+    OSMetaClassDeclareReservedUsed(IOUSBController,  0);
+    virtual void UIMCheckForTimeouts(void);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBController,  1);
+    virtual IOReturn 		UIMCreateControlTransfer(   short		functionNumber,
+                                                            short		endpointNumber,
+                                                            IOUSBCommand*	command,
+                                                            void*		CBP,
+                                                            bool		bufferRounding,
+                                                            UInt32		bufferSize,
+                                                            short		direction);
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  2);
+    virtual IOReturn 		UIMCreateControlTransfer(   short			functionNumber,
+                                                            short			endpointNumber,
+                                                            IOUSBCommand*		command,
+                                                            IOMemoryDescriptor*		CBP,
+                                                            bool			bufferRounding,
+                                                            UInt32			bufferSize,
+                                                            short			direction);
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  3);
+/*!
+    @function UIMCreateBulkTransfer
+    @abstract UIM function, Do a transfer on a bulk endpoint.
+                This method supercedes the method which takes multiple parameters.
+    @param command  paramters for transfer.
+*/
+    virtual IOReturn 		UIMCreateBulkTransfer(IOUSBCommand* command);
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  4);
+/*!
+    @function UIMCreateInterruptTransfer
+    @abstract UIM function, Do a transfer on an interrupt endpoint.
+                This method supercedes the method which takes multiple parameters.
+    @param command  paramters for transfer.
+*/
+    virtual IOReturn 		UIMCreateInterruptTransfer(IOUSBCommand* command);
+
+    /*!
+        @function deviceRequest
+        Make a control request to the specified endpoint
+		There are two versions of this method, one uses a simple void *
+        to point to the data portion of the transfer, the other uses an
+		IOMemoryDescriptor to point to the data.
+		@param request parameter block for the control request
+		@param completion describes action to take when the request has been executed
+        @param address Address of the device on the USB bus
+		@param epNum endpoint number
+    */
+    OSMetaClassDeclareReservedUsed(IOUSBController,  5);
+    virtual IOReturn 		DeviceRequest(  IOUSBDevRequest *	request,
+                                                IOUSBCompletion *	completion,
+                                                USBDeviceAddress 	address, 
+                                                UInt8 			epNum,
+						UInt32			noDataTimeout,
+						UInt32			completionTimeout );
+						
+    OSMetaClassDeclareReservedUsed(IOUSBController,  6);
+    virtual IOReturn 		DeviceRequest(  IOUSBDevRequestDesc *	request,
+                                                IOUSBCompletion *	completion,
+                                                USBDeviceAddress 	address, 
+                                                UInt8 			epNum,
+						UInt32			noDataTimeout,
+						UInt32			completionTimeout );
+
+    
+    
+    OSMetaClassDeclareReservedUsed(IOUSBController,  7);
+    /*!
+        @function read
+        Read from an interrupt or bulk endpoint
+		@param buffer place to put the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+		@param completion describes action to take when buffer has been filled 
+    */
+    virtual IOReturn 		Read(   IOMemoryDescriptor * 	buffer,
+                                        USBDeviceAddress 	address,
+                                        Endpoint *		endpoint,
+                                        IOUSBCompletion *	completion,
+					UInt32			noDataTimeout,
+					UInt32			completionTimeout );
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  8);
+    /*!
+        @function write
+        Write to an interrupt or bulk endpoint
+        @param buffer place to get the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+        @param completion describes action to take when buffer has been emptied
+    */
+    virtual IOReturn 		Write(  IOMemoryDescriptor *	buffer,
+                                        USBDeviceAddress 	address,
+                                        Endpoint *		endpoint,
+                                        IOUSBCompletion *	completion,
+					UInt32			noDataTimeout,
+					UInt32			completionTimeout );
+
+    // this should really not be using a padding slot, since free is in our superclas, but we shipped this way so now we need to leave it.
+    OSMetaClassDeclareReservedUsed(IOUSBController,  9);
+    virtual void free();
+
+protected:
+    	
+/*!
+    @function UIMRootHubStatusChange(bool)
+    @abstract UIM function  UIMRootHubStatusChange(bool) - This method was internal to the UIM (never called by the superclass) until
+							IOUSBControllerV3. For UIMs which are a subclass of IOUSBController or IOUSBControllerV2, it can
+							still be used internally only. For subclasses of IOUSBControllerV3, however, it has become obsolete
+							(it still needs to be implemented since it is pure virtual)
+*/
+    OSMetaClassDeclareReservedUsed(IOUSBController,  10);
+    virtual void 		UIMRootHubStatusChange( bool abort ) = 0;
+
+public:
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  11);
+    virtual IOReturn CreateRootHubDevice( IOService * provider, IOUSBRootHubDevice ** rootHubDevice);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBController,  12);
+    /*!
+        @function Read
+        Read from an interrupt or bulk endpoint
+		@param buffer place to put the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+		@param completion describes action to take when buffer has been filled
+		@param noDataTimeout number of milliseconds of no data movement before the request is aborted
+		@param completionTimeout number of milliseonds after the command is on the bus in which it must complete
+		@param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
+    */
+    virtual IOReturn 		Read(   IOMemoryDescriptor * 	buffer,
+                                        USBDeviceAddress 	address,
+                                        Endpoint *		endpoint,
+                                        IOUSBCompletion *	completion,
+					UInt32			noDataTimeout,
+					UInt32			completionTimeout,
+					IOByteCount		reqCount );
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  13);
+    /*!
+        @function Write
+        Write to an interrupt or bulk endpoint
+        @param buffer place to get the transferred data
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+        @param completion describes action to take when buffer has been emptied
+		@param noDataTimeout number of milliseconds of no data movement before the request is aborted
+		@param completionTimeout number of milliseonds after the command is on the bus in which it must complete
+		@param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
+    */
+    virtual IOReturn 		Write(  IOMemoryDescriptor *	buffer,
+                                        USBDeviceAddress 	address,
+                                        Endpoint *		endpoint,
+                                        IOUSBCompletion *	completion,
+					UInt32			noDataTimeout,
+					UInt32			completionTimeout,
+					IOByteCount		reqCount );
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  14);
+    
+    virtual IOReturn GetRootHubStringDescriptor(UInt8	index, OSData *desc) = 0;
+    
+    OSMetaClassDeclareReservedUsed(IOUSBController,  15);
+    /*!
+        @function IsocIO
+        Read from or write to an isochronous endpoint
+        @param buffer place to put the transferred data
+        @param frameStart USB frame number of the frame to start transfer
+        @param numFrames Number of frames to transfer
+        @param frameList Bytes to transfer and result for each frame
+        @param address Address of the device on the USB bus
+        @param endpoint description of endpoint
+        @param completion describes action to take when buffer has been filled
+        @param updateFrequency describes how often to update the framelist once the transfer has completed (in ms)
+    */
+    virtual IOReturn IsocIO(  IOMemoryDescriptor * 			buffer,
+                                        UInt64 				frameStart,
+                                        UInt32 				numFrames,
+                                        IOUSBLowLatencyIsocFrame *	frameList,
+                                        USBDeviceAddress 		address,
+                                        Endpoint *			endpoint,
+                                        IOUSBLowLatencyIsocCompletion *	completion,
+                                        UInt32				updateFrequency );
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  16);
+    
+    /*!
+		@function UIMCreateIsochTransfer
+		@abstract UIM function, Do a transfer on an Isocchronous endpoint.
+		@param functionNumber  The USB device ID of the device to perform the transaction with
+		@param endpointNumber  The endpoint number for the transaction
+		@param completion      Action to perform when I/O completes
+		@param direction       Specifies direction for transfer. kUSBIn or KUSBOut.
+		@param frameStart      The frame number in which to start the transactions
+		@param pBuffer         describes memory buffer. 
+		@param frameCount      number of frames to do transactions in
+		@param pFrames         Describes transactions in individual frames, gives sizes and reults for transactions.
+		@param updateFrequency Describes how often we update the frameList parameters (in ms)
+	*/
+    virtual IOReturn 		UIMCreateIsochTransfer(
+                                                        short			functionAddress,
+                                                        short			endpointNumber,
+                                                        IOUSBIsocCompletion	completion,
+                                                        UInt8			direction,
+                                                        UInt64			frameStart,
+                                                        IOMemoryDescriptor *	pBuffer,
+                                                        UInt32			frameCount,
+                                                        IOUSBLowLatencyIsocFrame *pFrames,
+                                                        UInt32			updateFrequency);
+
+
+    OSMetaClassDeclareReservedUsed(IOUSBController,  17);
+    virtual IOReturn 		CheckForDisjointDescriptor(IOUSBCommand *command, UInt16 maxPacketSize);
+    
+    /*!
+		@function UIMCreateIsochTransfer
+		@abstract UIM function, Do a transfer on an Isocchronous endpoint.
+		@param command  an IOUSBIsocCommand object with all the necessary information
+	 */
+    OSMetaClassDeclareReservedUsed(IOUSBController,  18);
+	virtual IOReturn UIMCreateIsochTransfer(IOUSBIsocCommand *command);
+	
+	// do not use this slot without first checking bug rdar://6022420
+    OSMetaClassDeclareReservedUnused(IOUSBController,  19);
+    
+protected:
+    void	IncreaseIsocCommandPool();
+    void 	IncreaseCommandPool();
+    void	ParsePCILocation(const char *str, int *deviceNum, int *functionNum);
+    int		ValueOfHexDigit(char c);
+};
+
+#endif /* ! _IOKIT_IOUSBCONTROLLER_H */
+
diff --git a/i386/include/IOKit/usb/IOUSBControllerListElement.h b/i386/include/IOKit/usb/IOUSBControllerListElement.h
new file mode 100644
index 0000000..7351177
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBControllerListElement.h
@@ -0,0 +1,126 @@
+/*
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1998-2007 Apple Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOUSBCONTROLLERLISTELEMENT_H
+#define _IOUSBCONTROLLERLISTELEMENT_H
+
+
+#include <libkern/c++/OSObject.h>
+
+#include <IOKit/IOTypes.h>
+
+#include <IOKit/usb/USB.h>
+
+
+/*!
+ @class IOUSBControllerListElement
+ @abstract Used by the IOUSBController to manage the USB controller lists that are common between EHCI and UHCI.
+ */
+class IOUSBControllerListElement : public OSObject
+{
+    OSDeclareDefaultStructors(IOUSBControllerListElement)
+	
+private:    
+	
+public:
+	
+    virtual void					SetPhysicalLink(IOPhysicalAddress next) = 0;
+    virtual IOPhysicalAddress		GetPhysicalLink(void) = 0;
+    virtual IOPhysicalAddress		GetPhysicalAddrWithType(void) = 0;
+    virtual void					print(int level);
+	
+    IOPhysicalAddress				_sharedPhysical;			// phys address of the memory shared with the controller			
+    void *							_sharedLogical;				// logical address of the above
+    IOUSBControllerListElement		*_logicalNext;				// the next element in the list
+    
+};
+
+
+class IOUSBControllerV2;										// needed for a parameter
+class IOUSBControllerIsochEndpoint;
+
+class IOUSBControllerIsochListElement : public IOUSBControllerListElement
+{
+    OSDeclareDefaultStructors(IOUSBControllerIsochListElement)
+	
+private:
+    
+public:
+	
+    virtual void					SetPhysicalLink(IOPhysicalAddress next) = 0;
+    virtual IOPhysicalAddress		GetPhysicalLink(void) = 0;
+    virtual IOPhysicalAddress		GetPhysicalAddrWithType(void) = 0;
+    virtual void					print(int level);
+	
+    IOUSBControllerIsochEndpoint	*_pEndpoint;
+    IOUSBIsocFrame					*_pFrames;
+    IOUSBIsocCompletion				_completion;
+    Boolean							_lowLatency;
+	bool							_requestFromRosettaClient; // True if the request originated from a Rosetta client in user space
+	UInt8							_framesInTD;			// used for HS Isoch only
+    UInt64							_frameNumber;			// frame number for scheduling purposes
+    UInt32							_frameIndex;			// index into the myFrames array
+    IOUSBControllerIsochListElement *_doneQueueLink;		// linkage used by done queue processing
+	
+    // pure virtual methods which must be implemented by descendants
+    virtual IOReturn				UpdateFrameList(AbsoluteTime timeStamp) = 0;
+    virtual IOReturn				Deallocate(IOUSBControllerV2 *uim) = 0;
+};
+
+class IOUSBControllerIsochEndpoint : public OSObject
+{
+    OSDeclareDefaultStructors(IOUSBControllerIsochEndpoint)
+	
+public:
+	
+	virtual bool init();
+
+    IOUSBControllerIsochEndpoint		*nextEP;
+    IOUSBControllerIsochListElement  	*toDoList;					// ITD or SITD
+    IOUSBControllerIsochListElement  	*toDoEnd;					// ITD or SITD
+    IOUSBControllerIsochListElement  	*doneQueue;					// ITD or SITD
+    IOUSBControllerIsochListElement  	*doneEnd;					// ITD or SITD
+    IOUSBControllerIsochListElement  	*deferredQueue;				// ITD or SITD
+    IOUSBControllerIsochListElement  	*deferredEnd;				// ITD or SITD
+    UInt64								firstAvailableFrame;		// next frame available for a transfer on this EP
+    UInt32								maxPacketSize;
+    UInt32								activeTDs;					// + when added to todo list, - when taken from done queue
+    UInt32								onToDoList;					// + when added to todo list, - when taken from done queue
+    UInt32								onDoneQueue;					// + when added to todo list, - when taken from done queue
+	volatile SInt32						scheduledTDs;				// + when linked onto periodic list, - when unlinked
+	UInt32								deferredTDs;
+	UInt32								onProducerQ;
+	UInt32								onReversedList;
+    UInt16								inSlot;						// where Isoc TDs are being put in the periodic list 
+    short								functionAddress;
+    short								endpointNumber;
+    IOReturn							accumulatedStatus;
+	UInt32								interval;					// this is the decoded interval value for HS endpoints and is 1 for FS endpoints
+    UInt8								direction;
+	bool								aborting;
+};
+
+
+#endif
+
diff --git a/i386/include/IOKit/usb/IOUSBControllerV2.h b/i386/include/IOKit/usb/IOUSBControllerV2.h
new file mode 100644
index 0000000..4d2c306
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBControllerV2.h
@@ -0,0 +1,374 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.2 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBCONTROLLERV2_H
+#define _IOKIT_IOUSBCONTROLLERV2_H
+
+#include <IOKit/IODMACommand.h>
+
+#include <IOKit/usb/IOUSBControllerListElement.h>
+#include <IOKit/usb/IOUSBController.h>
+
+enum
+{
+    kUSBHSHubCommandAddHub	= 1,
+    kUSBHSHubCommandRemoveHub	= 2,
+    
+    kUSBHSHubFlagsMultiTT	= 1
+};
+
+
+/*!
+    @class IOUSBControllerV2
+    @abstract subclass of the IOUSBController to provide support for high speed 
+                devices and split transactions.
+    @discussion The IOUSBController class provide sufficient functionality to 
+                work with full (12Mb/s) and low (1.5Mb/s) devices. IOUSBControllerV2
+                introduces the support for high (480Mb/s) speed devices from the
+                USB 2.0 spec. In particular IOUSBControllerV2 indicates the high
+                speed hub a full or low speed device is attached to so that split
+                transactions can be directed to the hub at high speed to be forwarded
+                to the full or low speed device by the hub.
+                It also gives support for bulk endoints of greater than 256 bytes.
+*/
+
+class IOUSBControllerV2 : public IOUSBController
+{
+    OSDeclareAbstractStructors(IOUSBControllerV2)
+
+protected:
+    
+    // These for keeping track of high speed ancestor to allow controller to do splits.
+    //
+    UInt8 _highSpeedHub[128];
+    UInt8 _highSpeedPort[128];
+
+    struct V2ExpansionData { 
+		UInt8										_multiTT[128];
+		IOUSBCommand								*ClearTTCommand;
+		IOUSBControllerIsochEndpoint				*_isochEPList;						// linked list of active Isoch "endpoints"
+		IOUSBControllerIsochEndpoint				*_freeIsochEPList;					// linked list of freed Isoch EP data structures
+		thread_call_t								_returnIsochDoneQueueThread;
+	};
+    V2ExpansionData *_v2ExpansionData;
+
+    // Super's expansion data
+    #define _freeUSBCommandPool					_expansionData->freeUSBCommandPool
+    #define _freeUSBIsocCommandPool				_expansionData->freeUSBIsocCommandPool
+    #define _watchdogUSBTimer					_expansionData->watchdogUSBTimer
+    #define _controllerTerminating				_expansionData->_terminating
+    #define _watchdogTimerActive				_expansionData->_watchdogTimerActive
+    #define _busNumber							_expansionData->_busNumber
+    #define _currentSizeOfCommandPool			_expansionData->_currentSizeOfCommandPool
+    #define _currentSizeOfIsocCommandPool		_expansionData->_currentSizeOfIsocCommandPool
+    #define _controllerSpeed					_expansionData->_controllerSpeed
+	#define _activeIsochTransfers				_expansionData->_activeIsochTransfers
+
+	// this class's expansion data
+	#define _isochEPList						_v2ExpansionData->_isochEPList
+	#define _freeIsochEPList					_v2ExpansionData->_freeIsochEPList
+	#define _returnIsochDoneQueueThread			_v2ExpansionData->_returnIsochDoneQueueThread
+	
+    virtual bool 		init( OSDictionary *  propTable );
+    virtual bool 		start( IOService *  provider );
+    virtual void		free();
+
+    static IOReturn  DoCreateEP(OSObject *owner,
+                           void *arg0, void *arg1,
+                           void *arg2, void *arg3);
+
+    static void		clearTTHandler( 
+							OSObject *	target,
+                            void *	parameter,
+                            IOReturn	status,
+                            UInt32	bufferSizeRemaining );
+
+public:
+
+        /*!
+        @function openPipe
+         Open a pipe to the specified device endpoint
+         @param address Address of the device on the USB bus
+         @param speed of the device: kUSBDeviceSpeedLow, kUSBDeviceSpeedFull or kUSBDeviceSpeedHigh
+         @param endpoint description of endpoint to connect to
+         */
+        virtual IOReturn 		OpenPipe(   USBDeviceAddress 	address,
+                                       UInt8 		speed,
+                                       Endpoint *		endpoint );
+
+    /*!
+    @function CreateDevice
+    @abstract Create a new device as IOUSBController, making a note of the
+                high speed hub device ID and port number the full/low speed
+                device is attached to.
+    @param newDevice       new device object to work with
+    @param deviceAddress   USB device ID
+    @param maxPacketSize   max packet size of endpoint zero
+    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
+    @param powerAvailable  power available to the device 
+    @param hub             USB ID of hub the device is immediatly attached to. (Not necessarily high speed)
+    @param port            port number of port the device is attached to.
+*/
+    virtual  IOReturn CreateDevice(	IOUSBDevice 		*newDevice,
+                                    USBDeviceAddress	deviceAddress,
+                                    UInt8		 	maxPacketSize,
+                                    UInt8			speed,
+                                    UInt32			powerAvailable,
+                                    USBDeviceAddress		hub,
+                                    int      port);
+
+/*!
+	@function ConfigureDeviceZero
+    @abstract configure pipe zero of device zero, as IOUSBController, but also keeping 
+                 note of high speed hub device is attached to.
+    @param maxPacketSize  max packet size for the pipe
+    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
+    @param hub            USB ID of hub the device is immediatly attached to.  (Not necessarily high speed)
+    @param port           port number of port the device is attached to.
+*/
+    virtual  IOReturn ConfigureDeviceZero(UInt8 maxPacketSize, UInt8 speed, USBDeviceAddress hub, int port);
+
+/*!
+	@function UIMCreateControlEndpoint
+    @abstract Create an endpoint in the controller to do control transactions.
+    @param functionNumber  USB device ID of device
+    @param endpointNumber  endpoint address of the endpoint in the device
+    @param maxPacketSize   maximum packet size of this endpoint
+    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
+    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
+                           address split transactions to.
+    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
+*/
+    virtual IOReturn 		UIMCreateControlEndpoint(
+                                                            UInt8	functionNumber,
+                                                            UInt8	endpointNumber,
+                                                            UInt16	maxPacketSize,
+                                                            UInt8	speed,
+                                                            USBDeviceAddress highSpeedHub,
+                                                            int      highSpeedPort) = 0;
+
+/*!
+	@function UIMCreateBulkEndpoint
+    @abstract Create an endpoint in the controller to do bulk transactions.
+    @param functionNumber  USB device ID of device
+    @param endpointNumber  endpoint address of the endpoint in the device
+    @param direction       Direction of data flow. kUSBIn or kUSBOut
+    @param maxPacketSize   maximum packet size of this endpoint
+    @param speed           speed of the device kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
+    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
+                           address split transactions to.
+    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
+*/
+    virtual IOReturn 		UIMCreateBulkEndpoint(
+                                                        UInt8		functionNumber,
+                                                        UInt8		endpointNumber,
+                                                        UInt8		direction,
+                                                        UInt8		speed,
+                                                        UInt16		maxPacketSize,
+                                                        USBDeviceAddress highSpeedHub,
+                                                        int      highSpeedPort) = 0;
+
+/*!
+	@function UIMCreateInterruptEndpoint
+    @abstract Create an endpoint in the controller to do interrupt transactions.
+    @param functionAddress USB device ID of device
+    @param endpointNumber  endpoint address of the endpoint in the device
+    @param direction       Direction of data flow. kUSBIn or kUSBOut
+    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
+    @param maxPacketSize   maximum packet size of this endpoint
+    @param pollingRate     The maximum polling interval from the endpoint descriptor.
+    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
+                           address split transactions to.
+    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
+*/
+    virtual IOReturn		UIMCreateInterruptEndpoint(
+                                                                short		functionAddress,
+                                                                short		endpointNumber,
+                                                                UInt8		direction,
+                                                                short		speed,
+                                                                UInt16		maxPacketSize,
+                                                                short		pollingRate,
+                                                                USBDeviceAddress highSpeedHub,
+                                                                int      highSpeedPort) = 0;
+
+/*!
+	@function UIMCreateIsochEndpoint
+    @abstract Create an endpoint in the controller to do Isochronous transactions.
+    @param functionAddress USB device ID of device
+    @param endpointNumber  endpoint address of the endpoint in the device
+    @param maxPacketSize   maximum packet size of this endpoint
+    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
+    @param highSpeedHub    If non zero, this is a full speed device, the address of the high speed hub to
+                           address split transactions to.
+    @param highSpeedPort   If highSpeedHub is non zero, the hub port to address split transactions to
+*/
+    virtual IOReturn 		UIMCreateIsochEndpoint(
+                                                        short				functionAddress,
+                                                        short				endpointNumber,
+                                                        UInt32				maxPacketSize,
+                                                        UInt8				direction,
+                                                        USBDeviceAddress	highSpeedHub,
+                                                        int					highSpeedPort) = 0;
+
+
+	static void 				ReturnIsochDoneQueueEntry(OSObject *target, thread_call_param_t endpointPtr);
+
+	
+	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  0);
+    virtual IOReturn		AddHSHub(USBDeviceAddress highSpeedHub, UInt32 flags);
+    
+    static IOReturn DOHSHubMaintenance(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  1);
+    virtual IOReturn 		UIMHubMaintenance(USBDeviceAddress highSpeedHub, UInt32 highSpeedPort, UInt32 command, UInt32 flags);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  2);
+    virtual IOReturn		RemoveHSHub(USBDeviceAddress highSpeedHub);
+    
+    static IOReturn DOSetTestMode(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  3);
+    virtual IOReturn		SetTestMode(UInt32 mode, UInt32 port);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  4);
+    virtual IOReturn		UIMSetTestMode(UInt32 mode, UInt32 port);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  5);
+    virtual UInt64		GetMicroFrameNumber( void );
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  6);
+    virtual void ClearTT(USBDeviceAddress addr, UInt8 endpt, Boolean IN);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  7);
+    /*!
+        @function Read
+     Read from an interrupt or bulk endpoint
+     @param buffer place to put the transferred data
+     @param address Address of the device on the USB bus
+     @param endpoint description of endpoint
+     @param completion describes action to take when buffer has been filled
+     @param noDataTimeout number of milliseconds of no data movement before the request is aborted
+     @param completionTimeout number of milliseonds after the command is on the bus in which it must complete
+     @param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
+     */
+    virtual IOReturn ReadV2( IOMemoryDescriptor *			buffer,
+                           USBDeviceAddress					address,
+                           Endpoint *						endpoint,
+                           IOUSBCompletionWithTimeStamp *	completion,
+                           UInt32							noDataTimeout,
+                           UInt32							completionTimeout,
+                           IOByteCount						reqCount );
+    
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  8);
+/*!
+	@function UIMCreateIsochEndpoint
+    @abstract Create an endpoint in the controller to do Isochronous transactions.
+    @param functionAddress USB device ID of device
+    @param endpointNumber  endpoint address of the endpoint in the device
+    @param maxPacketSize   maximum packet size of this endpoint
+    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
+    @param highSpeedHub    If non zero, this is a full speed device, the address of the high speed hub to
+                           address split transactions to.
+    @param highSpeedPort   If highSpeedHub is non zero, the hub port to address split transactions to
+	@param interval		   The encoded interval value from the endpoint descriptor
+*/
+    virtual IOReturn 		UIMCreateIsochEndpoint(		short				functionAddress,
+                                                        short				endpointNumber,
+                                                        UInt32				maxPacketSize,
+                                                        UInt8				direction,
+                                                        USBDeviceAddress	highSpeedHub,
+                                                        int					highSpeedPort,
+														UInt8				interval);
+
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  9);
+	virtual IOUSBControllerIsochEndpoint*		AllocateIsochEP(void);	
+	
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  10);
+	virtual IOReturn							DeallocateIsochEP(IOUSBControllerIsochEndpoint *pEP);
+
+	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  11);
+    virtual IOUSBControllerIsochEndpoint* 	FindIsochronousEndpoint(short functionNumber, short endpointNumber, short direction, IOUSBControllerIsochEndpoint* *pEDBack);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  12);
+    virtual IOUSBControllerIsochEndpoint*	CreateIsochronousEndpoint(short functionNumber, short endpointNumber, short direction);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  13);
+    virtual void								PutTDonToDoList(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  14);
+    virtual IOUSBControllerIsochListElement		*GetTDfromToDoList(IOUSBControllerIsochEndpoint* pED);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  15);
+    virtual void								PutTDonDeferredQueue(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  16);
+	virtual IOUSBControllerIsochListElement		*GetTDfromDeferredQueue(IOUSBControllerIsochEndpoint* pED);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  17);
+    virtual void								PutTDonDoneQueue(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD, bool checkDeferred);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  18);
+    virtual IOUSBControllerIsochListElement		*GetTDfromDoneQueue(IOUSBControllerIsochEndpoint* pED);
+	
+	// 7185026 - this is to make this call from behind the gate
+    static IOReturn		GatedGetTDfromDoneQueue(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  19);
+    virtual void								ReturnIsochDoneQueue(IOUSBControllerIsochEndpoint*);
+
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  20);
+	virtual IODMACommand						*GetNewDMACommand();
+	
+    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  21);
+	/*!
+	 @function GetLowLatencyOptionsAndPhysicalMask
+	 @abstract Low Latency transfers require that the client have access to the memory after the Isochronous I/O request has already been scheduled. This might be used, for example to fill in outgoing data "just in time." Some controllers, however, may have requirements which need to be followed in order to make sure that the memory buffer isn't moved after the call is made. This call will return an IOOptionBits and mach_vm_address_t which can be used in a call to IOBufferMemoryDescriptor::inTaskWithPhysicalMask which will help meet these requirements.
+	 @param optionBits Pointer to an an IOOptionBits. The only bit which may be returned is kIOMemoryPhysicallyContiguous. Other bits, e.g. direction bits, must be ORd in by the client as needed. This call replaces the old property based method of obtaining this information.
+	 @param physicalMask  Pointer to a mach_vm_address_t which should be used in the call to IOBufferMemoryDescriptor::inTaskWithPhysicalMask and will guarantee that when the memory is wired down it will be accessible by both the client and the USB controller at the same time.
+	 @result returns kIOReturnSuccess if the method is implemented by the controller, otherwise kIOReturnUnsupported
+	 */
+    virtual IOReturn 		GetLowLatencyOptionsAndPhysicalMask(IOOptionBits *optionBits, mach_vm_address_t *physicalMask);
+	
+	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  22);
+	/*!
+	 @function GetFrameNumberWithTime
+	 @abstract Real Time A/V applications send and receive Iscohronous data scheduled on certain USB frame numbers. The clock for these frame numbers is independent of the system clock, and drivers need to synchronize these two clocks. This routine will return a system time which corresponds to the beginning of a USB frame number. It is not necessarily the currrent frame, but it will be a frame in the recent past (within the past minute). The jitter between the start of the USB frame and the system time will be as low as possible, but due to hardware interrupt latencies could be as high as 200 microseconds.
+	 @param frameNumber A pointer to a UInt64 in which to hold the USB frame number corresponding to the given system time.
+	 @param theTime A pointer to an AbsoluteTime corresponding to the system time at the beginning of the given USB frame number.
+	 @result returns kIOReturnSuccess if the method is implemented by the controller, otherwise kIOReturnUnsupported
+	 */
+	virtual IOReturn		GetFrameNumberWithTime(UInt64* frameNumber, AbsoluteTime *theTime);
+	
+	
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  23);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  24);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  25);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  26);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  27);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  28);
+    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  29);
+    
+};
+
+
+#endif /* ! _IOKIT_IOUSBCONTROLLERV2_H */
diff --git a/i386/include/IOKit/usb/IOUSBControllerV3.h b/i386/include/IOKit/usb/IOUSBControllerV3.h
new file mode 100644
index 0000000..22da915
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBControllerV3.h
@@ -0,0 +1,233 @@
+/*
+* Copyright (c) 2007-2008 Apple Inc. All rights reserved.
+*
+* @APPLE_LICENSE_HEADER_START@
+* 
+* The contents of this file constitute Original Code as defined in and
+* are subject to the Apple Public Source License Version 1.2 (the
+* "License").  You may not use this file except in compliance with the
+* License.  Please obtain a copy of the License at
+* http://www.apple.com/publicsource and read it before using this file.
+* 
+* This Original Code and all software distributed under the License are
+* distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
+* Please see the License for the specific language governing rights and 
+* limitations under the License.
+* 
+* @APPLE_LICENSE_HEADER_END@
+*/
+
+#ifndef _IOKIT_IOUSBCONTROLLERV3_H
+#define _IOKIT_IOUSBCONTROLLERV3_H
+
+#include <IOKit/pci/IOPCIDevice.h>
+
+#include <IOKit/usb/IOUSBControllerV2.h>
+#include <IOKit/usb/IOUSBHubDevice.h>
+
+// Constants that define the different power states in the setPowerState call
+enum
+{
+    kUSBPowerStateOff				= 0,				// controller is reset, nothing is attached
+    kUSBPowerStateRestart			= 1,				// same as OFF
+    kUSBPowerStateSleep				= 2,				// controller is suspended, preparing to lose main power
+    kUSBPowerStateLowPower			= 3,				// controller is suspended, power remains on
+    kUSBPowerStateOn				= 4,				// up and running
+	kUSBNumberBusPowerStates		= 5
+};
+
+#define kUSBPowerStateStable		-1
+
+enum
+{
+    kUSBBusStateReset				= 0,				// bus is in RESET
+    kUSBBusStateSuspended			= 1,				// bus is in SUSPEND mode
+    kUSBBusStateRunning				= 2					// bus is operational
+};
+
+
+// Root Hub things
+typedef struct IOUSBRootHubInterruptTransaction 
+{
+    IOMemoryDescriptor *		buf;
+    UInt32						bufLen;
+    IOUSBCompletion				completion;
+} IOUSBRootHubInterruptTransaction;
+
+enum 
+{
+	  kIOUSBMaxRootHubTransactions  = 2
+};
+
+
+
+/*!
+ @class IOUSBControllerV3
+ @abstract subclass of the IOUSBControllerV2 to provide support for new USB Power Management techniques.
+ @discussion With Leopard, we are providing more information to USB Device Drivers in the IOPower
+ tree to allow for more efficient Power Management. This controller class encapulates many of the changes
+ needed for that, without disturbing third party subclasses of IOUSBController or IOUSBControllerV2
+ */
+
+class IOUSBControllerV3 : public IOUSBControllerV2
+{	
+		OSDeclareAbstractStructors(IOUSBControllerV3)
+
+	protected:
+		// static variable shared by all instances
+		static uint32_t *				_gHibernateState;
+
+	
+		UInt8							_myBusState;					// kUSBBusStateReset, kUSBBusStateSuspended, kUSBBusStateRunning
+		bool							_wakingFromHibernation;			// True while the Hibernation Wake thread is active
+		bool							_needToAckPowerDown;			// True while we are changing power state due to shutdown/restart
+		bool							_onCardBus;						// OBSOLETE
+		bool							_controllerAvailable;			// true if we can talk to the controller
+		SInt32							_powerStateChangingTo;			// a power state that we are in the process of changing to, or -1 if we are stable
+		bool							_poweringDown;					// true is the controller is powering down because of a systemWillPowerDown message
+		bool							_restarting;					// true is the controller is restarting because of a systemWillPowerDown message
+		unsigned long					_myPowerState;					// my current state (since getPowerState doesn't always change in time)
+		IOUSBControllerV3				*_ehciController;				// set if I am a companion controller
+		unsigned long					_numPowerStates;				// how many power states do I support (defaults to kUSBNumDefaultPowerStates)
+		IOPMPowerState					*_myPowerStates;				// my power state array (allocated on the fly)
+		IOPCIDevice						*_device;						// my PCI device
+
+		// root hub support
+	    IOTimerEventSource					*_rootHubTimer;				// timer which fires at the rate of the root hub interrupt endpoint
+		UInt8								_rootHubPollingRate;		// Obsolete -- we need to have it be a uint32_t
+		UInt8								_rootHubNumPorts;			// number of root hub ports - should be 15 or fewer!
+		UInt16								_rootHubStatusChangedBitmap;	// support up to 15 ports for status changes
+		bool								_rootHubTimerActive;		// UNUSED
+		IOUSBRootHubInterruptTransaction	_outstandingRHTrans[4];		// Transactions for the Root Hub.  We need 2, one for the current transaction and one for the next.  This is declared as 4 for binary compatibility
+
+		struct V3ExpansionData { 
+			uint32_t				_rootHubPollingRate32;
+			bool					_rootHubTransactionWasAborted;
+		};
+		V3ExpansionData *_v3ExpansionData;
+
+		// IOKit methods
+		virtual bool					init( OSDictionary *  propTable );
+		virtual bool					start( IOService *  provider );
+		virtual void					stop( IOService * provider );
+		virtual unsigned long			maxCapabilityForDomainState ( IOPMPowerFlags domainState );
+		virtual unsigned long			initialPowerStateForDomainState ( IOPMPowerFlags domainState );
+		virtual IOReturn				powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+		virtual IOReturn				setPowerState( unsigned long powerStateOrdinal, IOService* whatDevice );
+		virtual IOReturn				powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+		virtual void					powerChangeDone ( unsigned long fromState);
+		virtual void					systemWillShutdown( IOOptionBits specifier );
+		virtual void					free(void);
+	
+		// IOUSBController methods
+		// we override these to deal with methods attempting to go through the workloop while we are in sleep
+		virtual IOReturn 		AcquireDeviceZero( void );
+		virtual void			ReleaseDeviceZero( void );
+		virtual IOReturn 		DeviceRequest(IOUSBDevRequest *request,  IOUSBCompletion *completion, USBDeviceAddress address, UInt8 epNum, UInt32 noDataTimeout, UInt32 completionTimeout);
+		virtual IOReturn 		DeviceRequest(IOUSBDevRequestDesc *request,  IOUSBCompletion *completion, USBDeviceAddress address, UInt8 epNum, UInt32 noDataTimeout, UInt32 completionTimeout);
+		virtual IOReturn 		ClosePipe(USBDeviceAddress address, Endpoint *endpoint);
+		virtual IOReturn 		AbortPipe(USBDeviceAddress address, Endpoint *endpoint);
+		virtual IOReturn 		ResetPipe(USBDeviceAddress address, Endpoint *endpoint);
+		virtual IOReturn 		ClearPipeStall(USBDeviceAddress address, Endpoint *endpoint);
+		virtual IOReturn 		Read(IOMemoryDescriptor *buffer, USBDeviceAddress address, Endpoint *endpoint, IOUSBCompletion *completion, UInt32 noDataTimeout, UInt32 completionTimeout, IOByteCount reqCount);
+		virtual IOReturn 		Write(IOMemoryDescriptor *buffer, USBDeviceAddress address, Endpoint *endpoint, IOUSBCompletion *completion, UInt32 noDataTimeout, UInt32 completionTimeout, IOByteCount reqCount);
+		virtual IOReturn		IsocIO(IOMemoryDescriptor *buffer, UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList, USBDeviceAddress address, Endpoint *endpoint, IOUSBIsocCompletion *completion );
+		virtual IOReturn		IsocIO(IOMemoryDescriptor *buffer, UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList, USBDeviceAddress address, Endpoint *endpoint, IOUSBLowLatencyIsocCompletion *completion, UInt32 updateFrequency );	
+
+		// IOUSBControllerV2 methods
+		// we override these to deal with methods attempting to go through the workloop while we are in sleep
+		virtual IOReturn 		OpenPipe(USBDeviceAddress address, UInt8 speed, Endpoint *endpoint);
+		virtual IOReturn		AddHSHub(USBDeviceAddress highSpeedHub, UInt32 flags);
+		virtual IOReturn		RemoveHSHub(USBDeviceAddress highSpeedHub);
+		virtual IOReturn		SetTestMode(UInt32 mode, UInt32 port);
+		virtual IOReturn		ReadV2(IOMemoryDescriptor *buffer, USBDeviceAddress	address, Endpoint *endpoint, IOUSBCompletionWithTimeStamp *completion, UInt32 noDataTimeout, UInt32	completionTimeout, IOByteCount reqCount);
+	
+		// IOUSBControllerV3 methods
+	
+		// these are called through the workloop
+		static IOReturn					DoEnableAddressEndpoints(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
+		static IOReturn					DoEnableAllEndpoints(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
+		static IOReturn					GatedPowerChange(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
+
+		// also on the workloop
+	    static void						RootHubTimerFired(OSObject *owner, IOTimerEventSource *sender);
+	
+		// subclassable methods
+		virtual IOReturn				CheckForEHCIController(IOService *provider);
+		virtual	IOReturn				AllocatePowerStateArray(void);
+		virtual	IOReturn				InitForPM(void);
+		virtual IOReturn				CheckPowerModeBeforeGatedCall(char *fromStr);
+		virtual IOReturn				EnableAllEndpoints(bool enable);
+		virtual IOReturn				EnableBusMastering(bool enable);
+		virtual IOReturn				EnsureUsability(void);
+		virtual IOReturn				CheckForRootHubChanges(void);
+		virtual IOReturn				RootHubQueueInterruptRead(IOMemoryDescriptor *buf, UInt32 bufLen, IOUSBCompletion completion);
+		virtual IOReturn				RootHubAbortInterruptRead(void);
+		virtual IOReturn				RootHubStartTimer(UInt8 pollingRate);			// Obsolete see RootHubStartTimer32
+		virtual IOReturn				RootHubStopTimer(void);
+	
+		// these methods have a default implementation using some of the virtual methods below
+		virtual	void					ControllerOff(void);
+		virtual	void					ControllerRestart(void);
+		virtual	void					ControllerSleep(void);
+		virtual	void					ControllerDoze(void);
+		virtual	void					ControllerOn(void);
+
+		// these methods are pure virtual, and need to be implemented in the subclass driver
+		virtual	IOReturn				ResetControllerState(void) = 0;
+		virtual IOReturn				RestartControllerFromReset(void) = 0;
+		virtual	IOReturn				SaveControllerStateForSleep(void) = 0;
+		virtual	IOReturn				RestoreControllerStateFromSleep(void) = 0;
+		virtual IOReturn				DozeController(void) = 0;
+		virtual IOReturn				WakeControllerFromDoze(void) = 0;
+		virtual IOReturn				UIMEnableAddressEndpoints(USBDeviceAddress address, bool enable) = 0;
+		virtual IOReturn				UIMEnableAllEndpoints(bool enable) = 0;
+		virtual IOReturn				EnableInterruptsFromController(bool enable) = 0;
+	
+	public:
+	
+		// public methods
+		virtual IOReturn				EnableAddressEndpoints(USBDeviceAddress address, bool enable);
+		virtual bool					IsControllerAvailable(void);
+		virtual IOReturn				HandlePowerChange(unsigned long powerStateOrdinal);
+		virtual	UInt32					AllocateExtraRootHubPortPower(UInt32 extraPowerRequested);
+		virtual	void					ReturnExtraRootHubPortPower(UInt32 extraPowerReturned);
+	
+	OSMetaClassDeclareReservedUsed(IOUSBControllerV3,  0);
+	virtual IOReturn				RootHubStartTimer32(uint32_t pollingRate);
+	
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  1);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  2);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  3);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  4);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  5);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  6);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  7);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  8);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  9);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  10);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  11);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  12);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  13);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  14);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  15);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  16);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  17);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  18);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  19);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  20);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  21);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  22);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  23);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  24);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  25);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  26);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  27);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  28);
+	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  29);
+};
+
+#endif		// _IOKIT_IOUSBCONTROLLERV3_H
\ No newline at end of file
diff --git a/i386/include/IOKit/usb/IOUSBDevice.h b/i386/include/IOKit/usb/IOUSBDevice.h
new file mode 100644
index 0000000..58d73a0
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBDevice.h
@@ -0,0 +1,639 @@
+/*
+ * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.2 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __OPEN_SOURCE__
+/*
+ *
+ *	$Log: IOUSBDevice.h,v $
+ *	Revision 1.65  2009/10/18 20:20:37  nano
+ *	Bring in fixes in 390.4.0 QL:  7310698 7301024 7307079 and 7310698
+ *
+ *	Revision 1.64.32.4  2009/10/15 21:17:43  nano
+ *	If OverrideAtLocationID does not see a override property, return true
+ *	
+ *	Revision 1.64.32.3.2.1  2009/10/15 21:36:27  nano
+ *	If OverrideAtLocationID does not see a override property, return true
+ *	
+ *	Revision 1.64.32.3  2009/10/14 19:16:15  nano
+ *	Minor name changes
+ *	
+ *	Revision 1.64.32.2  2009/10/14 19:05:21  nano
+ *	7284477 7293893 Simplify scheme to decide whether we want to override a property for a hub at a particular ID for a particular MacModel.  Added a IOUSBDevice API that tells us if we are in the right model and locationID to override a property
+ *	
+ *	Revision 1.64.32.1  2009/10/08 19:55:56  nano
+ *	rdar://7284477 Allow us to overide the config descriptor of a 2514 hub on a K23F
+ *	
+ *	Revision 1.64  2009/09/08 12:28:45  nano
+ *	<rdar://problem/7195788> IOUSBDevice headerdoc comment problem - GetNumConfigs name is wrong, should be GetNumConfigurations
+ *	
+ *	Revision 1.63  2009/05/07 19:43:09  nano
+ *	Move our SnowLeopard branch to TOT
+ *	
+ *	Revision 1.57.84.6  2009/03/13 22:45:11  nano
+ *	Bring in branches to fix 6676089 6675858 6567987 6490273
+ *	
+ *	Revision 1.57.84.5.4.1  2009/03/11 20:01:56  nano
+ *	rdar://6567987  Do not let a Reset or a ReEnumerate through while the other is executing.
+ *	
+ *	Revision 1.57.84.5  2009/02/26 13:44:32  nano
+ *	Bring in rdar://6536090&6586312 to SL branch
+ *	
+ *	Revision 1.57.84.4.10.1  2009/02/25 00:51:06  rhoads
+ *	change the mechanism of getConfigLock so as to prevent a deadlock
+ *	
+ *	Revision 1.57.84.4  2009/02/13 15:57:33  rhoads
+ *	roll in rdars: 6213394, 6489431, 6513000, 6515115, 6535200, 6567783
+ *	
+ *	Revision 1.57.84.3.48.3  2009/02/11 19:19:08  rhoads
+ *	add back an expansionData variable to preserve binary compatibility
+ *	
+ *	Revision 1.57.84.3.48.2  2009/02/11 03:05:56  arulchan
+ *	more ::SuspendDevice changes
+ *	
+ *	Revision 1.57.84.3.48.1  2009/01/23 21:34:15  arulchan
+ *	fix for rdar://6213394
+ *	
+ *	Revision 1.57.84.3  2008/06/16 21:31:16  nano
+ *	Bring in changes from Foxhound 320.2.17
+ *	
+ *	Revision 1.57.84.2  2008/04/22 22:38:01  nano
+ *	Bring in changes from Foxhound-320.2.9
+ *	
+ *	Revision 1.60.28.2  2008/05/22 17:36:18  nano
+ *	Fix the reporting of the internal bit for GetDeviceInformation
+ *	
+ *	Revision 1.60.28.1  2008/05/21 17:51:43  nano
+ *	<rdar://problem/5952635> GetDeviceInformation needs some fixes
+ *	
+ *	Revision 1.60  2008/04/18 22:03:28  nano
+ *	Bring in fix for rdar://5874560
+ *	
+ *	Revision 1.59.4.1  2008/04/18 21:55:55  nano
+ *	<rdar://problem/5874560> Need API to know how much extra power has been allocated
+ *	
+ *	Revision 1.59  2008/04/17 16:56:57  nano
+ *	Bring in branches for rdar://5867990 & rdar://5768343
+ *	
+ *	Revision 1.58.4.1  2008/04/16 20:26:13  nano
+ *	<rdar://problem/5867990> Add API to allocate sleep current, as well as making sure that we return any extra power if our client dies or our device is terminated without returning it
+ *	
+ *	Revision 1.58  2008/04/14 16:08:38  nano
+ *	Add new APIs for high power and for GetDeviceInformation.
+ *	
+ *	Revision 1.57.126.2  2008/04/13 05:25:40  nano
+ *	Call into PolicyMaker for the GetPortInformation
+ *	
+ *	Revision 1.57.126.1  2008/04/11 22:25:44  nano
+ *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
+ *	
+ *	Revision 1.57  2007/08/07 20:30:36  rhoads
+ *	rolled in a few branches to TOT
+ *	
+ *	Revision 1.56.92.1  2007/08/07 03:43:34  nano
+ *	Bring in more changes for M89 suppport -- like actually use the dang power if the properties are available
+ *	
+ *	Revision 1.56  2007/03/06 12:23:41  rhoads
+ *	roll in 5024412, 5035829, and 5039670
+ *	
+ *	Revision 1.55.30.1  2007/02/27 16:08:33  rhoads
+ *	some fine tuning of our IOService overrides, including not overriding willTerminate and didTerminate (5024412)
+ *	
+ *	Revision 1.55  2007/01/19 17:58:48  rhoads
+ *	roll in branches for a leopard build
+ *	
+ *	Revision 1.54.30.1  2007/01/17 16:37:02  rhoads
+ *	remove the IOUSBDevice::attach method which is not really useful
+ *	
+ *	Revision 1.54  2006/10/06 04:42:01  rhoads
+ *	roll in branches 4727961, 4758404, 4759810, 4760274, and 4762769
+ *	
+ *	Revision 1.53.4.1  2006/10/04 16:03:57  rhoads
+ *	better IOUSBHubDevice design
+ *	
+ */
+#endif
+
+#ifndef _IOKIT_IOUSBDEVICE_H
+#define _IOKIT_IOUSBDEVICE_H
+
+#include <IOKit/usb/IOUSBNub.h>
+#include <IOKit/usb/IOUSBPipe.h>
+#include <IOKit/IOBufferMemoryDescriptor.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOCommandGate.h>
+
+#include <kern/thread_call.h>
+
+// The following are definitions for errata properties needed for different devices.  This
+// should be but in the dictionary of the IOUSBDevice in question.  This can be achieved
+// by using the AppleUSBMergeNub class and having an IOProviderMergeProperties dictionary
+// with the required properties.
+
+// This property allows a device to specify a configuration value of 0 in its configuration
+// descriptor.  This does not follow the spec, but we will allow it in order to get the device 
+// to work.  The property should be a Boolean
+//
+#define kAllowConfigValueOfZero		"kAllowZeroConfigValue"
+#define kAllowNumConfigsOfZero		"kAllowZeroNumConfigs"
+
+
+class IOUSBController;
+class IOUSBControllerV2;
+class IOUSBInterface;
+class IOUSBHubPolicyMaker;
+/*!
+    @class IOUSBDevice
+    @abstract The IOService object representing a device on the USB bus.
+    @discussion This class provides functionality to configure a device and to create
+	IOUSBInterface objects to represent the interfaces of the device.
+*/
+
+class IOUSBDevice : public IOUSBNub
+{
+    friend class IOUSBController;
+    friend class IOUSBControllerV2;
+    friend class IOUSBInterface;
+    friend class IOUSBPipe;
+   
+    OSDeclareDefaultStructors(IOUSBDevice)
+
+protected:
+
+    USBDeviceAddress				_address;
+    IOUSBController *	     		_controller;
+    IOUSBPipe *						_pipeZero;
+    IOUSBDeviceDescriptor			_descriptor;
+    UInt32							_busPowerAvailable;
+    UInt8							_speed;
+    IOUSBEndpointDescriptor			_endpointZero; 				// Fake ep for control pipe
+    void *							_port;					// Obsolete, do not use
+    IOBufferMemoryDescriptor**		_configList;
+    IOUSBInterface**				_interfaceList;
+    UInt8							_currentConfigValue;
+    UInt8							_numInterfaces;
+    
+    struct ExpansionData 
+    {
+        UInt32					_portNumber;
+        thread_call_t			_doPortResetThread;
+        IOUSBDevice *			_usbPlaneParent;
+        bool					_portResetThreadActive;
+        bool					_allowConfigValueOfZero;
+        thread_call_t			_doPortSuspendThread;
+        bool					_portSuspendThreadActive;
+        thread_call_t			_doPortReEnumerateThread;
+        bool					_resetInProgress;
+        bool					_portHasBeenReset;
+        IORecursiveLock*		_XgetConfigLock;				// Obsolete
+        bool					_doneWaiting;                   // Obsolete
+        bool					_notifiedWhileBooting;          // Obsolete
+        IOWorkLoop *			_workLoop;
+        IOTimerEventSource *	_notifierHandlerTimer;
+        UInt32					_notificationType;
+        bool					_suspendInProgress;
+        bool					_portHasBeenSuspendedOrResumed;
+        bool					_addExtraResetTime;
+		bool					_suspendCommand;
+		IOCommandGate *			_commandGate;
+		OSSet *					_openInterfaces;
+		bool					_resetCommand;
+		IOReturn				_resetError;
+		IOReturn				_suspendError;
+        thread_call_t			_doMessageClientsThread;
+		IOUSBHubPolicyMaker *	_hubPolicyMaker;
+		UInt32					_sleepPowerAllocated;				// how much sleep power we already gave to our client
+		UInt32					_wakePowerAllocated;				// how much extra power during wake did we already give our client
+		UInt32					_devicePortInfo;
+		bool					_deviceIsInternal;					// Will be set if all our upstream hubs are captive (internal to the computer)
+		bool					_deviceIsInternalIsValid;			// true if we have already determined whether the device is internal
+		bool					_newGetConfigLock;					// new lock, taken within the WL gate, when doing a GetConfig
+		UInt32					_resetAndReEnumerateLock;			// "Lock" to prevent us from doing a reset or a re-enumerate while the other one is in progress		
+		UInt32					_locationID;
+    };	
+    ExpansionData * _expansionData;
+
+    const IOUSBConfigurationDescriptor *FindConfig(UInt8 configValue, UInt8 *configIndex=0);
+
+    virtual IOUSBInterface * GetInterface(const IOUSBInterfaceDescriptor *interface);
+
+public:
+    virtual IOReturn SetFeature(UInt8 feature);
+
+protected:    
+    virtual IOReturn GetConfigDescriptor(UInt8 configIndex, void *data, UInt32 len);
+
+    virtual IOReturn GetDeviceDescriptor(IOUSBDeviceDescriptor *desc, UInt32 size);
+
+    virtual bool init(USBDeviceAddress deviceAddress, UInt32 powerAvaiable, UInt8 speed, UInt8 maxPacketSize );
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 *score);
+    
+public:
+    // IOService methods
+    virtual bool		init( void );
+    virtual bool		start( IOService *provider );	
+	virtual bool		handleIsOpen(const IOService *forClient) const;
+	virtual bool		handleOpen(IOService *forClient, IOOptionBits options, void *arg);
+	virtual void		handleClose(IOService *forClient, IOOptionBits options);
+    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
+    virtual bool		terminate( IOOptionBits options = 0 );
+    virtual bool		requestTerminate( IOService * provider, IOOptionBits options );
+    virtual void		stop( IOService *provider );
+    virtual bool		finalize(IOOptionBits options);
+	virtual void		free( void );	
+
+	// IOUSBDevice methods
+    virtual void SetProperties();
+    
+    static IOUSBDevice *NewDevice(void);
+    
+    virtual void SetPort(void *port);			// Obsolete, do NOT use
+
+    /*!
+	@function FindNextInterfaceDescriptor
+	return a pointer to the next interface descriptor within the given full configuration descriptor satisfying the requirements specified, or NULL if there aren't any.
+        @param configDescIn the configuration descriptor within which to search. obtained from GetFullConfigurationDescriptor(configIndex). use NULL to specify the current configuration's descriptor.
+        @param intfDesc interface descriptor from which to start the search. NULL for the first interface descriptor in the given configuration descriptor
+        @param request IOUSBFindInterfaceRequest specifying the desired interface. Not changed.
+        @param descOut pointer to placeholder for the returned descriptor ptr
+	@result returns kIOReturnBadArgument if configDesc is not correct, or if configDesc is NULL and the device is not configured, or if intfDesc is not in configDesc. Otherwise returns kIOReturnSuccess or kIOUSBInterfaceNotFound.
+    */
+    virtual IOReturn FindNextInterfaceDescriptor(const IOUSBConfigurationDescriptor *configDescIn, 
+                                                 const IOUSBInterfaceDescriptor *intfDesc,
+                                                 const IOUSBFindInterfaceRequest *request,
+                                                 IOUSBInterfaceDescriptor **descOut);
+    /*!
+	@function FindNextInterface
+	return an pointer to an IOUSBInterface object satisfying the requirements specified in request, or NULL if there aren't any. the device
+        must be configured for there to be any interfaces.
+        @param current interface to start searching from, NULL to start at the beginning of the device's interface list for the current configuration.
+	@param request specifies what properties an interface must have to match.
+	@result Pointer to a matching IOUSBInterface, or NULL if none match. Note: The IOUSBInterface is NOT retained for the caller. If the caller wishes to continue to use the returned object, it should call retain() on that object.
+    */
+    virtual IOUSBInterface *FindNextInterface(IOUSBInterface *current,
+                                              IOUSBFindInterfaceRequest *request);
+
+    /*!
+        @function CreateInterfaceIterator 
+        return an OSIterator to iterate through interfaces satisfying the requirements specified in request.                        
+        @param request specifies what properties an interface must have to match.
+        @result Pointer to an OSIterator.
+    */
+    virtual OSIterator *CreateInterfaceIterator(IOUSBFindInterfaceRequest *request);
+
+    // Get pointer to full config info (cached in device, don't free returned pointer)
+    /*!
+	@function GetFullConfigurationDescriptor
+	return a pointer to all the descriptors for the requested configuration.
+        @param configIndex The configuration index (not the configuration value)
+	@result Pointer to the descriptors, which are cached in the IOUSBDevice object.
+    */
+    virtual const IOUSBConfigurationDescriptor *GetFullConfigurationDescriptor(UInt8 configIndex);
+
+    /*!
+	@function GetConfigurationDescriptor
+        Copy the specified amount of data for a configuration into the suppled buffer.
+        @param configValue The configuration value
+	@param data Buffer to copy data into
+	@param len number of bytes to copy
+    */
+    virtual IOReturn GetConfigurationDescriptor(UInt8 configValue, void *data, UInt32 len);
+
+    /*!
+	@function ResetDevice
+	Reset the device, returning it to the addressed, unconfigured state.
+	This is useful if a device has got badly confused. Note that the AppleUSBComposite driver will automatically
+        reconfigure the device if it is a composite device.
+    */
+    virtual IOReturn ResetDevice();
+
+    /*!
+	@function SetConfiguration
+	Do a USB SetConfiguration call to the device. The caller must have the device open() in order to 
+	actually cause a configuration change. If the device is currently configured, all IOUSBInterface objects
+	associated with the device are freed. After the new configuration has been set, all of its IOUSBInterface objects are
+	instantiated automatically.
+	@param forClient The client requesting the configuration change
+	@param configValue The desired configuration value.
+	@param startInterfaceMatching A boolean specifying whether IOKit should begin the process of finding
+	matching drivers for the new IOUSBInterface objects.
+    */
+    virtual IOReturn SetConfiguration(IOService *forClient, UInt8 configValue, bool startInterfaceMatching=true);
+    
+    // Access to addressing and cached info
+    /*!
+        @function GetAddress
+        returns the bus address of the device
+    */
+    virtual USBDeviceAddress GetAddress(void);
+    
+    /*!
+        @function GetSpeed
+        returns the speed of the device
+    */
+    virtual UInt8 GetSpeed(void);
+    /*!
+        @function GetBus
+        returns a pointer to the IOUSBController object for the device
+    */
+    virtual IOUSBController *GetBus(void);
+    /*!
+        @function GetBusPowerAvailable
+        returns the power available to the device, in units of 2mA
+    */
+    virtual UInt32 GetBusPowerAvailable( void );
+    /*!
+        @function GetMaxPacketSize
+        returns the maximum packet size for endpoint zero (only 8, 16, 32, 64 are valid)
+    */
+    virtual UInt8 GetMaxPacketSize(void);
+    /*!
+        @function GetVendorID
+        returns the Vendor ID of the device
+    */
+    virtual UInt16 GetVendorID(void);
+    /*!
+        @function GetProductID
+        returns the Product ID of the device
+    */
+    virtual UInt16 GetProductID(void);
+    /*!
+        @function GetDeviceRelease
+        returns the DeviceRelease information
+    */
+    virtual UInt16 GetDeviceRelease(void);
+    /*!
+        @function GetNumConfigurations
+        returns the number of configs in the device config descriptor
+    */
+    virtual UInt8 GetNumConfigurations(void);
+    /*!
+        @function GetManufacturerStringIndex
+        returns the index of string descriptor describing manufacturer
+    */
+    virtual UInt8 GetManufacturerStringIndex(void );
+    /*!
+        @function GetProductStringIndex
+        returns the index of string descriptor describing product
+    */
+    virtual UInt8 GetProductStringIndex(void );
+    /*!
+        @function GetSerialNumberStringIndex
+        returns the index of string descriptor describing the device's serial number
+    */
+    virtual UInt8 GetSerialNumberStringIndex(void );
+    /*!
+        @function GetPipeZero
+        returns a pointer to the device's default control pipe
+    */
+    virtual IOUSBPipe * GetPipeZero(void);
+
+	// Deprecated but needed for binary compatibility
+    virtual IOUSBPipe*	MakePipe(const IOUSBEndpointDescriptor *ep);
+    
+    // this method is deprecated. use the other DeviceRequest methods
+    virtual IOReturn DeviceRequest(IOUSBDevRequest	*request,
+                                IOUSBCompletion	*completion = 0);
+
+    // Same but with a memory descriptor
+    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc	*request,
+                                   IOUSBCompletion	*completion = 0);
+
+    /*!
+	@function GetConfiguration
+	Gets the current configuration from the IOUSBDevice object.  Note that this call will send a control
+        request on the bus to get the current configuration from the physical device.
+	@param configNum Pointer to place to store configuration value.
+    */
+    virtual IOReturn GetConfiguration(UInt8 *configNumber);
+
+    /*!
+        @function GetDeviceStatus
+        Gets the device's status.  Note that this sends a control request to the physical device.
+        @param status Pointer to place to store the status.
+    */
+    virtual IOReturn GetDeviceStatus(USBStatus *status);
+
+    /*! 
+	@function GetStringDescriptor
+	Get a string descriptor as ASCII, in the specified language (default is US English)
+	@param index Index of the string descriptor to get.
+	@param buf Pointer to place to store ASCII string
+	@param maxLen Size of buffer pointed to by buf
+        @param lang Language to get string in (default is US English)
+    */
+    virtual IOReturn GetStringDescriptor(UInt8 index, char *buf, int maxLen, UInt16 lang=0x409);
+    
+    /*! 
+	@function GetChildLocationID
+	Get the locationID (UInt32) given the port number and the parent's location
+	@param parentLocationID locationID for the hub to which this device is attached.
+	@param port Port number of the hub where this device is attached
+    */
+    virtual UInt32 GetChildLocationID(UInt32 parentLocationID, int port);
+
+    virtual const IOUSBDescriptorHeader* FindNextDescriptor(const void *cur, UInt8 descType);
+
+    virtual void 	DisplayNotEnoughPowerNotice();
+    
+    // this is a non-virtual function so that we don't have to take up a binary compatibility slot.
+    UInt16	GetbcdUSB(void);
+    UInt8	GetProtocol(void);
+	void	SetBusPowerAvailable(UInt32 newPower);
+
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  0);
+    /*!
+	@function DeviceRequest
+        @abstract execute a control request to the default control pipe (pipe zero)
+        @param request The parameter block to send to the device
+        @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
+        if no data has been transferred on the bus.
+        @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
+        not been completed.
+		@param completion Function to call when request completes. If omitted then
+	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
+	 the IOUSBDevRequest is not released until the callback has occurred.
+
+    */
+    virtual IOReturn DeviceRequest(IOUSBDevRequest	*request,
+				UInt32 noDataTimeout,
+				UInt32 completionTimeout,
+                                IOUSBCompletion	*completion = 0);
+
+    /*!
+	 @function DeviceRequest
+	 @abstract execute a control request to the default control pipe (pipe zero)
+	 @param request The parameter block to send to the device (with the pData as an IOMemoryDesriptor)
+	 @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
+	 if no data has been transferred on the bus.
+	 @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
+	 not been completed.
+	 @param completion Function to call when request completes. If omitted then
+	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
+	 the IOUSBDevRequest is not released until the callback has occurred.
+	 
+	 */
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  1);
+    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc	*request,
+				    UInt32 noDataTimeout,
+				    UInt32 completionTimeout,
+				    IOUSBCompletion	*completion = 0);
+
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  2);
+    /*!
+	@function SuspendDevice
+        @abstract Instruct the hub to which this device is attached to suspend or resume the port to which the device is attached.
+        Note that if there are any outstanding transactions on any pipes in the device, those transactions will get returned with a 
+        kIOReturnNotResponding error.
+        @param suspend Boolean value. true = suspend, false = resume.
+    */
+    virtual IOReturn SuspendDevice( bool suspend);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  3);
+    /*!
+	@function ReEnumerateDevice
+        @abstract Instruct the hub to which this device is attached to reset the port to which this device is attached. This causes the
+        IOUSBDevice object and any child objects (IOUSBInterface objects or driver objects) to be terminated, and the device to be
+        completely reenumerated, as if it had been detached and reattached.
+        @param options Reserved for future use.
+    */
+    virtual IOReturn ReEnumerateDevice( UInt32 options );
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  4);
+    /*!
+        @function DisplayUserNotification
+        @abstract  Will use the KUNCUserNotification mechanism to display a notification to the user.
+        @param notificationType Which notification to display.
+     */
+    virtual void	DisplayUserNotification(UInt32 notificationType);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  5);
+	/*!
+        @function MakePipe
+	 @abstract build a pipe on a given endpoint
+	 @param ep A description of the endpoint
+	 @param interface The IOUSBInterface object requesting the pipe
+	 returns the desired IOUSBPipe object
+	 */
+    virtual IOUSBPipe*	MakePipe(const IOUSBEndpointDescriptor *ep, IOUSBInterface *interface);
+    
+	
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  6);
+	/*!
+	 @function SetHubParent
+	 @abstract Used by the hub driver to give the nub a pointer to its HubPolicyMaker object
+	 @param hubPolicyMaker	The object representing the Hub driver
+	 */
+    virtual void	SetHubParent(IOUSBHubPolicyMaker *hubParent);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  7);
+	/*!
+	 @function GetHubParent
+	 @abstract Used by the hub driver to give the nub a pointer to its HubPolicyMaker object
+	 @param hubPolicyMaker	The object representing the Hub driver
+	 */
+    virtual IOUSBHubPolicyMaker*	GetHubParent();
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  8);
+    /*!
+	 @function 	GetDeviceInformation
+	 @abstract 	Returns status information about the USB device, such as whether the device is captive or whether it is in the suspended state.
+	 @param requestedPower 	The desired amount of power that the client wishes to reserve
+	 @result 		Actual power that was reserved
+	 
+		*/
+	virtual IOReturn	GetDeviceInformation(UInt32 *info);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  9);
+    /*!
+	 @function				RequestExtraPower
+	 @abstract				Clients can use this API to reserve extra power for use by this device while the machine is asleep or while it is awake.  Units are milliAmps (mA).
+	 @param type			Indicates whether the power is to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
+	 @param requestedPower 	Amount of power desired, in mA
+	 @result				Amount of power actually reserved, in mA.  It can be less than the requested or zero.
+	 
+	 */
+	virtual UInt32	RequestExtraPower(UInt32 type, UInt32 requestedPower);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  10);
+    /*!
+	 @function				ReturnExtraPower
+	 @abstract				Clients can use this API to tell the system that they will not use power that was previously reserved by using the RequestExtraPower API.
+	 @param type			Indicates whether the power is to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
+	 @param returnedPower 	Amount of power that is no longer needed, in mA
+	 @result				If the returnedPower was not previously allocated, an error will be returned.  This will include the case for power that was requested for sleep but was returned for wake.
+	 
+	 */
+	virtual IOReturn		ReturnExtraPower(UInt32 type, UInt32 returnedPower);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  11);
+    /*!
+	 @function				GetExtraPowerAllocated
+	 @abstract				Clients can use this API to ask how much extra power has already been reserved by this device.  Units are milliAmps (mA).
+	 @param type			Indicates whether the allocated power was to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
+	 @result				Amount of power allocated, in mA.
+	 
+	 */
+	virtual UInt32			GetExtraPowerAllocated(UInt32 type);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBDevice,  12);
+    /*!
+	 @function				DoLocationOverrideAndModelMatch
+	 @abstract				Will look for a kOverrideIfAtLocationID array proerty with locationID entries and a "MacModel" property.  If any of the locationIDs match to the Mac Model, will return true.
+	 						If there is no kOverrideAtLocationID property, it will also return true.
+	 @result				True if we have a match, false otherwise
+	 */
+	virtual	bool			DoLocationOverrideAndModelMatch();
+	
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  13);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  14);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  15);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  16);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  17);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  18);
+    OSMetaClassDeclareReservedUnused(IOUSBDevice,  19);
+    
+private:
+
+    static void 	ProcessPortResetEntry(OSObject *target);
+    void 		ProcessPortReset(void);
+
+    void 		TerminateInterfaces(void);
+
+    static void 	ProcessPortReEnumerateEntry(OSObject *target, thread_call_param_t options);
+    void 		ProcessPortReEnumerate(UInt32 options);
+	
+    static void 	DoMessageClientsEntry(OSObject *target, thread_call_param_t messageStruct);
+    void 		DoMessageClients( void * messageStructPtr);
+	
+    static void 	DisplayUserNotificationForDeviceEntry (OSObject *owner, IOTimerEventSource *sender);
+    void		DisplayUserNotificationForDevice( );
+    
+    UInt32              SimpleUnicodeToUTF8(UInt16 uChar, UInt8 utf8Bytes[4]);
+    void                SwapUniWords (UInt16  **unicodeString, UInt32 uniSize);
+
+    IOReturn			TakeGetConfigLock(void);
+    IOReturn			ReleaseGetConfigLock(void);
+    static IOReturn		ChangeGetConfigLock(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+};
+
+#endif /* _IOKIT_IOUSBDEVICE_H */
diff --git a/i386/include/IOKit/usb/IOUSBHIDDriver.h b/i386/include/IOKit/usb/IOUSBHIDDriver.h
new file mode 100644
index 0000000..5e76887
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBHIDDriver.h
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef IOUSBHIDDRIVER_H
+#define IOUSBHIDDRIVER_H
+
+#include <IOKit/IOBufferMemoryDescriptor.h>
+
+#include <IOKit/hid/IOHIDDevice.h>
+
+#include <IOKit/usb/IOUSBBus.h>
+#include <IOKit/usb/IOUSBInterface.h>
+#include <IOKit/usb/USB.h>
+
+
+#define ENABLE_HIDREPORT_LOGGING	0
+
+// Report types from low level USB:
+//	from USBSpec.h:
+//    enum {
+//        kHIDRtInputReport		= 1,
+//        kHIDRtOutputReport		= 2,
+//        kHIDRtFeatureReport		= 3
+//    };
+//    
+//	from IOHIDDescriptorParser.h:
+//    // types of HID reports (input, output, feature)
+//    enum
+//    {
+//        kHIDInputReport			= 	1,
+//        kHIDOutputReport,
+//        kHIDFeatureReport,
+//        kHIDUnknownReport		=	255
+//    };
+//    
+// Report types from high level HID Manager:
+//	from IOHIDKeys.h:
+//    enum IOHIDReportType
+//    {
+//        kIOHIDReportTypeInput = 0,
+//        kIOHIDReportTypeOutput,
+//        kIOHIDReportTypeFeature,
+//        kIOHIDReportTypeCount
+//    };
+//
+#define HIDMGR2USBREPORTTYPE(x) (x + 1)
+#define USB2HIDMGRREPORTTYPE(x) (x - 1)
+
+
+// Note: In other Neptune files, kMaxHIDReportSize was defined as 64. But Ferg & Keithen were unable to
+// find that value in the USB HID 1.1 specs. Brent had previously changed it to 256 in the OS 9 HID Driver
+// to  allow for reports spanning multiple packets. 256 may be no more a hard and fast limit, but it's 
+// working for now in OS 9.
+#define kMaxHIDReportSize 256			// Max packet size = 8 for low speed & 64 for high speed.
+#define kHIDDriverRetryCount	3
+#define	kUSBHIDReportLoggingLevel	"USB HID Report Logging Level"
+
+
+// power states for the driver (awake or suspended)
+enum
+{
+	kUSBHIDPowerStateOff		= 0,
+	kUSBHIDPowerStateRestart	= 1,
+	kUSBHIDPowerStateSleep		= 2,			// this could be system sleep or idle sleep
+	kUSBHIDPowerStateLowPower	= 3,			// this is idling
+	kUSBHIDPowerStateOn			= 4,			// this is fully on
+	kUSBHIDNumberPowerStates	= 5
+};
+
+
+/*!
+ @class IOUSBHIDDriver
+ @abstract Driver that matches to USB HID devices.
+ @discussion This class can be overriden to provide for specific behaviors.
+ */
+class IOUSBHIDDriver : public IOHIDDevice
+{
+    OSDeclareDefaultStructors(IOUSBHIDDriver)
+
+    IOUSBInterface *			_interface;
+    IOUSBDevice	*				_device;
+    IOUSBPipe *					_interruptPipe;
+    UInt32						_maxReportSize;
+    IOBufferMemoryDescriptor *	_buffer;
+    IOUSBCompletion				_completion;
+    UInt32						_retryCount;
+    thread_call_t				_deviceDeadCheckThread;
+    thread_call_t				_clearFeatureEndpointHaltThread;
+    bool						_deviceDeadThreadActive;
+    bool						_deviceIsDead;                          // Should really be called "abort expected"
+    bool						_deviceHasBeenDisconnected;
+    bool						_needToClose;
+    UInt32						_outstandingIO;
+    IOCommandGate *				_gate;
+    IOUSBPipe *					_interruptOutPipe;
+    UInt32						_locationID; 	
+    IOBufferMemoryDescriptor *	_outBuffer;								// Obsolete
+    UInt32						_deviceUsage;							// Obsolete
+    UInt32						_deviceUsagePage;						// Obsolete
+
+    struct IOUSBHIDDriverExpansionData 
+    {
+        IOWorkLoop	*					_workLoop;
+        thread_call_t					_handleReportThread;
+        IOService *						_rootDomain;
+        AbsoluteTime					_wakeUpTime;
+        IOUSBCompletionWithTimeStamp	_completionWithTimeStamp;
+        bool							_checkForTimeStamp;
+        UInt32							_msToIgnoreTransactionsAfterWake;
+        IOTimerEventSource	*			_suspendPortTimer;
+		bool							_portSuspended;
+		UInt32							_suspendTimeoutInMS;
+		UInt8							_interfaceNumber;
+		bool							_logHIDReports;
+		UInt8							_hidLoggingLevel;
+		bool							_needToClearPipeStall;
+		SInt32							_queuedReports;
+		AbsoluteTime					_interruptTimeStamp;
+		bool							_powerStateChanging;
+		unsigned long					_myPowerState;
+		bool							_pendingRead;
+		UInt32							_deviceDeadCheckLock;			// "Lock" to prevent us from executing the device dead check while in progress		
+    };
+    IOUSBHIDDriverExpansionData *_usbHIDExpansionData;
+    
+    static void 		InterruptReadHandlerEntry(OSObject *target, void *param, IOReturn status, UInt32 bufferSizeRemaining);
+    static void 		InterruptReadHandlerWithTimeStampEntry(OSObject *target, void *param, IOReturn status, UInt32 bufferSizeRemaining, AbsoluteTime timeStamp);
+    void				InterruptReadHandler(IOReturn status, UInt32 bufferSizeRemaining, AbsoluteTime timeStamp);
+
+    static void 		CheckForDeadDeviceEntry(OSObject *target);
+    void				CheckForDeadDevice();
+
+    static void			ClearFeatureEndpointHaltEntry(OSObject *target);
+    void				ClearFeatureEndpointHalt(void);
+    
+    static void			HandleReportEntry(OSObject *target, thread_call_param_t timeStamp);
+    void				HandleReport(AbsoluteTime timeStamp);
+    
+    virtual void 		processPacket(void *data, UInt32 size);		// Obsolete
+
+    static IOReturn		ChangeOutstandingIO(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+    static IOReturn		ClaimPendingRead(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+
+    static void			SuspendPortTimer(OSObject *target, IOTimerEventSource *sender);
+
+public:
+        
+    // IOService methods
+    //
+    virtual bool			init(OSDictionary *properties);
+    virtual bool			start(IOService * provider);
+    virtual bool			didTerminate( IOService * provider, IOOptionBits options, bool * defer );
+    virtual bool			willTerminate( IOService * provider, IOOptionBits options );
+    virtual void			stop(IOService *  provider);
+    virtual void			free();
+    virtual IOReturn		message( UInt32 type, IOService * provider,  void * argument = 0 );
+	virtual unsigned long	maxCapabilityForDomainState ( IOPMPowerFlags domainState );
+	virtual IOReturn		powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+	virtual IOReturn		setPowerState ( unsigned long powerStateOrdinal, IOService* whatDevice );
+	virtual IOReturn		powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+ 	virtual void			powerChangeDone ( unsigned long fromState);
+  
+
+    // IOHIDDevice methods
+    //
+    virtual bool		handleStart(IOService * provider);
+    virtual void		handleStop(IOService *  provider);
+
+    virtual IOReturn 	newReportDescriptor( IOMemoryDescriptor ** descriptor ) const;
+                        
+    virtual OSString * 	newTransportString() const;
+
+    virtual OSNumber * 	newVendorIDNumber() const;
+
+    virtual OSNumber * 	newProductIDNumber() const;
+
+    virtual OSNumber * 	newVersionNumber() const;
+
+    virtual OSString * 	newManufacturerString() const;
+
+    virtual OSString * 	newProductString() const;
+
+    virtual OSString * 	newSerialNumberString() const;
+
+    virtual OSNumber * 	newLocationIDNumber() const;
+
+    virtual OSNumber * 	newCountryCodeNumber() const;
+
+    virtual IOReturn	getReport( IOMemoryDescriptor * report,
+                                IOHIDReportType      reportType,
+                                IOOptionBits         options = 0 );
+                                
+    virtual IOReturn 	setReport( IOMemoryDescriptor * report,
+                                IOHIDReportType      reportType,
+                                IOOptionBits         options = 0 );
+
+    // HID driver methods
+    //
+    virtual OSString * 	newIndexedString(UInt8 index) const;
+
+    virtual UInt32		getMaxReportSize();
+	
+    virtual void		DecrementOutstandingIO(void);
+    virtual void		IncrementOutstandingIO(void);
+    virtual IOReturn	StartFinalProcessing();
+    virtual IOReturn	SetIdleMillisecs(UInt16 msecs);
+    
+private:
+
+	IOReturn			GetHIDDescriptor(UInt8 inDescriptorType, UInt8 inDescriptorIndex, UInt8 *vOutBuf, UInt32 *vOutSize);
+	IOReturn			GetReport(UInt8 inReportType, UInt8 inReportID, UInt8 *vInBuf, UInt32 *vInSize);
+	IOReturn			SetReport(UInt8 outReportType, UInt8 outReportID, UInt8 *vOutBuf, UInt32 vOutSize);
+	IOReturn			GetIndexedString(UInt8 index, UInt8 *vOutBuf, UInt32 *vOutSize, UInt16 lang = 0x409) const;
+	IOReturn			SetProtocol(UInt32 protocolType);
+	char				GetHexChar(char hexChar);
+	IOReturn			AbortAndSuspend( bool suspend );
+	
+        
+
+#if ENABLE_HIDREPORT_LOGGING
+    void LogBufferReport(char *report, UInt32 len);
+    void LogMemReport(IOMemoryDescriptor * reportBuffer);
+    char GetHexChar(char hexChar);
+#endif
+
+public:
+    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  0);
+    virtual IOReturn    RearmInterruptRead();
+    
+    /*!
+		@function SuspendPort
+	 @abstract Suspends the port for this device or optionally sets a timeout to suspend after a period of inactivity.
+	 @discussion  This call can be used to immediately suspend/resume a port or to enable the suspension of the port after a period of inactivity.  If called with suspendPort = true (no timeout parameter), the HID driver
+	 will immediately suspend the port, after aborting any outstanding reads on the interrupt pipe.  If called with suspendPort = true and timeout != 0, it will suspend the port after the timeout number of ms have
+	 passed without any read completions.  If called with suspendPort = false, the port will be immediately resumed and the reads will be re-issued.  If a timeout was enabled, it will be cancelled.
+	 @param suspendPort Boolean value. true = suspend the port, false = resume the port.
+	 @param timeoutMS	Value in milliseconds If value is non-zero, the port will be suspended after the timeout milliseconds have passed without any read completions.
+	 @result The IOReturn value from the IOUSBDevice::Suspend() call. 
+	*/
+    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  1);
+	virtual IOReturn	SuspendPort(bool suspendPort, UInt32 timeoutMS = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  2);
+	virtual bool		IsPortSuspended();
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  3);
+    virtual void		LogMemReport(UInt8 level, IOMemoryDescriptor * reportBuffer, IOByteCount size);
+
+    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  4);
+	virtual IOReturn	InitializeUSBHIDPowerManagement(IOService *provider);
+	
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  5);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  6);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  7);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  8);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  9);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 10);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 11);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 12);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 13);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 14);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 15);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 16);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 17);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 18);
+    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 19);
+};
+
+#endif	// IOUSBHIDDRIVER_H
diff --git a/i386/include/IOKit/usb/IOUSBHubDevice.h b/i386/include/IOKit/usb/IOUSBHubDevice.h
new file mode 100644
index 0000000..91c728c
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBHubDevice.h
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __OPEN_SOURCE__
+/*
+ *
+ *	$Log: IOUSBHubDevice.h,v $
+ *	Revision 1.11  2009/09/12 03:42:16  rhoads
+ *	merge in the changes for the 390.3.4b QL
+ *
+ *	Revision 1.10.52.1  2009/09/10 18:50:52  nano
+ *	<rdar://problem/7134800> Task: Extra Current support for Ibex Peak RMHs -- look for a property that tells us to ask our USB plane parent for the extra current.  This will allow the RMH to pass on the request to it's parent.
+ *	
+ *	Revision 1.10  2009/05/07 19:43:09  nano
+ *	Move our SnowLeopard branch to TOT
+ *	
+ *	Revision 1.6.102.3  2008/06/16 22:02:16  nano
+ *	Bring in changes from Foxound 320.2.19
+ *	
+
+ *	Revision 1.6.102.2  2008/04/22 22:38:01  nano
+ *	Bring in changes from Foxhound-320.2.9
+ *	
+ *	Revision 1.8.62.2  2008/06/06 21:08:44  nano
+ *	Enable dynamic allocation of power for M89, so we don't reserve it if there isn't a high power device attached
+ *	
+ *	Revision 1.8.62.1  2008/06/06 04:14:32  nano
+ *	Fix SleepCurrent allocation so it will work with hub devices and root hub devices as well as consolidating it across all controllers
+ *	
+ *	Revision 1.8  2008/04/17 16:56:57  nano
+ *	Bring in branches for rdar://5867990 & rdar://5768343
+ *	
+ *	Revision 1.7.4.1  2008/04/17 15:54:07  nano
+ *	Merged PR-5768343 into this branch and fixed a couple of issues
+ *	
+ *	Revision 1.7.2.1  2008/04/16 00:48:49  ferg
+ *	Bug #: 5768343
+ *	Add support for hubs with high-power downstream port capability.  This is
+ *	controlled by the properties "AAPL,current-available" and "AAPL,current-extra".
+ *	
+ *	Revision 1.7  2008/04/14 16:08:38  nano
+ *	Add new APIs for high power and for GetDeviceInformation.
+ *	
+ *	Revision 1.6.144.1  2008/04/11 22:25:44  nano
+ *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
+ *	
+ *	Revision 1.6  2007/08/01 16:10:18  rhoads
+ *	roll in extra power changes
+ *	
+ *	Revision 1.5.118.1  2007/07/27 16:49:10  rhoads
+ *	merge the extra current stuff into Leopard, and add extra sleep current for self powered hubs
+ *	
+ *	Revision 1.5  2007/01/20 00:47:01  rhoads
+ *	roll in Hub Policy Maker changes
+ *	
+ *	Revision 1.4  2006/12/22 23:05:46  rhoads
+ *	roll in branches 4364835 and 4277683-2
+ *	
+ *	Revision 1.3.20.3  2007/01/15 19:58:07  rhoads
+ *	saving more changes
+ *	
+ *	Revision 1.3.20.2  2007/01/09 21:55:53  rhoads
+ *	commit some stuff to try to fix a permissions issue
+ *	
+ *	Revision 1.3.20.1  2006/12/18 19:13:56  rhoads
+ *	re-integrate the old branch into TOT
+ *	
+ *	Revision 1.3.12.4  2006/12/18 17:33:48  rhoads
+ *	looking good except for sleep/wake
+ *	
+ *	Revision 1.3.12.3  2006/12/08 05:42:40  rhoads
+ *	mostly working
+ *	
+ *	Revision 1.3.12.2  2006/11/14 22:37:06  rhoads
+ *	more changes with the root hubs
+ *	
+ *	Revision 1.3.12.1  2006/11/07 16:55:52  rhoads
+ *	change to get the IOUSBHubDevice nubs into the IOPower tree
+ *	
+ *	Revision 1.3  2006/10/06 04:42:02  rhoads
+ *	roll in branches 4727961, 4758404, 4759810, 4760274, and 4762769
+ *	
+ *	Revision 1.2.4.2  2006/10/04 23:01:24  rhoads
+ *	better naming
+ *	
+ *	Revision 1.2.4.1  2006/10/04 16:03:57  rhoads
+ *	better IOUSBHubDevice design
+ *	
+ */
+#endif
+
+
+#ifndef _IOKIT_IOUSBHUBDEVICE_H
+#define _IOKIT_IOUSBHUBDEVICE_H
+
+#include <IOKit/usb/IOUSBDevice.h>						// our superclass
+
+// forward refeference. we don't include the header file because it would cause a circular reference
+class IOUSBHubPolicyMaker;
+
+enum {
+	kIOUSBHubDeviceIsRootHub			=	0x0001,
+	kIOUSBHubDeviceIsOnHighSpeedBus		=	0x0002,
+	kIOUSBHubDeviceCanSleep				=	0x0004
+};
+
+/*!
+    @class IOUSBHubDevice
+    @abstract New in MAC OS X 10.5. The IOKit object representing a hub device on the USB bus. It is a subclass of IOUSBDevice.
+    @discussion With the exception of the IOUSBRootHubDevice objects representing the root hubs, every IOUSBDevice
+	will have an IOUSBHubDevice as its parent in the IOUSB plane. USB KEXT drivers will have the ability to 
+	query this device for characteristics of the hub into which they are connected. This class will also give a dive driver
+	the abilty to get an IOService* pointing to the hub driver itself, which can then be used as the parent in the power plane.
+*/
+
+class IOUSBHubDevice : public IOUSBDevice
+{
+	friend class IOUSBHubPolicyMaker;
+	friend class AppleUSBHub;
+	friend class IOUSBController;								// for the "can sleep" characteristic
+	
+private:
+    OSDeclareDefaultStructors(IOUSBHubDevice)
+
+	UInt32					_myCharacteristics;					// bitmap of my characteristics
+	IOUSBHubPolicyMaker		*_myPolicyMaker;					// pointer to the policy maker in the IOPower tree for this hub
+
+    struct ExpansionData 
+	{ 
+		UInt32					_maxPortCurrent;				// maximum current in milliamps per downstream port
+		UInt32					_totalExtraCurrent;				// total amount of current above the spec'ed current per port available (during normal operation)
+		UInt32					_totalSleepCurrent;				// total amount of current that can be drawn during sleep
+		UInt32					_canRequestExtraPower;			// If 0, this hub does not support requesting extra power from its parent, non-zero:  how much power we need to request in order to give out _extraPowerForPorts
+		UInt32					_extraPowerForPorts;			// Of the power requested from our parent, how much can we parcel out -- the rest is consumed by voltage drop thru the cable
+		UInt32					_extraPowerAllocated;			// Amount of power that we actually got from our parent
+		bool					_requestFromParent;				// True if we are to request the extra power from our parent, without modifying the request.  Used for RMHs
+	};
+    ExpansionData			*_expansionData;
+	
+protected:
+	// IOUSBHubDevice methods which will be used by the hub driver (which is also the Policy Maker)
+	virtual	void			SetPolicyMaker(IOUSBHubPolicyMaker *policyMaker);
+	virtual void			SetHubCharacteristics(UInt32);
+	virtual bool			InitializeCharacteristics(void);					// used at start
+	
+public:
+	// static constructor
+    static IOUSBHubDevice	*NewHubDevice(void);
+
+	// IOKit methods
+    virtual bool			init();
+	virtual bool			start( IOService * provider );
+    virtual void			stop( IOService *provider );
+    virtual void			free();
+	
+	// public IOUSBHubDevice methods
+
+	void					SetTotalSleepCurrent(UInt32 sleepCurrent);
+	UInt32					GetTotalSleepCurrent();
+	
+    /*!
+	 @function GetPolicyMaker
+	 returns a pointer to the policy maker for the hub, which can be used as the power plane parent.
+	 @result returns an IOUSBHubPolicyMaker* pointing to the policy maker for this hub. returns NULL is no policy maker is active on the hub device.
+	 */
+	virtual IOUSBHubPolicyMaker *GetPolicyMaker(void);
+	
+    /*!
+	@function GetHubCharacteristics
+	returns characteristics of the hub device which might be useful for the driver of a device connected to the hub.
+		kIOUSBHubDeviceIsRootHub indicates that the hub is a root hub
+		kIOUSBHubDeviceIsOnHighSpeedBus indicates that the hub is running on a High Speed bus. If this bit is set and kIOUSBHubDeviceIsHighSpeed is clear, then this is a Classic Speed hub running on a High Speed bus, which means that Split Transactions will be used to communicate with downstream devices.
+
+	@result returns a bitmap of characteristics
+    */
+	virtual	UInt32			GetHubCharacteristics();
+	
+    /*!
+	@function GetMaxProvidedPower
+	returns the maximum amount of power available on any downstream port of this hub
+	@result the power is returned in milliamps - usually 100ma or 500 ma.
+    */
+	virtual UInt32			GetMaxProvidedPower();
+
+    /*!
+	@function RequestProvidedPower
+	requests power from the hub device
+	@param requestedPower - the amount of power requested in milliamps (usually 100ma or 500 ma)
+	@result the amount of power allocated for this driver in milliamps (usually 100ma or 500 ma)
+    */
+	virtual UInt32			RequestProvidedPower(UInt32 requestedPower);
+
+	virtual UInt32			RequestExtraPower(UInt32 requestedPower);
+
+	virtual void			ReturnExtraPower(UInt32 returnedPower);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  0);
+	
+	virtual void			InitializeExtraPower(UInt32 maxPortCurrent, UInt32 totalExtraCurrent);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  1);
+	virtual UInt32			RequestSleepPower(UInt32 requestedPower);
+
+    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  2);
+	virtual void			ReturnSleepPower(UInt32 returnedPower);
+
+    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  3);
+	virtual void			SetSleepCurrent(UInt32 sleepCurrent);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  4);
+	virtual	UInt32			GetSleepCurrent();
+	
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  5);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  6);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  7);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  8);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  9);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  10);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  11);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  12);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  13);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  14);
+    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  15);
+};
+
+#endif /* _IOKIT_IOUSBROOTHUBDEVICE_H */
+
diff --git a/i386/include/IOKit/usb/IOUSBHubPolicyMaker.h b/i386/include/IOKit/usb/IOUSBHubPolicyMaker.h
new file mode 100644
index 0000000..a0021d3
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBHubPolicyMaker.h
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __OPEN_SOURCE__
+/*
+ *
+ *	$Log: IOUSBHubPolicyMaker.h,v $
+ *	Revision 1.10  2009/05/07 19:43:09  nano
+ *	Move our SnowLeopard branch to TOT
+ *
+ *	Revision 1.7.72.3  2008/07/23 17:43:32  nano
+ *	<rdar://problem/5939357> IOUSBHIDDriver, IOHIDEventService missing HeaderDoc class declarations
+ *	
+ *	Revision 1.7.72.2  2008/04/22 22:38:01  nano
+ *	Bring in changes from Foxhound-320.2.9
+ *	
+ *	Revision 1.9  2008/04/17 16:56:57  nano
+ *	Bring in branches for rdar://5867990 & rdar://5768343
+ *	
+ *	Revision 1.8.4.1  2008/04/16 20:26:15  nano
+ *	<rdar://problem/5867990> Add API to allocate sleep current, as well as making sure that we return any extra power if our client dies or our device is terminated without returning it
+ *	
+ *	Revision 1.8  2008/04/14 16:08:38  nano
+ *	Add new APIs for high power and for GetDeviceInformation.
+ *	
+ *	Revision 1.7.114.1  2008/04/11 22:25:44  nano
+ *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
+ *	
+ *	Revision 1.7  2007/08/17 22:41:11  nano
+ *	Bring in branch that fixes <rdar://problem/5414582> USB not honoring Resume recovery time (hub driver) and adds extra time for iPods
+ *	
+ *	Revision 1.6.30.1  2007/08/16 19:14:02  nano
+ *	ResumeRecovery additions.
+ *	
+ *	Revision 1.6  2007/08/01 16:10:18  rhoads
+ *	roll in extra power changes
+ *	
+ *	Revision 1.5.12.1  2007/07/27 16:49:10  rhoads
+ *	merge the extra current stuff into Leopard, and add extra sleep current for self powered hubs
+ *	
+ *	Revision 1.5  2007/07/20 22:31:22  rhoads
+ *	roll in branch300-3-2
+ *	
+ *	Revision 1.4.40.1  2007/07/18 18:44:24  rhoads
+ *	this is the 300.3.2g version plus some quieter logs
+ *	
+ *	Revision 1.4.34.2  2007/07/17 06:30:35  rhoads
+ *	more hub chain fixes
+ *	
+ *	Revision 1.4.34.1  2007/07/16 16:45:00  rhoads
+ *	more power management and termination tweaks
+ *	
+ *	Revision 1.4  2007/05/18 01:59:12  rhoads
+ *	roll in 5112084 and 5204170
+ *	
+ *	Revision 1.3.2.1  2007/05/15 18:23:48  rhoads
+ *	some initial power state bug fixes
+ *	
+ *	Revision 1.3  2007/05/10 22:25:35  rhoads
+ *	roll in branch 5113395 - the last major piece of the new power architecture
+ *	
+ *	Revision 1.2.64.4  2007/04/13 22:34:59  rhoads
+ *	fix restart and shutdown
+ *	
+ *	Revision 1.2.64.3  2007/04/11 23:56:23  rhoads
+ *	first mostly working dozing hub
+ *	
+ *	Revision 1.2.64.2  2007/04/10 02:09:09  rhoads
+ *	got UHCI almost working
+ *	
+ *	Revision 1.2.64.1  2007/04/05 02:57:50  rhoads
+ *	move power management out of AppleUSBHub and into IOUSBHubPolicyMaker
+ *	
+ *	Revision 1.2  2007/01/20 00:47:01  rhoads
+ *	roll in Hub Policy Maker changes
+ *	
+ *	Revision 1.1.2.4  2007/01/18 22:51:08  rhoads
+ *	add some padding
+ *	
+ *	Revision 1.1.2.3  2007/01/15 19:58:07  rhoads
+ *	saving more changes
+ *	
+ *	Revision 1.1.2.2  2007/01/09 23:55:36  rhoads
+ *	working version
+ *	
+ *	Revision 1.1.2.1  2007/01/09 21:57:02  rhoads
+ *	commit some stuff to try to fix a permissions issue
+ *	
+ *	
+ */
+#endif
+#ifndef _IOKIT_IOUSBHUBPOLICYMAKER_H
+#define _IOKIT_IOUSBHUBPOLICYMAKER_H
+
+#include	<IOKit/IOService.h>
+#include	<IOKit/usb/IOUSBController.h>
+#include	<IOKit/usb/IOUSBHubDevice.h>
+
+
+enum {
+	kIOUSBHubPowerStateOff		= 0,				// losing power
+	kIOUSBHubPowerStateRestart	= 1,				// reseting bus, but may maintain power
+	kIOUSBHubPowerStateSleep	= 2,				// upstream port and all downstream ports suspended (from the top)
+	kIOUSBHubPowerStateLowPower	= 3,				// upstream port and all downstream ports suspended (from the bottom)
+	kIOUSBHubPowerStateOn		= 4,				// upstream port and at least one downstream port on
+	kIOUSBHubNumberPowerStates	= 5
+};
+
+enum {
+	kHubResumeRecoveryTime	=	10,								// 10 ms to recover after I resume myself
+	kPortResumeRecoveryTime =	10								// 10 ms to recover another device
+};
+
+#define kIOUSBHubPowerStateStable	-1
+
+/*!
+ @class IOUSBHubPolicyMaker
+ @abstract Super class for Hub drivers to incorporate common Power Management code.
+ */
+class IOUSBHubPolicyMaker : public IOService
+{
+	OSDeclareAbstractStructors(IOUSBHubPolicyMaker)
+
+protected:
+    IOUSBControllerV2 *					_bus;
+    IOUSBHubDevice *					_device;					// our provider
+    IOUSBHubDevice *					_parentHubDevice;			// for non root hub drivers, this is the hub device that my hub device is connected to
+    bool								_isRootHub;					// this is a root hub
+	bool								_dozeEnabled;				// true if the controller has been enabled to go into doze mode
+	bool								_dontAllowLowPower;			// If true, we will not allow the hub to go into low power mode.
+	bool								_dontAllowSleepPower;		// If true, we will not allow extra sleep power for a self powered hub.
+	SInt32								_powerStateChangingTo;		// a power state if we are changing to one, or -1 if we are stable
+	unsigned long						_myPowerState;				// my current state (since getPowerState doesn't always change in time)
+	UInt32								_extraPower;				// how much extra power we might be able to get from our parent hub
+	UInt32								_extraPowerRemaining;		// how many milliamps we can still give to any one port
+	UInt32								_hubResumeRecoveryTime;		// # of ms that we will wait before issuing any transactions on our port (nominally 10ms)
+    struct ExpansionData 
+	{ 
+	};
+    ExpansionData			*_expansionData;
+
+public:
+	// IOService methods
+    virtual bool						start(IOService * provider);
+	virtual IOReturn					powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+	virtual unsigned long				powerStateForDomainState ( IOPMPowerFlags domainState );
+	virtual IOReturn					setPowerState ( unsigned long powerStateOrdinal, IOService* whatDevice );
+	virtual IOReturn					powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
+	virtual unsigned long				maxCapabilityForDomainState ( IOPMPowerFlags domainState );
+	virtual void						powerChangeDone ( unsigned long fromState );
+
+	// public methods which MAY be implemented in subclass
+	virtual IOReturn					EnsureUsability(void);
+		
+	// Extra Port Power calls
+	void								AllocateExtraPower();
+	IOReturn							GetExtraPortPower(UInt32 portNum, UInt32 *extraPower);
+	IOReturn							ReturnExtraPortPower(UInt32 portNum, UInt32 extraPower);
+    
+	// virtual methods to be implemented in the controlling driver subclass
+	virtual bool						ConfigureHubDriver(void) = 0;
+	virtual IOReturn					HubPowerChange(unsigned long powerStateOrdinal) = 0;
+
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  0);
+	virtual	IOReturn					GetPortInformation(UInt32 portNum, UInt32 *info);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  1);
+	virtual	IOReturn					ResetPort(UInt32 portNum);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  2);
+	virtual	IOReturn					SuspendPort(UInt32 portNum, bool suspend);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  3);
+	virtual	IOReturn					ReEnumeratePort(UInt32 portNum, UInt32 options);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  4);
+	virtual UInt32						RequestExtraPower(UInt32 portNum, UInt32 type, UInt32 requestedPower);
+
+    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  5);
+	virtual IOReturn					ReturnExtraPower(UInt32 portNum, UInt32 type, UInt32 returnedPower);
+
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  6);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  7);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  8);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  9);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  10);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  11);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  12);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  13);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  14);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  15);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  16);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  17);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  18);
+    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  19);
+};
+
+#endif _IOKIT_IOUSBHUBPOLICYMAKER_H
diff --git a/i386/include/IOKit/usb/IOUSBInterface.h b/i386/include/IOKit/usb/IOUSBInterface.h
new file mode 100644
index 0000000..4777e50
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBInterface.h
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBINTERFACE_H
+#define _IOKIT_IOUSBINTERFACE_H
+
+#include <IOKit/IOService.h>
+#include <libkern/c++/OSData.h>
+
+#include <IOKit/usb/USB.h>
+#include <IOKit/usb/IOUSBNub.h>
+#include <IOKit/usb/IOUSBDevice.h>
+
+/*!
+    @class IOUSBInterface
+    @abstract The object representing an interface of a device on the USB bus.
+    @discussion This class provides functionality to find the pipes of an interface and
+	to read the descriptors associated with an interface. When an interface is open()ed,
+	all its pipes are created
+*/
+class IOUSBInterface : public IOUSBNub
+{
+    friend class IOUSBInterfaceUserClientV2;
+    
+    OSDeclareDefaultStructors(IOUSBInterface)
+
+protected:
+    IOUSBPipe * 			_pipeList[kUSBMaxPipes];
+    const IOUSBConfigurationDescriptor *_configDesc;
+    const IOUSBInterfaceDescriptor *	_interfaceDesc;
+    IOUSBDevice *			_device;
+
+    // these variable are the parsed interface descriptor
+    UInt8				_bInterfaceNumber;
+    UInt8				_bAlternateSetting;
+    UInt8				_bNumEndpoints;
+    UInt8				_bInterfaceClass;
+    UInt8				_bInterfaceSubClass;
+    UInt8				_bInterfaceProtocol;
+    UInt8				_iInterface;
+
+    struct ExpansionData {
+        IOCommandGate		*_gate;
+        IOWorkLoop			*_workLoop;
+		bool				_needToClose;
+		IOLock *			_pipeObjLock;											// Lock to synchronize accesses to our pipeObjects
+    };
+    ExpansionData * _expansionData;
+
+    // private methods
+    virtual void		ClosePipes(void);				// close all pipes (except pipe zero)
+    virtual IOReturn	CreatePipes(void);				// open all pipes in the current interface/alt interface
+    virtual void		SetProperties(void);			// update my property table with the correct properties		
+	
+public:
+	// static methods
+    static IOUSBInterface *withDescriptors(const IOUSBConfigurationDescriptor *cfDesc, const IOUSBInterfaceDescriptor *ifDesc);
+    static IOReturn	CallSuperOpen(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+    static IOReturn     CallSuperClose(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
+	static UInt8 hex2char( UInt8 digit );
+    
+	// IOService methods
+    virtual bool		start(IOService * provider);
+    virtual bool		handleOpen(IOService *forClient, IOOptionBits options = 0, void *arg = 0 );
+    virtual bool		open(IOService *forClient, IOOptionBits options = 0, void *arg = 0 );
+    virtual void		close(IOService *forClient, IOOptionBits options = 0);
+    virtual void		handleClose(IOService *forClient, IOOptionBits options = 0);
+    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
+    virtual bool		finalize(IOOptionBits options);
+    virtual void		stop(IOService *  provider);
+    virtual bool		terminate( IOOptionBits options = 0 );
+    virtual void		free();	
+
+	// IOUSBInterface class methods
+	virtual bool		init(	const IOUSBConfigurationDescriptor *cfDesc,
+							 const IOUSBInterfaceDescriptor *ifDesc);
+   /*!
+        @function FindNextAltInterface
+        return alternate interface descriptor satisfying the requirements specified in request, or NULL if there aren't any.
+        request is updated with the properties of the returned interface.
+        @param current interface descriptor to start searching from, NULL to start at alternate interface 0.
+        @param request specifies what properties an interface must have to match.
+        @result Pointer to a matching interface descriptor, or NULL if none match.
+    */
+    virtual const IOUSBInterfaceDescriptor *FindNextAltInterface(const IOUSBInterfaceDescriptor *current,
+                                                                 IOUSBFindInterfaceRequest *request);
+
+    /*!
+	@function FindNextPipe
+	Find a pipe of the interface that matches the requirements, either
+	starting from the beginning of the interface's pipe list or from a specified
+	pipe.
+	@param current Pipe to start searching from, NULL to start from beginning of list.
+	@param request Requirements for pipe to match, updated with the found pipe's
+	properties.
+	@result Pointer to the pipe, or NULL if no pipe matches the request.
+    */
+    virtual IOUSBPipe *FindNextPipe(IOUSBPipe *current, IOUSBFindEndpointRequest *request);
+
+    /*!
+        @function FindNextAssociatedDescriptor
+        Find the next descriptor of the requested type associated with the interface.
+	@param current Descriptor to start searching from, NULL to start from beginning of list.
+	@param type Descriptor type to search for, or kUSBAnyDesc to return any descriptor type.
+	@result Pointer to the descriptor, or NULL if no matching descriptors found.
+    */
+    virtual const IOUSBDescriptorHeader * FindNextAssociatedDescriptor(const void *current, UInt8 type);
+
+    /*!
+        @function SetAlternateInterface
+        Select the specified alternate interface.
+        @param forClient The client requesting the alternate setting. This client must have the interface open in order to perform the request.
+	@param alternateSetting Alternate setting (from the alternate interface's interface descriptor).
+        @result exclusive access error if the interface is not open. otherwise the result of the transaction
+    */
+    virtual IOReturn SetAlternateInterface(IOService *forClient, UInt16 alternateSetting);
+
+     /*!
+        @function GetPipeObj
+	returns a handle to the pipe at the corresponding index
+        @param index value from zero to kUSBMaxPipes-1
+	@result The IOUSBPipe object. Note that the client does not own a reference to this pipe, so the client should retain() the IOUSBPipe object if necessary.
+    */
+    virtual IOUSBPipe *GetPipeObj(UInt8 index);
+    /*!
+        @function GetConfigValue
+	returns the device configuration value for the interface
+	@result The device configuration value.
+    */
+    virtual UInt8 GetConfigValue();
+    /*!
+        @function GetDevice
+        returns the device the interface is part of.
+	@result Pointer to the IOUSBDevice object which is the parent of this IOUSBInterface object.
+    */
+    virtual IOUSBDevice *GetDevice();
+    /*!
+        @function GetInterfaceNumber
+        returns the zero based value identifying the index in the array of concurrent
+        interfaces supported by the current configuration
+        @result the interface index
+    */
+    virtual UInt8 GetInterfaceNumber();
+    /*!
+        @function GetAlternateSetting
+        returns the alternate setting for this interface.
+        @result the alternate setting
+    */
+    virtual UInt8 GetAlternateSetting();
+    /*!
+        @function GetNumEndpoints
+        returns the number of endpoints used by this interface (excluding
+        device endpoint zero. If the value is zero, this interface only
+        uses endpoint zero.
+        @result the number of endpoints
+    */
+    virtual UInt8 GetNumEndpoints();
+    /*!
+        @function GetInterfaceClass
+        returns the class code for this interface (assigned by the USB)
+        a value of zero is reserved
+        if the value is FFh, the interface class is vendor-specific
+        all other values are reserved for assignment by the USB
+        @result the interface class
+    */
+    virtual UInt8 GetInterfaceClass();
+    /*!
+        @function GetInterfaceSubClass
+        returns the subclass code (assigned by the USB).
+        These codes are qualified by the value returned by GetInterfaceClass
+        @result the interface subclass
+    */
+    virtual UInt8 GetInterfaceSubClass();
+    /*!
+        @function GetInterfaceProtocol
+        returns the protocol code (assigned by the USB).
+        @result the interface index
+    */
+    virtual UInt8 GetInterfaceProtocol();
+    /*!
+        @function GetInterfaceStringIndex
+        returns the index of the string descriptor describing the interface
+        @result the string index
+    */
+    virtual UInt8 GetInterfaceStringIndex();
+    
+    /*!
+	@function DeviceRequest
+        @abstract Sends a control request to the default control pipe in the device (pipe zero)
+        @param request The parameter block to send to the device
+		@param completion Function to call when request completes. If omitted then
+        DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
+		the IOUSBDevRequest is not released until the callback has occurred.
+    */
+    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, IOUSBCompletion *completion = 0); 
+
+    /*!
+	 @function DeviceRequest
+	 @abstract Sends a control request to the default control pipe in the device (pipe zero)
+	 @param request The parameter block to send to the device (with the pData as an IOMemoryDesriptor)
+	 @param completion Function to call when request completes. If omitted then
+	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
+	 the IOUSBDevRequest is not released until the callback has occurred.
+	 */
+    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc *request, IOUSBCompletion *completion = 0);
+
+    virtual bool matchPropertyTable(OSDictionary * table, SInt32 *score);
+
+    OSMetaClassDeclareReservedUsed(IOUSBInterface,  0);
+    /*!
+	@function GetEndpointProperties
+        @abstract Returns the properties of an endpoint, possibly in an alternate interface.
+        @param alternateSetting specifies the desired alternate setting
+        @param endpointNumber specifies the endpoint number
+        @param direction specifies the direction (kUSBIn, kUSBOut)
+        @param transferType a pointer to hold the transfer type (kUSBControl, kUSBBulk, etc.) of the endpoint if found.
+        @param maxPacketSize a pointer to hold the maxPacketSize in the endpoint descriptor.
+        @param interval a pointer to hold the interval value in the endpoint descriptor.
+	@result returns kIOReturnSuccess if the endpoint is found, and kIOUSBEndpointNotFound if it is not.
+    */
+    virtual IOReturn GetEndpointProperties(UInt8 alternateSetting, UInt8 endpointNumber, UInt8 direction, UInt8 *transferType, UInt16 *maxPacketSize, UInt8 *interval);
+    
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  1);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  2);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  3);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  4);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  5);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  6);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  7);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  8);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  9);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  10);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  11);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  12);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  13);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  14);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  15);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  16);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  17);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  18);
+    OSMetaClassDeclareReservedUnused(IOUSBInterface,  19);
+};
+
+#endif /* _IOKIT_IOUSBINTERFACE_H */
diff --git a/i386/include/IOKit/usb/IOUSBLog.h b/i386/include/IOKit/usb/IOUSBLog.h
new file mode 100644
index 0000000..7f8f2a3
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBLog.h
@@ -0,0 +1,240 @@
+/*
+ * Copyright © 1998-20010 Apple Inc.  All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBLOG_H
+#define _IOKIT_IOUSBLOG_H
+
+#include 	<IOKit/IOService.h>
+#include	<IOKit/IOLib.h>
+
+
+#ifdef	__cplusplus
+	extern "C" {
+#endif
+
+// USB Specific defines
+#define USBLog( LEVEL, ARGS...)		KernelDebugLogTag( LEVEL, 'USBF', ## ARGS )
+#define USBError( LEVEL, ARGS...)	KernelDebugLogInternal( ( LEVEL ), 'USBF', ## ARGS )
+#define USBStringFromReturn( IORETURN)	(IOUSBController::_log)->stringFromReturn( IORETURN )
+
+
+// Possible Debug levels. If DEBUG_LEVEL is set to DEBUG_LEVEL_PRODUCTION, all debug logs will be 
+// stripped of the final code. 
+
+#define	DEBUG_LEVEL_PRODUCTION		0
+#define	DEBUG_LEVEL_DEVELOPMENT		1
+#define	DEBUG_LEVEL_ALPHA			2
+#define	DEBUG_LEVEL_BETA			3
+#define	DEBUG_LEVEL_FINAL			DEBUG_LEVEL_PRODUCTION
+
+// Allow clients to define their own debug level.
+
+#if ( !defined( DEBUG_LEVEL ) )
+	#define	DEBUG_LEVEL			DEBUG_LEVEL_PRODUCTION
+#endif
+
+// Index for user client methods
+//
+enum
+{
+    kUSBControllerUserClientOpen = 0,
+    kUSBControllerUserClientClose,
+    kUSBControllerUserClientEnableLogger,
+    kUSBControllerUserClientSetDebuggingLevel,
+    kUSBControllerUserClientSetDebuggingType,
+    kUSBControllerUserClientGetDebuggingLevel,
+    kUSBControllerUserClientGetDebuggingType,
+#ifndef __OPEN_SOURCE__
+    kUSBControllerUserClientSetTestMode,
+    kUSBControllerUserClientReadRegister,
+    kUSBControllerUserClientWriteRegister,
+    kUSBControllerUserClientMessageController,
+#endif
+    kNumUSBControllerMethods
+};
+
+#ifndef __OPEN_SOURCE__
+// Enums for the private kIOUSBMessageController message
+enum
+{
+	kIOUSBMessageControllerDoGPIOReset = 0x00000001
+};
+#endif
+
+// Info Debug Output Types.
+
+typedef UInt32		KernelDebuggingOutputType;
+enum
+{
+	kKernelDebugOutputIOLogType		= 0x00000001, 
+	kKernelDebugOutputKextLoggerType	= 0x00000002
+};
+
+
+// Info Debug levels.
+
+typedef UInt32		KernelDebugLevel;
+enum
+{
+	kKernelDebugInfoLevel 		= 1000, 
+	kKernelDebugRareInfoLevel	= 2000, 
+	kKernelDebugAllowedErrorLevel	= 3000, 
+	kKernelDebugAssertLevel 	= 4000, 
+	kKernelDebugRequireLevel	= 5000, 
+	kKernelDebugErrorLevel		= 6000, 
+	kKernelDebugCriticalErrorLevel	= 7000, 
+	kKernelDebugTragicErrorLevel	= 8000, 
+	kKernelDebugAnyLevel		= 0
+};
+
+// Function prototypes.
+
+void			KernelDebugSetLevel( KernelDebugLevel inLevel );
+KernelDebugLevel	KernelDebugGetLevel();
+void			KernelDebugSetOutputType( KernelDebuggingOutputType inType );
+KernelDebuggingOutputType	KernelDebugGetOutputType();
+IOReturn 		KernelDebugFindKernelLogger();
+void			KernelDebugEnable( bool enable );
+
+//	Yes, you can call this directly. But, why? If you use the macros declared below, such as
+//	KernelIOLog, you get the benefit of having your logs compiled out when you set the
+//	DEBUG_LEVEL to production mode and recompile. Dude. Sweet. What's mine say?
+
+void			KernelDebugLogInternal( KernelDebugLevel inLevel, UInt32 inTag, char const *inFormatString, ... )  __attribute__ ((format(printf,3,4)));;
+void 			KernelDebugLogDataInternal( UInt32 inLevel,  UInt32 inTag, void *buffer, UInt32 byteCount, bool preBuffer);
+
+// Handy macros.
+
+#define REQUIRE_NO_ERR_PRINTF( VALUE, LABEL, ARGS... )							\
+	if ( VALUE != kIOReturnSuccess )									\
+	{												\
+		KernelDebugLogInternal( kDebugInfoLevel, 'BluD', ## ARGS );				\
+		goto LABEL;										\
+	}
+
+#define REQUIRE_PRINTF( TEST, LABEL, ARGS... )								\
+	do												\
+	{												\
+		if ( !( TEST ) )										\
+		{											\
+			KernelDebugLogInternal( kDebugInfoLevel, 'BluD',  ## ARGS );			\
+			goto LABEL;									\
+		}											\
+	} while( false )
+
+// Some macros to call the debugging outputs. We'll strip out the debug logs if we are production code.
+
+#if DEBUG_LEVEL != DEBUG_LEVEL_PRODUCTION
+#define	KernelDebugLog( LEVEL, ARGS... )			KernelDebugLogInternal( ( LEVEL ), 'KDbg', ## ARGS ) __attribute__ ((format(printf,1,2)));
+	#define	KernelDebugLogTag( LEVEL, TAG, ARGS... )		KernelDebugLogInternal( ( LEVEL ), ( TAG ),  ## ARGS )
+	#define KernelDebugLogData( LEVEL, TAG, BUFFER, SIZE, HOLD)	KernelDebugLogDataInternal( ( LEVEL ), ( TAG ), ( BUFFER ), ( SIZE ), ( HOLD ))
+#else
+	#define	KernelDebugLog( LEVEL, ARGS... )
+	#define	KernelDebugLogTag( LEVEL, TAG, ARGS... )
+	#define KernelDebugLogData( LEVEL, TAG, BUFFER, SIZE, HOLD)
+#endif
+
+
+#ifdef	__cplusplus
+	}
+        
+//================================================================================================
+//   Forward declarations
+//================================================================================================
+class com_apple_iokit_KLogClient;
+
+//================================================================================================
+//   Defines
+//================================================================================================
+#define kLogKextName 	"com_apple_iokit_KLog"
+#define MAXUSERS 	5
+
+//================================================================================================
+//   Custom Types
+//================================================================================================
+
+typedef UInt32 KLogLevel;
+typedef UInt32 KLogTag;
+
+//================================================================================================
+//   com_apple_iokit_KLog
+//================================================================================================
+
+class com_apple_iokit_KLog : public IOService
+{
+
+    OSDeclareDefaultStructors(com_apple_iokit_KLog)
+
+    com_apple_iokit_KLogClient *	mClientPtr[MAXUSERS+1];
+
+    unsigned char *			mMsgBuffer;
+    UInt8 				mClientCount;
+    UInt8 				mMsgSize;
+    bool 				mErrFlag;
+    struct timeval *			mTimeVal;
+    IOLock *				mLogLock;
+    
+public:
+
+    static com_apple_iokit_KLog	*	logger;
+    
+    virtual bool 			init(OSDictionary *dictionary = 0);
+    virtual void 			free(void);
+   
+    virtual IOService *			probe(IOService *provider, SInt32 *score);
+    virtual bool 			start(IOService *provider);
+    virtual void 			stop(IOService *provider);
+    virtual IOReturn 			newUserClient( task_t owningTask, void * securityID,
+                                                UInt32 type, IOUserClient ** handler );
+
+    virtual SInt8			Log( KLogLevel level, KLogTag tag, const char *format, ... );
+    virtual SInt8			vLog( KLogLevel level, KLogTag tag, const char *format, va_list in_va_list );
+	
+    void 				closeChild(com_apple_iokit_KLogClient *ptr);
+    void 				setErr(bool set);
+    
+};
+
+#define kMaxStatusBufSize	(8*1024)
+
+
+class IOUSBLog : public IOService
+{
+    OSDeclareAbstractStructors(IOUSBLog)
+
+private:
+public:
+    virtual bool	init( OSDictionary * dictionary = 0 );
+  	virtual const char *			stringFromReturn( IOReturn rtn );
+	static IOUSBLog	*usblog();
+    virtual void 	AddStatusLevel (UInt32 level, UInt32 ref, char *status, UInt32 value);
+    virtual void	AddStatus(char *message);
+    virtual void	AddStatus(UInt32 level, char *message);
+    virtual void 	USBLogPrintf(UInt32 level, char *format,...);
+	virtual char *	strstr(const char *in, const char *str);
+};
+
+
+#endif
+#endif /* ! _IOKIT_IOUSBLOG_H */
+
diff --git a/i386/include/IOKit/usb/IOUSBMassStorageClass.h b/i386/include/IOKit/usb/IOUSBMassStorageClass.h
new file mode 100644
index 0000000..02c8557
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBMassStorageClass.h
@@ -0,0 +1,507 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+
+#ifndef _IOKIT_IOUSBMASSSTORAGECLASS_H
+#define _IOKIT_IOUSBMASSSTORAGECLASS_H
+
+// Headers for general IOKit definitions
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOMessage.h>
+
+// Headers for USB specific definitions
+#include <IOKit/usb/IOUSBInterface.h>
+#include <IOKit/usb/IOUSBPipe.h>
+#include <IOKit/usb/USBSpec.h>
+#include <IOKit/usb/USB.h>
+
+// Headers for SCSI Protocol support definitions
+#include <IOKit/scsi/IOSCSIProtocolServices.h>
+
+// BSD includes
+#include <sys/sysctl.h>
+
+#define UNUSED(x) ((void)x)
+
+
+#pragma mark -
+#pragma mark Vendor Specific Device Support
+#define kIOUSBMassStorageCharacteristics		"USB Mass Storage Characteristics"
+#define kIOUSBMassStoragePreferredSubclass		"Preferred Subclass"
+#define kIOUSBMassStoragePreferredProtocol		"Preferred Protocol"
+#define kIOUSBMassStorageResetOnResume			"Reset On Resume"
+#define kIOUSBMassStorageUseStandardUSBReset	"Use Standard USB Reset"
+#define kIOUSBKnownCSWTagIssues					"Known CSW Tag Issues"
+#define kIOUSBMassStorageMaxLogicalUnitNumber	"Max Logical Unit Number"
+#define kIOPropertyIOUnitKey					"IOUnit"
+#define kIOUSBMassStorageDoNotMatch				"Do Not Match MSC"
+#define kIOUSBMassStorageDoNotOperate			"Do Not Operate"
+#define kIOUSBMassStorageEnableSuspendResumePM	"Enable Port Suspend-Resume PM"
+
+enum 
+{
+	kUSBDAddressLength = 10
+};
+
+#pragma mark -
+#pragma mark CBI Protocol Strutures
+// Structure for the global PB's
+struct CBIRequestBlock
+{
+	SCSITaskIdentifier			request;
+	IOUSBDevRequest				cbiDevRequest;
+	SCSICommandDescriptorBlock	cbiCDB;
+	IOUSBCompletion				cbiCompletion;
+	UInt32						currentState;
+	IOMemoryDescriptor *		cbiPhaseDesc;
+	UInt8						cbiGetStatusBuffer[2];	// 2 bytes as specified in the USB spec
+};
+
+typedef struct CBIRequestBlock	CBIRequestBlock;
+
+#pragma mark -
+#pragma mark Bulk Only Protocol Structures
+
+struct StorageBulkOnlyCBW
+{
+	UInt32		cbwSignature;
+	UInt32		cbwTag;
+	UInt32		cbwTransferLength;
+	UInt8		cbwFlags;
+	UInt8		cbwLUN;					// Bits 0-3: LUN, 4-7: Reserved
+	UInt8		cbwCDBLength;			// Bits 0-4: CDB Length, 5-7: Reserved
+	UInt8		cbwCDB[16];
+};
+
+typedef struct StorageBulkOnlyCBW	StorageBulkOnlyCBW;
+
+struct	StorageBulkOnlyCSW
+{
+	UInt32		cswSignature;
+	UInt32		cswTag;
+	UInt32		cswDataResidue;
+	UInt8		cswStatus;
+};
+
+typedef struct StorageBulkOnlyCSW	StorageBulkOnlyCSW;
+
+struct	BulkOnlyRequestBlock
+{
+	SCSITaskIdentifier		request;
+	IOUSBCompletion			boCompletion;
+	UInt32					currentState;
+	StorageBulkOnlyCBW		boCBW;
+	StorageBulkOnlyCSW		boCSW;
+	IOMemoryDescriptor *	boPhaseDesc;
+	UInt8					boGetStatusBuffer[2];	// 2 bytes as specified in the USB spec
+};
+
+typedef struct BulkOnlyRequestBlock		BulkOnlyRequestBlock;
+
+
+#pragma mark -
+#pragma mark IOUSBMassStorageClass definition
+
+class IOUSBMassStorageClass : public IOSCSIProtocolServices
+{
+    OSDeclareDefaultStructors(IOUSBMassStorageClass)
+
+private:
+	// ---- Member variables used by all protocols ----
+	// The interface object that provides the driver with access to the 
+	// USB so that it may talk to its device.
+    IOUSBInterface *			fInterface;
+
+	// The pipe objects that the driver uses to transport data through a
+	// pipe to the appropriate endpoint.
+    IOUSBPipe *					fBulkInPipe;
+    IOUSBPipe *					fBulkOutPipe;
+    IOUSBPipe *					fInterruptPipe;
+	IOUSBDevRequest				fUSBDeviceRequest;
+	UInt8						fPreferredSubclass;
+	UInt8						fPreferredProtocol;
+	
+  	// The maximum Logical Unit Number.  This is the highest valid LUN
+  	// that the USB device supports, so if the device only supports one
+  	// LUN, such as CBI and CB, this number will be zero.
+  	UInt8						fMaxLogicalUnitNumber;
+
+	// ---- Member variables used by CBI protocol ----
+	bool						fCBICommandStructInUse; 
+
+	CBIRequestBlock				fCBICommandRequestBlock;
+	
+	// ---- Member variables used by Bulk Only protocol ----
+ 	// Command tag, this driver just uses a sequential counter that is
+ 	// incremented for each CBW that is sent to the device.
+ 	UInt32 						fBulkOnlyCommandTag;
+
+	bool						fBulkOnlyCommandStructInUse; 
+    
+    // Dedicated CBW and CSW IOMemoryDescriptors are listed in the ExpansionData struct.
+		
+ 	// The Request block that contains all the necessary data for 
+ 	// transporting a Bulk Only request across the USB.
+ 	BulkOnlyRequestBlock		fBulkOnlyCommandRequestBlock;
+
+protected:
+    // Reserve space for future expansion.
+    struct ExpansionData
+	{
+		bool					fResetInProgress;
+		OSSet *					fClients;
+		IOUSBPipe *				fPotentiallyStalledPipe;
+		bool					fUseUSBResetNotBOReset;
+		bool					fAbortCurrentSCSITaskInProgress;
+		IOMemoryDescriptor *	fCBIMemoryDescriptor;
+		IOMemoryDescriptor *	fBulkOnlyCBWMemoryDescriptor;
+		IOMemoryDescriptor *	fBulkOnlyCSWMemoryDescriptor;
+        bool                    fDeviceAttached;
+		bool                    fWaitingForReconfigurationMessage;
+		bool					fTerminating;
+        bool                    fKnownCSWTagMismatchIssues;
+        bool                    fPortSuspendResumeForPMEnabled;
+        bool                    fPortIsSuspended;
+		bool					fRequiresResetOnResume;
+		bool					fAutonomousSpinDownWorkAround;
+		UInt8					fConsecutiveResetCount;
+		bool					fClearStallInProgress;				/* OBSOLETE */
+		bool					fTerminationDeferred;
+	};
+    ExpansionData *				reserved;
+	
+	#define fResetInProgress					reserved->fResetInProgress
+	#define fClients							reserved->fClients
+	#define fPotentiallyStalledPipe				reserved->fPotentiallyStalledPipe
+    #define fUseUSBResetNotBOReset				reserved->fUseUSBResetNotBOReset
+	#define fAbortCurrentSCSITaskInProgress		reserved->fAbortCurrentSCSITaskInProgress
+	#define fCBIMemoryDescriptor                reserved->fCBIMemoryDescriptor
+	#define	fBulkOnlyCBWMemoryDescriptor		reserved->fBulkOnlyCBWMemoryDescriptor
+	#define	fBulkOnlyCSWMemoryDescriptor		reserved->fBulkOnlyCSWMemoryDescriptor
+    #define fDeviceAttached                     reserved->fDeviceAttached
+	#define fWaitingForReconfigurationMessage	reserved->fWaitingForReconfigurationMessage
+	#define fTerminating						reserved->fTerminating
+    #define fKnownCSWTagMismatchIssues          reserved->fKnownCSWTagMismatchIssues
+    #define fPortSuspendResumeForPMEnabled      reserved->fPortSuspendResumeForPMEnabled
+    #define fPortIsSuspended                    reserved->fPortIsSuspended
+	#define fRequiresResetOnResume				reserved->fRequiresResetOnResume
+	#define fAutonomousSpinDownWorkAround		reserved->fAutonomousSpinDownWorkAround
+	#define fConsecutiveResetCount				reserved->fConsecutiveResetCount
+	#define fClearStallInProgress				reserved->fClearStallInProgress
+	#define fTerminationDeferred				reserved->fTerminationDeferred
+	
+	// Enumerated constants used to control various aspects of this
+	// driver.
+	
+	// Enumerations for Mass Storage Class Subclass types
+	enum
+	{
+		kUSBStorageRBCSubclass 				= 1,
+		kUSBStorageSFF8020iSubclass 		= 2,
+		kUSBStorageQIC157Subclass			= 3,
+		kUSBStorageUFISubclass				= 4,
+		kUSBStorageSFF8070iSubclass			= 5,
+		kUSBStorageSCSITransparentSubclass	= 6
+	};
+
+	// The supported USB Mass Storage Class transport protocols.
+	enum
+	{
+		kProtocolControlBulkInterrupt	= 0x00,
+		kProtocolControlBulk			= 0x01,
+		kProtocolBulkOnly				= 0x50
+	};
+
+	// ------- Protocol support functions ------------
+	// The SendSCSICommand function will take a SCSITask Object and transport
+	// it across the physical wire(s) to the device
+	virtual bool    		SendSCSICommand( 	
+								SCSITaskIdentifier 		request, 
+								SCSIServiceResponse *	serviceResponse,
+								SCSITaskStatus		*	taskStatus );
+
+	// The AbortSCSICommand function will abort the indicated SCSITask object,
+	// if it is possible and the SCSITask has not already completed.
+    virtual SCSIServiceResponse    	AbortSCSICommand( SCSITaskIdentifier abortTask );
+
+	virtual bool					IsProtocolServiceSupported( 
+										SCSIProtocolFeature 	feature, 
+										void * 					serviceValue );
+
+	virtual bool					HandleProtocolServiceFeature( 
+										SCSIProtocolFeature 	feature, 
+										void * 					serviceValue );
+ 
+	// Methods for retrieving and setting the object for the Interface
+	IOUSBInterface *		GetInterfaceReference( void );
+	void					SetInterfaceReference( IOUSBInterface * newInterface );
+	
+	UInt8					GetInterfaceSubclass( void );
+	UInt8					GetInterfaceProtocol( void );
+	
+	// Methods for retrieving an object for a Pipe.
+	IOUSBPipe *				GetControlPipe( void );
+	IOUSBPipe *				GetBulkInPipe( void );
+	IOUSBPipe *				GetBulkOutPipe( void );
+	IOUSBPipe *				GetInterruptPipe( void );
+	
+	// Methods for getting and setting the maximum LUN of a device.
+	UInt8					GetMaxLogicalUnitNumber( void ) const;
+	void					SetMaxLogicalUnitNumber( UInt8 maxLUN );
+	
+	virtual void 			CompleteSCSICommand( 
+								SCSITaskIdentifier request, 
+								IOReturn status );
+
+	virtual	bool			BeginProvidedServices( void );
+	virtual	bool			EndProvidedServices( void );
+	
+	// The Protocol specific helper methods for SendSCSICommand	
+	virtual IOReturn		SendSCSICommandForCBIProtocol(
+                  				SCSITaskIdentifier request );
+	
+	virtual IOReturn		SendSCSICommandForBulkOnlyProtocol(
+								SCSITaskIdentifier request );
+
+	// The Protocol specific helper methods for AbortSCSICommand	
+	virtual IOReturn		AbortSCSICommandForCBIProtocol(
+								SCSITaskIdentifier abortTask );
+	
+	virtual IOReturn		AbortSCSICommandForBulkOnlyProtocol(
+								SCSITaskIdentifier abortTask );
+
+	// Helper methods for performing general USB device requests
+	virtual IOReturn		ClearFeatureEndpointStall( 
+								IOUSBPipe *			thePipe,
+								IOUSBCompletion	*	completion );
+	virtual IOReturn 		GetStatusEndpointStatus(
+								IOUSBPipe *			thePipe,
+								void *				endpointStatus,
+								IOUSBCompletion	*	completion );
+	
+ 	/* All CBI transport related methods.
+ 	 */
+	// All definitions and structures for the CBI Protocol
+	enum
+	{
+ 		kUSBStorageAutoStatusSize	= 2		// Per the USB CBI Protocol
+ 	};
+
+ 	// Methods for accessing Bulk Only specific member variables.
+	CBIRequestBlock *		GetCBIRequestBlock( void );
+
+	void 					ReleaseCBIRequestBlock( 
+								CBIRequestBlock *	cbiRequestBlock );
+
+	// Methods used for CBI/CB command transportation.
+	static void		CBIProtocolUSBCompletionAction(
+						void *					target,
+		                void *					parameter,
+		                IOReturn				status,
+		                UInt32					bufferSizeRemaining);
+
+	IOReturn		CBIProtocolTransferData( 
+						CBIRequestBlock *		cbiRequestBlock,
+						UInt32					nextExecutionState );
+		                
+	IOReturn		CBIProtocolReadInterrupt( 
+						CBIRequestBlock *		cbiRequestBlock,
+						UInt32					nextExecutionState );
+
+	IOReturn		CBIGetStatusEndpointStatus( 
+						IOUSBPipe *				targetPipe,
+						CBIRequestBlock *		cbiRequestBlock,
+						UInt32					nextExecutionState );
+
+	IOReturn		CBIClearFeatureEndpointStall( 
+						IOUSBPipe *				targetPipe,
+						CBIRequestBlock *		cbiRequestBlock,
+						UInt32					nextExecutionState );
+						
+	void 			CBIProtocolCommandCompletion(
+						CBIRequestBlock *		cbiRequestBlock,
+		                IOReturn				resultingStatus,
+		                UInt32					bufferSizeRemaining );
+		                
+ 	/* All Bulk Only transport related methods, structures and enums.
+ 	 */
+ 	// All Bulk Only specific structures and enums.
+	
+	// All definitions and structures for the Bulk Only Protocol
+	// Command Block Wrapper (CBW)
+	enum
+	{
+		// CBW general struture definitions
+		kCommandBlockWrapperSignature	= OSSwapHostToBigConstInt32 ( 'USBC' ),
+		kByteCountOfCBW					= 31,
+
+		// CBW LUN related definitions
+		kCBWLUNMask						= 0x0F,
+
+		kCBWFlagsDataOut				= 0x00,
+		kCBWFlagsDataIn					= 0x80
+	};
+	
+	// All definitions and structures for the Bulk Only Protocol
+	// Command Status Wrapper (CSW)
+	enum
+	{
+		// CSW general struture definitions
+		kCommandStatusWrapperSignature	= OSSwapHostToBigConstInt32 ( 'USBS' ),
+		kByteCountOfCSW					= 13,
+
+		// CSW status definitions
+		kCSWCommandPassedError 			= 0x00,	// No error occurred
+		kCSWCommandFailedError			= 0x01,	/* An error occurred (probably a 
+											 	 * bad command or parameter ) */
+		kCSWPhaseError					= 0x02	/* A transfer was performed in 
+											 	 * the wrong sequence */
+	};
+
+ 	// Methods for accessing Bulk Only specific member variables.
+	BulkOnlyRequestBlock *	GetBulkOnlyRequestBlock( void );
+
+	void 			ReleaseBulkOnlyRequestBlock( 
+						BulkOnlyRequestBlock * 		boRequestBlock );
+
+	UInt32			GetNextBulkOnlyCommandTag( void );
+
+	// Methods for Bulk Only specific utility commands
+	IOReturn		BulkDeviceResetDevice(
+						BulkOnlyRequestBlock *		boRequestBlock,
+						UInt32						nextExecutionState );
+						
+	// Methods used for Bulk Only command transportation.
+	IOReturn		BulkOnlySendCBWPacket(
+						BulkOnlyRequestBlock *		boRequestBlock,
+						UInt32						nextExecutionState );
+	
+	IOReturn		BulkOnlyTransferData( 
+						BulkOnlyRequestBlock *		boRequestBlock,
+						UInt32						nextExecutionState );
+	
+	IOReturn		BulkOnlyReceiveCSWPacket(
+						BulkOnlyRequestBlock *		boRequestBlock,
+						UInt32						nextExecutionState );
+	
+	void			BulkOnlyExecuteCommandCompletion (
+						BulkOnlyRequestBlock *		boRequestBlock,
+		                IOReturn					resultingStatus,
+		                UInt32						bufferSizeRemaining );
+
+	static void		BulkOnlyUSBCompletionAction (
+		                void *			target,
+		                void *			parameter,
+		                IOReturn		status,
+		                UInt32			bufferSizeRemaining );
+	
+public:
+
+    bool				init( OSDictionary * 	propTable );
+    virtual bool		start( IOService *	 	provider );
+    virtual void 		stop( IOService * 		provider );
+	virtual void		free( void );
+	virtual	IOReturn	message( UInt32 type, IOService * provider, void * argument = 0 );
+	
+	virtual bool        willTerminate(  IOService *     provider, 
+                                        IOOptionBits    options );
+										
+	virtual bool        didTerminate(	IOService *     provider, 
+                                        IOOptionBits    options, 
+										bool *			defer );
+                                        
+	virtual bool		handleOpen( IOService *		client,
+									IOOptionBits	options,
+									void *			arg );
+	
+	virtual void		handleClose( IOService *	client,
+									 IOOptionBits	options );
+	
+	virtual bool		handleIsOpen(  const IOService * client ) const;
+	
+	virtual IOReturn	HandlePowerOn( void );
+	
+protected:
+
+	static IOReturn		sWaitForReset( void * refcon );
+	IOReturn			GatedWaitForReset( void );
+	
+	static IOReturn		sWaitForTaskAbort( void * refcon );			/* OBSOLETE */
+	IOReturn			GatedWaitForTaskAbort( void );				/* OBSOLETE */
+	
+	static void			sResetDevice( void * refcon );
+	
+	static void			sAbortCurrentSCSITask( void * refcon );		/* OBSOLETE */
+	
+    OSMetaClassDeclareReservedUsed( IOUSBMassStorageClass, 1 );
+	virtual IOReturn	StartDeviceRecovery( void );				/* OBSOLETE */
+
+    OSMetaClassDeclareReservedUsed( IOUSBMassStorageClass, 2 );
+	virtual void		FinishDeviceRecovery( IOReturn	status );	/* OBSOLETE */
+
+	static void			DeviceRecoveryCompletionAction(
+		                	void *			target,
+		                	void *			parameter,
+		                	IOReturn		status,
+		                	UInt32			bufferSizeRemaining );	/* OBSOLETE */
+
+    void                ResetDeviceNow( bool waitForReset );
+	
+	void                AbortCurrentSCSITask( void );
+	
+	bool                IsPhysicalInterconnectLocationInternal ( void );
+	    
+	IOReturn            SuspendPort ( bool suspend );
+	
+private:
+	
+	void				ClearPipeStall ( void );
+	
+	IOReturn			AcceptSCSITask ( SCSITaskIdentifier scsiTask, bool * pAccepted );
+	
+	void				CheckDeferredTermination ( void );
+	
+	void				GatedCompleteSCSICommand ( SCSITaskIdentifier request, SCSIServiceResponse * serviceResponse, SCSITaskStatus * taskStatus );
+	
+	// Space reserved for future expansion.
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 3 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 4 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 5 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 6 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 7 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 8 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 9 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 10 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 11 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 12 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 13 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 14 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 15 );
+    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 16 );
+	
+};
+
+
+#endif _IOKIT_IOUSBMASSSTORAGECLASS_H
diff --git a/i386/include/IOKit/usb/IOUSBMassStorageUFISubclass.h b/i386/include/IOKit/usb/IOUSBMassStorageUFISubclass.h
new file mode 100644
index 0000000..cbfe3c8
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBMassStorageUFISubclass.h
@@ -0,0 +1,355 @@
+/*
+ * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+#ifndef _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
+#define _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
+
+// This class' header file
+#include <IOKit/usb/IOUSBMassStorageClass.h>
+#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
+
+
+#pragma mark -
+#pragma mark IOUSBMassStorageUFIDevice declaration
+
+class IOUSBMassStorageUFIDevice : public IOSCSIPrimaryCommandsDevice
+{
+    OSDeclareDefaultStructors(IOUSBMassStorageUFIDevice)
+
+private:
+	static void			AsyncReadWriteComplete( SCSITaskIdentifier	completedTask );
+	
+protected:
+    // Reserve space for future expansion.
+    struct IOUSBMassStorageUFIDeviceExpansionData
+	{
+	};
+    IOUSBMassStorageUFIDeviceExpansionData *fIOUSBMassStorageUFIDeviceReserved;
+
+	// ---- Medium Characteristics ----
+	bool				fMediumPresent;
+
+	// The byte count of each physical block on the medium.
+	UInt32				fMediumBlockSize;
+
+	// The total number of blocks of fMediumBlockSize on the medium.
+	UInt32				fMediumBlockCount;
+
+	// Whether the installed medium is protected from writes
+	bool				fMediumIsWriteProtected;
+
+	// Polling thread variables
+	thread_call_t		fPollingThread;
+	UInt32				fPollingMode;
+	enum
+	{
+		kPollingMode_Suspended		= 0,
+		kPollingMode_NewMedia 		= 1,
+		kPollingMode_MediaRemoval	= 2
+	};
+	
+	// ---- Methods for controlling the current state of device support ----
+	virtual bool		InitializeDeviceSupport( void );
+	virtual void 		StartDeviceSupport ( void );
+	virtual void		SuspendDeviceSupport( void );
+	virtual void		ResumeDeviceSupport( void );
+	virtual void 		StopDeviceSupport ( void );
+	virtual void		TerminateDeviceSupport( void );
+
+	// ---- Methods used for misc  ----
+	virtual bool		ClearNotReadyStatus( void );
+	virtual void 		CreateStorageServiceNub( void );
+	virtual bool		DetermineDeviceCharacteristics( void );
+
+	// ---- Methods used for controlling the polling thread ----
+	virtual void		ProcessPoll( void );
+	virtual void		EnablePolling( void );
+	virtual void		DisablePolling( void );
+
+	// ---- Main and support methods for polling for new Media ----
+	virtual void		PollForNewMedia( void );
+	virtual bool		DetermineMediaPresence( void );
+	virtual bool		DetermineMediumCapacity( 
+							UInt64 * 				blockSize, 
+							UInt64 * 				blockCount );
+	virtual bool		DetermineMediumWriteProtectState( void );
+
+	// ---- Main and support methods for polling for Media removal ----
+	virtual void		PollForMediaRemoval( void );
+	
+	// ---- Methods used for power managment ----
+	virtual UInt32		GetInitialPowerState ( void );
+	virtual void 		InitializePowerManagement ( IOService * provider );
+	virtual void		HandlePowerChange ( void );
+	virtual void		HandleCheckPowerState ( void );
+	virtual void		TicklePowerManager ( void );
+	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
+
+	// ---- Methods used for handling medium characteristics ----
+    virtual void		SetMediumCharacteristics( 
+    						UInt32 					blockSize, 
+    						UInt32 					blockCount );
+	
+	virtual void		ResetMediumCharacteristics( void );
+
+	virtual IOReturn	IssueRead( 	
+							IOMemoryDescriptor *	buffer,
+                         	UInt64					startBlock,
+                     		UInt64					blockCount );
+	
+	virtual IOReturn	IssueRead(	
+							IOMemoryDescriptor *	buffer,
+                      		UInt64					startBlock,
+                     		UInt64					blockCount,
+                       		void * 					clientData );
+
+
+	virtual IOReturn	IssueWrite( 
+							IOMemoryDescriptor *	buffer,
+                    		UInt64					startBlock,
+                       		UInt64					blockCount );
+
+	virtual IOReturn	IssueWrite(	
+							IOMemoryDescriptor *	buffer,
+                         	UInt64					startBlock,
+                      		UInt64					blockCount,
+							void * 					clientData );
+
+public:
+											
+	static 	void		sProcessPoll( void * pdtDriver, void * refCon );
+
+	// Interface to the UFI Storage Services Driver
+	// ---- Methods for controlling the device ----
+	virtual IOReturn	SyncReadWrite(
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+							UInt64					blockCount,
+							UInt64					blockSize );
+
+	virtual IOReturn	AsyncReadWrite(
+							IOMemoryDescriptor *	buffer,
+							UInt64					startBlock,
+							UInt64					blockCount,
+							UInt64					blockSize,
+							void * 					clientData );
+
+	// ---- Methods for controlling medium state ----
+	virtual IOReturn	EjectTheMedium( void );
+
+	// ---- Methods for controlling media format ----
+	virtual IOReturn	FormatMedium( 
+							UInt64 					blockCount, 
+							UInt64 					blockSize );
+	virtual UInt32		GetFormatCapacities( 	
+							UInt64 * 				capacities,
+             				UInt32   				capacitiesMaxCount ) const;
+
+	// ---- Query methods to report device characteristics ----
+	// Report the maximum number of blocks that the device can handle per
+	// read or write.  A value of 0 (zero) indicates there is no limit aside
+	// from the size of the method's return parameter.
+	virtual UInt64		ReportDeviceMaxBlocksReadTransfer( void );
+	virtual UInt64		ReportDeviceMaxBlocksWriteTransfer( void );
+	
+	// ---- Query methods to report installed medium characteristics ----
+	virtual UInt64		ReportMediumBlockSize( void );
+	virtual UInt64		ReportMediumTotalBlockCount( void );
+	virtual bool		ReportMediumWriteProtection( void );
+        
+	// Methods for getting device information strings
+	virtual char *		GetVendorString( void );
+	virtual char *		GetProductString( void );
+	virtual char *		GetRevisionString( void );
+	OSDictionary *		GetProtocolCharacteristicsDictionary ( void );
+	OSDictionary *		GetDeviceCharacteristicsDictionary ( void );	
+	
+protected:
+	// Utility methods used by all SCSI Command Set objects
+	
+	// isParameterValid methods are used to validate that the parameter passed into
+	// the command methods are of the correct value.
+	
+	// Validate Parameter used for 1 bit to 1 byte paramaters
+    bool		 	IsParameterValid( 
+							SCSICmdField1Byte 			param,
+							SCSICmdField1Byte 			mask );
+	
+	// Validate Parameter used for 9 bit to 2 byte paramaters
+	bool		 	IsParameterValid( 
+							SCSICmdField2Byte 			param,
+							SCSICmdField2Byte 			mask );
+	
+	// Validate Parameter used for 17 bit to 4 byte paramaters
+	bool		 	IsParameterValid( 
+							SCSICmdField4Byte 			param,
+							SCSICmdField4Byte 			mask );
+	
+	// UFI Required Commands
+	virtual bool 	FORMAT_UNIT(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer,
+			    			IOByteCount					defectListSize,
+			    			SCSICmdField1Byte 			TRACK_NUMBER, 
+			    			SCSICmdField2Byte 			INTERLEAVE );
+
+	virtual bool	INQUIRY(
+							SCSITaskIdentifier			request,
+    						IOMemoryDescriptor 			*dataBuffer,
+    						SCSICmdField1Byte 			PAGE_OR_OPERATION_CODE,
+    						SCSICmdField1Byte 			ALLOCATION_LENGTH );
+
+   	virtual bool	MODE_SELECT_10(
+							SCSITaskIdentifier			request,
+    						IOMemoryDescriptor 			*dataBuffer,
+    						SCSICmdField1Bit 			PF,
+    						SCSICmdField1Bit 			SP,
+    						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH );  
+
+   	virtual bool	MODE_SENSE_10(
+							SCSITaskIdentifier			request,
+    						IOMemoryDescriptor 			*dataBuffer,
+    						SCSICmdField1Bit 			DBD,
+	   						SCSICmdField2Bit 			PC,
+	   						SCSICmdField6Bit 			PAGE_CODE,
+	   						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH );
+
+    virtual bool	PREVENT_ALLOW_MEDIUM_REMOVAL( 
+							SCSITaskIdentifier			request,
+	     					SCSICmdField1Bit 			PREVENT );
+
+	virtual bool 	READ_10(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			UInt32						blockSize,
+			    			SCSICmdField1Bit 			DPO, 
+			    			SCSICmdField1Bit 			FUA,
+							SCSICmdField1Bit 			RELADR, 
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField2Byte 			TRANSFER_LENGTH );
+
+	virtual bool 	READ_12(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			UInt32						blockSize,
+			    			SCSICmdField1Bit 			DPO, 
+			    			SCSICmdField1Bit 			FUA,
+							SCSICmdField1Bit 			RELADR, 
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField4Byte 			TRANSFER_LENGTH );
+
+	virtual bool 	READ_CAPACITY(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			SCSICmdField1Bit 			RELADR,
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField1Bit 			PMI );
+
+	virtual bool 	READ_FORMAT_CAPACITIES(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			SCSICmdField2Byte 			ALLOCATION_LENGTH );
+
+	virtual bool 	REQUEST_SENSE(
+							SCSITaskIdentifier			request,
+   							IOMemoryDescriptor 			*dataBuffer,
+			    			SCSICmdField1Byte 			ALLOCATION_LENGTH );
+ 	
+	virtual bool 	REZERO_UNIT( 
+							SCSITaskIdentifier			request );
+
+	virtual bool 	SEEK( 
+							SCSITaskIdentifier			request,
+			    			SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS );
+
+	virtual bool 	SEND_DIAGNOSTICS( 
+							SCSITaskIdentifier			request,
+							SCSICmdField1Bit 			PF, 
+							SCSICmdField1Bit 			SELF_TEST, 
+							SCSICmdField1Bit 			DEF_OFL, 
+							SCSICmdField1Bit 			UNIT_OFL );
+
+	virtual bool 	START_STOP_UNIT( 
+							SCSITaskIdentifier			request,
+							SCSICmdField1Bit 			IMMED, 
+							SCSICmdField1Bit 			LOEJ, 
+							SCSICmdField1Bit 			START );
+
+    virtual bool 	TEST_UNIT_READY(  
+							SCSITaskIdentifier			request );
+ 
+	virtual bool 	VERIFY( 
+							SCSITaskIdentifier			request,
+							SCSICmdField1Bit 			DPO, 
+							SCSICmdField1Bit 			BYTCHK, 
+							SCSICmdField1Bit 			RELADR,
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField2Byte 			VERIFICATION_LENGTH );
+
+	virtual bool 	WRITE_10(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			UInt32						blockSize,
+			    			SCSICmdField1Bit 			DPO, 
+			    			SCSICmdField1Bit 			FUA,
+							SCSICmdField1Bit 			RELADR, 
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField2Byte 			TRANSFER_LENGTH );
+
+	virtual bool 	WRITE_12(
+							SCSITaskIdentifier			request,
+							IOMemoryDescriptor *		dataBuffer, 
+			    			UInt32						blockSize,
+			    			SCSICmdField1Bit 			DPO, 
+							SCSICmdField1Bit 			EBP, 
+							SCSICmdField1Bit 			RELADR, 
+							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
+							SCSICmdField4Byte 			TRANSFER_LENGTH );
+
+	virtual bool 	WRITE_AND_VERIFY(
+							SCSITaskIdentifier			request,
+			    			IOMemoryDescriptor *		dataBuffer, 
+			    			UInt32						blockSize,
+			    			SCSICmdField1Bit 			DPO,
+			    			SCSICmdField1Bit 			BYTCHK, 
+			    			SCSICmdField1Bit 			RELADR, 
+			    			SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS, 
+			    			SCSICmdField2Byte 			TRANSFER_LENGTH );
+};
+
+
+#pragma mark -
+#pragma mark IOUSBMassStorageUFISubclass declaration
+
+
+class IOUSBMassStorageUFISubclass : public IOUSBMassStorageClass
+{
+    OSDeclareDefaultStructors(IOUSBMassStorageUFISubclass)
+
+protected:
+	virtual	bool		BeginProvidedServices( void );
+	virtual	bool		EndProvidedServices( void );
+};
+
+#endif _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
diff --git a/i386/include/IOKit/usb/IOUSBNub.h b/i386/include/IOKit/usb/IOUSBNub.h
new file mode 100644
index 0000000..a998e5b
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBNub.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBNUB_H
+#define _IOKIT_IOUSBNUB_H
+
+#include <IOKit/IOService.h>
+#include <libkern/c++/OSData.h>
+#include <IOKit/IOMemoryDescriptor.h>
+
+#include <IOKit/usb/USB.h>
+
+class IOUSBController;
+class IOUSBPipe;
+
+/*!
+ @class IOUSBNub
+ @abstract Super class for for IOUSBDevice and IOUSBInterface.
+ */
+class IOUSBNub : public IOService
+{
+    OSDeclareDefaultStructors(IOUSBNub)
+
+public:
+	
+	// IOKit method
+	virtual void					joinPMtree ( IOService * driver );
+
+    virtual bool					USBCompareProperty(OSDictionary   * matching, const char     * key );
+    
+    bool							IsWildCardMatch( OSDictionary   * matching, const char     * key );
+    bool							USBComparePropertyWithMask( OSDictionary *matching, const char *key, const char * maskKey );
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void printDescriptor(const IOUSBDescriptorHeader *desc);
+void printDeviceDescriptor(const IOUSBDeviceDescriptor *desc);
+void printConfigDescriptor(const IOUSBConfigurationDescriptor *cd);
+void printEndpointDescriptor(const IOUSBEndpointDescriptor *ed);
+void printInterfaceDescriptor(const IOUSBInterfaceDescriptor *id);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _IOKIT_IOUSBNUB_H */
diff --git a/i386/include/IOKit/usb/IOUSBPipe.h b/i386/include/IOKit/usb/IOUSBPipe.h
new file mode 100644
index 0000000..3286b92
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBPipe.h
@@ -0,0 +1,387 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.2 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBPIPE_H
+#define _IOKIT_IOUSBPIPE_H
+
+#include <IOKit/IOService.h>
+#include <IOKit/IOMemoryDescriptor.h>
+
+#include <IOKit/usb/USB.h>
+#include <IOKit/usb/IOUSBController.h>
+#include <IOKit/usb/IOUSBControllerV2.h>
+
+class IOUSBInterface;
+
+/*!
+    @class IOUSBPipe
+    @abstract The object representing an open pipe for a device.
+*/
+class IOUSBPipe : public OSObject
+{
+    friend class IOUSBInterface;
+    friend class IOUSBDevice;
+	
+    OSDeclareDefaultStructors(IOUSBPipe)
+		
+protected:
+	
+	const IOUSBEndpointDescriptor *	_descriptor;
+    IOUSBController::Endpoint		_endpoint;	// tidied up version of descriptor
+    IOUSBController *				_controller;
+    USBDeviceAddress				_address;
+    UInt8							_status;	// was previously used for status.  Now used to detect whether a property exists or not
+	
+    struct ExpansionData
+    {
+        IOReturn					_correctStatus;		
+		IOUSBDevice *				_device;	// Remember containing device for clearing TTs
+		UInt8						_speed;
+		IOUSBInterface	*			_interface;
+		bool						_crossEndianCompatible;
+		UInt32						_locationID;
+    };
+    ExpansionData * _expansionData;
+    
+    virtual void free();
+    
+    IOReturn ClosePipe(void);
+	
+public:
+		
+		virtual bool InitToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
+									USBDeviceAddress address, IOUSBController * controller);
+	
+    // The following 2 methods are obsolete
+    //
+    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
+                                 USBDeviceAddress address, IOUSBController * controller);
+	
+    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint,
+                                 IOUSBDevice * device, IOUSBController * controller);
+	
+    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint,
+                                 IOUSBDevice * device, IOUSBController * controller, IOUSBInterface *interface);
+	
+    // Controlling pipe state
+    /*!
+        @function GetStatus
+	 This method does NOT work.  Do not call it. See GetPipeStatus for the correct method.
+	 GetStatus will always return 0.
+	 */
+    virtual UInt8 GetStatus(void);
+    /*!
+        @function Abort
+	 This method causes all outstanding I/O on a pipe to complete with return code kIOReturnAborted. It  clears the halted bit but does NOT clear the
+	 toggle bit on the endpoint in the controller.  If you wish to clear the toggle bit, see ClearPipeStall
+	 */
+    virtual IOReturn Abort(void);
+    /*!
+        @function Reset
+	 This method is identical to ClearPipeStall(false). The use of that API is preferred.
+	 */
+    virtual IOReturn Reset(void);
+    /*!
+        @function ClearStall
+	 This method is equivalent to ClearPipeStall(false). This method is available before version 1.9.
+	 */
+    virtual IOReturn ClearStall(void);
+	
+    //
+    // Transferring Data
+    //
+    
+    // deprecated
+    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
+                          IOUSBCompletion *	completion = 0,
+						  IOByteCount *		bytesRead = 0);
+	
+    // deprecated
+    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
+                           IOUSBCompletion *	completion = 0);
+	
+    // Transfer data over Isochronous pipes
+    /*!
+        @function Read
+	 Read from an isochronous endpoint
+	 @param buffer place to put the transferred data
+	 @param frameStart USB frame number of the frame to start transfer
+	 @param numFrames Number of frames to transfer
+	 @param frameList Bytes to transfer and result for each frame
+	 @param completion describes action to take when buffer has been filled
+	 */
+    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
+                          UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList,
+                          IOUSBIsocCompletion *	completion = 0);
+    /*!
+        @function Write
+	 Write to an isochronous endpoint
+	 @param buffer place to get the transferred data
+	 @param frameStart USB frame number of the frame to start transfer
+	 @param numFrames Number of frames to transfer
+	 @param frameList Bytes to transfer and result for each frame
+	 @param completion describes action to take when buffer has been emptied
+	 */
+    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
+                           UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList,
+                           IOUSBIsocCompletion * completion = 0);
+	
+    // Do a control request over a Control pipe, using a memory descriptor
+    /*!
+        @function ControlRequest
+	 Make a control request
+	 There are two versions of this method, one uses a simple void *
+	 to point to the data portion of the transfer, the other uses an
+	 IOMemoryDescriptor to point to the data.
+	 @param request parameter block for the control request
+	 @param completion describes action to take when the request has been executed
+	 */
+    virtual IOReturn ControlRequest(IOUSBDevRequestDesc	*request,
+                                    IOUSBCompletion	*completion = 0);
+	
+    // Do a control request over a Control pipe, using a simple buffer
+    virtual IOReturn ControlRequest(IOUSBDevRequest	*request,
+                                    IOUSBCompletion	*completion = 0);
+	
+	/*
+	 *  Accessors
+	 */
+    /*!
+        @function GetEndpoint
+	 returns a pointer to the Endpoint structure for the pipe.
+	 */
+    virtual const IOUSBController::Endpoint *	GetEndpoint();
+    /*!
+        @function GetEndpointDescriptor
+	 returns the endpoint descriptor for the pipe.
+	 */
+    virtual const IOUSBEndpointDescriptor *	GetEndpointDescriptor();
+    /*!
+        @function GetDirection
+	 returns the direction of the pipe:kUSBOut/kUSBIn for a bulk or interrupt pipe,
+	 kUSBAnyDirn for a control pipe.
+	 */
+    virtual UInt8 GetDirection();
+    /*!
+        @function GetType
+	 returns the pipe type: kUSBControl, kUSBBulk or kUSBInterrupt.
+	 */
+    virtual UInt8 GetType();
+    /*!
+        @function GetEndpointNumber
+	 returns the endpoint number in the device that the pipe is connected to.
+	 */
+    virtual UInt8 GetEndpointNumber();
+    virtual USBDeviceAddress GetAddress();
+    virtual UInt16 GetMaxPacketSize();
+    virtual UInt8 GetInterval();
+	
+    // Transfer data over Bulk pipes with timeouts.
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  0);
+	
+    // deprecated
+    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
+						  UInt32		noDataTimeout,
+						  UInt32		completionTimeout,
+                          IOUSBCompletion *	completion = 0,
+						  IOByteCount *		bytesRead = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  1);
+	
+    // deprecated
+    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
+						   UInt32		noDataTimeout,
+						   UInt32		completionTimeout,
+                           IOUSBCompletion *	completion = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  2);
+    // Do a control request over a Control pipe, using a memory descriptor
+    /*!
+        @function ControlRequest
+	 Make a control request. 
+	 There are two versions of this method, one uses a simple void *
+	 to point to the data portion of the transfer, the other uses an
+	 IOMemoryDescriptor to point to the data.
+	 @param request parameter block for the control request
+	 @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
+	 if no data has been transferred on the bus.
+	 @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
+	 not been completed.
+	 @param completion describes action to take when the request has been executed
+	 */
+    virtual IOReturn ControlRequest(IOUSBDevRequestDesc	*request,
+									UInt32		noDataTimeout,
+									UInt32		completionTimeout,
+                                    IOUSBCompletion	*completion = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  3);
+    // Do a control request over a Control pipe, using a simple buffer
+    virtual IOReturn ControlRequest(IOUSBDevRequest	*request,
+									UInt32		noDataTimeout,
+									UInt32		completionTimeout,
+                                    IOUSBCompletion	*completion = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  4);
+    /*!
+        @function Read
+	 Read from an interrupt or bulk endpoint
+	 @param buffer place to put the transferred data
+	 @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
+	 the driver software may have to resynchronize the data toggle. See ClearPipeStall.
+	 @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
+	 @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
+	 @param completion describes action to take when buffer has been filled
+	 @param bytesRead returns total bytes read for synchronous reads
+	 */
+    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
+						  UInt32		noDataTimeout,
+						  UInt32		completionTimeout,
+						  IOByteCount		reqCount,
+						  IOUSBCompletion *	completion = 0,
+						  IOByteCount *		bytesRead = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  5);
+    /*!
+        @function Write
+	 Write to an interrupt or bulk endpoint
+	 @param buffer place to get the transferred data
+	 @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
+	 the driver software may have to resynchronize the data toggle. See ClearPipeStall.
+	 @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
+	 @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
+	 @param completion describes action to take when buffer has been emptied
+	 */
+    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
+						   UInt32		noDataTimeout,
+						   UInt32		completionTimeout,
+						   IOByteCount		reqCount,
+                           IOUSBCompletion *	completion = 0);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  6);
+    /*!
+        @function GetPipeStatus
+	 Returns the status of the pipe (kIOUSBPipeStalled of the pipe is stalled, else kIOReturnSuccess)
+	 */
+    virtual IOReturn GetPipeStatus(void);
+    
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  7);
+    /*!
+		@function ClearPipeStall
+	 AVAILABLE ONLY IN VERSION 1.9 AND ABOVE
+	 This method causes all outstanding I/O on a pipe to complete with return code kIOUSBTransactionReturned. It also clears both the halted bit and the
+	 toggle bit on the endpoint in the controller. The driver may need to reset the data toggle within the device to avoid losing any data. If the
+	 device correctly handles the ClearFeature(ENDPOINT_HALT) device request, then this API will handle that by sending the correct request to the
+	 device.
+	 @param withDeviceRequest if true, a ClearFeature(ENDPOINT_HALT) is sent to the appropriate endpoint on the device after the transactions on the 
+	 controllers endpoint are returned and the toggle bit on the controllers endpoint is cleared. if this parameter is false, then this is equivalent
+	 to the pre-1.9 API. This means that the endpoint on the controller is cleared, but no DeviceRequest is sent to the device's endpoint.
+	 */
+    virtual IOReturn ClearPipeStall(bool withDeviceRequest);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  8);
+    /*!
+		@function SetPipePolicy
+	 AVAILABLE ONLY IN VERSION 1.9 AND ABOVE
+	 This method allows a driver to change the maxPacketSize of an Isochronous pipe, or the polling interval for an interrupt pipe. There is a limited
+	 amount of bandwidth on any single bus, and isochronous pipes tend to use much of this bandwidth. The driver may know, however, that there
+	 will never be as much bandwidth used as is specified in the pipe's endpoint descriptor. Therefore, the driver may return some of this 
+	 bandwidth to the system by using this method. Additionally, if on an open of an IOUSBInterface any of the Isochronous pipes is unable to be 
+	 opened because of a lack of bandwidth, the pipe will be created with a bandwidth of zero, and the driver may get some of the limited bandwidth
+	 remaining by using this call.
+	 This method returns kIOReturnBadArgument if the pipe is a bulk on control pipe, or if the maxPacketSize parameter is larger than the amount specified
+	 in the endpoint descriptor. It returns kIOReturnNoBandwidth if the bandwidth requested cannot be allocated. Otherwise it returns kIOReturnSuccess.
+	 @param maxPacketSize specifies the maximum number of bytes to be used in any one millisecond frame by this pipe. The value must be less than or 
+	 equal to the maxPacketSize specified in the endpoint descriptor.
+	 @param maxInterval not currently used. reserved for future expansion
+	 
+	 */
+    virtual IOReturn SetPipePolicy(UInt16 maxPacketSize, UInt8 maxInterval);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  9);
+	
+    // Transfer data over Isochronous pipes and process the frame list at hardware interrupt time
+    /*!
+        @function Read
+	 AVAILABLE ONLY IN VERSION 1.9.2 AND ABOVE
+	 Read from an isochronous endpoint and process the IOUSBLowLatencyIsocFrame fields at 
+	 hardware interrupt time
+	 @param buffer place to put the transferred data
+	 @param frameStart USB frame number of the frame to start transfer
+	 @param numFrames Number of frames to transfer
+	 @param frameList Bytes to transfer, result, and time stamp for each frame
+	 @param completion describes action to take when buffer has been filled
+	 @param updateFrequency describes how often (in milliseconds) should the frame list be processed
+	 */
+    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
+                          UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList,
+                          IOUSBLowLatencyIsocCompletion *	completion = 0, UInt32 updateFrequency = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  10);
+    /*!
+        @function Write
+	 AVAILABLE ONLY IN VERSION 1.9.2 AND ABOVE
+	 Write to an isochronous endpoint
+	 @param buffer place to get the data to transfer
+	 @param frameStart USB frame number of the frame to start transfer
+	 @param numFrames Number of frames to transfer
+	 @param frameList Pointer to list of frames indicating bytes to transfer and result for each frame
+	 @param completion describes action to take when buffer has been emptied
+	 @param updateFrequency describes how often (in milliseconds) should the frame list be processed
+	 */
+    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
+                           UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList,
+                           IOUSBLowLatencyIsocCompletion * completion = 0, UInt32 updateFrequency = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  11);
+    /*!
+        @function Read
+     Read from an interrupt or bulk endpoint
+     @param buffer place to put the transferred data
+     @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
+     the driver software may have to resynchronize the data toggle. See ClearPipeStall.
+     @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
+     @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
+     @param completion describes action to take when buffer has been filled
+     @param bytesRead returns total bytes read for synchronous reads
+     */
+    virtual IOReturn Read(IOMemoryDescriptor *			buffer,
+                          UInt32				noDataTimeout,
+                          UInt32				completionTimeout,
+                          IOByteCount				reqCount,
+                          IOUSBCompletionWithTimeStamp *	completion = 0,
+                          IOByteCount *				bytesRead = 0);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBPipe,  12);
+	virtual bool InitToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
+								USBDeviceAddress address, IOUSBController * controller, IOUSBDevice * device, IOUSBInterface * interface);
+
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  13);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  14);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  15);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  16);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  17);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  18);
+    OSMetaClassDeclareReservedUnused(IOUSBPipe,  19);
+	
+};
+
+#endif /* _IOKIT_IOUSBPIPE_H */
diff --git a/i386/include/IOKit/usb/IOUSBRootHubDevice.h b/i386/include/IOKit/usb/IOUSBRootHubDevice.h
new file mode 100644
index 0000000..19a17c4
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBRootHubDevice.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBROOTHUBDEVICE_H
+#define _IOKIT_IOUSBROOTHUBDEVICE_H
+
+#include <IOKit/usb/IOUSBHubDevice.h>
+
+/*!
+ @class IOUSBRootHubDevice
+ @abstract The object representing the Root Hub simulation.
+ */
+class IOUSBRootHubDevice : public IOUSBHubDevice
+{
+    OSDeclareDefaultStructors(IOUSBRootHubDevice)
+
+private:
+    UInt16				configuration;
+	IOCommandGate		*_commandGate;
+
+	// private method which overrides the same method in IOUSBHubDevice
+	virtual bool			InitializeCharacteristics(void);					// used at start
+	
+    struct ExpansionData 
+	{
+		IOService *		_IOResourcesEntry;
+	};
+    ExpansionData *_expansionData;
+
+public:
+	// static methods
+    static IOUSBRootHubDevice	*NewRootHubDevice(void);
+    static IOReturn				GatedDeviceRequest (OSObject *	owner, 
+												void *		arg0, 
+												void *		arg1, 
+												void *		arg2, 
+												void *		arg3 );
+    
+	// IOKit methods
+    virtual bool 	init();
+	virtual bool 	start( IOService * provider );
+    virtual void 	stop( IOService *provider );
+    virtual void	free();
+
+	// IOUSBHubDevice methods
+	virtual bool			IsRootHub(void);
+	virtual UInt32			RequestExtraPower(UInt32 requestedPower);
+	virtual void			ReturnExtraPower(UInt32 returnedPower);
+
+	// 
+	virtual UInt32			RequestSleepPower(UInt32 requestedPower);
+	virtual void			ReturnSleepPower(UInt32 returnedPower);
+	
+	// a non static but non-virtual function
+	IOReturn DeviceRequestWorker(IOUSBDevRequest *request, UInt32 noDataTimeout, UInt32 completionTimeout, IOUSBCompletion *completion);
+    
+	// IOUSBDevice methods overriden here
+    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, IOUSBCompletion *completion = 0);
+    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, UInt32 noDataTimeout, UInt32 completionTimeout, IOUSBCompletion *completion = 0);
+
+    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  0);
+	virtual IOReturn		GetDeviceInformation(UInt32 *info);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  1);
+	virtual void			InitializeExtraPower(UInt32 maxPortCurrent, UInt32 totalExtraCurrent);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  2);
+	virtual void			SetSleepCurrent(UInt32 sleepCurrent);
+	
+    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  3);
+	virtual UInt32			GetSleepCurrent();
+
+    OSMetaClassDeclareReservedUnused(IOUSBRootHubDevice,  4);
+};
+
+#endif /* _IOKIT_IOUSBROOTHUBDEVICE_H */
+
diff --git a/i386/include/IOKit/usb/IOUSBUserClient.h b/i386/include/IOKit/usb/IOUSBUserClient.h
new file mode 100644
index 0000000..1cd47a8
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBUserClient.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBUSERCLIENT_H
+#define _IOKIT_IOUSBUSERCLIENT_H
+
+// these are the new User Client method names    
+enum {
+    kUSBDeviceUserClientOpen,
+    kUSBDeviceUserClientClose,
+    kUSBDeviceUserClientSetConfig,
+    kUSBDeviceUserClientGetConfig,
+    kUSBDeviceUserClientGetConfigDescriptor,
+    kUSBDeviceUserClientGetFrameNumber,
+    kUSBDeviceUserClientDeviceRequestOut,
+    kUSBDeviceUserClientDeviceRequestIn,
+    kUSBDeviceUserClientCreateInterfaceIterator,
+    kUSBDeviceUserClientResetDevice,
+    kUSBDeviceUserClientSuspend,
+    kUSBDeviceUserClientAbortPipeZero,
+    kUSBDeviceUserClientReEnumerateDevice,
+    kUSBDeviceUserClientGetMicroFrameNumber,
+    kUSBDeviceUserClientGetFrameNumberWithTime,
+    kUSBDeviceUserClientSetAsyncPort,
+	kUSBDeviceUserClientGetDeviceInformation,
+	kUSBDeviceUserClientRequestExtraPower,
+	kUSBDeviceUserClientReturnExtraPower,
+	kUSBDeviceUserClientGetExtraPowerAllocated,
+    kIOUSBLibDeviceUserClientNumCommands
+    };
+
+enum {
+    kUSBInterfaceUserClientOpen,
+    kUSBInterfaceUserClientClose,
+    kUSBInterfaceUserClientGetDevice,
+    kUSBInterfaceUserClientSetAlternateInterface,
+    kUSBInterfaceUserClientGetFrameNumber,
+    kUSBInterfaceUserClientGetPipeProperties,
+    kUSBInterfaceUserClientReadPipe,
+    kUSBInterfaceUserClientWritePipe,
+    kUSBInterfaceUserClientGetPipeStatus,
+    kUSBInterfaceUserClientAbortPipe,
+    kUSBInterfaceUserClientResetPipe,
+    kUSBInterfaceUserClientClearPipeStall,
+    kUSBInterfaceUserClientControlRequestOut,
+    kUSBInterfaceUserClientControlRequestIn,
+    kUSBInterfaceUserClientSetPipePolicy,
+    kUSBInterfaceUserClientGetBandwidthAvailable,
+    kUSBInterfaceUserClientGetEndpointProperties,
+    kUSBInterfaceUserClientLowLatencyPrepareBuffer,
+    kUSBInterfaceUserClientLowLatencyReleaseBuffer,
+    kUSBInterfaceUserClientGetMicroFrameNumber,
+    kUSBInterfaceUserClientGetFrameListTime,
+    kUSBInterfaceUserClientGetFrameNumberWithTime,
+    kUSBInterfaceUserClientSetAsyncPort,
+    kUSBInterfaceUserClientReadIsochPipe,
+    kUSBInterfaceUserClientWriteIsochPipe,
+    kUSBInterfaceUserClientLowLatencyReadIsochPipe,
+    kUSBInterfaceUserClientLowLatencyWriteIsochPipe,
+	kUSBInterfaceUserClientGetConfigDescriptor,
+    kIOUSBLibInterfaceUserClientNumCommands
+    };
+
+
+#if KERNEL
+#include <IOKit/IOService.h>
+#include <IOKit/IOUserClient.h>
+#include <IOKit/usb/USB.h>
+
+//================================================================================================
+//
+//   Structure declarations
+//
+//================================================================================================
+//
+typedef struct IOUSBUserClientAsyncParamBlock IOUSBUserClientAsyncParamBlock;
+
+struct IOUSBUserClientAsyncParamBlock 
+{
+    OSAsyncReference64			fAsyncRef;
+    uint32_t					fAsyncCount;
+    uint32_t					fMax;
+    IOMemoryDescriptor *		fMem;
+    IOUSBDevRequestDesc			req;
+};
+
+typedef struct IOUSBInterfaceUserClientISOAsyncParamBlock IOUSBInterfaceUserClientISOAsyncParamBlock;
+struct IOUSBInterfaceUserClientISOAsyncParamBlock 
+{
+    OSAsyncReference64			fAsyncRef;
+	uint32_t					fAsyncCount;
+    mach_vm_size_t				frameLen;	// In bytes
+    mach_vm_address_t           frameBase;	// In user task
+    IOMemoryDescriptor *        dataMem;
+    IOMemoryDescriptor *        countMem;
+	uint64_t					numFrames;
+    IOUSBIsocFrame              frames[0];  // Must be the last one
+};
+
+
+//================================================================================================
+//
+// This class is used to add an IOProviderMergeProperties dictionary entry to a provider's
+// property list, thus providing a tie between hardware and a CFBundle at hardware
+// load time.  This property usually contains the user client class name and the CFPlugInTypes UUID's
+// but it can contain other properties.
+//
+//================================================================================================
+//
+class IOUSBUserClientInit : public IOService 
+{
+    OSDeclareDefaultStructors(IOUSBUserClientInit);
+
+public:
+    
+    virtual bool		start(IOService *  provider) ;
+    virtual bool 		MergeDictionaryIntoProvider(IOService *  provider, OSDictionary *  mergeDict);
+    virtual bool		MergeDictionaryIntoDictionary(OSDictionary *  sourceDictionary,  OSDictionary *  targetDictionary);
+};
+
+#endif // KERNEL
+
+#endif /* ! _IOKIT_IOUSBUSERCLIENT_H */
+
diff --git a/i386/include/IOKit/usb/IOUSBWorkLoop.h b/i386/include/IOKit/usb/IOUSBWorkLoop.h
new file mode 100644
index 0000000..7630704
--- /dev/null
+++ b/i386/include/IOKit/usb/IOUSBWorkLoop.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2001-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _IOKIT_IOUSBWORKLOOP_H
+#define _IOKIT_IOUSBWORKLOOP_H
+
+#include <IOKit/IOWorkLoop.h>
+
+/*!
+ @class IOUSBWorkLoop
+ @abstract Subclass of IOWorkloop that allows the USB stack to more finely control sleep and wake.
+ */
+class IOUSBWorkLoop : public IOWorkLoop
+{    
+    OSDeclareDefaultStructors(IOUSBWorkLoop)
+    
+protected:
+    void *			fSleepToken;
+#ifndef __OPEN_SOURCE__
+	lck_grp_t *		fLockGroup;
+#endif
+	bool init ( const char * controllerLocation );
+	void free ( void );
+	
+    // Overrides to check for sleeping
+    virtual void closeGate();
+    virtual bool tryCloseGate();
+    
+public:
+    // Create a workloop
+    static IOUSBWorkLoop * workLoop(const char * controllerLocation);
+    
+    // Put workloop to sleep (Must have gate closed, opens gate if successful)
+    virtual IOReturn sleep(void *token);
+    
+    // Wake workloop up (closes gate if successful)
+    virtual IOReturn wake(void *token);
+    
+    void CloseGate(void);
+    void OpenGate(void);
+};
+
+#endif /* ! _IOKIT_IOUSBWORKLOOP_H */
+
diff --git a/i386/include/IOKit/usb/USB.h b/i386/include/IOKit/usb/USB.h
new file mode 100644
index 0000000..8ba12bb
--- /dev/null
+++ b/i386/include/IOKit/usb/USB.h
@@ -0,0 +1,1076 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _USB_H
+#define _USB_H
+
+#if KERNEL
+	#include <libkern/OSByteOrder.h>
+	#include <IOKit/IOMemoryDescriptor.h>
+#else
+	#include <libkern/OSByteOrder.h>
+#endif
+
+#include <IOKit/IOTypes.h>
+
+#if !defined(__USB__)
+#    include <IOKit/usb/USBSpec.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /*!
+    @header		USB.h
+     @abstract	Public Interfaces to the USB implementation in Mac OS X.
+     @discussion	This header file contains definitions and structures that are used in the different USB API's in Mac OS X, both in the kernel and in the user space.
+     */
+
+    /*!
+    @defined	Endian conversion definitions
+     @discussion The USB API's use a convention of specifying parameters in the host order.  The USB spec specifies that multi-byte items should be
+     formatted in little endian order.  The following macros allow one to translate multi-byte values from Host order to USB order and vice versa.  There are separate macros for
+     in-kernel use and for user space use.
+     */
+#define USBToHostWord OSSwapLittleToHostInt16
+#define HostToUSBWord OSSwapHostToLittleInt16
+#define USBToHostLong OSSwapLittleToHostInt32
+#define HostToUSBLong OSSwapHostToLittleInt32
+
+    /*!
+    @enum Miscellaneous Constants
+    @discussion 
+    */
+    enum {
+    kUSBDeviceIDShift = 7,
+    kUSBMaxDevices = 128,
+    kUSBMaxDevice = kUSBMaxDevices-1,
+    kUSBDeviceIDMask = 0x7f,
+
+    kUSBPipeIDMask = 0xf,
+    kUSBMaxPipes = 32,	// In and Out pipes can have same pipe number.
+
+    kUSBInterfaceIDShift = 8,
+    kUSBMaxInterfaces = 1 << kUSBInterfaceIDShift,
+    kUSBInterfaceIDMask = kUSBMaxInterfaces-1,
+
+    kUSBEndPtShift = 7,
+    kUSBDeviceMask = ((1 << kUSBEndPtShift) -1),
+
+    kUSBNoPipeIdx = -1
+};
+
+/*!
+@enum bRequest Shifts and Masks 
+@discussion These are used to create the macro to encode the bRequest filed of a Device Request
+*/
+enum {
+    kUSBRqDirnShift = 7,
+    kUSBRqDirnMask = 1,
+
+    kUSBRqTypeShift = 5,
+    kUSBRqTypeMask = 3,
+
+    kUSBRqRecipientMask = 0X1F
+};
+
+/*!
+@defined USBmakebmRequestType 
+@discussion Macro to encode the bRequest field of a Device Request.  It is used when constructing an IOUSBDevRequest.
+*/
+#define USBmakebmRequestType(direction, type, recipient)		\
+    ((direction & kUSBRqDirnMask) << kUSBRqDirnShift) |			\
+    ((type & kUSBRqTypeMask) << kUSBRqTypeShift) |			\
+    (recipient & kUSBRqRecipientMask)
+
+/*!
+@enum kUSBMaxIsocFrameReqCount 
+@discussion Maximum size in bytes allowed for one Isochronous frame
+*/
+enum {
+    kUSBMaxFSIsocEndpointReqCount = 1023,	// max size (bytes) of any one Isoc frame for 1 FS endpoint
+	kUSBMaxHSIsocEndpointReqCount = 3072,	// max size (bytes) of any one Isoc frame for 1 HS endpoint
+	kUSBMaxHSIsocFrameCount = 7168			// max size (bytes) of all Isoc transfers in a HS frame
+};
+
+/*!
+@defined EncodeRequest 
+@discussion Macro that encodes the bRequest and bRequestType fields of a IOUSBDevRequest into a single value.  It is useful when one needs
+to know what type of request the IOUSBDevRequest encodes and simplifies comparisons.
+*/
+#define EncodeRequest(request, direction, type, recipient)		\
+    (((UInt16)request << 8) +	    					\
+              ((UInt16)recipient +					\
+                        ((UInt16)type << kUSBRqTypeShift) +		\
+                        ((UInt16)direction << kUSBRqDirnShift)))
+
+
+/*!
+@enum Standard Device Requests
+@discussion Encoding of the standard device requests.
+<tt>
+<pre><b>
+bmRequestType bRequest          wValue        wIndex     wLength Data</b>
+00000000B     CLEAR_FEATURE     Feature       Zero       Zero    None (device)
+00000001B                       Feature       Interface  Zero    None (Interface)
+00000010B                       Feature       Endpoint   Zero    None (Endpoint)
+
+10000000B     GET_CONFIGURATION Zero          Zero       One     Configuration
+10000000B     GET_DESCRIPTOR    Type          LangID     Length  Descriptor
+10000001B     GET_INTERFACE     Zero          Interface  One     Alternate
+
+10000000B     GET_STATUS        Zero          Zero       Two     status (device)
+10000001B                       Zero          Interface  Two     status (Interface)
+10000010B                       Zero          Endpoint   Two     status (Endpoint)
+
+00000000B     SET_ADDRESS       Address       Zero       Zero    None
+00000000B     SET_CONFIGURATION Configuration Zero       Zero    None
+00000000B     SET_DESCRIPTOR    Type          LangID     Length  Descriptor
+
+00000000B     SET_FEATURE       Feature       Zero       Zero    None (device)
+00000001B                       Feature       Interface  Zero    None (Interface)
+00000010B                       Feature       Endpoint   Zero    None (Endpoint)
+
+00000001B     SET_INTERFACE     Alternate     Interface  Zero    None
+10000010B     SYNCH_FRAME       Zero          Endpoint   Two     Frame Number
+</pre>
+</tt>
+*/
+enum {
+    kClearDeviceFeature     = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBDevice),
+    kClearInterfaceFeature  = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBInterface),
+    kClearEndpointFeature   = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBEndpoint),
+    kGetConfiguration       = EncodeRequest(kUSBRqGetConfig,     kUSBIn,  kUSBStandard, kUSBDevice),
+    kGetDescriptor          = EncodeRequest(kUSBRqGetDescriptor, kUSBIn,  kUSBStandard, kUSBDevice),
+    kGetInterface           = EncodeRequest(kUSBRqGetInterface,  kUSBIn,  kUSBStandard, kUSBInterface),
+    kGetDeviceStatus        = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBDevice),
+    kGetInterfaceStatus     = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBInterface),
+    kGetEndpointStatus      = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBEndpoint),
+    kSetAddress             = EncodeRequest(kUSBRqSetAddress,    kUSBOut, kUSBStandard, kUSBDevice),
+    kSetConfiguration       = EncodeRequest(kUSBRqSetConfig,     kUSBOut, kUSBStandard, kUSBDevice),
+    kSetDescriptor          = EncodeRequest(kUSBRqSetDescriptor, kUSBOut, kUSBStandard, kUSBDevice),
+    kSetDeviceFeature       = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBDevice),
+    kSetInterfaceFeature    = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBInterface),
+    kSetEndpointFeature     = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBEndpoint),
+    kSetInterface           = EncodeRequest(kUSBRqSetInterface,  kUSBOut, kUSBStandard, kUSBInterface),
+    kSyncFrame              = EncodeRequest(kUSBRqSyncFrame,     kUSBIn,  kUSBStandard, kUSBEndpoint),
+};
+
+/*!
+@defined kCallInterfaceOpenWithGate
+ @discussion If the USB Device has this property, drivers for any of its interfaces will have their handleOpen method called while holding the workloop gate.
+ */
+#define kCallInterfaceOpenWithGate	"kCallInterfaceOpenWithGate"
+
+// TYPES
+
+typedef UInt16 USBDeviceAddress;
+
+typedef uint32_t USBPhysicalAddress32;
+
+/*!
+    @typedef IOUSBIsocFrame
+    @discussion Structure used to encode information about each isoc frame.
+    @param frStatus Returns status associated with the frame.
+    @param frReqCount Input specifiying how many bytes to read or write.
+    @param frActCount Actual # of bytes transferred.
+*/
+typedef struct IOUSBIsocFrame {
+    IOReturn                        frStatus;
+    UInt16                          frReqCount;
+    UInt16                          frActCount;
+} IOUSBIsocFrame;
+
+
+/*!
+    @typedef IOUSBLowLatencyIsocFrame
+    @discussion    Structure used to encode information about each isoc frame that is processed
+    at hardware interrupt time (low latency).
+    @param frStatus Returns status associated with the frame.
+    @param frReqCount Input specifiying how many bytes to read or write.
+    @param frActCount Actual # of bytes transferred.
+    @param frTimeStamp Time stamp that indicates time when frame was procesed.
+*/
+struct IOUSBLowLatencyIsocFrame {
+    IOReturn                        frStatus;
+    UInt16                          frReqCount;
+    UInt16                          frActCount;
+    AbsoluteTime		    frTimeStamp;
+};
+typedef struct IOUSBLowLatencyIsocFrame IOUSBLowLatencyIsocFrame;
+
+/*!
+@typedef IOUSBCompletionAction
+ @discussion Function called when USB I/O completes.
+ @param target The target specified in the IOUSBCompletion struct.
+ @param parameter The parameter specified in the IOUSBCompletion struct.
+ @param status Completion status.
+ @param bufferSizeRemaining Bytes left to be transferred.
+ */
+typedef void (*IOUSBCompletionAction)(
+                                      void *			target,
+                                      void *			parameter,
+                                      IOReturn		status,
+                                      UInt32			bufferSizeRemaining);
+
+/*!
+@typedef IOUSBCompletionActionWithTimeStamp
+ @discussion Function called when USB I/O completes.
+ @param target The target specified in the IOUSBCompletion struct.
+ @param parameter The parameter specified in the IOUSBCompletion struct.
+ @param status Completion status.
+ @param bufferSizeRemaining Bytes left to be transferred.
+ @param timeStamp Time at which the transaction was processed.
+ */
+typedef void (*IOUSBCompletionActionWithTimeStamp)(
+                                      void *		target,
+                                      void *		parameter,
+                                      IOReturn		status,
+                                      UInt32		bufferSizeRemaining,
+                                      AbsoluteTime	timeStamp);
+
+/*!
+    @typedef IOUSBIsocCompletionAction
+    @discussion Function called when Isochronous USB I/O completes.
+    @param target The target specified in the IOUSBIsocCompletionn struct.
+    @param parameter The parameter specified in the IOUSBIsocCompletion struct.
+    @param status Completion status.
+    @param pFrames Pointer to the frame list containing the status for each frame transferred.
+*/
+typedef void (*IOUSBIsocCompletionAction)(
+                void *			target,
+                void *			parameter,
+                IOReturn		status,
+                IOUSBIsocFrame		*pFrames);
+
+/*!
+    @typedef IOUSBLowLatencyIsocCompletionAction
+    @discussion Function called when Low Latency Isochronous USB I/O completes.
+    @param target The target specified in the IOUSBLowLatencyIsocCompletion struct.
+    @param parameter The parameter specified in the IOUSBLowLatencyIsocCompletion struct.
+    @param status Completion status.
+    @param pFrames Pointer to the low latency frame list containing the status for each frame transferred.
+*/
+typedef void (*IOUSBLowLatencyIsocCompletionAction)(
+                void *				target,
+                void *				parameter,
+                IOReturn			status,
+                IOUSBLowLatencyIsocFrame	*pFrames);
+
+/*!
+@typedef IOUSBCompletion
+ @discussion Struct specifying action to perform when a USB I/O completes.
+ @param target The target to pass to the action function.
+ @param action The function to call.
+ @param parameter The parameter to pass to the action function.
+ */
+typedef struct IOUSBCompletion {
+    void * 			target;
+    IOUSBCompletionAction	action;
+    void *			parameter;
+} IOUSBCompletion;
+
+/*!
+@typedef IOUSBCompletionWithTimeStamp
+ @discussion Struct specifying action to perform when a USB I/O completes.
+ @param target The target to pass to the action function.
+ @param action The function to call.
+ @param parameter The parameter to pass to the action function.
+ */
+typedef struct IOUSBCompletionWithTimeStamp {
+    void * 				target;
+    IOUSBCompletionActionWithTimeStamp	action;
+    void *				parameter;
+} IOUSBCompletionWithTimeStamp;
+
+/*!
+    @typedef IOUSBIsocCompletion
+    @discussion Struct specifying action to perform when an Isochronous USB I/O completes.
+    @param target The target to pass to the action function.
+    @param action The function to call.
+    @param parameter The parameter to pass to the action function.
+*/
+typedef struct IOUSBIsocCompletion {
+    void * 			target;
+    IOUSBIsocCompletionAction	action;
+    void *			parameter;
+} IOUSBIsocCompletion;
+
+/*!
+    @typedef IOUSBLowLatencyIsocCompletion
+    @discussion Struct specifying action to perform when an Low Latency Isochronous USB I/O completes.
+    @param target The target to pass to the action function.
+    @param action The function to call.
+    @param parameter The parameter to pass to the action function.
+*/
+typedef struct IOUSBLowLatencyIsocCompletion {
+    void * 				target;
+    IOUSBLowLatencyIsocCompletionAction	action;
+    void *				parameter;
+} IOUSBLowLatencyIsocCompletion;
+
+
+/*!
+@defined IOUSBFamily error codes
+@discussion  Errors specific to the IOUSBFamily.  Note that the iokit_usb_err(x) translates to 0xe0004xxx, where xxx is the value in parenthesis as a hex number.
+*/
+#define	iokit_usb_err(return)       (sys_iokit|sub_iokit_usb|return)
+#define kIOUSBUnknownPipeErr        iokit_usb_err(0x61)			// 0xe0004061  Pipe ref not recognized
+#define kIOUSBTooManyPipesErr       iokit_usb_err(0x60)			// 0xe0004060  Too many pipes
+#define kIOUSBNoAsyncPortErr        iokit_usb_err(0x5f)			// 0xe000405f  no async port
+#define kIOUSBNotEnoughPipesErr     iokit_usb_err(0x5e)			// 0xe000405e  not enough pipes in interface
+#define kIOUSBNotEnoughPowerErr     iokit_usb_err(0x5d)			// 0xe000405d  not enough power for selected configuration
+#define kIOUSBEndpointNotFound      iokit_usb_err(0x57)			// 0xe0004057  Endpoint Not found
+#define kIOUSBConfigNotFound        iokit_usb_err(0x56)			// 0xe0004056  Configuration Not found
+#define kIOUSBTransactionTimeout    iokit_usb_err(0x51)			// 0xe0004051  Transaction timed out
+#define kIOUSBTransactionReturned   iokit_usb_err(0x50)			// 0xe0004050  The transaction has been returned to the caller
+#define kIOUSBPipeStalled           iokit_usb_err(0x4f)			// 0xe000404f  Pipe has stalled, error needs to be cleared
+#define kIOUSBInterfaceNotFound     iokit_usb_err(0x4e)			// 0xe000404e  Interface ref not recognized
+#define kIOUSBLowLatencyBufferNotPreviouslyAllocated        iokit_usb_err(0x4d)			// 0xe000404d  Attempted to use user land low latency isoc calls w/out calling PrepareBuffer (on the data buffer) first 
+#define kIOUSBLowLatencyFrameListNotPreviouslyAllocated     iokit_usb_err(0x4c)			// 0xe000404c  Attempted to use user land low latency isoc calls w/out calling PrepareBuffer (on the frame list) first
+#define kIOUSBHighSpeedSplitError     iokit_usb_err(0x4b)		// 0xe000404b Error to hub on high speed bus trying to do split transaction
+#define kIOUSBSyncRequestOnWLThread	iokit_usb_err(0x4a)			// 0xe000404a  A synchronous USB request was made on the workloop thread (from a callback?).  Only async requests are permitted in that case
+#define kIOUSBDeviceNotHighSpeed	iokit_usb_err(0x49)			// 0xe0004049  The device is not a high speed device, so the EHCI driver returns an error
+#define kIOUSBDevicePortWasNotSuspended iokit_usb_err(0x50)		// 0xe0004050  Port was not suspended
+	
+/*!
+@defined IOUSBFamily hardware error codes
+@discussion These errors are returned by the OHCI controller.  The # in parenthesis (xx) corresponds to the OHCI Completion Code.
+For the following Completion codes, we return a generic IOKit error instead of a USB specific error.  
+<tt>
+<pre>
+Completion Code         Error Returned              Description
+9                       kIOReturnUnderrun           (Data Underrun) EP returned less data than max packet size
+8                       kIOReturnOverrun            (Data Overrun) Packet too large or more data than buffer
+5                       kIOReturnNotResponding      Device Not responding
+4                       kIOUSBPipeStalled           Endpoint returned a STALL PID
+</pre>
+</tt>
+*/
+#define kIOUSBLinkErr           iokit_usb_err(0x10)		// 0xe0004010
+#define kIOUSBNotSent2Err       iokit_usb_err(0x0f)		// 0xe000400f Transaction not sent
+#define kIOUSBNotSent1Err       iokit_usb_err(0x0e)		// 0xe000400e Transaction not sent
+#define kIOUSBBufferUnderrunErr iokit_usb_err(0x0d)		// 0xe000400d Buffer Underrun (Host hardware failure on data out, PCI busy?)
+#define kIOUSBBufferOverrunErr  iokit_usb_err(0x0c)		// 0xe000400c Buffer Overrun (Host hardware failure on data out, PCI busy?)
+#define kIOUSBReserved2Err      iokit_usb_err(0x0b)		// 0xe000400b Reserved
+#define kIOUSBReserved1Err      iokit_usb_err(0x0a)		// 0xe000400a Reserved
+#define kIOUSBWrongPIDErr       iokit_usb_err(0x07)		// 0xe0004007 Pipe stall, Bad or wrong PID
+#define kIOUSBPIDCheckErr       iokit_usb_err(0x06)		// 0xe0004006 Pipe stall, PID CRC error
+#define kIOUSBDataToggleErr     iokit_usb_err(0x03)		// 0xe0004003 Pipe stall, Bad data toggle
+#define kIOUSBBitstufErr        iokit_usb_err(0x02)		// 0xe0004002 Pipe stall, bitstuffing
+#define kIOUSBCRCErr            iokit_usb_err(0x01)		// 0xe0004001 Pipe stall, bad CRC
+
+/*!
+@defined IOUSBFamily message codes
+@discussion  Messages specific to the IOUSBFamily.  Note that the iokit_usb_msg(x) translates to 0xe0004xxx, where xxx is the value in parenthesis as a hex number.
+*/
+#define iokit_usb_msg(message)						(UInt32)(sys_iokit|sub_iokit_usb|message)
+#define kIOUSBMessageHubResetPort					iokit_usb_msg(0x01)		// 0xe0004001  Message sent to a hub to reset a particular port
+#define kIOUSBMessageHubSuspendPort					iokit_usb_msg(0x02)		// 0xe0004002  Message sent to a hub to suspend a particular port
+#define kIOUSBMessageHubResumePort					iokit_usb_msg(0x03)		// 0xe0004003  Message sent to a hub to resume a particular port
+#define kIOUSBMessageHubIsDeviceConnected			iokit_usb_msg(0x04)		// 0xe0004004  Message sent to a hub to inquire whether a particular port has a device connected or not
+#define kIOUSBMessageHubIsPortEnabled				iokit_usb_msg(0x05)		// 0xe0004005  Message sent to a hub to inquire whether a particular port is enabled or not
+#define kIOUSBMessageHubReEnumeratePort				iokit_usb_msg(0x06)		// 0xe0004006  Message sent to a hub to reenumerate the device attached to a particular port
+#define kIOUSBMessagePortHasBeenReset				iokit_usb_msg(0x0a)		// 0xe000400a  Message sent to a device indicating that the port it is attached to has been reset
+#define kIOUSBMessagePortHasBeenResumed				iokit_usb_msg(0x0b)		// 0xe000400b  Message sent to a device indicating that the port it is attached to has been resumed
+#define kIOUSBMessageHubPortClearTT					iokit_usb_msg(0x0c)		// 0xe000400c  Message sent to a hub to clear the transaction translator
+#define kIOUSBMessagePortHasBeenSuspended			iokit_usb_msg(0x0d)		// 0xe000400d  Message sent to a device indicating that the port it is attached to has been suspended
+#define kIOUSBMessageFromThirdParty					iokit_usb_msg(0x0e)		// 0xe000400e  Message sent from a third party.  Uses IOUSBThirdPartyParam to encode the sender's ID
+#define kIOUSBMessagePortWasNotSuspended			iokit_usb_msg(0x0f)		// 0xe000400f  Message indicating that the hub driver received a resume request for a port that was not suspended
+#define kIOUSBMessageExpressCardCantWake			iokit_usb_msg(0x10)		// 0xe0004010  Message from a driver to a bus that an express card will disconnect on sleep and thus shouldn't wake
+#define kIOUSBMessageCompositeDriverReconfigured    iokit_usb_msg(0x11)		// 0xe0004011  Message from the composite driver indicating that it has finished re-configuring the device after a reset
+#define kIOUSBMessageHubSetPortRecoveryTime			iokit_usb_msg(0x12)		// 0xe0004012  Message sent to a hub to set the # of ms required when resuming a particular port
+#define kIOUSBMessageOvercurrentCondition			iokit_usb_msg(0x13)     // 0xe0004013  Message sent to the clients of the device's hub parent, when a device causes an overcurrent condition.  The message argument contains the locationID of the device
+#define kIOUSBMessageNotEnoughPower					iokit_usb_msg(0x14)     // 0xe0004014  Message sent to the clients of the device's hub parent, when a device causes an low power notice to be displayed.  The message argument contains the locationID of the device
+#define kIOUSBMessageController						iokit_usb_msg(0x15)		// 0xe0004015  Generic message sent from controller user client to controllers 
+#define	kIOUSBMessageRootHubWakeEvent				iokit_usb_msg(0x16)		// 0xe0004016  Message from the HC Wakeup code indicating that a Root Hub port has a wake event
+
+// Obsolete
+//
+struct IOUSBMouseData {
+    UInt16 				buttons;
+    SInt16 				XDelta;
+    SInt16 				YDelta;
+};
+typedef struct IOUSBMouseData		IOUSBMouseData;
+typedef IOUSBMouseData *		IOUSBMouseDataPtr;
+
+// Obsolete
+//
+struct IOUSBKeyboardData {
+    UInt16 				keycount;
+    UInt16 				usbkeycode[32];
+};
+typedef struct IOUSBKeyboardData	IOUSBKeyboardData;
+typedef IOUSBKeyboardData *		IOUSBKeyboardDataPtr;
+
+// Obsolete
+//
+union IOUSBHIDData {
+    IOUSBKeyboardData 			kbd;
+    IOUSBMouseData 			mouse;
+};
+typedef union IOUSBHIDData		IOUSBHIDData;
+typedef IOUSBHIDData *			IOUSBHIDDataPtr;
+
+/*!
+    @typedef IOUSBDeviceDescriptor
+    @discussion Descriptor for a USB Device.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+struct IOUSBDeviceDescriptor {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt16 			bcdUSB;
+	UInt8 			bDeviceClass;
+	UInt8 			bDeviceSubClass;
+	UInt8 			bDeviceProtocol;
+	UInt8 			bMaxPacketSize0;
+	UInt16 			idVendor;
+	UInt16 			idProduct;
+	UInt16 			bcdDevice;
+	UInt8 			iManufacturer;
+	UInt8 			iProduct;
+	UInt8 			iSerialNumber;
+	UInt8 			bNumConfigurations;
+};
+typedef struct IOUSBDeviceDescriptor		IOUSBDeviceDescriptor;
+typedef IOUSBDeviceDescriptor *			IOUSBDeviceDescriptorPtr;
+
+/*!
+    @typedef IOUSBDescriptorHeader
+    @discussion Standard header used for all USB descriptors.  Used to read the length of a descriptor so that we can allocate storage for the whole descriptor later on.
+*/
+struct IOUSBDescriptorHeader {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+};
+typedef struct IOUSBDescriptorHeader		IOUSBDescriptorHeader;
+typedef IOUSBDescriptorHeader *			IOUSBDescriptorHeaderPtr;
+
+/*!
+    @typedef IOUSBConfigurationDescriptor
+    @discussion Standard USB Configuration Descriptor.  It is variable length, so this only specifies the known fields.  We use the wTotalLength field to read the whole descriptor.
+    See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+struct IOUSBConfigurationDescriptor {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt16 			wTotalLength;
+	UInt8 			bNumInterfaces;
+	UInt8 			bConfigurationValue;
+	UInt8 			iConfiguration;
+	UInt8 			bmAttributes;
+	UInt8 			MaxPower;
+};
+typedef struct IOUSBConfigurationDescriptor 	IOUSBConfigurationDescriptor;
+typedef IOUSBConfigurationDescriptor *		IOUSBConfigurationDescriptorPtr;
+
+/*!
+    @typedef IOUSBConfigurationDescHeader
+    @discussion Header of a IOUSBConfigurationDescriptor.  Used to get the total length of the descriptor.
+*/
+struct IOUSBConfigurationDescHeader {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt16 			wTotalLength;
+};
+typedef struct IOUSBConfigurationDescHeader 	IOUSBConfigurationDescHeader;
+typedef IOUSBConfigurationDescHeader *		IOUSBConfigurationDescHeaderPtr;
+
+/*!
+    @typedef IOUSBInterfaceDescriptor
+    @discussion Descriptor for a USB Interface.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+struct IOUSBInterfaceDescriptor {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt8 			bInterfaceNumber;
+	UInt8 			bAlternateSetting;
+	UInt8 			bNumEndpoints;
+	UInt8 			bInterfaceClass;
+	UInt8 			bInterfaceSubClass;
+	UInt8 			bInterfaceProtocol;
+	UInt8 			iInterface;
+};
+typedef struct IOUSBInterfaceDescriptor	IOUSBInterfaceDescriptor;
+typedef IOUSBInterfaceDescriptor *	IOUSBInterfaceDescriptorPtr;
+
+/*!
+    @typedef IOUSBEndpointDescriptor
+    @discussion Descriptor for a USB Endpoint.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+struct IOUSBEndpointDescriptor {
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt8 			bEndpointAddress;
+	UInt8 			bmAttributes;
+	UInt16 			wMaxPacketSize;	
+	UInt8 			bInterval;
+};
+typedef struct IOUSBEndpointDescriptor	IOUSBEndpointDescriptor;
+typedef IOUSBEndpointDescriptor *	IOUSBEndpointDescriptorPtr;
+
+enum{addPacketShift = 11};  // Bits for additional packets in maxPacketField. (Table 9-13)
+#define mungeMaxPacketSize(w) ((w>1024)?(((w>>(addPacketShift))+1)*(w&((1<<addPacketShift)-1))):w)
+
+/*!
+    @typedef IOUSBHIDDescriptor
+    @discussion USB HID Descriptor.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.  (This structure
+    should have used the #pragma pack(1) compiler directive to get byte alignment.
+*/
+struct IOUSBHIDDescriptor {
+	UInt8 			descLen;
+	UInt8 			descType;
+	UInt16 			descVersNum;
+	UInt8 			hidCountryCode;
+	UInt8 			hidNumDescriptors;
+	UInt8 			hidDescriptorType;
+	UInt8 			hidDescriptorLengthLo;
+	UInt8 			hidDescriptorLengthHi;
+};
+typedef struct IOUSBHIDDescriptor	IOUSBHIDDescriptor;
+typedef IOUSBHIDDescriptor *IOUSBHIDDescriptorPtr;
+
+/*!
+    @typedef IOUSBHIDReportDesc
+    @discussion USB HID Report Descriptor header.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.  (This structure
+    should have used the #pragma pack(1) compiler directive to get byte alignment.
+*/
+struct IOUSBHIDReportDesc {
+	UInt8 			hidDescriptorType;
+	UInt8 			hidDescriptorLengthLo;	
+	UInt8 			hidDescriptorLengthHi;
+};
+typedef struct IOUSBHIDReportDesc	IOUSBHIDReportDesc;
+typedef IOUSBHIDReportDesc *		IOUSBHIDReportDescPtr;
+
+/*!
+    @typedef IOUSBDeviceQualifierDescriptor
+    @discussion USB Device Qualifier Descriptor.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+#pragma pack(1)
+struct IOUSBDeviceQualifierDescriptor
+{
+	UInt8 			bLength;
+	UInt8 			bDescriptorType;
+	UInt16 			bcdUSB;
+	UInt8 			bDeviceClass;
+	UInt8 			bDeviceSubClass;
+	UInt8 			bDeviceProtocol;
+	UInt8 			bMaxPacketSize0;
+	UInt8 			bNumConfigurations;
+	UInt8 			bReserved;
+};
+typedef struct IOUSBDeviceQualifierDescriptor	IOUSBDeviceQualifierDescriptor;
+typedef IOUSBDeviceQualifierDescriptor *	IOUSBDeviceQualifierDescriptorPtr;
+#pragma options align=reset
+
+/*!
+    @typedef IOUSBDFUDescriptor
+    @discussion USB Device Firmware Update Descriptor.  See the USB Device Firmware Update Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+#pragma pack(1)
+struct IOUSBDFUDescriptor 
+{
+        UInt8 			bLength;
+        UInt8 			bDescriptorType;
+        UInt8 			bmAttributes;
+        UInt16 			wDetachTimeout;
+        UInt16 			wTransferSize;
+};
+typedef struct 	IOUSBDFUDescriptor 		IOUSBDFUDescriptor;
+typedef 		IOUSBDFUDescriptor *	IOUSBDFUDescriptorPtr;
+
+#pragma options align=reset
+
+/*!
+@typedef IOUSBInterfaceAssociationDescriptor
+ @discussion USB Inerface Association Descriptor.  ECN to the USB 2.0 Spec.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+ */
+#pragma pack(1)
+struct IOUSBInterfaceAssociationDescriptor
+{
+    UInt8 			bLength;
+    UInt8 			bDescriptorType;
+    UInt8 			bFirstInterface;
+    UInt8 			bInterfaceCount;
+    UInt8 			bFunctionClass;
+    UInt8 			bFunctionSubClass;
+    UInt8 			bFunctionProtocol;
+    UInt8			iFunction;
+};
+typedef struct IOUSBInterfaceAssociationDescriptor	IOUSBInterfaceAssociationDescriptor;
+typedef IOUSBInterfaceAssociationDescriptor *	IOUSBInterfaceAssociationDescriptorPtr;
+#pragma options align=reset
+
+/*!
+    @typedef USBStatus
+    @discussion Type used to get a DeviceStatus as a single quantity.
+*/
+typedef UInt16				USBStatus;
+typedef USBStatus *			USBStatusPtr;
+
+// These constants are obsolete
+//
+enum {
+    kIOUSBAnyClass	= 0xFFFF,
+    kIOUSBAnySubClass	= 0xFFFF,
+    kIOUSBAnyProtocol	= 0xFFFF,
+    kIOUSBAnyVendor	= 0xFFFF,
+    kIOUSBAnyProduct	= 0xFFFF
+};
+
+// This structure are obsolete
+//
+typedef struct IOUSBMatch {
+    UInt16	usbClass;
+    UInt16	usbSubClass;
+    UInt16	usbProtocol;
+    UInt16	usbVendor;
+    UInt16	usbProduct;
+} IOUSBMatch;
+
+/*!
+    @typedef IOUSBFindEndpointRequest
+    @discussion Struct used to find endpoints of an interface
+    type and direction are used to match endpoints,
+    type, direction, maxPacketSize and interval are updated
+    with the properties of the found endpoint.
+    @field type Type of endpoint: kUSBControl, kUSBIsoc, kUSBBulk, kUSBInterrupt, kUSBAnyType.  If kUSBAnyType is specified, this field is treated as a don't care.
+    @field direction Direction of endpoint: kUSBOut, kUSBIn, kUSBAnyDirn.   If kUSBAnyDirn is specified, this field is treated as a don't care.
+    @field maxPacketSize maximum packet size of endpoint.
+    @field interval Polling interval in mSec for endpoint.
+*/
+typedef struct {
+	UInt8 type;	
+	UInt8 direction;
+    UInt16 maxPacketSize;
+    UInt8 interval;
+} IOUSBFindEndpointRequest;
+
+/*!
+    @struct IOUSBDevRequest
+    @discussion Parameter block for control requests, using a simple pointer
+    for the data to be transferred.
+    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
+    @field bRequest Request code
+    @field wValue 16 bit parameter for request, host endianess
+    @field wIndex 16 bit parameter for request, host endianess
+    @field wLength Length of data part of request, 16 bits, host endianess
+    @field pData Pointer to data for request - data returned in bus endianess
+    @field wLenDone Set by standard completion routine to number of data bytes
+	actually transferred
+*/
+typedef struct {
+    UInt8       bmRequestType;
+    UInt8       bRequest;
+    UInt16      wValue;
+    UInt16      wIndex;
+    UInt16      wLength;
+    void *      pData;
+    UInt32      wLenDone;
+} IOUSBDevRequest;
+typedef IOUSBDevRequest * IOUSBDeviceRequestPtr;
+
+/*!
+    @struct IOUSBDevRequestTO
+    @discussion Parameter block for control requests with timeouts, using a simple pointer
+    for the data to be transferred.  Same as a IOUSBDevRequest except for the two extra timeout fields.
+    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
+    @field bRequest Request code
+    @field wValue 16 bit parameter for request, host endianess
+    @field wIndex 16 bit parameter for request, host endianess
+    @field wLength Length of data part of request, 16 bits, host endianess
+    @field pData Pointer to data for request - data returned in bus endianess
+    @field wLenDone Set by standard completion routine to number of data bytes
+	actually transferred
+    @field noDataTimeout Specifies a time value in milliseconds. Once the request is queued on the bus, if no data is transferred in this amount of time, the request will be aborted and returned.
+    @field completionTimeout Specifies a time value in milliseconds. Once the request is queued on the bus, if the entire request is not completed in this amount of time, the request will be aborted and returned 
+*/
+typedef struct {
+    UInt8       bmRequestType;
+    UInt8       bRequest;
+    UInt16      wValue;
+    UInt16      wIndex;
+    UInt16      wLength;
+    void *      pData;
+    UInt32      wLenDone;
+    UInt32      noDataTimeout;
+    UInt32      completionTimeout;
+} IOUSBDevRequestTO;
+
+/*!
+    @enum Default timeout values
+    @discussion default values used for data and completion timeouts.
+*/
+enum
+{
+    kUSBDefaultControlNoDataTimeoutMS = 5000,
+    kUSBDefaultControlCompletionTimeoutMS = 0
+};
+
+// Internal structure to pass parameters between IOUSBLib and UserClient
+//
+typedef struct
+{
+    UInt32      pipeRef;
+    void *      buf;
+    UInt32      size;
+    UInt32      noDataTimeout;
+    UInt32      completionTimeout;
+} IOUSBBulkPipeReq;
+
+
+#if KERNEL
+/*!
+    @struct IOUSBDevRequestDesc
+    @discussion Parameter block for control requests, using a memory descriptor
+    for the data to be transferred.  Only available in the kernel.
+    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
+    @field bRequest Request code
+    @field wValue 16 bit parameter for request, host endianess
+    @field wIndex 16 bit parameter for request, host endianess
+    @field wLength Length of data part of request, 16 bits, host endianess
+    @field pData Pointer to memory descriptor for data for request - data returned in bus endianess
+    @field wLenDone Set by standard completion routine to number of data bytes
+     actually transferred
+*/
+typedef struct {
+    UInt8                   bmRequestType;
+    UInt8                   bRequest;
+    UInt16                  wValue;
+    UInt16                  wIndex;
+    UInt16                  wLength;
+    IOMemoryDescriptor *    pData;
+    UInt32                  wLenDone;
+} IOUSBDevRequestDesc;
+
+
+/*!
+    @enum IOOptionBits
+    @discussion Parameter passed to an IOService::open() call.
+    @constant kIOUSBInterfaceOpenAlt Open the alternate interface specified when creating the interface.
+*/
+enum {
+    kIOUSBInterfaceOpenAlt	= 0x00010000
+};
+
+#endif
+
+// Internal structure to pass parameters between IOUSBLib and UserClient
+//
+// use a structure because there's a limit of 6 total arguments
+// to a user client method.
+typedef struct {
+    UInt8   	bmRequestType;
+    UInt8 	bRequest;
+    UInt16 	wValue;
+    UInt16 	wIndex;
+    UInt16	wLength;
+    void * 	pData;		// data pointer
+    UInt32	wLenDone;	// # bytes transferred
+    UInt8	pipeRef;
+} IOUSBDevReqOOL;
+
+// Internal structure to pass parameters between IOUSBLib and UserClient
+//
+typedef struct {
+    UInt8   	bmRequestType;
+    UInt8 	bRequest;
+    UInt16 	wValue;
+    UInt16 	wIndex;
+    UInt16	wLength;
+    void * 	pData;		// data pointer
+    UInt32	wLenDone;	// # bytes transferred
+    UInt8	pipeRef;
+    UInt32	noDataTimeout;
+    UInt32	completionTimeout;
+} IOUSBDevReqOOLTO;
+
+// Internal structure to pass parameters between IOUSBLib and UserClient
+//
+// Structure to request isochronous transfer
+//
+typedef struct {
+    UInt32 		fPipe;
+    void 		*fBuffer;
+    UInt32 		fBufSize;
+    UInt64 		fStartFrame;
+    UInt32 		fNumFrames;
+    IOUSBIsocFrame 	*fFrameCounts;
+} IOUSBIsocStruct;
+
+// Internal structure to pass parameters between IOUSBLib and UserClient
+//
+// Structure to request low latency isochronous transfer
+//
+struct IOUSBLowLatencyIsocStruct {
+    UInt32 			fPipe;
+    UInt32 			fBufSize;
+    UInt64 			fStartFrame;
+    UInt32 			fNumFrames;
+    UInt32			fUpdateFrequency;
+    UInt32			fDataBufferCookie;
+    UInt32			fDataBufferOffset;
+    UInt32			fFrameListBufferCookie;
+    UInt32			fFrameListBufferOffset;
+};
+
+typedef struct IOUSBLowLatencyIsocStruct IOUSBLowLatencyIsocStruct;
+
+
+/*!
+    @struct IOUSBGetFrameStruct
+    @discussion Structure used from user space to return the frame number and a timestamp on when the frame register was read.
+    @field frame frame number
+    @field timeStamp  AbsoluteTime when the frame was updated
+*/
+typedef struct {
+    UInt64			frame;
+    AbsoluteTime	timeStamp;
+} IOUSBGetFrameStruct;
+
+
+/*!
+    @struct IOUSBFindInterfaceRequest
+    @discussion Structure used with FindNextInterface.
+*/
+typedef struct {
+    UInt16	bInterfaceClass;		// requested class
+    UInt16 	bInterfaceSubClass;		// requested subclass
+    UInt16 	bInterfaceProtocol;		// requested protocol
+    UInt16	bAlternateSetting;		// requested alt setting
+} IOUSBFindInterfaceRequest;
+
+/*!
+    @enum kIOUSBFindInterfaceDontCare
+    @discussion Constant that can be used for the fields of IOUSBFindInterfaceRequest to specify that they should not be matched. 
+*/
+enum {
+        kIOUSBFindInterfaceDontCare		= 0xFFFF
+        };
+
+/*!
+    @enum kIOUSBVendorIDAppleComputer
+    @discussion USB Vendor ID for Apple Computer, Inc. 
+*/
+enum {
+	kIOUSBVendorIDAppleComputer		= 0x05AC
+        };
+
+/*!
+    @enum USBDeviceSpeed
+    @discussion Returns the speed of a particular USB device. 
+    @constant	kUSBDeviceSpeedLow	The device a low speed device.
+    @constant	kUSBDeviceSpeedFull	The device a full speed device.
+    @constant	kUSBDeviceSpeedHigh	The device a high speed device.
+*/
+enum {
+        kUSBDeviceSpeedLow		= 0,
+        kUSBDeviceSpeedFull		= 1,
+        kUSBDeviceSpeedHigh		= 2
+        };
+
+/*!
+    @enum MicrosecondsInFrame
+    @discussion Returns the number of microseconds in a USB frame. 
+    @constant	kUSBFullSpeedMicrosecondsInFrame	The device is attached to a bus running at full speed (1 ms / frame).
+    @constant	kUSBHighSpeedMicrosecondsInFrame	The device is attached to a bus running at high speed (125 microseconds / frame).
+*/
+enum {
+    kUSBFullSpeedMicrosecondsInFrame		= 1000,	
+    kUSBHighSpeedMicrosecondsInFrame		= 125
+};
+
+//  During low latency transfers, the stack will set the frStatus for each frame to this value.  A client can check that to see if the transfer has completed.  We set the frStatus to a 
+//  valid return code when the transfer completes.
+//
+enum {
+        kUSBLowLatencyIsochTransferKey	= 'llit'	// Set frStatus field of first frame in isoch transfer to designate as low latency
+    };
+    
+// This structure is DEPRECATED.  See the LowLatencyUserBufferInfoV2  
+//
+typedef struct LowLatencyUserBufferInfo LowLatencyUserBufferInfo;
+
+struct LowLatencyUserBufferInfo {
+    UInt32				cookie;
+    void *				bufferAddress;
+    IOByteCount			bufferSize;
+    UInt32				bufferType;
+    Boolean				isPrepared;
+    LowLatencyUserBufferInfo *	nextBuffer;
+};
+
+// This structure is DEPRECATED.  See the LowLatencyUserBufferInfoV3  
+
+typedef struct LowLatencyUserBufferInfoV2 LowLatencyUserBufferInfoV2;
+
+struct LowLatencyUserBufferInfoV2 
+{
+	UInt32							cookie;
+	void *							bufferAddress;
+	IOByteCount						bufferSize;
+	UInt32							bufferType;
+	Boolean							isPrepared;
+	void *							mappedUHCIAddress;
+	LowLatencyUserBufferInfoV2 *	nextBuffer;
+};
+
+	
+// This structure is used to pass information for the low latency calls between user space and the kernel.  
+//
+typedef struct LowLatencyUserBufferInfoV3 LowLatencyUserBufferInfoV3;
+
+struct LowLatencyUserBufferInfoV3 
+{
+	uint64_t						cookie;
+	mach_vm_address_t				bufferAddress;
+	mach_vm_size_t					bufferSize;
+	uint64_t						bufferType;
+	uint64_t						isPrepared;
+	mach_vm_address_t				mappedUHCIAddress;
+	LowLatencyUserBufferInfoV3 *	nextBuffer;
+};
+	
+	
+	/*!
+    @enum USBLowLatencyBufferType
+    @discussion Used to specify what kind of buffer to create when calling LowLatencyCreateBuffer(). 
+    @constant	kUSBLowLatencyWriteBuffer	The buffer will be used to write data out to a device.
+    @constant	kUSBLowLatencyReadBuffer	The buffer will be used to read data from a device.
+    @constant	kUSBLowLatencyFrameListBuffer	The buffer will be used for a low latency isoch frame list.
+*/
+typedef enum {
+    kUSBLowLatencyWriteBuffer 		= 0,
+    kUSBLowLatencyReadBuffer		= 1,
+    kUSBLowLatencyFrameListBuffer	= 2
+} USBLowLatencyBufferType;
+
+// USB User Notification Types
+//
+enum {
+    kUSBNoUserNotificationType			= 0,
+    kUSBNotEnoughPowerNotificationType		= 1,
+    kUSBIndividualOverCurrentNotificationType	= 2,
+    kUSBGangOverCurrentNotificationType		= 3
+};
+
+/*!
+    @defined Property Definitions
+    @discussion Useful property names in USB land. 
+*/
+#define kUSBDevicePropertySpeed                 "Device Speed"
+#define kUSBDevicePropertyBusPowerAvailable     "Bus Power Available"
+#define kUSBDevicePropertyAddress               "USB Address"
+#define kUSBDevicePropertyLocationID            "locationID"
+#define kUSBProductIDMask						"idProductMask"
+#define kUSBPreferredConfiguration				"Preferred Configuration"
+#define kUSBSuspendPort							"kSuspendPort"
+#define kUSBExpressCardCantWake					"ExpressCardCantWake"
+#define kUSBControllerNeedsContiguousMemoryForIsoch	"Need contiguous memory for isoch"
+#define kUSBHubDontAllowLowPower				"kUSBHubDontAllowLowPower"
+#define kUSBDeviceResumeRecoveryTime			"kUSBDeviceResumeRecoveryTime"
+#define kUSBOutOfSpecMPSOK						"Out of spec MPS OK"
+#define kConfigurationDescriptorOverride		"ConfigurationDescriptorOverride"
+#define kOverrideIfAtLocationID					"OverrideIfAtLocationID"
+
+/*!
+@enum USBReEnumerateOptions
+ @discussion Options used when calling ReEnumerateDevice. 
+ @constant	kUSBAddExtraResetTimeBit	Setting this bit will cause the Hub driver to wait 100ms before addressing the device after the reset following the re-enumeration.
+ */
+typedef enum {
+    kUSBAddExtraResetTimeBit 		= 31,
+    kUSBAddExtraResetTimeMask		= ( 1 << kUSBAddExtraResetTimeBit)
+} USBReEnumerateOptions;
+
+/*!
+ @enum USBDeviceInformationBits
+ @discussion 	GetUSBDeviceInformation will return a unit32_t value with bits set indicating that a particular state is present in the USB device.  These bits are described here 
+ 
+ @constant	kUSBInformationDeviceIsCaptiveBit			The USB device is directly attached to its hub and cannot be removed.
+ @constant	kUSBInformationDeviceIsAttachedToRootHubBit	The USB device is directly attached to the root hub
+ @constant	kUSBInformationDeviceIsInternalBit			The USB device is internal to the computer (all the hubs it attaches to are captive)
+ @constant	kUSBInformationDeviceIsConnectedBit			The USB device is connected to its hub
+ @constant	kUSBInformationDeviceIsEnabledBit			The hub port to which the USB device is attached is enabled
+ @constant	kUSBInformationDeviceIsSuspendedBit			The hub port to which the USB device is attached is suspended
+ @constant	kUSBInformationDeviceIsInResetBit			The hub port to which the USB device is attached is being reset
+ @constant	kUSBInformationDeviceOvercurrentBit			The USB device generated an overcurrent
+ @constant	kUSBInformationDevicePortIsInTestModeBit	The hub port to which the USB device is attached is in test mode
+ @constant  kUSBInformationDeviceIsRootHub				The device is actually the root hub simulation
+ @constant  kUSBInformationRootHubisBuiltIn				If this is a root hub simulation and it's built into the machine, this bit is set.  If it's on an expansion card, it will be cleared
+ 
+ */
+	typedef enum {
+		kUSBInformationDeviceIsCaptiveBit				= 0,
+		kUSBInformationDeviceIsAttachedToRootHubBit		= 1,
+		kUSBInformationDeviceIsInternalBit				= 2,
+		kUSBInformationDeviceIsConnectedBit				= 3,
+		kUSBInformationDeviceIsEnabledBit				= 4,
+		kUSBInformationDeviceIsSuspendedBit				= 5,
+		kUSBInformationDeviceIsInResetBit				= 6,
+		kUSBInformationDeviceOvercurrentBit				= 7,
+		kUSBInformationDevicePortIsInTestModeBit		= 8,
+		kUSBInformationDeviceIsRootHub					= 9,
+		kUSBInformationRootHubisBuiltIn					= 10,
+		kUSBInformationDeviceIsRemote					= 11,
+		kUSBInformationDeviceIsCaptiveMask				= (1 << kUSBInformationDeviceIsCaptiveBit),
+		kUSBInformationDeviceIsAttachedToRootHubMask	= (1 << kUSBInformationDeviceIsAttachedToRootHubBit),
+		kUSBInformationDeviceIsInternalMask				= (1 << kUSBInformationDeviceIsInternalBit),
+		kUSBInformationDeviceIsConnectedMask			= (1 << kUSBInformationDeviceIsConnectedBit),
+		kUSBInformationDeviceIsEnabledMask				= (1 << kUSBInformationDeviceIsEnabledBit),
+		kUSBInformationDeviceIsSuspendedMask			= (1 << kUSBInformationDeviceIsSuspendedBit),
+		kUSBInformationDeviceIsInResetMask				= (1 << kUSBInformationDeviceIsInResetBit),
+		kUSBInformationDeviceOvercurrentMask			= (1 << kUSBInformationDeviceOvercurrentBit),
+		kUSBInformationDevicePortIsInTestModeMask		= (1 << kUSBInformationDevicePortIsInTestModeBit),
+		kUSBInformationDeviceIsRootHubMask				= (1 << kUSBInformationDeviceIsRootHub),
+		kUSBInformationRootHubisBuiltInMask				= (1 << kUSBInformationRootHubisBuiltIn),
+		kUSBInformationDeviceIsRemoteMask				= (1 << kUSBInformationDeviceIsRemote)
+	} USBDeviceInformationBits;
+	
+	/*!
+	 @enum USBPowerRequestTypes
+	 @discussion Used to specify what kind of power will be reserved using the IOUSBDevice RequestExtraPower and ReturnExtraPower APIs. 
+	 @constant	kUSBPowerDuringSleep	The power is to be used during sleep.
+	 @constant	kUSBPowerDuringWake		The power is to be used while the system is awake (i.e not sleeping)
+	 */
+	typedef enum {
+		kUSBPowerDuringSleep 		= 0,
+		kUSBPowerDuringWake			= 1
+	} USBPowerRequestTypes;
+	
+	// Apple specific properties
+#define kAppleCurrentAvailable		"AAPL,current-available"
+#define kAppleCurrentInSleep		"AAPL,current-in-sleep"
+#define kAppleCurrentExtra			"AAPL,current-extra"
+#define kAppleInternalUSBDevice		"AAPL,device-internal"
+#define kUSBBusID					"AAPL,bus-id"
+	
+
+#ifdef __cplusplus
+}       
+#endif
+
+#endif /* _USB_H */
diff --git a/i386/include/IOKit/usb/USBHub.h b/i386/include/IOKit/usb/USBHub.h
new file mode 100644
index 0000000..4bbda15
--- /dev/null
+++ b/i386/include/IOKit/usb/USBHub.h
@@ -0,0 +1,240 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _USBHUB_H
+#define _USBHUB_H
+
+#include <IOKit/usb/USB.h>
+#include <IOKit/usb/USBSpec.h>
+
+    /*!
+    @header     USBHub.h
+     @abstract  Constants and definitions used with Hub devices.
+     @discussion    
+     */
+
+    /*!
+    @enum Hub Descriptor Type
+    @discussion
+    */
+enum {
+    kUSBHubDescriptorType       = 0x29
+};
+
+    /*!
+    @enum HubFeatures
+    @discussion Used with SET_FEATURE to set hub and port features
+    */
+enum {
+                            
+    kUSBHubLocalPowerChangeFeature      = 0,    /* Hub features */
+    kUSBHubOverCurrentChangeFeature     = 1,
+
+    kUSBHubPortConnectionFeature        = 0,    /* port features */
+    kUSBHubPortEnableFeature            = 1,
+    kUSBHubPortSuspendFeature           = 2,
+    kUSBHubPortOverCurrentFeature       = 3,
+    kUSBHubPortResetFeature             = 4,
+    kUSBHubPortPowerFeature             = 8,
+    kUSBHubPortLowSpeedFeature          = 9,
+    kUSBHubPortConnectionChangeFeature  = 16,
+    kUSBHubPortEnableChangeFeature      = 17,
+    kUSBHubPortSuspendChangeFeature     = 18,
+    kUSBHubPortOverCurrentChangeFeature = 19,
+    kUSBHubPortResetChangeFeature       = 20,
+    kUSBHubPortTestFeature				= 21,
+	kUSBHubPortIndicatorFeature			= 22
+};
+
+    /*!
+    @enum HubPortStatus
+    @discussion Used to decode the Port Status and Change 
+    */
+enum {
+    kHubPortConnection		= 0x0001,
+    kHubPortEnabled			= 0x0002,
+    kHubPortSuspend			= 0x0004,
+    kHubPortOverCurrent		= 0x0008,
+    kHubPortBeingReset		= 0x0010,
+    kHubPortPower			= 0x0100,
+    kHubPortLowSpeed		= 0x0200,
+    kHubPortHighSpeed		= 0x0400,
+    kHubPortTestMode		= 0x0800,
+    kHubPortIndicator		= 0x1000,
+
+    // these are the bits which cause the hub port state machine to keep moving
+    kHubPortStateChangeMask		= kHubPortConnection | kHubPortEnabled | kHubPortSuspend | kHubPortOverCurrent | kHubPortBeingReset
+};
+
+
+    /*!
+    @enum HubStatus
+    @discussion Used to decode the Hub Status and Change 
+    */
+enum {
+    kHubLocalPowerStatus        = 1,
+    kHubOverCurrentIndicator    = 2,
+    kHubLocalPowerStatusChange  = 1,
+    kHubOverCurrentIndicatorChange  = 2
+};
+
+    /*!
+    @enum HubCharacteristics
+    @discussion 
+    */
+enum {
+    kPerPortSwitchingBit    = (1 << 0),
+    kNoPowerSwitchingBit    = (1 << 1),
+    kCompoundDeviceBit      = (1 << 2),
+    kPerPortOverCurrentBit  = (1 << 3),
+    kNoOverCurrentBit       = (1 << 4),
+	
+	kHubPortIndicatorBit	= 7,
+	kHubPortIndicatorMask	= 0x0080
+};
+
+/*!
+@enum PowerSwitching
+ @discussion 
+ */
+enum {
+	kHubSupportsGangPower	= 0,
+	kHubSupportsIndividualPortPower = 1,
+	kHubPortSetPowerOff		= 0,
+	kHubPortSetPowerOn		= 1
+};
+
+/*!
+@enum PortIndicatorSelectors
+ @discussion 
+ */
+enum {
+	kHubPortIndicatorAutomatic	= 0,
+	kHubPortIndicatorAmber,
+	kHubPortIndicatorGreen,
+	kHubPortIndicatorOff
+};
+
+/*!
+ @enum Root Hub specific 
+ @discussion 
+ */
+enum {
+	kPrdRootHubApple			= 0x8005,	// ProductID for classic speed root hubs
+	kPrdRootHubAppleE			= 0x8006,	// ProductID for high speed root hubs
+	kUSBRootHubPollingRate		= 32		// Enpoint polling rate interval for root hubs
+};
+
+/*!
+@enum Hub Device Requests
+@discussion  Encoding of the hub specific standard requests
+<tt>
+<pre><b>
+Request          bmRequestType bRequest       wValue  wIndex wLength Data</b>
+ClearHubFeature  0010 0000B    CLEAR_FEATURE  Feature Zero    Zero   None
+ClearPortFeature 0010 0011B                   Feature Port    Zero   None
+
+GetBusState      1010 0011B    GET_STATE      Zero    Port    One    Port Bus State
+
+GetHubDescriptor 1010 0000B    GET_DESCRIPTOR Type    Zero    Length Descriptor
+
+GetHubStatus     1010 0000B    GET_STATUS     Zero    Zero    Four   Hub Status
+GetPortStatus    1010 0011B                   Zero    Port    Four   Port Status
+
+SetHubDescriptor 0010 0000B    SET_DESCRIPTOR Type    Zero    Length Descriptor
+
+SetHubFeature    0010 0000B    SET_FEATURE    Feature Zero    Zero   None
+SetPortFeature   0010 0011B                   Feature Port    Zero   None
+</pre>
+</tt>
+    */
+enum {
+    kClearHubFeature  = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBClass, kUSBDevice),
+    kClearPortFeature = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBClass, kUSBOther),
+    kGetPortState     = EncodeRequest(kUSBRqGetState,      kUSBIn,  kUSBClass, kUSBOther),
+    kGetHubDescriptor = EncodeRequest(kUSBRqGetDescriptor, kUSBIn,  kUSBClass, kUSBDevice),
+    kGetHubStatus     = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBClass, kUSBDevice),
+    kGetPortStatus    = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBClass, kUSBOther),
+    kSetHubDescriptor = EncodeRequest(kUSBRqGetDescriptor, kUSBOut, kUSBClass, kUSBDevice),
+    kSetHubFeature    = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBClass, kUSBDevice),
+    kSetPortFeature   = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBClass, kUSBOther)
+};
+
+
+/*!
+    @typedef IOUSBHubDescriptor
+    @discussion USB Hub Descriptor.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
+*/
+struct IOUSBHubDescriptor {
+    UInt8   length;
+    UInt8   hubType;
+    UInt8   numPorts;
+    UInt16  characteristics __attribute__((packed));
+    UInt8   powerOnToGood;  /* Port settling time, in 2ms */
+    UInt8   hubCurrent;
+    /* These are received packed, will have to be unpacked */
+    UInt8   removablePortFlags[8];
+    UInt8   pwrCtlPortFlags[8];
+};
+
+typedef struct IOUSBHubDescriptor IOUSBHubDescriptor;
+
+/*!
+    @typedef IOUSBHubStatus
+    @discussion Used to get the port status and change flags using GetPortStatus()
+*/
+struct IOUSBHubStatus {
+    UInt16          statusFlags;
+    UInt16          changeFlags;
+};
+typedef struct IOUSBHubStatus   IOUSBHubStatus;
+typedef IOUSBHubStatus *    IOUSBHubStatusPtr;
+
+typedef struct IOUSBHubStatus   IOUSBHubPortStatus;
+
+
+/*!
+    @typedef IOUSBHubPortReEnumerateParam
+    @discussion Used to specify the port that needs to be reenumerated
+*/
+typedef struct IOUSBHubPortReEnumerateParam IOUSBHubPortReEnumerateParam;
+
+struct IOUSBHubPortReEnumerateParam {
+    UInt32   portNumber;
+    UInt32   options;
+};
+
+typedef struct IOUSBHubPortClearTTParam IOUSBHubPortClearTTParam;
+
+struct IOUSBHubPortClearTTParam {
+    UInt32	 portNumber;
+    UInt32	 options;
+#if 0
+    UInt8 	 deviceAddress;  <<0
+	UInt8	 endpointNum;    <<8
+	UInt8 	 endpointType;	 <<16 // As split transaction. 00 Control, 10 Bulk
+	UInt8 	 IN;		 <<24 // Direction, 1 = IN, 0 = OUT
+#endif
+};
+
+#endif /* _USBHUB_H */
diff --git a/i386/include/IOKit/usb/USBSpec.h b/i386/include/IOKit/usb/USBSpec.h
new file mode 100644
index 0000000..0665819
--- /dev/null
+++ b/i386/include/IOKit/usb/USBSpec.h
@@ -0,0 +1,470 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+
+/*
+ * Constants that both OS9 and OSX want to define, and whose values are
+ * specified by the USB Standard.
+ * Put in a seperate file so they can be included if the OS9 include file isn't already
+ * included.
+ */
+#ifndef _USBSPEC_H
+#define _USBSPEC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /*!
+    @header     USBSpec.h
+     @abstract  Constants and definitions of parameters that are used in communcating with USB devices and interfaces.
+     @discussion    
+     */
+
+    /*!
+    @enum Endpoint type
+    @discussion Used in IOUSBFindEndpointRequest's type field
+    */
+enum {
+    kUSBControl     = 0,
+    kUSBIsoc        = 1,
+    kUSBBulk        = 2,
+    kUSBInterrupt   = 3,
+    kUSBAnyType     = 0xFF
+};
+
+    /*!
+    @enum Endpoint direction
+    @discussion Used in IOUSBFindEndpointRequest's direction field
+    */
+enum {
+    kUSBOut         = 0,
+    kUSBIn          = 1,
+    kUSBNone        = 2,
+    kUSBAnyDirn     = 3
+};
+
+    /*!
+    @enum Device Request Type
+    @discussion This type is encoded in the bmRequestType field of a Device Request.  It specifies the type of request: standard, class or vendor specific.
+    */
+enum {
+    kUSBStandard    = 0,
+    kUSBClass       = 1,
+    kUSBVendor      = 2
+};
+
+    /*!
+    @enum Device Request Recipient
+    @discussion This recipient is encoded in the bmRequestType field of a Device Request.  It specifies the type of recipient for a request:  the device, the interface, or an endpoint.
+    */
+enum {
+    kUSBDevice      = 0,
+    kUSBInterface   = 1,
+    kUSBEndpoint    = 2,
+    kUSBOther       = 3
+};
+
+    /*!
+    @enum Device Request
+    @discussion Specifies values for the bRequest field of a Device Request.
+    */
+enum {
+    kUSBRqGetStatus     = 0,
+    kUSBRqClearFeature  = 1,
+    kUSBRqGetState      = 2,
+    kUSBRqSetFeature    = 3,
+    kUSBRqReserved2     = 4,
+    kUSBRqSetAddress    = 5,
+    kUSBRqGetDescriptor = 6,
+    kUSBRqSetDescriptor = 7,
+    kUSBRqGetConfig     = 8,
+    kUSBRqSetConfig     = 9,
+    kUSBRqGetInterface  = 10,
+    kUSBRqSetInterface  = 11,
+    kUSBRqSyncFrame     = 12
+};
+
+    /*!
+    @enum USB Descriptors
+    @discussion Specifies values for diffent descriptor types.
+    */
+enum {
+    kUSBAnyDesc             = 0,    // Wildcard for searches
+    kUSBDeviceDesc          = 1,
+    kUSBConfDesc            = 2,
+    kUSBStringDesc          = 3,
+    kUSBInterfaceDesc       = 4,
+    kUSBEndpointDesc        = 5,
+    kUSBDeviceQualifierDesc = 6,
+    kUSBOtherSpeedConfDesc  = 7,
+    kUSBInterfacePowerDesc  = 8,
+    kUSBOnTheGoDesc	    = 9,
+    kUSDebugDesc	    = 10,
+    kUSBInterfaceAssociationDesc 	= 11,
+    kUSBHIDDesc             		= 0x21,
+    kUSBReportDesc          		= 0x22,
+    kUSBPhysicalDesc        		= 0x23,
+    kUSBHUBDesc             		= 0x29
+};
+
+    /*!
+    @enum Feature Selectors
+    @discussion Used with SET/CLEAR_FEATURE requests.
+    */
+enum {
+        kUSBFeatureEndpointStall = 0,
+        kUSBFeatureDeviceRemoteWakeup = 1
+}; 
+
+    /*!
+    @enum USB Power constants
+    @discussion Constants relating to USB Power.
+    */
+enum {
+    kUSB100mAAvailable  = 50,
+    kUSB500mAAvailable  = 250,
+    kUSB100mA           = 50,
+    kUSBAtrBusPowered   = 0x80,
+    kUSBAtrSelfPowered  = 0x40,
+    kUSBAtrRemoteWakeup = 0x20
+};
+
+    /*!
+    @enum USB Release constants
+    @discussion Constants relating to USB releases as found in the bcdUSB field of the Device Descriptor.
+    */
+enum {
+    kUSBRel10       = 0x0100,
+    kUSBRel11       = 0x0110,
+    kUSBRel20       = 0x0200
+};
+
+
+    /*!
+    @enum HID requests
+    @discussion Constants for HID requests.
+    */
+enum {
+    kHIDRqGetReport     = 1,
+    kHIDRqGetIdle       = 2,
+    kHIDRqGetProtocol   = 3,
+    kHIDRqSetReport     = 9,
+    kHIDRqSetIdle       = 10,
+    kHIDRqSetProtocol   = 11
+};
+
+    /*!
+    @enum HID report types
+    @discussion Constants for the three kinds of HID reports.
+    */
+enum {
+    kHIDRtInputReport       = 1,
+    kHIDRtOutputReport      = 2,
+    kHIDRtFeatureReport     = 3
+};
+
+
+    /*!
+    @enum HID Protocol
+    @discussion  Used in the SET_PROTOCOL device request
+    */
+enum {
+    kHIDBootProtocolValue   = 0,
+    kHIDReportProtocolValue = 1
+};
+
+
+
+enum {
+    kUSBCapsLockKey         = 0x39,
+    kUSBNumLockKey          = 0x53,
+    kUSBScrollLockKey       = 0x47
+};
+
+/*!
+@enum Device Class Codes
+ @discussion Constants for USB Device classes (bDeviceClass).
+ */
+enum {
+    kUSBCompositeClass          	= 0,
+    kUSBCommClass               	= 2,		// Deprecated
+    kUSBCommunicationClass			= 2,	
+    kUSBHubClass                	= 9,
+    kUSBDataClass               	= 10,
+	kUSBPersonalHealthcareClass		= 15,
+    kUSBDiagnosticClass				= 220,
+    kUSBWirelessControllerClass 	= 224,
+    kUSBMiscellaneousClass			= 239,
+    kUSBApplicationSpecificClass 	= 254,
+    kUSBVendorSpecificClass     	= 255
+};
+
+/*!
+@enum Interface Class
+ @discussion Constants for Interface classes (bInterfaceClass).
+ */
+enum {
+    kUSBAudioClass							= 1,		// Deprecated
+    kUSBAudioInterfaceClass					= 1,
+
+    kUSBCommunicationControlInterfaceClass	= 2,
+    kUSBCommunicationDataInterfaceClass		= 10,
+
+    kUSBHIDClass							= 3,
+    kUSBHIDInterfaceClass					= 3,
+
+    kUSBPhysicalInterfaceClass				= 5,
+
+    kUSBImageInterfaceClass					= 6,
+
+    kUSBPrintingClass						= 7,		// Deprecated
+    kUSBPrintingInterfaceClass				= 7,
+
+    kUSBMassStorageClass					= 8,		// Deprecated
+    kUSBMassStorageInterfaceClass			= 8,
+
+    kUSBChipSmartCardInterfaceClass			= 11,
+    
+    kUSBContentSecurityInterfaceClass 		= 13,
+    
+    kUSBVideoInterfaceClass					= 14,
+	
+	kUSBPersonalHealthcareInterfaceClass	= 15,
+    
+    kUSBDiagnosticDeviceInterfaceClass 		= 220,
+
+    kUSBWirelessControllerInterfaceClass	= 224,
+
+    kUSBApplicationSpecificInterfaceClass	= 254,
+    
+    kUSBVendorSpecificInterfaceClass     	= 255
+};
+
+// Obsolete
+enum {
+        
+    kUSBDisplayClass            = 4,		// Obsolete
+};
+
+/*!
+    @enum Interface SubClass
+    @discussion Constants for USB Interface SubClasses (bInterfaceSubClass).
+*/
+enum {
+    kUSBCompositeSubClass               = 0,
+    
+    kUSBHubSubClass                     = 0,
+
+    // For the kUSBAudioInterfaceClass
+    //
+    kUSBAudioControlSubClass		= 0x01,
+    kUSBAudioStreamingSubClass		= 0x02,
+    kUSBMIDIStreamingSubClass		= 0x03,
+    
+    // For the kUSBApplicationSpecificInterfaceClass
+    //
+    kUSBDFUSubClass                     = 0x01,
+    kUSBIrDABridgeSubClass              = 0x02,
+    kUSBTestMeasurementSubClass		= 0x03,
+
+    // For the kUSBMassStorageInterfaceClass
+    //
+    kUSBMassStorageRBCSubClass          = 0x01,
+    kUSBMassStorageATAPISubClass        = 0x02,
+    kUSBMassStorageQIC157SubClass       = 0x03,
+    kUSBMassStorageUFISubClass          = 0x04,
+    kUSBMassStorageSFF8070iSubClass     = 0x05,
+    kUSBMassStorageSCSISubClass         = 0x06,
+
+    // For the kUSBHIDInterfaceClass
+    //
+    kUSBHIDBootInterfaceSubClass        = 0x01,
+
+    // For the kUSBCommunicationDataInterfaceClass
+    //
+    kUSBCommDirectLineSubClass          = 0x01,
+    kUSBCommAbstractSubClass            = 0x02,
+    kUSBCommTelephoneSubClass           = 0x03,
+    kUSBCommMultiChannelSubClass        = 0x04,
+    kUSBCommCAPISubClass                = 0x05,
+    kUSBCommEthernetNetworkingSubClass  = 0x06,
+    kUSBATMNetworkingSubClass           = 0x07,
+
+    // For the kUSBDiagnosticDeviceInterfaceClass
+    //
+    kUSBReprogrammableDiagnosticSubClass	= 0x01,
+
+    // For the kUSBWirelessControllerInterfaceClass
+    //
+    kUSBRFControllerSubClass		= 0x01,
+
+    // For the kUSBMiscellaneousClass
+    //
+    kUSBCommonClassSubClass		= 0x02,
+
+    // For the kUSBVideoInterfaceClass
+    //
+    kUSBVideoControlSubClass		= 0x01,
+    kUSBVideoStreamingSubClass		= 0x02,
+    kUSBVideoInterfaceCollectionSubClass = 0x03
+    
+};
+
+/*!
+@enum	Interface Protocol
+ @discussion Reported in the bInterfaceProtocol field of the Interface Descriptor.
+ */
+enum {
+
+    // For kUSBHIDInterfaceClass
+    //
+    kHIDNoInterfaceProtocol		= 0,
+    kHIDKeyboardInterfaceProtocol	= 1,
+    kHIDMouseInterfaceProtocol		= 2,
+    kUSBVendorSpecificProtocol		= 0xff,
+
+    // For kUSBDiagnosticDeviceInterfaceClass
+    //
+    kUSB2ComplianceDeviceProtocol	= 0x01,
+
+    // For kUSBWirelessControllerInterfaceClass
+    //
+    kUSBBluetoothProgrammingInterfaceProtocol	= 0x01,
+
+    // For kUSBMiscellaneousClass
+    //
+    KUSBInterfaceAssociationDescriptorProtocol	= 0x01
+    
+};
+
+
+/*!
+    @enum DFU Class Attributes
+    @discussion 
+*/
+enum {
+    kUSBDFUAttributesMask       = 0x07,
+    kUSBDFUCanDownloadBit       = 0,
+    kUSBDFUCanUploadBit         = 1,
+    kUSBDFUManifestationTolerantBit     = 2
+};
+
+/*!
+ @enum Printer Class Requests
+ @discussion The bRequest parameter for Printing Class Sepcific Requests
+ */
+enum {
+	kUSPrintingClassGetDeviceID		= 0,
+	kUSPrintingClassGePortStatus	= 1,
+	kUSPrintingClassSoftReset		= 2
+};
+
+	/*!
+@enum Endpoint Descriptor bits
+ @discussion Bit definitions for endpoint descriptor fields
+ */
+enum {
+    kUSBbEndpointAddressMask				= 0x0f,
+    kUSBbEndpointDirectionBit				= 7,
+    kUSBbEndpointDirectionMask				= ( 1 << kUSBbEndpointDirectionBit ),
+    kUSBEndpointDirectionOut				= 0x00,
+    kUSBEndpointDirectionIn				= 0x80,
+    kUSBEndpointbmAttributesTransferTypeMask		= 0x03,
+    kUSBEndpointbmAttributesSynchronizationTypeMask	= 0x0c,
+    kUSBEndpointbmAttributesSynchronizationTypeShift	= 2,
+    kUSBEndpointbmAttributesUsageTypeMask		= 0x30,
+    kUSBEndpointbmAttributesUsageTypeShift		= 4
+};
+
+	/*!
+	 @defineblock USB Descriptor and IORegistry constants
+	 @discussion 	Various constants used to describe the fields in the various USB Device Descriptors and IORegistry names used for some of those fields 
+	 
+	 @define	kUSBDeviceClass				The field in the USB Device Descriptor corresponding to the device class
+	 @define	kUSBDeviceSubClass			The field in the USB Device Descriptor corresponding to the device sub class
+	 @define	kUSBDeviceProtocol			The field in the USB Device Descriptor corresponding to the device protocol
+	 @define	kUSBDeviceMaxPacketSize		The field in the USB Device Descriptor corresponding to the maximum packet size for endpoint 0
+	 @define	kUSBVendorID				The field in the USB Device Descriptor corresponding to the device USB Vendor ID
+	 @define	kUSBVendorName				Deprecated.  Use kUSBVendorID 
+	 @define	kUSBProductID				The field in the USB Device Descriptor corresponding to the device USB Product ID
+	 @define	kUSBProductName				Deprecated.  Use kUSBProductID
+	 @define	kUSBDeviceReleaseNumber		The field in the USB Device Descriptor corresponding to the device release version
+	 @define	kUSBManufacturerStringIndex	The field in the USB Device Descriptor corresponding to the index for the manufacturer's string
+	 @define	kUSBProductStringIndex		The field in the USB Device Descriptor corresponding to the index for the product name's string
+	 @define	kUSBSerialNumberStringIndex	The field in the USB Device Descriptor corresponding to the index for the serial number's string
+	 @define	kUSBDeviceNumConfigs		The field in the USB Configuration Descriptor corresponding to the number of configurations
+	 @define	kUSBInterfaceNumber			The field in the USB Configuration Descriptor corresponding to the number of configurations
+	 @define	kUSBAlternateSetting		The field in the USB Configuration Descriptor corresponding to the number of configurations
+	 @define	kUSBNumEndpoints			The field in the USB Configuration Descriptor corresponding to the number of configurations
+	 @define	kUSBInterfaceClass			The field in the USB Interface Descriptor corresponding to the interface class
+	 @define	kUSBInterfaceSubClass		The field in the USB Interface Descriptor corresponding to the interface sub class
+	 @define	kUSBInterfaceProtocol		The field in the USB Interface Descriptor corresponding to the interface protocol
+	 @define	kUSBInterfaceStringIndex	The field in the USB Interface Descriptor corresponding to the index for the interface name's string
+	 @define	kUSBConfigurationValue		The field in the USB Interface Descriptor corresponding to the configuration
+	 @define	kUSBProductString			IORegistry key for the device's USB Product string
+	 @define	kUSBVendorString			IORegistry key for the device's USB manufacturer string
+	 @define	kUSBSerialNumberString		IORegistry key for the device's USB serial number string
+	 @define	kUSB1284DeviceID			IORegistry key for the 1284 Device ID of a printer
+	 
+	 */
+#define kUSBDeviceClass             "bDeviceClass"
+#define kUSBDeviceSubClass          "bDeviceSubClass"
+#define kUSBDeviceProtocol          "bDeviceProtocol"
+#define kUSBDeviceMaxPacketSize     "bMaxPacketSize0"
+#define kUSBVendorID                "idVendor"          // good name
+#define kUSBVendorName              kUSBVendorID        // bad name - keep for backward compatibility
+#define kUSBProductID               "idProduct"         // good name
+#define kUSBProductName             kUSBProductID       // bad name - keep for backward compatibility
+#define kUSBDeviceReleaseNumber     "bcdDevice"
+#define kUSBManufacturerStringIndex "iManufacturer"
+#define kUSBProductStringIndex      "iProduct"
+#define kUSBSerialNumberStringIndex "iSerialNumber"
+#define kUSBDeviceNumConfigs        "bNumConfigurations"
+#define kUSBInterfaceNumber         "bInterfaceNumber"
+#define kUSBAlternateSetting        "bAlternateSetting"
+#define kUSBNumEndpoints            "bNumEndpoints"
+#define kUSBInterfaceClass          "bInterfaceClass"
+#define kUSBInterfaceSubClass       "bInterfaceSubClass"
+#define kUSBInterfaceProtocol       "bInterfaceProtocol"
+#define kUSBInterfaceStringIndex    "iInterface"
+#define kUSBConfigurationValue      "bConfigurationValue"
+#define kUSBProductString			"USB Product Name"	
+#define kUSBVendorString			"USB Vendor Name"
+#define kUSBSerialNumberString		"USB Serial Number"
+#define kUSB1284DeviceID			"1284 Device ID"
+ /*! @/defineblock */
+	
+	/*!
+    @enum Apple USB Vendor ID
+    @discussion Apple's vendor ID, assigned by the USB-IF
+*/
+enum {
+	kAppleVendorID      = 0x05AC
+};
+	
+#ifdef __cplusplus
+}       
+#endif
+
+#endif /* _USBSPEC_H */
diff --git a/i386/include/IOKit/usb/USBTracepoints.h b/i386/include/IOKit/usb/USBTracepoints.h
new file mode 100644
index 0000000..f2fe81e
--- /dev/null
+++ b/i386/include/IOKit/usb/USBTracepoints.h
@@ -0,0 +1,662 @@
+/*
+ * Copyright � 2009 Apple Inc.  All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __IOKIT_IO_USB_FAMILY_TRACEPOINTS__
+#define __IOKIT_IO_USB_FAMILY_TRACEPOINTS__
+
+#include <IOKit/IOTypes.h>
+
+#include <sys/kdebug.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+	
+#define USB_SYSCTL			"debug.USB"
+#define kUSBTypeDebug		'USBD'
+#define DEBUG_UNUSED( X )	( void )( X )
+	
+	extern UInt32 gUSBStackDebugFlags;
+	
+	typedef struct USBSysctlArgs
+		{
+			uint32_t		type;
+			uint32_t		operation;
+			uint32_t		debugFlags;
+		} USBSysctlArgs;
+	
+	enum
+	{
+		kUSBOperationGetFlags 	= 0,
+		kUSBOperationSetFlags	= 1
+	};
+	
+	// the following bits/masks are for use in the usb boot args
+	// e.g. boot-args="usb=0x102" will turn on Trace Points and set the EHCI retry count to 1
+	// the bits can also be set with a sysctl call
+	enum
+	{
+		kUSBEnableDebugLoggingBit		= 0,	// bit 0 currently not used
+		kUSBEnableTracePointsBit		= 1,	// bit 1 used to turn on Trace Points when a USB controller first loads
+		kUSBEnableErrorLogBit			= 2,	// bit 2 (4) turns level 1 log for errors
+		kUSBDebugRetryCountShift		= 8,	// bits 8 and 9 will set the retry count for low level bus transactions
+		kUSBDebugRetryCountReserved		= 9,	// must be 1, 2, or 3 (0 is invalid, 3 is the default)
+		
+		kUSBEnableDebugLoggingMask		= (1 << kUSBEnableDebugLoggingBit),
+		kUSBEnableTracePointsMask		= (1 << kUSBEnableTracePointsBit),
+		kUSBDebugRetryCountMask			= (3 << kUSBDebugRetryCountShift),
+		kUSBEnableErrorLogMask				= (1 << kUSBEnableErrorLogBit)
+	};
+	
+	
+	/* Kernel Tracepoints
+	 *
+	 * Kernel tracepoints are a logging mechanism reduces the size of a log-laden binary.
+	 * Codes are placed into a buffer, from the kernel, and picked up by a userspace
+	 * tool that displays a unique log message for each tracepoint. Additionally, each
+	 * tracepoint may contain up-to four 32-bit (may change with LP64) arguments. 
+	 *
+	 * To add a tracepoint, use the code below as an example:
+	 * USBTrace( kUSBTController, kTPControllerStart, (uintptr_t)myArgValue );
+	 * Next, add the corresponding tracepoint code in the USBTracer tool, using
+	 * the existing examples. Avoid using confidential information in the log strings.
+	 * Some functions have a argument counter, to signify which of the function's tracepoints
+	 * are actually being logged. When adding a tracepoint using an existing code, you
+	 * must verify that you increment this argument counter properly.
+	 *
+	 * The trace codes consist of the following:
+	 *
+	 * ----------------------------------------------------------------------
+	 *| Class (8)      | SubClass (8)   | USBGroup(6) | Code (8)    |Func   |
+	 *| DBG_IOKIT      | DBG_IOUSB      |             |             |Qual(2)|
+	 * ----------------------------------------------------------------------
+	 *
+	 * DBG_IOKIT(05h)  DBG_IOUSB(2Dh)
+	 *
+	 * See <sys/kdebug.h> and IOTimeStamp.h for more details.
+	 */
+	
+	
+	// USB groupings (max of 64)
+	enum
+	{
+		// Family groupings
+		kUSBTController				= 0,
+		kUSBTControllerUserClient	= 1,
+		
+		kUSBTDevice					= 2,
+		kUSBTDeviceUserClient		= 3,
+
+		kUSBTHub					= 4,
+		kUSBTHubPort				= 5,
+		kUSBTHSHubUserClient		= 6,
+		kUSBTHID					= 7,
+		kUSBTPipe					= 8,
+
+		kUSBTInterfaceUserClient	= 9,
+		
+		kUSBTEnumeration				= 10,		// Tracepoints in various components to debug USB enumeration
+
+		
+		// UIM groupings
+		kUSBTUHCI					= 11,
+		kUSBTUHCIUIM				= 12,
+		kUSBTUHCIInterrupts			= 13,
+
+		kUSBTOHCI					= 14,
+		kUSBTOHCIInterrupts			= 15,
+		
+		kUSBTEHCI					= 20,
+		kUSBTEHCIHubInfo			= 22,
+		kUSBTEHCIInterrupts			= 23,
+		
+		// 30-33 reserved
+
+		// 21-25 reserved
+		kUSBTHubPolicyMaker			= 35,
+		kUSBTCompositeDriver		= 36,
+		
+		// Actions
+		kUSBTOutstandingIO			= 42,
+
+		// kUSBAudio
+		kUSBAudio					= 50
+
+		// 61-63 reserved
+	};
+	
+	// USB Controller Tracepoints		0x052D0000 - 0x052D03FF
+	// kUSBTController
+	enum
+	{
+		kTPControllerStart							= 1,
+		kTPControllerControlPacketHandler			= 2,
+		kTPControllerMakeDevice						= 3,
+		kTPControllerMakeHubDevice					= 4,
+		kTPControllerCreateRootHubDevice			= 5,
+		kTPControllerClearTTHandler					= 6,
+		kTPControllerClearTT						= 7,
+		kTPControllerDoCreateEP						= 8,
+		kTPControllerReadV2							= 9,
+		kTPControllerReturnIsochDoneQueue			= 10,
+		kTPControllersetPowerState					= 11,
+		kTPControllerCheckPowerModeBeforeGatedCall	= 12,
+		kTPControllerGatedPowerChange				= 13,
+		kTPControllerCheckForRootHubChanges			= 14,
+		kTPControllerRootHubQueueInterruptRead		= 15,
+		kTPControllerRootHubTimer					= 16,
+		kTPControllerDisjointCompletion				= 17,
+		kTPControllerCheckForDisjointDescriptor		= 18,
+		kTPControllerRead							= 19,
+		kTPControllerV3Start						= 20,
+		kTPAllocatePowerStateArray					= 21,
+		kTPInitForPM								= 22,
+		kTPIsocIOLL									= 23,
+		kTPIsocIO									= 24,
+		kTPControllerWrite							= 25,
+		kTPCompletionCall							= 26,
+		kTPControlTransaction						= 27,
+		kTPInterruptTransaction						= 28,
+		kTPInterruptTransactionData					= 29,
+		kTPBulkTransaction							= 30,
+		kTPBulkTransactionData						= 31,
+		kTPIsocTransaction							= 32,
+		kTPInterruptPacketHandler					= 33,
+		kTPBulkPacketHandler						= 34,
+		kTPDevZeroLock								= 35,
+		kTPControlPacketHandlerData					= 36,
+		kTPDoIOTransferIntrSync						= 37,
+		kTPDoIOTransferBulkSync						= 38,
+		kTPBulkPacketHandlerData					= 39,
+		kTPInterruptPacketHandlerData				= 40
+	};
+	
+	// USB Device Tracepoints			
+	// kUSBTDevice
+	enum
+	{
+		kTPDeviceInit								= 1,
+		kTPDeviceMessage							= 2,
+		kTPDeviceResetDevice						= 3,
+		kTPDeviceGetFullConfigurationDescriptor		= 4,
+		kTPDeviceGetDeviceDescriptor				= 5,
+		kTPDeviceGetConfigDescriptor				= 6,
+		kTPDeviceSetConfiguration					= 7,
+		kTPDeviceSetFeature							= 8,
+		kTPDeviceDeviceRequest						= 9,
+		kTPDeviceGetConfiguration					= 10,
+		kTPDeviceGetDeviceStatus					= 11,
+		kTPDeviceSuspendDevice						= 12,
+		kTPDeviceReEnumerateDevice					= 13,
+		kTPDeviceConfigLock							= 14
+	};
+	
+	// USB Pipe Tracepoints			
+	// kUSBTPipe
+	enum
+	{
+		kTPPipeInitToEndpoint						= 1,
+		kTPBulkPipeRead								= 2,
+		kTPBulkPipeWrite							= 3,
+		kTPIsocPipeRead								= 4,
+		kTPIsocPipeWrite							= 5,
+		kTPIsocPipeReadLL							= 6,
+		kTPIsocPipeWriteLL							= 7,
+		kTPIBulkReadTS								= 8,
+		kTPPipeControlRequest						= 9,
+		kTPPipeControlRequestMemDesc				= 10
+	};
+	
+	
+	// USB kUSBTControllerUserClient Tracepoints			
+	// kUSBTControllerUserClient
+	enum
+	{
+		kTPControllerUCStart					= 1,
+		kTPControllerUCOpen						= 2,
+		kTPControllerUCReadRegister				= 3,
+		kTPControllerUCWriteRegister			= 4
+	};
+	
+	// USB kUSBTDeviceUserClient Tracepoints			
+	// kUSBTDeviceUserClient
+	enum
+	{
+		kTPDeviceUCDeviceRequestIn				= 1,
+		kTPDeviceUCDeviceRequestOut				= 2,
+		kTPDeviceUCChangeOutstandingIO			= 3,
+		kTPDeviceUCGetGatedOutstandingIO		= 4,
+		kTPDeviceUCReqComplete					= 5
+	};
+	
+	// USB InterfaceUserClient Tracepoints			
+	// kUSBTInterfaceUserClient
+	enum
+	{
+		kTPInterfaceUCReadPipe					= 1,
+		kTPInterfaceUCWritePipe					= 2,
+		kTPInterfaceUCControlRequestOut			= 3,
+		kTPInterfaceUCControlRequestIn			= 4,
+		kTPInterfaceUCDoIsochPipeAsync			= 5,
+		kTPInterfaceUCLowLatencyPrepareBuffer	= 6,
+		kTPInterfaceUCChangeOutstandingIO		= 7,
+		kTPInterfaceUCReqComplete				= 8,
+		kTPInterfaceUCIsoReqComplete			= 9,
+		kTPInterfaceUCLLIsoReqComplete			= 10
+	};
+	
+	
+	// USB HSHubUserClient Tracepoints			
+	// kUSBTHSHubUserClient
+	enum
+	{
+		kTPHSHubUCInitWithTask					= 1,
+		kTPHSHubUCStart							= 2,
+		kTPHSHubUCClose							= 3,
+		kTPHSHubUCGetNumberOfPorts				= 4,
+		kTPHSHubUCGetLocationID					= 5,
+		kTPHSHubUCPutPortIntoTestMode			= 6,
+		kTPHSHubUCSupportsIndicators			= 7,
+		kTPHSHubUCSetIndicatorForPort			= 8,
+		kTPHSHubUCGetPortIndicatorControl		= 9,
+		kTPHSHubUCSetIndicatorsToAutomatic		= 10,
+		kTPHSHubUCGetPowerSwitchingMode			= 11,
+		kTPHSHubUCGetPortPower					= 12,
+		kTPHSHubUCSetPortPower					= 13,
+		kTPHSHubUCDisablePwrMgmt				= 14
+	};
+	
+	// USB Hub Tracepoints			
+	// kUSBTHub
+	enum
+	{
+		kTPHubStart								= 1,
+		kTPHubMessage							= 2,
+		kTPHubWillTerminate						= 3,
+		kTPHubPowerStateWillChangeTo			= 4,
+		kTPHubPowerChangeDone					= 5,
+		kTPHubConfigureHub						= 6,
+		kTPHubCheckPowerPowerRequirements		= 7,
+		kTPHubHubPowerChange					= 8,
+		kTPHubAreAllPortsDisconnectedOrSuspended= 9,
+		kTPHubSuspendPorts						= 10,
+		kTPHubSetPortFeature					= 11,
+		kTPHubClearPortFeature					= 12,
+		kTPHubDoPortAction						= 13,
+		kTPHubInterruptReadHandler				= 14,
+		kTPHubResetPortZero						= 15,
+		kTPHubProcessStateChanged				= 16,
+		kTPHubRearmInterruptRead				= 17,
+		kTPHubDoDeviceRequest					= 18,
+		kTPHubWaitForPortResumes				= 19,
+		kTPHubResetMyPort						= 20,
+		kTPHubDecrementOutstandingIO			= 21,
+		kTPHubChangeOutstandingIO				= 22, 
+		kTPHubChangeRaisedPowerState			= 23,
+		kTPHubChangeOutstandingResumes			= 24,
+		kTPHubEnterTestMode						= 25,
+		kTPHubLeaveTestMode						= 26,
+		kTPHubPutPortIntoTestMode				= 27,
+		kTPHubGetPortIndicatorControl			= 28,
+		kTPHubSetIndicatorsToAutomatic			= 29,
+		kTPHubGetPortPower						= 30,
+		kTPHubEnsureUsability					= 31,
+		kTPHubCheckPowerRequirements			= 32,
+		kTPHubWaitForPowerOn					= 33,
+		kTPHubDoPortActionLock					= 34,
+		kTPHubCheckForDeadDevice				= 35
+	};
+	
+	// USB HubPort Tracepoints			
+	// kUSBTHubPort
+	enum
+	{
+		kTPHubPortStop								= 1,
+		kTPHubPortAddDevice							= 2,
+		kTPHubPortSuspendPort						= 3,
+		kTPHubPortFatalError						= 4,
+		kTPHubPortAddDeviceResetChangeHandler		= 5,
+		kTPHubPortHandleResetPortHandler			= 6,
+		kTPHubPortDefaultOverCrntChangeHandler		= 7,
+		kTPHubPortDefaultConnectionChangeHandler	= 8,
+		kTPHubPortReleaseDevZeroLock				= 9,
+		kTPHubPortDetachDevice						= 10,
+		kTPHubPortGetDevZeroDescriptorWithRetries	= 11,
+		kTPHubPortDisplayOverCurrentNotice			= 12,
+		kTPHubPortWakeSuspendCommand				= 13,
+		kTPHubPortWaitForSuspendCommand				= 14,
+		kTPHubPortEnablePowerAfterOvercurrent		= 15
+	};
+	
+	// USB HID Tracepoints			
+	// kUSBTHID
+	enum
+	{
+		kTPHIDStart							= 1,
+		kTPHIDpowerStateWillChangeTo		= 2,
+		kTPHIDsetPowerState					= 3,
+		kTPHIDpowerStateDidChangeTo			= 4,
+		kTPHIDpowerChangeDone				= 5,
+		kTPHIDhandleStart					= 6,
+		kTPHIDClearFeatureEndpointHalt		= 7,
+		kTPHIDHandleReport					= 8,
+		kTPHIDSuspendPort					= 9,
+		kTPHIDAbortAndSuspend				= 10,
+		kTPHIDClaimPendingRead				= 11,
+		kTPHIDChangeOutstandingIO			= 12,
+		kTPHIDRearmInterruptRead			= 13,
+		kTPHIDInitializeUSBHIDPowerManagement = 14,
+		kTPHIDInterruptRead					= 15,
+		kTPHIDInterruptReadError			= 16,
+		kTPHIDCheckForDeadDevice			= 17
+	};
+	
+	// USB Enumeration Tracepoints			
+	// kUSBTEnumeration
+	enum
+	{
+		kTPEnumerationProcessStatusChanged	= 1,
+		kTPEnumerationInitialGetPortStatus	= 2,
+		kTPEnumerationCallAddDevice			= 3,
+		kTPEnumerationAddDevice				= 4,
+		kTPEnumerationResetPort				= 5,
+		kTPEnumerationAddDeviceResetChangeHandler	= 6,
+		kTPEnumerationRegisterService		= 7,
+		kTPEnumerationLowSpeedDevice		= 8,
+		kTPEnumerationFullSpeedDevice		= 9
+		
+	};
+	
+	// USB UHCI Tracepoints			
+	// kUSBTUHCI
+	enum
+	{
+		kTPUHCIMessage						= 1,
+		kTPUHCIGetFrameNumber				= 2,
+		kTPUHCIScavengeIsocTransactions		= 3,
+		kTPUHCIScavengeQueueHeads			= 4,
+		kTPUHCIAllocateQH					= 5,
+		kTPUHCIRootHubStatusChange			= 6,
+		kTPUHCIRHSuspendPort				= 7,
+		kTPUHCIRHHoldPortReset				= 8,
+		kTPUHCIRHResumePortCompletion		= 9,
+		kTPUHCISuspendController			= 10,
+		KTPUHCIResumeController				= 11,
+		KTPUHCIResetControllerState			= 12,
+		KTPUHCIRestartControllerFromReset	= 13,
+		KTPUHCIEnableInterrupts				= 14,
+		KTPUHCIDozeController				= 15,
+		KTPUHCIWakeFromDoze					= 16,
+		KTPUHCIPowerState					= 17,
+	};
+
+	
+	// USB UHCI Tracepoints			
+	// kUSBTUHCIUIM
+	enum
+	{
+		kTPUHCIUIMCreateControlEndpoint		= 1,
+		kTPUHCIUIMCreateBulkEndpoint		= 2,
+		kTPUHCIUIMCreateInterruptEndpoint	= 3,
+		kTPUHCIUIMCreateIsochEndpoint		= 4,
+		kTPUHCIUIMCreateIsochTransfer		= 5,
+		kTPUHCIUIMDeleteEndpoint			= 6,
+		kTPUHCIUIMUnlinkQueueHead			= 7,
+		kTPUHCIUIMCheckForTimeouts			= 8,
+		kTPUHCIUIMReturnOneTransaction		= 9,
+		kTPUHCIUIMAllocateTDChain			= 10,
+		kTPUHCIUIMAddIsochFramesToSchedule	= 11,
+		kTPUHCIUIMAbortIsochEP				= 12,
+		kTPUHCIUIMCreateInterruptTransfer	= 13,
+		kTPUHCIUIMHandleEndpointAbort		= 14
+	};
+	
+	// USB UHCI Interrupt Tracepoints			
+	// kUSBTUHCIInterrupts
+	enum
+	{
+		kTPUHCIInterruptsGetFrameNumberInternal	= 1,
+		kTPUHCIInterruptsFilterInterrupt		= 2,
+		kTPUHCIInterruptsHandleInterrupt		= 3,
+		kTPUHCIUpdateFrameList					= 4
+	};
+	
+	// USB EHCI Tracepoints			
+	// kUSBTEHCI
+	enum
+	{
+		kTPEHCIRootHubResetPort					= 1,
+		kTPEHCIRootHubPortEnable				= 2,
+		kTPEHCIRootHubPortSuspend				= 3,
+		// kTPEHCIRootHubStatusChange			= 4,
+		kTPEHCIRHResumePortCompletion			= 5,
+		kTPEHCIUIMFinalize						= 6,
+		kTPEHCIGetFrameNumber32					= 7, 
+		kTPEHCIGetFrameNumber					= 8,
+		kTPEHCIAllocateQH						= 9,
+		kTPEHCIEnableAsyncSchedule				= 10,
+		kTPEHCIDisableAsyncSchedule				= 11,
+		kTPEHCIEnablePeriodicSchedule			= 12,
+		kTPEHCIDisablePeriodicSchedule			= 13,
+		kTPEHCIMessage							= 14,
+		kTPEHCIMakeEmptyEndPoint				= 15,
+		kTPEHCIAllocateTDs						= 16,
+		kTPEHCIMungeECHIStatus					= 17,
+		kTPEHCIScavengeIsocTransactions			= 18,
+		kTPEHCIScavengeAnEndpointQueue			= 19,
+		kTPEHCIScavengeCompletedTransactions	= 20,
+		kTPEHCICreateBulkEndpoint				= 21,
+		kTPEHCICreateBulkTransfer				= 22,
+
+		kTPEHCICreateInterruptEndpoint			= 24,
+		kTPEHCICreateIsochEndpoint				= 25,
+		kTPEHCIAbortIsochEP						= 26,
+		kTPEHCIHandleEndpointAbort				= 27,
+		kTPEHCICreateInterruptTransfer			= 28,
+		kTPEHCIUnlinkAsyncEndpoint				= 29,
+		kTPEHCIDeleteEndpoint					= 30,
+		kTPEHCICreateHSIsochTransfer			= 31,
+		kTPEHCICreateSplitIsochTransfer			= 32,
+		kTPEHCICreateIsochTransfer				= 33,
+		kTPEHCIAddIsocFramesToSchedule			= 34,
+		kTPEHCIReturnOneTransaction				= 35,
+		kTPEHCICheckEDListForTimeouts			= 36,
+		kTPEHCISuspendUSBBus					= 37,
+		kTPEHCICheckForTimeouts					= 38,
+		kTPEHCIResumeUSBBus						= 39,
+		kTPEHCIRestartUSBBus					= 40,
+		kTPEHCIResetControllerState				= 41,
+		kTPEHCIDozeController					= 42,
+		kTPEHCIWakeControllerFromDoze			= 43,
+		kTPEHCIEnableInterrupts					= 44,
+		kTPEHCIPowerState						= 45,
+		kTPEHCIStopUSBBus						= 46,
+		kTPEHCIRestartControllerFromReset		= 47
+	};
+
+	// USB EHCI Interrupt Tracepoints			
+	// kUSBTEHCIInterrupts
+	enum
+	{
+		kTPEHCIInterruptsPollInterrupts			= 1,
+		kTPEHCIInterruptsPrimaryInterruptFilter	= 2,
+		kTPEHCIUpdateFrameList					= 3,
+	};
+	
+	
+	// USB EHCI Interrupt Tracepoints			
+	// kUSBTEHCIHubInfo
+	enum
+	{
+		kTPEHCIAvailableIsochBandwidth			= 1,
+		kTPEHCIAllocateIsochBandwidth			= 2
+	};
+	
+	// USB OHCI Tracepoints			
+	// kUSBTOHCI
+	enum
+	{
+		kTPOHCIInitialize						= 1,
+		kTPOHCICreateGeneralTransfer			= 2,
+		kTPOHCIAbortEndpoint					= 3,
+		kTPOHCIDeleteEndpoint					= 4,
+		kTPOHCIEndpointStall					= 5,
+		kTPOHCICreateIsochTransfer				= 6,
+		kTPOHCIAllocateTD						= 7,
+		kTPOHCIAllocateITD						= 8,
+		kTPOHCIAllocateED						= 9,
+		kTPOHCIProcessCompletedITD				= 10,
+		kTPOHCIReturnTransactions				= 11,
+		kTPOHCIMessage							= 12,
+		KTPOHCISuspendUSBBus					= 13,
+		KTPOHCIResumeUSBBus						= 14,
+		KTPOHCIResetControllerState				= 15,
+		KTPOHCIRestartControllerFromReset		= 16,
+		KTPOHCIEnableInterrupts					= 17,
+		KTPOHCIDozeController					= 18,
+		KTPOHCIWakeControllerFromDoze			= 19,
+		KTPOHCIPowerState						= 20,
+		kTPOHCIDoneQueueCompletion				= 21
+	};
+		
+	// USB OHCI Interrupt Tracepoints			
+	// kUSBTOHCIInterrupts
+	enum
+	{
+		kTPOHCIInterruptsPollInterrupts			= 1,
+		kTPOHCIInterruptsPrimaryInterruptFilter	= 2,
+		kTPOHCIUpdateFrameList					= 3
+	};
+	
+
+	// USB HubPolicyMaker Tracepoints			
+	// kUSBTHubPolicyMaker
+	enum
+	{
+		kTPSetPowerState						 = 1
+	};
+	
+	// USB CompositeDriver Tracepoints			
+	// kUSBTCompositeDriver
+	enum
+	{
+		kTPCompositeDriverConfigureDevice		 = 1
+	};
+
+	// USB USB OutstandingIO Tracepoints			
+	// kUSBTOutstandingIO
+	enum
+	{
+		kTPDeviceUCDecrement	= 1,
+		kTPDeviceUCIncrement	= 2,
+		kTPInterfaceUCDecrement	= 3,
+		kTPInterfaceUCIncrement	= 4,
+		kTPHubDecrement			= 5,
+		kTPHubIncrement			= 6,
+		kTPHIDDecrement			= 7,
+		kTPHIDIncrement			= 8
+	};
+	
+	// USB Audio driver Tracepoints			
+	// kUSBAudio
+	enum
+	{
+		kTPAudioDriverRead						= 1,
+		kTPAudioDriverCoalesceInputSamples		= 2,
+		kTPAudioDriverCoalesceError				= 3,
+		kTPAudioDriverCoalesce					= 4,
+		kTPAudioDriverReadHandler				= 5,
+		kTPAudioDriverCoalesceError2			= 6,
+		kTPAudioDriverConvertInputSamples		= 7
+	};
+	
+	// Tracepoint macros.
+#define USB_TRACE(USBClass, code, funcQualifier)	( ( ( DBG_IOKIT & 0xFF ) << 24) | ( ( DBG_IOUSB & 0xFF ) << 16 ) | ( ( USBClass & 0x3F ) << 10 ) | ( ( code & 0xFF ) << 2 ) | ( funcQualifier & 0x3 ) )
+
+#define kTPAllUSB								USB_TRACE ( 0, 0, 0 )
+
+#define USB_CONTROLLER_TRACE(code)				USB_TRACE( kUSBTController, code, DBG_FUNC_NONE )
+#define USB_CONTROLLER_UC_TRACE(code)			USB_TRACE( kUSBTControllerUserClient, code, DBG_FUNC_NONE )
+#define USB_DEVICE_TRACE(code)					USB_TRACE( kUSBTDevice, code, DBG_FUNC_NONE )
+#define USB_DEVICE_UC_TRACE(code)				USB_TRACE( kUSBTDeviceUserClient, code, DBG_FUNC_NONE )
+
+#define USB_HUB_TRACE(code)						USB_TRACE( kUSBTHub, code, DBG_FUNC_NONE )
+#define USB_HUB_PORT_TRACE(code)				USB_TRACE( kUSBTHubPort, code, DBG_FUNC_NONE )
+#define USB_HUB_UC_TRACE(code)					USB_TRACE( kUSBTHSHubUserClient, code, DBG_FUNC_NONE )
+#define USB_HID_TRACE(code)						USB_TRACE( kUSBTHID, code, DBG_FUNC_NONE )
+#define USB_PIPE_TRACE(code)					USB_TRACE( kUSBTPipe, code, DBG_FUNC_NONE )
+
+#define USB_INTERFACE_UC_TRACE(code)			USB_TRACE( kUSBTInterfaceUserClient, code, DBG_FUNC_NONE )
+
+#define USB_ENUMERATION_TRACE(code)				USB_TRACE( kUSBTEnumeration, code, DBG_FUNC_NONE )
+
+#define USB_UHCI_TRACE(code)					USB_TRACE( kUSBTUHCI, code, DBG_FUNC_NONE )
+#define USB_UHCI_UIM_TRACE(code)				USB_TRACE( kUSBTUHCIUIM, code, DBG_FUNC_NONE )
+#define USB_UHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTUHCIInterrupts, code, DBG_FUNC_NONE )
+
+#define USB_OHCI_TRACE(code)					USB_TRACE( kUSBTOHCI, code, DBG_FUNC_NONE )
+#define USB_OHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTOHCIInterrupts, code, DBG_FUNC_NONE )
+
+#define USB_EHCI_TRACE(code)					USB_TRACE( kUSBTEHCI, code, DBG_FUNC_NONE )
+#define USB_EHCI_HUBINFO_TRACE(code)			USB_TRACE( kUSBTEHCIHubInfo, code, DBG_FUNC_NONE )
+#define USB_EHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTEHCIInterrupts, code, DBG_FUNC_NONE )
+
+#define USB_HUB_POLICYMAKER_TRACE(code)			USB_TRACE( kUSBTHubPolicyMaker, code, DBG_FUNC_NONE )
+#define USB_COMPOSITE_DRIVER_TRACE(code)		USB_TRACE( kUSBTCompositeDriver, code, DBG_FUNC_NONE )
+
+#define USB_OUTSTANDING_IO_TRACE(code)			USB_TRACE( kUSBTOutstandingIO, code, DBG_FUNC_NONE )	
+	
+#define USB_AUDIO_DRIVER_TRACE(code)			USB_TRACE( kUSBAudio, code, DBG_FUNC_NONE )	
+
+#ifdef KERNEL
+	
+#include <IOKit/IOTimeStamp.h>
+		
+#define USBTrace(USBClass, code, a, b, c, d) {														\
+			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
+				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_NONE), a, b, c, d );		\
+			}																						\
+		}
+
+#define USBTrace_Start(USBClass, code, a, b, c, d) {												\
+			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
+				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_START), a, b, c, d );		\
+			}																						\
+		}
+
+#define USBTrace_End(USBClass, code, a, b, c, d) {														\
+			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
+				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_END), a, b, c, d );			\
+			}																						\
+		}
+
+#endif
+	
+	
+	
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/* __IOKIT_IO_USB_FAMILY_TRACEPOINTS__ */
diff --git a/i386/include/_structs.h b/i386/include/_structs.h
new file mode 100644
index 0000000..44443b2
--- /dev/null
+++ b/i386/include/_structs.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#include <sys/_structs.h>
+
diff --git a/i386/include/_types.h b/i386/include/_types.h
new file mode 100644
index 0000000..6340283
--- /dev/null
+++ b/i386/include/_types.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2004, 2008, 2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef __TYPES_H_
+#define __TYPES_H_
+
+#include <sys/_types.h>
+
+#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7
+#define __strfmonlike(fmtarg, firstvararg) \
+		__attribute__((__format__ (__strfmon__, fmtarg, firstvararg)))
+#define __strftimelike(fmtarg) \
+		__attribute__((__format__ (__strftime__, fmtarg, 0)))
+#else
+#define __strfmonlike(fmtarg, firstvararg)
+#define __strftimelike(fmtarg)
+#endif
+
+typedef	int		__darwin_nl_item;
+typedef	int		__darwin_wctrans_t;
+#ifdef __LP64__
+typedef	__uint32_t	__darwin_wctype_t;
+#else /* !__LP64__ */
+typedef	unsigned long	__darwin_wctype_t;
+#endif /* __LP64__ */
+
+#ifdef __WCHAR_MAX__
+#define __DARWIN_WCHAR_MAX	__WCHAR_MAX__
+#else /* ! __WCHAR_MAX__ */
+#define __DARWIN_WCHAR_MAX	0x7fffffff
+#endif /* __WCHAR_MAX__ */
+
+#if __DARWIN_WCHAR_MAX > 0xffffU
+#define __DARWIN_WCHAR_MIN	(-0x7fffffff - 1)
+#else
+#define __DARWIN_WCHAR_MIN	0
+#endif
+#define	__DARWIN_WEOF 	((__darwin_wint_t)-1)
+
+#ifndef _FORTIFY_SOURCE
+#  if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1050)
+#    define _FORTIFY_SOURCE 0
+#  else
+#    define _FORTIFY_SOURCE 2	/* on by default */
+#  endif
+#endif
+
+#endif /* __TYPES_H_ */
diff --git a/i386/include/architecture/alignment.h b/i386/include/architecture/alignment.h
new file mode 100644
index 0000000..3a27fc4
--- /dev/null
+++ b/i386/include/architecture/alignment.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 1999, 2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1996 NeXT Software, Inc.
+ *
+ * Natural alignment of shorts and longs.
+ *
+ * HISTORY
+ *
+ * 2 Sept 1992 Brian Raymor at NeXT
+ *	Moved over to architecture.
+ * 18 August 1992 Jack Greenfield at NeXT
+ *	Created.
+ */
+ 
+
+#if defined (__ppc__)
+#include "architecture/ppc/alignment.h"
+#elif defined (__i386__)
+#include "architecture/i386/alignment.h"
+#elif defined (__arm__)
+#include "architecture/arm/alignment.h"
+#else
+#error architecture not supported
+#endif
+
+
diff --git a/i386/include/architecture/byte_order.h b/i386/include/architecture/byte_order.h
new file mode 100644
index 0000000..4542986
--- /dev/null
+++ b/i386/include/architecture/byte_order.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 1999-2008 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ * Byte ordering conversion.
+ *
+ */
+
+#ifndef	_ARCHITECTURE_BYTE_ORDER_H_
+#define _ARCHITECTURE_BYTE_ORDER_H_
+
+#include <libkern/OSByteOrder.h>
+
+
+#endif	/* _ARCHITECTURE_BYTE_ORDER_H_ */
diff --git a/i386/include/architecture/i386/alignment.h b/i386/include/architecture/i386/alignment.h
new file mode 100644
index 0000000..17dd0ef
--- /dev/null
+++ b/i386/include/architecture/i386/alignment.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ * Natural alignment of shorts and longs (for i386)
+ *
+ * HISTORY
+ *
+ * 2 Sept 1992 Brian Raymor at NeXT
+ *      Moved over to architecture.
+ * 18 August 1992 Jack Greenfield at NeXT
+ *	Created.
+ */
+
+#ifndef _ARCH_I386_ALIGNMENT_H_
+#define _ARCH_I386_ALIGNMENT_H_
+
+/*
+ * NOP
+ */
+__inline__ static unsigned short
+get_align_short(void *ivalue)
+{
+    return *((unsigned short *) ivalue);
+}
+
+__inline__ static unsigned short 
+put_align_short(unsigned short ivalue, void *ovalue)
+{
+    return *((unsigned short *) ovalue) = ivalue;
+}
+
+/*
+ * NOP
+ */
+__inline__ static unsigned long
+get_align_long(void *ivalue)
+{
+    return *((unsigned long *) ivalue);
+}
+
+__inline__ static unsigned long 
+put_align_long(unsigned long ivalue, void *ovalue)
+{
+    return *((unsigned long *) ovalue) = ivalue;
+}
+
+#endif	/* _ARCH_I386_ALIGNMENT_H_ */
diff --git a/i386/include/architecture/i386/asm_help.h b/i386/include/architecture/i386/asm_help.h
new file mode 100644
index 0000000..0207c1d
--- /dev/null
+++ b/i386/include/architecture/i386/asm_help.h
@@ -0,0 +1,398 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1991 NeXT Computer, Inc.  All rights reserved.
+ *
+ *	File:	architecture/i386/asm_help.h
+ *	Author:	Mike DeMoney, NeXT Computer, Inc.
+ *	Modified for i386 by: Bruce Martin, NeXT Computer, Inc.
+ *
+ *	This header file defines macros useful when writing assembly code
+ *	for the Intel i386 family processors.
+ *
+ * HISTORY
+ * 10-Mar-92  Bruce Martin (bmartin@next.com)
+ *	Adapted to i386
+ * 23-Jan-91  Mike DeMoney (mike@next.com)
+ *	Created.
+ */
+
+#ifndef	_ARCH_I386_ASM_HELP_H_
+#define	_ARCH_I386_ASM_HELP_H_
+
+#include	<architecture/i386/reg_help.h>
+
+
+#ifdef	__ASSEMBLER__
+
+#define ALIGN						\
+	.align	2, 0x90
+
+#define	ROUND_TO_STACK(len)				\
+	(((len) + STACK_INCR - 1) / STACK_INCR * STACK_INCR)
+
+#ifdef notdef
+#if defined(__i386__)
+#define CALL_MCOUNT						\
+	pushl	%ebp						;\
+	movl	%esp, %ebp					;\
+	.data							;\
+	1: .long 0						;\
+	.text							;\
+	lea 9b,%edx						;\
+	call mcount						;\
+	popl	%ebp						;
+#elif defined(__x86_64__)
+#define CALL_MCOUNT						\
+	pushq	%rbp						;\
+	movq	%rsp, %rbp					;\
+	.data							;\
+	1: .quad 0						;\
+	.text							;\
+	lea 9b,%r13						;\
+	call mcount						;\
+	popq	%rbp					;
+#endif
+#else
+#define CALL_MCOUNT
+#endif
+
+/*
+ * Prologue for functions that may call other functions.  Saves
+ * registers and sets up a C frame.
+ */
+#if defined(__i386__)
+#define NESTED_FUNCTION_PROLOGUE(localvarsize)			\
+	.set	__framesize,ROUND_TO_STACK(localvarsize)	;\
+	.set	__nested_function, 1				;\
+	CALL_MCOUNT						\
+	.if __framesize						;\
+	  pushl	%ebp						;\
+	  movl	%esp, %ebp					;\
+	  subl	$__framesize, %esp				;\
+	.endif							;\
+	pushl	%edi						;\
+	pushl	%esi						;\
+	pushl	%ebx
+#elif defined(__x86_64__)
+#define NESTED_FUNCTION_PROLOGUE(localvarsize)			\
+	.set	__framesize,ROUND_TO_STACK(localvarsize)	;\
+	.set	__nested_function, 1				;\
+	CALL_MCOUNT						\
+	.if __framesize						;\
+	  pushq	%rbp						;\
+	  movq	%rsp, %rbp					;\
+	  subq	$__framesize, %rsp				;\
+	.endif							;
+#endif
+
+/*
+ * Prologue for functions that do not call other functions.  Does not
+ * save registers (this is the functions responsibility).  Does set
+ * up a C frame.
+ */
+#if defined(__i386__)
+#define LEAF_FUNCTION_PROLOGUE(localvarsize)			\
+	.set	__framesize,ROUND_TO_STACK(localvarsize)	;\
+	.set	__nested_function, 0				;\
+	CALL_MCOUNT						\
+	.if __framesize						;\
+	  pushl	%ebp						;\
+	  movl	%esp, %ebp					;\
+	  subl	$__framesize, %esp				;\
+	.endif
+#elif defined(__x86_64__)
+#define LEAF_FUNCTION_PROLOGUE(localvarsize)			\
+	.set	__framesize,ROUND_TO_STACK(localvarsize)	;\
+	.set	__nested_function, 0				;\
+	CALL_MCOUNT						\
+	.if __framesize						;\
+	  pushq	%rbp						;\
+	  movq	%rsp, %rbp					;\
+	  subq	$__framesize, %rsp				;\
+	.endif
+#endif
+
+/*
+ * Epilogue for any function.
+ *
+ * We assume that all Leaf functions will be responsible for saving any
+ * local registers they clobber.
+ */
+#if defined(__i386__)
+#define FUNCTION_EPILOGUE					\
+	.if __nested_function					;\
+	  popl	%ebx						;\
+	  popl	%esi						;\
+	  popl	%edi						;\
+	.endif							;\
+	.if __framesize						;\
+	  movl	%ebp, %esp					;\
+	  popl	%ebp						;\
+	.endif							;\
+	ret
+#elif defined(__x86_64__)
+#define FUNCTION_EPILOGUE					\
+	.if __framesize						;\
+	  movq	%rbp, %rsp					;\
+	  popq	%rbp						;\
+	.endif							;\
+	ret
+#endif
+
+/*
+ * Macros for declaring procedures
+ *
+ * Use of these macros allows ctags to have a predictable way
+ * to find various types of declarations.  They also simplify
+ * inserting appropriate symbol table information.
+ *
+ * NOTE: these simple stubs will be replaced with more
+ * complicated versions once we know what the linker and gdb
+ * will require as far as register use masks and frame declarations.
+ * These macros may also be ifdef'ed in the future to contain profiling
+ * code.
+ *
+ */
+
+/*
+ * TEXT -- declare start of text segment
+ */
+#define	TEXT						\
+	.text
+
+/*
+ * DATA -- declare start of data segment
+ */
+#define DATA						\
+	.data
+
+/*
+ * LEAF -- declare global leaf procedure
+ * NOTE: Control SHOULD NOT FLOW into a LEAF!  A LEAF should only
+ * be jumped to.  (A leaf may do an align.)  Use a LABEL() if you
+ * need control to flow into the label.
+ */
+#define	LEAF(name, localvarsize)			\
+	.globl	name					;\
+	ALIGN						;\
+name:							;\
+	LEAF_FUNCTION_PROLOGUE(localvarsize)
+
+/*
+ * X_LEAF -- declare alternate global label for leaf
+ */
+#define	X_LEAF(name, value)				\
+	.globl	name					;\
+	.set	name,value
+
+/*
+ * P_LEAF -- declare private leaf procedure
+ */
+#define	P_LEAF(name, localvarsize)			\
+	ALIGN						;\
+name:							;\
+	LEAF_FUNCTION_PROLOGUE(localvarsize)
+
+/*
+ * LABEL -- declare a global code label
+ * MUST be used (rather than LEAF, NESTED, etc) if control
+ * "flows into" the label.
+ */
+#define	LABEL(name)					\
+	.globl	name					;\
+name:
+
+/*
+ * NESTED -- declare procedure that invokes other procedures
+ */
+#define	NESTED(name, localvarsize)			\
+	.globl	name					;\
+	ALIGN						;\
+name:							;\
+	NESTED_FUNCTION_PROLOGUE(localvarsize)
+
+/*
+ * X_NESTED -- declare alternate global label for nested proc
+ */
+#define	X_NESTED(name, value)				\
+	.globl	name					;\
+	.set	name,value
+
+/*
+ * P_NESTED -- declare private nested procedure
+ */
+#define	P_NESTED(name, localvarsize)			\
+	ALIGN						;\
+name:							;\
+	NESTED_FUNCTION_PROLOGUE(localvarsize)
+
+/*
+ * END -- mark end of procedure
+ */
+#define	END(name)					\
+	FUNCTION_EPILOGUE
+
+
+/*
+ * Storage definition macros
+ * The main purpose of these is to allow an easy handle for ctags
+ */
+
+/*
+ * IMPORT -- import symbol
+ */
+#define	IMPORT(name)					\
+	.reference	name
+
+/*
+ * ABS -- declare global absolute symbol
+ */
+#define	ABS(name, value)				\
+	.globl	name					;\
+	.set	name,value
+
+/*
+ * P_ABS -- declare private absolute symbol
+ */
+#define	P_ABS(name, value)				\
+	.set	name,value
+
+/*
+ * EXPORT -- declare global label for data
+ */
+#define	EXPORT(name)					\
+	.globl	name					;\
+name:
+
+/*
+ * BSS -- declare global zero'ed storage
+ */
+#define	BSS(name,size)					\
+	.comm	name,size
+
+
+/*
+ * P_BSS -- declare private zero'ed storage
+ */
+#define	P_BSS(name,size)				\
+	.lcomm	name,size
+
+/*
+ * dynamic/PIC macros for routines which reference external symbols
+ */
+
+#if defined(__DYNAMIC__)
+#if defined(__i386__)
+#define PICIFY(var)					\
+	call	1f					; \
+1:							; \
+	popl	%edx					; \
+	movl	L ## var ## __non_lazy_ptr-1b(%edx),%edx
+#elif defined(__x86_64__)
+#define PICIFY(var)					\
+	movq	var@GOTPCREL(%rip),%r11
+#endif
+
+#if defined(__i386__)
+#define CALL_EXTERN_AGAIN(func)	\
+	PICIFY(func)		; \
+	call	*%edx
+#elif defined(__x86_64__)
+#define CALL_EXTERN_AGAIN(func)	\
+	call	func
+#endif
+
+#if defined(__i386__)
+#define NON_LAZY_STUB(var)	\
+.section __IMPORT,__pointers,non_lazy_symbol_pointers	; \
+L ## var ## __non_lazy_ptr:	; \
+.indirect_symbol var		; \
+.long 0				; \
+.text
+#elif defined(__x86_64__)
+#define NON_LAZY_STUB(var)	
+#endif
+
+#define CALL_EXTERN(func)	\
+	CALL_EXTERN_AGAIN(func)	; \
+	NON_LAZY_STUB(func)
+
+#if defined(__i386__)
+#define BRANCH_EXTERN(func)	\
+	PICIFY(func)		; \
+	jmp	*%edx		; \
+	NON_LAZY_STUB(func)
+#elif defined(__x86_64__)
+#define BRANCH_EXTERN(func)	\
+	jmp	func
+#endif
+
+#if defined(__i386__)
+#define PUSH_EXTERN(var)	\
+	PICIFY(var)		; \
+	movl	(%edx),%edx	; \
+	pushl	%edx		; \
+	NON_LAZY_STUB(var)
+#endif
+
+#if defined(__i386__)
+#define REG_TO_EXTERN(reg, var)	\
+	PICIFY(var)		; \
+	movl	reg, (%edx)	; \
+	NON_LAZY_STUB(var)
+#elif defined(__x86_64__)
+#define REG_TO_EXTERN(reg, var)	\
+	PICIFY(var)		; \
+	mov		reg, (%r11)
+#endif
+
+#if defined(__i386__)
+#define EXTERN_TO_REG(var, reg)				\
+	call	1f					; \
+1:							; \
+	popl	%edx					; \
+	movl	L ## var ##__non_lazy_ptr-1b(%edx),reg	; \
+	NON_LAZY_STUB(var)
+#elif defined(__x86_64__)
+#define EXTERN_TO_REG(var, reg)				\
+	PICIFY(var)		; \
+	mov    (%r11), reg
+#endif
+
+#else
+#define BRANCH_EXTERN(func)	jmp	func
+#define PUSH_EXTERN(var)	push	var
+#define CALL_EXTERN(func)	call	func
+#define CALL_EXTERN_AGAIN(func)	call	func
+#if defined(__i386__)
+#define REG_TO_EXTERN(reg, var)	mov	reg, var
+#define EXTERN_TO_REG(var, reg)	mov	$ ## var, reg
+#elif defined(__x86_64__)
+#define REG_TO_EXTERN(reg, var)	mov	reg, var ## (%rip)
+#define EXTERN_TO_REG(var, reg)	mov	var ## (%rip), reg
+#endif
+#endif
+
+#endif	/* __ASSEMBLER__ */
+
+#endif	/* _ARCH_I386_ASM_HELP_H_ */
diff --git a/i386/include/architecture/i386/byte_order.h b/i386/include/architecture/i386/byte_order.h
new file mode 100644
index 0000000..60afd0f
--- /dev/null
+++ b/i386/include/architecture/i386/byte_order.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 1999-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _ARCH_I386_BYTE_ORDER_H_
+#define _ARCH_I386_BYTE_ORDER_H_
+
+/*
+ * Maintain source compatibility
+ */
+
+#include <architecture/byte_order.h>
+
+#endif	/* _ARCH_I386_BYTE_ORDER_H_ */
diff --git a/i386/include/architecture/i386/cpu.h b/i386/include/architecture/i386/cpu.h
new file mode 100644
index 0000000..c5fc807
--- /dev/null
+++ b/i386/include/architecture/i386/cpu.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ * Intel386 Family:	Special processor registers.
+ *
+ * HISTORY
+ *
+ * 5 April 1992 ? at NeXT
+ *	Created.
+ */
+
+#ifndef _ARCH_I386_CPU_H_
+#define _ARCH_I386_CPU_H_
+
+/*
+ * Control register 0
+ */
+ 
+typedef struct _cr0 {
+    unsigned int	pe	:1,
+    			mp	:1,
+			em	:1,
+			ts	:1,
+				:1,
+			ne	:1,
+				:10,
+			wp	:1,
+				:1,
+			am	:1,
+				:10,
+			nw	:1,
+			cd	:1,
+			pg	:1;
+} cr0_t;
+
+/*
+ * Debugging register 6
+ */
+
+typedef struct _dr6 {
+    unsigned int	b0	:1,
+    			b1	:1,
+			b2	:1,
+			b3	:1,
+				:9,
+			bd	:1,
+			bs	:1,
+			bt	:1,
+				:16;
+} dr6_t;
+
+#endif	/* _ARCH_I386_CPU_H_ */
diff --git a/i386/include/architecture/i386/desc.h b/i386/include/architecture/i386/desc.h
new file mode 100644
index 0000000..3997a8a
--- /dev/null
+++ b/i386/include/architecture/i386/desc.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ * Intel386 Family:	Segment descriptors.
+ *
+ * HISTORY
+ *
+ * 29 March 1992 ? at NeXT
+ *	Created.
+ */
+
+#ifndef _ARCH_I386_DESC_H_
+#define _ARCH_I386_DESC_H_
+
+/*
+ * Code segment descriptor.
+ */
+
+typedef struct code_desc {
+    unsigned short	limit00;
+    unsigned short	base00;
+    unsigned char	base16;
+    unsigned char	type	:5,
+#define DESC_CODE_EXEC	0x18
+#define DESC_CODE_READ	0x1a
+			dpl	:2,
+			present	:1;
+    unsigned char	limit16	:4,
+				:2,
+			opsz	:1,
+#define DESC_CODE_16B	0
+#define DESC_CODE_32B	1
+			granular:1;
+#define DESC_GRAN_BYTE	0
+#define DESC_GRAN_PAGE	1
+    unsigned char	base24;
+} code_desc_t;
+ 
+/*
+ * Data segment descriptor.
+ */
+
+typedef struct data_desc {
+    unsigned short	limit00;
+    unsigned short	base00;
+    unsigned char	base16;
+    unsigned char	type	:5,
+#define DESC_DATA_RONLY	0x10
+#define DESC_DATA_WRITE	0x12
+			dpl	:2,
+			present	:1;
+    unsigned char	limit16	:4,
+				:2,
+			stksz	:1,
+#define DESC_DATA_16B	0
+#define DESC_DATA_32B	1
+			granular:1;
+    unsigned char	base24;
+} data_desc_t;
+
+/*
+ * LDT segment descriptor.
+ */
+
+typedef struct ldt_desc {
+    unsigned short	limit00;
+    unsigned short	base00;
+    unsigned char	base16;
+    unsigned char	type	:5,
+#define DESC_LDT	0x02
+				:2,
+			present	:1;
+    unsigned char	limit16	:4,
+				:3,
+			granular:1;
+    unsigned char	base24;
+} ldt_desc_t;
+
+#include <architecture/i386/sel.h>
+
+/*
+ * Call gate descriptor.
+ */
+ 
+typedef struct call_gate {
+    unsigned short	offset00;
+    sel_t		seg;
+    unsigned int	argcnt	:5,
+    				:3,
+			type	:5,
+#define DESC_CALL_GATE	0x0c
+			dpl	:2,
+			present	:1,
+			offset16:16;
+} call_gate_t;
+
+/*
+ * Trap gate descriptor.
+ */
+ 
+typedef struct trap_gate {
+    unsigned short	offset00;
+    sel_t		seg;
+    unsigned int		:8,
+    			type	:5,
+#define DESC_TRAP_GATE	0x0f
+			dpl	:2,
+			present	:1,
+			offset16:16;
+} trap_gate_t;
+
+
+/*
+ * Interrupt gate descriptor.
+ */
+ 
+typedef struct intr_gate {
+    unsigned short	offset00;
+    sel_t		seg;
+    unsigned int		:8,
+    			type	:5,
+#define DESC_INTR_GATE	0x0e
+			dpl	:2,
+			present	:1,
+			offset16:16;
+} intr_gate_t;
+
+#endif	/* _ARCH_I386_DESC_H_ */
diff --git a/i386/include/architecture/i386/fenv.h b/i386/include/architecture/i386/fenv.h
new file mode 100644
index 0000000..9a50747
--- /dev/null
+++ b/i386/include/architecture/i386/fenv.h
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+/*******************************************************************************
+*                                                                              *
+*     File:  fenv.h	                                                       *
+*                                                                              *
+*     Contains: typedefs and prototypes for C99 floating point environment.    *
+*                                                                              *
+*******************************************************************************/
+
+#ifndef __FENV__
+#define __FENV__
+
+#if defined( __ppc__ ) || defined( __ppc64__ )
+    #error  Wrong arch. This is Intel only.
+#endif
+   
+#if defined(__GNUC__) && (__GNUC__ >= 4)   
+#pragma GCC fenv
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+    A collection of functions designed to provide access to the floating
+    point environment for numerical programming. It is compliant with
+    the floating-point requirements in C99.
+    
+    Earlier versions of fenv.h were merely "modeled after" C9X. Many of the functions 
+    that formerly returned ints now return void to be standard compliant.
+    
+    Note: There are actually two physical floating point environments on x86. There
+    is the one described by the x87 floating point control and status words, which applies 
+    primarily to calculations done with long double on MacOS X for Intel. There is the 
+    MXCSR which applies primarily to calculations done with scalar float, scalar double 
+    and SSE/SSE2/SSE3. The high level interface, which uses FE_ macros as int arguments 
+    to configure the fexcep_t, returns and works with values that represents the logical 
+    OR of these two sets of flags or masks. That is, if a flag or mask is set in either 
+    environment, it will be set in fexcept_t when the state is read. Likewise, setting 
+    the mask using a fexcep_t will set that mask on both environments. For this reason, 
+    changing the value of the MXCSR state or floating point control/status word state on 
+    your own will make the results of the functions declared in this header undefined. 
+    See below for details about how and when. Exception: you may change the FZ, DAZ, DE 
+    and DM bits in the MXCSR independent of this interface and retain defined behavior, 
+    so long as you do not change the other bits. It is suggested that developers who wish 
+    this level of control access the bits in the fenv_t directly. They are direct copies 
+    of the hardware special purpose registers of similar name. Please consult appropriate 
+    Intel documentation for the processor about the meaning of various bits in each register. 
+        
+    The file <fenv.h> declares many functions in support of numerical
+    programming. Programs that test flags or run under
+    non-default modes must do so under the effect of an enabling
+    "fenv_access" pragma.
+*/
+
+/********************************************************************************
+*                                                                               *
+*    fenv_t         is a type for representing the entire floating-point        *
+*                   environment in a single object.                             *
+*                                                                               *
+*    fexcept_t      is a type for representing the floating-point               *
+*                   exception flag state collectively.                          *
+*                                                                               *
+********************************************************************************/
+typedef struct {
+    unsigned short  __control;      /* A direct copy of the floaing point control word */
+    unsigned short  __status;       /* A direct copy of the floaing point status word */
+    unsigned int    __mxcsr;        /* A direct copy of the MXCSR */
+    char            __reserved[8];  /* Reserved for future expansion. */   
+} fenv_t;
+
+typedef unsigned short fexcept_t;
+
+/*    Definitions of floating-point exception macros                          */
+#define FE_INEXACT          0x0020
+#define FE_UNDERFLOW        0x0010
+#define FE_OVERFLOW         0x0008
+#define FE_DIVBYZERO        0x0004
+#define FE_INVALID          0x0001
+#define FE_ALL_EXCEPT       0x003D
+
+/*    Definitions of rounding direction macros                                */
+#define FE_TONEAREST        0x0000
+#define FE_DOWNWARD         0x0400
+#define FE_UPWARD           0x0800
+#define FE_TOWARDZERO       0x0C00
+
+/* default environment object        */
+extern const fenv_t _FE_DFL_ENV;
+#define FE_DFL_ENV &_FE_DFL_ENV          /* pointer to default environment    */
+
+/*******************************************************************************
+* A environment object that sets to defualt settings and in addition sets the  *
+* FZ and DAZ bits in the MXCSR, which causes flush-to-zero behavior of         *
+* denormals. When using this environment, denormals encountered by XMM based   *
+* calculation (which normally should be all single and double precision scalar *
+* floating point calculations, and all SSE/SSE2/SSE3 computation) will be      *
+* treated as zero. Calculation results that are denormals will also be         *
+* truncated to zero. This calculation mode is not IEEE-754 compliant, but may  *
+* prevent lengthy stalls that occur in code that encounters denormals. It is   *
+* suggested that you do not use this mode unless you have established that     *
+* denormals are causing trouble for your code. Please use wisely.              *
+*                                                                              *
+* CAUTION: The math library currently is not architected to do the right       *
+* thing in the face of DAZ + FZ mode.  For example, ceil( +denormal) returns   *
+* +denormal rather than 1.0 in some versions of MacOS X. In some circumstances *
+* this may lead to unexpected application behavior. Use at your own risk.      *
+*                                                                              *
+* It is not possible to disable denorm stalls on calculation using the x87 FPU.*
+*******************************************************************************/
+extern const fenv_t _FE_DFL_DISABLE_SSE_DENORMS_ENV;
+#define FE_DFL_DISABLE_SSE_DENORMS_ENV  &_FE_DFL_DISABLE_SSE_DENORMS_ENV
+
+/*******************************************************************************
+*     The following functions provide high level access to the exception flags.*  
+*     The "int" input argument can be constructed by bitwise ORs of the        *
+*     exception macros: for example: FE_OVERFLOW | FE_INEXACT.                 *
+*******************************************************************************/
+
+/*******************************************************************************
+*     The function "feclearexcept" clears the supported floating point         *
+*     exceptions represented by its argument.                                  *
+*******************************************************************************/
+
+extern int  feclearexcept(int /*excepts*/);
+
+
+/*******************************************************************************
+*    The function "fegetexceptflag" stores a implementation-defined            *
+*    representation of the states of the floating-point status flags indicated *
+*    by its integer argument excepts in the object pointed to by the argument, * 
+*    flagp.                                                                    *
+*******************************************************************************/
+
+extern int  fegetexceptflag(fexcept_t * /*flagp*/, int /*excepts*/);
+
+
+/*******************************************************************************
+*     The function "feraiseexcept" raises the supported floating-point         *
+*     exceptions represented by its argument. The order in which these         *
+*     floating-point exceptions are raised is unspecified.                     *
+*******************************************************************************/
+
+extern int  feraiseexcept(int /*excepts*/);
+
+
+/*******************************************************************************
+*     The function "fesetexceptflag" sets or clears the floating point status  *
+*     flags indicated by the argument excepts to the states stored in the      *
+*     object pointed to by flagp. The value of the *flagp shall have been set  *
+*     by a previous call to fegetexceptflag whose second argument represented  *
+*     at least those floating-point exceptions represented by the argument     *
+*     excepts. This function does not raise floating-point exceptions; it just *
+*     sets the state of the flags.                                             *
+*******************************************************************************/
+
+extern int  fesetexceptflag(const fexcept_t * /*flagp*/, int /*excepts*/);
+
+
+/*******************************************************************************
+*     The function "fetestexcept" determines which of the specified subset of  *
+*     the floating-point exception flags are currently set.  The excepts       *
+*     argument specifies the floating-point status flags to be queried. This   *
+*     function returns the value of the bitwise OR of the floating-point       *
+*     exception macros corresponding to the currently set floating-point       *
+*     exceptions included in excepts.                                          *
+*                                                                              *
+*     On MacOS X for Intel, the result is the value of union of the            *
+*     corresponding result from the x87 and SSE floating point states.         *
+*******************************************************************************/
+
+extern int  fetestexcept(int /*excepts*/);
+
+
+/*******************************************************************************
+*     The following functions provide control of rounding direction modes.     *
+*******************************************************************************/
+
+/*******************************************************************************
+*     The function "fegetround" returns the value of the rounding direction    *
+*     macro which represents the current rounding direction, or a negative     *
+*     if there is no such rounding direction macro or the current rounding     *
+*     direction is not determinable.                                           *
+*******************************************************************************/
+
+extern int  fegetround(void);
+
+
+/*******************************************************************************
+*     The function "fesetround" establishes the rounding direction represented *
+*     by its argument "round". If the argument is not equal to the value of a  *
+*     rounding direction macro, the rounding direction is not changed.  It     *
+*     returns zero if and only if the argument is equal to a rounding          *
+*     direction macro.                                                         *
+*******************************************************************************/
+
+extern int  fesetround(int /*round*/);
+
+
+/*******************************************************************************
+*    The following functions manage the floating-point environment, exception  *
+*    flags and dynamic modes, as one entity.                                   *
+*******************************************************************************/
+
+/*******************************************************************************
+*    The fegetenv function stores the current floating-point enviornment in    *
+*    the object pointed to by envp.                                            *
+*******************************************************************************/
+extern int  fegetenv(fenv_t * /*envp*/);
+
+/*******************************************************************************
+*    The feholdexcept function saves the current floating-point environment in *
+*    the object pointed to by envp, clears the floating-point status flags,    *
+*    and then installs a non-stop (continue on floating-point exceptions)      *
+*    mode, if available, for all floating-point exceptions. The feholdexcept   *
+*    function returns zero if and only if non-stop floating-point exceptions   *
+*    handling was successfully installed.                                      *
+*******************************************************************************/
+extern int   feholdexcept(fenv_t * /*envp*/);
+
+/*******************************************************************************
+*    The fesetnv function establishes the floating-point environment           *
+*    represented by the object pointed to by envp. The argument envp shall     *
+*    point to an object set by a call to fegetenv or feholdexcept, or equal to *
+*    a floating-point environment macro -- we define only *FE_DFL_ENV and      *
+*    FE_DISABLE_SSE_DENORMS_ENV -- to be C99 standard compliant and portable   *
+*    to other architectures. Note that fesetnv merely installs the state of    *
+*    the floating-point status flags represented through its argument, and     *
+*    does not raise these floating-point exceptions.                           *
+*                                                                              *
+*    On MacOS X for Intel you may test and set the bits in *envp yourself,     *
+*    provided that you conditionalize the code appropriately to preserve       *
+*    portability and you follow the various strictures and suggestions         *
+*    provided by Intel in appropriate processor documentation. Please be aware *
+*    that because there are two hardware locations for setting and reading     *
+*    floating point environment, this function (and others like it) are not    *
+*    atomic -- that is, for a brief period of time during the function call    *
+*    your new environment will have been applied to one but not both of the    *
+*    floating point engines (x87 and SSE). In addition, the behavior of some   *
+*    higher level interfaces (fegetround) is undefined if the x87 and SSE      *
+*    floating point units rounding modes are configured differently.  Please   *
+*    use common sense.                                                         *
+*******************************************************************************/
+extern int  fesetenv(const fenv_t * /*envp*/);
+
+/*******************************************************************************
+*    The feupdateenv function saves the currently raised floating-point        *
+*    exceptions in its automatic storage, installs the floating-point          *
+*    environment represented by the object pointed to by envp, and then raises *
+*    the saved floating-point exceptions. The argument envp shall point to an  *
+*    object set by a call to feholdexcept or fegetenv or equal a               *
+*    floating-point environment macro.                                         *
+*                                                                              *
+*    Please see the description of feholdexcept for additional ways to create  *
+*    a fenv_t object, which are valid only for MacOS X for Intel.              *
+*******************************************************************************/
+extern int  feupdateenv(const fenv_t * /*envp*/);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __FENV__ */
+
diff --git a/i386/include/architecture/i386/fpu.h b/i386/include/architecture/i386/fpu.h
new file mode 100644
index 0000000..29c260b
--- /dev/null
+++ b/i386/include/architecture/i386/fpu.h
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ * Intel386 Family:	Floating Point unit.
+ *
+ * HISTORY
+ *
+ * 5 October 1992 ? at NeXT
+ *	Added names to previously unamed fields in the mantissa.
+ *
+ * 5 April 1992 ? at NeXT
+ *	Created.
+ */
+
+#ifndef _ARCH_I386_FPU_H_
+#define _ARCH_I386_FPU_H_
+
+/*
+ * Data register.
+ */
+
+typedef struct fp_data_reg {
+    unsigned short		mant;
+    unsigned short		mant1	:16,
+				mant2	:16,
+				mant3	:16;
+    unsigned short		exp	:15,
+			    	sign	:1;
+} fp_data_reg_t;
+
+/*
+ * Data register stack.
+ */
+
+typedef struct fp_stack {
+    fp_data_reg_t		ST[8];
+} fp_stack_t;
+
+/*
+ * Register stack tag word.
+ */
+
+typedef struct fp_tag {
+    unsigned short		tag0	:2,
+    				tag1	:2,
+				tag2	:2,
+				tag3	:2,
+    				tag4	:2,
+				tag5	:2,
+				tag6	:2,
+				tag7	:2;
+#define FP_TAG_VALID		0
+#define FP_TAG_ZERO		1
+#define FP_TAG_SPEC		2
+#define FP_TAG_EMPTY		3
+} fp_tag_t;
+
+/*
+ * Status word.
+ */
+
+typedef struct fp_status {
+    unsigned short		invalid	:1,
+    				denorm	:1,
+				zdiv	:1,
+				ovrfl	:1,
+				undfl	:1,
+				precis	:1,
+				stkflt	:1,
+				errsumm	:1,
+				c0	:1,
+				c1	:1,
+				c2	:1,
+				tos	:3,
+				c3	:1,
+				busy	:1;
+} fp_status_t;
+
+/*
+ * Control word.
+ */
+
+typedef struct fp_control {
+    unsigned short		invalid	:1,
+    				denorm	:1,
+				zdiv	:1,
+				ovrfl	:1,
+				undfl	:1,
+				precis	:1,
+					:2,
+				pc	:2,
+#define FP_PREC_24B		0
+#define	FP_PREC_53B		2
+#define FP_PREC_64B		3
+				rc	:2,
+#define FP_RND_NEAR		0
+#define FP_RND_DOWN		1
+#define FP_RND_UP		2
+#define FP_CHOP			3
+				/*inf*/	:1,
+					:3;
+} fp_control_t;
+
+#include <architecture/i386/sel.h>
+
+/*
+ * Floating point 'environment'
+ * used by FSTENV/FLDENV instructions.
+ */
+
+typedef struct fp_env {
+    fp_control_t		control;
+    unsigned short			:16;
+    fp_status_t			status;
+    unsigned short			:16;
+    fp_tag_t			tag;
+    unsigned short			:16;
+    unsigned int		ip;
+    sel_t			cs;
+    unsigned short		opcode;
+    unsigned int		dp;
+    sel_t			ds;
+    unsigned short			:16;
+} fp_env_t;
+
+/*
+ * Floating point state
+ * used by FSAVE/FRSTOR instructions.
+ */
+ 
+/*
+ * To allow the the common idiom of:
+ *     #define environ (*_NSGetEnviron())
+ * to be used these fields were renamed.  Old code that that does
+ * not use this idiom can use the old field names by defining
+ * _ARCHITECTURE_I386_FPU_FPSTATE_LEGACY_FIELD_NAMES_ .
+ */
+typedef struct fp_state {
+#if _ARCHITECTURE_I386_FPU_FPSTATE_LEGACY_FIELD_NAMES_
+    fp_env_t			environ;
+    fp_stack_t			stack;
+#else
+    fp_env_t			fp_environ;
+    fp_stack_t			fp_stack;
+#endif
+} fp_state_t;
+
+#endif	/* _ARCH_I386_FPU_H_ */
diff --git a/i386/include/architecture/i386/frame.h b/i386/include/architecture/i386/frame.h
new file mode 100644
index 0000000..112cbcd
--- /dev/null
+++ b/i386/include/architecture/i386/frame.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ * Intel386 Family:	Processor exception frame.
+ *
+ * HISTORY
+ *
+ * 31 August 1992 ? at NeXT
+ *	Added v86 mode stuff.
+ *
+ * 8 June 1992 ? at NeXT
+ *	Changed name of write field in err_code_t
+ *	which collided with write() in shlib.
+ *
+ * 30 March 1992 ? at NeXT
+ *	Created.
+ */
+
+#ifndef _ARCH_I386_FRAME_H_
+#define _ARCH_I386_FRAME_H_
+
+/*
+ * Format of the error code
+ * generated by the hardware
+ * for certain exceptions.
+ */
+ 
+typedef union err_code {
+    struct err_code_normal {
+	unsigned int	ext	:1,
+			tbl	:2,
+#define ERR_GDT		0
+#define ERR_IDT		1
+#define ERR_LDT		2
+			index	:13,
+				:16;
+    } normal;
+    struct err_code_pgfault {
+	unsigned int	prot	:1,
+			wrtflt	:1,
+			user	:1,
+				:29;
+    } pgfault;
+} err_code_t;
+
+#include <architecture/i386/sel.h>
+
+/*
+ * The actual hardware exception frame
+ * is variable in size.  An error code is
+ * only pushed for certain exceptions.
+ * Previous stack information is only
+ * pushed for exceptions that cause a
+ * change in privilege level.  The dpl
+ * field of the saved CS selector can be
+ * used to determine whether this is the
+ * case.  If the interrupted task was
+ * executing in v86 mode, then the data
+ * segment registers are also present in
+ * the exception frame (in addition to
+ * previous stack information).  This
+ * case can be determined by examining
+ * eflags.
+ */
+
+typedef struct except_frame {
+    err_code_t		err;
+    unsigned int	eip;
+    sel_t		cs;
+    unsigned int		:0;
+    unsigned int	eflags;
+    unsigned int	esp;
+    sel_t		ss;
+    unsigned int		:0;
+    unsigned short	v_es;
+    unsigned int		:0;
+    unsigned short	v_ds;
+    unsigned int		:0;
+    unsigned short	v_fs;
+    unsigned int		:0;
+    unsigned short	v_gs;
+    unsigned int		:0;
+} except_frame_t;
+
+/*
+ * Values in eflags.
+ */
+
+#define EFL_CF		0x00001
+#define EFL_PF		0x00004
+#define EFL_AF		0x00010
+#define EFL_ZF		0x00040
+#define EFL_SF		0x00080
+#define EFL_TF		0x00100
+#define EFL_IF		0x00200
+#define EFL_DF		0x00400
+#define EFL_OF		0x00800
+#define EFL_IOPL	0x03000
+#define EFL_NT		0x04000
+#define EFL_RF		0x10000
+#define EFL_VM		0x20000
+#define EFL_AC		0x40000
+
+#define EFL_CLR		0xfff88028
+#define EFL_SET		0x00000002
+
+#endif	/* _ARCH_I386_FRAME_H_ */
diff --git a/i386/include/architecture/i386/io.h b/i386/include/architecture/i386/io.h
new file mode 100644
index 0000000..07021a1
--- /dev/null
+++ b/i386/include/architecture/i386/io.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ * Intel 386 Family: IO space defines.
+ *
+ * HISTORY
+ *
+ * 11 August 1992 ? at NeXT
+ *	Created.
+ */
+
+#ifndef _ARCH_I386_IO_H_
+#define _ARCH_I386_IO_H_
+
+typedef unsigned short		io_addr_t;
+typedef unsigned short		io_len_t;
+
+#endif	/* _ARCH_I386_IO_H_ */
diff --git a/i386/include/architecture/i386/math.h b/i386/include/architecture/i386/math.h
new file mode 100644
index 0000000..6723ef4
--- /dev/null
+++ b/i386/include/architecture/i386/math.h
@@ -0,0 +1,642 @@
+/*
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+/*******************************************************************************
+*                                                                              *
+*     File:  math.h	                                                       *
+*                                                                              *
+*     Contains: typedefs, prototypes, and macros germane to C99 floating point.*
+*                                                                              *
+*******************************************************************************/
+#ifndef __MATH__
+#define __MATH__
+
+#include "sys/cdefs.h" /* For definition of __DARWIN_UNIX03 et al */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/******************************************************************************
+*       Floating point data types                                             *
+******************************************************************************/
+
+/*	Define float_t and double_t per C standard, ISO/IEC 9899:1999 7.12 2,
+	taking advantage of GCC's __FLT_EVAL_METHOD__ (which a compiler may
+	define anytime and GCC does) that shadows FLT_EVAL_METHOD (which a compiler
+	must and may define only in float.h).
+*/
+#if __FLT_EVAL_METHOD__ == 0
+	typedef float float_t;
+	typedef double double_t;
+#elif __FLT_EVAL_METHOD__ == 1
+	typedef double float_t;
+	typedef double double_t;
+#elif __FLT_EVAL_METHOD__ == 2 || __FLT_EVAL_METHOD__ == -1
+	typedef long double float_t;
+	typedef long double double_t;
+#else /* __FLT_EVAL_METHOD__ */
+	#error "Unsupported value of __FLT_EVAL_METHOD__."
+#endif /* __FLT_EVAL_METHOD__ */
+
+
+#if defined(__GNUC__)
+	#define	HUGE_VAL	__builtin_huge_val()
+	#define	HUGE_VALF	__builtin_huge_valf()
+	#define	HUGE_VALL	__builtin_huge_vall()
+    #define NAN         __builtin_nanf("0x7fc00000") /* Constant expression, can be used as initializer. */
+    #define __MATH_H_ALWAYS_INLINE__		__attribute__ ((always_inline))
+#else
+    #define	HUGE_VAL	1e500
+    #define	HUGE_VALF	1e50f
+    #define	HUGE_VALL	1e5000L
+    #define NAN		__nan( )
+    #define __MATH_H_ALWAYS_INLINE__
+#endif
+
+#define INFINITY	HUGE_VALF
+
+
+/******************************************************************************
+*      Taxonomy of floating point data types                                  *
+******************************************************************************/
+
+#define FP_NAN          1
+#define FP_INFINITE     2
+#define FP_ZERO         3
+#define FP_NORMAL       4
+#define FP_SUBNORMAL    5
+#define FP_SUPERNORMAL  6 /* meaningful only on PowerPC */
+
+/* fma() *function call* is more costly than equivalent (in-line) multiply and add operations    */
+/* For single and double precision, the cost isn't too bad, because we can fall back on higher   */
+/* precision hardware, with the necessary range to handle infinite precision products. However,  */
+/* expect the long double fma to be at least an order of magnitude slower than a simple multiply */
+/* and an add.                                                                                   */
+#undef FP_FAST_FMA
+#undef FP_FAST_FMAF
+#undef FP_FAST_FMAL
+
+/* The values returned by `ilogb' for 0 and NaN respectively. */
+#define FP_ILOGB0	(-2147483647 - 1)
+#define FP_ILOGBNAN	(-2147483647 - 1)
+
+/* Bitmasks for the math_errhandling macro.  */
+#define MATH_ERRNO	1	/* errno set by math functions.  */
+#define MATH_ERREXCEPT	2	/* Exceptions raised by math functions.  */
+
+#define math_errhandling (__math_errhandling())
+extern unsigned int __math_errhandling ( void );
+
+/********************************************************************************
+*                                                                               *
+*                              Inquiry macros                                   *
+*                                                                               *
+*   fpclassify      Returns one of the FP_Å values.                             *
+*   isnormal        Non-zero if and only if the argument x is normalized.       *
+*   isfinite        Non-zero if and only if the argument x is finite.           *
+*   isnan           Non-zero if and only if the argument x is a NaN.            *
+*   signbit         Non-zero if and only if the sign of the argument x is       *
+*                   negative.  This includes, NaNs, infinities and zeros.       *
+*                                                                               *
+********************************************************************************/
+
+#define fpclassify(x)	\
+	(	sizeof (x) == sizeof(float )	?	__fpclassifyf((float)(x))	\
+	:	sizeof (x) == sizeof(double)	?	__fpclassifyd((double)(x))	\
+										:	__fpclassify ((long double)(x)))
+
+extern int __fpclassifyf(float      );
+extern int __fpclassifyd(double     );
+extern int __fpclassify (long double);
+
+#if defined( __GNUC__ ) && 0 == __FINITE_MATH_ONLY__ 
+    /*  Yes, that's right. You only get the fast iswhatever() macros if you do NOT turn on -ffast-math.  */
+    /*  These inline functions require the compiler to be compiling to standard in order to work.        */
+    /*  -ffast-math, among other things, implies that NaNs don't happen. The compiler can in that case   */
+    /*  optimize x != x to be false always, wheras it would be true for NaNs. That breaks __inline_isnan() */
+    /*  below.                                                                                           */
+	#define isnormal(x)	\
+		(	sizeof (x) == sizeof(float )	?	__inline_isnormalf((float)(x))	\
+		:	sizeof (x) == sizeof(double)	?	__inline_isnormald((double)(x))	\
+											:	__inline_isnormal ((long double)(x)))
+
+	#define isfinite(x)	\
+		(	sizeof (x) == sizeof(float )	?	__inline_isfinitef((float)(x))	\
+		:	sizeof (x) == sizeof(double)	?	__inline_isfinited((double)(x))	\
+											:	__inline_isfinite ((long double)(x)))
+
+	#define isinf(x)	\
+		(	sizeof (x) == sizeof(float )	?	__inline_isinff((float)(x))	\
+		:	sizeof (x) == sizeof(double)	?	__inline_isinfd((double)(x))	\
+											:	__inline_isinf ((long double)(x)))
+
+	#define isnan(x)	\
+		(	sizeof (x) == sizeof(float )	?	__inline_isnanf((float)(x))	\
+		:	sizeof (x) == sizeof(double)	?	__inline_isnand((double)(x))	\
+											:	__inline_isnan ((long double)(x)))
+
+	#define signbit(x)	\
+		(	sizeof (x) == sizeof(float )	?	__inline_signbitf((float)(x))	\
+		:	sizeof (x) == sizeof(double)	?	__inline_signbitd((double)(x))	\
+											:	__inline_signbit((long double)(x)))
+
+	static __inline__  int __inline_isfinitef	(float      ) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isfinited	(double     ) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isfinite	(long double) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isinff		(float      ) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isinfd		(double     ) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isinf		(long double) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isnanf		(float      ) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isnand		(double     ) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isnan		(long double) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isnormalf    (float      ) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isnormald    (double     ) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_isnormal     (long double) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_signbitf     (float      ) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_signbitd     (double     ) __MATH_H_ALWAYS_INLINE__;
+	static __inline__  int __inline_signbit      (long double) __MATH_H_ALWAYS_INLINE__;
+	
+	static __inline__  int __inline_isinff( float __x ) { return __builtin_fabsf(__x) == __builtin_inff(); }
+	static __inline__  int __inline_isinfd( double __x ) { return __builtin_fabs(__x) == __builtin_inf(); }
+	static __inline__  int __inline_isinf( long double __x ) { return __builtin_fabsl(__x) == __builtin_infl(); }
+	static __inline__  int __inline_isfinitef( float __x ) { return __x == __x && __builtin_fabsf(__x) != __builtin_inff(); }
+	static __inline__  int __inline_isfinited( double __x ) { return __x == __x && __builtin_fabs(__x) != __builtin_inf(); }
+	static __inline__  int __inline_isfinite( long double __x ) { return __x == __x && __builtin_fabsl(__x) != __builtin_infl(); }
+	static __inline__  int __inline_isnanf( float __x ) { return __x != __x; }
+	static __inline__  int __inline_isnand( double __x ) { return __x != __x; }
+	static __inline__  int __inline_isnan( long double __x ) { return __x != __x; }
+	static __inline__  int __inline_signbitf( float __x ) { union{ float __f; unsigned int __u; }__u; __u.__f = __x; return (int)(__u.__u >> 31); }
+	static __inline__  int __inline_signbitd( double __x ) { union{ double __f; unsigned int __u[2]; }__u; __u.__f = __x; return (int)(__u.__u[1] >> 31); }
+	static __inline__  int __inline_signbit( long double __x ){ union{ long double __ld; struct{ unsigned int __m[2]; short __sexp; }__p; }__u; __u.__ld = __x; return (int) (((unsigned short) __u.__p.__sexp) >> 15); } 
+	static __inline__  int __inline_isnormalf( float __x ) { float fabsf = __builtin_fabsf(__x); if( __x != __x ) return 0; return fabsf < __builtin_inff() && fabsf >= __FLT_MIN__; }  
+	static __inline__  int __inline_isnormald( double __x ) { double fabsf = __builtin_fabs(__x); if( __x != __x ) return 0; return fabsf < __builtin_inf() && fabsf >= __DBL_MIN__; }  
+	static __inline__  int __inline_isnormal( long double __x ) { long double fabsf = __builtin_fabsl(__x); if( __x != __x ) return 0; return fabsf < __builtin_infl() && fabsf >= __LDBL_MIN__; }  
+	
+#else
+
+	#define isnormal(x)	\
+		(	sizeof (x) == sizeof(float )	?	__isnormalf((float)(x))	\
+		:	sizeof (x) == sizeof(double)	?	__isnormald((double)(x))	\
+											:	__isnormal ((long double)(x)))
+
+	#define isfinite(x)	\
+		(	sizeof (x) == sizeof(float )	?	__isfinitef((float)(x))	\
+		:	sizeof (x) == sizeof(double)	?	__isfinited((double)(x))	\
+											:	__isfinite ((long double)(x)))
+
+	#define isinf(x)	\
+		(	sizeof (x) == sizeof(float )	?	__isinff((float)(x))	\
+		:	sizeof (x) == sizeof(double)	?	__isinfd((double)(x))	\
+											:	__isinf ((long double)(x)))
+
+	#define isnan(x)	\
+		(	sizeof (x) == sizeof(float )	?	__isnanf((float)(x))	\
+		:	sizeof (x) == sizeof(double)	?	__isnand((double)(x))	\
+											:	__isnan ((long double)(x)))
+
+	#define signbit(x)	\
+		(	sizeof (x) == sizeof(float )	?	__signbitf((float)(x))	\
+		:	sizeof (x) == sizeof(double)	?	__signbitd((double)(x))	\
+											:	__signbitl((long double)(x)))
+
+
+	extern int __isnormalf  (float      );
+	extern int __isnormald  (double     );
+	extern int __isnormal   (long double);
+
+	extern int __isfinitef  (float      );
+	extern int __isfinited  (double     );
+	extern int __isfinite   (long double);
+
+	extern int __isinff     (float      );
+	extern int __isinfd     (double     );
+	extern int __isinf      (long double);
+
+	extern int __isnanf     (float      );
+	extern int __isnand     (double     );
+	extern int __isnan      (long double);
+
+	extern int __signbitf   (float      );
+	extern int __signbitd   (double     );
+	extern int __signbitl   (long double);
+
+#endif
+
+
+
+/********************************************************************************
+*                                                                               *
+*                              Math Functions                                   *
+*                                                                               *
+********************************************************************************/
+
+extern double  acos( double );
+extern float  acosf( float );
+
+extern double  asin( double );
+extern float  asinf( float );
+
+extern double  atan( double );
+extern float  atanf( float );
+
+extern double  atan2( double, double );
+extern float  atan2f( float, float );
+
+extern double  cos( double );
+extern float  cosf( float );
+
+extern double  sin( double );
+extern float  sinf( float );
+
+extern double  tan( double );
+extern float  tanf( float );
+
+extern double  acosh( double );
+extern float  acoshf( float );
+
+extern double  asinh( double );
+extern float  asinhf( float );
+
+extern double  atanh( double );
+extern float  atanhf( float );
+
+extern double  cosh( double );
+extern float  coshf( float );
+
+extern double  sinh( double );
+extern float  sinhf( float );
+
+extern double  tanh( double );
+extern float  tanhf( float );
+
+extern double exp ( double );
+extern float expf ( float );
+
+extern double exp2 ( double ); 
+extern float exp2f ( float );
+
+extern double expm1 ( double ); 
+extern float expm1f ( float );
+
+extern double log ( double );
+extern float logf ( float );
+
+extern double log10 ( double );
+extern float log10f ( float );
+
+extern double log2 ( double );
+extern float log2f ( float );
+
+extern double log1p ( double );
+extern float log1pf ( float );
+
+extern double logb ( double );
+extern float logbf ( float );
+
+extern double modf ( double, double * );
+extern float modff ( float, float * );
+
+extern double ldexp ( double, int );
+extern float ldexpf ( float, int );
+
+extern double frexp ( double, int * );
+extern float frexpf ( float, int * );
+
+extern int ilogb ( double );
+extern int ilogbf ( float );
+
+extern double scalbn ( double, int );
+extern float scalbnf ( float, int );
+
+extern double scalbln ( double, long int );
+extern float scalblnf ( float, long int );
+
+extern double  fabs( double );
+extern float  fabsf( float );
+
+extern double  cbrt( double );
+extern float  cbrtf( float );
+
+extern double hypot ( double, double );
+extern float hypotf ( float, float );
+
+extern double pow ( double, double );
+extern float powf ( float, float );
+
+extern double  sqrt( double );
+extern float  sqrtf( float );
+
+extern double  erf( double );
+extern float  erff( float );
+
+extern double  erfc( double );
+extern float  erfcf( float );
+
+/*	lgamma and lgammaf are not thread-safe.  The thread-safe variants
+ *	lgamma_r and lgammaf_r are available on OS X 10.6 and later.
+ *
+ *	To use the thread-safe variants, you must define the _REENTRANT symbol.
+ */
+extern double  lgamma( double );
+extern float  lgammaf( float );
+
+extern double  tgamma( double );
+extern float  tgammaf( float );
+
+extern double ceil ( double );
+extern float ceilf ( float );
+
+extern double floor ( double );
+extern float floorf ( float );
+
+extern double nearbyint ( double );
+extern float nearbyintf ( float );
+
+extern double rint ( double );
+extern float rintf ( float );
+
+extern long int lrint ( double );
+extern long int lrintf ( float );
+
+extern double round ( double );
+extern float roundf ( float );
+
+extern long int lround ( double );
+extern long int lroundf ( float );
+
+#if ( defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ) || ! defined( __STRICT_ANSI__ )  || ! defined( __GNUC__ )
+
+    /* long long is not part of C90. Make sure you are passing -std=c99 or -std=gnu99 or better if you need this. */
+    extern long long int llrint ( double );
+    extern long long int llrintf ( float );
+
+    extern long long int llround ( double );
+    extern long long int llroundf ( float );
+
+#endif /* #if ( defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ) || ! defined( __STRICT_ANSI__ )  || ! defined( __GNUC__ ) */
+
+extern double trunc ( double );
+extern float truncf ( float );
+
+extern double fmod ( double, double );
+extern float fmodf ( float, float );
+
+extern double remainder ( double, double );
+extern float remainderf ( float, float );
+
+extern double remquo ( double, double, int * );
+extern float remquof ( float, float, int * );
+
+extern double copysign ( double, double );
+extern float copysignf ( float, float );
+
+extern double nan( const char * );
+extern float nanf( const char * );
+
+extern double nextafter ( double, double );
+extern float nextafterf ( float, float );
+
+extern double fdim ( double, double );
+extern float fdimf ( float, float );
+
+extern double fmax ( double, double );
+extern float fmaxf ( float, float );
+
+extern double fmin ( double, double );
+extern float fminf ( float, float );
+
+extern double fma ( double, double, double );
+extern float fmaf ( float, float, float );
+
+extern long double acosl(long double);
+extern long double asinl(long double);
+extern long double atanl(long double);
+extern long double atan2l(long double, long double);
+extern long double cosl(long double);
+extern long double sinl(long double);
+extern long double tanl(long double);
+extern long double acoshl(long double);
+extern long double asinhl(long double);
+extern long double atanhl(long double);
+extern long double coshl(long double);
+extern long double sinhl(long double);
+extern long double tanhl(long double);
+extern long double expl(long double);
+extern long double exp2l(long double);
+extern long double expm1l(long double);
+extern long double logl(long double);
+extern long double log10l(long double);
+extern long double log2l(long double);
+extern long double log1pl(long double);
+extern long double logbl(long double);
+extern long double modfl(long double, long double *);
+extern long double ldexpl(long double, int);
+extern long double frexpl(long double, int *);
+extern int ilogbl(long double);
+extern long double scalbnl(long double, int);
+extern long double scalblnl(long double, long int);
+extern long double fabsl(long double);
+extern long double cbrtl(long double);
+extern long double hypotl(long double, long double);
+extern long double powl(long double, long double);
+extern long double sqrtl(long double);
+extern long double erfl(long double);
+extern long double erfcl(long double);
+	
+/*	lgammal is not thread-safe.
+ *	The thread-safe variant lgammal_r is available on OS X 10.6 and later.
+ *
+ *	To use the thread-safe variant, you must define the _REENTRANT symbol.
+ */
+extern long double lgammal(long double);
+	
+extern long double tgammal(long double);
+extern long double ceill(long double);
+extern long double floorl(long double);
+extern long double nearbyintl(long double);
+extern long double rintl(long double);
+extern long int lrintl(long double);
+extern long double roundl(long double);
+extern long int lroundl(long double);
+
+#if ( defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ) || ! defined( __STRICT_ANSI__ )  || ! defined( __GNUC__ )
+    /* long long is not part of C90. Make sure you are passing -std=c99 or -std=gnu99 or better if you need this. */
+    extern long long int llrintl(long double);
+    extern long long int llroundl(long double);
+#endif /* #if ( defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ) || ! defined( __STRICT_ANSI__ )  || ! defined( __GNUC__ ) */
+
+extern long double truncl(long double);
+extern long double fmodl(long double, long double);
+extern long double remainderl(long double, long double);
+extern long double remquol(long double, long double, int *);
+extern long double copysignl(long double, long double);
+extern long double nanl(const char *);
+extern long double nextafterl(long double, long double);
+extern double nexttoward(double, long double);
+extern float nexttowardf(float, long double);
+extern long double nexttowardl(long double, long double);
+extern long double fdiml(long double, long double);
+extern long double fmaxl(long double, long double);
+extern long double fminl(long double, long double);
+extern long double fmal(long double, long double, long double);
+
+#define isgreater(x, y) __builtin_isgreater ((x),(y))
+#define isgreaterequal(x, y) __builtin_isgreaterequal ((x),(y))
+#define isless(x, y) __builtin_isless ((x),(y))
+#define islessequal(x, y) __builtin_islessequal ((x),(y))
+#define islessgreater(x, y) __builtin_islessgreater ((x),(y))
+#define isunordered(x, y) __builtin_isunordered ((x),(y))
+
+extern double  		__inf( void );
+extern float  		__inff( void );
+extern long double  __infl( void );
+extern float  		__nan( void ); /* 10.3 (and later) must retain in ABI for backward compatability */
+
+#if !defined(_ANSI_SOURCE)
+extern double j0 ( double );
+
+extern double j1 ( double );
+
+extern double jn ( int, double );
+
+extern double y0 ( double );
+
+extern double y1 ( double );
+
+extern double yn ( int, double );
+
+extern double scalb ( double, double ); 
+
+
+#define M_E         2.71828182845904523536028747135266250   /* e */
+#define M_LOG2E     1.44269504088896340735992468100189214   /* log 2e */
+#define M_LOG10E    0.434294481903251827651128918916605082  /* log 10e */
+#define M_LN2       0.693147180559945309417232121458176568  /* log e2 */
+#define M_LN10      2.30258509299404568401799145468436421   /* log e10 */
+#define M_PI        3.14159265358979323846264338327950288   /* pi */
+#define M_PI_2      1.57079632679489661923132169163975144   /* pi/2 */
+#define M_PI_4      0.785398163397448309615660845819875721  /* pi/4 */
+#define M_1_PI      0.318309886183790671537767526745028724  /* 1/pi */
+#define M_2_PI      0.636619772367581343075535053490057448  /* 2/pi */
+#define M_2_SQRTPI  1.12837916709551257389615890312154517   /* 2/sqrt(pi) */
+#define M_SQRT2     1.41421356237309504880168872420969808   /* sqrt(2) */
+#define M_SQRT1_2   0.707106781186547524400844362104849039  /* 1/sqrt(2) */
+
+#define	MAXFLOAT	((float)3.40282346638528860e+38)
+extern int signgam;     /* required for unix 2003 */
+
+
+#endif /* !defined(_ANSI_SOURCE) */
+
+#if !defined(__NOEXTENSIONS__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+#define __WANT_EXTENSIONS__
+#endif
+
+#ifdef __WANT_EXTENSIONS__
+
+#define FP_SNAN		FP_NAN
+#define FP_QNAN		FP_NAN
+
+extern long int rinttol ( double );		/* Legacy API: please use C99 lrint() instead. */
+
+extern long int roundtol ( double );	/* Legacy API: please use C99 lround() instead. */
+
+/*
+ * XOPEN/SVID
+ */
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+#if (!defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE))
+#if !defined(__cplusplus)
+/* used by matherr below */
+struct exception {
+	int type;
+	char *name;
+	double arg1;
+	double arg2;
+	double retval;
+};
+#endif
+
+#define	HUGE		MAXFLOAT
+
+/* 
+ * set X_TLOSS = pi*2**52, which is possibly defined in <values.h>
+ * (one may replace the following line by "#include <values.h>")
+ */
+
+#define X_TLOSS		1.41484755040568800000e+16 
+
+#define	DOMAIN		1
+#define	SING		2
+#define	OVERFLOW	3
+#define	UNDERFLOW	4
+#define	TLOSS		5
+#define	PLOSS		6
+
+#endif /* (!_XOPEN_SOURCE || _DARWIN_C_SOURCE) */
+#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+#if !defined( __STRICT_ANSI__) && !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+extern int finite ( double );			/* Legacy API: please use C99 isfinite() instead. */
+
+extern double gamma ( double );			/* Legacy API: please use C99 tgamma() instead. */
+
+#if (!defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE))
+
+#if !defined(__cplusplus)
+extern int matherr ( struct exception * );
+#endif
+
+/*
+ * IEEE Test Vector
+ */
+extern double significand ( double );
+
+/*
+ * BSD math library entry points
+ */
+extern double drem ( double, double );	/* Legacy API: please use C99 remainder() instead. */
+	
+/*
+ * Reentrant version of lgamma; passes signgam back by reference
+ * as the second argument; user must allocate space for signgam.
+ */
+	
+#ifdef _REENTRANT
+	#include <AvailabilityMacros.h>
+	// Available on OS X 10.6 and later.
+	extern float  lgammaf_r ( float, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER;
+	extern double lgamma_r ( double, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER;
+	extern long double lgammal_r ( long double, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER;
+#endif /* _REENTRANT */
+	
+#endif /* (!_XOPEN_SOURCE || _DARWIN_C_SOURCE) */
+#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+#endif /* __WANT_EXTENSIONS__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MATH__ */
diff --git a/i386/include/architecture/i386/pio.h b/i386/include/architecture/i386/pio.h
new file mode 100644
index 0000000..338f158
--- /dev/null
+++ b/i386/include/architecture/i386/pio.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/* 
+ */
+#ifndef _ARCH_I386_PIO_H_
+#define _ARCH_I386_PIO_H_
+
+typedef unsigned short i386_ioport_t;
+
+#if defined(__GNUC__)
+static __inline__ unsigned long	inl(
+				i386_ioport_t port)
+{
+	unsigned long datum;
+	__asm__ volatile("inl %w1, %0" : "=a" (datum) : "Nd" (port));
+	return(datum);
+}
+
+static __inline__ unsigned short inw(
+				i386_ioport_t port)
+{
+	unsigned short datum;
+	__asm__ volatile("inw %w1, %w0" : "=a" (datum) : "Nd" (port));
+	return(datum);
+}
+
+static __inline__ unsigned char inb(
+				i386_ioport_t port)
+{
+	unsigned char datum;
+	__asm__ volatile("inb %w1, %b0" : "=a" (datum) : "Nd" (port));
+	return(datum);
+}
+
+static __inline__ void outl(
+				i386_ioport_t port,
+				unsigned long datum)
+{
+	__asm__ volatile("outl %0, %w1" : : "a" (datum), "Nd" (port));
+}
+
+static __inline__ void outw(
+				i386_ioport_t port,
+				unsigned short datum)
+{
+	__asm__ volatile("outw %w0, %w1" : : "a" (datum), "Nd" (port));
+}
+
+static __inline__ void outb(
+				i386_ioport_t port,
+				unsigned char datum)
+{
+	__asm__ volatile("outb %b0, %w1" : : "a" (datum), "Nd" (port));
+}
+#endif /* defined(__GNUC__) */
+#endif /* _ARCH_I386_PIO_H_ */
diff --git a/i386/include/architecture/i386/reg_help.h b/i386/include/architecture/i386/reg_help.h
new file mode 100644
index 0000000..98c18c5
--- /dev/null
+++ b/i386/include/architecture/i386/reg_help.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1991 NeXT Computer, Inc.  All rights reserved.
+ *
+ *	File:	architecture/i386/reg_help.h
+ *	Author:	Mike DeMoney, NeXT Computer, Inc.
+ *      Modified for i386 by: Bruce Martin, NeXT Computer, Inc.
+ *
+ *	This header file defines cpp macros useful for defining
+ *	machine register and doing machine-level operations.
+ *
+ * HISTORY
+ * 10-Mar-92  Bruce Martin (bmartin@next.com)
+ *	Adapted to i386
+ * 23-Jan-91  Mike DeMoney (mike@next.com)
+ *	Created.
+ */
+
+#ifndef	_ARCH_I386_REG_HELP_H_
+#define	_ARCH_I386_REG_HELP_H_
+
+/* Bitfield definition aid */
+#define	BITS_WIDTH(msb, lsb)	((msb)-(lsb)+1)
+#define	BIT_WIDTH(pos)		(1)	/* mostly to record the position */
+
+/* Mask creation */
+#define	MKMASK(width, offset)	(((unsigned)-1)>>(32-(width))<<(offset))
+#define	BITSMASK(msb, lsb)	MKMASK(BITS_WIDTH(msb, lsb), lsb & 0x1f)
+#define	BITMASK(pos)		MKMASK(BIT_WIDTH(pos), pos & 0x1f)
+
+/* Register addresses */
+#if	__ASSEMBLER__
+# define	REG_ADDR(type, addr)	(addr)
+#else	/* __ASSEMBLER__ */
+# define	REG_ADDR(type, addr)	(*(volatile type *)(addr))
+#endif	/* __ASSEMBLER__ */
+
+/* Cast a register to be an unsigned */
+#define	CONTENTS(foo)	(*(unsigned *) &(foo))
+
+/* Stack pointer must always be a multiple of 4 */
+#define	STACK_INCR	4
+#define	ROUND_FRAME(x)	((((unsigned)(x)) + STACK_INCR - 1) & ~(STACK_INCR-1))
+
+/* STRINGIFY -- perform all possible substitutions, then stringify */
+#define	__STR(x)	#x		/* just a helper macro */
+#define	STRINGIFY(x)	__STR(x)
+
+/*
+ * REG_PAIR_DEF -- define a register pair
+ * Register pairs are appropriately aligned to allow access via
+ * ld.d and st.d.
+ *
+ * Usage:
+ *	struct foo {
+ *		REG_PAIR_DEF(
+ *			bar_t *,	barp,
+ *			afu_t,		afu
+ *		);
+ *	};
+ *
+ * Access to individual entries of the pair is via the REG_PAIR
+ * macro (below).
+ */
+#define	REG_PAIR_DEF(type0, name0, type1, name1)		\
+	struct {						\
+		type0	name0 __attribute__(( aligned(8) ));	\
+		type1	name1;					\
+	} name0##_##name1
+
+/*
+ * REG_PAIR -- Macro to define names for accessing individual registers
+ * of register pairs.
+ *
+ * Usage:
+ *	arg0 is first element of pair
+ *	arg1 is second element of pair
+ *	arg2 is desired element of pair
+ * eg:
+ *	#define	foo_barp	REG_PAIR(barp, afu, afu)
+ */
+#define	REG_PAIR(name0, name1, the_name)			\
+	name0##_##name1.the_name
+
+#endif	/* _ARCH_I386_REG_HELP_H_ */
diff --git a/i386/include/architecture/i386/sel.h b/i386/include/architecture/i386/sel.h
new file mode 100644
index 0000000..80cb516
--- /dev/null
+++ b/i386/include/architecture/i386/sel.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ * Intel386 Family:	Segment selector.
+ *
+ * HISTORY
+ *
+ * 29 March 1992 ? at NeXT
+ *	Created.
+ */
+
+#ifndef	_ARCH_I386_SEL_H_
+#define	_ARCH_I386_SEL_H_
+
+/*
+ * Segment selector.
+ */
+
+typedef struct sel {
+    unsigned short	rpl	:2,
+#define KERN_PRIV	0
+#define USER_PRIV	3
+			ti	:1,
+#define SEL_GDT		0
+#define SEL_LDT		1
+			index	:13;
+} sel_t;
+
+#define NULL_SEL	((sel_t) { 0, 0, 0 } )
+
+#endif	/* _ARCH_I386_SEL_H_ */
diff --git a/i386/include/architecture/i386/table.h b/i386/include/architecture/i386/table.h
new file mode 100644
index 0000000..3ce1f81
--- /dev/null
+++ b/i386/include/architecture/i386/table.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ * Intel386 Family:	Descriptor tables.
+ *
+ * HISTORY
+ *
+ * 30 March 1992 ? at NeXT
+ *	Created.
+ */
+
+#ifndef _ARCH_I386_TABLE_H_
+#define _ARCH_I386_TABLE_H_
+
+#include <architecture/i386/desc.h>
+#include <architecture/i386/tss.h>
+
+/*
+ * A totally generic descriptor
+ * table entry.
+ */
+
+typedef union dt_entry {
+    code_desc_t		code;
+    data_desc_t		data;
+    ldt_desc_t		ldt;
+    tss_desc_t		task_state;
+    call_gate_t		call_gate;
+    trap_gate_t		trap_gate;
+    intr_gate_t		intr_gate;
+    task_gate_t		task_gate;
+} dt_entry_t;
+
+#define DESC_TBL_MAX	8192
+
+/*
+ * Global descriptor table.
+ */
+
+typedef union gdt_entry {
+    code_desc_t		code;
+    data_desc_t		data;
+    ldt_desc_t		ldt;
+    call_gate_t		call_gate;
+    task_gate_t		task_gate;
+    tss_desc_t		task_state;
+} gdt_entry_t;
+
+typedef gdt_entry_t	gdt_t;
+
+/*
+ * Interrupt descriptor table.
+ */
+
+typedef union idt_entry {
+    trap_gate_t		trap_gate;
+    intr_gate_t		intr_gate;
+    task_gate_t		task_gate;
+} idt_entry_t;
+
+typedef idt_entry_t	idt_t;
+
+/*
+ * Local descriptor table.
+ */
+
+typedef union ldt_entry {
+    code_desc_t		code;
+    data_desc_t		data;
+    call_gate_t		call_gate;
+    task_gate_t		task_gate;
+} ldt_entry_t;
+
+typedef ldt_entry_t	ldt_t;
+
+#endif	/* _ARCH_I386_TABLE_H_ */
diff --git a/i386/include/architecture/i386/tss.h b/i386/include/architecture/i386/tss.h
new file mode 100644
index 0000000..7f060ec
--- /dev/null
+++ b/i386/include/architecture/i386/tss.h
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ * Intel386 Family:	Task State Segment.
+ *
+ * HISTORY
+ *
+ * 29 March 1992 ? at NeXT
+ *	Created.
+ */
+
+#ifndef _ARCH_I386_TSS_H_
+#define _ARCH_I386_TSS_H_
+
+#include <architecture/i386/sel.h>
+
+/*
+ * Task State segment.
+ */
+
+typedef struct tss {
+    sel_t		oldtss;
+    unsigned int		:0;
+    unsigned int	esp0;
+    sel_t		ss0;
+    unsigned int		:0;
+    unsigned int	esp1;
+    sel_t		ss1;
+    unsigned int		:0;
+    unsigned int	esp2;
+    sel_t		ss2;
+    unsigned int		:0;
+    unsigned int	cr3;
+    unsigned int	eip;
+    unsigned int	eflags;
+    unsigned int	eax;
+    unsigned int	ecx;
+    unsigned int	edx;
+    unsigned int	ebx;
+    unsigned int	esp;
+    unsigned int	ebp;
+    unsigned int	esi;
+    unsigned int	edi;
+    sel_t		es;
+    unsigned int		:0;
+    sel_t		cs;
+    unsigned int		:0;
+    sel_t		ss;
+    unsigned int		:0;
+    sel_t		ds;
+    unsigned int		:0;
+    sel_t		fs;
+    unsigned int		:0;
+    sel_t		gs;
+    unsigned int		:0;
+    sel_t		ldt;
+    unsigned int		:0;
+    unsigned int	t	:1,
+    				:15,
+			io_bmap	:16;
+} tss_t;
+
+#define TSS_SIZE(n)	(sizeof (struct tss) + (n))
+
+/*
+ * Task State segment descriptor.
+ */
+
+typedef struct tss_desc {
+    unsigned short	limit00;
+    unsigned short	base00;
+    unsigned char	base16;
+    unsigned char	type	:5,
+#define DESC_TSS	0x09
+			dpl	:2,
+			present	:1;
+    unsigned char	limit16	:4,
+				:3,
+			granular:1;
+    unsigned char	base24;
+} tss_desc_t;
+
+/*
+ * Task gate descriptor.
+ */
+ 
+typedef struct task_gate {
+    unsigned short		:16;
+    sel_t		tss;
+    unsigned int		:8,
+    			type	:5,
+#define DESC_TASK_GATE	0x05
+			dpl	:2,
+			present	:1,
+				:0;
+} task_gate_t;
+
+#endif	/* _ARCH_I386_TSS_H_ */
diff --git a/i386/include/assert.h b/i386/include/assert.h
new file mode 100644
index 0000000..1bfea51
--- /dev/null
+++ b/i386/include/assert.h
@@ -0,0 +1,92 @@
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)assert.h	8.2 (Berkeley) 1/21/94
+ * $FreeBSD: src/include/assert.h,v 1.4 2002/03/23 17:24:53 imp Exp $
+ */
+
+#include <sys/cdefs.h>
+#ifdef __cplusplus
+#include <stdlib.h>
+#endif /* __cplusplus */
+
+/*
+ * Unlike other ANSI header files, <assert.h> may usefully be included
+ * multiple times, with and without NDEBUG defined.
+ */
+
+#undef assert
+#undef __assert
+
+#ifdef NDEBUG
+#define	assert(e)	((void)0)
+#else
+
+#ifndef __GNUC__
+
+__BEGIN_DECLS
+#ifndef __cplusplus
+void abort(void) __dead2;
+#endif /* !__cplusplus */
+int  printf(const char * __restrict, ...);
+__END_DECLS
+
+#define assert(e)  \
+    ((void) ((e) ? 0 : __assert (#e, __FILE__, __LINE__)))
+#define __assert(e, file, line) \
+    ((void)printf ("%s:%u: failed assertion `%s'\n", file, line, e), abort())
+
+#else /* __GNUC__ */
+
+__BEGIN_DECLS
+void __assert_rtn(const char *, const char *, int, const char *) __dead2;
+void __eprintf(const char *, const char *, unsigned, const char *) __dead2;
+__END_DECLS
+
+#define __assert(e, file, line) \
+    __eprintf ("%s:%u: failed assertion `%s'\n", file, line, e)
+
+#if __DARWIN_UNIX03
+#define	assert(e) \
+    (__builtin_expect(!(e), 0) ? __assert_rtn(__func__, __FILE__, __LINE__, #e) : (void)0)
+#else /* !__DARWIN_UNIX03 */
+#define assert(e)  \
+    (__builtin_expect(!(e), 0) ? __assert (#e, __FILE__, __LINE__) : (void)0)
+#endif /* __DARWIN_UNIX03 */
+
+#endif /* __GNUC__ */
+#endif /* NDEBUG */
diff --git a/i386/include/ctype.h b/i386/include/ctype.h
new file mode 100644
index 0000000..58dca3d
--- /dev/null
+++ b/i386/include/ctype.h
@@ -0,0 +1,438 @@
+/*
+ * Copyright (c) 2000, 2005, 2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Paul Borman at Krystal Technologies.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)ctype.h	8.4 (Berkeley) 1/21/94
+ */
+
+//Begin-Libc
+//#include "xlocale_private.h"
+//End-Libc
+#ifndef	_CTYPE_H_
+#define _CTYPE_H_
+
+#include <runetype.h>
+
+#define	_CTYPE_A	0x00000100L		/* Alpha */
+#define	_CTYPE_C	0x00000200L		/* Control */
+#define	_CTYPE_D	0x00000400L		/* Digit */
+#define	_CTYPE_G	0x00000800L		/* Graph */
+#define	_CTYPE_L	0x00001000L		/* Lower */
+#define	_CTYPE_P	0x00002000L		/* Punct */
+#define	_CTYPE_S	0x00004000L		/* Space */
+#define	_CTYPE_U	0x00008000L		/* Upper */
+#define	_CTYPE_X	0x00010000L		/* X digit */
+#define	_CTYPE_B	0x00020000L		/* Blank */
+#define	_CTYPE_R	0x00040000L		/* Print */
+#define	_CTYPE_I	0x00080000L		/* Ideogram */
+#define	_CTYPE_T	0x00100000L		/* Special */
+#define	_CTYPE_Q	0x00200000L		/* Phonogram */
+#define	_CTYPE_SW0	0x20000000L		/* 0 width character */
+#define	_CTYPE_SW1	0x40000000L		/* 1 width character */
+#define	_CTYPE_SW2	0x80000000L		/* 2 width character */
+#define	_CTYPE_SW3	0xc0000000L		/* 3 width character */
+#define	_CTYPE_SWM	0xe0000000L		/* Mask for screen width data */
+#define	_CTYPE_SWS	30			/* Bits to shift to get width */
+
+#ifdef _NONSTD_SOURCE
+/*
+ * Backward compatibility
+ */
+#define	_A		_CTYPE_A		/* Alpha */
+#define	_C		_CTYPE_C		/* Control */
+#define	_D		_CTYPE_D		/* Digit */
+#define	_G		_CTYPE_G		/* Graph */
+#define	_L		_CTYPE_L		/* Lower */
+#define	_P		_CTYPE_P		/* Punct */
+#define	_S		_CTYPE_S		/* Space */
+#define	_U		_CTYPE_U		/* Upper */
+#define	_X		_CTYPE_X		/* X digit */
+#define	_B		_CTYPE_B		/* Blank */
+#define	_R		_CTYPE_R		/* Print */
+#define	_I		_CTYPE_I		/* Ideogram */
+#define	_T		_CTYPE_T		/* Special */
+#define	_Q		_CTYPE_Q		/* Phonogram */
+#define	_SW0		_CTYPE_SW0		/* 0 width character */
+#define	_SW1		_CTYPE_SW1		/* 1 width character */
+#define	_SW2		_CTYPE_SW2		/* 2 width character */
+#define	_SW3		_CTYPE_SW3		/* 3 width character */
+#endif /* _NONSTD_SOURCE */
+
+/*
+ * _EXTERNALIZE_CTYPE_INLINES_ is defined in locale/nomacros.c to tell us
+ * to generate code for extern versions of all intermediate inline functions.
+ */
+#ifdef _EXTERNALIZE_CTYPE_INLINES_
+#define _USE_CTYPE_INLINE_
+#define __DARWIN_CTYPE_static_inline
+#else /* !_EXTERNALIZE_CTYPE_INLINES_ */
+#define __DARWIN_CTYPE_static_inline		static __inline
+#endif /* !_EXTERNALIZE_CTYPE_INLINES_ */
+
+/*
+ * _EXTERNALIZE_CTYPE_INLINES_TOP_ is defined in locale/isctype.c to tell us
+ * to generate code for extern versions of all top-level inline functions.
+ */
+#ifdef _EXTERNALIZE_CTYPE_INLINES_TOP_
+#define _USE_CTYPE_INLINE_
+#define __DARWIN_CTYPE_TOP_static_inline
+#else /* !_EXTERNALIZE_CTYPE_INLINES_TOP_ */
+#define __DARWIN_CTYPE_TOP_static_inline	static __inline
+#endif /* _EXTERNALIZE_CTYPE_INLINES_TOP_ */
+
+/*
+ * Use inline functions if we are allowed to and the compiler supports them.
+ */
+#if !defined(_DONT_USE_CTYPE_INLINE_) && \
+    (defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus))
+
+/* See comments in <machine/_type.h> about __darwin_ct_rune_t. */
+__BEGIN_DECLS
+unsigned long		___runetype(__darwin_ct_rune_t);
+__darwin_ct_rune_t	___tolower(__darwin_ct_rune_t);
+__darwin_ct_rune_t	___toupper(__darwin_ct_rune_t);
+__END_DECLS
+
+__DARWIN_CTYPE_TOP_static_inline int
+isascii(int _c)
+{
+	return ((_c & ~0x7F) == 0);
+}
+
+#ifdef USE_ASCII
+__DARWIN_CTYPE_static_inline int     
+__maskrune(__darwin_ct_rune_t _c, unsigned long _f)
+{
+	return _DefaultRuneLocale.__runetype[_c & 0xff] & _f;
+}
+//Begin-Libc
+#elif defined(__LIBC__)
+__DARWIN_CTYPE_static_inline int     
+__maskrune(__darwin_ct_rune_t _c, unsigned long _f)
+{
+	return ((_c < 0 || _c >= _CACHED_RUNES) ? ___runetype(_c) :
+		__current_locale()->__lc_ctype->_CurrentRuneLocale.__runetype[_c]) & _f;
+}
+//End-Libc
+#else /* !USE_ASCII */
+__BEGIN_DECLS
+int             	__maskrune(__darwin_ct_rune_t, unsigned long);   
+__END_DECLS
+#endif /* USE_ASCII */
+
+__DARWIN_CTYPE_static_inline int
+__istype(__darwin_ct_rune_t _c, unsigned long _f)
+{
+#ifdef USE_ASCII
+	return !!(__maskrune(_c, _f));
+#else /* USE_ASCII */
+	return (isascii(_c) ? !!(_DefaultRuneLocale.__runetype[_c] & _f)
+		: !!__maskrune(_c, _f));
+#endif /* USE_ASCII */
+}
+
+__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
+__isctype(__darwin_ct_rune_t _c, unsigned long _f)
+{
+#ifdef USE_ASCII
+	return !!(__maskrune(_c, _f));
+#else /* USE_ASCII */
+	return (_c < 0 || _c >= _CACHED_RUNES) ? 0 :
+		!!(_DefaultRuneLocale.__runetype[_c] & _f);
+#endif /* USE_ASCII */
+}
+
+#ifdef USE_ASCII
+__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
+__toupper(__darwin_ct_rune_t _c)
+{
+	return _DefaultRuneLocale.__mapupper[_c & 0xff];
+}
+
+__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
+__tolower(__darwin_ct_rune_t _c)
+{
+	return _DefaultRuneLocale.__maplower[_c & 0xff];
+}
+//Begin-Libc
+#elif defined(__LIBC__)
+/*
+ * We can't do what we do for __toupper_l() (check for ASCII first, then call
+ * ___toupper_l() otherwise) because versions of ___toupper() before Tiger
+ * assume c >= _CACHED_RUNES.  So we are stuck making __toupper() a routine
+ * to hide the extended locale details, outside of Libc.
+ */
+__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
+__toupper(__darwin_ct_rune_t _c)
+{
+	return (_c < 0 || _c >= _CACHED_RUNES) ? ___toupper(_c) :
+		__current_locale()->__lc_ctype->_CurrentRuneLocale.__mapupper[_c];
+}
+
+__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
+__tolower(__darwin_ct_rune_t _c)
+{
+	return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) :
+		__current_locale()->__lc_ctype->_CurrentRuneLocale.__maplower[_c];
+}
+//End-Libc
+#else /* !USE_ASCII */
+__BEGIN_DECLS
+__darwin_ct_rune_t	__toupper(__darwin_ct_rune_t);
+__darwin_ct_rune_t	__tolower(__darwin_ct_rune_t);
+__END_DECLS
+#endif /* USE_ASCII */
+
+__DARWIN_CTYPE_static_inline int
+__wcwidth(__darwin_ct_rune_t _c)
+{
+	unsigned int _x;
+
+	if (_c == 0)
+		return (0);
+	_x = (unsigned int)__maskrune(_c, _CTYPE_SWM|_CTYPE_R);
+	if ((_x & _CTYPE_SWM) != 0)
+		return ((_x & _CTYPE_SWM) >> _CTYPE_SWS);
+	return ((_x & _CTYPE_R) != 0 ? 1 : -1);
+}
+
+#ifndef _EXTERNALIZE_CTYPE_INLINES_
+
+#define	_tolower(c)	__tolower(c)
+#define	_toupper(c)	__toupper(c)
+
+__DARWIN_CTYPE_TOP_static_inline int
+isalnum(int _c)
+{
+	return (__istype(_c, _CTYPE_A|_CTYPE_D));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isalpha(int _c)
+{
+	return (__istype(_c, _CTYPE_A));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isblank(int _c)
+{
+	return (__istype(_c, _CTYPE_B));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+iscntrl(int _c)
+{
+	return (__istype(_c, _CTYPE_C));
+}
+
+/* ANSI -- locale independent */
+__DARWIN_CTYPE_TOP_static_inline int
+isdigit(int _c)
+{
+	return (__isctype(_c, _CTYPE_D));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isgraph(int _c)
+{
+	return (__istype(_c, _CTYPE_G));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+islower(int _c)
+{
+	return (__istype(_c, _CTYPE_L));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isprint(int _c)
+{
+	return (__istype(_c, _CTYPE_R));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+ispunct(int _c)
+{
+	return (__istype(_c, _CTYPE_P));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isspace(int _c)
+{
+	return (__istype(_c, _CTYPE_S));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isupper(int _c)
+{
+	return (__istype(_c, _CTYPE_U));
+}
+
+/* ANSI -- locale independent */
+__DARWIN_CTYPE_TOP_static_inline int
+isxdigit(int _c)
+{
+	return (__isctype(_c, _CTYPE_X));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+toascii(int _c)
+{
+	return (_c & 0x7F);
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+tolower(int _c)
+{
+        return (__tolower(_c));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+toupper(int _c)
+{
+        return (__toupper(_c));
+}
+
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+__DARWIN_CTYPE_TOP_static_inline int
+digittoint(int _c)
+{
+	return (__maskrune(_c, 0x0F));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+ishexnumber(int _c)
+{
+	return (__istype(_c, _CTYPE_X));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isideogram(int _c)
+{
+	return (__istype(_c, _CTYPE_I));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isnumber(int _c)
+{
+	return (__istype(_c, _CTYPE_D));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isphonogram(int _c)
+{
+	return (__istype(_c, _CTYPE_Q));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isrune(int _c)
+{
+	return (__istype(_c, 0xFFFFFFF0L));
+}
+
+__DARWIN_CTYPE_TOP_static_inline int
+isspecial(int _c)
+{
+	return (__istype(_c, _CTYPE_T));
+}
+#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#endif /* _EXTERNALIZE_CTYPE_INLINES_ */
+
+#else /* not using inlines */
+
+__BEGIN_DECLS
+int     isalnum(int);
+int     isalpha(int);
+int     isblank(int);
+int     iscntrl(int);
+int     isdigit(int);
+int     isgraph(int);
+int     islower(int);
+int     isprint(int);
+int     ispunct(int);
+int     isspace(int);
+int     isupper(int);
+int     isxdigit(int);
+int     tolower(int);
+int     toupper(int);
+int     isascii(int);
+int     toascii(int);
+
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+int     _tolower(int);
+int     _toupper(int);
+int     digittoint(int);
+int     ishexnumber(int);
+int     isideogram(int);
+int     isnumber(int);
+int     isphonogram(int);
+int     isrune(int);
+int     isspecial(int);
+#endif
+__END_DECLS
+
+#endif /* using inlines */
+
+#ifdef _USE_EXTENDED_LOCALES_
+#include <xlocale/_ctype.h>
+#endif /* _USE_EXTENDED_LOCALES_ */
+
+#endif /* !_CTYPE_H_ */
diff --git a/i386/include/device/.svn/all-wcprops b/i386/include/device/.svn/all-wcprops
new file mode 100644
index 0000000..206efb7
--- /dev/null
+++ b/i386/include/device/.svn/all-wcprops
@@ -0,0 +1,17 @@
+K 25
+svn:wc:ra_dav:version-url
+V 53
+/svn/chameleon/!svn/ver/881/trunk/i386/include/device
+END
+device_port.h
+K 25
+svn:wc:ra_dav:version-url
+V 67
+/svn/chameleon/!svn/ver/881/trunk/i386/include/device/device_port.h
+END
+device_types.h
+K 25
+svn:wc:ra_dav:version-url
+V 68
+/svn/chameleon/!svn/ver/881/trunk/i386/include/device/device_types.h
+END
diff --git a/i386/include/device/.svn/entries b/i386/include/device/.svn/entries
new file mode 100644
index 0000000..b2356fb
--- /dev/null
+++ b/i386/include/device/.svn/entries
@@ -0,0 +1,96 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/device
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+device_port.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+a32061f0b361911908c8f1a738ad6fbd
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2936
+
+device_types.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+3002c6d1dc242f177c4ae99fb073e186
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+4507
+
diff --git a/i386/include/device/.svn/text-base/device_port.h.svn-base b/i386/include/device/.svn/text-base/device_port.h.svn-base
new file mode 100644
index 0000000..8948ed5
--- /dev/null
+++ b/i386/include/device/.svn/text-base/device_port.h.svn-base
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	Author: David B. Golub, Carnegie Mellon University
+ *	Date: 	8/89
+ */
+
+#ifndef	_DEVICE_DEVICE_PORT_H_
+#define	_DEVICE_DEVICE_PORT_H_
+
+#include <device/device_types.h>
+
+/*
+ *	Master privileged I/O object for this host
+ */
+extern mach_port_t	master_device_port;
+
+#define DEVICE_PAGER_GUARDED		0x1
+#define DEVICE_PAGER_COHERENT		0x2
+#define DEVICE_PAGER_CACHE_INHIB	0x4
+#define DEVICE_PAGER_WRITE_THROUGH	0x8
+#define DEVICE_PAGER_CONTIGUOUS		0x100
+#define DEVICE_PAGER_NOPHYSCACHE	0x200
+
+#endif	/* _DEVICE_DEVICE_PORT_H_ */
diff --git a/i386/include/device/.svn/text-base/device_types.h.svn-base b/i386/include/device/.svn/text-base/device_types.h.svn-base
new file mode 100644
index 0000000..f71249e
--- /dev/null
+++ b/i386/include/device/.svn/text-base/device_types.h.svn-base
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	Author: David B. Golub, Carnegie Mellon University
+ *	Date: 	3/89
+ */
+
+#ifndef	DEVICE_TYPES_H
+#define	DEVICE_TYPES_H
+
+/*
+ * Types for device interface.
+ */
+#include <mach/std_types.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/port.h>
+
+/*
+ * IO buffer - out-of-line array of characters.
+ */
+typedef char *	io_buf_ptr_t;
+
+/*
+ * Some types for IOKit.
+ */
+
+#ifdef IOKIT
+
+/* must match device_types.defs */
+typedef	char			io_name_t[128];
+typedef	char			io_string_t[512];	
+typedef char 			io_struct_inband_t[4096];
+
+#if KERNEL
+typedef uint64_t		io_user_scalar_t;
+typedef uint64_t		io_user_reference_t;
+typedef int 			io_scalar_inband_t[16];
+// must be the same type as OSAsyncReference
+typedef natural_t		io_async_ref_t[8];
+typedef io_user_scalar_t	io_scalar_inband64_t[16];
+typedef io_user_reference_t	io_async_ref64_t[8];
+#elif __LP64__
+typedef uint64_t		io_user_scalar_t;
+typedef uint64_t		io_user_reference_t;
+typedef io_user_scalar_t	io_scalar_inband_t[16];
+typedef io_user_reference_t	io_async_ref_t[8];
+typedef io_user_scalar_t	io_scalar_inband64_t[16];
+typedef io_user_reference_t	io_async_ref64_t[8];
+#else
+typedef int			io_user_scalar_t;
+typedef natural_t		io_user_reference_t;
+typedef io_user_scalar_t	io_scalar_inband_t[16];
+typedef io_user_reference_t	io_async_ref_t[8];
+typedef uint64_t		io_scalar_inband64_t[16];
+typedef uint64_t		io_async_ref64_t[8];
+#endif // __LP64__
+
+#ifdef MACH_KERNEL
+
+typedef struct IOObject * io_object_t;
+typedef io_object_t io_connect_t;
+
+extern void iokit_remove_reference( io_object_t	obj );
+
+extern io_object_t iokit_lookup_object_port( ipc_port_t port );
+extern io_connect_t iokit_lookup_connect_port( ipc_port_t port );
+
+extern ipc_port_t iokit_make_object_port( io_object_t obj );
+extern ipc_port_t iokit_make_connect_port( io_connect_t obj );
+
+extern boolean_t iokit_notify( mach_msg_header_t *msg );
+
+#else
+
+#ifndef	__IOKIT_PORTS_DEFINED__
+#define __IOKIT_PORTS_DEFINED__
+typedef mach_port_t	io_object_t;
+#endif	/* __IOKIT_PORTS_DEFINED__ */
+
+#endif  /* MACH_KERNEL */
+
+#endif  /* IOKIT */
+
+#endif	/* DEVICE_TYPES_H */
+
diff --git a/i386/include/device/device_port.h b/i386/include/device/device_port.h
new file mode 100644
index 0000000..8948ed5
--- /dev/null
+++ b/i386/include/device/device_port.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	Author: David B. Golub, Carnegie Mellon University
+ *	Date: 	8/89
+ */
+
+#ifndef	_DEVICE_DEVICE_PORT_H_
+#define	_DEVICE_DEVICE_PORT_H_
+
+#include <device/device_types.h>
+
+/*
+ *	Master privileged I/O object for this host
+ */
+extern mach_port_t	master_device_port;
+
+#define DEVICE_PAGER_GUARDED		0x1
+#define DEVICE_PAGER_COHERENT		0x2
+#define DEVICE_PAGER_CACHE_INHIB	0x4
+#define DEVICE_PAGER_WRITE_THROUGH	0x8
+#define DEVICE_PAGER_CONTIGUOUS		0x100
+#define DEVICE_PAGER_NOPHYSCACHE	0x200
+
+#endif	/* _DEVICE_DEVICE_PORT_H_ */
diff --git a/i386/include/device/device_types.h b/i386/include/device/device_types.h
new file mode 100644
index 0000000..f71249e
--- /dev/null
+++ b/i386/include/device/device_types.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	Author: David B. Golub, Carnegie Mellon University
+ *	Date: 	3/89
+ */
+
+#ifndef	DEVICE_TYPES_H
+#define	DEVICE_TYPES_H
+
+/*
+ * Types for device interface.
+ */
+#include <mach/std_types.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/port.h>
+
+/*
+ * IO buffer - out-of-line array of characters.
+ */
+typedef char *	io_buf_ptr_t;
+
+/*
+ * Some types for IOKit.
+ */
+
+#ifdef IOKIT
+
+/* must match device_types.defs */
+typedef	char			io_name_t[128];
+typedef	char			io_string_t[512];	
+typedef char 			io_struct_inband_t[4096];
+
+#if KERNEL
+typedef uint64_t		io_user_scalar_t;
+typedef uint64_t		io_user_reference_t;
+typedef int 			io_scalar_inband_t[16];
+// must be the same type as OSAsyncReference
+typedef natural_t		io_async_ref_t[8];
+typedef io_user_scalar_t	io_scalar_inband64_t[16];
+typedef io_user_reference_t	io_async_ref64_t[8];
+#elif __LP64__
+typedef uint64_t		io_user_scalar_t;
+typedef uint64_t		io_user_reference_t;
+typedef io_user_scalar_t	io_scalar_inband_t[16];
+typedef io_user_reference_t	io_async_ref_t[8];
+typedef io_user_scalar_t	io_scalar_inband64_t[16];
+typedef io_user_reference_t	io_async_ref64_t[8];
+#else
+typedef int			io_user_scalar_t;
+typedef natural_t		io_user_reference_t;
+typedef io_user_scalar_t	io_scalar_inband_t[16];
+typedef io_user_reference_t	io_async_ref_t[8];
+typedef uint64_t		io_scalar_inband64_t[16];
+typedef uint64_t		io_async_ref64_t[8];
+#endif // __LP64__
+
+#ifdef MACH_KERNEL
+
+typedef struct IOObject * io_object_t;
+typedef io_object_t io_connect_t;
+
+extern void iokit_remove_reference( io_object_t	obj );
+
+extern io_object_t iokit_lookup_object_port( ipc_port_t port );
+extern io_connect_t iokit_lookup_connect_port( ipc_port_t port );
+
+extern ipc_port_t iokit_make_object_port( io_object_t obj );
+extern ipc_port_t iokit_make_connect_port( io_connect_t obj );
+
+extern boolean_t iokit_notify( mach_msg_header_t *msg );
+
+#else
+
+#ifndef	__IOKIT_PORTS_DEFINED__
+#define __IOKIT_PORTS_DEFINED__
+typedef mach_port_t	io_object_t;
+#endif	/* __IOKIT_PORTS_DEFINED__ */
+
+#endif  /* MACH_KERNEL */
+
+#endif  /* IOKIT */
+
+#endif	/* DEVICE_TYPES_H */
+
diff --git a/i386/include/errno.h b/i386/include/errno.h
new file mode 100644
index 0000000..9879cc4
--- /dev/null
+++ b/i386/include/errno.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#include <sys/errno.h>
+
diff --git a/i386/include/float.h b/i386/include/float.h
new file mode 100644
index 0000000..84fd005
--- /dev/null
+++ b/i386/include/float.h
@@ -0,0 +1,281 @@
+/* This file exists soley to keep Metrowerks' compilers happy.  The version
+   used by GCC can be found in /usr/lib/gcc, although it's
+   not very informative.  */
+
+#ifndef _FLOAT_H_
+
+#if defined(__GNUC__)
+#include_next <float.h>
+
+#elif defined(__MWERKS__)
+#define _FLOAT_H_
+
+/* APPLE LOCAL begin MW compatibility */
+/* Define various characteristics of floating-point types, if needed.  */
+#ifndef __FLT_RADIX__   
+#define __FLT_RADIX__ 2
+#endif
+#ifndef __FLT_MANT_DIG__
+#define __FLT_MANT_DIG__ 24
+#endif
+#ifndef __FLT_DIG__
+#define __FLT_DIG__ 6
+#endif
+#ifndef __FLT_EPSILON__
+#define __FLT_EPSILON__ 1.19209290e-07F
+#endif
+#ifndef __FLT_MIN__
+#define __FLT_MIN__ 1.17549435e-38F
+#endif
+#ifndef __FLT_MAX__
+#define __FLT_MAX__ 3.40282347e+38F
+#endif
+#ifndef __FLT_MIN_EXP__
+#define __FLT_MIN_EXP__ (-125)
+#endif
+#ifndef __FLT_MIN_10_EXP__
+#define __FLT_MIN_10_EXP__ (-37)
+#endif
+#ifndef __FLT_MAX_EXP__
+#define __FLT_MAX_EXP__ 128
+#endif
+#ifndef __FLT_MAX_10_EXP__
+#define __FLT_MAX_10_EXP__ 38
+#endif
+#ifndef __DBL_MANT_DIG__
+#define __DBL_MANT_DIG__ 53
+#endif
+#ifndef __DBL_DIG__
+#define __DBL_DIG__ 15
+#endif
+#ifndef __DBL_EPSILON__
+#define __DBL_EPSILON__ 2.2204460492503131e-16
+#endif
+#ifndef __DBL_MIN__
+#define __DBL_MIN__ 2.2250738585072014e-308
+#endif
+#ifndef __DBL_MAX__
+#define __DBL_MAX__ 1.7976931348623157e+308
+#endif
+#ifndef __DBL_MIN_EXP__
+#define __DBL_MIN_EXP__ (-1021)
+#endif
+#ifndef __DBL_MIN_10_EXP__
+#define __DBL_MIN_10_EXP__ (-307)
+#endif
+#ifndef __DBL_MAX_EXP__
+#define __DBL_MAX_EXP__ 1024
+#endif
+#ifndef __DBL_MAX_10_EXP__
+#define __DBL_MAX_10_EXP__ 308
+#endif
+#ifndef __LDBL_MANT_DIG__
+#define __LDBL_MANT_DIG__ 53
+#endif
+#ifndef __LDBL_DIG__  
+#define __LDBL_DIG__ 15 
+#endif
+#ifndef __LDBL_EPSILON__
+#define __LDBL_EPSILON__ 2.2204460492503131e-16
+#endif
+#ifndef __LDBL_MIN__
+#define __LDBL_MIN__ 2.2250738585072014e-308
+#endif
+#ifndef __LDBL_MAX__
+#define __LDBL_MAX__ 1.7976931348623157e+308
+#endif
+#ifndef __LDBL_MIN_EXP__
+#define __LDBL_MIN_EXP__ (-1021)
+#endif
+#ifndef __LDBL_MIN_10_EXP__
+#define __LDBL_MIN_10_EXP__ (-307)
+#endif
+#ifndef __LDBL_MAX_EXP__
+#define __LDBL_MAX_EXP__ 1024
+#endif
+#ifndef __LDBL_MAX_10_EXP__
+#define __LDBL_MAX_10_EXP__ 308
+#endif
+/* APPLE LOCAl end MW compatibility */
+
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU CC.
+
+GNU CC 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, or (at your option)
+any later version.
+
+GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, if you include this header file into source
+   files compiled by GCC, this header file does not by itself cause
+   the resulting executable to be covered by the GNU General Public
+   License.  This exception does not however invalidate any other
+   reasons why the executable file might be covered by the GNU General
+   Public License.  */
+
+/*
+ * ISO C Standard:  5.2.4.2.2  Characteristics of floating types <float.h>
+ */
+
+
+/* Radix of exponent representation, b. */
+#undef FLT_RADIX
+#define FLT_RADIX	__FLT_RADIX__
+
+/* Number of base-FLT_RADIX digits in the significand, p.  */
+#undef FLT_MANT_DIG
+#undef DBL_MANT_DIG
+#undef LDBL_MANT_DIG
+#define FLT_MANT_DIG	__FLT_MANT_DIG__
+#define DBL_MANT_DIG	__DBL_MANT_DIG__
+#define LDBL_MANT_DIG	__LDBL_MANT_DIG__
+
+/* Number of decimal digits, q, such that any floating-point number with q
+   decimal digits can be rounded into a floating-point number with p radix b
+   digits and back again without change to the q decimal digits,
+
+	p * log10(b)			if b is a power of 10
+	floor((p - 1) * log10(b))	otherwise
+*/
+#undef FLT_DIG
+#undef DBL_DIG
+#undef LDBL_DIG
+#define FLT_DIG		__FLT_DIG__
+#define DBL_DIG		__DBL_DIG__
+#define LDBL_DIG	__LDBL_DIG__
+
+/* Minimum int x such that FLT_RADIX**(x-1) is a normalized float, emin */
+#undef FLT_MIN_EXP
+#undef DBL_MIN_EXP
+#undef LDBL_MIN_EXP
+#define FLT_MIN_EXP	__FLT_MIN_EXP__
+#define DBL_MIN_EXP	__DBL_MIN_EXP__
+#define LDBL_MIN_EXP	__LDBL_MIN_EXP__
+
+/* Minimum negative integer such that 10 raised to that power is in the
+   range of normalized floating-point numbers,
+
+	ceil(log10(b) * (emin - 1))
+*/
+#undef FLT_MIN_10_EXP
+#undef DBL_MIN_10_EXP
+#undef LDBL_MIN_10_EXP
+#define FLT_MIN_10_EXP	__FLT_MIN_10_EXP__
+#define DBL_MIN_10_EXP	__DBL_MIN_10_EXP__
+#define LDBL_MIN_10_EXP	__LDBL_MIN_10_EXP__
+
+/* Maximum int x such that FLT_RADIX**(x-1) is a representable float, emax.  */
+#undef FLT_MAX_EXP
+#undef DBL_MAX_EXP
+#undef LDBL_MAX_EXP
+#define FLT_MAX_EXP	__FLT_MAX_EXP__
+#define DBL_MAX_EXP	__DBL_MAX_EXP__
+#define LDBL_MAX_EXP	__LDBL_MAX_EXP__
+
+/* Maximum integer such that 10 raised to that power is in the range of
+   representable finite floating-point numbers,
+
+	floor(log10((1 - b**-p) * b**emax))
+*/
+#undef FLT_MAX_10_EXP
+#undef DBL_MAX_10_EXP
+#undef LDBL_MAX_10_EXP
+#define FLT_MAX_10_EXP	__FLT_MAX_10_EXP__
+#define DBL_MAX_10_EXP	__DBL_MAX_10_EXP__
+#define LDBL_MAX_10_EXP	__LDBL_MAX_10_EXP__
+
+/* Maximum representable finite floating-point number,
+
+	(1 - b**-p) * b**emax
+*/
+#undef FLT_MAX
+#undef DBL_MAX
+#undef LDBL_MAX
+#define FLT_MAX		__FLT_MAX__
+#define DBL_MAX		__DBL_MAX__
+#define LDBL_MAX	__LDBL_MAX__
+
+/* The difference between 1 and the least value greater than 1 that is
+   representable in the given floating point type, b**1-p.  */
+#undef FLT_EPSILON
+#undef DBL_EPSILON
+#undef LDBL_EPSILON
+#define FLT_EPSILON	__FLT_EPSILON__
+#define DBL_EPSILON	__DBL_EPSILON__
+#define LDBL_EPSILON	__LDBL_EPSILON__
+
+/* Minimum normalized positive floating-point number, b**(emin - 1).  */
+#undef FLT_MIN
+#undef DBL_MIN
+#undef LDBL_MIN
+#define FLT_MIN		__FLT_MIN__
+#define DBL_MIN		__DBL_MIN__
+#define LDBL_MIN	__LDBL_MIN__
+
+/* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown.  */
+/* ??? This is supposed to change with calls to fesetround in <fenv.h>.  */
+#undef FLT_ROUNDS
+#define FLT_ROUNDS 1
+
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+/* The floating-point expression evaluation method.
+        -1  indeterminate
+         0  evaluate all operations and constants just to the range and
+            precision of the type
+         1  evaluate operations and constants of type float and double
+            to the range and precision of the double type, evaluate
+            long double operations and constants to the range and
+            precision of the long double type
+         2  evaluate all operations and constants to the range and
+            precision of the long double type
+
+   ??? This ought to change with the setting of the fp control word;
+   the value provided by the compiler assumes the widest setting.  */
+#undef FLT_EVAL_METHOD
+#define FLT_EVAL_METHOD	__FLT_EVAL_METHOD__
+
+/* Number of decimal digits, n, such that any floating-point number in the
+   widest supported floating type with pmax radix b digits can be rounded
+   to a floating-point number with n decimal digits and back again without
+   change to the value,
+
+	pmax * log10(b)			if b is a power of 10
+	ceil(1 + pmax * log10(b))	otherwise
+*/
+#undef DECIMAL_DIG
+#define DECIMAL_DIG	__DECIMAL_DIG__
+
+#endif /* C99 */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern int __fegetfltrounds( void ); 
+#ifdef __cplusplus
+}
+#endif
+#undef FLT_ROUNDS
+#define FLT_ROUNDS (__fegetfltrounds ())
+/* End of GNU CC file */
+
+/* APPLE LOCAL begin CW compatibility */
+/* CodeWarrior defines the following on its own.  */
+#undef DECIMAL_DIG
+/* APPLE LOCAL end CW compatibility */
+
+#else
+#error This file is only for Metrowerks compatibilty.
+#endif
+
+#endif /* _FLOAT_H_ */
diff --git a/i386/include/i386/_limits.h b/i386/include/i386/_limits.h
new file mode 100644
index 0000000..3b9e7a6
--- /dev/null
+++ b/i386/include/i386/_limits.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef	_I386__LIMITS_H_
+#define	_I386__LIMITS_H_
+
+#define	__DARWIN_CLK_TCK		100	/* ticks per second */
+
+#endif	/* _I386__LIMITS_H_ */
diff --git a/i386/include/i386/_param.h b/i386/include/i386/_param.h
new file mode 100644
index 0000000..61f0d24
--- /dev/null
+++ b/i386/include/i386/_param.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2008 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _I386__PARAM_H_
+#define _I386__PARAM_H_
+
+#include <i386/_types.h>
+
+/*
+ * Round p (pointer or byte index) up to a correctly-aligned value for all
+ * data types (int, long, ...).   The result is unsigned int and must be
+ * cast to any desired pointer type.
+ */
+#define	__DARWIN_ALIGNBYTES	(sizeof(__darwin_size_t) - 1)
+#define	__DARWIN_ALIGN(p)	((__darwin_size_t)((char *)(__darwin_size_t)(p) + __DARWIN_ALIGNBYTES) &~ __DARWIN_ALIGNBYTES)
+
+#define      __DARWIN_ALIGNBYTES32     (sizeof(__uint32_t) - 1)
+#define       __DARWIN_ALIGN32(p)       ((__darwin_size_t)((char *)(__darwin_size_t)(p) + __DARWIN_ALIGNBYTES32) &~ __DARWIN_ALIGNBYTES32)
+
+
+#endif /* _I386__PARAM_H_ */
diff --git a/i386/include/i386/_structs.h b/i386/include/i386/_structs.h
new file mode 100644
index 0000000..9cad355
--- /dev/null
+++ b/i386/include/i386/_structs.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#include <sys/appleapiopts.h>
+
+#ifdef __need_mcontext_t
+#ifndef __need_struct_mcontext
+#define __need_struct_mcontext
+#endif /* __need_struct_mcontext */
+#endif /* __need_mcontext_t */
+
+#if defined(__need_struct_mcontext)
+#include <mach/i386/_structs.h>
+#endif /* __need_struct_mcontext */
+
+
+#ifdef __need_struct_mcontext
+#undef __need_struct_mcontext
+
+#ifndef _STRUCT_MCONTEXT32
+#if __DARWIN_UNIX03
+#define	_STRUCT_MCONTEXT32	struct __darwin_mcontext32
+_STRUCT_MCONTEXT32
+{
+	_STRUCT_X86_EXCEPTION_STATE32	__es;
+	_STRUCT_X86_THREAD_STATE32	__ss;
+	_STRUCT_X86_FLOAT_STATE32	__fs;
+};
+#else /* !__DARWIN_UNIX03 */
+#define	_STRUCT_MCONTEXT32	struct mcontext32
+_STRUCT_MCONTEXT32
+{
+	_STRUCT_X86_EXCEPTION_STATE32	es;
+	_STRUCT_X86_THREAD_STATE32	ss;
+	_STRUCT_X86_FLOAT_STATE32	fs;
+};
+#endif /* __DARWIN_UNIX03 */
+#endif /* _STRUCT_MCONTEXT32 */
+
+#ifndef _STRUCT_MCONTEXT64
+#if __DARWIN_UNIX03
+#define	_STRUCT_MCONTEXT64	struct __darwin_mcontext64
+_STRUCT_MCONTEXT64
+{
+	_STRUCT_X86_EXCEPTION_STATE64	__es;
+	_STRUCT_X86_THREAD_STATE64	__ss;
+	_STRUCT_X86_FLOAT_STATE64	__fs;
+};
+#else /* !__DARWIN_UNIX03 */
+#define	_STRUCT_MCONTEXT64	struct mcontext64
+_STRUCT_MCONTEXT64
+{
+	_STRUCT_X86_EXCEPTION_STATE64	es;
+	_STRUCT_X86_THREAD_STATE64	ss;
+	_STRUCT_X86_FLOAT_STATE64	fs;
+};
+#endif /* __DARWIN_UNIX03 */
+#endif /* _STRUCT_MCONTEXT64 */
+#endif /* __need_struct_mcontext */
+
+#ifdef __need_mcontext_t
+#undef __need_mcontext_t
+#ifndef _MCONTEXT_T
+#define _MCONTEXT_T
+#if defined(__LP64__)
+typedef _STRUCT_MCONTEXT64	*mcontext_t;
+#define _STRUCT_MCONTEXT _STRUCT_MCONTEXT64
+#else
+typedef _STRUCT_MCONTEXT32	*mcontext_t;
+#define _STRUCT_MCONTEXT	_STRUCT_MCONTEXT32
+#endif
+#endif /* _MCONTEXT_T */
+#endif /* __need_mcontext_t */
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifndef I386_MCONTEXT_SIZE
+#define I386_MCONTEXT_SIZE	sizeof(struct mcontext)	
+#endif /* I386_MCONTEXT_SIZE */
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
diff --git a/i386/include/i386/_types.h b/i386/include/i386/_types.h
new file mode 100644
index 0000000..67741d5
--- /dev/null
+++ b/i386/include/i386/_types.h
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef	_BSD_I386__TYPES_H_
+#define	_BSD_I386__TYPES_H_
+
+/*
+ * This header file contains integer types.  It's intended to also contain
+ * flotaing point and other arithmetic types, as needed, later.
+ */
+
+#ifdef __GNUC__
+typedef __signed char		__int8_t;
+#else	/* !__GNUC__ */
+typedef char			__int8_t;
+#endif	/* !__GNUC__ */
+typedef unsigned char		__uint8_t;
+typedef	short			__int16_t;
+typedef	unsigned short		__uint16_t;
+typedef int			__int32_t;
+typedef unsigned int		__uint32_t;
+typedef long long		__int64_t;
+typedef unsigned long long	__uint64_t;
+
+typedef long			__darwin_intptr_t;
+typedef unsigned int		__darwin_natural_t;
+
+/*
+ * The rune type below is declared to be an ``int'' instead of the more natural
+ * ``unsigned long'' or ``long''.  Two things are happening here.  It is not
+ * unsigned so that EOF (-1) can be naturally assigned to it and used.  Also,
+ * it looks like 10646 will be a 31 bit standard.  This means that if your
+ * ints cannot hold 32 bits, you will be in trouble.  The reason an int was
+ * chosen over a long is that the is*() and to*() routines take ints (says
+ * ANSI C), but they use __darwin_ct_rune_t instead of int.  By changing it
+ * here, you lose a bit of ANSI conformance, but your programs will still
+ * work.
+ *
+ * NOTE: rune_t is not covered by ANSI nor other standards, and should not
+ * be instantiated outside of lib/libc/locale.  Use wchar_t.  wchar_t and
+ * rune_t must be the same type.  Also wint_t must be no narrower than
+ * wchar_t, and should also be able to hold all members of the largest
+ * character set plus one extra value (WEOF). wint_t must be at least 16 bits.
+ */
+
+typedef int			__darwin_ct_rune_t;	/* ct_rune_t */
+
+/*
+ * mbstate_t is an opaque object to keep conversion state, during multibyte
+ * stream conversions.  The content must not be referenced by user programs.
+ */
+typedef union {
+	char		__mbstate8[128];
+	long long	_mbstateL;			/* for alignment */
+} __mbstate_t;
+
+typedef __mbstate_t		__darwin_mbstate_t;	/* mbstate_t */
+
+#if defined(__GNUC__) && defined(__PTRDIFF_TYPE__)
+typedef __PTRDIFF_TYPE__	__darwin_ptrdiff_t;	/* ptr1 - ptr2 */
+#else
+typedef int			__darwin_ptrdiff_t;	/* ptr1 - ptr2 */
+#endif /* __GNUC__ */
+
+#if defined(__GNUC__) && defined(__SIZE_TYPE__)
+typedef __SIZE_TYPE__		__darwin_size_t;	/* sizeof() */
+#else
+typedef unsigned long		__darwin_size_t;	/* sizeof() */
+#endif
+
+#if (__GNUC__ > 2)
+typedef __builtin_va_list	__darwin_va_list;	/* va_list */
+#else
+typedef void *			__darwin_va_list;	/* va_list */
+#endif
+
+#if defined(__GNUC__) && defined(__WCHAR_TYPE__)
+typedef __WCHAR_TYPE__		__darwin_wchar_t;	/* wchar_t */
+#else
+typedef __darwin_ct_rune_t	__darwin_wchar_t;	/* wchar_t */
+#endif
+
+typedef __darwin_wchar_t	__darwin_rune_t;	/* rune_t */
+
+#if defined(__GNUC__) && defined(__WINT_TYPE__)
+typedef __WINT_TYPE__		__darwin_wint_t;	/* wint_t */
+#else
+typedef __darwin_ct_rune_t	__darwin_wint_t;	/* wint_t */
+#endif
+
+typedef unsigned long		__darwin_clock_t;	/* clock() */
+typedef __uint32_t		__darwin_socklen_t;	/* socklen_t (duh) */
+typedef long			__darwin_ssize_t;	/* byte count or error */
+typedef long			__darwin_time_t;	/* time() */
+
+#endif	/* _BSD_I386__TYPES_H_ */
diff --git a/i386/include/i386/eflags.h b/i386/include/i386/eflags.h
new file mode 100644
index 0000000..9dc6478
--- /dev/null
+++ b/i386/include/i386/eflags.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+#ifndef	_I386_EFLAGS_H_
+#define	_I386_EFLAGS_H_
+
+/*
+ *	i386 flags register
+ */
+
+#ifndef EFL_CF
+#define	EFL_CF		0x00000001		/* carry */
+#define	EFL_PF		0x00000004		/* parity of low 8 bits */
+#define	EFL_AF		0x00000010		/* carry out of bit 3 */
+#define	EFL_ZF		0x00000040		/* zero */
+#define	EFL_SF		0x00000080		/* sign */
+#define	EFL_TF		0x00000100		/* trace trap */
+#define	EFL_IF		0x00000200		/* interrupt enable */
+#define	EFL_DF		0x00000400		/* direction */
+#define	EFL_OF		0x00000800		/* overflow */
+#define	EFL_IOPL	0x00003000		/* IO privilege level: */
+#define	EFL_IOPL_KERNEL	0x00000000			/* kernel */
+#define	EFL_IOPL_USER	0x00003000			/* user */
+#define	EFL_NT		0x00004000		/* nested task */
+#define	EFL_RF		0x00010000		/* resume without tracing */
+#define	EFL_VM		0x00020000		/* virtual 8086 mode */
+#define EFL_AC		0x00040000		/* alignment check */
+#define EFL_VIF		0x00080000		/* virtual interrupt flag */
+#define EFL_VIP		0x00100000		/* virtual interrupt pending */
+#define EFL_ID		0x00200000		/* cpuID instruction */
+#endif
+
+#define EFL_CLR		0xfff88028
+#define EFL_SET		0x00000002
+
+#define	EFL_USER_SET	(EFL_IF)
+#define	EFL_USER_CLEAR	(EFL_IOPL|EFL_NT|EFL_RF)
+
+#endif	/* _I386_EFLAGS_H_ */
diff --git a/i386/include/i386/endian.h b/i386/include/i386/endian.h
new file mode 100644
index 0000000..9f64aa0
--- /dev/null
+++ b/i386/include/i386/endian.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright 1995 NeXT Computer, Inc. All rights reserved.
+ */
+/*
+ * Copyright (c) 1987, 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)endian.h	8.1 (Berkeley) 6/11/93
+ */
+
+#ifndef _I386__ENDIAN_H_
+#define	_I386__ENDIAN_H_
+
+#include <sys/cdefs.h>
+/*
+ * Define _NOQUAD if the compiler does NOT support 64-bit integers.
+ */
+/* #define _NOQUAD */
+
+/*
+ * Define the order of 32-bit words in 64-bit words.
+ */
+#define _QUAD_HIGHWORD 1
+#define _QUAD_LOWWORD 0
+
+/*
+ * Definitions for byte order, according to byte significance from low
+ * address to high.
+ */
+#define	__DARWIN_LITTLE_ENDIAN	1234	/* LSB first: i386, vax */
+#define	__DARWIN_BIG_ENDIAN	4321	/* MSB first: 68000, ibm, net */
+#define	__DARWIN_PDP_ENDIAN	3412	/* LSB first in word, MSW first in long */
+
+#define	__DARWIN_BYTE_ORDER	__DARWIN_LITTLE_ENDIAN
+
+#if	defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+
+#define	LITTLE_ENDIAN	__DARWIN_LITTLE_ENDIAN
+#define	BIG_ENDIAN	__DARWIN_BIG_ENDIAN
+#define	PDP_ENDIAN	__DARWIN_PDP_ENDIAN
+
+#define	BYTE_ORDER	__DARWIN_BYTE_ORDER
+
+#include <sys/_endian.h>
+
+#endif /* defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) */
+#endif /* !_I386__ENDIAN_H_ */
diff --git a/i386/include/i386/fasttrap_isa.h b/i386/include/i386/fasttrap_isa.h
new file mode 100644
index 0000000..d51c7dd
--- /dev/null
+++ b/i386/include/i386/fasttrap_isa.h
@@ -0,0 +1,116 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef	_FASTTRAP_ISA_H
+#define	_FASTTRAP_ISA_H
+
+/*
+ * #pragma ident	"@(#)fasttrap_isa.h	1.6	06/09/19 SMI"
+ */
+
+#include <sys/types.h>
+#include <stdint.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define	FASTTRAP_MAX_INSTR_SIZE		15
+
+#define	FASTTRAP_INSTR			0xcc
+
+#define	FASTTRAP_SUNWDTRACE_SIZE	64
+
+typedef	uint8_t		fasttrap_instr_t;
+
+typedef struct fasttrap_machtp {
+	uint8_t		ftmt_instr[FASTTRAP_MAX_INSTR_SIZE]; /* orig. instr. */
+	uint8_t		ftmt_size;	/* instruction size */
+#if __sol64 || defined(__APPLE__)
+	uint8_t		ftmt_ripmode;	/* %rip-relative handling mode */
+	uint8_t		ftmt_modrm;	/* saved modrm byte */
+#endif
+	uint8_t		ftmt_type;	/* emulation type */
+	uint8_t		ftmt_code;	/* branch condition */
+	uint8_t		ftmt_base;	/* branch base */
+	uint8_t		ftmt_index;	/* branch index */
+	uint8_t		ftmt_scale;	/* branch scale */
+	uint8_t		ftmt_segment;	/* segment for memory accesses */
+	user_addr_t	ftmt_dest;	/* destination of control flow */
+} fasttrap_machtp_t;
+
+#define	ftt_instr	ftt_mtp.ftmt_instr
+#if __sol64 || defined(__APPLE__)
+#define	ftt_ripmode	ftt_mtp.ftmt_ripmode
+#define	ftt_modrm	ftt_mtp.ftmt_modrm
+#endif
+#define	ftt_size	ftt_mtp.ftmt_size
+#define	ftt_type	ftt_mtp.ftmt_type
+#define	ftt_code	ftt_mtp.ftmt_code
+#define	ftt_base	ftt_mtp.ftmt_base
+#define	ftt_index	ftt_mtp.ftmt_index
+#define	ftt_scale	ftt_mtp.ftmt_scale
+#define	ftt_segment	ftt_mtp.ftmt_segment
+#define	ftt_dest	ftt_mtp.ftmt_dest
+
+#define	FASTTRAP_T_COMMON	0x00	/* common case -- no emulation */
+#define	FASTTRAP_T_JCC		0x01	/* near and far conditional jumps */
+#define	FASTTRAP_T_LOOP		0x02	/* loop instructions */
+#define	FASTTRAP_T_JCXZ		0x03	/* jump if %ecx/%rcx is zero */
+#define	FASTTRAP_T_JMP		0x04	/* relative jump */
+#define	FASTTRAP_T_CALL		0x05	/* near call (and link) */
+#define	FASTTRAP_T_RET		0x06	/* ret */
+#define	FASTTRAP_T_RET16	0x07	/* ret <imm16> */
+
+/*
+ * For performance rather than correctness.
+ */
+#define	FASTTRAP_T_PUSHL_EBP	0x10	/* pushl %ebp (for function entry) */
+#define	FASTTRAP_T_NOP		0x11	/* nop */
+
+#define	FASTTRAP_RIP_1		0x1
+#define	FASTTRAP_RIP_2		0x2
+#define	FASTTRAP_RIP_X		0x4
+
+/*
+ * Segment values.
+ */
+#define	FASTTRAP_SEG_NONE		0
+#define	FASTTRAP_SEG_CS			1
+#define	FASTTRAP_SEG_DS			2
+#define	FASTTRAP_SEG_ES			3
+#define	FASTTRAP_SEG_FS			4
+#define	FASTTRAP_SEG_GS			5
+#define	FASTTRAP_SEG_SS			6
+
+#define	FASTTRAP_RETURN_AFRAMES		6	
+#define	FASTTRAP_ENTRY_AFRAMES		5
+#define	FASTTRAP_OFFSET_AFRAMES		5
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _FASTTRAP_ISA_H */
diff --git a/i386/include/i386/limits.h b/i386/include/i386/limits.h
new file mode 100644
index 0000000..9ee7c03
--- /dev/null
+++ b/i386/include/i386/limits.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)limits.h	8.3 (Berkeley) 1/4/94
+ */
+
+#ifndef _I386_LIMITS_H_
+#define _I386_LIMITS_H_
+
+#include <sys/cdefs.h>
+#include <i386/_limits.h>
+
+#define	CHAR_BIT	8		/* number of bits in a char */
+#define	MB_LEN_MAX	6		/* Allow 31 bit UTF2 */
+
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+#define	CLK_TCK		__DARWIN_CLK_TCK	/* ticks per second */
+#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/*
+ * According to ANSI (section 2.2.4.2), the values below must be usable by
+ * #if preprocessing directives.  Additionally, the expression must have the
+ * same type as would an expression that is an object of the corresponding
+ * type converted according to the integral promotions.  The subtraction for
+ * INT_MIN and LONG_MIN is so the value is not unsigned; 2147483648 is an
+ * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
+ * These numbers work for pcc as well.  The UINT_MAX and ULONG_MAX values
+ * are written as hex so that GCC will be quiet about large integer constants.
+ */
+#define	SCHAR_MAX	127		/* min value for a signed char */
+#define	SCHAR_MIN	(-128)		/* max value for a signed char */
+
+#define	UCHAR_MAX	255		/* max value for an unsigned char */
+#define	CHAR_MAX	127		/* max value for a char */
+#define	CHAR_MIN	(-128)		/* min value for a char */
+
+#define	USHRT_MAX	65535		/* max value for an unsigned short */
+#define	SHRT_MAX	32767		/* max value for a short */
+#define	SHRT_MIN	(-32768)	/* min value for a short */
+
+#define	UINT_MAX	0xffffffff	/* max value for an unsigned int */
+#define	INT_MAX		2147483647	/* max value for an int */
+#define	INT_MIN		(-2147483647-1)	/* min value for an int */
+
+#ifdef __LP64__
+#define	ULONG_MAX	0xffffffffffffffffUL	/* max unsigned long */
+#define	LONG_MAX	0x7fffffffffffffffL	/* max signed long */
+#define	LONG_MIN	(-0x7fffffffffffffffL-1) /* min signed long */
+#else /* !__LP64__ */
+#define	ULONG_MAX	0xffffffffUL	/* max unsigned long */
+#define	LONG_MAX	2147483647L	/* max signed long */
+#define	LONG_MIN	(-2147483647L-1) /* min signed long */
+#endif /* __LP64__ */
+
+#define	ULLONG_MAX	0xffffffffffffffffULL	/* max unsigned long long */
+#define	LLONG_MAX	0x7fffffffffffffffLL	/* max signed long long */
+#define	LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min signed long long */
+
+#if !defined(_ANSI_SOURCE)
+#ifdef __LP64__
+#define LONG_BIT	64
+#else /* !__LP64__ */
+#define LONG_BIT	32
+#endif /* __LP64__ */
+#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
+#define WORD_BIT	32
+
+#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || defined(_DARWIN_C_SOURCE)
+#define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
+
+#define	UQUAD_MAX	ULLONG_MAX
+#define	QUAD_MAX	LLONG_MAX
+#define	QUAD_MIN	LLONG_MIN
+
+#endif /* (!_POSIX_C_SOURCE && !_XOPEN_SOURCE) || _DARWIN_C_SOURCE */
+#endif /* !_ANSI_SOURCE */
+
+#endif /* _I386_LIMITS_H_ */
diff --git a/i386/include/i386/param.h b/i386/include/i386/param.h
new file mode 100644
index 0000000..03a38d2
--- /dev/null
+++ b/i386/include/i386/param.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)param.h	8.1 (Berkeley) 4/4/95
+ */
+
+/*
+ * Machine dependent constants for Intel 386.
+ */
+
+#ifndef _I386_PARAM_H_
+#define _I386_PARAM_H_
+
+#include <i386/_param.h>
+
+/*
+ * Round p (pointer or byte index) up to a correctly-aligned value for all
+ * data types (int, long, ...).   The result is unsigned int and must be
+ * cast to any desired pointer type.
+ */
+#define	ALIGNBYTES	__DARWIN_ALIGNBYTES
+#define	ALIGN(p)	__DARWIN_ALIGN(p)
+
+#define	NBPG		4096		/* bytes/page */
+#define	PGOFSET		(NBPG-1)	/* byte offset into page */
+#define	PGSHIFT		12		/* LOG2(NBPG) */
+
+#define	DEV_BSIZE	512
+#define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
+#define BLKDEV_IOSIZE	2048
+#define	MAXPHYS		(128 * 1024)	/* max raw I/O transfer size */
+
+#define	CLSIZE		1
+#define	CLSIZELOG2	0
+
+/*
+ * Constants related to network buffer management.
+ * MCLBYTES must be no larger than CLBYTES (the software page size), and,
+ * on machines that exchange pages of input or output buffers with mbuf
+ * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
+ * of the hardware page size.
+ */
+#define	MSIZE		256		/* size of an mbuf */
+#define	MCLBYTES	2048		/* large enough for ether MTU */
+#define	MCLSHIFT	11
+#define	MCLOFSET	(MCLBYTES - 1)
+#ifndef NMBCLUSTERS
+#ifdef GATEWAY
+#define	NMBCLUSTERS	((1024 * 1024) / MCLBYTES)	/* cl map size: 1MB */
+#else
+#define	NMBCLUSTERS	((1024 * 512) / MCLBYTES)	/* cl map size: 0.5MB */
+#endif
+#endif
+
+/*
+ * Some macros for units conversion
+ */
+/* Core clicks (NeXT_page_size bytes) to segments and vice versa */
+#define	ctos(x)	(x)
+#define	stoc(x)	(x)
+
+/* Core clicks (4096 bytes) to disk blocks */
+#define	ctod(x)	((x)<<(PGSHIFT-DEV_BSHIFT))
+#define	dtoc(x)	((x)>>(PGSHIFT-DEV_BSHIFT))
+#define	dtob(x)	((x)<<DEV_BSHIFT)
+
+/* clicks to bytes */
+#define	ctob(x)	((x)<<PGSHIFT)
+
+/* bytes to clicks */
+#define	btoc(x)	(((unsigned)(x)+(NBPG-1))>>PGSHIFT)
+
+#ifdef __APPLE__
+#define  btodb(bytes, devBlockSize)         \
+        ((unsigned)(bytes) / devBlockSize)
+#define  dbtob(db, devBlockSize)            \
+        ((unsigned)(db) * devBlockSize)
+#else
+#define	btodb(bytes)	 		/* calculates (bytes / DEV_BSIZE) */ \
+	((unsigned)(bytes) >> DEV_BSHIFT)
+#define	dbtob(db)			/* calculates (db * DEV_BSIZE) */ \
+	((unsigned)(db) << DEV_BSHIFT)
+#endif
+
+/*
+ * Map a ``block device block'' to a file system block.
+ * This should be device dependent, and will be if we
+ * add an entry to cdevsw/bdevsw for that purpose.
+ * For now though just use DEV_BSIZE.
+ */
+#define	bdbtofsb(bn)	((bn) / (BLKDEV_IOSIZE/DEV_BSIZE))
+
+/*
+ * Macros to decode (and encode) processor status word.
+ */
+#define STATUS_WORD(rpl, ipl)	(((ipl) << 8) | (rpl))
+#define	USERMODE(x)		(((x) & 3) == 3)
+#define	BASEPRI(x)		(((x) & (255 << 8)) == 0)
+
+
+#if	defined(KERNEL) || defined(STANDALONE)
+#define	DELAY(n) delay(n)
+
+#else	/* defined(KERNEL) || defined(STANDALONE) */
+#define	DELAY(n)	{ register int N = (n); while (--N > 0); }
+#endif	/* defined(KERNEL) || defined(STANDALONE) */
+
+#endif /* _I386_PARAM_H_ */
diff --git a/i386/include/i386/profile.h b/i386/include/i386/profile.h
new file mode 100644
index 0000000..26782f8
--- /dev/null
+++ b/i386/include/i386/profile.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1997, Apple Computer, Inc. All rights reserved.
+ *
+ */
+
+#ifndef _BSD_I386_PROFILE_H_
+#define _BSD_I386_PROFILE_H_
+
+#include <sys/appleapiopts.h>
+
+
+#endif /* _BSD_I386_PROFILE_H_ */
diff --git a/i386/include/i386/setjmp.h b/i386/include/i386/setjmp.h
new file mode 100644
index 0000000..aff6e3c
--- /dev/null
+++ b/i386/include/i386/setjmp.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved.
+ *
+ *	File:	setjmp.h
+ *
+ *	Declaration of setjmp routines and data structures.
+ */
+#ifndef _BSD_I386_SETJMP_H
+#define _BSD_I386_SETJMP_H
+
+#include <sys/cdefs.h>
+
+#if defined(__x86_64__)
+/*
+ * _JBLEN is number of ints required to save the following:
+ * rflags, rip, rbp, rsp, rbx, r12, r13, r14, r15... these are 8 bytes each
+ * mxcsr, fp control word, sigmask... these are 4 bytes each
+ * add 16 ints for future expansion needs...
+ */
+#define _JBLEN ((9 * 2) + 3 + 16)
+typedef int jmp_buf[_JBLEN];
+typedef int sigjmp_buf[_JBLEN + 1];
+
+#else
+
+/*
+ * _JBLEN is number of ints required to save the following:
+ * eax, ebx, ecx, edx, edi, esi, ebp, esp, ss, eflags, eip,
+ * cs, de, es, fs, gs == 16 ints
+ * onstack, mask = 2 ints
+ */
+
+#define _JBLEN (18)
+typedef int jmp_buf[_JBLEN];
+typedef int sigjmp_buf[_JBLEN + 1];
+
+#endif
+
+__BEGIN_DECLS
+int	setjmp(jmp_buf);
+void	longjmp(jmp_buf, int);
+
+#ifndef _ANSI_SOURCE
+int	_setjmp(jmp_buf);
+void	_longjmp(jmp_buf, int);
+int	sigsetjmp(sigjmp_buf, int);
+void	siglongjmp(sigjmp_buf, int);
+#endif /* _ANSI_SOURCE  */
+
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+void	longjmperror(void);
+#endif /* neither ANSI nor POSIX */
+__END_DECLS
+#endif /* !_BSD_I386_SETJMP_H */
diff --git a/i386/include/i386/signal.h b/i386/include/i386/signal.h
new file mode 100644
index 0000000..8419888
--- /dev/null
+++ b/i386/include/i386/signal.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992 NeXT Computer, Inc.
+ *
+ */
+
+#ifndef	_I386_SIGNAL_H_
+#define	_I386_SIGNAL_H_ 1
+
+#include <sys/cdefs.h>
+
+#ifndef _ANSI_SOURCE
+typedef int sig_atomic_t; 
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+
+#include <sys/appleapiopts.h>
+
+#ifdef __APPLE_API_OBSOLETE
+
+/*
+ * Information pushed on stack when a signal is delivered.
+ * This is used by the kernel to restore state following
+ * execution of the signal handler.  It is also made available
+ * to the handler to allow it to properly restore state if
+ * a non-standard exit is performed.
+ */
+#define __need_struct_sigcontext
+#include <i386/_structs.h>
+
+#endif /* __APPLE_API_OBSOLETE */
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#endif /* ! _ANSI_SOURCE */
+
+#endif	/* _I386_SIGNAL_H_ */
+
diff --git a/i386/include/i386/types.h b/i386/include/i386/types.h
new file mode 100644
index 0000000..ef4e660
--- /dev/null
+++ b/i386/include/i386/types.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright 1995 NeXT Computer, Inc. All rights reserved.
+ */
+/*
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)types.h	8.3 (Berkeley) 1/5/94
+ */
+
+#ifndef	_MACHTYPES_H_
+#define	_MACHTYPES_H_
+
+#include <i386/types.h>
+
+
+#ifndef __ASSEMBLER__
+#include <i386/_types.h>
+#include <sys/cdefs.h>
+/*
+ * Basic integral types.  Omit the typedef if
+ * not possible for a machine/compiler combination.
+ */
+#ifndef _INT8_T
+#define _INT8_T
+typedef	__signed char		int8_t;
+#endif
+typedef	unsigned char		u_int8_t;
+#ifndef _INT16_T
+#define _INT16_T
+typedef	short			int16_t;
+#endif
+typedef	unsigned short		u_int16_t;
+#ifndef _INT32_T
+#define _INT32_T
+typedef	int			int32_t;
+#endif
+typedef	unsigned int		u_int32_t;
+#ifndef _INT64_T
+#define _INT64_T
+typedef	long long		int64_t;
+#endif
+typedef	unsigned long long	u_int64_t;
+
+#if __LP64__
+typedef int64_t			register_t;
+#else
+typedef int32_t			register_t;
+#endif
+
+#ifndef _INTPTR_T
+#define _INTPTR_T
+typedef __darwin_intptr_t	intptr_t;
+#endif
+#ifndef _UINTPTR_T
+#define _UINTPTR_T
+typedef unsigned long		uintptr_t;
+#endif
+
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+/* These types are used for reserving the largest possible size. */
+typedef u_int64_t		user_addr_t;	
+typedef u_int64_t		user_size_t;	
+typedef int64_t			user_ssize_t;
+typedef int64_t			user_long_t;
+typedef u_int64_t		user_ulong_t;
+typedef int64_t			user_time_t;
+typedef int64_t			user_off_t;
+#define USER_ADDR_NULL	((user_addr_t) 0)
+#define CAST_USER_ADDR_T(a_ptr)   ((user_addr_t)((uintptr_t)(a_ptr)))
+
+
+#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/* This defines the size of syscall arguments after copying into the kernel: */
+typedef u_int64_t		syscall_arg_t;
+
+#ifndef __offsetof
+#define __offsetof(type, field) ((size_t)(&((type *)0)->field))
+#endif
+
+#endif /* __ASSEMBLER__ */
+#endif	/* _MACHTYPES_H_ */
diff --git a/i386/include/i386/user_ldt.h b/i386/include/i386/user_ldt.h
new file mode 100644
index 0000000..3b61e3f
--- /dev/null
+++ b/i386/include/i386/user_ldt.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon 
+ * the rights to redistribute these changes.
+ */
+
+/*
+ */
+
+#ifndef	_I386_USER_LDT_H_
+#define	_I386_USER_LDT_H_
+
+/*
+ * User LDT management.
+ *
+ * Each task may have its own LDT.
+ */
+
+#define	LDT_AUTO_ALLOC	0xffffffff
+
+#include <sys/cdefs.h>
+
+union ldt_entry;
+
+__BEGIN_DECLS
+int i386_get_ldt(int, union ldt_entry *, int);
+int i386_set_ldt(int, const union ldt_entry *, int);
+__END_DECLS
+
+#endif	/* _I386_USER_LDT_H_ */
diff --git a/i386/include/i386/vmparam.h b/i386/include/i386/vmparam.h
new file mode 100644
index 0000000..b6389b4
--- /dev/null
+++ b/i386/include/i386/vmparam.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_BSD_I386_VMPARAM_H_
+#define	_BSD_I386_VMPARAM_H_ 1
+
+#include <sys/resource.h>
+
+/* Rosetta dependency on this address */
+#define	USRSTACK	VM_USRSTACK32
+
+#define	USRSTACK64	VM_USRSTACK64
+
+
+/*
+ * Virtual memory related constants, all in bytes
+ */
+#ifndef DFLDSIZ
+#define	DFLDSIZ		(RLIM_INFINITY)		/* initial data size limit */
+#endif
+#ifndef MAXDSIZ
+#define	MAXDSIZ		(RLIM_INFINITY)		/* max data size */
+#endif
+#ifndef	DFLSSIZ
+#define	DFLSSIZ		(8*1024*1024)		/* initial stack size limit */
+#endif
+#ifndef	MAXSSIZ
+#define	MAXSSIZ		(64*1024*1024)		/* max stack size */
+#endif
+#ifndef	DFLCSIZ
+#define DFLCSIZ		(0)			/* initial core size limit */
+#endif
+#ifndef	MAXCSIZ
+#define MAXCSIZ		(RLIM_INFINITY)		/* max core size */
+#endif	/* MAXCSIZ */
+
+#endif	/* _BSD_I386_VMPARAM_H_ */
diff --git a/i386/include/inttypes.h b/i386/include/inttypes.h
new file mode 100644
index 0000000..4f9dd8d
--- /dev/null
+++ b/i386/include/inttypes.h
@@ -0,0 +1,321 @@
+/*
+ * Copyright (c) 2000, 2001, 2002, 2003, 2004 Apple Computer, Inc.
+ * All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ *
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+/*
+ * <inttypes.h> -- Standard C header, defined in ISO/IEC 9899:1999
+ * (aka "C99"), section 7.8.   This defines format string conversion
+ * specifiers suitable for use within arguments to fprintf and fscanf
+ * and their ilk.
+ */
+
+/* "C++ implementations should define these macros only when
+ *  __STDC_FORMAT_MACROS is defined before <inttypes.h> is included."
+ */
+#if (!defined(__cplusplus) || defined(__STDC_FORMAT_MACROS)) && !defined(__STDC_FORMAT_MACROS_DEFINED)
+#define __STDC_FORMAT_MACROS_DEFINED
+
+#  undef __PRI_8_LENGTH_MODIFIER__
+#  undef __PRI_64_LENGTH_MODIFIER__
+#  undef __SCN_64_LENGTH_MODIFIER__
+
+#  if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 > 1020
+#    define __PRI_8_LENGTH_MODIFIER__ "hh"
+#    define __PRI_64_LENGTH_MODIFIER__ "ll"
+#    define __SCN_64_LENGTH_MODIFIER__ "ll"
+#  else
+/* These could be "hh", "ll", and "ll" respectively, but that doesn't work on
+   10.2, and these do.  Note that there's no way to use scanf to scan a
+   decimal into a 'char' argument on 10.2, so "hh" is used unconditionally
+   and programs that use it won't work on Jaguar.  */
+#    define __PRI_8_LENGTH_MODIFIER__ ""  /* none */
+#    define __PRI_64_LENGTH_MODIFIER__ "q"
+#    define __SCN_64_LENGTH_MODIFIER__ "q"
+#  endif
+#  define __PRI_MAX_LENGTH_MODIFIER__ "j"
+#  define __SCN_MAX_LENGTH_MODIFIER__ "j"
+
+#  define PRId8         __PRI_8_LENGTH_MODIFIER__ "d"
+#  define PRIi8         __PRI_8_LENGTH_MODIFIER__ "i"
+#  define PRIo8         __PRI_8_LENGTH_MODIFIER__ "o"
+#  define PRIu8         __PRI_8_LENGTH_MODIFIER__ "u"
+#  define PRIx8         __PRI_8_LENGTH_MODIFIER__ "x"
+#  define PRIX8         __PRI_8_LENGTH_MODIFIER__ "X"
+
+#  define PRId16        "hd"
+#  define PRIi16        "hi"
+#  define PRIo16        "ho"
+#  define PRIu16        "hu"
+#  define PRIx16        "hx"
+#  define PRIX16        "hX"
+
+#  define PRId32        "d"
+#  define PRIi32        "i"
+#  define PRIo32        "o"
+#  define PRIu32        "u"
+#  define PRIx32        "x"
+#  define PRIX32        "X"
+
+#  define PRId64        __PRI_64_LENGTH_MODIFIER__ "d"
+#  define PRIi64        __PRI_64_LENGTH_MODIFIER__ "i"
+#  define PRIo64        __PRI_64_LENGTH_MODIFIER__ "o"
+#  define PRIu64        __PRI_64_LENGTH_MODIFIER__ "u"
+#  define PRIx64        __PRI_64_LENGTH_MODIFIER__ "x"
+#  define PRIX64        __PRI_64_LENGTH_MODIFIER__ "X"
+
+#  define PRIdLEAST8    PRId8
+#  define PRIiLEAST8    PRIi8
+#  define PRIoLEAST8    PRIo8
+#  define PRIuLEAST8    PRIu8
+#  define PRIxLEAST8    PRIx8
+#  define PRIXLEAST8    PRIX8
+
+#  define PRIdLEAST16   PRId16
+#  define PRIiLEAST16   PRIi16
+#  define PRIoLEAST16   PRIo16
+#  define PRIuLEAST16   PRIu16
+#  define PRIxLEAST16   PRIx16
+#  define PRIXLEAST16   PRIX16
+
+#  define PRIdLEAST32   PRId32
+#  define PRIiLEAST32   PRIi32
+#  define PRIoLEAST32   PRIo32
+#  define PRIuLEAST32   PRIu32
+#  define PRIxLEAST32   PRIx32
+#  define PRIXLEAST32   PRIX32
+
+#  define PRIdLEAST64   PRId64
+#  define PRIiLEAST64   PRIi64
+#  define PRIoLEAST64   PRIo64
+#  define PRIuLEAST64   PRIu64
+#  define PRIxLEAST64   PRIx64
+#  define PRIXLEAST64   PRIX64
+
+#  define PRIdFAST8     PRId8
+#  define PRIiFAST8     PRIi8
+#  define PRIoFAST8     PRIo8
+#  define PRIuFAST8     PRIu8
+#  define PRIxFAST8     PRIx8
+#  define PRIXFAST8     PRIX8
+
+#  define PRIdFAST16    PRId16
+#  define PRIiFAST16    PRIi16
+#  define PRIoFAST16    PRIo16
+#  define PRIuFAST16    PRIu16
+#  define PRIxFAST16    PRIx16
+#  define PRIXFAST16    PRIX16
+
+#  define PRIdFAST32    PRId32
+#  define PRIiFAST32    PRIi32
+#  define PRIoFAST32    PRIo32
+#  define PRIuFAST32    PRIu32
+#  define PRIxFAST32    PRIx32
+#  define PRIXFAST32    PRIX32
+
+#  define PRIdFAST64    PRId64
+#  define PRIiFAST64    PRIi64
+#  define PRIoFAST64    PRIo64
+#  define PRIuFAST64    PRIu64
+#  define PRIxFAST64    PRIx64
+#  define PRIXFAST64    PRIX64
+
+/* int32_t is 'int', but intptr_t is 'long'.  */
+#  define PRIdPTR       "ld"
+#  define PRIiPTR       "li"
+#  define PRIoPTR       "lo"
+#  define PRIuPTR       "lu"
+#  define PRIxPTR       "lx"
+#  define PRIXPTR       "lX"
+
+#  define PRIdMAX        __PRI_MAX_LENGTH_MODIFIER__ "d"
+#  define PRIiMAX        __PRI_MAX_LENGTH_MODIFIER__ "i"
+#  define PRIoMAX        __PRI_MAX_LENGTH_MODIFIER__ "o"
+#  define PRIuMAX        __PRI_MAX_LENGTH_MODIFIER__ "u"
+#  define PRIxMAX        __PRI_MAX_LENGTH_MODIFIER__ "x"
+#  define PRIXMAX        __PRI_MAX_LENGTH_MODIFIER__ "X"
+
+#  if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 > 1020
+#    define SCNd8         __PRI_8_LENGTH_MODIFIER__ "d"
+#    define SCNi8         __PRI_8_LENGTH_MODIFIER__ "i"
+#    define SCNo8         __PRI_8_LENGTH_MODIFIER__ "o"
+#    define SCNu8         __PRI_8_LENGTH_MODIFIER__ "u"
+#    define SCNx8         __PRI_8_LENGTH_MODIFIER__ "x"
+#  else
+#    define SCNd8         "hhd"
+#    define SCNi8         "hhi"
+#    define SCNo8         "hho"
+#    define SCNu8         "hhu"
+#    define SCNx8         "hhx"
+#  endif
+
+#  define SCNd16        "hd"
+#  define SCNi16        "hi"
+#  define SCNo16        "ho"
+#  define SCNu16        "hu"
+#  define SCNx16        "hx"
+
+#  define SCNd32        "d"
+#  define SCNi32        "i"
+#  define SCNo32        "o"
+#  define SCNu32        "u"
+#  define SCNx32        "x"
+
+#  define SCNd64        __SCN_64_LENGTH_MODIFIER__ "d"
+#  define SCNi64        __SCN_64_LENGTH_MODIFIER__ "i"
+#  define SCNo64        __SCN_64_LENGTH_MODIFIER__ "o"
+#  define SCNu64        __SCN_64_LENGTH_MODIFIER__ "u"
+#  define SCNx64        __SCN_64_LENGTH_MODIFIER__ "x"
+
+#  define SCNdLEAST8    SCNd8
+#  define SCNiLEAST8    SCNi8
+#  define SCNoLEAST8    SCNo8
+#  define SCNuLEAST8    SCNu8
+#  define SCNxLEAST8    SCNx8
+
+#  define SCNdLEAST16   SCNd16
+#  define SCNiLEAST16   SCNi16
+#  define SCNoLEAST16   SCNo16
+#  define SCNuLEAST16   SCNu16
+#  define SCNxLEAST16   SCNx16
+
+#  define SCNdLEAST32   SCNd32
+#  define SCNiLEAST32   SCNi32
+#  define SCNoLEAST32   SCNo32
+#  define SCNuLEAST32   SCNu32
+#  define SCNxLEAST32   SCNx32
+
+#  define SCNdLEAST64   SCNd64
+#  define SCNiLEAST64   SCNi64
+#  define SCNoLEAST64   SCNo64
+#  define SCNuLEAST64   SCNu64
+#  define SCNxLEAST64   SCNx64
+
+#  define SCNdFAST8     SCNd8
+#  define SCNiFAST8     SCNi8
+#  define SCNoFAST8     SCNo8
+#  define SCNuFAST8     SCNu8
+#  define SCNxFAST8     SCNx8
+
+#  define SCNdFAST16    SCNd16
+#  define SCNiFAST16    SCNi16
+#  define SCNoFAST16    SCNo16
+#  define SCNuFAST16    SCNu16
+#  define SCNxFAST16    SCNx16
+
+#  define SCNdFAST32    SCNd32
+#  define SCNiFAST32    SCNi32
+#  define SCNoFAST32    SCNo32
+#  define SCNuFAST32    SCNu32
+#  define SCNxFAST32    SCNx32
+
+#  define SCNdFAST64    SCNd64
+#  define SCNiFAST64    SCNi64
+#  define SCNoFAST64    SCNo64
+#  define SCNuFAST64    SCNu64
+#  define SCNxFAST64    SCNx64
+
+#  define SCNdPTR       "ld"
+#  define SCNiPTR       "li"
+#  define SCNoPTR       "lo"
+#  define SCNuPTR       "lu"
+#  define SCNxPTR       "lx"
+
+#  define SCNdMAX       __SCN_MAX_LENGTH_MODIFIER__ "d"
+#  define SCNiMAX       __SCN_MAX_LENGTH_MODIFIER__ "i"
+#  define SCNoMAX       __SCN_MAX_LENGTH_MODIFIER__ "o"
+#  define SCNuMAX       __SCN_MAX_LENGTH_MODIFIER__ "u"
+#  define SCNxMAX       __SCN_MAX_LENGTH_MODIFIER__ "x"
+
+#endif /* if C++, then __STDC_FORMAT_MACROS enables the above macros */
+
+#if !defined(_INTTYPES_H_)
+#define _INTTYPES_H_
+
+#include <sys/cdefs.h>		/* For __BEGIN_DECLS and __END_DECLS */
+#include <_types.h>		/* For __darwin_wchar_t */
+#include <stdint.h>
+
+#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
+  /* Translator is not ISO/IEC 9899:1999-compliant. */
+#  if !defined(restrict)
+#    define restrict
+#    define __RESTRICT_KEYWORD_DEFINED__
+#  endif
+#endif
+
+__BEGIN_DECLS
+
+  /* 7.8.2.1 */
+  extern intmax_t imaxabs(intmax_t j);
+
+  /* 7.8.2.2 */
+  typedef struct {
+        intmax_t quot;
+        intmax_t rem;
+  } imaxdiv_t;
+
+  extern imaxdiv_t imaxdiv(intmax_t numer, intmax_t denom);
+
+  /* 7.8.2.3 */
+  extern intmax_t strtoimax(const char * restrict nptr, char ** restrict endptr, int base);
+  extern uintmax_t strtoumax(const char * restrict nptr, char ** restrict endptr, int base);
+
+#ifndef __cplusplus /* wchar_t is a built-in type in C++ */
+#  ifndef	_WCHAR_T
+#    define	_WCHAR_T
+     typedef	__darwin_wchar_t	wchar_t;
+#  endif /* _WCHAR_T */
+#endif /* __cplusplus */
+
+  /* 7.8.2.4 */
+  extern intmax_t wcstoimax(const wchar_t * restrict nptr, wchar_t ** restrict endptr, int base);
+  extern uintmax_t wcstoumax(const wchar_t * restrict nptr, wchar_t ** restrict endptr, int base);
+
+/* Poison the following routines if -fshort-wchar is set */
+#if !defined(__cplusplus) && defined(__WCHAR_MAX__) && __WCHAR_MAX__ <= 0xffffU
+#pragma GCC poison wcstoimax wcstoumax
+#endif
+
+__END_DECLS
+
+#ifdef _USE_EXTENDED_LOCALES_
+#include <xlocale/_inttypes.h>
+#endif /* _USE_EXTENDED_LOCALES_ */
+
+/*
+   No need to #undef the __*_{8,64}_LENGTH_MODIFIER__ macros;
+   in fact, you can't #undef them, because later uses of any of
+   their dependents will *not* then do the intended substitution.
+   Expansion of a #define like this one:
+
+        #define x IDENT y
+
+   uses the cpp value of IDENT at the location where x is *expanded*,
+   not where it is #defined.
+*/
+
+#if defined(__RESTRICT_KEYWORD_DEFINED__)
+#  undef restrict
+#  undef __RESTRICT_KEYWORD_DEFINED__
+#endif
+
+#endif /* !_INTTYPES_H_ */
diff --git a/i386/include/libkern/OSAtomic.h b/i386/include/libkern/OSAtomic.h
new file mode 100644
index 0000000..9f2dba4
--- /dev/null
+++ b/i386/include/libkern/OSAtomic.h
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _OSATOMIC_H_
+#define _OSATOMIC_H_
+
+#include    <stddef.h>
+#include    <sys/cdefs.h>
+#include    <stdint.h>
+#include    <stdbool.h>
+
+/* These are the preferred versions of the atomic and synchronization operations.
+ * Their implementation is customized at boot time for the platform, including
+ * late-breaking errata fixes as necessary.   They are thread safe.
+ *
+ * WARNING: all addresses passed to these functions must be "naturally aligned", ie
+ * int32_t's must be 32-bit aligned (low 2 bits of address zero), and int64_t's
+ * must be 64-bit aligned (low 3 bits of address zero.)
+ *
+ * Note that some versions of the atomic functions incorporate memory barriers,
+ * and some do not.  Barriers strictly order memory access on a weakly-ordered
+ * architecture such as PPC.  All loads and stores executed in sequential program
+ * order before the barrier will complete before any load or store executed after
+ * the barrier.  On a uniprocessor, the barrier operation is typically a nop.
+ * On a multiprocessor, the barrier can be quite expensive on some platforms,
+ * eg PPC.
+ *
+ * Most code will want to use the barrier functions to insure that memory shared
+ * between threads is properly synchronized.  For example, if you want to initialize
+ * a shared data structure and then atomically increment a variable to indicate
+ * that the initialization is complete, then you must use OSAtomicIncrement32Barrier()
+ * to ensure that the stores to your data structure complete before the atomic add.
+ * Likewise, the consumer of that data structure must use OSAtomicDecrement32Barrier(),
+ * in order to ensure that their loads of the structure are not executed before
+ * the atomic decrement.  On the other hand, if you are simply incrementing a global
+ * counter, then it is safe and potentially faster to use OSAtomicIncrement32().
+ *
+ * If you are unsure which version to use, prefer the barrier variants as they are
+ * safer.
+ *
+ * The spinlock and queue operations always incorporate a barrier.
+ */ 
+__BEGIN_DECLS
+
+
+/* Arithmetic functions.  They return the new value.
+ */
+int32_t	OSAtomicAdd32( int32_t __theAmount, volatile int32_t *__theValue );
+int32_t	OSAtomicAdd32Barrier( int32_t __theAmount, volatile int32_t *__theValue );
+
+__inline static
+int32_t	OSAtomicIncrement32( volatile int32_t *__theValue )
+            { return OSAtomicAdd32(  1, __theValue); }
+__inline static
+int32_t	OSAtomicIncrement32Barrier( volatile int32_t *__theValue )
+            { return OSAtomicAdd32Barrier(  1, __theValue); }
+
+__inline static
+int32_t	OSAtomicDecrement32( volatile int32_t *__theValue )
+            { return OSAtomicAdd32( -1, __theValue); }
+__inline static
+int32_t	OSAtomicDecrement32Barrier( volatile int32_t *__theValue )
+            { return OSAtomicAdd32Barrier( -1, __theValue); }
+
+#if defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__)
+
+int64_t	OSAtomicAdd64( int64_t __theAmount, volatile int64_t *__theValue );
+int64_t	OSAtomicAdd64Barrier( int64_t __theAmount, volatile int64_t *__theValue );
+
+__inline static
+int64_t	OSAtomicIncrement64( volatile int64_t *__theValue )
+            { return OSAtomicAdd64(  1, __theValue); }
+__inline static
+int64_t	OSAtomicIncrement64Barrier( volatile int64_t *__theValue )
+            { return OSAtomicAdd64Barrier(  1, __theValue); }
+
+__inline static
+int64_t	OSAtomicDecrement64( volatile int64_t *__theValue )
+            { return OSAtomicAdd64( -1, __theValue); }
+__inline static
+int64_t	OSAtomicDecrement64Barrier( volatile int64_t *__theValue )
+            { return OSAtomicAdd64Barrier( -1, __theValue); }
+
+#endif  /* defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__) */
+
+
+/* Boolean functions (and, or, xor.)  These come in four versions for each operation:
+ * with and without barriers, and returning the old or new value of the operation.
+ * The "Orig" versions return the original value, ie before the operation, the non-Orig
+ * versions return the value after the operation.  All are layered on top of
+ * compare-and-swap.
+ */
+int32_t	OSAtomicOr32( uint32_t __theMask, volatile uint32_t *__theValue );
+int32_t	OSAtomicOr32Barrier( uint32_t __theMask, volatile uint32_t *__theValue );
+int32_t	OSAtomicOr32Orig( uint32_t __theMask, volatile uint32_t *__theValue );
+int32_t	OSAtomicOr32OrigBarrier( uint32_t __theMask, volatile uint32_t *__theValue );
+
+int32_t	OSAtomicAnd32( uint32_t __theMask, volatile uint32_t *__theValue ); 
+int32_t	OSAtomicAnd32Barrier( uint32_t __theMask, volatile uint32_t *__theValue ); 
+int32_t	OSAtomicAnd32Orig( uint32_t __theMask, volatile uint32_t *__theValue ); 
+int32_t	OSAtomicAnd32OrigBarrier( uint32_t __theMask, volatile uint32_t *__theValue ); 
+
+int32_t	OSAtomicXor32( uint32_t __theMask, volatile uint32_t *__theValue );
+int32_t	OSAtomicXor32Barrier( uint32_t __theMask, volatile uint32_t *__theValue );
+int32_t	OSAtomicXor32Orig( uint32_t __theMask, volatile uint32_t *__theValue );
+int32_t	OSAtomicXor32OrigBarrier( uint32_t __theMask, volatile uint32_t *__theValue );
+ 
+
+/* Compare and swap.  They return true if the swap occured.  There are several versions,
+ * depending on data type and whether or not a barrier is used.
+ */
+bool    OSAtomicCompareAndSwap32( int32_t __oldValue, int32_t __newValue, volatile int32_t *__theValue );
+bool    OSAtomicCompareAndSwap32Barrier( int32_t __oldValue, int32_t __newValue, volatile int32_t *__theValue );
+bool	OSAtomicCompareAndSwapPtr( void *__oldValue, void *__newValue, void * volatile *__theValue );
+bool	OSAtomicCompareAndSwapPtrBarrier( void *__oldValue, void *__newValue, void * volatile *__theValue );
+bool	OSAtomicCompareAndSwapInt( int __oldValue, int __newValue, volatile int *__theValue );
+bool	OSAtomicCompareAndSwapIntBarrier( int __oldValue, int __newValue, volatile int *__theValue );
+bool	OSAtomicCompareAndSwapLong( long __oldValue, long __newValue, volatile long *__theValue );
+bool	OSAtomicCompareAndSwapLongBarrier( long __oldValue, long __newValue, volatile long *__theValue );
+
+#if defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__)
+
+bool    OSAtomicCompareAndSwap64( int64_t __oldValue, int64_t __newValue, volatile int64_t *__theValue );
+bool    OSAtomicCompareAndSwap64Barrier( int64_t __oldValue, int64_t __newValue, volatile int64_t *__theValue );
+
+#endif  /* defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__) */
+
+
+/* Test and set.  They return the original value of the bit, and operate on bit (0x80>>(n&7))
+ * in byte ((char*)theAddress + (n>>3)).
+ */
+bool    OSAtomicTestAndSet( uint32_t __n, volatile void *__theAddress );
+bool    OSAtomicTestAndSetBarrier( uint32_t __n, volatile void *__theAddress );
+bool    OSAtomicTestAndClear( uint32_t __n, volatile void *__theAddress );
+bool    OSAtomicTestAndClearBarrier( uint32_t __n, volatile void *__theAddress );
+ 
+
+/* Spinlocks.  These use memory barriers as required to synchronize access to shared
+ * memory protected by the lock.  The lock operation spins, but employs various strategies
+ * to back off if the lock is held, making it immune to most priority-inversion livelocks.
+ * The try operation immediately returns false if the lock was held, true if it took the
+ * lock.  The convention is that unlocked is zero, locked is nonzero.
+ */
+#define	OS_SPINLOCK_INIT    0
+
+typedef int32_t OSSpinLock;
+
+bool    OSSpinLockTry( volatile OSSpinLock *__lock );
+void    OSSpinLockLock( volatile OSSpinLock *__lock );
+void    OSSpinLockUnlock( volatile OSSpinLock *__lock );
+
+
+/* Lockless atomic enqueue and dequeue.  These routines manipulate singly
+ * linked LIFO lists.  Ie, a dequeue will return the most recently enqueued
+ * element, or NULL if the list is empty.  The "offset" parameter is the offset
+ * in bytes of the link field within the data structure being queued.  The
+ * link field should be a pointer type.  Memory barriers are incorporated as 
+ * needed to permit thread-safe access to the queue element.
+ */
+#if defined(__x86_64__)
+
+typedef volatile struct {
+	void	*opaque1;
+	long	 opaque2;
+} OSQueueHead __attribute__ ((aligned (16)));
+
+#else
+
+typedef volatile struct {
+	void	*opaque1;
+	long	 opaque2;
+} OSQueueHead;
+
+#endif
+
+#define	OS_ATOMIC_QUEUE_INIT	{ NULL, 0 }
+
+void  OSAtomicEnqueue( OSQueueHead *__list, void *__new, size_t __offset);
+void* OSAtomicDequeue( OSQueueHead *__list, size_t __offset);
+
+
+/* Memory barrier.  It is both a read and write barrier.
+ */
+void    OSMemoryBarrier( void );
+
+
+__END_DECLS
+
+#endif /* _OSATOMIC_H_ */
diff --git a/i386/include/libkern/OSByteOrder.h b/i386/include/libkern/OSByteOrder.h
new file mode 100644
index 0000000..915a249
--- /dev/null
+++ b/i386/include/libkern/OSByteOrder.h
@@ -0,0 +1,310 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _OS_OSBYTEORDER_H
+#define _OS_OSBYTEORDER_H
+
+#include <stdint.h>
+#include <libkern/_OSByteOrder.h>
+
+/* Macros for swapping constant values in the preprocessing stage. */
+#define OSSwapConstInt16(x)	__DARWIN_OSSwapConstInt16(x)
+#define OSSwapConstInt32(x)	__DARWIN_OSSwapConstInt32(x)
+#define OSSwapConstInt64(x)	__DARWIN_OSSwapConstInt64(x)
+
+#if defined(__GNUC__)
+
+#if (defined(__ppc__) || defined(__ppc64__))
+#include <libkern/ppc/OSByteOrder.h>
+#elif (defined(__i386__) || defined(__x86_64__))
+#include <libkern/i386/OSByteOrder.h>
+#elif defined(__arm__)
+#include <libkern/arm/OSByteOrder.h>
+#else
+#include <libkern/machine/OSByteOrder.h>
+#endif
+
+#else /* ! __GNUC__ */
+
+#include <libkern/machine/OSByteOrder.h>
+
+#endif /* __GNUC__ */
+
+#define OSSwapInt16(x)	__DARWIN_OSSwapInt16(x)
+#define OSSwapInt32(x)	__DARWIN_OSSwapInt32(x)
+#define OSSwapInt64(x)	__DARWIN_OSSwapInt64(x)
+
+enum {
+    OSUnknownByteOrder,
+    OSLittleEndian,
+    OSBigEndian
+};
+
+OS_INLINE
+int32_t
+OSHostByteOrder(void) {
+#if defined(__LITTLE_ENDIAN__)
+    return OSLittleEndian;
+#elif defined(__BIG_ENDIAN__)
+    return OSBigEndian;
+#else
+    return OSUnknownByteOrder;
+#endif
+}
+
+#define OSReadBigInt(x, y)		OSReadBigInt32(x, y)
+#define OSWriteBigInt(x, y, z)		OSWriteBigInt32(x, y, z)
+#define OSSwapBigToHostInt(x)		OSSwapBigToHostInt32(x)
+#define OSSwapHostToBigInt(x)		OSSwapHostToBigInt32(x)
+#define OSReadLittleInt(x, y)		OSReadLittleInt32(x, y)
+#define OSWriteLittleInt(x, y, z)	OSWriteLittleInt32(x, y, z)
+#define OSSwapHostToLittleInt(x)	OSSwapHostToLittleInt32(x)
+#define OSSwapLittleToHostInt(x)	OSSwapLittleToHostInt32(x)
+
+/* Functions for loading native endian values. */
+
+OS_INLINE
+uint16_t
+_OSReadInt16(
+    const volatile void               * base,
+    uintptr_t                     byteOffset
+)
+{
+    return *(volatile uint16_t *)((uintptr_t)base + byteOffset);
+}
+
+OS_INLINE
+uint32_t
+_OSReadInt32(
+    const volatile void               * base,
+    uintptr_t                     byteOffset
+)
+{
+    return *(volatile uint32_t *)((uintptr_t)base + byteOffset);
+}
+
+OS_INLINE
+uint64_t
+_OSReadInt64(
+    const volatile void               * base,
+    uintptr_t                     byteOffset
+)
+{
+    return *(volatile uint64_t *)((uintptr_t)base + byteOffset);
+}
+
+/* Functions for storing native endian values. */
+
+OS_INLINE
+void
+_OSWriteInt16(
+    volatile void               * base,
+    uintptr_t                     byteOffset,
+    uint16_t                      data
+)
+{
+    *(volatile uint16_t *)((uintptr_t)base + byteOffset) = data;
+}
+
+OS_INLINE
+void
+_OSWriteInt32(
+    volatile void               * base,
+    uintptr_t                     byteOffset,
+    uint32_t                      data
+)
+{
+    *(volatile uint32_t *)((uintptr_t)base + byteOffset) = data;
+}
+
+OS_INLINE
+void
+_OSWriteInt64(
+    volatile void               * base,
+    uintptr_t                     byteOffset,
+    uint64_t                      data
+)
+{
+    *(volatile uint64_t *)((uintptr_t)base + byteOffset) = data;
+}
+
+#if		defined(__BIG_ENDIAN__)
+
+/* Functions for loading big endian to host endianess. */
+
+#define OSReadBigInt16(base, byteOffset) _OSReadInt16(base, byteOffset)
+#define OSReadBigInt32(base, byteOffset) _OSReadInt32(base, byteOffset)
+#define OSReadBigInt64(base, byteOffset) _OSReadInt64(base, byteOffset)
+
+/* Functions for storing host endianess to big endian. */
+
+#define OSWriteBigInt16(base, byteOffset, data) _OSWriteInt16(base, byteOffset, data)
+#define OSWriteBigInt32(base, byteOffset, data) _OSWriteInt32(base, byteOffset, data)
+#define OSWriteBigInt64(base, byteOffset, data) _OSWriteInt64(base, byteOffset, data)
+
+/* Functions for loading little endian to host endianess. */
+
+#define OSReadLittleInt16(base, byteOffset) OSReadSwapInt16(base, byteOffset)
+#define OSReadLittleInt32(base, byteOffset) OSReadSwapInt32(base, byteOffset)
+#define OSReadLittleInt64(base, byteOffset) OSReadSwapInt64(base, byteOffset)
+
+/* Functions for storing host endianess to little endian. */
+
+#define OSWriteLittleInt16(base, byteOffset, data) OSWriteSwapInt16(base, byteOffset, data)
+#define OSWriteLittleInt32(base, byteOffset, data) OSWriteSwapInt32(base, byteOffset, data)
+#define OSWriteLittleInt64(base, byteOffset, data) OSWriteSwapInt64(base, byteOffset, data)
+
+/* Host endianess to big endian byte swapping macros for constants. */
+
+#define OSSwapHostToBigConstInt16(x) ((uint16_t)(x))
+#define OSSwapHostToBigConstInt32(x) ((uint32_t)(x))
+#define OSSwapHostToBigConstInt64(x) ((uint64_t)(x))
+
+/* Generic host endianess to big endian byte swapping functions. */
+
+#define OSSwapHostToBigInt16(x) ((uint16_t)(x))
+#define OSSwapHostToBigInt32(x) ((uint32_t)(x))
+#define OSSwapHostToBigInt64(x) ((uint64_t)(x))
+
+/* Host endianess to little endian byte swapping macros for constants. */
+
+#define OSSwapHostToLittleConstInt16(x) OSSwapConstInt16(x)
+#define OSSwapHostToLittleConstInt32(x) OSSwapConstInt32(x) 
+#define OSSwapHostToLittleConstInt64(x) OSSwapConstInt64(x) 
+
+/* Generic host endianess to little endian byte swapping functions. */
+
+#define OSSwapHostToLittleInt16(x) OSSwapInt16(x)
+#define OSSwapHostToLittleInt32(x) OSSwapInt32(x)
+#define OSSwapHostToLittleInt64(x) OSSwapInt64(x)
+
+/* Big endian to host endianess byte swapping macros for constants. */
+    
+#define OSSwapBigToHostConstInt16(x) ((uint16_t)(x))
+#define OSSwapBigToHostConstInt32(x) ((uint32_t)(x))
+#define OSSwapBigToHostConstInt64(x) ((uint64_t)(x))
+
+/* Generic big endian to host endianess byte swapping functions. */
+
+#define OSSwapBigToHostInt16(x) ((uint16_t)(x))
+#define OSSwapBigToHostInt32(x) ((uint32_t)(x))
+#define OSSwapBigToHostInt64(x) ((uint64_t)(x))
+
+/* Little endian to host endianess byte swapping macros for constants. */
+   
+#define OSSwapLittleToHostConstInt16(x) OSSwapConstInt16(x)
+#define OSSwapLittleToHostConstInt32(x) OSSwapConstInt32(x)
+#define OSSwapLittleToHostConstInt64(x) OSSwapConstInt64(x)
+
+/* Generic little endian to host endianess byte swapping functions. */
+
+#define OSSwapLittleToHostInt16(x) OSSwapInt16(x)
+#define OSSwapLittleToHostInt32(x) OSSwapInt32(x)
+#define OSSwapLittleToHostInt64(x) OSSwapInt64(x)
+
+#elif		defined(__LITTLE_ENDIAN__)
+
+/* Functions for loading big endian to host endianess. */
+
+#define OSReadBigInt16(base, byteOffset) OSReadSwapInt16(base, byteOffset)
+#define OSReadBigInt32(base, byteOffset) OSReadSwapInt32(base, byteOffset)
+#define OSReadBigInt64(base, byteOffset) OSReadSwapInt64(base, byteOffset)
+
+/* Functions for storing host endianess to big endian. */
+
+#define OSWriteBigInt16(base, byteOffset, data) OSWriteSwapInt16(base, byteOffset, data)
+#define OSWriteBigInt32(base, byteOffset, data) OSWriteSwapInt32(base, byteOffset, data)
+#define OSWriteBigInt64(base, byteOffset, data) OSWriteSwapInt64(base, byteOffset, data)
+
+/* Functions for loading little endian to host endianess. */
+
+#define OSReadLittleInt16(base, byteOffset) _OSReadInt16(base, byteOffset)
+#define OSReadLittleInt32(base, byteOffset) _OSReadInt32(base, byteOffset)
+#define OSReadLittleInt64(base, byteOffset) _OSReadInt64(base, byteOffset)
+
+/* Functions for storing host endianess to little endian. */
+
+#define OSWriteLittleInt16(base, byteOffset, data) _OSWriteInt16(base, byteOffset, data)
+#define OSWriteLittleInt32(base, byteOffset, data) _OSWriteInt32(base, byteOffset, data)
+#define OSWriteLittleInt64(base, byteOffset, data) _OSWriteInt64(base, byteOffset, data)
+
+/* Host endianess to big endian byte swapping macros for constants. */
+
+#define OSSwapHostToBigConstInt16(x) OSSwapConstInt16(x)
+#define OSSwapHostToBigConstInt32(x) OSSwapConstInt32(x)
+#define OSSwapHostToBigConstInt64(x) OSSwapConstInt64(x)
+
+/* Generic host endianess to big endian byte swapping functions. */
+
+#define OSSwapHostToBigInt16(x) OSSwapInt16(x)
+#define OSSwapHostToBigInt32(x) OSSwapInt32(x)
+#define OSSwapHostToBigInt64(x) OSSwapInt64(x)
+
+/* Host endianess to little endian byte swapping macros for constants. */
+
+#define OSSwapHostToLittleConstInt16(x) ((uint16_t)(x))
+#define OSSwapHostToLittleConstInt32(x) ((uint32_t)(x))
+#define OSSwapHostToLittleConstInt64(x) ((uint64_t)(x)) 
+
+/* Generic host endianess to little endian byte swapping functions. */
+
+#define OSSwapHostToLittleInt16(x) ((uint16_t)(x))
+#define OSSwapHostToLittleInt32(x) ((uint32_t)(x))
+#define OSSwapHostToLittleInt64(x) ((uint64_t)(x))
+
+/* Big endian to host endianess byte swapping macros for constants. */
+
+#define OSSwapBigToHostConstInt16(x) OSSwapConstInt16(x)
+#define OSSwapBigToHostConstInt32(x) OSSwapConstInt32(x)
+#define OSSwapBigToHostConstInt64(x) OSSwapConstInt64(x)
+
+/* Generic big endian to host endianess byte swapping functions. */
+
+#define OSSwapBigToHostInt16(x) OSSwapInt16(x)
+#define OSSwapBigToHostInt32(x) OSSwapInt32(x)
+#define OSSwapBigToHostInt64(x) OSSwapInt64(x)
+
+/* Little endian to host endianess byte swapping macros for constants. */
+
+#define OSSwapLittleToHostConstInt16(x) ((uint16_t)(x))
+#define OSSwapLittleToHostConstInt32(x) ((uint32_t)(x))
+#define OSSwapLittleToHostConstInt64(x) ((uint64_t)(x))
+
+/* Generic little endian to host endianess byte swapping functions. */
+
+#define OSSwapLittleToHostInt16(x) ((uint16_t)(x))
+#define OSSwapLittleToHostInt32(x) ((uint32_t)(x))
+#define OSSwapLittleToHostInt64(x) ((uint64_t)(x))
+
+#else
+#error Unknown endianess.
+#endif
+
+#endif /* ! _OS_OSBYTEORDER_H */
+
+
diff --git a/i386/include/libkern/OSCacheControl.h b/i386/include/libkern/OSCacheControl.h
new file mode 100644
index 0000000..771a704
--- /dev/null
+++ b/i386/include/libkern/OSCacheControl.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _OS_CACHE_CONTROL_H_
+#define _OS_CACHE_CONTROL_H_
+
+#include    <stddef.h>
+#include    <sys/cdefs.h>
+#include    <stdint.h>
+
+__BEGIN_DECLS
+
+
+/* Functions performed by sys_cache_control(): */
+
+/* Prepare memory for execution.  This should be called
+ * after writing machine instructions to memory, before
+ * executing them.  It syncs the dcache and icache.
+ * On IA32 processors this function is a NOP, because
+ * no synchronization is required.
+ */
+#define	kCacheFunctionPrepareForExecution	1
+
+/* Flush data cache(s).  This ensures that cached data 
+ * makes it all the way out to DRAM, and then removes
+ * copies of the data from all processor caches.
+ * It can be useful when dealing with cache incoherent
+ * devices or DMA.
+ */
+#define	kCacheFunctionFlushDcache	2
+
+
+/* perform one of the above cache functions: */
+int	sys_cache_control( int function, void *start, size_t len);
+ 
+/* equivalent to sys_cache_control(kCacheFunctionPrepareForExecution): */
+void	sys_icache_invalidate( void *start, size_t len);
+
+/* equivalent to sys_cache_control(kCacheFunctionFlushDcache): */
+void	sys_dcache_flush( void *start, size_t len);
+
+
+__END_DECLS
+
+#endif /* _OS_CACHE_CONTROL_H_ */
diff --git a/i386/include/libkern/OSDebug.h b/i386/include/libkern/OSDebug.h
new file mode 100644
index 0000000..eaeefc1
--- /dev/null
+++ b/i386/include/libkern/OSDebug.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved.
+ *
+ * HISTORY
+ *
+ */
+
+#ifndef _OS_OSDEBBUG_H
+#define _OS_OSDEBBUG_H
+
+#include <sys/cdefs.h>
+#include <mach/mach_types.h>
+
+__BEGIN_DECLS
+
+extern int log_leaks;
+
+/* Use kernel_debug() to log a backtrace */ 
+extern void trace_backtrace(unsigned int debugid, unsigned int debugid2, unsigned long size, unsigned long data);
+/* Report a message with a 4 entry backtrace - very slow */
+extern void OSReportWithBacktrace(const char *str, ...);
+extern unsigned OSBacktrace(void **bt, unsigned maxAddrs);
+
+/*! @function OSKernelStackRemaining
+    @abstract Returns bytes available below the current stack frame.
+    @discussion Returns bytes available below the current stack frame. Safe for interrupt or thread context.
+    @result Approximate byte count available. */
+
+vm_offset_t OSKernelStackRemaining( void );
+
+__END_DECLS
+
+#define TRACE_MACHLEAKS(a,b,c,d)	\
+do {					\
+    if (log_leaks)			\
+        trace_backtrace(a,b,c,d);	\
+} while(0)
+
+#endif /* !_OS_OSDEBBUG_H */
diff --git a/i386/include/libkern/OSKextLib.h b/i386/include/libkern/OSKextLib.h
new file mode 100644
index 0000000..dbe2ba2
--- /dev/null
+++ b/i386/include/libkern/OSKextLib.h
@@ -0,0 +1,472 @@
+/*
+ * Copyright (c) 2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _LIBKERN_OSKEXTLIB_H
+#define _LIBKERN_OSKEXTLIB_H
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+#include <stdint.h>
+#include <mach/kmod.h>
+#include <mach/vm_types.h>
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <System/libkern/OSReturn.h>
+
+/*!
+ * @header
+ *
+ * Declares functions, basic return values, and other constants
+ * related to kernel extensions (kexts).
+ */
+
+#if PRAGMA_MARK
+#pragma mark -
+/********************************************************************/
+#pragma mark OSReturn Values for Kernel Extensions
+/********************************************************************/
+#endif
+/*!
+ * @group OSReturn Values for Kernel Extensions
+ * Many kext-related functions return these values,
+ * as well as those defined under
+ * <code>@link //apple_ref/c/tdef/OSReturn OSReturn@/link</code>
+ * and other variants of <code>kern_return_t</code>.
+ */
+
+
+#define sub_libkern_kext           err_sub(2)
+#define libkern_kext_err(code)     (sys_libkern|sub_libkern_kext|(code))
+
+
+/*!
+ * @define   kOSKextReturnInternalError
+ * @abstract An internal error in the kext library.
+ *           Contrast with <code>@link //apple_ref/c/econst/OSReturnError
+ *           OSReturnError@/link</code>.
+ */
+#define kOSKextReturnInternalError                   libkern_kext_err(0x1)
+
+/*!
+ * @define   kOSKextReturnNoMemory
+ * @abstract Memory allocation failed.
+ */
+#define kOSKextReturnNoMemory                        libkern_kext_err(0x2)
+
+/*!
+ * @define   kOSKextReturnNoResources
+ * @abstract Some resource other than memory (such as available load tags)
+ *           is exhausted.
+ */
+#define kOSKextReturnNoResources                     libkern_kext_err(0x3)
+
+/*!
+ * @define   kOSKextReturnNotPrivileged
+ * @abstract The caller lacks privileges to perform the requested operation.
+ */
+#define kOSKextReturnNotPrivileged                   libkern_kext_err(0x4)
+
+/*!
+ * @define   kOSKextReturnInvalidArgument
+ * @abstract Invalid argument.
+ */
+#define kOSKextReturnInvalidArgument                 libkern_kext_err(0x5)
+
+/*!
+ * @define   kOSKextReturnNotFound
+ * @abstract Search item not found.
+ */
+#define kOSKextReturnNotFound                        libkern_kext_err(0x6)
+
+/*!
+ * @define   kOSKextReturnBadData
+ * @abstract Malformed data (not used for XML).
+ */
+#define kOSKextReturnBadData                         libkern_kext_err(0x7)
+
+/*!
+ * @define   kOSKextReturnSerialization
+ * @abstract Error converting or (un)serializing URL, string, or XML.
+ */
+#define kOSKextReturnSerialization                   libkern_kext_err(0x8)
+
+/*!
+ * @define   kOSKextReturnUnsupported
+ * @abstract Operation is no longer or not yet supported.
+ */
+#define kOSKextReturnUnsupported                     libkern_kext_err(0x9)
+
+/*!
+ * @define   kOSKextReturnDisabled
+ * @abstract Operation is currently disabled.
+ */
+#define kOSKextReturnDisabled                        libkern_kext_err(0xa)
+
+/*!
+ * @define   kOSKextReturnNotAKext
+ * @abstract Bundle is not a kernel extension.
+ */
+#define kOSKextReturnNotAKext                        libkern_kext_err(0xb)
+
+/*!
+ * @define   kOSKextReturnValidation
+ * @abstract Validation failures encountered; check diagnostics for details.
+ */
+#define kOSKextReturnValidation                      libkern_kext_err(0xc)
+
+/*!
+ * @define   kOSKextReturnAuthentication
+ * @abstract Authetication failures encountered; check diagnostics for details.
+ */
+#define kOSKextReturnAuthentication                  libkern_kext_err(0xd)
+
+/*!
+ * @define   kOSKextReturnDependencies
+ * @abstract Dependency resolution failures encountered; check diagnostics for details.
+ */
+#define kOSKextReturnDependencies                    libkern_kext_err(0xe)
+
+/*!
+ * @define   kOSKextReturnArchNotFound
+ * @abstract Kext does not contain code for the requested architecture.
+ */
+#define kOSKextReturnArchNotFound                    libkern_kext_err(0xf)
+
+/*!
+ * @define   kOSKextReturnCache
+ * @abstract An error occurred processing a system kext cache.
+ */
+#define kOSKextReturnCache                           libkern_kext_err(0x10)
+
+/*!
+ * @define   kOSKextReturnDeferred
+ * @abstract Operation has been posted asynchronously to user space (kernel only).
+ */
+#define kOSKextReturnDeferred                        libkern_kext_err(0x11)
+
+/*!
+ * @define   kOSKextReturnBootLevel
+ * @abstract Kext not loadable or operation not allowed at current boot level.
+ */
+#define kOSKextReturnBootLevel                       libkern_kext_err(0x12)
+
+/*!
+ * @define   kOSKextReturnNotLoadable
+ * @abstract Kext cannot be loaded; check diagnostics for details.
+ */
+#define kOSKextReturnNotLoadable                     libkern_kext_err(0x13)
+
+/*!
+ * @define   kOSKextReturnLoadedVersionDiffers
+ * @abstract A different version (or executable UUID, or executable by checksum)
+ *           of the requested kext is already loaded.
+ */
+#define kOSKextReturnLoadedVersionDiffers            libkern_kext_err(0x14)
+
+/*!
+ * @define   kOSKextReturnDependencyLoadError
+ * @abstract A load error occurred on a dependency of the kext being loaded.
+ */
+#define kOSKextReturnDependencyLoadError             libkern_kext_err(0x15)
+
+/*!
+ * @define   kOSKextReturnLinkError
+ * @abstract A link failure occured with this kext or a dependency.
+ */
+#define kOSKextReturnLinkError                       libkern_kext_err(0x16)
+
+/*!
+ * @define   kOSKextReturnStartStopError
+ * @abstract The kext start or stop routine returned an error.
+ */
+#define kOSKextReturnStartStopError                  libkern_kext_err(0x17)
+
+/*!
+ * @define   kOSKextReturnInUse
+ * @abstract The kext is currently in use or has outstanding references,
+ *           and cannot be unloaded.
+ */
+#define kOSKextReturnInUse                           libkern_kext_err(0x18)
+
+/*!
+ * @define   kOSKextReturnTimeout
+ * @abstract A kext request has timed out.
+ */
+#define kOSKextReturnTimeout                         libkern_kext_err(0x19)
+
+/*!
+ * @define   kOSKextReturnStopping
+ * @abstract The kext is in the process of stopping; requests cannot be made.
+ */
+#define kOSKextReturnStopping                        libkern_kext_err(0x1a)
+
+#if PRAGMA_MARK
+#pragma mark -
+/********************************************************************/
+#pragma mark Kext/OSBundle Property List Keys
+/********************************************************************/
+#endif
+/*!
+ * @group Kext Property List Keys
+ * These constants cover CFBundle properties defined for kernel extensions.
+ * Because they are used in the kernel, if you want to use one with
+ * CFBundle APIs you'll need to wrap it in a <code>CFSTR()</code> macro.
+ */
+
+
+/*!
+ * @define   kOSBundleCompatibleVersionKey
+ * @abstract A string giving the backwards-compatible version of a library kext
+ *           in extended Mac OS 'vers' format (####.##.##s{1-255} where 's'
+ *           is a build stage 'd', 'a', 'b', 'f' or 'fc').
+ */
+#define kOSBundleCompatibleVersionKey           "OSBundleCompatibleVersion"
+
+/*!
+ * @define   kOSBundleEnableKextLoggingKey
+ * @abstract Set to true to have the kernel kext logging spec applied
+ *           to the kext.
+ *           See <code>@link //apple_ref/c/econst/OSKextLogSpec
+ *           OSKextLogSpec@/link</code>.
+ */
+#define kOSBundleEnableKextLoggingKey           "OSBundleEnableKextLogging"
+
+/*!
+ * @define   kOSBundleIsInterfaceKey
+ * @abstract A boolean value indicating whether the kext executable
+ *           contains only symbol references.
+ */
+#define kOSBundleIsInterfaceKey                 "OSBundleIsInterface"
+
+/*!
+ * @define   kOSBundleLibrariesKey
+ * @abstract A dictionary listing link dependencies for this kext.
+ *           Keys are bundle identifiers, values are version strings.
+ */
+#define kOSBundleLibrariesKey                   "OSBundleLibraries"
+
+/*!
+ * @define   kOSBundleRequiredKey
+ * @abstract A string indicating in which kinds of startup this kext
+ *           may need to load during early startup (before
+ *           <code>@link //apple_ref/doc/man/8/kextd kextcache(8)@/link</code>).
+ * @discussion
+ * The value is one of:
+ * <ul>
+ * <li>@link kOSBundleRequiredRoot "OSBundleRequiredRoot"@/link</li>
+ * <li>@link kOSBundleRequiredLocalRoot "OSBundleRequiredLocalRoot"@/link</li>
+ * <li>@link kOSBundleRequiredNetworkRoot "OSBundleRequiredNetworkRoot"@/link</li>
+ * <li>@link kOSBundleRequiredSafeBoot "OSBundleRequiredSafeBoot"@/link</li>
+ * <li>@link kOSBundleRequiredConsole "OSBundleRequiredConsole"@/link</li>
+ * </ul>
+ *
+ * Use this property judiciously.
+ * Every kext that declares a value other than "OSBundleRequiredSafeBoot"
+ * increases startup time, as the booter must read it into memory,
+ * or startup kext caches must include it.
+ */
+#define kOSBundleRequiredKey                    "OSBundleRequired"
+
+/*!
+ * @define   kOSBundleAllowUserLoadKey
+ * @abstract A boolean value indicating whether
+ *           <code>@link //apple_ref/doc/man/8/kextd kextcache(8)@/link</code>
+ *           will honor a non-root process's request to load a kext.
+ * @discussion
+ * See <code>@link //apple_ref/doc/compositePage/c/func/KextManagerLoadKextWithURL
+ * KextManagerLoadKextWithURL@/link</code>
+ * and <code>@link //apple_ref/doc/compositePage/c/func/KextManagerLoadKextWithIdentifier
+ * KextManagerLoadKextWithIdentifier@/link</code>.
+ */
+#define kOSBundleAllowUserLoadKey               "OSBundleAllowUserLoad"
+
+/*!
+ * @define   kOSKernelResourceKey
+ * @abstract A boolean value indicating whether the kext represents a built-in
+ *           component of the kernel.
+ */
+#define kOSKernelResourceKey                    "OSKernelResource"
+
+/*!
+ * @define   kIOKitPersonalitiesKey
+ * @abstract A dictionary of dictionaries used in matching for I/O Kit drivers.
+ */
+#define kIOKitPersonalitiesKey                  "IOKitPersonalities"
+
+/*
+ * @define   kIOPersonalityPublisherKey
+ * @abstract Used in personalities sent to the I/O Kit,
+ *           contains the CFBundleIdentifier of the kext
+ *           that the personality originated in.
+ */
+#define kIOPersonalityPublisherKey              "IOPersonalityPublisher"
+
+
+#if PRAGMA_MARK
+/********************************************************************/
+#pragma mark Kext/OSBundle Property Deprecated Keys
+/********************************************************************/
+#endif
+/*
+ * @define   kOSBundleDebugLevelKey
+ * @abstract
+ * Deprecated (used on some releases of Mac OS X prior to 10.6 Snow Leopard).
+ * Value is an integer from 1-6, corresponding to the verbose levels
+ * of kext tools on those releases.
+ * On 10.6 Snow Leopard, use <code>@link OSKextEnableKextLogging
+ * OSKextEnableKextLogging@/link</code>.
+ */
+#define kOSBundleDebugLevelKey                  "OSBundleDebugLevel"
+
+/*!
+ * @define   kOSBundleSharedExecutableIdentifierKey
+ * @abstract Deprecated (used on some releases of Mac OS X
+ *           prior to 10.6 Snow Leopard).
+ *           Value is the bundle identifier of the pseudokext
+ *           that contains an executable shared by this kext.
+ */
+#define kOSBundleSharedExecutableIdentifierKey  "OSBundleSharedExecutableIdentifier"
+
+
+#if PRAGMA_MARK
+/********************************************************************/
+#pragma mark Kext/OSBundle Property List Values
+/********************************************************************/
+#endif
+
+/*!
+ * @group Kext Property List Values
+ * These constants encompass established values
+ * for kernel extension bundle properties.
+ */
+
+/*!
+* @define   kOSKextKernelIdentifier
+* @abstract
+* This is the CFBundleIdentifier user for the kernel itself.
+*/
+#define kOSKextKernelIdentifier                 "__kernel__"
+
+/*!
+* @define   kOSBundleRequiredRoot
+* @abstract
+* This <code>@link kOSBundleRequiredKey OSBundleRequired@/link</code>
+* value indicates that the kext may be needed to mount the root filesystem
+* whether starting from a local or a network volume.
+*/
+#define kOSBundleRequiredRoot                   "Root"
+
+/*!
+* @define   kOSBundleRequiredLocalRoot
+* @abstract
+* This <code>@link kOSBundleRequiredKey OSBundleRequired@/link</code>
+* value indicates that the kext may be needed to mount the root filesystem
+* when starting from a local disk.
+*/
+#define kOSBundleRequiredLocalRoot              "Local-Root"
+
+/*!
+* @define   kOSBundleRequiredNetworkRoot
+* @abstract
+* This <code>@link kOSBundleRequiredKey OSBundleRequired@/link</code>
+* value indicates that the kext may be needed to mount the root filesystem
+* when starting over a network connection.
+*/
+#define kOSBundleRequiredNetworkRoot            "Network-Root"
+
+/*!
+* @define   kOSBundleRequiredSafeBoot
+* @abstract
+* This <code>@link kOSBundleRequiredKey OSBundleRequired@/link</code>
+* value indicates that the kext can be loaded during a safe startup.
+* This value does not normally cause the kext to be read by the booter
+* or included in startup kext caches.
+*/
+#define kOSBundleRequiredSafeBoot               "Safe Boot"
+
+/*!
+* @define   kOSBundleRequiredConsole
+* @abstract
+* This <code>@link kOSBundleRequiredKey OSBundleRequired@/link</code>
+* value indicates that the kext may be needed for console access
+* (specifically in a single-user startup when
+* <code>@link //apple_ref/doc/man/8/kextd kextd(8)@/link</code>.
+* does not run)
+* and should be loaded during early startup.
+*/
+#define kOSBundleRequiredConsole                "Console"
+
+
+#if PRAGMA_MARK
+#pragma mark -
+/********************************************************************/
+#pragma mark Kext Information
+/********************************************************************/
+#endif
+/*!
+ * @group Kext Information
+ * Types, constants, and macros providing a kext with information
+ * about itself.
+ */
+
+/*!
+ * @typedef OSKextLoadTag
+ *
+ * @abstract
+ * A unique identifier assigned to a loaded instanace of a kext.
+ *
+ * @discussion
+ * If a kext is unloaded and later reloaded, the new instance
+ * has a different load tag.
+ *
+ * A kext can get its own load tag in the <code>kmod_info_t</code>
+ * structure passed into its module start routine, as the
+ * <code>id</code> field (cast to this type).
+ * You can use the load tag with the functions
+ * <code>@link OSKextRetainKextWithLoadTag
+ * OSKextRetainKextWithLoadTag@/link</code> and
+ * <code>@link OSKextReleaseKextWithLoadTag
+ * OSKextReleaseKextWithLoadTag@/link</code>.
+ */
+typedef uint32_t  OSKextLoadTag;
+
+/*!
+ * @define kOSKextInvalidLoadTag
+ *
+ * @abstract
+ * A load tag value that will never be used for a loaded kext;
+ * indicates kext not found.
+ */
+#define  kOSKextInvalidLoadTag  ((OSKextLoadTag)(-1))
+
+
+
+__END_DECLS
+
+#endif /* _LIBKERN_OSKEXTLIB_H */
diff --git a/i386/include/libkern/OSReturn.h b/i386/include/libkern/OSReturn.h
new file mode 100644
index 0000000..b5490c9
--- /dev/null
+++ b/i386/include/libkern/OSReturn.h
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2000 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Inc.  All rights reserved. 
+ *
+ * HISTORY
+ *
+ */
+ 
+/*
+ * Core OSReturn values.
+ */
+
+#ifndef __LIBKERN_OSRETURN_H
+#define __LIBKERN_OSRETURN_H
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+#include <mach/error.h>
+
+
+/*!
+ * @header
+ *
+ * Declares functions, basic return values, and other constants
+ * related to kernel extensions (kexts).
+ */
+
+#if PRAGMA_MARK
+#pragma mark Core OSReturn Values for Libkern
+#endif
+/*********************************************************************
+* Core OSReturn Values for Libkern
+*********************************************************************/
+/*!
+ * @group Core OSReturn Values for Libkern
+ * Some kext and I/O Kit functions can return these values,
+ * as well as  other values of
+ * <code>kern_return_t</code>.
+ *
+ * Many of these return values represent internal errors
+ * in the Libkern C++ run-time typing information system
+ * based on @link //apple_ref/doc/class/OSMetaClass OSMetaClass@/link;
+ * you are unlikely to ever see them.
+ * 
+ */
+
+
+/*!
+ * @typedef  OSReturn
+ * @abstract The return type for many Libkern functions.
+ */
+typedef kern_return_t OSReturn;
+
+#ifndef sys_libkern
+#define sys_libkern                   err_system(0x37)
+#endif /* sys_libkern */
+
+#define sub_libkern_common            err_sub(0)
+#define sub_libkern_metaclass         err_sub(1)
+#define sub_libkern_reserved          err_sub(-1)
+
+#define libkern_common_err(return)    (sys_libkern|sub_libkern_common|(return))
+#define libkern_metaclass_err(return) (sys_libkern|sub_libkern_metaclass|(return))
+
+/* See OSKextLib.h for these
+ * #define sub_libkern_kext           err_sub(2)
+ * #define libkern_kext_err(code)     (sys_libkern|sub_libkern_kext|(code))
+ */
+
+/*!
+ * @define   kOSReturnSuccess
+ * @abstract Operation successful.
+ *           Equal to <code>@link //apple_ref/c/econst/KERN_SUCCESS
+ *           KERN_SUCCESS@/link</code>.
+ */
+#define kOSReturnSuccess              KERN_SUCCESS
+
+/*!
+ * @define   kOSReturnError
+ * @abstract Unspecified Libkern error.
+ *           <b>Not equal</b> to 
+ *           <code>@link //apple_ref/c/econst/KERN_FAILURE
+ *           KERN_FAILURE@/link</code>.
+ */
+#define kOSReturnError                libkern_common_err(1)
+
+/*!
+ * @define   kOSMetaClassInternal
+ * @abstract Internal OSMetaClass run-time error.
+ */
+#define kOSMetaClassInternal          libkern_metaclass_err(1)
+
+/*!
+ * @define   kOSMetaClassHasInstances
+ * @abstract A kext cannot be unloaded because there are instances
+ *           derived from Libkern C++ classes that it defines.
+ */
+#define kOSMetaClassHasInstances      libkern_metaclass_err(2)
+
+/*!
+ * @define   kOSMetaClassNoInit
+ * @abstract Internal error: The Libkern C++ class registration system
+ *           was not properly initialized during kext loading.
+ */
+#define kOSMetaClassNoInit            libkern_metaclass_err(3)
+// OSMetaClass::preModLoad wasn't called, runtime internal error
+
+/*!
+ * @define   kOSMetaClassNoTempData
+ * @abstract Internal error: An allocation failure occurred
+ *           registering Libkern C++ classes during kext loading.
+ */
+#define kOSMetaClassNoTempData        libkern_metaclass_err(4)
+// Allocation failure internal data
+
+/*!
+ * @define   kOSMetaClassNoDicts
+ * @abstract Internal error: An allocation failure occurred
+ *           registering Libkern C++ classes during kext loading.
+ */
+#define kOSMetaClassNoDicts           libkern_metaclass_err(5)
+// Allocation failure for Metaclass internal dictionaries
+
+/*!
+ * @define   kOSMetaClassNoKModSet
+ * @abstract Internal error: An allocation failure occurred
+ *           registering Libkern C++ classes during kext loading.
+ */
+#define kOSMetaClassNoKModSet         libkern_metaclass_err(6)
+// Allocation failure for internal kmodule set
+
+/*!
+ * @define   kOSMetaClassNoInsKModSet
+ * @abstract Internal error: An error occurred registering
+ *           a specific Libkern C++ class during kext loading.
+ */
+#define kOSMetaClassNoInsKModSet      libkern_metaclass_err(7)
+// Can't insert the KMod set into the module dictionary
+
+/*!
+ * @define   kOSMetaClassNoSuper
+ * @abstract Internal error: No superclass can be found
+ *           for a specific Libkern C++ class during kext loading.
+ */
+#define kOSMetaClassNoSuper           libkern_metaclass_err(8)
+
+/*!
+ * @define   kOSMetaClassInstNoSuper
+ * @abstract Internal error: No superclass can be found when constructing
+ *           an instance of a Libkern C++ class.
+ */
+#define kOSMetaClassInstNoSuper       libkern_metaclass_err(9)
+
+/*!
+ * @define   kOSMetaClassDuplicateClass
+ * @abstract A duplicate Libkern C++ classname was encountered
+ *           during kext loading.
+ */
+#define kOSMetaClassDuplicateClass    libkern_metaclass_err(10)
+
+/*!
+ * @define   kOSMetaClassNoKext
+ * @abstract Internal error: The kext for a Libkern C++ class
+ *           can't be found during kext loading.
+ */
+#define kOSMetaClassNoKext            libkern_metaclass_err(11)
+
+__END_DECLS
+
+#endif /* ! __LIBKERN_OSRETURN_H */
diff --git a/i386/include/libkern/OSTypes.h b/i386/include/libkern/OSTypes.h
new file mode 100644
index 0000000..6a03a27
--- /dev/null
+++ b/i386/include/libkern/OSTypes.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved.
+ *
+ * HISTORY
+ *
+ */
+
+#ifndef _OS_OSTYPES_H
+#define _OS_OSTYPES_H
+
+#define OSTYPES_K64_REV		2
+
+typedef unsigned int 	   UInt;
+typedef signed int         SInt;
+
+#ifndef __MACTYPES__	/* CF MacTypes.h */
+#ifndef __TYPES__	/* guess... Mac Types.h */
+
+typedef unsigned char 	   UInt8;
+typedef unsigned short 	   UInt16;
+#if __LP64__
+typedef unsigned int       UInt32;
+#else
+typedef unsigned long      UInt32;
+#endif
+typedef unsigned long long UInt64;
+#if		defined(__BIG_ENDIAN__)
+typedef	struct UnsignedWide {
+			UInt32		hi;
+			UInt32		lo;
+}							UnsignedWide;
+#elif		defined(__LITTLE_ENDIAN__)
+typedef	struct UnsignedWide {
+			UInt32		lo;
+			UInt32		hi;
+}							UnsignedWide;
+#else
+#error Unknown endianess.
+#endif
+
+typedef signed char 	   SInt8;
+typedef signed short 	   SInt16;
+#if __LP64__
+typedef signed int         SInt32;
+#else
+typedef signed long        SInt32;
+#endif
+typedef signed long long   SInt64;
+#if		defined(__BIG_ENDIAN__)
+typedef	struct wide {
+			SInt32		hi;
+			UInt32		lo;
+}							wide;
+#elif		defined(__LITTLE_ENDIAN__)
+typedef	struct wide {
+			UInt32		lo;
+			SInt32		hi;
+}							wide;
+#else
+#error Unknown endianess.
+#endif
+
+typedef SInt32				OSStatus;
+
+#if defined(__LP64__) && defined(KERNEL)
+#ifndef ABSOLUTETIME_SCALAR_TYPE
+#define ABSOLUTETIME_SCALAR_TYPE    1
+#endif
+typedef UInt64		AbsoluteTime;
+#else
+typedef UnsignedWide		AbsoluteTime;
+#endif
+
+typedef UInt32				OptionBits;
+
+#if defined(KERNEL) && defined(__LP64__)
+/*
+ * Use intrinsic boolean types for the LP64 kernel, otherwise maintain
+ * source and binary backward compatibility.  This attempts to resolve
+ * the "(x == true)" vs. "(x)" conditional issue.
+ */
+#ifdef __cplusplus
+typedef bool Boolean;
+#else	/* !__cplusplus */
+#if defined(__STDC_VERSION__) && ((__STDC_VERSION__ - 199901L) > 0L)
+/* only use this if we are sure we are using a c99 compiler */
+typedef _Bool Boolean;
+#else	/* !c99 */
+/* Fall back to previous definition unless c99 */
+typedef unsigned char Boolean;
+#endif	/* !c99 */
+#endif	/* !__cplusplus */
+#else	/* !(KERNEL && __LP64__) */
+typedef unsigned char Boolean;
+#endif	/* !(KERNEL && __LP64__) */
+
+#endif /* __TYPES__ */
+#endif /* __MACTYPES__ */
+
+#if !defined(OS_INLINE)
+#	define OS_INLINE static inline
+#endif
+
+#endif /* _OS_OSTYPES_H */
diff --git a/i386/include/libkern/_OSByteOrder.h b/i386/include/libkern/_OSByteOrder.h
new file mode 100644
index 0000000..d8806fc
--- /dev/null
+++ b/i386/include/libkern/_OSByteOrder.h
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _OS__OSBYTEORDER_H
+#define _OS__OSBYTEORDER_H
+
+/*
+ * This header is normally included from <libkern/OSByteOrder.h>.  However,
+ * <sys/_endian.h> also includes this in the case of little-endian
+ * architectures, so that we can map OSByteOrder routines to the hton* and ntoh*
+ * macros.  This results in the asymmetry below; we only include
+ * <libkern/arch/_OSByteOrder.h> for little-endian architectures.
+ */
+
+//#include <sys/_types.h>
+
+/* Macros for swapping constant values in the preprocessing stage. */
+#define __DARWIN_OSSwapConstInt16(x) \
+    ((__uint16_t)((((__uint16_t)(x) & 0xff00) >> 8) | \
+                (((__uint16_t)(x) & 0x00ff) << 8)))
+
+#define __DARWIN_OSSwapConstInt32(x) \
+    ((__uint32_t)((((__uint32_t)(x) & 0xff000000) >> 24) | \
+                (((__uint32_t)(x) & 0x00ff0000) >>  8) | \
+                (((__uint32_t)(x) & 0x0000ff00) <<  8) | \
+                (((__uint32_t)(x) & 0x000000ff) << 24)))
+
+#define __DARWIN_OSSwapConstInt64(x) \
+    ((__uint64_t)((((__uint64_t)(x) & 0xff00000000000000ULL) >> 56) | \
+                (((__uint64_t)(x) & 0x00ff000000000000ULL) >> 40) | \
+                (((__uint64_t)(x) & 0x0000ff0000000000ULL) >> 24) | \
+                (((__uint64_t)(x) & 0x000000ff00000000ULL) >>  8) | \
+                (((__uint64_t)(x) & 0x00000000ff000000ULL) <<  8) | \
+                (((__uint64_t)(x) & 0x0000000000ff0000ULL) << 24) | \
+                (((__uint64_t)(x) & 0x000000000000ff00ULL) << 40) | \
+                (((__uint64_t)(x) & 0x00000000000000ffULL) << 56)))
+
+#if defined(__GNUC__)
+
+#if defined(__i386__) || defined(__x86_64__)
+#include <libkern/i386/_OSByteOrder.h>
+#endif
+
+#if defined(__arm__)
+#include <libkern/arm/OSByteOrder.h>
+#endif
+
+
+#define __DARWIN_OSSwapInt16(x) \
+    (__builtin_constant_p(x) ? __DARWIN_OSSwapConstInt16(x) : _OSSwapInt16(x))
+
+#define __DARWIN_OSSwapInt32(x) \
+    (__builtin_constant_p(x) ? __DARWIN_OSSwapConstInt32(x) : _OSSwapInt32(x))
+
+#define __DARWIN_OSSwapInt64(x) \
+    (__builtin_constant_p(x) ? __DARWIN_OSSwapConstInt64(x) : _OSSwapInt64(x))
+
+#else /* ! __GNUC__ */
+
+#if defined(__i386__) || defined(__x86_64__)
+
+#if !defined(__DARWIN_OS_INLINE)
+# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#        define __DARWIN_OS_INLINE static inline
+# elif defined(__MWERKS__) || defined(__cplusplus)
+#        define __DARWIN_OS_INLINE static inline
+# else
+#        define __DARWIN_OS_INLINE static __inline__
+# endif
+#endif
+
+__DARWIN_OS_INLINE
+uint16_t
+_OSSwapInt16(
+    uint16_t			data
+)
+{
+    return __DARWIN_OSSwapConstInt16(data);
+}
+
+__DARWIN_OS_INLINE
+uint32_t
+_OSSwapInt32(
+    uint32_t			data
+)
+{
+    return __DARWIN_OSSwapConstInt32(data);
+}
+
+__DARWIN_OS_INLINE
+uint64_t
+_OSSwapInt64(
+    uint64_t			data
+)
+{
+    return __DARWIN_OSSwapConstInt64(data);
+}
+#endif
+
+#define __DARWIN_OSSwapInt16(x) _OSSwapInt16(x)
+
+#define __DARWIN_OSSwapInt32(x) _OSSwapInt32(x)
+
+#define __DARWIN_OSSwapInt64(x) _OSSwapInt64(x)
+
+#endif /* __GNUC__ */
+
+#endif /* ! _OS__OSBYTEORDER_H */
diff --git a/i386/include/libkern/crypto/md5.h b/i386/include/libkern/crypto/md5.h
new file mode 100644
index 0000000..57e826a
--- /dev/null
+++ b/i386/include/libkern/crypto/md5.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+/*
+ * MD5.H - header file for MD5.C
+ */
+
+/*
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD5 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+#ifndef _CRYPTO_MD5_H_
+#define	_CRYPTO_MD5_H_
+
+#include <sys/types.h>
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+#define	MD5_DIGEST_LENGTH	16
+
+/* MD5 context. */
+typedef struct {
+	u_int32_t state[4];	/* state (ABCD) */
+	u_int32_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
+	unsigned char buffer[64];	/* input buffer */
+} MD5_CTX;
+
+extern void MD5Init(MD5_CTX *);
+extern void MD5Update(MD5_CTX *, const void *, unsigned int);
+extern void MD5Final(unsigned char [MD5_DIGEST_LENGTH], MD5_CTX *);
+
+__END_DECLS
+
+#endif /* _CRYPTO_MD5_H_ */
diff --git a/i386/include/libkern/crypto/sha1.h b/i386/include/libkern/crypto/sha1.h
new file mode 100644
index 0000000..9acc46b
--- /dev/null
+++ b/i386/include/libkern/crypto/sha1.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _CRYPTO_SHA1_H_
+#define	_CRYPTO_SHA1_H_
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define	SHA_DIGEST_LENGTH	20
+#define	SHA1_RESULTLEN		SHA_DIGEST_LENGTH
+
+typedef struct sha1_ctxt {
+	union {
+		u_int8_t	b8[20];
+		u_int32_t	b32[5];	/* state (ABCDE) */
+	} h;
+	union {
+		u_int8_t	b8[8];
+		u_int32_t	b32[2];
+		u_int64_t	b64[1];	/* # of bits, modulo 2^64 (msb first) */
+	} c;
+	union {
+		u_int8_t	b8[64];
+		u_int32_t	b32[16]; /* input buffer */
+	} m;
+	u_int8_t	count;		/* unused; for compatibility only */
+} SHA1_CTX;
+
+/* For compatibility with the other SHA-1 implementation. */
+#define sha1_init(c)		SHA1Init(c)
+#define sha1_loop(c, b, l)	SHA1Update(c, b, l)
+#define sha1_result(c, b)	SHA1Final(b, c)
+
+extern void SHA1Init(SHA1_CTX *);
+extern void SHA1Update(SHA1_CTX *, const void *, size_t);
+extern void SHA1UpdateUsePhysicalAddress(SHA1_CTX *, const void *, size_t);
+extern void SHA1Final(void *, SHA1_CTX *);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /*_CRYPTO_SHA1_H_*/
diff --git a/i386/include/libkern/i386/OSByteOrder.h b/i386/include/libkern/i386/OSByteOrder.h
new file mode 100644
index 0000000..7f19736
--- /dev/null
+++ b/i386/include/libkern/i386/OSByteOrder.h
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 1999-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _OS_OSBYTEORDERI386_H
+#define _OS_OSBYTEORDERI386_H
+
+#include <stdint.h>
+#include <libkern/i386/_OSByteOrder.h>
+
+#if !defined(OS_INLINE)
+#define OS_INLINE	__DARWIN_OS_INLINE
+#endif
+
+/* Functions for byte reversed loads. */
+
+OS_INLINE
+uint16_t
+OSReadSwapInt16(
+    const volatile void   * base,
+    uintptr_t       byteOffset
+)
+{
+    uint16_t result;
+
+    result = *(volatile uint16_t *)((uintptr_t)base + byteOffset);
+    return _OSSwapInt16(result);
+}
+
+OS_INLINE
+uint32_t
+OSReadSwapInt32(
+    const volatile void   * base,
+    uintptr_t       byteOffset
+)
+{
+    uint32_t result;
+
+    result = *(volatile uint32_t *)((uintptr_t)base + byteOffset);
+    return _OSSwapInt32(result);
+}
+
+OS_INLINE
+uint64_t
+OSReadSwapInt64(
+    const volatile void   * base,
+    uintptr_t       byteOffset
+)
+{
+    uint64_t result;
+
+    result = *(volatile uint64_t *)((uintptr_t)base + byteOffset);
+    return _OSSwapInt64(result);
+}
+
+/* Functions for byte reversed stores. */
+
+OS_INLINE
+void
+OSWriteSwapInt16(
+    volatile void   * base,
+    uintptr_t       byteOffset,
+    uint16_t        data
+)
+{
+    *(volatile uint16_t *)((uintptr_t)base + byteOffset) = _OSSwapInt16(data);
+}
+
+OS_INLINE
+void
+OSWriteSwapInt32(
+    volatile void   * base,
+    uintptr_t       byteOffset,
+    uint32_t        data
+)
+{
+    *(volatile uint32_t *)((uintptr_t)base + byteOffset) = _OSSwapInt32(data);
+}
+
+OS_INLINE
+void
+OSWriteSwapInt64(
+    volatile void    * base,
+    uintptr_t        byteOffset,
+    uint64_t         data
+)
+{
+    *(volatile uint64_t *)((uintptr_t)base + byteOffset) = _OSSwapInt64(data);
+}
+
+#endif /* ! _OS_OSBYTEORDERI386_H */
diff --git a/i386/include/libkern/i386/_OSByteOrder.h b/i386/include/libkern/i386/_OSByteOrder.h
new file mode 100644
index 0000000..51477bb
--- /dev/null
+++ b/i386/include/libkern/i386/_OSByteOrder.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _OS__OSBYTEORDERI386_H
+#define _OS__OSBYTEORDERI386_H
+
+#if !defined(__DARWIN_OS_INLINE)
+# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#        define __DARWIN_OS_INLINE static inline
+# elif defined(__MWERKS__) || defined(__cplusplus)
+#        define __DARWIN_OS_INLINE static inline
+# else
+#        define __DARWIN_OS_INLINE static __inline__
+# endif
+#endif
+
+/* Generic byte swapping functions. */
+
+__DARWIN_OS_INLINE
+__uint16_t
+_OSSwapInt16(
+    __uint16_t        _data
+)
+{
+    return ((_data << 8) | (_data >> 8));
+}
+
+__DARWIN_OS_INLINE
+__uint32_t
+_OSSwapInt32(
+    __uint32_t        _data
+)
+{
+#if defined(__llvm__)
+    return __builtin_bswap32(_data);
+#else
+    __asm__ ("bswap   %0" : "+r" (_data));
+    return _data;
+#endif
+}
+
+#if defined(__llvm__)
+__DARWIN_OS_INLINE
+__uint64_t
+_OSSwapInt64(
+    __uint64_t        _data
+)
+{
+    return __builtin_bswap64(_data);
+}
+
+#elif defined(__i386__)
+__DARWIN_OS_INLINE
+__uint64_t
+_OSSwapInt64(
+    __uint64_t        _data
+)
+{
+    __asm__ ("bswap   %%eax\n\t"
+             "bswap   %%edx\n\t" 
+             "xchgl   %%eax, %%edx"
+             : "+A" (_data));
+    return _data;
+}
+#elif defined(__x86_64__)
+__DARWIN_OS_INLINE
+__uint64_t
+_OSSwapInt64(
+    __uint64_t        _data
+)
+{
+    __asm__ ("bswap   %0" : "+r" (_data));
+    return _data;
+}
+#else
+#error Unknown architecture
+#endif
+
+#endif /* ! _OS__OSBYTEORDERI386_H */
diff --git a/i386/include/libkern/machine/OSByteOrder.h b/i386/include/libkern/machine/OSByteOrder.h
new file mode 100644
index 0000000..4860215
--- /dev/null
+++ b/i386/include/libkern/machine/OSByteOrder.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _OS_OSBYTEORDERMACHINE_H
+#define _OS_OSBYTEORDERMACHINE_H
+
+#include <stdint.h>
+
+#if !defined(OS_INLINE)
+# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#        define OS_INLINE static inline
+# elif defined(__MWERKS__) || defined(__cplusplus)
+#        define OS_INLINE static inline
+# else
+#        define OS_INLINE static __inline__
+# endif
+#endif
+
+/* Generic byte swapping functions. */
+
+OS_INLINE
+uint16_t
+_OSSwapInt16(
+    uint16_t                      data
+)
+{
+    return OSSwapConstInt16(data);
+}
+
+OS_INLINE
+uint32_t
+_OSSwapInt32(
+    uint32_t                      data
+)
+{
+    return OSSwapConstInt32(data);
+}
+
+OS_INLINE
+uint64_t
+_OSSwapInt64(
+    uint64_t                        data
+)
+{
+    return OSSwapConstInt64(data);
+}
+
+/* Functions for byte reversed loads. */
+
+OS_INLINE
+uint16_t
+OSReadSwapInt16(
+    const volatile void               * base,
+    uintptr_t                     byteOffset
+)
+{
+    uint16_t data = *(volatile uint16_t *)((uintptr_t)base + byteOffset);
+    return _OSSwapInt16(data);
+}
+
+OS_INLINE
+uint32_t
+OSReadSwapInt32(
+    const volatile void               * base,
+    uintptr_t                     byteOffset
+)
+{
+    uint32_t data = *(volatile uint32_t *)((uintptr_t)base + byteOffset);
+    return _OSSwapInt32(data);
+}
+
+OS_INLINE
+uint64_t
+OSReadSwapInt64(
+    const volatile void               * base,
+    uintptr_t                     byteOffset
+)
+{
+    uint64_t data = *(volatile uint64_t *)((uintptr_t)base + byteOffset);
+    return _OSSwapInt64(data);
+}
+
+/* Functions for byte reversed stores. */
+
+OS_INLINE
+void
+OSWriteSwapInt16(
+    volatile void               * base,
+    uintptr_t                     byteOffset,
+    uint16_t                      data
+)
+{
+    *(volatile uint16_t *)((uintptr_t)base + byteOffset) = _OSSwapInt16(data);
+}
+
+OS_INLINE
+void
+OSWriteSwapInt32(
+    volatile void               * base,
+    uintptr_t                     byteOffset,
+    uint32_t                      data
+)
+{
+    *(volatile uint32_t *)((uintptr_t)base + byteOffset) = _OSSwapInt32(data);
+}
+
+OS_INLINE
+void
+OSWriteSwapInt64(
+    volatile void               * base,
+    uintptr_t                     byteOffset,
+    uint64_t                      data
+)
+{
+    *(volatile uint64_t *)((uintptr_t)base + byteOffset) = _OSSwapInt64(data);
+}
+
+#endif /* ! _OS_OSBYTEORDERMACHINE_H */
diff --git a/i386/include/libkern/ppc/OSByteOrder.h b/i386/include/libkern/ppc/OSByteOrder.h
new file mode 100644
index 0000000..c666685
--- /dev/null
+++ b/i386/include/libkern/ppc/OSByteOrder.h
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _OS_OSBYTEORDERPPC_H
+#define _OS_OSBYTEORDERPPC_H
+
+#include <stdint.h>
+
+#if !defined(OS_INLINE)
+# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#        define OS_INLINE static inline
+# elif defined(__MWERKS__) || defined(__cplusplus)
+#        define OS_INLINE static inline
+# else
+#        define OS_INLINE static __inline__
+# endif
+#endif
+
+/* Functions for byte reversed loads. */
+
+OS_INLINE
+uint16_t
+OSReadSwapInt16(
+    const volatile void * base,
+    uintptr_t             byteOffset
+)
+{
+    uint16_t result;
+    volatile uint16_t *addr = (volatile uint16_t *)((uintptr_t)base + byteOffset);
+
+#if defined(__llvm__)
+    result = *addr;
+    result = ((result << 8) | (result >> 8));
+#else
+    __asm__ ("lhbrx %0, %2, %1"
+             : "=r" (result)
+             : "r"  (base), "bO" (byteOffset), "m" (*addr));
+#endif
+
+    return result;
+}
+
+OS_INLINE
+uint32_t
+OSReadSwapInt32(
+    const volatile void * base,
+    uintptr_t             byteOffset
+)
+{
+    uint32_t result;
+    volatile uint32_t *addr = (volatile uint32_t *)((uintptr_t)base + byteOffset);
+
+#if defined(__llvm__)
+    result = __builtin_bswap32(*addr);
+#else
+    __asm__ ("lwbrx %0, %2, %1"
+             : "=r" (result)
+             : "r"  (base), "bO" (byteOffset), "m" (*addr));
+#endif
+
+    return result;
+}
+
+OS_INLINE
+uint64_t
+OSReadSwapInt64(
+    const volatile void * base,
+    uintptr_t             byteOffset
+)
+{
+    volatile uint64_t *addr = (volatile uint64_t *)((uintptr_t)base + byteOffset);
+    union {
+        uint64_t u64;
+        uint32_t u32[2];
+    } u;
+
+#if defined(__llvm__)
+    u.u64 = __builtin_bswap64(*addr);
+#else
+    __asm__ ("lwbrx %0, %3, %2\n\t"
+             "lwbrx %1, %4, %2"
+             : "=&r" (u.u32[1]), "=r" (u.u32[0])
+             : "r"  (base), "bO" (byteOffset), "b" (byteOffset + 4), "m" (*addr));
+#endif
+
+    return u.u64;
+}
+
+/* Functions for byte reversed stores. */
+
+OS_INLINE
+void
+OSWriteSwapInt16(
+    volatile void * base,
+    uintptr_t       byteOffset,
+    uint16_t        data
+)
+{
+    volatile uint16_t *addr = (volatile uint16_t *)((uintptr_t)base + byteOffset);
+
+#if defined(__llvm__)
+    *addr = ((data >> 8) | (data << 8));
+#else
+    __asm__ ("sthbrx %1, %3, %2"
+             : "=m" (*addr)
+             : "r" (data), "r" (base), "bO" (byteOffset));
+#endif
+}
+
+OS_INLINE
+void
+OSWriteSwapInt32(
+    volatile void * base,
+    uintptr_t       byteOffset,
+    uint32_t        data
+)
+{
+    volatile uint32_t *addr = (volatile uint32_t *)((uintptr_t)base + byteOffset);
+
+#if defined(__llvm__)
+    *addr = __builtin_bswap32(data);
+#else
+    __asm__ ("stwbrx %1, %3, %2"
+             : "=m" (*addr)
+             : "r" (data), "r" (base), "bO" (byteOffset));
+#endif
+}
+
+OS_INLINE
+void
+OSWriteSwapInt64(
+    volatile void * base,
+    uintptr_t       byteOffset,
+    uint64_t        data
+)
+{
+    volatile uint64_t *addr = (volatile uint64_t *)((uintptr_t)base + byteOffset);
+
+#if defined(__llvm__)
+    *addr = __builtin_bswap64(data);
+#else
+    uint32_t hi = (uint32_t)(data >> 32);
+    uint32_t lo = (uint32_t)(data & 0xffffffff);
+
+    __asm__ ("stwbrx %1, %4, %3\n\t"
+             "stwbrx %2, %5, %3"
+             : "=m" (*addr)
+             : "r" (lo), "r" (hi), "r" (base), "bO" (byteOffset), "b" (byteOffset + 4));
+#endif
+}
+
+/* Generic byte swapping functions. */
+
+OS_INLINE
+uint16_t
+_OSSwapInt16(
+    uint16_t data
+)
+{
+    return OSReadSwapInt16(&data, 0);
+}
+
+OS_INLINE
+uint32_t
+_OSSwapInt32(
+    uint32_t data
+)
+{
+    return OSReadSwapInt32(&data, 0);
+}
+
+OS_INLINE
+uint64_t
+_OSSwapInt64(
+    uint64_t data
+)
+{
+    return OSReadSwapInt64(&data, 0);
+}
+
+#endif /* ! _OS_OSBYTEORDERPPC_H */
diff --git a/i386/include/limits.h b/i386/include/limits.h
new file mode 100644
index 0000000..a117167
--- /dev/null
+++ b/i386/include/limits.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*	$NetBSD: limits.h,v 1.8 1996/10/21 05:10:50 jtc Exp $	*/
+
+/*
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)limits.h	8.2 (Berkeley) 1/4/94
+ */
+
+#ifndef _LIMITS_H_
+#define	_LIMITS_H_
+
+#include <sys/cdefs.h>
+#include <i386/limits.h>
+#include <sys/syslimits.h>
+
+#if !defined(_ANSI_SOURCE)
+#define _POSIX_AIO_LISTIO_MAX   2
+#define _POSIX_AIO_MAX          1
+#define _POSIX_DELAYTIMER_MAX   32
+#define _POSIX_HOST_NAME_MAX    255
+#define _POSIX_LOGIN_NAME_MAX   9
+#define _POSIX_MQ_OPEN_MAX      8
+#define _POSIX_MQ_PRIO_MAX	32
+
+#define	_POSIX_ARG_MAX		4096
+#define	_POSIX_CHILD_MAX	25
+#define	_POSIX_LINK_MAX		8
+#define	_POSIX_MAX_CANON	255
+#define	_POSIX_MAX_INPUT	255
+#define	_POSIX_NAME_MAX		14
+#define	_POSIX_NGROUPS_MAX	8
+#define	_POSIX_OPEN_MAX		20
+#define	_POSIX_PATH_MAX		256
+#define	_POSIX_PIPE_BUF		512
+#define	_POSIX_SSIZE_MAX	32767
+#define	_POSIX_STREAM_MAX	8
+#define	_POSIX_TZNAME_MAX	6
+
+#define _POSIX_RE_DUP_MAX 			255
+#define _POSIX_RTSIG_MAX 			8
+#define _POSIX_SEM_NSEMS_MAX 			256
+#define _POSIX_SEM_VALUE_MAX 			32767
+#define _POSIX_SIGQUEUE_MAX 			32
+#define _POSIX_SS_REPL_MAX 			4
+#define _POSIX_SYMLINK_MAX 			255
+#define _POSIX_SYMLOOP_MAX 			8
+#define _POSIX_THREAD_DESTRUCTOR_ITERATIONS 	4
+#define _POSIX_THREAD_KEYS_MAX 			128
+#define _POSIX_THREAD_THREADS_MAX 		64
+#define _POSIX_TIMER_MAX 			32
+#define _POSIX_TRACE_EVENT_NAME_MAX 		30
+#define _POSIX_TRACE_NAME_MAX 			8
+#define _POSIX_TRACE_SYS_MAX 			8
+#define _POSIX_TRACE_USER_EVENT_MAX 		32
+#define _POSIX_TTY_NAME_MAX 			9
+
+#define	_POSIX2_BC_BASE_MAX		99
+#define	_POSIX2_BC_DIM_MAX		2048
+#define	_POSIX2_BC_SCALE_MAX		99
+#define	_POSIX2_BC_STRING_MAX		1000
+#define _POSIX2_CHARCLASS_NAME_MAX	14
+#define	_POSIX2_COLL_WEIGHTS_MAX	2
+#define	_POSIX2_EQUIV_CLASS_MAX		2
+#define	_POSIX2_EXPR_NEST_MAX		32
+#define	_POSIX2_LINE_MAX		2048
+#define	_POSIX2_RE_DUP_MAX		255
+
+#define PTHREAD_STACK_MIN 		8192
+#define PTHREAD_DESTRUCTOR_ITERATIONS 	4
+#define PTHREAD_KEYS_MAX 		512
+
+#if (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+#define PASS_MAX	128
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
+
+#define NL_ARGMAX	9
+#define NL_LANGMAX	14
+#define NL_MSGMAX	32767
+#define NL_NMAX		1
+#define NL_SETMAX	255
+#define NL_TEXTMAX	2048
+
+#define _XOPEN_IOV_MAX	16
+#define IOV_MAX		1024
+#define _XOPEN_NAME_MAX 255
+#define _XOPEN_PATH_MAX 1024
+
+#endif /* _ANSI_SOURCE */
+
+/* NZERO to be defined here. TBD. See also sys/param.h  */
+
+#endif /* !_LIMITS_H_ */
+
diff --git a/i386/include/locale.h b/i386/include/locale.h
new file mode 100644
index 0000000..ab28ceb
--- /dev/null
+++ b/i386/include/locale.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)locale.h	8.1 (Berkeley) 6/2/93
+ * $FreeBSD: /repoman/r/ncvs/src/include/locale.h,v 1.7 2002/10/09 09:19:27 tjr Exp $
+ */
+
+#ifndef _LOCALE_H_
+#define _LOCALE_H_
+
+#include <_locale.h>
+
+#define	LC_ALL		0
+#define	LC_COLLATE	1
+#define	LC_CTYPE	2
+#define	LC_MONETARY	3
+#define	LC_NUMERIC	4
+#define	LC_TIME		5
+#define	LC_MESSAGES	6
+
+#define	_LC_LAST	7		/* marks end */
+
+__BEGIN_DECLS
+char		*setlocale(int, const char *);
+__END_DECLS
+
+#endif /* _LOCALE_H_ */
diff --git a/i386/include/mach-o/arch.h b/i386/include/mach-o/arch.h
new file mode 100644
index 0000000..526c10f
--- /dev/null
+++ b/i386/include/mach-o/arch.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _MACH_O_ARCH_H_
+#define _MACH_O_ARCH_H_
+/*
+ * Copyright (c) 1997 Apple Computer, Inc.
+ *
+ * Functions that deal with information about architectures.
+ *
+ */
+
+#include <stdint.h>
+#include <mach/machine.h>
+#include <architecture/byte_order.h>
+
+/* The NXArchInfo structs contain the architectures symbolic name
+ * (such as "ppc"), its CPU type and CPU subtype as defined in
+ * mach/machine.h, the byte order for the architecture, and a
+ * describing string (such as "PowerPC").
+ * There will both be entries for specific CPUs (such as ppc604e) as
+ * well as generic "family" entries (such as ppc).
+ */
+typedef struct {
+    const char *name;
+    cpu_type_t cputype;
+    cpu_subtype_t cpusubtype;
+    enum NXByteOrder byteorder;
+    const char *description;
+} NXArchInfo;
+
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* NXGetAllArchInfos() returns a pointer to an array of all known
+ * NXArchInfo structures.  The last NXArchInfo is marked by a NULL name.
+ */
+extern const NXArchInfo *NXGetAllArchInfos(void);
+
+/* NXGetLocalArchInfo() returns the NXArchInfo for the local host, or NULL
+ * if none is known. 
+ */
+extern const NXArchInfo *NXGetLocalArchInfo(void);
+
+/* NXGetArchInfoFromName() and NXGetArchInfoFromCpuType() return the
+ * NXArchInfo from the architecture's name or cputype/cpusubtype
+ * combination.  A cpusubtype of CPU_SUBTYPE_MULTIPLE can be used
+ * to request the most general NXArchInfo known for the given cputype.
+ * NULL is returned if no matching NXArchInfo can be found.
+ */
+extern const NXArchInfo *NXGetArchInfoFromName(const char *name);
+extern const NXArchInfo *NXGetArchInfoFromCpuType(cpu_type_t cputype,
+						  cpu_subtype_t cpusubtype);
+
+/* NXFindBestFatArch() is passed a cputype and cpusubtype and a set of
+ * fat_arch structs and selects the best one that matches (if any) and returns
+ * a pointer to that fat_arch struct (or NULL).  The fat_arch structs must be
+ * in the host byte order and correct such that the fat_archs really points to
+ * enough memory for nfat_arch structs.  It is possible that this routine could
+ * fail if new cputypes or cpusubtypes are added and an old version of this
+ * routine is used.  But if there is an exact match between the cputype and
+ * cpusubtype and one of the fat_arch structs this routine will always succeed.
+ */
+extern struct fat_arch *NXFindBestFatArch(cpu_type_t cputype,
+					  cpu_subtype_t cpusubtype,
+					  struct fat_arch *fat_archs,
+					  uint32_t nfat_archs);
+
+/* NXCombineCpuSubtypes() returns the resulting cpusubtype when combining two
+ * different cpusubtypes for the specified cputype.  If the two cpusubtypes
+ * can't be combined (the specific subtypes are mutually exclusive) -1 is
+ * returned indicating it is an error to combine them.  This can also fail and
+ * return -1 if new cputypes or cpusubtypes are added and an old version of
+ * this routine is used.  But if the cpusubtypes are the same they can always
+ * be combined and this routine will return the cpusubtype pass in.
+ */
+extern cpu_subtype_t NXCombineCpuSubtypes(cpu_type_t cputype,
+					  cpu_subtype_t cpusubtype1,
+					  cpu_subtype_t cpusubtype2);
+
+#if __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _MACH_O_ARCH_H_ */
diff --git a/i386/include/mach-o/compact_unwind_encoding.h b/i386/include/mach-o/compact_unwind_encoding.h
new file mode 100644
index 0000000..237b226
--- /dev/null
+++ b/i386/include/mach-o/compact_unwind_encoding.h
@@ -0,0 +1,224 @@
+/* -*- mode: C; c-basic-offset: 4; tab-width: 4 -*-
+ *
+ * Copyright (c) 2008-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+ 
+
+#ifndef __COMPACT_UNWIND_ENCODING__
+#define __COMPACT_UNWIND_ENCODING__
+
+#include <stdint.h>
+
+
+// 
+// Each final linked mach-o image has an optional __TEXT, __unwind_info section.
+// This section is much smaller and faster to use than the __eh_frame section.
+//
+
+
+
+//
+// Compilers usually emit standard Dwarf FDEs.  The linker recognizes standard FDEs and
+// synthesizes a matching compact_unwind_encoding_t and adds it to the __unwind_info table.
+// It is also possible for the compiler to emit __unwind_info entries for functions that 
+// have different unwind requirements at different ranges in the function.
+//
+typedef uint32_t compact_unwind_encoding_t;
+
+
+
+//
+// The __unwind_info section is laid out for an efficient two level lookup.
+// The header of the section contains a coarse index that maps function address
+// to the page (4096 byte block) containing the unwind info for that function.  
+//
+
+#define UNWIND_SECTION_VERSION 1
+struct unwind_info_section_header
+{
+    uint32_t    version;            // UNWIND_SECTION_VERSION
+    uint32_t    commonEncodingsArraySectionOffset;
+    uint32_t    commonEncodingsArrayCount;
+    uint32_t    personalityArraySectionOffset;
+    uint32_t    personalityArrayCount;
+    uint32_t    indexSectionOffset;
+    uint32_t    indexCount;
+    // compact_unwind_encoding_t[]
+    // uintptr_t personalities[]
+    // unwind_info_section_header_index_entry[]
+    // unwind_info_section_header_lsda_index_entry[]
+};
+
+struct unwind_info_section_header_index_entry 
+{
+    uint32_t        functionOffset;
+    uint32_t        secondLevelPagesSectionOffset;  // section offset to start of regular or compress page
+    uint32_t        lsdaIndexArraySectionOffset;    // section offset to start of lsda_index array for this range
+};
+
+struct unwind_info_section_header_lsda_index_entry 
+{
+    uint32_t        functionOffset;
+    uint32_t        lsdaOffset;
+};
+
+//
+// There are two kinds of second level index pages: regular and compressed.
+// A compressed page can hold up to 1021 entries, but it cannot be used
+// if too many different encoding types are used.  The regular page holds
+// 511 entries.  
+//
+
+struct unwind_info_regular_second_level_entry 
+{
+    uint32_t                    functionOffset;
+    compact_unwind_encoding_t    encoding;
+};
+
+#define UNWIND_SECOND_LEVEL_REGULAR 2
+struct unwind_info_regular_second_level_page_header
+{
+    uint32_t    kind;    // UNWIND_SECOND_LEVEL_REGULAR
+    uint16_t    entryPageOffset;
+    uint16_t    entryCount;
+    // entry array
+};
+
+#define UNWIND_SECOND_LEVEL_COMPRESSED 3
+struct unwind_info_compressed_second_level_page_header
+{
+    uint32_t    kind;    // UNWIND_SECOND_LEVEL_COMPRESSED
+    uint16_t    entryPageOffset;
+    uint16_t    entryCount;
+    uint16_t    encodingsPageOffset;
+    uint16_t    encodingsCount;
+    // 32-bit entry array    
+    // encodings array
+};
+
+#define UNWIND_INFO_COMPRESSED_ENTRY_FUNC_OFFSET(entry)            (entry & 0x00FFFFFF)
+#define UNWIND_INFO_COMPRESSED_ENTRY_ENCODING_INDEX(entry)        ((entry >> 24) & 0xFF)
+
+
+
+// architecture independent bits
+enum {
+    UNWIND_IS_NOT_FUNCTION_START           = 0x80000000,
+    UNWIND_HAS_LSDA                        = 0x40000000,
+    UNWIND_PERSONALITY_MASK                = 0x30000000,
+};
+
+
+// x86_64
+//
+// 1-bit: start
+// 1-bit: has lsda
+// 2-bit: personality index
+//
+// 4-bits: 0=old, 1=rbp based, 2=stack-imm, 3=stack-ind, 4=dwarf
+//  rbp based:
+//        15-bits (5*3-bits per reg) register permutation
+//        8-bits for stack offset
+//  frameless:
+//        8-bits stack size
+//        3-bits stack adjust
+//        3-bits register count
+//        10-bits register permutation
+//
+enum {
+    UNWIND_X86_64_MODE_MASK                         = 0x0F000000,
+    UNWIND_X86_64_MODE_COMPATIBILITY                = 0x00000000,
+    UNWIND_X86_64_MODE_RBP_FRAME                    = 0x01000000,
+    UNWIND_X86_64_MODE_STACK_IMMD                   = 0x02000000,
+    UNWIND_X86_64_MODE_STACK_IND                    = 0x03000000,
+    UNWIND_X86_64_MODE_DWARF                        = 0x04000000,
+    
+    UNWIND_X86_64_RBP_FRAME_REGISTERS               = 0x00007FFF,
+    UNWIND_X86_64_RBP_FRAME_OFFSET                  = 0x00FF0000,
+
+    UNWIND_X86_64_FRAMELESS_STACK_SIZE              = 0x00FF0000,
+    UNWIND_X86_64_FRAMELESS_STACK_ADJUST            = 0x0000E000,
+    UNWIND_X86_64_FRAMELESS_STACK_REG_COUNT         = 0x00001C00,
+    UNWIND_X86_64_FRAMELESS_STACK_REG_PERMUTATION   = 0x000003FF,
+
+    UNWIND_X86_64_DWARF_SECTION_OFFSET              = 0x03FFFFFF,
+};
+
+enum {
+    UNWIND_X86_64_REG_NONE       = 0,
+    UNWIND_X86_64_REG_RBX        = 1,
+    UNWIND_X86_64_REG_R12        = 2,
+    UNWIND_X86_64_REG_R13        = 3,
+    UNWIND_X86_64_REG_R14        = 4,
+    UNWIND_X86_64_REG_R15        = 5,
+    UNWIND_X86_64_REG_RBP        = 6,
+};
+
+
+// x86
+//
+// 1-bit: start
+// 1-bit: has lsda
+// 2-bit: personality index
+//
+// 4-bits: 0=old, 1=ebp based, 2=stack-imm, 3=stack-ind, 4=dwarf
+//  ebp based:
+//        15-bits (5*3-bits per reg) register permutation
+//        8-bits for stack offset
+//  frameless:
+//        8-bits stack size
+//        3-bits stack adjust
+//        3-bits register count
+//        10-bits register permutation
+//
+enum {
+    UNWIND_X86_MODE_MASK                         = 0x0F000000,
+    UNWIND_X86_MODE_COMPATIBILITY                = 0x00000000,
+    UNWIND_X86_MODE_EBP_FRAME                    = 0x01000000,
+    UNWIND_X86_MODE_STACK_IMMD                   = 0x02000000,
+    UNWIND_X86_MODE_STACK_IND                    = 0x03000000,
+    UNWIND_X86_MODE_DWARF                        = 0x04000000,
+    
+    UNWIND_X86_EBP_FRAME_REGISTERS               = 0x00007FFF,
+    UNWIND_X86_EBP_FRAME_OFFSET                  = 0x00FF0000,
+    
+    UNWIND_X86_FRAMELESS_STACK_SIZE              = 0x00FF0000,
+    UNWIND_X86_FRAMELESS_STACK_ADJUST            = 0x0000E000,
+    UNWIND_X86_FRAMELESS_STACK_REG_COUNT         = 0x00001C00,
+    UNWIND_X86_FRAMELESS_STACK_REG_PERMUTATION   = 0x000003FF,
+    
+    UNWIND_X86_DWARF_SECTION_OFFSET              = 0x03FFFFFF,
+};
+
+enum {
+    UNWIND_X86_REG_NONE     = 0,
+    UNWIND_X86_REG_EBX      = 1,
+    UNWIND_X86_REG_ECX      = 2,
+    UNWIND_X86_REG_EDX      = 3,
+    UNWIND_X86_REG_EDI      = 4,
+    UNWIND_X86_REG_ESI      = 5,
+    UNWIND_X86_REG_EBP      = 6,
+};
+
+
+#endif
+
diff --git a/i386/include/mach-o/dyld.h b/i386/include/mach-o/dyld.h
new file mode 100644
index 0000000..3f579ef
--- /dev/null
+++ b/i386/include/mach-o/dyld.h
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 1999-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _MACH_O_DYLD_H_
+#define _MACH_O_DYLD_H_
+
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <mach-o/loader.h>
+#include <Availability.h>
+
+#if __cplusplus
+extern "C" {
+#endif 
+
+/*
+ * The following functions allow you to iterate through all loaded images.  
+ * This is not a thread safe operation.  Another thread can add or remove
+ * an image during the iteration.  
+ *
+ * Many uses of these routines can be replace by a call to dladdr() which 
+ * will return the mach_header and name of an image, given an address in 
+ * the image. dladdr() is thread safe.
+ */
+extern uint32_t                    _dyld_image_count(void)                              __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
+extern const struct mach_header*   _dyld_get_image_header(uint32_t image_index)         __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
+extern intptr_t                    _dyld_get_image_vmaddr_slide(uint32_t image_index)   __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
+extern const char*                 _dyld_get_image_name(uint32_t image_index)           __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
+
+
+/*
+ * The following functions allow you to install callbacks which will be called   
+ * by dyld whenever an image is loaded or unloaded.  During a call to _dyld_register_func_for_add_image()
+ * the callback func is called for every existing image.  Later, it is called as each new image
+ * is loaded and bound (but initializers not yet run).  The callback registered with
+ * _dyld_register_func_for_remove_image() is called after any terminators in an image are run
+ * and before the image is un-memory-mapped.
+ */
+extern void _dyld_register_func_for_add_image(void (*func)(const struct mach_header* mh, intptr_t vmaddr_slide))    __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
+extern void _dyld_register_func_for_remove_image(void (*func)(const struct mach_header* mh, intptr_t vmaddr_slide)) __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
+
+
+/*
+ * NSVersionOfRunTimeLibrary() returns the current_version number of the currently dylib 
+ * specifed by the libraryName.  The libraryName parameter would be "bar" for /path/libbar.3.dylib and
+ * "Foo" for /path/Foo.framework/Versions/A/Foo.  It returns -1 if no such library is loaded.
+ */
+extern int32_t NSVersionOfRunTimeLibrary(const char* libraryName)            __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
+
+
+/*
+ * NSVersionOfRunTimeLibrary() returns the current_version number that the main executable was linked
+ * against at build time.  The libraryName parameter would be "bar" for /path/libbar.3.dylib and
+ * "Foo" for /path/Foo.framework/Versions/A/Foo.  It returns -1 if the main executable did not link
+ * against the specified library.
+ */
+extern int32_t NSVersionOfLinkTimeLibrary(const char* libraryName)           __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
+
+
+/*
+ * _NSGetExecutablePath() copies the path of the main executable into the buffer. The bufsize parameter
+ * should initially be the size of the buffer.  The function returns 0 if the path was successfully copied,
+ * and *bufsize is left unchanged. It returns -1 if the buffer is not large enough, and *bufsize is set 
+ * to the size required. 
+ * 
+ * Note that _NSGetExecutablePath will return "a path" to the executable not a "real path" to the executable. 
+ * That is the path may be a symbolic link and not the real file. With deep directories the total bufsize 
+ * needed could be more than MAXPATHLEN.
+ */
+extern int _NSGetExecutablePath(char* buf, uint32_t* bufsize)                 __OSX_AVAILABLE_STARTING(__MAC_10_2, __IPHONE_2_0);
+
+
+
+/*
+ * _dyld_moninit() is a private interface between dyld and libSystem.
+ */
+extern void _dyld_moninit(void (*monaddition)(char *lowpc, char *highpc))    __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
+
+
+
+
+
+/*
+ * The following dyld API's are deprecated as of Mac OS X 10.5.  They are either  
+ * no longer necessary or are superceeded by dlopen and friends in <dlfcn.h>.
+ * dlopen/dlsym/dlclose have been available since Mac OS X 10.3 and work with 
+ * dylibs and bundles.  
+ *
+ *    NSAddImage                           -> dlopen
+ *    NSLookupSymbolInImage                -> dlsym
+ *    NSCreateObjectFileImageFromFile      -> dlopen
+ *    NSDestroyObjectFileImage             -> dlclose
+ *    NSLinkModule                         -> not needed when dlopen used
+ *    NSUnLinkModule                       -> not needed when dlclose used
+ *    NSLookupSymbolInModule               -> dlsym
+ *    _dyld_image_containing_address       -> dladdr
+ *    NSLinkEditError                      -> dlerror
+ *
+ */
+
+#ifndef ENUM_DYLD_BOOL
+#define ENUM_DYLD_BOOL
+  #undef FALSE
+  #undef TRUE
+  enum DYLD_BOOL { FALSE, TRUE };
+#endif /* ENUM_DYLD_BOOL */
+
+
+/* Object file image API */
+typedef enum {
+    NSObjectFileImageFailure, /* for this a message is printed on stderr */
+    NSObjectFileImageSuccess,
+    NSObjectFileImageInappropriateFile,
+    NSObjectFileImageArch,
+    NSObjectFileImageFormat, /* for this a message is printed on stderr */
+    NSObjectFileImageAccess
+} NSObjectFileImageReturnCode;
+
+typedef struct __NSObjectFileImage*  NSObjectFileImage;
+
+/* NSObjectFileImage can only be used with MH_BUNDLE files */
+extern NSObjectFileImageReturnCode NSCreateObjectFileImageFromFile(const char* pathName, NSObjectFileImage *objectFileImage)               __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern NSObjectFileImageReturnCode NSCreateObjectFileImageFromMemory(const void *address, size_t size, NSObjectFileImage *objectFileImage) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern bool                        NSDestroyObjectFileImage(NSObjectFileImage objectFileImage)                                             __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+
+extern uint32_t     NSSymbolDefinitionCountInObjectFileImage(NSObjectFileImage objectFileImage)                   __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern const char*  NSSymbolDefinitionNameInObjectFileImage(NSObjectFileImage objectFileImage, uint32_t ordinal)  __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern uint32_t     NSSymbolReferenceCountInObjectFileImage(NSObjectFileImage objectFileImage)                    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern const char*  NSSymbolReferenceNameInObjectFileImage(NSObjectFileImage objectFileImage, uint32_t ordinal, bool *tentative_definition) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern bool         NSIsSymbolDefinedInObjectFileImage(NSObjectFileImage objectFileImage, const char* symbolName) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
+extern void*        NSGetSectionDataInObjectFileImage(NSObjectFileImage objectFileImage, const char* segmentName, const char* sectionName, size_t *size) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern bool         NSHasModInitObjectFileImage(NSObjectFileImage objectFileImage)                                __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_3,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+
+typedef struct __NSModule* NSModule;
+extern const char*  NSNameOfModule(NSModule m)         __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern const char*  NSLibraryNameForModule(NSModule m) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+
+extern NSModule NSLinkModule(NSObjectFileImage objectFileImage, const char* moduleName, uint32_t options) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+#define NSLINKMODULE_OPTION_NONE                         0x0
+#define NSLINKMODULE_OPTION_BINDNOW                      0x1
+#define NSLINKMODULE_OPTION_PRIVATE                      0x2
+#define NSLINKMODULE_OPTION_RETURN_ON_ERROR              0x4
+#define NSLINKMODULE_OPTION_DONT_CALL_MOD_INIT_ROUTINES  0x8
+#define NSLINKMODULE_OPTION_TRAILING_PHYS_NAME          0x10
+
+extern bool NSUnLinkModule(NSModule module, uint32_t options) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+#define NSUNLINKMODULE_OPTION_NONE                  0x0
+#define NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED    0x1
+#define NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES	0x2
+
+/* symbol API */
+typedef struct __NSSymbol* NSSymbol;
+extern bool     NSIsSymbolNameDefined(const char* symbolName)                                                    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
+extern bool     NSIsSymbolNameDefinedWithHint(const char* symbolName, const char* libraryNameHint)               __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
+extern bool     NSIsSymbolNameDefinedInImage(const struct mach_header* image, const char* symbolName)            __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
+extern NSSymbol NSLookupAndBindSymbol(const char* symbolName)                                                    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
+extern NSSymbol NSLookupAndBindSymbolWithHint(const char* symbolName, const char* libraryNameHint)               __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
+extern NSSymbol NSLookupSymbolInModule(NSModule module, const char* symbolName)                                  __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern NSSymbol NSLookupSymbolInImage(const struct mach_header* image, const char* symbolName, uint32_t options) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND            0x0
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW        0x1
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY      0x2
+#define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
+extern const char*  NSNameOfSymbol(NSSymbol symbol)    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern void *       NSAddressOfSymbol(NSSymbol symbol) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern NSModule     NSModuleForSymbol(NSSymbol symbol) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+
+/* error handling API */
+typedef enum {
+    NSLinkEditFileAccessError,
+    NSLinkEditFileFormatError,
+    NSLinkEditMachResourceError,
+    NSLinkEditUnixResourceError,
+    NSLinkEditOtherError,
+    NSLinkEditWarningError,
+    NSLinkEditMultiplyDefinedError,
+    NSLinkEditUndefinedError
+} NSLinkEditErrors;
+
+/*
+ * For the NSLinkEditErrors value NSLinkEditOtherError these are the values
+ * passed to the link edit error handler as the errorNumber (what would be an
+ * errno value for NSLinkEditUnixResourceError or a kern_return_t value for
+ * NSLinkEditMachResourceError).
+ */
+typedef enum {
+    NSOtherErrorRelocation, 
+    NSOtherErrorLazyBind,
+    NSOtherErrorIndrLoop,
+    NSOtherErrorLazyInit,
+    NSOtherErrorInvalidArgs
+} NSOtherErrorNumbers;
+
+extern void NSLinkEditError(NSLinkEditErrors *c, int *errorNumber, const char** fileName, const char** errorString) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+
+typedef struct {
+     void     (*undefined)(const char* symbolName);
+     NSModule (*multiple)(NSSymbol s, NSModule oldModule, NSModule newModule); 
+     void     (*linkEdit)(NSLinkEditErrors errorClass, int errorNumber,
+                          const char* fileName, const char* errorString);
+} NSLinkEditErrorHandlers;
+
+extern void NSInstallLinkEditErrorHandlers(const NSLinkEditErrorHandlers *handlers) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+
+extern bool                      NSAddLibrary(const char* pathName)                   __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
+extern bool                      NSAddLibraryWithSearching(const char* pathName)      __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
+extern const struct mach_header* NSAddImage(const char* image_name, uint32_t options) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+#define NSADDIMAGE_OPTION_NONE                  	0x0
+#define NSADDIMAGE_OPTION_RETURN_ON_ERROR       	0x1
+#define NSADDIMAGE_OPTION_WITH_SEARCHING        	0x2
+#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 	0x4
+#define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME	0x8
+
+extern bool _dyld_present(void)                                                              __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern bool _dyld_launched_prebound(void)                                                    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern bool _dyld_all_twolevel_modules_prebound(void)                                        __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_3,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern void _dyld_bind_objc_module(const void* objc_module)                                  __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern bool _dyld_bind_fully_image_containing_address(const void* address)                   __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern bool _dyld_image_containing_address(const void* address)                              __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_3,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+extern void _dyld_lookup_and_bind(const char* symbol_name, void **address, NSModule* module) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
+extern void _dyld_lookup_and_bind_with_hint(const char* symbol_name, const char* library_name_hint, void** address, NSModule* module) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
+extern void _dyld_lookup_and_bind_fully(const char* symbol_name, void** address, NSModule* module) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+
+extern const struct mach_header*  _dyld_get_image_header_containing_address(const void* address) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_3,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
+
+
+#if __cplusplus
+}
+#endif 
+
+#endif /* _MACH_O_DYLD_H_ */
diff --git a/i386/include/mach-o/dyld_images.h b/i386/include/mach-o/dyld_images.h
new file mode 100644
index 0000000..ed710ef
--- /dev/null
+++ b/i386/include/mach-o/dyld_images.h
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2006-2010 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _DYLD_IMAGES_
+#define _DYLD_IMAGES_
+
+#include <stdbool.h>
+#include <unistd.h>
+#include <mach/mach.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* 
+ *	Beginning in Mac OS X 10.4, this is how gdb discovers which mach-o images are loaded in a process.
+ *
+ *	gdb looks for the symbol "_dyld_all_image_infos" in dyld.  It contains the fields below.  
+ *
+ *	For a snashot of what images are currently loaded, the infoArray fields contain a pointer
+ *	to an array of all images. If infoArray is NULL, it means it is being modified, come back later.
+ *
+ *	To be notified of changes, gdb sets a break point on the address pointed to by the notificationn
+ *	field.  The function it points to is called by dyld with an array of information about what images 
+ *	have been added (dyld_image_adding) or are about to be removed (dyld_image_removing). 
+ *
+ * The notification is called after infoArray is updated.  This means that if gdb attaches to a process
+ * and infoArray is NULL, gdb can set a break point on notification and let the proccess continue to
+ * run until the break point.  Then gdb can inspect the full infoArray.
+ *
+ * The dyldVersion field always points to a C string that contains the dyld version.  For instance,
+ * in dyld-127.3, dyldVersion would contain a pointer to "127.3".
+ *
+ * The errorMessage and terminationFlags fields are normally zero.  If dyld terminates a process
+ * (for instance because a required dylib or symbol is missing), then the errorMessage field will
+ * be set to point to a C string message buffer containing the reason dyld terminate the process.
+ * The low bit of the terminationFlags will be set if dyld terminated the process before any user
+ * code ran, in which case there is no need for the crash log to contain the backtrace.
+ *
+ * When dyld terminates a process because some required dylib or symbol cannot be bound, in 
+ * addition to the errorMessage field, it now sets the errorKind field and the corresponding
+ * fields: errorClientOfDylibPath, errorTargetDylibPath, errorSymbol.
+ *
+ */
+
+enum dyld_image_mode { dyld_image_adding=0, dyld_image_removing=1 };
+
+struct dyld_image_info {
+	const struct mach_header*	imageLoadAddress;	/* base address image is mapped into */
+	const char*					imageFilePath;		/* path dyld used to load the image */
+	uintptr_t					imageFileModDate;	/* time_t of image file */
+													/* if stat().st_mtime of imageFilePath does not match imageFileModDate, */
+													/* then file has been modified since dyld loaded it */
+};
+
+struct dyld_uuid_info {
+	const struct mach_header*	imageLoadAddress;	/* base address image is mapped into */
+	uuid_t						imageUUID;			/* UUID of image */
+};
+
+typedef void (*dyld_image_notifier)(enum dyld_image_mode mode, uint32_t infoCount, const struct dyld_image_info info[]);
+
+/* for use in dyld_all_image_infos.errorKind field */
+enum {	dyld_error_kind_none=0, 
+		dyld_error_kind_dylib_missing=1, 
+		dyld_error_kind_dylib_wrong_arch=2,
+		dyld_error_kind_dylib_version=3,
+		dyld_error_kind_symbol_missing=4
+	};
+
+
+struct dyld_all_image_infos {
+	uint32_t						version;		/* 1 in Mac OS X 10.4 and 10.5 */
+	uint32_t						infoArrayCount;
+	const struct dyld_image_info*	infoArray;
+	dyld_image_notifier				notification;		
+	bool							processDetachedFromSharedRegion;
+	/* the following fields are only in version 2 (Mac OS X 10.6, iPhoneOS 2.0) and later */
+	bool							libSystemInitialized;
+	const struct mach_header*		dyldImageLoadAddress;
+	/* the following field is only in version 3 (Mac OS X 10.6, iPhoneOS 3.0) and later */
+	void*							jitInfo;
+	/* the following fields are only in version 5 (Mac OS X 10.6, iPhoneOS 3.0) and later */
+	const char*						dyldVersion;
+	const char*						errorMessage;
+	uintptr_t						terminationFlags;
+	/* the following field is only in version 6 (Mac OS X 10.6, iPhoneOS 3.1) and later */
+	void*							coreSymbolicationShmPage;
+	/* the following field is only in version 7 (Mac OS X 10.6, iPhoneOS 3.1) and later */
+	uintptr_t						systemOrderFlag;
+	/* the following field is only in version 8 (Mac OS X 10.7, iPhoneOS 3.1) and later */
+	uintptr_t						uuidArrayCount;
+	const struct dyld_uuid_info*	uuidArray;		/* only images not in dyld shared cache */
+	/* the following field is only in version 9 (Mac OS X 10.7, iOS 4.0) and later */
+	struct dyld_all_image_infos*	dyldAllImageInfosAddress;
+	/* the following field is only in version 10 (Mac OS X 10.7, iOS 4.2) and later */
+	uintptr_t						initialImageCount;
+	/* the following field is only in version 11 (Mac OS X 10.7, iOS 4.2) and later */
+	uintptr_t						errorKind;
+	const char*						errorClientOfDylibPath;
+	const char*						errorTargetDylibPath;
+	const char*						errorSymbol;
+	/* the following field is only in version 12 (Mac OS X 10.7, iOS 4.3) and later */
+	uintptr_t						sharedCacheSlide;
+};
+extern struct dyld_all_image_infos  dyld_all_image_infos;
+
+/*
+ * Beginning in Mac OS X 10.6, rather than looking up the symbol "_dyld_all_image_infos"
+ * in dyld's symbol table, you can add DYLD_ALL_IMAGE_INFOS_OFFSET_OFFSET to the mach_header
+ * for dyld and read the 32-bit unsigned int at that location.  Adding that value to dyld's
+ * mach_header address gets you the address of dyld_all_image_infos in dyld.
+ */
+#define DYLD_ALL_IMAGE_INFOS_OFFSET_OFFSET 0x1010
+
+
+
+/*
+ * Beginning in Mac OS X 10.5, this is how gdb discovers where the shared cache is in a process.
+ * Images that are in the shared cache have their segments rearranged, so when using imageFilePath
+ * to load the file from disk, you have to know to adjust addresses based on how their segment
+ * was rearranged.
+ *
+ * gdb looks for the symbol "_dyld_shared_region_ranges" in dyld. 
+ * 
+ * It contains information the count of shared regions used by the process.  The count is
+ * the number of start/length pairs.  
+ */
+struct dyld_shared_cache_ranges {
+	uintptr_t					sharedRegionsCount;	/* how many ranges follow */
+	struct {
+		uintptr_t	start;
+		uintptr_t	length;
+	}							ranges[4];			/* max regions */
+};
+extern struct dyld_shared_cache_ranges dyld_shared_cache_ranges;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _DYLD_IMAGES_ */
diff --git a/i386/include/mach-o/fat.h b/i386/include/mach-o/fat.h
new file mode 100644
index 0000000..e2bcf43
--- /dev/null
+++ b/i386/include/mach-o/fat.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _MACH_O_FAT_H_
+#define _MACH_O_FAT_H_
+/*
+ * This header file describes the structures of the file format for "fat"
+ * architecture specific file (wrapper design).  At the begining of the file
+ * there is one fat_header structure followed by a number of fat_arch
+ * structures.  For each architecture in the file, specified by a pair of
+ * cputype and cpusubtype, the fat_header describes the file offset, file
+ * size and alignment in the file of the architecture specific member.
+ * The padded bytes in the file to place each member on it's specific alignment
+ * are defined to be read as zeros and can be left as "holes" if the file system
+ * can support them as long as they read as zeros.
+ *
+ * All structures defined here are always written and read to/from disk
+ * in big-endian order.
+ */
+
+/*
+ * <mach/machine.h> is needed here for the cpu_type_t and cpu_subtype_t types
+ * and contains the constants for the possible values of these types.
+ */
+#include <stdint.h>
+#include <mach/machine.h>
+#include <architecture/byte_order.h>
+
+#define FAT_MAGIC	0xcafebabe
+#define FAT_CIGAM	0xbebafeca	/* NXSwapLong(FAT_MAGIC) */
+
+struct fat_header {
+	uint32_t	magic;		/* FAT_MAGIC */
+	uint32_t	nfat_arch;	/* number of structs that follow */
+};
+
+struct fat_arch {
+	cpu_type_t	cputype;	/* cpu specifier (int) */
+	cpu_subtype_t	cpusubtype;	/* machine specifier (int) */
+	uint32_t	offset;		/* file offset to this object file */
+	uint32_t	size;		/* size of this object file */
+	uint32_t	align;		/* alignment as a power of 2 */
+};
+
+#endif /* _MACH_O_FAT_H_ */
diff --git a/i386/include/mach-o/getsect.h b/i386/include/mach-o/getsect.h
new file mode 100644
index 0000000..cee1f9f
--- /dev/null
+++ b/i386/include/mach-o/getsect.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _MACH_O_GETSECT_H_
+#define _MACH_O_GETSECT_H_
+
+#include <stdint.h>
+#include <mach-o/loader.h>
+
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/*
+ * Runtime interfaces for Mach-O programs.  For both 32-bit and 64-bit programs,
+ * where the sizes returned will be 32-bit or 64-bit based on the size of
+ * 'unsigned long'.
+ */
+extern char *getsectdata(
+    const char *segname,
+    const char *sectname,
+    unsigned long *size);
+
+extern char *getsectdatafromFramework(
+    const char *FrameworkName,
+    const char *segname,
+    const char *sectname,
+    unsigned long *size);
+
+extern unsigned long get_end(void);
+extern unsigned long get_etext(void);
+extern unsigned long get_edata(void);
+
+#ifndef __LP64__
+/*
+ * Runtime interfaces for 32-bit Mach-O programs.
+ */
+extern const struct section *getsectbyname(
+    const char *segname,
+    const char *sectname);
+
+extern uint8_t *getsectiondata(
+    const struct mach_header *mhp,
+    const char *segname,
+    const char *sectname,
+    unsigned long *size);
+
+extern const struct segment_command *getsegbyname(
+    const char *segname);
+
+extern uint8_t *getsegmentdata(
+    const struct mach_header *mhp,
+    const char *segname,
+    unsigned long *size);
+
+#else /* defined(__LP64__) */
+/*
+ * Runtime interfaces for 64-bit Mach-O programs.
+ */
+extern const struct section_64 *getsectbyname(
+    const char *segname,
+    const char *sectname);
+
+extern uint8_t *getsectiondata(
+    const struct mach_header_64 *mhp,
+    const char *segname,
+    const char *sectname,
+    unsigned long *size);
+
+extern const struct segment_command_64 *getsegbyname(
+    const char *segname);
+
+extern uint8_t *getsegmentdata(
+    const struct mach_header_64 *mhp,
+    const char *segname,
+    unsigned long *size);
+
+#endif /* defined(__LP64__) */
+
+/*
+ * Interfaces for tools working with 32-bit Mach-O files.
+ */
+extern char *getsectdatafromheader(
+    const struct mach_header *mhp,
+    const char *segname,
+    const char *sectname,
+    uint32_t *size);
+
+extern const struct section *getsectbynamefromheader(
+    const struct mach_header *mhp,
+    const char *segname,
+    const char *sectname);
+
+/*
+ * Interfaces for tools working with 64-bit Mach-O files.
+ */
+extern char *getsectdatafromheader_64(
+    const struct mach_header_64 *mhp,
+    const char *segname,
+    const char *sectname,
+    uint64_t *size);
+
+extern const struct section_64 *getsectbynamefromheader_64(
+    const struct mach_header_64 *mhp,
+    const char *segname,
+    const char *sectname);
+
+#if __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _MACH_O_GETSECT_H_ */
diff --git a/i386/include/mach-o/i386/swap.h b/i386/include/mach-o/i386/swap.h
new file mode 100644
index 0000000..09e322f
--- /dev/null
+++ b/i386/include/mach-o/i386/swap.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#include <architecture/byte_order.h>
+#include <mach/i386/thread_status.h>
+
+extern void swap_i386_thread_state(
+    i386_thread_state_t *cpu,
+    enum NXByteOrder target_byte_order);
+
+/* current i386 thread states */
+#if i386_THREAD_STATE == 1
+extern void swap_i386_float_state(
+    struct i386_float_state *fpu,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_i386_exception_state(
+    i386_exception_state_t *exc,
+    enum NXByteOrder target_byte_order);
+#endif /* i386_THREAD_STATE == 1 */
+
+/* i386 thread states on older releases */
+#if i386_THREAD_STATE == -1
+extern void swap_i386_thread_fpstate(
+    i386_thread_fpstate_t *fpu,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_i386_thread_exceptstate(
+    i386_thread_exceptstate_t *exc,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_i386_thread_cthreadstate(
+    i386_thread_cthreadstate_t *user,
+    enum NXByteOrder target_byte_order);
+#endif /* i386_THREAD_STATE == -1 */
+
+#ifdef x86_THREAD_STATE64
+extern void swap_x86_thread_state64(
+    x86_thread_state64_t *cpu,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_x86_state_hdr(
+    x86_state_hdr_t *hdr,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_x86_float_state64(
+    x86_float_state64_t *fpu,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_x86_exception_state64(
+    x86_exception_state64_t *exc,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_x86_thread_state(
+    x86_thread_state_t *cpu,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_x86_float_state(
+    x86_float_state_t *fpu,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_x86_exception_state(
+    x86_exception_state_t *exc,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_x86_debug_state32(
+    x86_debug_state32_t *debug,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_x86_debug_state64(
+    x86_debug_state64_t *debug,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_x86_debug_state(
+    x86_debug_state_t *debug,
+    enum NXByteOrder target_byte_order);
+#endif /* x86_THREAD_STATE64 */
diff --git a/i386/include/mach-o/ldsyms.h b/i386/include/mach-o/ldsyms.h
new file mode 100644
index 0000000..3f28b1b
--- /dev/null
+++ b/i386/include/mach-o/ldsyms.h
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACHO_LDSYMS_H_
+#define _MACHO_LDSYMS_H_
+
+#include <mach-o/loader.h>
+
+/*
+ * This file describes the link editor defined symbols.  The semantics of a
+ * link editor symbol is that it is defined by the link editor only if it is
+ * referenced and it is an error for the user to define them (see the man page
+ * ld(1)).  The standard UNIX link editor symbols: __end, __etext and __edata
+ * are not not supported by the Apple Mach-O link editor.  These symbols are
+ * really not meaningful in a Mach-O object file and the link editor symbols
+ * that are supported (described here) replace them.  In the case of the
+ * standard UNIX link editor symbols the program can use the symbol
+ * __mh_execute_header and walk the load commands of it's program to determine
+ * the ending (or beginning) of any section or segment in the program.  Note
+ * that the compiler prepends an underbar to all external symbol names coded
+ * in a high level language.  Thus in 'C' names are coded without an underbar
+ * and symbol names in the symbol table have an underbar.  There are two cpp
+ * macros for each link editor defined name in this file.  The macro with a
+ * leading underbar is the symbol name and the one without is the name as
+ * coded in 'C'.
+ */
+
+/*
+ * The value of the link editor defined symbol _MH_EXECUTE_SYM is the address
+ * of the mach header in a Mach-O executable file type.  It does not appear in
+ * any file type other than a MH_EXECUTE file type.  The type of the symbol is
+ * absolute as the header is not part of any section.
+ */
+#define _MH_EXECUTE_SYM	"__mh_execute_header"
+#define MH_EXECUTE_SYM	"_mh_execute_header"
+extern const struct
+#ifdef __LP64__
+mach_header_64
+#else
+mach_header
+#endif
+_mh_execute_header;
+
+/*
+ * The value of the link editor defined symbol _MH_BUNDLE_SYM is the address
+ * of the mach header in a Mach-O bundle file type.  It does not appear in
+ * any file type other than a MH_BUNDLE file type.  The type of the symbol is
+ * an N_SECT symbol even thought the header is not part of any section.  This
+ * symbol is private to the code in the bundle it is a part of.
+ */
+#define _MH_BUNDLE_SYM	"__mh_bundle_header"
+#define MH_BUNDLE_SYM	"_mh_bundle_header"
+extern const struct
+#ifdef __LP64__
+mach_header_64
+#else
+mach_header
+#endif
+_mh_bundle_header;
+
+/*
+ * The value of the link editor defined symbol _MH_DYLIB_SYM is the address
+ * of the mach header in a Mach-O dylib file type.  It does not appear in
+ * any file type other than a MH_DYLIB file type.  The type of the symbol is
+ * an N_SECT symbol even thought the header is not part of any section.  This
+ * symbol is private to the code in the library it is a part of.
+ */
+#define _MH_DYLIB_SYM	"__mh_dylib_header"
+#define MH_DYLIB_SYM	"_mh_dylib_header"
+extern const struct
+#ifdef __LP64__
+mach_header_64
+#else
+mach_header
+#endif
+_mh_dylib_header;
+
+/*
+ * The value of the link editor defined symbol _MH_DYLINKER_SYM is the address
+ * of the mach header in a Mach-O dylinker file type.  It does not appear in
+ * any file type other than a MH_DYLINKER file type.  The type of the symbol is
+ * an N_SECT symbol even thought the header is not part of any section.  This
+ * symbol is private to the code in the dynamic linker it is a part of.
+ */
+#define _MH_DYLINKER_SYM	"__mh_dylinker_header"
+#define MH_DYLINKER_SYM		"_mh_dylinker_header"
+extern const struct
+#ifdef __LP64__
+mach_header_64
+#else
+mach_header
+#endif
+_mh_dylinker_header;
+
+/*
+ * For the MH_PRELOAD file type the headers are not loaded as part of any
+ * segment so the link editor defines symbols defined for the beginning
+ * and ending of each segment and each section in each segment.  The names for
+ * the symbols for a segment's beginning and end will have the form:
+ * __SEGNAME__begin and  __SEGNAME__end where __SEGNAME is the name of the
+ * segment.  The names for the symbols for a section's beginning and end will
+ * have the form: __SEGNAME__sectname__begin and __SEGNAME__sectname__end
+ * where __sectname is the name of the section and __SEGNAME is the segment it
+ * is in.
+ * 
+ * The above symbols' types are those of the section they are referring to.
+ * This is true even for symbols who's values are end's of a section and
+ * that value is next address after that section and not really in that
+ * section.  This results in these symbols having types referring to sections
+ * who's values are not in that section.
+ */
+
+#endif /* _MACHO_LDSYMS_H_ */
diff --git a/i386/include/mach-o/loader.h b/i386/include/mach-o/loader.h
new file mode 100644
index 0000000..ff18e29
--- /dev/null
+++ b/i386/include/mach-o/loader.h
@@ -0,0 +1,1402 @@
+/*
+ * Copyright (c) 1999-2010 Apple Inc.  All Rights Reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _MACHO_LOADER_H_
+#define _MACHO_LOADER_H_
+
+/*
+ * This file describes the format of mach object files.
+ */
+#include <stdint.h>
+
+/*
+ * <mach/machine.h> is needed here for the cpu_type_t and cpu_subtype_t types
+ * and contains the constants for the possible values of these types.
+ */
+#include <mach/machine.h>
+
+/*
+ * <mach/vm_prot.h> is needed here for the vm_prot_t type and contains the 
+ * constants that are or'ed together for the possible values of this type.
+ */
+#include <mach/vm_prot.h>
+
+/*
+ * <machine/thread_status.h> is expected to define the flavors of the thread
+ * states and the structures of those flavors for each machine.
+ */
+#include <mach/machine/thread_status.h>
+#include <architecture/byte_order.h>
+
+/*
+ * The 32-bit mach header appears at the very beginning of the object file for
+ * 32-bit architectures.
+ */
+struct mach_header {
+	uint32_t	magic;		/* mach magic number identifier */
+	cpu_type_t	cputype;	/* cpu specifier */
+	cpu_subtype_t	cpusubtype;	/* machine specifier */
+	uint32_t	filetype;	/* type of file */
+	uint32_t	ncmds;		/* number of load commands */
+	uint32_t	sizeofcmds;	/* the size of all the load commands */
+	uint32_t	flags;		/* flags */
+};
+
+/* Constant for the magic field of the mach_header (32-bit architectures) */
+#define	MH_MAGIC	0xfeedface	/* the mach magic number */
+#define MH_CIGAM	0xcefaedfe	/* NXSwapInt(MH_MAGIC) */
+
+/*
+ * The 64-bit mach header appears at the very beginning of object files for
+ * 64-bit architectures.
+ */
+struct mach_header_64 {
+	uint32_t	magic;		/* mach magic number identifier */
+	cpu_type_t	cputype;	/* cpu specifier */
+	cpu_subtype_t	cpusubtype;	/* machine specifier */
+	uint32_t	filetype;	/* type of file */
+	uint32_t	ncmds;		/* number of load commands */
+	uint32_t	sizeofcmds;	/* the size of all the load commands */
+	uint32_t	flags;		/* flags */
+	uint32_t	reserved;	/* reserved */
+};
+
+/* Constant for the magic field of the mach_header_64 (64-bit architectures) */
+#define MH_MAGIC_64 0xfeedfacf /* the 64-bit mach magic number */
+#define MH_CIGAM_64 0xcffaedfe /* NXSwapInt(MH_MAGIC_64) */
+
+/*
+ * The layout of the file depends on the filetype.  For all but the MH_OBJECT
+ * file type the segments are padded out and aligned on a segment alignment
+ * boundary for efficient demand pageing.  The MH_EXECUTE, MH_FVMLIB, MH_DYLIB,
+ * MH_DYLINKER and MH_BUNDLE file types also have the headers included as part
+ * of their first segment.
+ * 
+ * The file type MH_OBJECT is a compact format intended as output of the
+ * assembler and input (and possibly output) of the link editor (the .o
+ * format).  All sections are in one unnamed segment with no segment padding. 
+ * This format is used as an executable format when the file is so small the
+ * segment padding greatly increases its size.
+ *
+ * The file type MH_PRELOAD is an executable format intended for things that
+ * are not executed under the kernel (proms, stand alones, kernels, etc).  The
+ * format can be executed under the kernel but may demand paged it and not
+ * preload it before execution.
+ *
+ * A core file is in MH_CORE format and can be any in an arbritray legal
+ * Mach-O file.
+ *
+ * Constants for the filetype field of the mach_header
+ */
+#define	MH_OBJECT	0x1		/* relocatable object file */
+#define	MH_EXECUTE	0x2		/* demand paged executable file */
+#define	MH_FVMLIB	0x3		/* fixed VM shared library file */
+#define	MH_CORE		0x4		/* core file */
+#define	MH_PRELOAD	0x5		/* preloaded executable file */
+#define	MH_DYLIB	0x6		/* dynamically bound shared library */
+#define	MH_DYLINKER	0x7		/* dynamic link editor */
+#define	MH_BUNDLE	0x8		/* dynamically bound bundle file */
+#define	MH_DYLIB_STUB	0x9		/* shared library stub for static */
+					/*  linking only, no section contents */
+#define	MH_DSYM		0xa		/* companion file with only debug */
+					/*  sections */
+#define	MH_KEXT_BUNDLE	0xb		/* x86_64 kexts */
+
+/* Constants for the flags field of the mach_header */
+#define	MH_NOUNDEFS	0x1		/* the object file has no undefined
+					   references */
+#define	MH_INCRLINK	0x2		/* the object file is the output of an
+					   incremental link against a base file
+					   and can't be link edited again */
+#define MH_DYLDLINK	0x4		/* the object file is input for the
+					   dynamic linker and can't be staticly
+					   link edited again */
+#define MH_BINDATLOAD	0x8		/* the object file's undefined
+					   references are bound by the dynamic
+					   linker when loaded. */
+#define MH_PREBOUND	0x10		/* the file has its dynamic undefined
+					   references prebound. */
+#define MH_SPLIT_SEGS	0x20		/* the file has its read-only and
+					   read-write segments split */
+#define MH_LAZY_INIT	0x40		/* the shared library init routine is
+					   to be run lazily via catching memory
+					   faults to its writeable segments
+					   (obsolete) */
+#define MH_TWOLEVEL	0x80		/* the image is using two-level name
+					   space bindings */
+#define MH_FORCE_FLAT	0x100		/* the executable is forcing all images
+					   to use flat name space bindings */
+#define MH_NOMULTIDEFS	0x200		/* this umbrella guarantees no multiple
+					   defintions of symbols in its
+					   sub-images so the two-level namespace
+					   hints can always be used. */
+#define MH_NOFIXPREBINDING 0x400	/* do not have dyld notify the
+					   prebinding agent about this
+					   executable */
+#define MH_PREBINDABLE  0x800           /* the binary is not prebound but can
+					   have its prebinding redone. only used
+                                           when MH_PREBOUND is not set. */
+#define MH_ALLMODSBOUND 0x1000		/* indicates that this binary binds to
+                                           all two-level namespace modules of
+					   its dependent libraries. only used
+					   when MH_PREBINDABLE and MH_TWOLEVEL
+					   are both set. */ 
+#define MH_SUBSECTIONS_VIA_SYMBOLS 0x2000/* safe to divide up the sections into
+					    sub-sections via symbols for dead
+					    code stripping */
+#define MH_CANONICAL    0x4000		/* the binary has been canonicalized
+					   via the unprebind operation */
+#define MH_WEAK_DEFINES	0x8000		/* the final linked image contains
+					   external weak symbols */
+#define MH_BINDS_TO_WEAK 0x10000	/* the final linked image uses
+					   weak symbols */
+
+#define MH_ALLOW_STACK_EXECUTION 0x20000/* When this bit is set, all stacks 
+					   in the task will be given stack
+					   execution privilege.  Only used in
+					   MH_EXECUTE filetypes. */
+#define MH_ROOT_SAFE 0x40000           /* When this bit is set, the binary 
+					  declares it is safe for use in
+					  processes with uid zero */
+                                         
+#define MH_SETUID_SAFE 0x80000         /* When this bit is set, the binary 
+					  declares it is safe for use in
+					  processes when issetugid() is true */
+
+#define MH_NO_REEXPORTED_DYLIBS 0x100000 /* When this bit is set on a dylib, 
+					  the static linker does not need to
+					  examine dependent dylibs to see
+					  if any are re-exported */
+#define	MH_PIE 0x200000			/* When this bit is set, the OS will
+					   load the main executable at a
+					   random address.  Only used in
+					   MH_EXECUTE filetypes. */
+#define	MH_DEAD_STRIPPABLE_DYLIB 0x400000 /* Only for use on dylibs.  When
+					     linking against a dylib that
+					     has this bit set, the static linker
+					     will automatically not create a
+					     LC_LOAD_DYLIB load command to the
+					     dylib if no symbols are being
+					     referenced from the dylib. */
+#define MH_HAS_TLV_DESCRIPTORS 0x800000 /* Contains a section of type 
+					    S_THREAD_LOCAL_VARIABLES */
+
+#define MH_NO_HEAP_EXECUTION 0x1000000	/* When this bit is set, the OS will
+					   run the main executable with
+					   a non-executable heap even on
+					   platforms (e.g. i386) that don't
+					   require it. Only used in MH_EXECUTE
+					   filetypes. */
+
+/*
+ * The load commands directly follow the mach_header.  The total size of all
+ * of the commands is given by the sizeofcmds field in the mach_header.  All
+ * load commands must have as their first two fields cmd and cmdsize.  The cmd
+ * field is filled in with a constant for that command type.  Each command type
+ * has a structure specifically for it.  The cmdsize field is the size in bytes
+ * of the particular load command structure plus anything that follows it that
+ * is a part of the load command (i.e. section structures, strings, etc.).  To
+ * advance to the next load command the cmdsize can be added to the offset or
+ * pointer of the current load command.  The cmdsize for 32-bit architectures
+ * MUST be a multiple of 4 bytes and for 64-bit architectures MUST be a multiple
+ * of 8 bytes (these are forever the maximum alignment of any load commands).
+ * The padded bytes must be zero.  All tables in the object file must also
+ * follow these rules so the file can be memory mapped.  Otherwise the pointers
+ * to these tables will not work well or at all on some machines.  With all
+ * padding zeroed like objects will compare byte for byte.
+ */
+struct load_command {
+	uint32_t cmd;		/* type of load command */
+	uint32_t cmdsize;	/* total size of command in bytes */
+};
+
+/*
+ * After MacOS X 10.1 when a new load command is added that is required to be
+ * understood by the dynamic linker for the image to execute properly the
+ * LC_REQ_DYLD bit will be or'ed into the load command constant.  If the dynamic
+ * linker sees such a load command it it does not understand will issue a
+ * "unknown load command required for execution" error and refuse to use the
+ * image.  Other load commands without this bit that are not understood will
+ * simply be ignored.
+ */
+#define LC_REQ_DYLD 0x80000000
+
+/* Constants for the cmd field of all load commands, the type */
+#define	LC_SEGMENT	0x1	/* segment of this file to be mapped */
+#define	LC_SYMTAB	0x2	/* link-edit stab symbol table info */
+#define	LC_SYMSEG	0x3	/* link-edit gdb symbol table info (obsolete) */
+#define	LC_THREAD	0x4	/* thread */
+#define	LC_UNIXTHREAD	0x5	/* unix thread (includes a stack) */
+#define	LC_LOADFVMLIB	0x6	/* load a specified fixed VM shared library */
+#define	LC_IDFVMLIB	0x7	/* fixed VM shared library identification */
+#define	LC_IDENT	0x8	/* object identification info (obsolete) */
+#define LC_FVMFILE	0x9	/* fixed VM file inclusion (internal use) */
+#define LC_PREPAGE      0xa     /* prepage command (internal use) */
+#define	LC_DYSYMTAB	0xb	/* dynamic link-edit symbol table info */
+#define	LC_LOAD_DYLIB	0xc	/* load a dynamically linked shared library */
+#define	LC_ID_DYLIB	0xd	/* dynamically linked shared lib ident */
+#define LC_LOAD_DYLINKER 0xe	/* load a dynamic linker */
+#define LC_ID_DYLINKER	0xf	/* dynamic linker identification */
+#define	LC_PREBOUND_DYLIB 0x10	/* modules prebound for a dynamically */
+				/*  linked shared library */
+#define	LC_ROUTINES	0x11	/* image routines */
+#define	LC_SUB_FRAMEWORK 0x12	/* sub framework */
+#define	LC_SUB_UMBRELLA 0x13	/* sub umbrella */
+#define	LC_SUB_CLIENT	0x14	/* sub client */
+#define	LC_SUB_LIBRARY  0x15	/* sub library */
+#define	LC_TWOLEVEL_HINTS 0x16	/* two-level namespace lookup hints */
+#define	LC_PREBIND_CKSUM  0x17	/* prebind checksum */
+
+/*
+ * load a dynamically linked shared library that is allowed to be missing
+ * (all symbols are weak imported).
+ */
+#define	LC_LOAD_WEAK_DYLIB (0x18 | LC_REQ_DYLD)
+
+#define	LC_SEGMENT_64	0x19	/* 64-bit segment of this file to be
+				   mapped */
+#define	LC_ROUTINES_64	0x1a	/* 64-bit image routines */
+#define LC_UUID		0x1b	/* the uuid */
+#define LC_RPATH       (0x1c | LC_REQ_DYLD)    /* runpath additions */
+#define LC_CODE_SIGNATURE 0x1d	/* local of code signature */
+#define LC_SEGMENT_SPLIT_INFO 0x1e /* local of info to split segments */
+#define LC_REEXPORT_DYLIB (0x1f | LC_REQ_DYLD) /* load and re-export dylib */
+#define	LC_LAZY_LOAD_DYLIB 0x20	/* delay load of dylib until first use */
+#define	LC_ENCRYPTION_INFO 0x21	/* encrypted segment information */
+#define	LC_DYLD_INFO 	0x22	/* compressed dyld information */
+#define	LC_DYLD_INFO_ONLY (0x22|LC_REQ_DYLD)	/* compressed dyld information only */
+#define	LC_LOAD_UPWARD_DYLIB (0x23 | LC_REQ_DYLD) /* load upward dylib */
+#define LC_VERSION_MIN_MACOSX 0x24   /* build for MacOSX min OS version */
+#define LC_VERSION_MIN_IPHONEOS 0x25 /* build for iPhoneOS min OS version */
+#define LC_FUNCTION_STARTS 0x26 /* compressed table of function start addresses */
+#define LC_DYLD_ENVIRONMENT 0x27 /* string for dyld to treat
+				    like environment variable */
+
+/*
+ * A variable length string in a load command is represented by an lc_str
+ * union.  The strings are stored just after the load command structure and
+ * the offset is from the start of the load command structure.  The size
+ * of the string is reflected in the cmdsize field of the load command.
+ * Once again any padded bytes to bring the cmdsize field to a multiple
+ * of 4 bytes must be zero.
+ */
+union lc_str {
+	uint32_t	offset;	/* offset to the string */
+#ifndef __LP64__
+	char		*ptr;	/* pointer to the string */
+#endif 
+};
+
+/*
+ * The segment load command indicates that a part of this file is to be
+ * mapped into the task's address space.  The size of this segment in memory,
+ * vmsize, maybe equal to or larger than the amount to map from this file,
+ * filesize.  The file is mapped starting at fileoff to the beginning of
+ * the segment in memory, vmaddr.  The rest of the memory of the segment,
+ * if any, is allocated zero fill on demand.  The segment's maximum virtual
+ * memory protection and initial virtual memory protection are specified
+ * by the maxprot and initprot fields.  If the segment has sections then the
+ * section structures directly follow the segment command and their size is
+ * reflected in cmdsize.
+ */
+struct segment_command { /* for 32-bit architectures */
+	uint32_t	cmd;		/* LC_SEGMENT */
+	uint32_t	cmdsize;	/* includes sizeof section structs */
+	char		segname[16];	/* segment name */
+	uint32_t	vmaddr;		/* memory address of this segment */
+	uint32_t	vmsize;		/* memory size of this segment */
+	uint32_t	fileoff;	/* file offset of this segment */
+	uint32_t	filesize;	/* amount to map from the file */
+	vm_prot_t	maxprot;	/* maximum VM protection */
+	vm_prot_t	initprot;	/* initial VM protection */
+	uint32_t	nsects;		/* number of sections in segment */
+	uint32_t	flags;		/* flags */
+};
+
+/*
+ * The 64-bit segment load command indicates that a part of this file is to be
+ * mapped into a 64-bit task's address space.  If the 64-bit segment has
+ * sections then section_64 structures directly follow the 64-bit segment
+ * command and their size is reflected in cmdsize.
+ */
+struct segment_command_64 { /* for 64-bit architectures */
+	uint32_t	cmd;		/* LC_SEGMENT_64 */
+	uint32_t	cmdsize;	/* includes sizeof section_64 structs */
+	char		segname[16];	/* segment name */
+	uint64_t	vmaddr;		/* memory address of this segment */
+	uint64_t	vmsize;		/* memory size of this segment */
+	uint64_t	fileoff;	/* file offset of this segment */
+	uint64_t	filesize;	/* amount to map from the file */
+	vm_prot_t	maxprot;	/* maximum VM protection */
+	vm_prot_t	initprot;	/* initial VM protection */
+	uint32_t	nsects;		/* number of sections in segment */
+	uint32_t	flags;		/* flags */
+};
+
+/* Constants for the flags field of the segment_command */
+#define	SG_HIGHVM	0x1	/* the file contents for this segment is for
+				   the high part of the VM space, the low part
+				   is zero filled (for stacks in core files) */
+#define	SG_FVMLIB	0x2	/* this segment is the VM that is allocated by
+				   a fixed VM library, for overlap checking in
+				   the link editor */
+#define	SG_NORELOC	0x4	/* this segment has nothing that was relocated
+				   in it and nothing relocated to it, that is
+				   it maybe safely replaced without relocation*/
+#define SG_PROTECTED_VERSION_1	0x8 /* This segment is protected.  If the
+				       segment starts at file offset 0, the
+				       first page of the segment is not
+				       protected.  All other pages of the
+				       segment are protected. */
+
+/*
+ * A segment is made up of zero or more sections.  Non-MH_OBJECT files have
+ * all of their segments with the proper sections in each, and padded to the
+ * specified segment alignment when produced by the link editor.  The first
+ * segment of a MH_EXECUTE and MH_FVMLIB format file contains the mach_header
+ * and load commands of the object file before its first section.  The zero
+ * fill sections are always last in their segment (in all formats).  This
+ * allows the zeroed segment padding to be mapped into memory where zero fill
+ * sections might be. The gigabyte zero fill sections, those with the section
+ * type S_GB_ZEROFILL, can only be in a segment with sections of this type.
+ * These segments are then placed after all other segments.
+ *
+ * The MH_OBJECT format has all of its sections in one segment for
+ * compactness.  There is no padding to a specified segment boundary and the
+ * mach_header and load commands are not part of the segment.
+ *
+ * Sections with the same section name, sectname, going into the same segment,
+ * segname, are combined by the link editor.  The resulting section is aligned
+ * to the maximum alignment of the combined sections and is the new section's
+ * alignment.  The combined sections are aligned to their original alignment in
+ * the combined section.  Any padded bytes to get the specified alignment are
+ * zeroed.
+ *
+ * The format of the relocation entries referenced by the reloff and nreloc
+ * fields of the section structure for mach object files is described in the
+ * header file <reloc.h>.
+ */
+struct section { /* for 32-bit architectures */
+	char		sectname[16];	/* name of this section */
+	char		segname[16];	/* segment this section goes in */
+	uint32_t	addr;		/* memory address of this section */
+	uint32_t	size;		/* size in bytes of this section */
+	uint32_t	offset;		/* file offset of this section */
+	uint32_t	align;		/* section alignment (power of 2) */
+	uint32_t	reloff;		/* file offset of relocation entries */
+	uint32_t	nreloc;		/* number of relocation entries */
+	uint32_t	flags;		/* flags (section type and attributes)*/
+	uint32_t	reserved1;	/* reserved (for offset or index) */
+	uint32_t	reserved2;	/* reserved (for count or sizeof) */
+};
+
+struct section_64 { /* for 64-bit architectures */
+	char		sectname[16];	/* name of this section */
+	char		segname[16];	/* segment this section goes in */
+	uint64_t	addr;		/* memory address of this section */
+	uint64_t	size;		/* size in bytes of this section */
+	uint32_t	offset;		/* file offset of this section */
+	uint32_t	align;		/* section alignment (power of 2) */
+	uint32_t	reloff;		/* file offset of relocation entries */
+	uint32_t	nreloc;		/* number of relocation entries */
+	uint32_t	flags;		/* flags (section type and attributes)*/
+	uint32_t	reserved1;	/* reserved (for offset or index) */
+	uint32_t	reserved2;	/* reserved (for count or sizeof) */
+	uint32_t	reserved3;	/* reserved */
+};
+
+/*
+ * The flags field of a section structure is separated into two parts a section
+ * type and section attributes.  The section types are mutually exclusive (it
+ * can only have one type) but the section attributes are not (it may have more
+ * than one attribute).
+ */
+#define SECTION_TYPE		 0x000000ff	/* 256 section types */
+#define SECTION_ATTRIBUTES	 0xffffff00	/*  24 section attributes */
+
+/* Constants for the type of a section */
+#define	S_REGULAR		0x0	/* regular section */
+#define	S_ZEROFILL		0x1	/* zero fill on demand section */
+#define	S_CSTRING_LITERALS	0x2	/* section with only literal C strings*/
+#define	S_4BYTE_LITERALS	0x3	/* section with only 4 byte literals */
+#define	S_8BYTE_LITERALS	0x4	/* section with only 8 byte literals */
+#define	S_LITERAL_POINTERS	0x5	/* section with only pointers to */
+					/*  literals */
+/*
+ * For the two types of symbol pointers sections and the symbol stubs section
+ * they have indirect symbol table entries.  For each of the entries in the
+ * section the indirect symbol table entries, in corresponding order in the
+ * indirect symbol table, start at the index stored in the reserved1 field
+ * of the section structure.  Since the indirect symbol table entries
+ * correspond to the entries in the section the number of indirect symbol table
+ * entries is inferred from the size of the section divided by the size of the
+ * entries in the section.  For symbol pointers sections the size of the entries
+ * in the section is 4 bytes and for symbol stubs sections the byte size of the
+ * stubs is stored in the reserved2 field of the section structure.
+ */
+#define	S_NON_LAZY_SYMBOL_POINTERS	0x6	/* section with only non-lazy
+						   symbol pointers */
+#define	S_LAZY_SYMBOL_POINTERS		0x7	/* section with only lazy symbol
+						   pointers */
+#define	S_SYMBOL_STUBS			0x8	/* section with only symbol
+						   stubs, byte size of stub in
+						   the reserved2 field */
+#define	S_MOD_INIT_FUNC_POINTERS	0x9	/* section with only function
+						   pointers for initialization*/
+#define	S_MOD_TERM_FUNC_POINTERS	0xa	/* section with only function
+						   pointers for termination */
+#define	S_COALESCED			0xb	/* section contains symbols that
+						   are to be coalesced */
+#define	S_GB_ZEROFILL			0xc	/* zero fill on demand section
+						   (that can be larger than 4
+						   gigabytes) */
+#define	S_INTERPOSING			0xd	/* section with only pairs of
+						   function pointers for
+						   interposing */
+#define	S_16BYTE_LITERALS		0xe	/* section with only 16 byte
+						   literals */
+#define	S_DTRACE_DOF			0xf	/* section contains 
+						   DTrace Object Format */
+#define	S_LAZY_DYLIB_SYMBOL_POINTERS	0x10	/* section with only lazy
+						   symbol pointers to lazy
+						   loaded dylibs */
+/*
+ * Section types to support thread local variables
+ */
+#define S_THREAD_LOCAL_REGULAR                   0x11  /* template of initial 
+							  values for TLVs */
+#define S_THREAD_LOCAL_ZEROFILL                  0x12  /* template of initial 
+							  values for TLVs */
+#define S_THREAD_LOCAL_VARIABLES                 0x13  /* TLV descriptors */
+#define S_THREAD_LOCAL_VARIABLE_POINTERS         0x14  /* pointers to TLV 
+                                                          descriptors */
+#define S_THREAD_LOCAL_INIT_FUNCTION_POINTERS    0x15  /* functions to call
+							  to initialize TLV
+							  values */
+
+/*
+ * Constants for the section attributes part of the flags field of a section
+ * structure.
+ */
+#define SECTION_ATTRIBUTES_USR	 0xff000000	/* User setable attributes */
+#define S_ATTR_PURE_INSTRUCTIONS 0x80000000	/* section contains only true
+						   machine instructions */
+#define S_ATTR_NO_TOC 		 0x40000000	/* section contains coalesced
+						   symbols that are not to be
+						   in a ranlib table of
+						   contents */
+#define S_ATTR_STRIP_STATIC_SYMS 0x20000000	/* ok to strip static symbols
+						   in this section in files
+						   with the MH_DYLDLINK flag */
+#define S_ATTR_NO_DEAD_STRIP	 0x10000000	/* no dead stripping */
+#define S_ATTR_LIVE_SUPPORT	 0x08000000	/* blocks are live if they
+						   reference live blocks */
+#define S_ATTR_SELF_MODIFYING_CODE 0x04000000	/* Used with i386 code stubs
+						   written on by dyld */
+/*
+ * If a segment contains any sections marked with S_ATTR_DEBUG then all
+ * sections in that segment must have this attribute.  No section other than
+ * a section marked with this attribute may reference the contents of this
+ * section.  A section with this attribute may contain no symbols and must have
+ * a section type S_REGULAR.  The static linker will not copy section contents
+ * from sections with this attribute into its output file.  These sections
+ * generally contain DWARF debugging info.
+ */ 
+#define	S_ATTR_DEBUG		 0x02000000	/* a debug section */
+#define SECTION_ATTRIBUTES_SYS	 0x00ffff00	/* system setable attributes */
+#define S_ATTR_SOME_INSTRUCTIONS 0x00000400	/* section contains some
+						   machine instructions */
+#define S_ATTR_EXT_RELOC	 0x00000200	/* section has external
+						   relocation entries */
+#define S_ATTR_LOC_RELOC	 0x00000100	/* section has local
+						   relocation entries */
+
+
+/*
+ * The names of segments and sections in them are mostly meaningless to the
+ * link-editor.  But there are few things to support traditional UNIX
+ * executables that require the link-editor and assembler to use some names
+ * agreed upon by convention.
+ *
+ * The initial protection of the "__TEXT" segment has write protection turned
+ * off (not writeable).
+ *
+ * The link-editor will allocate common symbols at the end of the "__common"
+ * section in the "__DATA" segment.  It will create the section and segment
+ * if needed.
+ */
+
+/* The currently known segment names and the section names in those segments */
+
+#define	SEG_PAGEZERO	"__PAGEZERO"	/* the pagezero segment which has no */
+					/* protections and catches NULL */
+					/* references for MH_EXECUTE files */
+
+
+#define	SEG_TEXT	"__TEXT"	/* the tradition UNIX text segment */
+#define	SECT_TEXT	"__text"	/* the real text part of the text */
+					/* section no headers, and no padding */
+#define SECT_FVMLIB_INIT0 "__fvmlib_init0"	/* the fvmlib initialization */
+						/*  section */
+#define SECT_FVMLIB_INIT1 "__fvmlib_init1"	/* the section following the */
+					        /*  fvmlib initialization */
+						/*  section */
+
+#define	SEG_DATA	"__DATA"	/* the tradition UNIX data segment */
+#define	SECT_DATA	"__data"	/* the real initialized data section */
+					/* no padding, no bss overlap */
+#define	SECT_BSS	"__bss"		/* the real uninitialized data section*/
+					/* no padding */
+#define SECT_COMMON	"__common"	/* the section common symbols are */
+					/* allocated in by the link editor */
+
+#define	SEG_OBJC	"__OBJC"	/* objective-C runtime segment */
+#define SECT_OBJC_SYMBOLS "__symbol_table"	/* symbol table */
+#define SECT_OBJC_MODULES "__module_info"	/* module information */
+#define SECT_OBJC_STRINGS "__selector_strs"	/* string table */
+#define SECT_OBJC_REFS "__selector_refs"	/* string table */
+
+#define	SEG_ICON	 "__ICON"	/* the icon segment */
+#define	SECT_ICON_HEADER "__header"	/* the icon headers */
+#define	SECT_ICON_TIFF   "__tiff"	/* the icons in tiff format */
+
+#define	SEG_LINKEDIT	"__LINKEDIT"	/* the segment containing all structs */
+					/* created and maintained by the link */
+					/* editor.  Created with -seglinkedit */
+					/* option to ld(1) for MH_EXECUTE and */
+					/* FVMLIB file types only */
+
+#define SEG_UNIXSTACK	"__UNIXSTACK"	/* the unix stack segment */
+
+#define SEG_IMPORT	"__IMPORT"	/* the segment for the self (dyld) */
+					/* modifing code stubs that has read, */
+					/* write and execute permissions */
+
+/*
+ * Fixed virtual memory shared libraries are identified by two things.  The
+ * target pathname (the name of the library as found for execution), and the
+ * minor version number.  The address of where the headers are loaded is in
+ * header_addr. (THIS IS OBSOLETE and no longer supported).
+ */
+struct fvmlib {
+	union lc_str	name;		/* library's target pathname */
+	uint32_t	minor_version;	/* library's minor version number */
+	uint32_t	header_addr;	/* library's header address */
+};
+
+/*
+ * A fixed virtual shared library (filetype == MH_FVMLIB in the mach header)
+ * contains a fvmlib_command (cmd == LC_IDFVMLIB) to identify the library.
+ * An object that uses a fixed virtual shared library also contains a
+ * fvmlib_command (cmd == LC_LOADFVMLIB) for each library it uses.
+ * (THIS IS OBSOLETE and no longer supported).
+ */
+struct fvmlib_command {
+	uint32_t	cmd;		/* LC_IDFVMLIB or LC_LOADFVMLIB */
+	uint32_t	cmdsize;	/* includes pathname string */
+	struct fvmlib	fvmlib;		/* the library identification */
+};
+
+/*
+ * Dynamicly linked shared libraries are identified by two things.  The
+ * pathname (the name of the library as found for execution), and the
+ * compatibility version number.  The pathname must match and the compatibility
+ * number in the user of the library must be greater than or equal to the
+ * library being used.  The time stamp is used to record the time a library was
+ * built and copied into user so it can be use to determined if the library used
+ * at runtime is exactly the same as used to built the program.
+ */
+struct dylib {
+    union lc_str  name;			/* library's path name */
+    uint32_t timestamp;			/* library's build time stamp */
+    uint32_t current_version;		/* library's current version number */
+    uint32_t compatibility_version;	/* library's compatibility vers number*/
+};
+
+/*
+ * A dynamically linked shared library (filetype == MH_DYLIB in the mach header)
+ * contains a dylib_command (cmd == LC_ID_DYLIB) to identify the library.
+ * An object that uses a dynamically linked shared library also contains a
+ * dylib_command (cmd == LC_LOAD_DYLIB, LC_LOAD_WEAK_DYLIB, or
+ * LC_REEXPORT_DYLIB) for each library it uses.
+ */
+struct dylib_command {
+	uint32_t	cmd;		/* LC_ID_DYLIB, LC_LOAD_{,WEAK_}DYLIB,
+					   LC_REEXPORT_DYLIB */
+	uint32_t	cmdsize;	/* includes pathname string */
+	struct dylib	dylib;		/* the library identification */
+};
+
+/*
+ * A dynamically linked shared library may be a subframework of an umbrella
+ * framework.  If so it will be linked with "-umbrella umbrella_name" where
+ * Where "umbrella_name" is the name of the umbrella framework. A subframework
+ * can only be linked against by its umbrella framework or other subframeworks
+ * that are part of the same umbrella framework.  Otherwise the static link
+ * editor produces an error and states to link against the umbrella framework.
+ * The name of the umbrella framework for subframeworks is recorded in the
+ * following structure.
+ */
+struct sub_framework_command {
+	uint32_t	cmd;		/* LC_SUB_FRAMEWORK */
+	uint32_t	cmdsize;	/* includes umbrella string */
+	union lc_str 	umbrella;	/* the umbrella framework name */
+};
+
+/*
+ * For dynamically linked shared libraries that are subframework of an umbrella
+ * framework they can allow clients other than the umbrella framework or other
+ * subframeworks in the same umbrella framework.  To do this the subframework
+ * is built with "-allowable_client client_name" and an LC_SUB_CLIENT load
+ * command is created for each -allowable_client flag.  The client_name is
+ * usually a framework name.  It can also be a name used for bundles clients
+ * where the bundle is built with "-client_name client_name".
+ */
+struct sub_client_command {
+	uint32_t	cmd;		/* LC_SUB_CLIENT */
+	uint32_t	cmdsize;	/* includes client string */
+	union lc_str 	client;		/* the client name */
+};
+
+/*
+ * A dynamically linked shared library may be a sub_umbrella of an umbrella
+ * framework.  If so it will be linked with "-sub_umbrella umbrella_name" where
+ * Where "umbrella_name" is the name of the sub_umbrella framework.  When
+ * staticly linking when -twolevel_namespace is in effect a twolevel namespace 
+ * umbrella framework will only cause its subframeworks and those frameworks
+ * listed as sub_umbrella frameworks to be implicited linked in.  Any other
+ * dependent dynamic libraries will not be linked it when -twolevel_namespace
+ * is in effect.  The primary library recorded by the static linker when
+ * resolving a symbol in these libraries will be the umbrella framework.
+ * Zero or more sub_umbrella frameworks may be use by an umbrella framework.
+ * The name of a sub_umbrella framework is recorded in the following structure.
+ */
+struct sub_umbrella_command {
+	uint32_t	cmd;		/* LC_SUB_UMBRELLA */
+	uint32_t	cmdsize;	/* includes sub_umbrella string */
+	union lc_str 	sub_umbrella;	/* the sub_umbrella framework name */
+};
+
+/*
+ * A dynamically linked shared library may be a sub_library of another shared
+ * library.  If so it will be linked with "-sub_library library_name" where
+ * Where "library_name" is the name of the sub_library shared library.  When
+ * staticly linking when -twolevel_namespace is in effect a twolevel namespace 
+ * shared library will only cause its subframeworks and those frameworks
+ * listed as sub_umbrella frameworks and libraries listed as sub_libraries to
+ * be implicited linked in.  Any other dependent dynamic libraries will not be
+ * linked it when -twolevel_namespace is in effect.  The primary library
+ * recorded by the static linker when resolving a symbol in these libraries
+ * will be the umbrella framework (or dynamic library). Zero or more sub_library
+ * shared libraries may be use by an umbrella framework or (or dynamic library).
+ * The name of a sub_library framework is recorded in the following structure.
+ * For example /usr/lib/libobjc_profile.A.dylib would be recorded as "libobjc".
+ */
+struct sub_library_command {
+	uint32_t	cmd;		/* LC_SUB_LIBRARY */
+	uint32_t	cmdsize;	/* includes sub_library string */
+	union lc_str 	sub_library;	/* the sub_library name */
+};
+
+/*
+ * A program (filetype == MH_EXECUTE) that is
+ * prebound to its dynamic libraries has one of these for each library that
+ * the static linker used in prebinding.  It contains a bit vector for the
+ * modules in the library.  The bits indicate which modules are bound (1) and
+ * which are not (0) from the library.  The bit for module 0 is the low bit
+ * of the first byte.  So the bit for the Nth module is:
+ * (linked_modules[N/8] >> N%8) & 1
+ */
+struct prebound_dylib_command {
+	uint32_t	cmd;		/* LC_PREBOUND_DYLIB */
+	uint32_t	cmdsize;	/* includes strings */
+	union lc_str	name;		/* library's path name */
+	uint32_t	nmodules;	/* number of modules in library */
+	union lc_str	linked_modules;	/* bit vector of linked modules */
+};
+
+/*
+ * A program that uses a dynamic linker contains a dylinker_command to identify
+ * the name of the dynamic linker (LC_LOAD_DYLINKER).  And a dynamic linker
+ * contains a dylinker_command to identify the dynamic linker (LC_ID_DYLINKER).
+ * A file can have at most one of these.
+ * This struct is also used for the LC_DYLD_ENVIRONMENT load command and
+ * contains string for dyld to treat like environment variable.
+ */
+struct dylinker_command {
+	uint32_t	cmd;		/* LC_ID_DYLINKER, LC_LOAD_DYLINKER or
+					   LC_DYLD_ENVIRONMENT */
+	uint32_t	cmdsize;	/* includes pathname string */
+	union lc_str    name;		/* dynamic linker's path name */
+};
+
+/*
+ * Thread commands contain machine-specific data structures suitable for
+ * use in the thread state primitives.  The machine specific data structures
+ * follow the struct thread_command as follows.
+ * Each flavor of machine specific data structure is preceded by an unsigned
+ * long constant for the flavor of that data structure, an uint32_t
+ * that is the count of longs of the size of the state data structure and then
+ * the state data structure follows.  This triple may be repeated for many
+ * flavors.  The constants for the flavors, counts and state data structure
+ * definitions are expected to be in the header file <machine/thread_status.h>.
+ * These machine specific data structures sizes must be multiples of
+ * 4 bytes  The cmdsize reflects the total size of the thread_command
+ * and all of the sizes of the constants for the flavors, counts and state
+ * data structures.
+ *
+ * For executable objects that are unix processes there will be one
+ * thread_command (cmd == LC_UNIXTHREAD) created for it by the link-editor.
+ * This is the same as a LC_THREAD, except that a stack is automatically
+ * created (based on the shell's limit for the stack size).  Command arguments
+ * and environment variables are copied onto that stack.
+ */
+struct thread_command {
+	uint32_t	cmd;		/* LC_THREAD or  LC_UNIXTHREAD */
+	uint32_t	cmdsize;	/* total size of this command */
+	/* uint32_t flavor		   flavor of thread state */
+	/* uint32_t count		   count of longs in thread state */
+	/* struct XXX_thread_state state   thread state for this flavor */
+	/* ... */
+};
+
+/*
+ * The routines command contains the address of the dynamic shared library 
+ * initialization routine and an index into the module table for the module
+ * that defines the routine.  Before any modules are used from the library the
+ * dynamic linker fully binds the module that defines the initialization routine
+ * and then calls it.  This gets called before any module initialization
+ * routines (used for C++ static constructors) in the library.
+ */
+struct routines_command { /* for 32-bit architectures */
+	uint32_t	cmd;		/* LC_ROUTINES */
+	uint32_t	cmdsize;	/* total size of this command */
+	uint32_t	init_address;	/* address of initialization routine */
+	uint32_t	init_module;	/* index into the module table that */
+				        /*  the init routine is defined in */
+	uint32_t	reserved1;
+	uint32_t	reserved2;
+	uint32_t	reserved3;
+	uint32_t	reserved4;
+	uint32_t	reserved5;
+	uint32_t	reserved6;
+};
+
+/*
+ * The 64-bit routines command.  Same use as above.
+ */
+struct routines_command_64 { /* for 64-bit architectures */
+	uint32_t	cmd;		/* LC_ROUTINES_64 */
+	uint32_t	cmdsize;	/* total size of this command */
+	uint64_t	init_address;	/* address of initialization routine */
+	uint64_t	init_module;	/* index into the module table that */
+					/*  the init routine is defined in */
+	uint64_t	reserved1;
+	uint64_t	reserved2;
+	uint64_t	reserved3;
+	uint64_t	reserved4;
+	uint64_t	reserved5;
+	uint64_t	reserved6;
+};
+
+/*
+ * The symtab_command contains the offsets and sizes of the link-edit 4.3BSD
+ * "stab" style symbol table information as described in the header files
+ * <nlist.h> and <stab.h>.
+ */
+struct symtab_command {
+	uint32_t	cmd;		/* LC_SYMTAB */
+	uint32_t	cmdsize;	/* sizeof(struct symtab_command) */
+	uint32_t	symoff;		/* symbol table offset */
+	uint32_t	nsyms;		/* number of symbol table entries */
+	uint32_t	stroff;		/* string table offset */
+	uint32_t	strsize;	/* string table size in bytes */
+};
+
+/*
+ * This is the second set of the symbolic information which is used to support
+ * the data structures for the dynamically link editor.
+ *
+ * The original set of symbolic information in the symtab_command which contains
+ * the symbol and string tables must also be present when this load command is
+ * present.  When this load command is present the symbol table is organized
+ * into three groups of symbols:
+ *	local symbols (static and debugging symbols) - grouped by module
+ *	defined external symbols - grouped by module (sorted by name if not lib)
+ *	undefined external symbols (sorted by name if MH_BINDATLOAD is not set,
+ *	     			    and in order the were seen by the static
+ *				    linker if MH_BINDATLOAD is set)
+ * In this load command there are offsets and counts to each of the three groups
+ * of symbols.
+ *
+ * This load command contains a the offsets and sizes of the following new
+ * symbolic information tables:
+ *	table of contents
+ *	module table
+ *	reference symbol table
+ *	indirect symbol table
+ * The first three tables above (the table of contents, module table and
+ * reference symbol table) are only present if the file is a dynamically linked
+ * shared library.  For executable and object modules, which are files
+ * containing only one module, the information that would be in these three
+ * tables is determined as follows:
+ * 	table of contents - the defined external symbols are sorted by name
+ *	module table - the file contains only one module so everything in the
+ *		       file is part of the module.
+ *	reference symbol table - is the defined and undefined external symbols
+ *
+ * For dynamically linked shared library files this load command also contains
+ * offsets and sizes to the pool of relocation entries for all sections
+ * separated into two groups:
+ *	external relocation entries
+ *	local relocation entries
+ * For executable and object modules the relocation entries continue to hang
+ * off the section structures.
+ */
+struct dysymtab_command {
+    uint32_t cmd;	/* LC_DYSYMTAB */
+    uint32_t cmdsize;	/* sizeof(struct dysymtab_command) */
+
+    /*
+     * The symbols indicated by symoff and nsyms of the LC_SYMTAB load command
+     * are grouped into the following three groups:
+     *    local symbols (further grouped by the module they are from)
+     *    defined external symbols (further grouped by the module they are from)
+     *    undefined symbols
+     *
+     * The local symbols are used only for debugging.  The dynamic binding
+     * process may have to use them to indicate to the debugger the local
+     * symbols for a module that is being bound.
+     *
+     * The last two groups are used by the dynamic binding process to do the
+     * binding (indirectly through the module table and the reference symbol
+     * table when this is a dynamically linked shared library file).
+     */
+    uint32_t ilocalsym;	/* index to local symbols */
+    uint32_t nlocalsym;	/* number of local symbols */
+
+    uint32_t iextdefsym;/* index to externally defined symbols */
+    uint32_t nextdefsym;/* number of externally defined symbols */
+
+    uint32_t iundefsym;	/* index to undefined symbols */
+    uint32_t nundefsym;	/* number of undefined symbols */
+
+    /*
+     * For the for the dynamic binding process to find which module a symbol
+     * is defined in the table of contents is used (analogous to the ranlib
+     * structure in an archive) which maps defined external symbols to modules
+     * they are defined in.  This exists only in a dynamically linked shared
+     * library file.  For executable and object modules the defined external
+     * symbols are sorted by name and is use as the table of contents.
+     */
+    uint32_t tocoff;	/* file offset to table of contents */
+    uint32_t ntoc;	/* number of entries in table of contents */
+
+    /*
+     * To support dynamic binding of "modules" (whole object files) the symbol
+     * table must reflect the modules that the file was created from.  This is
+     * done by having a module table that has indexes and counts into the merged
+     * tables for each module.  The module structure that these two entries
+     * refer to is described below.  This exists only in a dynamically linked
+     * shared library file.  For executable and object modules the file only
+     * contains one module so everything in the file belongs to the module.
+     */
+    uint32_t modtaboff;	/* file offset to module table */
+    uint32_t nmodtab;	/* number of module table entries */
+
+    /*
+     * To support dynamic module binding the module structure for each module
+     * indicates the external references (defined and undefined) each module
+     * makes.  For each module there is an offset and a count into the
+     * reference symbol table for the symbols that the module references.
+     * This exists only in a dynamically linked shared library file.  For
+     * executable and object modules the defined external symbols and the
+     * undefined external symbols indicates the external references.
+     */
+    uint32_t extrefsymoff;	/* offset to referenced symbol table */
+    uint32_t nextrefsyms;	/* number of referenced symbol table entries */
+
+    /*
+     * The sections that contain "symbol pointers" and "routine stubs" have
+     * indexes and (implied counts based on the size of the section and fixed
+     * size of the entry) into the "indirect symbol" table for each pointer
+     * and stub.  For every section of these two types the index into the
+     * indirect symbol table is stored in the section header in the field
+     * reserved1.  An indirect symbol table entry is simply a 32bit index into
+     * the symbol table to the symbol that the pointer or stub is referring to.
+     * The indirect symbol table is ordered to match the entries in the section.
+     */
+    uint32_t indirectsymoff; /* file offset to the indirect symbol table */
+    uint32_t nindirectsyms;  /* number of indirect symbol table entries */
+
+    /*
+     * To support relocating an individual module in a library file quickly the
+     * external relocation entries for each module in the library need to be
+     * accessed efficiently.  Since the relocation entries can't be accessed
+     * through the section headers for a library file they are separated into
+     * groups of local and external entries further grouped by module.  In this
+     * case the presents of this load command who's extreloff, nextrel,
+     * locreloff and nlocrel fields are non-zero indicates that the relocation
+     * entries of non-merged sections are not referenced through the section
+     * structures (and the reloff and nreloc fields in the section headers are
+     * set to zero).
+     *
+     * Since the relocation entries are not accessed through the section headers
+     * this requires the r_address field to be something other than a section
+     * offset to identify the item to be relocated.  In this case r_address is
+     * set to the offset from the vmaddr of the first LC_SEGMENT command.
+     * For MH_SPLIT_SEGS images r_address is set to the the offset from the
+     * vmaddr of the first read-write LC_SEGMENT command.
+     *
+     * The relocation entries are grouped by module and the module table
+     * entries have indexes and counts into them for the group of external
+     * relocation entries for that the module.
+     *
+     * For sections that are merged across modules there must not be any
+     * remaining external relocation entries for them (for merged sections
+     * remaining relocation entries must be local).
+     */
+    uint32_t extreloff;	/* offset to external relocation entries */
+    uint32_t nextrel;	/* number of external relocation entries */
+
+    /*
+     * All the local relocation entries are grouped together (they are not
+     * grouped by their module since they are only used if the object is moved
+     * from it staticly link edited address).
+     */
+    uint32_t locreloff;	/* offset to local relocation entries */
+    uint32_t nlocrel;	/* number of local relocation entries */
+
+};	
+
+/*
+ * An indirect symbol table entry is simply a 32bit index into the symbol table 
+ * to the symbol that the pointer or stub is refering to.  Unless it is for a
+ * non-lazy symbol pointer section for a defined symbol which strip(1) as 
+ * removed.  In which case it has the value INDIRECT_SYMBOL_LOCAL.  If the
+ * symbol was also absolute INDIRECT_SYMBOL_ABS is or'ed with that.
+ */
+#define INDIRECT_SYMBOL_LOCAL	0x80000000
+#define INDIRECT_SYMBOL_ABS	0x40000000
+
+
+/* a table of contents entry */
+struct dylib_table_of_contents {
+    uint32_t symbol_index;	/* the defined external symbol
+				   (index into the symbol table) */
+    uint32_t module_index;	/* index into the module table this symbol
+				   is defined in */
+};	
+
+/* a module table entry */
+struct dylib_module {
+    uint32_t module_name;	/* the module name (index into string table) */
+
+    uint32_t iextdefsym;	/* index into externally defined symbols */
+    uint32_t nextdefsym;	/* number of externally defined symbols */
+    uint32_t irefsym;		/* index into reference symbol table */
+    uint32_t nrefsym;		/* number of reference symbol table entries */
+    uint32_t ilocalsym;		/* index into symbols for local symbols */
+    uint32_t nlocalsym;		/* number of local symbols */
+
+    uint32_t iextrel;		/* index into external relocation entries */
+    uint32_t nextrel;		/* number of external relocation entries */
+
+    uint32_t iinit_iterm;	/* low 16 bits are the index into the init
+				   section, high 16 bits are the index into
+			           the term section */
+    uint32_t ninit_nterm;	/* low 16 bits are the number of init section
+				   entries, high 16 bits are the number of
+				   term section entries */
+
+    uint32_t			/* for this module address of the start of */
+	objc_module_info_addr;  /*  the (__OBJC,__module_info) section */
+    uint32_t			/* for this module size of */
+	objc_module_info_size;	/*  the (__OBJC,__module_info) section */
+};	
+
+/* a 64-bit module table entry */
+struct dylib_module_64 {
+    uint32_t module_name;	/* the module name (index into string table) */
+
+    uint32_t iextdefsym;	/* index into externally defined symbols */
+    uint32_t nextdefsym;	/* number of externally defined symbols */
+    uint32_t irefsym;		/* index into reference symbol table */
+    uint32_t nrefsym;		/* number of reference symbol table entries */
+    uint32_t ilocalsym;		/* index into symbols for local symbols */
+    uint32_t nlocalsym;		/* number of local symbols */
+
+    uint32_t iextrel;		/* index into external relocation entries */
+    uint32_t nextrel;		/* number of external relocation entries */
+
+    uint32_t iinit_iterm;	/* low 16 bits are the index into the init
+				   section, high 16 bits are the index into
+				   the term section */
+    uint32_t ninit_nterm;      /* low 16 bits are the number of init section
+				  entries, high 16 bits are the number of
+				  term section entries */
+
+    uint32_t			/* for this module size of */
+        objc_module_info_size;	/*  the (__OBJC,__module_info) section */
+    uint64_t			/* for this module address of the start of */
+        objc_module_info_addr;	/*  the (__OBJC,__module_info) section */
+};
+
+/* 
+ * The entries in the reference symbol table are used when loading the module
+ * (both by the static and dynamic link editors) and if the module is unloaded
+ * or replaced.  Therefore all external symbols (defined and undefined) are
+ * listed in the module's reference table.  The flags describe the type of
+ * reference that is being made.  The constants for the flags are defined in
+ * <mach-o/nlist.h> as they are also used for symbol table entries.
+ */
+struct dylib_reference {
+    uint32_t isym:24,		/* index into the symbol table */
+    		  flags:8;	/* flags to indicate the type of reference */
+};
+
+/*
+ * The twolevel_hints_command contains the offset and number of hints in the
+ * two-level namespace lookup hints table.
+ */
+struct twolevel_hints_command {
+    uint32_t cmd;	/* LC_TWOLEVEL_HINTS */
+    uint32_t cmdsize;	/* sizeof(struct twolevel_hints_command) */
+    uint32_t offset;	/* offset to the hint table */
+    uint32_t nhints;	/* number of hints in the hint table */
+};
+
+/*
+ * The entries in the two-level namespace lookup hints table are twolevel_hint
+ * structs.  These provide hints to the dynamic link editor where to start
+ * looking for an undefined symbol in a two-level namespace image.  The
+ * isub_image field is an index into the sub-images (sub-frameworks and
+ * sub-umbrellas list) that made up the two-level image that the undefined
+ * symbol was found in when it was built by the static link editor.  If
+ * isub-image is 0 the the symbol is expected to be defined in library and not
+ * in the sub-images.  If isub-image is non-zero it is an index into the array
+ * of sub-images for the umbrella with the first index in the sub-images being
+ * 1. The array of sub-images is the ordered list of sub-images of the umbrella
+ * that would be searched for a symbol that has the umbrella recorded as its
+ * primary library.  The table of contents index is an index into the
+ * library's table of contents.  This is used as the starting point of the
+ * binary search or a directed linear search.
+ */
+struct twolevel_hint {
+    uint32_t 
+	isub_image:8,	/* index into the sub images */
+	itoc:24;	/* index into the table of contents */
+};
+
+/*
+ * The prebind_cksum_command contains the value of the original check sum for
+ * prebound files or zero.  When a prebound file is first created or modified
+ * for other than updating its prebinding information the value of the check sum
+ * is set to zero.  When the file has it prebinding re-done and if the value of
+ * the check sum is zero the original check sum is calculated and stored in
+ * cksum field of this load command in the output file.  If when the prebinding
+ * is re-done and the cksum field is non-zero it is left unchanged from the
+ * input file.
+ */
+struct prebind_cksum_command {
+    uint32_t cmd;	/* LC_PREBIND_CKSUM */
+    uint32_t cmdsize;	/* sizeof(struct prebind_cksum_command) */
+    uint32_t cksum;	/* the check sum or zero */
+};
+
+/*
+ * The uuid load command contains a single 128-bit unique random number that
+ * identifies an object produced by the static link editor.
+ */
+struct uuid_command {
+    uint32_t	cmd;		/* LC_UUID */
+    uint32_t	cmdsize;	/* sizeof(struct uuid_command) */
+    uint8_t	uuid[16];	/* the 128-bit uuid */
+};
+
+/*
+ * The rpath_command contains a path which at runtime should be added to
+ * the current run path used to find @rpath prefixed dylibs.
+ */
+struct rpath_command {
+    uint32_t	 cmd;		/* LC_RPATH */
+    uint32_t	 cmdsize;	/* includes string */
+    union lc_str path;		/* path to add to run path */
+};
+
+/*
+ * The linkedit_data_command contains the offsets and sizes of a blob
+ * of data in the __LINKEDIT segment.  
+ */
+struct linkedit_data_command {
+    uint32_t	cmd;		/* LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO,
+                                   or LC_FUNCTION_STARTS */
+    uint32_t	cmdsize;	/* sizeof(struct linkedit_data_command) */
+    uint32_t	dataoff;	/* file offset of data in __LINKEDIT segment */
+    uint32_t	datasize;	/* file size of data in __LINKEDIT segment  */
+};
+
+/*
+ * The encryption_info_command contains the file offset and size of an
+ * of an encrypted segment.
+ */
+struct encryption_info_command {
+   uint32_t	cmd;		/* LC_ENCRYPTION_INFO */
+   uint32_t	cmdsize;	/* sizeof(struct encryption_info_command) */
+   uint32_t	cryptoff;	/* file offset of encrypted range */
+   uint32_t	cryptsize;	/* file size of encrypted range */
+   uint32_t	cryptid;	/* which enryption system,
+				   0 means not-encrypted yet */
+};
+
+/*
+ * The version_min_command contains the min OS version on which this 
+ * binary was built to run.
+ */
+struct version_min_command {
+    uint32_t	cmd;		/* LC_VERSION_MIN_MACOSX or
+				   LC_VERSION_MIN_IPHONEOS  */
+    uint32_t	cmdsize;	/* sizeof(struct min_version_command) */
+    uint32_t	version;	/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
+    uint32_t	reserved;	/* zero */
+};
+
+/*
+ * The dyld_info_command contains the file offsets and sizes of 
+ * the new compressed form of the information dyld needs to 
+ * load the image.  This information is used by dyld on Mac OS X
+ * 10.6 and later.  All information pointed to by this command
+ * is encoded using byte streams, so no endian swapping is needed
+ * to interpret it. 
+ */
+struct dyld_info_command {
+   uint32_t   cmd;		/* LC_DYLD_INFO or LC_DYLD_INFO_ONLY */
+   uint32_t   cmdsize;		/* sizeof(struct dyld_info_command) */
+
+    /*
+     * Dyld rebases an image whenever dyld loads it at an address different
+     * from its preferred address.  The rebase information is a stream
+     * of byte sized opcodes whose symbolic names start with REBASE_OPCODE_.
+     * Conceptually the rebase information is a table of tuples:
+     *    <seg-index, seg-offset, type>
+     * The opcodes are a compressed way to encode the table by only
+     * encoding when a column changes.  In addition simple patterns
+     * like "every n'th offset for m times" can be encoded in a few
+     * bytes.
+     */
+    uint32_t   rebase_off;	/* file offset to rebase info  */
+    uint32_t   rebase_size;	/* size of rebase info   */
+    
+    /*
+     * Dyld binds an image during the loading process, if the image
+     * requires any pointers to be initialized to symbols in other images.  
+     * The bind information is a stream of byte sized 
+     * opcodes whose symbolic names start with BIND_OPCODE_.
+     * Conceptually the bind information is a table of tuples:
+     *    <seg-index, seg-offset, type, symbol-library-ordinal, symbol-name, addend>
+     * The opcodes are a compressed way to encode the table by only
+     * encoding when a column changes.  In addition simple patterns
+     * like for runs of pointers initialzed to the same value can be 
+     * encoded in a few bytes.
+     */
+    uint32_t   bind_off;	/* file offset to binding info   */
+    uint32_t   bind_size;	/* size of binding info  */
+        
+    /*
+     * Some C++ programs require dyld to unique symbols so that all
+     * images in the process use the same copy of some code/data.
+     * This step is done after binding. The content of the weak_bind
+     * info is an opcode stream like the bind_info.  But it is sorted
+     * alphabetically by symbol name.  This enable dyld to walk 
+     * all images with weak binding information in order and look
+     * for collisions.  If there are no collisions, dyld does
+     * no updating.  That means that some fixups are also encoded
+     * in the bind_info.  For instance, all calls to "operator new"
+     * are first bound to libstdc++.dylib using the information
+     * in bind_info.  Then if some image overrides operator new
+     * that is detected when the weak_bind information is processed
+     * and the call to operator new is then rebound.
+     */
+    uint32_t   weak_bind_off;	/* file offset to weak binding info   */
+    uint32_t   weak_bind_size;  /* size of weak binding info  */
+    
+    /*
+     * Some uses of external symbols do not need to be bound immediately.
+     * Instead they can be lazily bound on first use.  The lazy_bind
+     * are contains a stream of BIND opcodes to bind all lazy symbols.
+     * Normal use is that dyld ignores the lazy_bind section when
+     * loading an image.  Instead the static linker arranged for the
+     * lazy pointer to initially point to a helper function which 
+     * pushes the offset into the lazy_bind area for the symbol
+     * needing to be bound, then jumps to dyld which simply adds
+     * the offset to lazy_bind_off to get the information on what 
+     * to bind.  
+     */
+    uint32_t   lazy_bind_off;	/* file offset to lazy binding info */
+    uint32_t   lazy_bind_size;  /* size of lazy binding infs */
+    
+    /*
+     * The symbols exported by a dylib are encoded in a trie.  This
+     * is a compact representation that factors out common prefixes.
+     * It also reduces LINKEDIT pages in RAM because it encodes all  
+     * information (name, address, flags) in one small, contiguous range.
+     * The export area is a stream of nodes.  The first node sequentially
+     * is the start node for the trie.  
+     *
+     * Nodes for a symbol start with a uleb128 that is the length of
+     * the exported symbol information for the string so far.
+     * If there is no exported symbol, the node starts with a zero byte. 
+     * If there is exported info, it follows the length.  First is
+     * a uleb128 containing flags.  Normally, it is followed by a
+     * uleb128 encoded offset which is location of the content named
+     * by the symbol from the mach_header for the image.  If the flags
+     * is EXPORT_SYMBOL_FLAGS_REEXPORT, then following the flags is
+     * a uleb128 encoded library ordinal, then a zero terminated
+     * UTF8 string.  If the string is zero length, then the symbol
+     * is re-export from the specified dylib with the same name.
+     *
+     * After the optional exported symbol information is a byte of
+     * how many edges (0-255) that this node has leaving it, 
+     * followed by each edge.
+     * Each edge is a zero terminated UTF8 of the addition chars
+     * in the symbol, followed by a uleb128 offset for the node that
+     * edge points to.
+     *  
+     */
+    uint32_t   export_off;	/* file offset to lazy binding info */
+    uint32_t   export_size;	/* size of lazy binding infs */
+};
+
+/*
+ * The following are used to encode rebasing information
+ */
+#define REBASE_TYPE_POINTER					1
+#define REBASE_TYPE_TEXT_ABSOLUTE32				2
+#define REBASE_TYPE_TEXT_PCREL32				3
+
+#define REBASE_OPCODE_MASK					0xF0
+#define REBASE_IMMEDIATE_MASK					0x0F
+#define REBASE_OPCODE_DONE					0x00
+#define REBASE_OPCODE_SET_TYPE_IMM				0x10
+#define REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB		0x20
+#define REBASE_OPCODE_ADD_ADDR_ULEB				0x30
+#define REBASE_OPCODE_ADD_ADDR_IMM_SCALED			0x40
+#define REBASE_OPCODE_DO_REBASE_IMM_TIMES			0x50
+#define REBASE_OPCODE_DO_REBASE_ULEB_TIMES			0x60
+#define REBASE_OPCODE_DO_REBASE_ADD_ADDR_ULEB			0x70
+#define REBASE_OPCODE_DO_REBASE_ULEB_TIMES_SKIPPING_ULEB	0x80
+
+
+/*
+ * The following are used to encode binding information
+ */
+#define BIND_TYPE_POINTER					1
+#define BIND_TYPE_TEXT_ABSOLUTE32				2
+#define BIND_TYPE_TEXT_PCREL32					3
+
+#define BIND_SPECIAL_DYLIB_SELF					 0
+#define BIND_SPECIAL_DYLIB_MAIN_EXECUTABLE			-1
+#define BIND_SPECIAL_DYLIB_FLAT_LOOKUP				-2
+
+#define BIND_SYMBOL_FLAGS_WEAK_IMPORT				0x1
+#define BIND_SYMBOL_FLAGS_NON_WEAK_DEFINITION			0x8
+
+#define BIND_OPCODE_MASK					0xF0
+#define BIND_IMMEDIATE_MASK					0x0F
+#define BIND_OPCODE_DONE					0x00
+#define BIND_OPCODE_SET_DYLIB_ORDINAL_IMM			0x10
+#define BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB			0x20
+#define BIND_OPCODE_SET_DYLIB_SPECIAL_IMM			0x30
+#define BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM		0x40
+#define BIND_OPCODE_SET_TYPE_IMM				0x50
+#define BIND_OPCODE_SET_ADDEND_SLEB				0x60
+#define BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB			0x70
+#define BIND_OPCODE_ADD_ADDR_ULEB				0x80
+#define BIND_OPCODE_DO_BIND					0x90
+#define BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB			0xA0
+#define BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED			0xB0
+#define BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB		0xC0
+
+
+/*
+ * The following are used on the flags byte of a terminal node
+ * in the export information.
+ */
+#define EXPORT_SYMBOL_FLAGS_KIND_MASK				0x03
+#define EXPORT_SYMBOL_FLAGS_KIND_REGULAR			0x00
+#define EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL			0x01
+#define EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION			0x04
+#define EXPORT_SYMBOL_FLAGS_REEXPORT				0x08
+#define EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER			0x10
+
+/*
+ * The symseg_command contains the offset and size of the GNU style
+ * symbol table information as described in the header file <symseg.h>.
+ * The symbol roots of the symbol segments must also be aligned properly
+ * in the file.  So the requirement of keeping the offsets aligned to a
+ * multiple of a 4 bytes translates to the length field of the symbol
+ * roots also being a multiple of a long.  Also the padding must again be
+ * zeroed. (THIS IS OBSOLETE and no longer supported).
+ */
+struct symseg_command {
+	uint32_t	cmd;		/* LC_SYMSEG */
+	uint32_t	cmdsize;	/* sizeof(struct symseg_command) */
+	uint32_t	offset;		/* symbol segment offset */
+	uint32_t	size;		/* symbol segment size in bytes */
+};
+
+/*
+ * The ident_command contains a free format string table following the
+ * ident_command structure.  The strings are null terminated and the size of
+ * the command is padded out with zero bytes to a multiple of 4 bytes/
+ * (THIS IS OBSOLETE and no longer supported).
+ */
+struct ident_command {
+	uint32_t cmd;		/* LC_IDENT */
+	uint32_t cmdsize;	/* strings that follow this command */
+};
+
+/*
+ * The fvmfile_command contains a reference to a file to be loaded at the
+ * specified virtual address.  (Presently, this command is reserved for
+ * internal use.  The kernel ignores this command when loading a program into
+ * memory).
+ */
+struct fvmfile_command {
+	uint32_t cmd;			/* LC_FVMFILE */
+	uint32_t cmdsize;		/* includes pathname string */
+	union lc_str	name;		/* files pathname */
+	uint32_t	header_addr;	/* files virtual address */
+};
+
+/*
+ * Sections of type S_THREAD_LOCAL_VARIABLES contain an array 
+ * of tlv_descriptor structures.
+ */
+struct tlv_descriptor
+{
+	void*		(*thunk)(struct tlv_descriptor*);
+	unsigned long	key;
+	unsigned long	offset;
+};
+
+#endif /* _MACHO_LOADER_H_ */
diff --git a/i386/include/mach-o/nlist.h b/i386/include/mach-o/nlist.h
new file mode 100644
index 0000000..1c19410
--- /dev/null
+++ b/i386/include/mach-o/nlist.h
@@ -0,0 +1,312 @@
+/*
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _MACHO_NLIST_H_
+#define _MACHO_NLIST_H_
+/*	$NetBSD: nlist.h,v 1.5 1994/10/26 00:56:11 cgd Exp $	*/
+
+/*-
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
+ */
+#include <stdint.h>
+
+/*
+ * Format of a symbol table entry of a Mach-O file for 32-bit architectures.
+ * Modified from the BSD format.  The modifications from the original format
+ * were changing n_other (an unused field) to n_sect and the addition of the
+ * N_SECT type.  These modifications are required to support symbols in a larger
+ * number of sections not just the three sections (text, data and bss) in a BSD
+ * file.
+ */
+struct nlist {
+	union {
+#ifndef __LP64__
+		char *n_name;	/* for use when in-core */
+#endif
+		int32_t n_strx;	/* index into the string table */
+	} n_un;
+	uint8_t n_type;		/* type flag, see below */
+	uint8_t n_sect;		/* section number or NO_SECT */
+	int16_t n_desc;		/* see <mach-o/stab.h> */
+	uint32_t n_value;	/* value of this symbol (or stab offset) */
+};
+
+/*
+ * This is the symbol table entry structure for 64-bit architectures.
+ */
+struct nlist_64 {
+    union {
+        uint32_t  n_strx; /* index into the string table */
+    } n_un;
+    uint8_t n_type;        /* type flag, see below */
+    uint8_t n_sect;        /* section number or NO_SECT */
+    uint16_t n_desc;       /* see <mach-o/stab.h> */
+    uint64_t n_value;      /* value of this symbol (or stab offset) */
+};
+
+/*
+ * Symbols with a index into the string table of zero (n_un.n_strx == 0) are
+ * defined to have a null, "", name.  Therefore all string indexes to non null
+ * names must not have a zero string index.  This is bit historical information
+ * that has never been well documented.
+ */
+
+/*
+ * The n_type field really contains four fields:
+ *	unsigned char N_STAB:3,
+ *		      N_PEXT:1,
+ *		      N_TYPE:3,
+ *		      N_EXT:1;
+ * which are used via the following masks.
+ */
+#define	N_STAB	0xe0  /* if any of these bits set, a symbolic debugging entry */
+#define	N_PEXT	0x10  /* private external symbol bit */
+#define	N_TYPE	0x0e  /* mask for the type bits */
+#define	N_EXT	0x01  /* external symbol bit, set for external symbols */
+
+/*
+ * Only symbolic debugging entries have some of the N_STAB bits set and if any
+ * of these bits are set then it is a symbolic debugging entry (a stab).  In
+ * which case then the values of the n_type field (the entire field) are given
+ * in <mach-o/stab.h>
+ */
+
+/*
+ * Values for N_TYPE bits of the n_type field.
+ */
+#define	N_UNDF	0x0		/* undefined, n_sect == NO_SECT */
+#define	N_ABS	0x2		/* absolute, n_sect == NO_SECT */
+#define	N_SECT	0xe		/* defined in section number n_sect */
+#define	N_PBUD	0xc		/* prebound undefined (defined in a dylib) */
+#define N_INDR	0xa		/* indirect */
+
+/* 
+ * If the type is N_INDR then the symbol is defined to be the same as another
+ * symbol.  In this case the n_value field is an index into the string table
+ * of the other symbol's name.  When the other symbol is defined then they both
+ * take on the defined type and value.
+ */
+
+/*
+ * If the type is N_SECT then the n_sect field contains an ordinal of the
+ * section the symbol is defined in.  The sections are numbered from 1 and 
+ * refer to sections in order they appear in the load commands for the file
+ * they are in.  This means the same ordinal may very well refer to different
+ * sections in different files.
+ *
+ * The n_value field for all symbol table entries (including N_STAB's) gets
+ * updated by the link editor based on the value of it's n_sect field and where
+ * the section n_sect references gets relocated.  If the value of the n_sect 
+ * field is NO_SECT then it's n_value field is not changed by the link editor.
+ */
+#define	NO_SECT		0	/* symbol is not in any section */
+#define MAX_SECT	255	/* 1 thru 255 inclusive */
+
+/*
+ * Common symbols are represented by undefined (N_UNDF) external (N_EXT) types
+ * who's values (n_value) are non-zero.  In which case the value of the n_value
+ * field is the size (in bytes) of the common symbol.  The n_sect field is set
+ * to NO_SECT.  The alignment of a common symbol may be set as a power of 2
+ * between 2^1 and 2^15 as part of the n_desc field using the macros below. If
+ * the alignment is not set (a value of zero) then natural alignment based on
+ * the size is used.
+ */
+#define GET_COMM_ALIGN(n_desc) (((n_desc) >> 8) & 0x0f)
+#define SET_COMM_ALIGN(n_desc,align) \
+    (n_desc) = (((n_desc) & 0xf0ff) | (((align) & 0x0f) << 8))
+
+/*
+ * To support the lazy binding of undefined symbols in the dynamic link-editor,
+ * the undefined symbols in the symbol table (the nlist structures) are marked
+ * with the indication if the undefined reference is a lazy reference or
+ * non-lazy reference.  If both a non-lazy reference and a lazy reference is
+ * made to the same symbol the non-lazy reference takes precedence.  A reference
+ * is lazy only when all references to that symbol are made through a symbol
+ * pointer in a lazy symbol pointer section.
+ *
+ * The implementation of marking nlist structures in the symbol table for
+ * undefined symbols will be to use some of the bits of the n_desc field as a
+ * reference type.  The mask REFERENCE_TYPE will be applied to the n_desc field
+ * of an nlist structure for an undefined symbol to determine the type of
+ * undefined reference (lazy or non-lazy).
+ *
+ * The constants for the REFERENCE FLAGS are propagated to the reference table
+ * in a shared library file.  In that case the constant for a defined symbol,
+ * REFERENCE_FLAG_DEFINED, is also used.
+ */
+/* Reference type bits of the n_desc field of undefined symbols */
+#define REFERENCE_TYPE				0x7
+/* types of references */
+#define REFERENCE_FLAG_UNDEFINED_NON_LAZY		0
+#define REFERENCE_FLAG_UNDEFINED_LAZY			1
+#define REFERENCE_FLAG_DEFINED				2
+#define REFERENCE_FLAG_PRIVATE_DEFINED			3
+#define REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY	4
+#define REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY		5
+
+/*
+ * To simplify stripping of objects that use are used with the dynamic link
+ * editor, the static link editor marks the symbols defined an object that are
+ * referenced by a dynamicly bound object (dynamic shared libraries, bundles).
+ * With this marking strip knows not to strip these symbols.
+ */
+#define REFERENCED_DYNAMICALLY	0x0010
+
+/*
+ * For images created by the static link editor with the -twolevel_namespace
+ * option in effect the flags field of the mach header is marked with
+ * MH_TWOLEVEL.  And the binding of the undefined references of the image are
+ * determined by the static link editor.  Which library an undefined symbol is
+ * bound to is recorded by the static linker in the high 8 bits of the n_desc
+ * field using the SET_LIBRARY_ORDINAL macro below.  The ordinal recorded
+ * references the libraries listed in the Mach-O's LC_LOAD_DYLIB,
+ * LC_LOAD_WEAK_DYLIB, LC_REEXPORT_DYLIB, LC_LOAD_UPWARD_DYLIB, and
+ * LC_LAZY_LOAD_DYLIB, etc. load commands in the order they appear in the
+ * headers.   The library ordinals start from 1.
+ * For a dynamic library that is built as a two-level namespace image the
+ * undefined references from module defined in another use the same nlist struct
+ * an in that case SELF_LIBRARY_ORDINAL is used as the library ordinal.  For
+ * defined symbols in all images they also must have the library ordinal set to
+ * SELF_LIBRARY_ORDINAL.  The EXECUTABLE_ORDINAL refers to the executable
+ * image for references from plugins that refer to the executable that loads
+ * them.
+ * 
+ * The DYNAMIC_LOOKUP_ORDINAL is for undefined symbols in a two-level namespace
+ * image that are looked up by the dynamic linker with flat namespace semantics.
+ * This ordinal was added as a feature in Mac OS X 10.3 by reducing the
+ * value of MAX_LIBRARY_ORDINAL by one.  So it is legal for existing binaries
+ * or binaries built with older tools to have 0xfe (254) dynamic libraries.  In
+ * this case the ordinal value 0xfe (254) must be treated as a library ordinal
+ * for compatibility. 
+ */
+#define GET_LIBRARY_ORDINAL(n_desc) (((n_desc) >> 8) & 0xff)
+#define SET_LIBRARY_ORDINAL(n_desc,ordinal) \
+	(n_desc) = (((n_desc) & 0x00ff) | (((ordinal) & 0xff) << 8))
+#define SELF_LIBRARY_ORDINAL 0x0
+#define MAX_LIBRARY_ORDINAL 0xfd
+#define DYNAMIC_LOOKUP_ORDINAL 0xfe
+#define EXECUTABLE_ORDINAL 0xff
+
+/*
+ * The bit 0x0020 of the n_desc field is used for two non-overlapping purposes
+ * and has two different symbolic names, N_NO_DEAD_STRIP and N_DESC_DISCARDED.
+ */
+
+/*
+ * The N_NO_DEAD_STRIP bit of the n_desc field only ever appears in a 
+ * relocatable .o file (MH_OBJECT filetype). And is used to indicate to the
+ * static link editor it is never to dead strip the symbol.
+ */
+#define N_NO_DEAD_STRIP 0x0020 /* symbol is not to be dead stripped */
+
+/*
+ * The N_DESC_DISCARDED bit of the n_desc field never appears in linked image.
+ * But is used in very rare cases by the dynamic link editor to mark an in
+ * memory symbol as discared and longer used for linking.
+ */
+#define N_DESC_DISCARDED 0x0020	/* symbol is discarded */
+
+/*
+ * The N_WEAK_REF bit of the n_desc field indicates to the dynamic linker that
+ * the undefined symbol is allowed to be missing and is to have the address of
+ * zero when missing.
+ */
+#define N_WEAK_REF	0x0040 /* symbol is weak referenced */
+
+/*
+ * The N_WEAK_DEF bit of the n_desc field indicates to the static and dynamic
+ * linkers that the symbol definition is weak, allowing a non-weak symbol to
+ * also be used which causes the weak definition to be discared.  Currently this
+ * is only supported for symbols in coalesed sections.
+ */
+#define N_WEAK_DEF	0x0080 /* coalesed symbol is a weak definition */
+
+/*
+ * The N_REF_TO_WEAK bit of the n_desc field indicates to the dynamic linker
+ * that the undefined symbol should be resolved using flat namespace searching.
+ */
+#define	N_REF_TO_WEAK	0x0080 /* reference to a weak symbol */
+
+/*
+ * The N_ARM_THUMB_DEF bit of the n_desc field indicates that the symbol is
+ * a defintion of a Thumb function.
+ */
+#define N_ARM_THUMB_DEF	0x0008 /* symbol is a Thumb function (ARM) */
+
+/*
+ * The N_SYMBOL_RESOLVER bit of the n_desc field indicates that the
+ * that the function is actually a resolver function and should
+ * be called to get the address of the real function to use.
+ * This bit is only available in .o files (MH_OBJECT filetype)
+ */
+#define N_SYMBOL_RESOLVER  0x0100 
+
+#ifndef __STRICT_BSD__
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+/*
+ * The function nlist(3) from the C library.
+ */
+extern int nlist (const char *filename, struct nlist *list);
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __STRICT_BSD__ */
+
+#endif /* _MACHO_LIST_H_ */
diff --git a/i386/include/mach-o/ranlib.h b/i386/include/mach-o/ranlib.h
new file mode 100644
index 0000000..66a1f09
--- /dev/null
+++ b/i386/include/mach-o/ranlib.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*	ranlib.h	4.1	83/05/03	*/
+#ifndef _MACH_O_RANLIB_H_
+#define _MACH_O_RANLIB_H_
+
+#include <stdint.h>
+#include <sys/types.h>		/* off_t */
+
+/*
+ * There are two known orders of table of contents for archives.  The first is
+ * the order ranlib(1) originally produced and still produces without any
+ * options.  This table of contents has the archive member name "__.SYMDEF"
+ * This order has the ranlib structures in the order the objects appear in the
+ * archive and the symbol names of those objects in the order of symbol table.
+ * The second know order is sorted by symbol name and is produced with the -s
+ * option to ranlib(1).  This table of contents has the archive member name
+ * "__.SYMDEF SORTED" and many programs (notably the 1.0 version of ld(1) can't
+ * tell the difference between names because of the imbedded blank in the name
+ * and works with either table of contents).  This second order is used by the
+ * post 1.0 link editor to produce faster linking.  The original 1.0 version of
+ * ranlib(1) gets confused when it is run on a archive with the second type of
+ * table of contents because it and ar(1) which it uses use different ways to
+ * determined the member name (ar(1) treats all blanks in the name as
+ * significant and ranlib(1) only checks for the first one).
+ */
+#define SYMDEF		"__.SYMDEF"
+#define SYMDEF_SORTED	"__.SYMDEF SORTED"
+
+/*
+ * Structure of the __.SYMDEF table of contents for an archive.
+ * __.SYMDEF begins with a long giving the size in bytes of the ranlib
+ * structures which immediately follow, and then continues with a string
+ * table consisting of a long giving the number of bytes of strings which
+ * follow and then the strings themselves.  The ran_strx fields index the
+ * string table whose first byte is numbered 0.
+ */
+struct	ranlib {
+    union {
+	uint32_t	ran_strx;	/* string table index of */
+#ifndef __LP64__
+	char		*ran_name;	/* symbol defined by */
+#endif
+    } ran_un;
+    uint32_t		ran_off;	/* library member at this offset */
+};
+#endif /* _MACH_O_RANLIB_H_ */
diff --git a/i386/include/mach-o/reloc.h b/i386/include/mach-o/reloc.h
new file mode 100644
index 0000000..d5741ef
--- /dev/null
+++ b/i386/include/mach-o/reloc.h
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*	$NetBSD: exec.h,v 1.6 1994/10/27 04:16:05 cgd Exp $	*/
+
+/*
+ * Copyright (c) 1993 Christopher G. Demetriou
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _MACHO_RELOC_H_
+#define _MACHO_RELOC_H_
+#include <stdint.h>
+
+/*
+ * Format of a relocation entry of a Mach-O file.  Modified from the 4.3BSD
+ * format.  The modifications from the original format were changing the value
+ * of the r_symbolnum field for "local" (r_extern == 0) relocation entries.
+ * This modification is required to support symbols in an arbitrary number of
+ * sections not just the three sections (text, data and bss) in a 4.3BSD file.
+ * Also the last 4 bits have had the r_type tag added to them.
+ */
+struct relocation_info {
+   int32_t	r_address;	/* offset in the section to what is being
+				   relocated */
+   uint32_t     r_symbolnum:24,	/* symbol index if r_extern == 1 or section
+				   ordinal if r_extern == 0 */
+		r_pcrel:1, 	/* was relocated pc relative already */
+		r_length:2,	/* 0=byte, 1=word, 2=long, 3=quad */
+		r_extern:1,	/* does not include value of sym referenced */
+		r_type:4;	/* if not 0, machine specific relocation type */
+};
+#define	R_ABS	0		/* absolute relocation type for Mach-O files */
+
+/*
+ * The r_address is not really the address as it's name indicates but an offset.
+ * In 4.3BSD a.out objects this offset is from the start of the "segment" for
+ * which relocation entry is for (text or data).  For Mach-O object files it is
+ * also an offset but from the start of the "section" for which the relocation
+ * entry is for.  See comments in <mach-o/loader.h> about the r_address feild
+ * in images for used with the dynamic linker.
+ * 
+ * In 4.3BSD a.out objects if r_extern is zero then r_symbolnum is an ordinal
+ * for the segment the symbol being relocated is in.  These ordinals are the
+ * symbol types N_TEXT, N_DATA, N_BSS or N_ABS.  In Mach-O object files these
+ * ordinals refer to the sections in the object file in the order their section
+ * structures appear in the headers of the object file they are in.  The first
+ * section has the ordinal 1, the second 2, and so on.  This means that the
+ * same ordinal in two different object files could refer to two different
+ * sections.  And further could have still different ordinals when combined
+ * by the link-editor.  The value R_ABS is used for relocation entries for
+ * absolute symbols which need no further relocation.
+ */
+
+/*
+ * For RISC machines some of the references are split across two instructions
+ * and the instruction does not contain the complete value of the reference.
+ * In these cases a second, or paired relocation entry, follows each of these
+ * relocation entries, using a PAIR r_type, which contains the other part of the
+ * reference not contained in the instruction.  This other part is stored in the
+ * pair's r_address field.  The exact number of bits of the other part of the
+ * reference store in the r_address field is dependent on the particular
+ * relocation type for the particular architecture.
+ */
+
+/*
+ * To make scattered loading by the link editor work correctly "local"
+ * relocation entries can't be used when the item to be relocated is the value
+ * of a symbol plus an offset (where the resulting expresion is outside the
+ * block the link editor is moving, a blocks are divided at symbol addresses).
+ * In this case. where the item is a symbol value plus offset, the link editor
+ * needs to know more than just the section the symbol was defined.  What is
+ * needed is the actual value of the symbol without the offset so it can do the
+ * relocation correctly based on where the value of the symbol got relocated to
+ * not the value of the expression (with the offset added to the symbol value).
+ * So for the NeXT 2.0 release no "local" relocation entries are ever used when
+ * there is a non-zero offset added to a symbol.  The "external" and "local"
+ * relocation entries remain unchanged.
+ *
+ * The implemention is quite messy given the compatibility with the existing
+ * relocation entry format.  The ASSUMPTION is that a section will never be
+ * bigger than 2**24 - 1 (0x00ffffff or 16,777,215) bytes.  This assumption
+ * allows the r_address (which is really an offset) to fit in 24 bits and high
+ * bit of the r_address field in the relocation_info structure to indicate
+ * it is really a scattered_relocation_info structure.  Since these are only
+ * used in places where "local" relocation entries are used and not where
+ * "external" relocation entries are used the r_extern field has been removed.
+ *
+ * For scattered loading to work on a RISC machine where some of the references
+ * are split across two instructions the link editor needs to be assured that
+ * each reference has a unique 32 bit reference (that more than one reference is
+ * NOT sharing the same high 16 bits for example) so it move each referenced
+ * item independent of each other.  Some compilers guarantees this but the
+ * compilers don't so scattered loading can be done on those that do guarantee
+ * this.
+ */
+#if defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)
+/*
+ * The reason for the ifdef's of __BIG_ENDIAN__ and __LITTLE_ENDIAN__ are that
+ * when stattered relocation entries were added the mistake of using a mask
+ * against a structure that is made up of bit fields was used.  To make this
+ * design work this structure must be laid out in memory the same way so the
+ * mask can be applied can check the same bit each time (r_scattered).
+ */
+#endif /* defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__) */
+#define R_SCATTERED 0x80000000	/* mask to be applied to the r_address field 
+				   of a relocation_info structure to tell that
+				   is is really a scattered_relocation_info
+				   stucture */
+struct scattered_relocation_info {
+#ifdef __BIG_ENDIAN__
+   uint32_t	r_scattered:1,	/* 1=scattered, 0=non-scattered (see above) */
+		r_pcrel:1, 	/* was relocated pc relative already */
+		r_length:2,	/* 0=byte, 1=word, 2=long, 3=quad */
+		r_type:4,	/* if not 0, machine specific relocation type */
+   		r_address:24;	/* offset in the section to what is being
+				   relocated */
+   int32_t	r_value;	/* the value the item to be relocated is
+				   refering to (without any offset added) */
+#endif /* __BIG_ENDIAN__ */
+#ifdef __LITTLE_ENDIAN__
+   uint32_t
+   		r_address:24,	/* offset in the section to what is being
+				   relocated */
+		r_type:4,	/* if not 0, machine specific relocation type */
+		r_length:2,	/* 0=byte, 1=word, 2=long, 3=quad */
+		r_pcrel:1, 	/* was relocated pc relative already */
+		r_scattered:1;	/* 1=scattered, 0=non-scattered (see above) */
+   int32_t	r_value;	/* the value the item to be relocated is
+				   refering to (without any offset added) */
+#endif /* __LITTLE_ENDIAN__ */
+};
+
+/*
+ * Relocation types used in a generic implementation.  Relocation entries for
+ * normal things use the generic relocation as discribed above and their r_type
+ * is GENERIC_RELOC_VANILLA (a value of zero).
+ *
+ * Another type of generic relocation, GENERIC_RELOC_SECTDIFF, is to support
+ * the difference of two symbols defined in different sections.  That is the
+ * expression "symbol1 - symbol2 + constant" is a relocatable expression when
+ * both symbols are defined in some section.  For this type of relocation the
+ * both relocations entries are scattered relocation entries.  The value of
+ * symbol1 is stored in the first relocation entry's r_value field and the
+ * value of symbol2 is stored in the pair's r_value field.
+ *
+ * A special case for a prebound lazy pointer is needed to beable to set the
+ * value of the lazy pointer back to its non-prebound state.  This is done
+ * using the GENERIC_RELOC_PB_LA_PTR r_type.  This is a scattered relocation
+ * entry where the r_value feild is the value of the lazy pointer not prebound.
+ */
+enum reloc_type_generic
+{
+    GENERIC_RELOC_VANILLA,	/* generic relocation as discribed above */
+    GENERIC_RELOC_PAIR,		/* Only follows a GENERIC_RELOC_SECTDIFF */
+    GENERIC_RELOC_SECTDIFF,
+    GENERIC_RELOC_PB_LA_PTR,	/* prebound lazy pointer */
+    GENERIC_RELOC_LOCAL_SECTDIFF,
+    GENERIC_RELOC_TLV		/* thread local variables */
+};
+
+#endif /* _MACHO_RELOC_H_ */
diff --git a/i386/include/mach-o/stab.h b/i386/include/mach-o/stab.h
new file mode 100644
index 0000000..e9e15b2
--- /dev/null
+++ b/i386/include/mach-o/stab.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _MACHO_STAB_H_
+#define _MACHO_STAB_H_
+/*	$NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $	*/
+
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)stab.h	5.2 (Berkeley) 4/4/91
+ */
+
+/*
+ * This file gives definitions supplementing <nlist.h> for permanent symbol
+ * table entries of Mach-O files.  Modified from the BSD definitions.  The
+ * modifications from the original definitions were changing what the values of
+ * what was the n_other field (an unused field) which is now the n_sect field.
+ * These modifications are required to support symbols in an arbitrary number of
+ * sections not just the three sections (text, data and bss) in a BSD file.
+ * The values of the defined constants have NOT been changed.
+ *
+ * These must have one of the N_STAB bits on.  The n_value fields are subject
+ * to relocation according to the value of their n_sect field.  So for types
+ * that refer to things in sections the n_sect field must be filled in with the
+ * proper section ordinal.  For types that are not to have their n_value field 
+ * relocatated the n_sect field must be NO_SECT.
+ */
+
+/*
+ * Symbolic debugger symbols.  The comments give the conventional use for
+ * 
+ * 	.stabs "n_name", n_type, n_sect, n_desc, n_value
+ *
+ * where n_type is the defined constant and not listed in the comment.  Other
+ * fields not listed are zero. n_sect is the section ordinal the entry is
+ * refering to.
+ */
+#define	N_GSYM	0x20	/* global symbol: name,,NO_SECT,type,0 */
+#define	N_FNAME	0x22	/* procedure name (f77 kludge): name,,NO_SECT,0,0 */
+#define	N_FUN	0x24	/* procedure: name,,n_sect,linenumber,address */
+#define	N_STSYM	0x26	/* static symbol: name,,n_sect,type,address */
+#define	N_LCSYM	0x28	/* .lcomm symbol: name,,n_sect,type,address */
+#define N_BNSYM 0x2e	/* begin nsect sym: 0,,n_sect,0,address */
+#define N_OPT	0x3c	/* emitted with gcc2_compiled and in gcc source */
+#define	N_RSYM	0x40	/* register sym: name,,NO_SECT,type,register */
+#define	N_SLINE	0x44	/* src line: 0,,n_sect,linenumber,address */
+#define N_ENSYM 0x4e	/* end nsect sym: 0,,n_sect,0,address */
+#define	N_SSYM	0x60	/* structure elt: name,,NO_SECT,type,struct_offset */
+#define	N_SO	0x64	/* source file name: name,,n_sect,0,address */
+#define	N_OSO	0x66	/* object file name: name,,0,0,st_mtime */
+#define	N_LSYM	0x80	/* local sym: name,,NO_SECT,type,offset */
+#define N_BINCL	0x82	/* include file beginning: name,,NO_SECT,0,sum */
+#define	N_SOL	0x84	/* #included file name: name,,n_sect,0,address */
+#define	N_PARAMS  0x86	/* compiler parameters: name,,NO_SECT,0,0 */
+#define	N_VERSION 0x88	/* compiler version: name,,NO_SECT,0,0 */
+#define	N_OLEVEL  0x8A	/* compiler -O level: name,,NO_SECT,0,0 */
+#define	N_PSYM	0xa0	/* parameter: name,,NO_SECT,type,offset */
+#define N_EINCL	0xa2	/* include file end: name,,NO_SECT,0,0 */
+#define	N_ENTRY	0xa4	/* alternate entry: name,,n_sect,linenumber,address */
+#define	N_LBRAC	0xc0	/* left bracket: 0,,NO_SECT,nesting level,address */
+#define N_EXCL	0xc2	/* deleted include file: name,,NO_SECT,0,sum */
+#define	N_RBRAC	0xe0	/* right bracket: 0,,NO_SECT,nesting level,address */
+#define	N_BCOMM	0xe2	/* begin common: name,,NO_SECT,0,0 */
+#define	N_ECOMM	0xe4	/* end common: name,,n_sect,0,0 */
+#define	N_ECOML	0xe8	/* end common (local name): 0,,n_sect,0,address */
+#define	N_LENG	0xfe	/* second stab entry with length information */
+
+/*
+ * for the berkeley pascal compiler, pc(1):
+ */
+#define	N_PC	0x30	/* global pascal symbol: name,,NO_SECT,subtype,line */
+
+#endif /* _MACHO_STAB_H_ */
diff --git a/i386/include/mach-o/swap.h b/i386/include/mach-o/swap.h
new file mode 100644
index 0000000..ba10994
--- /dev/null
+++ b/i386/include/mach-o/swap.h
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _MACH_O_SWAP_H_
+#define _MACH_O_SWAP_H_
+
+#include <stdint.h>
+#include <architecture/byte_order.h>
+#include <mach-o/fat.h>
+#include <mach-o/loader.h>
+#include <mach-o/nlist.h>
+#include <mach-o/reloc.h>
+#include <mach-o/ranlib.h>
+
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+extern void swap_fat_header(
+    struct fat_header *fat_header,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_fat_arch(
+    struct fat_arch *fat_archs,
+    uint32_t nfat_arch,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_mach_header(
+    struct mach_header *mh,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_mach_header_64(
+    struct mach_header_64 *mh,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_load_command(
+    struct load_command *lc,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_segment_command(
+    struct segment_command *sg,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_segment_command_64(
+    struct segment_command_64 *sg,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_section(
+    struct section *s,
+    uint32_t nsects,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_section_64(
+    struct section_64 *s,
+    uint32_t nsects,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_symtab_command(
+    struct symtab_command *st,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_dysymtab_command(
+    struct dysymtab_command *dyst,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_symseg_command(
+    struct symseg_command *ss,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_fvmlib_command(
+    struct fvmlib_command *fl,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_dylib_command(
+    struct dylib_command *dl,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_sub_framework_command(
+    struct sub_framework_command *sub,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_sub_umbrella_command(
+    struct sub_umbrella_command *usub,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_sub_library_command(
+    struct sub_library_command *lsub,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_sub_client_command(
+    struct sub_client_command *csub,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_prebound_dylib_command(
+    struct prebound_dylib_command *pbdylib,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_dylinker_command(
+    struct dylinker_command *dyld,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_fvmfile_command(
+    struct fvmfile_command *ff,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_thread_command(
+    struct thread_command *ut,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_ident_command(
+    struct ident_command *ident,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_routines_command(
+    struct routines_command *r_cmd,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_routines_command_64(
+    struct routines_command_64 *r_cmd,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_twolevel_hints_command(
+    struct twolevel_hints_command *hints_cmd,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_prebind_cksum_command(
+    struct prebind_cksum_command *cksum_cmd,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_uuid_command(
+    struct uuid_command *uuid_cmd,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_twolevel_hint(
+    struct twolevel_hint *hints,
+    uint32_t nhints,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_nlist(
+    struct nlist *symbols,
+    uint32_t nsymbols,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_nlist_64(
+    struct nlist_64 *symbols,
+    uint32_t nsymbols,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_ranlib(
+    struct ranlib *ranlibs,
+    uint32_t nranlibs,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_relocation_info(
+    struct relocation_info *relocs,
+    uint32_t nrelocs,
+    enum NXByteOrder target_byte_order);
+
+extern void swap_indirect_symbols(
+    uint32_t *indirect_symbols,
+    uint32_t nindirect_symbols,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_dylib_reference(
+    struct dylib_reference *refs,  
+    uint32_t nrefs,
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_dylib_module(  
+    struct dylib_module *mods,
+    uint32_t nmods, 
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_dylib_module_64(  
+    struct dylib_module_64 *mods,
+    uint32_t nmods, 
+    enum NXByteOrder target_byte_sex);
+
+extern void swap_dylib_table_of_contents(
+    struct dylib_table_of_contents *tocs,
+    uint32_t ntocs,
+    enum NXByteOrder target_byte_sex);
+
+#if __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _MACH_O_SWAP_H_ */
diff --git a/i386/include/mach-o/x86_64/reloc.h b/i386/include/mach-o/x86_64/reloc.h
new file mode 100644
index 0000000..d3466d8
--- /dev/null
+++ b/i386/include/mach-o/x86_64/reloc.h
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Relocations for x86_64 are a bit different than for other architectures in
+ * Mach-O: Scattered relocations are not used.  Almost all relocations produced
+ * by the compiler are external relocations.  An external relocation has the
+ * r_extern bit set to 1 and the r_symbolnum field contains the symbol table
+ * index of the target label.
+ * 
+ * When the assembler is generating relocations, if the target label is a local
+ * label (begins with 'L'), then the previous non-local label in the same
+ * section is used as the target of the external relocation.  An addend is used
+ * with the distance from that non-local label to the target label.  Only when
+ * there is no previous non-local label in the section is an internal
+ * relocation used.
+ * 
+ * The addend (i.e. the 4 in _foo+4) is encoded in the instruction (Mach-O does
+ * not have RELA relocations).  For PC-relative relocations, the addend is
+ * stored directly in the instruction.  This is different from other Mach-O
+ * architectures, which encode the addend minus the current section offset.
+ * 
+ * The relocation types are:
+ * 
+ * 	X86_64_RELOC_UNSIGNED	// for absolute addresses
+ * 	X86_64_RELOC_SIGNED		// for signed 32-bit displacement
+ * 	X86_64_RELOC_BRANCH		// a CALL/JMP instruction with 32-bit displacement
+ * 	X86_64_RELOC_GOT_LOAD	// a MOVQ load of a GOT entry
+ * 	X86_64_RELOC_GOT		// other GOT references
+ * 	X86_64_RELOC_SUBTRACTOR	// must be followed by a X86_64_RELOC_UNSIGNED
+ * 
+ * The following are sample assembly instructions, followed by the relocation
+ * and section content they generate in an object file:
+ * 
+ * 	call _foo
+ * 		r_type=X86_64_RELOC_BRANCH, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
+ * 		E8 00 00 00 00
+ * 
+ * 	call _foo+4
+ * 		r_type=X86_64_RELOC_BRANCH, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
+ * 		E8 04 00 00 00 
+ * 
+ * 	movq _foo@GOTPCREL(%rip), %rax
+ * 		r_type=X86_64_RELOC_GOT_LOAD, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
+ * 		48 8B 05 00 00 00 00
+ * 	
+ * 	pushq _foo@GOTPCREL(%rip)
+ * 		r_type=X86_64_RELOC_GOT, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
+ * 		FF 35 00 00 00 00
+ * 	
+ * 	movl _foo(%rip), %eax
+ * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
+ * 		8B 05 00 00 00 00
+ * 
+ * 	movl _foo+4(%rip), %eax
+ * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
+ * 		8B 05 04 00 00 00
+ * 
+ * 	movb  $0x12, _foo(%rip)
+ * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
+ * 		C6 05 FF FF FF FF 12
+ * 
+ * 	movl  $0x12345678, _foo(%rip)
+ * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
+ * 		C7 05 FC FF FF FF 78 56 34 12
+ * 
+ * 	.quad _foo
+ * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
+ * 		00 00 00 00 00 00 00 00
+ * 
+ * 	.quad _foo+4
+ * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
+ * 		04 00 00 00 00 00 00 00
+ * 
+ * 	.quad _foo - _bar
+ * 		r_type=X86_64_RELOC_SUBTRACTOR, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_bar
+ * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
+ * 		00 00 00 00 00 00 00 00
+ * 
+ * 	.quad _foo - _bar + 4
+ * 		r_type=X86_64_RELOC_SUBTRACTOR, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_bar
+ * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
+ * 		04 00 00 00 00 00 00 00
+ * 	
+ * 	.long _foo - _bar
+ * 		r_type=X86_64_RELOC_SUBTRACTOR, r_length=2, r_extern=1, r_pcrel=0, r_symbolnum=_bar
+ * 		r_type=X86_64_RELOC_UNSIGNED, r_length=2, r_extern=1, r_pcrel=0, r_symbolnum=_foo
+ * 		00 00 00 00
+ * 
+ * 	lea L1(%rip), %rax
+ * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_prev
+ * 		48 8d 05 12 00 00 00
+ * 		// assumes _prev is the first non-local label 0x12 bytes before L1
+ * 
+ * 	lea L0(%rip), %rax
+ * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=0, r_pcrel=1, r_symbolnum=3
+ * 		48 8d 05 56 00 00 00
+ *		// assumes L0 is in third section and there is no previous non-local label.
+ *		// The rip-relative-offset of 0x00000056 is L0-address_of_next_instruction.
+ *		// address_of_next_instruction is the address of the relocation + 4.
+ *
+ *     add     $6,L0(%rip)
+ *             r_type=X86_64_RELOC_SIGNED_1, r_length=2, r_extern=0, r_pcrel=1, r_symbolnum=3
+ *		83 05 18 00 00 00 06
+ *		// assumes L0 is in third section and there is no previous non-local label.
+ *		// The rip-relative-offset of 0x00000018 is L0-address_of_next_instruction.
+ *		// address_of_next_instruction is the address of the relocation + 4 + 1.
+ *		// The +1 comes from SIGNED_1.  This is used because the relocation is not
+ *		// at the end of the instruction.
+ *
+ * 	.quad L1
+ * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_prev
+ * 		12 00 00 00 00 00 00 00
+ * 		// assumes _prev is the first non-local label 0x12 bytes before L1
+ * 
+ * 	.quad L0
+ * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=0, r_pcrel=0, r_symbolnum=3
+ * 		56 00 00 00 00 00 00 00
+ * 		// assumes L0 is in third section, has an address of 0x00000056 in .o
+ * 		// file, and there is no previous non-local label
+ * 
+ * 	.quad _foo - .
+ * 		r_type=X86_64_RELOC_SUBTRACTOR, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_prev
+ * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
+ * 		EE FF FF FF FF FF FF FF
+ * 		// assumes _prev is the first non-local label 0x12 bytes before this
+ * 		// .quad
+ * 
+ * 	.quad _foo - L1
+ * 		r_type=X86_64_RELOC_SUBTRACTOR, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_prev
+ * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
+ * 		EE FF FF FF FF FF FF FF
+ * 		// assumes _prev is the first non-local label 0x12 bytes before L1
+ * 
+ * 	.quad L1 - _prev
+ * 		// No relocations.  This is an assembly time constant.
+ * 		12 00 00 00 00 00 00 00
+ * 		// assumes _prev is the first non-local label 0x12 bytes before L1
+ *
+ *
+ *
+ * In final linked images, there are only two valid relocation kinds:
+ *
+ *     r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_pcrel=0, r_extern=1, r_symbolnum=sym_index
+ *	This tells dyld to add the address of a symbol to a pointer sized (8-byte)
+ *  piece of data (i.e on disk the 8-byte piece of data contains the addend). The 
+ *  r_symbolnum contains the index into the symbol table of the target symbol.
+ *
+ *     r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_pcrel=0, r_extern=0, r_symbolnum=0
+ * This tells dyld to adjust the pointer sized (8-byte) piece of data by the amount
+ * the containing image was loaded from its base address (e.g. slide).
+ *
+ */ 
+enum reloc_type_x86_64
+{
+	X86_64_RELOC_UNSIGNED,		// for absolute addresses
+	X86_64_RELOC_SIGNED,		// for signed 32-bit displacement
+	X86_64_RELOC_BRANCH,		// a CALL/JMP instruction with 32-bit displacement
+	X86_64_RELOC_GOT_LOAD,		// a MOVQ load of a GOT entry
+	X86_64_RELOC_GOT,			// other GOT references
+	X86_64_RELOC_SUBTRACTOR,	// must be followed by a X86_64_RELOC_UNSIGNED
+	X86_64_RELOC_SIGNED_1,		// for signed 32-bit displacement with a -1 addend
+	X86_64_RELOC_SIGNED_2,		// for signed 32-bit displacement with a -2 addend
+	X86_64_RELOC_SIGNED_4,		// for signed 32-bit displacement with a -4 addend
+	X86_64_RELOC_TLV,		// for thread local variables
+};
diff --git a/i386/include/mach/audit_triggers.defs b/i386/include/mach/audit_triggers.defs
new file mode 100644
index 0000000..1d6e279
--- /dev/null
+++ b/i386/include/mach/audit_triggers.defs
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2004-2008, Apple Inc.  All rights reserved.
+ * 
+ * @APPLE_BSD_LICENSE_HEADER_START@
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * @APPLE_BSD_LICENSE_HEADER_END@
+*/
+
+/*
+ *  Interface definition for the audit logging facility.
+ */
+
+subsystem
+#if	KERNEL_USER
+    KernelUser
+#endif	/* KERNEL_USER */
+    audit_triggers 123;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+simpleroutine	audit_triggers(
+		audit_port	: mach_port_t; 
+	in	flags		: int);
+
diff --git a/i386/include/mach/boolean.h b/i386/include/mach/boolean.h
new file mode 100644
index 0000000..641c396
--- /dev/null
+++ b/i386/include/mach/boolean.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/boolean.h
+ *
+ *	Boolean data type.
+ *
+ */
+
+#ifndef	_MACH_BOOLEAN_H_
+#define	_MACH_BOOLEAN_H_
+
+/*
+ *	Pick up "boolean_t" type definition
+ */
+
+#ifndef	ASSEMBLER
+#include <mach/machine/boolean.h>
+#endif	/* ASSEMBLER */
+
+/*
+ *	Define TRUE and FALSE if not defined.
+ */
+
+#ifndef	TRUE
+#define TRUE	1
+#endif	/* TRUE */
+
+#ifndef	FALSE
+#define FALSE	0
+#endif	/* FALSE */
+
+#endif	/* _MACH_BOOLEAN_H_ */
diff --git a/i386/include/mach/bootstrap.h b/i386/include/mach/bootstrap.h
new file mode 100644
index 0000000..67667c3
--- /dev/null
+++ b/i386/include/mach/bootstrap.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Mach bootstrap interfaces (obsolete: header included only for compatibility)
+ */
+#ifndef	_MACH_BOOTSTRAP_H_
+#define _MACH_BOOTSTRAP_H_
+
+#endif /* _MACH_BOOTSTRAP_H_ */
diff --git a/i386/include/mach/clock.defs b/i386/include/mach/clock.defs
new file mode 100644
index 0000000..440042c
--- /dev/null
+++ b/i386/include/mach/clock.defs
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/*
+ * 	File:		mach/clock.defs
+ *	Purpose:	Kernel clock subsystem definitions. This
+ *			file defines the clock request interface.
+ */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+		       clock 1000;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+#include <mach/clock_types.defs>
+
+/*
+ * References to clock objects are returned by:
+ *	host_get_clock_service(host_t,...)
+ *	host_get_clock_control(host_priv_t,...) - Priviledged subclass
+ */
+
+/*
+ *	Get the clock time.
+ *	Available to all.
+ */
+routine	clock_get_time(
+		clock_serv	: clock_serv_t;
+	out	cur_time	: mach_timespec_t);
+
+/*
+ *	Get clock attributes.
+ *	Available to all.
+ */
+routine	clock_get_attributes(
+		clock_serv	: clock_serv_t;
+	in	flavor		: clock_flavor_t;
+	out	clock_attr	: clock_attr_t, CountInOut);
+
+/*
+ *	Setup a clock alarm.
+ *	Available to all.
+ */
+routine clock_alarm(
+		clock_serv	: clock_serv_t;
+		alarm_type	: alarm_type_t;
+		alarm_time	: mach_timespec_t;
+                alarm_port      : clock_reply_t =
+			MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/clock.h b/i386/include/mach/clock.h
new file mode 100644
index 0000000..948b489
--- /dev/null
+++ b/i386/include/mach/clock.h
@@ -0,0 +1,221 @@
+#ifndef	_clock_user_
+#define	_clock_user_
+
+/* Module clock */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	clock_MSG_COUNT
+#define	clock_MSG_COUNT	3
+#endif	/* clock_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine clock_get_time */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t clock_get_time
+(
+	clock_serv_t clock_serv,
+	mach_timespec_t *cur_time
+);
+
+/* Routine clock_get_attributes */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t clock_get_attributes
+(
+	clock_serv_t clock_serv,
+	clock_flavor_t flavor,
+	clock_attr_t clock_attr,
+	mach_msg_type_number_t *clock_attrCnt
+);
+
+/* Routine clock_alarm */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t clock_alarm
+(
+	clock_serv_t clock_serv,
+	alarm_type_t alarm_type,
+	mach_timespec_t alarm_time,
+	clock_reply_t alarm_port
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__clock_subsystem__defined
+#define __Request__clock_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__clock_get_time_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		clock_flavor_t flavor;
+		mach_msg_type_number_t clock_attrCnt;
+	} __Request__clock_get_attributes_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t alarm_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		alarm_type_t alarm_type;
+		mach_timespec_t alarm_time;
+	} __Request__clock_alarm_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__clock_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__clock_subsystem__defined
+#define __RequestUnion__clock_subsystem__defined
+union __RequestUnion__clock_subsystem {
+	__Request__clock_get_time_t Request_clock_get_time;
+	__Request__clock_get_attributes_t Request_clock_get_attributes;
+	__Request__clock_alarm_t Request_clock_alarm;
+};
+#endif /* !__RequestUnion__clock_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__clock_subsystem__defined
+#define __Reply__clock_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_timespec_t cur_time;
+	} __Reply__clock_get_time_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t clock_attrCnt;
+		int clock_attr[1];
+	} __Reply__clock_get_attributes_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__clock_alarm_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__clock_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__clock_subsystem__defined
+#define __ReplyUnion__clock_subsystem__defined
+union __ReplyUnion__clock_subsystem {
+	__Reply__clock_get_time_t Reply_clock_get_time;
+	__Reply__clock_get_attributes_t Reply_clock_get_attributes;
+	__Reply__clock_alarm_t Reply_clock_alarm;
+};
+#endif /* !__RequestUnion__clock_subsystem__defined */
+
+#ifndef subsystem_to_name_map_clock
+#define subsystem_to_name_map_clock \
+    { "clock_get_time", 1000 },\
+    { "clock_get_attributes", 1001 },\
+    { "clock_alarm", 1002 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _clock_user_ */
diff --git a/i386/include/mach/clock_priv.defs b/i386/include/mach/clock_priv.defs
new file mode 100644
index 0000000..b3854a4
--- /dev/null
+++ b/i386/include/mach/clock_priv.defs
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/*
+ * 	File:		mach/clock_priv.defs
+ *	Purpose:	Kernel clock subsystem definitions. This
+ *			file defines the clock request interface.
+ */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+		       clock_priv 1200;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+#include <mach/clock_types.defs>
+
+/*
+ * References to clock_priv objects are returned by:
+ *	host_get_clock_control(host_priv_t,...) - Priviledged subclass
+ */
+
+/*
+ *	Set the clock time.
+ *	Privileged.
+ */
+routine	clock_set_time(
+		clock_ctrl	: clock_ctrl_t;
+		new_time	: mach_timespec_t);
+
+/*
+ *	Set clock attributes.
+ *	Privileged.
+ */
+routine	clock_set_attributes(
+		clock_ctrl	: clock_ctrl_t;
+	in	flavor		: clock_flavor_t;
+	in	clock_attr	: clock_attr_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/clock_priv.h b/i386/include/mach/clock_priv.h
new file mode 100644
index 0000000..8a38935
--- /dev/null
+++ b/i386/include/mach/clock_priv.h
@@ -0,0 +1,175 @@
+#ifndef	_clock_priv_user_
+#define	_clock_priv_user_
+
+/* Module clock_priv */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	clock_priv_MSG_COUNT
+#define	clock_priv_MSG_COUNT	2
+#endif	/* clock_priv_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine clock_set_time */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t clock_set_time
+(
+	clock_ctrl_t clock_ctrl,
+	mach_timespec_t new_time
+);
+
+/* Routine clock_set_attributes */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t clock_set_attributes
+(
+	clock_ctrl_t clock_ctrl,
+	clock_flavor_t flavor,
+	clock_attr_t clock_attr,
+	mach_msg_type_number_t clock_attrCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__clock_priv_subsystem__defined
+#define __Request__clock_priv_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_timespec_t new_time;
+	} __Request__clock_set_time_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		clock_flavor_t flavor;
+		mach_msg_type_number_t clock_attrCnt;
+		int clock_attr[1];
+	} __Request__clock_set_attributes_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__clock_priv_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__clock_priv_subsystem__defined
+#define __RequestUnion__clock_priv_subsystem__defined
+union __RequestUnion__clock_priv_subsystem {
+	__Request__clock_set_time_t Request_clock_set_time;
+	__Request__clock_set_attributes_t Request_clock_set_attributes;
+};
+#endif /* !__RequestUnion__clock_priv_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__clock_priv_subsystem__defined
+#define __Reply__clock_priv_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__clock_set_time_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__clock_set_attributes_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__clock_priv_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__clock_priv_subsystem__defined
+#define __ReplyUnion__clock_priv_subsystem__defined
+union __ReplyUnion__clock_priv_subsystem {
+	__Reply__clock_set_time_t Reply_clock_set_time;
+	__Reply__clock_set_attributes_t Reply_clock_set_attributes;
+};
+#endif /* !__RequestUnion__clock_priv_subsystem__defined */
+
+#ifndef subsystem_to_name_map_clock_priv
+#define subsystem_to_name_map_clock_priv \
+    { "clock_set_time", 1200 },\
+    { "clock_set_attributes", 1201 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _clock_priv_user_ */
diff --git a/i386/include/mach/clock_reply.defs b/i386/include/mach/clock_reply.defs
new file mode 100644
index 0000000..9646f90
--- /dev/null
+++ b/i386/include/mach/clock_reply.defs
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/*
+ *	File:		clock_reply.defs
+ *	Purpose:	Kernel clock subsystem definitions. This
+ *			file defines the clock reply interface.
+ */
+
+subsystem
+#if	KERNEL_USER
+	  KernelUser
+#endif	/* KERNEL_USER */
+		     clock_reply 3125107;  /* Matches up with old value */
+
+#include <mach/std_types.defs>
+#include <mach/clock_types.defs>
+
+
+/*
+ *	Reply routine for clock_alarm. 
+ */
+simpleroutine clock_alarm_reply(
+                alarm_port      : clock_reply_t;
+		alarm_code	: kern_return_t;
+		alarm_type	: alarm_type_t;
+		alarm_time	: mach_timespec_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/clock_reply.h b/i386/include/mach/clock_reply.h
new file mode 100644
index 0000000..d0cf150
--- /dev/null
+++ b/i386/include/mach/clock_reply.h
@@ -0,0 +1,136 @@
+#ifndef	_clock_reply_user_
+#define	_clock_reply_user_
+
+/* Module clock_reply */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	clock_reply_MSG_COUNT
+#define	clock_reply_MSG_COUNT	1
+#endif	/* clock_reply_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* SimpleRoutine clock_alarm_reply */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t clock_alarm_reply
+(
+	clock_reply_t alarm_port,
+	mach_msg_type_name_t alarm_portPoly,
+	kern_return_t alarm_code,
+	alarm_type_t alarm_type,
+	mach_timespec_t alarm_time
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__clock_reply_subsystem__defined
+#define __Request__clock_reply_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t alarm_code;
+		alarm_type_t alarm_type;
+		mach_timespec_t alarm_time;
+	} __Request__clock_alarm_reply_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__clock_reply_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__clock_reply_subsystem__defined
+#define __RequestUnion__clock_reply_subsystem__defined
+union __RequestUnion__clock_reply_subsystem {
+	__Request__clock_alarm_reply_t Request_clock_alarm_reply;
+};
+#endif /* !__RequestUnion__clock_reply_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__clock_reply_subsystem__defined
+#define __Reply__clock_reply_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__clock_alarm_reply_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__clock_reply_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__clock_reply_subsystem__defined
+#define __ReplyUnion__clock_reply_subsystem__defined
+union __ReplyUnion__clock_reply_subsystem {
+	__Reply__clock_alarm_reply_t Reply_clock_alarm_reply;
+};
+#endif /* !__RequestUnion__clock_reply_subsystem__defined */
+
+#ifndef subsystem_to_name_map_clock_reply
+#define subsystem_to_name_map_clock_reply \
+    { "clock_alarm_reply", 3125107 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _clock_reply_user_ */
diff --git a/i386/include/mach/clock_types.defs b/i386/include/mach/clock_types.defs
new file mode 100644
index 0000000..4dbacfc
--- /dev/null
+++ b/i386/include/mach/clock_types.defs
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/*
+ *	File:		clock_types.defs
+ *	Purpose:
+ *		Clock kernel interface type declarations
+ */
+
+#ifndef	_MACH_CLOCK_TYPES_DEFS_
+#define _MACH_CLOCK_TYPES_DEFS_
+
+#include <mach/std_types.defs>
+
+type clock_serv_t = mach_port_t
+		cusertype: clock_serv_t
+#if	KERNEL_SERVER
+		intran: clock_serv_t convert_port_to_clock(mach_port_t)
+		outtran: mach_port_t convert_clock_to_port(clock_serv_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type clock_ctrl_t = mach_port_t
+		cusertype: clock_ctrl_t
+#if	KERNEL_SERVER
+		intran: clock_ctrl_t convert_port_to_clock_ctrl(mach_port_t)
+		outtran: mach_port_t convert_clock_ctrl_to_port(clock_ctrl_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type clock_reply_t = polymorphic|MACH_MSG_TYPE_MAKE_SEND_ONCE;
+
+type clock_flavor_t = int;
+type clock_attr_t = array[*:1] of int;
+type mach_timespec_t	= struct[2] of int;
+type time_t = int;
+type sleep_type_t = int;
+type alarm_type_t = int;
+type clock_res_t = int;
+type clock_id_t = int;
+
+import <mach/mach_types.h>;
+
+#endif	/* _MACH_CLOCK_TYPES_DEFS_ */
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/clock_types.h b/i386/include/mach/clock_types.h
new file mode 100644
index 0000000..12035da
--- /dev/null
+++ b/i386/include/mach/clock_types.h
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/*
+ *	File:		clock_types.h
+ *	Purpose:	Clock facility header definitions. These
+ *				definitons are needed by both kernel and
+ *				user-level software.
+ */
+
+/*
+ *	All interfaces defined here are obsolete.
+ */
+
+#ifndef	_MACH_CLOCK_TYPES_H_
+#define	_MACH_CLOCK_TYPES_H_
+
+#include <stdint.h>
+#include <mach/time_value.h>
+
+/*
+ * Type definitions.
+ */
+typedef	int	alarm_type_t;		/* alarm time type */
+typedef int	sleep_type_t;		/* sleep time type */
+typedef	int	clock_id_t;			/* clock identification type */
+typedef int	clock_flavor_t;		/* clock flavor type */
+typedef int	*clock_attr_t;		/* clock attribute type */
+typedef int	clock_res_t;		/* clock resolution type */
+
+/*
+ * Normal time specification used by the kernel clock facility.
+ */
+struct mach_timespec {
+	unsigned int	tv_sec;			/* seconds */
+	clock_res_t		tv_nsec;		/* nanoseconds */
+};
+typedef struct mach_timespec	mach_timespec_t;
+
+/*
+ * Reserved clock id values for default clocks.
+ */
+#define SYSTEM_CLOCK		0
+#define CALENDAR_CLOCK		1
+
+#define REALTIME_CLOCK		0
+
+/*
+ * Attribute names.
+ */
+#define	CLOCK_GET_TIME_RES	1	/* get_time call resolution */
+/*							2	 * was map_time call resolution */
+#define CLOCK_ALARM_CURRES	3	/* current alarm resolution */
+#define CLOCK_ALARM_MINRES	4	/* minimum alarm resolution */
+#define CLOCK_ALARM_MAXRES	5	/* maximum alarm resolution */
+
+#define NSEC_PER_USEC	1000		/* nanoseconds per microsecond */
+#define USEC_PER_SEC	1000000		/* microseconds per second */
+#define NSEC_PER_SEC	1000000000	/* nanoseconds per second */
+
+#define BAD_MACH_TIMESPEC(t)						\
+	((t)->tv_nsec < 0 || (t)->tv_nsec >= NSEC_PER_SEC)
+
+/* t1 <=> t2, also (t1 - t2) in nsec with max of +- 1 sec */
+#define CMP_MACH_TIMESPEC(t1, t2)					\
+	((t1)->tv_sec > (t2)->tv_sec ? +NSEC_PER_SEC :	\
+	((t1)->tv_sec < (t2)->tv_sec ? -NSEC_PER_SEC :	\
+			(t1)->tv_nsec - (t2)->tv_nsec))
+
+/* t1  += t2 */
+#define ADD_MACH_TIMESPEC(t1, t2)								\
+  do {															\
+	if (((t1)->tv_nsec += (t2)->tv_nsec) >= NSEC_PER_SEC) {		\
+		(t1)->tv_nsec -= NSEC_PER_SEC;							\
+		(t1)->tv_sec  += 1;										\
+	}															\
+	(t1)->tv_sec += (t2)->tv_sec;								\
+  } while (0)
+
+/* t1  -= t2 */
+#define SUB_MACH_TIMESPEC(t1, t2)								\
+  do {															\
+	if (((t1)->tv_nsec -= (t2)->tv_nsec) < 0) {					\
+		(t1)->tv_nsec += NSEC_PER_SEC;							\
+		(t1)->tv_sec  -= 1;										\
+	}															\
+	(t1)->tv_sec -= (t2)->tv_sec;								\
+  } while (0)
+
+/*
+ * Alarm parameter defines.
+ */
+#define ALRMTYPE			0xff		/* type (8-bit field)	*/
+#define TIME_ABSOLUTE		0x00		/* absolute time */
+#define	TIME_RELATIVE		0x01		/* relative time */
+
+#define BAD_ALRMTYPE(t)		(((t) &~ TIME_RELATIVE) != 0)
+
+#endif /* _MACH_CLOCK_TYPES_H_ */
diff --git a/i386/include/mach/error.h b/i386/include/mach/error.h
new file mode 100644
index 0000000..a32eaee
--- /dev/null
+++ b/i386/include/mach/error.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ * File:	mach/error.h
+ * Purpose:
+ *	error module definitions
+ *
+ */
+
+#ifndef	_MACH_ERROR_H_
+#define	_MACH_ERROR_H_
+
+#include <mach/kern_return.h>
+
+/*
+ *	error number layout as follows:
+ *
+ *	hi		 		       lo
+ *	| system(6) | subsystem(12) | code(14) |
+ */
+
+
+#define	err_none		(mach_error_t)0
+#define ERR_SUCCESS		(mach_error_t)0
+#define	ERR_ROUTINE_NIL		(mach_error_fn_t)0
+
+
+#define	err_system(x)		(((x)&0x3f)<<26)
+#define err_sub(x)		(((x)&0xfff)<<14)
+
+#define err_get_system(err)	(((err)>>26)&0x3f)
+#define err_get_sub(err)	(((err)>>14)&0xfff)
+#define err_get_code(err)	((err)&0x3fff)
+
+#define system_emask		(err_system(0x3f))
+#define sub_emask		(err_sub(0xfff))
+#define code_emask		(0x3fff)
+
+
+/*	major error systems	*/
+#define	err_kern		err_system(0x0)		/* kernel */
+#define	err_us			err_system(0x1)		/* user space library */
+#define	err_server		err_system(0x2)		/* user space servers */
+#define	err_ipc			err_system(0x3)		/* old ipc errors */
+#define err_mach_ipc		err_system(0x4)		/* mach-ipc errors */
+#define	err_dipc		err_system(0x7)		/* distributed ipc */
+#define err_local		err_system(0x3e)	/* user defined errors */
+#define	err_ipc_compat		err_system(0x3f)	/* (compatibility) mach-ipc errors */
+
+#define	err_max_system		0x3f
+
+
+/*	unix errors get lumped into one subsystem  */
+#define	unix_err(errno)		(err_kern|err_sub(3)|errno)
+
+typedef	kern_return_t	mach_error_t;
+typedef mach_error_t	(* mach_error_fn_t)( void );
+
+#endif	/* _MACH_ERROR_H_ */
diff --git a/i386/include/mach/exc.defs b/i386/include/mach/exc.defs
new file mode 100644
index 0000000..de6aee7
--- /dev/null
+++ b/i386/include/mach/exc.defs
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ * Abstract:
+ *	MiG definitions file for Mach exception interface.
+ */
+
+subsystem
+#if	KERNEL_USER
+	  KernelUser
+#endif
+		     exc 2401;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+ServerPrefix catch_;
+
+type exception_data_t		= array[*:2] of integer_t;
+type exception_type_t		= int;
+
+routine		exception_raise(
+#if	KERNEL_USER
+			exception_port	: mach_port_move_send_t;
+			thread		: mach_port_move_send_t;
+			task		: mach_port_move_send_t;
+#else	/* KERNEL_USER */
+			exception_port	: mach_port_t;
+			thread		: mach_port_t;
+			task		: mach_port_t;
+#endif	/* KERNEL_USER */
+			exception	: exception_type_t;
+			code		: exception_data_t
+			);
+
+routine		exception_raise_state(
+#if	KERNEL_USER
+			exception_port	: mach_port_move_send_t;
+#else	/* KERNEL_USER */
+			exception_port	: mach_port_t;
+#endif	/* KERNEL_USER */
+			exception	: exception_type_t;
+			code		: exception_data_t, const;
+		  inout flavor		: int;
+			old_state	: thread_state_t, const;
+		    out new_state	: thread_state_t);
+
+routine		exception_raise_state_identity(
+#if	KERNEL_USER
+			exception_port  : mach_port_move_send_t;
+			thread		: mach_port_move_send_t;
+			task		: mach_port_move_send_t;
+#else	/* KERNEL_USER */
+			exception_port  : mach_port_t;
+			thread          : mach_port_t;
+			task            : mach_port_t;
+#endif	/* KERNEL_USER */
+			exception       : exception_type_t;
+			code            : exception_data_t;
+		  inout flavor          : int;
+			old_state       : thread_state_t;
+		    out new_state       : thread_state_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/exc.h b/i386/include/mach/exc.h
new file mode 100644
index 0000000..3987a6e
--- /dev/null
+++ b/i386/include/mach/exc.h
@@ -0,0 +1,257 @@
+#ifndef	_exc_user_
+#define	_exc_user_
+
+/* Module exc */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	exc_MSG_COUNT
+#define	exc_MSG_COUNT	3
+#endif	/* exc_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine exception_raise */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t exception_raise
+(
+	mach_port_t exception_port,
+	mach_port_t thread,
+	mach_port_t task,
+	exception_type_t exception,
+	exception_data_t code,
+	mach_msg_type_number_t codeCnt
+);
+
+/* Routine exception_raise_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t exception_raise_state
+(
+	mach_port_t exception_port,
+	exception_type_t exception,
+	const exception_data_t code,
+	mach_msg_type_number_t codeCnt,
+	int *flavor,
+	const thread_state_t old_state,
+	mach_msg_type_number_t old_stateCnt,
+	thread_state_t new_state,
+	mach_msg_type_number_t *new_stateCnt
+);
+
+/* Routine exception_raise_state_identity */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t exception_raise_state_identity
+(
+	mach_port_t exception_port,
+	mach_port_t thread,
+	mach_port_t task,
+	exception_type_t exception,
+	exception_data_t code,
+	mach_msg_type_number_t codeCnt,
+	int *flavor,
+	thread_state_t old_state,
+	mach_msg_type_number_t old_stateCnt,
+	thread_state_t new_state,
+	mach_msg_type_number_t *new_stateCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__exc_subsystem__defined
+#define __Request__exc_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t thread;
+		mach_msg_port_descriptor_t task;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_type_t exception;
+		mach_msg_type_number_t codeCnt;
+		integer_t code[2];
+	} __Request__exception_raise_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		exception_type_t exception;
+		mach_msg_type_number_t codeCnt;
+		integer_t code[2];
+		int flavor;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Request__exception_raise_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t thread;
+		mach_msg_port_descriptor_t task;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_type_t exception;
+		mach_msg_type_number_t codeCnt;
+		integer_t code[2];
+		int flavor;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Request__exception_raise_state_identity_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__exc_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__exc_subsystem__defined
+#define __RequestUnion__exc_subsystem__defined
+union __RequestUnion__exc_subsystem {
+	__Request__exception_raise_t Request_exception_raise;
+	__Request__exception_raise_state_t Request_exception_raise_state;
+	__Request__exception_raise_state_identity_t Request_exception_raise_state_identity;
+};
+#endif /* !__RequestUnion__exc_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__exc_subsystem__defined
+#define __Reply__exc_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__exception_raise_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		int flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Reply__exception_raise_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		int flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Reply__exception_raise_state_identity_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__exc_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__exc_subsystem__defined
+#define __ReplyUnion__exc_subsystem__defined
+union __ReplyUnion__exc_subsystem {
+	__Reply__exception_raise_t Reply_exception_raise;
+	__Reply__exception_raise_state_t Reply_exception_raise_state;
+	__Reply__exception_raise_state_identity_t Reply_exception_raise_state_identity;
+};
+#endif /* !__RequestUnion__exc_subsystem__defined */
+
+#ifndef subsystem_to_name_map_exc
+#define subsystem_to_name_map_exc \
+    { "exception_raise", 2401 },\
+    { "exception_raise_state", 2402 },\
+    { "exception_raise_state_identity", 2403 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _exc_user_ */
diff --git a/i386/include/mach/exception.h b/i386/include/mach/exception.h
new file mode 100644
index 0000000..e7d5d23
--- /dev/null
+++ b/i386/include/mach/exception.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+
+#ifndef	_MACH_EXCEPTION_H_
+#define	_MACH_EXCEPTION_H_
+
+#include <mach/exception_types.h>
+
+#endif	/* _MACH_EXCEPTION_H_ */
diff --git a/i386/include/mach/exception_types.h b/i386/include/mach/exception_types.h
new file mode 100644
index 0000000..642cbe2
--- /dev/null
+++ b/i386/include/mach/exception_types.h
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+#ifndef	_MACH_EXCEPTION_TYPES_H_
+#define	_MACH_EXCEPTION_TYPES_H_
+
+#include <mach/machine/exception.h>
+
+/*
+ *	Machine-independent exception definitions.
+ */
+
+#define EXC_BAD_ACCESS		1	/* Could not access memory */
+		/* Code contains kern_return_t describing error. */
+		/* Subcode contains bad memory address. */
+
+#define EXC_BAD_INSTRUCTION	2	/* Instruction failed */
+		/* Illegal or undefined instruction or operand */
+
+#define EXC_ARITHMETIC		3	/* Arithmetic exception */
+		/* Exact nature of exception is in code field */
+
+#define EXC_EMULATION		4	/* Emulation instruction */
+		/* Emulation support instruction encountered */
+		/* Details in code and subcode fields	*/
+
+#define EXC_SOFTWARE		5	/* Software generated exception */
+		/* Exact exception is in code field. */
+		/* Codes 0 - 0xFFFF reserved to hardware */
+		/* Codes 0x10000 - 0x1FFFF reserved for OS emulation (Unix) */
+
+#define EXC_BREAKPOINT		6	/* Trace, breakpoint, etc. */
+		/* Details in code field. */
+
+#define EXC_SYSCALL		7	/* System calls. */
+
+#define EXC_MACH_SYSCALL	8	/* Mach system calls. */
+
+#define EXC_RPC_ALERT		9	/* RPC alert */
+ 
+#define EXC_CRASH		10	/* Abnormal process exit */
+
+/*
+ *	Machine-independent exception behaviors
+ */
+
+# define EXCEPTION_DEFAULT		1
+/*	Send a catch_exception_raise message including the identity.
+ */
+
+# define EXCEPTION_STATE		2
+/*	Send a catch_exception_raise_state message including the
+ *	thread state.
+ */
+
+# define EXCEPTION_STATE_IDENTITY	3
+/*	Send a catch_exception_raise_state_identity message including
+ *	the thread identity and state.
+ */
+
+#define MACH_EXCEPTION_CODES		0x80000000
+/*	Send 64-bit code and subcode in the exception header */
+
+/*
+ * Masks for exception definitions, above
+ * bit zero is unused, therefore 1 word = 31 exception types
+ */
+
+#define EXC_MASK_BAD_ACCESS		(1 << EXC_BAD_ACCESS)
+#define EXC_MASK_BAD_INSTRUCTION	(1 << EXC_BAD_INSTRUCTION)
+#define EXC_MASK_ARITHMETIC		(1 << EXC_ARITHMETIC)
+#define EXC_MASK_EMULATION		(1 << EXC_EMULATION)
+#define EXC_MASK_SOFTWARE		(1 << EXC_SOFTWARE)
+#define EXC_MASK_BREAKPOINT		(1 << EXC_BREAKPOINT)
+#define EXC_MASK_SYSCALL		(1 << EXC_SYSCALL)
+#define EXC_MASK_MACH_SYSCALL		(1 << EXC_MACH_SYSCALL)
+#define EXC_MASK_RPC_ALERT		(1 << EXC_RPC_ALERT)
+#define EXC_MASK_CRASH			(1 << EXC_CRASH)
+
+#define EXC_MASK_ALL	(EXC_MASK_BAD_ACCESS |			\
+			 EXC_MASK_BAD_INSTRUCTION |		\
+			 EXC_MASK_ARITHMETIC |			\
+			 EXC_MASK_EMULATION |			\
+			 EXC_MASK_SOFTWARE |			\
+			 EXC_MASK_BREAKPOINT |			\
+			 EXC_MASK_SYSCALL |			\
+			 EXC_MASK_MACH_SYSCALL |		\
+			 EXC_MASK_RPC_ALERT |			\
+			 EXC_MASK_MACHINE)
+
+
+#define FIRST_EXCEPTION		1	/* ZERO is illegal */
+
+/*
+ * Machine independent codes for EXC_SOFTWARE
+ * Codes 0x10000 - 0x1FFFF reserved for OS emulation (Unix) 
+ * 0x10000 - 0x10002 in use for unix signals
+ */
+#define	EXC_SOFT_SIGNAL		0x10003	/* Unix signal exceptions */
+
+#ifndef	ASSEMBLER
+
+#include <mach/port.h>
+#include <mach/thread_status.h>
+#include <mach/machine/vm_types.h>
+/*
+ * Exported types
+ */
+
+typedef int				exception_type_t;
+typedef	integer_t			exception_data_type_t;
+typedef	int64_t				mach_exception_data_type_t;
+typedef int				exception_behavior_t;
+typedef exception_data_type_t		*exception_data_t;
+typedef mach_exception_data_type_t	*mach_exception_data_t;
+typedef	unsigned int			exception_mask_t;
+typedef	exception_mask_t		*exception_mask_array_t;
+typedef exception_behavior_t		*exception_behavior_array_t;
+typedef thread_state_flavor_t		*exception_flavor_array_t;
+typedef mach_port_t			*exception_port_array_t;
+typedef	mach_exception_data_type_t	mach_exception_code_t;
+typedef	mach_exception_data_type_t	mach_exception_subcode_t;
+
+#endif	/* ASSEMBLER */
+
+#endif	/* _MACH_EXCEPTION_TYPES_H_ */
diff --git a/i386/include/mach/host_info.h b/i386/include/mach/host_info.h
new file mode 100644
index 0000000..bc8f803
--- /dev/null
+++ b/i386/include/mach/host_info.h
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+/*
+ *	File:	mach/host_info.h
+ *
+ *	Definitions for host_info call.
+ */
+
+#ifndef	_MACH_HOST_INFO_H_
+#define	_MACH_HOST_INFO_H_
+
+#include <mach/message.h>
+#include <mach/vm_statistics.h>
+#include <mach/machine.h>
+#include <mach/machine/vm_types.h>
+#include <mach/time_value.h>
+
+#include <sys/cdefs.h>
+
+/*
+ *	Generic information structure to allow for expansion.
+ */
+typedef integer_t	*host_info_t;		/* varying array of int. */
+typedef integer_t	*host_info64_t;		/* varying array of int. */
+
+#define	HOST_INFO_MAX	(1024)		/* max array size */
+typedef integer_t	host_info_data_t[HOST_INFO_MAX];
+
+#define KERNEL_VERSION_MAX (512)
+typedef char	kernel_version_t[KERNEL_VERSION_MAX];
+
+#define KERNEL_BOOT_INFO_MAX (4096)
+typedef char	kernel_boot_info_t[KERNEL_BOOT_INFO_MAX];
+
+/*
+ *	Currently defined information.
+ */
+/* host_info() */
+typedef	integer_t	host_flavor_t;
+#define HOST_BASIC_INFO		1	/* basic info */
+#define HOST_SCHED_INFO		3	/* scheduling info */
+#define HOST_RESOURCE_SIZES	4	/* kernel struct sizes */
+#define HOST_PRIORITY_INFO	5	/* priority information */
+#define HOST_SEMAPHORE_TRAPS	7	/* Has semaphore traps */
+#define HOST_MACH_MSG_TRAP	8	/* Has mach_msg_trap */
+
+
+#pragma pack(4)
+
+struct host_basic_info {
+	integer_t		max_cpus;		/* max number of CPUs possible */
+	integer_t		avail_cpus;		/* number of CPUs now available */
+	natural_t		memory_size;		/* size of memory in bytes, capped at 2 GB */
+	cpu_type_t		cpu_type;		/* cpu type */
+	cpu_subtype_t		cpu_subtype;		/* cpu subtype */
+	cpu_threadtype_t	cpu_threadtype;		/* cpu threadtype */
+	integer_t		physical_cpu;		/* number of physical CPUs now available */
+	integer_t		physical_cpu_max;	/* max number of physical CPUs possible */
+	integer_t		logical_cpu;		/* number of logical cpu now available */
+	integer_t		logical_cpu_max;	/* max number of physical CPUs possible */
+	uint64_t		max_mem;		/* actual size of physical memory */
+};
+
+#pragma pack()
+
+typedef	struct host_basic_info	host_basic_info_data_t;
+typedef struct host_basic_info	*host_basic_info_t;
+#define HOST_BASIC_INFO_COUNT ((mach_msg_type_number_t) \
+		(sizeof(host_basic_info_data_t)/sizeof(integer_t)))
+
+struct host_sched_info {
+	integer_t	min_timeout;	/* minimum timeout in milliseconds */
+	integer_t	min_quantum;	/* minimum quantum in milliseconds */
+};
+
+typedef	struct host_sched_info	host_sched_info_data_t;
+typedef struct host_sched_info	*host_sched_info_t;
+#define HOST_SCHED_INFO_COUNT ((mach_msg_type_number_t) \
+		(sizeof(host_sched_info_data_t)/sizeof(integer_t)))
+
+struct kernel_resource_sizes {
+	natural_t	task;
+        natural_t	thread;
+        natural_t	port;
+        natural_t	memory_region;
+        natural_t	memory_object;
+};
+
+typedef struct kernel_resource_sizes	kernel_resource_sizes_data_t;
+typedef struct kernel_resource_sizes	*kernel_resource_sizes_t;
+#define HOST_RESOURCE_SIZES_COUNT ((mach_msg_type_number_t) \
+		(sizeof(kernel_resource_sizes_data_t)/sizeof(integer_t)))
+
+struct host_priority_info {
+    	integer_t	kernel_priority;
+    	integer_t	system_priority;
+    	integer_t	server_priority;
+    	integer_t	user_priority;
+    	integer_t	depress_priority;
+    	integer_t	idle_priority;
+    	integer_t	minimum_priority;
+	integer_t	maximum_priority;
+};
+
+typedef struct host_priority_info	host_priority_info_data_t;
+typedef struct host_priority_info	*host_priority_info_t;
+#define HOST_PRIORITY_INFO_COUNT ((mach_msg_type_number_t) \
+		(sizeof(host_priority_info_data_t)/sizeof(integer_t)))
+
+/* host_statistics() */
+#define	HOST_LOAD_INFO		1	/* System loading stats */
+#define HOST_VM_INFO		2	/* Virtual memory stats */
+#define HOST_CPU_LOAD_INFO	3	/* CPU load stats */
+
+/* host_statistics64() */
+#define HOST_VM_INFO64		4	/* 64-bit virtual memory stats */
+
+
+struct host_load_info {
+	integer_t	avenrun[3];	/* scaled by LOAD_SCALE */
+	integer_t	mach_factor[3];	/* scaled by LOAD_SCALE */
+};
+
+typedef struct host_load_info	host_load_info_data_t;
+typedef struct host_load_info	*host_load_info_t;
+#define	HOST_LOAD_INFO_COUNT ((mach_msg_type_number_t) \
+		(sizeof(host_load_info_data_t)/sizeof(integer_t)))
+
+/* in <mach/vm_statistics.h> */
+/* vm_statistics64 */
+#define	HOST_VM_INFO64_COUNT ((mach_msg_type_number_t) \
+		(sizeof(vm_statistics64_data_t)/sizeof(integer_t)))
+
+/* size of the latest version of the structure */
+#define HOST_VM_INFO64_LATEST_COUNT HOST_VM_INFO64_COUNT
+
+
+/* vm_statistics */
+#define	HOST_VM_INFO_COUNT ((mach_msg_type_number_t) \
+		(sizeof(vm_statistics_data_t)/sizeof(integer_t)))
+
+/* size of the latest version of the structure */
+#define HOST_VM_INFO_LATEST_COUNT HOST_VM_INFO_COUNT
+#define	HOST_VM_INFO_REV2_COUNT HOST_VM_INFO_LATEST_COUNT
+/* previous versions: adjust the size according to what was added each time */
+#define	HOST_VM_INFO_REV1_COUNT /* added "speculative_count" (1 int) */	\
+	((mach_msg_type_number_t) \
+	 (HOST_VM_INFO_REV2_COUNT - 1))
+#define	HOST_VM_INFO_REV0_COUNT /* added "purgable" info (2 ints) */ 	\
+	((mach_msg_type_number_t) \
+	 (HOST_VM_INFO_REV1_COUNT - 2))
+
+struct host_cpu_load_info {		/* number of ticks while running... */
+	natural_t	cpu_ticks[CPU_STATE_MAX]; /* ... in the given mode */
+};
+
+typedef struct host_cpu_load_info	host_cpu_load_info_data_t;
+typedef struct host_cpu_load_info	*host_cpu_load_info_t;
+#define HOST_CPU_LOAD_INFO_COUNT ((mach_msg_type_number_t) \
+		(sizeof (host_cpu_load_info_data_t) / sizeof (integer_t)))
+
+#endif	/* _MACH_HOST_INFO_H_ */
diff --git a/i386/include/mach/host_notify.h b/i386/include/mach/host_notify.h
new file mode 100644
index 0000000..6c0ca74
--- /dev/null
+++ b/i386/include/mach/host_notify.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_MACH_HOST_NOTIFY_H_
+#define	_MACH_HOST_NOTIFY_H_
+
+#define HOST_NOTIFY_CALENDAR_CHANGE		0
+#define HOST_NOTIFY_TYPE_MAX			0
+
+#define HOST_CALENDAR_CHANGED_REPLYID	950
+
+#endif /* _MACH_HOST_NOTIFY_H_ */
diff --git a/i386/include/mach/host_notify_reply.defs b/i386/include/mach/host_notify_reply.defs
new file mode 100644
index 0000000..85437f8
--- /dev/null
+++ b/i386/include/mach/host_notify_reply.defs
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+subsystem
+#if	KERNEL_USER
+		KernelUser
+#endif	/* KERN_USER */
+			host_notify_reply 950;
+
+#include <mach/std_types.defs>
+
+simpleroutine host_calendar_changed(
+		notify_port	: mach_port_move_send_once_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/host_priv.defs b/i386/include/mach/host_priv.defs
new file mode 100644
index 0000000..3be3986
--- /dev/null
+++ b/i386/include/mach/host_priv.defs
@@ -0,0 +1,380 @@
+/*
+ * Copyright (c) 2000-2004 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+/*
+ *	Matchmaker definitions file for Mach kernel interface.
+ */
+subsystem
+#if	KERNEL_USER
+	  KernelUser
+#endif	/* KERNEL_USER */
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+		       host_priv 400;
+
+#ifdef	KERNEL_USER
+userprefix r_;
+#endif	/* KERNEL_USER */
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+#include <mach/clock_types.defs>
+#include <mach_debug/mach_debug_types.defs>
+
+/*
+ *      Get boot configuration information from kernel.
+ */
+routine host_get_boot_info(
+		host_priv	: host_priv_t;
+	out	boot_info	: kernel_boot_info_t);
+
+/*
+ *	Reboot this host.
+ *	Only available to privileged users.
+ */
+routine host_reboot(
+		host_priv	: host_priv_t;
+		options		: int);
+
+
+/*
+ *	Return privileged statistics from this host.
+ */
+routine host_priv_statistics(
+		host_priv	: host_priv_t;
+		flavor		: host_flavor_t;
+	out	host_info_out	: host_info_t, CountInOut);
+
+/*
+ *	Sets the default memory manager, the port to which
+ *	newly-created temporary memory objects are delivered.
+ *	[See (memory_object_default)memory_object_create.]
+ *	Also sets the default cluster size used for pagein/pageout
+ *	to this port.
+ *	The old memory manager port is returned.
+ */
+routine host_default_memory_manager(
+		host_priv	: host_priv_t;
+	inout	default_manager	: memory_object_default_t = 
+					MACH_MSG_TYPE_MAKE_SEND;
+		cluster_size	: memory_object_cluster_size_t);
+
+
+/*
+ *	Specify that the range of the virtual address space
+ *	of the target task must not cause page faults for
+ *	the indicated accesses.
+ *
+ *	[ To unwire the pages, specify VM_PROT_NONE. ]
+ */
+routine	vm_wire(
+		host_priv	: host_priv_t;
+		task		: vm_map_t;
+		address		: vm_address_t;
+		size		: vm_size_t;
+		desired_access	: vm_prot_t);
+
+/*
+ *	Specify that the target thread must always be able
+ *	to run and to allocate memory.
+ */
+routine	thread_wire(
+		host_priv	: host_priv_t;
+		thread		: thread_act_t;
+		wired		: boolean_t);
+
+/*
+ *	Allocate zero-filled, wired, contiguous physical memory
+ *	in the address space of the target task, either at the
+ *	specified address, or wherever space can be found (if
+ *	anywhere is TRUE), of the specified size.  The address
+ *	at which the allocation actually took place is returned.
+ *	All pages will be entered into the task's pmap immediately,
+ *	with VM_PROT_ALL.
+ *
+ *	In addition to all the failure modes of its cousin,
+ *	vm_allocate, this call may also fail if insufficient
+ *	contiguous memory exists to satisfy the request.
+ *
+ *	Memory obtained from this call should be freed the
+ *	normal way, via vm_deallocate.
+ *
+ *	N.B.  This is an EXPERIMENTAL interface!
+ */
+routine	vm_allocate_cpm(
+		host_priv	: host_priv_t;
+		task		: vm_map_t;
+	inout	address		: vm_address_t;
+		size		: vm_size_t;
+		flags		: int);
+
+/*
+ *	Get list of processors on this host.
+ */
+routine host_processors(
+		host_priv		: host_priv_t;
+	out	out_processor_list	: processor_array_t);
+
+
+/*
+ *	Get control port for a system-wide clock.
+ *	Privileged.
+ */
+routine host_get_clock_control(
+		host_priv	: host_priv_t;
+		clock_id	: clock_id_t;
+	out	clock_ctrl	: clock_ctrl_t);
+
+
+/*
+ * kernel module interface (obsolete as of SnowLeopard)
+ * see mach/kmod.h
+ */
+/* kmod_ MIG calls now return KERN_NOT_SUPPORTED on PPC/i386/x86_64. */
+routine kmod_create(
+		host_priv	: host_priv_t;
+		info		: vm_address_t;
+	out	module		: kmod_t);
+
+routine kmod_destroy(
+		host_priv	: host_priv_t;
+		module		: kmod_t);
+
+routine	kmod_control(
+		host_priv	: host_priv_t;
+		module		: kmod_t;
+		flavor		: kmod_control_flavor_t;
+	inout	data		: kmod_args_t);
+
+/*
+ * 	Get a given special port for a given node.
+ * 	Special ports are defined in host_special_ports.h;
+ * 	examples include the master device port.
+ * 	There are a limited number of slots available for system servers.
+ */
+routine host_get_special_port(
+                host_priv       : host_priv_t;
+                node            : int;
+                which           : int;
+        out     port            : mach_port_t);
+
+/*
+ * 	Set a given special port for the local node.
+ * 	See host_get_special_port.
+ */
+routine host_set_special_port(
+                host_priv       : host_priv_t;
+                which           : int;
+                port            : mach_port_t);
+
+/*
+ * Set an exception handler for a host on one or more exception types.
+ * These handlers are invoked for all threads on the host if there are
+ * no task or thread-specific exception handlers or those handlers returned
+ * an error.
+ */
+routine	host_set_exception_ports(
+		host_priv	: host_priv_t;
+		exception_mask	: exception_mask_t;
+		new_port	: mach_port_t;
+		behavior	: exception_behavior_t;
+		new_flavor	: thread_state_flavor_t);
+
+
+/*
+ * Lookup some of the old exception handlers for a host
+ */
+routine	host_get_exception_ports(
+		host_priv	: host_priv_t;
+		exception_mask	: exception_mask_t;
+	  out	masks		: exception_mask_array_t;
+	  out	old_handlers	: exception_handler_array_t, SameCount;
+	  out	old_behaviors	: exception_behavior_array_t, SameCount;
+	  out	old_flavors	: exception_flavor_array_t, SameCount);
+
+
+/*
+ * Set an exception handler for a host on one or more exception types.
+ * At the same time, return the previously defined exception handlers for
+ * those types.
+ */
+routine	host_swap_exception_ports(
+		host_priv	: host_priv_t;
+		exception_mask	: exception_mask_t;
+		new_port	: mach_port_t;
+		behavior	: exception_behavior_t;
+		new_flavor	: thread_state_flavor_t;
+	  out	masks		: exception_mask_array_t;
+	  out	old_handlerss	: exception_handler_array_t, SameCount;
+	  out	old_behaviors	: exception_behavior_array_t, SameCount;
+	  out	old_flavors	: exception_flavor_array_t, SameCount);
+
+/*
+ *	Loads a symbol table for an external file into the kernel debugger.
+ *	The symbol table data is an array of characters.  It is assumed that
+ *	the caller and the kernel debugger agree on its format.
+ *      This call is only supported in MACH_DEBUG and MACH_KDB kernels,
+ *      otherwise KERN_FAILURE is returned.
+ */
+routine host_load_symbol_table(
+		host		: host_priv_t;
+		task		: task_t;
+		name		: symtab_name_t;
+		symtab		: pointer_t);
+
+/*
+ *	Specify that the range of the virtual address space
+ *	of the target task must not cause page faults for
+ *	the indicated accesses.
+ *
+ *	[ To unwire the pages, specify VM_PROT_NONE. ]
+ */
+routine	mach_vm_wire(
+		host_priv	: host_priv_t;
+		task		: vm_map_t;
+		address		: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		desired_access	: vm_prot_t);
+
+/*
+ * JMM - Keep all processor_set related items at the end for easy
+ * removal.
+ */
+/*
+ *	List all processor sets on host.
+ */
+routine host_processor_sets(
+		host_priv	: host_priv_t;
+	out	processor_sets	: processor_set_name_array_t);
+
+/*
+ *	Get control port for a processor set.
+ */
+routine host_processor_set_priv(
+		host_priv	: host_priv_t;
+		set_name	: processor_set_name_t;
+	out	set		: processor_set_t);
+
+/************************** Warning *************************************/
+/*       The following routines are going away in a future release	*/
+/*	use the appropriate variant of host_set_special_port instead	*/
+/************************************************************************/
+ 
+/*
+ *	Set the dynamic_pager control port. Other entities
+ *	can request a send right to this port to talk with
+ *	the dynamic_pager utility, setting behavioral parameters
+ *	within the dynamic pager and getting low/high backing store
+ *	resource notifications.
+ */
+routine set_dp_control_port(    
+		host		: host_priv_t;
+	in	control_port	: mach_port_t);
+
+/*
+ *	Get the dynamic_pager control port.  This port
+ *	allows the holder to talk directly with the dynamic
+ *	pager utility.
+ */
+routine get_dp_control_port(    
+		host		: host_priv_t;
+	out	contorl_port    :mach_port_t);
+
+/*
+ *	Set the UserNotification daemon access port for this host. 
+ *	If this value is already set, the kernel will discard its
+ *	reference to the previously registered port.
+ */
+routine host_set_UNDServer(    
+		host		: host_priv_t;
+	in	server		: UNDServerRef);
+
+/*
+ *	Get the UserNotification daemon access port for this host.
+ *	This can then be used to communicate with that daemon, which
+ *	in turn communicates with the User through whatever means
+ *	available (pop-up-menus for GUI systems, text for non-GUI, etc..).
+ *
+ *	Access to this port is restricted to privileged clients because
+ *	it is a special purpose port intended for kernel clients.  User
+ *	level clients should go directly to the CFUserNotifcation services.
+ */
+routine host_get_UNDServer(    
+		host		: host_priv_t;
+	out	server		: UNDServerRef);
+
+/*
+ * Perform an operation with a kernel extension, on the kext loading system,
+ * or request information about loaded kexts or the state of the kext loading
+ * system.
+ * Active operations (load, unload, disable/enable) require host_priv/root access.
+ * Info retrieval does not.
+ *
+ * WARNING: THIS ROUTINE IS PRIVATE TO THE KEXT-MANAGEMENT STACK AND IS
+ * SUBJECT TO CHANGE AT ANY TIME.
+ */
+routine kext_request(
+        host_priv      : host_priv_t;
+    in  user_log_flags : uint32_t;
+    in  request_data   : pointer_t;
+    out response_data  : pointer_t;
+    out log_data       : pointer_t;
+    out op_result      : kern_return_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/host_priv.h b/i386/include/mach/host_priv.h
new file mode 100644
index 0000000..7a9df1f
--- /dev/null
+++ b/i386/include/mach/host_priv.h
@@ -0,0 +1,1269 @@
+#ifndef	_host_priv_user_
+#define	_host_priv_user_
+
+/* Module host_priv */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	host_priv_MSG_COUNT
+#define	host_priv_MSG_COUNT	26
+#endif	/* host_priv_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+#include <mach/mach_types.h>
+#include <mach_debug/mach_debug_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine host_get_boot_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_get_boot_info
+(
+	host_priv_t host_priv,
+	kernel_boot_info_t boot_info
+);
+
+/* Routine host_reboot */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_reboot
+(
+	host_priv_t host_priv,
+	int options
+);
+
+/* Routine host_priv_statistics */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_priv_statistics
+(
+	host_priv_t host_priv,
+	host_flavor_t flavor,
+	host_info_t host_info_out,
+	mach_msg_type_number_t *host_info_outCnt
+);
+
+/* Routine host_default_memory_manager */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_default_memory_manager
+(
+	host_priv_t host_priv,
+	memory_object_default_t *default_manager,
+	memory_object_cluster_size_t cluster_size
+);
+
+/* Routine vm_wire */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_wire
+(
+	host_priv_t host_priv,
+	vm_map_t task,
+	vm_address_t address,
+	vm_size_t size,
+	vm_prot_t desired_access
+);
+
+/* Routine thread_wire */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_wire
+(
+	host_priv_t host_priv,
+	thread_act_t thread,
+	boolean_t wired
+);
+
+/* Routine vm_allocate_cpm */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_allocate_cpm
+(
+	host_priv_t host_priv,
+	vm_map_t task,
+	vm_address_t *address,
+	vm_size_t size,
+	int flags
+);
+
+/* Routine host_processors */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_processors
+(
+	host_priv_t host_priv,
+	processor_array_t *out_processor_list,
+	mach_msg_type_number_t *out_processor_listCnt
+);
+
+/* Routine host_get_clock_control */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_get_clock_control
+(
+	host_priv_t host_priv,
+	clock_id_t clock_id,
+	clock_ctrl_t *clock_ctrl
+);
+
+/* Routine kmod_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t kmod_create
+(
+	host_priv_t host_priv,
+	vm_address_t info,
+	kmod_t *module
+);
+
+/* Routine kmod_destroy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t kmod_destroy
+(
+	host_priv_t host_priv,
+	kmod_t module
+);
+
+/* Routine kmod_control */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t kmod_control
+(
+	host_priv_t host_priv,
+	kmod_t module,
+	kmod_control_flavor_t flavor,
+	kmod_args_t *data,
+	mach_msg_type_number_t *dataCnt
+);
+
+/* Routine host_get_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_get_special_port
+(
+	host_priv_t host_priv,
+	int node,
+	int which,
+	mach_port_t *port
+);
+
+/* Routine host_set_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_set_special_port
+(
+	host_priv_t host_priv,
+	int which,
+	mach_port_t port
+);
+
+/* Routine host_set_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_set_exception_ports
+(
+	host_priv_t host_priv,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor
+);
+
+/* Routine host_get_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_get_exception_ports
+(
+	host_priv_t host_priv,
+	exception_mask_t exception_mask,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlers,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine host_swap_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_swap_exception_ports
+(
+	host_priv_t host_priv,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlerss,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine host_load_symbol_table */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_load_symbol_table
+(
+	host_priv_t host,
+	task_t task,
+	symtab_name_t name,
+	vm_offset_t symtab,
+	mach_msg_type_number_t symtabCnt
+);
+
+/* Routine mach_vm_wire */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_wire
+(
+	host_priv_t host_priv,
+	vm_map_t task,
+	mach_vm_address_t address,
+	mach_vm_size_t size,
+	vm_prot_t desired_access
+);
+
+/* Routine host_processor_sets */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_processor_sets
+(
+	host_priv_t host_priv,
+	processor_set_name_array_t *processor_sets,
+	mach_msg_type_number_t *processor_setsCnt
+);
+
+/* Routine host_processor_set_priv */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_processor_set_priv
+(
+	host_priv_t host_priv,
+	processor_set_name_t set_name,
+	processor_set_t *set
+);
+
+/* Routine set_dp_control_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t set_dp_control_port
+(
+	host_priv_t host,
+	mach_port_t control_port
+);
+
+/* Routine get_dp_control_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t get_dp_control_port
+(
+	host_priv_t host,
+	mach_port_t *contorl_port
+);
+
+/* Routine host_set_UNDServer */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_set_UNDServer
+(
+	host_priv_t host,
+	UNDServerRef server
+);
+
+/* Routine host_get_UNDServer */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_get_UNDServer
+(
+	host_priv_t host,
+	UNDServerRef *server
+);
+
+/* Routine kext_request */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t kext_request
+(
+	host_priv_t host_priv,
+	uint32_t user_log_flags,
+	vm_offset_t request_data,
+	mach_msg_type_number_t request_dataCnt,
+	vm_offset_t *response_data,
+	mach_msg_type_number_t *response_dataCnt,
+	vm_offset_t *log_data,
+	mach_msg_type_number_t *log_dataCnt,
+	kern_return_t *op_result
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__host_priv_subsystem__defined
+#define __Request__host_priv_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__host_get_boot_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int options;
+	} __Request__host_reboot_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		host_flavor_t flavor;
+		mach_msg_type_number_t host_info_outCnt;
+	} __Request__host_priv_statistics_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t default_manager;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		memory_object_cluster_size_t cluster_size;
+	} __Request__host_default_memory_manager_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t task;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		vm_prot_t desired_access;
+	} __Request__vm_wire_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t thread;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		boolean_t wired;
+	} __Request__thread_wire_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t task;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		int flags;
+	} __Request__vm_allocate_cpm_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__host_processors_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		clock_id_t clock_id;
+	} __Request__host_get_clock_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t info;
+	} __Request__kmod_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kmod_t module;
+	} __Request__kmod_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t data;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		kmod_t module;
+		kmod_control_flavor_t flavor;
+		mach_msg_type_number_t dataCnt;
+	} __Request__kmod_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int node;
+		int which;
+	} __Request__host_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int which;
+	} __Request__host_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__host_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+	} __Request__host_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__host_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t task;
+		mach_msg_ool_descriptor_t symtab;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t nameOffset; /* MiG doesn't use it */
+		mach_msg_type_number_t nameCnt;
+		char name[32];
+		mach_msg_type_number_t symtabCnt;
+	} __Request__host_load_symbol_table_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t task;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		vm_prot_t desired_access;
+	} __Request__mach_vm_wire_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__host_processor_sets_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t set_name;
+		/* end of the kernel processed data */
+	} __Request__host_processor_set_priv_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t control_port;
+		/* end of the kernel processed data */
+	} __Request__set_dp_control_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__get_dp_control_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t server;
+		/* end of the kernel processed data */
+	} __Request__host_set_UNDServer_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__host_get_UNDServer_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t request_data;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		uint32_t user_log_flags;
+		mach_msg_type_number_t request_dataCnt;
+	} __Request__kext_request_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__host_priv_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__host_priv_subsystem__defined
+#define __RequestUnion__host_priv_subsystem__defined
+union __RequestUnion__host_priv_subsystem {
+	__Request__host_get_boot_info_t Request_host_get_boot_info;
+	__Request__host_reboot_t Request_host_reboot;
+	__Request__host_priv_statistics_t Request_host_priv_statistics;
+	__Request__host_default_memory_manager_t Request_host_default_memory_manager;
+	__Request__vm_wire_t Request_vm_wire;
+	__Request__thread_wire_t Request_thread_wire;
+	__Request__vm_allocate_cpm_t Request_vm_allocate_cpm;
+	__Request__host_processors_t Request_host_processors;
+	__Request__host_get_clock_control_t Request_host_get_clock_control;
+	__Request__kmod_create_t Request_kmod_create;
+	__Request__kmod_destroy_t Request_kmod_destroy;
+	__Request__kmod_control_t Request_kmod_control;
+	__Request__host_get_special_port_t Request_host_get_special_port;
+	__Request__host_set_special_port_t Request_host_set_special_port;
+	__Request__host_set_exception_ports_t Request_host_set_exception_ports;
+	__Request__host_get_exception_ports_t Request_host_get_exception_ports;
+	__Request__host_swap_exception_ports_t Request_host_swap_exception_ports;
+	__Request__host_load_symbol_table_t Request_host_load_symbol_table;
+	__Request__mach_vm_wire_t Request_mach_vm_wire;
+	__Request__host_processor_sets_t Request_host_processor_sets;
+	__Request__host_processor_set_priv_t Request_host_processor_set_priv;
+	__Request__set_dp_control_port_t Request_set_dp_control_port;
+	__Request__get_dp_control_port_t Request_get_dp_control_port;
+	__Request__host_set_UNDServer_t Request_host_set_UNDServer;
+	__Request__host_get_UNDServer_t Request_host_get_UNDServer;
+	__Request__kext_request_t Request_kext_request;
+};
+#endif /* !__RequestUnion__host_priv_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__host_priv_subsystem__defined
+#define __Reply__host_priv_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t boot_infoOffset; /* MiG doesn't use it */
+		mach_msg_type_number_t boot_infoCnt;
+		char boot_info[4096];
+	} __Reply__host_get_boot_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__host_reboot_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t host_info_outCnt;
+		integer_t host_info_out[15];
+	} __Reply__host_priv_statistics_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t default_manager;
+		/* end of the kernel processed data */
+	} __Reply__host_default_memory_manager_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__vm_wire_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_wire_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_address_t address;
+	} __Reply__vm_allocate_cpm_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t out_processor_list;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t out_processor_listCnt;
+	} __Reply__host_processors_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t clock_ctrl;
+		/* end of the kernel processed data */
+	} __Reply__host_get_clock_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		kmod_t module;
+	} __Reply__kmod_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__kmod_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t data;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t dataCnt;
+	} __Reply__kmod_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t port;
+		/* end of the kernel processed data */
+	} __Reply__host_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__host_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__host_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlers[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__host_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlerss[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__host_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__host_load_symbol_table_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_vm_wire_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t processor_sets;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t processor_setsCnt;
+	} __Reply__host_processor_sets_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t set;
+		/* end of the kernel processed data */
+	} __Reply__host_processor_set_priv_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__set_dp_control_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t contorl_port;
+		/* end of the kernel processed data */
+	} __Reply__get_dp_control_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__host_set_UNDServer_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t server;
+		/* end of the kernel processed data */
+	} __Reply__host_get_UNDServer_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t response_data;
+		mach_msg_ool_descriptor_t log_data;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t response_dataCnt;
+		mach_msg_type_number_t log_dataCnt;
+		kern_return_t op_result;
+	} __Reply__kext_request_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__host_priv_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__host_priv_subsystem__defined
+#define __ReplyUnion__host_priv_subsystem__defined
+union __ReplyUnion__host_priv_subsystem {
+	__Reply__host_get_boot_info_t Reply_host_get_boot_info;
+	__Reply__host_reboot_t Reply_host_reboot;
+	__Reply__host_priv_statistics_t Reply_host_priv_statistics;
+	__Reply__host_default_memory_manager_t Reply_host_default_memory_manager;
+	__Reply__vm_wire_t Reply_vm_wire;
+	__Reply__thread_wire_t Reply_thread_wire;
+	__Reply__vm_allocate_cpm_t Reply_vm_allocate_cpm;
+	__Reply__host_processors_t Reply_host_processors;
+	__Reply__host_get_clock_control_t Reply_host_get_clock_control;
+	__Reply__kmod_create_t Reply_kmod_create;
+	__Reply__kmod_destroy_t Reply_kmod_destroy;
+	__Reply__kmod_control_t Reply_kmod_control;
+	__Reply__host_get_special_port_t Reply_host_get_special_port;
+	__Reply__host_set_special_port_t Reply_host_set_special_port;
+	__Reply__host_set_exception_ports_t Reply_host_set_exception_ports;
+	__Reply__host_get_exception_ports_t Reply_host_get_exception_ports;
+	__Reply__host_swap_exception_ports_t Reply_host_swap_exception_ports;
+	__Reply__host_load_symbol_table_t Reply_host_load_symbol_table;
+	__Reply__mach_vm_wire_t Reply_mach_vm_wire;
+	__Reply__host_processor_sets_t Reply_host_processor_sets;
+	__Reply__host_processor_set_priv_t Reply_host_processor_set_priv;
+	__Reply__set_dp_control_port_t Reply_set_dp_control_port;
+	__Reply__get_dp_control_port_t Reply_get_dp_control_port;
+	__Reply__host_set_UNDServer_t Reply_host_set_UNDServer;
+	__Reply__host_get_UNDServer_t Reply_host_get_UNDServer;
+	__Reply__kext_request_t Reply_kext_request;
+};
+#endif /* !__RequestUnion__host_priv_subsystem__defined */
+
+#ifndef subsystem_to_name_map_host_priv
+#define subsystem_to_name_map_host_priv \
+    { "host_get_boot_info", 400 },\
+    { "host_reboot", 401 },\
+    { "host_priv_statistics", 402 },\
+    { "host_default_memory_manager", 403 },\
+    { "vm_wire", 404 },\
+    { "thread_wire", 405 },\
+    { "vm_allocate_cpm", 406 },\
+    { "host_processors", 407 },\
+    { "host_get_clock_control", 408 },\
+    { "kmod_create", 409 },\
+    { "kmod_destroy", 410 },\
+    { "kmod_control", 411 },\
+    { "host_get_special_port", 412 },\
+    { "host_set_special_port", 413 },\
+    { "host_set_exception_ports", 414 },\
+    { "host_get_exception_ports", 415 },\
+    { "host_swap_exception_ports", 416 },\
+    { "host_load_symbol_table", 417 },\
+    { "mach_vm_wire", 418 },\
+    { "host_processor_sets", 419 },\
+    { "host_processor_set_priv", 420 },\
+    { "set_dp_control_port", 421 },\
+    { "get_dp_control_port", 422 },\
+    { "host_set_UNDServer", 423 },\
+    { "host_get_UNDServer", 424 },\
+    { "kext_request", 425 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _host_priv_user_ */
diff --git a/i386/include/mach/host_reboot.h b/i386/include/mach/host_reboot.h
new file mode 100644
index 0000000..65609dd
--- /dev/null
+++ b/i386/include/mach/host_reboot.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+#ifndef _MACH_HOST_REBOOT_
+#define _MACH_HOST_REBOOT_
+
+#define HOST_REBOOT_HALT        0x0008
+#define HOST_REBOOT_UPSDELAY    0x0100
+#define	HOST_REBOOT_DEBUGGER	0x1000
+
+#endif	/* _MACH_HOST_REBOOT_ */
diff --git a/i386/include/mach/host_security.defs b/i386/include/mach/host_security.defs
new file mode 100644
index 0000000..4098df4
--- /dev/null
+++ b/i386/include/mach/host_security.defs
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+/*
+ * File:	mach/host_security.defs
+ *
+ * Abstract:
+ *	Mach host security operations support.
+ */
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+		      host_security 600;
+
+/*
+ *	Basic types
+ */
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+
+/*
+ *	Create a new task with an explicit security token
+ */
+routine host_security_create_task_token(
+		host_security	: host_security_t;
+		parent_task	: task_t;
+		sec_token	: security_token_t;
+		audit_token	: audit_token_t;
+		host		: host_t;
+		ledgers		: ledger_array_t;
+		inherit_memory	: boolean_t;
+	out	child_task	: task_t);
+
+/*
+ *	Change a task's security token
+ */
+routine host_security_set_task_token(
+		host_security	: host_security_t;
+		target_task	: task_t;
+		sec_token	: security_token_t;
+		audit_token	: audit_token_t;
+		host		: host_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/host_security.h b/i386/include/mach/host_security.h
new file mode 100644
index 0000000..ee4ed9e
--- /dev/null
+++ b/i386/include/mach/host_security.h
@@ -0,0 +1,197 @@
+#ifndef	_host_security_user_
+#define	_host_security_user_
+
+/* Module host_security */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	host_security_MSG_COUNT
+#define	host_security_MSG_COUNT	2
+#endif	/* host_security_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine host_security_create_task_token */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_security_create_task_token
+(
+	host_security_t host_security,
+	task_t parent_task,
+	security_token_t sec_token,
+	audit_token_t audit_token,
+	host_t host,
+	ledger_array_t ledgers,
+	mach_msg_type_number_t ledgersCnt,
+	boolean_t inherit_memory,
+	task_t *child_task
+);
+
+/* Routine host_security_set_task_token */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_security_set_task_token
+(
+	host_security_t host_security,
+	task_t target_task,
+	security_token_t sec_token,
+	audit_token_t audit_token,
+	host_t host
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__host_security_subsystem__defined
+#define __Request__host_security_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t parent_task;
+		mach_msg_port_descriptor_t host;
+		mach_msg_ool_ports_descriptor_t ledgers;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		security_token_t sec_token;
+		audit_token_t audit_token;
+		mach_msg_type_number_t ledgersCnt;
+		boolean_t inherit_memory;
+	} __Request__host_security_create_task_token_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t target_task;
+		mach_msg_port_descriptor_t host;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		security_token_t sec_token;
+		audit_token_t audit_token;
+	} __Request__host_security_set_task_token_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__host_security_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__host_security_subsystem__defined
+#define __RequestUnion__host_security_subsystem__defined
+union __RequestUnion__host_security_subsystem {
+	__Request__host_security_create_task_token_t Request_host_security_create_task_token;
+	__Request__host_security_set_task_token_t Request_host_security_set_task_token;
+};
+#endif /* !__RequestUnion__host_security_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__host_security_subsystem__defined
+#define __Reply__host_security_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_task;
+		/* end of the kernel processed data */
+	} __Reply__host_security_create_task_token_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__host_security_set_task_token_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__host_security_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__host_security_subsystem__defined
+#define __ReplyUnion__host_security_subsystem__defined
+union __ReplyUnion__host_security_subsystem {
+	__Reply__host_security_create_task_token_t Reply_host_security_create_task_token;
+	__Reply__host_security_set_task_token_t Reply_host_security_set_task_token;
+};
+#endif /* !__RequestUnion__host_security_subsystem__defined */
+
+#ifndef subsystem_to_name_map_host_security
+#define subsystem_to_name_map_host_security \
+    { "host_security_create_task_token", 600 },\
+    { "host_security_set_task_token", 601 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _host_security_user_ */
diff --git a/i386/include/mach/host_special_ports.h b/i386/include/mach/host_special_ports.h
new file mode 100644
index 0000000..755327c
--- /dev/null
+++ b/i386/include/mach/host_special_ports.h
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/host_special_ports.h
+ *
+ *	Defines codes for access to host-wide special ports.
+ */
+
+#ifndef _MACH_HOST_SPECIAL_PORTS_H_
+#define _MACH_HOST_SPECIAL_PORTS_H_
+
+/*
+ * Cannot be set or gotten from user space
+ */
+#define HOST_SECURITY_PORT               0
+
+/*
+ * Always provided by kernel (cannot be set from user-space).
+ */
+#define HOST_PORT                        1
+#define HOST_PRIV_PORT                   2
+#define HOST_IO_MASTER_PORT              3
+#define HOST_MAX_SPECIAL_KERNEL_PORT     7 /* room to grow */
+
+/*
+ * Not provided by kernel
+ */
+#define HOST_DYNAMIC_PAGER_PORT         (1 + HOST_MAX_SPECIAL_KERNEL_PORT)
+#define HOST_AUDIT_CONTROL_PORT         (2 + HOST_MAX_SPECIAL_KERNEL_PORT)
+#define HOST_USER_NOTIFICATION_PORT     (3 + HOST_MAX_SPECIAL_KERNEL_PORT)
+#define HOST_AUTOMOUNTD_PORT            (4 + HOST_MAX_SPECIAL_KERNEL_PORT)
+#define HOST_LOCKD_PORT                 (5 + HOST_MAX_SPECIAL_KERNEL_PORT)
+#define HOST_SEATBELT_PORT              (7 + HOST_MAX_SPECIAL_KERNEL_PORT)
+#define HOST_KEXTD_PORT                 (8 + HOST_MAX_SPECIAL_KERNEL_PORT)
+#define HOST_CHUD_PORT                  (9 + HOST_MAX_SPECIAL_KERNEL_PORT)
+#define HOST_UNFREED_PORT		(10 + HOST_MAX_SPECIAL_KERNEL_PORT)
+#define HOST_AMFID_PORT			(11 + HOST_MAX_SPECIAL_KERNEL_PORT)
+#define HOST_MAX_SPECIAL_PORT           (12 + HOST_MAX_SPECIAL_KERNEL_PORT)
+                                        /* room to grow here as well */
+
+/*
+ * Special node identifier to always represent the local node.
+ */
+#define HOST_LOCAL_NODE	                 -1
+			
+/*
+ * Definitions for ease of use.
+ *
+ * In the get call, the host parameter can be any host, but will generally
+ * be the local node host port. In the set call, the host must the per-node
+ * host port for the node being affected.
+ */
+#define host_get_host_port(host, port)	\
+	(host_get_special_port((host), 	\
+	HOST_LOCAL_NODE, HOST_PORT, (port)))
+#define host_set_host_port(host, port) (KERN_INVALID_ARGUMENT)
+
+#define host_get_host_priv_port(host, port)	\
+	(host_get_special_port((host), 		\
+	HOST_LOCAL_NODE, HOST_PRIV_PORT, (port)))
+#define host_set_host_priv_port(host, port) (KERN_INVALID_ARGUMENT)
+
+#define host_get_io_master_port(host, port)	\
+	(host_get_special_port((host), 		\
+	HOST_LOCAL_NODE, HOST_IO_MASTER_PORT, (port)))
+#define host_set_io_master_port(host, port) (KERN_INVALID_ARGUMENT)
+
+/*
+ * User-settable special ports.
+ */
+#define host_get_dynamic_pager_port(host, port)	\
+	(host_get_special_port((host),			\
+	HOST_LOCAL_NODE, HOST_DYNAMIC_PAGER_PORT, (port)))
+#define host_set_dynamic_pager_port(host, port)	\
+	(host_set_special_port((host), HOST_DYNAMIC_PAGER_PORT, (port)))
+
+#define host_get_audit_control_port(host, port)	\
+	(host_get_special_port((host), 		\
+	HOST_LOCAL_NODE, HOST_AUDIT_CONTROL_PORT, (port)))
+#define host_set_audit_control_port(host, port)	\
+	(host_set_special_port((host), HOST_AUDIT_CONTROL_PORT, (port)))
+
+#define host_get_user_notification_port(host, port)	\
+	(host_get_special_port((host), 			\
+	HOST_LOCAL_NODE, HOST_USER_NOTIFICATION_PORT, (port)))
+#define host_set_user_notification_port(host, port)	\
+	(host_set_special_port((host), HOST_USER_NOTIFICATION_PORT, (port)))
+
+#define host_get_automountd_port(host, port)	\
+	(host_get_special_port((host), 		\
+	HOST_LOCAL_NODE, HOST_AUTOMOUNTD_PORT, (port)))
+#define host_set_automountd_port(host, port)	\
+	(host_set_special_port((host), HOST_AUTOMOUNTD_PORT, (port)))
+
+#define host_get_lockd_port(host, port)	\
+	(host_get_special_port((host), 			\
+	HOST_LOCAL_NODE, HOST_LOCKD_PORT, (port)))
+#define host_set_lockd_port(host, port)	\
+	(host_set_special_port((host), HOST_LOCKD_PORT, (port)))
+
+#define host_get_kextd_port(host, port)	\
+	(host_get_special_port((host), 			\
+	HOST_LOCAL_NODE, HOST_KEXTD_PORT, (port)))
+#define host_set_kextd_port(host, port)	\
+	(host_set_special_port((host), HOST_KEXTD_PORT, (port)))
+
+#define host_get_chud_port(host, port)	\
+	(host_get_special_port((host), 			\
+	HOST_LOCAL_NODE, HOST_CHUD_PORT, (port)))
+#define host_set_chud_port(host, port)	\
+	(host_set_special_port((host), HOST_CHUD_PORT, (port)))
+
+#define host_get_unfreed_port(host, port)	\
+	(host_get_special_port((host), 			\
+	HOST_LOCAL_NODE, HOST_UNFREED_PORT, (port)))
+#define host_set_unfreed_port(host, port)	\
+	(host_set_special_port((host), HOST_UNFREED_PORT, (port)))
+
+#define host_get_amfid_port(host, port)	\
+	(host_get_special_port((host), 			\
+	HOST_LOCAL_NODE, HOST_AMFID_PORT, (port)))
+#define host_set_amfid_port(host, port)	\
+	(host_set_special_port((host), HOST_AMFID_PORT, (port)))
+
+#endif	/* _MACH_HOST_SPECIAL_PORTS_H_ */
diff --git a/i386/include/mach/i386/_structs.h b/i386/include/mach/i386/_structs.h
new file mode 100644
index 0000000..927d12f
--- /dev/null
+++ b/i386/include/mach/i386/_structs.h
@@ -0,0 +1,561 @@
+/*
+ * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+#ifndef	_MACH_I386__STRUCTS_H_
+#define	_MACH_I386__STRUCTS_H_
+
+/*
+ * i386 is the structure that is exported to user threads for 
+ * use in status/mutate calls.  This structure should never change.
+ *
+ */
+
+#if __DARWIN_UNIX03
+#define	_STRUCT_X86_THREAD_STATE32	struct __darwin_i386_thread_state
+_STRUCT_X86_THREAD_STATE32
+{
+    unsigned int	__eax;
+    unsigned int	__ebx;
+    unsigned int	__ecx;
+    unsigned int	__edx;
+    unsigned int	__edi;
+    unsigned int	__esi;
+    unsigned int	__ebp;
+    unsigned int	__esp;
+    unsigned int	__ss;
+    unsigned int	__eflags;
+    unsigned int	__eip;
+    unsigned int	__cs;
+    unsigned int	__ds;
+    unsigned int	__es;
+    unsigned int	__fs;
+    unsigned int	__gs;
+};
+#else /* !__DARWIN_UNIX03 */
+#define	_STRUCT_X86_THREAD_STATE32	struct i386_thread_state
+_STRUCT_X86_THREAD_STATE32
+{
+    unsigned int	eax;
+    unsigned int	ebx;
+    unsigned int	ecx;
+    unsigned int	edx;
+    unsigned int	edi;
+    unsigned int	esi;
+    unsigned int	ebp;
+    unsigned int	esp;
+    unsigned int	ss;
+    unsigned int	eflags;
+    unsigned int	eip;
+    unsigned int	cs;
+    unsigned int	ds;
+    unsigned int	es;
+    unsigned int	fs;
+    unsigned int	gs;
+};
+#endif /* !__DARWIN_UNIX03 */
+
+/* This structure should be double-word aligned for performance */
+
+#if __DARWIN_UNIX03
+#define _STRUCT_FP_CONTROL	struct __darwin_fp_control
+_STRUCT_FP_CONTROL
+{
+    unsigned short		__invalid	:1,
+    				__denorm	:1,
+				__zdiv		:1,
+				__ovrfl		:1,
+				__undfl		:1,
+				__precis	:1,
+						:2,
+				__pc		:2,
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define FP_PREC_24B		0
+#define	FP_PREC_53B		2
+#define FP_PREC_64B		3
+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
+				__rc		:2,
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define FP_RND_NEAR		0
+#define FP_RND_DOWN		1
+#define FP_RND_UP		2
+#define FP_CHOP			3
+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
+					/*inf*/	:1,
+						:3;
+};
+typedef _STRUCT_FP_CONTROL	__darwin_fp_control_t;
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_FP_CONTROL	struct fp_control
+_STRUCT_FP_CONTROL
+{
+    unsigned short		invalid	:1,
+    				denorm	:1,
+				zdiv	:1,
+				ovrfl	:1,
+				undfl	:1,
+				precis	:1,
+					:2,
+				pc	:2,
+#define FP_PREC_24B		0
+#define	FP_PREC_53B		2
+#define FP_PREC_64B		3
+				rc	:2,
+#define FP_RND_NEAR		0
+#define FP_RND_DOWN		1
+#define FP_RND_UP		2
+#define FP_CHOP			3
+				/*inf*/	:1,
+					:3;
+};
+typedef _STRUCT_FP_CONTROL	fp_control_t;
+#endif /* !__DARWIN_UNIX03 */
+
+/*
+ * Status word.
+ */
+
+#if __DARWIN_UNIX03
+#define _STRUCT_FP_STATUS	struct __darwin_fp_status
+_STRUCT_FP_STATUS
+{
+    unsigned short		__invalid	:1,
+    				__denorm	:1,
+				__zdiv		:1,
+				__ovrfl		:1,
+				__undfl		:1,
+				__precis	:1,
+				__stkflt	:1,
+				__errsumm	:1,
+				__c0		:1,
+				__c1		:1,
+				__c2		:1,
+				__tos		:3,
+				__c3		:1,
+				__busy		:1;
+};
+typedef _STRUCT_FP_STATUS	__darwin_fp_status_t;
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_FP_STATUS	struct fp_status
+_STRUCT_FP_STATUS
+{
+    unsigned short		invalid	:1,
+    				denorm	:1,
+				zdiv	:1,
+				ovrfl	:1,
+				undfl	:1,
+				precis	:1,
+				stkflt	:1,
+				errsumm	:1,
+				c0	:1,
+				c1	:1,
+				c2	:1,
+				tos	:3,
+				c3	:1,
+				busy	:1;
+};
+typedef _STRUCT_FP_STATUS	fp_status_t;
+#endif /* !__DARWIN_UNIX03 */
+				
+/* defn of 80bit x87 FPU or MMX register  */
+
+#if __DARWIN_UNIX03
+#define _STRUCT_MMST_REG	struct __darwin_mmst_reg
+_STRUCT_MMST_REG
+{
+	char	__mmst_reg[10];
+	char	__mmst_rsrv[6];
+};
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_MMST_REG	struct mmst_reg
+_STRUCT_MMST_REG
+{
+	char	mmst_reg[10];
+	char	mmst_rsrv[6];
+};
+#endif /* !__DARWIN_UNIX03 */
+
+
+/* defn of 128 bit XMM regs */
+
+#if __DARWIN_UNIX03
+#define _STRUCT_XMM_REG		struct __darwin_xmm_reg
+_STRUCT_XMM_REG
+{
+	char		__xmm_reg[16];
+};
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_XMM_REG		struct xmm_reg
+_STRUCT_XMM_REG
+{
+	char		xmm_reg[16];
+};
+#endif /* !__DARWIN_UNIX03 */
+
+/* 
+ * Floating point state.
+ */
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define FP_STATE_BYTES		512	/* number of chars worth of data from fpu_fcw */
+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
+
+#if __DARWIN_UNIX03
+#define	_STRUCT_X86_FLOAT_STATE32	struct __darwin_i386_float_state
+_STRUCT_X86_FLOAT_STATE32
+{
+	int 			__fpu_reserved[2];
+	_STRUCT_FP_CONTROL	__fpu_fcw;		/* x87 FPU control word */
+	_STRUCT_FP_STATUS	__fpu_fsw;		/* x87 FPU status word */
+	__uint8_t		__fpu_ftw;		/* x87 FPU tag word */
+	__uint8_t		__fpu_rsrv1;		/* reserved */ 
+	__uint16_t		__fpu_fop;		/* x87 FPU Opcode */
+	__uint32_t		__fpu_ip;		/* x87 FPU Instruction Pointer offset */
+	__uint16_t		__fpu_cs;		/* x87 FPU Instruction Pointer Selector */
+	__uint16_t		__fpu_rsrv2;		/* reserved */
+	__uint32_t		__fpu_dp;		/* x87 FPU Instruction Operand(Data) Pointer offset */
+	__uint16_t		__fpu_ds;		/* x87 FPU Instruction Operand(Data) Pointer Selector */
+	__uint16_t		__fpu_rsrv3;		/* reserved */
+	__uint32_t		__fpu_mxcsr;		/* MXCSR Register state */
+	__uint32_t		__fpu_mxcsrmask;	/* MXCSR mask */
+	_STRUCT_MMST_REG	__fpu_stmm0;		/* ST0/MM0   */
+	_STRUCT_MMST_REG	__fpu_stmm1;		/* ST1/MM1  */
+	_STRUCT_MMST_REG	__fpu_stmm2;		/* ST2/MM2  */
+	_STRUCT_MMST_REG	__fpu_stmm3;		/* ST3/MM3  */
+	_STRUCT_MMST_REG	__fpu_stmm4;		/* ST4/MM4  */
+	_STRUCT_MMST_REG	__fpu_stmm5;		/* ST5/MM5  */
+	_STRUCT_MMST_REG	__fpu_stmm6;		/* ST6/MM6  */
+	_STRUCT_MMST_REG	__fpu_stmm7;		/* ST7/MM7  */
+	_STRUCT_XMM_REG		__fpu_xmm0;		/* XMM 0  */
+	_STRUCT_XMM_REG		__fpu_xmm1;		/* XMM 1  */
+	_STRUCT_XMM_REG		__fpu_xmm2;		/* XMM 2  */
+	_STRUCT_XMM_REG		__fpu_xmm3;		/* XMM 3  */
+	_STRUCT_XMM_REG		__fpu_xmm4;		/* XMM 4  */
+	_STRUCT_XMM_REG		__fpu_xmm5;		/* XMM 5  */
+	_STRUCT_XMM_REG		__fpu_xmm6;		/* XMM 6  */
+	_STRUCT_XMM_REG		__fpu_xmm7;		/* XMM 7  */
+	char			__fpu_rsrv4[14*16];	/* reserved */
+	int 			__fpu_reserved1;
+};
+#else /* !__DARWIN_UNIX03 */
+#define	_STRUCT_X86_FLOAT_STATE32	struct i386_float_state
+_STRUCT_X86_FLOAT_STATE32
+{
+	int 			fpu_reserved[2];
+	_STRUCT_FP_CONTROL	fpu_fcw;		/* x87 FPU control word */
+	_STRUCT_FP_STATUS	fpu_fsw;		/* x87 FPU status word */
+	__uint8_t		fpu_ftw;		/* x87 FPU tag word */
+	__uint8_t		fpu_rsrv1;		/* reserved */ 
+	__uint16_t		fpu_fop;		/* x87 FPU Opcode */
+	__uint32_t		fpu_ip;			/* x87 FPU Instruction Pointer offset */
+	__uint16_t		fpu_cs;			/* x87 FPU Instruction Pointer Selector */
+	__uint16_t		fpu_rsrv2;		/* reserved */
+	__uint32_t		fpu_dp;			/* x87 FPU Instruction Operand(Data) Pointer offset */
+	__uint16_t		fpu_ds;			/* x87 FPU Instruction Operand(Data) Pointer Selector */
+	__uint16_t		fpu_rsrv3;		/* reserved */
+	__uint32_t		fpu_mxcsr;		/* MXCSR Register state */
+	__uint32_t		fpu_mxcsrmask;		/* MXCSR mask */
+	_STRUCT_MMST_REG	fpu_stmm0;		/* ST0/MM0   */
+	_STRUCT_MMST_REG	fpu_stmm1;		/* ST1/MM1  */
+	_STRUCT_MMST_REG	fpu_stmm2;		/* ST2/MM2  */
+	_STRUCT_MMST_REG	fpu_stmm3;		/* ST3/MM3  */
+	_STRUCT_MMST_REG	fpu_stmm4;		/* ST4/MM4  */
+	_STRUCT_MMST_REG	fpu_stmm5;		/* ST5/MM5  */
+	_STRUCT_MMST_REG	fpu_stmm6;		/* ST6/MM6  */
+	_STRUCT_MMST_REG	fpu_stmm7;		/* ST7/MM7  */
+	_STRUCT_XMM_REG		fpu_xmm0;		/* XMM 0  */
+	_STRUCT_XMM_REG		fpu_xmm1;		/* XMM 1  */
+	_STRUCT_XMM_REG		fpu_xmm2;		/* XMM 2  */
+	_STRUCT_XMM_REG		fpu_xmm3;		/* XMM 3  */
+	_STRUCT_XMM_REG		fpu_xmm4;		/* XMM 4  */
+	_STRUCT_XMM_REG		fpu_xmm5;		/* XMM 5  */
+	_STRUCT_XMM_REG		fpu_xmm6;		/* XMM 6  */
+	_STRUCT_XMM_REG		fpu_xmm7;		/* XMM 7  */
+	char			fpu_rsrv4[14*16];	/* reserved */
+	int 			fpu_reserved1;
+};
+#endif /* !__DARWIN_UNIX03 */
+
+#if __DARWIN_UNIX03
+#define _STRUCT_X86_EXCEPTION_STATE32	struct __darwin_i386_exception_state
+_STRUCT_X86_EXCEPTION_STATE32
+{
+    unsigned int	__trapno;
+    unsigned int	__err;
+    unsigned int	__faultvaddr;
+};
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_X86_EXCEPTION_STATE32	struct i386_exception_state
+_STRUCT_X86_EXCEPTION_STATE32
+{
+    unsigned int	trapno;
+    unsigned int	err;
+    unsigned int	faultvaddr;
+};
+#endif /* !__DARWIN_UNIX03 */
+
+#if __DARWIN_UNIX03
+#define _STRUCT_X86_DEBUG_STATE32	struct __darwin_x86_debug_state32
+_STRUCT_X86_DEBUG_STATE32
+{
+	unsigned int	__dr0;
+	unsigned int	__dr1;
+	unsigned int	__dr2;
+	unsigned int	__dr3;
+	unsigned int	__dr4;
+	unsigned int	__dr5;
+	unsigned int	__dr6;
+	unsigned int	__dr7;
+};
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_X86_DEBUG_STATE32	struct x86_debug_state32
+_STRUCT_X86_DEBUG_STATE32
+{
+	unsigned int	dr0;
+	unsigned int	dr1;
+	unsigned int	dr2;
+	unsigned int	dr3;
+	unsigned int	dr4;
+	unsigned int	dr5;
+	unsigned int	dr6;
+	unsigned int	dr7;
+};
+#endif /* !__DARWIN_UNIX03 */
+
+/*
+ * 64 bit versions of the above
+ */
+
+#if __DARWIN_UNIX03
+#define	_STRUCT_X86_THREAD_STATE64	struct __darwin_x86_thread_state64
+_STRUCT_X86_THREAD_STATE64
+{
+	__uint64_t	__rax;
+	__uint64_t	__rbx;
+	__uint64_t	__rcx;
+	__uint64_t	__rdx;
+	__uint64_t	__rdi;
+	__uint64_t	__rsi;
+	__uint64_t	__rbp;
+	__uint64_t	__rsp;
+	__uint64_t	__r8;
+	__uint64_t	__r9;
+	__uint64_t	__r10;
+	__uint64_t	__r11;
+	__uint64_t	__r12;
+	__uint64_t	__r13;
+	__uint64_t	__r14;
+	__uint64_t	__r15;
+	__uint64_t	__rip;
+	__uint64_t	__rflags;
+	__uint64_t	__cs;
+	__uint64_t	__fs;
+	__uint64_t	__gs;
+};
+#else /* !__DARWIN_UNIX03 */
+#define	_STRUCT_X86_THREAD_STATE64	struct x86_thread_state64
+_STRUCT_X86_THREAD_STATE64
+{
+	__uint64_t	rax;
+	__uint64_t	rbx;
+	__uint64_t	rcx;
+	__uint64_t	rdx;
+	__uint64_t	rdi;
+	__uint64_t	rsi;
+	__uint64_t	rbp;
+	__uint64_t	rsp;
+	__uint64_t	r8;
+	__uint64_t	r9;
+	__uint64_t	r10;
+	__uint64_t	r11;
+	__uint64_t	r12;
+	__uint64_t	r13;
+	__uint64_t	r14;
+	__uint64_t	r15;
+	__uint64_t	rip;
+	__uint64_t	rflags;
+	__uint64_t	cs;
+	__uint64_t	fs;
+	__uint64_t	gs;
+};
+#endif /* !__DARWIN_UNIX03 */
+
+
+#if __DARWIN_UNIX03
+#define	_STRUCT_X86_FLOAT_STATE64	struct __darwin_x86_float_state64
+_STRUCT_X86_FLOAT_STATE64
+{
+	int 			__fpu_reserved[2];
+	_STRUCT_FP_CONTROL	__fpu_fcw;		/* x87 FPU control word */
+	_STRUCT_FP_STATUS	__fpu_fsw;		/* x87 FPU status word */
+	__uint8_t		__fpu_ftw;		/* x87 FPU tag word */
+	__uint8_t		__fpu_rsrv1;		/* reserved */ 
+	__uint16_t		__fpu_fop;		/* x87 FPU Opcode */
+
+	/* x87 FPU Instruction Pointer */
+	__uint32_t		__fpu_ip;		/* offset */
+	__uint16_t		__fpu_cs;		/* Selector */
+
+	__uint16_t		__fpu_rsrv2;		/* reserved */
+
+	/* x87 FPU Instruction Operand(Data) Pointer */
+	__uint32_t		__fpu_dp;		/* offset */
+	__uint16_t		__fpu_ds;		/* Selector */
+
+	__uint16_t		__fpu_rsrv3;		/* reserved */
+	__uint32_t		__fpu_mxcsr;		/* MXCSR Register state */
+	__uint32_t		__fpu_mxcsrmask;	/* MXCSR mask */
+	_STRUCT_MMST_REG	__fpu_stmm0;		/* ST0/MM0   */
+	_STRUCT_MMST_REG	__fpu_stmm1;		/* ST1/MM1  */
+	_STRUCT_MMST_REG	__fpu_stmm2;		/* ST2/MM2  */
+	_STRUCT_MMST_REG	__fpu_stmm3;		/* ST3/MM3  */
+	_STRUCT_MMST_REG	__fpu_stmm4;		/* ST4/MM4  */
+	_STRUCT_MMST_REG	__fpu_stmm5;		/* ST5/MM5  */
+	_STRUCT_MMST_REG	__fpu_stmm6;		/* ST6/MM6  */
+	_STRUCT_MMST_REG	__fpu_stmm7;		/* ST7/MM7  */
+	_STRUCT_XMM_REG		__fpu_xmm0;		/* XMM 0  */
+	_STRUCT_XMM_REG		__fpu_xmm1;		/* XMM 1  */
+	_STRUCT_XMM_REG		__fpu_xmm2;		/* XMM 2  */
+	_STRUCT_XMM_REG		__fpu_xmm3;		/* XMM 3  */
+	_STRUCT_XMM_REG		__fpu_xmm4;		/* XMM 4  */
+	_STRUCT_XMM_REG		__fpu_xmm5;		/* XMM 5  */
+	_STRUCT_XMM_REG		__fpu_xmm6;		/* XMM 6  */
+	_STRUCT_XMM_REG		__fpu_xmm7;		/* XMM 7  */
+	_STRUCT_XMM_REG		__fpu_xmm8;		/* XMM 8  */
+	_STRUCT_XMM_REG		__fpu_xmm9;		/* XMM 9  */
+	_STRUCT_XMM_REG		__fpu_xmm10;		/* XMM 10  */
+	_STRUCT_XMM_REG		__fpu_xmm11;		/* XMM 11 */
+	_STRUCT_XMM_REG		__fpu_xmm12;		/* XMM 12  */
+	_STRUCT_XMM_REG		__fpu_xmm13;		/* XMM 13  */
+	_STRUCT_XMM_REG		__fpu_xmm14;		/* XMM 14  */
+	_STRUCT_XMM_REG		__fpu_xmm15;		/* XMM 15  */
+	char			__fpu_rsrv4[6*16];	/* reserved */
+	int 			__fpu_reserved1;
+};
+#else /* !__DARWIN_UNIX03 */
+#define	_STRUCT_X86_FLOAT_STATE64	struct x86_float_state64
+_STRUCT_X86_FLOAT_STATE64
+{
+	int 			fpu_reserved[2];
+	_STRUCT_FP_CONTROL	fpu_fcw;		/* x87 FPU control word */
+	_STRUCT_FP_STATUS	fpu_fsw;		/* x87 FPU status word */
+	__uint8_t		fpu_ftw;		/* x87 FPU tag word */
+	__uint8_t		fpu_rsrv1;		/* reserved */ 
+	__uint16_t		fpu_fop;		/* x87 FPU Opcode */
+
+	/* x87 FPU Instruction Pointer */
+	__uint32_t		fpu_ip;			/* offset */
+	__uint16_t		fpu_cs;			/* Selector */
+
+	__uint16_t		fpu_rsrv2;		/* reserved */
+
+	/* x87 FPU Instruction Operand(Data) Pointer */
+	__uint32_t		fpu_dp;			/* offset */
+	__uint16_t		fpu_ds;			/* Selector */
+
+	__uint16_t		fpu_rsrv3;		/* reserved */
+	__uint32_t		fpu_mxcsr;		/* MXCSR Register state */
+	__uint32_t		fpu_mxcsrmask;		/* MXCSR mask */
+	_STRUCT_MMST_REG	fpu_stmm0;		/* ST0/MM0   */
+	_STRUCT_MMST_REG	fpu_stmm1;		/* ST1/MM1  */
+	_STRUCT_MMST_REG	fpu_stmm2;		/* ST2/MM2  */
+	_STRUCT_MMST_REG	fpu_stmm3;		/* ST3/MM3  */
+	_STRUCT_MMST_REG	fpu_stmm4;		/* ST4/MM4  */
+	_STRUCT_MMST_REG	fpu_stmm5;		/* ST5/MM5  */
+	_STRUCT_MMST_REG	fpu_stmm6;		/* ST6/MM6  */
+	_STRUCT_MMST_REG	fpu_stmm7;		/* ST7/MM7  */
+	_STRUCT_XMM_REG		fpu_xmm0;		/* XMM 0  */
+	_STRUCT_XMM_REG		fpu_xmm1;		/* XMM 1  */
+	_STRUCT_XMM_REG		fpu_xmm2;		/* XMM 2  */
+	_STRUCT_XMM_REG		fpu_xmm3;		/* XMM 3  */
+	_STRUCT_XMM_REG		fpu_xmm4;		/* XMM 4  */
+	_STRUCT_XMM_REG		fpu_xmm5;		/* XMM 5  */
+	_STRUCT_XMM_REG		fpu_xmm6;		/* XMM 6  */
+	_STRUCT_XMM_REG		fpu_xmm7;		/* XMM 7  */
+	_STRUCT_XMM_REG		fpu_xmm8;		/* XMM 8  */
+	_STRUCT_XMM_REG		fpu_xmm9;		/* XMM 9  */
+	_STRUCT_XMM_REG		fpu_xmm10;		/* XMM 10  */
+	_STRUCT_XMM_REG		fpu_xmm11;		/* XMM 11 */
+	_STRUCT_XMM_REG		fpu_xmm12;		/* XMM 12  */
+	_STRUCT_XMM_REG		fpu_xmm13;		/* XMM 13  */
+	_STRUCT_XMM_REG		fpu_xmm14;		/* XMM 14  */
+	_STRUCT_XMM_REG		fpu_xmm15;		/* XMM 15  */
+	char			fpu_rsrv4[6*16];	/* reserved */
+	int 			fpu_reserved1;
+};
+#endif /* !__DARWIN_UNIX03 */
+
+#if __DARWIN_UNIX03
+#define _STRUCT_X86_EXCEPTION_STATE64	struct __darwin_x86_exception_state64
+_STRUCT_X86_EXCEPTION_STATE64
+{
+    unsigned int	__trapno;
+    unsigned int	__err;
+    __uint64_t		__faultvaddr;
+};
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_X86_EXCEPTION_STATE64	struct x86_exception_state64
+_STRUCT_X86_EXCEPTION_STATE64
+{
+    unsigned int	trapno;
+    unsigned int	err;
+    __uint64_t		faultvaddr;
+};
+#endif /* !__DARWIN_UNIX03 */
+
+#if __DARWIN_UNIX03
+#define _STRUCT_X86_DEBUG_STATE64	struct __darwin_x86_debug_state64
+_STRUCT_X86_DEBUG_STATE64
+{
+	__uint64_t	__dr0;
+	__uint64_t	__dr1;
+	__uint64_t	__dr2;
+	__uint64_t	__dr3;
+	__uint64_t	__dr4;
+	__uint64_t	__dr5;
+	__uint64_t	__dr6;
+	__uint64_t	__dr7;
+};
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_X86_DEBUG_STATE64	struct x86_debug_state64
+_STRUCT_X86_DEBUG_STATE64
+{
+	__uint64_t	dr0;
+	__uint64_t	dr1;
+	__uint64_t	dr2;
+	__uint64_t	dr3;
+	__uint64_t	dr4;
+	__uint64_t	dr5;
+	__uint64_t	dr6;
+	__uint64_t	dr7;
+};
+#endif /* !__DARWIN_UNIX03 */
+
+#endif /* _MACH_I386__STRUCTS_H_ */
diff --git a/i386/include/mach/i386/asm.h b/i386/include/mach/i386/asm.h
new file mode 100644
index 0000000..02a5620
--- /dev/null
+++ b/i386/include/mach/i386/asm.h
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+
+#ifndef	_I386_ASM_H_
+#define	_I386_ASM_H_
+
+#ifdef _KERNEL
+#include <gprof.h>
+#endif	/* _KERNEL */
+
+#ifdef MACH_KERNEL
+#include <mach_kdb.h>
+#else	/* !MACH_KERNEL */
+#define	MACH_KDB 0
+#endif	/* !MACH_KERNEL */
+
+
+#if	defined(MACH_KERNEL) || defined(_KERNEL)
+#include <gprof.h>
+#endif	/* MACH_KERNEL || _KERNEL */
+
+#if defined(__i386__)
+
+#define S_PC	 (%esp)
+#define S_ARG0	 4(%esp)
+#define S_ARG1	 8(%esp)
+#define S_ARG2	12(%esp)
+#define S_ARG3	16(%esp)
+#define S_ARG4	20(%esp)
+
+#define FRAME	pushl %ebp; movl %esp, %ebp
+#define EMARF	leave
+
+#define B_LINK	 (%ebp)
+#define B_PC	 4(%ebp)
+#define B_ARG0	 8(%ebp)
+#define B_ARG1	12(%ebp)
+#define B_ARG2	16(%ebp)
+#define B_ARG3	20(%ebp)
+
+#elif defined(__x86_64__)
+
+#define S_PC	 (%rsp)
+
+#define FRAME	pushq %rbp; movq %rsp, %rbp
+#define EMARF	leave
+
+#define B_LINK	 (%rbp)
+#define B_PC	 8(%rbp)
+
+#else
+#error unsupported architecture
+#endif
+
+/* There is another definition of ALIGN for .c sources */
+#ifdef ASSEMBLER
+#define ALIGN 4,0x90
+#endif /* ASSEMBLER */
+
+#ifndef FALIGN
+#define FALIGN ALIGN
+#endif
+
+#define LB(x,n) n
+#if	__STDC__
+#ifndef __NO_UNDERSCORES__
+#define	LCL(x)	L ## x
+#define EXT(x) _ ## x
+#define LEXT(x) _ ## x ## :
+#else
+#define	LCL(x)	.L ## x
+#define EXT(x) x
+#define LEXT(x) x ## :
+#endif
+#define LBc(x,n) n ## :
+#define LBb(x,n) n ## b
+#define LBf(x,n) n ## f
+#else /* __STDC__ */
+#ifndef __NO_UNDERSCORES__
+#define LCL(x) L/**/x
+#define EXT(x) _/**/x
+#define LEXT(x) _/**/x/**/:
+#else /* __NO_UNDERSCORES__ */
+#define	LCL(x)	.L/**/x
+#define EXT(x) x
+#define LEXT(x) x/**/:
+#endif /* __NO_UNDERSCORES__ */
+#define LBc(x,n) n/**/:
+#define LBb(x,n) n/**/b
+#define LBf(x,n) n/**/f
+#endif /* __STDC__ */
+
+#define SVC .byte 0x9a; .long 0; .word 0x7
+
+#define RPC_SVC .byte 0x9a; .long 0; .word 0xf
+
+#define String	.asciz
+#define Value	.word
+#define Times(a,b) (a*b)
+#define Divide(a,b) (a/b)
+
+#define INB	inb	%dx, %al
+#define OUTB	outb	%al, %dx
+#define INL	inl	%dx, %eax
+#define OUTL	outl	%eax, %dx
+
+#define data16	.byte 0x66
+#define addr16	.byte 0x67
+
+#if !GPROF
+#define MCOUNT
+
+#elif defined(__SHARED__)
+#define MCOUNT		; .data;\
+			.align ALIGN;\
+			LBc(x, 8) .long 0;\
+			.text;\
+			Gpush;\
+			Gload;\
+			leal Gotoff(LBb(x,8)),%edx;\
+			Egaddr(%eax,_mcount_ptr);\
+			Gpop;\
+			call *(%eax);
+
+#else	/* !GPROF, !__SHARED__ */
+#define MCOUNT		; call mcount;
+#endif /* GPROF */
+
+#ifdef __ELF__
+#define ELF_FUNC(x)	.type x,@function
+#define ELF_DATA(x)	.type x,@object
+#define ELF_SIZE(x,s)	.size x,s
+#else
+#define ELF_FUNC(x)
+#define ELF_DATA(x)
+#define ELF_SIZE(x,s)
+#endif
+
+#define	Entry(x)	.globl EXT(x); ELF_FUNC(EXT(x)); .align FALIGN; LEXT(x)
+#define	ENTRY(x)	Entry(x) MCOUNT
+#define	ENTRY2(x,y)	.globl EXT(x); .globl EXT(y); \
+			ELF_FUNC(EXT(x)); ELF_FUNC(EXT(y)); \
+			.align FALIGN; LEXT(x); LEXT(y) \
+			MCOUNT
+#if __STDC__
+#define	ASENTRY(x) 	.globl x; .align FALIGN; x ## : ELF_FUNC(x) MCOUNT
+#else
+#define	ASENTRY(x) 	.globl x; .align FALIGN; x: ELF_FUNC(x) MCOUNT
+#endif /* __STDC__ */
+
+#define	DATA(x)		.globl EXT(x); ELF_DATA(EXT(x)); .align ALIGN; LEXT(x)
+
+#define End(x)		ELF_SIZE(x,.-x)
+#define END(x)		End(EXT(x))
+#define ENDDATA(x)	END(x)
+#define Enddata(x)	End(x)
+
+/*
+ * ELF shared library accessor macros.
+ * Gpush saves the %ebx register used for the GOT address
+ * Gpop pops %ebx if we need a GOT
+ * Gload loads %ebx with the GOT address if shared libraries are used
+ * Gcall calls an external function.
+ * Gotoff allows you to reference local labels.
+ * Gotoff2 allows you to reference local labels with an index reg.
+ * Gotoff3 allows you to reference local labels with an index reg & size.
+ * Gaddr loads up a register with an address of an external item.
+ * Gstack is the number of bytes that Gpush pushes on the stack.
+ *
+ * Varients of the above with E or L prefixes do EXT(name) or LCL(name)
+ * respectively.
+ */
+
+#ifndef __SHARED__
+#define Gpush
+#define Gpop
+#define Gload
+#define Gcall(func)		call func
+#define Gotoff(lab)		lab
+#define Gotoff2(l,r)		l(r)
+#define Gotoff3(l,r,s)		l(,r,s)
+#define Gaddr(to,lab)		movl $lab,to
+#define Gcmp(lab,reg)		cmpl $lab,reg
+#define Gmemload(lab,reg)	movl lab,reg
+#define Gmemstore(reg,lab,tmp)	movl reg,lab
+#define Gstack			0
+
+#else
+#ifdef __ELF__			/* ELF shared libraries */
+#define Gpush			pushl %ebx
+#define Gpop			popl %ebx
+#define Gload			call 9f; 9: popl %ebx; addl $_GLOBAL_OFFSET_TABLE_+[.-9b],%ebx
+#define Gcall(func)		call EXT(func)@PLT
+#define Gotoff(lab)		lab@GOTOFF(%ebx)
+#define Gotoff2(l,r)		l@GOTOFF(%ebx,r)
+#define Gotoff3(l,r,s)		l@GOTOFF(%ebx,r,s)
+#define Gaddr(to,lab)		movl lab@GOT(%ebx),to
+#define Gcmp(lab,reg)		cmpl reg,lab@GOT(%ebx)
+#define Gmemload(lab,reg)	movl lab@GOT(%ebx),reg; movl (reg),reg
+#define Gmemstore(reg,lab,tmp)	movl lab@GOT(%ebx),tmp; movl reg,(tmp)
+#define Gstack			4
+
+#else				/* ROSE shared libraries */
+#define Gpush
+#define Gpop
+#define Gload
+#define Gcall(func)		call *9f; .data; .align ALIGN; 9: .long func; .text
+#define Gotoff(lab)		lab
+#define Gotoff2(l,r)		l(r)
+#define Gotoff3(l,r,s)		l(,r,s)
+#define Gaddr(to,lab)		movl 9f,to; .data; .align ALIGN; 9: .long lab; .text
+#define Gcmp(lab,reg)		cmpl reg,9f; .data; .align ALIGN; 9: .long lab; .text
+#define Gmemload(lab,reg)	movl 9f,reg; movl (reg),reg; .data; .align ALIGN; 9: .long lab; .text
+#define Gmemstore(reg,lab,tmp)	movl 9f,tmp; movl reg,(tmp); .data; .align ALIGN; 9: .long lab; .text
+#define Gstack			0
+#endif	/* __ELF__ */
+#endif	/* __SHARED__ */
+
+/* Egotoff is not provided, since external symbols should not use @GOTOFF
+   relocations.  */
+#define Egcall(func)		Gcall(EXT(func))
+#define Egaddr(to,lab)		Gaddr(to,EXT(lab))
+#define Egcmp(lab,reg)		Gcmp(EXT(lab),reg)
+#define Egmemload(lab,reg)	Gmemload(EXT(lab),reg)
+#define Egmemstore(reg,lab,tmp)	Gmemstore(reg,EXT(lab),tmp)
+
+#define Lgotoff(lab)		Gotoff(LCL(lab))
+#define Lgotoff2(l,r)		Gotoff2(LCL(l),r)
+#define Lgotoff3(l,r,s)		Gotoff3(LCL(l),r,s)
+#define Lgcmp(lab,reg)		Gcmp(LCL(lab),reg)
+#define Lgmemload(lab,reg)	movl Lgotoff(lab),reg
+#define Lgmemstore(reg,lab,tmp)	movl reg,Lgotoff(lab)
+
+#ifdef ASSEMBLER
+#if	MACH_KDB
+#include <ddb/stab.h>
+/*
+ * This pseudo-assembler line is added so that there will be at least
+ *	one N_SO entry in the symbol stable to define the current file name.
+ */
+#endif	/* MACH_KDB */
+
+#else /* NOT ASSEMBLER */
+
+/* These defines are here for .c files that wish to reference global symbols
+ * within __asm__ statements. 
+ */
+#ifndef __NO_UNDERSCORES__
+#define CC_SYM_PREFIX "_"
+#else
+#define CC_SYM_PREFIX ""
+#endif /* __NO_UNDERSCORES__ */
+#endif /* ASSEMBLER */
+
+#endif /* _I386_ASM_H_ */
diff --git a/i386/include/mach/i386/boolean.h b/i386/include/mach/i386/boolean.h
new file mode 100644
index 0000000..100f7e7
--- /dev/null
+++ b/i386/include/mach/i386/boolean.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+/*
+ *	File:	boolean.h
+ *
+ *	Boolean type, for I386.
+ */
+
+#ifndef	_MACH_I386_BOOLEAN_H_
+#define _MACH_I386_BOOLEAN_H_
+
+#if defined(__x86_64__) && !defined(KERNEL)
+typedef unsigned int	boolean_t;
+#else
+typedef int		boolean_t;
+#endif
+
+#endif	/* _MACH_I386_BOOLEAN_H_ */
diff --git a/i386/include/mach/i386/exception.h b/i386/include/mach/i386/exception.h
new file mode 100644
index 0000000..77fe4e4
--- /dev/null
+++ b/i386/include/mach/i386/exception.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+#ifndef	_MACH_I386_EXCEPTION_H_
+#define _MACH_I386_EXCEPTION_H_
+
+/*
+ * No machine dependent types for the 80386
+ */
+
+#define	EXC_TYPES_COUNT	11	/* incl. illegal exception 0 */
+
+/*
+ *	Codes and subcodes for 80386 exceptions.
+ */
+
+#define EXCEPTION_CODE_MAX	2	/* currently code and subcode */
+
+/*
+ *	EXC_BAD_INSTRUCTION
+ */
+
+#define EXC_I386_INVOP			1
+
+/*
+ *	EXC_ARITHMETIC
+ */
+
+#define EXC_I386_DIV			1
+#define EXC_I386_INTO			2
+#define EXC_I386_NOEXT			3
+#define EXC_I386_EXTOVR			4
+#define EXC_I386_EXTERR			5
+#define EXC_I386_EMERR			6
+#define EXC_I386_BOUND			7
+#define EXC_I386_SSEEXTERR              8
+
+/*
+ *	EXC_SOFTWARE
+ *	Note: 0x10000-0x10003 in use for unix signal
+ */
+
+/*
+ *	EXC_BAD_ACCESS
+ */
+
+/*
+ *	EXC_BREAKPOINT
+ */
+
+#define EXC_I386_SGL			1
+#define EXC_I386_BPT			2
+
+#define EXC_I386_DIVERR		0	/* divide by 0 eprror		*/
+#define EXC_I386_SGLSTP		1	/* single step			*/
+#define EXC_I386_NMIFLT		2	/* NMI				*/
+#define EXC_I386_BPTFLT		3	/* breakpoint fault		*/
+#define EXC_I386_INTOFLT	4	/* INTO overflow fault		*/
+#define EXC_I386_BOUNDFLT	5	/* BOUND instruction fault	*/
+#define EXC_I386_INVOPFLT	6	/* invalid opcode fault		*/
+#define EXC_I386_NOEXTFLT	7	/* extension not available fault*/
+#define EXC_I386_DBLFLT		8	/* double fault			*/
+#define EXC_I386_EXTOVRFLT	9	/* extension overrun fault	*/
+#define EXC_I386_INVTSSFLT	10	/* invalid TSS fault		*/
+#define EXC_I386_SEGNPFLT	11	/* segment not present fault	*/
+#define EXC_I386_STKFLT		12	/* stack fault			*/
+#define EXC_I386_GPFLT		13	/* general protection fault	*/
+#define EXC_I386_PGFLT		14	/* page fault			*/
+#define EXC_I386_EXTERRFLT	16	/* extension error fault	*/
+#define	EXC_I386_ALIGNFLT	17	/* Alignment fault */
+#define EXC_I386_ENDPERR	33	/* emulated extension error flt	*/
+#define EXC_I386_ENOEXTFLT	32	/* emulated ext not present	*/
+
+
+/*
+ *	machine dependent exception masks
+ */
+#define	EXC_MASK_MACHINE	0
+
+#endif	/* _MACH_I386_EXCEPTION_H_ */
diff --git a/i386/include/mach/i386/fp_reg.h b/i386/include/mach/i386/fp_reg.h
new file mode 100644
index 0000000..47a26a9
--- /dev/null
+++ b/i386/include/mach/i386/fp_reg.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1992-1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+#ifndef	_I386_FP_SAVE_H_
+#define	_I386_FP_SAVE_H_
+
+
+/* note when allocating this data structure, it must be 16 byte aligned. */
+struct x86_fx_save {
+        unsigned short  fx_control;     /* control */
+        unsigned short  fx_status;      /* status */
+        unsigned char  	fx_tag;         /* register tags */
+        unsigned char	fx_bbz1;	/* better be zero when calling fxrtstor */
+        unsigned short  fx_opcode;
+        unsigned int    fx_eip;         /* eip  instruction */
+        unsigned short  fx_cs;          /* cs instruction */
+        unsigned short  fx_bbz2;	/* better be zero when calling fxrtstor */ 
+        unsigned int    fx_dp;          /* data address */
+        unsigned short  fx_ds;          /* data segment */
+        unsigned short  fx_bbz3;	/* better be zero when calling fxrtstor */
+        unsigned int  	fx_MXCSR;
+        unsigned int  	fx_MXCSR_MASK;
+        unsigned short  fx_reg_word[8][8];      /* STx/MMx registers */
+        unsigned short  fx_XMM_reg[8][16];	/* XMM0-XMM15 on 64 bit processors */
+                                                /* XMM0-XMM7  on 32 bit processors... unused storage reserved */
+        unsigned char 	fx_reserved[16*6];	/* reserved by intel for future expansion */
+};
+
+
+/*
+ * Control register
+ */
+#define	FPC_IE		0x0001		/* enable invalid operation
+					   exception */
+#define FPC_IM		FPC_IE
+#define	FPC_DE		0x0002		/* enable denormalized operation
+					   exception */
+#define FPC_DM		FPC_DE
+#define	FPC_ZE		0x0004		/* enable zero-divide exception */
+#define FPC_ZM		FPC_ZE
+#define	FPC_OE		0x0008		/* enable overflow exception */
+#define FPC_OM		FPC_OE
+#define	FPC_UE		0x0010		/* enable underflow exception */
+#define	FPC_PE		0x0020		/* enable precision exception */
+#define	FPC_PC		0x0300		/* precision control: */
+#define	FPC_PC_24	0x0000			/* 24 bits */
+#define	FPC_PC_53	0x0200			/* 53 bits */
+#define	FPC_PC_64	0x0300			/* 64 bits */
+#define	FPC_RC		0x0c00		/* rounding control: */
+#define	FPC_RC_RN	0x0000			/* round to nearest or even */
+#define	FPC_RC_RD	0x0400			/* round down */
+#define	FPC_RC_RU	0x0800			/* round up */
+#define	FPC_RC_CHOP	0x0c00			/* chop */
+#define	FPC_IC		0x1000		/* infinity control (obsolete) */
+#define	FPC_IC_PROJ	0x0000			/* projective infinity */
+#define	FPC_IC_AFF	0x1000			/* affine infinity (std) */
+
+/*
+ * Status register
+ */
+#define	FPS_IE		0x0001		/* invalid operation */
+#define	FPS_DE		0x0002		/* denormalized operand */
+#define	FPS_ZE		0x0004		/* divide by zero */
+#define	FPS_OE		0x0008		/* overflow */
+#define	FPS_UE		0x0010		/* underflow */
+#define	FPS_PE		0x0020		/* precision */
+#define	FPS_SF		0x0040		/* stack flag */
+#define	FPS_ES		0x0080		/* error summary */
+#define	FPS_C0		0x0100		/* condition code bit 0 */
+#define	FPS_C1		0x0200		/* condition code bit 1 */
+#define	FPS_C2		0x0400		/* condition code bit 2 */
+#define	FPS_TOS		0x3800		/* top-of-stack pointer */
+#define	FPS_TOS_SHIFT	11
+#define	FPS_C3		0x4000		/* condition code bit 3 */
+#define	FPS_BUSY	0x8000		/* FPU busy */
+
+/*
+ * Kind of floating-point support provided by kernel.
+ */
+#define	FP_NO		0		/* no floating point */
+#define	FP_SOFT		1		/* software FP emulator */
+#define	FP_287		2		/* 80287 */
+#define	FP_387		3		/* 80387 or 80486 */
+#define FP_FXSR		4		/* Fast save/restore SIMD Extension */
+
+#endif	/* _I386_FP_SAVE_H_ */
diff --git a/i386/include/mach/i386/kern_return.h b/i386/include/mach/i386/kern_return.h
new file mode 100644
index 0000000..a9df708
--- /dev/null
+++ b/i386/include/mach/i386/kern_return.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+/*
+ *	File:	kern_return.h
+ *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
+ *	Date:	1985
+ *
+ *	Machine-dependent kernel return definitions.
+ */
+
+#ifndef	_MACH_I386_KERN_RETURN_H_
+#define _MACH_I386_KERN_RETURN_H_
+
+#ifndef	ASSEMBLER
+typedef	int		kern_return_t;
+#endif	/* ASSEMBLER */
+
+#endif	/* _MACH_I386_KERN_RETURN_H_ */
diff --git a/i386/include/mach/i386/machine_types.defs b/i386/include/mach/i386/machine_types.defs
new file mode 100644
index 0000000..6a35615
--- /dev/null
+++ b/i386/include/mach/i386/machine_types.defs
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+/*
+ *	Header file for basic, machine-dependent data types.  i386 version.
+ */
+
+#ifndef	_MACHINE_VM_TYPES_DEFS_
+#define	_MACHINE_VM_TYPES_DEFS_	1
+
+type short = int16_t;
+type int = int32_t;
+type unsigned = uint32_t;
+
+type float = MACH_MSG_TYPE_REAL_32;
+type double = MACH_MSG_TYPE_REAL_64;
+
+
+/* from ISO/IEC 988:1999 spec */
+/* 7.18.1.4 Integer types capable of hgolding object pointers */
+/*
+ * The [u]intptr_t types for the native
+ * integer type, e.g. 32 or 64 or.. whatever
+ * register size the machine has.  They are
+ * used for entities that might be either
+ * [unsigned] integers or pointers, and for
+ * type-casting between the two.
+ *
+ * For instance, the IPC system represents
+ * a port in user space as an integer and
+ * in kernel space as a pointer.
+ */
+#if defined(__LP64__)
+type uintptr_t = uint64_t;
+type intptr_t = int64_t;
+#else
+type uintptr_t = uint32_t;
+type intptr_t = int32_t;
+#endif
+
+/*
+ * These are the legacy Mach types that are
+ * the [rough] equivalents of the standards above.
+ * They were defined in terms of int, not
+ * long int, so they remain separate.
+ */
+#if defined(__LP64__)
+type register_t = int64_t;
+#else
+type register_t = int32_t;
+#endif
+type integer_t = int32_t;
+type natural_t = uint32_t;
+
+/*
+ * These are the VM types that scale with the address
+ * space size of a given process.
+ */
+
+#if defined(__LP64__)
+type vm_address_t = uint64_t;
+type vm_offset_t = uint64_t;
+type vm_size_t = uint64_t;
+#else
+type vm_address_t = natural_t;
+type vm_offset_t = natural_t;
+type vm_size_t = natural_t;
+#endif
+
+/*
+ * The mach_vm_xxx_t types are sized to hold the
+ * maximum pointer, offset, etc... supported on the
+ * platform.
+ */
+type mach_vm_address_t = uint64_t;
+type mach_vm_offset_t = uint64_t;
+type mach_vm_size_t = uint64_t;
+
+#if	MACH_IPC_COMPAT
+/*
+ * For the old IPC interface
+ */
+#define	MSG_TYPE_PORT_NAME	natural_t
+
+#endif	/* MACH_IPC_COMPAT */
+
+/*
+ * These are types used internal to Mach to implement the
+ * legacy 32-bit VM APIs published by the kernel.
+ */
+#define	VM32_SUPPORT	1
+
+type vm32_address_t = uint32_t;
+type vm32_offset_t = uint32_t;
+type vm32_size_t = uint32_t;
+
+#endif	/* _MACHINE_VM_TYPES_DEFS_ */
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/i386/ndr_def.h b/i386/include/mach/i386/ndr_def.h
new file mode 100644
index 0000000..5163f63
--- /dev/null
+++ b/i386/include/mach/i386/ndr_def.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+/* NDR record for Intel x86s */
+
+#include <mach/ndr.h>
+
+NDR_record_t NDR_record = {
+	0,			/* mig_reserved */
+	0,			/* mig_reserved */
+	0,			/* mig_reserved */
+	NDR_PROTOCOL_2_0,		
+	NDR_INT_LITTLE_ENDIAN,
+	NDR_CHAR_ASCII,
+	NDR_FLOAT_IEEE,
+	0,
+};
diff --git a/i386/include/mach/i386/processor_info.h b/i386/include/mach/i386/processor_info.h
new file mode 100644
index 0000000..8272c6d
--- /dev/null
+++ b/i386/include/mach/i386/processor_info.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ *	File:	mach/i386/processor_info.h
+ *
+ *	Data structure definitions for i386 specific processor control
+ */
+
+#ifndef	_MACH_I386_PROCESSOR_INFO_H_
+#define _MACH_I386_PROCESSOR_INFO_H_
+
+#endif	/* _MACH_I386_PROCESSOR_INFO_H_ */
diff --git a/i386/include/mach/i386/rpc.h b/i386/include/mach/i386/rpc.h
new file mode 100644
index 0000000..55561f9
--- /dev/null
+++ b/i386/include/mach/i386/rpc.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2002,2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+#ifndef	_MACH_I386_RPC_H_
+#define	_MACH_I386_RPC_H_
+
+#endif	/* _MACH_I386_RPC_H_ */
+
diff --git a/i386/include/mach/i386/sdt_isa.h b/i386/include/mach/i386/sdt_isa.h
new file mode 100644
index 0000000..7934a2c
--- /dev/null
+++ b/i386/include/mach/i386/sdt_isa.h
@@ -0,0 +1,412 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MACH_I386_SDT_ISA_H
+#define	_MACH_I386_SDT_ISA_H
+
+/*
+ * Only define when testing.  This makes the calls into actual calls to
+ * test functions.
+ */
+/* #define DTRACE_CALL_TEST */
+
+#define DTRACE_STRINGIFY(s) #s
+#define DTRACE_TOSTRING(s) DTRACE_STRINGIFY(s)
+#define DTRACE_LABEL(p, n)									\
+	"__dtrace_probe$" DTRACE_TOSTRING(__LINE__) DTRACE_STRINGIFY(_##p##___##n) ":"	"\n\t"
+
+#ifdef DTRACE_CALL_TEST
+
+#define DTRACE_CALL(p,n)	\
+	DTRACE_LABEL(p,n)	\
+	DTRACE_CALL_INSN(p,n)
+
+#else
+
+#define DTRACE_CALL(p,n)	\
+	DTRACE_LABEL(p,n)	\
+	DTRACE_NOPS
+
+#endif
+
+#ifdef __x86_64__
+
+#define DTRACE_NOPS			\
+	"nop"			"\n\t"	\
+	"nop"			"\n\t"	\
+	"nop"			"\n\t"	
+
+#define DTRACE_CALL_INSN(p,n)						\
+	"call _dtracetest" DTRACE_STRINGIFY(_##p##_##n)	"\n\t"
+
+#define ARG1_EXTENT	1
+#define ARGS2_EXTENT	2
+#define ARGS3_EXTENT	3
+#define ARGS4_EXTENT	4
+#define ARGS5_EXTENT	5
+#define ARGS6_EXTENT	6
+#define ARGS7_EXTENT	7
+#define ARGS8_EXTENT	8
+#define ARGS9_EXTENT	10	
+#define ARGS10_EXTENT	10	
+
+#define DTRACE_CALL0ARGS(provider, name)							\
+	asm volatile (										\
+		      DTRACE_CALL(provider, name)						\
+	);
+
+#define DTRACE_CALL1ARG(provider, name)								\
+	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
+		      DTRACE_CALL(provider, name)						\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "rdi"								\
+	);
+
+#define DTRACE_CALL2ARGS(provider, name)							\
+	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
+	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
+		      DTRACE_CALL(provider, name)						\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "rdi", "rsi"							\
+	);
+
+#define DTRACE_CALL3ARGS(provider, name)							\
+	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
+	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
+	              "movq\t0x10(%0),%%rdx"						"\n\t"	\
+		      DTRACE_CALL(provider, name)						\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "rdi", "rsi", "rdx"						\
+	);
+
+#define DTRACE_CALL4ARGS(provider, name)							\
+	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
+	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
+	              "movq\t0x10(%0),%%rdx"						"\n\t"	\
+	              "movq\t0x18(%0),%%rcx"						"\n\t"	\
+		      DTRACE_CALL(provider, name)						\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "rdi", "rsi", "rdx", "rcx"					\
+	);
+
+#define DTRACE_CALL5ARGS(provider, name)							\
+	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
+	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
+	              "movq\t0x10(%0),%%rdx"						"\n\t"	\
+	              "movq\t0x18(%0),%%rcx"						"\n\t"	\
+	              "movq\t0x20(%0),%%r8"						"\n\t"	\
+		      DTRACE_CALL(provider, name)						\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "rdi", "rsi", "rdx", "rcx", "r8"				\
+	);
+
+#define DTRACE_CALL6ARGS(provider, name)							\
+	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
+	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
+	              "movq\t0x10(%0),%%rdx"						"\n\t"	\
+	              "movq\t0x18(%0),%%rcx"						"\n\t"	\
+	              "movq\t0x20(%0),%%r8"						"\n\t"	\
+	              "movq\t0x28(%0),%%r9"						"\n\t"	\
+		      DTRACE_CALL(provider, name)						\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "rdi", "rsi", "rdx", "rcx", "r8", "r9"			\
+	);
+
+#define DTRACE_CALL7ARGS(provider, name)							\
+	asm volatile ("subq\t$0x8,%%rsp"						"\n\t"	\
+	              "movq\t0x0(%0),%%rdi"						"\n\t"	\
+	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
+	              "movq\t0x10(%0),%%rdx"						"\n\t"	\
+	              "movq\t0x18(%0),%%rcx"						"\n\t"	\
+	              "movq\t0x20(%0),%%r8"						"\n\t"	\
+	              "movq\t0x28(%0),%%r9"						"\n\t"	\
+	              "movq\t0x30(%0),%%rax"						"\n\t"	\
+	              "movq\t%%rax,0x0(%%rsp)"						"\n\t"	\
+		      DTRACE_CALL(provider, name)						\
+	              "addq\t$0x8,%%rsp"						"\n\t"	\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "rax"			\
+	);
+
+#endif // __x86_64__
+
+#ifdef __i386__
+
+#define DTRACE_NOPS			\
+	"nop"			"\n\t"	\
+	"leal 0(%%esi), %%esi"	"\n\t"	
+
+#define DTRACE_CALL_INSN(p,n)						\
+	"call _dtracetest" DTRACE_STRINGIFY(_##p##_##n)	"\n\t"
+
+#define ARG1_EXTENT	1
+#define ARGS2_EXTENT	2
+#define ARGS3_EXTENT	4
+#define ARGS4_EXTENT	4
+#define ARGS5_EXTENT	8
+#define ARGS6_EXTENT	8
+#define ARGS7_EXTENT	8
+#define ARGS8_EXTENT	8
+#define ARGS9_EXTENT	12	
+#define ARGS10_EXTENT	12	
+
+/*
+ * Because this code is used in the kernel, we must not touch any floating point
+ * or specialized registers. This leaves the following registers:
+ *
+ * eax ; volatile, safe to use
+ * ebx ; PIC register, gcc error when used
+ * ecx ; volatile, safe to use
+ * edx ; volatile, safe to use
+ * esi ; non-volatile, otherwise safe to use
+ * edi ; non-volatile, otherwise safe to use
+ *
+ * Using any of the non volatile register causes a spill to stack which is almost
+ * certainly a net performance loss. Also, note that the array ref (__dtrace_args)
+ * consumes one free register. If all three of the volatile regs are used for load/store,
+ * the compiler will spill a register to hold the array ref.
+ *
+ * The end result is that we only pipeline two loads/stores at a time. Blech.
+ */
+
+#define DTRACE_CALL0ARGS(provider, name)							\
+	asm volatile (										\
+	              DTRACE_CALL(provider, name)						\
+	              "# eat trailing nl +tabfrom DTRACE_CALL"					\
+	              :										\
+	              :										\
+	);
+
+#define DTRACE_CALL1ARG(provider, name)								\
+	asm volatile ("subl\t$0x10,%%esp"						"\n\t"	\
+	              "movl\t0x0(%0),%%eax"						"\n\t"	\
+	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
+	              DTRACE_CALL(provider, name)						\
+                      "addl\t$0x10,%%esp"							\
+	              :										\
+	              : "r" (__dtrace_args)		       					\
+	              : "memory", "eax"								\
+	);
+
+#define DTRACE_CALL2ARGS(provider, name)							\
+	asm volatile ("subl\t$0x10,%%esp"						"\n\t"	\
+	              "movl\t0x0(%0),%%eax"						"\n\t"	\
+		      "movl\t0x4(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
+	              DTRACE_CALL(provider, name)						\
+                      "addl\t$0x10,%%esp"							\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "eax", "edx"							\
+	);
+
+#define DTRACE_CALL3ARGS(provider, name)							\
+	asm volatile ("subl\t$0x10,%%esp"						"\n\t"	\
+	              "movl\t0x0(%0),%%eax"						"\n\t"	\
+		      "movl\t0x4(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
+	              "movl\t0x8(%0),%%eax"						"\n\t"	\
+	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
+	              DTRACE_CALL(provider, name)						\
+                      "addl\t$0x10,%%esp"							\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "eax", "edx"							\
+	);
+
+#define DTRACE_CALL4ARGS(provider, name)							\
+	asm volatile ("subl\t$0x10,%%esp"						"\n\t"	\
+	              "movl\t0x0(%0),%%eax"						"\n\t"	\
+		      "movl\t0x4(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
+	              "movl\t0x8(%0),%%eax"						"\n\t"	\
+		      "movl\t0xC(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
+	              DTRACE_CALL(provider, name)						\
+                      "addl\t$0x10,%%esp"							\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "eax", "edx"	       						\
+	);
+
+#define DTRACE_CALL5ARGS(provider, name)							\
+	asm volatile ("subl\t$0x20,%%esp"						"\n\t"	\
+	              "movl\t0x0(%0),%%eax"						"\n\t"	\
+		      "movl\t0x4(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
+	              "movl\t0x8(%0),%%eax"						"\n\t"	\
+		      "movl\t0xC(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
+	              "movl\t0x10(%0),%%eax"						"\n\t"	\
+	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
+	              DTRACE_CALL(provider, name)						\
+                      "addl\t$0x20,%%esp"							\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "eax", "edx"	       						\
+	);
+
+#define DTRACE_CALL6ARGS(provider, name)							\
+	asm volatile ("subl\t$0x20,%%esp"						"\n\t"	\
+	              "movl\t0x0(%0),%%eax"						"\n\t"	\
+		      "movl\t0x4(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
+	              "movl\t0x8(%0),%%eax"						"\n\t"	\
+		      "movl\t0xC(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
+	              "movl\t0x10(%0),%%eax"						"\n\t"	\
+		      "movl\t0x14(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x14(%%esp)"						"\n\t"	\
+	              DTRACE_CALL(provider, name)						\
+                      "addl\t$0x20,%%esp"							\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "eax", "edx"	       						\
+	);
+
+#define DTRACE_CALL7ARGS(provider, name)							\
+	asm volatile ("subl\t$0x20,%%esp"						"\n\t"	\
+	              "movl\t0x0(%0),%%eax"						"\n\t"	\
+		      "movl\t0x4(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
+	              "movl\t0x8(%0),%%eax"						"\n\t"	\
+		      "movl\t0xC(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
+	              "movl\t0x10(%0),%%eax"						"\n\t"	\
+		      "movl\t0x14(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x14(%%esp)"						"\n\t"	\
+	              "movl\t0x18(%0),%%eax"						"\n\t"	\
+	              "movl\t%%eax,0x18(%%esp)"						"\n\t"	\
+	              DTRACE_CALL(provider, name)						\
+                      "addl\t$0x20,%%esp"							\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "eax", "edx"	       						\
+	);
+
+#define DTRACE_CALL8ARGS(provider, name)							\
+	asm volatile ("subl\t$0x20,%%esp"						"\n\t"	\
+	              "movl\t0x0(%0),%%eax"						"\n\t"	\
+		      "movl\t0x4(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
+	              "movl\t0x8(%0),%%eax"						"\n\t"	\
+		      "movl\t0xC(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
+	              "movl\t0x10(%0),%%eax"						"\n\t"	\
+		      "movl\t0x14(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x14(%%esp)"						"\n\t"	\
+	              "movl\t0x18(%0),%%eax"						"\n\t"	\
+		      "movl\t0x1C(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x18(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x1C(%%esp)"						"\n\t"	\
+	              DTRACE_CALL(provider, name)						\
+                      "addl\t$0x20,%%esp"							\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "eax", "edx"	       						\
+	);
+
+#define DTRACE_CALL9ARGS(provider, name)							\
+	asm volatile ("subl\t$0x30,%%esp"						"\n\t"	\
+	              "movl\t0x0(%0),%%eax"						"\n\t"	\
+		      "movl\t0x4(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
+	              "movl\t0x8(%0),%%eax"						"\n\t"	\
+		      "movl\t0xC(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
+	              "movl\t0x10(%0),%%eax"						"\n\t"	\
+		      "movl\t0x14(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x14(%%esp)"						"\n\t"	\
+	              "movl\t0x18(%0),%%eax"						"\n\t"	\
+		      "movl\t0x1C(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x18(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x1C(%%esp)"						"\n\t"	\
+	              "movl\t0x20(%0),%%eax"						"\n\t"	\
+	              "movl\t%%eax,0x20(%%esp)"						"\n\t"	\
+	              DTRACE_CALL(provider, name)						\
+                      "addl\t$0x30,%%esp"							\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "eax", "edx"	       						\
+	);
+
+#define DTRACE_CALL10ARGS(provider, name)							\
+	asm volatile ("subl\t$0x30,%%esp"						"\n\t"	\
+	              "movl\t0x0(%0),%%eax"						"\n\t"	\
+		      "movl\t0x4(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
+	              "movl\t0x8(%0),%%eax"						"\n\t"	\
+		      "movl\t0xC(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
+	              "movl\t0x10(%0),%%eax"						"\n\t"	\
+		      "movl\t0x14(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x14(%%esp)"						"\n\t"	\
+	              "movl\t0x18(%0),%%eax"						"\n\t"	\
+		      "movl\t0x1C(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x18(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x1C(%%esp)"						"\n\t"	\
+	              "movl\t0x20(%0),%%eax"						"\n\t"	\
+		      "movl\t0x24(%0),%%edx"						"\n\t"	\
+	              "movl\t%%eax,0x20(%%esp)"						"\n\t"	\
+	              "movl\t%%edx,0x24(%%esp)"						"\n\t"	\
+	              DTRACE_CALL(provider, name)						\
+                      "addl\t$0x30,%%esp"							\
+	              :										\
+	              : "r" (__dtrace_args)							\
+	              : "memory", "eax", "edx"	       						\
+	);
+
+#endif // __i386__
+
+#endif	/* _MACH_I386_SDT_ISA_H */
diff --git a/i386/include/mach/i386/task.h b/i386/include/mach/i386/task.h
new file mode 100644
index 0000000..15c8248
--- /dev/null
+++ b/i386/include/mach/i386/task.h
@@ -0,0 +1,1578 @@
+#ifndef	_task_user_
+#define	_task_user_
+
+/* Module task */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	task_MSG_COUNT
+#define	task_MSG_COUNT	35
+#endif	/* task_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine task_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_create
+(
+	task_t target_task,
+	ledger_array_t ledgers,
+	mach_msg_type_number_t ledgersCnt,
+	boolean_t inherit_memory,
+	task_t *child_task
+);
+
+/* Routine task_terminate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_terminate
+(
+	task_t target_task
+);
+
+/* Routine task_threads */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_threads
+(
+	task_t target_task,
+	thread_act_array_t *act_list,
+	mach_msg_type_number_t *act_listCnt
+);
+
+/* Routine mach_ports_register */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_ports_register
+(
+	task_t target_task,
+	mach_port_array_t init_port_set,
+	mach_msg_type_number_t init_port_setCnt
+);
+
+/* Routine mach_ports_lookup */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_ports_lookup
+(
+	task_t target_task,
+	mach_port_array_t *init_port_set,
+	mach_msg_type_number_t *init_port_setCnt
+);
+
+/* Routine task_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_info
+(
+	task_name_t target_task,
+	task_flavor_t flavor,
+	task_info_t task_info_out,
+	mach_msg_type_number_t *task_info_outCnt
+);
+
+/* Routine task_set_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_info
+(
+	task_t target_task,
+	task_flavor_t flavor,
+	task_info_t task_info_in,
+	mach_msg_type_number_t task_info_inCnt
+);
+
+/* Routine task_suspend */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_suspend
+(
+	task_t target_task
+);
+
+/* Routine task_resume */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_resume
+(
+	task_t target_task
+);
+
+/* Routine task_get_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_special_port
+(
+	task_t task,
+	int which_port,
+	mach_port_t *special_port
+);
+
+/* Routine task_set_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_special_port
+(
+	task_t task,
+	int which_port,
+	mach_port_t special_port
+);
+
+/* Routine thread_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_create
+(
+	task_t parent_task,
+	thread_act_t *child_act
+);
+
+/* Routine thread_create_running */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_create_running
+(
+	task_t parent_task,
+	thread_state_flavor_t flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt,
+	thread_act_t *child_act
+);
+
+/* Routine task_set_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_exception_ports
+(
+	task_t task,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor
+);
+
+/* Routine task_get_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_exception_ports
+(
+	task_t task,
+	exception_mask_t exception_mask,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlers,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine task_swap_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_swap_exception_ports
+(
+	task_t task,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlerss,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine lock_set_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_set_create
+(
+	task_t task,
+	lock_set_t *new_lock_set,
+	int n_ulocks,
+	int policy
+);
+
+/* Routine lock_set_destroy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_set_destroy
+(
+	task_t task,
+	lock_set_t lock_set
+);
+
+/* Routine semaphore_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t semaphore_create
+(
+	task_t task,
+	semaphore_t *semaphore,
+	int policy,
+	int value
+);
+
+/* Routine semaphore_destroy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t semaphore_destroy
+(
+	task_t task,
+	semaphore_t semaphore
+);
+
+/* Routine task_policy_set */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_policy_set
+(
+	task_t task,
+	task_policy_flavor_t flavor,
+	task_policy_t policy_info,
+	mach_msg_type_number_t policy_infoCnt
+);
+
+/* Routine task_policy_get */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_policy_get
+(
+	task_t task,
+	task_policy_flavor_t flavor,
+	task_policy_t policy_info,
+	mach_msg_type_number_t *policy_infoCnt,
+	boolean_t *get_default
+);
+
+/* Routine task_sample */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_sample
+(
+	task_t task,
+	mach_port_t reply
+);
+
+/* Routine task_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_policy
+(
+	task_t task,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	boolean_t set_limit,
+	boolean_t change
+);
+
+/* Routine task_set_emulation */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_emulation
+(
+	task_t target_port,
+	vm_address_t routine_entry_pt,
+	int routine_number
+);
+
+/* Routine task_get_emulation_vector */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_emulation_vector
+(
+	task_t task,
+	int *vector_start,
+	emulation_vector_t *emulation_vector,
+	mach_msg_type_number_t *emulation_vectorCnt
+);
+
+/* Routine task_set_emulation_vector */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_emulation_vector
+(
+	task_t task,
+	int vector_start,
+	emulation_vector_t emulation_vector,
+	mach_msg_type_number_t emulation_vectorCnt
+);
+
+/* Routine task_set_ras_pc */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_ras_pc
+(
+	task_t target_task,
+	vm_address_t basepc,
+	vm_address_t boundspc
+);
+
+/* Routine task_assign */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_assign
+(
+	task_t task,
+	processor_set_t new_set,
+	boolean_t assign_threads
+);
+
+/* Routine task_assign_default */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_assign_default
+(
+	task_t task,
+	boolean_t assign_threads
+);
+
+/* Routine task_get_assignment */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_assignment
+(
+	task_t task,
+	processor_set_name_t *assigned_set
+);
+
+/* Routine task_set_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_policy
+(
+	task_t task,
+	processor_set_t pset,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	policy_limit_t limit,
+	mach_msg_type_number_t limitCnt,
+	boolean_t change
+);
+
+/* Routine task_get_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_state
+(
+	task_t task,
+	thread_state_flavor_t flavor,
+	thread_state_t old_state,
+	mach_msg_type_number_t *old_stateCnt
+);
+
+/* Routine task_set_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_state
+(
+	task_t task,
+	thread_state_flavor_t flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__task_subsystem__defined
+#define __Request__task_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t ledgers;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t ledgersCnt;
+		boolean_t inherit_memory;
+	} __Request__task_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_threads_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t init_port_set;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t init_port_setCnt;
+	} __Request__mach_ports_register_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__mach_ports_lookup_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_flavor_t flavor;
+		mach_msg_type_number_t task_info_outCnt;
+	} __Request__task_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_flavor_t flavor;
+		mach_msg_type_number_t task_info_inCnt;
+		integer_t task_info_in[10];
+	} __Request__task_set_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__task_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__task_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__thread_create_running_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__task_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+	} __Request__task_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__task_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int n_ulocks;
+		int policy;
+	} __Request__lock_set_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t lock_set;
+		/* end of the kernel processed data */
+	} __Request__lock_set_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int policy;
+		int value;
+	} __Request__semaphore_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t semaphore;
+		/* end of the kernel processed data */
+	} __Request__semaphore_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+	} __Request__task_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		boolean_t get_default;
+	} __Request__task_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t reply;
+		/* end of the kernel processed data */
+	} __Request__task_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		boolean_t set_limit;
+		boolean_t change;
+	} __Request__task_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t routine_entry_pt;
+		int routine_number;
+	} __Request__task_set_emulation_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_get_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t emulation_vector;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int vector_start;
+		mach_msg_type_number_t emulation_vectorCnt;
+	} __Request__task_set_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t basepc;
+		vm_address_t boundspc;
+	} __Request__task_set_ras_pc_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_set;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		boolean_t assign_threads;
+	} __Request__task_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		boolean_t assign_threads;
+	} __Request__task_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t pset;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		mach_msg_type_number_t limitCnt;
+		integer_t limit[1];
+		boolean_t change;
+	} __Request__task_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t old_stateCnt;
+	} __Request__task_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__task_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__task_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__task_subsystem__defined
+#define __RequestUnion__task_subsystem__defined
+union __RequestUnion__task_subsystem {
+	__Request__task_create_t Request_task_create;
+	__Request__task_terminate_t Request_task_terminate;
+	__Request__task_threads_t Request_task_threads;
+	__Request__mach_ports_register_t Request_mach_ports_register;
+	__Request__mach_ports_lookup_t Request_mach_ports_lookup;
+	__Request__task_info_t Request_task_info;
+	__Request__task_set_info_t Request_task_set_info;
+	__Request__task_suspend_t Request_task_suspend;
+	__Request__task_resume_t Request_task_resume;
+	__Request__task_get_special_port_t Request_task_get_special_port;
+	__Request__task_set_special_port_t Request_task_set_special_port;
+	__Request__thread_create_t Request_thread_create;
+	__Request__thread_create_running_t Request_thread_create_running;
+	__Request__task_set_exception_ports_t Request_task_set_exception_ports;
+	__Request__task_get_exception_ports_t Request_task_get_exception_ports;
+	__Request__task_swap_exception_ports_t Request_task_swap_exception_ports;
+	__Request__lock_set_create_t Request_lock_set_create;
+	__Request__lock_set_destroy_t Request_lock_set_destroy;
+	__Request__semaphore_create_t Request_semaphore_create;
+	__Request__semaphore_destroy_t Request_semaphore_destroy;
+	__Request__task_policy_set_t Request_task_policy_set;
+	__Request__task_policy_get_t Request_task_policy_get;
+	__Request__task_sample_t Request_task_sample;
+	__Request__task_policy_t Request_task_policy;
+	__Request__task_set_emulation_t Request_task_set_emulation;
+	__Request__task_get_emulation_vector_t Request_task_get_emulation_vector;
+	__Request__task_set_emulation_vector_t Request_task_set_emulation_vector;
+	__Request__task_set_ras_pc_t Request_task_set_ras_pc;
+	__Request__task_assign_t Request_task_assign;
+	__Request__task_assign_default_t Request_task_assign_default;
+	__Request__task_get_assignment_t Request_task_get_assignment;
+	__Request__task_set_policy_t Request_task_set_policy;
+	__Request__task_get_state_t Request_task_get_state;
+	__Request__task_set_state_t Request_task_set_state;
+};
+#endif /* !__RequestUnion__task_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__task_subsystem__defined
+#define __Reply__task_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_task;
+		/* end of the kernel processed data */
+	} __Reply__task_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t act_list;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t act_listCnt;
+	} __Reply__task_threads_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_ports_register_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t init_port_set;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t init_port_setCnt;
+	} __Reply__mach_ports_lookup_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t task_info_outCnt;
+		integer_t task_info_out[10];
+	} __Reply__task_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+	} __Reply__task_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_act;
+		/* end of the kernel processed data */
+	} __Reply__thread_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_act;
+		/* end of the kernel processed data */
+	} __Reply__thread_create_running_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlers[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__task_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlerss[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__task_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_lock_set;
+		/* end of the kernel processed data */
+	} __Reply__lock_set_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__lock_set_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t semaphore;
+		/* end of the kernel processed data */
+	} __Reply__semaphore_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__semaphore_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+		boolean_t get_default;
+	} __Reply__task_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_emulation_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t emulation_vector;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int vector_start;
+		mach_msg_type_number_t emulation_vectorCnt;
+	} __Reply__task_get_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_ras_pc_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t assigned_set;
+		/* end of the kernel processed data */
+	} __Reply__task_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Reply__task_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__task_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__task_subsystem__defined
+#define __ReplyUnion__task_subsystem__defined
+union __ReplyUnion__task_subsystem {
+	__Reply__task_create_t Reply_task_create;
+	__Reply__task_terminate_t Reply_task_terminate;
+	__Reply__task_threads_t Reply_task_threads;
+	__Reply__mach_ports_register_t Reply_mach_ports_register;
+	__Reply__mach_ports_lookup_t Reply_mach_ports_lookup;
+	__Reply__task_info_t Reply_task_info;
+	__Reply__task_set_info_t Reply_task_set_info;
+	__Reply__task_suspend_t Reply_task_suspend;
+	__Reply__task_resume_t Reply_task_resume;
+	__Reply__task_get_special_port_t Reply_task_get_special_port;
+	__Reply__task_set_special_port_t Reply_task_set_special_port;
+	__Reply__thread_create_t Reply_thread_create;
+	__Reply__thread_create_running_t Reply_thread_create_running;
+	__Reply__task_set_exception_ports_t Reply_task_set_exception_ports;
+	__Reply__task_get_exception_ports_t Reply_task_get_exception_ports;
+	__Reply__task_swap_exception_ports_t Reply_task_swap_exception_ports;
+	__Reply__lock_set_create_t Reply_lock_set_create;
+	__Reply__lock_set_destroy_t Reply_lock_set_destroy;
+	__Reply__semaphore_create_t Reply_semaphore_create;
+	__Reply__semaphore_destroy_t Reply_semaphore_destroy;
+	__Reply__task_policy_set_t Reply_task_policy_set;
+	__Reply__task_policy_get_t Reply_task_policy_get;
+	__Reply__task_sample_t Reply_task_sample;
+	__Reply__task_policy_t Reply_task_policy;
+	__Reply__task_set_emulation_t Reply_task_set_emulation;
+	__Reply__task_get_emulation_vector_t Reply_task_get_emulation_vector;
+	__Reply__task_set_emulation_vector_t Reply_task_set_emulation_vector;
+	__Reply__task_set_ras_pc_t Reply_task_set_ras_pc;
+	__Reply__task_assign_t Reply_task_assign;
+	__Reply__task_assign_default_t Reply_task_assign_default;
+	__Reply__task_get_assignment_t Reply_task_get_assignment;
+	__Reply__task_set_policy_t Reply_task_set_policy;
+	__Reply__task_get_state_t Reply_task_get_state;
+	__Reply__task_set_state_t Reply_task_set_state;
+};
+#endif /* !__RequestUnion__task_subsystem__defined */
+
+#ifndef subsystem_to_name_map_task
+#define subsystem_to_name_map_task \
+    { "task_create", 3400 },\
+    { "task_terminate", 3401 },\
+    { "task_threads", 3402 },\
+    { "mach_ports_register", 3403 },\
+    { "mach_ports_lookup", 3404 },\
+    { "task_info", 3405 },\
+    { "task_set_info", 3406 },\
+    { "task_suspend", 3407 },\
+    { "task_resume", 3408 },\
+    { "task_get_special_port", 3409 },\
+    { "task_set_special_port", 3410 },\
+    { "thread_create", 3411 },\
+    { "thread_create_running", 3412 },\
+    { "task_set_exception_ports", 3413 },\
+    { "task_get_exception_ports", 3414 },\
+    { "task_swap_exception_ports", 3415 },\
+    { "lock_set_create", 3416 },\
+    { "lock_set_destroy", 3417 },\
+    { "semaphore_create", 3418 },\
+    { "semaphore_destroy", 3419 },\
+    { "task_policy_set", 3420 },\
+    { "task_policy_get", 3421 },\
+    { "task_sample", 3422 },\
+    { "task_policy", 3423 },\
+    { "task_set_emulation", 3424 },\
+    { "task_get_emulation_vector", 3425 },\
+    { "task_set_emulation_vector", 3426 },\
+    { "task_set_ras_pc", 3427 },\
+    { "task_assign", 3429 },\
+    { "task_assign_default", 3430 },\
+    { "task_get_assignment", 3431 },\
+    { "task_set_policy", 3432 },\
+    { "task_get_state", 3433 },\
+    { "task_set_state", 3434 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _task_user_ */
diff --git a/i386/include/mach/i386/thread_act.h b/i386/include/mach/i386/thread_act.h
new file mode 100644
index 0000000..fde4189
--- /dev/null
+++ b/i386/include/mach/i386/thread_act.h
@@ -0,0 +1,1155 @@
+#ifndef	_thread_act_user_
+#define	_thread_act_user_
+
+/* Module thread_act */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	thread_act_MSG_COUNT
+#define	thread_act_MSG_COUNT	25
+#endif	/* thread_act_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine thread_terminate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_terminate
+(
+	thread_act_t target_act
+);
+
+/* Routine act_get_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t act_get_state
+(
+	thread_act_t target_act,
+	int flavor,
+	thread_state_t old_state,
+	mach_msg_type_number_t *old_stateCnt
+);
+
+/* Routine act_set_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t act_set_state
+(
+	thread_act_t target_act,
+	int flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt
+);
+
+/* Routine thread_get_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_state
+(
+	thread_act_t target_act,
+	thread_state_flavor_t flavor,
+	thread_state_t old_state,
+	mach_msg_type_number_t *old_stateCnt
+);
+
+/* Routine thread_set_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_state
+(
+	thread_act_t target_act,
+	thread_state_flavor_t flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt
+);
+
+/* Routine thread_suspend */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_suspend
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_resume */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_resume
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_abort */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_abort
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_abort_safely */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_abort_safely
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_depress_abort */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_depress_abort
+(
+	thread_act_t thread
+);
+
+/* Routine thread_get_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_special_port
+(
+	thread_act_t thr_act,
+	int which_port,
+	mach_port_t *special_port
+);
+
+/* Routine thread_set_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_special_port
+(
+	thread_act_t thr_act,
+	int which_port,
+	mach_port_t special_port
+);
+
+/* Routine thread_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_info
+(
+	thread_act_t target_act,
+	thread_flavor_t flavor,
+	thread_info_t thread_info_out,
+	mach_msg_type_number_t *thread_info_outCnt
+);
+
+/* Routine thread_set_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_exception_ports
+(
+	thread_act_t thread,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor
+);
+
+/* Routine thread_get_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_exception_ports
+(
+	thread_act_t thread,
+	exception_mask_t exception_mask,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlers,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine thread_swap_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_swap_exception_ports
+(
+	thread_act_t thread,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlers,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine thread_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_policy
+(
+	thread_act_t thr_act,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	boolean_t set_limit
+);
+
+/* Routine thread_policy_set */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_policy_set
+(
+	thread_act_t thread,
+	thread_policy_flavor_t flavor,
+	thread_policy_t policy_info,
+	mach_msg_type_number_t policy_infoCnt
+);
+
+/* Routine thread_policy_get */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_policy_get
+(
+	thread_act_t thread,
+	thread_policy_flavor_t flavor,
+	thread_policy_t policy_info,
+	mach_msg_type_number_t *policy_infoCnt,
+	boolean_t *get_default
+);
+
+/* Routine thread_sample */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_sample
+(
+	thread_act_t thread,
+	mach_port_t reply
+);
+
+/* Routine etap_trace_thread */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t etap_trace_thread
+(
+	thread_act_t target_act,
+	boolean_t trace_status
+);
+
+/* Routine thread_assign */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_assign
+(
+	thread_act_t thread,
+	processor_set_t new_set
+);
+
+/* Routine thread_assign_default */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_assign_default
+(
+	thread_act_t thread
+);
+
+/* Routine thread_get_assignment */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_assignment
+(
+	thread_act_t thread,
+	processor_set_name_t *assigned_set
+);
+
+/* Routine thread_set_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_policy
+(
+	thread_act_t thr_act,
+	processor_set_t pset,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	policy_limit_t limit,
+	mach_msg_type_number_t limitCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__thread_act_subsystem__defined
+#define __Request__thread_act_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int flavor;
+		mach_msg_type_number_t old_stateCnt;
+	} __Request__act_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__act_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t old_stateCnt;
+	} __Request__thread_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__thread_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_abort_safely_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_depress_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__thread_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__thread_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_flavor_t flavor;
+		mach_msg_type_number_t thread_info_outCnt;
+	} __Request__thread_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__thread_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+	} __Request__thread_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__thread_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		boolean_t set_limit;
+	} __Request__thread_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+	} __Request__thread_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		boolean_t get_default;
+	} __Request__thread_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t reply;
+		/* end of the kernel processed data */
+	} __Request__thread_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		boolean_t trace_status;
+	} __Request__etap_trace_thread_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_set;
+		/* end of the kernel processed data */
+	} __Request__thread_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t pset;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		mach_msg_type_number_t limitCnt;
+		integer_t limit[1];
+	} __Request__thread_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__thread_act_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__thread_act_subsystem__defined
+#define __RequestUnion__thread_act_subsystem__defined
+union __RequestUnion__thread_act_subsystem {
+	__Request__thread_terminate_t Request_thread_terminate;
+	__Request__act_get_state_t Request_act_get_state;
+	__Request__act_set_state_t Request_act_set_state;
+	__Request__thread_get_state_t Request_thread_get_state;
+	__Request__thread_set_state_t Request_thread_set_state;
+	__Request__thread_suspend_t Request_thread_suspend;
+	__Request__thread_resume_t Request_thread_resume;
+	__Request__thread_abort_t Request_thread_abort;
+	__Request__thread_abort_safely_t Request_thread_abort_safely;
+	__Request__thread_depress_abort_t Request_thread_depress_abort;
+	__Request__thread_get_special_port_t Request_thread_get_special_port;
+	__Request__thread_set_special_port_t Request_thread_set_special_port;
+	__Request__thread_info_t Request_thread_info;
+	__Request__thread_set_exception_ports_t Request_thread_set_exception_ports;
+	__Request__thread_get_exception_ports_t Request_thread_get_exception_ports;
+	__Request__thread_swap_exception_ports_t Request_thread_swap_exception_ports;
+	__Request__thread_policy_t Request_thread_policy;
+	__Request__thread_policy_set_t Request_thread_policy_set;
+	__Request__thread_policy_get_t Request_thread_policy_get;
+	__Request__thread_sample_t Request_thread_sample;
+	__Request__etap_trace_thread_t Request_etap_trace_thread;
+	__Request__thread_assign_t Request_thread_assign;
+	__Request__thread_assign_default_t Request_thread_assign_default;
+	__Request__thread_get_assignment_t Request_thread_get_assignment;
+	__Request__thread_set_policy_t Request_thread_set_policy;
+};
+#endif /* !__RequestUnion__thread_act_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__thread_act_subsystem__defined
+#define __Reply__thread_act_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Reply__act_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__act_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Reply__thread_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_abort_safely_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_depress_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+	} __Reply__thread_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t thread_info_outCnt;
+		integer_t thread_info_out[12];
+	} __Reply__thread_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlers[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__thread_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlers[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__thread_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+		boolean_t get_default;
+	} __Reply__thread_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__etap_trace_thread_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t assigned_set;
+		/* end of the kernel processed data */
+	} __Reply__thread_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__thread_act_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__thread_act_subsystem__defined
+#define __ReplyUnion__thread_act_subsystem__defined
+union __ReplyUnion__thread_act_subsystem {
+	__Reply__thread_terminate_t Reply_thread_terminate;
+	__Reply__act_get_state_t Reply_act_get_state;
+	__Reply__act_set_state_t Reply_act_set_state;
+	__Reply__thread_get_state_t Reply_thread_get_state;
+	__Reply__thread_set_state_t Reply_thread_set_state;
+	__Reply__thread_suspend_t Reply_thread_suspend;
+	__Reply__thread_resume_t Reply_thread_resume;
+	__Reply__thread_abort_t Reply_thread_abort;
+	__Reply__thread_abort_safely_t Reply_thread_abort_safely;
+	__Reply__thread_depress_abort_t Reply_thread_depress_abort;
+	__Reply__thread_get_special_port_t Reply_thread_get_special_port;
+	__Reply__thread_set_special_port_t Reply_thread_set_special_port;
+	__Reply__thread_info_t Reply_thread_info;
+	__Reply__thread_set_exception_ports_t Reply_thread_set_exception_ports;
+	__Reply__thread_get_exception_ports_t Reply_thread_get_exception_ports;
+	__Reply__thread_swap_exception_ports_t Reply_thread_swap_exception_ports;
+	__Reply__thread_policy_t Reply_thread_policy;
+	__Reply__thread_policy_set_t Reply_thread_policy_set;
+	__Reply__thread_policy_get_t Reply_thread_policy_get;
+	__Reply__thread_sample_t Reply_thread_sample;
+	__Reply__etap_trace_thread_t Reply_etap_trace_thread;
+	__Reply__thread_assign_t Reply_thread_assign;
+	__Reply__thread_assign_default_t Reply_thread_assign_default;
+	__Reply__thread_get_assignment_t Reply_thread_get_assignment;
+	__Reply__thread_set_policy_t Reply_thread_set_policy;
+};
+#endif /* !__RequestUnion__thread_act_subsystem__defined */
+
+#ifndef subsystem_to_name_map_thread_act
+#define subsystem_to_name_map_thread_act \
+    { "thread_terminate", 3600 },\
+    { "act_get_state", 3601 },\
+    { "act_set_state", 3602 },\
+    { "thread_get_state", 3603 },\
+    { "thread_set_state", 3604 },\
+    { "thread_suspend", 3605 },\
+    { "thread_resume", 3606 },\
+    { "thread_abort", 3607 },\
+    { "thread_abort_safely", 3608 },\
+    { "thread_depress_abort", 3609 },\
+    { "thread_get_special_port", 3610 },\
+    { "thread_set_special_port", 3611 },\
+    { "thread_info", 3612 },\
+    { "thread_set_exception_ports", 3613 },\
+    { "thread_get_exception_ports", 3614 },\
+    { "thread_swap_exception_ports", 3615 },\
+    { "thread_policy", 3616 },\
+    { "thread_policy_set", 3617 },\
+    { "thread_policy_get", 3618 },\
+    { "thread_sample", 3619 },\
+    { "etap_trace_thread", 3620 },\
+    { "thread_assign", 3621 },\
+    { "thread_assign_default", 3622 },\
+    { "thread_get_assignment", 3623 },\
+    { "thread_set_policy", 3624 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _thread_act_user_ */
diff --git a/i386/include/mach/i386/thread_state.h b/i386/include/mach/i386/thread_state.h
new file mode 100644
index 0000000..dba05b9
--- /dev/null
+++ b/i386/include/mach/i386/thread_state.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+#ifndef _MACH_I386_THREAD_STATE_H_
+#define _MACH_I386_THREAD_STATE_H_
+
+/* Size of maximum exported thread state in words */
+#define I386_THREAD_STATE_MAX	(144)    /* Size of biggest state possible */
+
+#if defined (__i386__) || defined(__x86_64__)
+#define THREAD_STATE_MAX	I386_THREAD_STATE_MAX
+#endif
+
+#endif	/* _MACH_I386_THREAD_STATE_H_ */
diff --git a/i386/include/mach/i386/thread_status.h b/i386/include/mach/i386/thread_status.h
new file mode 100644
index 0000000..65773e3
--- /dev/null
+++ b/i386/include/mach/i386/thread_status.h
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	thread_status.h
+ *	Author:	Avadis Tevanian, Jr.
+ *	Date:	1985
+ *
+ *	This file contains the structure definitions for the thread
+ *	state as applied to I386 processors.
+ */
+
+#ifndef	_MACH_I386_THREAD_STATUS_H_
+#define _MACH_I386_THREAD_STATUS_H_
+
+#include <mach/i386/_structs.h>
+#include <mach/message.h>
+#include <mach/i386/fp_reg.h>
+#include <mach/i386/thread_state.h>
+#include <i386/eflags.h>
+
+/*
+ * the i386_xxxx form is kept for legacy purposes since these types
+ * are externally known... eventually they should be deprecated.
+ * our internal implementation has moved to the following naming convention
+ *
+ *   x86_xxxx32 names are used to deal with 32 bit states
+ *   x86_xxxx64 names are used to deal with 64 bit states
+ *   x86_xxxx   names are used to deal with either 32 or 64 bit states
+ *	via a self-describing mechanism
+ */
+
+/*
+ * these are the legacy names which should be deprecated in the future
+ * they are externally known which is the only reason we don't just get
+ * rid of them
+ */
+#define i386_THREAD_STATE		1
+#define i386_FLOAT_STATE		2
+#define i386_EXCEPTION_STATE		3
+
+/*
+ * THREAD_STATE_FLAVOR_LIST 0
+ * 	these are the supported flavors
+ */
+#define x86_THREAD_STATE32		1
+#define x86_FLOAT_STATE32		2
+#define x86_EXCEPTION_STATE32		3
+#define x86_THREAD_STATE64		4
+#define x86_FLOAT_STATE64		5
+#define x86_EXCEPTION_STATE64		6
+#define x86_THREAD_STATE		7
+#define x86_FLOAT_STATE			8
+#define x86_EXCEPTION_STATE		9
+#define x86_DEBUG_STATE32		10
+#define x86_DEBUG_STATE64		11
+#define x86_DEBUG_STATE			12
+#define THREAD_STATE_NONE		13
+
+/*
+ * Largest state on this machine:
+ * (be sure mach/machine/thread_state.h matches!)
+ */
+#define THREAD_MACHINE_STATE_MAX	THREAD_STATE_MAX
+
+/*
+ * VALID_THREAD_STATE_FLAVOR is a platform specific macro that when passed
+ * an exception flavor will return if that is a defined flavor for that
+ * platform. The macro must be manually updated to include all of the valid
+ * exception flavors as defined above.
+ */
+#define VALID_THREAD_STATE_FLAVOR(x)       \
+	 ((x == x86_THREAD_STATE32)	|| \
+	  (x == x86_FLOAT_STATE32)	|| \
+	  (x == x86_EXCEPTION_STATE32)	|| \
+	  (x == x86_DEBUG_STATE32)	|| \
+	  (x == x86_THREAD_STATE64)	|| \
+	  (x == x86_FLOAT_STATE64)	|| \
+	  (x == x86_EXCEPTION_STATE64)	|| \
+	  (x == x86_DEBUG_STATE64)	|| \
+	  (x == x86_THREAD_STATE)	|| \
+	  (x == x86_FLOAT_STATE)	|| \
+	  (x == x86_EXCEPTION_STATE)	|| \
+	  (x == x86_DEBUG_STATE)	|| \
+	  (x == THREAD_STATE_NONE))
+
+struct x86_state_hdr {
+	int	flavor;
+	int	count;
+};
+typedef struct x86_state_hdr x86_state_hdr_t;
+
+/*
+ * Default segment register values.
+ */
+    
+#define USER_CODE_SELECTOR	0x0017
+#define USER_DATA_SELECTOR	0x001f
+#define KERN_CODE_SELECTOR	0x0008
+#define KERN_DATA_SELECTOR	0x0010
+
+/*
+ * to be deprecated in the future
+ */
+typedef _STRUCT_X86_THREAD_STATE32 i386_thread_state_t;
+#define i386_THREAD_STATE_COUNT	((mach_msg_type_number_t) \
+    ( sizeof (i386_thread_state_t) / sizeof (int) ))
+
+typedef _STRUCT_X86_THREAD_STATE32 x86_thread_state32_t;
+#define x86_THREAD_STATE32_COUNT	((mach_msg_type_number_t) \
+    ( sizeof (x86_thread_state32_t) / sizeof (int) ))
+
+/*
+ * to be deprecated in the future
+ */
+typedef _STRUCT_X86_FLOAT_STATE32 i386_float_state_t;
+#define i386_FLOAT_STATE_COUNT ((mach_msg_type_number_t) \
+		(sizeof(i386_float_state_t)/sizeof(unsigned int)))
+
+typedef _STRUCT_X86_FLOAT_STATE32 x86_float_state32_t;
+#define x86_FLOAT_STATE32_COUNT ((mach_msg_type_number_t) \
+		(sizeof(x86_float_state32_t)/sizeof(unsigned int)))
+
+/*
+ * to be deprecated in the future
+ */
+typedef _STRUCT_X86_EXCEPTION_STATE32 i386_exception_state_t;
+#define i386_EXCEPTION_STATE_COUNT	((mach_msg_type_number_t) \
+    ( sizeof (i386_exception_state_t) / sizeof (int) ))
+
+typedef _STRUCT_X86_EXCEPTION_STATE32 x86_exception_state32_t;
+#define x86_EXCEPTION_STATE32_COUNT	((mach_msg_type_number_t) \
+    ( sizeof (x86_exception_state32_t) / sizeof (int) ))
+
+#define I386_EXCEPTION_STATE_COUNT i386_EXCEPTION_STATE_COUNT
+
+typedef _STRUCT_X86_DEBUG_STATE32 x86_debug_state32_t;
+#define x86_DEBUG_STATE32_COUNT       ((mach_msg_type_number_t) \
+	( sizeof (x86_debug_state32_t) / sizeof (int) ))
+
+#define X86_DEBUG_STATE32_COUNT x86_DEBUG_STATE32_COUNT
+
+typedef _STRUCT_X86_THREAD_STATE64 x86_thread_state64_t;
+#define x86_THREAD_STATE64_COUNT	((mach_msg_type_number_t) \
+    ( sizeof (x86_thread_state64_t) / sizeof (int) ))
+
+typedef _STRUCT_X86_FLOAT_STATE64 x86_float_state64_t;
+#define x86_FLOAT_STATE64_COUNT ((mach_msg_type_number_t) \
+		(sizeof(x86_float_state64_t)/sizeof(unsigned int)))
+		
+typedef _STRUCT_X86_EXCEPTION_STATE64 x86_exception_state64_t;
+#define x86_EXCEPTION_STATE64_COUNT	((mach_msg_type_number_t) \
+    ( sizeof (x86_exception_state64_t) / sizeof (int) ))
+
+#define X86_EXCEPTION_STATE64_COUNT x86_EXCEPTION_STATE64_COUNT
+
+typedef _STRUCT_X86_DEBUG_STATE64 x86_debug_state64_t;
+#define x86_DEBUG_STATE64_COUNT	((mach_msg_type_number_t) \
+    ( sizeof (x86_debug_state64_t) / sizeof (int) ))
+
+#define X86_DEBUG_STATE64_COUNT x86_DEBUG_STATE64_COUNT
+
+/*
+ * Combined thread, float and exception states
+ */
+struct x86_thread_state {
+	x86_state_hdr_t			tsh;
+	union {
+	    x86_thread_state32_t	ts32;
+	    x86_thread_state64_t	ts64;
+	} uts;
+};
+
+struct x86_float_state {
+	x86_state_hdr_t			fsh;
+	union {
+		x86_float_state32_t	fs32;
+		x86_float_state64_t	fs64;
+	} ufs;
+};
+
+struct x86_exception_state {
+	x86_state_hdr_t			esh;
+	union {
+		x86_exception_state32_t	es32;
+		x86_exception_state64_t	es64;
+	} ues;
+};
+
+struct x86_debug_state {
+	x86_state_hdr_t			dsh;
+	union {
+		x86_debug_state32_t	ds32;
+		x86_debug_state64_t	ds64;
+	} uds;
+};
+
+typedef struct x86_thread_state x86_thread_state_t;
+#define x86_THREAD_STATE_COUNT	((mach_msg_type_number_t) \
+		( sizeof (x86_thread_state_t) / sizeof (int) ))
+
+typedef struct x86_float_state x86_float_state_t;
+#define x86_FLOAT_STATE_COUNT ((mach_msg_type_number_t) \
+		(sizeof(x86_float_state_t)/sizeof(unsigned int)))
+
+typedef struct x86_exception_state x86_exception_state_t;
+#define x86_EXCEPTION_STATE_COUNT ((mach_msg_type_number_t) \
+		(sizeof(x86_exception_state_t)/sizeof(unsigned int)))
+
+typedef struct x86_debug_state x86_debug_state_t;
+#define x86_DEBUG_STATE_COUNT ((mach_msg_type_number_t) \
+		(sizeof(x86_debug_state_t)/sizeof(unsigned int)))
+
+/*
+ * Machine-independent way for servers and Mach's exception mechanism to
+ * choose the most efficient state flavor for exception RPC's:
+ */
+#define MACHINE_THREAD_STATE		x86_THREAD_STATE
+#define MACHINE_THREAD_STATE_COUNT	x86_THREAD_STATE_COUNT
+
+/*
+ * when reloading the segment registers on
+ * a return out of the kernel, we may take
+ * a GeneralProtection or SegmentNotPresent
+ * fault if one or more of the segment
+ * registers in the saved state was improperly
+ * specified via an x86_THREAD_STATE32 call
+ * the frame we push on top of the existing
+ * save area looks like this... we need to
+ * carry this as part of the save area
+ * in case we get hit so that we have a big
+ * enough stack
+ */
+struct x86_seg_load_fault32 {
+	unsigned int    trapno;
+	unsigned int    err;
+	unsigned int    eip;
+	unsigned int    cs;
+	unsigned int    efl;
+};
+
+
+#endif	/* _MACH_I386_THREAD_STATUS_H_ */
diff --git a/i386/include/mach/i386/vm_param.h b/i386/include/mach/i386/vm_param.h
new file mode 100644
index 0000000..edcb834
--- /dev/null
+++ b/i386/include/mach/i386/vm_param.h
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+
+/* 
+ * Copyright (c) 1994 The University of Utah and
+ * the Computer Systems Laboratory at the University of Utah (CSL).
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify and distribute this software is hereby
+ * granted provided that (1) source code retains these copyright, permission,
+ * and disclaimer notices, and (2) redistributions including binaries
+ * reproduce the notices in supporting documentation, and (3) all advertising
+ * materials mentioning features or use of this software display the following
+ * acknowledgement: ``This product includes software developed by the
+ * Computer Systems Laboratory at the University of Utah.''
+ *
+ * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS
+ * IS" CONDITION.  THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF
+ * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * CSL requests users of this software to return to csl-dist@cs.utah.edu any
+ * improvements that they make and grant CSL redistribution rights.
+ *
+ */
+
+/*
+ *	File:	vm_param.h
+ *	Author:	Avadis Tevanian, Jr.
+ *	Date:	1985
+ *
+ *	I386 machine dependent virtual memory parameters.
+ *	Most of the declarations are preceeded by I386_ (or i386_)
+ *	which is OK because only I386 specific code will be using
+ *	them.
+ */
+
+#ifndef	_MACH_I386_VM_PARAM_H_
+#define _MACH_I386_VM_PARAM_H_
+
+#define BYTE_SIZE		8		/* byte size in bits */
+
+#define I386_PGBYTES		4096		/* bytes per 80386 page */
+#define I386_PGSHIFT		12		/* bitshift for pages */
+
+#define	PAGE_SIZE		I386_PGBYTES
+#define	PAGE_SHIFT		I386_PGSHIFT
+#define	PAGE_MASK		(PAGE_SIZE - 1)
+
+#define I386_LPGBYTES		2*1024*1024	/* bytes per large page */
+#define I386_LPGSHIFT		21		/* bitshift for large pages */
+#define I386_LPGMASK		(I386_LPGBYTES-1)
+
+/*
+ *	Convert bytes to pages and convert pages to bytes.
+ *	No rounding is used.
+ */
+
+#define i386_btop(x)		((ppnum_t)((x) >> I386_PGSHIFT))
+#define machine_btop(x)		i386_btop(x)
+#define i386_ptob(x)		(((pmap_paddr_t)(x)) << I386_PGSHIFT)
+
+/*
+ *	Round off or truncate to the nearest page.  These will work
+ *	for either addresses or counts.  (i.e. 1 byte rounds to 1 page
+ *	bytes.
+ */
+
+#define i386_round_page(x)	((((pmap_paddr_t)(x)) + I386_PGBYTES - 1) & \
+					~(I386_PGBYTES-1))
+#define i386_trunc_page(x)	(((pmap_paddr_t)(x)) & ~(I386_PGBYTES-1))
+
+
+
+#define VM_MIN_ADDRESS64	((user_addr_t) 0x0000000000000000ULL)
+/*
+ * default top of user stack... it grows down from here
+ */
+#define VM_USRSTACK64		((user_addr_t) 0x00007FFF5FC00000ULL)
+#define VM_DYLD64		((user_addr_t) 0x00007FFF5FC00000ULL)
+#define VM_LIB64_SHR_DATA	((user_addr_t) 0x00007FFF60000000ULL)
+#define VM_LIB64_SHR_TEXT	((user_addr_t) 0x00007FFF80000000ULL)
+/*
+ * the end of the usable user address space , for now about 47 bits.
+ * the 64 bit commpage is past the end of this
+ */
+#define VM_MAX_PAGE_ADDRESS	((user_addr_t) 0x00007FFFFFE00000ULL)
+/*
+ * canonical end of user address space for limits checking
+ */
+#define VM_MAX_USER_PAGE_ADDRESS ((user_addr_t)0x00007FFFFFFFF000ULL)
+
+
+/* system-wide values */
+#define MACH_VM_MIN_ADDRESS		((mach_vm_offset_t) 0)
+#define MACH_VM_MAX_ADDRESS		((mach_vm_offset_t) VM_MAX_PAGE_ADDRESS)
+
+/* process-relative values (all 32-bit legacy only for now) */
+#define VM_MIN_ADDRESS		((vm_offset_t) 0)
+#define VM_USRSTACK32		((vm_offset_t) 0xC0000000)
+#define VM_MAX_ADDRESS		((vm_offset_t) 0xFFE00000)
+
+
+
+#endif	/* _MACH_I386_VM_PARAM_H_ */
diff --git a/i386/include/mach/i386/vm_types.h b/i386/include/mach/i386/vm_types.h
new file mode 100644
index 0000000..2c38fa2
--- /dev/null
+++ b/i386/include/mach/i386/vm_types.h
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+/*
+ *	File:	vm_types.h
+ *	Author:	Avadis Tevanian, Jr.
+ *	Date: 1985
+ *
+ *	Header file for VM data types.  I386 version.
+ */
+
+#ifndef	_MACH_I386_VM_TYPES_H_
+#define _MACH_I386_VM_TYPES_H_
+
+#ifndef	ASSEMBLER
+
+#include <i386/_types.h>
+#include <mach/i386/vm_param.h>
+#include <stdint.h>
+
+/*
+ * natural_t and integer_t are Mach's legacy types for machine-
+ * independent integer types (unsigned, and signed, respectively).
+ * Their original purpose was to define other types in a machine/
+ * compiler independent way.
+ *
+ * They also had an implicit "same size as pointer" characteristic
+ * to them (i.e. Mach's traditional types are very ILP32 or ILP64
+ * centric).  We support x86 ABIs that do not follow either of
+ * these models (specifically LP64).  Therefore, we had to make a
+ * choice between making these types scale with pointers or stay
+ * tied to integers.  Because their use is predominantly tied to
+ * to the size of an integer, we are keeping that association and
+ * breaking free from pointer size guarantees.
+ *
+ * New use of these types is discouraged.
+ */
+typedef __darwin_natural_t	natural_t;
+typedef int			integer_t;
+
+/*
+ * A vm_offset_t is a type-neutral pointer,
+ * e.g. an offset into a virtual memory space.
+ */
+#ifdef __LP64__
+typedef uintptr_t		vm_offset_t;
+#else	/* __LP64__ */
+typedef	natural_t		vm_offset_t;
+#endif	/* __LP64__ */
+
+/*
+ * A vm_size_t is the proper type for e.g.
+ * expressing the difference between two
+ * vm_offset_t entities.
+ */
+#ifdef __LP64__
+typedef uintptr_t		vm_size_t;
+#else	/* __LP64__ */
+typedef	natural_t		vm_size_t;
+#endif	/* __LP64__ */
+
+/*
+ * This new type is independent of a particular vm map's
+ * implementation size - and represents appropriate types
+ * for all possible maps.  This is used for interfaces
+ * where the size of the map is not known - or we don't
+ * want to have to distinguish.
+ */
+typedef uint64_t		mach_vm_address_t;
+typedef uint64_t		mach_vm_offset_t;
+typedef uint64_t		mach_vm_size_t;
+
+typedef uint64_t		vm_map_offset_t;
+typedef uint64_t		vm_map_address_t;
+typedef uint64_t		vm_map_size_t;
+
+
+#endif	/* ASSEMBLER */
+
+/*
+ * If composing messages by hand (please do not)
+ */
+#define	MACH_MSG_TYPE_INTEGER_T	MACH_MSG_TYPE_INTEGER_32
+
+#endif	/* _MACH_I386_VM_TYPES_H_ */
diff --git a/i386/include/mach/kern_return.h b/i386/include/mach/kern_return.h
new file mode 100644
index 0000000..da73236
--- /dev/null
+++ b/i386/include/mach/kern_return.h
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	h/kern_return.h
+ *	Author:	Avadis Tevanian, Jr.
+ *	Date:	1985
+ *
+ *	Kernel return codes.
+ *
+ */
+
+#ifndef	_MACH_KERN_RETURN_H_
+#define _MACH_KERN_RETURN_H_
+
+#include <mach/machine/kern_return.h>
+
+#define KERN_SUCCESS			0
+
+#define KERN_INVALID_ADDRESS		1
+		/* Specified address is not currently valid.
+		 */
+
+#define KERN_PROTECTION_FAILURE		2
+		/* Specified memory is valid, but does not permit the
+		 * required forms of access.
+		 */
+
+#define KERN_NO_SPACE			3
+		/* The address range specified is already in use, or
+		 * no address range of the size specified could be
+		 * found.
+		 */
+
+#define KERN_INVALID_ARGUMENT		4
+		/* The function requested was not applicable to this
+		 * type of argument, or an argument is invalid
+		 */
+
+#define KERN_FAILURE			5
+		/* The function could not be performed.  A catch-all.
+		 */
+
+#define KERN_RESOURCE_SHORTAGE		6
+		/* A system resource could not be allocated to fulfill
+		 * this request.  This failure may not be permanent.
+		 */
+
+#define KERN_NOT_RECEIVER		7
+		/* The task in question does not hold receive rights
+		 * for the port argument.
+		 */
+
+#define KERN_NO_ACCESS			8
+		/* Bogus access restriction.
+		 */
+
+#define KERN_MEMORY_FAILURE		9
+		/* During a page fault, the target address refers to a
+		 * memory object that has been destroyed.  This
+		 * failure is permanent.
+		 */
+
+#define KERN_MEMORY_ERROR		10
+		/* During a page fault, the memory object indicated
+		 * that the data could not be returned.  This failure
+		 * may be temporary; future attempts to access this
+		 * same data may succeed, as defined by the memory
+		 * object.
+		 */
+
+#define	KERN_ALREADY_IN_SET		11
+		/* The receive right is already a member of the portset.
+		 */
+
+#define KERN_NOT_IN_SET			12
+		/* The receive right is not a member of a port set.
+		 */
+
+#define KERN_NAME_EXISTS		13
+		/* The name already denotes a right in the task.
+		 */
+
+#define KERN_ABORTED			14
+		/* The operation was aborted.  Ipc code will
+		 * catch this and reflect it as a message error.
+		 */
+
+#define KERN_INVALID_NAME		15
+		/* The name doesn't denote a right in the task.
+		 */
+
+#define	KERN_INVALID_TASK		16
+		/* Target task isn't an active task.
+		 */
+
+#define KERN_INVALID_RIGHT		17
+		/* The name denotes a right, but not an appropriate right.
+		 */
+
+#define KERN_INVALID_VALUE		18
+		/* A blatant range error.
+		 */
+
+#define	KERN_UREFS_OVERFLOW		19
+		/* Operation would overflow limit on user-references.
+		 */
+
+#define	KERN_INVALID_CAPABILITY		20
+		/* The supplied (port) capability is improper.
+		 */
+
+#define KERN_RIGHT_EXISTS		21
+		/* The task already has send or receive rights
+		 * for the port under another name.
+		 */
+
+#define	KERN_INVALID_HOST		22
+		/* Target host isn't actually a host.
+		 */
+
+#define KERN_MEMORY_PRESENT		23
+		/* An attempt was made to supply "precious" data
+		 * for memory that is already present in a
+		 * memory object.
+		 */
+
+#define KERN_MEMORY_DATA_MOVED		24
+		/* A page was requested of a memory manager via
+		 * memory_object_data_request for an object using
+		 * a MEMORY_OBJECT_COPY_CALL strategy, with the
+		 * VM_PROT_WANTS_COPY flag being used to specify
+		 * that the page desired is for a copy of the
+		 * object, and the memory manager has detected
+		 * the page was pushed into a copy of the object
+		 * while the kernel was walking the shadow chain
+		 * from the copy to the object. This error code
+		 * is delivered via memory_object_data_error
+		 * and is handled by the kernel (it forces the
+		 * kernel to restart the fault). It will not be
+		 * seen by users.
+		 */
+
+#define KERN_MEMORY_RESTART_COPY	25
+		/* A strategic copy was attempted of an object
+		 * upon which a quicker copy is now possible.
+		 * The caller should retry the copy using
+		 * vm_object_copy_quickly. This error code
+		 * is seen only by the kernel.
+		 */
+
+#define KERN_INVALID_PROCESSOR_SET	26
+		/* An argument applied to assert processor set privilege
+		 * was not a processor set control port.
+		 */
+
+#define KERN_POLICY_LIMIT		27
+		/* The specified scheduling attributes exceed the thread's
+		 * limits.
+		 */
+
+#define KERN_INVALID_POLICY		28
+		/* The specified scheduling policy is not currently
+		 * enabled for the processor set.
+		 */
+
+#define KERN_INVALID_OBJECT		29
+		/* The external memory manager failed to initialize the
+		 * memory object.
+		 */
+
+#define KERN_ALREADY_WAITING		30
+		/* A thread is attempting to wait for an event for which 
+		 * there is already a waiting thread.
+		 */
+
+#define KERN_DEFAULT_SET		31
+		/* An attempt was made to destroy the default processor
+		 * set.
+		 */
+
+#define KERN_EXCEPTION_PROTECTED	32
+		/* An attempt was made to fetch an exception port that is
+		 * protected, or to abort a thread while processing a
+		 * protected exception.
+		 */
+
+#define KERN_INVALID_LEDGER		33
+		/* A ledger was required but not supplied.
+		 */
+
+#define KERN_INVALID_MEMORY_CONTROL	34
+		/* The port was not a memory cache control port.
+		 */
+
+#define KERN_INVALID_SECURITY		35
+		/* An argument supplied to assert security privilege 	
+		 * was not a host security port.
+		 */
+		
+#define KERN_NOT_DEPRESSED		36
+		/* thread_depress_abort was called on a thread which
+		 * was not currently depressed.
+		 */
+		
+#define KERN_TERMINATED			37
+		/* Object has been terminated and is no longer available
+		 */
+
+#define KERN_LOCK_SET_DESTROYED		38
+		/* Lock set has been destroyed and is no longer available.
+		 */
+
+#define KERN_LOCK_UNSTABLE		39
+		/* The thread holding the lock terminated before releasing
+		 * the lock
+		 */
+
+#define KERN_LOCK_OWNED			40
+		/* The lock is already owned by another thread
+		 */
+
+#define KERN_LOCK_OWNED_SELF		41
+		/* The lock is already owned by the calling thread
+		 */
+
+#define KERN_SEMAPHORE_DESTROYED	42
+		/* Semaphore has been destroyed and is no longer available.
+		 */
+
+#define KERN_RPC_SERVER_TERMINATED	43
+		/* Return from RPC indicating the target server was 
+		 * terminated before it successfully replied 
+		 */
+
+#define KERN_RPC_TERMINATE_ORPHAN	44
+		/* Terminate an orphaned activation.
+		 */
+
+#define KERN_RPC_CONTINUE_ORPHAN	45
+		/* Allow an orphaned activation to continue executing.
+		 */
+
+#define	KERN_NOT_SUPPORTED		46
+		/* Empty thread activation (No thread linked to it)
+		 */
+
+#define	KERN_NODE_DOWN			47
+		/* Remote node down or inaccessible.
+		 */
+
+#define KERN_NOT_WAITING		48
+		/* A signalled thread was not actually waiting. */
+
+#define	KERN_OPERATION_TIMED_OUT        49
+		/* Some thread-oriented operation (semaphore_wait) timed out
+		 */
+
+#define KERN_CODESIGN_ERROR		50
+		/* During a page fault, indicates that the page was rejected
+		 * as a result of a signature check.
+		 */
+
+#define	KERN_RETURN_MAX			0x100
+		/* Maximum return value allowable
+		 */
+
+#endif	/* _MACH_KERN_RETURN_H_ */
diff --git a/i386/include/mach/kmod.h b/i386/include/mach/kmod.h
new file mode 100644
index 0000000..f31821d
--- /dev/null
+++ b/i386/include/mach/kmod.h
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
+
+#ifndef    _MACH_KMOD_H_
+#define    _MACH_KMOD_H_
+
+#include <mach/kern_return.h>
+#include <mach/mach_types.h>
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+#if PRAGMA_MARK
+#pragma mark Basic macros & typedefs
+#endif
+/***********************************************************************
+* Basic macros & typedefs
+***********************************************************************/
+#define KMOD_MAX_NAME    64
+
+#define KMOD_RETURN_SUCCESS    KERN_SUCCESS
+#define KMOD_RETURN_FAILURE    KERN_FAILURE
+
+typedef int kmod_t;
+
+struct  kmod_info;
+typedef kern_return_t kmod_start_func_t(struct kmod_info * ki, void * data);
+typedef kern_return_t kmod_stop_func_t(struct kmod_info * ki, void * data);
+
+#if PRAGMA_MARK
+#pragma mark Structure definitions
+#endif
+/***********************************************************************
+* Structure definitions
+*
+* All structures must be #pragma pack(4).
+***********************************************************************/
+#pragma pack(4)
+
+/* Run-time struct only; never saved to a file */
+typedef struct kmod_reference {
+    struct kmod_reference * next;
+    struct kmod_info      * info;
+} kmod_reference_t;
+
+/***********************************************************************
+* Warning: Any changes to the kmod_info structure affect the
+* KMOD_..._DECL macros below.
+***********************************************************************/
+
+/* The kmod_info_t structure is only safe to use inside the running
+ * kernel.  If you need to work with a kmod_info_t structure outside
+ * the kernel, please use the compatibility definitions below.
+ */
+typedef struct kmod_info {
+    struct kmod_info  * next;
+    int32_t             info_version;           // version of this structure
+    uint32_t            id;
+    char                name[KMOD_MAX_NAME];
+    char                version[KMOD_MAX_NAME];
+    int32_t             reference_count;        // # linkage refs to this 
+    kmod_reference_t  * reference_list;         // who this refs (links on)
+    vm_address_t        address;                // starting address
+    vm_size_t           size;                   // total size
+    vm_size_t           hdr_size;               // unwired hdr size
+    kmod_start_func_t * start;
+    kmod_stop_func_t  * stop;
+} kmod_info_t;
+
+/* A compatibility definition of kmod_info_t for 32-bit kexts.
+ */
+typedef struct kmod_info_32_v1 {
+    uint32_t            next_addr;
+    int32_t             info_version;
+    uint32_t            id;
+    uint8_t             name[KMOD_MAX_NAME];
+    uint8_t             version[KMOD_MAX_NAME];
+    int32_t             reference_count;
+    uint32_t            reference_list_addr;
+    uint32_t            address;
+    uint32_t            size;
+    uint32_t            hdr_size;
+    uint32_t            start_addr;
+    uint32_t            stop_addr;
+} kmod_info_32_v1_t;
+
+/* A compatibility definition of kmod_info_t for 64-bit kexts.
+ */
+typedef struct kmod_info_64_v1 {
+    uint64_t            next_addr;
+    int32_t             info_version;
+    uint32_t            id;
+    uint8_t             name[KMOD_MAX_NAME];
+    uint8_t             version[KMOD_MAX_NAME];
+    int32_t             reference_count;
+    uint64_t            reference_list_addr;
+    uint64_t            address;
+    uint64_t            size;
+    uint64_t            hdr_size;
+    uint64_t            start_addr;
+    uint64_t            stop_addr;
+} kmod_info_64_v1_t;
+
+#pragma pack()
+
+#if PRAGMA_MARK
+#pragma mark Kmod structure declaration macros
+#endif
+/***********************************************************************
+* Kmod structure declaration macros
+***********************************************************************/
+#define KMOD_INFO_NAME       kmod_info
+#define KMOD_INFO_VERSION    1
+
+#define KMOD_DECL(name, version)                                  \
+    static kmod_start_func_t name ## _module_start;               \
+    static kmod_stop_func_t  name ## _module_stop;                \
+    kmod_info_t KMOD_INFO_NAME = { 0, KMOD_INFO_VERSION, -1U,      \
+                       { #name }, { version }, -1, 0, 0, 0, 0,    \
+                           name ## _module_start,                 \
+                           name ## _module_stop };
+
+#define KMOD_EXPLICIT_DECL(name, version, start, stop)            \
+    kmod_info_t KMOD_INFO_NAME = { 0, KMOD_INFO_VERSION, -1U,      \
+                       { #name }, { version }, -1, 0, 0, 0, 0,    \
+                           start, stop };
+
+#if PRAGMA_MARK
+#pragma mark Kernel private declarations
+#endif
+/***********************************************************************
+* Kernel private declarations.
+***********************************************************************/
+
+
+#if PRAGMA_MARK
+#pragma mark Obsolete kmod stuff
+#endif
+/***********************************************************************
+* These 3 should be dropped but they're referenced by MIG declarations.
+***********************************************************************/
+typedef void * kmod_args_t;
+typedef int kmod_control_flavor_t;
+typedef kmod_info_t * kmod_info_array_t;
+
+__END_DECLS
+
+#endif    /* _MACH_KMOD_H_ */
diff --git a/i386/include/mach/ledger.defs b/i386/include/mach/ledger.defs
new file mode 100644
index 0000000..76367a9
--- /dev/null
+++ b/i386/include/mach/ledger.defs
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+subsystem
+#if	KERNEL_USER
+	  KernelUser
+#endif	/* KERNEL_USER */
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+		       ledger 5000;
+
+#ifdef	KERNEL_USER
+userprefix r_;
+#endif	/* KERNEL_USER */
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+/*
+ *	Create a subordinate ledger
+ */
+routine ledger_create(
+		parent_ledger		: ledger_t;
+		ledger_ledger		: ledger_t;
+	out	new_ledger		: ledger_t;
+		transfer		: ledger_item_t);
+
+/*
+ *	Destroy a ledger
+ */
+routine ledger_terminate(
+		ledger			: ledger_t);
+
+/*
+ *	Transfer resources from a parent ledger to a child
+ */
+routine ledger_transfer(
+		parent_ledger		: ledger_t;
+		child_ledger		: ledger_t;
+		transfer		: ledger_item_t);
+
+/*
+ *	Return the ledger limit and balance
+ */
+routine ledger_read(
+		ledger			: ledger_t;
+	out	balance			: ledger_item_t;
+	out	limit			: ledger_item_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/ledger.h b/i386/include/mach/ledger.h
new file mode 100644
index 0000000..f0f050f
--- /dev/null
+++ b/i386/include/mach/ledger.h
@@ -0,0 +1,259 @@
+#ifndef	_ledger_user_
+#define	_ledger_user_
+
+/* Module ledger */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	ledger_MSG_COUNT
+#define	ledger_MSG_COUNT	4
+#endif	/* ledger_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine ledger_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t ledger_create
+(
+	ledger_t parent_ledger,
+	ledger_t ledger_ledger,
+	ledger_t *new_ledger,
+	ledger_item_t transfer
+);
+
+/* Routine ledger_terminate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t ledger_terminate
+(
+	ledger_t ledger
+);
+
+/* Routine ledger_transfer */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t ledger_transfer
+(
+	ledger_t parent_ledger,
+	ledger_t child_ledger,
+	ledger_item_t transfer
+);
+
+/* Routine ledger_read */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t ledger_read
+(
+	ledger_t ledger,
+	ledger_item_t *balance,
+	ledger_item_t *limit
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__ledger_subsystem__defined
+#define __Request__ledger_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t ledger_ledger;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		ledger_item_t transfer;
+	} __Request__ledger_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__ledger_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_ledger;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		ledger_item_t transfer;
+	} __Request__ledger_transfer_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__ledger_read_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__ledger_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__ledger_subsystem__defined
+#define __RequestUnion__ledger_subsystem__defined
+union __RequestUnion__ledger_subsystem {
+	__Request__ledger_create_t Request_ledger_create;
+	__Request__ledger_terminate_t Request_ledger_terminate;
+	__Request__ledger_transfer_t Request_ledger_transfer;
+	__Request__ledger_read_t Request_ledger_read;
+};
+#endif /* !__RequestUnion__ledger_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__ledger_subsystem__defined
+#define __Reply__ledger_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_ledger;
+		/* end of the kernel processed data */
+	} __Reply__ledger_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__ledger_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__ledger_transfer_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		ledger_item_t balance;
+		ledger_item_t limit;
+	} __Reply__ledger_read_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__ledger_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__ledger_subsystem__defined
+#define __ReplyUnion__ledger_subsystem__defined
+union __ReplyUnion__ledger_subsystem {
+	__Reply__ledger_create_t Reply_ledger_create;
+	__Reply__ledger_terminate_t Reply_ledger_terminate;
+	__Reply__ledger_transfer_t Reply_ledger_transfer;
+	__Reply__ledger_read_t Reply_ledger_read;
+};
+#endif /* !__RequestUnion__ledger_subsystem__defined */
+
+#ifndef subsystem_to_name_map_ledger
+#define subsystem_to_name_map_ledger \
+    { "ledger_create", 5000 },\
+    { "ledger_terminate", 5001 },\
+    { "ledger_transfer", 5002 },\
+    { "ledger_read", 5003 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _ledger_user_ */
diff --git a/i386/include/mach/lock_set.defs b/i386/include/mach/lock_set.defs
new file mode 100644
index 0000000..c7ee584
--- /dev/null
+++ b/i386/include/mach/lock_set.defs
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ * 
+ */
+/*
+ *	File: mach/lock_set.defs
+ *	Author: Joseph CaraDonna
+ *
+ *	Exported kernel calls	
+ *
+ */
+
+subsystem
+#if	KERNEL_SERVER
+	KernelServer
+#endif	/* KERNEL_SERVER */
+			lock_set 617000;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+/*
+ * a lock_set_t is created and destroyed through the task object.
+ *      lock_set_create(task,&lock_set_t,...);
+ *      lock_set_destroy(task,lock_set_t);
+ */
+
+routine lock_acquire(
+		lock_set	: lock_set_t;
+		lock_id		: int);
+
+routine lock_release(
+		lock_set	: lock_set_t;
+		lock_id		: int);
+
+routine lock_try(
+		lock_set	: lock_set_t;
+		lock_id		: int);
+
+routine lock_make_stable(
+		lock_set	: lock_set_t;
+		lock_id		: int);
+
+routine lock_handoff(
+		lock_set	: lock_set_t;
+		lock_id		: int);
+
+routine lock_handoff_accept(
+		lock_set	: lock_set_t;
+		lock_id		: int);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/lock_set.h b/i386/include/mach/lock_set.h
new file mode 100644
index 0000000..07a8d13
--- /dev/null
+++ b/i386/include/mach/lock_set.h
@@ -0,0 +1,326 @@
+#ifndef	_lock_set_user_
+#define	_lock_set_user_
+
+/* Module lock_set */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	lock_set_MSG_COUNT
+#define	lock_set_MSG_COUNT	6
+#endif	/* lock_set_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine lock_acquire */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_acquire
+(
+	lock_set_t lock_set,
+	int lock_id
+);
+
+/* Routine lock_release */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_release
+(
+	lock_set_t lock_set,
+	int lock_id
+);
+
+/* Routine lock_try */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_try
+(
+	lock_set_t lock_set,
+	int lock_id
+);
+
+/* Routine lock_make_stable */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_make_stable
+(
+	lock_set_t lock_set,
+	int lock_id
+);
+
+/* Routine lock_handoff */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_handoff
+(
+	lock_set_t lock_set,
+	int lock_id
+);
+
+/* Routine lock_handoff_accept */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_handoff_accept
+(
+	lock_set_t lock_set,
+	int lock_id
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__lock_set_subsystem__defined
+#define __Request__lock_set_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int lock_id;
+	} __Request__lock_acquire_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int lock_id;
+	} __Request__lock_release_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int lock_id;
+	} __Request__lock_try_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int lock_id;
+	} __Request__lock_make_stable_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int lock_id;
+	} __Request__lock_handoff_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int lock_id;
+	} __Request__lock_handoff_accept_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__lock_set_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__lock_set_subsystem__defined
+#define __RequestUnion__lock_set_subsystem__defined
+union __RequestUnion__lock_set_subsystem {
+	__Request__lock_acquire_t Request_lock_acquire;
+	__Request__lock_release_t Request_lock_release;
+	__Request__lock_try_t Request_lock_try;
+	__Request__lock_make_stable_t Request_lock_make_stable;
+	__Request__lock_handoff_t Request_lock_handoff;
+	__Request__lock_handoff_accept_t Request_lock_handoff_accept;
+};
+#endif /* !__RequestUnion__lock_set_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__lock_set_subsystem__defined
+#define __Reply__lock_set_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__lock_acquire_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__lock_release_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__lock_try_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__lock_make_stable_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__lock_handoff_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__lock_handoff_accept_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__lock_set_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__lock_set_subsystem__defined
+#define __ReplyUnion__lock_set_subsystem__defined
+union __ReplyUnion__lock_set_subsystem {
+	__Reply__lock_acquire_t Reply_lock_acquire;
+	__Reply__lock_release_t Reply_lock_release;
+	__Reply__lock_try_t Reply_lock_try;
+	__Reply__lock_make_stable_t Reply_lock_make_stable;
+	__Reply__lock_handoff_t Reply_lock_handoff;
+	__Reply__lock_handoff_accept_t Reply_lock_handoff_accept;
+};
+#endif /* !__RequestUnion__lock_set_subsystem__defined */
+
+#ifndef subsystem_to_name_map_lock_set
+#define subsystem_to_name_map_lock_set \
+    { "lock_acquire", 617000 },\
+    { "lock_release", 617001 },\
+    { "lock_try", 617002 },\
+    { "lock_make_stable", 617003 },\
+    { "lock_handoff", 617004 },\
+    { "lock_handoff_accept", 617005 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _lock_set_user_ */
diff --git a/i386/include/mach/mach.h b/i386/include/mach/mach.h
new file mode 100644
index 0000000..0b3b1a0
--- /dev/null
+++ b/i386/include/mach/mach.h
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 1999-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+
+/* 
+ *  Includes all the types that a normal user
+ *  of Mach programs should need
+ */
+
+#ifndef	_MACH_H_
+#define	_MACH_H_
+
+#define __MACH30__
+#define MACH_IPC_FLAVOR UNTYPED
+
+#include <mach/std_types.h>
+#include <mach/mach_types.h>
+#include <mach/mach_interface.h>
+#include <mach/mach_port.h>
+#include <mach/mach_init.h>
+#include <mach/mach_host.h>
+#include <mach/thread_switch.h>
+
+#include <mach/rpc.h>  		/* for compatibility only */
+#include <mach/mig.h>
+
+#include <mach/mig_errors.h>
+#include <mach/mach_error.h>
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+/*
+ * Standard prototypes
+ */
+extern void			panic_init(mach_port_t);
+extern void			panic(const char *, ...);
+
+extern void			safe_gets(char *,
+					  char *,
+					  int);
+
+extern void			slot_name(cpu_type_t,
+					  cpu_subtype_t,
+					  char **,
+					  char **);
+
+extern void			mig_reply_setup(mach_msg_header_t *,
+						mach_msg_header_t *);
+
+extern void			mach_msg_destroy(mach_msg_header_t *);
+
+extern mach_msg_return_t	mach_msg_receive(mach_msg_header_t *);
+
+extern mach_msg_return_t	mach_msg_send(mach_msg_header_t *);
+
+extern mach_msg_return_t	mach_msg_server_once(boolean_t (*)
+						     (mach_msg_header_t *,
+						      mach_msg_header_t *),
+						     mach_msg_size_t,
+						     mach_port_t,
+						     mach_msg_options_t);
+extern mach_msg_return_t	mach_msg_server(boolean_t (*)
+						(mach_msg_header_t *,
+						 mach_msg_header_t *),
+						mach_msg_size_t,
+						mach_port_t,
+						mach_msg_options_t);
+
+/*
+ * Prototypes for compatibility
+ */
+extern kern_return_t	clock_get_res(mach_port_t,
+				      clock_res_t *);
+extern kern_return_t	clock_set_res(mach_port_t,
+				      clock_res_t);
+
+extern kern_return_t	clock_sleep(mach_port_t,
+				    int,
+				    mach_timespec_t,
+				    mach_timespec_t *);
+__END_DECLS
+
+#endif	/* _MACH_H_ */
diff --git a/i386/include/mach/mach_error.h b/i386/include/mach/mach_error.h
new file mode 100644
index 0000000..5840bd5
--- /dev/null
+++ b/i386/include/mach/mach_error.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS 
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+/*
+ *	File:	mach_error.h
+ *	Author:	Douglas Orr, Carnegie Mellon University
+ *	Date:	Mar. 1988
+ *
+ *	Definitions of routines in mach_error.c
+ */
+
+#ifndef	_MACH_ERROR_
+#define	_MACH_ERROR_	1
+
+#include <mach/error.h>
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+char		*mach_error_string(
+/*
+ *	Returns a string appropriate to the error argument given
+ */
+	mach_error_t error_value
+				);
+
+void		mach_error(
+/*
+ *	Prints an appropriate message on the standard error stream
+ */
+	const char	*str,
+	mach_error_t	error_value
+				);
+
+char		*mach_error_type(
+/*
+ *	Returns a string with the error system, subsystem and code
+ */
+	mach_error_t	error_value
+				);
+__END_DECLS
+
+#endif	/* _MACH_ERROR_ */
diff --git a/i386/include/mach/mach_exc.defs b/i386/include/mach/mach_exc.defs
new file mode 100644
index 0000000..00fae28
--- /dev/null
+++ b/i386/include/mach/mach_exc.defs
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ * Abstract:
+ *	MiG definitions file for Mach exception interface.
+ */
+
+subsystem
+#if	KERNEL_USER
+	  KernelUser
+#endif
+		     mach_exc 2405;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+ServerPrefix catch_;
+
+type mach_exception_data_t	= array[*:2] of int64_t;
+type exception_type_t		= int;
+
+routine		mach_exception_raise(
+#if	KERNEL_USER
+			exception_port	: mach_port_move_send_t;
+			thread		: mach_port_move_send_t;
+			task		: mach_port_move_send_t;
+#else	/* KERNEL_USER */
+			exception_port	: mach_port_t;
+			thread		: mach_port_t;
+			task		: mach_port_t;
+#endif	/* KERNEL_USER */
+			exception	: exception_type_t;
+			code		: mach_exception_data_t
+			);
+
+routine		mach_exception_raise_state(
+#if	KERNEL_USER
+			exception_port	: mach_port_move_send_t;
+#else	/* KERNEL_USER */
+			exception_port	: mach_port_t;
+#endif	/* KERNEL_USER */
+			exception	: exception_type_t;
+			code		: mach_exception_data_t, const;
+		  inout flavor		: int;
+			old_state	: thread_state_t, const;
+		    out new_state	: thread_state_t);
+
+routine		mach_exception_raise_state_identity(
+#if	KERNEL_USER
+			exception_port  : mach_port_move_send_t;
+			thread		: mach_port_move_send_t;
+			task		: mach_port_move_send_t;
+#else	/* KERNEL_USER */
+			exception_port  : mach_port_t;
+			thread          : mach_port_t;
+			task            : mach_port_t;
+#endif	/* KERNEL_USER */
+			exception       : exception_type_t;
+			code            : mach_exception_data_t;
+		  inout flavor          : int;
+			old_state       : thread_state_t;
+		    out new_state       : thread_state_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/mach_host.defs b/i386/include/mach/mach_host.defs
new file mode 100644
index 0000000..90ba9b9
--- /dev/null
+++ b/i386/include/mach/mach_host.defs
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+/*
+ * File:	mach/mach_host.defs
+ *
+ * Abstract:
+ *	Mach host operations support.  Includes processor allocation and
+ *	control.  
+ */
+
+#ifdef	MACH_KERNEL
+#include <advisory_pageout.h>
+#endif	/* MACH_KERNEL */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+		       mach_host 200;
+
+/*
+ *	Basic types
+ */
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+#include <mach/clock_types.defs>
+#include <mach_debug/mach_debug_types.defs>
+
+/*
+ * References to host objects are returned by:
+ *	mach_host_self() - trap
+ */
+
+/*
+ *	Return information about this host.
+ */
+routine host_info(
+		host		: host_t;
+		flavor		: host_flavor_t;
+	out	host_info_out	: host_info_t, CountInOut);
+
+/*
+ *	Get string describing current kernel version.
+ */
+routine	host_kernel_version(
+		host		: host_t;
+	out	kernel_version	: kernel_version_t);
+
+/*
+ *      Get host page size
+ *	(compatibility for running old libraries on new kernels -
+ *	host_page_size() is now a library routine based on constants)
+ */
+routine _host_page_size(
+		host		: host_t;
+	out	out_page_size	: vm_size_t);
+
+/*
+ *	Allow pagers to create named entries that point to un-mapped
+ *	abstract memory object.  The named entries are generally mappable
+ *	and can be subsetted through the mach_make_memory_entry call
+ */
+routine mach_memory_object_memory_entry(
+		host		:host_t;
+		internal	:boolean_t;
+		size		:vm_size_t;
+		permission	:vm_prot_t;
+		pager		:memory_object_t;
+	out	entry_handle	:mach_port_move_send_t);
+
+
+/*
+ *      Get processor info for all the processors on this host.
+ *	The returned data is an OOL array of processor info.
+ */
+routine host_processor_info(
+		host			: host_t;
+                flavor          	: processor_flavor_t;
+	out	out_processor_count 	: natural_t;
+        out     out_processor_info  	: processor_info_array_t);
+
+/*
+ * 	Return host IO master access port
+ */
+routine host_get_io_master(
+                host            : host_t;
+        out     io_master       : io_master_t);
+
+/*
+ *	Get service port for a processor set.
+ *	Available to all.
+ */
+routine host_get_clock_service(
+		host		: host_t;
+		clock_id	: clock_id_t;
+	out	clock_serv	: clock_serv_t);
+
+/*
+ * kernel module interface (obsolete as of SnowLeopard)
+ * see mach/kmod.h
+ */
+/* kmod_ MIG calls now return KERN_NOT_SUPPORTED on PPC/i386/x86_64. */
+routine	kmod_get_info(
+		host		: host_t;
+	out	modules		: kmod_args_t);
+
+/*
+ *	Returns information about the memory allocation zones.
+ *      Supported in all kernels..
+ */
+routine host_zone_info(
+		host		: host_t;
+	out	names		: zone_name_array_t,
+					Dealloc;
+	out	info		: zone_info_array_t,
+					Dealloc);
+
+/*
+ *	Returns information about the global VP table.
+ *      Only supported in MACH_VM_DEBUG kernels,
+ *      otherwise returns KERN_FAILURE.
+ */
+routine host_virtual_physical_table_info(
+		host		: host_t;
+	out	info		: hash_info_bucket_array_t,
+					Dealloc);
+
+/*
+ *	Returns information about the global reverse hash table.
+ *      This call is only valid on MACH_IPC_DEBUG kernels.
+ *      Otherwise, KERN_FAILURE is returned.
+ */
+routine host_ipc_hash_info(
+		host		: host_t;
+	out	info		: hash_info_bucket_array_t,
+					Dealloc);
+
+skip; /* was enable_bluebox */
+skip; /* was disable_bluebox */
+
+/*
+ * JMM - Keep processor_set related items at the end for easy
+ * removal.
+ */
+/*
+ *	Get default processor set for host.
+ */
+routine processor_set_default(
+		host		: host_t;
+	out	default_set	: processor_set_name_t);
+
+/*
+ *	Create new processor set.  Returns real port for manipulations,
+ *	and name port for obtaining information.
+ */
+routine processor_set_create(
+		host		: host_t;
+	out	new_set		: processor_set_t;
+	out	new_name	: processor_set_name_t);
+
+/*
+ * 	Temporary interfaces for conversion to 64 bit data path 
+ */
+
+routine mach_memory_object_memory_entry_64(
+		host		:host_t;
+		internal	:boolean_t;
+		size		:memory_object_size_t;
+		permission	:vm_prot_t;
+		pager		:memory_object_t;
+	out	entry_handle	:mach_port_move_send_t);
+
+/*
+ *	Return statistics from this host.
+ */
+routine host_statistics(
+		host_priv	: host_t;
+		flavor		: host_flavor_t;
+	out	host_info_out	: host_info_t, CountInOut);
+
+routine host_request_notification(
+		host		: host_t;
+		notify_type	: host_flavor_t;
+		notify_port	: mach_port_make_send_once_t);
+
+routine host_lockgroup_info(
+		host		: host_t;
+	out	lockgroup_info	: lockgroup_info_array_t,
+					Dealloc);
+
+/*
+ *	Return 64-bit statistics from this host.
+ */
+routine host_statistics64(
+		host_priv	: host_t;
+		flavor		: host_flavor_t;
+	out	host_info64_out	: host_info64_t, CountInOut);
+
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/mach_host.h b/i386/include/mach/mach_host.h
new file mode 100644
index 0000000..70ab53f
--- /dev/null
+++ b/i386/include/mach/mach_host.h
@@ -0,0 +1,873 @@
+#ifndef	_mach_host_user_
+#define	_mach_host_user_
+
+/* Module mach_host */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	mach_host_MSG_COUNT
+#define	mach_host_MSG_COUNT	20
+#endif	/* mach_host_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+#include <mach/mach_types.h>
+#include <mach_debug/mach_debug_types.h>
+#include <mach/mach_init.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine host_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_info
+(
+	host_t host,
+	host_flavor_t flavor,
+	host_info_t host_info_out,
+	mach_msg_type_number_t *host_info_outCnt
+);
+
+/* Routine host_kernel_version */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_kernel_version
+(
+	host_t host,
+	kernel_version_t kernel_version
+);
+
+/* Routine _host_page_size */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t _host_page_size
+(
+	host_t host,
+	vm_size_t *out_page_size
+);
+
+/* Routine mach_memory_object_memory_entry */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_memory_object_memory_entry
+(
+	host_t host,
+	boolean_t internal,
+	vm_size_t size,
+	vm_prot_t permission,
+	memory_object_t pager,
+	mach_port_t *entry_handle
+);
+
+/* Routine host_processor_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_processor_info
+(
+	host_t host,
+	processor_flavor_t flavor,
+	natural_t *out_processor_count,
+	processor_info_array_t *out_processor_info,
+	mach_msg_type_number_t *out_processor_infoCnt
+);
+
+/* Routine host_get_io_master */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_get_io_master
+(
+	host_t host,
+	io_master_t *io_master
+);
+
+/* Routine host_get_clock_service */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_get_clock_service
+(
+	host_t host,
+	clock_id_t clock_id,
+	clock_serv_t *clock_serv
+);
+
+/* Routine kmod_get_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t kmod_get_info
+(
+	host_t host,
+	kmod_args_t *modules,
+	mach_msg_type_number_t *modulesCnt
+);
+
+/* Routine host_zone_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_zone_info
+(
+	host_t host,
+	zone_name_array_t *names,
+	mach_msg_type_number_t *namesCnt,
+	zone_info_array_t *info,
+	mach_msg_type_number_t *infoCnt
+);
+
+/* Routine host_virtual_physical_table_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_virtual_physical_table_info
+(
+	host_t host,
+	hash_info_bucket_array_t *info,
+	mach_msg_type_number_t *infoCnt
+);
+
+/* Routine host_ipc_hash_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_ipc_hash_info
+(
+	host_t host,
+	hash_info_bucket_array_t *info,
+	mach_msg_type_number_t *infoCnt
+);
+
+/* Routine processor_set_default */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_default
+(
+	host_t host,
+	processor_set_name_t *default_set
+);
+
+/* Routine processor_set_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_create
+(
+	host_t host,
+	processor_set_t *new_set,
+	processor_set_name_t *new_name
+);
+
+/* Routine mach_memory_object_memory_entry_64 */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_memory_object_memory_entry_64
+(
+	host_t host,
+	boolean_t internal,
+	memory_object_size_t size,
+	vm_prot_t permission,
+	memory_object_t pager,
+	mach_port_t *entry_handle
+);
+
+/* Routine host_statistics */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_statistics
+(
+	host_t host_priv,
+	host_flavor_t flavor,
+	host_info_t host_info_out,
+	mach_msg_type_number_t *host_info_outCnt
+);
+
+/* Routine host_request_notification */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_request_notification
+(
+	host_t host,
+	host_flavor_t notify_type,
+	mach_port_t notify_port
+);
+
+/* Routine host_lockgroup_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_lockgroup_info
+(
+	host_t host,
+	lockgroup_info_array_t *lockgroup_info,
+	mach_msg_type_number_t *lockgroup_infoCnt
+);
+
+/* Routine host_statistics64 */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t host_statistics64
+(
+	host_t host_priv,
+	host_flavor_t flavor,
+	host_info64_t host_info64_out,
+	mach_msg_type_number_t *host_info64_outCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__mach_host_subsystem__defined
+#define __Request__mach_host_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		host_flavor_t flavor;
+		mach_msg_type_number_t host_info_outCnt;
+	} __Request__host_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__host_kernel_version_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request___host_page_size_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t pager;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		boolean_t internal;
+		vm_size_t size;
+		vm_prot_t permission;
+	} __Request__mach_memory_object_memory_entry_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		processor_flavor_t flavor;
+	} __Request__host_processor_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__host_get_io_master_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		clock_id_t clock_id;
+	} __Request__host_get_clock_service_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__kmod_get_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__host_zone_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__host_virtual_physical_table_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__host_ipc_hash_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__processor_set_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__processor_set_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t pager;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		boolean_t internal;
+		memory_object_size_t size;
+		vm_prot_t permission;
+	} __Request__mach_memory_object_memory_entry_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		host_flavor_t flavor;
+		mach_msg_type_number_t host_info_outCnt;
+	} __Request__host_statistics_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t notify_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		host_flavor_t notify_type;
+	} __Request__host_request_notification_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__host_lockgroup_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		host_flavor_t flavor;
+		mach_msg_type_number_t host_info64_outCnt;
+	} __Request__host_statistics64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__mach_host_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__mach_host_subsystem__defined
+#define __RequestUnion__mach_host_subsystem__defined
+union __RequestUnion__mach_host_subsystem {
+	__Request__host_info_t Request_host_info;
+	__Request__host_kernel_version_t Request_host_kernel_version;
+	__Request___host_page_size_t Request__host_page_size;
+	__Request__mach_memory_object_memory_entry_t Request_mach_memory_object_memory_entry;
+	__Request__host_processor_info_t Request_host_processor_info;
+	__Request__host_get_io_master_t Request_host_get_io_master;
+	__Request__host_get_clock_service_t Request_host_get_clock_service;
+	__Request__kmod_get_info_t Request_kmod_get_info;
+	__Request__host_zone_info_t Request_host_zone_info;
+	__Request__host_virtual_physical_table_info_t Request_host_virtual_physical_table_info;
+	__Request__host_ipc_hash_info_t Request_host_ipc_hash_info;
+	__Request__processor_set_default_t Request_processor_set_default;
+	__Request__processor_set_create_t Request_processor_set_create;
+	__Request__mach_memory_object_memory_entry_64_t Request_mach_memory_object_memory_entry_64;
+	__Request__host_statistics_t Request_host_statistics;
+	__Request__host_request_notification_t Request_host_request_notification;
+	__Request__host_lockgroup_info_t Request_host_lockgroup_info;
+	__Request__host_statistics64_t Request_host_statistics64;
+};
+#endif /* !__RequestUnion__mach_host_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__mach_host_subsystem__defined
+#define __Reply__mach_host_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t host_info_outCnt;
+		integer_t host_info_out[15];
+	} __Reply__host_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t kernel_versionOffset; /* MiG doesn't use it */
+		mach_msg_type_number_t kernel_versionCnt;
+		char kernel_version[512];
+	} __Reply__host_kernel_version_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_size_t out_page_size;
+	} __Reply___host_page_size_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t entry_handle;
+		/* end of the kernel processed data */
+	} __Reply__mach_memory_object_memory_entry_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t out_processor_info;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		natural_t out_processor_count;
+		mach_msg_type_number_t out_processor_infoCnt;
+	} __Reply__host_processor_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t io_master;
+		/* end of the kernel processed data */
+	} __Reply__host_get_io_master_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t clock_serv;
+		/* end of the kernel processed data */
+	} __Reply__host_get_clock_service_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t modules;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t modulesCnt;
+	} __Reply__kmod_get_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t names;
+		mach_msg_ool_descriptor_t info;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t namesCnt;
+		mach_msg_type_number_t infoCnt;
+	} __Reply__host_zone_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t info;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t infoCnt;
+	} __Reply__host_virtual_physical_table_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t info;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t infoCnt;
+	} __Reply__host_ipc_hash_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t default_set;
+		/* end of the kernel processed data */
+	} __Reply__processor_set_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_set;
+		mach_msg_port_descriptor_t new_name;
+		/* end of the kernel processed data */
+	} __Reply__processor_set_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t entry_handle;
+		/* end of the kernel processed data */
+	} __Reply__mach_memory_object_memory_entry_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t host_info_outCnt;
+		integer_t host_info_out[15];
+	} __Reply__host_statistics_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__host_request_notification_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t lockgroup_info;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t lockgroup_infoCnt;
+	} __Reply__host_lockgroup_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t host_info64_outCnt;
+		integer_t host_info64_out[256];
+	} __Reply__host_statistics64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__mach_host_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__mach_host_subsystem__defined
+#define __ReplyUnion__mach_host_subsystem__defined
+union __ReplyUnion__mach_host_subsystem {
+	__Reply__host_info_t Reply_host_info;
+	__Reply__host_kernel_version_t Reply_host_kernel_version;
+	__Reply___host_page_size_t Reply__host_page_size;
+	__Reply__mach_memory_object_memory_entry_t Reply_mach_memory_object_memory_entry;
+	__Reply__host_processor_info_t Reply_host_processor_info;
+	__Reply__host_get_io_master_t Reply_host_get_io_master;
+	__Reply__host_get_clock_service_t Reply_host_get_clock_service;
+	__Reply__kmod_get_info_t Reply_kmod_get_info;
+	__Reply__host_zone_info_t Reply_host_zone_info;
+	__Reply__host_virtual_physical_table_info_t Reply_host_virtual_physical_table_info;
+	__Reply__host_ipc_hash_info_t Reply_host_ipc_hash_info;
+	__Reply__processor_set_default_t Reply_processor_set_default;
+	__Reply__processor_set_create_t Reply_processor_set_create;
+	__Reply__mach_memory_object_memory_entry_64_t Reply_mach_memory_object_memory_entry_64;
+	__Reply__host_statistics_t Reply_host_statistics;
+	__Reply__host_request_notification_t Reply_host_request_notification;
+	__Reply__host_lockgroup_info_t Reply_host_lockgroup_info;
+	__Reply__host_statistics64_t Reply_host_statistics64;
+};
+#endif /* !__RequestUnion__mach_host_subsystem__defined */
+
+#ifndef subsystem_to_name_map_mach_host
+#define subsystem_to_name_map_mach_host \
+    { "host_info", 200 },\
+    { "host_kernel_version", 201 },\
+    { "_host_page_size", 202 },\
+    { "mach_memory_object_memory_entry", 203 },\
+    { "host_processor_info", 204 },\
+    { "host_get_io_master", 205 },\
+    { "host_get_clock_service", 206 },\
+    { "kmod_get_info", 207 },\
+    { "host_zone_info", 208 },\
+    { "host_virtual_physical_table_info", 209 },\
+    { "host_ipc_hash_info", 210 },\
+    { "processor_set_default", 213 },\
+    { "processor_set_create", 214 },\
+    { "mach_memory_object_memory_entry_64", 215 },\
+    { "host_statistics", 216 },\
+    { "host_request_notification", 217 },\
+    { "host_lockgroup_info", 218 },\
+    { "host_statistics64", 219 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _mach_host_user_ */
diff --git a/i386/include/mach/mach_init.h b/i386/include/mach/mach_init.h
new file mode 100644
index 0000000..36a47fa
--- /dev/null
+++ b/i386/include/mach/mach_init.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987,1986 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+
+/*
+ *	Items provided by the Mach environment initialization.
+ */
+
+#ifndef	_MACH_INIT_
+#define	_MACH_INIT_	1
+
+#include <mach/mach_types.h>
+#include <stdarg.h>
+
+#include <sys/cdefs.h>
+
+/*
+ *	Kernel-related ports; how a task/thread controls itself
+ */
+
+__BEGIN_DECLS
+extern mach_port_t mach_task_self(void);
+extern mach_port_t mach_host_self(void);
+extern mach_port_t mach_thread_self(void);
+extern kern_return_t host_page_size(host_t, vm_size_t *);
+
+extern	mach_port_t	mach_task_self_;
+#define	mach_task_self() mach_task_self_
+#define	current_task()	mach_task_self()
+
+__END_DECLS
+#include <mach/mach_traps.h>
+__BEGIN_DECLS
+
+/*
+ *	Other important ports in the Mach user environment
+ */
+
+extern	mach_port_t	bootstrap_port;
+extern	mach_port_t	name_server_port;
+extern	mach_port_t	environment_port;
+extern	mach_port_t	service_port;
+
+/*
+ *	Where these ports occur in the "mach_ports_register"
+ *	collection... only servers or the runtime library need know.
+ */
+
+#define	NAME_SERVER_SLOT	0
+#define	ENVIRONMENT_SLOT	1
+#define SERVICE_SLOT		2
+
+#define	MACH_PORTS_SLOTS_USED	3
+
+/*
+ *	Globally interesting numbers.
+ *	These macros assume vm_page_size is a power-of-2.
+ */
+
+extern	vm_size_t	vm_page_size;
+extern	vm_size_t	vm_page_mask;
+extern	int		vm_page_shift;
+
+#define trunc_page(x)	((x) & (~(vm_page_size - 1)))
+#define round_page(x)	trunc_page((x) + (vm_page_size - 1))
+
+/*
+ *	Page-size rounding macros for the fixed-width VM types.
+ */
+#define mach_vm_trunc_page(x) ((mach_vm_offset_t)(x) & ~((signed)PAGE_MASK))
+#define mach_vm_round_page(x) (((mach_vm_offset_t)(x) + PAGE_MASK) & ~((signed)PAGE_MASK))
+
+/*
+ *	fprintf_stderr uses vprintf_stderr_func to produce
+ *	error messages, this can be overridden by a user
+ *	application to point to a user-specified output function
+ */
+extern int (*vprintf_stderr_func)(const char *format, va_list ap);
+__END_DECLS
+
+#endif	/* _MACH_INIT_ */
diff --git a/i386/include/mach/mach_interface.h b/i386/include/mach/mach_interface.h
new file mode 100644
index 0000000..af939cb
--- /dev/null
+++ b/i386/include/mach/mach_interface.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (C) Apple Computer 1998
+ * ALL Rights Reserved
+ */
+/*
+ * This file represents the interfaces that used to come
+ * from creating the user headers from the mach.defs file.
+ * Because mach.defs was decomposed, this file now just
+ * wraps up all the new interface headers generated from
+ * each of the new .defs resulting from that decomposition.
+ */
+#ifndef	_MACH_INTERFACE_H_
+#define _MACH_INTERFACE_H_
+
+#include <mach/clock_priv.h>
+#include <mach/host_priv.h>
+#include <mach/host_security.h>
+#include <mach/ledger.h>
+#include <mach/lock_set.h>
+#include <mach/processor.h>
+#include <mach/processor_set.h>
+#include <mach/semaphore.h>
+#include <mach/task.h>
+#include <mach/thread_act.h>
+#include <mach/vm_map.h>
+
+#endif /* _MACH_INTERFACE_H_ */
diff --git a/i386/include/mach/mach_param.h b/i386/include/mach/mach_param.h
new file mode 100644
index 0000000..e4ead67
--- /dev/null
+++ b/i386/include/mach/mach_param.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/mach_param.h
+ *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
+ *	Date:	1986
+ *
+ *	Mach system sizing parameters
+ */
+
+#ifndef	_MACH_MACH_PARAM_H_
+#define _MACH_MACH_PARAM_H_
+
+/* Number of "registered" ports */
+
+#define TASK_PORT_REGISTER_MAX	3
+
+#endif	/* _MACH_MACH_PARAM_H_ */
diff --git a/i386/include/mach/mach_port.defs b/i386/include/mach/mach_port.defs
new file mode 100644
index 0000000..5801ee4
--- /dev/null
+++ b/i386/include/mach/mach_port.defs
@@ -0,0 +1,492 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_FREE_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/mach_port.defs
+ *	Author:	Rich Draves
+ *
+ *	Exported kernel calls.
+ */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+	  mach_port 3200;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+#include <mach_debug/mach_debug_types.defs>
+
+/*
+ *	Returns the set of port and port set names
+ *	to which the target task has access, along with
+ *	the type (set or port) for each name.
+ */
+
+routine mach_port_names(
+		task		: ipc_space_t;
+	out	names		: mach_port_name_array_t;
+	out	types		: mach_port_type_array_t);
+
+/*
+ *	Returns the type (set or port) for the port name
+ *	within the target task.  Also indicates whether
+ *	there is a dead-name request for the name.
+ */
+
+routine mach_port_type(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+	out	ptype		: mach_port_type_t);
+
+/*
+ *	Changes the name by which a port (or port set) is known to
+ *	the target task.  The new name can't be in use.  The
+ *	old name becomes available for recycling.
+ */
+
+routine mach_port_rename(
+		task		: ipc_space_t;
+		old_name	: mach_port_name_t;
+		new_name	: mach_port_name_t);
+
+/*
+ *	Allocates the specified kind of object, with the given name.
+ *	The right must be one of
+ *		MACH_PORT_RIGHT_RECEIVE
+ *		MACH_PORT_RIGHT_PORT_SET
+ *		MACH_PORT_RIGHT_DEAD_NAME
+ *	New port sets are empty.  New ports don't have any
+ *	send/send-once rights or queued messages.  The make-send
+ *	count is zero and their queue limit is MACH_PORT_QLIMIT_DEFAULT.
+ *	New sets, ports, and dead names have one user reference.
+ */
+
+routine mach_port_allocate_name(
+		task		: ipc_space_t;
+		right		: mach_port_right_t;
+		name		: mach_port_name_t);
+
+/*
+ *	Allocates the specified kind of object.
+ *	The right must be one of
+ *		MACH_PORT_RIGHT_RECEIVE
+ *		MACH_PORT_RIGHT_PORT_SET
+ *		MACH_PORT_RIGHT_DEAD_NAME
+ *	Like port_allocate_name, but the kernel picks a name.
+ *	It can use any name not associated with a right.
+ */
+
+routine mach_port_allocate(
+		task		: ipc_space_t;
+		right		: mach_port_right_t;
+	out	name		: mach_port_name_t);
+
+/*
+ *	Destroys all rights associated with the name and makes it
+ *	available for recycling immediately.  The name can be a
+ *	port (possibly with multiple user refs), a port set, or
+ *	a dead name (again, with multiple user refs).
+ */
+
+routine mach_port_destroy(
+		task		: ipc_space_t;
+		name		: mach_port_name_t);
+
+/*
+ *	Releases one send/send-once/dead-name user ref.
+ *	Just like mach_port_mod_refs -1, but deduces the
+ *	correct type of right.  This allows a user task
+ *	to release a ref for a port without worrying
+ *	about whether the port has died or not.
+ */
+
+routine mach_port_deallocate(
+		task		: ipc_space_t;
+		name		: mach_port_name_t);
+
+/*
+ *	A port set always has one user ref.
+ *	A send-once right always has one user ref.
+ *	A dead name always has one or more user refs.
+ *	A send right always has one or more user refs.
+ *	A receive right always has one user ref.
+ *	The right must be one of
+ *		MACH_PORT_RIGHT_RECEIVE
+ *		MACH_PORT_RIGHT_PORT_SET
+ *		MACH_PORT_RIGHT_DEAD_NAME
+ *		MACH_PORT_RIGHT_SEND
+ *		MACH_PORT_RIGHT_SEND_ONCE
+ */
+
+routine mach_port_get_refs(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		right		: mach_port_right_t;
+	out	refs		: mach_port_urefs_t);
+
+/*
+ *	The delta is a signed change to the task's
+ *	user ref count for the right.  Only dead names
+ *	and send rights can have a positive delta.
+ *	The resulting user ref count can't be negative.
+ *	If it is zero, the right is deallocated.
+ *	If the name isn't a composite right, it becomes
+ *	available for recycling.  The right must be one of
+ *		MACH_PORT_RIGHT_RECEIVE
+ *		MACH_PORT_RIGHT_PORT_SET
+ *		MACH_PORT_RIGHT_DEAD_NAME
+ *		MACH_PORT_RIGHT_SEND
+ *		MACH_PORT_RIGHT_SEND_ONCE
+ */
+
+routine mach_port_mod_refs(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		right		: mach_port_right_t;
+		delta		: mach_port_delta_t);
+
+skip;
+
+/*
+ *	Only valid for receive rights.
+ *	Sets the make-send count for the port.
+ */
+routine mach_port_set_mscount(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		mscount		: mach_port_mscount_t);
+
+/*
+ *	Only valid for port sets.  Returns a list of
+ *	the members.
+ */
+
+routine mach_port_get_set_status(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+	out	members		: mach_port_name_array_t);
+
+/*
+ *	Puts the member port (the task must have receive rights)
+ *	into the after port set.  If the port is already a member
+ *	of any set(s), it is atomically removed from those sets as
+ *	part of this operation.  (If after is MACH_PORT_NULL, the
+ *	port is still removed from all current sets).
+ */
+
+routine mach_port_move_member(
+		task		: ipc_space_t;
+		member		: mach_port_name_t;
+		after		: mach_port_name_t);
+
+/*
+ *	Requests a notification from the kernel.  The request
+ *	must supply the send-once right which is used for
+ *	the notification.  If a send-once right was previously
+ *	registered, it is returned.  The msg_id must be one of
+ *		MACH_NOTIFY_PORT_DESTROYED (receive rights)
+ *		MACH_NOTIFY_DEAD_NAME (send/receive/send-once rights)
+ *		MACH_NOTIFY_NO_SENDERS (receive rights)
+ *
+ *	The sync value specifies whether a notification should
+ *	get sent immediately, if appropriate.  The exact meaning
+ *	depends on the notification:
+ *		MACH_NOTIFY_PORT_DESTROYED: must be zero.
+ *		MACH_NOTIFY_DEAD_NAME: if non-zero, then name can be dead,
+ *			and the notification gets sent immediately.
+ *			If zero, then name can't be dead.
+ *		MACH_NOTIFY_NO_SENDERS: the notification gets sent
+ *			immediately if the current mscount is greater
+ *			than or equal to the sync value and there are no
+ *			extant send rights.
+ */
+
+routine mach_port_request_notification(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		msgid		: mach_msg_id_t;
+		sync		: mach_port_mscount_t;
+		notify		: mach_port_send_once_t;
+	out	previous	: mach_port_move_send_once_t);
+
+/*
+ *	Inserts the specified rights into the target task,
+ *	using the specified name.  If inserting send/receive
+ *	rights and the task already has send/receive rights
+ *	for the port, then the names must agree.  In any case,
+ *	the task gains a user ref for the port.
+ */
+
+routine mach_port_insert_right(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		poly		: mach_port_poly_t);
+
+/*
+ *	Returns the specified right for the named port
+ *	in the target task, extracting that right from
+ *	the target task.  The target task loses a user
+ *	ref and the name may be available for recycling.
+ *	msgt_name must be one of
+ *		MACH_MSG_TYPE_MOVE_RECEIVE
+ *		MACH_MSG_TYPE_COPY_SEND
+ *		MACH_MSG_TYPE_MAKE_SEND
+ *		MACH_MSG_TYPE_MOVE_SEND
+ *		MACH_MSG_TYPE_MAKE_SEND_ONCE
+ *		MACH_MSG_TYPE_MOVE_SEND_ONCE
+ */
+
+routine mach_port_extract_right(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		msgt_name	: mach_msg_type_name_t;
+	out	poly		: mach_port_poly_t);
+
+/*
+ *	Only valid for receive rights.
+ *	Sets the sequence number for the port.
+ */
+
+routine mach_port_set_seqno(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		seqno		: mach_port_seqno_t);
+
+/*
+ *      Returns information about a port.
+ */
+
+routine mach_port_get_attributes(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		flavor		: mach_port_flavor_t;
+	out	port_info_out	: mach_port_info_t, CountInOut);
+
+/*
+ *      Set attributes of a port
+ */
+
+routine mach_port_set_attributes(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		flavor		: mach_port_flavor_t;
+		port_info	: mach_port_info_t);
+
+
+/*
+ *	Allocates the specified kind of object, qos version.
+ *	The right must be
+ *		MACH_PORT_RIGHT_RECEIVE
+ *	Like port_allocate_name, but the kernel picks a name.
+ *	It can use any name not associated with a right.
+ */
+
+routine mach_port_allocate_qos(
+		task		: ipc_space_t;
+		right		: mach_port_right_t;
+	inout	qos		: mach_port_qos_t;
+	out	name		: mach_port_name_t);
+
+
+/*
+ *	Generic interface to allocation various kinds of ports.
+ *	Should never be called directly by users (at least not
+ *	unless they are exceedingly masochistic).
+ */
+
+routine mach_port_allocate_full(
+		task		: ipc_space_t;
+		right		: mach_port_right_t;
+		proto		: mach_port_t;
+	inout	qos		: mach_port_qos_t;
+	inout	name		: mach_port_name_t);
+
+
+/*
+ *	Pre-expand task port name space.
+ */
+routine task_set_port_space(
+		task		: ipc_space_t;
+		table_entries	: int);
+
+
+/*
+ *	Returns the exact number of extant send rights
+ *	for the given receive right.
+ *      This call is only valid on MACH_IPC_DEBUG kernels.
+ *      Otherwise, KERN_FAILURE is returned.
+ */
+routine	mach_port_get_srights(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+	out	srights		: mach_port_rights_t);
+
+
+/*
+ *	Returns information about an IPC space.
+ *      This call is only valid on MACH_IPC_DEBUG kernels.
+ *      Otherwise, KERN_FAILURE is returned.
+ */
+routine mach_port_space_info(
+		task		: ipc_space_t;
+	out	space_info	: ipc_info_space_t;
+	out	table_info	: ipc_info_name_array_t;
+	out	tree_info	: ipc_info_tree_name_array_t);
+
+/*
+ *	Returns information about the dead-name requests
+ *	registered with the named receive right.
+ *      This call is only valid on MACH_IPC_DEBUG kernels.
+ *      Otherwise, KERN_FAILURE is returned.
+ */
+routine mach_port_dnrequest_info(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+	out	dnr_total	: unsigned;	/* total size of table */
+	out	dnr_used	: unsigned);	/* amount used */
+
+/*
+ *	Return the type and address of the kernel object
+ *	that the given send/receive right represents.
+ *      This call is only valid on MACH_IPC_DEBUG kernels.
+ *      Otherwise, KERN_FAILURE is returned.
+ *
+ *	This interface is DEPRECATED in favor of the new
+ *	mach_port_kernel_object64() call (see below).
+ */
+routine	mach_port_kernel_object(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+	out	object_type	: unsigned;
+	out	object_addr	: unsigned);
+
+
+/*
+ *	Inserts the specified rights into the portset identified
+ *	by the <task, pset> pair.  The results of passing in the
+ *	Poly argument via the supplied disposition must yield a
+ *	receive right.
+ *
+ *	If the <task,pset> pair does not represent a valid portset
+ *	KERN_INVALID_RIGHT is returned.
+ *	
+ *	If the passed in name argument does not represent a receive
+ *	right, KERN_INVALID_CAPABILITY will be returned.
+ *
+ *	If the port represented by the receive right is already in
+ *	the portset, KERN_ALREADY_IN_SET is returned.
+ */
+routine mach_port_insert_member(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		pset		: mach_port_name_t);
+
+/*
+ *	Extracts the specified right from the named portset
+ *	in the target task.  
+ *	the target task.  The target task loses a user
+ *	ref and the name may be available for recycling.
+ *	msgt_name must be one of
+ *		MACH_MSG_TYPE_MOVE_RECEIVE
+ *		MACH_MSG_TYPE_COPY_SEND
+ *		MACH_MSG_TYPE_MAKE_SEND
+ *		MACH_MSG_TYPE_MOVE_SEND
+ *		MACH_MSG_TYPE_MAKE_SEND_ONCE
+ *		MACH_MSG_TYPE_MOVE_SEND_ONCE
+ */
+
+routine mach_port_extract_member(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		pset		: mach_port_name_t);
+
+/*
+ * Only valid for receive rights.
+ * Gets the context pointer for the port.
+ */
+
+routine mach_port_get_context(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+	out context		: mach_vm_address_t);
+
+/*
+ * Only valid for receive rights.
+ * Sets the context pointer for the port.
+ */
+
+routine mach_port_set_context(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+		context		: mach_vm_address_t);
+
+/*
+ *	Return the type and address of the kernel object
+ *	that the given send/receive right represents.
+ *      This call is only valid on MACH_IPC_DEBUG kernels.
+ *      Otherwise, KERN_FAILURE is returned.
+ */
+routine	mach_port_kobject(
+		task		: ipc_space_t;
+		name		: mach_port_name_t;
+	out	object_type	: natural_t;
+	out	object_addr	: mach_vm_address_t);
+
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/mach_port.h b/i386/include/mach/mach_port.h
new file mode 100644
index 0000000..c964828
--- /dev/null
+++ b/i386/include/mach/mach_port.h
@@ -0,0 +1,1383 @@
+#ifndef	_mach_port_user_
+#define	_mach_port_user_
+
+/* Module mach_port */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	mach_port_MSG_COUNT
+#define	mach_port_MSG_COUNT	31
+#endif	/* mach_port_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+#include <mach_debug/mach_debug_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine mach_port_names */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_names
+(
+	ipc_space_t task,
+	mach_port_name_array_t *names,
+	mach_msg_type_number_t *namesCnt,
+	mach_port_type_array_t *types,
+	mach_msg_type_number_t *typesCnt
+);
+
+/* Routine mach_port_type */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_type
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_type_t *ptype
+);
+
+/* Routine mach_port_rename */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_rename
+(
+	ipc_space_t task,
+	mach_port_name_t old_name,
+	mach_port_name_t new_name
+);
+
+/* Routine mach_port_allocate_name */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_allocate_name
+(
+	ipc_space_t task,
+	mach_port_right_t right,
+	mach_port_name_t name
+);
+
+/* Routine mach_port_allocate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_allocate
+(
+	ipc_space_t task,
+	mach_port_right_t right,
+	mach_port_name_t *name
+);
+
+/* Routine mach_port_destroy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_destroy
+(
+	ipc_space_t task,
+	mach_port_name_t name
+);
+
+/* Routine mach_port_deallocate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_deallocate
+(
+	ipc_space_t task,
+	mach_port_name_t name
+);
+
+/* Routine mach_port_get_refs */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_get_refs
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_right_t right,
+	mach_port_urefs_t *refs
+);
+
+/* Routine mach_port_mod_refs */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_mod_refs
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_right_t right,
+	mach_port_delta_t delta
+);
+
+/* Routine mach_port_set_mscount */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_set_mscount
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_mscount_t mscount
+);
+
+/* Routine mach_port_get_set_status */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_get_set_status
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_name_array_t *members,
+	mach_msg_type_number_t *membersCnt
+);
+
+/* Routine mach_port_move_member */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_move_member
+(
+	ipc_space_t task,
+	mach_port_name_t member,
+	mach_port_name_t after
+);
+
+/* Routine mach_port_request_notification */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_request_notification
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_msg_id_t msgid,
+	mach_port_mscount_t sync,
+	mach_port_t notify,
+	mach_msg_type_name_t notifyPoly,
+	mach_port_t *previous
+);
+
+/* Routine mach_port_insert_right */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_insert_right
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_t poly,
+	mach_msg_type_name_t polyPoly
+);
+
+/* Routine mach_port_extract_right */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_extract_right
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_msg_type_name_t msgt_name,
+	mach_port_t *poly,
+	mach_msg_type_name_t *polyPoly
+);
+
+/* Routine mach_port_set_seqno */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_set_seqno
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_seqno_t seqno
+);
+
+/* Routine mach_port_get_attributes */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_get_attributes
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_flavor_t flavor,
+	mach_port_info_t port_info_out,
+	mach_msg_type_number_t *port_info_outCnt
+);
+
+/* Routine mach_port_set_attributes */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_set_attributes
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_flavor_t flavor,
+	mach_port_info_t port_info,
+	mach_msg_type_number_t port_infoCnt
+);
+
+/* Routine mach_port_allocate_qos */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_allocate_qos
+(
+	ipc_space_t task,
+	mach_port_right_t right,
+	mach_port_qos_t *qos,
+	mach_port_name_t *name
+);
+
+/* Routine mach_port_allocate_full */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_allocate_full
+(
+	ipc_space_t task,
+	mach_port_right_t right,
+	mach_port_t proto,
+	mach_port_qos_t *qos,
+	mach_port_name_t *name
+);
+
+/* Routine task_set_port_space */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_port_space
+(
+	ipc_space_t task,
+	int table_entries
+);
+
+/* Routine mach_port_get_srights */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_get_srights
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_rights_t *srights
+);
+
+/* Routine mach_port_space_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_space_info
+(
+	ipc_space_t task,
+	ipc_info_space_t *space_info,
+	ipc_info_name_array_t *table_info,
+	mach_msg_type_number_t *table_infoCnt,
+	ipc_info_tree_name_array_t *tree_info,
+	mach_msg_type_number_t *tree_infoCnt
+);
+
+/* Routine mach_port_dnrequest_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_dnrequest_info
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	unsigned *dnr_total,
+	unsigned *dnr_used
+);
+
+/* Routine mach_port_kernel_object */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_kernel_object
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	unsigned *object_type,
+	unsigned *object_addr
+);
+
+/* Routine mach_port_insert_member */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_insert_member
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_name_t pset
+);
+
+/* Routine mach_port_extract_member */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_extract_member
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_port_name_t pset
+);
+
+/* Routine mach_port_get_context */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_get_context
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_vm_address_t *context
+);
+
+/* Routine mach_port_set_context */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_set_context
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	mach_vm_address_t context
+);
+
+/* Routine mach_port_kobject */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_port_kobject
+(
+	ipc_space_t task,
+	mach_port_name_t name,
+	natural_t *object_type,
+	mach_vm_address_t *object_addr
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__mach_port_subsystem__defined
+#define __Request__mach_port_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__mach_port_names_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+	} __Request__mach_port_type_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t old_name;
+		mach_port_name_t new_name;
+	} __Request__mach_port_rename_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_right_t right;
+		mach_port_name_t name;
+	} __Request__mach_port_allocate_name_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_right_t right;
+	} __Request__mach_port_allocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+	} __Request__mach_port_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+	} __Request__mach_port_deallocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_port_right_t right;
+	} __Request__mach_port_get_refs_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_port_right_t right;
+		mach_port_delta_t delta;
+	} __Request__mach_port_mod_refs_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_port_mscount_t mscount;
+	} __Request__mach_port_set_mscount_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+	} __Request__mach_port_get_set_status_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t member;
+		mach_port_name_t after;
+	} __Request__mach_port_move_member_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t notify;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_msg_id_t msgid;
+		mach_port_mscount_t sync;
+	} __Request__mach_port_request_notification_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t poly;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_port_name_t name;
+	} __Request__mach_port_insert_right_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_msg_type_name_t msgt_name;
+	} __Request__mach_port_extract_right_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_port_seqno_t seqno;
+	} __Request__mach_port_set_seqno_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_port_flavor_t flavor;
+		mach_msg_type_number_t port_info_outCnt;
+	} __Request__mach_port_get_attributes_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_port_flavor_t flavor;
+		mach_msg_type_number_t port_infoCnt;
+		integer_t port_info[10];
+	} __Request__mach_port_set_attributes_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_right_t right;
+		mach_port_qos_t qos;
+	} __Request__mach_port_allocate_qos_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t proto;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_port_right_t right;
+		mach_port_qos_t qos;
+		mach_port_name_t name;
+	} __Request__mach_port_allocate_full_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int table_entries;
+	} __Request__task_set_port_space_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+	} __Request__mach_port_get_srights_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__mach_port_space_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+	} __Request__mach_port_dnrequest_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+	} __Request__mach_port_kernel_object_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_port_name_t pset;
+	} __Request__mach_port_insert_member_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_port_name_t pset;
+	} __Request__mach_port_extract_member_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+	} __Request__mach_port_get_context_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+		mach_vm_address_t context;
+	} __Request__mach_port_set_context_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_port_name_t name;
+	} __Request__mach_port_kobject_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__mach_port_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__mach_port_subsystem__defined
+#define __RequestUnion__mach_port_subsystem__defined
+union __RequestUnion__mach_port_subsystem {
+	__Request__mach_port_names_t Request_mach_port_names;
+	__Request__mach_port_type_t Request_mach_port_type;
+	__Request__mach_port_rename_t Request_mach_port_rename;
+	__Request__mach_port_allocate_name_t Request_mach_port_allocate_name;
+	__Request__mach_port_allocate_t Request_mach_port_allocate;
+	__Request__mach_port_destroy_t Request_mach_port_destroy;
+	__Request__mach_port_deallocate_t Request_mach_port_deallocate;
+	__Request__mach_port_get_refs_t Request_mach_port_get_refs;
+	__Request__mach_port_mod_refs_t Request_mach_port_mod_refs;
+	__Request__mach_port_set_mscount_t Request_mach_port_set_mscount;
+	__Request__mach_port_get_set_status_t Request_mach_port_get_set_status;
+	__Request__mach_port_move_member_t Request_mach_port_move_member;
+	__Request__mach_port_request_notification_t Request_mach_port_request_notification;
+	__Request__mach_port_insert_right_t Request_mach_port_insert_right;
+	__Request__mach_port_extract_right_t Request_mach_port_extract_right;
+	__Request__mach_port_set_seqno_t Request_mach_port_set_seqno;
+	__Request__mach_port_get_attributes_t Request_mach_port_get_attributes;
+	__Request__mach_port_set_attributes_t Request_mach_port_set_attributes;
+	__Request__mach_port_allocate_qos_t Request_mach_port_allocate_qos;
+	__Request__mach_port_allocate_full_t Request_mach_port_allocate_full;
+	__Request__task_set_port_space_t Request_task_set_port_space;
+	__Request__mach_port_get_srights_t Request_mach_port_get_srights;
+	__Request__mach_port_space_info_t Request_mach_port_space_info;
+	__Request__mach_port_dnrequest_info_t Request_mach_port_dnrequest_info;
+	__Request__mach_port_kernel_object_t Request_mach_port_kernel_object;
+	__Request__mach_port_insert_member_t Request_mach_port_insert_member;
+	__Request__mach_port_extract_member_t Request_mach_port_extract_member;
+	__Request__mach_port_get_context_t Request_mach_port_get_context;
+	__Request__mach_port_set_context_t Request_mach_port_set_context;
+	__Request__mach_port_kobject_t Request_mach_port_kobject;
+};
+#endif /* !__RequestUnion__mach_port_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__mach_port_subsystem__defined
+#define __Reply__mach_port_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t names;
+		mach_msg_ool_descriptor_t types;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t namesCnt;
+		mach_msg_type_number_t typesCnt;
+	} __Reply__mach_port_names_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_port_type_t ptype;
+	} __Reply__mach_port_type_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_rename_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_allocate_name_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_port_name_t name;
+	} __Reply__mach_port_allocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_deallocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_port_urefs_t refs;
+	} __Reply__mach_port_get_refs_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_mod_refs_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_set_mscount_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t members;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t membersCnt;
+	} __Reply__mach_port_get_set_status_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_move_member_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t previous;
+		/* end of the kernel processed data */
+	} __Reply__mach_port_request_notification_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_insert_right_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t poly;
+		/* end of the kernel processed data */
+	} __Reply__mach_port_extract_right_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_set_seqno_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t port_info_outCnt;
+		integer_t port_info_out[10];
+	} __Reply__mach_port_get_attributes_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_set_attributes_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_port_qos_t qos;
+		mach_port_name_t name;
+	} __Reply__mach_port_allocate_qos_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_port_qos_t qos;
+		mach_port_name_t name;
+	} __Reply__mach_port_allocate_full_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_port_space_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_port_rights_t srights;
+	} __Reply__mach_port_get_srights_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t table_info;
+		mach_msg_ool_descriptor_t tree_info;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		ipc_info_space_t space_info;
+		mach_msg_type_number_t table_infoCnt;
+		mach_msg_type_number_t tree_infoCnt;
+	} __Reply__mach_port_space_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		unsigned dnr_total;
+		unsigned dnr_used;
+	} __Reply__mach_port_dnrequest_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		unsigned object_type;
+		unsigned object_addr;
+	} __Reply__mach_port_kernel_object_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_insert_member_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_extract_member_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_vm_address_t context;
+	} __Reply__mach_port_get_context_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_port_set_context_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		natural_t object_type;
+		mach_vm_address_t object_addr;
+	} __Reply__mach_port_kobject_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__mach_port_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__mach_port_subsystem__defined
+#define __ReplyUnion__mach_port_subsystem__defined
+union __ReplyUnion__mach_port_subsystem {
+	__Reply__mach_port_names_t Reply_mach_port_names;
+	__Reply__mach_port_type_t Reply_mach_port_type;
+	__Reply__mach_port_rename_t Reply_mach_port_rename;
+	__Reply__mach_port_allocate_name_t Reply_mach_port_allocate_name;
+	__Reply__mach_port_allocate_t Reply_mach_port_allocate;
+	__Reply__mach_port_destroy_t Reply_mach_port_destroy;
+	__Reply__mach_port_deallocate_t Reply_mach_port_deallocate;
+	__Reply__mach_port_get_refs_t Reply_mach_port_get_refs;
+	__Reply__mach_port_mod_refs_t Reply_mach_port_mod_refs;
+	__Reply__mach_port_set_mscount_t Reply_mach_port_set_mscount;
+	__Reply__mach_port_get_set_status_t Reply_mach_port_get_set_status;
+	__Reply__mach_port_move_member_t Reply_mach_port_move_member;
+	__Reply__mach_port_request_notification_t Reply_mach_port_request_notification;
+	__Reply__mach_port_insert_right_t Reply_mach_port_insert_right;
+	__Reply__mach_port_extract_right_t Reply_mach_port_extract_right;
+	__Reply__mach_port_set_seqno_t Reply_mach_port_set_seqno;
+	__Reply__mach_port_get_attributes_t Reply_mach_port_get_attributes;
+	__Reply__mach_port_set_attributes_t Reply_mach_port_set_attributes;
+	__Reply__mach_port_allocate_qos_t Reply_mach_port_allocate_qos;
+	__Reply__mach_port_allocate_full_t Reply_mach_port_allocate_full;
+	__Reply__task_set_port_space_t Reply_task_set_port_space;
+	__Reply__mach_port_get_srights_t Reply_mach_port_get_srights;
+	__Reply__mach_port_space_info_t Reply_mach_port_space_info;
+	__Reply__mach_port_dnrequest_info_t Reply_mach_port_dnrequest_info;
+	__Reply__mach_port_kernel_object_t Reply_mach_port_kernel_object;
+	__Reply__mach_port_insert_member_t Reply_mach_port_insert_member;
+	__Reply__mach_port_extract_member_t Reply_mach_port_extract_member;
+	__Reply__mach_port_get_context_t Reply_mach_port_get_context;
+	__Reply__mach_port_set_context_t Reply_mach_port_set_context;
+	__Reply__mach_port_kobject_t Reply_mach_port_kobject;
+};
+#endif /* !__RequestUnion__mach_port_subsystem__defined */
+
+#ifndef subsystem_to_name_map_mach_port
+#define subsystem_to_name_map_mach_port \
+    { "mach_port_names", 3200 },\
+    { "mach_port_type", 3201 },\
+    { "mach_port_rename", 3202 },\
+    { "mach_port_allocate_name", 3203 },\
+    { "mach_port_allocate", 3204 },\
+    { "mach_port_destroy", 3205 },\
+    { "mach_port_deallocate", 3206 },\
+    { "mach_port_get_refs", 3207 },\
+    { "mach_port_mod_refs", 3208 },\
+    { "mach_port_set_mscount", 3210 },\
+    { "mach_port_get_set_status", 3211 },\
+    { "mach_port_move_member", 3212 },\
+    { "mach_port_request_notification", 3213 },\
+    { "mach_port_insert_right", 3214 },\
+    { "mach_port_extract_right", 3215 },\
+    { "mach_port_set_seqno", 3216 },\
+    { "mach_port_get_attributes", 3217 },\
+    { "mach_port_set_attributes", 3218 },\
+    { "mach_port_allocate_qos", 3219 },\
+    { "mach_port_allocate_full", 3220 },\
+    { "task_set_port_space", 3221 },\
+    { "mach_port_get_srights", 3222 },\
+    { "mach_port_space_info", 3223 },\
+    { "mach_port_dnrequest_info", 3224 },\
+    { "mach_port_kernel_object", 3225 },\
+    { "mach_port_insert_member", 3226 },\
+    { "mach_port_extract_member", 3227 },\
+    { "mach_port_get_context", 3228 },\
+    { "mach_port_set_context", 3229 },\
+    { "mach_port_kobject", 3230 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _mach_port_user_ */
diff --git a/i386/include/mach/mach_syscalls.h b/i386/include/mach/mach_syscalls.h
new file mode 100644
index 0000000..0e04e4f
--- /dev/null
+++ b/i386/include/mach/mach_syscalls.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+#ifndef _MACH_MACH_SYSCALLS_H_
+#define	_MACH_MACH_SYSCALLS_H_
+
+#include <mach/mach_traps.h>
+
+#endif	/* _MACH_MACH_SYSCALLS_H_ */
diff --git a/i386/include/mach/mach_time.h b/i386/include/mach/mach_time.h
new file mode 100644
index 0000000..6a7ce4f
--- /dev/null
+++ b/i386/include/mach/mach_time.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2001-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_MACH_MACH_TIME_H_
+#define	_MACH_MACH_TIME_H_
+
+#include <mach/mach_types.h>
+
+#include <sys/cdefs.h>
+
+struct mach_timebase_info {
+	uint32_t	numer;
+	uint32_t	denom;
+};
+
+typedef struct mach_timebase_info	*mach_timebase_info_t;
+typedef struct mach_timebase_info	mach_timebase_info_data_t;
+
+__BEGIN_DECLS
+
+kern_return_t		mach_timebase_info(
+						mach_timebase_info_t	info);
+
+kern_return_t		mach_wait_until(
+						uint64_t		deadline);
+
+
+uint64_t			mach_absolute_time(void);
+__END_DECLS
+
+#endif /* _MACH_MACH_TIME_H_ */
diff --git a/i386/include/mach/mach_traps.h b/i386/include/mach/mach_traps.h
new file mode 100644
index 0000000..50cbd0a
--- /dev/null
+++ b/i386/include/mach/mach_traps.h
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	Definitions of general Mach system traps.
+ *
+ *	These are the definitions as seen from user-space.
+ *	The kernel definitions are in <mach/syscall_sw.h>.
+ *	Kernel RPC functions are defined in <mach/mach_interface.h>.
+ */
+
+#ifndef	_MACH_MACH_TRAPS_H_
+#define _MACH_MACH_TRAPS_H_
+
+#include <stdint.h>
+
+#include <mach/std_types.h>
+#include <mach/mach_types.h>
+#include <mach/kern_return.h>
+#include <mach/port.h>
+#include <mach/vm_types.h>
+#include <mach/clock_types.h>
+
+#include <machine/endian.h>
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+
+
+
+extern kern_return_t macx_swapon(
+				uint64_t filename,
+				int flags,
+				int size,
+				int priority);
+
+extern kern_return_t macx_swapoff(
+				uint64_t filename,
+				int flags);
+
+extern kern_return_t macx_triggers(
+				int hi_water,
+				int low_water,
+				int flags,
+				mach_port_t alert_port);
+
+extern kern_return_t macx_backing_store_suspend(
+				boolean_t suspend);
+
+extern kern_return_t macx_backing_store_recovery(
+				int pid);
+
+extern boolean_t swtch_pri(int pri);
+
+extern boolean_t swtch(void);
+
+extern kern_return_t thread_switch(
+				mach_port_name_t thread_name,
+				int option,
+				mach_msg_timeout_t option_time);
+
+extern mach_port_name_t task_self_trap(void);
+
+/*
+ *	Obsolete interfaces.
+ */
+
+extern kern_return_t task_for_pid(
+				mach_port_name_t target_tport,
+				int pid,
+				mach_port_name_t *t);
+
+extern kern_return_t task_name_for_pid(
+				mach_port_name_t target_tport,
+				int pid,
+				mach_port_name_t *tn);
+
+extern kern_return_t pid_for_task(
+				mach_port_name_t t,
+				int *x);
+
+#if		!defined(__LP64__)
+/* these should go away altogether - so no 64 legacy please */
+
+extern kern_return_t map_fd(
+				int fd,
+				vm_offset_t offset,
+				vm_offset_t *va,
+				boolean_t findspace,
+				vm_size_t size);
+
+#endif	/* !defined(__LP64__) */
+
+
+__END_DECLS
+
+#endif	/* _MACH_MACH_TRAPS_H_ */
diff --git a/i386/include/mach/mach_types.defs b/i386/include/mach/mach_types.defs
new file mode 100644
index 0000000..d325179
--- /dev/null
+++ b/i386/include/mach/mach_types.defs
@@ -0,0 +1,474 @@
+/*
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ * NOTICE: This file was modified by McAfee Research in 2004 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
+/*
+ */
+/*
+ *	Mach kernel interface type declarations
+ */
+
+#ifndef	_MACH_MACH_TYPES_DEFS_
+#define _MACH_MACH_TYPES_DEFS_
+
+
+#include <mach/std_types.defs>
+
+type memory_object_offset_t 	= uint64_t;
+type memory_object_size_t 	= uint64_t;
+type memory_object_cluster_size_t = uint32_t;
+type memory_object_fault_info_t = array[16] of integer_t;
+
+
+type mach_port_status_t = struct[10] of integer_t;	/* obsolete */
+
+		/* mach_port_info_t: can hold either a
+		 * mach_port_status_t (9 ints) or a
+		 * mach_port_limits_t (1 int). If new flavors of
+		 * mach_port_{get,set}_attributes are added, the size of
+		 * this array may have to be increased. (See mach/port.h)
+		 */
+type mach_port_flavor_t 	= int;
+type mach_port_info_t		= array[*:10] of integer_t;
+
+type task_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: task_t convert_port_to_task(mach_port_t)
+		outtran: mach_port_t convert_task_to_port(task_t)
+		destructor: task_deallocate(task_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type task_name_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: task_name_t convert_port_to_task_name(mach_port_t)
+		outtran: mach_port_t convert_task_name_to_port(task_name_t)
+		destructor: task_name_deallocate(task_name_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type thread_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: thread_t convert_port_to_thread(mach_port_t)
+		outtran: mach_port_t convert_thread_to_port(thread_t)
+		destructor: thread_deallocate(thread_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type thread_act_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: thread_act_t convert_port_to_thread(mach_port_t)
+		outtran: mach_port_t convert_thread_to_port(thread_act_t)
+		destructor: thread_deallocate(thread_act_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type thread_act_consume_ref_t = mach_port_move_send_t
+		cusertype: thread_act_t
+#if	KERNEL_SERVER
+		intran: thread_act_t convert_port_to_thread(mach_port_t)
+		destructor: thread_deallocate(thread_act_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+		/* thread_state_t: This inline array can hold
+		 * a machine-dependent amount of data, defined in
+		 * mach/machine/???? (currently THREAD_STATE_MAX,
+		 * in mach/thread_state.h)
+		 */
+#include <mach/machine/thread_state.h>
+type thread_state_flavor_t	= int;
+type thread_state_t		= array[*:THREAD_STATE_MAX] of natural_t;
+
+type task_array_t = ^array[] of task_t;
+type thread_array_t = ^array[] of thread_t;
+type thread_act_array_t = ^array[] of thread_act_t;
+type act_params_t = array[6] of int;
+
+type vm_map_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: vm_map_t convert_port_to_map(mach_port_t)
+		destructor: vm_map_deallocate(vm_map_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type vm_task_entry_t = mach_port_t
+		cusertype: vm_map_t
+#if	KERNEL_SERVER
+		intran: vm_map_t convert_port_entry_to_map(mach_port_t)
+		destructor: vm_map_deallocate(vm_map_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type ipc_space_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: ipc_space_t convert_port_to_space(mach_port_t)
+		destructor: space_deallocate(ipc_space_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type vm_prot_t = int;
+type vm_inherit_t = int;
+type vm_purgable_t = int;
+type xxx_vm_statistics_data_t = struct[13] of integer_t;
+type vm_behavior_t = int;
+type vm_statistics_data_t = struct[15] of integer_t;
+type vm_machine_attribute_t = int;
+type vm_machine_attribute_val_t = int;
+type vm_sync_t = int;
+
+		/* thread_info_t: this inline array can hold any of:
+		 * thread_basic_info_t (10 ints)
+		 * policy_timeshare_info_t (5 ints)
+		 * policy_fifo_info_t (4 ints)
+		 * policy_rr_info_t (5 ints)
+		 * if other thread_info flavors are added, this
+		 * definition may need to be changed. (See
+		 * mach/thread_info.h and mach/policy.h) */
+type thread_flavor_t		= int;
+type thread_info_t		= array[*:12] of integer_t;
+
+type thread_policy_flavor_t	= natural_t;
+type thread_policy_t		= array[*:16] of integer_t;
+
+		/* task_info_t: this inline array can hold any of:
+		 * task_basic_info_32_t (8 ints)
+		 * task_basic_info_64_t (10 ints)
+		 * task_events_info_t (8 ints)
+		 * task_thread_times_info_t (4 ints)
+		 * policy_timeshare_info_t (5 ints)
+		 * policy_fifo_info_t (4 ints)
+		 * policy_rr_info_t (5 ints)
+		 * task security token (2 ints)
+		 * task audit token (8 ints)
+		 * If other task_info flavors are added, this
+		 * definition may need to be changed. (See
+		 * mach/task_info.h and mach/policy.h) */
+type task_flavor_t		= int;
+type task_info_t		= array[*:10] of integer_t;
+
+type task_policy_flavor_t	= natural_t;
+type task_policy_t		= array[*:16] of integer_t;
+
+type mem_entry_name_port_t = mach_port_t
+#if     KERNEL_SERVER
+		intran: mem_entry_name_port_t null_conversion(mach_port_t)
+		outtran: mach_port_t null_conversion(mem_entry_name_port_t)
+#endif  /* KERNEL_SERVER */
+		;
+
+type mem_entry_name_port_move_send_t = mach_port_move_send_t
+	cusertype: mem_entry_name_port_t
+#if     KERNEL_SERVER
+		intran: mem_entry_name_port_t null_conversion(mach_port_t)
+		outtran: mach_port_t null_conversion(mem_entry_name_port_t)
+#endif  /* KERNEL_SERVER */
+		;
+
+type memory_object_default_t = mach_port_t
+		;
+ 
+type memory_object_t = mach_port_t
+		;
+
+
+type memory_object_control_t = mach_port_t
+		;
+
+type memory_object_name_t = mach_port_t
+		ctype: mach_port_t
+		;
+
+
+type memory_object_copy_strategy_t = int;
+type memory_object_return_t = int;
+
+type machine_info_data_t = struct[5] of integer_t;
+type machine_slot_data_t = struct[8] of integer_t;
+
+type host_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: host_t convert_port_to_host(mach_port_t)
+		outtran: mach_port_t convert_host_to_port(host_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type host_priv_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: host_priv_t convert_port_to_host_priv(mach_port_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type host_security_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: host_security_t convert_port_to_host_security(mach_port_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+		/* 
+		 * host_info_t: variable-sized inline array that can contain:
+		 * 
+		 * 	host_basic_info_old_t (5 ints)
+		 * 	host_basic_info_t (12 ints)
+		 * 	host_sched_info_t (2 ints)
+		 * 	kernel_resource_sizes_t (5 ints)
+		 * 	host_load_info_t (6 ints)
+		 * 	vm_statistics32_t (15 ints)
+		 * 
+		 * If other host_info flavors are added, this definition may
+		 * need to be changed. (See mach/{host_info,vm_statistics}.h)
+		 */
+type host_flavor_t		= int;
+type host_info_t 		= array[*:15] of integer_t;
+
+
+		/* 
+		 * host_info64_t: variable-sized inline array that can contain:
+		 * 
+		 *	vm_statistics_t (6 ints and 9 longs)
+		 */
+type host_info64_t		= array[*:256] of integer_t;
+
+type processor_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: processor_t convert_port_to_processor(mach_port_t)
+		outtran: mach_port_t convert_processor_to_port(processor_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type processor_array_t 	= ^array[] of processor_t;
+
+		/* processor_info_t: variable-sized inline array that can
+		 * contain:
+		 * processor_basic_info_t:   (5 ints)
+		 * processor_cpu_load_info_t:(4 ints)
+		 * processor_machine_info_t :(12 ints)
+		 * If other processor_info flavors are added, this definition
+		 * may need to be changed. (See mach/processor_info.h) */
+type processor_flavor_t		= int;
+type processor_info_t		= array[*:12] of integer_t;
+type processor_info_array_t	= ^array[] of integer_t;
+
+type processor_set_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: processor_set_t convert_port_to_pset(mach_port_t)
+		outtran: mach_port_t convert_pset_to_port(processor_set_t)
+		destructor: pset_deallocate(processor_set_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type processor_set_array_t = ^array[] of processor_set_t;
+
+type processor_set_name_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: processor_set_name_t convert_port_to_pset_name(mach_port_t)
+		outtran: mach_port_t convert_pset_name_to_port(processor_set_name_t)
+		destructor: pset_deallocate(processor_set_name_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type processor_set_name_array_t = ^array[] of processor_set_name_t;
+
+		/* processor_set_info_t: variable-size inline array
+		 * that can hold:
+		 * processor_set_basic_info (5 ints)
+		 * processor_set_load_info (4 ints)
+		 * policy_timeshare_base_t (1 int)
+		 * policy_fifo_base_t (1 int)
+		 * policy_rr_base_t (1 int)
+		 * policy_timeshare_base_t (1 int)
+		 * policy_fifo_base_t (1 int)
+		 * policy_rr_base_t (1 int)
+		 * policy_t (1 int)
+		 * If other flavors are added, this definition may
+		 * need to be changed. (see mach/processor.h) */
+type processor_set_flavor_t	= int;
+type processor_set_info_t	= array[*:5] of integer_t;	
+
+type bootstrap_t = mach_port_t;
+
+type kernel_version_t           = c_string[*:512];
+type kernel_boot_info_t         = c_string[*:4096];
+
+type time_value_t = struct[2] of integer_t;
+
+type mach_port_qos_t = struct[2] of integer_t;
+
+type emulation_vector_t		= ^array[] of vm_offset_t;
+
+type inline_existence_map_t	= array[*:512] of char;
+
+type policy_t			= int;
+		/* policy_info_t: variable-size inline array. Can hold:
+		 * policy_timeshare_info_t (5 ints)
+		 * policy_fifo_info_t (4 ints)
+		 * policy_rr_info_t (5 ints) */
+type policy_base_t		= array[*:5] of integer_t;
+type policy_info_t		= array[*:2] of integer_t;
+type policy_limit_t		= array[*:1] of integer_t;
+
+type ledger_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: ledger_t convert_port_to_ledger(mach_port_t)
+		outtran: mach_port_t convert_ledger_to_port(ledger_t)
+#endif	/* KERNEL_SERVER */
+                ;
+
+type ledger_array_t	 	= ^array[] of ledger_t;
+type ledger_item_t		= integer_t;
+
+type security_token_t		= struct[2] of uint32_t;
+type audit_token_t		= struct[8] of uint32_t;
+
+type msg_labels_t = mach_port_t;
+
+		/* memory_object_info_t: variable-size inline array:
+		 * memory_object_attr_info_t (5 ints)
+		 * XXX actually it's 6 ints temporarily (object_ready!)
+		 * memory_object_behave_info_t (4 ints)
+		 * memory_object_perf_info_t (2 ints)
+		 * old_memory_object_attr_info_t (3 ints)
+		 * memory_object_norma_info_t (5 ints)
+		 * If other flavors are added, this definition may
+		 * need to be changed. (see mach/memory_object.h) */
+type memory_object_flavor_t	= int;
+type memory_object_info_t	= array[*:6] of int;
+
+		/* vm_region_info_t: variable-size inline array that can hold:
+		 * vm_region_basic_info_t (8 ints)
+		 * If other flavors are added, this definition may
+		 * need to be changed. (see mach/vm_region.h) */
+type vm_region_flavor_t		= int;
+type vm_region_info_t		= array[*:10] of int;
+type vm_region_recurse_info_t	= array[*:19] of int;
+
+type vm_page_info_flavor_t	= int;
+type vm_page_info_t		= array[*:32] of int;
+
+type mach_vm_read_entry_t = array[512] of mach_vm_offset_t;
+type vm_read_entry_t = array[512] of vm_offset_t;
+#if VM32_SUPPORT
+type vm32_read_entry_t = array[512] of vm32_offset_t;
+#endif
+
+type exception_mask_t		= int;
+type exception_behavior_t	= int;
+
+type    exception_handler_t = mach_port_t;
+
+type	exception_handler_array_t	=
+			array[*:32] of exception_handler_t;
+
+type	exception_behavior_array_t	=
+			array[*:32] of exception_behavior_t;
+
+type	exception_flavor_array_t	=
+			array[*:32] of thread_state_flavor_t;
+
+type	exception_mask_array_t	=
+			array[*:32] of exception_mask_t;
+
+type semaphore_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: semaphore_t convert_port_to_semaphore(mach_port_t)
+		outtran: mach_port_t convert_semaphore_to_port(semaphore_t)
+		destructor: semaphore_dereference(semaphore_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type semaphore_consume_ref_t = mach_port_move_send_t
+		cusertype: semaphore_t
+#if	KERNEL_SERVER
+		intran: semaphore_t convert_port_to_semaphore(mach_port_t)
+		outtran: mach_port_t convert_semaphore_to_port(semaphore_t)
+		destructor: semaphore_dereference(semaphore_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+type lock_set_t = mach_port_t
+#if	KERNEL_SERVER
+		intran: lock_set_t convert_port_to_lock_set(mach_port_t)
+		outtran: mach_port_t convert_lock_set_to_port(lock_set_t)
+		destructor: lock_set_dereference(lock_set_t)
+#endif	/* KERNEL_SERVER */
+		;
+
+/* kernel module loader */
+type kmod_t = int;
+type kmod_control_flavor_t = int;
+
+type kmod_args_t = ^array[] of MACH_MSG_TYPE_BYTE
+	ctype: kmod_args_t;
+
+type io_master_t = mach_port_t;
+type UNDServerRef = mach_port_t;
+
+#if KERNEL_SERVER
+
+simport <kern/ipc_mig.h>;	/* pick up kernel-specific MIG things */
+
+#endif /* KERNEL_SERVER */
+
+import <mach/mig.h>;
+import <mach/mach_types.h>;
+
+#endif	/* _MACH_MACH_TYPES_DEFS_ */
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/mach_types.h b/i386/include/mach/mach_types.h
new file mode 100644
index 0000000..30ebec9
--- /dev/null
+++ b/i386/include/mach/mach_types.h
@@ -0,0 +1,230 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
+/*
+ *	File:	mach/mach_types.h
+ *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
+ *	Date:	1986
+ *
+ *	Mach external interface definitions.
+ *
+ */
+
+#ifndef	_MACH_MACH_TYPES_H_
+#define _MACH_MACH_TYPES_H_
+
+#include <stdint.h>
+
+#include <sys/cdefs.h>
+
+#include <mach/host_info.h>
+#include <mach/host_notify.h>
+#include <mach/host_special_ports.h>
+#include <mach/machine.h>
+#include <mach/machine/vm_types.h>
+#include <mach/memory_object_types.h>
+#include <mach/message.h>
+#include <mach/exception_types.h>
+#include <mach/port.h>
+#include <mach/processor_info.h>
+#include <mach/task_info.h>
+#include <mach/task_policy.h>
+#include <mach/task_special_ports.h>
+#include <mach/thread_info.h>
+#include <mach/thread_policy.h>
+#include <mach/thread_special_ports.h>
+#include <mach/thread_status.h>
+#include <mach/time_value.h>
+#include <mach/clock_types.h>
+#include <mach/vm_attributes.h>
+#include <mach/vm_inherit.h>
+#include <mach/vm_purgable.h>
+#include <mach/vm_behavior.h>
+#include <mach/vm_prot.h>
+#include <mach/vm_statistics.h>
+#include <mach/vm_sync.h>
+#include <mach/vm_types.h>
+#include <mach/vm_region.h>
+#include <mach/kmod.h>
+
+
+/*
+ * If we are not in the kernel, then these will all be represented by
+ * ports at user-space.
+ */
+typedef mach_port_t		task_t;
+typedef mach_port_t		task_name_t;
+typedef mach_port_t		thread_t;
+typedef	mach_port_t		thread_act_t;
+typedef mach_port_t		ipc_space_t;
+typedef mach_port_t		host_t;
+typedef mach_port_t		host_priv_t;
+typedef mach_port_t		host_security_t;
+typedef mach_port_t		processor_t;
+typedef mach_port_t		processor_set_t;
+typedef mach_port_t		processor_set_control_t;
+typedef mach_port_t		semaphore_t;
+typedef mach_port_t		lock_set_t;
+typedef mach_port_t		ledger_t;
+typedef mach_port_t		alarm_t;
+typedef mach_port_t		clock_serv_t;
+typedef mach_port_t		clock_ctrl_t;
+
+
+/*
+ * These aren't really unique types.  They are just called
+ * out as unique types at one point in history.  So we list
+ * them here for compatibility.
+ */
+typedef processor_set_t		processor_set_name_t;
+
+/*
+ * These types are just hard-coded as ports
+ */
+typedef mach_port_t		clock_reply_t;
+typedef mach_port_t		bootstrap_t;
+typedef	mach_port_t		mem_entry_name_port_t;
+typedef mach_port_t		exception_handler_t;
+typedef exception_handler_t	*exception_handler_array_t;
+typedef mach_port_t		vm_task_entry_t;
+typedef mach_port_t		io_master_t;
+typedef mach_port_t		UNDServerRef;
+
+/*
+ * Mig doesn't translate the components of an array.
+ * For example, Mig won't use the thread_t translations
+ * to translate a thread_array_t argument.  So, these definitions
+ * are not completely accurate at the moment for other kernel
+ * components.
+ */
+typedef task_t			*task_array_t;
+typedef thread_t		*thread_array_t;
+typedef processor_set_t		*processor_set_array_t;
+typedef processor_set_t		*processor_set_name_array_t;
+typedef processor_t		*processor_array_t;
+typedef	thread_act_t		*thread_act_array_t;
+typedef ledger_t		*ledger_array_t;
+
+/*
+ * However the real mach_types got declared, we also have to declare
+ * types with "port" in the name for compatability with the way OSF
+ * had declared the user interfaces at one point.  Someday these should
+ * go away.
+ */
+typedef task_t			task_port_t;
+typedef	task_array_t		task_port_array_t;
+typedef thread_t		thread_port_t;
+typedef	thread_array_t		thread_port_array_t;
+typedef ipc_space_t		ipc_space_port_t;
+typedef host_t			host_name_t;
+typedef host_t			host_name_port_t;
+typedef processor_set_t		processor_set_port_t;
+typedef processor_set_t		processor_set_name_port_t;
+typedef processor_set_array_t	processor_set_name_port_array_t;
+typedef processor_set_t		processor_set_control_port_t;
+typedef processor_t		processor_port_t;
+typedef processor_array_t	processor_port_array_t;
+typedef thread_act_t		thread_act_port_t;
+typedef	thread_act_array_t	thread_act_port_array_t;
+typedef semaphore_t		semaphore_port_t;
+typedef lock_set_t		lock_set_port_t;
+typedef ledger_t		ledger_port_t;
+typedef ledger_array_t		ledger_port_array_t;
+typedef alarm_t			alarm_port_t;
+typedef clock_serv_t		clock_serv_port_t;
+typedef clock_ctrl_t		clock_ctrl_port_t;
+typedef exception_handler_t	exception_port_t;
+typedef exception_handler_array_t exception_port_arrary_t;
+
+
+#define TASK_NULL		((task_t) 0)
+#define TASK_NAME_NULL		((task_name_t) 0)
+#define THREAD_NULL		((thread_t) 0)
+#define THR_ACT_NULL 		((thread_act_t) 0)
+#define IPC_SPACE_NULL		((ipc_space_t) 0)
+#define HOST_NULL		((host_t) 0)
+#define HOST_PRIV_NULL		((host_priv_t)0)
+#define HOST_SECURITY_NULL	((host_security_t)0)
+#define PROCESSOR_SET_NULL	((processor_set_t) 0)
+#define PROCESSOR_NULL		((processor_t) 0)
+#define SEMAPHORE_NULL		((semaphore_t) 0)
+#define LOCK_SET_NULL		((lock_set_t) 0)
+#define LEDGER_NULL 		((ledger_t) 0)
+#define ALARM_NULL		((alarm_t) 0)
+#define CLOCK_NULL		((clock_t) 0)
+#define UND_SERVER_NULL		((UNDServerRef) 0)
+
+typedef natural_t 		ledger_item_t;
+#define LEDGER_ITEM_INFINITY ((ledger_item_t) (~0))
+
+typedef mach_vm_offset_t	*emulation_vector_t;
+typedef char			*user_subsystem_t;
+
+typedef char			*labelstr_t;
+/*
+ *	Backwards compatibility, for those programs written
+ *	before mach/{std,mach}_types.{defs,h} were set up.
+ */
+#include <mach/std_types.h>
+
+#endif	/* _MACH_MACH_TYPES_H_ */
diff --git a/i386/include/mach/mach_vm.defs b/i386/include/mach/mach_vm.defs
new file mode 100644
index 0000000..8dbb71f
--- /dev/null
+++ b/i386/include/mach/mach_vm.defs
@@ -0,0 +1,480 @@
+/*
+ * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_FREE_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/mach_vm.defs
+ *
+ *	Exported kernel VM calls (for any task on the platform).
+ */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+	  mach_vm
+#else
+	  vm_map_lp64_local
+#endif
+	  4800;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+#include <mach_debug/mach_debug_types.defs>
+
+/*
+ *	Allocate zero-filled memory in the address space
+ *	of the target task, either at the specified address,
+ *	or wherever space can be found (controlled by flags),
+ *	of the specified size.  The address at which the
+ *	allocation actually took place is returned.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_allocate(
+#else
+routine vm_allocate(
+#endif
+		target		: vm_task_entry_t;
+	inout	address		: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		flags		: int);
+
+/*
+ *	Deallocate the specified range from the virtual
+ *	address space of the target virtual memory map.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_deallocate(
+#else
+routine vm_deallocate(
+#endif
+		target		: vm_task_entry_t;
+		address		: mach_vm_address_t;
+		size		: mach_vm_size_t);
+
+/*
+ *	Set the current or maximum protection attribute
+ *	for the specified range of the virtual address
+ *	space of the target virtual memory map.  The current
+ *	protection limits the memory access rights of threads
+ *	within the map; the maximum protection limits the accesses
+ *	that may be given in the current protection.
+ *	Protections are specified as a set of {read, write, execute}
+ *	*permissions*.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_protect(
+#else
+routine vm_protect(
+#endif
+		target_task	: vm_task_entry_t;
+		address		: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		set_maximum	: boolean_t;
+		new_protection	: vm_prot_t);
+
+/*
+ *	Set the inheritance attribute for the specified range
+ *	of the virtual address space of the target address space.
+ *	The inheritance value is one of {none, copy, share}, and
+ *	specifies how the child address space should acquire
+ *	this memory at the time of a task_create call.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_inherit(
+#else
+routine vm_inherit(
+#endif
+		target_task	: vm_task_entry_t;
+		address		: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		new_inheritance	: vm_inherit_t);
+
+/*
+ *	Returns the contents of the specified range of the
+ *	virtual address space of the target task.  [The
+ *	range must be aligned on a virtual page boundary,
+ *	and must be a multiple of pages in extent.  The
+ *	protection on the specified range must permit reading.]
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_read(
+#else
+routine vm_read(
+#endif
+		target_task	: vm_map_t;
+		address		: mach_vm_address_t;
+		size		: mach_vm_size_t;
+	out	data		: pointer_t);
+
+/* 
+ * List corrollary to vm_read, returns mapped contents of specified
+ * ranges within target address space.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_read_list(
+#else
+routine vm_read_list(
+#endif
+		target_task 	: vm_map_t;
+	inout	data_list   	: mach_vm_read_entry_t;
+		count		: natural_t);
+
+/*
+ *	Writes the contents of the specified range of the
+ *	virtual address space of the target task.  [The
+ *	range must be aligned on a virtual page boundary,
+ *	and must be a multiple of pages in extent.  The
+ *	protection on the specified range must permit writing.]
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_write(
+#else
+routine vm_write(
+#endif
+		target_task	: vm_map_t;
+		address		: mach_vm_address_t;
+		data		: pointer_t);
+
+/*
+ *	Copy the contents of the source range of the virtual
+ *	address space of the target task to the destination
+ *	range in that same address space.  [Both of the
+ *	ranges must be aligned on a virtual page boundary,
+ *	and must be multiples of pages in extent.  The
+ *	protection on the source range must permit reading,
+ *	and the protection on the destination range must
+ *	permit writing.]
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_copy(
+#else
+routine vm_copy(
+#endif
+		target_task	: vm_map_t;
+		source_address	: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		dest_address	: mach_vm_address_t);
+
+/*
+ *	Returns the contents of the specified range of the
+ *	virtual address space of the target task.  [There
+ *	are no alignment restrictions, and the results will
+ *      overwrite the area pointed to by data - which must
+ *      already exist. The protection on the specified range
+ *	must permit reading.]
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_read_overwrite(
+#else
+routine vm_read_overwrite(
+#endif
+		target_task	: vm_map_t;
+		address		: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		data		: mach_vm_address_t;
+	out	outsize		: mach_vm_size_t);
+
+
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_msync(
+#else
+routine vm_msync(
+#endif
+		target_task	: vm_map_t;
+		address		: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		sync_flags	: vm_sync_t );
+
+/*
+ *	Set the paging behavior attribute for the specified range
+ *	of the virtual address space of the target task.
+ *	The behavior value is one of {default, random, forward 
+ *	sequential, reverse sequential} and indicates the expected
+ *	page reference pattern for the specified range.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_behavior_set(
+#else
+routine vm_behavior_set(
+#endif
+		target_task	: vm_map_t;
+		address		: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		new_behavior	: vm_behavior_t);
+
+
+/*
+ *	Map a user-supplie memory object into the virtual address
+ *	space of the target task.  If desired (anywhere is TRUE),
+ *	the kernel will find a suitable address range of the
+ *	specified size; else, the specific address will be allocated.
+ *
+ *	The beginning address of the range will be aligned on a virtual
+ *	page boundary, be at or beyond the address specified, and
+ *	meet the mask requirements (bits turned on in the mask must not
+ *	be turned on in the result); the size of the range, in bytes,
+ *	will be rounded	up to an integral number of virtual pages.
+ *
+ *	The memory in the resulting range will be associated with the
+ *	specified memory object, with the beginning of the memory range
+ *	referring to the specified offset into the memory object.
+ *
+ *	The mapping will take the current and maximum protections and
+ *	the inheritance attributes specified; see the vm_protect and
+ *	vm_inherit calls for a description of these attributes.
+ *
+ *	If desired (copy is TRUE), the memory range will be filled
+ *	with a copy of the data from the memory object; this copy will
+ *	be private to this mapping in this target task.  Otherwise,
+ *	the memory in this mapping will be shared with other mappings
+ *	of the same memory object at the same offset (in this task or
+ *	in other tasks).  [The Mach kernel only enforces shared memory
+ *	consistency among mappings on one host with similar page alignments.
+ *	The user-defined memory manager for this object is responsible
+ *	for further consistency.]
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_map(
+#else
+routine vm_map(
+#endif
+		target_task	: vm_task_entry_t;
+	inout	address		: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		mask		: mach_vm_offset_t;
+		flags		: int;
+		object		: mem_entry_name_port_t;
+		offset		: memory_object_offset_t;
+		copy		: boolean_t;
+		cur_protection	: vm_prot_t;
+		max_protection	: vm_prot_t;
+		inheritance	: vm_inherit_t);
+
+/*
+ *	Set/Get special properties of memory associated
+ *	to some virtual address range, such as cachability, 
+ *	migrability, replicability.  Machine-dependent.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_machine_attribute(
+#else
+routine vm_machine_attribute(
+#endif
+		target_task	: vm_map_t;
+		address		: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		attribute	: vm_machine_attribute_t;
+	inout	value		: vm_machine_attribute_val_t);
+
+/*
+ *      Map portion of a task's address space.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_remap(
+#else
+routine vm_remap(
+#endif
+		target_task	: vm_map_t;
+	inout	target_address	: mach_vm_address_t;
+		size		: mach_vm_size_t;
+		mask		: mach_vm_offset_t;
+		anywhere	: boolean_t;
+		src_task	: vm_map_t;
+		src_address	: mach_vm_address_t;
+		copy		: boolean_t;
+	out	cur_protection	: vm_prot_t;
+	out	max_protection	: vm_prot_t;
+		inheritance	: vm_inherit_t);
+
+/*
+ *      Give the caller information on the given location in a virtual
+ *      address space.  If a page is mapped return ref and dirty info.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_page_query(
+#else
+routine vm_map_page_query(
+#endif
+                target_map      :vm_map_t;
+                offset          :mach_vm_offset_t;
+        out     disposition     :integer_t;
+        out     ref_count       :integer_t);
+
+
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_region_recurse(
+#else
+routine vm_region_recurse_64(
+#endif
+                target_task     : vm_map_t;
+	inout	address		: mach_vm_address_t;
+        out     size            : mach_vm_size_t;
+	inout	nesting_depth	: natural_t;
+	out	info		: vm_region_recurse_info_t,CountInOut);
+
+/*
+ *      Returns information about the contents of the virtual
+ *      address space of the target task at the specified
+ *      address.  The returned protection, inheritance, sharing
+ *      and memory object values apply to the entire range described
+ *      by the address range returned; the memory object offset
+ *      corresponds to the beginning of the address range.
+ *      [If the specified address is not allocated, the next
+ *      highest address range is described.  If no addresses beyond
+ *      the one specified are allocated, the call returns KERN_NO_SPACE.]
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_region(
+#else
+routine vm_region_64(
+#endif
+                target_task     : vm_map_t;
+	inout	address		: mach_vm_address_t;
+        out     size            : mach_vm_size_t;
+		flavor		: vm_region_flavor_t;
+	out	info		: vm_region_info_t, CountInOut;
+        out     object_name     : memory_object_name_t =
+                                        MACH_MSG_TYPE_MOVE_SEND
+                                        ctype: mach_port_t);
+
+/*
+ *	Allow application level processes to create named entries which
+ *	correspond to mapped portions of their address space.  These named
+ *	entries can then be manipulated, shared with other processes in
+ *	other address spaces and ultimately mapped in ohter address spaces
+ *
+ *	THIS INTERFACE IS STILL EVOLVING.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+#if !defined(__LP64__) || KERNEL_SERVER || XNU_KERNEL_PRIVATE || LIBSYSCALL_INTERFACE
+routine _mach_make_memory_entry(
+#else
+routine mach_make_memory_entry(
+#endif
+#else
+routine mach_make_memory_entry_64(
+#endif
+		target_task	:vm_map_t;
+	inout	size		:memory_object_size_t;
+		offset		:memory_object_offset_t;
+		permission	:vm_prot_t;
+	out	object_handle	:mem_entry_name_port_move_send_t;
+		parent_handle	:mem_entry_name_port_t);
+
+/*
+ *	Control behavior and investigate state of a "purgable" object in
+ *	the virtual address space of the target task.  A purgable object is
+ *	created via a call to mach_vm_allocate() with VM_FLAGS_PURGABLE
+ *	specified.  See the routine implementation for a complete
+ *	definition of the routine.
+ */
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_purgable_control(
+#else
+routine vm_purgable_control(
+#endif
+		target_task	: vm_map_t;
+		address		: mach_vm_address_t;
+		control		: vm_purgable_t;
+	inout	state		: int);
+
+
+#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
+routine mach_vm_page_info(
+			target_task		: vm_map_t;
+			address			: mach_vm_address_t;
+			flavor			: vm_page_info_flavor_t;
+	out		info			: vm_page_info_t, CountInOut);
+#else
+skip;
+#endif
+
+/****************************** Legacy section ***************************/
+/*  The following definitions are exist to provide compatibility with    */
+/*  the legacy APIs.  They are no different.  We just need to produce    */
+/*  the user-level stub interface for them.                              */
+/****************************** Legacy section ***************************/
+
+
+/*
+ * These interfaces just aren't supported in the new (wide) model:
+ *
+ *	mach_vm_region_info() -
+ *	vm_map_pages_info() -
+ *		no user-level replacement for these MACH_DEBUG interfaces
+ *	vm_map_get_upl() -
+ *		no user-level replacement at the moment
+ *	vm_region_info() -
+ *		use mach_vm_region_info() or vm_region_info_64()
+ *	vm_region_recurse() -
+ *		use mach_vm_region_recurse() or vm_region_recurse_64()
+ */
+
+/*
+ * The following legacy interfaces are provides as macro wrappers to the new
+ * interfaces.  You should strive to use the new ones instead:
+ *
+ *	vm_map() -
+ *		use mach_vm_map() or vm_map_64()
+ *	vm_region() -
+ *		use mach_vm_region() or vm_region_64()
+ *	mach_make_memory_entry() -
+ *		use mach_vm_make_memory_entry() or mach_make_memory_entry_64()
+ */
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/mach_vm.h b/i386/include/mach/mach_vm.h
new file mode 100644
index 0000000..f72b17e
--- /dev/null
+++ b/i386/include/mach/mach_vm.h
@@ -0,0 +1,1032 @@
+#ifndef	_mach_vm_user_
+#define	_mach_vm_user_
+
+/* Module mach_vm */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	mach_vm_MSG_COUNT
+#define	mach_vm_MSG_COUNT	20
+#endif	/* mach_vm_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+#include <mach_debug/mach_debug_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine mach_vm_allocate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_allocate
+(
+	vm_map_t target,
+	mach_vm_address_t *address,
+	mach_vm_size_t size,
+	int flags
+);
+
+/* Routine mach_vm_deallocate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_deallocate
+(
+	vm_map_t target,
+	mach_vm_address_t address,
+	mach_vm_size_t size
+);
+
+/* Routine mach_vm_protect */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_protect
+(
+	vm_map_t target_task,
+	mach_vm_address_t address,
+	mach_vm_size_t size,
+	boolean_t set_maximum,
+	vm_prot_t new_protection
+);
+
+/* Routine mach_vm_inherit */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_inherit
+(
+	vm_map_t target_task,
+	mach_vm_address_t address,
+	mach_vm_size_t size,
+	vm_inherit_t new_inheritance
+);
+
+/* Routine mach_vm_read */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_read
+(
+	vm_map_t target_task,
+	mach_vm_address_t address,
+	mach_vm_size_t size,
+	vm_offset_t *data,
+	mach_msg_type_number_t *dataCnt
+);
+
+/* Routine mach_vm_read_list */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_read_list
+(
+	vm_map_t target_task,
+	mach_vm_read_entry_t data_list,
+	natural_t count
+);
+
+/* Routine mach_vm_write */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_write
+(
+	vm_map_t target_task,
+	mach_vm_address_t address,
+	vm_offset_t data,
+	mach_msg_type_number_t dataCnt
+);
+
+/* Routine mach_vm_copy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_copy
+(
+	vm_map_t target_task,
+	mach_vm_address_t source_address,
+	mach_vm_size_t size,
+	mach_vm_address_t dest_address
+);
+
+/* Routine mach_vm_read_overwrite */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_read_overwrite
+(
+	vm_map_t target_task,
+	mach_vm_address_t address,
+	mach_vm_size_t size,
+	mach_vm_address_t data,
+	mach_vm_size_t *outsize
+);
+
+/* Routine mach_vm_msync */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_msync
+(
+	vm_map_t target_task,
+	mach_vm_address_t address,
+	mach_vm_size_t size,
+	vm_sync_t sync_flags
+);
+
+/* Routine mach_vm_behavior_set */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_behavior_set
+(
+	vm_map_t target_task,
+	mach_vm_address_t address,
+	mach_vm_size_t size,
+	vm_behavior_t new_behavior
+);
+
+/* Routine mach_vm_map */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_map
+(
+	vm_map_t target_task,
+	mach_vm_address_t *address,
+	mach_vm_size_t size,
+	mach_vm_offset_t mask,
+	int flags,
+	mem_entry_name_port_t object,
+	memory_object_offset_t offset,
+	boolean_t copy,
+	vm_prot_t cur_protection,
+	vm_prot_t max_protection,
+	vm_inherit_t inheritance
+);
+
+/* Routine mach_vm_machine_attribute */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_machine_attribute
+(
+	vm_map_t target_task,
+	mach_vm_address_t address,
+	mach_vm_size_t size,
+	vm_machine_attribute_t attribute,
+	vm_machine_attribute_val_t *value
+);
+
+/* Routine mach_vm_remap */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_remap
+(
+	vm_map_t target_task,
+	mach_vm_address_t *target_address,
+	mach_vm_size_t size,
+	mach_vm_offset_t mask,
+	boolean_t anywhere,
+	vm_map_t src_task,
+	mach_vm_address_t src_address,
+	boolean_t copy,
+	vm_prot_t *cur_protection,
+	vm_prot_t *max_protection,
+	vm_inherit_t inheritance
+);
+
+/* Routine mach_vm_page_query */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_page_query
+(
+	vm_map_t target_map,
+	mach_vm_offset_t offset,
+	integer_t *disposition,
+	integer_t *ref_count
+);
+
+/* Routine mach_vm_region_recurse */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_region_recurse
+(
+	vm_map_t target_task,
+	mach_vm_address_t *address,
+	mach_vm_size_t *size,
+	natural_t *nesting_depth,
+	vm_region_recurse_info_t info,
+	mach_msg_type_number_t *infoCnt
+);
+
+/* Routine mach_vm_region */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_region
+(
+	vm_map_t target_task,
+	mach_vm_address_t *address,
+	mach_vm_size_t *size,
+	vm_region_flavor_t flavor,
+	vm_region_info_t info,
+	mach_msg_type_number_t *infoCnt,
+	mach_port_t *object_name
+);
+
+/* Routine _mach_make_memory_entry */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t _mach_make_memory_entry
+(
+	vm_map_t target_task,
+	memory_object_size_t *size,
+	memory_object_offset_t offset,
+	vm_prot_t permission,
+	mem_entry_name_port_t *object_handle,
+	mem_entry_name_port_t parent_handle
+);
+
+/* Routine mach_vm_purgable_control */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_purgable_control
+(
+	vm_map_t target_task,
+	mach_vm_address_t address,
+	vm_purgable_t control,
+	int *state
+);
+
+/* Routine mach_vm_page_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_page_info
+(
+	vm_map_t target_task,
+	mach_vm_address_t address,
+	vm_page_info_flavor_t flavor,
+	vm_page_info_t info,
+	mach_msg_type_number_t *infoCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__mach_vm_subsystem__defined
+#define __Request__mach_vm_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		int flags;
+	} __Request__mach_vm_allocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+	} __Request__mach_vm_deallocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		boolean_t set_maximum;
+		vm_prot_t new_protection;
+	} __Request__mach_vm_protect_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		vm_inherit_t new_inheritance;
+	} __Request__mach_vm_inherit_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+	} __Request__mach_vm_read_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_read_entry_t data_list;
+		natural_t count;
+	} __Request__mach_vm_read_list_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t data;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_msg_type_number_t dataCnt;
+	} __Request__mach_vm_write_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t source_address;
+		mach_vm_size_t size;
+		mach_vm_address_t dest_address;
+	} __Request__mach_vm_copy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		mach_vm_address_t data;
+	} __Request__mach_vm_read_overwrite_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		vm_sync_t sync_flags;
+	} __Request__mach_vm_msync_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		vm_behavior_t new_behavior;
+	} __Request__mach_vm_behavior_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t object;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		mach_vm_offset_t mask;
+		int flags;
+		memory_object_offset_t offset;
+		boolean_t copy;
+		vm_prot_t cur_protection;
+		vm_prot_t max_protection;
+		vm_inherit_t inheritance;
+	} __Request__mach_vm_map_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		vm_machine_attribute_t attribute;
+		vm_machine_attribute_val_t value;
+	} __Request__mach_vm_machine_attribute_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t src_task;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_vm_address_t target_address;
+		mach_vm_size_t size;
+		mach_vm_offset_t mask;
+		boolean_t anywhere;
+		mach_vm_address_t src_address;
+		boolean_t copy;
+		vm_inherit_t inheritance;
+	} __Request__mach_vm_remap_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_offset_t offset;
+	} __Request__mach_vm_page_query_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		natural_t nesting_depth;
+		mach_msg_type_number_t infoCnt;
+	} __Request__mach_vm_region_recurse_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		vm_region_flavor_t flavor;
+		mach_msg_type_number_t infoCnt;
+	} __Request__mach_vm_region_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t parent_handle;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		memory_object_size_t size;
+		memory_object_offset_t offset;
+		vm_prot_t permission;
+	} __Request___mach_make_memory_entry_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		vm_purgable_t control;
+		int state;
+	} __Request__mach_vm_purgable_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		vm_page_info_flavor_t flavor;
+		mach_msg_type_number_t infoCnt;
+	} __Request__mach_vm_page_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__mach_vm_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__mach_vm_subsystem__defined
+#define __RequestUnion__mach_vm_subsystem__defined
+union __RequestUnion__mach_vm_subsystem {
+	__Request__mach_vm_allocate_t Request_mach_vm_allocate;
+	__Request__mach_vm_deallocate_t Request_mach_vm_deallocate;
+	__Request__mach_vm_protect_t Request_mach_vm_protect;
+	__Request__mach_vm_inherit_t Request_mach_vm_inherit;
+	__Request__mach_vm_read_t Request_mach_vm_read;
+	__Request__mach_vm_read_list_t Request_mach_vm_read_list;
+	__Request__mach_vm_write_t Request_mach_vm_write;
+	__Request__mach_vm_copy_t Request_mach_vm_copy;
+	__Request__mach_vm_read_overwrite_t Request_mach_vm_read_overwrite;
+	__Request__mach_vm_msync_t Request_mach_vm_msync;
+	__Request__mach_vm_behavior_set_t Request_mach_vm_behavior_set;
+	__Request__mach_vm_map_t Request_mach_vm_map;
+	__Request__mach_vm_machine_attribute_t Request_mach_vm_machine_attribute;
+	__Request__mach_vm_remap_t Request_mach_vm_remap;
+	__Request__mach_vm_page_query_t Request_mach_vm_page_query;
+	__Request__mach_vm_region_recurse_t Request_mach_vm_region_recurse;
+	__Request__mach_vm_region_t Request_mach_vm_region;
+	__Request___mach_make_memory_entry_t Request__mach_make_memory_entry;
+	__Request__mach_vm_purgable_control_t Request_mach_vm_purgable_control;
+	__Request__mach_vm_page_info_t Request_mach_vm_page_info;
+};
+#endif /* !__RequestUnion__mach_vm_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__mach_vm_subsystem__defined
+#define __Reply__mach_vm_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_vm_address_t address;
+	} __Reply__mach_vm_allocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_vm_deallocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_vm_protect_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_vm_inherit_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t data;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t dataCnt;
+	} __Reply__mach_vm_read_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_vm_read_entry_t data_list;
+	} __Reply__mach_vm_read_list_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_vm_write_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_vm_copy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_vm_size_t outsize;
+	} __Reply__mach_vm_read_overwrite_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_vm_msync_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_vm_behavior_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_vm_address_t address;
+	} __Reply__mach_vm_map_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_machine_attribute_val_t value;
+	} __Reply__mach_vm_machine_attribute_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_vm_address_t target_address;
+		vm_prot_t cur_protection;
+		vm_prot_t max_protection;
+	} __Reply__mach_vm_remap_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		integer_t disposition;
+		integer_t ref_count;
+	} __Reply__mach_vm_page_query_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		natural_t nesting_depth;
+		mach_msg_type_number_t infoCnt;
+		int info[19];
+	} __Reply__mach_vm_region_recurse_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t object_name;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_vm_address_t address;
+		mach_vm_size_t size;
+		mach_msg_type_number_t infoCnt;
+		int info[10];
+	} __Reply__mach_vm_region_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t object_handle;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		memory_object_size_t size;
+	} __Reply___mach_make_memory_entry_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		int state;
+	} __Reply__mach_vm_purgable_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t infoCnt;
+		int info[32];
+	} __Reply__mach_vm_page_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__mach_vm_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__mach_vm_subsystem__defined
+#define __ReplyUnion__mach_vm_subsystem__defined
+union __ReplyUnion__mach_vm_subsystem {
+	__Reply__mach_vm_allocate_t Reply_mach_vm_allocate;
+	__Reply__mach_vm_deallocate_t Reply_mach_vm_deallocate;
+	__Reply__mach_vm_protect_t Reply_mach_vm_protect;
+	__Reply__mach_vm_inherit_t Reply_mach_vm_inherit;
+	__Reply__mach_vm_read_t Reply_mach_vm_read;
+	__Reply__mach_vm_read_list_t Reply_mach_vm_read_list;
+	__Reply__mach_vm_write_t Reply_mach_vm_write;
+	__Reply__mach_vm_copy_t Reply_mach_vm_copy;
+	__Reply__mach_vm_read_overwrite_t Reply_mach_vm_read_overwrite;
+	__Reply__mach_vm_msync_t Reply_mach_vm_msync;
+	__Reply__mach_vm_behavior_set_t Reply_mach_vm_behavior_set;
+	__Reply__mach_vm_map_t Reply_mach_vm_map;
+	__Reply__mach_vm_machine_attribute_t Reply_mach_vm_machine_attribute;
+	__Reply__mach_vm_remap_t Reply_mach_vm_remap;
+	__Reply__mach_vm_page_query_t Reply_mach_vm_page_query;
+	__Reply__mach_vm_region_recurse_t Reply_mach_vm_region_recurse;
+	__Reply__mach_vm_region_t Reply_mach_vm_region;
+	__Reply___mach_make_memory_entry_t Reply__mach_make_memory_entry;
+	__Reply__mach_vm_purgable_control_t Reply_mach_vm_purgable_control;
+	__Reply__mach_vm_page_info_t Reply_mach_vm_page_info;
+};
+#endif /* !__RequestUnion__mach_vm_subsystem__defined */
+
+#ifndef subsystem_to_name_map_mach_vm
+#define subsystem_to_name_map_mach_vm \
+    { "mach_vm_allocate", 4800 },\
+    { "mach_vm_deallocate", 4801 },\
+    { "mach_vm_protect", 4802 },\
+    { "mach_vm_inherit", 4803 },\
+    { "mach_vm_read", 4804 },\
+    { "mach_vm_read_list", 4805 },\
+    { "mach_vm_write", 4806 },\
+    { "mach_vm_copy", 4807 },\
+    { "mach_vm_read_overwrite", 4808 },\
+    { "mach_vm_msync", 4809 },\
+    { "mach_vm_behavior_set", 4810 },\
+    { "mach_vm_map", 4811 },\
+    { "mach_vm_machine_attribute", 4812 },\
+    { "mach_vm_remap", 4813 },\
+    { "mach_vm_page_query", 4814 },\
+    { "mach_vm_region_recurse", 4815 },\
+    { "mach_vm_region", 4816 },\
+    { "_mach_make_memory_entry", 4817 },\
+    { "mach_vm_purgable_control", 4818 },\
+    { "mach_vm_page_info", 4819 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _mach_vm_user_ */
diff --git a/i386/include/mach/machine.h b/i386/include/mach/machine.h
new file mode 100644
index 0000000..431d3c9
--- /dev/null
+++ b/i386/include/mach/machine.h
@@ -0,0 +1,344 @@
+/*
+ * Copyright (c) 2000-2007 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*	File:	machine.h
+ *	Author:	Avadis Tevanian, Jr.
+ *	Date:	1986
+ *
+ *	Machine independent machine abstraction.
+ */
+
+#ifndef	_MACH_MACHINE_H_
+#define _MACH_MACHINE_H_
+
+#include <stdint.h>
+#include <mach/machine/vm_types.h>
+#include <mach/boolean.h>
+
+typedef integer_t	cpu_type_t;
+typedef integer_t	cpu_subtype_t;
+typedef integer_t	cpu_threadtype_t;
+
+#define CPU_STATE_MAX		4
+
+#define CPU_STATE_USER		0
+#define CPU_STATE_SYSTEM	1
+#define CPU_STATE_IDLE		2
+#define CPU_STATE_NICE		3
+
+
+
+/*
+ * Capability bits used in the definition of cpu_type.
+ */
+#define	CPU_ARCH_MASK	0xff000000		/* mask for architecture bits */
+#define CPU_ARCH_ABI64	0x01000000		/* 64 bit ABI */
+
+/*
+ *	Machine types known by all.
+ */
+ 
+#define CPU_TYPE_ANY		((cpu_type_t) -1)
+
+#define CPU_TYPE_VAX		((cpu_type_t) 1)
+/* skip				((cpu_type_t) 2)	*/
+/* skip				((cpu_type_t) 3)	*/
+/* skip				((cpu_type_t) 4)	*/
+/* skip				((cpu_type_t) 5)	*/
+#define	CPU_TYPE_MC680x0	((cpu_type_t) 6)
+#define CPU_TYPE_X86		((cpu_type_t) 7)
+#define CPU_TYPE_I386		CPU_TYPE_X86		/* compatibility */
+#define	CPU_TYPE_X86_64		(CPU_TYPE_X86 | CPU_ARCH_ABI64)
+
+/* skip CPU_TYPE_MIPS		((cpu_type_t) 8)	*/
+/* skip 			((cpu_type_t) 9)	*/
+#define CPU_TYPE_MC98000	((cpu_type_t) 10)
+#define CPU_TYPE_HPPA           ((cpu_type_t) 11)
+#define CPU_TYPE_ARM		((cpu_type_t) 12)
+#define CPU_TYPE_MC88000	((cpu_type_t) 13)
+#define CPU_TYPE_SPARC		((cpu_type_t) 14)
+#define CPU_TYPE_I860		((cpu_type_t) 15)
+/* skip	CPU_TYPE_ALPHA		((cpu_type_t) 16)	*/
+/* skip				((cpu_type_t) 17)	*/
+#define CPU_TYPE_POWERPC		((cpu_type_t) 18)
+#define CPU_TYPE_POWERPC64		(CPU_TYPE_POWERPC | CPU_ARCH_ABI64)
+
+/*
+ *	Machine subtypes (these are defined here, instead of in a machine
+ *	dependent directory, so that any program can get all definitions
+ *	regardless of where is it compiled).
+ */
+
+/*
+ * Capability bits used in the definition of cpu_subtype.
+ */
+#define CPU_SUBTYPE_MASK	0xff000000	/* mask for feature flags */
+#define CPU_SUBTYPE_LIB64	0x80000000	/* 64 bit libraries */
+
+
+/*
+ *	Object files that are hand-crafted to run on any
+ *	implementation of an architecture are tagged with
+ *	CPU_SUBTYPE_MULTIPLE.  This functions essentially the same as
+ *	the "ALL" subtype of an architecture except that it allows us
+ *	to easily find object files that may need to be modified
+ *	whenever a new implementation of an architecture comes out.
+ *
+ *	It is the responsibility of the implementor to make sure the
+ *	software handles unsupported implementations elegantly.
+ */
+#define	CPU_SUBTYPE_MULTIPLE		((cpu_subtype_t) -1)
+#define CPU_SUBTYPE_LITTLE_ENDIAN	((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_BIG_ENDIAN		((cpu_subtype_t) 1)
+
+/*
+ *     Machine threadtypes.
+ *     This is none - not defined - for most machine types/subtypes.
+ */
+#define CPU_THREADTYPE_NONE		((cpu_threadtype_t) 0)
+
+/*
+ *	VAX subtypes (these do *not* necessary conform to the actual cpu
+ *	ID assigned by DEC available via the SID register).
+ */
+
+#define	CPU_SUBTYPE_VAX_ALL	((cpu_subtype_t) 0) 
+#define CPU_SUBTYPE_VAX780	((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_VAX785	((cpu_subtype_t) 2)
+#define CPU_SUBTYPE_VAX750	((cpu_subtype_t) 3)
+#define CPU_SUBTYPE_VAX730	((cpu_subtype_t) 4)
+#define CPU_SUBTYPE_UVAXI	((cpu_subtype_t) 5)
+#define CPU_SUBTYPE_UVAXII	((cpu_subtype_t) 6)
+#define CPU_SUBTYPE_VAX8200	((cpu_subtype_t) 7)
+#define CPU_SUBTYPE_VAX8500	((cpu_subtype_t) 8)
+#define CPU_SUBTYPE_VAX8600	((cpu_subtype_t) 9)
+#define CPU_SUBTYPE_VAX8650	((cpu_subtype_t) 10)
+#define CPU_SUBTYPE_VAX8800	((cpu_subtype_t) 11)
+#define CPU_SUBTYPE_UVAXIII	((cpu_subtype_t) 12)
+
+/*
+ * 	680x0 subtypes
+ *
+ * The subtype definitions here are unusual for historical reasons.
+ * NeXT used to consider 68030 code as generic 68000 code.  For
+ * backwards compatability:
+ * 
+ *	CPU_SUBTYPE_MC68030 symbol has been preserved for source code
+ *	compatability.
+ *
+ *	CPU_SUBTYPE_MC680x0_ALL has been defined to be the same
+ *	subtype as CPU_SUBTYPE_MC68030 for binary comatability.
+ *
+ *	CPU_SUBTYPE_MC68030_ONLY has been added to allow new object
+ *	files to be tagged as containing 68030-specific instructions.
+ */
+
+#define	CPU_SUBTYPE_MC680x0_ALL		((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_MC68030		((cpu_subtype_t) 1) /* compat */
+#define CPU_SUBTYPE_MC68040		((cpu_subtype_t) 2) 
+#define	CPU_SUBTYPE_MC68030_ONLY	((cpu_subtype_t) 3)
+
+/*
+ *	I386 subtypes
+ */
+
+#define CPU_SUBTYPE_INTEL(f, m)	((cpu_subtype_t) (f) + ((m) << 4))
+
+#define	CPU_SUBTYPE_I386_ALL			CPU_SUBTYPE_INTEL(3, 0)
+#define CPU_SUBTYPE_386					CPU_SUBTYPE_INTEL(3, 0)
+#define CPU_SUBTYPE_486					CPU_SUBTYPE_INTEL(4, 0)
+#define CPU_SUBTYPE_486SX				CPU_SUBTYPE_INTEL(4, 8)	// 8 << 4 = 128
+#define CPU_SUBTYPE_586					CPU_SUBTYPE_INTEL(5, 0)
+#define CPU_SUBTYPE_PENT	CPU_SUBTYPE_INTEL(5, 0)
+#define CPU_SUBTYPE_PENTPRO	CPU_SUBTYPE_INTEL(6, 1)
+#define CPU_SUBTYPE_PENTII_M3	CPU_SUBTYPE_INTEL(6, 3)
+#define CPU_SUBTYPE_PENTII_M5	CPU_SUBTYPE_INTEL(6, 5)
+#define CPU_SUBTYPE_CELERON				CPU_SUBTYPE_INTEL(7, 6)
+#define CPU_SUBTYPE_CELERON_MOBILE		CPU_SUBTYPE_INTEL(7, 7)
+#define CPU_SUBTYPE_PENTIUM_3			CPU_SUBTYPE_INTEL(8, 0)
+#define CPU_SUBTYPE_PENTIUM_3_M			CPU_SUBTYPE_INTEL(8, 1)
+#define CPU_SUBTYPE_PENTIUM_3_XEON		CPU_SUBTYPE_INTEL(8, 2)
+#define CPU_SUBTYPE_PENTIUM_M			CPU_SUBTYPE_INTEL(9, 0)
+#define CPU_SUBTYPE_PENTIUM_4			CPU_SUBTYPE_INTEL(10, 0)
+#define CPU_SUBTYPE_PENTIUM_4_M			CPU_SUBTYPE_INTEL(10, 1)
+#define CPU_SUBTYPE_ITANIUM				CPU_SUBTYPE_INTEL(11, 0)
+#define CPU_SUBTYPE_ITANIUM_2			CPU_SUBTYPE_INTEL(11, 1)
+#define CPU_SUBTYPE_XEON				CPU_SUBTYPE_INTEL(12, 0)
+#define CPU_SUBTYPE_XEON_MP				CPU_SUBTYPE_INTEL(12, 1)
+
+#define CPU_SUBTYPE_INTEL_FAMILY(x)	((x) & 15)
+#define CPU_SUBTYPE_INTEL_FAMILY_MAX	15
+
+#define CPU_SUBTYPE_INTEL_MODEL(x)	((x) >> 4)
+#define CPU_SUBTYPE_INTEL_MODEL_ALL	0
+
+/*
+ *	X86 subtypes.
+ */
+
+#define CPU_SUBTYPE_X86_ALL		((cpu_subtype_t)3)
+#define CPU_SUBTYPE_X86_64_ALL		((cpu_subtype_t)3)
+#define CPU_SUBTYPE_X86_ARCH1		((cpu_subtype_t)4)
+
+
+#define CPU_THREADTYPE_INTEL_HTT	((cpu_threadtype_t) 1)
+
+/*
+ *	Mips subtypes.
+ */
+
+#define	CPU_SUBTYPE_MIPS_ALL	((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_MIPS_R2300	((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_MIPS_R2600	((cpu_subtype_t) 2)
+#define CPU_SUBTYPE_MIPS_R2800	((cpu_subtype_t) 3)
+#define CPU_SUBTYPE_MIPS_R2000a	((cpu_subtype_t) 4)	/* pmax */
+#define CPU_SUBTYPE_MIPS_R2000	((cpu_subtype_t) 5)
+#define CPU_SUBTYPE_MIPS_R3000a	((cpu_subtype_t) 6)	/* 3max */
+#define CPU_SUBTYPE_MIPS_R3000	((cpu_subtype_t) 7)
+
+/*
+ *	MC98000 (PowerPC) subtypes
+ */
+#define	CPU_SUBTYPE_MC98000_ALL	((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_MC98601	((cpu_subtype_t) 1)
+
+/*
+ *	HPPA subtypes for Hewlett-Packard HP-PA family of
+ *	risc processors. Port by NeXT to 700 series. 
+ */
+
+#define	CPU_SUBTYPE_HPPA_ALL		((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_HPPA_7100		((cpu_subtype_t) 0) /* compat */
+#define CPU_SUBTYPE_HPPA_7100LC		((cpu_subtype_t) 1)
+
+/*
+ *	MC88000 subtypes.
+ */
+#define	CPU_SUBTYPE_MC88000_ALL	((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_MC88100	((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_MC88110	((cpu_subtype_t) 2)
+
+/*
+ *	SPARC subtypes
+ */
+#define	CPU_SUBTYPE_SPARC_ALL		((cpu_subtype_t) 0)
+
+/*
+ *	I860 subtypes
+ */
+#define CPU_SUBTYPE_I860_ALL	((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_I860_860	((cpu_subtype_t) 1)
+
+/*
+ *	PowerPC subtypes
+ */
+#define CPU_SUBTYPE_POWERPC_ALL		((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_POWERPC_601		((cpu_subtype_t) 1)
+#define CPU_SUBTYPE_POWERPC_602		((cpu_subtype_t) 2)
+#define CPU_SUBTYPE_POWERPC_603		((cpu_subtype_t) 3)
+#define CPU_SUBTYPE_POWERPC_603e	((cpu_subtype_t) 4)
+#define CPU_SUBTYPE_POWERPC_603ev	((cpu_subtype_t) 5)
+#define CPU_SUBTYPE_POWERPC_604		((cpu_subtype_t) 6)
+#define CPU_SUBTYPE_POWERPC_604e	((cpu_subtype_t) 7)
+#define CPU_SUBTYPE_POWERPC_620		((cpu_subtype_t) 8)
+#define CPU_SUBTYPE_POWERPC_750		((cpu_subtype_t) 9)
+#define CPU_SUBTYPE_POWERPC_7400	((cpu_subtype_t) 10)
+#define CPU_SUBTYPE_POWERPC_7450	((cpu_subtype_t) 11)
+#define CPU_SUBTYPE_POWERPC_970		((cpu_subtype_t) 100)
+
+/*
+ *	ARM subtypes
+ */
+#define CPU_SUBTYPE_ARM_ALL             ((cpu_subtype_t) 0)
+#define CPU_SUBTYPE_ARM_V4T             ((cpu_subtype_t) 5)
+#define CPU_SUBTYPE_ARM_V6              ((cpu_subtype_t) 6)
+#define CPU_SUBTYPE_ARM_V5TEJ           ((cpu_subtype_t) 7)
+#define CPU_SUBTYPE_ARM_XSCALE		((cpu_subtype_t) 8)
+#define CPU_SUBTYPE_ARM_V7		((cpu_subtype_t) 9)
+
+/*
+ *	CPU families (sysctl hw.cpufamily)
+ *
+ * These are meant to identify the CPU's marketing name - an
+ * application can map these to (possibly) localized strings.
+ * NB: the encodings of the CPU families are intentionally arbitrary.
+ * There is no ordering, and you should never try to deduce whether
+ * or not some feature is available based on the family.
+ * Use feature flags (eg, hw.optional.altivec) to test for optional
+ * functionality.
+ */
+#define CPUFAMILY_UNKNOWN   		0
+#define CPUFAMILY_POWERPC_G3		0xcee41549
+#define CPUFAMILY_POWERPC_G4		0x77c184ae
+#define CPUFAMILY_POWERPC_G5		0xed76d8aa
+#define CPUFAMILY_INTEL_6_13		0xaa33392b
+#define CPUFAMILY_INTEL_YONAH		0x73d67300
+#define CPUFAMILY_INTEL_MEROM		0x426f69ef
+#define CPUFAMILY_INTEL_PENRYN		0x78ea4fbc
+#define CPUFAMILY_INTEL_NEHALEM		0x6b5a4cd2
+#define CPUFAMILY_INTEL_WESTMERE	0x573b5eec
+#define CPUFAMILY_ARM_9			0xe73283ae
+#define CPUFAMILY_ARM_11		0x8ff620d8
+#define CPUFAMILY_ARM_XSCALE		0x53b005f5
+#define CPUFAMILY_ARM_13		0x0cc90e64
+
+/* The following synonyms are deprecated: */
+#define CPUFAMILY_INTEL_6_14	CPUFAMILY_INTEL_YONAH
+#define CPUFAMILY_INTEL_6_15	CPUFAMILY_INTEL_MEROM
+#define CPUFAMILY_INTEL_6_23	CPUFAMILY_INTEL_PENRYN
+#define CPUFAMILY_INTEL_6_26	CPUFAMILY_INTEL_NEHALEM
+
+#define CPUFAMILY_INTEL_CORE	CPUFAMILY_INTEL_YONAH
+#define CPUFAMILY_INTEL_CORE2	CPUFAMILY_INTEL_MEROM
+
+
+#endif	/* _MACH_MACHINE_H_ */
diff --git a/i386/include/mach/machine/asm.h b/i386/include/mach/machine/asm.h
new file mode 100644
index 0000000..59e1da2
--- /dev/null
+++ b/i386/include/mach/machine/asm.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_ASM_H
+#define _MACH_MACHINE_ASM_H
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "mach/ppc/asm.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/asm.h"
+#elif defined (__arm__)
+#include "mach/arm/asm.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_ASM_H */
diff --git a/i386/include/mach/machine/boolean.h b/i386/include/mach/machine/boolean.h
new file mode 100644
index 0000000..1bec00d
--- /dev/null
+++ b/i386/include/mach/machine/boolean.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_BOOLEAN_H_
+#define _MACH_MACHINE_BOOLEAN_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "mach/ppc/boolean.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/boolean.h"
+#elif defined (__arm__)
+#include "mach/arm/boolean.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_BOOLEAN_H_ */
diff --git a/i386/include/mach/machine/exception.h b/i386/include/mach/machine/exception.h
new file mode 100644
index 0000000..5ce83f2
--- /dev/null
+++ b/i386/include/mach/machine/exception.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_EXCEPTION_H_
+#define _MACH_MACHINE_EXCEPTION_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "mach/ppc/exception.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/exception.h"
+#elif defined (__arm__)
+#include "mach/arm/exception.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_EXCEPTION_H_ */
diff --git a/i386/include/mach/machine/kern_return.h b/i386/include/mach/machine/kern_return.h
new file mode 100644
index 0000000..df37396
--- /dev/null
+++ b/i386/include/mach/machine/kern_return.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_KERN_RETURN_H_
+#define _MACH_MACHINE_KERN_RETURN_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "mach/ppc/kern_return.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/kern_return.h"
+#elif defined (__arm__)
+#include "mach/arm/kern_return.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_KERN_RETURN_H_ */
diff --git a/i386/include/mach/machine/machine_types.defs b/i386/include/mach/machine/machine_types.defs
new file mode 100644
index 0000000..418d16b
--- /dev/null
+++ b/i386/include/mach/machine/machine_types.defs
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_MACHINE_TYPES_DEFS
+#define _MACH_MACHINE_MACHINE_TYPES_DEFS
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "mach/ppc/machine_types.defs"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/machine_types.defs"
+#elif defined (__arm__)
+#include "mach/arm/machine_types.defs"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_THREAD_STATUS_H_ */
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/machine/ndr_def.h b/i386/include/mach/machine/ndr_def.h
new file mode 100644
index 0000000..a7b5a9b
--- /dev/null
+++ b/i386/include/mach/machine/ndr_def.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_NDR_DEF_H
+#define _MACH_MACHINE_NDR_DEF_H
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "mach/ppc/ndr_def.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/ndr_def.h"
+#elif defined (__arm__)
+#include "mach/arm/ndr_def.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_NDR_DEF_H */
diff --git a/i386/include/mach/machine/processor_info.h b/i386/include/mach/machine/processor_info.h
new file mode 100644
index 0000000..ca96367
--- /dev/null
+++ b/i386/include/mach/machine/processor_info.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_PROCESSOR_INFO_H_
+#define _MACH_MACHINE_PROCESSOR_INFO_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "mach/ppc/processor_info.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/processor_info.h"
+#elif defined (__arm__)
+#include "mach/arm/processor_info.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_PROCESSOR_INFO_H_ */
diff --git a/i386/include/mach/machine/rpc.h b/i386/include/mach/machine/rpc.h
new file mode 100644
index 0000000..b969bd4
--- /dev/null
+++ b/i386/include/mach/machine/rpc.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_RPC_H_
+#define _MACH_MACHINE_RPC_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "mach/ppc/rpc.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/rpc.h"
+#elif defined (__arm__)
+#include "mach/arm/rpc.h"
+#else
+#error architecture not supported
+#endif
+
+#endif	/* _MACH_MACHINE_RPC_H_ */
diff --git a/i386/include/mach/machine/sdt.h b/i386/include/mach/machine/sdt.h
new file mode 100644
index 0000000..e85508f
--- /dev/null
+++ b/i386/include/mach/machine/sdt.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2007 Apple Inc. All rights reserved.
+ */
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MACH_MACHINE_SYS_SDT_H
+#define	_MACH_MACHINE_SYS_SDT_H
+
+#include <mach/machine/sdt_isa.h>
+
+
+#endif	/* _MACH_MACHINE_SYS_SDT_H */
diff --git a/i386/include/mach/machine/sdt_isa.h b/i386/include/mach/machine/sdt_isa.h
new file mode 100644
index 0000000..a8e1379
--- /dev/null
+++ b/i386/include/mach/machine/sdt_isa.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _MACH_MACHINE_SDT_ISA_H_
+#define _MACH_MACHINE_SDT_ISA_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include <mach/ppc/sdt_isa.h>
+#elif defined (__i386__) || defined(__x86_64__)
+#include <mach/i386/sdt_isa.h>
+#elif defined (__arm__)
+#include <mach/arm/sdt_isa.h>
+#else
+#error architecture not supported
+#endif
+
+#endif /* _BSD_MACHINE_SDT_ISA_H_ */
diff --git a/i386/include/mach/machine/thread_state.h b/i386/include/mach/machine/thread_state.h
new file mode 100644
index 0000000..18ffca4
--- /dev/null
+++ b/i386/include/mach/machine/thread_state.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_THREAD_STATE_H_
+#define _MACH_MACHINE_THREAD_STATE_H_
+
+#if defined (__ppc__) || defined(__ppc64__)
+#include "mach/ppc/thread_state.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/thread_state.h"
+#elif defined (__arm__)
+#include "mach/arm/thread_state.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_THREAD_STATE_H_ */
diff --git a/i386/include/mach/machine/thread_status.h b/i386/include/mach/machine/thread_status.h
new file mode 100644
index 0000000..ad5eff0
--- /dev/null
+++ b/i386/include/mach/machine/thread_status.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_THREAD_STATUS_H_
+#define _MACH_MACHINE_THREAD_STATUS_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "mach/ppc/thread_status.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/thread_status.h"
+#elif defined (__arm__)
+#include "mach/arm/thread_status.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_THREAD_STATUS_H_ */
diff --git a/i386/include/mach/machine/vm_param.h b/i386/include/mach/machine/vm_param.h
new file mode 100644
index 0000000..c71121b
--- /dev/null
+++ b/i386/include/mach/machine/vm_param.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_VM_PARAM_H_
+#define _MACH_MACHINE_VM_PARAM_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "mach/ppc/vm_param.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/vm_param.h"
+#elif defined (__arm__)
+#include "mach/arm/vm_param.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_VM_PARAM_H_ */
diff --git a/i386/include/mach/machine/vm_types.h b/i386/include/mach/machine/vm_types.h
new file mode 100644
index 0000000..b366092
--- /dev/null
+++ b/i386/include/mach/machine/vm_types.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_MACHINE_VM_TYPES_H_
+#define _MACH_MACHINE_VM_TYPES_H_
+
+#if defined (__ppc__) || defined(__ppc64__)
+#include "mach/ppc/vm_types.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "mach/i386/vm_types.h"
+#elif defined (__arm__)
+#include "mach/arm/vm_types.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _MACH_MACHINE_VM_TYPES_H_ */
diff --git a/i386/include/mach/memory_object_types.h b/i386/include/mach/memory_object_types.h
new file mode 100644
index 0000000..5c1f76e
--- /dev/null
+++ b/i386/include/mach/memory_object_types.h
@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	memory_object.h
+ *	Author:	Michael Wayne Young
+ *
+ *	External memory management interface definition.
+ */
+
+#ifndef	_MACH_MEMORY_OBJECT_TYPES_H_
+#define _MACH_MEMORY_OBJECT_TYPES_H_
+
+/*
+ *	User-visible types used in the external memory
+ *	management interface:
+ */
+
+#include <mach/port.h>
+#include <mach/message.h>
+#include <mach/vm_prot.h>
+#include <mach/vm_sync.h>
+#include <mach/vm_types.h>
+#include <mach/machine/vm_types.h>
+
+#include <sys/cdefs.h>
+
+#define VM_64_BIT_DATA_OBJECTS
+
+typedef unsigned long long	memory_object_offset_t;
+typedef unsigned long long	memory_object_size_t;
+typedef natural_t		memory_object_cluster_size_t;
+typedef natural_t *		memory_object_fault_info_t;
+
+typedef unsigned long long 	vm_object_id_t;
+
+
+/*
+ * Temporary until real EMMI version gets re-implemented
+ */
+
+
+typedef mach_port_t	memory_object_t;
+typedef mach_port_t	memory_object_control_t;
+
+
+typedef memory_object_t *memory_object_array_t;
+					/* A memory object ... */
+					/*  Used by the kernel to retrieve */
+					/*  or store data */
+
+typedef	mach_port_t	memory_object_name_t;
+					/* Used to describe the memory ... */
+					/*  object in vm_regions() calls */
+
+typedef mach_port_t	memory_object_default_t;
+					/* Registered with the host ... */
+					/*  for creating new internal objects */
+
+#define MEMORY_OBJECT_NULL		((memory_object_t) 0)
+#define MEMORY_OBJECT_CONTROL_NULL	((memory_object_control_t) 0)
+#define MEMORY_OBJECT_NAME_NULL		((memory_object_name_t) 0)
+#define MEMORY_OBJECT_DEFAULT_NULL	((memory_object_default_t) 0)
+
+
+typedef	int		memory_object_copy_strategy_t;
+					/* How memory manager handles copy: */
+#define		MEMORY_OBJECT_COPY_NONE		0
+					/* ... No special support */
+#define		MEMORY_OBJECT_COPY_CALL		1
+					/* ... Make call on memory manager */
+#define		MEMORY_OBJECT_COPY_DELAY 	2
+					/* ... Memory manager doesn't
+					 *     change data externally.
+					 */
+#define		MEMORY_OBJECT_COPY_TEMPORARY 	3
+					/* ... Memory manager doesn't
+					 *     change data externally, and
+					 *     doesn't need to see changes.
+					 */
+#define		MEMORY_OBJECT_COPY_SYMMETRIC 	4
+					/* ... Memory manager doesn't
+					 *     change data externally,
+					 *     doesn't need to see changes,
+					 *     and object will not be
+					 *     multiply mapped.
+					 *
+					 *     XXX
+					 *     Not yet safe for non-kernel use.
+					 */
+
+#define		MEMORY_OBJECT_COPY_INVALID	5
+					/* ...	An invalid copy strategy,
+					 *	for external objects which
+					 *	have not been initialized.
+					 *	Allows copy_strategy to be
+					 *	examined without also
+					 *	examining pager_ready and
+					 *	internal.
+					 */
+
+typedef	int		memory_object_return_t;
+					/* Which pages to return to manager
+					   this time (lock_request) */
+#define		MEMORY_OBJECT_RETURN_NONE	0
+					/* ... don't return any. */
+#define		MEMORY_OBJECT_RETURN_DIRTY	1
+					/* ... only dirty pages. */
+#define		MEMORY_OBJECT_RETURN_ALL	2
+					/* ... dirty and precious pages. */
+#define		MEMORY_OBJECT_RETURN_ANYTHING	3
+					/* ... any resident page. */
+
+/* 
+ *	Data lock request flags
+ */
+
+#define		MEMORY_OBJECT_DATA_FLUSH 	0x1
+#define		MEMORY_OBJECT_DATA_NO_CHANGE	0x2
+#define		MEMORY_OBJECT_DATA_PURGE	0x4
+#define		MEMORY_OBJECT_COPY_SYNC		0x8
+#define		MEMORY_OBJECT_DATA_SYNC		0x10
+#define         MEMORY_OBJECT_IO_SYNC           0x20
+#define		MEMORY_OBJECT_DATA_FLUSH_ALL	0x40
+
+/*
+ *	Types for the memory object flavor interfaces
+ */
+
+#define MEMORY_OBJECT_INFO_MAX      (1024) 
+typedef int     *memory_object_info_t;      
+typedef int	 memory_object_flavor_t;
+typedef int      memory_object_info_data_t[MEMORY_OBJECT_INFO_MAX];
+
+
+#define MEMORY_OBJECT_PERFORMANCE_INFO	11
+#define MEMORY_OBJECT_ATTRIBUTE_INFO	14
+#define MEMORY_OBJECT_BEHAVIOR_INFO 	15	
+
+
+struct memory_object_perf_info {
+	memory_object_cluster_size_t	cluster_size;
+	boolean_t			may_cache;
+};
+
+struct memory_object_attr_info {
+	memory_object_copy_strategy_t	copy_strategy;
+	memory_object_cluster_size_t	cluster_size;
+	boolean_t			may_cache_object;
+	boolean_t			temporary;
+};
+
+struct memory_object_behave_info {
+	memory_object_copy_strategy_t	copy_strategy;	
+	boolean_t			temporary;
+	boolean_t			invalidate;
+	boolean_t			silent_overwrite;
+	boolean_t			advisory_pageout;
+};
+
+
+typedef struct memory_object_behave_info *memory_object_behave_info_t;
+typedef struct memory_object_behave_info memory_object_behave_info_data_t;
+
+typedef struct memory_object_perf_info 	*memory_object_perf_info_t;
+typedef struct memory_object_perf_info	memory_object_perf_info_data_t;
+
+typedef struct memory_object_attr_info	*memory_object_attr_info_t;
+typedef struct memory_object_attr_info	memory_object_attr_info_data_t;
+
+#define MEMORY_OBJECT_BEHAVE_INFO_COUNT ((mach_msg_type_number_t)	\
+                (sizeof(memory_object_behave_info_data_t)/sizeof(int)))
+#define MEMORY_OBJECT_PERF_INFO_COUNT	((mach_msg_type_number_t)	\
+		(sizeof(memory_object_perf_info_data_t)/sizeof(int)))
+#define MEMORY_OBJECT_ATTR_INFO_COUNT	((mach_msg_type_number_t)	\
+		(sizeof(memory_object_attr_info_data_t)/sizeof(int)))
+
+#define invalid_memory_object_flavor(f)					\
+	(f != MEMORY_OBJECT_ATTRIBUTE_INFO && 				\
+	 f != MEMORY_OBJECT_PERFORMANCE_INFO && 			\
+	 f != OLD_MEMORY_OBJECT_BEHAVIOR_INFO &&			\
+	 f != MEMORY_OBJECT_BEHAVIOR_INFO &&				\
+	 f != OLD_MEMORY_OBJECT_ATTRIBUTE_INFO)
+
+
+/*
+ * Used to support options on memory_object_release_name call
+ */
+#define MEMORY_OBJECT_TERMINATE_IDLE	0x1
+#define MEMORY_OBJECT_RESPECT_CACHE	0x2
+#define MEMORY_OBJECT_RELEASE_NO_OP	0x4
+
+
+/* named entry processor mapping options */
+/* enumerated */
+#define MAP_MEM_NOOP		0
+#define MAP_MEM_COPYBACK	1
+#define MAP_MEM_IO		2
+#define MAP_MEM_WTHRU		3
+#define MAP_MEM_WCOMB		4	/* Write combining mode */
+					/* aka store gather     */
+
+#define GET_MAP_MEM(flags)	\
+	((((unsigned int)(flags)) >> 24) & 0xFF)
+
+#define SET_MAP_MEM(caching, flags)	\
+	((flags) = ((((unsigned int)(caching)) << 24) \
+			& 0xFF000000) | ((flags) & 0xFFFFFF));
+
+/* leave room for vm_prot bits */
+#define MAP_MEM_ONLY		0x10000	/* change processor caching  */
+#define MAP_MEM_NAMED_CREATE	0x20000 /* create extant object      */
+#define MAP_MEM_PURGABLE	0x40000	/* create a purgable VM object */
+#define MAP_MEM_NAMED_REUSE	0x80000	/* reuse provided entry if identical */
+
+
+#endif	/* _MACH_MEMORY_OBJECT_TYPES_H_ */
diff --git a/i386/include/mach/message.h b/i386/include/mach/message.h
new file mode 100644
index 0000000..15c9be4
--- /dev/null
+++ b/i386/include/mach/message.h
@@ -0,0 +1,783 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ * NOTICE: This file was modified by McAfee Research in 2004 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ * Copyright (c) 2005 SPARTA, Inc.
+ */
+/*
+ */
+/*
+ *	File:	mach/message.h
+ *
+ *	Mach IPC message and primitive function definitions.
+ */
+
+#ifndef	_MACH_MESSAGE_H_
+#define _MACH_MESSAGE_H_
+
+#include <stdint.h>
+#include <mach/port.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/machine/vm_types.h>
+
+#include <sys/cdefs.h>
+
+/*
+ *  The timeout mechanism uses mach_msg_timeout_t values,
+ *  passed by value.  The timeout units are milliseconds.
+ *  It is controlled with the MACH_SEND_TIMEOUT
+ *  and MACH_RCV_TIMEOUT options.
+ */
+
+typedef natural_t mach_msg_timeout_t;
+
+/*
+ *  The value to be used when there is no timeout.
+ *  (No MACH_SEND_TIMEOUT/MACH_RCV_TIMEOUT option.)
+ */
+
+#define MACH_MSG_TIMEOUT_NONE		((mach_msg_timeout_t) 0)
+
+/*
+ *  The kernel uses MACH_MSGH_BITS_COMPLEX as a hint.  If it isn't on, it
+ *  assumes the body of the message doesn't contain port rights or OOL
+ *  data.  The field is set in received messages.  A user task must
+ *  use caution in interpreting the body of a message if the bit isn't
+ *  on, because the mach_msg_type's in the body might "lie" about the
+ *  contents.  If the bit isn't on, but the mach_msg_types
+ *  in the body specify rights or OOL data, the behavior is undefined.
+ *  (Ie, an error may or may not be produced.)
+ *
+ *  The value of MACH_MSGH_BITS_REMOTE determines the interpretation
+ *  of the msgh_remote_port field.  It is handled like a msgt_name.
+ *
+ *  The value of MACH_MSGH_BITS_LOCAL determines the interpretation
+ *  of the msgh_local_port field.  It is handled like a msgt_name.
+ *
+ *  MACH_MSGH_BITS() combines two MACH_MSG_TYPE_* values, for the remote
+ *  and local fields, into a single value suitable for msgh_bits.
+ *
+ *  MACH_MSGH_BITS_CIRCULAR should be zero; is is used internally.
+ *
+ *  The unused bits should be zero and are reserved for the kernel
+ *  or for future interface expansion.
+ */
+
+#define MACH_MSGH_BITS_ZERO		0x00000000
+#define MACH_MSGH_BITS_REMOTE_MASK	0x000000ff
+#define MACH_MSGH_BITS_LOCAL_MASK	0x0000ff00
+#define MACH_MSGH_BITS_COMPLEX		0x80000000U
+#define MACH_MSGH_BITS_USER             0x8000ffffU
+
+#define	MACH_MSGH_BITS_CIRCULAR		0x40000000	/* internal use only */
+#define	MACH_MSGH_BITS_USED		0xc000ffffU
+
+#define	MACH_MSGH_BITS_PORTS_MASK				\
+		(MACH_MSGH_BITS_REMOTE_MASK|MACH_MSGH_BITS_LOCAL_MASK)
+
+#define MACH_MSGH_BITS(remote, local)				\
+		((remote) | ((local) << 8))
+#define	MACH_MSGH_BITS_REMOTE(bits)				\
+		((bits) & MACH_MSGH_BITS_REMOTE_MASK)
+#define	MACH_MSGH_BITS_LOCAL(bits)				\
+		(((bits) & MACH_MSGH_BITS_LOCAL_MASK) >> 8)
+#define	MACH_MSGH_BITS_PORTS(bits)				\
+		((bits) & MACH_MSGH_BITS_PORTS_MASK)
+#define	MACH_MSGH_BITS_OTHER(bits)				\
+		((bits) &~ MACH_MSGH_BITS_PORTS_MASK)
+
+/*
+ *  Every message starts with a message header.
+ *  Following the message header, if the message is complex, are a count
+ *  of type descriptors and the type descriptors themselves 
+ *  (mach_msg_descriptor_t). The size of the message must be specified in 
+ *  bytes, and includes the message header, descriptor count, descriptors, 
+ *  and inline data.
+ *
+ *  The msgh_remote_port field specifies the destination of the message.
+ *  It must specify a valid send or send-once right for a port.
+ *
+ *  The msgh_local_port field specifies a "reply port".  Normally,
+ *  This field carries a send-once right that the receiver will use
+ *  to reply to the message.  It may carry the values MACH_PORT_NULL,
+ *  MACH_PORT_DEAD, a send-once right, or a send right.
+ *
+ *  The msgh_seqno field carries a sequence number associated with the
+ *  received-from port.  A port's sequence number is incremented every
+ *  time a message is received from it.  In sent messages, the field's
+ *  value is ignored.
+ *
+ *  The msgh_id field is uninterpreted by the message primitives.
+ *  It normally carries information specifying the format
+ *  or meaning of the message.
+ */
+
+typedef unsigned int mach_msg_bits_t;
+typedef	natural_t mach_msg_size_t;
+typedef integer_t mach_msg_id_t;
+
+
+#define MACH_MSG_SIZE_NULL (mach_msg_size_t *) 0
+
+typedef unsigned int mach_msg_type_name_t;
+
+#define MACH_MSG_TYPE_MOVE_RECEIVE	16	/* Must hold receive rights */
+#define MACH_MSG_TYPE_MOVE_SEND		17	/* Must hold send rights */
+#define MACH_MSG_TYPE_MOVE_SEND_ONCE	18	/* Must hold sendonce rights */
+#define MACH_MSG_TYPE_COPY_SEND		19	/* Must hold send rights */
+#define MACH_MSG_TYPE_MAKE_SEND		20	/* Must hold receive rights */
+#define MACH_MSG_TYPE_MAKE_SEND_ONCE	21	/* Must hold receive rights */
+#define MACH_MSG_TYPE_COPY_RECEIVE	22	/* Must hold receive rights */
+
+typedef unsigned int mach_msg_copy_options_t;
+
+#define MACH_MSG_PHYSICAL_COPY		0
+#define MACH_MSG_VIRTUAL_COPY   	1
+#define MACH_MSG_ALLOCATE		2
+#define MACH_MSG_OVERWRITE		3
+#ifdef  MACH_KERNEL
+#define MACH_MSG_KALLOC_COPY_T		4
+#endif  /* MACH_KERNEL */
+
+/*
+ * In a complex mach message, the mach_msg_header_t is followed by 
+ * a descriptor count, then an array of that number of descriptors 
+ * (mach_msg_*_descriptor_t). The type field of mach_msg_type_descriptor_t
+ * (which any descriptor can be cast to) indicates the flavor of the
+ * descriptor.
+ *
+ * Note that in LP64, the various types of descriptors are no longer all
+ * the same size as mach_msg_descriptor_t, so the array cannot be indexed 
+ * as expected.
+ */
+
+typedef unsigned int mach_msg_descriptor_type_t;
+
+#define MACH_MSG_PORT_DESCRIPTOR 		0
+#define MACH_MSG_OOL_DESCRIPTOR  		1
+#define MACH_MSG_OOL_PORTS_DESCRIPTOR 		2
+#define MACH_MSG_OOL_VOLATILE_DESCRIPTOR  	3
+
+#pragma pack(4)
+
+typedef struct
+{
+  natural_t			pad1;
+  mach_msg_size_t		pad2;
+  unsigned int			pad3 : 24;
+  mach_msg_descriptor_type_t	type : 8;
+} mach_msg_type_descriptor_t;
+
+typedef struct
+{
+  mach_port_t			name;
+#if !(defined(KERNEL) && defined(__LP64__))
+// Pad to 8 bytes everywhere except the K64 kernel where mach_port_t is 8 bytes
+  mach_msg_size_t		pad1;
+#endif
+  unsigned int			pad2 : 16;
+  mach_msg_type_name_t		disposition : 8;
+  mach_msg_descriptor_type_t	type : 8;
+} mach_msg_port_descriptor_t;
+
+typedef struct
+{
+  uint32_t			address;
+  mach_msg_size_t       	size;
+  boolean_t     		deallocate: 8;
+  mach_msg_copy_options_t       copy: 8;
+  unsigned int     		pad1: 8;
+  mach_msg_descriptor_type_t    type: 8;
+} mach_msg_ool_descriptor32_t;
+
+typedef struct
+{
+  uint64_t			address;
+  boolean_t     		deallocate: 8;
+  mach_msg_copy_options_t       copy: 8;
+  unsigned int     		pad1: 8;
+  mach_msg_descriptor_type_t    type: 8;
+  mach_msg_size_t       	size;
+} mach_msg_ool_descriptor64_t;
+
+typedef struct
+{
+  void*				address;
+#if !defined(__LP64__)
+  mach_msg_size_t       	size;
+#endif
+  boolean_t     		deallocate: 8;
+  mach_msg_copy_options_t       copy: 8;
+  unsigned int     		pad1: 8;
+  mach_msg_descriptor_type_t    type: 8;
+#if defined(__LP64__)
+  mach_msg_size_t       	size;
+#endif
+#if defined(KERNEL) && !defined(__LP64__)
+  uint32_t          pad_end;
+#endif
+} mach_msg_ool_descriptor_t;
+
+typedef struct
+{
+  uint32_t			address;
+  mach_msg_size_t		count;
+  boolean_t     		deallocate: 8;
+  mach_msg_copy_options_t       copy: 8;
+  mach_msg_type_name_t		disposition : 8;
+  mach_msg_descriptor_type_t	type : 8;
+} mach_msg_ool_ports_descriptor32_t;
+
+typedef struct
+{
+  uint64_t			address;
+  boolean_t     		deallocate: 8;
+  mach_msg_copy_options_t       copy: 8;
+  mach_msg_type_name_t		disposition : 8;
+  mach_msg_descriptor_type_t	type : 8;
+  mach_msg_size_t		count;
+} mach_msg_ool_ports_descriptor64_t;
+
+typedef struct
+{
+  void*				address;
+#if !defined(__LP64__)
+  mach_msg_size_t		count;
+#endif
+  boolean_t     		deallocate: 8;
+  mach_msg_copy_options_t       copy: 8;
+  mach_msg_type_name_t		disposition : 8;
+  mach_msg_descriptor_type_t	type : 8;
+#if defined(__LP64__)
+  mach_msg_size_t		count;
+#endif
+#if defined(KERNEL) && !defined(__LP64__)
+  uint32_t          pad_end;
+#endif
+} mach_msg_ool_ports_descriptor_t;
+
+/*
+ * LP64support - This union definition is not really
+ * appropriate in LP64 mode because not all descriptors
+ * are of the same size in that environment.
+ */
+#if defined(__LP64__) && defined(KERNEL)
+typedef union
+{
+  mach_msg_port_descriptor_t		port;
+  mach_msg_ool_descriptor32_t		out_of_line;
+  mach_msg_ool_ports_descriptor32_t	ool_ports;
+  mach_msg_type_descriptor_t		type;
+} mach_msg_descriptor_t;
+#else
+typedef union
+{
+  mach_msg_port_descriptor_t		port;
+  mach_msg_ool_descriptor_t		out_of_line;
+  mach_msg_ool_ports_descriptor_t	ool_ports;
+  mach_msg_type_descriptor_t		type;
+} mach_msg_descriptor_t;
+#endif
+
+typedef struct
+{
+        mach_msg_size_t msgh_descriptor_count;
+} mach_msg_body_t;
+
+#define MACH_MSG_BODY_NULL (mach_msg_body_t *) 0
+#define MACH_MSG_DESCRIPTOR_NULL (mach_msg_descriptor_t *) 0
+
+typedef	struct 
+{
+  mach_msg_bits_t	msgh_bits;
+  mach_msg_size_t	msgh_size;
+  mach_port_t		msgh_remote_port;
+  mach_port_t		msgh_local_port;
+  mach_msg_size_t 	msgh_reserved;
+  mach_msg_id_t		msgh_id;
+} mach_msg_header_t;
+
+#define MACH_MSG_NULL (mach_msg_header_t *) 0
+
+typedef struct
+{
+        mach_msg_header_t       header;
+        mach_msg_body_t         body;
+} mach_msg_base_t;
+
+typedef	unsigned int mach_msg_trailer_type_t;
+
+#define	MACH_MSG_TRAILER_FORMAT_0	0
+
+typedef	unsigned int mach_msg_trailer_size_t;
+
+typedef struct 
+{
+  mach_msg_trailer_type_t	msgh_trailer_type;
+  mach_msg_trailer_size_t	msgh_trailer_size;
+} mach_msg_trailer_t;
+
+typedef struct
+{
+  mach_msg_trailer_type_t       msgh_trailer_type;
+  mach_msg_trailer_size_t       msgh_trailer_size;
+  mach_port_seqno_t             msgh_seqno;
+} mach_msg_seqno_trailer_t;
+
+typedef struct
+{
+  unsigned int			val[2];
+} security_token_t;
+
+typedef struct 
+{
+  mach_msg_trailer_type_t	msgh_trailer_type;
+  mach_msg_trailer_size_t	msgh_trailer_size;
+  mach_port_seqno_t		msgh_seqno;
+  security_token_t		msgh_sender;
+} mach_msg_security_trailer_t;
+
+/*
+ * The audit token is an opaque token which identifies
+ * Mach tasks and senders of Mach messages as subjects
+ * to the BSM audit system.  Only the appropriate BSM
+ * library routines should be used to interpret the
+ * contents of the audit token as the representation
+ * of the subject identity within the token may change
+ * over time.
+ */
+typedef struct
+{
+  unsigned int			val[8];
+} audit_token_t;
+
+typedef struct 
+{
+  mach_msg_trailer_type_t	msgh_trailer_type;
+  mach_msg_trailer_size_t	msgh_trailer_size;
+  mach_port_seqno_t		msgh_seqno;
+  security_token_t		msgh_sender;
+  audit_token_t			msgh_audit;
+} mach_msg_audit_trailer_t;
+
+typedef struct 
+{
+  mach_msg_trailer_type_t	msgh_trailer_type;
+  mach_msg_trailer_size_t	msgh_trailer_size;
+  mach_port_seqno_t		msgh_seqno;
+  security_token_t		msgh_sender;
+  audit_token_t			msgh_audit;
+  mach_vm_address_t		msgh_context;
+} mach_msg_context_trailer_t;
+
+
+typedef struct
+{
+  mach_port_name_t sender;
+} msg_labels_t;
+
+/* 
+   Trailer type to pass MAC policy label info as a mach message trailer.
+   
+*/
+
+typedef struct
+{
+  mach_msg_trailer_type_t       msgh_trailer_type;
+  mach_msg_trailer_size_t       msgh_trailer_size;
+  mach_port_seqno_t             msgh_seqno;
+  security_token_t              msgh_sender;
+  audit_token_t                 msgh_audit;
+  mach_vm_address_t             msgh_context;
+  int				msgh_ad;
+  msg_labels_t                  msgh_labels;
+} mach_msg_mac_trailer_t;
+
+#define MACH_MSG_TRAILER_MINIMUM_SIZE  sizeof(mach_msg_trailer_t)
+
+/*
+ * These values can change from release to release - but clearly
+ * code cannot request additional trailer elements one was not
+ * compiled to understand.  Therefore, it is safe to use this
+ * constant when the same module specified the receive options.
+ * Otherwise, you run the risk that the options requested by
+ * another module may exceed the local modules notion of
+ * MAX_TRAILER_SIZE.
+ */
+typedef mach_msg_mac_trailer_t mach_msg_max_trailer_t;
+#define MAX_TRAILER_SIZE ((mach_msg_size_t)sizeof(mach_msg_max_trailer_t))
+
+/*
+ * Legacy requirements keep us from ever updating these defines (even
+ * when the format_0 trailers gain new option data fields in the future).
+ * Therefore, they shouldn't be used going forward.  Instead, the sizes
+ * should be compared against the specific element size requested using
+ * REQUESTED_TRAILER_SIZE.
+ */
+typedef mach_msg_security_trailer_t mach_msg_format_0_trailer_t;
+
+/*typedef mach_msg_mac_trailer_t mach_msg_format_0_trailer_t;
+*/
+
+#define MACH_MSG_TRAILER_FORMAT_0_SIZE sizeof(mach_msg_format_0_trailer_t)
+
+#define   KERNEL_SECURITY_TOKEN_VALUE  { {0, 1} }
+extern security_token_t KERNEL_SECURITY_TOKEN;
+
+#define   KERNEL_AUDIT_TOKEN_VALUE  { {0, 0, 0, 0, 0, 0, 0, 0} }
+extern audit_token_t KERNEL_AUDIT_TOKEN;
+
+typedef	integer_t mach_msg_options_t;
+
+typedef struct
+{
+  mach_msg_header_t	header;
+} mach_msg_empty_send_t;
+
+typedef struct
+{
+  mach_msg_header_t	header;
+  mach_msg_trailer_t	trailer;
+} mach_msg_empty_rcv_t;
+
+typedef union
+{
+  mach_msg_empty_send_t	send;
+  mach_msg_empty_rcv_t	rcv;
+} mach_msg_empty_t;
+
+#pragma pack()
+
+/* utility to round the message size - will become machine dependent */
+#define round_msg(x)	(((mach_msg_size_t)(x) + sizeof (natural_t) - 1) & \
+				~(sizeof (natural_t) - 1))
+
+/*
+ *  There is no fixed upper bound to the size of Mach messages.
+ */
+
+#define	MACH_MSG_SIZE_MAX	((mach_msg_size_t) ~0)
+
+/*
+ *  Compatibility definitions, for code written
+ *  when there was a msgh_kind instead of msgh_seqno.
+ */
+#define MACH_MSGH_KIND_NORMAL		0x00000000
+#define MACH_MSGH_KIND_NOTIFICATION	0x00000001
+#define	msgh_kind			msgh_seqno
+#define mach_msg_kind_t			mach_port_seqno_t
+
+typedef natural_t mach_msg_type_size_t;
+typedef natural_t mach_msg_type_number_t;
+
+/*
+ *  Values received/carried in messages.  Tells the receiver what
+ *  sort of port right he now has.
+ *
+ *  MACH_MSG_TYPE_PORT_NAME is used to transfer a port name
+ *  which should remain uninterpreted by the kernel.  (Port rights
+ *  are not transferred, just the port name.)
+ */
+
+#define MACH_MSG_TYPE_PORT_NONE		0
+
+#define MACH_MSG_TYPE_PORT_NAME		15
+#define MACH_MSG_TYPE_PORT_RECEIVE	MACH_MSG_TYPE_MOVE_RECEIVE
+#define MACH_MSG_TYPE_PORT_SEND		MACH_MSG_TYPE_MOVE_SEND
+#define MACH_MSG_TYPE_PORT_SEND_ONCE	MACH_MSG_TYPE_MOVE_SEND_ONCE
+
+#define MACH_MSG_TYPE_LAST		22		/* Last assigned */
+
+/*
+ *  A dummy value.  Mostly used to indicate that the actual value
+ *  will be filled in later, dynamically.
+ */
+
+#define MACH_MSG_TYPE_POLYMORPHIC	((mach_msg_type_name_t) -1)
+
+/*
+ *	Is a given item a port type?
+ */
+
+#define MACH_MSG_TYPE_PORT_ANY(x)			\
+	(((x) >= MACH_MSG_TYPE_MOVE_RECEIVE) &&		\
+	 ((x) <= MACH_MSG_TYPE_MAKE_SEND_ONCE))
+
+#define	MACH_MSG_TYPE_PORT_ANY_SEND(x)			\
+	(((x) >= MACH_MSG_TYPE_MOVE_SEND) &&		\
+	 ((x) <= MACH_MSG_TYPE_MAKE_SEND_ONCE))
+
+#define	MACH_MSG_TYPE_PORT_ANY_RIGHT(x)			\
+	(((x) >= MACH_MSG_TYPE_MOVE_RECEIVE) &&		\
+	 ((x) <= MACH_MSG_TYPE_MOVE_SEND_ONCE))
+
+typedef integer_t mach_msg_option_t;
+
+#define MACH_MSG_OPTION_NONE	0x00000000
+
+#define	MACH_SEND_MSG		0x00000001
+#define	MACH_RCV_MSG		0x00000002
+#define MACH_RCV_LARGE		0x00000004
+
+#define MACH_SEND_TIMEOUT	0x00000010
+#define MACH_SEND_INTERRUPT	0x00000040	/* libmach implements */
+#define MACH_SEND_CANCEL	0x00000080
+#define MACH_SEND_ALWAYS	0x00010000	/* internal use only */
+#define MACH_SEND_TRAILER	0x00020000	
+
+#define MACH_RCV_TIMEOUT	0x00000100
+#define MACH_RCV_NOTIFY		0x00000200
+#define MACH_RCV_INTERRUPT	0x00000400	/* libmach implements */
+#define MACH_RCV_OVERWRITE	0x00001000
+
+/* 
+ * NOTE: a 0x00------ RCV mask implies to ask for
+ * a MACH_MSG_TRAILER_FORMAT_0 with 0 Elements, 
+ * which is equivalent to a mach_msg_trailer_t.
+ *
+ * XXXMAC: unlike the rest of the MACH_RCV_* flags, MACH_RCV_TRAILER_LABELS
+ * needs its own private bit since we only calculate its fields when absolutely 
+ * required.
+ */
+#define MACH_RCV_TRAILER_NULL   0
+#define MACH_RCV_TRAILER_SEQNO  1
+#define MACH_RCV_TRAILER_SENDER 2
+#define MACH_RCV_TRAILER_AUDIT  3
+#define MACH_RCV_TRAILER_CTX    4
+#define MACH_RCV_TRAILER_AV     7
+#define MACH_RCV_TRAILER_LABELS 8
+
+#define MACH_RCV_TRAILER_TYPE(x)     (((x) & 0xf) << 28) 
+#define MACH_RCV_TRAILER_ELEMENTS(x) (((x) & 0xf) << 24)  
+#define MACH_RCV_TRAILER_MASK 	     ((0xff << 24))
+
+#define GET_RCV_ELEMENTS(y) (((y) >> 24) & 0xf)
+
+/* 
+ * XXXMAC: note that in the case of MACH_RCV_TRAILER_LABELS, 
+ * we just fall through to mach_msg_max_trailer_t.
+ * This is correct behavior since mach_msg_max_trailer_t is defined as
+ * mac_msg_mac_trailer_t which is used for the LABELS trailer.
+ * It also makes things work properly if MACH_RCV_TRAILER_LABELS is ORed 
+ * with one of the other options.
+ */
+#define REQUESTED_TRAILER_SIZE(y) 				\
+	((mach_msg_trailer_size_t)				\
+	 ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_NULL) ?	\
+	  sizeof(mach_msg_trailer_t) :				\
+	  ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_SEQNO) ?	\
+	   sizeof(mach_msg_seqno_trailer_t) :			\
+	  ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_SENDER) ?	\
+	   sizeof(mach_msg_security_trailer_t) :		\
+	   ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_AUDIT) ?	\
+	    sizeof(mach_msg_audit_trailer_t) :      		\
+	    ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_CTX) ?	\
+	     sizeof(mach_msg_context_trailer_t) :      		\
+	     ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_AV) ?	\
+	      sizeof(mach_msg_mac_trailer_t) :      		\
+	     sizeof(mach_msg_max_trailer_t))))))))
+
+/*
+ *  Much code assumes that mach_msg_return_t == kern_return_t.
+ *  This definition is useful for descriptive purposes.
+ *
+ *  See <mach/error.h> for the format of error codes.
+ *  IPC errors are system 4.  Send errors are subsystem 0;
+ *  receive errors are subsystem 1.  The code field is always non-zero.
+ *  The high bits of the code field communicate extra information
+ *  for some error codes.  MACH_MSG_MASK masks off these special bits.
+ */
+
+typedef kern_return_t mach_msg_return_t;
+
+#define MACH_MSG_SUCCESS		0x00000000
+
+
+#define	MACH_MSG_MASK			0x00003e00
+		/* All special error code bits defined below. */
+#define	MACH_MSG_IPC_SPACE		0x00002000
+		/* No room in IPC name space for another capability name. */
+#define	MACH_MSG_VM_SPACE		0x00001000
+		/* No room in VM address space for out-of-line memory. */
+#define	MACH_MSG_IPC_KERNEL		0x00000800
+		/* Kernel resource shortage handling an IPC capability. */
+#define	MACH_MSG_VM_KERNEL		0x00000400
+		/* Kernel resource shortage handling out-of-line memory. */
+
+#define MACH_SEND_IN_PROGRESS		0x10000001
+		/* Thread is waiting to send.  (Internal use only.) */
+#define MACH_SEND_INVALID_DATA		0x10000002
+		/* Bogus in-line data. */
+#define MACH_SEND_INVALID_DEST		0x10000003
+		/* Bogus destination port. */
+#define MACH_SEND_TIMED_OUT		0x10000004
+		/* Message not sent before timeout expired. */
+#define MACH_SEND_INTERRUPTED		0x10000007
+		/* Software interrupt. */
+#define MACH_SEND_MSG_TOO_SMALL		0x10000008
+		/* Data doesn't contain a complete message. */
+#define MACH_SEND_INVALID_REPLY		0x10000009
+		/* Bogus reply port. */
+#define MACH_SEND_INVALID_RIGHT		0x1000000a
+		/* Bogus port rights in the message body. */
+#define MACH_SEND_INVALID_NOTIFY	0x1000000b
+		/* Bogus notify port argument. */
+#define MACH_SEND_INVALID_MEMORY	0x1000000c
+		/* Invalid out-of-line memory pointer. */
+#define MACH_SEND_NO_BUFFER		0x1000000d
+		/* No message buffer is available. */
+#define MACH_SEND_TOO_LARGE		0x1000000e
+		/* Send is too large for port */
+#define MACH_SEND_INVALID_TYPE		0x1000000f
+		/* Invalid msg-type specification. */
+#define MACH_SEND_INVALID_HEADER	0x10000010
+		/* A field in the header had a bad value. */
+#define MACH_SEND_INVALID_TRAILER	0x10000011
+		/* The trailer to be sent does not match kernel format. */
+#define MACH_SEND_INVALID_RT_OOL_SIZE	0x10000015
+		/* compatibility: no longer a returned error */
+
+#define MACH_RCV_IN_PROGRESS		0x10004001
+		/* Thread is waiting for receive.  (Internal use only.) */
+#define MACH_RCV_INVALID_NAME		0x10004002
+		/* Bogus name for receive port/port-set. */
+#define MACH_RCV_TIMED_OUT		0x10004003
+		/* Didn't get a message within the timeout value. */
+#define MACH_RCV_TOO_LARGE		0x10004004
+		/* Message buffer is not large enough for inline data. */
+#define MACH_RCV_INTERRUPTED		0x10004005
+		/* Software interrupt. */
+#define MACH_RCV_PORT_CHANGED		0x10004006
+		/* compatibility: no longer a returned error */
+#define MACH_RCV_INVALID_NOTIFY		0x10004007
+		/* Bogus notify port argument. */
+#define MACH_RCV_INVALID_DATA		0x10004008
+		/* Bogus message buffer for inline data. */
+#define MACH_RCV_PORT_DIED		0x10004009
+		/* Port/set was sent away/died during receive. */
+#define	MACH_RCV_IN_SET			0x1000400a
+		/* compatibility: no longer a returned error */
+#define	MACH_RCV_HEADER_ERROR		0x1000400b
+		/* Error receiving message header.  See special bits. */
+#define	MACH_RCV_BODY_ERROR		0x1000400c
+		/* Error receiving message body.  See special bits. */
+#define	MACH_RCV_INVALID_TYPE		0x1000400d
+		/* Invalid msg-type specification in scatter list. */
+#define	MACH_RCV_SCATTER_SMALL		0x1000400e
+		/* Out-of-line overwrite region is not large enough */
+#define MACH_RCV_INVALID_TRAILER	0x1000400f
+		/* trailer type or number of trailer elements not supported */
+#define MACH_RCV_IN_PROGRESS_TIMED      0x10004011
+                /* Waiting for receive with timeout. (Internal use only.) */
+
+
+__BEGIN_DECLS
+
+/*
+ *	Routine:	mach_msg_overwrite
+ *	Purpose:
+ *		Send and/or receive a message.  If the message operation
+ *		is interrupted, and the user did not request an indication
+ *		of that fact, then restart the appropriate parts of the
+ *		operation silently (trap version does not restart).
+ *
+ *		Distinct send and receive buffers may be specified.  If
+ *		no separate receive buffer is specified, the msg parameter
+ *		will be used for both send and receive operations.
+ *
+ *		In addition to a distinct receive buffer, that buffer may
+ *		already contain scatter control information to direct the
+ *		receiving of the message.
+ */
+
+extern mach_msg_return_t	mach_msg_overwrite(
+					mach_msg_header_t *msg,
+					mach_msg_option_t option,
+					mach_msg_size_t send_size,
+					mach_msg_size_t rcv_size,
+					mach_port_name_t rcv_name,
+					mach_msg_timeout_t timeout,
+					mach_port_name_t notify,
+					mach_msg_header_t *rcv_msg,
+					mach_msg_size_t rcv_limit);
+
+
+/*
+ *	Routine:	mach_msg
+ *	Purpose:
+ *		Send and/or receive a message.  If the message operation
+ *		is interrupted, and the user did not request an indication
+ *		of that fact, then restart the appropriate parts of the
+ *		operation silently (trap version does not restart).
+ */
+extern mach_msg_return_t	mach_msg(
+					mach_msg_header_t *msg,
+					mach_msg_option_t option,
+					mach_msg_size_t send_size,
+					mach_msg_size_t rcv_size,
+					mach_port_name_t rcv_name,
+					mach_msg_timeout_t timeout,
+					mach_port_name_t notify);
+
+
+__END_DECLS
+
+#endif	/* _MACH_MESSAGE_H_ */
+
diff --git a/i386/include/mach/mig.h b/i386/include/mach/mig.h
new file mode 100644
index 0000000..b62dd2c
--- /dev/null
+++ b/i386/include/mach/mig.h
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+/*
+ * Mach MIG Subsystem Interfaces
+ */
+
+#ifndef	_MACH_MIG_H_
+#define _MACH_MIG_H_
+
+#include <stdint.h>
+#include <mach/port.h>
+#include <mach/message.h>
+#include <mach/vm_types.h>
+
+#include <sys/cdefs.h>
+
+#if defined(MACH_KERNEL)
+
+#if defined(BSMALL_LATER)
+/* Really small configurations don't need type checking */
+#define __MigTypeCheck 0
+#else
+/* Turn MIG type checking on by default for kernel */
+#define __MigTypeCheck 1
+#endif
+#define __MigKernelSpecificCode 1
+#define _MIG_KERNEL_SPECIFIC_CODE_ 1
+
+/* Otherwise check legacy setting (temporary) */
+#elif defined(TypeCheck)  
+
+#define __MigTypeCheck TypeCheck
+
+#elif !defined(__MigTypeCheck)
+
+/* otherwise, default MIG type checking on - except in small configurations */
+#if defined(BSMALL)
+#define __MigTypeCheck 0
+#else
+#define __MigTypeCheck 1
+#endif
+
+#endif /* !defined(__MigTypeCheck) */
+
+/*
+ * Pack MIG message structs.
+ * This is an indicator of the need to view shared structs in a
+ * binary-compatible format - and MIG message structs are no different.
+ */
+#define __MigPackStructs 1
+
+/*
+ * Definition for MIG-generated server stub routines.  These routines
+ * unpack the request message, call the server procedure, and pack the
+ * reply message.
+ */
+typedef void	(*mig_stub_routine_t) (mach_msg_header_t *InHeadP,
+				       mach_msg_header_t *OutHeadP);
+
+typedef mig_stub_routine_t mig_routine_t;
+
+/*
+ * Definition for MIG-generated server routine.  This routine takes a
+ * message, and returns the appropriate stub function for handling that
+ * message.
+ */
+typedef mig_routine_t (*mig_server_routine_t) (mach_msg_header_t *InHeadP);
+
+/*
+ * Generic definition for implementation routines.  These routines do
+ * the real work associated with this request.  This generic type is
+ * used for keeping the pointers in the subsystem array.
+ */
+typedef kern_return_t   (*mig_impl_routine_t)(void);
+
+typedef mach_msg_type_descriptor_t routine_arg_descriptor;
+typedef mach_msg_type_descriptor_t *routine_arg_descriptor_t;
+typedef mach_msg_type_descriptor_t *mig_routine_arg_descriptor_t;
+
+#define MIG_ROUTINE_ARG_DESCRIPTOR_NULL ((mig_routine_arg_descriptor_t)0)
+
+struct routine_descriptor {
+	mig_impl_routine_t	impl_routine;	/* Server work func pointer   */
+	mig_stub_routine_t	stub_routine;	/* Unmarshalling func pointer */
+	unsigned int		argc;			/* Number of argument words   */
+	unsigned int		descr_count;	/* Number complex descriptors */
+	routine_arg_descriptor_t
+						arg_descr;		/* pointer to descriptor array*/
+	unsigned int		max_reply_msg;	/* Max size for reply msg     */
+};
+typedef struct routine_descriptor *routine_descriptor_t;
+
+typedef struct routine_descriptor mig_routine_descriptor;
+typedef mig_routine_descriptor *mig_routine_descriptor_t;
+
+#define MIG_ROUTINE_DESCRIPTOR_NULL ((mig_routine_descriptor_t)0)
+
+typedef struct mig_subsystem {
+	mig_server_routine_t server;		/* pointer to demux routine	*/
+	mach_msg_id_t		 start;			/* Min routine number	    */
+	mach_msg_id_t		 end;			/* Max routine number + 1   */
+	mach_msg_size_t		 maxsize;		/* Max reply message size   */
+	vm_address_t		 reserved;		/* reserved for MIG use	    */
+	mig_routine_descriptor
+						 routine[1];	/* Routine descriptor array */
+} *mig_subsystem_t;
+
+#define MIG_SUBSYSTEM_NULL		((mig_subsystem_t)0)
+
+typedef struct mig_symtab {
+	char				*ms_routine_name;
+	int					ms_routine_number;
+	void    			(*ms_routine)(void);	/* Since the functions in the
+					 							 * symbol table have unknown
+												 * signatures, this is the best
+					 							 * we can do...
+					 							 */
+} mig_symtab_t;
+
+
+__BEGIN_DECLS
+
+/* Client side reply port allocate */
+extern mach_port_t mig_get_reply_port(void);
+
+/* Client side reply port deallocate */
+extern void mig_dealloc_reply_port(mach_port_t reply_port);
+
+/* Client side reply port "deallocation" */
+extern void mig_put_reply_port(mach_port_t reply_port);
+
+/* Bounded string copy */
+extern int mig_strncpy(char	*dest, const char *src,	int	len);
+
+
+/* Allocate memory for out-of-line mig structures */
+extern void mig_allocate(vm_address_t *, vm_size_t);
+
+/* Deallocate memory used for out-of-line mig structures */
+extern void mig_deallocate(vm_address_t, vm_size_t);
+
+
+__END_DECLS
+
+#endif	/* _MACH_MIG_H_ */
diff --git a/i386/include/mach/mig_errors.h b/i386/include/mach/mig_errors.h
new file mode 100644
index 0000000..f1234bc
--- /dev/null
+++ b/i386/include/mach/mig_errors.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ * Mach Interface Generator errors
+ *
+ */
+
+#ifndef	_MACH_MIG_ERRORS_H_
+#define _MACH_MIG_ERRORS_H_
+
+#include <mach/mig.h>
+#include <mach/ndr.h>
+#include <mach/message.h>
+#include <mach/kern_return.h>
+
+#include <sys/cdefs.h>
+
+/*
+ *	These error codes should be specified as system 4, subsytem 2.
+ *	But alas backwards compatibility makes that impossible.
+ *	The problem is old clients of new servers (eg, the kernel)
+ *	which get strange large error codes when there is a Mig problem
+ *	in the server.  Unfortunately, the IPC system doesn't have
+ *	the knowledge to convert the codes in this situation.
+ */
+
+#define MIG_TYPE_ERROR		-300	/* client type check failure */
+#define MIG_REPLY_MISMATCH	-301	/* wrong reply message ID */
+#define MIG_REMOTE_ERROR	-302	/* server detected error */
+#define MIG_BAD_ID		-303	/* bad request message ID */
+#define MIG_BAD_ARGUMENTS	-304	/* server type check failure */
+#define MIG_NO_REPLY		-305	/* no reply should be send */
+#define MIG_EXCEPTION		-306	/* server raised exception */
+#define MIG_ARRAY_TOO_LARGE	-307	/* array not large enough */
+#define MIG_SERVER_DIED		-308	/* server died */
+#define MIG_TRAILER_ERROR       -309    /* trailer has an unknown format */
+
+/*
+ *	Whenever MIG detects an error, it sends back a generic
+ *	mig_reply_error_t format message.  Clients must accept
+ *	these in addition to the expected reply message format.
+ */
+#pragma pack(4)
+typedef struct {
+	mach_msg_header_t	Head;
+	NDR_record_t		NDR;
+	kern_return_t		RetCode;
+} mig_reply_error_t;
+#pragma pack()
+
+
+__BEGIN_DECLS
+
+#if !defined(__NDR_convert__mig_reply_error_t__defined)
+#define __NDR_convert__mig_reply_error_t__defined
+
+static __inline__ void
+__NDR_convert__mig_reply_error_t(__unused mig_reply_error_t *x)
+{
+#if defined(__NDR_convert__int_rep__kern_return_t__defined)
+	if (x->NDR.int_rep != NDR_record.int_rep)
+		__NDR_convert__int_rep__kern_return_t(&x->RetCode, x->NDR.int_rep);
+#endif /* __NDR_convert__int_rep__kern_return_t__defined */
+}
+#endif /* !defined(__NDR_convert__mig_reply_error_t__defined) */
+
+__END_DECLS
+
+#endif	/* _MACH_MIG_ERRORS_H_ */
diff --git a/i386/include/mach/ndr.h b/i386/include/mach/ndr.h
new file mode 100644
index 0000000..cb64d3f
--- /dev/null
+++ b/i386/include/mach/ndr.h
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+#ifndef _MACH_NDR_H_
+#define _MACH_NDR_H_
+
+#include <stdint.h>
+#include <sys/cdefs.h>
+
+typedef struct {
+    unsigned char       mig_vers;
+    unsigned char       if_vers;
+    unsigned char       reserved1;
+    unsigned char       mig_encoding;
+    unsigned char       int_rep;
+    unsigned char       char_rep;
+    unsigned char       float_rep;
+    unsigned char       reserved2;
+} NDR_record_t;
+
+/*
+ * MIG supported protocols for Network Data Representation
+ */
+#define  NDR_PROTOCOL_2_0      0
+
+/*
+ * NDR 2.0 format flag type definition and values.
+ */
+#define  NDR_INT_BIG_ENDIAN    0
+#define  NDR_INT_LITTLE_ENDIAN 1
+#define  NDR_FLOAT_IEEE        0
+#define  NDR_FLOAT_VAX         1
+#define  NDR_FLOAT_CRAY        2
+#define  NDR_FLOAT_IBM         3
+#define  NDR_CHAR_ASCII        0
+#define  NDR_CHAR_EBCDIC       1
+
+extern NDR_record_t NDR_record;
+
+#if defined(BSMALL)
+#define __NDR_convert__ 0
+#define __NDR_convert__int_rep__ 0
+#else
+#ifndef __NDR_convert__
+#define __NDR_convert__ 1
+#endif /* __NDR_convert__ */
+
+#ifndef __NDR_convert__int_rep__
+#define __NDR_convert__int_rep__ 1
+#endif /* __NDR_convert__int_rep__ */
+
+#endif /* defined(BSMALL) */
+
+#ifndef __NDR_convert__char_rep__
+#define __NDR_convert__char_rep__ 0
+#endif /* __NDR_convert__char_rep__ */
+
+#ifndef __NDR_convert__float_rep__
+#define __NDR_convert__float_rep__ 0
+#endif /* __NDR_convert__float_rep__ */
+
+#if __NDR_convert__
+
+#define __NDR_convert__NOOP		do ; while (0)
+#define __NDR_convert__UNKNOWN(s)	__NDR_convert__NOOP
+#define __NDR_convert__SINGLE(a, f, r)	do { r((a), (f)); } while (0)
+#define __NDR_convert__ARRAY(a, f, c, r) \
+	do { int __i__, __C__ = (c); \
+	for (__i__ = 0; __i__ < __C__; __i__++) \
+	r(&(a)[__i__], f); } while (0)
+#define __NDR_convert__2DARRAY(a, f, s, c, r) \
+	do { int __i__, __C__ = (c), __S__ = (s); \
+	for (__i__ = 0; __i__ < __C__; __i__++) \
+	r(&(a)[__i__ * __S__], f, __S__); } while (0)
+
+#if __NDR_convert__int_rep__
+
+#include <libkern/OSByteOrder.h>
+
+#define __NDR_READSWAP_assign(a, rs)	do { *(a) = rs(a); } while (0)
+
+#define __NDR_READSWAP__uint16_t(a) 	OSReadSwapInt16((void *)a, 0)
+#define __NDR_READSWAP__int16_t(a)	(int16_t)OSReadSwapInt16((void *)a, 0)
+#define __NDR_READSWAP__uint32_t(a) 	OSReadSwapInt32((void *)a, 0)
+#define __NDR_READSWAP__int32_t(a)	(int32_t)OSReadSwapInt32((void *)a, 0)
+#define __NDR_READSWAP__uint64_t(a)	OSReadSwapInt64((void *)a, 0)
+#define __NDR_READSWAP__int64_t(a)	(int64_t)OSReadSwapInt64((void *)a, 0)
+
+__BEGIN_DECLS
+
+static __inline__ float __NDR_READSWAP__float(float *argp) {
+	union {
+		float sv;
+		uint32_t ull;
+	} result;
+	result.ull = __NDR_READSWAP__uint32_t((uint32_t *)argp);
+	return result.sv;
+}
+
+static __inline__ double __NDR_READSWAP__double(double *argp) {
+	union {
+		double sv;
+		uint64_t ull;
+	} result;
+	result.ull = __NDR_READSWAP__uint64_t((uint64_t *)argp);
+	return result.sv;
+}
+
+__END_DECLS
+
+#define __NDR_convert__int_rep__int16_t__defined
+#define __NDR_convert__int_rep__int16_t(v,f)		\
+	__NDR_READSWAP_assign(v, __NDR_READSWAP__int16_t)
+
+#define __NDR_convert__int_rep__uint16_t__defined
+#define __NDR_convert__int_rep__uint16_t(v,f)		\
+	__NDR_READSWAP_assign(v, __NDR_READSWAP__uint16_t)
+
+#define __NDR_convert__int_rep__int32_t__defined
+#define __NDR_convert__int_rep__int32_t(v,f)		\
+	__NDR_READSWAP_assign(v, __NDR_READSWAP__int32_t)
+
+#define __NDR_convert__int_rep__uint32_t__defined
+#define __NDR_convert__int_rep__uint32_t(v,f)		\
+	__NDR_READSWAP_assign(v, __NDR_READSWAP__uint32_t)
+
+#define __NDR_convert__int_rep__int64_t__defined
+#define __NDR_convert__int_rep__int64_t(v,f)		\
+	__NDR_READSWAP_assign(v, __NDR_READSWAP__int64_t)
+
+#define __NDR_convert__int_rep__uint64_t__defined
+#define __NDR_convert__int_rep__uint64_t(v,f)		\
+	__NDR_READSWAP_assign(v, __NDR_READSWAP__uint64_t)
+
+#define __NDR_convert__int_rep__float__defined
+#define __NDR_convert__int_rep__float(v,f)		\
+	__NDR_READSWAP_assign(v, __NDR_READSWAP__float)
+
+#define __NDR_convert__int_rep__double__defined
+#define __NDR_convert__int_rep__double(v,f)		\
+	__NDR_READSWAP_assign(v, __NDR_READSWAP__double)
+
+#define __NDR_convert__int_rep__boolean_t__defined
+#define __NDR_convert__int_rep__boolean_t(v, f)		\
+	__NDR_convert__int_rep__int32_t(v,f)
+
+#define __NDR_convert__int_rep__kern_return_t__defined
+#define __NDR_convert__int_rep__kern_return_t(v,f)	\
+	__NDR_convert__int_rep__int32_t(v,f)
+
+#define __NDR_convert__int_rep__mach_port_name_t__defined
+#define __NDR_convert__int_rep__mach_port_name_t(v,f)	\
+	__NDR_convert__int_rep__uint32_t(v,f)
+
+#define __NDR_convert__int_rep__mach_msg_type_number_t__defined
+#define __NDR_convert__int_rep__mach_msg_type_number_t(v,f) \
+	__NDR_convert__int_rep__uint32_t(v,f)
+
+#endif /* __NDR_convert__int_rep__ */
+
+#if __NDR_convert__char_rep__
+
+#warning  NDR character representation conversions not implemented yet!
+#define __NDR_convert__char_rep__char(v,f)	__NDR_convert__NOOP
+#define __NDR_convert__char_rep__string(v,f,l)	__NDR_convert__NOOP
+
+#endif /* __NDR_convert__char_rep__ */
+
+#if __NDR_convert__float_rep__
+
+#warning  NDR floating point representation conversions not implemented yet!
+#define __NDR_convert__float_rep__float(v,f)	__NDR_convert__NOOP
+#define __NDR_convert__float_rep__double(v,f)	__NDR_convert__NOOP
+
+#endif /* __NDR_convert__float_rep__ */
+
+#endif /* __NDR_convert__ */
+
+#endif /* _MACH_NDR_H_ */
diff --git a/i386/include/mach/notify.defs b/i386/include/mach/notify.defs
new file mode 100644
index 0000000..6f7f81d
--- /dev/null
+++ b/i386/include/mach/notify.defs
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+subsystem 
+#if	KERNEL_USER
+	KernelUser
+#endif
+	notify 64;
+
+#include <mach/std_types.defs>
+
+#if	SEQNOS
+serverprefix do_seqnos_;
+serverdemux seqnos_notify_server;
+#else	/* !SEQNOS */
+serverprefix do_;
+serverdemux notify_server;
+#endif	/* SEQNOS */
+
+/* MACH_NOTIFY_FIRST: 0100 */
+skip;
+
+/* MACH_NOTIFY_PORT_DELETED: 0101 */
+simpleroutine mach_notify_port_deleted(
+		notify	: mach_port_move_send_once_t;
+#if	SEQNOS
+	msgseqno seqno	: mach_port_seqno_t;
+#endif	/* SEQNOS */
+		name	: mach_port_name_t);
+
+skip;	/* was MACH_NOTIFY_MSG_ACCEPTED: 0102 */
+
+skip;	/* was NOTIFY_OWNERSHIP_RIGHTS: 0103 */
+
+skip;	/* was NOTIFY_RECEIVE_RIGHTS: 0104 */
+
+/* MACH_NOTIFY_PORT_DESTROYED: 0105 */
+simpleroutine mach_notify_port_destroyed(
+		notify	: mach_port_move_send_once_t;
+#if	SEQNOS
+	msgseqno seqno	: mach_port_seqno_t;
+#endif	/* SEQNOS */
+		rights	: mach_port_move_receive_t);
+
+/* MACH_NOTIFY_NO_SENDERS: 0106 */
+simpleroutine mach_notify_no_senders(
+		notify	: mach_port_move_send_once_t;
+#if	SEQNOS
+	msgseqno seqno	: mach_port_seqno_t;
+#endif	/* SEQNOS */
+		mscount	: mach_port_mscount_t);
+
+/* MACH_NOTIFY_SEND_ONCE: 0107 */
+simpleroutine mach_notify_send_once(
+		notify	: mach_port_move_send_once_t
+#if	SEQNOS
+;	msgseqno seqno	: mach_port_seqno_t
+#endif	/* SEQNOS */
+		);
+
+/* MACH_NOTIFY_DEAD_NAME: 0110 */
+simpleroutine mach_notify_dead_name(
+		notify	: mach_port_move_send_once_t;
+#if	SEQNOS
+	msgseqno seqno	: mach_port_seqno_t;
+#endif	/* SEQNOS */
+		name	: mach_port_name_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/notify.h b/i386/include/mach/notify.h
new file mode 100644
index 0000000..768a865
--- /dev/null
+++ b/i386/include/mach/notify.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/notify.h
+ *
+ *	Kernel notification message definitions.
+ */
+
+#ifndef	_MACH_NOTIFY_H_
+#define _MACH_NOTIFY_H_
+
+#include <mach/port.h>
+#include <mach/message.h>
+#include <mach/ndr.h>
+
+/*
+ *  An alternative specification of the notification interface
+ *  may be found in mach/notify.defs.
+ */
+
+#define MACH_NOTIFY_FIRST		0100
+#define MACH_NOTIFY_PORT_DELETED	(MACH_NOTIFY_FIRST + 001 )
+			/* A send or send-once right was deleted. */
+#define MACH_NOTIFY_PORT_DESTROYED	(MACH_NOTIFY_FIRST + 005)
+			/* A receive right was (would have been) deallocated */
+#define MACH_NOTIFY_NO_SENDERS		(MACH_NOTIFY_FIRST + 006)
+			/* Receive right has no extant send rights */
+#define MACH_NOTIFY_SEND_ONCE		(MACH_NOTIFY_FIRST + 007)
+			/* An extant send-once right died */
+#define MACH_NOTIFY_DEAD_NAME		(MACH_NOTIFY_FIRST + 010)
+			/* Send or send-once right died, leaving a dead-name */
+#define MACH_NOTIFY_LAST		(MACH_NOTIFY_FIRST + 015)
+
+typedef mach_port_t notify_port_t;
+
+/*
+ * Hard-coded message structures for receiving Mach port notification
+ * messages.  However, they are not actual large enough to receive 
+ * the largest trailers current exported by Mach IPC (so they cannot
+ * be used for space allocations in situations using these new larger
+ * trailers).  Instead, the MIG-generated server routines (and
+ * related prototypes should be used).
+ */
+typedef struct {
+    mach_msg_header_t	not_header;
+    NDR_record_t	NDR;
+    mach_port_name_t not_port;/* MACH_MSG_TYPE_PORT_NAME */
+    mach_msg_format_0_trailer_t trailer;
+} mach_port_deleted_notification_t;
+
+typedef struct {
+    mach_msg_header_t	not_header;
+    mach_msg_body_t	not_body;
+    mach_msg_port_descriptor_t not_port;/* MACH_MSG_TYPE_PORT_RECEIVE */
+    mach_msg_format_0_trailer_t trailer;
+} mach_port_destroyed_notification_t;
+
+typedef struct {
+    mach_msg_header_t	not_header;
+    NDR_record_t	NDR;
+    mach_msg_type_number_t not_count;
+    mach_msg_format_0_trailer_t trailer;
+} mach_no_senders_notification_t;
+
+typedef struct {
+    mach_msg_header_t	not_header;
+    mach_msg_format_0_trailer_t trailer;
+} mach_send_once_notification_t;
+
+typedef struct {
+    mach_msg_header_t	not_header;
+    NDR_record_t	NDR;
+    mach_port_name_t not_port;/* MACH_MSG_TYPE_PORT_NAME */
+    mach_msg_format_0_trailer_t trailer;
+} mach_dead_name_notification_t;
+
+#endif	/* _MACH_NOTIFY_H_ */
diff --git a/i386/include/mach/policy.h b/i386/include/mach/policy.h
new file mode 100644
index 0000000..b6ec795
--- /dev/null
+++ b/i386/include/mach/policy.h
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+#ifndef	_MACH_POLICY_H_
+#define _MACH_POLICY_H_
+
+/*
+ *	mach/policy.h
+ *
+ *	Definitions for scheduing policy.
+ */
+
+/*
+ *  All interfaces defined here are obsolete.
+ */
+
+#include <mach/boolean.h>
+#include <mach/message.h>
+#include <mach/vm_types.h>
+
+/*
+ *	Old scheduling control interface
+ */
+typedef int 				policy_t;
+typedef integer_t			*policy_info_t;
+typedef integer_t			*policy_base_t;
+typedef integer_t			*policy_limit_t;
+
+/*
+ *	Policy definitions.  Policies should be powers of 2,
+ *	but cannot be or'd together other than to test for a
+ *	policy 'class'.
+ */
+#define	POLICY_NULL		0	/* none			*/
+#define	POLICY_TIMESHARE	1	/* timesharing		*/
+#define	POLICY_RR		2	/* fixed round robin	*/
+#define POLICY_FIFO		4	/* fixed fifo		*/
+
+#define __NEW_SCHEDULING_FRAMEWORK__
+
+/*
+ *	Check if policy is of 'class' fixed-priority.
+ */
+#define	POLICYCLASS_FIXEDPRI	(POLICY_RR | POLICY_FIFO)
+
+/*
+ *	Check if policy is valid.
+ */
+#define invalid_policy(policy)			\
+	((policy) != POLICY_TIMESHARE &&	\
+	 (policy) != POLICY_RR &&		\
+	 (policy) != POLICY_FIFO)
+
+
+/*
+ * 	Types for TIMESHARE policy
+ */
+struct policy_timeshare_base {			
+	integer_t		base_priority;
+};
+struct policy_timeshare_limit {
+	integer_t		max_priority;
+};
+struct policy_timeshare_info {
+	integer_t		max_priority;
+	integer_t		base_priority;
+	integer_t		cur_priority;
+	boolean_t		depressed;
+	integer_t		depress_priority;
+};
+
+typedef struct policy_timeshare_base	*policy_timeshare_base_t; 
+typedef struct policy_timeshare_limit	*policy_timeshare_limit_t;
+typedef struct policy_timeshare_info	*policy_timeshare_info_t;
+
+typedef struct policy_timeshare_base	policy_timeshare_base_data_t; 
+typedef struct policy_timeshare_limit	policy_timeshare_limit_data_t;
+typedef struct policy_timeshare_info	policy_timeshare_info_data_t;
+
+
+#define POLICY_TIMESHARE_BASE_COUNT	((mach_msg_type_number_t) \
+	(sizeof(struct policy_timeshare_base)/sizeof(integer_t)))
+#define POLICY_TIMESHARE_LIMIT_COUNT	((mach_msg_type_number_t) \
+	(sizeof(struct policy_timeshare_limit)/sizeof(integer_t)))
+#define POLICY_TIMESHARE_INFO_COUNT	((mach_msg_type_number_t) \
+	(sizeof(struct policy_timeshare_info)/sizeof(integer_t)))
+
+
+/*
+ *	Types for the ROUND ROBIN (RR) policy
+ */
+struct policy_rr_base {				
+	integer_t		base_priority;
+	integer_t		quantum;
+};
+struct policy_rr_limit {
+	integer_t		max_priority;
+};
+struct policy_rr_info {
+	integer_t		max_priority;
+	integer_t		base_priority;
+	integer_t		quantum;
+	boolean_t		depressed;
+	integer_t		depress_priority;
+};
+
+typedef struct policy_rr_base		*policy_rr_base_t;
+typedef struct policy_rr_limit		*policy_rr_limit_t;
+typedef struct policy_rr_info		*policy_rr_info_t;
+
+typedef struct policy_rr_base		policy_rr_base_data_t;
+typedef struct policy_rr_limit		policy_rr_limit_data_t;
+typedef struct policy_rr_info		policy_rr_info_data_t;
+
+#define POLICY_RR_BASE_COUNT	((mach_msg_type_number_t)	\
+	(sizeof(struct policy_rr_base)/sizeof(integer_t)))
+#define POLICY_RR_LIMIT_COUNT	((mach_msg_type_number_t)	\
+	(sizeof(struct policy_rr_limit)/sizeof(integer_t)))
+#define POLICY_RR_INFO_COUNT	((mach_msg_type_number_t)	\
+	(sizeof(struct policy_rr_info)/sizeof(integer_t)))
+
+
+/*
+ * 	Types for the FIRST-IN-FIRST-OUT (FIFO) policy
+ */
+struct policy_fifo_base {		
+	integer_t		base_priority;
+};
+struct policy_fifo_limit {
+	integer_t		max_priority;
+};
+struct policy_fifo_info {
+	integer_t		max_priority;
+	integer_t		base_priority;
+	boolean_t		depressed;
+	integer_t		depress_priority;
+};
+
+typedef struct policy_fifo_base		*policy_fifo_base_t;
+typedef struct policy_fifo_limit	*policy_fifo_limit_t;
+typedef struct policy_fifo_info		*policy_fifo_info_t;
+
+typedef struct policy_fifo_base		policy_fifo_base_data_t;
+typedef struct policy_fifo_limit	policy_fifo_limit_data_t;
+typedef struct policy_fifo_info		policy_fifo_info_data_t;
+
+#define POLICY_FIFO_BASE_COUNT	((mach_msg_type_number_t)	\
+	(sizeof(struct policy_fifo_base)/sizeof(integer_t)))
+#define POLICY_FIFO_LIMIT_COUNT	((mach_msg_type_number_t)	\
+	(sizeof(struct policy_fifo_limit)/sizeof(integer_t)))
+#define POLICY_FIFO_INFO_COUNT	((mach_msg_type_number_t)	\
+	(sizeof(struct policy_fifo_info)/sizeof(integer_t)))
+
+/*
+ * 	Aggregate policy types
+ */
+
+struct policy_bases {
+	policy_timeshare_base_data_t	ts;
+	policy_rr_base_data_t		rr;
+	policy_fifo_base_data_t		fifo;
+};
+
+struct policy_limits {
+	policy_timeshare_limit_data_t	ts;
+	policy_rr_limit_data_t		rr;
+	policy_fifo_limit_data_t	fifo;
+};
+
+struct policy_infos {
+	policy_timeshare_info_data_t	ts;
+	policy_rr_info_data_t		rr;
+	policy_fifo_info_data_t		fifo;
+};
+
+typedef struct policy_bases		policy_base_data_t;
+typedef struct policy_limits		policy_limit_data_t;
+typedef struct policy_infos		policy_info_data_t;
+
+#endif	/* _MACH_POLICY_H_ */
diff --git a/i386/include/mach/port.h b/i386/include/mach/port.h
new file mode 100644
index 0000000..6550139
--- /dev/null
+++ b/i386/include/mach/port.h
@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ * NOTICE: This file was modified by McAfee Research in 2004 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
+/*
+ */
+/*
+ *	File:	mach/port.h
+ *
+ *	Definition of a Mach port
+ *
+ *	Mach ports are the endpoints to Mach-implemented communications
+ *	channels (usually uni-directional message queues, but other types
+ *	also exist).
+ *
+ *	Unique collections of these endpoints are maintained for each
+ *	Mach task.  Each Mach port in the task's collection is given a 
+ *	[task-local] name to identify it - and the the various "rights"
+ *	held by the task for that specific endpoint.
+ *
+ *	This header defines the types used to identify these Mach ports
+ *	and the various rights associated with them.  For more info see:
+ *
+ *	<mach/mach_port.h> - manipulation of port rights in a given space
+ *	<mach/message.h> - message queue [and port right passing] mechanism
+ *
+ */
+
+#ifndef	_MACH_PORT_H_
+#define _MACH_PORT_H_
+
+#include <sys/cdefs.h>
+#include <stdint.h>
+#include <mach/boolean.h>
+#include <mach/machine/vm_types.h>
+
+/*
+ *	mach_port_name_t - the local identity for a Mach port
+ *
+ *	The name is Mach port namespace specific.  It is used to
+ *	identify the rights held for that port by the task whose
+ *	namespace is implied [or specifically provided].
+ *
+ *	Use of this type usually implies just a name - no rights.
+ *	See mach_port_t for a type that implies a "named right."
+ *
+ */
+ 
+typedef natural_t mach_port_name_t;
+typedef mach_port_name_t *mach_port_name_array_t;
+
+
+/* 
+ *	mach_port_t - a named port right
+ *
+ *	In user-space, "rights" are represented by the name of the
+ *	right in the Mach port namespace.  Even so, this type is
+ *	presented as a unique one to more clearly denote the presence
+ *	of a right coming along with the name. 
+ *
+ *	Often, various rights for a port held in a single name space
+ *	will coalesce and are, therefore, be identified by a single name
+ *	[this is the case for send and receive rights].  But not
+ *	always [send-once rights currently get a unique name for
+ *	each right].      
+ *
+ */
+
+#ifndef _MACH_PORT_T
+#define _MACH_PORT_T
+typedef mach_port_name_t 		mach_port_t;
+#endif
+
+
+typedef mach_port_t			*mach_port_array_t;
+
+/*
+ *  MACH_PORT_NULL is a legal value that can be carried in messages.
+ *  It indicates the absence of any port or port rights.  (A port
+ *  argument keeps the message from being "simple", even if the
+ *  value is MACH_PORT_NULL.)  The value MACH_PORT_DEAD is also a legal
+ *  value that can be carried in messages.  It indicates
+ *  that a port right was present, but it died.
+ */
+
+#define MACH_PORT_NULL		0  /* intentional loose typing */
+#define MACH_PORT_DEAD		((mach_port_name_t) ~0)
+#define MACH_PORT_VALID(name)				\
+		(((name) != MACH_PORT_NULL) && 		\
+		 ((name) != MACH_PORT_DEAD))
+
+
+/*
+ *	For kernel-selected [assigned] port names, the name is
+ *	comprised of two parts: a generation number and an index.
+ *	This approach keeps the exact same name from being generated
+ *	and reused too quickly [to catch right/reference counting bugs].
+ *	The dividing line between the constituent parts is exposed so
+ *	that efficient "mach_port_name_t to data structure pointer"
+ *	conversion implementation can be made.  But it is possible
+ *	for user-level code to assign their own names to Mach ports.
+ *	These are not required to participate in this algorithm.  So
+ *	care should be taken before "assuming" this model.
+ *
+ */
+
+#ifndef	NO_PORT_GEN
+
+#define	MACH_PORT_INDEX(name)		((name) >> 8)
+#define	MACH_PORT_GEN(name)		(((name) & 0xff) << 24)
+#define	MACH_PORT_MAKE(index, gen)	\
+		(((index) << 8) | (gen) >> 24)
+
+#else	/* NO_PORT_GEN */
+
+#define	MACH_PORT_INDEX(name)		(name)
+#define	MACH_PORT_GEN(name)		(0)
+#define	MACH_PORT_MAKE(index, gen)	(index)
+
+#endif	/* NO_PORT_GEN */
+
+
+/*
+ *  These are the different rights a task may have for a port.
+ *  The MACH_PORT_RIGHT_* definitions are used as arguments
+ *  to mach_port_allocate, mach_port_get_refs, etc, to specify
+ *  a particular right to act upon.  The mach_port_names and
+ *  mach_port_type calls return bitmasks using the MACH_PORT_TYPE_*
+ *  definitions.  This is because a single name may denote
+ *  multiple rights.
+ */
+
+typedef natural_t mach_port_right_t;
+
+#define MACH_PORT_RIGHT_SEND		((mach_port_right_t) 0)
+#define MACH_PORT_RIGHT_RECEIVE		((mach_port_right_t) 1)
+#define MACH_PORT_RIGHT_SEND_ONCE	((mach_port_right_t) 2)
+#define MACH_PORT_RIGHT_PORT_SET	((mach_port_right_t) 3)
+#define MACH_PORT_RIGHT_DEAD_NAME	((mach_port_right_t) 4)
+#define MACH_PORT_RIGHT_LABELH	        ((mach_port_right_t) 5)
+#define MACH_PORT_RIGHT_NUMBER		((mach_port_right_t) 6)
+
+typedef natural_t mach_port_type_t;
+typedef mach_port_type_t *mach_port_type_array_t;
+
+#define MACH_PORT_TYPE(right)						\
+		((mach_port_type_t)(((mach_port_type_t) 1)  		\
+		<< ((right) + ((mach_port_right_t) 16))))	
+#define MACH_PORT_TYPE_NONE	    ((mach_port_type_t) 0L)
+#define MACH_PORT_TYPE_SEND	    MACH_PORT_TYPE(MACH_PORT_RIGHT_SEND)
+#define MACH_PORT_TYPE_RECEIVE	    MACH_PORT_TYPE(MACH_PORT_RIGHT_RECEIVE)
+#define MACH_PORT_TYPE_SEND_ONCE    MACH_PORT_TYPE(MACH_PORT_RIGHT_SEND_ONCE)
+#define MACH_PORT_TYPE_PORT_SET	    MACH_PORT_TYPE(MACH_PORT_RIGHT_PORT_SET)
+#define MACH_PORT_TYPE_DEAD_NAME    MACH_PORT_TYPE(MACH_PORT_RIGHT_DEAD_NAME)
+#define MACH_PORT_TYPE_LABELH       MACH_PORT_TYPE(MACH_PORT_RIGHT_LABELH)
+
+/* Convenient combinations. */
+
+#define MACH_PORT_TYPE_SEND_RECEIVE					\
+		(MACH_PORT_TYPE_SEND|MACH_PORT_TYPE_RECEIVE)
+#define	MACH_PORT_TYPE_SEND_RIGHTS					\
+		(MACH_PORT_TYPE_SEND|MACH_PORT_TYPE_SEND_ONCE)
+#define	MACH_PORT_TYPE_PORT_RIGHTS					\
+		(MACH_PORT_TYPE_SEND_RIGHTS|MACH_PORT_TYPE_RECEIVE)
+#define	MACH_PORT_TYPE_PORT_OR_DEAD					\
+		(MACH_PORT_TYPE_PORT_RIGHTS|MACH_PORT_TYPE_DEAD_NAME)
+#define MACH_PORT_TYPE_ALL_RIGHTS					\
+		(MACH_PORT_TYPE_PORT_OR_DEAD|MACH_PORT_TYPE_PORT_SET)
+
+/* Dummy type bits that mach_port_type/mach_port_names can return. */
+
+#define MACH_PORT_TYPE_DNREQUEST	0x80000000
+
+/* User-references for capabilities. */
+
+typedef natural_t mach_port_urefs_t;
+typedef integer_t mach_port_delta_t;			/* change in urefs */
+
+/* Attributes of ports.  (See mach_port_get_receive_status.) */
+
+typedef natural_t mach_port_seqno_t;		/* sequence number */
+typedef natural_t mach_port_mscount_t;		/* make-send count */
+typedef natural_t mach_port_msgcount_t;		/* number of msgs */
+typedef natural_t mach_port_rights_t;		/* number of rights */
+
+/*
+ *	Are there outstanding send rights for a given port?
+ */
+#define	MACH_PORT_SRIGHTS_NONE		0		/* no srights */
+#define	MACH_PORT_SRIGHTS_PRESENT	1		/* srights */
+typedef unsigned int mach_port_srights_t;	/* status of send rights */
+
+typedef struct mach_port_status {
+	mach_port_rights_t	mps_pset;	/* count of containing port sets */
+	mach_port_seqno_t	mps_seqno;	/* sequence number */
+	mach_port_mscount_t	mps_mscount;	/* make-send count */
+	mach_port_msgcount_t	mps_qlimit;	/* queue limit */
+	mach_port_msgcount_t	mps_msgcount;	/* number in the queue */
+	mach_port_rights_t	mps_sorights;	/* how many send-once rights */
+	boolean_t		mps_srights;	/* do send rights exist? */
+	boolean_t		mps_pdrequest;	/* port-deleted requested? */
+	boolean_t		mps_nsrequest;	/* no-senders requested? */
+	natural_t		mps_flags;		/* port flags */
+} mach_port_status_t;
+
+/* System-wide values for setting queue limits on a port */
+#define MACH_PORT_QLIMIT_ZERO		((mach_port_msgcount_t) 0)
+#define MACH_PORT_QLIMIT_BASIC		((mach_port_msgcount_t) 5)
+#define MACH_PORT_QLIMIT_SMALL		((mach_port_msgcount_t) 16)
+#define MACH_PORT_QLIMIT_LARGE		((mach_port_msgcount_t) 1024)
+#define MACH_PORT_QLIMIT_KERNEL		((mach_port_msgcount_t) 65536)
+#define MACH_PORT_QLIMIT_MIN		MACH_PORT_QLIMIT_ZERO
+#define MACH_PORT_QLIMIT_DEFAULT	MACH_PORT_QLIMIT_BASIC
+#define MACH_PORT_QLIMIT_MAX		MACH_PORT_QLIMIT_LARGE
+
+typedef struct mach_port_limits {
+	mach_port_msgcount_t	mpl_qlimit;	/* number of msgs */
+} mach_port_limits_t;
+
+typedef integer_t *mach_port_info_t;		/* varying array of natural_t */
+
+/* Flavors for mach_port_get/set_attributes() */
+typedef int	mach_port_flavor_t;
+#define MACH_PORT_LIMITS_INFO		1	/* uses mach_port_status_t */
+#define MACH_PORT_RECEIVE_STATUS	2	/* uses mach_port_limits_t */
+#define MACH_PORT_DNREQUESTS_SIZE	3	/* info is int */
+
+#define MACH_PORT_LIMITS_INFO_COUNT	((natural_t) \
+	(sizeof(mach_port_limits_t)/sizeof(natural_t)))
+#define MACH_PORT_RECEIVE_STATUS_COUNT	((natural_t) \
+	(sizeof(mach_port_status_t)/sizeof(natural_t)))
+#define MACH_PORT_DNREQUESTS_SIZE_COUNT 1
+
+/*
+ * Structure used to pass information about port allocation requests.
+ * Must be padded to 64-bits total length.
+ */
+typedef struct mach_port_qos {
+	unsigned int		name:1;		/* name given */
+	unsigned int 		prealloc:1;	/* prealloced message */
+	boolean_t		pad1:30;
+	natural_t		len;
+} mach_port_qos_t;
+
+#if	!__DARWIN_UNIX03 && !defined(_NO_PORT_T_FROM_MACH)
+/*
+ *  Mach 3.0 renamed everything to have mach_ in front of it.
+ *  These types and macros are provided for backward compatibility
+ *	but are deprecated.
+ */
+typedef mach_port_t		port_t;
+typedef mach_port_name_t	port_name_t;
+typedef mach_port_name_t	*port_name_array_t;
+
+#define PORT_NULL		((port_t) 0)
+#define PORT_DEAD		((port_t) ~0)
+#define PORT_VALID(name) \
+		((port_t)(name) != PORT_NULL && (port_t)(name) != PORT_DEAD)
+
+#endif	/* !__DARWIN_UNIX03 && !_NO_PORT_T_FROM_MACH */
+
+#endif	/* _MACH_PORT_H_ */
diff --git a/i386/include/mach/port_obj.h b/i386/include/mach/port_obj.h
new file mode 100644
index 0000000..d2b5f89
--- /dev/null
+++ b/i386/include/mach/port_obj.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+/*
+ * Define a service to map from a kernel-generated port name
+ * to server-defined "type" and "value" data to be associated
+ * with the port.
+ */
+
+#ifndef PORT_OBJ_H
+#define PORT_OBJ_H
+
+#include <mach/port.h>
+
+struct port_obj_tentry {
+	void *pos_value;
+	int pos_type;
+};
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+extern void port_obj_init(int);
+__END_DECLS
+
+extern struct port_obj_tentry *port_obj_table;
+extern int port_obj_table_size;
+
+#ifndef PORT_OBJ_ASSERT
+
+#define port_set_obj_value_type(pname, value, type)	\
+do {							\
+	int ndx;					\
+							\
+	if (!port_obj_table)				\
+		port_obj_init(port_obj_table_size);	\
+	ndx = MACH_PORT_INDEX(pname);			\
+	port_obj_table[ndx].pos_value = (value);	\
+	port_obj_table[ndx].pos_type = (type);		\
+} while (0)
+
+#define port_get_obj_value(pname)			\
+	(port_obj_table[MACH_PORT_INDEX(pname)].pos_value)
+
+#define port_get_obj_type(pname)			\
+	(port_obj_table[MACH_PORT_INDEX(pname)].pos_type)
+
+#else	/* PORT_OBJ_ASSERT */
+
+#define port_set_obj_value_type(pname, value, type)	\
+do {							\
+	int ndx;					\
+							\
+	if (!port_obj_table)				\
+		port_obj_init(port_obj_table_size);	\
+	ndx = MACH_PORT_INDEX(pname);			\
+	assert(ndx > 0);				\
+	assert(ndx < port_obj_table_size);		\
+	port_obj_table[ndx].pos_value = (value);	\
+	port_obj_table[ndx].pos_type = (type);		\
+} while (0)
+
+#define port_get_obj_value(pname)				\
+	((MACH_PORT_INDEX(pname) < (unsigned)port_obj_table_size) ?	\
+	port_obj_table[MACH_PORT_INDEX(pname)].pos_value :	\
+	(panic("port_get_obj_value: index too big"), (void *)-1))
+
+#define port_get_obj_type(pname)				\
+	((MACH_PORT_INDEX(pname) < (unsigned)port_obj_table_size) ?	\
+	port_obj_table[MACH_PORT_INDEX(pname)].pos_type :	\
+	(panic("port_get_obj_type: index too big"), -1))
+
+#endif	/* PORT_OBJ_ASSERT */
+
+#endif	/* PORT_OBJ_H */
diff --git a/i386/include/mach/processor.defs b/i386/include/mach/processor.defs
new file mode 100644
index 0000000..f590633
--- /dev/null
+++ b/i386/include/mach/processor.defs
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_FREE_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/mach_port.defs
+ *	Author:	Rich Draves
+ *
+ *	Exported kernel calls.
+ */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+	  processor 3000;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+/*
+ * References to processor objects are returned by:
+ *	host_processors(host_priv_t,...);
+ *
+/*
+ *	Start processor.
+ */
+routine	processor_start(
+		processor	: processor_t);
+
+/*
+ *	Exit processor -- may not be restartable.
+ */
+
+routine	processor_exit(
+		processor	: processor_t);
+
+/*
+ *	Return information about this processor.
+ */
+routine processor_info(
+		processor	: processor_t;
+		flavor		: processor_flavor_t;
+	out	host		: host_t;
+	out	processor_info_out: processor_info_t, CountInOut);
+
+
+/*
+ *	Do something machine-dependent to processor.
+ */
+routine processor_control(
+		processor	: processor_t;
+		processor_cmd	: processor_info_t);
+
+/*
+ * JMM - Keep processor_set related stuff at the end because
+ * they likely will be removed.
+ */
+
+/*
+ *	Assign processor to processor set.
+ */
+routine processor_assign(
+		processor	: processor_t;
+		new_set		: processor_set_t;
+		wait		: boolean_t);
+
+/*
+ *	Get current assignment for processor.
+ */
+routine processor_get_assignment(
+		processor	: processor_t;
+	out	assigned_set	: processor_set_name_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/processor.h b/i386/include/mach/processor.h
new file mode 100644
index 0000000..e3afbde
--- /dev/null
+++ b/i386/include/mach/processor.h
@@ -0,0 +1,336 @@
+#ifndef	_processor_user_
+#define	_processor_user_
+
+/* Module processor */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	processor_MSG_COUNT
+#define	processor_MSG_COUNT	6
+#endif	/* processor_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine processor_start */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_start
+(
+	processor_t processor
+);
+
+/* Routine processor_exit */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_exit
+(
+	processor_t processor
+);
+
+/* Routine processor_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_info
+(
+	processor_t processor,
+	processor_flavor_t flavor,
+	host_t *host,
+	processor_info_t processor_info_out,
+	mach_msg_type_number_t *processor_info_outCnt
+);
+
+/* Routine processor_control */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_control
+(
+	processor_t processor,
+	processor_info_t processor_cmd,
+	mach_msg_type_number_t processor_cmdCnt
+);
+
+/* Routine processor_assign */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_assign
+(
+	processor_t processor,
+	processor_set_t new_set,
+	boolean_t wait
+);
+
+/* Routine processor_get_assignment */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_get_assignment
+(
+	processor_t processor,
+	processor_set_name_t *assigned_set
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__processor_subsystem__defined
+#define __Request__processor_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__processor_start_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__processor_exit_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		processor_flavor_t flavor;
+		mach_msg_type_number_t processor_info_outCnt;
+	} __Request__processor_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		mach_msg_type_number_t processor_cmdCnt;
+		integer_t processor_cmd[12];
+	} __Request__processor_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_set;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		boolean_t wait;
+	} __Request__processor_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__processor_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__processor_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__processor_subsystem__defined
+#define __RequestUnion__processor_subsystem__defined
+union __RequestUnion__processor_subsystem {
+	__Request__processor_start_t Request_processor_start;
+	__Request__processor_exit_t Request_processor_exit;
+	__Request__processor_info_t Request_processor_info;
+	__Request__processor_control_t Request_processor_control;
+	__Request__processor_assign_t Request_processor_assign;
+	__Request__processor_get_assignment_t Request_processor_get_assignment;
+};
+#endif /* !__RequestUnion__processor_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__processor_subsystem__defined
+#define __Reply__processor_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__processor_start_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__processor_exit_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t host;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t processor_info_outCnt;
+		integer_t processor_info_out[12];
+	} __Reply__processor_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__processor_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__processor_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t assigned_set;
+		/* end of the kernel processed data */
+	} __Reply__processor_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__processor_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__processor_subsystem__defined
+#define __ReplyUnion__processor_subsystem__defined
+union __ReplyUnion__processor_subsystem {
+	__Reply__processor_start_t Reply_processor_start;
+	__Reply__processor_exit_t Reply_processor_exit;
+	__Reply__processor_info_t Reply_processor_info;
+	__Reply__processor_control_t Reply_processor_control;
+	__Reply__processor_assign_t Reply_processor_assign;
+	__Reply__processor_get_assignment_t Reply_processor_get_assignment;
+};
+#endif /* !__RequestUnion__processor_subsystem__defined */
+
+#ifndef subsystem_to_name_map_processor
+#define subsystem_to_name_map_processor \
+    { "processor_start", 3000 },\
+    { "processor_exit", 3001 },\
+    { "processor_info", 3002 },\
+    { "processor_control", 3003 },\
+    { "processor_assign", 3004 },\
+    { "processor_get_assignment", 3005 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _processor_user_ */
diff --git a/i386/include/mach/processor_info.h b/i386/include/mach/processor_info.h
new file mode 100644
index 0000000..1607c71
--- /dev/null
+++ b/i386/include/mach/processor_info.h
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+/*
+ *	File:	mach/processor_info.h
+ *	Author:	David L. Black
+ *	Date:	1988
+ *
+ *	Data structure definitions for processor_info, processor_set_info
+ */
+
+#ifndef	_MACH_PROCESSOR_INFO_H_
+#define _MACH_PROCESSOR_INFO_H_
+
+#include <mach/message.h>
+#include <mach/machine.h>
+#include <mach/machine/processor_info.h>
+
+/*
+ *	Generic information structure to allow for expansion.
+ */
+typedef integer_t	*processor_info_t;	/* varying array of int. */
+typedef integer_t	*processor_info_array_t;  /* varying array of int */
+
+#define PROCESSOR_INFO_MAX	(1024)	/* max array size */
+typedef integer_t	processor_info_data_t[PROCESSOR_INFO_MAX];
+
+
+typedef integer_t	*processor_set_info_t;	/* varying array of int. */
+
+#define PROCESSOR_SET_INFO_MAX	(1024)	/* max array size */
+typedef integer_t	processor_set_info_data_t[PROCESSOR_SET_INFO_MAX];
+
+/*
+ *	Currently defined information.
+ */
+typedef int	processor_flavor_t;
+#define	PROCESSOR_BASIC_INFO	1		/* basic information */
+#define	PROCESSOR_CPU_LOAD_INFO	2	/* cpu load information */
+#define	PROCESSOR_PM_REGS_INFO	0x10000001	/* performance monitor register info */
+#define	PROCESSOR_TEMPERATURE	0x10000002	/* Processor core temperature */
+
+struct processor_basic_info {
+	cpu_type_t	cpu_type;	/* type of cpu */
+	cpu_subtype_t	cpu_subtype;	/* subtype of cpu */
+	boolean_t	running;	/* is processor running */
+	int		slot_num;	/* slot number */
+	boolean_t	is_master;	/* is this the master processor */
+};
+
+typedef	struct processor_basic_info	processor_basic_info_data_t;
+typedef struct processor_basic_info	*processor_basic_info_t;
+#define PROCESSOR_BASIC_INFO_COUNT	((mach_msg_type_number_t) \
+		(sizeof(processor_basic_info_data_t)/sizeof(natural_t)))
+
+struct processor_cpu_load_info {             /* number of ticks while running... */
+        unsigned int	cpu_ticks[CPU_STATE_MAX]; /* ... in the given mode */
+}; 
+
+typedef	struct processor_cpu_load_info	processor_cpu_load_info_data_t;
+typedef struct processor_cpu_load_info	*processor_cpu_load_info_t;
+#define PROCESSOR_CPU_LOAD_INFO_COUNT	((mach_msg_type_number_t) \
+		(sizeof(processor_cpu_load_info_data_t)/sizeof(natural_t)))
+
+/*
+ *	Scaling factor for load_average, mach_factor.
+ */
+#define	LOAD_SCALE	1000		
+
+typedef	int	processor_set_flavor_t;
+#define	PROCESSOR_SET_BASIC_INFO	5	/* basic information */
+
+struct processor_set_basic_info {
+	int		processor_count;	/* How many processors */
+	int		default_policy;		/* When others not enabled */
+};
+
+typedef	struct processor_set_basic_info	processor_set_basic_info_data_t;
+typedef struct processor_set_basic_info	*processor_set_basic_info_t;
+#define PROCESSOR_SET_BASIC_INFO_COUNT	((mach_msg_type_number_t) \
+		(sizeof(processor_set_basic_info_data_t)/sizeof(natural_t)))
+
+#define PROCESSOR_SET_LOAD_INFO		4	/* scheduling statistics */
+
+struct processor_set_load_info {
+        int             task_count;             /* How many tasks */
+        int             thread_count;           /* How many threads */
+        integer_t       load_average;           /* Scaled */
+        integer_t       mach_factor;            /* Scaled */
+};
+
+typedef struct processor_set_load_info processor_set_load_info_data_t;
+typedef struct processor_set_load_info *processor_set_load_info_t;
+#define PROCESSOR_SET_LOAD_INFO_COUNT	((mach_msg_type_number_t) \
+                (sizeof(processor_set_load_info_data_t)/sizeof(natural_t)))
+
+
+#endif	/* _MACH_PROCESSOR_INFO_H_ */
diff --git a/i386/include/mach/processor_set.defs b/i386/include/mach/processor_set.defs
new file mode 100644
index 0000000..dc0f407
--- /dev/null
+++ b/i386/include/mach/processor_set.defs
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_FREE_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/mach_port.defs
+ *	Author:	Rich Draves
+ *
+ *	Exported kernel calls.
+ */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+	  processor_set 4000;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+/*
+ *      Return scheduling statistics for a processor set.
+ */
+routine processor_set_statistics(
+        	pset                    : processor_set_name_t;
+        	flavor                  : processor_set_flavor_t;
+	out     info_out        	: processor_set_info_t, CountInOut);
+
+
+/*
+ *	Destroy processor set.
+ */
+routine processor_set_destroy(
+		set		: processor_set_t);
+
+
+/*
+ *	Set max priority for processor_set.
+ */
+routine processor_set_max_priority(
+		processor_set	: processor_set_t;
+		max_priority	: int;
+		change_threads	: boolean_t);
+
+/*
+ *	Enable policy for processor set
+ */
+routine processor_set_policy_enable(
+		processor_set	: processor_set_t;
+		policy		: int);
+
+/*
+ *	Disable policy for processor set
+ */
+routine processor_set_policy_disable(
+		processor_set	: processor_set_t;
+		policy		: int;
+		change_threads	: boolean_t);
+
+/*
+ *	List all tasks in processor set.
+ */
+routine processor_set_tasks(
+		processor_set	: processor_set_t;
+	out	task_list	: task_array_t);
+
+/*
+ *	List all threads in processor set.
+ */
+routine processor_set_threads(
+		processor_set	: processor_set_t;
+	out	thread_list	: thread_act_array_t);
+
+/*
+ *      Controls the scheduling attributes governing the processor set.
+ *      Allows control of enabled policies, and per-policy base and limit
+ *      priorities.
+ */
+routine processor_set_policy_control(
+	pset			: processor_set_t;
+	flavor			: processor_set_flavor_t;
+	policy_info		: processor_set_info_t;
+	change			: boolean_t);
+
+
+/*
+ *	Debug Info
+ *      This call is only valid on MACH_DEBUG kernels.
+ *      Otherwise, KERN_FAILURE is returned.
+ */
+routine processor_set_stack_usage(
+		pset		: processor_set_t;
+	out	ltotal		: unsigned;
+	out	space		: vm_size_t;
+	out	resident	: vm_size_t;
+	out	maxusage	: vm_size_t;
+	out	maxstack	: vm_offset_t);
+
+/*
+ *      Get information about processor set.
+ */
+routine processor_set_info(
+                set_name        : processor_set_name_t;
+                flavor          : int;
+        out     host            : host_t;
+        out     info_out        : processor_set_info_t, CountInOut);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/processor_set.h b/i386/include/mach/processor_set.h
new file mode 100644
index 0000000..1aaf327
--- /dev/null
+++ b/i386/include/mach/processor_set.h
@@ -0,0 +1,516 @@
+#ifndef	_processor_set_user_
+#define	_processor_set_user_
+
+/* Module processor_set */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	processor_set_MSG_COUNT
+#define	processor_set_MSG_COUNT	10
+#endif	/* processor_set_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine processor_set_statistics */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_statistics
+(
+	processor_set_name_t pset,
+	processor_set_flavor_t flavor,
+	processor_set_info_t info_out,
+	mach_msg_type_number_t *info_outCnt
+);
+
+/* Routine processor_set_destroy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_destroy
+(
+	processor_set_t set
+);
+
+/* Routine processor_set_max_priority */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_max_priority
+(
+	processor_set_t processor_set,
+	int max_priority,
+	boolean_t change_threads
+);
+
+/* Routine processor_set_policy_enable */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_policy_enable
+(
+	processor_set_t processor_set,
+	int policy
+);
+
+/* Routine processor_set_policy_disable */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_policy_disable
+(
+	processor_set_t processor_set,
+	int policy,
+	boolean_t change_threads
+);
+
+/* Routine processor_set_tasks */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_tasks
+(
+	processor_set_t processor_set,
+	task_array_t *task_list,
+	mach_msg_type_number_t *task_listCnt
+);
+
+/* Routine processor_set_threads */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_threads
+(
+	processor_set_t processor_set,
+	thread_act_array_t *thread_list,
+	mach_msg_type_number_t *thread_listCnt
+);
+
+/* Routine processor_set_policy_control */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_policy_control
+(
+	processor_set_t pset,
+	processor_set_flavor_t flavor,
+	processor_set_info_t policy_info,
+	mach_msg_type_number_t policy_infoCnt,
+	boolean_t change
+);
+
+/* Routine processor_set_stack_usage */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_stack_usage
+(
+	processor_set_t pset,
+	unsigned *ltotal,
+	vm_size_t *space,
+	vm_size_t *resident,
+	vm_size_t *maxusage,
+	vm_offset_t *maxstack
+);
+
+/* Routine processor_set_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t processor_set_info
+(
+	processor_set_name_t set_name,
+	int flavor,
+	host_t *host,
+	processor_set_info_t info_out,
+	mach_msg_type_number_t *info_outCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__processor_set_subsystem__defined
+#define __Request__processor_set_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		processor_set_flavor_t flavor;
+		mach_msg_type_number_t info_outCnt;
+	} __Request__processor_set_statistics_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__processor_set_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int max_priority;
+		boolean_t change_threads;
+	} __Request__processor_set_max_priority_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int policy;
+	} __Request__processor_set_policy_enable_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int policy;
+		boolean_t change_threads;
+	} __Request__processor_set_policy_disable_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__processor_set_tasks_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__processor_set_threads_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		processor_set_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[5];
+		boolean_t change;
+	} __Request__processor_set_policy_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__processor_set_stack_usage_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int flavor;
+		mach_msg_type_number_t info_outCnt;
+	} __Request__processor_set_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__processor_set_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__processor_set_subsystem__defined
+#define __RequestUnion__processor_set_subsystem__defined
+union __RequestUnion__processor_set_subsystem {
+	__Request__processor_set_statistics_t Request_processor_set_statistics;
+	__Request__processor_set_destroy_t Request_processor_set_destroy;
+	__Request__processor_set_max_priority_t Request_processor_set_max_priority;
+	__Request__processor_set_policy_enable_t Request_processor_set_policy_enable;
+	__Request__processor_set_policy_disable_t Request_processor_set_policy_disable;
+	__Request__processor_set_tasks_t Request_processor_set_tasks;
+	__Request__processor_set_threads_t Request_processor_set_threads;
+	__Request__processor_set_policy_control_t Request_processor_set_policy_control;
+	__Request__processor_set_stack_usage_t Request_processor_set_stack_usage;
+	__Request__processor_set_info_t Request_processor_set_info;
+};
+#endif /* !__RequestUnion__processor_set_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__processor_set_subsystem__defined
+#define __Reply__processor_set_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t info_outCnt;
+		integer_t info_out[5];
+	} __Reply__processor_set_statistics_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__processor_set_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__processor_set_max_priority_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__processor_set_policy_enable_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__processor_set_policy_disable_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t task_list;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t task_listCnt;
+	} __Reply__processor_set_tasks_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t thread_list;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t thread_listCnt;
+	} __Reply__processor_set_threads_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__processor_set_policy_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		unsigned ltotal;
+		vm_size_t space;
+		vm_size_t resident;
+		vm_size_t maxusage;
+		vm_offset_t maxstack;
+	} __Reply__processor_set_stack_usage_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t host;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t info_outCnt;
+		integer_t info_out[5];
+	} __Reply__processor_set_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__processor_set_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__processor_set_subsystem__defined
+#define __ReplyUnion__processor_set_subsystem__defined
+union __ReplyUnion__processor_set_subsystem {
+	__Reply__processor_set_statistics_t Reply_processor_set_statistics;
+	__Reply__processor_set_destroy_t Reply_processor_set_destroy;
+	__Reply__processor_set_max_priority_t Reply_processor_set_max_priority;
+	__Reply__processor_set_policy_enable_t Reply_processor_set_policy_enable;
+	__Reply__processor_set_policy_disable_t Reply_processor_set_policy_disable;
+	__Reply__processor_set_tasks_t Reply_processor_set_tasks;
+	__Reply__processor_set_threads_t Reply_processor_set_threads;
+	__Reply__processor_set_policy_control_t Reply_processor_set_policy_control;
+	__Reply__processor_set_stack_usage_t Reply_processor_set_stack_usage;
+	__Reply__processor_set_info_t Reply_processor_set_info;
+};
+#endif /* !__RequestUnion__processor_set_subsystem__defined */
+
+#ifndef subsystem_to_name_map_processor_set
+#define subsystem_to_name_map_processor_set \
+    { "processor_set_statistics", 4000 },\
+    { "processor_set_destroy", 4001 },\
+    { "processor_set_max_priority", 4002 },\
+    { "processor_set_policy_enable", 4003 },\
+    { "processor_set_policy_disable", 4004 },\
+    { "processor_set_tasks", 4005 },\
+    { "processor_set_threads", 4006 },\
+    { "processor_set_policy_control", 4007 },\
+    { "processor_set_stack_usage", 4008 },\
+    { "processor_set_info", 4009 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _processor_set_user_ */
diff --git a/i386/include/mach/rpc.h b/i386/include/mach/rpc.h
new file mode 100644
index 0000000..565d7ac
--- /dev/null
+++ b/i386/include/mach/rpc.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2002,2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+/*
+ * Mach RPC Subsystem Interfaces
+ */
+
+#ifndef	_MACH_RPC_H_
+#define _MACH_RPC_H_
+
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/port.h>
+#include <mach/vm_types.h>
+
+#include <mach/mig.h>
+#include <mach/mig_errors.h>
+#include <mach/machine/rpc.h>
+#include <mach/thread_status.h>
+
+/*
+ * These are the types for RPC-specific variants of the MIG routine
+ * descriptor and subsystem data types.
+ *
+ * THIS IS ONLY FOR COMPATIBILITY.  WE WILL NOT BE IMPLEMENTING THIS.
+ */
+
+/*
+ * Basic mach rpc types.
+ */
+typedef unsigned int    routine_arg_type;
+typedef unsigned int	routine_arg_offset;
+typedef unsigned int	routine_arg_size;
+
+/*
+ * Definitions for a signature's argument and routine descriptor's.
+ */
+struct rpc_routine_arg_descriptor {
+	routine_arg_type	type;	   /* Port, Array, etc. */
+        routine_arg_size        size;      /* element size in bytes */
+        routine_arg_size        count;     /* number of elements */
+	routine_arg_offset	offset;	   /* Offset in list of routine args */
+};
+typedef struct rpc_routine_arg_descriptor *rpc_routine_arg_descriptor_t;
+
+struct rpc_routine_descriptor {
+	mig_impl_routine_t	impl_routine;	/* Server work func pointer   */
+	mig_stub_routine_t	stub_routine;	/* Unmarshalling func pointer */
+	unsigned int		argc;		/* Number of argument words   */
+	unsigned int		descr_count;	/* Number of complex argument */
+					        /* descriptors                */
+	rpc_routine_arg_descriptor_t
+				arg_descr;	/* Pointer to beginning of    */
+						/* the arg_descr array        */
+	unsigned int		max_reply_msg;	/* Max size for reply msg     */
+};
+typedef struct rpc_routine_descriptor *rpc_routine_descriptor_t;
+
+#define RPC_DESCR_SIZE(x) ((x)->descr_count * \
+				sizeof(struct rpc_routine_arg_descriptor))
+
+struct rpc_signature {
+    struct rpc_routine_descriptor rd;
+    struct rpc_routine_arg_descriptor rad[1];
+};
+
+#define RPC_SIGBUF_SIZE 8
+
+/*
+ *	A subsystem describes a set of server routines that can be invoked by
+ *	mach_rpc() on the ports that are registered with the subsystem.  For
+ *	each routine, the routine number is given, along with the
+ *	address of the implementation function in the server and a
+ *	description of the arguments of the routine (it's "signature").
+ *
+ *	This structure definition is only a template for what is really a
+ *	variable-length structure (generated by MIG for each subsystem).
+ *	The actual structures do not always have one entry in the routine
+ *	array, and also have a varying number of entries in the arg_descr
+ *	array.  Each routine has an array of zero or more arg descriptors
+ *	one for each complex arg.  These arrays are all catenated together
+ *	to form the arg_descr field of the subsystem struct.  The
+ *	arg_descr field of each routine entry points to a unique sub-sequence
+ *	within this catenated array.  The goal is to keep everything
+ *	contiguous.
+ */
+struct rpc_subsystem {
+	void		*reserved;	/* Reserved for system use */
+
+	mach_msg_id_t	start;		/* Min routine number */
+	mach_msg_id_t	end;		/* Max routine number + 1 */
+	unsigned int	maxsize;	/* Max mach_msg size */
+	vm_address_t	base_addr;	/* Address of this struct in user */
+
+	struct rpc_routine_descriptor	/* Array of routine descriptors */
+			routine[1       /* Actually, (start-end+1) */
+				 ];
+
+	struct rpc_routine_arg_descriptor
+			arg_descriptor[1   /* Actually, the sum of the descr_ */
+					]; /* count fields for all routines   */
+};
+typedef struct rpc_subsystem  *rpc_subsystem_t;
+
+#define RPC_SUBSYSTEM_NULL	((rpc_subsystem_t) 0)
+
+#endif	/* _MACH_RPC_H_ */
diff --git a/i386/include/mach/sdt.h b/i386/include/mach/sdt.h
new file mode 100644
index 0000000..3268551
--- /dev/null
+++ b/i386/include/mach/sdt.h
@@ -0,0 +1,32 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _MACH_SDT_H
+#define	_MACH_SDT_H
+
+#include <mach/machine/sdt.h>
+
+#endif	/* _MACH_SDT_H */
diff --git a/i386/include/mach/security.defs b/i386/include/mach/security.defs
new file mode 100644
index 0000000..734aa90
--- /dev/null
+++ b/i386/include/mach/security.defs
@@ -0,0 +1,208 @@
+
+/* -*- C++ -*- */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	KERNEL_SERVER
+	  security 5200;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+type labelstr_t = c_string[*:512];
+
+/**
+  @brief Retrieve a task label as a label handle
+  @param task Target's task port
+  @param label Returned label handle
+
+  This call retrieves the label handle of the specified task.
+
+  @return Standard MiG return values (0 for success)
+*/
+
+routine mach_get_task_label(task      : ipc_space_t;
+			    out label : mach_port_name_t);
+
+/**
+  @brief Retrieve a task label in textual form
+  @param task Target's task port
+  @param policies Comma-delimited list of policies to query
+  @param label Returned label text
+
+  This call retrieves an externalized task label for the
+  specified task, with respect to the specified policies.
+
+  @return Standard MiG return values (0 for success)
+*/
+
+routine mach_get_task_label_text(task      : ipc_space_t;
+				 policies  : labelstr_t;
+				 out label : labelstr_t);
+
+/**
+  @brief Retrieve a port label as a label handle
+  @param task Issuer's task port
+  @param port Port to query label from
+  @param label Returned label handle
+
+  This call retrieves a new label handle for the specified port.
+  If the port represents a label handle, KERN_INVALID_ARGUMENT is
+  returned.
+
+  @return Standard MiG return values (0 for success)
+*/
+
+routine mach_get_label(task      : ipc_space_t;
+		       port      : mach_port_name_t;
+		       out label : mach_port_name_t);
+
+/**
+  @brief Retrieve a port label in textual form
+  @param task Issuer's task port
+  @param name Port to query label from
+  @param policies Comma-delimited list of policies to query
+  @param label Returned label text
+
+  This call retrieves an externalized port label for the specified port,
+  with respect to the specified policies. If the port represents a label
+  handle, the returned label text refers to the stored label and not the
+  access control label.
+
+  @return Standard MiG return values (0 for success)
+*/
+
+routine mach_get_label_text(task      : ipc_space_t;
+			    name      : mach_port_name_t;
+			    policies  : labelstr_t;
+			    out label : labelstr_t);
+
+/**
+  @brief Relabel a port
+  @param task Task containing specified ports
+  @param name Port to relabel
+  @param label String representation of new label
+
+  This call attempts to relabel the specified port to the
+  label specified. For label handles, it changes the access control
+  label and not the stored label.
+
+  @return Standard MiG return values (0 for success)
+*/
+
+routine mach_set_port_label(task      : ipc_space_t;
+			    name      : mach_port_name_t;
+			    label     : labelstr_t);
+
+/**
+  @brief Generic access control check
+  @param task Any task port
+  @param subj subject label in textual form
+  @param obj object label in textual form
+  @param serv Service or object class name
+  @param perm Permission, or method, within the specified service
+
+  This function provides a general way for a user process to query
+  an arbitrary access control decision from the system's security policies.
+  Currently, there are no standards for the format of the service and
+  permission names. 
+
+  @return Standard MiG return values (0 for success)
+*/
+
+routine mac_check_service(task    : ipc_space_t;
+			  subject : labelstr_t;
+			  object  : labelstr_t;
+			  service : labelstr_t;
+			  perm    : labelstr_t);
+
+/**
+  @brief Generic access control check
+  @param task Task containing specified ports (usually caller's)
+  @param subj subject label in textual form
+  @param obj port containing object label
+  @param serv Service or object class name
+  @param perm Permission, or method, within the specified service
+
+  This function provides a general way for a user process to query
+  an arbitrary access control decision from the system's security policies.
+  Currently, there are no standards for the format of the service and
+  permission names. If the port is a label handle, the stored label is
+  used. Otherwise, its access control label is used.
+
+  @return Standard MiG return values (0 for success)
+*/
+
+routine mac_port_check_service_obj(task    : ipc_space_t;
+				   subject : labelstr_t;
+				   object  : mach_port_name_t;
+				   service : labelstr_t;
+				   perm    : labelstr_t);
+
+/**
+  @brief Generic access control check
+  @param task Task containing specified ports (usually caller's)
+  @param subj port containing subject label
+  @param obj port containing object label
+  @param serv Service or object class name
+  @param perm Permission, or method, within the specified service
+
+  This function provides a general way for a user process to query
+  an arbitrary access control decision from the system's security policies.
+  Currently, there are no standards for the format of the service and
+  permission names. If any ports are label handles, the stored label is
+  used. Otherwise, the access control labels are used.
+
+  @return Standard MiG return values (0 for success)
+*/
+
+routine mac_port_check_access(task    : ipc_space_t;
+			      subject : mach_port_name_t;
+			      object  : mach_port_name_t;
+			      service : labelstr_t;
+			      perm    : labelstr_t);
+
+/**
+  @brief Create a new label handle
+  @param task Task to receive new ports (usually caller's)
+  @param name Returned label handle port
+  @param label String representation of new label
+
+  Creates a new label handle, with the stored label defined by the
+  given text. Any task may create a label handle with any valid label,
+  not necessarily one that it has permission to access. A port right
+  for the new label handle is inserted into the specified task.
+  Posession of label handles should not imply any security properties.
+
+  @return Standard MiG return values (0 for success)
+*/
+
+routine mac_label_new(task     : ipc_space_t;
+		      out name : mach_port_name_t;
+		      label    : labelstr_t);
+
+/**
+  @brief Request a computed label
+  @param task subj,obj,newlabel relative to this task (usually caller's)
+  @param subj port containing subject label
+  @param obj port containing object label
+  @param serv Service or object class name
+  @param newlabel Returned label handle port
+  
+  Ask the loaded policies to compute a label based on the two input labels
+  and the service name. There is currently no standard for the service name,
+  or even what the input labels represent (Subject and parent object are only
+  a suggestion). If any ports are label handles, the stored label is
+  used. Otherwise, the access control labels are used. A new label handle
+  is created to contain the computed label, and is stored into the
+  specified task.
+
+  @return Standard MiG return values (0 for success)
+*/
+
+routine mac_request_label(task         : ipc_space_t;
+			  subject      : mach_port_name_t;
+			  object       : mach_port_name_t;
+			  service      : labelstr_t;
+			  out newlabel : mach_port_name_t);
diff --git a/i386/include/mach/semaphore.h b/i386/include/mach/semaphore.h
new file mode 100644
index 0000000..660af09
--- /dev/null
+++ b/i386/include/mach/semaphore.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_SEMAPHORE_H_
+#define _MACH_SEMAPHORE_H_
+
+#include <mach/port.h>
+#include <mach/mach_types.h>
+#include <mach/kern_return.h>
+#include <mach/sync_policy.h>
+
+/*
+ *	Forward Declarations
+ *
+ *	The semaphore creation and deallocation routines are
+ *	defined with the Mach task APIs in <mach/task.h>.
+ *
+ *      kern_return_t	semaphore_create(task_t task,
+ *                                       semaphore_t *new_semaphore,
+ *					 sync_policy_t policy,
+ *					 int value);
+ *
+ *	kern_return_t	semaphore_destroy(task_t task,
+ *					  semaphore_t semaphore);
+ */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+extern	kern_return_t	semaphore_signal     	(semaphore_t semaphore);
+extern	kern_return_t	semaphore_signal_all 	(semaphore_t semaphore);
+
+extern	kern_return_t	semaphore_wait       	(semaphore_t semaphore);
+
+
+extern	kern_return_t	semaphore_timedwait    	(semaphore_t semaphore, 
+												 mach_timespec_t wait_time);
+
+extern  kern_return_t	semaphore_timedwait_signal(semaphore_t wait_semaphore,
+												   semaphore_t signal_semaphore,
+												   mach_timespec_t wait_time);
+
+extern  kern_return_t   semaphore_wait_signal   (semaphore_t wait_semaphore,
+                                                 semaphore_t signal_semaphore);
+
+extern	kern_return_t	semaphore_signal_thread	(semaphore_t semaphore,
+                                                 thread_t thread);
+
+
+__END_DECLS
+
+
+#endif	/* _MACH_SEMAPHORE_H_ */
diff --git a/i386/include/mach/shared_memory_server.h b/i386/include/mach/shared_memory_server.h
new file mode 100644
index 0000000..1ca25f3
--- /dev/null
+++ b/i386/include/mach/shared_memory_server.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ *
+ *	File: mach/shared_memory_server.h
+ *
+ * 	protos and struct definitions for shared library
+ *	server and interface
+ */
+
+/*
+ * XXX
+ * 
+ * NOTE: this file is deprecated and will be removed in the near future.
+ * Any project that includes this file should be changed to:
+ * 1. use <mach/shared_region.h> instead of this file,
+ * 2. handle the new shared regions, now available on more platforms
+ */
+
+#ifndef _MACH_SHARED_MEMORY_SERVER_H_
+#define _MACH_SHARED_MEMORY_SERVER_H_
+
+#warning "<mach/shared_memory_server.h> is deprecated.  Please use <mach/shared_region.h> instead."
+
+#include <sys/cdefs.h>
+#include <mach/vm_prot.h>
+#include <mach/vm_types.h>
+#include <mach/mach_types.h>
+
+#define VM_PROT_COW  0x8  /* must not interfere with normal prot assignments */
+#define VM_PROT_ZF  0x10  /* must not interfere with normal prot assignments */
+
+#ifdef	__arm__
+#define GLOBAL_SHARED_TEXT_SEGMENT	0x30000000U
+#define GLOBAL_SHARED_DATA_SEGMENT	0x38000000U
+#define GLOBAL_SHARED_SEGMENT_MASK	0xF8000000U
+
+#define	SHARED_TEXT_REGION_SIZE		0x08000000
+#define	SHARED_DATA_REGION_SIZE		0x08000000
+#else
+#define GLOBAL_SHARED_TEXT_SEGMENT	0x90000000U
+#define GLOBAL_SHARED_DATA_SEGMENT	0xA0000000U
+#define GLOBAL_SHARED_SEGMENT_MASK	0xF0000000U
+
+#define	SHARED_TEXT_REGION_SIZE		0x10000000
+#define	SHARED_DATA_REGION_SIZE		0x10000000
+#endif
+
+#if !defined(__LP64__)
+
+#define	SHARED_LIBRARY_SERVER_SUPPORTED
+
+#define	SHARED_ALTERNATE_LOAD_BASE	0x09000000
+
+/* 
+ *  Note: the two masks below are useful because the assumption is 
+ *  made that these shared regions will always be mapped on natural boundaries 
+ *  i.e. if the size is 0x10000000 the object can be mapped at 
+ *  0x20000000, or 0x30000000, but not 0x1000000
+ */
+#ifdef	__arm__
+#define	SHARED_TEXT_REGION_MASK		0x07FFFFFF
+#define	SHARED_DATA_REGION_MASK		0x07FFFFFF
+#else
+#define	SHARED_TEXT_REGION_MASK		0x0FFFFFFF
+#define	SHARED_DATA_REGION_MASK		0x0FFFFFFF
+#endif
+
+
+/* flags field aliases for copyin_shared_file and load_shared_file */
+
+/* IN */
+#define ALTERNATE_LOAD_SITE 0x1
+#define NEW_LOCAL_SHARED_REGIONS 0x2
+#define	QUERY_IS_SYSTEM_REGION 0x4
+
+/* OUT */
+#define SF_PREV_LOADED    0x1
+#define SYSTEM_REGION_BACKED 0x2
+
+
+struct sf_mapping {
+	vm_offset_t	mapping_offset;
+	vm_size_t	size;
+	vm_offset_t	file_offset;
+	vm_prot_t	protection;  /* read/write/execute/COW/ZF */
+	vm_offset_t	cksum;
+};
+typedef struct sf_mapping sf_mapping_t;
+
+#endif  /* !defined(__LP64__) */
+
+/* 
+ * All shared_region_* declarations are a private interface
+ * between dyld and the kernel.
+ *
+ */
+struct shared_file_mapping_np {
+	mach_vm_address_t	sfm_address;
+	mach_vm_size_t		sfm_size;
+	mach_vm_offset_t	sfm_file_offset;
+	vm_prot_t		sfm_max_prot;
+	vm_prot_t		sfm_init_prot;
+};
+
+struct shared_region_range_np {
+	mach_vm_address_t	srr_address;
+	mach_vm_size_t		srr_size;
+};
+
+
+__BEGIN_DECLS
+int	shared_region_map_file_np(int fd,
+				  uint32_t mappingCount,
+				  const struct shared_file_mapping_np *mappings,
+				  int64_t *slide_p);
+int	shared_region_make_private_np(uint32_t rangeCount,
+				      const struct shared_region_range_np *ranges);
+__END_DECLS
+
+
+#endif /* _MACH_SHARED_MEMORY_SERVER_H_ */
diff --git a/i386/include/mach/shared_region.h b/i386/include/mach/shared_region.h
new file mode 100644
index 0000000..4bea17e
--- /dev/null
+++ b/i386/include/mach/shared_region.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ *
+ *	File: mach/shared_region.h
+ *
+ * 	protos and struct definitions for shared region
+ */
+
+#ifndef _MACH_SHARED_REGION_H_
+#define _MACH_SHARED_REGION_H_
+
+#include <sys/cdefs.h>
+#include <mach/vm_prot.h>
+#include <mach/vm_types.h>
+#include <mach/mach_types.h>
+
+#define SHARED_REGION_BASE_I386			0x90000000ULL
+#define SHARED_REGION_SIZE_I386			0x20000000ULL
+#define SHARED_REGION_NESTING_BASE_I386		0x90000000ULL
+#define SHARED_REGION_NESTING_SIZE_I386		0x20000000ULL
+#define SHARED_REGION_NESTING_MIN_I386		0x00200000ULL
+#define SHARED_REGION_NESTING_MAX_I386		0xFFE00000ULL
+
+#define SHARED_REGION_BASE_X86_64		0x00007FFF70000000ULL
+#define SHARED_REGION_SIZE_X86_64		0x000000008FE00000ULL
+#define SHARED_REGION_NESTING_BASE_X86_64	0x00007FFF80000000ULL
+#define SHARED_REGION_NESTING_SIZE_X86_64	0x0000000040000000ULL
+#define SHARED_REGION_NESTING_MIN_X86_64	0x0000000000200000ULL
+#define SHARED_REGION_NESTING_MAX_X86_64	0xFFFFFFFFFFE00000ULL
+
+#define SHARED_REGION_BASE_PPC			0x90000000ULL
+#define SHARED_REGION_SIZE_PPC			0x20000000ULL
+#define SHARED_REGION_NESTING_BASE_PPC		0x90000000ULL
+#define SHARED_REGION_NESTING_SIZE_PPC		0x10000000ULL
+#define SHARED_REGION_NESTING_MIN_PPC		0x10000000ULL
+#define SHARED_REGION_NESTING_MAX_PPC		0x10000000ULL
+
+#define SHARED_REGION_BASE_PPC64		0x00007FFF60000000ULL
+#define SHARED_REGION_SIZE_PPC64		0x00000000A0000000ULL
+#define SHARED_REGION_NESTING_BASE_PPC64	0x00007FFF60000000ULL
+#define SHARED_REGION_NESTING_SIZE_PPC64	0x00000000A0000000ULL
+#define SHARED_REGION_NESTING_MIN_PPC64		0x0000000010000000ULL
+#define SHARED_REGION_NESTING_MAX_PPC64		0x0000000010000000ULL
+
+#define SHARED_REGION_BASE_ARM			0x30000000ULL
+#define SHARED_REGION_SIZE_ARM			0x10000000ULL
+#define SHARED_REGION_NESTING_BASE_ARM		0x30000000ULL
+#define SHARED_REGION_NESTING_SIZE_ARM		0x08000000ULL
+#define SHARED_REGION_NESTING_MIN_ARM		?
+#define SHARED_REGION_NESTING_MAX_ARM		?
+
+#if defined(__i386__)
+#define SHARED_REGION_BASE			SHARED_REGION_BASE_I386
+#define SHARED_REGION_SIZE			SHARED_REGION_SIZE_I386
+#define SHARED_REGION_NESTING_BASE		SHARED_REGION_NESTING_BASE_I386
+#define SHARED_REGION_NESTING_SIZE		SHARED_REGION_NESTING_SIZE_I386
+#define SHARED_REGION_NESTING_MIN		SHARED_REGION_NESTING_MIN_I386
+#define SHARED_REGION_NESTING_MAX		SHARED_REGION_NESTING_MAX_I386
+#elif defined(__x86_64__)
+#define SHARED_REGION_BASE			SHARED_REGION_BASE_X86_64
+#define SHARED_REGION_SIZE			SHARED_REGION_SIZE_X86_64
+#define SHARED_REGION_NESTING_BASE		SHARED_REGION_NESTING_BASE_X86_64
+#define SHARED_REGION_NESTING_SIZE		SHARED_REGION_NESTING_SIZE_X86_64
+#define SHARED_REGION_NESTING_MIN		SHARED_REGION_NESTING_MIN_X86_64
+#define SHARED_REGION_NESTING_MAX		SHARED_REGION_NESTING_MAX_X86_64
+#elif defined(__ppc__)
+#define SHARED_REGION_BASE			SHARED_REGION_BASE_PPC
+#define SHARED_REGION_SIZE			SHARED_REGION_SIZE_PPC
+#define SHARED_REGION_NESTING_BASE		SHARED_REGION_NESTING_BASE_PPC
+#define SHARED_REGION_NESTING_SIZE		SHARED_REGION_NESTING_SIZE_PPC
+#define SHARED_REGION_NESTING_MIN		SHARED_REGION_NESTING_MIN_PPC
+#define SHARED_REGION_NESTING_MAX		SHARED_REGION_NESTING_MAX_PPC
+#elif defined(__ppc64__)
+#define SHARED_REGION_BASE			SHARED_REGION_BASE_PPC64
+#define SHARED_REGION_SIZE			SHARED_REGION_SIZE_PPC64
+#define SHARED_REGION_NESTING_BASE		SHARED_REGION_NESTING_BASE_PPC64
+#define SHARED_REGION_NESTING_SIZE		SHARED_REGION_NESTING_SIZE_PPC64
+#define SHARED_REGION_NESTING_MIN		SHARED_REGION_NESTING_MIN_PPC64
+#define SHARED_REGION_NESTING_MAX		SHARED_REGION_NESTING_MAX_PPC64
+#elif defined(__arm__)
+#define SHARED_REGION_BASE			SHARED_REGION_BASE_ARM
+#define SHARED_REGION_SIZE			SHARED_REGION_SIZE_ARM
+#define SHARED_REGION_NESTING_BASE		SHARED_REGION_NESTING_BASE_ARM
+#define SHARED_REGION_NESTING_SIZE		SHARED_REGION_NESTING_SIZE_ARM
+#define SHARED_REGION_NESTING_MIN		SHARED_REGION_NESTING_MIN_ARM
+#define SHARED_REGION_NESTING_MAX		SHARED_REGION_NESTING_MAX_ARM
+#endif
+
+/* 
+ * All shared_region_* declarations are a private interface
+ * between dyld and the kernel.
+ *
+ */
+struct shared_file_mapping_np {
+	mach_vm_address_t	sfm_address;
+	mach_vm_size_t		sfm_size;
+	mach_vm_offset_t	sfm_file_offset;
+	vm_prot_t		sfm_max_prot;
+	vm_prot_t		sfm_init_prot;
+};
+#define VM_PROT_COW  0x8  /* must not interfere with normal prot assignments */
+#define VM_PROT_ZF  0x10  /* must not interfere with normal prot assignments */
+
+
+__BEGIN_DECLS
+int	shared_region_check_np(uint64_t	*startaddress);
+int	shared_region_map_np(int fd,
+			     uint32_t mappingCount,
+			     const struct shared_file_mapping_np *mappings);
+__END_DECLS
+
+
+#endif /* _MACH_SHARED_REGION_H_ */
diff --git a/i386/include/mach/std_types.defs b/i386/include/mach/std_types.defs
new file mode 100644
index 0000000..0b48383
--- /dev/null
+++ b/i386/include/mach/std_types.defs
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2002,2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	Mach kernel standard interface type declarations
+ */
+
+#ifndef	_MACH_STD_TYPES_DEFS_
+#define _MACH_STD_TYPES_DEFS_
+
+/* from ISO/IEC 988:1999 spec */
+/* 7.18.1.1 Exact-width integer types */
+
+type int8_t = MACH_MSG_TYPE_INTEGER_8;
+type uint8_t = MACH_MSG_TYPE_INTEGER_8;
+type int16_t = MACH_MSG_TYPE_INTEGER_16;
+type uint16_t = MACH_MSG_TYPE_INTEGER_16;
+type int32_t = MACH_MSG_TYPE_INTEGER_32;
+type uint32_t = MACH_MSG_TYPE_INTEGER_32;
+type int64_t = MACH_MSG_TYPE_INTEGER_64;
+type uint64_t = MACH_MSG_TYPE_INTEGER_64;
+
+/*
+ * Legacy fixed-length Mach types which should
+ * be replaced with the Standard types from above.
+ */
+type int32 = int32_t;
+type unsigned32 = uint32_t;
+type int64 = int64_t;
+type unsigned64 = uint64_t;
+
+/*
+ * Other fixed length Mach types.
+ */
+type char = MACH_MSG_TYPE_CHAR;
+type boolean_t = MACH_MSG_TYPE_BOOLEAN;
+
+#include <mach/machine/machine_types.defs>
+
+type kern_return_t = int;
+
+type pointer_t = ^array[] of MACH_MSG_TYPE_BYTE
+	ctype: vm_offset_t;
+
+
+type mach_port_t = MACH_MSG_TYPE_COPY_SEND;
+type mach_port_array_t = array[] of mach_port_t;
+
+type mach_port_name_t = MACH_MSG_TYPE_PORT_NAME;
+type mach_port_name_array_t = array[] of mach_port_name_t;
+
+type mach_port_right_t = natural_t;
+
+type mach_port_type_t = natural_t;
+type mach_port_type_array_t = array[] of mach_port_type_t;
+
+type mach_port_urefs_t = natural_t;
+type mach_port_delta_t = integer_t;
+type mach_port_seqno_t = natural_t;
+type mach_port_mscount_t = unsigned;
+type mach_port_msgcount_t = unsigned;
+type mach_port_rights_t = unsigned;
+type mach_msg_id_t = integer_t;
+type mach_msg_size_t = natural_t;
+type mach_msg_type_name_t = unsigned;
+type mach_msg_options_t = integer_t;
+
+type mach_port_move_receive_t =		MACH_MSG_TYPE_MOVE_RECEIVE
+	ctype: mach_port_t;
+type mach_port_copy_send_t =		MACH_MSG_TYPE_COPY_SEND
+	ctype: mach_port_t;
+type mach_port_make_send_t =		MACH_MSG_TYPE_MAKE_SEND
+	ctype: mach_port_t;
+type mach_port_move_send_t =		MACH_MSG_TYPE_MOVE_SEND
+	ctype: mach_port_t;
+type mach_port_make_send_once_t =	MACH_MSG_TYPE_MAKE_SEND_ONCE
+	ctype: mach_port_t;
+type mach_port_move_send_once_t =	MACH_MSG_TYPE_MOVE_SEND_ONCE
+	ctype: mach_port_t;
+
+type mach_port_receive_t =		MACH_MSG_TYPE_PORT_RECEIVE
+	ctype: mach_port_t;
+type mach_port_send_t =			MACH_MSG_TYPE_PORT_SEND
+	ctype: mach_port_t;
+type mach_port_send_once_t =		MACH_MSG_TYPE_PORT_SEND_ONCE
+	ctype: mach_port_t;
+
+type mach_port_poly_t = polymorphic
+	ctype: mach_port_t;
+
+import <mach/std_types.h>;
+import <mach/mig.h>;
+
+#endif	/* _MACH_STD_TYPES_DEFS_ */
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/std_types.h b/i386/include/mach/std_types.h
new file mode 100644
index 0000000..f5b838a
--- /dev/null
+++ b/i386/include/mach/std_types.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2002,2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	Mach standard external interface type definitions.
+ *
+ */
+
+#ifndef	_MACH_STD_TYPES_H_
+#define	_MACH_STD_TYPES_H_
+
+#include <stdint.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/port.h>
+#include <mach/vm_types.h>
+
+#endif	/* _MACH_STD_TYPES_H_ */
diff --git a/i386/include/mach/sync.h b/i386/include/mach/sync.h
new file mode 100644
index 0000000..0a567c2
--- /dev/null
+++ b/i386/include/mach/sync.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+** This file contains compatibilty wrapper header for things that used
+** to be generated from mach/sync.defs.  Now that code is split into two
+** different interface generator files, so include the two resulting
+** headers here.
+*/
+#include <mach/semaphore.h>
+#include <mach/lock_set.h>
diff --git a/i386/include/mach/sync_policy.h b/i386/include/mach/sync_policy.h
new file mode 100644
index 0000000..1fd8d3f
--- /dev/null
+++ b/i386/include/mach/sync_policy.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+#ifndef	_MACH_SYNC_POLICY_H_
+#define _MACH_SYNC_POLICY_H_
+
+typedef int sync_policy_t;
+
+/*
+ *	These options define the wait ordering of the synchronizers
+ */
+#define SYNC_POLICY_FIFO		0x0
+#define SYNC_POLICY_FIXED_PRIORITY	0x1
+#define SYNC_POLICY_REVERSED		0x2
+#define SYNC_POLICY_ORDER_MASK		0x3
+#define SYNC_POLICY_LIFO		(SYNC_POLICY_FIFO|SYNC_POLICY_REVERSED)
+
+
+#define SYNC_POLICY_MAX			0x7
+
+#endif 	/* _MACH_SYNC_POLICY_H_ */
diff --git a/i386/include/mach/task.defs b/i386/include/mach/task.defs
new file mode 100644
index 0000000..ceebc95
--- /dev/null
+++ b/i386/include/mach/task.defs
@@ -0,0 +1,393 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_FREE_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/mach_port.defs
+ *	Author:	Rich Draves
+ *
+ *	Exported kernel calls.
+ */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+	  task 3400;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+/*
+ *	Create a new task with an empty set of IPC rights,
+ *	and having an address space constructed from the
+ *	target task (or empty, if inherit_memory is FALSE).
+ */
+routine task_create(
+		target_task	: task_t;
+		ledgers		: ledger_array_t;
+		inherit_memory	: boolean_t;
+	out	child_task	: task_t);
+
+/*
+ *	Destroy the target task, causing all of its threads
+ *	to be destroyed, all of its IPC rights to be deallocated,
+ *	and all of its address space to be deallocated.
+ */
+routine task_terminate(
+		target_task	: task_t);
+
+/*
+ *	Returns the set of threads belonging to the target task.
+ */
+routine task_threads(
+		target_task	: task_t;
+	out	act_list	: thread_act_array_t);
+
+/*
+ *	Stash a handful of ports for the target task; child
+ *	tasks inherit this stash at task_create time.
+ */
+routine	mach_ports_register(
+		target_task	: task_t;
+		init_port_set	: mach_port_array_t =
+					^array[] of mach_port_t);
+
+/*
+ *	Retrieve the stashed ports for the target task.
+ */
+routine	mach_ports_lookup(
+		target_task	: task_t;
+	out	init_port_set	: mach_port_array_t =
+					^array[] of mach_port_t);
+
+/*
+ *      Returns information about the target task.
+ */
+routine task_info(
+                target_task     : task_name_t;
+                flavor          : task_flavor_t;
+        out     task_info_out   : task_info_t, CountInOut);
+
+/*
+ * Set task information.
+ */
+routine	task_set_info(
+		target_task	: task_t;
+		flavor		: task_flavor_t;
+		task_info_in	: task_info_t);
+
+/*
+ *	Increment the suspend count for the target task.
+ *	No threads within a task may run when the suspend
+ *	count for that task is non-zero.
+ */
+routine	task_suspend(
+		target_task	: task_t);
+
+
+/*
+ *	Decrement the suspend count for the target task,
+ *	if the count is currently non-zero.  If the resulting
+ *	suspend	count is zero, then threads within the task
+ *	that also have non-zero suspend counts may execute.
+ */
+routine	task_resume(
+		target_task	: task_t);
+
+/*
+ *	Returns the current value of the selected special port
+ *	associated with the target task.
+ */
+routine task_get_special_port(
+		task		: task_t;
+		which_port	: int;
+	out	special_port	: mach_port_t);
+
+/*
+ *	Set one of the special ports associated with the
+ *	target task.
+ */
+routine task_set_special_port(
+		task		: task_t;
+		which_port	: int;
+		special_port	: mach_port_t);
+
+/*
+ *	Create a new thread within the target task, returning
+ *	the port representing the first thr_act in that new thread.  The
+ *	initial execution state of the thread is undefined.
+ */
+routine thread_create(
+		parent_task	: task_t;
+	out	child_act	: thread_act_t);
+
+/*
+ *      Create a new thread within the target task, returning
+ *      the port representing that new thread.  The new thread 
+ *	is not suspended; its initial execution state is given
+ *	by flavor and new_state. Returns the port representing 
+ *	the new thread.
+ */
+routine thread_create_running(
+                parent_task     : task_t;
+                flavor          : thread_state_flavor_t;
+                new_state       : thread_state_t;
+        out     child_act       : thread_act_t);
+
+/*
+ * Set an exception handler for a task on one or more exception types.
+ * These handlers are invoked for all threads in the task if there are
+ * no thread-specific exception handlers or those handlers returned an
+ * error.
+ */
+routine	task_set_exception_ports(
+		task		: task_t;
+		exception_mask	: exception_mask_t;
+		new_port	: mach_port_t;
+		behavior	: exception_behavior_t;
+		new_flavor	: thread_state_flavor_t);
+
+
+/*
+ * Lookup some of the old exception handlers for a task
+ */
+routine	task_get_exception_ports(
+		task		: task_t;
+		exception_mask	: exception_mask_t;
+	  out	masks		: exception_mask_array_t;
+	  out	old_handlers	: exception_handler_array_t, SameCount;
+	  out	old_behaviors	: exception_behavior_array_t, SameCount;
+	  out	old_flavors	: exception_flavor_array_t, SameCount);
+
+
+/*
+ * Set an exception handler for a thread on one or more exception types.
+ * At the same time, return the previously defined exception handlers for
+ * those types.
+ */
+routine	task_swap_exception_ports(
+		task		: task_t;
+		exception_mask	: exception_mask_t;
+		new_port	: mach_port_t;
+		behavior	: exception_behavior_t;
+		new_flavor	: thread_state_flavor_t;
+	  out	masks		: exception_mask_array_t;
+	  out	old_handlerss	: exception_handler_array_t, SameCount;
+	  out	old_behaviors	: exception_behavior_array_t, SameCount;
+	  out	old_flavors	: exception_flavor_array_t, SameCount);
+
+/*
+ * Create and destroy lock_set and semaphore synchronizers on a
+ * per-task basis (i.e. the task owns them).
+ */
+routine lock_set_create(
+		task		: task_t;
+	out	new_lock_set	: lock_set_t;
+		n_ulocks	: int;
+		policy		: int);
+
+routine lock_set_destroy(
+		task		: task_t;
+		lock_set	: lock_set_t);
+
+routine semaphore_create(
+		task		: task_t;
+	out	semaphore	: semaphore_t;
+		policy		: int;
+		value		: int);
+
+routine semaphore_destroy(
+		task		: task_t;
+		semaphore	: semaphore_consume_ref_t);
+
+/*
+ * Set/get policy information for a task.
+ * (Approved Mac OS X microkernel interface)
+ */
+
+routine task_policy_set(
+	task			: task_t;
+	flavor			: task_policy_flavor_t;
+	policy_info		: task_policy_t);
+
+routine task_policy_get(
+	task			: task_t;
+	flavor			: task_policy_flavor_t;
+out	policy_info		: task_policy_t, CountInOut;
+inout	get_default		: boolean_t);
+
+/*
+ *	Removed from the kernel.
+ */
+#if KERNEL_SERVER
+skip;
+#else
+routine task_sample(
+		task		: task_t;
+		reply		: mach_port_make_send_t);
+#endif
+
+/*
+ * JMM - Everything from here down is likely to go away soon
+ */
+/*
+ * OBSOLETE interface.
+ */
+routine task_policy(
+	task			: task_t;
+	policy			: policy_t;
+	base			: policy_base_t;
+	set_limit		: boolean_t;
+	change			: boolean_t);
+
+
+/*
+ *	Establish a user-level handler for the specified
+ *	system call.
+ */
+routine task_set_emulation(
+		target_port	: task_t;
+		routine_entry_pt: vm_address_t;
+		routine_number  : int);	
+
+/*
+ *	Get user-level handler entry points for all
+ *	emulated system calls.
+ */
+routine task_get_emulation_vector(
+		task		: task_t;
+	out	vector_start	: int;
+	out	emulation_vector: emulation_vector_t);
+
+/*
+ *	Establish user-level handlers for the specified
+ *	system calls. Non-emulated system calls are specified
+ *	with emulation_vector[i] == EML_ROUTINE_NULL.
+ */
+routine task_set_emulation_vector(
+		task		: task_t;
+		vector_start	: int;
+		emulation_vector: emulation_vector_t);
+
+
+/*
+ *      Establish restart pc for interrupted atomic sequences.
+ */
+routine task_set_ras_pc(
+		target_task     : task_t;
+		basepc          : vm_address_t;
+		boundspc        : vm_address_t);
+
+
+skip; /* was kernel_task_create() */
+
+/* 
+ * JMM - Want to eliminate processor_set so keep them at the end.
+ */
+
+/*
+ *	Assign task to processor set.
+ */
+routine task_assign(
+		task		: task_t;
+		new_set		: processor_set_t;
+		assign_threads	: boolean_t);
+
+/*
+ *	Assign task to default set.
+ */
+routine task_assign_default(
+		task		: task_t;
+		assign_threads	: boolean_t);
+
+/*
+ *	Get current assignment for task.
+ */
+routine task_get_assignment(
+		task		: task_t;
+	out	assigned_set	: processor_set_name_t);
+
+/*
+ * OBSOLETE interface.
+ */
+routine task_set_policy(
+	task			: task_t;
+	pset			: processor_set_t;
+	policy			: policy_t;
+	base			: policy_base_t;
+	limit			: policy_limit_t;
+	change			: boolean_t);
+
+/*
+ * Read the selected state which is to be installed on new 
+ * threads in the task as they are created.
+ */
+routine task_get_state(
+		task		: task_t;
+		flavor		: thread_state_flavor_t;
+	out	old_state	: thread_state_t, CountInOut);
+ 
+/*
+ * Set the selected state information to be installed on
+ * all subsequently created threads in the task.
+ */
+routine	task_set_state(
+		task		: task_t;
+		flavor		: thread_state_flavor_t;
+		new_state	: thread_state_t);
+
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/task.h b/i386/include/mach/task.h
new file mode 100644
index 0000000..459a330
--- /dev/null
+++ b/i386/include/mach/task.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#if defined(__i386__)
+#include <mach/i386/task.h>
+#elif defined(__x86_64__)
+#include <mach/x86_64/task.h>
+#elif defined(__ppc__)
+#include <mach/ppc/task.h>
+#elif defined(__ppc64__)
+#include <mach/ppc64/task.h>
+#elif defined(__arm__)
+#include <mach/arm/task.h>
+#else
+#error unknown architecture
+#endif 
diff --git a/i386/include/mach/task_access.defs b/i386/include/mach/task_access.defs
new file mode 100644
index 0000000..1696fd3
--- /dev/null
+++ b/i386/include/mach/task_access.defs
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+subsystem
+#if	KERNEL_USER
+		KernelUser
+#endif	/* KERN_USER */
+			task_access 27000;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+/*
+ *	Verify task_for_pid access for the given pid
+ *	Access granted by return value (success/failure)
+ */
+routine check_task_access(
+		task_access_port			: mach_port_t;
+		calling_pid				: int32_t;
+		calling_gid				: uint32_t;
+		target_pid				: int32_t;
+		ServerAuditToken	caller_cred 	: audit_token_t);
+
+/*
+ *	Search for a code signature for unsigned executables
+ */
+routine find_code_signature(
+		task_access_port			: mach_port_t;
+		new_pid					: int32_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/task_info.h b/i386/include/mach/task_info.h
new file mode 100644
index 0000000..cab9c17
--- /dev/null
+++ b/i386/include/mach/task_info.h
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ *	Machine-independent task information structures and definitions.
+ *
+ *	The definitions in this file are exported to the user.  The kernel
+ *	will translate its internal data structures to these structures
+ *	as appropriate.
+ *
+ */
+
+#ifndef	_MACH_TASK_INFO_H_
+#define	_MACH_TASK_INFO_H_
+
+#include <mach/message.h>
+#include <mach/machine/vm_types.h>
+#include <mach/time_value.h>
+#include <mach/policy.h>
+
+#include <sys/cdefs.h>
+
+/*
+ *	Generic information structure to allow for expansion.
+ */
+typedef	natural_t	task_flavor_t;
+typedef	integer_t	*task_info_t;		/* varying array of int */
+
+#define	TASK_INFO_MAX	(1024)		/* maximum array size */
+typedef	integer_t	task_info_data_t[TASK_INFO_MAX];
+
+/*
+ *	Currently defined information structures.
+ */
+
+#pragma pack(4)
+
+#define TASK_BASIC_INFO_32      4       /* basic information */
+#define TASK_BASIC2_INFO_32      6
+
+struct task_basic_info_32 {
+        integer_t       suspend_count;  /* suspend count for task */
+        natural_t       virtual_size;   /* virtual memory size (bytes) */
+        natural_t       resident_size;  /* resident memory size (bytes) */
+        time_value_t    user_time;      /* total user run time for
+                                           terminated threads */
+        time_value_t    system_time;    /* total system run time for
+                                           terminated threads */
+	policy_t	policy;		/* default policy for new threads */
+};
+typedef struct task_basic_info_32       task_basic_info_32_data_t;
+typedef struct task_basic_info_32       *task_basic_info_32_t;
+#define TASK_BASIC_INFO_32_COUNT   \
+                (sizeof(task_basic_info_32_data_t) / sizeof(natural_t))
+
+
+#define TASK_BASIC_INFO_64      5       /* 64-bit capable basic info */
+
+struct task_basic_info_64 {
+        integer_t       suspend_count;  /* suspend count for task */
+        mach_vm_size_t  virtual_size;   /* virtual memory size (bytes) */
+        mach_vm_size_t  resident_size;  /* resident memory size (bytes) */
+        time_value_t    user_time;      /* total user run time for
+                                           terminated threads */
+        time_value_t    system_time;    /* total system run time for
+                                           terminated threads */
+	policy_t	policy;		/* default policy for new threads */
+};
+typedef struct task_basic_info_64       task_basic_info_64_data_t;
+typedef struct task_basic_info_64       *task_basic_info_64_t;
+#define TASK_BASIC_INFO_64_COUNT   \
+                (sizeof(task_basic_info_64_data_t) / sizeof(natural_t))
+
+
+/* localized structure - cannot be safely passed between tasks of differing sizes */
+
+struct task_basic_info {
+        integer_t       suspend_count;  /* suspend count for task */
+        vm_size_t       virtual_size;   /* virtual memory size (bytes) */
+        vm_size_t       resident_size;  /* resident memory size (bytes) */
+        time_value_t    user_time;      /* total user run time for
+                                           terminated threads */
+        time_value_t    system_time;    /* total system run time for
+                                           terminated threads */
+	policy_t	policy;		/* default policy for new threads */
+};
+
+typedef struct task_basic_info          task_basic_info_data_t;
+typedef struct task_basic_info          *task_basic_info_t;
+#define TASK_BASIC_INFO_COUNT   \
+                (sizeof(task_basic_info_data_t) / sizeof(natural_t))
+#if !defined(__LP64__)
+#define TASK_BASIC_INFO TASK_BASIC_INFO_32
+#else
+#define TASK_BASIC_INFO TASK_BASIC_INFO_64
+#endif
+
+
+
+#define	TASK_EVENTS_INFO	2	/* various event counts */
+
+struct task_events_info {
+	integer_t	faults;		/* number of page faults */
+	integer_t 	pageins;	/* number of actual pageins */
+	integer_t 	cow_faults;	/* number of copy-on-write faults */
+	integer_t 	messages_sent;	/* number of messages sent */
+	integer_t 	messages_received; /* number of messages received */
+        integer_t 	syscalls_mach;  /* number of mach system calls */
+	integer_t 	syscalls_unix;  /* number of unix system calls */
+	integer_t 	csw;            /* number of context switches */
+};
+typedef struct task_events_info		task_events_info_data_t;
+typedef struct task_events_info		*task_events_info_t;
+#define	TASK_EVENTS_INFO_COUNT		((mach_msg_type_number_t) \
+		(sizeof(task_events_info_data_t) / sizeof(natural_t)))
+
+#define	TASK_THREAD_TIMES_INFO	3	/* total times for live threads -
+					   only accurate if suspended */
+
+struct task_thread_times_info {
+	time_value_t	user_time;	/* total user run time for
+					   live threads */
+	time_value_t	system_time;	/* total system run time for
+					   live threads */
+};
+
+typedef struct task_thread_times_info	task_thread_times_info_data_t;
+typedef struct task_thread_times_info	*task_thread_times_info_t;
+#define	TASK_THREAD_TIMES_INFO_COUNT	((mach_msg_type_number_t) \
+		(sizeof(task_thread_times_info_data_t) / sizeof(natural_t)))
+
+#define TASK_ABSOLUTETIME_INFO	1
+
+struct task_absolutetime_info {
+	uint64_t		total_user;		/* total time */
+	uint64_t		total_system;
+	uint64_t		threads_user;	/* existing threads only */
+	uint64_t		threads_system;
+};
+
+typedef struct task_absolutetime_info	task_absolutetime_info_data_t;
+typedef struct task_absolutetime_info	*task_absolutetime_info_t;
+#define TASK_ABSOLUTETIME_INFO_COUNT	((mach_msg_type_number_t) \
+		(sizeof (task_absolutetime_info_data_t) / sizeof (natural_t)))
+
+#define TASK_SECURITY_TOKEN		13
+#define TASK_SECURITY_TOKEN_COUNT	((mach_msg_type_number_t) \
+		(sizeof(security_token_t) / sizeof(natural_t)))
+
+#define TASK_AUDIT_TOKEN		15
+#define TASK_AUDIT_TOKEN_COUNT	\
+		(sizeof(audit_token_t) / sizeof(natural_t))
+
+
+#define TASK_AFFINITY_TAG_INFO		16 	/* This is experimental. */
+
+struct task_affinity_tag_info {
+	integer_t		set_count;
+	integer_t		min;
+	integer_t		max;
+	integer_t		task_count;
+};
+typedef struct task_affinity_tag_info	task_affinity_tag_info_data_t;
+typedef struct task_affinity_tag_info	*task_affinity_tag_info_t;
+#define TASK_AFFINITY_TAG_INFO_COUNT	\
+		(sizeof(task_affinity_tag_info_data_t) / sizeof(natural_t))
+
+#define TASK_DYLD_INFO			17	/* This is experimental. */
+
+struct task_dyld_info {
+	mach_vm_address_t	all_image_info_addr;
+	mach_vm_size_t		all_image_info_size;
+};
+typedef struct task_dyld_info	task_dyld_info_data_t;
+typedef struct task_dyld_info	*task_dyld_info_t;
+#define TASK_DYLD_INFO_COUNT	\
+    		(sizeof(task_dyld_info_data_t) / sizeof(natural_t))
+
+#pragma pack()
+
+
+/*
+ * Obsolete interfaces.
+ */
+
+#define TASK_SCHED_TIMESHARE_INFO	10
+#define TASK_SCHED_RR_INFO		11
+#define TASK_SCHED_FIFO_INFO		12
+
+#define TASK_SCHED_INFO			14
+
+#endif	/* _MACH_TASK_INFO_H_ */
diff --git a/i386/include/mach/task_ledger.h b/i386/include/mach/task_ledger.h
new file mode 100644
index 0000000..5d4bc25
--- /dev/null
+++ b/i386/include/mach/task_ledger.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+
+#ifndef _MACH_TASK_LEDGER_H_
+#define _MACH_TASK_LEDGER_H_
+
+/*
+ * Evolving and likely to change.
+ */
+
+/*
+ * Definitions for task ledger line items
+ */
+#define ITEM_THREADS		0	/* number of threads	*/
+#define ITEM_TASKS		1	/* number of tasks	*/
+
+#define ITEM_VM	   		2	/* virtual space (bytes)*/
+
+#define LEDGER_N_ITEMS		3	/* Total line items	*/
+
+#define LEDGER_UNLIMITED	0	/* ignored item.maximum	*/
+
+#endif  /* _MACH_TASK_LEDGER_H_ */
diff --git a/i386/include/mach/task_policy.h b/i386/include/mach/task_policy.h
new file mode 100644
index 0000000..3a2fb39
--- /dev/null
+++ b/i386/include/mach/task_policy.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_TASK_POLICY_H_
+#define _MACH_TASK_POLICY_H_
+
+#include <mach/mach_types.h>
+
+/*
+ * These are the calls for accessing the policy parameters
+ * of a particular task.
+ *
+ * The extra 'get_default' parameter to the second call is
+ * IN/OUT as follows:
+ * 1) if asserted on the way in it indicates that the default
+ * values should be returned, not the ones currently set, in
+ * this case 'get_default' will always be asserted on return;
+ * 2) if unasserted on the way in, the current settings are
+ * desired and if still unasserted on return, then the info
+ * returned reflects the current settings, otherwise if
+ * 'get_default' returns asserted, it means that there are no
+ * current settings due to other parameters taking precedence,
+ * and the default ones are being returned instead.
+ */
+
+typedef natural_t	task_policy_flavor_t;
+typedef integer_t	*task_policy_t;
+
+/*
+kern_return_t	task_policy_set(
+					task_t					task,
+					task_policy_flavor_t	flavor,
+					task_policy_t			policy_info,
+					mach_msg_type_number_t	count);
+
+kern_return_t	task_policy_get(
+					task_t					task,
+					task_policy_flavor_t	flavor,
+					task_policy_t			policy_info,
+					mach_msg_type_number_t	*count,
+					boolean_t				*get_default);
+*/
+
+/*
+ * Defined flavors.
+ */
+/*
+ * TASK_CATEGORY_POLICY:
+ *
+ * This provides information to the kernel about the role
+ * of the task in the system.
+ *
+ * Parameters:
+ *
+ * role: Enumerated as follows:
+ *
+ * TASK_UNSPECIFIED is the default, since the role is not
+ * inherited from the parent.
+ *
+ * TASK_FOREGROUND_APPLICATION should be assigned when the
+ * task is a normal UI application in the foreground from
+ * the HI point of view.
+ * **N.B. There may be more than one of these at a given time.
+ *
+ * TASK_BACKGROUND_APPLICATION should be assigned when the
+ * task is a normal UI application in the background from
+ * the HI point of view.
+ *
+ * TASK_CONTROL_APPLICATION should be assigned to the unique
+ * UI application which implements the pop-up application dialog.
+ * There can only be one task at a time with this designation,
+ * which is assigned FCFS.
+ *
+ * TASK_GRAPHICS_SERVER should be assigned to the graphics
+ * management (window) server.  There can only be one task at
+ * a time with this designation, which is assigned FCFS.
+ */
+
+#define TASK_CATEGORY_POLICY		1
+
+enum task_role {
+	TASK_RENICED = -1,
+	TASK_UNSPECIFIED = 0,
+	TASK_FOREGROUND_APPLICATION,
+	TASK_BACKGROUND_APPLICATION,
+	TASK_CONTROL_APPLICATION,
+	TASK_GRAPHICS_SERVER,
+	TASK_THROTTLE_APPLICATION,
+	TASK_DEFAULT_APPLICATION
+};
+
+typedef enum task_role		task_role_t;
+
+struct task_category_policy {
+	task_role_t		role;
+};
+
+typedef struct task_category_policy		task_category_policy_data_t;
+typedef struct task_category_policy		*task_category_policy_t;
+
+#define TASK_CATEGORY_POLICY_COUNT	((mach_msg_type_number_t) \
+	(sizeof (task_category_policy_data_t) / sizeof (integer_t)))
+
+#endif	/* _MACH_TASK_POLICY_H_ */
diff --git a/i386/include/mach/task_special_ports.h b/i386/include/mach/task_special_ports.h
new file mode 100644
index 0000000..ec980cf
--- /dev/null
+++ b/i386/include/mach/task_special_ports.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/task_special_ports.h
+ *
+ *	Defines codes for special_purpose task ports.  These are NOT
+ *	port identifiers - they are only used for the task_get_special_port
+ *	and task_set_special_port routines.
+ *	
+ */
+
+#ifndef	_MACH_TASK_SPECIAL_PORTS_H_
+#define _MACH_TASK_SPECIAL_PORTS_H_
+
+typedef	int	task_special_port_t;
+
+#define TASK_KERNEL_PORT	1	/* Represents task to the outside
+					   world.*/
+
+#define TASK_HOST_PORT		2	/* The host (priv) port for task.  */
+
+#define TASK_NAME_PORT		3	/* the name (unpriv) port for task */
+
+#define TASK_BOOTSTRAP_PORT	4	/* Bootstrap environment for task. */
+
+/*
+ * Evolving and likely to change.
+ */
+
+#define TASK_WIRED_LEDGER_PORT	5	/* Wired resource ledger for task. */
+
+#define TASK_PAGED_LEDGER_PORT	6	/* Paged resource ledger for task. */
+
+#define TASK_SEATBELT_PORT	7	/* Seatbelt compiler/DEM port for task. */
+
+#define TASK_GSSD_PORT		8	/* GSSD port for security context */
+
+#define TASK_ACCESS_PORT	9	/* Permission check for task_for_pid. */
+
+#define task_get_wired_ledger_port(task, port)	\
+		(task_get_special_port((task), TASK_WIRED_LEDGER_PORT, (port)))
+
+#define task_set_wired_ledger_port(task, port)	\
+		(task_set_special_port((task), TASK_WIRED_LEDGER_PORT, (port)))
+
+#define task_get_paged_ledger_port(task, port)	\
+		(task_get_special_port((task), TASK_PAGED_LEDGER_PORT, (port)))
+
+#define task_set_paged_ledger_port(task, port)	\
+		(task_set_special_port((task), TASK_PAGED_LEDGER_PORT, (port)))
+
+/*
+ *	Definitions for ease of use
+ */
+
+#define task_get_kernel_port(task, port)	\
+		(task_get_special_port((task), TASK_KERNEL_PORT, (port)))
+
+#define task_set_kernel_port(task, port)	\
+		(task_set_special_port((task), TASK_KERNEL_PORT, (port)))
+
+#define task_get_host_port(task, port)		\
+		(task_get_special_port((task), TASK_HOST_PORT, (port)))
+
+#define task_set_host_port(task, port)	\
+		(task_set_special_port((task), TASK_HOST_PORT, (port)))
+
+#define task_get_bootstrap_port(task, port)	\
+		(task_get_special_port((task), TASK_BOOTSTRAP_PORT, (port)))
+
+#define task_set_bootstrap_port(task, port)	\
+		(task_set_special_port((task), TASK_BOOTSTRAP_PORT, (port)))
+
+#define task_get_gssd_port(task, port)	\
+		(task_get_special_port((task), TASK_GSSD_PORT, (port)))
+
+#define task_set_gssd_port(task, port)	\
+		(task_set_special_port((task), TASK_GSSD_PORT, (port)))
+
+#define task_get_task_access_port(task, port)	\
+		(task_get_special_port((task), TASK_ACCESS_PORT, (port)))
+
+#define task_set_task_access_port(task, port)	\
+		(task_set_special_port((task), TASK_ACCESS_PORT, (port)))
+
+#endif	/* _MACH_TASK_SPECIAL_PORTS_H_ */
diff --git a/i386/include/mach/thread_act.defs b/i386/include/mach/thread_act.defs
new file mode 100644
index 0000000..47a21a9
--- /dev/null
+++ b/i386/include/mach/thread_act.defs
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_FREE_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/mach_port.defs
+ *	Author:	Rich Draves
+ *
+ *	Exported kernel calls.
+ */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+	  thread_act 3600;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+
+/*
+ *	Destroy the target thread.
+ *
+ *	JMM - For legacy reasons this consumes a reference to the
+ *	target thread.  This will have to change in the future because
+ *	we want the interfaces to be able to be defined in more standard
+ *	IDLs and transports, and most of them do not support the notion
+ *	of reference ownership transfers (just sharing).
+ */
+routine thread_terminate(
+		target_act	: thread_act_consume_ref_t); 
+
+
+/*
+ *	Return the selected state information for the target
+ *	thr_act.  If the thr_act is currently executing, the results
+ *	may be stale.  [Flavor THREAD_STATE_FLAVOR_LIST provides a
+ *	list of valid flavors for the target thread.]
+ */
+routine act_get_state(
+		target_act	: thread_act_t;
+		flavor		: int;
+	out	old_state	: thread_state_t, CountInOut);
+
+/*
+ *	Set the selected state information for the target thread.
+ *	If the thread is currently executing, the state change
+ *	may be ill-defined.
+ */
+routine	act_set_state(
+		target_act	: thread_act_t;
+		flavor		: int;
+		new_state	: thread_state_t);
+
+/*
+ * Backward compatible old-style thread routines.
+ * These have different semantics than the new activation versions.
+ *
+ *	Return the selected state information for the target
+ *	thread.  If the thread is currently executing, the results
+ *	may be stale.  [Flavor THREAD_STATE_FLAVOR_LIST provides a
+ *	list of valid flavors for the target thr_act.]
+ */
+routine thread_get_state(
+		target_act	: thread_act_t;
+		flavor		: thread_state_flavor_t;
+	out	old_state	: thread_state_t, CountInOut);
+
+/*
+ *	Set the selected state information for the target thread.
+ *	If the thread is currently executing, the state change
+ *	may be ill-defined.
+ */
+routine	thread_set_state(
+		target_act	: thread_act_t;
+		flavor		: thread_state_flavor_t;
+		new_state	: thread_state_t);
+
+/*
+ *	Increment the suspend count for the target thread.
+ *	Once this call has completed, the thread will not
+ *	execute any further user or meta- instructions.
+ *	Once suspended, a thread may not execute again until
+ *	its suspend count is zero, and the suspend count
+ *	for its task is also zero.
+ */
+routine	thread_suspend(
+		target_act	: thread_act_t);
+
+/*
+ *	Decrement the suspend count for the target thread,
+ *	if that count is not already zero.
+ */
+routine	thread_resume(
+		target_act	: thread_act_t);
+
+/*
+ *	Cause any user or meta- instructions currently being
+ *	executed by the target thread to be aborted.  [Meta-
+ *	instructions consist of the basic traps for IPC
+ *	(e.g., msg_send, msg_receive) and self-identification
+ *	(e.g., task_self, thread_self, thread_reply).  Calls
+ *	described by MiG interfaces are not meta-instructions
+ *	themselves.]
+ */
+routine thread_abort(
+		target_act	: thread_act_t);
+
+/*
+ *	Cause any user or meta- instructions currently being
+ *	executed by the target thread to be aborted so that
+ *	they are transparently restartable.  This call fails
+ *	if the abort would result in a non-restartable condition.
+ *	Retry is the caller's responsibility.  [Meta-
+ *	instructions consist of the basic traps for IPC
+ *	(e.g., msg_send, msg_receive) and self-identification
+ *	(e.g., task_self, thread_self, thread_reply).  Calls
+ *	described by MiG interfaces are not meta-instructions
+ *	themselves.]
+ */
+routine thread_abort_safely(
+		target_act	: thread_act_t);
+
+
+routine thread_depress_abort(
+		thread		: thread_act_t);
+
+
+/*
+ *	Returns the current value of the selected special port
+ *	associated with the target thread.
+ */
+routine thread_get_special_port(
+		thr_act		: thread_act_t;
+		which_port	: int;
+	out	special_port	: mach_port_t);
+
+/*
+ *	Set one of the special ports associated with the
+ *	target thread.
+ */
+routine thread_set_special_port(
+		thr_act		: thread_act_t;
+		which_port	: int;
+		special_port	: mach_port_t);
+
+/*
+ *      Returns information about the target thread.
+ */
+routine thread_info(
+                target_act      : thread_act_t;
+                flavor          : thread_flavor_t;
+        out     thread_info_out : thread_info_t, CountInOut);
+
+/*
+ * Set an exception handler for a thread on one or more exception types
+ */
+routine		thread_set_exception_ports(
+			thread		: thread_act_t;
+			exception_mask	: exception_mask_t;
+			new_port	: mach_port_t;
+			behavior	: exception_behavior_t;
+			new_flavor	: thread_state_flavor_t);
+
+/*
+ * Lookup some of the old exception handlers for a thread
+ */
+routine		thread_get_exception_ports(
+			thread		: thread_act_t;
+			exception_mask	: exception_mask_t;
+		  out	masks		: exception_mask_array_t;
+		  out	old_handlers	: exception_handler_array_t, SameCount;
+		  out	old_behaviors	: exception_behavior_array_t, SameCount;
+		  out	old_flavors	: exception_flavor_array_t, SameCount);
+
+/*
+ * Set an exception handler for a thread on one or more exception types.
+ * At the same time, return the previously defined exception handlers for
+ * those types.
+ */
+routine		thread_swap_exception_ports(
+			thread		: thread_act_t;
+			exception_mask	: exception_mask_t;
+			new_port	: mach_port_t;
+			behavior	: exception_behavior_t;
+			new_flavor	: thread_state_flavor_t;
+		  out	masks		: exception_mask_array_t;
+		  out	old_handlers	: exception_handler_array_t, SameCount;
+		  out	old_behaviors	: exception_behavior_array_t, SameCount;
+		  out	old_flavors	: exception_flavor_array_t, SameCount);
+
+/*
+ * OBSOLETE interface.
+ */
+routine thread_policy(
+	thr_act			: thread_act_t;
+	policy			: policy_t;
+	base			: policy_base_t;
+	set_limit		: boolean_t);
+
+/*
+ * Set/get policy information for a thread.
+ * (Approved Mac OS X microkernel interface)
+ */
+
+routine thread_policy_set(
+	thread			: thread_act_t;
+	flavor			: thread_policy_flavor_t;
+	policy_info		: thread_policy_t);
+
+routine thread_policy_get(
+	thread			: thread_act_t;
+	flavor			: thread_policy_flavor_t;
+out	policy_info		: thread_policy_t, CountInOut;
+inout	get_default		: boolean_t);
+
+/*
+ *	Removed from the kernel.
+ */
+#if KERNEL_SERVER
+skip;
+#else
+routine thread_sample(
+		thread		: thread_act_t;
+		reply		: mach_port_make_send_t);
+#endif
+
+/*
+ *	ETAP has been removed from the kernel.
+ */
+#if KERNEL_SERVER
+skip;
+#else
+routine	etap_trace_thread(
+		target_act	: thread_act_t;
+		trace_status	: boolean_t);
+#endif
+
+/*
+ *	Assign thread to processor set.
+ */
+routine	thread_assign(
+		thread		: thread_act_t;
+		new_set		: processor_set_t);
+
+/*
+ *	Assign thread to default set.
+ */
+routine thread_assign_default(
+		thread		: thread_act_t);
+
+/*
+ *	Get current assignment for thread.
+ */
+routine thread_get_assignment(
+		thread		: thread_act_t;
+	out	assigned_set	: processor_set_name_t);
+
+
+/*
+ * OBSOLETE interface.
+ */
+routine thread_set_policy(
+	thr_act			: thread_act_t;
+	pset			: processor_set_t;
+	policy			: policy_t;
+	base			: policy_base_t;
+	limit			: policy_limit_t);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/thread_act.h b/i386/include/mach/thread_act.h
new file mode 100644
index 0000000..ac2309b
--- /dev/null
+++ b/i386/include/mach/thread_act.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#if defined(__i386__)
+#include <mach/i386/thread_act.h>
+#elif defined(__x86_64__)
+#include <mach/x86_64/thread_act.h>
+#elif defined(__ppc__)
+#include <mach/ppc/thread_act.h>
+#elif defined(__ppc64__)
+#include <mach/ppc64/thread_act.h>
+#elif defined(__arm__)
+#include <mach/arm/thread_act.h>
+#else
+#error unknown architecture
+#endif 
diff --git a/i386/include/mach/thread_info.h b/i386/include/mach/thread_info.h
new file mode 100644
index 0000000..5f51aea
--- /dev/null
+++ b/i386/include/mach/thread_info.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/thread_info
+ *
+ *	Thread information structure and definitions.
+ *
+ *	The defintions in this file are exported to the user.  The kernel
+ *	will translate its internal data structures to these structures
+ *	as appropriate.
+ *
+ */
+
+#ifndef	_MACH_THREAD_INFO_H_
+#define _MACH_THREAD_INFO_H_
+
+#include <mach/boolean.h>
+#include <mach/policy.h>
+#include <mach/time_value.h>
+#include <mach/message.h>
+#include <mach/machine/vm_types.h>
+
+/*
+ *	Generic information structure to allow for expansion.
+ */
+typedef	natural_t	thread_flavor_t;
+typedef	integer_t	*thread_info_t;		/* varying array of int */
+
+#define THREAD_INFO_MAX		(1024)	/* maximum array size */
+typedef	integer_t	thread_info_data_t[THREAD_INFO_MAX];
+
+/*
+ *	Currently defined information.
+ */
+#define THREAD_BASIC_INFO         	3     /* basic information */
+
+struct thread_basic_info {
+        time_value_t    user_time;      /* user run time */
+        time_value_t    system_time;    /* system run time */
+        integer_t       cpu_usage;      /* scaled cpu usage percentage */
+	policy_t	policy;		/* scheduling policy in effect */
+        integer_t       run_state;      /* run state (see below) */
+        integer_t       flags;          /* various flags (see below) */
+        integer_t       suspend_count;  /* suspend count for thread */
+        integer_t       sleep_time;     /* number of seconds that thread
+                                           has been sleeping */
+};
+
+typedef struct thread_basic_info  thread_basic_info_data_t;
+typedef struct thread_basic_info  *thread_basic_info_t;
+#define THREAD_BASIC_INFO_COUNT   ((mach_msg_type_number_t) \
+                (sizeof(thread_basic_info_data_t) / sizeof(natural_t)))
+
+#define THREAD_IDENTIFIER_INFO		4     /* thread id and other information */
+
+struct thread_identifier_info {
+	uint64_t	thread_id;	/* system-wide unique 64-bit thread id */
+	uint64_t	thread_handle;	/* handle to be used by libproc */
+	uint64_t	dispatch_qaddr;	/* libdispatch queue address */
+};
+
+typedef struct thread_identifier_info  thread_identifier_info_data_t;
+typedef struct thread_identifier_info  *thread_identifier_info_t;
+#define THREAD_IDENTIFIER_INFO_COUNT   ((mach_msg_type_number_t) \
+                (sizeof(thread_identifier_info_data_t) / sizeof(natural_t)))
+
+/*
+ *	Scale factor for usage field.
+ */
+
+#define TH_USAGE_SCALE	1000
+
+/*
+ *	Thread run states (state field).
+ */
+
+#define TH_STATE_RUNNING	1	/* thread is running normally */
+#define TH_STATE_STOPPED	2	/* thread is stopped */
+#define TH_STATE_WAITING	3	/* thread is waiting normally */
+#define TH_STATE_UNINTERRUPTIBLE 4	/* thread is in an uninterruptible
+					   wait */
+#define TH_STATE_HALTED		5	/* thread is halted at a
+					   clean point */
+
+/*
+ *	Thread flags (flags field).
+ */
+#define TH_FLAGS_SWAPPED	0x1	/* thread is swapped out */
+#define TH_FLAGS_IDLE		0x2	/* thread is an idle thread */
+
+/*
+ * Obsolete interfaces.
+ */
+
+#define THREAD_SCHED_TIMESHARE_INFO	10
+#define THREAD_SCHED_RR_INFO		11
+#define THREAD_SCHED_FIFO_INFO		12
+
+#endif	/* _MACH_THREAD_INFO_H_ */
diff --git a/i386/include/mach/thread_policy.h b/i386/include/mach/thread_policy.h
new file mode 100644
index 0000000..d9530b7
--- /dev/null
+++ b/i386/include/mach/thread_policy.h
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _MACH_THREAD_POLICY_H_
+#define _MACH_THREAD_POLICY_H_
+
+#include <mach/mach_types.h>
+
+/*
+ * These are the calls for accessing the policy parameters
+ * of a particular thread.
+ *
+ * The extra 'get_default' parameter to the second call is
+ * IN/OUT as follows:
+ * 1) if asserted on the way in it indicates that the default
+ * values should be returned, not the ones currently set, in
+ * this case 'get_default' will always be asserted on return;
+ * 2) if unasserted on the way in, the current settings are
+ * desired and if still unasserted on return, then the info
+ * returned reflects the current settings, otherwise if
+ * 'get_default' returns asserted, it means that there are no
+ * current settings due to other parameters taking precedence,
+ * and the default ones are being returned instead.
+ */
+
+typedef natural_t	thread_policy_flavor_t;
+typedef integer_t	*thread_policy_t;
+
+/*
+kern_return_t	thread_policy_set(
+					thread_t					thread,
+					thread_policy_flavor_t		flavor,
+					thread_policy_t				policy_info,
+					mach_msg_type_number_t		count);
+
+kern_return_t	thread_policy_get(
+					thread_t					thread,
+					thread_policy_flavor_t		flavor,
+					thread_policy_t				policy_info,
+					mach_msg_type_number_t		*count,
+					boolean_t					*get_default);
+*/
+
+/*
+ * Defined flavors.
+ */
+/*
+ * THREAD_STANDARD_POLICY:
+ *
+ * This is the standard (fair) scheduling mode, assigned to new
+ * threads.  The thread will be given processor time in a manner
+ * which apportions approximately equal share to long running
+ * computations.
+ *
+ * Parameters:
+ *	[none]
+ */
+
+#define THREAD_STANDARD_POLICY			1
+
+struct thread_standard_policy {
+	natural_t		no_data;
+};
+
+typedef struct thread_standard_policy	thread_standard_policy_data_t;
+typedef struct thread_standard_policy	*thread_standard_policy_t;
+
+#define THREAD_STANDARD_POLICY_COUNT	0
+
+/*
+ * THREAD_EXTENDED_POLICY:
+ *
+ * Extended form of THREAD_STANDARD_POLICY, which supplies a
+ * hint indicating whether this is a long running computation.
+ *
+ * Parameters:
+ *
+ * timeshare: TRUE (the default) results in identical scheduling
+ * behavior as THREAD_STANDARD_POLICY.
+ */
+
+#define THREAD_EXTENDED_POLICY			1
+
+struct thread_extended_policy {
+	boolean_t		timeshare;
+};
+
+typedef struct thread_extended_policy	thread_extended_policy_data_t;
+typedef struct thread_extended_policy	*thread_extended_policy_t;
+
+#define THREAD_EXTENDED_POLICY_COUNT	((mach_msg_type_number_t) \
+	(sizeof (thread_extended_policy_data_t) / sizeof (integer_t)))
+
+/*
+ * THREAD_TIME_CONSTRAINT_POLICY:
+ *
+ * This scheduling mode is for threads which have real time
+ * constraints on their execution.
+ *
+ * Parameters:
+ *
+ * period: This is the nominal amount of time between separate
+ * processing arrivals, specified in absolute time units.  A
+ * value of 0 indicates that there is no inherent periodicity in
+ * the computation.
+ *
+ * computation: This is the nominal amount of computation
+ * time needed during a separate processing arrival, specified
+ * in absolute time units.
+ *
+ * constraint: This is the maximum amount of real time that
+ * may elapse from the start of a separate processing arrival
+ * to the end of computation for logically correct functioning,
+ * specified in absolute time units.  Must be (>= computation).
+ * Note that latency = (constraint - computation).
+ *
+ * preemptible: This indicates that the computation may be
+ * interrupted, subject to the constraint specified above.
+ */
+
+#define THREAD_TIME_CONSTRAINT_POLICY	2
+
+struct thread_time_constraint_policy {
+	uint32_t		period;
+	uint32_t		computation;
+	uint32_t		constraint;
+	boolean_t		preemptible;
+};
+
+typedef struct thread_time_constraint_policy	\
+									thread_time_constraint_policy_data_t;
+typedef struct thread_time_constraint_policy	\
+									*thread_time_constraint_policy_t;
+
+#define THREAD_TIME_CONSTRAINT_POLICY_COUNT	((mach_msg_type_number_t) \
+	(sizeof (thread_time_constraint_policy_data_t) / sizeof (integer_t)))
+
+/*
+ * THREAD_PRECEDENCE_POLICY:
+ *
+ * This may be used to indicate the relative value of the
+ * computation compared to the other threads in the task.
+ *
+ * Parameters:
+ *
+ * importance: The importance is specified as a signed value.
+ */
+
+#define THREAD_PRECEDENCE_POLICY		3
+
+struct thread_precedence_policy {
+	integer_t		importance;
+};
+
+typedef struct thread_precedence_policy		thread_precedence_policy_data_t;
+typedef struct thread_precedence_policy		*thread_precedence_policy_t;
+
+#define THREAD_PRECEDENCE_POLICY_COUNT	((mach_msg_type_number_t) \
+	(sizeof (thread_precedence_policy_data_t) / sizeof (integer_t)))
+
+/*
+ * THREAD_AFFINITY_POLICY:
+ *
+ * This policy is experimental.
+ * This may be used to express affinity relationships 
+ * between threads in the task. Threads with the same affinity tag will
+ * be scheduled to share an L2 cache if possible. That is, affinity tags
+ * are a hint to the scheduler for thread placement. 
+ *
+ * The namespace of affinity tags is generally local to one task. However,
+ * a child task created after the assignment of affinity tags by its parent
+ * will share that namespace. In particular, a family of forked processes
+ * may be created with a shared affinity namespace.
+ *
+ * Parameters:
+ * tag: The affinity set identifier.
+ */
+
+#define THREAD_AFFINITY_POLICY		4
+
+struct thread_affinity_policy {
+	integer_t	affinity_tag;
+};
+
+#define THREAD_AFFINITY_TAG_NULL		0
+
+typedef struct thread_affinity_policy		thread_affinity_policy_data_t;
+typedef struct thread_affinity_policy		*thread_affinity_policy_t;
+
+#define THREAD_AFFINITY_POLICY_COUNT	((mach_msg_type_number_t) \
+	(sizeof (thread_affinity_policy_data_t) / sizeof (integer_t)))
+
+#endif	/* _MACH_THREAD_POLICY_H_ */
diff --git a/i386/include/mach/thread_special_ports.h b/i386/include/mach/thread_special_ports.h
new file mode 100644
index 0000000..1d44c02
--- /dev/null
+++ b/i386/include/mach/thread_special_ports.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/thread_special_ports.h
+ *
+ *	Defines codes for special_purpose thread ports.  These are NOT
+ *	port identifiers - they are only used for the thread_get_special_port
+ *	and thread_set_special_port routines.
+ *	
+ */
+
+#ifndef	_MACH_THREAD_SPECIAL_PORTS_H_
+#define _MACH_THREAD_SPECIAL_PORTS_H_
+
+#define THREAD_KERNEL_PORT	1	/* Represents the thread to the outside
+					   world.*/
+
+/*
+ *	Definitions for ease of use
+ */
+
+#define thread_get_kernel_port(thread, port)	\
+		(thread_get_special_port((thread), THREAD_KERNEL_PORT, (port)))
+
+#define thread_set_kernel_port(thread, port)	\
+		(thread_set_special_port((thread), THREAD_KERNEL_PORT, (port)))
+
+#endif	/* _MACH_THREAD_SPECIAL_PORTS_H_ */
diff --git a/i386/include/mach/thread_status.h b/i386/include/mach/thread_status.h
new file mode 100644
index 0000000..aead09b
--- /dev/null
+++ b/i386/include/mach/thread_status.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/*
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/thread_status.h
+ *	Author:	Avadis Tevanian, Jr.
+ *
+ *	This file contains the structure definitions for the user-visible
+ *	thread state.  This thread state is examined with the thread_get_state
+ *	kernel call and may be changed with the thread_set_state kernel call.
+ *
+ */
+
+#ifndef	_MACH_THREAD_STATUS_H_
+#define	_MACH_THREAD_STATUS_H_
+
+/*
+ *	The actual structure that comprises the thread state is defined
+ *	in the machine dependent module.
+ */
+#include <mach/machine/vm_types.h>
+#include <mach/machine/thread_status.h>
+#include <mach/machine/thread_state.h>
+
+/*
+ *	Generic definition for machine-dependent thread status.
+ */
+
+typedef	natural_t	*thread_state_t;	/* Variable-length array */
+
+/* THREAD_STATE_MAX is now defined in <mach/machine/thread_state.h> */
+typedef	natural_t	thread_state_data_t[THREAD_STATE_MAX];
+
+#define	THREAD_STATE_FLAVOR_LIST	0	/* List of valid flavors */
+#define THREAD_STATE_FLAVOR_LIST_NEW	128
+
+typedef	int			thread_state_flavor_t;
+typedef thread_state_flavor_t	*thread_state_flavor_array_t;
+
+#endif	/* _MACH_THREAD_STATUS_H_ */
diff --git a/i386/include/mach/thread_switch.h b/i386/include/mach/thread_switch.h
new file mode 100644
index 0000000..f555894
--- /dev/null
+++ b/i386/include/mach/thread_switch.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+
+#ifndef	_MACH_THREAD_SWITCH_H_
+#define	_MACH_THREAD_SWITCH_H_
+
+#include <mach/mach_types.h>
+#include <mach/kern_return.h>
+#include <mach/message.h>
+#include <mach/mach_traps.h>
+
+/*
+ *	Constant definitions for thread_switch trap.
+ */
+
+#define	SWITCH_OPTION_NONE			0
+#define SWITCH_OPTION_DEPRESS		1
+#define SWITCH_OPTION_WAIT			2
+
+#define valid_switch_option(opt)	(0 <= (opt) && (opt) <= 2)
+
+#endif	/* _MACH_THREAD_SWITCH_H_ */
diff --git a/i386/include/mach/time_value.h b/i386/include/mach/time_value.h
new file mode 100644
index 0000000..e4f912d
--- /dev/null
+++ b/i386/include/mach/time_value.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+
+#ifndef	_MACH_TIME_VALUE_H_
+#define	_MACH_TIME_VALUE_H_
+
+#include <mach/machine/vm_types.h>
+
+/*
+ *	Time value returned by kernel.
+ */
+
+struct time_value {
+	integer_t seconds;
+	integer_t microseconds;
+};
+
+typedef	struct time_value	time_value_t;
+
+/*
+ *	Macros to manipulate time values.  Assume that time values
+ *	are normalized (microseconds <= 999999).
+ */
+#define	TIME_MICROS_MAX	(1000000)
+
+#define	time_value_add_usec(val, micros)	{	\
+	if (((val)->microseconds += (micros))		\
+		>= TIME_MICROS_MAX) {			\
+	    (val)->microseconds -= TIME_MICROS_MAX;	\
+	    (val)->seconds++;				\
+	}						\
+}
+
+#define	time_value_add(result, addend)		{		\
+	(result)->microseconds += (addend)->microseconds;	\
+	(result)->seconds += (addend)->seconds;			\
+	if ((result)->microseconds >= TIME_MICROS_MAX) {	\
+	    (result)->microseconds -= TIME_MICROS_MAX;		\
+	    (result)->seconds++;				\
+	}							\
+}
+
+#endif	/* _MACH_TIME_VALUE_H_ */
diff --git a/i386/include/mach/vm_attributes.h b/i386/include/mach/vm_attributes.h
new file mode 100644
index 0000000..2be3233
--- /dev/null
+++ b/i386/include/mach/vm_attributes.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/vm_attributes.h
+ *	Author:	Alessandro Forin
+ *
+ *	Virtual memory attributes definitions.
+ *
+ *	These definitions are in addition to the machine-independent
+ *	ones (e.g. protection), and are only selectively supported
+ *	on specific machine architectures.
+ *
+ */
+
+#ifndef	_MACH_VM_ATTRIBUTES_H_
+#define	_MACH_VM_ATTRIBUTES_H_
+
+/*
+ *	Types of machine-dependent attributes
+ */
+typedef unsigned int	vm_machine_attribute_t;
+
+#define	MATTR_CACHE		1	/* cachability */
+#define MATTR_MIGRATE		2	/* migrability */
+#define	MATTR_REPLICATE		4	/* replicability */
+
+/*
+ *	Values for the above, e.g. operations on attribute
+ */
+typedef int		vm_machine_attribute_val_t;
+
+#define MATTR_VAL_OFF		0	/* (generic) turn attribute off */
+#define MATTR_VAL_ON		1	/* (generic) turn attribute on */
+#define MATTR_VAL_GET		2	/* (generic) return current value */
+
+#define MATTR_VAL_CACHE_FLUSH	6	/* flush from all caches */
+#define MATTR_VAL_DCACHE_FLUSH	7	/* flush from data caches */
+#define MATTR_VAL_ICACHE_FLUSH	8	/* flush from instruction caches */
+#define MATTR_VAL_CACHE_SYNC	9	/* sync I+D caches */
+#define MATTR_VAL_CACHE_SYNC	9	/* sync I+D caches */
+
+#define MATTR_VAL_GET_INFO	10	/* get page info (stats) */
+
+#endif	/* _MACH_VM_ATTRIBUTES_H_ */
diff --git a/i386/include/mach/vm_behavior.h b/i386/include/mach/vm_behavior.h
new file mode 100644
index 0000000..ec0ee72
--- /dev/null
+++ b/i386/include/mach/vm_behavior.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/*
+ *	File:	mach/vm_behavior.h
+ *
+ *	Virtual memory map behavior definitions.
+ *
+ */
+
+#ifndef	_MACH_VM_BEHAVIOR_H_
+#define _MACH_VM_BEHAVIOR_H_
+
+/*
+ *	Types defined:
+ *
+ *	vm_behavior_t	behavior codes.
+ */
+
+typedef int		vm_behavior_t;
+
+/*
+ *	Enumeration of valid values for vm_behavior_t.
+ *	These describe expected page reference behavior for 
+ *	for a given range of virtual memory.  For implementation 
+ *	details see vm/vm_fault.c
+ */
+
+
+/*
+ * The following behaviors affect the memory region's future behavior
+ * and are stored in the VM map entry data structure.
+ */
+#define VM_BEHAVIOR_DEFAULT	((vm_behavior_t) 0)	/* default */
+#define VM_BEHAVIOR_RANDOM	((vm_behavior_t) 1)	/* random */
+#define VM_BEHAVIOR_SEQUENTIAL	((vm_behavior_t) 2)	/* forward sequential */
+#define VM_BEHAVIOR_RSEQNTL	((vm_behavior_t) 3)	/* reverse sequential */
+
+/*
+ * The following "behaviors" affect the memory region only at the time of the
+ * call and are not stored in the VM map entry.
+ */
+#define VM_BEHAVIOR_WILLNEED	((vm_behavior_t) 4)	/* will need in near future */
+#define VM_BEHAVIOR_DONTNEED	((vm_behavior_t) 5)	/* dont need in near future */
+#define VM_BEHAVIOR_FREE	((vm_behavior_t) 6)	/* free memory without write-back */
+#define VM_BEHAVIOR_ZERO_WIRED_PAGES	((vm_behavior_t) 7)	/* zero out the wired pages of an entry if it is being deleted without unwiring them first */
+#define VM_BEHAVIOR_REUSABLE	((vm_behavior_t) 8)
+#define VM_BEHAVIOR_REUSE	((vm_behavior_t) 9)
+#define VM_BEHAVIOR_CAN_REUSE	((vm_behavior_t) 10)
+
+#endif	/*_MACH_VM_BEHAVIOR_H_*/
diff --git a/i386/include/mach/vm_inherit.h b/i386/include/mach/vm_inherit.h
new file mode 100644
index 0000000..d6440e4
--- /dev/null
+++ b/i386/include/mach/vm_inherit.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/vm_inherit.h
+ *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
+ *
+ *	Virtual memory map inheritance definitions.
+ *
+ */
+
+#ifndef	_MACH_VM_INHERIT_H_
+#define	_MACH_VM_INHERIT_H_
+
+/*
+ *	Types defined:
+ *
+ *	vm_inherit_t	inheritance codes.
+ */
+
+typedef unsigned int		vm_inherit_t;	/* might want to change this */
+
+/*
+ *	Enumeration of valid values for vm_inherit_t.
+ */
+
+#define	VM_INHERIT_SHARE	((vm_inherit_t) 0)	/* share with child */
+#define	VM_INHERIT_COPY		((vm_inherit_t) 1)	/* copy into child */
+#define VM_INHERIT_NONE		((vm_inherit_t) 2)	/* absent from child */
+#define	VM_INHERIT_DONATE_COPY	((vm_inherit_t) 3)	/* copy and delete */
+
+#define VM_INHERIT_DEFAULT	VM_INHERIT_COPY
+#define VM_INHERIT_LAST_VALID VM_INHERIT_NONE
+
+#endif	/* _MACH_VM_INHERIT_H_ */
diff --git a/i386/include/mach/vm_map.defs b/i386/include/mach/vm_map.defs
new file mode 100644
index 0000000..439c014
--- /dev/null
+++ b/i386/include/mach/vm_map.defs
@@ -0,0 +1,475 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_FREE_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/vm_map.defs
+ *
+ *	Exported (native-sized) kernel VM calls.
+ */
+
+subsystem
+#if	KERNEL_SERVER
+	  KernelServer
+#endif	/* KERNEL_SERVER */
+	  vm_map 3800;
+
+#include <mach/std_types.defs>
+#include <mach/mach_types.defs>
+#include <mach_debug/mach_debug_types.defs>
+
+/*
+ *      Returns information about the contents of the virtual
+ *      address space of the target task at the specified
+ *      address.  The returned protection, inheritance, sharing
+ *      and memory object values apply to the entire range described
+ *      by the address range returned; the memory object offset
+ *      corresponds to the beginning of the address range.
+ *      [If the specified address is not allocated, the next
+ *      highest address range is described.  If no addresses beyond
+ *      the one specified are allocated, the call returns KERN_NO_SPACE.]
+ */
+routine vm_region(
+                target_task     : vm_map_t;
+	inout	address		: vm_address_t;
+        out     size            : vm_size_t;
+		flavor		: vm_region_flavor_t;
+	out	info		: vm_region_info_t, CountInOut;
+        out     object_name     : memory_object_name_t =
+                                        MACH_MSG_TYPE_MOVE_SEND
+                                        ctype: mach_port_t);
+
+/*
+ *	Allocate zero-filled memory in the address space
+ *	of the target task, either at the specified address,
+ *	or wherever space can be found (if anywhere is TRUE),
+ *	of the specified size.  The address at which the
+ *	allocation actually took place is returned.
+ */
+routine vm_allocate(
+		target_task	: vm_task_entry_t;
+	inout	address		: vm_address_t;
+		size		: vm_size_t;
+		flags		: int);
+
+/*
+ *	Deallocate the specified range from the virtual
+ *	address space of the target task.
+ */
+routine vm_deallocate(
+		target_task	: vm_task_entry_t;
+		address		: vm_address_t;
+		size		: vm_size_t);
+
+/*
+ *	Set the current or maximum protection attribute
+ *	for the specified range of the virtual address
+ *	space of the target task.  The current protection
+ *	limits the memory access rights of threads within
+ *	the task; the maximum protection limits the accesses
+ *	that may be given in the current protection.
+ *	Protections are specified as a set of {read, write, execute}
+ *	*permissions*.
+ */
+routine vm_protect(
+		target_task	: vm_task_entry_t;
+		address		: vm_address_t;
+		size		: vm_size_t;
+		set_maximum	: boolean_t;
+		new_protection	: vm_prot_t);
+
+/*
+ *	Set the inheritance attribute for the specified range
+ *	of the virtual address space of the target task.
+ *	The inheritance value is one of {none, copy, share}, and
+ *	specifies how the child address space should acquire
+ *	this memory at the time of a task_create call.
+ */
+routine vm_inherit(
+		target_task	: vm_task_entry_t;
+		address		: vm_address_t;
+		size		: vm_size_t;
+		new_inheritance	: vm_inherit_t);
+
+/*
+ *	Returns the contents of the specified range of the
+ *	virtual address space of the target task.  [The
+ *	range must be aligned on a virtual page boundary,
+ *	and must be a multiple of pages in extent.  The
+ *	protection on the specified range must permit reading.]
+ */
+routine vm_read(
+		target_task	: vm_map_t;
+		address		: vm_address_t;
+		size		: vm_size_t;
+	out	data		: pointer_t);
+
+/* 
+ * List corrollary to vm_read, returns mapped contents of specified
+ * ranges within target address space.
+ */
+routine vm_read_list(
+		target_task 	: vm_map_t;
+	inout	data_list   	: vm_read_entry_t;
+		count		: natural_t);
+
+/*
+ *	Writes the contents of the specified range of the
+ *	virtual address space of the target task.  [The
+ *	range must be aligned on a virtual page boundary,
+ *	and must be a multiple of pages in extent.  The
+ *	protection on the specified range must permit writing.]
+ */
+routine vm_write(
+		target_task	: vm_map_t;
+		address		: vm_address_t;
+		data		: pointer_t);
+
+/*
+ *	Copy the contents of the source range of the virtual
+ *	address space of the target task to the destination
+ *	range in that same address space.  [Both of the
+ *	ranges must be aligned on a virtual page boundary,
+ *	and must be multiples of pages in extent.  The
+ *	protection on the source range must permit reading,
+ *	and the protection on the destination range must
+ *	permit writing.]
+ */
+routine vm_copy(
+		target_task	: vm_map_t;
+		source_address	: vm_address_t;
+		size		: vm_size_t;
+		dest_address	: vm_address_t);
+
+/*
+ *	Returns the contents of the specified range of the
+ *	virtual address space of the target task.  [There
+ *	are no alignment restrictions, and the results will
+ *      overwrite the area pointed to by data - which must
+ *      already exist. The protection on the specified range
+ *	must permit reading.]
+ */
+routine vm_read_overwrite(
+		target_task	: vm_map_t;
+		address		: vm_address_t;
+		size		: vm_size_t;
+		data		: vm_address_t;
+	out	outsize		: vm_size_t);
+
+
+routine vm_msync(
+		target_task	: vm_map_t;
+		address		: vm_address_t;
+		size		: vm_size_t;
+		sync_flags	: vm_sync_t );
+
+/*
+ *	Set the paging behavior attribute for the specified range
+ *	of the virtual address space of the target task.
+ *	The behavior value is one of {default, random, forward 
+ *	sequential, reverse sequential} and indicates the expected
+ *	page reference pattern for the specified range.
+ */
+routine vm_behavior_set(
+		target_task	: vm_map_t;
+		address		: vm_address_t;
+		size		: vm_size_t;
+		new_behavior	: vm_behavior_t);
+
+
+/*
+ *	Map a user-defined memory object into the virtual address
+ *	space of the target task.  If desired (anywhere is TRUE),
+ *	the kernel will find a suitable address range of the
+ *	specified size; else, the specific address will be allocated.
+ *
+ *	The beginning address of the range will be aligned on a virtual
+ *	page boundary, be at or beyond the address specified, and
+ *	meet the mask requirements (bits turned on in the mask must not
+ *	be turned on in the result); the size of the range, in bytes,
+ *	will be rounded	up to an integral number of virtual pages.
+ *
+ *	The memory in the resulting range will be associated with the
+ *	specified memory object, with the beginning of the memory range
+ *	referring to the specified offset into the memory object.
+ *
+ *	The mapping will take the current and maximum protections and
+ *	the inheritance attributes specified; see the vm_protect and
+ *	vm_inherit calls for a description of these attributes.
+ *
+ *	If desired (copy is TRUE), the memory range will be filled
+ *	with a copy of the data from the memory object; this copy will
+ *	be private to this mapping in this target task.  Otherwise,
+ *	the memory in this mapping will be shared with other mappings
+ *	of the same memory object at the same offset (in this task or
+ *	in other tasks).  [The Mach kernel only enforces shared memory
+ *	consistency among mappings on one host with similar page alignments.
+ *	The user-defined memory manager for this object is responsible
+ *	for further consistency.]
+ */
+routine vm_map(
+		target_task	: vm_task_entry_t;
+	inout	address		: vm_address_t;
+		size		: vm_size_t;
+		mask		: vm_address_t;
+		flags		: int;
+		object		: mem_entry_name_port_t;
+		offset		: vm_offset_t;
+		copy		: boolean_t;
+		cur_protection	: vm_prot_t;
+		max_protection	: vm_prot_t;
+		inheritance	: vm_inherit_t);
+
+/*
+ *	Set/Get special properties of memory associated
+ *	to some virtual address range, such as cachability, 
+ *	migrability, replicability.  Machine-dependent.
+ */
+routine vm_machine_attribute(
+		target_task	: vm_map_t;
+		address		: vm_address_t;
+		size		: vm_size_t;
+		attribute	: vm_machine_attribute_t;
+	inout	value		: vm_machine_attribute_val_t);
+
+/*
+ *      Map portion of a task's address space.
+ */
+routine vm_remap(
+		target_task	: vm_map_t;
+	inout	target_address	: vm_address_t;
+		size		: vm_size_t;
+		mask		: vm_address_t;
+		anywhere	: boolean_t;
+		src_task	: vm_map_t;
+		src_address	: vm_address_t;
+		copy		: boolean_t;
+	out	cur_protection	: vm_prot_t;
+	out	max_protection	: vm_prot_t;
+		inheritance	: vm_inherit_t);
+
+/*
+ *	Require that all future virtual memory allocation
+ *	allocates wired memory.  Setting must_wire to FALSE
+ *	disables the wired future feature.
+ */
+routine task_wire(
+		target_task	: vm_map_t;
+		must_wire	: boolean_t);
+
+	
+/*
+ *	Allow application level processes to create named entries which
+ *	correspond to mapped portions of their address space.  These named
+ *	entries can then be manipulated, shared with other processes in
+ *	other address spaces and ultimately mapped in ohter address spaces
+ */
+
+routine mach_make_memory_entry(
+		target_task	:vm_map_t;
+	inout	size		:vm_size_t;
+		offset		:vm_offset_t;
+		permission	:vm_prot_t;
+	out	object_handle	:mem_entry_name_port_move_send_t;
+		parent_entry	:mem_entry_name_port_t);
+
+/*
+ *      Give the caller information on the given location in a virtual
+ *      address space.  If a page is mapped return ref and dirty info.
+ */
+routine vm_map_page_query(
+                target_map      :vm_map_t;
+                offset          :vm_offset_t;
+        out     disposition     :integer_t;
+        out     ref_count       :integer_t);
+
+/*
+ *	Returns information about a region of memory.
+ *	Includes info about the chain of objects rooted at that region.
+ *      Only available in MACH_VM_DEBUG compiled kernels,
+ *      otherwise returns KERN_FAILURE.
+ */
+routine mach_vm_region_info(
+		task		: vm_map_t;
+		address		: vm_address_t;
+	out	region		: vm_info_region_t;
+	out	objects		: vm_info_object_array_t);
+
+routine	vm_mapped_pages_info(
+		task		: vm_map_t;
+	out	pages		: page_address_array_t);
+
+#if 0
+/*
+ *    Allow application level processes to create named entries which
+ *    are backed by sub-maps which describe regions of address space.
+ *    These regions of space can have objects mapped into them and
+ *    in turn, can be mapped into target address spaces 
+ */
+
+routine	vm_region_object_create(
+		target_task	:vm_map_t;
+	in	size		:vm_size_t;
+	out	region_object	:mach_port_move_send_t);
+#else
+skip; /* was vm_region_object_create */
+#endif
+
+/*
+ *	A recursive form of vm_region which probes submaps withint the
+ *	address space.
+ */
+routine vm_region_recurse(
+                target_task     : vm_map_t;
+	inout	address		: vm_address_t;
+        out     size            : vm_size_t;
+	inout	nesting_depth	: natural_t;
+	out	info		: vm_region_recurse_info_t,CountInOut);
+
+
+/* 
+ *	The routines below are temporary, meant for transitional use
+ *	as their counterparts are moved from 32 to 64 bit data path
+ */
+
+
+routine vm_region_recurse_64(
+                target_task     : vm_map_t;
+	inout	address		: vm_address_t;
+        out     size            : vm_size_t;
+	inout	nesting_depth	: natural_t;
+	out	info		: vm_region_recurse_info_t,CountInOut);
+
+routine mach_vm_region_info_64(
+		task		: vm_map_t;
+		address		: vm_address_t;
+	out	region		: vm_info_region_64_t;
+	out	objects		: vm_info_object_array_t);
+
+routine vm_region_64(
+                target_task     : vm_map_t;
+	inout	address		: vm_address_t;
+        out     size            : vm_size_t;
+		flavor		: vm_region_flavor_t;
+	out	info		: vm_region_info_t, CountInOut;
+        out     object_name     : memory_object_name_t =
+                                        MACH_MSG_TYPE_MOVE_SEND
+                                        ctype: mach_port_t);
+
+routine mach_make_memory_entry_64(
+		target_task	:vm_map_t;
+	inout	size		:memory_object_size_t;
+		offset		:memory_object_offset_t;
+		permission	:vm_prot_t;
+	out	object_handle	:mach_port_move_send_t;
+		parent_entry	:mem_entry_name_port_t);
+
+
+
+routine vm_map_64(
+		target_task	: vm_task_entry_t;
+	inout	address		: vm_address_t;
+		size		: vm_size_t;
+		mask		: vm_address_t;
+		flags		: int;
+		object		: mem_entry_name_port_t;
+		offset		: memory_object_offset_t;
+		copy		: boolean_t;
+		cur_protection	: vm_prot_t;
+		max_protection	: vm_prot_t;
+		inheritance	: vm_inherit_t);
+
+#if 0
+/*
+ * The UPL interfaces are not ready for user-level export.
+ */
+routine vm_map_get_upl(
+		target_task	: vm_map_t;
+		address		: vm_map_offset_t;
+	inout	size		: vm_size_t;
+	out	upl		: upl_t;
+	out	page_info	: upl_page_info_array_t, CountInOut;
+	inout	flags		: integer_t;
+		force_data_sync	: integer_t);
+
+routine vm_upl_map(
+		target_task	: vm_map_t;
+		upl		: upl_t;
+	inout	address		: vm_address_t);
+
+routine vm_upl_unmap(
+		target_task	: vm_map_t;
+		upl		: upl_t);
+#else
+skip; /* was vm_map_get_upl */
+skip; /* was vm_upl_map */
+skip; /* was vm_upl_unmap */
+#endif		
+
+/*
+ *	Control behavior and investigate state of a "purgable" object in
+ *	the virtual address space of the target task.  A purgable object is
+ *	created via a call to vm_allocate() with VM_FLAGS_PURGABLE
+ *	specified.  See the routine implementation for a complete
+ *	definition of the routine.
+ */
+routine vm_purgable_control(
+		target_task	: vm_map_t;
+		address		: vm_address_t;
+		control		: vm_purgable_t;
+	inout	state		: int);
+
+/* vim: set ft=c : */
diff --git a/i386/include/mach/vm_map.h b/i386/include/mach/vm_map.h
new file mode 100644
index 0000000..1ed28fb
--- /dev/null
+++ b/i386/include/mach/vm_map.h
@@ -0,0 +1,1378 @@
+#ifndef	_vm_map_user_
+#define	_vm_map_user_
+
+/* Module vm_map */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	vm_map_MSG_COUNT
+#define	vm_map_MSG_COUNT	31
+#endif	/* vm_map_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+#include <mach_debug/mach_debug_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine vm_region */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_region
+(
+	vm_map_t target_task,
+	vm_address_t *address,
+	vm_size_t *size,
+	vm_region_flavor_t flavor,
+	vm_region_info_t info,
+	mach_msg_type_number_t *infoCnt,
+	mach_port_t *object_name
+);
+
+/* Routine vm_allocate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_allocate
+(
+	vm_map_t target_task,
+	vm_address_t *address,
+	vm_size_t size,
+	int flags
+);
+
+/* Routine vm_deallocate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_deallocate
+(
+	vm_map_t target_task,
+	vm_address_t address,
+	vm_size_t size
+);
+
+/* Routine vm_protect */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_protect
+(
+	vm_map_t target_task,
+	vm_address_t address,
+	vm_size_t size,
+	boolean_t set_maximum,
+	vm_prot_t new_protection
+);
+
+/* Routine vm_inherit */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_inherit
+(
+	vm_map_t target_task,
+	vm_address_t address,
+	vm_size_t size,
+	vm_inherit_t new_inheritance
+);
+
+/* Routine vm_read */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_read
+(
+	vm_map_t target_task,
+	vm_address_t address,
+	vm_size_t size,
+	vm_offset_t *data,
+	mach_msg_type_number_t *dataCnt
+);
+
+/* Routine vm_read_list */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_read_list
+(
+	vm_map_t target_task,
+	vm_read_entry_t data_list,
+	natural_t count
+);
+
+/* Routine vm_write */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_write
+(
+	vm_map_t target_task,
+	vm_address_t address,
+	vm_offset_t data,
+	mach_msg_type_number_t dataCnt
+);
+
+/* Routine vm_copy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_copy
+(
+	vm_map_t target_task,
+	vm_address_t source_address,
+	vm_size_t size,
+	vm_address_t dest_address
+);
+
+/* Routine vm_read_overwrite */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_read_overwrite
+(
+	vm_map_t target_task,
+	vm_address_t address,
+	vm_size_t size,
+	vm_address_t data,
+	vm_size_t *outsize
+);
+
+/* Routine vm_msync */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_msync
+(
+	vm_map_t target_task,
+	vm_address_t address,
+	vm_size_t size,
+	vm_sync_t sync_flags
+);
+
+/* Routine vm_behavior_set */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_behavior_set
+(
+	vm_map_t target_task,
+	vm_address_t address,
+	vm_size_t size,
+	vm_behavior_t new_behavior
+);
+
+/* Routine vm_map */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_map
+(
+	vm_map_t target_task,
+	vm_address_t *address,
+	vm_size_t size,
+	vm_address_t mask,
+	int flags,
+	mem_entry_name_port_t object,
+	vm_offset_t offset,
+	boolean_t copy,
+	vm_prot_t cur_protection,
+	vm_prot_t max_protection,
+	vm_inherit_t inheritance
+);
+
+/* Routine vm_machine_attribute */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_machine_attribute
+(
+	vm_map_t target_task,
+	vm_address_t address,
+	vm_size_t size,
+	vm_machine_attribute_t attribute,
+	vm_machine_attribute_val_t *value
+);
+
+/* Routine vm_remap */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_remap
+(
+	vm_map_t target_task,
+	vm_address_t *target_address,
+	vm_size_t size,
+	vm_address_t mask,
+	boolean_t anywhere,
+	vm_map_t src_task,
+	vm_address_t src_address,
+	boolean_t copy,
+	vm_prot_t *cur_protection,
+	vm_prot_t *max_protection,
+	vm_inherit_t inheritance
+);
+
+/* Routine task_wire */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_wire
+(
+	vm_map_t target_task,
+	boolean_t must_wire
+);
+
+/* Routine mach_make_memory_entry */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_make_memory_entry
+(
+	vm_map_t target_task,
+	vm_size_t *size,
+	vm_offset_t offset,
+	vm_prot_t permission,
+	mem_entry_name_port_t *object_handle,
+	mem_entry_name_port_t parent_entry
+);
+
+/* Routine vm_map_page_query */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_map_page_query
+(
+	vm_map_t target_map,
+	vm_offset_t offset,
+	integer_t *disposition,
+	integer_t *ref_count
+);
+
+/* Routine mach_vm_region_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_region_info
+(
+	vm_map_t task,
+	vm_address_t address,
+	vm_info_region_t *region,
+	vm_info_object_array_t *objects,
+	mach_msg_type_number_t *objectsCnt
+);
+
+/* Routine vm_mapped_pages_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_mapped_pages_info
+(
+	vm_map_t task,
+	page_address_array_t *pages,
+	mach_msg_type_number_t *pagesCnt
+);
+
+/* Routine vm_region_recurse */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_region_recurse
+(
+	vm_map_t target_task,
+	vm_address_t *address,
+	vm_size_t *size,
+	natural_t *nesting_depth,
+	vm_region_recurse_info_t info,
+	mach_msg_type_number_t *infoCnt
+);
+
+/* Routine vm_region_recurse_64 */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_region_recurse_64
+(
+	vm_map_t target_task,
+	vm_address_t *address,
+	vm_size_t *size,
+	natural_t *nesting_depth,
+	vm_region_recurse_info_t info,
+	mach_msg_type_number_t *infoCnt
+);
+
+/* Routine mach_vm_region_info_64 */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_vm_region_info_64
+(
+	vm_map_t task,
+	vm_address_t address,
+	vm_info_region_64_t *region,
+	vm_info_object_array_t *objects,
+	mach_msg_type_number_t *objectsCnt
+);
+
+/* Routine vm_region_64 */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_region_64
+(
+	vm_map_t target_task,
+	vm_address_t *address,
+	vm_size_t *size,
+	vm_region_flavor_t flavor,
+	vm_region_info_t info,
+	mach_msg_type_number_t *infoCnt,
+	mach_port_t *object_name
+);
+
+/* Routine mach_make_memory_entry_64 */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_make_memory_entry_64
+(
+	vm_map_t target_task,
+	memory_object_size_t *size,
+	memory_object_offset_t offset,
+	vm_prot_t permission,
+	mach_port_t *object_handle,
+	mem_entry_name_port_t parent_entry
+);
+
+/* Routine vm_map_64 */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_map_64
+(
+	vm_map_t target_task,
+	vm_address_t *address,
+	vm_size_t size,
+	vm_address_t mask,
+	int flags,
+	mem_entry_name_port_t object,
+	memory_object_offset_t offset,
+	boolean_t copy,
+	vm_prot_t cur_protection,
+	vm_prot_t max_protection,
+	vm_inherit_t inheritance
+);
+
+/* Routine vm_purgable_control */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t vm_purgable_control
+(
+	vm_map_t target_task,
+	vm_address_t address,
+	vm_purgable_t control,
+	int *state
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__vm_map_subsystem__defined
+#define __Request__vm_map_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_region_flavor_t flavor;
+		mach_msg_type_number_t infoCnt;
+	} __Request__vm_region_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		int flags;
+	} __Request__vm_allocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+	} __Request__vm_deallocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		boolean_t set_maximum;
+		vm_prot_t new_protection;
+	} __Request__vm_protect_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		vm_inherit_t new_inheritance;
+	} __Request__vm_inherit_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+	} __Request__vm_read_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_read_entry_t data_list;
+		natural_t count;
+	} __Request__vm_read_list_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t data;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_address_t address;
+		mach_msg_type_number_t dataCnt;
+	} __Request__vm_write_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t source_address;
+		vm_size_t size;
+		vm_address_t dest_address;
+	} __Request__vm_copy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		vm_address_t data;
+	} __Request__vm_read_overwrite_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		vm_sync_t sync_flags;
+	} __Request__vm_msync_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		vm_behavior_t new_behavior;
+	} __Request__vm_behavior_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t object;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		vm_address_t mask;
+		int flags;
+		vm_offset_t offset;
+		boolean_t copy;
+		vm_prot_t cur_protection;
+		vm_prot_t max_protection;
+		vm_inherit_t inheritance;
+	} __Request__vm_map_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		vm_machine_attribute_t attribute;
+		vm_machine_attribute_val_t value;
+	} __Request__vm_machine_attribute_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t src_task;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_address_t target_address;
+		vm_size_t size;
+		vm_address_t mask;
+		boolean_t anywhere;
+		vm_address_t src_address;
+		boolean_t copy;
+		vm_inherit_t inheritance;
+	} __Request__vm_remap_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		boolean_t must_wire;
+	} __Request__task_wire_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t parent_entry;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_size_t size;
+		vm_offset_t offset;
+		vm_prot_t permission;
+	} __Request__mach_make_memory_entry_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_offset_t offset;
+	} __Request__vm_map_page_query_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+	} __Request__mach_vm_region_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__vm_mapped_pages_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		natural_t nesting_depth;
+		mach_msg_type_number_t infoCnt;
+	} __Request__vm_region_recurse_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		natural_t nesting_depth;
+		mach_msg_type_number_t infoCnt;
+	} __Request__vm_region_recurse_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+	} __Request__mach_vm_region_info_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_region_flavor_t flavor;
+		mach_msg_type_number_t infoCnt;
+	} __Request__vm_region_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t parent_entry;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		memory_object_size_t size;
+		memory_object_offset_t offset;
+		vm_prot_t permission;
+	} __Request__mach_make_memory_entry_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t object;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		vm_address_t mask;
+		int flags;
+		memory_object_offset_t offset;
+		boolean_t copy;
+		vm_prot_t cur_protection;
+		vm_prot_t max_protection;
+		vm_inherit_t inheritance;
+	} __Request__vm_map_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_purgable_t control;
+		int state;
+	} __Request__vm_purgable_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__vm_map_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__vm_map_subsystem__defined
+#define __RequestUnion__vm_map_subsystem__defined
+union __RequestUnion__vm_map_subsystem {
+	__Request__vm_region_t Request_vm_region;
+	__Request__vm_allocate_t Request_vm_allocate;
+	__Request__vm_deallocate_t Request_vm_deallocate;
+	__Request__vm_protect_t Request_vm_protect;
+	__Request__vm_inherit_t Request_vm_inherit;
+	__Request__vm_read_t Request_vm_read;
+	__Request__vm_read_list_t Request_vm_read_list;
+	__Request__vm_write_t Request_vm_write;
+	__Request__vm_copy_t Request_vm_copy;
+	__Request__vm_read_overwrite_t Request_vm_read_overwrite;
+	__Request__vm_msync_t Request_vm_msync;
+	__Request__vm_behavior_set_t Request_vm_behavior_set;
+	__Request__vm_map_t Request_vm_map;
+	__Request__vm_machine_attribute_t Request_vm_machine_attribute;
+	__Request__vm_remap_t Request_vm_remap;
+	__Request__task_wire_t Request_task_wire;
+	__Request__mach_make_memory_entry_t Request_mach_make_memory_entry;
+	__Request__vm_map_page_query_t Request_vm_map_page_query;
+	__Request__mach_vm_region_info_t Request_mach_vm_region_info;
+	__Request__vm_mapped_pages_info_t Request_vm_mapped_pages_info;
+	__Request__vm_region_recurse_t Request_vm_region_recurse;
+	__Request__vm_region_recurse_64_t Request_vm_region_recurse_64;
+	__Request__mach_vm_region_info_64_t Request_mach_vm_region_info_64;
+	__Request__vm_region_64_t Request_vm_region_64;
+	__Request__mach_make_memory_entry_64_t Request_mach_make_memory_entry_64;
+	__Request__vm_map_64_t Request_vm_map_64;
+	__Request__vm_purgable_control_t Request_vm_purgable_control;
+};
+#endif /* !__RequestUnion__vm_map_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__vm_map_subsystem__defined
+#define __Reply__vm_map_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t object_name;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		mach_msg_type_number_t infoCnt;
+		int info[10];
+	} __Reply__vm_region_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_address_t address;
+	} __Reply__vm_allocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__vm_deallocate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__vm_protect_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__vm_inherit_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t data;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t dataCnt;
+	} __Reply__vm_read_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_read_entry_t data_list;
+	} __Reply__vm_read_list_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__vm_write_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__vm_copy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_size_t outsize;
+	} __Reply__vm_read_overwrite_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__vm_msync_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__vm_behavior_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_address_t address;
+	} __Reply__vm_map_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_machine_attribute_val_t value;
+	} __Reply__vm_machine_attribute_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_address_t target_address;
+		vm_prot_t cur_protection;
+		vm_prot_t max_protection;
+	} __Reply__vm_remap_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_wire_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t object_handle;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_size_t size;
+	} __Reply__mach_make_memory_entry_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		integer_t disposition;
+		integer_t ref_count;
+	} __Reply__vm_map_page_query_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t objects;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_info_region_t region;
+		mach_msg_type_number_t objectsCnt;
+	} __Reply__mach_vm_region_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t pages;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t pagesCnt;
+	} __Reply__vm_mapped_pages_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_address_t address;
+		vm_size_t size;
+		natural_t nesting_depth;
+		mach_msg_type_number_t infoCnt;
+		int info[19];
+	} __Reply__vm_region_recurse_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_address_t address;
+		vm_size_t size;
+		natural_t nesting_depth;
+		mach_msg_type_number_t infoCnt;
+		int info[19];
+	} __Reply__vm_region_recurse_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t objects;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_info_region_64_t region;
+		mach_msg_type_number_t objectsCnt;
+	} __Reply__mach_vm_region_info_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t object_name;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		vm_address_t address;
+		vm_size_t size;
+		mach_msg_type_number_t infoCnt;
+		int info[10];
+	} __Reply__vm_region_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t object_handle;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		memory_object_size_t size;
+	} __Reply__mach_make_memory_entry_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		vm_address_t address;
+	} __Reply__vm_map_64_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		int state;
+	} __Reply__vm_purgable_control_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__vm_map_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__vm_map_subsystem__defined
+#define __ReplyUnion__vm_map_subsystem__defined
+union __ReplyUnion__vm_map_subsystem {
+	__Reply__vm_region_t Reply_vm_region;
+	__Reply__vm_allocate_t Reply_vm_allocate;
+	__Reply__vm_deallocate_t Reply_vm_deallocate;
+	__Reply__vm_protect_t Reply_vm_protect;
+	__Reply__vm_inherit_t Reply_vm_inherit;
+	__Reply__vm_read_t Reply_vm_read;
+	__Reply__vm_read_list_t Reply_vm_read_list;
+	__Reply__vm_write_t Reply_vm_write;
+	__Reply__vm_copy_t Reply_vm_copy;
+	__Reply__vm_read_overwrite_t Reply_vm_read_overwrite;
+	__Reply__vm_msync_t Reply_vm_msync;
+	__Reply__vm_behavior_set_t Reply_vm_behavior_set;
+	__Reply__vm_map_t Reply_vm_map;
+	__Reply__vm_machine_attribute_t Reply_vm_machine_attribute;
+	__Reply__vm_remap_t Reply_vm_remap;
+	__Reply__task_wire_t Reply_task_wire;
+	__Reply__mach_make_memory_entry_t Reply_mach_make_memory_entry;
+	__Reply__vm_map_page_query_t Reply_vm_map_page_query;
+	__Reply__mach_vm_region_info_t Reply_mach_vm_region_info;
+	__Reply__vm_mapped_pages_info_t Reply_vm_mapped_pages_info;
+	__Reply__vm_region_recurse_t Reply_vm_region_recurse;
+	__Reply__vm_region_recurse_64_t Reply_vm_region_recurse_64;
+	__Reply__mach_vm_region_info_64_t Reply_mach_vm_region_info_64;
+	__Reply__vm_region_64_t Reply_vm_region_64;
+	__Reply__mach_make_memory_entry_64_t Reply_mach_make_memory_entry_64;
+	__Reply__vm_map_64_t Reply_vm_map_64;
+	__Reply__vm_purgable_control_t Reply_vm_purgable_control;
+};
+#endif /* !__RequestUnion__vm_map_subsystem__defined */
+
+#ifndef subsystem_to_name_map_vm_map
+#define subsystem_to_name_map_vm_map \
+    { "vm_region", 3800 },\
+    { "vm_allocate", 3801 },\
+    { "vm_deallocate", 3802 },\
+    { "vm_protect", 3803 },\
+    { "vm_inherit", 3804 },\
+    { "vm_read", 3805 },\
+    { "vm_read_list", 3806 },\
+    { "vm_write", 3807 },\
+    { "vm_copy", 3808 },\
+    { "vm_read_overwrite", 3809 },\
+    { "vm_msync", 3810 },\
+    { "vm_behavior_set", 3811 },\
+    { "vm_map", 3812 },\
+    { "vm_machine_attribute", 3813 },\
+    { "vm_remap", 3814 },\
+    { "task_wire", 3815 },\
+    { "mach_make_memory_entry", 3816 },\
+    { "vm_map_page_query", 3817 },\
+    { "mach_vm_region_info", 3818 },\
+    { "vm_mapped_pages_info", 3819 },\
+    { "vm_region_recurse", 3821 },\
+    { "vm_region_recurse_64", 3822 },\
+    { "mach_vm_region_info_64", 3823 },\
+    { "vm_region_64", 3824 },\
+    { "mach_make_memory_entry_64", 3825 },\
+    { "vm_map_64", 3826 },\
+    { "vm_purgable_control", 3830 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _vm_map_user_ */
diff --git a/i386/include/mach/vm_param.h b/i386/include/mach/vm_param.h
new file mode 100644
index 0000000..9a87873
--- /dev/null
+++ b/i386/include/mach/vm_param.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/vm_param.h
+ *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
+ *	Date:	1985
+ *
+ *	Machine independent virtual memory parameters.
+ *
+ */
+
+#ifndef	_MACH_VM_PARAM_H_
+#define _MACH_VM_PARAM_H_
+
+#include <mach/machine/vm_param.h>
+
+
+#endif	/* _MACH_VM_PARAM_H_ */
diff --git a/i386/include/mach/vm_prot.h b/i386/include/mach/vm_prot.h
new file mode 100644
index 0000000..6fe17d4
--- /dev/null
+++ b/i386/include/mach/vm_prot.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/vm_prot.h
+ *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
+ *
+ *	Virtual memory protection definitions.
+ *
+ */
+
+#ifndef	_MACH_VM_PROT_H_
+#define	_MACH_VM_PROT_H_
+
+/*
+ *	Types defined:
+ *
+ *	vm_prot_t		VM protection values.
+ */
+
+typedef int		vm_prot_t;
+
+/*
+ *	Protection values, defined as bits within the vm_prot_t type
+ */
+
+#define	VM_PROT_NONE	((vm_prot_t) 0x00)
+
+#define VM_PROT_READ	((vm_prot_t) 0x01)	/* read permission */
+#define VM_PROT_WRITE	((vm_prot_t) 0x02)	/* write permission */
+#define VM_PROT_EXECUTE	((vm_prot_t) 0x04)	/* execute permission */
+
+/*
+ *	The default protection for newly-created virtual memory
+ */
+
+#define VM_PROT_DEFAULT	(VM_PROT_READ|VM_PROT_WRITE)
+
+/*
+ *	The maximum privileges possible, for parameter checking.
+ */
+
+#define VM_PROT_ALL	(VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
+
+/*
+ *	An invalid protection value.
+ *	Used only by memory_object_lock_request to indicate no change
+ *	to page locks.  Using -1 here is a bad idea because it
+ *	looks like VM_PROT_ALL and then some.
+ */
+
+#define VM_PROT_NO_CHANGE	((vm_prot_t) 0x08)
+
+/* 
+ *      When a caller finds that he cannot obtain write permission on a
+ *      mapped entry, the following flag can be used.  The entry will
+ *      be made "needs copy" effectively copying the object (using COW),
+ *      and write permission will be added to the maximum protections
+ *      for the associated entry. 
+ */        
+
+#define VM_PROT_COPY            ((vm_prot_t) 0x10)
+
+
+/*
+ *	Another invalid protection value.
+ *	Used only by memory_object_data_request upon an object
+ *	which has specified a copy_call copy strategy. It is used
+ *	when the kernel wants a page belonging to a copy of the
+ *	object, and is only asking the object as a result of
+ *	following a shadow chain. This solves the race between pages
+ *	being pushed up by the memory manager and the kernel
+ *	walking down the shadow chain.
+ */
+
+#define VM_PROT_WANTS_COPY	((vm_prot_t) 0x10)
+
+
+/*
+ *	The caller wants this memory region treated as if it had a valid
+ *	code signature.
+ */
+
+#define VM_PROT_TRUSTED		((vm_prot_t) 0x20)
+
+
+#endif	/* _MACH_VM_PROT_H_ */
diff --git a/i386/include/mach/vm_purgable.h b/i386/include/mach/vm_purgable.h
new file mode 100644
index 0000000..2d8ca30
--- /dev/null
+++ b/i386/include/mach/vm_purgable.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2003-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+/*
+ * Virtual memory map purgeable object definitions.
+ * Objects that will be needed in the future (forward cached objects) should be queued LIFO. 
+ * Objects that have been used and are cached for reuse (backward cached) should be queued FIFO.
+ * Every user of purgeable memory is entitled to using the highest volatile group (7).
+ * Only if a client wants some of its objects to definitely be purged earlier, it can put those in
+ * another group. This could be used to make all FIFO objects (in the lower group) go away before 
+ * any LIFO objects (in the higher group) go away.
+ * Objects that should not get any chance to stay around can be marked as "obsolete". They will
+ * be emptied before any other objects or pages are reclaimed. Obsolete objects are not emptied
+ * in any particular order.
+ * 'purgeable' is recognized as the correct spelling. For historical reasons, definitions 
+ * in this file are spelled 'purgable'.
+ */
+
+#ifndef	_MACH_VM_PURGABLE_H_
+#define	_MACH_VM_PURGABLE_H_
+
+/*
+ *	Types defined:
+ *
+ *	vm_purgable_t	purgeable object control codes.
+ */
+
+typedef int	vm_purgable_t;
+
+/*
+ *	Enumeration of valid values for vm_purgable_t.
+ */
+#define VM_PURGABLE_SET_STATE	((vm_purgable_t) 0)	/* set state of purgeable object */
+#define VM_PURGABLE_GET_STATE	((vm_purgable_t) 1)	/* get state of purgeable object */
+#define VM_PURGABLE_PURGE_ALL	((vm_purgable_t) 2)	/* purge all volatile objects now */
+
+#define VM_PURGABLE_DEBUG_SHIFT	12
+#define VM_PURGABLE_DEBUG_MASK	(0x3 << VM_PURGABLE_DEBUG_SHIFT)
+#define VM_PURGABLE_DEBUG_EMPTY	(0x1 << VM_PURGABLE_DEBUG_SHIFT)
+#define VM_PURGABLE_DEBUG_FAULT	(0x2 << VM_PURGABLE_DEBUG_SHIFT)
+
+/*
+ * Volatile memory ordering groups (group zero objects are purged before group 1, etc...
+ * It is implementation dependent as to whether these groups are global or per-address space.
+ * (for the moment, they are global).
+ */
+#define VM_VOLATILE_GROUP_SHIFT		8
+#define VM_VOLATILE_GROUP_MASK		(7 << VM_VOLATILE_GROUP_SHIFT)
+#define VM_VOLATILE_GROUP_DEFAULT   VM_VOLATILE_GROUP_7
+
+#define VM_VOLATILE_GROUP_0			(0 << VM_VOLATILE_GROUP_SHIFT)
+#define VM_VOLATILE_GROUP_1			(1 << VM_VOLATILE_GROUP_SHIFT)
+#define VM_VOLATILE_GROUP_2			(2 << VM_VOLATILE_GROUP_SHIFT)
+#define VM_VOLATILE_GROUP_3			(3 << VM_VOLATILE_GROUP_SHIFT)
+#define VM_VOLATILE_GROUP_4			(4 << VM_VOLATILE_GROUP_SHIFT)
+#define VM_VOLATILE_GROUP_5			(5 << VM_VOLATILE_GROUP_SHIFT)
+#define VM_VOLATILE_GROUP_6			(6 << VM_VOLATILE_GROUP_SHIFT)
+#define VM_VOLATILE_GROUP_7			(7 << VM_VOLATILE_GROUP_SHIFT)
+
+/*
+ * Purgeable behavior
+ * Within the same group, FIFO objects will be emptied before objects that are added later.
+ * LIFO objects will be emptied after objects that are added later.
+ * - Input only, not returned on state queries.
+ */
+#define VM_PURGABLE_BEHAVIOR_SHIFT  6
+#define VM_PURGABLE_BEHAVIOR_MASK   (1 << VM_PURGABLE_BEHAVIOR_SHIFT)
+#define VM_PURGABLE_BEHAVIOR_FIFO   (0 << VM_PURGABLE_BEHAVIOR_SHIFT)
+#define VM_PURGABLE_BEHAVIOR_LIFO   (1 << VM_PURGABLE_BEHAVIOR_SHIFT)
+
+/*
+ * Obsolete object.
+ * Disregard volatile group, and put object into obsolete queue instead, so it is the next object
+ * to be purged.
+ * - Input only, not returned on state queries.
+ */
+#define VM_PURGABLE_ORDERING_SHIFT		5
+#define VM_PURGABLE_ORDERING_MASK		(1 << VM_PURGABLE_ORDERING_SHIFT)
+#define VM_PURGABLE_ORDERING_OBSOLETE	(1 << VM_PURGABLE_ORDERING_SHIFT)
+#define VM_PURGABLE_ORDERING_NORMAL		(0 << VM_PURGABLE_ORDERING_SHIFT)
+
+
+/*
+ * Obsolete parameter - do not use
+ */
+#define VM_VOLATILE_ORDER_SHIFT			4
+#define VM_VOLATILE_ORDER_MASK			(1 << VM_VOLATILE_ORDER_SHIFT)
+#define VM_VOLATILE_MAKE_FIRST_IN_GROUP	(1 << VM_VOLATILE_ORDER_SHIFT)
+#define VM_VOLATILE_MAKE_LAST_IN_GROUP	(0 << VM_VOLATILE_ORDER_SHIFT)
+
+/*
+ * Valid states of a purgeable object.
+ */
+#define VM_PURGABLE_STATE_MIN	0		/* minimum purgeable object state value */
+#define VM_PURGABLE_STATE_MAX	3		/* maximum purgeable object state value */
+#define VM_PURGABLE_STATE_MASK	3		/* mask to separate state from group */
+
+#define VM_PURGABLE_NONVOLATILE	0		/* purgeable object is non-volatile */
+#define VM_PURGABLE_VOLATILE	1		/* purgeable object is volatile */
+#define VM_PURGABLE_EMPTY		2		/* purgeable object is volatile and empty */
+#define VM_PURGABLE_DENY		3		/* (mark) object not purgeable */
+
+#define VM_PURGABLE_ALL_MASKS	(VM_PURGABLE_STATE_MASK | \
+				 VM_VOLATILE_ORDER_MASK | \
+				 VM_PURGABLE_ORDERING_MASK | \
+				 VM_PURGABLE_BEHAVIOR_MASK | \
+				 VM_VOLATILE_GROUP_MASK | \
+				 VM_PURGABLE_DEBUG_MASK)
+#endif	/* _MACH_VM_PURGABLE_H_ */
diff --git a/i386/include/mach/vm_region.h b/i386/include/mach/vm_region.h
new file mode 100644
index 0000000..ceb42b7
--- /dev/null
+++ b/i386/include/mach/vm_region.h
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/*
+ *	File:	mach/vm_region.h
+ *
+ *	Define the attributes of a task's memory region
+ *
+ */
+
+#ifndef	_MACH_VM_REGION_H_
+#define _MACH_VM_REGION_H_
+
+#include <mach/boolean.h>
+#include <mach/vm_prot.h>
+#include <mach/vm_inherit.h>
+#include <mach/vm_behavior.h>
+#include <mach/vm_types.h>
+#include <mach/message.h>
+#include <mach/machine/vm_param.h>
+#include <mach/machine/vm_types.h>
+#include <mach/memory_object_types.h>
+
+#include <sys/cdefs.h>
+
+#pragma pack(4)
+
+// LP64todo: all the current tools are 32bit, obviously never worked for 64b
+// so probably should be a real 32b ID vs. ptr.
+// Current users just check for equality
+typedef uint32_t vm32_object_id_t;
+
+/*
+ *	Types defined:
+ *
+ *	vm_region_info_t	memory region attributes
+ */
+
+#define VM_REGION_INFO_MAX      (1024)
+typedef int	*vm_region_info_t;
+typedef int	*vm_region_info_64_t;
+typedef int	*vm_region_recurse_info_t;
+typedef int	*vm_region_recurse_info_64_t;
+typedef int	 vm_region_flavor_t;
+typedef int	 vm_region_info_data_t[VM_REGION_INFO_MAX];
+
+#define VM_REGION_BASIC_INFO_64		9
+struct vm_region_basic_info_64 {
+	vm_prot_t		protection;
+	vm_prot_t		max_protection;
+	vm_inherit_t		inheritance;
+	boolean_t		shared;
+	boolean_t		reserved;
+	memory_object_offset_t	offset;
+	vm_behavior_t		behavior;
+	unsigned short		user_wired_count;
+};
+typedef struct vm_region_basic_info_64		*vm_region_basic_info_64_t;
+typedef struct vm_region_basic_info_64		 vm_region_basic_info_data_64_t;
+
+#define VM_REGION_BASIC_INFO_COUNT_64	((mach_msg_type_number_t) \
+	(sizeof(vm_region_basic_info_data_64_t)/sizeof(int)))
+
+/*
+ * Passing VM_REGION_BASIC_INFO to vm_region_64
+ * automatically converts it to a VM_REGION_BASIC_INFO_64.
+ * Please use that explicitly instead.
+ */
+#define VM_REGION_BASIC_INFO		10
+
+/*
+ * This is the legacy basic info structure.  It is
+ * deprecated because it passes only a 32-bit memory object
+ * offset back - too small for many larger objects (e.g. files).
+ */
+struct vm_region_basic_info {
+	vm_prot_t		protection;
+	vm_prot_t		max_protection;
+	vm_inherit_t		inheritance;
+	boolean_t		shared;
+	boolean_t		reserved;
+	uint32_t		offset; /* too small for a real offset */
+	vm_behavior_t		behavior;
+	unsigned short		user_wired_count;
+};
+
+typedef struct vm_region_basic_info		*vm_region_basic_info_t;
+typedef struct vm_region_basic_info		 vm_region_basic_info_data_t;
+
+#define VM_REGION_BASIC_INFO_COUNT ((mach_msg_type_number_t) \
+	(sizeof(vm_region_basic_info_data_t)/sizeof(int)))
+
+#define VM_REGION_EXTENDED_INFO	11
+
+#define SM_COW             1
+#define SM_PRIVATE         2
+#define SM_EMPTY           3
+#define SM_SHARED          4
+#define SM_TRUESHARED      5
+#define SM_PRIVATE_ALIASED 6
+#define SM_SHARED_ALIASED  7
+
+/* 
+ * For submap info,  the SM flags above are overlayed when a submap
+ * is encountered.  The field denotes whether or not machine level mapping
+ * information is being shared.  PTE's etc.  When such sharing is taking
+ * place the value returned is SM_TRUESHARED otherwise SM_PRIVATE is passed
+ * back.
+ */
+
+struct vm_region_extended_info {
+	vm_prot_t		protection;
+        unsigned int            user_tag;
+        unsigned int            pages_resident;
+        unsigned int            pages_shared_now_private;
+        unsigned int            pages_swapped_out;
+        unsigned int            pages_dirtied;
+        unsigned int            ref_count;
+        unsigned short          shadow_depth;
+        unsigned char           external_pager;
+        unsigned char           share_mode;
+};
+
+typedef struct vm_region_extended_info		*vm_region_extended_info_t;
+typedef struct vm_region_extended_info		 vm_region_extended_info_data_t;
+
+#define VM_REGION_EXTENDED_INFO_COUNT	((mach_msg_type_number_t) \
+	(sizeof(vm_region_extended_info_data_t)/sizeof(int)))
+
+
+#define VM_REGION_TOP_INFO	12
+
+struct vm_region_top_info {
+        unsigned int            obj_id;
+        unsigned int            ref_count;
+        unsigned int            private_pages_resident;
+        unsigned int            shared_pages_resident;
+        unsigned char           share_mode;
+};
+
+typedef struct vm_region_top_info		*vm_region_top_info_t;
+typedef struct vm_region_top_info		 vm_region_top_info_data_t;
+
+#define VM_REGION_TOP_INFO_COUNT ((mach_msg_type_number_t) \
+	(sizeof(vm_region_top_info_data_t)/sizeof(int)))
+
+
+
+/* 
+ * vm_region_submap_info will return information on a submap or object.
+ * The user supplies a nesting level on the call.  When a walk of the
+ * user's map is done and a submap is encountered, the nesting count is
+ * checked. If the nesting count is greater than 1 the submap is entered and
+ * the offset relative to the address in the base map is examined.  If the
+ * nesting count is zero, the information on the submap is returned.
+ * The caller may thus learn about a submap and its contents by judicious
+ * choice of the base map address and nesting count.  The nesting count
+ * allows penetration of recursively mapped submaps.  If a submap is
+ * encountered as a mapped entry of another submap, the caller may bump
+ * the nesting count and call vm_region_recurse again on the target address
+ * range.  The "is_submap" field tells the caller whether or not a submap
+ * has been encountered.
+ *
+ * Object only fields are filled in through a walking of the object shadow
+ * chain (where one is present), and a walking of the resident page queue.
+ * 
+ */
+
+struct vm_region_submap_info {
+	vm_prot_t		protection;     /* present access protection */
+	vm_prot_t		max_protection; /* max avail through vm_prot */
+	vm_inherit_t		inheritance;/* behavior of map/obj on fork */
+	uint32_t		offset;		/* offset into object/map */
+        unsigned int            user_tag;	/* user tag on map entry */
+        unsigned int            pages_resident;	/* only valid for objects */
+        unsigned int            pages_shared_now_private; /* only for objects */
+        unsigned int            pages_swapped_out; /* only for objects */
+        unsigned int            pages_dirtied;   /* only for objects */
+        unsigned int            ref_count;	 /* obj/map mappers, etc */
+        unsigned short          shadow_depth; 	/* only for obj */
+        unsigned char           external_pager;  /* only for obj */
+        unsigned char           share_mode;	/* see enumeration */
+	boolean_t		is_submap;	/* submap vs obj */
+	vm_behavior_t		behavior;	/* access behavior hint */
+	vm32_object_id_t		object_id;	/* obj/map name, not a handle */
+	unsigned short		user_wired_count; 
+};
+
+typedef struct vm_region_submap_info		*vm_region_submap_info_t;
+typedef struct vm_region_submap_info		 vm_region_submap_info_data_t;
+
+#define VM_REGION_SUBMAP_INFO_COUNT ((mach_msg_type_number_t) \
+	(sizeof(vm_region_submap_info_data_t)/sizeof(int)))
+
+struct vm_region_submap_info_64 {
+	vm_prot_t		protection;     /* present access protection */
+	vm_prot_t		max_protection; /* max avail through vm_prot */
+	vm_inherit_t		inheritance;/* behavior of map/obj on fork */
+	memory_object_offset_t	offset;		/* offset into object/map */
+        unsigned int            user_tag;	/* user tag on map entry */
+        unsigned int            pages_resident;	/* only valid for objects */
+        unsigned int            pages_shared_now_private; /* only for objects */
+        unsigned int            pages_swapped_out; /* only for objects */
+        unsigned int            pages_dirtied;   /* only for objects */
+        unsigned int            ref_count;	 /* obj/map mappers, etc */
+        unsigned short          shadow_depth; 	/* only for obj */
+        unsigned char           external_pager;  /* only for obj */
+        unsigned char           share_mode;	/* see enumeration */
+	boolean_t		is_submap;	/* submap vs obj */
+	vm_behavior_t		behavior;	/* access behavior hint */
+	vm32_object_id_t		object_id;	/* obj/map name, not a handle */
+	unsigned short		user_wired_count; 
+};
+
+typedef struct vm_region_submap_info_64		*vm_region_submap_info_64_t;
+typedef struct vm_region_submap_info_64		 vm_region_submap_info_data_64_t;
+
+#define VM_REGION_SUBMAP_INFO_COUNT_64		((mach_msg_type_number_t) \
+	(sizeof(vm_region_submap_info_data_64_t)/sizeof(int)))
+
+struct vm_region_submap_short_info_64 {
+	vm_prot_t		protection;     /* present access protection */
+	vm_prot_t		max_protection; /* max avail through vm_prot */
+	vm_inherit_t		inheritance;/* behavior of map/obj on fork */
+	memory_object_offset_t	offset;		/* offset into object/map */
+        unsigned int            user_tag;	/* user tag on map entry */
+        unsigned int            ref_count;	 /* obj/map mappers, etc */
+        unsigned short          shadow_depth; 	/* only for obj */
+        unsigned char           external_pager;  /* only for obj */
+        unsigned char           share_mode;	/* see enumeration */
+	boolean_t		is_submap;	/* submap vs obj */
+	vm_behavior_t		behavior;	/* access behavior hint */
+	vm32_object_id_t		object_id;	/* obj/map name, not a handle */
+	unsigned short		user_wired_count; 
+};
+
+typedef struct vm_region_submap_short_info_64	*vm_region_submap_short_info_64_t;
+typedef struct vm_region_submap_short_info_64	 vm_region_submap_short_info_data_64_t;
+
+#define VM_REGION_SUBMAP_SHORT_INFO_COUNT_64	((mach_msg_type_number_t) \
+	(sizeof(vm_region_submap_short_info_data_64_t)/sizeof(int)))
+
+
+struct mach_vm_read_entry {
+	mach_vm_address_t address;
+	mach_vm_size_t size;
+};
+
+struct vm_read_entry {
+	vm_address_t	address;
+	vm_size_t	size;
+};
+
+#if VM32_SUPPORT
+struct vm32_read_entry {
+	vm32_address_t	address;
+	vm32_size_t	size;
+};
+#endif
+
+
+#define VM_MAP_ENTRY_MAX  (256)
+
+typedef struct mach_vm_read_entry	mach_vm_read_entry_t[VM_MAP_ENTRY_MAX];
+typedef struct vm_read_entry		vm_read_entry_t[VM_MAP_ENTRY_MAX];
+#if VM32_SUPPORT
+typedef struct vm32_read_entry		vm32_read_entry_t[VM_MAP_ENTRY_MAX];
+#endif
+
+#pragma pack()
+
+
+#define VM_PAGE_INFO_MAX 
+typedef int *vm_page_info_t;
+typedef int vm_page_info_data_t[VM_PAGE_INFO_MAX];
+typedef int vm_page_info_flavor_t;
+
+#define VM_PAGE_INFO_BASIC		1
+struct vm_page_info_basic {
+	int			disposition;
+	int			ref_count;
+	vm_object_id_t		object_id;
+	memory_object_offset_t	offset;
+	int			depth;
+};
+typedef struct vm_page_info_basic		*vm_page_info_basic_t;
+typedef struct vm_page_info_basic		vm_page_info_basic_data_t;
+
+#define VM_PAGE_INFO_BASIC_COUNT	((mach_msg_type_number_t) \
+	(sizeof(vm_page_info_basic_data_t)/sizeof(int)))
+
+
+#endif	/*_MACH_VM_REGION_H_*/
diff --git a/i386/include/mach/vm_statistics.h b/i386/include/mach/vm_statistics.h
new file mode 100644
index 0000000..016a1c2
--- /dev/null
+++ b/i386/include/mach/vm_statistics.h
@@ -0,0 +1,335 @@
+/*
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ */
+/*
+ *	File:	mach/vm_statistics.h
+ *	Author:	Avadis Tevanian, Jr., Michael Wayne Young, David Golub
+ *
+ *	Virtual memory statistics structure.
+ *
+ */
+
+#ifndef	_MACH_VM_STATISTICS_H_
+#define	_MACH_VM_STATISTICS_H_
+
+#include <mach/machine/vm_types.h>
+
+
+/*
+ * vm_statistics
+ *
+ * History:
+ *	rev0 - 	original structure.
+ *	rev1 - 	added purgable info (purgable_count and purges).
+ *	rev2 - 	added speculative_count.
+ *
+ * Note: you cannot add any new fields to this structure. Add them below in
+ * 	 vm_statistics64.
+ */
+
+struct vm_statistics {
+	natural_t	free_count;		/* # of pages free */
+	natural_t	active_count;		/* # of pages active */
+	natural_t	inactive_count;		/* # of pages inactive */
+	natural_t	wire_count;		/* # of pages wired down */
+	natural_t	zero_fill_count;	/* # of zero fill pages */
+	natural_t	reactivations;		/* # of pages reactivated */
+	natural_t	pageins;		/* # of pageins */
+	natural_t	pageouts;		/* # of pageouts */
+	natural_t	faults;			/* # of faults */
+	natural_t	cow_faults;		/* # of copy-on-writes */
+	natural_t	lookups;		/* object cache lookups */
+	natural_t	hits;			/* object cache hits */
+
+	/* added for rev1 */
+	natural_t	purgeable_count;	/* # of pages purgeable */
+	natural_t	purges;			/* # of pages purged */
+
+	/* added for rev2 */
+	/*
+	 * NB: speculative pages are already accounted for in "free_count",
+	 * so "speculative_count" is the number of "free" pages that are
+	 * used to hold data that was read speculatively from disk but
+	 * haven't actually been used by anyone so far.
+	 */
+	natural_t	speculative_count;	/* # of pages speculative */
+};
+
+/* Used by all architectures */
+typedef struct vm_statistics	*vm_statistics_t;
+typedef struct vm_statistics	vm_statistics_data_t;
+
+#if defined(__ppc__) /* On ppc, vm statistics are still 32-bit */
+
+typedef struct vm_statistics	*vm_statistics64_t;
+typedef struct vm_statistics	vm_statistics64_data_t;
+
+#define VM_STATISTICS_TRUNCATE_TO_32_BIT(value) value
+
+#else /* !(defined(__ppc__))  */
+
+/* 
+ * vm_statistics64
+ *
+ * History:
+ *	rev0 - 	original structure.
+ *	rev1 - 	added purgable info (purgable_count and purges).
+ *	rev2 - 	added speculative_count.
+ *	   ----
+ *	rev3 - 	changed name to vm_statistics64.
+ *		changed some fields in structure to 64-bit on 
+ *		arm, i386 and x86_64 architectures.
+ *
+ */
+
+struct vm_statistics64 {
+	natural_t	free_count;		/* # of pages free */
+	natural_t	active_count;		/* # of pages active */
+	natural_t	inactive_count;		/* # of pages inactive */
+	natural_t	wire_count;		/* # of pages wired down */
+	uint64_t	zero_fill_count;	/* # of zero fill pages */
+	uint64_t	reactivations;		/* # of pages reactivated */
+	uint64_t	pageins;		/* # of pageins */
+	uint64_t	pageouts;		/* # of pageouts */
+	uint64_t	faults;			/* # of faults */
+	uint64_t	cow_faults;		/* # of copy-on-writes */
+	uint64_t	lookups;		/* object cache lookups */
+	uint64_t	hits;			/* object cache hits */
+
+	/* added for rev1 */
+	uint64_t	purges;			/* # of pages purged */
+	natural_t	purgeable_count;	/* # of pages purgeable */
+
+	/* added for rev2 */
+	/*
+	 * NB: speculative pages are already accounted for in "free_count",
+	 * so "speculative_count" is the number of "free" pages that are
+	 * used to hold data that was read speculatively from disk but
+	 * haven't actually been used by anyone so far.
+	 */
+	natural_t	speculative_count;	/* # of pages speculative */
+
+}
+#ifdef __arm__
+__attribute__((aligned(8)))
+#endif
+;
+
+typedef struct vm_statistics64	*vm_statistics64_t;
+typedef struct vm_statistics64	vm_statistics64_data_t;
+
+/* 
+ * VM_STATISTICS_TRUNCATE_TO_32_BIT
+ *
+ * This is used by host_statistics() to truncate and peg the 64-bit in-kernel values from
+ * vm_statistics64 to the 32-bit values of the older structure above (vm_statistics).
+ */
+#define VM_STATISTICS_TRUNCATE_TO_32_BIT(value) ((uint32_t)(((value) > UINT32_MAX ) ? UINT32_MAX : (value)))
+
+#endif /* !(defined(__ppc__)) */
+
+
+/* included for the vm_map_page_query call */
+
+#define VM_PAGE_QUERY_PAGE_PRESENT      0x1
+#define VM_PAGE_QUERY_PAGE_FICTITIOUS   0x2
+#define VM_PAGE_QUERY_PAGE_REF          0x4
+#define VM_PAGE_QUERY_PAGE_DIRTY        0x8
+#define VM_PAGE_QUERY_PAGE_PAGED_OUT    0x10
+#define VM_PAGE_QUERY_PAGE_COPIED       0x20
+#define VM_PAGE_QUERY_PAGE_SPECULATIVE	0x40
+#define VM_PAGE_QUERY_PAGE_EXTERNAL	0x80
+#define VM_PAGE_QUERY_PAGE_CS_VALIDATED	0x100
+#define VM_PAGE_QUERY_PAGE_CS_TAINTED	0x200
+
+
+/*
+ * VM allocation flags:
+ * 
+ * VM_FLAGS_FIXED
+ * 	(really the absence of VM_FLAGS_ANYWHERE)
+ *	Allocate new VM region at the specified virtual address, if possible.
+ * 
+ * VM_FLAGS_ANYWHERE
+ *	Allocate new VM region anywhere it would fit in the address space.
+ *
+ * VM_FLAGS_PURGABLE
+ *	Create a purgable VM object for that new VM region.
+ *
+ * VM_FLAGS_NO_PMAP_CHECK
+ *	(for DEBUG kernel config only, ignored for other configs)
+ *	Do not check that there is no stale pmap mapping for the new VM region.
+ *	This is useful for kernel memory allocations at bootstrap when building
+ *	the initial kernel address space while some memory is already in use.
+ *
+ * VM_FLAGS_OVERWRITE
+ *	The new VM region can replace existing VM regions if necessary
+ *	(to be used in combination with VM_FLAGS_FIXED).
+ *
+ * VM_FLAGS_NO_CACHE
+ *	Pages brought in to this VM region are placed on the speculative
+ *	queue instead of the active queue.  In other words, they are not
+ *	cached so that they will be stolen first if memory runs low.
+ */
+#define VM_FLAGS_FIXED		0x0000
+#define VM_FLAGS_ANYWHERE	0x0001
+#define VM_FLAGS_PURGABLE	0x0002
+#define VM_FLAGS_NO_CACHE	0x0010
+
+/*
+ * VM_FLAGS_SUPERPAGE_MASK
+ *	3 bits that specify whether large pages should be used instead of
+ *	base pages (!=0), as well as the requested page size.
+ */
+#define VM_FLAGS_SUPERPAGE_MASK	0x70000	/* bits 0x10000, 0x20000, 0x40000 */
+#define VM_FLAGS_SUPERPAGE_SHIFT 16
+
+#define SUPERPAGE_NONE			0	/* no superpages, if all bits are 0 */
+#define VM_FLAGS_SUPERPAGE_NONE		(SUPERPAGE_NONE<<VM_FLAGS_SUPERPAGE_SHIFT)
+#if defined(__x86_64__) || !defined(KERNEL)
+#define SUPERPAGE_SIZE_2MB		1
+#define VM_FLAGS_SUPERPAGE_SIZE_2MB	(SUPERPAGE_SIZE_2MB<<VM_FLAGS_SUPERPAGE_SHIFT)
+#endif
+
+#define VM_FLAGS_ALIAS_MASK	0xFF000000
+#define VM_GET_FLAGS_ALIAS(flags, alias)			\
+		(alias) = ((flags) & VM_FLAGS_ALIAS_MASK) >> 24	
+#define VM_SET_FLAGS_ALIAS(flags, alias)			\
+		(flags) = (((flags) & ~VM_FLAGS_ALIAS_MASK) |	\
+		(((alias) & ~VM_FLAGS_ALIAS_MASK) << 24))
+
+/* These are the flags that we accept from user-space */
+#define VM_FLAGS_USER_ALLOCATE	(VM_FLAGS_FIXED |		\
+				 VM_FLAGS_ANYWHERE |		\
+				 VM_FLAGS_PURGABLE |		\
+				 VM_FLAGS_NO_CACHE |		\
+				 VM_FLAGS_SUPERPAGE_MASK |	\
+				 VM_FLAGS_ALIAS_MASK)
+#define VM_FLAGS_USER_MAP	VM_FLAGS_USER_ALLOCATE
+
+#define VM_MEMORY_MALLOC 1
+#define VM_MEMORY_MALLOC_SMALL 2
+#define VM_MEMORY_MALLOC_LARGE 3
+#define VM_MEMORY_MALLOC_HUGE 4
+#define VM_MEMORY_SBRK 5// uninteresting -- no one should call
+#define VM_MEMORY_REALLOC 6
+#define VM_MEMORY_MALLOC_TINY 7
+#define VM_MEMORY_MALLOC_LARGE_REUSABLE 8
+#define VM_MEMORY_MALLOC_LARGE_REUSED 9
+
+#define VM_MEMORY_ANALYSIS_TOOL 10
+
+#define VM_MEMORY_MACH_MSG 20
+#define VM_MEMORY_IOKIT	21
+#define VM_MEMORY_STACK  30
+#define VM_MEMORY_GUARD  31
+#define	VM_MEMORY_SHARED_PMAP 32
+/* memory containing a dylib */
+#define VM_MEMORY_DYLIB	33
+#define VM_MEMORY_OBJC_DISPATCHERS 34
+
+// Placeholders for now -- as we analyze the libraries and find how they
+// use memory, we can make these labels more specific.
+#define VM_MEMORY_APPKIT 40
+#define VM_MEMORY_FOUNDATION 41
+#define VM_MEMORY_COREGRAPHICS 42
+#define VM_MEMORY_CARBON 43
+#define VM_MEMORY_JAVA 44
+#define VM_MEMORY_ATS 50
+#define VM_MEMORY_LAYERKIT 51
+#define VM_MEMORY_CGIMAGE 52
+#define VM_MEMORY_TCMALLOC 53
+
+/* private raster data (i.e. layers, some images, QGL allocator) */
+#define	VM_MEMORY_COREGRAPHICS_DATA	54
+
+/* shared image and font caches */
+#define VM_MEMORY_COREGRAPHICS_SHARED	55
+
+/* Memory used for virtual framebuffers, shadowing buffers, etc... */
+#define	VM_MEMORY_COREGRAPHICS_FRAMEBUFFERS	56
+
+/* Window backing stores, custom shadow data, and compressed backing stores */
+#define VM_MEMORY_COREGRAPHICS_BACKINGSTORES	57
+
+/* catch-all for other uses, such as the read-only shared data page */
+#define VM_MEMORY_COREGRAPHICS_MISC VM_MEMORY_COREGRAPHICS
+
+/* memory allocated by the dynamic loader for itself */
+#define VM_MEMORY_DYLD 60
+/* malloc'd memory created by dyld */
+#define VM_MEMORY_DYLD_MALLOC 61
+
+/* Used for sqlite page cache */
+#define VM_MEMORY_SQLITE 62
+
+/* JavaScriptCore heaps */
+#define VM_MEMORY_JAVASCRIPT_CORE 63
+/* memory allocated for the JIT */
+#define VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR 64
+#define VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE 65
+
+/* memory allocated for GLSL */
+#define VM_MEMORY_GLSL  66
+
+/* Reserve 240-255 for application */
+#define VM_MEMORY_APPLICATION_SPECIFIC_1 240
+#define VM_MEMORY_APPLICATION_SPECIFIC_16 255
+
+#define VM_MAKE_TAG(tag) ((tag) << 24)
+
+#endif	/* _MACH_VM_STATISTICS_H_ */
diff --git a/i386/include/mach/vm_sync.h b/i386/include/mach/vm_sync.h
new file mode 100644
index 0000000..dfb948b
--- /dev/null
+++ b/i386/include/mach/vm_sync.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ */
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ */
+/*
+ *	File:	mach/vm_sync.h
+ *
+ *	Virtual memory synchronisation definitions.
+ *
+ */
+
+#ifndef _MACH_VM_SYNC_H_
+#define _MACH_VM_SYNC_H_
+
+typedef unsigned		vm_sync_t;
+
+/*
+ *	Synchronization flags, defined as bits within the vm_sync_t type
+ */
+
+#define	VM_SYNC_ASYNCHRONOUS	((vm_sync_t) 0x01)
+#define	VM_SYNC_SYNCHRONOUS	((vm_sync_t) 0x02)
+#define VM_SYNC_INVALIDATE	((vm_sync_t) 0x04)
+#define VM_SYNC_KILLPAGES       ((vm_sync_t) 0x08)
+#define VM_SYNC_DEACTIVATE      ((vm_sync_t) 0x10)
+#define VM_SYNC_CONTIGUOUS      ((vm_sync_t) 0x20)
+#define VM_SYNC_REUSABLEPAGES	((vm_sync_t) 0x40)
+
+#endif  /* _MACH_VM_SYNC_H_ */
diff --git a/i386/include/mach/vm_task.h b/i386/include/mach/vm_task.h
new file mode 100644
index 0000000..d2401ac
--- /dev/null
+++ b/i386/include/mach/vm_task.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+** This file contains compatibilty wrapper header for things that are
+** generated from mach/vm_map.defs into mach/vm_map.h. 
+** 
+** This file will go away eventually - please switch.
+*/
+#include <mach/vm_map.h>
diff --git a/i386/include/mach/vm_types.h b/i386/include/mach/vm_types.h
new file mode 100644
index 0000000..37f4bd5
--- /dev/null
+++ b/i386/include/mach/vm_types.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * @OSF_COPYRIGHT@
+ * 
+ */
+#ifndef	_MACH_VM_TYPES_H_
+#define _MACH_VM_TYPES_H_
+
+#include <mach/port.h>
+#include <mach/machine/vm_types.h>
+
+#include <stdint.h>
+
+typedef vm_offset_t     	pointer_t;
+typedef vm_offset_t     	vm_address_t;
+
+/*
+ * We use addr64_t for 64-bit addresses that are used on both
+ * 32 and 64-bit machines.  On PPC, they are passed and returned as
+ * two adjacent 32-bit GPRs.  We use addr64_t in places where
+ * common code must be useable both on 32 and 64-bit machines.
+ */
+typedef uint64_t addr64_t;		/* Basic effective address */
+
+/*
+ * We use reg64_t for addresses that are 32 bits on a 32-bit
+ * machine, and 64 bits on a 64-bit machine, but are always
+ * passed and returned in a single GPR on PPC.  This type
+ * cannot be used in generic 32-bit c, since on a 64-bit
+ * machine the upper half of the register will be ignored
+ * by the c compiler in 32-bit mode.  In c, we can only use the
+ * type in prototypes of functions that are written in and called
+ * from assembly language.  This type is basically a comment.
+ */
+typedef	uint32_t	reg64_t;
+
+/*
+ * To minimize the use of 64-bit fields, we keep some physical
+ * addresses (that are page aligned) as 32-bit page numbers. 
+ * This limits the physical address space to 16TB of RAM.
+ */
+typedef uint32_t ppnum_t;		/* Physical page number */
+#define PPNUM_MAX UINT32_MAX
+
+
+
+typedef mach_port_t		vm_map_t;
+
+
+#define VM_MAP_NULL		((vm_map_t) 0)
+
+/*
+ * Evolving definitions, likely to change.
+ */
+
+typedef uint64_t		vm_object_offset_t;
+typedef uint64_t		vm_object_size_t;
+
+
+typedef mach_port_t		upl_t;
+typedef mach_port_t		vm_named_entry_t;
+
+
+#define UPL_NULL		((upl_t) 0)
+#define VM_NAMED_ENTRY_NULL	((vm_named_entry_t) 0)
+
+#endif	/* _MACH_VM_TYPES_H_ */
diff --git a/i386/include/mach/x86_64/.svn/all-wcprops b/i386/include/mach/x86_64/.svn/all-wcprops
new file mode 100644
index 0000000..c569814
--- /dev/null
+++ b/i386/include/mach/x86_64/.svn/all-wcprops
@@ -0,0 +1,17 @@
+K 25
+svn:wc:ra_dav:version-url
+V 58
+/svn/chameleon/!svn/ver/881/trunk/i386/include/mach/x86_64
+END
+thread_act.h
+K 25
+svn:wc:ra_dav:version-url
+V 71
+/svn/chameleon/!svn/ver/881/trunk/i386/include/mach/x86_64/thread_act.h
+END
+task.h
+K 25
+svn:wc:ra_dav:version-url
+V 65
+/svn/chameleon/!svn/ver/881/trunk/i386/include/mach/x86_64/task.h
+END
diff --git a/i386/include/mach/x86_64/.svn/entries b/i386/include/mach/x86_64/.svn/entries
new file mode 100644
index 0000000..0636f47
--- /dev/null
+++ b/i386/include/mach/x86_64/.svn/entries
@@ -0,0 +1,96 @@
+10
+
+dir
+2117
+http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/mach/x86_64
+http://forge.voodooprojects.org/svn/chameleon
+
+
+
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+b5af796a-00a8-11df-919b-ffff7a100b7d
+
+thread_act.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+25d845f2e915a195e887ae48026bf854
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+25654
+
+task.h
+file
+
+
+
+
+2012-10-03T17:50:21.000000Z
+d87c8dd8a5baf21d6cd2fb7fd2c6775d
+2011-05-26T03:34:29.106114Z
+881
+meklort
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+34704
+
diff --git a/i386/include/mach/x86_64/.svn/text-base/task.h.svn-base b/i386/include/mach/x86_64/.svn/text-base/task.h.svn-base
new file mode 100644
index 0000000..15c8248
--- /dev/null
+++ b/i386/include/mach/x86_64/.svn/text-base/task.h.svn-base
@@ -0,0 +1,1578 @@
+#ifndef	_task_user_
+#define	_task_user_
+
+/* Module task */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	task_MSG_COUNT
+#define	task_MSG_COUNT	35
+#endif	/* task_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine task_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_create
+(
+	task_t target_task,
+	ledger_array_t ledgers,
+	mach_msg_type_number_t ledgersCnt,
+	boolean_t inherit_memory,
+	task_t *child_task
+);
+
+/* Routine task_terminate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_terminate
+(
+	task_t target_task
+);
+
+/* Routine task_threads */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_threads
+(
+	task_t target_task,
+	thread_act_array_t *act_list,
+	mach_msg_type_number_t *act_listCnt
+);
+
+/* Routine mach_ports_register */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_ports_register
+(
+	task_t target_task,
+	mach_port_array_t init_port_set,
+	mach_msg_type_number_t init_port_setCnt
+);
+
+/* Routine mach_ports_lookup */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_ports_lookup
+(
+	task_t target_task,
+	mach_port_array_t *init_port_set,
+	mach_msg_type_number_t *init_port_setCnt
+);
+
+/* Routine task_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_info
+(
+	task_name_t target_task,
+	task_flavor_t flavor,
+	task_info_t task_info_out,
+	mach_msg_type_number_t *task_info_outCnt
+);
+
+/* Routine task_set_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_info
+(
+	task_t target_task,
+	task_flavor_t flavor,
+	task_info_t task_info_in,
+	mach_msg_type_number_t task_info_inCnt
+);
+
+/* Routine task_suspend */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_suspend
+(
+	task_t target_task
+);
+
+/* Routine task_resume */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_resume
+(
+	task_t target_task
+);
+
+/* Routine task_get_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_special_port
+(
+	task_t task,
+	int which_port,
+	mach_port_t *special_port
+);
+
+/* Routine task_set_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_special_port
+(
+	task_t task,
+	int which_port,
+	mach_port_t special_port
+);
+
+/* Routine thread_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_create
+(
+	task_t parent_task,
+	thread_act_t *child_act
+);
+
+/* Routine thread_create_running */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_create_running
+(
+	task_t parent_task,
+	thread_state_flavor_t flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt,
+	thread_act_t *child_act
+);
+
+/* Routine task_set_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_exception_ports
+(
+	task_t task,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor
+);
+
+/* Routine task_get_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_exception_ports
+(
+	task_t task,
+	exception_mask_t exception_mask,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlers,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine task_swap_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_swap_exception_ports
+(
+	task_t task,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlerss,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine lock_set_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_set_create
+(
+	task_t task,
+	lock_set_t *new_lock_set,
+	int n_ulocks,
+	int policy
+);
+
+/* Routine lock_set_destroy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_set_destroy
+(
+	task_t task,
+	lock_set_t lock_set
+);
+
+/* Routine semaphore_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t semaphore_create
+(
+	task_t task,
+	semaphore_t *semaphore,
+	int policy,
+	int value
+);
+
+/* Routine semaphore_destroy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t semaphore_destroy
+(
+	task_t task,
+	semaphore_t semaphore
+);
+
+/* Routine task_policy_set */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_policy_set
+(
+	task_t task,
+	task_policy_flavor_t flavor,
+	task_policy_t policy_info,
+	mach_msg_type_number_t policy_infoCnt
+);
+
+/* Routine task_policy_get */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_policy_get
+(
+	task_t task,
+	task_policy_flavor_t flavor,
+	task_policy_t policy_info,
+	mach_msg_type_number_t *policy_infoCnt,
+	boolean_t *get_default
+);
+
+/* Routine task_sample */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_sample
+(
+	task_t task,
+	mach_port_t reply
+);
+
+/* Routine task_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_policy
+(
+	task_t task,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	boolean_t set_limit,
+	boolean_t change
+);
+
+/* Routine task_set_emulation */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_emulation
+(
+	task_t target_port,
+	vm_address_t routine_entry_pt,
+	int routine_number
+);
+
+/* Routine task_get_emulation_vector */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_emulation_vector
+(
+	task_t task,
+	int *vector_start,
+	emulation_vector_t *emulation_vector,
+	mach_msg_type_number_t *emulation_vectorCnt
+);
+
+/* Routine task_set_emulation_vector */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_emulation_vector
+(
+	task_t task,
+	int vector_start,
+	emulation_vector_t emulation_vector,
+	mach_msg_type_number_t emulation_vectorCnt
+);
+
+/* Routine task_set_ras_pc */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_ras_pc
+(
+	task_t target_task,
+	vm_address_t basepc,
+	vm_address_t boundspc
+);
+
+/* Routine task_assign */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_assign
+(
+	task_t task,
+	processor_set_t new_set,
+	boolean_t assign_threads
+);
+
+/* Routine task_assign_default */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_assign_default
+(
+	task_t task,
+	boolean_t assign_threads
+);
+
+/* Routine task_get_assignment */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_assignment
+(
+	task_t task,
+	processor_set_name_t *assigned_set
+);
+
+/* Routine task_set_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_policy
+(
+	task_t task,
+	processor_set_t pset,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	policy_limit_t limit,
+	mach_msg_type_number_t limitCnt,
+	boolean_t change
+);
+
+/* Routine task_get_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_state
+(
+	task_t task,
+	thread_state_flavor_t flavor,
+	thread_state_t old_state,
+	mach_msg_type_number_t *old_stateCnt
+);
+
+/* Routine task_set_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_state
+(
+	task_t task,
+	thread_state_flavor_t flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__task_subsystem__defined
+#define __Request__task_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t ledgers;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t ledgersCnt;
+		boolean_t inherit_memory;
+	} __Request__task_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_threads_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t init_port_set;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t init_port_setCnt;
+	} __Request__mach_ports_register_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__mach_ports_lookup_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_flavor_t flavor;
+		mach_msg_type_number_t task_info_outCnt;
+	} __Request__task_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_flavor_t flavor;
+		mach_msg_type_number_t task_info_inCnt;
+		integer_t task_info_in[10];
+	} __Request__task_set_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__task_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__task_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__thread_create_running_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__task_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+	} __Request__task_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__task_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int n_ulocks;
+		int policy;
+	} __Request__lock_set_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t lock_set;
+		/* end of the kernel processed data */
+	} __Request__lock_set_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int policy;
+		int value;
+	} __Request__semaphore_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t semaphore;
+		/* end of the kernel processed data */
+	} __Request__semaphore_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+	} __Request__task_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		boolean_t get_default;
+	} __Request__task_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t reply;
+		/* end of the kernel processed data */
+	} __Request__task_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		boolean_t set_limit;
+		boolean_t change;
+	} __Request__task_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t routine_entry_pt;
+		int routine_number;
+	} __Request__task_set_emulation_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_get_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t emulation_vector;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int vector_start;
+		mach_msg_type_number_t emulation_vectorCnt;
+	} __Request__task_set_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t basepc;
+		vm_address_t boundspc;
+	} __Request__task_set_ras_pc_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_set;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		boolean_t assign_threads;
+	} __Request__task_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		boolean_t assign_threads;
+	} __Request__task_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t pset;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		mach_msg_type_number_t limitCnt;
+		integer_t limit[1];
+		boolean_t change;
+	} __Request__task_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t old_stateCnt;
+	} __Request__task_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__task_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__task_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__task_subsystem__defined
+#define __RequestUnion__task_subsystem__defined
+union __RequestUnion__task_subsystem {
+	__Request__task_create_t Request_task_create;
+	__Request__task_terminate_t Request_task_terminate;
+	__Request__task_threads_t Request_task_threads;
+	__Request__mach_ports_register_t Request_mach_ports_register;
+	__Request__mach_ports_lookup_t Request_mach_ports_lookup;
+	__Request__task_info_t Request_task_info;
+	__Request__task_set_info_t Request_task_set_info;
+	__Request__task_suspend_t Request_task_suspend;
+	__Request__task_resume_t Request_task_resume;
+	__Request__task_get_special_port_t Request_task_get_special_port;
+	__Request__task_set_special_port_t Request_task_set_special_port;
+	__Request__thread_create_t Request_thread_create;
+	__Request__thread_create_running_t Request_thread_create_running;
+	__Request__task_set_exception_ports_t Request_task_set_exception_ports;
+	__Request__task_get_exception_ports_t Request_task_get_exception_ports;
+	__Request__task_swap_exception_ports_t Request_task_swap_exception_ports;
+	__Request__lock_set_create_t Request_lock_set_create;
+	__Request__lock_set_destroy_t Request_lock_set_destroy;
+	__Request__semaphore_create_t Request_semaphore_create;
+	__Request__semaphore_destroy_t Request_semaphore_destroy;
+	__Request__task_policy_set_t Request_task_policy_set;
+	__Request__task_policy_get_t Request_task_policy_get;
+	__Request__task_sample_t Request_task_sample;
+	__Request__task_policy_t Request_task_policy;
+	__Request__task_set_emulation_t Request_task_set_emulation;
+	__Request__task_get_emulation_vector_t Request_task_get_emulation_vector;
+	__Request__task_set_emulation_vector_t Request_task_set_emulation_vector;
+	__Request__task_set_ras_pc_t Request_task_set_ras_pc;
+	__Request__task_assign_t Request_task_assign;
+	__Request__task_assign_default_t Request_task_assign_default;
+	__Request__task_get_assignment_t Request_task_get_assignment;
+	__Request__task_set_policy_t Request_task_set_policy;
+	__Request__task_get_state_t Request_task_get_state;
+	__Request__task_set_state_t Request_task_set_state;
+};
+#endif /* !__RequestUnion__task_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__task_subsystem__defined
+#define __Reply__task_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_task;
+		/* end of the kernel processed data */
+	} __Reply__task_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t act_list;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t act_listCnt;
+	} __Reply__task_threads_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_ports_register_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t init_port_set;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t init_port_setCnt;
+	} __Reply__mach_ports_lookup_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t task_info_outCnt;
+		integer_t task_info_out[10];
+	} __Reply__task_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+	} __Reply__task_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_act;
+		/* end of the kernel processed data */
+	} __Reply__thread_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_act;
+		/* end of the kernel processed data */
+	} __Reply__thread_create_running_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlers[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__task_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlerss[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__task_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_lock_set;
+		/* end of the kernel processed data */
+	} __Reply__lock_set_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__lock_set_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t semaphore;
+		/* end of the kernel processed data */
+	} __Reply__semaphore_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__semaphore_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+		boolean_t get_default;
+	} __Reply__task_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_emulation_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t emulation_vector;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int vector_start;
+		mach_msg_type_number_t emulation_vectorCnt;
+	} __Reply__task_get_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_ras_pc_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t assigned_set;
+		/* end of the kernel processed data */
+	} __Reply__task_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Reply__task_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__task_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__task_subsystem__defined
+#define __ReplyUnion__task_subsystem__defined
+union __ReplyUnion__task_subsystem {
+	__Reply__task_create_t Reply_task_create;
+	__Reply__task_terminate_t Reply_task_terminate;
+	__Reply__task_threads_t Reply_task_threads;
+	__Reply__mach_ports_register_t Reply_mach_ports_register;
+	__Reply__mach_ports_lookup_t Reply_mach_ports_lookup;
+	__Reply__task_info_t Reply_task_info;
+	__Reply__task_set_info_t Reply_task_set_info;
+	__Reply__task_suspend_t Reply_task_suspend;
+	__Reply__task_resume_t Reply_task_resume;
+	__Reply__task_get_special_port_t Reply_task_get_special_port;
+	__Reply__task_set_special_port_t Reply_task_set_special_port;
+	__Reply__thread_create_t Reply_thread_create;
+	__Reply__thread_create_running_t Reply_thread_create_running;
+	__Reply__task_set_exception_ports_t Reply_task_set_exception_ports;
+	__Reply__task_get_exception_ports_t Reply_task_get_exception_ports;
+	__Reply__task_swap_exception_ports_t Reply_task_swap_exception_ports;
+	__Reply__lock_set_create_t Reply_lock_set_create;
+	__Reply__lock_set_destroy_t Reply_lock_set_destroy;
+	__Reply__semaphore_create_t Reply_semaphore_create;
+	__Reply__semaphore_destroy_t Reply_semaphore_destroy;
+	__Reply__task_policy_set_t Reply_task_policy_set;
+	__Reply__task_policy_get_t Reply_task_policy_get;
+	__Reply__task_sample_t Reply_task_sample;
+	__Reply__task_policy_t Reply_task_policy;
+	__Reply__task_set_emulation_t Reply_task_set_emulation;
+	__Reply__task_get_emulation_vector_t Reply_task_get_emulation_vector;
+	__Reply__task_set_emulation_vector_t Reply_task_set_emulation_vector;
+	__Reply__task_set_ras_pc_t Reply_task_set_ras_pc;
+	__Reply__task_assign_t Reply_task_assign;
+	__Reply__task_assign_default_t Reply_task_assign_default;
+	__Reply__task_get_assignment_t Reply_task_get_assignment;
+	__Reply__task_set_policy_t Reply_task_set_policy;
+	__Reply__task_get_state_t Reply_task_get_state;
+	__Reply__task_set_state_t Reply_task_set_state;
+};
+#endif /* !__RequestUnion__task_subsystem__defined */
+
+#ifndef subsystem_to_name_map_task
+#define subsystem_to_name_map_task \
+    { "task_create", 3400 },\
+    { "task_terminate", 3401 },\
+    { "task_threads", 3402 },\
+    { "mach_ports_register", 3403 },\
+    { "mach_ports_lookup", 3404 },\
+    { "task_info", 3405 },\
+    { "task_set_info", 3406 },\
+    { "task_suspend", 3407 },\
+    { "task_resume", 3408 },\
+    { "task_get_special_port", 3409 },\
+    { "task_set_special_port", 3410 },\
+    { "thread_create", 3411 },\
+    { "thread_create_running", 3412 },\
+    { "task_set_exception_ports", 3413 },\
+    { "task_get_exception_ports", 3414 },\
+    { "task_swap_exception_ports", 3415 },\
+    { "lock_set_create", 3416 },\
+    { "lock_set_destroy", 3417 },\
+    { "semaphore_create", 3418 },\
+    { "semaphore_destroy", 3419 },\
+    { "task_policy_set", 3420 },\
+    { "task_policy_get", 3421 },\
+    { "task_sample", 3422 },\
+    { "task_policy", 3423 },\
+    { "task_set_emulation", 3424 },\
+    { "task_get_emulation_vector", 3425 },\
+    { "task_set_emulation_vector", 3426 },\
+    { "task_set_ras_pc", 3427 },\
+    { "task_assign", 3429 },\
+    { "task_assign_default", 3430 },\
+    { "task_get_assignment", 3431 },\
+    { "task_set_policy", 3432 },\
+    { "task_get_state", 3433 },\
+    { "task_set_state", 3434 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _task_user_ */
diff --git a/i386/include/mach/x86_64/.svn/text-base/thread_act.h.svn-base b/i386/include/mach/x86_64/.svn/text-base/thread_act.h.svn-base
new file mode 100644
index 0000000..fde4189
--- /dev/null
+++ b/i386/include/mach/x86_64/.svn/text-base/thread_act.h.svn-base
@@ -0,0 +1,1155 @@
+#ifndef	_thread_act_user_
+#define	_thread_act_user_
+
+/* Module thread_act */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	thread_act_MSG_COUNT
+#define	thread_act_MSG_COUNT	25
+#endif	/* thread_act_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine thread_terminate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_terminate
+(
+	thread_act_t target_act
+);
+
+/* Routine act_get_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t act_get_state
+(
+	thread_act_t target_act,
+	int flavor,
+	thread_state_t old_state,
+	mach_msg_type_number_t *old_stateCnt
+);
+
+/* Routine act_set_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t act_set_state
+(
+	thread_act_t target_act,
+	int flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt
+);
+
+/* Routine thread_get_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_state
+(
+	thread_act_t target_act,
+	thread_state_flavor_t flavor,
+	thread_state_t old_state,
+	mach_msg_type_number_t *old_stateCnt
+);
+
+/* Routine thread_set_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_state
+(
+	thread_act_t target_act,
+	thread_state_flavor_t flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt
+);
+
+/* Routine thread_suspend */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_suspend
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_resume */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_resume
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_abort */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_abort
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_abort_safely */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_abort_safely
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_depress_abort */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_depress_abort
+(
+	thread_act_t thread
+);
+
+/* Routine thread_get_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_special_port
+(
+	thread_act_t thr_act,
+	int which_port,
+	mach_port_t *special_port
+);
+
+/* Routine thread_set_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_special_port
+(
+	thread_act_t thr_act,
+	int which_port,
+	mach_port_t special_port
+);
+
+/* Routine thread_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_info
+(
+	thread_act_t target_act,
+	thread_flavor_t flavor,
+	thread_info_t thread_info_out,
+	mach_msg_type_number_t *thread_info_outCnt
+);
+
+/* Routine thread_set_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_exception_ports
+(
+	thread_act_t thread,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor
+);
+
+/* Routine thread_get_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_exception_ports
+(
+	thread_act_t thread,
+	exception_mask_t exception_mask,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlers,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine thread_swap_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_swap_exception_ports
+(
+	thread_act_t thread,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlers,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine thread_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_policy
+(
+	thread_act_t thr_act,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	boolean_t set_limit
+);
+
+/* Routine thread_policy_set */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_policy_set
+(
+	thread_act_t thread,
+	thread_policy_flavor_t flavor,
+	thread_policy_t policy_info,
+	mach_msg_type_number_t policy_infoCnt
+);
+
+/* Routine thread_policy_get */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_policy_get
+(
+	thread_act_t thread,
+	thread_policy_flavor_t flavor,
+	thread_policy_t policy_info,
+	mach_msg_type_number_t *policy_infoCnt,
+	boolean_t *get_default
+);
+
+/* Routine thread_sample */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_sample
+(
+	thread_act_t thread,
+	mach_port_t reply
+);
+
+/* Routine etap_trace_thread */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t etap_trace_thread
+(
+	thread_act_t target_act,
+	boolean_t trace_status
+);
+
+/* Routine thread_assign */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_assign
+(
+	thread_act_t thread,
+	processor_set_t new_set
+);
+
+/* Routine thread_assign_default */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_assign_default
+(
+	thread_act_t thread
+);
+
+/* Routine thread_get_assignment */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_assignment
+(
+	thread_act_t thread,
+	processor_set_name_t *assigned_set
+);
+
+/* Routine thread_set_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_policy
+(
+	thread_act_t thr_act,
+	processor_set_t pset,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	policy_limit_t limit,
+	mach_msg_type_number_t limitCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__thread_act_subsystem__defined
+#define __Request__thread_act_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int flavor;
+		mach_msg_type_number_t old_stateCnt;
+	} __Request__act_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__act_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t old_stateCnt;
+	} __Request__thread_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__thread_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_abort_safely_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_depress_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__thread_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__thread_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_flavor_t flavor;
+		mach_msg_type_number_t thread_info_outCnt;
+	} __Request__thread_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__thread_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+	} __Request__thread_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__thread_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		boolean_t set_limit;
+	} __Request__thread_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+	} __Request__thread_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		boolean_t get_default;
+	} __Request__thread_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t reply;
+		/* end of the kernel processed data */
+	} __Request__thread_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		boolean_t trace_status;
+	} __Request__etap_trace_thread_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_set;
+		/* end of the kernel processed data */
+	} __Request__thread_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t pset;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		mach_msg_type_number_t limitCnt;
+		integer_t limit[1];
+	} __Request__thread_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__thread_act_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__thread_act_subsystem__defined
+#define __RequestUnion__thread_act_subsystem__defined
+union __RequestUnion__thread_act_subsystem {
+	__Request__thread_terminate_t Request_thread_terminate;
+	__Request__act_get_state_t Request_act_get_state;
+	__Request__act_set_state_t Request_act_set_state;
+	__Request__thread_get_state_t Request_thread_get_state;
+	__Request__thread_set_state_t Request_thread_set_state;
+	__Request__thread_suspend_t Request_thread_suspend;
+	__Request__thread_resume_t Request_thread_resume;
+	__Request__thread_abort_t Request_thread_abort;
+	__Request__thread_abort_safely_t Request_thread_abort_safely;
+	__Request__thread_depress_abort_t Request_thread_depress_abort;
+	__Request__thread_get_special_port_t Request_thread_get_special_port;
+	__Request__thread_set_special_port_t Request_thread_set_special_port;
+	__Request__thread_info_t Request_thread_info;
+	__Request__thread_set_exception_ports_t Request_thread_set_exception_ports;
+	__Request__thread_get_exception_ports_t Request_thread_get_exception_ports;
+	__Request__thread_swap_exception_ports_t Request_thread_swap_exception_ports;
+	__Request__thread_policy_t Request_thread_policy;
+	__Request__thread_policy_set_t Request_thread_policy_set;
+	__Request__thread_policy_get_t Request_thread_policy_get;
+	__Request__thread_sample_t Request_thread_sample;
+	__Request__etap_trace_thread_t Request_etap_trace_thread;
+	__Request__thread_assign_t Request_thread_assign;
+	__Request__thread_assign_default_t Request_thread_assign_default;
+	__Request__thread_get_assignment_t Request_thread_get_assignment;
+	__Request__thread_set_policy_t Request_thread_set_policy;
+};
+#endif /* !__RequestUnion__thread_act_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__thread_act_subsystem__defined
+#define __Reply__thread_act_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Reply__act_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__act_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Reply__thread_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_abort_safely_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_depress_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+	} __Reply__thread_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t thread_info_outCnt;
+		integer_t thread_info_out[12];
+	} __Reply__thread_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlers[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__thread_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlers[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__thread_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+		boolean_t get_default;
+	} __Reply__thread_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__etap_trace_thread_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t assigned_set;
+		/* end of the kernel processed data */
+	} __Reply__thread_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__thread_act_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__thread_act_subsystem__defined
+#define __ReplyUnion__thread_act_subsystem__defined
+union __ReplyUnion__thread_act_subsystem {
+	__Reply__thread_terminate_t Reply_thread_terminate;
+	__Reply__act_get_state_t Reply_act_get_state;
+	__Reply__act_set_state_t Reply_act_set_state;
+	__Reply__thread_get_state_t Reply_thread_get_state;
+	__Reply__thread_set_state_t Reply_thread_set_state;
+	__Reply__thread_suspend_t Reply_thread_suspend;
+	__Reply__thread_resume_t Reply_thread_resume;
+	__Reply__thread_abort_t Reply_thread_abort;
+	__Reply__thread_abort_safely_t Reply_thread_abort_safely;
+	__Reply__thread_depress_abort_t Reply_thread_depress_abort;
+	__Reply__thread_get_special_port_t Reply_thread_get_special_port;
+	__Reply__thread_set_special_port_t Reply_thread_set_special_port;
+	__Reply__thread_info_t Reply_thread_info;
+	__Reply__thread_set_exception_ports_t Reply_thread_set_exception_ports;
+	__Reply__thread_get_exception_ports_t Reply_thread_get_exception_ports;
+	__Reply__thread_swap_exception_ports_t Reply_thread_swap_exception_ports;
+	__Reply__thread_policy_t Reply_thread_policy;
+	__Reply__thread_policy_set_t Reply_thread_policy_set;
+	__Reply__thread_policy_get_t Reply_thread_policy_get;
+	__Reply__thread_sample_t Reply_thread_sample;
+	__Reply__etap_trace_thread_t Reply_etap_trace_thread;
+	__Reply__thread_assign_t Reply_thread_assign;
+	__Reply__thread_assign_default_t Reply_thread_assign_default;
+	__Reply__thread_get_assignment_t Reply_thread_get_assignment;
+	__Reply__thread_set_policy_t Reply_thread_set_policy;
+};
+#endif /* !__RequestUnion__thread_act_subsystem__defined */
+
+#ifndef subsystem_to_name_map_thread_act
+#define subsystem_to_name_map_thread_act \
+    { "thread_terminate", 3600 },\
+    { "act_get_state", 3601 },\
+    { "act_set_state", 3602 },\
+    { "thread_get_state", 3603 },\
+    { "thread_set_state", 3604 },\
+    { "thread_suspend", 3605 },\
+    { "thread_resume", 3606 },\
+    { "thread_abort", 3607 },\
+    { "thread_abort_safely", 3608 },\
+    { "thread_depress_abort", 3609 },\
+    { "thread_get_special_port", 3610 },\
+    { "thread_set_special_port", 3611 },\
+    { "thread_info", 3612 },\
+    { "thread_set_exception_ports", 3613 },\
+    { "thread_get_exception_ports", 3614 },\
+    { "thread_swap_exception_ports", 3615 },\
+    { "thread_policy", 3616 },\
+    { "thread_policy_set", 3617 },\
+    { "thread_policy_get", 3618 },\
+    { "thread_sample", 3619 },\
+    { "etap_trace_thread", 3620 },\
+    { "thread_assign", 3621 },\
+    { "thread_assign_default", 3622 },\
+    { "thread_get_assignment", 3623 },\
+    { "thread_set_policy", 3624 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _thread_act_user_ */
diff --git a/i386/include/mach/x86_64/task.h b/i386/include/mach/x86_64/task.h
new file mode 100644
index 0000000..15c8248
--- /dev/null
+++ b/i386/include/mach/x86_64/task.h
@@ -0,0 +1,1578 @@
+#ifndef	_task_user_
+#define	_task_user_
+
+/* Module task */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	task_MSG_COUNT
+#define	task_MSG_COUNT	35
+#endif	/* task_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine task_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_create
+(
+	task_t target_task,
+	ledger_array_t ledgers,
+	mach_msg_type_number_t ledgersCnt,
+	boolean_t inherit_memory,
+	task_t *child_task
+);
+
+/* Routine task_terminate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_terminate
+(
+	task_t target_task
+);
+
+/* Routine task_threads */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_threads
+(
+	task_t target_task,
+	thread_act_array_t *act_list,
+	mach_msg_type_number_t *act_listCnt
+);
+
+/* Routine mach_ports_register */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_ports_register
+(
+	task_t target_task,
+	mach_port_array_t init_port_set,
+	mach_msg_type_number_t init_port_setCnt
+);
+
+/* Routine mach_ports_lookup */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t mach_ports_lookup
+(
+	task_t target_task,
+	mach_port_array_t *init_port_set,
+	mach_msg_type_number_t *init_port_setCnt
+);
+
+/* Routine task_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_info
+(
+	task_name_t target_task,
+	task_flavor_t flavor,
+	task_info_t task_info_out,
+	mach_msg_type_number_t *task_info_outCnt
+);
+
+/* Routine task_set_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_info
+(
+	task_t target_task,
+	task_flavor_t flavor,
+	task_info_t task_info_in,
+	mach_msg_type_number_t task_info_inCnt
+);
+
+/* Routine task_suspend */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_suspend
+(
+	task_t target_task
+);
+
+/* Routine task_resume */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_resume
+(
+	task_t target_task
+);
+
+/* Routine task_get_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_special_port
+(
+	task_t task,
+	int which_port,
+	mach_port_t *special_port
+);
+
+/* Routine task_set_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_special_port
+(
+	task_t task,
+	int which_port,
+	mach_port_t special_port
+);
+
+/* Routine thread_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_create
+(
+	task_t parent_task,
+	thread_act_t *child_act
+);
+
+/* Routine thread_create_running */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_create_running
+(
+	task_t parent_task,
+	thread_state_flavor_t flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt,
+	thread_act_t *child_act
+);
+
+/* Routine task_set_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_exception_ports
+(
+	task_t task,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor
+);
+
+/* Routine task_get_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_exception_ports
+(
+	task_t task,
+	exception_mask_t exception_mask,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlers,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine task_swap_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_swap_exception_ports
+(
+	task_t task,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlerss,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine lock_set_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_set_create
+(
+	task_t task,
+	lock_set_t *new_lock_set,
+	int n_ulocks,
+	int policy
+);
+
+/* Routine lock_set_destroy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t lock_set_destroy
+(
+	task_t task,
+	lock_set_t lock_set
+);
+
+/* Routine semaphore_create */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t semaphore_create
+(
+	task_t task,
+	semaphore_t *semaphore,
+	int policy,
+	int value
+);
+
+/* Routine semaphore_destroy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t semaphore_destroy
+(
+	task_t task,
+	semaphore_t semaphore
+);
+
+/* Routine task_policy_set */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_policy_set
+(
+	task_t task,
+	task_policy_flavor_t flavor,
+	task_policy_t policy_info,
+	mach_msg_type_number_t policy_infoCnt
+);
+
+/* Routine task_policy_get */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_policy_get
+(
+	task_t task,
+	task_policy_flavor_t flavor,
+	task_policy_t policy_info,
+	mach_msg_type_number_t *policy_infoCnt,
+	boolean_t *get_default
+);
+
+/* Routine task_sample */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_sample
+(
+	task_t task,
+	mach_port_t reply
+);
+
+/* Routine task_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_policy
+(
+	task_t task,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	boolean_t set_limit,
+	boolean_t change
+);
+
+/* Routine task_set_emulation */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_emulation
+(
+	task_t target_port,
+	vm_address_t routine_entry_pt,
+	int routine_number
+);
+
+/* Routine task_get_emulation_vector */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_emulation_vector
+(
+	task_t task,
+	int *vector_start,
+	emulation_vector_t *emulation_vector,
+	mach_msg_type_number_t *emulation_vectorCnt
+);
+
+/* Routine task_set_emulation_vector */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_emulation_vector
+(
+	task_t task,
+	int vector_start,
+	emulation_vector_t emulation_vector,
+	mach_msg_type_number_t emulation_vectorCnt
+);
+
+/* Routine task_set_ras_pc */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_ras_pc
+(
+	task_t target_task,
+	vm_address_t basepc,
+	vm_address_t boundspc
+);
+
+/* Routine task_assign */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_assign
+(
+	task_t task,
+	processor_set_t new_set,
+	boolean_t assign_threads
+);
+
+/* Routine task_assign_default */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_assign_default
+(
+	task_t task,
+	boolean_t assign_threads
+);
+
+/* Routine task_get_assignment */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_assignment
+(
+	task_t task,
+	processor_set_name_t *assigned_set
+);
+
+/* Routine task_set_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_policy
+(
+	task_t task,
+	processor_set_t pset,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	policy_limit_t limit,
+	mach_msg_type_number_t limitCnt,
+	boolean_t change
+);
+
+/* Routine task_get_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_get_state
+(
+	task_t task,
+	thread_state_flavor_t flavor,
+	thread_state_t old_state,
+	mach_msg_type_number_t *old_stateCnt
+);
+
+/* Routine task_set_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t task_set_state
+(
+	task_t task,
+	thread_state_flavor_t flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__task_subsystem__defined
+#define __Request__task_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t ledgers;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t ledgersCnt;
+		boolean_t inherit_memory;
+	} __Request__task_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_threads_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t init_port_set;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t init_port_setCnt;
+	} __Request__mach_ports_register_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__mach_ports_lookup_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_flavor_t flavor;
+		mach_msg_type_number_t task_info_outCnt;
+	} __Request__task_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_flavor_t flavor;
+		mach_msg_type_number_t task_info_inCnt;
+		integer_t task_info_in[10];
+	} __Request__task_set_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__task_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__task_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__thread_create_running_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__task_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+	} __Request__task_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__task_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int n_ulocks;
+		int policy;
+	} __Request__lock_set_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t lock_set;
+		/* end of the kernel processed data */
+	} __Request__lock_set_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int policy;
+		int value;
+	} __Request__semaphore_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t semaphore;
+		/* end of the kernel processed data */
+	} __Request__semaphore_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+	} __Request__task_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		task_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		boolean_t get_default;
+	} __Request__task_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t reply;
+		/* end of the kernel processed data */
+	} __Request__task_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		boolean_t set_limit;
+		boolean_t change;
+	} __Request__task_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t routine_entry_pt;
+		int routine_number;
+	} __Request__task_set_emulation_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_get_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t emulation_vector;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int vector_start;
+		mach_msg_type_number_t emulation_vectorCnt;
+	} __Request__task_set_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		vm_address_t basepc;
+		vm_address_t boundspc;
+	} __Request__task_set_ras_pc_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_set;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		boolean_t assign_threads;
+	} __Request__task_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		boolean_t assign_threads;
+	} __Request__task_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__task_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t pset;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		mach_msg_type_number_t limitCnt;
+		integer_t limit[1];
+		boolean_t change;
+	} __Request__task_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t old_stateCnt;
+	} __Request__task_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__task_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__task_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__task_subsystem__defined
+#define __RequestUnion__task_subsystem__defined
+union __RequestUnion__task_subsystem {
+	__Request__task_create_t Request_task_create;
+	__Request__task_terminate_t Request_task_terminate;
+	__Request__task_threads_t Request_task_threads;
+	__Request__mach_ports_register_t Request_mach_ports_register;
+	__Request__mach_ports_lookup_t Request_mach_ports_lookup;
+	__Request__task_info_t Request_task_info;
+	__Request__task_set_info_t Request_task_set_info;
+	__Request__task_suspend_t Request_task_suspend;
+	__Request__task_resume_t Request_task_resume;
+	__Request__task_get_special_port_t Request_task_get_special_port;
+	__Request__task_set_special_port_t Request_task_set_special_port;
+	__Request__thread_create_t Request_thread_create;
+	__Request__thread_create_running_t Request_thread_create_running;
+	__Request__task_set_exception_ports_t Request_task_set_exception_ports;
+	__Request__task_get_exception_ports_t Request_task_get_exception_ports;
+	__Request__task_swap_exception_ports_t Request_task_swap_exception_ports;
+	__Request__lock_set_create_t Request_lock_set_create;
+	__Request__lock_set_destroy_t Request_lock_set_destroy;
+	__Request__semaphore_create_t Request_semaphore_create;
+	__Request__semaphore_destroy_t Request_semaphore_destroy;
+	__Request__task_policy_set_t Request_task_policy_set;
+	__Request__task_policy_get_t Request_task_policy_get;
+	__Request__task_sample_t Request_task_sample;
+	__Request__task_policy_t Request_task_policy;
+	__Request__task_set_emulation_t Request_task_set_emulation;
+	__Request__task_get_emulation_vector_t Request_task_get_emulation_vector;
+	__Request__task_set_emulation_vector_t Request_task_set_emulation_vector;
+	__Request__task_set_ras_pc_t Request_task_set_ras_pc;
+	__Request__task_assign_t Request_task_assign;
+	__Request__task_assign_default_t Request_task_assign_default;
+	__Request__task_get_assignment_t Request_task_get_assignment;
+	__Request__task_set_policy_t Request_task_set_policy;
+	__Request__task_get_state_t Request_task_get_state;
+	__Request__task_set_state_t Request_task_set_state;
+};
+#endif /* !__RequestUnion__task_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__task_subsystem__defined
+#define __Reply__task_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_task;
+		/* end of the kernel processed data */
+	} __Reply__task_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t act_list;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t act_listCnt;
+	} __Reply__task_threads_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__mach_ports_register_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_ports_descriptor_t init_port_set;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t init_port_setCnt;
+	} __Reply__mach_ports_lookup_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t task_info_outCnt;
+		integer_t task_info_out[10];
+	} __Reply__task_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+	} __Reply__task_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_act;
+		/* end of the kernel processed data */
+	} __Reply__thread_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t child_act;
+		/* end of the kernel processed data */
+	} __Reply__thread_create_running_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlers[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__task_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlerss[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__task_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_lock_set;
+		/* end of the kernel processed data */
+	} __Reply__lock_set_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__lock_set_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t semaphore;
+		/* end of the kernel processed data */
+	} __Reply__semaphore_create_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__semaphore_destroy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+		boolean_t get_default;
+	} __Reply__task_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_emulation_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_ool_descriptor_t emulation_vector;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int vector_start;
+		mach_msg_type_number_t emulation_vectorCnt;
+	} __Reply__task_get_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_emulation_vector_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_ras_pc_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t assigned_set;
+		/* end of the kernel processed data */
+	} __Reply__task_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Reply__task_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__task_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__task_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__task_subsystem__defined
+#define __ReplyUnion__task_subsystem__defined
+union __ReplyUnion__task_subsystem {
+	__Reply__task_create_t Reply_task_create;
+	__Reply__task_terminate_t Reply_task_terminate;
+	__Reply__task_threads_t Reply_task_threads;
+	__Reply__mach_ports_register_t Reply_mach_ports_register;
+	__Reply__mach_ports_lookup_t Reply_mach_ports_lookup;
+	__Reply__task_info_t Reply_task_info;
+	__Reply__task_set_info_t Reply_task_set_info;
+	__Reply__task_suspend_t Reply_task_suspend;
+	__Reply__task_resume_t Reply_task_resume;
+	__Reply__task_get_special_port_t Reply_task_get_special_port;
+	__Reply__task_set_special_port_t Reply_task_set_special_port;
+	__Reply__thread_create_t Reply_thread_create;
+	__Reply__thread_create_running_t Reply_thread_create_running;
+	__Reply__task_set_exception_ports_t Reply_task_set_exception_ports;
+	__Reply__task_get_exception_ports_t Reply_task_get_exception_ports;
+	__Reply__task_swap_exception_ports_t Reply_task_swap_exception_ports;
+	__Reply__lock_set_create_t Reply_lock_set_create;
+	__Reply__lock_set_destroy_t Reply_lock_set_destroy;
+	__Reply__semaphore_create_t Reply_semaphore_create;
+	__Reply__semaphore_destroy_t Reply_semaphore_destroy;
+	__Reply__task_policy_set_t Reply_task_policy_set;
+	__Reply__task_policy_get_t Reply_task_policy_get;
+	__Reply__task_sample_t Reply_task_sample;
+	__Reply__task_policy_t Reply_task_policy;
+	__Reply__task_set_emulation_t Reply_task_set_emulation;
+	__Reply__task_get_emulation_vector_t Reply_task_get_emulation_vector;
+	__Reply__task_set_emulation_vector_t Reply_task_set_emulation_vector;
+	__Reply__task_set_ras_pc_t Reply_task_set_ras_pc;
+	__Reply__task_assign_t Reply_task_assign;
+	__Reply__task_assign_default_t Reply_task_assign_default;
+	__Reply__task_get_assignment_t Reply_task_get_assignment;
+	__Reply__task_set_policy_t Reply_task_set_policy;
+	__Reply__task_get_state_t Reply_task_get_state;
+	__Reply__task_set_state_t Reply_task_set_state;
+};
+#endif /* !__RequestUnion__task_subsystem__defined */
+
+#ifndef subsystem_to_name_map_task
+#define subsystem_to_name_map_task \
+    { "task_create", 3400 },\
+    { "task_terminate", 3401 },\
+    { "task_threads", 3402 },\
+    { "mach_ports_register", 3403 },\
+    { "mach_ports_lookup", 3404 },\
+    { "task_info", 3405 },\
+    { "task_set_info", 3406 },\
+    { "task_suspend", 3407 },\
+    { "task_resume", 3408 },\
+    { "task_get_special_port", 3409 },\
+    { "task_set_special_port", 3410 },\
+    { "thread_create", 3411 },\
+    { "thread_create_running", 3412 },\
+    { "task_set_exception_ports", 3413 },\
+    { "task_get_exception_ports", 3414 },\
+    { "task_swap_exception_ports", 3415 },\
+    { "lock_set_create", 3416 },\
+    { "lock_set_destroy", 3417 },\
+    { "semaphore_create", 3418 },\
+    { "semaphore_destroy", 3419 },\
+    { "task_policy_set", 3420 },\
+    { "task_policy_get", 3421 },\
+    { "task_sample", 3422 },\
+    { "task_policy", 3423 },\
+    { "task_set_emulation", 3424 },\
+    { "task_get_emulation_vector", 3425 },\
+    { "task_set_emulation_vector", 3426 },\
+    { "task_set_ras_pc", 3427 },\
+    { "task_assign", 3429 },\
+    { "task_assign_default", 3430 },\
+    { "task_get_assignment", 3431 },\
+    { "task_set_policy", 3432 },\
+    { "task_get_state", 3433 },\
+    { "task_set_state", 3434 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _task_user_ */
diff --git a/i386/include/mach/x86_64/thread_act.h b/i386/include/mach/x86_64/thread_act.h
new file mode 100644
index 0000000..fde4189
--- /dev/null
+++ b/i386/include/mach/x86_64/thread_act.h
@@ -0,0 +1,1155 @@
+#ifndef	_thread_act_user_
+#define	_thread_act_user_
+
+/* Module thread_act */
+
+#include <string.h>
+#include <mach/ndr.h>
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/notify.h>
+#include <mach/mach_types.h>
+#include <mach/message.h>
+#include <mach/mig_errors.h>
+#include <mach/port.h>
+
+#ifdef AUTOTEST
+#ifndef FUNCTION_PTR_T
+#define FUNCTION_PTR_T
+typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
+typedef struct {
+        char            *name;
+        function_ptr_t  function;
+} function_table_entry;
+typedef function_table_entry   *function_table_t;
+#endif /* FUNCTION_PTR_T */
+#endif /* AUTOTEST */
+
+#ifndef	thread_act_MSG_COUNT
+#define	thread_act_MSG_COUNT	25
+#endif	/* thread_act_MSG_COUNT */
+
+#include <mach/std_types.h>
+#include <mach/mig.h>
+#include <mach/mig.h>
+#include <mach/mach_types.h>
+
+#ifdef __BeforeMigUserHeader
+__BeforeMigUserHeader
+#endif /* __BeforeMigUserHeader */
+
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
+
+/* Routine thread_terminate */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_terminate
+(
+	thread_act_t target_act
+);
+
+/* Routine act_get_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t act_get_state
+(
+	thread_act_t target_act,
+	int flavor,
+	thread_state_t old_state,
+	mach_msg_type_number_t *old_stateCnt
+);
+
+/* Routine act_set_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t act_set_state
+(
+	thread_act_t target_act,
+	int flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt
+);
+
+/* Routine thread_get_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_state
+(
+	thread_act_t target_act,
+	thread_state_flavor_t flavor,
+	thread_state_t old_state,
+	mach_msg_type_number_t *old_stateCnt
+);
+
+/* Routine thread_set_state */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_state
+(
+	thread_act_t target_act,
+	thread_state_flavor_t flavor,
+	thread_state_t new_state,
+	mach_msg_type_number_t new_stateCnt
+);
+
+/* Routine thread_suspend */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_suspend
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_resume */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_resume
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_abort */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_abort
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_abort_safely */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_abort_safely
+(
+	thread_act_t target_act
+);
+
+/* Routine thread_depress_abort */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_depress_abort
+(
+	thread_act_t thread
+);
+
+/* Routine thread_get_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_special_port
+(
+	thread_act_t thr_act,
+	int which_port,
+	mach_port_t *special_port
+);
+
+/* Routine thread_set_special_port */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_special_port
+(
+	thread_act_t thr_act,
+	int which_port,
+	mach_port_t special_port
+);
+
+/* Routine thread_info */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_info
+(
+	thread_act_t target_act,
+	thread_flavor_t flavor,
+	thread_info_t thread_info_out,
+	mach_msg_type_number_t *thread_info_outCnt
+);
+
+/* Routine thread_set_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_exception_ports
+(
+	thread_act_t thread,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor
+);
+
+/* Routine thread_get_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_exception_ports
+(
+	thread_act_t thread,
+	exception_mask_t exception_mask,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlers,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine thread_swap_exception_ports */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_swap_exception_ports
+(
+	thread_act_t thread,
+	exception_mask_t exception_mask,
+	mach_port_t new_port,
+	exception_behavior_t behavior,
+	thread_state_flavor_t new_flavor,
+	exception_mask_array_t masks,
+	mach_msg_type_number_t *masksCnt,
+	exception_handler_array_t old_handlers,
+	exception_behavior_array_t old_behaviors,
+	exception_flavor_array_t old_flavors
+);
+
+/* Routine thread_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_policy
+(
+	thread_act_t thr_act,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	boolean_t set_limit
+);
+
+/* Routine thread_policy_set */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_policy_set
+(
+	thread_act_t thread,
+	thread_policy_flavor_t flavor,
+	thread_policy_t policy_info,
+	mach_msg_type_number_t policy_infoCnt
+);
+
+/* Routine thread_policy_get */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_policy_get
+(
+	thread_act_t thread,
+	thread_policy_flavor_t flavor,
+	thread_policy_t policy_info,
+	mach_msg_type_number_t *policy_infoCnt,
+	boolean_t *get_default
+);
+
+/* Routine thread_sample */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_sample
+(
+	thread_act_t thread,
+	mach_port_t reply
+);
+
+/* Routine etap_trace_thread */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t etap_trace_thread
+(
+	thread_act_t target_act,
+	boolean_t trace_status
+);
+
+/* Routine thread_assign */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_assign
+(
+	thread_act_t thread,
+	processor_set_t new_set
+);
+
+/* Routine thread_assign_default */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_assign_default
+(
+	thread_act_t thread
+);
+
+/* Routine thread_get_assignment */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_get_assignment
+(
+	thread_act_t thread,
+	processor_set_name_t *assigned_set
+);
+
+/* Routine thread_set_policy */
+#ifdef	mig_external
+mig_external
+#else
+extern
+#endif	/* mig_external */
+kern_return_t thread_set_policy
+(
+	thread_act_t thr_act,
+	processor_set_t pset,
+	policy_t policy,
+	policy_base_t base,
+	mach_msg_type_number_t baseCnt,
+	policy_limit_t limit,
+	mach_msg_type_number_t limitCnt
+);
+
+__END_DECLS
+
+/********************** Caution **************************/
+/* The following data types should be used to calculate  */
+/* maximum message sizes only. The actual message may be */
+/* smaller, and the position of the arguments within the */
+/* message layout may vary from what is presented here.  */
+/* For example, if any of the arguments are variable-    */
+/* sized, and less than the maximum is sent, the data    */
+/* will be packed tight in the actual message to reduce  */
+/* the presence of holes.                                */
+/********************** Caution **************************/
+
+/* typedefs for all requests */
+
+#ifndef __Request__thread_act_subsystem__defined
+#define __Request__thread_act_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int flavor;
+		mach_msg_type_number_t old_stateCnt;
+	} __Request__act_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__act_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t old_stateCnt;
+	} __Request__thread_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_state_flavor_t flavor;
+		mach_msg_type_number_t new_stateCnt;
+		natural_t new_state[144];
+	} __Request__thread_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_abort_safely_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_depress_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__thread_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		int which_port;
+	} __Request__thread_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_flavor_t flavor;
+		mach_msg_type_number_t thread_info_outCnt;
+	} __Request__thread_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__thread_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+	} __Request__thread_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_port;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		exception_mask_t exception_mask;
+		exception_behavior_t behavior;
+		thread_state_flavor_t new_flavor;
+	} __Request__thread_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		boolean_t set_limit;
+	} __Request__thread_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+	} __Request__thread_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		thread_policy_flavor_t flavor;
+		mach_msg_type_number_t policy_infoCnt;
+		boolean_t get_default;
+	} __Request__thread_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t reply;
+		/* end of the kernel processed data */
+	} __Request__thread_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		boolean_t trace_status;
+	} __Request__etap_trace_thread_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t new_set;
+		/* end of the kernel processed data */
+	} __Request__thread_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+	} __Request__thread_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t pset;
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		policy_t policy;
+		mach_msg_type_number_t baseCnt;
+		integer_t base[5];
+		mach_msg_type_number_t limitCnt;
+		integer_t limit[1];
+	} __Request__thread_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Request__thread_act_subsystem__defined */
+
+/* union of all requests */
+
+#ifndef __RequestUnion__thread_act_subsystem__defined
+#define __RequestUnion__thread_act_subsystem__defined
+union __RequestUnion__thread_act_subsystem {
+	__Request__thread_terminate_t Request_thread_terminate;
+	__Request__act_get_state_t Request_act_get_state;
+	__Request__act_set_state_t Request_act_set_state;
+	__Request__thread_get_state_t Request_thread_get_state;
+	__Request__thread_set_state_t Request_thread_set_state;
+	__Request__thread_suspend_t Request_thread_suspend;
+	__Request__thread_resume_t Request_thread_resume;
+	__Request__thread_abort_t Request_thread_abort;
+	__Request__thread_abort_safely_t Request_thread_abort_safely;
+	__Request__thread_depress_abort_t Request_thread_depress_abort;
+	__Request__thread_get_special_port_t Request_thread_get_special_port;
+	__Request__thread_set_special_port_t Request_thread_set_special_port;
+	__Request__thread_info_t Request_thread_info;
+	__Request__thread_set_exception_ports_t Request_thread_set_exception_ports;
+	__Request__thread_get_exception_ports_t Request_thread_get_exception_ports;
+	__Request__thread_swap_exception_ports_t Request_thread_swap_exception_ports;
+	__Request__thread_policy_t Request_thread_policy;
+	__Request__thread_policy_set_t Request_thread_policy_set;
+	__Request__thread_policy_get_t Request_thread_policy_get;
+	__Request__thread_sample_t Request_thread_sample;
+	__Request__etap_trace_thread_t Request_etap_trace_thread;
+	__Request__thread_assign_t Request_thread_assign;
+	__Request__thread_assign_default_t Request_thread_assign_default;
+	__Request__thread_get_assignment_t Request_thread_get_assignment;
+	__Request__thread_set_policy_t Request_thread_set_policy;
+};
+#endif /* !__RequestUnion__thread_act_subsystem__defined */
+/* typedefs for all replies */
+
+#ifndef __Reply__thread_act_subsystem__defined
+#define __Reply__thread_act_subsystem__defined
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_terminate_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Reply__act_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__act_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t old_stateCnt;
+		natural_t old_state[144];
+	} __Reply__thread_get_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_state_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_suspend_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_resume_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_abort_safely_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_depress_abort_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t special_port;
+		/* end of the kernel processed data */
+	} __Reply__thread_get_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_special_port_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t thread_info_outCnt;
+		integer_t thread_info_out[12];
+	} __Reply__thread_info_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlers[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__thread_get_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t old_handlers[32];
+		/* end of the kernel processed data */
+		NDR_record_t NDR;
+		mach_msg_type_number_t masksCnt;
+		exception_mask_t masks[32];
+		exception_behavior_t old_behaviors[32];
+		thread_state_flavor_t old_flavors[32];
+	} __Reply__thread_swap_exception_ports_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_policy_set_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+		mach_msg_type_number_t policy_infoCnt;
+		integer_t policy_info[16];
+		boolean_t get_default;
+	} __Reply__thread_policy_get_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_sample_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__etap_trace_thread_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_assign_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_assign_default_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		/* start of the kernel processed data */
+		mach_msg_body_t msgh_body;
+		mach_msg_port_descriptor_t assigned_set;
+		/* end of the kernel processed data */
+	} __Reply__thread_get_assignment_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+
+#ifdef  __MigPackStructs
+#pragma pack(4)
+#endif
+	typedef struct {
+		mach_msg_header_t Head;
+		NDR_record_t NDR;
+		kern_return_t RetCode;
+	} __Reply__thread_set_policy_t;
+#ifdef  __MigPackStructs
+#pragma pack()
+#endif
+#endif /* !__Reply__thread_act_subsystem__defined */
+
+/* union of all replies */
+
+#ifndef __ReplyUnion__thread_act_subsystem__defined
+#define __ReplyUnion__thread_act_subsystem__defined
+union __ReplyUnion__thread_act_subsystem {
+	__Reply__thread_terminate_t Reply_thread_terminate;
+	__Reply__act_get_state_t Reply_act_get_state;
+	__Reply__act_set_state_t Reply_act_set_state;
+	__Reply__thread_get_state_t Reply_thread_get_state;
+	__Reply__thread_set_state_t Reply_thread_set_state;
+	__Reply__thread_suspend_t Reply_thread_suspend;
+	__Reply__thread_resume_t Reply_thread_resume;
+	__Reply__thread_abort_t Reply_thread_abort;
+	__Reply__thread_abort_safely_t Reply_thread_abort_safely;
+	__Reply__thread_depress_abort_t Reply_thread_depress_abort;
+	__Reply__thread_get_special_port_t Reply_thread_get_special_port;
+	__Reply__thread_set_special_port_t Reply_thread_set_special_port;
+	__Reply__thread_info_t Reply_thread_info;
+	__Reply__thread_set_exception_ports_t Reply_thread_set_exception_ports;
+	__Reply__thread_get_exception_ports_t Reply_thread_get_exception_ports;
+	__Reply__thread_swap_exception_ports_t Reply_thread_swap_exception_ports;
+	__Reply__thread_policy_t Reply_thread_policy;
+	__Reply__thread_policy_set_t Reply_thread_policy_set;
+	__Reply__thread_policy_get_t Reply_thread_policy_get;
+	__Reply__thread_sample_t Reply_thread_sample;
+	__Reply__etap_trace_thread_t Reply_etap_trace_thread;
+	__Reply__thread_assign_t Reply_thread_assign;
+	__Reply__thread_assign_default_t Reply_thread_assign_default;
+	__Reply__thread_get_assignment_t Reply_thread_get_assignment;
+	__Reply__thread_set_policy_t Reply_thread_set_policy;
+};
+#endif /* !__RequestUnion__thread_act_subsystem__defined */
+
+#ifndef subsystem_to_name_map_thread_act
+#define subsystem_to_name_map_thread_act \
+    { "thread_terminate", 3600 },\
+    { "act_get_state", 3601 },\
+    { "act_set_state", 3602 },\
+    { "thread_get_state", 3603 },\
+    { "thread_set_state", 3604 },\
+    { "thread_suspend", 3605 },\
+    { "thread_resume", 3606 },\
+    { "thread_abort", 3607 },\
+    { "thread_abort_safely", 3608 },\
+    { "thread_depress_abort", 3609 },\
+    { "thread_get_special_port", 3610 },\
+    { "thread_set_special_port", 3611 },\
+    { "thread_info", 3612 },\
+    { "thread_set_exception_ports", 3613 },\
+    { "thread_get_exception_ports", 3614 },\
+    { "thread_swap_exception_ports", 3615 },\
+    { "thread_policy", 3616 },\
+    { "thread_policy_set", 3617 },\
+    { "thread_policy_get", 3618 },\
+    { "thread_sample", 3619 },\
+    { "etap_trace_thread", 3620 },\
+    { "thread_assign", 3621 },\
+    { "thread_assign_default", 3622 },\
+    { "thread_get_assignment", 3623 },\
+    { "thread_set_policy", 3624 }
+#endif
+
+#ifdef __AfterMigUserHeader
+__AfterMigUserHeader
+#endif /* __AfterMigUserHeader */
+
+#endif	 /* _thread_act_user_ */
diff --git a/i386/include/machine/_limits.h b/i386/include/machine/_limits.h
new file mode 100644
index 0000000..373e726
--- /dev/null
+++ b/i386/include/machine/_limits.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _BSD_MACHINE__LIMITS_H_
+#define _BSD_MACHINE__LIMITS_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/_limits.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "i386/_limits.h"
+#elif defined (__arm__)
+#include "arm/_limits.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _BSD_MACHINE__LIMITS_H_ */
diff --git a/i386/include/machine/_param.h b/i386/include/machine/_param.h
new file mode 100644
index 0000000..4171fd0
--- /dev/null
+++ b/i386/include/machine/_param.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/_param.h"
+#elif defined (__i386__) || defined (__x86_64__)
+#include "i386/_param.h"
+#elif defined (__arm__)
+#include "arm/_param.h"
+#else
+#error architecture not supported
+#endif
diff --git a/i386/include/machine/_structs.h b/i386/include/machine/_structs.h
new file mode 100644
index 0000000..0e35938
--- /dev/null
+++ b/i386/include/machine/_structs.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/_structs.h"
+#elif defined (__i386__) || defined (__x86_64__)
+#include "i386/_structs.h"
+#elif defined (__arm__)
+#include "arm/_structs.h"
+#else
+#error architecture not supported
+#endif
diff --git a/i386/include/machine/_types.h b/i386/include/machine/_types.h
new file mode 100644
index 0000000..9f2d6d2
--- /dev/null
+++ b/i386/include/machine/_types.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2003-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _BSD_MACHINE__TYPES_H_
+#define _BSD_MACHINE__TYPES_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/_types.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "i386/_types.h"
+#elif defined (__arm__)
+#include "arm/_types.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _BSD_MACHINE__TYPES_H_ */
diff --git a/i386/include/machine/byte_order.h b/i386/include/machine/byte_order.h
new file mode 100644
index 0000000..4008142
--- /dev/null
+++ b/i386/include/machine/byte_order.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1995 NeXT Computer, Inc.
+ */
+
+#ifndef	_BSD_MACHINE_BYTE_ORDER_H_
+#define _BSD_MACHINE_BYTE_ORDER_H_
+ 
+#include <architecture/byte_order.h>
+
+#endif	/* _BSD_MACHINE_BYTE_ORDER_H_ */
diff --git a/i386/include/machine/endian.h b/i386/include/machine/endian.h
new file mode 100644
index 0000000..a49d52a
--- /dev/null
+++ b/i386/include/machine/endian.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright 1995 NeXT Computer, Inc. All rights reserved.
+ */
+#ifndef _BSD_MACHINE_ENDIAN_H_
+#define _BSD_MACHINE_ENDIAN_H_
+
+#if defined (__ppc__) || defined(__ppc64__)
+#include "ppc/endian.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "i386/endian.h"
+#elif defined (__arm__)
+#include "arm/endian.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _BSD_MACHINE_ENDIAN_H_ */
diff --git a/i386/include/machine/fasttrap_isa.h b/i386/include/machine/fasttrap_isa.h
new file mode 100644
index 0000000..fa881d3
--- /dev/null
+++ b/i386/include/machine/fasttrap_isa.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _BSD_MACHINE_FASTTRAP_ISA_H_
+#define _BSD_MACHINE_FASTTRAP_ISA_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/fasttrap_isa.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "i386/fasttrap_isa.h"
+#elif defined (__arm__)
+#include "arm/fasttrap_isa.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _BSD_MACHINE_FASTTRAP_ISA_H_ */
diff --git a/i386/include/machine/limits.h b/i386/include/machine/limits.h
new file mode 100644
index 0000000..d52080f
--- /dev/null
+++ b/i386/include/machine/limits.h
@@ -0,0 +1,13 @@
+/* This is the `system' limits.h, independent of any particular
+   compiler.  GCC provides its own limits.h which can be found in
+   /usr/lib/gcc, although it is not very informative.  
+   This file is public domain.  */
+#if defined (__ppc__) || defined (__ppc64__)
+#include <ppc/limits.h>
+#elif defined (__i386__) || defined(__x86_64__)
+#include <i386/limits.h>
+#elif defined (__arm__)
+#include <arm/limits.h>
+#else
+#error architecture not supported
+#endif
diff --git a/i386/include/machine/param.h b/i386/include/machine/param.h
new file mode 100644
index 0000000..0b2a2ad
--- /dev/null
+++ b/i386/include/machine/param.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright 1995 NeXT Computer, Inc. All rights reserved.
+ */
+#ifndef _BSD_MACHINE_PARAM_H_
+#define _BSD_MACHINE_PARAM_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/param.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "i386/param.h"
+#elif defined (__arm__)
+#include "arm/param.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _BSD_MACHINE_PARAM_H_ */
diff --git a/i386/include/machine/profile.h b/i386/include/machine/profile.h
new file mode 100644
index 0000000..45e4de8
--- /dev/null
+++ b/i386/include/machine/profile.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 1997-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * History :
+ *	29-Sep-1997  Umesh Vaishampayan
+ *		Created.
+ */
+#ifndef _BSD_MACHINE_PROFILE_H_
+#define _BSD_MACHINE_PROFILE_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/profile.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "i386/profile.h"
+#elif defined (__arm__)
+#include "arm/profile.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _BSD_MACHINE_PROFILE_H_ */
diff --git a/i386/include/machine/setjmp.h b/i386/include/machine/setjmp.h
new file mode 100644
index 0000000..9aa71b5
--- /dev/null
+++ b/i386/include/machine/setjmp.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved
+ */
+#ifndef	_MACHINE_SETJMP_H_
+#define	_MACHINE_SETJMP_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/setjmp.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "i386/setjmp.h"
+#elif defined (__arm__)
+#include "arm/setjmp.h"
+#else
+#error architecture not supported
+#endif
+
+#endif	/* _MACHINE_SETJMP_H_ */
diff --git a/i386/include/machine/signal.h b/i386/include/machine/signal.h
new file mode 100644
index 0000000..7457d1c
--- /dev/null
+++ b/i386/include/machine/signal.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _BSD_MACHINE_SIGNAL_H_
+#define _BSD_MACHINE_SIGNAL_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/signal.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "i386/signal.h"
+#elif defined (__arm__)
+#include "arm/signal.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _BSD_MACHINE_SIGNAL_H_ */
diff --git a/i386/include/machine/types.h b/i386/include/machine/types.h
new file mode 100644
index 0000000..2bff809
--- /dev/null
+++ b/i386/include/machine/types.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright 1995 NeXT Computer, Inc. All rights reserved.
+ */
+#ifndef _BSD_MACHINE_TYPES_H_
+#define _BSD_MACHINE_TYPES_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/types.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "i386/types.h"
+#elif defined (__arm__)
+#include "arm/types.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _BSD_MACHINE_TYPES_H_ */
diff --git a/i386/include/machine/vmparam.h b/i386/include/machine/vmparam.h
new file mode 100644
index 0000000..d9d0d74
--- /dev/null
+++ b/i386/include/machine/vmparam.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _BSD_MACHINE_VMPARAM_H_
+#define _BSD_MACHINE_VMPARAM_H_
+
+#if defined (__ppc__) || defined (__ppc64__)
+#include "ppc/vmparam.h"
+#elif defined (__i386__) || defined(__x86_64__)
+#include "i386/vmparam.h"
+#elif defined (__arm__)
+#include "arm/vmparam.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _BSD_MACHINE_VMPARAM_H_ */
diff --git a/i386/include/math.h b/i386/include/math.h
new file mode 100644
index 0000000..6b2172f
--- /dev/null
+++ b/i386/include/math.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
+ * 
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef __MATH_H__
+#define __MATH_H__
+
+#if (defined(__ppc__) || defined(__ppc64__))
+#include "architecture/ppc/math.h"
+#elif (defined (__i386__) || defined( __x86_64__ ))
+#include "architecture/i386/math.h"
+#elif defined(__arm__)
+#include "architecture/arm/math.h"
+#else
+#error Unknown architecture
+#endif
+
+#endif /* __MATH_H__ */
diff --git a/i386/include/pexpert/boot.h b/i386/include/pexpert/boot.h
new file mode 100644
index 0000000..f26ec4a
--- /dev/null
+++ b/i386/include/pexpert/boot.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _PEXPERT_BOOT_H_
+#define _PEXPERT_BOOT_H_
+
+#include <pexpert/machine/boot.h>
+
+#endif /* _PEXPERT_BOOT_H_ */
diff --git a/i386/include/pexpert/i386/boot.h b/i386/include/pexpert/i386/boot.h
new file mode 100644
index 0000000..369c2c4
--- /dev/null
+++ b/i386/include/pexpert/i386/boot.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _PEXPERT_I386_BOOT_H
+#define _PEXPERT_I386_BOOT_H
+
+#include <stdint.h>
+
+/*
+ * What the booter leaves behind for the kernel.
+ */
+
+/*
+ * Types of boot driver that may be loaded by the booter.
+ */
+enum {
+    kBootDriverTypeInvalid = 0,
+    kBootDriverTypeKEXT    = 1,
+    kBootDriverTypeMKEXT   = 2
+};
+
+enum {
+    kEfiReservedMemoryType	= 0,
+    kEfiLoaderCode		= 1,
+    kEfiLoaderData		= 2,
+    kEfiBootServicesCode	= 3,
+    kEfiBootServicesData	= 4,
+    kEfiRuntimeServicesCode	= 5,
+    kEfiRuntimeServicesData	= 6,
+    kEfiConventionalMemory	= 7,
+    kEfiUnusableMemory		= 8,
+    kEfiACPIReclaimMemory	= 9,
+    kEfiACPIMemoryNVS		= 10,
+    kEfiMemoryMappedIO		= 11,
+    kEfiMemoryMappedIOPortSpace = 12,
+    kEfiPalCode			= 13,
+    kEfiMaxMemoryType		= 14
+};
+
+/*
+ * Memory range descriptor.
+ */
+typedef struct EfiMemoryRange {
+    uint32_t Type;
+    uint32_t Pad;
+    uint64_t PhysicalStart;
+    uint64_t VirtualStart;
+    uint64_t NumberOfPages;
+    uint64_t Attribute;
+} EfiMemoryRange;
+
+#define BOOT_LINE_LENGTH        1024
+#define BOOT_STRING_LEN         BOOT_LINE_LENGTH
+
+/*
+ * Video information.. 
+ */
+
+struct Boot_Video {
+	uint32_t	v_baseAddr;	/* Base address of video memory */
+	uint32_t	v_display;	/* Display Code (if Applicable */
+	uint32_t	v_rowBytes;	/* Number of bytes per pixel row */
+	uint32_t	v_width;	/* Width */
+	uint32_t	v_height;	/* Height */
+	uint32_t	v_depth;	/* Pixel Depth */
+};
+
+typedef struct Boot_Video	Boot_Video;
+
+/* Values for v_display */
+
+#define GRAPHICS_MODE         1
+#define FB_TEXT_MODE          2
+
+/* Struct describing an image passed in by the booter */
+struct boot_icon_element {
+    unsigned int    width;
+    unsigned int    height;
+    int             y_offset_from_center;
+    unsigned int    data_size;
+    unsigned int    __reserved1[4];
+    unsigned char   data[0];
+};
+typedef struct boot_icon_element boot_icon_element;
+
+/* Boot argument structure - passed into Mach kernel at boot time.
+ * "Revision" can be incremented for compatible changes
+ */
+#define kBootArgsRevision		0
+#define kBootArgsVersion		2
+
+/* Snapshot constants of previous revisions that are supported */
+#define kBootArgsVersion1		1
+#define kBootArgsVersion2		2
+#define kBootArgsRevision2_0		0
+
+#define kBootArgsEfiMode32              32
+#define kBootArgsEfiMode64              64
+
+/* Bitfields for boot_args->flags */
+#define kBootArgsFlagRebootOnPanic	(1 << 0)
+#define kBootArgsFlagHiDPI		(1 << 1)
+
+typedef struct boot_args {
+    uint16_t    Revision;	/* Revision of boot_args structure */
+    uint16_t    Version;	/* Version of boot_args structure */
+
+    uint8_t     efiMode;    /* 32 = 32-bit, 64 = 64-bit */
+    uint8_t     debugMode;  /* Bit field with behavior changes */
+    uint16_t    flags;
+
+    char        CommandLine[BOOT_LINE_LENGTH];	/* Passed in command line */
+
+    uint32_t    MemoryMap;  /* Physical address of memory map */
+    uint32_t    MemoryMapSize;
+    uint32_t    MemoryMapDescriptorSize;
+    uint32_t    MemoryMapDescriptorVersion;
+
+    Boot_Video	Video;		/* Video Information */
+
+    uint32_t    deviceTreeP;	  /* Physical address of flattened device tree */
+    uint32_t    deviceTreeLength; /* Length of flattened tree */
+
+    uint32_t    kaddr;            /* Physical address of beginning of kernel text */
+    uint32_t    ksize;            /* Size of combined kernel text+data+efi */
+
+    uint32_t    efiRuntimeServicesPageStart; /* physical address of defragmented runtime pages */
+    uint32_t    efiRuntimeServicesPageCount;
+    uint64_t    efiRuntimeServicesVirtualPageStart; /* virtual address of defragmented runtime pages */
+
+    uint32_t    efiSystemTable;   /* physical address of system table in runtime area */
+    uint32_t    kslide;
+
+    uint32_t    performanceDataStart; /* physical address of log */
+    uint32_t    performanceDataSize;
+
+    uint32_t    keyStoreDataStart; /* physical address of key store data */
+    uint32_t    keyStoreDataSize;
+    uint64_t	bootMemStart;
+    uint64_t	bootMemSize;
+    uint64_t    PhysicalMemorySize;
+    uint64_t    FSBFrequency;
+    uint64_t    pciConfigSpaceBaseAddress;
+    uint32_t    pciConfigSpaceStartBusNumber;
+    uint32_t    pciConfigSpaceEndBusNumber;
+    uint32_t    __reserved4[730];
+
+} boot_args;
+
+extern char assert_boot_args_size_is_4096[sizeof(boot_args) == 4096 ? 1 : -1];
+
+#endif /* _PEXPERT_I386_BOOT_H */
+
diff --git a/i386/include/pexpert/i386/efi.h b/i386/include/pexpert/i386/efi.h
new file mode 100644
index 0000000..5ef5015
--- /dev/null
+++ b/i386/include/pexpert/i386/efi.h
@@ -0,0 +1,558 @@
+/*
+ * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _PEXPERT_I386_EFI_H
+#define _PEXPERT_I386_EFI_H
+
+#include <stdint.h>
+
+typedef uint8_t   EFI_UINT8;
+typedef uint16_t  EFI_UINT16;
+typedef uint32_t  EFI_UINT32;
+typedef uint64_t  EFI_UINT64;
+
+typedef uint32_t  EFI_UINTN; /* natural size for firmware, not kernel */
+
+typedef int8_t    EFI_INT8;
+typedef int16_t   EFI_INT16;
+typedef int32_t   EFI_INT32;
+typedef int64_t   EFI_INT64;
+
+typedef int8_t    EFI_CHAR8;
+typedef int16_t   EFI_CHAR16;
+typedef int32_t   EFI_CHAR32;
+typedef int64_t   EFI_CHAR64;
+
+typedef uint32_t  EFI_STATUS;
+typedef uint8_t   EFI_BOOLEAN;
+typedef void      VOID;
+
+typedef uint32_t  EFI_PTR32;
+typedef uint32_t  EFI_HANDLE32;
+
+typedef uint64_t  EFI_PTR64;
+typedef uint64_t  EFI_HANDLE64;
+/*
+
+Portions Copyright 2004, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+    http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+*/
+
+
+//
+// Modifiers for EFI Runtime and Boot Services
+//
+#define EFI_RUNTIMESERVICE
+#define EFIAPI
+#define IN
+#define OUT
+#define OPTIONAL
+
+#define EFI_MAX_BIT       0x80000000
+
+//
+// Set the upper bit to indicate EFI Error.
+//
+#define EFIERR(a)                 (EFI_MAX_BIT | (a))
+
+#define EFIWARN(a)                (a)
+#define EFI_ERROR(a)              (((INTN) (a)) < 0)
+
+#define EFI_SUCCESS               0
+#define EFI_LOAD_ERROR            EFIERR (1)
+#define EFI_INVALID_PARAMETER     EFIERR (2)
+#define EFI_UNSUPPORTED           EFIERR (3)
+#define EFI_BAD_BUFFER_SIZE       EFIERR (4)
+#define EFI_BUFFER_TOO_SMALL      EFIERR (5)
+#define EFI_NOT_READY             EFIERR (6)
+#define EFI_DEVICE_ERROR          EFIERR (7)
+#define EFI_WRITE_PROTECTED       EFIERR (8)
+#define EFI_OUT_OF_RESOURCES      EFIERR (9)
+#define EFI_VOLUME_CORRUPTED      EFIERR (10)
+#define EFI_VOLUME_FULL           EFIERR (11)
+#define EFI_NO_MEDIA              EFIERR (12)
+#define EFI_MEDIA_CHANGED         EFIERR (13)
+#define EFI_NOT_FOUND             EFIERR (14)
+#define EFI_ACCESS_DENIED         EFIERR (15)
+#define EFI_NO_RESPONSE           EFIERR (16)
+#define EFI_NO_MAPPING            EFIERR (17)
+#define EFI_TIMEOUT               EFIERR (18)
+#define EFI_NOT_STARTED           EFIERR (19)
+#define EFI_ALREADY_STARTED       EFIERR (20)
+#define EFI_ABORTED               EFIERR (21)
+#define EFI_ICMP_ERROR            EFIERR (22)
+#define EFI_TFTP_ERROR            EFIERR (23)
+#define EFI_PROTOCOL_ERROR        EFIERR (24)
+#define EFI_INCOMPATIBLE_VERSION  EFIERR (25)
+#define EFI_SECURITY_VIOLATION    EFIERR (26)
+#define EFI_CRC_ERROR             EFIERR (27)
+
+#define EFI_WARN_UNKNOWN_GLYPH    EFIWARN (1)
+#define EFI_WARN_DELETE_FAILURE   EFIWARN (2)
+#define EFI_WARN_WRITE_FAILURE    EFIWARN (3)
+#define EFI_WARN_BUFFER_TOO_SMALL EFIWARN (4)
+
+//
+// EFI Specification Revision information
+//
+#define EFI_SPECIFICATION_MAJOR_REVISION  1
+#define EFI_SPECIFICATION_MINOR_REVISION  10
+
+typedef struct {
+  EFI_UINT32  Data1;
+  EFI_UINT16  Data2;
+  EFI_UINT16  Data3;
+  EFI_UINT8   Data4[8];
+} EFI_GUID;
+
+#define APPLE_VENDOR_GUID \
+    {0xAC39C713, 0x7E50, 0x423D, {0x88, 0x9D, 0x27,0x8F, 0xCC, 0x34, 0x22, 0xB6} }
+
+#define EFI_GLOBAL_VARIABLE_GUID \
+    {0x8BE4DF61, 0x93CA, 0x11d2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C} }
+
+typedef union {
+  EFI_GUID  Guid;
+  EFI_UINT8 Raw[16];
+} EFI_GUID_UNION;
+
+//
+// EFI Time Abstraction:
+//  Year:       2000 - 20XX
+//  Month:      1 - 12
+//  Day:        1 - 31
+//  Hour:       0 - 23
+//  Minute:     0 - 59
+//  Second:     0 - 59
+//  Nanosecond: 0 - 999,999,999
+//  TimeZone:   -1440 to 1440 or 2047
+//
+typedef struct {
+  EFI_UINT16  Year;
+  EFI_UINT8   Month;
+  EFI_UINT8   Day;
+  EFI_UINT8   Hour;
+  EFI_UINT8   Minute;
+  EFI_UINT8   Second;
+  EFI_UINT8   Pad1;
+  EFI_UINT32  Nanosecond;
+  EFI_INT16   TimeZone;
+  EFI_UINT8   Daylight;
+  EFI_UINT8   Pad2;
+} EFI_TIME;
+
+//
+// Bit definitions for EFI_TIME.Daylight
+//
+#define EFI_TIME_ADJUST_DAYLIGHT  0x01
+#define EFI_TIME_IN_DAYLIGHT      0x02
+
+//
+// Value definition for EFI_TIME.TimeZone
+//
+#define EFI_UNSPECIFIED_TIMEZONE  0x07FF
+
+typedef enum {
+  EfiReservedMemoryType,
+  EfiLoaderCode,
+  EfiLoaderData,
+  EfiBootServicesCode,
+  EfiBootServicesData,
+  EfiRuntimeServicesCode,
+  EfiRuntimeServicesData,
+  EfiConventionalMemory,
+  EfiUnusableMemory,
+  EfiACPIReclaimMemory,
+  EfiACPIMemoryNVS,
+  EfiMemoryMappedIO,
+  EfiMemoryMappedIOPortSpace,
+  EfiPalCode,
+  EfiMaxMemoryType
+} EFI_MEMORY_TYPE;
+
+typedef struct {
+  EFI_UINT64  Signature;
+  EFI_UINT32  Revision;
+  EFI_UINT32  HeaderSize;
+  EFI_UINT32  CRC32;
+  EFI_UINT32  Reserved;
+} __attribute__((aligned(8))) EFI_TABLE_HEADER;
+
+//
+// possible caching types for the memory range
+//
+#define EFI_MEMORY_UC   0x0000000000000001ULL
+#define EFI_MEMORY_WC   0x0000000000000002ULL
+#define EFI_MEMORY_WT   0x0000000000000004ULL
+#define EFI_MEMORY_WB   0x0000000000000008ULL
+#define EFI_MEMORY_UCE  0x0000000000000010ULL
+
+//
+// physical memory protection on range
+//
+#define EFI_MEMORY_WP 0x0000000000001000ULL
+#define EFI_MEMORY_RP 0x0000000000002000ULL
+#define EFI_MEMORY_XP 0x0000000000004000ULL
+
+//
+// range requires a runtime mapping
+//
+#define EFI_MEMORY_RUNTIME  0x8000000000000000ULL
+#define EFI_MEMORY_KERN_RESERVED (1ULL << 59)
+typedef EFI_UINT64  EFI_PHYSICAL_ADDRESS;
+typedef EFI_UINT64  EFI_VIRTUAL_ADDRESS;
+
+#define EFI_MEMORY_DESCRIPTOR_VERSION 1
+typedef struct {
+  EFI_UINT32            Type;
+  EFI_UINT32            Pad;
+  EFI_PHYSICAL_ADDRESS  PhysicalStart;
+  EFI_VIRTUAL_ADDRESS   VirtualStart;
+  EFI_UINT64            NumberOfPages;
+  EFI_UINT64            Attribute;
+} __attribute__((aligned(8))) EFI_MEMORY_DESCRIPTOR;
+
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_SET_VIRTUAL_ADDRESS_MAP) (
+  IN EFI_UINTN                    MemoryMapSize,
+  IN EFI_UINTN                    DescriptorSize,
+  IN EFI_UINT32                   DescriptorVersion,
+  IN EFI_MEMORY_DESCRIPTOR        * VirtualMap
+  );
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_CONVERT_POINTER) (
+  IN EFI_UINTN                DebugDisposition,
+  IN OUT VOID                 **Address
+  );
+
+//
+// Variable attributes
+//
+#define EFI_VARIABLE_NON_VOLATILE       0x00000001
+#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002
+#define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004
+#define EFI_VARIABLE_READ_ONLY          0x00000008
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_GET_VARIABLE) (
+  IN EFI_CHAR16               * VariableName,
+  IN EFI_GUID                 * VendorGuid,
+  OUT EFI_UINT32              * Attributes OPTIONAL,
+  IN OUT EFI_UINTN            * DataSize,
+  OUT VOID                    * Data
+  );
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_GET_NEXT_VARIABLE_NAME) (
+  IN OUT EFI_UINTN            * VariableNameSize,
+  IN OUT EFI_CHAR16           * VariableName,
+  IN OUT EFI_GUID             * VendorGuid
+  );
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_SET_VARIABLE) (
+  IN EFI_CHAR16               * VariableName,
+  IN EFI_GUID                 * VendorGuid,
+  IN EFI_UINT32               Attributes,
+  IN EFI_UINTN                DataSize,
+  IN VOID                     * Data
+  );
+
+//
+// EFI Time
+//
+typedef struct {
+  EFI_UINT32  Resolution;
+  EFI_UINT32  Accuracy;
+  EFI_BOOLEAN SetsToZero;
+} __attribute__((aligned(4))) EFI_TIME_CAPABILITIES;
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_GET_TIME) (
+  OUT EFI_TIME                * Time,
+  OUT EFI_TIME_CAPABILITIES   * Capabilities OPTIONAL
+  );
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_SET_TIME) (
+  IN EFI_TIME                 * Time
+  );
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_GET_WAKEUP_TIME) (
+  OUT EFI_BOOLEAN             * Enabled,
+  OUT EFI_BOOLEAN             * Pending,
+  OUT EFI_TIME                * Time
+  );
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_SET_WAKEUP_TIME) (
+  IN EFI_BOOLEAN              Enable,
+  IN EFI_TIME                 * Time OPTIONAL
+  );
+
+typedef enum {
+  EfiResetCold,
+  EfiResetWarm,
+  EfiResetShutdown,
+
+#ifdef TIANO_EXTENSION_FLAG
+  EfiResetUpdate
+#endif
+
+} EFI_RESET_TYPE;
+
+typedef
+EFI_RUNTIMESERVICE
+VOID
+(EFIAPI *EFI_RESET_SYSTEM) (
+  IN EFI_RESET_TYPE               ResetType,
+  IN EFI_STATUS                   ResetStatus,
+  IN EFI_UINTN                    DataSize,
+  IN EFI_CHAR16                   * ResetData OPTIONAL
+  );
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_GET_NEXT_HIGH_MONO_COUNT) (
+  OUT EFI_UINT32                  * HighCount
+  );
+
+//
+// Definition of Status Code extended data header
+//
+//  HeaderSize    The size of the architecture. This is specified to enable
+//                the future expansion
+//
+//  Size          The size of the data in bytes. This does not include the size
+//                of the header structure.
+//
+//  Type          A GUID defining the type of the data
+//
+//
+#ifdef TIANO_EXTENSION_FLAG
+
+typedef
+EFI_RUNTIMESERVICE
+EFI_STATUS
+(EFIAPI *EFI_REPORT_STATUS_CODE) (
+  IN EFI_STATUS_CODE_TYPE       Type,
+  IN EFI_STATUS_CODE_VALUE      Value,
+  IN EFI_UINT32                 Instance,
+  IN EFI_GUID                   * CallerId OPTIONAL,
+  IN EFI_STATUS_CODE_DATA       * Data OPTIONAL
+  );
+
+#endif
+//
+// EFI Runtime Services Table
+//
+#define EFI_RUNTIME_SERVICES_SIGNATURE  0x56524553544e5552ULL
+#define EFI_RUNTIME_SERVICES_REVISION   ((EFI_SPECIFICATION_MAJOR_REVISION << 16) | (EFI_SPECIFICATION_MINOR_REVISION))
+
+typedef struct {
+  EFI_TABLE_HEADER              Hdr;
+
+  //
+  // Time services
+  //
+  EFI_PTR32                     GetTime;
+  EFI_PTR32                     SetTime;
+  EFI_PTR32                     GetWakeupTime;
+  EFI_PTR32                     SetWakeupTime;
+
+  //
+  // Virtual memory services
+  //
+  EFI_PTR32                     SetVirtualAddressMap;
+  EFI_PTR32                     ConvertPointer;
+
+  //
+  // Variable services
+  //
+  EFI_PTR32                     GetVariable;
+  EFI_PTR32                     GetNextVariableName;
+  EFI_PTR32                     SetVariable;
+
+  //
+  // Misc
+  //
+  EFI_PTR32                     GetNextHighMonotonicCount;
+  EFI_PTR32                     ResetSystem;
+
+#ifdef TIANO_EXTENSION_FLAG
+  //
+  // ////////////////////////////////////////////////////
+  // Extended EFI Services
+    //////////////////////////////////////////////////////
+  //
+  EFI_PTR32                     ReportStatusCode;
+#endif
+
+} __attribute__((aligned(8))) EFI_RUNTIME_SERVICES_32;
+
+typedef struct {
+  EFI_TABLE_HEADER              Hdr;
+
+  //
+  // Time services
+  //
+  EFI_PTR64                     GetTime;
+  EFI_PTR64                     SetTime;
+  EFI_PTR64                     GetWakeupTime;
+  EFI_PTR64                     SetWakeupTime;
+
+  //
+  // Virtual memory services
+  //
+  EFI_PTR64                     SetVirtualAddressMap;
+  EFI_PTR64                     ConvertPointer;
+
+  //
+  // Variable services
+  //
+  EFI_PTR64                     GetVariable;
+  EFI_PTR64                     GetNextVariableName;
+  EFI_PTR64                     SetVariable;
+
+  //
+  // Misc
+  //
+  EFI_PTR64                     GetNextHighMonotonicCount;
+  EFI_PTR64                     ResetSystem;
+
+#ifdef TIANO_EXTENSION_FLAG
+  //
+  // ////////////////////////////////////////////////////
+  // Extended EFI Services
+    //////////////////////////////////////////////////////
+  //
+  EFI_PTR64                     ReportStatusCode;
+#endif
+
+} __attribute__((aligned(8))) EFI_RUNTIME_SERVICES_64;
+
+//
+// EFI Configuration Table
+//
+typedef struct {
+  EFI_GUID  VendorGuid;
+  EFI_PTR32 VendorTable;
+} EFI_CONFIGURATION_TABLE_32;
+
+typedef struct {
+  EFI_GUID  VendorGuid;
+  EFI_PTR64 VendorTable;
+} __attribute__((aligned(8))) EFI_CONFIGURATION_TABLE_64;
+
+//
+// EFI System Table
+//
+#define EFI_SYSTEM_TABLE_SIGNATURE      0x5453595320494249ULL
+#define EFI_SYSTEM_TABLE_REVISION       ((EFI_SPECIFICATION_MAJOR_REVISION << 16) | (EFI_SPECIFICATION_MINOR_REVISION))
+#define EFI_2_00_SYSTEM_TABLE_REVISION  ((2 << 16) | 00)
+#define EFI_1_02_SYSTEM_TABLE_REVISION  ((1 << 16) | 02)
+#define EFI_1_10_SYSTEM_TABLE_REVISION  ((1 << 16) | 10)
+
+typedef struct EFI_SYSTEM_TABLE_32 {
+  EFI_TABLE_HEADER              Hdr;
+
+  EFI_PTR32                     FirmwareVendor;
+  EFI_UINT32                    FirmwareRevision;
+
+  EFI_HANDLE32                  ConsoleInHandle;
+  EFI_PTR32                     ConIn;
+
+  EFI_HANDLE32                  ConsoleOutHandle;
+  EFI_PTR32                     ConOut;
+
+  EFI_HANDLE32                  StandardErrorHandle;
+  EFI_PTR32                     StdErr;
+
+  EFI_PTR32                     RuntimeServices;
+  EFI_PTR32                     BootServices;
+
+  EFI_UINT32                    NumberOfTableEntries;
+  EFI_PTR32                     ConfigurationTable;
+
+} __attribute__((aligned(8))) EFI_SYSTEM_TABLE_32;
+
+typedef struct EFI_SYSTEM_TABLE_64 {
+  EFI_TABLE_HEADER              Hdr;
+
+  EFI_PTR64                     FirmwareVendor;
+  EFI_UINT32                    FirmwareRevision;
+
+  EFI_UINT32                    __pad;
+
+  EFI_HANDLE64                  ConsoleInHandle;
+  EFI_PTR64                     ConIn;
+
+  EFI_HANDLE64                  ConsoleOutHandle;
+  EFI_PTR64                     ConOut;
+
+  EFI_HANDLE64                  StandardErrorHandle;
+  EFI_PTR64                     StdErr;
+
+  EFI_PTR64                     RuntimeServices;
+  EFI_PTR64                     BootServices;
+
+  EFI_UINT64                    NumberOfTableEntries;
+  EFI_PTR64                     ConfigurationTable;
+
+} __attribute__((aligned(8))) EFI_SYSTEM_TABLE_64;
+
+#endif /* _PEXPERT_I386_EFI_H */
diff --git a/i386/include/pexpert/i386/protos.h b/i386/include/pexpert/i386/protos.h
new file mode 100644
index 0000000..854f8c4
--- /dev/null
+++ b/i386/include/pexpert/i386/protos.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _PEXPERT_I386_PROTOS_H
+#define _PEXPERT_I386_PROTOS_H
+
+//------------------------------------------------------------------------
+// x86 IN/OUT I/O inline functions.
+//
+// IN :  inb, inw, inl
+//       IN(port)
+//
+// OUT:  outb, outw, outl
+//       OUT(port, data)
+
+typedef unsigned short   i386_ioport_t;
+
+#define __IN(s, u) \
+static __inline__ unsigned u \
+in##s(i386_ioport_t port) \
+{ \
+    unsigned u data; \
+    asm volatile ( \
+        "in" #s " %1,%0" \
+        : "=a" (data) \
+        : "d" (port)); \
+    return (data); \
+}
+
+#define __OUT(s, u) \
+static __inline__ void \
+out##s(i386_ioport_t port, unsigned u data) \
+{ \
+    asm volatile ( \
+        "out" #s " %1,%0" \
+        : \
+        : "d" (port), "a" (data)); \
+}
+
+__IN(b, char)
+__IN(w, short)
+__IN(l, long)
+
+__OUT(b, char)
+__OUT(w, short)
+__OUT(l, long)
+
+extern void cninit(void);
+extern int  sprintf(char * str, const char * format, ...);
+
+//------------------------------------------------------------------------
+// from osfmk/console/panic_dialog.c
+extern void panic_ui_initialize(const unsigned char * clut);
+
+/* ------------------------------------------------------------------------
+ * from osfmk/i386/serial_io.h
+ */
+int switch_to_serial_console(void);
+void switch_to_old_console(int);
+boolean_t console_is_serial(void);
+int serial_init(void);
+void serial_putc(char);
+int serial_getc(void);
+
+/* ------------------------------------------------------------------------
+ * from osfmk/kern/misc_protos.h
+ */
+void cnputc(char);
+int cngetc(void);
+
+#endif /* _PEXPERT_I386_PROTOS_H */
diff --git a/i386/include/pexpert/machine/boot.h b/i386/include/pexpert/machine/boot.h
new file mode 100644
index 0000000..d078b39
--- /dev/null
+++ b/i386/include/pexpert/machine/boot.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _PEXPERT_MACHINE_BOOT_H
+#define _PEXPERT_MACHINE_BOOT_H
+
+#if defined (__i386__) || defined(__x86_64__)
+#include "pexpert/i386/boot.h"
+#elif defined (__arm__)
+#include "pexpert/arm/boot.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _PEXPERT_MACHINE_BOOT_H */
diff --git a/i386/include/pexpert/machine/protos.h b/i386/include/pexpert/machine/protos.h
new file mode 100644
index 0000000..441a924
--- /dev/null
+++ b/i386/include/pexpert/machine/protos.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _PEXPERT_MACHINE_PROTOS_H
+#define _PEXPERT_MACHINE_PROTOS_H
+
+#if defined (__i386__) || defined(__x86_64__)
+#include "pexpert/i386/protos.h"
+#elif defined (__arm__)
+#include "pexpert/arm/protos.h"
+#else
+#error architecture not supported
+#endif
+
+#endif /* _PEXPERT_MACHINE_PROTOS_H */
diff --git a/i386/include/pexpert/pexpert.h b/i386/include/pexpert/pexpert.h
new file mode 100644
index 0000000..d661b10
--- /dev/null
+++ b/i386/include/pexpert/pexpert.h
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _PEXPERT_PEXPERT_H_
+#define _PEXPERT_PEXPERT_H_
+
+#include <sys/cdefs.h>
+
+#include <IOKit/IOInterrupts.h>
+#include <kern/kern_types.h>
+
+__BEGIN_DECLS
+#include <mach/boolean.h>
+#include <mach/kern_return.h>
+#include <mach/machine/vm_types.h>
+
+#include <pexpert/boot.h>
+
+typedef void *cpu_id_t;
+
+#if defined(__arm__)
+#endif
+
+void PE_enter_debugger(
+	const char *cause);
+
+void PE_init_platform(
+	boolean_t vm_initialized, 
+	void *args);
+
+#if defined(__arm__)
+uint32_t PE_get_security_epoch(
+	void);
+uint32_t PE_i_can_has_debugger(
+	uint32_t *);
+
+/*
+ * If invoked with NULL first argument, return the max buffer size that can
+ * be saved in the second argument
+ */
+void PE_save_buffer_to_vram(
+	unsigned char *,
+	unsigned int *);
+#endif
+
+void PE_init_kprintf(
+	boolean_t vm_initialized);
+
+extern int32_t gPESerialBaud;
+
+unsigned int PE_init_taproot(vm_offset_t *taddr);
+
+extern void (*PE_kputc)(char c);
+
+void PE_init_printf(
+	boolean_t vm_initialized);
+
+extern void (*PE_putc)(char c);
+
+void PE_init_iokit(
+	void);
+
+struct clock_frequency_info_t {
+  unsigned long bus_clock_rate_hz;
+  unsigned long cpu_clock_rate_hz;
+  unsigned long dec_clock_rate_hz;
+  unsigned long bus_clock_rate_num;
+  unsigned long bus_clock_rate_den;
+  unsigned long bus_to_cpu_rate_num;
+  unsigned long bus_to_cpu_rate_den;
+  unsigned long bus_to_dec_rate_num;
+  unsigned long bus_to_dec_rate_den;
+  unsigned long timebase_frequency_hz;
+  unsigned long timebase_frequency_num;
+  unsigned long timebase_frequency_den;
+  unsigned long long bus_frequency_hz;
+  unsigned long long bus_frequency_min_hz;
+  unsigned long long bus_frequency_max_hz;
+  unsigned long long cpu_frequency_hz;
+  unsigned long long cpu_frequency_min_hz;
+  unsigned long long cpu_frequency_max_hz;
+  unsigned long long prf_frequency_hz;
+  unsigned long long prf_frequency_min_hz;
+  unsigned long long prf_frequency_max_hz;
+  unsigned long long mem_frequency_hz;
+  unsigned long long mem_frequency_min_hz;
+  unsigned long long mem_frequency_max_hz;
+  unsigned long long fix_frequency_hz;
+};
+
+typedef struct clock_frequency_info_t clock_frequency_info_t;
+
+extern clock_frequency_info_t gPEClockFrequencyInfo;
+
+struct timebase_freq_t {
+  unsigned long timebase_num;
+  unsigned long timebase_den;
+};
+
+typedef void (*timebase_callback_func)(struct timebase_freq_t *timebase_freq);
+
+void PE_register_timebase_callback(timebase_callback_func callback);
+
+void PE_call_timebase_callback(void);
+
+void PE_install_interrupt_handler(
+	void *nub, int source,
+        void *target, IOInterruptHandler handler, void *refCon);
+
+#ifndef _FN_KPRINTF
+#define	_FN_KPRINTF
+void kprintf(const char *fmt, ...) __printflike(1,2);
+#endif
+
+
+#if CONFIG_NO_KPRINTF_STRINGS
+#define kprintf(x, ...) do {} while (0)
+#endif
+
+void init_display_putc(unsigned char *baseaddr, int rowbytes, int height);
+void display_putc(char c);
+
+enum {
+    kPEReadTOD,
+    kPEWriteTOD
+};
+extern int (*PE_read_write_time_of_day)(
+	unsigned int options, 
+	long * secs);
+
+enum {
+    kPEWaitForInput 	= 0x00000001,
+    kPERawInput		= 0x00000002
+};
+extern int (*PE_poll_input)(
+	unsigned int options, 
+	char * c);
+
+extern int (*PE_write_IIC)(
+	unsigned char addr, 
+	unsigned char reg,
+	unsigned char data);
+
+/* Private Stuff - eventually put in pexpertprivate.h */
+enum {
+    kDebugTypeNone    = 0,
+    kDebugTypeDisplay = 1,
+    kDebugTypeSerial  = 2 
+};
+
+/*  Scale factor values for PE_Video.v_scale */
+enum {
+   kPEScaleFactorUnknown = 0,
+   kPEScaleFactor1x      = 1,
+   kPEScaleFactor2x      = 2
+};
+
+struct PE_Video {
+        unsigned long   v_baseAddr;     /* Base address of video memory */
+        unsigned long   v_rowBytes;     /* Number of bytes per pixel row */
+        unsigned long   v_width;        /* Width */
+        unsigned long   v_height;       /* Height */
+        unsigned long   v_depth;        /* Pixel Depth */
+        unsigned long   v_display;      /* Text or Graphics */
+	char		v_pixelFormat[64];
+	unsigned long	v_offset;	/* offset into video memory to start at */
+	unsigned long	v_length;	/* length of video memory (0 for v_rowBytes * v_height) */
+	unsigned char	v_rotate;	/* Rotation: 0:normal, 1:right 90, 2:left 180, 3:left 90 */
+	unsigned char	v_scale;	/* Scale Factor for both X & Y */
+	char		reserved1[2];
+#ifdef __LP64__
+	long		reserved2;
+#else
+	long		v_baseAddrHigh;
+#endif
+};
+
+typedef struct PE_Video       PE_Video;
+
+extern void initialize_screen(PE_Video *, unsigned int);
+
+extern void dim_screen(void);
+
+extern int PE_current_console(
+	PE_Video *info);
+
+extern void PE_create_console(
+        void);
+
+extern int PE_initialize_console(
+	PE_Video *newInfo, 
+	int op);
+
+#define kPEGraphicsMode		1
+#define kPETextMode		2
+#define kPETextScreen		3
+#define kPEAcquireScreen	4
+#define kPEReleaseScreen	5
+#define kPEEnableScreen	 	6
+#define kPEDisableScreen	7
+#define kPEBaseAddressChange	8
+
+extern void PE_display_icon( unsigned int flags,
+			     const char * name );
+
+typedef struct PE_state {
+	boolean_t	initialized;
+	PE_Video	video;
+	void		*deviceTreeHead;
+	void		*bootArgs;
+} PE_state_t;
+
+extern PE_state_t PE_state;
+
+extern char * PE_boot_args(
+	void);
+
+#if !defined(__LP64__) && !defined(__arm__)
+extern boolean_t PE_parse_boot_arg(
+	const char	*arg_string,
+	void    	*arg_ptr) __deprecated;
+#endif
+
+extern boolean_t PE_parse_boot_argn(
+	const char	*arg_string,
+	void    	*arg_ptr,
+	int			max_arg);
+
+extern boolean_t PE_get_default(
+	const char	*property_name,
+	void		*property_ptr,
+	unsigned int max_property);
+
+#define PE_default_value(_key, _variable, _default)	\
+	do {															  \
+		if (!PE_get_default((_key), &(_variable), sizeof(_variable))) \
+			_variable = _default;									  \
+	} while(0)
+
+enum {
+    kPEOptionKey	= 0x3a,
+    kPECommandKey	= 0x37,
+    kPEControlKey	= 0x36,
+    kPEShiftKey		= 0x38
+};
+
+extern boolean_t PE_get_hotkey(
+	unsigned char	key);
+
+extern kern_return_t PE_cpu_start(
+	cpu_id_t target,
+	vm_offset_t start_paddr,
+	vm_offset_t arg_paddr);
+
+extern void PE_cpu_halt(
+	cpu_id_t target);
+
+extern void PE_cpu_signal(
+	cpu_id_t source,
+	cpu_id_t target);
+
+extern void PE_cpu_machine_init(
+	cpu_id_t target,
+	boolean_t bootb);
+
+extern void PE_cpu_machine_quiesce(
+	cpu_id_t target);
+
+extern void pe_init_debug(void);
+
+extern boolean_t PE_imgsrc_mount_supported(void);
+
+#if defined(__arm__)
+typedef void (*perfmon_interrupt_handler_func)(cpu_id_t source);
+extern kern_return_t PE_cpu_perfmon_interrupt_install_handler(perfmon_interrupt_handler_func handler);
+extern void PE_cpu_perfmon_interrupt_enable(cpu_id_t target, boolean_t enable);
+#endif
+
+
+__END_DECLS
+
+#endif /* _PEXPERT_PEXPERT_H_ */
diff --git a/i386/include/pexpert/protos.h b/i386/include/pexpert/protos.h
new file mode 100644
index 0000000..78b7a8b
--- /dev/null
+++ b/i386/include/pexpert/protos.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+#ifndef _PEXPERT_PROTOS_H_
+#define _PEXPERT_PROTOS_H_
+
+
+#endif /* _PEXPERT_PROTOS_H_ */
diff --git a/i386/include/runetype.h b/i386/include/runetype.h
new file mode 100644
index 0000000..fd16b82
--- /dev/null
+++ b/i386/include/runetype.h
@@ -0,0 +1,136 @@
+/*-
+ * Copyright (c) 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Paul Borman at Krystal Technologies.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
+ */
+
+#ifndef	_RUNETYPE_H_
+#define	_RUNETYPE_H_
+
+#include <_types.h>
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+
+#ifndef	_SIZE_T
+#define _SIZE_T
+typedef	__darwin_size_t		size_t;
+#endif
+
+#ifndef	_CT_RUNE_T
+#define _CT_RUNE_T
+typedef	__darwin_ct_rune_t	ct_rune_t;
+#endif
+
+#ifndef	_RUNE_T
+#define _RUNE_T
+typedef	__darwin_rune_t		rune_t;
+#endif
+
+#ifndef	__cplusplus
+#ifndef	_WCHAR_T
+#define	_WCHAR_T
+typedef	__darwin_wchar_t	wchar_t;
+#endif	/* _WCHAR_T */
+#endif	/* __cplusplus */
+
+#ifndef	_WINT_T
+#define _WINT_T
+typedef	__darwin_wint_t		wint_t;
+#endif
+
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+#define	_CACHED_RUNES	(1 <<8 )	/* Must be a power of 2 */
+#define	_CRMASK		(~(_CACHED_RUNES - 1))
+
+/*
+ * The lower 8 bits of runetype[] contain the digit value of the rune.
+ */
+typedef struct {
+	__darwin_rune_t	__min;		/* First rune of the range */
+	__darwin_rune_t	__max;		/* Last rune (inclusive) of the range */
+	__darwin_rune_t	__map;		/* What first maps to in maps */
+	__uint32_t	*__types;	/* Array of types in range */
+} _RuneEntry;
+
+typedef struct {
+	int		__nranges;	/* Number of ranges stored */
+	_RuneEntry	*__ranges;	/* Pointer to the ranges */
+} _RuneRange;
+
+typedef struct {
+	char		__name[14];	/* CHARCLASS_NAME_MAX = 14 */
+	__uint32_t	__mask;		/* charclass mask */
+} _RuneCharClass;
+
+typedef struct {
+	char		__magic[8];	/* Magic saying what version we are */
+	char		__encoding[32];	/* ASCII name of this encoding */
+
+	__darwin_rune_t	(*__sgetrune)(const char *, __darwin_size_t, char const **);
+	int		(*__sputrune)(__darwin_rune_t, char *, __darwin_size_t, char **);
+	__darwin_rune_t	__invalid_rune;
+
+	__uint32_t	__runetype[_CACHED_RUNES];
+	__darwin_rune_t	__maplower[_CACHED_RUNES];
+	__darwin_rune_t	__mapupper[_CACHED_RUNES];
+
+	/*
+	 * The following are to deal with Runes larger than _CACHED_RUNES - 1.
+	 * Their data is actually contiguous with this structure so as to make
+	 * it easier to read/write from/to disk.
+	 */
+	_RuneRange	__runetype_ext;
+	_RuneRange	__maplower_ext;
+	_RuneRange	__mapupper_ext;
+
+	void		*__variable;	/* Data which depends on the encoding */
+	int		__variable_len;	/* how long that data is */
+
+	/*
+	 * extra fields to deal with arbitrary character classes
+	 */
+	int		__ncharclasses;
+	_RuneCharClass	*__charclasses;
+} _RuneLocale;
+
+#define	_RUNE_MAGIC_A	"RuneMagA"	/* Indicates version A of RuneLocale */
+
+__BEGIN_DECLS
+extern _RuneLocale _DefaultRuneLocale;
+extern _RuneLocale *_CurrentRuneLocale;
+__END_DECLS
+
+#endif	/* !_RUNETYPE_H_ */
diff --git a/i386/include/setjmp.h b/i386/include/setjmp.h
new file mode 100644
index 0000000..4fced23
--- /dev/null
+++ b/i386/include/setjmp.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#ifndef _BSD_SETJMP_H
+#define _BSD_SETJMP_H
+
+#include <machine/setjmp.h>
+
+#endif /* _BSD_SETJMP_H */
diff --git a/i386/include/signal.h b/i386/include/signal.h
new file mode 100644
index 0000000..08ad77e
--- /dev/null
+++ b/i386/include/signal.h
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*-
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)signal.h	8.3 (Berkeley) 3/30/94
+ */
+
+#ifndef _USER_SIGNAL_H
+#define _USER_SIGNAL_H
+
+#include <sys/cdefs.h>
+#include <_types.h>
+#include <sys/signal.h>
+
+#ifndef _PTHREAD_T
+typedef __darwin_pthread_t	pthread_t;
+#define _PTHREAD_T
+#endif
+
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+extern __const char *__const sys_signame[NSIG];
+extern __const char *__const sys_siglist[NSIG];
+#endif
+
+__BEGIN_DECLS
+int	raise(int);
+__END_DECLS
+
+#ifndef	_ANSI_SOURCE
+__BEGIN_DECLS
+void	(*bsd_signal(int, void (*)(int)))(int);
+//Begin-Libc
+#ifndef LIBC_ALIAS_KILL
+//End-Libc
+int	kill(pid_t, int) __DARWIN_ALIAS(kill);
+//Begin-Libc
+#else /* LIBC_ALIAS_KILL */
+int	kill(pid_t, int) LIBC_ALIAS(kill);
+#endif /* !LIBC_ALIAS_KILL */
+//End-Libc
+//Begin-Libc
+#ifndef LIBC_ALIAS_KILLPG
+//End-Libc
+int	killpg(pid_t, int) __DARWIN_ALIAS(killpg);
+//Begin-Libc
+#else /* LIBC_ALIAS_KILLPG */
+int	killpg(pid_t, int) LIBC_ALIAS(killpg);
+#endif /* !LIBC_ALIAS_KILLPG */
+//End-Libc
+int	pthread_kill(pthread_t, int);
+//Begin-Libc
+#ifndef LIBC_ALIAS_PTHREAD_SIGMASK
+//End-Libc
+int	pthread_sigmask(int, const sigset_t *, sigset_t *) __DARWIN_ALIAS(pthread_sigmask);
+//Begin-Libc
+#else /* LIBC_ALIAS_PTHREAD_SIGMASK */
+int	pthread_sigmask(int, const sigset_t *, sigset_t *) LIBC_ALIAS(pthread_sigmask);
+#endif /* !LIBC_ALIAS_PTHREAD_SIGMASK */
+//End-Libc
+int	sigaction(int, const struct sigaction * __restrict,
+	    struct sigaction * __restrict);
+int	sigaddset(sigset_t *, int);
+//Begin-Libc
+#ifndef LIBC_ALIAS_SIGALTSTACK
+//End-Libc
+int	sigaltstack(const stack_t * __restrict, stack_t * __restrict)  __DARWIN_ALIAS(sigaltstack);
+//Begin-Libc
+#else /* LIBC_ALIAS_SIGALTSTACK */
+int	sigaltstack(const stack_t * __restrict, stack_t * __restrict)  LIBC_ALIAS(sigaltstack);
+#endif /* !LIBC_ALIAS_SIGALTSTACK */
+//End-Libc
+int	sigdelset(sigset_t *, int);
+int	sigemptyset(sigset_t *);
+int	sigfillset(sigset_t *);
+int	sighold(int);
+int	sigignore(int);
+int	siginterrupt(int, int);
+int	sigismember(const sigset_t *, int);
+//Begin-Libc
+#ifndef LIBC_ALIAS_SIGPAUSE
+//End-Libc
+int	sigpause(int) __DARWIN_ALIAS_C(sigpause);
+//Begin-Libc
+#else /* LIBC_ALIAS_SIGPAUSE */
+int	sigpause(int) LIBC_ALIAS_C(sigpause);
+#endif /* !LIBC_ALIAS_SIGPAUSE */
+//End-Libc
+int	sigpending(sigset_t *);
+int	sigprocmask(int, const sigset_t * __restrict, sigset_t * __restrict);
+int	sigrelse(int);
+void    (*sigset(int, void (*)(int)))(int); 
+//Begin-Libc
+#ifndef LIBC_ALIAS_SIGSUSPEND
+//End-Libc
+int	sigsuspend(const sigset_t *) __DARWIN_ALIAS_C(sigsuspend);
+//Begin-Libc
+#else /* LIBC_ALIAS_SIGSUSPEND */
+int	sigsuspend(const sigset_t *) LIBC_ALIAS_C(sigsuspend);
+#endif /* !LIBC_ALIAS_SIGSUSPEND */
+//End-Libc
+//Begin-Libc
+#ifndef LIBC_ALIAS_SIGWAIT
+//End-Libc
+int	sigwait(const sigset_t * __restrict, int * __restrict) __DARWIN_ALIAS_C(sigwait);
+//Begin-Libc
+#else /* LIBC_ALIAS_SIGWAIT */
+int	sigwait(const sigset_t * __restrict, int * __restrict) LIBC_ALIAS_C(sigwait);
+#endif /* !LIBC_ALIAS_SIGWAIT */
+//End-Libc
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+void	psignal(unsigned int, const char *);
+int	sigblock(int);
+int	sigsetmask(int);
+int	sigvec(int, struct sigvec *, struct sigvec *);
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+__END_DECLS
+
+/* List definitions after function declarations, or Reiser cpp gets upset. */
+#if defined(__i386__) || defined(__x86_64__)
+/* The left shift operator on intel is modulo 32 */
+static __inline int
+__sigbits(int __signo)
+{
+    return __signo > __DARWIN_NSIG ? 0 : (1 << (__signo - 1));
+}
+#else /* !__i386__ && !__x86_64__ */
+#define __sigbits(signo)	(1 << ((signo) - 1))
+#endif /* __i386__ || __x86_64__ */
+
+#define	sigaddset(set, signo)	(*(set) |= __sigbits(signo), 0)
+#define	sigdelset(set, signo)	(*(set) &= ~__sigbits(signo), 0)
+#define	sigismember(set, signo)	((*(set) & __sigbits(signo)) != 0)
+#define	sigemptyset(set)	(*(set) = 0, 0)
+#define	sigfillset(set)		(*(set) = ~(sigset_t)0, 0)
+#endif	/* !_ANSI_SOURCE */
+
+#endif	/* !_USER_SIGNAL_H */
diff --git a/i386/include/stdarg.h b/i386/include/stdarg.h
new file mode 100644
index 0000000..ede00f0
--- /dev/null
+++ b/i386/include/stdarg.h
@@ -0,0 +1,133 @@
+/* Copyright (C) 1989, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+ 
+ This file is part of GCC.
+ 
+ GCC 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, or (at your option)
+ any later version.
+ 
+ GCC 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 GCC; see the file COPYING.  If not, write to
+ the Free Software Foundation, 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, if you include this header file into source
+ files compiled by GCC, this header file does not by itself cause
+ the resulting executable to be covered by the GNU General Public
+ License.  This exception does not however invalidate any other
+ reasons why the executable file might be covered by the GNU General
+ Public License.  */
+
+/*
+ * ISO C Standard:  7.15  Variable arguments  <stdarg.h>
+ */
+
+#ifndef _STDARG_H
+#ifndef _ANSI_STDARG_H_
+#ifndef __need___va_list
+#define _STDARG_H
+#define _ANSI_STDARG_H_
+#endif /* not __need___va_list */
+#undef __need___va_list
+
+/* Define __gnuc_va_list.  */
+
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+typedef __builtin_va_list __gnuc_va_list;
+#endif
+
+/* Define the standard macros for the user,
+ if this invocation was from the user program.  */
+#ifdef _STDARG_H
+
+#define va_start(v,l)	__builtin_va_start(v,l)
+#define va_end(v)	__builtin_va_end(v)
+#define va_arg(v,l)	__builtin_va_arg(v,l)
+#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L
+#define va_copy(d,s)	__builtin_va_copy(d,s)
+#endif
+#define __va_copy(d,s)	__builtin_va_copy(d,s)
+
+/* Define va_list, if desired, from __gnuc_va_list. */
+/* We deliberately do not define va_list when called from
+ stdio.h, because ANSI C says that stdio.h is not supposed to define
+ va_list.  stdio.h needs to have access to that data type, 
+ but must not use that name.  It should use the name __gnuc_va_list,
+ which is safe because it is reserved for the implementation.  */
+
+#ifdef _HIDDEN_VA_LIST  /* On OSF1, this means varargs.h is "half-loaded".  */
+#undef _VA_LIST
+#endif
+
+#ifdef _BSD_VA_LIST
+#undef _BSD_VA_LIST
+#endif
+
+#if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST))
+/* SVR4.2 uses _VA_LIST for an internal alias for va_list,
+ so we must avoid testing it and setting it here.
+ SVR4 uses _VA_LIST as a flag in stdarg.h, but we should
+ have no conflict with that.  */
+#ifndef _VA_LIST_
+#define _VA_LIST_
+#ifdef __i860__
+#ifndef _VA_LIST
+#define _VA_LIST va_list
+#endif
+#endif /* __i860__ */
+typedef __gnuc_va_list va_list;
+#ifdef _SCO_DS
+#define __VA_LIST
+#endif
+#endif /* _VA_LIST_ */
+#else /* not __svr4__ || _SCO_DS */
+
+/* The macro _VA_LIST_ is the same thing used by this file in Ultrix.
+ But on BSD NET2 we must not test or define or undef it.
+ (Note that the comments in NET 2's ansi.h
+ are incorrect for _VA_LIST_--see stdio.h!)  */
+#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) || defined(WINNT)
+/* The macro _VA_LIST_DEFINED is used in Windows NT 3.5  */
+#ifndef _VA_LIST_DEFINED
+/* The macro _VA_LIST is used in SCO Unix 3.2.  */
+#ifndef _VA_LIST
+/* The macro _VA_LIST_T_H is used in the Bull dpx2  */
+#ifndef _VA_LIST_T_H
+/* The macro __va_list__ is used by BeOS.  */
+#ifndef __va_list__
+typedef __gnuc_va_list va_list;
+#endif /* not __va_list__ */
+#endif /* not _VA_LIST_T_H */
+#endif /* not _VA_LIST */
+#endif /* not _VA_LIST_DEFINED */
+#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__))
+#define _VA_LIST_
+#endif
+#ifndef _VA_LIST
+#define _VA_LIST
+#endif
+#ifndef _VA_LIST_DEFINED
+#define _VA_LIST_DEFINED
+#endif
+#ifndef _VA_LIST_T_H
+#define _VA_LIST_T_H
+#endif
+#ifndef __va_list__
+#define __va_list__
+#endif
+
+#endif /* not _VA_LIST_, except on certain systems */
+
+#endif /* not __svr4__ */
+
+#endif /* _STDARG_H */
+
+#endif /* not _ANSI_STDARG_H_ */
+#endif /* not _STDARG_H */
diff --git a/i386/include/stdbool.h b/i386/include/stdbool.h
new file mode 100644
index 0000000..994cee8
--- /dev/null
+++ b/i386/include/stdbool.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/include/stdbool.h,v 1.6 2002/08/16 07:33:14 alfred Exp $
+ */
+
+#ifndef _STDBOOL_H_
+#define	_STDBOOL_H_	
+
+#define	__bool_true_false_are_defined	1
+
+#ifndef __cplusplus
+
+#define	bool	_Bool
+#if __STDC_VERSION__ < 199901L && __GNUC__ < 3
+typedef	int	_Bool;
+#endif
+
+#define	false	(bool)0
+#define	true	(bool)1
+
+#endif /* !__cplusplus */
+
+#endif /* !_STDBOOL_H_ */
diff --git a/i386/include/stddef.h b/i386/include/stddef.h
new file mode 100644
index 0000000..9fc87ee
--- /dev/null
+++ b/i386/include/stddef.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*	$OpenBSD: stddef.h,v 1.2 1997/09/21 10:45:52 niklas Exp $	*/
+/*	$NetBSD: stddef.h,v 1.4 1994/10/26 00:56:26 cgd Exp $	*/
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)stddef.h	5.5 (Berkeley) 4/3/91
+ */
+
+#if !defined(__STDDEF_H__)
+
+#if !defined(__need_wchar_t) && !defined(__need_size_t) \
+    && !defined(__need_ptrdiff_t) && !defined(__need_NULL) \
+    && !defined(__need_wint_t)
+#define __STDDEF_H__
+#endif /* none of __need_* defined */
+
+#include <sys/_types.h>
+
+#if defined(__STDDEF_H__) || defined(__need_ptrdiff_t)
+#ifndef _PTRDIFF_T
+#define _PTRDIFF_T
+typedef	__darwin_ptrdiff_t	ptrdiff_t;
+#endif /* _PTRDIFF_T */
+#endif /* __STDDEF_H__ || __need_ptrdiff_t */
+
+#if defined(__STDDEF_H__) || defined(__need_size_t)
+#ifndef	_SIZE_T
+#define	_SIZE_T
+/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
+ * _GCC_SIZE_T */
+typedef	__darwin_size_t		size_t;
+#endif /* _SIZE_T */
+#endif /* __STDDEF_H__ || __need_size_t */
+
+#if defined(__STDDEF_H__) || defined(__need_wchar_t)
+#ifndef	__cplusplus
+#ifndef	_WCHAR_T
+#define	_WCHAR_T
+typedef	__darwin_wchar_t	wchar_t;
+#endif	/* _WCHAR_T */
+#endif	/* __cplusplus */
+#endif /* __STDDEF_H__ || __need_wchar_t */
+
+#if (defined(__STDDEF_H__) && !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))) \
+    || defined(__need_wint_t)
+#ifndef	_WINT_T
+#define	_WINT_T
+typedef	__darwin_wint_t		wint_t;
+#endif	/* _WINT_T */
+#endif /* __STDDEF_H__ && !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) || __need_wchar_t */
+
+#if defined(__STDDEF_H__) || defined(__need_NULL)
+#ifndef NULL
+#define NULL __DARWIN_NULL
+#endif /* ! NULL */
+#endif /* __STDDEF_H__ || __need_NULL */
+
+#ifdef __STDDEF_H__
+#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 5 || __GNUC__ > 3)
+#ifndef __offsetof	/* Deprecated: for source compatability only */
+#define __offsetof(type, field) __builtin_offsetof(type, field)
+#endif
+#define offsetof(type, field) __builtin_offsetof(type, field)
+#else /* ! (gcc >= 3.5) */
+#ifndef __offsetof	/* Deprecated: for source compatability only */
+#define __offsetof(type, field) ((size_t)(&((type *)0)->field))
+#endif
+#define offsetof(type, field) ((size_t)(&((type *)0)->field))
+#endif /* (gcc >= 3.5) */
+#endif /* __STDDEF_H__ */
+
+#endif /* __STDDEF_H__ */
+
+#undef __need_ptrdiff_t
+#undef __need_size_t
+#undef __need_wchar_t
+#undef __need_wint_t
+#undef __need_NULL
diff --git a/i386/include/stdint.h b/i386/include/stdint.h
new file mode 100644
index 0000000..1126b56
--- /dev/null
+++ b/i386/include/stdint.h
@@ -0,0 +1,253 @@
+/*
+ * Copyright (c) 2000, 2001, 2003, 2004, 2008 Apple Computer, Inc.
+ * All rights reserved.
+ */
+
+#ifndef _STDINT_H_
+#define _STDINT_H_
+
+#if __LP64__
+#define __WORDSIZE 64
+#else
+#define __WORDSIZE 32
+#endif
+
+/* from ISO/IEC 988:1999 spec */
+
+/* 7.18.1.1 Exact-width integer types */
+#ifndef _INT8_T
+#define _INT8_T
+typedef signed char           int8_t;
+#endif /*_INT8_T */
+
+#ifndef _INT16_T
+#define _INT16_T
+typedef short                int16_t;
+#endif /* _INT16_T */
+
+#ifndef _INT32_T
+#define _INT32_T
+typedef int                  int32_t;
+#endif /* _INT32_T */
+
+#ifndef _INT64_T
+#define _INT64_T
+typedef long long            int64_t;
+#endif /* _INT64_T */
+
+#ifndef _UINT8_T
+#define _UINT8_T
+typedef unsigned char         uint8_t;
+#endif /*_UINT8_T */
+
+#ifndef _UINT16_T
+#define _UINT16_T
+typedef unsigned short       uint16_t;
+#endif /* _UINT16_T */
+
+#ifndef _UINT32_T
+#define _UINT32_T
+typedef unsigned int         uint32_t;
+#endif /* _UINT32_T */
+
+#ifndef _UINT64_T
+#define _UINT64_T
+typedef unsigned long long   uint64_t;
+#endif /* _UINT64_T */
+
+/* 7.18.1.2 Minimum-width integer types */
+typedef int8_t           int_least8_t;
+typedef int16_t         int_least16_t;
+typedef int32_t         int_least32_t;
+typedef int64_t         int_least64_t;
+typedef uint8_t         uint_least8_t;
+typedef uint16_t       uint_least16_t;
+typedef uint32_t       uint_least32_t;
+typedef uint64_t       uint_least64_t;
+
+
+/* 7.18.1.3 Fastest-width integer types */
+typedef int8_t            int_fast8_t;
+typedef int16_t          int_fast16_t;
+typedef int32_t          int_fast32_t;
+typedef int64_t          int_fast64_t;
+typedef uint8_t          uint_fast8_t;
+typedef uint16_t        uint_fast16_t;
+typedef uint32_t        uint_fast32_t;
+typedef uint64_t        uint_fast64_t;
+
+
+/* 7.18.1.4 Integer types capable of holding object pointers */
+
+#ifndef _INTPTR_T
+#define _INTPTR_T
+typedef long   intptr_t;
+#endif /* _INTPTR_T */
+
+#ifndef _UINTPTR_T
+#define _UINTPTR_T
+typedef unsigned long   uintptr_t;
+#endif /* _UINTPTR_T */
+
+
+/* 7.18.1.5 Greatest-width integer types */
+#ifndef _INTMAX_T
+#define _INTMAX_T
+#ifdef __INTMAX_TYPE__
+typedef __INTMAX_TYPE__             intmax_t;
+#else /* __INTMAX_TYPE__ */
+typedef long long                intmax_t;
+#endif /* __INTMAX_TYPE__ */
+#endif /* _INTMAX_T */
+
+#ifndef _UINTMAX_T
+#define _UINTMAX_T
+#ifdef __UINTMAX_TYPE__
+typedef __UINTMAX_TYPE__             uintmax_t;
+#else /* __UINTMAX_TYPE__ */
+typedef unsigned long long      uintmax_t;
+#endif /* __UINTMAX_TYPE__ */
+#endif /* _UINTMAX_T */
+
+/* 7.18.2 Limits of specified-width integer types:
+ *   These #defines specify the minimum and maximum limits
+ *   of each of the types declared above.
+ */
+
+
+/* 7.18.2.1 Limits of exact-width integer types */
+#define INT8_MAX         127
+#define INT16_MAX        32767
+#define INT32_MAX        2147483647
+#define INT64_MAX        9223372036854775807LL
+
+#define INT8_MIN          -128
+#define INT16_MIN         -32768
+   /*
+      Note:  the literal "most negative int" cannot be written in C --
+      the rules in the standard (section 6.4.4.1 in C99) will give it
+      an unsigned type, so INT32_MIN (and the most negative member of
+      any larger signed type) must be written via a constant expression.
+   */
+#define INT32_MIN        (-INT32_MAX-1)
+#define INT64_MIN        (-INT64_MAX-1)
+
+#define UINT8_MAX         255
+#define UINT16_MAX        65535
+#define UINT32_MAX        4294967295U
+#define UINT64_MAX        18446744073709551615ULL
+
+/* 7.18.2.2 Limits of minimum-width integer types */
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST64_MIN   INT64_MIN
+
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MAX   INT64_MAX
+
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+/* 7.18.2.3 Limits of fastest minimum-width integer types */
+#define INT_FAST8_MIN     INT8_MIN
+#define INT_FAST16_MIN    INT16_MIN
+#define INT_FAST32_MIN    INT32_MIN
+#define INT_FAST64_MIN    INT64_MIN
+
+#define INT_FAST8_MAX     INT8_MAX
+#define INT_FAST16_MAX    INT16_MAX
+#define INT_FAST32_MAX    INT32_MAX
+#define INT_FAST64_MAX    INT64_MAX
+
+#define UINT_FAST8_MAX    UINT8_MAX
+#define UINT_FAST16_MAX   UINT16_MAX
+#define UINT_FAST32_MAX   UINT32_MAX
+#define UINT_FAST64_MAX   UINT64_MAX
+
+/* 7.18.2.4 Limits of integer types capable of holding object pointers */
+
+#if __WORDSIZE == 64
+#define INTPTR_MIN	  INT64_MIN
+#define INTPTR_MAX	  INT64_MAX
+#else
+#define INTPTR_MIN        INT32_MIN
+#define INTPTR_MAX        INT32_MAX
+#endif
+
+#if __WORDSIZE == 64
+#define UINTPTR_MAX	  UINT64_MAX
+#else
+#define UINTPTR_MAX       UINT32_MAX
+#endif
+
+/* 7.18.2.5 Limits of greatest-width integer types */
+#define INTMAX_MIN        INT64_MIN
+#define INTMAX_MAX        INT64_MAX
+
+#define UINTMAX_MAX       UINT64_MAX
+
+/* 7.18.3 "Other" */
+#if __WORDSIZE == 64
+#define PTRDIFF_MIN	  INT64_MIN
+#define PTRDIFF_MAX	  INT64_MAX
+#else
+#define PTRDIFF_MIN       INT32_MIN
+#define PTRDIFF_MAX       INT32_MAX
+#endif
+
+/* We have no sig_atomic_t yet, so no SIG_ATOMIC_{MIN,MAX}.
+   Should end up being {-127,127} or {0,255} ... or bigger.
+   My bet would be on one of {U}INT32_{MIN,MAX}. */
+
+#if __WORDSIZE == 64
+#define SIZE_MAX	  UINT64_MAX
+#else
+#define SIZE_MAX          UINT32_MAX
+#endif
+
+#ifndef WCHAR_MAX
+#  ifdef __WCHAR_MAX__
+#    define WCHAR_MAX     __WCHAR_MAX__
+#  else
+#    define WCHAR_MAX     0x7fffffff
+#  endif
+#endif
+
+/* WCHAR_MIN should be 0 if wchar_t is an unsigned type and
+   (-WCHAR_MAX-1) if wchar_t is a signed type.  Unfortunately,
+   it turns out that -fshort-wchar changes the signedness of
+   the type. */
+#ifndef WCHAR_MIN
+#  if WCHAR_MAX == 0xffff
+#    define WCHAR_MIN       0
+#  else
+#    define WCHAR_MIN       (-WCHAR_MAX-1)
+#  endif
+#endif
+
+#define WINT_MIN	  INT32_MIN
+#define WINT_MAX	  INT32_MAX
+
+#define SIG_ATOMIC_MIN	  INT32_MIN
+#define SIG_ATOMIC_MAX	  INT32_MAX
+
+/* 7.18.4 Macros for integer constants */
+#define INT8_C(v)    (v)
+#define INT16_C(v)   (v)
+#define INT32_C(v)   (v)
+#define INT64_C(v)   (v ## LL)
+
+#define UINT8_C(v)   (v ## U)
+#define UINT16_C(v)  (v ## U)
+#define UINT32_C(v)  (v ## U)
+#define UINT64_C(v)  (v ## ULL)
+
+#define INTMAX_C(v)  (v ## LL)
+#define UINTMAX_C(v) (v ## ULL)
+
+#endif /* _STDINT_H_ */
diff --git a/i386/include/stdio.h b/i386/include/stdio.h
new file mode 100644
index 0000000..455960c
--- /dev/null
+++ b/i386/include/stdio.h
@@ -0,0 +1,503 @@
+/*
+ * Copyright (c) 2000, 2005, 2007, 2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
+ */
+
+#ifndef	_STDIO_H_
+#define	_STDIO_H_
+
+#include <_types.h>
+
+#ifndef _VA_LIST
+#define _VA_LIST
+/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
+ * __gnuc_va_list and include <stdarg.h> */
+typedef __darwin_va_list	va_list;
+#endif
+
+#ifndef	_OFF_T
+#define	_OFF_T
+typedef	__darwin_off_t		off_t;
+#endif
+
+#ifndef	_SIZE_T
+#define	_SIZE_T
+typedef	__darwin_size_t		size_t;
+#endif
+
+#ifndef NULL
+#define NULL __DARWIN_NULL
+#endif /* ! NULL */
+
+typedef __darwin_off_t		fpos_t;
+
+#define	_FSTDIO			/* Define for new stdio with functions. */
+
+/*
+ * NB: to fit things in six character monocase externals, the stdio
+ * code uses the prefix `__s' for stdio objects, typically followed
+ * by a three-character attempt at a mnemonic.
+ */
+
+/* stdio buffers */
+struct __sbuf {
+	unsigned char	*_base;
+	int		_size;
+};
+
+/* hold a buncha junk that would grow the ABI */
+struct __sFILEX;
+
+/*
+ * stdio state variables.
+ *
+ * The following always hold:
+ *
+ *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
+ *		_lbfsize is -_bf._size, else _lbfsize is 0
+ *	if _flags&__SRD, _w is 0
+ *	if _flags&__SWR, _r is 0
+ *
+ * This ensures that the getc and putc macros (or inline functions) never
+ * try to write or read from a file that is in `read' or `write' mode.
+ * (Moreover, they can, and do, automatically switch from read mode to
+ * write mode, and back, on "r+" and "w+" files.)
+ *
+ * _lbfsize is used only to make the inline line-buffered output stream
+ * code as compact as possible.
+ *
+ * _ub, _up, and _ur are used when ungetc() pushes back more characters
+ * than fit in the current _bf, or when ungetc() pushes back a character
+ * that does not match the previous one in _bf.  When this happens,
+ * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
+ * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
+ *
+ * NB: see WARNING above before changing the layout of this structure!
+ */
+typedef	struct __sFILE {
+	unsigned char *_p;	/* current position in (some) buffer */
+	int	_r;		/* read space left for getc() */
+	int	_w;		/* write space left for putc() */
+	short	_flags;		/* flags, below; this FILE is free if 0 */
+	short	_file;		/* fileno, if Unix descriptor, else -1 */
+	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
+	int	_lbfsize;	/* 0 or -_bf._size, for inline putc */
+
+	/* operations */
+	void	*_cookie;	/* cookie passed to io functions */
+	int	(*_close)(void *);
+	int	(*_read) (void *, char *, int);
+	fpos_t	(*_seek) (void *, fpos_t, int);
+	int	(*_write)(void *, const char *, int);
+
+	/* separate buffer for long sequences of ungetc() */
+	struct	__sbuf _ub;	/* ungetc buffer */
+	struct __sFILEX *_extra; /* additions to FILE to not break ABI */
+	int	_ur;		/* saved _r when _r is counting ungetc data */
+
+	/* tricks to meet minimum requirements even when malloc() fails */
+	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
+	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
+
+	/* separate buffer for fgetln() when line crosses buffer boundary */
+	struct	__sbuf _lb;	/* buffer for fgetln() */
+
+	/* Unix stdio files get aligned to block boundaries on fseek() */
+	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
+	fpos_t	_offset;	/* current lseek offset (see WARNING) */
+} FILE;
+
+__BEGIN_DECLS
+#if __DARWIN_UNIX03
+extern FILE *__stdinp;
+extern FILE *__stdoutp;
+extern FILE *__stderrp;
+#else /* !__DARWIN_UNIX03 */
+extern FILE __sF[];
+#endif /* __DARWIN_UNIX03 */
+__END_DECLS
+
+#define	__SLBF	0x0001		/* line buffered */
+#define	__SNBF	0x0002		/* unbuffered */
+#define	__SRD	0x0004		/* OK to read */
+#define	__SWR	0x0008		/* OK to write */
+	/* RD and WR are never simultaneously asserted */
+#define	__SRW	0x0010		/* open for reading & writing */
+#define	__SEOF	0x0020		/* found EOF */
+#define	__SERR	0x0040		/* found error */
+#define	__SMBF	0x0080		/* _buf is from malloc */
+#define	__SAPP	0x0100		/* fdopen()ed in append mode */
+#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
+#define	__SOPT	0x0400		/* do fseek() optimisation */
+#define	__SNPT	0x0800		/* do not do fseek() optimisation */
+#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
+#define	__SMOD	0x2000		/* true => fgetln modified _p text */
+#define __SALC  0x4000		/* allocate string space dynamically */
+#define __SIGN  0x8000		/* ignore this file in _fwalk */
+
+/*
+ * The following three definitions are for ANSI C, which took them
+ * from System V, which brilliantly took internal interface macros and
+ * made them official arguments to setvbuf(), without renaming them.
+ * Hence, these ugly _IOxxx names are *supposed* to appear in user code.
+ *
+ * Although numbered as their counterparts above, the implementation
+ * does not rely on this.
+ */
+#define	_IOFBF	0		/* setvbuf should set fully buffered */
+#define	_IOLBF	1		/* setvbuf should set line buffered */
+#define	_IONBF	2		/* setvbuf should set unbuffered */
+
+#define	BUFSIZ	1024		/* size of buffer used by setbuf */
+#define	EOF	(-1)
+
+/*
+ * FOPEN_MAX is a minimum maximum, and is the number of streams that
+ * stdio can provide without attempting to allocate further resources
+ * (which could fail).  Do not use this for anything.
+ */
+				/* must be == _POSIX_STREAM_MAX <limits.h> */
+#define	FOPEN_MAX	20	/* must be <= OPEN_MAX <sys/syslimits.h> */
+#define	FILENAME_MAX	1024	/* must be <= PATH_MAX <sys/syslimits.h> */
+
+/* System V/ANSI C; this is the wrong way to do this, do *not* use these. */
+#ifndef _ANSI_SOURCE
+#define	P_tmpdir	"/var/tmp/"
+#endif
+#define	L_tmpnam	1024	/* XXX must be == PATH_MAX */
+#define	TMP_MAX		308915776
+
+#ifndef SEEK_SET
+#define	SEEK_SET	0	/* set file offset to offset */
+#endif
+#ifndef SEEK_CUR
+#define	SEEK_CUR	1	/* set file offset to current plus offset */
+#endif
+#ifndef SEEK_END
+#define	SEEK_END	2	/* set file offset to EOF plus offset */
+#endif
+
+#if __DARWIN_UNIX03
+#define	stdin	__stdinp
+#define	stdout	__stdoutp
+#define	stderr	__stderrp
+#else /* !__DARWIN_UNIX03 */
+#define stdin	(&__sF[0])
+#define stdout	(&__sF[1])
+#define stderr	(&__sF[2])
+#endif /* __DARWIN_UNIX03 */
+
+/*
+ * Functions defined in ANSI C standard.
+ */
+__BEGIN_DECLS
+void	 clearerr(FILE *);
+int	 fclose(FILE *);
+int	 feof(FILE *);
+int	 ferror(FILE *);
+int	 fflush(FILE *);
+int	 fgetc(FILE *);
+int	 fgetpos(FILE * __restrict, fpos_t *);
+char	*fgets(char * __restrict, int, FILE *);
+#if defined(__DARWIN_10_6_AND_LATER) && (defined(_DARWIN_UNLIMITED_STREAMS) || defined(_DARWIN_C_SOURCE))
+FILE	*fopen(const char * __restrict, const char * __restrict) __DARWIN_EXTSN(fopen);
+#else /* < 10.6 || !_DARWIN_UNLIMITED_STREAMS && !_DARWIN_C_SOURCE */
+//Begin-Libc
+#ifndef LIBC_ALIAS_FOPEN
+//End-Libc
+FILE	*fopen(const char * __restrict, const char * __restrict) __DARWIN_10_6_AND_LATER_ALIAS(__DARWIN_ALIAS(fopen));
+//Begin-Libc
+#else /* LIBC_ALIAS_FOPEN */
+FILE	*fopen(const char * __restrict, const char * __restrict) LIBC_ALIAS(fopen);
+#endif /* !LIBC_ALIAS_FOPEN */
+//End-Libc
+#endif /* >= 10.6 &&_(DARWIN_UNLIMITED_STREAMS || _DARWIN_C_SOURCE) */
+int	 fprintf(FILE * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(fprintf);
+int	 fputc(int, FILE *);
+//Begin-Libc
+#ifndef LIBC_ALIAS_FPUTS
+//End-Libc
+int	 fputs(const char * __restrict, FILE * __restrict) __DARWIN_ALIAS(fputs);
+//Begin-Libc
+#else /* LIBC_ALIAS_FPUTS */
+int	 fputs(const char * __restrict, FILE * __restrict) LIBC_ALIAS(fputs);
+#endif /* !LIBC_ALIAS_FPUTS */
+//End-Libc
+size_t	 fread(void * __restrict, size_t, size_t, FILE * __restrict);
+//Begin-Libc
+#ifndef LIBC_ALIAS_FREOPEN
+//End-Libc
+FILE	*freopen(const char * __restrict, const char * __restrict,
+	    FILE * __restrict) __DARWIN_ALIAS(freopen);
+//Begin-Libc
+#else /* LIBC_ALIAS_FREOPEN */
+FILE	*freopen(const char * __restrict, const char * __restrict,
+	    FILE * __restrict) LIBC_ALIAS(freopen);
+#endif /* !LIBC_ALIAS_FREOPEN */
+//End-Libc
+int	 fscanf(FILE * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(fscanf);
+int	 fseek(FILE *, long, int);
+int	 fsetpos(FILE *, const fpos_t *);
+long	 ftell(FILE *);
+//Begin-Libc
+#ifndef LIBC_ALIAS_FWRITE
+//End-Libc
+size_t	 fwrite(const void * __restrict, size_t, size_t, FILE * __restrict) __DARWIN_ALIAS(fwrite);
+//Begin-Libc
+#else /* LIBC_ALIAS_FWRITE */
+size_t	 fwrite(const void * __restrict, size_t, size_t, FILE * __restrict) LIBC_ALIAS(fwrite);
+#endif /* !LIBC_ALIAS_FWRITE */
+//End-Libc
+int	 getc(FILE *);
+int	 getchar(void);
+char	*gets(char *);
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+extern __const int sys_nerr;		/* perror(3) external variables */
+extern __const char *__const sys_errlist[];
+#endif
+void	 perror(const char *);
+int	 printf(const char * __restrict, ...) __DARWIN_LDBL_COMPAT(printf);
+int	 putc(int, FILE *);
+int	 putchar(int);
+int	 puts(const char *);
+int	 remove(const char *);
+int	 rename (const char *, const char *);
+void	 rewind(FILE *);
+int	 scanf(const char * __restrict, ...) __DARWIN_LDBL_COMPAT(scanf);
+void	 setbuf(FILE * __restrict, char * __restrict);
+int	 setvbuf(FILE * __restrict, char * __restrict, int, size_t);
+int	 sprintf(char * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(sprintf);
+int	 sscanf(const char * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(sscanf);
+FILE	*tmpfile(void);
+char	*tmpnam(char *);
+int	 ungetc(int, FILE *);
+int	 vfprintf(FILE * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vfprintf);
+int	 vprintf(const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vprintf);
+int	 vsprintf(char * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vsprintf);
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+int	 asprintf(char **, const char *, ...) __DARWIN_LDBL_COMPAT(asprintf);
+int	 vasprintf(char **, const char *, va_list) __DARWIN_LDBL_COMPAT(vasprintf);
+#endif
+__END_DECLS
+
+/*
+ * Functions defined in POSIX 1003.1.
+ */
+#ifndef _ANSI_SOURCE
+#define	L_ctermid	1024	/* size for ctermid(); PATH_MAX */
+
+__BEGIN_DECLS
+char	*ctermid(char *);
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+char	*ctermid_r(char *);
+#endif /* not POSIX */
+#if defined(__DARWIN_10_6_AND_LATER) && (defined(_DARWIN_UNLIMITED_STREAMS) || defined(_DARWIN_C_SOURCE))
+FILE	*fdopen(int, const char *) __DARWIN_EXTSN(fdopen);
+#else /* < 10.6 || !_DARWIN_UNLIMITED_STREAMS && !_DARWIN_C_SOURCE */
+//Begin-Libc
+#ifndef LIBC_ALIAS_FDOPEN
+//End-Libc
+FILE	*fdopen(int, const char *) __DARWIN_10_6_AND_LATER_ALIAS(__DARWIN_ALIAS(fdopen));
+//Begin-Libc
+#else /* LIBC_ALIAS_FDOPEN */
+FILE	*fdopen(int, const char *) LIBC_ALIAS(fdopen);
+#endif /* !LIBC_ALIAS_FDOPEN */
+//End-Libc
+#endif /* >= 10.6 &&_(DARWIN_UNLIMITED_STREAMS || _DARWIN_C_SOURCE) */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+char	*fgetln(FILE *, size_t *);
+#endif /* not POSIX */
+int	 fileno(FILE *);
+void	 flockfile(FILE *);
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+__const char
+	*fmtcheck(const char *, const char *);
+int	 fpurge(FILE *);
+#endif /* not POSIX */
+int	 fseeko(FILE *, off_t, int);
+off_t	 ftello(FILE *);
+int	 ftrylockfile(FILE *);
+void	 funlockfile(FILE *);
+int	 getc_unlocked(FILE *);
+int	 getchar_unlocked(void);
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+int	 getw(FILE *);
+#endif /* not POSIX */
+int	 pclose(FILE *);
+#if defined(__DARWIN_10_6_AND_LATER) && (defined(_DARWIN_UNLIMITED_STREAMS) || defined(_DARWIN_C_SOURCE))
+FILE	*popen(const char *, const char *) __DARWIN_EXTSN(popen);
+#else /* < 10.6 || !_DARWIN_UNLIMITED_STREAMS && !_DARWIN_C_SOURCE */
+//Begin-Libc
+#ifndef LIBC_ALIAS_POPEN
+//End-Libc
+FILE	*popen(const char *, const char *) __DARWIN_10_6_AND_LATER_ALIAS(__DARWIN_ALIAS(popen));
+//Begin-Libc
+#else /* LIBC_ALIAS_POPEN */
+FILE	*popen(const char *, const char *) LIBC_ALIAS(popen);
+#endif /* !LIBC_ALIAS_POPEN */
+//End-Libc
+#endif /* >= 10.6 &&_(DARWIN_UNLIMITED_STREAMS || _DARWIN_C_SOURCE) */
+int	 putc_unlocked(int, FILE *);
+int	 putchar_unlocked(int);
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+int	 putw(int, FILE *);
+void	 setbuffer(FILE *, char *, int);
+int	 setlinebuf(FILE *);
+#endif /* not POSIX */
+int	 snprintf(char * __restrict, size_t, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(snprintf);
+//Begin-Libc
+#ifndef LIBC_ALIAS_TEMPNAM
+//End-Libc
+char	*tempnam(const char *, const char *) __DARWIN_ALIAS(tempnam);
+//Begin-Libc
+#else /* LIBC_ALIAS_TEMPNAM */
+char	*tempnam(const char *, const char *) LIBC_ALIAS(tempnam);
+#endif /* !LIBC_ALIAS_TEMPNAM */
+//End-Libc
+int	 vfscanf(FILE * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vfscanf);
+int	 vscanf(const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vscanf);
+int	 vsnprintf(char * __restrict, size_t, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vsnprintf);
+int	 vsscanf(const char * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vsscanf);
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+FILE	*zopen(const char *, const char *, int);
+#endif /* not POSIX */
+__END_DECLS
+
+/*
+ * Stdio function-access interface.
+ */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+__BEGIN_DECLS
+FILE	*funopen(const void *,
+		int (*)(void *, char *, int),
+		int (*)(void *, const char *, int),
+		fpos_t (*)(void *, fpos_t, int),
+		int (*)(void *));
+__END_DECLS
+#define	fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
+#define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
+#endif /* not POSIX */
+#endif /* not ANSI */
+
+/*
+ * Functions internal to the implementation.
+ */
+__BEGIN_DECLS
+int	__srget(FILE *);
+int	__svfscanf(FILE *, const char *, va_list) __DARWIN_LDBL_COMPAT(__svfscanf);
+int	__swbuf(int, FILE *);
+__END_DECLS
+
+/*
+ * The __sfoo macros are here so that we can
+ * define function versions in the C library.
+ */
+#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
+#if defined(__GNUC__) && defined(__STDC__)
+static __inline int __sputc(int _c, FILE *_p) {
+	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
+		return (*_p->_p++ = _c);
+	else
+		return (__swbuf(_c, _p));
+}
+#else
+/*
+ * This has been tuned to generate reasonable code on the vax using pcc.
+ */
+#define	__sputc(c, p) \
+	(--(p)->_w < 0 ? \
+		(p)->_w >= (p)->_lbfsize ? \
+			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
+				(int)*(p)->_p++ : \
+				__swbuf('\n', p) : \
+			__swbuf((int)(c), p) : \
+		(*(p)->_p = (c), (int)*(p)->_p++))
+#endif
+
+#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
+#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
+#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
+#define	__sfileno(p)	((p)->_file)
+
+#ifndef _ANSI_SOURCE
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	feof_unlocked(p)	__sfeof(p)
+#define	ferror_unlocked(p)	__sferror(p)
+#define	clearerr_unlocked(p)	__sclearerr(p)
+#define	fileno_unlocked(p)	__sfileno(p)
+#endif /* not POSIX */
+
+#ifndef lint
+#define	getc_unlocked(fp)	__sgetc(fp)
+#define putc_unlocked(x, fp)	__sputc(x, fp)
+#endif /* lint */
+
+#define	getchar_unlocked()	getc_unlocked(stdin)
+#define	putchar_unlocked(x)	putc_unlocked(x, stdout)
+#endif /* not ANSI */
+
+#ifdef _USE_EXTENDED_LOCALES_
+#include <xlocale/_stdio.h>
+#endif /* _USE_EXTENDED_LOCALES_ */
+
+#if defined (__GNUC__) && _FORTIFY_SOURCE > 0 && !defined (__cplusplus)
+/* Security checking functions.  */
+#include <secure/_stdio.h>
+#endif
+
+#endif /* _STDIO_H_ */
diff --git a/i386/include/stdlib.h b/i386/include/stdlib.h
new file mode 100644
index 0000000..a177dbb
--- /dev/null
+++ b/i386/include/stdlib.h
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2000, 2002 - 2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)stdlib.h	8.5 (Berkeley) 5/19/95
+ */
+
+#ifndef _STDLIB_H_
+#define _STDLIB_H_
+
+#include <sys/types.h>
+
+#ifndef	_SIZE_T
+#define	_SIZE_T
+/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
+ * _GCC_SIZE_T */
+typedef	__darwin_size_t		size_t;
+#endif
+
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+#ifndef _CT_RUNE_T
+#define _CT_RUNE_T
+typedef	__darwin_ct_rune_t	ct_rune_t;
+#endif
+
+#ifndef _RUNE_T
+#define _RUNE_T
+typedef __darwin_rune_t   	rune_t;
+#endif
+#endif	/* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+#ifndef	__cplusplus
+#ifndef	_WCHAR_T
+#define	_WCHAR_T
+typedef	__darwin_wchar_t	wchar_t;
+#endif	/* _WCHAR_T */
+#endif	/* __cplusplus */
+
+typedef struct {
+	int quot;		/* quotient */
+	int rem;		/* remainder */
+} div_t;
+
+typedef struct {
+	long quot;		/* quotient */
+	long rem;		/* remainder */
+} ldiv_t;
+
+#if !__DARWIN_NO_LONG_LONG
+typedef struct {
+	long long quot;
+	long long rem;
+} lldiv_t;
+#endif /* !__DARWIN_NO_LONG_LONG */
+
+#ifndef NULL
+#define NULL __DARWIN_NULL
+#endif /* ! NULL */
+
+#define	EXIT_FAILURE	1
+#define	EXIT_SUCCESS	0
+
+#define	RAND_MAX	0x7fffffff
+
+#ifdef _USE_EXTENDED_LOCALES_
+#include <_xlocale.h>
+#endif /* _USE_EXTENDED_LOCALES_ */
+
+#ifndef MB_CUR_MAX
+#ifdef _USE_EXTENDED_LOCALES_
+#define	MB_CUR_MAX	(___mb_cur_max())
+#ifndef MB_CUR_MAX_L
+#define	MB_CUR_MAX_L(x)	(___mb_cur_max_l(x))
+#endif /* !MB_CUR_MAX_L */
+#else /* !_USE_EXTENDED_LOCALES_ */
+extern int __mb_cur_max;
+#define	MB_CUR_MAX	__mb_cur_max
+#endif /* _USE_EXTENDED_LOCALES_ */
+#endif /* MB_CUR_MAX */
+
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) \
+    && defined(_USE_EXTENDED_LOCALES_) && !defined(MB_CUR_MAX_L)
+#define	MB_CUR_MAX_L(x)	(___mb_cur_max_l(x))
+#endif
+//Begin-Libc
+/* f must be a literal string */
+#define LIBC_ABORT(f,...)	abort_report_np("%s:%s:%u: " f, __FILE__, __func__, __LINE__, ## __VA_ARGS__)
+//End-Libc
+
+__BEGIN_DECLS
+void	 abort(void) __dead2;
+//Begin-Libc
+__private_extern__
+void	 abort_report_np(const char *, ...) __dead2 __printflike(1, 2);
+//End-Libc
+int	 abs(int) __pure2;
+int	 atexit(void (*)(void));
+double	 atof(const char *);
+int	 atoi(const char *);
+long	 atol(const char *);
+#if !__DARWIN_NO_LONG_LONG
+long long
+	 atoll(const char *);
+#endif /* !__DARWIN_NO_LONG_LONG */
+void	*bsearch(const void *, const void *, size_t,
+	    size_t, int (*)(const void *, const void *));
+void	*calloc(size_t, size_t);
+div_t	 div(int, int) __pure2;
+void	 exit(int) __dead2;
+void	 free(void *);
+char	*getenv(const char *);
+long	 labs(long) __pure2;
+ldiv_t	 ldiv(long, long) __pure2;
+#if !__DARWIN_NO_LONG_LONG
+long long
+	 llabs(long long);
+lldiv_t	 lldiv(long long, long long);
+#endif /* !__DARWIN_NO_LONG_LONG */
+void	*malloc(size_t);
+int	 mblen(const char *, size_t);
+size_t	 mbstowcs(wchar_t * __restrict , const char * __restrict, size_t);
+int	 mbtowc(wchar_t * __restrict, const char * __restrict, size_t);
+int 	 posix_memalign(void **, size_t, size_t);
+void	 qsort(void *, size_t, size_t,
+	    int (*)(const void *, const void *));
+int	 rand(void);
+void	*realloc(void *, size_t);
+void	 srand(unsigned);
+double	 strtod(const char *, char **) __DARWIN_ALIAS(strtod);
+float	 strtof(const char *, char **) __DARWIN_ALIAS(strtof);
+long	 strtol(const char *, char **, int);
+long double
+	 strtold(const char *, char **) __DARWIN_LDBL_COMPAT(strtold);
+#if !__DARWIN_NO_LONG_LONG
+long long 
+	 strtoll(const char *, char **, int);
+#endif /* !__DARWIN_NO_LONG_LONG */
+unsigned long
+	 strtoul(const char *, char **, int);
+#if !__DARWIN_NO_LONG_LONG
+unsigned long long
+	 strtoull(const char *, char **, int);
+#endif /* !__DARWIN_NO_LONG_LONG */
+//Begin-Libc
+#ifndef LIBC_ALIAS_SYSTEM
+//End-Libc
+int	 system(const char *) __DARWIN_ALIAS_C(system);
+//Begin-Libc
+#else /* LIBC_ALIAS_SYSTEM */
+int	 system(const char *) LIBC_ALIAS_C(system);
+#endif /* !LIBC_ALIAS_SYSTEM */
+//End-Libc
+size_t	 wcstombs(char * __restrict, const wchar_t * __restrict, size_t);
+int	 wctomb(char *, wchar_t);
+
+#ifndef _ANSI_SOURCE
+void	_Exit(int) __dead2;
+long	 a64l(const char *);
+double	 drand48(void);
+char	*ecvt(double, int, int *__restrict, int *__restrict); /* LEGACY */
+double	 erand48(unsigned short[3]); 
+char	*fcvt(double, int, int *__restrict, int *__restrict); /* LEGACY */
+char	*gcvt(double, int, char *); /* LEGACY */
+int	 getsubopt(char **, char * const *, char **);
+int	 grantpt(int);
+#if __DARWIN_UNIX03
+char	*initstate(unsigned, char *, size_t); /* no  __DARWIN_ALIAS needed */
+#else /* !__DARWIN_UNIX03 */
+char	*initstate(unsigned long, char *, long);
+#endif /* __DARWIN_UNIX03 */
+long	 jrand48(unsigned short[3]);
+char	*l64a(long);
+void	 lcong48(unsigned short[7]);
+long	 lrand48(void);
+char	*mktemp(char *);
+int	 mkstemp(char *);
+long	 mrand48(void); 
+long	 nrand48(unsigned short[3]);
+int	 posix_openpt(int);
+char	*ptsname(int);
+//Begin-Libc
+#ifndef LIBC_ALIAS_PUTENV
+//End-Libc
+int	 putenv(char *) __DARWIN_ALIAS(putenv);
+//Begin-Libc
+#else /* LIBC_ALIAS_PUTENV */
+int	 putenv(char *) LIBC_ALIAS(putenv);
+#endif /* !LIBC_ALIAS_PUTENV */
+//End-Libc
+long	 random(void);
+int	 rand_r(unsigned *);
+//Begin-Libc
+#ifdef __LIBC__
+#ifndef LIBC_ALIAS_REALPATH
+char	*realpath(const char * __restrict, char * __restrict) __DARWIN_EXTSN(realpath);
+#else /* LIBC_ALIAS_REALPATH */
+#ifdef VARIANT_DARWINEXTSN
+char	*realpath(const char * __restrict, char * __restrict) LIBC_EXTSN(realpath);
+#else /* !VARIANT_DARWINEXTSN */
+char	*realpath(const char * __restrict, char * __restrict) LIBC_ALIAS(realpath);
+#endif /* VARIANT_DARWINEXTSN */
+#endif /* !LIBC_ALIAS_REALPATH */
+#else /* !__LIBC__ */
+//End-Libc
+#if (__DARWIN_UNIX03 && !defined(_POSIX_C_SOURCE)) || defined(_DARWIN_C_SOURCE) || defined(_DARWIN_BETTER_REALPATH)
+char	*realpath(const char * __restrict, char * __restrict) __DARWIN_EXTSN(realpath);
+#else /* (!__DARWIN_UNIX03 || _POSIX_C_SOURCE) && !_DARWIN_C_SOURCE && !_DARWIN_BETTER_REALPATH */
+char	*realpath(const char * __restrict, char * __restrict) __DARWIN_ALIAS(realpath);
+#endif /* (__DARWIN_UNIX03 && _POSIX_C_SOURCE) || _DARWIN_C_SOURCE || _DARWIN_BETTER_REALPATH */
+//Begin-Libc
+#endif /* __LIBC__ */
+//End-Libc
+unsigned short
+	*seed48(unsigned short[3]);
+//Begin-Libc
+#ifndef LIBC_ALIAS_SETENV
+//End-Libc
+int	 setenv(const char *, const char *, int) __DARWIN_ALIAS(setenv);
+//Begin-Libc
+#else /* LIBC_ALIAS_SETENV */
+int	 setenv(const char *, const char *, int) LIBC_ALIAS(setenv);
+#endif /* !LIBC_ALIAS_SETENV */
+//End-Libc
+#if __DARWIN_UNIX03
+//Begin-Libc
+#ifndef LIBC_ALIAS_SETKEY
+//End-Libc
+void	 setkey(const char *) __DARWIN_ALIAS(setkey);
+//Begin-Libc
+#else /* LIBC_ALIAS_SETKEY */
+void	 setkey(const char *) LIBC_ALIAS(setkey);
+#endif /* !LIBC_ALIAS_SETKEY */
+//End-Libc
+#else /* !__DARWIN_UNIX03 */
+int	 setkey(const char *);
+#endif /* __DARWIN_UNIX03 */
+char	*setstate(const char *);
+void	 srand48(long);
+#if __DARWIN_UNIX03
+void	 srandom(unsigned);
+#else /* !__DARWIN_UNIX03 */
+void	 srandom(unsigned long);
+#endif /* __DARWIN_UNIX03 */
+int	 unlockpt(int);
+#if __DARWIN_UNIX03
+//Begin-Libc
+#ifndef LIBC_ALIAS_UNSETENV
+//End-Libc
+int	 unsetenv(const char *) __DARWIN_ALIAS(unsetenv);
+//Begin-Libc
+#else /* LIBC_ALIAS_UNSETENV */
+int	 unsetenv(const char *) LIBC_ALIAS(unsetenv);
+#endif /* !LIBC_ALIAS_UNSETENV */
+//End-Libc
+#else /* !__DARWIN_UNIX03 */
+void	 unsetenv(const char *);
+#endif /* __DARWIN_UNIX03 */
+#endif	/* !_ANSI_SOURCE */
+
+/* Poison the following routines if -fshort-wchar is set */
+#if !defined(__cplusplus) && defined(__WCHAR_MAX__) && __WCHAR_MAX__ <= 0xffffU
+#pragma GCC poison mbstowcs mbtowc wcstombs wctomb
+#endif
+__END_DECLS
+
+#ifdef _USE_EXTENDED_LOCALES_
+#include <xlocale/_stdlib.h>
+#endif /* _USE_EXTENDED_LOCALES_ */
+
+#endif /* _STDLIB_H_ */
diff --git a/i386/include/string.h b/i386/include/string.h
new file mode 100644
index 0000000..6c16441
--- /dev/null
+++ b/i386/include/string.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2000, 2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)string.h	8.1 (Berkeley) 6/2/93
+ */
+
+#ifndef _STRING_H_
+#define	_STRING_H_
+#include <_types.h>
+
+#ifndef	_SIZE_T
+#define	_SIZE_T
+typedef	__darwin_size_t		size_t;
+#endif
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)	/* For swab */
+#ifndef _SSIZE_T
+#define _SSIZE_T
+typedef __darwin_ssize_t	ssize_t;
+#endif
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+#ifndef NULL
+#define NULL __DARWIN_NULL
+#endif /* ! NULL */
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+void	*memchr(const void *, int, size_t);
+int	 memcmp(const void *, const void *, size_t);
+void	*memcpy(void *, const void *, size_t);
+void	*memmove(void *, const void *, size_t);
+void	*memset(void *, int, size_t);
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+char	*stpcpy(char *, const char *);
+char	*strcasestr(const char *, const char *);
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+char	*strcat(char *, const char *);
+char	*strchr(const char *, int);
+int	 strcmp(const char *, const char *);
+int	 strcoll(const char *, const char *);
+char	*strcpy(char *, const char *);
+size_t	 strcspn(const char *, const char *);
+//Begin-Libc
+#ifndef LIBC_ALIAS_STRERROR
+//End-Libc
+char	*strerror(int) __DARWIN_ALIAS(strerror);
+//Begin-Libc
+#else /* LIBC_ALIAS_STRERROR */
+char	*strerror(int) LIBC_ALIAS(strerror);
+#endif /* !LIBC_ALIAS_STRERROR */
+//End-Libc
+int	 strerror_r(int, char *, size_t);
+size_t	 strlen(const char *);
+char	*strncat(char *, const char *, size_t);
+int	 strncmp(const char *, const char *, size_t);
+char	*strncpy(char *, const char *, size_t);
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+char	*strnstr(const char *, const char *, size_t);
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+char	*strpbrk(const char *, const char *);
+char	*strrchr(const char *, int);
+size_t	 strspn(const char *, const char *);
+char	*strstr(const char *, const char *);
+char	*strtok(char *, const char *);
+size_t	 strxfrm(char *, const char *, size_t);
+
+/* Nonstandard routines */
+#ifndef _ANSI_SOURCE
+void	*memccpy(void *, const void *, int, size_t);
+char	*strtok_r(char *, const char *, char **);
+char	*strdup(const char *);
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+int	 bcmp(const void *, const void *, size_t);
+void	 bcopy(const void *, void *, size_t);
+void	 bzero(void *, size_t);
+int	 ffs(int);
+int	 ffsl(long);
+int	 fls(int);
+int	 flsl(long);
+char	*index(const char *, int);
+void     memset_pattern4(void *, const void *, size_t);
+void     memset_pattern8(void *, const void *, size_t);
+void     memset_pattern16(void *, const void *, size_t);
+char	*rindex(const char *, int);
+int	 strcasecmp(const char *, const char *);
+size_t	 strlcat(char *, const char *, size_t);
+size_t	 strlcpy(char *, const char *, size_t);
+void	 strmode(int, char *);
+int	 strncasecmp(const char *, const char *, size_t);
+char	*strsep(char **, const char *);
+char	*strsignal(int sig);
+void	 swab(const void * __restrict, void * __restrict, ssize_t);
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#endif 	/* !_ANSI_SOURCE */
+__END_DECLS
+
+#ifdef _USE_EXTENDED_LOCALES_
+#include <xlocale/_string.h>
+#endif /* _USE_EXTENDED_LOCALES_ */
+
+#endif /* _STRING_H_ */
diff --git a/i386/include/sys/_endian.h b/i386/include/sys/_endian.h
new file mode 100644
index 0000000..3fb0f06
--- /dev/null
+++ b/i386/include/sys/_endian.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2004, 2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+/*
+ * Copyright (c) 1995 NeXT Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1987, 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _SYS__ENDIAN_H_
+#define	_SYS__ENDIAN_H_
+
+#include <sys/cdefs.h>
+
+/*
+ * Macros for network/external number representation conversion.
+ */
+
+#if defined(lint)
+
+__BEGIN_DECLS
+__uint16_t	ntohs(__uint16_t);
+__uint16_t	htons(__uint16_t);
+__uint32_t	ntohl(__uint32_t);
+__uint32_t	htonl(__uint32_t);
+__END_DECLS
+
+#elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
+
+#define ntohl(x)        ((__uint32_t)(x))
+#define ntohs(x)        ((__uint16_t)(x))
+#define htonl(x)        ((__uint32_t)(x))
+#define htons(x)        ((__uint16_t)(x))
+
+#if     defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+#define NTOHL(x)        (x)
+#define NTOHS(x)        (x)
+#define HTONL(x)        (x)
+#define HTONS(x)        (x)
+#endif /* defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) */
+
+#else	/* __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN */
+
+#include <libkern/_OSByteOrder.h>
+
+#define ntohs(x)	__DARWIN_OSSwapInt16(x)
+#define htons(x)	__DARWIN_OSSwapInt16(x)
+
+#define ntohl(x)	__DARWIN_OSSwapInt32(x)
+#define htonl(x)	__DARWIN_OSSwapInt32(x)
+
+#if	defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+#define	NTOHL(x)	(x) = ntohl((__uint32_t)x)
+#define	NTOHS(x)	(x) = ntohs((__uint16_t)x)
+#define	HTONL(x)	(x) = htonl((__uint32_t)x)
+#define	HTONS(x)	(x) = htons((__uint16_t)x)
+#endif /* defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) */
+#endif /* __DARWIN_BYTE_ORDER */
+#endif /* !_SYS__ENDIAN_H_ */
diff --git a/i386/include/sys/_select.h b/i386/include/sys/_select.h
new file mode 100644
index 0000000..6f70921
--- /dev/null
+++ b/i386/include/sys/_select.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2005, 2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+/*
+ * This is called from sys/select.h and sys/time.h for the common prototype
+ * of select().  Setting _DARWIN_C_SOURCE or _DARWIN_UNLIMITED_SELECT uses
+ * the version of select() that does not place a limit on the first argument
+ * (nfds).  In the UNIX conformance case, values of nfds greater than
+ * FD_SETSIZE will return an error of EINVAL.
+ */
+#ifndef _SYS__SELECT_H_
+#define	_SYS__SELECT_H_
+
+int	 select(int, fd_set * __restrict, fd_set * __restrict,
+		fd_set * __restrict, struct timeval * __restrict)
+#if defined(_DARWIN_C_SOURCE) || defined(_DARWIN_UNLIMITED_SELECT)
+		__DARWIN_EXTSN_C(select)
+#else /* !_DARWIN_C_SOURCE && !_DARWIN_UNLIMITED_SELECT */
+#  if defined(__LP64__) && !__DARWIN_NON_CANCELABLE
+		__DARWIN_1050(select)
+#  else /* !__LP64__ || __DARWIN_NON_CANCELABLE */
+		__DARWIN_ALIAS_C(select)
+#  endif /* __LP64__ && !__DARWIN_NON_CANCELABLE */
+#endif /* _DARWIN_C_SOURCE || _DARWIN_UNLIMITED_SELECT */
+		;
+
+#endif /* !_SYS__SELECT_H_ */
diff --git a/i386/include/sys/_structs.h b/i386/include/sys/_structs.h
new file mode 100644
index 0000000..5c9db95
--- /dev/null
+++ b/i386/include/sys/_structs.h
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#include <sys/cdefs.h>
+
+#ifdef __need_ucontext_t
+#ifndef __need_struct_ucontext
+#define __need_struct_ucontext
+#endif /* __need_struct_ucontext */
+#endif /* __need_ucontext_t */
+
+#ifdef __need_ucontext64_t
+#ifndef __need_struct_ucontext64
+#define __need_struct_ucontext64
+#endif /* __need_struct_ucontext64 */
+#endif /* __need_ucontext64_t */
+
+#ifdef __need_struct_ucontext
+#ifndef __need_struct_mcontext
+#define __need_struct_mcontext
+#endif /* __need_struct_mcontext */
+#endif /* __need_struct_ucontext */
+
+#ifdef __need_struct_ucontext64
+#ifndef __need_struct_mcontext64
+#define __need_struct_mcontext64
+#endif /* __need_struct_mcontext64 */
+#endif /* __need_struct_ucontext64 */
+
+#if defined(__need_struct_mcontext) || defined(__need_struct_mcontext64)
+#include <machine/_structs.h>
+#endif /* __need_struct_mcontext || __need_struct_mcontext64 */
+
+#if defined(__need_stack_t) || defined(__need_struct_ucontext) || defined(__need_struct_ucontext64)
+#ifndef __need_struct_sigaltstack
+#define __need_struct_sigaltstack
+#endif /* __need_struct_sigaltstack */
+#endif /* __need_stack_t || __need_struct_ucontext || __need_struct_ucontext64 */
+
+#ifdef __need_struct_sigaltstack
+#undef __need_struct_sigaltstack
+/* Structure used in sigaltstack call. */
+#ifndef _STRUCT_SIGALTSTACK
+#if __DARWIN_UNIX03
+#define _STRUCT_SIGALTSTACK	struct __darwin_sigaltstack
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_SIGALTSTACK	struct sigaltstack
+#endif /* __DARWIN_UNIX03 */
+_STRUCT_SIGALTSTACK
+{
+	void		*ss_sp;		/* signal stack base */
+	__darwin_size_t ss_size;	/* signal stack length */
+	int		ss_flags;	/* SA_DISABLE and/or SA_ONSTACK */
+};
+#endif /* _STRUCT_SIGALTSTACK */
+#endif /* __need_struct_sigaltstack */
+
+#ifdef __need_struct_timespec
+#undef __need_struct_timespec
+#ifndef _STRUCT_TIMESPEC
+#define _STRUCT_TIMESPEC	struct timespec
+_STRUCT_TIMESPEC
+{
+	__darwin_time_t	tv_sec;
+	long		tv_nsec;
+};
+#endif /* _STRUCT_TIMESPEC */
+#endif /* __need_struct_timespec */
+
+#ifdef __need_struct_timeval
+#undef __need_struct_timeval
+#ifndef _STRUCT_TIMEVAL
+#define _STRUCT_TIMEVAL		struct timeval
+_STRUCT_TIMEVAL
+{
+	__darwin_time_t		tv_sec;		/* seconds */
+	__darwin_suseconds_t	tv_usec;	/* and microseconds */
+};
+#endif /* _STRUCT_TIMEVAL */
+#endif /* __need_struct_timeval */
+
+#ifdef __need_struct_timeval32
+#undef __need_struct_timeval32
+#ifndef _STRUCT_TIMEVAL32
+#define _STRUCT_TIMEVAL32	struct timeval32
+_STRUCT_TIMEVAL32
+{
+	__int32_t		tv_sec;		/* seconds */
+	__int32_t		tv_usec;	/* and microseconds */
+};
+#endif /* _STRUCT_TIMEVAL32 */
+#endif /* __need_struct_timeval32 */
+
+#ifdef __need_struct_ucontext
+#undef __need_struct_ucontext
+#ifndef _STRUCT_UCONTEXT
+#if __DARWIN_UNIX03
+#define _STRUCT_UCONTEXT	struct __darwin_ucontext
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_UCONTEXT	struct ucontext
+#endif /* __DARWIN_UNIX03 */
+_STRUCT_UCONTEXT
+{
+	int			uc_onstack;
+	__darwin_sigset_t	uc_sigmask;	/* signal mask used by this context */
+	_STRUCT_SIGALTSTACK 	uc_stack;	/* stack used by this context */
+	_STRUCT_UCONTEXT	*uc_link;	/* pointer to resuming context */
+	__darwin_size_t		uc_mcsize;	/* size of the machine context passed in */
+	_STRUCT_MCONTEXT	*uc_mcontext;	/* pointer to machine specific context */
+#ifdef _XOPEN_SOURCE
+	_STRUCT_MCONTEXT	__mcontext_data;
+#endif /* _XOPEN_SOURCE */
+};
+#endif /* _STRUCT_UCONTEXT */
+#endif /* __need_struct_ucontext */
+
+#ifdef __need_struct_ucontext64
+#undef __need_struct_ucontext64
+#ifndef _STRUCT_UCONTEXT64
+#if __DARWIN_UNIX03
+#define _STRUCT_UCONTEXT64	struct __darwin_ucontext64
+#else /* !__DARWIN_UNIX03 */
+#define _STRUCT_UCONTEXT64	struct ucontext64
+#endif /* __DARWIN_UNIX03 */
+_STRUCT_UCONTEXT64
+{
+	int			uc_onstack;
+	__darwin_sigset_t	uc_sigmask;	/* signal mask used by this context */
+	_STRUCT_SIGALTSTACK 	uc_stack;	/* stack used by this context */
+	_STRUCT_UCONTEXT64	*uc_link;	/* pointer to resuming context */
+	__darwin_size_t		uc_mcsize;	/* size of the machine context passed in */
+	_STRUCT_MCONTEXT64	*uc_mcontext64;	/* pointer to machine specific context */
+};
+#endif /* _STRUCT_UCONTEXT64 */
+#endif /* __need_struct_ucontext64 */
+
+
+#ifdef __need_fd_set
+#undef __need_fd_set
+#ifndef _FD_SET
+#define _FD_SET
+/*
+ * Select uses bit masks of file descriptors in longs.  These macros
+ * manipulate such bit fields (the filesystem macros use chars).  The
+ * extra protection here is to permit application redefinition above
+ * the default size.
+ */
+#ifdef FD_SETSIZE
+#define	__DARWIN_FD_SETSIZE	FD_SETSIZE
+#else /* !FD_SETSIZE */
+#define	__DARWIN_FD_SETSIZE	1024
+#endif /* FD_SETSIZE */
+#define	__DARWIN_NBBY		8				/* bits in a byte */
+#define __DARWIN_NFDBITS	(sizeof(__int32_t) * __DARWIN_NBBY) /* bits per mask */
+#define	__DARWIN_howmany(x, y)	((((x) % (y)) == 0) ? ((x) / (y)) : (((x) / (y)) + 1)) /* # y's == x bits? */
+
+__BEGIN_DECLS
+typedef	struct fd_set {
+	__int32_t	fds_bits[__DARWIN_howmany(__DARWIN_FD_SETSIZE, __DARWIN_NFDBITS)];
+} fd_set;
+__END_DECLS
+
+/* This inline avoids argument side-effect issues with FD_ISSET() */
+static __inline int
+__darwin_fd_isset(int _n, const struct fd_set *_p)
+{
+	return (_p->fds_bits[_n/__DARWIN_NFDBITS] & (1<<(_n % __DARWIN_NFDBITS)));
+}
+
+#define	__DARWIN_FD_SET(n, p)	do { int __fd = (n); ((p)->fds_bits[__fd/__DARWIN_NFDBITS] |= (1<<(__fd % __DARWIN_NFDBITS))); } while(0)
+#define	__DARWIN_FD_CLR(n, p)	do { int __fd = (n); ((p)->fds_bits[__fd/__DARWIN_NFDBITS] &= ~(1<<(__fd % __DARWIN_NFDBITS))); } while(0)
+#define	__DARWIN_FD_ISSET(n, p)	__darwin_fd_isset((n), (p))
+
+#if __GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3
+/*
+ * Use the built-in bzero function instead of the library version so that
+ * we do not pollute the namespace or introduce prototype warnings.
+ */
+#define	__DARWIN_FD_ZERO(p)	__builtin_bzero(p, sizeof(*(p)))
+#else
+#define	__DARWIN_FD_ZERO(p)	bzero(p, sizeof(*(p)))
+#endif
+
+#define	__DARWIN_FD_COPY(f, t)	bcopy(f, t, sizeof(*(f)))
+#endif /* _FD_SET */
+#endif /* __need_fd_set */
+
+#ifdef __need_stack_t
+#undef __need_stack_t
+#ifndef _STACK_T
+#define _STACK_T
+typedef _STRUCT_SIGALTSTACK	stack_t; /* [???] signal stack */
+#endif /* _STACK_T */
+#endif /* __need_stack_t */
+
+#ifdef __need_ucontext_t
+#undef __need_ucontext_t
+/* user context */
+#ifndef _UCONTEXT_T
+#define _UCONTEXT_T
+typedef _STRUCT_UCONTEXT	ucontext_t;	/* [???] user context */
+#endif /* _UCONTEXT_T */
+#endif /* __need_ucontext_t */
+
+#ifdef __need_ucontext64_t
+#undef __need_ucontext64_t
+#ifndef _UCONTEXT64_T
+#define _UCONTEXT64_T
+typedef _STRUCT_UCONTEXT64	ucontext64_t;	/* [???] user context */
+#endif /* _UCONTEXT64_T */
+#endif /* __need_ucontext64_t */
diff --git a/i386/include/sys/_types.h b/i386/include/sys/_types.h
new file mode 100644
index 0000000..9047dc2
--- /dev/null
+++ b/i386/include/sys/_types.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2003-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _SYS__TYPES_H_
+#define _SYS__TYPES_H_
+
+#include <sys/cdefs.h>
+#include <machine/_types.h>
+
+/*
+ * Type definitions; takes common type definitions that must be used
+ * in multiple header files due to [XSI], removes them from the system
+ * space, and puts them in the implementation space.
+ */
+
+#ifdef __cplusplus
+#ifdef __GNUG__
+#define __DARWIN_NULL __null
+#else /* ! __GNUG__ */
+#ifdef __LP64__
+#define __DARWIN_NULL (0L)
+#else /* !__LP64__ */
+#define __DARWIN_NULL 0
+#endif /* __LP64__ */
+#endif /* __GNUG__ */
+#else /* ! __cplusplus */
+#define __DARWIN_NULL ((void *)0)
+#endif /* __cplusplus */
+
+typedef	__int64_t	__darwin_blkcnt_t;	/* total blocks */
+typedef	__int32_t	__darwin_blksize_t;	/* preferred block size */
+typedef __int32_t	__darwin_dev_t;		/* dev_t */
+typedef unsigned int	__darwin_fsblkcnt_t;	/* Used by statvfs and fstatvfs */
+typedef unsigned int	__darwin_fsfilcnt_t;	/* Used by statvfs and fstatvfs */
+typedef __uint32_t	__darwin_gid_t;		/* [???] process and group IDs */
+typedef __uint32_t	__darwin_id_t;		/* [XSI] pid_t, uid_t, or gid_t*/
+typedef __uint64_t	__darwin_ino64_t;	/* [???] Used for 64 bit inodes */
+#if __DARWIN_64_BIT_INO_T
+typedef __darwin_ino64_t __darwin_ino_t;	/* [???] Used for inodes */
+#else /* !__DARWIN_64_BIT_INO_T */
+typedef __uint32_t	__darwin_ino_t;		/* [???] Used for inodes */
+#endif /* __DARWIN_64_BIT_INO_T */
+typedef __darwin_natural_t __darwin_mach_port_name_t; /* Used by mach */
+typedef __darwin_mach_port_name_t __darwin_mach_port_t; /* Used by mach */
+typedef __uint16_t	__darwin_mode_t;	/* [???] Some file attributes */
+typedef __int64_t	__darwin_off_t;		/* [???] Used for file sizes */
+#ifndef	_OFF_T
+#define	_OFF_T
+typedef	__darwin_off_t		off_t;
+#endif
+typedef __int32_t	__darwin_pid_t;		/* [???] process and group IDs */
+typedef __uint32_t	__darwin_sigset_t;	/* [???] signal set */
+typedef __int32_t	__darwin_suseconds_t;	/* [???] microseconds */
+typedef __uint32_t	__darwin_uid_t;		/* [???] user IDs */
+typedef __uint32_t	__darwin_useconds_t;	/* [???] microseconds */
+typedef	unsigned char	__darwin_uuid_t[16];
+typedef	char	__darwin_uuid_string_t[37];
+
+#endif	/* _SYS__TYPES_H_ */
diff --git a/i386/include/sys/appleapiopts.h b/i386/include/sys/appleapiopts.h
new file mode 100644
index 0000000..2055701
--- /dev/null
+++ b/i386/include/sys/appleapiopts.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef __SYS_APPLEAPIOPTS_H__
+#define __SYS_APPLEAPIOPTS_H__
+
+
+#ifndef __APPLE_API_STANDARD
+#define __APPLE_API_STANDARD
+#endif /* __APPLE_API_STANDARD */
+
+#ifndef __APPLE_API_STABLE
+#define __APPLE_API_STABLE
+#endif /* __APPLE_API_STABLE */
+
+#ifndef __APPLE_API_STRICT_CONFORMANCE
+
+#ifndef __APPLE_API_EVOLVING
+#define __APPLE_API_EVOLVING
+#endif /* __APPLE_API_EVOLVING */
+
+#ifndef __APPLE_API_UNSTABLE
+#define __APPLE_API_UNSTABLE
+#endif /* __APPLE_API_UNSTABLE */
+
+#ifndef __APPLE_API_PRIVATE
+#define __APPLE_API_PRIVATE
+#endif /* __APPLE_API_PRIVATE */
+
+#ifndef __APPLE_API_OBSOLETE
+#define __APPLE_API_OBSOLETE
+#endif /* __APPLE_API_OBSOLETE */
+
+#endif /* __APPLE_API_STRICT_CONFORMANCE */
+
+#endif /* __SYS_APPLEAPIOPTS_H__ */
+
diff --git a/i386/include/sys/buf.h b/i386/include/sys/buf.h
new file mode 100644
index 0000000..6f0db77
--- /dev/null
+++ b/i386/include/sys/buf.h
@@ -0,0 +1,859 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
+/*
+ * Copyright (c) 1982, 1986, 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)buf.h	8.9 (Berkeley) 3/30/95
+ */
+
+#ifndef _SYS_BUF_H_
+#define	_SYS_BUF_H_
+
+#include <sys/cdefs.h>
+#include <sys/kernel_types.h>
+#include <mach/memory_object_types.h>
+
+
+#define	B_WRITE		0x00000000	/* Write buffer (pseudo flag). */
+#define	B_READ		0x00000001	/* Read buffer. */
+#define	B_ASYNC		0x00000002	/* Start I/O, do not wait. */
+#define	B_NOCACHE	0x00000004	/* Do not cache block after use. */
+#define	B_DELWRI	0x00000008	/* Delay I/O until buffer reused. */
+#define	B_LOCKED	0x00000010	/* Locked in core (not reusable). */
+#define	B_PHYS		0x00000020	/* I/O to user memory. */
+#define B_CLUSTER	0x00000040	/* UPL based I/O generated by cluster layer */
+#define	B_PAGEIO	0x00000080	/* Page in/out */
+#define	B_META		0x00000100	/* buffer contains meta-data. */
+#define	B_RAW		0x00000200	/* Set by physio for raw transfers. */
+#define	B_FUA		0x00000400	/* Write-through disk cache(if supported) */
+#define B_PASSIVE	0x00000800	/* PASSIVE I/Os are ignored by THROTTLE I/O */
+#define	B_IOSTREAMING	0x00001000	/* sequential access pattern detected */
+#define B_THROTTLED_IO	0x00002000	/* low priority I/O */
+/*
+ * make sure to check when adding flags that
+ * that the new flags don't overlap the definitions
+ * in buf_internal.h
+ */
+
+__BEGIN_DECLS
+
+/*!
+ @function buf_markaged
+ @abstract Mark a buffer as "aged," i.e. as a good candidate to be discarded and reused after buf_brelse().
+ @param bp Buffer to mark.
+ */
+void	buf_markaged(buf_t);
+
+/*!
+ @function buf_markinvalid
+ @abstract Mark a buffer as not having valid data and being ready for immediate reuse after buf_brelse().
+ @param bp Buffer to mark.
+ */
+void	buf_markinvalid(buf_t);
+
+/*!
+ @function buf_markdelayed
+ @abstract Mark a buffer as a delayed write: mark it dirty without actually scheduling I/O.
+ @discussion Data will be flushed to disk at some later time, not with brelse(). A sync()/fsync()
+ or pressure necessitating reuse of the buffer will cause it to be written back to disk.
+ @param bp Buffer to mark.
+ */
+void	buf_markdelayed(buf_t);
+
+/*!
+ @function buf_markeintr
+ @abstract Mark a buffer as having been interrupted during I/O.
+ @discussion Waiters for I/O to complete (buf_biowait()) will return with EINTR when woken up.  
+ buf_markeintr does not itself do a wakeup.
+ @param bp Buffer to mark.
+ */
+void	buf_markeintr(buf_t);
+
+/*!
+ @function buf_markfua
+ @abstract Mark a buffer for write through disk cache, if disk supports it.
+ @param bp Buffer to mark.
+ */
+void	buf_markfua(buf_t);
+
+/*!
+ @function buf_fua
+ @abstract Check if a buffer is marked for write through disk caches.
+ @param bp Buffer to test.
+ @return Nonzero if buffer is marked for write-through, 0 if not.
+ */
+int	buf_fua(buf_t);
+
+/*!
+ @function buf_valid
+ @abstract Check if a buffer contains valid data.
+ @param bp Buffer to test.
+ @return Nonzero if buffer has valid data, 0 if not.
+ */
+int	buf_valid(buf_t);
+
+/*!
+ @function buf_fromcache
+ @abstract Check if a buffer's data was found in core.
+ @discussion Will return truth after a buf_getblk that finds a valid buffer in the cache or the relevant
+ data in core (but not in a buffer).
+ @param bp Buffer to test.
+ @return Nonzero if we got this buffer's data without doing I/O, 0 if not.
+ */
+int	buf_fromcache(buf_t);
+
+/*!
+ @function buf_upl
+ @abstract Get the upl (Universal Page List) associated with a buffer.
+ @discussion Buffers allocated with buf_alloc() are not returned with a upl, and
+ traditional buffers only have a upl while an I/O is in progress.
+ @param bp Buffer whose upl to grab.
+ @return Buffer's upl if it has one, else NULL.
+ */
+void *	buf_upl(buf_t);
+
+/*!
+ @function buf_uploffset
+ @abstract Get the offset into a UPL at which this buffer begins.
+ @discussion This function should only be called on iobufs, i.e. buffers allocated with buf_alloc().
+ @param bp Buffer whose uploffset to grab.
+ @return Buffer's uploffset--does not check whether that value makes sense for this buffer.
+ */
+uint32_t buf_uploffset(buf_t);
+
+
+
+/*!
+ @function buf_proc
+ @abstract Get the process associated with this buffer.
+ @discussion buf_proc() will generally return NULL; a process is currently only associated with
+ a buffer in the event of a physio() call.  
+ @param bp Buffer whose associated process to find.
+ @return Associated process, possibly NULL.
+ */
+proc_t	buf_proc(buf_t);
+
+/*!
+ @function buf_dirtyoff
+ @abstract Get the starting offset of the dirty region associated with a buffer.
+ @discussion The dirty offset is zero unless someone explicitly calls buf_setdirtyoff() (which the kernel does not).
+ @param bp Buffer whose dirty offset to get.
+ @return Dirty offset (0 if not explicitly changed).
+ */
+uint32_t buf_dirtyoff(buf_t);
+
+/*!
+ @function buf_dirtyend
+ @abstract Get the ending offset of the dirty region associated with a buffer.
+ @discussion If the buffer's data was found incore and dirty, the dirty end is the size of the block; otherwise, unless
+ someone outside of xnu explicitly changes it by calling buf_setdirtyend(), it will be zero.
+ @param bp Buffer whose dirty end to get.
+ @return 0 if buffer is found clean; size of buffer if found dirty.  Can be set to any value by callers of buf_setdirtyend().
+ */
+uint32_t buf_dirtyend(buf_t);
+
+/*!
+ @function buf_setdirtyoff
+ @abstract Set the starting offset of the dirty region associated with a buffer.
+ @discussion This value is zero unless someone set it explicitly.
+ @param bp Buffer whose dirty end to set.
+ @return void.
+ */
+void	buf_setdirtyoff(buf_t, uint32_t);
+
+/*!
+ @function buf_setdirtyend
+ @abstract Set the ending offset of the dirty region associated with a buffer.
+ @discussion If the buffer's data was found incore and dirty, the dirty end is the size of the block; otherwise, unless
+ someone outside of xnu explicitly changes it by calling buf_setdirtyend(), it will be zero.
+ @param bp Buffer whose dirty end to set.
+ @return void.
+ */
+void	buf_setdirtyend(buf_t, uint32_t);
+
+/*!
+ @function buf_error
+ @abstract Get the error value associated with a buffer.
+ @discussion Errors are set with buf_seterror().
+ @param bp Buffer whose error value to retrieve.
+ @return Error value, directly.
+ */
+errno_t	buf_error(buf_t);
+
+/*!
+ @function buf_seterror
+ @abstract Set an error value on a buffer.
+ @param bp Buffer whose error value to set.
+ @return void.
+ */
+void	buf_seterror(buf_t, errno_t);
+
+/*!
+ @function buf_setflags
+ @abstract Set flags on a buffer.
+ @discussion: buffer_flags |= flags
+ @param bp Buffer whose flags to set.
+ @param flags Flags to add to buffer's mask. B_LOCKED/B_NOCACHE/B_ASYNC/B_READ/B_WRITE/B_PAGEIO/B_FUA
+ @return void.
+ */
+void	buf_setflags(buf_t, int32_t);
+
+/*!
+ @function buf_clearflags
+ @abstract Clear flags on a buffer.
+ @discussion: buffer_flags &= ~flags
+ @param bp Buffer whose flags to clear.
+ @param flags Flags to remove from buffer's mask. B_LOCKED/B_NOCACHE/B_ASYNC/B_READ/B_WRITE/B_PAGEIO/B_FUA
+ @return void.
+ */
+void	buf_clearflags(buf_t, int32_t);
+
+/*!
+ @function buf_flags
+ @abstract Get flags set on a buffer.
+ @discussion Valid flags are B_LOCKED/B_NOCACHE/B_ASYNC/B_READ/B_WRITE/B_PAGEIO/B_FUA.
+ @param bp Buffer whose flags to grab.
+ @return flags.
+ */
+int32_t	buf_flags(buf_t);
+
+/*!
+ @function buf_reset
+ @abstract Reset I/O flag state on a buffer.
+ @discussion Clears current flags on a buffer (internal and external) and allows some new flags to be set.
+ Used perhaps to prepare an iobuf for reuse.
+ @param bp Buffer whose flags to grab.  
+ @param flags Flags to set on buffer: B_READ, B_WRITE, B_ASYNC, B_NOCACHE.
+ @return void.
+ */
+void	buf_reset(buf_t, int32_t);
+
+/*!
+ @function buf_map
+ @abstract Get virtual mappings for buffer data.
+ @discussion For buffers created through buf_getblk() (i.e. traditional buffer cache usage), 
+ buf_map() just returns the address at which data was mapped by but_getblk().  For a B_CLUSTER buffer, i.e. an iobuf
+ whose upl state is managed manually, there are two possibilities.  If the buffer was created
+ with an underlying "real" buffer through cluster_bp(), the mapping of the "real" buffer is returned.
+ Otherwise, the buffer was created with buf_alloc() and buf_setupl() was subsequently called; buf_map()
+ will call ubc_upl_map() to get a mapping for the buffer's upl and return the start of that mapping
+ plus the buffer's upl offset (set in buf_setupl()).  In the last case, buf_unmap() must later be called
+ to tear down the mapping.  NOTE: buf_map() does not set the buffer data pointer; this must be done with buf_setdataptr().
+ @param bp Buffer whose mapping to find or create.
+ @param io_addr Destination for mapping address.
+ @return 0 for success, ENOMEM if unable to map the buffer.
+ */
+errno_t	buf_map(buf_t, caddr_t *);
+
+/*!
+ @function buf_unmap
+ @abstract Release mappings for buffer data.
+ @discussion For buffers created through buf_getblk() (i.e. traditional buffer cache usage), 
+ buf_unmap() does nothing; buf_brelse() will take care of unmapping.  For a B_CLUSTER buffer, i.e. an iobuf
+ whose upl state is managed manually, there are two possibilities.  If the buffer was created
+ with an underlying "real" buffer through cluster_bp(), buf_unmap() does nothing; buf_brelse() on the
+ underlying buffer will tear down the mapping. Otherwise, the buffer was created with buf_alloc() and 
+ buf_setupl() was subsequently called; buf_map() created the mapping.  In this case, buf_unmap() will
+ unmap the buffer.
+ @param bp Buffer whose mapping to find or create.
+ @param io_addr Destination for mapping address.
+ @return 0 for success, EINVAL if unable to unmap buffer.
+ */
+errno_t	buf_unmap(buf_t);
+
+/*!
+ @function buf_setdrvdata
+ @abstract Set driver-specific data on a buffer.
+ @param bp Buffer whose driver-data to set.
+ @param drvdata Opaque driver data.
+ @return void.
+ */
+void 	buf_setdrvdata(buf_t, void *);
+
+/*!
+ @function buf_setdrvdata
+ @abstract Get driver-specific data from a buffer.
+ @param bp Buffer whose driver data to get.
+ @return Opaque driver data.
+ */
+void *	buf_drvdata(buf_t);
+
+/*!
+ @function buf_setfsprivate
+ @abstract Set filesystem-specific data on a buffer.
+ @param bp Buffer whose filesystem data to set.
+ @param fsprivate Opaque filesystem data.
+ @return void.
+ */
+void 	buf_setfsprivate(buf_t, void *);
+
+/*!
+ @function buf_fsprivate
+ @abstract Get filesystem-specific data from a buffer.
+ @param bp Buffer whose filesystem data to get.
+ @return Opaque filesystem data.
+ */
+void *	buf_fsprivate(buf_t);
+
+/*!
+ @function buf_blkno
+ @abstract Get physical block number associated with a buffer, in the sense of VNOP_BLOCKMAP.
+ @discussion When a buffer's physical block number is the same is its logical block number, then the physical
+ block number is considered uninitialized.  A physical block number of -1 indicates that there is no valid
+ physical mapping (e.g. the logical block is invalid or corresponds to a sparse region in a file).  Physical
+ block number is normally set by the cluster layer or by buf_getblk().
+ @param bp Buffer whose physical block number to get.
+ @return Block number.
+ */
+daddr64_t buf_blkno(buf_t);
+
+/*!
+ @function buf_lblkno
+ @abstract Get logical block number associated with a buffer.
+ @discussion Logical block number is set on traditionally-used buffers by an argument passed to buf_getblk(),
+ for example by buf_bread().
+ @param bp Buffer whose logical block number to get.
+ @return Block number.
+ */
+daddr64_t buf_lblkno(buf_t);
+
+/*!
+ @function buf_setblkno
+ @abstract Set physical block number associated with a buffer.
+ @discussion Physical block number is generally set by the cluster layer or by buf_getblk().
+ @param bp Buffer whose physical block number to set.
+ @param blkno Block number to set.
+ @return void.
+ */
+void	buf_setblkno(buf_t, daddr64_t);
+
+/*!
+ @function buf_setlblkno
+ @abstract Set logical block number associated with a buffer.
+ @discussion Logical block number is set on traditionally-used buffers by an argument passed to buf_getblk(),
+ for example by buf_bread().
+ @param bp Buffer whose logical block number to set.
+ @param lblkno Block number to set.
+ @return void.
+ */
+void	buf_setlblkno(buf_t, daddr64_t);
+
+/*!
+ @function buf_count
+ @abstract Get count of valid bytes in a buffer.  This may be less than the space allocated to the buffer.
+ @param bp Buffer whose byte count to get.
+ @return Byte count.
+ */
+uint32_t buf_count(buf_t);
+
+/*!
+ @function buf_size
+ @abstract Get size of data region allocated to a buffer.
+ @discussion May be larger than amount of valid data in buffer.
+ @param bp Buffer whose size to get.
+ @return Size.
+ */
+uint32_t buf_size(buf_t);
+
+/*!
+ @function buf_resid
+ @abstract Get a count of bytes which were not consumed by an I/O on a buffer.
+ @discussion Set when an I/O operations completes.
+ @param bp Buffer whose outstanding count to get.
+ @return Count of unwritten/unread bytes.
+ */
+uint32_t buf_resid(buf_t);
+
+/*!
+ @function buf_setcount
+ @abstract Set count of valid bytes in a buffer.  This may be less than the space allocated to the buffer.
+ @param bp Buffer whose byte count to set.
+ @param bcount Count to set.
+ @return void.
+ */
+void	buf_setcount(buf_t, uint32_t);
+
+/*!
+ @function buf_setsize
+ @abstract Set size of data region allocated to a buffer.
+ @discussion May be larger than amount of valid data in buffer.  Should be used by 
+ code which is manually providing storage for an iobuf, one allocated with buf_alloc().
+ @param bp Buffer whose size to set.
+ @return void.
+ */
+void	buf_setsize(buf_t, uint32_t);
+
+/*!
+ @function buf_setresid
+ @abstract Set a count of bytes outstanding for I/O in a buffer.
+ @discussion Set when an I/O operations completes.  Examples: called by IOStorageFamily when I/O
+ completes, often called on an "original" buffer when using a manipulated buffer to perform I/O 
+ on behalf of the first.
+ @param bp Buffer whose outstanding count to set.
+ @return Count of unwritten/unread bytes.
+ */
+void	buf_setresid(buf_t, uint32_t);
+
+/*!
+ @function buf_setdataptr
+ @abstract Set the address at which a buffer's data will be stored.
+ @discussion In traditional buffer use, the data pointer will be set automatically. This routine is
+ useful with iobufs (allocated with buf_alloc()).
+ @param bp Buffer whose data pointer to set.
+ @param data Pointer to data region.
+ @return void.
+ */
+void	buf_setdataptr(buf_t, uintptr_t);
+
+/*!
+ @function buf_dataptr
+ @abstract Get the address at which a buffer's data is stored; for iobufs, this must
+ be set with buf_setdataptr().  See buf_map().
+ @param bp Buffer whose data pointer to retrieve.
+ @return Data pointer; NULL if unset.
+ */
+uintptr_t buf_dataptr(buf_t);
+
+/*!
+ @function buf_vnode
+ @abstract Get the vnode associated with a buffer.
+ @discussion Every buffer is associated with a file.  Because there is an I/O in flight,
+ there is an iocount on this vnode; it is returned WITHOUT an extra iocount, and vnode_put()
+ need NOT be called.
+ @param bp Buffer whose vnode to retrieve.
+ @return Buffer's vnode.
+ */
+vnode_t	buf_vnode(buf_t);
+
+/*!
+ @function buf_setvnode
+ @abstract Set the vnode associated with a buffer.
+ @discussion This call need not be used on traditional buffers; it is for use with iobufs.
+ @param bp Buffer whose vnode to set.
+ @param vp The vnode to attach to the buffer.
+ @return void.
+ */
+void	buf_setvnode(buf_t, vnode_t);
+
+/*!
+ @function buf_setdevice
+ @abstract Set the device associated with a buffer.
+ @discussion A buffer's device is set in buf_strategy() (or in buf_getblk() if the file is a device).  
+ It is also set on an iobuf if buf_alloc() is passed a device vnode.
+ @param bp Buffer whose device ID to set.
+ @param vp Device to set on the buffer.
+ @return 0 for success, EINVAL if vp is not a device file.
+ */
+errno_t	buf_setdevice(buf_t, vnode_t);
+
+/*!
+ @function buf_strategy
+ @abstract Pass an I/O request for a buffer down to the device layer.
+ @discussion This is one of the most important routines in the buffer cache layer.  For buffers obtained
+ through buf_getblk, it handles finding physical block numbers for the I/O (with VNOP_BLKTOOFF and 
+ VNOP_BLOCKMAP), packaging the I/O into page-sized chunks, and initiating I/O on the disk by calling 
+ the device's strategy routine. If a buffer's UPL has been set manually with buf_setupl(), it assumes 
+ that the request is already correctly configured with a block number and a size divisible by page size
+ and will just call directly to the device.
+ @param devvp Device on which to perform I/O
+ @param ap vnop_strategy_args structure (most importantly, a buffer).
+ @return 0 for success, or errors from filesystem or device layers.
+ */
+errno_t	buf_strategy(vnode_t, void *);
+
+/* 
+ * Flags for buf_invalblkno() 
+ */
+#define	BUF_WAIT	0x01
+
+/*!
+ @function buf_invalblkno
+ @abstract Invalidate a filesystem logical block in a file.
+ @discussion buf_invalblkno() tries to make the data for a given block in a file
+ invalid; if the buffer for that block is found in core and is not busy, we mark it 
+ invalid and call buf_brelse() (see "flags" param for what happens if the buffer is busy).
+ buf_brelse(), noticing that it is invalid, will 
+ will return the buffer to the empty-buffer list and tell the VM subsystem to abandon 
+ the relevant pages.  Data will not be written to backing store--it will be cast aside.
+ Note that this function will only work if the block in question has been
+ obtained with a buf_getblk().  If data has been read into core without using
+ traditional buffer cache routines, buf_invalblkno() will not be able to invalidate it--this
+ includes the use of iobufs.
+ @param bp Buffer whose block to invalidate.
+ @param lblkno Logical block number.
+ @param flags BUF_WAIT: wait for busy buffers to become unbusy and invalidate them then.  Otherwise,
+ just return EBUSY for busy blocks.
+ @return 0 for success, EINVAL if vp is not a device file.
+ */
+errno_t	buf_invalblkno(vnode_t, daddr64_t, int);
+
+/*!
+ @function buf_callback
+ @abstract Get the function set to be called when I/O on a buffer completes.
+ @discussion A function returned by buf_callback was originally set with buf_setcallback().
+ @param bp Buffer whose callback to get.
+ @return 0 for success, or errors from filesystem or device layers.
+ */
+void * buf_callback(buf_t);
+
+/*!
+ @function buf_setcallback
+ @abstract Set a function to be called once when I/O on a buffer completes.
+ @discussion A one-shot callout set with buf_setcallback() will be called from buf_biodone()
+ when I/O completes. It will be passed the "transaction" argument as well as the buffer.
+ buf_setcallback() also marks the buffer as B_ASYNC.
+ @param bp Buffer whose callback to set.
+ @param callback function to use as callback.
+ @param transaction Additional argument to callback function.
+ @return 0; always succeeds.
+ */
+errno_t	buf_setcallback(buf_t, void (*)(buf_t, void *), void *);
+
+/*!
+ @function buf_setupl
+ @abstract Set the UPL (Universal Page List), and offset therein, on a buffer.
+ @discussion buf_setupl() should only be called on buffers allocated with buf_alloc().
+ A subsequent call to buf_map() will map the UPL and give back the address at which data
+ begins. After buf_setupl() is called, a buffer is marked B_CLUSTER; when this is the case,
+ buf_strategy() assumes that a buffer is correctly configured to be passed to the device
+ layer without modification. Passing a NULL upl will clear the upl and the B_CLUSTER flag on the
+ buffer.
+ @param bp Buffer whose upl to set.
+ @param upl UPL to set in the buffer.
+ @parma offset Offset within upl at which relevant data begin.
+ @return 0 for success, EINVAL if the buffer was not allocated with buf_alloc().
+ */
+errno_t	buf_setupl(buf_t, upl_t, uint32_t);
+
+/*!
+ @function buf_clone
+ @abstract Clone a buffer with a restricted range and an optional callback.
+ @discussion Generates a buffer which is identical to its "bp" argument except that
+ it spans a subset of the data of the original.  The buffer to be cloned should
+ have been allocated with buf_alloc().  Checks its arguments to make sure
+ that the data subset is coherent. Optionally, adds a callback function and argument to it
+ to be called when I/O completes (as with buf_setcallback(), but B_ASYNC is not set).  If the original buffer had
+ a upl set through buf_setupl(), this upl is copied to the new buffer; otherwise, the original's
+ data pointer is used raw. The buffer must be released with buf_free().
+ @param bp Buffer to clone.
+ @param io_offset Offset, relative to start of data in original buffer, at which new buffer's data will begin. 
+ @param io_size Size of buffer region in new buffer, in the sense of buf_count().
+ @param iodone Callback to be called from buf_biodone() when I/O completes, in the sense of buf_setcallback().
+ @param arg Argument to pass to iodone() callback.
+ @return NULL if io_offset/io_size combination is invalid for the buffer to be cloned; otherwise, the new buffer.
+ */
+buf_t	buf_clone(buf_t, int, int, void (*)(buf_t, void *), void *);
+
+/*!
+ @function buf_alloc
+ @abstract Allocate an uninitialized buffer.
+ @discussion A buffer returned by buf_alloc() is marked as busy and as an iobuf; it has no storage set up and must be
+ set up using buf_setdataptr() or buf_setupl()/buf_map().
+ @param vp vnode to associate with the buffer: optionally NULL.  If vp is a device file, then
+ the buffer's associated device will be set. If vp is NULL, it can be set later with buf_setvnode().
+ @return New buffer.
+ */
+buf_t 	buf_alloc(vnode_t);
+
+/*!
+ @function buf_free
+ @abstract Free a buffer that was allocated with buf_alloc().
+ @discussion The storage (UPL, data pointer) associated with an iobuf must be freed manually.
+ @param bp The buffer to free.
+ @return void.
+ */
+void	buf_free(buf_t);
+
+/*
+ * flags for buf_invalidateblks
+ */
+#define	BUF_WRITE_DATA	0x0001		/* write data blocks first */
+#define	BUF_SKIP_META	0x0002		/* skip over metadata blocks */
+
+/*!
+ @function buf_invalidateblks
+ @abstract Invalidate all the blocks associated with a vnode.
+ @discussion This function does for all blocks associated with a vnode what buf_invalblkno does for one block.
+ Again, it will only be able to invalidate data which were populated with traditional buffer cache routines,
+ i.e. by buf_getblk() and callers thereof. Unlike buf_invalblkno(), it can be made to write dirty data to disk
+ rather than casting it aside.
+ @param bp The buffer whose data to invalidate.
+ @param flags BUF_WRITE_DATA: write dirty data to disk with VNOP_BWRITE() before kicking buffer cache entries out.
+ BUF_SKIP_META: do not invalidate metadata blocks.
+ @param slpflag Flags to pass to "msleep" while waiting to acquire busy buffers. 
+ @param slptimeo Timeout in "hz" (1/100 second) to wait for a buffer to become unbusy before waking from sleep
+ and re-starting the scan.
+ @return 0 for success, error values from msleep().
+ */
+int	buf_invalidateblks(vnode_t, int, int, int);
+
+/*
+ * flags for buf_flushdirtyblks and buf_iterate
+ */
+#define BUF_SKIP_NONLOCKED	0x01
+#define BUF_SKIP_LOCKED		0x02
+#define BUF_SCAN_CLEAN		0x04	/* scan the clean buffers */
+#define BUF_SCAN_DIRTY		0x08	/* scan the dirty buffers */
+#define BUF_NOTIFY_BUSY		0x10	/* notify the caller about the busy pages during the scan */
+
+
+#define	BUF_RETURNED		0
+#define BUF_RETURNED_DONE	1
+#define BUF_CLAIMED		2
+#define	BUF_CLAIMED_DONE	3
+/*!
+ @function buf_flushdirtyblks
+ @abstract Write dirty file blocks to disk.
+ @param vp The vnode whose blocks to flush.
+ @param wait Wait for writes to complete before returning.
+ @param flags Can pass zero, meaning "flush all dirty buffers."  
+ BUF_SKIP_NONLOCKED: Skip buffers which are not busy when we encounter them.
+ BUF_SKIP_LOCKED: Skip buffers which are busy when we encounter them.
+ @param msg String to pass to msleep().
+ @return void.
+ */
+void	buf_flushdirtyblks(vnode_t, int, int, const char *);
+
+/*!
+ @function buf_iterate
+ @abstract Perform some operation on all buffers associated with a vnode.
+ @param vp The vnode whose buffers to scan.
+ @param callout Function to call on each buffer.  Should return one of:
+ BUF_RETURNED: buf_iterate() should call buf_brelse() on the buffer.
+ BUF_RETURNED_DONE: buf_iterate() should call buf_brelse() on the buffer and then stop iterating.
+ BUF_CLAIMED: buf_iterate() should continue iterating (and not call buf_brelse()).
+ BUF_CLAIMED_DONE: buf_iterate() should stop iterating (and not call buf_brelse()).
+ @param flag
+ BUF_SKIP_NONLOCKED: Skip buffers which are not busy when we encounter them. BUF_SKIP_LOCKED: Skip buffers which are busy when we encounter them.
+ BUF_SCAN_CLEAN: Call out on clean buffers.
+ BUF_SCAN_DIRTY: Call out on dirty buffers.
+ BUF_NOTIFY_BUSY: If a buffer cannot be acquired, pass a NULL buffer to callout; otherwise,
+ that buffer will be silently skipped.
+ @param arg Argument to pass to callout in addition to buffer.
+ @return void.
+ */
+void	buf_iterate(vnode_t, int (*)(buf_t, void *), int, void *);
+
+/*!
+ @function buf_clear
+ @abstract Zero out the storage associated with a buffer. 
+ @discussion Calls buf_map() to get the buffer's data address; for a B_CLUSTER
+ buffer (one which has had buf_setupl() called on it), it tries to map the buffer's
+ UPL into memory; should only be called once during the life cycle of an iobuf (one allocated
+ with buf_alloc()).  
+ @param bp The buffer to zero out.
+ @return void.
+ */
+void	buf_clear(buf_t);
+
+/*!
+ @function buf_bawrite
+ @abstract Start an asychronous write on a buffer.
+ @discussion Calls VNOP_BWRITE to start the process of propagating an asynchronous write down to the device layer.
+ Callers can wait for writes to complete at their discretion using buf_biowait().  When this function is called,
+ data should already have been written to the buffer's data region.
+ @param bp The buffer on which to initiate I/O.
+ @param throttle If "throttle" is nonzero and more than VNODE_ASYNC_THROTTLE writes are in progress on this file,
+ buf_bawrite() will block until the write count drops below VNODE_ASYNC_THROTTLE.  If "throttle" is zero and the write
+ count is high, it will fail with EWOULDBLOCK; the caller can decide whether to make a blocking call or pursue
+ other opportunities.
+ @return EWOULDBLOCK if write count is high and "throttle" is zero; otherwise, errors from VNOP_BWRITE.
+ */
+errno_t	buf_bawrite(buf_t);
+
+/*!
+ @function buf_bdwrite
+ @abstract Mark a buffer for delayed write.
+ @discussion Marks a buffer as waiting for delayed write and the current I/O as complete; data will be written to backing store
+ before the buffer is reused, but it will not be queued for I/O immediately.  Note that for buffers allocated
+ with buf_alloc(), there are no such guarantees; you must take care of your own flushing to disk.  If
+ the number of delayed writes pending on the system is greater than an internal limit and the caller has not
+ requested otherwise [see return_error] , buf_bdwrite() will unilaterally launch an asynchronous I/O with buf_bawrite() to keep the pile of
+ delayed writes from getting too large.
+ @param bp The buffer to mark for delayed write.
+ @param return_error If the number of pending delayed writes systemwide is larger than an internal limit,
+ return EAGAIN rather than doing an asynchronous write.
+ @return EAGAIN for return_error != 0 case, 0 for succeess, errors from buf_bawrite.
+ */
+errno_t	buf_bdwrite(buf_t);
+
+/*!
+ @function buf_bwrite
+ @abstract Write a buffer's data to backing store.
+ @discussion Once the data in a buffer has been modified, buf_bwrite() starts sending it to disk by calling
+ VNOP_STRATEGY.  Unless B_ASYNC has been set on the buffer (by buf_setflags() or otherwise), data will have 
+ been written to disk when buf_bwrite() returns.  See Bach (p 56).
+ @param bp The buffer to write to disk.
+ @return 0 for success; errors from buf_biowait().
+ */
+errno_t	buf_bwrite(buf_t);
+
+/*!
+ @function buf_biodone
+ @abstract Mark an I/O as completed.
+ @discussion buf_biodone() should be called by whosoever decides that an I/O on a buffer is complete; for example,
+ IOStorageFamily.  It clears the dirty flag on a buffer and signals on the vnode that a write has completed
+ with vnode_writedone(). If a callout or filter has been set on the buffer, that function is called.  In the case
+ of a callout, that function is expected to take care of cleaning up and freeing the buffer.
+ Otherwise, if the buffer is marked B_ASYNC (e.g. it was passed to buf_bawrite()), then buf_biodone()
+ considers itself justified in calling buf_brelse() to return it to free lists--no one is waiting for it.  Finally, 
+ waiters on the bp (e.g. in buf_biowait()) are woken up.
+ @param bp The buffer to mark as done with I/O.
+ @return void.
+ */
+void	buf_biodone(buf_t);
+
+/*!
+ @function buf_biowait
+ @abstract Wait for I/O on a buffer to complete.
+ @discussion Waits for I/O on a buffer to finish, as marked by a buf_biodone() call.  
+ @param bp The buffer to wait on.
+ @return 0 for a successful wait; nonzero the buffer has been marked as EINTR or had an error set on it.
+ */
+errno_t	buf_biowait(buf_t);
+
+/*!
+ @function buf_brelse
+ @abstract Release any claim to a buffer, sending it back to free lists.
+ @discussion buf_brelse() cleans up buffer state and releases a buffer to the free lists.  If the buffer
+ is not marked invalid and its pages are dirty (e.g. a delayed write was made), its data will be commited
+ to backing store. If it is marked invalid, its data will be discarded completely.  
+ A valid, cacheable buffer will be put on a list and kept in the buffer hash so it
+ can be found again; otherwise, it will be dissociated from its vnode and treated as empty.  Which list a valid
+ buffer is placed on depends on the use of buf_markaged(), whether it is metadata, and the B_LOCKED flag.  A
+ B_LOCKED buffer will not be available for reuse by other files, though its data may be paged out.
+ Note that buf_brelse() is intended for use with traditionally allocated buffers.
+ @param bp The buffer to release.
+ @retrn void.
+ */
+void	buf_brelse(buf_t);
+
+/*!
+ @function minphys
+ @abstract Adjust a buffer's count to be no more than maximum physical I/O transfer size for the host architecture.
+ @discussion physio() takes as a parameter a function to bound transfer sizes for each VNOP_STRATEGY() call.  minphys()
+ is a default implementation.  It calls buf_setcount() to make the buffer's count the min() of its current count
+ and the max I/O size for the host architecture.
+ @param bp The buffer whose byte count to modify.
+ @return New byte count.
+ */
+u_int	minphys(buf_t bp);
+
+/*
+ * Flags for operation type in getblk()
+ */
+#define	BLK_READ	0x01	/* buffer for read */
+#define	BLK_WRITE	0x02	/* buffer for write */
+#define	BLK_META	0x10	/* buffer for metadata */
+/*
+ * modifier for above flags...  if set, getblk will only return
+ * a bp that is already valid... i.e. found in the cache
+ */
+#define BLK_ONLYVALID	0x80000000
+                                  
+/*!
+ @function buf_getblk
+ @abstract Traditional buffer cache routine to get a buffer corresponding to a logical block in a file.
+ @discussion buf_getblk() gets a buffer, not necessarily containing valid data, representing a block in a file.  
+ A metadata buffer will be returned with its own zone-allocated storage, managed by the traditional buffer-cache
+ layer, whereas data buffers will be returned hooked into backing by the UBC (which in fact controls the caching of data).
+ buf_getblk() first looks for the buffer header in cache; if the buffer is in-core but busy, buf_getblk() will wait for it to become
+ unbusy, depending on the slpflag and slptimeo parameters. If the buffer is found unbusy and is a metadata buffer,
+ it must already contain valid data and will be returned directly; data buffers will have a UPL configured to
+ prepare for interaction with the underlying UBC.  If the buffer is found in core, it will be marked as such
+ and buf_fromcache() will return truth. A buffer is allocated and initialized (but not filled with data)
+ if none is found in core. buf_bread(), buf_breadn(), buf_meta_bread(), and buf_meta_breadn() all 
+ return buffers obtained with buf_getblk().
+ @param vp File for which to get block.
+ @param blkno Logical block number.
+ @param size Size of block.
+ @param slpflag Flag to pass to msleep() while waiting for buffer to become unbusy.
+ @param slptimeo Time, in milliseconds, to wait for buffer to become unbusy.  0 means to wait indefinitely.
+ @param operation BLK_READ: want a read buffer.  BLK_WRITE: want a write buffer.  BLK_META: want a metadata buffer.  BLK_ONLYVALID: 
+ only return buffers which are found in core (do not allocate anew), and do not change buffer size.  The last remark means
+ that if a given logical block is found in core with a different size than what is requested, the buffer size will not be modified.
+ @return Buffer found in core or newly allocated, either containing valid data or ready for I/O.
+ */
+buf_t	buf_getblk(vnode_t, daddr64_t, int, int, int, int);
+
+/*!
+ @function buf_geteblk
+ @abstract Get a metadata buffer which is marked invalid and not associated with any vnode.
+ @discussion A buffer is returned with zone-allocated storage of the specified size, marked B_META and invalid. 
+ It has no vnode and is not visible in the buffer hash.  
+ @param size Size of buffer.
+ @return Always returns a new buffer.
+ */
+buf_t	buf_geteblk(int);
+
+
+__END_DECLS
+
+
+/* Macros to clear/set/test flags. */
+#define	SET(t, f)	(t) |= (f)
+#define	CLR(t, f)	(t) &= ~(f)
+#define	ISSET(t, f)	((t) & (f))
+
+
+#endif /* !_SYS_BUF_H_ */
diff --git a/i386/include/sys/cdefs.h b/i386/include/sys/cdefs.h
new file mode 100644
index 0000000..3240187
--- /dev/null
+++ b/i386/include/sys/cdefs.h
@@ -0,0 +1,583 @@
+/*
+ * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright 1995 NeXT Computer, Inc. All rights reserved. */
+/*
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Berkeley Software Design, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
+ */
+
+#ifndef	_CDEFS_H_
+#define	_CDEFS_H_
+
+#if defined(__cplusplus)
+#define	__BEGIN_DECLS	extern "C" {
+#define	__END_DECLS	}
+#else
+#define	__BEGIN_DECLS
+#define	__END_DECLS
+#endif
+
+/*
+ * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
+ * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
+ * The __CONCAT macro is a bit tricky -- make sure you don't put spaces
+ * in between its arguments.  __CONCAT can also concatenate double-quoted
+ * strings produced by the __STRING macro, but this only works with ANSI C.
+ */
+#if defined(__STDC__) || defined(__cplusplus)
+#define	__P(protos)	protos		/* full-blown ANSI C */
+#define	__CONCAT(x,y)	x ## y
+#define	__STRING(x)	#x
+
+#define	__const		const		/* define reserved names to standard */
+#define	__signed	signed
+#define	__volatile	volatile
+#if defined(__cplusplus)
+#define	__inline	inline		/* convert to C++ keyword */
+#else
+#ifndef __GNUC__
+#define	__inline			/* delete GCC keyword */
+#endif /* !__GNUC__ */
+#endif /* !__cplusplus */
+
+#else	/* !(__STDC__ || __cplusplus) */
+#define	__P(protos)	()		/* traditional C preprocessor */
+#define	__CONCAT(x,y)	x/**/y
+#define	__STRING(x)	"x"
+
+#ifndef __GNUC__
+#define	__const				/* delete pseudo-ANSI C keywords */
+#define	__inline
+#define	__signed
+#define	__volatile
+#endif	/* !__GNUC__ */
+
+/*
+ * In non-ANSI C environments, new programs will want ANSI-only C keywords
+ * deleted from the program and old programs will want them left alone.
+ * When using a compiler other than gcc, programs using the ANSI C keywords
+ * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS.
+ * When using "gcc -traditional", we assume that this is the intent; if
+ * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone.
+ */
+#ifndef	NO_ANSI_KEYWORDS
+#define	const		__const			/* convert ANSI C keywords */
+#define	inline		__inline
+#define	signed		__signed
+#define	volatile	__volatile
+#endif /* !NO_ANSI_KEYWORDS */
+#endif /* !(__STDC__ || __cplusplus) */
+
+/*
+ * GCC1 and some versions of GCC2 declare dead (non-returning) and
+ * pure (no side effects) functions using "volatile" and "const";
+ * unfortunately, these then cause warnings under "-ansi -pedantic".
+ * GCC2 uses a new, peculiar __attribute__((attrs)) style.  All of
+ * these work for GNU C++ (modulo a slight glitch in the C++ grammar
+ * in the distribution version of 2.5.5).
+ */
+#if defined(__MWERKS__) && (__MWERKS__ > 0x2400)
+	/* newer Metrowerks compilers support __attribute__() */
+#elif __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 5
+#define	__dead2		__attribute__((__noreturn__))
+#define	__pure2		__attribute__((__const__))
+#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7
+#define	__unused	/* no attribute */
+#else
+#define	__unused	__attribute__((__unused__))
+#endif
+#else
+#define	__attribute__(x)	/* delete __attribute__ if non-gcc or gcc1 */
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+/* __dead and __pure are depreciated.  Use __dead2 and __pure2 instead */
+#define	__dead		__volatile
+#define	__pure		__const
+#endif
+#endif
+
+/* Delete pseudo-keywords wherever they are not available or needed. */
+#ifndef __dead
+#define	__dead
+#define	__pure
+#endif
+#ifndef __dead2
+#define	__dead2
+#define	__pure2
+#define	__unused
+#endif
+
+/*
+ * GCC 2.95 provides `__restrict' as an extension to C90 to support the
+ * C99-specific `restrict' type qualifier.  We happen to use `__restrict' as
+ * a way to define the `restrict' type qualifier without disturbing older
+ * software that is unaware of C99 keywords.
+ */
+#if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95)
+#if __STDC_VERSION__ < 199901
+#define __restrict
+#else
+#define __restrict	restrict
+#endif
+#endif
+
+/*
+ * Compiler-dependent macros to declare that functions take printf-like
+ * or scanf-like arguments.  They are null except for versions of gcc
+ * that are known to support the features properly.  Functions declared
+ * with these attributes will cause compilation warnings if there is a
+ * mismatch between the format string and subsequent function parameter
+ * types.
+ */
+#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7
+#define __printflike(fmtarg, firstvararg) \
+		__attribute__((__format__ (__printf__, fmtarg, firstvararg)))
+#define __scanflike(fmtarg, firstvararg) \
+		__attribute__((__format__ (__scanf__, fmtarg, firstvararg)))
+#else
+#define __printflike(fmtarg, firstvararg)
+#define __scanflike(fmtarg, firstvararg)
+#endif
+
+#define __IDSTRING(name,string) static const char name[] __unused = string
+
+#ifndef __COPYRIGHT
+#define __COPYRIGHT(s) __IDSTRING(copyright,s)
+#endif
+
+#ifndef __RCSID
+#define __RCSID(s) __IDSTRING(rcsid,s)
+#endif
+
+#ifndef __SCCSID
+#define __SCCSID(s) __IDSTRING(sccsid,s)
+#endif
+
+#ifndef __PROJECT_VERSION
+#define __PROJECT_VERSION(s) __IDSTRING(project_version,s)
+#endif
+
+/*
+ * COMPILATION ENVIRONMENTS
+ *
+ * DEFAULT	By default newly complied code will get POSIX APIs plus
+ *		Apple API extensions in scope.
+ *
+ *		Most users will use this compilation environment to avoid
+ *		behavioral differences between 32 and 64 bit code.
+ *
+ * LEGACY	Defining _NONSTD_SOURCE will get pre-POSIX APIs plus Apple
+ *		API extensions in scope.
+ *
+ *		This is generally equivalent to the Tiger release compilation
+ *		environment, except that it cannot be applied to 64 bit code;
+ *		its use is discouraged.
+ *
+ *		We expect this environment to be deprecated in the future.
+ *
+ * STRICT	Defining _POSIX_C_SOURCE or _XOPEN_SOURCE restricts the
+ *		available APIs to exactly the set of APIs defined by the
+ *		corresponding standard, based on the value defined.
+ *
+ *		A correct, portable definition for _POSIX_C_SOURCE is 200112L.
+ *		A correct, portable definition for _XOPEN_SOURCE is 600L.
+ *
+ *		Apple API extensions are not visible in this environment,
+ *		which can cause Apple specific code to fail to compile,
+ *		or behave incorrectly if prototypes are not in scope or
+ *		warnings about missing prototypes are not enabled or ignored.
+ *
+ * In any compilation environment, for correct symbol resolution to occur,
+ * function prototypes must be in scope.  It is recommended that all Apple
+ * tools users add either the "-Wall" or "-Wimplicit-function-declaration"
+ * compiler flags to their projects to be warned when a function is being
+ * used without a prototype in scope.
+ */
+
+/* These settings are particular to each product. */
+/* Product: MacOSX */
+#define __DARWIN_ONLY_64_BIT_INO_T	0
+/* #undef __DARWIN_ONLY_UNIX_CONFORMANCE (automatically set for 64-bit) */
+#define __DARWIN_ONLY_VERS_1050		0
+
+/*
+ * The __DARWIN_ALIAS macros are used to do symbol renaming; they allow
+ * legacy code to use the old symbol, thus maintaining binary compatibility
+ * while new code can use a standards compliant version of the same function.
+ *
+ * __DARWIN_ALIAS is used by itself if the function signature has not
+ * changed, it is used along with a #ifdef check for __DARWIN_UNIX03
+ * if the signature has changed.  Because the __LP64__ environment
+ * only supports UNIX03 semantics it causes __DARWIN_UNIX03 to be
+ * defined, but causes __DARWIN_ALIAS to do no symbol mangling.
+ *
+ * As a special case, when XCode is used to target a specific version of the
+ * OS, the manifest constant __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+ * will be defined by the compiler, with the digits representing major version
+ * time 100 + minor version times 10 (e.g. 10.5 := 1050).  If we are targeting
+ * pre-10.5, and it is the default compilation environment, revert the
+ * compilation environment to pre-__DARWIN_UNIX03.
+ */
+#if !defined(__DARWIN_ONLY_UNIX_CONFORMANCE)
+#  if defined(__LP64__)
+#    define __DARWIN_ONLY_UNIX_CONFORMANCE 1
+#  else /* !__LP64__ */
+#    define __DARWIN_ONLY_UNIX_CONFORMANCE 0
+#  endif /* __LP64__ */
+#endif /* !__DARWIN_ONLY_UNIX_CONFORMANCE */
+
+#if !defined(__DARWIN_UNIX03)
+#  if   __DARWIN_ONLY_UNIX_CONFORMANCE
+#    if defined(_NONSTD_SOURCE)
+#      error "Can't define _NONSTD_SOURCE when only UNIX conformance is available."
+#    endif /* _NONSTD_SOURCE */
+#    define __DARWIN_UNIX03	1
+#  elif defined(_DARWIN_C_SOURCE) || defined(_XOPEN_SOURCE) || defined(_POSIX_C_SOURCE)
+#    if defined(_NONSTD_SOURCE)
+#      error "Can't define both _NONSTD_SOURCE and any of _DARWIN_C_SOURCE, _XOPEN_SOURCE or _POSIX_C_SOURCE."
+#    endif /* _NONSTD_SOURCE */
+#    define __DARWIN_UNIX03	1
+#  elif defined(_NONSTD_SOURCE)
+#    define __DARWIN_UNIX03	0
+#  else /* default */
+#    if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1050)
+#      define __DARWIN_UNIX03	0
+#    else /* __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 */
+#      define __DARWIN_UNIX03	1
+#    endif /* __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 */
+#  endif /* _DARWIN_C_SOURCE || _XOPEN_SOURCE || _POSIX_C_SOURCE || __LP64__ */
+#endif /* !__DARWIN_UNIX03 */
+
+#if !defined(__DARWIN_64_BIT_INO_T)
+#  if   defined(_DARWIN_USE_64_BIT_INODE)
+#    if defined(_DARWIN_NO_64_BIT_INODE)
+#      error "Can't define both _DARWIN_USE_64_BIT_INODE and _DARWIN_NO_64_BIT_INODE."
+#    endif /* _DARWIN_NO_64_BIT_INODE */
+#    define __DARWIN_64_BIT_INO_T 1
+#  elif defined(_DARWIN_NO_64_BIT_INODE)
+#    if __DARWIN_ONLY_64_BIT_INO_T
+#      error "Can't define _DARWIN_NO_64_BIT_INODE when only 64-bit inodes are available."
+#    endif /* __DARWIN_ONLY_64_BIT_INO_T */
+#    define __DARWIN_64_BIT_INO_T 0
+#  else /* default */
+#    if __DARWIN_ONLY_64_BIT_INO_T
+#      define __DARWIN_64_BIT_INO_T 1
+#    elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1060) || __DARWIN_UNIX03 == 0
+#      define __DARWIN_64_BIT_INO_T 0
+#    else /* default */
+#      define __DARWIN_64_BIT_INO_T 1
+#    endif /* __DARWIN_ONLY_64_BIT_INO_T */
+#  endif
+#endif /* !__DARWIN_64_BIT_INO_T */
+
+#if !defined(__DARWIN_VERS_1050)
+#  if   __DARWIN_ONLY_VERS_1050
+#    define __DARWIN_VERS_1050 1
+#  elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1050) || __DARWIN_UNIX03 == 0
+#    define __DARWIN_VERS_1050 0
+#  else /* default */
+#    define __DARWIN_VERS_1050 1
+#  endif
+#endif /* !__DARWIN_VERS_1050 */
+
+#if !defined(__DARWIN_NON_CANCELABLE)
+#    define __DARWIN_NON_CANCELABLE 0
+#endif /* !__DARWIN_NON_CANCELABLE */
+
+/*
+ * symbol suffixes used for symbol versioning
+ */
+#if __DARWIN_UNIX03
+#  if __DARWIN_ONLY_UNIX_CONFORMANCE
+#    define __DARWIN_SUF_UNIX03		/* nothing */
+#  else /* !__DARWIN_ONLY_UNIX_CONFORMANCE */
+#    define __DARWIN_SUF_UNIX03		"$UNIX2003"
+#  endif /* __DARWIN_ONLY_UNIX_CONFORMANCE */
+
+#  if __DARWIN_64_BIT_INO_T
+#    if __DARWIN_ONLY_64_BIT_INO_T
+#      define __DARWIN_SUF_64_BIT_INO_T	/* nothing */
+#    else /* !__DARWIN_ONLY_64_BIT_INO_T */
+#      define __DARWIN_SUF_64_BIT_INO_T	"$INODE64"
+#    endif /* __DARWIN_ONLY_64_BIT_INO_T */
+#  else /* !__DARWIN_64_BIT_INO_T */
+#    define __DARWIN_SUF_64_BIT_INO_T	/* nothing */
+#  endif /* __DARWIN_64_BIT_INO_T */
+
+#  if __DARWIN_VERS_1050
+#    if __DARWIN_ONLY_VERS_1050
+#      define __DARWIN_SUF_1050		/* nothing */
+#    else /* !__DARWIN_ONLY_VERS_1050 */
+#      define __DARWIN_SUF_1050		"$1050"
+#    endif /* __DARWIN_ONLY_VERS_1050 */
+#  else /* !__DARWIN_VERS_1050 */
+#    define __DARWIN_SUF_1050		/* nothing */
+#  endif /* __DARWIN_VERS_1050 */
+
+#  if __DARWIN_NON_CANCELABLE
+#    define __DARWIN_SUF_NON_CANCELABLE	"$NOCANCEL"
+#  else /* !__DARWIN_NON_CANCELABLE */
+#    define __DARWIN_SUF_NON_CANCELABLE	/* nothing */
+#  endif /* __DARWIN_NON_CANCELABLE */
+
+#else /* !__DARWIN_UNIX03 */
+#  define __DARWIN_SUF_UNIX03		/* nothing */
+#  define __DARWIN_SUF_64_BIT_INO_T	/* nothing */
+#  define __DARWIN_SUF_NON_CANCELABLE	/* nothing */
+#  define __DARWIN_SUF_1050		/* nothing */
+#endif /* __DARWIN_UNIX03 */
+
+#define __DARWIN_SUF_EXTSN		"$DARWIN_EXTSN"
+
+/*
+ * symbol versioning macros
+ */
+#define __DARWIN_ALIAS(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_UNIX03)
+#define __DARWIN_ALIAS_C(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_NON_CANCELABLE __DARWIN_SUF_UNIX03)
+#define __DARWIN_ALIAS_I(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_64_BIT_INO_T __DARWIN_SUF_UNIX03)
+#define __DARWIN_INODE64(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_64_BIT_INO_T)
+
+#define __DARWIN_1050(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_1050)
+#define __DARWIN_1050ALIAS(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_1050 __DARWIN_SUF_UNIX03)
+#define __DARWIN_1050ALIAS_C(sym)	__asm("_" __STRING(sym) __DARWIN_SUF_1050 __DARWIN_SUF_NON_CANCELABLE __DARWIN_SUF_UNIX03)
+#define __DARWIN_1050ALIAS_I(sym)	__asm("_" __STRING(sym) __DARWIN_SUF_1050 __DARWIN_SUF_64_BIT_INO_T __DARWIN_SUF_UNIX03)
+#define __DARWIN_1050INODE64(sym)	__asm("_" __STRING(sym) __DARWIN_SUF_1050 __DARWIN_SUF_64_BIT_INO_T)
+
+#define __DARWIN_EXTSN(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_EXTSN)
+#define __DARWIN_EXTSN_C(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_EXTSN __DARWIN_SUF_NON_CANCELABLE)
+
+/*
+ * symbol release macros
+ */
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1060)
+#undef __DARWIN_10_6_AND_LATER
+#define __DARWIN_10_6_AND_LATER_ALIAS(x)	/* nothing */
+#else /* 10.6 and beyond */
+#define __DARWIN_10_6_AND_LATER
+#define __DARWIN_10_6_AND_LATER_ALIAS(x)	x
+#endif
+
+
+/*
+ * POSIX.1 requires that the macros we test be defined before any standard
+ * header file is included.  This permits us to convert values for feature
+ * testing, as necessary, using only _POSIX_C_SOURCE.
+ *
+ * Here's a quick run-down of the versions:
+ *  defined(_POSIX_SOURCE)		1003.1-1988
+ *  _POSIX_C_SOURCE == 1L		1003.1-1990
+ *  _POSIX_C_SOURCE == 2L		1003.2-1992 C Language Binding Option
+ *  _POSIX_C_SOURCE == 199309L		1003.1b-1993
+ *  _POSIX_C_SOURCE == 199506L		1003.1c-1995, 1003.1i-1995,
+ *					and the omnibus ISO/IEC 9945-1: 1996
+ *  _POSIX_C_SOURCE == 200112L		1003.1-2001
+ *
+ * In addition, the X/Open Portability Guide, which is now the Single UNIX
+ * Specification, defines a feature-test macro which indicates the version of
+ * that specification, and which subsumes _POSIX_C_SOURCE.
+ */
+
+/* Deal with IEEE Std. 1003.1-1990, in which _POSIX_C_SOURCE == 1L. */
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1L
+#undef _POSIX_C_SOURCE
+#define	_POSIX_C_SOURCE		199009L
+#endif
+
+/* Deal with IEEE Std. 1003.2-1992, in which _POSIX_C_SOURCE == 2L. */
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2L
+#undef _POSIX_C_SOURCE
+#define	_POSIX_C_SOURCE		199209L
+#endif
+
+/* Deal with various X/Open Portability Guides and Single UNIX Spec. */
+#ifdef _XOPEN_SOURCE
+#if _XOPEN_SOURCE - 0L >= 600L
+#undef _POSIX_C_SOURCE
+#define	_POSIX_C_SOURCE		200112L
+#elif _XOPEN_SOURCE - 0L >= 500L
+#undef _POSIX_C_SOURCE
+#define	_POSIX_C_SOURCE		199506L
+#endif
+#endif
+
+/*
+ * Deal with all versions of POSIX.  The ordering relative to the tests above is
+ * important.
+ */
+#if defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE)
+#define _POSIX_C_SOURCE         198808L
+#endif
+
+/*
+ * long long is not supported in c89 (__STRICT_ANSI__), but g++ -ansi and
+ * c99 still want long longs.  While not perfect, we allow long longs for
+ * g++.
+ */
+#define	__DARWIN_NO_LONG_LONG	(defined(__STRICT_ANSI__) \
+				&& (__STDC_VERSION__-0 < 199901L) \
+				&& !defined(__GNUG__))
+
+/*
+ * Long double compatibility macro allow selecting variant symbols based
+ * on the old (compatible) 64-bit long doubles, or the new 128-bit
+ * long doubles.  This applies only to ppc; i386 already has long double
+ * support, while ppc64 doesn't have any backwards history.
+ */
+#if defined(__arm__)
+#  define	__DARWIN_LDBL_COMPAT(x)	/* nothing */
+#  define	__DARWIN_LDBL_COMPAT2(x) /* nothing */
+#  define	__DARWIN_LONG_DOUBLE_IS_DOUBLE	1
+#elif defined(__ppc__)
+#  if defined(__LDBL_MANT_DIG__) && defined(__DBL_MANT_DIG__) && \
+	__LDBL_MANT_DIG__ > __DBL_MANT_DIG__
+#    if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 < 1040
+#      define	__DARWIN_LDBL_COMPAT(x)	__asm("_" __STRING(x) "$LDBLStub")
+#    else
+#      define	__DARWIN_LDBL_COMPAT(x)	__asm("_" __STRING(x) "$LDBL128")
+#    endif
+#    define	__DARWIN_LDBL_COMPAT2(x) __asm("_" __STRING(x) "$LDBL128")
+#    define	__DARWIN_LONG_DOUBLE_IS_DOUBLE	0
+#  else
+#   define	__DARWIN_LDBL_COMPAT(x) /* nothing */
+#   define	__DARWIN_LDBL_COMPAT2(x) /* nothing */
+#   define	__DARWIN_LONG_DOUBLE_IS_DOUBLE	1
+#  endif
+#elif defined(__i386__) || defined(__ppc64__) || defined(__x86_64__)
+#  define	__DARWIN_LDBL_COMPAT(x)	/* nothing */
+#  define	__DARWIN_LDBL_COMPAT2(x) /* nothing */
+#  define	__DARWIN_LONG_DOUBLE_IS_DOUBLE	0
+#else
+#  error Unknown architecture
+#endif
+
+/*
+ * Deprecation macro
+ */
+#if __GNUC__ >= 3
+#define __deprecated __attribute__((deprecated))
+#else
+#define __deprecated /* nothing */
+#endif
+
+/*****************************************
+ *  Public darwin-specific feature macros
+ *****************************************/
+
+/*
+ * _DARWIN_FEATURE_64_BIT_INODE indicates that the ino_t type is 64-bit, and
+ * structures modified for 64-bit inodes (like struct stat) will be used.
+ */
+#if __DARWIN_64_BIT_INO_T
+#define _DARWIN_FEATURE_64_BIT_INODE		1
+#endif
+
+/*
+ * _DARWIN_FEATURE_LONG_DOUBLE_IS_DOUBLE indicates when the long double type
+ * is the same as the double type (ppc and arm only)
+ */
+#if __DARWIN_LONG_DOUBLE_IS_DOUBLE
+#define _DARWIN_FEATURE_LONG_DOUBLE_IS_DOUBLE	1
+#endif
+
+/*
+ * _DARWIN_FEATURE_64_ONLY_BIT_INODE indicates that the ino_t type may only
+ * be 64-bit; there is no support for 32-bit ino_t when this macro is defined
+ * (and non-zero).  There is no struct stat64 either, as the regular
+ * struct stat will already be the 64-bit version.
+ */
+#if __DARWIN_ONLY_64_BIT_INO_T
+#define _DARWIN_FEATURE_ONLY_64_BIT_INODE	1
+#endif
+
+/*
+ * _DARWIN_FEATURE_ONLY_VERS_1050 indicates that only those APIs updated
+ * in 10.5 exists; no pre-10.5 variants are available.
+ */
+#if __DARWIN_ONLY_VERS_1050
+#define _DARWIN_FEATURE_ONLY_VERS_1050		1
+#endif
+
+/*
+ * _DARWIN_FEATURE_ONLY_UNIX_CONFORMANCE indicates only UNIX conforming API
+ * are available (the legacy BSD APIs are not available)
+ */
+#if __DARWIN_ONLY_UNIX_CONFORMANCE
+#define _DARWIN_FEATURE_ONLY_UNIX_CONFORMANCE	1
+#endif
+
+/*
+ * _DARWIN_FEATURE_UNIX_CONFORMANCE indicates whether UNIX conformance is on,
+ * and specifies the conformance level (3 is SUSv3)
+ */
+#if __DARWIN_UNIX03
+#define _DARWIN_FEATURE_UNIX_CONFORMANCE	3
+#endif
+
+/* 
+ * This macro casts away the qualifier from the variable
+ *
+ * Note: use at your own risk, removing qualifiers can result in
+ * catastrophic run-time failures.
+ */
+#ifndef __CAST_AWAY_QUALIFIER
+#define __CAST_AWAY_QUALIFIER(variable, qualifier, type)  (type) ((char *)0 + ((qualifier char *)(variable) - (qualifier char *)0) ) 
+#endif
+
+#endif /* !_CDEFS_H_ */
diff --git a/i386/include/sys/disk.h b/i386/include/sys/disk.h
new file mode 100644
index 0000000..bd61eb6
--- /dev/null
+++ b/i386/include/sys/disk.h
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef	_SYS_DISK_H_
+#define	_SYS_DISK_H_
+
+#include <stdint.h>
+//#include <sys/ioctl.h>
+
+/*
+ * Definitions
+ *
+ * ioctl                                 description
+ * ------------------------------------- ---------------------------------------
+ * DKIOCEJECT                            eject media
+ * DKIOCSYNCHRONIZECACHE                 flush media
+ *
+ * DKIOCFORMAT                           format media
+ * DKIOCGETFORMATCAPACITIES              get media's formattable capacities
+ *
+ * DKIOCGETBLOCKSIZE                     get media's block size
+ * DKIOCGETBLOCKCOUNT                    get media's block count
+ * DKIOCGETFIRMWAREPATH                  get media's firmware path
+ *
+ * DKIOCISFORMATTED                      is media formatted?
+ * DKIOCISWRITABLE                       is media writable?
+ *
+ * DKIOCREQUESTIDLE                      idle media
+ * DKIOCDISCARD                          delete unused data
+ *
+ * DKIOCGETMAXBLOCKCOUNTREAD             get maximum block count for reads
+ * DKIOCGETMAXBLOCKCOUNTWRITE            get maximum block count for writes
+ * DKIOCGETMAXBYTECOUNTREAD              get maximum byte count for reads
+ * DKIOCGETMAXBYTECOUNTWRITE             get maximum byte count for writes
+ *
+ * DKIOCGETMAXSEGMENTCOUNTREAD           get maximum segment count for reads
+ * DKIOCGETMAXSEGMENTCOUNTWRITE          get maximum segment count for writes
+ * DKIOCGETMAXSEGMENTBYTECOUNTREAD       get maximum segment byte count for reads
+ * DKIOCGETMAXSEGMENTBYTECOUNTWRITE      get maximum segment byte count for writes
+ *
+ * DKIOCGETMINSEGMENTALIGNMENTBYTECOUNT  get minimum segment alignment in bytes
+ * DKIOCGETMAXSEGMENTADDRESSABLEBITCOUNT get maximum segment width in bits
+ *
+ * DKIOCGETPHYSICALBLOCKSIZE             get device's block size
+ * DKIOCGETCOMMANDPOOLSIZE               get device's queue depth
+ */
+
+typedef struct
+{
+    uint64_t               offset;
+    uint64_t               length;
+
+    uint8_t                reserved0128[16];       /* reserved, clear to zero */
+} dk_discard_t;
+
+typedef struct
+{
+    char                   path[128];
+} dk_firmware_path_t;
+
+typedef struct
+{
+    uint64_t               blockCount;
+    uint32_t               blockSize;
+
+    uint8_t                reserved0096[4];        /* reserved, clear to zero */
+} dk_format_capacity_t;
+
+typedef struct
+{
+    dk_format_capacity_t * capacities;
+    uint32_t               capacitiesCount;        /* use zero to probe count */
+
+#ifdef __LP64__
+    uint8_t                reserved0096[4];        /* reserved, clear to zero */
+#else /* !__LP64__ */
+    uint8_t                reserved0064[8];        /* reserved, clear to zero */
+#endif /* !__LP64__ */
+} dk_format_capacities_t;
+
+#define DKIOCEJECT                            _IO('d', 21)
+#define DKIOCSYNCHRONIZECACHE                 _IO('d', 22)
+
+#define DKIOCFORMAT                           _IOW('d', 26, dk_format_capacity_t)
+#define DKIOCGETFORMATCAPACITIES              _IOWR('d', 26, dk_format_capacities_t)
+
+#define DKIOCGETBLOCKSIZE                     _IOR('d', 24, uint32_t)
+#define DKIOCGETBLOCKCOUNT                    _IOR('d', 25, uint64_t)
+#define DKIOCGETFIRMWAREPATH                  _IOR('d', 28, dk_firmware_path_t)
+
+#define DKIOCISFORMATTED                      _IOR('d', 23, uint32_t)
+#define DKIOCISWRITABLE                       _IOR('d', 29, uint32_t)
+
+#define DKIOCREQUESTIDLE                      _IO('d', 30)
+#define DKIOCDISCARD                          _IOW('d', 31, dk_discard_t)
+
+#define DKIOCGETMAXBLOCKCOUNTREAD             _IOR('d', 64, uint64_t)
+#define DKIOCGETMAXBLOCKCOUNTWRITE            _IOR('d', 65, uint64_t)
+#define DKIOCGETMAXBYTECOUNTREAD              _IOR('d', 70, uint64_t)
+#define DKIOCGETMAXBYTECOUNTWRITE             _IOR('d', 71, uint64_t)
+
+#define DKIOCGETMAXSEGMENTCOUNTREAD           _IOR('d', 66, uint64_t)
+#define DKIOCGETMAXSEGMENTCOUNTWRITE          _IOR('d', 67, uint64_t)
+#define DKIOCGETMAXSEGMENTBYTECOUNTREAD       _IOR('d', 68, uint64_t)
+#define DKIOCGETMAXSEGMENTBYTECOUNTWRITE      _IOR('d', 69, uint64_t)
+
+#define DKIOCGETMINSEGMENTALIGNMENTBYTECOUNT  _IOR('d', 74, uint64_t)
+#define DKIOCGETMAXSEGMENTADDRESSABLEBITCOUNT _IOR('d', 75, uint64_t)
+
+#define DKIOCGETPHYSICALBLOCKSIZE             _IOR('d', 77, uint32_t)
+#define DKIOCGETCOMMANDPOOLSIZE               _IOR('d', 78, uint32_t)
+
+
+#endif	/* _SYS_DISK_H_ */
diff --git a/i386/include/sys/kernel_types.h b/i386/include/sys/kernel_types.h
new file mode 100644
index 0000000..7d7d709
--- /dev/null
+++ b/i386/include/sys/kernel_types.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2004-2010 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
+#ifndef _KERN_SYS_KERNELTYPES_H_
+#define _KERN_SYS_KERNELTYPES_H_
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+#include <stdint.h>
+
+#ifdef BSD_BUILD
+/* Macros(?) to clear/set/test flags. */
+#define	SET(t, f)	(t) |= (f)
+#define	CLR(t, f)	(t) &= ~(f)
+#define	ISSET(t, f)	((t) & (f))
+#endif
+
+
+typedef int errno_t;
+typedef int64_t daddr64_t;
+
+#ifndef BSD_BUILD
+struct buf;
+typedef struct buf * buf_t;
+
+struct file;
+typedef struct file * file_t;
+
+#ifndef __LP64__
+struct ucred;
+typedef struct ucred * ucred_t;
+#endif
+
+struct mount;
+typedef struct mount * mount_t;
+
+struct vnode;
+typedef struct vnode * vnode_t;
+
+struct proc;
+typedef struct proc * proc_t;
+
+struct uio;
+typedef struct uio * uio_t;
+
+struct vfs_context;
+typedef struct vfs_context * vfs_context_t;
+
+struct vfstable;
+typedef struct vfstable * vfstable_t;
+
+struct __ifnet;
+struct __mbuf;
+struct __pkthdr;
+struct __socket;
+struct __sockopt;
+struct __ifaddr;
+struct __ifmultiaddr;
+struct __ifnet_filter;
+struct __rtentry;
+struct __if_clone;
+
+typedef	struct __ifnet*			ifnet_t;
+typedef	struct __mbuf*			mbuf_t;
+typedef	struct __pkthdr*		pkthdr_t;
+typedef	struct __socket*		socket_t;
+typedef struct __sockopt*		sockopt_t;
+typedef struct __ifaddr*		ifaddr_t;
+typedef struct __ifmultiaddr*	ifmultiaddr_t;
+typedef struct __ifnet_filter*	interface_filter_t;
+typedef struct __rtentry*		route_t;
+typedef struct __if_clone*		if_clone_t;
+
+#else /* BSD_BUILD */
+
+typedef struct buf * buf_t;
+typedef struct file * file_t;
+#ifndef __LP64__
+typedef struct ucred * ucred_t;
+#endif
+typedef struct mount * mount_t;
+typedef struct vnode * vnode_t;
+typedef struct proc * proc_t;
+typedef struct uio * uio_t;
+typedef struct user_iovec * user_iovec_t;
+typedef struct vfs_context * vfs_context_t;
+typedef struct vfstable * vfstable_t;
+
+
+#endif /* !BSD_BUILD */
+
+#ifndef _KAUTH_GUID
+#define _KAUTH_GUID
+/* Apple-style globally unique identifier */
+typedef struct {
+#define KAUTH_GUID_SIZE	16	/* 128-bit identifier */
+	unsigned char g_guid[KAUTH_GUID_SIZE];
+} guid_t;
+#define _GUID_T
+#endif /* _KAUTH_GUID */
+
+#ifndef _KAUTH_ACE
+#define _KAUTH_ACE
+struct kauth_ace;
+typedef struct kauth_ace * kauth_ace_t;
+#endif
+#ifndef _KAUTH_ACL
+#define _KAUTH_ACL
+struct kauth_acl;
+typedef struct kauth_acl * kauth_acl_t;
+#endif
+#ifndef _KAUTH_FILESEC
+#define _KAUTH_FILESEC
+struct kauth_filesec;
+typedef struct kauth_filesec * kauth_filesec_t;
+#endif
+
+#endif /* !_KERN_SYS_KERNELTYPES_H_ */
diff --git a/i386/include/sys/param.h b/i386/include/sys/param.h
new file mode 100644
index 0000000..395fdf5
--- /dev/null
+++ b/i386/include/sys/param.h
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */
+/*-
+ * Copyright (c) 1982, 1986, 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)param.h	8.3 (Berkeley) 4/4/95
+ */
+
+#ifndef	_SYS_PARAM_H_
+#define _SYS_PARAM_H_
+
+#define	BSD	199506		/* System version (year & month). */
+#define BSD4_3	1
+#define BSD4_4	1
+
+#define NeXTBSD	1995064		/* NeXTBSD version (year, month, release) */
+#define NeXTBSD4_0 0		/* NeXTBSD 4.0 */
+
+#ifndef NULL
+#define	NULL	__DARWIN_NULL
+#endif /* ! NULL */
+
+#ifndef LOCORE
+#include <sys/types.h>
+#endif
+
+/*
+ * Machine-independent constants (some used in following include files).
+ * Redefined constants are from POSIX 1003.1 limits file.
+ *
+ * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>)
+ * MAXLOGNAME should be >= UT_NAMESIZE (see <utmp.h>)
+ */
+#include <sys/syslimits.h>
+
+#define	MAXCOMLEN	16		/* max command name remembered */
+#define	MAXINTERP	64		/* max interpreter file name length */
+#define	MAXLOGNAME	255		/* max login name length */
+#define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
+#define	NCARGS		ARG_MAX		/* max bytes for an exec function */
+#define	NGROUPS		NGROUPS_MAX	/* max number groups */
+#define	NOFILE		256		/* default max open files per process */
+#define	NOGROUP		65535		/* marker for empty group set member */
+#define MAXHOSTNAMELEN	256		/* max hostname size */
+#define MAXDOMNAMELEN	256		/* maximum domain name length */
+
+/* Machine type dependent parameters. */
+#include <i386/param.h>
+
+/* More types and definitions used throughout the kernel. */
+#include <limits.h>
+
+/*
+ * Priorities.  Note that with 32 run queues, differences less than 4 are
+ * insignificant.
+ */
+#define	PSWP	0
+#define	PVM	4
+#define	PINOD	8
+#define	PRIBIO	16
+#define	PVFS	20
+#define	PZERO	22		/* No longer magic, shouldn't be here.  XXX */
+#define	PSOCK	24
+#define	PWAIT	32
+#define	PLOCK	36
+#define	PPAUSE	40
+#define	PUSER	50
+#define	MAXPRI	127		/* Priorities range from 0 through MAXPRI. */
+
+#define	PRIMASK	0x0ff
+#define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
+#define PTTYBLOCK 0x200		/* for tty SIGTTOU and SIGTTIN blocking */
+#define PDROP	0x400		/* OR'd with pri to stop re-aquistion of mutex upon wakeup */
+#define PSPIN	0x800		/* OR'd with pri to require mutex in spin mode upon wakeup */
+
+#define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
+
+#define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
+#define	NODEV	(dev_t)(-1)	/* non-existent device */
+
+/*
+ * Clustering of hardware pages on machines with ridiculously small
+ * page sizes is done here.  The paging subsystem deals with units of
+ * CLSIZE pte's describing NBPG (from machine/param.h) pages each.
+ */
+#define	CLBYTES		(CLSIZE*NBPG)
+#define	CLOFSET		(CLSIZE*NBPG-1)	/* for clusters, like PGOFSET */
+#define	claligned(x)	((((int)(x))&CLOFSET)==0)
+#define	CLOFF		CLOFSET
+#define	CLSHIFT		(PGSHIFT+CLSIZELOG2)
+
+#if CLSIZE==1
+#define	clbase(i)	(i)
+#define	clrnd(i)	(i)
+#else
+/* Give the base virtual address (first of CLSIZE). */
+#define	clbase(i)	((i) &~ (CLSIZE-1))
+/* Round a number of clicks up to a whole cluster. */
+#define	clrnd(i)	(((i) + (CLSIZE-1)) &~ (CLSIZE-1))
+#endif
+
+#define	CBLOCK	64		/* Clist block size, must be a power of 2. */
+#define CBQSIZE	(CBLOCK/NBBY)	/* Quote bytes/cblock - can do better. */
+				/* Data chars/clist. */
+#define	CBSIZE	(CBLOCK - sizeof(struct cblock *) - CBQSIZE)
+#define	CROUND	(CBLOCK - 1)	/* Clist rounding. */
+
+/*
+ * File system parameters and macros.
+ *
+ * The file system is made out of blocks of at most MAXPHYS units, with
+ * smaller units (fragments) only in the last direct block.  MAXBSIZE
+ * primarily determines the size of buffers in the buffer pool.  It may be
+ * made larger than MAXPHYS without any effect on existing file systems;
+ * however making it smaller may make some file systems unmountable.
+ * We set this to track the value of (MAX_UPL_TRANSFER*PAGE_SIZE) from
+ * osfmk/mach/memory_object_types.h to bound it at the maximum UPL size.
+ */
+#define	MAXBSIZE	(256 * 4096)
+#define MAXPHYSIO	MAXPHYS
+#define MAXFRAG 	8
+
+#define	MAXPHYSIO_WIRED	(16 * 1024 * 1024)
+
+/*
+ * MAXPATHLEN defines the longest permissable path length after expanding
+ * symbolic links. It is used to allocate a temporary buffer from the buffer
+ * pool in which to do the name expansion, hence should be a power of two,
+ * and must be less than or equal to MAXBSIZE.  MAXSYMLINKS defines the
+ * maximum number of symbolic links that may be expanded in a path name.
+ * It should be set high enough to allow all legitimate uses, but halt
+ * infinite loops reasonably quickly.
+ */
+#define	MAXPATHLEN	PATH_MAX
+#define MAXSYMLINKS	32
+
+/* Bit map related macros. */
+#define	setbit(a,i)	(((char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY))
+#define	clrbit(a,i)	(((char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY)))
+#define	isset(a,i)	(((char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
+#define	isclr(a,i)	((((char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
+
+/* Macros for counting and rounding. */
+#ifndef howmany
+#define	howmany(x, y)	((((x) % (y)) == 0) ? ((x) / (y)) : (((x) / (y)) + 1))
+#endif
+#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))
+#define powerof2(x)	((((x)-1)&(x))==0)
+
+/* Macros for min/max. */
+#ifndef MIN
+#define	MIN(a,b) (((a)<(b))?(a):(b))
+#endif /* MIN */
+#ifndef MAX
+#define	MAX(a,b) (((a)>(b))?(a):(b))
+#endif	/* MAX */
+
+/*
+ * Constants for setting the parameters of the kernel memory allocator.
+ *
+ * 2 ** MINBUCKET is the smallest unit of memory that will be
+ * allocated. It must be at least large enough to hold a pointer.
+ *
+ * Units of memory less or equal to MAXALLOCSAVE will permanently
+ * allocate physical memory; requests for these size pieces of
+ * memory are quite fast. Allocations greater than MAXALLOCSAVE must
+ * always allocate and free physical memory; requests for these
+ * size allocations should be done infrequently as they will be slow.
+ *
+ * Constraints: CLBYTES <= MAXALLOCSAVE <= 2 ** (MINBUCKET + 14), and
+ * MAXALLOCSIZE must be a power of two.
+ */
+#define MINBUCKET	4		/* 4 => min allocation of 16 bytes */
+#define MAXALLOCSAVE	(2 * CLBYTES)
+
+/*
+ * Scale factor for scaled integers used to count %cpu time and load avgs.
+ *
+ * The number of CPU `tick's that map to a unique `%age' can be expressed
+ * by the formula (1 / (2 ^ (FSHIFT - 11))).  The maximum load average that
+ * can be calculated (assuming 32 bits) can be closely approximated using
+ * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15).
+ *
+ * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age',
+ * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024.
+ */
+#define	FSHIFT	11		/* bits to right of fixed binary point */
+#define FSCALE	(1<<FSHIFT)
+
+#endif	/* _SYS_PARAM_H_ */
diff --git a/i386/include/sys/reboot.h b/i386/include/sys/reboot.h
new file mode 100644
index 0000000..147a209
--- /dev/null
+++ b/i386/include/sys/reboot.h
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
+/*
+ * Copyright (c) 1982, 1986, 1988, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
+ */
+
+#ifndef	_SYS_REBOOT_H_
+#define _SYS_REBOOT_H_
+
+/*
+ * Arguments to reboot system call.
+ */
+
+#ifdef __APPLE_API_PRIVATE
+#define RB_AUTOBOOT	0	/* flags for system auto-booting itself */
+
+#define RB_ASKNAME	0x01	/* ask for file name to reboot from */
+#define RB_SINGLE	0x02	/* reboot to single user only */
+#define RB_NOSYNC	0x04	/* dont sync before reboot */
+#define RB_HALT		0x08	/* don't reboot, just halt */
+#define RB_INITNAME	0x10	/* name given for /etc/init */
+#define RB_DFLTROOT	0x20	/* use compiled-in rootdev */
+#define RB_ALTBOOT	0x40	/* use /boot.old vs /boot */
+#define RB_UNIPROC	0x80	/* don't start slaves */
+#define RB_SAFEBOOT	0x100	/* booting safe */
+#define RB_UPSDELAY 0x200   /* Delays restart by 5 minutes */
+#define RB_QUICK	0x400	/* quick and ungraceful reboot with file system caches flushed*/
+#define RB_PANIC	0	/* reboot due to panic */
+#define RB_BOOT		1	/* reboot due to boot() */
+
+#endif /* __APPLE_API_PRIVATE */
+
+#ifdef __APPLE_API_OBSOLETE
+/*
+ * Constants for converting boot-style device number to type,
+ * adaptor (uba, mba, etc), unit number and partition number.
+ * Type (== major device number) is in the low byte
+ * for backward compatibility.  Except for that of the "magic
+ * number", each mask applies to the shifted value.
+ * Format:
+ *	 (4) (4) (4) (4)  (8)     (8)
+ *	--------------------------------
+ *	|MA | AD| CT| UN| PART  | TYPE |
+ *	--------------------------------
+ */
+#define B_ADAPTORSHIFT	24
+#define B_ADAPTORMASK	0x0f
+#define	B_ADAPTOR(val)		(((val) >> B_ADAPTORSHIFT) & B_ADAPTORMASK)
+#define B_CONTROLLERSHIFT	20
+#define B_CONTROLLERMASK	0xf
+#define	B_CONTROLLER(val)	(((val)>>B_CONTROLLERSHIFT) & B_CONTROLLERMASK)
+#define B_UNITSHIFT	16
+#define B_UNITMASK	0xff
+#define	B_UNIT(val)		(((val) >> B_UNITSHIFT) & B_UNITMASK)
+#define B_PARTITIONSHIFT 8
+#define B_PARTITIONMASK	0xff
+#define	B_PARTITION(val)	(((val) >> B_PARTITIONSHIFT) & B_PARTITIONMASK)
+#define B_TYPESHIFT	0
+#define B_TYPEMASK	0xff
+#define	B_TYPE(val)		(((val) >> B_TYPESHIFT) & B_TYPEMASK)
+#define B_MAGICMASK	0xf0000000
+#define B_DEVMAGIC	0xa0000000
+
+#define MAKEBOOTDEV(type, adaptor, controller, unit, partition) \
+	(((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \
+	((controller) << B_CONTROLLERSHIFT) | ((unit) << B_UNITSHIFT) | \
+	((partition) << B_PARTITIONSHIFT) | B_DEVMAGIC)
+
+#endif /* __APPLE_API_OBSOLETE */
+
+
+#endif	/* _SYS_REBOOT_H_ */
diff --git a/i386/include/sys/select.h b/i386/include/sys/select.h
new file mode 100644
index 0000000..49a4572
--- /dev/null
+++ b/i386/include/sys/select.h
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)select.h	8.2 (Berkeley) 1/4/94
+ */
+
+#ifndef _SYS_SELECT_H_
+#define	_SYS_SELECT_H_
+
+#include <sys/appleapiopts.h>
+#include <sys/cdefs.h>
+#include <sys/_types.h>
+
+/*
+ * [XSI] The <sys/select.h> header shall define the fd_set type as a structure.
+ * The timespec structure shall be defined as described in <time.h>
+ * The <sys/select.h> header shall define the timeval structure.
+ */
+#define __need_fd_set
+#define __need_struct_timespec
+#define __need_struct_timeval
+#include <sys/_structs.h>
+
+/*
+ * The time_t and suseconds_t types shall be defined as described in
+ * <sys/types.h>
+ * The sigset_t type shall be defined as described in <signal.h>
+ */
+#ifndef	_TIME_T
+#define	_TIME_T
+typedef	__darwin_time_t		time_t;
+#endif
+
+#ifndef _SUSECONDS_T
+#define _SUSECONDS_T
+typedef __darwin_suseconds_t	suseconds_t;
+#endif
+
+#ifndef _SIGSET_T
+#define _SIGSET_T
+typedef __darwin_sigset_t	sigset_t;
+#endif
+
+/*
+ * [XSI] FD_CLR, FD_ISSET, FD_SET, FD_ZERO may be declared as a function, or
+ *	 defined as a macro, or both
+ * [XSI] FD_SETSIZE shall be defined as a macro
+ */
+
+/*
+ * Select uses bit masks of file descriptors in longs.  These macros
+ * manipulate such bit fields (the filesystem macros use chars).  The
+ * extra protection here is to permit application redefinition above
+ * the default size.
+ */
+#ifndef	FD_SETSIZE
+#define	FD_SETSIZE	__DARWIN_FD_SETSIZE
+#endif /* FD_SETSIZE */
+#ifndef FD_SET
+#define	FD_SET(n, p)	__DARWIN_FD_SET(n, p)
+#endif /* FD_SET */
+#ifndef FD_CLR
+#define	FD_CLR(n, p)	__DARWIN_FD_CLR(n, p)
+#endif /* FD_CLR */
+#ifndef FD_ISSET
+#define	FD_ISSET(n, p)	__DARWIN_FD_ISSET(n, p)
+#endif /* FD_ISSET */
+#ifndef FD_ZERO
+#define	FD_ZERO(p)	__DARWIN_FD_ZERO(p)
+#endif /* FD_ZERO */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifndef FD_COPY
+#define	FD_COPY(f, t)	__DARWIN_FD_COPY(f, t)
+#endif /* FD_COPY */
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+
+__BEGIN_DECLS
+
+#ifndef  __MWERKS__
+int	 pselect(int, fd_set * __restrict, fd_set * __restrict,
+		fd_set * __restrict, const struct timespec * __restrict,
+		const sigset_t * __restrict)
+#if defined(_DARWIN_C_SOURCE) || defined(_DARWIN_UNLIMITED_SELECT)
+		__DARWIN_EXTSN_C(pselect)
+#else /* !_DARWIN_C_SOURCE && !_DARWIN_UNLIMITED_SELECT */
+#  if defined(__LP64__) && !__DARWIN_NON_CANCELABLE
+		__DARWIN_1050(pselect)
+#  else /* !__LP64__ || __DARWIN_NON_CANCELABLE */
+		__DARWIN_ALIAS_C(pselect)
+#  endif /* __LP64__ && !__DARWIN_NON_CANCELABLE */
+#endif /* _DARWIN_C_SOURCE || _DARWIN_UNLIMITED_SELECT */
+		;
+#endif /* __MWERKS__ */
+
+#include <sys/_select.h>	/* select() prototype */
+
+__END_DECLS
+
+
+#endif /* !_SYS_SELECT_H_ */
diff --git a/i386/include/sys/socket.h b/i386/include/sys/socket.h
new file mode 100644
index 0000000..a19105a
--- /dev/null
+++ b/i386/include/sys/socket.h
@@ -0,0 +1,629 @@
+/*
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1998, 1999 Apple Computer, Inc. All Rights Reserved */
+/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
+/*
+ * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)socket.h	8.4 (Berkeley) 2/21/94
+ * $FreeBSD: src/sys/sys/socket.h,v 1.39.2.7 2001/07/03 11:02:01 ume Exp $
+ */
+/*
+ * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
+ * support for mandatory and extensible security protections.  This notice
+ * is included in support of clause 2.2 (b) of the Apple Public License,
+ * Version 2.0.
+ */
+
+#ifndef _SYS_SOCKET_H_
+#define	_SYS_SOCKET_H_
+
+#include <sys/types.h>
+#include <sys/cdefs.h>
+#include <machine/_param.h>
+
+/*
+ * Definitions related to sockets: types, address families, options.
+ */
+
+/*
+ * Data types.
+ */
+#ifndef _GID_T
+typedef __darwin_gid_t		gid_t;
+#define _GID_T
+#endif
+
+#ifndef _OFF_T
+typedef __darwin_off_t		off_t;
+#define _OFF_T
+#endif
+
+#ifndef _PID_T
+typedef __darwin_pid_t		pid_t;
+#define _PID_T
+#endif
+
+#ifndef _SA_FAMILY_T
+#define _SA_FAMILY_T
+typedef __uint8_t		sa_family_t;
+#endif
+
+#ifndef _SOCKLEN_T
+#define _SOCKLEN_T
+typedef	__darwin_socklen_t	socklen_t;
+#endif
+
+/* XXX Not explicitly defined by POSIX, but function return types are */
+#ifndef _SIZE_T
+#define _SIZE_T
+typedef __darwin_size_t		size_t;
+#endif
+ 
+/* XXX Not explicitly defined by POSIX, but function return types are */
+#ifndef	_SSIZE_T
+#define	_SSIZE_T
+typedef	__darwin_ssize_t	ssize_t;
+#endif
+
+/*
+ * [XSI] The iovec structure shall be defined as described in <sys/uio.h>.
+ */
+#ifndef _STRUCT_IOVEC
+#define	_STRUCT_IOVEC
+struct iovec {
+	void *   iov_base;	/* [XSI] Base address of I/O memory region */
+	size_t	 iov_len;	/* [XSI] Size of region iov_base points to */
+};
+#endif
+ 
+/*
+ * Types
+ */
+#define	SOCK_STREAM	1		/* stream socket */
+#define	SOCK_DGRAM	2		/* datagram socket */
+#define	SOCK_RAW	3		/* raw-protocol interface */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	SOCK_RDM	4		/* reliably-delivered message */
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#define	SOCK_SEQPACKET	5		/* sequenced packet stream */
+
+/*
+ * Option flags per-socket.
+ */
+#define	SO_DEBUG	0x0001		/* turn on debugging info recording */
+#define	SO_ACCEPTCONN	0x0002		/* socket has had listen() */
+#define	SO_REUSEADDR	0x0004		/* allow local address reuse */
+#define	SO_KEEPALIVE	0x0008		/* keep connections alive */
+#define	SO_DONTROUTE	0x0010		/* just use interface addresses */
+#define	SO_BROADCAST	0x0020		/* permit sending of broadcast msgs */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	SO_USELOOPBACK	0x0040		/* bypass hardware when possible */
+#define SO_LINGER	0x0080          /* linger on close if data present (in ticks) */
+#else
+#define SO_LINGER	0x1080          /* linger on close if data present (in seconds) */
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
+#define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
+#ifndef __APPLE__
+#define	SO_ACCEPTFILTER	0x1000		/* there is an accept filter */
+#else
+#define SO_DONTTRUNC	0x2000		/* APPLE: Retain unread data */
+					/*  (ATOMIC proto) */
+#define SO_WANTMORE		0x4000		/* APPLE: Give hint when more data ready */
+#define SO_WANTOOBFLAG	0x8000		/* APPLE: Want OOB in MSG_FLAG on receive */
+#endif
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/*
+ * Additional options, not kept in so_options.
+ */
+#define SO_SNDBUF	0x1001		/* send buffer size */
+#define SO_RCVBUF	0x1002		/* receive buffer size */
+#define SO_SNDLOWAT	0x1003		/* send low-water mark */
+#define SO_RCVLOWAT	0x1004		/* receive low-water mark */
+#define SO_SNDTIMEO	0x1005		/* send timeout */
+#define SO_RCVTIMEO	0x1006		/* receive timeout */
+#define	SO_ERROR	0x1007		/* get error status and clear */
+#define	SO_TYPE		0x1008		/* get socket type */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+/*efine	SO_PRIVSTATE	0x1009		   get/deny privileged state */
+#ifdef __APPLE__
+#define SO_NREAD	0x1020		/* APPLE: get 1st-packet byte count */
+#define SO_NKE		0x1021		/* APPLE: Install socket-level NKE */
+#define SO_NOSIGPIPE	0x1022		/* APPLE: No SIGPIPE on EPIPE */
+#define SO_NOADDRERR	0x1023		/* APPLE: Returns EADDRNOTAVAIL when src is not available anymore */
+#define SO_NWRITE	0x1024		/* APPLE: Get number of bytes currently in send socket buffer */
+#define SO_REUSESHAREUID	0x1025		/* APPLE: Allow reuse of port/socket by different userids */
+#ifdef __APPLE_API_PRIVATE
+#define SO_NOTIFYCONFLICT	0x1026	/* APPLE: send notification if there is a bind on a port which is already in use */
+#define	SO_UPCALLCLOSEWAIT	0x1027	/* APPLE: block on close until an upcall returns */
+#endif
+#define SO_LINGER_SEC	0x1080          /* linger on close if data present (in seconds) */
+#define SO_RESTRICTIONS	0x1081	/* APPLE: deny inbound/outbound/both/flag set */
+#define SO_RESTRICT_DENYIN		0x00000001	/* flag for SO_RESTRICTIONS - deny inbound */
+#define SO_RESTRICT_DENYOUT		0x00000002	/* flag for SO_RESTRICTIONS - deny outbound */
+#define SO_RESTRICT_DENYSET		0x80000000	/* flag for SO_RESTRICTIONS - deny has been set */
+#define SO_RANDOMPORT   0x1082  /* APPLE: request local port randomization */
+#define SO_NP_EXTENSIONS	0x1083	/* To turn off some POSIX behavior */
+#endif
+#define	SO_LABEL	0x1010		/* socket's MAC label */
+#define	SO_PEERLABEL	0x1011		/* socket's peer MAC label */
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/*
+ * Structure used for manipulating linger option.
+ */
+struct	linger {
+	int	l_onoff;		/* option on/off */
+	int	l_linger;		/* linger time */
+};
+
+#ifndef __APPLE__
+struct	accept_filter_arg {
+	char	af_name[16];
+	char	af_arg[256-16];
+};
+#endif
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifdef __APPLE__
+
+/*
+ * Structure to control non-portable Sockets extension to POSIX  
+ */
+struct so_np_extensions {
+	u_int32_t	npx_flags;
+	u_int32_t	npx_mask;
+};
+
+#define SONPX_SETOPTSHUT	0x000000001     /* flag for allowing setsockopt after shutdown */
+
+
+
+#endif
+#endif
+
+/*
+ * Level number for (get/set)sockopt() to apply to socket itself.
+ */
+#define	SOL_SOCKET	0xffff		/* options for socket level */
+
+
+/*
+ * Address families.
+ */
+#define	AF_UNSPEC	0		/* unspecified */
+#define	AF_UNIX		1		/* local to host (pipes) */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	AF_LOCAL	AF_UNIX		/* backward compatibility */
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	AF_IMPLINK	3		/* arpanet imp addresses */
+#define	AF_PUP		4		/* pup protocols: e.g. BSP */
+#define	AF_CHAOS	5		/* mit CHAOS protocols */
+#define	AF_NS		6		/* XEROX NS protocols */
+#define	AF_ISO		7		/* ISO protocols */
+#define	AF_OSI		AF_ISO
+#define	AF_ECMA		8		/* European computer manufacturers */
+#define	AF_DATAKIT	9		/* datakit protocols */
+#define	AF_CCITT	10		/* CCITT protocols, X.25 etc */
+#define	AF_SNA		11		/* IBM SNA */
+#define AF_DECnet	12		/* DECnet */
+#define AF_DLI		13		/* DEC Direct data link interface */
+#define AF_LAT		14		/* LAT */
+#define	AF_HYLINK	15		/* NSC Hyperchannel */
+#define	AF_APPLETALK	16		/* Apple Talk */
+#define	AF_ROUTE	17		/* Internal Routing Protocol */
+#define	AF_LINK		18		/* Link layer interface */
+#define	pseudo_AF_XTP	19		/* eXpress Transfer Protocol (no AF) */
+#define	AF_COIP		20		/* connection-oriented IP, aka ST II */
+#define	AF_CNT		21		/* Computer Network Technology */
+#define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
+#define	AF_IPX		23		/* Novell Internet Protocol */
+#define	AF_SIP		24		/* Simple Internet Protocol */
+#define pseudo_AF_PIP	25		/* Help Identify PIP packets */
+#ifdef __APPLE__
+/*define pseudo_AF_BLUE	26	   Identify packets for Blue Box - Not used */
+#define AF_NDRV		27		/* Network Driver 'raw' access */
+#endif
+#define	AF_ISDN		28		/* Integrated Services Digital Network*/
+#define	AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
+#define	pseudo_AF_KEY	29		/* Internal key-management function */
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#define	AF_INET6	30		/* IPv6 */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	AF_NATM		31		/* native ATM access */
+#ifdef __APPLE__
+#define AF_SYSTEM	32		/* Kernel event messages */
+#define AF_NETBIOS	33		/* NetBIOS */
+#define AF_PPP		34		/* PPP communication protocol */
+#else
+#define	AF_ATM		30		/* ATM */
+#endif
+#define pseudo_AF_HDRCMPLT 35		/* Used by BPF to not rewrite headers
+					 * in interface output routine
+					 */
+#define AF_RESERVED_36	36		/* Reserved for internal usage */
+
+#ifndef __APPLE__
+#define	AF_NETGRAPH	32		/* Netgraph sockets */
+#endif
+#define AF_IEEE80211    37              /* IEEE 802.11 protocol */
+#define	AF_MAX		38
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/*
+ * [XSI] Structure used by kernel to store most addresses.
+ */
+struct sockaddr {
+	__uint8_t	sa_len;		/* total length */
+	sa_family_t	sa_family;	/* [XSI] address family */
+	char		sa_data[14];	/* [XSI] addr value (actually larger) */
+};
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	SOCK_MAXADDRLEN	255		/* longest possible addresses */
+
+/*
+ * Structure used by kernel to pass protocol
+ * information in raw sockets.
+ */
+struct sockproto {
+	__uint16_t	sp_family;		/* address family */
+	__uint16_t	sp_protocol;		/* protocol */
+};
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE)*/
+
+/*
+ * RFC 2553: protocol-independent placeholder for socket addresses
+ */
+#define	_SS_MAXSIZE	128
+#define	_SS_ALIGNSIZE	(sizeof(__int64_t))
+#define	_SS_PAD1SIZE	\
+		(_SS_ALIGNSIZE - sizeof(__uint8_t) - sizeof(sa_family_t))
+#define	_SS_PAD2SIZE	\
+		(_SS_MAXSIZE - sizeof(__uint8_t) - sizeof(sa_family_t) - \
+				_SS_PAD1SIZE - _SS_ALIGNSIZE)
+
+/*
+ * [XSI] sockaddr_storage
+ */
+struct sockaddr_storage {
+	__uint8_t	ss_len;		/* address length */
+	sa_family_t	ss_family;	/* [XSI] address family */
+	char			__ss_pad1[_SS_PAD1SIZE];
+	__int64_t	__ss_align;	/* force structure storage alignment */
+	char			__ss_pad2[_SS_PAD2SIZE];
+};
+
+/*
+ * Protocol families, same as address families for now.
+ */
+#define	PF_UNSPEC	AF_UNSPEC
+#define	PF_LOCAL	AF_LOCAL
+#define	PF_UNIX		PF_LOCAL	/* backward compatibility */
+#define	PF_INET		AF_INET
+#define	PF_IMPLINK	AF_IMPLINK
+#define	PF_PUP		AF_PUP
+#define	PF_CHAOS	AF_CHAOS
+#define	PF_NS		AF_NS
+#define	PF_ISO		AF_ISO
+#define	PF_OSI		AF_ISO
+#define	PF_ECMA		AF_ECMA
+#define	PF_DATAKIT	AF_DATAKIT
+#define	PF_CCITT	AF_CCITT
+#define	PF_SNA		AF_SNA
+#define PF_DECnet	AF_DECnet
+#define PF_DLI		AF_DLI
+#define PF_LAT		AF_LAT
+#define	PF_HYLINK	AF_HYLINK
+#define	PF_APPLETALK	AF_APPLETALK
+#define	PF_ROUTE	AF_ROUTE
+#define	PF_LINK		AF_LINK
+#define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
+#define	PF_COIP		AF_COIP
+#define	PF_CNT		AF_CNT
+#define	PF_SIP		AF_SIP
+#define	PF_IPX		AF_IPX		/* same format as AF_NS */
+#define PF_RTIP		pseudo_AF_RTIP	/* same format as AF_INET */
+#define PF_PIP		pseudo_AF_PIP
+#ifdef __APPLE__
+#define PF_NDRV		AF_NDRV
+#endif
+#define	PF_ISDN		AF_ISDN
+#define	PF_KEY		pseudo_AF_KEY
+#define	PF_INET6	AF_INET6
+#define	PF_NATM		AF_NATM
+#ifdef __APPLE__
+#define PF_SYSTEM	AF_SYSTEM
+#define PF_NETBIOS	AF_NETBIOS
+#define PF_PPP		AF_PPP
+#define PF_RESERVED_36  AF_RESERVED_36
+
+#else
+#define	PF_ATM		AF_ATM
+#define	PF_NETGRAPH	AF_NETGRAPH
+#endif
+
+#define	PF_MAX		AF_MAX
+
+/*
+ * These do not have socket-layer support:
+ */
+#define	PF_VLAN		((uint32_t)0x766c616e)	/* 'vlan' */
+#define PF_BOND		((uint32_t)0x626f6e64)	/* 'bond' */
+
+/*
+ * Definitions for network related sysctl, CTL_NET.
+ *
+ * Second level is protocol family.
+ * Third level is protocol number.
+ *
+ * Further levels are defined by the individual families below.
+ */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define NET_MAXID	AF_MAX
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
+
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+/*
+ * PF_ROUTE - Routing table
+ *
+ * Three additional levels are defined:
+ *	Fourth: address family, 0 is wildcard
+ *	Fifth: type of info, defined below
+ *	Sixth: flag(s) to mask with for NET_RT_FLAGS
+ */
+#define NET_RT_DUMP			1		/* dump; may limit to a.f. */
+#define NET_RT_FLAGS		2		/* by flags, e.g. RESOLVING */
+#define NET_RT_IFLIST		3		/* survey interface list */
+#define NET_RT_STAT			4		/* routing statistics */
+#define NET_RT_TRASH		5		/* routes not in table but not freed */
+#define NET_RT_IFLIST2	6		/* interface list with addresses */
+#define NET_RT_DUMP2                     7               /* dump; may limit to a.f. */
+#define	NET_RT_MAXID		8
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
+
+
+/*
+ * Maximum queue length specifiable by listen.
+ */
+#define	SOMAXCONN	128
+
+/*
+ * [XSI] Message header for recvmsg and sendmsg calls.
+ * Used value-result for recvmsg, value only for sendmsg.
+ */
+struct msghdr {
+	void		*msg_name;	/* [XSI] optional address */
+	socklen_t	msg_namelen;	/* [XSI] size of address */
+	struct		iovec *msg_iov;	/* [XSI] scatter/gather array */
+	int		msg_iovlen;	/* [XSI] # elements in msg_iov */
+	void		*msg_control;	/* [XSI] ancillary data, see below */
+	socklen_t	msg_controllen;	/* [XSI] ancillary data buffer len */
+	int		msg_flags;	/* [XSI] flags on received message */
+};
+
+
+#define	MSG_OOB		0x1		/* process out-of-band data */
+#define	MSG_PEEK	0x2		/* peek at incoming message */
+#define	MSG_DONTROUTE	0x4		/* send without using routing tables */
+#define	MSG_EOR		0x8		/* data completes record */
+#define	MSG_TRUNC	0x10		/* data discarded before delivery */
+#define	MSG_CTRUNC	0x20		/* control data lost before delivery */
+#define	MSG_WAITALL	0x40		/* wait for full request or error */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	MSG_DONTWAIT	0x80		/* this message should be nonblocking */
+#define	MSG_EOF		0x100		/* data completes connection */
+#ifdef __APPLE__
+#define MSG_WAITSTREAM  0x200           /* wait up to full request.. may return partial */
+#define MSG_FLUSH	0x400		/* Start of 'hold' seq; dump so_temp */
+#define MSG_HOLD	0x800		/* Hold frag in so_temp */
+#define MSG_SEND	0x1000		/* Send the packet in so_temp */
+#define MSG_HAVEMORE	0x2000		/* Data ready to be read */
+#define MSG_RCVMORE	0x4000		/* Data remains in current pkt */
+#endif
+#define MSG_NEEDSA	0x10000		/* Fail receive if socket address cannot be allocated */
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/*
+ * Header for ancillary data objects in msg_control buffer.
+ * Used for additional information with/about a datagram
+ * not expressible by flags.  The format is a sequence
+ * of message elements headed by cmsghdr structures.
+ */
+struct cmsghdr {
+	socklen_t	cmsg_len;	/* [XSI] data byte count, including hdr */
+	int		cmsg_level;	/* [XSI] originating protocol */
+	int		cmsg_type;	/* [XSI] protocol-specific type */
+/* followed by	unsigned char  cmsg_data[]; */
+};
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifndef __APPLE__
+/*
+ * While we may have more groups than this, the cmsgcred struct must
+ * be able to fit in an mbuf, and NGROUPS_MAX is too large to allow
+ * this.
+*/
+#define CMGROUP_MAX 16
+
+/*
+ * Credentials structure, used to verify the identity of a peer
+ * process that has sent us a message. This is allocated by the
+ * peer process but filled in by the kernel. This prevents the
+ * peer from lying about its identity. (Note that cmcred_groups[0]
+ * is the effective GID.)
+ */
+struct cmsgcred {
+	pid_t	cmcred_pid;		/* PID of sending process */
+	uid_t	cmcred_uid;		/* real UID of sending process */
+	uid_t	cmcred_euid;		/* effective UID of sending process */
+	gid_t	cmcred_gid;		/* real GID of sending process */
+	short	cmcred_ngroups;		/* number or groups */
+	gid_t	cmcred_groups[CMGROUP_MAX];	/* groups */
+};
+#endif
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/* given pointer to struct cmsghdr, return pointer to data */
+#define	CMSG_DATA(cmsg)		((unsigned char *)(cmsg) + \
+				 __DARWIN_ALIGN32(sizeof(struct cmsghdr)))
+
+/*
+ * RFC 2292 requires to check msg_controllen, in case that the kernel returns
+ * an empty list for some reasons.
+ */
+#define CMSG_FIRSTHDR(mhdr) \
+        ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
+         (struct cmsghdr *)(mhdr)->msg_control : \
+         (struct cmsghdr *)0L)
+
+
+/* 
+ * Given pointer to struct cmsghdr, return pointer to next cmsghdr
+ * RFC 2292 says that CMSG_NXTHDR(mhdr, NULL) is equivalent to CMSG_FIRSTHDR(mhdr)
+ */
+#define	CMSG_NXTHDR(mhdr, cmsg)						\
+	((char *)(cmsg) == (char *)0L ? CMSG_FIRSTHDR(mhdr) :		\
+	 ((((unsigned char *)(cmsg) +					\
+	    __DARWIN_ALIGN32((__uint32_t)(cmsg)->cmsg_len) +		\
+	    __DARWIN_ALIGN32(sizeof(struct cmsghdr))) >			\
+	    ((unsigned char *)(mhdr)->msg_control +			\
+	     (mhdr)->msg_controllen)) ?					\
+	  (struct cmsghdr *)0L /* NULL */ :				\
+	  (struct cmsghdr *)((unsigned char *)(cmsg) +			\
+	 		    __DARWIN_ALIGN32((__uint32_t)(cmsg)->cmsg_len))))
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+/* RFC 2292 additions */
+#define	CMSG_SPACE(l)		(__DARWIN_ALIGN32(sizeof(struct cmsghdr)) + __DARWIN_ALIGN32(l))
+#define	CMSG_LEN(l)		(__DARWIN_ALIGN32(sizeof(struct cmsghdr)) + (l))
+
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/* "Socket"-level control message types: */
+#define	SCM_RIGHTS	0x01		/* access rights (array of int) */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
+#define	SCM_CREDS	0x03		/* process creds (struct cmsgcred) */
+
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+/*
+ * howto arguments for shutdown(2), specified by Posix.1g.
+ */
+#define	SHUT_RD		0		/* shut down the reading side */
+#define	SHUT_WR		1		/* shut down the writing side */
+#define	SHUT_RDWR	2		/* shut down both sides */
+
+#if !defined(_POSIX_C_SOURCE)
+/*
+ * sendfile(2) header/trailer struct
+ */
+struct sf_hdtr {
+	struct iovec *headers;	/* pointer to an array of header struct iovec's */
+	int hdr_cnt;		/* number of header iovec's */
+	struct iovec *trailers;	/* pointer to an array of trailer struct iovec's */
+	int trl_cnt;		/* number of trailer iovec's */
+};
+
+
+#endif	/* !_POSIX_C_SOURCE */
+
+__BEGIN_DECLS
+int	accept(int, struct sockaddr * __restrict, socklen_t * __restrict)
+		__DARWIN_ALIAS_C(accept);
+int	bind(int, const struct sockaddr *, socklen_t) __DARWIN_ALIAS(bind);
+int	connect(int, const struct sockaddr *, socklen_t) __DARWIN_ALIAS_C( connect);
+int	getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict)
+		__DARWIN_ALIAS(getpeername);
+int	getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict)
+		__DARWIN_ALIAS(getsockname);
+int	getsockopt(int, int, int, void * __restrict, socklen_t * __restrict);
+int	listen(int, int) __DARWIN_ALIAS(listen);
+ssize_t	recv(int, void *, size_t, int) __DARWIN_ALIAS_C(recv);
+ssize_t	recvfrom(int, void *, size_t, int, struct sockaddr * __restrict,
+		socklen_t * __restrict) __DARWIN_ALIAS_C(recvfrom);
+ssize_t	recvmsg(int, struct msghdr *, int) __DARWIN_ALIAS_C(recvmsg);
+ssize_t	send(int, const void *, size_t, int) __DARWIN_ALIAS_C(send);
+ssize_t	sendmsg(int, const struct msghdr *, int) __DARWIN_ALIAS_C(sendmsg);
+ssize_t	sendto(int, const void *, size_t,
+		int, const struct sockaddr *, socklen_t) __DARWIN_ALIAS_C(sendto);
+int	setsockopt(int, int, int, const void *, socklen_t);
+int	shutdown(int, int);
+int	sockatmark(int);
+int	socket(int, int, int);
+int	socketpair(int, int, int, int *) __DARWIN_ALIAS(socketpair);
+
+#if !defined(_POSIX_C_SOURCE)
+int	sendfile(int, int, off_t, off_t *, struct sf_hdtr *, int);
+#endif	/* !_POSIX_C_SOURCE */
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+void	pfctlinput(int, struct sockaddr *);
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+__END_DECLS
+
+
+
+#endif /* !_SYS_SOCKET_H_ */
diff --git a/i386/include/sys/syscall.h b/i386/include/sys/syscall.h
new file mode 100644
index 0000000..1f5aeb7
--- /dev/null
+++ b/i386/include/sys/syscall.h
@@ -0,0 +1,477 @@
+/*
+ * Copyright (c) 2004-2008 Apple Inc. All rights reserved.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * 
+ * 
+ * System call switch table.
+ *
+ * DO NOT EDIT-- this file is automatically generated.
+ * created from /SourceCache/xnu/xnu-1504.7.4/bsd/kern/syscalls.master
+ */
+
+#ifndef _SYS_SYSCALL_H_
+#define	_SYS_SYSCALL_H_
+
+#include <sys/appleapiopts.h>
+#ifdef __APPLE_API_PRIVATE
+#define	SYS_syscall        0
+#define	SYS_exit           1
+#define	SYS_fork           2
+#define	SYS_read           3
+#define	SYS_write          4
+#define	SYS_open           5
+#define	SYS_close          6
+#define	SYS_wait4          7
+			/* 8  old creat */
+#define	SYS_link           9
+#define	SYS_unlink         10
+			/* 11  old execv */
+#define	SYS_chdir          12
+#define	SYS_fchdir         13
+#define	SYS_mknod          14
+#define	SYS_chmod          15
+#define	SYS_chown          16
+			/* 17  old break */
+#define	SYS_getfsstat      18
+			/* 19  old lseek */
+#define	SYS_getpid         20
+			/* 21  old mount */
+			/* 22  old umount */
+#define	SYS_setuid         23
+#define	SYS_getuid         24
+#define	SYS_geteuid        25
+#define	SYS_ptrace         26
+#define	SYS_recvmsg        27
+#define	SYS_sendmsg        28
+#define	SYS_recvfrom       29
+#define	SYS_accept         30
+#define	SYS_getpeername    31
+#define	SYS_getsockname    32
+#define	SYS_access         33
+#define	SYS_chflags        34
+#define	SYS_fchflags       35
+#define	SYS_sync           36
+#define	SYS_kill           37
+			/* 38  old stat */
+#define	SYS_getppid        39
+			/* 40  old lstat */
+#define	SYS_dup            41
+#define	SYS_pipe           42
+#define	SYS_getegid        43
+#define	SYS_profil         44
+			/* 45  old ktrace */
+#define	SYS_sigaction      46
+#define	SYS_getgid         47
+#define	SYS_sigprocmask    48
+#define	SYS_getlogin       49
+#define	SYS_setlogin       50
+#define	SYS_acct           51
+#define	SYS_sigpending     52
+#define	SYS_sigaltstack    53
+#define	SYS_ioctl          54
+#define	SYS_reboot         55
+#define	SYS_revoke         56
+#define	SYS_symlink        57
+#define	SYS_readlink       58
+#define	SYS_execve         59
+#define	SYS_umask          60
+#define	SYS_chroot         61
+			/* 62  old fstat */
+			/* 63  used internally , reserved */
+			/* 64  old getpagesize */
+#define	SYS_msync          65
+#define	SYS_vfork          66
+			/* 67  old vread */
+			/* 68  old vwrite */
+			/* 69  old sbrk */
+			/* 70  old sstk */
+			/* 71  old mmap */
+			/* 72  old vadvise */
+#define	SYS_munmap         73
+#define	SYS_mprotect       74
+#define	SYS_madvise        75
+			/* 76  old vhangup */
+			/* 77  old vlimit */
+#define	SYS_mincore        78
+#define	SYS_getgroups      79
+#define	SYS_setgroups      80
+#define	SYS_getpgrp        81
+#define	SYS_setpgid        82
+#define	SYS_setitimer      83
+			/* 84  old wait */
+#define	SYS_swapon         85
+#define	SYS_getitimer      86
+			/* 87  old gethostname */
+			/* 88  old sethostname */
+#define	SYS_getdtablesize  89
+#define	SYS_dup2           90
+			/* 91  old getdopt */
+#define	SYS_fcntl          92
+#define	SYS_select         93
+			/* 94  old setdopt */
+#define	SYS_fsync          95
+#define	SYS_setpriority    96
+#define	SYS_socket         97
+#define	SYS_connect        98
+			/* 99  old accept */
+#define	SYS_getpriority    100
+			/* 101  old send */
+			/* 102  old recv */
+			/* 103  old sigreturn */
+#define	SYS_bind           104
+#define	SYS_setsockopt     105
+#define	SYS_listen         106
+			/* 107  old vtimes */
+			/* 108  old sigvec */
+			/* 109  old sigblock */
+			/* 110  old sigsetmask */
+#define	SYS_sigsuspend     111
+			/* 112  old sigstack */
+			/* 113  old recvmsg */
+			/* 114  old sendmsg */
+			/* 115  old vtrace */
+#define	SYS_gettimeofday   116
+#define	SYS_getrusage      117
+#define	SYS_getsockopt     118
+			/* 119  old resuba */
+#define	SYS_readv          120
+#define	SYS_writev         121
+#define	SYS_settimeofday   122
+#define	SYS_fchown         123
+#define	SYS_fchmod         124
+			/* 125  old recvfrom */
+#define	SYS_setreuid       126
+#define	SYS_setregid       127
+#define	SYS_rename         128
+			/* 129  old truncate */
+			/* 130  old ftruncate */
+#define	SYS_flock          131
+#define	SYS_mkfifo         132
+#define	SYS_sendto         133
+#define	SYS_shutdown       134
+#define	SYS_socketpair     135
+#define	SYS_mkdir          136
+#define	SYS_rmdir          137
+#define	SYS_utimes         138
+#define	SYS_futimes        139
+#define	SYS_adjtime        140
+			/* 141  old getpeername */
+#define	SYS_gethostuuid    142
+			/* 143  old sethostid */
+			/* 144  old getrlimit */
+			/* 145  old setrlimit */
+			/* 146  old killpg */
+#define	SYS_setsid         147
+			/* 148  old setquota */
+			/* 149  old qquota */
+			/* 150  old getsockname */
+#define	SYS_getpgid        151
+#define	SYS_setprivexec    152
+#define	SYS_pread          153
+#define	SYS_pwrite         154
+#define	SYS_nfssvc         155
+			/* 156  old getdirentries */
+#define	SYS_statfs         157
+#define	SYS_fstatfs        158
+#define	SYS_unmount        159
+			/* 160  old async_daemon */
+#define	SYS_getfh          161
+			/* 162  old getdomainname */
+			/* 163  old setdomainname */
+			/* 164  */
+#define	SYS_quotactl       165
+			/* 166  old exportfs */
+#define	SYS_mount          167
+			/* 168  old ustat */
+#define	SYS_csops          169
+			/* 170  old table */
+			/* 171  old wait3 */
+			/* 172  old rpause */
+#define	SYS_waitid         173
+			/* 174  old getdents */
+			/* 175  old gc_control */
+#define	SYS_add_profil     176
+			/* 177  */
+			/* 178  */
+			/* 179  */
+#define	SYS_kdebug_trace   180
+#define	SYS_setgid         181
+#define	SYS_setegid        182
+#define	SYS_seteuid        183
+#define	SYS_sigreturn      184
+#define	SYS_chud           185
+			/* 186  */
+#define	SYS_fdatasync      187
+#define	SYS_stat           188
+#define	SYS_fstat          189
+#define	SYS_lstat          190
+#define	SYS_pathconf       191
+#define	SYS_fpathconf      192
+			/* 193  */
+#define	SYS_getrlimit      194
+#define	SYS_setrlimit      195
+#define	SYS_getdirentries  196
+#define	SYS_mmap           197
+			/* 198  __syscall */
+#define	SYS_lseek          199
+#define	SYS_truncate       200
+#define	SYS_ftruncate      201
+#define	SYS___sysctl       202
+#define	SYS_mlock          203
+#define	SYS_munlock        204
+#define	SYS_undelete       205
+#define	SYS_ATsocket       206
+#define	SYS_ATgetmsg       207
+#define	SYS_ATputmsg       208
+#define	SYS_ATPsndreq      209
+#define	SYS_ATPsndrsp      210
+#define	SYS_ATPgetreq      211
+#define	SYS_ATPgetrsp      212
+			/* 213  Reserved for AppleTalk */
+			/* 214  */
+			/* 215  */
+#define	SYS_mkcomplex      216
+#define	SYS_statv          217
+#define	SYS_lstatv         218
+#define	SYS_fstatv         219
+#define	SYS_getattrlist    220
+#define	SYS_setattrlist    221
+#define	SYS_getdirentriesattr 222
+#define	SYS_exchangedata   223
+			/* 224  old checkuseraccess / fsgetpath ( which moved to 427 ) */
+#define	SYS_searchfs       225
+#define	SYS_delete         226
+#define	SYS_copyfile       227
+#define	SYS_fgetattrlist   228
+#define	SYS_fsetattrlist   229
+#define	SYS_poll           230
+#define	SYS_watchevent     231
+#define	SYS_waitevent      232
+#define	SYS_modwatch       233
+#define	SYS_getxattr       234
+#define	SYS_fgetxattr      235
+#define	SYS_setxattr       236
+#define	SYS_fsetxattr      237
+#define	SYS_removexattr    238
+#define	SYS_fremovexattr   239
+#define	SYS_listxattr      240
+#define	SYS_flistxattr     241
+#define	SYS_fsctl          242
+#define	SYS_initgroups     243
+#define	SYS_posix_spawn    244
+#define	SYS_ffsctl         245
+			/* 246  */
+#define	SYS_nfsclnt        247
+#define	SYS_fhopen         248
+			/* 249  */
+#define	SYS_minherit       250
+#define	SYS_semsys         251
+#define	SYS_msgsys         252
+#define	SYS_shmsys         253
+#define	SYS_semctl         254
+#define	SYS_semget         255
+#define	SYS_semop          256
+			/* 257  */
+#define	SYS_msgctl         258
+#define	SYS_msgget         259
+#define	SYS_msgsnd         260
+#define	SYS_msgrcv         261
+#define	SYS_shmat          262
+#define	SYS_shmctl         263
+#define	SYS_shmdt          264
+#define	SYS_shmget         265
+#define	SYS_shm_open       266
+#define	SYS_shm_unlink     267
+#define	SYS_sem_open       268
+#define	SYS_sem_close      269
+#define	SYS_sem_unlink     270
+#define	SYS_sem_wait       271
+#define	SYS_sem_trywait    272
+#define	SYS_sem_post       273
+#define	SYS_sem_getvalue   274
+#define	SYS_sem_init       275
+#define	SYS_sem_destroy    276
+#define	SYS_open_extended  277
+#define	SYS_umask_extended 278
+#define	SYS_stat_extended  279
+#define	SYS_lstat_extended 280
+#define	SYS_fstat_extended 281
+#define	SYS_chmod_extended 282
+#define	SYS_fchmod_extended 283
+#define	SYS_access_extended 284
+#define	SYS_settid         285
+#define	SYS_gettid         286
+#define	SYS_setsgroups     287
+#define	SYS_getsgroups     288
+#define	SYS_setwgroups     289
+#define	SYS_getwgroups     290
+#define	SYS_mkfifo_extended 291
+#define	SYS_mkdir_extended 292
+#define	SYS_identitysvc    293
+#define	SYS_shared_region_check_np 294
+#define	SYS_shared_region_map_np 295
+#define	SYS_vm_pressure_monitor 296
+#define	SYS_psynch_rw_longrdlock 297
+#define	SYS_psynch_rw_yieldwrlock 298
+#define	SYS_psynch_rw_downgrade 299
+#define	SYS_psynch_rw_upgrade 300
+#define	SYS_psynch_mutexwait 301
+#define	SYS_psynch_mutexdrop 302
+#define	SYS_psynch_cvbroad 303
+#define	SYS_psynch_cvsignal 304
+#define	SYS_psynch_cvwait  305
+#define	SYS_psynch_rw_rdlock 306
+#define	SYS_psynch_rw_wrlock 307
+#define	SYS_psynch_rw_unlock 308
+#define	SYS_psynch_rw_unlock2 309
+#define	SYS_getsid         310
+#define	SYS_settid_with_pid 311
+			/* 312  old __pthread_cond_timedwait */
+#define	SYS_aio_fsync      313
+#define	SYS_aio_return     314
+#define	SYS_aio_suspend    315
+#define	SYS_aio_cancel     316
+#define	SYS_aio_error      317
+#define	SYS_aio_read       318
+#define	SYS_aio_write      319
+#define	SYS_lio_listio     320
+			/* 321  old __pthread_cond_wait */
+#define	SYS_iopolicysys    322
+			/* 323  */
+#define	SYS_mlockall       324
+#define	SYS_munlockall     325
+			/* 326  */
+#define	SYS_issetugid      327
+#define	SYS___pthread_kill 328
+#define	SYS___pthread_sigmask 329
+#define	SYS___sigwait      330
+#define	SYS___disable_threadsignal 331
+#define	SYS___pthread_markcancel 332
+#define	SYS___pthread_canceled 333
+#define	SYS___semwait_signal 334
+			/* 335  old utrace */
+#define	SYS_proc_info      336
+#define	SYS_sendfile       337
+#define	SYS_stat64         338
+#define	SYS_fstat64        339
+#define	SYS_lstat64        340
+#define	SYS_stat64_extended 341
+#define	SYS_lstat64_extended 342
+#define	SYS_fstat64_extended 343
+#define	SYS_getdirentries64 344
+#define	SYS_statfs64       345
+#define	SYS_fstatfs64      346
+#define	SYS_getfsstat64    347
+#define	SYS___pthread_chdir 348
+#define	SYS___pthread_fchdir 349
+#define	SYS_audit          350
+#define	SYS_auditon        351
+			/* 352  */
+#define	SYS_getauid        353
+#define	SYS_setauid        354
+#define	SYS_getaudit       355
+#define	SYS_setaudit       356
+#define	SYS_getaudit_addr  357
+#define	SYS_setaudit_addr  358
+#define	SYS_auditctl       359
+#define	SYS_bsdthread_create 360
+#define	SYS_bsdthread_terminate 361
+#define	SYS_kqueue         362
+#define	SYS_kevent         363
+#define	SYS_lchown         364
+#define	SYS_stack_snapshot 365
+#define	SYS_bsdthread_register 366
+#define	SYS_workq_open     367
+#define	SYS_workq_kernreturn 368
+#define	SYS_kevent64       369
+#define	SYS___old_semwait_signal 370
+#define	SYS___old_semwait_signal_nocancel 371
+#define	SYS_thread_selfid  372
+			/* 373  */
+			/* 374  */
+			/* 375  */
+			/* 376  */
+			/* 377  */
+			/* 378  */
+			/* 379  */
+#define	SYS___mac_execve   380
+#define	SYS___mac_syscall  381
+#define	SYS___mac_get_file 382
+#define	SYS___mac_set_file 383
+#define	SYS___mac_get_link 384
+#define	SYS___mac_set_link 385
+#define	SYS___mac_get_proc 386
+#define	SYS___mac_set_proc 387
+#define	SYS___mac_get_fd   388
+#define	SYS___mac_set_fd   389
+#define	SYS___mac_get_pid  390
+#define	SYS___mac_get_lcid 391
+#define	SYS___mac_get_lctx 392
+#define	SYS___mac_set_lctx 393
+#define	SYS_setlcid        394
+#define	SYS_getlcid        395
+#define	SYS_read_nocancel  396
+#define	SYS_write_nocancel 397
+#define	SYS_open_nocancel  398
+#define	SYS_close_nocancel 399
+#define	SYS_wait4_nocancel 400
+#define	SYS_recvmsg_nocancel 401
+#define	SYS_sendmsg_nocancel 402
+#define	SYS_recvfrom_nocancel 403
+#define	SYS_accept_nocancel 404
+#define	SYS_msync_nocancel 405
+#define	SYS_fcntl_nocancel 406
+#define	SYS_select_nocancel 407
+#define	SYS_fsync_nocancel 408
+#define	SYS_connect_nocancel 409
+#define	SYS_sigsuspend_nocancel 410
+#define	SYS_readv_nocancel 411
+#define	SYS_writev_nocancel 412
+#define	SYS_sendto_nocancel 413
+#define	SYS_pread_nocancel 414
+#define	SYS_pwrite_nocancel 415
+#define	SYS_waitid_nocancel 416
+#define	SYS_poll_nocancel  417
+#define	SYS_msgsnd_nocancel 418
+#define	SYS_msgrcv_nocancel 419
+#define	SYS_sem_wait_nocancel 420
+#define	SYS_aio_suspend_nocancel 421
+#define	SYS___sigwait_nocancel 422
+#define	SYS___semwait_signal_nocancel 423
+#define	SYS___mac_mount    424
+#define	SYS___mac_get_mount 425
+#define	SYS___mac_getfsstat 426
+#define	SYS_fsgetpath      427
+#define	SYS_audit_session_self 428
+#define	SYS_audit_session_join 429
+#define	SYS_pid_suspend    430
+#define	SYS_pid_resume     431
+#define	SYS_fileport_makeport 432
+#define	SYS_fileport_makefd 433
+#define	SYS_MAXSYSCALL	434
+
+#endif /* __APPLE_API_PRIVATE */
+#endif /* !_SYS_SYSCALL_H_ */
diff --git a/i386/include/sys/syslimits.h b/i386/include/sys/syslimits.h
new file mode 100644
index 0000000..a020b39
--- /dev/null
+++ b/i386/include/sys/syslimits.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/*	$NetBSD: syslimits.h,v 1.15 1997/06/25 00:48:09 lukem Exp $	*/
+
+/*
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
+ */
+
+#ifndef _SYS_SYSLIMITS_H_
+#define _SYS_SYSLIMITS_H_
+
+#include <sys/cdefs.h>
+
+#if !defined(_ANSI_SOURCE)
+/*
+ * Note: CHILD_MAX *must* be less than hard_maxproc, which is set at
+ * compile time; you *cannot* set it higher than the hard limit!!
+ */
+#define	ARG_MAX		   (256 * 1024)	/* max bytes for an exec function */
+#define	CHILD_MAX		   266	/* max simultaneous processes */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	GID_MAX		   2147483647U	/* max value for a gid_t (2^31-2) */
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
+#define	LINK_MAX		32767	/* max file link count */
+#define	MAX_CANON		 1024	/* max bytes in term canon input line */
+#define	MAX_INPUT		 1024	/* max bytes in terminal input */
+#define	NAME_MAX		  255	/* max bytes in a file name */
+#define	NGROUPS_MAX		   16	/* max supplemental group id's */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	UID_MAX		   2147483647U	/* max value for a uid_t (2^31-2) */
+
+#define	OPEN_MAX		10240	/* max open files per process - todo, make a config option? */
+
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
+#define	PATH_MAX		 1024	/* max bytes in pathname */
+#define	PIPE_BUF		  512	/* max bytes for atomic pipe writes */
+
+#define	BC_BASE_MAX		   99	/* max ibase/obase values in bc(1) */
+#define	BC_DIM_MAX		 2048	/* max array elements in bc(1) */
+#define	BC_SCALE_MAX		   99	/* max scale value in bc(1) */
+#define	BC_STRING_MAX		 1000	/* max const string length in bc(1) */
+#define	CHARCLASS_NAME_MAX	   14	/* max character class name size */
+#define	COLL_WEIGHTS_MAX	    2	/* max weights for order keyword */
+#define	EQUIV_CLASS_MAX		    2
+#define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
+#define	LINE_MAX		 2048	/* max bytes in an input line */
+#define	RE_DUP_MAX		  255	/* max RE's in interval notation */
+
+#if __DARWIN_UNIX03
+#define	NZERO			   20	/* default priority [XSI] */
+					/* = ((PRIO_MAX - PRIO_MIN) / 2) + 1 */
+					/* range: 0 - 39 [(2 * NZERO) - 1] */
+					/* 0 is not actually used */
+#else /* !__DARWIN_UNIX03 */
+#define	NZERO			    0	/* default priority */
+					/* range: -20 - 20 */
+					/* (PRIO_MIN - PRIO_MAX) */
+#endif /* __DARWIN_UNIX03 */
+#endif /* !_ANSI_SOURCE */
+
+#endif /* !_SYS_SYSLIMITS_H_ */
diff --git a/i386/include/sys/time.h b/i386/include/sys/time.h
new file mode 100644
index 0000000..4b2d999
--- /dev/null
+++ b/i386/include/sys/time.h
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
+/*
+ * Copyright (c) 1982, 1986, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)time.h	8.2 (Berkeley) 7/10/94
+ */
+
+#ifndef _SYS_TIME_H_
+#define _SYS_TIME_H_
+
+#include <sys/cdefs.h>
+#include <sys/_types.h>
+
+/*
+ * [XSI] The fd_set type shall be defined as described in <sys/select.h>.
+ * The timespec structure shall be defined as described in <time.h>
+ */
+#define __need_fd_set
+#define __need_struct_timespec
+#define __need_struct_timeval
+#include <sys/_structs.h>
+
+#ifndef	_TIME_T
+#define	_TIME_T
+typedef	__darwin_time_t	time_t;
+#endif
+
+#ifndef _SUSECONDS_T
+#define _SUSECONDS_T
+typedef __darwin_suseconds_t	suseconds_t;
+#endif
+
+/*
+ * Structure used as a parameter by getitimer(2) and setitimer(2) system
+ * calls.
+ */
+struct	itimerval {
+	struct	timeval it_interval;	/* timer interval */
+	struct	timeval it_value;	/* current value */
+};
+
+/*
+ * Names of the interval timers, and structure
+ * defining a timer setting.
+ */
+#define	ITIMER_REAL	0
+#define	ITIMER_VIRTUAL	1
+#define	ITIMER_PROF	2
+
+/*
+ * Select uses bit masks of file descriptors in longs.  These macros
+ * manipulate such bit fields (the filesystem macros use chars).  The
+ * extra protection here is to permit application redefinition above
+ * the default size.
+ */
+#ifndef	FD_SETSIZE
+#define	FD_SETSIZE	__DARWIN_FD_SETSIZE
+#endif	/* FD_SETSIZE */
+#ifndef FD_SET
+#define	FD_SET(n, p)	__DARWIN_FD_SET(n, p)
+#endif	/* FD_SET */
+#ifndef	FD_CLR
+#define	FD_CLR(n,p)	__DARWIN_FD_CLR(n, p)
+#endif	/* FD_CLR */
+#ifndef FD_ISSET
+#define	FD_ISSET(n, p)	__DARWIN_FD_ISSET(n, p)
+#endif	/* FD_ISSET */
+#ifndef FD_ZERO
+#define	FD_ZERO(p)	__DARWIN_FD_ZERO(p)
+#endif	/* FD_ZERO */
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+
+#ifndef FD_COPY
+#define	FD_COPY(f, t)	__DARWIN_FD_COPY(f, t)
+#endif	/* FD_COPY */
+
+#define	TIMEVAL_TO_TIMESPEC(tv, ts) {					\
+	(ts)->tv_sec = (tv)->tv_sec;					\
+	(ts)->tv_nsec = (tv)->tv_usec * 1000;				\
+}
+#define	TIMESPEC_TO_TIMEVAL(tv, ts) {					\
+	(tv)->tv_sec = (ts)->tv_sec;					\
+	(tv)->tv_usec = (ts)->tv_nsec / 1000;				\
+}
+
+struct timezone {
+	int	tz_minuteswest;	/* minutes west of Greenwich */
+	int	tz_dsttime;	/* type of dst correction */
+};
+#define	DST_NONE	0	/* not on dst */
+#define	DST_USA		1	/* USA style dst */
+#define	DST_AUST	2	/* Australian style dst */
+#define	DST_WET		3	/* Western European dst */
+#define	DST_MET		4	/* Middle European dst */
+#define	DST_EET		5	/* Eastern European dst */
+#define	DST_CAN		6	/* Canada */
+
+/* Operations on timevals. */
+#define	timerclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
+#define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
+#define	timercmp(tvp, uvp, cmp)						\
+	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
+	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
+	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
+#define	timeradd(tvp, uvp, vvp)						\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec >= 1000000) {			\
+			(vvp)->tv_sec++;				\
+			(vvp)->tv_usec -= 1000000;			\
+		}							\
+	} while (0)
+#define	timersub(tvp, uvp, vvp)						\
+	do {								\
+		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
+		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
+		if ((vvp)->tv_usec < 0) {				\
+			(vvp)->tv_sec--;				\
+			(vvp)->tv_usec += 1000000;			\
+		}							\
+	} while (0)
+
+#define timevalcmp(l, r, cmp)   timercmp(l, r, cmp) /* freebsd */
+
+/*
+ * Getkerninfo clock information structure
+ */
+struct clockinfo {
+	int	hz;		/* clock frequency */
+	int	tick;		/* micro-seconds per hz tick */
+	int	tickadj;	/* clock skew rate for adjtime() */
+	int	stathz;		/* statistics clock frequency */
+	int	profhz;		/* profiling clock frequency */
+};
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#include <time.h>
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+__BEGIN_DECLS
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+int	adjtime(const struct timeval *, struct timeval *);
+int	futimes(int, const struct timeval *);
+int	lutimes(const char *, const struct timeval *);
+int	settimeofday(const struct timeval *, const struct timezone *);
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+int	getitimer(int, struct itimerval *);
+int	gettimeofday(struct timeval * __restrict, void * __restrict);
+
+#include <sys/_select.h>	/* select() prototype */
+
+int	setitimer(int, const struct itimerval * __restrict,
+		struct itimerval * __restrict);
+int	utimes(const char *, const struct timeval *);
+
+__END_DECLS
+
+
+#endif /* !_SYS_TIME_H_ */
diff --git a/i386/include/sys/types.h b/i386/include/sys/types.h
new file mode 100644
index 0000000..01d4f2b
--- /dev/null
+++ b/i386/include/sys/types.h
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
+/*
+ * Copyright (c) 1982, 1986, 1991, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)types.h	8.4 (Berkeley) 1/21/94
+ */
+
+#ifndef _SYS_TYPES_H_
+#define	_SYS_TYPES_H_
+
+#ifndef __ASSEMBLER__
+#include <sys/cdefs.h>
+
+/* Machine type dependent parameters. */
+#include <machine/types.h>
+#include <sys/_types.h>
+#include <machine/endian.h>
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+typedef	unsigned char		u_char;
+typedef	unsigned short		u_short;
+typedef	unsigned int		u_int;
+#ifndef _U_LONG
+typedef	unsigned long		u_long;
+#define _U_LONG
+#endif
+typedef	unsigned short		ushort;		/* Sys V compatibility */
+typedef	unsigned int		uint;		/* Sys V compatibility */
+#endif
+
+typedef	u_int64_t		u_quad_t;	/* quads */
+typedef	int64_t			quad_t;
+typedef	quad_t *		qaddr_t;
+
+typedef	char *			caddr_t;	/* core address */
+typedef	int32_t			daddr_t;	/* disk address */
+
+typedef	u_int32_t		fixpt_t;	/* fixed point number */
+
+
+#ifndef _IN_ADDR_T
+#define _IN_ADDR_T
+typedef	__uint32_t		in_addr_t;	/* base type for internet address */
+#endif
+
+#ifndef _IN_PORT_T
+#define _IN_PORT_T
+typedef	__uint16_t		in_port_t;
+#endif
+
+
+#ifndef _KEY_T
+#define _KEY_T
+typedef	__int32_t		key_t;		/* IPC key (for Sys V IPC) */
+#endif
+
+#ifndef _NLINK_T
+typedef	__uint16_t		nlink_t;	/* link count */
+#define	_NLINK_T
+#endif
+
+typedef	int32_t			segsz_t;	/* segment size */
+typedef	int32_t			swblk_t;	/* swap offset */
+
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+/* Major, minor numbers, dev_t's. */
+#if defined(__cplusplus)
+/*
+ * These lowercase macros tend to match member functions in some C++ code,
+ * so for C++, we must use inline functions instead.
+ */
+
+static inline __int32_t  major(__uint32_t _x)
+{
+	return (__int32_t)(((__uint32_t)_x >> 24) & 0xff);
+}
+
+static inline __int32_t  minor(__uint32_t _x)
+{
+	return (__int32_t)((_x) & 0xffffff);
+}
+#else	/* !__cplusplus */
+
+#define	major(x)	((int32_t)(((u_int32_t)(x) >> 24) & 0xff))
+#define	minor(x)	((int32_t)((x) & 0xffffff))
+
+#endif	/* !__cplusplus */
+#endif	/* !_POSIX_C_SOURCE */
+
+#ifndef	_CLOCK_T
+#define	_CLOCK_T
+typedef	__darwin_clock_t	clock_t;
+#endif
+
+#ifndef _SIZE_T
+#define _SIZE_T
+/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see
+ * _GCC_SIZE_T */
+typedef __darwin_size_t		size_t;
+#endif
+
+#ifndef	_SSIZE_T
+#define	_SSIZE_T
+typedef	__darwin_ssize_t	ssize_t;
+#endif
+
+#ifndef	_TIME_T
+#define	_TIME_T
+typedef	__darwin_time_t		time_t;
+#endif
+
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+/*
+ * This code is present here in order to maintain historical backward
+ * compatability, and is intended to be removed at some point in the
+ * future; please include <sys/select.h> instead.
+ */
+#define __need_fd_set
+#include <sys/_structs.h>
+
+#define	NBBY		__DARWIN_NBBY		/* bits in a byte */
+#define NFDBITS		__DARWIN_NFDBITS	/* bits per mask */
+#define	howmany(x, y)	__DARWIN_howmany(x, y)	/* # y's == x bits? */
+typedef __int32_t	fd_mask;
+
+/*
+ * Select uses bit masks of file descriptors in longs.  These macros
+ * manipulate such bit fields (the filesystem macros use chars).  The
+ * extra protection here is to permit application redefinition above
+ * the default size.
+ */
+#ifndef	FD_SETSIZE
+#define	FD_SETSIZE	__DARWIN_FD_SETSIZE
+#endif /* FD_SETSIZE */
+#ifndef FD_SET
+#define	FD_SET(n, p)	__DARWIN_FD_SET(n, p)
+#endif /* FD_SET */
+#ifndef FD_CLR
+#define	FD_CLR(n, p)	__DARWIN_FD_CLR(n, p)
+#endif /* FD_CLR */
+#ifndef FD_ISSET
+#define	FD_ISSET(n, p)	__DARWIN_FD_ISSET(n, p)
+#endif /* FD_ISSET */
+#ifndef FD_ZERO
+#define	FD_ZERO(p)	__DARWIN_FD_ZERO(p)
+#endif /* FD_ZERO */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifndef FD_COPY
+#define	FD_COPY(f, t)	__DARWIN_FD_COPY(f, t)
+#endif /* FD_COPY */
+#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+
+
+#if defined(__STDC__) && defined(KERNEL)
+/*
+ * Forward structure declarations for function prototypes.  We include the
+ * common structures that cross subsystem boundaries here; others are mostly
+ * used in the same place that the structure is defined.
+ */
+struct	proc;
+struct	pgrp;
+struct	ucred;
+struct	rusage;
+struct	file;
+struct	buf;
+struct	tty;
+struct	uio;
+#endif
+
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#endif /* __ASSEMBLER__ */
+
+
+
+
+#endif /* !_SYS_TYPES_H_ */
diff --git a/i386/include/sys/unistd.h b/i386/include/sys/unistd.h
new file mode 100644
index 0000000..d80b3bb
--- /dev/null
+++ b/i386/include/sys/unistd.h
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
+ */
+
+#ifndef _SYS_UNISTD_H_
+#define	_SYS_UNISTD_H_
+
+#include <sys/cdefs.h>
+
+/*
+ * Although we have saved user/group IDs, we do not use them in setuid
+ * as described in POSIX 1003.1, because the feature does not work for
+ * root.  We use the saved IDs in seteuid/setegid, which are not currently
+ * part of the POSIX 1003.1 specification.
+ */
+#ifdef	_NOT_AVAILABLE
+#define	_POSIX_SAVED_IDS	/* saved set-user-ID and set-group-ID */
+#endif
+
+#define	_POSIX_VERSION		200112L
+#define	_POSIX2_VERSION		200112L
+
+/* execution-time symbolic constants */
+				/* may disable terminal special characters */
+#ifndef _POSIX_VDISABLE
+#define	_POSIX_VDISABLE		((unsigned char)'\377')
+#endif
+
+#define _POSIX_THREAD_KEYS_MAX 128
+
+/* access function */
+#define	F_OK		0	/* test for existence of file */
+#define	X_OK		(1<<0)	/* test for execute or search permission */
+#define	W_OK		(1<<1)	/* test for write permission */
+#define	R_OK		(1<<2)	/* test for read permission */
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+/*
+ * Extended access functions.
+ * Note that we depend on these matching the definitions in sys/kauth.h,
+ * but with the bits shifted left by 8.
+ */
+#define _READ_OK	(1<<9)	/* read file data / read directory */
+#define _WRITE_OK	(1<<10)	/* write file data / add file to directory */
+#define _EXECUTE_OK	(1<<11) /* execute file / search in directory*/
+#define _DELETE_OK	(1<<12)	/* delete file / delete directory */
+#define _APPEND_OK	(1<<13)	/* append to file / add subdirectory to directory */
+#define _RMFILE_OK	(1<<14)	/* - / remove file from directory */
+#define _RATTR_OK	(1<<15)	/* read basic attributes */
+#define _WATTR_OK	(1<<16)	/* write basic attributes */
+#define _REXT_OK	(1<<17)	/* read extended attributes */
+#define _WEXT_OK	(1<<18)	/* write extended attributes */
+#define _RPERM_OK	(1<<19)	/* read permissions */
+#define _WPERM_OK	(1<<20)	/* write permissions */
+#define _CHOWN_OK	(1<<21)	/* change ownership */
+
+#define _ACCESS_EXTENDED_MASK (_READ_OK | _WRITE_OK | _EXECUTE_OK | \
+				_DELETE_OK | _APPEND_OK | \
+				_RMFILE_OK | _REXT_OK | \
+				_WEXT_OK | _RATTR_OK | _WATTR_OK | _RPERM_OK | \
+				_WPERM_OK | _CHOWN_OK)
+#endif
+
+/* whence values for lseek(2) */
+#ifndef SEEK_SET
+#define	SEEK_SET	0	/* set file offset to offset */
+#define	SEEK_CUR	1	/* set file offset to current plus offset */
+#define	SEEK_END	2	/* set file offset to EOF plus offset */
+#endif	/* !SEEK_SET */
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+/* whence values for lseek(2); renamed by POSIX 1003.1 */
+#define	L_SET		SEEK_SET
+#define	L_INCR		SEEK_CUR
+#define	L_XTND		SEEK_END
+#endif
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+struct accessx_descriptor {
+	unsigned int ad_name_offset;
+	int ad_flags;
+	int ad_pad[2];
+};
+#define ACCESSX_MAX_DESCRIPTORS	100
+#define ACCESSX_MAX_TABLESIZE	(16 * 1024)
+#endif
+
+/* configurable pathname variables */
+#define	_PC_LINK_MAX		 1
+#define	_PC_MAX_CANON		 2
+#define	_PC_MAX_INPUT		 3
+#define	_PC_NAME_MAX		 4
+#define	_PC_PATH_MAX		 5
+#define	_PC_PIPE_BUF		 6
+#define	_PC_CHOWN_RESTRICTED	 7
+#define	_PC_NO_TRUNC		 8
+#define	_PC_VDISABLE		 9
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	_PC_NAME_CHARS_MAX	 10
+#define	_PC_CASE_SENSITIVE		 11
+#define	_PC_CASE_PRESERVING		 12
+#define _PC_EXTENDED_SECURITY_NP        13
+#define _PC_AUTH_OPAQUE_NP      14
+#endif
+
+#define	_PC_2_SYMLINKS		15	/* Symlink supported in directory */
+#define	_PC_ALLOC_SIZE_MIN	16	/* Minimum storage actually allocated */
+#define	_PC_ASYNC_IO		17	/* Async I/O [AIO] supported? */
+#define	_PC_FILESIZEBITS	18	/* # of bits to represent file size */
+#define	_PC_PRIO_IO		19	/* Priority I/O [PIO] supported? */
+#define	_PC_REC_INCR_XFER_SIZE	20	/* Recommended increment for next two */
+#define	_PC_REC_MAX_XFER_SIZE	21	/* Recommended max file transfer size */
+#define	_PC_REC_MIN_XFER_SIZE	22	/* Recommended min file transfer size */
+#define	_PC_REC_XFER_ALIGN	23	/* Recommended buffer alignment */
+#define	_PC_SYMLINK_MAX		24	/* Max # of bytes in symlink name */
+#define	_PC_SYNC_IO		25	/* Sync I/O [SIO] supported? */
+
+/* configurable system strings */
+#define	_CS_PATH		 1
+
+#endif /* !_SYS_UNISTD_H_ */
diff --git a/i386/include/sys/vnode.h b/i386/include/sys/vnode.h
new file mode 100644
index 0000000..9e1a0c7
--- /dev/null
+++ b/i386/include/sys/vnode.h
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)vnode.h	8.17 (Berkeley) 5/20/95
+ */
+ 
+#ifndef _VNODE_H_
+#define _VNODE_H_
+
+#include <sys/appleapiopts.h>
+#include <sys/cdefs.h>
+
+/*
+ * The vnode is the focus of all file activity in UNIX.  There is a
+ * unique vnode allocated for each active file, each current directory,
+ * each mounted-on file, text file, and the root.
+ */
+
+/*
+ * Vnode types.  VNON means no type.
+ */
+enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD, VSTR,
+			  VCPLX };
+
+/*
+ * Vnode tag types.
+ * These are for the benefit of external programs only (e.g., pstat)
+ * and should NEVER be inspected by the kernel.
+ */
+enum vtagtype	{
+	VT_NON, VT_UFS, VT_NFS, VT_MFS, VT_MSDOSFS, VT_LFS, VT_LOFS, VT_FDESC,
+	VT_PORTAL, VT_NULL, VT_UMAP, VT_KERNFS, VT_PROCFS, VT_AFS, VT_ISOFS,
+	VT_UNION, VT_HFS, VT_ZFS, VT_DEVFS, VT_WEBDAV, VT_UDF, VT_AFP,
+	VT_CDDA, VT_CIFS, VT_OTHER};
+
+
+/*
+ * flags for VNOP_BLOCKMAP
+ */
+#define VNODE_READ	0x01
+#define VNODE_WRITE	0x02
+
+
+
+/* flags for VNOP_ALLOCATE */
+#define	PREALLOCATE		0x00000001	/* preallocate allocation blocks */
+#define	ALLOCATECONTIG	0x00000002	/* allocate contigious space */
+#define	ALLOCATEALL		0x00000004	/* allocate all requested space */
+									/* or no space at all */
+#define	FREEREMAINDER	0x00000008	/* deallocate allocated but */
+									/* unfilled blocks */
+#define	ALLOCATEFROMPEOF	0x00000010	/* allocate from the physical eof */
+#define	ALLOCATEFROMVOL		0x00000020	/* allocate from the volume offset */
+
+/*
+ * Token indicating no attribute value yet assigned. some user source uses this
+ */
+#define	VNOVAL	(-1)
+
+
+
+#endif /* !_VNODE_H_ */
diff --git a/i386/include/time.h b/i386/include/time.h
new file mode 100644
index 0000000..2914d40
--- /dev/null
+++ b/i386/include/time.h
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)time.h	8.3 (Berkeley) 1/21/94
+ */
+
+#ifndef _TIME_H_
+#define	_TIME_H_
+
+#include <_types.h>
+
+#define __need_struct_timespec
+#include <_structs.h>
+
+#ifndef NULL
+#define NULL __DARWIN_NULL
+#endif /* ! NULL */
+
+#ifndef	_CLOCK_T
+#define _CLOCK_T
+typedef	__darwin_clock_t	clock_t;
+#endif
+
+#ifndef	_SIZE_T
+#define	_SIZE_T
+typedef	__darwin_size_t		size_t;
+#endif
+
+#ifndef	_TIME_T
+#define	_TIME_T
+typedef	__darwin_time_t		time_t;
+#endif
+
+struct tm {
+	int	tm_sec;		/* seconds after the minute [0-60] */
+	int	tm_min;		/* minutes after the hour [0-59] */
+	int	tm_hour;	/* hours since midnight [0-23] */
+	int	tm_mday;	/* day of the month [1-31] */
+	int	tm_mon;		/* months since January [0-11] */
+	int	tm_year;	/* years since 1900 */
+	int	tm_wday;	/* days since Sunday [0-6] */
+	int	tm_yday;	/* days since January 1 [0-365] */
+	int	tm_isdst;	/* Daylight Savings Time flag */
+	long	tm_gmtoff;	/* offset from CUT in seconds */
+	char	*tm_zone;	/* timezone abbreviation */
+};
+
+#if __DARWIN_UNIX03
+#define CLOCKS_PER_SEC  1000000	/* [XSI] */
+#else /* !__DARWIN_UNIX03 */
+#include <machine/_limits.h>	/* Include file containing CLK_TCK. */
+
+#define CLOCKS_PER_SEC  (__DARWIN_CLK_TCK)
+#endif /* __DARWIN_UNIX03 */
+
+#ifndef _ANSI_SOURCE
+extern char *tzname[];
+#endif
+
+extern int getdate_err;
+#if __DARWIN_UNIX03
+//Begin-Libc
+#ifndef LIBC_ALIAS_TIMEZONE
+//End-Libc
+extern long timezone __DARWIN_ALIAS(timezone);
+//Begin-Libc
+#else /* LIBC_ALIAS_TIMEZONE */
+extern long timezone LIBC_ALIAS(timezone);
+#endif /* !LIBC_ALIAS_TIMEZONE */
+//End-Libc
+#endif /* __DARWIN_UNIX03 */
+extern int daylight;
+
+__BEGIN_DECLS
+char *asctime(const struct tm *);
+//Begin-Libc
+#ifndef LIBC_ALIAS_CLOCK
+//End-Libc
+clock_t clock(void) __DARWIN_ALIAS(clock);
+//Begin-Libc
+#else /* LIBC_ALIAS_CLOCK */
+clock_t clock(void) LIBC_ALIAS(clock);
+#endif /* !LIBC_ALIAS_CLOCK */
+//End-Libc
+char *ctime(const time_t *);
+double difftime(time_t, time_t);
+struct tm *getdate(const char *);
+struct tm *gmtime(const time_t *);
+struct tm *localtime(const time_t *);
+//Begin-Libc
+#ifndef LIBC_ALIAS_MKTIME
+//End-Libc
+time_t mktime(struct tm *) __DARWIN_ALIAS(mktime);
+//Begin-Libc
+#else /* LIBC_ALIAS_MKTIME */
+time_t mktime(struct tm *) LIBC_ALIAS(mktime);
+#endif /* !LIBC_ALIAS_MKTIME */
+//End-Libc
+//Begin-Libc
+#ifndef LIBC_ALIAS_STRFTIME
+//End-Libc
+size_t strftime(char * __restrict, size_t, const char * __restrict, const struct tm * __restrict) __DARWIN_ALIAS(strftime);
+//Begin-Libc
+#else /* LIBC_ALIAS_STRFTIME */
+size_t strftime(char * __restrict, size_t, const char * __restrict, const struct tm * __restrict) LIBC_ALIAS(strftime);
+#endif /* !LIBC_ALIAS_STRFTIME */
+//End-Libc
+//Begin-Libc
+#ifndef LIBC_ALIAS_STRPTIME
+//End-Libc
+char *strptime(const char * __restrict, const char * __restrict, struct tm * __restrict) __DARWIN_ALIAS(strptime);
+//Begin-Libc
+#else /* LIBC_ALIAS_STRPTIME */
+char *strptime(const char * __restrict, const char * __restrict, struct tm * __restrict) LIBC_ALIAS(strptime);
+#endif /* !LIBC_ALIAS_STRPTIME */
+//End-Libc
+time_t time(time_t *);
+
+#ifndef _ANSI_SOURCE
+void tzset(void);
+#endif /* not ANSI */
+
+/* [TSF] Thread safe functions */
+char *asctime_r(const struct tm * __restrict, char * __restrict);
+char *ctime_r(const time_t *, char *);
+struct tm *gmtime_r(const time_t * __restrict, struct tm * __restrict);
+struct tm *localtime_r(const time_t * __restrict, struct tm * __restrict);
+
+#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
+time_t posix2time(time_t);
+#if !__DARWIN_UNIX03
+char *timezone(int, int);
+#endif /* !__DARWIN_UNIX03 */
+void tzsetwall(void);
+time_t time2posix(time_t);
+time_t timelocal(struct tm * const);
+time_t timegm(struct tm * const);
+#endif /* neither ANSI nor POSIX */
+
+#if !defined(_ANSI_SOURCE)
+//Begin-Libc
+#ifndef LIBC_ALIAS_NANOSLEEP
+//End-Libc
+int nanosleep(const struct timespec *, struct timespec *) __DARWIN_ALIAS_C(nanosleep);
+//Begin-Libc
+#else /* LIBC_ALIAS_NANOSLEEP */
+int nanosleep(const struct timespec *, struct timespec *) LIBC_ALIAS_C(nanosleep);
+#endif /* !LIBC_ALIAS_NANOSLEEP */
+//End-Libc
+#endif
+__END_DECLS
+
+#ifdef _USE_EXTENDED_LOCALES_
+#include <xlocale/_time.h>
+#endif /* _USE_EXTENDED_LOCALES_ */
+
+#endif /* !_TIME_H_ */
diff --git a/i386/include/unistd.h b/i386/include/unistd.h
new file mode 100644
index 0000000..a15eee6
--- /dev/null
+++ b/i386/include/unistd.h
@@ -0,0 +1,623 @@
+/*
+ * Copyright (c) 2000, 2002-2006, 2008, 2009 Apple Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*-
+ * Copyright (c) 1998-1999 Apple Computer, Inc. All Rights Reserved
+ * Copyright (c) 1991, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
+ *
+ *  Copyright (c)  1998 Apple Compter, Inc.
+ *  All Rights Reserved
+ */
+
+/* History:
+        7/14/99 EKN at Apple fixed getdirentriesattr from getdirentryattr
+        3/26/98 CHW at Apple added real interface to searchfs call
+  	3/5/98  CHW at Apple added hfs semantic system calls headers
+*/
+
+#ifndef _UNISTD_H_
+#define	_UNISTD_H_
+
+#include <_types.h>
+#include <sys/unistd.h>
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifndef _DEV_T
+#define	_DEV_T
+typedef __darwin_dev_t		dev_t;
+#endif
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
+
+#ifndef _GID_T
+#define	_GID_T
+typedef __darwin_gid_t		gid_t;
+#endif
+
+#ifndef _INTPTR_T
+#define	_INTPTR_T
+typedef __darwin_intptr_t	intptr_t;
+#endif
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifndef _MODE_T
+#define	_MODE_T
+typedef __darwin_mode_t		mode_t;
+#endif
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
+
+#ifndef _OFF_T
+#define	_OFF_T
+typedef __darwin_off_t		off_t;
+#endif
+
+#ifndef _PID_T
+#define	_PID_T
+typedef __darwin_pid_t		pid_t;
+#endif
+
+#ifndef _SIZE_T
+#define	_SIZE_T
+/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
+ * _GCC_SIZE_T */
+typedef __darwin_size_t		size_t;
+#endif
+
+#ifndef	_SSIZE_T
+#define	_SSIZE_T
+typedef	__darwin_ssize_t	ssize_t;
+#endif
+
+#ifndef _UID_T
+#define	_UID_T
+typedef __darwin_uid_t		uid_t;	/* user id 	*/
+#endif
+
+#ifndef _USECONDS_T
+#define	_USECONDS_T
+typedef __darwin_useconds_t	useconds_t;
+#endif
+
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifndef _UUID_T
+#define	_UUID_T
+typedef __darwin_uuid_t		uuid_t;
+#endif /* _UUID_T */
+#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
+
+#define	 STDIN_FILENO	0	/* standard input file descriptor */
+#define	STDOUT_FILENO	1	/* standard output file descriptor */
+#define	STDERR_FILENO	2	/* standard error file descriptor */
+
+#ifndef NULL
+#define	NULL __DARWIN_NULL
+#endif /* ! NULL */
+
+/* Version test macros */
+/* _POSIX_VERSION and _POSIX2_VERSION from sys/unistd.h */
+#define	_XOPEN_VERSION			600		/* [XSI] */
+#define	_XOPEN_XCU_VERSION		4		/* Older standard */
+
+
+/* Please keep this list in the same order as the applicable standard */
+#define	_POSIX_ADVISORY_INFO		(-1)		/* [ADV] */
+#define	_POSIX_ASYNCHRONOUS_IO		(-1)		/* [AIO] */
+#define	_POSIX_BARRIERS			(-1)		/* [BAR] */
+#define	_POSIX_CHOWN_RESTRICTED		200112L
+#define	_POSIX_CLOCK_SELECTION		(-1)		/* [CS] */
+#define	_POSIX_CPUTIME			(-1)		/* [CPT] */
+#define	_POSIX_FSYNC			200112L		/* [FSC] */
+#define	_POSIX_IPV6			200112L
+#define	_POSIX_JOB_CONTROL		200112L
+#define	_POSIX_MAPPED_FILES		200112L		/* [MF] */
+#define	_POSIX_MEMLOCK			(-1)		/* [ML] */
+#define	_POSIX_MEMLOCK_RANGE		(-1)		/* [MR] */
+#define	_POSIX_MEMORY_PROTECTION	200112L		/* [MPR] */
+#define	_POSIX_MESSAGE_PASSING		(-1)		/* [MSG] */
+#define	_POSIX_MONOTONIC_CLOCK		(-1)		/* [MON] */
+#define	_POSIX_NO_TRUNC			200112L
+#define	_POSIX_PRIORITIZED_IO		(-1)		/* [PIO] */
+#define	_POSIX_PRIORITY_SCHEDULING	(-1)		/* [PS] */
+#define	_POSIX_RAW_SOCKETS		(-1)		/* [RS] */
+#define	_POSIX_READER_WRITER_LOCKS	200112L		/* [THR] */
+#define	_POSIX_REALTIME_SIGNALS		(-1)		/* [RTS] */
+#define	_POSIX_REGEXP			200112L
+#define	_POSIX_SAVED_IDS		200112L		/* XXX required */
+#define	_POSIX_SEMAPHORES		(-1)		/* [SEM] */
+#define	_POSIX_SHARED_MEMORY_OBJECTS	(-1)		/* [SHM] */
+#define	_POSIX_SHELL			200112L
+#define	_POSIX_SPAWN			(-1)		/* [SPN] */
+#define	_POSIX_SPIN_LOCKS		(-1)		/* [SPI] */
+#define	_POSIX_SPORADIC_SERVER		(-1)		/* [SS] */
+#define	_POSIX_SYNCHRONIZED_IO		(-1)		/* [SIO] */
+#define	_POSIX_THREAD_ATTR_STACKADDR	200112L		/* [TSA] */
+#define	_POSIX_THREAD_ATTR_STACKSIZE	200112L		/* [TSS] */
+#define	_POSIX_THREAD_CPUTIME		(-1)		/* [TCT] */
+#define	_POSIX_THREAD_PRIO_INHERIT	(-1)		/* [TPI] */
+#define	_POSIX_THREAD_PRIO_PROTECT	(-1)		/* [TPP] */
+#define	_POSIX_THREAD_PRIORITY_SCHEDULING	(-1)	/* [TPS] */
+#define	_POSIX_THREAD_PROCESS_SHARED	200112L		/* [TSH] */
+#define	_POSIX_THREAD_SAFE_FUNCTIONS	200112L		/* [TSF] */
+#define	_POSIX_THREAD_SPORADIC_SERVER	(-1)		/* [TSP] */
+#define	_POSIX_THREADS			200112L		/* [THR] */
+#define	_POSIX_TIMEOUTS			(-1)		/* [TMO] */
+#define	_POSIX_TIMERS			(-1)		/* [TMR] */
+#define	_POSIX_TRACE			(-1)		/* [TRC] */
+#define	_POSIX_TRACE_EVENT_FILTER	(-1)		/* [TEF] */
+#define	_POSIX_TRACE_INHERIT		(-1)		/* [TRI] */
+#define	_POSIX_TRACE_LOG		(-1)		/* [TRL] */
+#define	_POSIX_TYPED_MEMORY_OBJECTS	(-1)		/* [TYM] */
+#ifndef _POSIX_VDISABLE
+#define	_POSIX_VDISABLE			0xff		/* same as sys/termios.h */
+#endif /* _POSIX_VDISABLE */
+
+#define	_POSIX2_C_BIND			200112L
+#define	_POSIX2_C_DEV			200112L		/* c99 command */
+#define	_POSIX2_CHAR_TERM		200112L
+#define	_POSIX2_FORT_DEV		(-1)		/* fort77 command */
+#define	_POSIX2_FORT_RUN		200112L
+#define	_POSIX2_LOCALEDEF		200112L		/* localedef command */
+#define	_POSIX2_PBS			(-1)
+#define	_POSIX2_PBS_ACCOUNTING		(-1)
+#define	_POSIX2_PBS_CHECKPOINT		(-1)
+#define	_POSIX2_PBS_LOCATE		(-1)
+#define	_POSIX2_PBS_MESSAGE		(-1)
+#define	_POSIX2_PBS_TRACK		(-1)
+#define	_POSIX2_SW_DEV			200112L
+#define	_POSIX2_UPE			200112L	/* XXXX no fc, newgrp, tabs */
+
+#define	_V6_ILP32_OFF32			(-1)
+#define	_V6_ILP32_OFFBIG		(1)
+#define	_V6_LP64_OFF64			(-1)
+#define	_V6_LPBIG_OFFBIG		(-1)
+
+#define	_XBS5_ILP32_OFF32		_V6_ILP32_OFF32		/* legacy */
+#define	_XBS5_ILP32_OFFBIG		_V6_ILP32_OFFBIG	/* legacy */
+#define	_XBS5_LP64_OFF64		_V6_LP64_OFF64		/* legacy */
+#define	_XBS5_LPBIG_OFFBIG		_V6_LPBIG_OFFBIG	/* legacy */
+
+#define	_XOPEN_CRYPT			(1)
+#define	_XOPEN_ENH_I18N			(1)		/* XXX required */
+#define	_XOPEN_LEGACY			(-1)	/* no ftime gcvt, wcswcs */
+#define	_XOPEN_REALTIME			(-1)	/* no q'ed signals, mq_* */
+#define	_XOPEN_REALTIME_THREADS		(-1)	/* no posix_spawn, et. al. */
+#define	_XOPEN_SHM			(1)
+#define	_XOPEN_STREAMS			(-1)
+#define	_XOPEN_UNIX			(1)
+
+
+#define	F_ULOCK         0      /* unlock locked section */
+#define	F_LOCK          1      /* lock a section for exclusive use */
+#define	F_TLOCK         2      /* test and lock a section for exclusive use */
+#define	F_TEST          3      /* test a section for locks by other procs */
+
+/* configurable system variables */
+#define	_SC_ARG_MAX			 1
+#define	_SC_CHILD_MAX			 2
+#define	_SC_CLK_TCK			 3
+#define	_SC_NGROUPS_MAX			 4
+#define	_SC_OPEN_MAX			 5
+#define	_SC_JOB_CONTROL			 6
+#define	_SC_SAVED_IDS			 7
+#define	_SC_VERSION			 8
+#define	_SC_BC_BASE_MAX			 9
+#define	_SC_BC_DIM_MAX			10
+#define	_SC_BC_SCALE_MAX		11
+#define	_SC_BC_STRING_MAX		12
+#define	_SC_COLL_WEIGHTS_MAX		13
+#define	_SC_EXPR_NEST_MAX		14
+#define	_SC_LINE_MAX			15
+#define	_SC_RE_DUP_MAX			16
+#define	_SC_2_VERSION			17
+#define	_SC_2_C_BIND			18
+#define	_SC_2_C_DEV			19
+#define	_SC_2_CHAR_TERM			20
+#define	_SC_2_FORT_DEV			21
+#define	_SC_2_FORT_RUN			22
+#define	_SC_2_LOCALEDEF			23
+#define	_SC_2_SW_DEV			24
+#define	_SC_2_UPE			25
+#define	_SC_STREAM_MAX			26
+#define	_SC_TZNAME_MAX			27
+#define	_SC_ASYNCHRONOUS_IO		28
+#define	_SC_PAGESIZE			29
+#define	_SC_MEMLOCK			30
+#define	_SC_MEMLOCK_RANGE		31
+#define	_SC_MEMORY_PROTECTION		32
+#define	_SC_MESSAGE_PASSING		33
+#define	_SC_PRIORITIZED_IO		34
+#define	_SC_PRIORITY_SCHEDULING		35
+#define	_SC_REALTIME_SIGNALS		36
+#define	_SC_SEMAPHORES			37
+#define	_SC_FSYNC			38
+#define	_SC_SHARED_MEMORY_OBJECTS 	39
+#define	_SC_SYNCHRONIZED_IO		40
+#define	_SC_TIMERS			41
+#define	_SC_AIO_LISTIO_MAX		42
+#define	_SC_AIO_MAX			43
+#define	_SC_AIO_PRIO_DELTA_MAX		44
+#define	_SC_DELAYTIMER_MAX		45
+#define	_SC_MQ_OPEN_MAX			46
+#define	_SC_MAPPED_FILES		47	/* swap _SC_PAGESIZE vs. BSD */
+#define	_SC_RTSIG_MAX			48
+#define	_SC_SEM_NSEMS_MAX		49
+#define	_SC_SEM_VALUE_MAX		50
+#define	_SC_SIGQUEUE_MAX		51
+#define	_SC_TIMER_MAX			52
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#define	_SC_NPROCESSORS_CONF		57
+#define	_SC_NPROCESSORS_ONLN		58
+#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
+#define	_SC_2_PBS			59
+#define	_SC_2_PBS_ACCOUNTING		60
+#define	_SC_2_PBS_CHECKPOINT		61
+#define	_SC_2_PBS_LOCATE		62
+#define	_SC_2_PBS_MESSAGE		63
+#define	_SC_2_PBS_TRACK			64
+#define	_SC_ADVISORY_INFO		65
+#define	_SC_BARRIERS			66
+#define	_SC_CLOCK_SELECTION		67
+#define	_SC_CPUTIME			68
+#define	_SC_FILE_LOCKING		69
+#define	_SC_GETGR_R_SIZE_MAX		70
+#define	_SC_GETPW_R_SIZE_MAX		71
+#define	_SC_HOST_NAME_MAX		72
+#define	_SC_LOGIN_NAME_MAX		73
+#define	_SC_MONOTONIC_CLOCK		74
+#define	_SC_MQ_PRIO_MAX			75
+#define	_SC_READER_WRITER_LOCKS		76
+#define	_SC_REGEXP			77
+#define	_SC_SHELL			78
+#define	_SC_SPAWN			79
+#define	_SC_SPIN_LOCKS			80
+#define	_SC_SPORADIC_SERVER		81
+#define	_SC_THREAD_ATTR_STACKADDR	82
+#define	_SC_THREAD_ATTR_STACKSIZE	83
+#define	_SC_THREAD_CPUTIME		84
+#define	_SC_THREAD_DESTRUCTOR_ITERATIONS 85
+#define	_SC_THREAD_KEYS_MAX		86
+#define	_SC_THREAD_PRIO_INHERIT		87
+#define	_SC_THREAD_PRIO_PROTECT		88
+#define	_SC_THREAD_PRIORITY_SCHEDULING	89
+#define	_SC_THREAD_PROCESS_SHARED	90
+#define	_SC_THREAD_SAFE_FUNCTIONS	91
+#define	_SC_THREAD_SPORADIC_SERVER	92
+#define	_SC_THREAD_STACK_MIN		93
+#define	_SC_THREAD_THREADS_MAX		94
+#define	_SC_TIMEOUTS			95
+#define	_SC_THREADS			96
+#define	_SC_TRACE			97
+#define	_SC_TRACE_EVENT_FILTER		98
+#define	_SC_TRACE_INHERIT		99
+#define	_SC_TRACE_LOG			100
+#define	_SC_TTY_NAME_MAX		101
+#define	_SC_TYPED_MEMORY_OBJECTS	102
+#define	_SC_V6_ILP32_OFF32		103
+#define	_SC_V6_ILP32_OFFBIG		104
+#define	_SC_V6_LP64_OFF64		105
+#define	_SC_V6_LPBIG_OFFBIG		106
+#define	_SC_IPV6			118
+#define	_SC_RAW_SOCKETS			119
+#define	_SC_SYMLOOP_MAX			120
+#define	_SC_ATEXIT_MAX			107
+#define	_SC_IOV_MAX			56
+#define	_SC_PAGE_SIZE			_SC_PAGESIZE
+#define	_SC_XOPEN_CRYPT			108
+#define	_SC_XOPEN_ENH_I18N		109
+#define	_SC_XOPEN_LEGACY		110
+#define	_SC_XOPEN_REALTIME		111
+#define	_SC_XOPEN_REALTIME_THREADS	112
+#define	_SC_XOPEN_SHM			113
+#define	_SC_XOPEN_STREAMS		114
+#define	_SC_XOPEN_UNIX			115
+#define	_SC_XOPEN_VERSION		116
+#define	_SC_XOPEN_XCU_VERSION		121
+#define	_SC_XBS5_ILP32_OFF32		122
+#define	_SC_XBS5_ILP32_OFFBIG		123
+#define	_SC_XBS5_LP64_OFF64		124
+#define	_SC_XBS5_LPBIG_OFFBIG		125
+#define	_SC_SS_REPL_MAX			126
+#define	_SC_TRACE_EVENT_NAME_MAX	127
+#define	_SC_TRACE_NAME_MAX		128
+#define	_SC_TRACE_SYS_MAX		129
+#define	_SC_TRACE_USER_EVENT_MAX	130
+#define	_SC_PASS_MAX			131
+
+#ifndef _CS_PATH	/* XXX temporary #ifdef'ed for <sys/unistd.h> */
+#define	_CS_PATH				1
+#endif
+#define	_CS_POSIX_V6_ILP32_OFF32_CFLAGS		2
+#define	_CS_POSIX_V6_ILP32_OFF32_LDFLAGS	3
+#define	_CS_POSIX_V6_ILP32_OFF32_LIBS		4
+#define	_CS_POSIX_V6_ILP32_OFFBIG_CFLAGS	5
+#define	_CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS	6
+#define	_CS_POSIX_V6_ILP32_OFFBIG_LIBS		7
+#define	_CS_POSIX_V6_LP64_OFF64_CFLAGS		8
+#define	_CS_POSIX_V6_LP64_OFF64_LDFLAGS		9
+#define	_CS_POSIX_V6_LP64_OFF64_LIBS		10
+#define	_CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS	11
+#define	_CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS	12
+#define	_CS_POSIX_V6_LPBIG_OFFBIG_LIBS		13
+#define	_CS_POSIX_V6_WIDTH_RESTRICTED_ENVS	14
+
+/* reserved for compatibility with Issue 5 */
+#define	_CS_XBS5_ILP32_OFF32_CFLAGS		20
+#define	_CS_XBS5_ILP32_OFF32_LDFLAGS		21
+#define	_CS_XBS5_ILP32_OFF32_LIBS		22
+#define	_CS_XBS5_ILP32_OFF32_LINTFLAGS		23
+#define	_CS_XBS5_ILP32_OFFBIG_CFLAGS		24
+#define	_CS_XBS5_ILP32_OFFBIG_LDFLAGS		25
+#define	_CS_XBS5_ILP32_OFFBIG_LIBS		26
+#define	_CS_XBS5_ILP32_OFFBIG_LINTFLAGS		27
+#define	_CS_XBS5_LP64_OFF64_CFLAGS		28
+#define	_CS_XBS5_LP64_OFF64_LDFLAGS		29
+#define	_CS_XBS5_LP64_OFF64_LIBS		30
+#define	_CS_XBS5_LP64_OFF64_LINTFLAGS		31
+#define	_CS_XBS5_LPBIG_OFFBIG_CFLAGS		32
+#define	_CS_XBS5_LPBIG_OFFBIG_LDFLAGS		33
+#define	_CS_XBS5_LPBIG_OFFBIG_LIBS		34
+#define	_CS_XBS5_LPBIG_OFFBIG_LINTFLAGS		35
+
+#define	_CS_DARWIN_USER_DIR			65536
+#define	_CS_DARWIN_USER_TEMP_DIR		65537
+#define	_CS_DARWIN_USER_CACHE_DIR		65538
+
+__BEGIN_DECLS
+
+void	 _exit(int) __dead2;
+int	 access(const char *, int);
+unsigned int
+	 alarm(unsigned int);
+int	 chdir(const char *);
+int	 chown(const char *, uid_t, gid_t);
+int	 close(int) __DARWIN_ALIAS_C(close);
+size_t	 confstr(int, char *, size_t) __DARWIN_ALIAS(confstr);
+char	*crypt(const char *, const char *);
+char	*ctermid(char *);
+int	 dup(int);
+int	 dup2(int, int);
+#if __DARWIN_UNIX03
+void	 encrypt(char *, int) __DARWIN_ALIAS(encrypt);
+#else /* !__DARWIN_UNIX03 */
+int	 encrypt(char *, int);
+#endif /* __DARWIN_UNIX03 */
+int	 execl(const char *, const char *, ...);
+int	 execle(const char *, const char *, ...);
+int	 execlp(const char *, const char *, ...);
+int	 execv(const char *, char * const *);
+int	 execve(const char *, char * const *, char * const *);
+int	 execvp(const char *, char * const *);
+int	 fchown(int, uid_t, gid_t);
+int	 fchdir(int);
+pid_t	 fork(void);
+long	 fpathconf(int, int);
+int	 fsync(int) __DARWIN_ALIAS_C(fsync);
+int	 ftruncate(int, off_t);
+char	*getcwd(char *, size_t);
+gid_t	 getegid(void);
+uid_t	 geteuid(void);
+gid_t	 getgid(void);
+#if defined(_DARWIN_UNLIMITED_GETGROUPS) || defined(_DARWIN_C_SOURCE)
+int	 getgroups(int, gid_t []) __DARWIN_EXTSN(getgroups);
+#else /* !_DARWIN_UNLIMITED_GETGROUPS && !_DARWIN_C_SOURCE */
+int	 getgroups(int, gid_t []);
+#endif /* _DARWIN_UNLIMITED_GETGROUPS || _DARWIN_C_SOURCE */
+long	 gethostid(void);
+int	 gethostname(char *, size_t);
+char	*getlogin(void);
+int	 getlogin_r(char *, size_t);
+int	 getopt(int, char * const [], const char *) __DARWIN_ALIAS(getopt);
+pid_t	 getpgid(pid_t);
+pid_t	 getpgrp(void);
+pid_t	 getpid(void);
+pid_t	 getppid(void);
+pid_t	 getsid(pid_t);
+uid_t	 getuid(void);
+char	*getwd(char *);			/* obsoleted by getcwd() */
+int	 isatty(int);
+int	 lchown(const char *, uid_t, gid_t) __DARWIN_ALIAS(lchown);
+int	 link(const char *, const char *);
+int	 lockf(int, int, off_t) __DARWIN_ALIAS_C(lockf);
+off_t	 lseek(int, off_t, int);
+int	 nice(int) __DARWIN_ALIAS(nice);
+long	 pathconf(const char *, int);
+int	 pause(void) __DARWIN_ALIAS_C(pause);
+int	 pipe(int [2]);
+ssize_t	 pread(int, void *, size_t, off_t) __DARWIN_ALIAS_C(pread);
+ssize_t	 pwrite(int, const void *, size_t, off_t) __DARWIN_ALIAS_C(pwrite);
+ssize_t	 read(int, void *, size_t) __DARWIN_ALIAS_C(read);
+ssize_t  readlink(const char * __restrict, char * __restrict, size_t);
+int	 rmdir(const char *);
+int	 setegid(gid_t);
+int	 seteuid(uid_t);
+int	 setgid(gid_t);
+int	 setpgid(pid_t, pid_t);
+#if __DARWIN_UNIX03
+pid_t	 setpgrp(void) __DARWIN_ALIAS(setpgrp);
+#else /* !__DARWIN_UNIX03 */
+int	 setpgrp(pid_t pid, pid_t pgrp);	/* obsoleted by setpgid() */
+#endif /* __DARWIN_UNIX03 */
+int	 setregid(gid_t, gid_t) __DARWIN_ALIAS(setregid);
+int	 setreuid(uid_t, uid_t) __DARWIN_ALIAS(setreuid);
+pid_t	 setsid(void);
+int	 setuid(uid_t);
+unsigned int
+	 sleep(unsigned int) __DARWIN_ALIAS_C(sleep);
+void     swab(const void * __restrict, void * __restrict, ssize_t);
+int	 symlink(const char *, const char *);
+void	 sync(void);
+long	 sysconf(int);
+pid_t	 tcgetpgrp(int);
+int	 tcsetpgrp(int, pid_t);
+int	 truncate(const char *, off_t);
+char	*ttyname(int);
+#if __DARWIN_UNIX03
+int	 ttyname_r(int, char *, size_t) __DARWIN_ALIAS(ttyname_r);
+#else /* !__DARWIN_UNIX03 */
+char	*ttyname_r(int, char *, size_t);
+#endif /* __DARWIN_UNIX03 */
+useconds_t
+	 ualarm(useconds_t, useconds_t);
+int	 unlink(const char *);
+int	 usleep(useconds_t) __DARWIN_ALIAS_C(usleep);
+pid_t	 vfork(void);
+ssize_t	 write(int, const void *, size_t) __DARWIN_ALIAS_C(write);
+
+extern char *optarg;			/* getopt(3) external variables */
+extern int optind, opterr, optopt;
+
+#if	!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#include <sys/select.h>
+
+void	 _Exit(int) __dead2;
+int	 accessx_np(const struct accessx_descriptor *, size_t, int *, uid_t);
+int	 acct(const char *);
+int	 add_profil(char *, size_t, unsigned long, unsigned int);
+void	*brk(const void *);
+int	 chroot(const char *);
+void	 endusershell(void);
+int	 execvP(const char *, const char *, char * const *);
+char	*fflagstostr(unsigned long);
+int	 getdtablesize(void);
+int	 getdomainname(char *, int);
+int	 getgrouplist(const char *, int, int *, int *);
+int	 gethostuuid(uuid_t, const struct timespec *);
+mode_t	 getmode(const void *, mode_t);
+int	 getpagesize(void) __pure2;
+char	*getpass(const char *);
+int	 getpeereid(int, uid_t *, gid_t *);
+int	 getpgid(pid_t _pid);
+int	 getsgroups_np(int *, uuid_t);
+int	 getsid(pid_t _pid);
+char	*getusershell(void);
+int	 getwgroups_np(int *, uuid_t);
+int	 initgroups(const char *, int);
+int	 iruserok(unsigned long, int, const char *, const char *);
+int	 iruserok_sa(const void *, int, int, const char *, const char *);
+int	 issetugid(void);
+char	*mkdtemp(char *);
+int	 mknod(const char *, mode_t, dev_t);
+int	 mkstemp(char *);
+int	 mkstemps(char *, int);
+char	*mktemp(char *);
+int	 nfssvc(int, void *);
+int	 profil(char *, size_t, unsigned long, unsigned int);
+int	 pthread_setugid_np(uid_t, gid_t);
+int	 pthread_getugid_np( uid_t *, gid_t *);
+int	 rcmd(char **, int, const char *, const char *, const char *, int *);
+int	 rcmd_af(char **, int, const char *, const char *, const char *, int *,
+		int);
+int	 reboot(int);
+int	 revoke(const char *);
+int	 rresvport(int *);
+int	 rresvport_af(int *, int);
+int	 ruserok(const char *, int, const char *, const char *);
+void	*sbrk(int);
+int	 setdomainname(const char *, int);
+int	 setgroups(int, const gid_t *);
+void	 sethostid(long);
+int	 sethostname(const char *, int);
+#if __DARWIN_UNIX03
+void	 setkey(const char *) __DARWIN_ALIAS(setkey);
+#else /* !__DARWIN_UNIX03 */
+int	 setkey(const char *);
+#endif /* __DARWIN_UNIX03 */
+int	 setlogin(const char *);
+void	*setmode(const char *) __DARWIN_ALIAS(setmode);
+int	 setrgid(gid_t);
+int	 setruid(uid_t);
+int	 setsgroups_np(int, const uuid_t);
+void	 setusershell(void);
+int	 setwgroups_np(int, const uuid_t);
+int	 strtofflags(char **, unsigned long *, unsigned long *);
+int	 swapon(const char *);
+int	 syscall(int, ...);
+int	 ttyslot(void);
+int	 undelete(const char *);
+int	 unwhiteout(const char *);
+void	*valloc(size_t);			
+
+extern char *suboptarg;			/* getsubopt(3) external variable */
+int	 getsubopt(char **, char * const *, char **);
+
+/*  HFS & HFS Plus semantics system calls go here */
+#ifdef __LP64__
+int    fgetattrlist(int,void*,void*,size_t,unsigned int);
+int    fsetattrlist(int,void*,void*,size_t,unsigned int);
+int    getattrlist(const char*,void*,void*,size_t,unsigned int) __DARWIN_ALIAS(getattrlist);
+int    setattrlist(const char*,void*,void*,size_t,unsigned int) __DARWIN_ALIAS(setattrlist);
+int exchangedata(const char*,const char*,unsigned int);
+int    getdirentriesattr(int,void*,void*,size_t,unsigned int*,unsigned int*,unsigned int*,unsigned int);
+
+#else /* __LP64__ */
+int	fgetattrlist(int,void*,void*,size_t,unsigned long);
+int	fsetattrlist(int,void*,void*,size_t,unsigned long);
+int	getattrlist(const char*,void*,void*,size_t,unsigned long) __DARWIN_ALIAS(getattrlist);
+int	setattrlist(const char*,void*,void*,size_t,unsigned long) __DARWIN_ALIAS(setattrlist);
+int exchangedata(const char*,const char*,unsigned long);
+int	getdirentriesattr(int,void*,void*,size_t,unsigned long*,unsigned long*,unsigned long*,unsigned long);
+
+#endif /* __LP64__ */
+
+struct fssearchblock;
+struct searchstate;
+
+int	 searchfs(const char *, struct fssearchblock *, unsigned long *, unsigned int, unsigned int, struct searchstate *);
+int	 fsctl(const char *,unsigned long,void*,unsigned int);
+int	 ffsctl(int,unsigned long,void*,unsigned int);
+
+extern int optreset;
+
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+__END_DECLS
+
+#endif /* !_UNISTD_H_ */
diff --git a/i386/include/unwind.h b/i386/include/unwind.h
new file mode 100644
index 0000000..24cb87e
--- /dev/null
+++ b/i386/include/unwind.h
@@ -0,0 +1,245 @@
+/* Exception handling and frame unwind runtime interface routines.
+   Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
+
+   This file is part of GCC.
+
+   GCC 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, or (at your option)
+   any later version.
+
+   GCC 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 GCC; see the file COPYING.  If not, write to the Free
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+
+/* As a special exception, if you include this header file into source
+   files compiled by GCC, this header file does not by itself cause
+   the resulting executable to be covered by the GNU General Public
+   License.  This exception does not however invalidate any other
+   reasons why the executable file might be covered by the GNU General
+   Public License.  */
+
+/* This is derived from the C++ ABI for IA-64.  Where we diverge
+   for cross-architecture compatibility are noted with "@@@".  */
+
+#ifndef _UNWIND_H
+#define _UNWIND_H
+
+#ifndef HIDE_EXPORTS
+#ifdef __GCC__
+#pragma GCC visibility push(default)
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Level 1: Base ABI  */
+
+/* @@@ The IA-64 ABI uses uint64 throughout.  Most places this is
+   inefficient for 32-bit and smaller machines.  */
+typedef unsigned _Unwind_Word __attribute__((__mode__(__word__)));
+typedef signed _Unwind_Sword __attribute__((__mode__(__word__)));
+#if defined(__ia64__) && defined(__hpux__)
+typedef unsigned _Unwind_Ptr __attribute__((__mode__(__word__)));
+#else
+typedef unsigned _Unwind_Ptr __attribute__((__mode__(__pointer__)));
+#endif
+typedef unsigned _Unwind_Internal_Ptr __attribute__((__mode__(__pointer__)));
+
+/* @@@ The IA-64 ABI uses a 64-bit word to identify the producer and
+   consumer of an exception.  We'll go along with this for now even on
+   32-bit machines.  We'll need to provide some other option for
+   16-bit machines and for machines with > 8 bits per byte.  */
+typedef unsigned _Unwind_Exception_Class __attribute__((__mode__(__DI__)));
+
+/* The unwind interface uses reason codes in several contexts to
+   identify the reasons for failures or other actions.  */
+typedef enum
+{
+  _URC_NO_REASON = 0,
+  _URC_FOREIGN_EXCEPTION_CAUGHT = 1,
+  _URC_FATAL_PHASE2_ERROR = 2,
+  _URC_FATAL_PHASE1_ERROR = 3,
+  _URC_NORMAL_STOP = 4,
+  _URC_END_OF_STACK = 5,
+  _URC_HANDLER_FOUND = 6,
+  _URC_INSTALL_CONTEXT = 7,
+  _URC_CONTINUE_UNWIND = 8
+} _Unwind_Reason_Code;
+
+
+/* The unwind interface uses a pointer to an exception header object
+   as its representation of an exception being thrown. In general, the
+   full representation of an exception object is language- and
+   implementation-specific, but it will be prefixed by a header
+   understood by the unwind interface.  */
+
+struct _Unwind_Exception;
+
+typedef void (*_Unwind_Exception_Cleanup_Fn) (_Unwind_Reason_Code,
+					      struct _Unwind_Exception *);
+
+struct _Unwind_Exception
+{
+  _Unwind_Exception_Class exception_class;
+  _Unwind_Exception_Cleanup_Fn exception_cleanup;
+  _Unwind_Word private_1;
+  _Unwind_Word private_2;
+
+  /* @@@ The IA-64 ABI says that this structure must be double-word aligned.
+     Taking that literally does not make much sense generically.  Instead we
+     provide the maximum alignment required by any type for the machine.  */
+} __attribute__((__aligned__));
+
+
+/* The ACTIONS argument to the personality routine is a bitwise OR of one
+   or more of the following constants.  */
+typedef int _Unwind_Action;
+
+#define _UA_SEARCH_PHASE	1
+#define _UA_CLEANUP_PHASE	2
+#define _UA_HANDLER_FRAME	4
+#define _UA_FORCE_UNWIND	8
+#define _UA_END_OF_STACK	16
+
+/* This is an opaque type used to refer to a system-specific data
+   structure used by the system unwinder. This context is created and
+   destroyed by the system, and passed to the personality routine
+   during unwinding.  */
+struct _Unwind_Context;
+
+/* Raise an exception, passing along the given exception object.  */
+extern _Unwind_Reason_Code _Unwind_RaiseException (struct _Unwind_Exception *);
+
+/* Raise an exception for forced unwinding.  */
+
+typedef _Unwind_Reason_Code (*_Unwind_Stop_Fn)
+     (int, _Unwind_Action, _Unwind_Exception_Class,
+      struct _Unwind_Exception *, struct _Unwind_Context *, void *);
+
+extern _Unwind_Reason_Code _Unwind_ForcedUnwind (struct _Unwind_Exception *,
+						 _Unwind_Stop_Fn,
+						 void *);
+
+/* Helper to invoke the exception_cleanup routine.  */
+extern void _Unwind_DeleteException (struct _Unwind_Exception *);
+
+/* Resume propagation of an existing exception.  This is used after
+   e.g. executing cleanup code, and not to implement rethrowing.  */
+extern void _Unwind_Resume (struct _Unwind_Exception *);
+
+/* @@@ Resume propagation of an FORCE_UNWIND exception, or to rethrow
+   a normal exception that was handled.  */
+extern _Unwind_Reason_Code _Unwind_Resume_or_Rethrow (struct _Unwind_Exception *);
+
+/* @@@ Use unwind data to perform a stack backtrace.  The trace callback
+   is called for every stack frame in the call chain, but no cleanup
+   actions are performed.  */
+typedef _Unwind_Reason_Code (*_Unwind_Trace_Fn)
+     (struct _Unwind_Context *, void *);
+
+extern _Unwind_Reason_Code _Unwind_Backtrace (_Unwind_Trace_Fn, void *);
+
+/* These functions are used for communicating information about the unwind
+   context (i.e. the unwind descriptors and the user register state) between
+   the unwind library and the personality routine and landing pad.  Only
+   selected registers maybe manipulated.  */
+
+extern _Unwind_Word _Unwind_GetGR (struct _Unwind_Context *, int);
+extern void _Unwind_SetGR (struct _Unwind_Context *, int, _Unwind_Word);
+
+extern _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *);
+extern _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *);
+extern void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr);
+
+/* @@@ Retrieve the CFA of the given context.  */
+extern _Unwind_Word _Unwind_GetCFA (struct _Unwind_Context *);
+
+extern void *_Unwind_GetLanguageSpecificData (struct _Unwind_Context *);
+
+extern _Unwind_Ptr _Unwind_GetRegionStart (struct _Unwind_Context *);
+
+
+/* The personality routine is the function in the C++ (or other language)
+   runtime library which serves as an interface between the system unwind
+   library and language-specific exception handling semantics.  It is
+   specific to the code fragment described by an unwind info block, and
+   it is always referenced via the pointer in the unwind info block, and
+   hence it has no ABI-specified name.
+
+   Note that this implies that two different C++ implementations can
+   use different names, and have different contents in the language
+   specific data area.  Moreover, that the language specific data
+   area contains no version info because name of the function invoked
+   provides more effective versioning by detecting at link time the
+   lack of code to handle the different data format.  */
+
+typedef _Unwind_Reason_Code (*_Unwind_Personality_Fn)
+     (int, _Unwind_Action, _Unwind_Exception_Class,
+      struct _Unwind_Exception *, struct _Unwind_Context *);
+
+/* @@@ The following alternate entry points are for setjmp/longjmp
+   based unwinding.  */
+
+struct SjLj_Function_Context;
+extern void _Unwind_SjLj_Register (struct SjLj_Function_Context *);
+extern void _Unwind_SjLj_Unregister (struct SjLj_Function_Context *);
+
+extern _Unwind_Reason_Code _Unwind_SjLj_RaiseException
+     (struct _Unwind_Exception *);
+extern _Unwind_Reason_Code _Unwind_SjLj_ForcedUnwind
+     (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *);
+extern void _Unwind_SjLj_Resume (struct _Unwind_Exception *);
+extern _Unwind_Reason_Code _Unwind_SjLj_Resume_or_Rethrow (struct _Unwind_Exception *);
+
+/* @@@ The following provide access to the base addresses for text
+   and data-relative addressing in the LDSA.  In order to stay link
+   compatible with the standard ABI for IA-64, we inline these.  */
+
+#ifdef __ia64__
+#include <stdlib.h>
+
+static inline _Unwind_Ptr
+_Unwind_GetDataRelBase (struct _Unwind_Context *_C)
+{
+  /* The GP is stored in R1.  */
+  return _Unwind_GetGR (_C, 1);
+}
+
+static inline _Unwind_Ptr
+_Unwind_GetTextRelBase (struct _Unwind_Context *_C __attribute__ ((__unused__)))
+{
+  abort ();
+  return 0;
+}
+
+/* @@@ Retrieve the Backing Store Pointer of the given context.  */
+extern _Unwind_Word _Unwind_GetBSP (struct _Unwind_Context *);
+#else
+extern _Unwind_Ptr _Unwind_GetDataRelBase (struct _Unwind_Context *);
+extern _Unwind_Ptr _Unwind_GetTextRelBase (struct _Unwind_Context *);
+#endif
+
+/* @@@ Given an address, return the entry point of the function that
+   contains it.  */
+extern void * _Unwind_FindEnclosingFunction (void *pc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifndef HIDE_EXPORTS
+#ifdef __GCC__
+#pragma GCC visibility pop
+#endif
+#endif
+
+#endif /* unwind.h */
diff --git a/i386/libsa/Makefile b/i386/libsa/Makefile
index 2b0069d..9085a72 100644
--- a/i386/libsa/Makefile
+++ b/i386/libsa/Makefile
@@ -5,9 +5,9 @@
 #
 #			- Major cleanup (PikerAlpha, October 2012).
 #			- Output added for rm/ar/ranlib actions (PikerAlpha, November 2012).
+#			- Enabled clang compilation (dgsga,PikerAlpha, November 2012. Credits to Evan Lojewski for original work).
 #
 
-
 include ../MakePaths.dir
 
 UTILDIR = ../util
@@ -17,8 +17,8 @@ OPTIM = -Os -Oz
 CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
 		-fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \
 		-DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
-		-mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
-		-march=pentium4 -msse2 -mfpmath=sse -msoft-float
+		-fno-stack-protector \
+		-march=pentium4 -msse2 -msoft-float
 
 INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSAIODIR)
 
@@ -33,10 +33,10 @@ DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 $(MAKEGOAL): $(DIRS_NEEDED) $(LIBS)
 
 $(LIBS): $(SA_OBJS)
-	@echo "\t[RM] $(SYMROOT)/$@"
+	@echo "\t[RM] $@"
 	@rm -f $(SYMROOT)/$@
 	@echo "\t[AR] $@"
-	@ar q $(SYMROOT)/$@ $^ &> /dev/null
+	@ar qc $(SYMROOT)/$@ $^ &> /dev/null
 	@echo "\t[RANLIB] $@"
 	@ranlib $(SYMROOT)/$@
 
diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index 3e13d49..7a8b670 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -8,6 +8,7 @@
 #			- Static data selectors added (PikerAlpha, October 2012).
 #			- STATIC_DATA_FILENAME added (PikerAlpha, October 2012).
 #			- Output added for rm/ar/ranlib actions (PikerAlpha, November 2012).
+#			- Enabled clang compilation (dgsga, PikerAlpha, November 2012. Credits to Evan Lojewski for original work).
 #
 
 include ../MakePaths.dir
@@ -29,8 +30,8 @@ CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost \
     -DEFI_DATA_FILE=../config/$(MAKE_EFI_DATA_FILE) \
     -DSMBIOS_DATA_FILE=../config/$(MAKE_SMBIOS_DATA_FILE) \
     -fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \
-    -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
-    -march=pentium4 -msse2 -mfpmath=sse -msoft-float
+    -fno-stack-protector \
+    -march=pentium4 -msse2 -msoft-float
 
 INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR)
 
@@ -51,10 +52,10 @@ DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 $(MAKEGOAL): $(DIRS_NEEDED) libsaio.h $(LIBS)
 
 $(LIBS): $(SAIO_OBJS)
-	@echo "\t[RM] $(SYMROOT)/$@"
+	@echo "\t[RM] $@"
 	@rm -f $@
 	@echo "\t[AR] $@"
-	@ar q $(SYMROOT)/$@ $^ &> /dev/null
+	@ar qc $(SYMROOT)/$@ $^ &> /dev/null
 	@echo "\t[RANLIB] $@"
 	@ranlib $(SYMROOT)/$@
 
diff --git a/i386/libsaio/smbios/static_data.h b/i386/libsaio/smbios/static_data.h
index dc4f429..85823ee 100755
--- a/i386/libsaio/smbios/static_data.h
+++ b/i386/libsaio/smbios/static_data.h
@@ -17,7 +17,7 @@
 	#include "essentials.h"
 
 	int tableLength = 0;
-	long fileSize = 0;
+	//long fileSize = 0; ***unused variable
 
 	#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
 		char dirSpec[32] = "";
diff --git a/i386/libsaio/stringTable.c b/i386/libsaio/stringTable.c
index fe725ad..73e55e0 100755
--- a/i386/libsaio/stringTable.c
+++ b/i386/libsaio/stringTable.c
@@ -316,23 +316,23 @@ long ParseXMLFile(char * buffer, TagPtr * dict)
 
 int loadSystemConfig(config_file_t *config)
 {
-	char path[80] = ""; // Long enough for the longest (default) path.
+	char *path = malloc(80); // Long enough for the longest (default) path.
 	static char * dirspec[] = {
-
+        
 #if LION_RECOVERY_SUPPORT
 		"com.apple.recovery.boot",
 #endif
-
+        
 #if LION_INSTALL_SUPPORT
-		".IABootFiles", 
+		".IABootFiles",
 		"OS X Install Data",
 		"Mac OS X Install Data",
 #endif
 		"Library/Preferences/SystemConfiguration" // The default.
-
+        
 #if APPLE_RAID_SUPPORT
 		/*
-		 * This is a temporarily change to test RAID support, but it 
+		 * This is a temporarily change to test RAID support, but it
 		 * will be rewritten right after Bryan confirms that it works.
 		 */
 		,
@@ -341,27 +341,27 @@ int loadSystemConfig(config_file_t *config)
 		"com.apple.boot.S/Library/Preferences/SystemConfiguration"
 #endif
 	};
-
+    
 	int i, fd;
-
+    
 	for (i = 0; i < sizeof(dirspec) / sizeof(dirspec[0]); i++)
 	{
 		sprintf(path, "/%s/%s", dirspec[i], "com.apple.Boot.plist");
-
+        
 		if ((fd = open(path, 0)) >= 0)
 		{
-			// IO_CONFIG_DATA_SIZE is defined as 4096 in bios.h and which should 
+			// IO_CONFIG_DATA_SIZE is defined as 4096 in bios.h and which should
 			// be sufficient enough for RevoBoot (size was 4K for years already).
 			read(fd, config->plist, IO_CONFIG_DATA_SIZE);
 			close(fd);
-
+            
 			// Build XML dictionary.
 			ParseXMLFile(config->plist, &config->dictionary);
-
+            
 			return 0;
 		}
 	}
-
+    
 	return -1;
 }
 
diff --git a/i386/util/Makefile b/i386/util/Makefile
index e4ccd5f..714a6f4 100644
--- a/i386/util/Makefile
+++ b/i386/util/Makefile
@@ -4,6 +4,7 @@
 # Updates:
 #
 #			- Major cleanup (PikerAlpha, October 2012).
+#			- Fixed clang compilation (dgsga, November 2012. Credits to Evan Lojewski for original work).
 #
 
 
@@ -17,15 +18,15 @@ CFLAGS = $(RC_CFLAGS) $(OPTIM) -Wmost -Werror -g
 LDFLAGS =
 DEFINES=
 
-PROGRAMS = md machOconv
+PROGRAMS = machOconv segsize
+OBJS = machOconv.o segsize.o
 
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT) $(LANGDIR)
 
 $(MAKEGOAL): $(DIRS_NEEDED) $(PROGRAMS)
 
-machOconv: machOconv.o
-	@$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) machOconv.o
-md:
-	@$(CC) -mdynamic-no-pic -Wall -dead_strip -arch i386 -mmacosx-version-min=10.5 md.c -o $(SYMROOT)/md
+$(PROGRAMS): $(OBJS)
+	@echo "\t[CC] $(@F)"
+	@$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) $(OBJROOT)/$(@F).o
 
 include ../MakeInc.dir
diff --git a/i386/util/ld_classic b/i386/util/ld_classic
deleted file mode 100755
index 3d0fd45ed853debab0c6db6b5c05939e25bbd69a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 425120
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
SO8d|DPYe9h0{<6U;J*N5UQ(n0

diff --git a/i386/util/ld_classic.1 b/i386/util/ld_classic.1
deleted file mode 100644
index 49d0311..0000000
--- a/i386/util/ld_classic.1
+++ /dev/null
@@ -1,1823 +0,0 @@
-.TH LD_CLASSIC 1 "August 4, 2006" "Apple Computer, Inc."
-.SH NAME
-ld_classic \- The old Mach object file link editor
-.SH SYNOPSIS
-.B ld_classic
-[
-.I "option \&..."
-] [
-.I "file \&..."
-]
-.SH DESCRIPTION
-The
-.I ld_classic
-command combines several Mach-O (Mach object) files into one by combining like sections
-in like segments from all the object files, resolving external references, and
-searching libraries.  In the simplest case several object
-.I files
-are given, and
-.I ld_classic
-combines them, producing an object file which can either be executed or
-become the input for a further
-.I ld_classic
-run.  (In the latter case, the
-.B \-r
-option must be given to preserve the relocation information.)  Unless an output
-file is specified,
-.I ld_classic
-produces a file named
-.BR a.out .
-This file is made executable only if no errors occurred during the link editing
-and there are no undefined symbols.
-.SH "UNIVERSAL FILE SUPPORT"
-The link editor accepts ``universal'' (multiple-architecture) input files, but
-always creates a ``thin'' (single-architecture), standard Mach-O output file.
-The architecture is specified using the
-.B \-arch
-.I " arch_type"
-option.  If this option is not used,
-.IR ld_classic (1)
-attempts to determine the output architecture by examining the first object
-file encountered on the command line.  If it is a ``thin''
-file, its architecture determines that of the output file.  If the first input
-file is a ``universal'' file, the ``best'' architecture for the host is used.
-(See the explanation of the
-.B \-arch
-option, below.)
-.PP
-The compiler driver
-.IR cc (1)
-handles creating universal executables by calling
-.IR ld_classic (1)
-multiple times and using
-.IR lipo (1)
-to create a ``universal'' file from the results of the
-.IR ld_classic (1)
-executions.
-.SH "OUTPUT FILE LAYOUT"
-.PP
-The object files are loaded in the order in which they are specified on the
-command line.  The segments and the
-sections in those segments will appear in the output file in the order they are
-encountered in the object files being linked.  All zero fill sections will appear
-after all non-zero fill sections in their segments.
-.PP
-Sections created from files with the
-.B \-sectcreate
-option will appear in the output file last.  Section names for sections created
-from files are not allowed to overlap with a section name in the same segment
-as a section coming from an object file.  Sections created from files may be in
-a segment which has sections from object files and if so will be loaded at the
-end of the non-zero fill sections for that segment.
-.PP
-If the option
-.B \-seglinkedit
-is specified, the segment it creates is the last segment in the output file.
-.PP
-The address of each segment can be specified with
-.B \-segaddr,
-which takes the segment's name as an argument.
-The address of the first segment can alternatively be specified using
-.B \-seg1addr,
-in which case a segment name is not used.
-Segments that do not have a specified
-address will be assigned addresses in the order in which they appear
-in the output file.  A segment's address will be assigned
-based on the ending address of the previous segment.
-If the address of the
-first segment has not been specified by name,
-its assigned address will be
-the specified (via
-.BR \-seg1addr )
-or default first segment address.
-If neither flag is used to specify the first segment's address, its
-default address is zero
-for all formats except the demand-paged executable format
-.SM (MH_EXECUTE),
-in which case the default first address is the value of the segment alignment.
-.PP
-For demand-paged executable format
-.SM (MH_EXECUTE)
-output files,
-if none of the segments' addresses covers address zero through
-the value of the segment alignment, a segment with no access protection
-will be created to cover those addresses.  This segment, named
-.SM "``_\|_PAGEZERO'',"
-is created so that any attempt to dereference a NULL pointer will cause a
-memory exception.
-.PP
-The entry point of the output file is the beginning of
-the first section in the first segment (unless the
-.B \-e
-option is specified).
-.SH STATIC ARCHIVE LIBRARIES
-.PP
-.I ld_classic
-supports two types of libraries: static archive libraries and dynamic shared
-libraries.  Searching for undefined symbols is performed differently for dynamic
-shared libraries than it is for static archive libraries.  The searching of
-dynamic shared libraries is described later.
-.PP
-When a static archive library is specified as an argument to
-.IR ld_classic ,
-it is searched exactly once, at the
-point it is encountered in the argument list.  Only those members defining an unresolved external
-reference, as defined by the static archive library's table of contents,
-are loaded.  To produce the table of contents, all static archive libraries must be processed by
-.IR ranlib (1).
-.PP
-Generally, a static archive library does not have multiple members that define
-the same symbol.  For these types of libraries, the order of the members is not important, so
-the table of contents can be sorted for faster link editing using the
-.B \-s
-option to
-.IR ranlib (1).
-The first member
-of the static archive library is named
-.SM "``\_\^\_.SYMDEF SORTED'',"
-which is understood to be a sorted table of contents.
-.PP
-If the static archive library does have multiple members that define
-the same symbol, the table of contents that
-.IR ranlib (1)
-produces can't be sorted.  Instead, it follows the order in which the members
-appear in the static archive library.  The link editor searches the table of
-contents iteratively, loading members until no further references are
-satisfied.  In the unsorted case, the first member of the static archive
-library is named
-.SM "``\_\^\_.SYMDEF'',"
-which is understood to be a table of contents in
-the order of the archive members.
-.PP
-Static archive library members can also be loaded in response to
-the
-.B \-ObjC
-and
-.B \-all_load
-flags. See their descriptions below.
-
-.SH DYNAMIC SHARED LIBRARIES
-.PP
-When a dynamic shared library or an object file that was linked against a
-dynamic shared library is specified as an argument to
-.IR ld_classic ,
-that library is placed in the dynamic shared library search list. The order of
-the search list is always the same order the libraries were encountered on the
-command line. When linking -flat_namespace, all dynamic libraries that the
-dynamic libraries are dependent upon are added to the end of the search list.
-.PP
-Once the search list is constructed, the static link editor checks for undefined
-symbols by simulating the way the dynamic linker will search for undefined
-symbols at runtime. For each undefined symbol, the static link editor searches
-each library in the search list until it finds a module that defines the symbol.
-With each undefined symbol, the search starts with the first library in the
-list.  This is different than for static archive libraries, where each library
-is searched exactly once for all undefined symbols.
-.PP
-The static link editor simulates dynamic linking as if all the undefined
-symbols are to be bound at program launch time. The dynamic linker actually
-binds undefined symbols as they are encountered during execution instead of at
-program launch. However, the static link editor always produces the same linking
-as the dynamic linker as long as none of the dynamic shared libraries define the
-same symbol. Different linking can occur only when there is more than one
-definition of a symbol and the library modules that contain the definitions for
-that symbol do not define and reference exactly the same symbols.  In this case,
-even different executions of the same program can produce different linking
-because the dynamic linker binds undefined functions as they are called, and
-this affects the order in which undefined symbols are bound.  Because it can
-produce different dynamic linking, using dynamic shared libraries that define
-the same symbols in the same program is strongly discouraged.
-.PP
-If a static archive library appears after a dynamic shared library on the
-command line, the static library is placed in the dynamic library search list
-and is searched as a dynamic library.  In this way, when a dynamic library has
-undefined symbols, it will cause the appropriate members of the static libraries
-to be loaded into the output.  Searching static libraries as dynamic libraries
-can cause problems if the dynamic library later changes to reference symbols
-from the static library that it did not previously reference. In this case when
-the program runs, the dynamic linker will report these symbols as undefined
-because the members for these symbols were not loaded into the output.
-
-.SH TWO-LEVEL AND FLAT NAMESPACES
-.PP
-Two-level and flat namespaces refer to how references to symbols in dynamic
-libraries are resolved to a definition in specific dynamic library.  For
-two-level namespace that resolution is done at static link time when each
-image (program, bundle and shared library) is built.  When a program is using
-images built with two-level namespace there may be different global symbols
-with the same name being used by different images in the program (this is now
-the default).  When a program is using all flat namespace images then only one
-global symbol for each global symbol name is used by all images of the program
-(this was the default in MacOS X 10.0).
-.PP
-When creating an output file with the static link editor that links against
-dynamic libraries, the references to symbols in those libraries can be recorded
-at static link time to bind to a specific library definition (two-level
-namespace) or left to be bound at execution time to the first library in the
-search order of the program (flat namespace).  A program, its dynamic libraries
-and its bundles may each be either two-level or flat namespace images.  The
-dynamic linker will bind each image according to how it was built.
-.PP
-When creating an output file with the static link editor when
-.B \-twolevel_namespace
-is in effect (now the default) all undefined references must be satisfied at
-static link time.  The flags to allow undefined references,
-.BI \-U symbol_name,
-.BI \-undefined " warning"
-and
-.BI \-undefined " suppress"
-can't be used.
-When the environment variable
-.B MACOSX_DEPLOYMENT_TARGET
-is set to
-.B 10.3
-or higher then
-.BI \-undefined " dynamic_lookup"
-can also be used.  The specific library definition recorded
-for each reference is the first library that has a definition as listed on the
-link line.  Listing an umbrella framework implies all of its sub-frameworks,
-sub-umbrellas and sub-libraries.  For any reference to a definition found in
-an umbrella framework's sub-framework, sub-umbrella or sub-library will be
-recorded as coming from the umbrella framework.  Then at execution time the
-dynamic linker will search that umbrella framework's sub-frameworks,
-sub-umbrellas and sub-libraries for those references.
-Also when two-level namespace is in effect only those frameworks listed on the
-link line (and sub-frameworks, sub-umbrellas and sub-libraries of umbrella
-frameworks) are searched.  Other dependent libraries which are not
-sub-frameworks, sub-umbrellas or sub-libraries of umbrella frameworks are not
-searched.
-.RS
-.PP
-When creating bundles (MH_BUNDLE outputs) with the static link editor when
-two-level namespace is in effect (now the default) and the bundle has
-references to symbols
-expected to be defined in the program loading the bundle, then the
-.BI \-bundle_loader " executable"
-must be used.
-.PP
-When creating an output file with the static link editor when
-.B \-flat_namespace
-is in effect (the MacOS X 10.0 default) all undefined references must be
-satisfied at static link time when
-.BI \-undefined " error"
-(the default) is used.  The static
-link editor checks the undefined references by searching all the libraries
-listed on the link line then all dependent libraries.  The undefined symbols
-in the created output file are left to be resolved at execution time by the
-dynamic link editor in the dynamic libraries in the search order of the program.
-
-.SH MULTIPLY DEFINED SYMBOLS
-.PP
-If there are multiply defined symbols in the object files being linked into
-the output file being created this always results in a multiply defined
-symbol error.
-.PP
-When the static link editor links symbols in from a dynamic library that result
-in multiply defined symbols the handling depends on the type of name space of
-output file being created and possibly the type of name space of the dynamic
-library.
-.PP
-When the static link editor is creating a two-level namespace image and a
-there is a multiply defined symbol from dynamic library then that generates a
-multiply defined symbol warning (by default), where the treatment of this
-warning can be changed with the
-.B \-multiply_defined
-flag.
-.PP
-When the static link editor is creating a flat namespace image and a there is
-a multiply defined symbol from dynamic library, if the library is a flat
-namespace image then that generates a multiply defined symbol error.  If the
-library is a two-level namespace image then that generates a multiply defined
-symbol warning (by default), where the treatment of this warning can be changed
-with the
-.B \-multiply_defined
-flag.
-
-.SH "USING THE DYNAMIC LINK EDITOR AND DYNAMIC SHARED LIBRARIES"
-.PP
-The option
-.B \-dynamic
-must be specified in order to use dynamic shared libraries (and any of the features used to implement them) and/or the dynamic link editor.
-To make sure that the output is not using any features that would
-require the dynamic link editor, the flag
-.B \-static
-can be specified.
-Only one of these flags can be specified.
-
-.SH "LINK EDITOR DEFINED SYMBOLS"
-.PP
-There is a group of link editor defined symbols for the
-.SM MH_EXECUTE,
-.SM MH_DYLIB
-and
-.SM MH_PRELOAD
-file types (see the header file <mach-o/ldsyms.h>).  Link editor symbols are
-reserved; it is an error if an input object file defines such a symbol.
-Only those link editor symbols that are referenced by the object file
-appear in the output file's symbol table.
-.PP
-The link editor defined symbol `\_\^\_mh_execute_header'
-(`\_mh_execute_header' in C) is reserved when the output file format is
-.SM MH_EXECUTE.
-This symbol is the address of the Mach header in a Mach-O executable (a
-file of type
-.SM MH_EXECUTE).
-It does not appear in
-any other Mach-O file type.  It can be used to get to the addresses and
-sizes of all the segments and sections in the executable.  This can be done by parsing the headers
-and load commands (see
-.IR Mach-O (5)).
-.PP
-The link editor defined symbol `\_\^\_mh_dylib_header'
-(`\_mh_dylib_header' in C) is reserved when the output file format is
-.SM MH_DYLIB.
-This symbol is the address of the Mach header in a Mach-O dynamic shared library
-(a file of type
-.SM MH_DYLIB)
-and is a private external symbol.
-It does not appear in
-any other Mach-O file type.  It can be used to get to the addresses and
-sizes of all the segments and sections in a dynamic shared library.  The
-addresses, however, must have the value
-.IR _dyld_get_image_vmaddr_slide (3)
-added to them.
-.PP
-The
-.SM MH_PRELOAD
-file type has link editor defined symbols for the
-beginning and ending of each segment, and for the
-beginning and ending of each section within a segment.
-These names are provided for use in a Mach-O preloaded file,
-since it does not have its headers loaded as part of the first segment.
-The names of the symbols for a segment's beginning and end
-have the form: \_\^\_SEGNAME\_\^\_begin and \_\^\_SEGNAME\_\^\_end,
-where \_\^\_SEGNAME is the name of the segment.  Similarly, the symbols for
-a section have the form:
-\_\^\_SEGNAME\_\^\_sectname\_\^\_begin and \_\^\_SEGNAME\_\^\_sectname\_\^\_end,
-where \_\^\_sectname is the name of the section in the segment \_\^\_SEGNAME.
-These symbols' types are those of the section that the names refer to.
-(A symbol that refers to the end of a section actually has, as its value, the beginning address of the next section, but the symbol's type is still that of the section mentioned in the symbol's name.)
-.SH OPTIONS
-.PP
-.I Ld
-understands several options.  Filenames and
-options that refer to libraries (such as
-.B \-l
-and
-.BR \-framework ),
-as well as options that create symbols (such as
-.B \-u
-and
-.BR \-i ),
-are position-dependent: They define the load order and affect what gets
-loaded from libraries.
-Some
-.I ld_classic
-options overlap with compiler options.  If the compiler driver
-.IR cc (1)
-is used to invoke
-.I ld_classic ,
-it maybe necessary to pass the
-.IR ld_classic (1)
-options to
-.IR cc (1)
-using
-.BR \-Wl,\-option,argument1,argument2 .
-
-In this release of the static link editor, 64-bit code is processed by a the new
-link editor /usr/bin/ld.  And it is an error to pass -arch ppc64 or -arch x86_64
-to
-.IR ld_classic (1).
-
-The most common option is:
-.TP
-.BI  \-o " name"
-The output file is named
-.IR name ,
-instead of
-.BR a.out .
-
-.PP
-The following flags are related to architectures:
-.TP
-.BI \-arch " arch_type"
-Specifies the architecture,
-.I arch_type,
-for the output file. ``Universal'' input files that do not contain this
-specified architecture are ignored.  Only one
-.BI \-arch " arch_type"
-can be specified.  See
-.IR arch (3)
-for the currently known
-.IR arch_type s.
-If
-.I " arch_type"
-specifies a certain implementation of an architecture (such as
-.BI \-arch " m68040"
-or
-.BI \-arch " i486"
-), the resulting object file has that specific CPU subtype, and it is an
-error if any input file has a CPU subtype that will not combine to the CPU subtype
-for
-.IR " arch_type" .
-.IP
-The default output file architecture is determined by the first object file to
-be linked.  If it is a ``thin'' (standard Mach-O) file, or a ``universal'' file
-that contains only one architecture, the output file will have the same
-architecture.  Otherwise, if it is a ``universal'' file
-containing an architecture that would execute on the host, then the ``best''
-architecture is used, as defined by what the kernel exec(2) would select.
-Otherwise, it is an error, and a
-.BI \-arch " arch_type"
-must be specified.
-For family architectures (like ppc and i386) the CPU subtype of the linked
-output is the ALL cpusubtype.  For specific CPU subtypes (ppc7400 vs. ppc970),
-the resulting CPU subtype of the linked output is to 'combine' the CPU subtypes.
-The combining is CPU specific and generally results in the minimum CPU subtype
-needed to support all the combined CPU subtypes.
-.TP
-.B \-arch_multiple
-This flag is used by the
-.IR cc (1)
-driver program when it is run with multiple
-.BI \-arch " arch_type"
-flags.  It instructs programs like
-.IR ld_classic (1)
-to precede any displayed message with a line stating
-the program name, in this case
-.IR ld_classic ,
-and the architecture (from the
-.BI \-arch " arch_type"
-flag).  This helps distinguish which architecture the error messages refer to.
-.TP
-.B \-force_cpusubtype_ALL
-The
-.B \-force_cpusubtype_ALL
-flag causes the CPU subtype to remain the
-.SM ALL
-CPU subtype and not to be combined or
-changed.  This flag has precedence over any
-.BI \-arch " arch_type"
-flag for a specific implementation.
-This is the default for all x86 architectures.
-.PP
-The following flags are related to using the dynamic link editor and/or
-dynamic shared libraries (and any of the features used to implement them):
-.TP
-.B \-dynamic
-Allows use of the features associated with dynamic link editor.  The default is
-.B \-dynamic.
-.TP
-.B \-static
-Causes those features associated with dynamic link editor to be treated as
-an error. (The description for the options that will cause an error if you use them in conjunction with
-.B \-static
-are marked with the statement "when
-.B \-dynamic
- is used").
-.TP
-.BI \-read_only_relocs " treatment"
-Specifies how relocation entries in read-only sections are to be treated when
-.B \-dynamic
-is used.
-To get the best possible sharing, the read-only sections should not have any
-relocation entries.
-If they do, the dynamic linker will write on the section.
-Having relocation entries appear in read-only sections is normally avoided by compiling with the option
-.B \-dynamic.
-But in such cases non-converted assembly code
-or objects not compiled with
-.B \-dynamic
-relocation entries will appear in read-only sections.
-The
-.I treatment
-can be:
-.I error,
-.I warning,
-or
-.I suppress.
-Which cause the treatment of relocation entries in read-only sections as either,
-errors, warnings, or suppressed messages.
-The default is to treat these as errors.
-.TP
-.BI \-sect_diff_relocs " treatment"
-Specifies how section difference relocation enries are to be treated when
-.B \-dynamic
-and
-.B \-execute
-are used.
-To get the best possible code generation the compiler should not generate code
-for executables (MH_EXECUTE format outputs) that have any section difference
-relocation entries.  The
-.IR gcc (1)
-compiler has the
-.B \-mdynamic-no-pic
-flag for generating code for executables.  The default treatment is
-.I suppress,
-where no message is printed.  The other treatments are
-.I error
-or
-.I warning.
-This option can also be specified by setting the environment variable
-.SM LD_SECT_DIFF_RELOCS
-to the treatment values.
-.TP
-.BI \-weak_reference_mismatches " treatment"
-Specifies how to treat mismatches of symbol references in the the object files
-being linked. Normally the all the undefined symbol references of the object
-files being linked should be consistent for each undefined symbol.  That is all
-undefined symbols should either be weak or non-weak references. The default
-treatment is
-.I error,
-where the link fails with an error message.  The other treatments are
-.I weak
-or
-.I non-weak,
-which makes mismatched undefined symbol references either weak or non-weak
-in the output, respectively.  Care must be taken when using the treatment
-.I weak
-as the use of the non-weak symbol references in an object file may cause the
-program to crash when the symbol is not present at execution time.
-.TP
-.B \-prebind
-Have the static linker,
-.IR ld_classic (1),
-prebind an executable's or dynamic shared library's undefined symbols to the
-addresses of the dynamic libraries it is being linked with.
-This optimization can only be done if the libraries don't overlap and
-no symbols are overridden.
-When the resulting program is run and the same libraries are used to run the
-program as when the program was linked, the dynamic linker can use the prebound
-addresses.
-If not, the dynamic linker undoes the prebinding and binds normally.
-This option can also be specified by setting the environment variable
-.SM LD_PREBIND.
-If the environment variable
-.SM LD_FORCE_NO_PREBIND
-is set both the option
-.B \-prebind
-.SM LD_PREBIND
-environment variable are ignore and the output is not prebound.
-Or if the environment variable
-.B MACOSX_DEPLOYMENT_TARGET
-is set to 10.4 or greater and the output is not a split a dynamic library the
-output is not prebound.
-.TP
-.B \-noprebind
-Do not have the static linker,
-.IR ld_classic (1),
-prebind the output.  If this is specified the environment variable
-.SM LD_PREBIND
-is ignored.
-.TP
-.B \-prebind_allow_overlap
-Have the static linker,
-.IR ld_classic (1),
-prebind the output even if the addresses of the dynamic libraries it uses
-overlap.  The resulting output can then have
-.IR redo_prebinding (1)
-run on it to fix up the prebinding after the overlapping dynamic libraries
-have been rebuilt.  This option can also be specified by setting the
-environment variable
-.SM LD_PREBIND_ALLOW_OVERLAP.
-.TP
-.B \-prebind_all_twolevel_modules
-Have the static linker,
-.IR ld_classic (1),
-mark all modules from prebound two-level namespace dynamic libraries as used
-by the program even if they are not statically referenced.  This can provide
-improved launch time for programs like Objective-C programs that use symbols
-indirectly through NIB files. This option can also be specified by setting the
-environment variable
-.SM LD_PREBIND_ALL_TWOLEVEL_MODULES.
-.TP
-.B \-noprebind_all_twolevel_modules
-Don't have the static linker,
-.IR ld_classic (1),
-mark all modules from prebound two-level namespace dynamic libraries as used
-by the program.  This flag overrides the setting of the
-environment variable
-.SM LD_PREBIND_ALL_TWOLEVEL_MODULES.
-.TP
-.B \-nofixprebinding
-Have the static linker,
-.IR ld_classic (1),
-mark the executable so that the dynamic linker will never notify the prebinding
-agent if this launched and its prebinding is out of date.  This is used when
-building the prebinding agent itself.
-.PP
-The following flags are related to libraries:
-.TP
-.BI \-l x
-This
-option is an abbreviation for the library name
-.RI `lib x .a',
-where
-.I x
-is a string.
-If
-.B \-dynamic
-is specified the abbreviation for the library name is first search as
-.RI `lib x .dylib'
-and then
-.RI `lib x .a'
-is searched for.
-.I ld_classic
-searches for libraries first in any directories
-specified with
-.B \-L
-options, then in any directories specified in the colon separated set of paths
-in the environment variable LD_LIBRARY_PATH, then the standard directories 
-.BR /lib , 
-.BR /usr/lib , 
-and
-.BR "/usr/local/lib" .
-A library is searched when its name is encountered,
-so the placement of the
-.B  \-l
-flag is significant.  If string
-.I x
-is of the form
-.IR x .o,
-then that file is searched for in the same places, but without prepending
-`lib' or appending `.a' or `.dylib' to the filename.
-.TP
-.BI \-weak-l x
-This is the same as the
-.BI \-l x
-but forces the library and all references to it to be marked as weak imports.
-Care must be taken when using this as the use of the non-weak symbol references
-in an object file may cause the program to crash when the symbol or library is
-not present at execution time.
-.TP
-.BI \-weak_library " file_name_path_to_library"
-This is the same as listing a file name path to a library on the link line
-except that it forces the library and all references to it to be marked as
-weak imports.
-Care must be taken when using this as the use of the non-weak symbol references
-in an object file may cause the program to crash when the symbol or library is
-not present at execution time.
-.TP
-.BI \-L dir
-Add
-.I dir
-to the list of directories in which to search for libraries.
-Directories specified with
-.B \-L
-are searched before the standard directories.
-.TP
-.B \-Z
-Do not search the standard directories when searching for libraries.
-.TP
-.BI "\-syslibroot " rootdir
-Prepend
-.I rootdir
-to the standard directories when searching for libraries or frameworks.
-.TP
-.B \-search_paths_first
-By default when the
-.B \-dynamic
-flag is in effect, the
-.BI \-l x
-and
-.BI \-weak-l x
-options first search for a file of the form
-.RI `lib x .dylib'
-in each directory in the library search path, then a file of the form
-.RI `lib x .a'
-is searched for in the library search paths.
-This option changes it so that in each path
-.RI `lib x .dylib'
-is searched for then
-.RI `lib x .a'
-before the next path in the library search path is searched.
-.TP
-.BI "\-framework " name[,suffix]
-Specifies a framework to link against. Frameworks are dynamic shared libraries,
-but they are stored in different locations, and therefore must be searched for
-differently. When this option is specified,
-.I ld_classic
-searches for framework `\fIname\fR.framework/\fIname\fR'
-first in any directories
-specified with the
-.B \-F
-option, then in the standard framework directories
-.BR /Library/Frameworks ,
-.BR /Network/Library/Frameworks ,
-and
-.BR "/System/Library/Frameworks" .
-The placement of the
-.B \-framework
-option is significant, as it determines when and how the framework is searched.
-If the optional suffix is specified the framework is first searched for the
-name with the suffix and then without.
-.TP
-.BI "\-weak_framework " name[,suffix]
-This is the same as the
-.BI "\-framework " name[,suffix]
-but forces the framework and all references to it to be marked as weak imports.
-Care must be taken when using this as the use of the non-weak symbol references
-in an object file may cause the program to crash when the symbol or framework is
-not present at execution time.
-.TP
-.BI \-F dir
-Add
-.I dir
-to the list of directories in which to search for frameworks.
-Directories specified with
-.B \-F
-are searched before the standard framework directories.
-.TP
-.B \-ObjC
-Loads all members of static archive libraries that define an Objective C class or a category. This option does not apply to dynamic shared libraries.
-.TP
-.B \-all_load
-Loads all members of static archive libraries.
-This option does not apply to dynamic shared
-libraries.
-.TP
-.BI \-dylib_file " install_name:file_name"
-Specifies that a dynamic shared library is in a different location than its standard location. Use this option when you link with a library that is dependent on a dynamic library, and the dynamic library is in a location other than its default location.
-.I install_name
-specifies the path where the library normally resides.
-.I file_name
-specifies the path of the library you want to use instead.
-For example, if you link to a library that depends upon the dynamic library libsys and you have libsys installed in a nondefault location, you would use this option:
-\fB\-dylib_file /lib/libsys_s.A.dylib:/me/lib/libsys_s.A.dylib\fR.
-.TP
-.BI \-executable_path " path_name"
-Specifies that
-.I path_name
-is used to replace
-.I @executable_path
-for dependent libraries.
-
-.PP
-The following options specify the output file format (the file type):
-.TP
-.B "\-execute"
-Produce a Mach-O demand-paged executable format file.  The headers are placed
-in the first segment, and all segments are padded to the segment alignment.
-This has a file type of
-.SM MH_EXECUTE.
-This is the default.  If no segment address is specified at address zero, a
-segment with no protection (no read, write, or execute permission) is created
-at address zero.
-This segment, whose size is that of the segment
-alignment, is named
-.SM ``_\|_PAGEZERO''.
-This option was previously named
-.BR "\-Mach" ,
-which will continue to be recognized.
-.TP
-.B \-object
-Produce a Mach-O file in the relocatable object file format that is
-intended for execution.  This differs from using the
-.B \-r
-option in that it defines common symbols, does not allow undefined symbols and
-does not preserve relocation entries.  This has a file type of
-.SM MH_OBJECT.
-In this format all sections are placed in one unnamed segment with all
-protections (read, write, execute) allowed on that segment.  This is intended
-for extremely small programs that would otherwise be large due to segment
-padding.  In this format, and all
-.SM non-MH_EXECUTE
-formats, the link editor
-defined symbol ``\_\^\_mh_execute_header'' is not defined since the headers are
-not part of the segment.  This format file can't be used with the dynamic
-linker.
-.TP
-.B \-preload
-Produce a Mach-O preloaded executable format file.  The headers are not placed
-in any segment.  All sections are placed in their proper segments and they are
-padded to the segment alignment.  This has a file type of
-.SM MH_PRELOAD.
-This option was previously
-.BR "\-p" ,
-which will continue to be recognized.
-.TP
-.B "\-dylib"
-Produce a Mach-O dynamically linked shared library format file.  The headers are
-placed in the first segment.  All sections are placed in their proper segments
-and they are padded to the segment alignment.  This has a file type of
-.SM MH_DYLIB.
-This option is used by
-.IR libtool (1)
-when its
-.B \-dynamic
-option is specified.
-.TP
-.B "\-bundle"
-Produce a Mach-O bundle format file.  The headers are placed in the first
-segment.  All sections are placed in their proper segments
-and they are padded to the segment alignment.  This has a file type of
-.SM MH_BUNDLE.
-.TP
-.B "\-dylinker"
-Produces a Mach-O dynamic link editor format file.  The headers are placed in the
-first segment.  All sections are placed in their proper segments, and they are
-padded to the segment alignment.  This has a file type of
-.SM MH_DYLINKER.
-.TP
-.B \-fvmlib
-Produce a Mach-O fixed VM shared library format file.  The headers are placed
-in the first segment but the first section in that segment will be placed on
-the next segment alignment boundary in that segment.  All sections are placed
-in their proper segments and they are padded to the segment alignment.
-This has a file type of
-.SM MH_FVMLIB.
-
-.PP
-The following flags affect the contents of the output file:
-.TP
-.B  \-r
-Save the relocation information in the output file
-so that it can be the subject of another
-.I ld_classic
-run.  The resulting file type is a Mach-O relocatable file
-.SM (MH_OBJECT)
-if not otherwise specified.
-This flag also prevents final definitions from being
-given to common symbols,
-and suppresses the `undefined symbol' diagnostics.
-.TP
-.B  \-d
-Force definition of common storage even if the
-.B \-r
-option is present.  This option also forces link editor defined symbols to be defined.
-This option is assumed when there is a dynamic link editor load command in the input
-and
-.B \-r
-is not specified.
-
-.PP
-The following flags support segment specifications:
-.TP
-.BI "\-segalign" " value"
-Specifies the segment alignment.
-.I value
-is a hexadecimal number that must be an integral power of 2.
-The default is the target pagesize (currently 1000 hex for the PowerPC and
-i386).
-.TP
-.BI "\-seg1addr" " addr"
-Specifies the starting address of the first segment in the output file.
-.I addr
-is a hexadecimal number and must be a multiple of the segment alignment.
-This option can also be specified as
-.B "\-image_base."
-.TP
-.BI "\-segaddr" " name addr"
-Specifies the starting address of the segment named
-.I name
-to be
-.I addr.
-The address must be a hexadecimal number that is a multiple of the segment alignment.
-.TP
-.BI "\-segs_read_only_addr" " addr"
-Specifies the starting address of the read-only segments in a dynamic shared
-library.  When this option is used the dynamic shared library is built such
-that the read-only and read-write segments are split into separate address
-ranges.  By default the read-write segments are 256meg (0x10000000) after
-the read-only segments.
-.I addr
-is a hexadecimal number and must be a multiple of the segment alignment.
-.TP
-.BI "\-segs_read_write_addr" " addr"
-Specifies the starting address of the read-write segments in a dynamic shared
-library.  When this option is used the
-.B \-segs_read_only_addr
-must also be used (see above).
-.I addr
-is a hexadecimal number and must be a multiple of the segment alignment.
-.TP
-.BI "\-seg_addr_table" " filename"
-For dynamic shared libraries the
-.B "\-seg1addr"
-or the pair of
-.B "\-segs_read_only_addr"
-and
-.B "\-segs_read_write_addr"
-are specified by an entry in the segment address table in
-.I filename
-that matches the install name of the library.
-The entries in the table are lines containing either a single hex address and an
-install name or two hex addresses and an install name.  In the first form the
-single hex address is used as the
-.B "\-seg1addr".
-In the second form the first address is used as the
-.B "\-segs_read_only_addr"
-address and the second address is used as the
-.B "\-segs_read_write_addr"
-address.
-This option can also be specified by setting the environment variable
-.SM LD_SEG_ADDR_TABLE.
-If the environment variable is set then any
-.BR "\-seg1addr" ,
-.BR "\-segs_read_only_addr" ,
-.B "\-segs_read_write_addr"
-and
-.B "\-seg_addr_table"
-options are ignored and a warning is printed.
-.TP
-.BI "\-seg_addr_table_filename" " pathname"
-Use
-.B pathname
-instead of the install name of the library for matching an entry in the segment
-address table.
-.TP
-.BI "\-segprot" " name max init"
-Specifies the maximum and initial virtual memory protection of the named
-segment,
-.I name,
-to be
-.I max
-and
-.I init
-,respectively.  The values for
-.I max
-and
-.I init
-are any combination of the characters `r' (for read), `w' (for write),
-`x' (for execute) and '\-' (no access).  The default is `rwx' for the maximum
-protection for all segments for PowerPC architecures and `rw` for the all Intel
-architecures.
-The default for the initial protection for all segments is `rw' unless the
-segment contains a section which contains some machine instructions, in which
-case the default for the initial protection is `rwx' (and for Intel
-architecures it also sets the maximum protection to `rwx' in this case).
-The default for the initial protection for the
-.SM "``_\|_TEXT''"
-segment is `rx' (not writable).
-.TP
-.B \-seglinkedit
-Create the link edit segment, named
-.SM "``_\|_LINKEDIT''"
-(this is the default).
-This segment contains all the link edit information (relocation information,
-symbol table, string table, etc.) in the object file.  If the segment protection
-for this segment is not specified, the initial protection is not writable.
-This can only be specified when the output file type is not
-.SM MH_OBJECT
-and
-.SM MH_PRELOAD
-output file types.  To get at the contents of this section, the Mach header
-and load commands must be parsed from the link editor defined symbols like
-`\_\^\_mh_execute_header' (see
-.IR Mach-O (5)).
-.TP
-.B \-noseglinkedit
-Do not create the link edit segment (see
-.B \-seglinkedit
-above).
-.TP
-.BI "\-pagezero_size" " value"
-Specifies the segment size of _\|_PAGEZERO to be of size
-.IR value ,
-where
-.I value
-is a hexadecimal number rounded to the segment alignment.
-The default is the target pagesize (currently, 1000 hexadecimal for the PowerPC
-and for i386).
-.TP
-.BI "\-stack_addr" " value"
-Specifies the initial address of the stack pointer
-.IR value ,
-where
-.I value
-is a hexadecimal number rounded to the segment alignment.
-The default segment alignment is the target pagesize (currently, 1000
-hexadecimal for the PowerPC and for i386).
-If
-.B \-stack_size
-is specified and
-.B \-stack_addr
-is not, a default stack address specific for the architecture being linked will
-be used and its value printed as a warning message.
-This creates a segment named _\|_UNIXSTACK.  Note that the initial stack address
-will be either at the high address of the segment or the low address of the
-segment depending on which direction the stack grows for the architecture being
-linked.
-.TP
-.BI "\-stack_size" " value"
-Specifies the size of the stack segment
-.IR value ,
-where
-.I value
-is a hexadecimal number rounded to the segment alignment.
-The default segment alignment is the target pagesize (currently, 1000
-hexadecimal for the PowerPC and for i386).
-If
-.B \-stack_addr
-is specified and
-.B \-stack_size
-is not, a default stack size specific for the architecture being linked will be
-used and its value printed as a warning message.
-This creates a segment named _\|_UNIXSTACK .
-.TP
-.B \-allow_stack_execute
-Marks executable so that all stacks in the task will be given stack execution
-privilege.  This includes pthread stacks.
-
-.PP
-The following flags support section specifications:
-.TP
-.BI "\-sectcreate" " segname sectname file"
-The section
-.I sectname
-in the segment
-.I segname
-is created from the contents of
-.I file.
-The combination of
-.I segname
-and
-.I sectname
-must be unique; there cannot already be a section
-.I (segname,sectname)
-in any input object file.
-This option was previously called
-.BR "\-segcreate" ,
-which will continue to be recognized.
-.TP
-.BI "\-sectalign" " segname sectname value"
-The section named
-.I sectname
-in the segment
-.I segname
-will have its alignment set to
-.IR value ,
-where
-.I value
-is a hexadecimal number that must be an integral power of 2.
-This can be used to set the alignment of a section created from a file, or to
-increase the alignment of a section from an object file, or to set the maximum
-alignment of the
-.SM (_\|_DATA,_\|_common)
-section, where common symbols are defined
-by the link editor.  Setting the alignment of a literal section causes the
-individual literals to be aligned on that boundary.  If the section
-alignment is not specified by a section header in an object file or on the
-command line, it defaults to 10 (hex), indicating 16-byte alignment.
-.TP
-.BI "\-sectorder" " segname sectname orderfile"
-The section
-.I sectname
-in the segment
-.I segname
-of the input files will be broken up into blocks associated with
-symbols in the section.  The output section will be created by ordering
-the blocks as specified by the lines in the
-.I orderfile.
-These blocks are aligned to the output file's section alignment for this
-section.  Any section can be ordered in the output file except symbol pointer and symbol stub sections.
-.IP
-For non-literal sections, each line of the
-.I orderfile
-contains an object name and a symbol name, separated by a single colon (':').
-Lines that start with # are ignored and treated as comments.
-If the object file is
-in an archive, the archive name, followed by a single colon, must precede the
-object file name.  The object file names and archive names should be exactly the
-names as seen by the link editor, but if not, the link editor attempts to match
-up the names the best it can.
-For non-literal sections, the easiest way to generate an order file is
-with the ``\f3\-jonls +\f2segname sectname\f1'' options to
-.IR nm (1).
-.IP
-The format of the
-.I orderfile
-for literal sections is specific to each type of literal section.  For C
-string literal sections, each line of the order file contains one literal C
-string, which may include ANSI C escape sequences.  For four-byte literal
-sections, the order file format is one 32-bit hex number with a leading 0x
-per
-line, with the rest of the line treated as a comment.  For eight-byte literal
-sections, the order file has two 32-bit hex numbers per line; each number
-has a leading 0x, the two numbers are separated by white
-space, and the rest of the line is treated as a comment.
-For literal pointer sections, the lines in the order file represent
-pointers, one per line.  A literal pointer is represented by the name of
-the segment that contains the literal being pointed to, followed by the
-section name, followed by the literal. These three strings are separated
-by colons with no extra white space.
-For all the literal sections, each line in the the order file is simply entered
-into the literal section and will appear in the output file in the same order
-as in the
-order file.  There is no check to see whether the literal is present
-in the loaded objects.
-For literal sections, the easiest way to generate an order file is with
-the ``\f3\-X \-v \-s \f2segname sectname\f1'' options to
-.IR otool (1).
-.TP
-.B \-sectorder_detail
-When using the
-.B \-sectorder
-option,  any pairs of object file names and symbol names that are found in
-the loaded objects, but not specified in the
-.IR orderfile ,
-are placed last in the output file's section.   These pairs are ordered by
-object file (as the filenames appear
-on the command line), with the different symbols from a given object
-file being ordered by
-increasing symbol address (that is, the order
-in which the symbols occurred in the object file,
-not their order in the symbol table).  By default, the link editor displays a summary
-that simply shows the number
-of symbol names found in the loaded objects but not in the
-.IR orderfile ,
-as well as the number of symbol names listed in the
-.I orderfile
-but not found in the loaded objects.  (The summary is omitted if both values
-are zero.)  To instead produce a detailed list of these symbols, use the
-.B \-sectorder_detail
-flag.  If an object file-symbol name pair is listed multiple times, a
-warning is generated, and the first occurrence is used.
-.TP
-.BI "\-sectobjectsymbols" " segname sectname"
-This causes the link editor to generate local symbols in the section
-.I sectname
-in the segment
-.IR segname .
-Each object file that has one of these sections will have a local
-symbol created
-whose name is that of the object file, or of the member of the archive.
-The symbol's value will be the first address where that object file's section
-was loaded.  The symbol has the type N_SECT and its section number is the
-the same as that of the section
-.I (segname,sectname)
-in the output file.
-This symbol will be placed in the symbol table just before all other local
-symbols
-for the object file.  This feature is typically used where the section is
-.SM (\_\^\_TEXT,\_\^\_text),
-in order to help the debugger debug object files produced by old versions of
-the compiler or by non-Apple compilers.
-
-.PP
-The following flags are related to name spaces:
-.TP
-.B \-twolevel_namespace
-Specifies the output to be built as a two-level namespace image.
-This option can also be specified by setting the environment variable
-.SM LD_TWOLEVEL_NAMESPACE.
-This is the default.
-.TP
-.B \-flat_namespace
-Specifies the output to be built as a flat namespace image.
-This is not the default (but was the default in MacOS X 10.0).
-.TP
-.B \-force_flat_namespace
-Specifies the executable output to be built and executed treating all its
-dynamic libraries as flat namespace images.  This marks the executable so that
-the dynamic link editor treats all dynamic libraries as flat namespace
-images when the program is executed.
-.TP
-.BI \-bundle_loader " executable"
-This specifies the
-.I executable
-that will be loading the bundle output file being linked.  Undefined symbols
-from the bundle are checked against the specified executable like it was one of
-the dynamic libraries the bundle was linked with.  If the bundle being created
-with
-.B \-twolevel_namespace
-in effect then the searching of the executable for
-symbols is based on the placement of the
-.B \-bundle_loader
-flag relative to the dynamic libraries.  If the the bundle being created with
-.B \-flat_namespace
-then the searching of the executable is done before all dynamic libraries.
-.TP
-.B \-private_bundle
-This allows symbols defined in the output to also be defined in executable in
-the
-.B \-bundle_loader
-argument
-when
-.B \-flat_namespace
-is in effect.
-This implies that the bundle output file being created is going to be loaded by
-the executable with the
-.B NSLINKMODULE_OPTION_PRIVATE
-option to
-.IR NSLinkModule (3).
-.TP
-.B \-twolevel_namespace_hints
-Specifies to create the output with the two-level namespace hints table to be
-used by the dynamic linker.  This is the default except when the
-.B \-bundle
-flag is specified.  If this is used when the
-.B \-bundle
-flag is specified the bundle will fail to load on a MacOS X 10.0 system with a
-malformed object error.
-.TP
-.BI \-multiply_defined " treatment"
-Specifies how multiply defined symbols in dynamic libraries when
-.B \-twolevel_namespace
-is in effect are to be treated.
-.I treatment
-can be:
-.I error,
-.I warning,
-or
-.I suppress.
-Which cause the treatment of multiply defined symbols in dynamic libraries
-as either, errors, warnings, or suppresses the checking of multiply symbols
-from dynamic libraries when
-.B \-twolevel_namespace
-is in effect.
-The default is to treat multiply defined symbols in dynamic libraries as
-warnings when
-.B \-twolevel_namespace
-is in effect.
-.TP
-.BI \-multiply_defined_unused " treatment"
-Specifies how unused multiply defined symbols in dynamic libraries when
-.B \-twolevel_namespace
-is in effect are to be treated.
-An unused multiply defined symbol is one in which there is a symbol defined in
-the output that is also defined in the dynamic libraries the output is linked
-with but the symbol in the dynamic library is not used by any reference in the
-output.
-.I treatment
-can be:
-.I error,
-.I warning,
-or
-.I suppress.
-The default for unused multiply defined symbols is to suppress these messages.
-.TP
-.B -nomultidefs
-specifying this flag marks the umbrella being created such that the dynamic
-linker is guaranteed that no multiple definitions of symbols in the umbrella's
-sub-images will ever exist.  This allows the dynamic linker to always use the
-two-level namespace lookup hints even if the timestamps of the sub-images
-do not match.  This flag implies
-.BI \-multiply_defined " error".
-
-.PP
-The following flags are related to symbols.  These flags' arguments
-are external symbols whose names have `_' prepended to the C,
-.SM FORTRAN,
-or Pascal variable name.
-.TP
-.BI \-y sym
-Display each file in which
-.I sym
-appears, its type, and whether the file defines or references it.  Any
-multiply defined symbols are automatically
-traced.  Like most of the other symbol-related flags,
-.B \-y
-takes only one argument; the flag may be specified more than once in the
-command line to trace more than one symbol.
-.TP
-.BI \-Y " number"
-For the first
-.I number
-undefined symbols, displays each file in which the symbol appears, its type and whether the file defines or references it (that is, the same style of output produced by the
-.B \-y
-option). To keep the output manageable, this option displays at most
-.I number
-references.
-.TP
-.B \-keep_private_externs
-Don't turn private external symbols into static symbols, but rather leave them
-as private external in the resulting output file.
-.TP
-.B \-m
-Don't treat multiply defined symbols from the linked objects as a hard error;
-instead, simply print a warning.  The first linked object defining such a symbol
-is used for linking; its value is used for the symbol in the symbol table.  The
-code and data for all such symbols are copied into the output.  The duplicate
-symbols other than the first symbol may still end up being used in the resulting
-output file through local references.  This can still produce a resulting output
-file that is in error.  This flag's use is strongly discouraged!
-.TP
-.B \-whyload
-Indicate why each member of a library is loaded.  In other words, indicate
-which currently undefined symbol is being resolved, causing that
-member to be loaded.  This in combination with the above
-.BI \-y sym
-flag can help determine exactly why a link edit is failing due to multiply
-defined symbols.
-.B
-.TP
-.BI  \-u " sym"
-Enter the argument
-.I sym
-into the symbol table as an undefined symbol.  This is useful
-for loading wholly from a library, since initially the symbol
-table is empty and an unresolved reference is needed
-to force the loading of the first object file.
-.TP
-.BI \-e " sym"
-The argument
-.I sym
-is taken to be the symbol name of the entry point of
-the resulting file.  By default, the entry point is the address of the
-first section in the first segment.
-.TP
-.BI \-i definition:indirect
-Create an indirect symbol for the symbol name
-.I definition
-which is defined to be the same as the symbol name
-.I indirect
-(which is taken to be undefined).  When a definition of the symbol named
-.I indirect
-is linked, both symbols will take on the defined type and value.
-.IP
-This option overlaps with a compiler option.
-If you use the compiler driver
-.IR cc (1)
-to invoke \fIld_classic\fR,
-invoke this option in this way:
-.BI \-Wl,\-i definition:indirect.
-
-.TP
-.BI \-undefined " treatment"
-Specifies how undefined symbols are to be treated.
-.I treatment
-can be:
-.I error,
-.I warning,
-or
-.I suppress.
-Which cause the treatment of undefined symbols as either, errors, warnings, or
-suppresses the checking of undefined symbols.
-The default is to treat undefined symbols as errors.
-When the environment variable
-.B MACOSX_DEPLOYMENT_TARGET
-is set to
-.B 10.3
-or higher then
-.BI \-undefined " dynamic_lookup"
-can also be used to allow any undefined symbols to be looked up dynamically at
-runtime.  Use of a binary built with this flag requires a system with a dynamic
-linker from Mac OS X 10.3 or later.
-The flag
-.BI \-undefined " define_a_way"
-can also be used to cause the static linker to create a private definition for
-all undefined symbols.  This flag should only be used if it is known that the
-undefined symbols are not referenced as any use of them may cause a crash.
-.TP
-.BI  \-U " sym"
-Allow the symbol
-.I sym
-to be undefined, even if the
-.B \-r
-flag is not given.  Produce an executable file if the only undefined
-symbols are those specified with
-.BR \-U.
-.IP
-This option overlaps with a compiler option.
-If you use the compiler driver
-.IR cc (1)
-to invoke \fIld_classic\fR,
-invoke this option in this way:
-.BI \-Wl,\-U, sym.
-.TP
-.B \-bind_at_load
-Causes the output file to be marked such that the dynamic linker will bind all
-undefined references when the file is loaded or launched.
-
-.PP
-The following flags are related to stripping link edit information.
-This information can also be removed by
-.IR strip (1),
-which uses the same options.  (The
-exception is the
-.B \-s
-flag below, but this is the same as
-.IR strip (1)
-with no arguments.)
-The following flags are listed in decreasing level of stripping.
-.TP
-.B \-s
-Completely strip the output; that is, remove the symbol table
-and relocation information.
-.TP
-.B \-x
-Strips the non-global symbols; only saves external symbols.
-.IP
-This option overlaps with a compiler option.
-If you use the compiler driver
-.IR cc (1)
-to invoke \fIld_classic\fR,
-invoke this option in this way:
-.B \-Wl,\-x.
-.TP
-.B \-S
-Strip debugging symbols; only save local and global symbols.
-.TP
-.B \-X
-Strip local symbols whose names begin with `L'; save all other symbols.
-(The compiler and assembler currently strip these internally-generated
-labels by default, so they generally do not appear in object files
-seen by the link editor.)
-.TP
-.B \-Sp
-Strip, edit and add debugging symbols so the debugger can used most of the
-debugging symbols from the object files.
-.TP
-.B \-Si
-Strip duplicate debugging symbols from include files.  This is
-the default.
-.TP
-.B  \-b
-Strip the base file's symbols from the output file.  (The base file
-is given as the argument to the
-.B \-A
-option.)
-.IP
-This option overlaps with a compiler option.
-If you use the compiler driver
-.IR cc (1)
-to invoke \fIld_classic\fR,
-invoke this option in this way:
-.B \-Wl,\-b.
-.TP
-.B \-Sn
-Don't strip any symbols.
-.TP
-.BI \-exported_symbols_list " filename"
-The specified
-.I filename
-contains lists of global symbol names that will remain as global symbols in the
-output file.  All other global symbols will be treated as if they were marked as
-.I __private_extern__
-and will not be global in the output file. The symbol names listed in
-.I filename
-must be one per line. Leading and trailing white space are not part of the
-symbol name.  Lines starting with # are ignored, as are lines with only white
-space.
-.TP
-.BI \-unexported_symbols_list " filename"
-The specified
-.I filename
-contains lists of global symbol names that will not remain as global symbols in
-the output file.  The symbols will be treated as if they were marked as
-.I __private_extern__
-and will not be global in the output file. The symbol names listed in
-.I filename
-must be one per line. Leading and trailing white space are not part of the
-symbol name.  Lines starting with # are ignored, as are lines with only white
-space.
-.TP
-.BI \-no_uuid
-Do not emit an LC_UUID load command in the linked output file.
-
-.TP
-.B -dead_strip
-Remove blocks of code and data that are unreachable by the entry point or
-exported symbols.
-.TP
-.B -no_dead_strip_inits_and_terms
-When specified along with
-.B -dead_strip
-cause all constructors and destructors to never be dead stripped.
-
-.PP
-The remaining options are infrequently used:
-.TP
-.B \-v
-Print the version of the linker.
-.TP
-.B \-w
-Suppresses all warning messages.
-.TP
-.B \-no_arch_warnings
-Suppresses warning messages about files that have the wrong architecture for the
-.B \-arch
-flag.
-.TP
-.B \-arch_errors_fatal
-Cause the errors having to do with files that have the wrong architecture to be
-fatal and stop the link editor.
-.TP
-.B \-M
-Produce a load map, listing all the segments and sections.  The list
-includes the address where each input file's section appears in the
-output file, as well as the section's size.
-.IP
-This option overlaps with a compiler option.
-If you use the compiler driver
-.IR cc (1)
-to invoke \fIld_classic\fR,
-invoke this option in this way:
-.B \-Wl,\-M.
-.TP
-.B \-whatsloaded
-Display a single line listing each object file that is
-loaded.  Names of objects in archives have the form libfoo.a(bar.o).
-.TP
-.BI \-filelist " listfile[,dirname]"
-Specifies that the linker should link the files listed in
-.I listfile .
-This is an alternative to listing the files on the command line. The file names are listed one per line separated
-only by newlines. (Spaces and tabs are assumed to be part of the file name.)
-If the optional directory name,
-.I dirname
-is specified, it is prepended to each name in the list file.
-.TP
-.BI "\-headerpad" " value"
-Specifies the minimum amount of space ("padding") following
-the headers for the
-.SM MH_EXECUTE
-format and all output file types with the dynamic linker.
-.I value
-is a hexadecimal number.
-When a segment's size is rounded up to the segment alignment, there
-is extra space left over, which is placed between the headers and the sections, rather than at the end of the segment.  The
-.B headerpad
-option specifies the minimum size of this padding,
-which can be useful if the headers will be altered later.
-The default value is the larger of 2 * sizeof(struct section) so the program
-/usr/bin/objcunique can always add two section headers, or if the output is an
-MH_EXECUTE filetype and
-.B \-prebind
-is specified 3 times the size of the LC_PREBOUND_DYLIB load commands.
-The actual amount of pad will be as large as the amount of the first
-segment's round-off.
-(That is, take the total size of the first segments'
-headers and non-zerofill sections, round this size
-up to the segment alignment,
-and use the difference between the rounded
-and unrounded sizes as the minimum amount of padding.)
-.TP
-.B \-headerpad_max_install_names
-Add to the header padding enough space to allow changing all dynamic shared
-library paths recorded in the output file to be changed to MAXPATHLEN in length.
-.TP
-.B \-t
-Trace the progress of the link editor; display the name of each file
-that is
-loaded as it is processed in the first and second pass of the link
-editor.
-.TP
-.BI \-A " basefile"
-Incremental loading: linking is to be done in a manner
-that lets the resulting object be read into an already executing
-program, the
-.IR basefile .
-.I basefile
-is the name of a file whose symbol table will be taken as a basis
-on which to define additional symbols.
-Only newly linked material will be entered into the
-.BR a.out
-file, but the new symbol table will reflect
-every symbol defined in the base file and the newly linked files.
-Option(s) to specify the addresses of the segments are typically
-needed, since
-the default addresses tend to overlap with the
-.I basefile.
-The default format of the object file is
-.SM MH_OBJECT.
-Note: It is strongly recommended that this option NOT be used,
-because the dyld package described in
-.IR dyld (3)
-is a much easier alternative.
-.TP
-.BI \-dylib_install_name " name"
-For dynamic shared library files, specifies the name of the file
-the library will be installed in for programs that use it.  If this is not
-specified, the name specified in the
-.BI \-o " name"
-option will be used.
-This option is used as the
-.IR libtool (1)
-.BI \-install_name " name"
-option when its
-.B \-dynamic
-option is specified.
-.TP
-.BI \-umbrella " framework_name"
-Specifies this is a subframework where
-.I framework_name
-is the name of the umbrella framework this subframework is a part of.  Where
-.I framework_name
-is the same as the argument to the
-.BI \-framework " framework_name"
-option.  This subframework can then only be linked into the umbrella framework
-with the same
-.I framework_name
-or another subframework with the same umbrella framework name.  Any other
-attempt to statically link this subframework directly will result in an error
-stating to link with the umbrella framework instead.  When building the umbrella
-framework that uses this subframework no additional options are required.
-However the install name of the umbrella framework, required to be specified
-with
-.BR \-dylib_install_name ,
-must have the proper format for an install name of a framework for the
-.I framework_name
-of the umbrella framework to be determined.
-.TP
-.BI \-allowable_client " client_name"
-Specifies that for this subframework the
-.I client_name
-can link with this subframework without error even though it is not part of
-the umbrella framework that this subframework is part of.  The
-.I client_name
-can be another framework name or a name used by bundles (see the
-.BI \-client_name " client_name"
-option below).
-.TP
-.BI \-client_name " client_name"
-Specifies the
-.I client_name
-of a bundle for checking of allowable clients of subframeworks (see the
-.BI \-allowable_client " client_name"
-option above).
-.TP
-.BI \-sub_umbrella " framework_name"
-Specifies that the
-.I framework_name
-being linked by a dynamic library is to be treated as one of the
-subframeworks with respect to twolevel namespace.
-.TP
-.BI \-sub_library " library_name"
-Specifies that the
-.I library_name
-being linked by a dynamic library is to be treated as one of the
-sublibraries with respect to twolevel namespace.  For example the
-.I library_name
-for
-.I /usr/lib/libobjc_profile.A.dylib
-would be
-.I libobjc.
-.TP
-.BI \-init " sym"
-The argument
-.I sym
-is taken to be the symbol name of the dynamic shared library initialization
-routine.  If any module is used from the dynamic library the library
-initialization routine is called before any symbol is used from the library
-including C++ static initializers (and #pragma CALL_ON_LOAD routines).
-.TP
-.B \-run_init_lazily
-This option is obsolete.
-.TP
-.BI \-dylib_compatibility_version " number"
-For dynamic shared library files, this specifies the compatibility version number
-of the library.  When a library is used by a program, the compatibility version is checked
-and if the program's version is greater that the library's version, it is an error.
-The format of
-.I number
-is
-.I X[.Y[.Z]]
-where
-.I X
-must be a positive non-zero number less than or equal to 65535, and
-.I .Y
-and
-.I .Z
-are optional and if present must be non-negative numbers less than or
-equal to 255.
-If the compatibility version number is not specified, it has a
-value of 0 and no checking is done when the library is used.
-This option is used as the
-.IR libtool (1)
-.BI \-compatibility_version " number"
-option
-when its
-.B \-dynamic
-option is set.
-.TP
-.BI \-dylib_current_version " number"
-For dynamic shared library files, specifies the current version number
-of the library.  The current version of the library can be obtained
-programmatically by the user of the library so it can determine exactly which version of the library it is using.
-The format of
-.I number
-is
-.I X[.Y[.Z]]
-where
-.I X
-must be a positive non-zero number less than or equal to 65535, and
-.I .Y
-and
-.I .Z
-are optional and if present must be non-negative numbers less than or
-equal to 255.
-If the version number is not specified, it has a
-value of 0.
-This option is used as the
-.IR libtool (1)
-.BI \-current_version " number"
-option when its
-.B \-dynamic
-option is set.
-.TP
-.BI \-single_module
-When building a dynamic library build the library so that it contains only
-one module.
-.TP
-.BI \-multi_module
-When building a dynamic library build the library so that it contains one
-module for each object file linked in.  This is the default.
-.TP
-.BI \-dylinker_install_name " name"
-For dynamic link editor files, specifies the name of the file
-the dynamic link editor will be installed in for programs that use it.
-.TP
-.BI \-macosx_version_min " version"
-This overrides the
-.B MACOSX_DEPLOYMENT_TARGET
-environment variable (see below).  Unlike other linker options, this one may
-be specified multiple times; only the last occurrence is effective.
-.PP
-The following environment variable is used to control the use of incompatible
-features in the output with respect to Mac OS X releases.
-.TP
-.B MACOSX_DEPLOYMENT_TARGET
-This is set to indicate the oldest Mac OS X version that that the output is to
-be used on.  When this is set to a release that is older than the current
-release features that are incompatible with that release will be disabled.  If
-a feature is seen in the input that can't be in the output due to this setting
-a warning is issued.  The current allowable values for this are
-.B 10.1,
-.B 10.2
-.B 10.3,
-and
-.B 10.4
-with the default being
-.B 10.4
-for the i386 architecture and
-.B 10.1
-for all other architectures.
-.PP
-The following environment variables are used by Apple's Build and Integration
-team:
-.TP
-.B LD_TRACE_ARCHIVES
-When this is set it causes a message of the form ``[Logging for XBS]
-Used static archive:
-.I filename''
-for each static archive that has members linked into the output.
-.TP
-.B LD_TRACE_DYLIBS
-When this is set it causes a message of the form ``[Logging for XBS]
-Used dynamic library:
-.I filename''
-for each dynamic library linked into the output.
-.TP
-.B RC_TRACE_PREBINDING_DISABLED
-When this is set it causes a message of the form ``[Logging for XBS
-prebinding disabled for
-.I filename
-because
-.I reason''.
-Where
-.I filename
-is the value of the
-.B \-final_output
-argument if specified or the value of the
-.B \-o
-argument.
-.TP
-.BI \-final_output " filename"
-The argument
-.I filename
-is used in the above message when RC_TRACE_PREBINDING_DISABLED is set.
-.TP
-.B LD_TRACE_FILE
-When this is set, messages displayed due to the
-.B LD_TRACE_ARCHIVES
-,
-.B LD_TRACE_DYLIBS
-, and
-.B LD_TRACE_PREBINDING_DISABLED
-environment variables are printed to the file whose path is specified
-by this variable instead of stdout.
-.TP
-.B LD_SPLITSEGS_NEW_LIBRARIES
-When set and
-.B MACOSX_DEPLOYMENT_TARGET
-is set to 10.4 or greater and the output is a dynamic library, and if the
-install name of the library is not listed the segment address table, and if the
-environment variable
-.B LD_UNPREBOUND_LIBRARIES
-is set with a file name with a list of library install names and the install
-name is not listed, then this is built as a split shared library.
-
-.PP
-Options available in early versions of the Mach-O link editor
-may no longer be supported.
-
-.SH FILES
-.ta \w'/Network/Library/Frameworks/*.framework/*\ \ 'u
-/lib/lib*.{a,dylib}	libraries
-.br
-/usr/lib/lib*.{a,dylib}
-.br
-/usr/local/lib/lib*.{a,dylib}
-.br
-/Library/Frameworks/*.framework/*	framework libraries
-.br
-/Network/Library/Frameworks/*.framework/*	framework libraries
-.br
-/System/Library/Frameworks/*.framework/*	framework libraries
-.br
-a.out	output file
-.SH "SEE ALSO"
-as(1), ar(1), cc(1), libtool(1), ranlib(1), nm(1), otool(1) lipo(1), ld(1),
-arch(3), dyld(3), Mach-O(5), strip(1), redo_prebinding(1)
diff --git a/i386/util/machOconv.c b/i386/util/machOconv.c
old mode 100755
new mode 100644
index 5e31c44..540efe3
--- a/i386/util/machOconv.c
+++ b/i386/util/machOconv.c
@@ -34,19 +34,18 @@
 int	infile, outfile;
 
 struct mach_header	mh;
-void * cmds;
+void *		cmds;
 
-static bool swap_ends;
+static bool	swap_ends;
 
 static unsigned long swap(unsigned long x)
 {
-    if (swap_ends)
-        return OSSwapInt32(x);
-
-    return x;
+    if (swap_ends)	return OSSwapInt32(x);
+    else			return x;
 }
 
-int main(int argc, char *argv[])
+int
+main(int argc, char *argv[])
 {
     kern_return_t	result;
     vm_address_t	data;
@@ -54,130 +53,138 @@ int main(int argc, char *argv[])
     char *		cp;
     
     if (argc == 2)
-    {
-        infile = open(argv[1], O_RDONLY);
-
-        if (infile < 0)
-            goto usage;
-
-        outfile = fileno(stdout);
+	{
+		infile = open(argv[1], O_RDONLY);
+		if (infile < 0)		goto usage;
+		outfile = fileno(stdout);
     }
     else if (argc == 3)
-    {
-        infile = open(argv[1], O_RDONLY);
-
-        if (infile < 0)
-            goto usage;
-
-        outfile = open(argv[2], O_WRONLY|O_CREAT|O_TRUNC, 0644);
-
-        if (outfile < 0)
-            goto usage;
+	{
+    	infile = open(argv[1], O_RDONLY);
+		if (infile < 0)		goto usage;
+		outfile = open(argv[2], O_WRONLY|O_CREAT|O_TRUNC, 0644);
+		if (outfile < 0)	goto usage;
     }
-    else
-    {
-usage:
-        fprintf(stderr, "usage: machOconv inputfile [outputfile]\n");
-        exit(1);
+    else 
+	{
+	usage:
+    	fprintf(stderr, "usage: machOconv inputfile [outputfile]\n");
+		exit(1);
     }
     
     nc = read(infile, &mh, sizeof (mh));
-
     if (nc < 0)
-    {
-        perror("read mach header");
-        exit(1);
+	{
+		perror("read mach header");
+		exit(1);
     }
-
+	
     if (nc < (int)sizeof (mh))
-    {
-        fprintf(stderr, "read mach header: premature EOF %d\n", nc);
-        exit(1);
+	{
+		fprintf(stderr, "read mach header: premature EOF %d\n", nc);
+		exit(1);
     }
-
-    if (mh.magic == MH_MAGIC)
-        swap_ends = false;
-    else if (mh.magic == MH_CIGAM)
-        swap_ends = true;
+	
+	
+    if (mh.magic == MH_MAGIC)		swap_ends = false;
+    else if (mh.magic == MH_CIGAM)	swap_ends = true;
     else
-    {
-        fprintf(stderr, "bad magic number %lx\n", (unsigned long)mh.magic);
-        exit(1);
+	{
+    	fprintf(stderr, "bad magic number %lx\n", (unsigned long)mh.magic);
+		exit(1);
     }
-
+	
     cmds = calloc(swap(mh.sizeofcmds), sizeof (char));
-
     if (cmds == 0)
-    {
-        fprintf(stderr, "alloc load commands: no memory\n");
-        exit(1);
+	{
+		fprintf(stderr, "alloc load commands: no memory\n");
+		exit(1);
     }
     nc = read(infile, cmds, swap(mh.sizeofcmds));
-
-    if (nc < 0)
-    {
-        perror("read load commands");
-        exit(1);
+    if (nc < 0) 
+	{
+		perror("read load commands");
+		exit(1);
     }
-
     if (nc < (int)swap(mh.sizeofcmds))
-    {
-        fprintf(stderr, "read load commands: premature EOF %d\n", nc);
-        exit(1);
+	{
+		fprintf(stderr, "read load commands: premature EOF %d\n", nc);
+		exit(1);
     }
 
-    for (ncmds = swap(mh.ncmds), cp = cmds; ncmds > 0; ncmds--)
-    {
-	    bool    isDATA;
-	    unsigned	vmsize;
+	unsigned long vmstart = (unsigned long)-1;
 
+	// First pass: determine actual load address
+	for (ncmds = swap(mh.ncmds), cp = cmds;
+		 ncmds > 0; ncmds--)
+	{
+#define lcp	((struct load_command *)cp)    
+#define scp	((struct segment_command *)cp)
+		
+		switch(swap(lcp->cmd))
+		{
+			case LC_SEGMENT:
+				if(vmstart > swap(scp->vmaddr)) 
+				{
+					vmstart = swap(scp->vmaddr);
+				}
+		}
+		cp += swap(lcp->cmdsize);
+
+	}
+	
+	// Second pass: output to file.
+    for (ncmds = swap(mh.ncmds), cp = cmds;
+		 ncmds > 0; ncmds--)
+	{
 #define lcp	((struct load_command *)cp)    
-        switch(swap(lcp->cmd))
-        {
-            case LC_SEGMENT:
 #define scp	((struct segment_command *)cp)
-                isDATA = (strcmp(scp->segname, "__DATA") == 0);
-
-                if (isDATA)
-                    vmsize = swap(scp->filesize);
-                else
-                    vmsize = swap(scp->vmsize);
-
-                result = vm_allocate(mach_task_self(), &data, vmsize, true);
-
-                if (result != KERN_SUCCESS)
-                {
-                    mach_error("vm_allocate segment data", result);
-                    exit(1);
-                }
-
-                lseek(infile, swap(scp->fileoff), L_SET);
-                nc = read(infile, (void *)data, swap(scp->filesize));
-
-                if (nc < 0) {
-                    perror("read segment data");
-                    exit(1);
-                }
-
-                if (nc < (int)swap(scp->filesize))
-                {
-                    fprintf(stderr, "read segment data: premature EOF %d\n", nc);
-                    exit(1);
-                }
-
-                nc = write(outfile, (void *)data, vmsize);
-
-                if (nc < (int)vmsize)
-                {
-                    perror("write segment data");
-                    exit(1);
-                }
-	    
-                vm_deallocate(mach_task_self(), data, vmsize);
-                break;
-        }
 
-        cp += swap(lcp->cmdsize);
+	    bool	isDATA;
+	    unsigned	vmsize;
+		
+		switch(swap(lcp->cmd))
+		{
+			case LC_SEGMENT:
+				isDATA = (strcmp(scp->segname, "__DATA") == 0);
+				if (isDATA)
+				{
+					vmsize = swap(scp->filesize);
+				}
+				else
+				{
+					vmsize = swap(scp->vmsize);
+				}
+				
+				result = vm_allocate(mach_task_self(), &data, vmsize, true);
+				if (result != KERN_SUCCESS) {
+					mach_error("vm_allocate segment data", result);
+					exit(1);
+				}
+				
+				lseek(infile, swap(scp->fileoff), L_SET);
+				nc = read(infile, (void *)data, swap(scp->filesize));
+				if (nc < 0) {
+					perror("read segment data");
+					exit(1);
+				}
+				if (nc < (int)swap(scp->filesize)) {
+					fprintf(stderr, "read segment data: premature EOF %d\n", nc);
+					exit(1);
+				}
+				
+				lseek(outfile, swap(scp->vmaddr) - vmstart, L_SET);
+				nc = write(outfile, (void *)data, vmsize);
+				if (nc < (int)vmsize) {
+					perror("write segment data");
+					exit(1);
+				}
+				
+				vm_deallocate(mach_task_self(), data, vmsize);
+				break;
+		}
+		
+		cp += swap(lcp->cmdsize);
     }
 	
     exit(0);
diff --git a/i386/util/md.1 b/i386/util/md.1
deleted file mode 100644
index 9505f88..0000000
--- a/i386/util/md.1
+++ /dev/null
@@ -1,121 +0,0 @@
-.\" Man page Copyright (c) 2002
-.\"	Apple Computer
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS DOCUMENTATION IS PROVIDED BY THE APPLE ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL APPLE BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"
-.Dd "December 25, 2002"
-.Dt md 1
-.Os
-.Sh NAME
-.Nm md
-.Nd process raw dependency files produced by cpp -MD
-.Sh SYNOPSIS
-.Nm
-.Op Fl d
-.Op Fl f
-.Op Fl m Ar makefile
-.Op Fl u Ar makefile
-.Op Fl o Ar outputfile
-.Op Fl v
-.Op Fl x
-.Op Fl D Ar c|d|m|o|t|D
-.Sh DESCRIPTION
-The
-.Nm
-command basically does two things:
-.Pp
-Process the raw dependency files produced by the cpp -MD option.
-There is one line in the file for every #include encountered, but
-there are repeats and patterns like .../dir1/../dir2 that appear which
-should reduce to .../dir2.
-.Nm
-canonicalizes and flushes repeats from the dependency list.
-It also sorts the file names and "fills" them to a 78 character line.
-.Pp
-.Nm
-also updates the makefile directly with the dependency information,
-so the .d file can be thrown away (see
-.Ar d
-option).  This is done to save space.
-.Nm
-assumes that dependency information in the makefile is sorted by .o
-file name and it procedes to merge in (add/or replace [as appropriate])
-the new dependency lines that it has generated.
-For time efficiency,
-.Nm
-assumes that any .d files it is given that were created
-before the creation date of the "makefile" were processed
-already.  It ignores them unless the force flag
-.Op f
-is given.
-.Pp
-.Sh FLAG SUMMARY
-.Bl -tag -width indent
-.It Fl D Ar c|D|d|m|o|t
-Specify debugging option(s):
-.Bl -tag -width indent
-.It c
-show file contents
-.It D
-show very low level debugging
-.It d
-show new dependency crunching
-.It m
-show generation of makefile
-.It o
-show files being opened
-.It t
-show time comparisons
-.El
-.It Fl d
-Delete the .d file after it is processed
-.It Fl f
-Force an update of the dependencies in the makefile,
-even if the makefile is more recent than the .n file.
-(This implies that
-.Nm
-has been run already.)
-.It Fl m Ar makefile
-Specify the makefile to be upgraded.  The defaults are
-.Ar makefile
-and then
-.Ar Makefile .
-.It Fl o Ar outputfile
-Specify an output file (other than a makefile) for the dependencies.
-.It Fl u Ar makefile
-Like
-.Fl m ,
-but the file will be created if necessary.
-.It Fl v
-Set the verbose flag.
-.It Fl x
-Expunge old dependency information from the makefile.
-.El
-.Sh SEE ALSO
-.Xr make 1
-.Sh BUGS
-Old, possibly not used by anyone.
-.Sh HISTORY
-The
-.Nm
-utility was written by Robert V. Baron at Carnegie-Mellon University.
diff --git a/i386/util/md.c b/i386/util/md.c
deleted file mode 100644
index 99954f6..0000000
--- a/i386/util/md.c
+++ /dev/null
@@ -1,726 +0,0 @@
-/* ************************************************************************ *\
- *                                                                          *
- * File:        md.c                                                        *
- *                                                                          *
- *      Updates makefiles from the .n dependency files generated by the     *
- *      -MD option to "cc" (and "cpp").                                     *
- *                                                                          *
- * Abstract:                                                                *
- *                                                                          *
- *      Basically, "md" does two things:                                    *
- *      1) It processes the raw dependency files produced by the cpp -MD     *
- *         option.  There is one line in the file for every #include        *
- *         encountered, but there are repeats and patterns like             *
- *         .../dir1/../dir2 appear which should reduce to .../dir2          *
- *         Md canonicalizes and flushes repeats from the dependency         *
- *         list.  It also sorts the file names and "fills" them to a 78     *
- *         character line.                                                  *
- *      2) Md also updates the makefile directly with the dependency        *
- *         information, so the .d file can be thrown away (-- -d option)    *
- *         This is done to save space.  Md assumes that dependency          *
- *         information in the makefile is sorted by .o file name and it     *
- *         procedes to merge in (add/or replace [as appropriate])  the new  *
- *         dependency lines that it has generated.  For time effeciency,    *
- *         Md assumes that any .d files it is given that were created       *
- *         before the creation date of the "makefile" were processed        *
- *         already.  It ignores them unless the force flag (-f) is given.   *
- *                                                                          *
- * Arguments:                                                               *
- *                                                                          *
- *      -d      delete the .d file after it is processed                    *
- *      -f      force an update of the dependencies in the makefile         *
- *              even though the makefile is more recent than the .n file    *
- *              (This implies that md has been run already.)                *
- *      -m      specify the makefile to be upgraded.  The defaults are      *
- *              "makefile" and then "Makefile".                             *
- *      -u      like -m above, but the file will be created if necessary    *
- *      -o      specify an output file for the dependencies other than a    *
- *              makefile                                                    *
- *      -v      set the verbose flag                                        *
- *      -x      expunge old dependency info from makefile                   *
- *      -D      subswitch for debugging.  can be followed by any of         *
- *              "c", "d", "m", "o", "t", "D" meaning:                       *
- *              c       show file contents                                  *
- *              d       show new dependency crunching                       *
- *              m       show generation of makefile                         *
- *              o       show files being opened                             *
- *              t       show time comparisons                               *
- *              D       show very low level debugging                       *
- *                                                                          *
- * Author:      Robert V. Baron                                             *
- *              Copyright (c) 1986 by Robert V. Baron                       *
- *                                                                          *
- * HISTORY                                                                  *
- * 29-Apr-87  Robert Baron (rvb) at Carnegie-Mellon University
- *      If specified -u file does not exist, assume it is empty and
- *      generate one.  As a sanity check, it must be possible to create
- *      the output file.
- *      Also, generalized fix below to handle any case of . as a
- *      file name.
- *
- * 25-Mar-87  Mary Thompson (mrt) at Carnegie Mellon
- *      Fixed up pathnamecanonicalization to recognize .// and
- *      drop the second / as well. mmax cpp generates this form.
- *
- *  6-Jan-87  Robert Baron (rvb) at Carnegie-Mellon University
- *      Fixed up pathname canonicalization to that ../../, etc would be
- *      handled correctly.
- *      Also made "force" on by default.
- *
- * 16-Mar-86  Robert Baron (rvb) at Carnegie-Mellon University
- *              Created 4/16/86                                             *
- *                                                                          *
- \* ************************************************************************ */
-
-/* cleaned and adapted for Chameleon by cparm */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#define LINESIZE 65536  //  NeXT_MOD
-
-#define OUTLINELEN 79
-#define IObuffer 50000
-#define SALUTATION "# Dependencies for File:"
-#define SALUTATIONLEN (sizeof SALUTATION - 1)
-#define OLDSALUTATION "# DO NOT DELETE THIS LINE"
-#define OLDSALUTATIONLEN (sizeof OLDSALUTATION - 1)
-
-static char file_array[IObuffer];      /* read file and store crunched names */
-static char dep_line[LINESIZE];        /* line being processed */
-static char dot_o[LINESIZE];           /* <foo.o>: prefix */
-static char *path_component[100];      /* stores components for a path while being
-                                        crunched */
-
-static struct dep {                    /* stores paths that a file depends on */
-    int len;
-    char *str;
-} dep_files[1000];
-static int dep_file_index;
-
-static int qsort_strcmp(struct dep *a, struct dep *b)
-{
-    extern int strcmp();
-    return strcmp(a->str, b->str);
-}
-
-static char *outfile = (char *) 0;     /* generate dependency file */
-static FILE *out;
-
-static char *makefile = (char *) 0;    /* user supplied makefile name */
-static char *real_mak_name;            /* actual makefile name (if not supplied) */
-static char shadow_mak_name[LINESIZE]; /* changes done here then renamed */
-static FILE *mak;                      /* for reading makefile */
-static FILE *makout;                   /* for writing shadow */
-static char makbuf[LINESIZE];          /* one line buffer for makefile */
-static struct stat makstat;            /* stat of makefile for time comparisons */
-static int mak_eof = 0;                        /* eof seen on makefile */
-
-static int delete = 0;                 /* -d delete dependency file */
-static int debug = 0;
-static int     D_contents = 0;         /* print file contents */
-static int     D_depend = 0;           /* print dependency processing info */
-static int     D_make = 0;             /* print makefile processing info */
-static int     D_open = 0;             /* print after succesful open */
-static int     D_time = 0;             /* print time comparison info */
-static int force = 1;                  /* always update dependency info */
-static int update = 0;                 /* it's ok if the -m file does not exist */
-static int verbose = 0;                /* tell me something */
-static int expunge = 0;                /* first flush dependency stuff from makefile */
-
-
-static char *name;
-static int read_dep(register char *file);
-static void save_dot_o(void);
-static void parse_dep(void);
-static void output_dep(FILE *out);
-static FILE *find_mak(char *file);
-static FILE *temp_mak(void);
-static void scan_mak(FILE *, FILE *, char *);
-static void expunge_mak(register FILE *makin, register FILE *makout);
-static void skip_mak(register FILE *makin, register FILE *makout);
-static void finish_mak(FILE *, FILE *);
-
-int main(int argc, register char **argv)
-{
-    int size;
-    
-    name = *argv;
-    {
-        register char *cp =name;
-        while (*cp) if (*cp++ == '/') name = cp;
-    }
-    
-    for ( argv++ ; --argc ; argv++ )
-    {
-        
-        register char *token = *argv;
-        if (*token++ != '-' || !*token)
-            break;
-        else
-        {
-            register int flag;
-            for ( ; (flag = *token++) ; )
-            {
-                switch (flag)
-                {
-                    case 'd':
-                        delete++;
-                        break;
-                    case 'f':
-                        force++;
-                        break;
-                    case 'u':
-                        update++;
-                    case 'm':
-                        makefile = *++argv;
-                        if (--argc < 0) goto usage;
-                        break;
-                    case 'o':
-                        outfile = *++argv;
-                        if (--argc < 0) goto usage;
-                        break;
-                    case 'v':
-                        verbose++;
-                        break;
-                    case 'x':
-                        expunge++;
-                        break;
-                    case 'D':
-                        for ( ; (flag = *token++) ; )
-                            switch (flag)
-                        {
-                            case 'c':
-                                D_contents++;
-                                break;
-                            case 'd':
-                                D_depend++;
-                                break;
-                            case 'm':
-                                D_make++;
-                                break;
-                            case 'o':
-                                D_open++;
-                                break;
-                            case 't':
-                                D_time++;
-                                break;
-                            case 'D':
-                                debug++;
-                                break;
-                            default:
-                                goto letters;
-                                
-                        }
-                        goto newtoken;
-                    default:
-                        goto usage;
-                }
-            letters: ;
-            }
-        }
-    newtoken: ;
-    }
-    
-    if (!expunge && argc < 1) goto usage;
-    if ((int) outfile && (int) makefile)    /* not both */
-        goto usage;
-    
-    if ((int) outfile)
-    {
-        /*
-         * NeXT_MOD, For SGS stuff, in case still linked to master version
-         */
-        unlink(outfile);
-        
-        if ((out = fopen(outfile, "w")) == NULL)
-        {
-            fprintf(stderr, "%s: outfile = \"%s\" ", name, outfile);
-            perror("fopen");
-            fflush(stdout), fflush(stderr);
-            exit(1);
-        }
-        else if (D_open)
-            printf("%s: opened outfile \"%s\"\n", name, outfile);
-    }
-    else if ((mak = find_mak(makefile)))
-    {
-        makout = temp_mak();
-        out = makout;
-        if (expunge)
-            expunge_mak(mak, makout);
-        else
-            skip_mak(mak, makout);
-    }
-    else if (mak_eof &&  /* non existent file == mt file */
-             (int)(makout = temp_mak()))
-    { /* but we need to be able */
-        out = makout;                    /* to write here */
-    }
-    else if (makefile)
-    {
-        fprintf(stderr, "%s: makefile \"%s\" can not be opened or stat'ed\n",
-                name, makefile);
-        exit(2);
-    }
-    
-    for (; argc--; argv++)
-    {
-        dep_file_index = 0;
-        
-        if ((size = read_dep(*argv)))
-        {
-            
-            save_dot_o();
-            if (D_depend) printf("%s: dot_o = \"%s\"\n", name, dot_o);
-            
-            parse_dep();
-            if (mak) scan_mak(mak, makout, dot_o);
-            if (out) output_dep(out);
-            
-            if (delete)
-                unlink(*argv);
-        }
-    }
-    
-    if (mak) finish_mak(mak, makout);
-    rename(shadow_mak_name, real_mak_name);
-    exit(0);
-usage:
-    fprintf(stderr, "usage: md -f -Dcdmot -m makefile -o outputfile -v <file1> ... <filen>\n");
-    exit(1);
-    return 1;
-}
-
-
-static int read_dep(register char *file)
-{
-    register int fd;
-    register int size;
-    struct stat statbuf;
-    
-    if ((fd = open(file, 0)) < 0)
-    {
-        fprintf(stderr, "%s: file = \"%s\" ", name, file);
-        perror("open");
-        fflush(stdout), fflush(stderr);
-        return 0;
-    }
-    if (D_open)
-        printf("%s: opened dependency file \"%s\"\n", name, file);
-    
-    if (fstat(fd, &statbuf) < 0)
-    {
-        fprintf(stderr, "%s: file = \"%s\" ", name, file);
-        perror("stat");
-        fflush(stdout), fflush(stderr);
-        goto out;
-    }
-    switch(statbuf.st_mode & S_IFMT)
-    {
-        case S_IFREG:
-            if (D_time)
-                printf("%s: file time = %ld\n", name, statbuf.st_mtime);
-            
-            if (statbuf.st_size > IObuffer)
-            {
-                fprintf(stderr, "%s: file \"%s\" tooo big for IObuffer\n",
-                        name, file);
-                goto out;
-            } else if (force)
-                break;
-            else if ((int) mak && statbuf.st_mtime < makstat.st_mtime)
-            {
-                if (verbose || D_time)
-                    fprintf(stderr, "%s: skipping \"%s\" %ld < %ld \"%s\"\n",
-                            name, file, statbuf.st_mtime, makstat.st_mtime,
-                            real_mak_name);
-                goto out;
-            } else /* >=   =>ok */
-                break;
-        case S_IFDIR:
-        case S_IFLNK:
-        case S_IFCHR:
-        case S_IFBLK:
-        case S_IFSOCK:
-        default:
-            fprintf(stderr, "%s: bad mode: 0%o on \"%s\"\n",
-                    name, statbuf.st_mode, file);
-            fflush(stdout), fflush(stderr);
-            goto out;
-    }
-    
-    if ((size = read(fd, file_array, sizeof (file_array))) < 0)
-    {
-        fprintf(stderr, "%s: file = \"%s\" ", name, file);
-        perror("read");
-        fflush(stdout), fflush(stderr);
-        goto out;
-    }
-    file_array[size] = 0;
-    
-    if (close(fd) < 0)
-    {
-        fprintf(stderr, "%s: file = \"%s\" ", name, file);
-        perror("close");
-        fflush(stdout), fflush(stderr);
-        return 0;
-    }
-    
-    if (D_depend && D_contents)
-        printf("file_array: \"%s\"\n", file_array);
-    return size;
-out: ;
-    close(fd);
-    return 0;
-}
-
-static void save_dot_o(void)
-{
-    register char *cp = file_array;
-    register char *svp = dot_o;
-    register int c;
-    
-    while ((*svp++ = (c = *cp++)) && c != ':');
-    *svp = 0;
-}
-
-static void parse_dep(void)
-{
-    register char *lp = file_array;
-    register int c;
-    
-    while (*lp)
-    {
-        register char *tlp = lp;
-        register char *cp = dep_line;
-        register int i = 0;
-        int abspath = 0;
-        char oldc;
-        char *oldcp;
-        
-        /* get a line to process */
-        while ((c = *lp++) && c != '\n')
-        {
-            if (c == '\\')
-                lp++;             /* skip backslash newline */
-            else
-                *cp++ = c;
-        }
-        if (!c)
-            break;
-        *cp = 0;
-        cp = dep_line;
-        lp[-1] = 0;
-        /* skip .o file name */
-        while ((c = *cp++) && c != ':'); if (!c) continue;
-    next_filename:
-        i = 0;
-        abspath = 0;
-        while ((c = *cp) && (c == ' ' || c == '\t')) cp++; if (!c) continue;
-        
-        /* canonicalization processing */
-        
-        /* initial / is remembered */
-        if (c == '/')
-            abspath++;
-        
-        while (c && c != ' ' && c != '\t')
-        {
-            if (D_depend) printf("i = %d going \"%s\"\n", i, cp);
-            /* kill \'s */
-            while ((c = *cp) && c == '/') cp++; if (!c) break;
-            path_component[i] = cp;
-            /* swallow chars till next / or null */
-            while ((c = *cp++) && c != '/' && c != ' ' && c != '\t');
-            if (c) cp[-1]=0;/* end component C style */
-            
-            /* ignore . */;
-            if (!strcmp(path_component[i], "."))
-                ;       /* if "component" != .. */
-            else            /* don't reduce /component/.. to nothing */
-                i++;    /* there could be symbolic links! */
-        }
-        /* reassemble components */
-        oldc = c;               /* save c */
-        oldcp = cp;             /* save cp */
-        cp = tlp;               /* overwrite line in buffer */
-        if (abspath)
-            *cp++ = '/';
-        for (c=0; c<i; c++) {register char *ccp = path_component[c];
-            while ((*cp++ = *ccp++));
-            *--cp = '/';
-            cp++;
-        }
-        *--cp = 0;
-        
-        c=dep_file_index++;
-        dep_files[c].str = tlp;
-        dep_files[c].len = cp - tlp;
-        if (D_depend)
-            printf("%s: dep_file[%d] = \"%s\" Len %ld\n",
-                   name, dep_file_index - 1, tlp, (long)(cp - tlp));
-        tlp = cp + 1;
-        if (oldc)
-        {
-            cp = oldcp;
-            goto next_filename;
-        }
-    }
-}
-
-static void output_dep(FILE *out)
-{
-    register int j;
-    register int size = 1000;
-    register int dot_o_len = strlen(dot_o);
-    register struct dep *dp = dep_files;
-    int written = 0;
-    
-    if (D_depend && debug)
-        for(j = 0; j < dep_file_index; j++)
-        {
-            printf("dep_files[%d] = %s\n", j, dep_files[j].str);
-        }
-    typedef int (*qsort_strcmp_fixer)(const void *, const void *);
-    
-    int (*qsort_strcmp_fix)(const void *, const void *) = (qsort_strcmp_fixer)qsort_strcmp;
-    
-    qsort(dep_files, dep_file_index, sizeof (struct dep), qsort_strcmp_fix);
-    
-    if (D_depend && debug)
-        for(j = 0; j < dep_file_index; j++)
-        {
-            printf("dep_files[%d] = %s\n", j, dep_files[j].str);
-        }
-    
-    fprintf(out, "%s %s", SALUTATION, dot_o);
-    for(j = 0; j < dep_file_index; j++, dp++)
-    {
-        register int len = dp->len;
-        register char *str = dp->str;
-        if (j && len == (dp-1)->len && !strcmp(str, (dp-1)->str))
-            continue;
-        written++;
-        if (size + len + 1 > OUTLINELEN)
-        {
-            fprintf(out, "\n%s %s", dot_o, str);
-            size = dot_o_len + len + 1;
-        }
-        else
-        {
-            fprintf(out, " %s", str);
-            size += len + 1;
-        }
-    }
-    fprintf(out, "\n");
-    if (verbose)
-        fprintf(stdout, "%s: \"%s\" %d => %d\n", name, dot_o, dep_file_index, written);
-}
-
-/* process makefile */
-static FILE *find_mak(char *file)
-{
-    FILE *mak;
-    
-    if ((int) file)
-    {
-        if ((mak = fopen(file, "r")) != NULL)
-        {
-            real_mak_name = file;
-        }
-        else if (update)
-        {
-            mak_eof = 1;
-            real_mak_name = file;
-            return NULL;
-        }
-        else
-        {
-            fprintf(stderr, "%s: file = \"%s\" ", name, file);
-            perror("fopen");
-            fflush(stdout), fflush(stderr);
-            return NULL;
-        }
-    }
-    else
-    {
-        if ((mak = fopen("makefile", "r")) != NULL)
-        {
-            real_mak_name = "makefile";
-        }
-        else if ((mak = fopen("Makefile", "r")) != NULL)
-        {
-            real_mak_name = "Makefile";
-        }
-        else return NULL;
-    }
-    
-    if (fstat(fileno(mak), &makstat) < 0)
-    {
-        fprintf(stderr, "%s: file = \"%s\" ", name, real_mak_name);
-        perror("stat");
-        fflush(stdout), fflush(stderr);
-        return NULL;
-    }
-    if (D_open)
-        printf("%s: opened makefile \"%s\"\n", name, real_mak_name);
-    if (D_time)
-        printf("%s: makefile time = %ld\n", name, makstat.st_mtime);
-    
-    return mak;
-}
-
-static FILE *temp_mak(void)
-{
-    FILE *mak;
-    
-    strlcpy(shadow_mak_name, real_mak_name, sizeof(shadow_mak_name));
-    strlcat(shadow_mak_name, ".md", sizeof(shadow_mak_name));
-    
-    /*
-     * For SGS stuff, in case still linked to master version
-     */
-    unlink(shadow_mak_name);
-    if ((mak = fopen(shadow_mak_name, "w")) == NULL)
-    {
-        fprintf(stderr, "%s: file = \"%s\" ", name, shadow_mak_name);
-        perror("fopen");
-        fflush(stdout), fflush(stderr);
-        return NULL;
-    }
-    if (D_open)
-        printf("%s: opened makefile.md \"%s\"\n", name, shadow_mak_name);
-    
-    return mak;
-}
-
-static void skip_mak(register FILE *makin, register FILE *makout)
-{
-    register int len = SALUTATIONLEN;
-    
-    if (D_make)
-        printf("skipping in \"%s\"  ", real_mak_name);
-    
-    while (fgets(makbuf, LINESIZE, makin) != NULL)
-    {
-        if (D_make && D_contents)
-            printf("%s: \"%s\"\n", real_mak_name, makbuf);
-        if (strncmp(makbuf, SALUTATION, len))
-        {
-            fputs(makbuf, makout);
-        }
-        else
-            break;
-    }
-    mak_eof = feof(makin);
-    if (mak_eof)
-        fclose(makin);
-    if (D_make)
-        printf("eof = %d str = \"%s\"", mak_eof, makbuf);
-}
-
-static void expunge_mak(register FILE *makin, register FILE *makout)
-{
-    register int len = SALUTATIONLEN;
-    register int oldlen = OLDSALUTATIONLEN;
-    
-    if (D_make)
-        printf("expunging in \"%s\"  ", real_mak_name);
-    
-    while (fgets(makbuf, LINESIZE, makin) != NULL)
-    {
-        if (D_make && D_contents)
-            printf("%s: \"%s\"\n", real_mak_name, makbuf);
-        if (! strncmp(makbuf, SALUTATION, len) ||
-            ! strncmp(makbuf, OLDSALUTATION, oldlen))
-            break;
-        else
-            fputs(makbuf, makout);
-    }
-    mak_eof = 1;
-    if (mak_eof)
-        fclose(makin);
-    if (D_make)
-        printf("eof = %d str = \"%s\"", mak_eof, makbuf);
-}
-
-static void
-scan_mak(FILE *makin, FILE *makout, char *file)
-{
-    register char *cp = &makbuf[SALUTATIONLEN+1];
-    register int len = strlen(file);
-    register int ret;
-    
-    if (D_make)
-        printf("scanning in \"%s\" for \"%s\"\n", real_mak_name, file);
-    
-    do {
-        if (mak_eof)            /* don't scan any more */
-            return;
-        
-        ret = strncmp(cp, file, len);
-        if (D_make)
-            printf("saw \"%s\" ret = %d\n", cp, ret);
-        
-        if (ret < 0) {          /* skip forward till match or greater */
-            fputs(makbuf, makout);          /* line we're looking at */
-            while (fgets(makbuf, LINESIZE, makin) != NULL)
-            {
-                if (strncmp(makbuf, SALUTATION, SALUTATIONLEN))
-                {
-                    fputs(makbuf, makout);
-                }
-                else
-                    break;
-            }
-            mak_eof = feof(makin);
-            
-            if (mak_eof)
-                fclose(makin);
-            
-            continue;
-        }
-        else if (ret == 0)
-        {  /* flush match */
-            while (fgets(makbuf, LINESIZE, makin) != NULL)
-            {
-                if (strncmp(makbuf, SALUTATION, SALUTATIONLEN))
-                {
-                    ;       /* flush old stuff */
-                }
-                else
-                    break;
-            }
-            mak_eof = feof(makin);
-            if (mak_eof)
-                fclose(makin);
-            break;
-        }
-        else
-        {                /* no luck this time */
-            break;
-        }
-    } while (1);
-}
-
-static void
-finish_mak(FILE *makin, FILE *makout)
-{
-    if (mak_eof)            /* don't scan any more */
-        return;
-    
-    if (D_make)
-        printf("finishing in \"%s\"\n", real_mak_name);
-    
-    fputs(makbuf, makout);          /* line we're looking at */
-    while (fgets(makbuf, LINESIZE, makin) != NULL)
-    {
-        fputs(makbuf, makout);
-    }
-}
diff --git a/i386/util/segsize.c b/i386/util/segsize.c
new file mode 100644
index 0000000..592878a
--- /dev/null
+++ b/i386/util/segsize.c
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Portions Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights
+ * Reserved.  This file contains Original Code and/or Modifications of
+ * Original Code as defined in and that are subject to the Apple Public
+ * Source License Version 2.0 (the "License").  You may not use this file
+ * except in compliance with the License.  Please obtain a copy of the
+ * License at http://www.apple.com/publicsource and read it before using
+ * this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <mach/mach.h>
+#include <mach/mach_error.h>
+#include <sys/file.h>
+#include <mach-o/loader.h>
+#include <libkern/OSByteOrder.h>
+#include <unistd.h>
+
+int	infile;
+
+struct mach_header	mh;
+void *		cmds;
+
+static bool	swap_ends;
+
+static unsigned long swap(
+						  unsigned long x
+						  )
+{
+    if (swap_ends)
+		return OSSwapInt32(x);
+    else
+		return x;
+}
+
+int
+main(int argc, char *argv[])
+{
+    int			nc, ncmds;
+    char *		cp;
+    
+    if (argc == 3) {
+		infile = open(argv[1], O_RDONLY);
+		if (infile < 0)
+			goto usage;
+    }
+    else {
+	usage:
+    	fprintf(stderr, "usage: segsize segment\n");
+		exit(1);
+    }
+    
+    nc = read(infile, &mh, sizeof (mh));
+    if (nc < 0) {
+		perror("read mach header");
+		exit(1);
+    }
+    if (nc < (int)sizeof (mh)) {
+		fprintf(stderr, "read mach header: premature EOF %d\n", nc);
+		exit(1);
+    }
+    if (mh.magic == MH_MAGIC)
+		swap_ends = false;
+    else if (mh.magic == MH_CIGAM)
+		swap_ends = true;
+    else {
+    	fprintf(stderr, "bad magic number %lx\n", (unsigned long)mh.magic);
+		exit(1);
+    }
+	
+    cmds = calloc(swap(mh.sizeofcmds), sizeof (char));
+    if (cmds == 0) {
+		fprintf(stderr, "alloc load commands: no memory\n");
+		exit(1);
+    }
+    nc = read(infile, cmds, swap(mh.sizeofcmds));
+    if (nc < 0) {
+		perror("read load commands");
+		exit(1);
+    }
+    if (nc < (int)swap(mh.sizeofcmds)) {
+		fprintf(stderr, "read load commands: premature EOF %d\n", nc);
+		exit(1);
+    }
+	
+    for (	ncmds = swap(mh.ncmds), cp = cmds;
+		 ncmds > 0; ncmds--) {
+//	    bool	isDATA;
+//	    unsigned	vmsize;
+		
+#define lcp	((struct load_command *)cp)    
+		switch(swap(lcp->cmd)) {
+				
+			case LC_SEGMENT:
+#define scp	((struct segment_command *)cp)
+				if(strcmp(scp->segname, argv[2]) == 0)
+				{
+					printf("%ld\n", swap(scp->vmsize));
+#if 0
+				if (isDATA)
+					vmsize = swap(scp->filesize);
+				else
+					vmsize = swap(scp->vmsize);
+#endif
+				}
+				break;
+		}
+		
+		cp += swap(lcp->cmdsize);
+    }
+	
+    exit(0);
+}

From 354dbcbac15449bb77ec0cde43599f0539118cf0 Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Sun, 11 Nov 2012 10:48:41 +0000
Subject: [PATCH 130/623] Pruned include dir

---
 .../include/IOKit/acpi/IOACPIPlatformDevice.h |  254 --
 .../include/IOKit/acpi/IOACPIPlatformExpert.h |  178 --
 i386/include/IOKit/acpi/IOACPITypes.h         |  136 --
 i386/include/IOKit/ata/ATADeviceNub.h         |  164 --
 i386/include/IOKit/ata/ATATimerEventSource.h  |  126 -
 i386/include/IOKit/ata/IOATABusCommand.h      |  250 --
 i386/include/IOKit/ata/IOATABusInfo.h         |  219 --
 i386/include/IOKit/ata/IOATACommand.h         |  478 ----
 i386/include/IOKit/ata/IOATAController.h      |  314 ---
 i386/include/IOKit/ata/IOATADevConfig.h       |  239 --
 i386/include/IOKit/ata/IOATADevice.h          |  179 --
 i386/include/IOKit/ata/IOATARegI386.h         |   76 -
 i386/include/IOKit/ata/IOATATypes.h           |  393 ---
 i386/include/IOKit/ata/IOPCIATA.h             |  200 --
 i386/include/IOKit/ata/MacIOATA.h             |  225 --
 i386/include/IOKit/audio/IOAudioControl.h     |  595 -----
 .../IOKit/audio/IOAudioControlUserClient.h    |   90 -
 i386/include/IOKit/audio/IOAudioDebug.h       |   61 -
 i386/include/IOKit/audio/IOAudioDefines.h     |  465 ----
 i386/include/IOKit/audio/IOAudioDevice.h      |  749 ------
 i386/include/IOKit/audio/IOAudioEngine.h      |  865 -------
 .../IOKit/audio/IOAudioEngineUserClient.h     |  270 ---
 .../include/IOKit/audio/IOAudioLevelControl.h |  205 --
 i386/include/IOKit/audio/IOAudioPort.h        |  184 --
 .../IOKit/audio/IOAudioSelectorControl.h      |  122 -
 i386/include/IOKit/audio/IOAudioStream.h      |  289 ---
 .../IOKit/audio/IOAudioToggleControl.h        |  121 -
 i386/include/IOKit/audio/IOAudioTypes.h       |  661 -----
 i386/include/IOKit/avc/IOFireWireAVCCommand.h |   94 -
 i386/include/IOKit/avc/IOFireWireAVCConsts.h  |  259 --
 .../IOKit/avc/IOFireWireAVCRequestSpace.h     |   31 -
 .../IOKit/avc/IOFireWireAVCTargetSpace.h      |  297 ---
 i386/include/IOKit/avc/IOFireWireAVCUnit.h    |  408 ----
 .../IOKit/avc/IOFireWireAVCUserClientCommon.h |  124 -
 i386/include/IOKit/avc/IOFireWirePCRSpace.h   |  202 --
 i386/include/IOKit/bluetooth/Bluetooth.h      | 2158 -----------------
 .../bluetooth/BluetoothAssignedNumbers.h      |  552 -----
 .../bluetooth/IOBluetoothHCIController.h      | 1370 -----------
 .../IOKit/bluetooth/IOBluetoothHCIRequest.h   |  155 --
 .../IOKit/bluetooth/IOBluetoothHIDDriver.h    |  230 --
 .../bluetooth/IOBluetoothHIDDriverTypes.h     |   61 -
 .../IOKit/bluetooth/IOBluetoothInternal.h     |  103 -
 .../IOKit/bluetooth/IOBluetoothTypes.h        |   23 -
 .../IOKit/firewire/IOConfigDirectory.h        |  182 --
 .../include/IOKit/firewire/IOFWAddressSpace.h |  331 ---
 .../IOKit/firewire/IOFWAsyncStreamListener.h  |  132 -
 i386/include/IOKit/firewire/IOFWCommand.h     |  977 --------
 i386/include/IOKit/firewire/IOFWDCL.h         |  346 ---
 i386/include/IOKit/firewire/IOFWDCLPool.h     |  160 --
 i386/include/IOKit/firewire/IOFWDCLProgram.h  |  133 -
 .../IOKit/firewire/IOFWDCLTranslator.h        |  114 -
 .../include/IOKit/firewire/IOFWIsochChannel.h |  132 -
 i386/include/IOKit/firewire/IOFWIsochPort.h   |   66 -
 .../IOKit/firewire/IOFWLocalIsochPort.h       |  135 --
 .../IOKit/firewire/IOFWPHYPacketListener.h    |   77 -
 .../IOKit/firewire/IOFWPhysicalAddressSpace.h |  263 --
 .../IOKit/firewire/IOFWPseudoAddressSpace.h   |  370 ---
 i386/include/IOKit/firewire/IOFWRegs.h        |   73 -
 ...IOFWSimpleContiguousPhysicalAddressSpace.h |   66 -
 .../firewire/IOFWSimplePhysicalAddressSpace.h |   70 -
 i386/include/IOKit/firewire/IOFWSyncer.h      |   54 -
 .../IOKit/firewire/IOFWUserObjectExporter.h   |   95 -
 i386/include/IOKit/firewire/IOFWUtils.h       |   32 -
 i386/include/IOKit/firewire/IOFireWireBus.h   |  373 ---
 .../IOKit/firewire/IOFireWireController.h     | 1089 ---------
 .../include/IOKit/firewire/IOFireWireDevice.h |  289 ---
 .../IOKit/firewire/IOFireWireFamilyCommon.h   | 1235 ----------
 .../IOKit/firewire/IOFireWireIRMAllocation.h  |  116 -
 .../IOKit/firewire/IOFireWireLocalNode.h      |  143 --
 .../firewire/IOFireWireMultiIsochReceive.h    |  137 --
 i386/include/IOKit/firewire/IOFireWireNub.h   |  293 ---
 .../IOKit/firewire/IOFireWirePowerManager.h   |   78 -
 i386/include/IOKit/firewire/IOFireWireUnit.h  |  167 --
 .../IOKit/firewire/IOLocalConfigDirectory.h   |  110 -
 .../IOKit/firewire/IORemoteConfigDirectory.h  |   92 -
 .../IOKit/graphics/IOAccelClientConnect.h     |   44 -
 .../IOKit/graphics/IOAccelSurfaceConnect.h    |  182 --
 i386/include/IOKit/graphics/IOAccelTypes.h    |  101 -
 i386/include/IOKit/graphics/IOAccelerator.h   |   42 -
 i386/include/IOKit/graphics/IODisplay.h       |  292 ---
 i386/include/IOKit/graphics/IOFramebuffer.h   |  827 -------
 .../IOKit/graphics/IOFramebufferShared.h      |  255 --
 .../include/IOKit/graphics/IOGraphicsDevice.h |   47 -
 .../include/IOKit/graphics/IOGraphicsEngine.h |   51 -
 .../IOKit/graphics/IOGraphicsInterfaceTypes.h |  301 ---
 i386/include/IOKit/graphics/IOGraphicsTypes.h | 1260 ----------
 i386/include/IOKit/hid/IOHIDDevice.h          |  706 ------
 i386/include/IOKit/hid/IOHIDElement.h         |  106 -
 i386/include/IOKit/hid/IOHIDInterface.h       |  252 --
 i386/include/IOKit/hid/IOHIDKeys.h            |  349 ---
 i386/include/IOKit/hid/IOHIDUsageTables.h     | 1665 -------------
 .../include/IOKit/hidevent/IOHIDEventDriver.h |  171 --
 .../IOKit/hidevent/IOHIDEventService.h        |  394 ---
 .../IOKit/hidsystem/IOHIDDescriptorParser.h   |  939 -------
 i386/include/IOKit/hidsystem/IOHIDParameter.h |  310 ---
 i386/include/IOKit/hidsystem/IOHIDShared.h    |  341 ---
 i386/include/IOKit/hidsystem/IOHIDSystem.h    |  785 ------
 i386/include/IOKit/hidsystem/IOHIDTypes.h     |  171 --
 .../IOKit/hidsystem/IOHIDUsageTables.h        | 1665 -------------
 i386/include/IOKit/hidsystem/IOHIDevice.h     |   71 -
 i386/include/IOKit/hidsystem/IOHIKeyboard.h   |  268 --
 .../IOKit/hidsystem/IOHIKeyboardMapper.h      |  350 ---
 i386/include/IOKit/hidsystem/IOHIPointing.h   |  280 ---
 i386/include/IOKit/hidsystem/IOLLEvent.h      |  558 -----
 i386/include/IOKit/hidsystem/ev_keymap.h      |  166 --
 i386/include/IOKit/i2c/IOI2CInterface.h       |  262 --
 i386/include/IOKit/ndrvsupport/IOMacOSTypes.h |  441 ----
 i386/include/IOKit/ndrvsupport/IOMacOSVideo.h | 1391 -----------
 .../IOKit/ndrvsupport/IONDRVFramebuffer.h     |  352 ---
 .../IOKit/ndrvsupport/IONDRVLibraries.h       |  696 ------
 .../include/IOKit/ndrvsupport/IONDRVSupport.h |   95 -
 .../IOKit/network/IOBasicOutputQueue.h        |  319 ---
 .../IOKit/network/IOEthernetController.h      |  502 ----
 .../IOKit/network/IOEthernetInterface.h       |  328 ---
 i386/include/IOKit/network/IOEthernetStats.h  |  161 --
 .../IOKit/network/IOGatedOutputQueue.h        |  140 --
 i386/include/IOKit/network/IOKernelDebugger.h |  324 ---
 .../IOKit/network/IOMbufMemoryCursor.h        |  381 ---
 .../IOKit/network/IONetworkController.h       | 1452 -----------
 i386/include/IOKit/network/IONetworkData.h    |  477 ----
 .../IOKit/network/IONetworkInterface.h        | 1104 ---------
 i386/include/IOKit/network/IONetworkMedium.h  |  426 ----
 i386/include/IOKit/network/IONetworkStats.h   |   87 -
 i386/include/IOKit/network/IOOutputQueue.h    |  270 ---
 i386/include/IOKit/network/IOPacketQueue.h    |  290 ---
 i386/include/IOKit/nvram/IONVRAMController.h  |   49 -
 i386/include/IOKit/pci/IOAGPDevice.h          |  222 --
 i386/include/IOKit/pci/IOPCIBridge.h          |  381 ---
 i386/include/IOKit/pci/IOPCIDevice.h          |  673 -----
 i386/include/IOKit/platform/.svn/all-wcprops  |   29 -
 i386/include/IOKit/platform/.svn/entries      |  164 --
 .../.svn/text-base/AppleMacIO.h.svn-base      |   79 -
 .../text-base/AppleMacIODevice.h.svn-base     |   60 -
 .../.svn/text-base/AppleNMI.h.svn-base        |   76 -
 .../text-base/ApplePlatformExpert.h.svn-base  |   91 -
 i386/include/IOKit/platform/AppleMacIO.h      |   79 -
 .../include/IOKit/platform/AppleMacIODevice.h |   60 -
 i386/include/IOKit/platform/AppleNMI.h        |   76 -
 .../IOKit/platform/ApplePlatformExpert.h      |   91 -
 i386/include/IOKit/power/.svn/all-wcprops     |   11 -
 i386/include/IOKit/power/.svn/entries         |   62 -
 .../.svn/text-base/IOPwrController.h.svn-base |   41 -
 i386/include/IOKit/power/IOPwrController.h    |   41 -
 i386/include/IOKit/ppc/.svn/all-wcprops       |   11 -
 i386/include/IOKit/ppc/.svn/entries           |   62 -
 .../ppc/.svn/text-base/IODBDMA.h.svn-base     |  367 ---
 i386/include/IOKit/ppc/IODBDMA.h              |  367 ---
 i386/include/IOKit/pwr_mgt/.svn/all-wcprops   |   59 -
 i386/include/IOKit/pwr_mgt/.svn/entries       |  334 ---
 .../pwr_mgt/.svn/text-base/IOPM.h.svn-base    |  654 -----
 .../.svn/text-base/IOPMDeprecated.h.svn-base  |  177 --
 .../.svn/text-base/IOPMLibDefs.h.svn-base     |   40 -
 .../.svn/text-base/IOPMPowerSource.h.svn-base |  300 ---
 .../text-base/IOPMPowerSourceList.h.svn-base  |   54 -
 .../.svn/text-base/IOPMPrivate.h.svn-base     |  269 --
 .../.svn/text-base/IOPMpowerState.h.svn-base  |   72 -
 .../text-base/IOPowerConnection.h.svn-base    |  159 --
 .../.svn/text-base/RootDomain.h.svn-base      |  251 --
 i386/include/IOKit/pwr_mgt/IOPM.h             |  654 -----
 i386/include/IOKit/pwr_mgt/IOPMDeprecated.h   |  177 --
 i386/include/IOKit/pwr_mgt/IOPMLibDefs.h      |   40 -
 i386/include/IOKit/pwr_mgt/IOPMPowerSource.h  |  300 ---
 .../IOKit/pwr_mgt/IOPMPowerSourceList.h       |   54 -
 i386/include/IOKit/pwr_mgt/IOPMPrivate.h      |  269 --
 i386/include/IOKit/pwr_mgt/IOPMpowerState.h   |   72 -
 .../include/IOKit/pwr_mgt/IOPowerConnection.h |  159 --
 i386/include/IOKit/pwr_mgt/RootDomain.h       |  251 --
 i386/include/IOKit/rtc/.svn/all-wcprops       |   11 -
 i386/include/IOKit/rtc/.svn/entries           |   62 -
 .../.svn/text-base/IORTCController.h.svn-base |   46 -
 i386/include/IOKit/rtc/IORTCController.h      |   46 -
 i386/include/IOKit/sbp2/.svn/all-wcprops      |   59 -
 i386/include/IOKit/sbp2/.svn/entries          |  334 ---
 ...WireSBP2LSIWorkaroundDescriptor.h.svn-base |  292 ---
 .../text-base/IOFireWireSBP2LUN.h.svn-base    |  270 ---
 .../text-base/IOFireWireSBP2Login.h.svn-base  | 1078 --------
 .../IOFireWireSBP2ManagementORB.h.svn-base    |  345 ---
 .../text-base/IOFireWireSBP2ORB.h.svn-base    |  547 -----
 .../text-base/IOFireWireSBP2Target.h.svn-base |  224 --
 .../IOFireWireSBP2UserClient.h.svn-base       |  186 --
 .../IOFireWireSBP2UserClientCommon.h.svn-base |   79 -
 ...eWireSerialBusProtocolTransport.h.svn-base |  449 ----
 .../IOFireWireSBP2LSIWorkaroundDescriptor.h   |  292 ---
 i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h   |  270 ---
 i386/include/IOKit/sbp2/IOFireWireSBP2Login.h | 1078 --------
 .../IOKit/sbp2/IOFireWireSBP2ManagementORB.h  |  345 ---
 i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h   |  547 -----
 .../include/IOKit/sbp2/IOFireWireSBP2Target.h |  224 --
 .../IOKit/sbp2/IOFireWireSBP2UserClient.h     |  186 --
 .../sbp2/IOFireWireSBP2UserClientCommon.h     |   79 -
 .../IOFireWireSerialBusProtocolTransport.h    |  449 ----
 i386/include/IOKit/scsi/.svn/all-wcprops      |  155 --
 i386/include/IOKit/scsi/.svn/entries          |  881 -------
 .../.svn/text-base/IOBDServices.h.svn-base    |  241 --
 .../IOBlockStorageServices.h.svn-base         |  158 --
 .../IOCompactDiscServices.h.svn-base          |  230 --
 .../.svn/text-base/IODVDServices.h.svn-base   |  251 --
 .../IOReducedBlockServices.h.svn-base         |  147 --
 .../IOSCSIBlockCommandsDevice.h.svn-base      | 1146 ---------
 .../IOSCSIMultimediaCommandsDevice.h.svn-base | 1057 --------
 .../IOSCSIPeripheralDeviceNub.h.svn-base      |  233 --
 .../IOSCSIPeripheralDeviceType00.h.svn-base   |  102 -
 .../IOSCSIPeripheralDeviceType05.h.svn-base   |   75 -
 .../IOSCSIPeripheralDeviceType07.h.svn-base   |   75 -
 .../IOSCSIPeripheralDeviceType0E.h.svn-base   |   77 -
 .../IOSCSIPrimaryCommandsDevice.h.svn-base    |  805 ------
 .../IOSCSIProtocolInterface.h.svn-base        |  854 -------
 .../IOSCSIProtocolServices.h.svn-base         |  362 ---
 ...OSCSIReducedBlockCommandsDevice.h.svn-base |  438 ----
 .../SCSICmds_INQUIRY_Definitions.h.svn-base   |  923 -------
 .../SCSICmds_MODE_Definitions.h.svn-base      |  559 -----
 ...ICmds_READ_CAPACITY_Definitions.h.svn-base |  141 --
 ...CSICmds_REPORT_LUNS_Definitions.h.svn-base |  146 --
 .../SCSICmds_REQUEST_SENSE_Defs.h.svn-base    |  234 --
 .../SCSICommandDefinitions.h.svn-base         |  479 ----
 .../SCSICommandOperationCodes.h.svn-base      |  941 -------
 .../scsi/.svn/text-base/SCSIPort.h.svn-base   |   77 -
 .../scsi/.svn/text-base/SCSITask.h.svn-base   |  456 ----
 i386/include/IOKit/scsi/IOBDServices.h        |  241 --
 .../IOKit/scsi/IOBlockStorageServices.h       |  158 --
 .../IOKit/scsi/IOCompactDiscServices.h        |  230 --
 i386/include/IOKit/scsi/IODVDServices.h       |  251 --
 .../IOKit/scsi/IOReducedBlockServices.h       |  147 --
 .../IOKit/scsi/IOSCSIBlockCommandsDevice.h    | 1146 ---------
 .../scsi/IOSCSIMultimediaCommandsDevice.h     | 1057 --------
 .../IOKit/scsi/IOSCSIPeripheralDeviceNub.h    |  233 --
 .../IOKit/scsi/IOSCSIPeripheralDeviceType00.h |  102 -
 .../IOKit/scsi/IOSCSIPeripheralDeviceType05.h |   75 -
 .../IOKit/scsi/IOSCSIPeripheralDeviceType07.h |   75 -
 .../IOKit/scsi/IOSCSIPeripheralDeviceType0E.h |   77 -
 .../IOKit/scsi/IOSCSIPrimaryCommandsDevice.h  |  805 ------
 .../IOKit/scsi/IOSCSIProtocolInterface.h      |  854 -------
 .../IOKit/scsi/IOSCSIProtocolServices.h       |  362 ---
 .../scsi/IOSCSIReducedBlockCommandsDevice.h   |  438 ----
 .../IOKit/scsi/SCSICmds_INQUIRY_Definitions.h |  923 -------
 .../IOKit/scsi/SCSICmds_MODE_Definitions.h    |  559 -----
 .../scsi/SCSICmds_READ_CAPACITY_Definitions.h |  141 --
 .../scsi/SCSICmds_REPORT_LUNS_Definitions.h   |  146 --
 .../IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h  |  234 --
 .../IOKit/scsi/SCSICommandDefinitions.h       |  479 ----
 .../IOKit/scsi/SCSICommandOperationCodes.h    |  941 -------
 i386/include/IOKit/scsi/SCSIPort.h            |   77 -
 i386/include/IOKit/scsi/SCSITask.h            |  456 ----
 i386/include/IOKit/scsi/spi/.svn/all-wcprops  |   11 -
 i386/include/IOKit/scsi/spi/.svn/entries      |   62 -
 ...SCSIParallelInterfaceController.h.svn-base | 1568 ------------
 .../spi/IOSCSIParallelInterfaceController.h   | 1568 ------------
 i386/include/IOKit/serial/.svn/all-wcprops    |   35 -
 i386/include/IOKit/serial/.svn/entries        |  198 --
 .../IOModemSerialStreamSync.h.svn-base        |   42 -
 .../IORS232SerialStreamSync.h.svn-base        |  172 --
 .../text-base/IOSerialDriverSync.h.svn-base   |   91 -
 .../.svn/text-base/IOSerialKeys.h.svn-base    |   80 -
 .../text-base/IOSerialStreamSync.h.svn-base   |  275 ---
 .../IOKit/serial/IOModemSerialStreamSync.h    |   42 -
 .../IOKit/serial/IORS232SerialStreamSync.h    |  172 --
 .../include/IOKit/serial/IOSerialDriverSync.h |   91 -
 i386/include/IOKit/serial/IOSerialKeys.h      |   80 -
 .../include/IOKit/serial/IOSerialStreamSync.h |  275 ---
 i386/include/IOKit/storage/.svn/all-wcprops   |  185 --
 i386/include/IOKit/storage/.svn/entries       | 1051 --------
 .../text-base/IOAppleLabelScheme.h.svn-base   |  191 --
 .../IOApplePartitionScheme.h.svn-base         |  122 -
 .../IOBDBlockStorageDevice.h.svn-base         |  157 --
 .../IOBDBlockStorageDriver.h.svn-base         |  152 --
 .../.svn/text-base/IOBDMedia.h.svn-base       |  297 ---
 .../text-base/IOBDMediaBSDClient.h.svn-base   |  182 --
 .../.svn/text-base/IOBDTypes.h.svn-base       |  133 -
 .../text-base/IOBlockStorageDevice.h.svn-base |   80 -
 .../text-base/IOBlockStorageDriver.h.svn-base |  245 --
 .../IOCDBlockStorageDevice.h.svn-base         |   60 -
 .../IOCDBlockStorageDriver.h.svn-base         |   51 -
 .../.svn/text-base/IOCDMedia.h.svn-base       |  553 -----
 .../text-base/IOCDMediaBSDClient.h.svn-base   |  199 --
 .../text-base/IOCDPartitionScheme.h.svn-base  |  226 --
 .../.svn/text-base/IOCDTypes.h.svn-base       |  492 ----
 .../IODVDBlockStorageDevice.h.svn-base        |  145 --
 .../IODVDBlockStorageDriver.h.svn-base        |  219 --
 .../.svn/text-base/IODVDMedia.h.svn-base      |  357 ---
 .../text-base/IODVDMediaBSDClient.h.svn-base  |  197 --
 .../.svn/text-base/IODVDTypes.h.svn-base      |  451 ----
 .../IOFDiskPartitionScheme.h.svn-base         |  105 -
 .../.svn/text-base/IOFilterScheme.h.svn-base  |  289 ---
 ...OFireWireStorageCharacteristics.h.svn-base |   63 -
 .../IOGUIDPartitionScheme.h.svn-base          |   90 -
 .../storage/.svn/text-base/IOMedia.h.svn-base |  231 --
 .../text-base/IOMediaBSDClient.h.svn-base     |   29 -
 .../text-base/IOPartitionScheme.h.svn-base    |  373 ---
 .../.svn/text-base/IOStorage.h.svn-base       |  217 --
 .../IOStorageDeviceCharacteristics.h.svn-base |  659 -----
 ...OStorageProtocolCharacteristics.h.svn-base | 1758 --------------
 .../IOKit/storage/IOAppleLabelScheme.h        |  191 --
 .../IOKit/storage/IOApplePartitionScheme.h    |  122 -
 .../IOKit/storage/IOBDBlockStorageDevice.h    |  157 --
 .../IOKit/storage/IOBDBlockStorageDriver.h    |  152 --
 i386/include/IOKit/storage/IOBDMedia.h        |  297 ---
 .../IOKit/storage/IOBDMediaBSDClient.h        |  182 --
 i386/include/IOKit/storage/IOBDTypes.h        |  133 -
 .../IOKit/storage/IOBlockStorageDevice.h      |   80 -
 .../IOKit/storage/IOBlockStorageDriver.h      |  245 --
 .../IOKit/storage/IOCDBlockStorageDevice.h    |   60 -
 .../IOKit/storage/IOCDBlockStorageDriver.h    |   51 -
 i386/include/IOKit/storage/IOCDMedia.h        |  553 -----
 .../IOKit/storage/IOCDMediaBSDClient.h        |  199 --
 .../IOKit/storage/IOCDPartitionScheme.h       |  226 --
 i386/include/IOKit/storage/IOCDTypes.h        |  492 ----
 .../IOKit/storage/IODVDBlockStorageDevice.h   |  145 --
 .../IOKit/storage/IODVDBlockStorageDriver.h   |  219 --
 i386/include/IOKit/storage/IODVDMedia.h       |  357 ---
 .../IOKit/storage/IODVDMediaBSDClient.h       |  197 --
 i386/include/IOKit/storage/IODVDTypes.h       |  451 ----
 .../IOKit/storage/IOFDiskPartitionScheme.h    |  105 -
 i386/include/IOKit/storage/IOFilterScheme.h   |  289 ---
 .../IOFireWireStorageCharacteristics.h        |   63 -
 .../IOKit/storage/IOGUIDPartitionScheme.h     |   90 -
 i386/include/IOKit/storage/IOMedia.h          |  231 --
 i386/include/IOKit/storage/IOMediaBSDClient.h |   29 -
 .../include/IOKit/storage/IOPartitionScheme.h |  373 ---
 i386/include/IOKit/storage/IOStorage.h        |  217 --
 .../storage/IOStorageDeviceCharacteristics.h  |  659 -----
 .../IOStorageProtocolCharacteristics.h        | 1758 --------------
 .../IOKit/storage/ata/.svn/all-wcprops        |   17 -
 i386/include/IOKit/storage/ata/.svn/entries   |   96 -
 .../IOATAPIProtocolTransport.h.svn-base       |  365 ---
 .../text-base/IOATAStorageDefines.h.svn-base  |  321 ---
 .../storage/ata/IOATAPIProtocolTransport.h    |  365 ---
 .../IOKit/storage/ata/IOATAStorageDefines.h   |  321 ---
 i386/include/IOKit/stream/.svn/all-wcprops    |   29 -
 i386/include/IOKit/stream/.svn/entries        |  164 --
 .../stream/.svn/text-base/IOStream.h.svn-base |  609 -----
 .../.svn/text-base/IOStreamFamily.h.svn-base  |   13 -
 .../.svn/text-base/IOStreamShared.h.svn-base  |  175 --
 .../text-base/IOStreamUserClient.h.svn-base   |   76 -
 i386/include/IOKit/stream/IOStream.h          |  609 -----
 i386/include/IOKit/stream/IOStreamFamily.h    |   13 -
 i386/include/IOKit/stream/IOStreamShared.h    |  175 --
 .../include/IOKit/stream/IOStreamUserClient.h |   76 -
 .../IOKit/system_management/.svn/all-wcprops  |   11 -
 .../IOKit/system_management/.svn/entries      |   62 -
 .../.svn/text-base/IOWatchDogTimer.h.svn-base |   55 -
 .../IOKit/system_management/IOWatchDogTimer.h |   55 -
 i386/include/IOKit/usb/.svn/all-wcprops       |  155 --
 i386/include/IOKit/usb/.svn/entries           |  878 -------
 .../text-base/IOUFIStorageServices.h.svn-base |  136 --
 .../usb/.svn/text-base/IOUSBBus.h.svn-base    |   35 -
 .../.svn/text-base/IOUSBCommand.h.svn-base    |  266 --
 .../text-base/IOUSBCompositeDriver.h.svn-base |  127 -
 .../.svn/text-base/IOUSBController.h.svn-base | 1073 --------
 .../IOUSBControllerListElement.h.svn-base     |  126 -
 .../text-base/IOUSBControllerV2.h.svn-base    |  374 ---
 .../text-base/IOUSBControllerV3.h.svn-base    |  233 --
 .../usb/.svn/text-base/IOUSBDevice.h.svn-base |  639 -----
 .../.svn/text-base/IOUSBHIDDriver.h.svn-base  |  289 ---
 .../.svn/text-base/IOUSBHubDevice.h.svn-base  |  247 --
 .../text-base/IOUSBHubPolicyMaker.h.svn-base  |  218 --
 .../.svn/text-base/IOUSBInterface.h.svn-base  |  264 --
 .../usb/.svn/text-base/IOUSBLog.h.svn-base    |  240 --
 .../IOUSBMassStorageClass.h.svn-base          |  507 ----
 .../IOUSBMassStorageUFISubclass.h.svn-base    |  355 ---
 .../usb/.svn/text-base/IOUSBNub.h.svn-base    |   69 -
 .../usb/.svn/text-base/IOUSBPipe.h.svn-base   |  387 ---
 .../text-base/IOUSBRootHubDevice.h.svn-base   |   97 -
 .../.svn/text-base/IOUSBUserClient.h.svn-base |  144 --
 .../.svn/text-base/IOUSBWorkLoop.h.svn-base   |   64 -
 .../IOKit/usb/.svn/text-base/USB.h.svn-base   | 1076 --------
 .../usb/.svn/text-base/USBHub.h.svn-base      |  240 --
 .../usb/.svn/text-base/USBSpec.h.svn-base     |  470 ----
 .../.svn/text-base/USBTracepoints.h.svn-base  |  662 -----
 i386/include/IOKit/usb/IOUFIStorageServices.h |  136 --
 i386/include/IOKit/usb/IOUSBBus.h             |   35 -
 i386/include/IOKit/usb/IOUSBCommand.h         |  266 --
 i386/include/IOKit/usb/IOUSBCompositeDriver.h |  127 -
 i386/include/IOKit/usb/IOUSBController.h      | 1073 --------
 .../IOKit/usb/IOUSBControllerListElement.h    |  126 -
 i386/include/IOKit/usb/IOUSBControllerV2.h    |  374 ---
 i386/include/IOKit/usb/IOUSBControllerV3.h    |  233 --
 i386/include/IOKit/usb/IOUSBDevice.h          |  639 -----
 i386/include/IOKit/usb/IOUSBHIDDriver.h       |  289 ---
 i386/include/IOKit/usb/IOUSBHubDevice.h       |  247 --
 i386/include/IOKit/usb/IOUSBHubPolicyMaker.h  |  218 --
 i386/include/IOKit/usb/IOUSBInterface.h       |  264 --
 i386/include/IOKit/usb/IOUSBLog.h             |  240 --
 .../include/IOKit/usb/IOUSBMassStorageClass.h |  507 ----
 .../IOKit/usb/IOUSBMassStorageUFISubclass.h   |  355 ---
 i386/include/IOKit/usb/IOUSBNub.h             |   69 -
 i386/include/IOKit/usb/IOUSBPipe.h            |  387 ---
 i386/include/IOKit/usb/IOUSBRootHubDevice.h   |   97 -
 i386/include/IOKit/usb/IOUSBUserClient.h      |  144 --
 i386/include/IOKit/usb/IOUSBWorkLoop.h        |   64 -
 i386/include/IOKit/usb/USB.h                  | 1076 --------
 i386/include/IOKit/usb/USBHub.h               |  240 --
 i386/include/IOKit/usb/USBSpec.h              |  470 ----
 i386/include/IOKit/usb/USBTracepoints.h       |  662 -----
 i386/include/libkern/crypto/md5.h             |   79 -
 i386/include/libkern/crypto/sha1.h            |   70 -
 i386/include/libkern/ppc/OSByteOrder.h        |  206 --
 i386/include/mach-o/i386/swap.h               |   96 -
 i386/include/mach-o/x86_64/reloc.h            |  185 --
 i386/include/mach/x86_64/.svn/all-wcprops     |   17 -
 i386/include/mach/x86_64/.svn/entries         |   96 -
 .../x86_64/.svn/text-base/task.h.svn-base     | 1578 ------------
 .../.svn/text-base/thread_act.h.svn-base      | 1155 ---------
 i386/include/mach/x86_64/task.h               | 1578 ------------
 i386/include/mach/x86_64/thread_act.h         | 1155 ---------
 404 files changed, 131112 deletions(-)
 delete mode 100644 i386/include/IOKit/acpi/IOACPIPlatformDevice.h
 delete mode 100644 i386/include/IOKit/acpi/IOACPIPlatformExpert.h
 delete mode 100644 i386/include/IOKit/acpi/IOACPITypes.h
 delete mode 100644 i386/include/IOKit/ata/ATADeviceNub.h
 delete mode 100644 i386/include/IOKit/ata/ATATimerEventSource.h
 delete mode 100644 i386/include/IOKit/ata/IOATABusCommand.h
 delete mode 100644 i386/include/IOKit/ata/IOATABusInfo.h
 delete mode 100644 i386/include/IOKit/ata/IOATACommand.h
 delete mode 100644 i386/include/IOKit/ata/IOATAController.h
 delete mode 100644 i386/include/IOKit/ata/IOATADevConfig.h
 delete mode 100644 i386/include/IOKit/ata/IOATADevice.h
 delete mode 100644 i386/include/IOKit/ata/IOATARegI386.h
 delete mode 100644 i386/include/IOKit/ata/IOATATypes.h
 delete mode 100644 i386/include/IOKit/ata/IOPCIATA.h
 delete mode 100644 i386/include/IOKit/ata/MacIOATA.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioControl.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioControlUserClient.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioDebug.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioDefines.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioDevice.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioEngine.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioEngineUserClient.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioLevelControl.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioPort.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioSelectorControl.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioStream.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioToggleControl.h
 delete mode 100644 i386/include/IOKit/audio/IOAudioTypes.h
 delete mode 100644 i386/include/IOKit/avc/IOFireWireAVCCommand.h
 delete mode 100644 i386/include/IOKit/avc/IOFireWireAVCConsts.h
 delete mode 100644 i386/include/IOKit/avc/IOFireWireAVCRequestSpace.h
 delete mode 100644 i386/include/IOKit/avc/IOFireWireAVCTargetSpace.h
 delete mode 100644 i386/include/IOKit/avc/IOFireWireAVCUnit.h
 delete mode 100644 i386/include/IOKit/avc/IOFireWireAVCUserClientCommon.h
 delete mode 100644 i386/include/IOKit/avc/IOFireWirePCRSpace.h
 delete mode 100644 i386/include/IOKit/bluetooth/Bluetooth.h
 delete mode 100644 i386/include/IOKit/bluetooth/BluetoothAssignedNumbers.h
 delete mode 100644 i386/include/IOKit/bluetooth/IOBluetoothHCIController.h
 delete mode 100644 i386/include/IOKit/bluetooth/IOBluetoothHCIRequest.h
 delete mode 100644 i386/include/IOKit/bluetooth/IOBluetoothHIDDriver.h
 delete mode 100644 i386/include/IOKit/bluetooth/IOBluetoothHIDDriverTypes.h
 delete mode 100644 i386/include/IOKit/bluetooth/IOBluetoothInternal.h
 delete mode 100644 i386/include/IOKit/bluetooth/IOBluetoothTypes.h
 delete mode 100644 i386/include/IOKit/firewire/IOConfigDirectory.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWAddressSpace.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWAsyncStreamListener.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWCommand.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWDCL.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWDCLPool.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWDCLProgram.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWDCLTranslator.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWIsochChannel.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWIsochPort.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWLocalIsochPort.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWPHYPacketListener.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWPhysicalAddressSpace.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWPseudoAddressSpace.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWRegs.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWSimpleContiguousPhysicalAddressSpace.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWSimplePhysicalAddressSpace.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWSyncer.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWUserObjectExporter.h
 delete mode 100644 i386/include/IOKit/firewire/IOFWUtils.h
 delete mode 100644 i386/include/IOKit/firewire/IOFireWireBus.h
 delete mode 100644 i386/include/IOKit/firewire/IOFireWireController.h
 delete mode 100644 i386/include/IOKit/firewire/IOFireWireDevice.h
 delete mode 100644 i386/include/IOKit/firewire/IOFireWireFamilyCommon.h
 delete mode 100644 i386/include/IOKit/firewire/IOFireWireIRMAllocation.h
 delete mode 100644 i386/include/IOKit/firewire/IOFireWireLocalNode.h
 delete mode 100644 i386/include/IOKit/firewire/IOFireWireMultiIsochReceive.h
 delete mode 100644 i386/include/IOKit/firewire/IOFireWireNub.h
 delete mode 100644 i386/include/IOKit/firewire/IOFireWirePowerManager.h
 delete mode 100644 i386/include/IOKit/firewire/IOFireWireUnit.h
 delete mode 100644 i386/include/IOKit/firewire/IOLocalConfigDirectory.h
 delete mode 100644 i386/include/IOKit/firewire/IORemoteConfigDirectory.h
 delete mode 100644 i386/include/IOKit/graphics/IOAccelClientConnect.h
 delete mode 100644 i386/include/IOKit/graphics/IOAccelSurfaceConnect.h
 delete mode 100644 i386/include/IOKit/graphics/IOAccelTypes.h
 delete mode 100644 i386/include/IOKit/graphics/IOAccelerator.h
 delete mode 100644 i386/include/IOKit/graphics/IODisplay.h
 delete mode 100644 i386/include/IOKit/graphics/IOFramebuffer.h
 delete mode 100644 i386/include/IOKit/graphics/IOFramebufferShared.h
 delete mode 100644 i386/include/IOKit/graphics/IOGraphicsDevice.h
 delete mode 100644 i386/include/IOKit/graphics/IOGraphicsEngine.h
 delete mode 100644 i386/include/IOKit/graphics/IOGraphicsInterfaceTypes.h
 delete mode 100644 i386/include/IOKit/graphics/IOGraphicsTypes.h
 delete mode 100644 i386/include/IOKit/hid/IOHIDDevice.h
 delete mode 100644 i386/include/IOKit/hid/IOHIDElement.h
 delete mode 100644 i386/include/IOKit/hid/IOHIDInterface.h
 delete mode 100644 i386/include/IOKit/hid/IOHIDKeys.h
 delete mode 100644 i386/include/IOKit/hid/IOHIDUsageTables.h
 delete mode 100644 i386/include/IOKit/hidevent/IOHIDEventDriver.h
 delete mode 100644 i386/include/IOKit/hidevent/IOHIDEventService.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOHIDDescriptorParser.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOHIDParameter.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOHIDShared.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOHIDSystem.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOHIDTypes.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOHIDUsageTables.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOHIDevice.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOHIKeyboard.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOHIKeyboardMapper.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOHIPointing.h
 delete mode 100644 i386/include/IOKit/hidsystem/IOLLEvent.h
 delete mode 100644 i386/include/IOKit/hidsystem/ev_keymap.h
 delete mode 100644 i386/include/IOKit/i2c/IOI2CInterface.h
 delete mode 100644 i386/include/IOKit/ndrvsupport/IOMacOSTypes.h
 delete mode 100644 i386/include/IOKit/ndrvsupport/IOMacOSVideo.h
 delete mode 100644 i386/include/IOKit/ndrvsupport/IONDRVFramebuffer.h
 delete mode 100644 i386/include/IOKit/ndrvsupport/IONDRVLibraries.h
 delete mode 100644 i386/include/IOKit/ndrvsupport/IONDRVSupport.h
 delete mode 100644 i386/include/IOKit/network/IOBasicOutputQueue.h
 delete mode 100644 i386/include/IOKit/network/IOEthernetController.h
 delete mode 100644 i386/include/IOKit/network/IOEthernetInterface.h
 delete mode 100644 i386/include/IOKit/network/IOEthernetStats.h
 delete mode 100644 i386/include/IOKit/network/IOGatedOutputQueue.h
 delete mode 100644 i386/include/IOKit/network/IOKernelDebugger.h
 delete mode 100644 i386/include/IOKit/network/IOMbufMemoryCursor.h
 delete mode 100644 i386/include/IOKit/network/IONetworkController.h
 delete mode 100644 i386/include/IOKit/network/IONetworkData.h
 delete mode 100644 i386/include/IOKit/network/IONetworkInterface.h
 delete mode 100644 i386/include/IOKit/network/IONetworkMedium.h
 delete mode 100644 i386/include/IOKit/network/IONetworkStats.h
 delete mode 100644 i386/include/IOKit/network/IOOutputQueue.h
 delete mode 100644 i386/include/IOKit/network/IOPacketQueue.h
 delete mode 100644 i386/include/IOKit/nvram/IONVRAMController.h
 delete mode 100644 i386/include/IOKit/pci/IOAGPDevice.h
 delete mode 100644 i386/include/IOKit/pci/IOPCIBridge.h
 delete mode 100644 i386/include/IOKit/pci/IOPCIDevice.h
 delete mode 100644 i386/include/IOKit/platform/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/platform/.svn/entries
 delete mode 100644 i386/include/IOKit/platform/.svn/text-base/AppleMacIO.h.svn-base
 delete mode 100644 i386/include/IOKit/platform/.svn/text-base/AppleMacIODevice.h.svn-base
 delete mode 100644 i386/include/IOKit/platform/.svn/text-base/AppleNMI.h.svn-base
 delete mode 100644 i386/include/IOKit/platform/.svn/text-base/ApplePlatformExpert.h.svn-base
 delete mode 100644 i386/include/IOKit/platform/AppleMacIO.h
 delete mode 100644 i386/include/IOKit/platform/AppleMacIODevice.h
 delete mode 100644 i386/include/IOKit/platform/AppleNMI.h
 delete mode 100644 i386/include/IOKit/platform/ApplePlatformExpert.h
 delete mode 100644 i386/include/IOKit/power/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/power/.svn/entries
 delete mode 100644 i386/include/IOKit/power/.svn/text-base/IOPwrController.h.svn-base
 delete mode 100644 i386/include/IOKit/power/IOPwrController.h
 delete mode 100644 i386/include/IOKit/ppc/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/ppc/.svn/entries
 delete mode 100644 i386/include/IOKit/ppc/.svn/text-base/IODBDMA.h.svn-base
 delete mode 100644 i386/include/IOKit/ppc/IODBDMA.h
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/entries
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPM.h.svn-base
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMDeprecated.h.svn-base
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMLibDefs.h.svn-base
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSource.h.svn-base
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSourceList.h.svn-base
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPrivate.h.svn-base
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMpowerState.h.svn-base
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/IOPowerConnection.h.svn-base
 delete mode 100644 i386/include/IOKit/pwr_mgt/.svn/text-base/RootDomain.h.svn-base
 delete mode 100644 i386/include/IOKit/pwr_mgt/IOPM.h
 delete mode 100644 i386/include/IOKit/pwr_mgt/IOPMDeprecated.h
 delete mode 100644 i386/include/IOKit/pwr_mgt/IOPMLibDefs.h
 delete mode 100644 i386/include/IOKit/pwr_mgt/IOPMPowerSource.h
 delete mode 100644 i386/include/IOKit/pwr_mgt/IOPMPowerSourceList.h
 delete mode 100644 i386/include/IOKit/pwr_mgt/IOPMPrivate.h
 delete mode 100644 i386/include/IOKit/pwr_mgt/IOPMpowerState.h
 delete mode 100644 i386/include/IOKit/pwr_mgt/IOPowerConnection.h
 delete mode 100644 i386/include/IOKit/pwr_mgt/RootDomain.h
 delete mode 100644 i386/include/IOKit/rtc/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/rtc/.svn/entries
 delete mode 100644 i386/include/IOKit/rtc/.svn/text-base/IORTCController.h.svn-base
 delete mode 100644 i386/include/IOKit/rtc/IORTCController.h
 delete mode 100644 i386/include/IOKit/sbp2/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/sbp2/.svn/entries
 delete mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LSIWorkaroundDescriptor.h.svn-base
 delete mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LUN.h.svn-base
 delete mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Login.h.svn-base
 delete mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ManagementORB.h.svn-base
 delete mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ORB.h.svn-base
 delete mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Target.h.svn-base
 delete mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClient.h.svn-base
 delete mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClientCommon.h.svn-base
 delete mode 100644 i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSerialBusProtocolTransport.h.svn-base
 delete mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2LSIWorkaroundDescriptor.h
 delete mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h
 delete mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2Login.h
 delete mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2ManagementORB.h
 delete mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h
 delete mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2Target.h
 delete mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2UserClient.h
 delete mode 100644 i386/include/IOKit/sbp2/IOFireWireSBP2UserClientCommon.h
 delete mode 100644 i386/include/IOKit/sbp2/IOFireWireSerialBusProtocolTransport.h
 delete mode 100644 i386/include/IOKit/scsi/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/scsi/.svn/entries
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOBDServices.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOBlockStorageServices.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOCompactDiscServices.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IODVDServices.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOReducedBlockServices.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIBlockCommandsDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIMultimediaCommandsDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceNub.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType00.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType05.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType07.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType0E.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIPrimaryCommandsDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolInterface.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolServices.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/IOSCSIReducedBlockCommandsDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICmds_INQUIRY_Definitions.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICmds_MODE_Definitions.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICmds_READ_CAPACITY_Definitions.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REPORT_LUNS_Definitions.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REQUEST_SENSE_Defs.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICommandDefinitions.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSICommandOperationCodes.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSIPort.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/.svn/text-base/SCSITask.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/IOBDServices.h
 delete mode 100644 i386/include/IOKit/scsi/IOBlockStorageServices.h
 delete mode 100644 i386/include/IOKit/scsi/IOCompactDiscServices.h
 delete mode 100644 i386/include/IOKit/scsi/IODVDServices.h
 delete mode 100644 i386/include/IOKit/scsi/IOReducedBlockServices.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIBlockCommandsDevice.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIMultimediaCommandsDevice.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIPeripheralDeviceNub.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType00.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType05.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType07.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType0E.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIPrimaryCommandsDevice.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIProtocolInterface.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIProtocolServices.h
 delete mode 100644 i386/include/IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h
 delete mode 100644 i386/include/IOKit/scsi/SCSICmds_INQUIRY_Definitions.h
 delete mode 100644 i386/include/IOKit/scsi/SCSICmds_MODE_Definitions.h
 delete mode 100644 i386/include/IOKit/scsi/SCSICmds_READ_CAPACITY_Definitions.h
 delete mode 100644 i386/include/IOKit/scsi/SCSICmds_REPORT_LUNS_Definitions.h
 delete mode 100644 i386/include/IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h
 delete mode 100644 i386/include/IOKit/scsi/SCSICommandDefinitions.h
 delete mode 100644 i386/include/IOKit/scsi/SCSICommandOperationCodes.h
 delete mode 100644 i386/include/IOKit/scsi/SCSIPort.h
 delete mode 100644 i386/include/IOKit/scsi/SCSITask.h
 delete mode 100644 i386/include/IOKit/scsi/spi/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/scsi/spi/.svn/entries
 delete mode 100644 i386/include/IOKit/scsi/spi/.svn/text-base/IOSCSIParallelInterfaceController.h.svn-base
 delete mode 100644 i386/include/IOKit/scsi/spi/IOSCSIParallelInterfaceController.h
 delete mode 100644 i386/include/IOKit/serial/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/serial/.svn/entries
 delete mode 100644 i386/include/IOKit/serial/.svn/text-base/IOModemSerialStreamSync.h.svn-base
 delete mode 100644 i386/include/IOKit/serial/.svn/text-base/IORS232SerialStreamSync.h.svn-base
 delete mode 100644 i386/include/IOKit/serial/.svn/text-base/IOSerialDriverSync.h.svn-base
 delete mode 100644 i386/include/IOKit/serial/.svn/text-base/IOSerialKeys.h.svn-base
 delete mode 100644 i386/include/IOKit/serial/.svn/text-base/IOSerialStreamSync.h.svn-base
 delete mode 100644 i386/include/IOKit/serial/IOModemSerialStreamSync.h
 delete mode 100644 i386/include/IOKit/serial/IORS232SerialStreamSync.h
 delete mode 100644 i386/include/IOKit/serial/IOSerialDriverSync.h
 delete mode 100644 i386/include/IOKit/serial/IOSerialKeys.h
 delete mode 100644 i386/include/IOKit/serial/IOSerialStreamSync.h
 delete mode 100644 i386/include/IOKit/storage/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/storage/.svn/entries
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOAppleLabelScheme.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOApplePartitionScheme.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDriver.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBDMedia.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBDMediaBSDClient.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBDTypes.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDriver.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDriver.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDMedia.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDMediaBSDClient.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDPartitionScheme.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOCDTypes.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDriver.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IODVDMedia.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IODVDMediaBSDClient.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IODVDTypes.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOFDiskPartitionScheme.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOFilterScheme.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOFireWireStorageCharacteristics.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOGUIDPartitionScheme.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOMedia.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOMediaBSDClient.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOPartitionScheme.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOStorage.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOStorageDeviceCharacteristics.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/.svn/text-base/IOStorageProtocolCharacteristics.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/IOAppleLabelScheme.h
 delete mode 100644 i386/include/IOKit/storage/IOApplePartitionScheme.h
 delete mode 100644 i386/include/IOKit/storage/IOBDBlockStorageDevice.h
 delete mode 100644 i386/include/IOKit/storage/IOBDBlockStorageDriver.h
 delete mode 100644 i386/include/IOKit/storage/IOBDMedia.h
 delete mode 100644 i386/include/IOKit/storage/IOBDMediaBSDClient.h
 delete mode 100644 i386/include/IOKit/storage/IOBDTypes.h
 delete mode 100644 i386/include/IOKit/storage/IOBlockStorageDevice.h
 delete mode 100644 i386/include/IOKit/storage/IOBlockStorageDriver.h
 delete mode 100644 i386/include/IOKit/storage/IOCDBlockStorageDevice.h
 delete mode 100644 i386/include/IOKit/storage/IOCDBlockStorageDriver.h
 delete mode 100644 i386/include/IOKit/storage/IOCDMedia.h
 delete mode 100644 i386/include/IOKit/storage/IOCDMediaBSDClient.h
 delete mode 100644 i386/include/IOKit/storage/IOCDPartitionScheme.h
 delete mode 100644 i386/include/IOKit/storage/IOCDTypes.h
 delete mode 100644 i386/include/IOKit/storage/IODVDBlockStorageDevice.h
 delete mode 100644 i386/include/IOKit/storage/IODVDBlockStorageDriver.h
 delete mode 100644 i386/include/IOKit/storage/IODVDMedia.h
 delete mode 100644 i386/include/IOKit/storage/IODVDMediaBSDClient.h
 delete mode 100644 i386/include/IOKit/storage/IODVDTypes.h
 delete mode 100644 i386/include/IOKit/storage/IOFDiskPartitionScheme.h
 delete mode 100644 i386/include/IOKit/storage/IOFilterScheme.h
 delete mode 100644 i386/include/IOKit/storage/IOFireWireStorageCharacteristics.h
 delete mode 100644 i386/include/IOKit/storage/IOGUIDPartitionScheme.h
 delete mode 100644 i386/include/IOKit/storage/IOMedia.h
 delete mode 100644 i386/include/IOKit/storage/IOMediaBSDClient.h
 delete mode 100644 i386/include/IOKit/storage/IOPartitionScheme.h
 delete mode 100644 i386/include/IOKit/storage/IOStorage.h
 delete mode 100644 i386/include/IOKit/storage/IOStorageDeviceCharacteristics.h
 delete mode 100644 i386/include/IOKit/storage/IOStorageProtocolCharacteristics.h
 delete mode 100644 i386/include/IOKit/storage/ata/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/storage/ata/.svn/entries
 delete mode 100644 i386/include/IOKit/storage/ata/.svn/text-base/IOATAPIProtocolTransport.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/ata/.svn/text-base/IOATAStorageDefines.h.svn-base
 delete mode 100644 i386/include/IOKit/storage/ata/IOATAPIProtocolTransport.h
 delete mode 100644 i386/include/IOKit/storage/ata/IOATAStorageDefines.h
 delete mode 100644 i386/include/IOKit/stream/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/stream/.svn/entries
 delete mode 100644 i386/include/IOKit/stream/.svn/text-base/IOStream.h.svn-base
 delete mode 100644 i386/include/IOKit/stream/.svn/text-base/IOStreamFamily.h.svn-base
 delete mode 100644 i386/include/IOKit/stream/.svn/text-base/IOStreamShared.h.svn-base
 delete mode 100644 i386/include/IOKit/stream/.svn/text-base/IOStreamUserClient.h.svn-base
 delete mode 100644 i386/include/IOKit/stream/IOStream.h
 delete mode 100644 i386/include/IOKit/stream/IOStreamFamily.h
 delete mode 100644 i386/include/IOKit/stream/IOStreamShared.h
 delete mode 100644 i386/include/IOKit/stream/IOStreamUserClient.h
 delete mode 100644 i386/include/IOKit/system_management/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/system_management/.svn/entries
 delete mode 100644 i386/include/IOKit/system_management/.svn/text-base/IOWatchDogTimer.h.svn-base
 delete mode 100644 i386/include/IOKit/system_management/IOWatchDogTimer.h
 delete mode 100644 i386/include/IOKit/usb/.svn/all-wcprops
 delete mode 100644 i386/include/IOKit/usb/.svn/entries
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUFIStorageServices.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBBus.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBCommand.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBCompositeDriver.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBController.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBControllerListElement.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV2.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV3.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBHIDDriver.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBHubDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBHubPolicyMaker.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBInterface.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBLog.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageClass.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageUFISubclass.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBNub.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBPipe.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBRootHubDevice.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBUserClient.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/IOUSBWorkLoop.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/USB.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/USBHub.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/USBSpec.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/.svn/text-base/USBTracepoints.h.svn-base
 delete mode 100644 i386/include/IOKit/usb/IOUFIStorageServices.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBBus.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBCommand.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBCompositeDriver.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBController.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBControllerListElement.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBControllerV2.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBControllerV3.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBDevice.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBHIDDriver.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBHubDevice.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBHubPolicyMaker.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBInterface.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBLog.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBMassStorageClass.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBMassStorageUFISubclass.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBNub.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBPipe.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBRootHubDevice.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBUserClient.h
 delete mode 100644 i386/include/IOKit/usb/IOUSBWorkLoop.h
 delete mode 100644 i386/include/IOKit/usb/USB.h
 delete mode 100644 i386/include/IOKit/usb/USBHub.h
 delete mode 100644 i386/include/IOKit/usb/USBSpec.h
 delete mode 100644 i386/include/IOKit/usb/USBTracepoints.h
 delete mode 100644 i386/include/libkern/crypto/md5.h
 delete mode 100644 i386/include/libkern/crypto/sha1.h
 delete mode 100644 i386/include/libkern/ppc/OSByteOrder.h
 delete mode 100644 i386/include/mach-o/i386/swap.h
 delete mode 100644 i386/include/mach-o/x86_64/reloc.h
 delete mode 100644 i386/include/mach/x86_64/.svn/all-wcprops
 delete mode 100644 i386/include/mach/x86_64/.svn/entries
 delete mode 100644 i386/include/mach/x86_64/.svn/text-base/task.h.svn-base
 delete mode 100644 i386/include/mach/x86_64/.svn/text-base/thread_act.h.svn-base
 delete mode 100644 i386/include/mach/x86_64/task.h
 delete mode 100644 i386/include/mach/x86_64/thread_act.h

diff --git a/i386/include/IOKit/acpi/IOACPIPlatformDevice.h b/i386/include/IOKit/acpi/IOACPIPlatformDevice.h
deleted file mode 100644
index ebf0ccf..0000000
--- a/i386/include/IOKit/acpi/IOACPIPlatformDevice.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOACPIPLATFORMDEVICE_H
-#define _IOKIT_IOACPIPLATFORMDEVICE_H
-
-#include <libkern/c++/OSContainers.h>
-#include <IOKit/IOPlatformExpert.h>
-#include <IOKit/acpi/IOACPITypes.h>
-
-class IOACPIPlatformExpert;
-
-class IOACPIPlatformDevice : public IOPlatformDevice
-{
-    OSDeclareDefaultStructors( IOACPIPlatformDevice )
-
-protected:
-    void *                 _deviceHandle;
-    UInt32                 _deviceType;
-    UInt32                 _powerFlags;
-    UInt32 *               _powerStateFlags;
-    UInt32                 _sleepPowerState;
-    IOService *            _acpiParent;
-    IOACPIPlatformExpert * _platform;
-
-    /*! @struct ExpansionData
-        @discussion This structure will be used to expand the capablilties
-                    of the class in the future.
-     */
-    struct ExpansionData { };
-
-    /*! @var reserved
-        Reserved for future use. (Internal use only)
-     */
-    ExpansionData *  reserved;
-
-    virtual bool     initACPIPowerManagement( IOService * powerParent );
-    virtual void     stopACPIPowerManagement( IOService * powerParent );
-
-public:
-    virtual bool     init( IOService *    platform,
-                           void *         handle,
-                           OSDictionary * properties );
-
-    virtual void     free( void );
-
-    virtual bool     attachToParent( IORegistryEntry * parent,
-                                     const IORegistryPlane * plane );
-
-    virtual void     detachFromParent( IORegistryEntry * parent,
-                                       const IORegistryPlane * plane );
-
-    virtual bool     getPathComponent( char * path, int * length,
-                                       const IORegistryPlane * plane ) const;
-
-    virtual bool     compareName( OSString *  name,
-                                  OSString ** matched ) const;
-
-    virtual IOReturn getResources( void );
-
-    virtual void *   getDeviceHandle( void ) const;
-
-    virtual UInt32   getDeviceStatus( void ) const;
-
-    enum {
-        kTypeDevice         = 0,
-        kTypeProcessor      = 1,
-        kTypePowerResource  = 2
-    };
-
-    virtual UInt32   getDeviceType( void ) const;
-
-    virtual void     setDeviceType( UInt32 deviceType );
-
-    // Method (object) evaluation
-
-    virtual IOReturn validateObject(  const OSSymbol * objectName );
-
-    virtual IOReturn validateObject(  const char * objectName );
-
-    virtual IOReturn evaluateObject(  const OSSymbol * objectName,
-                                      OSObject **      result     = 0,
-                                      OSObject *       params[]   = 0,
-                                      IOItemCount      paramCount = 0,
-                                      IOOptionBits     options    = 0 );
-
-    virtual IOReturn evaluateObject(  const char *     objectName,
-                                      OSObject **      result     = 0,
-                                      OSObject *       params[]   = 0,
-                                      IOItemCount      paramCount = 0,
-                                      IOOptionBits     options    = 0 );
-
-    virtual IOReturn evaluateInteger( const OSSymbol * objectName,
-                                      UInt32 *         resultInt32,
-                                      OSObject *       params[]   = 0,
-                                      IOItemCount      paramCount = 0,
-                                      IOOptionBits     options    = 0 );
-
-    virtual IOReturn evaluateInteger( const char *     objectName,
-                                      UInt32 *         resultInt32,
-                                      OSObject *       params[]   = 0,
-                                      IOItemCount      paramCount = 0,
-                                      IOOptionBits     options    = 0 );
-
-    virtual IOReturn evaluateInteger( const OSSymbol * objectName,
-                                      UInt64 *         resultInt64,
-                                      OSObject *       params[]   = 0,
-                                      IOItemCount      paramCount = 0,
-                                      IOOptionBits     options    = 0 );
-
-    virtual IOReturn evaluateInteger( const char *     objectName,
-                                      UInt64 *         resultInt64,
-                                      OSObject *       params[]   = 0,
-                                      IOItemCount      paramCount = 0,
-                                      IOOptionBits     options    = 0 );
-
-    // ACPI table access
-
-    virtual const OSData * getACPITableData( const char * tableName,
-                                             UInt32       tableInstance = 0 ) const;
-
-    // Map ACPI event to interrupt event source index
-
-    virtual SInt32   installInterruptForFixedEvent( UInt32 fixedEvent );
-
-    virtual SInt32   installInterruptForGPE( UInt32       gpeNumber,
-                                             void *       gpeBlockDevice = 0,
-                                             IOOptionBits options = 0 );
-
-    // ACPI global lock acquire/release
-
-    virtual IOReturn acquireGlobalLock( UInt32 * lockToken,
-                                        const mach_timespec_t * timeout = 0 );
-
-    virtual void     releaseGlobalLock( UInt32 lockToken );
-
-    // Address space handler registration
-
-    virtual IOReturn registerAddressSpaceHandler(
-                                   IOACPIAddressSpaceID      spaceID,
-                                   IOACPIAddressSpaceHandler handler,
-                                   void *                    context,
-                                   IOOptionBits              options = 0 );
-
-    virtual void     unregisterAddressSpaceHandler(
-                                   IOACPIAddressSpaceID      spaceID,
-                                   IOACPIAddressSpaceHandler handler,
-                                   IOOptionBits              options = 0 );
-
-    // Address space access
-
-    virtual IOReturn readAddressSpace(  UInt64 *             value,
-                                        IOACPIAddressSpaceID spaceID,
-                                        IOACPIAddress        address,
-                                        UInt32               bitWidth,
-                                        UInt32               bitOffset = 0,
-                                        IOOptionBits         options   = 0 );
-
-    virtual IOReturn writeAddressSpace( UInt64               value,
-                                        IOACPIAddressSpaceID spaceID,
-                                        IOACPIAddress        address,
-                                        UInt32               bitWidth,
-                                        UInt32               bitOffset = 0,            
-                                        IOOptionBits         options   = 0 );
-
-    // Power management
-
-    virtual bool     hasSystemWakeCapability( void ) const;
-
-    virtual IOReturn setSystemWakeCapabilityEnable( bool enable );
-
-    virtual bool     hasACPIPowerStateSupport( UInt32 powerState ) const;
-
-    virtual IOReturn setACPIPowerManagementEnable(
-                            bool         enable,
-                            UInt32       powerState = kIOACPIDevicePowerStateD3,
-                            IOOptionBits options    = 0 );
-
-    virtual IOReturn setPowerState( unsigned long powerState,
-                                    IOService * whatDevice );
-
-    // I/O space helpers
-
-    virtual void     ioWrite32( UInt16 offset, UInt32 value,
-                                IOMemoryMap * map = 0 );
-
-    virtual void     ioWrite16( UInt16 offset, UInt16 value,
-                                IOMemoryMap * map = 0 );
-
-    virtual void     ioWrite8(  UInt16 offset, UInt8 value,
-                                IOMemoryMap * map = 0 );
-
-    virtual UInt32   ioRead32( UInt16 offset, IOMemoryMap * map = 0 );
-
-    virtual UInt16   ioRead16( UInt16 offset, IOMemoryMap * map = 0 );
-
-    virtual UInt8    ioRead8(  UInt16 offset, IOMemoryMap * map = 0 );
-
-    // vtable padding
-
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  0 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  1 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  2 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  3 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  4 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  5 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  6 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  7 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  8 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice,  9 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 10 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 11 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 12 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 13 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 14 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 15 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 16 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 17 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 18 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 19 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 20 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 21 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 22 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 23 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 24 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 25 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 26 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 27 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 28 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 29 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 30 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformDevice, 31 );
-};
-
-#endif /* !_IOKIT_IOACPIPLATFORMDEVICE_H */
diff --git a/i386/include/IOKit/acpi/IOACPIPlatformExpert.h b/i386/include/IOKit/acpi/IOACPIPlatformExpert.h
deleted file mode 100644
index 413f396..0000000
--- a/i386/include/IOKit/acpi/IOACPIPlatformExpert.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOACPIPLATFORMEXPERT_H
-#define _IOKIT_IOACPIPLATFORMEXPERT_H
-
-#include <IOKit/IOPlatformExpert.h>           // superclass
-#include <IOKit/acpi/IOACPIPlatformDevice.h>  // children
-
-class IOACPIPlatformExpert : public IODTPlatformExpert
-{
-    OSDeclareAbstractStructors( IOACPIPlatformExpert )
-
-    friend class IOACPIPlatformDevice;
-
-protected:
-    /*! @struct ExpansionData
-        @discussion This structure will be used to expand the capablilties
-                    of the class in the future.
-     */
-    struct ExpansionData { };
-
-    /*! @var reserved
-        Reserved for future use. (Internal use only)
-     */
-    ExpansionData *  reserved;
-
-public:
-    virtual bool     start( IOService * provider );
-
-protected:
-    // Map ACPI event to interrupt event source index
-
-    virtual SInt32   installDeviceInterruptForFixedEvent(
-                                  IOService *  device,
-                                  UInt32       fixedEvent ) = 0;
-
-    virtual SInt32   installDeviceInterruptForGPE(
-                                  IOService *  device,
-                                  UInt32       gpeNumber,
-                                  void *       gpeBlockDevice,
-                                  IOOptionBits options ) = 0;
-
-    // ACPI global lock acquisition
-
-    virtual IOReturn acquireGlobalLock( IOService *             client,
-                                        UInt32 *                lockToken,
-                                        const mach_timespec_t * timeout ) = 0;
-
-    virtual void     releaseGlobalLock( IOService * client,
-                                        UInt32      lockToken ) = 0;
-
-    // ACPI method and object evaluation
-
-    virtual IOReturn validateObject( IOACPIPlatformDevice * device,
-                                     const OSSymbol *       objectName ) = 0;
-
-    virtual IOReturn validateObject( IOACPIPlatformDevice * device,
-                                     const char *           objectName );
-
-    virtual IOReturn evaluateObject( IOACPIPlatformDevice * device,
-                                     const OSSymbol *       objectName,
-                                     OSObject **            result,
-                                     OSObject *             params[],
-                                     IOItemCount            paramCount,
-                                     IOOptionBits           options ) = 0;
-
-    virtual IOReturn evaluateObject( IOACPIPlatformDevice * device,
-                                     const char *           objectName,
-                                     OSObject **            result,
-                                     OSObject *             params[],
-                                     IOItemCount            paramCount,
-                                     IOOptionBits           options );
-
-    // ACPI table
-
-    virtual const OSData * getACPITableData(
-                                     const char * tableName,
-                                     UInt32       tableInstance ) = 0;
-
-    // Address space handler
-
-    virtual IOReturn registerAddressSpaceHandler(
-                                   IOACPIPlatformDevice *    device,
-                                   IOACPIAddressSpaceID      spaceID,
-                                   IOACPIAddressSpaceHandler handler,
-                                   void *                    context,
-                                   IOOptionBits              options ) = 0;
-
-    virtual void     unregisterAddressSpaceHandler(
-                                   IOACPIPlatformDevice *    device,
-                                   IOACPIAddressSpaceID      spaceID,
-                                   IOACPIAddressSpaceHandler handler,
-                                   IOOptionBits              options ) = 0;
-
-    // Address space read/write
-
-    virtual IOReturn readAddressSpace(  UInt64 *             value,
-                                        IOACPIAddressSpaceID spaceID,
-                                        IOACPIAddress        address,
-                                        UInt32               bitWidth,
-                                        UInt32               bitOffset,
-                                        IOOptionBits         options ) = 0;
-
-    virtual IOReturn writeAddressSpace( UInt64               value,
-                                        IOACPIAddressSpaceID spaceID,
-                                        IOACPIAddress        address,
-                                        UInt32               bitWidth,
-                                        UInt32               bitOffset,            
-                                        IOOptionBits         options ) = 0;
-
-    // Device power management
-
-    virtual IOReturn setDevicePowerState( IOACPIPlatformDevice * device,
-                                          UInt32 powerState ) = 0;
-
-    virtual IOReturn getDevicePowerState( IOACPIPlatformDevice * device,
-                                          UInt32 * powerState ) = 0;
-
-    virtual IOReturn setDeviceWakeEnable( IOACPIPlatformDevice * device,
-                                          bool enable ) = 0;
-
-    // vtable padding
-
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  0 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  1 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  2 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  3 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  4 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  5 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  6 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  7 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  8 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert,  9 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 10 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 11 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 12 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 13 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 14 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 15 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 16 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 17 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 18 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 19 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 20 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 21 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 22 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 23 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 24 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 25 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 26 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 27 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 28 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 29 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 30 );
-    OSMetaClassDeclareReservedUnused( IOACPIPlatformExpert, 31 );
-};
-
-#endif /* !_IOKIT_IOACPIPLATFORMEXPERT_H */
diff --git a/i386/include/IOKit/acpi/IOACPITypes.h b/i386/include/IOKit/acpi/IOACPITypes.h
deleted file mode 100644
index 6215cd4..0000000
--- a/i386/include/IOKit/acpi/IOACPITypes.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __IOKIT_IOACPITYPES_H
-#define __IOKIT_IOACPITYPES_H
-
-#include <IOKit/IOMessage.h>
-
-extern const IORegistryPlane * gIOACPIPlane;
-extern const OSSymbol *        gIOACPIHardwareIDKey;
-extern const OSSymbol *        gIOACPIUniqueIDKey;
-extern const OSSymbol *        gIOACPIAddressKey;
-extern const OSSymbol *        gIOACPIDeviceStatusKey;
-
-#pragma pack(1)
-
-struct IOACPIAddressSpaceDescriptor {
-    UInt32  resourceType;
-    UInt32  generalFlags;
-    UInt32  typeSpecificFlags;
-    UInt32  reserved1;
-    UInt64  granularity;
-    UInt64  minAddressRange;
-    UInt64  maxAddressRange;
-    UInt64  translationOffset;
-    UInt64  addressLength;
-    UInt64  reserved2;
-    UInt64  reserved3;
-    UInt64  reserved4;
-};
-
-enum {
-    kIOACPIMemoryRange    = 0,
-    kIOACPIIORange        = 1,
-    kIOACPIBusNumberRange = 2
-};
-
-typedef UInt32 IOACPIAddressSpaceID;
-
-enum {
-    kIOACPIAddressSpaceIDSystemMemory       = 0,
-    kIOACPIAddressSpaceIDSystemIO           = 1,
-    kIOACPIAddressSpaceIDPCIConfiguration   = 2,
-    kIOACPIAddressSpaceIDEmbeddedController = 3,
-    kIOACPIAddressSpaceIDSMBus              = 4
-};
-
-/*
- * Address space operation
- */
-enum {
-    kIOACPIAddressSpaceOpRead  = 0,
-    kIOACPIAddressSpaceOpWrite = 1
-};
-
-/*
- * 64-bit ACPI address
- */
-union IOACPIAddress {
-    UInt64 addr64;
-    struct {
-        unsigned int offset     :16;
-        unsigned int function   :3;
-        unsigned int device     :5;
-        unsigned int bus        :8;
-        unsigned int segment    :16;
-        unsigned int reserved   :16;
-    } pci;
-};
-
-/*
- * Address space handler
- */
-typedef IOReturn (*IOACPIAddressSpaceHandler)( UInt32         operation,
-                                               IOACPIAddress  address,
-                                               UInt64 *       value,
-                                               UInt32         bitWidth,
-                                               UInt32         bitOffset,
-                                               void *         context );
-
-/*
- * ACPI fixed event types
- */
-enum {
-    kIOACPIFixedEventPMTimer       = 0,
-    kIOACPIFixedEventPowerButton   = 2,
-    kIOACPIFixedEventSleepButton   = 3,
-    kIOACPIFixedEventRealTimeClock = 4
-};
-
-#pragma pack()
-
-/*
- * FIXME: Move to xnu/iokit to reserve the ACPI family code.
- */
-#ifndef sub_iokit_acpi
-#define sub_iokit_acpi   err_sub(10)
-#endif
-
-/*
- * ACPI notify message sent to all clients and interested parties.
- * The notify code can be read from the argument as an UInt32.
- */
-#define kIOACPIMessageDeviceNotification  iokit_family_msg(sub_iokit_acpi, 0x10)
-
-/*
- * ACPI device power states
- */
-enum {
-    kIOACPIDevicePowerStateD0    = 0,
-    kIOACPIDevicePowerStateD1    = 1,
-    kIOACPIDevicePowerStateD2    = 2,
-    kIOACPIDevicePowerStateD3    = 3,
-    kIOACPIDevicePowerStateCount = 4
-};
-
-#endif /* !__IOKIT_IOACPITYPES_H */
diff --git a/i386/include/IOKit/ata/ATADeviceNub.h b/i386/include/IOKit/ata/ATADeviceNub.h
deleted file mode 100644
index db14182..0000000
--- a/i386/include/IOKit/ata/ATADeviceNub.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- @header ATADeviceNub.h
- @abstract A concrete implementation of IOATADevice.
- */
- 
-#ifndef _ATADEVICENUB_H
-#define _ATADEVICENUB_H
-
-#include <IOKit/IOTypes.h>
-#include "IOATATypes.h"
-#include "IOATADevice.h"
-#include "IOATAController.h"
-
-#include "IOATABusCommand.h"
-
-
-/*!
-@class ATADeviceNub
-@abstract ATADeviceNub is a concrete implementation of IOATADevice.
-@discussion clients of IOATA (disk drivers) should use the interface presented
-by IOATADevice.  Concrete nubs are private to the IOATA family and 
-specific subclasses of IOATADevice are instantiated by controller 
-drivers to provide the abstract interface to clients.
-
-*/
-class ATADeviceNub : public IOATADevice
-{
-    OSDeclareDefaultStructors(ATADeviceNub);
-
-public:
-
-	/*!@function ataDeviceNub
-	@abstract static creator function - used by IOATAControllers to create nubs.
-	*/
-	static ATADeviceNub* ataDeviceNub( IOATAController* provider, ataUnitID unit, ataDeviceType devType);
- 
-	/*!@function attach
-	@abstract override of IOService method.
-	*/
-    virtual bool attach(IOService* provider );
- 
- 
- 	// overrides from IOATADevice to provide actual client interface
- 	
- 
-	/*!@function executeCommand
-	@abstract Submit IO requests 
-	*/
-    virtual IOReturn executeCommand(IOATACommand* command);
-
-	// create and destroy IOATACommands
-	/*!@function allocCommand
-	@abstract create command objects for clients.
-	*/
-	virtual IOATACommand*	allocCommand( void );
-	
-	/*!@function freeCommand
-	@abstract Clients use this method to dispose of command objects.
-	*/
-	virtual void freeCommand( IOATACommand* inCommand); 
-	
-	
-protected:
-	
-    /*!@function init
-	@abstract used after creating the nub.
-	*/
-    virtual bool init(IOATAController* provider, ataUnitID unit, ataDeviceType devType);
-	
-	/*!@function publishProperties
-	@abstract publish the nub's properties in the device tree.
-	*/
-	virtual void publishProperties( void );
-	
-	/*!@function publishBusProperties
-	@abstract puts info about this device's bus capability in the device tree.
-	*/
-	virtual void publishBusProperties(void);
-	
-	/*!@function publishVendorProperties
-	@abstract will be deprecated.
-	*/
-	virtual void publishVendorProperties( void );
-
-	/*!@function getDeviceID
-	@abstract get the unit id of this drive (0 or 1)
-	*/
-	virtual IOReturn getDeviceID(void);
-
-	/*!@function MyATACallback
-	@abstract to be deprecated.
-	*/
-	static void MyATACallback(IOATACommand* command );
-	
-	/*!@function processCallback
-	@abstract to be deprecated.
-	*/
-	void processCallback(IOATACommand* command );
-	
-	/*!@function swapBytes16
-	@abstract to be deprecated.
-	*/
-	void swapBytes16( UInt8* dataBuffer, IOByteCount length);
-    
-    UInt8* buffer;
-	
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the ATADeviceNub in the future.
-    */
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-private:
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 0);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 1);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 2);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 3);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 4);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 5);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 6);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 7);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 8);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 9);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 10);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 11);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 12);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 13);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 14);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 15);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 16);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 17);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 18);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 19);
-    OSMetaClassDeclareReservedUnused(ATADeviceNub, 20);
-
-};
-
-#endif /* !_IOATABUSNUB_H */
diff --git a/i386/include/IOKit/ata/ATATimerEventSource.h b/i386/include/IOKit/ata/ATATimerEventSource.h
deleted file mode 100644
index 864fa9e..0000000
--- a/i386/include/IOKit/ata/ATATimerEventSource.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2001-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _ATATIMEREVENTSOURCE_H
-#define _ATATIMEREVENTSOURCE_H
-
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOTimerEventSource.h>
-
-
-/*!
-@class ATATimerEventSource
-
-@discussion
-Extend the timer event source to allow checking for timer expiration 
-from behind the workloop.
-*/
-
-class ATATimerEventSource : public IOTimerEventSource
-{
-    OSDeclareDefaultStructors(ATATimerEventSource);
-
-	public:
-		
-	/*!@function ataTimerEventSource
-	@abstract  allocate an instance of this type.
-	*/
-    static ATATimerEventSource *
-	ataTimerEventSource(OSObject *owner, Action action = 0);
-	
-	/*!@function hasTimedOut
-	@abstract returns true if the timer has expired since the last enable/disable or setTimeout() or wakeAtTime() call.
-	*/
-	virtual bool hasTimedOut( void );
-		
-	// override to initialize the time out flag.
-  	/*!@function 
-	@abstract 
-	*/
-	virtual bool init(OSObject *owner, Action action = 0);
-
-	/*!@function enable
-	@abstract overrides in order to set/clear the timed out flag
-	*/
-	virtual void enable();
-
-	/*!@function disable
-	@abstract overrides in order to set/clear the timed out flag
-	*/
-	virtual void disable();
-
-	/*!@function wakeAtTime
-	@abstract overrides in order to set/clear the timed out flag
-	*/
-	virtual IOReturn wakeAtTime(UnsignedWide abstime);
-
-	/*!@function cancelTimeout
-	@abstract overrides in order to set/clear the timed out flag
-	*/
-	virtual void cancelTimeout();
-
-protected:
-	
-	enum{  kTimedOutTrue = 'true',
-			kTimedOutFalse = 'fals'
-		};
-	
-	UInt32 hasExpired;
-
-
-	/*!@function myTimeout
-	@abstract my timeout function which sets the timedOut flag atomically.
-	*/
-	static void myTimeout(void *self);
-
-	/*!@function setTimeoutFunc
-	@abstract override to install my timeout function instead of the super's.
-	*/
-    virtual void setTimeoutFunc();
-
-	/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */
-    struct ExpansionData { };
-
-	/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-private:
-    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 0);
-    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 1);
-    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 2);
-    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 3);
-    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 4);
-    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 5);
-    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 6);
-    OSMetaClassDeclareReservedUnused(ATATimerEventSource, 7);
-	
-};
-
-
-#endif /*_ATATIMEREVENTSOURCE_H*/
diff --git a/i386/include/IOKit/ata/IOATABusCommand.h b/i386/include/IOKit/ata/IOATABusCommand.h
deleted file mode 100644
index 94b3bca..0000000
--- a/i386/include/IOKit/ata/IOATABusCommand.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- *
- *	IOATABusCommand.h
- *
- */
- 
-#ifndef _IOATABUSCOMMAND_H
-#define _IOATABUSCOMMAND_H
-
-#include <IOKit/IOTypes.h>
-#include "IOATATypes.h"
-#include "IOATACommand.h"
-
-
-class IOSyncer;
-
-
-/*!
-
-@class IOATABusCommand
-
-@discussion ATA Device (disk) drivers should use the superclass, IOATACommand 
-and may not derive or use any subclass of IOATACommand. 
-
-IOATABusCommand is the subclass of IOATACommand used by 
-IOATAControllers. Controller classes may override this class to 
-provide additional fields as their needs dictate or may use this 
-as a concrete class if it is sufficient.
-
-IOATAControllers are always paired with specific IOATADevices 
-and each specific subclass of IOATADevice is in turn the factory method 
-for IOATACommands for use by disk drivers.
-
-In this manner, mass-storage device drivers (disk drivers, clients of 
-ATA bus controllers) see only the generalized interface of IOATADevice 
-and the generalized interface of IOATACommand. This provides isolation 
-from specific bus details for disk drivers and offers flexibility to 
-controllers to add per-command fields and state variables for their own 
-internal use.
-
-*/
-
-class IOATABusCommand : public IOATACommand {
-
-	OSDeclareDefaultStructors( IOATABusCommand );
-	
-	public:
-	
-	// data items for use by IOATAController
-	
-	/*! @var queueChain queue header for use by IOATAController. */
-	queue_chain_t	queueChain; 
-
-	/*! @var state state-semaphore for use by IOATAController */
-	UInt32 state;
-	
-	/*! @var syncer IOSyncer for use by IOATAController */
-	IOSyncer* syncer;
-
-
-
-	/*!@function allocateCmd
-	@abstract factory method to create an instance of this class used by subclasses of IOATADevice
-	*/
-	static IOATABusCommand* allocateCmd(void);
-
-	/*!@function zeroCommand
-	@abstract set to blank state, call prior to re-use of this object
-	*/
-	virtual void zeroCommand(void);  	  	  	
-  	
- 	/*!@function getOpcode
-	@abstract return the command opcode
-	*/
-	virtual ataOpcode getOpcode( void );  
-	
-	/*!@function getFlags
-	@abstract return the flags for this command.
-	*/
-	virtual ataFlags getFlags ( void ); 
-		
-	/*!@function getRegMask
-	@abstract  get the register mask for desired regs
-	*/
-	virtual ataRegMask getRegMask( void );
-	
-	/*!@function getUnit
-	@abstract return the unit id (0 master, 1 slave)
-	*/
-	virtual ataUnitID getUnit( void ); 
-	
-	/*!@function getTimeoutMS
-	@abstract return the timeout value for this command
-	*/
-	virtual UInt32 getTimeoutMS (void ); 
-	
-	/*!@function setResult
-	@abstract set the result code
-	*/
-	virtual void setResult( IOReturn );
-
-	/*!@function getCallbackPtr
-	@abstract return the callback pointer
-	*/
-	virtual IOATACompletionFunction* getCallbackPtr (void ); 
-	
-	
-	/*!@function executeCallback
-	@abstract call the completion callback function
-	*/
-	virtual void executeCallback(void);
-
-	/*!@function getTaskFilePtr
-	@abstract return the taskfile structure pointer.
-	*/
-	virtual ataTaskFile* getTaskFilePtr(void);
-	
-	/*!@function getPacketSize
-	@abstract return the size of atapi packet if any.
-	*/
-	virtual UInt16 getPacketSize(void);
-	
-	/*!@function getPacketData
-	@abstract return pointer to the array of packet data. 
-	*/
-	virtual UInt16*	getPacketData(void);
-	
-	/*!@function getTransferChunkSize
-	@abstract number of bytes between interrupts.
-	*/
-	virtual IOByteCount getTransferChunkSize(void);
-
-	/*!@function setActualTransfer
-	@abstract set the byte count of bytes actually transferred.
-	*/
-	virtual void setActualTransfer ( IOByteCount bytesTransferred );
-	
-	/*!@function getBuffer
-	@abstract get pointer to the memory descriptor for this transaction
-	*/
-	virtual IOMemoryDescriptor* getBuffer ( void);
-	
-	/*!@function getPosition
-	@abstract the position within the memory buffer for the transaction.
-	*/
-	virtual IOByteCount getPosition (void);
-	
-	/*!@function getByteCount
-	@abstract return the byte count for this transaction to transfer.
-	*/
-	virtual IOByteCount getByteCount (void);
-	
-	/*!@function setCommandInUse
-	@abstract mark the command as being in progress.
-	*/
-	virtual void setCommandInUse( bool inUse = true);
-
-
-	protected:
-	
-	//
-	/*!@function init
-	@abstract Zeroes all data, returns false if allocation fails. protected.
-	*/
-  	virtual bool init();  
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-private:
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 1);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 2);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 3);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 4);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 5);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 6);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 7);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 8);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 9);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 10);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 11);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 12);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 13);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 14);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 15);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 16);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 17);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 18);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 19);
-    OSMetaClassDeclareReservedUnused(IOATABusCommand, 20);
-};
-
-#include <IOKit/IODMACommand.h>
-
-class IOATABusCommand64 : public IOATABusCommand
-{
-
-	OSDeclareDefaultStructors( IOATABusCommand64 );
-	
-	public:
-	
-	// new features
-	static IOATABusCommand64* allocateCmd32(void);	
-	virtual IODMACommand* GetDMACommand( void );
-	
-	
-	
-	// overrides for IODMACommand setup
-	virtual void zeroCommand(void);  	 
-	virtual void setBuffer ( IOMemoryDescriptor* inDesc);
-	virtual void setCommandInUse( bool inUse = true);
-	virtual void executeCallback(void);
-
-
-	protected:
-	IODMACommand* _dmaCmd;
-	virtual bool init();  
-	virtual void free();
-};
-
-#endif /*_IOATABUSCOMMAND_H*/
diff --git a/i386/include/IOKit/ata/IOATABusInfo.h b/i386/include/IOKit/ata/IOATABusInfo.h
deleted file mode 100644
index 6faec4c..0000000
--- a/i386/include/IOKit/ata/IOATABusInfo.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOATABUSINFO_H
-#define _IOATABUSINFO_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOTypes.h>
-#include "IOATATypes.h"
-
-/*!
-@class IOATABusInfo
-@discussion used to indicate the capabilities of the bus the device is connected to, PIO and DMA modes supported, etc.
-*/
-
-class IOATABusInfo : public OSObject
-{
-	OSDeclareDefaultStructors( IOATABusInfo );
-	
-	public:
-	
-	/*!@function atabusinfo
-	@abstract factory method
-	*/
-	static IOATABusInfo* atabusinfo(void);
-	
-	/*!@function zeroData
-	@abstract set this object to a blank state.
-	*/
-	virtual void zeroData(void);
-
-	// Used by clients of ATAControllers to find out about the bus
-	// capability.
-
-	/*!@function getSocketType
-	@abstract returns the socket type, internal fixed, media-bay, PC-Card
-	Used by clients of ATAControllers to find out about the bus
-	*/
-	ataSocketType getSocketType( void );  
-
-	/*!@function getPIOModes
-	@abstract returns the bit-significant map of PIO mode(s) supported on the bus. 
-	Used by clients of ATAControllers to find out about the bus.
-	*/
-	UInt8 getPIOModes( void );
-	
-	/*!@function getDMAModes
-	@abstract bit-significant map of DMA mode(s) supported on the bus. 
-	Used by clients of ATAControllers to find out about the bus.
-	*/
-	UInt8 getDMAModes( void );
-	
-	/*!@function getUltraModes
-	@abstract bit-significant map of Ultra mode(s) supported on the bus. 
-	Used by clients of ATAControllers to find out about the bus.
-	*/
-	UInt8 getUltraModes( void );
-	
-	/*!@function getUnits
-	@abstract How many devices are present on bus. 
-	Used by clients of ATAControllers to find out about the bus.
-	*/
-	UInt8 getUnits( void );	 
-
-	/*!@function supportsDMA
-	@abstract  True = DMA supported on bus - inferred by looking at the DMA mode bits.
-	Used by clients of ATAControllers to find out about the bus.
-	*/
-	bool supportsDMA( void );   		
-	
-	/*!@function supportsExtendedLBA
-	@abstract Supports 48-bit LBA if true.
-	Used by clients of ATAControllers to find out about the bus.
-	*/
-	bool supportsExtendedLBA( void );
-	
-	/*!@function maxBlocksExtended
-	@abstract The maximum number of 512-byte blocks this controller supports
-	in a single Extended LBA transfer. Some controllers may be limited to less than 
-	the maximum sector count allowed under extended LBA protocol. 
-	*/
-	UInt16 maxBlocksExtended(void);
-	
-	/*!@function supportsOverlapped
-	@abstract Supports overlapped packet feature set if true. 
-	Used by clients of ATAControllers to find out about the bus.
-	*/
-	bool supportsOverlapped( void );  
-	
-	/*!@function supportsDMAQueued
-	@abstract Supports DMA Queued Feature set if true. 
-	Used by clients of ATAControllers to find out about the bus.
-	*/
-	bool supportsDMAQueued( void ); 
-	
-	
-	// Used by ATAControllers to generate an information object.
-	// Would not be used by disk device drivers normally.
-	// Bus controllers should set these items everytime.
-	
-	/*!@function setSocketType
-	@abstract internal fixed, media-bay, PC-Card. Set by ATAControllers.
-	*/
-	void setSocketType( ataSocketType inSocketType ); 
-	
-	/*!@function setPIOModes
-	@abstract Bit significant map of supported transfer modes. Set by ATAControllers.
-	*/
-	void setPIOModes( UInt8 inModeBitMap);		
-	
-	/*!@function setDMAModes
-	@abstract Bit significant map of supported transfer modes. Set by ATAControllers.
-	*/
-	void setDMAModes( UInt8 inModeBitMap );	
-	
-	/*!@function setUltraModes
-	@abstract Bit significant map of supported transfer modes. Set by ATAControllers.
-	*/
-	void setUltraModes( UInt8 inModeBitMap );	
-	
-	/*!@function setUnits
-	@abstract set to indicate how many devices are on this bus. Set by ATAControllers.
-	*/
-	void setUnits( UInt8 inNumUnits );
-
-	// Optional bus protocols some busses may support
-	/*!@function setExtendedLBA
-	@abstract Set true for supports 48-bit LBA. Set by ATAControllers.
-	*/
-	void setExtendedLBA( bool	inState ); 	
-	
-	/*!function setMaxBlocksExtended 
-	 @abstract value set by controllers to indicate the maximum number of blocks 
-	 allowed in a single transfer of data. Some dma engines may not be capable of supporting the full 
-	 16-bit worth of sector count allowed under 48 bit extended LBA. Default is 256 blocks, same as 
-	 standard ATA. 
-	 */
-	void setMaxBlocksExtended( UInt16 inMaxBlocks);
-	
-	/*!@function setOverlapped
-	@abstract Set true for supports overlapped packet feature set. Set by ATAControllers.
-	*/
-	void setOverlapped( bool inState);  	  
-	
-	/*!@function setDMAQueued
-	@abstract Set true if supports DMA Queued Feature. Set by ATAControllers.
-	*/
-	void setDMAQueued( bool inState);   	//    
-
-	protected:
-
-	UInt8 							_PIOModes;				/* PIO modes supported (bit-significant) */
-	UInt8 							_MultiDMAModes;			/* <--: Multiword DMA modes supported (b-sig) */
-	UInt8 							_UltraDMAModes;			/* <--: Ultra DMA modes supported (b-sig) */
-	bool							_ExtendedLBA;           /* <--: Suppports 48-bit LBA protocol */
-	bool							_Overlapped;			/* <--: Supports overlapped packet feature set */
-	bool							_DMAQueued;				/* <--: Supports DMA Queued Feature set */
-	ataSocketType					_SocketType;			/* <--: Indicates bus is fixed internal, removable media-bay, removable PC-Card or unknown type */
-	UInt8							_numUnits;				/* <--: How many devices on this bus */
-	UInt16							_maxBlocksExtended;
-	
-	protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
- 
-	virtual bool init(); 
-
-private:
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 0);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 1);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 2);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 3);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 4);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 5);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 6);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 7);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 8);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 9);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 10);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 11);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 12);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 13);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 14);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 15);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 16);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 17);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 18);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 19);
-    OSMetaClassDeclareReservedUnused(IOATABusInfo, 20);
-};
-
-
-#endif /* !_IOATABUSINFO_H */
diff --git a/i386/include/IOKit/ata/IOATACommand.h b/i386/include/IOKit/ata/IOATACommand.h
deleted file mode 100644
index 773f28a..0000000
--- a/i386/include/IOKit/ata/IOATACommand.h
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- *
- *	IOATACommand.h
- *
- */
-
-#ifndef _IOATACOMMAND_H
-#define _IOATACOMMAND_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOCommand.h>
-#include "IOATATypes.h"
-
-
-class IOExtendedLBA;
-class IOATACommand;
-
-
-/*! @typedef IOATACompletionFunction callback function for ATA disk devices.
-*/
-typedef void (IOATACompletionFunction)(IOATACommand* command );
-
-
-/*!
-@class IOATACommand
-
-@discussion
-Command structure superclass, created and freed only by IOATADevice objects 
-populated by disk device drivers with command parameters
-then submitted for operation to their IOATADevice provider for execution.
-
-IOATACommand is a virtual class, a concrete subclass contains the methods and fields needed 
-by IOATAControllers. Subclasses may be specific to particular controller hardware.
-Disk device drivers will only have visibility to this interface and may not subclass this object.
-Disk device drivers should instead make use of the void* refcon field which the controllers will not 
-touch
-*/
-
-class IOATACommand : public IOCommand {
-
-	OSDeclareAbstractStructors( IOATACommand );
-	
-	public:
-	
-	/*!@function zeroCommand
-	@abstract set to blank state, MUST call prior to re-use of this object
-	*/
-	virtual void zeroCommand(void);  
-	
-	/*!@function setOpcode
-	@abstract command opcode as defined in IOATATypes.
-	*/
-	virtual void setOpcode( ataOpcode inCode);
-
-	/*!@function setFlags
-	@abstract set the flags for this command, as defined in IOATATypes.
-	*/
-	virtual void setFlags( UInt32 inFlags);
-
-	/*!@function setUnit
-	@abstract set the unit number for this command.
-	*/
-	virtual void setUnit( ataUnitID inUnit);
-	
-	/*!@function setTimeoutMS
-	@abstract how long to allow this command to complete, in milliseconds, once issued to
-	 the hardware. if the time period expires, this command will return with a timeout error.
-	*/
-	virtual void setTimeoutMS( UInt32 inMs);
-
-	/*!@function setCallbackPtr
-	@abstract set the function pointer to call when this command completes.
-	*/
-	virtual void setCallbackPtr (IOATACompletionFunction* inCompletion);
-	
-	/*!@function setRegMask
-	@abstract used when accessing registers or reading registers on an error result. Mask is defined
-	in IOATATypes.h
-	*/
-	virtual void setRegMask( ataRegMask mask);
-
-	// memory information
-	// Since ATA hardware is limited in the amount of bytes 
-	// that can be transfered in a command, the disk driver shall supply
-	// a seperate offset and byte count per transfer.
-	// the offset may be any amount. The byte count must be a multiple of the  
-	// sector size of the device, ie, N * 512 bytes for ata hard drives.
-	/*!@function setBuffer
-	@abstract set the IIOMemoryDescriptor for this transaction.
-	*/
-	virtual void setBuffer ( IOMemoryDescriptor* inDesc);
-
-	/*!@function setPosition
-	@abstract used to set an offset into the memory descriptor for this transfer.
-	*/
-	virtual void setPosition (IOByteCount fromPosition);
-
-	/*!@function setByteCount
-	@abstract set the byte count for this transaction. Should agree with the device command and the 
-	memory descriptor in use.
-	*/
-	virtual void setByteCount (IOByteCount numBytes);
-
-	/*!@function setTransferChunkSize
-	@abstract set the size of transfer between intervening interrupts. necessary when doing PIO Read/Write Multiple, etc. so the controller knows when to expect an interrupt during multi-sector data transfers.
-	*/
-	virtual void setTransferChunkSize( IOByteCount chunk = kATADefaultSectorSize);
-	
-	/*!@function setFeatures
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setFeatures( UInt8 in);
-
-	/*!@function getErrorReg
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt8 getErrorReg (void );
-	
-	/*!@function setSectorCount
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setSectorCount( UInt8 in);
-
-	/*!@function getSectorCount
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt8 getSectorCount (void );
-	
-	/*!@function setSectorNumber
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setSectorNumber( UInt8 in);
-
-	/*!@function getSectorNumber
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt8 getSectorNumber (void );
-	
-	/*!@function setCylLo
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setCylLo ( UInt8 in);
-
-	/*!@function getCylLo
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt8 getCylLo (void );
-	
-	/*!@function setCylHi
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setCylHi( UInt8 in);
-
-	/*!@function getCylHi
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt8 getCylHi (void );
-	
-	/*!@function setDevice_Head
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setDevice_Head( UInt8 in);
-
-	/*!@function getDevice_Head
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt8 getDevice_Head (void );
-	
-	/*!@function setCommand
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setCommand ( UInt8 in);
-
-	/*!@function getStatus
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt8 getStatus (void );
-	
-	/*!@function setLBA28
-	@abstract convenience method that sets the taskfile registers into a 28-bit LBA address, with unit selected and LBA bit set. return err if param out of range, return kIOSuccess (kATANoErr) = 0 on return if successful
-	*/
-	virtual IOReturn setLBA28( UInt32 lba, ataUnitID inUnit);
-	
-	/*!@function setPacketCommand
-	@abstract ATAPI command packet max size is 16 bytes. Makes deep copy of data. 
-	*/
-	virtual IOReturn setPacketCommand( UInt16 packetSizeBytes, UInt8* command); 
-	
-	// the following registers are only accessed by register access 
-	// commands. Not by normal command dispatch where they are handled 
-	// by the controller.
-	
-	// not part of task file params. not written to device when sending commands.
-	virtual void setDataReg ( UInt16 in);
-	virtual UInt16 getDataReg (void );
-
-	// not part of taskfile. Not usually used except by controller.
-	virtual void setControl ( UInt8 in);
-	virtual UInt8 getAltStatus (void );
-
-	// return values
-	/*!@function getResult
-	@abstract IOReturn value of the result of this command. ATA family errors are defined in IOATATypes.h
-	*/
-	virtual IOReturn getResult (void);
-
-	/*!@function getBuffer
-	@abstract the IOMemoryDescriptor used in this transaction.
-	*/
-	virtual IOMemoryDescriptor* getBuffer ( void ); 
-
-	/*!@function getActualTransfer
-	@abstract The byte count on the ending result, as best as can be determined by the controller. May be zero, but partial transfer may have occurred on error in some cases.
-	*/
-	virtual IOByteCount getActualTransfer ( void );
-
-	/*!@function getEndStatusReg
-	@abstract the value of the status register on the end of the command.
-	*/
-	virtual UInt8	getEndStatusReg (void);   // always returned
-
-	/*!@function getEndErrorReg
-	@abstract If the error bit was set in the status register, the value of the error register is returned at the end of a command.
-	*/
-	virtual UInt8 	getEndErrorReg( void );   
-
-	/*!@function getCommandInUse
-	@abstract returns true if IOATAController is still in control of the command.
-	*/
-	virtual bool	getCommandInUse( void );  // returns true if IOATAController is using the command.
-	
-	// for use by disk drivers, clients of IOATADevice only.
-	// IOATADevice and IOATAControllers shall not use this field in any manner
-	/*!@var refCon
-	@abstract for use by disk drivers, clients of IOATADevice only. IOATADevice and IOATAControllers shall not use this field in any manner.
-	*/
-	void*	refCon;
-	
-	/*!@var refCon2
-	@abstract for use by disk drivers, clients of IOATADevice only. IOATADevice and IOATAControllers shall not use this field in any manner.
-	*/
-	void* 	refCon2;
-
-	protected:
-  											// < 	return from ATA controllers to disk drivers
-  											//  > 	sent to ATA controllers from disk drivers	
-	ataOpcode			_opCode;			//  >	Command code for the controller.
-	UInt32				_flags;		 		//  > 	Flags for this command
-	ataRegisterImage 	_taskFile;   		// <> 	Taskfile + data and control registers.
-	ATAPICmdPacket		_packet;	 		//  > 	ATAPI packet
-	ataUnitID			_unit;				//  > 	Unit number
-	UInt32				_timeoutMS;			//  > 	timeout command in ms.
-	IOMemoryDescriptor* _desc;        		//  >	Buffer for data may be nil if command transfer no data
-	IOByteCount			_position;			//  >	Position within the descriptor for this command
-	IOByteCount			_byteCount;			//	>	How many bytes to transfer.
-	IOByteCount			_logicalChunkSize;	//  >	How many bytes between intervening interrupts (R/W Multiple)
-	ataRegMask			_regMask;			//  >	Which registers to write or read for reg access commands
-	IOATACompletionFunction*	_callback;  // 	> 	if nil, command is synchronous
- 
- 	IOReturn			_result;			// < 	result
-	IOByteCount			_actualByteCount;  	// <	actual bytes transfered.
- 	UInt8				_status;			// <  	Status register at end of command
- 	UInt8				_errReg;			// <	Error register at end of command if error bit set.
-	bool				_inUse;				// <	true while IOATAController has possesion of the command
-
-
-	virtual bool		init();
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */
-    struct ExpansionData {IOExtendedLBA* extLBA; };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *fExpansionData;
-	
-	// overrides
-	virtual void free();
-
-
-private:
-    OSMetaClassDeclareReservedUsed(IOATACommand, 0);   // set end result
-    OSMetaClassDeclareReservedUsed(IOATACommand, 1); // get extendedLBAPtr
-    OSMetaClassDeclareReservedUnused(IOATACommand, 2);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 3);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 4);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 5);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 6);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 7);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 8);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 9);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 10);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 11);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 12);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 13);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 14);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 15);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 16);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 17);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 18);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 19);
-    OSMetaClassDeclareReservedUnused(IOATACommand, 20);
-
-public:
-	virtual void setEndResult(UInt8 inStatus, UInt8 endError  );
-	virtual IOExtendedLBA* getExtendedLBA(void);
-	
-
-};
-
-
-/*!
-@class IOExtendedLBA
-
-@discussion
-If 48-bit LBAs are supported, IOExtendedLBA is used to represent a 48-bit LBA.
-The driver examines the ATA identify data to determine if 48-bit addressing is
-supported.
-*/
-
-class IOExtendedLBA : public OSObject
-{
-	OSDeclareDefaultStructors( IOExtendedLBA );
-	
-	public:
-	static IOExtendedLBA* createIOExtendedLBA(IOATACommand* owner);
-	
-	// terminology as established in ATA/ATAPI-6. 
-	// for the extended LBA address
-	
-	/*!@function setLBALow16
-	@abstract convenience method that sets the lower 16 bits of a 48-bit LBA
-	*/
-	virtual void setLBALow16( UInt16 lbaLow);
-	
-	/*!@function getLBALow16
-	@abstract convenience method that gets the lower 16 bits of a 48-bit LBA
-	*/
-	virtual UInt16 getLBALow16 (void);
-
-	/*!@function setLBAMid16
-	@abstract convenience method that sets the middle 16 bits of a 48-bit LBA
-	*/
-	virtual void setLBAMid16 (UInt16 lbaMid);
-
-	/*!@function getLBAMid16
-	@abstract convenience method that gets the middle 16 bits of a 48-bit LBA
-	*/
-	virtual UInt16 getLBAMid16( void );
-	
-	/*!@function setLBAHigh16
-	@abstract convenience method that sets the high 16 bits of a 48-bit LBA
-	*/
-	virtual void setLBAHigh16( UInt16 lbaHigh );
-	
-	/*!@function getLBAHigh16
-	@abstract convenience method that gets the high 16 bits of a 48-bit LBA
-	*/
-	virtual UInt16 getLBAHigh16( void );
-
-	/*!@function setSectorCount16
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setSectorCount16( UInt16 sectorCount );
-	
-	/*!@function getSectorCount16
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt16 getSectorCount16( void );
-	
-	/*!@function setFeatures16
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setFeatures16( UInt16 features );
-	
-	/*!@function getFeatures16
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt16 getFeatures16( void );
-
-	/*!@function setDevice
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setDevice( UInt8 inDevice );
-
-	/*!@function getDevice
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt8 getDevice( void );
-
-	/*!@function setCommand
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual void setCommand( UInt8 inCommand );
-
-	/*!@function getCommand
-	@abstract  Taskfile access. Registers are named in accordance with ATA Standards conventions
-	*/
-	virtual UInt8 getCommand( void );
-
-	/*!@function setExtendedLBA
-	@abstract convenience method that sets the taskfile registers into a 48-bit LBA address, along with sector count, and unit selected and LBA bit set
-	*/
-	virtual void setExtendedLBA( UInt32 inLBAHi, UInt32 inLBALo, ataUnitID inUnit, UInt16 extendedCount, UInt8 extendedCommand);
-	
-	/*!@function getExtendedLBA
-	@abstract convenience method that gets a 48-bit LBA
-	*/
-	virtual void getExtendedLBA(  UInt32* outLBAHi, UInt32* outLBALo );
-
-	/*!@function zeroData
-	@abstract convenience method that zeros out the lba, sector count, features, device, and command member variables
-	*/
-	virtual void zeroData(void);
-	
-	/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties in the future.
-    */
-    struct ExpansionData { };
-
-	/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-
-	protected:
-	
-	IOATACommand* owner;
-	UInt16 lbaLow;
-	UInt16 lbaMid;
-	UInt16 lbaHigh;
-	UInt16 sectorCount;
-	UInt16 features;
-	UInt16 device;
-	UInt16 command;
-	
-	private:
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 0);
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 1);
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 2);
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 3);
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 4);
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 5);
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 6);
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 7);
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 8);
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 9);
-    OSMetaClassDeclareReservedUnused(IOExtendedLBA, 10);
-
-
-};
-
-#endif
diff --git a/i386/include/IOKit/ata/IOATAController.h b/i386/include/IOKit/ata/IOATAController.h
deleted file mode 100644
index 3758941..0000000
--- a/i386/include/IOKit/ata/IOATAController.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
- 
-#ifndef _IOATACONTROLLER_H
-#define _IOATACONTROLLER_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOWorkLoop.h>
-#include "ATATimerEventSource.h"
-
-class IOATADevice;
-class IOATABusCommand;
-class IOATABusInfo;
-class IOATADevConfig;
-
-/*! @class IOATAController
-    @abstract The base class for ata controller family. Provides the interface common to all ata bus controllers.
-    @discussion Subclasses of IOATAController implement drivers for specific bus hardware. Disk devices are clients of 
-    IOATAController and communicate via the IOATABusNub instantiated for each device discovered by the specific IOATAController
-    subclass when it probes hardware.  Via the nub, the ATA Controller provides standard information about bus capability, accepts 
-    requests for transfer mode configuration (timing), accepts requests for IO and bus operations, notifies the device driver about 
-    bus events which may affect the device, such as soft-resets or device removal (ie, media-bay and PC-card) and removal of queued 
-    IO requests which have not been dispatched into the hardware. 
-    
-    @discussion The header doc for this class is incomplete. The source however is heavily commented and should be consulted until 
-    such time as complete header doc is available.
-*/
-
-
-
-class IOATAController : public IOService
-{
-    OSDeclareDefaultStructors(IOATAController);
-
-public:
-
-
-	/*--- Common ATA Controller Interface ---*/
-	// find out bus capability
-	virtual IOReturn provideBusInfo( IOATABusInfo* infoOut);
-
-	// set and get bus timing configuration for a specific unit 
-	virtual IOReturn selectConfig( IOATADevConfig* configRequest, UInt32 unitNumber);
-	virtual IOReturn getConfig( IOATADevConfig* configRequest, UInt32 unitNumber); 
-
-	// The main call puts something on the work loop
-	virtual IOReturn executeCommand( IOATADevice* nub, IOATABusCommand* cmd);	
-
-	
-	
-	/*-- Power Management ---*/
-	
-	// TBD
-
-
-	/*--- Overrides from IOService ---*/
-	virtual bool init(OSDictionary * properties);
-
-	virtual IOService* probe( IOService* provider,	SInt32*	score );
-    virtual bool start( IOService* provider );
-
-
-protected:
-	
-	enum {  	
-			kBusFree = 'free',   // bus is available
-			kBusBusy = 'busy',   // bus is busy with request
-			kQueueOpen = '!lck',  // queue is not locked
-			kQueueLocked = 'LOCK', // queue is frozen and not
-			kImmediateLocked = '!Imd', // immediate commands may not be processed
-			kImmediateOK	=  'Immd'  // immediate commands allowed.
-		};	
-
-	/* Transaction State indicator definition - indicates what action is next*/
-	enum transState {
-		kATAInitial					= 0x00,  // in queue
-		kATAStarted					= 0x01,  // issue taskfile  
-		kATAPICmd					= 0x02,	 // issue packet						
-		kATADataTx					= 0x03,  // data transfer phase
-		kATAStatus					= 0x04,  // read status
-		kATAComplete				= 0x05,  // io complete
-		kATADone					= 0x06   // completion callout called
-	};
-	
-	struct ataDevInfo {
-		ataDeviceType   type;       // ata, atapi, unknown
-		atapiConfig		packetSend; // slow DRQ, IRQ, or fast DRQ for packet
-	};
-	
-
-	struct ataDoubleBuffer
-	{
-		IOPhysicalAddress	physicalBuffer;
-		IOLogicalAddress	logicalBuffer;
-		IOByteCount	bufferSize;
-		
-	};
-
-	
- 	IOService*					_provider;
-    IOWorkLoop*					_workLoop;
-    IOCommandGate*      		_cmdGate;
-	ATATimerEventSource*			_timer;
-	queue_head_t				_commandQueue;
-	IOATABusCommand*			_currentCommand;
-	UInt32						_busState;
-	UInt32						_queueState;
-	UInt32						_immediateGate;
-	ataUnitID					_selectedUnit;
-	ataDevInfo					_devInfo[2];
-	IOATADevice*				_nub[2];
-	ataDoubleBuffer				_doubleBuffer;
-	
-	IOATARegPtr8				_tfFeatureReg;
-	IOATARegPtr8				_tfSCountReg;
-	IOATARegPtr8				_tfSectorNReg;
-	IOATARegPtr8				_tfCylLoReg;
-	IOATARegPtr8				_tfCylHiReg;
-	IOATARegPtr8				_tfSDHReg;
-	IOATARegPtr8				_tfStatusCmdReg;  
-	IOATARegPtr16				_tfDataReg;
-	IOATARegPtr8				_tfAltSDevCReg;   
-
-	
-	// false if couldn't allocate the per-bus double buffer.
-	// controllers should provide implementation where needed 
-	// for DMA hardware compatibility. The default method provides
-	// a 4K buffer for PIO since MemoryDescriptors do not by default have 
-	// logical addresses in the kernel space.
-	virtual bool allocateDoubleBuffer( void );
-
-	// perform 2-byte endian swap. Only useful on PIO transfers and identify data
-	virtual void swapBytes16( UInt8* dataBuffer, IOByteCount length);
-
-/*! @function handleCommand
-    @abstract Called by executeCommand() to handle the client command
-    from the workloop context.
-    @param command The command code.
-    @param param1 Command parameter.
-    @param param2 Command parameter.
-    @param param3 Command parameter.
-	@result kIOReturnSuccess on success, or an error code otherwise. */
-
-    virtual IOReturn handleCommand( void *     command,
-                                   	void *     param1 = 0,
-                                   	void *     param2 = 0,
-                                   	void *     param3 = 0);
-
-
-/*! @function busCanDispatch
-    @abstract answers whether the bus is in state such that the next command 
-    can be dispatched.
-	@result true - bus is free to issue commands. false - bus cannot issue
-	commands at this time. */
-	virtual bool busCanDispatch( void );
-
-
-/*! @function dispatchNext
-    @abstract Causes the command at the front of the queue to dequeue, made the 
-    current command and begin execution.
-	@result  noErr indicates successful dispatch.  */
-	virtual IOReturn dispatchNext( void );
-
-	// sets the result code, free's the bus state, dispatch next command and execute completion
-	virtual void completeIO( IOReturn commandResult );
-
-	// Command queue handlers.	
-	virtual IOReturn enqueueCommand( IOATABusCommand* command);	
-	virtual IOATABusCommand* dequeueFirstCommand( void );
-
-	// event notifier for clients
-	virtual void executeEventCallouts(  ataEventCode event, ataUnitID unit);
-
-	// default handler for device interrupts.
-	virtual IOReturn handleDeviceInterrupt( void );
-
-
-	// timer functions
-	// starts the timeout on the current command
-	virtual IOReturn startTimer( UInt32 inMS);
-	//disable and clear a running timer.
-	virtual void stopTimer( void );
-	// called when a timeout occurs.
-	virtual void handleTimeout( void );
-	// true if the timer has expired 
-	virtual bool checkTimeout( void );
-
-	// handle IO opcodes
-	virtual IOReturn handleExecIO( void );
-	virtual IOReturn handleRegAccess( void );
-	virtual IOReturn handleBusReset(void);
-	virtual IOReturn handleQueueFlush( void );
-	
-	// various protocol phases
-	virtual IOReturn asyncData(void);
-	virtual IOReturn asyncStatus(void);
-	virtual IOReturn asyncIO(void);
-	virtual IOReturn asyncCommand(void);
-	virtual IOReturn synchronousIO(void);	
-	
-	// hardware access
-	virtual IOReturn selectDevice( ataUnitID unit );
-	virtual IOReturn issueCommand( void );
-	virtual IOReturn writePacket( void );
-	virtual IOReturn softResetBus( bool doATAPI = false );
-	
-	virtual IOReturn startDMA( void );
-	virtual IOReturn stopDMA( void );
-
-	virtual bool ATAPISlaveExists( void );
-	virtual UInt32 scanForDrives( void );
-
-	virtual bool waitForU8Status (UInt8 mask, UInt8 value);
-	
-	virtual IOByteCount readATAPIByteCount( void );
-	virtual void handleOverrun( IOByteCount length);
-	virtual IOReturn registerAccess(bool isWrite);
-	
-	// PIO data transfers
-	virtual IOReturn txDataIn (IOLogicalAddress buf, IOByteCount length);
-	virtual IOReturn txDataOut (IOLogicalAddress buf, IOByteCount length);
-
-	virtual IOATAController::transState	determineATAPIState(void);
-
-	// device should set the controller to the config for this device
-	virtual void selectIOTiming( ataUnitID unit );
-
-	// subclasses MUST implement this function in order to initialize
-	// the pointers to the ATA task file registers during start() time.
-	virtual bool configureTFPointers(void);
-
-	// convert a bit-significant indicator to a numeric value.
-	virtual UInt16 bitSigToNumeric( UInt16 binary);
-
-	// for 48 bit register reading and writing 
-	UInt16 readExtRegister( IOATARegPtr8 inRegister );
-	void writeExtRegister( IOATARegPtr8 inRegister, UInt16 inValue );
-
-	// overrides
-	virtual void free();
-	
-private:
-
-	// used called by the commandgate in executeCommand.
-    static void executeCommandAction(OSObject * owner,
-                                     void *     arg0,
-                                     void *     arg1,
-                                     void *     arg2,
-                                     void *     arg3);
-
-	// callout used by the timer to indicate the timeout failure.
-	static void timeoutOccured(	OSObject *owner, 
-								IOTimerEventSource *sender);
-
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOATAController in the future.
-    */
-    typedef struct ExpansionData
-    {
-    	IOBufferMemoryDescriptor*	_doubleBufferDesc;
-    } ExpansionData;
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-private:
-    OSMetaClassDeclareReservedUnused(IOATAController, 0);
-    OSMetaClassDeclareReservedUnused(IOATAController, 1);
-    OSMetaClassDeclareReservedUnused(IOATAController, 2);
-    OSMetaClassDeclareReservedUnused(IOATAController, 3);
-    OSMetaClassDeclareReservedUnused(IOATAController, 4);
-    OSMetaClassDeclareReservedUnused(IOATAController, 5);
-    OSMetaClassDeclareReservedUnused(IOATAController, 6);
-    OSMetaClassDeclareReservedUnused(IOATAController, 7);
-    OSMetaClassDeclareReservedUnused(IOATAController, 8);
-    OSMetaClassDeclareReservedUnused(IOATAController, 9);
-    OSMetaClassDeclareReservedUnused(IOATAController, 10);
-    OSMetaClassDeclareReservedUnused(IOATAController, 11);
-    OSMetaClassDeclareReservedUnused(IOATAController, 12);
-    OSMetaClassDeclareReservedUnused(IOATAController, 13);
-    OSMetaClassDeclareReservedUnused(IOATAController, 14);
-    OSMetaClassDeclareReservedUnused(IOATAController, 15);
-    OSMetaClassDeclareReservedUnused(IOATAController, 16);
-    OSMetaClassDeclareReservedUnused(IOATAController, 17);
-    OSMetaClassDeclareReservedUnused(IOATAController, 18);
-    OSMetaClassDeclareReservedUnused(IOATAController, 19);
-    OSMetaClassDeclareReservedUnused(IOATAController, 20);
-};
-#endif /* !_IOATACONTROLLER_H */
diff --git a/i386/include/IOKit/ata/IOATADevConfig.h b/i386/include/IOKit/ata/IOATADevConfig.h
deleted file mode 100644
index e5714c3..0000000
--- a/i386/include/IOKit/ata/IOATADevConfig.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOATADEVCONFIG_H
-#define _IOATADEVCONFIG_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOTypes.h>
-#include "IOATATypes.h"
-#include "IOATABusInfo.h"
-
-
-/*!
-	@class IOATADevConfig 
-	@abstract used for configuring and communicating the desired transfer modes of a device.
-	 A disk driver would typically use this object in conjunction with the 512-bytes of identification 
-	 data from the drive and the IOATABusInfo object for the bus it is connected to.
-	 This object will determine the best matching transfer speeds available.
-	 the device driver will then send a series of Set Features commands to configure the drive
-	 and this object to the bus through the IOATADevice nub in order to configure the optimum transfer mode.
-	 The driver for the disk drive may choose to populate this object with whatever transfer mode 
-	 desired, in the event that a different mode is required.
-	@discussion usually use the initWithBestSelection to make a best mode match.
-	The Mode accessors use bit significance to indicate a selected mode or supported modes(s)
-	ie, 00000001b indicates Mode-0, 00000010b indicates mode 1, etc.
-	Selected mode is indicated by a single set bit. No bit set indicates no mode in that class is selected.
-	ie, a bus will support multiple possible modes, but will only have one mode selected at that time.
-
-*/
-
-class IOATADevConfig : public OSObject {
-
-	OSDeclareDefaultStructors( IOATADevConfig );
-	
-	public:
-	
-	/*!@function atadevconfig
-	@abstract static creator function.
-	*/
-    static	IOATADevConfig* atadevconfig(void);
-    
-   /*!@function initWithBestSelection
-	@abstract Handy initializer: pass the 512-byte result of the Identify Device or 
-    Identify Packet Device in endian-order for your platform (byte-swapped on PPC) 
-    and the IOATABusInfo object for the bus. The object will initialize all fields 
-    and select the best transfer modes that match on bus and device. 
-    If the return value was 0 (success or noErr), then a matching mode is supported.
-    Examine the PIO and UDMA/DMA fields and to generate the apropriate SET FEATURES 
-    parameters for your drive and send this initialised object to the IOATAController 
-    when requesting a speed configuration.
-    failure means no supported transfer modes matched between bus and device info.
-	
-	@param identifyData 512 bytes of data obtained from the device via IDENTIFY DEVICE or IDENTIFY PACKET DEVICE command.
-	@param busInfo pointer to an IOATAbusInfo object obtained from a previous atanub->provideBusInfo() call.
-	@result kIOSuccess (0) when a matching transfer mode is available between the device and controller.
-	*/
-	IOReturn	initWithBestSelection( const UInt16* identifyData, IOATABusInfo* busInfo);
-    
-    // intitialize with the 512 byte data from an ATA device identify command
-	IOReturn assignFromData( const UInt16* identifyData );
-
-	/*!@function setPacketConfig
-	@param packetConfig
-	@abstract 	For ATAPI devices, if the device asserts interrupt after the Packet Command when it is ready to accept the packet, set this value to true (mostly older devices). If the device accepts the packet only by asserting DRQ bit in status, then set this value false. Tells the bus controller whether to wait for packet acceptance or set pending interrupt.
-	*/
-	void setPacketConfig ( atapiConfig packetConfig);
-
-	/*!@function getPacketConfig
-	@result atapiConfig as defined in IOATATypes.h 
-	*/
-	atapiConfig getPacketConfig( void );	
-
-	// The following Mode accessors use bit significance to indicate a selected mode or supported modes(s)
-	// ie, 00000001b indicates Mode-0, 00000010b indicates mode 1, etc.
-	// Selected mode is indicated by a single set bit. No bit set indicates no mode in that class is selected.
-	// ie, a bus will support multiple possible modes, but will only have one mode selected at that time.
-
-	/*!@function setPIOMode
-	@param inModeBitMap bit-significant map of PIO mode
-	*/
-	void setPIOMode( UInt8 inModeBitMap);		// bit-significant map of PIO mode(s)
-	
-	/*!@function getPIOMode
-	@result bit-significant map of PIO mode
-	*/
-	UInt8 getPIOMode( void );
-	
-	/*!@function setDMAMode
-	@param inModeBitMap bit-significant map of DMA mode
-	*/
-	void setDMAMode( UInt8 inModeBitMap );	// bit-significant map of DMA mode(s)
-	
-	/*!@function getDMAMode
-	@result bit-significant map of DMA mode
-	*/
-	UInt8 getDMAMode( void );
-	
-	/*!@function setUltraMode
-	@param inModeBitMap bit-significant map of Ultra mode
-	*/
-	void setUltraMode( UInt8 inModeBitMap );	// bit-significant map of Ultra mode(s)
-
-	/*!@function getUltraMode
-	@result  bit-significant map of Ultra mode
-	*/
-	UInt8 getUltraMode( void );
-	
-	// The following cycle time accessors report cycle times in nanoseconds.
-	// A device requesting a mode should also request a cycle time as reported in the device's identification page.
-	// A bus controller will configure the bus not to exceed (go faster than) the minimum time requested.
-	// When a bus controller reports a mode configuration, the cycle time indicates the busses contract not to go 
-	// faster than. However an actual cycle time may be slower than the indicated time.	
-	/*!@function setPIOCycleTime
-	@param inNS PIO cycle time in nanoseconds. 
-	*/
-	void setPIOCycleTime( UInt16 inNS );
-	
-	/*!@function getPIOCycleTime
-	@result reported PIO CycleTime in nanoseconds. 
-	*/
-	UInt16 getPIOCycleTime( void );
-
-	/*!@function setDMACycleTime
-	@param inNS reported multiword DMA Cycle time in nanoseconds.
-	*/
-	void setDMACycleTime( UInt16 inNS );
-	
-	/*!@function getDMACycleTime
-	@result Reported multiword DMA cycle time in nanoseconds. 
-	*/
-	UInt16 getDMACycleTime( void );
-	
-	// Ultra ATA defines cycle times a device must meet to comply with standards.
-	// No cycle time field is needed.
-
-	// convert bit-significant to numeric value
-	/*!@function bitSigToNumeric
-	@abstract converts a bit-significant field to a numerical value. Note that a bit field of 0x00 has no defined result.
-	@param binary the bit significant field.
-	@result the numerical value of the highest bit set in the field.
-	*/
-	virtual UInt8 bitSigToNumeric( UInt16 binary);
-
-	
-	protected:
-	
-	atapiConfig 					_atapiIRQForPacket;			// enum for bits 5 and 6 of word zero of 
-																// the identify packet device info data for PACKET devices ONLY.
-																// shift word-0 5-bits left, mask 0x03 and these enums apply.
-																// values are:
-																
-																//	kATAPIDRQSlow 	= 0x00   - wait up to 3MS for packet on DRQ
-																//	kATAPIIRQPacket = 0x01,  - device asserts IRQ for packet
-																//	kATAPIDRQFast	= 0x10,  - packet on DRQ within 50us
-																//	kATAPIUnknown   = 0x11   - reserved as of ATA/ATAPI-5
-
-
-
-
-	UInt8 							_ataPIOMode;					/* <->: PIO Mode Timing class bit-significant */
-	UInt16 							_ataPIOCycleTime;			/* <->: Cycle time in ns for PIO mode */
-	UInt8 							_ataMultiDMAMode;			/* <->: Multiple Word DMA Timing Class bit-significant*/
-	UInt16 							_ataMultiCycleTime;			/* <->: Cycle time in ns for Multiword DMA mode */
-	UInt8 							_ataUltraDMAMode;			/* <->: Ultra DMA timing class bit-significant */
-
-	IOReturn						_AssignPIOData( const UInt16* identifyData);
-	IOReturn						_AssignDMAData(const UInt16* identifyData);
-	IOReturn						_AssignUltraData(const UInt16* identifyData);
-	UInt8							_MostSignificantBit( UInt8 inByte);
-
-
-    virtual bool init();  
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-private:
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 0);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 1);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 2);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 3);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 4);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 5);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 6);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 7);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 8);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 9);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 10);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 11);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 12);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 13);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 14);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 15);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 16);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 17);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 18);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 19);
-    OSMetaClassDeclareReservedUnused(IOATADevConfig, 20);
-	
-public:
-
-//some static utility functions to parse the identify data for feature support
-
-  static bool sDriveSupports48BitLBA( const UInt16* identifyData );
-  static UInt32 sDriveExtendedLBASize( UInt32* lbaHi, UInt32* lbaLo, const UInt16* identifyData); // result returned is same as lbaLo. 
-	
-};
-
-
-// header doc info goes here. I find putting it within the delcarations more confusing than putting it all in the bottom of the header.
-
-
-#endif /* !_IOATADEVCONFIG_H */
diff --git a/i386/include/IOKit/ata/IOATADevice.h b/i386/include/IOKit/ata/IOATADevice.h
deleted file mode 100644
index 78be513..0000000
--- a/i386/include/IOKit/ata/IOATADevice.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * IOATADevice.h
- *
- * This object implements a relay to an ATA Bus where a drive is attached.
- */
-
-
-#ifndef _IOATADEVICE_H
-#define _IOATADEVICE_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOTypes.h>
-#include "IOATATypes.h"
-#include "IOATACommand.h"
-#include "IOATABusInfo.h"
-#include "IOATADevConfig.h"
-
-class IOATAController;
-
-
-/*!
-	@class IOATADevice
-	@abstract This object implements a relay to an ATA Bus where a drive is attached.
-	@discussion IOATADevice is the superclass which represents a particular device attached to a particular IOATAController (bus). IOATADevice is the provider for ATA mass-storage device drivers.IOATADevice is the factory for all IOATACommand objects and is responsible for creating and freeing IOATACommands. IOATAControllers will create an instance of IOATADevice for each device physically connected to the ata bus. IOATADevice is virtual and specific subclass should be implemented for particular types of IOATAController. In this manner, controller-specifc IOATACommands may be paired with the proper type of controller.
-*/
-
-class IOATADevice : public IOService
-{
-    OSDeclareDefaultStructors(IOATADevice);
-
-public:
-
-	// 
-	/*!@function getUnitID
-	@abstract Determine whether this device is number 0 or 1 (ie, master/slave)
-	@result ataUnitID - 0 or 1.
-	*/
-	virtual ataUnitID	getUnitID( void );
-
-	// 
-	/*!@function getDeviceType
-	@abstract Find out what kind of device this nub is (ata or atapi)
-	@result ataDeviceType as defined in IOATATypes.h
-	*/
-	virtual ataDeviceType getDeviceType( void );
-
-	// 
-	/*!@function provideBusInfo
-	@abstract Find out the bus capability so the client can choose the features to set and commands to run.
-	@param getInfo a pointer to a valid IOATABusInfo object.
-	@result kIOSuccess (0) and the getInfo object will be filled out by the bus controller with information about the bus.
-	*/
- 	virtual IOReturn provideBusInfo( IOATABusInfo* getInfo);  
-
-	// 
-	/*!@function selectConfig
-	@abstract Tell the bus what speed to use for your device.
-	@param configRequest pointer to a valid and initialized IOATADevConfig object.
-	@result kIOSuccess (0) if the configuration was succesfully selected.
-	@discussion This should only be called once during a disk drivers start method before registering its availability, and must be called prior to issuing any data IO transactions.
-	*/
-	virtual IOReturn selectConfig( IOATADevConfig* configRequest); 
-
-	// 
-	/*!@function provideConfig
-	@abstract Find out what speed the bus has configured for this unit. 
-	@param configRequest pointer to a valid IOATADevConfig object.
-	@result kIOSuccess (0) on successful completion and configRequest will contain the configuration information. 
-	*/
-	virtual IOReturn provideConfig( IOATADevConfig* configRequest);    
-
-	// Submit IO requests 
- 	/*!
- 	@function executeCommand
-	@abstract Submit IO requests
-	@param command pointer to a valid IOATACommand with the command to be executed.
-	@result kIOSuccess (0) if the command was successfully queued in the controller. 
-	*/
-	virtual IOReturn		executeCommand(IOATACommand* command);
- 
-	// create and destroy IOATACommands
-	/*!
-	@function allocCommand
-	@abstract create IOATACommands. Device drivers should allocate command objects only through this method.
-	@result null if allocation failed. Retain count is one.
-	*/
-	virtual IOATACommand*	allocCommand( void );
-	
-	/*!
-	@function freeCommand
-	@abstract release a command object that is no longer needed. Do not free an object in use and do not release the object anymore times than you have retained it.
-	@param inCommand the command to be released.
-	*/
-	virtual void			freeCommand( IOATACommand* inCommand); 
-
-	// matching stuff for IOBSDInit and so on.	
-	/*!@function matchPropertyTable
-	@abstract matching stuff for IOBSDInit and so on.
-	*/
-	virtual bool matchPropertyTable(OSDictionary * table);
-	
-	/*!@function matchLocation
-	@abstract matching stuff for IOBSDInit and so on.
-	*/
-	virtual IOService* matchLocation(IOService * client);
-	
-	/*!@function matchPropertyTable
-	@abstract matching stuff for IOBSDInit and so on.	
-	*/
-	virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
-
-	// called by controllers when they need to send a message to client drivers.
-	/*!
-	@function notifyEvent
-	@abstract called by controllers when they need to send a message to client (disk) drivers.
-	*/
-	virtual void notifyEvent( UInt32 event );
-
-	
-protected:
-    IOATAController*     _provider;
-    ataUnitID			_unitNumber;  // 0 - master, 1 - slave, -1 = not Valid
-    ataDeviceType		_deviceType;  // ata, atapi, unknown	    
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-private:
-    OSMetaClassDeclareReservedUnused(IOATADevice, 0);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 1);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 2);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 3);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 4);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 5);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 6);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 7);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 8);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 9);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 10);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 11);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 12);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 13);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 14);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 15);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 16);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 17);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 18);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 19);
-    OSMetaClassDeclareReservedUnused(IOATADevice, 20);    
-};
-
-#endif /* !_IOATABUSNUB_H */
diff --git a/i386/include/IOKit/ata/IOATARegI386.h b/i386/include/IOKit/ata/IOATARegI386.h
deleted file mode 100644
index 73016ba..0000000
--- a/i386/include/IOKit/ata/IOATARegI386.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOATAREGI386_H
-#define _IOATAREGI386_H
-
-#include <libkern/c++/OSObject.h>
-
-/*
- * IOATAReg: ATA register abstract base class.
- */
-#define DefineIOATAReg(w)                                   \
-class IOATAReg##w : public OSObject                         \
-{                                                           \
-    OSDeclareAbstractStructors( IOATAReg##w )               \
-                                                            \
-public:                                                     \
-    virtual void operator = (UInt##w rhs) = 0;              \
-    virtual operator UInt##w() const = 0;                   \
-}
-
-DefineIOATAReg( 8 );
-DefineIOATAReg( 16 );
-DefineIOATAReg( 32 );
-
-typedef IOATAReg8  * IOATARegPtr8;
-typedef IOATAReg16 * IOATARegPtr16;
-typedef IOATAReg32 * IOATARegPtr32;
-
-#define IOATARegPtr8Cast(x) (x)
-
-/*
- * IOATAIOReg: I/O mapped ATA registers.
- */
-#define DefineIOATAIOReg(w)                                 \
-class IOATAIOReg##w : public IOATAReg##w                    \
-{                                                           \
-    OSDeclareDefaultStructors( IOATAIOReg##w )              \
-                                                            \
-protected:                                                  \
-    UInt16 _address;                                        \
-                                                            \
-public:                                                     \
-    static IOATAIOReg##w * withAddress( UInt16 address );   \
-                                                            \
-    virtual bool initWithAddress( UInt16 address );         \
-    virtual UInt16 getAddress() const;                      \
-                                                            \
-    virtual void operator = (UInt##w rhs);                  \
-    virtual operator UInt##w() const;                       \
-}
-
-DefineIOATAIOReg( 8 );
-DefineIOATAIOReg( 16 );
-DefineIOATAIOReg( 32 );
-
-#endif /* !_IOATAREGI386_H */
diff --git a/i386/include/IOKit/ata/IOATATypes.h b/i386/include/IOKit/ata/IOATATypes.h
deleted file mode 100644
index a3be9dc..0000000
--- a/i386/include/IOKit/ata/IOATATypes.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Copyright (c) 2000-2008 Apple, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOATATYPES_H
-#define _IOATATYPES_H
-
-#include <IOKit/IOTypes.h>
-
-
-/*!
-
-@header IOATAtypes.h
-@discussion contains various definitions and constants for use in the IOATAFamily and clients. Header Doc is incomplete at this point, but file is heavily commented.
-
-*/
-// property strings
-#define kATADevPropertyKey "ata device type"
-#define kATATypeATAString "ata"
-#define kATATypeATAPIString "atapi"
-#define kATATypeUnknownString "unknown"
-
-#define kATAVendorPropertyKey "device model"
-#define kATARevisionPropertyKey "device revision"
-#define kATASerialNumPropertyKey "device serial"
-
-#define kATAUnitNumberKey "unit number"
-
-#define kATASocketKey "socket type"
-#define kATAInternalSocketString "internal"
-#define kATAMediaBaySocketString "media-bay"
-#define kATAPCCardSocketString "pccard"
-#define kATAInternalSATAString "serial-ata"
-#define kATASATABayString "sata-bay"
-#define kATAInternalSATA2 "serial-ata-2"
-#define kATASATA2BayString "sata-2-bay"
-#define kATAUnkownSocketString "unknown"
-
-#define kATANotifyOnChangeKey "media-notify"
-
-// allows for porting to non-memory-mapped IO systems, such as x86.
-// for such a platform, create a class and overload the assignment operators
-// so that the correct IO operation is performed and define the type for that architecture port.
-#ifdef __ppc__
-#define IOATARegPtr8 volatile UInt8* 
-#define IOATARegPtr16 volatile UInt16*
-#define IOATARegPtr32 volatile UInt32*
-#define IOATARegPtr8Cast(x) ((IOATARegPtr8)(x))
-#elif defined( __i386__ ) || defined( __x86_64__ )
-#include <IOKit/ata/IOATARegI386.h>
-#else
-#error Unknown machine architecture
-#endif
-
-enum ataSocketType{
-
-	kUnknownSocket	= 0,
-	kInternalATASocket,
-	kMediaBaySocket	,
-	kPCCardSocket,
-	kInternalSATA,
-	kSATABay,
-	kInternalSATA2,
-	kSATA2Bay
-
-} ;
-
-
-enum ataDeviceType {
-
-	kUnknownATADeviceType = 0,
-	kATADeviceType,
-	kATAPIDeviceType
-
-} ;
-
-// enum for bits 5 and 6 of word zero of 
-// the identify packet device info data.
-// shift word-0 5-bits left, mask 0x03 and these enums apply.
-enum atapiConfig {
-
-	kATAPIDRQSlow 	= 0x00,
-	kATAPIIRQPacket = 0x01,
-	kATAPIDRQFast	= 0x10,
-	kATAPIUnknown   = 0x11
-
-};
-
-
-enum ataUnitID {
-
-	kATAInvalidDeviceID			= -1,
-	kATADevice0DeviceID			= 0,							/* aka, Master. Device 0 is the correct terminology */
-	kATADevice1DeviceID			= 1								/* aka, Slave. Device 1 is the correct terminology */
-
-} ;
-
-enum {
-
-	kATADefaultSectorSize = 512
-};
-
-/* Task file definition *** Error Register *** */
-enum {
-	bATABadBlock				= 7,							/* bit number of bad block error bit*/
-	bATAUncorrectable			= 6,							/* bit number of uncorrectable error bit*/
-	bATAMediaChanged			= 5,							/* bit number of media changed indicator*/
-	bATAIDNotFound				= 4,							/* bit number of ID not found error bit*/
-	bATAMediaChangeReq			= 3,							/* bit number of media changed request*/
-	bATACommandAborted			= 2,							/* bit number of command abort bit*/
-	bATATrack0NotFound			= 1,							/* bit number of track not found*/
-	bATAAddressNotFound			= 0,							/* bit number of address mark not found*/
-	mATABadBlock				= 1 << bATABadBlock,			/* Bad Block Detected*/
-	mATAUncorrectable			= 1 << bATAUncorrectable,		/* Uncorrectable Data Error*/
-	mATAMediaChanged			= 1 << bATAMediaChanged,		/* Media Changed Indicator (for removable)*/
-	mATAIDNotFound				= 1 << bATAIDNotFound,			/* ID Not Found*/
-	mATAMediaChangeReq			= 1 << bATAMediaChangeReq,		/* Media Change Requested (NOT IMPLEMENTED)*/
-	mATACommandAborted			= 1 << bATACommandAborted,		/* Aborted Command*/
-	mATATrack0NotFound			= 1 << bATATrack0NotFound,		/* Track 0 Not Found*/
-	mATAAddressNotFound			= 1 << bATAAddressNotFound		/* Address Mark Not Found*/
-};
-
-/* Task file definition *** Features register *** */
-enum {
-	bATAPIuseDMA				= 0,							/* bit number of useDMA bit (ATAPI)*/
-	mATAPIuseDMA				= 1 << bATAPIuseDMA
-};
-
-/* Task file definition *** ataTFSDH Register *** */
-enum {
-	mATAHeadNumber				= 0x0F,							/* Head Number (bits 0-3) */
-	mATASectorSize				= 0xA0,							/* bit 7=1; bit 5 = 01 (512 sector size) <DP4>*/
-	mATADriveSelect				= 0x10,							/* Drive (0 = master, 1 = slave) */
-	mATALBASelect				= 0x40							/* LBA mode bit (0 = chs, 1 = LBA)*/
-};
-
-/* Task file definition *** Status Register *** */
-enum {
-	bATABusy					= 7,							/* bit number of BSY bit*/
-	bATADriveReady				= 6,							/* bit number of drive ready bit*/
-	bATAWriteFault				= 5,							/* bit number of write fault bit*/
-	bATASeekComplete			= 4,							/* bit number of seek complete bit*/
-	bATADataRequest				= 3,							/* bit number of data request bit*/
-	bATADataCorrected			= 2,							/* bit number of data corrected bit*/
-	bATAIndex					= 1,							/* bit number of index mark*/
-	bATAError					= 0,							/* bit number of error bit*/
-	mATABusy					= 1 << bATABusy,				/* Unit is busy*/
-	mATADriveReady				= 1 << bATADriveReady,			/* Unit is ready*/
-	mATAWriteFault				= 1 << bATAWriteFault,			/* Unit has a write fault condition*/
-	mATASeekComplete			= 1 << bATASeekComplete,		/* Unit seek complete*/
-	mATADataRequest				= 1 << bATADataRequest,			/* Unit data request*/
-	mATADataCorrected			= 1 << bATADataCorrected,		/* Data corrected*/
-	mATAIndex					= 1 << bATAIndex,				/* Index mark - NOT USED*/
-	mATAError					= 1 << bATAError				/* Error condition - see error register*/
-};
-
-/* Task file definition *** Device Control Register *** */
-enum {
-	bATADCROne					= 3,							/* bit number of always one bit*/
-	bATADCRReset				= 2,							/* bit number of reset bit*/
-	bATADCRnIntEnable			= 1,							/* bit number of interrupt disable*/
-	mATADCROne					= 1 << bATADCROne,				/* always one bit*/
-	mATADCRReset				= 1 << bATADCRReset,			/* Reset (1 = reset)*/
-	mATADCRnIntEnable			= 1 << bATADCRnIntEnable		/* Interrupt Disable(0 = enabled)*/
-};
-
-
-/* 'ataRegMask' field of the ataRegAccess definition*/
-enum ataRegMask{
-
-	bATAAltSDevCValid			= 14,							/* bit number of alternate status/device cntrl valid bit*/
-	bATAStatusCmdValid			= 7,							/* bit number of status/command valid bit*/
-	bATASDHValid				= 6,							/* bit number of ataTFSDH valid bit*/
-	bATACylinderHiValid			= 5,							/* bit number of cylinder high valid bit*/
-	bATACylinderLoValid			= 4,							/* bit number of cylinder low valid bit*/
-	bATASectorNumValid			= 3,							/* bit number of sector number valid bit*/
-	bATASectorCntValid			= 2,							/* bit number of sector count valid bit*/
-	bATAErrFeaturesValid		= 1,							/* bit number of error/features valid bit*/
-	bATADataValid				= 0,							/* bit number of data valid bit*/
-	mATAAltSDevCValid			= 1 << bATAAltSDevCValid,		/* alternate status/device control valid*/
-	mATAStatusCmdValid			= 1 << bATAStatusCmdValid,		/* status/command valid*/
-	mATASDHValid				= 1 << bATASDHValid,			/* ataTFSDH valid*/
-	mATACylinderHiValid			= 1 << bATACylinderHiValid,		/* cylinder high valid*/
-	mATACylinderLoValid			= 1 << bATACylinderLoValid,		/* cylinder low valid*/
-	mATASectorNumValid			= 1 << bATASectorNumValid,		/* sector number valid*/
-	mATASectorCntValid			= 1 << bATASectorCntValid,		/* sector count valid*/
-	mATAErrFeaturesValid		= 1 << bATAErrFeaturesValid,	/* error/features valid*/
-	mATADataValid				= 1 << bATADataValid			/* data valid*/
-
-} ;
-
-
-enum ataFlags{
-	bATAFlagQuiesce				= 20,
-	bATAFlagNoIRQ				= 19,							/* bit Number of no IRQ protocol flag*/
-	bATAFlag48BitLBA			= 18,
-	bATAFlagDMAQueued			= 17,
-	bATAFlagOverlapped			= 16,
-	bATAFlagUseConfigSpeed		= 15,							/* bit number of use configured speed flag*/
-	bATAFlagByteSwap			= 14,							/* bit number of byte swap flag*/
-	bATAFlagIORead				= 13,							/* bit number of I/O read flag*/
-	bATAFlagIOWrite				= 12,							/* bit number of I/O write flag*/
-	bATAFlagTFAccessResult 		= 8,							/* bit number of get register results on command completion.*/
-	bATAFlagUseDMA				= 7,							/* bit number of use DMA flag*/
-	bATAFlagProtocolATAPI		= 5,							/* bit number of ATAPI protocol*/
-	bATAFlagImmediate			= 1,							/* bit number of immediate flag */
-	bATAFlagTFAccess			= 0,							/* bit number of TF access */
-
-	mATAFlagQuiesce				= 1 << bATAFlagQuiesce,
-	mATAFlagUseNoIRQ			= 1 << bATAFlagNoIRQ,  			/* Special purpose! Avoid using! No-IRQ, polled synchronous protocol valid only for PIO commands*/
-	mATAFlag48BitLBA			= 1 << bATAFlag48BitLBA,		/* Use 48 bit extended LBA protocol on this command. Requires support from the controller.*/
-	mATAFlagDMAQueued			= 1 << bATAFlagDMAQueued,		/* Use tagged dma queuing protocol on this command. Requires support from the controller.*/
-	mATAFlagOverlapped			= 1 << bATAFlagOverlapped,		/* Use overllaped protocol on this command. Requires support from the controller.*/
-	mATAFlagUseConfigSpeed		= 1 << bATAFlagUseConfigSpeed,  /* Use the configured interface speed = true. False = use default PIO (slow) speed. valid only for PIO commands*/
-	mATAFlagByteSwap			= 1 << bATAFlagByteSwap,		/* Swap data bytes (read - after; write - before)*/
-	mATAFlagIORead				= 1 << bATAFlagIORead,			/* Read (in) operation*/
-	mATAFlagIOWrite				= 1 << bATAFlagIOWrite,			/* Write (out) operation*/
-	mATAFlagTFAccessResult		= 1 << bATAFlagTFAccessResult,  /* get contents of TaskFile registers indicated in TFMask on command completion, even if no error*/
-	mATAFlagUseDMA				= 1 << bATAFlagUseDMA,
-	mATAFlagProtocolATAPI		= 1 << bATAFlagProtocolATAPI,	/* ATAPI protocol indicator*/
-	mATAFlagImmediate			= 1 << bATAFlagImmediate,		/* Put command at head of queue */
-	mATAFlagTFAccess			= 1 << bATAFlagTFAccess,		/* Return Taskfile on error status*/
-
-} ;
-
-/* The Function codes sent to controllers*/
-enum ataOpcode {
-
-	kATANoOp = 0, 
-	kATAFnExecIO ,		/* Execute ATA I/O */
-	kATAPIFnExecIO,		/* ATAPI I/O */
-	kATAFnRegAccess ,	/* Register Access */
-
-	kATAFnQFlush ,		/* I/O Queue flush requests for your unit number */
-	kATAFnBusReset 	/* Reset ATA bus */
-
-} ;
-
-
-/* The ATA Event codes */
-/* sent when calling the device driver's event handler*/
-enum ataEventCode {
-	kATANullEvent				= 0x00,							/* Just kidding -- nothing happened*/
-	kATAOnlineEvent				= 0x01,							/* An ATA device has come online*/
-	kATAOfflineEvent			= 0x02,							/* An ATA device has gone offline*/
-	kATARemovedEvent			= 0x03,							/* An ATA device has been removed from the bus*/
-	kATAResetEvent				= 0x04,							/* Someone gave a hard reset to the drive*/
-	kATAOfflineRequest			= 0x05,							/* Someone requesting to offline the drive*/
-	kATAEjectRequest			= 0x06,							/* Someone requesting to eject the drive*/
-	kATAPIResetEvent			= 0x07,							/* Someone gave a ATAPI reset to the drive*/
-	kATAReservedEvent			= 0x80							/* RESERVED*/
-};
-
-
-// These need to be combined with a new enumeration of the current ATA/ATAPI command set.
-// Some opcodes are of interest to ATA controllers, since they imply special protocols 
-// or handling.   Device Reset, Execute Device Diagnostics have subtle side effects that
-// controllers need to be aware of, so we snoop for those commands being issued.
-// the rest are here for informational purposes.
-
-// BUG make new enum for all current ATA commands.
-
-enum {
-	kSOFTRESET	=	0x008,			// ATAPI Soft Reset command
-	kPACKET		=	0x0A0,			// ATAPI Packet command
-	kID_DRIVE	=	0x0A1			// ATAPI Identify drive command
-};
-/* ATA Command Opcode definition*/
-enum {
-	kATAcmdWORetry				= 0x01,							/* Without I/O retry option*/
-	kATAcmdNOP					= 0x0000,						/* NOP operation - media detect*/
-	kATAcmdRecal				= 0x0010,						/* Recalibrate command */
-	kATAcmdRead					= 0x0020,						/* Read command */
-	kATAcmdReadLong				= 0x0022,						/* Read Long command*/
-	kATAcmdReadExtended			= 0x0024,						/* Read Extended (with retries)*/
-	kATAcmdReadDMAExtended		= 0x0025,						/* Read DMA Extended (with retries)*/
-	kATAcmdWrite				= 0x0030,						/* Write command */
-	kATAcmdWriteLong			= 0x0032,						/* Write Long*/
-	kATAcmdWriteExtended		= 0x0034,						/* Write Extended (with retries)*/
-	kATAcmdWriteDMAExtended		= 0x0035,						/* Write DMA Extended (with retries)*/
-	kATAcmdWriteVerify			= 0x003C,						/* Write verify*/
-	kATAcmdReadVerify			= 0x0040,						/* Read Verify command */
-	kATAcmdFormatTrack			= 0x0050,						/* Format Track command */
-	kATAcmdSeek					= 0x0070,						/* Seek command */
-	kATAcmdDiagnostic			= 0x0090,						/* Drive Diagnostic command */
-	kATAcmdInitDrive			= 0x0091,						/* Init drive parameters command */
-	kATAcmdReadMultiple			= 0x00C4,						/* Read multiple*/
-	kATAcmdWriteMultiple		= 0x00C5,						/* Write multiple*/
-	kATAcmdSetRWMultiple		= 0x00C6,						/* Set Multiple for Read/Write Multiple*/
-	kATAcmdReadDMA				= 0x00C8,						/* Read DMA (with retries)*/
-	kATAcmdWriteDMA				= 0x00CA,						/* Write DMA (with retries)*/
-	kATAcmdMCAcknowledge		= 0x00DB,						/* Acknowledge media change - removable*/
-	kATAcmdDoorLock				= 0x00DE,						/* Door lock*/
-	kATAcmdDoorUnlock			= 0x00DF,						/* Door unlock*/
-	kATAcmdStandbyImmed			= 0x00E0,						/* Standby Immediate*/
-	kATAcmdIdleImmed			= 0x00E1,						/* Idle Immediate*/
-	kATAcmdStandby				= 0x00E2,						/* Standby*/
-	kATAcmdIdle					= 0x00E3,						/* Idle*/
-	kATAcmdReadBuffer			= 0x00E4,						/* Read sector buffer command */
-	kATAcmdCheckPowerMode		= 0x00E5,						/* Check power mode command	<04/04/94>*/
-	kATAcmdSleep				= 0x00E6,						/* Sleep*/
-	kATAcmdFlushCache			= 0x00E7,						/* Flush Cache */
-	kATAcmdWriteBuffer			= 0x00E8,						/* Write sector buffer command */
-	kATAcmdWriteSame			= 0x00E9,						/* Write same data to multiple sectors*/
-	kATAcmdFlushCacheExtended	= 0x00EA,						/* Flush Cache Extended */
-	kATAcmdDriveIdentify		= 0x00EC,						/* Identify Drive command */
-	kATAcmdMediaEject			= 0x00ED,						/* Media Eject*/
-	kATAcmdSetFeatures			= 0x00EF						/* Set Features*/
-};
-
-/* Set feature command opcodes*/
-enum {
-	kATAEnableWriteCache		= 0x02,							/*		Enable write cache*/
-	kATASetTransferMode			= 0x03,							/*		Set transfer mode*/
-	kATAEnableAPM				= 0x05,							/* 		Enable Advanced Power Management*/
-	kATASetPIOMode				= 0x08,							/*		PIO Flow Control Tx Mode bit*/
-	kATADisableWriteCache		= 0x82,							/*		disable write cache*/
-	kATAEnableReadAhead			= 0xAA							/*		Read look-ahead enable*/
-};
-
-// revisit the opcode enumerations.
-
-//////////////////////
-
-
-/* task file for ata */
-typedef struct ataTaskFile {
-
-	UInt8 							ataTFFeatures;				/* <-> Error(R) or ataTFFeatures(W) register image */
-	UInt8 							ataTFCount;					/* <-> Sector count/remaining */
-	UInt8 							ataTFSector;				/* <-> Sector start/finish */
-	UInt8 							ataTFCylLo;					/* <-> ataTFCylLo					*/
-	UInt8 							ataTFCylHigh;				/* <-> ataTFCylHigh  */
-	UInt8 							ataTFSDH;					/* <-> ataTFSDH register image*/
-	UInt8 							ataTFCommand;				/* <-> Status(R) or Command(W) register image */
-
-} ataTaskFile;
-
-
-typedef struct ataRegisterImage {
-
-	ataTaskFile						taskFile;
-	UInt16							ataDataRegister;			/* <-> Data register. */
-	UInt8 							ataAltSDevCReg;				/* <->: Alternate status(R) or Device Control(W) register image*/
-
-} ataRegisterImage ;
-
-
-typedef struct ATAPICmdPacket{
-
-	UInt16 							atapiPacketSize;			/* Size of command packet in bytes	*/
-	UInt16 							atapiCommandByte[8];		/* The command packet itself*/
-
-}ATAPICmdPacket;
-
-
-
-// Error and result codes:  TBD
-enum {
-		kATAErrUnknownType = -1,
-		kATANoErr = 0,
-		kATAQueueEmpty = 1,
-		kATAUnknownOpcode,
-		kATATimeoutErr,
-		kATAInvalidDevID,
-		kATAErrDevBusy,
-		kATAModeNotSupported,
-		kATADevIntNoCmd,
-		kATADeviceError,
-		kATADMAErr
-};
-
-
-#endif /* !_IOATATYPES_H */
diff --git a/i386/include/IOKit/ata/IOPCIATA.h b/i386/include/IOKit/ata/IOPCIATA.h
deleted file mode 100644
index 62067b2..0000000
--- a/i386/include/IOKit/ata/IOPCIATA.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-#ifndef _DRV_PCI_ATA_H
-#define _DRV_PCI_ATA_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOTypes.h>
-#include "IOATAController.h"
-#include <IOKit/IOMemoryCursor.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-
-#include <IOKit/IOInterruptEventSource.h>
-
-/*! @class IOPCIATA
-    @abstract The base class for  PCI-IDE ata controller family.
-    @discussion class defining the common elements of bus-mastering PCI ATA controllers which meet or at least loosely follow the pci bus mastering pci-ide controller spec. Header doc is incomplete, but source is heavily commented.
-
-*/
-
-
-
-class IOPCIATA : public IOATAController
-{
-    OSDeclareDefaultStructors(IOPCIATA);
-
-public:
-
-	/*--- Overrides from IOATAController ---*/
-	virtual bool init(OSDictionary * properties);
-    virtual bool start( IOService* provider );
-
-protected:
-
-	// The DMA states: not in use, in use and running with additional passes needed,
-	// in use on final pass, transfer complete, and failure
-	enum ATADMAState 
-	{
-		// DMA state flags
-		kATADMAInactive,
-		kATADMAStarting,
-		kATADMAActive,
-		kATADMAStatus,
-		kATADMAComplete,
-		kATADMAError,
-	
-	};
-	
-	enum {
-		// PRD flags	
-		kLast_PRD =	0x8000,
-		kContinue_PRD = 0,
-	
-	};
-	
-		
-	enum {
-		mBMCmdStartOutput = 0x01,  						// start engine to transfer from memory to device.
-		mBMCmdStartInput = (1 << 3 ) | 0x01,  	// start engine to transfer from device to memory
-		mBMCmdStop = 0x00,								// halt engine.
-	};
-	
-	enum {	
-		// bus master status register definitions.
-		bBMStatusSimplex = 7,  	// 0 = simultaneous transactions allowed. 1 = primary and secondary busses may not be active at same time.
-		bBMStatusDrv1 = 6,     	// 1 = device 1 and bus are already configured by some other software/firmware
-		bBMStatusDrv0 = 5,     	// 1 = device 0 and bus are already configured by some other software/firmware
-		bBMStatusInt = 2,		// 1 = device has asserted INTRQ and all data is flushed to/from memory.
-		bBMStatusError = 1,		// 1 = an error in the DMA has occured. Software clears by writing 1 to this bit.
-		bBMStatusActive = 0,	// 1 = DMA engine is active.
-	};
-	
-	enum{
-	
-		mBMStatusSimplex = 	1 << 7,
-		mBMStatusDrv1 = 	1 << 6,
-		mBMStatusDrv0 = 	1 << 5,
-		mBMStatusInt = 		1 << 2,
-		mBMStatusError = 	1 << 1,
-		mBMStatusActive = 	1
-	};
-		
-	// the physical region descriptor used for the dma engine.
-	struct PRD
-	{
-		UInt32	bufferPtr;		// address
-		UInt16	byteCount;		// 16 bit byte count where 0x0000 = 64K
-		UInt16	flags;			// 0 in flags means contine, 0x80 means stop
-	};	
-
-
-	// descendants of this class MUST initialize these values
-	// prior to activating any DMA command.
-	IOATARegPtr8 _bmCommandReg;
-	IOATARegPtr8 _bmStatusReg;
-	IOATARegPtr32 _bmPRDAddresReg;	
-	
-	// semaphore for DMA state
-	UInt32	_dmaState;
-	
-	// table of PRD descriptors
-	PRD*	_prdTable;
-	IOPhysicalAddress _prdTablePhysical;	
-	
-	IONaturalMemoryCursor*	_DMACursor;		
-
-	// override from IOATAController
-	// activate the DMA engine as per the current command
-	virtual IOReturn startDMA( void );
-
-	// override from IOATAController
-	// safely halt the DMA engine  regardless of state
-	virtual IOReturn stopDMA( void );
-
-	// allocate memory for the PRD descriptors.
-	virtual bool allocDMAChannel(void);
-	
-	// fill CC with stop commands.
-	virtual void initATADMAChains (PRD* descPtr);
-	
-	// fill out a PRD, respecting endianess
-	virtual void setPRD(UInt8 *bffr, UInt16 count, PRD *tableElement, UInt16 end);
-	
-	// setup the CC with IO commands
-	virtual IOReturn createChannelCommands(void);
-	
-	// deallocate memory for the DMA engine
-	virtual bool freeDMAChannel(void);
-	
-	// clean up on device interrupt
-	virtual IOReturn handleDeviceInterrupt(void);
-	
-	// activate the DMA engine
-	virtual void activateDMAEngine(void);
-	
-	// shutdown the DMA engine
-	virtual void stopDMAEngine(void);
-	
-	// safely suspend the DMA engine
-	virtual void shutDownATADMA (void);
-	
-	// overrides
-	virtual void free();
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOPCIATA class in the future.
-    */
-    typedef struct ExpansionData
-    {
-    	IOBufferMemoryDescriptor*	_prdBuffer;
-    } ExpansionData;
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-private:
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 0);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 1);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 2);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 3);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 4);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 5);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 6);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 7);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 8);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 9);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 10);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 11);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 12);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 13);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 14);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 15);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 16);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 17);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 18);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 19);
-    OSMetaClassDeclareReservedUnused(IOPCIATA, 20);
-};
-
-#endif // _DRV_PCI_ATA_H
diff --git a/i386/include/IOKit/ata/MacIOATA.h b/i386/include/IOKit/ata/MacIOATA.h
deleted file mode 100644
index fad6c33..0000000
--- a/i386/include/IOKit/ata/MacIOATA.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#if defined(__ppc__)
- 
- 
-#ifndef _DRV_MACIO_ATA_H
-#define _DRV_MACIO_ATA_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOTypes.h>
-#include "IOATAController.h"
-#include <IOKit/ppc/IODBDMA.h>
-#include <IOKit/IOMemoryCursor.h>
-
-#include <IOKit/IOInterruptEventSource.h>
-
-
-/*! @class MacIOATA
-    @abstract The base class for MAC-IO ata controller family. .
-    @discussion class defining the portions of MacIO ATA cells which are shared
-	in common between Heathrow and Key Largo ATA Cells.
-	These controllers share a common register file layout, interrupt 
-	source format and all use DBDMA engines. These are different from 
-	other ATA controllers, such as most PCI-IDE and PC-Card ATA ports.
- 	Each cell type has some distinctive features that must be implemented
-	by a specific driver subclass. As much common code as possible is 
-	presented in this superclass.
-
-*/
-
-class MacIOATA : public IOATAController
-{
-    OSDeclareDefaultStructors(MacIOATA);
-
-public:
-
-	/*--- Overrides from IOATAController ---*/
-	virtual bool init(OSDictionary * properties);
-    virtual bool start( IOService* provider );
-	virtual IOReturn message (UInt32 type, IOService* provider, void* argument = 0);
-
-protected:
-
-	// The DMA states: not in use, in use and running with additional passes needed,
-	// in use on final pass, transfer complete, and failure
-	enum ATADMAState 
-	{
-		kATADMAInactive,
-		kATADMAStarting,
-		kATADMAActive,
-		kATADMAStatus,
-		kATADMAComplete,
-		kATADMAError
-	};
-
-
-
-	// the address of the timing register in the controller
-	volatile UInt32* _timingConfigReg;
-	// the timing values to use for each device.
-	UInt32	_timingConfig[2];  
-	
-	// semaphore for DMA state
-	UInt32	_dmaState;
-	
-	// indicates whether a DMA interrupt is expected
-	UInt32 _dmaIntExpected;
-	
-	// pointer to the DMA control register address.
-	volatile IODBDMAChannelRegisters* _dmaControlReg;
-	
-	// mappings to the controller and DMA engine registers
-	// we have to free these when we go away.
-	IOMemoryMap* _baseAddressMap;
-	IOMemoryMap* _dmaBaseMap;
-	
-	// the DBDMA memory cursor
-	IODBDMAMemoryCursor*	_DMACursor;
-	
-	// the DBDMA descriptor table
-	IODBDMADescriptor* _descriptors;
-	IOPhysicalAddress	_descriptorsPhysical;
-	
-	// interrupt event sources
-	IOInterruptEventSource* _devIntSrc;
-	IOInterruptEventSource* _dmaIntSrc;
-	
-	// flag indicating device and dma engine interrupts need 
-	// re-synchronization.
-	
-	bool	_resyncInterrupts;
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-	
-	// overriden to allow synchronization of DMA vs. device interrupts.
-	virtual IOReturn handleDeviceInterrupt(void);
-	// overriden here to allow for reporting of DMA errs
-	virtual IOReturn asyncStatus(void);
-	
-	// overriden here to allow for clean up of DMA resynch flag on timeout.
-	virtual void handleTimeout(void);
-
-
-	// called by the superclass::start method in order to 
-	// find and enable access to the ATA task file.
-	virtual bool configureTFPointers(void);
-
-	// allocate memory for the DMA descriptors.
-	virtual bool allocDMAChannel(void);
-	
-	// fill CC with stop commands.
-	virtual void initATADMAChains (IODBDMADescriptor* descPtr);
-	
-	// setup the CC with IO commands
-	virtual IOReturn createChannelCommands(void);
-	
-	// deallocate memory for the DMA engine
-	virtual bool freeDMAChannel(void);
-	
-	// connect the device (drive) interrupt to our workloop
-	virtual bool createDeviceInterrupt(void);
-
-	// connect the DMA interrupt to our workloop.
-	virtual bool createDMAInterrupt(void);
-
-
-	// override from IOATAController
-	// activate the DMA engine as per the current command
-	virtual IOReturn startDMA( void );
-
-	// override from IOATAController
-	// safely halt the DMA engine  regardless of state
-	virtual IOReturn stopDMA( void );
-
-	// handle the interrupt processing
-	virtual void processDMAInterrupt (void);
-	
-	// activate the DMA engine
-	virtual void activateDMAEngine(void);
-	
-	// shutdown the DMA engine
-	virtual void stopDMAEngine(void);
-	
-	// safely suspend the DMA engine
-	virtual void shutDownATADMA (void);
-	
-	// check the command chain after run to update byte counts
-	// and check for errors
-	virtual bool scanATADMAChain (IOByteCount* byteCount);
-
-
-	// c to c++ glue code.
-	static void deviceInterruptOccurred(OSObject*, IOInterruptEventSource *, int count);
-	static void dmaInterruptOccurred(OSObject*, IOInterruptEventSource *, int count);
-
-	// overrides
-	virtual void free();
-
-	// media bay specific code
-	bool	isMediaBay;
-	bool	isBusOnline;
-	
-	virtual IOReturn executeCommand(IOATADevice* nub, IOATABusCommand* command);
-	virtual IOReturn handleQueueFlush( void );
-	virtual bool checkTimeout( void );
-	static void cleanUpAction(OSObject * owner, void*, void*, void*, void*);
-	virtual void cleanUpBus(void);
-	virtual IOReturn handleBusReset(void);
-	// end media bay specific.
-
-private:
-    OSMetaClassDeclareReservedUnused(MacIOATA, 0);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 1);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 2);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 3);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 4);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 5);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 6);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 7);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 8);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 9);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 10);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 11);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 12);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 13);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 14);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 15);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 16);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 17);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 18);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 19);
-    OSMetaClassDeclareReservedUnused(MacIOATA, 20);
-
-};
-
-#endif // _DRV_MACIO_ATA_H
-
-
-#endif // defined(ppc)
diff --git a/i386/include/IOKit/audio/IOAudioControl.h b/i386/include/IOKit/audio/IOAudioControl.h
deleted file mode 100644
index d1d9019..0000000
--- a/i386/include/IOKit/audio/IOAudioControl.h
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOAUDIOCONTROL_H
-#define _IOKIT_IOAUDIOCONTROL_H
-
-#include <IOKit/IOService.h>
-#ifndef IOAUDIOFAMILY_SELF_BUILD
-#include <IOKit/audio/IOAudioEngine.h>
-#else
-#include "IOAudioEngine.h"
-#endif
-
-class IOAudioPort;
-class OSDictionary;
-class OSSet;
-class IOAudioUserClient;
-class IOAudioControlUserClient;
-class IOWorkLoop;
-class IOCommandGate;
-
-/*!
- * @class IOAudioControl
- * @abstract Represents any controllable attribute of an IOAudioDevice.
- * @discussion An IOAudioControl instance may belong to one IOAudioPort.  Additionally, it may associated 
- *  with an IOAudioEngine as a default control for that IOAudioEngine.
- *
- *  When its value changes, it sends a notification to the CoreAudio.framework (HAL).  It also makes a call
- *  to the ValueChangeHandler.
- *
- *  The base IOAudioControl class contains a type, a value and a channel ID representing the channel(s) which 
- *  the control acts on.  It may also contain a readable format for the name of the channel as well as a 
- *  control ID that can be used to identify unique controls.  Additionally it may contain a subType and a usage.  
- *  Each type has its own set of possible subTypes.  There currently four different control types defined: 
- *  kIOAudioControlTypeLevel, kIOAudioControlTypeToggle, kIOAudioControlTypeSelector.  
- *  Each one is represented by a subclass of IOAudioControl: IOAudioLevelControl, IOAudioToggleControl, 
- *  IOAudioSelectorControl.  The level control defines a range of allowed values and has 
- *  a defined subtype of kIOAudioLevelControlSubTypeVolume used to define a volume control.  The toggle control 
- *  allows for a boolean value and has a defined subtype kIOAudioToggleControlSubTypeMute for a mute control.  The 
- *  selector control has a list of allowed selections with a value and description for each allowed selection and 
- *  has the following sub types: kIOAudioSelectorControlSubTypeOutput for an output selector and 
- *  kIOAudioSelectorControlSubTypeInput for an input selector.  See the subclass documentation for a more 
- *  complete description of each 
- * 
- *  There are enums for default channel ID values and common channel names in IOAudioTypes.h.  The channel ID 
- *  values are prefixed with 'kIOAudioControlChannelID' and the common channel names are prefixed with
- *  'kIOAudioControlChannelName'.  All of the attributes of the IOAudioControl are stored in the registry.
- *  The key used for each attribute is defined in IOAudioTypes.h with the define matching the following
- *  pattern: 'kIOAudioControl<attribute name>Key'.  For example: kIOAudioControlChannelIDKey.
- *
- *  In addition to the existing defined control types, drivers can define their own as well for other purposes.
- *
- *  Changes to the IOAudioControl's value made by the CoreAudio.framework are done through the IORegistry.  
- *  When the CoreAudio.framework initiates a value change, the control receives a setProperties() message. 
- *  The setProperties() implementation looks for the property 'IOAudioControlValue' and if present, calls 
- *  setValue() on the driver's IOWorkLoop with the new value.  The setValue() function first checks to see 
- *  if the new value is different.  If so, it calls performValueChange() to call through to the driver
- *  to make the change in the hardware.  If that call succeeds the value is changed and the new value is set
- *  in the registry.  Additionally notifications are sent to all clients that have registered for them.
- */
-class IOAudioControl : public IOService
-{
-    friend class IOAudioPort;
-    friend class IOAudioDevice;
-    friend class IOAudioEngine;
-    
-    OSDeclareDefaultStructors(IOAudioControl)
-    
-public:
-
-    /*!
-     * @typedef IntValueChangeHandler
-     * @abstract Handler function used to make a notification when a value is to be changed.
-     * @param target Reference supplied when the handler was registered.
-     * @param audioControl The IOAudioControl that is changing.
-	 * @param oldValue The old value of the control.
-     * @param newValue The new value the control is being changed to.
-	 * @result Must return kIOReturnSuccess when the hardware is successfully updated.
-     */
-    typedef IOReturn (*IntValueChangeHandler)(OSObject *target, IOAudioControl *audioControl, SInt32 oldValue, SInt32 newValue);
-    typedef IOReturn (*DataValueChangeHandler)(OSObject *target, IOAudioControl *audioControl, const void *oldData, UInt32 oldDataSize, const void *newData, UInt32 newDataSize);
-    typedef IOReturn (*ObjectValueChangeHandler)(OSObject *target, IOAudioControl *audioControl, OSObject *oldValue, OSObject *newValue);
-    
-protected:
-    /*! @var workLoop 
-        The IOWorkLoop for the audio driver - shared from the IOAudioDevice. 
-    */
-    IOWorkLoop 		*workLoop;
-    /*! @var commandGate 
-        The IOCommandGate for this control - attached to the driver's IOWorkLoop.
-    */
-    IOCommandGate	*commandGate;
-    
-    /*! @var isStarted 
-        Internal state keeping track of when the IOAudioControl has been started. 
-    */
-    bool		isStarted;
-
-    /*! @var controlID 
-        An optional identifier that can be used to identify the control. 
-    */
-    UInt32 		controlID;
-    /*! @var channelID 
-        The ID of the channel this control affects - may be kIOAudioControlChannelIDAll if it represents all channels.
-    */
-    UInt32		channelID;
-    
-    UInt32		type;
-    UInt32		subType;
-    UInt32		usage;
-    
-    OSObject	*value;
-    
-    typedef enum {
-        kIntValueChangeHandler,
-        kDataValueChangeHandler,
-        kObjectValueChangeHandler
-    } ValueChangeHandlerType;
-    
-    ValueChangeHandlerType valueChangeHandlerType;
-
-    union {
-        IntValueChangeHandler		intHandler;
-        DataValueChangeHandler		dataHandler;
-        ObjectValueChangeHandler	objectHandler;
-    } valueChangeHandler;
-    
-    OSObject	*valueChangeTarget;
-    
-    /*! @var clients
-        A list of user clients that have requested value change notifications. 
-    */ 
-    OSSet		*userClients;
-
-protected:
-    struct ExpansionData {
-		IOAudioEngine *				providerEngine;
-		OSArray *					notificationQueue;
-	};
-    
-    ExpansionData *reserved;
-    
-public:
-	// OSMetaClassDeclareReservedUsed(IOAudioControl, 0);
-	virtual void sendChangeNotification(UInt32 notificationType);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioControl, 1);
-    /*!
-	 * @function setReadOnlyFlag
-     * @abstract Call this function to say that a control is read only.
-	 * This call cannot be undone, so if a control is only temporarily unsetable,
-	 * do not use this call but instead return an error from the control handler.
-     */
-	virtual void setReadOnlyFlag();
-
-	// OSMetaClassDeclareReservedUsed(IOAudioControl, 2);
-	virtual void sendQueuedNotifications(void);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioControl, 3);
-    /*!
-     * @function createUserClient
-     * @abstract Creates a new IOAudioControlUserClient instance.
-     * @discussion This function is called by newUserClient() to create a new IOAudioControlUserClient instance.  This function may be overridden by subclasses that need to add functionality
-     *  to the IOAudioControlUserClient.  In that case, they must subclass IOAudioControlUserClient
-     *  and return a new, initialized instance of that subclass.
-	 *  A derived class that requires overriding of createUserClient should override the version with the properties
-	 *  parameter for Intel targets, and without the properties parameter for PPC targets.  The #if __i386__ directive
-	 *  can be used to select between the two behaviors.
-     * @param task The task requesting the new user client.
-     * @param securityID Optional security paramater passed in by the client - ignored.
-     * @param type Optional user client type passed in by the client.
-     * @param newUserClient The IOAudioControlUserClient * must be stored in this param on a successful
-     *  completion.
-     * @param properties A dictionary of additional properties for the connection.
-     * @result Returns kIOReturnSuccess on success.
-     */
-    virtual IOReturn createUserClient(task_t task, void *securityID, UInt32 type, IOAudioControlUserClient **newUserClient, OSDictionary *properties);
-
-private:
-    OSMetaClassDeclareReservedUsed(IOAudioControl, 0);
-    OSMetaClassDeclareReservedUsed(IOAudioControl, 1);
-    OSMetaClassDeclareReservedUsed(IOAudioControl, 2);
-    OSMetaClassDeclareReservedUsed(IOAudioControl, 3);
-
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 4);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 5);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 6);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 7);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 8);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 9);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 10);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 11);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 12);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 13);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 14);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 15);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 16);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 17);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 18);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 19);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 20);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 21);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 22);
-    OSMetaClassDeclareReservedUnused(IOAudioControl, 23);
-    
-public:
-
-    /*!
-     * @function withAttributes
-     * @abstract Static function that allocates a new IOAudioControl with the given attributes.
-     * @param type The type of the control.  Common, known types are defined in IOAudioTypes.h.  They currently
-     *  consist of kIOAudioControlTypeLevel, kIOAudioControlTypeToggle, kIOAudioControlTypeSelector.
-     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
-     * @param channelName An optional name for the channel.  Common names are located in IOAudioDefines.h.  Any name not
-     *  defined in IOAudioDefines.h must be localized in order to be properly displayed in multiple languages.
-     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls
-     * @param subType An optional subType specific to the given type
-     * @param usage An optional value specifying how the control will be used.  Currently defined usages are kIOAudioControlUsageInput, 
-     *  kIOAudioControlUsageOutput and kIOAudioControlUsagePassThru.  This value is used when a control is set as a default control
-     *  on an IOAudioEngine.
-     * @result Returns a newly allocated and initialized IOAudioControl.
-     */
-    static IOAudioControl *withAttributes(UInt32 type,
-                                          OSObject *initialValue,
-                                          UInt32 channelID,
-                                          const char *channelName = 0,
-                                          UInt32 cntrlID = 0,
-                                          UInt32 subType = 0,
-                                          UInt32 usage = 0);
-
-    /*!
-     * @function init
-     * @abstract Initializes a newly allocated IOAudioControl with the given attributes.
-     * @param type The type of the control.  Common, known types are defined in IOAudioTypes.h.  They currently
-     *  consist of kIOAudioControlTypeLevel, kIOAudioControlTypeToggle, kIOAudioControlTypeSelector.
-     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
-     * @param channelName An optional name for the channel.  Common names are located in IOAudioDefines.h.  Any name not
-     *  defined in IOAudioDefines.h must be localized in order to be properly displayed in multiple languages.
-     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls
-     * @param subType An optional subType specific to the given type
-     * @param usage An optional value specifying how the control will be used.  Currently defined usages are kIOAudioControlUsageInput, 
-     *  kIOAudioControlUsageOutput and kIOAudioControlUsagePassThru.  This value is used when a control is set as a default control
-     *  on an IOAudioEngine.
-     * @param properties Standard property list passed to the init() function of any new IOService.  This dictionary
-     *  gets stored in the registry entry for this instance.
-     * @result Returns true on success.
-     */
-    virtual bool init(UInt32 type,
-                      OSObject *initialValue,
-                      UInt32 channelID,
-                      const char *channelName = 0,
-                      UInt32 cntrlID = 0,
-                      UInt32 subType = 0,
-                      UInt32 usage = 0,
-                      OSDictionary *properties = 0);
-                      
-    /*!
-     * @function free
-     * @abstract Frees all of the resources allocated by the IOAudioControl.
-     * @discussion Do not call this directly.  This is called automatically by the system when the instance's
-     *  refcount goes to 0.  To decrement the refcount, call release() on the object.
-     */
-    virtual void free();
-
-    /*!
-     * @function start
-     * @abstract Starts a newly created IOAudioControl.
-     * @discussion This is called automatically by IOAudioPort when addAudioControl() is called or by IOAudioEngine 
-     *  when addDefaultAudioControl() is called.  It will only be called by the first call to either addAudioControl() or
-     *  addDefaultAudioControl().
-     * @param provider The IOAudioPort or IOAudioEngine that owns this control.
-     * @result Returns true on success.
-     */
-    virtual bool start(IOService *provider);
-    
-	virtual bool attachAndStart(IOService *provider);
-
-    /*!
-     * @function getIsStarted
-     * @abstract Returns true after start() has been called.
-     * @discussion Used by IOAudioPort and IOAudioEngine to decide if the control needs to be started.
-     */
-    virtual bool getIsStarted();
-
-    /*!
-     * @function stop
-     * @abstract Stops the control when the provider is going away.
-     * @param provider The IOAudioPort or IOAudioEngine that owns this control.
-     */
-    virtual void stop(IOService *provider);
-    
-    /*!
-     * @function getWorkLoop
-     * @abstract Returns the IOWorkLoop for the whole audio driver.
-     */
-    virtual IOWorkLoop *getWorkLoop();
-
-    /*!
-     * @function getCommandGate
-     * @abstract Returns the IOCommandGate for this IOAudioControl.
-     */
-    virtual IOCommandGate *getCommandGate();
-
-    /*!
-     * @function newUserClient
-     * @abstract Creates a new user client object for this IOAudioControl instance.
-     * @discussion This is called automatically by I/O Kit when a user process opens a connection to this
-     *  IOAudioControl.  This is typically done when the user process needs to register for value change
-     *  notifications.  This implementation allocates a new IOAudioControlUserClient object.  There is no
-     *  need to call this directly.
-	 *  A derived class that requires overriding of newUserClient should override the version with the properties
-	 *  parameter for Intel targets, and without the properties parameter for PPC targets.  The #if __i386__ directive
-	 *  can be used to select between the two behaviors.
-     * @param task The task requesting the new user client.
-     * @param securityID Optional security paramater passed in by the client - ignored.
-     * @param type Optional user client type passed in by the client - 0 for the default user client type.
-     * @param handler The new IOUserClient * must be stored in this param on a successful completion.
-     * @param properties A dictionary of additional properties for the connection.
-     * @result Returns kIOReturnSuccess on success.  May also result kIOReturnError or kIOReturnNoMemory.
-     */
-    virtual IOReturn newUserClient(task_t task, void *securityID, UInt32 type, IOUserClient **handler);
-    virtual IOReturn newUserClient(task_t task, void *securityID, UInt32 type, OSDictionary *properties, IOUserClient **handler);
-
-    /*!
-     * @function createUserClient
-     * @abstract Creates a new IOAudioControlUserClient instance.
-     * @discussion This function is called by newUserClient() to create a new IOAudioControlUserClient instance.  This function may be overridden by subclasses that need to add functionality
-     *  to the IOAudioControlUserClient.  In that case, they must subclass IOAudioControlUserClient
-     *  and return a new, initialized instance of that subclass.
-	 *  A derived class that requires overriding of createUserClient should override the version with the properties
-	 *  parameter for Intel targets, and without the properties parameter for PPC targets.  The #if __i386__ directive
-	 *  can be used to select between the two behaviors.
-     * @param task The task requesting the new user client.
-     * @param securityID Optional security paramater passed in by the client - ignored.
-     * @param type Optional user client type passed in by the client.
-     * @param newUserClient The IOAudioControlUserClient * must be stored in this param on a successful
-     *  completion.
-     * @result Returns kIOReturnSuccess on success.
-     */
-    virtual IOReturn createUserClient(task_t task, void *securityID, UInt32 type, IOAudioControlUserClient **newUserClient);
-    
-    /*!
-     * @function clientClosed
-     * @abstract Called automatically by the IOAudioControlUserClient when a user client closes its
-     *  connection to the control.
-     * @param client The user client object that has disconnected.
-     */
-    virtual void clientClosed(IOAudioControlUserClient *client);
-
-    /*!
-     * @function setProperties
-     * @abstract Changes a property of this IOService. 
-     * @discussion This is called when the user client changes a property of this 
-     *  IOAudioControl.  In this case it is used to change the value.  This function
-     *  looks for that property and then calls setValue() through the IOCommandGate and
-     *  setValueAction().
-     * @param properties An OSDictionary containing the properties to change.
-     * @result Returns kIOReturnSuccess on success.
-     */
-    virtual IOReturn setProperties(OSObject *properties);
-    
-    virtual void setValueChangeHandler(IntValueChangeHandler intValueChangeHandler, OSObject *target);
-    virtual void setValueChangeHandler(DataValueChangeHandler dataValueChangeHandler, OSObject *target);
-    virtual void setValueChangeHandler(ObjectValueChangeHandler objectValueChangeHandler, OSObject *target);
-
-    virtual void setValueChangeTarget(OSObject *target);
-
-    /*!
-     * @function flushValue
-     * @abstract Forces the control to be flushed out to the hardware.
-     * @discussion This function calls performValueChange() directly with the current value of the IOAudioControl.
-     * @result Returns the result of performValueChange() - kIOReturnSuccess on success.
-     */
-    virtual IOReturn flushValue();
-
-    /*!
-     * @function setValueAction
-     * @abstract IOCommandGate Action which calls setValue() while holding the IOCommandGate.
-     * @discussion This is needed to allow setValue() to be called on the IOWorkLoop.
-     * @param owner The owner of the IOCommandGate (the IOAudioControl in this case).
-     * @param arg1 The new value for the IOAudioControl.
-     * @result Returns the result of setValue() - kIOReturnSuccess on success.
-     */
-    static IOReturn setValueAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-
-	static IOReturn _setValueAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-	
-    /*!
-     * @function setValue
-     * @abstract Sets the value for this control.
-     * @discussion When the control's value is changed, a call is made to performValueChange().  If that call
-     *  succeeds, the value is set and sendValueChangeNotification() is called to send a notification to the
-     *  user clients.  This function must be called on the IOWorkLoop.
-     * @param newValue The new value for this control.
-     * @result Returns kIOReturnSuccess if the value is successfully set.
-     */
-    virtual IOReturn setValue(OSObject *newValue);
-    
-    virtual IOReturn setValue(SInt32 intValue);
-    
-    /*!
-     * @function hardwareValueChanged
-     * @abstract Updates the value for this control and sends out the value changed notification.
-     * @discussion This is designed to be called by the driver when it detects that the hardware's value has
-     *  changed without driver intervention (e.g. when an external event causes the change).  The difference between
-     *  hardwareValueChanged() and setValue() is that hardwareValueChanged() doesn't call performValueChange() which 
-     *  sends a message back to the driver to cause it to change the hardware with the new value.  This function must
-     *  be called on the IOWorkLoop.
-     * @param newValue The new value for this control.
-     * @result Returns kIOReturnSuccess if the value is successfully updated.
-     */
-    virtual IOReturn hardwareValueChanged(OSObject *newValue);
-
-    /*!
-     * @function getValue 
-     * @abstract Returns the current value of the control.
-     */
-    virtual OSObject *getValue();
-    virtual SInt32 getIntValue();
-    virtual const void *getDataBytes();
-    virtual UInt32 getDataLength();
-
-    /*!
-     * @function getControlID 
-     * @abstract Returns the control ID for the control.
-     */
-    virtual UInt32 getControlID();
-
-    /*!
-     * @function getChannelID 
-     * @abstract Returns the channel ID for the control.
-     */
-    virtual UInt32 getChannelID();
-    
-    virtual UInt32 getType();
-    virtual UInt32 getSubType();
-    virtual UInt32 getUsage();
-
-    virtual void setCoreAudioPropertyID(UInt32 propertyID);
-
-	void setWorkLoop(IOWorkLoop *wl);
-
-protected:
-    /*!
-     * @function sendValueChangeNotification
-     * @abstract Called when the value has changed for the control.
-     * @discussion This function sends out the value change notification to the user clients.
-     */
-    virtual void sendValueChangeNotification();
-    
-    /*!
-     * @function setChannelName 
-     * @abstract Called at init time to set the channel name for this IOAudioControl.
-     */
-    virtual void setChannelName(const char *channelName);
-
-    /*!
-     * @function setChannelID 
-     * @abstract Called at init time to set the channel ID for this IOAudioControl.
-     */
-    virtual void setChannelID(UInt32 newChannelID);
-    virtual void setChannelNumber(SInt32 channelNumber);
-
-    /*!
-     * @function setSubType 
-     * @abstract Called at init time to set the control subType.
-     */
-    virtual void setType(UInt32 type);
-
-    /*!
-     * @function setType 
-     * @abstract Called at init time to set the control type.
-     */
-    virtual void setSubType(UInt32 subType);
-
-    /*!
-     * @function setUsage 
-     * @abstract Called at init time to set the control usage.
-     */
-    virtual void setUsage(UInt32 usage);
-
-    /*!
-     * @function setControlID
-     * @abstract Sets the controlID for this control.
-     * @discussion The control ID is an optional attribute that can be used to track IOAudioControls.  A typical
-     *  use is for the IOAudioDevice to assign a unique controlID to each control that it creates and then
-     *  do a switch statement on the id of the control when it gets an audioControlValueChanged() notification.
-     *  Typically the control ID is set when the object is created and doesn't need to be called again.
-     * @param cntrlID The control ID for the control.
-     */
-    virtual void setControlID(UInt32 cntrlID);
-    
-    /*!
-     * @function validateValue
-     * @abstract Called by setValue() to verify that the value is valid.
-     * @param newValue The new value to be verified.
-     * @result Returns kIOReturnSuccess if the value is valid.
-     */
-    virtual IOReturn validateValue(OSObject *newValue);
-    
-    /*!
-     * @function updateValue
-     * @abstract Called by setValue() in order to update the value and the registry.
-     * @discussion It also calls
-     *  sendValueChangedNotification() to send notifications to the user clients.
-     * @param newValue The new value to b updated.
-     * @result Returns kIOReturnSuccess if the value is successfully updated.
-     */
-    virtual IOReturn updateValue(OSObject *newValue);
-    
-    virtual IOReturn _setValue(OSObject *newValue);
-
-    /*!
-     * @function performValueChange
-     * @abstract Called by setValue() to make the call to the valueChangeHandler
-     *  to update the hardware.
-     * @result Returns the result of the handler call (or kIOReturnError on an error).
-     */
-    virtual IOReturn performValueChange(OSObject *newValue);
-
-    /*!
-     * @function addUserClientAction
-     * @abstract IOCommandGate Action which calls addUserClient() while holding the IOCommandGate.
-     * @discussion This is needed to allow addUserClient() to be called on the IOWorkLoop.
-     * @param owner The owner of the IOCommandGate (the IOAudioControl in this case).
-     * @param arg1 The IOAudioControlUserClient to be added.
-     * @result Returns the result of addUserClient() - kIOReturnSuccess on success.
-     */
-    static IOReturn addUserClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-    
-	static IOReturn _addUserClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-
-    /*!
-     * @function removeUserClientAction
-     * @abstract IOCommandGate Action which calls removeUserClient() while holding the IOCommandGate.
-     * @discussion This is needed to allow removeUserClient() to be called on the IOWorkLoop.
-     * @param owner The owner of the IOCommandGate (the IOAudioControl in this case).
-     * @param arg1 The IOAudioControlUserClient to be removed.
-     * @result Returns the result of removeUserClient() - kIOReturnSuccess on success.
-     */
-    static IOReturn removeUserClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-    
-	static IOReturn _removeUserClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-
-    /*!
-     * @function detachUserClientsAction
-     */
-     static IOReturn detachUserClientsAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-
-    /*!
-     * @function addUserClient
-     * @abstract Called on the IOWorkLoop to add a new IOAudioControlUserClient.
-     * @discussion There is no need to call this directly.  It is called on the workLoop 
-     *  by newUserClient() through addUserClientAction().
-     * @param newUserClient The IOAudioControlUserClientto be added.
-     * @result Returns kIOReturnSuccess on success.
-     */
-    virtual IOReturn addUserClient(IOAudioControlUserClient *newUserClient);
-    
-    /*!
-     * @function removeUserClient
-     * @abstract Called on the IOWorkLoop to remove an IOAudioControlUserClient.
-     * @discussion This is called on the IOWorkLoop by clientClosed() through
-     *  removeUserClientAction() when the user client is going away.  It should
-     *  not be called directly. 
-     * @param userClient The IOAudioControlUserClient to be removed.
-     * @result Returns kIOReturnSuccess on success.
-     */
-    virtual IOReturn removeUserClient(IOAudioControlUserClient *userClient);
-    
-    virtual IOReturn detachUserClients();
-
-};
-
-#endif /* _IOKIT_IOAUDIOCONTROL_H */
-
diff --git a/i386/include/IOKit/audio/IOAudioControlUserClient.h b/i386/include/IOKit/audio/IOAudioControlUserClient.h
deleted file mode 100644
index 4ceb05f..0000000
--- a/i386/include/IOKit/audio/IOAudioControlUserClient.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOAUDIOCONTROLUSERCLIENT_H
-#define _IOKIT_IOAUDIOCONTROLUSERCLIENT_H
-
-#include <IOKit/IOUserClient.h>
-
-#ifndef IOAUDIOFAMILY_SELF_BUILD
-#include <IOKit/audio/IOAudioTypes.h>
-#else
-#include "IOAudioTypes.h"
-#endif
-
-class IOAudioControl;
-
-class IOAudioControlUserClient : public IOUserClient
-{
-    OSDeclareDefaultStructors(IOAudioControlUserClient)
-    
-protected:
-    task_t 				clientTask;
-    IOAudioControl *			audioControl;
-    IOAudioNotificationMessage *	notificationMessage;
-
-    virtual IOReturn clientClose();
-    virtual IOReturn clientDied();
-
-protected:
-    struct ExpansionData { };
-    
-    ExpansionData *reserved;
-
-public:
-	virtual void sendChangeNotification(UInt32 notificationType);
-    // OSMetaClassDeclareReservedUsed(IOAudioControlUserClient, 1);
-    virtual bool initWithAudioControl(IOAudioControl *control, task_t owningTask, void *securityID, UInt32 type, OSDictionary *properties);
-
-private:
-    OSMetaClassDeclareReservedUsed(IOAudioControlUserClient, 0);
-    OSMetaClassDeclareReservedUsed(IOAudioControlUserClient, 1);
-
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 2);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 3);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 4);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 5);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 6);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 7);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 8);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 9);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 10);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 11);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 12);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 13);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 14);
-    OSMetaClassDeclareReservedUnused(IOAudioControlUserClient, 15);
-
-public:
-    static IOAudioControlUserClient *withAudioControl(IOAudioControl *control, task_t clientTask, void *securityID, UInt32 type);
-    static IOAudioControlUserClient *withAudioControl(IOAudioControl *control, task_t clientTask, void *securityID, UInt32 type, OSDictionary *properties);
-
-    virtual bool initWithAudioControl(IOAudioControl *control, task_t owningTask, void *securityID, UInt32 type);
-	
-    virtual void free();
-
-    virtual IOReturn registerNotificationPort(mach_port_t port, UInt32 type, UInt32 refCon);
-
-    virtual void sendValueChangeNotification();
-};
-
-#endif /* _IOKIT_IOAUDIOCONTROLUSERCLIENT_H */
diff --git a/i386/include/IOKit/audio/IOAudioDebug.h b/i386/include/IOKit/audio/IOAudioDebug.h
deleted file mode 100644
index 04b744e..0000000
--- a/i386/include/IOKit/audio/IOAudioDebug.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOAUDIODEBUG_H
-#define _IOAUDIODEBUG_H
-
-#ifdef DEBUG
-	#define DEBUG_LEVEL 1
-	#define DEBUG_USE_FIRELOG 1
-	
-	#ifdef DEBUG_USE_FIRELOG
-	#include <IOKit/firewire/FireLog.h>
-	#define audioDebugIOLog( level, message... ) \
-		do {FireLog(  message ); FireLog("\n");} while (0)
-			
-	#else
-	#include <IOKit/usb/IOUSBLog.h>
-	#define audioDebugIOLog( level, message... ) \
-		do {USBLog( level, message );} while (0)
-	#endif
-
-
-
-	#ifdef assert
-		#undef assert
-
-		#define AssertionMessage( cond, file, line ) \
-			"assert \"" #cond "\" failed in " #file " at line " #line
-
-		#define AssertionFailed( cond, file, line ) \
-			panic(AssertionMessage( cond, file, line ));
-
-		#define	assert( cond )								\
-			if( !(cond) ) {									\
-				AssertionFailed( cond, __FILE__, __LINE__ )	\
-			}
-	#endif
-#else
-	#define audioDebugIOLog( level, message... ) ;
-#endif
-
-#endif /* _IOAUDIODEBUG_H */
diff --git a/i386/include/IOKit/audio/IOAudioDefines.h b/i386/include/IOKit/audio/IOAudioDefines.h
deleted file mode 100644
index 068267a..0000000
--- a/i386/include/IOKit/audio/IOAudioDefines.h
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOAUDIODEFINES_H
-#define _IOAUDIODEFINES_H
-
-#define kIOAudioDeviceClassName		"IOAudioDevice"
-#define kIOAudioEngineClassName		"IOAudioEngine"
-#define kIOAudioStreamClassName		"IOAudioStream"
-#define kIOAudioPortClassName		"IOAudioPort"
-#define kIOAudioControlClassName	"IOAudioControl"
-
-/*!
- * @defined kIOAudioSampleRateKey
- * @abstract The key in the IORegistry for the IOAudioEngine sample rate attribute
- * @discussion This value is represented as an integer in samples per second.
- */
-#define kIOAudioSampleRateKey				"IOAudioSampleRate"
-
-#define kIOAudioSampleRateWholeNumberKey	"IOAudioSampleRateWholeNumber"
-#define kIOAudioSampleRateFractionKey		"IOAudioSampleRateFraction"
-
-
-
-/******
- *
- * IOAudioDevice  defines
- *
- *****/
-
-
-/*!
- * @defined kIOAudioDeviceNameKey
- * @abstract The key in the IORegistry for the IOAudioDevice name attribute.
- */
-#define kIOAudioDeviceNameKey				"IOAudioDeviceName"
-
-#define kIOAudioDeviceShortNameKey			"IOAudioDeviceShortName"
-
-/*!
- * @defined kIOAudioDeviceManufacturerNameKey
- * @abstract The key in the IORegistry for the IOAudioDevice manufacturer name attribute.
- */
-#define kIOAudioDeviceManufacturerNameKey	"IOAudioDeviceManufacturerName"
-
-#define kIOAudioDeviceLocalizedBundleKey	"IOAudioDeviceLocalizedBundle"
-
-#define kIOAudioDeviceTransportTypeKey		"IOAudioDeviceTransportType"
-
-#define kIOAudioDeviceConfigurationAppKey	"IOAudioDeviceConfigurationApplication"
-
-#define kIOAudioDeviceCanBeDefaults			"IOAudioDeviceCanBeDefaults"
-
-#define kIOAudioDeviceModelIDKey			"IOAudioDeviceModelID"
-
-
-/*!
- * @defined kIOAudioDeviceIconName
- * @abstract The key in the IORegistry for the IOAudioDevice icon name attribute.
- */
-#define kIOAudioDeviceIconNameKey		"IOAudioDeviceIconName"
-
-#define kIOAudioDeviceIconTypeKey		"IOAudioDeviceIconType"
-
-#define kIOAudioDeviceIconSubDirKey	"IOAudioDeviceIconSubDir"
-
-/*****
- *
- * IOAudioEngine defines
- *
- *****/
-
-
- /*!
- * @defined kIOAudioEngineStateKey
- * @abstract The key in the IORegistry for the IOAudioEngine state atrribute
- * @discussion The value for this key may be one of: "Running", "Stopped" or "Paused".  Currently the "Paused"
- *  state is unimplemented.
- */
-#define kIOAudioEngineStateKey		"IOAudioEngineState"
-
-/*!
- * @defined kIOAudioEngineOutputSampleLatencyKey
- * @abstract The key in the IORegistry for the IOAudioEngine output sample latency key
- * @discussion 
- */
-#define kIOAudioEngineOutputSampleLatencyKey		"IOAudioEngineOutputSampleLatency"
-
-/*!
- * @defined kIOAudioStreamSampleLatencyKey
- * @abstract The key in the IORegistry for the IOAudioStream output sample latency key
- * @discussion Tells the HAL how much latency is on a particular stream.  If two streams
- * on the same engine have different latencies (e.g. one is analog, one is digital), then
- * set this property on both streams to inform the HAL of the latency differences.  Alternately,
- * you can set the engine latency, and just include the latency additional to that for the particular
- * stream.  The HAL will add the engine and stream latency numbers together to get the total latency.
- */
-#define kIOAudioStreamSampleLatencyKey				"IOAudioStreamSampleLatency"
-
-#define kIOAudioEngineInputSampleLatencyKey			"IOAudioEngineInputSampleLatency"
-
-#define kIOAudioEngineSampleOffsetKey				"IOAudioEngineSampleOffset"
-
-#define kIOAudioEngineInputSampleOffsetKey			"IOAudioEngineInputSampleOffset"
-
-#define kIOAudioEngineNumSampleFramesPerBufferKey	"IOAudioEngineNumSampleFramesPerBuffer"
-
-#define kIOAudioEngineCoreAudioPlugInKey			"IOAudioEngineCoreAudioPlugIn"
-
-#define kIOAudioEngineNumActiveUserClientsKey		"IOAudioEngineNumActiveUserClients"
-
-#define kIOAudioEngineUserClientActiveKey			"IOAudioEngineUserClientActive"
-
-#define kIOAudioEngineGlobalUniqueIDKey				"IOAudioEngineGlobalUniqueID"
-
-#define kIOAudioEngineDescriptionKey				"IOAudioEngineDescription"
-
-#define kIOAudioEngineClockIsStableKey				"IOAudioEngineClockIsStable"
-
-#define kIOAudioEngineClockDomainKey				"IOAudioEngineClockDomain"
-
-#define kIOAudioEngineIsHiddenKey               "IOAudioEngineIsHidden"
-/*!
- * @defined kIOAudioEngineFullChannelNamesKey
- * @abstract The key in the IORegistry for the IOAudioEngine's dictionary of fully constructed names for each channel keyed by the device channel
- * @discussion 
- */
-#define	kIOAudioEngineFullChannelNamesKey			"IOAudioEngineChannelNames"
-
-/*!
- * @defined kIOAudioEngineFullChannelNamesKey
- * @abstract The key in the IORegistry for the IOAudioEngine's dictionary of category names for each channel keyed by the device channel
- * @discussion 
- */
-#define	kIOAudioEngineFullChannelCategoryNamesKey	"IOAudioEngineChannelCategoryNames"
-
-/*!
- * @defined kIOAudioEngineFullChannelNamesKey
- * @abstract The key in the IORegistry for the IOAudioEngine's dictionary of number names for each channel keyed by the device channel
- * @discussion 
- */
-#define	kIOAudioEngineFullChannelNumberNamesKey			"IOAudioEngineChannelNumberNames"
-
-#define	kIOAudioEngineFullChannelNameKeyInputFormat		"InputChannel%u"
-
-#define	kIOAudioEngineFullChannelNameKeyOutputFormat	"OutputChannel%u"
-
-#define kIOAudioEngineFlavorKey							"IOAudioEngineFlavor"
-
-#define	kIOAudioEngineAlwaysLoadCoreAudioPlugInKey		"IOAudioEngineAlwaysLoadCoreAudioPlugIn"
-
-/*!
- * @defined kIOAudioEngineInputChannelLayoutKey
- * @abstract The key in the IORegistry for the IOAudioEngine's dictionary describes an array of OSNumber data that describe the spatial position of each channel.  See IOAudioTypes.h.
- * @discussion
- */
-
-#ifndef __OPEN_SOURCE__
-//	<rdar://6868206>
-#endif
-#define kIOAudioEngineInputChannelLayoutKey				"IOAudioEngineInputChannelLayout"
-
-/*!
- * @defined kIOAudioEngineOutputChannelLayoutKey
- * @abstract The key in the IORegistry for the IOAudioEngine's dictionary describes an array of OSNumber data that describe the spatial position of each channel.  See IOAudioTypes.h.
- * @discussion
- */
-
-#ifndef __OPEN_SOURCE__
-//	<rdar://6868206>
-#endif
-#define kIOAudioEngineOutputChannelLayoutKey			"IOAudioEngineOutputChannelLayout"
-
-/*****
- *
- * IOAudioStream defines
- *
- *****/
- 
- 
-#define kIOAudioStreamIDKey					"IOAudioStreamID"
-#define kIOAudioStreamDescriptionKey		"IOAudioStreamDescription"
-#define kIOAudioStreamNumClientsKey			"IOAudioStreamNumClients"
-
-/*!
- * @defined kIOAudioStreamDirectionKey
- * @abstract The key in the IORegistry for the IOAudioStream direction attribute.
- * @discussion The value for this key may be either "Output" or "Input".
- */
-#define kIOAudioStreamDirectionKey				"IOAudioStreamDirection"
-
-#define kIOAudioStreamStartingChannelIDKey		"IOAudioStreamStartingChannelID"
-#define kIOAudioStreamStartingChannelNumberKey	"IOAudioStreamStartingChannelNumber"
-#define kIOAudioStreamAvailableKey				"IOAudioStreamAvailable"
-
-#define kIOAudioStreamFormatKey					"IOAudioStreamFormat"
-#define kIOAudioStreamAvailableFormatsKey		"IOAudioStreamAvailableFormats"
-
-#define kIOAudioStreamNumChannelsKey			"IOAudioStreamNumChannels"
-#define kIOAudioStreamSampleFormatKey			"IOAudioStreamSampleFormat"
-
-#define kIOAudioStreamNumericRepresentationKey	"IOAudioStreamNumericRepresentation"
-
-#define kIOAudioStreamFormatFlagsKey			"IOAudioStreamFormatFlags"
-#define kIOAudioStreamFramesPerPacketKey		"IOAudioStreamFramesPerPacket"
-#define kIOAudioStreamBytesPerPacketKey			"IOAudioStreamBytesPerPacket"
-
-
-#define kIOAudioStreamBitDepthKey				"IOAudioStreamBitDepth"
-#define kIOAudioStreamBitWidthKey				"IOAudioStreamBitWidth"
-    
-#define kIOAudioStreamAlignmentKey				"IOAudioStreamAlignment"
-
-#define kIOAudioStreamByteOrderKey				"IOAudioStreamByteOrder"
-
-#define kIOAudioStreamIsMixableKey				"IOAudioStreamIsMixable"
-
-#define kIOAudioStreamMinimumSampleRateKey		"IOAudioStreamMinimumSampleRate"
-#define kIOAudioStreamMaximumSampleRateKey		"IOAudioStreamMaximumSampleRate"
-
-#define kIOAudioStreamDriverTagKey				"IOAudioStreamDriverTag"
-
-#define kIOAudioStreamTerminalTypeKey			"IOAudioStreamTerminalType"
-
-/*****
- *
- * IOAudioPort defines
- *
- *****/
- 
- 
- /*!
- * @defined kIOAudioPortTypeKey
- * @abstract The key in the IORegistry for the IOAudioPort type attribute.
- * @discussion This is a driver-defined text attribute that may contain any type.
- *  Common types are defined as: "Speaker", "Headphones", "Microphone", "CD", "Line", "Digital", "Mixer", "PassThru".
- */
-#define kIOAudioPortTypeKey			"IOAudioPortType"
-
-/*!
- * @defined kIOAudioPortSubTypeKey
- * @abstract The key in the IORegistry for the IOAudioPort subtype attribute.
- * @discussion The IOAudioPort subtype is a driver-defined text attribute designed to complement the type
- *  attribute.
- */
-#define kIOAudioPortSubTypeKey		"IOAudioPortSubType"
-
-/*!
- * @defined kIOAudioPortNameKey
- * @abstract The key in the IORegistry for the IOAudioPort name attribute.
- */
-#define kIOAudioPortNameKey			"IOAudioPortName"
-
-
-
-/*****
- *
- * IOAudioControl defines
- *
- *****/
- 
- 
- /*!
- * @defined kIOAudioControlTypeKey
- * @abstract The key in the IORegistry for the IOAudioCntrol type attribute.
- * @discussion The value of this text attribute may be defined by the driver, however system-defined
- *  types recognized by the upper-level software are "Level", "Mute", "Selector".
- */
-#define kIOAudioControlTypeKey		"IOAudioControlType"
-
-#define kIOAudioControlSubTypeKey	"IOAudioControlSubType"
-
-#define kIOAudioControlUsageKey		"IOAudioControlUsage"
-
-#define kIOAudioControlIDKey		"IOAudioControlID"
-
-/*!
- * @defined kIOAudioControlChannelIDKey
- * @abstract The key in the IORegistry for the IOAudioControl channel ID attribute
- * @discussion The value for this key is an integer which may be driver defined.  Default values for
- *  common channel types are provided in the following defines.
- */
-#define kIOAudioControlChannelIDKey		"IOAudioControlChannelID"
-
-#define kIOAudioControlChannelNumberKey			"IOAudioControlChannelNumber"
-
-#define kIOAudioControlCoreAudioPropertyIDKey	"IOAudioControlCoreAudioPropertyID"
-/*!
- * @defined kIOAudioControlChannelNameKey
- * @abstract The key in the IORegistry for the IOAudioControl name attribute.
- * @discussion This name should be a human-readable name for the channel(s) represented by the port.
- *  *** NOTE *** We really need to make all of the human-readable attributes that have potential to
- *  be used in a GUI localizable.  There will need to be localized strings in the kext bundle matching
- *  the text.
- */
-#define kIOAudioControlChannelNameKey		"IOAudioControlChannelName"
-
-/*!
- * @defined kIOAudioControlChannelNameAll
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for all channels.
- */
-#define kIOAudioControlChannelNameAll		"All Channels"
-
-/*!
- * @defined kIOAudioControlChannelNameLeft
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the left channel.
- */
-#define kIOAudioControlChannelNameLeft		"Left"
-
-/*!
- * @defined kIOAudioControlChannelNameRight
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the right channel.
- */
-#define kIOAudioControlChannelNameRight		"Right"
-
-/*!
- * @defined kIOAudioControlChannelNameCenter
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the center channel.
- */
-#define kIOAudioControlChannelNameCenter	"Center"
-
-/*!
- * @defined kIOAudioControlChannelNameLeftRear
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the left rear channel.
- */
-#define kIOAudioControlChannelNameLeftRear	"LeftRear"
-
-/*!
- * @defined kIOAudioControlChannelNameRightRear
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the right rear channel.
- */
-#define kIOAudioControlChannelNameRightRear	"RightRear"
-
-/*!
- * @defined kIOAudioControlChannelNameSub
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the sub/LFE channel.
- */
-#define kIOAudioControlChannelNameSub		"Sub"
-
-/*!
- * @defined kIOAudioControlChannelNameFrontLeftCenter
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the FrontLeftCenter channel.
- */
-#define kIOAudioControlChannelNameFrontLeftCenter		"FrontLeftCenter"
-
-/*!
- * @defined kIOAudioControlChannelNameFrontRightCenter
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the FrontRightCenter channel.
- */
-#define kIOAudioControlChannelNameFrontRightCenter		"FrontRightCenter"
-
-/*!
- * @defined kIOAudioControlChannelNameRearCenter
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the RearCenter channel.
- */
-#define kIOAudioControlChannelNameRearCenter		"RearCenter"
-
-/*!
- * @defined kIOAudioControlChannelNameSurroundLeft
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the SurroundLeft channel.
- */
-#define kIOAudioControlChannelNameSurroundLeft		"SurroundLeft"
-
-/*!
- * @defined kIOAudioControlChannelNameSurroundRight
- * @abstract The value for the kIOAudioControlChannelNameKey in the IORegistry representing
- *  the channel name for the SurroundRight channel.
- */
-#define kIOAudioControlChannelNameSurroundRight		"SurroundRight"
-
-
-/*!
- * @defined kIOAudioControlValueKey
- * @abstract The key in the IORegistry for the IOAudioControl value attribute.
- * @discussion The value returned by this key is a 32-bit integer representing the current value of the IOAudioControl.
- */
-#define kIOAudioControlValueKey				"IOAudioControlValue"
-
-/*!
- * @defined kIOAudioControlValueIsReadOnlyKey
- * @abstract The key in the IORegistry for the IOAudioControl value-is-read-only attribute.
- * @discussion The value returned by this key is a 32-bit integer but the value doesn't have any direct meaning.
- *  Instead, the presence of this key indicates that the value for the control is read-only
- */
-#define kIOAudioControlValueIsReadOnlyKey	"IOAudioControlValueIsReadOnly"
-
-/*!
- * @defined kIOAudioLevelControlMinValueKey
- * @abstract The key in the IORegistry for the IOAudioControl minimum value attribute.
- * @discussion The value returned by this key is a 32-bit integer representing the minimum value for the IOAudioControl.
- *  This is currently only valid for Level controls or other driver-defined controls that have a minimum and maximum
- *  value.
- */
-#define kIOAudioLevelControlMinValueKey		"IOAudioLevelControlMinValue"
-
-/*!
- * @defined kIOAudioLevelControlMaxValueKey
- * @abstract The key in the IORegistry for the IOAudioControl maximum value attribute.
- * @discussion The value returned by this key is a 32-bit integer representing the maximum value for the IOAudioControl.
- *  This is currently only valid for Level controls or other driver-defined controls that have a minimum and maximum
- *  value.
- */
-#define kIOAudioLevelControlMaxValueKey		"IOAudioLevelControlMaxValue"
-
-/*!
- * @defined kIOAudioLevelControlMinDBKey
- * @abstract The key in the IORgistry for the IOAudioControl minimum db value attribute.
- * @discussion The value returned by this key is a fixed point value in 16.16 format represented as a 32-bit
- *  integer.  It represents the minimum value in db for the IOAudioControl.  This value matches the minimum
- *  value attribute.  This is currently valid for Level controls or other driver-defined controls that have a
- *  minimum and maximum db value.
- */
-#define kIOAudioLevelControlMinDBKey		"IOAudioLevelControlMinDB"
-
-/*!
- * @defined kIOAudioLevelControlMaxDBKey
- * @abstract The key in the IORgistry for the IOAudioControl maximum db value attribute.
- * @discussion The value returned by this key is a fixed point value in 16.16 format represented as a 32-bit
- *  integer.  It represents the maximum value in db for the IOAudioControl.  This value matches the maximum
- *  value attribute.  This is currently valid for Level controls or other driver-defined controls that have a
- *  minimum and maximum db value.
- */
-#define kIOAudioLevelControlMaxDBKey		"IOAudioLevelControlMaxDB"
-
-#define kIOAudioLevelControlRangesKey		"IOAudioLevelControlRanges"
-
-#define kIOAudioLevelControlUseLinearScale	"IOAudioLevelControlUseLinearScale"
-
-#define kIOAudioSelectorControlAvailableSelectionsKey	"IOAudioSelectorControlAvailableSelections"
-#define kIOAudioSelectorControlSelectionValueKey		"IOAudioSelectorControlSelectionValue"
-#define kIOAudioSelectorControlSelectionDescriptionKey	"IOAudioSelectorControlSelectionDescriptionKey"
-
-#define kIOAudioSelectorControlClockSourceKey				"IOAudioSelectorControlClockSourceKey"
-
-#endif /* _IOAUDIODEFINES_H */
diff --git a/i386/include/IOKit/audio/IOAudioDevice.h b/i386/include/IOKit/audio/IOAudioDevice.h
deleted file mode 100644
index 6d55147..0000000
--- a/i386/include/IOKit/audio/IOAudioDevice.h
+++ /dev/null
@@ -1,749 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOAudioDevice
- */
-
-#ifndef _IOKIT_IOAUDIODEVICE_H
-#define _IOKIT_IOAUDIODEVICE_H
-
-#include <IOKit/IOService.h>
-
-#ifndef IOAUDIOFAMILY_SELF_BUILD
-#include <IOKit/audio/IOAudioTypes.h>
-#include <IOKit/audio/IOAudioStream.h>
-#else
-#include "IOAudioTypes.h"
-#include "IOAudioStream.h"
-#endif
-
-class IOAudioEngine;
-class IOAudioStream;
-class IOAudioPort;
-class IOAudioControl;
-class OSDictionary;
-class OSSet;
-class OSArray;
-class IOTimerEventSource;
-class IOCommandGate;
-
-/*!
- * enum IOAudioDevicePowerState
- * @abstract Identifies the power state of the audio device
- * @discussion A newly created IOAudioDevices defaults to the idle state.
- * @constant kIOAudioDeviceSleep State set when the system is going to sleep
- * @constant kIOAudioDeviceIdle State when the system is awake but none of the IOAudioEngines are in use
- * @constant kIOAudioDeviceActive State when one ore more IOAudioEngines are in use.  This state transition must complete before the system will begin playing audio.
- */
-typedef enum _IOAudioDevicePowerState {
-    kIOAudioDeviceSleep 	= 0,	// When sleeping
-    kIOAudioDeviceIdle		= 1,	// When no audio engines running
-    kIOAudioDeviceActive 	= 2		// audio engines running
-} IOAudioDevicePowerState;
-
-/*!
- * @class IOAudioDevice
- * @abstract Abstract base class for a single piece of audio hardware.  The IOAudioDevice provides
- *  the central coordination point for an audio driver.
- * @discussion An audio driver is required to subclass IOAudioDevice in order to provide
- *  working audio to the system.  A single driver instance will contain a single instance of the 
- *  driver's IOAudioDevice subclass.  The subclass is responsible for mapping all hardware device
- *  resources from the service provider nub.  It must control access to the hardware so that the
- *  hardware doesn't get into an inconsistent state.  It is possible that different threads may make
- *  requests of the hardware at the same time.  The IOAudioDevice superclass provides an IOWorkLoop
- *  and IOCommandGate on the IOWorkLoop through which all hardware accesses may be synchronized.
- *  All entry points to all parts of the driver controlled by the IOAudioFamily will be synchronized
- *  through this one IOWorkLoop.
- *
- *  The IOAudioDevice subclass is responsible for creating the rest of the pieces of the driver.
- *  It must identify and create all IOAudioEngines that are not automatically created by the system
- *  (i.e. those that are not matched and instantiated by IOKit directly).
- *
- *  The IOAudioDevice subclass must enumerate and create all IOAudioControls to match
- *  the device capabilities.
- *
- *  It must also execute control value chages when requested by the system (i.e. volume adjustments).
- *
- *  In order to allow sleep and wake to work on the system, the IOAudioDevice subclass is responsible
- *  for performing the necessary actions to sleep and wake its hardware (and restore necessary state
- *  on wake).
- *
- *  The IOAudioDevice class provides timer services that allow different elements in the audio driver
- *  to receive timer notifications as needed.  These services were designed with the idea that most
- *  timed events in a typical audio driver need to be done at least as often as a certain interval.
- *  Further, it is designed with the idea that being called more often than the specified interval
- *  doesn't hurt anything - and in fact may help.  With this in mind, the timer services provided
- *  by the IOAudioDevice class allow different targets to register for timer callbacks at least as
- *  often as the specified interval.  The actual interval will be the smallest of the intervals of
- *  all of the callbacks.  This way, we avoid the overhead of having many timers in a single audio
- *  device.  As an example, each output IOAudioEngine has a timer to run the erase head.  It doesn't hurt
- *  to have the erase head run more often.  Also, a typical IOAudioDevice subclass may need to run a timer
- *  to check for device state changes (e.g. jack insertions).
- *
- *  There are a number of strings passed from the driver to the CoreAudio.framework and then into
- *  applications.  All of those strings should be localized by the driver.  In order to do that
- *  the kext bundle should have localized string files following the Mac OS X localization 
- *  instructions.  The IOAudioDevice should contain a property with the name of the bundle/kext
- *  that contains the localized string resources.  To do that, the driver's personality in 
- *  the bundle resources could have a property named 'IOAudioDeviceLocalizedBundle' with the path 
- *  of the bundle/kext relative to '/System/Library/Extensions'.  It could also be set by the 
- *  IOAudioDevice subclass in its initHardware() function.  To do so, call
- *  setProperty(kIOAudioDeviceLocalizedBundleKey, "Driver.kext").
- *
- *  In a typical driver, the IOAudioDevice subclass will implement initHardware() to perform the
- *  hardware initialization and driver construction.  Within that initialization it must create at 
- *  least one IOAudioEngine instance and activate it.  In order to activate a new IOAudioEngine
- *  activateAudioEngine() should be called for each one.  It must create the IOAudioControls 
- *  matching the hardware capabilities to allow the system to set volume, mute and input selection.  
- *  To add those controls to the driver, each control should be attached to the IOAudioEngine to
- *  which it applies by calling addDefaultAudioControl() on the IOAudioEngine.
- *  During initialization it should also call setDeviceName(), setDeviceShortName() and 
- *  setManufacturerName() with localized strings representing each of the attributes.
- *
- *  If the driver is to work properly after sleep/wake, it must implement performPowerStateChange()
- *  and deal with the sleep and wake transitions.  It may also deal with the idle state transitions
- *  to turn off device power when it isn't in use (especially useful for devices attached to a 
- *  portable running on battery power).
- */
-
-class IOAudioDevice : public IOService
-{
-    friend class IOAudioEngine;
-    
-    OSDeclareDefaultStructors(IOAudioDevice)
-
-protected:
-    /*! @var workLoop The IOWorkLoop for the driver - this is shared with the other objects in the driver */
-    IOWorkLoop				*workLoop;
-    /*! @var commandGate The IOCommandGate for this IOAudioDevice.  It is attached to workLoop */
-    IOCommandGate			*commandGate;
-    /*! @var timerEventSource An IOTimerEventSource attached to workLoop used for the timer services */
-    IOTimerEventSource		*timerEventSource;
-
-    /*! @var duringStartup State variable set to true while the driver is starting up and false all other times */
-    bool			duringStartup;
-    /*! @var familyManagePower Set to true if the family is supposed to manage power - this is the default state.  It can be changed early in the initialization process with a call to setFamilyManagePower(). */
-    bool			familyManagePower;
-    /*! @var asyncPowerStateChangeInProgress Set to true while an asynchronous power change is pending and false all other times. */
-    bool			asyncPowerStateChangeInProgress;
-    
-    /*! @var numRunningAudioEngines The number of running IOAudioEngines.  This is used to maintain idle vs active power state. */
-    UInt32			numRunningAudioEngines;
-    
-    /*! @var currentPowerState Used to track the existing power state - can be fetched by calling getPowerState() */
-    IOAudioDevicePowerState	currentPowerState;
-    /*! @var pendingPowerState If a power state change is in progress, this represents the pending power state.  All other times this is the same as the currentPowerState. */
-    IOAudioDevicePowerState	pendingPowerState;
-
-    /*! @var audioEngines The set of IOAudioEngine objects vended by the IOAudioDevice. */
-    OSArray *			audioEngines;
-    /*! @var timerEvents The set of timer events in use by the device.  
-     *  @discussion The key for the dictionary is the target of the event.  This means that a single target may
-     *   have only a single event associated with it.
-     */
-    OSDictionary *		timerEvents;
-    /*! @var audioPorts The set of IOAudioPort objects associated with the IOAudioDevice */
-    OSSet *			audioPorts;
-
-    /*! @var minimumInterval The smallest timer interval requested by all timer event targets. */
-    AbsoluteTime		minimumInterval;
-    /*! @var previousTimerFire The time of the last timer event.
-     *  @discussion This is used to schedule the next timer event.
-     */
-    AbsoluteTime		previousTimerFire;
-
-public:
-    /*! @var gIOAudioPlane A static IORegistryPlane representing the new IOAudioPlane that the IOAudioFamily uses
-     *   to represent the signal chain of the device.
-     */
-    static const IORegistryPlane *gIOAudioPlane;
-
-protected:
-    struct ExpansionData {
-		unsigned long long			idleSleepDelayTime;
-		IOTimerEventSource *		idleTimer;
-	};
-    
-    ExpansionData *reserved;
-    
-public:
-	static void idleAudioSleepHandlerTimer(OSObject *owner, IOTimerEventSource *sender);
-	virtual IOReturn setAggressiveness(unsigned long type, unsigned long newLevel);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 0);
-	virtual void setDeviceTransportType(const UInt32 transportType);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 1);
-    /*!
-	 * @function setIdleAudioSleepTime
-     * @abstract This function is to be called by a driver that doesn't want to be told about the audio
-	 * going idle immediately, but at some point in the future.
-	 * @discussion This is useful if the device will want to power down its hardware into an idle sleep
-	 * state, but doesn't want to do that unless audio hasn't been used for a while.  Calling this function
-	 * immediately changes the idle sleep timer and queues it up if the idle is different from the previous
-	 * idle time.  The idle time defaults to 0, which means be called immediately (backwards compatible with
-	 * previous versions of IOAudioFamily).  A value of 0xffffffffffffffffULL means don't ever tell the
-	 * driver about going idle.
-     * @param sleepDelay The amount of time, in nanoseconds, before the hardware should be told to go idle.
-     */
-	virtual void setIdleAudioSleepTime(unsigned long long sleepDelay);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 2);
-	virtual void scheduleIdleAudioSleep(void);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 3);
-    /*!
-	 * @function setConfigurationApplicationBundle
-     * @abstract This function is to be called if an external configuration application is available to set
-	 * which application to launch.
-	 * @discussion This is useful for device drivers that are too complex to be represented by the Sound Preferences
-	 * panel.  The bundle ID is a more flexible way of specifying where the application is than a hard coded path.
-     * @param bundleID The bundle ID of the application to be launched by the HAL for configuration of the device and its engine(s).
-     */
-	virtual void setConfigurationApplicationBundle(const char *bundleID);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 4);
-    /*!
-	 * @function setDeviceCanBeDefault
-     * @abstract This function is to be called to tell CoreAudio if this device shouldn't be a default device.
-	 * @discussion This is useful for device drivers that don't want to be a default device.  Can be called with
-	 * kIOAudioDeviceCanBeDefaultNothing to prevent CoreAudio from allowing this device to be any default device, or it
-	 * can be called with any combination of kIOAudioDeviceCanBeDefaultInput, kIOAudioDeviceCanBeDefaultOutput, or
-	 * kIOAudioDeviceCanBeSystemOutput.  The default is 
-	 * (kIOAudioDeviceCanBeDefaultInput | kIOAudioDeviceCanBeDefaultOutput | kIOAudioDeviceCanBeSystemOutput).
-     * @param defaultsFlags The flags to instruct CoreAudio to allow this device to be only the indicated default devices.
-     */
-	virtual void setDeviceCanBeDefault(UInt32 defaultsFlags);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioDevice, 5);
-	virtual void setDeviceModelName(const char * modelName);
-
-private:
-	OSMetaClassDeclareReservedUsed(IOAudioDevice, 0);
-	OSMetaClassDeclareReservedUsed(IOAudioDevice, 1);
-	OSMetaClassDeclareReservedUsed(IOAudioDevice, 2);
-	OSMetaClassDeclareReservedUsed(IOAudioDevice, 3);
-	OSMetaClassDeclareReservedUsed(IOAudioDevice, 4);
-	OSMetaClassDeclareReservedUsed(IOAudioDevice, 5);
-
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 6);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 7);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 8);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 9);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 10);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 11);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 12);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 13);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 14);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 15);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 16);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 17);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 18);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 19);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 20);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 21);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 22);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 23);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 24);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 25);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 26);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 27);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 28);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 29);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 30);
-	OSMetaClassDeclareReservedUnused(IOAudioDevice, 31);
-	
-
-public:
-    // Initialization
-    
-    /*!
-     * @function init
-     * @abstract Initialize a newly created instance of IOAudioDevice.
-     * @discussion This implementation initializes all of the data structures and variables used by the
-     *  IOAudioDevice.  The currentPowerState and pendingPowerState variables are set to kIOAudioDeviceIdle.
-     *  A subclass that overrides this method must call the superclass' implementation.
-     * @param properties An OSDictionary of the device properties that gets passed to super::init and set
-     *  in the IORegistry.
-     * @result true if initialization was successful
-     */
-    virtual bool init(OSDictionary *properties);
-
-    /*!
-     * @function free
-     * @abstract Frees resources used by the IOAudioDevice instance
-     * @discussion This method will deactivate all audio audio engines and release the audioEngines OSSet.
-     *  It will also deactivate all of the audio ports and release the audioPorts OSSet.  It will release
-     *  the timerEvents OSDictionary as well as cancel any outstanding timer callbacks.  It will clean up
-     *  all of the event sources and the workLoop.
-     *
-     *  Do not call this directly.  This is called automatically by the system when the instance's
-     *  refcount goes to 0.  To decrement the refcount, call release() on the object.
-     */
-     
-    virtual void free();
-
-    /*!
-     * @function start
-     * @abstract This function is called automatically by the system to tell the driver to start vending
-     *  services to the rest of the system.
-     * @discussion The start() implementation in IOAudioDevice starts by calling start() on its superclass.
-     *  It then calls initHardware() which the subclass should override to properly initialize itself and 
-     *  the hardware.  If that call succeeds, it sets up power management if the family is supposed to 
-     *  manage power (checking the familyManagePower variable).  Then finally it calls registerService() 
-     *  to make the IOAudioDevice visible in the IORegistry.
-     * @param provider This is the service provider nub that provides access to the hardware resources.
-     * @result Returns true on success
-     */
-    virtual bool start(IOService *provider);
-
-    /*!
-     * @function stop
-     * @abstract This is responsible for stopping the device after the system is done with it (or
-     *  if the device is removed from the system).
-     * @discussion The IOAudioDevice implentation of stop() disables the timer services, deactivates 
-     *  all of the audio audio engines and audio ports and stops power management of the device.
-     *  The audio engine and port deactivation causes all of the audio engines to get stopped and 
-     *  all of the audio engine and port resources and objects to be released.  A subclass' implementation 
-     *  may could shut down hardware here if necessary.  If this function is overridden by a subclass,
-     *  the superclass' implementation must be called.
-     * @param The service provider nub for the device.
-     */
-    virtual void stop(IOService *provider);
-    virtual bool willTerminate(IOService *provider, IOOptionBits options);
-
-    /*!
-     * @function initHardware
-     * @abstract This function is called by start() to provide a convenient place for the subclass to 
-     *  perform its initialization.
-     * @discussion In a typical implementation, a driver would implementation this function and perform
-     *  a number of tasks.  Those include mapping hardware resources, initializing the hardware to a known
-     *  state, creating the IOAudioEngines, IOAudioControls and IOAudioStreams.  Additionally it 
-     *  should also call setDeviceName(), setDeviceShortName(), setManufacturerName().  Upon return of
-     *  this function, the device should be ready to begin vending services to the system.
-     * @param provider The service provider nub for the device.
-     * @result This function should return true on a successful initialization.
-     */
-    virtual bool initHardware(IOService *provider);
-    
-    /*!
-     * @function setDeviceName
-     * @abstract Sets the name of the device
-     * @discussion This method should be called during initialization or startup.  It should
-     *  be set by the time initHardware() completes.  The device name is used by the 
-     *  CoreAudio.framework to identify the particular piece of hardware.  This string should
-     *  should be localized by the driver.
-     */
-    virtual void setDeviceName(const char *deviceName);
-    
-    /*!
-     * @function setDeviceShortName
-     * @abstract Sets the short name of the device
-     * @discussion The short name is a shorter representation of the device name.  It may be used
-     *  by applications when the device name is too long.  It should be set by the time initHardware()
-     *  completes.  The string should be localized by the driver.
-     */
-    virtual void setDeviceShortName(const char *shortName);
-
-    /*!
-     * @function setManufacturerName
-     * @abstract Sets the manufacturer name of the device
-     * @discussion This method should be called during initialization or startup.  This should be 
-     *  called by the time initHardware() completes.  The string should be localized by the driver.
-     */
-    virtual void setManufacturerName(const char *manufacturerName);
-
-    
-    // IOWorkLoop, IOCommandGate management
-    
-    /*!
-     * @function getWorkLoop
-     * @abstract Returns the IOWorkLoop for the driver
-     * @discussion The IOWorkLoop is used to synchronized all critical aspects of the driver.  This
-     *  includes all entry points to the driver as well as power management.
-     */
-    virtual IOWorkLoop *getWorkLoop() const;
-    
-    /*!
-     * @function getCommandGate
-     * @abstract Returns the IOCommandGate for this IOAudioDevice
-     * @discussion This IOCommandGate allows calls into this IOAudioDevice to be synchronized on 
-     *  the IOWorkLoop.
-     */
-    virtual IOCommandGate *getCommandGate() const;
-
-    
-    // IOAudioEngine management
-    
-    /*!
-     * @function activateAudioEngine
-     * @abstract This simply calls activateAudioEngine(IOAudioEngine *audioEngine, 
-     *  bool shouldStartAudioEngine) with a value of true for shouldStartAudioEngine.
-     * @param audioEngine The IOAudioEngine instance to be activated.  It is treated as a newly 
-     *  allocated instance.
-     * @result Returns true if the audio engine was successfully activated.
-     */
-    virtual IOReturn activateAudioEngine(IOAudioEngine *audioEngine);
-
-    /*!
-     * @function activateAudioEngine
-     * @abstract This is called to add a new IOAudioEngine object to the IOAudioDevice.
-     * @discussion Once the IOAudioEngine has been activated by this function, it is ready
-     *  to begin moving audio data.  This should be called either during the subclass' initHardware()
-     *  implementation for each IOAudioEngine the device creates.  Or it should be called by
-     *  the IOAudioEngine itself if the audio engine was automatically created by IOKit's matching
-     *  process.  The system won't be able to properly track and control IOAudioEngines if
-     *  they are not activated though this function.
-     *  This implementation will retain the IOAudioEngine while it maintains control of it.  
-     *  When the audio engine is deactivated, the IOAudioEngine will be released.  If the 
-     *  IOAudioDevice subclass is passing a newly instantiated IOAudioEngine, it will need to release 
-     *  the audio engine after it has been activated.  This will insure that the refCount on the audio engine 
-     *  is correct when it gets deactivated when the driver is stopped.  That allows the audio engine to be
-     *  freed when it is no longer needed.
-     * @param audioEngine The IOAudioEngine instance to be activated.
-     * @param shouldStartAudioEngine If true, the audio engine is treated as a newly allocated IOAudioEngine
-     *  instance and is appropriately attached and started according to IOKit convention.  If it is false
-     *  it is assumed that some other process (possibly the IOKit matching process) has started the
-     *  IOAudioEngine and will skip that step.
-     * @result Returns true if the audio engine was successfully activated.
-     */
-    virtual IOReturn activateAudioEngine(IOAudioEngine *audioEngine, bool shouldStartAudioEngine);
-
-    /*!
-     * @function deactivateAllAudioEngines
-     * @abstract Deactivates all of the audio engines in the device.
-     * @discussion This is called by the stop() and free() methods in IOAudioDevice to completely
-     *  shut down all audio engines as the driver is being shut down.
-     */
-    virtual void deactivateAllAudioEngines();
-
-    
-    // Power management
-    
-    /*!
-     * @function setFamilyManagePower
-     * @abstract Called set whether or not the family should manage the device power throught the
-     *  IOService power management APIs.
-     * @discussion The default behavior is for the family to manage power.  It is only necessary to 
-     *  call this function if the driver does not want the family to manage power.  It is not
-     *  recommended that this function be called because it makes power management much more
-     *  difficult for the driver.  If this function is to be called, it must be called before
-     *  initHardware() completes.  Immediately after initHardware() is called by start(), 
-     *  the power management system is initialized if the family is to manage power.
-     * @param manage Set to false if it is not desired that the family does the power management
-     */
-    virtual void setFamilyManagePower(bool manage);
-    
-    /*!
-     * @function setPowerState
-     * @abstract Called by the power management system in IOService when the power state of this 
-     *  service needs to change.
-     * @discussion The default implementation of IOAudioDevice sets up two power states for IOService
-     *  to use.  State 0 is sleep and state 1 is wake.  This function should not be called directly.
-     *  It is only supposed to be used by the IOService power management services.
-     * @param powerStateOrdinal The number of the power state as defined by the IOAudioDevice - 
-     *  0 for sleep, 1 for wake.
-     * @param device The power management policy maker.
-     * @result Returns kIOPMAckImplied (0) when the power state change is complete.  Otherwise the an
-     *  upper bound on the number of microseconds until the state change is complete is returned.
-     */
-    virtual IOReturn setPowerState(unsigned long powerStateOrdinal, IOService *device);
-    
-    /*!
-     * @function setPowerStateAction
-     * @abstract IOCommandGate Action which calls protectedSetPowerState() while holding the IOCommandGate
-     * @discussion This is needed to allow protectedSetPowerState() to be called on the IOWorkLoop
-     * @param owner The owner of the IOCommandGate (the IOAudioDevice in this case)
-     * @param arg1 The powerStateOrdinal to be passed to protectedSetPowerState()
-     * @param arg2 The device to be passed to protectedSetPowerState()
-     * @result Returns the result of protectedSetPowerState()
-     */
-    static IOReturn setPowerStateAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-    
-    /*!
-     * @function protectedSetPowerState
-     * @abstract Called by setPowerStateAction() to deal with a power state change from the IOService
-     *  power management facility.
-     * @discussion This function is responsible for performing the necessary sleep and wake tasks
-     *  when the system is sleeping or waking.  If an outstanding power state change is in progress,
-     *  it will wait until the state changes has completed.  While sleeping, all audio engines are
-     *  stopped before calling initiatePowerStateChange() to call performPowerStateChange() to let
-     *  the driver deal with the sleep request.  When waking, it determines if the device should be
-     *  idle or active and continues to call initiatePowerStateChange().  If initiatePowerStateChange()
-     *  indicates that the power state change is occuring asynchronously, it returns the number of
-     *  microseconds.  This function must be called on the IOWorkLoop, but should not be called
-     *  directly.
-     * @param powerStateOrdinal Param passed to setPowerState() - 0 for sleep, 1 for wake
-     * @param device Param passed to setPowerState - the device initiating the power state change
-     * @result Returns 0 if the power state change is complete - the number of microseconds until 
-     *  complete if its asynchronous.
-     */
-    virtual IOReturn protectedSetPowerState(unsigned long powerStateOrdinal, IOService *device);
-    
-    /*!
-     * @function performPowerStateChange
-     * @abstract This function is called by the IOAudioDevice when a power state change is needed.
-     * @discussion In order to deal with power state changes, a subclass must override this function.
-     *  Any combination of old and new power states may be passed to this function.  If work is to
-     *  be performed while transitioning to sleep, check for a newPowerState of kIOAudioDeviceSleep.
-     *  If work is to be performed while transitioning from sleep, check for an oldPowerState of
-     *  kIOAudioDeviceSleep.  A power state of kIOAudioDeviceIdle means the system is awake, but
-     *  no clients are currently playing or recording audio (i.e. no IOAudioEngines are active).
-     *  A power state of kIOAudioDeviceActive means that at least one IOAudioEngine is active.
-     *  It is possible for a power state change to be performed synchronously or asynchronously.
-     *  In the case of a synchronous power state change, simple leave microsecondsUntilComplete
-     *  alone and return kIOReturnSuccess.  If an asynchronous power state change is needed the 
-     *  driver should do whatever needed to schedule another thread to finish the state change
-     *  and set the microsecondsUntilComplete to an upper bound on the amount of time it will
-     *  take to complete the power state change.  Then when the power state change is complete,
-     *  a call must be made to completePowerStateChange().  During an asynchronous power state
-     *  change, the current power state will remain the same as before the transition began, 
-     *  and the pendingPowerState is set to the new power state that will be set when the 
-     *  change is complete.
-     * @param oldPowerState The power state before the power state change
-     * @param newPowerState The power state being transitioned to
-     * @param microsecondsUntilComplete A pointer to a value representing an upper bound on
-     *  the number of microseconds to complete an asynchronous power state change.  It points
-     *  to a value of zero at the start and if it remains zero, the state change is complete
-     *  upon a successful return from the function.
-     * @result Returns kIOReturnSuccess on a successful completion
-     */
-    virtual IOReturn performPowerStateChange(IOAudioDevicePowerState oldPowerState,
-                                                IOAudioDevicePowerState newPowerState,
-                                                UInt32 *microsecondsUntilComplete);
-                                                    
-    /*!
-     * @function completePowerStateChange
-     * @abstract Called when a power state change is complete
-     * @discussion In the case of an asynchronous power state change, a subclass is responsible
-     *  for calling this function.  It is safe to call this function if not on the IOWorkLoop.
-     *  This function calls protectedCompletePowerStateChange() through the IOCommandGate and
-     *  completePowerStateChangeAction().  If the call is already on the IOWorkLoop, it is safe
-     *  to call protectedCompletePowerStateChange() directly.
-     * @result Returns kIOReturnSuccess on a successful completion
-     */
-    virtual IOReturn completePowerStateChange();
-    
-    /*!
-     * @function completePowerStateChangeAction
-     * @abstract IOCommandGate Action which calls protectedCompletePowerStateChange() while holding the
-     *  IOCommandGate.
-     * @discussion This is needed to allow protectedCompletePowerStateChange() to be called on the IOWorkLoop.
-     * @param owner The owner of the IOCommandGate (the IOAudioDevice in this case)
-     * @result Returns the result of protectedCompletePowerStateChange()
-     */
-    static IOReturn completePowerStateChangeAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-    
-    /*!
-     * @function protectedCompletePowerStateChange()
-     * @abstract Called on the IOWorkLoop when a power state change is complete.
-     * @discussion This function does the work to complete a power state change (both synchronous and
-     *  asynchronous).  If the system is waking from sleep, the timer system is restarted and the 
-     *  audio engines are resumed.  If this was called as a result of an asynchronous power state changed
-     *  it makes the IOService power management call acknowledgePowerChange() and resets the
-     *  asyncPowerStateChangeInProgress variable.  Finally it sets the currentPowerState to the
-     *  pendingPowerState.  This function must be called on the IOWorkLoop.  If a subclass is not
-     *  on the IOWorkLoop (e.g. holding the IOCommandGate), call completePowerStateChange() instead.
-     * @result Returns kIOReturnSuccess on success
-     */
-    virtual IOReturn protectedCompletePowerStateChange();
-
-    /*!
-     * @function getPowerState
-     * @abstract Returns the current power state (the old power state if a change is in progress).
-     * @result The current power state
-     */
-    virtual IOAudioDevicePowerState getPowerState();
-    
-    /*!
-     * @function getPendingPowerState
-     * @abstract Returns the pending power state if a state change is in progress.  Otherwise it 
-     *  returns the current power state change.
-     * @result The pending power state
-     */
-    virtual IOAudioDevicePowerState getPendingPowerState();
-    
-    /*!
-     * @function waitForPendingPowerStateChange
-     * @abstract Called internally to wait until a pending power state change is complete.
-     * @discussion This is only used by internal functions to wait during pending power
-     *  state changes.  It is used to prevent multiple power state changes at the same time.
-     *  This function must be called while holding the IOCommandGate.  If an asynchronous 
-     *  power state change is in progress this function will block until the state change
-     *  if complete.  Once complete, it will return while still holding the IOCommandGate.
-     */
-    virtual void waitForPendingPowerStateChange();
-    
-    /*!
-     * @function initiatePowerStateChange
-     * @abstract Called internally to execute a power state change
-     * @discussion This function must be called on the IOWorkLoop.  It calls performPowerStateChange()
-     *  to let the driver process the state change.  If the state change is completed synchronously
-     *  by the driver (subclass) it calls protectedCompletePowerStateChange().  If done asynchronously
-     *  it returns the microsecondsUntilComplete that was set by performPowerStateChange().  This
-     *  function should not be called directly.
-     * @param microsecondsUntilComplete Pointer to the microsecondsUntilComplete that should be set
-     *  by performPowerStateChange if an asynchronous power state change was started.
-     * @result Returns kIOReturnSuccess on success
-     */
-    virtual IOReturn initiatePowerStateChange(UInt32 *microsecondsUntilComplete = NULL);
-    
-
-    // IOAudioControl management
-    
-    /*!
-     * @function flushAudioControls
-     * @abstract Forces each IOAudioControl in the driver to have its value flushed out to the hardware.
-     *  That will cause either the IOAudioControl's ValueChangeHandler to be called.
-     * @discussion This can be used to force the hardware to get updated with the current value 
-     *  of each control.  It may be useful during wake for example.
-     */
-    virtual void flushAudioControls();
-
-
-    // Timer services
-    
-    /*!
-     * @typedef TimerEvent
-     * @abstract Generic timer event callback for IOAudioDevice timer targets
-     * @discussion TimerEvent callback function takes two arguments; the target of
-     *  the timer event and the IOAudioDevice sending the event.
-     * @param target The target of the timer event - passed in when the timer event was registered
-     * @param audioDevice The IOAudioDevice sending the event
-     */
-    typedef void (*TimerEvent)(OSObject *target, IOAudioDevice *audioDevice);
-
-    /*!
-     * @function addTimerEvent
-     * @abstract Adds a TimerEvent callback for the given target called at least as often
-     *  as specified in interval.
-     * @discussion The frequency of the timer event callbacks will be the smallest interval
-     *  specified by all targets.  Only one interval and callback may be specified per target.
-     *  If a addTimerEvent is called twice with the same target, the second one overrides the
-     *  first.  There is currently a bug triggered if the first call had the smallest interval.
-     *  In that case, that smallest interval would still be used.
-     * @param target This parameter is the target object of the TimerEvent.
-     * @param event The callback function called each time the timer fires.
-     * @param interval The callback will be called at least this often.
-     * @result Returns kIOReturnSuccess if the timer event was successfully added.
-     */
-    virtual IOReturn addTimerEvent(OSObject *target, TimerEvent event, AbsoluteTime interval);
-
-    /*!
-     * @function removeTimerEvent
-     * @abstract Removes the timer event for the given target.
-     * @discussion If the interval for the target to be removed is the smallest interval,
-     *  the timer interval is recalculated based on the remaining targets.  The next fire
-     *  time is readjusted based on the new interval compared to the last fire time.
-     * @param target The target whose timer event will be removed.
-     */
-    virtual void removeTimerEvent(OSObject *target);
-    
-    /*!
-     * @function removeAllTimerEvents
-     * @abstract Removes all timer events and stops the timer
-     * @discussion Called during teardown of the driver
-     */    
-    virtual void removeAllTimerEvents();
-
-    
-    // IOAudioPort management
-
-    /*!
-     * @function attachAudioPort
-     * @abstract Adds the port to the IOAudioDevice's list of ports and attaches the port to its parent
-     *  and attaches the child to the port.
-     * @discussion This function provides the functionality to represent the device's signal chain in the
-     *  IOAudioPlane in the IORegistry.  An IOAudioPort's parent(s) are before it in the signal chain
-     *  and its children are after it.  This method may be called multiple times for a single IOAudioPort.
-     *  This is necessary when there are many children or parents.  Once a relationship is made, it is not
-     *  necessary to make the reverse relationship.  A NULL value may be passed in for either the parent
-     *  or child or both.
-     *  The IOAudioPort passed in should be a newly allocated IOAudioPort instance.  This function will
-     *  appropriately attach and start the port object.  NOTE: It is not necessary to use IOAudioPorts
-     *  in a fully functional audio driver.
-     * @param port The newly created IOAudioPort instance to be activated.
-     * @param parent A parent IOAudioPort or IOAudioEngine of the given port.
-     * @param child A child IOAudioPort or IOAudioEngine of the given port.
-     * @result Returns true when the port has been successfully added and attached.
-     */
-    virtual IOReturn attachAudioPort(IOAudioPort *port, IORegistryEntry *parent, IORegistryEntry *child);
-
-    /*!
-     * @function detachAllAudioPorts
-     * @abstract Deactivates all of the ports in the device.
-     * @discussion This is called by the stop() and free() methods in IOAudioDevice to completely
-     *  shut down all ports as the driver is being shut down.
-     */
-    virtual void detachAllAudioPorts();
-
-protected:
-    /*!
-     * @function timerFired
-     * @abstract Internal static function called when the timer fires.
-     * @discussion This function simply calls dispatchTimerEvents() on the IOAudioDevice to do just that.
-     * @param target The IOAudioDevice instance that initiated the timer callback.
-     * @param sender The IOTimerEventSources calling this callback
-     */
-    static void timerFired(OSObject *target, IOTimerEventSource *sender);
-
-    /*!
-     * @function dispatchTimerEvents
-     * @abstract Called by timerFired() to cause the timer event callbacks to be called.
-     * @discussion This method iterates through all of the timer event targets and calls
-     *  the callback on each.  Unless the force flag is set to true, the timer events will
-     *  only be dispatched if the power state is not kIOAudioDeviceSleep.  This prevents
-     *  unexpected timer firings while making wake->sleep->wake transitions.  This function must
-     *  be called on the IOWorkLoop.
-     * @function force A bool param to allow the timer events to be dispatched even if the 
-     *  device is in the kIOAudioDeviceSleep power state.
-     */
-    virtual void dispatchTimerEvents(bool force);
-
-    /*!
-     * @function audioEngineStarting
-     * @abstract Called by IOAudioEngine when it is starting up
-     * @discussion This should only be called while on the IOWorkLoop.  It is not intended to be called
-     *  directly.  It is called when an IOAudioEngine is starting up to allow the IOAudioDevice
-     *  to keep track of running audio engines and change the power state from kIOAudioDeviceIdle to
-     *  kIOAudioDeviceActive when the first audio engine starts up.  If the state change is done
-     *  asynchronously, it waits for the state change to complete.  This is to ensure that the
-     *  system doesn't start playing audio until the IOAudioDevice has completed its transition
-     *  to kIOAudioDeviceActive.
-     */
-    virtual void audioEngineStarting();
-    
-    /*!
-     * @function audioEngineStopped
-     * @abstract Called by IOAudioEngine when it has stopped
-     * @discussion This should only be called while on the IOWorkLoop.  It is not intended to be called
-     *  directly.  It is called when an IOAudioEngine has stopped to allow the IOAudioDevice
-     *  to keep track of running audio engines and change the power state from kIOAudioDeviceActive
-     *  to kIOAudioDeviceIdle when the last audio engine stops.  If the state change is done 
-     *  asynchronously, it waits for the state change to complete.
-     */
-    virtual void audioEngineStopped();
-    
-};
-
-#endif /* _IOKIT_IOAUDIODEVICE_H */
diff --git a/i386/include/IOKit/audio/IOAudioEngine.h b/i386/include/IOKit/audio/IOAudioEngine.h
deleted file mode 100644
index 19477b5..0000000
--- a/i386/include/IOKit/audio/IOAudioEngine.h
+++ /dev/null
@@ -1,865 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOAudioEngine
- */
-
-#ifndef _IOKIT_IOAUDIOENGINE_H
-#define _IOKIT_IOAUDIOENGINE_H
-
-#include <IOKit/IOService.h>
-
-#ifndef IOAUDIOFAMILY_SELF_BUILD
-#include <IOKit/audio/IOAudioTypes.h>
-#else
-#include "IOAudioTypes.h"
-#endif
-#include <IOKit/IOBufferMemoryDescriptor.h>
-
-class OSDictionary;
-class OSCollection;
-class OSOrderedSet;
-class IOAudioEngineUserClient;
-class IOAudioDevice;
-class IOAudioStream;
-class IOAudioControl;
-class IOCommandGate;
-
-#define IOAUDIOENGINE_DEFAULT_NUM_ERASES_PER_BUFFER	4
-
-/*!
- * @typedef IOAudioEnginePosition
- * @abstract Represents a position in an audio audio engine.
- * @discussion This position is based on the sample frame within a 
- *  loop around the sample buffer, and the loop count which starts at 0 when the audio engine
- *  begins playback.
- * @field fSampleFrame The sample frame within the buffer - starts at 0.
- * @field fLoopCount The number of times the ring buffer has looped.
- */
-typedef struct {
-    UInt32	fSampleFrame;
-    UInt32	fLoopCount;
-} IOAudioEnginePosition;
-
-#define CMP_IOAUDIOENGINEPOSITION(p1, p2) \
-    (((p1)->fLoopCount > (p2)->fLoopCount) ? 1 :	\
-        ((p1)->fLoopCount == (p2)->fLoopCount) && ((p1)->fSampleFrame > (p2)->fSampleFrame) ? 1 :	\
-            ((p1)->fLoopCount == (p2)->fLoopCount) && ((p1)->fSampleFrame == (p2)->fSampleFrame) ? 0 : -1)
-            
-#define IOAUDIOENGINEPOSITION_IS_ZERO(p1) (((p1)->fLoopCount == 0) && ((p1)->fSampleFrame == 0))
-
-/*!
- * @class IOAudioEngine
- * @abstract Abstract base class for a single audio audio / I/O engine.
- * @discussion An IOAudioEngine is defined by a single I/O engine to transfer data to
- *  or from one or more sample buffers.  Each sample buffer is represented by a single IOAudioStream
- *  instance.  A single IOAudioEngine must contain at least one IOAudioStream, but has no upper
- *  limit on the number of IOAudioStreams it may contain.  An IOAudioEngine instance may contain
- *  both input and output IOAudioStreams.
- *
- *  An audio driver must subclass IOAudioEngine in order to provide certain services.  An 
- *  IOAudioEngine subclass must start and stop the I/O engine when requested.  The I/O
- *  engine should be continuously running and loop around from end to beginning.  While the audio
- *  engine is running, it must take a timestamp as the sample buffer(s) wrap around and start at
- *  the beginning.  The CoreAudio.framework uses the timestamp to calculate the exact position of
- *  the audio engine.  An IOAudioEngine subclass must implement getCurrentSampleFrame() to provide
- *  a sample position on demand.  Finally, an IOAudioEngine subclass must provide clipping and
- *  format conversion routines to go to/from the CoreAudio.framework's native float format.
- *
- *  If multiple stream formats or sample rates are allowed, the IOAudioEngine
- *  subclass must provide support for changing the hardware when a format or sample rate is
- *  changed.
- *
- *  There are several attributes associated with a single IOAudioEngine: 
- *
- *  The IOAudioEngine superclass provides a shared status buffer that contains all of the dynamic pieces
- *  of information about the audio engine (type IOAudioEngineStatus).  It runs an erase process on
- *  all of the output streams.  The erase head is used to zero out the mix and sample buffers after
- *  the samples have been played.  Additionally, the IOAudioEngine superclass handles the 
- *  communication with the CoreAudio.framework and makes the decision to start and stop the
- *  audio engine when it detects it is in use.
- *
- *  In order for an audio device to play back or record sound, an IOAudioEngine subclass must be created.
- *  The subclass must initialize all of the necessary hardware resources to prepare for starting the
- *  audio I/O engine.  It typically will perform these tasks in the initHardware() method.  A subclass 
- *  may also implement a stop() method which is called as the driver is being torn down.  This is 
- *  typically called in preparation of removing the device from the system for removable devices.
- *
- *  In addition to initializing the necessary hardware, there are a number of other tasks an 
- *  IOAudioEngine must do during initHardware().  It must create the necessary IOAudioStream objects
- *  to match the device capabilities.  Each IOAudioStream must be added using addAudioStream().  It
- *  also should create the IOAudioControls needed to control the various attributes of the audio engine:
- *  output volume, mute, input gain, input selection, analog passthru.  To do that, addDefaultAudioControl()
- *  should be called with each IOAudioControl to be attached to the IOAudioEngine.  In order to provide
- *  for proper synchronization, the latency of the audio engine should be specified with setSampleLatency().
- *  This value represents the latency between the timestamp taken at the beginning of the buffer and 
- *  when the audio is actually played (or recorded) by the device.  If a device is block based or if
- *  there is a need to keep the CoreAudio.framework a certain number of samples ahead of (or behind for
- *  input) the I/O head, that value should be specified using setSampleOffset().  If this is not specified
- *  the CoreAudio.framework may attempt to get as close to the I/O head as possible.
- *
- *  The following fields in the shared IOAudioEngineStatus struct must be maintained by the subclass
- *  implementation:
- *  <pre>
- *  <t>  fCurrentLoopCount - the number of times the sample buffer has wrapped around to the beginning
- *  <t>  fLastLoopTime - timestamp of the most recent time that the I/O engine looped back to the 
- *  beginning of the sample buffer
- *  </pre>
- *  It is critically important that the fLastLoopTime field be as accurate as possible.  It is 
- *  the basis for the entire timer and synchronization mechanism used by the audio system.
- *
- *  At init time, the IOAudioEngine subclass must call setNumSampleFramesPerBuffer() to indicate how large
- *  each of the sample buffers are (measured in sample frames).  Within a single IOAudioEngine, all sample
- *  buffers must be the same size and be running at the same sample rate.  If different buffers/streams can
- *  be run at different rates, separate IOAudioEngines should be used.  The IOAudioEngine subclass must
- *  also call setSampleRate() at init time to indicate the starting sample rate of the device.
- *
- */
-
-class IOAudioEngine : public IOService
-{
-    OSDeclareAbstractStructors(IOAudioEngine)
-    
-    friend class IOAudioEngineUserClient;
-    friend class IOAudioDevice;
-    friend class IOAudioStream;
-    
-public:
-    /*! @var gSampleRateWholeNumberKey */
-    static const OSSymbol	*gSampleRateWholeNumberKey;
-    /*! @var gSampleRateFractionKey */
-    static const OSSymbol	*gSampleRateFractionKey;
-    
-    /*! @var numSampleFramesPerBuffer */
-    UInt32			numSampleFramesPerBuffer;
-    
-    /*! @var sampleRate 
-     *  The current sample rate of the audio engine in samples per second. */
-    IOAudioSampleRate			sampleRate;
-
-    /*! @var numErasesPerBuffer 
-     *  The number of times the erase head get scheduled to run for each 
-     *   cycle of the audio engine. */
-    UInt32			numErasesPerBuffer;
-    /*! @var runEraseHead 
-     *  Set to true if the erase head is to run when the audio engine is running.  This is the case if there are any output streams. */
-    bool			runEraseHead;
-    
-    /*! @var audioEngineStopPosition 
-     *  When all clients have disconnected, this is set to one buffer length past the
-    *    current audio engine position at the time.  Then when the stop position is reached, the audio engine
-    *    is stopped */
-    IOAudioEnginePosition	audioEngineStopPosition;
-
-    /*! @var isRegistered 
-     *  Internal state variable to keep track or whether registerService() has been called. */
-    bool			isRegistered;
-    /*! @var configurationChangeInProgress 
-     *  Set to true after beginConfigurationChange() and false upon a 
-    *    subsequent call to completeConfigurationChange() or cancelConfigurationChange(). */
-    bool			configurationChangeInProgress;
-    
-    /*! @var state 
-     *  The current state of the IOAudioEngine - running, stopped, paused. */
-    IOAudioEngineState		state;
-
-    /*! @var status 
-     *  Status struct shared with the CoreAudio.framework. */
-    IOAudioEngineStatus *	status;
-
-    /*! @var audioDevice 
-     *  The IOAudioDevice instance to which the IOAudioEngine belongs. */
-    IOAudioDevice *		audioDevice;
-    
-    /*! @var workLoop 
-     *  The IOWorkLoop for the audio driver - shared with the IOAudioDevice. */
-    IOWorkLoop 			*workLoop;
-    /*! @var commandGate 
-     *  The IOCommandGate for this audio engine - attached to the driver's IOWorkLoop. */
-    IOCommandGate		*commandGate;
-
-    /*! @var inputStreams 
-     *  An OSSet of all of the input IOAudioStreams attached to this IOAudioEngine. */
-    OSOrderedSet 	*inputStreams;
-    UInt32			maxNumInputChannels;
-    /*! @var outputStreams 
-     *  An OSSet of all of the output IOAudioStreams attached to this IOAudioEngine. */
-    OSOrderedSet	*outputStreams;
-    UInt32			maxNumOutputChannels;
-    /*! @var userClients 
-     *  An OSSet of all of the currently connected user clients. */
-    OSSet			*userClients;
-    /*! @var defaultAudioControls 
-     *  All of the IOAudioControls that affect this audio engine. */
-    OSSet			*defaultAudioControls;
-    
-    /*! @var numActiveUserClients 
-     *  A total of the active user clients - those that are currently playing or 
-     *    recording audio. */
-    UInt32			numActiveUserClients;
-    UInt32			sampleOffset;				// used for input and output if inputSampleOffset is not set, if inputSampleOffset is set used as output only 
-		      
-    UInt32			index;
-    bool			duringStartup;
-
-protected:
-
-    /*!
-     * @var deviceStartedAudioEngine 
-     *  Used by the IOAudioDevice to determine responsibility for shutting
-     *  the audio engine down when it is no longer needed.
-     */
-    bool			deviceStartedAudioEngine;
-    
-protected:
-    struct ExpansionData {
-		UInt32								pauseCount;
-		IOBufferMemoryDescriptor			*statusDescriptor;
-		IOBufferMemoryDescriptor			*bytesInInputBufferArrayDescriptor;
-		IOBufferMemoryDescriptor			*bytesInOutputBufferArrayDescriptor;
-		UInt32								mixClipOverhead;
-		OSArray								*streams;
-	    UInt32								inputSampleOffset;
-	};
-    
-    ExpansionData   *reserved;
-
-//	static UInt32	sInstanceCount;	
-
-public:
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 0);
-    virtual IOReturn performFormatChange(IOAudioStream *audioStream, const IOAudioStreamFormat *newFormat, const IOAudioStreamFormatExtension *formatExtension, const IOAudioSampleRate *newSampleRate);
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 1);
-	virtual IOBufferMemoryDescriptor * getStatusDescriptor();
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 2);
-	virtual IOReturn getNearestStartTime(IOAudioStream *audioStream, IOAudioTimeStamp *ioTimeStamp, bool isInput);
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 3);
-	virtual IOBufferMemoryDescriptor * getBytesInInputBufferArrayDescriptor();
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 4);
-	virtual IOBufferMemoryDescriptor * getBytesInOutputBufferArrayDescriptor();
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 5);
-    /*!
-	 * @function eraseOutputSamples
-     * @abstract This function allows for the actual erasing of the mix and sample buffer to be overridden by
-	 * a child class.
-	 * @param mixBuf Pointer to the IOAudioFamily allocated mix buffer.
-	 * @param sampleBuf Pointer to the child class' sample buffer.
-	 * @param firstSampleFrame Index to the first sample frame to erase.
-	 * @param numSampleFrames Number of sample frames to erase.
-	 * @param streamFormat Format of the data to be erased.
-	 * @param audioStream Pointer to stream object that corresponds to the sample buffer being erased.
-	 * @result Must return kIOReturnSuccess if the samples have been erased.
-     */
-	virtual IOReturn eraseOutputSamples(const void *mixBuf, void *sampleBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 6);
-    /*!
-	 * @function setClockIsStable
-     * @abstract This function sets a flag that CoreAudio uses to select its sample rate tracking algorithm.  Set
-	 * this to TRUE unless that results in dropped audio.  If the driver is experiencing unexplained dropouts
-	 * setting this FALSE might help.
-	 * @param clockIsStable TRUE tells CoreAudio to use an agressive PLL to quickly lock to the engine's sample rate
-	 * while FALSE tells CoreAudio to adjust more slowly to perceived sample rate changes that might just be the
-	 * result of an unstable clock.
-     */
-	virtual void setClockIsStable(bool clockIsStable);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 7);
-	/*!
-     * @function setMixClipOverhead
-     * @abstract Used to tell IOAudioFamily when the watchdog timer must fire by.
-     * @discussion setMixClipOverhead allows an audio engine to tell IOAudioFamily how much time
-	 * an engine will take to mix and clip its samples, in percent.
-	 * The default value is 10, meaning 10%.  This will cause IOAudioFamily to make
-	 * the watchdog timer fire when there is just over 10% of the time to complete
-	 * a buffer set left (e.g. 51 samples when the HAL is using a buffer size of 512
-	 * samples).
-     * @param newMixClipOverhead How much time per buffer should be made available for the
-	 * mix and clip routines to run.  Valid values are 1 through 99, inclusive.
-     * @result return no error
-	*/
-	virtual void setMixClipOverhead(UInt32 newMixClipOverhead);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 8);
-    /*!
-	 * @function setClockDomain
-     * @abstract Sets a property that CoreAudio uses to determine how devices are synchronized.  If an audio device can tell that it is
-	 * synchronized to another engine, it should set this value to that engine's clock domain.  If an audio device can be a clock master, it may publish
-	 * its own clock domain for other devices to use.
-	 * @param clockDomain is the unique ID of another engine that this engine realizes it is synchronized to, use the default value kIOAudioNewClockDomain 
-	 * to have IOAudioEngine create a unique clock domain.
-     */
-	virtual void setClockDomain(UInt32 clockDomain = kIOAudioNewClockDomain);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 9);
-    /*!
-	 * @function convertInputSamplesVBR
-     * @abstract Override this method if you want to return a different number of sample frames than was requested.  
-     */
-	virtual IOReturn convertInputSamplesVBR(const void *sampleBuf, void *destBuf, UInt32 firstSampleFrame, UInt32 &numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 10);
-    /*!
-	 * @function setInputSampleOffset
-     * @abstract set the offset CoreAudio will read from off the current read pointer
-	 * @param numSamples size of offset in sample
-	 */
-    virtual void setInputSampleOffset(UInt32 numSamples);
-
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 11);
-    /*!
-	 * @function setOutputSampleOffset
-     * @abstract set the offset CoreAudio will write at off the current write pointer
-	 * @param numSamples size of offset in sample
-	 */
-    virtual void setOutputSampleOffset(UInt32 numSamples);
-
-protected:
-	
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 12);
-    virtual IOReturn createUserClient(task_t task, void *securityID, UInt32 type, IOAudioEngineUserClient **newUserClient, OSDictionary *properties);
-
-public:
-	
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 13);
-	/*! 
-	 * @function setAttributeForConnection
-	 * @abstract Generic method to set some attribute of the audio engine, specific to one connection.
-	 * @discussion IOAudioEngine subclasses may implement this method to allow arbitrary attribute/value pairs to be set, specific to one connection. 
-	 * @param attribute Defines the attribute to be set. 
-	 * @param value The new value for the attribute.
-	 * @result an IOReturn code.
-	 */
-	
-    virtual IOReturn setAttributeForConnection( SInt32 connectIndex, UInt32 attribute, uintptr_t value );
-	
-	// OSMetaClassDeclareReservedUsed(IOAudioEngine, 14);
-	/*! @function getAttributeForConnection
-	 * @abstract Generic method to retrieve some attribute of the audio engine, specific to one connection.
-	 * @discussion IOAudioEngine subclasses may implement this method to allow arbitrary attribute/value pairs to be returned, specific to one connection. 
-	 * @param attribute Defines the attribute to be returned. Some defined attributes are:<br> 
-	 * @param value Returns the value for the attribute.
-	 * @result an IOReturn code.
-	 */
-	
-    virtual IOReturn getAttributeForConnection( SInt32 connectIndex, UInt32 attribute, uintptr_t * value );
-
-private:
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 0);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 1);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 2);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 3);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 4);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 5);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 6);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 7);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 8);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 9);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 10);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 11);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 12);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 13);
-	OSMetaClassDeclareReservedUsed(IOAudioEngine, 14);
-
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 15);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 16);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 17);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 18);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 19);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 20);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 21);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 22);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 23);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 24);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 25);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 26);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 27);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 28);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 29);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 30);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 31);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 32);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 33);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 34);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 35);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 36);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 37);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 38);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 39);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 40);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 41);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 42);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 43);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 44);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 45);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 46);
-	OSMetaClassDeclareReservedUnused(IOAudioEngine, 47);
-
-public:
-    /*!
-     * @function createDictionaryFromSampleRate
-     * @abstract Generates a dictionary matching the given sample rate.
-     * @discussion This is an internal routine used to generate a dictionary matching the given sample rate.  It is used to generate a sample rate dictionary for the I/O Registry - used by the 
-     *  CoreAudio.framework.
-     * @result Returns the newly create OSDictionary.
-     */
-    static OSDictionary *createDictionaryFromSampleRate(const IOAudioSampleRate *sampleRate, OSDictionary *rateDict = 0);
-    
-    /*!
-     * @function createSampleRateFromDictionary
-     * @abstract Generates a sample rate from an OSDictionary.
-     * @discussion This is an internal routine used to generate a sample rate from an OSDictionary.  It is used to generate a sample rate give a new OSDictionary from the IORegistry - coming
-     *  from the CoreAudio.framework.
-     * @result Returns the sample rate.
-     */
-    static IOAudioSampleRate *createSampleRateFromDictionary(const OSDictionary *rateDict, IOAudioSampleRate *sampleRate = 0);
-
-    /*!
-     * @function init
-     * @abstract Performs initialization of a newly allocated IOAudioEngine.
-     * @discussion This function is responsible for initialization of all of the general attributes of
-     *  a new IOAudioEngine.  It initializes instance variables to their default
-     *  values and allocates the shared status buffer.  Subclasses will likely want to override this method
-     *  and do all of their common initialization in their implementation.  They do need to be sure to call
-     *  IOAudioEngine's implementation of init and pay attention to the return value.
-     * @param properties The default properties for the IOAudioEngine.
-     * @result Returns true if initialization was successful.
-     */
-    virtual bool init(OSDictionary *properties);
-
-    /*!
-     * @function free
-     * @abstract Frees all of the resources allocated by the IOAudioEngine.
-     * @discussion Do not call this directly.  This is called automatically by the system when the instance's
-     *  refcount goes to 0.  To decrement the refcount, call release() on the object.
-     */
-    virtual void free();
-
-    /*!
-     * @function getWorkLoop
-     * @abstract Returns the IOWorkLoop for the driver.
-     */
-    virtual IOWorkLoop *getWorkLoop() const;
-    
-    /*!
-     * @function getCommandGate
-     * @abstract Returns the IOCommandGate for this IOAudioEngine.
-     */
-    virtual IOCommandGate *getCommandGate() const;
-    
-    /*!
-     * @function start
-     * @abstract A simple cover function for start(IOService *, IOAudioDevice *) that assumes the provider
-     *  is the IOAudioDevice.
-     * @discussion Subclasses will want to override start(IOService *, IOAudioDevice *) rather than this
-     *  one.
-     * @param provider The service provider for the IOAudioEngine (the IOAudioDevice in this case).
-     * @result Returns true if the IOAudioEngine was successfully started.
-     */
-    virtual bool start(IOService *provider);
-
-    /*!
-     * @function start
-     * @abstract Standard IOKit start() routine called to start an IOService.
-     * @discussion This function is called in order to prepare the IOAudioEngine for use.  It does NOT
-     *  mean that the audio I/O engine itself should be started.  This implementation gets the IOWorkLoop
-     *  from the IOAudioDevice and allocates an IOCommandGate.  Finally it calls initHardware() in which
-     *  all of the subclass-specific device initialization should be done.  Upon return from initHardware()
-     *  all IOAudioStreams should be created and added to the audio engine.  Also, all IOAudioControls
-     *  for this IOAudioEngine should be created and attached.
-     * @param provider The service provider for the IOAudioEngine.
-     * @param device The IOAudioDevice to which this IOAudioEngine belongs.
-     * @result Returns true if the service was successfully started.
-     */
-    virtual bool start(IOService *provider, IOAudioDevice *device);
-    
-    /*!
-     * @function initHardware
-     * @abstract This function is called by start() to provide a convenient place for the subclass to
-     *  perform its hardware initialization.
-     * @discussion Upon return from this function, all IOAudioStreams and IOAudioControls should be created
-     *  and the audio engine should be ready to be started when a client requests that playback begin.
-     * @function provider The service provider numb for this audio engine - typically the IOAudioDevice.
-     * @result Returns true if the hardware was successfully initialized.
-     */
-    virtual bool initHardware(IOService *provider);
-
-    /*!
-     * @function stop
-     * @abstract Stops the service and prepares for the driver to be terminated.
-     * @discussion This function is called before the driver is terminated and usually means that the device
-     *  has been removed from the system.
-     * @param provider The service provider for the IOAudioEngine.
-     */
-    virtual void stop(IOService *provider);
-
-    /*!
-     * @function registerService
-     * @abstract Called when this audio engine is ready to begin vending services.
-     * @discussion This function is called by IOAudioDevice::activateAudioEngine() once the audio engine
-     *  has been fully initialized and is ready to begin audio playback.
-     * @param options
-     */
-    virtual void registerService(IOOptionBits options = 0);
-    
-    virtual void setAudioDevice(IOAudioDevice *device);
-    virtual void setIndex(UInt32 index);
-    
-    virtual void setDescription(const char *description);
-
-    /*!
-     * @function newUserClient
-     * @abstract Requests a new user client object for this service.
-     * @discussion This function is called automatically by I/O Kit when a user process attempts
-     *  to connect to this service.  It allocates a new IOAudioEngineUserClient object and increments
-     *  the number of connections for this audio engine.  If this is the first user client for this IOAudioEngine,
-     *  it calls startAudioEngine().  There is no need to call this function directly.
-	 *  A derived class that requires overriding of newUserClient should override the version with the properties
-	 *  parameter for Intel targets, and without the properties parameter for PPC targets.  The #if __i386__ directive
-	 *  can be used to select between the two behaviors.
-     * @param task The task requesting the new user client.
-     * @param securityID Optional security paramater passed in by the client - ignored.
-     * @param type Optional user client type passed in by the client - ignored.
-     * @param handler The new IOUserClient * must be stored in this param on a successful completion.
-     * @param properties A dictionary of additional properties for the connection.
-     * @result Returns kIOReturnSuccess on success.  May also result kIOReturnError or kIOReturnNoMemory.
-     */
-    virtual IOReturn newUserClient(task_t task, void *securityID, UInt32 type, IOUserClient **handler);
-    virtual IOReturn newUserClient(task_t task, void *securityID, UInt32 type, OSDictionary *properties, IOUserClient **handler);
-
-    /*!
-     * @function addAudioStream
-     * @abstract Adds an IOAudioStream to the audio engine.
-     * @discussion This function is called by the driver to add an IOAudioStream to the audio engine.  This must be called at least once to make sure the audio engine has at least one IOAudioStream.
-     * @param stream The IOAudioStream to be added.
-     * @result Returns kIOReturnSuccess if the stream was successfully added.
-     */
-    virtual IOReturn addAudioStream(IOAudioStream *stream);
-    
-    virtual IOAudioStream *getAudioStream(IOAudioStreamDirection direction, UInt32 channelID);
-    
-    virtual void lockAllStreams();
-    virtual void unlockAllStreams();
-    
-    virtual void updateChannelNumbers();
-
-    /*!
-     * @function resetStatusBuffer
-     * @abstract Resets the status buffer to its default values.
-     * @discussion This is called during startAudioEngine() and resumeAudioEngine() to clear out the status buffer
-     *  in preparation of starting up the I/O engine.  There is no need to call this directly.
-     */
-    virtual void resetStatusBuffer();
-    
-    /*!
-     * @function clearAllSampleBuffers
-     * @abstract Zeros out all of the sample and mix buffers associated with the IOAudioEngine
-     * @discussion This is called during resumeAudioEngine() since the audio engine gets started back at the
-     *  beginning of the sample buffer.
-     */
-    virtual void clearAllSampleBuffers();
-    
-    /*!
-     * @function getCurrentSampleFrame
-     * @abstract Gets the current sample frame from the IOAudioEngine subclass.
-     * @result
-     */
-    virtual UInt32 getCurrentSampleFrame() = 0;
-
-    /*!
-     * @function startAudioEngine
-     * @abstract Starts the audio I/O engine.
-     * @discussion This method is called automatically when the audio engine is placed into use the first time.
-     *  This must be overridden by the subclass.  No call to the superclass's implementation is
-     *  necessary.  The subclass's implementation must start up the audio I/O engine.  This includes any audio
-     *  engine that needs to be started as well as any interrupts that need to be enabled.  Upon successfully
-     *  starting the engine, the subclass's implementation must call setState(kIOAudioEngineRunning).  If
-     *  it has also checked the state using getState() earlier in the implementation, the stateLock must be
-     *  acquired for the entire initialization process (using IORecursiveLockLock(stateLock) and
-     *  IORecursiveLockUnlock(stateLock)) to ensure that the state remains consistent.  See the general class
-     *  comments for an example.
-     * @result Must return kIOReturnSuccess on a successful start of the engine.
-     */
-    virtual IOReturn startAudioEngine();
-
-    /*!
-     * @function stopAudioEngine
-     * @abstract Stops the audio I/O engine.
-     * @discussion This method is called automatically when the last client disconnects from this audio engine.
-     *  It must be overridden by the subclass.  No call to the superclass's implementation is necessary.
-     *  The subclass's implementation must stop the audio I/O engine.  The audio engine (if it exists) should
-     *  be stopped and any interrupts disabled.  Upon successfully stopping the engine, the subclass must call
-     *  setState(kAudioEngineStopped).  If it has also checked the state using getState() earlier in the
-     *  implementation, the stateLock must be acquired for the entire initialization process (using
-     *  IORecursiveLockLock(stateLock) and IORecursiveLockUnlock(stateLock)) to ensure that the state remains
-     *  consistent.
-     * @result Must return kIOReturnSuccess on a successful stop of the engine.
-     */
-    virtual IOReturn stopAudioEngine();
-    virtual IOReturn pauseAudioEngine();
-    virtual IOReturn resumeAudioEngine();
-    
-    /*!
-     * @function performAudioEngineStart
-     * @abstract Called to start the audio I/O engine
-     * @discussion This method is called by startAudioEngine().  This must be overridden by the subclass.
-	 *	No call to the superclass' implementation is necessary.  The subclass' implementation must start up the
-	 *	audio I/O engine.  This includes any audio engine that needs to be started as well as any interrupts
-	 *	that need to be enabled.
-     * @result Must return kIOReturnSuccess on a successful start of the engine.
-     */
-    virtual IOReturn performAudioEngineStart();
-
-    /*!
-     * @function performAudioEngineStop
-     * @abstract Called to stop the audio I/O engine
-     * @discussion This method is called by stopAudioEngine() and pauseAudioEngine.
-     *  This must be overridden by the subclass.  No call to the superclass' implementation is
-     *  necessary.  The subclass' implementation must stop the audio I/O engine.  This includes any audio
-     *  engine that needs to be stopped as well as any interrupts that need to be disabled.
-     * @result Must return kIOReturnSuccess on a successful stop of the engine.
-     */
-    virtual IOReturn performAudioEngineStop();
-
-    /*! 
-     * @function getState
-     * @abstract Returns the current state of the IOAudioEngine.
-     * @discussion If this method is called in preparation for calling setState(), the stateLock must
-     *  be acquired before the first call to getState() and held until after the last call to setState().
-     *  Be careful not to return from the code acquiring the lock while the lock is being held.  That
-     *  will cause a deadlock situation.
-     * @result The current state of the IOAudioEngine: kIOAudioEngineRunning, kIOAudioEngineStopped.
-     */
-    virtual IOAudioEngineState getState();
-
-    /*!
-     * @function getSampleRate 
-     * @abstract Returns the sample rate of the IOAudioEngine in samples per second.
-     */
-    virtual const IOAudioSampleRate *getSampleRate();
-    
-    virtual IOReturn hardwareSampleRateChanged(const IOAudioSampleRate *sampleRate);
-
-    /*!
-     * @function getRunEraseHead 
-     * @abstract Returns true if the audio engine will run the erase head when the audio engine is running.
-     */
-    virtual bool getRunEraseHead();
-
-    /*!
-     * @function getStatus 
-     * @abstract Returns a pointer to the shared status buffer.
-     */
-    virtual const IOAudioEngineStatus *getStatus();
-
-    /*!
-     * @function timerCallback
-     * @abstract A static method used as a callback for the IOAudioDevice timer services.
-     * @discussion This method implements the IOAudioDevice::TimerEvent type.
-     * @param arg1 The IOAudioEngine that is the target of the event.
-     * @param device The IOAudioDevice that sent the timer event.
-     */
-    static void timerCallback(OSObject *arg1, IOAudioDevice *device);
-
-    /*!
-     * @function timerFired
-     * @abstract Indicates the timer has fired.
-     * @discussion This method is called by timerCallback to indicate the timer has fired.  This method calls performErase() and performFlush() to do erase head processing and
-     *  audio engine flushing each time the timer event fires.
-     */
-    virtual void timerFired();
-
-    /*!
-     * @function getTimerInterval
-     * @abstract Gets the timer interval for use by the timer event.
-     * @discussion This method is called each time the timer event is enabled through addTimer().  The default
-     *  implementation is set to return a value such that the timer event runs n times each cycle of the audio
-     *  engine through the sample buffer.  The value n is stored as the instance variable: numErasesPerBuffer.
-     *  The default value of numErasesPerBuffer is set to IOAUDIOENGINE_DEFAULT_NUM_ERASES_PER_BUFFER which is 4.
-     *  A subclass may change the value of numErasesPerBuffer or override getTimerInterval.  If it is overridden,
-     *  the subclass should call the superclass's implementation, compare its interval with the superclass's and
-     *  return the smaller of the two.
-     * @result Returns the interval for the timer event.
-     */
-    virtual AbsoluteTime getTimerInterval();
-
-    /*!
-     * @function performErase
-     * @abstract Performs erase head processing.
-     * @discussion This method is called automatically each time the timer event fires and erases the sample
-     *  buffer and mix buffer from the previous location up to the current location of the audio engine.
-     */
-    virtual void performErase();
-
-    /*!
-     * @function performFlush
-     * @abstract Performs the flush operation.
-     * @discussion This method is called automatically each time the timer event fires.  It stops the audio engine
-     *  if there are no more clients and the audio engine is passed the latest flush ending position.
-     */
-    virtual void performFlush();
-    
-    virtual void stopEngineAtPosition(IOAudioEnginePosition *endingPosition);
-
-    virtual IOReturn mixOutputSamples(const void *sourceBuf, void *mixBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
-    virtual IOReturn clipOutputSamples(const void *mixBuf, void *sampleBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
-    virtual void resetClipPosition(IOAudioStream *audioStream, UInt32 clipSampleFrame);
-    virtual IOReturn convertInputSamples(const void *sampleBuf, void *destBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
-    
-    virtual void takeTimeStamp(bool incrementLoopCount = true, AbsoluteTime *timestamp = NULL);
-    virtual IOReturn getLoopCountAndTimeStamp(UInt32 *loopCount, AbsoluteTime *timestamp);
-
-    virtual IOReturn calculateSampleTimeout(AbsoluteTime *sampleInterval, UInt32 numSampleFrames, IOAudioEnginePosition *startingPosition, AbsoluteTime *wakeupTime);
-    
-    virtual IOReturn performFormatChange(IOAudioStream *audioStream, const IOAudioStreamFormat *newFormat, const IOAudioSampleRate *newSampleRate);
-    
-    virtual void beginConfigurationChange();
-    virtual void completeConfigurationChange();
-    virtual void cancelConfigurationChange();
-
-    virtual IOReturn addDefaultAudioControl(IOAudioControl *defaultAudioControl);
-    virtual IOReturn removeDefaultAudioControl(IOAudioControl *defaultAudioControl);
-    virtual void removeAllDefaultAudioControls();
-    
-    virtual OSString *getGlobalUniqueID();
-    virtual OSString *getLocalUniqueID();
-
-protected:
-
-    /*!
-     * @function initKeys
-     * @abstract Generates the OSSymbols with the keys.
-     * @discussion Do not call this directly.  This is an internal initialization routine.
-     */ 
-    static void initKeys();
-    
-    virtual void setNumSampleFramesPerBuffer(UInt32 numSampleFrames);
-    virtual UInt32 getNumSampleFramesPerBuffer();
-
-    /*!
-     * @function setState
-     * @abstract Indicates that the audio engine is in the specified state.
-     * @discussion This method simply sets the internal state of the audio engine to the specified state.  It does not
-     *  affect a change to the state.  It does however keep other internal state-related attributes consistent.
-     *  For example, it enables or disables the timer as needed when the state changes to running or stopped.
-     * @param newState The state the audio engine is in.
-     * @result Returns the old state.
-     */
-    virtual IOAudioEngineState setState(IOAudioEngineState newState);
-
-    /*!
-     * @function setSampleRate
-     * @abstract Records the sample rate of the audio engine.
-     * @discussion  This method must be called during initialization of a new audio engine to record the audio engine's
-     *  initial sample rate.  It also is intended to be used to record changes to the sample rate during use.
-     *  Currently changing sample rates after the audio engine has been started is not supported.
-     *  It may require that the sample buffers be re-sized.  This will be available in an upcoming release.
-     * @param newSampleRate The sample rate of the audio engine in samples per second.
-     */
-    virtual void setSampleRate(const IOAudioSampleRate *newSampleRate);
-
-    /*!
-     * @function setSampleLatency
-     * @abstract Sets the sample latency for the audio engine.
-     * @discussion The sample latency represents the number of samples ahead of the playback head
-     *  that it is safe to write into the sample buffer.  The audio device API will never write
-     *  closer to the playback head than the number of samples specified.  For input audio engines
-     *  the number of samples is behind the record head.
-     */
-    virtual void setSampleLatency(UInt32 numSamples);
-    virtual void setOutputSampleLatency(UInt32 numSamples);
-    virtual void setInputSampleLatency(UInt32 numSamples);
-    virtual void setSampleOffset(UInt32 numSamples);
-
-    /*!
-     * @function setRunEraseHead
-     * @abstract Tells the audio engine whether or not to run the erase head.
-     * @discussion By default, output audio engines run the erase head and input audio engines do not.  This method can
-     *  be called after setDirection() is called in order to change the default behavior.
-     * @param runEraseHead The audio engine will run the erase head if this value is true.
-     */
-    virtual void setRunEraseHead(bool runEraseHead);
-
-    /*!
-     * @function clientClosed
-     * @abstract Called automatically when a user client closes its connection to the audio engine.
-     * @discussion This method decrements the number of connections to the audio engine and if they reach
-     *  zero, the audio engine is called with a call to stopAudioEngine().  This method should not be called directly.
-     * @param client The user client that has disconnected.
-     */
-    virtual void clientClosed(IOAudioEngineUserClient *client);
-
-    /*!
-     * @function addTimer
-     * @abstract Enables the timer event for the audio engine.
-     * @discussion There is a timer event needed by the IOAudioEngine for processing the erase head
-     *  and performing flushing operations. When the timer fires, the method timerFired() is ultimately
-     *  called which in turn calls performErase() and performFlush().  This is called automatically
-     *  to enable the timer event for this audio engine.  It is called by setState() when the audio engine state
-     *  is set to kIOAudioEngineRunning.  When the timer is no longer needed, removeTimer() is called.
-     *  There is no need to call this directly.  
-     */
-    virtual void addTimer();
-
-    /*!
-     * @function removeTimer
-     * @abstract Disables the timer event for the audio engine.
-     * @discussion  This method is called automatically to disable the timer event for this audio engine.
-     *  There is need to call it directly.  This method is called by setState() when the audio engine state
-     *  is changed from kIOAudioEngineRunning to one of the stopped states.
-     */
-    virtual void removeTimer();
-
-    virtual void sendFormatChangeNotification(IOAudioStream *audioStream);
-    virtual void sendNotification(UInt32 notificationType);
-    
-    virtual IOReturn createUserClient(task_t task, void *securityID, UInt32 type, IOAudioEngineUserClient **newUserClient);
-
-	static IOReturn _addUserClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);		// <rdar://7529580>
-    static IOReturn addUserClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-	static IOReturn _removeUserClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-    static IOReturn removeUserClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-    static IOReturn detachUserClientsAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-    
-    virtual IOReturn addUserClient(IOAudioEngineUserClient *newUserClient);
-    virtual IOReturn removeUserClient(IOAudioEngineUserClient *userClient);
-    virtual IOReturn detachUserClients();
-    
-    virtual IOReturn startClient(IOAudioEngineUserClient *userClient);
-    virtual IOReturn stopClient(IOAudioEngineUserClient *userClient);
-    
-    virtual IOReturn incrementActiveUserClients();
-    virtual IOReturn decrementActiveUserClients();
-    
-    virtual void detachAudioStreams();
-	void setWorkLoopOnAllAudioControls(IOWorkLoop *wl);
-
-	static inline void lockStreamForIO(IOAudioStream *stream);
-	static inline void unlockStreamForIO(IOAudioStream *stream);
-
-	// These aren't virtual by design
-	UInt32 getNextStreamID(IOAudioStream * newStream);
-	IOAudioStream * getStreamForID(UInt32 streamID);
-
-};
-
-#endif /* _IOKIT_IOAUDIOENGINE_H */
diff --git a/i386/include/IOKit/audio/IOAudioEngineUserClient.h b/i386/include/IOKit/audio/IOAudioEngineUserClient.h
deleted file mode 100644
index cc51a83..0000000
--- a/i386/include/IOKit/audio/IOAudioEngineUserClient.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOAUDIOENGINEUSERCLIENT_H
-#define _IOKIT_IOAUDIOENGINEUSERCLIENT_H
-
-#include <IOKit/IOUserClient.h>
-#ifndef IOAUDIOFAMILY_SELF_BUILD
-#include <IOKit/audio/IOAudioEngine.h>
-#include <IOKit/audio/IOAudioTypes.h>
-#else
-#include "IOAudioEngine.h"
-#include "IOAudioTypes.h"
-#endif
-#include <IOKit/IOBufferMemoryDescriptor.h>
-
-class IOAudioEngine;
-class IOAudioStream;
-class IOMemoryDescriptor;
-class IOCommandGate;
-class IOWorkLoop;
-
-class IOAudioEngineUserClient;
-class IOAudioClientBufferSet;
-typedef struct IOAudioFormatNotification;
-typedef struct IOAudioClientBuffer {
-    IOAudioEngineUserClient		*userClient;
-    IOAudioStream 				*audioStream;
-    void						*sourceBuffer;
-    IOMemoryDescriptor			*sourceBufferDescriptor;
-    IOMemoryMap					*sourceBufferMap;
-    void						*unmappedSourceBuffer; 
-    UInt32						numSampleFrames;
-    UInt32						numChannels;
-    IOAudioEnginePosition		mixedPosition;
-    struct IOAudioClientBuffer	*mNextBuffer32;
-    struct IOAudioClientBuffer	*nextClip;
-    struct IOAudioClientBuffer	*previousClip;
-    struct IOAudioClientBuffer	*nextClient;
-	IOAudioBufferDataDescriptor *bufferDataDescriptor;
-} IOAudioClientBuffer;
-
-/* IOAudioClientBuffer64 added for binary compatibility with old PPC drivers covered by <rdar://problem/4651809> */
-typedef struct IOAudioClientBuffer64 
-{
-    IOAudioClientBuffer				mAudioClientBuffer32;
-    mach_vm_address_t				mUnmappedSourceBuffer64;
-    struct IOAudioClientBuffer64	*mNextBuffer64;
-} IOAudioClientBuffer64;
-
-typedef struct IOAudioClientBufferExtendedInfo {
-	// Added stuff for registerClientParameterBuffer
-	UInt32						bufferSetID;
-	void						*paramBuffer;
-	IOMemoryDescriptor			*paramBufferDescriptor;
-	IOMemoryMap					*paramBufferMap;
-	void						*unmappedParamBuffer;
-	struct IOAudioClientBufferExtendedInfo	*mNextExtended;
-} IOAudioClientBufferExtendedInfo;
-/* IOAudioClientBufferExtendedInfo64 added for binary compatibility with old PPC drivers covered by <rdar://problem/4651809>  */
-typedef struct IOAudioClientBufferExtendedInfo64 
-{
-	IOAudioClientBufferExtendedInfo mAudioClientBufferExtended32;
-	mach_vm_address_t			mUnmappedParamBuffer64;
-	struct IOAudioClientBufferExtendedInfo64	*mNextExtended64;
-}	IOAudioClientBufferExtendedInfo64;
-
-
-class IOAudioEngineUserClient : public IOUserClient
-	{
-		OSDeclareDefaultStructors(IOAudioEngineUserClient)
-		
-		friend class IOAudioEngine;
-		friend class IOAudioClientBufferSet;
-		friend class IOAudioStream;
-		
-	protected:
-		IOAudioEngine				*audioEngine;
-		
-		IOWorkLoop					*workLoop;
-		IOCommandGate				*commandGate;
-		
-		IOExternalMethod			old_methods[5];		// It's size can't be changed for binary compatibility reasons, no longer used.
-		IOExternalTrap				trap;
-		
-		task_t						clientTask;
-		UInt32						numSampleFrames;		// Never used...
-		
-		IOAudioClientBufferSet		*clientBufferSetList;
-		IORecursiveLock 			*clientBufferLock;
-		
-		IOAudioNotificationMessage	*notificationMessage;
-		
-		bool						online;
-		
-	protected:
-		struct ExpansionData {
-			IOAudioClientBufferExtendedInfo64	*extendedInfo;
-			IOExternalMethod					methods[kIOAudioEngineNumCalls];		// This size can be changed, this is the new methods pointer
-			UInt32								classicMode;
-		};
-		
-		ExpansionData *reserved;
-		
-	public:
-		virtual IOReturn externalMethod( uint32_t selector, IOExternalMethodArguments * arguments, 	IOExternalMethodDispatch * dispatch, 
-										OSObject * target, 	void * reference);
-		// New code added here...
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 0);	
-		virtual IOReturn registerClientParameterBuffer (void * parameterBuffer, UInt32 bufferSetID);  // unused function
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 1);	
-		virtual IOAudioClientBufferExtendedInfo * findExtendedInfo(UInt32 bufferSetID);
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 2);	
-		virtual IOReturn getNearestStartTime(IOAudioStream *audioStream, IOAudioTimeStamp *ioTimeStamp, UInt32 isInput);
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 3);	
-		virtual IOReturn getClientNearestStartTime(IOAudioStream *audioStream, IOAudioTimeStamp *ioTimeStamp, UInt32 isInput);
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 4);	
-		virtual IOReturn safeRegisterClientBuffer(UInt32 audioStreamIndex, void * sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 5);	
-		virtual bool initWithAudioEngine(IOAudioEngine *engine, task_t task, void *securityToken, UInt32 type, OSDictionary *properties);	
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 6);	<rdar://problems/5321701>
-		virtual IOReturn safeRegisterClientBuffer64(UInt32 audioStreamIndex, mach_vm_address_t * sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 7);	<rdar://problems/5321701>
-		virtual IOReturn registerClientBuffer64(IOAudioStream *audioStream, mach_vm_address_t sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 8);	<rdar://problems/5321701>
-		virtual IOReturn registerBuffer64(IOAudioStream *audioStream, mach_vm_address_t sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 9);	<rdar://problems/5321701>
-		virtual IOReturn unregisterBuffer64(mach_vm_address_t sourceBuffer, UInt32 bufferSetID);
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 10);	<rdar://problems/5321701>
-		virtual IOReturn unregisterClientBuffer64(mach_vm_address_t  * sourceBuffer, UInt32 bufferSetID);
-		// OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 11);	 <rdar://problems/5321701>
-		virtual IOAudioClientBufferExtendedInfo64 * findExtendedInfo64(UInt32 bufferSetID);
-	
-		
-		
-	private:
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 0);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 1);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 2);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 3);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 4);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 5);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 6);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 7);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 8);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 9);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 10);
-		OSMetaClassDeclareReservedUsed(IOAudioEngineUserClient, 11);
-		
-		
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 12);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 13);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 14);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 15);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 16);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 17);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 18);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 19);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 20);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 21);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 22);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 23);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 24);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 25);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 26);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 27);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 28);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 29);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 30);
-		OSMetaClassDeclareReservedUnused(IOAudioEngineUserClient, 31);
-		
-	protected:
-		virtual IOReturn clientClose();
-		virtual IOReturn clientDied();
-		
-		static IOReturn _closeClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-		static IOReturn closeClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-		virtual IOReturn closeClient();
-		
-		
-		virtual IOReturn clientMemoryForType(UInt32 type, UInt32 *flags, IOMemoryDescriptor **memory);
-		virtual IOExternalMethod *getExternalMethodForIndex(UInt32 index);
-		virtual IOExternalTrap *getExternalTrapForIndex(UInt32 index);
-		virtual IOReturn registerNotificationPort(mach_port_t port, UInt32 type, UInt32 refCon);
-		
-		static IOReturn _registerNotificationAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-		static IOReturn registerNotificationAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-		virtual IOReturn registerNotification(mach_port_t port, UInt32 refCon);
-	
-		virtual void setOnline(bool newOnline);
-		
-		virtual IOReturn performClientOutput(UInt32 firstSampleFrame, UInt32 loopCount, IOAudioClientBufferSet *bufferSet, UInt32 sampleIntervalHi, UInt32 sampleIntervalLo);
-		virtual IOReturn performClientInput(UInt32 firstSampleFrame, IOAudioClientBufferSet *bufferSet);
-		virtual void performWatchdogOutput(IOAudioClientBufferSet *clientBufferSet, UInt32 generationCount);
-		
-		virtual void lockBuffers();
-		virtual void unlockBuffers();
-		
-	public:
-		
-		static IOAudioEngineUserClient *withAudioEngine(IOAudioEngine *engine, task_t clientTask, void *securityToken, UInt32 type);
-		static IOAudioEngineUserClient *withAudioEngine(IOAudioEngine *engine, task_t clientTask, void *securityToken, UInt32 type, OSDictionary *properties);
-		
-		virtual bool initWithAudioEngine(IOAudioEngine *engine, task_t task, void *securityToken, UInt32 type);
-		
-		virtual void free();
-		virtual void freeClientBufferSetList();
-		virtual void freeClientBuffer(IOAudioClientBuffer64 *clientBuffer);
-		
-		virtual void stop(IOService *provider);
-		
-		virtual bool isOnline();
-		
-		virtual IOReturn registerBuffer(IOAudioStream *audioStream, void* sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
-		virtual IOReturn unregisterBuffer( void * sourceBuffer, UInt32 bufferSetID);
-		
-		static IOReturn _registerBufferAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-		static IOReturn registerBufferAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-		static IOReturn _unregisterBufferAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-		static IOReturn unregisterBufferAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-		
-		virtual IOReturn registerClientBuffer(IOAudioStream *audioStream, void * sourceBuffer, UInt32 bufSizeInBytes, UInt32 bufferSetID);
-		virtual IOReturn unregisterClientBuffer(void * sourceBuffer, UInt32 bufferSetID);
-		
-		static IOReturn _getNearestStartTimeAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-		static IOReturn getNearestStartTimeAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-		
-		virtual IOAudioClientBufferSet *findBufferSet(UInt32 bufferSetID);
-		virtual void removeBufferSet(IOAudioClientBufferSet *bufferSet);
-		
-		virtual IOReturn getConnectionID(UInt32 *connectionID);
-		
-		virtual IOReturn clientStart();
-		virtual IOReturn clientStop();
-		
-		static IOReturn _startClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-		static IOReturn startClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-		static IOReturn _stopClientAction(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);	// <rdar://7529580>
-		static IOReturn stopClientAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-		
-		virtual IOReturn startClient();
-		virtual IOReturn stopClient();
-		
-		virtual IOReturn performClientIO(UInt32 firstSampleFrame, UInt32 loopCount, bool inputIO, UInt32 bufferSetID, UInt32 sampleIntervalHi, UInt32 sampleIntervalLo);
-		
-		virtual void sendFormatChangeNotification(IOAudioStream *audioStream);
-		virtual IOReturn sendNotification(UInt32 notificationType);
-		
-	};
-
-#endif /* _IOKIT_IOAUDIOENGINEUSERCLIENT_H */
diff --git a/i386/include/IOKit/audio/IOAudioLevelControl.h b/i386/include/IOKit/audio/IOAudioLevelControl.h
deleted file mode 100644
index d76786d..0000000
--- a/i386/include/IOKit/audio/IOAudioLevelControl.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOAUDIOLEVELCONTROL_H
-#define _IOKIT_IOAUDIOLEVELCONTROL_H
-
-#ifndef IOAUDIOFAMILY_SELF_BUILD
-#include <IOKit/audio/IOAudioControl.h>
-#else
-#include "IOAudioControl.h"
-#endif
-
-class OSArray;
-
-/*!
- * @class IOAudioLevelControl
- * @abstract
- * @discussion
- */
-
-class IOAudioLevelControl : public IOAudioControl
-{
-    OSDeclareDefaultStructors(IOAudioLevelControl)
-
-protected:
-    SInt32	minValue;
-    SInt32	maxValue;
-    IOFixed	minDB;
-    IOFixed	maxDB;
-    
-    OSArray *ranges;
-    
-protected:
-    struct ExpansionData { };
-    
-    ExpansionData *reserved;
-
-public:
-	static IOAudioLevelControl *createPassThruVolumeControl (SInt32 initialValue,
-                                                                SInt32 minValue,
-                                                                SInt32 maxValue,
-                                                                IOFixed minDB,
-                                                                IOFixed maxDB,
-                                                                UInt32 channelID,
-                                                                const char *channelName,
-                                                                UInt32 cntrlID);
-
-	// OSMetaClassDefineReservedUnused(IOAudioLevelControl, 0);
-    /*!
-	 * @function setLinearScale
-     * @abstract This function tells CoreAudio if it should apply a curve to the scaler representation of the volume.
-	 * @param useLinearScale TRUE instructs CoreAudio to not apply a curve to the scaler representation of the volume,
-	 * FALSE instructs CoreAudio to apply a curve, which is CoreAudio's default behavior.
-     */
-	virtual void setLinearScale(bool useLinearScale);
-
-private:
-    OSMetaClassDeclareReservedUsed(IOAudioLevelControl, 0);
-
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 1);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 2);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 3);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 4);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 5);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 6);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 7);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 8);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 9);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 10);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 11);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 12);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 13);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 14);
-    OSMetaClassDeclareReservedUnused(IOAudioLevelControl, 15);
-
-public:
-    /*!
-     * @function create
-     * @abstract Allocates a new level control with the given attributes
-     * @param initialValue The initial value of the control
-     * @param minValue The lowest possible value the control may have 
-     * @param maxValue The highest possible value the control may have
-     * @param minDB A fixed point representation of the db value matching minValue 
-     * @param maxDB A fixed point representation of the db value matching maxValue 
-     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
-     * @param channelName An optional name for the channel.  Common names are located in IOAudioTypes.h.
-     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls.
-     * @result Returns a newly allocted and initialized level IOAudioControl
-     */
-    static IOAudioLevelControl *create(SInt32 initialValue,
-                                       SInt32 minValue,
-                                       SInt32 maxValue,
-                                       IOFixed minDB,
-                                       IOFixed maxDB,
-                                       UInt32 channelID,
-                                       const char *channelName = 0,
-                                       UInt32 cntrlID = 0,
-                                       UInt32 subType = 0,
-                                       UInt32 usage = 0);
-                                       
-    static IOAudioLevelControl *createVolumeControl(SInt32 initialValue,
-                                                    SInt32 minValue,
-                                                    SInt32 maxValue,
-                                                    IOFixed minDB,
-                                                    IOFixed maxDB,
-                                                    UInt32 channelID,
-                                                    const char *channelName = 0,
-                                                    UInt32 cntrlID = 0,
-                                                    UInt32 usage = 0);
-
-    /*!
-     * @function init
-     * @abstract Initializes a newly allocated IOAudioLevelControl with the given attributes
-     * @param initialValue The initial value of the control
-     * @param minValue The lowest possible value the control may have 
-     * @param maxValue The highest possible value the control may have
-     * @param minDB A fixed point representation of the db value matching minValue 
-     * @param maxDB A fixed point representation of the db value matching maxValue 
-     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
-     * @param channelName An optional name for the channel.  Common names are located in IOAudioTypes.h.
-     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls.
-     * @param properties Standard property list passed to the init() function of any new IOService.  This dictionary
-     *  gets stored in the registry entry for this service.
-     * @result Returns true on success
-     */
-    virtual bool init(SInt32 initialValue,
-                      SInt32 minValue,
-                      SInt32 maxValue,
-                      IOFixed minDB,
-                      IOFixed maxDB,
-                      UInt32 channelID,
-                      const char *channelName = 0,
-                      UInt32 cntrlID = 0,
-                      UInt32 subType = 0,
-                      UInt32 usage = 0,
-                      OSDictionary *properties = 0);
-                      
-    virtual void free();
-
-    /*!
-     * @function setMinValue
-     * @abstract Sets the minimum value the control may have
-     * @param minValue The minimum value for the control
-     */
-    virtual void setMinValue(SInt32 minValue);
-
-    virtual SInt32 getMinValue();
-     
-    /*!
-     * @function setMaxValue
-     * @abstract Sets the maximum value the control may have
-     * @param maxValue The maximum value for the control
-     */ 
-    virtual void setMaxValue(SInt32 maxValue);
-
-    virtual SInt32 getMaxValue();
-     
-     /*!
-     * @function setMinDB
-     * @abstract Sets the minimum value in db that the control may have
-     * @discussion This value is represented as an IOFixed value which is a fixed point number.  The IOFixed
-     *  type is a 16.16 fixed point value.
-     * @param minDB The minimum value in db for the control
-     */
-    virtual void setMinDB(IOFixed minDB);
-
-    virtual IOFixed getMinDB();
-    
-    /*!
-     * @function setMaxDB
-     * @abstract Sets the maximum value in db that the control may have
-     * @discussion This value is represented as an IOFixed value which is a fixed point number.  The IOFixed
-     *  type is a 16.16 fixed point value.
-     * @param maxDB The maximum value in db for the control
-     */
-    virtual void setMaxDB(IOFixed maxDB);
-
-    virtual IOFixed getMaxDB();
-    
-    virtual IOReturn addRange(SInt32 minValue, SInt32 maxValue, IOFixed minDB, IOFixed maxDB);
-    virtual IOReturn addNegativeInfinity(SInt32 negativeInfinityValue);
-    
-    virtual IOReturn validateValue(OSObject *newValue);
-};
-
-#endif /* _IOKIT_IOAUDIOLEVELCONTROL_H */
diff --git a/i386/include/IOKit/audio/IOAudioPort.h b/i386/include/IOKit/audio/IOAudioPort.h
deleted file mode 100644
index 728c65e..0000000
--- a/i386/include/IOKit/audio/IOAudioPort.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOAUDIOPORT_H
-#define _IOKIT_IOAUDIOPORT_H
-
-#include <IOKit/IOService.h>
-
-class IOAudioDevice;
-class IOAudioControl;
-class OSDictionary;
-
-/*!
- * @class IOAudioPort
- * @abstract Represents a logical or physical port or functional unit in an audio device.
- * @discussion An IOAudioPort represents an element in the signal chain in the audio device.  It may contain
- *  one or more controls (represented by IOAudioControl) by which different attributes of the port may be
- *  represented and adjusted.
- *
- *  IOAudioPort objects are connected up in the IORegistry in the IOAudioPlane to represent the signal chain of
- *  the device.  They may be connected to other IOAudioPorts as well as IOAudioEngines to indicate they either
- *  feed into or are fed by one of the audio engines (i.e. they provide input to or take output from the computer).
- */
-class IOAudioPort : public IOService
-{
-    friend class IOAudioDevice;
-
-    OSDeclareDefaultStructors(IOAudioPort)
-
-public:
-    /* @var audioDevice The IOAudioDevice that this IOAudioPort belongs to. */
-    IOAudioDevice *	audioDevice;
-    /* @var audioControls A set containg all of the IOAudioControl instances that belong to the port. */
-    OSSet *		audioControls;
-    bool		isRegistered;
-
-protected:
-    struct ExpansionData { };
-    
-    ExpansionData *reserved;
-    
-private:
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 0);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 1);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 2);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 3);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 4);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 5);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 6);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 7);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 8);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 9);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 10);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 11);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 12);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 13);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 14);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 15);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 16);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 17);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 18);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 19);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 20);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 21);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 22);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 23);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 24);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 25);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 26);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 27);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 28);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 29);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 30);
-    OSMetaClassDeclareReservedUnused(IOAudioPort, 31);
-
-public:
-    /*!
-     * @function withAttributes
-     * @abstract Allocates a new IOAudioPort instance with the given attributes
-     * @discussion This static method allocates a new IOAudioPort and calls initWithAttributes() on it with
-     *  the parameters passed in to it.
-     * @param portType A readable string representing the type of port.  Common port types are defined in
-     *  IOAudioTypes.h and are prefixed with 'kIOAudioPortType'.  Please provide feedback if there are
-     *  other common port types that should be included.
-     * @param portName A readable string representing the name of the port.  For example: 'Internal Speaker',
-     *  'Line Out'.  This field is optional, but useful for providing information to the application/user.
-     * @param subType Developer defined readable string representing a subtype for the port. (optional)
-     * @param properties Standard property list passed to the init of any new IOService.  This dictionary
-     *  gets stored in the registry for this instance. (optional)
-     * @result Returns the newly allocated and initialized IOAudioPort instance.
-     */
-    static IOAudioPort *withAttributes(UInt32 portType, const char *portName = 0, UInt32 subType = 0, OSDictionary *properties = 0);
-
-    /*!
-     * @function initWithAttributes
-     * @abstract Initializes a newly allocated IOAudioPort instance with the given attributes
-     * @discussion The properties parameter is passed on the superclass' init().  The portType, subType
-     *  and properties parameters are optional, however portType is recommended.
-     * @param portType A readable string representing the type of port.  Common port types are defined in
-     *  IOAudioTypes.h and are prefixed with 'kIOAudioPortType'.  Please provide feedback if there are
-     *  other common port types that should be included.
-     * @param portName A readable string representing the name of the port.  For example: 'Internal Speaker',
-     *  'Line Out'.  This field is optional, but useful for providing information to the application/user.
-     * @param subType Developer defined readable string representing a subtype for the port. (optional)
-     * @param properties Standard property list passed to the init of any new IOService.  This dictionary
-     *  gets stored in the registry for this instance. (optional)
-     * @result Returns true on success.
-     */
-    virtual bool initWithAttributes(UInt32 portType, const char *portName = 0, UInt32 subType = 0, OSDictionary *properties = 0);
-
-    /*!
-     * @function free
-     * @abstract Frees all of the resources allocated by the IOAudioPort.
-     * @discussion Do not call this directly.  This is called automatically by the system when the instance's
-     *  refcount goes to 0.  To decrement the refcount, call release() on the object.
-     */
-    virtual void free();
-
-    /*!
-     * @function start
-     * @abstract Called to start a newly created IOAudioPort.
-     * @discussion This is called automatically by IOAudioDevice when attachAudioPort() is called.
-     * @param provider The IOAudioDevice that owns this port
-     * @result Returns true on success
-     */
-    virtual bool start(IOService *provider);
-
-    /*!
-     * @function stop
-     * @abstract Called when the IOAudioDevice is stopping when it is no longer available.
-     * @discussion This method calls deactivateAudioControls() to shut down all of the controls associated with
-     *  this port.
-     * @param provider The IOAudioDevice that owns this port
-     */
-    virtual void stop(IOService *provider);
-
-    virtual void registerService(IOOptionBits options = 0);
-
-    virtual IOAudioDevice *getAudioDevice();
-
-    /*!
-     * @function addAudioControl
-     * @abstract Adds a newly created IOAudioControl instance to the port.
-     * @discussion This method is responsible for starting the new IOAudioControl and adding it to the internal
-     *  audioControls array.
-     * @param control A newly created IOAudioControl instance that should belong to this port.
-     * @result Returns true on successfully staring the IOAudioControl.
-     */
-    virtual IOReturn addAudioControl(IOAudioControl *control);
-
-    /*!
-     * @function deactivateAudioControls
-     * @abstract Called to shut down all of the audio controls for this port.
-     * @discussion This will stop all of the audio controls and release them so that the instances may be
-     *  freed.  This is called from the free() method.
-     */
-    virtual void deactivateAudioControls();
-
-protected:
-    virtual void setType(UInt32 portType);
-    virtual void setSubType(UInt32 subType);
-    virtual void setName(const char *name);
-};
-
-#endif /* _IOKIT_IOAUDIOPORT_H */
diff --git a/i386/include/IOKit/audio/IOAudioSelectorControl.h b/i386/include/IOKit/audio/IOAudioSelectorControl.h
deleted file mode 100644
index 8687810..0000000
--- a/i386/include/IOKit/audio/IOAudioSelectorControl.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOAUDIOSELECTORCONTROL_H
-#define _IOKIT_IOAUDIOSELECTORCONTROL_H
-
-#ifndef IOAUDIOFAMILY_SELF_BUILD
-#include <IOKit/audio/IOAudioControl.h>
-#else
-#include "IOAudioControl.h"
-#endif
-
-class OSString;
-class OSArray;
-
-class IOAudioSelectorControl : public IOAudioControl
-{
-    OSDeclareDefaultStructors(IOAudioSelectorControl)
-    
-protected:
-
-    OSArray *availableSelections;
-
-protected:
-    struct ExpansionData { };
-    
-    ExpansionData *reserved;
-
-public:
-	static IOAudioSelectorControl *createOutputSelector(SInt32 initialValue,
-															UInt32 channelID,
-															const char *channelName = 0,
-															UInt32 cntrlID = 0);
-	static IOAudioSelectorControl *createOutputClockSelector(SInt32 initialValue,
-                                                                    UInt32 channelID,
-																	UInt32 clockSource,
-                                                                    const char *channelName = 0,
-                                                                    UInt32 cntrlID = 0);
-	static IOAudioSelectorControl *createInputClockSelector(SInt32 initialValue,
-                                                                    UInt32 channelID,
-																	UInt32 clockSource,
-                                                                    const char *channelName = 0,
-                                                                    UInt32 cntrlID = 0);
-
-    // OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 0);
-	virtual IOReturn removeAvailableSelection(SInt32 selectionValue);
-    // OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 1);
-	virtual IOReturn replaceAvailableSelection(SInt32 selectionValue, const char *selectionDescription);
-    // OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 2);
-	virtual IOReturn replaceAvailableSelection(SInt32 selectionValue, OSString *selectionDescription);
-
-private:
-    OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 0);
-    OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 1);
-    OSMetaClassDeclareReservedUsed(IOAudioSelectorControl, 2);
-
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 3);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 4);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 5);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 6);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 7);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 8);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 9);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 10);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 11);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 12);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 13);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 14);
-    OSMetaClassDeclareReservedUnused(IOAudioSelectorControl, 15);
-
-public:
-    static IOAudioSelectorControl *create(SInt32 initialValue,
-                                            UInt32 channelID,
-                                            const char *channelName = 0,
-                                            UInt32 cntrlID = 0,
-                                            UInt32 subType = 0,
-                                            UInt32 usage = 0);
-                                            
-    static IOAudioSelectorControl *createInputSelector(SInt32 initialValue,
-                                                        UInt32 channelID,
-                                                        const char *channelName = 0,
-                                                        UInt32 cntrlID = 0);
-                                                        
-    virtual bool init(SInt32 initialValue,
-                      UInt32 channelID,
-                      const char *channelName = 0,
-                      UInt32 cntrlID = 0,
-                      UInt32 subType = 0,
-                      UInt32 usage = 0,
-                      OSDictionary *properties = 0);
-
-    virtual void free();
-
-    virtual IOReturn addAvailableSelection(SInt32 selectionValue, const char *selectionDescription);
-    virtual IOReturn addAvailableSelection(SInt32 selectionValue, OSString *selectionDescription);
-
-    virtual bool valueExists(SInt32 selectorValue);
-
-    virtual IOReturn validateValue(OSObject *newValue);
-
-};
-
-#endif /* _IOKIT_IOAUDIOSELECTORCONTROL_H */
diff --git a/i386/include/IOKit/audio/IOAudioStream.h b/i386/include/IOKit/audio/IOAudioStream.h
deleted file mode 100644
index 07f40be..0000000
--- a/i386/include/IOKit/audio/IOAudioStream.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOAUDIOSTREAM_H
-#define _IOKIT_IOAUDIOSTREAM_H
-
-#include <IOKit/IOService.h>
-#ifndef IOAUDIOFAMILY_SELF_BUILD
-#include <IOKit/audio/IOAudioEngine.h>
-#include <IOKit/audio/IOAudioTypes.h>
-#else
-#include "IOAudioEngine.h"
-#include "IOAudioTypes.h"
-#endif
-
-class OSSymbol;
-class OSArray;
-class OSDictionary;
-class OSSet;
-
-class IOCommandGate;
-class IOAudioControl;
-
-typedef struct IOAudioClientBuffer;
-typedef struct IOAudioStreamFormatDesc;
-
-/*!
- * @class IOAudioStream
- * @abstract This class wraps a single sample buffer in an audio driver.
- * @discussion An IOAudioStream represents one hardware sample buffer as well as the direction
- *  of that buffer, the mix buffer that multiple clients mix into as well as a list of
- *  all of the formats to which this buffer can be set.
- *
- *  When an IOAudioEngine is created during init time in the driver, an IOAudioStream must be
- *  created for each sample buffer in the device.  Typically, the sample buffer will be interleaved 
- *  (or single channel), as a non-interleaved buffer should be divided into multiple single-channel
- *  buffers (and multiple IOAudioStreams).
- *
- *  Additionally, when an IOAudioStream is created it must have all of the possible formats (and
- *  allowed sample rates for each format) set and must have the currently set format specified
- *  (addAvailableFormat() and setFormat()).
- */
-
-class IOAudioStream : public IOService
-{
-    OSDeclareDefaultStructors(IOAudioStream)
-    
-    friend class IOAudioEngine;
-    friend class IOAudioEngineUserClient;
-
-public:
-
-    typedef IOReturn (*AudioIOFunction)(const void *mixBuf, void *sampleBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
-    
-    static const OSSymbol	*gDirectionKey;
-    static const OSSymbol	*gNumChannelsKey;
-    static const OSSymbol	*gSampleFormatKey;
-    static const OSSymbol	*gNumericRepresentationKey;
-    static const OSSymbol	*gBitDepthKey;
-    static const OSSymbol	*gBitWidthKey;
-    static const OSSymbol	*gAlignmentKey;
-    static const OSSymbol	*gByteOrderKey;
-    static const OSSymbol	*gIsMixableKey;
-    static const OSSymbol	*gDriverTagKey;
-    static const OSSymbol	*gMinimumSampleRateKey;
-    static const OSSymbol	*gMaximumSampleRateKey;
-
-    static void initKeys();
-
-    static OSDictionary *createDictionaryFromFormat(const IOAudioStreamFormat *streamFormat, const IOAudioStreamFormatExtension *formatExtension, OSDictionary *formatDict = 0);
-    static IOAudioStreamFormat *createFormatFromDictionary(const OSDictionary *formatDict, IOAudioStreamFormat *streamFormat = 0, IOAudioStreamFormatExtension *formatExtension = 0);
-
-    IOAudioEngine 				*audioEngine;
-    IOWorkLoop					*workLoop;
-    IOCommandGate				*commandGate;
-    IORecursiveLock				*streamIOLock;
-    
-    UInt32						numClients;
-
-    IOAudioStreamDirection		direction;
-
-    IOAudioStreamFormat			format;
-    IOAudioStreamFormatDesc		*availableFormats;
-    OSArray						*availableFormatDictionaries;
-    UInt32						numAvailableFormats;
-    
-    UInt32						startingChannelID;
-    UInt32						maxNumChannels;
-    
-    void						*sampleBuffer;
-    UInt32						sampleBufferSize;
-
-    void						*mixBuffer;
-    UInt32						mixBufferSize;
-    bool						streamAllocatedMixBuffer;
-    
-    AudioIOFunction				*audioIOFunctions;
-    UInt32						numIOFunctions;
-    
-    bool						streamAvailable;
-    
-    OSSet						*defaultAudioControls;
-    
-    IOAudioEnginePosition		startingPosition;
-    IOAudioEnginePosition		clippedPosition;
-    
-    IOAudioClientBuffer			*clientBufferListStart;
-    IOAudioClientBuffer			*clientBufferListEnd;
-    
-    IOAudioClientBuffer			*userClientList;
-	
-protected:
-
-    struct ExpansionData {
-		IOAudioStreamFormatExtension	streamFormatExtension;
-		UInt32							mSampleFramesReadByEngine;
-		IOReturn						mClipOutputStatus;
-	};
-    
-    ExpansionData *reserved;
-
-public:
-// New code added here:
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 0);
-    virtual const IOAudioStreamFormatExtension *getFormatExtension();
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 1);
-    virtual IOReturn setFormat(const IOAudioStreamFormat *streamFormat, const IOAudioStreamFormatExtension *formatExtension, bool callDriver = true);
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 2);
-    virtual IOReturn setFormat(const IOAudioStreamFormat *streamFormat, const IOAudioStreamFormatExtension *formatExtension, OSDictionary *formatDict, bool callDriver = true);
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 3);
-    virtual void addAvailableFormat(const IOAudioStreamFormat *streamFormat, const IOAudioStreamFormatExtension *formatExtension, const IOAudioSampleRate *minRate, const IOAudioSampleRate *maxRate, const AudioIOFunction *ioFunctionList = NULL, UInt32 numFunctions = 0);
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 4);
-    virtual void addAvailableFormat(const IOAudioStreamFormat *streamFormat, const IOAudioStreamFormatExtension *formatExtension, const IOAudioSampleRate *minRate, const IOAudioSampleRate *maxRate, AudioIOFunction ioFunction);
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 5);
-    virtual bool validateFormat(IOAudioStreamFormat *streamFormat, IOAudioStreamFormatExtension *formatExtension, IOAudioStreamFormatDesc *formatDesc);
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 6);
-	virtual void setTerminalType(const UInt32 terminalType);
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 7);
-	virtual IOReturn mixOutputSamples(const void *sourceBuf, void *mixBuf, UInt32 firstSampleFrame, UInt32 numSampleFrames, const IOAudioStreamFormat *streamFormat, IOAudioStream *audioStream);
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 8);
-	virtual void setSampleLatency(UInt32 numSamples);
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 9);
-	virtual bool validateFormat(IOAudioStreamFormat *streamFormat, IOAudioStreamFormatExtension *formatExtension, IOAudioStreamFormatDesc *formatDesc, const IOAudioSampleRate *sampleRate);
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 10);
-	virtual UInt32 getNumSampleFramesRead();
-	// OSMetaClassDeclareReservedUsed(IOAudioStream, 11);
-	virtual void setDefaultNumSampleFramesRead(UInt32);
-
-private:
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 0);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 1);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 2);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 3);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 4);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 5);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 6);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 7);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 8);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 9);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 10);
-    OSMetaClassDeclareReservedUsed(IOAudioStream, 11);
-
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 12);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 13);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 14);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 15);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 16);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 17);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 18);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 19);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 20);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 21);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 22);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 23);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 24);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 25);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 26);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 27);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 28);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 29);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 30);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 31);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 32);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 33);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 34);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 35);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 36);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 37);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 38);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 39);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 40);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 41);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 42);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 43);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 44);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 45);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 46);
-    OSMetaClassDeclareReservedUnused(IOAudioStream, 47);
-
-public:
-    virtual bool initWithAudioEngine(IOAudioEngine *engine, IOAudioStreamDirection dir, UInt32 startChannelID, const char *streamDescription = NULL, OSDictionary *properties = 0);
-    virtual void free();
-    
-    virtual void stop(IOService *provider);
-    
-    virtual IOWorkLoop *getWorkLoop() const;
-
-    virtual IOReturn setProperties(OSObject *properties);
-
-    virtual IOAudioStreamDirection getDirection();
-
-    virtual void setSampleBuffer(void *buffer, UInt32 size);
-    virtual void *getSampleBuffer();
-    virtual UInt32 getSampleBufferSize();
-    
-    virtual void setMixBuffer(void *buffer, UInt32 size);
-    virtual void *getMixBuffer();
-    virtual UInt32 getMixBufferSize();
-    
-    virtual void numSampleFramesPerBufferChanged();
-
-    virtual void clearSampleBuffer();
-    
-    virtual void setIOFunction(AudioIOFunction ioFunction);
-    virtual void setIOFunctionList(const AudioIOFunction *ioFunctionList, UInt32 numFunctions);
-
-    virtual const IOAudioStreamFormat *getFormat();
-    static IOReturn setFormatAction(OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4);
-    virtual IOReturn setFormat(const IOAudioStreamFormat *streamFormat, bool callDriver = true);
-    virtual IOReturn setFormat(OSDictionary *formatDict);
-    virtual IOReturn setFormat(const IOAudioStreamFormat *streamFormat, OSDictionary *formatDict, bool callDriver = true);
-    virtual IOReturn hardwareFormatChanged(const IOAudioStreamFormat *streamFormat);
-    virtual void addAvailableFormat(const IOAudioStreamFormat *streamFormat, const IOAudioSampleRate *minRate, const IOAudioSampleRate *maxRate, const AudioIOFunction *ioFunctionList = NULL, UInt32 numFunctions = 0);
-    virtual void addAvailableFormat(const IOAudioStreamFormat *streamFormat, const IOAudioSampleRate *minRate, const IOAudioSampleRate *maxRate, AudioIOFunction ioFunction);
-    virtual void clearAvailableFormats();
-    virtual bool validateFormat(IOAudioStreamFormat *streamFormat, IOAudioStreamFormatDesc *formatDesc);
-    
-    virtual UInt32 getStartingChannelID();
-    virtual UInt32 getMaxNumChannels();
-    
-    virtual void setStreamAvailable(bool available);
-    virtual bool getStreamAvailable();
-    
-    virtual IOReturn addDefaultAudioControl(IOAudioControl *defaultAudioControl);
-    virtual void removeDefaultAudioControls();
-
-protected:
-    virtual void lockStreamForIO();
-    virtual void unlockStreamForIO();
-    
-    virtual void updateNumClients();
-    virtual IOReturn addClient(IOAudioClientBuffer *clientBuffer);
-    virtual void removeClient(IOAudioClientBuffer *clientBuffer);
-    virtual UInt32 getNumClients();
-    
-    virtual IOReturn processOutputSamples(IOAudioClientBuffer *clientBuffer, UInt32 firstSampleFrame, UInt32 loopCount, bool samplesAvailable);
-    virtual IOReturn readInputSamples(IOAudioClientBuffer *clientBuffer, UInt32 firstSampleFrame);
-    
-    virtual void resetClipInfo();
-    virtual void clipIfNecessary();
-    virtual void clipOutputSamples(UInt32 startingSampleFrame, UInt32 numSampleFrames);
-    
-    virtual void setStartingChannelNumber(UInt32 channelNumber);
-
-private:
-    virtual void setDirection(IOAudioStreamDirection dir);
-
-};
-
-#endif /* _IOKIT_IOAUDIOSTREAM_H */
diff --git a/i386/include/IOKit/audio/IOAudioToggleControl.h b/i386/include/IOKit/audio/IOAudioToggleControl.h
deleted file mode 100644
index 95bfb4a..0000000
--- a/i386/include/IOKit/audio/IOAudioToggleControl.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*   
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *   
- * @APPLE_LICENSE_HEADER_START@
- *   
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *  
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *  
- * @APPLE_LICENSE_HEADER_END@
- */  
-
-#ifndef _IOKIT_IOAUDIOTOGGLECONTROL_H
-#define _IOKIT_IOAUDIOTOGGLECONTROL_H
-
-#ifndef IOAUDIOFAMILY_SELF_BUILD
-#include <IOKit/audio/IOAudioControl.h>
-#else
-#include "IOAudioControl.h"
-#endif
-
-/*!
- * @class IOAudioToggleControl
- */
-
-class IOAudioToggleControl : public IOAudioControl
-{
-    OSDeclareDefaultStructors(IOAudioToggleControl)
-
-protected:
-    struct ExpansionData { };
-    
-    ExpansionData *reserved;
-
-// New code added here
-public:
-    /*!
-     * @function createPassThruMuteControl
-     * @abstract Allocates a new pass through mute control with the given attributes
-     * @param initialValue The initial value of the control
-     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
-     * @param channelName An optional name for the channel.  Common names are located in IOAudioPort.h.
-     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls
-     * @result Returns a newly allocated and initialized mute IOAudioControl
-     */
-	static IOAudioToggleControl *createPassThruMuteControl (bool initialValue,
-																UInt32 channelID,
-																const char *channelName,
-																UInt32 cntrlID);
-
-private:
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 0);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 1);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 2);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 3);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 4);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 5);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 6);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 7);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 8);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 9);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 10);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 11);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 12);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 13);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 14);
-    OSMetaClassDeclareReservedUnused(IOAudioToggleControl, 15);
-
-public:
-    /*!
-     * @function create
-     * @abstract Allocates a new mute control with the given attributes
-     * @param initialValue The initial value of the control
-     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
-     * @param channelName An optional name for the channel.  Common names are located in IOAudioPort.h.
-     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls
-     * @result Returns a newly allocated and initialized mute IOAudioControl
-     */
-    static IOAudioToggleControl *create(bool initialValue,
-                                        UInt32 channelID,
-                                        const char *channelName = 0,
-                                        UInt32 cntrlID = 0,
-                                        UInt32 subType = 0,
-                                        UInt32 usage = 0);
-                                      
-    static IOAudioToggleControl *createMuteControl(bool initialValue,
-                                                    UInt32 channelID,
-                                                    const char *channelName = 0,
-                                                    UInt32 cntrlID = 0,
-                                                    UInt32 usage = 0);
-
-    /*!
-     * @function init
-     * @abstract Initializes a newly allocated IOAudioToggleControl with the given attributes
-     * @param initialValue The initial value of the control
-     * @param channelID The ID of the channel(s) that the control acts on.  Common IDs are located in IOAudioTypes.h.
-     * @param channelName An optional name for the channel.  Common names are located in IOAudioPort.h.
-     * @param cntrlID An optional ID for the control that can be used to uniquely identify controls
-     * @result Returns truen on success
-     */
-    virtual bool init(bool initialValue,
-                      UInt32 channelID, 
-                      const char *channelName = 0,
-                      UInt32 cntrlID = 0,
-                      UInt32 subType = 0,
-                      UInt32 usage = 0,
-                      OSDictionary *properties = 0);
-
-};
-
-#endif /* _IOKIT_IOAUDIOTOGGLECONTROL_H */
diff --git a/i386/include/IOKit/audio/IOAudioTypes.h b/i386/include/IOKit/audio/IOAudioTypes.h
deleted file mode 100644
index 0526575..0000000
--- a/i386/include/IOKit/audio/IOAudioTypes.h
+++ /dev/null
@@ -1,661 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOAUDIOTYPES_H
-#define _IOKIT_IOAUDIOTYPES_H
-
-#include <libkern/OSTypes.h>
-#include <mach/message.h>
-#include <device/device_types.h>
-
-
-/*!
- * @enum IOAudioEngineMemory
- * @abstract Used to identify the type of memory requested by a client process to be mapped into its process space
- * @discussion This is the parameter to the type field of IOMapMemory when called on an IOAudioEngine.  This is
- *  only intended for use by the Audio Device API library.
- * @constant kIOAudioSampleBuffer This requests the IOAudioEngine's sample buffer
- * @constant kIOAudioStatusBuffer This requests the IOAudioEngine's status buffer.  It's type is IOAudioEngineStatus.
- * @constant kIOAudioMixBuffer This requests the IOAudioEngine's mix buffer
-*/
-typedef enum _IOAudioEngineMemory {
-    kIOAudioStatusBuffer 			= 0,
-    kIOAudioSampleBuffer			= 1,
-    kIOAudioMixBuffer				= 2,
-	kIOAudioBytesInInputBuffer		= 3,
-	kIOAudioBytesInOutputBuffer		= 4
-} IOAudioEngineMemory;
-
-/*!
- * @enum IOAudioEngineCalls
- * @abstract The set of constants passed to IOAudioEngineUserClient::getExternalMethodForIndex() when making calls
- *  from the IOAudioFamily user client code.
- */
-typedef enum _IOAudioEngineCalls {
-    kIOAudioEngineCallRegisterClientBuffer			= 0,
-    kIOAudioEngineCallUnregisterClientBuffer		= 1,
-    kIOAudioEngineCallGetConnectionID				= 2,
-    kIOAudioEngineCallStart							= 3,
-    kIOAudioEngineCallStop							= 4,
-	kIOAudioEngineCallGetNearestStartTime			= 5
-} IOAudioEngineCalls;
-
-/*! @defined kIOAudioEngineNumCalls The number of elements in the IOAudioEngineCalls enum. */
-#define kIOAudioEngineNumCalls		6
-
-typedef enum _IOAudioEngineTraps {
-    kIOAudioEngineTrapPerformClientIO				= 0
-} IOAudioEngineTraps;
-
-typedef enum _IOAudioEngineNotifications {
-    kIOAudioEngineAllNotifications 					= 0,
-    kIOAudioEngineStreamFormatChangeNotification	= 1,
-    kIOAudioEngineChangeNotification 				= 2,
-    kIOAudioEngineStartedNotification 				= 3,
-    kIOAudioEngineStoppedNotification 				= 4,
-    kIOAudioEnginePausedNotification				= 5,
-    kIOAudioEngineResumedNotification				= 6
-} IOAudioEngineNotifications;
-
-/*!
- * @enum IOAudioEngineState
- * @abstract Represents the state of an IOAudioEngine
- * @constant kIOAudioEngineRunning The IOAudioEngine is currently running - it is transferring data to or 
- *           from the device.
- * @constant kIOAudioEngineStopped The IOAudioEngine is currently stopped - no activity is occurring.
- */
-
-typedef enum _IOAudioEngineState {
-    kIOAudioEngineStopped							= 0,
-    kIOAudioEngineRunning							= 1,
-    kIOAudioEnginePaused							= 2,
-    kIOAudioEngineResumed							= 3
-} IOAudioEngineState;
-
-
-/*!
- * @typedef IOAudioEngineStatus
- * @abstract Shared-memory structure giving audio engine status
- * @discussion
- * @field fVersion Indicates version of this structure
- * @field fCurrentLoopCount Number of times around the ring buffer since the audio engine started
- * @field fLastLoopTime Timestamp of the last time the ring buffer wrapped
- * @field fEraseHeadSampleFrame Location of the erase head in sample frames - erased up to but not
- *        including the given sample frame
- */
-
-typedef struct _IOAudioEngineStatus {
-    UInt32					fVersion;
-    volatile UInt32			fCurrentLoopCount;
-    volatile AbsoluteTime                    fLastLoopTime;
-    volatile UInt32			fEraseHeadSampleFrame;
-} IOAudioEngineStatus;
-
-#define kIOAudioEngineCurrentStatusStructVersion		2
-
-typedef struct _IOAudioStreamFormat {
-    UInt32	fNumChannels;
-    UInt32	fSampleFormat;
-    UInt32	fNumericRepresentation;
-    UInt8	fBitDepth;
-    UInt8	fBitWidth;
-    UInt8	fAlignment;
-    UInt8	fByteOrder;
-    UInt8	fIsMixable;
-    UInt32	fDriverTag;
-} IOAudioStreamFormat;
-
-#define kFormatExtensionInvalidVersion					0
-#define kFormatExtensionCurrentVersion					1
-
-typedef struct _IOAudioStreamFormatExtension {
-    UInt32	fVersion;
-    UInt32	fFlags;
-    UInt32	fFramesPerPacket;
-    UInt32	fBytesPerPacket;
-} IOAudioStreamFormatExtension;
-
-typedef struct _IOAudioBufferDataDescriptor {
-	UInt32	fActualDataByteSize;
-	UInt32	fActualNumSampleFrames;
-	UInt32	fTotalDataByteSize;
-	UInt32	fNominalDataByteSize;
-	UInt8	fData[1];
-} IOAudioBufferDataDescriptor;
-
-#define kStreamDataDescriptorInvalidVersion				0
-#define kStreamDataDescriptorCurrentVersion				1
-
-typedef struct _IOAudioStreamDataDescriptor {
-    UInt32	fVersion;
-    UInt32	fNumberOfStreams;
-    UInt32	fStreamLength[1];			// Array with fNumberOfStreams number of entries
-} IOAudioStreamDataDescriptor;
-
-typedef struct _IOAudioSampleIntervalDescriptor {
-	UInt32	sampleIntervalHi;
-	UInt32	sampleIntervalLo;
-} IOAudioSampleIntervalDescriptor;
-
-/*!
-    @struct         SMPTETime
-    @abstract       A structure for holding a SMPTE time.
-    @field          fSubframes
-                        The number of subframes in the full message.
-    @field          fSubframeDivisor
-                        The number of subframes per frame (typically 80).
-    @field          fCounter
-                        The total number of messages received.
-    @field          fType
-                        The kind of SMPTE time using the SMPTE time type constants.
-    @field          fFlags
-                        A set of flags that indicate the SMPTE state.
-    @field          fHours
-                        The number of hourse in the full message.
-    @field          fMinutes
-                        The number of minutes in the full message.
-    @field          fSeconds
-                        The number of seconds in the full message.
-    @field          fFrames
-                        The number of frames in the full message.
-*/
-typedef struct _IOAudioSMPTETime
-{
-    SInt16  fSubframes;
-    SInt16  fSubframeDivisor;
-    UInt32  fCounter;
-    UInt32  fType;
-    UInt32  fFlags;
-    SInt16  fHours;
-    SInt16  fMinutes;
-    SInt16  fSeconds;
-    SInt16  fFrames;
-
-} IOAudioSMPTETime;
-
-//	constants describing SMPTE types (taken from the MTC spec)
-enum
-{
-	kIOAudioSMPTETimeType24			= 0,
-	kIOAudioSMPTETimeType25			= 1,
-	kIOAudioSMPTETimeType30Drop		= 2,
-	kIOAudioSMPTETimeType30			= 3,
-	kIOAudioSMPTETimeType2997		= 4,
-	kIOAudioSMPTETimeType2997Drop	= 5
-};
-
-//	flags describing a SMPTE time stamp
-enum
-{
-	kIOAudioSMPTETimeValid		= (1L << 0),	//	the full time is valid
-	kIOAudioSMPTETimeRunning	= (1L << 1)		//	time is running
-};
-
-//	A struct for encapsulating the parts of a time stamp. The flags
-//	say which fields are valid.
-typedef struct _IOAudioTimeStamp
-{
-	UInt64				fSampleTime;	//	the absolute sample time, was a Float64
-	UInt64				fHostTime;		//	the host's root timebase's time
-	UInt64				fRateScalar;	//	the system rate scalar, was a Float64
-	UInt64				fWordClockTime;	//	the word clock time
-	IOAudioSMPTETime	fSMPTETime;		//	the SMPTE time
-	UInt32				fFlags;			//	the flags indicate which fields are valid
-	UInt32				fReserved;		//	reserved, pads the structure out to force 8 byte alignment
-} IOAudioTimeStamp;
-
-//	flags for the AudioTimeStamp sturcture
-enum
-{
-	kIOAudioTimeStampSampleTimeValid	= (1L << 0),
-	kIOAudioTimeStampHostTimeValid		= (1L << 1),
-	kIOAudioTimeStampRateScalarValid	= (1L << 2),
-	kIOAudioTimeStampWordClockTimeValid	= (1L << 3),
-	kIOAudioTimeStampSMPTETimeValid		= (1L << 4)
-};
-
-//	Some commonly used combinations of timestamp flags
-enum
-{
-	kIOAudioTimeStampSampleHostTimeValid	= (kIOAudioTimeStampSampleTimeValid | kIOAudioTimeStampHostTimeValid)
-};
-
-/*!
-* @enum IOAudioStreamDirection
- * @abstract Represents the direction of an IOAudioStream
- * @constant kIOAudioStreamDirectionOutput Output buffer
- * @constant kIOAudioStreamDirectionInput Input buffer
- */
-
-typedef enum _IOAudioStreamDirection {
-    kIOAudioStreamDirectionOutput	= 0,
-    kIOAudioStreamDirectionInput	= 1
-} IOAudioStreamDirection;
-
-enum {
-	kIOAudioDeviceCanBeDefaultNothing	= 0,
-	kIOAudioDeviceCanBeDefaultInput		= (1L << 0),
-	kIOAudioDeviceCanBeDefaultOutput	= (1L << 1),
-	kIOAudioDeviceCanBeSystemOutput		= (1L << 2)
-};
-
-/*!
- * @defined kIOAudioEngineDefaultMixBufferSampleSize
- */
-
-#define kIOAudioEngineDefaultMixBufferSampleSize		sizeof(float)
-
-/* The following are for use only by the IOKit.framework audio family code */
-
-/*!
- * @enum IOAudioControlCalls
- * @abstract The set of constants passed to IOAudioControlUserClient::getExternalMethodForIndex() when making calls
- *  from the IOAudioFamily user client code.
- * @constant kIOAudioControlCallSetValue Used to set the value of an IOAudioControl.
- * @constant kIOAudioControlCallGetValue Used to get the value of an IOAudioControl.
- */
-typedef enum _IOAudioControlCalls {
-    kIOAudioControlCallSetValue = 0,
-    kIOAudioControlCallGetValue = 1
-} IOAudioControlCalls;
-
-/*! @defined kIOAudioControlNumCalls The number of elements in the IOAudioControlCalls enum. */
-#define kIOAudioControlNumCalls 	2
-
-/*!
- * @enum IOAudioControlNotifications
- * @abstract The set of constants passed in the type field of IOAudioControlUserClient::registerNotificaitonPort().
- * @constant kIOAudioControlValueChangeNotification Used to request value change notifications.
- * @constant kIOAudioControlRangeChangeNotification Used to request range change notifications.
- */
-typedef enum _IOAudioControlNotifications {
-    kIOAudioControlValueChangeNotification = 0,
-	kIOAudioControlRangeChangeNotification = 1
-} IOAudioControlNotifications;
-
-/*!
- * @struct IOAudioNotificationMessage
- * @abstract Used in the mach message for IOAudio notifications.
- * @field messageHeader Standard mach message header
- * @field ref The param passed to registerNotificationPort() in refCon.
- */
-typedef struct _IOAudioNotificationMessage {
-    mach_msg_header_t	messageHeader;
-    UInt32		type;
-    UInt32		ref;
-    void *		sender;
-} IOAudioNotificationMessage;
-
-typedef struct _IOAudioSampleRate {
-    UInt32	whole;
-    UInt32	fraction;
-} IOAudioSampleRate;
-
-#define kNoIdleAudioPowerDown		0xffffffffffffffffULL
-
-enum {
-    kIOAudioPortTypeOutput		= 'outp',
-    kIOAudioPortTypeInput		= 'inpt',
-    kIOAudioPortTypeMixer		= 'mixr',
-    kIOAudioPortTypePassThru	= 'pass',
-    kIOAudioPortTypeProcessing	= 'proc'
-};
-
-enum {
-    kIOAudioOutputPortSubTypeInternalSpeaker	= 'ispk',
-    kIOAudioOutputPortSubTypeExternalSpeaker	= 'espk',
-    kIOAudioOutputPortSubTypeHeadphones			= 'hdpn',
-    kIOAudioOutputPortSubTypeLine				= 'line',
-    kIOAudioOutputPortSubTypeSPDIF				= 'spdf',
-    
-    kIOAudioInputPortSubTypeInternalMicrophone	= 'imic',
-    kIOAudioInputPortSubTypeExternalMicrophone	= 'emic',
-    kIOAudioInputPortSubTypeCD					= 'cd  ',
-    kIOAudioInputPortSubTypeLine				= 'line',
-    kIOAudioInputPortSubTypeSPDIF				= 'spdf'
-};
-
-enum {
-    kIOAudioControlTypeLevel			= 'levl',
-    kIOAudioControlTypeToggle			= 'togl',
-	kIOAudioControlTypeJack				= 'jack',
-    kIOAudioControlTypeSelector			= 'slct'
-};
-
-enum {
-    kIOAudioLevelControlSubTypeVolume						= 'vlme',
-	kIOAudioLevelControlSubTypeLFEVolume					= 'subv',
-	kIOAudioLevelControlSubTypePRAMVolume					= 'pram',
-    kIOAudioToggleControlSubTypeMute						= 'mute',
-    kIOAudioToggleControlSubTypeSolo						= 'solo',
-	kIOAudioToggleControlSubTypeLFEMute						= 'subm',
-	kIOAudioToggleControlSubTypeiSubAttach					= 'atch',
-    kIOAudioSelectorControlSubTypeOutput					= 'outp',
-    kIOAudioSelectorControlSubTypeInput						= 'inpt',
-    kIOAudioSelectorControlSubTypeClockSource				= 'clck',
-    kIOAudioSelectorControlSubTypeDestination				= 'dest',
-	kIOAudioSelectorControlSubTypeChannelNominalLineLevel	= 'nlev',
-	kIOAudioSelectorControlSubTypeChannelLevelPlus4dBu		= '4dbu',
-	kIOAudioSelectorControlSubTypeChannelLevelMinus10dBV	= '10db',
-	kIOAudioSelectorControlSubTypeChannelLevelMinus20dBV	= '20db',
-	kIOAudioSelectorControlSubTypeChannelLevelMicLevel		= 'micl',
-	kIOAudioSelectorControlSubTypeChannelLevelInstrumentLevel		= 'istl'
-};
-
-enum {
-    kIOAudioControlUsageOutput				= 'outp',
-    kIOAudioControlUsageInput				= 'inpt',
-    kIOAudioControlUsagePassThru			= 'pass',
-    kIOAudioControlUsageCoreAudioProperty	= 'prop'
-};
-
-enum {
-    kIOAudioControlChannelNumberInactive				= -1,
-    kIOAudioControlChannelIDAll							= 0,
-    kIOAudioControlChannelIDDefaultLeft					= 1,
-    kIOAudioControlChannelIDDefaultRight				= 2,
-    kIOAudioControlChannelIDDefaultCenter				= 3,
-    kIOAudioControlChannelIDDefaultLeftRear				= 4,
-    kIOAudioControlChannelIDDefaultRightRear			= 5,
-    kIOAudioControlChannelIDDefaultSub					= 6,
-    kIOAudioControlChannelIDDefaultFrontLeftCenter		= 7,
-    kIOAudioControlChannelIDDefaultFrontRightCenter		= 8,
-    kIOAudioControlChannelIDDefaultRearCenter			= 9,
-    kIOAudioControlChannelIDDefaultSurroundLeft			= 10,
-    kIOAudioControlChannelIDDefaultSurroundRight		= 11
-};
-
-enum {
-    kIOAudioSelectorControlSelectionValueNone				= 'none',
-    
-    // Output-specific selection IDs 
-    kIOAudioSelectorControlSelectionValueInternalSpeaker	= 'ispk',
-    kIOAudioSelectorControlSelectionValueExternalSpeaker	= 'espk',
-    kIOAudioSelectorControlSelectionValueHeadphones			= 'hdpn',
-    
-    // Input-specific selection IDs
-    kIOAudioSelectorControlSelectionValueInternalMicrophone	= 'imic',
-    kIOAudioSelectorControlSelectionValueExternalMicrophone	= 'emic',
-    kIOAudioSelectorControlSelectionValueCD					= 'cd  ',
-    
-    // Common selection IDs
-    kIOAudioSelectorControlSelectionValueLine				= 'line',
-    kIOAudioSelectorControlSelectionValueSPDIF				= 'spdf'
-};
-
-enum {
-    kIOAudioStreamSampleFormatLinearPCM		= 'lpcm',
-    kIOAudioStreamSampleFormatIEEEFloat		= 'ieee',
-    kIOAudioStreamSampleFormatALaw			= 'alaw',
-    kIOAudioStreamSampleFormatMuLaw			= 'ulaw',
-    kIOAudioStreamSampleFormatMPEG			= 'mpeg',
-    kIOAudioStreamSampleFormatAC3			= 'ac-3',
-    kIOAudioStreamSampleFormat1937AC3		= 'cac3',
-    kIOAudioStreamSampleFormat1937MPEG1		= 'mpg1',
-    kIOAudioStreamSampleFormat1937MPEG2		= 'mpg2',
-	kIOAudioStreamSampleFormatTimeCode		= 'time'		//	a stream of IOAudioTimeStamp structures that capture any incoming time code information
-};
-
-enum {
-    kIOAudioStreamNumericRepresentationSignedInt	= 'sint',
-    kIOAudioStreamNumericRepresentationUnsignedInt	= 'uint',
-	kIOAudioStreamNumericRepresentationIEEE754Float = 'flot'
-};
-
-enum {
-	kIOAudioClockSelectorTypeInternal			= 'int ',
-	kIOAudioClockSelectorTypeExternal			= 'ext ',
-	kIOAudioClockSelectorTypeAESEBU				= 'asbu',
-	kIOAudioClockSelectorTypeTOSLink			= 'tosl',
-	kIOAudioClockSelectorTypeSPDIF				= 'spdf',
-	kIOAudioClockSelectorTypeADATOptical		= 'adto',
-	kIOAudioClockSelectorTypeADAT9Pin			= 'adt9',
-	kIOAudioClockSelectorTypeSMPTE				= 'smpt',
-	kIOAudioClockSelectorTypeVideo				= 'vdeo',
-	kIOAudioClockSelectorTypeControl			= 'cnrl',
-	kIOAudioClockSelectorTypeOther				= 'othr',
-};
-
-enum {
-    kIOAudioStreamAlignmentLowByte					= 0,
-    kIOAudioStreamAlignmentHighByte					= 1
-};
-
-enum {
-    kIOAudioStreamByteOrderBigEndian				= 0,
-    kIOAudioStreamByteOrderLittleEndian				= 1
-};
-
-enum {
-    kIOAudioLevelControlNegativeInfinity			= 0xffffffff
-};
-
-enum {
-    kIOAudioNewClockDomain							= 0xffffffff
-};
-
-// Device connection types
-#ifndef __OPEN_SOURCE__
-//	<rdar://7130813>	Added kIOAudioDeviceTransportTypeDisplayPort
-#endif
-enum {
-	kIOAudioDeviceTransportTypeBuiltIn				= 'bltn',
-	kIOAudioDeviceTransportTypePCI					= 'pci ',
-	kIOAudioDeviceTransportTypeUSB					= 'usb ',
-	kIOAudioDeviceTransportTypeFireWire				= '1394',
-	kIOAudioDeviceTransportTypeNetwork				= 'ntwk',
-	kIOAudioDeviceTransportTypeWireless				= 'wrls',
-	kIOAudioDeviceTransportTypeOther				= 'othr',
-	kIOAudioDeviceTransportTypeBluetooth			= 'blue',
-	kIOAudioDeviceTransportTypeVirtual				= 'virt',
-	kIOAudioDeviceTransportTypeDisplayPort			= 'dprt',
-	kIOAudioDeviceTransportTypeHdmi					= 'hdmi'
-
-};
-
-// types that go nowhere
-enum {
-	OUTPUT_NULL										= 0x0100,
-	INPUT_NULL										= 0x0101
-};
-
-// Input terminal types
-enum {
-	INPUT_UNDEFINED									= 0x0200,
-	INPUT_MICROPHONE								= 0x0201,
-	INPUT_DESKTOP_MICROPHONE						= 0x0202,
-	INPUT_PERSONAL_MICROPHONE						= 0x0203,
-	INPUT_OMNIDIRECTIONAL_MICROPHONE				= 0x0204,
-	INPUT_MICROPHONE_ARRAY							= 0x0205,
-	INPUT_PROCESSING_MICROPHONE_ARRAY				= 0x0206,
-	INPUT_MODEM_AUDIO								= 0x207
-};
-
-// Output terminal types
-enum {
-	OUTPUT_UNDEFINED								= 0x0300,
-	OUTPUT_SPEAKER									= 0x0301,
-	OUTPUT_HEADPHONES								= 0x0302,
-	OUTPUT_HEAD_MOUNTED_DISPLAY_AUDIO				= 0x0303,
-	OUTPUT_DESKTOP_SPEAKER							= 0x0304,
-	OUTPUT_ROOM_SPEAKER								= 0x0305,
-	OUTPUT_COMMUNICATION_SPEAKER					= 0x0306,
-	OUTPUT_LOW_FREQUENCY_EFFECTS_SPEAKER			= 0x0307
-};
-
-// Bi-directional terminal types
-enum {
-	BIDIRECTIONAL_UNDEFINED							= 0x0400,
-	BIDIRECTIONAL_HANDSET							= 0x0401,
-	BIDIRECTIONAL_HEADSET							= 0x0402,
-	BIDIRECTIONAL_SPEAKERPHONE_NO_ECHO_REDX			= 0x0403,
-	BIDIRECTIONAL_ECHO_SUPPRESSING_SPEAKERPHONE		= 0x0404,
-	BIDIRECTIONAL_ECHO_CANCELING_SPEAKERPHONE		= 0x0405
-};
-
-// Telephony terminal types
-enum {
-	TELEPHONY_UNDEFINED								= 0x0500,
-	TELEPHONY_PHONE_LINE							= 0x0501,
-	TELEPHONY_TELEPHONE								= 0x0502,
-	TELEPHONY_DOWN_LINE_PHONE						= 0x0503
-};
-
-// External terminal types
-enum {
-	EXTERNAL_UNDEFINED								= 0x0600,
-	EXTERNAL_ANALOG_CONNECTOR						= 0x0601,
-	EXTERNAL_DIGITAL_AUDIO_INTERFACE				= 0x0602,
-	EXTERNAL_LINE_CONNECTOR							= 0x0603,
-	EXTERNAL_LEGACY_AUDIO_CONNECTOR					= 0x0604,
-	EXTERNAL_SPDIF_INTERFACE						= 0x0605,
-	EXTERNAL_1394_DA_STREAM							= 0x0606,
-	EXTERNAL_1394_DV_STREAM_SOUNDTRACK				= 0x0607,
-	EXTERNAL_ADAT									= 0x0608,
-	EXTERNAL_TDIF									= 0x0609,
-	EXTERNAL_MADI									= 0x060A
-};
-
-// Embedded terminal types
-enum {
-	EMBEDDED_UNDEFINED								= 0x0700,
-	EMBEDDED_LEVEL_CALIBRATION_NOISE_SOURCE			= 0x0701,
-	EMBEDDED_EQUALIZATION_NOISE						= 0x0702,
-	EMBEDDED_CD_PLAYER								= 0x0703,
-	EMBEDDED_DAT									= 0x0704,
-	EMBEDDED_DCC									= 0x0705,
-	EMBEDDED_MINIDISK								= 0x0706,
-	EMBEDDED_ANALOG_TAPE							= 0x0707,
-	EMBEDDED_PHONOGRAPH								= 0x0708,
-	EMBEDDED_VCR_AUDIO								= 0x0709,
-	EMBEDDED_VIDEO_DISC_AUDIO						= 0x070A,
-	EMBEDDED_DVD_AUDIO								= 0x070B,
-	EMBEDDED_TV_TUNER_AUDIO							= 0x070C,
-	EMBEDDED_SATELLITE_RECEIVER_AUDIO				= 0x070D,
-	EMBEDDED_CABLE_TUNER_AUDIO						= 0x070E,
-	EMBEDDED_DSS_AUDIO								= 0x070F,
-	EMBEDDED_RADIO_RECEIVER							= 0x0710,
-	EMBEDDED_RADIO_TRANSMITTER						= 0x0711,
-	EMBEDDED_MULTITRACK_RECORDER					= 0x0712,
-	EMBEDDED_SYNTHESIZER							= 0x0713
-};
-
-// Processing terminal types
-enum {
-	PROCESSOR_UNDEFINED								= 0x0800,
-	PROCESSOR_GENERAL								= 0x0801
-};
-
-//	Channel spatial position types
-
-#ifndef __OPEN_SOURCE__
-//	<rdar://6868206>	NOTE: the following are derived from CoreAudioTypes.h
-#endif
-
-#define	kIOAudioChannelLabel_Discrete_field_ba		16
-enum {
-    kIOAudioChannelLabel_Unknown                  = 0xFFFFFFFF,   // unknown or unspecified other use
-    kIOAudioChannelLabel_Unused                   = 0,            // channel is present, but has no intended use or destination
-    kIOAudioChannelLabel_UseCoordinates           = 100,          // channel is described by the mCoordinates fields.
-	
-    kIOAudioChannelLabel_Left                     = 1,
-    kIOAudioChannelLabel_Right                    = 2,
-    kIOAudioChannelLabel_Center                   = 3,
-    kIOAudioChannelLabel_LFEScreen                = 4,
-    kIOAudioChannelLabel_LeftSurround             = 5,            // WAVE: "Back Left"
-    kIOAudioChannelLabel_RightSurround            = 6,            // WAVE: "Back Right"
-    kIOAudioChannelLabel_LeftCenter               = 7,
-    kIOAudioChannelLabel_RightCenter              = 8,
-    kIOAudioChannelLabel_CenterSurround           = 9,            // WAVE: "Back Center" or plain "Rear Surround"
-    kIOAudioChannelLabel_LeftSurroundDirect       = 10,           // WAVE: "Side Left"
-    kIOAudioChannelLabel_RightSurroundDirect      = 11,           // WAVE: "Side Right"
-    kIOAudioChannelLabel_TopCenterSurround        = 12,
-    kIOAudioChannelLabel_VerticalHeightLeft       = 13,           // WAVE: "Top Front Left"
-    kIOAudioChannelLabel_VerticalHeightCenter     = 14,           // WAVE: "Top Front Center"
-    kIOAudioChannelLabel_VerticalHeightRight      = 15,           // WAVE: "Top Front Right"
-	
-    kIOAudioChannelLabel_TopBackLeft              = 16,
-    kIOAudioChannelLabel_TopBackCenter            = 17,
-    kIOAudioChannelLabel_TopBackRight             = 18,
-	
-    kIOAudioChannelLabel_RearSurroundLeft         = 33,
-    kIOAudioChannelLabel_RearSurroundRight        = 34,
-    kIOAudioChannelLabel_LeftWide                 = 35,
-    kIOAudioChannelLabel_RightWide                = 36,
-    kIOAudioChannelLabel_LFE2                     = 37,
-    kIOAudioChannelLabel_LeftTotal                = 38,           // matrix encoded 4 channels
-    kIOAudioChannelLabel_RightTotal               = 39,           // matrix encoded 4 channels
-    kIOAudioChannelLabel_HearingImpaired          = 40,
-    kIOAudioChannelLabel_Narration                = 41,
-    kIOAudioChannelLabel_Mono                     = 42,
-    kIOAudioChannelLabel_DialogCentricMix         = 43,
-	
-    kIOAudioChannelLabel_CenterSurroundDirect     = 44,           // back center, non diffuse
-    
-    kIOAudioChannelLabel_Haptic                   = 45,
-	
-    // first order ambisonic channels
-    kIOAudioChannelLabel_Ambisonic_W              = 200,
-    kIOAudioChannelLabel_Ambisonic_X              = 201,
-    kIOAudioChannelLabel_Ambisonic_Y              = 202,
-    kIOAudioChannelLabel_Ambisonic_Z              = 203,
-	
-    // Mid/Side Recording
-    kIOAudioChannelLabel_MS_Mid                   = 204,
-    kIOAudioChannelLabel_MS_Side                  = 205,
-	
-    // X-Y Recording
-    kIOAudioChannelLabel_XY_X                     = 206,
-    kIOAudioChannelLabel_XY_Y                     = 207,
-	
-    // other
-    kIOAudioChannelLabel_HeadphonesLeft           = 301,
-    kIOAudioChannelLabel_HeadphonesRight          = 302,
-    kIOAudioChannelLabel_ClickTrack               = 304,
-    kIOAudioChannelLabel_ForeignLanguage          = 305,
-	
-    // generic discrete channel
-    kIOAudioChannelLabel_Discrete                 = 400,
-	
-    // numbered discrete channel
-    kIOAudioChannelLabel_Discrete_0               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 0,
-    kIOAudioChannelLabel_Discrete_1               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 1,
-    kIOAudioChannelLabel_Discrete_2               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 2,
-    kIOAudioChannelLabel_Discrete_3               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 3,
-    kIOAudioChannelLabel_Discrete_4               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 4,
-    kIOAudioChannelLabel_Discrete_5               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 5,
-    kIOAudioChannelLabel_Discrete_6               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 6,
-    kIOAudioChannelLabel_Discrete_7               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 7,
-    kIOAudioChannelLabel_Discrete_8               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 8,
-    kIOAudioChannelLabel_Discrete_9               = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 9,
-    kIOAudioChannelLabel_Discrete_10              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 10,
-    kIOAudioChannelLabel_Discrete_11              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 11,
-    kIOAudioChannelLabel_Discrete_12              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 12,
-    kIOAudioChannelLabel_Discrete_13              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 13,
-    kIOAudioChannelLabel_Discrete_14              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 14,
-    kIOAudioChannelLabel_Discrete_15              = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 15,
-    kIOAudioChannelLabel_Discrete_65535           = ( 1 << kIOAudioChannelLabel_Discrete_field_ba ) | 65535
-};
-
-
-
-#endif /* _IOKIT_IOAUDIOTYPES_H */
diff --git a/i386/include/IOKit/avc/IOFireWireAVCCommand.h b/i386/include/IOKit/avc/IOFireWireAVCCommand.h
deleted file mode 100644
index ff9850d..0000000
--- a/i386/include/IOKit/avc/IOFireWireAVCCommand.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 1998-2001 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _IOKIT_IOFireWireAVCCommand_H
-#define _IOKIT_IOFireWireAVCCommand_H
- 
-#include <IOKit/firewire/IOFWCommand.h>
-
-/*! @class IOFireWireAVCCommand
-*/
-class IOFireWireAVCCommand : public IOFWCommand
-{
-    OSDeclareDefaultStructors(IOFireWireAVCCommand)
-    
-protected:
-    IOFWCommand 		*fWriteCmd;
-    IOMemoryDescriptor	*fMem;
-    const UInt8 		*fCommand;
-    
-    UInt32 	fCmdLen;
-    UInt8 	*fResponse;
-    UInt32 	*fResponseLen;
-    int		fCurRetries;
-    int		fMaxRetries;
-    
-    UInt32	fWriteGen;
-    UInt16	fWriteNodeID;
-    bool	bypassRobustCommandResponseMatching;
-	
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { 
-		bool 	fStarted;
-		bool 	fSyncWakeupSignaled;
-	};
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *fIOFireWireAVCCommandExpansion;
-    
-    static void writeDone(void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd);
-    
-    virtual IOReturn	complete(IOReturn status);
-    virtual IOReturn	execute();
-    virtual void		free();
-    
-public:
-    virtual bool init(IOFireWireNub *device, const UInt8 * command, UInt32 cmdLen,
-                                                    UInt8 * response, UInt32 * responseLen);
-    virtual IOReturn reinit(IOFireWireNub *device, const UInt8 * command, UInt32 cmdLen,
-                                                    UInt8 * response, UInt32 * responseLen);
-                                                    
-    static IOFireWireAVCCommand *withNub(IOFireWireNub *device, const UInt8 * command, UInt32 cmdLen,
-                                                    UInt8 * response, UInt32 * responseLen);
-                                                    
-    static IOFireWireAVCCommand *withNub(IOFireWireNub *device, UInt32 generation,
-                const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 * responseLen);
-                                                    
-    virtual UInt32 handleResponse(UInt16 nodeID, UInt32 len, const void *buf);
-
-    virtual IOReturn resetInterimTimeout();
-
-	virtual UInt32 handleResponseWithSimpleMatching(UInt16 nodeID, UInt32 len, const void *buf);
-
-    virtual IOReturn 	submit(bool queue = false);
-
-private:
-    OSMetaClassDeclareReservedUsed(IOFireWireAVCCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCCommand, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCCommand, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCCommand, 3);
-};
-
-#endif // _IOKIT_IOFireWireAVCCommand_H
-
diff --git a/i386/include/IOKit/avc/IOFireWireAVCConsts.h b/i386/include/IOKit/avc/IOFireWireAVCConsts.h
deleted file mode 100644
index ae7a12c..0000000
--- a/i386/include/IOKit/avc/IOFireWireAVCConsts.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 1998-2001 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _IOKIT_IOFIREWIREAVCCONSTS_H
-#define _IOKIT_IOFIREWIREAVCCONSTS_H
-
-// Fields of AVC frame
-typedef enum {
-    kAVCCommandResponse = 0,
-    kAVCAddress = 1,
-    kAVCOpcode = 2,
-    kAVCOperand0 = 3,
-    kAVCOperand1 = 4,
-    kAVCOperand2 = 5,
-    kAVCOperand3 = 6,
-    kAVCOperand4 = 7,
-    kAVCOperand5 = 8,
-    kAVCOperand6 = 9,
-    kAVCOperand7 = 10,
-    kAVCOperand8 = 11
-} IOAVCFrameFields;
-
-// Command/Response values
-typedef enum {
-    kAVCControlCommand                      = 0x00,
-    kAVCStatusInquiryCommand                = 0x01,
-    kAVCSpecificInquiryCommand				= 0x02,
-    kAVCNotifyCommand						= 0x03,
-    kAVCGeneralInquiryCommand				= 0x04,
-    kAVCNotImplementedStatus				= 0x08,
-    kAVCAcceptedStatus						= 0x09,
-    kAVCRejectedStatus						= 0x0a,
-    kAVCInTransitionStatus					= 0x0b,
-    kAVCImplementedStatus					= 0x0c,
-    kAVCChangedStatus						= 0x0d,
-    kAVCInterimStatus						= 0x0f
-} IOAVCCommandResponse;
-
-// Opcodes
-typedef enum {
-
-    // Unit commands
-    kAVCPlugInfoOpcode						= 0x02,
-    kAVCOutputPlugSignalFormatOpcode		= 0x18,
-    kAVCInputPlugSignalFormatOpcode			= 0x19,
-    kAVCUnitInfoOpcode						= 0x30,
-    kAVCSubunitInfoOpcode					= 0x31,
-    kAVCConnectionsOpcode					= 0x22,
-    kAVCConnectOpcode						= 0x24,
-    kAVCDisconnectOpcode					= 0x25,
-    kAVCPowerOpcode							= 0xB2,
-	kAVCSignalSourceOpcode					= 0x1A,
-	
-    // Vendor dependent commands
-    kAVCVendorDependentOpcode				= 0x00,
-
-    // Subunit commands
-    kAVCOutputSignalModeOpcode              = 0x78,
-    kAVCInputSignalModeOpcode               = 0x79, 
-    kAVCSignalModeSD525_60                  = 0x00,
-    kAVCSignalModeSDL525_60                 = 0x04,
-    kAVCSignalModeHD1125_60                 = 0x08,
-    kAVCSignalModeSD625_50                  = 0x80, 
-    kAVCSignalModeSDL625_50                 = 0x84, 
-    kAVCSignalModeHD1250_50                 = 0x88,
-    kAVCSignalModeDVCPro525_60				= 0x78,
-    kAVCSignalModeDVCPro625_50				= 0xf8,
-    
-    kAVCSignalModeDummyOperand              = 0xff,
-    kAVCSignalModeMask_50					= 0x80,
-    kAVCSignalModeMask_STYPE				= 0x7c,          
-    kAVCSignalModeMask_SDL					= 0x04,          
-    kAVCSignalModeMask_DVCPro25				= 0x78        
-
-} IOAVCOpcodes;
-
-// Unit/Subunit types
-typedef enum {
-    kAVCVideoMonitor						= 0x00,
-    kAVCAudio								= 0x01,
-    kAVCPrinter								= 0x02,
-    kAVCDiskRecorder						= 0x03,
-    kAVCTapeRecorder						= 0x04,
-    kAVCTuner								= 0x05,
-    kAVCVideoCamera							= 0x07,
-    kAVCCameraStorage						= 0x0b,
-    kAVCVendorUnique						= 0x1c,
-    kAVCNumSubUnitTypes						= 0x20
-} IOAVCUnitTypes;
-
-#define kAVCAllOpcodes 0xFF
-#define kAVCAllSubunitsAndUnit 0xEE
-#define kAVCMaxNumPlugs 31
-#define kAVCAnyAvailableIsochPlug 0x7F
-#define kAVCAnyAvailableExternalPlug 0xFF
-#define kAVCAnyAvailableSubunitPlug 0xFF
-#define kAVCMultiplePlugs 0xFD
-#define kAVCInvalidPlug 0xFE
-
-
-#define IOAVCAddress(type, id) (((type) << 3) | (id))
-#define kAVCUnitAddress 0xff
-#define IOAVCType(address) ((address) >> 3)
-#define IOAVCId(address) ((address) & 0x7)
-
-// Macros for Plug Control Register field manipulation
-
-// Master control registers
-#define kIOFWPCRDataRate FWBitRange(0,1)
-#define kIOFWPCRDataRatePhase FWBitRangePhase(0,1)
-#define kIOFWPCRExtension FWBitRange(8,15)
-#define kIOFWPCRExtensionPhase FWBitRangePhase(8,15)
-#define kIOFWPCRNumPlugs FWBitRange(27,31)
-#define kIOFWPCRNumPlugsPhase FWBitRangePhase(27,31)
-
-// master output register
-#define kIOFWPCRBroadcastBase FWBitRange(2,7)
-#define kIOFWPCRBroadcastBasePhase FWBitRangePhase(2,7)
-
-// plug registers
-#define kIOFWPCROnline FWBitRange(0,0)
-#define kIOFWPCROnlinePhase FWBitRangePhase(0,0)
-#define kIOFWPCRBroadcast FWBitRange(1,1)
-#define kIOFWPCRBroadcastPhase FWBitRangePhase(1,1)
-#define kIOFWPCRP2PCount FWBitRange(2,7)
-#define kIOFWPCRP2PCountPhase FWBitRangePhase(2,7)
-#define kIOFWPCRChannel FWBitRange(10,15)
-#define kIOFWPCRChannelPhase FWBitRangePhase(10,15)
-
-// Extra fields for output plug registers
-#define kIOFWPCROutputDataRate FWBitRange(16,17)
-#define kIOFWPCROutputDataRatePhase FWBitRangePhase(16,17)
-#define kIOFWPCROutputOverhead FWBitRange(18,21)
-#define kIOFWPCROutputOverheadPhase FWBitRangePhase(18,21)
-#define kIOFWPCROutputPayload FWBitRange(22,31)
-#define kIOFWPCROutputPayloadPhase FWBitRangePhase(22,31)
-
-// async plug numbers
-
-enum
-{
-	kFWAVCAsyncPlug0 	= 0xa0,
-	kFWAVCAsyncPlug1 	= 0xa1,
-	kFWAVCAsyncPlug2 	= 0xa2,
-	kFWAVCAsyncPlug3 	= 0xa3,
-	kFWAVCAsyncPlug4 	= 0xa4,
-	kFWAVCAsyncPlug5 	= 0xa5,
-	kFWAVCAsyncPlug6 	= 0xa6,
-	kFWAVCAsyncPlug7 	= 0xa7,
-	kFWAVCAsyncPlug8 	= 0xa8,
-	kFWAVCAsyncPlug9 	= 0xa9,
-	kFWAVCAsyncPlug10 	= 0xa1,
-	kFWAVCAsyncPlug11	= 0xab,
-	kFWAVCAsyncPlug12 	= 0xac,
-	kFWAVCAsyncPlug13	= 0xad,
-	kFWAVCAsyncPlug14	= 0xae,
-	kFWAVCAsyncPlug15 	= 0xaf,
-	kFWAVCAsyncPlug16 	= 0xb0,
-	kFWAVCAsyncPlug17 	= 0xb1,
-	kFWAVCAsyncPlug18	= 0xb2,
-	kFWAVCAsyncPlug19 	= 0xb3,
-	kFWAVCAsyncPlug20 	= 0xb4,
-	kFWAVCAsyncPlug21 	= 0xb5,
-	kFWAVCAsyncPlug22 	= 0xb6,
-	kFWAVCAsyncPlug23 	= 0xb7,
-	kFWAVCAsyncPlug24 	= 0xb8,
-	kFWAVCAsyncPlug25 	= 0xb9,
-	kFWAVCAsyncPlug26 	= 0xba,
-	kFWAVCAsyncPlug27 	= 0xbb,
-	kFWAVCAsyncPlug28 	= 0xbc,
-	kFWAVCAsyncPlug29 	= 0xbd,
-	kFWAVCAsyncPlug30	= 0xbe,
-	kFWAVCAsyncPlugAny	= 0xbf
-};
-
-enum
-{
-    kFWAVCStateBusSuspended 	= 0,
-    kFWAVCStateBusResumed 		= 1,
-    kFWAVCStatePlugReconnected 	= 2,
-    kFWAVCStatePlugDisconnected = 3,
-    kFWAVCStateDeviceRemoved	= 4
-};
-
-enum
-{
-    kFWAVCConsumerMode_MORE		= 1,
-    kFWAVCConsumerMode_LAST		= 4,
-    kFWAVCConsumerMode_LESS		= 5,
-    kFWAVCConsumerMode_JUNK		= 6,
-    kFWAVCConsumerMode_LOST		= 7
-};
-
-enum
-{
-    kFWAVCProducerMode_SEND		= 5,
-    kFWAVCProducerMode_TOSS		= 7
-};
-
-
-typedef enum
-{
-	IOFWAVCPlugSubunitSourceType,
-	IOFWAVCPlugSubunitDestType,
-	IOFWAVCPlugIsochInputType,
-	IOFWAVCPlugIsochOutputType,
-	IOFWAVCPlugAsynchInputType,
-	IOFWAVCPlugAsynchOutputType,
-	IOFWAVCPlugExternalInputType,
-	IOFWAVCPlugExternalOutputType
-} IOFWAVCPlugTypes;
-
-typedef enum
-{
-	kIOFWAVCSubunitPlugMsgConnected,
-	kIOFWAVCSubunitPlugMsgDisconnected,
-	kIOFWAVCSubunitPlugMsgConnectedPlugModified,
-	kIOFWAVCSubunitPlugMsgSignalFormatModified
-} IOFWAVCSubunitPlugMessages;
-
-// Some plug signal formats
-#define kAVCPlugSignalFormatNTSCDV 0x80000000
-#define kAVCPlugSignalFormatPalDV 0x80800000 
-#define kAVCPlugSignalFormatMPEGTS 0xA0000000
-
-// Possible states of an AVCAsynchronousCommand
-typedef enum
-{
-	kAVCAsyncCommandStatePendingRequest,
-	kAVCAsyncCommandStateRequestSent,
-	kAVCAsyncCommandStateRequestFailed,
-	kAVCAsyncCommandStateWaitingForResponse,
-	kAVCAsyncCommandStateReceivedInterimResponse,
-	kAVCAsyncCommandStateReceivedFinalResponse,
-	kAVCAsyncCommandStateTimeOutBeforeResponse,
-	kAVCAsyncCommandStateBusReset,
-	kAVCAsyncCommandStateOutOfMemory,
-	kAVCAsyncCommandStateCanceled
-} IOFWAVCAsyncCommandState;
-
-#endif // _IOKIT_IOFIREWIREAVCCONSTS_H
diff --git a/i386/include/IOKit/avc/IOFireWireAVCRequestSpace.h b/i386/include/IOKit/avc/IOFireWireAVCRequestSpace.h
deleted file mode 100644
index c02797f..0000000
--- a/i386/include/IOKit/avc/IOFireWireAVCRequestSpace.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *
- *	IOFireWirePCRSpace.h
- *
- * Class to multiplex access to the FCP request address.
- */
-#ifndef _IOKIT_IOFIREWIREAVCREQUESTSPACE_H
-#define _IOKIT_IOFIREWIREAVCREQUESTSPACE_H
-
-#endif /* _IOKIT_IOFIREWIREAVCREQUESTSPACE_H */
diff --git a/i386/include/IOKit/avc/IOFireWireAVCTargetSpace.h b/i386/include/IOKit/avc/IOFireWireAVCTargetSpace.h
deleted file mode 100644
index 4f3cdb0..0000000
--- a/i386/include/IOKit/avc/IOFireWireAVCTargetSpace.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- *
- *	IOFireWireAVCTargetSpace.h
- *
- * Class to centralize the AVC Target mode support
- *
- */
-
-#ifndef _IOKIT_IOFIREWIREAVCTARGETSPACE_H
-#define _IOKIT_IOFIREWIREAVCTARGETSPACE_H
-
-#include <IOKit/IOUserClient.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-
-#include <IOKit/firewire/IOFWAddressSpace.h>
-#include <IOKit/firewire/IOLocalConfigDirectory.h>
-#include <IOKit/avc/IOFireWireAVCConsts.h>
-#include <IOKit/avc/IOFireWireAVCUserClientCommon.h>
-
-class IOFireWireAVCProtocolUserClient;
-class AVCCommandHandlerInfo;
-class AVCSubunitInfo;
-
-typedef void (*IOFireWireAVCTargetCommandHandlerCallback)(const AVCCommandHandlerInfo *pCmdInfo,
-														  UInt32 generation,
-														  UInt16 nodeID,
-														  const void *command,
-														  UInt32 cmdLen,
-														  IOFWSpeed &speed,
-														  UInt32 handlerSearchIndex);
-
-typedef void (*IOFireWireAVCSubunitPlugHandlerCallback)(const AVCSubunitInfo *pSubunitInfo,
-														IOFWAVCSubunitPlugMessages plugMessage,
-														IOFWAVCPlugTypes plugType,
-														UInt32 plugNum,
-														UInt32 messageParams,
-														UInt32 generation,
-														UInt16 nodeID);
-
-/*!
-@class AVCCommandHandlerInfo
-@abstract internal class to manage installed command handlers
-*/
-class AVCCommandHandlerInfo : public OSObject
-{
-    OSDeclareDefaultStructors(AVCCommandHandlerInfo)
-public:
-	IOFireWireAVCProtocolUserClient * userClient;
-	IOFireWireAVCTargetCommandHandlerCallback callBack;
-	OSAsyncReference64 asyncRef;
-	UInt32 subUnitTypeAndID;
-	UInt32 opCode;
-	uint64_t userCallBack;
-	uint64_t userRefCon;
-};
-
-typedef struct _AVCSubunitPlugRecord
-{
-	UInt32 plugSignalFormat;
-	UInt32 connectionCount;
-}AVCSubunitPlugRecord;
-
-/*!
-@class AVCSubunitInfo
-@abstract internal class to manage installed subunits
-*/
-class AVCSubunitInfo : public OSObject
-{
-    OSDeclareDefaultStructors(AVCSubunitInfo)
-    bool init();
-    void free();
-public:
-	static AVCSubunitInfo *create();
-	IOFireWireAVCProtocolUserClient * userClient;
-	IOFireWireAVCSubunitPlugHandlerCallback callBack;
-	OSAsyncReference64 asyncRef;
-	UInt32 subunitTypeAndID;
-	UInt32 numSourcePlugs;
-	UInt32 numDestPlugs;
-	uint64_t userCallBack;
-	uint64_t userRefCon;
-	AVCSubunitPlugRecord *sourcePlugRecords;
-	AVCSubunitPlugRecord *destPlugRecords;
-};
-
-typedef struct _AVCUnitPlugRecord
-{
-	UInt32 connectionCount;
-}AVCUnitPlugRecord;
-
-typedef struct _AVCUnitPlugs
-{
-	UInt32 numIsochInPlugs;
-	UInt32 numIsochOutPlugs;
-	UInt32 numExternalInPlugs;
-	UInt32 numExternalOutPlugs;
-	AVCUnitPlugRecord isochInPlugRecord[kAVCMaxNumPlugs];
-	AVCUnitPlugRecord isochOutPlugRecord[kAVCMaxNumPlugs];
-	AVCUnitPlugRecord externalInPlugRecord[kAVCMaxNumPlugs];
-	AVCUnitPlugRecord externalOutPlugRecord[kAVCMaxNumPlugs];
-}AVCUnitPlugs;
-
-/*!
-@class UCInfo
-@abstract internal class to manage multiple protocol user clients
-*/
-class UCInfo : public OSObject
-{
-    OSDeclareDefaultStructors(UCInfo)
-public:
-    IOFireWireAVCProtocolUserClient *fUserClient;
-};
-
-/*!
-@class AVCConnectionRecord
-@abstract internal class to manage AVC connections
-*/
-class AVCConnectionRecord : public OSObject
-{
-    OSDeclareDefaultStructors(AVCConnectionRecord)
-public:
-	UInt32 sourceSubunitTypeAndID;
-	IOFWAVCPlugTypes sourcePlugType;
-	UInt32 sourcePlugNum;
-	UInt32 destSubunitTypeAndID;
-	IOFWAVCPlugTypes destPlugType;
-	UInt32 destPlugNum;
-	bool lockConnection;
-	bool permConnection;
-};
-
-/*!
-@class IOFireWireAVCTargetSpace
-@abstract object to centralize the AVC Target mode support
-*/
-class IOFireWireAVCTargetSpace : public IOFWPseudoAddressSpace
-{
-    OSDeclareDefaultStructors(IOFireWireAVCTargetSpace)
-
-protected:
-    UInt32 fBuf[512];
-    UInt32 fActivations;
-	IOFireWireController *fController;
-	IOLocalConfigDirectory * fAVCLocalConfigDirectory;
-    OSArray * fUserClients;
-	OSArray * fCommandHandlers;
-	OSArray * fSubunits;
-	OSArray * fConnectionRecords;
-	AVCUnitPlugs fUnitPlugs;
-	IORecursiveLock * fLock;
-
-	/*! @struct ExpansionData
-	@discussion This structure will be used to expand the capablilties of the class in the future.
-	*/
-    struct ExpansionData { };
-
-	/*! @var reserved
-	Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-    virtual UInt32 doWrite(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
-                           const void *buf, IOFWRequestRefCon refcon);
-
-
-	IOReturn targetSendAVCResponse(UInt32 generation, UInt16 nodeID, IOBufferMemoryDescriptor *pBufMemDesc, UInt32 size);
-
-	// Internal AVC Target Command Handlers
-	IOReturn handleUnitInfoCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
-	IOReturn handleSubUnitInfoCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
-	IOReturn handlePlugInfoCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
-	IOReturn handlePowerCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
-	IOReturn handleConnectCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
-	IOReturn handleDisconnectCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
-	IOReturn handleInputPlugSignalFormatCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
-	IOReturn handleOutputPlugSignalFormatCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
-	IOReturn handleConnectionsCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
-	IOReturn handleSignalSourceCommand(UInt16 nodeID, UInt32 generation, const char *buf, UInt32 len);
-
-	UInt32 subUnitOfTypeCount(UInt32 type);
-	AVCSubunitInfo *getSubunitInfo(UInt32 subunitTypeAndID);
-	bool canConnectDestPlug(UInt32 destSubunitTypeAndID,
-						 IOFWAVCPlugTypes destPlugType,
-						 UInt32 *destPlugNum);
-	
-public:
-
-	// Activate/Deactivate Functions
-	virtual IOReturn activateWithUserClient(IOFireWireAVCProtocolUserClient *userClient);
-    virtual void deactivateWithUserClient(IOFireWireAVCProtocolUserClient *userClient);
-
-	/*!
-	@function init
-	@abstract initializes the IOFireWireAVCTargetSpace object
-	*/
-    virtual bool init(IOFireWireController *controller);
-
-	/*!
-	@function getAVCTargetSpace
-	@abstract returns the IOFireWireAVCTargetSpace object for the given FireWire bus
-	@param bus The FireWire bus
-	*/
-    static IOFireWireAVCTargetSpace *getAVCTargetSpace(IOFireWireController *controller);
-
-	/*!
-	@function publishAVCUnitDirectory
-	@abstract Creates a local AVC Unit directory if it doesn't already exist
-	*/
-    virtual IOReturn publishAVCUnitDirectory(void);
-
-	virtual IOReturn installAVCCommandHandler(IOFireWireAVCProtocolUserClient *userClient,
-										   IOFireWireAVCTargetCommandHandlerCallback callBack,
-										   OSAsyncReference64 asyncRef,
-										   UInt32 subUnitTypeAndID,
-										   UInt32 opCode,
-										   uint64_t userCallBack,
-										   uint64_t userRefCon);
-
-	virtual IOReturn addSubunit(IOFireWireAVCProtocolUserClient *userClient,
-							 IOFireWireAVCSubunitPlugHandlerCallback callBack,
-							 OSAsyncReference64 asyncRef,
-							 UInt32 subunitType,
-							 UInt32 numSourcePlugs,
-							 UInt32 numDestPlugs,
-							 uint64_t userCallBack,
-							 uint64_t userRefCon,
-							 UInt32 *subUnitID);
-
-	virtual IOReturn setSubunitPlugSignalFormat(IOFireWireAVCProtocolUserClient *userClient,
-											 UInt32 subunitTypeAndID,
-											 IOFWAVCPlugTypes plugType,
-											 UInt32 plugNum,
-											 UInt32 signalFormat);
-
-	virtual IOReturn getSubunitPlugSignalFormat(IOFireWireAVCProtocolUserClient *userClient,
-											 UInt32 subunitTypeAndID,
-											 IOFWAVCPlugTypes plugType,
-											 UInt32 plugNum,
-											 UInt32 *pSignalFormat);
-
-	virtual IOReturn connectTargetPlugs(IOFireWireAVCProtocolUserClient *userClient,
-									 AVCConnectTargetPlugsInParams *inParams,
-									 AVCConnectTargetPlugsOutParams *outParams);
-
-	virtual IOReturn disconnectTargetPlugs(IOFireWireAVCProtocolUserClient *userClient,
-										UInt32 sourceSubunitTypeAndID,
-										IOFWAVCPlugTypes sourcePlugType,
-										UInt32 sourcePlugNum,
-										UInt32 destSubunitTypeAndID,
-										IOFWAVCPlugTypes destPlugType,
-										UInt32 destPlugNum);
-
-	virtual IOReturn getTargetPlugConnection(IOFireWireAVCProtocolUserClient *userClient,
-										  AVCGetTargetPlugConnectionInParams *inParams,
-										  AVCGetTargetPlugConnectionOutParams *outParams);
-
-    virtual IOReturn findAVCRequestHandler(IOFireWireAVCProtocolUserClient *userClient,
-										  UInt32 generation,
-										  UInt16 nodeID,
-										  IOFWSpeed speed,
-										  UInt32 handlerSearchIndex,
-										  const char *pCmdBuf,
-										  UInt32 cmdLen);
-	
-	virtual void pcrModified(IOFWAVCPlugTypes plugType,
-						  UInt32 plugNum,
-						  UInt32 newValue);
-	
-private:
-	OSMetaClassDeclareReservedUnused(IOFireWireAVCTargetSpace, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCTargetSpace, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCTargetSpace, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCTargetSpace, 3);
-};
-
-#endif /*_IOKIT_IOFIREWIREAVCTARGETSPACE_H */
\ No newline at end of file
diff --git a/i386/include/IOKit/avc/IOFireWireAVCUnit.h b/i386/include/IOKit/avc/IOFireWireAVCUnit.h
deleted file mode 100644
index 0abf1cd..0000000
--- a/i386/include/IOKit/avc/IOFireWireAVCUnit.h
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- * Copyright (c) 1998-2001 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOFIREWIREAVCUNIT_H
-#define _IOKIT_IOFIREWIREAVCUNIT_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/firewire/IOFWRegs.h>
-#include <IOKit/firewire/IOFWAddressSpace.h>
-#include <IOKit/firewire/IOFWCommand.h>
-#include <IOKit/avc/IOFireWireAVCConsts.h>
-
-extern const OSSymbol *gIOAVCUnitType;
-
-class IOFireWireNub;
-class IOFireWireAVCCommand;
-class IOFireWirePCRSpace;
-class IOFireWireAVCUnit;
-class IOFireWireAVCSubUnit;
-class IOFireWireAVCAsynchronousCommand;
-class IOFireWireAVCNub;
-
-// The callback prototype for AVC Asynchronous Commands
-typedef void (*IOFireWireAVCAsynchronousCommandCallback)(void *pRefCon, IOFireWireAVCAsynchronousCommand *pCommandObject);
-
-const UInt16 kIOFWAVCAsyncCmdFreed = 0xdead;
-
-/*!
-@class IOFireWireAVCAsynchronousCommand
-*/
-class IOFireWireAVCAsynchronousCommand : public IOCommand 
-{
-    OSDeclareDefaultStructors(IOFireWireAVCAsynchronousCommand)
-	void free(void);
-
-	friend class IOFireWireAVCUnit;
-	
-protected:
-	/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */
-    struct ExpansionData { };
-
-	/*! @var reserved
-		Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-	
-public:
-	IOReturn init(const UInt8 * command, UInt32 len, IOFireWireAVCAsynchronousCommandCallback completionCallback, void *pClientRefCon);
-	IOReturn submit(IOFireWireAVCNub *pAVCNub);
-	IOReturn cancel(void);
-	IOReturn reinit(const UInt8 * command, UInt32 cmdLen);
-
-	// This function returns true if this command is currently waiting for a response
-	bool isPending(void);
-	
-	IOFWAVCAsyncCommandState cmdState;
-	void	*pRefCon;
-	UInt8	*pCommandBuf;
-	UInt32	cmdLen;
-	UInt8	*pInterimResponseBuf;
-	UInt32	interimResponseLen;
-	UInt8	*pFinalResponseBuf;
-	UInt32	finalResponseLen;
-
-protected:
-	IOFireWireAVCAsynchronousCommandCallback fCallback;
-	IOFireWireAVCUnit *fAVCUnit;
-	IOMemoryDescriptor *fMem;
-	IOFWCommand *fWriteCmd;
-	IOFWDelayCommand *fDelayCmd;
-    UInt16 fWriteNodeID;
-	UInt32 fWriteGen;
-	
-private:
-	OSMetaClassDeclareReservedUnused(IOFireWireAVCAsynchronousCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCAsynchronousCommand, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCAsynchronousCommand, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCAsynchronousCommand, 3);
-};
-
-/*!
-    @class IOFireWireAVCNub
-    @abstract nub for AVC devices
-*/
-class IOFireWireAVCNub : public IOService
-{
-    OSDeclareDefaultStructors(IOFireWireAVCNub)
-
-protected:
-    IOFireWireNub * fDevice;
-
-public:
-    // execute AVC command
-/*!
-    @function AVCCommand
-    @abstract Sends an AVC command to the device and stores the response.
-    @param command Pointer to command to send.
-    @param cmdLen Length of the command.
-    @param response Pointer to place to store the response.
-    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
-    updated to the number of bytes returned by the device.
-*/
-    virtual IOReturn AVCCommand(const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen) = 0;
-
-/*!
-    @function AVCCommandInGeneration
-    @abstract Sends an AVC command to the device and stores the response. The command must complete in the specified
-    FireWire bus generation otherwise kIOFireWireBusReset is returned.
-    @param generation The bus generation that the command must execute in.
-    @param command Pointer to command to send.
-    @param cmdLen Length of the command.
-    @param response Pointer to place to store the response.
-    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
-    updated to the number of bytes returned by the device.
-*/
-    virtual IOReturn AVCCommandInGeneration(UInt32 generation,
-                const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen) = 0;
-
-/*!
-    @function getDevice
-    @abstract Returns the FireWire device nub that is this object's provider .
-*/
-    IOFireWireNub* getDevice() const
-        {return fDevice;};
-
-/*!
-    @function updateAVCCommandTimeout
-    @abstract By default, AVCCommands timeout 10 seconds after receiving an Interim response.
-    This function resets the timeout of the current command to 10 seconds from the current time.
-    Call this repeatedly for AVC commands that take a very long time to execute to prevent premature
-    timeout.
-*/
-    virtual IOReturn updateAVCCommandTimeout() = 0;
-
-private:
-    OSMetaClassDeclareReservedUsed(IOFireWireAVCNub, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCNub, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCNub, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCNub, 3);
-};
-
-/*!
-    @class IOFireWireAVCUnit
-    @abstract nub for AVC devices
-*/
-class IOFireWireAVCUnit : public IOFireWireAVCNub
-{
-    OSDeclareDefaultStructors(IOFireWireAVCUnit)
-
-	friend class IOFireWireAVCAsynchronousCommand;
-	
-protected:
-    IOFWPseudoAddressSpace *fFCPResponseSpace;
-    IOLock *avcLock;
-    IOFireWireAVCCommand *fCommand;
-
-    UInt8 fSubUnitCount[kAVCNumSubUnitTypes];
-    
-	bool fStarted;
-    IOLock *cmdLock;
-	
-/*! @struct ExpansionData
-    @discussion This structure is used to expand the capablilties of the class in a binary compatible way
-    */    
-    struct ExpansionData
-	{
-		OSArray * fAVCAsyncCommands;
-		IOFireWireController *fControl;
-		bool enableRobustAVCCommandResponseMatching;
-	};
-
-/*! @var fIOFireWireAVCUnitExpansion 
-      */
-    ExpansionData *fIOFireWireAVCUnitExpansion;
-    
-    static UInt32 AVCResponse(void *refcon, UInt16 nodeID, IOFWSpeed &speed,
-                    FWAddress addr, UInt32 len, const void *buf, IOFWRequestRefCon requestRefcon);
-
-    static void rescanSubUnits(void *arg);
-    
-    virtual void free(void);
-    
-    virtual void updateSubUnits(bool firstTime);
-
-	static void AVCAsynchRequestWriteDone(void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd);
-	static void AVCAsynchDelayDone(void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd);
-
-public:
-    // IOService overrides
-    virtual bool start(IOService *provider);
-    virtual IOReturn message(UInt32 type, IOService *provider, void *argument);
-	virtual IOReturn setProperties (OSObject * properties );
-
-/*! @function handleOpen
-    @abstract Overrideable method to control the open / close behaviour of an IOService.
-    @discussion See IOService for discussion.		
-    @param forClient Designates the client of the provider requesting the open.
-    @param options Options for the open, may be interpreted by the implementor of handleOpen.
-    @result Return true if the open was successful, false otherwise.
-*/
-
-    virtual bool handleOpen(  IOService *	  forClient,
-                              IOOptionBits	  options,
-                              void *		  arg );
-/*! 
-    @function handleClose
-    @abstract Overrideable method to control the open / close behaviour of an IOService.
-    @discussion See IOService for discussion.
-    @param forClient Designates the client of the provider requesting the close.
-    @param options Options for the close, may be interpreted by the implementor of handleOpen. 
-*/
-
-    virtual void handleClose(   IOService *		forClient,
-                                IOOptionBits	options );
-    
-
-/*!
-    @function matchPropertyTable
-    @abstract Matching language support
-	Match on the following properties of the unit:
-	Vendor_ID
-	GUID
-	Unit_Type
-	and available sub-units, match if the device has at least the requested number of a sub-unit type:
-	AVCSubUnit_0 -> AVCSubUnit_1f
-*/
-    virtual bool matchPropertyTable(OSDictionary * table);
-
-    // execute AVC command
-/*!
-    @function AVCCommand
-    @abstract Sends an AVC command to the device and stores the response.
-    @param command Pointer to command to send.
-    @param cmdLen Length of the command.
-    @param response Pointer to place to store the response.
-    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
-    updated to the number of bytes returned by the device.
-*/
-    virtual IOReturn AVCCommand(const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen);
-
-/*!
-    @function AVCCommandInGeneration
-    @abstract Sends an AVC command to the device and stores the response. The command must complete in the specified
-    FireWire bus generation otherwise kIOFireWireBusReset is returned.
-    @param generation The bus generation that the command must execute in.
-    @param command Pointer to command to send.
-    @param cmdLen Length of the command.
-    @param response Pointer to place to store the response.
-    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
-    updated to the number of bytes returned by the device.
-*/
-    virtual IOReturn AVCCommandInGeneration(UInt32 generation,
-                const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen);
-
-/*!
-    @function updateAVCCommandTimeout
-    @abstract By default, AVCCommands timeout 10 seconds after receiving an Interim response.
-    This function resets the timeout of the current command to 10 seconds from the current time.
-    Call this repeatedly for AVC commands that take a very long time to execute to prevent premature
-    timeout.
-*/
-    virtual IOReturn updateAVCCommandTimeout();
-
-protected:
-	UInt32 indexOfAVCAsynchronousCommandObject(IOFireWireAVCAsynchronousCommand *pCommandObject);
-	void removeAVCAsynchronousCommandObjectAtIndex(UInt32 index);
-
-	void lockAVCAsynchronousCommandLock();
-
-	void unlockAVCAsynchronousCommandLock();
-	
-	bool available();
-	
-private:
-		
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCUnit, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCUnit, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCUnit, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCUnit, 3);
-
-};
-
-/*!
-    @class IOFireWireAVCSubUnit
-    @abstract nub for sub unit of AVC devices. Just for matching, calls the AVC unit for all functions.
-*/
-class IOFireWireAVCSubUnit : public IOFireWireAVCNub
-{
-    OSDeclareDefaultStructors(IOFireWireAVCSubUnit)
-	
-	friend class IOFireWireAVCAsynchronousCommand;
-
-protected:
-    IOFireWireAVCUnit *fAVCUnit;
-    
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-    
-public:
-    virtual bool init(OSDictionary *propTable, IOFireWireAVCUnit *provider);
-
-    // IOService overrides
-    virtual IOReturn message(UInt32 type, IOService *provider, void *argument);
-
-/*! @function handleOpen
-    @abstract Overrideable method to control the open / close behaviour of an IOService.
-    @discussion See IOService for discussion.		
-    @param forClient Designates the client of the provider requesting the open.
-    @param options Options for the open, may be interpreted by the implementor of handleOpen.
-    @result Return true if the open was successful, false otherwise.
-*/
-
-    virtual bool handleOpen(  IOService *	  forClient,
-                              IOOptionBits	  options,
-                              void *		  arg );
-/*! 
-    @function handleClose
-    @abstract Overrideable method to control the open / close behaviour of an IOService.
-    @discussion See IOService for discussion.
-    @param forClient Designates the client of the provider requesting the close.
-    @param options Options for the close, may be interpreted by the implementor of handleOpen. 
-*/
-
-    virtual void handleClose(   IOService *		forClient,
-                                IOOptionBits	options );
-    
-
-/*!
-    @function matchPropertyTable
-    @abstract Matching language support
-	Match on the following properties of the sub unit:
-	Vendor_ID
-	GUID
-	SubUnit_Type
-*/
-    virtual bool matchPropertyTable(OSDictionary * table);
-
-    // execute AVC command
-/*!
-    @function AVCCommand
-    @abstract Sends an AVC command to the device and stores the response.
-    @param command Pointer to command to send.
-    @param cmdLen Length of the command.
-    @param response Pointer to place to store the response.
-    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
-    updated to the number of bytes returned by the device.
-*/
-    virtual IOReturn AVCCommand(const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen);
-
-/*!
-    @function AVCCommandInGeneration
-    @abstract Sends an AVC command to the device and stores the response. The command must complete in the specified
-    FireWire bus generation otherwise kIOFireWireBusReset is returned.
-    @param generation The bus generation that the command must execute in.
-    @param command Pointer to command to send.
-    @param cmdLen Length of the command.
-    @param response Pointer to place to store the response.
-    @param responseLen Pointer to response length - initialize to the size of the buffer pointed to by response,
-    updated to the number of bytes returned by the device.
-*/
-    virtual IOReturn AVCCommandInGeneration(UInt32 generation,
-                const UInt8 * command, UInt32 cmdLen, UInt8 * response, UInt32 *responseLen);
-
-/*!
-    @function updateAVCCommandTimeout
-    @abstract By default, AVCCommands timeout 10 seconds after receiving an Interim response.
-    This function resets the timeout of the current command to 10 seconds from the current time.
-    Call this repeatedly for AVC commands that take a very long time to execute to prevent premature
-    timeout.
-*/
-    virtual IOReturn updateAVCCommandTimeout();
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCSubUnit, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCSubUnit, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCSubUnit, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireAVCSubUnit, 3);
-
-};
-
-#endif // _IOKIT_IOFIREWIREAVCUNIT_H
-
diff --git a/i386/include/IOKit/avc/IOFireWireAVCUserClientCommon.h b/i386/include/IOKit/avc/IOFireWireAVCUserClientCommon.h
deleted file mode 100644
index cecf812..0000000
--- a/i386/include/IOKit/avc/IOFireWireAVCUserClientCommon.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 1998-2001 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOFIREWIREAVCUSERCLIENTCOMMON_H_
-#define _IOKIT_IOFIREWIREAVCUSERCLIENTCOMMON_H_
-
-#include <IOKit/avc/IOFireWireAVCConsts.h>
-
-#define kIOFireWireAVCLibConnection 13
-
-enum IOFWAVCUserClientCommandCodes {
-    kIOFWAVCUserClientOpen,						// kIOUCScalarIScalarO 0,0
-    kIOFWAVCUserClientClose,					// kIOUCScalarIScalarO 0,0
-    kIOFWAVCUserClientOpenWithSessionRef,		// kIOUCScalarIScalarO 1,0
-	kIOFWAVCUserClientGetSessionRef,			// kIOUCScalarIScalarO 0,1
-    kIOFWAVCUserClientAVCCommand,				// kIOUCStructIStructO -1,-1
-    kIOFWAVCUserClientAVCCommandInGen,			// kIOUCStructIStructO -1,-1
-    kIOFWAVCUserClientUpdateAVCCommandTimeout,	// kIOUCScalarIScalarO 0,0
-    kIOFWAVCUserClientMakeP2PInputConnection,	// KIOUCScalarIScalarO 1, 0
-    kIOFWAVCUserClientBreakP2PInputConnection,	// KIOUCScalarIScalarO 1, 0
-    kIOFWAVCUserClientMakeP2POutputConnection,	// KIOUCScalarIScalarO 1, 0
-    kIOFWAVCUserClientBreakP2POutputConnection,	// KIOUCScalarIScalarO 1, 0
-	kIOFWAVCUserClientCreateAsyncAVCCommand,	// kIOUCStructIStructO -1,-1
-	kIOFWAVCUserClientSubmitAsyncAVCCommand,	// kIOUCScalarIScalarO 1, 0
-	kIOFWAVCUserClientCancelAsyncAVCCommand,	// kIOUCScalarIScalarO 1, 0
-	kIOFWAVCUserClientReleaseAsyncAVCCommand,	// kIOUCScalarIScalarO 1, 0
-	kIOFWAVCUserClientReinitAsyncAVCCommand,	// // kIOUCScalarIStructI 1, -1
-    kIOFWAVCUserClientNumCommands
-};
-
-enum IOFWAVCUserClientAsyncCommandCodes {
-    kIOFWAVCUserClientInstallAsyncAVCCommandCallback = kIOFWAVCUserClientNumCommands,	// kIOUCScalarIScalarO 1, 1
-    kIOFWAVCUserClientNumAsyncCommands
-};
-
-
-enum IOFWAVCProtocolUserClientCommandCodes {
-    kIOFWAVCProtocolUserClientSendAVCResponse,   		// kIOUCScalarIStructI 2, -1
-    kIOFWAVCProtocolUserClientFreeInputPlug,			// kIOUCScalarIScalarO 1, 0
-    kIOFWAVCProtocolUserClientReadInputPlug,			// kIOUCScalarIScalarO 1, 1
-    kIOFWAVCProtocolUserClientUpdateInputPlug,			// kIOUCScalarIScalarO 3, 0
-    kIOFWAVCProtocolUserClientFreeOutputPlug,			// kIOUCScalarIScalarO 1, 0
-    kIOFWAVCProtocolUserClientReadOutputPlug,			// kIOUCScalarIScalarO 1, 1
-    kIOFWAVCProtocolUserClientUpdateOutputPlug,			// kIOUCScalarIScalarO 3, 0
-    kIOFWAVCProtocolUserClientReadOutputMasterPlug,		// kIOUCScalarIScalarO 0, 1
-    kIOFWAVCProtocolUserClientUpdateOutputMasterPlug,	// kIOUCScalarIScalarO 2, 0
-    kIOFWAVCProtocolUserClientReadInputMasterPlug,		// kIOUCScalarIScalarO 0, 1
-    kIOFWAVCProtocolUserClientUpdateInputMasterPlug,	// kIOUCScalarIScalarO 2, 0
-    kIOFWAVCProtocolUserClientPublishAVCUnitDirectory,	// kIOUCScalarIScalarO 0, 0
-	kIOFWAVCProtocolUserClientSetSubunitPlugSignalFormat, // kIOUCScalarIScalarO 4, 0
-	kIOFWAVCProtocolUserClientGetSubunitPlugSignalFormat, // kIOUCScalarIScalarO 3, 1
-	kIOFWAVCProtocolUserClientConnectTargetPlugs,		// kIOUCStructIStructO
-	kIOFWAVCProtocolUserClientDisconnectTargetPlugs,	// kIOUCScalarIScalarO 6, 0
-	kIOFWAVCProtocolUserClientGetTargetPlugConnection,	// kIOUCStructIStructO
-	kIOFWAVCProtocolUserClientAVCRequestNotHandled,		// kIOUCScalarIStructI 4, -1
-    kIOFWAVCProtocolUserClientNumCommands
-};
-
-enum IOFWAVCProtocolUserClientAsyncCommandCodes {
-    kIOFWAVCProtocolUserClientSetAVCRequestCallback = kIOFWAVCProtocolUserClientNumCommands,   		// kIOUCScalarIScalarO 2, 0
-    kIOFWAVCProtocolUserClientAllocateInputPlug,			// kIOUCScalarIScalarO 1, 1
-    kIOFWAVCProtocolUserClientAllocateOutputPlug,			// kIOUCScalarIScalarO 1, 1
-    kIOFWAVCProtocolUserClientInstallAVCCommandHandler,		// kIOUCScalarIScalarO 4, 0
-    kIOFWAVCProtocolUserClientAddSubunit,					// kIOUCScalarIScalarO 5, 1
-    kIOFWAVCProtocolUserClientNumAsyncCommands
-};
-
-typedef struct _AVCConnectTargetPlugsInParams
-{
-	UInt32 sourceSubunitTypeAndID;
-	IOFWAVCPlugTypes sourcePlugType;
-	UInt32 sourcePlugNum;
-	UInt32 destSubunitTypeAndID;
-	IOFWAVCPlugTypes destPlugType;
-	UInt32 destPlugNum;
-	Boolean lockConnection;
-	Boolean permConnection;
-}AVCConnectTargetPlugsInParams;
-
-typedef struct _AVCConnectTargetPlugsOutParams
-{
-	UInt32 sourcePlugNum;
-	UInt32 destPlugNum;
-}AVCConnectTargetPlugsOutParams;
-
-typedef struct _AVCGetTargetPlugConnectionInParams
-{
-	UInt32 subunitTypeAndID;
-	IOFWAVCPlugTypes plugType;
-	UInt32 plugNum;
-}AVCGetTargetPlugConnectionInParams;
-
-typedef struct _AVCGetTargetPlugConnectionOutParams
-{
-	UInt32 connectedSubunitTypeAndID;
-	IOFWAVCPlugTypes connectedPlugType;
-	UInt32 connectedPlugNum;
-	Boolean lockConnection;
-	Boolean permConnection;
-}AVCGetTargetPlugConnectionOutParams;
-
-#define kAsyncCmdSharedBufInterimRespOffset 0
-#define kAsyncCmdSharedBufFinalRespOffset 512
-
-#endif // _IOKIT_IOFIREWIREAVCUSERCLIENTCOMMON_H_
\ No newline at end of file
diff --git a/i386/include/IOKit/avc/IOFireWirePCRSpace.h b/i386/include/IOKit/avc/IOFireWirePCRSpace.h
deleted file mode 100644
index 9f31176..0000000
--- a/i386/include/IOKit/avc/IOFireWirePCRSpace.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2001 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *
- *	IOFireWirePCRSpace.h
- *
- * Class to multiplex access to the PCR addresses.
- */
-#ifndef _IOKIT_IOFIREWIREPCRSPACE_H
-#define _IOKIT_IOFIREWIREPCRSPACE_H
-
-#include <IOKit/firewire/IOFWAddressSpace.h>
-#include <IOKit/avc/IOFireWireAVCTargetSpace.h>
-
-/*!
-    @typedef IOFireWirePCRCallback
-	@abstract Callback called after a successful lock transaction to a plug.
-    @param refcon refcon supplied to the IOFireWireFCPSpace when a client is registered
-	@param nodeID is the node originating the request
-	@param plugNo is the plug number
-	@param oldVal is the value the plug used to contain
-    @param newVal is the quad written into the plug
-
- */
-typedef void (*IOFireWirePCRCallback)(void *refcon, UInt16 nodeID, UInt32 plug, UInt32 oldVal, UInt32 newVal);
-
-class IOFireWireBus;
-
-/*!
-    @class IOFireWirePCRSpace
-    @abstract object to multiplex users of the PCR plug registers
-*/
-class IOFireWirePCRSpace : public IOFWPseudoAddressSpace
-{
-    OSDeclareDefaultStructors(IOFireWirePCRSpace)
-    
-protected:
-    struct Client {
-        IOFireWirePCRCallback func;
-        void * refcon;
-    };
-    UInt32 fBuf[64];
-    
-    Client fClients[64];
-    UInt32 fActivations;
-	IOFireWireAVCTargetSpace *	fAVCTargetSpace;
-	IONotifier *fNotifier;
-    
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-    
-    // Override to notify client of each plug seperately
-    virtual UInt32 doWrite(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
-                           const void *buf, IOFWRequestRefCon refcon);
-                          
-    virtual IOReturn allocatePlug(void *refcon, IOFireWirePCRCallback func, UInt32 &plug, Client* head);
-    virtual void freePlug(UInt32 plug, Client* head);
-    virtual UInt32 readPlug(UInt32 plug);
-    virtual IOReturn updatePlug(UInt32 plug, UInt32 oldVal, UInt32 newVal);
-    
-public:
-
-    // Override to handle multiple activations (one per client)
-    virtual IOReturn activate();
-    virtual void deactivate();
-
-/*!
-    @function init
-    @abstract initializes the IOFireWirePCRSpace object
-*/
-    virtual bool init(IOFireWireBus *bus);
-/*!
-    @function getPCRAddressSpace
-    @abstract returns the IOFireWirePCRSpace object for the given FireWire bus
-    @param bus The FireWire bus
-*/
-    static IOFireWirePCRSpace *getPCRAddressSpace(IOFireWireBus *bus);
-/*!
-    @function allocateInputPlug
-    @abstract allocates an input plug.
-    @param refcon arbitrary value passed back as first argument of callback.
-    @param func callback function when a successful lock transaction to the plug has been performed
-    @param plug set to the plug number if a plug is successfully allocated
-*/
-    virtual IOReturn allocateInputPlug(void *refcon, IOFireWirePCRCallback func, UInt32 &plug);
-/*!
-    @function freeInputPlug
-    @abstract deallocates an input plug.
-    @param plug value returned by allocateInputPlug.
-*/
-    virtual void freeInputPlug(UInt32 plug);
-/*!
-    @function readInputPlug
-    @abstract returns the current value of an input plug.
-    @param plug value returned by allocateInputPlug.
-*/
-    virtual UInt32 readInputPlug(UInt32 plug);
-/*!
-    @function updateInputPlug
-    @abstract updates the value of an input plug (simulating a lock transaction).
-    @param plug value returned by allocateInputPlug.
-    @param oldVal value returned by readInputPlug.
-    @param newVal new value to store in plug if it's current value is oldVal.
-*/
-    virtual IOReturn updateInputPlug(UInt32 plug, UInt32 oldVal, UInt32 newVal);
-/*!
-    @function allocateOutputPlug
-    @abstract allocates an output plug.
-    @param refcon arbitrary value passed back as first argument of callback.
-    @param func callback function when a successful lock transaction to the plug has been performed
-    @param plug set to the plug number if a plug is successfully allocated
-*/
-    virtual IOReturn allocateOutputPlug(void *refcon, IOFireWirePCRCallback func, UInt32 &plug);
-/*!
-    @function freeOutputPlug
-    @abstract deallocates an output plug.
-    @param plug value returned by allocateOutputPlug.
-*/
-    virtual void freeOutputPlug(UInt32 plug);
-/*!
-    @function readOutputPlug
-    @abstract returns the current value of an output plug.
-    @param plug value returned by allocateOutputPlug.
-*/
-    virtual UInt32 readOutputPlug(UInt32 plug);
-/*!
-    @function updateOutputPlug
-    @abstract updates the value of an output plug (simulating a lock transaction).
-    @param plug value returned by allocateOutputPlug.
-    @param oldVal value returned by readOutputPlug.
-    @param newVal new value to store in plug if it's current value is oldVal.
-*/
-    virtual IOReturn updateOutputPlug(UInt32 plug, UInt32 oldVal, UInt32 newVal);
-/*!
-    @function readOutputMasterPlug
-    @abstract returns the current value of the output master plug.
-*/
-    virtual UInt32 readOutputMasterPlug();
-/*!
-    @function updateOutputMasterPlug
-    @abstract updates the value of the master output plug (simulating a lock transaction).
-    @param oldVal value returned by readOutputMasterPlug.
-    @param newVal new value to store in plug if it's current value is oldVal.
-*/
-    virtual IOReturn updateOutputMasterPlug(UInt32 oldVal, UInt32 newVal);
-/*!
-    @function readInputMasterPlug
-    @abstract returns the current value of the input master plug.
-*/
-    virtual UInt32 readInputMasterPlug();
-/*!
-    @function updateInputMasterPlug
-    @abstract updates the value of the master input plug (simulating a lock transaction).
-    @param oldVal value returned by readInputMasterPlug.
-    @param newVal new value to store in plug if it's current value is oldVal.
-*/
-    virtual IOReturn updateInputMasterPlug(UInt32 oldVal, UInt32 newVal);
-
-	/*!
-		@function setAVCTargetSpacePointer
-	 */
-    virtual void setAVCTargetSpacePointer(IOFireWireAVCTargetSpace *pAVCTargetSpace);
-
-	/*!
-		@function clearAllP2PConnections
-	 */
-    virtual void clearAllP2PConnections(void);
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWirePCRSpace, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWirePCRSpace, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWirePCRSpace, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWirePCRSpace, 3);
-
-};
-
-#endif /* _IOKIT_IOFIREWIREPCRSPACE_H */
diff --git a/i386/include/IOKit/bluetooth/Bluetooth.h b/i386/include/IOKit/bluetooth/Bluetooth.h
deleted file mode 100644
index 6692b90..0000000
--- a/i386/include/IOKit/bluetooth/Bluetooth.h
+++ /dev/null
@@ -1,2158 +0,0 @@
-/*
-	File:		Bluetooth.h
-	Contains:	Public interfaces for Bluetooth technology.
-	Copyright:	(c) 2002-2007 by Apple Inc. All rights reserved.
-*/
-
-#pragma once
-
-#ifdef KERNEL
-#include	<IOKit/bluetooth/BluetoothAssignedNumbers.h>
-#else
-#include 	<CoreFoundation/CFBase.h>
-#include	<IOBluetooth/BluetoothAssignedNumbers.h>
-#endif
-
-#include <IOKit/IOTypes.h>
-#include <libkern/OSByteOrder.h>
-
-//---------------------------------------------------------------------------------------------------------------------------
-/*!	@header		Bluetooth
-	Bluetooth wireless technology
-*/
-
-#ifdef	__cplusplus
-	extern "C" {
-#endif
-
-
-#if 0
-
-#pragma mark === Baseband ===
-#endif
-
-//===========================================================================================================================
-//	Baseband
-//===========================================================================================================================
-
-typedef UInt16		BluetoothConnectionHandle;		// Upper 4 bits are reserved.
-typedef uint8_t		BluetoothLMPHandle;
-enum
-{
-    kBluetoothConnectionHandleNone	= 0xffff
-};
-
-typedef UInt8		BluetoothReasonCode;
-typedef UInt8		BluetoothEncryptionEnable;
-enum
-{
-	kBluetoothEncryptionEnableOff 	= 0x00, 
-	kBluetoothEncryptionEnableOn	= 0x01
-};
-
-typedef UInt8		BluetoothKeyFlag;
-enum
-{
-	kBluetoothKeyFlagSemiPermanent 	= 0x00, 
-	kBluetoothKeyFlagTemporary 		= 0x01
-};
-
-typedef UInt8		BluetoothKeyType;
-enum
-{
-	kBluetoothKeyTypeCombination					= 0x00, 
-	kBluetoothKeyTypeLocalUnit						= 0x01,
-	kBluetoothKeyTypeRemoteUnit						= 0x02,
-	kBluetoothKeyTypeDebugCombination				= 0x03,
-	kBluetoothKeyTypeUnauthenticatedCombination		= 0x04,
-	kBluetoothKeyTypeAuthenticatedCombination		= 0x05,
-	kBluetoothKeyTypeChangedCombination				= 0x06,
-};
-
-// Packet types (Bluetooth spec section 7.1.5 - Create Connection)
-
-typedef UInt16		BluetoothPacketType;
-enum
-{
-	kBluetoothPacketTypeReserved1	= 0x0001, 
-	kBluetoothPacketType2DH1Omit	= 0x0002,	// Masks OUT this packet type
-	kBluetoothPacketType3DH1Omit	= 0x0004,	// Masks OUT this packet type
-
-	kBluetoothPacketTypeDM1			= 0x0008, 
-	kBluetoothPacketTypeDH1			= 0x0010, 
-	kBluetoothPacketTypeHV1			= 0x0020, 	// Reserved
-	kBluetoothPacketTypeHV2			= 0x0040, 	// Reserved
-	kBluetoothPacketTypeHV3			= 0x0080, 	// Reserved
-	kBluetoothPacketTypeDV			= 0x0100, 	// Reserved
-	kBluetoothPacketType2DH3Omit	= 0x0100,	// Masks OUT this packet type
-	kBluetoothPacketType3DH3Omit	= 0x0200,	// Masks OUT this packet type
-	kBluetoothPacketTypeAUX			= 0x0200,	// Deprecated
-	
-	kBluetoothPacketTypeDM3			= 0x0400, 
-	kBluetoothPacketTypeDH3			= 0x0800,
-	
-	kBluetoothPacketType2DH5Omit	= 0x1000,	// Masks OUT this packet type
-	kBluetoothPacketType3DM5Omit	= 0x2000,	// Masks OUT this packet type 
-	
-	kBluetoothPacketTypeDM5			= 0x4000, 
-	kBluetoothPacketTypeDH5			= 0x8000, 
-	
-	kBluetoothPacketTypeEnd
-};
-
-// Setup Synchronous Packet types (Bluetooth 2.1 spec section 7.1.26 - Setup Synchronous Command)
-
-enum
-{
-	kBluetoothSynchronousConnectionPacketTypeHV1			= 0x0001,
-	kBluetoothSynchronousConnectionPacketTypeHV2			= 0x0002,
-	kBluetoothSynchronousConnectionPacketTypeHV3			= 0x0004,
-	kBluetoothSynchronousConnectionPacketTypeEV3			= 0x0008,
-	kBluetoothSynchronousConnectionPacketTypeEV4			= 0x0010,
-	kBluetoothSynchronousConnectionPacketTypeEV5			= 0x0020,
-
-	// masking out certain types:
-	
-	kBluetoothSynchronousConnectionPacketType2EV3Omit		= 0x0040,
-	kBluetoothSynchronousConnectionPacketType3EV3Omit		= 0x0080,
-	kBluetoothSynchronousConnectionPacketType2EV5Omit		= 0x0100,
-	kBluetoothSynchronousConnectionPacketType3EV5Omit		= 0x0200,
-	
-	kBluetoothSynchronousConnectionPacketTypeAll			= 0xFFFF,
-
-	kBluetoothSynchronousConnectionPacketTypeEnd
-};
-
-
-// LAP/Inquiry Access Codes
-
-typedef UInt32		BluetoothLAP;
-enum
-{
-	kBluetoothGeneralInquiryAccessCodeIndex		= 0, 			// General/Unlimited Inquiry Access Code (GIAC)
-	kBluetoothGeneralInquiryAccessCodeLAPValue 	= 0x9E8B33, 	// General/Unlimited Inquiry Access Code (GIAC)
-	
-	kBluetoothLimitedInquiryAccessCodeIndex		= 1, 			// Limited Dedicated Inquiry Access Code (LIAC)
-	kBluetoothLimitedInquiryAccessCodeLAPValue 	= 0x9E8B00, 	// Limited Dedicated Inquiry Access Code (LIAC)
-	
-	// All other access codes are reserved for future use (indices 2-63, LAP values 0x9E8B01-0x9E8B32 and 0x9E8B34-0x9E8B3F).
-	
-	kBluetoothLimitedInquiryAccessCodeEnd
-};
-
-// PageScanRepetitionMode
-
-typedef	UInt8	BluetoothPageScanRepetitionMode;
-enum
-{
-	kBluetoothPageScanRepetitionModeR0 			= 0x00, 
-	kBluetoothPageScanRepetitionModeR1 			= 0x01, 
-	kBluetoothPageScanRepetitionModeR2 			= 0x02
-	
-	// All other values are reserved for future use.
-};
-
-// PageScanPeriodMode
-
-typedef UInt8	BluetoothPageScanPeriodMode;
-enum
-{
-	kBluetoothPageScanPeriodModeP0 				= 0x00, 
-	kBluetoothPageScanPeriodModeP1 				= 0x01, 
-	kBluetoothPageScanPeriodModeP2 				= 0x02
-	
-	// All other values are reserved for future use.
-};
-
-// PageScanMode
-
-typedef UInt8	BluetoothPageScanMode;
-enum
-{
-	kBluetoothPageScanModeMandatory 			= 0x00, 
-	kBluetoothPageScanModeOptional1 			= 0x01, 
-	kBluetoothPageScanModeOptional2 			= 0x02, 
-	kBluetoothPageScanModeOptional3 			= 0x03
-	
-	// All other values are reserved for future use.
-};
-
-#if 0
-#pragma mark -
-#pragma mark === Devices ===
-#endif
-
-typedef struct	BluetoothDeviceAddress		BluetoothDeviceAddress;
-struct	BluetoothDeviceAddress
-{
-	UInt8		data[ 6 ];
-};
-
-typedef struct	BluetoothKey				BluetoothKey;
-struct	BluetoothKey
-{
-	UInt8		data[ 16 ];
-};
-
-typedef struct	BluetoothPINCode			BluetoothPINCode;
-struct	BluetoothPINCode
-{
-	UInt8		data[ 16 ];		// PIN codes may be up to 128 bits.
-};
-
-
-//	Physical layout of the "class of device/service" field (see Bluetooth Assigned Numbers section 1.2):
-//
-//	 2 2 2 2 1 1 1 1 1 1 1 1 1 1
-//	 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0  <- Bit Transmission Order
-//	+---------------+---------------+---------------+
-//	|    octet 3    |    octet 2    |    octet 1    | <- Octet Transmission Order
-//	+---------------+---------------+---------------+
-//	<------ 11 bits ----->< 5 bits ><- 6 bits ->
-//	+---------------------+---------+-----------+-+-+
-//	|   Service Classes   | Major   |  Minor    | | |
-//	+-+-+-+-+-+-+-+-+-+-+-+  Device |   Device  |0|0|
-//	| | | | | | | |*|*|*| |   Class |    Class  | | |
-//	+-+-+-+-+-+-+-+-+-+-+-+---------+-----------+-+-+
-//	 | | | | | | |       |                        |
-//   | | | | | | |       + Limited Discoverable   +- Format Type
-//	 | | | | | | +- Networking
-//	 | | | | | +- Rendering
-//	 | | | | +- Capturing
-//	 | | | +- Object Transfer
-//	 | | +- Audio
-//	 | +- Telephony
-//	 +- Information
-
-typedef UInt32		BluetoothClassOfDevice;
-
-#define		BluetoothGetDeviceClassMajor( inCOD )		( (inCOD & 0x00001F00) >> 8 )
-#define		BluetoothGetDeviceClassMinor( inCOD )		( (inCOD & 0x000000FC) >> 2 )
-#define		BluetoothGetServiceClassMajor( inCOD )		( (inCOD & 0x00FFE000) >> 13 )
-#define		BluetoothMakeClassOfDevice( inServiceClassMajor, inDeviceClassMajor, inDeviceClassMinor )		\
-										(((inServiceClassMajor << 13) & 0x00FFE000) | ((inDeviceClassMajor << 8) & 0x00001F00) | ((inDeviceClassMinor << 2) & 0x000000FC))
-
-///
-/// Major Service Classes (11-bit value - bits 13-23 of Device/Service field)
-///
-
-typedef UInt32		BluetoothServiceClassMajor;
-// Service Class Major enum in BluetoothAssignedNumbers.h
-
-///
-/// Major Device Classes (5-bit value - bits 8-12 of Device/Service field)
-///
-
-typedef UInt32		BluetoothDeviceClassMajor;
-// Device Class Major enum in BluetoothAssignedNumbers.h
-
-///
-/// Minor Device Classes (6-bit value - bits 2-7 of Device/Service field)
-///
-
-typedef UInt32		BluetoothDeviceClassMinor;
-// Device Class Minor enum in BluetoothAssignedNumbers.h
-
-// Misc Device Types
-
-enum
-{
-	kBluetoothDeviceNameMaxLength	= 248
-};
-typedef UInt8	BluetoothDeviceName[ 256 ];		// Max 248 bytes of UTF-8 encoded Unicode.
-typedef UInt16	BluetoothClockOffset;			// Bits 14-0 come from bits 16-2 of CLKslav-CLKmaster.
-typedef UInt8	BluetoothRole;					// 
-typedef UInt8	BluetoothAllowRoleSwitch;		// 0x00-0x01 valid, 0x02-0xFF reserved.
-enum
-{
-	kBluetoothDontAllowRoleSwitch 	= 0x00, 
-	kBluetoothAllowRoleSwitch 		= 0x01
-};
-
-enum
-{
-	kBluetoothRoleBecomeMaster 	= 0x00, 
-	kBluetoothRoleRemainSlave 	= 0x01
-};
-
-typedef struct BluetoothSetEventMask	BluetoothSetEventMask;
-struct	BluetoothSetEventMask
-{
-	UInt8		data[ 8 ];
-};
-
-typedef UInt8	BluetoothPINType;
-
-
-#if 0
-#pragma mark -
-#pragma mark === L2CAP ===
-#endif
-
-//===========================================================================================================================
-//	Logical Link Control and Adaptation Protocol (L2CAP)
-//===========================================================================================================================
-
-
-// ACL Packet values (Bluetooth L2CAP spec section 1).
-
-enum
-{
-	kBluetoothL2CAPMaxPacketSize					= 65535,	// Max number of data bytes in an L2CAP packet.
-
-	kBluetoothACLLogicalChannelReserved 			= 0, 		// [00] Reserved for future use
-	kBluetoothACLLogicalChannelL2CAPContinue	 	= 1, 		// [01] Continuation of L2CAP packet.
-	kBluetoothACLLogicalChannelL2CAPStart 			= 2, 		// [10] Start of L2CAP packet.
-	kBluetoothACLLogicalChannelLMP	 				= 3			// [11] Link Manager Protocol packet.
-};
-
-// Channel Identifiers (Bluetooth L2CAP spec section 2.1).
-
-typedef UInt16		BluetoothL2CAPChannelID;
-enum
-{
-	kBluetoothL2CAPChannelNull					= 0x0000, 	// Illegal, should not be used
-	kBluetoothL2CAPChannelSignalling	 		= 0x0001, 	// L2CAP signalling channel
-	kBluetoothL2CAPChannelConnectionLessData	= 0x0002, 	// L2CAP connection less data
-	kBluetoothL2CAPChannelAMPManagerProtocol	= 0x0003,	// AMP Manager Protocol
-	
-	// Range 0x0003 to 0x003F reserved for future use.
-	kBluetoothL2CAPChannelReservedStart			= 0x0004,
-    kBluetoothL2CAPChannelReservedEnd			= 0x003F,
-    
-    // Range 0x0040 to 0xFFFF are dynamically allocated.
-    kBluetoothL2CAPChannelDynamicStart			= 0x0040,
-    kBluetoothL2CAPChannelDynamicEnd			= 0xffff,
-	kBluetoothL2CAPChannelEnd					= 0xffff
-};
-
-typedef BluetoothL2CAPChannelID		BluetoothL2CAPGroupID;
-
-// Protocol/Service Multiplexor (PSM) values (Bluetooth L2CAP spec section 5.2).
-
-typedef UInt16		BluetoothL2CAPPSM;
-// PSM enum in BluetoothAssignedNumbers.h
-
-// Command Codes
-
-typedef enum
-{
-	kBluetoothL2CAPCommandCodeReserved							= 0x00, 
-	kBluetoothL2CAPCommandCodeCommandReject						= 0x01, 
-	kBluetoothL2CAPCommandCodeConnectionRequest					= 0x02, 
-	kBluetoothL2CAPCommandCodeConnectionResponse				= 0x03, 
-	kBluetoothL2CAPCommandCodeConfigureRequest					= 0x04, 
-	kBluetoothL2CAPCommandCodeConfigureResponse					= 0x05, 
-	kBluetoothL2CAPCommandCodeDisconnectionRequest				= 0x06, 
-	kBluetoothL2CAPCommandCodeDisconnectionResponse				= 0x07, 
-	kBluetoothL2CAPCommandCodeEchoRequest						= 0x08, 
-	kBluetoothL2CAPCommandCodeEchoResponse						= 0x09, 
-	kBluetoothL2CAPCommandCodeInformationRequest				= 0x0A, 
-	kBluetoothL2CAPCommandCodeInformationResponse				= 0x0B,
-	kBluetoothL2CAPCommandCodeCreateChannelRequest				= 0x0C,
-	kBluetoothL2CAPCommandCodeCreateChannelResponse				= 0x0D,
-	kBluetoothL2CAPCommandCodeMoveChannelRequest				= 0x0E,
-	kBluetoothL2CAPCommandCodeMoveChannelResponse				= 0x0F,
-	kBluetoothL2CAPCommandCodeMoveChannelConfirmation			= 0x10,
-	kBluetoothL2CAPCommandCodeMoveChannelConfirmationResponse	= 0x11,
-} BluetoothL2CAPCommandCode;
-
-// Command Reject
-
-typedef enum
-{
-	kBluetoothL2CAPCommandRejectReasonCommandNotUnderstood 	= 0x0000, 
-	kBluetoothL2CAPCommandRejectReasonSignallingMTUExceeded = 0x0001, 
-	kBluetoothL2CAPCommandRejectReasonInvalidCIDInRequest 	= 0x0002, 
-} BluetoothL2CAPCommandRejectReason;
-
-typedef UInt16		BluetoothL2CAPMTU;
-typedef	UInt16		BluetoothL2CAPLinkTimeout;
-typedef UInt16		BluetoothL2CAPFlushTimeout;
-enum
-{
-	kBluetoothL2CAPFlushTimeoutUseExisting 	= 0x0000, 
-	kBluetoothL2CAPFlushTimeoutImmediate 	= 0x0001, 
-	kBluetoothL2CAPFlushTimeoutForever 		= 0xFFFF, 
-	
-	kBluetoothL2CAPFlushTimeoutEnd
-};
-
-typedef struct BluetoothL2CAPQualityOfServiceOptions	BluetoothL2CAPQualityOfServiceOptions;
-struct BluetoothL2CAPQualityOfServiceOptions
-{
-	UInt8		flags;
-	UInt8		serviceType;
-	UInt32		tokenRate;
-	UInt32		tokenBucketSize;
-	UInt32		peakBandwidth;
-	UInt32		latency;
-	UInt32		delayVariation;
-};
-
-typedef struct BluetoothL2CAPRetransmissionAndFlowControlOptions BluetoothL2CAPRetransmissionAndFlowControlOptions;
-struct BluetoothL2CAPRetransmissionAndFlowControlOptions
-{
-	UInt8		flags;
-	UInt8		txWindowSize;
-	UInt8		maxTransmit;
-	UInt16		retransmissionTimeout;
-	UInt16		monitorTimeout;
-	UInt16		maxPDUPayloadSize;
-};
-
-enum
-{
-	kBluetoothL2CAPInfoTypeMaxConnectionlessMTUSize = 0x0001
-};
-
-// Packets
-
-enum
-{
-	kBluetoothL2CAPPacketHeaderSize = 4
-};
-
-typedef UInt16		BluetoothL2CAPByteCount;
-typedef UInt8		BluetoothL2CAPCommandID;
-typedef UInt16		BluetoothL2CAPCommandByteCount;
-
-typedef enum
-{
-    kBluetoothL2CAPConnectionResultSuccessful				= 0x0000,
-    kBluetoothL2CAPConnectionResultPending					= 0x0001,
-    kBluetoothL2CAPConnectionResultRefusedPSMNotSupported	= 0x0002,
-    kBluetoothL2CAPConnectionResultRefusedSecurityBlock		= 0x0003,
-    kBluetoothL2CAPConnectionResultRefusedNoResources		= 0x0004,
-} BluetoothL2CAPConnectionResult;
-
-typedef enum 
-{
-    kBluetoothL2CAPConnectionStatusNoInfoAvailable			= 0x0000,
-    kBluetoothL2CAPConnectionStatusAuthenticationPending	= 0x0001,
-    kBluetoothL2CAPConnectionStatusAuthorizationPending		= 0x0002,
-} BluetoothL2CAPConnectionStatus;
-
-typedef enum
-{
-    kBluetoothL2CAPConfigurationResultSuccess					= 0x0000,
-    kBluetoothL2CAPConfigurationResultUnacceptableParams		= 0x0001,
-    kBluetoothL2CAPConfigurationResultRejected					= 0x0002,
-    kBluetoothL2CAPConfigurationResultUnknownOptions			= 0x0003,
-} BluetoothL2CAPConfigurationResult;
-
-typedef enum
-{
-    kBluetoothL2CAPConfigurationOptionMTU                           = 0x01,
-    kBluetoothL2CAPConfigurationOptionFlushTimeout                  = 0x02,
-    kBluetoothL2CAPConfigurationOptionQoS                           = 0x03,
-    kBluetoothL2CAPConfigurationOptionRetransmissionAndFlowControl  = 0x04
-} BluetoothL2CAPConfigurationOption;
-
-enum
-{
-    kBluetoothL2CAPConfigurationOptionMTULength                             = 2,
-    kBluetoothL2CAPConfigurationOptionFlushTimeoutLength                    = 2,
-    kBluetoothL2CAPConfigurationOptionQoSLength                             = 22,
-    kBluetoothL2CAPConfigurationOptionRetransmissionAndFlowControlLength    = 9
-};
-
-typedef enum
-{
-    kBluetoothL2CAPConfigurationRetransmissionModeFlag  = 0x01,
-    kBluetoothL2CAPConfigurationFlowControlModeFlag     = 0x02,
-    kBluetoothL2CAPConfigurationBasicL2CAPModeFlag      = 0x00,
-} BluetoothL2CAPConfigurationRetransmissionAndFlowControlFlags;
-
-
-typedef enum
-{
-    kBluetoothL2CAPInformationTypeConnectionlessMTU			= 0x0001,
-    kBluetoothL2CAPInformationTypeExtendedFeatures			= 0x0002,
-	kBluetoothL2CAPInformationTypeFixedChannelsSupported	= 0x0003,
-} BluetoothL2CAPInformationType;
-
-typedef enum
-{
-    kBluetoothL2CAPInformationResultSuccess			= 0x0000,
-    kBluetoothL2CAPInformationResultNotSupported	= 0x0001,
-} BluetoothL2CAPInformationResult;
-
-typedef enum
-{
-    kBluetoothL2CAPInformationNoExtendedFeatures			= 0x00000000,
-    kBluetoothL2CAPInformationFlowControlMode				= 0x00000001,
-    kBluetoothL2CAPInformationRetransmissionMode			= 0x00000002,
-    kBluetoothL2CAPInformationBidirectionalQoS				= 0x00000004,
-	kBluetoothL2CAPInformationEnhancedRetransmissionMode	= 0x00000008,
-	kBluetoothL2CAPInformationStreamingMode					= 0x00000010,
-	kBluetoothL2CAPInformationFCSOption						= 0x00000020,
-	kBluetoothL2CAPInformationExtendedFlowSpecification		= 0x00000040,
-	kBluetoothL2CAPInformationFixedChannels					= 0x00000080,
-	kBluetoothL2CAPInformationExtendedWindowSize			= 0x00000100,
-	kBluetoothL2CAPUnicastConnectionlessDataReception		= 0x00000200,
-} BluetoothL2CAPInformationExtendedFeaturesMask;
-
-typedef enum
-{
-    kBluetoothL2CAPQoSTypeNoTraffic     = 0x00,
-    kBluetoothL2CAPQoSTypeBestEffort	= 0x01,
-    kBluetoothL2CAPQoSTypeGuaranteed	= 0x02,
-} BluetoothL2CAPQoSType;
-
-enum
-{
-	kBluetoothL2CAPMTUMinimum					= 0x0030,	// 48 bytes
-	kBluetoothL2CAPMTUDefault					= 0x03F9,	// 11.10.08 - dropped back to 1017 from 1021 (don't aggravate the 3DH5 problem between CSR<->BRCM just yet)
-	kBluetoothL2CAPMTUMaximum					= 0xffff,	
-	kBluetoothL2CAPMTUStart						= 0x7fff,
-	kBluetoothL2CAPMTUSIG						= 0x0030,	// 48 bytes
-	kBluetoothL2CAPFlushTimeoutDefault			= kBluetoothL2CAPFlushTimeoutForever,	// 0xffff
-	kBluetoothL2CAPQoSFlagsDefault				= 0,
-	kBluetoothL2CAPQoSTypeDefault				= kBluetoothL2CAPQoSTypeBestEffort,	// 0x01
-	kBluetoothL2CAPQoSTokenRateDefault			= 0x00000000,
-	kBluetoothL2CAPQoSTokenBucketSizeDefault	= 0x00000000,
-	kBluetoothL2CAPQoSPeakBandwidthDefault		= 0x00000000,
-	kBluetoothL2CAPQoSLatencyDefault			= 0xffffffff,
-	kBluetoothL2CAPQoSDelayVariationDefault		= 0xffffffff
-};
-
-#pragma mark === AMP Manager ===
-typedef enum {
-	kBluetoothAMPManagerCodeReserved							= 0x00,
-	kBluetoothAMPManagerCodeAMPCommandReject					= 0x01,
-	kBluetoothAMPManagerCodeAMPDiscoverRequest					= 0x02,
-	kBluetoothAMPManagerCodeAMPDiscoverResponse					= 0x03,
-	kBluetoothAMPManagerCodeAMPChangeNotify						= 0x04,
-	kBluetoothAMPManagerCodeAMPChangeResponse					= 0x05,
-	kBluetoothAMPManagerCodeAMPGetInfoRequest					= 0x06,
-	kBluetoothAMPManagerCodeAMPGetInfoResponse					= 0x07,
-	kBluetoothAMPManagerCodeAMPGetAssocRequest					= 0x08,
-	kBluetoothAMPManagerCodeAMPGetAssocResponse					= 0x09,
-	kBluetoothAMPManagerCodeAMPCreatePhysicalLinkRequest		= 0x0A,
-	kBluetoothAMPManagerCodeAMPCreatePhysicalLinkResponse		= 0x0B,
-	kBluetoothAMPManagerCodeAMPDisconnectPhysicalLinkRequest	= 0x0C,
-	kBluetoothAMPManagerCodeAMPDisconnectPhysicalLinkResponse	= 0x0D,
-} BluetoothAMPManagerCode;
-		
-typedef enum {
-	kBluetoothAMPManagerCommandRejectReasonCommandNotRecognized	= 0x0000,
-} BluetoothAMPCommandRejectReason;
-		
-typedef enum {
-	kBluetoothAMPManagerDiscoverResponseControllerStatusPoweredDown		= 0x00,
-	kBluetoothAMPManagerDiscoverResponseControllerStatusBluetoothOnly	= 0x01,
-	kBluetoothAMPManagerDiscoverResponseControllerStatusNoCapacity		= 0x02,
-	kBluetoothAMPManagerDiscoverResponseControllerStatusLowCapacity		= 0x03,
-	kBluetoothAMPManagerDiscoverResponseControllerStatusMediumCapacity	= 0x04,
-	kBluetoothAMPManagerDiscoverResponseControllerStatusHighCapacity	= 0x05,
-	kBluetoothAMPManagerDiscoverResponseControllerStatusFullCapacity	= 0x06,
-} BluetoothAMPDiscoverResponseControllerStatus;
-		
-typedef enum {
-	kBluetoothAMPManagerGetInfoResponseSuccess				= 0x00,
-	kBluetoothAMPManagerGetInfoResponseInvalidControllerID	= 0x01,
-} BluetoothAMPGetInfoResponseStatus;
-		
-typedef enum {
-	kBluetoothAMPManagerGetAssocResponseSuccess				= 0x00,
-	kBluetoothAMPManagerGetAssocResponseInvalidControllerID	= 0x01,
-} BluetoothAMPGetAssocResponseStatus;
-		
-typedef enum {
-	kBluetoothAMPManagerCreatePhysicalLinkResponseSuccess										= 0x00,
-	kBluetoothAMPManagerCreatePhysicalLinkResponseInvalidControllerID							= 0x01,
-	kBluetoothAMPManagerCreatePhysicalLinkResponseUnableToStartLinkCreation						= 0x02,
-	kBluetoothAMPManagerCreatePhysicalLinkResponseCollisionOccurred								= 0x03,
-	kBluetoothAMPManagerCreatePhysicalLinkResponseAMPDisconnectedPhysicalLinkRequestReceived	= 0x04,
-	kBluetoothAMPManagerCreatePhysicalLinkResponsePhysicalLinkAlreadyExists						= 0x05,
-	kBluetoothAMPManagerCreatePhysicalLinkResponseSecurityViolation								= 0x06,
-} BluetoothAMPCreatePhysicalLinkResponseStatus;
-		
-typedef enum {
-	kBluetoothAMPManagerDisconnectPhysicalLinkResponseSuccess				= 0x00,
-	kBluetoothAMPManagerDisconnectPhysicalLinkResponseInvalidControllerID	= 0x01,
-	kBluetoothAMPManagerDisconnectPhysicalLinkResponseNoPhysicalLink		= 0x02,
-} BluetoothAMPDisconnectPhysicalLinkResponseStatus;
-
-#if 0
-#pragma mark -
-#pragma mark === HCI ===
-#endif
-
-//===========================================================================================================================
-//	Host Controller Interface (HCI)
-//===========================================================================================================================
-
-//	HCI Command Packet
-//	------------------
-//	
-//	                     1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3
-//	 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-//	+--------------------------------+---------------+--------------+
-//	|            OpCode              |               |              |
-//	+--------------------+-----------| Param Length  |  Params...   |
-//	|         OCF        |    OGF    |               |              |
-//	+--------------------+-----------+---------------+--------------+
-//	|                                                               |
-//	|                         Params...                             |
-//	|                                                               |
-//	+---------------------------------------------------------------+
-
-// Commands
-
-typedef UInt8		BluetoothHCICommandOpCodeGroup;
-typedef UInt16		BluetoothHCICommandOpCodeCommand;
-typedef UInt16		BluetoothHCICommandOpCode;
-typedef	UInt32		BluetoothHCIVendorCommandSelector;
-
-#define	BluetoothHCIMakeCommandOpCode( GROUP, CMD )				( ( ( ( GROUP ) & 0x003F ) << 10 ) | ( ( CMD ) & 0x03FF ) )
-#define	BluetoothHCIMakeCommandOpCodeEndianSwap( GROUP, CMD )	( CFSwapInt16HostToLittle ( BluetoothHCIMakeCommandOpCode( GROUP, CMD ) ) )
-#define	BluetoothHCIExtractCommandOpCodeGroup( OPCODE )			( ( ( OPCODE ) >> 10 ) & 0x003F )
-#define	BluetoothHCIExtractCommandOpCodeCommand( OPCODE )		( ( OPCODE ) & 0x03FF )
-
-#define BluetoothHCIMakeCommandOpCodeHostOrder(GROUP, CMD )	OSSwapLittleToHostConstInt16( ( ( ( GROUP ) & 0x003F ) << 10 ) | ( ( CMD ) & 0x03FF ) )
-
-
-enum
-{
-	// Command Group: NoOp
-	
-	kBluetoothHCIOpCodeNoOp												= 0, 
-	kBluetoothHCICommandGroupNoOp										= 0x00, 
-		kBluetoothHCICommandNoOp										= 0x0000,
-	
-	// Command Group: Link Control
-	
-	kBluetoothHCICommandGroupLinkControl								= 0x01, 
-		kBluetoothHCICommandInquiry										= 0x0001, 
-		kBluetoothHCICommandInquiryCancel								= 0x0002, 
-		kBluetoothHCICommandPeriodicInquiryMode							= 0x0003, 
-		kBluetoothHCICommandExitPeriodicInquiryMode						= 0x0004, 
-		kBluetoothHCICommandCreateConnection							= 0x0005, 
-		kBluetoothHCICommandDisconnect									= 0x0006, 
-		kBluetoothHCICommandAddSCOConnection							= 0x0007,
-		kBluetoothHCICommandCreateConnectionCancel						= 0x0008,
-		kBluetoothHCICommandAcceptConnectionRequest						= 0x0009, 
-		kBluetoothHCICommandRejectConnectionRequest						= 0x000A, 
-		kBluetoothHCICommandLinkKeyRequestReply							= 0x000B, 
-		kBluetoothHCICommandLinkKeyRequestNegativeReply					= 0x000C, 
-		kBluetoothHCICommandPINCodeRequestReply							= 0x000D, 
-		kBluetoothHCICommandPINCodeRequestNegativeReply					= 0x000E, 
-		kBluetoothHCICommandChangeConnectionPacketType					= 0x000F, 
-		kBluetoothHCICommandAuthenticationRequested						= 0x0011, 
-		kBluetoothHCICommandSetConnectionEncryption						= 0x0013, 
-		kBluetoothHCICommandChangeConnectionLinkKey						= 0x0015, 
-		kBluetoothHCICommandMasterLinkKey								= 0x0017, 
-		kBluetoothHCICommandRemoteNameRequest							= 0x0019, 
-		kBluetoothHCICommandReadRemoteSupportedFeatures					= 0x001B, 
-		kBluetoothHCICommandReadRemoteExtendedFeatures					= 0x001C, 
-		kBluetoothHCICommandReadRemoteVersionInformation				= 0x001D, 
-		kBluetoothHCICommandReadClockOffset								= 0x001F, 
-		kBluetoothHCICommandRemoteNameRequestCancel						= 0x001A,
-		kBluetoothHCICommandReadLMPHandle								= 0x0020,
-		kBluetoothHCICommandSetupSynchronousConnection					= 0x0028,
-		kBluetoothHCICommandAcceptSynchronousConnectionRequest			= 0x0029,
-		kBluetoothHCICommandRejectSynchronousConnectionRequest			= 0x002A,
-		kBluetoothHCICommandIOCapabilityRequestReply					= 0x002B,
-		kBluetoothHCICommandUserConfirmationRequestReply				= 0x002C,
-		kBluetoothHCICommandUserConfirmationRequestNegativeReply		= 0x002D,
-		kBluetoothHCICommandUserPasskeyRequestReply						= 0x002E,
-		kBluetoothHCICommandUserPasskeyRequestNegativeReply				= 0x002F,
-		kBluetoothHCICommandRemoteOOBDataRequestReply					= 0x0030,
-		kBluetoothHCICommandRemoteOOBDataRequestNegativeReply			= 0x0033,
-
-	// Command Group: Link Policy
-	
-	kBluetoothHCICommandGroupLinkPolicy									= 0x02, 
-		kBluetoothHCICommandHoldMode									= 0x0001, 
-		kBluetoothHCICommandSniffMode									= 0x0003, 
-		kBluetoothHCICommandExitSniffMode								= 0x0004, 
-		kBluetoothHCICommandParkMode									= 0x0005, 
-		kBluetoothHCICommandExitParkMode								= 0x0006, 
-		kBluetoothHCICommandQoSSetup									= 0x0007, 
-		kBluetoothHCICommandRoleDiscovery								= 0x0009, 
-		kBluetoothHCICommandSwitchRole									= 0x000B, 
-		kBluetoothHCICommandReadLinkPolicySettings						= 0x000C, 
-		kBluetoothHCICommandWriteLinkPolicySettings						= 0x000D, 
-		kBluetoothHCICommandReadDefaultLinkPolicySettings				= 0x000E,
-		kBluetoothHCICommandWriteDefaultLinkPolicySettings				= 0x000F,
-		kBluetoothHCICommandFlowSpecification							= 0x0010,
-		kBluetoothHCICommandSniffSubrating								= 0x0011,
-		kBluetoothHCICommandAcceptSniffRequest							= 0x0031,
-		kBluetoothHCICommandRejectSniffRequest							= 0x0032,
-	
-	// Command Group: Host Controller & Baseband
-	
-	kBluetoothHCICommandGroupHostController								= 0x03, 
-		kBluetoothHCICommandSetEventMask								= 0x0001, 
-		kBluetoothHCICommandReset										= 0x0003, 
-		kBluetoothHCICommandSetEventFilter								= 0x0005, 
-		kBluetoothHCICommandFlush										= 0x0008, 
-		kBluetoothHCICommandReadPINType									= 0x0009, 
-		kBluetoothHCICommandWritePINType								= 0x000A, 
-		kBluetoothHCICommandCreateNewUnitKey							= 0x000B, 
-		kBluetoothHCICommandReadStoredLinkKey							= 0x000D, 
-		kBluetoothHCICommandWriteStoredLinkKey							= 0x0011, 
-		kBluetoothHCICommandDeleteStoredLinkKey							= 0x0012, 
-		kBluetoothHCICommandChangeLocalName								= 0x0013, 
-		kBluetoothHCICommandReadLocalName								= 0x0014, 
-		kBluetoothHCICommandReadConnectionAcceptTimeout					= 0x0015, 
-		kBluetoothHCICommandWriteConnectionAcceptTimeout				= 0x0016, 
-		kBluetoothHCICommandReadPageTimeout								= 0x0017, 
-		kBluetoothHCICommandWritePageTimeout							= 0x0018, 
-		kBluetoothHCICommandReadScanEnable								= 0x0019, 
-		kBluetoothHCICommandWriteScanEnable								= 0x001A, 
-		kBluetoothHCICommandReadPageScanActivity						= 0x001B, 
-		kBluetoothHCICommandWritePageScanActivity						= 0x001C, 
-		kBluetoothHCICommandReadInquiryScanActivity						= 0x001D, 
-		kBluetoothHCICommandWriteInquiryScanActivity					= 0x001E, 
-		kBluetoothHCICommandReadAuthenticationEnable					= 0x001F, 
-		kBluetoothHCICommandWriteAuthenticationEnable					= 0x0020, 
-		kBluetoothHCICommandReadEncryptionMode							= 0x0021, 
-		kBluetoothHCICommandWriteEncryptionMode							= 0x0022, 
-		kBluetoothHCICommandReadClassOfDevice							= 0x0023,
-		kBluetoothHCICommandWriteClassOfDevice							= 0x0024, 
-		kBluetoothHCICommandReadVoiceSetting							= 0x0025,
-		kBluetoothHCICommandWriteVoiceSetting							= 0x0026, 
-		kBluetoothHCICommandReadAutomaticFlushTimeout					= 0x0027, 
-		kBluetoothHCICommandWriteAutomaticFlushTimeout					= 0x0028, 
-		kBluetoothHCICommandReadNumberOfBroadcastRetransmissions		= 0x0029, 
-		kBluetoothHCICommandWriteNumberOfBroadcastRetransmissions		= 0x002A, 
-		kBluetoothHCICommandReadHoldModeActivity						= 0x002B, 
-		kBluetoothHCICommandWriteHoldModeActivity						= 0x002C, 
-		kBluetoothHCICommandReadTransmitPowerLevel						= 0x002D, 
-		kBluetoothHCICommandReadSCOFlowControlEnable					= 0x002E, 
-		kBluetoothHCICommandWriteSCOFlowControlEnable					= 0x002F, 
-		kBluetoothHCICommandSetHostControllerToHostFlowControl			= 0x0031, 
-		kBluetoothHCICommandHostBufferSize								= 0x0033, 
-		kBluetoothHCICommandHostNumberOfCompletedPackets				= 0x0035, 
-		kBluetoothHCICommandReadLinkSupervisionTimeout					= 0x0036, 
-		kBluetoothHCICommandWriteLinkSupervisionTimeout					= 0x0037, 
-		kBluetoothHCICommandReadNumberOfSupportedIAC					= 0x0038, 
-		kBluetoothHCICommandReadCurrentIACLAP							= 0x0039, 
-		kBluetoothHCICommandWriteCurrentIACLAP							= 0x003A, 
-		kBluetoothHCICommandReadPageScanPeriodMode						= 0x003B, 
-		kBluetoothHCICommandWritePageScanPeriodMode						= 0x003C, 
-		kBluetoothHCICommandReadPageScanMode							= 0x003D, 
-		kBluetoothHCICommandWritePageScanMode							= 0x003E, 
-		kBluetoothHCICommandSetAFHClassification						= 0x003F, 		
-		kBluetoothHCICommandReadInquiryScanType							= 0x0042, 		
-		kBluetoothHCICommandWriteInquiryScanType						= 0x0043, 		
-		kBluetoothHCICommandReadInquiryMode								= 0x0044, 		
-		kBluetoothHCICommandWriteInquiryMode							= 0x0045,
-		kBluetoothHCICommandReadPageScanType							= 0x0046,
-		kBluetoothHCICommandWritePageScanType							= 0x0047,
-		kBluetoothHCICommandReadAFHChannelAssessmentMode				= 0x0048,
-		kBluetoothHCICommandWriteAFHChannelAssessmentMode				= 0x0049,
-		kBluetoothHCICommandReadExtendedInquiryResponse					= 0x0051, 		
-		kBluetoothHCICommandWriteExtendedInquiryResponse				= 0x0052, 		
-		kBluetoothHCICommandReadSimplePairingMode						= 0x0055,
-		kBluetoothHCICommandWriteSimplePairingMode						= 0x0056,
-		kBluetoothHCICommandReadLocalOOBData							= 0x0057,
-		kBluetoothHCICommandReadInquiryResponseTransmitPower			= 0x0058,
-		kBluetoothHCICommandWriteInquiryResponseTransmitPower			= 0x0059,
-		kBluetoothHCICommandReadDefaultErroneousDataReporting			= 0x005A,
-		kBluetoothHCICommandWriteDefaultErroneousDataReporting			= 0x005B,
-		kBluetoothHCICommandReadPersistentSniffInterval					= 0x005C,
-		kBluetoothHCICommandWritePersistentSniffInterval				= 0x005D,
-		kBluetoothHCICommandDeletePersistentSniffInterval				= 0x005E,
-		kBluetoothHCICommandEnhancedFlush								= 0x005F,
-		kBluetoothHCICommandSendKeypressNotification					= 0x0060,
-	
-	// Command Group: Informational
-	
-	kBluetoothHCICommandGroupInformational								= 0x04, 
-		kBluetoothHCICommandReadLocalVersionInformation					= 0x0001, 
-		kBluetoothHCICommandReadLocalSupportedCommands					= 0x0002, 
-		kBluetoothHCICommandReadLocalSupportedFeatures					= 0x0003, 
-		kBluetoothHCICommandReadLocalExtendedFeatures					= 0x0004,
-		kBluetoothHCICommandReadBufferSize								= 0x0005, 
-		kBluetoothHCICommandReadCountryCode								= 0x0007, 
-		kBluetoothHCICommandReadDeviceAddress							= 0x0009, 
-	
-	// Command Group: Status
-	
-	kBluetoothHCICommandGroupStatus										= 0x05, 
-		kBluetoothHCICommandReadFailedContactCounter					= 0x0001, 
-		kBluetoothHCICommandResetFailedContactCounter					= 0x0002, 
-		kBluetoothHCICommandGetLinkQuality								= 0x0003, 
-		kBluetoothHCICommandReadRSSI									= 0x0005, 
-		kBluetoothHCICommandReadAFHMappings								= 0x0006,
-		kBluetoothHCICommandReadClock									= 0x0007,
-
-	// Command Group: Testing
-	
-	kBluetoothHCICommandGroupTesting									= 0x06, 
-		kBluetoothHCICommandReadLoopbackMode							= 0x0001, 
-		kBluetoothHCICommandWriteLoopbackMode							= 0x0002, 
-		kBluetoothHCICommandEnableDeviceUnderTestMode					= 0x0003, 
-		kBluetoothHCICommandWriteSimplePairingDebugMode					= 0x0004,
-
-	// Command Group: Logo Testing (no commands yet)
-	
-	kBluetoothHCICommandGroupLogoTesting 								= 0x3E, 
-	
-	// Command Group: Vendor Specific (from Broadcom HCI Programmer's Reference Guide)
-	
-	kBluetoothHCICommandGroupVendorSpecific								= 0x3f, 
-		kBluetoothHCICommandWriteDeviceAddress							= 0x0001, 
-		kBluetoothHCICommandWriteHoppingChannels						= 0x0012,
-		kBluetoothHCICommandInvalidateFlashAndReboot					= 0x0017,
-		kBluetoothHCICommandSetMaxPower									= 0x0026,
-		kBluetoothHCICommandEnableHIDEmulation							= 0x003B,
-		kBluetoothHCICommandEnableRadio									= 0x0034,
-		kBluetoothHCIGetHIDDeviceList									= 0x0036,
-		kBluetoothHCIAddHIDDevice										= 0x0037,
-		kBluetoothHCIRemoveHIDDevice									= 0x0039,
-	
-	kBluetoothHCICommandGroupMax										= 0x40, 
-	kBluetoothHCICommandMax												= 0x03FF
-};
-
-// HCI Data Types
-
-typedef UInt8										BluetoothHCIQoSFlags;
-typedef UInt8										BluetoothHCIParamByteCount;
-typedef UInt16										BluetoothHCIACLDataByteCount;
-typedef UInt8										BluetoothHCISCODataByteCount;
-typedef UInt8										BluetoothHCIInquiryLength;
-typedef UInt8										BluetoothHCIResponseCount;
-typedef UInt8										BluetoothHCICountryCode;
-typedef UInt16										BluetoothHCIModeInterval;
-typedef UInt16										BluetoothHCISniffAttemptCount;
-typedef UInt16										BluetoothHCISniffTimeout;
-typedef UInt16										BluetoothHCIParkModeBeaconInterval;
-
-typedef UInt8										BluetoothMaxSlots;
-typedef UInt16										BluetoothManufacturerName;
-typedef UInt8										BluetoothLMPVersion;
-typedef UInt16										BluetoothLMPSubversion;
-
-typedef UInt8										BluetoothHCIConnectionMode;
-enum BluetoothHCIConnectionModes
-{
-	kConnectionActiveMode					= 0,
-	kConnectionHoldMode						= 1,
-	kConnectionSniffMode					= 2,
-	kConnectionParkMode						= 3,
-	kConnectionModeReservedForFutureUse		= 4,
-};
-
-typedef struct	BluetoothHCISupportedFeatures		BluetoothHCISupportedFeatures;
-struct BluetoothHCISupportedFeatures
-{
-	UInt8	data[8];
-};
-
-#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1
-typedef UInt8										BluetoothHCIPageNumber;
-typedef struct	BluetoothHCIExtendedFeaturesInfo	BluetoothHCIExtendedFeaturesInfo;
-struct BluetoothHCIExtendedFeaturesInfo
-{
-	BluetoothHCIPageNumber	page;
-	BluetoothHCIPageNumber	maxPage;
-	UInt8					data[8];
-};
-#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1 */
-		
-enum BluetoothFeatureBits
-{
-	// Byte 0 of the support features data structure.
-
-	kBluetoothFeatureThreeSlotPackets					= (1 << 0L),
-	kBluetoothFeatureFiveSlotPackets					= (1 << 1L),
-	kBluetoothFeatureEncryption							= (1 << 2L),
-	kBluetoothFeatureSlotOffset							= (1 << 3L),
-	kBluetoothFeatureTimingAccuracy						= (1 << 4L),
-	kBluetoothFeatureSwitchRoles						= (1 << 5L),
-	kBluetoothFeatureHoldMode							= (1 << 6L),
-	kBluetoothFeatureSniffMode							= (1 << 7L),
-	
-	// Byte 1 of the support features data structure.
-
-	kBluetoothFeatureParkMode							= (1 << 0L),
-	kBluetoothFeatureRSSI								= (1 << 1L),
-	kBluetoothFeaturePowerControlRequests				= (1 << 1L),
-	kBluetoothFeatureChannelQuality						= (1 << 2L),
-	kBluetoothFeatureSCOLink							= (1 << 3L),
-	kBluetoothFeatureHV2Packets							= (1 << 4L),
-	kBluetoothFeatureHV3Packets							= (1 << 5L),
-	kBluetoothFeatureULawLog							= (1 << 6L),
-	kBluetoothFeatureALawLog							= (1 << 7L),
-
-	// Byte 2 of the support features data structure.
-
-	kBluetoothFeatureCVSD								= (1 << 0L),
-	kBluetoothFeaturePagingScheme						= (1 << 1L),
-	kBluetoothFeaturePowerControl						= (1 << 2L),
-	kBluetoothFeatureTransparentSCOData					= (1 << 3L),
-	kBluetoothFeatureFlowControlLagBit0					= (1 << 4L),
-	kBluetoothFeatureFlowControlLagBit1					= (1 << 5L),
-	kBluetoothFeatureFlowControlLagBit2					= (1 << 6L),
-	kBluetoothFeatureBroadcastEncryption				= (1 << 7L),	
-	
-	// Byte 3 of the support features data structure.	
-	
-	kBluetoothFeatureScatterMode						= (1 << 0L),
-	kBluetoothFeatureEnhancedDataRateACL2MbpsMode		= (1 << 1L),	
-	kBluetoothFeatureEnhancedDataRateACL3MbpsMode		= (1 << 2L),	
-	kBluetoothFeatureEnhancedInquiryScan				= (1 << 3L),
-	kBluetoothFeatureInterlacedInquiryScan				= (1 << 4L),	
-	kBluetoothFeatureInterlacedPageScan					= (1 << 5L),		
-	kBluetoothFeatureRSSIWithInquiryResult				= (1 << 6L),	
-	kBluetoothFeatureExtendedSCOLink					= (1 << 7L),
-
-	// Byte 4 of the support features data structure.	
-
-	kBluetoothFeatureEV4Packets							= (1 << 0L),
-	kBluetoothFeatureEV5Packets							= (1 << 1L),	
-	kBluetoothFeatureAbsenceMasks						= (1 << 2L),
-	kBluetoothFeatureAFHCapableSlave					= (1 << 3L),
-	kBluetoothFeatureAFHClassificationSlave				= (1 << 4L),	
-	kBluetoothFeatureAliasAuhentication					= (1 << 5L),
-	kBluetoothFeatureAnonymityMode						= (1 << 6L),
-	kBluetoothFeature3SlotEnhancedDataRateACLPackets	= (1 << 7L),
-	
-	// Byte 5 of the support features data structure.
-
-	kBluetoothFeature5SlotEnhancedDataRateACLPackets	= (1 << 0L), // 2.0 version of this header had this at the wrong bit location
-	kBluetoothFeatureSniffSubrating						= (1 << 1L),
-	kBluetoothFeaturePauseEncryption					= (1 << 2L),
-	kBluetoothFeatureAFHCapableMaster					= (1 << 3L),
-	kBluetoothFeatureAFHClassificationMaster			= (1 << 4L),
-	kBluetoothFeatureEnhancedDataRateeSCO2MbpsMode		= (1 << 5L),
-	kBluetoothFeatureEnhancedDataRateeSCO3MbpsMode		= (1 << 6L),
-	kBluetoothFeature3SlotEnhancedDataRateeSCOPackets	= (1 << 7L),
-	
-	// Byte 6 of the support features data structure.	
-
-	kBluetoothFeatureExtendedInquiryResponse			= (1 << 0L),
-	kBluetoothFeatureSecureSimplePairing				= (1 << 3L),
-	kBluetoothFeatureEncapsulatedPDU					= (1 << 4L),
-	kBluetoothFeatureErroneousDataReporting				= (1 << 5L),
-	kBluetoothFeatureNonFlushablePacketBoundaryFlag		= (1 << 6L),
-	
-	// Byte 7 of the support features data structure.
-
-	kBluetoothFeatureLinkSupervisionTimeoutChangedEvent	= (1 << 0L),
-	kBluetoothFeatureInquiryTransmissionPowerLevel		= (1 << 1L),
-	kBluetoothFeatureExtendedFeatures					= (1 << 7L),
-	
-	// Byte 8 of the support features data structure (extended)
-
-	kBluetoothFeatureSimpleSecurePairingHostMode		= (1 << 0L),
-
-};
-
-typedef UInt16										BluetoothHCIFailedContactCount;
-typedef struct BluetoothHCIFailedContactInfo		BluetoothHCIFailedContactInfo;
-struct BluetoothHCIFailedContactInfo
-{
-	BluetoothHCIFailedContactCount	count;
-	BluetoothConnectionHandle		handle;
-};
-
-typedef SInt8										BluetoothHCIRSSIValue;	/* Valid Range: -127 to +20 */
-typedef struct BluetoothHCIRSSIInfo					BluetoothHCIRSSIInfo;
-struct BluetoothHCIRSSIInfo
-{
-	BluetoothConnectionHandle		handle;
-	BluetoothHCIRSSIValue			RSSIValue;
-};
-
-typedef	UInt8										BluetoothHCILinkQuality;
-typedef struct BluetoothHCILinkQualityInfo			BluetoothHCILinkQualityInfo;
-struct BluetoothHCILinkQualityInfo
-{
-	BluetoothConnectionHandle		handle;
-	BluetoothHCILinkQuality			qualityValue;
-};
-
-typedef UInt8	BluetoothHCIRole;
-typedef struct	BluetoothHCIRoleInfo					BluetoothHCIRoleInfo;
-struct BluetoothHCIRoleInfo
-{
-	UInt8						role;
-	BluetoothConnectionHandle	handle;
-};
-
-enum BluetoothHCIRoles
-{
-	kBluetoothHCIMasterRole				= 0x00,
-	kBluetoothHCISlaveRole				= 0x01
-};
-
-typedef UInt16										BluetoothHCILinkPolicySettings;
-enum BluetoothHCILinkPolicySettingsValues
-{
-	kDisableAllLMModes					= 0x0000,
-	kEnableMasterSlaveSwitch			= 0x0001,
-	kEnableHoldMode						= 0x0002,
-	kEnableSniffMode					= 0x0004,
-	kEnableParkMode						= 0x0008,
-	kReservedForFutureUse				= 0x0010
-};
-
-typedef struct	BluetoothHCILinkPolicySettingsInfo		BluetoothHCILinkPolicySettingsInfo;
-struct BluetoothHCILinkPolicySettingsInfo
-{
-	BluetoothHCILinkPolicySettings		settings;
-	BluetoothConnectionHandle			handle;
-};
-
-
-typedef struct BluetoothHCIQualityOfServiceSetupParams	BluetoothHCIQualityOfServiceSetupParams;
-struct BluetoothHCIQualityOfServiceSetupParams
-{
-	UInt8		flags;
-	UInt8		serviceType;
-	UInt32		tokenRate;
-	UInt32		peakBandwidth;
-	UInt32		latency;
-	UInt32		delayVariation;
-};
-
-typedef UInt8										BluetoothHCILoopbackMode;
-enum
-{
-	kBluetoothHCILoopbackModeOff		= 0x00,
-	kBluetoothHCILoopbackModeLocal		= 0x01,
-	kBluetoothHCILoopbackModeRemote		= 0x02
-};
-
-typedef UInt32 BluetoothHCIOperationID;
-typedef UInt32 BluetoothHCIEventID;
-typedef UInt32 BluetoothHCIDataID;
-typedef UInt32 BluetoothHCISignalID;
-typedef UInt32 BluetoothHCITransportID;
-typedef UInt32 BluetoothHCITransportCommandID;
-typedef UInt32 BluetoothHCIRequestID;
-		
-
-// Version Information
-
-typedef struct	BluetoothHCIVersionInfo		BluetoothHCIVersionInfo;
-struct	BluetoothHCIVersionInfo
-{
-	// Local & Remote information
-	
-	BluetoothManufacturerName	manufacturerName;
-	BluetoothLMPVersion			lmpVersion;
-	BluetoothLMPSubversion		lmpSubVersion;
-	
-	// Local information only
-	
-	UInt8		hciVersion;
-	UInt16		hciRevision;
-};
-
-// HCI buffer sizes.
-
-typedef struct	BluetoothHCIBufferSize		BluetoothHCIBufferSize;
-struct	BluetoothHCIBufferSize
-{
-	UInt16	ACLDataPacketLength;
-	UInt8	SCODataPacketLength;
-	UInt16	totalNumACLDataPackets;
-	UInt16	totalNumSCODataPackets;
-};
-
-// Timeouts
-typedef UInt16	BluetoothHCIConnectionAcceptTimeout;
-typedef UInt16	BluetoothHCIPageTimeout;
-enum BluetoothHCITimeoutValues
-{
-	kDefaultPageTimeout			= 0x2000,
-};
-
-#define		BluetoothGetSlotsFromSeconds( inSeconds )		( (inSeconds/.000625 ) )
-
-
-// Link Keys
-typedef UInt16	BluetoothHCINumLinkKeysDeleted;
-typedef UInt8	BluetoothHCINumLinkKeysToWrite;
-typedef UInt8	BluetoothHCIDeleteStoredLinkKeyFlag;
-enum BluetoothHCIDeleteStoredLinkKeyFlags
-{
-	kDeleteKeyForSpecifiedDeviceOnly		= 0x00,
-	kDeleteAllStoredLinkKeys				= 0x01,
-};
-
-typedef UInt8	BluetoothHCIReadStoredLinkKeysFlag;
-enum BluetoothHCIReadStoredLinkKeysFlags
-{
-	kReturnLinkKeyForSpecifiedDeviceOnly		= 0x00,
-	kReadAllStoredLinkKeys						= 0x01,
-};
-
-typedef struct	BluetoothHCIStoredLinkKeysInfo	BluetoothHCIStoredLinkKeysInfo;
-struct BluetoothHCIStoredLinkKeysInfo
-{
-	UInt16	numLinkKeysRead;
-	UInt16	maxNumLinkKeysAllowedInDevice;
-};
-
-
-// Page Scan
-
-typedef UInt8	BluetoothHCIPageScanMode;
-enum BluetoothHCIPageScanModes
-{
-	kMandatoryPageScanMode		= 0x00,
-	kOptionalPageScanMode1		= 0x01,
-	kOptionalPageScanMode2		= 0x02,
-	kOptionalPageScanMode3		= 0x03,
-};
-
-typedef UInt8	BluetoothHCIPageScanPeriodMode;
-enum BluetoothHCIPageScanPeriodModes
-{
-	kP0Mode						= 0x00,
-	kP1Mode						= 0x01,
-	kP2Mode						= 0x02,
-};
-
-typedef UInt8	BluetoothHCIPageScanEnableState;
-enum BluetoothHCIPageScanEnableStates
-{
-	kNoScansEnabled							= 0x00,
-	kInquiryScanEnabledPageScanDisabled		= 0x01,
-	kInquiryScanDisabledPageScanEnabled		= 0x02,
-	kInquiryScanEnabledPageScanEnabled		= 0x03,
-};
-
-typedef struct	BluetoothHCIScanActivity	BluetoothHCIScanActivity;
-struct BluetoothHCIScanActivity
-{
-	UInt16 	scanInterval;
-	UInt16	scanWindow;
-};
-
-typedef struct	BluetoothHCIInquiryAccessCode	BluetoothHCIInquiryAccessCode;
-struct BluetoothHCIInquiryAccessCode
-{
-	UInt8 	data[3];
-};
-
-typedef UInt8 BluetoothHCIInquiryAccessCodeCount;
-typedef struct	BluetoothHCICurrentInquiryAccessCodes	BluetoothHCICurrentInquiryAccessCodes;
-struct BluetoothHCICurrentInquiryAccessCodes
-{
-	BluetoothHCIInquiryAccessCodeCount	count;	// Number of codes in array.
-	BluetoothHCIInquiryAccessCode *		codes;	// Ptr to array of codes.
-};
-
-typedef	struct BluetoothHCILinkSupervisionTimeout	BluetoothHCILinkSupervisionTimeout;
-struct BluetoothHCILinkSupervisionTimeout
-{
-	BluetoothConnectionHandle 	handle;
-	UInt16						timeout;
-};
-
-typedef UInt8 BluetoothHCIFlowControlState;
-enum BluetoothHCISCOFlowControlStates
-{
-	kSCOFlowControlDisabled		= 0x00,
-	kSCOFlowControlEnabled		= 0x01
-};
-
-enum BluetoothHCIGeneralFlowControlStates
-{
-	kHostControllerToHostFlowControlOff			= 0x00,
-	kHCIACLDataPacketsOnHCISCODataPacketsOff	= 0x01,
-	kHCIACLDataPacketsOffHCISCODataPacketsOn	= 0x02,
-	kHCIACLDataPacketsOnHCISCODataPacketsOn		= 0x03,
-};		
-		
-typedef SInt8 BluetoothHCITransmitPowerLevel;
-typedef UInt8 BluetoothHCITransmitPowerLevelType;
-enum BluetoothHCITransmitReadPowerLevelTypes
-{
-	kReadCurrentTransmitPowerLevel	= 0x00,
-	kReadMaximumTransmitPowerLevel	= 0x01,
-};
-
-typedef UInt8	BluetoothHCIAFHChannelAssessmentMode;	
-enum BluetoothHCIAFHChannelAssessmentModes
-{
-	kAFHChannelAssessmentModeDisabled		= 0x00,
-	kAFHChannelAssessmentModeEnabled		= 0x01
-};
-
-
-typedef struct BluetoothHCITransmitPowerLevelInfo	BluetoothHCITransmitPowerLevelInfo;
-struct BluetoothHCITransmitPowerLevelInfo
-{
-	BluetoothConnectionHandle		handle;
-	BluetoothHCITransmitPowerLevel	level; // Range: -70 <= N <= 20 (units are dBm)
-};
-
-typedef UInt8	BluetoothHCINumBroadcastRetransmissions;
-typedef UInt8	BluetoothHCIHoldModeActivity;
-enum BluetoothHCIHoldModeActivityStates
-{
-	kMaintainCurrentPowerState		= 0x00,
-	kSuspendPageScan				= 0x01,
-	kSuspendInquiryScan				= 0x02,
-	kSuspendPeriodicInquiries		= 0x03,
-};
-
-typedef UInt8 BluetoothHCIAuthenticationEnable;
-enum BluetoothHCIAuthentionEnableModes
-{
-	kAuthenticationDisabled			= 0x00,
-	kAuthenticationEnabled			= 0x01,
-};
-
-typedef UInt8	BluetoothHCIEncryptionMode;
-enum BluetoothHCIEncryptionModes
-{
-	kEncryptionDisabled									= 0x00,		// Default.
-	kEncryptionOnlyForPointToPointPackets				= 0x01,
-	kEncryptionForBothPointToPointAndBroadcastPackets	= 0x02,
-};
-
-typedef UInt16	BluetoothHCIAutomaticFlushTimeout;
-typedef struct	BluetoothHCIAutomaticFlushTimeoutInfo	BluetoothHCIAutomaticFlushTimeoutInfo;
-struct BluetoothHCIAutomaticFlushTimeoutInfo
-{
-	BluetoothConnectionHandle			handle;
-	BluetoothHCIAutomaticFlushTimeout	timeout;
-};
-
-#define	kInfoStringMaxLength		25
-typedef struct	BluetoothTransportInfo 		BluetoothTransportInfo;
-typedef 		BluetoothTransportInfo*		BluetoothTransportInfoPtr;
-struct			BluetoothTransportInfo
-{
-	UInt32	productID;
-	UInt32	vendorID;
-	UInt32	type;
-	char	productName[kInfoStringMaxLength];
-	char	vendorName[kInfoStringMaxLength];
-};
-
-enum BluetoothTransportTypes
-{
-	kBluetoothTransportTypeUSB				= 0x01,
-	kBluetoothTransportTypePCCard			= 0x02,
-	kBluetoothTransportTypePCICard			= 0x03
-};
-
-// Inquiries
-
-typedef struct	BluetoothHCIInquiryResult	BluetoothHCIInquiryResult;
-struct	BluetoothHCIInquiryResult
-{
-	BluetoothDeviceAddress				deviceAddress;
-	BluetoothPageScanRepetitionMode		pageScanRepetitionMode;
-	BluetoothHCIPageScanPeriodMode		pageScanPeriodMode;
-	BluetoothHCIPageScanMode			pageScanMode;
-	BluetoothClassOfDevice				classOfDevice;
-	BluetoothClockOffset				clockOffset;
-};
-
-#define kBluetoothHCIInquiryResultsMaxResults 50
-typedef struct	BluetoothHCIInquiryResults	BluetoothHCIInquiryResults;
-struct	BluetoothHCIInquiryResults
-{
-	BluetoothHCIInquiryResult		results[kBluetoothHCIInquiryResultsMaxResults];
-	IOItemCount						count;
-};
-
-#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0
-
-//Inquiries with RSSI (v1.2 specification)
-
-typedef struct	BluetoothHCIInquiryWithRSSIResult	BluetoothHCIInquiryWithRSSIResult;
-struct	BluetoothHCIInquiryWithRSSIResult
-{
-	BluetoothDeviceAddress				deviceAddress;
-	BluetoothPageScanRepetitionMode		pageScanRepetitionMode;
-	UInt8								reserved;
-	BluetoothClassOfDevice				classOfDevice;
-	BluetoothClockOffset				clockOffset;
-	BluetoothHCIRSSIValue				RSSIValue;
-};
-
-typedef struct	BluetoothHCIInquiryWithRSSIResults	BluetoothHCIInquiryWithRSSIResults;
-struct	BluetoothHCIInquiryWithRSSIResults
-{
-	BluetoothHCIInquiryWithRSSIResult	results[50];
-	IOItemCount							count;
-};
-
-//Inquiries with 'Extended Inquiry Response' (v2.1 specification)
-
-typedef UInt8	BluetoothHCIFECRequired;
-enum BluetoothHCIFECRequiredValues
-{
-	kBluetoothHCIFECRequired		= 0x00,
-	kBluetoothHCIFECNotRequired		= 0x01
-};
-
-typedef	UInt8	BluetoothHCIInquiryMode;
-enum BluetoothHCIInquiryModes
-{
-	kBluetoothHCIInquiryModeResultFormatStandard								=	0x00,
-	kBluetoothHCIInquiryModeResultFormatWithRSSI								=	0x01,
-	kBluetoothHCIInquiryModeResultFormatWithRSSIOrExtendedInquiryResultFormat	=	0x02
-};
-
-typedef	UInt8	BluetoothHCIExtendedInquiryResponseDataType;
-
-typedef struct	BluetoothHCIExtendedInquiryResponse		BluetoothHCIExtendedInquiryResponse;	/* Extended Inquiry Response [EIR] data, consisting of a sequence of data structures in this format: [length(1byte)][data type(1byte)][data(e.g. device name)] */
-struct	BluetoothHCIExtendedInquiryResponse
-{
-	UInt8		data[ 240 ];
-};
-
-typedef struct	BluetoothHCIReadExtendedInquiryResponseResults	BluetoothHCIReadExtendedInquiryResponseResults;
-struct	BluetoothHCIReadExtendedInquiryResponseResults
-{
-	BluetoothHCIFECRequired					outFECRequired;
-	BluetoothHCIExtendedInquiryResponse		extendedInquiryResponse;
-};
-
-typedef struct	BluetoothHCIExtendedInquiryResult	BluetoothHCIExtendedInquiryResult;
-struct	BluetoothHCIExtendedInquiryResult
-{
-	UInt8								numberOfReponses;			/* always a value of 1 */
-	BluetoothDeviceAddress				deviceAddress;
-	BluetoothPageScanRepetitionMode		pageScanRepetitionMode;
-	UInt8								reserved;
-	BluetoothClassOfDevice				classOfDevice;
-	BluetoothClockOffset				clockOffset;
-	BluetoothHCIRSSIValue				RSSIValue;
-	BluetoothHCIExtendedInquiryResponse	extendedInquiryResponse;
-};
-
-// 'Simple Pairing' (v2.1 specification)
-
-typedef	UInt8	BluetoothHCISimplePairingMode;
-enum BluetoothHCISimplePairingModes
-{
-	kBluetoothHCISimplePairingModeNotSet											=	0x00,
-	kBluetoothHCISimplePairingModeEnabled											=	0x01
-};
-
-typedef	UInt8	BluetoothSimplePairingDebugMode;
-enum BluetoothSimplePairingDebugModes
-{
-	kBluetoothHCISimplePairingDebugModeDisabled										=	0x00,
-	kBluetoothHCISimplePairingDebugModeEnabled										=	0x01
-};
-
-typedef struct	BluetoothHCISimplePairingOOBData		BluetoothHCISimplePairingOOBData;
-struct BluetoothHCISimplePairingOOBData
-{
-	UInt8		data[ 16 ];
-};
-
-typedef struct BluetoothHCIReadLocalOOBDataResults BluetoothHCIReadLocalOOBDataResults;
-struct	BluetoothHCIReadLocalOOBDataResults
-{
-	BluetoothHCISimplePairingOOBData		hash;
-	BluetoothHCISimplePairingOOBData		randomizer;
-};
-
-typedef UInt8	BluetoothIOCapability;
-enum BluetoothIOCapabilities
-{
-	kBluetoothCapabilityTypeDisplayOnly			= 0x00,
-	kBluetoothCapabilityTypeDisplayYesNo		= 0x01,
-	kBluetoothCapabilityTypeKeyboardOnly		= 0x02,
-	kBluetoothCapabilityTypeNoInputNoOutput		= 0x03
-};
-
-typedef UInt8	BluetoothOOBDataPresence;
-enum BluetoothOOBDataPresenceValues
-{
-	kBluetoothOOBAuthenticationDataNotPresent				= 0x00,
-	kBluetoothOOBAuthenticationDataFromRemoteDevicePresent	= 0x01
-};
-
-typedef UInt8	BluetoothAuthenticationRequirements;
-enum BluetoothAuthenticationRequirementsValues
-{
-	kBluetoothAuthenticationRequirementsMITMProtectionNotRequired	= 0x00,		/* Numeric comparison with automatic accept allowed */
-	kBluetoothAuthenticationRequirementsMITMProtectionRequired		= 0x01,		/* Refer to BluetoothIOCapabilities to determine authentication procedure */
-	kBluetoothAuthenticationRequirementsMITMProtectionNotRequiredNoBonding			= 0x00,
-	kBluetoothAuthenticationRequirementsMITMProtectionRequiredNoBonding				= 0x01,
-	kBluetoothAuthenticationRequirementsMITMProtectionNotRequiredDedicatedBonding	= 0x02,
-	kBluetoothAuthenticationRequirementsMITMProtectionRequiredDedicatedBonding		= 0x03,
-	kBluetoothAuthenticationRequirementsMITMProtectionNotRequiredGeneralBonding		= 0x04,
-	kBluetoothAuthenticationRequirementsMITMProtectionRequiredGeneralBonding		= 0x05
-};
-
-typedef struct BluetoothIOCapabilityResponse	BluetoothIOCapabilityResponse;
-struct BluetoothIOCapabilityResponse
-{
-	BluetoothDeviceAddress				deviceAddress;
-	BluetoothIOCapability				ioCapability;				/* possible values from BluetoothIOCapabilities above */
-	BluetoothOOBDataPresence			OOBDataPresence;				
-	BluetoothAuthenticationRequirements	authenticationRequirements;
-};
-
-typedef UInt32	BluetoothPasskey;
-
-typedef struct BluetoothUserPasskeyNotification	BluetoothUserPasskeyNotification;
-struct BluetoothUserPasskeyNotification
-{
-	BluetoothDeviceAddress				deviceAddress;
-	BluetoothPasskey					passkey;				/* passkey for display. valid values are 000000 - 999999 */
-};
-
-typedef UInt8	BluetoothKeypressNotificationType;
-enum BluetoothKeypressNotificationTypes
-{
-	kBluetoothKeypressNotificationTypePasskeyEntryStarted		= 0,
-	kBluetoothKeypressNotificationTypePasskeyDigitEntered		= 1,
-	kBluetoothKeypressNotificationTypePasskeyDigitErased		= 2,
-	kBluetoothKeypressNotificationTypePasskeyCleared			= 3,
-	kBluetoothKeypressNotificationTypePasskeyEntryCompleted		= 4
-};
-		
-typedef struct BluetoothKeypressNotification	BluetoothKeypressNotification;
-struct BluetoothKeypressNotification
-{
-	BluetoothDeviceAddress				deviceAddress;
-	BluetoothKeypressNotificationType	notificationType;
-};
-		
-typedef SInt8	TransmissionPower;
-
-typedef UInt8	BluetoothAFHMode;
-typedef struct	BluetoothAFHResults					BluetoothAFHResults;
-struct BluetoothAFHResults
-{
-	BluetoothConnectionHandle	handle;
-	BluetoothAFHMode			mode;
-	UInt8						afhMap[10];
-};
-
-#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0 */
-
-#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1
-
-typedef UInt32	BluetoothNumericValue;
-
-typedef struct BluetoothUserConfirmationRequest	BluetoothUserConfirmationRequest;
-struct BluetoothUserConfirmationRequest
-{
-	BluetoothDeviceAddress				deviceAddress;
-	BluetoothNumericValue				numericValue;				/* numeric value for display. valid values are 000000 - 999999 */
-};
-
-typedef struct	BluetoothHCIEventSimplePairingCompleteResults 		BluetoothHCIEventSimplePairingCompleteResults;
-struct			BluetoothHCIEventSimplePairingCompleteResults
-{
-	BluetoothDeviceAddress						deviceAddress;
-};
-
-#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1 */
-
-
-// Packet Sizes
-
-enum
-{
-	kBluetoothHCICommandPacketHeaderSize 	= 3, 
-	kBluetoothHCICommandPacketMaxDataSize 	= 255, 
-	kBluetoothHCIMaxCommandPacketSize		= kBluetoothHCICommandPacketHeaderSize + kBluetoothHCICommandPacketMaxDataSize, 
-	
-	kBluetoothHCIEventPacketHeaderSize	 	= 2, 
-	kBluetoothHCIEventPacketMaxDataSize 	= 255, 
-	kBluetoothHCIMaxEventPacketSize			= kBluetoothHCIEventPacketHeaderSize + kBluetoothHCIEventPacketMaxDataSize, 
-	
-	kBluetoothHCIDataPacketHeaderSize 		= 4, 
-	kBluetoothHCIDataPacketMaxDataSize 		= 65535, 
-	kBluetoothHCIMaxDataPacketSize			= kBluetoothHCIDataPacketHeaderSize + kBluetoothHCIDataPacketMaxDataSize
-};
-
-typedef UInt8		BluetoothHCIEventCode;
-typedef UInt8		BluetoothLinkType;
-enum BluetoothLinkTypes
-{
-	kBluetoothSCOConnection		= 0,
-	kBluetoothACLConnection		= 1,
-	kBluetoothESCOConnection	= 2,
-    kBluetoothLinkTypeNone		= 0xff
-};
-
-typedef UInt16		BluetoothHCIVoiceSetting; // 10 bits meaningful
-typedef UInt8		BluetoothHCISupportedIAC;
-
-typedef uint32_t	BluetoothHCITransmitBandwidth;
-typedef uint32_t	BluetoothHCIReceiveBandwidth;
-typedef uint16_t	BluetoothHCIMaxLatency;
-typedef uint8_t		BluetoothHCIRetransmissionEffort;		
-enum BluetoothHCIRetransmissionEffortTypes
-{
-	kHCIRetransmissionEffortTypeNone								= 0x00,
-	kHCIRetransmissionEffortTypeAtLeastOneAndOptimizeForPower		= 0x01,
-	kHCIRetransmissionEffortTypeAtLeastOneAndOptimizeLinkQuality	= 0x02,
-	kHCIRetransmissionEffortTypeDontCare							= 0xFF,
-};
-		
-
-// Setup Synchronous Packet types (Bluetooth 2.1 spec section 7.7.35  - Setup Synchronous Command Complete Event)
-
-typedef uint8_t		BluetoothAirMode;
-enum
-{
-	kBluetoothAirModeULawLog				= 0x00,
-	kBluetoothAirModeALawLog				= 0x01,
-	kBluetoothAirModeCVSD					= 0x02,
-	kBluetoothAirModeTransparentData		= 0x03
-};
-
-typedef struct	BluetoothSynchronousConnectionInfo		BluetoothSynchronousConnectionInfo;
-struct	BluetoothSynchronousConnectionInfo
-{
-	BluetoothHCITransmitBandwidth		transmitBandWidth;
-	BluetoothHCIReceiveBandwidth		receiveBandWidth;
-	BluetoothHCIMaxLatency				maxLatency;
-	BluetoothHCIVoiceSetting			voiceSetting;
-	BluetoothHCIRetransmissionEffort	retransmissionEffort;
-	BluetoothPacketType					packetType;
-};
-
-typedef struct	BluetoothHCIEventSynchronousConnectionCompleteResults 	BluetoothHCIEventSynchronousConnectionCompleteResults;
-struct			BluetoothHCIEventSynchronousConnectionCompleteResults
-{
-	BluetoothConnectionHandle			connectionHandle;
-	BluetoothDeviceAddress				deviceAddress;
-	BluetoothLinkType					linkType;
-	uint8_t								transmissionInterval;
-	uint8_t								retransmissionWindow;
-	uint16_t							receivePacketLength;
-	uint16_t							transmitPacketLength;
-	BluetoothAirMode					airMode;
-};
-
-
-typedef UInt8	BluetoothHCIStatus;
-typedef UInt8	BluetoothHCIEventStatus;
-
-// Events.
-
-enum
-{
-	kBluetoothHCIEventInquiryComplete									= 0x01,
-	kBluetoothHCIEventInquiryResult										= 0x02,
-	kBluetoothHCIEventConnectionComplete								= 0x03,
-	kBluetoothHCIEventConnectionRequest									= 0x04,
-	kBluetoothHCIEventDisconnectionComplete								= 0x05,
-	kBluetoothHCIEventAuthenticationComplete							= 0x06,
-	kBluetoothHCIEventRemoteNameRequestComplete							= 0x07,
-	kBluetoothHCIEventEncryptionChange									= 0x08,
-	kBluetoothHCIEventChangeConnectionLinkKeyComplete					= 0x09,
-	kBluetoothHCIEventMasterLinkKeyComplete								= 0x0A,
-	kBluetoothHCIEventReadRemoteSupportedFeaturesComplete				= 0x0B,
-	kBluetoothHCIEventReadRemoteVersionInformationComplete				= 0x0C,
-	kBluetoothHCIEventQoSSetupComplete									= 0x0D,
-	kBluetoothHCIEventCommandComplete									= 0x0E,
-	kBluetoothHCIEventCommandStatus										= 0x0F,
-	kBluetoothHCIEventHardwareError										= 0x10,
-	kBluetoothHCIEventFlushOccurred										= 0x11,
-	kBluetoothHCIEventRoleChange										= 0x12,
-	kBluetoothHCIEventNumberOfCompletedPackets							= 0x13,
-	kBluetoothHCIEventModeChange										= 0x14,
-	kBluetoothHCIEventReturnLinkKeys									= 0x15,
-	kBluetoothHCIEventPINCodeRequest									= 0x16,
-	kBluetoothHCIEventLinkKeyRequest									= 0x17,
-	kBluetoothHCIEventLinkKeyNotification								= 0x18,
-	kBluetoothHCIEventLoopbackCommand									= 0x19,
-	kBluetoothHCIEventDataBufferOverflow								= 0x1A,
-	kBluetoothHCIEventMaxSlotsChange									= 0x1B,
-	kBluetoothHCIEventReadClockOffsetComplete							= 0x1C,
-	kBluetoothHCIEventConnectionPacketType								= 0x1D,
-	kBluetoothHCIEventQoSViolation										= 0x1E,
-	kBluetoothHCIEventPageScanModeChange								= 0x1F,
-	kBluetoothHCIEventPageScanRepetitionModeChange						= 0x20,
-	
-	// [v1.2]
-
-	kBluetoothHCIEventFlowSpecificationComplete							= 0x21,
-	kBluetoothHCIEventInquiryResultWithRSSI								= 0x22,
-	kBluetoothHCIEventReadRemoteExtendedFeaturesComplete				= 0x23,
-	kBluetoothHCIEventSynchronousConnectionComplete						= 0x2C,
-	kBluetoothHCIEventSynchronousConnectionChanged						= 0x2D,
-
-	// [v2.1]
-
-	kBluetoothHCIEventSniffSubstrate									= 0x2E,
-	kBluetoothHCIEventExtendedInquiryResult								= 0x2F,
-	kBluetoothHCIEventIOCapabilityRequest								= 0x31,
-	kBluetoothHCIEventIOCapabilityResponse								= 0x32,
-	kBluetoothHCIEventUserConfirmationRequest							= 0x33,
-	kBluetoothHCIEventUserPasskeyRequest								= 0x34,
-	kBluetoothHCIEventRemoteOOBDataRequest								= 0x35,
-	kBluetoothHCIEventSimplePairingComplete								= 0x36,
-	kBluetoothHCIEventLinkSupervisionTimeoutChanged						= 0x38,
-	kBluetoothHCIEventEnhancedFlushComplete								= 0x39,
-	kBluetoothHCIEventSniffRequest										= 0x3A,
-	kBluetoothHCIEventUserPasskeyNotification							= 0x3B,
-	kBluetoothHCIEventKeypressNotification								= 0x3C,
-	
-	kBluetoothHCIEventLogoTesting										= 0xFE,
-	kBluetoothHCIEventVendorSpecific									= 0xFF
-};
-
-// HCI Event Masks
-
-// Event masks are 8 octets according to the spec. v2.1 introduces some event masks that
-// actually exceed 32 bits so the 4 byte enum we had before Bluetooth 2.0 will still work for old
-// the masks, but the new masks need to be defined as 64 bits.
-
-typedef uint64_t	BluetoothHCIEventMask;
-
-#define	kBluetoothHCIEventMaskDefault64Bit								0x00001FFFFFFFFFFFLL
-#define	kBluetoothHCIEventMaskAll64Bit									0xFFFFFFFFFFFFFFFFLL
-
-	// [v1.2]
-
-#define	kBluetoothHCIEventMaskFlowSpecificationCompleteEvent			0x0000000100000000LL
-#define	kBluetoothHCIEventMaskInquiryResultWithRSSIEvent				0x0000000200000000LL
-#define	kBluetoothHCIEventMaskReadRemoteExtendedFeaturesCompleteEvent	0x0000000400000000LL
-#define	kBluetoothHCIEventMaskSynchronousConnectionCompleteEvent		0x0000080000000000LL
-#define	kBluetoothHCIEventMaskSynchronousConnectionChangedEvent			0x0000100000000000LL
-
-	// [v2.1]
-
-#define	kBluetoothHCIEventMaskSniffSubstrateEvent						0x0000200000000000LL
-#define	kBluetoothHCIEventMaskExtendedInquiryResultEvent				0x0000400000000000LL
-#define	kBluetoothHCIEventMaskLinkSupervisionTimeoutChangedEvent		0x0080000000000000LL
-#define	kBluetoothHCIEventMaskEnhancedFlushCompleteEvent				0x0100000000000000LL
-	
-	// [v2.1 Secure Simple Pairing]
-
-#define	kBluetoothHCIEventMaskIOCapabilityRequestEvent					0x0001000000000000LL
-#define	kBluetoothHCIEventMaskIOCapabilityRequestReplyEvent				0x0002000000000000LL
-#define	kBluetoothHCIEventMaskUserConfirmationRequestEvent				0x0004000000000000LL
-#define	kBluetoothHCIEventMaskUserPasskeyRequestEvent					0x0008000000000000LL
-#define	kBluetoothHCIEventMaskRemoteOOBDataRequestEvent					0x0010000000000000LL
-#define	kBluetoothHCIEventMaskSimplePairingCompleteEvent				0x0020000000000000LL
-#define	kBluetoothHCIEventMaskUserPasskeyNotificationEvent				0x0400000000000000LL
-#define	kBluetoothHCIEventMaskKeypressNotificationEvent					0x0800000000000000LL
-	
-enum
-{
-	kBluetoothHCIEventMaskNone											= 0x00000000, 
-	kBluetoothHCIEventMaskInquiryComplete								= 0x00000001, 
-	kBluetoothHCIEventMaskInquiryResult									= 0x00000002, 
-	kBluetoothHCIEventMaskConnectionComplete							= 0x00000004, 
-	kBluetoothHCIEventMaskConnectionRequest								= 0x00000008, 
-	kBluetoothHCIEventMaskDisconnectionComplete							= 0x00000010, 
-	kBluetoothHCIEventMaskAuthenticationComplete						= 0x00000020, 
-	kBluetoothHCIEventMaskRemoteNameRequestComplete						= 0x00000040, 
-	kBluetoothHCIEventMaskEncryptionChange								= 0x00000080, 
-	kBluetoothHCIEventMaskChangeConnectionLinkKeyComplete				= 0x00000100, 
-	kBluetoothHCIEventMaskMasterLinkKeyComplete							= 0x00000200, 
-	kBluetoothHCIEventMaskReadRemoteSupportedFeaturesComplete			= 0x00000400, 
-	kBluetoothHCIEventMaskReadRemoteVersionInformationComplete			= 0x00000800, 
-	kBluetoothHCIEventMaskQoSSetupComplete								= 0x00001000, 
-	kBluetoothHCIEventMaskCommandComplete								= 0x00002000, 
-	kBluetoothHCIEventMaskCommandStatus									= 0x00004000, 
-	kBluetoothHCIEventMaskHardwareError									= 0x00008000, 
-	kBluetoothHCIEventMaskFlushOccurred									= 0x00010000, 
-	kBluetoothHCIEventMaskRoleChange									= 0x00020000, 
-	
-	kBluetoothHCIEventMaskNumberOfCompletedPackets						= 0x00040000, 
-	kBluetoothHCIEventMaskModeChange									= 0x00080000, 
-	kBluetoothHCIEventMaskReturnLinkKeys								= 0x00100000, 
-	kBluetoothHCIEventMaskPINCodeRequest								= 0x00200000, 
-	kBluetoothHCIEventMaskLinkKeyRequest								= 0x00400000, 
-	kBluetoothHCIEventMaskLinkKeyNotification							= 0x00800000, 
-	kBluetoothHCIEventMaskLoopbackCommand								= 0x01000000, 
-	kBluetoothHCIEventMaskDataBufferOverflow							= 0x02000000, 
-	kBluetoothHCIEventMaskMaxSlotsChange								= 0x04000000, 
-	kBluetoothHCIEventMaskReadClockOffsetComplete						= 0x08000000, 
-	kBluetoothHCIEventMaskConnectionPacketTypeChanged					= 0x10000000, 
-	kBluetoothHCIEventMaskQoSViolation									= 0x20000000, 
-	kBluetoothHCIEventMaskPageScanModeChange							= 0x40000000, 
-	kBluetoothHCIEventMaskPageScanRepetitionModeChange					= 0x80000000, 
-	
-	kBluetoothHCIEventMaskAll											= 0xFFFFFFFF, 
-	kBluetoothHCIEventMaskDefault										= kBluetoothHCIEventMaskAll		/* Use kBluetoothHCIEventMaskDefault64Bit above! */
-};
-
-// Event results structures.
-
-typedef struct	BluetoothHCIEventConnectionCompleteResults		BluetoothHCIEventConnectionCompleteResults;
-struct			BluetoothHCIEventConnectionCompleteResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothDeviceAddress						deviceAddress;
-	BluetoothLinkType							linkType;
-	BluetoothHCIEncryptionMode					encryptionMode;
-};
-
-typedef struct	BluetoothHCIEventDisconnectionCompleteResults		BluetoothHCIEventDisconnectionCompleteResults;
-struct			BluetoothHCIEventDisconnectionCompleteResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothReasonCode							reason;
-};
-
-typedef struct	BluetoothHCIEventReadSupportedFeaturesResults 	BluetoothHCIEventReadSupportedFeaturesResults;
-struct 			BluetoothHCIEventReadSupportedFeaturesResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothHCISupportedFeatures				supportedFeatures;
-};
-
-#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1
-typedef struct	BluetoothHCIEventReadExtendedFeaturesResults 	BluetoothHCIEventReadExtendedFeaturesResults;
-struct 			BluetoothHCIEventReadExtendedFeaturesResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothHCIExtendedFeaturesInfo			supportedFeaturesInfo;
-};
-#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1 */
-		
-typedef struct	BluetoothHCIEventReadRemoteVersionInfoResults 	BluetoothHCIEventReadRemoteVersionInfoResults;
-struct 			BluetoothHCIEventReadRemoteVersionInfoResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothLMPVersion							lmpVersion;
-	BluetoothManufacturerName					manufacturerName;
-	BluetoothLMPSubversion						lmpSubversion;
-};
-
-typedef struct	BluetoothHCIEventRemoteNameRequestResults 		BluetoothHCIEventRemoteNameRequestResults;
-struct 			BluetoothHCIEventRemoteNameRequestResults
-{
-	BluetoothDeviceAddress						deviceAddress;
-	BluetoothDeviceName							deviceName;
-};
-
-typedef struct	BluetoothHCIEventReadClockOffsetResults 		BluetoothHCIEventReadClockOffsetResults;
-struct			BluetoothHCIEventReadClockOffsetResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothClockOffset						clockOffset;
-};
-
-typedef struct	BluetoothHCIEventConnectionRequestResults 		BluetoothHCIEventConnectionRequestResults;
-struct			BluetoothHCIEventConnectionRequestResults
-{
-	BluetoothDeviceAddress						deviceAddress;
-	BluetoothClassOfDevice						classOfDevice;
-	BluetoothLinkType							linkType;
-};
-
-typedef struct	BluetoothHCIEventLinkKeyNotificationResults 		BluetoothHCIEventLinkKeyNotificationResults;
-struct			BluetoothHCIEventLinkKeyNotificationResults
-{
-	BluetoothDeviceAddress						deviceAddress;
-	BluetoothKey								linkKey;
-	BluetoothKeyType							keyType;
-};
-
-typedef struct	BluetoothHCIEventMaxSlotsChangeResults 		BluetoothHCIEventMaxSlotsChangeResults;
-struct			BluetoothHCIEventMaxSlotsChangeResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothMaxSlots							maxSlots;
-};
-
-typedef struct	BluetoothHCIEventModeChangeResults 		BluetoothHCIEventModeChangeResults;
-struct			BluetoothHCIEventModeChangeResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothHCIConnectionMode					mode;
-	BluetoothHCIModeInterval					modeInterval;
-};
-
-typedef struct	BluetoothHCIEventReturnLinkKeysResults	BluetoothHCIEventReturnLinkKeysResults;
-struct			BluetoothHCIEventReturnLinkKeysResults
-{
-	UInt8										numLinkKeys;
-	struct {
-		BluetoothDeviceAddress					deviceAddress;
-		BluetoothKey							linkKey;
-	} linkKeys[1];
-};
-
-typedef struct	BluetoothHCIEventAuthenticationCompleteResults 		BluetoothHCIEventAuthenticationCompleteResults;
-struct			BluetoothHCIEventAuthenticationCompleteResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-};
-
-typedef struct	BluetoothHCIEventEncryptionChangeResults 		BluetoothHCIEventEncryptionChangeResults;
-struct			BluetoothHCIEventEncryptionChangeResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothEncryptionEnable					enable;
-};
-
-typedef struct	BluetoothHCIEventChangeConnectionLinkKeyCompleteResults 	BluetoothHCIEventChangeConnectionLinkKeyCompleteResults;
-struct			BluetoothHCIEventChangeConnectionLinkKeyCompleteResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-};
-
-typedef struct	BluetoothHCIEventMasterLinkKeyCompleteResults 	BluetoothHCIEventMasterLinkKeyCompleteResults;
-struct			BluetoothHCIEventMasterLinkKeyCompleteResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothKeyFlag							keyFlag;
-};
-
-typedef struct	BluetoothHCIEventQoSSetupCompleteResults 	BluetoothHCIEventQoSSetupCompleteResults;
-struct			BluetoothHCIEventQoSSetupCompleteResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothHCIQualityOfServiceSetupParams		setupParams;
-};
-
-typedef struct	BluetoothHCIEventHardwareErrorResults 	BluetoothHCIEventHardwareErrorResults;
-struct			BluetoothHCIEventHardwareErrorResults
-{
-	BluetoothHCIStatus							error;
-};
-
-typedef struct	BluetoothHCIEventFlushOccurredResults 	BluetoothHCIEventFlushOccurredResults;
-struct			BluetoothHCIEventFlushOccurredResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-};
-
-typedef struct	BluetoothHCIEventRoleChangeResults 	BluetoothHCIEventRoleChangeResults;
-struct			BluetoothHCIEventRoleChangeResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothDeviceAddress						deviceAddress;
-	BluetoothRole								role;
-};
-
-typedef struct	BluetoothHCIEventDataBufferOverflowResults 	BluetoothHCIEventDataBufferOverflowResults;
-struct			BluetoothHCIEventDataBufferOverflowResults
-{
-	BluetoothLinkType							linkType;
-};
-
-typedef struct	BluetoothHCIEventConnectionPacketTypeResults 	BluetoothHCIEventConnectionPacketTypeResults;
-struct			BluetoothHCIEventConnectionPacketTypeResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothPacketType							packetType;
-};
-
-typedef struct	BluetoothHCIEventReadRemoteSupportedFeaturesResults 	BluetoothHCIEventReadRemoteSupportedFeaturesResults;
-struct			BluetoothHCIEventReadRemoteSupportedFeaturesResults
-{
-	BluetoothHCIStatus							error;
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothHCISupportedFeatures				lmpFeatures;
-};
-
-#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1
-typedef struct	BluetoothHCIEventReadRemoteExtendedFeaturesResults 	BluetoothHCIEventReadRemoteExtendedFeaturesResults;
-struct			BluetoothHCIEventReadRemoteExtendedFeaturesResults
-{
-	BluetoothHCIStatus							error;
-	BluetoothConnectionHandle					connectionHandle;
-	BluetoothHCIPageNumber						page;
-	BluetoothHCIPageNumber						maxPage;
-	BluetoothHCISupportedFeatures				lmpFeatures;
-};
-#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1 */
-
-typedef struct	BluetoothHCIEventQoSViolationResults 	BluetoothHCIEventQoSViolationResults;
-struct			BluetoothHCIEventQoSViolationResults
-{
-	BluetoothConnectionHandle					connectionHandle;
-};
-
-typedef struct	BluetoothHCIEventPageScanModeChangeResults 	BluetoothHCIEventPageScanModeChangeResults;
-struct			BluetoothHCIEventPageScanModeChangeResults
-{
-	BluetoothDeviceAddress			deviceAddress;
-	BluetoothPageScanMode			pageScanMode;
-};
-
-typedef struct	BluetoothHCIEventPageScanRepetitionModeChangeResults 	BluetoothHCIEventPageScanRepetitionModeChangeResults;
-struct			BluetoothHCIEventPageScanRepetitionModeChangeResults
-{
-	BluetoothDeviceAddress				deviceAddress;
-	BluetoothPageScanRepetitionMode		pageScanRepetitionMode;
-};
-
-typedef struct	BluetoothHCIEventVendorSpecificResults 	BluetoothHCIEventVendorSpecificResults;
-struct			BluetoothHCIEventVendorSpecificResults
-{
-	UInt8								length;
-	UInt8								data[255];
-};
-
-#define kNoNotifyProc	NULL
-#define kNoUserRefCon	NULL
-
-typedef struct BluetoothHCIRequestCallbackInfo BluetoothHCIRequestCallbackInfo;
-struct BluetoothHCIRequestCallbackInfo
-{
-	mach_vm_address_t					userCallback;			// Proc to call when async handler is called.
-	mach_vm_address_t					userRefCon;				// For user's info.
-	mach_vm_address_t					internalRefCon;			// For our purposes.
-	mach_vm_address_t 					asyncIDRefCon;			// For our aync calls.
-	mach_vm_address_t					reserved;				// For the future. Currently Unused.
-};
-
-// Error codes
-
-enum
-{
-	kBluetoothHCIErrorSuccess											= 0x00, 
-	kBluetoothHCIErrorUnknownHCICommand									= 0x01, 
-	kBluetoothHCIErrorNoConnection										= 0x02, 
-	kBluetoothHCIErrorHardwareFailure									= 0x03, 
-	kBluetoothHCIErrorPageTimeout										= 0x04, 
-	kBluetoothHCIErrorAuthenticationFailure								= 0x05, 
-	kBluetoothHCIErrorKeyMissing										= 0x06, 
-	kBluetoothHCIErrorMemoryFull										= 0x07, 
-	kBluetoothHCIErrorConnectionTimeout									= 0x08, 
-	kBluetoothHCIErrorMaxNumberOfConnections							= 0x09, 
-	kBluetoothHCIErrorMaxNumberOfSCOConnectionsToADevice				= 0x0A, 
-	kBluetoothHCIErrorACLConnectionAlreadyExists						= 0x0B, 
-	kBluetoothHCIErrorCommandDisallowed									= 0x0C, 
-	kBluetoothHCIErrorHostRejectedLimitedResources						= 0x0D, 
-	kBluetoothHCIErrorHostRejectedSecurityReasons						= 0x0E, 
-	kBluetoothHCIErrorHostRejectedRemoteDeviceIsPersonal				= 0x0F, 
-	kBluetoothHCIErrorHostTimeout										= 0x10, 
-	kBluetoothHCIErrorUnsupportedFeatureOrParameterValue				= 0x11, 
-	kBluetoothHCIErrorInvalidHCICommandParameters						= 0x12, 
-	kBluetoothHCIErrorOtherEndTerminatedConnectionUserEnded				= 0x13, 
-	kBluetoothHCIErrorOtherEndTerminatedConnectionLowResources			= 0x14, 
-	kBluetoothHCIErrorOtherEndTerminatedConnectionAboutToPowerOff		= 0x15, 
-	kBluetoothHCIErrorConnectionTerminatedByLocalHost					= 0x16, 
-	kBluetoothHCIErrorRepeatedAttempts									= 0x17, 
-	kBluetoothHCIErrorPairingNotAllowed									= 0x18, 
-	kBluetoothHCIErrorUnknownLMPPDU										= 0x19, 
-	kBluetoothHCIErrorUnsupportedRemoteFeature							= 0x1A, 
-	kBluetoothHCIErrorSCOOffsetRejected									= 0x1B, 
-	kBluetoothHCIErrorSCOIntervalRejected								= 0x1C, 
-	kBluetoothHCIErrorSCOAirModeRejected								= 0x1D, 
-	kBluetoothHCIErrorInvalidLMPParameters								= 0x1E, 
-	kBluetoothHCIErrorUnspecifiedError									= 0x1F, 
-	kBluetoothHCIErrorUnsupportedLMPParameterValue						= 0x20, 
-	kBluetoothHCIErrorRoleChangeNotAllowed								= 0x21, 
-	kBluetoothHCIErrorLMPResponseTimeout								= 0x22, 
-	kBluetoothHCIErrorLMPErrorTransactionCollision						= 0x23, 
-	kBluetoothHCIErrorLMPPDUNotAllowed									= 0x24, 
-	kBluetoothHCIErrorEncryptionModeNotAcceptable						= 0x25, 	// Added Core Spec, v1.1
-	kBluetoothHCIErrorUnitKeyUsed										= 0x26, 	// 1.1
-	kBluetoothHCIErrorQoSNotSupported									= 0x27, 	// 1.1
-	kBluetoothHCIErrorInstantPassed										= 0x28, 	// 1.1
-	kBluetoothHCIErrorPairingWithUnitKeyNotSupported					= 0x29, 	// 1.1
-	kBluetoothHCIErrorHostRejectedUnacceptableDeviceAddress				= 0x0F,		// 2.0+
-	kBluetoothHCIErrorDifferentTransactionCollision						= 0x2A, 	// 1.2
-	kBluetoothHCIErrorQoSUnacceptableParameter							= 0x2C, 	// 1.2
-	kBluetoothHCIErrorQoSRejected										= 0x2D, 	// 1.2
-	kBluetoothHCIErrorChannelClassificationNotSupported					= 0x2E, 	// 1.2
-	kBluetoothHCIErrorInsufficientSecurity								= 0x2F, 	// 1.2
-	kBluetoothHCIErrorParameterOutOfMandatoryRange						= 0x30,		// 1.2
-	kBluetoothHCIErrorRoleSwitchPending									= 0x31,		// 1.2
-	kBluetoothHCIErrorReservedSlotViolation								= 0x34,		// 1.2
-	kBluetoothHCIErrorRoleSwitchFailed									= 0x35,		// 1.2
-	kBluetoothHCIErrorExtendedInquiryResponseTooLarge					= 0x36, 	// 2.1
-	kBluetoothHCIErrorSecureSimplePairingNotSupportedByHost				= 0x37, 	// 2.1
-	
-	kBluetoothHCIErrorMax												= 0x37
-};
-
-#if 0
-#pragma mark === HCI Power Mode ===
-#endif
-
-//===========================================================================================================================
-//	HCI Power Mode 
-//===========================================================================================================================
-
-typedef enum
-{
-	kBluetoothHCIPowerStateON				= 0x01,
-	kBluetoothHCIPowerStateOFF				= 0x00,
-	kBluetoothHCIPowerStateUnintialized		= 0xFF,	
-} BluetoothHCIPowerState;
-
-enum
-{
-        kBluetoothHCIErrorPowerIsOFF		= (kBluetoothHCIErrorMax + 1)
-};
-
-#if 0
-#pragma mark === HCI USB Transport ===
-#endif
-
-//===========================================================================================================================
-//	HCI USB Transport
-//===========================================================================================================================
-
-//---------------------------------------------------------------------------------------------------------------------------
-/*!	@enum		BluetoothHCIUSBDeviceMatchingConstants
-	@abstract	Bluetooth USB device matching constants
-	@constant	kBluetoothHCITransportUSBClassCode			Wireless Controller
-	@constant	kBluetoothHCITransportUSBSubClassCode		RF Controller
-	@constant	kBluetoothHCITransportUSBProtocolCode		Bluetooth Programming
-*/
-
-enum
-{
-	kBluetoothHCITransportUSBClassCode		= 0xE0,
-	kBluetoothHCITransportUSBSubClassCode	= 0x01,
-	kBluetoothHCITransportUSBProtocolCode	= 0x01
-};
-
-#if 0
-#pragma mark === TCI - L2CAP ===
-#endif
-
-//===========================================================================================================================
-//	TCI - L2CAP
-//===========================================================================================================================
-
-enum
-{
-	kBluetoothL2CAPTCIEventIDReserved							= 0x00,
-	kBluetoothL2CAPTCIEventIDL2CA_ConnectInd					= 0x01,
-	kBluetoothL2CAPTCIEventIDL2CA_ConfigInd						= 0x02,
-	kBluetoothL2CAPTCIEventIDL2CA_DisconnectInd					= 0x03,
-	kBluetoothL2CAPTCIEventIDL2CA_QoSViolationInd				= 0x04,
-	kBluetoothL2CAPTCIEventIDL2CA_TimeOutInd					= 0x05
-};
-
-enum
-{
-	kBluetoothL2CAPTCICommandReserved							= 0x0000,
-	kBluetoothL2CAPTCICommandL2CA_ConnectReq					= 0x0001,
-	kBluetoothL2CAPTCICommandL2CA_DisconnectReq					= 0x0002,
-	kBluetoothL2CAPTCICommandL2CA_ConfigReq						= 0x0003,
-	kBluetoothL2CAPTCICommandL2CA_DisableCLT					= 0x0004,
-	kBluetoothL2CAPTCICommandL2CA_EnableCLT						= 0x0005,
-	kBluetoothL2CAPTCICommandL2CA_GroupCreate					= 0x0006,
-	kBluetoothL2CAPTCICommandL2CA_GroupClose					= 0x0007,
-	kBluetoothL2CAPTCICommandL2CA_GroupAddMember				= 0x0008,
-	kBluetoothL2CAPTCICommandL2CA_GroupRemoveMember				= 0x0009,
-	kBluetoothL2CAPTCICommandL2CA_GroupMembership				= 0x000A,
-	kBluetoothL2CAPTCICommandL2CA_WriteData						= 0x000B,
-	kBluetoothL2CAPTCICommandL2CA_ReadData						= 0x000C,
-	kBluetoothL2CAPTCICommandL2CA_Ping							= 0x000D,
-	kBluetoothL2CAPTCICommandL2CA_GetInfo						= 0x000E,
-	kBluetoothL2CAPTCICommandL2CA_Reserved1						= 0x000F,
-	kBluetoothL2CAPTCICommandL2CA_Reserved2						= 0x0010,
-	kBluetoothL2CAPTCICommandL2CA_ConnectResp					= 0x0011,
-	kBluetoothL2CAPTCICommandL2CA_DisconnectResp				= 0x0012,
-	kBluetoothL2CAPTCICommandL2CA_ConfigResp					= 0x0013
-};
-
-#if 0
-#pragma mark -
-#pragma mark === RFCOMM ===
-#endif
-
-//===========================================================================================================================
-//	RFCOMM
-//===========================================================================================================================
-#define kMaxChannelIDPerSide	31
-
-typedef UInt8	BluetoothRFCOMMChannelID;
-
-#define	RFCOMM_CHANNEL_ID_IS_VALID( CHANNEL ) (( CHANNEL >= 1 ) && ( CHANNEL <= 30 ))
-
-typedef UInt16	BluetoothRFCOMMMTU;
-
-typedef enum BluetoothRFCOMMParityType
-{
-    kBluetoothRFCOMMParityTypeNoParity = 0, 
-    kBluetoothRFCOMMParityTypeOddParity, 
-    kBluetoothRFCOMMParityTypeEvenParity, 
-    kBluetoothRFCOMMParityTypeMaxParity
-} BluetoothRFCOMMParityType;
-
-typedef enum BluetoothRFCOMMLineStatus
-{
-    BluetoothRFCOMMLineStatusNoError = 0, 
-    BluetoothRFCOMMLineStatusOverrunError, 
-    BluetoothRFCOMMLineStatusParityError, 
-    BluetoothRFCOMMLineStatusFramingError
-} BluetoothRFCOMMLineStatus;
-
-#if 0
-#pragma mark -
-#pragma mark === SDP ===
-#endif
-
-//===========================================================================================================================
-//	SDP
-//===========================================================================================================================
-
-typedef UInt8	BluetoothSDPPDUID;
-enum {
-    kBluetoothSDPPDUIDReserved							= 0,
-    kBluetoothSDPPDUIDErrorResponse						= 1,
-    kBluetoothSDPPDUIDServiceSearchRequest				= 2,
-    kBluetoothSDPPDUIDServiceSearchResponse				= 3,
-    kBluetoothSDPPDUIDServiceAttributeRequest			= 4,
-    kBluetoothSDPPDUIDServiceAttributeResponse			= 5,
-    kBluetoothSDPPDUIDServiceSearchAttributeRequest		= 6,
-    kBluetoothSDPPDUIDServiceSearchAttributeResponse	= 7
-};
-
-#define IS_REQUEST_PDU( _pduID ) (	( _pduID == kBluetoothSDPPDUIDServiceSearchRequest ) || \
-                                    ( _pduID == kBluetoothSDPPDUIDServiceAttributeRequest ) || \
-                                    ( _pduID == kBluetoothSDPPDUIDServiceSearchAttributeRequest ) )
-                                    
-#define IS_RESPONSE_PDU( _pduID ) (	( _pduID == kBluetoothSDPPDUIDErrorResponse ) || \
-                                    ( _pduID == kBluetoothSDPPDUIDServiceSearchResponse ) || \
-                                    ( _pduID == kBluetoothSDPPDUIDServiceAttributeResponse ) || \
-                                    ( _pduID == kBluetoothSDPPDUIDServiceSearchAttributeResponse ) )
-
-typedef UInt16	BluetoothSDPErrorCode;
-enum {
-    kBluetoothSDPErrorCodeSuccess						= 0x0000,
-    kBluetoothSDPErrorCodeReserved						= 0x0000,
-    kBluetoothSDPErrorCodeInvalidSDPVersion				= 0x0001,
-    kBluetoothSDPErrorCodeInvalidServiceRecordHandle	= 0x0002,
-    kBluetoothSDPErrorCodeInvalidRequestSyntax			= 0x0003,
-    kBluetoothSDPErrorCodeInvalidPDUSize				= 0x0004,
-    kBluetoothSDPErrorCodeInvalidContinuationState		= 0x0005,
-    kBluetoothSDPErrorCodeInsufficientResources			= 0x0006,
-    
-    kBluetoothSDPErrorCodeReservedStart					= 0x0007,
-    kBluetoothSDPErrorCodeReservedEnd					= 0xFFFF
-};
-
-typedef UInt16	BluetoothSDPTransactionID;
-
-typedef UInt32	BluetoothSDPServiceRecordHandle;
-
-enum {
-    kBluetoothSDPDataElementTypeNil						= 0,
-    kBluetoothSDPDataElementTypeUnsignedInt				= 1,
-    kBluetoothSDPDataElementTypeSignedInt				= 2,
-    kBluetoothSDPDataElementTypeUUID					= 3,
-    kBluetoothSDPDataElementTypeString					= 4,
-    kBluetoothSDPDataElementTypeBoolean					= 5,
-    kBluetoothSDPDataElementTypeDataElementSequence		= 6,
-    kBluetoothSDPDataElementTypeDataElementAlternative	= 7,
-    kBluetoothSDPDataElementTypeURL						= 8,
-    kBluetoothSDPDataElementTypeReservedStart			= 9,
-    kBluetoothSDPDataElementTypeReservedEnd				= 31
-};
-
-typedef UInt16	BluetoothSDPUUID16;
-typedef UInt32	BluetoothSDPUUID32;
-
-typedef UInt8	BluetoothSDPDataElementTypeDescriptor;
-typedef UInt8	BluetoothSDPDataElementSizeDescriptor;
-
-typedef UInt16	BluetoothSDPServiceAttributeID;
-
-#ifdef	__cplusplus
-	}
-#endif
diff --git a/i386/include/IOKit/bluetooth/BluetoothAssignedNumbers.h b/i386/include/IOKit/bluetooth/BluetoothAssignedNumbers.h
deleted file mode 100644
index ea5db2e..0000000
--- a/i386/include/IOKit/bluetooth/BluetoothAssignedNumbers.h
+++ /dev/null
@@ -1,552 +0,0 @@
-/*
-	File:		BluetoothAssignedNumbers.h
-	Copyright:	(c) 2002-2008 by Apple Computer, Inc. All rights reserved.
-*/
-
-#pragma once
-
-#ifdef	__cplusplus
-	extern "C" {
-#endif
-
-#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0
-
-#pragma mark -
-#pragma mark === General ===
-
-enum BluetoothCompanyIdentifers
-{
-	kBluetoothCompanyIdentiferEricssonTechnologyLicensing						=	0,
-	kBluetoothCompanyIdentiferNokiaMobilePhones									=	1,
-	kBluetoothCompanyIdentiferIntel												=	2,
-	kBluetoothCompanyIdentiferIBM												=	3,
-	kBluetoothCompanyIdentiferToshiba											=	4,
-	kBluetoothCompanyIdentifer3Com												=	5,
-	kBluetoothCompanyIdentiferMicrosoft											=	6,
-	kBluetoothCompanyIdentiferLucent											=	7,
-	kBluetoothCompanyIdentiferMotorola											=	8,
-	kBluetoothCompanyIdentiferInfineonTechnologiesAG							=	9,
-	kBluetoothCompanyIdentiferCambridgeSiliconRadio								=	10,
-	kBluetoothCompanyIdentiferSiliconWave										=	11,
-	kBluetoothCompanyIdentiferDigianswerAS										=	12,
-	kBluetoothCompanyIdentiferTexasInstruments									=	13,
-	kBluetoothCompanyIdentiferParthusTechnologies								=	14,
-	kBluetoothCompanyIdentiferBroadcom											=	15,
-	kBluetoothCompanyIdentiferMitelSemiconductor								=	16,
-	kBluetoothCompanyIdentiferWidcomm											=	17,
-	kBluetoothCompanyIdentiferZeevo												=	18,
-	kBluetoothCompanyIdentiferAtmel												=	19,
-	kBluetoothCompanyIdentiferMistubishiElectric								=	20,
-	kBluetoothCompanyIdentiferRTXTelecom										=	21,
-	kBluetoothCompanyIdentiferKCTechnology										=	22,
-	kBluetoothCompanyIdentiferNewlogic											=	23,
-	kBluetoothCompanyIdentiferTransilica										=	24,
-	kBluetoothCompanyIdentiferRohdeandSchwarz									=	25,
-	kBluetoothCompanyIdentiferTTPCom											=	26,
-	kBluetoothCompanyIdentiferSigniaTechnologies								=	27,
-	kBluetoothCompanyIdentiferConexantSystems									=	28,
-	kBluetoothCompanyIdentiferQualcomm											=	29,
-	kBluetoothCompanyIdentiferInventel											=	30,
-	kBluetoothCompanyIdentiferAVMBerlin											=	31,
-	kBluetoothCompanyIdentiferBandspeed											=	32,
-	kBluetoothCompanyIdentiferMansella											=	33,
-	kBluetoothCompanyIdentiferNEC												=	34,
-	kBluetoothCompanyIdentiferWavePlusTechnology								=	35,
-	kBluetoothCompanyIdentiferAlcatel											=	36,
-	kBluetoothCompanyIdentiferPhilipsSemiconductor								=	37,
-	kBluetoothCompanyIdentiferCTechnologies										=	38,
-	kBluetoothCompanyIdentiferOpenInterface										=	39,
-	kBluetoothCompanyIdentiferRFCMicroDevices									=	40,
-	kBluetoothCompanyIdentiferHitachi											=	41,
-	kBluetoothCompanyIdentiferSymbolTechnologies								=	42,
-	kBluetoothCompanyIdentiferTenovis											=	43,
-	kBluetoothCompanyIdentiferMacronixInternational								=	44,
-	kBluetoothCompanyIdentiferGCTSemiconductor									=	45,
-	kBluetoothCompanyIdentiferNorwoodSystems									=	46,
-	kBluetoothCompanyIdentiferMewTelTechnology									=	47,
-	kBluetoothCompanyIdentiferSTMicroelectronics								=	48,
-	kBluetoothCompanyIdentiferSynopsys											=	49,
-	kBluetoothCompanyIdentiferRedMCommunications								=	50,
-	kBluetoothCompanyIdentiferCommil											=	51,
-	kBluetoothCompanyIdentiferCATC												=	52,
-	kBluetoothCompanyIdentiferEclipse											=	53,
-	kBluetoothCompanyIdentiferRenesasTechnology									=	54,
-	kBluetoothCompanyIdentiferMobilian											=	55,
-	kBluetoothCompanyIdentiferTerax												=	56,
-	kBluetoothCompanyIdentiferIntegratedSystemSolution							=	57,
-	kBluetoothCompanyIdentiferMatsushitaElectricIndustrial						=	58,
-	kBluetoothCompanyIdentiferGennum											=	59,
-	kBluetoothCompanyIdentiferResearchInMotion									=	60,
-	kBluetoothCompanyIdentiferIPextreme											=	61,
-	kBluetoothCompanyIdentiferSystemsAndChips									=	62,
-	kBluetoothCompanyIdentiferBluetoothSIG										=	63,
-	kBluetoothCompanyIdentiferSeikoEpson										=	64,
-	kBluetoothCompanyIdentiferIntegratedSiliconSolution							=	65,
-	kBluetoothCompanyIdentiferCONWISETechnology									=	66,
-	kBluetoothCompanyIdentiferParrotSA											=	67,
-	kBluetoothCompanyIdentiferSocketCommunications								=	68,
-	kBluetoothCompanyIdentiferAtherosCommunications								=	69,
-	kBluetoothCompanyIdentiferMediaTek											=	70,
-	kBluetoothCompanyIdentiferBluegiga											=	71,
-	kBluetoothCompanyIdentiferMarvellTechnologyGroup							=	72,
-	kBluetoothCompanyIdentifer3DSP												=	73,
-	kBluetoothCompanyIdentiferAccelSemiconductor								=	74,
-	kBluetoothCompanyIdentiferContinentialAutomotiveSystems						=	75,
-	kBluetoothCompanyIdentiferApple												=	76,
-	kBluetoothCompanyIdentiferStaccatoCommunications							=	77,
-	kBluetoothCompanyIdentiferAvagoTechnologies									=	78,
-	kBluetoothCompanyIdentiferAPT												=	79,
-
-	kBluetoothCompanyIdentiferInteropIdentifier									=	65535
-};
-
-#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0 */
-
-#pragma mark -
-#pragma mark === Baseband ===
-
-//==================================================================================================================
-//	Baseband
-//==================================================================================================================
-
-//
-// Service Class Major
-//
-
-enum
-{
-	kBluetoothServiceClassMajorLimitedDiscoverableMode		= 0x001,	// Bit 13 - Limited Discoverable Mode
-	kBluetoothServiceClassMajorReserved1					= 0x002, 	// Bit 14 - Reserved for future use.
-	kBluetoothServiceClassMajorReserved2					= 0x004, 	// Bit 15 - Reserved for future use.
-	kBluetoothServiceClassMajorPositioning					= 0x008, 	// Bit 16 - Positioning (Location ID)
-	kBluetoothServiceClassMajorNetworking					= 0x010, 	// Bit 17 - LAN, Ad hoc, etc...
-	kBluetoothServiceClassMajorRendering					= 0x020, 	// Bit 18 - Printing, Speaker, etc...
-	kBluetoothServiceClassMajorCapturing					= 0x040,	// Bit 19 - Scanner, Microphone, etc...
-	kBluetoothServiceClassMajorObjectTransfer				= 0x080,	// Bit 20 - v-Inbox, v-Folder, etc...
-	kBluetoothServiceClassMajorAudio						= 0x100,	// Bit 21 - Speaker, Microphone, Headset, etc...
-	kBluetoothServiceClassMajorTelephony					= 0x200,	// Bit 22 - Cordless telephony, Modem, Headset, etc...
-	kBluetoothServiceClassMajorInformation					= 0x400,	// Bit 23 - Web server, WAP server, etc...
-	
-	kBluetoothServiceClassMajorAny							= '****',	// Pseudo-class - means anything acceptable.
-	kBluetoothServiceClassMajorNone							= 'none',	// Pseudo-class - means no matching.
-	
-	kBluetoothServiceClassMajorEnd
-};
-
-//
-// Device Class Major
-//
-
-enum
-{
-	kBluetoothDeviceClassMajorMiscellaneous					= 0x00, 	// [00000] Miscellaneous
-	kBluetoothDeviceClassMajorComputer						= 0x01, 	// [00001] Desktop, Notebook, PDA, Organizers, etc...
-	kBluetoothDeviceClassMajorPhone							= 0x02, 	// [00010] Cellular, Cordless, Payphone, Modem, etc...
-	kBluetoothDeviceClassMajorLANAccessPoint				= 0x03, 	// [00011] LAN Access Point
-	kBluetoothDeviceClassMajorAudio							= 0x04, 	// [00100] Headset, Speaker, Stereo, etc...
-	kBluetoothDeviceClassMajorPeripheral					= 0x05, 	// [00101] Mouse, Joystick, Keyboards, etc...
-    kBluetoothDeviceClassMajorImaging						= 0x06,		// [00110] Printing, scanner, camera, display, etc...
-	kBluetoothDeviceClassMajorUnclassified					= 0x1F, 	// [11111] Specific device code not assigned
-	
-	// Range 0x06 to 0x1E Reserved for future use.
-	
-	kBluetoothDeviceClassMajorAny							= '****',	// Pseudo-class - means anything acceptable.
-	kBluetoothDeviceClassMajorNone							= 'none',	// Pseudo-class - means no matching.
-	
-	kBluetoothDeviceClassMajorEnd
-};
-
-//
-// Device Class Minor
-//
-
-enum
-{
-	///
-	/// Computer Major Class
-	///
-	
-	kBluetoothDeviceClassMinorComputerUnclassified			= 0x00, 	// [000000] Specific device code not assigned
-	kBluetoothDeviceClassMinorComputerDesktopWorkstation	= 0x01, 	// [000001] Desktop workstation
-	kBluetoothDeviceClassMinorComputerServer				= 0x02, 	// [000010] Server-class computer
-	kBluetoothDeviceClassMinorComputerLaptop				= 0x03, 	// [000011] Laptop
-	kBluetoothDeviceClassMinorComputerHandheld				= 0x04, 	// [000100] Handheld PC/PDA (clam shell)
-	kBluetoothDeviceClassMinorComputerPalmSized				= 0x05, 	// [000101] Palm-sized PC/PDA
-    kBluetoothDeviceClassMinorComputerWearable				= 0x06,		// [000110] Wearable computer (watch sized)
-	
-	// Range 0x06 to 0x7F Reserved for future use.
-	
-    
-	///
-	/// Phone Major Class
-	///
-	
-	kBluetoothDeviceClassMinorPhoneUnclassified				= 0x00, 	// [000000] Specific device code not assigned
-	kBluetoothDeviceClassMinorPhoneCellular					= 0x01, 	// [000001] Cellular
-	kBluetoothDeviceClassMinorPhoneCordless					= 0x02, 	// [000010] Cordless
-	kBluetoothDeviceClassMinorPhoneSmartPhone				= 0x03, 	// [000011] Smart phone
-	kBluetoothDeviceClassMinorPhoneWiredModemOrVoiceGateway	= 0x04, 	// [000100] Wired modem or voice gateway
-    kBluetoothDeviceClassMinorPhoneCommonISDNAccess			= 0x05,		// [000101] Common ISDN Access
-	
-	// Range 0x05 to 0x7F Reserved for future use.
-	
-    
-	///
-	/// LAN Access Point Major Class
-	///
-	
-	// $$$ TO DO: LAN Access Point minor classes are broken into bits 5-7 for utilization and bits 2-4 for class.
-	
-    
-	///
-	/// Audio Major Class
-	///
-	
-	kBluetoothDeviceClassMinorAudioUnclassified					= 0x00, 	// [000000] Specific device code not assigned
-	kBluetoothDeviceClassMinorAudioHeadset						= 0x01, 	// [000001] Device conforms to the Headset profile
-    kBluetoothDeviceClassMinorAudioHandsFree					= 0x02,		// [000010] Hands-free
-    kBluetoothDeviceClassMinorAudioReserved1					= 0x03,		// [000011] Reserved
-    kBluetoothDeviceClassMinorAudioMicrophone					= 0x04,		// [000100] Microphone
-    kBluetoothDeviceClassMinorAudioLoudspeaker					= 0x05,		// [000101] Loudspeaker
-    kBluetoothDeviceClassMinorAudioHeadphones					= 0x06,		// [000110] Headphones
-    kBluetoothDeviceClassMinorAudioPortable						= 0x07,		// [000111] Portable Audio
-    kBluetoothDeviceClassMinorAudioCar							= 0x08,		// [001000] Car Audio
-    kBluetoothDeviceClassMinorAudioSetTopBox					= 0x09,		// [001001] Set-top box
-    kBluetoothDeviceClassMinorAudioHiFi							= 0x0a,		// [001010] HiFi Audio Device
-    kBluetoothDeviceClassMinorAudioVCR							= 0x0b,		// [001011] VCR
-    kBluetoothDeviceClassMinorAudioVideoCamera					= 0x0c,		// [001100] Video Camera
-    kBluetoothDeviceClassMinorAudioCamcorder					= 0x0d,		// [001101] Camcorder
-    kBluetoothDeviceClassMinorAudioVideoMonitor					= 0x0e,		// [001110] Video Monitor
-    kBluetoothDeviceClassMinorAudioVideoDisplayAndLoudspeaker	= 0x0f,		// [001111] Video Display and Loudspeaker
-    kBluetoothDeviceClassMinorAudioVideoConferencing			= 0x10,		// [010000] Video Conferencing
-    kBluetoothDeviceClassMinorAudioReserved2					= 0x11,		// [010001] Reserved
-    kBluetoothDeviceClassMinorAudioGamingToy					= 0x12,		// [010010] Gaming/Toy
-    
-	
-	// Range 0x13 to 0x7F Reserved for future use.
-	
-    
-	///
-	/// Peripheral Major Class
-	///
-    
-    // Peripheral1 subclass is bits 7 & 6
-    
-    kBluetoothDeviceClassMinorPeripheral1Keyboard			= 0x10,		// [01XXXX] Keyboard
-    kBluetoothDeviceClassMinorPeripheral1Pointing			= 0x20,		// [10XXXX] Pointing device
-    kBluetoothDeviceClassMinorPeripheral1Combo				= 0x30,		// [11XXXX] Combo keyboard/pointing device
-    
-    // Peripheral2 subclass is bits 5-2
-    
-    kBluetoothDeviceClassMinorPeripheral2Unclassified		= 0x00,		// [XX0000] Uncategorized device
-    kBluetoothDeviceClassMinorPeripheral2Joystick			= 0x01,		// [XX0001] Joystick
-    kBluetoothDeviceClassMinorPeripheral2Gamepad			= 0x02,		// [XX0010] Gamepad
-    kBluetoothDeviceClassMinorPeripheral2RemoteControl		= 0x03,		// [XX0011] Remote control
-    kBluetoothDeviceClassMinorPeripheral2SensingDevice		= 0x04,		// [XX0100] Sensing device
-    kBluetoothDeviceClassMinorPeripheral2DigitizerTablet	= 0x05,		// [XX0101] Digitizer Tablet	
-    kBluetoothDeviceClassMinorPeripheral2CardReader			= 0x06,		// [XX0110] Card Reader
-    
-	kBluetoothDeviceClassMinorPeripheral2AnyPointing		= 'poin',	// Anything under MinorPeripheral1Pointing
-	
-    // Range 0x05 to 0x0f reserved for future use
-	
-    
-	///
-	/// Imaging Major Class
-	///
-    
-    // Imaging1 subclass is bits 7 - 4
-    
-    kBluetoothDeviceClassMinorImaging1Display				= 0x04,		// [XXX1XX] Display
-    kBluetoothDeviceClassMinorImaging1Camera				= 0x08,		// [XX1XXX] Camera
-    kBluetoothDeviceClassMinorImaging1Scanner				= 0x10,		// [X1XXXX] Scanner
-    kBluetoothDeviceClassMinorImaging1Printer				= 0x20,		// [1XXXXX] Printer
-    
-    // Imaging2 subclass is bits 3 - 2
-    
-    kBluetoothDeviceClassMinorImaging2Unclassified			= 0x00,		// [XXXX00] Uncategorized, default
-    
-    // Range 0x01 - 0x03 reserved for future use
-    
-    
-	///
-	///	Misc
-	///
-	
-	kBluetoothDeviceClassMinorAny							= '****',	// Pseudo-class - means anything acceptable.
-	kBluetoothDeviceClassMinorNone							= 'none',	// Pseudo-class - means no matching.
-	
-	kBluetoothDeviceClassMinorEnd
-};
-		
-		
-// Peripheral devices bits 7 & 6
-#define BluetoothCoDMinorPeripheral1(minorClass) (minorClass & 0x30)
-		
-// Peripheral devices bits 5 - 2
-#define BluetoothCoDMinorPeripheral2(minorClass) (minorClass & 0x0f)	
-		
-#pragma mark -
-#pragma mark === L2CAP ===
-
-//===========================================================================================================================
-//	L2CAP
-//===========================================================================================================================
-
-enum
-{
-	kBluetoothL2CAPPSMSDP						= 0x0001, 
-	kBluetoothL2CAPPSMRFCOMM					= 0x0003, 
-	kBluetoothL2CAPPSMTCS_BIN					= 0x0005,	// Telephony Control Specifictation / TCS Binary
-    kBluetoothL2CAPPSMTCS_BIN_Cordless			= 0x0007,	// Telephony Control Specifictation / TCS Binary
-    kBluetoothL2CAPPSMBNEP						= 0x000F,	// Bluetooth Network Encapsulation Protocol
-    kBluetoothL2CAPPSMHIDControl				= 0x0011,	// HID profile - control interface
-    kBluetoothL2CAPPSMHIDInterrupt				= 0x0013,	// HID profile - interrupt interface
-    kBluetoothL2CAPPSMAVCTP						= 0x0017,	// Audio/Video Control Transport Protocol
-    kBluetoothL2CAPPSMAVDTP						= 0x0019,	// Audio/Video Distribution Transport Protocol
-    kBluetoothL2CAPPSMUID_C_Plane				= 0x001D,	// Unrestricted Digital Information Profile (UDI)
-	
-	// Range < 0x1000 reserved.
-    kBluetoothL2CAPPSMReservedStart				= 0x0001,
-    kBluetoothL2CAPPSMReservedEnd				= 0x1000,
-    
-	// Range 0x1001-0xFFFF dynamically assigned.
-    kBluetoothL2CAPPSMDynamicStart				= 0x1001,
-	kBluetoothL2CAPPSMD2D						= 0x100F,
-    kBluetoothL2CAPPSMDynamicEnd				= 0xFFFF,
-    
-    kBluetoothL2CAPPSMNone						= 0x0000
-};
-
-
-#pragma mark -
-#pragma mark === SDP ===
-
-//===========================================================================================================================
-//	Service Discovery Protocol
-//===========================================================================================================================
-
-enum
-{
-	// General
-	
-	kBluetoothSDPUUID16Base									= 0x0000, 	// 00000000-0000-1000-8000-00805f9b34fb
-	
-	// Protocols
-	
-	kBluetoothSDPUUID16SDP				 					= 0x0001, 	// 00000001-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16UDP 									= 0x0002, 	// 00000002-0000-1000-8000-00805f9b34fb 
-	kBluetoothSDPUUID16RFCOMM 								= 0x0003, 	// 00000003-0000-1000-8000-00805f9b34fb 
-	kBluetoothSDPUUID16TCP 									= 0x0004, 	// 00000004-0000-1000-8000-00805f9b34fb 
-	kBluetoothSDPUUID16TCSBIN 								= 0x0005, 	// 00000005-0000-1000-8000-00805f9b34fb 
-	kBluetoothSDPUUID16TCSAT 								= 0x0006, 	// 00000006-0000-1000-8000-00805f9b34fb 
-	kBluetoothSDPUUID16OBEX 								= 0x0008, 	// 00000008-0000-1000-8000-00805f9b34fb 
-	kBluetoothSDPUUID16IP 									= 0x0009, 	// 00000009-0000-1000-8000-00805f9b34fb 
-	kBluetoothSDPUUID16FTP 									= 0x000A, 	// 0000000A-0000-1000-8000-00805f9b34fb 
-	kBluetoothSDPUUID16HTTP 								= 0x000C, 	// 0000000C-0000-1000-8000-00805f9b34fb 
-	kBluetoothSDPUUID16WSP	 								= 0x000E, 	// 0000000E-0000-1000-8000-00805f9b34fb 
-	kBluetoothSDPUUID16BNEP									= 0x000F,
-	kBluetoothSDPUUID16UPNP									= 0x0010,
-	kBluetoothSDPUUID16HIDP									= 0x0011,
-	kBluetoothSDPUUID16HardcopyControlChannel				= 0x0012,
-	kBluetoothSDPUUID16HardcopyDataChannel					= 0x0014,
-	kBluetoothSDPUUID16HardcopyNotification					= 0x0016,
-	kBluetoothSDPUUID16AVCTP								= 0x0017,
-	kBluetoothSDPUUID16AVDTP								= 0x0019,
-	kBluetoothSDPUUID16CMPT									= 0x001B,
-	kBluetoothSDPUUID16UDI_C_Plane							= 0x001D,
-	kBluetoothSDPUUID16L2CAP 								= 0x0100, 	// 00000100-0000-1000-8000-00805f9b34fb 
-};
-
-enum SDPServiceClasses
-{
-	kBluetoothSDPUUID16ServiceClassServiceDiscoveryServer					= 0x1000,	// 00001000-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassBrowseGroupDescriptor					= 0x1001,	// 00001001-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassPublicBrowseGroup						= 0x1002,	// 00001002-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassSerialPort								= 0x1101,	// 00001101-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassLANAccessUsingPPP						= 0x1102,	// 00001102-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassDialupNetworking							= 0x1103,	// 00001103-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassIrMCSync									= 0x1104,	// 00001104-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassOBEXObjectPush							= 0x1105,	// 00001105-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassOBEXFileTransfer							= 0x1106,	// 00001106-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassIrMCSyncCommand							= 0x1107,	// 00001107-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassHeadset									= 0x1108,	// 00001108-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassCordlessTelephony						= 0x1109,	// 00001109-0000-1000-8000-00805f9b34fb
-    kBluetoothSDPUUID16ServiceClassAudioSource								= 0x110A,
-    kBluetoothSDPUUID16ServiceClassAudioSink								= 0x110B,
-    kBluetoothSDPUUID16ServiceClassAVRemoteControlTarget					= 0x110C,
-    kBluetoothSDPUUID16ServiceClassAdvancedAudioDistribution				= 0x110D,
-    kBluetoothSDPUUID16ServiceClassAVRemoteControl							= 0x110E,
-    kBluetoothSDPUUID16ServiceClassVideoConferencing						= 0x110F,
-	kBluetoothSDPUUID16ServiceClassIntercom									= 0x1110,	// 00001110-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassFax										= 0x1111,	// 00001111-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassHeadsetAudioGateway						= 0x1112,	// 00001112-0000-1000-8000-00805f9b34fb
-    kBluetoothSDPUUID16ServiceClassWAP										= 0x1113,
-    kBluetoothSDPUUID16ServiceClassWAPClient								= 0x1114,
-    kBluetoothSDPUUID16ServiceClassPANU										= 0x1115,
-    kBluetoothSDPUUID16ServiceClassNAP										= 0x1116,
-    kBluetoothSDPUUID16ServiceClassGN										= 0x1117,
-    kBluetoothSDPUUID16ServiceClassDirectPrinting							= 0x1118,
-    kBluetoothSDPUUID16ServiceClassReferencePrinting						= 0x1119,
-    kBluetoothSDPUUID16ServiceClassImaging									= 0x111A,
-    kBluetoothSDPUUID16ServiceClassImagingResponder							= 0x111B,
-    kBluetoothSDPUUID16ServiceClassImagingAutomaticArchive					= 0x111C,
-    kBluetoothSDPUUID16ServiceClassImagingReferencedObjects					= 0x111D,
-    kBluetoothSDPUUID16ServiceClassHandsFree								= 0x111E,
-    kBluetoothSDPUUID16ServiceClassHandsFreeAudioGateway					= 0x111F,
-    kBluetoothSDPUUID16ServiceClassDirectPrintingReferenceObjectsService	= 0x1120,
-    kBluetoothSDPUUID16ServiceClassReflectedUI								= 0x1121,
-    kBluetoothSDPUUID16ServiceClassBasicPrinting							= 0x1122,
-    kBluetoothSDPUUID16ServiceClassPrintingStatus							= 0x1123,
-    kBluetoothSDPUUID16ServiceClassHumanInterfaceDeviceService				= 0x1124,
-    kBluetoothSDPUUID16ServiceClassHardcopyCableReplacement					= 0x1125,
-    kBluetoothSDPUUID16ServiceClassHCR_Print								= 0x1126,
-    kBluetoothSDPUUID16ServiceClassHCR_Scan									= 0x1127,
-    kBluetoothSDPUUID16ServiceClassCommonISDNAccess							= 0x1128,
-    kBluetoothSDPUUID16ServiceClassVideoConferencingGW						= 0x1129,
-    kBluetoothSDPUUID16ServiceClassUDI_MT									= 0x112A,
-    kBluetoothSDPUUID16ServiceClassUDI_TA									= 0x112B,
-    kBluetoothSDPUUID16ServiceClassAudioVideo								= 0x112C,
-    kBluetoothSDPUUID16ServiceClassSIM_Access								= 0x112D,
-    kBluetoothSDPUUID16ServiceClassPhonebookAccess_PCE						= 0x112E,
-    kBluetoothSDPUUID16ServiceClassPhonebookAccess_PSE						= 0x112F,
-    kBluetoothSDPUUID16ServiceClassPhonebookAccess							= 0x1130,
-    kBluetoothSDPUUID16ServiceClassHeadset_HS								= 0x1131,
-    kBluetoothSDPUUID16ServiceClassMessageAccessServer						= 0x1132,
-    kBluetoothSDPUUID16ServiceClassMessageNotificationServer				= 0x1133,
-    kBluetoothSDPUUID16ServiceClassMessageAccessProfile						= 0x1134,
-	kBluetoothSDPUUID16ServiceClassPnPInformation							= 0x1200,	// 00001200-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassGenericNetworking						= 0x1201,	// 00001201-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassGenericFileTransfer						= 0x1202,	// 00001202-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassGenericAudio								= 0x1203,	// 00001203-0000-1000-8000-00805f9b34fb
-	kBluetoothSDPUUID16ServiceClassGenericTelephony							= 0x1204	// 00001204-0000-1000-8000-00805f9b34fb
-};
-
-enum SDPAttributeIdentifierCodes
-{
-	kBluetoothSDPAttributeIdentifierServiceRecordHandle					= 0x0000,
-	kBluetoothSDPAttributeIdentifierServiceClassIDList					= 0x0001,
-	kBluetoothSDPAttributeIdentifierServiceRecordState					= 0x0002,
-	kBluetoothSDPAttributeIdentifierServiceID							= 0x0003,
-	kBluetoothSDPAttributeIdentifierProtocolDescriptorList				= 0x0004,
-	kBluetoothSDPAttributeIdentifierBrowseGroupList						= 0x0005,
-	kBluetoothSDPAttributeIdentifierLanguageBaseAttributeIDList			= 0x0006,
-	kBluetoothSDPAttributeIdentifierServiceInfoTimeToLive				= 0x0007,
-	kBluetoothSDPAttributeIdentifierServiceAvailability					= 0x0008,
-	kBluetoothSDPAttributeIdentifierBluetoothProfileDescriptorList		= 0x0009,
-	kBluetoothSDPAttributeIdentifierDocumentationURL					= 0x000A,
-	kBluetoothSDPAttributeIdentifierClientExecutableURL					= 0x000B,
-	kBluetoothSDPAttributeIdentifierIconURL								= 0x000C,
-	kBluetoothSDPAttributeIdentifierAdditionalProtocolsDescriptorList	= 0x000D,
-
-    // Service Discovery Server
-	kBluetoothSDPAttributeIdentifierVersionNumberList					= 0x0200,
-	kBluetoothSDPAttributeIdentifierServiceDatabaseState				= 0x0201,
-    
-    // Browse Group Descriptor
-    kBluetoothSDPAttributeIdentifierGroupID								= 0x0200,
-    
-    // PAN
-    kBluetoothSDPAttributeIdentifierIPSubnet							= 0x0200,
-
-#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_1_1
-
-    // HID																			Required		Type		Section		Notes
-    kBluetoothSDPAttributeIdentifierHIDReleaseNumber					= 0x0200,	// O			uint16		7.11.1
-    kBluetoothSDPAttributeIdentifierHIDParserVersion					= 0x0201,	// M			uint16		-
-    kBluetoothSDPAttributeIdentifierHIDDeviceSubclass					= 0x0202,	// M			uint8		7.11.2		Should match the low order 8 bits of CoD unless a combo device
-    kBluetoothSDPAttributeIdentifierHIDCountryCode						= 0x0203,	// M			uint8		7.11.3
-    kBluetoothSDPAttributeIdentifierHIDVirtualCable						= 0x0204,	// M			bool		7.11.4
-    kBluetoothSDPAttributeIdentifierHIDReconnectInitiate				= 0x0205,	// M			bool		7.11.5
-    kBluetoothSDPAttributeIdentifierHIDDescriptorList					= 0x0206,	// M			sequence	7.11.6		Layout is defined in Section 6.2 of the HID Specification
-    kBluetoothSDPAttributeIdentifierHIDLangIDBaseList					= 0x0207,	// M			sequence	7.11.7
-    kBluetoothSDPAttributeIdentifierHIDSDPDisable						= 0x0208,	// O			bool		7.11.8
-    kBluetoothSDPAttributeIdentifierHIDBatteryPower						= 0x0209,	// O			bool		7.11.9
-    kBluetoothSDPAttributeIdentifierHIDRemoteWake						= 0x020A,	// O			bool		7.11.10
-    kBluetoothSDPAttributeIdentifierHIDProfileVersion					= 0x020B,	// M			uint16		7.11.14
-    kBluetoothSDPAttributeIdentifierHIDSupervisionTimeout				= 0x020C,	// O			uint16		7.11.12		Default to 5 seconds or longer if not defined
-    kBluetoothSDPAttributeIdentifierHIDNormallyConnectable				= 0x020D,	// O			bool		7.11.13
-    kBluetoothSDPAttributeIdentifierHIDBootDevice						= 0x020E,	// M			bool		7.11.11		Only defined for mice and keyboards as of HID 1.0
-
-#endif
-    
-	kBluetoothSDPAttributeIdentifierServiceVersion						= 0x0300,
-	kBluetoothSDPAttributeIdentifierExternalNetwork						= 0x0301,	// Cordless telephony
-    kBluetoothSDPAttributeIdentifierNetwork								= 0x0301,	// Handsfree Profile (HFP)
-	kBluetoothSDPAttributeIdentifierSupportedDataStoresList				= 0x0301,	// Sync Profile
-	kBluetoothSDPAttributeIdentifierFaxClass1Support					= 0x0302,	// Fax Profile
-	kBluetoothSDPAttributeIdentifierRemoteAudioVolumeControl			= 0x0302,	// GAP???
-	kBluetoothSDPAttributeIdentifierFaxClass2_0Support					= 0x0303,
-	kBluetoothSDPAttributeIdentifierSupporterFormatsList				= 0x0303,
-	kBluetoothSDPAttributeIdentifierFaxClass2Support					= 0x0304,
-	kBluetoothSDPAttributeIdentifierAudioFeedbackSupport				= 0x0305,
-    kBluetoothSDPAttributeIdentifierNetworkAddress						= 0x0306,	// WAP
-    kBluetoothSDPAttributeIdentifierWAPGateway							= 0x0307,	// WAP
-    kBluetoothSDPAttributeIdentifierHomepageURL							= 0x0308,	// WAP
-    kBluetoothSDPAttributeIdentifierWAPStackType						= 0x0309,	// WAP
-    kBluetoothSDPAttributeIdentifierSecurityDescription					= 0x030A,	// PAN
-    kBluetoothSDPAttributeIdentifierNetAccessType						= 0x030B,	// PAN
-    kBluetoothSDPAttributeIdentifierMaxNetAccessRate					= 0x030C,	// PAN
-    kBluetoothSDPAttributeIdentifierSupportedCapabilities				= 0x0310,	// Imaging
-    kBluetoothSDPAttributeIdentifierSupportedFeatures					= 0x0311,	// Imaging & HFP
-    kBluetoothSDPAttributeIdentifierSupportedFunctions					= 0x0312,	// Imaging
-    kBluetoothSDPAttributeIdentifierTotalImagingDataCapacity			= 0x0313,	// Imaging
-
-	kBluetoothSDPAttributeIdentifierServiceName							= 0x0000, /* +language base offset*/
-	kBluetoothSDPAttributeIdentifierServiceDescription					= 0x0001, /* +language base offset*/
-	kBluetoothSDPAttributeIdentifierProviderName						= 0x0002  /* +language base offset*/
-};
-
-enum SDPAttributeDeviceIdentificationRecord
-{
-	/* Values taken from the Bluetooth Device Identification specification, 1.0 draft, 1.16.2003 */
-	
-	kBluetoothSDPAttributeDeviceIdentifierServiceDescription			= 0x0001,	/* String */
-	kBluetoothSDPAttributeDeviceIdentifierDocumentationURL				= 0x000A,	/* URL */
-	kBluetoothSDPAttributeDeviceIdentifierClientExecutableURL			= 0x000B,	/* URL */
-	kBluetoothSDPAttributeDeviceIdentifierSpecificationID				= 0x0200,	/* 2 byte unsigned integer */
-	kBluetoothSDPAttributeDeviceIdentifierVendorID						= 0x0201,	/* 2 byte unsigned integer */
-	kBluetoothSDPAttributeDeviceIdentifierProductID						= 0x0202,	/* 2 byte unsigned integer */
-	kBluetoothSDPAttributeDeviceIdentifierVersion						= 0x0203,	/* 2 byte unsigned integer */
-	kBluetoothSDPAttributeDeviceIdentifierPrimaryRecord					= 0x0204,	/* Boolean */
-	kBluetoothSDPAttributeDeviceIdentifierVendorIDSource				= 0x0205,	/* 2 byte unsigned integer */
-	kBluetoothSDPAttributeDeviceIdentifierReservedRangeStart			= 0x0206,
-	kBluetoothSDPAttributeDeviceIdentifierReservedRangeEnd				= 0x02FF
-	
-};
-
-enum ProtocolParameters
-{
-    kBluetoothSDPProtocolParameterL2CAPPSM								= 1,
-    kBluetoothSDPProtocolParameterRFCOMMChannel							= 1,
-    kBluetoothSDPProtocolParameterTCPPort								= 1,
-    kBluetoothSDPProtocolParameterUDPPort								= 1,
-    kBluetoothSDPProtocolParameterBNEPVersion							= 1,
-    kBluetoothSDPProtocolParameterBNEPSupportedNetworkPacketTypeList	= 2
-};
-
-#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0
-
-//Inquiries with 'Extended Inquiry Response' (v2.1 specification)
-
-enum BluetoothHCIExtendedInquiryResponseDataTypes
-{
-	kBluetoothHCIExtendedInquiryResponseDataTypeFlags										=	0x01,
-	kBluetoothHCIExtendedInquiryResponseDataType16BitServiceClassUUIDsWithMoreAvailable		=	0x02,
-	kBluetoothHCIExtendedInquiryResponseDataType16BitServiceClassUUIDsCompleteList			=	0x03,
-	kBluetoothHCIExtendedInquiryResponseDataType32BitServiceClassUUIDsWithMoreAvailable		=	0x04,
-	kBluetoothHCIExtendedInquiryResponseDataType32BitServiceClassUUIDsCompleteList			=	0x05,
-	kBluetoothHCIExtendedInquiryResponseDataType128BitServiceClassUUIDsWithMoreAvailable	=	0x06,
-	kBluetoothHCIExtendedInquiryResponseDataType128BitServiceClassUUIDsCompleteList			=	0x07,
-	kBluetoothHCIExtendedInquiryResponseDataTypeShortenedLocalName							=	0x08,
-	kBluetoothHCIExtendedInquiryResponseDataTypeCompleteLocalName							=	0x09,
-	kBluetoothHCIExtendedInquiryResponseDataTypeDeviceID									=	0x10,
-	kBluetoothHCIExtendedInquiryResponseDataTypeManufacturerSpecificData					=	0xFF
-};
-
-#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0 */
-
-
-#ifdef	__cplusplus
-	}
-#endif
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothHCIController.h b/i386/include/IOKit/bluetooth/IOBluetoothHCIController.h
deleted file mode 100644
index 303795e..0000000
--- a/i386/include/IOKit/bluetooth/IOBluetoothHCIController.h
+++ /dev/null
@@ -1,1370 +0,0 @@
-/*
-	File:		IOBluetoothHCIController.h
-	Contains:	Bluetooth Host Controller base class.
-	Copyright:	(c) 2001-2008 by Apple, all rights reserved.
-*/
-
-
-#pragma once
-
-//====================================================================================================
-// Imports
-//====================================================================================================
-
-#import <IOKit/IOService.h>
-#import <IOKit/system.h>
-#import <IOKit/system.h>
-#import <kern/thread_call.h>
-
-#import </usr/include/AvailabilityMacros.h>
-
-#include <IOKit/pwr_mgt/RootDomain.h>
-
-#import <IOKit/bluetooth/Bluetooth.h>
-
-#import <IOKit/bluetooth/IOBluetoothTypes.h>
-#import <IOKit/bluetooth/IOBluetoothInternal.h>
-
-//====================================================================================================
-// Forward declarations
-//====================================================================================================
-
-class OSSet;
-class IOWorkLoop;
-class IOCommandGate;
-class IOWorkQueue;
-class IOBluetoothDevice;
-class IOBluetoothHCIRequest;
-class IOBluetoothHCIController;
-class IOBluetoothACLMemoryDescriptor;
-class IOTimerEventSource;
-class IOBluetoothInactivityTimerEventSource;
-class IOBluetoothHCIPacketLogUserClient;
-
-//====================================================================================================
-// defines, typdefs, etc.
-//====================================================================================================
-
-#define kNoReturnParam					NULL
-
-typedef	uint16_t	DevicePublishNotificationStateType;
-enum DevicePublishNotificationStateTypes
-{
-	kHasNotRegisteredForDevicePublishNotification		= 0x0001,
-	kHasRegisteredForDevicePublishNotification			= 0x0002,
-	kDevicePublishNotificationCalled					= 0x0004,
-	kDevicePublishNotificationProcessed					= 0x0008
-};
-
-typedef UInt32 HCIDataHandlerType;
-enum HCIDataHandlerTypes
-{
-	kTransportDataTypeHCIEvents,
-	kTransportDataTypeACL,
-	kTransportDataTypeSCO
-};
-
-typedef IOReturn (*IOBluetoothIncomingDataAction) ( IOBluetoothHCIController *hciController,  UInt8 *inDataPtr, UInt32 inDataSize, UInt32 inSequenceNumber );
-typedef IOReturn (*IOBluetoothHCIControllerDataHandler) ( void * contextPtr, const UInt8 * data, UInt32 dataSize );
-
-typedef struct HCIDataHandler	HCIDataHandler;
-struct HCIDataHandler
-{
-	IOBluetoothHCIControllerDataHandler		procPtr;
-	void * 									contextPtr;
-};
-
-typedef struct HCIEventNotificationListener	HCIEventNotificationListener;
-struct HCIEventNotificationListener
-{
-	task_t				owningTask;		// Used to ID these things when adding/removing them from our listener pool.
-	mach_port_t			port;			// Mach port to send out the notificaton.
-	void * 				refCon;			// RefCon for the port's use.
-};
-
-#define POWER_STATE_CHANGE_IN_PROGRESS()	( mCurrentInternalPowerState != mPendingInternalPowerState )
-#define	IS_POWERING_DOWN()	( POWER_STATE_CHANGE_IN_PROGRESS() && ( mPendingInternalPowerState == kIOBluetoothHCIControllerInternalPowerStateOff ) )
-
-//====================================================================================================
-// Callback structure for data:
-//====================================================================================================
-
-typedef struct SendDataContext
-{
-	// Data sent:
-	IOMemoryDescriptor *memoryDescriptorPointer;
-	
-	// Referece to the device that sent the data:
-	IOBluetoothDevice *devicePointer;
-	void *devicePointerContextInfo0;
-	void *devicePointerContextInfo1;
-	
-	// And the controller that received it:
-	IOBluetoothHCIController *hciController;
-	void *controllerPointerContextInfo0;
-	void *controllerPointerContextInfo1;
-	
-	// ReturnValue:
-	IOReturn sendingWasSuccessful;
-} SendDataContext;
-
-
-//====================================================================================================
-// Keep track of hearing devices
-//====================================================================================================
-typedef struct HearingDeviceListType
-{
-	BluetoothDeviceAddress					mDeviceAddress;
-	bool									mRemoveDeviceCalled;
-	DevicePublishNotificationStateType		mDevicePublishNotificationState;
-	HearingDeviceListType *					mNextDevice;
-	HearingDeviceListType *					mPreviousDevice;
-} HearingDeviceListType;
-
-//====================================================================================================
-// IOBluetoothHCIController
-//====================================================================================================
-
-class IOBluetoothHCIController : public IOService
-{
-	// We don't make many friends, but at least we have a few...
-
-    friend class IOBluetoothHCIPacketLogUserClient;
-    friend class IOBluetoothSerialManager;
-    friend class IOBluetoothHCIUserClient;
-    friend class IOBluetoothDevice;
-	friend class IOBluetoothHCIRequest;
-	
-	// IOKit stuff.
-	
-    OSDeclareDefaultStructors( IOBluetoothHCIController )
-
-protected:
-
-	IOWorkLoop *					mWorkLoop;
-	IOCommandGate *					mCommandGate;
-	IOWorkQueue *					mWorkQueue;
-	IOTimerEventSource *			mTimerEventSource;
-	Boolean							mShouldRunInactivityTimer;
-	
-	// Data and request queue stuff.
-	
-	HCIEventNotificationListener*	mHCIEventListenersList;
-	size_t							mHCIEventListenersListSize;
- 	HCIDataHandler*					mHCIEventDataHandlerList;
-	size_t							mHCIEventDataHandlerListSize;
-	HCIDataHandler*					mACLDataHandlerList;
-	size_t							mACLDataHandlerListSize;
-	HCIDataHandler*					mSCODataHandlerList;
-	size_t							mSCODataHandlerListSize;
-	
-	IOBluetoothHCIRequest *	 		mBusyQueueHead;
-	IOBluetoothHCIRequest *	 		mWaitQueueHead;
-	IOBluetoothHCIRequest **		mHCIRequestList;
-
-    IOBluetoothDevice *				mDeviceListHead;
-	
-	OSSet *							mPacketLogClients;
-	UInt8 *							mPacketLogBuffer;
-	UInt32							mPacketLogBufferSize;
-   
-	uint8_t *						mEventDataBuffer;			// Events without matching requests will use this.
-	size_t							mEventDataBufferSize;
-	
-    // This keeps track of the ACL packets we actually sent:
-    BluetoothHCIBufferSize			mHCIBufferSize;
-    UInt16							mNumOutstandingACLPackets;
-    
-    OSArray *						mAllowedIncomingL2CAPChannels;
-    
-    UInt32							mNextAvailableSequenceNumber;
-    UInt32							mCurrentlyExecutingSequenceNumber;
-    UInt16							mActiveConnections;
-	
-	// Packet Queue description:
-	typedef struct QueuePacketHolder {
-		IOMemoryDescriptor								*memDescriptor;	// The data we need to send
-		SendDataContext *								contextPtr;		// Context pointer for the sent data.
-		IOBluetoothDevice *								inTargetDevice;	// The device that enqueued the data.
-		struct QueuePacketHolder						*next;			// The next block in the queue.
-	} QueuePacketHolder;
-    QueuePacketHolder *mACLQueueHead, *mACLQueueTail;
-	
-	// Counters to limit the number of packets in the queue (we do not want to go out of memory)
-	UInt32 mNumberOfPacketsInQueue;
-
-	// The allowed RFCOMM channels
-    OSArray *mAllowedIncomingRFCOMMChannels;
-    
-	IOBluetoothHCIControllerInternalPowerState	mCurrentInternalPowerState;
-	IOBluetoothHCIControllerInternalPowerState	mPendingInternalPowerState;
-	Boolean										mAsyncPowerStateChangeInProgress;
-	UInt32										mPendingPowerStateChangeOptions;
-	IOBluetoothHCIControllerPowerOptions		mControllerPowerOptions;
-	Boolean										mPowerStateChangeIsUserEnforced;
-	
-	Boolean										mHardwareSetupComplete;
-	
-	IOBluetoothHCIControllerConfigState		mControllerConfigState;
-	IOBluetoothHCIControllerConfigState		mPreviousControllerConfigState;
-	
-	IOBluetoothHCIControllerFeatureFlags	mControllerFeatureFlags;
-
-	// Overrides.
-
-	bool 				start( IOService * provider );
-
-	bool		 		init( OSDictionary* dictionary );
-
-    virtual void		free();
-
-#if defined( MAC_OS_X_VERSION_10_5 )
-    virtual void		systemWillShutdown( IOOptionBits specifier );
-#endif
-
-    static IOReturn		initHardwareAction(	OSObject	*owner,
-                                            void		*arg1,
-                                            void		*arg2,
-                                            void		*arg3,
-                                            void		*arg4 );
-                                            
-    virtual bool		initHardware( IOService * provider );
-	
-    static IOReturn		setupHardwareAction(	OSObject	*owner,
-												void		*arg1,
-												void		*arg2,
-												void		*arg3,
-												void		*arg4 );
-                                                    
-	virtual IOReturn	setupHardware( IOService* provider );
-
-    virtual void		hardwareSetupComplete( IOReturn status );
-    
-	virtual	void		setConfigState( IOBluetoothHCIControllerConfigState configState );
-	virtual	bool		terminate( IOOptionBits options = 0 );
-	virtual bool		willTerminate( IOService * provider, IOOptionBits options );
-	virtual bool		didTerminate( IOService * provider, IOOptionBits options, bool * defer );
-	
-	void 				stop( IOService * provider );
-	
-	IOReturn			newUserClient(	task_t 				owningTask,
-										void *				securityID,
-										UInt32 				type,
-										IOUserClient **		handler );
-	
-	uint32_t			CountExistingHCIControllers();
-
-	virtual IOReturn	powerStateWillChangeTo(	IOPMPowerFlags	powerFlags,
-												unsigned long	powerState,
-												IOService *		from );
-
-	virtual	unsigned long	maxCapabilityForDomainState(  IOPMPowerFlags domainState );
-
-	virtual unsigned long	initialPowerStateForDomainState ( IOPMPowerFlags powerFlags );
-
-	// Our protected custom stuff.
-	
-    static IOReturn		DetachUserClientsAction(	OSObject *owner,
-                                                    void *arg1,
-                                                    void *arg2,
-                                                    void *arg3,
-                                                    void *arg4 );
-
-    virtual void		DetachUserClients();
-	
-    static IOReturn		setPropertiesAction( OSObject	*owner, 
-                                             void		*arg1, 
-                                             void		*arg2, 
-                                             void		*arg3, 
-                                             void		*arg4 );
-                                            
-    virtual IOReturn	setPropertiesWL( OSObject * properties );
-
-    static IOReturn		AddPacketLogUserClientAction(	OSObject *owner, 
-                                                        void *arg1, 
-                                                        void *arg2, 
-                                                        void *arg3, 
-                                                        void *arg4 );
-
-    virtual IOReturn	AddPacketLogUserClient( IOBluetoothHCIPacketLogUserClient *newPacketLogUserClient );
-	
-	virtual bool		PacketLogFillBufferedData();
-	
-    virtual void		PacketLogClientClosed( IOBluetoothHCIPacketLogUserClient *packetLogClient );
-	
-    virtual void		LogPacket( UInt8 packetType, void *packetData, size_t packetSize );
-
-	static IOReturn		LogPacketAction( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4 );
-
-	virtual	void		DesyncIncomingData( IOBluetoothIncomingDataAction action, UInt8 *inDataPtr, UInt32 inDataSize );
-    
-	static	void		DesyncIncomingDataAction( IOBluetoothHCIController *hciController, IOBluetoothIncomingDataAction action, void *inDataPtr, UInt32 inDataSize, UInt32 sequenceNumber );
-	
-    virtual void		SynchronizePacketSequence( UInt32 sequenceNumber );
-    
-    virtual IOReturn	AddDevice( IOBluetoothDevice *inDevice );
-    
-    virtual IOReturn	RemoveDevice( IOBluetoothDevice *inDevice );
-    
-    virtual IOReturn	CreateDeviceFromConnectionResults( BluetoothHCIEventConnectionCompleteResults *connectionResults );
-    
-    virtual IOReturn	DestroyDeviceWithDisconnectionResults( BluetoothHCIEventDisconnectionCompleteResults *disconnectionResults );
-    
-    virtual IOReturn	DestroyDevice( IOBluetoothDevice *inDevice );
-    
-    virtual IOReturn	DestroyAllDevices();
-
-    virtual void		FlushDeviceACLPackets( IOBluetoothDevice *inDevice );
-    
-    virtual void		DecrementOutstandingACLPackets( UInt16 delta );
-    
-    virtual void		ProcessFlushOccurredEvent( BluetoothHCIEventFlushOccurredResults *inFlushResults );
-    
-    virtual void		ProcessNumCompletedPacketsEvent( UInt8 *inDataPtr );
-    
-    virtual void		ProcessHCIControllerResetEvent();
-    
-    virtual IOReturn	DispatchIncomingACLData( UInt8 *inDataPtr, UInt32 inDataSize );
-
-	// Common methods for L2CAP and RFCOMM channel managment:
-	virtual void		MergeChannelDescription(OSDictionary *destination , OSDictionary *source);
-	virtual void		RemoveChannelRestrictions(OSDictionary *toChange , OSDictionary *removeRule, const char *key);
-	virtual Boolean		IsAllowedDevice(OSDictionary *description , IOBluetoothDevice *device);
-	virtual void		RemoveAllRules();
-
-	// L2CAP channel managment methods:
-    virtual void		RemoveAllowedIncomingL2CAPChannel( OSObject *channelID );
-	virtual IOReturn 	AddAllowedIncomingL2CAPChannel( OSDictionary *channelDescription );
-	virtual OSDictionary *GetIncomingL2CAPChannelDescription( OSNumber *psmNumber );
-
-	// L2CAP channel accessory methods:
-    virtual void		AddAllowedIncomingL2CAPChannel( BluetoothL2CAPPSM incomingPSM );
-    virtual void		AddAllowedIncomingL2CAPChannel( OSNumber *psmNumber );
-    virtual void 		RemoveAllowedIncomingL2CAPChannel( BluetoothL2CAPPSM incomingPSM );
-
-	// RFCOMM channel managment methods:
-	virtual OSDictionary *GetIncomingRFCOMMChannelDescription( OSNumber *channelIDNumber );
-	virtual IOReturn 	AddAllowedIncomingRFCOMMChannel( OSDictionary *channelDescription );
-    virtual void		RemoveAllowedIncomingRFCOMMChannel( OSObject *channelID );
-
-	// RFCOMM channel accessory methods:
-    virtual void		AddAllowedIncomingRFCOMMChannel( BluetoothRFCOMMChannelID incomingChannelID );
-    virtual void		AddAllowedIncomingRFCOMMChannel( OSNumber *channelIDNumber );
-    virtual void		AddSecureIncomingRFCOMMChannel( BluetoothRFCOMMChannelID incomingChannelID );
-    virtual void		AddSecureIncomingRFCOMMChannel( OSNumber *channelIDNumber );
-    virtual void 		RemoveAllowedIncomingRFCOMMChannel( BluetoothRFCOMMChannelID incomingChannelID );
-		
-	virtual IOReturn	TransferACLPacketToHW(IOMemoryDescriptor *memDescriptor,
-													SendDataContext *								contextPtr);
-	
-	// ACL Packet queue:
-	virtual IOReturn	EnqueuePacket(	IOMemoryDescriptor	*memDescriptor,
-										SendDataContext		*contextPtr,
-										IOBluetoothDevice	*inTargetDevice);
-										
-	virtual IOReturn	DequeuePacket();
-	
-	virtual IOReturn	RemoveAllPacketsBelongingTo(IOBluetoothDevice	*inTargetDevice);
-
-public:
-
-    // IOWorkLoop and IOCommandGate accessors
-    
-    virtual IOWorkLoop *getWorkLoop() const;
-    
-    virtual IOCommandGate *getCommandGate() const;
-    
-    virtual IOReturn setProperties( OSObject * properties );
-
-	// Subclasses must implement these for it to be a working transport
-	// in the Bluetooth Family world.
-	
-	virtual	IOReturn	SendHCIRequest(	UInt8 * 					buffer,
-										IOByteCount					bufferSize  );
-
-	static	IOReturn	SendACLCompletedAction ( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 );
-	
-	virtual	void		SendACLCompleted(	SendDataContext	*contextPtr);
-		
-	virtual	IOReturn	SendACLData(	IOMemoryDescriptor						*memDescriptor,
-										SendDataContext *						contextPtr  );
-
-	virtual	IOReturn	GetTransportInfo( BluetoothTransportInfo *	infoStruct );
-	
-	static	IOReturn	SendSCOCompletedAction ( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 );
-	
-	// Override to do something custom with the data. Otherwise, the registered data handler
-	// will get a peek at it.
-	
-    // The ProcessXXXData() functions are safe to be called from anywhere.
-    // They call ProcessXXXDataWL() on the workloop using ProcessXXXDataAction()
-    
-	virtual	void	 	ProcessEventData( UInt8 * inDataPtr, UInt32 inDataSize );
-		
-	virtual	void	 	ProcessACLData( UInt8 * data, UInt32 dataSize );
-	
-	virtual	void	 	ProcessSCOData( UInt8 * data, UInt32 dataSize, UInt32 inMissingData, AbsoluteTime inTimestamp, Boolean copyData );
-    
-	virtual	void	 	ProcessEventDataWL( UInt8 * inDataPtr, UInt32 inDataSize, UInt32 sequenceNumber );
-		
-	virtual	void	 	ProcessACLDataWL( UInt8 * data, UInt32 dataSize, UInt32 sequenceNumber );
-	
-	virtual	void	 	ProcessSCODataWL( UInt8 * data, UInt32 dataSize, UInt32 inMissingData, AbsoluteTime inTimestamp, Boolean copyData );
-    
-	static	IOReturn	ProcessEventDataAction( IOBluetoothHCIController *	hciController,
-												UInt8 *						incomingDataPtr,
-												UInt32						inDataSize,
-												UInt32						inSequenceNumber );
-		
-	static	IOReturn	ProcessACLDataAction(	IOBluetoothHCIController *	hciController,
-												UInt8 *						incomingDataPtr,
-												UInt32						inDataSize,
-												UInt32						inSequenceNumber );
-
-	// The following is only a "ghost" call and exists only to make the compiler happy, its implementation 
-	// does not do anything.
-	static	IOReturn	ProcessSCODataAction( IOBluetoothHCIController *	hciController,
-												UInt8 *						incomingDataPtr,
-												UInt32						inDataSize,
-												UInt32						inMissingData,
-												UInt32						inTimestampHi,
-												UInt32						inTimestampLo,
-												Boolean						inCopyData );
-												
-	static	IOReturn	ProcessSCODataActionAT( IOBluetoothHCIController *	hciController,
-												UInt8 *						incomingDataPtr,
-												UInt32						inDataSize,
-												UInt32						inMissingData,
-												AbsoluteTime*				inTimestamp,
-												Boolean						inCopyData );
-
-	// Data processing helpers.
-
-    virtual bool		GetCompleteCodeForCommand(	BluetoothHCICommandOpCode	inOpCode,
-                                                    BluetoothHCIEventCode		*outEventCode );
-                                                    
-	virtual	bool		GetOpCodeAndEventCode(	UInt8 * 						inDataPtr,
-												BluetoothHCICommandOpCode * 	outOpCode,
-												BluetoothHCIEventCode * 		eventCode,
-                                                BluetoothHCIEventStatus *		outStatus,
-                                                BluetoothDeviceAddress *		outDeviceAddress,
-                                                BluetoothConnectionHandle *		outConnectionHandle );
-									
-	virtual	IOReturn	FindConnectionCompleteType( BluetoothHCICommandOpCode *		outOpCode );
-													
-	virtual	IOReturn	HandleSpecialOpcodes( BluetoothHCICommandOpCode opCode );
-
-	// This is a hook for other interested parties to get HCI event notifications. When a user client is created,
-	// that mach_port_t will be passed on to us via these calls so that their port will get HCI events that aren't
-	// specifically tied to a requst object, but occur due to requests they make.
-	
-	virtual	IOReturn	AddHCIEventNotification( task_t inOwningTask, mach_port_t inPort, void * refCon );
-	
-	virtual	void		BroadcastEventNotification(	BluetoothHCIRequestID		inID,
-													BluetoothHCIEventCode		inEventCode,
-													IOReturn					eventStatus,
-													UInt8 *						inDataToSendPtr, 
-													IOByteCount 				inDataSize,
-                                                    BluetoothHCICommandOpCode	inOpCode );
-												
-	virtual void		BroadcastConfigStateChangeNotification(	IOBluetoothHCIControllerConfigState oldState,
-																IOBluetoothHCIControllerConfigState newState );
-																
-	virtual IOReturn	RemoveHCIEventNotification( task_t inOwningTask );
-
-	// This is a hook for other interested parties to get data from transports. They will register itself
-	// with these to receive the raw data from the transport, bypassing HCI code.
-	
-	virtual	IOReturn	AddDataClient(	HCIDataHandlerType		 			inType,
-										IOBluetoothHCIControllerDataHandler inProcPtr,
-										void * 								inContextPtr );
-										
-	virtual IOReturn	NotifyDataClients( HCIDataHandlerType inType, UInt8 * inDataPtr, UInt32 inDataSize );
-	
-	virtual IOReturn	RemoveDataClient( HCIDataHandlerType inType, IOBluetoothHCIControllerDataHandler inProcPtr );
-
-	// Request creation, deletion and other data processing stuff.
-
-	virtual	IOReturn 	HCIRequestCreate(	BluetoothHCIRequestID * 			outRequestID,
-											bool 								inDoAsyncNotify 	= TRUE,
-											UInt32 								inTimeout 			= 5,
-											BluetoothHCIRequestCallbackInfo * 	inCallbackInfo 		= NULL,
-											task_t								inTaskID			= 0,
-											UInt32								inControlFlags		= 0 );
-											
-	virtual	IOReturn	HCIRequestDelete( task_t inTask, BluetoothHCIRequestID inID );
-	
-	virtual	IOReturn 	LookupRequest( BluetoothHCIRequestID inID, IOBluetoothHCIRequest ** outRequestPtr );
-
-    virtual IOReturn	PrepareRequestForNewCommand(	BluetoothHCIRequestID			inID,
-                                                        const BluetoothDeviceAddress *	inDeviceAddress,
-                                                        BluetoothConnectionHandle		inConnectionHandle );
-                                                        
-	virtual	IOReturn	EnqueueRequest( IOBluetoothHCIRequest * inRequestPtr );
-
-	virtual	IOReturn	FindQueuedRequest(	BluetoothHCICommandOpCode	opCode,
-                                            BluetoothDeviceAddress *	inDeviceAddress,
-                                            BluetoothConnectionHandle	inConnectionHandle,
-                                            Boolean						inUseAttributes,
-                                            IOBluetoothHCIRequest **	outRequestPtr );
-
-	virtual	IOReturn	DequeueRequest( IOBluetoothHCIRequest * inRequestPtr );
-
-	virtual	IOReturn 	EnqueueWaitRequest( IOBluetoothHCIRequest * inRequestPtr );
-
-	virtual	IOReturn	FindQueuedWaitRequest( BluetoothHCICommandOpCode opCode, IOBluetoothHCIRequest ** outRequestPtr );
-
-	virtual IOReturn	DequeueWaitRequest( IOBluetoothHCIRequest * inRequestPtr );
-
-	virtual	IOReturn	AbortRequest( IOBluetoothHCIRequest * inRequestPtr );
-
-	virtual	IOReturn	FindNextExpiringRequest( BluetoothHCICommandOpCode opCode, IOBluetoothHCIRequest ** outRequestPtr );
-	
-	virtual	IOReturn	ProcessWaitingRequests();
-	
-	inline	IOBluetoothHCIRequest*	GetNextWaitRequest() { return( mWaitQueueHead ); }
-
-	inline	IOBluetoothHCIRequest*	GetNextBusyRequest() { return( mBusyQueueHead ); }
-			
-	virtual	void		TakeAHexDump( const void *inData, UInt32 inDataSize );
-			
-	virtual	IOReturn	DumpStats();
-        
-	virtual IOBluetoothHCIControllerPowerOptions		GetControllerPowerOptions();
-	virtual IOBluetoothHCIControllerInternalPowerState	GetControllerPowerState();
-	virtual IOReturn	WaitForControllerPowerState( IOBluetoothHCIControllerInternalPowerState powerState );
-	
-	virtual IOReturn	RequestPowerStateChange( IOBluetoothHCIControllerInternalPowerState newPowerState );
-
-	virtual IOReturn	SendHCIRequestFormatted( BluetoothHCIRequestID		inID, 
-												 BluetoothHCICommandOpCode 	inOpCode,
-												 IOByteCount				outResultsSize, 
-												 void *						outResultsPtr,
-												 const char *				inFormat, 
-												 ... );
-
-	static	void		RequestExpired( OSObject *owner, IOTimerEventSource *sender );
-
-	// Misc stuff.
-	
-			IOReturn	DisposeRequestsForTaskID( task_t inTaskID );
-	
-			IOReturn	KillAllPendingRequests( Boolean destroy, Boolean includeIdleRequests );
-                        void	SendingRequest( IOBluetoothHCIRequest *requestPtr );
-                        void	DecrementActiveConnections(  );
-
-	virtual	void	ActiveConnectionsInProgress( );
-	virtual	void	AllConnectionsGone( );
-			
-	virtual IOReturn	SendRawHCICommand(	BluetoothHCIRequestID	inID,
-											char * 		 			buffer,
-											UInt32					bufferSize );
-	
-	// Vendor Specific stuff.
-
-	virtual	IOReturn	VendorCommand(	BluetoothHCIRequestID	 			inID, 
-										BluetoothHCIVendorCommandSelector	inSelector,
-										UInt8 *								inCommandData,
-										IOByteCount							inCommandDataSize,
-										IOByteCount 						outBufferSize,
-										UInt8 * 							outBuffer );
-
-	// IOBluetoothDevice object management
-    
-    virtual IOBluetoothDevice *	FindDeviceWithHandle( BluetoothConnectionHandle inConnectionHandle );
-    
-    virtual IOBluetoothDevice * FindDeviceWithAddress( const BluetoothDeviceAddress *inDeviceAddress );
-
-    virtual IOReturn	SendACLPacket(	IOBluetoothACLMemoryDescriptor				*memDescriptor,
-                                        SendDataContext *								contextPtr,
-                                        IOBluetoothDevice *						inTargetDevice = NULL );
-                                        
-
-    // API for the serial manager to open a new connection
-
-    virtual IOBluetoothDevice *OpenDeviceConnection( const BluetoothDeviceAddress *inDeviceAddress );
-
-    static IOReturn OpenDeviceConnectionAction(	OSObject	*owner,
-                                                void 		*arg1,
-                                                void		*arg2,
-                                                void		*arg3,
-                                                void		*arg4 );
-                                                
-    virtual IOBluetoothDevice *OpenDeviceConnectionWL( const BluetoothDeviceAddress *inDeviceAddress );
-
-    // API to track the secure state of RFCOMM channels
-    virtual Boolean IsSecureIncomingRFCOMMChannel( BluetoothRFCOMMChannelID incomingChannelID );
-    virtual Boolean IsSecureIncomingRFCOMMChannel( OSNumber *channelIDNumber );
-        
-	// API to track allowed incoming L2CAP and RFCOMM channels given a device:
-	virtual Boolean IsAllowedIncomingL2CAPChannelForDevice( BluetoothL2CAPPSM incomingPSM, IOBluetoothDevice *device );
-	virtual Boolean IsAllowedIncomingRFCOMMChannelForDevice( BluetoothRFCOMMChannelID incomingChannelID, IOBluetoothDevice *device );
-
-	// Enabled state for RFCOMM channels:
-	virtual void SetEnabledIncomingRFCOMMChannel( OSNumber *channelIDNumber, bool ShouldBeEnabled);
-	virtual void SetEnabledIncomingRFCOMMChannel( BluetoothRFCOMMChannelID incomingChannelID, bool ShouldBeEnabled);
-
-    virtual Boolean ShouldRunInactivityTimer(); // NOT USED: See StartIdleTimer
-    virtual void	SetRunInactivityTimer( Boolean shouldRun ); // NOT USED: See StopIdleTimer
-
-	//============================
-
-	// From here on out, we implement each of the commands in the HCI spec. You can work around
-	// hardware bugs by overriding any of these functions if necessary.
-	
-	
-	// Link Control Commands.
-																				
-	virtual IOReturn	BluetoothHCIInquiry(	BluetoothHCIRequestID	 		inID, 
-												BluetoothLAP					inLAP, 
-												BluetoothHCIInquiryLength		inInquiryLength, 
-												BluetoothHCIResponseCount		inMaxResponseCount, 
-												BluetoothHCIInquiryResults *	outResults );
-
-	virtual IOReturn	BluetoothHCIInquiryCancel( BluetoothHCIRequestID		 inID );
-
-	virtual IOReturn	BluetoothHCIPeriodicInquiryMode(	BluetoothHCIRequestID	 	inID, 
-															BluetoothHCIInquiryLength	inMaxPeriodLength, 
-															BluetoothHCIInquiryLength	inMinPeriodLength, 
-															BluetoothLAP				inLAP, 
-															BluetoothHCIInquiryLength	inInquiryLength, 
-															BluetoothHCIResponseCount	inMaxResponses,
-                                                            BluetoothHCIInquiryResults *	outResults );
-
-	virtual IOReturn	BluetoothHCIExitPeriodicInquiryMode( BluetoothHCIRequestID	inID );
-
-	virtual IOReturn	BluetoothHCICreateConnection(	BluetoothHCIRequestID						inID, 
-														const BluetoothDeviceAddress *				inAddressPtr, 
-														BluetoothPacketType							inPacketType, 
-														BluetoothPageScanRepetitionMode				inPageScanRepetitionMode, 
-														BluetoothPageScanMode						inPageScanMode, 
-														BluetoothClockOffset						inClockOffset, 
-														BluetoothAllowRoleSwitch					inAllowRoleSwitch, 
-														BluetoothHCIEventConnectionCompleteResults *outConnectionHandle );
-
-	virtual IOReturn	BluetoothHCIDisconnect( BluetoothHCIRequestID			inID, 
-												BluetoothConnectionHandle	 	inConnectionHandle, 
-												BluetoothReasonCode				inReason,
-                                                BluetoothHCIEventDisconnectionCompleteResults *	outResults );
-
-	virtual IOReturn	BluetoothHCIAddSCOConnection(	BluetoothHCIRequestID		inID, 
-														BluetoothConnectionHandle	inACLConnectionHandle, 
-														BluetoothPacketType 		inPacketType );
-
-	virtual IOReturn	BluetoothHCIAcceptConnectionRequest(	BluetoothHCIRequestID				inID, 
-																const BluetoothDeviceAddress *		inAddressPtr, 
-																BluetoothRole						inRole );
-
-	virtual IOReturn	BluetoothHCIRejectConnectionRequest(	BluetoothHCIRequestID			inID, 
-																const BluetoothDeviceAddress *	inAddressPtr, 
-																BluetoothReasonCode				inReason );
-
-	virtual IOReturn	BluetoothHCILinkKeyRequestReply(	BluetoothHCIRequestID			inID, 
-															const BluetoothDeviceAddress *	inAddressPtr, 
-															const BluetoothKey *			inKeyPtr,
-															BluetoothDeviceAddress *		outAddress );
-
-	virtual IOReturn	BluetoothHCILinkKeyRequestNegativeReply( 	BluetoothHCIRequestID			inID, 
-																	const BluetoothDeviceAddress *	inAddressPtr,
-																	BluetoothDeviceAddress *		outAddress );
-
-	virtual IOReturn	BluetoothHCIPINCodeRequestReply(	BluetoothHCIRequestID				inID, 
-															const BluetoothDeviceAddress *		inAddressPtr, 
-															IOByteCount							inPINCodeSize, 
-															const BluetoothPINCode *			inPINCode,
-															BluetoothDeviceAddress *		outAddress );
-
-	virtual IOReturn	BluetoothHCIPINCodeRequestNegativeReply(	BluetoothHCIRequestID			inID, 
-																	const BluetoothDeviceAddress *	inAddressPtr,
-																	BluetoothDeviceAddress *		outAddress );
-
-	virtual IOReturn	BluetoothHCIChangeConnectionPacketType( BluetoothHCIRequestID		inID, 
-																BluetoothConnectionHandle	inConnectionHandle, 
-																BluetoothPacketType			inPacketType );
-
-	virtual IOReturn	BluetoothHCIAuthenticationRequested(	BluetoothHCIRequestID		inID, 
-																BluetoothConnectionHandle	inConnectionHandle );
-
-	virtual IOReturn	BluetoothHCISetEncryptionEnable(	BluetoothHCIRequestID		inID, 
-															BluetoothConnectionHandle	inConnectionHandle, 
-															BluetoothEncryptionEnable	inEncryptionEnable );
-
-	virtual IOReturn	BluetoothHCIChangeConnectionLinkKey(	BluetoothHCIRequestID		inID, 
-																BluetoothConnectionHandle	inConnectionHandle );
-
-	virtual IOReturn	BluetoothHCIMasterLinkKey(	BluetoothHCIRequestID	inID, 
-													BluetoothKeyFlag		inKeyFlag );
-
-	virtual IOReturn	BluetoothHCIRemoteNameRequest(	BluetoothHCIRequestID						inID, 
-														const BluetoothDeviceAddress *				inAddressPtr, 
-														BluetoothPageScanRepetitionMode 			inPageScanRepetitionMode, 
-														BluetoothPageScanMode						inPageScanMode, 
-														BluetoothClockOffset						inClockOffset,
-														BluetoothHCIEventRemoteNameRequestResults *	outName );
-
-	virtual IOReturn	BluetoothHCIReadRemoteSupportedFeatures(	BluetoothHCIRequestID			inID, 
-																	BluetoothConnectionHandle		inConnectionHandle,
-																	BluetoothHCIEventReadRemoteSupportedFeaturesResults *	outFeatures );
-
-	virtual IOReturn	BluetoothHCIReadRemoteVersionInformation(	BluetoothHCIRequestID		inID, 
-																	BluetoothConnectionHandle	inConnectionHandle, 
-																	BluetoothHCIEventReadRemoteVersionInfoResults *	outVersionInfo );
-
-	virtual IOReturn	BluetoothHCIReadClockOffset(	BluetoothHCIRequestID		inID, 
-														BluetoothConnectionHandle	inConnectionHandle,
-														BluetoothClockOffset *		outClockOffset );
-
-	// Link Policy commands.
-	
-	virtual	IOReturn	BluetoothHCIHoldMode(	BluetoothHCIRequestID	 		inID,
-												BluetoothConnectionHandle		inConnectionHandle,
-												BluetoothHCIModeInterval		inHoldModeMaxInterval,
-												BluetoothHCIModeInterval		inHoldModeMinInterval );
-												
-	virtual	IOReturn	BluetoothHCISniffMode(	BluetoothHCIRequestID	 		inID,
-												BluetoothConnectionHandle		inConnectionHandle,
-												BluetoothHCIModeInterval		inSniffModeMaxInterval,
-												BluetoothHCIModeInterval		inSniffModeMinInterval,
-												BluetoothHCISniffAttemptCount	inSniffAttemptCount,
-												BluetoothHCISniffTimeout		inSniffModeTimeout );
-												
-	virtual	IOReturn	BluetoothHCIExitSniffMode(	BluetoothHCIRequestID	 	inID,
-													BluetoothConnectionHandle	inConnectionHandle );
-
-	virtual	IOReturn	BluetoothHCIParkMode(	BluetoothHCIRequestID	 			inID,
-												BluetoothConnectionHandle			inConnectionHandle,
-												BluetoothHCIParkModeBeaconInterval	inMaxInterval,
-												BluetoothHCIParkModeBeaconInterval	inMinInterval );
-												
-	virtual	IOReturn	BluetoothHCIExitParkMode(	BluetoothHCIRequestID	 		inID,
-													BluetoothConnectionHandle		inConnectionHandle );
-													
-	virtual	IOReturn	BluetoothHCIQualityOfServiceSetup(	BluetoothHCIRequestID	 					inID,
-															BluetoothConnectionHandle					inConnectionHandle,
-															BluetoothHCIQualityOfServiceSetupParams * 	inSetupPtr );
-		
-	virtual	IOReturn	BluetoothHCIRoleDiscovery(	BluetoothHCIRequestID			inID, 
-													BluetoothConnectionHandle		inConnectionHandle,
-													BluetoothHCIRoleInfo  *			outRoleInfo );
-																
-	virtual	IOReturn	BluetoothHCISwitchRole(	BluetoothHCIRequestID		inID, 
-												BluetoothDeviceAddress * 	inAddressPtr,
-												BluetoothHCIRole			inNewRole );
-																							
-	virtual	IOReturn	BluetoothHCIReadLinkPolicySettings(	BluetoothHCIRequestID					inID, 
-															BluetoothConnectionHandle				inConnectionHandle,
-															BluetoothHCILinkPolicySettingsInfo  *	outSettingsInfo );
-															
-	virtual	IOReturn	BluetoothHCIWriteLinkPolicySettings(	BluetoothHCIRequestID				inID,
-																BluetoothConnectionHandle			inConnectionHandle,
-																BluetoothHCILinkPolicySettings		inSettings,
-																BluetoothConnectionHandle *			outConnectionHandle );
-																																					
-	// Host controller and baseband commands.
-
-	virtual	IOReturn	BluetoothHCISetEventMask(	BluetoothHCIRequestID	inID,
-													BluetoothSetEventMask *	inMask );
-											
-	virtual	IOReturn	BluetoothHCIReset( BluetoothHCIRequestID	inID );
-
-	virtual	IOReturn	BluetoothHCISetEventFilter( BluetoothHCIRequestID	inID );
-
-	virtual	IOReturn	BluetoothHCIFlush(	BluetoothHCIRequestID	 	inID,
-											BluetoothConnectionHandle	inHandle );
-
-	virtual	IOReturn	BluetoothHCIReadPINType(	BluetoothHCIRequestID	inID,
-													BluetoothPINType *		outType );
-
-	virtual	IOReturn	BluetoothHCIWritePINType(	BluetoothHCIRequestID	inID,
-													BluetoothPINType		inType );
-
-	virtual	IOReturn	BluetoothHCICreateNewUnitKey( BluetoothHCIRequestID	inID );
-
-	virtual	IOReturn	BluetoothHCIReadStoredLinkKey(	BluetoothHCIRequestID					inID,
-														BluetoothDeviceAddress *				targetDevice,
-														BluetoothHCIReadStoredLinkKeysFlag * 	inFlags,
-														BluetoothHCIStoredLinkKeysInfo *		outKeysInfo );
-
-	virtual	IOReturn	BluetoothHCIWriteStoredLinkKey( BluetoothHCIRequestID				inID,
-														IOItemCount 						inNumKeysToWrite,
-														BluetoothDeviceAddress				inDeviceAddresses[],
-														BluetoothKey						inLinkKeys[],
-														BluetoothHCINumLinkKeysToWrite * 	outNumKeysWritten );
-
-	virtual	IOReturn	BluetoothHCIDeleteStoredLinkKey(	BluetoothHCIRequestID					inID,
-															BluetoothDeviceAddress	*				targetDevice,
-															BluetoothHCIDeleteStoredLinkKeyFlag *	inFlag,
-															BluetoothHCINumLinkKeysDeleted *		outNumDeleted );
-
-	virtual	IOReturn	BluetoothHCIReadLocalName(	BluetoothHCIRequestID	inID,
-													BluetoothDeviceName		name );
-
-	virtual	IOReturn	BluetoothHCIChangeLocalName( BluetoothHCIRequestID		inID,
-													 BluetoothDeviceName		newName );
-
-	virtual	IOReturn	BluetoothHCIReadConnectionAcceptTimeout( 	BluetoothHCIRequestID					inID,
-																	BluetoothHCIConnectionAcceptTimeout *	outTimeout );
-
-	virtual	IOReturn	BluetoothHCIWriteConnectionAcceptTimeout(	BluetoothHCIRequestID					inID,
-																	BluetoothHCIConnectionAcceptTimeout		inTimeout );
-
-	virtual	IOReturn	BluetoothHCIReadPageTimeout(	BluetoothHCIRequestID	 	inID,
-														BluetoothHCIPageTimeout * 	outDataPtr );
-
-	virtual	IOReturn	BluetoothHCIWritePageTimeout(	BluetoothHCIRequestID	 	inID,
-														BluetoothHCIPageTimeout 	inTimeout );
-
-	virtual	IOReturn	BluetoothHCIReadScanEnable( BluetoothHCIRequestID	 			inID,
-													BluetoothHCIPageScanEnableState *	outState );
-
-	virtual	IOReturn	BluetoothHCIWriteScanEnable( 	BluetoothHCIRequestID				inID,
-														BluetoothHCIPageScanEnableState		inState  );
-
-	virtual	IOReturn	BluetoothHCIReadPageScanActivity(	BluetoothHCIRequestID 		inID,
-															BluetoothHCIScanActivity *	outActivityInfo );
-
-	virtual	IOReturn	BluetoothHCIWritePageScanActivity(	BluetoothHCIRequestID	 	inID,
-															BluetoothHCIScanActivity *	inActivityInfo );
-
-	virtual	IOReturn	BluetoothHCIReadInquiryScanActivity(	BluetoothHCIRequestID 		inID,
-																BluetoothHCIScanActivity *	outActivityInfo );
-
-	virtual	IOReturn	BluetoothHCIWriteInquiryScanActivity(	BluetoothHCIRequestID	 	inID,
-																BluetoothHCIScanActivity *	inActivityInfo );
-
-	virtual	IOReturn	BluetoothHCIReadAuthenticationEnable(	BluetoothHCIRequestID	 			inID,
-																BluetoothHCIAuthenticationEnable *	outAuthenticationState );
-	
-	virtual	IOReturn	BluetoothHCIWriteAuthenticationEnable(	BluetoothHCIRequestID	 			inID,
-																BluetoothHCIAuthenticationEnable	inAuthenticationState );
-																
-	virtual	IOReturn	BluetoothHCIReadEncryptionMode(	BluetoothHCIRequestID	 		inID,
-														BluetoothHCIEncryptionMode *	outEncryptionState );
-
-	virtual	IOReturn	BluetoothHCIWriteEncryptionMode(	BluetoothHCIRequestID		 	inID,
-															BluetoothHCIEncryptionMode		inEncryptionMode );
-
-	virtual	IOReturn	BluetoothHCIReadClassOfDevice(	BluetoothHCIRequestID		inID,
-														BluetoothClassOfDevice *	outClassOfDevice );
-																	
-	virtual	IOReturn	BluetoothHCIWriteClassOfDevice(	BluetoothHCIRequestID		inID,
-														BluetoothClassOfDevice		inClassOfDevice );
-																	
-	virtual	IOReturn	BluetoothHCIReadVoiceSetting(	BluetoothHCIRequestID	 	inID,
-														BluetoothHCIVoiceSetting *	outVoiceSetting );
-
-	virtual	IOReturn	BluetoothHCIWriteVoiceSetting(	BluetoothHCIRequestID		inID,
-														BluetoothHCIVoiceSetting	inVoiceSetting );
-
-	virtual	IOReturn	BluetoothHCIReadAutomaticFlushTimeout(	BluetoothHCIRequestID	 				inID,
-																BluetoothConnectionHandle				inConnectionHandle,
-																BluetoothHCIAutomaticFlushTimeoutInfo *	outAutomaticFlushTimeoutInfo );
-
-
-	virtual	IOReturn	BluetoothHCIWriteAutomaticFlushTimeout(	BluetoothHCIRequestID					inID,
-																BluetoothHCIAutomaticFlushTimeoutInfo *	inAutomaticFlushTimeoutInfo,
-																BluetoothConnectionHandle *				outConnectionHandle );
-
-	virtual	IOReturn	BluetoothHCIReadNumBroadcastRetransmissions(	BluetoothHCIRequestID	 					inID,
-																		BluetoothHCINumBroadcastRetransmissions *	outNumRetrans );
-																				
-	virtual	IOReturn	BluetoothHCIWriteNumBroadcastRetransmissions(	BluetoothHCIRequestID					inID,
-																		BluetoothHCINumBroadcastRetransmissions	inNumRetrans );
-																				
-	virtual	IOReturn	BluetoothHCIReadHoldModeActivity(	BluetoothHCIRequestID	 		inID,
-															BluetoothHCIHoldModeActivity *	outState );
-																	
-	virtual	IOReturn	BluetoothHCIWriteHoldModeActivity(	BluetoothHCIRequestID			inID,
-															BluetoothHCIHoldModeActivity	inState );
-
-	virtual	IOReturn	BluetoothHCIReadTransmitPowerLevel(	BluetoothHCIRequestID	 				inID,
-															BluetoothConnectionHandle				inHandle,
-															BluetoothHCITransmitPowerLevelType		inType,
-															BluetoothHCITransmitPowerLevelInfo *	outLevelInfo );
-
-	virtual	IOReturn	BluetoothHCIReadSCOFlowControlEnable(	BluetoothHCIRequestID	 		inID,
-																BluetoothHCIFlowControlState *	outState );
-																		
-	virtual	IOReturn	BluetoothHCIWriteSCOFlowControlEnable(	BluetoothHCIRequestID			inID,
-																BluetoothHCIFlowControlState	inState );
-
-	virtual	IOReturn	BluetoothHCISetHostControllerToHostFlowControl(	BluetoothHCIRequestID			inID,
-																		BluetoothHCIFlowControlState	inState );
-
-	virtual	IOReturn	BluetoothHCIHostBufferSize(	BluetoothHCIRequestID	 	inID,
-													BluetoothHCIBufferSize * 	inSize );
-
-	virtual	IOReturn	BluetoothHCIHostNumberOfCompletePackets( BluetoothHCIRequestID inID );
-
-	virtual	IOReturn	BluetoothHCIReadLinkSupervisionTimeout(	BluetoothHCIRequestID 					inID,
-																BluetoothConnectionHandle				inHandle,
-																BluetoothHCILinkSupervisionTimeout *	outInfo );
-																			
-	virtual	IOReturn	BluetoothHCIWriteLinkSupervisionTimeout(	BluetoothHCIRequestID 					inID,
-																	BluetoothHCILinkSupervisionTimeout *	inInfo,
-																	BluetoothConnectionHandle *				outHandle );
-
-	virtual	IOReturn	BluetoothHCIReadNumberOfSupportedIAC(	BluetoothHCIRequestID 		inID,
-																BluetoothHCISupportedIAC *	outNumSupported );
-																		
-	virtual	IOReturn	BluetoothHCIReadCurrentIACLAP(	BluetoothHCIRequestID inID );
-
-	virtual	IOReturn	BluetoothHCIWriteCurrentIACLAP(	BluetoothHCIRequestID inID );
-
-	virtual	IOReturn	BluetoothHCIReadPageScanPeriodMode(	BluetoothHCIRequestID 				inID,
-															BluetoothHCIPageScanPeriodMode *	outMode );
-																		
-	virtual	IOReturn	BluetoothHCIWritePageScanPeriodMode(	BluetoothHCIRequestID 			inID,
-																BluetoothHCIPageScanPeriodMode	inMode );
-																		
-	virtual	IOReturn	BluetoothHCIReadPageScanMode(	BluetoothHCIRequestID 		inID,
-														BluetoothHCIPageScanMode *	outMode );
-																
-	virtual	IOReturn	BluetoothHCIWritePageScanMode(	BluetoothHCIRequestID 		inID,
-														BluetoothHCIPageScanMode	inMode );
-																	
-	// Informational commands.
-	
-	virtual	IOReturn	BluetoothHCIReadLocalVersionInformation( BluetoothHCIRequestID		inID,
-																 BluetoothHCIVersionInfo *	outVersionInfo );
-
-	virtual	IOReturn	BluetoothHCIReadLocalSupportedFeatures( BluetoothHCIRequestID				inID,
-																BluetoothHCISupportedFeatures	 *	outFeatures );
-	
-	virtual	IOReturn	BluetoothHCIReadBufferSize( BluetoothHCIRequestID	 	inID,
-													BluetoothHCIBufferSize * 	outSize );
-
-	virtual	IOReturn	BluetoothHCIReadCountryCode(	BluetoothHCIRequestID	 	inID,
-														BluetoothHCICountryCode * 	outCountryCode );
-
-	virtual	IOReturn	BluetoothHCIReadDeviceAddress(	BluetoothHCIRequestID	 	inID, 
-														BluetoothDeviceAddress *	outAddress );
-
-	// Status commands.
-	
-	virtual	IOReturn	BluetoothHCIReadFailedContactCounter(	BluetoothHCIRequestID	 			inID,
-																BluetoothConnectionHandle			inConnectionHandle,
-																BluetoothHCIFailedContactInfo *		outFailedContactCount );
-																
-	virtual	IOReturn	BluetoothHCIResetFailedContactCounter(	BluetoothHCIRequestID	 	inID,
-																BluetoothConnectionHandle	inConnectionHandle );
-																
-	virtual	IOReturn	BluetoothHCIGetLinkQuality(	BluetoothHCIRequestID	 		inID,
-													BluetoothConnectionHandle		inConnectionHandle,
-													BluetoothHCILinkQualityInfo *	outLinkQualityInfo );
-																
-	virtual	IOReturn	BluetoothHCIReadRSSI(	BluetoothHCIRequestID	 	inID,
-												BluetoothConnectionHandle	inConnectionHandle,
-												BluetoothHCIRSSIInfo *		outRSSIInfo );
-	
-	// Testing Commands.
-
-	virtual	IOReturn	BluetoothHCIReadLoopbackMode(	BluetoothHCIRequestID	 	inID,
-														BluetoothHCILoopbackMode *	inLoopbackMode );
-
-	virtual	IOReturn	BluetoothHCIWriteLoopbackMode(	BluetoothHCIRequestID		inID, 
-														BluetoothHCILoopbackMode	inLoopbackMode );
-
-	virtual	IOReturn	BluetoothHCIEnableDeviceUnderTestMode( BluetoothHCIRequestID	inID );
-	
-	virtual IOBluetoothHCIControllerFeatureFlags	GetControllerFeatureFlags();
-
-protected:
-
-	// Power managment functions:
-
-	virtual bool		configurePM(IOService *provider);
-
-	virtual	IOReturn	setPowerState( unsigned long powerStateOrdinal, IOService* whatDevice );
-	static	IOReturn	setPowerStateAction( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4 );
-	virtual	IOReturn	setPowerStateWL( unsigned long powerStateOrdinal, IOService* whatDevice );
-    
-	virtual void		UpdatePowerStateProperty( IOBluetoothHCIControllerInternalPowerState powerState );
-	
-	virtual void		SetControllerPowerOptions( IOBluetoothHCIControllerPowerOptions controllerPowerOptions );
-	virtual IOReturn	PerformPowerStateChange(	IOBluetoothHCIControllerInternalPowerState oldPowerState,
-													IOBluetoothHCIControllerInternalPowerState newPowerState,
-													UInt32 powerStateOptions,
-													UInt32 *microsecondsUntilComplete );
-	virtual void		CompletePowerStateChange();
-	
-	virtual void		SetControllerFeatureFlags( IOBluetoothHCIControllerFeatureFlags featureFlags );
-
-	virtual IOReturn	setAggressiveness( unsigned long type, unsigned long newLevel );
-
-	// Enablers for future Changes.
-
-    typedef struct ExpansionData 
-	{
-		void	*mUnsedPointer1, *mUnsedPointer2;
-
-		// Max number of HCI command allowed;
-		UInt8									mNumberOfCommandsAllowedByHardware;
-		UInt8									mNumConfiguredHIDDevices;
-		UInt8									mControllerSleepFlags;
-		
-		// This pointer is depreacted and free for future uses.
-		void*									mUnusedPointer;
-
-		// AFH support:
-		// the mask for the channels to use:
-		UInt8									mMaskByte[10];
-
-		// AirPort changes notifications:
-		IONotifier 								*windowServerNotifier;
-		IONotifier 								*mAirPortPCI;
-		Boolean									mProcessingConnectionRequest;
-		Boolean									mWaitingForCompletedACLPacketsToSleep;
-
-        // SCO Support
-		UInt8									mNumSCOConnections;
-		UInt8									*mSCOPacketBuffer;
-		UInt16									mNumBufferedSCOBytes;
-		AbsoluteTime							mBufferedSCOPacketTimestamp;
-		
-		// Repository for the packets when logging at boot
-		OSArray									*mRepositoryForBoot;
-		UInt16									mMaxNumberOfBootPackets;
-		
-		IOService								*mOverriddenControllerProvider;
-		
-		size_t									mHCIRequestListSize;
-		uint32_t								mNewRequestIndex;
-		
-		IOBluetoothInactivityTimerEventSource	*mIdleTimer;
-		Boolean									mSystemOnTheWayToSleep;
-
-		// New Airport notifications:
-		IONotifier 								*mIO80211Interface;
-
-		UInt32									mNextAvailableSCOSequenceNumber;
-		UInt32									mCurrentlyExecutingSCOSequenceNumber;
-		
-		Boolean									mNeedToCleanUpWaitForAckQueue;
-		Boolean									mResettingDevice;
-		
-		HearingDeviceListType 					*mConnectedHearingDeviceListHead;
-		HearingDeviceListType 					*mConnectedHearingDeviceListTail;
-
-	} ExpansionData;
-
-	ExpansionData*		mExpansionData;
-	
-#define	mConnectedHearingDeviceListTail			IOBluetoothHCIController::mExpansionData->mConnectedHearingDeviceListTail
-#define	mConnectedHearingDeviceListHead			IOBluetoothHCIController::mExpansionData->mConnectedHearingDeviceListHead
-#define	mResettingDevice						IOBluetoothHCIController::mExpansionData->mResettingDevice
-#define	mNeedToCleanUpWaitForAckQueue			IOBluetoothHCIController::mExpansionData->mNeedToCleanUpWaitForAckQueue
-#define mNextAvailableSCOSequenceNumber			IOBluetoothHCIController::mExpansionData->mNextAvailableSCOSequenceNumber
-#define mCurrentlyExecutingSCOSequenceNumber	IOBluetoothHCIController::mExpansionData->mCurrentlyExecutingSCOSequenceNumber
-
-#define mNumberOfCommandsAllowedByHardware		IOBluetoothHCIController::mExpansionData->mNumberOfCommandsAllowedByHardware
-#define	mNumConfiguredHIDDevices				IOBluetoothHCIController::mExpansionData->mNumConfiguredHIDDevices
-#define mControllerSleepFlags					IOBluetoothHCIController::mExpansionData->mControllerSleepFlags
-#define mSleepWakeNotifier						IOBluetoothHCIController::mExpansionData->mSleepWakeNotifier
-
-#define mMaskByte								IOBluetoothHCIController::mExpansionData->mMaskByte
-#define windowServerNotifier					IOBluetoothHCIController::mExpansionData->windowServerNotifier
-#define mAirPortPCI								IOBluetoothHCIController::mExpansionData->mAirPortPCI
-#define mProcessingConnectionRequest			IOBluetoothHCIController::mExpansionData->mProcessingConnectionRequest
-#define mWaitingForCompletedACLPacketsToSleep   IOBluetoothHCIController::mExpansionData->mWaitingForCompletedACLPacketsToSleep
-
-#define	mNumSCOConnections						IOBluetoothHCIController::mExpansionData->mNumSCOConnections
-#define mSCOPacketBuffer						IOBluetoothHCIController::mExpansionData->mSCOPacketBuffer
-#define mNumBufferedSCOBytes					IOBluetoothHCIController::mExpansionData->mNumBufferedSCOBytes
-#define mBufferedSCOPacketTimestamp				IOBluetoothHCIController::mExpansionData->mBufferedSCOPacketTimestamp
-#define mRepositoryForBoot						IOBluetoothHCIController::mExpansionData->mRepositoryForBoot
-#define mMaxNumberOfBootPackets					IOBluetoothHCIController::mExpansionData->mMaxNumberOfBootPackets
-#define mOverriddenControllerProvider			IOBluetoothHCIController::mExpansionData->mOverriddenControllerProvider
-#define mHCIRequestListSize						IOBluetoothHCIController::mExpansionData->mHCIRequestListSize
-#define mNewRequestIndex						IOBluetoothHCIController::mExpansionData->mNewRequestIndex
-#define mIdleTimer								IOBluetoothHCIController::mExpansionData->mIdleTimer
-#define mSystemOnTheWayToSleep					IOBluetoothHCIController::mExpansionData->mSystemOnTheWayToSleep
-#define mIO80211Interface						IOBluetoothHCIController::mExpansionData->mIO80211Interface
-
-	enum {
-		kIOBluetoothHCIControllerSleepFlagInquiryScanWasEnabled	= 0x01
-	};
-
-	
-private:
-
-	// Command Packet Queue:
-	virtual IOReturn	EnqueueRequestForController( IOBluetoothHCIRequest *requestPtr );	// Was OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  0 )
-	virtual IOReturn	DequeueAndSendRequests();											// Was OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  1 )
-	virtual IOReturn	RemoveAllRequestsFromQueue();										// Was OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  2 )
-
-	// New Device creation upon connection:
-	IOReturn CreateDeviceFromConnectionResults( BluetoothHCIEventConnectionCompleteResults *connectionResults, bool isInitiator);
-
-	// Expanded version of OpenDeviceConnection MUST BE CALLED IN THE WORKLOOP
-    virtual IOBluetoothDevice *OpenDeviceConnection( const BluetoothDeviceAddress *inDeviceAddress, BluetoothHCIPageTimeout pageTimeoutValue, bool  authenticationRequired);
-
-	// sleepWakeHandler DEPRECATED METHOD RETURNS kIOReturnUnsupported ALL THE TIME	!
-	static	IOReturn sleepWakeHandler( void *target, void *refCon, UInt32 messageType, IOService *service, void *messageArgument, vm_size_t argSize );
-	
-	static	IOReturn	restartShutdownAction( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4 );
-	static	IOReturn	systemSleepWakeAction( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4 );
-
-public:	
-	virtual	IOReturn 	restartShutdownWL( UInt32 messageType, void *reserved);
-	
-	// AFH support:
-	virtual	UInt8 *rangeForChannel(UInt16 channel);
-	virtual IOReturn handleAirPortChangesChannelWL(IOService *serviceForAirport);
-
-	// Version of stop in the workloop
-	virtual void stopWL( IOService * provider );
-        
-private:
-	static bool staticAirPortDriverNotification(void *us, void *unused, IOService * yourDevice);
-	static IOReturn handleAirPortChangesChannelAction( OSObject *owner, void *castMeToServiceForAirport, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 );
-
-	static bool windowServerDidAppear( void * target, void * refCon, IOService * newService, IONotifier * notifier );
-	static IOReturn windowServerDidAppearAction( OSObject *owner, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 );
-
-	// Expansion slots:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  0 );
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  1 );
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  2 );
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  3 );
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  4 );
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  5 );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  6 );
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  7 );
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  8 );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  9 );
-	virtual void SetNumSCOConnections( UInt8 numSCOConnections );
-	
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  10 );
-	virtual void UpdateSCOConnections( UInt8 numSCOConnections );
-	
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  11 );
-	virtual IOBluetoothDevice *FindDeviceWithSCOHandle( BluetoothConnectionHandle inConnectionHandle );
-	
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  12 );
-	virtual IOReturn SendSCOData(	IOMemoryDescriptor	*scoDataDescriptor,
-									SendDataContext		*scoDataContext );
-
-protected:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  13 );
-	virtual	void	SendSCOCompleted( SendDataContext *contextPtr, AbsoluteTime timestamp );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  14 );
-	virtual IOReturn DispatchIncomingSCOData( UInt8 *inDataPtr, UInt32 inDataSize, UInt32 inMissingData, AbsoluteTime inTimestamp );
-        
-        OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  15 );
-        virtual bool willTerminateWL( IOService * provider, IOOptionBits options );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  16 );
-	virtual bool shouldOverrideExistingController( IOBluetoothHCIController *controller );
-
-	static void idleTimerFired( OSObject *owner, IOTimerEventSource *timerEventSource );
-	
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  17 );
-	virtual void handleIdleTimeout();
-
-	static IOReturn terminateAction(	OSObject	*owner, 
-										void		*arg1, 
-										void		*arg2, 
-										void		*arg3, 
-										void		*arg4 );
-	
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  18 );
-	virtual IOReturn terminateWL( IOOptionBits options );
-
-	// Support for dynamic channel width
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  19 );
-	virtual	UInt8 *rangeForChannel(UInt16 channel, SInt16 width);
-
-public:
-
-	// v1.2 + v2.1 commands
-	
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  20 );
-	virtual	IOReturn	BluetoothHCIReadExtendedInquiryResponse(	BluetoothHCIRequestID								inID,
-																	BluetoothHCIReadExtendedInquiryResponseResults *	outData );
-
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  21 );
-	virtual	IOReturn	BluetoothHCIWriteExtendedInquiryResponse(	BluetoothHCIRequestID					inID,
-																	BluetoothHCIFECRequired					inFECRequired,
-																	BluetoothHCIExtendedInquiryResponse *	inData );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  22 );
-	virtual	IOReturn	BluetoothHCIReadInquiryMode(	BluetoothHCIRequestID		inID,
-														BluetoothHCIInquiryMode	*	outMode );
-
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  23 );
-	virtual	IOReturn	BluetoothHCIWriteInquiryMode(	BluetoothHCIRequestID		inID,
-														BluetoothHCIInquiryMode		inMode );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  24 );
-	virtual	IOReturn	BluetoothHCIReadSimplePairingMode(	BluetoothHCIRequestID				inID,
-															BluetoothHCISimplePairingMode	*	outMode );
-
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  25 );
-	virtual	IOReturn	BluetoothHCIWriteSimplePairingMode(	BluetoothHCIRequestID				inID,
-															BluetoothHCISimplePairingMode		inMode );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  26 );
-	virtual IOReturn	BluetoothHCIIOCapabilityRequestReply(	BluetoothHCIRequestID					inID, 
-																const BluetoothDeviceAddress *			inAddress,
-																BluetoothIOCapability					inIOCapability,
-																BluetoothOOBDataPresence				inOOBDataPresence,
-																BluetoothAuthenticationRequirements		inAuthenticationRequirements );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  27 );
-	virtual	IOReturn	BluetoothHCIReadLocalOOBData(	BluetoothHCIRequestID					inID,
-														BluetoothHCIReadLocalOOBDataResults *	outData	);
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  28 );
-	virtual	IOReturn	BluetoothHCIReadInquiryResponseTransmitPower(	BluetoothHCIRequestID				inID,
-																		BluetoothHCITransmitPowerLevel *	outData	);
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  29 );
-	virtual	IOReturn	BluetoothHCIWriteInquiryResponseTransmitPower(	BluetoothHCIRequestID				inID,
-																		BluetoothHCITransmitPowerLevel		inData );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  30 );
-	virtual	IOReturn	BluetoothHCIUserConfirmationRequestReply(	BluetoothHCIRequestID				inID,
-																	const BluetoothDeviceAddress *		inAddress );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  31 );
-	virtual	IOReturn	BluetoothHCIUserConfirmationRequestNegativeReply(	BluetoothHCIRequestID				inID,
-																			const BluetoothDeviceAddress *		inAddress );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  32 );
-	virtual	IOReturn	BluetoothHCIUserPasskeyRequestReply(	BluetoothHCIRequestID					inID,
-																const BluetoothDeviceAddress *			inAddress,
-																BluetoothPasskey						inPasskey);
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  33 );
-	virtual	IOReturn	BluetoothHCIUserPasskeyRequestNegativeReply(	BluetoothHCIRequestID					inID,
-																		const BluetoothDeviceAddress *			inAddress );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  34 );
-	virtual	IOReturn	BluetoothHCIRemoteOOBDataRequestReply(	BluetoothHCIRequestID				inID,
-																const BluetoothDeviceAddress *		inAddress,
-																BluetoothHCISimplePairingOOBData *	hash,
-																BluetoothHCISimplePairingOOBData *	randomizer );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  35 );
-	virtual	IOReturn	BluetoothHCIRemoteOOBDataRequestNegativeReply(	BluetoothHCIRequestID				inID,
-																		const BluetoothDeviceAddress *		inAddress );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  36 );
-	virtual	IOReturn	BluetoothHCIWriteSimplePairingDebugMode(	BluetoothHCIRequestID					inID,
-																	BluetoothSimplePairingDebugMode			inData	);
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  37 );
-	virtual	IOReturn	BluetoothHCISendKeypressNotification(	BluetoothHCIRequestID					inID,
-																const BluetoothDeviceAddress *			inAddress,
-																BluetoothKeypressNotificationType		inData	);
-
-protected:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  38 );
-	virtual	IOReturn	systemSleepWakeWL( UInt32 messageType, void *reserved);
-
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  39 );
-	virtual	IOReturn	BluetoothHCIReadLocalExtendedFeatures(	BluetoothHCIRequestID				inID,
-															  BluetoothHCIPageNumber				inPageNumber,
-															  BluetoothHCIExtendedFeaturesInfo *	outFeatures );
-	
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  40 );
-	virtual IOReturn	BluetoothHCIReadRemoteExtendedFeatures(	BluetoothHCIRequestID				inID, 
-																BluetoothConnectionHandle			inConnectionHandle,
-																BluetoothHCIPageNumber				inPageNumber,
-																BluetoothHCIEventReadRemoteExtendedFeaturesResults *	outFeatures  );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  41 );
-	virtual	IOReturn	BluetoothHCIReadAFHChannelAssessmentMode(	BluetoothHCIRequestID					inID,
-																	BluetoothHCIAFHChannelAssessmentMode *	outData );
-	
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  42 );
-	virtual IOReturn	BluetoothHCIWriteAFHChannelAssessmentMode(	BluetoothHCIRequestID						inID,
-																	BluetoothHCIAFHChannelAssessmentMode		inData  );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  43 );
-	virtual IOReturn	BluetoothHCISetAFHHostChannelClassification(	BluetoothHCIRequestID						inID,
-																		uint8_t	 *									inDataPtr,
-																		uint8_t										inDataLength );
-	
-private:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  44 );
-	virtual IOReturn	BluetoothHCIReadAFHChannelMap(	BluetoothHCIRequestID	 		inID,
-														BluetoothConnectionHandle		inConnectionHandle,
-														BluetoothAFHResults *			outData );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  45 );
-    virtual void		SynchronizeSCOPacketSequence( UInt32 sequenceNumber );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  46 );
-	virtual IOReturn	BluetoothHCICreateConnectionCancel(	BluetoothHCIRequestID				inID,
-															const BluetoothDeviceAddress *	inAddressPtr,
-															BluetoothDeviceAddress *		outAddress );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  47 );
-    virtual IOReturn	BluetoothHCIRemoteNameRequestCancel(	BluetoothHCIRequestID				inID,
-																const BluetoothDeviceAddress *	inAddressPtr,
-																BluetoothDeviceAddress *		outAddress );
-
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  48 );
-	void				StartIdleTimer( uint32_t milliseconds );
-	
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  49 );
-	void				StopIdleTimer();
-
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  50 );
-	virtual	IOReturn	setUnackQueueCompletionCalled(void * memoryDescriptor);
-
-protected:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  51 );
-	virtual IOReturn	RemovePacket(IOMemoryDescriptor	*memDescriptor);
-
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  52 );
-	IOReturn 			exitHIDSniff(bool	 exitSniff);
-	
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  53 );
-	virtual IOReturn	WaitForControllerPowerStateWithTimeout( IOBluetoothHCIControllerInternalPowerState	powerState,
-															    UInt32										waitTimeInMicroSecond);
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  54 );
-	void				SetHCIDriverExistsVariableTo( bool isLoaded );
-	
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  55 );
-	virtual	IOReturn	ToggleLMPLogging( );
-	
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  56 );
-	virtual	HearingDeviceListType * 	FindHearingDeviceWithAddress( const BluetoothDeviceAddress *inDeviceAddress );
-	
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  57 );
-	virtual	IOReturn	AddHearingDevice( IOBluetoothDevice *inDevice );
-	
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  58 );
-	virtual	IOReturn	RemoveHearingDevice( IOBluetoothDevice *inDevice, bool all );
-	
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  59 );
-	virtual	IOReturn	SetDevicePublishNotificationState( const BluetoothDeviceAddress *inDeviceAddress, DevicePublishNotificationStateType state );
-	
-public:
-	OSMetaClassDeclareReservedUsed(	IOBluetoothHCIController,  60 );
-	virtual	DevicePublishNotificationStateType *	GetDevicePublishNotificationState( const BluetoothDeviceAddress *inDeviceAddress );
-	
-private:
-	OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  61 );
-	OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  62 );
-	OSMetaClassDeclareReservedUnused(	IOBluetoothHCIController,  63 );
-};
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothHCIRequest.h b/i386/include/IOKit/bluetooth/IOBluetoothHCIRequest.h
deleted file mode 100644
index c9d970e..0000000
--- a/i386/include/IOKit/bluetooth/IOBluetoothHCIRequest.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-	File:		IOBluetoothHCIRequest.h
-	Contains:	Bluetooth Host Controller request object.
-	Copyright:	(c) 2001-2008 by Apple, all rights reserved.
-*/
-
-#pragma once
-
-#import <IOKit/IOService.h>
-#import <IOKit/system.h>
-
-#import <IOKit/bluetooth/Bluetooth.h>
-
-
-class IOCommandGate;
-class IOTimerEventSource;
-class IOBluetoothHCIController;
-
-// Forward declaration to avoid the need to include IOBluetoothHCIUserLibShared.h
-typedef struct	BluetoothHCINotificationMessage;
-
-//===========================================================================================================================
-// enums, macros, etc.
-//===========================================================================================================================
-
-enum
-{
-	kMaxHCIBufferLength	= 512
-};
-
-typedef UInt8	BluetoothHCIRequestState;
-enum BluetoothHCIRequestStates
-{
-	kHCIRequestStateIdle		= 0,		// Doing nothing - neither waiting nor busy. usually waiting for deletion.
-	kHCIRequestStateWaiting		= 1,		// On the wait queue - request has not been processed in any way.
-	kHCIRequestStateBusy		= 2,		// On the busy queue - request is sent and is currently processing
-};
-
-
-//===========================================================================================================================
-// IOBluetoothHCIRequest
-//===========================================================================================================================
-
-class IOBluetoothHCIRequest : public OSObject
-{
-    OSDeclareDefaultStructors( IOBluetoothHCIRequest )
-
-	UInt8								mPrivateResultsBuffer[kMaxHCIBufferLength*4];	// Just in case they didn't give a results ptr.
-	IOByteCount							mPrivateResultsSize;							// Result size.
-	BluetoothHCITransportID				mTransportID;									// Transport ID to use for this request.
-	UInt8								mState;											// Busy, waiting, idle.
-	bool								mAsyncNotify;
-	task_t								mOwningTaskID;
-	BluetoothHCIRequestCallbackInfo		mCallbackInfo;									// When this request is complete, call this.
-	BluetoothHCICommandOpCode			mOpCode;
-    BluetoothDeviceAddress				mDeviceAddress;
-    BluetoothConnectionHandle			mConnectionHandle;
-	BluetoothHCINotificationMessage *	mNotificationMessage;
-	IOByteCount							mNotificationMessageSize;
-		
-	
-public:
-
-	IOBluetoothHCIRequest *				mNextBusy;									// Points to next request element on busy queue.
-	IOBluetoothHCIRequest *				mNextWait;									// Points to next request element on wait queue.
-	IOBluetoothHCIRequest *				mNextAllocated;								// Points to next allocated request element.
-	IOBluetoothHCIRequest *				mPreviousAllocated;							// Points to next allocated request element.
-	BluetoothHCIRequestID				mID;										// For internal identification.
-	UInt8								mCommandBuffer[kMaxHCIBufferLength];		// Built-up HCI Command to send to the transport.
-	IOByteCount							mCommandBufferSize;							// Size of command buffer.
-	
-	UInt8 *								mResultsPtr;								// Result ptr, provided by object creator.
-	IOByteCount							mResultsSize;								// Result size.
-	
-	IOCommandGate *						mCommandGate;
-    IOTimerEventSource *				mTimer;	
-	IOBluetoothHCIController *			mHCIController;
-    IOReturn							mStatus;									// Success/failure code of request.
-	UInt32								mTimeout;									// Timeout for request to complete, in milliseconds.
-	UInt32								mControlFlags;
-	int									mPID;										// Creating Task
-	bool								mHCIRequestDeleteWasCalled;					// Fixed rdar://problem/7044168
-	
-	
-public:
-
-	bool							init( IOCommandGate *commandGate, IOBluetoothHCIController *hciController );
-	void							free();
-	
-	static IOBluetoothHCIRequest *	Create( IOCommandGate *commandGate, IOBluetoothHCIController *hciController, bool async = TRUE, UInt32 timeout = 5, UInt32 controlFlags = 0 );
-	static IOReturn					Dispose( IOBluetoothHCIRequest * inObject );
-
-	
-	// Called when a request is started on a transport, and completed.
-	
-	IOReturn					Start();
-	void						Complete();
-
-	// Accessors for object members.
-
-	void						SetState( BluetoothHCIRequestState inState );
-	BluetoothHCIRequestState	GetState() { return( mState ); }
-
-	void						SetHCIStatus( BluetoothHCIStatus inStatus ) { mStatus = inStatus; }
-	BluetoothHCIStatus			GetHCIStatus() { return( mStatus ); }
-
-	void						SetID( BluetoothHCIRequestID inID ) { mID = inID; }
-	BluetoothHCIRequestID		GetID() { return( mID ); }
-
-	void								SetCallbackInfo( BluetoothHCIRequestCallbackInfo * inInfo );
-	BluetoothHCIRequestCallbackInfo *	GetCallbackInfo() { return( &mCallbackInfo ); }
-	
-	void						SetOwningTaskID( task_t inTaskID ) { mOwningTaskID = inTaskID; }
-	task_t						GetOwningTaskID() { return( mOwningTaskID ); }
-	
-	void *						GetCommandBuffer();
-	
-	BluetoothHCICommandOpCode	GetCommandOpCode();
-	void						SetCommandOpCode( BluetoothHCICommandOpCode inOpCode ) { mOpCode = inOpCode; }
-    
-    BluetoothDeviceAddress *	GetDeviceAddress() { return &mDeviceAddress; }
-    void						SetDeviceAddress( const BluetoothDeviceAddress *inDeviceAddress ) { if ( inDeviceAddress != NULL ) memcpy( &mDeviceAddress, inDeviceAddress, sizeof( BluetoothDeviceAddress ) ); }
-    void						ClearDeviceAddress() { bzero( &mDeviceAddress, sizeof( BluetoothDeviceAddress ) ); }
-    Boolean						CompareDeviceAddress( const BluetoothDeviceAddress *inDeviceAddress );
-    
-    BluetoothConnectionHandle	GetConnectionHandle() { return mConnectionHandle; }
-    void						SetConnectionHandle( BluetoothConnectionHandle inConnectionHandle ) { mConnectionHandle = inConnectionHandle; }
-    void						ClearConnectionHandle() { mConnectionHandle = kBluetoothConnectionHandleNone; }
-	
-	void						SetTimeout( UInt32 inTimeout ) { mTimeout = inTimeout; }	// in milliseconds
-	UInt32						GetTimeout() { return( mTimeout ); }
-    
-	void						StartTimer();
-	
-    static void 				timerFired( OSObject *owner, IOTimerEventSource *sender );
-    void						handleTimeout();
-	
-	void						CopyDataIntoResultsPtr( UInt8 * inDataPtr, IOByteCount inSize );
-	void						SetParamPtrAndSize( UInt8 paramNumber, UInt8 * inParamPtr, IOByteCount inSize );
-	
-	void						SetResultsBufferPtrAndSize( UInt8 * resultsBuffer, IOByteCount inSize );
-	void						SetResultsDataSize( IOByteCount inCount );
-	UInt8 *						GetResultsBuffer();
-	IOByteCount					GetResultsBufferSize();
-	
-	mach_vm_address_t			GetNotificationRefCon() { return( mCallbackInfo.asyncIDRefCon ); }
-	
-	void						SetDoAsyncNotify( bool inAsyncNotify ) { mAsyncNotify = inAsyncNotify; }
-	Boolean						IsSynchronous() { return !mAsyncNotify; }
-	
-	void						SetControlFlags( UInt32 controlFlags ) { mControlFlags = controlFlags; }
-	UInt32						GetControlFlags() { return mControlFlags; }
-	
-	const char *				RequestDescription();
-};
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothHIDDriver.h b/i386/include/IOKit/bluetooth/IOBluetoothHIDDriver.h
deleted file mode 100644
index b3bb449..0000000
--- a/i386/include/IOKit/bluetooth/IOBluetoothHIDDriver.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-	File:		IOBluetoothHIDDriver.h
-	Contains:	Driver for generic Bluetooth HID devices.
-	Copyright:	(c) 2001-2008 by Apple, all rights reserved.
-*/
-
-#ifndef IOBLUETOOTHHIDDRIVER_H
-#define IOBLUETOOTHHIDDRIVER_H
-
-#include <IOKit/hid/IOHIDDevice.h>
-#include <IOKit/bluetooth/Bluetooth.h>
-
-//===========================================================================================================================
-// Forwards
-//===========================================================================================================================
-
-class IOTimerEventSource;
-class IOWorkLoop;
-
-class IOBluetoothL2CAPChannel;
-class IOBluetoothDevice;
-class IOWorkQueue;
-
-//===========================================================================================================================
-// IOBluetoothHIDDriver
-//===========================================================================================================================
-
-class IOBluetoothHIDDriver : public IOHIDDevice
-{
-	OSDeclareDefaultStructors( IOBluetoothHIDDriver )
-
-    IOWorkLoop*					_workLoop;
-	IOCommandGate*				_commandGate;
-	
-	IOWorkQueue					*_desyncWorkQueue;
-	
-	IOBluetoothL2CAPChannel*	_controlChannel;
-    IOBluetoothL2CAPChannel*	_interruptChannel;
-
-    IOBluetoothDevice*			_device;
-
-	IOMemoryDescriptor*			_memDescriptor;
-	IOMemoryDescriptor*			_getReportDescriptor;
-	IONotifier*					_interruptOpenNotification;
-	IOTimerEventSource*			_timer;
-    IONotifier*					_sleepWakeNotifier;
-
-	bool						_deviceReady;
-
-	UInt8						_expectedReportID;
-	UInt8						_expectedReportType;
-	UInt8						_handshake;
-	
-	OSDictionary*				_deviceProperties;
-
-	UInt16						_vendorIDSource;
-	UInt16						_vendorID;
-	UInt16						_productID;
-	UInt16						_deviceVersion;
-	uint32_t					_classOfDevice;
-    UInt16                      _countryCode;
-	
-	BluetoothDeviceAddress		_deviceAddress;
-	char						_deviceAddressString[20];
-	
-	uint32_t					_outstandingIO;
-	bool						_sendOutstanding;
-	
-	// Debug / Behavior Modifiers
-	UInt8						_verboseLevel;
-	bool						_logPackets;
-	bool						_decodePackets;
-	bool						_logOutstandingIO;
-	bool						_suppressDisconnectNotifications;
-	bool						_suppressSetProtocol;
-	bool						_driverIsAwake;
-	bool						_reservedFlag4;
-	UInt8						_reservedByte;
-	
-    struct ExpansionData 
-    { 
-        OSArray*    _sendQueue;
-		
-		uint8_t		*interruptBuffer;
-		uint32_t	interruptBufferUsed;
-		
-		uint8_t		*controlBuffer;
-		uint32_t	controlBufferUsed;
-
-		uint8_t		deviceSupportsSuspend;
-
-		uint32_t	getReportTimeoutMS;
-		uint32_t	setReportTimeoutMS;
-		
-		uint32_t	outstandingMemoryBlockCount;
-		bool		waitingForMemoryBlockCount;
-    };
-    ExpansionData	*_expansionData;
-	
-public:
-	// Standard IOService Methods
-    virtual IOService*  probe( IOService * provider, SInt32 * score );
-	virtual bool		init( OSDictionary *properties );
-	virtual void		free();
-	virtual bool 		willTerminate( IOService * provider, IOOptionBits options );
-	
-	// Starting & Stopping
-    virtual bool		handleStart( IOService * provider );
-    virtual void		handleStop( IOService *  provider );
-	virtual void		deviceReady();
-	virtual void		closeDownServices();
-
-	// Power Management
-    virtual void		handleSleep();
-    virtual void		handleWake();
-    virtual void		handleShutdown();			// Does nothing
-    virtual void		handleRestart();			// Does nothing
-	
-	// HID Properties
-	virtual OSString*	newTransportString() const;
-	virtual OSString*	newManufacturerString() const;
-	virtual OSString*	newProductString() const;
-	virtual OSNumber*	newVendorIDSourceNumber() const;
-	virtual OSNumber*	newVendorIDNumber() const;
-	virtual OSNumber*	newProductIDNumber() const;
-	virtual OSNumber*	newVersionNumber() const;
-    virtual IOReturn	newReportDescriptor( IOMemoryDescriptor ** descriptor ) const;
-	virtual OSString*	newSerialNumberString() const;
-	virtual OSNumber*	newLocationIDNumber() const;
-    virtual OSNumber*	newCountryCodeNumber() const;
-	virtual OSNumber*	newReportIntervalNumber() const;
-
-	// Main UserLand Entry Points
-    virtual IOReturn	getReport( IOMemoryDescriptor* report, IOHIDReportType reportType, IOOptionBits options = 0 );
-    virtual IOReturn 	setReport( IOMemoryDescriptor* report, IOHIDReportType reportType, IOOptionBits options = 0 );
-    virtual IOReturn	setProperties( OSObject* properties );
-
-	// General IO
-	virtual IOReturn	sendData( IOBluetoothL2CAPChannel* theChannel, void* theData, IOByteCount theSize );
-    virtual void		processControlData( UInt8 *buffer, UInt16 length );
-    virtual void		processInterruptData( UInt8 *buffer, UInt16 length );
-	virtual IOReturn	waitForData( IOMemoryDescriptor* report, UInt8 btReportType, UInt8 reportID );
-	virtual IOReturn	waitForHandshake();
-	
-	// HID Transaction Methods
-	virtual IOReturn	hidControl( UInt8 controlOperation );
-	virtual int			getProtocol();
-	virtual IOReturn	setProtocol( UInt8 protocol );
-	virtual int			getIdle();
-	virtual IOReturn	setIdle( UInt8 idleRate );
-
-	// Device Introspection
-	virtual bool		isKeyboard();
-	virtual bool		isMouse();
-	
-	// Misc
-	virtual IOReturn	setPowerState( unsigned long powerStateOrdinal, IOService* whatDevice );
-	virtual IOReturn	createCommandGate( IOService* provider );
-	virtual IOReturn	getDeviceProperties( IOService* provider );
-	virtual	bool		readDeviceName();
-	
-	// Command Gate Actions
-	static	IOReturn	staticCloseDownServicesAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
-	static	IOReturn	staticSendToAction( OSObject* owner, void* theChannel, void* theData, void *theSize, void* );
-	static	IOReturn	staticPrepControlChannelAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
-	static	IOReturn	staticPrepInterruptChannelAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
-	static	IOReturn	staticGetReportAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
-	static	IOReturn	staticSetReportAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
-	static	IOReturn	staticProcessCommandAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
-	static	IOReturn	staticGetDevicePropertiesAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
-	static	IOReturn	staticInterruptChannelOpeningAction( OSObject* owner, void* newService, void* arg2, void* arg3, void* arg4 );
-	static	IOReturn	staticWillTerminateAction( OSObject* owner, void* arg1, void* arg2, void* arg3, void* arg4 );
-	
-	// Work Loop Methods
-	virtual void		closeDownServicesWL();
-	virtual IOReturn	prepInterruptChannelWL();
-	virtual IOReturn	getReportWL( IOMemoryDescriptor* report, IOHIDReportType reportType, IOOptionBits options );
-	virtual IOReturn	setReportWL( IOMemoryDescriptor* report, IOHIDReportType reportType, IOOptionBits options );
-	virtual IOReturn	processCommandWL( OSString* command, OSNumber* commandParameter );
-	virtual IOReturn	getDevicePropertiesWL( IOService* provider );
-	virtual IOReturn	interruptChannelOpeningWL( IOBluetoothL2CAPChannel* theChannel );
-
-	// Timeout Handler
-	static	void		timerFired( OSObject* owner, IOTimerEventSource* sender );
-	virtual void		handleTimeout();
-	
-	// IO Counting
-	virtual void		incrementOutstandingIO();
-	virtual void		decrementOutstandingIO();
-	
-private:
-	// Lazy Interrupt Channel Methods
-	static	bool		interruptChannelOpeningCallback(	void* me, void* ignoreMe, IOService* newService, IONotifier *notifier );
-    static	IOReturn 	powerStateHandler( void *target, void *refCon, UInt32 messageType, IOService *service, void *messageArgument, vm_size_t argSize );
-
-public:
-    OSMetaClassDeclareReservedUsed( IOBluetoothHIDDriver,  0 );
-    virtual void        	sendDeviceDisconnectNotifications( void );
-
-	OSMetaClassDeclareReservedUsed( IOBluetoothHIDDriver,  1 );
-	virtual IOReturn		setPowerStateWL( unsigned long powerStateOrdinal, IOService* whatDevice ); 
-    
-	OSMetaClassDeclareReservedUsed( IOBluetoothHIDDriver,  2 );
-    virtual void        	sendDeviceConnectNotifications( void );
-
-	OSMetaClassDeclareReservedUsed( IOBluetoothHIDDriver,  3 );
-    virtual void        	decrementOutstandingMemoryBlockCount( void );
-
-	OSMetaClassDeclareReservedUsed( IOBluetoothHIDDriver,  4 );
-    virtual IOReturn       	willTerminateWL( void );
-
-public:    
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver,  5 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver,  6 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver,  7 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver,  8 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver,  9 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 10 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 11 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 12 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 13 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 14 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 15 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 16 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 17 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 18 );
-    OSMetaClassDeclareReservedUnused( IOBluetoothHIDDriver, 19 );
-};
-
-#endif	// IOBLUETOOTHHIDDRIVER_H
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothHIDDriverTypes.h b/i386/include/IOKit/bluetooth/IOBluetoothHIDDriverTypes.h
deleted file mode 100644
index 8d722aa..0000000
--- a/i386/include/IOKit/bluetooth/IOBluetoothHIDDriverTypes.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-	File:		IOBluetoothHIDDriverTypes.h
-	Contains:	Type defined for the IOBluetoothHIDDriver.h.
-	Copyright:	(c) 2001-2008 by Apple, all rights reserved.
-*/
-
-
-#ifndef IOBLUETOOTHHIDDRIVERTYPES_H
-#define IOBLUETOOTHHIDDRIVERTYPES_H
-
-// Vendor ID Sources
-//------------------
-#define kVendorIDSourceBluetoothSIG				0x1
-#define kVendorIDSourceUSBIF					0x2
-
-// Bluetooth HID Transaction Headers
-//----------------------------------
-#define IOBTHID_HANDSHAKE_HEADER				0x00
-#define IOBTHID_HID_CONTROL_HEADER				0x10
-#define IOBTHID_GET_REPORT_HEADER				0x40
-#define IOBTHID_SET_REPORT_HEADER				0x50
-#define IOBTHID_GET_PROTOCOL_HEADER				0x60
-#define IOBTHID_SET_PROTOCOL_HEADER				0x70
-#define IOBTHID_GET_IDLE_HEADER					0x80
-#define IOBTHID_SET_IDLE_HEADER					0x90
-#define IOBTHID_DATA_HEADER						0xA0
-#define IOBTHID_DATC_HEADER						0xB0
-
-// Handshake Types
-//----------------
-#define IOBTHID_HANDSHAKE_SUCCESSFUL			0x0
-#define IOBTHID_HANDSHAKE_NOT_READY				0x1
-#define IOBTHID_HANDSHAKE_INVALID_REPORT_ID		0x2
-#define IOBTHID_HANDSHAKE_UNSUPPORTED_REQUEST	0x3
-#define IOBTHID_HANDSHAKE_INVALID_PARAMETER		0x4
-#define IOBTHID_HANDSHAKE_ERR_UNKNOWN			0xE
-#define IOBTHID_HANDSHAKE_ERR_FATAL				0xF
-
-// HID_Control Types
-//------------------
-#define IOBTHID_CONTROL_NOP						0x0
-#define IOBTHID_CONTROL_HARD_RESET				0x1
-#define IOBTHID_CONTROL_SOFT_RESET				0x2
-#define IOBTHID_CONTROL_SUSPEND					0x3
-#define IOBTHID_CONTROL_EXIT_SUSPEND			0x4
-#define IOBTHID_CONTROL_VC_UNPLUG				0x5
-
-// Protocol Types
-//---------------
-#define IOBTHID_BOOT_PROTOCOL					0x0
-#define IOBTHID_REPORT_PROTOCOL					0x1
-
-// Report Types
-//-------------
-#define IOBTHID_RESERVED_REPORT					0x0
-#define IOBTHID_OTHER_REPORT					0x0
-#define IOBTHID_INPUT_REPORT					0x1
-#define IOBTHID_OUTPUT_REPORT					0x2
-#define IOBTHID_FEATURE_REPORT					0x3
-
-#endif // IOBLUETOOTHHIDDRIVERTYPES_H
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothInternal.h b/i386/include/IOKit/bluetooth/IOBluetoothInternal.h
deleted file mode 100644
index ed40a76..0000000
--- a/i386/include/IOKit/bluetooth/IOBluetoothInternal.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-	File:		BluetoothInternal.h
-	Contains:	Internal types and macros needed by public kernel APIs.
-	Copyright:	2003-2007 by Apple, Inc. All rights reserved.
-*/
-
-#pragma once
-
-typedef enum IOBluetoothHCIControllerConfigState
-{
-	kIOBluetoothHCIControllerConfigStateOnline							= 0,	// Controller is configured and ready for clients
-	kIOBluetoothHCIControllerConfigStateKernelSetupPending				= 1,	// New controller - kernel setup in progress
-	kIOBluetoothHCIControllerConfigStateDaemonSetupPending				= 2,	// New controller - daemon setup in progress
-	kIOBluetoothHCIControllerConfigStateDaemonSetupComplete				= 3,	// New controller - daemon setup complete
-	kIOBluetoothHCIControllerConfigStateResetPending					= 4,	// HCI reset has been issued
-	kIOBluetoothHCIControllerConfigStateKernelPostResetSetupPending		= 5,	// HCI reset complete - kernel setup in progress
-	kIOBluetoothHCIControllerConfigStateDaemonPostResetSetupPending		= 6,	// HCI reset complete - daemon setup in progress
-	kIOBluetoothHCIControllerConfigStateDaemonPostResetSetupComplete	= 7,	// HCI reset complete - daemon setup complete
-	kIOBluetoothHCIControllerConfigStateUninitialized					= 8
-} IOBluetoothHCIControllerConfigState;
-
-typedef UInt32 IOBluetoothHCIControllerPowerOptions;
-enum
-{
-	kIOBluetoothHCIControllerPowerOptionPowerOffSupported					= 0x00000001,
-	kIOBluetoothHCIControllerPowerOptionWakeFromExistingConnectionSupported	= 0x00000002,
-	kIOBluetoothHCIControllerPowerOptionWakeFromNewConnectionSupported		= 0x00000004,
-	kIOBluetoothHCIControllerPowerOptionIdleWithConnectionSupported			= 0x00000008,	
-	kIOBluetoothHCIControllerPowerOptionIdleWhenInternalPower				= 0x00000010	
-};
-
-enum IOBluetoothHCIControllerSleepOptions
-{
-	kIOBluetoothHCIControllerAllowWakeFromExistingConnection				= 0x00000001,
-	kIOBluetoothHCIControllerAllowWakeFromNewConnection						= 0x00000002,
-	kIOBluetoothHCIControllerTemporaryOnFromIdle							= 0x00000004
-};
-
-#define HCI_CONTROLLER_POWER_OFF_SUPPORTED( _controllerPowerOptions )	( ( _controllerPowerOptions & kIOBluetoothHCIControllerPowerOptionPowerOffSupported ) == kIOBluetoothHCIControllerPowerOptionPowerOffSupported )
-#define HCI_CONTROLLER_SLEEP_SUPPORTED( _controllerPowerOptions )	\
-	( ( _controllerPowerOptions &	\
-		( kIOBluetoothHCIControllerPowerOptionWakeFromExistingConnectionSupported |	\
-		  kIOBluetoothHCIControllerPowerOptionWakeFromNewConnectionSupported ) ) != 0 )
-
-typedef enum IOBluetoothHCIControllerInternalPowerState
-{
-	kIOBluetoothHCIControllerInternalPowerStateOff		= 0,
-	kIOBluetoothHCIControllerInternalPowerStateOn		= 1,
-	kIOBluetoothHCIControllerInternalPowerStateSleep	= 2,
-	kIOBluetoothHCIControllerInternalPowerStateIdle		= 3
-} IOBluetoothHCIControllerInternalPowerState;
-
-enum IOBluetoothHCIControllerPowerStateOrdinal
-{
-	kIOBluetoothHCIControllerPowerStateOrdinalOff		= 0,
-	kIOBluetoothHCIControllerPowerStateOrdinalIdle		= 1,
-	kIOBluetoothHCIControllerPowerStateOrdinalOn		= 2
-};
-
-typedef UInt32 IOBluetoothHCIControllerFeatureFlags;
-
-enum
-{
-	kIOBluetoothHCIControllerFeatureFlagVendorCommandFlowControl	= 0x00000001,
-	kIOBluetoothHCIControllerFeatureFlagSCOSupported				= 0x00000002,
-	kIOBluetoothHCIControllerFeatureFlagSerializeCommands			= 0x10000000
-};
-
-//===========================================================================================================================
-//	Private_UnifiedInquiryResult
-//===========================================================================================================================
-
-typedef struct	IOBluetoothHCIUnifiedInquiryResult	IOBluetoothHCIUnifiedInquiryResult;
-struct	IOBluetoothHCIUnifiedInquiryResult
-{
-	BluetoothHCIInquiryResult			originalInquiryResult;
-
-	// event code will be either:
-	// kBluetoothHCIEventInquiryResult, kBluetoothHCIEventInquiryResultWithRSSI, or kBluetoothHCIEventExtendedInquiryResult
-
-	BluetoothHCIEventCode eventCode;
-
-	// kBluetoothHCIEventExtendedInquiryResult only
-
-	BluetoothHCIExtendedInquiryResponse	extendedInquiryResponse;
-
-	// kBluetoothHCIEventExtendedInquiryResult or kBluetoothHCIEventInquiryResultWithRSSI only
-
-	UInt8								reserved;
-	BluetoothHCIRSSIValue				RSSIValue;
-};
-
-#if BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0
-
-enum BluetoothHCIExtendedInquiryResponseDataTypesAppleSpecificInfo
-{
-	kBluetoothHCIExtendedInquiryResponseDataTypeAppleSpecificInfoReserved					=	0x00,
-	kBluetoothHCIExtendedInquiryResponseDataTypeAppleSpecificInfoModelIdentifier			=	0x01,	/* UTF8String char data */
-	kBluetoothHCIExtendedInquiryResponseDataTypeAppleSpecificInfoThirdPartyAdvertising		=	0x02,
-};
-
-#endif /* BLUETOOTH_VERSION_MAX_ALLOWED >= BLUETOOTH_VERSION_2_0 */
-
diff --git a/i386/include/IOKit/bluetooth/IOBluetoothTypes.h b/i386/include/IOKit/bluetooth/IOBluetoothTypes.h
deleted file mode 100644
index 07ee4c2..0000000
--- a/i386/include/IOKit/bluetooth/IOBluetoothTypes.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-	File:		IOBluetoothTypes.h
-	Contains:	Family provided types and defines - shared between user and kernel code.
-	Copyright:	© 2002-2007 by Apple Inc. All rights reserved.
-*/
-
-#pragma once
-
-#include <IOKit/IOReturn.h>
-
-// Error returns
-#ifndef sub_iokit_bluetooth
-#define sub_iokit_bluetooth				err_sub(8)
-#endif
-
-#define iokit_bluetooth_err(return)		(sys_iokit|sub_iokit_bluetooth|return)
-
-#define kIOBluetoothDeviceResetError			iokit_bluetooth_err(1)	// Device reset interrupted pending operation
-#define kIOBluetoothConnectionAlreadyExists		iokit_bluetooth_err(2)	// Attempting to open a connection that already exists
-#define kIOBluetoothNoHCIController				iokit_bluetooth_err(3)	// No HCI controller is present
-#define kIOBluetoothHCIPowerStatesNotSupported	iokit_bluetooth_err(4)	// HCI controller does not support changing power states
-
-
diff --git a/i386/include/IOKit/firewire/IOConfigDirectory.h b/i386/include/IOKit/firewire/IOConfigDirectory.h
deleted file mode 100644
index d72ed21..0000000
--- a/i386/include/IOKit/firewire/IOConfigDirectory.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __IOCONFIGDIRECTORY_H__
-#define __IOCONFIGDIRECTORY_H__
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOReturn.h>
-
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-
-class OSData;
-class OSString;
-class OSIterator;
-class IOFireWireDevice;
-
-/*! @class IOConfigDirectory 
-*/
-class IOConfigDirectory : public OSObject
-{
-    OSDeclareAbstractStructors(IOConfigDirectory);
-
-protected:
-    int fStart;			// Offset into ROM of start of this dir
-    int fType;			// Directory type
-    int fNumEntries;		// In directory
-    
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-    virtual bool initWithOffset(int start, int type);
-
-    virtual const UInt32 *getBase() = 0;
-    virtual IOReturn createIterator(UInt32 testVal, UInt32 testMask,
-                                    OSIterator *&iterator);
-    virtual IOConfigDirectory *getSubDir(int start, int type) = 0;
-
-public:
-    /*!
-        @function update
-        makes sure that the ROM has at least the specified capacity,
-        and that the ROM is uptodate from its start to at least the
-        specified quadlet offset.
-        @result kIOReturnSuccess if the specified offset is now
-        accessable at romBase[offset].
-    */
-    virtual IOReturn update(UInt32 offset, const UInt32 *&romBase) = 0;
-
-    /*!
-        @function getKeyType
-        Gets the data type for the specified key
-        @param type on return, set to the data type
-        @result kIOReturnSuccess if the key exists in the dictionary
-    */
-    virtual IOReturn getKeyType(int key, IOConfigKeyType &type);
-    /*!
-        @function getKeyValue
-        Gets the value for the specified key, in a variety of forms.
-        @param value on return, set to the data type
-        @param text if non-zero, on return points to the
-        string description of the field, or NULL if no text found.
-        @result kIOReturnSuccess if the key exists in the dictionary
-        and is of a type appropriate for the value parameter
-        @param value reference to variable to store the entry's value
-    */
-    virtual IOReturn getKeyValue(int key, UInt32 &value, OSString** text = NULL);
-    virtual IOReturn getKeyValue(int key, OSData *&value,
-                                 OSString** text = NULL);
-    virtual IOReturn getKeyValue(int key, IOConfigDirectory *&value,
-                                 OSString** text = NULL);
-    virtual IOReturn getKeyOffset(int key, FWAddress &value,
-                                  OSString** text = NULL);
-
-
-    /*!
-        @function getIndexType
-        Gets the data type for entry at the specified index
-        @param type on return, set to the data type
-        @result kIOReturnSuccess if the index exists in the dictionary
-    */
-    virtual IOReturn getIndexType(int index, IOConfigKeyType &type);
-    /*!
-        @function getIndexKey
-        Gets the key for entry at the specified index
-        @param key on return, set to the key
-        @result kIOReturnSuccess if the index exists in the dictionary
-    */
-    virtual IOReturn getIndexKey(int index, int &key);
-
-    /*!
-        @function getIndexValue
-        Gets the value at the specified index of the directory,
-        in a variety of forms.
-        @param type on return, set to the data type
-        @result kIOReturnSuccess if the index exists in the dictionary
-        and is of a type appropriate for the value parameter
-        @param value reference to variable to store the entry's value
-    */
-    virtual IOReturn getIndexValue(int index, UInt32 &value);
-    virtual IOReturn getIndexValue(int index, OSData *&value);
-    virtual IOReturn getIndexValue(int index, OSString *&value);
-    virtual IOReturn getIndexValue(int index, IOConfigDirectory *&value);
-    virtual IOReturn getIndexOffset(int index, FWAddress &value);
-    virtual IOReturn getIndexOffset(int index, UInt32 &value);
-
-    /*!
-        @function getIndexEntry
-        Gets the entry at the specified index of the directory,
-        as a raw UInt32.
-        @param entry on return, set to the entry value
-        @result kIOReturnSuccess if the index exists in the dictionary
-        @param value reference to variable to store the entry's value
-    */
-    virtual IOReturn getIndexEntry(int index, UInt32 &value);
-
-    /*!
-        @function getSubdirectories
-        Creates an iterator over the subdirectories of the directory.
-        @param iterator on return, set to point to an OSIterator
-        @result kIOReturnSuccess if the iterator could be created
-    */
-    virtual IOReturn getSubdirectories(OSIterator *&iterator);
-
-    /*!
-        @function getKeySubdirectories
-        Creates an iterator over subdirectories of a given type of the directory.
-        @param key type of subdirectory to iterate over
-        @param iterator on return, set to point to an OSIterator
-        @result kIOReturnSuccess if the iterator could be created
-    */
-    virtual IOReturn getKeySubdirectories(int key, OSIterator *&iterator);
-
-    int getType() const;
-	
-    int getNumEntries() const;
-
-protected:
-	
-	virtual const UInt32 * lockData( void ) = 0;
-	virtual void unlockData( void ) = 0;
-	virtual IOReturn updateROMCache( UInt32 offset, UInt32 length ) = 0;
-	virtual IOReturn checkROMState( void ) = 0;
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 0);
-    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 1);
-    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 2);
-    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 3);
-    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 4);
-    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 5);
-    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 6);
-    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 7);
-    OSMetaClassDeclareReservedUnused(IOConfigDirectory, 8);
-
-};
-
-#endif /* __IOCONFIGDIRECTORY_H__ */
diff --git a/i386/include/IOKit/firewire/IOFWAddressSpace.h b/i386/include/IOKit/firewire/IOFWAddressSpace.h
deleted file mode 100644
index 7ad6764..0000000
--- a/i386/include/IOKit/firewire/IOFWAddressSpace.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- *
- *	IOFWAddressSpace.h
- *
- * Classes which describe addresses in the local node which are accessable to other nodes
- * via firewire asynchronous read/write/lock requests.
- */
- 
-#ifndef _IOKIT_IOFWADDRESSSPACE_H
-#define _IOKIT_IOFWADDRESSSPACE_H
-
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-
-class IOFireWireDevice;
-class IOFireWireBus;
-class IOFireWireController;
-
-typedef void * IOFWRequestRefCon;
-
-/*!	@function	FWWriteCallback
-	@abstract	Callback called when a write request packet is received for
-				a 'virtual' firewire address.
-	@param		device	is the node originating the request
-	@param		speed	is the FireWire speed of the request, update it if you need to control
-						the speed of the reply, otherwise the response will be the same speed.
-	@param		addr	is the address the device is requesting to write to
-	@param		len		is the number of bytes to write
-	@param		buf		contains the packet data
-	@param		requestRefcon	refcon Can be queried for extra info about the request,
-								using IOFireWireController::isLockRequest(), isQuadRequest()
-	@result		return:
-				kFWResponseComplete			= 0,	OK
-				kFWResponseConflictError	= 4,	Resource conflict, may retry
-				kFWResponseDataError		= 5,	Data not available
-				kFWResponseTypeError		= 6,	Operation not supported
-				kFWResponseAddressError		= 7		Address not valid in target device */
-typedef UInt32 (*FWWriteCallback)(void *refcon, UInt16 nodeID, IOFWSpeed &speed,
-                                  FWAddress addr, UInt32 len, const void *buf, IOFWRequestRefCon requestRefcon);
-
-/*!	@function	FWReadCallback
-	@abstract	Callback called when a read request packet is received for
-				a 'virtual' firewire address.
-	@param		 nodeID is the node originating the request
-	@param		speed is the FireWire speed of the request, update it if you need to control
-						the speed of the reply, otherwise the response will be the same speed.
-	@param		addr is the address the device is requesting to read from
-	@param		len is the number of bytes to read
-	@param		buf contains the packet data
-	@param		offset on return points to the offset into *buf of the packet data
-	@param		requestRefcon   refcon to pass back if sending a delayed response. Also can be queried 
-								for extra info about the request
-	@result		return:
-    kFWResponsePending			= -1,	Pseudo response, real response sent later.
-	kFWResponseComplete			= 0,	OK!
-	kFWResponseConflictError	= 4,	Resource conflict, may retry
-	kFWResponseDataError		= 5,	Data not available
-	kFWResponseTypeError		= 6,	Operation not supported
-	kFWResponseAddressError		= 7		Address not valid in target device 
-
-	A return of kFWResponsePending should be followed at some later time by a call to
-	IOFireWireController::asyncReadResponse	*/ 
-typedef UInt32 (*FWReadCallback)(void *refcon, UInt16 nodeID, IOFWSpeed &speed,
-                                FWAddress addr, UInt32 len, IOMemoryDescriptor **buf,
-                                 IOByteCount * offset, IOFWRequestRefCon requestRefcon);
-
-class IOFWAddressSpace;
-
-#pragma mark -
-
-/*! @class IOFWAddressSpaceAux
-	@discussion An IOFWAddressSpaceAux is for internal use only. You should never subclass IOFWAddressSpaceAux 
-*/
-
-class IOFWAddressSpaceAux : public OSObject
-{
-    OSDeclareDefaultStructors(IOFWAddressSpaceAux)
-
-	friend class IOFWAddressSpace;
-	
-protected:
-	
-	IOFWAddressSpace * 		fPrimary;
-	IOFireWireController *	fControl;
-	
-	OSSet *					fTrustedNodeSet;
-    OSIterator *			fTrustedNodeSetIterator;
-	
-	bool					fExclusive;
-	
-	/*! 
-		@struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-    */  
-	  
-    struct ExpansionData { };
-
-	/*! 
-		@var reserved
-		Reserved for future use.  (Internal use only)  
-	*/
-    
-	ExpansionData * reserved;
-
-    virtual bool init( IOFWAddressSpace * primary );
-	virtual	void free();
-
-	virtual bool isTrustedNode( UInt16 nodeID );
-	virtual void addTrustedNode( IOFireWireDevice * device );
-	virtual void removeTrustedNode( IOFireWireDevice * device );
-	virtual void removeAllTrustedNodes( void );
-
-	bool isExclusive( void );
-	void setExclusive( bool exclusive );
-	
-	virtual bool intersects( IOFWAddressSpace * space );
-		
-private:
-    OSMetaClassDeclareReservedUsed(IOFWAddressSpaceAux, 0);
-    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 1);
-    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 2);
-    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 3);
-    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 4);
-    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 5);
-    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 6);
-    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 7);
-    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 8);
-    OSMetaClassDeclareReservedUnused(IOFWAddressSpaceAux, 9);
-	
-};
-
-#pragma mark -
-
-/*
- * Base class for FireWire address space objects
- */
- 
-/*! 
-	@class IOFWAddressSpace
-*/
-
-class IOFWAddressSpace : public OSObject
-{
-    OSDeclareAbstractStructors(IOFWAddressSpace)
-
-	friend class IOFWAddressSpaceAux;
-	
-protected:
-    
-	IOFireWireController *fControl;
-
-	/*!
-		@struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-    */  
-	  
-    struct ExpansionData 
-	{ 
-		IOFWAddressSpaceAux * fAuxiliary; 
-	};
-
-	/*! 
-		@var reserved
-		Reserved for future use.  (Internal use only)  
-	*/
-	
-    ExpansionData * fIOFWAddressSpaceExpansion;
-
-    virtual bool init(IOFireWireBus *bus);
-	virtual	void free();
-  
-public:
-
-	/*!	@function	doRead
-		@abstract	An abstract method for processing an address space read request
-		@param		nodeID	FireWire Read from nodeID.
-		@param		speed	at this 'speed'.
-		@param		addr	with FireWire address 'addr'.
-		@param		len		read 'len' bytes from nodeID.
-		@param		buf		points to a memory descriptor containing the packet data.
-		@param		offset	start from this 'offset' in 'buf'.
-		@param		refcon  Can be queried for extra info about the request.
-		@result		UIn32	returns kFWResponseComplete on success */
-	virtual UInt32 doRead(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len, 
-					IOMemoryDescriptor **buf, IOByteCount * offset,
-                          IOFWRequestRefCon refcon) = 0;
-						  
-	/*!	@function	doWrite
-		@abstract	An abstract method for processing an address space write request
-		@param		nodeID	FireWire Write to nodeID.
-		@param		speed	at this 'speed'.
-		@param		addr	with FireWire address 'addr'.
-		@param		len		write 'len' bytes to nodeID.
-		@param		buf		obtain bytes from location given by 'buf'.
-		@param		refcon  Can be queried for extra info about the request.
-		@result		UIn32	returns kFWResponseComplete on success */
-    virtual UInt32 doWrite(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
-                           const void *buf, IOFWRequestRefCon refcon) = 0;
-
-	/*!	@function	doLock
-		@abstract	A method for processing a lock request.
-		@param		nodeID	FireWire Lock request for nodeID.
-		@param		speed	at this 'speed'.
-		@param		addr	with FireWire address 'addr'.
-		@param		inlen	'inlen' bytes to use.
-		@param		newVal	new value to write at 'addr' location .
-		@param		outLen	'outLen' bytes for result.
-		@param		oldVal	old value read from 'addr' location.
-		@param		extType	Type like kFWExtendedTCodeCompareSwap.
-		@param		refcon  Can be queried for extra info about the request.
-		@result		UIn32	returns kFWResponseComplete on success */
-    virtual UInt32 doLock(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 inlen,
-                          const UInt32 *newVal, UInt32 &outLen, UInt32 *oldVal,
-                          UInt32 extType, IOFWRequestRefCon refcon);
-
-	/*!	@function	activate
-		@abstract	Address space is ready for handling requests.
-		@result		IOReturn
-		*/
-    virtual IOReturn activate();
-	
-	/*!	@function	deactivate
-		@abstract	Address space request handler is disabled.
-		@result		none
-		*/
-    virtual void deactivate();
-    
-	/*!	@function	contains
-		@abstract	returns number of bytes starting at addr in this space
-		@result		0 if it doesn't contain the address
-		*/
-    virtual UInt32 contains(FWAddress addr);
-
-	/*!	@function	isTrustedNode
-		@abstract	returns true if the node is added as a trusted node
-		@param		nodeID is the nodeID to verify whether its trusted.
-		@result		false if nodeID is not trusted
-		*/
-	inline bool isTrustedNode( UInt16 nodeID ) 
-				{ return fIOFWAddressSpaceExpansion->fAuxiliary->isTrustedNode( nodeID ); }
-
-	/*!	@function	addTrustedNode
-		@abstract	Add a trusted node.
-		@param		device object pointing to a FireWire node on the bus.
-		@result		none
-		*/
-	inline void addTrustedNode( IOFireWireDevice * device )
-				{ fIOFWAddressSpaceExpansion->fAuxiliary->addTrustedNode( device ); }
-	
-	/*!	@function	removeTrustedNode
-		@abstract	Remove a trusted node.
-		@param		device object pointing to a FireWire node on the bus.
-		@result		none
-		*/
-	inline void removeTrustedNode( IOFireWireDevice * device )
-				{ fIOFWAddressSpaceExpansion->fAuxiliary->removeTrustedNode( device ); }
-		
-	/*!	@function	removeAllTrustedNodes
-		@abstract	Remove all trusted nodes.
-		@result		none
-		*/
-	inline void removeAllTrustedNodes( void )
-				{ fIOFWAddressSpaceExpansion->fAuxiliary->removeAllTrustedNodes(); }
-
-	/*!	@function	isExclusive
-		@abstract	Checks if an address space wants exclusive control of its address range
-		@result		True if the address space is marked exclusive false otherwise
-		*/
-
-	inline bool isExclusive( void )
-		{ return fIOFWAddressSpaceExpansion->fAuxiliary->isExclusive(); }
-
-	/*!	@function	setExclusive
-		@abstract	Sets if this address space requires exclusive control of its address range. Exclusivity should be set before an address space is activated.
-		@param		exclusive  True if address space should be exclusive, false otherwise
-		@result		none
-	*/
-		
-	inline void setExclusive( bool exclusive )
-		{ fIOFWAddressSpaceExpansion->fAuxiliary->setExclusive( exclusive ); }
-
-	/*!	@function	intersects
-		@abstract	Checks this address space intersects with the given address range. Currently only supports IOFWPsuedoAddressSpaces.
-		@param		space  An address space to compare against
-		@result		True if the address spaces intersect false otherwise
-	*/
-		
-	inline bool intersects( IOFWAddressSpace * space )
-		{ return fIOFWAddressSpaceExpansion->fAuxiliary->intersects( space ); }
-
-		
-protected:
-	
-	virtual IOFWAddressSpaceAux * createAuxiliary( void );
-    
-private:
-    OSMetaClassDeclareReservedUsed(IOFWAddressSpace, 0);
-    OSMetaClassDeclareReservedUsed(IOFWAddressSpace, 1);
-    
-};
-
-// the physical and psuedo address space classes used to be defined here
-// for backwards compatibility, we pull them in now.  the ifdefs surrounding
-// the content of the header files ensures we do not multiply include a header.
-
-#include <IOKit/firewire/IOFWPseudoAddressSpace.h>
-#include <IOKit/firewire/IOFWPhysicalAddressSpace.h>
-
-#endif /* _IOKIT_IOFWADDRESSSPACE */
diff --git a/i386/include/IOKit/firewire/IOFWAsyncStreamListener.h b/i386/include/IOKit/firewire/IOFWAsyncStreamListener.h
deleted file mode 100644
index cef64f8..0000000
--- a/i386/include/IOKit/firewire/IOFWAsyncStreamListener.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 1998-2001 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _IOKIT_IOFWASYNCSTREAMLISTENER_H
-#define _IOKIT_IOFWASYNCSTREAMLISTENER_H
-
-#include <IOKit/firewire/IOFireWireLink.h>
-#include <IOKit/firewire/IOFWCommand.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/firewire/IOFWDCLProgram.h>
-
-class IOFWAsyncStreamReceiver;
-class IOFWAsyncStreamReceivePort;
-
-/*! @class IOFWAsyncStreamListener
-*/
-class IOFWAsyncStreamListener : public OSObject
-{
-    OSDeclareDefaultStructors(IOFWAsyncStreamListener)
-
-friend class IOFWAsyncStreamReceiver;
-friend class IOFireWireController;
-
-public:
-
-/*!	@function initAll
-	@abstract Creates an AsyncStream client for an Isoch channel.
-	@param control	Points to IOFireWireController.
-	@param channel	Isoch channel for listening.
-	@param proc		Callback on packet reception.
-	@param obj  Client's callback object.
-	@result returns true on success, else false.	*/	
-	bool initAll( IOFireWireController *control, UInt32 channel, FWAsyncStreamReceiveCallback proc, void *refcon );
-
-/*!	@function setListenerHandler
-	@abstract Set the callback that should be called to handle incoming async stream packets
-	@param inReceiver The callback to set.
-	@result Returns the callback that was previously set or nil for none.*/
-	const FWAsyncStreamReceiveCallback setListenerHandler( FWAsyncStreamReceiveCallback inReceiver );
-
-/*!	@function TurnOffNotification
-	@abstract Turns off client callback notification.
-	@result   none.	*/	
-	inline void TurnOffNotification() { fNotify = false; };
-
-/*!	@function TurnOnNotification
-	@abstract Turns on client callback notification.
-	@result   none.	*/	
-	inline void TurnOnNotification() { fNotify = true; };
-
-/*!	@function IsNotificationOn
-	@abstract checks the notification state.
-	@result   true if ON, else false	*/	
-	inline bool IsNotificationOn() { return fNotify; };
-
-/*!	@function setFlags
-	@abstract set flags for the listener.
-	@param flags indicate performance metrics.
-	@result none.	*/	
-	void setFlags( UInt32 flags );
-	
-/*!	@function getFlags
-	@abstract get the flags of listener.
-	@param none.
-	@result flags.	*/	
-	UInt32 getFlags();
-
-/*!	@function getRefCon
-	@abstract get the refcon specific to this listener.
-	@param none.
-	@result fRefCon refcon passed during initialization. */	
-	inline void* getRefCon() { return fRefCon; };
-	
-/*!	@function getOverrunCounter
-	@abstract get overrun counter from the DCL program.
-	@param none.
-	@result returns the counter value.	*/	
-	UInt32 getOverrunCounter();
-	
-protected:
-
-	FWAsyncStreamReceiveCallback	fClientProc; 
-	void							*fRefCon;
-	IOFWAsyncStreamReceiver			*fReceiver;
-	bool							 fNotify;
-	UInt32							 fFlags;
-	IOFireWireController			*fControl;
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-    
-    virtual void		free();
-
-private:
-/*!	function getReceiver
-	abstract Returns the Async Stream receiver object which tracks multiple
-	         IOFWAsyncStreamListeners for the same Isoc channel. */	
-	inline IOFWAsyncStreamReceiver *getReceiver() { return fReceiver; };
-
-/*!	function invokeClients
-	abstract Invokes client's callback function with fRefCon.	*/	
-	void invokeClients( UInt8 *buffer );
-	
-    OSMetaClassDeclareReservedUnused(IOFWAsyncStreamListener, 0);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncStreamListener, 1);
-};
-#endif // _IOKIT_IOFWASYNCSTREAMLISTENER_H
-
diff --git a/i386/include/IOKit/firewire/IOFWCommand.h b/i386/include/IOKit/firewire/IOFWCommand.h
deleted file mode 100644
index fdf85b5..0000000
--- a/i386/include/IOKit/firewire/IOFWCommand.h
+++ /dev/null
@@ -1,977 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *
- *	IOFWCommand.h
- *
- */
-#ifndef _IOKIT_IOFWCOMMAND_H
-#define _IOKIT_IOFWCOMMAND_H
-
-#include <IOKit/IOCommand.h>
-#include <IOKit/IOLib.h>
-
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-
-#include <IOKit/firewire/IOFWSyncer.h>
-
-#define kFWCmdDefaultRetries 3
-#define kFWCmdZeroRetries 0
-#define kFWCmdReducedRetries 2
-#define kFWCmdIncreasedRetries 6
-
-class IOMemoryDescriptor;
-class IOSyncer;
-class IOFireWireBus;
-class IOFireWireController;
-class IOFireWireNub;
-class IOFWAddressSpace;	// Description of chunk of local FW address space
-class IOFWCommand;
-class IOFWBusCommand;
-class IOFWAsyncStreamCommand;
-class IOCommandGate;
-class IOFWAsyncPHYCommand;
-
-struct AsyncPendingTrans;
-
-// Struct for head of command queue
-/*!
-    @struct IOFWCmdQ
-    @abstract Structure for head of a queue of IOFWCommands
-    @field fHead Points to the head of the queue, or NULL if queue is empty
-    @field fTail Points to the tail of the queue, or NULL if queue is empty
-    @function headChanged called when head command is changed, or the command
- 	itself changes state.
-*/
-
-struct IOFWCmdQ
-{
-    IOFWCommand *fHead;
-    IOFWCommand *fTail;
-    bool executeQueue(bool all);
-    virtual void headChanged(IOFWCommand *oldHead);
-	
-	virtual ~IOFWCmdQ() {}
-
-	void checkProgress( void );
-};
-
-// Callback when device command completes asynchronously
-typedef void (*FWDeviceCallback)(void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd);
-
-// Callback when bus command completes asynchronously
-typedef void (*FWBusCallback)(void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd);
-
-// Callback when async stream command completes asynchronously
-typedef void (*FWAsyncStreamCallback)(void *refcon, IOReturn status, IOFireWireBus *bus, IOFWAsyncStreamCommand *fwCmd);
-
-// Callback when async stream command completes asynchronously
-typedef void (*FWAsyncPHYCallback)(void *refcon, IOReturn status, IOFireWireBus *bus, IOFWAsyncPHYCommand *fwCmd );
-
-// Callback when async stream packet is received
-typedef void (*FWAsyncStreamReceiveCallback)(void *refcon, const void *buf);
-
-#pragma mark -
-
-/*
- * Base class for FireWire commands
- */
-/*! @class IOFWCommand
-*/
-class IOFWCommand : public IOCommand
-{
-    OSDeclareAbstractStructors(IOFWCommand)
-
-protected:
-    IOReturn		fStatus;
-    IOFireWireController *fControl;
-    IOFWCommand *	fQueuePrev;
-    IOFWCommand *	fQueueNext;
-    IOFWCmdQ *		fQueue;
-    UInt32			fTimeout;	// How long (in microsecs) after execute() to timeout
-    AbsoluteTime	fDeadline;	// Time after which this command has timed out.
-    IOFWSyncer *	fSyncWakeup;
-    UInt8			fSync;
-    UInt8			fCancelOnReset;
-    UInt8			spare[2];
-    
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct MemberVariables 
-	{
-		void *			fFWIMRefCon;
-		IOReturn		fCompletionStatus;
-		bool			fSubmitTimeLatched;
-	    AbsoluteTime	fSubmitTime;
-		bool			fFlush;
-	};
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    MemberVariables * fMembers;
-
-    virtual IOReturn	complete(IOReturn status);
-    virtual void	updateTimer();
-    virtual IOReturn	startExecution();
-    
-    /*	
-     *	Execute the FWCommand immediately
-     *	must be called with the workloop gate closed
-     */
-    virtual IOReturn	execute() = 0;
-
-public:
-
-    virtual bool	initWithController(IOFireWireController *control);
-	virtual void	free( void );
-	
-    IOReturn		getStatus() const { return fStatus; };
-    
-    /*	
-     *	Submit the FWCommand.
-     *	if queue is false the command's execute()
-     *	method will be called on the caller's thread, otherwise
-     *	the command wil be queued for execution on the work loop thread.
-     */                          
-    virtual IOReturn 	submit(bool queue = false);
-
-    /*
-     * Cancel command, causes it to complete with given status
-     */
-    virtual IOReturn	cancel(IOReturn reason);
-
-    /*!
-        @function setHead
-        inserts a command at the head of a queue.
-        @param queue queue command is being added to
-    */
-    virtual void setHead(IOFWCmdQ &queue);
-    /*!
-        @function insertAfter
-        inserts a command after the specified one.
-        @param prev command to insert after
-        @param queue queue command is being added to
-    */
-    virtual void insertAfter(IOFWCommand &prev);
-
-    /*!
-        @function removeFromQ
-        Removes command from current queue.
-    */
-    virtual void removeFromQ();
-
-    IOFWCommand *getPrevious() const
-	{ return fQueuePrev; };
-    IOFWCommand *getNext() const
-        { return fQueueNext; };
-    const AbsoluteTime &getDeadline() const
-	{ return fDeadline; };
-
-    bool cancelOnReset() const
-    { return fCancelOnReset; };
-
-    bool Busy() const
-        { return fStatus == kIOReturnBusy || fStatus == kIOFireWirePending;};
-    
-    void setTimeout( UInt32 timeout )
-        { fTimeout = timeout; };
-        
-    friend class IOFWCmdQ;
-
-	void * getFWIMRefCon( void )
-	{
-		return fMembers->fFWIMRefCon;
-	}
-	
-	void setFWIMRefCon( void * refcon )
-	{
-		fMembers->fFWIMRefCon = refcon;
-	}
-
-	void setFlush( bool flush )
-	{
-		fMembers->fFlush = flush;		
-	}
-	
-	virtual IOReturn checkProgress( void );
-	
-private:
-    OSMetaClassDeclareReservedUsed(IOFWCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFWCommand, 1);
-
-};
-
-#pragma mark -
-
-/*
- * Bus control commands
- */
-/*! @class IOFWBusCommand
-*/
-class IOFWBusCommand : public IOFWCommand
-{
-    OSDeclareAbstractStructors(IOFWBusCommand)
-
-protected:
-    FWBusCallback	fComplete;
-    void *		fRefCon;
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-    virtual IOReturn	complete(IOReturn status);
-
-    virtual bool	initWithController(IOFireWireController *control,
-				FWBusCallback completion=NULL, void *refcon=NULL);
-    virtual IOReturn	reinit(FWBusCallback completion, void *refcon);
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFWBusCommand, 0);
-
-};
-
-#pragma mark -
-
-/*
- * Command to execute some code after a specified delay (in microseconds)
- * All it does is timeout after the specified delay, hence calling the completion
- * callback.
- */
-/*! @class IOFWDelayCommand
-*/
-class IOFWDelayCommand : public IOFWBusCommand
-{
-    OSDeclareDefaultStructors(IOFWDelayCommand)
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-protected:
-    virtual IOReturn	execute();
-
-public:
-    virtual bool	initWithDelay(IOFireWireController *control, UInt32 uSecs,
-                                FWBusCallback completion, void *refcon);
-    virtual IOReturn	reinit(UInt32 uSecs, FWBusCallback completion, void *refcon);
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFWDelayCommand, 0);
-
-};
-
-/*
- * Send an async request to a device
- */
-class IOFWUserReadQuadletCommand ;
-class IOFWUserWriteCommand ;
-
-#pragma mark -
-
-/*! @class IOFWAsyncCommand
-*/
-class IOFWAsyncCommand : public IOFWCommand
-{
-	OSDeclareAbstractStructors(IOFWAsyncCommand)
-
-protected:
-    IOFireWireNub *	fDevice;
-    FWDeviceCallback	fComplete;
-    void *		fRefCon;
-    IOMemoryDescriptor *fMemDesc;
-    AsyncPendingTrans *	fTrans;
-    UInt32		fAddressHi;
-    UInt32		fAddressLo;
-    IOByteCount		fBytesTransferred;
-    int			fSize;
-    int			fSpeed;
-    int			fMaxPack;
-    int			fCurRetries;
-    int			fMaxRetries;
-    UInt32		fGeneration;	// bus topology fNodeID is valid for.
-    UInt16		fNodeID;
-    bool		fFailOnReset;
-    bool		fWrite;
-
-	typedef struct 
-	{ 
-		// some of our subclasses didn't have room for expansion data, so
-		// we've reserved space for their use here.
-		
-		void *			fSubclassMembers;
-		int				fMaxSpeed;
-		int				fAckCode;
-		UInt32			fResponseCode;
-		UInt32			fFastRetryCount;
-		int				fResponseSpeed;
-		bool			fForceBlockRequests;
-	} 
-	MemberVariables;
-
-    MemberVariables * fMembers;
-
-    virtual IOReturn	complete(IOReturn status);
-	virtual bool	initWithController(IOFireWireController *control);
-    virtual bool	initAll(IOFireWireNub *device, FWAddress devAddress,
-				IOMemoryDescriptor *hostMem,
-				FWDeviceCallback completion, void *refcon, bool failOnReset);
-    virtual bool	initAll(IOFireWireController *control,
-                                UInt32 generation, FWAddress devAddress,
-                                IOMemoryDescriptor *hostMem,
-                                FWDeviceCallback completion, void *refcon);
-	virtual void free( void );
-    virtual IOReturn	reinit(FWAddress devAddress, IOMemoryDescriptor *hostMem,
-				FWDeviceCallback completion, void *refcon, bool failOnReset);
-    virtual IOReturn	reinit(UInt32 generation, FWAddress devAddress, IOMemoryDescriptor *hostMem,
-                                FWDeviceCallback completion, void *refcon);
-	bool createMemberVariables( void );
-	void destroyMemberVariables( void );
-public:
-	// Utility for setting generation on newly created command
-	virtual void	setGeneration(UInt32 generation)
-	{ fGeneration = generation; }
-
-    // To be called by IOFireWireController and derived classes.
-    virtual void 	gotPacket(int rcode, const void* data, int size) = 0;
-    virtual void	gotAck(int ackCode);
-
-    // update nodeID/generation after bus reset, from the device object
-    IOReturn		updateGeneration();
-    // explicitly update nodeID/generation after bus reset
-    IOReturn		updateNodeID(UInt32 generation, UInt16 nodeID);
-    
-    // Generally useful stuff
-    IOByteCount		getBytesTransferred() const
-    { return fBytesTransferred; };
-
-    FWAddress		getAddress() const
-    { return FWAddress(fAddressHi, fAddressLo, fNodeID); }
-
-    bool		failOnReset() const
-    { return fFailOnReset; }
-    
-    IOFireWireNub *	getDevice() const
-    { return fDevice; }
-    
-    /*!
-        @function setMaxPacket
-        Sets the maximum size for block transfers used by the command.
-        The command is initialized to use the maximum packet size calculated from the device's
-        PHY speed, bus info block and the bus topology.
-        Call this method before calling submit().
-        @param maxBytes Maximum packet size in bytes. If the maxsize is 4 then quadlet transfers will be used.
-    */
-    IOReturn	setMaxPacket(UInt32 maxBytes)
-    {
-        if(fStatus == kIOReturnBusy || fStatus == kIOFireWirePending)
-            return fStatus;
-        fMaxPack = maxBytes;
-        return kIOReturnSuccess;
-    }
-
-	void setMaxSpeed( int speed );
-	
-	void setAckCode( int ack );
-	int getAckCode( void );
-	
-	void setRetries( int retries);
-	int getMaxRetries( void );
-	
-	void setResponseCode( UInt32 rcode );
-	UInt32 getResponseCode( void ) const;
-
-	void setFastRetryCount( UInt32 count ) 
-		{ fMembers->fFastRetryCount = count; };
-
-	UInt32 getFastRetryCount( void ) 
-		{ return fMembers->fFastRetryCount; };
-		
-	void setResponseSpeed( int speed ) 
-		{ fMembers->fResponseSpeed = speed; };
-
-	int getResponseSpeed( void ) 
-		{ return fMembers->fResponseSpeed; };
-
-	// forces even 4 byte transactions to be block requests
-	void setForceBlockRequests( bool enabled )
-		{ fMembers->fForceBlockRequests = enabled; }
-
-	virtual IOReturn checkProgress( void );
-			
-private:
-    OSMetaClassDeclareReservedUnused(IOFWAsyncCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncCommand, 1);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncCommand, 2);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncCommand, 3);
-
-};
-
-#pragma mark -
-
-/*
- * Concrete async requests - read, write and hordes of read/modify/write
- */
-class IOFWReadCommand : public IOFWAsyncCommand
-{
-    OSDeclareDefaultStructors(IOFWReadCommand)
-
-protected:
-	
-    virtual void 	gotPacket(int rcode, const void* data, int size);
-
-    virtual IOReturn	execute();
-
-public:
-    virtual bool	initAll(IOFireWireNub *device, FWAddress devAddress,
-				IOMemoryDescriptor *hostMem,
-				FWDeviceCallback completion, void *refcon, bool failOnReset);
-    virtual bool	initAll(IOFireWireController *control,
-                                UInt32 generation, FWAddress devAddress,
-                                IOMemoryDescriptor *hostMem,
-                                FWDeviceCallback completion, void *refcon);
-    virtual IOReturn	reinit(FWAddress devAddress, IOMemoryDescriptor *hostMem,
-				FWDeviceCallback completion=NULL, void *refcon=NULL,
-				bool failOnReset=false);
-    virtual IOReturn	reinit(UInt32 generation, FWAddress devAddress, IOMemoryDescriptor *hostMem,
-                                FWDeviceCallback completion=NULL, void *refcon=NULL);
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFWReadCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFWReadCommand, 1);
-};
-
-#pragma mark -
-
-/*!
-	@class IOFWReadQuadCommand
-	@discussion An easier to use version of IOFWReadCommand for use when the data to be transferred
-	is an integer number of quads.
-	Note that block read requests will be used for transfers greater than one quad unless setMaxPacket(4)
-	is called.
-*/
-
-class IOFWReadQuadCommand : public IOFWAsyncCommand
-{
-    OSDeclareDefaultStructors(IOFWReadQuadCommand)
-
-protected:
-
-    UInt32 *	fQuads;
-
-	typedef struct 
-	{ 
-		bool	fPingTime;
-	}
-	MemberVariables;
-	
-	bool createMemberVariables( void );
-	void destroyMemberVariables( void );
-	virtual void free( void );
-	
-    virtual void 	gotPacket(int rcode, const void* data, int size);
-
-    virtual IOReturn	execute();
-
-public:
-    virtual bool	initAll(IOFireWireNub *device, FWAddress devAddress,
-				UInt32 *quads, int numQuads,
-				FWDeviceCallback completion, void *refcon, bool failOnReset);
-
-    virtual bool	initAll(IOFireWireController *control,
-                                UInt32 generation, FWAddress devAddress,
-                                UInt32 *quads, int numQuads,
-                                FWDeviceCallback completion, void *refcon);
-    
-    virtual IOReturn	reinit(FWAddress devAddress, UInt32 *quads, int numQuads,
-				FWDeviceCallback completion=NULL, void *refcon=NULL,
-				bool failOnReset=false);
-
-    virtual IOReturn	reinit(UInt32 generation, FWAddress devAddress, UInt32 *quads, int numQuads,
-                                FWDeviceCallback completion=NULL, void *refcon=NULL);
-
-	void setPingTime( bool state ) 
-		{ ((MemberVariables*)fMembers->fSubclassMembers)->fPingTime = state; };    
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFWReadQuadCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFWReadQuadCommand, 1);
-};
-
-#pragma mark -
-
-class IOFWWriteCommand : public IOFWAsyncCommand
-{
-
-    OSDeclareDefaultStructors(IOFWWriteCommand)
-
-protected:
-
-    int			fPackSize;
-	
-	typedef struct 
-	{ 
-		bool 	fDeferredNotify;
-		bool	fFastRetryOnBusy;
-	}
-	MemberVariables;
-		
-    virtual IOReturn	execute();
-
-    virtual void 	gotPacket( int rcode, const void* data, int size );
-
-	bool createMemberVariables( void );
-	void destroyMemberVariables( void );
-	
-public:
-
-	virtual bool	initWithController(IOFireWireController *control);
-    virtual bool	initAll(	IOFireWireNub *			device, 
-								FWAddress 				devAddress,
-								IOMemoryDescriptor *	hostMem,
-								FWDeviceCallback 		completion, 
-								void *					refcon, 
-								bool 					failOnReset );
-								
-    virtual bool	initAll(	IOFireWireController *	control,
-                                UInt32 					generation, 
-								FWAddress 				devAddress,
-                                IOMemoryDescriptor *	hostMem,
-                                FWDeviceCallback 		completion, 
-								void *					refcon );
-	virtual void free( void );
-								
-    virtual IOReturn	reinit(	FWAddress 				devAddress, 
-								IOMemoryDescriptor *	hostMem,
-								FWDeviceCallback 		completion = NULL, 
-								void *					refcon = NULL,
-								bool 					failOnReset = false );
-								
-    virtual IOReturn	reinit(	UInt32 					generation, 
-								FWAddress 				devAddress, 
-								IOMemoryDescriptor *	hostMem,
-                                FWDeviceCallback		completion = NULL, 
-								void *					refcon = NULL );
-
-	void setDeferredNotify( bool state ) 
-		{ ((MemberVariables*)fMembers->fSubclassMembers)->fDeferredNotify = state; };
-
-	void setFastRetryOnBusy( bool state ) 
-		{ ((MemberVariables*)fMembers->fSubclassMembers)->fFastRetryOnBusy = state; };
-	
-private:
-
-    OSMetaClassDeclareReservedUnused(IOFWWriteCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFWWriteCommand, 1);
-
-};
-
-#pragma mark -
-
-/*!
-	@class IOFWWriteQuadCommand
-	@discussion An easier to use version of IOFWWriteCommand for use when the data to be transferred
-	is small and an integer number of quads.
-	Note that block read requests will be used for transfers greater than one quad unless setMaxPacket(4)
-	is called.
-	kMaxWriteQuads is the largest legal number of quads that this object can be asked to transfer
-	(the data is copied into an internal buffer in init() and reinit()).
-*/
-
-class IOFWWriteQuadCommand : public IOFWAsyncCommand
-{
-
-    OSDeclareDefaultStructors(IOFWWriteQuadCommand)
-
-public:
-
-    enum 
-	{
-        kMaxWriteQuads = 8
-    };
-    
-protected:
-
-    UInt32					fQuads[kMaxWriteQuads];
-    UInt32 *				fQPtr;
-    int						fPackSize;
-	
-	typedef struct 
-	{ 
-		bool 					fDeferredNotify;
-		IOMemoryDescriptor *	fMemory;
-	} 
-	MemberVariables;
-	
-    virtual void 	gotPacket( int rcode, const void* data, int size );
-
-    virtual IOReturn	execute();
-
-	bool createMemberVariables( void );
-	void destroyMemberVariables( void );
-	
-public:
-	virtual bool	initWithController(IOFireWireController *control);
-    
-	virtual bool	initAll(	IOFireWireNub *		device, 
-								FWAddress 			devAddress,
-								UInt32 *			quads, 
-								int 				numQuads,
-								FWDeviceCallback	completion, 
-								void *				refcon, 
-								bool 				failOnReset );
-								
-    virtual bool	initAll(	IOFireWireController *	control,
-                                UInt32 					generation, 
-								FWAddress 				devAddress,
-                                UInt32 *				quads, 
-								int 					numQuads,
-                                FWDeviceCallback 		completion, 
-								void *					refcon );
-
-	virtual void free( void );
-
-    virtual IOReturn	reinit(	FWAddress 			devAddress, 
-								UInt32 *			quads, 
-								int 				numQuads,
-								FWDeviceCallback	completion = NULL, 
-								void *				refcon = NULL,
-								bool 				failOnReset = false );
-								
-    virtual IOReturn	reinit(	UInt32 				generation, 
-								FWAddress 			devAddress, 
-								UInt32 *			quads, 
-								int 				numQuads,
-                                FWDeviceCallback 	completion = NULL, 
-								void *				refcon = NULL );
-
-protected:
-	
-	void setQuads( UInt32 * quads, int numQuads );
-	bool createMemoryDescriptor( void );
-	void destroyMemoryDescriptor( void );
-
-public:
-
- 	void setDeferredNotify( bool state ) 
-		{ ((MemberVariables*)fMembers->fSubclassMembers)->fDeferredNotify = state; };
-	
-private:
-    
-	OSMetaClassDeclareReservedUnused(IOFWWriteQuadCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFWWriteQuadCommand, 1);
-
-};
-
-/*
- * May need more parameters for some of these,
- * and/or derive from a base Lock transaction command
- */
-
-#pragma mark -
-
-/*! @class IOFWCompareAndSwapCommand
-*/
-class IOFWCompareAndSwapCommand : public IOFWAsyncCommand
-{
-    OSDeclareDefaultStructors(IOFWCompareAndSwapCommand)
-
-protected:
-    UInt32 					fInputVals[4];
-    UInt32 					fOldVal[2];
-	
-	typedef struct 
-	{ 
-		IOMemoryDescriptor *	fMemory;
-	} 
-	MemberVariables;
-	
-	MemberVariables * fMembers;
-
-    virtual void 	gotPacket(int rcode, const void* data, int size);
-
-    virtual IOReturn	execute();
-
-public:
-    // Compare to cmpVal, and if equal replace with newVal.
-    // Size = 1 for 32 bit operation (one quad), 2 for 64 bit (two quads)
-	virtual bool	initWithController(IOFireWireController *control);
-    virtual bool	initAll(IOFireWireNub *device, FWAddress devAddress,
-				const UInt32 *cmpVal, const UInt32 *newVal, int size,
-				FWDeviceCallback completion, void *refcon, bool failOnReset);
-    virtual bool	initAll(IOFireWireController *control,
-                                UInt32 generation, FWAddress devAddress,
-                                const UInt32 *cmpVal, const UInt32 *newVal, int size,
-                                FWDeviceCallback completion, void *refcon);
-
-    virtual IOReturn	reinit(FWAddress devAddress, const UInt32 *cmpVal, const UInt32 *newVal, int size,
-                                FWDeviceCallback completion=NULL, void *refcon=NULL, bool failOnReset=false);
-    virtual IOReturn	reinit(UInt32 generation, FWAddress devAddress,
-                                const UInt32 *cmpVal, const UInt32 *newVal, int size,
-                                FWDeviceCallback completion=NULL, void *refcon=NULL);
-
-    // sets oldVal to the old value returned by the device, and
-    // returns true if it was the expected value, ie. the lock succeeded
-    virtual bool	locked(UInt32 *oldVal);
-
-	virtual void free( void );
-
-protected:
-
-	bool createMemberVariables( void );
-	void destroyMemberVariables( void );
-	
-	void setInputVals( const UInt32 *	cmpVal, const UInt32 * newVal, int size );
-
-	bool createMemoryDescriptor( void );
-	void destroyMemoryDescriptor( void );
-    
-private:
-    OSMetaClassDeclareReservedUnused(IOFWCompareAndSwapCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFWCompareAndSwapCommand, 1);
-    OSMetaClassDeclareReservedUnused(IOFWCompareAndSwapCommand, 2);
-    OSMetaClassDeclareReservedUnused(IOFWCompareAndSwapCommand, 3);
-
-};
-
-/*
- * Send an async stream packet
- */
-
-#pragma mark -
-
-/*! @class IOFWAsyncStreamCommand
-*/
-class IOFWAsyncStreamCommand : public IOFWCommand
-{
-	// temporary for debugging:
-	friend class IOFireWireUserClient ;
-
-	OSDeclareDefaultStructors(IOFWAsyncStreamCommand)
-
-protected:
-    FWAsyncStreamCallback	fComplete;
-    void *					fRefCon;
-    IOMemoryDescriptor 		* fMemDesc;
-    int						fSpeed;
-    int						fSize;
-    int						fCurRetries;
-    int						fMaxRetries;
-    int						fChannel;
-    int						fSyncBits;
-    int						fTag;
-    UInt32					fGeneration;	// bus topology fNodeID is valid for.
-    bool					fFailOnReset;
-
-	typedef struct 
-	{ 	} 
-	MemberVariables;
-
-    MemberVariables * fMembers;		
-	
-    virtual IOReturn	complete(
-    							IOReturn 				status);
-    							
-	// To be called by IOFireWireController and derived classes.
-    virtual IOReturn	execute();
-
-public:
-
-    virtual bool		initAll(
-    							IOFireWireController 	* control,
-                                UInt32 					generation, 
-                                UInt32 					channel,
-                                UInt32 					sync,
-                                UInt32 					tag,
-                                IOMemoryDescriptor 		* hostMem,
-                                UInt32					size,
-                                int						speed,
-                                FWAsyncStreamCallback	completion,
-                                void 					* refcon);
-
-	virtual void free( void );
-
-    virtual IOReturn	reinit(	UInt32 					generation, 
-                                UInt32 					channel,
-                                UInt32 					sync,
-                                UInt32 					tag,
-                                IOMemoryDescriptor 		* hostMem,
-                                UInt32					size,
-                                int						speed,
-                               	FWAsyncStreamCallback	completion,
-                                void 					* refcon);
-								
-    virtual void				gotAck(
-    							int 					ackCode);
-	// Utility for setting generation on newly created command
-	virtual void				setGeneration(
-								UInt32 					generation)
-	{ fGeneration = generation; }
-
- 
-    // update nodeID/generation after bus reset, from the device object
-    IOReturn		updateGeneration();
-    
-    bool		failOnReset() const
-    { return fFailOnReset; }
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFWAsyncStreamCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncStreamCommand, 1);
-
-public:
-    virtual bool		initAll(
-    							IOFireWireController 	* control,
-                                UInt32 					generation, 
-                                UInt32 					channel,
-                                UInt32 					sync,
-                                UInt32 					tag,
-                                IOMemoryDescriptor 		* hostMem,
-                                UInt32					size,
-                                int						speed,
-                                FWAsyncStreamCallback	completion,
-                                void 					* refcon,
-								bool					failOnReset );
-								
-    
-	virtual IOReturn	reinit(
-								UInt32 					generation, 
-                                UInt32 					channel,
-                                UInt32 					sync,
-                                UInt32 					tag,
-                                IOMemoryDescriptor 		* hostMem,
-                                UInt32					size,
-                                int						speed,
-                                FWAsyncStreamCallback 	completion,
-                                void 					* refcon,
-								bool					failOnReset);
-	
-
-};
-
-/*
- * Send an async PHY packet
- */
-
-#pragma mark -
-
-/*! @class IOFWAsyncPHYCommand
-*/
-class IOFWAsyncPHYCommand : public IOFWCommand
-{
-	// temporary for debugging:
-	friend class IOFireWireUserClient;
-
-	OSDeclareDefaultStructors( IOFWAsyncPHYCommand )
-
-protected:
-	AsyncPendingTrans *		fTrans;
-    FWAsyncPHYCallback		fComplete;
-    void *					fRefCon;
-    int						fCurRetries;
-    int						fMaxRetries;
-    UInt32					fGeneration;
-    bool					fFailOnReset;
-	UInt32					fData1;
-	UInt32					fData2;
-	int						fAckCode;
-	UInt32					fResponseCode;
-		
-	typedef struct 
-	{ 	} 
-	MemberVariables;
-
-    MemberVariables * fMembers;		
-	
-    virtual IOReturn	complete(
-    							IOReturn 				status );
-    							
-	// To be called by IOFireWireController and derived classes.
-    virtual IOReturn	execute();
-
-	void setResponseCode( UInt32 rcode );
-	void setAckCode( int ack );
-
-public:
-
-    virtual bool		initAll(
-    							IOFireWireController 	* control,
-                                UInt32 					generation, 
-                                UInt32					data1,
-								UInt32					data2,
-                                FWAsyncPHYCallback		completion,
-                                void 					* refcon,
-								bool 					failOnReset );
-	virtual void free( void );
-
-    virtual IOReturn	reinit(	UInt32 					generation, 
-								UInt32					data1,
-								UInt32					data2,
-                               	FWAsyncPHYCallback		completion,
-                                void 					* refcon,
-								bool 					failOnReset );
-
-    virtual void				gotAck(
-    							int 					ackCode );
-								
-	// Utility for setting generation on newly created command
-	virtual void				setGeneration(
-								UInt32 					generation )
-			{ fGeneration = generation; }
-
- 
-    // update nodeID/generation after bus reset, from the device object
-    IOReturn		updateGeneration();
-    
-    bool		failOnReset() const
-		{ return fFailOnReset; }
-    
-
-	virtual void gotPacket( int rcode  );
-
-	int getAckCode( void );
-	UInt32 getResponseCode( void ) const;
-
-	void setRetries( int retries);
-private:
-    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 0);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 1);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 2);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 3);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 4);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 5);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 6);
-    OSMetaClassDeclareReservedUnused(IOFWAsyncPHYCommand, 7);
-};
-
-#endif /* _IOKIT_IOFWCOMMAND_H */
diff --git a/i386/include/IOKit/firewire/IOFWDCL.h b/i386/include/IOKit/firewire/IOFWDCL.h
deleted file mode 100644
index 8919485..0000000
--- a/i386/include/IOKit/firewire/IOFWDCL.h
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
-*  IOFWDCL.h
-*  IOFireWireFamily
-*
-*  Created by Niels on Fri Feb 21 2003.
-*  Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
-*
-*	$Log: IOFWDCL.h,v $
-*	Revision 1.20  2008/11/14 00:17:11  arulchan
-*	fix for rdar://5939334
-*	
-*	Revision 1.19  2007/03/14 01:01:12  collin
-*	*** empty log message ***
-*	
-*	Revision 1.18  2007/01/26 23:42:19  ayanowit
-*	another fix for nuDCL rosetta mode
-*	
-*	Revision 1.17  2006/08/16 01:41:41  collin
-*	*** empty log message ***
-*	
-*	Revision 1.16  2006/03/09 22:26:46  niels
-*	fix 4466075
-*	
-*	Revision 1.15  2006/03/09 22:20:14  niels
-*	fix 4466075
-*	
-*	Revision 1.14  2006/03/09 21:40:44  niels
-*	fix 4466075
-*	
-*	Revision 1.13  2006/02/09 00:21:50  niels
-*	merge chardonnay branch to tot
-*	
-*	Revision 1.12.4.1  2005/08/06 01:31:31  collin
-*	*** empty log message ***
-*	
-*	Revision 1.12  2005/02/18 03:19:03  niels
-*	fix isight
-*	
-*	Revision 1.11  2004/04/19 21:51:49  niels
-*	*** empty log message ***
-*	
-*	Revision 1.10  2004/03/25 00:00:23  niels
-*	fix panic allocating large physical address spaces
-*	
-*	Revision 1.9  2003/10/31 02:40:58  niels
-*	*** empty log message ***
-*	
-*	Revision 1.8  2003/08/26 05:11:21  niels
-*	*** empty log message ***
-*	
-*	Revision 1.7  2003/08/25 08:39:15  niels
-*	*** empty log message ***
-*	
-*	Revision 1.6  2003/08/18 23:18:14  niels
-*	*** empty log message ***
-*	
-*	Revision 1.5  2003/08/08 22:30:32  niels
-*	*** empty log message ***
-*	
-*	Revision 1.4  2003/07/30 05:22:14  niels
-*	*** empty log message ***
-*	
-*	Revision 1.3  2003/07/29 22:49:22  niels
-*	*** empty log message ***
-*	
-*	Revision 1.2  2003/07/21 06:52:58  niels
-*	merge isoch to TOT
-*	
-*	Revision 1.1.2.5  2003/07/18 00:17:41  niels
-*	*** empty log message ***
-*	
-*	Revision 1.1.2.4  2003/07/14 22:08:53  niels
-*	*** empty log message ***
-*	
-*	Revision 1.1.2.3  2003/07/11 18:15:33  niels
-*	*** empty log message ***
-*	
-*	Revision 1.1.2.2  2003/07/03 22:10:24  niels
-*	fix iidc/dv rcv
-*	
-*	Revision 1.1.2.1  2003/07/01 20:54:06  niels
-*	isoch merge
-*	
-*/
-
-#import <IOKit/firewire/IOFireWireFamilyCommon.h>
-
-#import <libkern/c++/OSObject.h>
-#import <libkern/c++/OSSet.h>
-#import <IOKit/IOTypes.h>
-
-class IODCLProgram ;
-class OSIterator ;
-class IOFireWireLink ;
-class IOMemoryMap ;
-
-/*! @class IOFWDCL
-*/
-
-class IOFWDCL : public OSObject
-{
-	OSDeclareAbstractStructors( IOFWDCL ) ;
-	
-	public:
-	
-		typedef void (*Callback)( void * refcon ) ;
-
-		enum
-		{
-			kDynamic					= BIT(1)//kNuDCLDynamic,
-			,kUpdateBeforeCallback		= BIT(2)//kNuDCLUpdateBeforeCallback
-			,kUser						= BIT(18) // kNuDCLUser
-			,kBigEndianUpdates			= BIT(19) // NOTE: Don't change this without making similar change to IOFireWireLib's NuDCL::Export(...)!
-		} ;
-
-		class InternalData 
-		{
-			public:
-			
-				IOFWDCL *			lastBranch ;
-		} ;
-
-	protected:
-		
-		IOFWDCL*			fBranch ;
-		Callback			fCallback ;
-		volatile UInt32 *	fTimeStampPtr ;
-		UInt32				fRangeCount ;
-		IOVirtualRange *	fRanges ;
-		OSSet*				fUpdateList ;
-		OSIterator *		fUpdateIterator ;
-		volatile UInt32 *	fUserStatusPtr ;
-		void*				fRefcon ;
-		UInt32				fFlags ;
-		
-		InternalData *		fLoLevel ;
-
-	public:
-
-		//
-		// IOFWDCL public API:
-		//
-		
-		virtual bool		initWithRanges ( 
-											OSSet * 				updateSet, 
-											unsigned 				rangesCount = 0, 
-											IOVirtualRange 			ranges [] = NULL ) ;
-
-		void				setBranch( IOFWDCL* branch ) ;
-		IOFWDCL*			getBranch()	const ;
-		void				setTimeStampPtr ( UInt32* timeStampPtr ) ;
-		UInt32*				getTimeStampPtr () const ;
-		void				setCallback( Callback callback ) ;
-		Callback			getCallback() const ;
-		void				setStatusPtr( UInt32* statusPtr ) ;
-		UInt32*				getStatusPtr() const ;
-		void				setRefcon( void * refcon ) ;
-		void *				getRefcon() const ;
-		const OSSet*		getUpdateList() const ;
-		
-		virtual IOReturn	addRange ( IOVirtualRange& range ) ;
-		virtual IOReturn	setRanges ( UInt32 numRanges, IOVirtualRange ranges[] ) ;
-		virtual UInt32		getRanges( UInt32 maxRanges, IOVirtualRange ranges[] ) const ;
-		virtual UInt32		countRanges() ;
-		virtual IOReturn	getSpan( IOVirtualRange& result ) const ;
-		virtual IOByteCount	getSize() const ;
-		IOReturn			appendUpdateList( IOFWDCL* updateDCL ) ;
-		IOReturn			setUpdateList( OSSet* updateList ) ;
-		void				emptyUpdateList() ; 
-		void				setFlags( UInt32 flags ) ;
-		UInt32				getFlags() const ;
-		
-
-		virtual void		update() = 0 ;
-
-		// OSObject
-		
-		virtual void		free () ;
-		
-	public:
-		
-		//
-		// internal use only; please don't use... 
-		//
-		
-		virtual IOReturn				compile( IODCLProgram & , bool & ) = 0 ;
-		virtual void					link () = 0 ;
-
-		OSMetaClassDeclareReservedUnused ( IOFWDCL, 4 ) ;		// used to be relink()
-
-	public :
-		virtual bool					interrupt( bool &, IOFWDCL * & ) = 0 ;
-		virtual void					finalize ( IODCLProgram & ) ;
-		virtual IOReturn				importUserDCL (
-														UInt8 *				data,
-														IOByteCount &		dataSize,
-														IOMemoryMap *		bufferMap,
-														const OSArray *		dcl ) ;
-			
-	protected :
-	
-		friend class IOFWDCLFriend ;
-		
-	public :
-	
-		// dump DCL info...
-		virtual void					debug() ;
-
-	public:
-		
-		//
-		// internal use only; please don't use... 
-		//
-		
-		virtual bool					checkForInterrupt() = 0 ;
-
-    OSMetaClassDeclareReservedUsed ( IOFWDCL, 0 ) ;
-    OSMetaClassDeclareReservedUnused ( IOFWDCL, 1 ) ;
-    OSMetaClassDeclareReservedUnused ( IOFWDCL, 2 ) ;
-    OSMetaClassDeclareReservedUnused ( IOFWDCL, 3 ) ;
-//	OSMetaClassDeclareReservedUnused ( ***, 4 ) ;			// used above
-
-} ;
-
-#pragma mark -
-
-/*! @class IOFWReceiveDCL
-*/
-
-class IOFWReceiveDCL : public IOFWDCL
-{
-	OSDeclareAbstractStructors( IOFWReceiveDCL )
-
-	protected :
-	
-		UInt8		fHeaderBytes ;
-		bool		fWait ;
-	
-	public:
-
-		// me
-		virtual bool		initWithParams( 
-											OSSet *				updateSet, 
-											UInt8				headerBytes, 
-											unsigned			rangesCount, 
-											IOVirtualRange		ranges [] ) ;	
-		IOReturn			setWaitControl( bool wait ) ;
-
-	public :
-
-		// internal use only:
-		virtual IOReturn				importUserDCL (
-														UInt8 *				data,
-														IOByteCount &		dataSize,
-														IOMemoryMap *		bufferMap,
-														const OSArray *		dcl ) ;
-	
-	protected :
-	
-		virtual void		debug() ;
-
-} ;
-
-#pragma mark -
-
-/*! @class IOFWSendDCL
-*/
-
-class IOFWSendDCL : public IOFWDCL
-{
-	OSDeclareAbstractStructors( IOFWSendDCL )
-
-	protected:
-	
-		UInt32 * 	fUserHeaderPtr ;			// pointer to 2 quadlets containing isoch header for this packet
-		UInt32 *	fUserHeaderMaskPtr ;		// pointer to 2 quadlets; used to mask header quadlets
-		IOFWDCL *	fSkipBranchDCL ;
-		Callback	fSkipCallback ;
-		void *		fSkipRefcon ;
-		UInt8		fSync ;
-		UInt8		fTag ;
-
-	public:
-
-		// OSObject
-		virtual void		free() ;
-		
-		// IOFWDCL
-		virtual IOReturn	addRange ( IOVirtualRange& range ) ;
-		virtual IOReturn	setRanges ( UInt32 numRanges, IOVirtualRange ranges[] ) ;
-
-		// me
-		virtual bool		initWithParams( OSSet * 				updateSet, 
-											unsigned 				rangesCount = 0, 
-											IOVirtualRange 			ranges [] = NULL,
-											UInt8					sync = 0,
-											UInt8					tag = 0 ) ;
-		
-		void				setUserHeaderPtr( UInt32* userHeaderPtr, UInt32 * maskPtr ) ;
-		UInt32 *			getUserHeaderPtr() ;
-		UInt32 *			getUserHeaderMask() ;
-		void				setSkipBranch( IOFWDCL * skipBranchDCL ) ;
-		IOFWDCL *			getSkipBranch() const ;
-		void				setSkipCallback( Callback callback ) ;
-		Callback			getSkipCallback() const ;
-		void				setSkipRefcon( void * refcon = 0 ) ;
-		void *				getSkipRefcon() const ;										
-		void				setSync( UInt8 sync ) ;
-		UInt8				getSync() const ;												
-		void				setTag( UInt8 tag ) ;											
-		UInt8				getTag() const ;
-
-	public :
-	
-		// internal use only:
-		virtual IOReturn				importUserDCL (
-														UInt8 *				data,
-														IOByteCount &		dataSize,
-														IOMemoryMap *		bufferMap,
-														const OSArray *		dcl ) ;
-	protected :
-	
-		virtual void		debug() ;
-} ;
-
-#pragma mark -
-
-/*! @class IOFWSkipCycleDCL
-*/
-
-class IOFWSkipCycleDCL : public IOFWDCL
-{
-	OSDeclareAbstractStructors( IOFWSkipCycleDCL )
-
-	public:
-	
-		virtual bool		init() ;
-		
-		virtual IOReturn	addRange ( IOVirtualRange& range ) ;
-		virtual IOReturn	setRanges ( UInt32 numRanges, IOVirtualRange ranges[] ) ;
-		virtual IOReturn	getSpan( IOVirtualRange& result ) ;
-
-	protected :
-	
-		virtual void		debug() ;
-} ;
diff --git a/i386/include/IOKit/firewire/IOFWDCLPool.h b/i386/include/IOKit/firewire/IOFWDCLPool.h
deleted file mode 100644
index 005b62a..0000000
--- a/i386/include/IOKit/firewire/IOFWDCLPool.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- *  IOFWNuDCLPool.h
- *  IOFireWireFamily
- *
- *  Created by Niels on Fri Mar 07 2003.
- *  Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
- *
- *	$Log: IOFWDCLPool.h,v $
- *	Revision 1.15  2008/11/14 00:17:12  arulchan
- *	fix for rdar://5939334
- *	
- *	Revision 1.14  2008/03/03 23:31:42  ayanowit
- *	another gcc-42 fix.
- *	
- *	Revision 1.13  2007/01/26 20:52:31  ayanowit
- *	changes to user-space isoch stuff to support 64-bit apps.
- *	
- *	Revision 1.12  2006/02/09 00:21:50  niels
- *	merge chardonnay branch to tot
- *	
- *	Revision 1.11  2005/04/12 20:09:13  niels
- *	fix memory leak importing NuDCL programs from user space
- *	
- *	Revision 1.10.20.2  2006/01/31 04:49:50  collin
- *	*** empty log message ***
- *	
- *	Revision 1.10  2003/11/07 21:24:28  niels
- *	*** empty log message ***
- *	
- *	Revision 1.9  2003/11/07 21:01:18  niels
- *	*** empty log message ***
- *	
- *	Revision 1.8  2003/08/25 08:39:15  niels
- *	*** empty log message ***
- *	
- *	Revision 1.7  2003/08/22 18:15:16  niels
- *	*** empty log message ***
- *	
- *	Revision 1.6  2003/08/15 04:36:55  niels
- *	*** empty log message ***
- *	
- *	Revision 1.5  2003/07/30 05:22:14  niels
- *	*** empty log message ***
- *	
- *	Revision 1.4  2003/07/21 08:48:20  niels
- *	*** empty log message ***
- *	
- *	Revision 1.3  2003/07/21 07:52:13  niels
- *	*** empty log message ***
- *	
- *	Revision 1.2  2003/07/21 06:52:58  niels
- *	merge isoch to TOT
- *	
- *	Revision 1.1.2.3  2003/07/11 18:15:34  niels
- *	*** empty log message ***
- *	
- *	Revision 1.1.2.2  2003/07/09 21:24:00  niels
- *	*** empty log message ***
- *	
- *	Revision 1.1.2.1  2003/07/01 20:54:06  niels
- *	isoch merge
- *	
- */
-
-#import <libkern/c++/OSObject.h>
-#import <libkern/c++/OSArray.h>
-#import <IOKit/IOTypes.h>
-
-class IOFireWireLink ;
-class IOFWDCL ;
-class IOFWReceiveDCL ;
-class IOFWSendDCL ;
-class IOFWSkipCycleDCL ;
-class IOFireWireUserClient ;
-class IOMemoryDescriptor ;
-class IOMemoryMap ;
-class OSSet;
-
-/*! @class IOFWDCLPool
-	@discussion You should never subclass IOFWDCLPool 
-*/
-
-class IOFWDCLPool : public OSObject
-{
-	OSDeclareAbstractStructors( IOFWDCLPool )
-
-	friend class IOFireWireUserClient ;
-	friend class IOFWUserLocalIsochPort ;
-	
-	protected:
-	
-		class Expansion*		fReserved ;		// for class expansion
-
-		IOFireWireLink *		fLink ;
-		UInt8					fCurrentTag ;
-		UInt8					fCurrentSync ;
-		OSArray*				fProgram ;
-		DCLNuDCLLeader			fLeader ;
-	
-	public:
-		
-		// OSObject
-		
-		virtual void						free() ;
-		
-		// me
-		
-		virtual bool	 					initWithLink ( IOFireWireLink& link, UInt32 capacity ) ;
-		
-		virtual void						setCurrentTagAndSync ( UInt8 tag, UInt8 sync ) ;
-		
-		virtual IOFWReceiveDCL*				appendReceiveDCL ( 
-													OSSet * 				updateSet, 
-													UInt8 					headerBytes,
-													UInt32					rangesCount,
-													IOVirtualRange			ranges[] ) ;
-		virtual IOFWSendDCL*				appendSendDCL ( 
-													OSSet * 				updateSet, 
-													UInt32					rangesCount,
-													IOVirtualRange			ranges[] ) ;
-		virtual IOFWSkipCycleDCL*			appendSkipCycleDCL () ;
-		virtual const OSArray *				getProgramRef () const ;
-		
-	protected :
-	
-		IOReturn							importUserProgram (
-													IOMemoryDescriptor *	userExportDesc,
-													unsigned				bufferRangeCount,
-													IOAddressRange			bufferRanges[],
-													IOMemoryMap *			bufferMap ) ;
-		IOReturn							importUserDCL(
-													IOFWDCL *				dcl,
-													void * 					importData,
-													IOByteCount &			dataSize,
-													IOMemoryMap *			bufferMap ) ;
-													
-
-	protected :
-	
-		virtual IOFWReceiveDCL *			allocReceiveDCL () = 0 ;
-		virtual IOFWSendDCL *				allocSendDCL () = 0 ;
-		virtual IOFWSkipCycleDCL *			allocSkipCycleDCL () = 0 ;
-
-	private :
-	
-		void								appendDCL( IOFWDCL * dcl ) ;
-
-	public :
-	
-		DCLCommand *						getProgram() ;
-													
-    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 0);
-    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 1);
-    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 2);
-    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 3);
-    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 4);
-    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 5);
-    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 6);
-    OSMetaClassDeclareReservedUnused ( IOFWDCLPool, 7);		
-} ;
diff --git a/i386/include/IOKit/firewire/IOFWDCLProgram.h b/i386/include/IOKit/firewire/IOFWDCLProgram.h
deleted file mode 100644
index cf91f06..0000000
--- a/i386/include/IOKit/firewire/IOFWDCLProgram.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOFWDCLPROGRAM_H
-#define _IOKIT_IOFWDCLPROGRAM_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-#include <IOKit/firewire/IOFireWireBus.h>
-#include <IOKit/IOMemoryCursor.h>
-
-/*! @class IODCLProgram
-*/
-class IODCLProgram : public OSObject
-{
-    OSDeclareAbstractStructors(IODCLProgram)
-
-	private :	
-	
-		void * 						reserved0 ;//fDCLTaskToKernel;
-		void * 						reserved1 ;//fDataTaskToKernel;
-		void *		 				reserved2 ;//fDataBase;
-		void *		 				reserved3 ;//		IOMemoryDescriptor *		fDCLDesc;
-		IOMemoryMap *				fBufferMem ;
-		void *		 				reserved5 ;//		IOMemoryCursor *			fDataCursor;
-
-	protected:
-	
-	/*! @struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-		*/    
-		struct ExpansionData 
-		{
-			IOFWIsochResourceFlags		resourceFlags ;
-		};
-		
-	/*! @var reserved
-		Reserved for future use.  (Internal use only)  */
-		ExpansionData *					fExpansionData ;
-	
-	public :
-	
-		virtual void			setIsochResourceFlags ( IOFWIsochResourceFlags flags ) ;	// formerly getPhysicalSegs()
-		IOFWIsochResourceFlags	getIsochResourceFlags () const ;
-		
-	protected:
-	
-		virtual void 			free () ;
-	
-	public:
-	
-		virtual bool 			init ( IOFireWireBus::DCLTaskInfo * info = NULL ) ;
-		virtual IOReturn 		allocateHW (
-										IOFWSpeed 			speed, 
-										UInt32 				chan) = 0;
-		virtual IOReturn 		releaseHW () = 0;
-		virtual IOReturn 		compile (
-										IOFWSpeed 			speed, 
-										UInt32 				chan) = 0;
-		virtual IOReturn 		notify (
-												IOFWDCLNotificationType		notificationType,
-												DCLCommand ** 				dclCommandList, 
-												UInt32 						numDCLCommands ) = 0;
-		virtual IOReturn 		start () = 0;
-		virtual void 			stop () = 0;
-		virtual IOReturn 		pause ();
-		virtual IOReturn 		resume ();
-				
-		virtual void			setForceStopProc( 
-												IOFWIsochChannel::ForceStopNotificationProc proc, 
-												void * 						refCon,
-												IOFWIsochChannel *			channel ) ;
-	protected :
-	
-		void					generateBufferMap( DCLCommand * program ) ;
-		IOReturn				virtualToPhysical( 
-												IOVirtualRange						ranges[], 
-												unsigned							rangeCount, 
-												IOMemoryCursor::IOPhysicalSegment	outSegments[], 
-												unsigned &							outPhysicalSegmentCount, 
-												unsigned							maxSegments ) ;
-
-	public :
-	
-		IOMemoryMap *			getBufferMap() const ;
-
-	public :
-	
-		// close/open isoch workloop gate...
-		// clients should not need to call these.
-		virtual void			closeGate() = 0 ;
-		virtual void			openGate() = 0 ;
-
-		virtual IOReturn		synchronizeWithIO() = 0 ;
-		
-	private:
-	
-		OSMetaClassDeclareReservedUsed(IODCLProgram, 0);
-		OSMetaClassDeclareReservedUsed(IODCLProgram, 1);
-		OSMetaClassDeclareReservedUnused(IODCLProgram, 2);
-		OSMetaClassDeclareReservedUnused(IODCLProgram, 3);
-		OSMetaClassDeclareReservedUnused(IODCLProgram, 4);
-	
-};
-
-#endif /* ! _IOKIT_IOFWDCLPROGRAM_H */
-
diff --git a/i386/include/IOKit/firewire/IOFWDCLTranslator.h b/i386/include/IOKit/firewire/IOFWDCLTranslator.h
deleted file mode 100644
index e02067c..0000000
--- a/i386/include/IOKit/firewire/IOFWDCLTranslator.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
- *
- * A DCL program to interpret (in software) a program that's too complicated
- * for the DMA engine.
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOFWDCLTRANSLATOR_H
-#define _IOKIT_IOFWDCLTRANSLATOR_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/firewire/IOFWDCLProgram.h>
-
-
-/*! @class IODCLTranslator
-*/
-
-class IODCLTranslator : public IODCLProgram
-{
-    OSDeclareAbstractStructors(IODCLTranslator)
-
-protected:
-    enum
-    {
-        kNumPingPongs				= 2,
-        kNumPacketsPerPingPong		= 500,
-        kMaxIsochPacketSize			= 1000,
-        kPingPongBufferSize			= kNumPingPongs * kNumPacketsPerPingPong * kMaxIsochPacketSize
-    };
-
-    // Opcodes and buffer for pingpong program
-    DCLLabel			fStartLabel;
-    DCLTransferPacket	fTransfers[kNumPingPongs*kNumPacketsPerPingPong];
-    DCLCallProc			fCalls[kNumPingPongs];
-    DCLJump				fJumpToStart;
-    UInt8				fBuffer[kPingPongBufferSize];
-
-    IODCLProgram *		fHWProgram;				// Hardware program executing our opcodes
-    DCLCommand*			fToInterpret;			// The commands to interpret
-    DCLCommand*			fCurrentDCLCommand;		// Current command to interpret
-    int					fPingCount;				// Are we pinging or ponging?
-    UInt32				fPacketHeader;
-
-    static void ListeningDCLPingPongProc(DCLCommand* pDCLCommand);
-    static void TalkingDCLPingPongProc(DCLCommand* pDCLCommand);
-
-public:
-    virtual bool init(DCLCommand* toInterpret);
-    virtual IOReturn allocateHW(IOFWSpeed speed, UInt32 chan);
-    virtual IOReturn releaseHW();
-    virtual IOReturn notify(IOFWDCLNotificationType notificationType,
-	DCLCommand** dclCommandList, UInt32 numDCLCommands);
-    virtual void stop();
-
-    DCLCommand* getTranslatorOpcodes();
-    void setHWProgram(IODCLProgram *program);
-};
-
-/*! @class IODCLTranslateTalk
-*/
-
-class IODCLTranslateTalk : public IODCLTranslator
-{
-    OSDeclareDefaultStructors(IODCLTranslateTalk)
-
-protected:
-
-public:
-    virtual IOReturn compile(IOFWSpeed speed, UInt32 chan);
-    virtual IOReturn start();
-
-};
-
-/*! @class IODCLTranslateListen
-*/
-
-class IODCLTranslateListen : public IODCLTranslator
-{
-    OSDeclareDefaultStructors(IODCLTranslateListen)
-
-protected:
-
-public:
-    virtual IOReturn compile(IOFWSpeed speed, UInt32 chan);
-    virtual IOReturn start();
-
-};
-#endif /* ! _IOKIT_IOFWDCLPROGRAM_H */
-
diff --git a/i386/include/IOKit/firewire/IOFWIsochChannel.h b/i386/include/IOKit/firewire/IOFWIsochChannel.h
deleted file mode 100644
index 4bbd6c8..0000000
--- a/i386/include/IOKit/firewire/IOFWIsochChannel.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOFWISOCHCHANNEL_H
-#define _IOKIT_IOFWISOCHCHANNEL_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-
-enum
-{
-    kFWIsochChannelUnknownCondition	= 0,
-    kFWIsochChannelNotEnoughBandwidth	= 1,
-    kFWIsochChannelChannelNotAvailable	= 2
-};
-
-class IOFireWireController;
-class IOFWIsochChannel;
-class IOFWIsochPort;
-class OSSet;
-class IOFWReadQuadCommand;
-class IOFWCompareAndSwapCommand;
-
-/*! @class IOFWIsochChannel
-*/
-class IOFWIsochChannel : public OSObject
-{
-    OSDeclareDefaultStructors(IOFWIsochChannel)
-
-	public:
-
-		typedef IOReturn (ForceStopNotificationProc)(void* refCon, IOFWIsochChannel* channel, UInt32 stopCondition );
-
-protected:
-    IOFireWireController *			fControl;
-    ForceStopNotificationProc* 		fStopProc;
-    void *							fStopRefCon;
-    IOFWIsochPort *					fTalker;
-    OSSet *							fListeners;
-    bool							fDoIRM;
-    UInt32							fBandwidth;	// Allocation units used
-    UInt32							fPacketSize;
-    IOFWSpeed						fPrefSpeed;
-    IOFWSpeed						fSpeed;		// Actual speed used
-    UInt32							fChannel;	// Actual channel used
-    IOFWReadQuadCommand *			fReadCmd;
-    IOFWCompareAndSwapCommand *		fLockCmd;
-    UInt32							fGeneration;	// When bandwidth was allocated
-    
-	IOLock *		fLock;
-	
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-    static void					threadFunc( void * arg );
-    
-    virtual IOReturn			updateBandwidth(bool claim);
-    virtual void				reallocBandwidth( UInt32 generation );	
-    virtual void				free();
-
-public:
-    // Called from IOFireWireController
-    virtual bool 				init( IOFireWireController *control, bool doIRM, UInt32 packetSize, 
-										IOFWSpeed prefSpeed, ForceStopNotificationProc* stopProc,
-										void *stopRefCon );
-    virtual void 				handleBusReset();
-
-    // Called by clients
-    virtual IOReturn 			setTalker(IOFWIsochPort *talker);
-    virtual IOReturn 			addListener(IOFWIsochPort *listener);
-
-    virtual IOReturn 			allocateChannel();
-    virtual IOReturn 			releaseChannel();
-    virtual IOReturn 			start();
-    virtual IOReturn 			stop();
-
-protected:
-	// handles IRM and channel determination and allocation.
-	// called by both user and kernel isoch channels
-	IOReturn					allocateChannelBegin( IOFWSpeed speed, UInt64 allowedChans, UInt32 * channel = NULL ) ;
-
-	// handles IRM and channel allocation.
-	// called by both user and kernel isoch channels
-	IOReturn					releaseChannelComplete() ;
-
-	IOReturn	checkMemoryInRange( IOMemoryDescriptor * memory );
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFWIsochChannel, 0);
-    OSMetaClassDeclareReservedUnused(IOFWIsochChannel, 1);
-    OSMetaClassDeclareReservedUnused(IOFWIsochChannel, 2);
-    OSMetaClassDeclareReservedUnused(IOFWIsochChannel, 3);
-
-};
-
-typedef IOFWIsochChannel::ForceStopNotificationProc 	FWIsochChannelForceStopNotificationProc ;
-typedef IOFWIsochChannel::ForceStopNotificationProc* 	FWIsochChannelForceStopNotificationProcPtr ;
-
-#endif /* ! _IOKIT_IOFWISOCHCHANNEL_H */
-
diff --git a/i386/include/IOKit/firewire/IOFWIsochPort.h b/i386/include/IOKit/firewire/IOFWIsochPort.h
deleted file mode 100644
index 793c5e9..0000000
--- a/i386/include/IOKit/firewire/IOFWIsochPort.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
- *
- * IOFWIsochPort is an abstract object that represents hardware on the bus
- * (locally or remotely) that sends or receives isochronous packets.
- * Local ports are implemented by the local device driver,
- * Remote ports are implemented by the driver for the remote device.
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOFWISOCHPORT_H
-#define _IOKIT_IOFWISOCHPORT_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-
-/*! @class IOFWIsochPort
-*/
-
-class IOFWIsochPort : public OSObject
-{
-    OSDeclareAbstractStructors(IOFWIsochPort)
-
-public:
-	// Return maximum speed and channels supported
-	// (bit n set = chan n supported)
-    virtual IOReturn getSupported(IOFWSpeed &maxSpeed, UInt64 &chanSupported) = 0;
-
-	// Allocate hardware resources for port
-    virtual IOReturn allocatePort(IOFWSpeed speed, UInt32 chan) = 0;
-    virtual IOReturn releasePort() = 0;		// Free hardware resources
-    virtual IOReturn start() = 0;		// Start port processing packets
-    virtual IOReturn stop() = 0;		// Stop processing packets
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFWIsochPort, 0);
-    OSMetaClassDeclareReservedUnused(IOFWIsochPort, 1);
-
-};
-
-#endif /* ! _IOKIT_IOFWISOCHPORT_H */
-
diff --git a/i386/include/IOKit/firewire/IOFWLocalIsochPort.h b/i386/include/IOKit/firewire/IOFWLocalIsochPort.h
deleted file mode 100644
index 493f719..0000000
--- a/i386/include/IOKit/firewire/IOFWLocalIsochPort.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
- *
- * IOFWIsochPort is an abstract object that represents hardware on the bus
- * (locally or remotely) that sends or receives isochronous packets.
- * Local ports are implemented by the local device driver,
- * Remote ports are implemented by the driver for the remote device.
- *
- * HISTORY
- *
- * $Log: IOFWLocalIsochPort.h,v $
- * Revision 1.10  2004/06/10 20:57:36  niels
- * *** empty log message ***
- *
- * Revision 1.9  2003/08/30 00:16:44  collin
- * *** empty log message ***
- *
- * Revision 1.8  2003/08/15 04:36:55  niels
- * *** empty log message ***
- *
- * Revision 1.7  2003/07/29 22:49:22  niels
- * *** empty log message ***
- *
- * Revision 1.6  2003/07/21 06:52:58  niels
- * merge isoch to TOT
- *
- * Revision 1.5.14.1  2003/07/01 20:54:07  niels
- * isoch merge
- *
- */
-
-
-#ifndef _IOKIT_IOFWLOCALISOCHPORT_H
-#define _IOKIT_IOFWLOCALISOCHPORT_H
-
-#import <IOKit/firewire/IOFireWireFamilyCommon.h>
-#import <IOKit/firewire/IOFWIsochPort.h>
-
-class IOFireWireController;
-class IODCLProgram;
-
-/*! @class IOFWLocalIsochPort
-*/
-class IOFWLocalIsochPort : public IOFWIsochPort
-{
-    OSDeclareDefaultStructors(IOFWLocalIsochPort)
-
-	protected:
-	
-		IOFireWireController *	fControl;
-		IODCLProgram *			fProgram;
-	
-	/*! @struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-		*/    
-		struct ExpansionData
-		{
-		} ;
-	
-		ExpansionData *			fExpansion ;
-
-	protected :
-	
-		virtual void 			free ( void ) ;
-
-	public:
-	
-		virtual bool 			init (
-										IODCLProgram *			program, 
-										IOFireWireController *	control ) ;
-	
-		// Return maximum speed and channels supported
-		// (bit n set = chan n supported)
-		virtual IOReturn 		getSupported (
-										IOFWSpeed &				maxSpeed, 
-										UInt64 &				chanSupported ) ;
-	
-		// Allocate hardware resources for port
-		virtual IOReturn 		allocatePort (
-										IOFWSpeed 				speed, 
-										UInt32 					chan ) ;
-		virtual IOReturn 		releasePort ( void ) ;	// Free hardware resources
-		virtual IOReturn 		start ( void ) ;		// Start port processing packets
-		virtual IOReturn 		stop ( void ) ;		// Stop processing packets
-	
-		/*! @function notify
-			@abstract Informs hardware of a change to the DCL program.
-			@param notificationType Type of change.
-			@param dclCommandList List of DCL commands that have been changed.
-			@param numDCLCommands Number of commands in list.
-			@result IOKit error code. */
-		virtual IOReturn 		notify(
-										IOFWDCLNotificationType 	notificationType,
-										DCLCommand ** 				dclCommandList, 
-										UInt32 						numDCLCommands ) ;
-		static void				printDCLProgram (
-										const DCLCommand *		dcl,
-										UInt32					count = 0,
-										void (*printFN)( const char *format, ...) = NULL,
-										unsigned				lineDelayMS = 0 ) ;
-		IOReturn				setIsochResourceFlags (
-										IOFWIsochResourceFlags	flags ) ;
-		IODCLProgram *			getProgramRef() const ;
-
-		IOReturn				synchronizeWithIO() ;
-
-	private:
-
-		OSMetaClassDeclareReservedUnused ( IOFWLocalIsochPort, 0 ) ;
-		OSMetaClassDeclareReservedUnused ( IOFWLocalIsochPort, 1 ) ;
-};
-
-#endif /* ! _IOKIT_IOFWLOCALISOCHPORT_H */
-
diff --git a/i386/include/IOKit/firewire/IOFWPHYPacketListener.h b/i386/include/IOKit/firewire/IOFWPHYPacketListener.h
deleted file mode 100644
index ea2c6ff..0000000
--- a/i386/include/IOKit/firewire/IOFWPHYPacketListener.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2007 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-#ifndef _IOFWPHYPACKETLISTENER_H_
-#define _IOFWPHYPACKETLISTENER_H_
-
-#include <libkern/c++/OSObject.h>
-
-class IOFireWireController;
-
-// Callback when phy packet is received
-typedef void (*FWPHYPacketCallback)( void *refcon, UInt32 data1, UInt32 data2 );
-
-/*! @class IOFWPHYPacketListener
-*/
-
-class IOFWPHYPacketListener : public OSObject
-{
-	OSDeclareDefaultStructors( IOFWPHYPacketListener );
-
-	friend class IOFireWireController;
-	
-protected:
-	
-	IOFireWireController *		fControl;
-	FWPHYPacketCallback			fCallback;
-	void *						fRefCon;
-
-	static IOFWPHYPacketListener * createWithController( IOFireWireController * controller );
-
-    virtual bool initWithController( IOFireWireController * control );
-    virtual void free( void );
-
-public:
-
-	virtual IOReturn activate( void );
-	virtual void deactivate( void );
-
-	virtual void setCallback( FWPHYPacketCallback callback );
-	virtual void setRefCon( void * refcon );
-	virtual void * getRefCon( void );
-
-protected:
-	virtual void processPHYPacket( UInt32 data1, UInt32 data2 );
-
-    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 0 );
-    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 1 );
-    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 2 );
-    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 3 );
-    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 4 );
-    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 5 );
-    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 6 );
-    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 7 );
-    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 8 );
-    OSMetaClassDeclareReservedUnused( IOFWPHYPacketListener, 9 );
-};
-
-#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/firewire/IOFWPhysicalAddressSpace.h b/i386/include/IOKit/firewire/IOFWPhysicalAddressSpace.h
deleted file mode 100644
index b1944f4..0000000
--- a/i386/include/IOKit/firewire/IOFWPhysicalAddressSpace.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-#ifndef _IOKIT_IOFWPHYSICALADDRESSSPACE_H
-#define _IOKIT_IOFWPHYSICALADDRESSSPACE_H
-
-#include <IOKit/firewire/IOFWAddressSpace.h>
-#include <IOKit/IODMACommand.h>
-
-/*
- * Direct physical memory <-> FireWire address.
- * Accesses to these addresses may be handled automatically by the
- * hardware without notification.
- *
- * The 64 bit FireWire address of (32 bit) physical addr xxxx:xxxx is hostNode:0000:xxxx:xxxx
- */
-
-class IOFWPhysicalAddressSpace;
-
-struct FWSegment
-{
-	FWAddress	address;
-	UInt32		length;
-};
-
-#pragma mark -
-
-/*! 
-	@class IOFWPhysicalAddressSpaceAux
-*/
-
-class IOFWPhysicalAddressSpaceAux : public IOFWAddressSpaceAux
-{
-    OSDeclareDefaultStructors(IOFWPhysicalAddressSpaceAux)
-
-	friend class IOFWAddressSpace;
-	friend class IOFWPhysicalAddressSpace;
-	
-protected:
-	
-	/*! 
-		@struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-    */  
-	  
-    struct ExpansionData { };
-
-	/*! 
-		@var reserved
-		Reserved for future use.  (Internal use only)  
-	*/
-    
-	ExpansionData *reserved;
-	
-	IODMACommand *	fDMACommand;
-	bool			fDMACommandPrepared;
-	
-public:
-    virtual bool init( IOFWAddressSpace * primary );
-	virtual	void free();
-
-	void setDMACommand( IODMACommand * dma_command );
-	IODMACommand * getDMACommand( void ); 
-	UInt64 getPhysicalSegment( UInt64 offset, UInt64 * length );
-	
-	IOReturn prepare( void );
-	IOReturn synchronize( IOOptionBits options );
-	IOReturn complete( void );
-
-	bool isPrepared( void );
-
-	IOReturn getSegments( UInt64 * offset, FWSegment * fw_segments, UInt32 * num_segments );
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 0);
-    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 1);
-    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 2);
-    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 3);
-    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 4);
-    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 5);
-    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 6);
-    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 7);
-    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 8);
-    OSMetaClassDeclareReservedUnused(IOFWPhysicalAddressSpaceAux, 9);
-	
-};
-
-#pragma mark -
-
-/*! 
-	@class IOFWPhysicalAddressSpace
-*/
-
-class IOFWPhysicalAddressSpace : public IOFWAddressSpace
-{
-    OSDeclareDefaultStructors(IOFWPhysicalAddressSpace)
-
-	friend class IOFWPhysicalAddressSpaceAux;
-
-protected:
-    
-	IOMemoryDescriptor *	fMem;	// unused
-    vm_size_t				fLen;	// unused
-	
-    virtual	void 					free();
-
-public:
-
-/*!	@function	init
-	@abstract	Initialize physical address space.
-	@param		bus	Points to IOFireWireBus object.
-	@result		returns true if success, else false */
-	virtual bool init( IOFireWireBus * bus );
-	
-/*!	@function	initWithDesc
-	@abstract	Initialize physical address space with IOMemoryDescriptor.
-	@param		bus	Points to IOFireWireBus object.
-	@param		mem	Points to IOMemoryDescriptor.
-	@result		returns true if success, else false */
-    virtual bool initWithDesc(IOFireWireBus *bus,
-                                        IOMemoryDescriptor *mem);
-
-/*!	@function	doRead
-	@abstract	A method for processing an address space read request
-	@param		nodeID	FireWire Read from nodeID.
-	@param		speed	at this 'speed'.
-	@param		addr	with FireWire address 'addr'.
-	@param		len		read 'len' bytes from nodeID.
-	@param		buf		points to a memory descriptor containing the packet data.
-	@param		offset	start from this 'offset' in 'buf'.
-	@param		refcon  Can be queried for extra info about the request.
-	@result		UIn32	returns kFWResponseComplete on success */
-    virtual UInt32 doRead(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len, 
-							IOMemoryDescriptor **buf, IOByteCount * offset,
-							IOFWRequestRefCon refcon);
-
-/*!	@function	doWrite
-	@abstract	A method for processing an address space write request
-	@param		nodeID	FireWire Write to nodeID.
-	@param		speed	at this 'speed'.
-	@param		addr	with FireWire address 'addr'.
-	@param		len		write 'len' bytes to nodeID.
-	@param		buf		obtain bytes from location given by 'buf'.
-	@param		reqrefcon  Can be queried for extra info about the request.
-	@result		UIn32	returns kFWResponseComplete on success */
-    virtual UInt32 doWrite(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
-                           const void *buf, IOFWRequestRefCon refcon);
-
-/*!	@function	getMemoryDescriptor
-	@abstract	Gets the memory descriptor, which is associated to this 
-				PhysicalAddressSpace.
-	@param		none.
-	@result		returns the IOMemoryDescriptor */
-	IOMemoryDescriptor * getMemoryDescriptor( void );
-
-/*!	@function	setMemoryDescriptor
-	@abstract	Sets the memory descriptor, which will be associated to this 
-				PhysicalAddressSpace.
-	@param		none.
-	@result		returns the IOMemoryDescriptor */
-	IOReturn setMemoryDescriptor( IOMemoryDescriptor * descriptor );
-
-/*!	@function	getLength
-	@abstract	Get the length of the memory backed by PhysicalAddressSpace.
-	@param		none.
-	@result		returns the length */
-	UInt64 getLength( void );
-
-/*!	@function	setDMACommand
-	@abstract	Set the DMACommand for this PhysicalAddressSpace.
-	@param		dma_command	Points to IODMACommand object.
-	@result		none */
-	inline void setDMACommand( IODMACommand * dma_command )
-		{ ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->setDMACommand( dma_command ); };
-		
-/*!	@function	getDMACommand
-	@abstract	Get the DMACommand from this PhysicalAddressSpace.
-	@param		none.
-	@result		return previously assigned IODMACommand, null if not initialized */
-	inline IODMACommand * getDMACommand( void )
-		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->getDMACommand(); };
-
-/*!	@function	initWithDMACommand
-	@abstract	Initialize physical address space with IODMACommand.
-	@param		bus	Points to IOFireWireBus object.
-	@param		command	Points to IODMACommand.
-	@result		returns true if success, else false */
-	virtual bool initWithDMACommand( IOFireWireBus * control, IODMACommand * command );
-	
-/*!	@function	prepare
-	@abstract	Prepare the IODMACommand used by this PhysicalAddressSpace.
-	@param		none.
-	@result		returns kIOReturnSuccess on success */
-	inline IOReturn prepare( void )
-		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->prepare(); };
-
-/*!	@function	synchronize
-	@abstract	synchronize the IODMACommand used by this PhysicalAddressSpace.
-	@param		none.
-	@result		returns kIOReturnSuccess on success */
-	inline IOReturn synchronize( IOOptionBits options )
-		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->synchronize( options ); };
-		 
-/*!	@function	complete
-	@abstract	complete the IODMACommand used by this PhysicalAddressSpace.
-	@param		none.
-	@result		returns kIOReturnSuccess on success */
-	inline IOReturn complete( void )
-		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->complete(); };
-
-/*!	@function	isPrepared
-	@abstract	Inspects whether the IODMACommand was prepared in this PhysicalAddressSpace.
-	@param		none.
-	@result		returns true if prepared, else false */
-	inline bool isPrepared( void )
-		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->isPrepared(); };
-
-/*!	@function	getSegments
-	@abstract	Returns the scatter gather list of memory segments from the IODMACommand
-				used in this PhysicalAddressSpace.
-	@param		offset		input/output parameter, defines the starting and ending offset in the memory 
-							descriptor, relative to any offset passed to the prepare() method.
-				FWSegment 	Points to an array of memory segments.
-				num_segments Size of the FWSegment array.   
-	@result		returns kIOReturnSuccess on success */
-	inline IOReturn getSegments( UInt64 * offset, FWSegment * fw_segments, UInt32 * num_segments )
-		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->getSegments( offset, fw_segments, num_segments ); };
-
-/*!	@function	checkMemoryInRange
-	@abstract	Validates the IOMemoryDescriptor, which is used to initialize the PhysicalAddressSpace.
-	@param		memory	Points to a valid IOMemoryDescriptor.
-	@result		returns kIOReturnSuccess on success */
-	IOReturn checkMemoryInRange( IOMemoryDescriptor * memory );
-		
-protected:
-
-	UInt64 getPhysicalSegment( UInt64 offset, UInt64 * length )
-		{ return ((IOFWPhysicalAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->getPhysicalSegment( offset, length); };
-			
-	virtual IOFWAddressSpaceAux * createAuxiliary( void );
-    	
-};
-
-#endif
diff --git a/i386/include/IOKit/firewire/IOFWPseudoAddressSpace.h b/i386/include/IOKit/firewire/IOFWPseudoAddressSpace.h
deleted file mode 100644
index 02c2c30..0000000
--- a/i386/include/IOKit/firewire/IOFWPseudoAddressSpace.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-#ifndef _IOKIT_IOFWPSEUDOADDRESSSPACE_H
-#define _IOKIT_IOFWPSEUDOADDRESSSPACE_H
-
-#include <IOKit/firewire/IOFWAddressSpace.h>
-
-/*
- * If installed, this callback is invoked for drivers which 
- * would like to coalesce incoming writes and do batch processing 
- * of incoming block write packets.
- * This callback can be installed by calling setARxReqIntCompleteHandler
- * method in IOFWPseudoAddressSpace object. 
- */
-typedef void (*IOFWARxReqIntCompleteHandler)( void * refcon );
-
-/*
- * Pseudo firewire addresses usually represent emulated registers of some kind.
- * Accesses to these addresses will result in the owner being notified.
- * 
- * Virtual addresses should not have zero as the top 16 bits of the 48 bit local address,
- * since that may look like a physical address to hardware (eg. OHCI).
- * if reader is NULL then reads will not be allowed.
- * if writer is NULL then writes will not be allowed.
- * if either is NULL then lock requests will not be allowed.
- * refcon is passed back as the first argument of read and write callbacks.
- */
-
-class IOFWPseudoAddressSpace;
-
-#pragma mark -
-
-/*! 
-	@class IOFWPseudoAddressSpaceAux
-*/
-
-class IOFWPseudoAddressSpaceAux : public IOFWAddressSpaceAux
-{
-    OSDeclareDefaultStructors(IOFWPseudoAddressSpaceAux)
-
-	friend class IOFWAddressSpace;
-	friend class IOFWPseudoAddressSpace;
-	friend class IOFireWireController;
-		
-protected:
-	
-    struct MemberVariables 
-	{ 		
-		IOFWARxReqIntCompleteHandler		fARxReqIntCompleteHandler;
-		void *	  							fARxReqIntCompleteHandlerRefcon;	
-	};
-	  
-    MemberVariables * fMembers;
-
-public:
-     
-	virtual bool init( IOFWAddressSpace * primary );
-	virtual	void free();
-
-protected:
-
-	bool createMemberVariables( void );
-	void destroyMemberVariables( void );
-	
-	virtual void handleARxReqIntComplete();
-		
-public:
-
-/*!	@function setARxReqIntCompleteHandler
-	@abstract Installs a callback to receive notification, when FWIM has completed
-			  ARxReqInt processing and no incoming packets are left in the queue.
-	@param refcon	Client's callback object.
-	@param handler	Client callback to be invoked, at the end of interrupt processing.
-	@result none.	*/	
-	virtual void setARxReqIntCompleteHandler( void * refcon, IOFWARxReqIntCompleteHandler handler );
-
-	virtual bool intersects( IOFWAddressSpace * space );
-	
-private:
-
-    OSMetaClassDeclareReservedUsed(IOFWPseudoAddressSpaceAux, 0);
-    OSMetaClassDeclareReservedUsed(IOFWPseudoAddressSpaceAux, 1);
-    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 2);
-    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 3);
-    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 4);
-    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 5);
-    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 6);
-    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 7);
-    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 8);
-    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpaceAux, 9);
-	
-};
-
-/*! 
-	@class IOFWPseudoAddressSpace
-*/
-
-class IOFWPseudoAddressSpace : public IOFWAddressSpace
-{
-    OSDeclareDefaultStructors(IOFWPseudoAddressSpace)
-
-	friend class IOFWPseudoAddressSpaceAux;
-	friend class IOFireWireController;
-	
-protected:
-
-    IOMemoryDescriptor*	fDesc;
-    void *				fRefCon;
-    FWReadCallback		fReader;
-    FWWriteCallback		fWriter;
-    FWAddress			fBase;
-    UInt32				fLen;
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-    static	OSData *	allocatedAddresses; // unused
-    
-    virtual	void 					free();
-	
-public:
-
-/*!	@function	simpleReader
-	@abstract	A method for processing an address space read request
-	@param		refcon		Client's callback object.
-	@param		nodeID		FireWire Read from nodeID.
-	@param		speed		at this 'speed'.
-	@param		addr		with FireWire address 'addr'.
-	@param		len			read 'len' bytes from nodeID.
-	@param		buf			points to a memory descriptor containing the packet data.
-	@param		offset		start from this 'offset' in 'buf'.
-	@param		reqrefcon	Can be queried for extra info about the request.
-	@result		UIn32		returns kFWResponseComplete on success */
-    static 	UInt32 					simpleReader(
-											void*					refcon,
-											UInt16 					nodeID,
-											IOFWSpeed &				speed,
-											FWAddress 				addr,
-											UInt32 					len,
-											IOMemoryDescriptor**	buf,
-											IOByteCount* 			offset,
-                                            IOFWRequestRefCon		reqrefcon);
-
-/*!	@function	simpleWriter
-	@abstract	A method for processing an address space write request
-	@param		refcon		Client's callback object.
-	@param		nodeID		FireWire Write to nodeID.
-	@param		speed		at this 'speed'.
-	@param		addr		with FireWire address 'addr'.
-	@param		len			write 'len' bytes to nodeID.
-	@param		buf			obtain bytes from location given by 'buf'.
-	@param		reqrefcon	Can be queried for extra info about the request.
-	@result		UIn32		returns kFWResponseComplete on success */
-    static 	UInt32 					simpleWriter(
-											void*					refcon,
-											UInt16 					nodeID,
-											IOFWSpeed&				speed,
-											FWAddress 				addr,
-											UInt32 					len,
-											const void*				buf,
-                                            IOFWRequestRefCon		reqrefcon);
-protected:
-
-    // Get a unique address range
-    IOReturn						allocateAddress(
-											FWAddress*				addr,
-											UInt32 					len);
-    // free address
-    void							freeAddress(
-											FWAddress 				addr,
-											UInt32 					len);
-
-public:
-
-    static IOFWPseudoAddressSpace*	readWrite(
-											FWAddress 				addr,
-											UInt32 					len, 
-											FWReadCallback 			reader,
-											FWWriteCallback 		writer,
-											void*					refcon);
-
-/*!	@function	simpleRead
-	@abstract	Create an address space object to handle read-only memory (eg. the local ROM)
-				handles everything itself
-	@param		bus		Points to IOFireWireBus object.
-	@param		addr	Points to starting address for the Pseudo Address Space.
-	@param		len		Length of the Pseudo Address Space.
-	@param		data	The virtual address of the first byte in the memory.
-	@result		returns valid IOFWPseudoAddressSpace on success, null on failure */
-    static IOFWPseudoAddressSpace*	simpleRead(
-                                            IOFireWireBus*			bus,
-			                                FWAddress*				addr,
-											UInt32 					len,
-											const void*				data);
-
-/*!	@function	simpleReadFixed
-	@abstract	Create an address space object to handle fixed read-only memory (eg. the local ROM)
-				handles everything itself
-	@param		bus		Points to IOFireWireBus object.
-	@param		addr	Points to starting address for the Pseudo Address Space.
-	@param		len		Length of the Pseudo Address Space.
-	@param		data	The virtual address of the first byte in the memory.
-	@result		returns valid IOFWPseudoAddressSpace on success, null on failure */
-    static IOFWPseudoAddressSpace*	simpleReadFixed(
-                                            IOFireWireBus*			bus,
-			                                FWAddress 				addr,
-											UInt32 					len,
-											const void*				data);
-
-/*!	@function	simpleRW
-	@abstract	Create an address space object to handle r/w memory
-				handles everything itself
-	@param		bus		Points to IOFireWireBus object.
-	@param		addr	Points to starting address for the Pseudo Address Space.
-	@param		len		Length of the Pseudo Address Space.
-	@param		data	The virtual address of the first byte in the memory.
-	@result		returns valid IOFWPseudoAddressSpace on success, null on failure */
-    static IOFWPseudoAddressSpace*	simpleRW(
-                                            IOFireWireBus*			bus,
-                                			FWAddress*				addr,
-											UInt32 					len,
-											void *					data);
-											
-/*!	@function	simpleRW
-	@abstract	Create an address space object to handle r/w memory
-				handles everything itself
-	@param		bus		Points to IOFireWireBus object.
-	@param		addr	Points to starting address for the Pseudo Address Space.
-	@param		data	The virtual address of the first byte in the memory.
-	@result		returns valid IOFWPseudoAddressSpace on success, null on failure */
-    static IOFWPseudoAddressSpace*	simpleRW(
-                                            IOFireWireBus*			bus,
-                                			FWAddress*				addr,
-											IOMemoryDescriptor *	data);
-											
-/*!	@function	initAll
-	@abstract	Initialize an address space object to handle r/w memory
-	@param		bus		Points to IOFireWireBus object.
-	@param		addr	Points to starting address for the Pseudo Address Space.
-	@param		len		Length of the Pseudo Address Space.
-	@param		reader	Callback handler for incoming Read.
-	@param		writer	Callback handler for incoming Write.
-	@param		refcon	Client's callback object.
-	@result		returns true on success, false on failure */
-    virtual bool 					initAll(
-                                            IOFireWireBus*			bus,
-                							FWAddress*				addr,
-											UInt32 					len, 
-											FWReadCallback 			reader,
-											FWWriteCallback 		writer,
-											void*					refcon);
-											
-/*!	@function	initFixed
-	@abstract	Initialize a fixed address space at top of kCSRRegisterSpaceBaseAddressHi
-	@param		bus		Points to IOFireWireBus object.
-	@param		addr	Points to starting address for the Pseudo Address Space.
-	@param		reader	Callback handler for incoming Read.
-	@param		writer	Callback handler for incoming Write.
-	@param		refcon	Client's callback object.
-	@result		returns true on success, false on failure */
-    virtual bool 					initFixed(
-                                            IOFireWireBus*			bus,
-							                FWAddress 				addr,
-											UInt32 					len,
-                							FWReadCallback 			reader,
-											FWWriteCallback 		writer,
-											void*					refcon);
-
-/*!	@function	doRead
-	@abstract	A method for processing an address space read request
-	@param		nodeID	FireWire Read from nodeID.
-	@param		speed	at this 'speed'.
-	@param		addr	with FireWire address 'addr'.
-	@param		len		read 'len' bytes from nodeID.
-	@param		buf		points to a memory descriptor containing the packet data.
-	@param		offset	start from this 'offset' in 'buf'.
-	@param		reqrefcon  Can be queried for extra info about the request.
-	@result		UIn32	returns kFWResponseComplete on success */
-    virtual UInt32 					doRead(
-											UInt16 					nodeID, 
-											IOFWSpeed &				speed, 
-											FWAddress 				addr, 
-											UInt32 					len,
-                               				IOMemoryDescriptor **	buf, 
-											IOByteCount * 			offset,
-                                            IOFWRequestRefCon		reqrefcon);
-/*!	@function	doWrite
-	@abstract	A method for processing an address space write request
-	@param		nodeID	FireWire Write to nodeID.
-	@param		speed	at this 'speed'.
-	@param		addr	with FireWire address 'addr'.
-	@param		len		write 'len' bytes to nodeID.
-	@param		buf		obtain bytes from location given by 'buf'.
-	@param		reqrefcon  Can be queried for extra info about the request.
-	@result		UIn32	returns kFWResponseComplete on success */
-    virtual UInt32 					doWrite(
-											UInt16 					nodeID,
-											IOFWSpeed&				speed,
-											FWAddress 				addr,
-											UInt32 					len, 
-											const void*				buf,
-                                            IOFWRequestRefCon		reqrefcon);
-
-/*!	@function	contains
-	@abstract	returns number of bytes starting at addr in this space
-	@result		0 if it doesn't contain the address
-	*/
-    virtual UInt32					contains(FWAddress addr);
-
-/*!	@function	simpleRWFixed
-	@abstract	Create a Read/Write fixed address space at top of kCSRRegisterSpaceBaseAddressHi.
-	@param		control	Points to IOFireWireBus object.
-	@param		addr	Points to starting address for the Pseudo Address Space.
-	@param		len		Length of the address range.
-	@param		data	The virtual address of the first byte in the memory.
-	@result		returns valid IOFWPseudoAddressSpace on success, null on failure */
-	static IOFWPseudoAddressSpace * simpleRWFixed( IOFireWireBus *control, FWAddress addr, UInt32 len, const void *data );
-
-protected:
-	
-	virtual IOFWAddressSpaceAux * createAuxiliary( void );
-
-protected:
-	inline void handleARxReqIntComplete( void )
-		{ ((IOFWPseudoAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->handleARxReqIntComplete(); }
-	
-public:
-/*!	@function setARxReqIntCompleteHandler
-	@abstract Installs a callback to receive notification, when FWIM has completed
-			  ARxReqInt processing and no incoming packets are left in the queue.
-	@param refcon	Client's callback object.
-	@param handler	Client callback to be invoked, at the end of interrupt processing.
-	@result none.	*/	
-	inline void setARxReqIntCompleteHandler( void * refcon, IOFWARxReqIntCompleteHandler handler )
-		{ ((IOFWPseudoAddressSpaceAux*)fIOFWAddressSpaceExpansion->fAuxiliary)->setARxReqIntCompleteHandler( refcon, handler ); }
-			
-private:
-
-    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpace, 0);
-    OSMetaClassDeclareReservedUnused(IOFWPseudoAddressSpace, 1);
-    
-};
-
-#endif
diff --git a/i386/include/IOKit/firewire/IOFWRegs.h b/i386/include/IOKit/firewire/IOFWRegs.h
deleted file mode 100644
index 97c7078..0000000
--- a/i386/include/IOKit/firewire/IOFWRegs.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
-*
-* @APPLE_LICENSE_HEADER_START@
-* 
-* The contents of this file constitute Original Code as defined in and
-* are subject to the Apple Public Source License Version 1.1 (the
-* "License").  You may not use this file except in compliance with the
-* License.  Please obtain a copy of the License at
-* http://www.apple.com/publicsource and read it before using this file.
-* 
-* This Original Code and all software distributed under the License are
-* distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
-* License for the specific language governing rights and limitations
-* under the License.
-* 
-* @APPLE_LICENSE_HEADER_END@
-*/
-/*
-	File:		IOFWRegs.h
-
-	Copyright:	© 1996-1999 by Apple Computer, Inc., all rights reserved.
-
-*/
-
-#ifndef __IOFWREGS_H__
-#define __IOFWREGS_H__
-
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-
-#ifndef NEW_ERROR_CODES
-
-//	 
-// (!)	The following error codes are obsolete...
-//		Please use the error codes defined in IOFireWireFamilyCommon.h
-//
-
-enum {
-	inUseErr					= -4160,				// Item already in use
-	notFoundErr					= -4161,				// Item not found
-	timeoutErr					= -4162,				// Something timed out
-	busReconfiguredErr			= -4163,				// Bus was reconfigured
-	invalidIDTypeErr			= -4166,				// Given ID is of an invalid type for the requested operation.
-	alreadyRegisteredErr		= -4168,				// Item has already been registered.
-	disconnectedErr				= -4169,				// Target of request has been disconnected.
-	retryExceededErr			= -4170,				// Retry limit was exceeded.
-	addressRangeErr				= -4171,				// Address is not in range.
-	addressAlignmentErr			= -4172,				// Address is not of proper alignment.
-
-	multipleTalkerErr			= -4180,				// Tried to install multiple talkers
-	channelActiveErr			= -4181,				// Operation not permitted when channel is active
-	noListenerOrTalkerErr		= -4182,				// Every isochronous channel must have one talker and at least
-														// one listener
-	noChannelsAvailableErr		= -4183,				// No supported isochronous channels are available
-	channelNotAvailableErr		= -4184,				// Required channel was not available.
-	invalidIsochPortIDErr		= -4185,				// An isochronous port ID is invalid.
-	invalidFWReferenceTypeErr	= -4186,				// Operation does not support type of given reference ID
-	separateBusErr				= -4187,				// Two or more entities are on two or more busses and cannot be associated with eachother.
-	badSelfIDsErr				= -4188,				// Received self IDs are bad.
-
-//zzz Do we own these next ID numbers?
-	cableVoltageTooLowErr		= -4190,				// Cable power below device's minimum voltage
-	cablePowerInsufficientErr	= -4191					// Can't grant power request at this time
-};
-
-
-#endif //NEW_ERROR_CODES
-
-#endif /* __IOFWREGS_H */
-
diff --git a/i386/include/IOKit/firewire/IOFWSimpleContiguousPhysicalAddressSpace.h b/i386/include/IOKit/firewire/IOFWSimpleContiguousPhysicalAddressSpace.h
deleted file mode 100644
index 606a9b2..0000000
--- a/i386/include/IOKit/firewire/IOFWSimpleContiguousPhysicalAddressSpace.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-#ifndef _IOFWSIMPLECONTIGUOUSPHYSICALADDRESSSPACE_H_
-#define _IOFWSIMPLECONTIGUOUSPHYSICALADDRESSSPACE_H_
-
-#include <IOKit/firewire/IOFWSimplePhysicalAddressSpace.h>
-
-/*! @class IOFWSimpleContiguousPhysicalAddressSpace
-*/
-
-class IOFWSimpleContiguousPhysicalAddressSpace : public IOFWSimplePhysicalAddressSpace
-{
-	OSDeclareDefaultStructors( IOFWSimpleContiguousPhysicalAddressSpace )
-
-private:
-
-	void * fSimpleContigPhysSpaceMembers;
-	
-	IOReturn cachePhysicalAddress( void );
-
-protected:	
-	virtual bool createMemberVariables( void );
-	virtual void destroyMemberVariables( void );
-
-public:
-
-	virtual bool init( IOFireWireBus * control, vm_size_t size, IODirection direction );
-	virtual void free( void );
-
-	FWAddress getFWAddress( void );
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 0);
-    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 1);
-    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 2);
-    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 3);
-    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 4);
-    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 5);
-    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 6);
-    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 7);
-    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 8);
-    OSMetaClassDeclareReservedUnused(IOFWSimpleContiguousPhysicalAddressSpace, 9);
-
-};
-
-#endif
diff --git a/i386/include/IOKit/firewire/IOFWSimplePhysicalAddressSpace.h b/i386/include/IOKit/firewire/IOFWSimplePhysicalAddressSpace.h
deleted file mode 100644
index 83a76a4..0000000
--- a/i386/include/IOKit/firewire/IOFWSimplePhysicalAddressSpace.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-#ifndef _IOFWSIMPLEPHYSICALADDRESSSPACE_H_
-#define _IOFWSIMPLEPHYSICALADDRESSSPACE_H_
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/IODMACommand.h>
-#include <IOKit/firewire/IOFWPhysicalAddressSpace.h>
-
-/*! @class IOFWSimplePhysicalAddressSpace
-*/
-
-class IOFWSimplePhysicalAddressSpace : public IOFWPhysicalAddressSpace
-{
-	OSDeclareDefaultStructors( IOFWSimplePhysicalAddressSpace )
-	
-private:
-
-	void *	fSimplePhysSpaceMembers;
-		
-	IOReturn allocateMemory( void );	
-	void deallocateMemory( void );
-
-protected:	
-	virtual bool createMemberVariables( void );
-	virtual void destroyMemberVariables( void );
-
-public:
-
-	virtual bool init( IOFireWireBus * control, vm_size_t size, IODirection direction, bool contiguous = false );
-	virtual void free( void );
-
-	IOVirtualAddress getVirtualAddress( void );
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 0);
-    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 1);
-    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 2);
-    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 3);
-    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 4);
-    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 5);
-    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 6);
-    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 7);
-    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 8);
-    OSMetaClassDeclareReservedUnused(IOFWSimplePhysicalAddressSpace, 9);
-	
-};
-
-#endif
diff --git a/i386/include/IOKit/firewire/IOFWSyncer.h b/i386/include/IOKit/firewire/IOFWSyncer.h
deleted file mode 100644
index 0fa497f..0000000
--- a/i386/include/IOKit/firewire/IOFWSyncer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1998-2007 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-#ifndef _IOFWSYNCER_H
-#define _IOFWSYNCER_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOLocks.h>
-
-class IOFWSyncer : public OSObject
-{
-    OSDeclareDefaultStructors(IOFWSyncer)
-
-private:
-    // The spin lock that is used to guard the 'threadMustStop' variable. 
-    IOSimpleLock *guardLock;
-    volatile bool threadMustStop;
-    IOReturn fResult;
-    virtual void free();
-    virtual void privateSignal();
-
-public:
-
-    static IOFWSyncer * create(bool twoRetains = true);
-
-    virtual bool init(bool twoRetains);
-    virtual void reinit();
-    virtual IOReturn wait(bool autoRelease = true);
-    virtual void signal(IOReturn res = kIOReturnSuccess,
-					bool autoRelease = true);
-};
-
-#endif /* !_IOFWSYNCER */
-
diff --git a/i386/include/IOKit/firewire/IOFWUserObjectExporter.h b/i386/include/IOKit/firewire/IOFWUserObjectExporter.h
deleted file mode 100644
index 5d12307..0000000
--- a/i386/include/IOKit/firewire/IOFWUserObjectExporter.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*! @class IOFWUserObjectExporter
-	@discussion An IOFWUserObjectExporter is for internal use only. You should never subclass IOFWUserObjectExporter 
-*/
-
-	namespace IOFireWireLib
-	{
-		typedef UInt32      UserObjectHandle;
-	}
-
-#ifdef KERNEL
-
-	class IOFWUserObjectExporter : public OSObject
-	{
-		OSDeclareDefaultStructors (IOFWUserObjectExporter )
-
-		public :
-		
-			typedef void (*CleanupFunction)( const OSObject * obj );
-			typedef void (*CleanupFunctionWithExporter)( const OSObject * obj, IOFWUserObjectExporter * );
-			
-		private :
-		
-			unsigned							fCapacity;
-			unsigned							fObjectCount;
-			const OSObject **					fObjects;
-			CleanupFunctionWithExporter *		fCleanupFunctions;
-			IOLock *							fLock;
-			OSObject *							fOwner;
-			
-		public :
-		
-			static IOFWUserObjectExporter *		createWithOwner( OSObject * owner );
-			bool								initWithOwner( OSObject * owner );
-
-			virtual bool			init();
-	
-			virtual void			free ();
-			virtual bool			serialize ( OSSerialize * s ) const;
-			
-			// me
-			IOReturn				addObject ( OSObject * obj, CleanupFunction cleanup, IOFireWireLib::UserObjectHandle * outHandle );
-			void					removeObject ( IOFireWireLib::UserObjectHandle handle );
-			
-			// the returned object is retained! This is for thread safety.. if someone else released
-			// the object from the pool after you got it, you be in for Trouble
-			// Release the returned value when you're done!!
-			const OSObject *		lookupObject ( IOFireWireLib::UserObjectHandle handle ) const;
-			const OSObject *		lookupObjectForType( IOFireWireLib::UserObjectHandle handle, const OSMetaClass * toType ) const;
-			void					removeAllObjects ();
-
-			void					lock () const;
-			void					unlock () const;
-			
-			OSObject *				getOwner() const;
-			
-			const IOFireWireLib::UserObjectHandle	lookupHandle ( OSObject * object ) const;
-		
-			// don't subclass, but just in case someone does...
-			
-		private:
-		
-			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 0);
-			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 1);
-			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 2);
-			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 3);
-			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 4);
-			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 5);
-			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 6);
-			OSMetaClassDeclareReservedUnused(IOFWUserObjectExporter, 7);
-				
-	};
-
-#endif
diff --git a/i386/include/IOKit/firewire/IOFWUtils.h b/i386/include/IOKit/firewire/IOFWUtils.h
deleted file mode 100644
index 1a0ffc3..0000000
--- a/i386/include/IOKit/firewire/IOFWUtils.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  IOFWUtils.h
- *  IOFireWireFamily
- *
- *  Created by Niels on Fri Aug 16 2002.
- *  Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#import <IOKit/IOTypes.h>
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Useful FireWire utility functions.
-//
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-UInt16 FWComputeCRC16(const UInt32 *pQuads, UInt32 numQuads);
-UInt16 FWUpdateCRC16(UInt16 crc16, UInt32 quad);
-
-UInt32 AddFWCycleTimeToFWCycleTime( UInt32 cycleTime1, UInt32 cycleTime2 );
-UInt32 SubtractFWCycleTimeFromFWCycleTime( UInt32 cycleTime1, UInt32 cycleTime2);
-
-void IOFWGetAbsoluteTime( AbsoluteTime * result );
-	
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/i386/include/IOKit/firewire/IOFireWireBus.h b/i386/include/IOKit/firewire/IOFireWireBus.h
deleted file mode 100644
index 053bfe4..0000000
--- a/i386/include/IOKit/firewire/IOFireWireBus.h
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOFIREWIREBUS_H
-#define _IOKIT_IOFIREWIREBUS_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/firewire/IOFWIsochChannel.h>
-#include <IOKit/firewire/IOFWAddressSpace.h>
-#include <IOKit/firewire/IOFWCommand.h>
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-
-extern const OSSymbol *gFireWireROM;
-extern const OSSymbol *gFireWireNodeID;
-extern const OSSymbol *gFireWireSelfIDs;
-extern const OSSymbol *gFireWireSpeed;
-extern const OSSymbol *gFireWireUnit_Spec_ID;
-extern const OSSymbol *gFireWireUnit_SW_Version;
-extern const OSSymbol *gFireWireVendor_ID;
-extern const OSSymbol *gFireWire_GUID;
-extern const OSSymbol *gFireWireVendor_Name;
-extern const OSSymbol *gFireWireProduct_Name;
-extern const OSSymbol *gFireWireModel_ID;
-extern const OSSymbol *gFireWireTDM;
-
-class IOFireWireDevice;
-class IOLocalConfigDirectory;
-class IOFWLocalIsochPort;
-class IOFireWirePowerManager;
-class IOFireWireBus;
-class IOFWDCLPool;
-class IOFWSimpleContiguousPhysicalAddressSpace;
-class IOFWSimplePhysicalAddressSpace;
-class IOFWUserObjectExporter;
-
-#pragma mark -
-
-/*! 
-	@class IOFireWireBusAux
-*/
-
-class IOFireWireBusAux : public OSObject
-{
-    OSDeclareAbstractStructors(IOFireWireBusAux)
-
-	friend class IOFireWireBus;
-	
-	protected:
-			
-		/*! 
-			@struct ExpansionData
-			@discussion This structure will be used to expand the capablilties of the class in the future.
-		*/  
-		
-		struct ExpansionData { };
-	
-		/*! 
-			@var reserved
-			Reserved for future use.  (Internal use only)  
-		*/
-		
-		ExpansionData * reserved;
-	
-	public :
-	
-		virtual IOFWDCLPool *							createDCLPool ( unsigned capacity ) const = 0 ;
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 32);
-		virtual UInt8 getMaxRec( void ) = 0;
-
-		virtual UInt64 getFireWirePhysicalAddressMask( void ) = 0;
-		virtual UInt32 getFireWirePhysicalAddressBits( void ) = 0;
-		virtual UInt64 getFireWirePhysicalBufferMask( void ) = 0;
-		virtual UInt32 getFireWirePhysicalBufferBits( void ) = 0;
-
-		virtual IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction ) = 0;
-		virtual IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction ) = 0;
-
-		virtual IOFWUserObjectExporter * getSessionRefExporter( void ) = 0;
-	
-	private:
-		OSMetaClassDeclareReservedUsed(IOFireWireBusAux, 0);
-		OSMetaClassDeclareReservedUsed(IOFireWireBusAux, 1);
-		OSMetaClassDeclareReservedUsed(IOFireWireBusAux, 2);
-		OSMetaClassDeclareReservedUsed(IOFireWireBusAux, 3);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 4);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 5);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 6);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 7);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 8);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 9);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 10);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 11);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 12);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 13);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 14);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 15);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 16);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 17);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 18);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 19);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 20);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 21);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 22);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 23);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 24);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 25);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 26);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 27);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 28);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 29);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 30);
-		OSMetaClassDeclareReservedUnused(IOFireWireBusAux, 31);
-		
-};
-
-#pragma mark -
-
-/*! 
-	@class IOFireWireBus
-	@abstract IOFireWireBus is a public class the provides access to
-		general FireWire functionality...
-*/
-
-class IOFireWireBus : public IOService
-{
-    OSDeclareAbstractStructors(IOFireWireBus)
-
-public:
-
-	struct DCLTaskInfoAux
-	{
-		unsigned version ;
-		union	// u
-		{
-			struct	// v0
-			{
-				IOMemoryMap * bufferMemoryMap ;				// This field required to get physical addresses to program DMA.
-															// If NULL, we try to make the map ourselves.
-															// If you created a buffer memory descriptor
-															// for your program's buffers, just call map() on it
-															// and pass the returned object here...
-			} v0 ;
-			
-			struct  // v1
-			{
-				IOMemoryMap * bufferMemoryMap ;				// same as 'bufferMemoryMap' from version 0, above.
-				
-				IOWorkLoop * workloop ;						// A workloop on which to run callbacks for this port..
-															// Can be NULL to use FireWire isochronous workloop...
-															// The workloop will be retained by the program object.
-			} v1 ;
-			
-			struct
-			{
-				IOMemoryMap * bufferMemoryMap ;				// same as 'bufferMemoryMap' from version 0, above.
-				
-				IOWorkLoop * workloop ;						// A workloop on which to run callbacks for this port..
-															// Can be NULL to use FireWire isochronous workloop...
-															// The workloop will be retained by the program object.
-				IOFWIsochPortOptions options ;				// extra options
-			} v2 ;
-		} u ;
-	} ;
-	
-	// this struct has been redefined for our next generation isochronous architecture,
-	// but is backwards compatible with the old definition.. This means we should
-	// be safe when an old-style driver is loaded..
-	// To use DCLTaskInfo (see createLocalIsochPort) make sure all 'unused' fields are set to 0 or NULL
-	// and that auxInfo points to a valid DCLTaskInfoAux struct, defined above.
-	
-	struct DCLTaskInfo
-	{
-		task_t 				unused0 ;
-		vm_address_t 		unused1 ;
-		UInt32 				unused2 ;
-		vm_address_t 		unused3 ;
-		UInt32 				unused4 ;
-		void				(*unused5)(void) ;
-		DCLTaskInfoAux *	auxInfo ;	// Refcon for user call
-	} ;
-
-	static const IORegistryPlane * gIOFireWirePlane;
-
-	IOFireWireBusAux * fAuxiliary;
-
-    // Create an Isochronous Channel object
-    virtual IOFWIsochChannel *createIsochChannel(
-        bool doIRM, UInt32 bandwidth, IOFWSpeed prefSpeed,
-        IOFWIsochChannel::ForceStopNotificationProc stopProc=NULL,
-        void *stopRefCon=NULL) = 0;
- 
-	/*!	@function createLocalIsochPort
-		@abstract Create a local isochronous port to run the given DCL program
-		@param talking Pass true to create a talker port; pass false to create a listener port.
-		@param opcodes A pointer to your DCL program (linked list of DCLCommand structs)
-			To use an IOFWDCL/IOFWDCLPool program, pass the DCLCommand returned by
-			IOFWDCLPool::getProgram().
-		@param info (Optional) Pointer to DCLTaskInfo struct containing additional
-			configuration information. If you have an IOMemoryMap for your DCL program data buffers,
-			pass it here. You can also pass an IOWorkLoop if you want to use your own
-			workloop to handle callbacks for the created port object.
-		@param startEvent Specifies a bus condition on which the port should start receiving/sending packets
-			Must be kFWDCLImmediateEvent, kFWDCLCycleEvent, or kFWDCLSyBitsEvent.
-			Pass kFWDCLImmediateEvent to start without waiting when start() is called. Pass kFWDCLCycleEvent
-			to start() transmitting at a specified bus cycle time. Pass kFWDCLSyBitsEvent (receive only)
-			to start receiving packets once an isochronous packet with a specified sync field arrives.
-		@param startState Pass the value for the desired start condition, as specified by 'startEvent'
-			kFWDCLImmediateEvent: set to 0
-			kFWDCLCycleEvent: the cycle timer value on which to start processing packets. For talker
-				ports, This value will be masked by 'startMask' and packet processing will be begin on the 
-				next cycle whose lowest bits match the masked value. For listener ports, pass a 15-bit value
-				containg to the low order two bits of cycleSeconds and the 13-bit cycleCount on which to start
-				processing packets.
-			kFWDCLSyBitsEvent: The value of the sync field on which to start receive packets. The value will be masked
-				by 'startMask'. For DCLCommand based isoch ports, processing will begin on the first received packet 
-				that has an isochronous header sync field matching 'startState'. For IOFWDCL/IOFWDCLPool based
-				ports, processing will pause on each IOFWDCL that has wait set to true until a packet that has
-				an isochronous header sync field matching 'startState' is received.
-		@result Returns an IOFWLocalIsochPort on success.*/
-    virtual IOFWLocalIsochPort *createLocalIsochPort(bool talking,
-        DCLCommand *opcodes, DCLTaskInfo *info = 0,
-        UInt32 startEvent = 0, UInt32 startState = 0, UInt32 startMask = 0) = 0;
-
-    virtual IOReturn getCycleTime(UInt32 &cycleTime) = 0;
-    virtual IOReturn getBusCycleTime(UInt32 &busTime, UInt32 &cycleTime) = 0;
-
-    // Methods to manipulate the local Config ROM
-    virtual IOReturn AddUnitDirectory(IOLocalConfigDirectory *unitDir) = 0;
-    virtual IOReturn RemoveUnitDirectory(IOLocalConfigDirectory *unitDir) = 0;
-
-    // Cause a bus reset
-    virtual IOReturn resetBus() = 0;
-
-    // Convert a firewire nodeID into the IOFireWireDevice for it
-    virtual IOFireWireDevice * nodeIDtoDevice(UInt32 generation, UInt16 nodeID) = 0;
-
-    // Execute specified function on workloop after specified delay
-    // Returned command is for delay, call it's cancel() function to cancel timeout.
-    virtual IOFWDelayCommand * createDelayedCmd(UInt32 uSecDelay, FWBusCallback func, void *refcon) = 0;
-
-    virtual IOFWPhysicalAddressSpace *createPhysicalAddressSpace(IOMemoryDescriptor *mem) = 0;
-    virtual IOFWPseudoAddressSpace *createPseudoAddressSpace(FWAddress *addr, UInt32 len,
-                                FWReadCallback reader, FWWriteCallback writer, void *refcon) = 0;
-
-
-    // Extract info about the async request
-    virtual bool isLockRequest(IOFWRequestRefCon refcon) = 0;
-    virtual bool isQuadRequest(IOFWRequestRefCon refcon) = 0;
-    virtual UInt32 getExtendedTCode(IOFWRequestRefCon refcon) = 0;
-
-    // How big (as a power of two) can packets sent to/received from the node be?
-    virtual int maxPackLog ( bool forSend, UInt16 nodeAddress) const = 0;
-
-    // How big (as a power of two) can packets sent from A to B be?
-    virtual int maxPackLog ( UInt16 nodeA, UInt16 nodeB) const = 0;
-
-    // Force given node to be root (via root holdoff Phy packet)
-    virtual IOReturn makeRoot ( UInt32 generation, UInt16 nodeID) = 0;
-
-    // Create address space at fixed address in initial register space
-    virtual IOFWPseudoAddressSpace * createInitialAddressSpace (	UInt32 addressLo, UInt32 len,
-																	FWReadCallback reader, FWWriteCallback writer, void *refcon) = 0;
-
-    // Get address space object for given address, if any
-    virtual IOFWAddressSpace *						getAddressSpace(FWAddress address) = 0;
-
-    // Extract info about the async request - was the request ack'ed complete already?
-    virtual bool									isCompleteRequest(IOFWRequestRefCon refcon) = 0;
-    
-    virtual IOFWAsyncStreamCommand *				createAsyncStreamCommand( UInt32 generation,
-															UInt32 channel, UInt32 sync, UInt32 tag, IOMemoryDescriptor *hostMem,
-															UInt32 size, int speed,FWAsyncStreamCallback completion=NULL, void *refcon=NULL) = 0;
-	virtual UInt32									hopCount(UInt16 nodeAAddress, UInt16 nodeBAddress ) = 0;
-	virtual UInt32									hopCount(UInt16 nodeAAddress ) = 0;
-	virtual IOFireWirePowerManager *				getBusPowerManager( void ) = 0;
-
-protected:
-
-	virtual IOFireWireBusAux *						createAuxiliary( void ) = 0;
-
-	public :
-	
-		inline IOFWDCLPool *						createDCLPool ( UInt32 capacity = 0 )			{ return fAuxiliary->createDCLPool ( capacity ) ; }
-		inline UInt8								getMaxRec( void )								{ return fAuxiliary->getMaxRec(); }
-
-		// get the physical addressing limitations for this controller
-
-		// returns the physical mask for memory addressable by the bus and this controller's DMA engine
-		// intended for use with IOBufferMemoryDescriptor::inTaskWithPhysicalMask()
-		// all current hardware is 32 bit --- currently returns 0x00000000FFFFFFFF
-		// this API is intended for allocating physical buffers. 
-		// it will not return more than 48 bits so that buffer addresses can be turned into FWAddresses
-		inline UInt64 getFireWirePhysicalAddressMask( void )
-			{ return fAuxiliary->getFireWirePhysicalAddressMask(); }
-		
-		// returns a count of the maximum addressing bits supported by the bus and this controller
-		// intended for use with IODMACommand::withSpecification()
-		// all current hardware is 32 bit --- currently returns 32
-		// this API is intended for allocating physical buffers. 
-		// it will not return more than 48 bits so that buffer addresses can be turned into FWAddresses
-		inline UInt32 getFireWirePhysicalAddressBits( void )
-			{ return fAuxiliary->getFireWirePhysicalAddressBits(); }
-
-		// returns the physical mask for memory addressable by this controller's DMA engine
-		// intended for use with IOBufferMemoryDescriptor::inTaskWithPhysicalMask()
-		// all current hardware is 32 bit --- currently returns 0x00000000FFFFFFFF
-		// this API is to allocate isoch and other buffers that don't need to be addressable by the bus 
-		// it may someday return as high 64 bits
-		inline UInt64 getFireWirePhysicalBufferMask( void )
-			{ return fAuxiliary->getFireWirePhysicalBufferMask(); }
-		
-		// returns a count of the maximum addressing bits supported by this controller
-		// intended for use with IODMACommand::withSpecification()
-		// all current hardware is 32 bit --- currently returns 32
-		// this API is to allocate isoch and other buffers that don't need to be addressable by the bus 
-		// it may someday return as high 64 bits
-		inline UInt32 getFireWirePhysicalBufferBits( void )
-			{ return fAuxiliary->getFireWirePhysicalBufferBits(); }
-
-		inline IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction )
-			{ return fAuxiliary->createSimpleContiguousPhysicalAddressSpace( size, direction ); }
-			
-		inline IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction )
-			{ return fAuxiliary->createSimplePhysicalAddressSpace( size, direction ); }
-
-		virtual IOFWAsyncStreamCommand * createAsyncStreamCommand( UInt32 generation,
-															UInt32 channel, UInt32 sync, UInt32 tag, IOMemoryDescriptor *hostMem,
-															UInt32 size, int speed,FWAsyncStreamCallback completion, void *refcon, bool	failOnReset) = 0;
-	
-		inline IOFWUserObjectExporter * getSessionRefExporter( void )
-			{ return fAuxiliary->getSessionRefExporter(); }
-	
-	private:
-	
-		OSMetaClassDeclareReservedUsed(IOFireWireBus, 0);
-		OSMetaClassDeclareReservedUsed(IOFireWireBus, 1);
-		OSMetaClassDeclareReservedUsed(IOFireWireBus, 2);
-		OSMetaClassDeclareReservedUsed(IOFireWireBus, 3);
-		OSMetaClassDeclareReservedUsed(IOFireWireBus, 4);
-		OSMetaClassDeclareReservedUsed(IOFireWireBus, 5);
-		OSMetaClassDeclareReservedUsed(IOFireWireBus, 6);
-		OSMetaClassDeclareReservedUsed(IOFireWireBus, 7);
-
-};
-
-#endif /* ! _IOKIT_IOFIREWIREBUS_H */
-
diff --git a/i386/include/IOKit/firewire/IOFireWireController.h b/i386/include/IOKit/firewire/IOFireWireController.h
deleted file mode 100644
index e2f3ae1..0000000
--- a/i386/include/IOKit/firewire/IOFireWireController.h
+++ /dev/null
@@ -1,1089 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999-2002 Apple Computer, Inc.  All rights reserved.
- *
- * HISTORY
- *
- */
-
-#ifndef _IOKIT_IOFIREWIRECONTROLLER_H
-#define _IOKIT_IOFIREWIRECONTROLLER_H
-
-#ifndef FIREWIREPRIVATE
-#warning Please do not include this file. Include IOFireWireBus.h instead.
-#endif
-
-#include <IOKit/IOEventSource.h>
-#include <IOKit/firewire/IOFireWireBus.h>
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-#include <IOKit/firewire/IOFireWireIRMAllocation.h>
-#include <IOKit/firewire/IOFWPHYPacketListener.h>
-#include <IOKit/firewire/IOFireWireMultiIsochReceive.h>
-
-class OSData;
-class IOWorkLoop;
-class IOEventSource;
-class IOFWQEventSource;
-class IOTimerEventSource;
-class IOMemoryDescriptor;
-class IOFireWireController;
-class IOFWAddressSpace;
-class IOFWPseudoAddressSpace;
-class IOFireWireNub;
-class IOFireWireDevice;
-class IOFireWireDeviceAux;
-class IOFireWireUnit;
-class IODCLProgram;
-class IOLocalConfigDirectory;
-class IOFireWireLink;
-class IOFireWireSBP2ORB;
-class IOFireWireSBP2Login;
-class IOFireWireROMCache;
-class IOFireWireLocalNode;
-class IOFWWorkLoop;
-class IOFireWireIRM;
-class IOFireWirePowerManager;
-class IOFWSimplePhysicalAddressSpace;
-class IOFWSimpleContiguousPhysicalAddressSpace;
-class IOFWAsyncStreamReceiver;
-class IOFWAsyncStreamListener;
-class IOFWUserVectorCommand;
-class IOFWAsyncPHYCommand;
-class IOFWPHYPacketListener;
-class IOFWUserPHYPacketListener;
-
-#if FIRELOGCORE
-class IOFireLog;
-class IOFireLogPublisher;
-#endif
-
-const UInt32 kMaxWaitForValidSelfID = 20; // Still invalid SelfID after 20 retries
-
-// Phy packet defs.
-
-enum
-{
-	kFWPhyPacketID					= FWBitRange (0, 1),
-	kFWPhyPacketIDPhase				= FWBitRangePhase (0, 1),
-
-	kFWPhyPacketPhyID				= FWBitRange (2, 7),
-	kFWPhyPacketPhyIDPhase			= FWBitRangePhase (2, 7)
-};
-
-enum
-{
-	kSelfIDPacketSize				= 8,
-	kMaxSelfIDs						= 4	// SelfID 0,1,3,8
-};
-
-enum
-{
-	kFWConfigurationPacketID		= 0,
-	kFWLinkOnPacketID				= 1,
-	kFWSelfIDPacketID				= 2
-};
-
-enum
-{
-	kFWPhyConfigurationR					= FW_BIT(8),
-	kFWPhyConfigurationT					= FW_BIT(9),
-	kFWPhyConfigurationGapCnt				= FWBitRange (10, 15),
-	kFWPhyConfigurationGapCntPhase			= FWBitRangePhase (10, 15)
-};
-
-enum
-{
-	kFWSelfIDPortStatusChild				= 3,
-	kFWSelfIDPortStatusParent				= 2,
-	kFWSelfIDPortStatusNotConnected			= 1,
-	kFWSelfIDPortStatusNotPresent			= 0,
-
-	kFWSelfIDNoPower						= 0,
-	kFWSelfIDSelfPowered15W					= 1,
-	kFWSelfIDSelfPowered30W					= 2,
-	kFWSelfIDSelfPowered45W					= 3,
-	kFWSelfIDBusPowered1W					= 4,
-	kFWSelfIDBusPowered3W					= 5,
-	kFWSelfIDBusPowered6W					= 6,
-	kFWSelfIDBusPowered10W					= 7,
-
-	kFWSelfIDPhyID							= kFWPhyPacketPhyID,//zzz do we need or want this?
-	kFWSelfIDPhyIDPhase						= kFWPhyPacketPhyIDPhase,
-	kFWSelfIDM								= FW_BIT(31),
-
-	kFWSelfID0L								= FW_BIT(9),
-	kFWSelfID0GapCnt						= FWBitRange (10, 15),
-	kFWSelfID0GapCntPhase					= FWBitRangePhase (10, 15),
-	kFWSelfID0SP							= FWBitRange (16, 17),
-	kFWSelfID0SPPhase						= FWBitRangePhase (16, 17),
-	kFWSelfID0Del							= FWBitRange (18, 19),
-	kFWSelfID0DelPhase						= FWBitRangePhase (18, 19),
-	kFWSelfID0C								= FW_BIT(20),
-	kFWSelfID0Pwr							= FWBitRange (21, 23),
-	kFWSelfID0PwrPhase						= FWBitRangePhase (21, 23),
-	kFWSelfID0P0							= FWBitRange (24, 25),
-	kFWSelfID0P0Phase						= FWBitRangePhase (24, 25),
-	kFWSelfID0P1							= FWBitRange (26, 27),
-	kFWSelfID0P1Phase						= FWBitRangePhase (26, 27),
-	kFWSelfID0P2							= FWBitRange (28, 29),
-	kFWSelfID0P2Phase						= FWBitRangePhase (28, 29),
-	kFWSelfID0I								= FW_BIT(30),
-
-	kFWSelfIDPacketType						= FW_BIT(8),
-	kFWSelfIDNN								= FWBitRange (9, 11),
-	kFWSelfIDNNPhase						= FWBitRangePhase (9, 11),
-	kFWSelfIDNPa							= FWBitRange (14, 15),
-	kFWSelfIDNPaPhase						= FWBitRangePhase (14, 15),
-	kFWSelfIDNPb							= FWBitRange (16, 17),
-	kFWSelfIDNPbPhase						= FWBitRangePhase (16, 17),
-	kFWSelfIDNPc							= FWBitRange (18, 19),
-	kFWSelfIDNPcPhase						= FWBitRangePhase (18, 19),
-	kFWSelfIDNPd							= FWBitRange (20, 21),
-	kFWSelfIDNPdPhase						= FWBitRangePhase (20, 21),
-	kFWSelfIDNPe							= FWBitRange (22, 23),
-	kFWSelfIDNPePhase						= FWBitRangePhase (22, 23),
-	kFWSelfIDNPf							= FWBitRange (24, 25),
-	kFWSelfIDNPfPhase						= FWBitRangePhase (24, 25),
-	kFWSelfIDNPg							= FWBitRange (26, 27),
-	kFWSelfIDNPgPhase						= FWBitRangePhase (26, 27),
-	kFWSelfIDNPh							= FWBitRange (28, 29),
-	kFWSelfIDNPhPhase						= FWBitRangePhase (28, 29),
-	kFWSelfIDMore							= FW_BIT(31)
-};
-
-// Primary packet defs.
-enum
-{
-	kFWPacketTCode							= FWBitRange (24, 27),
-	kFWPacketTCodePhase						= FWBitRangePhase (24, 27)
-};
-
-
-enum
-{
-	kFWAsynchSpd							= FWBitRange (14, 15),
-	kFWAsynchSpdPhase						= FWBitRangePhase (14, 15),
-
-	kFWAsynchTLabel							= FWBitRange (16, 21),
-	kFWAsynchTLabelPhase					= FWBitRangePhase (16, 21),
-	kFWAsynchTTotal 						= ((0xffffffff & kFWAsynchTLabel) >> kFWAsynchTLabelPhase)+1,
-	kFWAsynchRt								= FWBitRange (22, 23),
-	kFWAsynchRtPhase						= FWBitRangePhase (22, 23),
-	kFWAsynchNew							= 0,
-	kFWAsynchRetryA							= 2,
-	kTIAsycnhRetryB							= 3,
-
-	kFWAsynchPriority						= FWBitRange (28, 31),
-	kFWAsynchPriorityPhase					= FWBitRangePhase (28, 31),
-
-	kFWAsynchDestinationID					= FWBitRange (0, 15),
-	kFWAsynchDestinationIDPhase				= FWBitRangePhase (0, 15),
-
-	kFWAsynchSourceID						= FWBitRange (0, 15),
-	kFWAsynchSourceIDPhase					= FWBitRangePhase (0, 15),
-
-	kFWAsynchDestinationOffsetHigh			= FWBitRange (16, 31),
-	kFWAsynchDestinationOffsetHighPhase		= FWBitRangePhase (16, 31),
-
-	kFWAsynchDestinationOffsetLow			= FWBitRange (0, 31),
-	kFWAsynchDestinationOffsetLowPhase		= FWBitRangePhase (0, 31),
-
-	kFWAsynchDataLength						= FWBitRange (0, 15),
-	kFWAsynchDataLengthPhase				= FWBitRangePhase (0, 15),
-
-	kFWAsynchExtendedTCode					= FWBitRange (16, 31),
-	kFWAsynchExtendedTCodePhase				= FWBitRangePhase (16, 31),
-
-	kFWAsynchAckSent						= FWBitRange (28, 31),
-	kFWAsynchAckSentPhase					= FWBitRangePhase (28, 31),
-
-	kFWAsynchRCode							= FWBitRange (16, 19),
-	kFWAsynchRCodePhase						= FWBitRangePhase (16, 19)
-};
-
-enum
-{
-	kFWTCodeWriteQuadlet					= 0,
-	kFWTCodeWriteBlock						= 1,
-	kFWTCodeWriteResponse					= 2,
-	kFWTCodeReadQuadlet						= 4,
-	kFWTCodeReadBlock						= 5,
-	kFWTCodeReadQuadletResponse				= 6,
-	kFWTCodeReadBlockResponse				= 7,
-	kFWTCodeCycleStart						= 8,
-	kFWTCodeLock							= 9,
-	kFWTCodeIsochronousBlock				= 10,
-	kFWTCodeLockResponse					= 11,
-	kFWTCodePHYPacket						= 14
-};
-
-enum
-{
-	kFWExtendedTCodeMaskSwap				= 1,
-	kFWExtendedTCodeCompareSwap				= 2,
-	kFWExtendedTCodeFetchAdd				= 3,
-	kFWExtendedTCodeLittleAdd				= 4,
-	kFWExtendedTCodeBoundedAdd				= 5,
-	kFWExtendedTCodeWrapAdd					= 6,
-	kFWExtendedTCodeVendorDependent			= 7
-};
-
-// debug boot-arg constants
-enum
-{
-	kFWDebugIgnoreNodeNone					= 0xFFFFFFFF
-};
-
-struct AsyncPendingTrans {
-    IOFWAsyncCommand *	fHandler;
-    IOFWCommand *		fAltHandler;
-    int			fTCode;
-    bool		fInUse;
-};
-
-struct IOFWNodeScan {
-    IOFireWireController 	*	fControl;
-    FWAddress					fAddr;
-    UInt32						fBuf[5];	// Enough for bus info block
-    UInt32 					*	fSelfIDs;
-    int							fNumSelfIDs;
-    int							fROMSize;
-    int							fRead;
-    IOFWReadQuadCommand 	* 	fCmd;
-	IOFWCompareAndSwapCommand * fLockCmd;
-	UInt32						generation;
-    UInt32						fIRMBitBucketOld;
-    UInt32						fIRMBitBucketNew;
-    bool						fIRMisBad;
-    bool						speedChecking;
-    bool						fContenderNeedsChecking;
-    bool						fIRMCheckingRead;
-    bool						fIRMCheckingLock;
-	int							fRetriesBumped;
-	bool						fMustNotBeRoot;
-};
-
-
-typedef struct IOFWDuplicateGUIDStruct IOFWDuplicateGUIDRec;
-struct IOFWDuplicateGUIDStruct
- {
-	IOFWDuplicateGUIDRec		* 	fNextGUID;
-	CSRNodeUniqueID				fGUID;
-	UInt32						fLastGenSeen;
-};
-	
-
-// IOFireWireDuplicateGUIDList
-//
-// A little class for keeping track of GUIDs which where we have observed 2 nodes with
-// the same GUID
-
-class IOFireWireDuplicateGUIDList : public OSObject
-{
-    OSDeclareDefaultStructors(IOFireWireDuplicateGUIDList);
-
-private:
-    IOFWDuplicateGUIDRec		* 	fFirstGUID;
-    
-protected:
-    virtual void free();
-    
-public:
-
-	static IOFireWireDuplicateGUIDList * create( void );
-
-	void addDuplicateGUID( CSRNodeUniqueID guid, UInt32 gen );
-	void removeDuplicateGUID( CSRNodeUniqueID guid );
-	
-	bool findDuplicateGUID( CSRNodeUniqueID guid, UInt32 gen );
-	
-};
-
-#define kMaxPendingTransfers kFWAsynchTTotal
-
-class IOFireWireController;
-
-#pragma mark -
-
-/*! 
-	@class IOFireWireControllerAux
-*/
-
-class IOFireWireControllerAux : public IOFireWireBusAux
-{
-    OSDeclareDefaultStructors(IOFireWireControllerAux)
-
-	friend class IOFireWireController;
-	
-protected:
-	
-	IOFireWireController * 		fPrimary;
-	
-	UInt8						fMaxRec;
-	
-	UInt8						fPadding;
-	UInt16						fPadding2;
-	
-	IOFWUserObjectExporter *	fSessionRefExporter;
-	
-	/*! 
-		@struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-    */  
-	  
-    struct ExpansionData { };
-
-	/*! 
-		@var reserved
-		Reserved for future use.  (Internal use only)  
-	*/
-    
-	ExpansionData * reserved;
-
-    virtual bool 									init ( 
-																IOFireWireController * 	primary );
-	virtual	void 									free ();
-	virtual IOFWDCLPool *							createDCLPool ( unsigned capacity ) const ;	
-	virtual UInt8									getMaxRec( void );
-	
-	virtual UInt64 getFireWirePhysicalAddressMask( void );
-	virtual UInt32 getFireWirePhysicalAddressBits( void );
-	virtual UInt64 getFireWirePhysicalBufferMask( void );
-	virtual UInt32 getFireWirePhysicalBufferBits( void );
-	
-	virtual IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction );
-	virtual IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction );
-	
-	virtual IOFWUserObjectExporter * getSessionRefExporter( void );
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireControllerAux, 7);
-
-};
-
-
-#pragma mark -
-
-/*! @class IOFireWireController
-*/
-class IOFireWireController : public IOFireWireBus
-{
-    OSDeclareAbstractStructors(IOFireWireController)
-
-protected:
-    enum busState {
-        kStarting = 0,		
-		kAsleep,			// Link off, zzzzzz
-		kWaitingBusReset,
-        kWaitingSelfIDs,	// Bus has been reset, no selfIDs yet
-        kWaitingScan,		// Got selfIDs, waiting a bit before hitting lame devices
-        kScanning,			// Reading node ROMs
-        kWaitingPrune,		// Read all ROMs, pausing before pruning missing devices
-        kRunning,			// Normal happy state,
-		kWaitingBusResetStart	// bus reset is desired, but not yet sent to the fwim
-    };
-    
-	enum ResetState
-	{
-		kResetStateResetting,
-		kResetStateDisabled,
-		kResetStateArbitrated
-	};
-
-	enum
-	{
-		kDisablePhysicalAccess 	= (1 << 0)
-	};
-		
-    struct timeoutQ: public IOFWCmdQ
-    {
-        IOTimerEventSource *fTimer;
-        virtual void headChanged(IOFWCommand *oldHead);
-        void busReset();
-    };
-	
-    struct pendingQ: public IOFWCmdQ
-    {
-        IOFWQEventSource *fSource;
-        virtual void headChanged(IOFWCommand *oldHead);
-    };
-
-    friend class IOFireWireLink;
-	friend class IOFireWireDevice;
-	friend class IOFireWireDeviceAux;
-	friend class IOFWAddressSpace;
-	friend class IOFWAddressSpaceAux;
-    friend class IOFWPseudoAddressSpace;
-    friend class IOFireWireSBP2ORB;
-	friend class IOFireWireSBP2Login;
-	friend class IOFWLocalIsochPort;
-	friend class IOFWCommand;
-    friend class IOFireWireUnit;
-	friend class IOFireWirePCRSpace;
-    friend class IOFireWireROMCache;
-    friend class IOFWAsyncStreamCommand;
-	friend class IOFireWireAVCLocalUnit;
-	friend class IOFireWireAVCUnit;
-    friend class IOFireWireAVCCommand;
-	friend class IOFireWirePowerManager;
-	friend class IOFWWriteQuadCommand;
-	friend class IOFWWriteCommand;
-	friend class IOFWCompareAndSwapCommand;
-	friend class IOFWAsyncCommand;
-	friend class IOFireWireAVCTargetSpace;
-	friend class AppleFWOHCI;
-	friend class IOFireWireNub;
-	friend class IOFWAsyncStreamListener;
-	friend class IOFireWireLocalNode;
-	friend class IOFireWireIRMAllocation;
-	friend class IOFWUserVectorCommand;
-	friend class IOFWAsyncPHYCommand;
-	friend class IOFWUserPHYPacketListener;
-	friend class IOFWAsyncStreamReceiver;	
-	
-#if FIRELOGCORE
-	friend class IOFireLog;
-#endif
-
-    IOFireWireLink *			fFWIM;
-    IOFWWorkLoop *				fWorkLoop;
-    IOTimerEventSource *		fTimer;
-    OSSet *						fLocalAddresses;	// Collection of local adress spaces
-    OSIterator *				fSpaceIterator;		// Iterator over local addr spaces
-
-    OSSet *						fAllocatedChannels;	// Need to be informed of bus resets
-    OSIterator *				fAllocChannelIterator;	// Iterator over channels
-
-	OSSet *						fIRMAllocations;	// Need to be informed of bus resets
-    OSIterator *				fIRMAllocationsIterator;	// Iterator over channels
-	OSSet *						fIRMAllocationsAllocated;	// Need to be informed of bus resets
-
-    // Bus management variables (although we aren't a FireWire Bus Manager...)
-    AbsoluteTime				fResetTime;		// Time of last reset
-    UInt32						fBusGeneration;		// ID of current bus topology.
-    UInt16						fLocalNodeID;		// ID of local node, ie. this computer
-    UInt16						fRootNodeID;		// ID of root, ie. highest node id in use.
-    UInt16						fIRMNodeID;		// ID of Isochronous resource manager, or kFWBadNodeID
-    bool						fBusMgr;		// true if at least one node is bus manager capable
-    IORegistryEntry *			fNodes[kFWMaxNodesPerBus];	// FireWire nodes on this bus
-    UInt32 *					fNodeIDs[kFWMaxNodesPerBus+1];	// Pointer to SelfID list for each node
-							// +1 so we know how many selfIDs the last node has
-							
-    UInt32						fGapCount;		// What we think the gap count should be
-    //UInt8						fSpeedCodes[(kFWMaxNodesPerBus+1)*kFWMaxNodesPerBus];
-    UInt8						fSpeedVector[((kFWMaxNodesPerBus+1)*kFWMaxNodesPerBus)/2];
-						// Max speed between two nodes
-    busState					fBusState;		// Which state are we in?
-    int							fNumROMReads;		// Number of device ROMs we are still reading
-    // SelfIDs
-    int							fNumSelfIDs;		// Total number of SelfID packets
-    UInt32						fSelfIDs[kMaxSelfIDs*kFWMaxNodesPerBus];
-
-    // The local device's Config ROM
-    UInt32						fROMHeader[5];		// More or less fixed header and bus info block
-    IOLocalConfigDirectory *	fRootDir;		// Local Config ROM root directory.
-
-    // log base 2 of maximum packet size the FWIM can send/receive
-    // Normally calculated from bus info block.
-    int	fMaxSendLog;
-    int fMaxRecvLog;
-    
-    IOFWAddressSpace *			fROMAddrSpace;
-    IOMemoryDescriptor *		fBadReadResponse;	// Send back easily identified bad data to out of range addrs. 
-
-    // Array for outstanding requests (up to 64)
-    AsyncPendingTrans			fTrans[kMaxPendingTransfers];
-    int							fLastTrans;
-
-    // queue for executing commands that may timeout
-    timeoutQ					fTimeoutQ;
-
-    // queue for commands that can't execute yet
-    pendingQ					fPendingQ;
-
-    // queue for async commands interrupted by bus reset
-    IOFWCmdQ					fAfterResetHandledQ;
-    
-    // Command to change bus state after a delay.
-    IOFWDelayCommand *			fDelayedStateChangeCmd;
-    bool						fDelayedStateChangeCmdNeedAbort;
-    
-	UInt32						fDelayedPhyPacket;
-	bool						fBusResetScheduled;
-	ResetState					fBusResetState;
-	IOFWDelayCommand *			fBusResetStateChangeCmd;
-	UInt32						fBusResetDisabledCount;
-
-#if FIRELOGCORE
-    IOFireLogPublisher *		fFireLogPublisher;
-#else
-    void *						fFireLogPublisher;
-#endif
-
-    OSData *					fAllocatedAddresses;
-
-	UInt32						fDevicePruneDelay;
-	
-	IOFWPhysicalAccessMode		fPhysicalAccessMode;
-	IOFWSecurityMode			fSecurityMode;
-	IONotifier *				fKeyswitchNotifier;
-	
-	IOFireWireIRM *				fIRM;
-	IOFireWirePowerManager *	fBusPowerManager;
-	
-	bool						fGapCountMismatch;
-
-	bool						fUseHalfSizePackets;
-	bool						fRequestedHalfSizePackets;
-
-	IOFWNodeScan *					fScans[kFWMaxNodesPerBus];
-	IOFireWireDuplicateGUIDList	*	fGUIDDups;
-	
-	bool						fDelegateCycleMaster;
-	bool						fBadIRMsKnown;
-	
-	UInt32						fPreviousGap;
-	
-	UInt32						fOutOfTLabels;
-	UInt32						fOutOfTLabels10S;
-	UInt32						fOutOfTLabelsThreshold;
-
-#ifdef LEGACY_SHUTDOWN
-	IONotifier *				fPowerEventNotifier;
-#endif
-
-	bool						fStarted;
-
-	UInt32						fIOCriticalSectionCount;
-	UInt32						fHubPort;
-	UInt32						fDebugIgnoreNode;
-
-	OSSet *						fLocalAsyncStreamReceivers; 
-    OSIterator *				fAsyncStreamReceiverIterator;
-
-	bool						fInstantiated;
-
-	IOReturn					fStartStatus;
-	UInt32						fWaitingForSelfID;
-
-	UInt32						fForcedRootNodeID;
-	bool						fNodeMustBeRootFlag;
-	bool						fNodeMustNotBeRootFlag;
-	
-	UInt32						fForcedGapCount;
-	bool						fForcedGapFlag;
-
-	OSSet *						fPHYPacketListeners;
- 	OSIterator *				fPHYPacketListenersIterator;
-
-	bool						fDSLimited;
-	
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-	
-    static void clockTick(OSObject *, IOTimerEventSource *);
-    static void readROMGlue(void *refcon, IOReturn status,
-			IOFireWireNub *device, IOFWCommand *fwCmd);
-    static void delayedStateChange(void *refcon, IOReturn status,
-                                    IOFireWireBus *bus, IOFWBusCommand *fwCmd);
-
-    virtual void processBusReset();
-    virtual void processSelfIDs(UInt32 *IDs, int numIDs, UInt32 *ownIDs, int numOwnIDs);
-    virtual void processTimeout(IOTimerEventSource *src);
-    virtual void processRcvPacket( UInt32 *data, int numQuads, IOFWSpeed speed );
-    virtual void processWriteRequest(UInt16 sourceID, UInt32 tlabel,
-				UInt32 *hdr, void *buf, int len, IOFWSpeed speed);
-    virtual void processLockRequest(UInt16 sourceID, UInt32 tlabel,
-				UInt32 *hdr, void *buf, int len, IOFWSpeed speed);
-
-    // Process read from a local address, return rcode
-    virtual UInt32 doReadSpace(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
-                                      IOMemoryDescriptor **buf, IOByteCount * offset, IODMACommand **dma_command,
-                                      IOFWRequestRefCon refcon);
-
-    // Process write to a local address, return rcode
-    virtual UInt32 doWriteSpace(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
-                                const void *buf, IOFWRequestRefCon refcon);
-
-    // Process lock to a local address, return rcode
-    UInt32 doLockSpace(UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 inlen,
-                                             const UInt32 *newVal, UInt32 &outLen, UInt32 *oldVal,
-                                             UInt32 extType, IOFWRequestRefCon refcon);
-    
-    virtual void updatePlane();
-    virtual void startBusScan();
-
-    // Called when all devices on bus have been examined
-    virtual void finishedBusScan();
-    
-    virtual void buildTopology(bool doFWPlane);
-
-    virtual void readDeviceROM(IOFWNodeScan *refCon, IOReturn status);
-    
-    virtual IOReturn UpdateROM();
-    virtual IOReturn allocAddress(IOFWAddressSpace *space);
-    virtual void freeAddress(IOFWAddressSpace *space);
-
-	IOFireWireBusAux * createAuxiliary( void );
-	
-public:
-
-    // Initialization
-    virtual bool init(IOFireWireLink *fwim);
-    virtual void free();
-    virtual bool start(IOService *provider);
-    virtual void stop( IOService * provider );
-    virtual bool finalize( IOOptionBits options );
-    virtual bool requestTerminate( IOService * provider, IOOptionBits options );
-
-	// Power management
-    virtual IOReturn setPowerState ( unsigned long powerStateOrdinal, IOService* whatDevice );
-
-    // Implement IOService::getWorkLoop
-    virtual IOWorkLoop *getWorkLoop() const;
-
-    // Allocate struct for tracking a transaction
-    virtual AsyncPendingTrans *allocTrans(IOFWAsyncCommand *cmd=NULL);
-    virtual void freeTrans(AsyncPendingTrans *trans);
-
-    // Really public methods
-
-    virtual IOReturn getCycleTime(UInt32 &cycleTime);
-    virtual IOReturn getBusCycleTime(UInt32 &busTime, UInt32 &cycleTime);
-    
-    // Methods to manipulate the local Config ROM
-    virtual IOReturn AddUnitDirectory(IOLocalConfigDirectory *unitDir);
-    virtual IOReturn RemoveUnitDirectory(IOLocalConfigDirectory *unitDir);
-
-    // Cause a bus reset
-    virtual IOReturn resetBus();
-
-    // Send async request packets
-    virtual IOReturn asyncRead(	UInt32 				generation, 
-								UInt16 				nodeID, 
-								UInt16 				addrHi, 
-								UInt32 				addrLo,
-                                int 				speed, 
-								int 				label, 
-								int 				size, 
-								IOFWAsyncCommand *	cmd );
-
-    virtual IOReturn asyncWrite(	UInt32 					generation, 
-									UInt16 					nodeID, 
-									UInt16 					addrHi, 
-									UInt32 					addrLo,
-									int 					speed, 
-									int 					label, 
-									IOMemoryDescriptor *	buf, 
-									IOByteCount 			offset,
-									int 					size, 
-									IOFWAsyncCommand *		cmd );
-				
-    /* DEPRECATED */ virtual IOReturn asyncWrite(	UInt32 				generation, 
-	/* DEPRECATED */								UInt16 				nodeID, 
-	/* DEPRECATED */								UInt16 				addrHi, 
-	/* DEPRECATED */								UInt32 				addrLo,
-	/* DEPRECATED */								int 				speed, 
-	/* DEPRECATED */								int 				label, 
-	/* DEPRECATED */								void *				data, 
-	/* DEPRECATED */								int 				size, 
-	/* DEPRECATED */								IOFWAsyncCommand *	cmd );
-
-    /* DEPRECATED */ virtual IOReturn asyncLock(	UInt32 				generation, 
-	/* DEPRECATED */								UInt16 				nodeID, 
-	/* DEPRECATED */								UInt16 				addrHi, 
-	/* DEPRECATED */								UInt32 				addrLo,
-	/* DEPRECATED */								int 				speed, 
-	/* DEPRECATED */								int 				label, 
-	/* DEPRECATED */								int 				type, 
-	/* DEPRECATED */								void *				data, 
-	/* DEPRECATED */								int 				size, 
-	/* DEPRECATED */								IOFWAsyncCommand *	cmd);
-
-
-    // Send async read response packets
-    // useful for pseudo address spaces that require servicing outside the FireWire work loop.
-    virtual IOReturn asyncReadResponse(	UInt32 					generation, 
-										UInt16 					nodeID, 
-										int 					speed,
-										IOMemoryDescriptor *	buf, 
-										IOByteCount 			offset, 
-										int 					len,
-										IOFWRequestRefCon 		refcon );
-
-    virtual IOReturn asyncLockResponse( UInt32 					generation, 
-										UInt16 					nodeID, 
-										int 					speed,
-                                        IOMemoryDescriptor *	buf, 
-										IOByteCount 			offset, 
-										int 					len,
-                                        IOFWRequestRefCon 		refcon );
-                                       
-    // Try to fix whatever might have caused the other device to not respond
-    virtual IOReturn handleAsyncTimeout(IOFWAsyncCommand *cmd);
-
-    // Convert a firewire nodeID into the IOFireWireDevice for it
-    virtual IOFireWireDevice * nodeIDtoDevice(UInt32 generation, UInt16 nodeID);
-
-    // Add/remove a channel from the list informed of bus resets
-    virtual void addAllocatedChannel(IOFWIsochChannel *channel);
-    virtual void removeAllocatedChannel(IOFWIsochChannel *channel);
-
-	// Add/remove a IRM allocation from the list informed of bus resets
-    virtual void addIRMAllocation(IOFireWireIRMAllocation *irmAllocation);
-    virtual void removeIRMAllocation(IOFireWireIRMAllocation *irmAllocation);
-	
-    // Create an Isochronous Channel object
-    // doIRM = true => allocate channel and bandwith in Isochronous Resource Manager
-    // packetSize packet size (in bytes), used to calculate bandwidth needed.
-    virtual IOFWIsochChannel *createIsochChannel(
-	bool doIRM, UInt32 packetSize, IOFWSpeed prefSpeed,
-	FWIsochChannelForceStopNotificationProc stopProc=NULL,
-	void *stopRefCon=NULL);
-
-    // Create a local isochronous port to run the given DCL program
-    // if task is 0, the DCL program is for the kernel task,
-    // otherwise all DCL pointers are valid in the specified task.
-    // opcodes is also pointer valid in the specified task.
-    virtual IOFWLocalIsochPort *createLocalIsochPort(bool talking,
-        DCLCommand* opcodes, DCLTaskInfo *info = 0,
-	UInt32 startEvent = 0, UInt32 startState = 0, UInt32 startMask = 0);
-
-    // Execute specified function on workloop after specified delay
-    // Returned command is for delay, call it's cancel() function to cancel timeout.
-    virtual IOFWDelayCommand * createDelayedCmd(UInt32 uSecDelay, FWBusCallback func, void *refcon);
-
-    virtual IOFWPhysicalAddressSpace *createPhysicalAddressSpace(IOMemoryDescriptor *mem);
-    virtual IOFWPseudoAddressSpace *createPseudoAddressSpace(FWAddress *addr, UInt32 len,
-                                FWReadCallback reader, FWWriteCallback writer, void *refcon);
-
-    // Extract info about the async request 
-    virtual bool isLockRequest(IOFWRequestRefCon refcon);
-    virtual bool isQuadRequest(IOFWRequestRefCon refcon);
-    virtual UInt32 getExtendedTCode(IOFWRequestRefCon refcon);
-    
-    // Inline accessors for protected member variables
-    IOFWCmdQ &getTimeoutQ();
-	IOFWCmdQ &getPendingQ();
-    IOFWCmdQ &getAfterResetHandledQ();
-    IOFireWireLink * getLink() const;
-
-    IOLocalConfigDirectory *getRootDir() const;
-    bool checkGeneration(UInt32 gen) const;
-    UInt32 getGeneration() const;
-    UInt16 getLocalNodeID() const;
-    IOReturn getIRMNodeID(UInt32 &generation, UInt16 &id);
-    
-    const AbsoluteTime * getResetTime() const;
-
-    IOFWSpeed FWSpeed(UInt16 nodeAddress) const;
-    IOFWSpeed FWSpeed(UInt16 nodeA, UInt16 nodeB) const;
-
-    // How big (as a power of two) can packets sent to/received from the node be?
-    virtual int maxPackLog(bool forSend, UInt16 nodeAddress) const;
-
-    // How big (as a power of two) can packets sent from A to B be?
-    virtual int maxPackLog(UInt16 nodeA, UInt16 nodeB) const;
-
-   // Force given node to be root (via root holdoff Phy packet)
-    virtual IOReturn makeRoot(UInt32 generation, UInt16 nodeID) ;
-
-    virtual IOFWPseudoAddressSpace *createInitialAddressSpace(UInt32 addressLo, UInt32 len,
-                                FWReadCallback reader, FWWriteCallback writer, void *refcon);
-    
-    virtual IOFWAddressSpace *getAddressSpace(FWAddress address);
-    
-    // Extract info about the async request - was the request ack'ed complete already?
-    virtual bool isCompleteRequest(IOFWRequestRefCon refcon);
-
-    // Are we currently scanning the bus?
-    bool scanningBus() const;
-
-protected:
-
-    void openGate();
-    void closeGate();
-		
-protected:    
-	virtual void doBusReset( void );
-	static void resetStateChange( void *refcon, IOReturn status,
-								   IOFireWireBus *bus, IOFWBusCommand *fwCmd);
-
-public:
-	virtual IOReturn disableSoftwareBusResets( void );
-	virtual void enableSoftwareBusResets( void );
-
-    virtual IOFWAsyncStreamCommand * createAsyncStreamCommand( UInt32 generation,
-    			UInt32 channel, UInt32 sync, UInt32 tag, IOMemoryDescriptor *hostMem,
-				UInt32 size, int speed,FWAsyncStreamCallback completion, void *refcon);
-    
-	virtual	IOReturn asyncStreamWrite(UInt32 generation,
-                    int speed, int tag, int sync, int channel,
-                    IOMemoryDescriptor *buf, IOByteCount offset,
-                	int size, IOFWAsyncStreamCommand *cmd);
-					
-protected:
-	bool inGate();
-
-    virtual IOReturn allocatePseudoAddress(FWAddress *addr, UInt32 lenDummy);
-    virtual void freePseudoAddress(FWAddress addr, UInt32 lenDummy);
-	
-	virtual IORegistryEntry * createDummyRegistryEntry( IOFWNodeScan *scan );
-
-	static IOFireWireLocalNode * getLocalNode(IOFireWireController *control);
-	
-	virtual void setPhysicalAccessMode( IOFWPhysicalAccessMode mode );
-	virtual IOFWPhysicalAccessMode getPhysicalAccessMode( void );
-	virtual void physicalAccessProcessBusReset( void );
-	virtual void setNodeIDPhysicalFilter( UInt16 nodeID, bool state );
-	
-	virtual void initSecurity( void );
-	virtual void freeSecurity( void );
-	static bool serverKeyswitchCallback( void * target, void * refCon, IOService * service, IONotifier * notifier );
-	virtual void setSecurityMode( IOFWSecurityMode mode );
-	virtual IOFWSecurityMode getSecurityMode( void );
-
-	virtual IOReturn createTimeoutQ( void );
-	virtual void destroyTimeoutQ( void );
-	virtual IOReturn createPendingQ( void );
-	virtual void destroyPendingQ( void );
-
-	virtual UInt32 countNodeIDChildren( UInt16 nodeID, int hub_port = 0, int * hubChildRemainder = NULL, bool * hubParentFlag = NULL );
-
-public:
-	virtual UInt32 hopCount(UInt16 nodeAAddress, UInt16 nodeBAddress );
-	virtual UInt32 hopCount(UInt16 nodeAAddress );
-	
-	virtual IOFireWirePowerManager * getBusPowerManager( void );
-
-protected:
-	virtual void handleARxReqIntComplete();
-
-    virtual IOReturn asyncLock(	UInt32 					generation, 
-								UInt16 					nodeID, 
-								UInt16 					addrHi, 
-								UInt32 					addrLo,
-								int 					speed, 
-								int 					label, 
-								int 					type, 
-								IOMemoryDescriptor *	buf, 
-								IOByteCount 			offset,
-								int 					size, 
-								IOFWAsyncCommand *		cmd );
-
-    virtual IOReturn asyncWrite(	UInt32 					generation, 
-									UInt16 					nodeID, 
-									UInt16 					addrHi, 
-									UInt32 					addrLo,
-									int 					speed, 
-									int 					label, 
-									IOMemoryDescriptor *	buf, 
-									IOByteCount 			offset,
-									int 					size, 
-									IOFWAsyncCommand *		cmd,
-									IOFWWriteFlags 			flags );
-
-protected:
-	bool delayedStateCommandInUse() const;
-	void enterBusResetDisabledState( );
-	
-	virtual UInt32 getPortNumberFromIndex( UInt16 index );
-												
-    virtual bool checkForDuplicateGUID(IOFWNodeScan *scan, CSRNodeUniqueID *currentGUIDs );
-    virtual void updateDevice(IOFWNodeScan *scan );
-    virtual bool AssignCycleMaster();
-
-public:
-
- 	IOReturn clipMaxRec2K(Boolean clipMaxRec );
-	void setNodeSpeed( UInt16 nodeAddress, IOFWSpeed speed );
-	void useHalfSizePackets( void );
-	void disablePhyPortOnSleepForNodeID( UInt32 nodeID );
-
-	IOReturn handleAsyncCompletion( IOFWCommand *cmd, IOReturn status );
-	void processCycle64Int();
-
-#ifdef LEGACY_SHUTDOWN
-	static IOReturn systemShutDownHandler( void * target, void * refCon,
-                                    UInt32 messageType, IOService * service,
-                                    void * messageArgument, vm_size_t argSize );
-#else
-    virtual void systemWillShutdown( IOOptionBits specifier );
-#endif
-
-	IOReturn beginIOCriticalSection( void );
-	void endIOCriticalSection( void );
-
-protected:	
-	IOReturn poweredStart( void );
-	void setNodeSpeed( UInt16 nodeA, UInt16 nodeB, UInt8 speed );
-	void setNodeSpeed( UInt16 nodeAddress, UInt8 speed );
-
-public:
-	bool isPhysicalAccessEnabledForNodeID( UInt16 nodeID );
-	
-	// Allocate IRM bandwidth if the specified generation is the current FireWire generation.
-	IOReturn allocateIRMBandwidthInGeneration(UInt32 bandwidthUnits, UInt32 generation) ;
-	
-	// Release IRM bandwidth if the specified generation is the current FireWire generation.
-	IOReturn releaseIRMBandwidthInGeneration(UInt32 bandwidthUnits, UInt32 generation) ;
-	
-	// Allocate IRM channel if the specified generation is the current FireWire generation.
-	IOReturn allocateIRMChannelInGeneration(UInt8 isochChannel, UInt32 generation) ;
-	
-	// Release IRM channel if the specified generation is the current FireWire generation.
-	IOReturn releaseIRMChannelInGeneration(UInt8 isochChannel, UInt32 generation) ;
-	
-	// Create an IOFireWireIRMAllocation object which can be used to allocate isoch resources that are automatically reallocated after bus-resets!
-	IOFireWireIRMAllocation *createIRMAllocation(Boolean releaseIRMResourcesOnFree = true, 
-												IOFireWireIRMAllocation::AllocationLostNotificationProc allocationLostProc = NULL,
-												void *pLostNotificationProcRefCon = NULL);
-
-	IOFWAsyncStreamListener *createAsyncStreamListener( UInt32	channel, FWAsyncStreamReceiveCallback proc, void *refcon );
-
-	void removeAsyncStreamListener( IOFWAsyncStreamListener *listener );
-
-	IOFWSpeed getBroadcastSpeed(){ return FWSpeed( fLocalNodeID ); };
-
-private:
-
-	IOFWAsyncStreamReceiver *allocAsyncStreamReceiver( UInt32 channel, FWAsyncStreamReceiveCallback proc, void *refcon );
-
-	IOFWAsyncStreamReceiver *getAsyncStreamReceiver( UInt32 channel );
-
-	void freeAllAsyncStreamReceiver();
-
-	void activateAsyncStreamReceivers();
-
-	void deactivateAsyncStreamReceivers();
-
-protected:
-	IOService *findKeyswitchDevice( void );
-	void suspendBus( void );
-
-public:
-	virtual IOReturn			asyncRead(	UInt32 				generation, 
-											UInt16 				nodeID, 
-											UInt16 				addrHi, 
-											UInt32 				addrLo,
-											int 				speed, 
-											int 				label, 
-											int 				size, 
-											IOFWAsyncCommand *	cmd,
-											IOFWReadFlags		flags );
-
-	void checkProgress( void );
-
-	void terminateDevice( IOFireWireDevice * device );
-
-	void nodeMustBeRoot( UInt32 nodeID );
-
-	void nodeMustNotBeRoot( UInt32 nodeID );	
-
-	void setGapCount( UInt32	gapCount );	
-	
-	IOReturn asyncPHYPacket(	UInt32					generation, 
-								UInt32					data, 
-								UInt32					data2, 
-								IOFWAsyncPHYCommand *	cmd );
-
-    IOFWAsyncPHYCommand * createAsyncPHYCommand(	UInt32				generation,
-													UInt32				data1, 
-													UInt32				data2,			
-													FWAsyncPHYCallback	completion, 
-													void *				refcon, 
-													bool				failOnReset );
-	
-private:
-	AsyncPendingTrans * allocTrans( IOFWAsyncCommand * cmd, IOFWCommand * altcmd );
-
-public:
-
-	IOReturn activatePHYPacketListener( IOFWPHYPacketListener * listener );
-	void deactivatePHYPacketListener( IOFWPHYPacketListener * listener );
-
-	IOFWPHYPacketListener * createPHYPacketListener( FWPHYPacketCallback proc, void * refcon );
-
-private:
-	void processPHYPacket( UInt32 data1, UInt32 data2 );
-	void enterLoggingMode( void );
-
-public:
-	IOReturn getCycleTimeAndUpTime( UInt32 &cycleTime, UInt64 &uptime );
-
-protected:
-	void removeAsyncStreamReceiver( IOFWAsyncStreamReceiver *receiver );
-	
-public:
-
-	// Create a multi-isoch-receive listener
-	IOFireWireMultiIsochReceiveListener * createMultiIsochReceiveListener(UInt32 channel,
-																		  FWMultiIsochReceiveListenerCallback callback,
-																		  void *pCallbackRefCon,
-																		  FWMultiIsochReceiveListenerParams *pListenerParams = NULL);
-	
-	// Activate a multi-isoch-receive listener
-	IOReturn activateMultiIsochReceiveListener(IOFireWireMultiIsochReceiveListener *pListener);
-	
-	// Deactivate a multi-isoch-receive listener
-	IOReturn deactivateMultiIsochReceiveListener(IOFireWireMultiIsochReceiveListener *pListener);
-
-	// Call for client to specify he is done with a multi-isoch receiver isoch packet
-	void clientDoneWithMultiIsochReceivePacket(IOFireWireMultiIsochReceivePacket *pPacket);
-
-public:
-    virtual IOFWAsyncStreamCommand * createAsyncStreamCommand( UInt32 generation,
-    			UInt32 channel, UInt32 sync, UInt32 tag, IOMemoryDescriptor *hostMem,
-				UInt32 size, int speed,FWAsyncStreamCallback completion, void *refcon, bool	failOnReset);
-
-private:
-	void addToIRMAllocationSet(IOFireWireIRMAllocation *anObject);
-	void removeFromIRMAllocationSet(IOFireWireIRMAllocation *anObject);
-	
-protected:	
-	OSMetaClassDeclareReservedUnused(IOFireWireController, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireController, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireController, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireController, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireController, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireController, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireController, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireController, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireController, 8);
-
-};
-
-#endif /* ! _IOKIT_IOFIREWIRECONTROLLER_H */
diff --git a/i386/include/IOKit/firewire/IOFireWireDevice.h b/i386/include/IOKit/firewire/IOFireWireDevice.h
deleted file mode 100644
index a68e5a2..0000000
--- a/i386/include/IOKit/firewire/IOFireWireDevice.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- /*! @header
-	This header contains the definition of the <code>IOFireWireDevice</code> and <code>IOFireWireDeviceAux</code> classes. 
-	An <code>IOFireWireDevice</code> object represents a FireWire device in the I/O Registry.
-	It is strongly recommended that you write applications that access FireWire devices rather than in-kernel device drivers. 
-	For more information on how to do this, see {@linkdoc //apple_ref/doc/uid/TP40000969 FireWire Device Interface Guide}.
-	@indexgroup FireWire
- */
-#ifndef _IOKIT_IOFIREWIREDEVICE_H
-#define _IOKIT_IOFIREWIREDEVICE_H
-
-#include <IOKit/firewire/IOFireWireNub.h>
-
-class IOFireWireROMCache;
-
-struct IOFWNodeScan;
-struct RomScan;
-
-class IOFireWireDevice;
-
-#pragma mark -
-
-/*! @class IOFireWireDeviceAux
-	@discussion An IOFireWireDeviceAux is for internal use only. You should never subclass IOFireWireDeviceAux 
-*/
-
-class IOFireWireDeviceAux : public IOFireWireNubAux
-{
-    OSDeclareDefaultStructors(IOFireWireDeviceAux)
-
-	friend class IOFireWireDevice;
-	
-protected:
-	
-	UInt32			fUnitCount;
-	IOFWSpeed		fMaxSpeed;
-	OSSet *			fOpenUnitSet;
-	AbsoluteTime	fResumeTime;
-	
-	/*! 
-		@struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-    */  
-	  
-    struct ExpansionData { };
-
-	/*! 
-		@var reserved
-		Reserved for future use.  (Internal use only)  
-	*/
-    
-	ExpansionData * reserved;
-
-    virtual bool init( IOFireWireDevice * primary );
-	
-	virtual	void free();
-
-	virtual bool isTerminated( void );
-	
-	virtual void setTerminationState( TerminationState state );
-	
-	void setMaxSpeed( IOFWSpeed speed );
-	
-	void setUnitCount( UInt32 count );
-	
-	UInt32 getUnitCount( void );
-
-	bool isPhysicalAccessEnabled( void );
-
-	virtual IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction );
-		
-    virtual IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction );
-	
-	OSSet * getOpenUnitSet() const;
-	
-	void  latchResumeTime( void );
-	
-	AbsoluteTime getResumeTime( void );
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWireDeviceAux, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireDeviceAux, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireDeviceAux, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireDeviceAux, 3);	
-};
-
-#pragma mark -
-/*! @class IOFireWireDevice
-	@abstract Represents a FireWire device.
-	@discussion The FireWire family tries to read the configuration ROM of each device on the FireWire bus. For each device that responds with 
-				its bus information block, the FireWire family publishes an <code>IOFireWireDevice</code> object in the I/O Registry. An 
-				<code>IOFireWireDevice</code> object keeps track of the device's node ID, copies config ROM properties into the object's property 
-				list, and scans the config ROM for unit directories, publishing an <code>IOFireWireUnit</code> object for each unit directory it finds.
-*/
-
-class IOFireWireDevice : public IOFireWireNub
-{
-    OSDeclareDefaultStructors(IOFireWireDevice)
-
-    friend class IOFireWireController;
-	friend class IOFireWireDeviceAux;
-
-protected:
-
-	enum RegistrationState
-	{
-		kDeviceRegistered,
-		kDeviceNeedsRegisterService,
-		kDeviceNotRegistered
-	};
-	
-    IOFireWireROMCache	*fDeviceROM;
-    bool				fOpenFromDevice;
-    UInt32				fOpenFromUnitCount;
-    UInt32				fROMGeneration;
-    IORecursiveLock		*fROMLock;
-    RegistrationState	fRegistrationState;
-	UInt32				fROMReadRetry;
-	
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-    static	void readROMDirGlue(void *refcon, IOReturn status,
-                               IOFireWireNub *device, IOFWCommand *fwCmd);
-    static	void readROMThreadFunc(void *arg);
-
-    static	void terminateDevice(void *arg);
-    
-    void	processROM(RomScan *romScan);
-    
-    virtual void free();
-    
-public:
-    virtual IOReturn message( UInt32 type, IOService * provider, void * argument );
-
-    virtual bool handleOpen( IOService * forClient, IOOptionBits options, void * arg );
-
-    virtual void handleClose( IOService * forClient, IOOptionBits options );
-
-    virtual bool handleIsOpen( const IOService * forClient ) const;
-
-protected:    
-    virtual IOReturn cacheROM(OSData *rom, UInt32 offset, const UInt32 *&romBase);
-
-    virtual const UInt32 * getROMBase();
-    
-    virtual void setNodeROM(UInt32 generation, UInt16 localNodeID, const IOFWNodeScan *info);
-
-public:
-    virtual bool matchPropertyTable(OSDictionary * table);
-
-	/*!	@function	init
-		@abstract	Initializes the nub.
-		@param		propTable	Property table passed to the standard nub initialization.
-		@param		scan		Pointer to the node scan structure.
-		@result		Returns <code>true</code> if initialization was successful; <code>false</code> otherwise.
-	*/
-    virtual bool init(OSDictionary * propTable, const IOFWNodeScan *scan);
-
-    virtual bool attach(IOService * provider );
-
-    virtual bool finalize( IOOptionBits options );
-
-	/*!	@function	setNodeFlags
-		@abstract	Sets the node's characteristics.
-		@param		flags Refer to "node flags" in IOFireWireFamilyCommon.h.
-	*/
-    virtual void setNodeFlags( UInt32 flags );
-
-	/*!	@function	clearNodeFlags
-		@abstract	Resets the node's characteristics.
-		@param		flags Refer to "node flags" in IOFireWireFamilyCommon.h.
-	*/
-	virtual void clearNodeFlags( UInt32 flags );
-
-	/*!	@function	getNodeFlags
-		@abstract	Retrieves the node's characteristics.
-		@param		flags	Refer to "node flags" in IOFireWireFamilyCommon.h.
-		@result		UInt32	The flags set for a particular node. 
-	*/
-    virtual UInt32 getNodeFlags( void );
-
-protected:
-	virtual IOReturn configureNode( void );
-
-public:
-	/*!	@function	createPhysicalAddressSpace
-		@abstract	Creates local physical FireWire address spaces for the device to access.
-		@param		mem  Memory area allocated to back the physical access by Link hardware.
-		@result		A valid <code>IOFWPhysicalAddressSpace</code> object on success; NULL on failure.
-	*/
-    virtual IOFWPhysicalAddressSpace *createPhysicalAddressSpace(IOMemoryDescriptor *mem);
-
-	/*!	@function	createPseudoAddressSpace
-		@abstract	Creates local pseudo FireWire address spaces for the device to access.
-		@param		addr	The FireWire address that is mapped to the pseudo address access.
-		@param		len		Size of the address space to allocate.
-		@param		reader  Read callback, when the device reads from this address space.
-		@param		writer  Write callback, when the device writes to this address space.
-		@param		refcon  Client's callback object returned during reader/writer callbacks.
-		@result		A valid <code>IOFWPseudoAddressSpace</code> object on success; NULL on failure.
-	*/
-    virtual IOFWPseudoAddressSpace *createPseudoAddressSpace(FWAddress *addr, UInt32 len,
-                    FWReadCallback reader, FWWriteCallback writer, void *refcon);
-
-protected:
-	virtual IOReturn readRootDirectory( IOConfigDirectory * directory, OSDictionary * propTable );
-
-	virtual IOReturn processRootDirectory( OSDictionary * propTable );
-
-	virtual IOReturn readUnitDirectories( IOConfigDirectory * directory, OSSet * unitInfo );
-
-	virtual IOReturn processUnitDirectories( OSSet * unitSet );
-    
-	virtual void setRegistrationState( RegistrationState fRegistrationState );
-	
-	virtual void preprocessDirectories( OSDictionary * rootPropTable, OSSet * unitSet );
-	
-	virtual void configurePhysicalFilter( void );
-
-protected:
-	virtual IOFireWireNubAux * createAuxiliary( void );
-
-public:
-	inline bool isTerminated( void )
-		{ return ((IOFireWireDeviceAux*)fAuxiliary)->isTerminated(); }
-		
-	/*!	@function	setMaxSpeed
-		@abstract	Sets the maximum speed for this node.
-		@param		speed Maximum speed. Refer to "bus speed numbers" in IOFireWireFamilyCommon.h.
-	*/
-	inline void setMaxSpeed( IOFWSpeed speed )
-		{ ((IOFireWireDeviceAux*)fAuxiliary)->setMaxSpeed( speed ); }		
-
-protected:
-	inline void setUnitCount( UInt32 count )
-		{ ((IOFireWireDeviceAux*)fAuxiliary)->setUnitCount( count ); }		
-
-	inline OSSet * getOpenUnitSet( void ) const
-		{ return ((IOFireWireDeviceAux*)fAuxiliary)->getOpenUnitSet(); }
-			
-public:
-	/*!	@function	getUnitCount
-		@abstract	Returns number of units attached to this device.
-		@result		UInt32 The number of units attached to this device.
-	*/
-	inline UInt32 getUnitCount( void )
-		{ return ((IOFireWireDeviceAux*)fAuxiliary)->getUnitCount(); }		
-
-protected:
-	inline AbsoluteTime getResumeTime( void )
-		{ return ((IOFireWireDeviceAux*)fAuxiliary)->getResumeTime(); }		
-
-	inline void latchResumeTime( void )
-		{ ((IOFireWireDeviceAux*)fAuxiliary)->latchResumeTime(); }		
-		
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWireDevice, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireDevice, 1);
-
-};
-
-#endif /* ! _IOKIT_IOFIREWIREDEVICE_H */
diff --git a/i386/include/IOKit/firewire/IOFireWireFamilyCommon.h b/i386/include/IOKit/firewire/IOFireWireFamilyCommon.h
deleted file mode 100644
index ceb426d..0000000
--- a/i386/include/IOKit/firewire/IOFireWireFamilyCommon.h
+++ /dev/null
@@ -1,1235 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *  IOFireWireFamilyCommon.h
- *  IOFireWireUserClient/IOFireWireFamily
- *
- *  Created by NWG on Fri Apr 28 2000.
- *  Copyright (c) 2000-2001 Apple Computer, Inc. All rights reserved.
- *
- */
-/*
-	$Log: IOFireWireFamilyCommon.h,v $
-	Revision 1.79  2008/07/15 01:29:44  collin
-	<rdar://problem/5859733> & <rdar://problem/5843668>
-	
-	Revision 1.78  2008/05/08 02:33:22  collin
-	more K64
-	
-	Revision 1.77  2008/04/24 00:01:39  collin
-	more K640
-	
-	Revision 1.76  2007/12/05 04:52:08  collin
-	integrate chex workaround
-	
-	Revision 1.75  2007/08/31 20:29:06  collin
-	fixed 5437835
-	
-	Revision 1.74  2007/04/24 21:40:23  arulchan
-	headerdoc changes
-	
-	Revision 1.73  2007/04/24 21:28:24  arulchan
-	changes for headerdoc
-	
-	Revision 1.72  2007/04/13 19:37:01  calderon
-	Integrated FireWireKPrintf implemented
-	
-	Revision 1.71  2007/03/14 18:41:43  collin
-	*** empty log message ***
-	
-	Revision 1.70  2007/02/28 23:10:13  ayanowit
-	Another IRMAllocation fix.
-	
-	Revision 1.69  2007/02/20 01:25:28  collin
-	*** empty log message ***
-	
-	Revision 1.68  2007/02/17 00:26:51  collin
-	*** empty log message ***
-	
-	Revision 1.67  2007/02/15 19:42:07  ayanowit
-	For 4369537, eliminated support for legacy DCL SendPacketWithHeader, since it didn't work anyway, and NuDCL does support it.
-	
-	Revision 1.66  2007/02/15 01:23:39  arulchan
-	changes in AssignCycleMaster
-	
-	Revision 1.65  2007/02/09 04:44:06  collin
-	*** empty log message ***
-	
-	Revision 1.64  2007/01/26 20:52:31  ayanowit
-	changes to user-space isoch stuff to support 64-bit apps.
-	
-	Revision 1.63  2007/01/16 01:41:02  gecko1
-	4159728 Add improved async lock based check for bad IRMs
-	
-	Revision 1.62  2007/01/15 23:29:05  arulchan
-	Fixed Skipped Packet Handler Notifications
-	
-	Revision 1.61  2007/01/12 22:15:14  arulchan
-	Added flag kIOFWEnableBeingRoot
-	
-	Revision 1.60  2007/01/10 22:14:44  calderon
-	Fixed 4046607 Propagate vendor/model from IIDC UnitDepedantInfoDir
-	Fixed some null termination shinanigans in getIndexValue(string)
-	
-	Revision 1.59  2007/01/08 18:47:19  ayanowit
-	More 64-bit changes for isoch.
-	
-	Revision 1.58  2006/07/07 20:18:25  calderon
-	4227201: SpeedMap and HopCount table reductions.
-	
-	Revision 1.57  2006/04/03 21:29:48  collin
-	*** empty log message ***
-	
-	Revision 1.56  2006/02/09 00:21:51  niels
-	merge chardonnay branch to tot
-	
-	Revision 1.55.4.1  2005/08/06 01:31:31  collin
-	*** empty log message ***
-	
-	Revision 1.55  2005/03/12 03:27:51  collin
-	*** empty log message ***
-	
-	Revision 1.54  2005/01/12 06:34:53  collin
-	*** empty log message ***
-	
-	Revision 1.53  2004/05/04 22:52:19  niels
-	*** empty log message ***
-	
-	Revision 1.52  2004/03/26 01:42:53  gecko1
-	Add code to disable any port directly connected to an iPod when we go to sleep.
-	
-	Revision 1.51  2004/03/05 00:33:59  calderon
-	Fixed 3570909 - FireWire - iokit_fw_errs should be defined in hex
-	All decimal #define errors in header changed to hex
-	
-	Revision 1.50  2003/11/07 21:01:18  niels
-	Revision 1.49  2003/10/21 01:16:41  collin
-	Revision 1.48  2003/10/17 00:25:24  collin
-	Revision 1.47  2003/10/15 02:19:45  collin
-	Revision 1.46  2003/07/22 10:49:47  niels
-	Revision 1.45  2003/07/21 06:52:59  niels
-	merge isoch to TOT
-	
-	Revision 1.44.4.5  2003/07/21 06:44:44  niels
-	Revision 1.44.4.4  2003/07/18 00:17:42  niels
-	Revision 1.44.4.3  2003/07/14 22:08:53  niels
-	Revision 1.44.4.2  2003/07/09 21:24:01  niels
-	Revision 1.44.4.1  2003/07/01 20:54:07  niels
-	isoch merge
-	
-	Revision 1.44  2003/03/17 01:05:22  collin
-	Revision 1.43  2003/03/07 01:26:06  collin
-	Revision 1.42  2003/02/19 22:33:17  niels
-	add skip cycle DCL
-	
-	Revision 1.41  2003/02/18 00:14:01  collin
-	Revision 1.40  2003/02/17 21:47:52  collin
-	Revision 1.39  2002/12/05 19:08:37  niels
-	remove trailing commas from enums in IOFireWireFamilyCommon.h
-	
-	Revision 1.38  2002/11/01 20:45:57  collin
-	add enhanced IRM with support for the BROADCAST_CHANNEL register
-	
-	Revision 1.37  2002/10/01 02:40:27  collin
-	security mode support
-	
-	Revision 1.36  2002/09/25 21:17:14  collin
-	fix headers again.
-	
-	Revision 1.35  2002/09/25 00:27:23  niels
-	flip your world upside-down
-	
-	Revision 1.34  2002/09/12 22:41:53  niels
-	add GetIRMNodeID() to user client
-	
-*/
-
-/*! @header IOFireWireFamilyCommon.h
-This file contains useful definitions for working with FireWire
-in the kernel and in user space
-*/
-
-#ifndef __IOFireWireFamilyCommon_H__
-#define __IOFireWireFamilyCommon_H__
-
-#ifdef KERNEL
-#ifndef __IOKIT_IOTYPES_H
-	#include <IOKit/IOTypes.h>
-#endif
-#else
-#include <IOKit/IOKitLib.h>
-#endif
-
-//#define LEGACY_SHUTDOWN
-
-#define FW_OLD_DCL_DEFS
-#define FW_OLD_BIT_DEFS
-
-// =================================================================
-// bit ranges and fields
-// =================================================================
-#pragma mark -
-#pragma mark BITS
-
-// FireWire bit defs.
-
-#define BIT(x)		( 1 << (x) )
-#define FW_BIT(x)	( 1 << (31 - (x) ) )
-
-#define FWBitRange(start, end)						\
-(													\
-	((((UInt32) 0xFFFFFFFF) << (start)) >>			\
-	 ((start) + (31 - (end)))) <<					\
-	(31 - (end))									\
-)
-
-#define FWBitRangePhase(start, end)					\
-	(31 - (end))
-
-#define BitRange(start, end)						\
-(													\
-	((((UInt32) 0xFFFFFFFF) << (31 - (end))) >>		\
-	 ((31 - (end)) + (start))) <<					\
-	(start)											\
-)
- 
-
-#define BitRangePhase(start, end)					\
-	(start)
-
-// =================================================================
-// FireWire messages & errors
-// =================================================================
-#pragma mark -
-#pragma mark MESSAGES AND ERRORS
-
-#define	iokit_fw_err(return) (sys_iokit|sub_iokit_firewire|return)
-
-// e0008010 -> 0xe000801f Response codes from response packets
-
-// Base of Response error codes
-#define kIOFireWireResponseBase							iokit_fw_err(0x10)
-
-// e0008020 -- Bus reset during command execution (current bus generation does
-//             not match that specified in command.)
-#define kIOFireWireBusReset								(kIOFireWireResponseBase+kFWResponseBusResetError)
-
-// e0008001 -- Can't find requested entry in ROM
-#define kIOConfigNoEntry								iokit_fw_err(0x1)
-
-// e0008002 -- In pending queue waiting to execute
-#define kIOFireWirePending								iokit_fw_err(0x2)
-
-// e0008003 -- Last DCL callback of program (internal use)
-#define kIOFireWireLastDCLToken							iokit_fw_err(0x3)
-
-// e0008004
-#define kIOFireWireConfigROMInvalid						iokit_fw_err(0x4)
-
-// e0008005
-#define kIOFireWireAlreadyRegistered					iokit_fw_err(0x5)
-
-// e0008006
-#define kIOFireWireMultipleTalkers						iokit_fw_err(0x6)
-
-// e0008007
-#define kIOFireWireChannelActive						iokit_fw_err(0x7)
-
-// e0008008
-#define kIOFireWireNoListenerOrTalker					iokit_fw_err(0x8)
-
-// e0008009
-#define kIOFireWireNoChannels							iokit_fw_err(0x9)
-
-// e000800A
-#define kIOFireWireChannelNotAvailable					iokit_fw_err(0xA)
-
-// e000800B
-#define kIOFireWireSeparateBus							iokit_fw_err(0xB)
-
-// e000800C
-#define kIOFireWireBadSelfIDs							iokit_fw_err(0xC)
-
-// e000800D
-#define kIOFireWireLowCableVoltage						iokit_fw_err(0xD)
-
-// e000800E
-#define kIOFireWireInsufficientPower					iokit_fw_err(0xE)
-
-// e000800f
-#define kIOFireWireOutOfTLabels							iokit_fw_err(0xF)
-
-// NOTE: errors 16Ñ31 used for address space response codes.. (see above)
-
-// e0008101
-#define kIOFireWireBogusDCLProgram						iokit_fw_err(0x101)
-
-// e0008102
-#define kIOFireWireTalkingAndListening					iokit_fw_err(0x102)
-
-// e0008103
-#define kIOFireWireHardwareSlept						iokit_fw_err(0x103)
-
-// e0008104		// let's resume here...
-
-// e0008104 -- In the middle of completing
-#define kIOFireWireCompleting							iokit_fw_err(0x104)
-
-// e0008105 -- Invalid Response Length
-#define kIOFireWireInvalidResponseLength				iokit_fw_err(0x105)
-
-// e0008106 -- Isoch Bandwidth Not Available
-#define kIOFireWireIsochBandwidthNotAvailable			iokit_fw_err(0x106)
-
-
-// e00087d0
-#define kIOFWMessageServiceIsRequestingClose 			(UInt32)iokit_fw_err(0x7D0)
-#define kIOFWMessagePowerStateChanged 					(UInt32)iokit_fw_err(0x7D1)
-#define kIOFWMessageTopologyChanged						(UInt32)iokit_fw_err(0x7D2)
-// =================================================================
-// Pseudo address space response codes
-// =================================================================
-#pragma mark -
-#pragma mark PSEDUO ADDRESS SPACE RESPONSE CODES
-enum
-{
-	kFWResponseComplete			= 0,	// OK!
-	kFWResponseConflictError	= 4,	// Resource conflict, may retry
-	kFWResponseDataError		= 5,	// Data not available
-	kFWResponseTypeError		= 6,	// Operation not supported
-	kFWResponseAddressError		= 7,	// Address not valid in target device
-	kFWResponseBusResetError	= 16,	// Pseudo response generated locally
-	kFWResponsePending			= 17	// Pseudo response, real response sent later.
-};
-
-//
-// Pseudo address space response codes
-//
-enum
-{
-	kFWAckTimeout				= -1,	// Pseudo ack generated locally
-	kFWAckComplete				= 1,
-	kFWAckPending				= 2,
-	kFWAckBusyX					= 4,
-	kFWAckBusyA					= 5,
-	kFWAckBusyB					= 6,
-	kFWAckDataError				= 13,
-	kFWAckTypeError				= 14
-};
-
-// =================================================================
-// FireWire bus speed numbers
-// =================================================================
-#pragma mark -
-#pragma mark BUS SPEED NUMBERS
-
-typedef enum
-{
-	kFWSpeed100MBit			= 0,
-	kFWSpeed200MBit			= 1,
-	kFWSpeed400MBit			= 2,
-	kFWSpeed800MBit			= 3,
-	kFWSpeedReserved		= 3,	// In all cases, 1394B Devices report this speed, 
-									// each port of the PHY could be different
-	
-	kFWSpeedUnknownMask		= 0x80,	// If speed was reserved and we haven't probed it further
-	
-	kFWSpeedMaximum			= 0x7FFFFFFF,	
-	kFWSpeedInvalid			= 0x80000000
-} IOFWSpeed;
-
-// =================================================================
-// FWAddress
-// =================================================================
-#pragma mark -
-#pragma mark FWADDRESS
-//
-// The venerable FWAddress structure. This is the standard
-// struct to use for passing FireWire addresses.
-//
-
-typedef struct FWAddressStruct
-{
-    UInt16	nodeID;		// bus/node
-    UInt16	addressHi;	// Top 16 bits of node address.
-    UInt32	addressLo;	// Bottom 32 bits of node address
-	
-	//
-	// Useful C++ only constructors
-	//
-	#ifdef __cplusplus
-	FWAddressStruct(const FWAddressStruct & a): 
-			nodeID(a.nodeID), addressHi(a.addressHi), addressLo(a.addressLo) {};
-    FWAddressStruct(UInt16 h=0xdead, UInt32 l=0xcafebabe) : 
-			nodeID(0), addressHi(h), addressLo(l) {};
-	FWAddressStruct(UInt16 h, UInt32 l, UInt16 n) :
-			nodeID(n), addressHi(h), addressLo(l) {};
-	#endif
-} FWAddress, *FWAddressPtr ;
-
-// =================================================================
-// Config ROM
-// =================================================================
-#pragma mark -
-#pragma mark CONFIG ROM
-
-//
-// CSR bit defs.
-//
-
-#define CSR_BIT(x) FW_BIT(x)
-
-#define CSRBitRange(start, end)						\
-(													\
-	((((UInt32) 0xFFFFFFFF) << (start)) >>			\
-	((start) + (31 - (end)))) <<					\
-	(31 - (end))									\
-)
-
-#define CSRBitRangePhase(start, end)				\
-	(31 - end)
-
-//
-// Key types.
-//
-
-typedef enum
-{
-	kConfigImmediateKeyType		= 0,
-	kConfigOffsetKeyType		= 1,
-	kConfigLeafKeyType		= 2,
-	kConfigDirectoryKeyType		= 3,
-	kInvalidConfigROMEntryType	= 0xff
-} IOConfigKeyType;
-
-//
-// Key values.
-//
-
-enum
-{
-	kConfigTextualDescriptorKey		= 0x01,
-	kConfigBusDependentInfoKey		= 0x02,
-	kConfigModuleVendorIdKey		= 0x03,
-	kConfigModuleHwVersionKey		= 0x04,
-	kConfigModuleSpecIdKey			= 0x05,
-	kConfigModuleSwVersionKey		= 0x06,
-	kConfigModuleDependentInfoKey	= 0x07,
-	kConfigNodeVendorIdKey			= 0x08,
-	kConfigNodeHwVersionKey			= 0x09,
-	kConfigNodeSpecIdKey			= 0x0A,
-	kConfigNodeSwVersionKey			= 0x0B,
-	kConfigNodeCapabilitiesKey		= 0x0C,
-	kConfigNodeUniqueIdKey			= 0x0D,
-	kConfigNodeUnitsExtentKey		= 0x0E,
-	kConfigNodeMemoryExtentKey		= 0x0F,
-	kConfigNodeDependentInfoKey		= 0x10,
-	kConfigUnitDirectoryKey			= 0x11,
-	kConfigUnitSpecIdKey			= 0x12,
-	kConfigUnitSwVersionKey			= 0x13,
-	kConfigUnitDependentInfoKey		= 0x14,
-	kConfigUnitLocationKey			= 0x15,
-	kConfigUnitPollMaskKey			= 0x16,
-	kConfigModelIdKey				= 0x17,
-	kConfigGenerationKey			= 0x38,		// Apple-specific
-
-	kConfigRootDirectoryKey			= 0xffff	// Not a real key
-};
-
-enum
-{
-	kConfigSBP2LUN					= 0x14,
-	kConfigSBP2Revision				= 0x21,
-	kConfigSBP2MAO					= 0x54	
-};
-
-// Core CSR registers.
-enum
-{
-	kCSRStateUnitDepend			= CSRBitRange(0, 15),
-	kCSRStateUnitDependPhase	= CSRBitRangePhase(0, 15),
-
-	kCSRStateBusDepend			= CSRBitRange(16, 23),
-	kCSRStateBusDependPhase		= CSRBitRangePhase(16, 23),
-
-	kCSRStateLost				= CSR_BIT(24),
-	kCSRStateDReq				= CSR_BIT(25),
-	kCSRStateELog				= CSR_BIT(27),
-	kCSRStateAtn				= CSR_BIT(28),
-	kCSRStateOff				= CSR_BIT(29),
-
-	kCSRStateState				= CSRBitRange(30, 31),
-	kCSRStateStatePhase			= CSRBitRangePhase(30, 31),
-	kCSRStateStateRunning		= 0,
-	kCSRStateStateInitializing	= 1,
-	kCSRStateStateTesting		= 2,
-	kCSRStateStateDead			= 3
-};
-
-// Config ROM entry bit locations.
-
-enum
-{
-	kConfigBusInfoBlockLength		= CSRBitRange (0, 7),
-	kConfigBusInfoBlockLengthPhase	= CSRBitRangePhase (0, 7),
-
-	kConfigROMCRCLength				= CSRBitRange (8, 15),
-	kConfigROMCRCLengthPhase		= CSRBitRangePhase (8, 15),
-
-	kConfigROMCRCValue				= CSRBitRange (16, 31),
-	kConfigROMCRCValuePhase			= CSRBitRangePhase (16, 31),
-
-	kConfigEntryKeyType				= CSRBitRange (0, 1),
-	kConfigEntryKeyTypePhase		= CSRBitRangePhase (0, 1),
-
-	kConfigEntryKeyValue			= CSRBitRange (2, 7),
-	kConfigEntryKeyValuePhase		= CSRBitRangePhase (2, 7),
-
-	kConfigEntryValue				= CSRBitRange (8, 31),
-	kConfigEntryValuePhase			= CSRBitRangePhase (8, 31),
-
-	kConfigLeafDirLength			= CSRBitRange (0, 15),
-	kConfigLeafDirLengthPhase		= CSRBitRangePhase (0, 15),
-
-	kConfigLeafDirCRC				= CSRBitRange (16, 31),
-	kConfigLeafDirCRCPhase			= CSRBitRangePhase (16, 31)
-};
-
-//
-// Key types.
-//
-typedef enum
-{
-	kCSRImmediateKeyType		= 0,
-	kCSROffsetKeyType			= 1,
-	kCSRLeafKeyType				= 2,
-	kCSRDirectoryKeyType		= 3,
-    kInvalidCSRROMEntryType		= 0xff
-} IOCSRKeyType;
-
-// CSR 64-bit fixed address defs.
-
-enum
-{
-	kCSRNodeID								= CSRBitRange (0, 15),
-	kCSRNodeIDPhase							= CSRBitRangePhase (0, 15),
-
-	kCSRInitialMemorySpaceBaseAddressHi		= 0x00000000,
-	kCSRInitialMemorySpaceBaseAddressLo		= 0x00000000,
-
-	kCSRPrivateSpaceBaseAddressHi			= 0x0000FFFF,
-	kCSRPrivateSpaceBaseAddressLo			= 0xE0000000,
-
-	kCSRRegisterSpaceBaseAddressHi			= 0x0000FFFF,
-	kCSRRegisterSpaceBaseAddressLo			= 0xF0000000,
-
-	kCSRCoreRegistersBaseAddress			= kCSRRegisterSpaceBaseAddressLo,
-	kCSRStateClearAddress					= kCSRCoreRegistersBaseAddress + 0x0000,
-	kCSRStateSetAddress						= kCSRCoreRegistersBaseAddress + 0x0004,
-	kCSRNodeIDsAddress						= kCSRCoreRegistersBaseAddress + 0x0008,
-	kCSRResetStartAddress					= kCSRCoreRegistersBaseAddress + 0x000C,
-	kCSRIndirectAddressAddress				= kCSRCoreRegistersBaseAddress + 0x0010,
-	kCSRIndirectDataAddress					= kCSRCoreRegistersBaseAddress + 0x0014,
-	kCSRSplitTimeoutHiAddress				= kCSRCoreRegistersBaseAddress + 0x0018,
-	kCSRSplitTimeoutLoAddress				= kCSRCoreRegistersBaseAddress + 0x001C,
-	kCSRArgumentHiAddress					= kCSRCoreRegistersBaseAddress + 0x0020,
-	kCSRArgumentLoAddress					= kCSRCoreRegistersBaseAddress + 0x0024,
-	kCSRTestStartAddress					= kCSRCoreRegistersBaseAddress + 0x0028,
-	kCSRTestStatusAddress					= kCSRCoreRegistersBaseAddress + 0x002C,
-	kCSRUnitsBaseHiAddress					= kCSRCoreRegistersBaseAddress + 0x0030,
-	kCSRUnitsBaseLoAddress					= kCSRCoreRegistersBaseAddress + 0x0034,
-	kCSRUnitsBoundHiAddress					= kCSRCoreRegistersBaseAddress + 0x0038,
-	kCSRUnitsBoundLoAddress					= kCSRCoreRegistersBaseAddress + 0x003C,
-	kCSRMemoryBaseHiAddress					= kCSRCoreRegistersBaseAddress + 0x0040,
-	kCSRMemoryBaseLoAddress					= kCSRCoreRegistersBaseAddress + 0x0044,
-	kCSRMemoryBoundHiAddress				= kCSRCoreRegistersBaseAddress + 0x0048,
-	kCSRMemoryBoundLoAddress				= kCSRCoreRegistersBaseAddress + 0x004C,
-	kCSRInterruptTargetAddress				= kCSRCoreRegistersBaseAddress + 0x0050,
-	kCSRInterruptMaskAddress				= kCSRCoreRegistersBaseAddress + 0x0054,
-	kCSRClockValueHiAddress					= kCSRCoreRegistersBaseAddress + 0x0058,
-	kCSRClockValueMidAddress				= kCSRCoreRegistersBaseAddress + 0x005C,
-	kCSRClockTickPeriodMidAddress			= kCSRCoreRegistersBaseAddress + 0x0060,
-	kCSRClockTickPeriodLoAddress			= kCSRCoreRegistersBaseAddress + 0x0064,
-	kCSRClockStrobeArrivedHiAddress			= kCSRCoreRegistersBaseAddress + 0x0068,
-	kCSRClockStrobeArrivedMidAddress		= kCSRCoreRegistersBaseAddress + 0x006C,
-	kCSRClockInfo0Address					= kCSRCoreRegistersBaseAddress + 0x0070,
-	kCSRClockInfo1Address					= kCSRCoreRegistersBaseAddress + 0x0074,
-	kCSRClockInfo2Address					= kCSRCoreRegistersBaseAddress + 0x0078,
-	kCSRClockInfo3Address					= kCSRCoreRegistersBaseAddress + 0x007C,
-	kCSRMessageRequestAddress				= kCSRCoreRegistersBaseAddress + 0x0080,
-	kCSRMessageResponseAddress				= kCSRCoreRegistersBaseAddress + 0x00C0,
-	kCSRErrorLogBufferAddress				= kCSRCoreRegistersBaseAddress + 0x0180,
-
-	kCSRBusDependentRegistersBaseAddress	= kCSRRegisterSpaceBaseAddressLo + 0x0200,
-	kCSRBusyTimeout							= kCSRRegisterSpaceBaseAddressLo + 0x0210,
-	kCSRBusManagerID						= kCSRRegisterSpaceBaseAddressLo + 0x021C,
-	kCSRBandwidthAvailable					= kCSRRegisterSpaceBaseAddressLo + 0x0220,
-	kCSRChannelsAvailable31_0				= kCSRRegisterSpaceBaseAddressLo + 0x0224,
-	kCSRChannelsAvailable63_32				= kCSRRegisterSpaceBaseAddressLo + 0x0228,
-	kCSRBroadcastChannel					= kCSRRegisterSpaceBaseAddressLo + 0x0234,
-	
-	kConfigROMBaseAddress					= kCSRRegisterSpaceBaseAddressLo + 0x0400,
-	kConfigBIBHeaderAddress					= kConfigROMBaseAddress,
-	kConfigBIBBusNameAddress				= kConfigROMBaseAddress + 4,
-	
-	kPCRBaseAddress							= kCSRRegisterSpaceBaseAddressLo + 0x900,
-	kFCPCommandAddress						= kCSRRegisterSpaceBaseAddressLo + 0xb00,
-	kFCPResponseAddress						= kCSRRegisterSpaceBaseAddressLo + 0xd00
-};
-
-// from figure 10-7 of 1394a
-#define kBroadcastChannelInitialValues 	0x8000001f
-#define kBroadcastChannelValidMask 		0x40000000
-
-// CSR defined 64 bit unique ID.
-
-typedef UInt64 CSRNodeUniqueID;
-
-// FireWire core CSR registers.
-
-enum
-{
-	kFWCSRStateGone				= FW_BIT(16),
-	kFWCSRStateLinkOff			= FW_BIT(22),
-	kFWCSRStateCMstr			= FW_BIT(23)
-};
-
-// FireWire bus/nodeID address defs.
-
-enum
-{
-	kFWAddressBusID				= FWBitRange (16, 25) << kCSRNodeIDPhase,
-	kFWAddressBusIDPhase		= FWBitRangePhase (16, 25) + kCSRNodeIDPhase,
-
-	kFWAddressNodeID			= FWBitRange (26, 31) << kCSRNodeIDPhase,
-	kFWAddressNodeIDPhase		= FWBitRangePhase (26, 31) + kCSRNodeIDPhase,
-
-	kFWLocalBusID				= 1023,
-	kFWBroadcastNodeID			= 63,
-	kFWBadNodeID				= 0xffff,
-
-	kFWLocalBusAddress			= kFWLocalBusID << kFWAddressBusIDPhase,
-	kFWBroadcastAddress			= kFWBroadcastNodeID << kFWAddressNodeIDPhase
-};
-
-#define FWNodeBaseAddress(busID, nodeID)												\
-(																						\
-	(busID << kFWAddressBusIDPhase) |													\
-	(nodeID << kFWAddressNodeIDPhase)													\
-)
-
-#define FWNodeRegisterSpaceBaseAddressHi(busID, nodeID)									\
-(																						\
-	FWNodeBaseAddress (busID, nodeID) |													\
-	kCSRRegisterSpaceBaseAddressHi														\
-)
-
-// FireWire CSR bus info block defs.
-
-enum
-{
-	kFWBIBHeaderAddress					= kConfigBIBHeaderAddress,
-	kFWBIBBusNameAddress				= kConfigBIBBusNameAddress,
-	kFWBIBNodeCapabilitiesAddress		= kConfigROMBaseAddress + 8,
-	kFWBIBNodeUniqueIDHiAddress			= kConfigROMBaseAddress + 12,
-	kFWBIBNodeUniqueIDLoAddress			= kConfigROMBaseAddress + 16,
-
-	kFWBIBBusName						= 0x31333934, //'1394'
-
-	kFWBIBIrmc							= FW_BIT(0),
-	kFWBIBCmc							= FW_BIT(1),
-	kFWBIBIsc							= FW_BIT(2),
-	kFWBIBBmc							= FW_BIT(3),
-	kFWBIBCycClkAcc						= FWBitRange (8, 15),
-	kFWBIBCycClkAccPhase				= FWBitRangePhase (8, 15),
-	kFWBIBMaxRec						= FWBitRange (16, 19),
-	kFWBIBMaxRecPhase					= FWBitRangePhase (16, 19),
-	kFWBIBMaxROM						= FWBitRange (20, 21),
-	kFWBIBMaxROMPhase					= FWBitRangePhase (20, 21),
-	kFWBIBGeneration					= FWBitRange (24, 27),
-	kFWBIBGenerationPhase				= FWBitRangePhase (24, 27),
-	kFWBIBLinkSpeed						= FWBitRange (29, 31),
-	kFWBIBLinkSpeedPhase				= FWBitRangePhase (29, 31)
-};
-
-enum
-{
-	kConfigUnitSpecAppleA27				= 0x000a27,
-	kConfigUnitSpec1394TA1				= 0x00a02d,
-	
-	kConfigUnitSWVersMacintosh10		= 10,
-	kConfigUnitSWVersIIDC100			= 0x000100,
-	kConfigUnitSWVersIIDC101			= 0x000101,
-	kConfigUnitSWVersIIDC102			= 0x000102
-};
-
-
-// =================================================================
-// Isoch defines
-// =================================================================
-#pragma mark -
-#pragma mark ISOCH
-
-enum
-{
-	kFWIsochDataLength		= FWBitRange (0, 15),
-	kFWIsochDataLengthPhase	= FWBitRangePhase (0, 15),
-	
-	kFWIsochTag				= FWBitRange (16, 17),
-	kFWIsochTagPhase		= FWBitRangePhase (16, 17),
-
-	kFWIsochChanNum			= FWBitRange (18, 23),
-	kFWIsochChanNumPhase	= FWBitRangePhase (18, 23),
-
-	kFWIsochTCode			= FWBitRange (24, 27),
-	kFWIsochTCodePhase		= FWBitRangePhase (24, 27),
-
-	kFWIsochSy				= FWBitRange (28, 31),
-	kFWIsochSyPhase			= FWBitRangePhase (28, 31)
-};
-
-#define CHAN_BIT(x) 		(((UInt64)1) << (63 - (x))
-#define CHAN_MASK(x) 		(~CHAN_BIT(X))
-
-typedef enum
-{
-	kFWNeverMultiMode = 0,
-	kFWAllowMultiMode,
-	kFWSuggestMultiMode,
-	kFWAlwaysMultiMode,
-	
-	kFWDefaultIsochResourceFlags = kFWNeverMultiMode
-} IOFWIsochResourceFlags ;
-
-enum
-{
-	kFWIsochChannelDefaultFlags = 0,
-	kFWIsochChannelDoNotResumeOnWake = BIT(1)
-} ;
-
-typedef enum
-{
-	kFWIsochPortDefaultOptions = 0,
-	kFWIsochPortUseSeparateKernelThread		= BIT(1),
-	kFWIsochEnableRobustness			= BIT(2),
-	kFWIsochBigEndianUpdates			= BIT(3),	// private
-	kFWIsochRequireLastContext			= BIT(4),	// private
-} IOFWIsochPortOptions ;
-
-// =================================================================
-// DCL opcode defs.
-// =================================================================
-#pragma mark -
-#pragma mark DCL OPCODES
-
-enum
-{
-	kFWDCLImmediateEvent				= 0,
-	kFWDCLCycleEvent					= 1,
-	kFWDCLSyBitsEvent					= 2
-};
-
-typedef enum
-{
-	kFWDCLInvalidNotification				= 0
-	, kFWDCLUpdateNotification				= 1
-	, kFWDCLModifyNotification				= 2
-	, kFWNuDCLModifyNotification			= 3
-	, kFWNuDCLModifyJumpNotification		= 4
-	, kFWNuDCLUpdateNotification			= 5
-} IOFWDCLNotificationType ;
-
-enum
-{
-	kFWDCLOpDynamicFlag					= BIT(16),
-	kFWDCLOpVendorDefinedFlag			= BIT(17),
-	kFWDCLOpFlagMask					= BitRange (16, 31),
-	kFWDCLOpFlagPhase					= BitRangePhase (16, 31)
-};
-
-enum
-{
-	kDCLInvalidOp						= 0,
-	kDCLSendPacketStartOp				= 1,
-	//kDCLSendPacketWithHeaderStartOp		= 2, // Deprecated legacy DCL opcode! Use NuDCL instead!
-	kDCLSendPacketOp					= 3,
-	kDCLSendBufferOp					= 4,	// obsolete - do not use
-	kDCLReceivePacketStartOp			= 5,
-	kDCLReceivePacketOp					= 6,
-	kDCLReceiveBufferOp					= 7,	// obsolete - do not use
-	kDCLCallProcOp						= 8,
-	kDCLLabelOp							= 9,
-	kDCLJumpOp							= 10,
-	kDCLSetTagSyncBitsOp				= 11,
-	kDCLUpdateDCLListOp					= 12,
-	kDCLTimeStampOp						= 13,
-	kDCLPtrTimeStampOp					= 14,
-	kDCLSkipCycleOp						= 15,
-
-	kDCLNuDCLLeaderOp					= 20	// compilerData field contains NuDCLRef to start of NuDCL
-												// program.
-												// Should not need to use this directly.
-};
-
-#ifdef FW_OLD_DCL_DEFS
-
-//typedef struct DCLCommandStruct ;
-//typedef void (DCLCallCommandProc)(DCLCommandStruct* command);
-
-#else
-
-//typedef struct DCLCommand ;
-//typedef void (DCLCallCommandProc)(DCLCommand* command);
-
-#endif
-
-// =================================================================
-// DCL structs
-// =================================================================
-#pragma mark -
-#pragma mark DCL
-
-#ifdef __LP64__		
-typedef void* DCLCallProcDataType;
-#else
-typedef UInt32 DCLCallProcDataType;
-#endif
-
-#ifdef KERNEL
-	#ifdef __LP64__		
-		typedef void* DCLCompilerDataType;
-	#else
-		typedef UInt32 DCLCompilerDataType;
-	#endif
-#else
-		typedef UInt32 DCLCompilerDataType;
-#endif
-
-typedef struct DCLCommandStruct
-{
-	struct DCLCommandStruct *	pNextDCLCommand;		// Next DCL command.
-	DCLCompilerDataType			compilerData;			// Data for use by DCL compiler.
-	UInt32						opcode;					// DCL opcode.
-	UInt32						operands[1];			// DCL operands (size varies)
-} DCLCommand;
-
-typedef void (DCLCallCommandProc)(DCLCommand * command);
-
-typedef struct DCLTransferPacketStruct
-{
-	DCLCommand *			pNextDCLCommand;		// Next DCL command.
-	DCLCompilerDataType		compilerData;			// Data for use by DCL compiler.
-	UInt32					opcode;					// DCL opcode.
-	void *					buffer;					// Packet buffer.
-	UInt32					size;					// Buffer size.
-} DCLTransferPacket ;
-
-typedef struct DCLTransferBufferStruct
-{
-	DCLCommand *			pNextDCLCommand;		// Next DCL command.
-	DCLCompilerDataType		compilerData;			// Data for use by DCL compiler.
-	UInt32					opcode;					// DCL opcode.
-	void *					buffer;					// Buffer.
-	UInt32					size;					// Buffer size.
-	UInt16					packetSize;				// Size of packets to send.
-	UInt16					reserved;
-	UInt32					bufferOffset;			// Current offset into buffer.
-} DCLTransferBuffer ;
-
-typedef struct DCLCallProcStruct
-{
-	DCLCommand *			pNextDCLCommand;	// Next DCL command.
-	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	DCLCallCommandProc *	proc;				// Procedure to call.
-	DCLCallProcDataType		procData;			// Data for use by called procedure.
-} DCLCallProc;
-
-typedef struct DCLLabelStruct
-{
-	DCLCommand *			pNextDCLCommand;	// Next DCL command.
-	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-} DCLLabel;
-
-typedef struct DCLJumpStruct
-{
-	DCLCommand *			pNextDCLCommand;	// Next DCL command.
-	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	DCLLabel *				pJumpDCLLabel;		// DCL label to jump to.
-} DCLJump;
-
-typedef struct DCLSetTagSyncBitsStruct
-{
-	DCLCommand *			pNextDCLCommand;	// Next DCL command.
-	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	UInt16					tagBits;			// Tag bits for following packets.
-	UInt16					syncBits;			// Sync bits for following packets.
-} DCLSetTagSyncBits;
-
-typedef struct DCLUpdateDCLListStruct
-{
-	DCLCommand *			pNextDCLCommand;	// Next DCL command.
-	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	DCLCommand **			dclCommandList;		// List of DCL commands to update.
-	UInt32					numDCLCommands;		// Number of DCL commands in list.
-} DCLUpdateDCLList;
-
-typedef struct DCLTimeStampStruct
-{
-	DCLCommand *			pNextDCLCommand;	// Next DCL command.
-	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	UInt32					timeStamp;			// Time stamp.
-} DCLTimeStamp;
-
-typedef struct DCLPtrTimeStampStruct
-{
-	DCLCommand *			pNextDCLCommand;	// Next DCL command.
-	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	UInt32 *				timeStampPtr;		// Where to store the time stamp.
-} DCLPtrTimeStamp ;
-
-typedef struct 
-{
-	DCLCommand *			pNextDCLCommand ;	// unused - always NULL
-	DCLCompilerDataType		compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode ;			// must be kDCLNuDCLLeaderOp
-	void*				 	program ;			// NuDCL program here...
-} DCLNuDCLLeader ;
-
-#ifdef FW_OLD_DCL_DEFS
-
-//  should not use these...
-
-typedef DCLCommand*				DCLCommandPtr ;
-typedef DCLTransferBuffer*		DCLTransferBufferPtr ;
-typedef DCLTransferPacket*		DCLTransferPacketPtr ;
-typedef DCLCallProc*			DCLCallProcPtr ;
-typedef DCLLabel*				DCLLabelPtr ;
-typedef DCLJump*				DCLJumpPtr ;
-typedef DCLSetTagSyncBits*		DCLSetTagSyncBitsPtr ;
-typedef DCLUpdateDCLList*		DCLUpdateDCLListPtr ;
-typedef DCLTimeStamp*			DCLTimeStampPtr ;
-typedef DCLPtrTimeStamp*		DCLPtrTimeStampPtr ;
-typedef DCLCallCommandProc* 	DCLCallCommandProcPtr ;
-
-#endif
-
-
-// =================================================================
-// User-Lib Export DCL structs - Thses structus are used to pass
-// a user-created legacy DCL program down into kernel space. These
-// structs allow support for both 32-bit and 64-bit user-space clients.
-// These structs should only be used internally. They are not for
-// clients to create DCL programs with.
-// =================================================================
-
-typedef struct UserExportDCLCommandStruct
-{
-	mach_vm_address_t					pClientDCLStruct;		// A pointer to the client's DCL struct
-	mach_vm_address_t					pNextDCLCommand;		// Next DCL command.
-	uint64_t							compilerData;			// Data for use by DCL compiler.
-	UInt32								opcode;					// DCL opcode.
-	UInt32								operands[1];			// DCL operands (size varies)
-} __attribute__ ((packed)) UserExportDCLCommand;
-
-typedef void (UserExportDCLCallCommandProc)(UserExportDCLCommand * command);
-
-typedef struct UserExportDCLTransferPacketStruct
-{
-	mach_vm_address_t		pClientDCLStruct;		// A pointer to the client's DCL struct
-	mach_vm_address_t		pNextDCLCommand;		// Next DCL command.
-	uint64_t				compilerData;			// Data for use by DCL compiler.
-	UInt32					opcode;					// DCL opcode.
-	mach_vm_address_t		buffer;					// Packet buffer.
-	UInt32					size;					// Buffer size.
-} __attribute__ ((packed)) UserExportDCLTransferPacket ;
-
-typedef struct UserExportDCLTransferBufferStruct
-{
-	mach_vm_address_t		pClientDCLStruct;		// A pointer to the client's DCL struct
-	mach_vm_address_t		pNextDCLCommand;		// Next DCL command.
-	uint64_t				compilerData;			// Data for use by DCL compiler.
-	UInt32					opcode;					// DCL opcode.
-	mach_vm_address_t		buffer;					// Buffer.
-	UInt32					size;					// Buffer size.
-	UInt16					packetSize;				// Size of packets to send.
-	UInt16					reserved;
-	UInt32					bufferOffset;			// Current offset into buffer.
-} __attribute__ ((packed)) UserExportDCLTransferBuffer ;
-
-typedef struct UserExportDCLCallProcStruct
-{
-	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
-	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
-	uint64_t				compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	mach_vm_address_t		proc;				// Procedure to call.
-	uint64_t				procData;			// Data for use by called procedure.
-} __attribute__ ((packed)) UserExportDCLCallProc;
-
-typedef struct UserExportDCLLabelStruct
-{
-	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
-	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
-	uint64_t				compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-} __attribute__ ((packed)) UserExportDCLLabel;
-
-typedef struct UserExportDCLJumpStruct
-{
-	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
-	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
-	uint64_t				compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	mach_vm_address_t		pJumpDCLLabel;		// DCL label to jump to.
-} __attribute__ ((packed)) UserExportDCLJump;
-
-typedef struct UserExportDCLSetTagSyncBitsStruct
-{
-	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
-	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
-	uint64_t				compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	UInt16					tagBits;			// Tag bits for following packets.
-	UInt16					syncBits;			// Sync bits for following packets.
-} __attribute__ ((packed)) UserExportDCLSetTagSyncBits;
-
-typedef struct UserExportDCLUpdateDCLListStruct
-{
-	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
-	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
-	uint64_t				compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	mach_vm_address_t		dclCommandList;		// List of DCL commands to update.
-	UInt32					numDCLCommands;		// Number of DCL commands in list.
-} __attribute__ ((packed)) UserExportDCLUpdateDCLList;
-
-typedef struct UserExportDCLTimeStampStruct
-{
-	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
-	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
-	uint64_t				compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	UInt32					timeStamp;			// Time stamp.
-} __attribute__ ((packed)) UserExportDCLTimeStamp;
-
-typedef struct UserExportDCLPtrTimeStampStruct
-{
-	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
-	mach_vm_address_t		pNextDCLCommand;	// Next DCL command.
-	uint64_t				compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode;				// DCL opcode.
-	mach_vm_address_t		timeStampPtr;		// Where to store the time stamp.
-} __attribute__ ((packed)) UserExportDCLPtrTimeStamp ;
-
-typedef struct 
-{
-	mach_vm_address_t		pClientDCLStruct;	// A pointer to the client's DCL struct
-	mach_vm_address_t		pNextDCLCommand ;	// unused - always NULL
-	uint64_t				compilerData;		// Data for use by DCL compiler.
-	UInt32					opcode ;			// must be kDCLNuDCLLeaderOp
-	mach_vm_address_t	 	program ;			// NuDCL program here...
-} __attribute__ ((packed)) UserExportDCLNuDCLLeader ;
-
-
-// =================================================================
-// NuDCL
-// =================================================================
-#pragma mark -
-#pragma mark NUDCL
-
-typedef struct __NuDCL *	NuDCLRef ;
-typedef NuDCLRef			NuDCLSendPacketRef ;
-typedef NuDCLRef			NuDCLSkipCycleRef ;
-typedef NuDCLRef			NuDCLReceivePacketRef ;
-
-typedef void (*NuDCLCallback)( void* refcon, NuDCLRef dcl );
-
-typedef enum
-{
-	kNuDCLDynamic = BIT( 1 ),
-	kNuDCLUpdateBeforeCallback = BIT( 2 )
-
-} NuDCLFlags ;
-
-// =================================================================
-// Miscellaneous
-// =================================================================
-#pragma mark -
-#pragma mark MISCELLANEOUS
-
-typedef void* FWClientCommandID ;
-
-typedef struct IOFireWireSessionRefOpaqueStuct* IOFireWireSessionRef ;
-
-//
-// bus management constants.
-//
-
-enum
-{
-	kFWBusManagerArbitrationTimeoutDuration	= 625 // durationMillisecond
-};
-
-//
-// bus characteristics.
-//
-
-enum
-{
-	kFWMaxBusses				= 1023,
-	kFWMaxNodesPerBus			= 63,
-	kFWMaxNodeHops				= 16
-};
-
-/*! @enum		NodeFlags
-
-	@abstract	Flags that specify characteristics of the FireWire device node.
-	
-	@constant	kIOFWDisablePhysicalAccess 		Disable physical memory access
-	
-	@constant	kIOFWDisableAllPhysicalAccess	Disable all physical memory access
-	
-	@constant	kIOFWEnableRetryOnAckD			Enable retry on Ack D
-	
-	@constant	kIOFWLimitAsyncPacketSize		Limit async packet size
-	
-	@constant	kIOFWDisablePhyOnSleep			Disable Phy, when machine is in Sleep mode
-	
-	@constant	kIOFWMustBeRoot					Attempt to make this device root, There is no guarentee Mac OS will succeed in making the device 
-	                                            root.
-												
-	@constant	kIOFWMustNotBeRoot				Attempt to prevent this device from being root, There is no guarentee Mac OS will succeed in preventing the device 
-	                                            from being root.
-												
-	@constant	kIOFWMustHaveGap63				Attempt to ensure the gap count is 63, when this device is on the bus. Gap 63 reduces bus performance significantly,
-												so this flag should be used only when absolutely necessary. There is no guarentee Mac OS will succeed in forcing
-												the gap count to 63.
-*/
-enum
-{
-    kIOFWDisablePhysicalAccess 		= (1 << 0),
-	kIOFWDisableAllPhysicalAccess 	= (1 << 1),
-	kIOFWEnableRetryOnAckD			= (1 << 2),
-	kIOFWLimitAsyncPacketSize		= (1 << 3),
-	kIOFWDisablePhyOnSleep			= (1 << 4),
-	kIOFWMustBeRoot					= (1 << 5),
-	kIOFWMustNotBeRoot				= (1 << 6),
-	kIOFWMustHaveGap63				= (1 << 7)
-};
-
-//
-// write flags
-//
-
-enum IOFWWriteFlags
-{
-	kIOFWWriteFlagsNone				= 0x00000000,
-	kIOFWWriteFlagsDeferredNotify 	= 0x00000001,
-	kIOFWWriteFastRetryOnBusy		= 0x00000002,
-	kIOFWWriteBlockRequest			= 0x00000004,		// force a block request
-};
-
-//
-// read flags
-//
-
-enum IOFWReadFlags
-{
-	kIOFWReadFlagsNone				= 0x00000000,
-	kIOFWReadBlockRequest			= 0x00000004,		// force a block request
-	kIOFWReadPingTime				= 0x00000008		// ping time
-};
-
-//
-// security modes
-//
-
-enum IOFWSecurityMode
-{
-	kIOFWSecurityModeNormal = 0,
-	kIOFWSecurityModeSecure = 1,
-	kIOFWSecurityModeSecurePermanent = 2
-};
-
-//
-// physical access settings
-//
-
-enum IOFWPhysicalAccessMode
-{
-	kIOFWPhysicalAccessEnabled = 0,
-	kIOFWPhysicalAccessDisabled = 1,
-	kIOFWPhysicalAccessDisabledForGeneration = 2
-};
-
-enum
-{
-	kIOFWSpecID_AAPL = 0xa27,
-	kIOFWSWVers_KPF = 0x40
-};
-
-// old style bit defs
-#ifdef FW_OLD_BIT_DEFS
-
-	#define kBit0	BIT(0)
-	#define kBit1	BIT(1)
-	#define kBit2	BIT(2)
-	#define kBit3	BIT(3)
-	#define kBit4	BIT(4)
-	#define kBit5	BIT(5)
-	#define kBit6	BIT(6)
-	#define kBit7	BIT(7)
-	#define kBit8	BIT(8)
-	#define kBit9	BIT(9)
-	#define kBit10	BIT(10)
-	#define kBit11	BIT(11)
-	#define kBit12	BIT(12)
-	#define kBit13	BIT(13)
-	#define kBit14	BIT(14)
-	#define kBit15	BIT(15)
-	#define kBit16	BIT(16)
-	#define kBit17	BIT(17)
-	#define kBit18	BIT(18)
-	#define kBit19	BIT(19)
-	#define kBit20	BIT(20)
-	#define kBit21	BIT(21)
-	#define kBit22	BIT(22)
-	#define kBit23	BIT(23)
-	#define kBit24	BIT(24)
-	#define kBit25	BIT(25)
-	#define kBit26	BIT(26)
-	#define kBit27	BIT(27)
-	#define kBit28	BIT(28)
-	#define kBit29	BIT(29)
-	#define kBit30	BIT(30)
-	#define kBit31	BIT(31)
-
-#endif
-
-#endif //__IOFireWireFamilyCommon_H__
diff --git a/i386/include/IOKit/firewire/IOFireWireIRMAllocation.h b/i386/include/IOKit/firewire/IOFireWireIRMAllocation.h
deleted file mode 100644
index c67986c..0000000
--- a/i386/include/IOKit/firewire/IOFireWireIRMAllocation.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOFIREWIREIRMALLOCATION_H
-#define _IOKIT_IOFIREWIREIRMALLOCATION_H
-
-#include <libkern/c++/OSObject.h>
-
-class IOFireWireController;
-
-//#include <IOKit/firewire/IOFireWireController.h>
-//#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-
-/*! @class IOFireWireIRMAllocation
-*/
-
-class IOFireWireIRMAllocation : public OSObject
-{
-	friend class IOFireWireController;
-
-    OSDeclareDefaultStructors(IOFireWireIRMAllocation)
-	
-public:
-		
-		// Prototype for the callback if reallocation after bus-reset is unsuccessful.
-		typedef IOReturn (*AllocationLostNotificationProc)(void* refCon, class IOFireWireIRMAllocation* allocation);
-
-	// Initialize the IRM allocation object. 
-    virtual bool init( IOFireWireController * control,
-					   Boolean releaseIRMResourcesOnFree = true, 
-					   AllocationLostNotificationProc allocationLostProc = NULL,
-					   void *pLostProcRefCon = NULL);
-    	
-	// Specify whether of not the IRM resources should automatically
-	// be released when freeing this allocation object.
-	virtual void setReleaseIRMResourcesOnFree(Boolean doRelease);
-	
-	// Use the IRMAllocation object to allocate isoch resources
-	virtual IOReturn allocateIsochResources(UInt8 isochChannel, UInt32 bandwidthUnits);
-
-	// Free isoch resources previously allocated with a call to allocateIsochResources
-	virtual IOReturn deallocateIsochResources(void);
-	
-	// Returns true if isoch resources are currently allocated, and if true, the allocated channel, and amount of isoch bandwidth.
-	virtual Boolean areIsochResourcesAllocated(UInt8 *pAllocatedIsochChannel, UInt32 *pAllocatedBandwidthUnits);
-	
-	// Get the refcon
-	virtual void * GetRefCon(void);
-	virtual void SetRefCon(void* refCon); 
-
-	// Override the base-class release function for special processing
-	virtual void release() const;
-	
-protected:
-
-		/*! @struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-		*/    
-		struct ExpansionData { };
-	
-		/*! @var reserved
-		Reserved for future use.  (Internal use only)  */
-		ExpansionData *reserved;
-
-		// Free the allocation object (and release IRM resources if needed)
-		virtual void free( void );
-
-		// Controller will call this to notify about bus-reset complete.
-		virtual void handleBusReset(UInt32 generation);
-	
-		virtual void failedToRealloc(void);
-		virtual UInt32 getAllocationGeneration(void);
-		static void threadFunc( void * arg );
-
-private:
-	
-	AllocationLostNotificationProc fAllocationLostProc;
-	void *fLostProcRefCon;
-	Boolean fReleaseIRMResourcesOnFree;
-	UInt8 fIsochChannel; 
-	UInt32 fBandwidthUnits;
-	UInt32 fAllocationGeneration;
-	IORecursiveLock *fLock ;
-	IOFireWireController *fControl;
-	Boolean isAllocated;
-	
-	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 0);
-	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 1);
-	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 2);
-	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 3);
-	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 4);
-	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 5);
-	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 6);
-	OSMetaClassDeclareReservedUnused(IOFireWireIRMAllocation, 7);
-};
-
-#endif // _IOKIT_IOFIREWIREIRMALLOCATION_H
diff --git a/i386/include/IOKit/firewire/IOFireWireLocalNode.h b/i386/include/IOKit/firewire/IOFireWireLocalNode.h
deleted file mode 100644
index 339fb9e..0000000
--- a/i386/include/IOKit/firewire/IOFireWireLocalNode.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *  IOFireWireLocalNode.h
- *  IOFireWireFamily
- *
- *  Created by Niels on Fri Aug 16 2002.
- *  Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
-	$Log: IOFireWireLocalNode.h,v $
-	Revision 1.8  2009/03/26 22:45:17  calderon
-	<rdar://6728033> User client fails to terminate with unexpected consuequences
-	
-	Revision 1.7  2008/11/14 00:17:12  arulchan
-	fix for rdar://5939334
-	
-	Revision 1.6  2005/02/18 22:56:53  gecko1
-	3958781 Q45C EVT: FireWire ASP reporter says port speed is 800 Mb/sec
-	
-	Revision 1.5  2003/02/20 02:00:12  collin
-	*** empty log message ***
-	
-	Revision 1.4  2003/02/17 21:47:53  collin
-	*** empty log message ***
-	
-	Revision 1.3  2002/10/18 23:29:44  collin
-	fix includes, fix cast which fails on new compiler
-	
-	Revision 1.2  2002/09/25 00:27:24  niels
-	flip your world upside-down
-	
-*/
-
-// public
-#import <IOKit/firewire/IOFireWireNub.h>
-
-class IOFireWireLocalNode;
-
-#pragma mark -
-
-/*! 
-	@class IOFireWireLocalNodeAux
-*/
-
-class IOFireWireLocalNodeAux : public IOFireWireNubAux
-{
-    OSDeclareDefaultStructors(IOFireWireLocalNodeAux)
-
-	friend class IOFireWireLocalNode;
-	
-protected:
-	
-	/*! 
-		@struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-    */  
-	  
-    struct ExpansionData { };
-
-	/*! 
-		@var reserved
-		Reserved for future use.  (Internal use only)  
-	*/
-    
-	ExpansionData * reserved;
-
-    virtual bool init( IOFireWireLocalNode * primary );
-	virtual	void free();
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWireLocalNodeAux, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireLocalNodeAux, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireLocalNodeAux, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireLocalNodeAux, 3);
-	
-};
-
-#pragma mark -
-
-/*! @class IOFireWireLocalNode
-*/
-
-class IOFireWireLocalNode : public IOFireWireNub
-{
-    OSDeclareDefaultStructors(IOFireWireLocalNode)
-
-	friend class IOFireWireLocalNodeAux;
-
-	/*------------------Useful info about device (also available in the registry)--------*/
-protected:
-
-	/*-----------Methods provided to FireWire device clients-------------*/
-public:
-	
-		// Set up properties affected by bus reset
-		virtual void setNodeProperties(UInt32 generation, UInt16 nodeID, UInt32 *selfIDs, int numIDs, IOFWSpeed maxSpeed );
-		
-		/*
-		* Standard nub initialization
-		*/
-		virtual bool init(OSDictionary * propTable);
-		virtual bool attach(IOService * provider );
-	
-		virtual void handleClose(   IOService *	  forClient,
-								IOOptionBits	  options ) ;
-		virtual bool handleOpen( 	IOService *	  forClient,
-								IOOptionBits	  options,
-								void *		  arg ) ;
-		virtual bool handleIsOpen(  const IOService * forClient ) const;
-	
-		/*
-		* Trick method to create protocol user clients
-		*/
-		virtual IOReturn setProperties( OSObject * properties );
-
-protected:
-	
-	virtual IOFireWireNubAux * createAuxiliary( void );
-
-public:
-	virtual IOReturn message( UInt32 type, IOService * provider, void * argument );
-	virtual void free();
-
-protected:
-	OSSet * fOpenClients;
-};
diff --git a/i386/include/IOKit/firewire/IOFireWireMultiIsochReceive.h b/i386/include/IOKit/firewire/IOFireWireMultiIsochReceive.h
deleted file mode 100644
index e003660..0000000
--- a/i386/include/IOKit/firewire/IOFireWireMultiIsochReceive.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2008 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@ 
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOFIREWIREMULTIISOCHRECEIVE_H_
-#define _IOKIT_IOFIREWIREMULTIISOCHRECEIVE_H_
-
-class IOFireWireMultiIsochReceiveListener;
-class IOFireWireMultiIsochReceivePacket;
-class IOFireWireController;
-
-typedef IOReturn (*FWMultiIsochReceiveListenerCallback)(void *refcon, IOFireWireMultiIsochReceivePacket *pPacket);
-
-// These are the parameters clients can set which help us to optimize the mult-isoch-receiver 
-// polling interval, and memory resources 
-typedef struct FWMultiIsochReceiveListenerParamsStruct
-	{
-		// How much latency, from when the packet arrives to when the client is notified, can the client tolerate. 
-		UInt32 maxLatencyInFireWireCycles;
-		
-		// In bits per second, the expected bit-rate of the incoming stream
-		UInt32 expectedStreamBitRate;
-		
-		// How long does the client expect to hold onto packets objects before returning them back to the receiver
-		UInt32 clientPacketReturnLatencyInFireWireCycles;
-	}FWMultiIsochReceiveListenerParams;
-
-/*! @class IOFireWireMultiIsochReceiveListener
-*/
-
-class IOFireWireMultiIsochReceiveListener : public OSObject
-	{
-		friend class IOFireWireLink;
-		
-	protected:
-		OSDeclareDefaultStructors(IOFireWireMultiIsochReceiveListener)
-		bool init(IOFireWireController *fwController,
-				  UInt32 receiveChannel,
-				  FWMultiIsochReceiveListenerCallback callback,
-				  void *pCallbackRefCon,
-				  FWMultiIsochReceiveListenerParams *pListenerParams);
-		void free();
-	public:
-		static IOFireWireMultiIsochReceiveListener *create(IOFireWireController *fwController,
-														   UInt32 channel,
-														   FWMultiIsochReceiveListenerCallback callback,
-														   void *pCallbackRefCon,
-														   FWMultiIsochReceiveListenerParams *pListenerParams);
-		
-		// Call this to activate the listener
-		IOReturn Activate();
-		
-		// Call this to deactivate the listener
-		IOReturn Deactivate();
-		
-		// Call this to modify the callback/refcon pointers. Only call this when not activated!
-		IOReturn SetCallback(FWMultiIsochReceiveListenerCallback callback,
-							 void *pCallbackRefCon);
-		
-		// Accessors
-		inline UInt32 getReceiveChannel(void) {return fChannel;};
-		inline FWMultiIsochReceiveListenerCallback getCallback(void){return fClientCallback;}; 
-		inline void * getRefCon(void){return fClientCallbackRefCon;};
-		inline bool getActivatedState(void) {return fActivated;};
-		
-	protected:
-		IOFireWireController *fControl;
-		UInt32 fChannel;
-		FWMultiIsochReceiveListenerCallback fClientCallback;
-		void *fClientCallbackRefCon;
-		bool fActivated;
-		FWMultiIsochReceiveListenerParams *fListenerParams;
-	};
-
-#define kMaxRangesPerMultiIsochReceivePacket 6
-
-/*! @class IOFireWireMultiIsochReceivePacket
-*/
-
-class IOFireWireMultiIsochReceivePacket : public OSObject
-	{
-		OSDeclareDefaultStructors(IOFireWireMultiIsochReceivePacket)
-		bool init(IOFireWireController *fwController);
-		void free();
-	public:
-		static IOFireWireMultiIsochReceivePacket *create(IOFireWireController *fwController);
-		
-		// The clients who are passed this packet by the 
-		// multi-isoch receiver calling their callback
-		// MUST call clientDone() on this packet to
-		// return it back for reuse!
-		void clientDone(void);
-		
-		UInt32 isochChannel(void);
-		UInt32 packetReceiveTime(void);
-		
-		UInt32 isochPayloadSize(void);	// The size of just the isoch payload, not including header/trailer quads.
-		inline UInt32 isochPacketSize(void) {return isochPayloadSize()+8; };	// The size of the packet, including header/trailer quads.
-		
-		// This returns a memory descriptor to the client. The client must call complete(), and release() on the
-		// memory descriptor when done.
-		IOMemoryDescriptor *createMemoryDescriptorForRanges(void);
-		
-		// These should be treated as read-only by clients,
-		// as should the data contained in these buffers!
-		IOAddressRange ranges[kMaxRangesPerMultiIsochReceivePacket] ;
-		UInt32 numRanges;
-		
-		// These should be treated private for clients!
-		// Messing with them will screw up the bookkeepping
-		// in the Multi-Isoch Receiver!
-		UInt32 numClientReferences;
-		void* elements[kMaxRangesPerMultiIsochReceivePacket];
-		
-	protected:
-		IOFireWireController *fControl;
-	};
-
-#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/firewire/IOFireWireNub.h b/i386/include/IOKit/firewire/IOFireWireNub.h
deleted file mode 100644
index 7df983b..0000000
--- a/i386/include/IOKit/firewire/IOFireWireNub.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *
- *	IOFireWireNub.h
- *
- *
- * 	Note: IOFWCommand(s) are allocated by methods in this class. 
- *            The remaining methods to setup and submit IOFWCommands are defined in
- *            IOFWCommand.h
- */
-#ifndef _IOKIT_IOFIREWIRENUB_H
-#define _IOKIT_IOFIREWIRENUB_H
-
-// public
-#include <IOKit/IOService.h>
-#include <IOKit/firewire/IOFWCommand.h>
-#include <IOKit/firewire/IOFWAddressSpace.h>
-
-class IOFireWireController;
-class IOFireWireBus;
-class IOConfigDirectory;
-class IOFireWireNub;
-class IOFireWireDevice;
-class IOFireWireUnit;
-class IOFWSimplePhysicalAddressSpace;
-class IOFWSimpleContiguousPhysicalAddressSpace;
-
-enum TerminationState
-{
-	kNotTerminated = 0,
-	kNeedsTermination,
-	kTerminated
-};
-
-#pragma mark -
-
-/*! 
-	@class IOFireWireNubAux
-*/
-
-class IOFireWireNubAux : public OSObject
-{
-    OSDeclareDefaultStructors(IOFireWireNubAux)
-
-	friend class IOFireWireNub;
-	
-protected:
-	
-	IOFireWireNub * 		fPrimary;
-	TerminationState		fTerminationState;
-	
-	/*! 
-		@struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-    */  
-	  
-    struct ExpansionData { };
-
-	/*! 
-		@var reserved
-		Reserved for future use.  (Internal use only)  
-	*/
-    
-	ExpansionData * reserved;
-
-    virtual bool init( IOFireWireNub * primary );
-	virtual	void free();
-
-	virtual UInt32 hopCount( IOFireWireNub * nub );
-	virtual UInt32 hopCount( void );
-	
-	virtual TerminationState getTerminationState( void );
-	virtual void setTerminationState( TerminationState state );
-
-	virtual bool isPhysicalAccessEnabled( void );
-
-	virtual IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction );
-		
-    virtual IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction );
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 8);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 9);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 10);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 11);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 12);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 13);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 14);
-    OSMetaClassDeclareReservedUnused(IOFireWireNubAux, 15);
-	
-};
-
-#pragma mark -
-
-/*! @class IOFireWireNub
-*/
-class IOFireWireNub : public IOService
-{
-    OSDeclareAbstractStructors(IOFireWireNub)
-
-    friend class IOFireWireController;
-    friend class IOFireWireNubAux;
-	friend class IOFireWireDeviceAux;
-	friend class IOFireWireUnitAux;
-	friend class IOFireWireDevice;
-	friend class IOFireWireUnit;
-   
-/*------------------Useful info about device (also available in the registry)--------*/
-protected:
-    int			fDeviceSpeed;	// Max supported by device
-    int			fCommsSpeed;	// Max speed this node can communicate with device
-    UInt16		fNodeID;	// Current node ID (could change after bus reset!)
-    UInt16		fLocalNodeID;	// ID of the local node (could change after bus reset!)
-    UInt32		fGeneration;	// ID Of bus topology that fNodeID is valid for.
-    CSRNodeUniqueID	fUniqueID;	// Device's globally unique ID (never changes)
-    mach_timespec_t	fAsyncTimeout;	// Guesstimate of how long to wait for response
-					// from device when making async requests
-					// Different values for quad/block transfers?
-					// OS8 FW has 40/100 mSec.
-
-    int			fMaxReadPackLog;
-    int			fMaxWritePackLog;
-    int			fMaxReadROMPackLog;
-
-    IOFireWireController *fControl;        
-    IOConfigDirectory	*fDirectory;
-
-    UInt32		fNodeFlags;
-    
-	OSSet *	 fConfigDirectorySet;
-
-	IOFireWireNubAux * fAuxiliary;
-		
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-    virtual void free();
-
-/*------------------Methods provided to FireWire device clients-----------------------*/
-public:
-
-    // Get nodeID and bus generation info
-    IOReturn getNodeIDGeneration(UInt32 &generation, UInt16 &nodeID, UInt16 &localID) const;
-    IOReturn getNodeIDGeneration(UInt32 &generation, UInt16 &nodeID) const;
-    
-    // How fast can this system talk to the node?
-    virtual IOFWSpeed FWSpeed() const;
-
-    // How fast can this node talk to another node?
-    virtual IOFWSpeed FWSpeed(const IOFireWireNub *dst) const;
-
-    // How big (as a power of two) can packets sent to/received from the node be?
-    virtual int maxPackLog(bool forSend) const;
-
-    // How big (as a power of two) can packets sent to/received from a specified address in the node be?
-    virtual int maxPackLog(bool forSend, FWAddress address) const;
-   
-    // How big (as a power of two) can packets sent from this node to dst node/received from dst be?
-    virtual int maxPackLog(bool forSend, const IOFireWireNub *dst) const;
-
-    // Set maximum packet size nub can handle
-    virtual void setMaxPackLog(bool forSend, bool forROM, int maxPackLog);
-    
-    /*
-     * Create various FireWire commands to send to the device
-     */
-    virtual IOFWReadCommand 	*createReadCommand(FWAddress devAddress, IOMemoryDescriptor *hostMem,
-				FWDeviceCallback completion=NULL, void *refcon=NULL,
- 				bool failOnReset=false);
-    virtual IOFWReadQuadCommand *createReadQuadCommand(FWAddress devAddress, UInt32 *quads, int numQuads,
-				FWDeviceCallback completion=NULL, void *refcon=NULL,
- 				bool failOnReset=false);
-
-    virtual IOFWWriteCommand 	*createWriteCommand(FWAddress devAddress, IOMemoryDescriptor *hostMem,
-				FWDeviceCallback completion=NULL, void *refcon=NULL,
- 				bool failOnReset=false);
-    virtual IOFWWriteQuadCommand *createWriteQuadCommand(FWAddress devAddress, UInt32 *quads, int numQuads,
-				FWDeviceCallback completion=NULL, void *refcon=NULL,
- 				bool failOnReset=false);
-
-    // size is 1 for 32 bit compare, 2 for 64 bit.
-    virtual IOFWCompareAndSwapCommand 	*createCompareAndSwapCommand(FWAddress devAddress,
-				const UInt32 *cmpVal, const UInt32 *newVal, int size,
-				FWDeviceCallback completion=NULL, void *refcon=NULL,
- 				bool failOnReset=false);
-    /*
-     * Create local FireWire address spaces for the device to access
-     */
-    virtual IOFWPhysicalAddressSpace *createPhysicalAddressSpace(IOMemoryDescriptor *mem);
-    virtual IOFWPseudoAddressSpace *createPseudoAddressSpace(FWAddress *addr, UInt32 len,
-                    FWReadCallback reader, FWWriteCallback writer, void *refcon);
-
-    /*
-     * Get Config directory for nub
-     * Device nub directory is root directory, Unit nub directory is Unit directory.
-	 *
-	 * Depricated use getConfigDirectoryRef
-     *
-	 */
-    
-	virtual IOReturn getConfigDirectory(IOConfigDirectory *&dir);
-
-    /*
-     * Get bus for nub
-     */
-    IOFireWireBus * getBus() const;
-
-    IOFireWireController * getController() const;
-
-    const CSRNodeUniqueID &getUniqueID() const;
-
-    /*
-     * Standard nub initialization
-     */
-    virtual bool init(OSDictionary * propTable);
-
-    virtual void setNodeFlags( UInt32 flags );
-    virtual UInt32 getNodeFlags( void );
-	virtual void clearNodeFlags( UInt32 flags );
-	
-	virtual IOReturn setConfigDirectory( IOConfigDirectory *directory );
-
-    virtual IOReturn getConfigDirectoryRef( IOConfigDirectory *&dir );
-
-	inline UInt32 hopCount( IOFireWireNub * nub )
-		{ return fAuxiliary->hopCount( nub ); }
-		
-	inline UInt32 hopCount( void )
-		{ return fAuxiliary->hopCount(); }
-
-	inline TerminationState getTerminationState( void )
-		{ return fAuxiliary->getTerminationState(); }
-				
-protected:
-	inline void setTerminationState( TerminationState state )
-		{ fAuxiliary->setTerminationState( state ); }
-
-	virtual IOFireWireNubAux * createAuxiliary( void );
-
-public:
-
-	inline bool isPhysicalAccessEnabled( void )
-		{ return fAuxiliary->isPhysicalAccessEnabled(); }
-
-	inline IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction )
-		{ return fAuxiliary->createSimpleContiguousPhysicalAddressSpace( size, direction ); }
-		
-    inline IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction )
-		{ return fAuxiliary->createSimplePhysicalAddressSpace( size, direction ); }
-    
-private:
-    OSMetaClassDeclareReservedUsed(IOFireWireNub, 0);
-	OSMetaClassDeclareReservedUsed(IOFireWireNub, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireNub, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireNub, 3);
-
-};
-
-#endif /* ! _IOKIT_IOFIREWIRENUB_H */
diff --git a/i386/include/IOKit/firewire/IOFireWirePowerManager.h b/i386/include/IOKit/firewire/IOFireWirePowerManager.h
deleted file mode 100644
index e0a141a..0000000
--- a/i386/include/IOKit/firewire/IOFireWirePowerManager.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-#ifndef _IOKIT_IOFIREWIREPOWERMANAGER_H
-#define _IOKIT_IOFIREWIREPOWERMANAGER_H
-
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOReturn.h>
-
-class IOFireWireController;
-
-/*! @class IOFireWirePowerManager
-*/
-
-class IOFireWirePowerManager : public OSObject
-{
-    OSDeclareAbstractStructors(IOFireWirePowerManager);
-
-protected:
-    
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-	IOFireWireController *	fControl;
-	
-	UInt32		fMaximumDeciwatts;
-	UInt32		fAllocatedDeciwatts;
-
-public:	
-	static IOFireWirePowerManager * createWithController( IOFireWireController * controller );
-	
-	virtual bool initWithController( IOFireWireController * controller );
-
-	virtual void setMaximumDeciwatts( UInt32 deciwatts );
-	virtual IOReturn allocateDeciwatts( UInt32 deciwatts );
-	virtual void deallocateDeciwatts( UInt32 deciwatts );
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 8);
-    OSMetaClassDeclareReservedUnused(IOFireWirePowerManager, 9);
-};
-
-#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/firewire/IOFireWireUnit.h b/i386/include/IOKit/firewire/IOFireWireUnit.h
deleted file mode 100644
index 6509b94..0000000
--- a/i386/include/IOKit/firewire/IOFireWireUnit.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *
- *	IOFireWireUnit.h
- *
- *
- */
-#ifndef _IOKIT_IOFIREWIREUNIT_H
-#define _IOKIT_IOFIREWIREUNIT_H
-
-// public
-#include <IOKit/firewire/IOFireWireNub.h>
-
-class IOFireWireDevice;
-class IOFireWireUnit;
-
-#pragma mark -
-
-/*! 
-	@class IOFireWireUnitAux
-*/
-
-class IOFireWireUnitAux : public IOFireWireNubAux
-{
-    OSDeclareDefaultStructors(IOFireWireUnitAux)
-
-	friend class IOFireWireUnit;
-	
-protected:
-	
-	/*! 
-		@struct ExpansionData
-		@discussion This structure will be used to expand the capablilties of the class in the future.
-    */  
-	  
-    struct ExpansionData { };
-
-	/*! 
-		@var reserved
-		Reserved for future use.  (Internal use only)  
-	*/
-    
-	ExpansionData * reserved;
-
-    virtual bool init( IOFireWireUnit * primary );
-	virtual	void free();
-
-	virtual bool isPhysicalAccessEnabled( void );
-
-	virtual IOFWSimpleContiguousPhysicalAddressSpace * createSimpleContiguousPhysicalAddressSpace( vm_size_t size, IODirection direction );
-		
-    virtual IOFWSimplePhysicalAddressSpace * createSimplePhysicalAddressSpace( vm_size_t size, IODirection direction );
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWireUnitAux, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireUnitAux, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireUnitAux, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireUnitAux, 3);
-	
-};
-
-#pragma mark -
-
-/*! @class IOFireWireUnit
-*/
-class IOFireWireUnit : public IOFireWireNub
-{
-    OSDeclareDefaultStructors(IOFireWireUnit)
-
-	friend class IOFireWireUnitAux;
-	friend class IOFireWireDevice;
-
-protected:
-    IOFireWireDevice *fDevice;	// The device unit is part of
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-/*------------------Methods provided to FireWire device clients-----------------------*/
-public:
-
-    virtual bool init(OSDictionary *propTable, IOConfigDirectory *directory);
-    
-    /*
-     * Standard nub initialization
-     */
-    virtual bool attach(IOService * provider );
-	virtual void free();
-
-    /*
-     * Matching language support
-     * Match on the following properties of the unit:
-     * Vendor_ID
-     * GUID
-     * Unit_Spec_ID
-     * Unit_SW_Version
-     */
-    virtual bool matchPropertyTable(OSDictionary * table);
-
-
-    virtual IOReturn message( UInt32 type, IOService * provider, void * argument );
-
-    // Override handleOpen() and handleClose() to pass on to device
-    virtual bool handleOpen( 	IOService *	  forClient,
-                                IOOptionBits	  options,
-                                void *		  arg );
-
-    virtual void handleClose(   IOService *	  forClient,
-                                IOOptionBits	  options );
-    
-    virtual void setNodeFlags( UInt32 flags );
-	virtual void clearNodeFlags( UInt32 flags );
-    virtual UInt32 getNodeFlags( void );
-
-	virtual IOReturn setConfigDirectory( IOConfigDirectory *directory );
-
-    /*
-     * Create local FireWire address spaces for the device to access
-     */
-    virtual IOFWPhysicalAddressSpace *createPhysicalAddressSpace(IOMemoryDescriptor *mem);
-    virtual IOFWPseudoAddressSpace *createPseudoAddressSpace(FWAddress *addr, UInt32 len,
-                    FWReadCallback reader, FWWriteCallback writer, void *refcon);
-
-protected:
-	
-	virtual IOFireWireNubAux * createAuxiliary( void );
-
-public:
-	void setMaxSpeed( IOFWSpeed speed );
-
-protected:
-	void terminateUnit( void );
-	static void terminateUnitThreadFunc( void * refcon );
-	    
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWireUnit, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireUnit, 1);
-
-};
-
-#endif /* ! _IOKIT_IOFIREWIREDEVICE_H */
diff --git a/i386/include/IOKit/firewire/IOLocalConfigDirectory.h b/i386/include/IOKit/firewire/IOLocalConfigDirectory.h
deleted file mode 100644
index 4be26df..0000000
--- a/i386/include/IOKit/firewire/IOLocalConfigDirectory.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-* Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
-*
-* @APPLE_LICENSE_HEADER_START@
-*
-* The contents of this file constitute Original Code as defined in and
-* are subject to the Apple Public Source License Version 1.1 (the
-* "License").  You may not use this file except in compliance with the
-* License.  Please obtain a copy of the License at
-* http://www.apple.com/publicsource and read it before using this file.
-*
-* This Original Code and all software distributed under the License are
-* distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
-* License for the specific language governing rights and limitations
-* under the License.
-*
-* @APPLE_LICENSE_HEADER_END@
-*/
-
-#ifndef __IOLOCALCONFIGDIRECTORY_H__
-#define __IOLOCALCONFIGDIRECTORY_H__
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOReturn.h>
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-#include <IOKit/firewire/IOConfigDirectory.h>
-
-class OSArray;
-class OSData;
-class IOFireWireController;
-class IOFWUserObjectExporter ;
-
-/*! @class IOLocalConfigDirectory
-*/
-class IOLocalConfigDirectory : public IOConfigDirectory
-{
-	friend class IOFireWireController;
-	friend class IOFireWireUserClient ;
-
-	OSDeclareDefaultStructors(IOLocalConfigDirectory);
-
-protected:
-	OSArray *fEntries;	// Entries for this directory.
-	OSData *fROM;	// Local ROM, if compiled.
-	UInt32 fHeader;	// Num entries and CRC.
-	
-/*! @struct ExpansionData
-	@discussion This structure will be used to expand the capablilties of the class in the future.
-	*/    
-	struct ExpansionData { };
-
-/*! @var reserved
-	Reserved for future use.  (Internal use only)  */
-	ExpansionData *reserved;
-
-	virtual bool init();
-	virtual void free();
-
-	virtual const UInt32 *getBase();
-	virtual IOConfigDirectory *getSubDir(int start, int type);
-
-public:
-	static IOLocalConfigDirectory *create();
-
-	/*!
-		@function update
-		makes sure that the ROM has at least the specified capacity,
-		and that the ROM is uptodate from its start to at least the
-		specified quadlet offset.
-		@result kIOReturnSuccess if the specified offset is now
-		accessable at romBase[offset].
-	*/
-	virtual IOReturn update(UInt32 offset, const UInt32 *&romBase);
-
-	virtual IOReturn compile(OSData *rom);
-	
-	// All flavours of addEntry eat a retain of the desc string
-	virtual IOReturn addEntry(int key, UInt32 value, OSString *desc = NULL);
-	virtual IOReturn addEntry(int key, IOLocalConfigDirectory *value,
-							OSString *desc = NULL);
-	virtual IOReturn addEntry(int key, OSData *value, OSString *desc = NULL);
-	virtual IOReturn addEntry(int key, FWAddress value, OSString *desc = NULL);
-	virtual IOReturn removeSubDir(IOLocalConfigDirectory *value);
-	const OSArray *getEntries() const;
-
-	virtual IOReturn getIndexValue(int index, IOConfigDirectory *&value);
-
-protected:
-
-	virtual const UInt32 * lockData( void );
-	virtual void unlockData( void );
-	virtual IOReturn updateROMCache( UInt32 offset, UInt32 length );
-	virtual IOReturn checkROMState( void );
-
-	// call eats a retain count
-	virtual IOReturn addEntry(OSString *desc);
-
-	IOReturn	incrementGeneration( void );
-	static void	exporterCleanup( const OSObject * self, IOFWUserObjectExporter * exporter ) ;
-		
-private:
-	OSMetaClassDeclareReservedUsed(IOLocalConfigDirectory, 0);
-	OSMetaClassDeclareReservedUnused(IOLocalConfigDirectory, 1);
-	OSMetaClassDeclareReservedUnused(IOLocalConfigDirectory, 2);
-};
-
-#endif /* __IOLOCALCONFIGDIRECTORY_H__ */
diff --git a/i386/include/IOKit/firewire/IORemoteConfigDirectory.h b/i386/include/IOKit/firewire/IORemoteConfigDirectory.h
deleted file mode 100644
index 7ddbb7c..0000000
--- a/i386/include/IOKit/firewire/IORemoteConfigDirectory.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __IOREMOTECONFIGDIRECTORY_H__
-#define __IOREMOTECONFIGDIRECTORY_H__
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOReturn.h>
-
-#include <IOKit/firewire/IOFireWireFamilyCommon.h>
-#include <IOKit/firewire/IOConfigDirectory.h>
-
-#include "IOFireWireROMCache.h"
-
-class OSString;
-class OSIterator;
-class IOFireWireDevice;
-
-/*! @class IORemoteConfigDirectory
-*/
-class IORemoteConfigDirectory : public IOConfigDirectory
-{
-    OSDeclareDefaultStructors(IORemoteConfigDirectory);
-
-protected:
-    IOFireWireROMCache *fROM;				// Our cache of the ROM
-    
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-    virtual bool initWithOwnerOffset(IOFireWireROMCache *rom,
-                             int start, int type);
-    virtual void free();
-
-    virtual const UInt32 *getBase();
-    virtual IOConfigDirectory *getSubDir(int start, int type);
-
-public:
-    static IOConfigDirectory *withOwnerOffset(IOFireWireROMCache *rom,
-                                           int start, int type);
-
-
-    /*!
-        @function update
-        makes sure that the ROM has at least the specified capacity,
-        and that the ROM is uptodate from its start to at least the
-        specified quadlet offset.
-        @result kIOReturnSuccess if the specified offset is now
-        accessable at romBase[offset].
-    */
-    virtual IOReturn update(UInt32 offset, const UInt32 *&romBase);
-
-protected:
-	
-	virtual const UInt32 * lockData( void );
-	virtual void unlockData( void );
-	virtual IOReturn updateROMCache( UInt32 offset, UInt32 length );
-	virtual IOReturn checkROMState( void );
-	
-private:
-    OSMetaClassDeclareReservedUnused(IORemoteConfigDirectory, 0);
-    OSMetaClassDeclareReservedUnused(IORemoteConfigDirectory, 1);
-    OSMetaClassDeclareReservedUnused(IORemoteConfigDirectory, 2);
-};
-
-
-#endif /* __IOREMOTECONFIGDIRECTORY_H__ */
diff --git a/i386/include/IOKit/graphics/IOAccelClientConnect.h b/i386/include/IOKit/graphics/IOAccelClientConnect.h
deleted file mode 100644
index 80ff711..0000000
--- a/i386/include/IOKit/graphics/IOAccelClientConnect.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOACCEL_CLIENT_CONNECT_H
-#define _IOACCEL_CLIENT_CONNECT_H
-
-
-/*
-** The IOAccelerator service name
-*/
-#define kIOAcceleratorClassName "IOAccelerator"
-
-
-/*
-** IOAccelerator public client types.  Private client types start with
-** kIOAccelNumClientTypes.
-*/
-enum eIOAcceleratorClientTypes {
-        kIOAccelSurfaceClientType,
-        kIOAccelNumClientTypes
-};
-
-
-#endif /* _IOACCEL_CLIENT_CONNECT_H */
-
diff --git a/i386/include/IOKit/graphics/IOAccelSurfaceConnect.h b/i386/include/IOKit/graphics/IOAccelSurfaceConnect.h
deleted file mode 100644
index b597370..0000000
--- a/i386/include/IOKit/graphics/IOAccelSurfaceConnect.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOACCEL_SURFACE_CONNECT_H
-#define _IOACCEL_SURFACE_CONNECT_H
-
-#include <IOKit/graphics/IOAccelTypes.h>
-#include <IOKit/graphics/IOAccelClientConnect.h>
-
-/*
-** Surface visible region in device coordinates.
-**
-** num_rects:   The number of rectangles in the rect array.  If num_rects
-**              is zero the bounds rectangle is used for the visible rectangle.
-**              If num_rects is zero the surface must be completely contained
-**              by the device.
-**
-** bounds:      The unclipped surface rectangle in device coords.  Extends
-**              beyond the device bounds if the surface is not totally on
-**              the device.
-**
-** rect[]:      An array of visible rectangles in device coords.  If num_rects
-**              is non-zero only the region described by these rectangles is
-**              copied to the frame buffer during a flush operation.
-*/
-typedef struct
-{
-        UInt32        num_rects;
-        IOAccelBounds bounds;
-        IOAccelBounds rect[0];
-} IOAccelDeviceRegion;
-
-
-/*
-** Determine the size of a region.
-*/
-#define IOACCEL_SIZEOF_DEVICE_REGION(_rgn_) (sizeof(IOAccelDeviceRegion) + (_rgn_)->num_rects * sizeof(IOAccelBounds))
-
-
-/*
-** Surface client public memory types.  Private memory types start with
-** kIOAccelNumSurfaceMemoryTypes.
-*/
-enum eIOAccelSurfaceMemoryTypes {
-        kIOAccelNumSurfaceMemoryTypes
-};
-
-
-/*
-** Surface client public methods.  Private methods start with
-** kIOAccelNumSurfaceMethods.
-*/
-enum eIOAccelSurfaceMethods {
-        kIOAccelSurfaceReadLockOptions,
-        kIOAccelSurfaceReadUnlockOptions,
-        kIOAccelSurfaceGetState,
-        kIOAccelSurfaceWriteLockOptions,
-        kIOAccelSurfaceWriteUnlockOptions,
-        kIOAccelSurfaceRead,
-        kIOAccelSurfaceSetShapeBacking,
-
-        kIOAccelSurfaceSetIDMode,
-        kIOAccelSurfaceSetScale,
-
-        kIOAccelSurfaceSetShape,
-        kIOAccelSurfaceFlush,
-
-        kIOAccelSurfaceQueryLock,
-
-        kIOAccelSurfaceReadLock,
-        kIOAccelSurfaceReadUnlock,
-        kIOAccelSurfaceWriteLock,
-        kIOAccelSurfaceWriteUnlock,
-
-        kIOAccelSurfaceControl,
-        kIOAccelSurfaceSetShapeBackingAndLength,
-
-        kIOAccelNumSurfaceMethods
-};
-
-
-/*
-** Option bits for IOAccelCreateSurface and the kIOAccelSurfaceSetIDMode method.
-** The color depth field can take any value of the _CGSDepth enumeration.
-*/
-typedef enum {
-        kIOAccelSurfaceModeColorDepth1555  = 0x00000003,  
-        kIOAccelSurfaceModeColorDepth8888  = 0x00000004,  
-//      kIOAccelSurfaceModeColorDepthRGB565 = 0x00000005,  
-        kIOAccelSurfaceModeColorDepthYUV   = 0x00000006,
-        kIOAccelSurfaceModeColorDepthYUV9  = 0x00000007,
-        kIOAccelSurfaceModeColorDepthYUV12 = 0x00000008,
-        kIOAccelSurfaceModeColorDepthYUV2  = 0x00000009,
-        kIOAccelSurfaceModeColorDepthBGRA32 = 0x0000000A,
-
-//      kIOAccelSurfaceModeColorDepthRGBA64       = 0x0000000B,
-//      kIOAccelSurfaceModeColorDepthRGBAFloat64  = 0x0000000C,
-//      kIOAccelSurfaceModeColorDepthRGBAFloat128 = 0x0000000D,
-        
-//      kIOAccelSurfaceModeColorDepthYUV420  = 0x0000000E,
-        kIOAccelSurfaceModeColorDepth2101010 = 0x0000000F,
-        
-        kIOAccelSurfaceModeColorDepthBits  = 0x0000000F,
-
-        kIOAccelSurfaceModeStereoBit       = 0x00000010,
-        kIOAccelSurfaceModeWindowedBit     = 0x00000020,
-
-        kIOAccelSurfaceModeBeamSync        = 0x00008000
-} eIOAccelSurfaceModeBits;
-
-
-/*
-** Options bits for IOAccelSetSurfaceShape and the kIOAccelSurfaceSetShape method.
-*/
-typedef enum {
-        kIOAccelSurfaceShapeNone             = 0x00000000,
-        kIOAccelSurfaceShapeNonBlockingBit   = 0x00000001,
-        kIOAccelSurfaceShapeNonSimpleBit     = 0x00000002,
-        kIOAccelSurfaceShapeIdentityScaleBit = 0x00000004,
-        kIOAccelSurfaceShapeFrameSyncBit     = 0x00000008,
-        kIOAccelSurfaceShapeBeamSyncBit      = 0x00000010,
-        kIOAccelSurfaceShapeStaleBackingBit  = 0x00000020,
-        kIOAccelSurfaceShapeAssemblyBit      = 0x00000040,
-        kIOAccelSurfaceShapeWaitEnabledBit   = 0x00000080,
-
-        /* wrong name, use kIOAccelSurfaceShapeNonBlockingBit */
-        kIOAccelSurfaceShapeBlockingBit      = kIOAccelSurfaceShapeNonBlockingBit
-} eIOAccelSurfaceShapeBits;
-
-/*
-** Return bits for the kIOAccelSurfaceGetState method.
-*/
-typedef enum {
-        kIOAccelSurfaceStateNone    = 0x00000000,
-        kIOAccelSurfaceStateIdleBit = 0x00000001
-} eIOAccelSurfaceStateBits;
-
-/*
-** Option bits for the kIOAccelSurfaceSetScale method.
-*/
-typedef enum {
-        kIOAccelSurfaceBeamSyncSwaps = 0x00000001,
-        kIOAccelSurfaceFixedSource   = 0x00000002,
-
-        kIOAccelSurfaceFiltering     = 0x000000f0,
-        kIOAccelSurfaceFilterDefault = 0x00000000,
-        kIOAccelSurfaceFilterNone    = 0x00000010,
-        kIOAccelSurfaceFilterLinear  = 0x00000020
-
-} eIOAccelSurfaceScaleBits;
-
-/*
-** Option bits for the kIOAccelSurfaceLock methods.
-*/
-typedef enum {
-    kIOAccelSurfaceLockInBacking  = 0,
-    kIOAccelSurfaceLockInAccel    = 1,
-    kIOAccelSurfaceLockInDontCare = 2,
-    kIOAccelSurfaceLockInMask     = 0x00000003
-} eIOAccelSurfaceLockBits;
-
-#endif /* _IOACCEL_SURFACE_CONNECT_H */
-
diff --git a/i386/include/IOKit/graphics/IOAccelTypes.h b/i386/include/IOKit/graphics/IOAccelTypes.h
deleted file mode 100644
index 09084c1..0000000
--- a/i386/include/IOKit/graphics/IOAccelTypes.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOACCEL_TYPES_H
-#define _IOACCEL_TYPES_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOKitKeys.h>
-
-#define IOACCEL_TYPES_REV       12
-
-#if !defined(OSTYPES_K64_REV) && !defined(MAC_OS_X_VERSION_10_6)
-#define IOACCELTYPES_10_5       1
-#endif
-
-/* Integer rectangle in device coordinates */
-typedef struct
-{
-    SInt16      x;
-    SInt16      y;
-    SInt16      w;
-    SInt16      h;
-} IOAccelBounds;
-
-typedef struct
-{
-    SInt16      w;
-    SInt16      h;
-} IOAccelSize;
-
-/* Surface information */
-
-enum {
-    kIOAccelVolatileSurface     = 0x00000001,
-    kIOAccelKeycolorSurface     = 0x00000002
-};
-
-typedef struct
-{
-#if IOACCELTYPES_10_5
-    vm_address_t        address[4];
-#else
-    mach_vm_address_t   address[4];
-#endif /* IOACCELTYPES_10_5 */
-    UInt32              rowBytes;
-    UInt32              width;
-    UInt32              height;
-    UInt32              pixelFormat;
-    IOOptionBits        flags;
-    IOFixed             colorTemperature[4];
-    UInt32              typeDependent[4];
-} IOAccelSurfaceInformation;
-
-typedef struct
-{
-#if IOACCELTYPES_10_5
-        long x, y, w, h;
-        void *client_addr;
-        unsigned long client_row_bytes;
-#else
-        SInt32                    x, y, w, h;
-        mach_vm_address_t client_addr;
-        UInt32            client_row_bytes;
-#endif /* IOACCELTYPES_10_5 */
-} IOAccelSurfaceReadData;
-
-typedef struct {
-        IOAccelBounds   buffer;
-        IOAccelSize     source;
-        UInt32          reserved[8];
-} IOAccelSurfaceScaling;
-
-
-typedef SInt32 IOAccelID;
-
-enum {
-    kIOAccelPrivateID           = 0x00000001
-};
-
-
-#endif /* _IOACCEL_TYPES_H */
-
diff --git a/i386/include/IOKit/graphics/IOAccelerator.h b/i386/include/IOKit/graphics/IOAccelerator.h
deleted file mode 100644
index 1c2119c..0000000
--- a/i386/include/IOKit/graphics/IOAccelerator.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IO_ACCELERATOR_H
-#define _IO_ACCELERATOR_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/graphics/IOAccelTypes.h>
-
-class IOAccelerator : public IOService
-{
-    OSDeclareDefaultStructors(IOAccelerator)
-
-public:
-    static IOReturn createAccelID(IOOptionBits options, IOAccelID * identifier);
-    static IOReturn retainAccelID(IOOptionBits options, IOAccelID identifier);
-    static IOReturn releaseAccelID(IOOptionBits options, IOAccelID identifier);
-
-};
-
-
-#endif /* _IO_ACCELERATOR_H */
-
diff --git a/i386/include/IOKit/graphics/IODisplay.h b/i386/include/IOKit/graphics/IODisplay.h
deleted file mode 100644
index adcfc49..0000000
--- a/i386/include/IOKit/graphics/IODisplay.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IODISPLAY_H
-#define _IOKIT_IODISPLAY_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/graphics/IOFramebuffer.h>
-
-extern const OSSymbol * gIODisplayParametersKey;
-extern const OSSymbol * gIODisplayGUIDKey;
-
-extern const OSSymbol * gIODisplayValueKey;
-extern const OSSymbol * gIODisplayMinValueKey;
-extern const OSSymbol * gIODisplayMaxValueKey;
-
-extern const OSSymbol * gIODisplayContrastKey;
-extern const OSSymbol * gIODisplayBrightnessKey;
-extern const OSSymbol * gIODisplayHorizontalPositionKey;
-extern const OSSymbol * gIODisplayHorizontalSizeKey;
-extern const OSSymbol * gIODisplayVerticalPositionKey;
-extern const OSSymbol * gIODisplayVerticalSizeKey;
-extern const OSSymbol * gIODisplayTrapezoidKey;
-extern const OSSymbol * gIODisplayPincushionKey;
-extern const OSSymbol * gIODisplayParallelogramKey;
-extern const OSSymbol * gIODisplayRotationKey;
-extern const OSSymbol * gIODisplayOverscanKey;
-extern const OSSymbol * gIODisplayVideoBestKey;
-
-extern const OSSymbol * gIODisplayParametersTheatreModeKey;
-extern const OSSymbol * gIODisplayParametersTheatreModeWindowKey;
-
-extern const OSSymbol * gIODisplayMCCSVersionKey;
-extern const OSSymbol * gIODisplayTechnologyTypeKey;
-extern const OSSymbol * gIODisplayUsageTimeKey;
-extern const OSSymbol * gIODisplayFirmwareLevelKey;
-
-extern const OSSymbol * gIODisplaySpeakerVolumeKey;
-extern const OSSymbol * gIODisplaySpeakerSelectKey;
-extern const OSSymbol * gIODisplayMicrophoneVolumeKey;
-extern const OSSymbol * gIODisplayAmbientLightSensorKey;
-extern const OSSymbol * gIODisplayAudioMuteAndScreenBlankKey;
-extern const OSSymbol * gIODisplayAudioTrebleKey;
-extern const OSSymbol * gIODisplayAudioBassKey;
-extern const OSSymbol * gIODisplayAudioBalanceLRKey;
-extern const OSSymbol * gIODisplayAudioProcessorModeKey;
-extern const OSSymbol * gIODisplayPowerModeKey;
-extern const OSSymbol * gIODisplayManufacturerSpecificKey;
-
-extern const OSSymbol * gIODisplayParametersCommitKey;
-extern const OSSymbol * gIODisplayParametersDefaultKey;
-extern const OSSymbol * gIODisplayParametersFlushKey;
-
-enum {
-    kIODisplayNumPowerStates = 4,
-    kIODisplayMaxPowerState  = kIODisplayNumPowerStates - 1
-};
-
-// these are the private instance variables for power management
-struct DisplayPMVars
-{
-    UInt32              currentState;
-    // highest state number normally, lowest usable state in emergency
-    unsigned long       maxState;
-    // true if the display has had power lowered due to user inactivity
-    bool                displayIdle;
-};
-
-class IODisplayConnect : public IOService
-{
-    OSDeclareDefaultStructors(IODisplayConnect)
-
-private:
-    IOIndex     connection;
-
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of this class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData * reserved;
-
-public:
-    virtual bool initWithConnection( IOIndex connection );
-    virtual IOFramebuffer * getFramebuffer( void );
-    virtual IOIndex getConnection( void );
-    virtual IOReturn getAttributeForConnection( IOSelect selector, uintptr_t * value );
-    virtual IOReturn setAttributeForConnection( IOSelect selector, uintptr_t value );
-    virtual void joinPMtree ( IOService * driver );
-};
-
-class IODisplay : public IOService
-{
-    OSDeclareAbstractStructors(IODisplay)
-
-public:
-    static void initialize( void );
-
-protected:
-    // used to query the framebuffer controller
-    IODisplayConnect *                  fConnection;
-    class IODisplayParameterHandler *   fParameterHandler;
-    void *                      __resv;
-    IONotifier *                        fNotifier;
-
-    // pointer to protected instance variables for power management
-    struct DisplayPMVars *              fDisplayPMVars;
-
-    // reserved for future expansion
-    void *                              _IODisplay_reserved[32];
-
-public:
-    virtual IOService * probe(  IOService *     provider,
-                                SInt32 *        score );
-
-    virtual bool start( IOService * provider );
-    virtual void stop( IOService * provider );
-    virtual void free();
-
-    virtual IODisplayConnect * getConnection( void );
-
-    virtual IOReturn getConnectFlagsForDisplayMode(
-                IODisplayModeID mode, UInt32 * flags );
-
-    virtual IOReturn getGammaTableByIndex(
-        UInt32 * channelCount, UInt32 * dataCount,
-        UInt32 * dataWidth, void ** data );
-
-    virtual IOReturn readFramebufferEDID( void );
-
-    // 
-    virtual IOReturn framebufferEvent( IOFramebuffer * framebuffer, 
-                                        IOIndex event, void * info );
-
-    // parameter setting
-    virtual IOReturn setProperties( OSObject * properties );
-    virtual bool setForKey( OSDictionary * params, const OSSymbol * key,
-                            SInt32 value, SInt32 min, SInt32 max );
-
-    static bool addParameter( OSDictionary * params, const OSSymbol * paramName, SInt32 min, SInt32 max );
-    static bool setParameter( OSDictionary * params, const OSSymbol * paramName, SInt32 value );
-    static OSDictionary * getIntegerRange( OSDictionary * params, const OSSymbol * sym,
-                                      SInt32 * value, SInt32 * min, SInt32 * max );
-
-    // low level set/get
-    virtual bool doIntegerSet( OSDictionary * params,
-                               const OSSymbol * paramName, UInt32 value );
-    virtual bool doDataSet( const OSSymbol * paramName, OSData * value );
-    virtual bool doUpdate( void );
-
-    // power management methods
-    virtual IOReturn setPowerState( unsigned long, IOService * );
-    virtual unsigned long maxCapabilityForDomainState( IOPMPowerFlags );
-    virtual unsigned long initialPowerStateForDomainState( IOPMPowerFlags );
-    virtual unsigned long powerStateForDomainState( IOPMPowerFlags );
-
-    // 
-    virtual void initPowerManagement( IOService * provider);
-    virtual void dropOneLevel( void );
-    virtual void makeDisplayUsable( void );
-
-private:
-    OSMetaClassDeclareReservedUnused(IODisplay, 0);
-    OSMetaClassDeclareReservedUnused(IODisplay, 1);
-    OSMetaClassDeclareReservedUnused(IODisplay, 2);
-    OSMetaClassDeclareReservedUnused(IODisplay, 3);
-    OSMetaClassDeclareReservedUnused(IODisplay, 4);
-    OSMetaClassDeclareReservedUnused(IODisplay, 5);
-    OSMetaClassDeclareReservedUnused(IODisplay, 6);
-    OSMetaClassDeclareReservedUnused(IODisplay, 7);
-    OSMetaClassDeclareReservedUnused(IODisplay, 8);
-    OSMetaClassDeclareReservedUnused(IODisplay, 9);
-    OSMetaClassDeclareReservedUnused(IODisplay, 10);
-    OSMetaClassDeclareReservedUnused(IODisplay, 11);
-    OSMetaClassDeclareReservedUnused(IODisplay, 12);
-    OSMetaClassDeclareReservedUnused(IODisplay, 13);
-    OSMetaClassDeclareReservedUnused(IODisplay, 14);
-    OSMetaClassDeclareReservedUnused(IODisplay, 15);
-    OSMetaClassDeclareReservedUnused(IODisplay, 16);
-    OSMetaClassDeclareReservedUnused(IODisplay, 17);
-    OSMetaClassDeclareReservedUnused(IODisplay, 18);
-    OSMetaClassDeclareReservedUnused(IODisplay, 19);
-
-private:
-    static IOReturn _framebufferEvent( OSObject * self, void * ref,
-                    IOFramebuffer *framebuffer, IOIndex event, void * info );
-
-    bool addParameterHandler( IODisplayParameterHandler * parameterHandler );
-    bool removeParameterHandler( IODisplayParameterHandler * parameterHandler );
-    static bool updateNumber( OSDictionary * params, const OSSymbol * key, SInt32 value );
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-class IOBacklightDisplay : public IODisplay
-{
-    OSDeclareDefaultStructors(IOBacklightDisplay)
-
-protected:
-    // User preferred brightness level
-    SInt32      fCurrentUserBrightness;
-    SInt32      fCurrentBrightness;
-    UInt32      fCurrentPowerState;
-    SInt32      fMinBrightness;
-    SInt32      fMaxBrightness;
-    UInt16      fMaxBrightnessLevel[kIODisplayNumPowerStates];
-
-public:
-    virtual IOService * probe( IOService *, SInt32 * );
-    virtual void stop( IOService * provider );
-    virtual IOReturn setPowerState( unsigned long, IOService * );
-    virtual unsigned long maxCapabilityForDomainState( IOPMPowerFlags );
-    virtual unsigned long initialPowerStateForDomainState( IOPMPowerFlags );
-    virtual unsigned long powerStateForDomainState( IOPMPowerFlags );
-
-    // 
-    virtual void initPowerManagement( IOService * );
-
-public:
-    virtual bool doIntegerSet( OSDictionary * params,
-                               const OSSymbol * paramName, UInt32 value );
-    virtual bool doUpdate( void );
-    virtual void makeDisplayUsable( void );
-    virtual bool setBrightness( SInt32 value );
-
-private:
-    void handlePMSettingCallback(const OSSymbol *, OSObject *, uintptr_t);
-
-    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 0);
-    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 1);
-    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 2);
-    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 3);
-    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 4);
-    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 5);
-    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 6);
-    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 7);
-    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 8);
-    OSMetaClassDeclareReservedUnused(IOBacklightDisplay, 9);
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-class IODisplayParameterHandler : public IOService
-{
-    OSDeclareDefaultStructors(IODisplayParameterHandler)
-
-public:
-    virtual bool setDisplay( IODisplay * display ) = 0;
-    virtual bool doIntegerSet( OSDictionary * params,
-                               const OSSymbol * paramName, UInt32 value ) = 0;
-    virtual bool doDataSet( const OSSymbol * paramName, OSData * value ) = 0;
-    virtual bool doUpdate( void ) = 0;
-
-private:
-    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 0);
-    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 1);
-    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 2);
-    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 3);
-    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 4);
-    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 5);
-    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 6);
-    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 7);
-    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 8);
-    OSMetaClassDeclareReservedUnused(IODisplayParameterHandler, 9);
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#endif /* ! _IOKIT_IODISPLAY_H */
-
diff --git a/i386/include/IOKit/graphics/IOFramebuffer.h b/i386/include/IOKit/graphics/IOFramebuffer.h
deleted file mode 100644
index 16a5ffd..0000000
--- a/i386/include/IOKit/graphics/IOFramebuffer.h
+++ /dev/null
@@ -1,827 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOFRAMEBUFFER_H
-#define _IOKIT_IOFRAMEBUFFER_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOInterruptEventSource.h>
-#include <IOKit/graphics/IOGraphicsDevice.h>
-#include <IOKit/graphics/IOFramebufferShared.h>
-#include <IOKit/IOLib.h>
-
-class IOFramebuffer;
-class IOBufferMemoryDescriptor;
-
-typedef void (*CursorBlitProc)(
-                    IOFramebuffer * inst,
-                    void * shmem,
-                    volatile unsigned char *vramPtr,
-                    unsigned int cursStart,
-                    unsigned int vramRow,
-                    unsigned int cursRow,
-                    int width,
-                    int height );
-
-typedef void (*CursorRemoveProc)(
-                    IOFramebuffer * inst,
-                    void * shmem,
-                    volatile unsigned char *vramPtr,
-                    unsigned int vramRow,
-                    int width,
-                    int height );
-
-
-typedef void * IOFBCursorRef;
-
-struct IOFBCursorControlCallouts {
-    IOReturn    (*setCursorImage) (void * self, void * ref,
-                                    IOHardwareCursorDescriptor * description, IOFBCursorRef cursorImage);
-    IOReturn    (*setCursorState) (void * self, void * ref,
-                                    SInt32 x, SInt32 y, bool visible);
-    UInt32      reserved[30];
-};
-typedef struct IOFBCursorControlCallouts IOFBCursorControlCallouts;
-
-struct IOFBCursorControlAttribute {
-    void *                              self;
-    void *                              ref;
-    const IOFBCursorControlCallouts *   callouts;
-    UInt32                              reserved[29];
-};
-typedef struct IOFBCursorControlAttribute IOFBCursorControlAttribute;
-
-// clock & data values
-enum {
-    kIODDCLow                           = 0,
-    kIODDCHigh                          = 1,
-    kIODDCTristate                      = 2
-};
-// ddcBlockType constants
-enum {
-    // EDID block type.
-    kIODDCBlockTypeEDID                 = 0
-};
-
-// ddcFlags constants
-enum {
-    // Force a new read of the EDID.
-    kIODDCForceRead                     = 0x00000001
-};
-
-enum {
-    kDisabledInterruptState             = 0,
-    kEnabledInterruptState              = 1
-};
-
-typedef void (*IOFBInterruptProc)( OSObject * target, void * ref );
-
-
-typedef IOReturn (*IOFramebufferNotificationHandler)
-        (OSObject * self, void * ref,
-        IOFramebuffer * framebuffer, IOIndex event,
-        void * info);
-
-// IOFramebufferNotificationHandler events
-enum {
-    kIOFBNotifyDisplayModeWillChange    = 1,
-    kIOFBNotifyDisplayModeDidChange     = 2,
-
-    kIOFBNotifyWillSleep        = 3,
-    kIOFBNotifyDidWake          = 4,
-
-    kIOFBNotifyDidPowerOff      = 5,
-    kIOFBNotifyWillPowerOn      = 6,
-
-    kIOFBNotifyDidSleep         = kIOFBNotifyDidPowerOff,
-    kIOFBNotifyWillWake         = kIOFBNotifyWillPowerOn,
-
-    kIOFBNotifyWillPowerOff     = 7,
-    kIOFBNotifyDidPowerOn       = 8,
-
-    kIOFBNotifyWillChangeSpeed  = 9,
-    kIOFBNotifyDidChangeSpeed   = 10,
-
-    kIOFBNotifyClamshellChange  = 20,
-
-    kIOFBNotifyCaptureChange    = 30,
-
-    kIOFBNotifyOnlineChange     = 40,
-
-    kIOFBNotifyDisplayDimsChange = 50,
-
-    kIOFBNotifyProbed           = 60,
-};
-
-enum {
-    kFBDisplayUsablePowerState          = 0x80000000,
-    kFBDisplayPowerStateMask            = 0x0000ffff
-};
-
-#define kIOFBDependentIDKey     "IOFBDependentID"
-#define kIOFBDependentIndexKey  "IOFBDependentIndex"
-
-struct StdFBShmem_t;
-class IOFramebufferUserClient;
-
-/*! @class IOFramebuffer : public IOGraphicsDevice
-    @abstract The base class for graphics devices to be made available as part of the desktop.
-    @discussion The IOFramebuffer base class defines APIs used to publish a linear framebuffer device. Device driver writers should subclass this class to provide a X native driver. Mac OS X will also utilize 'ndrv' drivers via a subclass of IOFramebuffer IONDRVFramebuffer that does not require device driver writers to provide a X native driver.
-    
-    There are no in kernel clients of IOFramebuffer aside from rudimentary console and panic UI supported by the IOFramebuffer class. The IOFramebuffer class provides the IOUserClient implementation to allow the CoreGraphics server to provide the user accessible interface to all displays on a Mac OS X system, and this is further layered underneath application frameworks. Device driver writers should not need any knowledge of this part of the interfaces. Similarly the instance variables of IOFramebuffer are mostly used for cursor rendering which is handled by the IOFramebuffer class, and should be avoided by subclass implementors. Only IOFramebuffer methods with header documentation in this header are designed for subclasses to implement.
-
-    IOFramebuffer provides simple dumb framebuffer operation - accceleration for 2D, 3D and video may be provided by a separate implementation of the IOAccelerator class.
-*/
-
-class IOFramebuffer : public IOGraphicsDevice
-{
-    friend class IOFramebufferUserClient;
-    friend class IOFramebufferSharedUserClient;
-    friend class IODisplay;
-
-    OSDeclareDefaultStructors(IOFramebuffer)
-
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of this class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData * reserved;
-
-private:
-
-protected:
-    StdFBShmem_t *                      priv;
-    int                                 shmemClientVersion;
-    IOBufferMemoryDescriptor *          sharedCursor;
-
-    union {
-        struct {
-            /* Mapping tables used in cursor drawing to 5-5-5 displays. */
-            unsigned char *     _bm34To35SampleTable;
-            unsigned char *     _bm35To34SampleTable;
-            /* Mapping tables used in cursor drawing to 8-bit RGB displays. */
-            unsigned int *      _bm256To38SampleTable;
-            unsigned char *     _bm38To256SampleTable;
-        }                               t;
-        UInt8 *                         tables[ 4 ];
-    }                                   colorConvert;
-    
-    /* cursor blitting vars */
-    CursorBlitProc                      cursorBlitProc;
-    CursorRemoveProc                    cursorRemoveProc;
-
-    IOGSize                             maxCursorSize;
-    void *                              _IOFramebuffer_reservedE[7];
-    const char *                        thisName;
-    volatile unsigned char *            cursorSave;
-    unsigned int                        white;
-
-    IOGPoint                            nextCursorLoc;
-    int                                 nextCursorFrame;
-    SInt32                              connectChange;
-    semaphore_t                         vblSemaphore;
-
-    /* memory ranges */
-    volatile unsigned char *            frameBuffer;
-    unsigned int                        totalWidth;
-    unsigned int                        rowBytes;
-    unsigned int                        bytesPerPixel;
-
-    IOMemoryMap *                       vramMap;
-    IOByteCount                         vramMapOffset;
-    OSArray *                           userAccessRanges;
-    unsigned int                        suspended:1;
-    unsigned int                        captured:1;
-    unsigned int                        sleepConnectCheck:1;
-    unsigned int                        messaged:1;
-    unsigned int                        _IOFramebuffer_reservedC:28;
-    IOFramebuffer *                     nextDependent;
-    OSSet *                             fbNotifications;
-
-    class IOFramebufferUserClient *       serverConnect;
-    class IOFramebufferSharedUserClient * sharedConnect;
-
-    unsigned int                        opened:1;
-    unsigned int                        dead:1;
-    unsigned int                        configPending:1;
-    unsigned int                        serverNotified:1;
-    unsigned int                        serverState:1;
-    unsigned int                        serverPendingAck:1;
-    unsigned int                        isUsable:1;
-    unsigned int                        mirrored:1;
-    unsigned int                        pendingPowerState:4;
-    unsigned int                        pendingPowerChange:1;
-    unsigned int                        pagingState:1;
-    unsigned int                        mirrorPrimary:1;
-    unsigned int                        mirrorSWCursor:1;
-
-    bool                                clutValid;
-    bool                                currentMono;
-    bool                                needCursorService;
-    bool                                haveVBLService;
-    bool                                haveHWCursor;
-    bool                                hwCursorLoaded;
-
-    void *                              serverMsg;
-    IOInterruptEventSource *            deferredEvents;
-
-    /* Reserved for future expansion. */
-    int                                 _IOFramebuffer_reserved[5];
-
-private:
-    struct IOFramebufferPrivate *       __private;
-
-public:
-/*! @function doI2CRequest
-    @abstract Carry out an I2C request.
-    @discussion IOFramebuffer subclasses may optionally implement this method to perform I2C bus requests on one of the buses they support. Alternatively they may implement the setDDCClock(), setDDCData(), readDDCClock(), readDDCData() methods and respond from getAttributeForConnection() to the kConnectionSupportsLLDDCSense attribute with success, in which case IOFramebuffer::doI2CRequest() will carry out a software implementation of I2C using the low level routines and conforming to the timing constraints passed in the timing parameter. Subclasses may pass timing parameters tuned for the specific bus, otherwise VESA DDC defaults will apply.
-    @timing event Subclasses may pass timing parameters tuned for the specific bus, otherwise if NULL, VESA DDC defaults will apply.
-    @param request An IOI2CRequest structure. The request should be carried out synchronously if the completion routine is NULL, otherwise it may optionally be carried out asynchronously. The completion routine should be called if supplied.
-    @result an IOReturn code. If kIOReturnSuccces, the result of the transaction is returned in the requests result field.
-*/
-    virtual IOReturn doI2CRequest( UInt32 bus, struct IOI2CBusTiming * timing, struct IOI2CRequest * request );
-
-private:
-    OSMetaClassDeclareReservedUsed(IOFramebuffer, 0);
-
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 1);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 2);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 3);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 4);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 5);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 6);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 7);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 8);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 9);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 10);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 11);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 12);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 13);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 14);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 15);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 16);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 17);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 18);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 19);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 20);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 21);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 22);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 23);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 24);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 25);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 26);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 27);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 28);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 29);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 30);
-    OSMetaClassDeclareReservedUnused(IOFramebuffer, 31);
-
-
-public:
-    static void initialize();
-
-    virtual bool requestTerminate( IOService * provider, IOOptionBits options );
-    virtual IOService * probe( IOService * provider, SInt32 * score );
-    virtual bool start( IOService * provider );
-    virtual void stop( IOService * provider );
-    virtual void free();
-    virtual IOWorkLoop * getWorkLoop() const;
-
-    IOWorkLoop * getGraphicsSystemWorkLoop() const;
-    IOWorkLoop * getControllerWorkLoop() const;
-
-    virtual IOReturn requestProbe( IOOptionBits options );
-
-    virtual IOReturn powerStateWillChangeTo ( IOPMPowerFlags, unsigned long, IOService* );
-    virtual IOReturn powerStateDidChangeTo ( IOPMPowerFlags, unsigned long, IOService* );
-    virtual IOReturn setPowerState( unsigned long powerStateOrdinal, IOService * device);
-    virtual IOReturn setAggressiveness( unsigned long type, unsigned long newLevel );
-    virtual IOReturn getAggressiveness( unsigned long type, unsigned long * currentLevel );
-    virtual IOReturn newUserClient( task_t              owningTask,
-                                    void *              security_id,
-                                    UInt32              type,
-                                    IOUserClient **     handler );
-    virtual IOReturn callPlatformFunction( const OSSymbol * functionName,
-                                    bool waitForFunction,
-                                    void *p1, void *p2,
-                                    void *p3, void *p4 );
-
-    virtual void hideCursor( void );
-    virtual void showCursor( IOGPoint * cursorLoc, int frame );
-    virtual void moveCursor( IOGPoint * cursorLoc, int frame );
-    // virtual
-    void resetCursor( void );
-
-    virtual void getVBLTime( AbsoluteTime * time, AbsoluteTime * delta );
-
-    virtual void getBoundingRect ( IOGBounds ** bounds );
-
-    virtual IOReturn open( void );
-    
-    virtual void close( void );
-
-    virtual bool isConsoleDevice( void );
-
-    virtual IOReturn setupForCurrentConfig( void );
-
-    virtual bool serializeInfo( OSSerialize * s );
-    virtual bool setNumber( OSDictionary * dict, const char * key,
-                                UInt32 number );
-
-    IONotifier * addFramebufferNotification(
-            IOFramebufferNotificationHandler handler,
-            OSObject * self, void * ref);
-
-/*! @function getApertureRange
-    @abstract Return reference to IODeviceMemory object representing memory range of framebuffer.
-    @discussion IOFramebuffer subclasses must implement this method to describe the memory used by the framebuffer in the current mode. The OS will map this memory range into user space for client access - the range should only include vram memory not hardware registers.
-    @param aperture The system will only access the aperture kIOFBSystemAperture.
-    @result an IODeviceMemory instance. A reference will be consumed by the caller for each call of this method - the implementatation should create a new instance of IODeviceMemory for each call, or return one instance with a retain for each call.
-*/
-
-    virtual IODeviceMemory * getApertureRange( IOPixelAperture aperture ) = 0;
-
-/*! @function getVRAMRange
-    @abstract Return reference to IODeviceMemory object representing memory range of all the cards vram.
-    @discussion IOFramebuffer subclasses should implement this method to describe all the vram memory available on the card. The OS will map this memory range into user space for client access - the range should only include vram memory not hardware registers.
-    @result an IODeviceMemory instance. A reference will be consumed by the caller for each call of this method - the implementatation should create a new instance of IODeviceMemory for each call, or return one instance with a retain for each call.
-*/
-
-    virtual IODeviceMemory * getVRAMRange( void );
-
-protected:
-
-/*! @function handleEvent
-    @abstract Notify IOFramebuffer superclass code of events.
-    @discussion IOFramebuffer subclasses should call this IOFramebuffer method on certain power state changes.
-    @param event The event that has occurred:<br>
-    kIOFBNotifyWillPowerOff call before entering a state other than the maximum.<br>
-    kIOFBNotifyDidPowerOn call after entering the maximum power state.<br>
-    kIOFBNotifyWillPowerOff call before entering a state other than the maximum.<br>
-    kIOFBNotifyDidPowerOn call after entering a state other than the maximum.<br>
-    @param info None of the above events require additional info, pass zero.
-    @result an IOReturn code, safely ignored.
-*/
-
-    IOReturn handleEvent( IOIndex event, void * info = 0 );
-
-
-    IOReturn deliverFramebufferNotification(
-                    IOIndex event, void * info = 0 );
-
-#ifdef IOFRAMEBUFFER_PRIVATE
-#include <IOKit/graphics/IOFramebufferPrivate.h>
-#endif
-
-public:
-/*! @function enableController
-    @abstract Perform first time setup of the framebuffer.
-    @discussion IOFramebuffer subclasses should perform their initialization of the hardware here. The IOService start() method is not called at a time appropriate for this initialization.
-    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
-*/
-
-    virtual IOReturn enableController( void );
-
-/*! @function getPixelFormats
-    @abstract List the pixel formats the framebuffer supports.
-    @discussion IOFramebuffer subclasses must implement this method to return an array of strings representing the possible pixel formats available in the framebuffer.
-    @result A const char * pointer. The string consists of a concatenation of each pixel format string separated by the NULL character. The commonly supported pixel formats for Mac OS X are defined as IO8BitIndexedPixels, IO16BitDirectPixels, IO32BitDirectPixels.
-*/
-
-    virtual const char * getPixelFormats( void ) = 0;
-
-/*! @function getDisplayModeCount
-    @abstract Return the number of display modes the framebuffer supports.
-    @discussion IOFramebuffer subclasses must implement this method to return a count of the display modes available. This count should change unless a connection change is posted for the device indicated the framebuffer and/or display configuration has changed.
-    @result A count of the display modes available.
-*/
-
-    virtual IOItemCount getDisplayModeCount( void ) = 0;
-
-/*! @function getDisplayModes
-    @abstract Return the number of display modes the framebuffer supports.
-    @discussion IOFramebuffer subclasses must implement this method to return an array of display mode IDs available for the framebuffer. The IDs are defined by the driver in the range 0x00000001 - 0x7fffffff, and should be constant for a given display mode. 
-    @param allDisplayModes A caller allocated buffer with the size given by the result of getDisplayModeCount().
-    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
-*/
- 
-    virtual IOReturn getDisplayModes( IODisplayModeID * allDisplayModes ) = 0;
-
-/*! @function getInformationForDisplayMode
-    @abstract Return information about a given display mode.
-    @discussion IOFramebuffer subclasses must implement this method to return information in the IODisplayModeInformation structure for the display mode with the passed ID. 
-    @param displayMode A display mode ID previously returned by getDisplayModes().
-    @param info Pointer to a structure of type IODisplayModeInformation to be filled out by the driver. IODisplayModeInformation is documented in IOGraphicsTypes.h.
-    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
-*/
-
-    virtual IOReturn getInformationForDisplayMode( IODisplayModeID displayMode,
-                    IODisplayModeInformation * info ) = 0;
-
-/*! @function getPixelFormatsForDisplayMode
-    @abstract Obsolete.
-    @discussion IOFramebuffer subclasses must implement this method to return zero. 
-    @param displayMode Ignored.
-    @param depth Ignored.
-    @result Return zero.
-*/
-
-    virtual UInt64  getPixelFormatsForDisplayMode( IODisplayModeID displayMode,
-                    IOIndex depth ) = 0;
-
-/*! @function getPixelInformation
-    @abstract Return information about the framebuffer format for a given display mode and depth.
-    @discussion IOFramebuffer subclasses must implement this method to return information in the IOPixelInformation structure for the display mode with the passed ID, depth index and aperture. The aperture utilized by the system is always kIOFBSystemAperture. Drivers may define alternative apertures, being a view of the framebuffer in a different pixel format from the default.
-    @param displayMode A display mode ID previously returned by getDisplayModes().
-    @param depth An index from zero to the value of the maxDepthIndex field from the IODisplayModeInformation structure (inclusive).
-    @param info Pointer to a structure of type IOPixelInformation to be filled out by the driver. IOPixelInformation is documented in IOGraphicsTypes.h.
-    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
-*/
-
-    virtual IOReturn getPixelInformation(
-        IODisplayModeID displayMode, IOIndex depth,
-        IOPixelAperture aperture, IOPixelInformation * pixelInfo ) = 0;
-
-/*! @function getCurrentDisplayMode
-    @abstract Return the framebuffers current display mode and depth.
-    @discussion IOFramebuffer subclasses must implement this method to return the current mode and depth.
-    @param displayMode A display mode ID representing the current mode.
-    @param depth An index indicating the depth configuration of the framebuffer. The index should range from zero to the value of the maxDepthIndex field from the IODisplayModeInformation structure for the display mode.
-    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
-*/
-
-    virtual IOReturn getCurrentDisplayMode( IODisplayModeID * displayMode,
-                            IOIndex * depth ) = 0;
-
-/*! @function setCurrentDisplayMode
-    @abstract Set the framebuffers current display mode and depth.
-    @discussion IOFramebuffer subclasses should implement this method to set the current mode and depth. Other than at enableController() time, this is the only method that should change the framebuffer format and is synchronized with clients and attached accelerators to make sure access to the device is disallowed during the change.
-    @param displayMode A display mode ID representing the new mode.
-    @param depth An index indicating the new depth configuration of the framebuffer. The index should range from zero to the value of the maxDepthIndex field from the IODisplayModeInformation structure for the display mode.
-    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
-*/
-
-    virtual IOReturn setDisplayMode( IODisplayModeID displayMode,
-                            IOIndex depth );
-
-/*! @function setApertureEnable
-    @abstract Enable an aperture on the framebuffer (usually unimplemented, no OS usage).
-    @discussion IOFramebuffer subclasses may implement this method to set enable a non standard aperture. The system does not call this method.
-    @param aperture A device specific aperture index.
-    @param enable Device specific mask of options.
-    @result an IOReturn code.
-*/
-
-    virtual IOReturn setApertureEnable( IOPixelAperture aperture,
-                    IOOptionBits enable );
-
-/*! @function setStartupDisplayMode
-    @abstract Set the framebuffers display mode and depth to be used during boot and at startup.
-    @discussion IOFramebuffer subclasses should implement this method to set the mode and depth to be used during boot and at startup, to reduce needed mode changes during boot when the display connection type is the same. If possible this mode should also be used by the OpenFirmware driver for the card.
-    @param displayMode A display mode ID representing the new startup mode.
-    @param depth An index indicating the new startup depth configuration of the framebuffer. The index should range from zero to the value of the maxDepthIndex field from the IODisplayModeInformation structure for the display mode.
-    @result an IOReturn code.
-*/
-
-    virtual IOReturn setStartupDisplayMode( IODisplayModeID displayMode,
-                            IOIndex depth );
-
-/*! @function getCurrentDisplayMode
-    @abstract Return the framebuffers display mode and depth to be used during boot and at startup.
-    @discussion IOFramebuffer subclasses should implement this method to return the current mode and depth.
-    @param displayMode A display mode ID representing the mode used during startup.
-    @param depth An index indicating the depth configuration of the framebuffer used during startup. The index should range from zero to the value of the maxDepthIndex field from the IODisplayModeInformation structure for the display mode.
-    @result an IOReturn code.
-*/
-
-    virtual IOReturn getStartupDisplayMode( IODisplayModeID * displayMode,
-                            IOIndex * depth );
-
-/*! @function setCLUTWithEntries
-    @abstract Set the color lookup table to be used by the framebuffer in indexed modes.
-    @discussion IOFramebuffer subclasses may implement this method to allow a palette to be set for indexed display modes. It will not be called on framebuffers in direct display modes.
-    @param colors A pointer to an array of numEntries RGB color entries.
-    @param index The index of the first entry to set.
-    @param numEntries The number of entries in the table.
-    @param options Options controlling the operation. <br>
-    kSetCLUTByValue is set if the index field of each entry should be used to set the table sparsely, otherwise consecutive entries from the index parameter should be set.<br>
-    kSetCLUTImmediately is set if the CLUT set should not be synchronized with the vertical blank, otherwise it should.<br>
-    kSetCLUTWithLuminance is set if the CLUT should be set to a gray value equivalent in luminance to the passed color entry.<br>
-    @result an IOReturn code.
-*/
-
-    virtual IOReturn setCLUTWithEntries( IOColorEntry * colors, UInt32 index,
-                UInt32 numEntries, IOOptionBits options );
-
-/*! @function setGammaTable
-    @abstract Set the gamma table to be used by the framebuffer.
-    @discussion IOFramebuffer subclasses should implement this method to allow a gamma table to be set. 
-    @param channelCount Defines the number of channels in the supplied data. OS X will pass three for separate R, G, B data, or one if the same data should apply to all channels.
-    @param dataCount The number of data entries per channel.
-    @param dataWidth The number of bits in each entry. 8 for Mac OS X 10.1 and earlier, 16 for later releases.
-    @param data The packed array of correction data. Data is passed for the R (or single) channel followed by the G & B channels. Each entry is one or two bytes (if dataWidth > 8).
-    @result an IOReturn code.
-*/
-
-    virtual IOReturn setGammaTable( UInt32 channelCount, UInt32 dataCount,
-                    UInt32 dataWidth, void * data );
-
-/*! @function setAttribute
-    @abstract Generic method to set some attribute of the framebuffer device.
-    @discussion IOFramebuffer subclasses may implement this method to allow arbitrary attribute/value pairs to be set. 
-    @param attribute Defines the attribute to be set. Some defined attributes are:<br> 
-    kIOPowerAttribute The IOFramebuffer class implements most power management (IOService) methods. It calls the subclass to carry out the power management state change with this attribute. When carrying out power state changes, the subclass should call IOFramebuffer::handleEvent for certain changes - set that method for more information.
-    @param value The new value for the attribute.
-    @result an IOReturn code.
-*/
-
-    virtual IOReturn setAttribute( IOSelect attribute, uintptr_t value );
-
-/*! @function getAttribute
-    @abstract Generic method to retrieve some attribute of the framebuffer device.
-    @discussion IOFramebuffer subclasses may implement this method to allow arbitrary attribute/value pairs to be returned. 
-    @param attribute Defines the attribute to be set. Some defined attributes are:<br> 
-    kIOHardwareCursorAttribute If the device supports a hardware cursor and implements the setCursorImage() and setCursorState() calls it should return true for this attribute.
-    @param value Returns the value for the attribute.
-    @result an IOReturn code.
-*/
-
-    virtual IOReturn getAttribute( IOSelect attribute, uintptr_t * value );
-
-/*! @function getTimingInfoForDisplayMode
-    @abstract Returns a timing description for a display mode.
-    @discussion IOFramebuffer subclasses should implement this method to return timing information for a display mode. This allows the OS to enable display modes based on its knowledge of the connected display type. Two types of timing information are defined, by Apple defined constant, or by a detailed description of the timing parameters of the mode. 
-    @param displayMode A display mode ID representing the mode to examine.
-    @param info The driver returns the information for the display mode in this structure.<br>
-    If the mode has an Apple defined constant, such as timingVESA_1024x768_75hz, it should be returned in the appleTimingID field. Otherwise the field should be set to timingInvalid.<br>
-    If the driver is able to supply detailed timing information, it should return it in the detailedInfo.v2 field of the structure, otherwise the driver should clear the kIODetailedTimingValid flag from the flags field.<br>
-    The IODetailedTimingInformationV2 structure is documented in IOGraphicsTypes.h
-    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from using the device.
-*/
-
-    virtual IOReturn getTimingInfoForDisplayMode(
-                IODisplayModeID displayMode, IOTimingInformation * info );
-
-/*! @function validateDetailedTiming
-    @abstract Reports whether a detailed timing is able to be programmed with the device.
-    @discussion IOFramebuffer subclasses may implement programmable mode functionality where the OS is able to install modes described by a detailed timing into the driver. 
-    @param description A pointer to a IODetailedTimingInformationV2 structure. The driver should examine this description and change any fields that it cannot implement to reflect its closest possible implementation.
-    @param descripSize sizeof(IODetailedTimingInformationV2)
-    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from installing the programmable mode.
-*/
-
-    virtual IOReturn validateDetailedTiming(
-                    void * description, IOByteCount descripSize );
-
-/*! @function setDetailedTimings
-    @abstract Installs an array of OS programmed detailed timings to be made available by the driver.
-    @discussion IOFramebuffer subclasses may implement programmable mode functionality where the OS is able to install modes described by a detailed timing into the driver. The driver needs to add these modes to its internal mode list if it provides this functionality.
-    @param array An OSArray of OSData objects. Each OSData contains one IODetailedTimingInformationV2 structure. All the data described by the array should be copied or retained by this call until the next invocation of this method.
-    @result an IOReturn code. A return other than kIOReturnSuccess will prevent the system from installing the programmable modes.
-*/
-
-    virtual IOReturn setDetailedTimings( OSArray * array );
-
-/*! @function getConnectionCount
-    @abstract Reports the number of display connections the device supports, driven from one framebuffer.
-    @discussion IOFramebuffer subclasses may implement functionality where a single framebuffer drives multiple displays. This is not recommended or fully supported and instead multihead cards should implement multiple instances of IOFramebuffer objects to provide full functionality.
-    @result A count of the number of display connections reported by the framebuffer. Current versions of OS X only support one connection completely.
-*/
-
-    virtual IOItemCount getConnectionCount( void );
-
-
-/*! @function setAttributeForConnection
-    @abstract Generic method to set some attribute of the framebuffer device, specific to one display connection.
-    @discussion IOFramebuffer subclasses may implement this method to allow arbitrary attribute/value pairs to be set, specific to one display connection. 
-    @param attribute Defines the attribute to be set. Some defined attributes are:<br> 
-    kIOCapturedAttribute If the device supports hotplugging displays, it should disable the generation of hot plug interrupts when the attribute kIOCapturedAttribute is set to true.
-    @param value The new value for the attribute.
-    @result an IOReturn code.
-*/
-
-    virtual IOReturn setAttributeForConnection( IOIndex connectIndex,
-                    IOSelect attribute, uintptr_t value );
-
-/*! @function getAttributeForConnection
-    @abstract Generic method to retrieve some attribute of the framebuffer device, specific to one display connection.
-    @discussion IOFramebuffer subclasses may implement this method to allow arbitrary attribute/value pairs to be returned, specific to one display connection. 
-    @param attribute Defines the attribute to be returned. Some defined attributes are:<br> 
-    kConnectionSupportsHLDDCSense If the framebuffer supports the DDC methods hasDDCConnect() and getDDCBlock() it should return success (and no value) for this attribute.<br>
-    kConnectionSupportsLLDDCSense If the framebuffer wishes to make use of IOFramebuffer::doI2CRequest software implementation of I2C it should implement the I2C methods setDDCClock(), setDDCData(), readDDCClock(), readDDCData(), and it should return success (and no value) for this attribute.<br>
-    @param value Returns the value for the attribute.
-    @result an IOReturn code.
-*/
-
-    virtual IOReturn getAttributeForConnection( IOIndex connectIndex,
-                    IOSelect attribute, uintptr_t * value );
-
-/*! @function convertCursorImage
-    @abstract Utility method of IOFramebuffer to convert cursor image to a hardware cursor format.
-    @discussion IOFramebuffer subclasses may implement hardware cursor functionality, if so they should pass the cursor image given by the  setCursorImage() method, with a description of their hardware cursor format, to this helper function to this routine to convert the image to one suitable for the hardware.
-    @param cursorImage Opaque cursor parameter from the setCursorImage() call.
-    @param description Describes the cursor format supported by the driver.
-    @param cursor Structure describing the drivers allocated buffer to receive the converted image.
-    @result a bool indicating the conversion was successful.
-*/
-
-    virtual bool convertCursorImage( void * cursorImage,
-                IOHardwareCursorDescriptor * description,
-                IOHardwareCursorInfo * cursor );
-
-/*! @function setCursorImage
-    @abstract Set a new image for the hardware cursor.
-    @discussion IOFramebuffer subclasses may implement hardware cursor functionality, if so they should implement this method to change the hardware cursor image. The image should be passed to the convertCursorImage() method with each type of cursor format the hardware supports until success, if all fail the hardware cursor should be hidden and kIOReturnUnsupported returned.
-    @param cursorImage Opaque cursor description. This should be passed to the convertCursorImage() method to convert to a format specific to the hardware.
-    @result An IOReturn code.
-*/
-
-    virtual IOReturn setCursorImage( void * cursorImage );
-
-/*! @function setCursorState
-    @abstract Set a new position and visibility for the hardware cursor.
-    @discussion IOFramebuffer subclasses may implement hardware cursor functionality, if so they should implement this method to change the position and visibility of the cursor.
-    @param x Left coordinate of the cursor image. A signed value, will be negative if the cursor's hot spot and position place it partly offscreen.
-    @param y Top coordinate of the cursor image. A signed value, will be negative if the cursor's hot spot and position place it partly offscreen.
-    @param visible Visible state of the cursor.
-    @result An IOReturn code.
-*/
-
-    virtual IOReturn setCursorState( SInt32 x, SInt32 y, bool visible );
-
-/*! @function flushCursor
-    @abstract Perform any needed cache flushing after software cursor rendering.
-    @discussion IOFramebuffer implements software cursor functionality when a hardware cursor is unavailable. Some hardware may need to flush a cache after the processor has finished lifting and dropping the software cursor.
-*/
-
-    virtual void flushCursor( void );
-
-/*! @function getAppleSense
-    @abstract Return display sense information for legacy Apple sensing.
-    @discussion Hardware that supports simple display sensing, or the classic 3 pin Apple sensing described in Designing Cards and Drivers, should implement this method to return sense information.
-    @param connectIndex Index of the display connection, from zero to the value of getConnectionCount().
-    @param senseType Return zero to indicate legacy Apple sensing.
-    @param primary Return the value of the primary Apple sense code.
-    @param extended Return the value of the secondary Apple sense code.
-    @param displayType Return an Apple defined constant for the type of display sensed. For example, kVGAConnect, kNTSCConnect, kPALConnect etc.
-    @result An IOReturn code.
-*/
-
-    virtual IOReturn getAppleSense( IOIndex connectIndex,
-            UInt32 * senseType,
-            UInt32 * primary,
-            UInt32 * extended,
-            UInt32 * displayType );
-
-/*! @function connectFlags
-    @abstract Return display sense information for legacy Apple sensing.
-    @discussion Hardware that supports simple display sensing, or the classic 3 pin Apple sensing described in Designing Cards and Drivers, should implement this method to return mode flags relative to the sensed display. If this method is unimplemented, all modes have are given the flags kDisplayModeValidFlag | kDisplayModeSafeFlag.
-    @param connectIndex Index of the display connection, from zero to the value of getConnectionCount().
-    @param displayMode A display mode ID.
-    @param flags Return the flags value for the given mode with the connected display. Flags are:<br>
-    kDisplayModeValidFlag - mode is considered valid for the connected display by the driver.
-    kDisplayModeSafeFlag - mode is considered safe (not requiring mode change confirmation) for the connected display by the driver.
-    kDisplayModeDefaultFlag - mode is considered default for the connected display by the driver.
-    @result An IOReturn code.
-*/
-
-    virtual IOReturn connectFlags( IOIndex connectIndex,
-                    IODisplayModeID displayMode, IOOptionBits * flags );
-
-    //// IOLowLevelDDCSense
-
-/*! @function setDDCClock
-    @abstract Sets the state of the I2C clock line on a bus.
-    @discussion Framebuffers making use of the IOFramebuffer::doI2CRequest() software implementation of I2C should implement this method to set the state of the I2C clock line on the given bus. Otherwise may be unimplemented.
-    @param bus Index of the bus.
-    @param value One of kIODDCLow, kIODDCHigh, kIODDCTristate.
-*/
-
-    virtual void setDDCClock( IOIndex bus, UInt32 value );
-
-/*! @function setDDCData
-    @abstract Sets the state of the I2C data line on a bus.
-    @discussion Framebuffers making use of the IOFramebuffer::doI2CRequest() software implementation of I2C should implement this method to set the state of the I2C data line on the given bus. Otherwise may be unimplemented.
-    @param bus Index of the bus.
-    @param value One of kIODDCLow, kIODDCHigh, kIODDCTristate.
-*/
-    virtual void setDDCData( IOIndex bus, UInt32 value );
-
-/*! @function readDDCClock
-    @abstract Reads the input state of the I2C clock line on a bus.
-    @discussion Framebuffers making use of the IOFramebuffer::doI2CRequest() software implementation of I2C should implement this method to return the input state of the I2C clock line on the given bus. Otherwise may be unimplemented.
-    @param bus Index of the bus.
-    @result A boolean reflecting the current state of the clock line on the given bus.
-*/
-    virtual bool readDDCClock( IOIndex bus );
-
-/*! @function readDDCData
-    @abstract Reads the input state of the I2C data line on a bus.
-    @discussion Framebuffers making use of the IOFramebuffer::doI2CRequest() software implementation of I2C should implement this method to return the input state of the I2C data line on the given bus. Otherwise may be unimplemented.
-    @param bus Index of the bus.
-    @result A boolean reflecting the current state of the data line on the given bus.
-*/
-    virtual bool readDDCData( IOIndex bus );
-
-    virtual IOReturn enableDDCRaster( bool enable );
-
-/*! @function hasDDCConnect
-    @abstract Return display DDC connect state.
-    @discussion Hardware that supports DDC/EDID display sensing should implement this method to return true if a DDC display is detected. They should also return success for the connection attribute kConnectionSupportsHLDDCSense (from getAttributeForConnection()).
-    @param connectIndex Index of the display connection, from zero to the value of getConnectionCount().
-    @result True if a DDC display is detected.
-*/
-
-    virtual bool hasDDCConnect( IOIndex connectIndex );
-
-/*! @function getDDCBlock
-    @abstract Return display EDID data.
-    @discussion Hardware that supports DDC/EDID display sensing should implement this method to return EDID data in 128 byte blocks.
-    @param connectIndex Index of the display connection, from zero to the value of getConnectionCount().
-    @param blockNumber Block number, ranging from one to the number of blocks return by the display.
-    @param blockType kIODDCBlockTypeEDID will be passed. 
-    @param options No options are currently defined.
-    @param data Caller allocated buffer to receive the blocks data.
-    @param length In/out parameter - callers allocated buffer size, driver returns actual size.
-    @result An IOReturn code.
-*/
-
-    virtual IOReturn getDDCBlock( IOIndex connectIndex, UInt32 blockNumber,
-                    IOSelect blockType, IOOptionBits options,
-                    UInt8 * data, IOByteCount * length );
-
-/*! @function registerForInterruptType
-    @abstract Set callbacks for driver to call on interrupt events.
-    @discussion The IOFramebuffer class will call its subclasses to set callbacks to be called on interrupt events generated by hardware events. Only two are currently in use - vertical blank interrupts and connection changed interrupts.
-    @param interruptType One of these constants:<br>
-    kIOFBVBLInterruptType Specifying a vertical blanking interrupt.
-    kIOFBConnectInterruptType Specify the display connection should be resensed.
-    @param proc C callback to be called by the driver when the specified event occurs.
-    @param target Target parameter for the callback proc.
-    @param ref Ref parameter for the callback proc.
-    @param interruptRef The subclass should return an opaque reference to the installed interrupt handler, for use with unregisterInterrupt() and setInterruptState().
-    @result An IOReturn code.
-*/
-
-    virtual IOReturn registerForInterruptType( IOSelect interruptType,
-                    IOFBInterruptProc proc, OSObject * target, void * ref,
-                    void ** interruptRef );
-
-/*! @function unregisterInterrupt
-    @abstract Remove a callback previously installed by registerForInterruptType().
-    @discussion Remove a callback previously installed by registerForInterruptType().
-    @param interruptRef The interruptRef returned from the registerForInterruptType call that installed the interrupt.
-    @result An IOReturn code.
-*/
-
-    virtual IOReturn unregisterInterrupt( void * interruptRef );
-
-/*! @function unregisterInterrupt
-    @abstract Enable or disable a callback previously installed by registerForInterruptType().
-    @discussion Enable or disable a callback previously installed by registerForInterruptType().
-    @param state True or false to enable the callback.
-    @result An IOReturn code.
-*/
-
-    virtual IOReturn setInterruptState( void * interruptRef, UInt32 state );
-
-    virtual IOReturn getNotificationSemaphore( IOSelect interruptType,
-                                               semaphore_t * semaphore );
-
-/*  non WL clients apis
-*/
-    IOReturn setAttributeExt( IOSelect attribute, uintptr_t value );
-    
-    IOReturn getAttributeExt( IOSelect attribute, uintptr_t * value );
-    
-    IOReturn setAttributeForConnectionExt( IOIndex connectIndex,
-               IOSelect attribute, uintptr_t value );
-    
-    IOReturn getAttributeForConnectionExt( IOIndex connectIndex,
-            IOSelect attribute, uintptr_t * value );
-};
-
-#endif /* ! _IOKIT_IOFRAMEBUFFER_H */
diff --git a/i386/include/IOKit/graphics/IOFramebufferShared.h b/i386/include/IOKit/graphics/IOFramebufferShared.h
deleted file mode 100644
index 7f01ff3..0000000
--- a/i386/include/IOKit/graphics/IOFramebufferShared.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOFRAMEBUFFERSHARED_H
-#define _IOKIT_IOFRAMEBUFFERSHARED_H
-
-#include <IOKit/hidsystem/IOHIDTypes.h>
-#include <IOKit/graphics/IOGraphicsTypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*! @header IOFramebufferShared
-The IOFramebufferShared.h header contains definitions of objects and types shared between a kernel level IOFrameBuffer service and a non-kernel window server. In Mac OS X this structure is used by the CoreGraphics server and IOGraphics Family, and is not available to other clients. IOFramebuffer subclasses and IOFramebuffer clients within the kernel should also not rely on this structure definition and constants. It is public only for use on Darwin based window servers. Cursor and window server state data is exchanged by kernel and non-kernel tasks through a slice of shared memory containing a StdFBShmem_t structure.<br>
-For a non-kernel task to get access to this slice of shared memory, a connection to an IOFramebuffer service must be made. A connection is made with the IOServiceOpen() function described in IOKitLib.h. A connection type of kIOFBServerConnectType or kIOFBSharedConnectType (for read-only access) should be specified. An io_connect_t handle is returned by IOServiceOpen(). This handle must be passed to IOFBCreateSharedCursor() to create the slice of shared memory. Then IOConnectMapMemory() may be called with a memory type of kIOFBCursorMemory to map the shared memory into the non-kernel task.
-*/
-
-#ifdef KERNEL
-// CGS use optional
-/*! @defined IOFB_ARBITRARY_SIZE_CURSOR
-    @discussion When IOFB_ARBITRARY_SIZE_CURSOR is not defined, the maximum cursor size is assumed to be CURSORWIDTH x CURSORHEIGHT and this header file will define a number of structures for storing cursor images accordingly. A non-kernel task may define IOFB_ARBITRARY_SIZE_CURSOR and use cursors up to the size specified when IOFBCreateSharedCursor() was called. In this case appropriate structures for storing cursor images must be defined elsewhere. In the kernel, IOFB_ARBITRARY_SIZE_CURSOR is always defined.
-*/
-#define IOFB_ARBITRARY_SIZE_CURSOR
-#define IOFB_ARBITRARY_FRAMES_CURSOR    1
-#endif
-
-#define IOFB_SUPPORTS_XOR_CURSOR
-#define IOFB_SUPPORTS_HW_SHIELD
-#define IOFB_SUPPORTS_ARBITRARY_FRAMES_CURSOR
-
-//
-// Cursor and Window Server state data, occupying a slice of shared memory
-// between the kernel and WindowServer.
-//
-/*! @enum CursorParameters
-    @constant kIOFBNumCursorFrames The number of cursor images stored in the StdFBShmem_t structure.
-    @constant kIOFBNumCursorFramesShift Used with waiting cursors.
-    @constant kIOFBMaxCursorDepth The maximum cursor pixel depth.
-*/
-enum {
-#if IOFB_ARBITRARY_FRAMES_CURSOR
-    kIOFBMainCursorIndex        = 0,
-    kIOFBWaitCursorIndex        = 1,
-    kIOFBNumCursorIndex         = 4,
-#else
-    kIOFBNumCursorFrames        = 4,
-    kIOFBNumCursorFramesShift   = 2,
-#endif
-    kIOFBMaxCursorDepth         = 32
-};
-
-#ifndef IOFB_ARBITRARY_SIZE_CURSOR
-
-/*! @defined CURSORWIDTH
-    @discussion The maximum width of the cursor image in pixels. This is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
-*/
-#define CURSORWIDTH  16         /* width in pixels */
-
-/*! @defined CURSORHEIGHT
-    @discussion The maximum height of the cursor image in pixels. This is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
-*/
-#define CURSORHEIGHT 16         /* height in pixels */
-
-/*! @struct bm12Cursor
-    @abstract Cursor image for 1-bit cursor.
-    @discussion This structure stores 16 pixel x 16 pixel cursors to be used with 1-bit color depth. This structure is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
-    @field image This array contains the cursor images.
-    @field mask This array contains the cursor mask.
-    @field save This array stores the pixel values of the region underneath the cursor in its last drawn position.
-*/
-struct bm12Cursor {
-    unsigned int image[4][16];
-    unsigned int mask[4][16];
-    unsigned int save[16];
-};
-
-/*! @struct bm18Cursor
-    @abstract Cursor image for 8-bit cursor.
-    @discussion This structure stores 16 pixel x 16 pixel cursors to be used with 8-bit color depth. This structure is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
-    @field image This array contains cursor color values, which are converted to displayed colors through the color table. The array is two dimensional and its first index is the cursor frame and the second index is the cursor pixel.
-    @field mask This array contains the cursor alpha mask. The array is two dimensional with the same indexing as the image. If an alpha mask pixel is 0 and the corresponding image pixel is set to white for the display, then this cursor pixel will invert pixels on the display.
-    @field save This array stores the color values of the region underneath the cursor in its last drawn position.
-*/
-struct bm18Cursor {
-    unsigned char image[4][256];
-    unsigned char mask[4][256];
-    unsigned char save[256];
-};
-
-/*! @struct bm34Cursor
-    @abstract Cursor image for 15-bit cursor.
-    @discussion This structure stores 16 pixel x 16 pixel cursors to be used with 15-bit color depth. This structure is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
-    @field image This array defines the cursor color values and transparency. The array is two dimensional and its first index is the cursor frame and the second index is the cursor pixel. A value of 0 means the pixel is transparent. Non-zero values are stored with the red, green, blue, and alpha values encoded with the following masks:<BR>
-    red mask = 0xF000<br>
-    blue mask 0x0F00<br>
-    green mask 0x00F0<br>
-    alpha mask = 0x000F<br>
-Note, only 4 bits are allocated for each color component.
-    @field save This array stores the color values of the region underneath the cursor in its last drawn position.
-*/
-struct bm34Cursor {
-    unsigned short image[4][256];
-    unsigned short save[256];
-};
-
-/*! @struct bm38Cursor
-    @abstract Cursor image for 24-bit cursor.
-    @discussion This structure stores 16 pixel x 16 pixel cursors to be used with 24-bit color depth. This structure is only defined if IOFB_ARBITRARY_SIZE_CURSOR is not defined.
-    @field image This array defines the cursor color values and transparency. The array is two dimensional and its first index is the cursor frame and the second index is the cursor pixel. The lower 24 bits of a pixel's value contain the RGB color, while the upper 8 bits contain the alpha value.
-    @field save This array stores the color values of the region underneath the cursor in its last drawn position.
-*/
-struct bm38Cursor {
-    unsigned int image[4][256];
-    unsigned int save[256];
-};
-
-#endif /* IOFB_ARBITRARY_SIZE_CURSOR */
-
-enum {
-    kIOFBCursorImageNew         = 0x01,
-    kIOFBCursorHWCapable        = 0x02
-};
-enum {
-    kIOFBHardwareCursorActive   = 0x01,
-    kIOFBHardwareCursorInVRAM   = 0x02
-};
-
-/*! @struct StdFBShmem_t
-    @discussion This structure contains cursor and window server state data and occupies a slice of shared memory between the kernel and window server. Several elements of this structure are only used in software cursor mode. Unless otherwise indicated, the coordinates in this structure are given in display space. Display space is the coordinate space that encompasses all the screens. The positions of the screens within display space indicate their location relative to each other as the cursor moves between them. If there is only one screen, the screen coordinates and display space coordinates will be the same.
-    @field cursorSema Semaphore lock for write access to the shared data in this structure.
-    @field frame The current cursor frame index.
-    @field cursorShow The cursor is displayed when cursorShow is 0.
-    @field cursorObscured If this is true, the cursor has been obscured and cursorShow should not be 0. The cursor will be shown again the next time it is moved.
-    @field shieldFlag When this is set to true the cursor will not be displayed in the region specified by shieldRect.
-    @field shielded True if the cursor has been hidden because it entered the shielded region.
-    @field saveRect The region that is saved underneath the cursor in software cursor mode.
-    @field shieldRect The region that the cursor will not be displayed in if shieldFlag is true.
-    @field cursorLoc The location of the cursor hot spot.
-    @field cursorRect The region that the cursor image currently occupies in software cursor mode.
-    @field oldCursorRect The region that the cursor image occupied the last time the cursor was drawn in software cursor mode.
-    @field screenBounds The region that the current screen occupies.
-    @field version Contains kIOFBCurrentShmemVersion so that a user client can ensure it is using the same version of this structure as the kernel.
-    @field structSize Contains the size of this structure.
-    @field vblTime The time of the most recent vertical blanking.
-    @field vblDelta The interval between the two most recent vertical blankings.
-    @field vblCount A running count of vertical blank interrupts.
-    @field reservedC Reserved for future use.
-    @field hardwareCursorCapable True if the hardware is capable of using hardware cursor mode.
-    @field hardwareCursorActive True if currently using the hardware cursor mode.
-    @field reservedB Reserved for future use.
-    @field cursorSize This array contains the cursor sizes indexed by frame.
-    @field hotSpot This array contains the location of the cursor hot spots indexed by frame. The hot spots coordinates are given relative to the top left corner of the cursor image.
-    @field cursor A union of structures that define the cursor images. The structure used depends on the framebuffer's bit depth. These structures are defined above.
-*/
-
-struct StdFBShmem_t {
-    ev_lock_data_t cursorSema;  
-    int frame;
-    char cursorShow;
-    char cursorObscured;
-    char shieldFlag;
-    char shielded;
-    IOGBounds saveRect;
-    IOGBounds shieldRect;
-    IOGPoint cursorLoc;
-    IOGBounds cursorRect;
-    IOGBounds oldCursorRect;
-    IOGBounds screenBounds;
-    int version;
-    int structSize;
-    AbsoluteTime vblTime;
-    AbsoluteTime vblDelta;
-    unsigned long long int vblCount;
-#if IOFB_ARBITRARY_FRAMES_CURSOR
-    unsigned int reservedC[28];
-#else
-    unsigned int reservedC[27];
-    unsigned char hardwareCursorFlags[kIOFBNumCursorFrames];
-#endif
-    unsigned char hardwareCursorCapable;
-    unsigned char hardwareCursorActive;
-    unsigned char hardwareCursorShields;
-    unsigned char reservedB[1];
-#if IOFB_ARBITRARY_FRAMES_CURSOR
-    IOGSize cursorSize[kIOFBNumCursorIndex];
-    IOGPoint hotSpot[kIOFBNumCursorIndex];
-#else
-    IOGSize cursorSize[kIOFBNumCursorFrames];
-    IOGPoint hotSpot[kIOFBNumCursorFrames];
-#endif
-#ifndef IOFB_ARBITRARY_SIZE_CURSOR
-    union {
-        struct bm12Cursor bw;
-        struct bm18Cursor bw8;
-        struct bm34Cursor rgb;
-        struct bm38Cursor rgb24;
-    } cursor;
-#else  /* IOFB_ARBITRARY_SIZE_CURSOR */
-    unsigned char cursor[0];
-#endif /* IOFB_ARBITRARY_SIZE_CURSOR */
-};
-#ifndef __cplusplus
-typedef volatile struct StdFBShmem_t StdFBShmem_t;
-#endif
-
-
-/*! @enum FramebufferConstants
-    @constant kIOFBCurrentShmemVersion The current version of the slice of shared memory that contains the cursor and window server state data in the StdFBShmem_t structure.
-    @constant kIOFBCursorMemory The memory type for IOConnectMapMemory() to get a slice of shared memory that contains the StdFBShmem_t structure.
-*/
-enum {
-    // version for IOFBCreateSharedCursor
-    kIOFBShmemVersionMask       = 0x000000ff,
-    kIOFBTenPtOneShmemVersion   = 2,
-    kIOFBTenPtTwoShmemVersion   = 3,
-    kIOFBCurrentShmemVersion    = 2,
-
-    // number of frames in animating cursor (if > kIOFBTenPtTwoShmemVersion)
-    kIOFBShmemCursorNumFramesMask       = 0x00ff0000,
-    kIOFBShmemCursorNumFramesShift      = 16,
-
-    // memory types for IOConnectMapMemory.
-    kIOFBCursorMemory           = 100
-};
-
-/*! @defined IOFRAMEBUFFER_CONFORMSTO
-    @discussion The class name of the framebuffer service.
-*/
-#define IOFRAMEBUFFER_CONFORMSTO        "IOFramebuffer"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ! _IOKIT_IOFRAMEBUFFERSHARED_H */
diff --git a/i386/include/IOKit/graphics/IOGraphicsDevice.h b/i386/include/IOKit/graphics/IOGraphicsDevice.h
deleted file mode 100644
index 8f51330..0000000
--- a/i386/include/IOKit/graphics/IOGraphicsDevice.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IOGRAPHICSDEVICE_H
-#define _IOKIT_IOGRAPHICSDEVICE_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/graphics/IOGraphicsTypes.h>
-
-
-class IOGraphicsDevice : public IOService
-{
-    OSDeclareAbstractStructors(IOGraphicsDevice)
-
-public:
-
-    virtual void hideCursor( void ) = 0;
-    virtual void showCursor( IOGPoint * cursorLoc, int frame ) = 0;
-    virtual void moveCursor( IOGPoint * cursorLoc, int frame ) = 0;
-
-    virtual void getVBLTime( AbsoluteTime * time, AbsoluteTime * delta ) = 0;
-
-    virtual void getBoundingRect ( IOGBounds ** bounds ) = 0;
-};
-
-#endif /* ! _IOKIT_IOGRAPHICSDEVICE_H */
-
diff --git a/i386/include/IOKit/graphics/IOGraphicsEngine.h b/i386/include/IOKit/graphics/IOGraphicsEngine.h
deleted file mode 100644
index 4c79b41..0000000
--- a/i386/include/IOKit/graphics/IOGraphicsEngine.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- * 10 Mar 99 sdouglas created.
- */
-
-
-struct IOGraphicsEngineContext {
-    IOSharedLockData    contextLock;
-    IOOptionBits        state;
-    void *              owner;
-    UInt32              version;
-    IOByteCount         structSize;
-    UInt32              reserved[ 8 ];
-};
-#ifndef __cplusplus
-typedef volatile struct IOGraphicsEngineContext IOGraphicsEngineContext;
-#endif
-
-enum {
-    // memory type for IOMapMemory
-    kIOGraphicsEngineContext            = 100
-};
-
-enum {
-    // version
-    kIOGraphicsEngineContextVersion     = 1
-};
diff --git a/i386/include/IOKit/graphics/IOGraphicsInterfaceTypes.h b/i386/include/IOKit/graphics/IOGraphicsInterfaceTypes.h
deleted file mode 100644
index 5b392a7..0000000
--- a/i386/include/IOKit/graphics/IOGraphicsInterfaceTypes.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOGRAPHICSINTERFACETYPES_H
-#define _IOKIT_IOGRAPHICSINTERFACETYPES_H
-
-#include <IOKit/graphics/IOAccelSurfaceConnect.h>
-
-#define IO_FOUR_CHAR_CODE(x)    (x)
-
-typedef UInt32 IOFourCharCode;
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#define kCurrentGraphicsInterfaceVersion        1
-#define kCurrentGraphicsInterfaceRevision       2
-
-
-#ifdef IOGA_COMPAT
-typedef SInt32          IOBlitCompletionToken;
-#endif
-
-typedef UInt32          IOBlitType;
-enum {
-    kIOBlitTypeVerbMask                 = 0x000000ff,
-    kIOBlitTypeRects                    = 0,
-    kIOBlitTypeCopyRects,
-    kIOBlitTypeLines,
-    kIOBlitTypeScanlines,
-    kIOBlitTypeCopyRegion,
-
-    kIOBlitTypeMoveCursor,
-    kIOBlitTypeShowCursor,
-    kIOBlitTypeHideCursor,
-
-    kIOBlitTypeMonoExpand               = 0x00000100,
-    kIOBlitTypeColorSpaceConvert        = 0x00000200,
-    kIOBlitTypeScale                    = 0x00000400,
-
-    kIOBlitTypeSourceKeyColorModeMask   = 0x00003000,
-    kIOBlitTypeDestKeyColorModeMask     = 0x0000c000,
-    kIOBlitTypeSourceKeyColorEqual      = 0x00001000,
-    kIOBlitTypeSourceKeyColorNotEqual   = 0x00002000,
-    kIOBlitTypeDestKeyColorEqual        = 0x00004000,
-    kIOBlitTypeDestKeyColorNotEqual     = 0x00008000,
-
-    kIOBlitTypeOperationMask            = 0x0fff0000,
-    kIOBlitTypeOperationShift           = 16,
-    kIOBlitTypeOperationTypeMask        = 0x0f000000,
-
-    kIOBlitTypeOperationType0           = 0x00000000,
-    kIOBlitCopyOperation                = 0x00000000 | kIOBlitTypeOperationType0,
-    kIOBlitOrOperation                  = 0x00010000 | kIOBlitTypeOperationType0,
-    kIOBlitXorOperation                 = 0x00020000 | kIOBlitTypeOperationType0,
-    kIOBlitBlendOperation               = 0x00030000 | kIOBlitTypeOperationType0,
-    kIOBlitHighlightOperation           = 0x00040000 | kIOBlitTypeOperationType0
-};
-
-typedef UInt32          IOBlitSourceType;
-enum {
-    kIOBlitSourceDefault                = 0x00000000,
-    kIOBlitSourceFramebuffer            = 0x00001000,
-    kIOBlitSourceMemory                 = 0x00002000,
-    kIOBlitSourceOOLMemory              = 0x00003000,
-    kIOBlitSourcePattern                = 0x00004000,
-    kIOBlitSourceOOLPattern             = 0x00005000,
-    kIOBlitSourceSolid                  = 0x00006000,
-    kIOBlitSourceCGSSurface             = 0x00007000,
-    kIOBlitSourceIsSame                 = 0x80000000
-};
-
-#ifdef IOGA_COMPAT
-typedef IOBlitSourceType        IOBlitSourceDestType;
-enum {
-    kIOBlitDestFramebuffer              = 0x00000001
-};
-#endif
-
-typedef struct IOBlitOperationStruct {
-    UInt32              color0;
-    UInt32              color1;
-    SInt32              offsetX;
-    SInt32              offsetY;
-    UInt32              sourceKeyColor;
-    UInt32              destKeyColor;
-    UInt32              specific[16];
-} IOBlitOperation;
-
-typedef struct IOBlitRectangleStruct {
-    SInt32              x;
-    SInt32              y;
-    SInt32              width;
-    SInt32              height;
-} IOBlitRectangle;
-
-typedef struct IOBlitRectanglesStruct {
-    IOBlitOperation     operation;
-    IOItemCount         count;
-    IOBlitRectangle     rects[1];
-} IOBlitRectangles;
-
-typedef struct IOBlitCopyRectangleStruct {
-    SInt32              sourceX;
-    SInt32              sourceY;
-    SInt32              x;
-    SInt32              y;
-    SInt32              width;
-    SInt32              height;
-} IOBlitCopyRectangle;
-
-typedef struct IOBlitCopyRectanglesStruct {
-    IOBlitOperation     operation;
-    IOItemCount         count;
-    IOBlitCopyRectangle rects[1];
-} IOBlitCopyRectangles;
-
-
-typedef struct IOBlitCopyRegionStruct {
-    IOBlitOperation       operation;
-    SInt32                deltaX;
-    SInt32                deltaY;
-    IOAccelDeviceRegion * region;
-} IOBlitCopyRegion;
-
-
-typedef struct IOBlitVertexStruct {
-    SInt32              x;
-    SInt32              y;
-} IOBlitVertex;
-
-typedef struct IOBlitVerticesStruct {
-    IOBlitOperation     operation;
-    IOItemCount         count;
-    IOBlitVertex        vertices[2];
-} IOBlitVertices;
-
-typedef struct IOBlitScanlinesStruct {
-    IOBlitOperation     operation;
-    IOItemCount         count;
-    SInt32              y;
-    SInt32              height;
-    SInt32              x[2];
-} IOBlitScanlines;
-
-
-typedef struct IOBlitCursorStruct {
-    IOBlitOperation     operation;
-    IOBlitRectangle     rect;
-} IOBlitCursor;
-
-typedef struct _IOBlitMemory * IOBlitMemoryRef;
-
-
-/* Quickdraw.h pixel formats*/
-
-enum {
-        kIO1MonochromePixelFormat       = 0x00000001,           /* 1 bit indexed*/
-        kIO2IndexedPixelFormat          = 0x00000002,           /* 2 bit indexed*/
-        kIO4IndexedPixelFormat          = 0x00000004,           /* 4 bit indexed*/
-        kIO8IndexedPixelFormat          = 0x00000008,           /* 8 bit indexed*/
-        kIO16BE555PixelFormat           = 0x00000010,           /* 16 bit BE rgb 555 (Mac)*/
-        kIO24RGBPixelFormat             = 0x00000018,           /* 24 bit rgb */
-        kIO32ARGBPixelFormat            = 0x00000020,           /* 32 bit argb  (Mac)*/
-        kIO1IndexedGrayPixelFormat      = 0x00000021,           /* 1 bit indexed gray*/
-        kIO2IndexedGrayPixelFormat      = 0x00000022,           /* 2 bit indexed gray*/
-        kIO4IndexedGrayPixelFormat      = 0x00000024,           /* 4 bit indexed gray*/
-        kIO8IndexedGrayPixelFormat      = 0x00000028            /* 8 bit indexed gray*/
-};
-
-enum {
-        kIO16LE555PixelFormat   = IO_FOUR_CHAR_CODE('L555'),    /* 16 bit LE rgb 555 (PC)*/
-        kIO16LE5551PixelFormat  = IO_FOUR_CHAR_CODE('5551'),    /* 16 bit LE rgb 5551*/
-        kIO16BE565PixelFormat   = IO_FOUR_CHAR_CODE('B565'),    /* 16 bit BE rgb 565*/
-        kIO16LE565PixelFormat   = IO_FOUR_CHAR_CODE('L565'),    /* 16 bit LE rgb 565*/
-        kIO24BGRPixelFormat     = IO_FOUR_CHAR_CODE('24BG'),    /* 24 bit bgr */
-        kIO32BGRAPixelFormat    = IO_FOUR_CHAR_CODE('BGRA'),    /* 32 bit bgra  (Matrox)*/
-        kIO32ABGRPixelFormat    = IO_FOUR_CHAR_CODE('ABGR'),    /* 32 bit abgr  */
-        kIO32RGBAPixelFormat    = IO_FOUR_CHAR_CODE('RGBA'),    /* 32 bit rgba  */
-        kIOYUVSPixelFormat      = IO_FOUR_CHAR_CODE('yuvs'),    /* YUV 4:2:2 byte ordering 16-unsigned = 'YUY2'*/
-        kIOYUVUPixelFormat      = IO_FOUR_CHAR_CODE('yuvu'),    /* YUV 4:2:2 byte ordering 16-signed*/
-        kIOYVU9PixelFormat      = IO_FOUR_CHAR_CODE('YVU9'),    /* YVU9 Planar  9*/
-        kIOYUV411PixelFormat    = IO_FOUR_CHAR_CODE('Y411'),    /* YUV 4:1:1 Interleaved 16*/
-        kIOYVYU422PixelFormat   = IO_FOUR_CHAR_CODE('YVYU'),    /* YVYU 4:2:2 byte ordering 16*/
-        kIOUYVY422PixelFormat   = IO_FOUR_CHAR_CODE('UYVY'),    /* UYVY 4:2:2 byte ordering 16*/
-        kIOYUV211PixelFormat    = IO_FOUR_CHAR_CODE('Y211'),    /* YUV 2:1:1 Packed     8*/
-        kIO2vuyPixelFormat      = IO_FOUR_CHAR_CODE('2vuy') /* UYVY 4:2:2 byte ordering   16*/
-};
-
-/* Non Quickdraw.h pixel formats*/
-enum {
-        kIO16LE4444PixelFormat     = IO_FOUR_CHAR_CODE('L444'), /* 16 bit LE argb 4444*/
-        kIO16BE4444PixelFormat     = IO_FOUR_CHAR_CODE('B444'), /* 16 bit BE argb 4444*/
-        kIO64BGRAPixelFormat       = IO_FOUR_CHAR_CODE('B16I'), /* 64 bit bgra  */
-        kIO64RGBAFloatPixelFormat  = IO_FOUR_CHAR_CODE('B16F'), /* 64 bit rgba  */
-        kIO128RGBAFloatPixelFormat = IO_FOUR_CHAR_CODE('B32F')  /* 128 bit rgba float */
-};
-
-enum {
-    kIOBlitMemoryRequiresHostFlush      = 0x00000001
-};
-
-typedef struct IOBlitSurfaceStruct {
-    union {
-        UInt8 *         bytes;
-        IOBlitMemoryRef ref;
-    }                   memory;
-    IOFourCharCode      pixelFormat;
-    IOBlitRectangle     size;
-    UInt32              rowBytes;
-    UInt32              byteOffset;
-    UInt32 *            palette;
-    IOOptionBits        accessFlags;
-    IOBlitMemoryRef     interfaceRef;
-    UInt32              more[14];
-} IOBlitSurface;
-
-typedef IOBlitSurface IOBlitMemory;
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-enum {
-    // options for Synchronize
-    kIOBlitSynchronizeWaitBeamExit      = 0x00000001,
-    kIOBlitSynchronizeFlushHostWrites   = 0x00000002
-};
-
-enum {
-    // options for WaitComplete & Flush
-    kIOBlitWaitContext                  = 0x00000000,
-    kIOBlitWaitAll2D                    = 0x00000001,
-    kIOBlitWaitGlobal                   = 0x00000001,
-    kIOBlitWaitAll                      = 0x00000002,
-    kIOBlitWaitCheck                    = 0x00000080,
-    kIOBlitFlushWithSwap                = 0x00010000
-};
-
-enum {
-    // options for AllocateSurface
-    kIOBlitHasCGSSurface                = 0x00000001,
-    kIOBlitFixedSource                  = 0x00000002,
-    kIOBlitBeamSyncSwaps                = 0x00000004,
-    kIOBlitReferenceSource              = 0x00000008
-};
-
-enum {
-    // options for UnlockSurface
-    kIOBlitUnlockWithSwap               = 0x80000000
-};
-
-enum {
-    // options for SetDestination
-    kIOBlitFramebufferDestination       = 0x00000000,
-    kIOBlitSurfaceDestination           = 0x00000001
-};
-
-
-
-enum {
-    // options for blit procs
-    kIOBlitBeamSync                     = 0x00000001,
-    kIOBlitBeamSyncAlways               = 0x00000002,
-    kIOBlitBeamSyncSpin                 = 0x00000004,
-
-    kIOBlitAllOptions                   = 0xffffffff
-};
-
-enum {
-    // capabilities
-    kIOBlitColorSpaceTypes              = IO_FOUR_CHAR_CODE('cspc')
-};
-
-
-// keys for IOAccelFindAccelerator()
-#define kIOAccelTypesKey                        "IOAccelTypes"
-#define kIOAccelIndexKey                        "IOAccelIndex"
-
-#define kIOAccelRevisionKey                     "IOAccelRevision"
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#endif /* !_IOKIT_IOGRAPHICSINTERFACETYPES_H */
diff --git a/i386/include/IOKit/graphics/IOGraphicsTypes.h b/i386/include/IOKit/graphics/IOGraphicsTypes.h
deleted file mode 100644
index 00bc2a8..0000000
--- a/i386/include/IOKit/graphics/IOGraphicsTypes.h
+++ /dev/null
@@ -1,1260 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOGRAPHICSTYPES_H
-#define _IOKIT_IOGRAPHICSTYPES_H
-
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOKitKeys.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define IOGRAPHICSTYPES_REV     24
-
-typedef SInt32  IOIndex;
-typedef UInt32  IOSelect;
-typedef UInt32  IOFixed1616;
-typedef UInt32  IODisplayVendorID;
-typedef UInt32  IODisplayProductID;
-
-typedef SInt32  IODisplayModeID;
-enum {
-    // This is the ID given to a programmable timing used at boot time
-    kIODisplayModeIDBootProgrammable = (IODisplayModeID)0xFFFFFFFB,
-    // Lowest (unsigned) DisplayModeID reserved by Apple
-    kIODisplayModeIDReservedBase     = (IODisplayModeID)0x80000000
-};
-
-enum {
-    kIOMaxPixelBits     = 64
-};
-typedef char IOPixelEncoding[ kIOMaxPixelBits ];
-
-// Common Apple pixel formats
-
-#define IO1BitIndexedPixels     "P"
-#define IO2BitIndexedPixels     "PP"
-#define IO4BitIndexedPixels     "PPPP"
-#define IO8BitIndexedPixels     "PPPPPPPP"
-#define IO16BitDirectPixels     "-RRRRRGGGGGBBBBB"
-#define IO32BitDirectPixels     "--------RRRRRRRRGGGGGGGGBBBBBBBB"
-
-#define kIO30BitDirectPixels    "--RRRRRRRRRRGGGGGGGGGGBBBBBBBBBB"
-#define kIO64BitDirectPixels    "-16R16G16B16"
-
-#define kIO16BitFloatPixels     "-16FR16FG16FB16"
-#define kIO32BitFloatPixels     "-32FR32FG32FB32"
-
-// other possible pixel formats
-
-#define IOYUV422Pixels          "Y4U2V2"
-#define IO8BitOverlayPixels     "O8"
-// page flipping
-#define IOPagedPixels           "Page1"
-
-#define IO_SampleTypeAlpha      'A'
-#define IO_SampleTypeSkip       '-'
-
-// Info about a pixel format
-enum {
-    kIOCLUTPixels                   = 0,
-    kIOFixedCLUTPixels              = 1,
-    kIORGBDirectPixels              = 2,
-    kIOMonoDirectPixels             = 3,
-    kIOMonoInverseDirectPixels      = 4,
-    kIORGBSignedDirectPixels        = 5,
-    kIORGBSignedFloatingPointPixels = 6
-};
-
-/*!
- * @struct IOPixelInformation
- * @abstract A structure defining the format of a framebuffer.
- * @discussion This structure is used by IOFramebuffer to define the format of the pixels.
- * @field bytesPerRow The number of bytes per row.
- * @field bytesPerPlane Not used.
- * @field bitsPerPixel The number of bits per pixel, including unused bits and alpha.
- * @field pixelType One of kIOCLUTPixels (indexed pixels with changeable CLUT), kIORGBDirectPixels (direct pixels).
- * @field componentCount One for indexed pixels, three for direct pixel formats.
- * @field bitsPerComponent Number of bits per component in each pixel.
- * @field componentMasks Mask of the bits valid for each component of the pixel - in R, G, B order for direct pixels.
- * @field pixelFormat String description of the pixel format - IO32BitDirectPixels, IO16BitDirectPixels etc.
- * @field flags None defined - set to zero.
- * @field activeWidth Number of pixels visible per row.
- * @field activeHeight Number of visible pixel rows.
- * @field reserved Set to zero.
- */
-
-struct IOPixelInformation {
-    UInt32                      bytesPerRow;
-    UInt32                      bytesPerPlane;
-    UInt32                      bitsPerPixel;
-    UInt32                      pixelType;
-    UInt32                      componentCount;
-    UInt32                      bitsPerComponent;
-    UInt32                      componentMasks[ 8 * 2 ];
-    IOPixelEncoding             pixelFormat;
-    UInt32                      flags;
-    UInt32                      activeWidth;
-    UInt32                      activeHeight;
-    UInt32                      reserved[ 2 ];
-};
-typedef struct IOPixelInformation IOPixelInformation;
-
-// ID for industry standard display timings
-typedef UInt32  IOAppleTimingID;
-
-/*!
- * @struct IODisplayModeInformation
- * @abstract A structure defining the format of a framebuffer.
- * @discussion This structure is used by IOFramebuffer to define the format of the pixels.
- * @field nominalWidth Number of pixels visible per row.
- * @field nominalHeight Number of visible pixel rows.
- * @field refreshRate Refresh rate in fixed point 16.16.
- * @field maxDepthIndex Highest depth index available in this display mode.
- * @field flags Flags for the mode, including: <br>
- *   kDisplayModeInterlacedFlag mode is interlaced. <br>
- *   kDisplayModeSimulscanFlag mode is available on multiple display connections. <br>
- *   kDisplayModeNotPresetFlag mode is not a factory preset for the display (geometry may need correction). <br>
- *   kDisplayModeStretchedFlag mode is stretched/distorted to match the display aspect ratio. <br>
- * @field reserved Set to zero.
- */
-
-struct IODisplayModeInformation {
-    UInt32                      nominalWidth;
-    UInt32                      nominalHeight;
-    IOFixed1616                 refreshRate;
-    IOIndex                     maxDepthIndex;
-    UInt32                      flags;
-    UInt32                      reserved[ 4 ];
-};
-typedef struct IODisplayModeInformation IODisplayModeInformation;
-
-// flags
-enum {
-    kDisplayModeSafetyFlags             = 0x00000007,
-
-    kDisplayModeAlwaysShowFlag          = 0x00000008,
-    kDisplayModeNeverShowFlag           = 0x00000080,
-    kDisplayModeNotResizeFlag           = 0x00000010,
-    kDisplayModeRequiresPanFlag         = 0x00000020,
-
-    kDisplayModeInterlacedFlag          = 0x00000040,
-
-    kDisplayModeSimulscanFlag           = 0x00000100,
-    kDisplayModeBuiltInFlag             = 0x00000400,
-    kDisplayModeNotPresetFlag           = 0x00000200,
-    kDisplayModeStretchedFlag           = 0x00000800,
-    kDisplayModeNotGraphicsQualityFlag  = 0x00001000,
-    kDisplayModeValidateAgainstDisplay  = 0x00002000,
-    kDisplayModeTelevisionFlag          = 0x00100000,
-    kDisplayModeValidForMirroringFlag   = 0x00200000
-};
-enum {
-    kDisplayModeValidFlag               = 0x00000001,
-    kDisplayModeSafeFlag                = 0x00000002,
-    kDisplayModeDefaultFlag             = 0x00000004
-};
-
-#ifndef KERNEL
-// Framebuffer info - obsolete
-
-struct IOFramebufferInformation {
-    IOPhysicalAddress           baseAddress;
-    UInt32                      activeWidth;
-    UInt32                      activeHeight;
-    IOByteCount                 bytesPerRow;
-    IOByteCount                 bytesPerPlane;
-    UInt32                      bitsPerPixel;
-    UInt32                      pixelType;
-    UInt32                      flags;
-    UInt32                      reserved[ 4 ];
-};
-typedef struct IOFramebufferInformation IOFramebufferInformation;
-#endif
-
-// flags
-enum {
-    kFramebufferSupportsCopybackCache   = 0x00010000,
-    kFramebufferSupportsWritethruCache  = 0x00020000,
-    kFramebufferSupportsGammaCorrection = 0x00040000,
-    kFramebufferDisableAltivecAccess    = 0x00080000
-};
-
-// Aperture is an index into supported pixel formats for a mode & depth
-typedef IOIndex IOPixelAperture;
-enum {
-    kIOFBSystemAperture = 0
-};
-
-//// CLUTs
-
-typedef UInt16 IOColorComponent;
-
-/*!
- * @struct IOColorEntry
- * @abstract A structure defining one entry of a color lookup table.
- * @discussion This structure is used by IOFramebuffer to define an entry of a color lookup table.
- * @field index Number of pixels visible per row.
- * @field red Value of red component 0-65535.
- * @field green Value of green component 0-65535.
- * @field blue Value of blue component 0-65535.
- */
-
-struct IOColorEntry {
-    UInt16                      index;
-    IOColorComponent            red;
-    IOColorComponent            green;
-    IOColorComponent            blue;
-};
-typedef struct IOColorEntry IOColorEntry;
-
-// options (masks)
-enum {
-    kSetCLUTByValue             = 0x00000001,           // else at index
-    kSetCLUTImmediately         = 0x00000002,           // else at VBL
-    kSetCLUTWithLuminance       = 0x00000004            // else RGB
-};
-
-//// Controller attributes
-
-enum {
-    kIOPowerStateAttribute              = 'pwrs',
-    kIOPowerAttribute                   = 'powr',
-    kIODriverPowerAttribute             = 'dpow',
-    kIOHardwareCursorAttribute          = 'crsr',
-
-    kIOMirrorAttribute                  = 'mirr',
-    kIOMirrorDefaultAttribute           = 'mrdf',
-
-    kIOCapturedAttribute                = 'capd',
-
-    kIOCursorControlAttribute           = 'crsc',
-
-    kIOSystemPowerAttribute             = 'spwr',
-    kIOVRAMSaveAttribute                = 'vrsv',
-    kIODeferCLUTSetAttribute            = 'vclt',
-
-    kIOClamshellStateAttribute          = 'clam'
-};
-
-// values for kIOMirrorAttribute
-enum {
-    kIOMirrorIsPrimary                  = 0x80000000,
-    kIOMirrorHWClipped                  = 0x40000000
-};
-
-// values for kIOMirrorDefaultAttribute
-enum {
-    kIOMirrorDefault                    = 0x00000001,
-    kIOMirrorForced                     = 0x00000002
-};
-
-//// Display mode timing information
-
-struct IODetailedTimingInformationV1 {
-    // from EDID defn
-    UInt32                      pixelClock;             // Hertz
-    UInt32                      horizontalActive;       // pixels
-    UInt32                      horizontalBlanking;     // pixels
-    UInt32                      horizontalBorder;       // pixels
-    UInt32                      horizontalSyncOffset;   // pixels
-    UInt32                      horizontalSyncWidth;    // pixels
-    UInt32                      verticalActive;         // lines
-    UInt32                      verticalBlanking;       // lines
-    UInt32                      verticalBorder;         // lines
-    UInt32                      verticalSyncOffset;     // lines
-    UInt32                      verticalSyncWidth;      // lines
-};
-typedef struct IODetailedTimingInformationV1 IODetailedTimingInformationV1;
-
-/*!
- * @struct IODetailedTimingInformationV2
- * @abstract A structure defining the detailed timing information of a display mode.
- * @discussion This structure is used by IOFramebuffer to define detailed timing information for a display mode. The VESA EDID document has more information.
- * @field __reservedA Set to zero.
- * @field horizontalScaledInset If the mode is scaled, sets the number of active pixels to remove the left and right edges in order to display an underscanned image.
- * @field verticalScaledInset If the mode is scaled, sets the number of active lines to remove the top and bottom edges in order to display an underscanned image.
- * @field scalerFlags If the mode is scaled,
- *    kIOScaleStretchToFit may be set to allow stretching.
- *    kIOScaleRotateFlags is mask which may have the value given by kIOScaleRotate90, kIOScaleRotate180, kIOScaleRotate270 to display a rotated framebuffer.
- * @field horizontalScaled If the mode is scaled, sets the size of the image before scaling or rotation.
- * @field verticalScaled If the mode is scaled, sets the size of the image before scaling or rotation.
- * @field signalConfig 
- *    kIOAnalogSetupExpected set if display expects a blank-to-black setup or pedestal.  See VESA signal standards. <br>
- *    kIOInterlacedCEATiming set for a CEA style interlaced timing:<br>
- *      Field 1 vertical blanking = half specified vertical blanking lines. <br>
- *      Field 2 vertical blanking = (half vertical blanking lines) + 1 line. <br>
- *      Field 1 vertical offset = half specified vertical sync offset. <br>
- *      Field 2 vertical offset = (half specified vertical sync offset) + 0.5 lines. <br>
- * @field signalLevels One of:<br>
- *   kIOAnalogSignalLevel_0700_0300 0.700 - 0.300 V p-p.<br>
- *   kIOAnalogSignalLevel_0714_0286 0.714 - 0.286 V p-p.<br>
- *   kIOAnalogSignalLevel_1000_0400 1.000 - 0.400 V p-p.<br>
- *   kIOAnalogSignalLevel_0700_0000 0.700 - 0.000 V p-p.<br>
- * @field pixelClock Pixel clock frequency in Hz.
- * @field minPixelClock Minimum pixel clock frequency in Hz, with error.
- * @field maxPixelClock Maximum pixel clock frequency in Hz, with error.
- * @field horizontalActive Pixel clocks per line.
- * @field horizontalBlanking Blanking clocks per line.
- * @field horizontalSyncOffset First clock of horizontal sync.
- * @field horizontalSyncPulseWidth Width of horizontal sync.
- * @field verticalActive Number of lines per frame.
- * @field verticalBlanking Blanking lines per frame.
- * @field verticalSyncOffset First line of vertical sync.
- * @field verticalSyncPulseWidth Height of vertical sync.
- * @field horizontalBorderLeft Number of pixels in left horizontal border.
- * @field horizontalBorderRight Number of pixels in right horizontal border.
- * @field verticalBorderTop Number of lines in top vertical border.
- * @field verticalBorderBottom Number of lines in bottom vertical border.
- * @field horizontalSyncConfig kIOSyncPositivePolarity for positive polarity horizontal sync (0 for negative).
- * @field horizontalSyncLevel Zero.
- * @field verticalSyncConfig kIOSyncPositivePolarity for positive polarity vertical sync (0 for negative).
- * @field verticalSyncLevel Zero.
- * @field numLinks number of links to be used by a dual link timing, if zero, assume one link.
- * @field __reservedB Reserved set to zero.
- */
-
-struct IODetailedTimingInformationV2 {
-
-    UInt32      __reservedA[3];                 // Init to 0
-    UInt32      horizontalScaledInset;          // pixels
-    UInt32      verticalScaledInset;            // lines
-
-    UInt32      scalerFlags;
-    UInt32      horizontalScaled;
-    UInt32      verticalScaled;
-
-    UInt32      signalConfig;
-    UInt32      signalLevels;
-
-    UInt64      pixelClock;                     // Hz
-
-    UInt64      minPixelClock;                  // Hz - With error what is slowest actual clock
-    UInt64      maxPixelClock;                  // Hz - With error what is fasted actual clock
-
-    UInt32      horizontalActive;               // pixels
-    UInt32      horizontalBlanking;             // pixels
-    UInt32      horizontalSyncOffset;           // pixels
-    UInt32      horizontalSyncPulseWidth;       // pixels
-
-    UInt32      verticalActive;                 // lines
-    UInt32      verticalBlanking;               // lines
-    UInt32      verticalSyncOffset;             // lines
-    UInt32      verticalSyncPulseWidth;         // lines
-
-    UInt32      horizontalBorderLeft;           // pixels
-    UInt32      horizontalBorderRight;          // pixels
-    UInt32      verticalBorderTop;              // lines
-    UInt32      verticalBorderBottom;           // lines
-
-    UInt32      horizontalSyncConfig;
-    UInt32      horizontalSyncLevel;            // Future use (init to 0)
-    UInt32      verticalSyncConfig;
-    UInt32      verticalSyncLevel;              // Future use (init to 0)
-    UInt32      numLinks;
-
-    UInt32      __reservedB[7];                 // Init to 0
-};
-typedef struct IODetailedTimingInformationV2 IODetailedTimingInformationV2;
-typedef struct IODetailedTimingInformationV2 IODetailedTimingInformation;
-
-struct IOTimingInformation {
-    IOAppleTimingID             appleTimingID;  // kIOTimingIDXXX const
-    UInt32                      flags;
-    union {
-      IODetailedTimingInformationV1     v1;
-      IODetailedTimingInformationV2     v2;
-    }                           detailedInfo;
-};
-typedef struct IOTimingInformation IOTimingInformation;
-
-enum {
-    // IOTimingInformation flags
-    kIODetailedTimingValid      = 0x80000000,
-    kIOScalingInfoValid         = 0x40000000
-};
-
-enum {
-    // scalerFlags
-    kIOScaleStretchToFit        = 0x00000001,
-
-    kIOScaleRotateFlags         = 0x000000f0,
-
-    kIOScaleSwapAxes            = 0x00000010,
-    kIOScaleInvertX             = 0x00000020,
-    kIOScaleInvertY             = 0x00000040,
-
-    kIOScaleRotate0             = 0x00000000,
-    kIOScaleRotate90            = kIOScaleSwapAxes | kIOScaleInvertX,
-    kIOScaleRotate180           = kIOScaleInvertX  | kIOScaleInvertY,
-    kIOScaleRotate270           = kIOScaleSwapAxes | kIOScaleInvertY
-};
-
-
-#pragma pack(push, 4)
-struct IOFBDisplayModeDescription {
-    IODisplayModeInformation    info;
-    IOTimingInformation         timingInfo;
-};
-typedef struct IOFBDisplayModeDescription IOFBDisplayModeDescription;
-#pragma pack(pop)
-
-/*!
- * @struct IODisplayTimingRange
- * @abstract A structure defining the limits and attributes of a display or framebuffer.
- * @discussion This structure is used to define the limits for modes programmed as detailed timings by the OS. The VESA EDID is useful background information for many of these fields. A data property with this structure under the key kIOFBTimingRangeKey in a framebuffer will allow the OS to program detailed timings that fall within its range.
- * @field __reservedA Set to zero.
- * @field version Set to zero.
- * @field __reservedB Set to zero.
- * @field minPixelClock minimum pixel clock frequency in range, in Hz.
- * @field minPixelClock maximum pixel clock frequency in range, in Hz.
- * @field maxPixelError largest variation between specified and actual pixel clock frequency, in Hz.
- * @field supportedSyncFlags mask of supported sync attributes. The following are defined:<br>
- *    kIORangeSupportsSeparateSyncs - digital separate syncs.<br>
- *    kIORangeSupportsSyncOnGreen - sync on green.<br>
- *    kIORangeSupportsCompositeSync - composite sync.<br>
- *    kIORangeSupportsVSyncSerration - vertical sync has serration and equalization pulses.<br>
- * @field supportedSignalLevels mask of possible signal levels. The following are defined:<br>
- *    kIORangeSupportsSignal_0700_0300 0.700 - 0.300 V p-p.<br>
- *    kIORangeSupportsSignal_0714_0286 0.714 - 0.286 V p-p.<br>
- *    kIORangeSupportsSignal_1000_0400 1.000 - 0.400 V p-p.<br>
- *    kIORangeSupportsSignal_0700_0000 0.700 - 0.000 V p-p.<br>
- * @field supportedSignalConfigs mask of possible signal configurations. The following are defined:<br>
- *    kIORangeSupportsInterlacedCEATiming Supports CEA style interlaced timing:<br>
- *      Field 1 vertical blanking = specified vertical blanking lines. <br>
- *      Field 2 vertical blanking = vertical blanking lines + 1 line. <br> 
- *      Field 1 vertical offset = specified vertical sync offset. <br>
- *      Field 2 vertical offset = specified vertical sync offset + 0.5 lines. <br>
- *    kIORangeSupportsInterlacedCEATimingWithConfirm Supports CEA style interlaced timing, but require a confirm.
- * @field minFrameRate minimum frame rate (vertical refresh frequency) in range, in Hz.
- * @field maxFrameRate maximum frame rate (vertical refresh frequency) in range, in Hz.
- * @field minLineRate minimum line rate (horizontal refresh frequency) in range, in Hz.
- * @field maxLineRate maximum line rate (horizontal refresh frequency) in range, in Hz.
- * @field maxHorizontalTotal maximum clocks in horizontal line (active + blanking).
- * @field maxVerticalTotal maximum lines in vertical frame (active + blanking).
- * @field __reservedD Set to zero.
- * @field charSizeHorizontalActive horizontalActive must be a multiple of charSizeHorizontalActive.
- * @field charSizeHorizontalBlanking horizontalBlanking must be a multiple of charSizeHorizontalBlanking.
- * @field charSizeHorizontalSyncOffset horizontalSyncOffset must be a multiple of charSizeHorizontalSyncOffset.
- * @field charSizeHorizontalSyncPulse horizontalSyncPulse must be a multiple of charSizeHorizontalSyncPulse.
- * @field charSizeVerticalActive verticalActive must be a multiple of charSizeVerticalActive.
- * @field charSizeVerticalBlanking verticalBlanking must be a multiple of charSizeVerticalBlanking.
- * @field charSizeVerticalSyncOffset verticalSyncOffset must be a multiple of charSizeVerticalSyncOffset.
- * @field charSizeVerticalSyncPulse verticalSyncPulse must be a multiple of charSizeVerticalSyncPulse.
- * @field charSizeHorizontalBorderLeft horizontalBorderLeft must be a multiple of charSizeHorizontalBorderLeft.
- * @field charSizeHorizontalBorderRight horizontalBorderRight must be a multiple of charSizeHorizontalBorderRight.
- * @field charSizeVerticalBorderTop verticalBorderTop must be a multiple of charSizeVerticalBorderTop.
- * @field charSizeVerticalBorderBottom verticalBorderBottom must be a multiple of charSizeVerticalBorderBottom.
- * @field charSizeHorizontalTotal (horizontalActive + horizontalBlanking) must be a multiple of charSizeHorizontalTotal.
- * @field charSizeVerticalTotal (verticalActive + verticalBlanking) must be a multiple of charSizeVerticalTotal.
- * @field __reservedE Set to zero.
- * @field minHorizontalActiveClocks minimum value of horizontalActive.
- * @field maxHorizontalActiveClocks maximum value of horizontalActive.
- * @field minHorizontalBlankingClocks minimum value of horizontalBlanking.
- * @field maxHorizontalBlankingClocks maximum value of horizontalBlanking.
- * @field minHorizontalSyncOffsetClocks minimum value of horizontalSyncOffset.
- * @field maxHorizontalSyncOffsetClocks maximum value of horizontalSyncOffset.
- * @field minHorizontalPulseWidthClocks minimum value of horizontalPulseWidth.
- * @field maxHorizontalPulseWidthClocks maximum value of horizontalPulseWidth.
- * @field minVerticalActiveClocks minimum value of verticalActive.
- * @field maxVerticalActiveClocks maximum value of verticalActive.
- * @field minVerticalBlankingClocks minimum value of verticalBlanking.
- * @field maxVerticalBlankingClocks maximum value of verticalBlanking.
- * @field minVerticalSyncOffsetClocks minimum value of verticalSyncOffset.
- * @field maxVerticalSyncOffsetClocks maximum value of verticalSyncOffset.
- * @field minVerticalPulseWidthClocks minimum value of verticalPulseWidth.
- * @field maxVerticalPulseWidthClocks maximum value of verticalPulseWidth.
- * @field minHorizontalBorderLeft minimum value of horizontalBorderLeft.
- * @field maxHorizontalBorderLeft maximum value of horizontalBorderLeft.
- * @field minHorizontalBorderRight minimum value of horizontalBorderRight.
- * @field maxHorizontalBorderRight maximum value of horizontalBorderRight.
- * @field minVerticalBorderTop minimum value of verticalBorderTop.
- * @field maxVerticalBorderTop maximum value of verticalBorderTop.
- * @field minVerticalBorderBottom minimum value of verticalBorderBottom.
- * @field maxVerticalBorderBottom maximum value of verticalBorderBottom.
- * @field maxNumLinks number of links supported, if zero, 1 link is assumed.
- * @field minLink0PixelClock minimum pixel clock for link 0 (kHz).
- * @field maxLink0PixelClock maximum pixel clock for link 0 (kHz).
- * @field minLink1PixelClock minimum pixel clock for link 1 (kHz).
- * @field maxLink1PixelClock maximum pixel clock for link 1 (kHz).
- * @field __reservedF Set to zero.
- */
-
-struct IODisplayTimingRange
-{
-    UInt32      __reservedA[2];                 // Init to 0
-    UInt32      version;                        // Init to 0
-    UInt32      __reservedB[5];                 // Init to 0
-
-    UInt64      minPixelClock;                  // Min dot clock in Hz
-    UInt64      maxPixelClock;                  // Max dot clock in Hz
-
-    UInt32      maxPixelError;                  // Max dot clock error
-    UInt32      supportedSyncFlags;
-    UInt32      supportedSignalLevels;
-    UInt32      supportedSignalConfigs;
-
-    UInt32      minFrameRate;                   // Hz
-    UInt32      maxFrameRate;                   // Hz
-    UInt32      minLineRate;                    // Hz
-    UInt32      maxLineRate;                    // Hz
-
-    UInt32      maxHorizontalTotal;             // Clocks - Maximum total (active + blanking)
-    UInt32      maxVerticalTotal;               // Clocks - Maximum total (active + blanking)
-    UInt32      __reservedD[2];                 // Init to 0
-
-    UInt8       charSizeHorizontalActive;
-    UInt8       charSizeHorizontalBlanking;     
-    UInt8       charSizeHorizontalSyncOffset; 
-    UInt8       charSizeHorizontalSyncPulse; 
-
-    UInt8       charSizeVerticalActive;         
-    UInt8       charSizeVerticalBlanking;       
-    UInt8       charSizeVerticalSyncOffset;     
-    UInt8       charSizeVerticalSyncPulse;      
-
-    UInt8       charSizeHorizontalBorderLeft; 
-    UInt8       charSizeHorizontalBorderRight; 
-    UInt8       charSizeVerticalBorderTop;      
-    UInt8       charSizeVerticalBorderBottom; 
-
-    UInt8       charSizeHorizontalTotal;                // Character size for active + blanking
-    UInt8       charSizeVerticalTotal;                  // Character size for active + blanking
-    UInt16      __reservedE;                            // Reserved (Init to 0)
-
-    UInt32      minHorizontalActiveClocks;
-    UInt32      maxHorizontalActiveClocks;
-    UInt32      minHorizontalBlankingClocks;
-    UInt32      maxHorizontalBlankingClocks;
-
-    UInt32      minHorizontalSyncOffsetClocks;
-    UInt32      maxHorizontalSyncOffsetClocks;
-    UInt32      minHorizontalPulseWidthClocks;
-    UInt32      maxHorizontalPulseWidthClocks;
-
-    UInt32      minVerticalActiveClocks;
-    UInt32      maxVerticalActiveClocks;
-    UInt32      minVerticalBlankingClocks;
-    UInt32      maxVerticalBlankingClocks;
-
-    UInt32      minVerticalSyncOffsetClocks;
-    UInt32      maxVerticalSyncOffsetClocks;
-    UInt32      minVerticalPulseWidthClocks;
-    UInt32      maxVerticalPulseWidthClocks;
-
-    UInt32      minHorizontalBorderLeft;
-    UInt32      maxHorizontalBorderLeft;
-    UInt32      minHorizontalBorderRight;
-    UInt32      maxHorizontalBorderRight;
-
-    UInt32      minVerticalBorderTop;
-    UInt32      maxVerticalBorderTop;
-    UInt32      minVerticalBorderBottom;
-    UInt32      maxVerticalBorderBottom;
-    UInt32      maxNumLinks;                       // number of links, if zero, assume link 1
-    UInt32      minLink0PixelClock;                // min pixel clock for link 0 (kHz)
-    UInt32      maxLink0PixelClock;                // max pixel clock for link 0 (kHz)
-    UInt32      minLink1PixelClock;                // min pixel clock for link 1 (kHz)
-    UInt32      maxLink1PixelClock;                // max pixel clock for link 1 (kHz)
-
-    UInt32      __reservedF[3];                 // Init to 0
-};
-typedef struct IODisplayTimingRange  IODisplayTimingRange;
-
-enum {
-    // supportedSignalLevels
-    kIORangeSupportsSignal_0700_0300    = 0x00000001,
-    kIORangeSupportsSignal_0714_0286    = 0x00000002,
-    kIORangeSupportsSignal_1000_0400    = 0x00000004,
-    kIORangeSupportsSignal_0700_0000    = 0x00000008
-};
-enum {
-    // supportedSyncFlags
-    kIORangeSupportsSeparateSyncs        = 0x00000001,
-    kIORangeSupportsSyncOnGreen          = 0x00000002,
-    kIORangeSupportsCompositeSync        = 0x00000004,
-    kIORangeSupportsVSyncSerration       = 0x00000008
-};
-enum {
-    // supportedSignalConfigs
-    kIORangeSupportsInterlacedCEATiming            = 0x00000004,
-    kIORangeSupportsInterlacedCEATimingWithConfirm = 0x00000008
-};
-
-enum {
-    // signalConfig
-    kIODigitalSignal          = 0x00000001,
-    kIOAnalogSetupExpected    = 0x00000002,
-    kIOInterlacedCEATiming    = 0x00000004,
-    kIONTSCTiming             = 0x00000008,
-    kIOPALTiming              = 0x00000010
-};
-
-enum {
-    // signalLevels for analog
-    kIOAnalogSignalLevel_0700_0300 = 0,
-    kIOAnalogSignalLevel_0714_0286 = 1,
-    kIOAnalogSignalLevel_1000_0400 = 2,
-    kIOAnalogSignalLevel_0700_0000 = 3
-};
-
-enum {
-    // horizontalSyncConfig and verticalSyncConfig
-    kIOSyncPositivePolarity     = 0x00000001
-};
-
-/*!
- * @struct IODisplayScalerInformation
- * @abstract A structure defining the scaling capabilities of a framebuffer.
- * @discussion This structure is used to define the limits for modes programmed as detailed timings by the OS. A data property with this structure under the key kIOFBScalerInfoKey in a framebuffer will allow the OS to program detailed timings that are scaled to a displays native resolution.
- * @field __reservedA Set to zero.
- * @field version Set to zero.
- * @field __reservedB Set to zero.
- * @field scalerFeatures Mask of scaling features. The following are defined:<br>
- *   kIOScaleStretchOnly If set the framebuffer can only provide stretched scaling with non-square pixels, without borders.<br>
- *   kIOScaleCanUpSamplePixels If set framebuffer can scale up from a smaller number of source pixels to a larger native timing (eg. 640x480 pixels on a 1600x1200 timing).<br>
- *   kIOScaleCanDownSamplePixels If set framebuffer can scale down from a larger number of source pixels to a smaller native timing (eg. 1600x1200 pixels on a 640x480 timing).<br>
- *   kIOScaleCanScaleInterlaced If set framebuffer can scale an interlaced detailed timing.<br>
- *   kIOScaleCanSupportInset If set framebuffer can support scaled modes with non-zero horizontalScaledInset, verticalScaledInset fields.<br>
- *   kIOScaleCanRotate If set framebuffer can support some of the flags in the kIOScaleRotateFlags mask.<br>
- *   kIOScaleCanBorderInsetOnly If set framebuffer can support scaled modes with non-zero horizontalScaledInset, verticalScaledInset fields, but requires the active pixels to be equal in size to the inset area, ie. can do insets with a border versus scaling an image.<br>
- * @field maxHorizontalPixels Maximum number of horizontal source pixels (horizontalScaled).<br>
- * @field maxVerticalPixels Maximum number of vertical source pixels (verticalScaled).<br>
- * @field __reservedC Set to zero.
- */
-
-struct IODisplayScalerInformation {
-    UInt32              __reservedA[1];         // Init to 0
-    UInt32              version;                // Init to 0
-    UInt32              __reservedB[2];         // Init to 0
-    
-    IOOptionBits        scalerFeatures;
-    UInt32              maxHorizontalPixels;
-    UInt32              maxVerticalPixels;
-    UInt32              __reservedC[5];         // Init to 0
-};
-typedef struct IODisplayScalerInformation IODisplayScalerInformation;
-
-enum {
-    /* scalerFeatures */
-    kIOScaleStretchOnly           = 0x00000001,
-    kIOScaleCanUpSamplePixels     = 0x00000002,
-    kIOScaleCanDownSamplePixels   = 0x00000004,
-    kIOScaleCanScaleInterlaced    = 0x00000008,
-    kIOScaleCanSupportInset       = 0x00000010,
-    kIOScaleCanRotate             = 0x00000020,
-    kIOScaleCanBorderInsetOnly    = 0x00000040
-};
-
-//// Connections
-
-enum {
-    kOrConnections                      = 0xffffffe,
-    kAndConnections                     = 0xffffffd
-};
-
-enum {
-    kConnectionFlags                    = 'flgs',
-    kConnectionSyncEnable               = 'sync',
-    kConnectionSyncFlags                = 'sycf',
-    kConnectionSupportsAppleSense       = 'asns',
-    kConnectionSupportsLLDDCSense       = 'lddc',
-    kConnectionSupportsHLDDCSense       = 'hddc',
-    kConnectionEnable                   = 'enab',
-    kConnectionCheckEnable              = 'cena',
-    kConnectionProbe                    = 'prob',
-    kConnectionChanged                  = 'chng',
-    kConnectionPower                    = 'powr',
-    kConnectionPostWake                 = 'pwak',
-    kConnectionDisplayParameterCount    = 'pcnt',
-    kConnectionDisplayParameters        = 'parm',
-    kConnectionOverscan                 = 'oscn',
-    kConnectionVideoBest                = 'vbst',
-
-    kConnectionRedGammaScale            = 'rgsc',
-    kConnectionGreenGammaScale          = 'ggsc',
-    kConnectionBlueGammaScale           = 'bgsc',
-
-    kConnectionHandleDisplayPortEvent   = 'dpir',
-
-    kConnectionPanelTimingDisable       = 'pnlt',
-
-    kConnectionColorMode                = 'cyuv',
-    kConnectionColorModesSupported      = 'colr',
-    kConnectionColorDepthsSupported     = ' bpc',
-
-    kConnectionControllerDepthsSupported = '\0grd',
-    kConnectionControllerColorDepth      = '\0dpd',
-    kConnectionControllerDitherControl   = '\0gdc',
-
-    kConnectionDisplayFlags              = 'dflg',
-};
-
-// kConnectionFlags values
-enum {
-    kIOConnectionBuiltIn                = 0x00000800,
-    kIOConnectionStereoSync             = 0x00008000
-};
-
-// kConnectionSyncControl values
-enum {
-    kIOHSyncDisable                     = 0x00000001,
-    kIOVSyncDisable                     = 0x00000002,
-    kIOCSyncDisable                     = 0x00000004,
-    kIONoSeparateSyncControl            = 0x00000040,
-    kIOTriStateSyncs                    = 0x00000080,
-    kIOSyncOnBlue                       = 0x00000008,
-    kIOSyncOnGreen                      = 0x00000010,
-    kIOSyncOnRed                        = 0x00000020
-};
-
-// kConnectionHandleDisplayPortEvent values
-enum {
-    kIODPEventStart                             = 1,
-    kIODPEventIdle                              = 2,
-
-    kIODPEventForceRetrain                      = 3,
-
-    kIODPEventRemoteControlCommandPending       = 256,
-    kIODPEventAutomatedTestRequest              = 257,
-    kIODPEventContentProtection                 = 258,
-    kIODPEventMCCS                              = 259,
-    kIODPEventSinkSpecific                      = 260
-};
-
-#define kIODisplayAttributesKey         "IODisplayAttributes"
-
-#define kIODisplaySupportsUnderscanKey  "IODisplaySupportsUnderscan"
-#define kIODisplaySupportsBasicAudioKey "IODisplaySupportsBasicAudio"
-#define kIODisplaySupportsYCbCr444Key   "IODisplaySupportsYCbCr444"
-#define kIODisplaySupportsYCbCr422Key   "IODisplaySupportsYCbCr422"
-
-enum
-{ 
-    kIODisplayColorMode = kConnectionColorMode,
-};
-
-#if 0
-enum
-{
-    // kConnectionColorMode attribute
-    kIODisplayColorModeReserved   = 0x00000000,
-    kIODisplayColorModeRGB        = 0x00000001,
-    kIODisplayColorModeYCbCr422   = 0x00000010,
-    kIODisplayColorModeYCbCr444   = 0x00000100,
-    kIODisplayColorModeRGBLimited = 0x00001000,
-    kIODisplayColorModeAuto       = 0x10000000,
-};
-#endif
-
-enum
-{ 
-    // kConnectionColorDepthsSupported attribute
-    kIODisplayRGBColorComponentBitsUnknown       = 0x00000000,
-    kIODisplayRGBColorComponentBits6             = 0x00000001,
-    kIODisplayRGBColorComponentBits8             = 0x00000002,
-    kIODisplayRGBColorComponentBits10            = 0x00000004,
-    kIODisplayRGBColorComponentBits12            = 0x00000008,
-    kIODisplayRGBColorComponentBits14            = 0x00000010,
-    kIODisplayRGBColorComponentBits16            = 0x00000020,
-
-    kIODisplayYCbCr444ColorComponentBitsUnknown  = 0x00000000,
-    kIODisplayYCbCr444ColorComponentBits6        = 0x00000100,
-    kIODisplayYCbCr444ColorComponentBits8        = 0x00000200,
-    kIODisplayYCbCr444ColorComponentBits10       = 0x00000400,
-    kIODisplayYCbCr444ColorComponentBits12       = 0x00000800,
-    kIODisplayYCbCr444ColorComponentBits14       = 0x00001000,
-    kIODisplayYCbCr444ColorComponentBits16       = 0x00002000,
-
-    kIODisplayYCbCr422ColorComponentBitsUnknown  = 0x00000000,
-    kIODisplayYCbCr422ColorComponentBits6        = 0x00010000,
-    kIODisplayYCbCr422ColorComponentBits8        = 0x00020000,
-    kIODisplayYCbCr422ColorComponentBits10       = 0x00040000,
-    kIODisplayYCbCr422ColorComponentBits12       = 0x00080000,
-    kIODisplayYCbCr422ColorComponentBits14       = 0x00100000,
-    kIODisplayYCbCr422ColorComponentBits16       = 0x00200000,
-};
-
-enum
-{ 
-    // kConnectionDitherControl attribute
-    kIODisplayDitherDisable          = 0x00000000,
-    kIODisplayDitherSpatial          = 0x00000001,
-    kIODisplayDitherTemporal         = 0x00000002,
-    kIODisplayDitherFrameRateControl = 0x00000004,
-    kIODisplayDitherDefault          = 0x00000080,
-    kIODisplayDitherAll              = 0x000000FF,
-    kIODisplayDitherRGBShift         = 0,
-    kIODisplayDitherYCbCr444Shift    = 8,
-    kIODisplayDitherYCbCr422Shift    = 16,
-};
-
-enum
-{ 
-    // kConnectionDisplayFlags attribute
-    kIODisplayNeedsCEAUnderscan      = 0x00000001,
-};
-
-
-#define IO_DISPLAY_CAN_FILL             0x00000040
-#define IO_DISPLAY_CAN_BLIT             0x00000020
-
-#define IO_24BPP_TRANSFER_TABLE_SIZE    256
-#define IO_15BPP_TRANSFER_TABLE_SIZE    256
-#define IO_8BPP_TRANSFER_TABLE_SIZE     256
-#define IO_12BPP_TRANSFER_TABLE_SIZE    256
-#define IO_2BPP_TRANSFER_TABLE_SIZE     256
-
-#define STDFB_BM256_TO_BM38_MAP_SIZE    256
-#define STDFB_BM38_TO_BM256_MAP_SIZE    256
-#define STDFB_BM38_TO_256_WITH_LOGICAL_SIZE     \
-        (STDFB_BM38_TO_BM256_MAP_SIZE + (256/sizeof(int)))
-
-#define STDFB_4BPS_TO_5BPS_MAP_SIZE     16
-#define STDFB_5BPS_TO_4BPS_MAP_SIZE     32
-
-enum {
-    // connection types for IOServiceOpen
-    kIOFBServerConnectType              = 0,
-    kIOFBSharedConnectType              = 1
-};
-
-enum {
-    // options for IOServiceRequestProbe()
-    kIOFBUserRequestProbe               = 0x00000001
-};
-
-struct IOGPoint {
-    SInt16      x;
-    SInt16      y;
-};
-typedef struct IOGPoint IOGPoint;
-
-struct IOGSize {
-    SInt16      width;
-    SInt16      height;
-};
-typedef struct IOGSize IOGSize;
-
-struct IOGBounds {
-    SInt16      minx;
-    SInt16      maxx;
-    SInt16      miny;
-    SInt16      maxy;
-};
-typedef struct IOGBounds IOGBounds;
-
-#ifndef kIODescriptionKey
-
-#if !defined(__Point__) && !defined(BINTREE_H) && !defined(__MACTYPES__)
-#define __Point__
-typedef IOGPoint Point;
-#endif
-
-#if !defined(__Bounds__) && !defined(BINTREE_H) && !defined(__MACTYPES__)
-#define __Bounds__
-typedef IOGBounds Bounds;
-#endif
-
-#endif /* !kIODescriptionKey */
-
-// cursor description
-
-enum {
-   kTransparentEncoding         = 0,
-   kInvertingEncoding
-};
-
-enum {
-   kTransparentEncodingShift    = (kTransparentEncoding << 1),
-   kTransparentEncodedPixel     = (0x01 << kTransparentEncodingShift),
-
-   kInvertingEncodingShift      = (kInvertingEncoding << 1),
-   kInvertingEncodedPixel       = (0x01 << kInvertingEncodingShift)
-};
-
-enum {
-   kHardwareCursorDescriptorMajorVersion        = 0x0001,
-   kHardwareCursorDescriptorMinorVersion        = 0x0000
-};
-
-/*!
- * @struct IOHardwareCursorDescriptor
- * @abstract A structure defining the format of a hardware cursor.
- * @discussion This structure is used by IOFramebuffer to define the format of a hardware cursor.
- * @field majorVersion Set to kHardwareCursorDescriptorMajorVersion.
- * @field minorVersion Set to kHardwareCursorDescriptorMinorVersion.
- * @field height Maximum size of the cursor.
- * @field width Maximum size of the cursor.
- * @field bitDepth Number bits per pixel, or a QD/QT pixel type, for example kIO8IndexedPixelFormat, kIO32ARGBPixelFormat.
- * @field maskBitDepth Unused.
- * @field numColors Number of colors for indexed pixel types.
- * @field colorEncodings An array pointer specifying the pixel values corresponding to the indices into the color table, for indexed pixel types.
- * @field flags None defined, set to zero.
- * @field supportedSpecialEncodings Mask of supported special pixel values, eg. kTransparentEncodedPixel, kInvertingEncodedPixel.
- * @field specialEncodings Array of pixel values for each supported special encoding.
- */
-
-struct IOHardwareCursorDescriptor {
-   UInt16               majorVersion;
-   UInt16               minorVersion;
-   UInt32               height;
-   UInt32               width;
-   UInt32               bitDepth;                       // bits per pixel, or a QD/QT pixel type
-   UInt32               maskBitDepth;                   // unused
-   UInt32               numColors;                      // number of colors in the colorMap. ie. 
-   UInt32 *             colorEncodings;
-   UInt32               flags;
-   UInt32               supportedSpecialEncodings;
-   UInt32               specialEncodings[16];
-};
-typedef struct IOHardwareCursorDescriptor IOHardwareCursorDescriptor;
-
-enum {
-   kHardwareCursorInfoMajorVersion              = 0x0001,
-   kHardwareCursorInfoMinorVersion              = 0x0000
-};
-
-/*!
- * @struct IOHardwareCursorInfo
- * @abstract A structure defining the converted data of a hardware cursor.
- * @discussion This structure is used by IOFramebuffer to return the data of a hardware cursor by convertCursorImage() after conversion based on the IOHardwareCursorDescriptor passed to that routine.
- * @field majorVersion Set to kHardwareCursorInfoMajorVersion.
- * @field minorVersion Set to kHardwareCursorInfoMinorVersion.
- * @field cursorHeight The actual size of the cursor is returned.
- * @field cursorWidth The actual size of the cursor is returned.
- * @field colorMap Pointer to array of IOColorEntry structures, with the number of elements set by the numColors field of the IOHardwareCursorDescriptor. Zero should be passed for direct pixel formats.
- * @field hardwareCursorData Buffer to receive the converted cursor data.
- * @field cursorHotSpotX Cursor's hotspot.
- * @field cursorHotSpotY Cursor's hotspot.
- * @field reserved Reserved, set to zero.
- */
-
-struct IOHardwareCursorInfo {
-   UInt16               majorVersion;
-   UInt16               minorVersion;
-   UInt32               cursorHeight;
-   UInt32               cursorWidth;
-   // nil or big enough for hardware's max colors
-   IOColorEntry *       colorMap;
-   UInt8 *              hardwareCursorData;
-   UInt16               cursorHotSpotX;
-   UInt16               cursorHotSpotY;
-   UInt32               reserved[5];
-};
-typedef struct IOHardwareCursorInfo IOHardwareCursorInfo;
-
-// interrupt types
-
-enum {
-    kIOFBVBLInterruptType               = 'vbl ',
-    kIOFBHBLInterruptType               = 'hbl ',
-    kIOFBFrameInterruptType             = 'fram',
-    // Demand to check configuration (Hardware unchanged)
-    kIOFBConnectInterruptType           = 'dci ',
-    // Demand to rebuild (Hardware has reinitialized on dependent change)
-    kIOFBChangedInterruptType           = 'chng',
-    // Demand to remove framebuffer (Hardware not available on dependent change -- but must not buserror)
-    kIOFBOfflineInterruptType           = 'remv',
-    // Notice that hardware is available (after being removed)
-    kIOFBOnlineInterruptType            = 'add ',
-    // DisplayPort short pulse
-    kIOFBDisplayPortInterruptType           = 'dpir',
-    // DisplayPort link event
-    kIOFBDisplayPortLinkChangeInterruptType = 'dplk',
-    // MCCS
-    kIOFBMCCSInterruptType                  = 'mccs'
-};
-
-// IOAppleTimingID's
-enum {
-    kIOTimingIDInvalid               = 0,       /*  Not a standard timing */
-    kIOTimingIDApple_FixedRateLCD    = 42,      /*  Lump all fixed-rate LCDs into one category.*/
-    kIOTimingIDApple_512x384_60hz    = 130,     /*  512x384  (60 Hz) Rubik timing. */
-    kIOTimingIDApple_560x384_60hz    = 135,     /*  560x384  (60 Hz) Rubik-560 timing. */
-    kIOTimingIDApple_640x480_67hz    = 140,     /*  640x480  (67 Hz) HR timing. */
-    kIOTimingIDApple_640x400_67hz    = 145,     /*  640x400  (67 Hz) HR-400 timing. */
-    kIOTimingIDVESA_640x480_60hz     = 150,     /*  640x480  (60 Hz) VGA timing. */
-    kIOTimingIDVESA_640x480_72hz     = 152,     /*  640x480  (72 Hz) VGA timing. */
-    kIOTimingIDVESA_640x480_75hz     = 154,     /*  640x480  (75 Hz) VGA timing. */
-    kIOTimingIDVESA_640x480_85hz     = 158,     /*  640x480  (85 Hz) VGA timing. */
-    kIOTimingIDGTF_640x480_120hz     = 159,     /*  640x480  (120 Hz) VESA Generalized Timing Formula */
-    kIOTimingIDApple_640x870_75hz    = 160,     /*  640x870  (75 Hz) FPD timing.*/
-    kIOTimingIDApple_640x818_75hz    = 165,     /*  640x818  (75 Hz) FPD-818 timing.*/
-    kIOTimingIDApple_832x624_75hz    = 170,     /*  832x624  (75 Hz) GoldFish timing.*/
-    kIOTimingIDVESA_800x600_56hz     = 180,     /*  800x600  (56 Hz) SVGA timing. */
-    kIOTimingIDVESA_800x600_60hz     = 182,     /*  800x600  (60 Hz) SVGA timing. */
-    kIOTimingIDVESA_800x600_72hz     = 184,     /*  800x600  (72 Hz) SVGA timing. */
-    kIOTimingIDVESA_800x600_75hz     = 186,     /*  800x600  (75 Hz) SVGA timing. */
-    kIOTimingIDVESA_800x600_85hz     = 188,     /*  800x600  (85 Hz) SVGA timing. */
-    kIOTimingIDVESA_1024x768_60hz    = 190,     /* 1024x768  (60 Hz) VESA 1K-60Hz timing. */
-    kIOTimingIDVESA_1024x768_70hz    = 200,     /* 1024x768  (70 Hz) VESA 1K-70Hz timing. */
-    kIOTimingIDVESA_1024x768_75hz    = 204,     /* 1024x768  (75 Hz) VESA 1K-75Hz timing (very similar to kIOTimingIDApple_1024x768_75hz). */
-    kIOTimingIDVESA_1024x768_85hz    = 208,     /* 1024x768  (85 Hz) VESA timing. */
-    kIOTimingIDApple_1024x768_75hz   = 210,     /* 1024x768  (75 Hz) Apple 19" RGB. */
-    kIOTimingIDApple_1152x870_75hz   = 220,     /* 1152x870  (75 Hz) Apple 21" RGB. */
-    kIOTimingIDAppleNTSC_ST          = 230,     /*  512x384  (60 Hz, interlaced, non-convolved). */
-    kIOTimingIDAppleNTSC_FF          = 232,     /*  640x480  (60 Hz, interlaced, non-convolved). */
-    kIOTimingIDAppleNTSC_STconv      = 234,     /*  512x384  (60 Hz, interlaced, convolved). */
-    kIOTimingIDAppleNTSC_FFconv      = 236,     /*  640x480  (60 Hz, interlaced, convolved). */
-    kIOTimingIDApplePAL_ST           = 238,     /*  640x480  (50 Hz, interlaced, non-convolved). */
-    kIOTimingIDApplePAL_FF           = 240,     /*  768x576  (50 Hz, interlaced, non-convolved). */
-    kIOTimingIDApplePAL_STconv       = 242,     /*  640x480  (50 Hz, interlaced, convolved). */
-    kIOTimingIDApplePAL_FFconv       = 244,     /*  768x576  (50 Hz, interlaced, convolved). */
-    kIOTimingIDVESA_1280x960_75hz    = 250,     /* 1280x960  (75 Hz) */
-    kIOTimingIDVESA_1280x960_60hz    = 252,     /* 1280x960  (60 Hz) */
-    kIOTimingIDVESA_1280x960_85hz    = 254,     /* 1280x960  (85 Hz) */
-    kIOTimingIDVESA_1280x1024_60hz   = 260,     /* 1280x1024 (60 Hz) */
-    kIOTimingIDVESA_1280x1024_75hz   = 262,     /* 1280x1024 (75 Hz) */
-    kIOTimingIDVESA_1280x1024_85hz   = 268,     /* 1280x1024 (85 Hz) */
-    kIOTimingIDVESA_1600x1200_60hz   = 280,     /* 1600x1200 (60 Hz) VESA timing. */
-    kIOTimingIDVESA_1600x1200_65hz   = 282,     /* 1600x1200 (65 Hz) VESA timing. */
-    kIOTimingIDVESA_1600x1200_70hz   = 284,     /* 1600x1200 (70 Hz) VESA timing. */
-    kIOTimingIDVESA_1600x1200_75hz   = 286,     /* 1600x1200 (75 Hz) VESA timing (pixel clock is 189.2 Mhz dot clock). */
-    kIOTimingIDVESA_1600x1200_80hz   = 288,     /* 1600x1200 (80 Hz) VESA timing (pixel clock is 216>? Mhz dot clock) - proposed only. */
-    kIOTimingIDVESA_1600x1200_85hz   = 289,     /* 1600x1200 (85 Hz) VESA timing (pixel clock is 229.5 Mhz dot clock). */
-    kIOTimingIDVESA_1792x1344_60hz   = 296,     /* 1792x1344 (60 Hz) VESA timing (204.75 Mhz dot clock). */
-    kIOTimingIDVESA_1792x1344_75hz   = 298,     /* 1792x1344 (75 Hz) VESA timing (261.75 Mhz dot clock). */
-    kIOTimingIDVESA_1856x1392_60hz   = 300,     /* 1856x1392 (60 Hz) VESA timing (218.25 Mhz dot clock). */
-    kIOTimingIDVESA_1856x1392_75hz   = 302,     /* 1856x1392 (75 Hz) VESA timing (288 Mhz dot clock). */
-    kIOTimingIDVESA_1920x1440_60hz   = 304,     /* 1920x1440 (60 Hz) VESA timing (234 Mhz dot clock). */
-    kIOTimingIDVESA_1920x1440_75hz   = 306,     /* 1920x1440 (75 Hz) VESA timing (297 Mhz dot clock). */
-    kIOTimingIDSMPTE240M_60hz        = 400,     /* 60Hz V, 33.75KHz H, interlaced timing, 16:9 aspect, typical resolution of 1920x1035. */
-    kIOTimingIDFilmRate_48hz         = 410,     /* 48Hz V, 25.20KHz H, non-interlaced timing, typical resolution of 640x480. */
-    kIOTimingIDSony_1600x1024_76hz   = 500,     /* 1600x1024 (76 Hz) Sony timing (pixel clock is 170.447 Mhz dot clock). */
-    kIOTimingIDSony_1920x1080_60hz   = 510,     /* 1920x1080 (60 Hz) Sony timing (pixel clock is 159.84 Mhz dot clock). */
-    kIOTimingIDSony_1920x1080_72hz   = 520,     /* 1920x1080 (72 Hz) Sony timing (pixel clock is 216.023 Mhz dot clock). */
-    kIOTimingIDSony_1920x1200_76hz   = 540,     /* 1900x1200 (76 Hz) Sony timing (pixel clock is 243.20 Mhz dot clock). */
-    kIOTimingIDApple_0x0_0hz_Offline = 550,     /* Indicates that this timing will take the display off-line and remove it from the system. */
-    kIOTimingIDVESA_848x480_60hz     = 570,     /*  848x480 (60 Hz)  VESA timing. */
-    kIOTimingIDVESA_1360x768_60hz    = 590      /* 1360x768 (60 Hz)  VESA timing. */
-};
-
-// framebuffer property keys
-
-#define kIOFramebufferInfoKey           "IOFramebufferInformation"
-
-#define kIOFBWidthKey                   "IOFBWidth"
-#define kIOFBHeightKey                  "IOFBHeight"
-#define kIOFBRefreshRateKey             "IOFBRefreshRate"
-#define kIOFBFlagsKey                   "IOFBFlags"
-#define kIOFBBytesPerRowKey             "IOFBBytesPerRow"
-#define kIOFBBytesPerPlaneKey           "IOFBBytesPerPlane"
-#define kIOFBBitsPerPixelKey            "IOFBBitsPerPixel"
-#define kIOFBComponentCountKey          "IOFBComponentCount"
-#define kIOFBBitsPerComponentKey        "IOFBBitsPerComponent"
-
-#define kIOFBDetailedTimingsKey         "IOFBDetailedTimings"
-#define kIOFBTimingRangeKey             "IOFBTimingRange"
-#define kIOFBScalerInfoKey              "IOFBScalerInfo"
-#define kIOFBCursorInfoKey              "IOFBCursorInfo"
-
-#define kIOFBHostAccessFlagsKey         "IOFBHostAccessFlags"
-
-#define kIOFBMemorySizeKey              "IOFBMemorySize"
-
-#define kIOFBProbeOptionsKey            "IOFBProbeOptions"
-
-#define kIOFBGammaWidthKey              "IOFBGammaWidth"
-#define kIOFBGammaCountKey              "IOFBGammaCount"
-#define kIOFBCLUTDeferKey               "IOFBCLUTDefer"
-        
-// exists on the hibernate progress display device
-#ifndef kIOHibernatePreviewActiveKey
-#define kIOHibernatePreviewActiveKey    "IOHibernatePreviewActive"
-// values for kIOHibernatePreviewActiveKey set by driver
-enum {
-    kIOHibernatePreviewActive  = 0x00000001,
-    kIOHibernatePreviewUpdates = 0x00000002
-};
-#endif
-
-// CFNumber/CFData
-#define kIOFBAVSignalTypeKey            "av-signal-type"
-enum {
-    kIOFBAVSignalTypeUnknown = 0x00000000,
-    kIOFBAVSignalTypeVGA     = 0x00000001,
-    kIOFBAVSignalTypeDVI     = 0x00000002,
-    kIOFBAVSignalTypeHDMI    = 0x00000008,
-    kIOFBAVSignalTypeDP      = 0x00000010,
-};
-
-// diagnostic keys
-
-#define kIOFBConfigKey                  "IOFBConfig"
-#define kIOFBModesKey                   "IOFBModes"
-#define kIOFBModeIDKey                  "ID"
-#define kIOFBModeDMKey                  "DM"
-#define kIOFBModeTMKey                  "TM"
-#define kIOFBModeAIDKey                 "AID"
-#define kIOFBModeDFKey                  "DF"
-
-// display property keys
-
-#define kIODisplayEDIDKey               "IODisplayEDID"
-#define kIODisplayLocationKey           "IODisplayLocation"             // CFString
-#define kIODisplayConnectFlagsKey       "IODisplayConnectFlags"         // CFNumber
-#define kIODisplayHasBacklightKey       "IODisplayHasBacklight"         // CFBoolean
-#define kIODisplayIsDigitalKey          "IODisplayIsDigital"            // CFBoolean
-#define kDisplayBundleKey               "DisplayBundle"
-
-#define kAppleDisplayTypeKey            "AppleDisplayType"
-#define kAppleSenseKey                  "AppleSense"
-
-#define kIODisplayMCCSVersionKey                "IODisplayMCCSVersion"
-#define kIODisplayTechnologyTypeKey             "IODisplayTechnologyType"
-#define kIODisplayUsageTimeKey                  "IODisplayUsageTime"
-#define kIODisplayFirmwareLevelKey              "IODisplayFirmwareLevel"
-
-enum {
-    kDisplayVendorIDUnknown     = 'unkn',
-    kDisplayProductIDGeneric    = 0x717
-};
-
-#define kDisplayVendorID                "DisplayVendorID"        // CFNumber
-#define kDisplayProductID               "DisplayProductID"       // CFNumber
-#define kDisplaySerialNumber            "DisplaySerialNumber"    // CFNumber
-#define kDisplaySerialString            "DisplaySerialString"    // CFString
-#define kDisplayWeekOfManufacture       "DisplayWeekManufacture" // CFNumber
-#define kDisplayYearOfManufacture       "DisplayYearManufacture" // CFNumber
-
-// CFDictionary of language-locale keys, name values
-// eg. "en"="Color LCD", "en-GB"="Colour LCD"
-#define kDisplayProductName             "DisplayProductName"
-
-// all CFNumber or CFArray of CFNumber (floats)
-#define kDisplayWhitePointX             "DisplayWhitePointX"
-#define kDisplayWhitePointY             "DisplayWhitePointY"
-#define kDisplayRedPointX               "DisplayRedPointX"
-#define kDisplayRedPointY               "DisplayRedPointY"
-#define kDisplayGreenPointX             "DisplayGreenPointX"
-#define kDisplayGreenPointY             "DisplayGreenPointY"
-#define kDisplayBluePointX              "DisplayBluePointX"
-#define kDisplayBluePointY              "DisplayBluePointY"
-#define kDisplayWhiteGamma              "DisplayWhiteGamma"
-#define kDisplayRedGamma                "DisplayRedGamma"
-#define kDisplayGreenGamma              "DisplayGreenGamma"
-#define kDisplayBlueGamma               "DisplayBlueGamma"
-
-// Display gamma
-#define kDisplayGammaChannels           "DisplayGammaChannels"    // CFNumber 1 or 3 channel count
-#define kDisplayGammaEntryCount         "DisplayGammaEntryCount"  // CFNumber 1-based count of entries per channel
-#define kDisplayGammaEntrySize          "DisplayGammaEntrySize"   // CFNumber size in bytes of each table entry
-#define kDisplayGammaTable              "DisplayGammaTable"       // CFData
-
-// CFBoolean
-#define kDisplayBrightnessAffectsGamma  "DisplayBrightnessAffectsGamma"
-#define kDisplayViewAngleAffectsGamma   "DisplayViewAngleAffectsGamma"
-
-// CFData
-#define kDisplayCSProfile               "DisplayCSProfile"
-
-// CFNumber
-#define kDisplayHorizontalImageSize     "DisplayHorizontalImageSize"
-#define kDisplayVerticalImageSize       "DisplayVerticalImageSize"
-
-// Pixel description
-
-// CFBoolean
-#define kDisplayFixedPixelFormat        "DisplayFixedPixelFormat"
-
-enum {
-    kDisplaySubPixelLayoutUndefined     = 0x00000000,
-    kDisplaySubPixelLayoutRGB           = 0x00000001,
-    kDisplaySubPixelLayoutBGR           = 0x00000002,
-    kDisplaySubPixelLayoutQuadGBL       = 0x00000003,
-    kDisplaySubPixelLayoutQuadGBR       = 0x00000004,
-
-    kDisplaySubPixelConfigurationUndefined    = 0x00000000,
-    kDisplaySubPixelConfigurationDelta        = 0x00000001,
-    kDisplaySubPixelConfigurationStripe       = 0x00000002,
-    kDisplaySubPixelConfigurationStripeOffset = 0x00000003,
-    kDisplaySubPixelConfigurationQuad         = 0x00000004,
-
-    kDisplaySubPixelShapeUndefined      = 0x00000000,
-    kDisplaySubPixelShapeRound          = 0x00000001,
-    kDisplaySubPixelShapeSquare         = 0x00000002,
-    kDisplaySubPixelShapeRectangular    = 0x00000003,
-    kDisplaySubPixelShapeOval           = 0x00000004,
-    kDisplaySubPixelShapeElliptical     = 0x00000005
-};
-
-// CFNumbers
-#define kDisplaySubPixelLayout          "DisplaySubPixelLayout"
-#define kDisplaySubPixelConfiguration   "DisplaySubPixelConfiguration"
-#define kDisplaySubPixelShape           "DisplaySubPixelShape"
-
-#define kIODisplayOverrideMatchingKey   "IODisplayOverrideMatching"
-
-// Display parameters
-
-#define kIODisplayParametersKey         "IODisplayParameters"
-#define kIODisplayGUIDKey               "IODisplayGUID"
-
-#define kIODisplayValueKey              "value"
-#define kIODisplayMinValueKey           "min"
-#define kIODisplayMaxValueKey           "max"
-
-#define kIODisplayBrightnessKey         "brightness"
-#define kIODisplayContrastKey           "contrast"
-#define kIODisplayHorizontalPositionKey "horizontal-position"
-#define kIODisplayHorizontalSizeKey     "horizontal-size"
-#define kIODisplayVerticalPositionKey   "vertical-position"
-#define kIODisplayVerticalSizeKey       "vertical-size"
-#define kIODisplayTrapezoidKey          "trapezoid"
-#define kIODisplayPincushionKey         "pincushion"
-#define kIODisplayParallelogramKey      "parallelogram"
-#define kIODisplayRotationKey           "rotation"
-#define kIODisplayTheatreModeKey        "theatre-mode"
-#define kIODisplayTheatreModeWindowKey  "theatre-mode-window"
-#define kIODisplayOverscanKey           "oscn"
-#define kIODisplayVideoBestKey          "vbst"
-
-#define kIODisplaySpeakerVolumeKey              "speaker-volume"
-#define kIODisplaySpeakerSelectKey              "speaker-select"
-#define kIODisplayMicrophoneVolumeKey           "microphone-volume"
-#define kIODisplayAmbientLightSensorKey         "ambient-light-sensor"
-#define kIODisplayAudioMuteAndScreenBlankKey    "audio-mute-and-screen-blank"
-#define kIODisplayAudioTrebleKey                "audio-treble"
-#define kIODisplayAudioBassKey                  "audio-bass"
-#define kIODisplayAudioBalanceLRKey             "audio-balance-LR"
-#define kIODisplayAudioProcessorModeKey         "audio-processor-mode"
-#define kIODisplayPowerModeKey                  "power-mode"
-#define kIODisplayManufacturerSpecificKey       "manufacturer-specific"
-
-
-#define kIODisplayRedGammaScaleKey      "rgsc"
-#define kIODisplayGreenGammaScaleKey    "ggsc"
-#define kIODisplayBlueGammaScaleKey     "bgsc"
-
-#define kIODisplayParametersCommitKey   "commit"
-#define kIODisplayParametersDefaultKey  "defaults"
-#define kIODisplayParametersFlushKey    "flush"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ! _IOKIT_IOGRAPHICSTYPES_H */
diff --git a/i386/include/IOKit/hid/IOHIDDevice.h b/i386/include/IOKit/hid/IOHIDDevice.h
deleted file mode 100644
index 29f0024..0000000
--- a/i386/include/IOKit/hid/IOHIDDevice.h
+++ /dev/null
@@ -1,706 +0,0 @@
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_HID_IOHIDDEVICE_H
-#define _IOKIT_HID_IOHIDDEVICE_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/hidsystem/IOHIDDescriptorParser.h>
-#include <IOKit/hid/IOHIDKeys.h>
-
-class   IOHIDSystem;
-class   IOHIDPointing;
-class   IOHIDKeyboard;
-class   IOHIDConsumer;
-class   IOHIDElementPrivate;
-class   IOHIDEventQueue;
-class   IOHIDInterface;
-class   IOHIDDeviceShim;
-struct  IOHIDReportHandler;
-
-/*!
-    @typedef IOHIDCompletionAction
-    @abstract Function called when set/get report completes
-    @param target The target specified in the IOHIDCompletion struct.
-    @param parameter The parameter specified in the IOHIDCompletion struct.
-    @param status Completion status
-*/
-typedef void (*IOHIDCompletionAction)(
-                void *			target,
-                void *			parameter,
-                IOReturn		status,
-                UInt32			bufferSizeRemaining);
-
-/*!
-    @typedef IOHIDCompletion
-    @abstract Struct spefifying action to perform when set/get report completes.
-    @param target The target to pass to the action function.
-    @param action The function to call.
-    @param parameter The parameter to pass to the action function.
-*/
-typedef struct IOHIDCompletion {
-    void * 			target;
-    IOHIDCompletionAction	action;
-    void *			parameter;
-} IOHIDCompletion;
-
-/*!
-    @enum IOHIDReportOption
-    @abstract Option bits for IOHIDDevice::handleReport, 
-    IOHIDDevice::getReport, and IOHIDDevice::setReport
-    @constant kIOHIDReportOptionNotInterrupt Tells method that the report
-    passed was not interrupt driven.
-*/
-enum
-{
-    kIOHIDReportOptionNotInterrupt	= 0x100
-};
-
-
-/*! @class IOHIDDevice : public IOService
-    @abstract IOHIDDevice defines a Human Interface Device (HID) object,
-    which will interact with the HID Manager by publishing static properties
-    in the registry, and also by reporting HID events through shared memory.
-    IOHIDDevice is an abstract class that must be subclassed to support a
-    specific type of HID devices, such as USB HID class devices.
-    <br>
-    Since most HID devices are expected to be USB devices, IOHIDDevice
-    uses the USB HID specification to define the format of the report
-    descriptor, and also reports that are used to communicate with the
-    hardware via some intervening transport layer. However, there is no
-    mandate that the transport layer must be restricted to USB. A subclass
-    may be created to support legacy ADB joysticks, and issue packets on
-    the ADB bus and translate those packets to USB reports, and vice versa.
-    IOHIDDevice does not care how those reports are generated or consumed
-    by the physical device, as long as the reports abide to the USB
-    specification. */
-
-class IOHIDDevice : public IOService
-{
-    OSDeclareDefaultStructors( IOHIDDevice )
-
-    friend class IOHIDLibUserClient;
-    friend class IOHIDDeviceShim;
-    
-private:
-    OSArray *                   _elementArray;
-    UInt32                      _dataElementIndex;
-    IORecursiveLock *           _elementLock;
-    IOHIDReportHandler *        _reportHandlers;
-    IOBufferMemoryDescriptor *  _elementValuesDescriptor;
-    bool                        _readyForInputReports;
-    UInt32                      _reportCount;
-    UInt32                      _maxInputReportSize;
-    UInt32                      _maxOutputReportSize;
-    UInt32                      _maxFeatureReportSize;
-
-    struct ExpansionData { 
-        OSSet *                 clientSet;
-        IOService *             seizedClient;
-        AbsoluteTime            eventDeadline;
-        IONotifier *            publishNotify;
-        OSArray *               inputInterruptElementArray;
-		bool                    performTickle;
-		IOHIDInterface *        interfaceNub;
-        IOHIDElementPrivate *   rollOverElement;
-        OSArray *               hierarchElements;
-    };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData * _reserved;
-    
-    // HID report descriptor parsing support.
-
-    bool linkToParent( const OSArray * array,
-                       UInt32          parentIndex,
-                       UInt32          childIndex );
-
-    bool createCollectionElements( HIDPreparsedDataRef parseData,
-                                   OSArray *           array,
-                                   UInt32              maxCount );
-
-    bool createValueElements( HIDPreparsedDataRef parseData,
-                              OSArray *           array,
-                              UInt32              hidReportType,
-                              IOHIDElementType    elementType,
-                              UInt32              maxCount );
-
-    bool createButtonElements( HIDPreparsedDataRef parseData,
-                               OSArray *           array,
-                               UInt32              hidReportType,
-                               IOHIDElementType    elementType,
-                               UInt32              maxCount );
-                               
-    bool createReportHandlerElements( HIDPreparsedDataRef parseData);
-
-    OSArray * newDeviceUsagePairs();
-
-    bool getReportCountAndSizes( HIDPreparsedDataRef parseData );
-
-    bool setReportSize( UInt8           reportID,
-                        IOHIDReportType reportType,
-                        UInt32          bits );
-
-    IOReturn createElementHierarchy( HIDPreparsedDataRef parseData );
-
-    IOReturn parseReportDescriptor( IOMemoryDescriptor * report,
-                                    IOOptionBits         options = 0 );
-
-    IOBufferMemoryDescriptor * createMemoryForElementValues();
-
-    
-    static bool _publishNotificationHandler( void * target, 
-				void * ref, IOService * newService );
-    
-protected:
-
-/*! @function free
-    @abstract Free the IOHIDDevice object.
-    @discussion Release all resources that were previously allocated,
-    then call super::free() to propagate the call to our superclass. */
-
-    virtual void free();
-
-/*! @function handleOpen
-    @abstract Handle a client open on the interface.
-    @discussion This method is called by IOService::open() with the
-    arbitration lock held, and must return true to accept the client open.
-    This method will in turn call handleClientOpen() to qualify the client
-    requesting the open.
-    @param client The client object that requested the open.
-    @param options Options passed to IOService::open().
-    @param argument Argument passed to IOService::open().
-    @result true to accept the client open, false otherwise. */
-
-    virtual bool handleOpen(IOService *  client,
-                            IOOptionBits options,
-                            void *       argument);
-
-/*! @function handleClose
-    @abstract Handle a client close on the interface.
-    @discussion This method is called by IOService::close() with the
-    arbitration lock held. This method will in turn call handleClientClose()
-    to notify interested subclasses about the client close. If this represents
-    the last close, then the interface will also close the controller before
-    this method returns. The controllerWillClose() method will be called before
-    closing the controller. Subclasses should not override this method.
-    @param client The client object that requested the close.
-    @param options Options passed to IOService::close(). */
-
-    virtual void handleClose(IOService * client, IOOptionBits options);
-
-/*! @function handleIsOpen
-    @abstract Query whether a client has an open on the interface.
-    @discussion This method is always called by IOService with the
-    arbitration lock held. Subclasses should not override this method.
-    @result true if the specified client, or any client if none (0) is
-    specified, presently has an open on this object. */
-
-    virtual bool handleIsOpen(const IOService * client) const;
-
-/*! @function handleStart
-    @abstract Prepare the hardware and driver to support I/O operations.
-    @discussion IOHIDDevice will call this method from start() before
-    any I/O operations are issued to the concrete subclass. Methods
-    such as newReportDescriptor() are only called after handleStart()
-    has returned true. A subclass that overrides this method should
-    begin its implementation by calling the version in super, and
-    then check the return value.
-    @param provider The provider argument passed to start().
-    @result True on success, or false otherwise. Returning false will
-    cause start() to fail and return false. */
-
-    virtual bool handleStart( IOService * provider );
-
-/*! @function handleStop
-    @abstract Quiesce the hardware and stop the driver.
-    @discussion IOHIDDevice will call this method from stop() to
-    signal that the hardware should be quiesced and the driver stopped.
-    A subclass that overrides this method should end its implementation
-    by calling the version in super.
-    @param provider The provider argument passed to stop(). */
-
-    virtual void handleStop(  IOService * provider );
-
-/*! @function newUserClient
-    @abstract Handle a request to create a connection for a non kernel
-    client.
-    @discussion Create a new IOUserClient, or a subclass of IOUserClient,
-    to service a connection to a non kernel client. This implementation
-    will simply call the implementation in IOService to handle the call.
-    @param owningTask The mach task requesting the connection.
-    @param security_id A token representing the access level for the task.
-    @param type A constant specifying the type of connection to be created.
-    @param properties A dictionary of additional properties for the connection.
-    @param handler The IOUserClient object returned.
-    @result The return from IOService::newUserClient() is returned. */
-
-    virtual IOReturn newUserClient( task_t          owningTask,
-                                   void *          security_id,
-                                   UInt32          type,
-                                   OSDictionary *  properties,
-                                   IOUserClient ** handler );
-    IOReturn newUserClientGated(task_t          owningTask,
-                                void *          security_id,
-                                OSDictionary *  properties,
-                                IOUserClient ** handler );
-    
-/*! @function publishProperties
-    @abstract Publish HID properties to the I/O Kit registry.
-    @discussion Called by the start() method to fetch and publish all
-    HID properties to the I/O Kit registry. These properties will allow
-    the HID Manager to identify all HID device(s) in the system, by
-    iterating through objects that are subclasses of IOHIDDevice, and
-    then fetch their published property values. The implementation in
-    IOHIDDevice will call methods to get each individual HID property,
-    and subclasses will not normally need to override this method.
-    @param provider The provider argument passed to start().
-    @result True to indicate that all properties were discovered and
-    published to the registry, false otherwise. Returning false will
-    cause start() to fail and return false. */
-
-    virtual bool publishProperties( IOService * provider );
-
-public:
-
-/*! @function init
-    @abstract Initialize an IOHIDDevice object.
-    @discussion Prime the IOHIDDevice object and prepare it to support
-    a probe() or a start() call. This implementation will simply call
-    super::init().
-    @param A dictionary A property table associated with this IOHIDDevice
-    instance.
-    @result True on sucess, or false otherwise. */
-
-    virtual bool init( OSDictionary * dictionary = 0 );
-
-/*! @function start
-    @abstract Start up the driver using the given provider.
-    @discussion IOHIDDevice will allocate resources, then call handleStart()
-    before fetching the report descriptor through newReportDescriptor(), and
-    publishing HID properties to the registry. Before returning true to 
-    indicate success, registerService() is called to trigger client matching.
-    Subclasses are recommended to override handleStart().
-    @param provider The provider that the driver was matched to, and selected
-    to run with.
-    @result True on success, or false otherwise. */
-
-    virtual bool start( IOService * provider );
-
-/*! @function stop
-    @abstract Called by a provider (during its termination) before detaching
-    all its clients.
-    @discussion IOHIDDevice will call handleStop(), then release allocated
-    resources. Subclasses are recommended to override handleStop().
-    @param provider The provider that the driver was started on. */
-
-    virtual void stop( IOService * provider );
-    
-/*! @function matchPropertyTable
-    @abstract Called by the provider during a match
-    @discussion Compare the properties in the supplied table to this 
-    object's properties.
-    @param table The property table that this device will match against
-*/
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);    
-
-/*! @function newTransportString
-    @abstract Returns a string object that describes the transport
-    layer used by the HID device.
-    @result A string object. The caller must decrement the retain count
-    on the object returned. */
-
-    virtual OSString * newTransportString() const;
-    
-/*! @function newManufacturerString
-    @abstract Returns a string object that describes the manufacturer
-    of the HID device.
-    @result A string object. The caller must decrement the retain count
-    on the object returned. */
-
-    virtual OSString * newManufacturerString() const;
-
-/*! @function newProductString
-    @abstract Returns a string object that describes the product
-    of the HID device.
-    @result A string object. The caller must decrement the retain count
-    on the object returned. */
-
-    virtual OSString * newProductString() const;
-
-/*! @function newVendorIDNumber
-    @abstract Returns a number object that describes the vendor ID
-    of the HID device.
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */
-
-    virtual OSNumber * newVendorIDNumber() const;
-
-/*! @function newProductIDNumber
-    @abstract Returns a number object that describes the product ID
-    of the HID device.
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */
-
-    virtual OSNumber * newProductIDNumber() const;
-
-/*! @function newVersionNumber
-    @abstract Returns a number object that describes the version number
-    of the HID device.
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */
-
-    virtual OSNumber * newVersionNumber() const;
-
-//  *** THIS HAS BEEN DEPRECATED.  PLEASE USE newSerialNumberString ***
-/*! @function newSerialNumber
-    @abstract THIS HAS BEEN DEPRECATED.  PLEASE USE newSerialNumberString.
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */
-
-    virtual OSNumber * newSerialNumber() const;
-
-/*! @function newPrimaryUsageNumber
-    @abstract Returns a number object that describes the primary usage
-    of the HID device.
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */
-
-    virtual OSNumber * newPrimaryUsageNumber() const;
-
-/*! @function newPrimaryUsagePageNumber
-    @abstract Returns a number object that describes the primary usage
-    page of the HID device.
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */
-
-    virtual OSNumber * newPrimaryUsagePageNumber() const;
-
-/*! @function newReportDescriptor
-    @abstract Create and return a new memory descriptor that describes the
-    report descriptor for the HID device.
-    @discussion A subclass must override this pure virtual function, and
-    return a memory descriptor that describes the HID report descriptor as
-    defined by the USB Device Class Definition for Human Interface Devices
-    Version 1.1 specification.
-    @param descriptor Pointer to the memory descriptor returned. This
-    memory descriptor will be released by the caller.
-    @result kIOReturnSuccess on success, or an error return otherwise. */
-
-    virtual IOReturn newReportDescriptor(
-                        IOMemoryDescriptor ** descriptor ) const = 0;
-
-/*! @function handleReport
-    @abstract Handle an asynchronous report received from the HID device.
-    @param report A memory descriptor that describes the report.
-    @param reportType The type of report.
-    @param options Options to specify the request. No options are
-    currently defined, and the default value is 0.
-    @result kIOReturnSuccess on success, or an error return otherwise. */
-
-	virtual IOReturn handleReport(
-                     IOMemoryDescriptor * report,
-	                 IOHIDReportType      reportType = kIOHIDReportTypeInput,
-	                 IOOptionBits         options    = 0 );
-
-/*! @function getReport
-    @abstract Get a report from the HID device.
-    @discussion A completion parameter may be added in the future.
-    @param report A memory descriptor that describes the memory to store
-    the report read from the HID device.
-    @param reportType The report type.
-    @param options The lower 8 bits will represent the Report ID.  The
-    other 24 bits are options to specify the request.
-    @result kIOReturnSuccess on success, or an error return otherwise. */
-
-    virtual IOReturn getReport( IOMemoryDescriptor * report,
-                                IOHIDReportType      reportType,
-                                IOOptionBits         options );
-
-/*! @function setReport
-    @abstract Send a report to the HID device.
-    @discussion A completion parameter may be added in the future.
-    @param report A memory descriptor that describes the report to send
-    to the HID device.
-    @param reportType The report type.
-    @param options The lower 8 bits will represent the Report ID.  The
-    other 24 bits are options to specify the request.
-    @result kIOReturnSuccess on success, or an error return otherwise. */
-
-    virtual IOReturn setReport( IOMemoryDescriptor * report,
-                                IOHIDReportType      reportType,
-                                IOOptionBits         options = 0 );
-
-/*! @function getMemoryWithCurrentElementValues
-    @abstract Get a reference to a memory descriptor that describes the
-    memory block containing the current HID element values.
-    @discussion Each HID element that can contribute to an input, output,
-    or feature report, is assigned an area of memory from a common memory
-    block allocated by IOHIDDevice. Each element will use its assigned
-    memory area to store its current value, defined by an IOHIDElementValue
-    structure. The memory described by the memory descriptor may be mapped
-    to user space to allow the HID Manager to poll the current element
-    value without the cost of a user-kernel transition. Subclasses should
-    not override this method.
-    @result A reference to a memory descriptor that describes the current
-    element values, or 0 to indicate a resource shortage. */
-
-    virtual IOMemoryDescriptor * getMemoryWithCurrentElementValues() const;
-
-/*! @function registerElement
-    @abstract A registration function called by a HID element to register
-    itself, and also to obtain an unique cookie identifier
-    (unique per device, not unique system-wide).
-    @discussion An internal data type, an IOHIDElementPrivate, is created to
-    represent each HID element discovered by parsing the HID report
-    descriptor. Each element created will call this method to register
-    itself with its owner (IOHIDDevice), and also to obtain an element
-    cookie that is used by HID Manager to specify and identify the element.
-    Subclasses should not override this method.
-    @param element The element that is requesting registration with its
-    owner.
-    @param cookie Pointer to the returned cookie assigned to this element.
-    @result True on success, or false otherwise. */
-
-    virtual bool registerElement( IOHIDElementPrivate * element,
-                                  IOHIDElementCookie * cookie );
-
-/*! @function startEventDelivery
-    @abstract Start delivering events from a HID element to the event
-    queue specified.
-    @discussion Clients of IOHIDDevice may create an IOHIDEventQueue, and
-    then call this method to register for delivery of events generated by
-    one or more HID elements to that event queue. Subclasses should not
-    override this method.
-    @param queue The event queue that is interested in receiving events
-    generated by the HID element specified. The retain count on the queue
-    will be incremented by one.
-    @param cookie The cookie for a HID element published by the HID device.
-    @param options Options to specify the request. No options are currently
-    defined, and the default value is zero.
-    @result kIOReturnSuccess on success, or kIOReturnBadArgument if the
-    queue or the cookie argument specified is invalid, or kIOReturnNoMemory
-    if a resource shortage was encountered. */
-
-    virtual IOReturn startEventDelivery( IOHIDEventQueue *  queue,
-                                         IOHIDElementCookie cookie,
-                                         IOOptionBits       options = 0 );
-
-/*! @function stopEventDelivery
-    @abstract Stop delivering events from one or more HID elements to the
-    event queue specified.
-    @discussion Clients that called startEventDelivery() must eventually
-    call this method to stop event delivery to its queue from one or more
-    HID elements.
-    @param queue The event queue that no longer wishes to receive events
-    generated by the HID element specified.
-    @param cookie The cookie for a HID element published by the HID device.
-    The default value of zero indicates that the queue should be removed from
-    the event dispatch list of all HID elements published by the HID device.
-    Subclasses should not override this method.
-    @result kIOReturnSuccess if the queue was removed from the event dispatch
-    list for one or more HID elements, or kIOReturnBadArgument if the queue
-    or the cookie argument specified is invalid, or kIOReturnNotFound if the
-    queue was not found. */
-
-    virtual IOReturn stopEventDelivery( IOHIDEventQueue *  queue,
-                                        IOHIDElementCookie cookie = 0 );
-
-/*! @function checkEventDelivery
-    @abstract Check whether events from a HID element will be delivered to
-    the event queue specified.
-    @param queue The event queue.
-    @param cookie The cookie for a HID element published by the HID device.
-    @param isActive Pointer to the return value that is set to true if events
-    generated by the HID element will be delivered to the queue, or false
-    otherwise. This return value is set only if kIOReturnSuccess is
-    returned.
-    @result kIOReturnSuccess on success, or kIOReturnBadArgument if one or
-    more of the arguments provided are invalid. */
-
-    virtual IOReturn checkEventDelivery( IOHIDEventQueue *  queue,
-                                         IOHIDElementCookie cookie,
-                                         bool *             isActive );
-
-/*! @function updateElementValues
-    @abstract Updates element values from a HID device via getReport.
-    @discussion A completion parameter may be added in the future.
-    @param cookies A list of element cookies who's values need to be
-    set on the device.
-    @param cookieCount The number of element cookies.
-    @result kIOReturnSuccess on success, or an error return otherwise. */
-    OSMetaClassDeclareReservedUsed(IOHIDDevice,  0);
-    virtual IOReturn updateElementValues(IOHIDElementCookie * cookies, UInt32 cookieCount = 1);
-    
-/*! @function postElementValues
-    @abstract Posts element values to a HID device via setReport.
-    @discussion A completion parameter may be added in the future.
-    @param cookies A list of element cookies who's values need to be
-    set on the device.
-    @param cookieCount The number of element cookies.
-    @result kIOReturnSuccess on success, or an error return otherwise. */
-    OSMetaClassDeclareReservedUsed(IOHIDDevice,  1);
-    virtual IOReturn postElementValues(IOHIDElementCookie * cookies, UInt32 cookieCount = 1);
-
-/*! @function newSerialNumberString
-    @abstract Returns a string object that describes the serial number
-    of the HID device.
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */
-    OSMetaClassDeclareReservedUsed(IOHIDDevice,  2);
-    virtual OSString * newSerialNumberString() const;
-    
-/*! @function newLocationIDNumber
-    @abstract Returns a number object that describes the location ID
-    of the HID device.
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */    
-    OSMetaClassDeclareReservedUsed(IOHIDDevice,  3);
-    virtual OSNumber * newLocationIDNumber() const;
-
-/*! @function getReport
-    @abstract Get a report from the HID device.
-    @discussion A completion parameter may be added in the future.
-    @param report A memory descriptor that describes the memory to store
-    the report read from the HID device.
-    @param reportType The report type.
-    @param options The lower 8 bits will represent the Report ID.  The
-    other 24 bits are options to specify the request.
-    @param completionTimeout Specifies an amount of time (in ms) after which 
-    the command will be aborted if the entire command has not been completed.
-    @param completion Function to call when request completes. If omitted then
-    getReport() executes synchronously, blocking until the request is complete.
-    @result kIOReturnSuccess on success, or an error return otherwise. */
-
-    OSMetaClassDeclareReservedUsed(IOHIDDevice,  4);
-    virtual IOReturn getReport( IOMemoryDescriptor * report,
-                                IOHIDReportType      reportType,
-                                IOOptionBits         options,
-                                UInt32               completionTimeout,
-                                IOHIDCompletion	*    completion = 0);
-
-/*! @function setReport
-    @abstract Send a report to the HID device.
-    @discussion A completion parameter may be added in the future.
-    @param report A memory descriptor that describes the report to send
-    to the HID device.
-    @param reportType The report type.
-    @param options The lower 8 bits will represent the Report ID.  The
-    other 24 bits are options to specify the request.
-    @param completionTimeout Specifies an amount of time (in ms) after which 
-    the command will be aborted if the entire command has not been completed.
-    @param completion Function to call when request completes. If omitted then
-    setReport() executes synchronously, blocking until the request is complete.
-    @result kIOReturnSuccess on success, or an error return otherwise. */
-
-    OSMetaClassDeclareReservedUsed(IOHIDDevice,  5);
-    virtual IOReturn setReport( IOMemoryDescriptor * report,
-                                IOHIDReportType      reportType,
-                                IOOptionBits         options,
-                                UInt32               completionTimeout,
-                                IOHIDCompletion	*    completion = 0);    
-
-/*! @function newVendorIDSourceNumber
-    @abstract Returns a number object that describes the vendor ID
-    source of the HID device.  
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */
-    OSMetaClassDeclareReservedUsed(IOHIDDevice,  6);
-    virtual OSNumber * newVendorIDSourceNumber() const;
-    
-/*! @function newCountryCodeNumber
-    @abstract Returns a number object that describes the country code
-    of the HID device.  
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */
-    OSMetaClassDeclareReservedUsed(IOHIDDevice,  7);
-    virtual OSNumber * newCountryCodeNumber() const;
-
-    
-/*! @function handleReportWithTime
-    @abstract Handle an asynchronous report received from the HID device.
-	@param timeStamp The timestamp of report.
-    @param report A memory descriptor that describes the report.
-    @param reportType The type of report. Currently, only
-    kIOHIDReportTypeInput report type is handled.
-    @param options Options to specify the request. No options are
-    currently defined, and the default value is 0.
-    @result kIOReturnSuccess on success, or an error return otherwise. */
-
-    OSMetaClassDeclareReservedUsed(IOHIDDevice,  8);
-	virtual IOReturn handleReportWithTime(
-                     AbsoluteTime         timeStamp,
-                     IOMemoryDescriptor * report,
-	                 IOHIDReportType      reportType = kIOHIDReportTypeInput,
-	                 IOOptionBits         options    = 0);
-
-/*! @function newReportInterval
-    @abstract Returns a number object that describes the actual polling
-    interval of the HID device in microseconds.  
-    @result A number object. The caller must decrement the retain count
-    on the object returned. */
-    OSMetaClassDeclareReservedUsed(IOHIDDevice,  9);
-    virtual OSNumber * newReportIntervalNumber() const;
-    
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 10);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 11);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 12);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 13);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 14);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 15);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 16);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 17);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 18);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 19);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 20);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 21);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 22);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 23);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 24);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 25);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 26);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 27);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 28);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 29);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 30);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 31);
-
-#ifndef __ppc__
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 32);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 33);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 34);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 35);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 36);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 37);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 38);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 39);
-    OSMetaClassDeclareReservedUnused(IOHIDDevice, 40);
-#endif
-
-};
-
-#endif /* !_IOKIT_HID_IOHIDDEVICE_H */
diff --git a/i386/include/IOKit/hid/IOHIDElement.h b/i386/include/IOKit/hid/IOHIDElement.h
deleted file mode 100644
index f4fbb17..0000000
--- a/i386/include/IOKit/hid/IOHIDElement.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_HID_IOHIDELEMENT_H
-#define _IOKIT_HID_IOHIDELEMENT_H
-
-#include <libkern/c++/OSArray.h>
-#include <libkern/c++/OSData.h>
-#include <IOKit/hid/IOHIDKeys.h>
-
-//===========================================================================
-// An object that describes a single HID element.
-    
-class IOHIDElement: public OSObject
-{
-    OSDeclareAbstractStructors( IOHIDElement )
-    
-    struct ExpansionData { 
-    };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *             _reserved;
-
-
-public:
-
-    virtual IOHIDElementCookie              getCookie()            = 0;
-    virtual IOHIDElement *                  getParentElement()     = 0;
-    virtual OSArray *                       getChildElements()     = 0;
-    virtual IOHIDElementType                getType()              = 0;
-    virtual IOHIDElementCollectionType      getCollectionType()    = 0;
-    virtual UInt32                          getUsagePage()         = 0;
-    virtual UInt32                          getUsage()             = 0;
-    virtual UInt32                          getLogicalMin()        = 0;
-    virtual UInt32                          getLogicalMax()        = 0;
-    virtual UInt32                          getPhysicalMin()       = 0;
-    virtual UInt32                          getPhysicalMax()       = 0;
-    virtual UInt32                          getUnitExponent()      = 0;
-    virtual UInt32                          getUnit()              = 0;
-    virtual UInt32                          getReportSize()        = 0;
-    virtual UInt32                          getReportCount()       = 0;
-    virtual UInt32                          getReportID()          = 0;
-    virtual UInt32                          getFlags()             = 0;
-    virtual AbsoluteTime                    getTimeStamp()         = 0;
-    virtual UInt32                          getValue()             = 0;
-    virtual OSData *                        getDataValue()         = 0;
-    virtual void                            setValue(UInt32 value)  = 0;
-    virtual void                            setDataValue(OSData * value)    = 0;
-    
-    OSMetaClassDeclareReservedUnused(IOHIDElement,  0);
-    OSMetaClassDeclareReservedUnused(IOHIDElement,  1);
-    OSMetaClassDeclareReservedUnused(IOHIDElement,  2);
-    OSMetaClassDeclareReservedUnused(IOHIDElement,  3);
-    OSMetaClassDeclareReservedUnused(IOHIDElement,  4);
-    OSMetaClassDeclareReservedUnused(IOHIDElement,  5);
-    OSMetaClassDeclareReservedUnused(IOHIDElement,  6);
-    OSMetaClassDeclareReservedUnused(IOHIDElement,  7);
-    OSMetaClassDeclareReservedUnused(IOHIDElement,  8);
-    OSMetaClassDeclareReservedUnused(IOHIDElement,  9);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 10);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 11);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 12);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 13);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 14);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 15);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 16);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 17);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 18);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 19);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 20);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 21);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 22);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 23);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 24);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 25);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 26);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 27);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 28);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 29);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 30);
-    OSMetaClassDeclareReservedUnused(IOHIDElement, 31);
-
-};
-
-#endif /* !_IOKIT_HID_IOHIDELEMENT_H */
diff --git a/i386/include/IOKit/hid/IOHIDInterface.h b/i386/include/IOKit/hid/IOHIDInterface.h
deleted file mode 100644
index 54b4230..0000000
--- a/i386/include/IOKit/hid/IOHIDInterface.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_HID_IOHIDINTERFACE_H
-#define _IOKIT_HID_IOHIDINTERFACE_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/hid/IOHIDKeys.h>
-
-class IOHIDDevice;
-
-/*! @class IOHIDInterface : public IOService
-    @abstract In kernel interface to a HID device.
-    @discussion
-*/
-
-class IOHIDInterface: public IOService
-{
-    OSDeclareDefaultStructors( IOHIDInterface )
-    
-public:
-
-    /*! @typedef IOHIDInterface::InterruptReportAction
-        @abstract Callback to handle an asynchronous report received from 
-        the HID device.
-        @discussion This callback is set when calling IOHIDInterface::open.  
-        @param target Pointer to your data object.
-        @param timestamp Time when the report was delivered.
-        @param report A memory descriptor that describes the report. 
-        @param reportType The type of report.
-        @param reportID The ID of the report.
-        @param refcon void * pointer to more data.
-    */  
-    typedef void (*InterruptReportAction)(
-                                OSObject *                  target,
-                                AbsoluteTime                timestamp,
-                                IOMemoryDescriptor *        report,
-                                IOHIDReportType             type,
-                                UInt32                      reportID,
-                                void *                      refcon);
-
-    /*!
-        @typedef IOHIDInterface::CompletionAction
-        @discussion Function called when HID I/O completes.
-        @param target
-        @param refcon
-        @param status Completion status.
-        @param bufferSizeRemaining Bytes left to be transferred.
-    */
-        
-    typedef void (*CompletionAction)(
-                                OSObject *                  target,
-                                void *                      refcon,
-                                IOReturn                    status,
-                                UInt32                      bufferSizeRemaining);
-
-private:
-    IOHIDDevice *               _owner;
-    OSArray *                   _elementArray;
-    InterruptReportAction       _interruptAction;
-    void *                      _interruptRefCon;
-    OSObject *                  _interruptTarget;
-    OSString *                  _transportString;
-    OSString *                  _manufacturerString;
-    OSString *                  _productString;
-    OSString *                  _serialNumberString;
-    UInt32                      _locationID;
-    UInt32                      _vendorID;
-    UInt32                      _vendorIDSource;
-    UInt32                      _productID;
-    UInt32                      _version;
-    UInt32                      _countryCode;
-    IOByteCount                 _maxReportSize[kIOHIDReportTypeCount];
-
-    struct ExpansionData { 
-        UInt32                  reportInterval;
-    };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *             _reserved;
-    
-protected:
-
-    /*! 
-        @function free
-        @abstract Free the IOHIDInterface object.
-        @discussion Release all resources that were previously allocated,
-        then call super::free() to propagate the call to our superclass. 
-    */
-
-    virtual void            free();
-
-public:
-
-    static IOHIDInterface * withElements ( OSArray * elements );
-
-    /*! 
-        @function init
-        @abstract Initialize an IOHIDInterface object.
-        @discussion Prime the IOHIDInterface object and prepare it to support
-        a probe() or a start() call. This implementation will simply call
-        super::init().
-        @param A dictionary A property table associated with this IOHIDInterface
-        instance.
-        @result True on sucess, or false otherwise. 
-    */
-
-    virtual bool            init( OSDictionary * dictionary = 0 );
-
-    /*! 
-        @function start
-        @abstract Start up the driver using the given provider.
-        @discussion IOHIDInterface will allocate resources. Before returning true
-        to indicate success, registerService() is called to trigger client matching.
-        @param provider The provider that the driver was matched to, and selected
-        to run with.
-        @result True on success, or false otherwise. 
-    */
-
-    virtual bool            start( IOService * provider );
-    
-    /*! 
-        @function matchPropertyTable
-        @abstract Called by the provider during a match
-        @discussion Compare the properties in the supplied table to this 
-        object's properties.
-        @param table The property table that this device will match against
-    */
-
-    virtual bool            matchPropertyTable(
-                                OSDictionary *              table, 
-                                SInt32 *                    score);    
-
-    virtual bool            open (
-                                IOService *                 client,
-                                IOOptionBits                options,
-                                InterruptReportAction       action,
-                                void *                      refCon);
-
-    virtual void			close(  
-								IOService *					client,
-								IOOptionBits				options = 0 );
-
-    virtual OSString *      getTransport ();
-    virtual UInt32          getLocationID ();
-    virtual UInt32          getVendorID ();
-    virtual UInt32          getVendorIDSource ();
-    virtual UInt32          getProductID ();
-    virtual UInt32          getVersion ();
-    virtual UInt32          getCountryCode ();
-    virtual OSString *      getManufacturer ();
-    virtual OSString *      getProduct ();
-    virtual OSString *      getSerialNumber ();
-    virtual IOByteCount     getMaxReportSize (IOHIDReportType type);
-
-    virtual OSArray *       createMatchingElements (
-                                OSDictionary *              matching            = 0, 
-                                IOOptionBits                options             = 0);
-                                
-    virtual void            handleReport (
-                                AbsoluteTime                timeStamp,
-                                IOMemoryDescriptor *        report,
-                                IOHIDReportType             reportType,
-                                UInt32                      reportID,
-                                IOOptionBits                options             = 0);
-    
-    virtual IOReturn        setReport ( 
-                                IOMemoryDescriptor *        report,
-                                IOHIDReportType             reportType,
-                                UInt32                      reportID            = 0,
-                                IOOptionBits                options             = 0);
-
-    virtual IOReturn        getReport ( 
-                                IOMemoryDescriptor *        report,
-                                IOHIDReportType             reportType,
-                                UInt32                      reportID            = 0,
-                                IOOptionBits                options             = 0);
-
-    virtual IOReturn        setReport ( 
-                                IOMemoryDescriptor *        report,
-                                IOHIDReportType             reportType,
-                                UInt32                      reportID            = 0,
-                                IOOptionBits                options             = 0,
-                                UInt32                      completionTimeout   = 0,
-                                CompletionAction *          completion          = 0);    
-
-    virtual IOReturn        getReport ( 
-                                IOMemoryDescriptor *        report,
-                                IOHIDReportType             reportType,
-                                UInt32                      reportID            = 0,
-                                IOOptionBits                options             = 0,
-                                UInt32                      completionTimeout   = 0,
-                                CompletionAction *          completion          = 0);
-                                    
-    OSMetaClassDeclareReservedUsed(IOHIDInterface,  0);
-    virtual UInt32             getReportInterval ();
-    
-    OSMetaClassDeclareReservedUnused(IOHIDInterface,  1);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface,  2);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface,  3);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface,  4);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface,  5);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface,  6);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface,  7);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface,  8);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface,  9);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 10);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 11);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 12);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 13);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 14);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 15);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 16);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 17);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 18);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 19);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 20);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 21);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 22);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 23);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 24);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 25);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 26);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 27);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 28);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 29);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 30);
-    OSMetaClassDeclareReservedUnused(IOHIDInterface, 31);
-};
-
-#endif /* !_IOKIT_HID_IOHIDINTERFACE_H */
diff --git a/i386/include/IOKit/hid/IOHIDKeys.h b/i386/include/IOKit/hid/IOHIDKeys.h
deleted file mode 100644
index a4e3789..0000000
--- a/i386/include/IOKit/hid/IOHIDKeys.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_HID_IOHIDKEYS_H_
-#define _IOKIT_HID_IOHIDKEYS_H_
-
-#include <sys/cdefs.h>
-#include <IOKit/hidsystem/IOHIDParameter.h>
-
-__BEGIN_DECLS
-
-/* The following keys are used to search the IORegistry for HID related services
-*/
-
-/* This is used to find HID Devices in the IORegistry */
-#define kIOHIDDeviceKey                     "IOHIDDevice"
-
-/*!
-    @defined HID Device Property Keys
-    @abstract Keys that represent properties of a paticular device.
-    @discussion Keys that represent properties of a paticular device.  Can be added
-        to your matching dictionary when refining searches for HID devices.
-        <br><br>
-        <b>Please note:</b><br>
-        kIOHIDPrimaryUsageKey and kIOHIDPrimaryUsagePageKey are no longer 
-        rich enough to describe a device's capabilities.  Take, for example, a
-        device that describes both a keyboard and a mouse in the same descriptor.  
-        The previous behavior was to only describe the keyboard behavior with the 
-        primary usage and usage page.   Needless to say, this would sometimes cause 
-        a program interested in mice to skip this device when matching.  
-        <br>
-        Thus we have added 3 
-        additional keys:
-        <ul>
-            <li>kIOHIDDeviceUsageKey</li>
-            <li>kIOHIDDeviceUsagePageKey</li>
-            <li>kIOHIDDeviceUsagePairsKey</li>
-        </ul>
-        kIOHIDDeviceUsagePairsKey is used to represent an array of dictionaries containing 
-        key/value pairs referenced by kIOHIDDeviceUsageKey and kIOHIDDeviceUsagePageKey.  
-        These usage pairs describe all application type collections (behaviors) defined 
-        by the device.
-        <br><br>
-        An application intersted in only matching on one criteria would only add the 
-        kIOHIDDeviceUsageKey and kIOHIDDeviceUsagePageKey keys to the matching dictionary.
-        If it is interested in a device that has multiple behaviors, the application would
-        instead add an array or dictionaries referenced by kIOHIDDeviceUsagePairsKey to his 
-        matching dictionary.
-*/
-#define kIOHIDTransportKey                  "Transport"
-#define kIOHIDVendorIDKey                   "VendorID"
-#define kIOHIDVendorIDSourceKey             "VendorIDSource"
-#define kIOHIDProductIDKey                  "ProductID"
-#define kIOHIDVersionNumberKey              "VersionNumber"
-#define kIOHIDManufacturerKey               "Manufacturer"
-#define kIOHIDProductKey                    "Product"
-#define kIOHIDSerialNumberKey               "SerialNumber"
-#define kIOHIDCountryCodeKey                "CountryCode"
-#define kIOHIDStandardTypeKey               "StandardType"
-#define kIOHIDLocationIDKey                 "LocationID"
-#define kIOHIDDeviceUsageKey                "DeviceUsage"
-#define kIOHIDDeviceUsagePageKey            "DeviceUsagePage"
-#define kIOHIDDeviceUsagePairsKey           "DeviceUsagePairs"
-#define kIOHIDPrimaryUsageKey               "PrimaryUsage"
-#define kIOHIDPrimaryUsagePageKey           "PrimaryUsagePage"
-#define kIOHIDMaxInputReportSizeKey         "MaxInputReportSize"
-#define kIOHIDMaxOutputReportSizeKey	    "MaxOutputReportSize"
-#define kIOHIDMaxFeatureReportSizeKey	    "MaxFeatureReportSize"
-#define kIOHIDReportIntervalKey             "ReportInterval"
-#define kIOHIDReportDescriptorKey           "ReportDescriptor"
-
-/*!
-    @define kIOHIDElementKey
-    @abstract Keys that represents an element property.
-    @discussion Property for a HID Device or element dictionary.
-        Elements can be heirarchical, so they can contain other elements.
-*/
-#define kIOHIDElementKey                    "Elements"
-
-/*!
-    @defined HID Element Dictionary Keys
-    @abstract Keys that represent properties of a particular elements.
-    @discussion These keys can also be added to a matching dictionary 
-        when searching for elements via copyMatchingElements.  
-*/
-#define kIOHIDElementCookieKey                      "ElementCookie"
-#define kIOHIDElementTypeKey                        "Type"
-#define kIOHIDElementCollectionTypeKey              "CollectionType"
-#define kIOHIDElementUsageKey                       "Usage"
-#define kIOHIDElementUsagePageKey                   "UsagePage"
-#define kIOHIDElementMinKey                         "Min"
-#define kIOHIDElementMaxKey                         "Max"
-#define kIOHIDElementScaledMinKey                   "ScaledMin"
-#define kIOHIDElementScaledMaxKey                   "ScaledMax"
-#define kIOHIDElementSizeKey                        "Size"
-#define kIOHIDElementReportSizeKey                  "ReportSize"
-#define kIOHIDElementReportCountKey                 "ReportCount"
-#define kIOHIDElementReportIDKey                    "ReportID"
-#define kIOHIDElementIsArrayKey                     "IsArray"
-#define kIOHIDElementIsRelativeKey                  "IsRelative"
-#define kIOHIDElementIsWrappingKey                  "IsWrapping"
-#define kIOHIDElementIsNonLinearKey                 "IsNonLinear"
-#define kIOHIDElementHasPreferredStateKey           "HasPreferredState"
-#define kIOHIDElementHasNullStateKey                "HasNullState"
-#define kIOHIDElementFlagsKey                       "Flags"
-#define kIOHIDElementUnitKey                        "Unit"
-#define kIOHIDElementUnitExponentKey                "UnitExponent"
-#define kIOHIDElementNameKey                        "Name"
-#define kIOHIDElementValueLocationKey               "ValueLocation"
-#define kIOHIDElementDuplicateIndexKey              "DuplicateIndex"
-#define kIOHIDElementParentCollectionKey            "ParentCollection"
-
-#ifndef __ppc__
-    #define kIOHIDElementVendorSpecificKey          "VendorSpecific"
-#else
-    #define kIOHIDElementVendorSpecificKey          "VendorSpecifc"
-#endif
-
-/*!
-    @defined HID Element Match Keys
-    @abstract Keys used for matching particular elements.
-    @discussion These keys should only be used with a matching  
-        dictionary when searching for elements via copyMatchingElements.  
-*/
-#define kIOHIDElementCookieMinKey           "ElementCookieMin"
-#define kIOHIDElementCookieMaxKey           "ElementCookieMax"
-#define kIOHIDElementUsageMinKey            "UsageMin"
-#define kIOHIDElementUsageMaxKey            "UsageMax"
-
-/*!
-    @defined kIOHIDElementCalibrationMinKey
-    @abstract The minimum bounds for a calibrated value.  
-*/
-#define kIOHIDElementCalibrationMinKey              "CalibrationMin"
-
-/*!
-    @defined kIOHIDElementCalibrationMaxKey
-    @abstract The maximum bounds for a calibrated value.  
-*/
-#define kIOHIDElementCalibrationMaxKey              "CalibrationMax"
-
-/*!
-    @defined kIOHIDElementCalibrationSaturationMinKey
-    @abstract The mininum tolerance to be used when calibrating a logical element value. 
-    @discussion The saturation property is used to allow for slight differences in the minimum and maximum value returned by an element. 
-*/
-#define kIOHIDElementCalibrationSaturationMinKey    "CalibrationSaturationMin"
-
-/*!
-    @defined kIOHIDElementCalibrationSaturationMaxKey
-    @abstract The maximum tolerance to be used when calibrating a logical element value.  
-    @discussion The saturation property is used to allow for slight differences in the minimum and maximum value returned by an element. 
-*/
-#define kIOHIDElementCalibrationSaturationMaxKey    "CalibrationSaturationMax"
-
-/*!
-    @defined kIOHIDElementCalibrationDeadZoneMinKey
-    @abstract The minimum bounds near the midpoint of a logical value in which the value is ignored.  
-    @discussion The dead zone property is used to allow for slight differences in the idle value returned by an element. 
-*/
-#define kIOHIDElementCalibrationDeadZoneMinKey      "CalibrationDeadZoneMin"
-
-/*!
-    @defined kIOHIDElementCalibrationDeadZoneMinKey
-    @abstract The maximum bounds near the midpoint of a logical value in which the value is ignored.  
-    @discussion The dead zone property is used to allow for slight differences in the idle value returned by an element. 
-*/
-#define kIOHIDElementCalibrationDeadZoneMaxKey      "CalibrationDeadZoneMax"
-
-/*!
-    @defined kIOHIDElementCalibrationGranularityKey
-    @abstract The scale or level of detail returned in a calibrated element value.  
-    @discussion Values are rounded off such that if granularity=0.1, values after calibration are 0, 0.1, 0.2, 0.3, etc.
-*/
-#define kIOHIDElementCalibrationGranularityKey      "CalibrationGranularity"
-
-/*!
-    @typedef IOHIDElementCookie
-    @abstract Abstract data type used as a unique identifier for an element.
-*/
-#ifdef __LP64__
-    typedef uint32_t IOHIDElementCookie;
-#else
-    typedef void * IOHIDElementCookie;
-#endif
-
-/*!
-  @typedef IOHIDElementType
-  @abstract Describes different types of HID elements.
-  @discussion Used by the IOHIDFamily to identify the type of
-  element processed.  Represented by the key kIOHIDElementTypeKey in the 
-    dictionary describing the element.
-  @constant kIOHIDElementTypeInput_Misc
-    Misc input data field or varying size.
-  @constant kIOHIDElementTypeInput_Button 
-    One bit input data field.
-  @constant kIOHIDElementTypeInput_Axis 
-    Input data field used to represent an axis.
-  @constant kIOHIDElementTypeInput_ScanCodes
-    Input data field used to represent a scan code or usage selector.
-  @constant kIOHIDElementTypeOutput
-    Used to represent an output data field in a report.
-  @constant kIOHIDElementTypeFeature
-    Describes input and output elements not intended for 
-    consumption by the end user.
-  @constant kIOHIDElementTypeCollection
-    Element used to identify a relationship between two or more elements.
-*/
-enum IOHIDElementType {
-	kIOHIDElementTypeInput_Misc        = 1,
-	kIOHIDElementTypeInput_Button      = 2,
-	kIOHIDElementTypeInput_Axis        = 3,
-	kIOHIDElementTypeInput_ScanCodes   = 4,
-	kIOHIDElementTypeOutput            = 129,
-	kIOHIDElementTypeFeature           = 257,
-	kIOHIDElementTypeCollection        = 513
-};
-typedef enum IOHIDElementType IOHIDElementType;
-
-/*!
-  @typedef IOHIDElementCollectionType
-  @abstract Describes different types of HID collections.
-  @discussion Collections identify a relationship between two or more
-    elements.
-  @constant kIOHIDElementCollectionTypePhysical   
-    Used for a set of data items that represent data points 
-    collected at one geometric point.
-  @constant kIOHIDElementCollectionTypeApplication 
-    Identifies item groups serving different purposes in a single device.
-  @constant kIOHIDElementCollectionTypeLogical
-    Used when a set of data items form a composite data structure.
-  @constant kIOHIDElementCollectionTypeReport 
-    Wraps all the fields in a report.
-  @constant kIOHIDElementCollectionTypeNamedArray 
-    Contains an array of selector usages.
-  @constant kIOHIDElementCollectionTypeUsageSwitch 
-    Modifies the meaning of the usage it contains.
-  @constant kIOHIDElementCollectionTypeUsageModifier 
-    Modifies the meaning of the usage attached to the encompassing collection.
-*/
-enum IOHIDElementCollectionType{
-	kIOHIDElementCollectionTypePhysical	= 0x00,
-	kIOHIDElementCollectionTypeApplication,
-    kIOHIDElementCollectionTypeLogical,
-    kIOHIDElementCollectionTypeReport,
-    kIOHIDElementCollectionTypeNamedArray,
-    kIOHIDElementCollectionTypeUsageSwitch,
-    kIOHIDElementCollectionTypeUsageModifier
-};
-typedef enum IOHIDElementCollectionType IOHIDElementCollectionType;
-
-
-/*!
-  @typedef IOHIDReportType
-  @abstract Describes different type of HID reports.
-  @discussion Used by the IOHIDFamily to identify the type of
-    report being processed.
-  @constant kIOHIDReportTypeInput Input report.
-  @constant kIOHIDReportTypeOutput Output report.
-  @constant kIOHIDReportTypeFeature Feature report.
-*/
-enum IOHIDReportType{
-    kIOHIDReportTypeInput = 0,
-    kIOHIDReportTypeOutput,
-    kIOHIDReportTypeFeature,
-    kIOHIDReportTypeCount
-};
-typedef enum IOHIDReportType IOHIDReportType;
-
-/*!
-  @typedef IOHIDOptionsType
-  @abstract Options for opening a device via IOHIDLib.
-  @constant kIOHIDOptionsTypeNone Default option.
-  @constant kIOHIDOptionsTypeSeizeDevice Used to open exclusive
-    communication with the device.  This will prevent the system
-    and other clients from receiving events from the device.
-*/
-enum {
-    kIOHIDOptionsTypeNone	 = 0x00,
-    kIOHIDOptionsTypeSeizeDevice = 0x01
-};
-typedef uint32_t IOHIDOptionsType;
-
-
-/*!
-  @typedef IOHIDQueueOptionsType
-  @abstract Options for creating a queue via IOHIDLib.
-  @constant kIOHIDQueueOptionsTypeNone Default option.
-  @constant kIOHIDQueueOptionsTypeEnqueueAll Force the IOHIDQueue
-    to enqueue all events, relative or absolute, regardless of change.
-*/
-enum {
-    kIOHIDQueueOptionsTypeNone	 = 0x00,
-    kIOHIDQueueOptionsTypeEnqueueAll = 0x01
-};
-typedef uint32_t IOHIDQueueOptionsType;
-
-
-enum {
-    kIOHIDElementFlagsConstantMask        = 0x0001,
-    kIOHIDElementFlagsVariableMask        = 0x0002,
-    kIOHIDElementFlagsRelativeMask        = 0x0004,
-    kIOHIDElementFlagsWrapMask            = 0x0008,
-    kIOHIDElementFlagsNonLinearMask       = 0x0010,
-    kIOHIDElementFlagsNoPreferredMask     = 0x0020,
-    kIOHIDElementFlagsNullStateMask       = 0x0040,
-    kIOHIDElementFlagsVolativeMask        = 0x0080,
-    kIOHIDElementFlagsBufferedByteMask    = 0x0100
-};
-typedef uint32_t IOHIDElementFlags;
-
-/*!
-  @typedef IOHIDStandardType
-  @abstract Type to define what industrial standard the device is referencing.
-  @constant kIOHIDStandardTypeANSI ANSI.
-  @constant kIOHIDStandardTypeISO ISO.
-  @constant kIOHIDStandardTypeJIS JIS.
-*/
-enum {
-    kIOHIDStandardTypeANSI                = 0,
-    kIOHIDStandardTypeISO                 = 1,
-    kIOHIDStandardTypeJIS                 = 2
-};
-typedef uint32_t IOHIDStandardType;
-
-__END_DECLS
-
-#endif /* !_IOKIT_HID_IOHIDKEYS_H_ */
diff --git a/i386/include/IOKit/hid/IOHIDUsageTables.h b/i386/include/IOKit/hid/IOHIDUsageTables.h
deleted file mode 100644
index ff0fd88..0000000
--- a/i386/include/IOKit/hid/IOHIDUsageTables.h
+++ /dev/null
@@ -1,1665 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _IOHIDUSAGETABLES_H
-#define _IOHIDUSAGETABLES_H
-
-/* ******************************************************************************************
- * HID Usage Tables
- *
- * The following constants are from the USB 'HID Usage Tables' specification, revision 1.1rc3
- * ****************************************************************************************** */
-
-
-/* Usage Pages */
-enum
-{
-	kHIDPage_Undefined	= 0x00,
-	kHIDPage_GenericDesktop	= 0x01,
-	kHIDPage_Simulation	= 0x02,
-	kHIDPage_VR	= 0x03,
-	kHIDPage_Sport	= 0x04,
-	kHIDPage_Game	= 0x05,
-	/* Reserved 0x06 */
-	kHIDPage_KeyboardOrKeypad	= 0x07,	/* USB Device Class Definition for Human Interface Devices (HID). Note: the usage type for all key codes is Selector (Sel). */
-	kHIDPage_LEDs	= 0x08,
-	kHIDPage_Button	= 0x09,
-	kHIDPage_Ordinal	= 0x0A,
-	kHIDPage_Telephony	= 0x0B,
-	kHIDPage_Consumer	= 0x0C,
-	kHIDPage_Digitizer	= 0x0D,
-	/* Reserved 0x0E */
-	kHIDPage_PID	= 0x0F,	/* USB Physical Interface Device definitions for force feedback and related devices. */
-	kHIDPage_Unicode	= 0x10,
-	/* Reserved 0x11 - 0x13 */
-	kHIDPage_AlphanumericDisplay	= 0x14,
-	/* Reserved 0x15 - 0x7F */
-	/* Monitor 0x80 - 0x83	 USB Device Class Definition for Monitor Devices */
-	/* Power 0x84 - 0x87	 USB Device Class Definition for Power Devices */
-	kHIDPage_PowerDevice = 0x84, 				/* Power Device Page */
-	kHIDPage_BatterySystem = 0x85, 				/* Battery System Page */
-	/* Reserved 0x88 - 0x8B */
-	kHIDPage_BarCodeScanner	= 0x8C,	/* (Point of Sale) USB Device Class Definition for Bar Code Scanner Devices */
-	kHIDPage_WeighingDevice	= 0x8D,	/* (Point of Sale) USB Device Class Definition for Weighing Devices */
-	kHIDPage_Scale	= 0x8D,	/* (Point of Sale) USB Device Class Definition for Scale Devices */
-    kHIDPage_MagneticStripeReader = 0x8E,
-	/* ReservedPointofSalepages 0x8F */
-	kHIDPage_CameraControl	= 0x90,	/* USB Device Class Definition for Image Class Devices */
-	kHIDPage_Arcade	= 0x91,	/* OAAF Definitions for arcade and coinop related Devices */
-	/* Reserved 0x92 - 0xFEFF */
-	/* VendorDefined 0xFF00 - 0xFFFF */
-	kHIDPage_VendorDefinedStart	= 0xFF00
-};
-
-/* Undefined Usage for all usage pages */
-enum
-{
-	kHIDUsage_Undefined	= 0x00
-};
-
-/* GenericDesktop Page (0x01) */
-enum
-{
-	kHIDUsage_GD_Pointer	= 0x01,	/* Physical Collection */
-	kHIDUsage_GD_Mouse	= 0x02,	/* Application Collection */
-	/* 0x03 Reserved */
-	kHIDUsage_GD_Joystick	= 0x04,	/* Application Collection */
-	kHIDUsage_GD_GamePad	= 0x05,	/* Application Collection */
-	kHIDUsage_GD_Keyboard	= 0x06,	/* Application Collection */
-	kHIDUsage_GD_Keypad	= 0x07,	/* Application Collection */
-	kHIDUsage_GD_MultiAxisController	= 0x08,	/* Application Collection */
-	/* 0x09 - 0x2F Reserved */
-	kHIDUsage_GD_X	= 0x30,	/* Dynamic Value */
-	kHIDUsage_GD_Y	= 0x31,	/* Dynamic Value */
-	kHIDUsage_GD_Z	= 0x32,	/* Dynamic Value */
-	kHIDUsage_GD_Rx	= 0x33,	/* Dynamic Value */
-	kHIDUsage_GD_Ry	= 0x34,	/* Dynamic Value */
-	kHIDUsage_GD_Rz	= 0x35,	/* Dynamic Value */
-	kHIDUsage_GD_Slider	= 0x36,	/* Dynamic Value */
-	kHIDUsage_GD_Dial	= 0x37,	/* Dynamic Value */
-	kHIDUsage_GD_Wheel	= 0x38,	/* Dynamic Value */
-	kHIDUsage_GD_Hatswitch	= 0x39,	/* Dynamic Value */
-	kHIDUsage_GD_CountedBuffer	= 0x3A,	/* Logical Collection */
-	kHIDUsage_GD_ByteCount	= 0x3B,	/* Dynamic Value */
-	kHIDUsage_GD_MotionWakeup	= 0x3C,	/* One-Shot Control */
-	kHIDUsage_GD_Start	= 0x3D,	/* On/Off Control */
-	kHIDUsage_GD_Select	= 0x3E,	/* On/Off Control */
-	/* 0x3F Reserved */
-	kHIDUsage_GD_Vx	= 0x40,	/* Dynamic Value */
-	kHIDUsage_GD_Vy	= 0x41,	/* Dynamic Value */
-	kHIDUsage_GD_Vz	= 0x42,	/* Dynamic Value */
-	kHIDUsage_GD_Vbrx	= 0x43,	/* Dynamic Value */
-	kHIDUsage_GD_Vbry	= 0x44,	/* Dynamic Value */
-	kHIDUsage_GD_Vbrz	= 0x45,	/* Dynamic Value */
-	kHIDUsage_GD_Vno	= 0x46,	/* Dynamic Value */
-	/* 0x47 - 0x7F Reserved */
-	kHIDUsage_GD_SystemControl	= 0x80,	/* Application Collection */
-	kHIDUsage_GD_SystemPowerDown	= 0x81,	/* One-Shot Control */
-	kHIDUsage_GD_SystemSleep	= 0x82,	/* One-Shot Control */
-	kHIDUsage_GD_SystemWakeUp	= 0x83,	/* One-Shot Control */
-	kHIDUsage_GD_SystemContextMenu	= 0x84,	/* One-Shot Control */
-	kHIDUsage_GD_SystemMainMenu	= 0x85,	/* One-Shot Control */
-	kHIDUsage_GD_SystemAppMenu	= 0x86,	/* One-Shot Control */
-	kHIDUsage_GD_SystemMenuHelp	= 0x87,	/* One-Shot Control */
-	kHIDUsage_GD_SystemMenuExit	= 0x88,	/* One-Shot Control */
-	kHIDUsage_GD_SystemMenu	= 0x89,	/* Selector */
-	kHIDUsage_GD_SystemMenuRight	= 0x8A,	/* Re-Trigger Control */
-	kHIDUsage_GD_SystemMenuLeft	= 0x8B,	/* Re-Trigger Control */
-	kHIDUsage_GD_SystemMenuUp	= 0x8C,	/* Re-Trigger Control */
-	kHIDUsage_GD_SystemMenuDown	= 0x8D,	/* Re-Trigger Control */
-	/* 0x8E - 0x8F Reserved */
-	kHIDUsage_GD_DPadUp	= 0x90,	/* On/Off Control */
-	kHIDUsage_GD_DPadDown	= 0x91,	/* On/Off Control */
-	kHIDUsage_GD_DPadRight	= 0x92,	/* On/Off Control */
-	kHIDUsage_GD_DPadLeft	= 0x93,	/* On/Off Control */
-	/* 0x94 - 0xFFFF Reserved */
-	kHIDUsage_GD_Reserved = 0xFFFF
-};
-
-/* Simulation Page (0x02) */
-/* This section provides detailed descriptions of the usages employed by simulation devices. */
-enum
-{
-	kHIDUsage_Sim_FlightSimulationDevice	= 0x01,	/* Application Collection */
-	kHIDUsage_Sim_AutomobileSimulationDevice	= 0x02,	/* Application Collection */
-	kHIDUsage_Sim_TankSimulationDevice	= 0x03,	/* Application Collection */
-	kHIDUsage_Sim_SpaceshipSimulationDevice	= 0x04,	/* Application Collection */
-	kHIDUsage_Sim_SubmarineSimulationDevice	= 0x05,	/* Application Collection */
-	kHIDUsage_Sim_SailingSimulationDevice	= 0x06,	/* Application Collection */
-	kHIDUsage_Sim_MotorcycleSimulationDevice	= 0x07,	/* Application Collection */
-	kHIDUsage_Sim_SportsSimulationDevice	= 0x08,	/* Application Collection */
-	kHIDUsage_Sim_AirplaneSimulationDevice	= 0x09,	/* Application Collection */
-	kHIDUsage_Sim_HelicopterSimulationDevice	= 0x0A,	/* Application Collection */
-	kHIDUsage_Sim_MagicCarpetSimulationDevice	= 0x0B,	/* Application Collection */
-	kHIDUsage_Sim_BicycleSimulationDevice	= 0x0C,	/* Application Collection */
-	/* 0x0D - 0x1F Reserved */
-	kHIDUsage_Sim_FlightControlStick	= 0x20,	/* Application Collection */
-	kHIDUsage_Sim_FlightStick	= 0x21,	/* Application Collection */
-	kHIDUsage_Sim_CyclicControl	= 0x22,	/* Physical Collection */
-	kHIDUsage_Sim_CyclicTrim	= 0x23,	/* Physical Collection */
-	kHIDUsage_Sim_FlightYoke	= 0x24,	/* Application Collection */
-	kHIDUsage_Sim_TrackControl	= 0x25,	/* Physical Collection */
-	/* 0x26 - 0xAF Reserved */
-	kHIDUsage_Sim_Aileron	= 0xB0,	/* Dynamic Value */
-	kHIDUsage_Sim_AileronTrim	= 0xB1,	/* Dynamic Value */
-	kHIDUsage_Sim_AntiTorqueControl	= 0xB2,	/* Dynamic Value */
-	kHIDUsage_Sim_AutopilotEnable	= 0xB3,	/* On/Off Control */
-	kHIDUsage_Sim_ChaffRelease	= 0xB4,	/* One-Shot Control */
-	kHIDUsage_Sim_CollectiveControl	= 0xB5,	/* Dynamic Value */
-	kHIDUsage_Sim_DiveBrake	= 0xB6,	/* Dynamic Value */
-	kHIDUsage_Sim_ElectronicCountermeasures	= 0xB7,	/* On/Off Control */
-	kHIDUsage_Sim_Elevator	= 0xB8,	/* Dynamic Value */
-	kHIDUsage_Sim_ElevatorTrim	= 0xB9,	/* Dynamic Value */
-	kHIDUsage_Sim_Rudder	= 0xBA,	/* Dynamic Value */
-	kHIDUsage_Sim_Throttle	= 0xBB,	/* Dynamic Value */
-	kHIDUsage_Sim_FlightCommunications	= 0xBC,	/* On/Off Control */
-	kHIDUsage_Sim_FlareRelease	= 0xBD,	/* One-Shot Control */
-	kHIDUsage_Sim_LandingGear	= 0xBE,	/* On/Off Control */
-	kHIDUsage_Sim_ToeBrake	= 0xBF,	/* Dynamic Value */
-	kHIDUsage_Sim_Trigger	= 0xC0,	/* Momentary Control */
-	kHIDUsage_Sim_WeaponsArm	= 0xC1,	/* On/Off Control */
-	kHIDUsage_Sim_Weapons	= 0xC2,	/* Selector */
-	kHIDUsage_Sim_WingFlaps	= 0xC3,	/* Dynamic Value */
-	kHIDUsage_Sim_Accelerator	= 0xC4,	/* Dynamic Value */
-	kHIDUsage_Sim_Brake	= 0xC5,	/* Dynamic Value */
-	kHIDUsage_Sim_Clutch	= 0xC6,	/* Dynamic Value */
-	kHIDUsage_Sim_Shifter	= 0xC7,	/* Dynamic Value */
-	kHIDUsage_Sim_Steering	= 0xC8,	/* Dynamic Value */
-	kHIDUsage_Sim_TurretDirection	= 0xC9,	/* Dynamic Value */
-	kHIDUsage_Sim_BarrelElevation	= 0xCA,	/* Dynamic Value */
-	kHIDUsage_Sim_DivePlane	= 0xCB,	/* Dynamic Value */
-	kHIDUsage_Sim_Ballast	= 0xCC,	/* Dynamic Value */
-	kHIDUsage_Sim_BicycleCrank	= 0xCD,	/* Dynamic Value */
-	kHIDUsage_Sim_HandleBars	= 0xCE,	/* Dynamic Value */
-	kHIDUsage_Sim_FrontBrake	= 0xCF,	/* Dynamic Value */
-	kHIDUsage_Sim_RearBrake	= 0xD0,	/* Dynamic Value */
-	/* 0xD1 - 0xFFFF Reserved */
-	kHIDUsage_Sim_Reserved = 0xFFFF
-};
-
-/* VR Page (0x03) */
-/* Virtual Reality controls depend on designators to identify the individual controls. Most of the following are */
-/* usages are applied to the collections of entities that comprise the actual device. */
-enum
-{
-	kHIDUsage_VR_Belt	= 0x01,	/* Application Collection */
-	kHIDUsage_VR_BodySuit	= 0x02,	/* Application Collection */
-	kHIDUsage_VR_Flexor	= 0x03,	/* Physical Collection */
-	kHIDUsage_VR_Glove	= 0x04,	/* Application Collection */
-	kHIDUsage_VR_HeadTracker	= 0x05,	/* Physical Collection */
-	kHIDUsage_VR_HeadMountedDisplay	= 0x06,	/* Application Collection */
-	kHIDUsage_VR_HandTracker	= 0x07,	/* Application Collection */
-	kHIDUsage_VR_Oculometer	= 0x08,	/* Application Collection */
-	kHIDUsage_VR_Vest	= 0x09,	/* Application Collection */
-	kHIDUsage_VR_AnimatronicDevice	= 0x0A,	/* Application Collection */
-	/* 0x0B - 0x1F Reserved */
-	kHIDUsage_VR_StereoEnable	= 0x20,	/* On/Off Control */
-	kHIDUsage_VR_DisplayEnable	= 0x21,	/* On/Off Control */
-	/* 0x22 - 0xFFFF Reserved */
-	kHIDUsage_VR_Reserved = 0xFFFF
-};
-
-/* Sport Page (0x04) */
-enum
-{
-	kHIDUsage_Sprt_BaseballBat	= 0x01,	/* Application Collection */
-	kHIDUsage_Sprt_GolfClub	= 0x02,	/* Application Collection */
-	kHIDUsage_Sprt_RowingMachine	= 0x03,	/* Application Collection */
-	kHIDUsage_Sprt_Treadmill	= 0x04,	/* Application Collection */
-	/* 0x05 - 0x2F Reserved */
-	kHIDUsage_Sprt_Oar	= 0x30,	/* Dynamic Value */
-	kHIDUsage_Sprt_Slope	= 0x31,	/* Dynamic Value */
-	kHIDUsage_Sprt_Rate	= 0x32,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickSpeed	= 0x33,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickFaceAngle	= 0x34,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickHeelOrToe	= 0x35,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickFollowThrough	= 0x36,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickTempo	= 0x37,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickType	= 0x38,	/* Named Array */
-	kHIDUsage_Sprt_StickHeight	= 0x39,	/* Dynamic Value */
-	/* 0x3A - 0x4F Reserved */
-	kHIDUsage_Sprt_Putter	= 0x50,	/* Selector */
-	kHIDUsage_Sprt_1Iron	= 0x51,	/* Selector */
-	kHIDUsage_Sprt_2Iron	= 0x52,	/* Selector */
-	kHIDUsage_Sprt_3Iron	= 0x53,	/* Selector */
-	kHIDUsage_Sprt_4Iron	= 0x54,	/* Selector */
-	kHIDUsage_Sprt_5Iron	= 0x55,	/* Selector */
-	kHIDUsage_Sprt_6Iron	= 0x56,	/* Selector */
-	kHIDUsage_Sprt_7Iron	= 0x57,	/* Selector */
-	kHIDUsage_Sprt_8Iron	= 0x58,	/* Selector */
-	kHIDUsage_Sprt_9Iron	= 0x59,	/* Selector */
-	kHIDUsage_Sprt_10Iron	= 0x5A,	/* Selector */
-	kHIDUsage_Sprt_11Iron	= 0x5B,	/* Selector */
-	kHIDUsage_Sprt_SandWedge	= 0x5C,	/* Selector */
-	kHIDUsage_Sprt_LoftWedge	= 0x5D,	/* Selector */
-	kHIDUsage_Sprt_PowerWedge	= 0x5E,	/* Selector */
-	kHIDUsage_Sprt_1Wood	= 0x5F,	/* Selector */
-	kHIDUsage_Sprt_3Wood	= 0x60,	/* Selector */
-	kHIDUsage_Sprt_5Wood	= 0x61,	/* Selector */
-	kHIDUsage_Sprt_7Wood	= 0x62,	/* Selector */
-	kHIDUsage_Sprt_9Wood	= 0x63,	/* Selector */
-	/* 0x64 - 0xFFFF Reserved */
-	kHIDUsage_Sprt_Reserved = 0xFFFF
-};
-
-/* Game Page (0x05) */
-enum
-{
-	kHIDUsage_Game_3DGameController	= 0x01,	/* Application Collection */
-	kHIDUsage_Game_PinballDevice	= 0x02,	/* Application Collection */
-	kHIDUsage_Game_GunDevice	= 0x03,	/* Application Collection */
-	/* 0x04 - 0x1F Reserved */
-	kHIDUsage_Game_PointofView	= 0x20,	/* Physical Collection */
-	kHIDUsage_Game_TurnRightOrLeft	= 0x21,	/* Dynamic Value */
-	kHIDUsage_Game_PitchUpOrDown	= 0x22,	/* Dynamic Value */
-	kHIDUsage_Game_RollRightOrLeft	= 0x23,	/* Dynamic Value */
-	kHIDUsage_Game_MoveRightOrLeft	= 0x24,	/* Dynamic Value */
-	kHIDUsage_Game_MoveForwardOrBackward	= 0x25,	/* Dynamic Value */
-	kHIDUsage_Game_MoveUpOrDown	= 0x26,	/* Dynamic Value */
-	kHIDUsage_Game_LeanRightOrLeft	= 0x27,	/* Dynamic Value */
-	kHIDUsage_Game_LeanForwardOrBackward	= 0x28,	/* Dynamic Value */
-	kHIDUsage_Game_HeightOfPOV	= 0x29,	/* Dynamic Value */
-	kHIDUsage_Game_Flipper	= 0x2A,	/* Momentary Control */
-	kHIDUsage_Game_SecondaryFlipper	= 0x2B,	/* Momentary Control */
-	kHIDUsage_Game_Bump	= 0x2C,	/* Momentary Control */
-	kHIDUsage_Game_NewGame	= 0x2D,	/* One-Shot Control */
-	kHIDUsage_Game_ShootBall	= 0x2E,	/* One-Shot Control */
-	kHIDUsage_Game_Player	= 0x2F,	/* One-Shot Control */
-	kHIDUsage_Game_GunBolt	= 0x30,	/* On/Off Control */
-	kHIDUsage_Game_GunClip	= 0x31,	/* On/Off Control */
-	kHIDUsage_Game_Gun	= 0x32,	/* Selector */
-	kHIDUsage_Game_GunSingleShot	= 0x33,	/* Selector */
-	kHIDUsage_Game_GunBurst	= 0x34,	/* Selector */
-	kHIDUsage_Game_GunAutomatic	= 0x35,	/* Selector */
-	kHIDUsage_Game_GunSafety	= 0x36,	/* On/Off Control */
-	kHIDUsage_Game_GamepadFireOrJump	= 0x37,	/* Logical Collection */
-	kHIDUsage_Game_GamepadTrigger	= 0x39,	/* Logical Collection */
-	/* 0x3A - 0xFFFF Reserved */
-	kHIDUsage_Game_Reserved = 0xFFFF
-};
-
-/* KeyboardOrKeypad Page (0x07) */
-/* This section is the Usage Page for key codes to be used in implementing a USB keyboard. A Boot Keyboard (84-, 101- or 104-key) should at a minimum support all associated usage codes as indicated in the ÒBootÓ */
-/* column below. */
-/* The usage type of all key codes is Selectors (Sel), except for the modifier keys Keyboard Left Control (0x224) to Keyboard Right GUI (0x231) which are Dynamic Flags (DV). */
-/* Note: A general note on Usages and languages: Due to the variation of keyboards from language to language, it is not feasible to specify exact key mappings for every language. Where this list is not specific for a key function in a language, the closest equivalent key position should be used, so that a keyboard may be modified for a different language by simply printing different keycaps. One example is the Y key on a North American keyboard. In Germany this is typically Z. Rather than changing the keyboard firmware to put the Z Usage into that place in the descriptor list, the vendor should use the Y Usage on both the North American and German keyboards. This continues to be the existing practice in the industry, in order to minimize the number of changes to the electronics to accommodate otherlanguages. */
-enum
-{
-	kHIDUsage_KeyboardErrorRollOver	= 0x01,	/* ErrorRollOver */
-	kHIDUsage_KeyboardPOSTFail	= 0x02,	/* POSTFail */
-	kHIDUsage_KeyboardErrorUndefined	= 0x03,	/* ErrorUndefined */
-	kHIDUsage_KeyboardA	= 0x04,	/* a or A */
-	kHIDUsage_KeyboardB	= 0x05,	/* b or B */
-	kHIDUsage_KeyboardC	= 0x06,	/* c or C */
-	kHIDUsage_KeyboardD	= 0x07,	/* d or D */
-	kHIDUsage_KeyboardE	= 0x08,	/* e or E */
-	kHIDUsage_KeyboardF	= 0x09,	/* f or F */
-	kHIDUsage_KeyboardG	= 0x0A,	/* g or G */
-	kHIDUsage_KeyboardH	= 0x0B,	/* h or H */
-	kHIDUsage_KeyboardI	= 0x0C,	/* i or I */
-	kHIDUsage_KeyboardJ	= 0x0D,	/* j or J */
-	kHIDUsage_KeyboardK	= 0x0E,	/* k or K */
-	kHIDUsage_KeyboardL	= 0x0F,	/* l or L */
-	kHIDUsage_KeyboardM	= 0x10,	/* m or M */
-	kHIDUsage_KeyboardN	= 0x11,	/* n or N */
-	kHIDUsage_KeyboardO	= 0x12,	/* o or O */
-	kHIDUsage_KeyboardP	= 0x13,	/* p or P */
-	kHIDUsage_KeyboardQ	= 0x14,	/* q or Q */
-	kHIDUsage_KeyboardR	= 0x15,	/* r or R */
-	kHIDUsage_KeyboardS	= 0x16,	/* s or S */
-	kHIDUsage_KeyboardT	= 0x17,	/* t or T */
-	kHIDUsage_KeyboardU	= 0x18,	/* u or U */
-	kHIDUsage_KeyboardV	= 0x19,	/* v or V */
-	kHIDUsage_KeyboardW	= 0x1A,	/* w or W */
-	kHIDUsage_KeyboardX	= 0x1B,	/* x or X */
-	kHIDUsage_KeyboardY	= 0x1C,	/* y or Y */
-	kHIDUsage_KeyboardZ	= 0x1D,	/* z or Z */
-	kHIDUsage_Keyboard1	= 0x1E,	/* 1 or ! */
-	kHIDUsage_Keyboard2	= 0x1F,	/* 2 or @ */
-	kHIDUsage_Keyboard3	= 0x20,	/* 3 or # */
-	kHIDUsage_Keyboard4	= 0x21,	/* 4 or $ */
-	kHIDUsage_Keyboard5	= 0x22,	/* 5 or % */
-	kHIDUsage_Keyboard6	= 0x23,	/* 6 or ^ */
-	kHIDUsage_Keyboard7	= 0x24,	/* 7 or & */
-	kHIDUsage_Keyboard8	= 0x25,	/* 8 or * */
-	kHIDUsage_Keyboard9	= 0x26,	/* 9 or ( */
-	kHIDUsage_Keyboard0	= 0x27,	/* 0 or ) */
-	kHIDUsage_KeyboardReturnOrEnter	= 0x28,	/* Return (Enter) */
-	kHIDUsage_KeyboardEscape	= 0x29,	/* Escape */
-	kHIDUsage_KeyboardDeleteOrBackspace	= 0x2A,	/* Delete (Backspace) */
-	kHIDUsage_KeyboardTab	= 0x2B,	/* Tab */
-	kHIDUsage_KeyboardSpacebar	= 0x2C,	/* Spacebar */
-	kHIDUsage_KeyboardHyphen	= 0x2D,	/* - or _ */
-	kHIDUsage_KeyboardEqualSign	= 0x2E,	/* = or + */
-	kHIDUsage_KeyboardOpenBracket	= 0x2F,	/* [ or { */
-	kHIDUsage_KeyboardCloseBracket	= 0x30,	/* ] or } */
-	kHIDUsage_KeyboardBackslash	= 0x31,	/* \ or | */
-	kHIDUsage_KeyboardNonUSPound	= 0x32,	/* Non-US # or _ */
-	kHIDUsage_KeyboardSemicolon	= 0x33,	/* ; or : */
-	kHIDUsage_KeyboardQuote	= 0x34,	/* ' or " */
-	kHIDUsage_KeyboardGraveAccentAndTilde	= 0x35,	/* Grave Accent and Tilde */
-	kHIDUsage_KeyboardComma	= 0x36,	/* , or < */
-	kHIDUsage_KeyboardPeriod	= 0x37,	/* . or > */
-	kHIDUsage_KeyboardSlash	= 0x38,	/* / or ? */
-	kHIDUsage_KeyboardCapsLock	= 0x39,	/* Caps Lock */
-	kHIDUsage_KeyboardF1	= 0x3A,	/* F1 */
-	kHIDUsage_KeyboardF2	= 0x3B,	/* F2 */
-	kHIDUsage_KeyboardF3	= 0x3C,	/* F3 */
-	kHIDUsage_KeyboardF4	= 0x3D,	/* F4 */
-	kHIDUsage_KeyboardF5	= 0x3E,	/* F5 */
-	kHIDUsage_KeyboardF6	= 0x3F,	/* F6 */
-	kHIDUsage_KeyboardF7	= 0x40,	/* F7 */
-	kHIDUsage_KeyboardF8	= 0x41,	/* F8 */
-	kHIDUsage_KeyboardF9	= 0x42,	/* F9 */
-	kHIDUsage_KeyboardF10	= 0x43,	/* F10 */
-	kHIDUsage_KeyboardF11	= 0x44,	/* F11 */
-	kHIDUsage_KeyboardF12	= 0x45,	/* F12 */
-	kHIDUsage_KeyboardPrintScreen	= 0x46,	/* Print Screen */
-	kHIDUsage_KeyboardScrollLock	= 0x47,	/* Scroll Lock */
-	kHIDUsage_KeyboardPause	= 0x48,	/* Pause */
-	kHIDUsage_KeyboardInsert	= 0x49,	/* Insert */
-	kHIDUsage_KeyboardHome	= 0x4A,	/* Home */
-	kHIDUsage_KeyboardPageUp	= 0x4B,	/* Page Up */
-	kHIDUsage_KeyboardDeleteForward	= 0x4C,	/* Delete Forward */
-	kHIDUsage_KeyboardEnd	= 0x4D,	/* End */
-	kHIDUsage_KeyboardPageDown	= 0x4E,	/* Page Down */
-	kHIDUsage_KeyboardRightArrow	= 0x4F,	/* Right Arrow */
-	kHIDUsage_KeyboardLeftArrow	= 0x50,	/* Left Arrow */
-	kHIDUsage_KeyboardDownArrow	= 0x51,	/* Down Arrow */
-	kHIDUsage_KeyboardUpArrow	= 0x52,	/* Up Arrow */
-	kHIDUsage_KeypadNumLock	= 0x53,	/* Keypad NumLock or Clear */
-	kHIDUsage_KeypadSlash	= 0x54,	/* Keypad / */
-	kHIDUsage_KeypadAsterisk	= 0x55,	/* Keypad * */
-	kHIDUsage_KeypadHyphen	= 0x56,	/* Keypad - */
-	kHIDUsage_KeypadPlus	= 0x57,	/* Keypad + */
-	kHIDUsage_KeypadEnter	= 0x58,	/* Keypad Enter */
-	kHIDUsage_Keypad1	= 0x59,	/* Keypad 1 or End */
-	kHIDUsage_Keypad2	= 0x5A,	/* Keypad 2 or Down Arrow */
-	kHIDUsage_Keypad3	= 0x5B,	/* Keypad 3 or Page Down */
-	kHIDUsage_Keypad4	= 0x5C,	/* Keypad 4 or Left Arrow */
-	kHIDUsage_Keypad5	= 0x5D,	/* Keypad 5 */
-	kHIDUsage_Keypad6	= 0x5E,	/* Keypad 6 or Right Arrow */
-	kHIDUsage_Keypad7	= 0x5F,	/* Keypad 7 or Home */
-	kHIDUsage_Keypad8	= 0x60,	/* Keypad 8 or Up Arrow */
-	kHIDUsage_Keypad9	= 0x61,	/* Keypad 9 or Page Up */
-	kHIDUsage_Keypad0	= 0x62,	/* Keypad 0 or Insert */
-	kHIDUsage_KeypadPeriod	= 0x63,	/* Keypad . or Delete */
-	kHIDUsage_KeyboardNonUSBackslash	= 0x64,	/* Non-US \ or | */
-	kHIDUsage_KeyboardApplication	= 0x65,	/* Application */
-	kHIDUsage_KeyboardPower	= 0x66,	/* Power */
-	kHIDUsage_KeypadEqualSign	= 0x67,	/* Keypad = */
-	kHIDUsage_KeyboardF13	= 0x68,	/* F13 */
-	kHIDUsage_KeyboardF14	= 0x69,	/* F14 */
-	kHIDUsage_KeyboardF15	= 0x6A,	/* F15 */
-	kHIDUsage_KeyboardF16	= 0x6B,	/* F16 */
-	kHIDUsage_KeyboardF17	= 0x6C,	/* F17 */
-	kHIDUsage_KeyboardF18	= 0x6D,	/* F18 */
-	kHIDUsage_KeyboardF19	= 0x6E,	/* F19 */
-	kHIDUsage_KeyboardF20	= 0x6F,	/* F20 */
-	kHIDUsage_KeyboardF21	= 0x70,	/* F21 */
-	kHIDUsage_KeyboardF22	= 0x71,	/* F22 */
-	kHIDUsage_KeyboardF23	= 0x72,	/* F23 */
-	kHIDUsage_KeyboardF24	= 0x73,	/* F24 */
-	kHIDUsage_KeyboardExecute	= 0x74,	/* Execute */
-	kHIDUsage_KeyboardHelp	= 0x75,	/* Help */
-	kHIDUsage_KeyboardMenu	= 0x76,	/* Menu */
-	kHIDUsage_KeyboardSelect	= 0x77,	/* Select */
-	kHIDUsage_KeyboardStop	= 0x78,	/* Stop */
-	kHIDUsage_KeyboardAgain	= 0x79,	/* Again */
-	kHIDUsage_KeyboardUndo	= 0x7A,	/* Undo */
-	kHIDUsage_KeyboardCut	= 0x7B,	/* Cut */
-	kHIDUsage_KeyboardCopy	= 0x7C,	/* Copy */
-	kHIDUsage_KeyboardPaste	= 0x7D,	/* Paste */
-	kHIDUsage_KeyboardFind	= 0x7E,	/* Find */
-	kHIDUsage_KeyboardMute	= 0x7F,	/* Mute */
-	kHIDUsage_KeyboardVolumeUp	= 0x80,	/* Volume Up */
-	kHIDUsage_KeyboardVolumeDown	= 0x81,	/* Volume Down */
-	kHIDUsage_KeyboardLockingCapsLock	= 0x82,	/* Locking Caps Lock */
-	kHIDUsage_KeyboardLockingNumLock	= 0x83,	/* Locking Num Lock */
-	kHIDUsage_KeyboardLockingScrollLock	= 0x84,	/* Locking Scroll Lock */
-	kHIDUsage_KeypadComma	= 0x85,	/* Keypad Comma */
-	kHIDUsage_KeypadEqualSignAS400	= 0x86,	/* Keypad Equal Sign for AS/400 */
-	kHIDUsage_KeyboardInternational1	= 0x87,	/* International1 */
-	kHIDUsage_KeyboardInternational2	= 0x88,	/* International2 */
-	kHIDUsage_KeyboardInternational3	= 0x89,	/* International3 */
-	kHIDUsage_KeyboardInternational4	= 0x8A,	/* International4 */
-	kHIDUsage_KeyboardInternational5	= 0x8B,	/* International5 */
-	kHIDUsage_KeyboardInternational6	= 0x8C,	/* International6 */
-	kHIDUsage_KeyboardInternational7	= 0x8D,	/* International7 */
-	kHIDUsage_KeyboardInternational8	= 0x8E,	/* International8 */
-	kHIDUsage_KeyboardInternational9	= 0x8F,	/* International9 */
-	kHIDUsage_KeyboardLANG1	= 0x90,	/* LANG1 */
-	kHIDUsage_KeyboardLANG2	= 0x91,	/* LANG2 */
-	kHIDUsage_KeyboardLANG3	= 0x92,	/* LANG3 */
-	kHIDUsage_KeyboardLANG4	= 0x93,	/* LANG4 */
-	kHIDUsage_KeyboardLANG5	= 0x94,	/* LANG5 */
-	kHIDUsage_KeyboardLANG6	= 0x95,	/* LANG6 */
-	kHIDUsage_KeyboardLANG7	= 0x96,	/* LANG7 */
-	kHIDUsage_KeyboardLANG8	= 0x97,	/* LANG8 */
-	kHIDUsage_KeyboardLANG9	= 0x98,	/* LANG9 */
-	kHIDUsage_KeyboardAlternateErase	= 0x99,	/* AlternateErase */
-	kHIDUsage_KeyboardSysReqOrAttention	= 0x9A,	/* SysReq/Attention */
-	kHIDUsage_KeyboardCancel	= 0x9B,	/* Cancel */
-	kHIDUsage_KeyboardClear	= 0x9C,	/* Clear */
-	kHIDUsage_KeyboardPrior	= 0x9D,	/* Prior */
-	kHIDUsage_KeyboardReturn	= 0x9E,	/* Return */
-	kHIDUsage_KeyboardSeparator	= 0x9F,	/* Separator */
-	kHIDUsage_KeyboardOut	= 0xA0,	/* Out */
-	kHIDUsage_KeyboardOper	= 0xA1,	/* Oper */
-	kHIDUsage_KeyboardClearOrAgain	= 0xA2,	/* Clear/Again */
-	kHIDUsage_KeyboardCrSelOrProps	= 0xA3,	/* CrSel/Props */
-	kHIDUsage_KeyboardExSel	= 0xA4,	/* ExSel */
-	/* 0xA5-0xDF Reserved */
-	kHIDUsage_KeyboardLeftControl	= 0xE0,	/* Left Control */
-	kHIDUsage_KeyboardLeftShift	= 0xE1,	/* Left Shift */
-	kHIDUsage_KeyboardLeftAlt	= 0xE2,	/* Left Alt */
-	kHIDUsage_KeyboardLeftGUI	= 0xE3,	/* Left GUI */
-	kHIDUsage_KeyboardRightControl	= 0xE4,	/* Right Control */
-	kHIDUsage_KeyboardRightShift	= 0xE5,	/* Right Shift */
-	kHIDUsage_KeyboardRightAlt	= 0xE6,	/* Right Alt */
-	kHIDUsage_KeyboardRightGUI	= 0xE7,	/* Right GUI */
-	/* 0xE8-0xFFFF Reserved */
-	kHIDUsage_Keyboard_Reserved = 0xFFFF
-};
-
-/* LEDs Page (0x08) */
-/* An LED or indicator is implemented as an On/Off Control (OOF) using the ÒSingle button toggleÓ mode, where a value of 1 will turn on the indicator, and a value of 0 will turn it off. The exceptions are described below. */
-enum
-{
-	kHIDUsage_LED_NumLock	= 0x01,	/* On/Off Control */
-	kHIDUsage_LED_CapsLock	= 0x02,	/* On/Off Control */
-	kHIDUsage_LED_ScrollLock	= 0x03,	/* On/Off Control */
-	kHIDUsage_LED_Compose	= 0x04,	/* On/Off Control */
-	kHIDUsage_LED_Kana	= 0x05,	/* On/Off Control */
-	kHIDUsage_LED_Power	= 0x06,	/* On/Off Control */
-	kHIDUsage_LED_Shift	= 0x07,	/* On/Off Control */
-	kHIDUsage_LED_DoNotDisturb	= 0x08,	/* On/Off Control */
-	kHIDUsage_LED_Mute	= 0x09,	/* On/Off Control */
-	kHIDUsage_LED_ToneEnable	= 0x0A,	/* On/Off Control */
-	kHIDUsage_LED_HighCutFilter	= 0x0B,	/* On/Off Control */
-	kHIDUsage_LED_LowCutFilter	= 0x0C,	/* On/Off Control */
-	kHIDUsage_LED_EqualizerEnable	= 0x0D,	/* On/Off Control */
-	kHIDUsage_LED_SoundFieldOn	= 0x0E,	/* On/Off Control */
-	kHIDUsage_LED_SurroundOn	= 0x0F,	/* On/Off Control */
-	kHIDUsage_LED_Repeat	= 0x10,	/* On/Off Control */
-	kHIDUsage_LED_Stereo	= 0x11,	/* On/Off Control */
-	kHIDUsage_LED_SamplingRateDetect	= 0x12,	/* On/Off Control */
-	kHIDUsage_LED_Spinning	= 0x13,	/* On/Off Control */
-	kHIDUsage_LED_CAV	= 0x14,	/* On/Off Control */
-	kHIDUsage_LED_CLV	= 0x15,	/* On/Off Control */
-	kHIDUsage_LED_RecordingFormatDetect	= 0x16,	/* On/Off Control */
-	kHIDUsage_LED_OffHook	= 0x17,	/* On/Off Control */
-	kHIDUsage_LED_Ring	= 0x18,	/* On/Off Control */
-	kHIDUsage_LED_MessageWaiting	= 0x19,	/* On/Off Control */
-	kHIDUsage_LED_DataMode	= 0x1A,	/* On/Off Control */
-	kHIDUsage_LED_BatteryOperation	= 0x1B,	/* On/Off Control */
-	kHIDUsage_LED_BatteryOK	= 0x1C,	/* On/Off Control */
-	kHIDUsage_LED_BatteryLow	= 0x1D,	/* On/Off Control */
-	kHIDUsage_LED_Speaker	= 0x1E,	/* On/Off Control */
-	kHIDUsage_LED_HeadSet	= 0x1F,	/* On/Off Control */
-	kHIDUsage_LED_Hold	= 0x20,	/* On/Off Control */
-	kHIDUsage_LED_Microphone	= 0x21,	/* On/Off Control */
-	kHIDUsage_LED_Coverage	= 0x22,	/* On/Off Control */
-	kHIDUsage_LED_NightMode	= 0x23,	/* On/Off Control */
-	kHIDUsage_LED_SendCalls	= 0x24,	/* On/Off Control */
-	kHIDUsage_LED_CallPickup	= 0x25,	/* On/Off Control */
-	kHIDUsage_LED_Conference	= 0x26,	/* On/Off Control */
-	kHIDUsage_LED_StandBy	= 0x27,	/* On/Off Control */
-	kHIDUsage_LED_CameraOn	= 0x28,	/* On/Off Control */
-	kHIDUsage_LED_CameraOff	= 0x29,	/* On/Off Control */
-	kHIDUsage_LED_OnLine	= 0x2A,	/* On/Off Control */
-	kHIDUsage_LED_OffLine	= 0x2B,	/* On/Off Control */
-	kHIDUsage_LED_Busy	= 0x2C,	/* On/Off Control */
-	kHIDUsage_LED_Ready	= 0x2D,	/* On/Off Control */
-	kHIDUsage_LED_PaperOut	= 0x2E,	/* On/Off Control */
-	kHIDUsage_LED_PaperJam	= 0x2F,	/* On/Off Control */
-	kHIDUsage_LED_Remote	= 0x30,	/* On/Off Control */
-	kHIDUsage_LED_Forward	= 0x31,	/* On/Off Control */
-	kHIDUsage_LED_Reverse	= 0x32,	/* On/Off Control */
-	kHIDUsage_LED_Stop	= 0x33,	/* On/Off Control */
-	kHIDUsage_LED_Rewind	= 0x34,	/* On/Off Control */
-	kHIDUsage_LED_FastForward	= 0x35,	/* On/Off Control */
-	kHIDUsage_LED_Play	= 0x36,	/* On/Off Control */
-	kHIDUsage_LED_Pause	= 0x37,	/* On/Off Control */
-	kHIDUsage_LED_Record	= 0x38,	/* On/Off Control */
-	kHIDUsage_LED_Error	= 0x39,	/* On/Off Control */
-	kHIDUsage_LED_Usage	= 0x3A,	/* Selector */
-	kHIDUsage_LED_UsageInUseIndicator	= 0x3B,	/* Usage Switch */
-	kHIDUsage_LED_UsageMultiModeIndicator	= 0x3C,	/* Usage Modifier */
-	kHIDUsage_LED_IndicatorOn	= 0x3D,	/* Selector */
-	kHIDUsage_LED_IndicatorFlash	= 0x3E,	/* Selector */
-	kHIDUsage_LED_IndicatorSlowBlink	= 0x3F,	/* Selector */
-	kHIDUsage_LED_IndicatorFastBlink	= 0x40,	/* Selector */
-	kHIDUsage_LED_IndicatorOff	= 0x41,	/* Selector */
-	kHIDUsage_LED_FlashOnTime	= 0x42,	/* Dynamic Value */
-	kHIDUsage_LED_SlowBlinkOnTime	= 0x43,	/* Dynamic Value */
-	kHIDUsage_LED_SlowBlinkOffTime	= 0x44,	/* Dynamic Value */
-	kHIDUsage_LED_FastBlinkOnTime	= 0x45,	/* Dynamic Value */
-	kHIDUsage_LED_FastBlinkOffTime	= 0x46,	/* Dynamic Value */
-	kHIDUsage_LED_UsageIndicatorColor	= 0x47,	/* Usage Modifier */
-	kHIDUsage_LED_IndicatorRed	= 0x48,	/* Selector */
-	kHIDUsage_LED_IndicatorGreen	= 0x49,	/* Selector */
-	kHIDUsage_LED_IndicatorAmber	= 0x4A,	/* Selector */
-	kHIDUsage_LED_GenericIndicator	= 0x4B,	/* On/Off Control */
-	kHIDUsage_LED_SystemSuspend	= 0x4C,	/* On/Off Control */
-	kHIDUsage_LED_ExternalPowerConnected	= 0x4D,	/* On/Off Control */
-	/* 0x4E - 0xFFFF Reserved */
-	kHIDUsage_LED_Reserved = 0xFFFF
-};
-
-/* Button Page (0x09) */
-/* The Button page is the first place an application should look for user selection controls. System graphical user interfaces typically employ a pointer and a set of hierarchical selectors to select, move and otherwise manipulate their environment. For these purposes the following assignment of significance can be applied to the Button usages: */
-/* ¥ Button 1, Primary Button. Used for object selecting, dragging, and double click activation. On MacOS, this is the only button. Microsoft operating systems call this a logical left button, because it */
-/* is not necessarily physically located on the left of the pointing device. */
-/* ¥ Button 2, Secondary Button. Used by newer graphical user interfaces to browse object properties. Exposed by systems to applications that typically assign application-specific functionality. */
-/* ¥ Button 3, Tertiary Button. Optional control. Exposed to applications, but seldom assigned functionality due to prevalence of two- and one-button devices. */
-/* ¥ Buttons 4 -55. As the button number increases, its significance as a selector decreases. */
-/* In many ways the assignment of button numbers is similar to the assignment of Effort in Physical descriptors. Button 1 would be used to define the button a finger rests on when the hand is in the Òat restÓ position, that is, virtually no effort is required by the user to activate the button. Button values increment as the finger has to stretch to reach a control. See Section 6.2.3, ÒPhysical Descriptors,Ó in the HID Specification for methods of further qualifying buttons. */
-enum
-{
-	kHIDUsage_Button_1	= 0x01,	/* (primary/trigger) */
-	kHIDUsage_Button_2	= 0x02,	/* (secondary) */
-	kHIDUsage_Button_3	= 0x03,	/* (tertiary) */
-	kHIDUsage_Button_4	= 0x04, /* 4th button */
-	/* ... */
-	kHIDUsage_Button_65535	= 0xFFFF
-};
-
-/* Ordinal Page (0x0A) */
-/* The Ordinal page allows multiple instances of a control or sets of controls to be declared without requiring individual enumeration in the native usage page. For example, it is not necessary to declare usages of Pointer 1, Pointer 2, and so forth on the Generic Desktop page. When parsed, the ordinal instance number is, in essence, concatenated to the usages attached to the encompassing collection to create Pointer 1, Pointer 2, and so forth. */
-/* For an example, see Section A.5, ÒMultiple Instances of a Control,Ó in Appendix A, ÒUsage Examples.Ó By convention, an Ordinal collection is placed inside the collection for which it is declaring multiple instances. */
-/* Instances do not have to be identical. */
-enum
-{
-	/* 0x00 Reserved */
-	kHIDUsage_Ord_Instance1	= 0x01,	/* Usage Modifier */
-	kHIDUsage_Ord_Instance2	= 0x02,	/* Usage Modifier */
-	kHIDUsage_Ord_Instance3	= 0x03,	/* Usage Modifier */
-	kHIDUsage_Ord_Instance4	= 0x04,	/* Usage Modifier */
-	kHIDUsage_Ord_Instance65535	= 0xFFFF	/* Usage Modifier */
-};
-
-/* Telephony Page (0x0B) */
-/* This usage page defines the keytop and control usages for telephony devices. */
-/* Indicators on a phone are handled by wrapping them in LED: Usage In Use Indicator and LED: Usage Selected Indicator usages. For example, a message-indicator LED would be identified by a Telephony: Message usage declared as a Feature or Output in a LED: Usage In Use Indicator collection. */
-/* See Section 14, ÒConsumer Page (0x0C),Ó for audio volume and tone controls. */
-enum
-{
-	kHIDUsage_Tfon_Phone	= 0x01,	/* Application Collection */
-	kHIDUsage_Tfon_AnsweringMachine	= 0x02,	/* Application Collection */
-	kHIDUsage_Tfon_MessageControls	= 0x03,	/* Logical Collection */
-	kHIDUsage_Tfon_Handset	= 0x04,	/* Logical Collection */
-	kHIDUsage_Tfon_Headset	= 0x05,	/* Logical Collection */
-	kHIDUsage_Tfon_TelephonyKeyPad	= 0x06,	/* Named Array */
-	kHIDUsage_Tfon_ProgrammableButton	= 0x07,	/* Named Array */
-	/* 0x08 - 0x1F Reserved */
-	kHIDUsage_Tfon_HookSwitch	= 0x20,	/* On/Off Control */
-	kHIDUsage_Tfon_Flash	= 0x21,	/* Momentary Control */
-	kHIDUsage_Tfon_Feature	= 0x22,	/* One-Shot Control */
-	kHIDUsage_Tfon_Hold	= 0x23,	/* On/Off Control */
-	kHIDUsage_Tfon_Redial	= 0x24,	/* One-Shot Control */
-	kHIDUsage_Tfon_Transfer	= 0x25,	/* One-Shot Control */
-	kHIDUsage_Tfon_Drop	= 0x26,	/* One-Shot Control */
-	kHIDUsage_Tfon_Park	= 0x27,	/* On/Off Control */
-	kHIDUsage_Tfon_ForwardCalls	= 0x28,	/* On/Off Control */
-	kHIDUsage_Tfon_AlternateFunction	= 0x29,	/* Momentary Control */
-	kHIDUsage_Tfon_Line	= 0x2A,	/* One-Shot Control */
-	kHIDUsage_Tfon_SpeakerPhone	= 0x2B,	/* On/Off Control */
-	kHIDUsage_Tfon_Conference	= 0x2C,	/* On/Off Control */
-	kHIDUsage_Tfon_RingEnable	= 0x2D,	/* On/Off Control */
-	kHIDUsage_Tfon_Ring	= 0x2E,	/* Selector */
-	kHIDUsage_Tfon_PhoneMute	= 0x2F,	/* On/Off Control */
-	kHIDUsage_Tfon_CallerID	= 0x30,	/* Momentary Control */
-	/* 0x31 - 0x4F Reserved */
-	kHIDUsage_Tfon_SpeedDial	= 0x50,	/* One-Shot Control */
-	kHIDUsage_Tfon_StoreNumber	= 0x51,	/* One-Shot Control */
-	kHIDUsage_Tfon_RecallNumber	= 0x52,	/* One-Shot Control */
-	kHIDUsage_Tfon_PhoneDirectory	= 0x53,	/* On/Off Control */
-	/* 0x54 - 0x6F Reserved */
-	kHIDUsage_Tfon_VoiceMail	= 0x70,	/* On/Off Control */
-	kHIDUsage_Tfon_ScreenCalls	= 0x71,	/* On/Off Control */
-	kHIDUsage_Tfon_DoNotDisturb	= 0x72,	/* On/Off Control */
-	kHIDUsage_Tfon_Message	= 0x73,	/* One-Shot Control */
-	kHIDUsage_Tfon_AnswerOnOrOff	= 0x74,	/* On/Off Control */
-	/* 0x75 - 0x8F Reserved */
-	kHIDUsage_Tfon_InsideDialTone	= 0x90,	/* Momentary Control */
-	kHIDUsage_Tfon_OutsideDialTone	= 0x91,	/* Momentary Control */
-	kHIDUsage_Tfon_InsideRingTone	= 0x92,	/* Momentary Control */
-	kHIDUsage_Tfon_OutsideRingTone	= 0x93,	/* Momentary Control */
-	kHIDUsage_Tfon_PriorityRingTone	= 0x94,	/* Momentary Control */
-	kHIDUsage_Tfon_InsideRingback	= 0x95,	/* Momentary Control */
-	kHIDUsage_Tfon_PriorityRingback	= 0x96,	/* Momentary Control */
-	kHIDUsage_Tfon_LineBusyTone	= 0x97,	/* Momentary Control */
-	kHIDUsage_Tfon_ReorderTone	= 0x98,	/* Momentary Control */
-	kHIDUsage_Tfon_CallWaitingTone	= 0x99,	/* Momentary Control */
-	kHIDUsage_Tfon_ConfirmationTone1	= 0x9A,	/* Momentary Control */
-	kHIDUsage_Tfon_ConfirmationTone2	= 0x9B,	/* Momentary Control */
-	kHIDUsage_Tfon_TonesOff	= 0x9C,	/* On/Off Control */
-	kHIDUsage_Tfon_OutsideRingback	= 0x9D,	/* Momentary Control */
-	/* 0x9E - 0xAF Reserved */
-	kHIDUsage_Tfon_PhoneKey0	= 0xB0,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey1	= 0xB1,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey2	= 0xB2,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey3	= 0xB3,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey4	= 0xB4,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey5	= 0xB5,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey6	= 0xB6,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey7	= 0xB7,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey8	= 0xB8,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey9	= 0xB9,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyStar	= 0xBA,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyPound	= 0xBB,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyA	= 0xBC,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyB	= 0xBD,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyC	= 0xBE,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyD	= 0xBF,	/* Selector/One-Shot Control */
-	/* 0xC0 - 0xFFFF Reserved */
-	kHIDUsage_TFon_Reserved = 0xFFFF
-};
-
-/* Consumer Page (0x0C) */
-/* All controls on the Consumer page are application-specific. That is, they affect a specific device, not the system as a whole. */
-enum
-{
-	kHIDUsage_Csmr_ConsumerControl	= 0x01,	/* Application Collection */
-	kHIDUsage_Csmr_NumericKeyPad	= 0x02,	/* Named Array */
-	kHIDUsage_Csmr_ProgrammableButtons	= 0x03,	/* Named Array */
-	/* 0x03 - 0x1F Reserved */
-	kHIDUsage_Csmr_Plus10	= 0x20,	/* One-Shot Control */
-	kHIDUsage_Csmr_Plus100	= 0x21,	/* One-Shot Control */
-	kHIDUsage_Csmr_AMOrPM	= 0x22,	/* One-Shot Control */
-	/* 0x23 - 0x3F Reserved */
-	kHIDUsage_Csmr_Power	= 0x30,	/* On/Off Control */
-	kHIDUsage_Csmr_Reset	= 0x31,	/* One-Shot Control */
-	kHIDUsage_Csmr_Sleep	= 0x32,	/* One-Shot Control */
-	kHIDUsage_Csmr_SleepAfter	= 0x33,	/* One-Shot Control */
-	kHIDUsage_Csmr_SleepMode	= 0x34,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_Illumination	= 0x35,	/* On/Off Control */
-	kHIDUsage_Csmr_FunctionButtons	= 0x36,	/* Named Array */
-	/* 0x37 - 0x3F Reserved */
-	kHIDUsage_Csmr_Menu	= 0x40,	/* On/Off Control */
-	kHIDUsage_Csmr_MenuPick	= 0x41,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuUp	= 0x42,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuDown	= 0x43,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuLeft	= 0x44,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuRight	= 0x45,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuEscape	= 0x46,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuValueIncrease	= 0x47,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuValueDecrease	= 0x48,	/* One-Shot Control */
-	/* 0x49 - 0x5F Reserved */
-	kHIDUsage_Csmr_DataOnScreen	= 0x60,	/* On/Off Control */
-	kHIDUsage_Csmr_ClosedCaption	= 0x61,	/* On/Off Control */
-	kHIDUsage_Csmr_ClosedCaptionSelect	= 0x62,	/* Selector */
-	kHIDUsage_Csmr_VCROrTV	= 0x63,	/* On/Off Control */
-	kHIDUsage_Csmr_BroadcastMode	= 0x64,	/* One-Shot Control */
-	kHIDUsage_Csmr_Snapshot	= 0x65,	/* One-Shot Control */
-	kHIDUsage_Csmr_Still	= 0x66,	/* One-Shot Control */
-	/* 0x67 - 0x7F Reserved */
-	kHIDUsage_Csmr_Selection	= 0x80,	/* Named Array */
-	kHIDUsage_Csmr_Assign	= 0x81,	/* Selector */
-	kHIDUsage_Csmr_ModeStep	= 0x82,	/* One-Shot Control */
-	kHIDUsage_Csmr_RecallLast	= 0x83,	/* One-Shot Control */
-	kHIDUsage_Csmr_EnterChannel	= 0x84,	/* One-Shot Control */
-	kHIDUsage_Csmr_OrderMovie	= 0x85,	/* One-Shot Control */
-	kHIDUsage_Csmr_Channel	= 0x86,	/* Linear Control */
-	kHIDUsage_Csmr_MediaSelection	= 0x87,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectComputer	= 0x88,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectTV	= 0x89,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectWWW	= 0x8A,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectDVD	= 0x8B,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectTelephone	= 0x8C,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectProgramGuide	= 0x8D,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectVideoPhone	= 0x8E,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectGames	= 0x8F,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectMessages	= 0x90,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectCD	= 0x91,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectVCR	= 0x92,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectTuner	= 0x93,	/* Selector */
-	kHIDUsage_Csmr_Quit	= 0x94,	/* One-Shot Control */
-	kHIDUsage_Csmr_Help	= 0x95,	/* On/Off Control */
-	kHIDUsage_Csmr_MediaSelectTape	= 0x96,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectCable	= 0x97,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectSatellite	= 0x98,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectSecurity	= 0x99,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectHome	= 0x9A,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectCall	= 0x9B,	/* Selector */
-	kHIDUsage_Csmr_ChannelIncrement	= 0x9C,	/* One-Shot Control */
-	kHIDUsage_Csmr_ChannelDecrement	= 0x9D,	/* One-Shot Control */
-	kHIDUsage_Csmr_Media	= 0x9E,	/* Selector */
-	/* 0x9F Reserved */
-	kHIDUsage_Csmr_VCRPlus	= 0xA0,	/* One-Shot Control */
-	kHIDUsage_Csmr_Once	= 0xA1,	/* One-Shot Control */
-	kHIDUsage_Csmr_Daily	= 0xA2,	/* One-Shot Control */
-	kHIDUsage_Csmr_Weekly	= 0xA3,	/* One-Shot Control */
-	kHIDUsage_Csmr_Monthly	= 0xA4,	/* One-Shot Control */
-	/* 0xA5 - 0xAF Reserved */
-	kHIDUsage_Csmr_Play	= 0xB0,	/* On/Off Control */
-	kHIDUsage_Csmr_Pause	= 0xB1,	/* On/Off Control */
-	kHIDUsage_Csmr_Record	= 0xB2,	/* On/Off Control */
-	kHIDUsage_Csmr_FastForward	= 0xB3,	/* On/Off Control */
-	kHIDUsage_Csmr_Rewind	= 0xB4,	/* On/Off Control */
-	kHIDUsage_Csmr_ScanNextTrack	= 0xB5,	/* One-Shot Control */
-	kHIDUsage_Csmr_ScanPreviousTrack	= 0xB6,	/* One-Shot Control */
-	kHIDUsage_Csmr_Stop	= 0xB7,	/* One-Shot Control */
-	kHIDUsage_Csmr_Eject	= 0xB8,	/* One-Shot Control */
-	kHIDUsage_Csmr_RandomPlay	= 0xB9,	/* On/Off Control */
-	kHIDUsage_Csmr_SelectDisc	= 0xBA,	/* Named Array */
-	kHIDUsage_Csmr_EnterDisc	= 0xBB,	/* Momentary Control */
-	kHIDUsage_Csmr_Repeat	= 0xBC,	/* One-Shot Control */
-	kHIDUsage_Csmr_Tracking	= 0xBD,	/* Linear Control */
-	kHIDUsage_Csmr_TrackNormal	= 0xBE,	/* One-Shot Control */
-	kHIDUsage_Csmr_SlowTracking	= 0xBF,	/* Linear Control */
-	kHIDUsage_Csmr_FrameForward	= 0xC0,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_FrameBack	= 0xC1,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_Mark	= 0xC2,	/* One-Shot Control */
-	kHIDUsage_Csmr_ClearMark	= 0xC3,	/* One-Shot Control */
-	kHIDUsage_Csmr_RepeatFromMark	= 0xC4,	/* On/Off Control */
-	kHIDUsage_Csmr_ReturnToMark	= 0xC5,	/* One-Shot Control */
-	kHIDUsage_Csmr_SearchMarkForward	= 0xC6,	/* One-Shot Control */
-	kHIDUsage_Csmr_SearchMarkBackwards	= 0xC7,	/* One-Shot Control */
-	kHIDUsage_Csmr_CounterReset	= 0xC8,	/* One-Shot Control */
-	kHIDUsage_Csmr_ShowCounter	= 0xC9,	/* One-Shot Control */
-	kHIDUsage_Csmr_TrackingIncrement	= 0xCA,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_TrackingDecrement	= 0xCB,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_StopOrEject	= 0xCC,	/* One-Shot Control */
-	kHIDUsage_Csmr_PlayOrPause	= 0xCD,	/* One-Shot Control */
-	kHIDUsage_Csmr_PlayOrSkip	= 0xCE,	/* One-Shot Control */
-	/* 0xCF - 0xDF Reserved */
-	kHIDUsage_Csmr_Volume	= 0xE0,	/* Linear Control */
-	kHIDUsage_Csmr_Balance	= 0xE1,	/* Linear Control */
-	kHIDUsage_Csmr_Mute	= 0xE2,	/* On/Off Control */
-	kHIDUsage_Csmr_Bass	= 0xE3,	/* Linear Control */
-	kHIDUsage_Csmr_Treble	= 0xE4,	/* Linear Control */
-	kHIDUsage_Csmr_BassBoost	= 0xE5,	/* On/Off Control */
-	kHIDUsage_Csmr_SurroundMode	= 0xE6,	/* One-Shot Control */
-	kHIDUsage_Csmr_Loudness	= 0xE7,	/* On/Off Control */
-	kHIDUsage_Csmr_MPX	= 0xE8,	/* On/Off Control */
-	kHIDUsage_Csmr_VolumeIncrement	= 0xE9,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_VolumeDecrement	= 0xEA,	/* Re-Trigger Control */
-	/* 0xEB - 0xEF Reserved */
-	kHIDUsage_Csmr_Speed	= 0xF0,	/* Selector */
-	kHIDUsage_Csmr_PlaybackSpeed	= 0xF1,	/* Named Array */
-	kHIDUsage_Csmr_StandardPlay	= 0xF2,	/* Selector */
-	kHIDUsage_Csmr_LongPlay	= 0xF3,	/* Selector */
-	kHIDUsage_Csmr_ExtendedPlay	= 0xF4,	/* Selector */
-	kHIDUsage_Csmr_Slow	= 0xF5,	/* One-Shot Control */
-	/* 0xF6 - 0xFF Reserved */
-	kHIDUsage_Csmr_FanEnable	= 0x100,	/* On/Off Control */
-	kHIDUsage_Csmr_FanSpeed	= 0x101,	/* Linear Control */
-	kHIDUsage_Csmr_LightEnable	= 0x102,	/* On/Off Control */
-	kHIDUsage_Csmr_LightIlluminationLevel	= 0x103,	/* Linear Control */
-	kHIDUsage_Csmr_ClimateControlEnable	= 0x104,	/* On/Off Control */
-	kHIDUsage_Csmr_RoomTemperature	= 0x105,	/* Linear Control */
-	kHIDUsage_Csmr_SecurityEnable	= 0x106,	/* On/Off Control */
-	kHIDUsage_Csmr_FireAlarm	= 0x107,	/* One-Shot Control */
-	kHIDUsage_Csmr_PoliceAlarm	= 0x108,	/* One-Shot Control */
-	/* 0x109 - 0x14F Reserved */
-	kHIDUsage_Csmr_BalanceRight	= 0x150,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_BalanceLeft	= 0x151,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_BassIncrement	= 0x152,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_BassDecrement	= 0x153,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_TrebleIncrement	= 0x154,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_TrebleDecrement	= 0x155,	/* Re-Trigger Control */
-	/* 0x156 - 0x15F Reserved */
-	kHIDUsage_Csmr_SpeakerSystem	= 0x160,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelLeft	= 0x161,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelRight	= 0x162,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelCenter	= 0x163,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelFront	= 0x164,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelCenterFront	= 0x165,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelSide	= 0x166,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelSurround	= 0x167,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelLowFrequencyEnhancement	= 0x168,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelTop	= 0x169,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelUnknown	= 0x16A,	/* Logical Collection */
-	/* 0x16B - 0x16F Reserved */
-	kHIDUsage_Csmr_SubChannel	= 0x170,	/* Linear Control */
-	kHIDUsage_Csmr_SubChannelIncrement	= 0x171,	/* One-Shot Control */
-	kHIDUsage_Csmr_SubChannelDecrement	= 0x172,	/* One-Shot Control */
-	kHIDUsage_Csmr_AlternateAudioIncrement	= 0x173,	/* One-Shot Control */
-	kHIDUsage_Csmr_AlternateAudioDecrement	= 0x174,	/* One-Shot Control */
-	/* 0x175 - 0x17F Reserved */
-	kHIDUsage_Csmr_ApplicationLaunchButtons	= 0x180,	/* Named Array */
-	kHIDUsage_Csmr_ALLaunchButtonConfigurationTool	= 0x181,	/* Selector */
-	kHIDUsage_Csmr_ALProgrammableButtonConfiguration	= 0x182,	/* Selector */
-	kHIDUsage_Csmr_ALConsumerControlConfiguration	= 0x183,	/* Selector */
-	kHIDUsage_Csmr_ALWordProcessor	= 0x184,	/* Selector */
-	kHIDUsage_Csmr_ALTextEditor	= 0x185,	/* Selector */
-	kHIDUsage_Csmr_ALSpreadsheet	= 0x186,	/* Selector */
-	kHIDUsage_Csmr_ALGraphicsEditor	= 0x187,	/* Selector */
-	kHIDUsage_Csmr_ALPresentationApp	= 0x188,	/* Selector */
-	kHIDUsage_Csmr_ALDatabaseApp	= 0x189,	/* Selector */
-	kHIDUsage_Csmr_ALEmailReader	= 0x18A,	/* Selector */
-	kHIDUsage_Csmr_ALNewsreader	= 0x18B,	/* Selector */
-	kHIDUsage_Csmr_ALVoicemail	= 0x18C,	/* Selector */
-	kHIDUsage_Csmr_ALContactsOrAddressBook	= 0x18D,	/* Selector */
-	kHIDUsage_Csmr_ALCalendarOrSchedule	= 0x18E,	/* Selector */
-	kHIDUsage_Csmr_ALTaskOrProjectManager	= 0x18F,	/* Selector */
-	kHIDUsage_Csmr_ALLogOrJournalOrTimecard	= 0x190,	/* Selector */
-	kHIDUsage_Csmr_ALCheckbookOrFinance	= 0x191,	/* Selector */
-	kHIDUsage_Csmr_ALCalculator	= 0x192,	/* Selector */
-	kHIDUsage_Csmr_ALAOrVCaptureOrPlayback	= 0x193,	/* Selector */
-	kHIDUsage_Csmr_ALLocalMachineBrowser	= 0x194,	/* Selector */
-	kHIDUsage_Csmr_ALLANOrWANBrowser	= 0x195,	/* Selector */
-	kHIDUsage_Csmr_ALInternetBrowser	= 0x196,	/* Selector */
-	kHIDUsage_Csmr_ALRemoteNetworkingOrISPConnect	= 0x197,	/* Selector */
-	kHIDUsage_Csmr_ALNetworkConference	= 0x198,	/* Selector */
-	kHIDUsage_Csmr_ALNetworkChat	= 0x199,	/* Selector */
-	kHIDUsage_Csmr_ALTelephonyOrDialer	= 0x19A,	/* Selector */
-	kHIDUsage_Csmr_ALLogon	= 0x19B,	/* Selector */
-	kHIDUsage_Csmr_ALLogoff	= 0x19C,	/* Selector */
-	kHIDUsage_Csmr_ALLogonOrLogoff	= 0x19D,	/* Selector */
-	kHIDUsage_Csmr_ALTerminalLockOrScreensaver	= 0x19E,	/* Selector */
-	kHIDUsage_Csmr_ALControlPanel	= 0x19F,	/* Selector */
-	kHIDUsage_Csmr_ALCommandLineProcessorOrRun	= 0x1A0,	/* Selector */
-	kHIDUsage_Csmr_ALProcessOrTaskManager	= 0x1A1,	/* Selector */
-	kHIDUsage_Csmr_AL	= 0x1A2,	/* Selector */
-	kHIDUsage_Csmr_ALNextTaskOrApplication	= 0x1A3,	/* Selector */
-	kHIDUsage_Csmr_ALPreviousTaskOrApplication	= 0x1A4,	/* Selector */
-	kHIDUsage_Csmr_ALPreemptiveHaltTaskOrApplication	= 0x1A5,	/* Selector */
-    kHIDUsage_Csmr_ALIntegratedHelpCenter   = 0x1A6, /* Selector */
-    kHIDUsage_Csmr_ALDocuments   = 0x1A7, /* Selector */
-    kHIDUsage_Csmr_ALThesaurus   = 0x1A8, /* Selector */
-    kHIDUsage_Csmr_ALDictionary   = 0x1A9, /* Selector */
-    kHIDUsage_Csmr_ALDesktop   = 0x1AA, /* Selector */
-    kHIDUsage_Csmr_ALSpellCheck   = 0x1AB, /* Selector */
-    kHIDUsage_Csmr_ALGrammerCheck   = 0x1AC, /* Selector */
-    kHIDUsage_Csmr_ALWirelessStatus   = 0x1AD, /* Selector */
-    kHIDUsage_Csmr_ALKeyboardLayout   = 0x1AE, /* Selector */
-    kHIDUsage_Csmr_ALVirusProtection   = 0x1AF, /* Selector */
-    kHIDUsage_Csmr_ALEncryption   = 0x1B0, /* Selector */
-    kHIDUsage_Csmr_ALScreenSaver   = 0x1B1, /* Selector */
-    kHIDUsage_Csmr_ALAlarms   = 0x1B2, /* Selector */
-    kHIDUsage_Csmr_ALClock   = 0x1B3, /* Selector */
-    kHIDUsage_Csmr_ALFileBrowser   = 0x1B4, /* Selector */
-    kHIDUsage_Csmr_ALPowerStatus   = 0x1B5, /* Selector */
-	/* 0x1A6 - 0x1FF Reserved */
-	kHIDUsage_Csmr_GenericGUIApplicationControls	= 0x200,	/* Named Array */
-	kHIDUsage_Csmr_ACNew	= 0x201,	/* Selector */
-	kHIDUsage_Csmr_ACOpen	= 0x202,	/* Selector */
-	kHIDUsage_Csmr_ACClose	= 0x203,	/* Selector */
-	kHIDUsage_Csmr_ACExit	= 0x204,	/* Selector */
-	kHIDUsage_Csmr_ACMaximize	= 0x205,	/* Selector */
-	kHIDUsage_Csmr_ACMinimize	= 0x206,	/* Selector */
-	kHIDUsage_Csmr_ACSave	= 0x207,	/* Selector */
-	kHIDUsage_Csmr_ACPrint	= 0x208,	/* Selector */
-	kHIDUsage_Csmr_ACProperties	= 0x209,	/* Selector */
-	kHIDUsage_Csmr_ACUndo	= 0x21A,	/* Selector */
-	kHIDUsage_Csmr_ACCopy	= 0x21B,	/* Selector */
-	kHIDUsage_Csmr_ACCut	= 0x21C,	/* Selector */
-	kHIDUsage_Csmr_ACPaste	= 0x21D,	/* Selector */
-	kHIDUsage_Csmr_AC	= 0x21E,	/* Selector */
-	kHIDUsage_Csmr_ACFind	= 0x21F,	/* Selector */
-	kHIDUsage_Csmr_ACFindandReplace	= 0x220,	/* Selector */
-	kHIDUsage_Csmr_ACSearch	= 0x221,	/* Selector */
-	kHIDUsage_Csmr_ACGoTo	= 0x222,	/* Selector */
-	kHIDUsage_Csmr_ACHome	= 0x223,	/* Selector */
-	kHIDUsage_Csmr_ACBack	= 0x224,	/* Selector */
-	kHIDUsage_Csmr_ACForward	= 0x225,	/* Selector */
-	kHIDUsage_Csmr_ACStop	= 0x226,	/* Selector */
-	kHIDUsage_Csmr_ACRefresh	= 0x227,	/* Selector */
-	kHIDUsage_Csmr_ACPreviousLink	= 0x228,	/* Selector */
-	kHIDUsage_Csmr_ACNextLink	= 0x229,	/* Selector */
-	kHIDUsage_Csmr_ACBookmarks	= 0x22A,	/* Selector */
-	kHIDUsage_Csmr_ACHistory	= 0x22B,	/* Selector */
-	kHIDUsage_Csmr_ACSubscriptions	= 0x22C,	/* Selector */
-	kHIDUsage_Csmr_ACZoomIn	= 0x22D,	/* Selector */
-	kHIDUsage_Csmr_ACZoomOut	= 0x22E,	/* Selector */
-	kHIDUsage_Csmr_ACZoom	= 0x22F,	/* Selector */
-	kHIDUsage_Csmr_ACFullScreenView	= 0x230,	/* Selector */
-	kHIDUsage_Csmr_ACNormalView	= 0x231,	/* Selector */
-	kHIDUsage_Csmr_ACViewToggle	= 0x232,	/* Selector */
-	kHIDUsage_Csmr_ACScrollUp	= 0x233,	/* Selector */
-	kHIDUsage_Csmr_ACScrollDown	= 0x234,	/* Selector */
-	kHIDUsage_Csmr_ACScroll	= 0x235,	/* Selector */
-	kHIDUsage_Csmr_ACPanLeft	= 0x236,	/* Selector */
-	kHIDUsage_Csmr_ACPanRight	= 0x237,	/* Selector */
-	kHIDUsage_Csmr_ACPan	= 0x238,	/* Selector */
-	kHIDUsage_Csmr_ACNewWindow	= 0x239,	/* Selector */
-	kHIDUsage_Csmr_ACTileHorizontally	= 0x23A,	/* Selector */
-	kHIDUsage_Csmr_ACTileVertically	= 0x23B,	/* Selector */
-	kHIDUsage_Csmr_ACFormat	= 0x23C,	/* Selector */
-	/* 0x23D - 0xFFFF Reserved */
-	kHIDUsage_Csmr_Reserved = 0xFFFF
-};
-
-/* Physical Interface Device Page (0x0F) */
-/* This section provides detailed descriptions of the usages employed by Digitizer Devices. */
-enum
-{
-	kHIDUsage_PID_PhysicalInterfaceDevice = 0x01,		/* CA - A collection of PID usages */
-	/* 0x02 - 0x1F Reserved */
-	kHIDUsage_PID_Normal = 0x20,						/* DV - A force applied perpendicular to the surface of an object */
-	kHIDUsage_PID_SetEffectReport = 0x21,				/* XXX */
-	kHIDUsage_PID_EffectBlockIndex = 0x22,				/* XXX */
-	kHIDUsage_PID_ParamBlockOffset = 0x23,				/* XXX */
-	kHIDUsage_PID_ROM_Flag = 0x24,						/* XXX */
-	kHIDUsage_PID_EffectType = 0x25,					/* XXX */
-	kHIDUsage_PID_ET_ConstantForce = 0x26,				/* XXX */
-	kHIDUsage_PID_ET_Ramp = 0x27,						/* XXX */
-	kHIDUsage_PID_ET_CustomForceData = 0x28,			/* XXX */
-	/* 0x29 - 0x2F Reserved */
-	kHIDUsage_PID_ET_Square = 0x30,						/* XXX */
-	kHIDUsage_PID_ET_Sine = 0x31,						/* XXX */
-	kHIDUsage_PID_ET_Triangle = 0x32,					/* XXX */
-	kHIDUsage_PID_ET_SawtoothUp = 0x33,					/* XXX */
-	kHIDUsage_PID_ET_SawtoothDown = 0x34,				/* XXX */
-	/* 0x35 - 0x3F Reserved */
-	kHIDUsage_PID_ET_Spring = 0x40,						/* XXX */
-	kHIDUsage_PID_ET_Damper = 0x41,						/* XXX */
-	kHIDUsage_PID_ET_Inertia = 0x42,					/* XXX */
-	kHIDUsage_PID_ET_Friction = 0x43,					/* XXX */
-	/* 0x44 - 0x4F Reserved */
-	kHIDUsage_PID_Duration = 0x50,						/* XXX */
-	kHIDUsage_PID_SamplePeriod = 0x51,					/* XXX */
-	kHIDUsage_PID_Gain = 0x52,							/* XXX */
-	kHIDUsage_PID_TriggerButton = 0x53,					/* XXX */
-	kHIDUsage_PID_TriggerRepeatInterval = 0x54,			/* XXX */
-	kHIDUsage_PID_AxesEnable = 0x55,					/* XXX */
-	kHIDUsage_PID_DirectionEnable = 0x56,				/* XXX */
-	kHIDUsage_PID_Direction = 0x57,						/* XXX */
-	kHIDUsage_PID_TypeSpecificBlockOffset = 0x58,		/* XXX */
-	kHIDUsage_PID_BlockType = 0x59,						/* XXX */
-	kHIDUsage_PID_SetEnvelopeReport = 0x5A,				/* XXX */
-	kHIDUsage_PID_AttackLevel = 0x5B,					/* XXX */
-	kHIDUsage_PID_AttackTime = 0x5C,					/* XXX */
-	kHIDUsage_PID_FadeLevel = 0x5D,						/* XXX */
-	kHIDUsage_PID_FadeTime = 0x5E,						/* XXX */
-	kHIDUsage_PID_SetConditionReport = 0x5F,			/* XXX */
-
-	kHIDUsage_PID_CP_Offset = 0x60,						/* XXX */
-	kHIDUsage_PID_PositiveCoefficient = 0x61,			/* XXX */
-	kHIDUsage_PID_NegativeCoefficient = 0x62,			/* XXX */
-	kHIDUsage_PID_PositiveSaturation = 0x63,			/* XXX */
-	kHIDUsage_PID_NegativeSaturation = 0x64,			/* XXX */
-	kHIDUsage_PID_DeadBand = 0x65,						/* XXX */
-	kHIDUsage_PID_DownloadForceSample = 0x66,			/* XXX */
-	kHIDUsage_PID_IsochCustomForceEnable = 0x67,		/* XXX */
-	kHIDUsage_PID_CustomForceDataReport = 0x68,			/* XXX */
-	kHIDUsage_PID_CustomForceData = 0x69,				/* XXX */
-	kHIDUsage_PID_CustomForceVendorDefinedData = 0x6A,	/* XXX */
-	kHIDUsage_PID_SetCustomForceReport = 0x6B,			/* XXX */
-	kHIDUsage_PID_CustomForceDataOffset = 0x6C,			/* XXX */
-	kHIDUsage_PID_SampleCount = 0x6D,					/* XXX */
-	kHIDUsage_PID_SetPeriodicReport = 0x6E,				/* XXX */
-	kHIDUsage_PID_Offset = 0x6F,						/* XXX */
-
-	kHIDUsage_PID_Magnitude = 0x70,						/* XXX */
-	kHIDUsage_PID_Phase = 0x71,							/* XXX */
-	kHIDUsage_PID_Period = 0x72,						/* XXX */
-	kHIDUsage_PID_SetConstantForceReport = 0x73,		/* XXX */
-	kHIDUsage_PID_SetRampForceReport = 0x74,			/* XXX */
-	kHIDUsage_PID_RampStart = 0x75,						/* XXX */
-	kHIDUsage_PID_RampEnd = 0x76,						/* XXX */
-	kHIDUsage_PID_EffectOperationReport = 0x77,			/* XXX */
-	kHIDUsage_PID_EffectOperation = 0x78,				/* XXX */
-	kHIDUsage_PID_OpEffectStart = 0x79,					/* XXX */
-	kHIDUsage_PID_OpEffectStartSolo = 0x7A,				/* XXX */
-	kHIDUsage_PID_OpEffectStop = 0x7B,					/* XXX */
-	kHIDUsage_PID_LoopCount = 0x7C,						/* XXX */
-	kHIDUsage_PID_DeviceGainReport = 0x7D,				/* XXX */
-	kHIDUsage_PID_DeviceGain = 0x7E,					/* XXX */
-	kHIDUsage_PID_PoolReport = 0x7F,					/* XXX */
-
-	kHIDUsage_PID_RAM_PoolSize = 0x80,					/* XXX */
-	kHIDUsage_PID_ROM_PoolSize = 0x81,					/* XXX */
-	kHIDUsage_PID_ROM_EffectBlockCount = 0x82,			/* XXX */
-	kHIDUsage_PID_SimultaneousEffectsMax = 0x83,		/* XXX */
-	kHIDUsage_PID_PoolAlignment = 0x84,					/* XXX */
-	kHIDUsage_PID_PoolMoveReport = 0x85,				/* XXX */
-	kHIDUsage_PID_MoveSource = 0x86,					/* XXX */
-	kHIDUsage_PID_MoveDestination = 0x87,				/* XXX */
-	kHIDUsage_PID_MoveLength = 0x88,					/* XXX */
-	kHIDUsage_PID_BlockLoadReport = 0x89,				/* XXX */
-	/* 0x8A Reserved */
-	kHIDUsage_PID_BlockLoadStatus = 0x8B,				/* XXX */
-	kHIDUsage_PID_BlockLoadSuccess = 0x8C,				/* XXX */
-	kHIDUsage_PID_BlockLoadFull = 0x8D,					/* XXX */
-	kHIDUsage_PID_BlockLoadError = 0x8E,				/* XXX */
-	kHIDUsage_PID_BlockHandle = 0x8F,					/* XXX */
-
-	kHIDUsage_PID_BlockFreeReport = 0x90,				/* XXX */
-	kHIDUsage_PID_TypeSpecificBlockHandle = 0x91,		/* XXX */
-	kHIDUsage_PID_StateReport = 0x92,					/* XXX */
-	/* 0x93 Reserved */
-	kHIDUsage_PID_EffectPlaying = 0x94,					/* XXX */
-	kHIDUsage_PID_DeviceControlReport = 0x95,			/* XXX */
-	kHIDUsage_PID_DeviceControl = 0x96,					/* XXX */
-	kHIDUsage_PID_DC_EnableActuators = 0x97,			/* XXX */
-	kHIDUsage_PID_DC_DisableActuators = 0x98,			/* XXX */
-	kHIDUsage_PID_DC_StopAllEffects = 0x99,				/* XXX */
-	kHIDUsage_PID_DC_DeviceReset = 0x9A,				/* XXX */
-	kHIDUsage_PID_DC_DevicePause = 0x9B,				/* XXX */
-	kHIDUsage_PID_DC_DeviceContinue = 0x9C,				/* XXX */
-	/* 0x9d - 0x9E Reserved */
-	kHIDUsage_PID_DevicePaused = 0x9F,					/* XXX */
-
-	kHIDUsage_PID_ActuatorsEnabled = 0xA0,				/* XXX */
-	/* 0xA1 - 0xA3 Reserved */
-	kHIDUsage_PID_SafetySwitch = 0xA4,					/* XXX */
-	kHIDUsage_PID_ActuatorOverrideSwitch = 0xA5,		/* XXX */
-	kHIDUsage_PID_ActuatorPower = 0xA6,					/* XXX */
-	kHIDUsage_PID_StartDelay = 0xA7,					/* XXX */
-	kHIDUsage_PID_ParameterBlockSize = 0xA8,			/* XXX */
-	kHIDUsage_PID_DeviceManagedPool = 0xA9,				/* XXX */
-	kHIDUsage_PID_SharedParameterBlocks = 0xAA,			/* XXX */
-	kHIDUsage_PID_CreateNewEffectReport = 0xAB,			/* XXX */
-	kHIDUsage_PID_RAM_PoolAvailable = 0xAC,				/* XXX */
-	/* 0xAD - 0xFFFF Reserved */
-	kHIDUsage_PID_Reserved = 0xFFFF
-};
-
-/* Digitizer Page (0x0D) */
-/* This section provides detailed descriptions of the usages employed by Digitizer Devices. */
-enum
-{
-	kHIDUsage_Dig_Digitizer	= 0x01,	/* Application Collection */
-	kHIDUsage_Dig_Pen	= 0x02,	/* Application Collection */
-	kHIDUsage_Dig_LightPen	= 0x03,	/* Application Collection */
-	kHIDUsage_Dig_TouchScreen	= 0x04,	/* Application Collection */
-	kHIDUsage_Dig_TouchPad	= 0x05,	/* Application Collection */
-	kHIDUsage_Dig_WhiteBoard	= 0x06,	/* Application Collection */
-	kHIDUsage_Dig_CoordinateMeasuringMachine	= 0x07,	/* Application Collection */
-	kHIDUsage_Dig_3DDigitizer	= 0x08,	/* Application Collection */
-	kHIDUsage_Dig_StereoPlotter	= 0x09,	/* Application Collection */
-	kHIDUsage_Dig_ArticulatedArm	= 0x0A,	/* Application Collection */
-	kHIDUsage_Dig_Armature	= 0x0B,	/* Application Collection */
-	kHIDUsage_Dig_MultiplePointDigitizer	= 0x0C,	/* Application Collection */
-	kHIDUsage_Dig_FreeSpaceWand	= 0x0D,	/* Application Collection */
-	/* 0x0E - 0x1F Reserved */
-	kHIDUsage_Dig_Stylus	= 0x20,	/* Logical Collection */
-	kHIDUsage_Dig_Puck	= 0x21,	/* Logical Collection */
-	kHIDUsage_Dig_Finger	= 0x22,	/* Logical Collection */
-	/* 0x23 - 0x2F Reserved */
-	kHIDUsage_Dig_TipPressure	= 0x30,	/* Dynamic Value */
-	kHIDUsage_Dig_BarrelPressure	= 0x31,	/* Dynamic Value */
-	kHIDUsage_Dig_InRange	= 0x32,	/* Momentary Control */
-	kHIDUsage_Dig_Touch	= 0x33,	/* Momentary Control */
-	kHIDUsage_Dig_Untouch	= 0x34,	/* One-Shot Control */
-	kHIDUsage_Dig_Tap	= 0x35,	/* One-Shot Control */
-	kHIDUsage_Dig_Quality	= 0x36,	/* Dynamic Value */
-	kHIDUsage_Dig_DataValid	= 0x37,	/* Momentary Control */
-	kHIDUsage_Dig_TransducerIndex	= 0x38,	/* Dynamic Value */
-	kHIDUsage_Dig_TabletFunctionKeys	= 0x39,	/* Logical Collection */
-	kHIDUsage_Dig_ProgramChangeKeys	= 0x3A,	/* Logical Collection */
-	kHIDUsage_Dig_BatteryStrength	= 0x3B,	/* Dynamic Value */
-	kHIDUsage_Dig_Invert	= 0x3C,	/* Momentary Control */
-	kHIDUsage_Dig_XTilt	= 0x3D,	/* Dynamic Value */
-	kHIDUsage_Dig_YTilt	= 0x3E,	/* Dynamic Value */
-	kHIDUsage_Dig_Azimuth	= 0x3F,	/* Dynamic Value */
-	kHIDUsage_Dig_Altitude	= 0x40,	/* Dynamic Value */
-	kHIDUsage_Dig_Twist	= 0x41,	/* Dynamic Value */
-	kHIDUsage_Dig_TipSwitch	= 0x42,	/* Momentary Control */
-	kHIDUsage_Dig_SecondaryTipSwitch	= 0x43,	/* Momentary Control */
-	kHIDUsage_Dig_BarrelSwitch	= 0x44,	/* Momentary Control */
-	kHIDUsage_Dig_Eraser	= 0x45,	/* Momentary Control */
-	kHIDUsage_Dig_TabletPick	= 0x46,	/* Momentary Control */
-	/* 0x47 - 0xFFFF Reserved */
-	kHIDUsage_Dig_Reserved = 0xFFFF
-};
-
-/* AlphanumericDisplay Page (0x14) */
-/* The Alphanumeric Display page is intended for use by simple alphanumeric displays that are used on consumer devices. */
-enum
-{
-	kHIDUsage_AD_AlphanumericDisplay	= 0x01,	/* Application Collection */
-	/* 0x02 - 0x1F Reserved */
-	kHIDUsage_AD_DisplayAttributesReport	= 0x20,	/* Logical Collection */
-	kHIDUsage_AD_ASCIICharacterSet	= 0x21,	/* Static Flag */
-	kHIDUsage_AD_DataReadBack	= 0x22,	/* Static Flag */
-	kHIDUsage_AD_FontReadBack	= 0x23,	/* Static Flag */
-	kHIDUsage_AD_DisplayControlReport	= 0x24,	/* Logical Collection */
-	kHIDUsage_AD_ClearDisplay	= 0x25,	/* Dynamic Flag */
-	kHIDUsage_AD_DisplayEnable	= 0x26,	/* Dynamic Flag */
-	kHIDUsage_AD_ScreenSaverDelay	= 0x27,	/* Static Value */
-	kHIDUsage_AD_ScreenSaverEnable	= 0x28,	/* Dynamic Flag */
-	kHIDUsage_AD_VerticalScroll	= 0x29,	/* Static Flag */
-	kHIDUsage_AD_HorizontalScroll	= 0x2A,	/* Static Flag */
-	kHIDUsage_AD_CharacterReport	= 0x2B,	/* Logical Collection */
-	kHIDUsage_AD_DisplayData	= 0x2C,	/* Dynamic Value */
-	kHIDUsage_AD_DisplayStatus	= 0x2D,	/* Logical Collection */
-	kHIDUsage_AD_StatNotReady	= 0x2E,	/* Selector */
-	kHIDUsage_AD_StatReady	= 0x2F,	/* Selector */
-	kHIDUsage_AD_ErrNotaloadablecharacter	= 0x30,	/* Selector */
-	kHIDUsage_AD_ErrFontdatacannotberead	= 0x31,	/* Selector */
-	kHIDUsage_AD_CursorPositionReport	= 0x32,	/* Logical Collection */
-	kHIDUsage_AD_Row	= 0x33,	/* Dynamic Value */
-	kHIDUsage_AD_Column	= 0x34,	/* Dynamic Value */
-	kHIDUsage_AD_Rows	= 0x35,	/* Static Value */
-	kHIDUsage_AD_Columns	= 0x36,	/* Static Value */
-	kHIDUsage_AD_CursorPixelPositioning	= 0x37,	/* Static Flag */
-	kHIDUsage_AD_CursorMode	= 0x38,	/* Dynamic Flag */
-	kHIDUsage_AD_CursorEnable	= 0x39,	/* Dynamic Flag */
-	kHIDUsage_AD_CursorBlink	= 0x3A,	/* Dynamic Flag */
-	kHIDUsage_AD_FontReport	= 0x3B,	/* Logical Collection */
-	kHIDUsage_AD_FontData	= 0x3C,	/* Buffered Byte */
-	kHIDUsage_AD_CharacterWidth	= 0x3D,	/* Static Value */
-	kHIDUsage_AD_CharacterHeight	= 0x3E,	/* Static Value */
-	kHIDUsage_AD_CharacterSpacingHorizontal	= 0x3F,	/* Static Value */
-	kHIDUsage_AD_CharacterSpacingVertical	= 0x40,	/* Static Value */
-	kHIDUsage_AD_UnicodeCharacterSet	= 0x41,	/* Static Flag */
-	/* 0x42 - 0xFFFF Reserved */
-	kHIDUsage_AD_Reserved = 0xFFFF
-};
-
-/* Power Device Page (0x84) */
-/* This section provides detailed descriptions of the usages employed by Power Devices. */
-enum
-{
-	
-	kHIDUsage_PD_Undefined = 0x00,				/* Power Device Undefined Usage */
-	kHIDUsage_PD_iName = 0x01,					/* CL- Power Device Name Index */
-	kHIDUsage_PD_PresentStatus = 0x02,			/* CL- Power Device Present Status */
-	kHIDUsage_PD_ChangedStatus = 0x03,			/* CA- Power Device Changed Status */
-	kHIDUsage_PD_UPS = 0x04,					/* CA- Uninterruptible Power Supply */
-	kHIDUsage_PD_PowerSupply = 0x05,			/* CA- Power Supply */
-	/* Reserved 0x06 - 0x0F */
-	kHIDUsage_PD_BatterySystem = 0x10,			/* CP- Battery System power module */
-	kHIDUsage_PD_BatterySystemID = 0x11,		/* SV IF- Battery System ID */
-	kHIDUsage_PD_Battery = 0x12,				/* CP- Battery */
-	kHIDUsage_PD_BatteryID = 0x13,				/* SV IF- Battery ID */
-	kHIDUsage_PD_Charger = 0x14,				/* CP- Charger */
-	kHIDUsage_PD_ChargerID = 0x15,				/* SV IF- Charger ID */
-	kHIDUsage_PD_PowerConverter = 0x16,			/* CP- Power Converter power module */
-	kHIDUsage_PD_PowerConverterID = 0x17,		/* SV IF- Power Converter ID */
-	kHIDUsage_PD_OutletSystem = 0x18,			/* CP- Outlet System power module */
-	kHIDUsage_PD_OutletSystemID = 0x19,			/* SV IF-Outlet System ID */
-	kHIDUsage_PD_Input = 0x1A,					/* CP- Power Device Input */
-	kHIDUsage_PD_InputID = 0x1B,				/* SV IF- Power Device Input ID */
-	kHIDUsage_PD_Output = 0x1C,					/* CP- Power Device Output */
-	kHIDUsage_PD_OutputID = 0x1D,				/* SV IF- Power Device Output ID */
-	kHIDUsage_PD_Flow = 0x1E,					/* CP- Power Device Flow */
-	kHIDUsage_PD_FlowID = 0x1F,					/* Item IF- Power Device Flow ID */
-	kHIDUsage_PD_Outlet = 0x20,					/* CP- Power Device Outlet */
-	kHIDUsage_PD_OutletID = 0x21,				/* SV IF- Power Device Outlet ID */
-	kHIDUsage_PD_Gang = 0x22,					/* CL/CP- Power Device Gang */
-	kHIDUsage_PD_GangID = 0x23,					/* SV IF- Power Device Gang ID */
-	kHIDUsage_PD_PowerSummary = 0x24,			/* CL/CP- Power Device Power Summary */
-	kHIDUsage_PD_PowerSummaryID = 0x25,			/* SV IF- Power Device Power Summary ID */
-	/* Reserved 0x26 - 0x2F */
-	kHIDUsage_PD_Voltage = 0x30,				/* DV IF- Power Device Voltage */
-	kHIDUsage_PD_Current = 0x31,				/* DV IF- Power Device Current */
-	kHIDUsage_PD_Frequency = 0x32,				/* DV IF- Power Device Frequency */
-	kHIDUsage_PD_ApparentPower = 0x33,			/* DV IF- Power Device Apparent Power */
-	kHIDUsage_PD_ActivePower = 0x34,			/* DV IF- Power Device RMS Power */
-	kHIDUsage_PD_PercentLoad = 0x35,			/* DV IF- Power Device Percent Load */
-	kHIDUsage_PD_Temperature = 0x36,			/* DV IF- Power Device Temperature */
-	kHIDUsage_PD_Humidity = 0x37,				/* DV IF- Power Device Humidity */
-	kHIDUsage_PD_BadCount = 0x38,				/* DV IF- Power Device Bad Condition Count */
-	/* Reserved 0x39 - 0x3F */
-	kHIDUsage_PD_ConfigVoltage = 0x40,			/* SV/DV F- Power Device Nominal Voltage */
-	kHIDUsage_PD_ConfigCurrent = 0x41,			/* SV/DV F- Power Device Nominal Current */
-	kHIDUsage_PD_ConfigFrequency = 0x42,		/* SV/DV F- Power Device Nominal Frequency */
-	kHIDUsage_PD_ConfigApparentPower = 0x43,	/* SV/DV F- Power Device Nominal Apparent Power */
-	kHIDUsage_PD_ConfigActivePower = 0x44,		/* SV/DV F- Power Device Nominal RMS Power */
-	kHIDUsage_PD_ConfigPercentLoad = 0x45,		/* SV/DV F- Power Device Nominal Percent Load */
-	kHIDUsage_PD_ConfigTemperature = 0x46,		/* SV/DV F- Power Device Nominal Temperature */
-	kHIDUsage_PD_ConfigHumidity = 0x47,			/* SV/DV F- Power Device Nominal Humidity */
-	/* Reserved 0x48 - 0x4F */
-	kHIDUsage_PD_SwitchOnControl = 0x50,		/* DV F- Power Device Switch On Control */
-	kHIDUsage_PD_SwitchOffControl = 0x51,		/* DV F- Power Device Switch Off Control */
-	kHIDUsage_PD_ToggleControl = 0x52,			/* DV F- Power Device Toogle Sequence Control */
-	kHIDUsage_PD_LowVoltageTransfer = 0x53,		/* DV F- Power Device Min Transfer Voltage */
-	kHIDUsage_PD_HighVoltageTransfer = 0x54,	/* DV F- Power Device Max Transfer Voltage */
-	kHIDUsage_PD_DelayBeforeReboot = 0x55,		/* DV F- Power Device Delay Before Reboot */
-	kHIDUsage_PD_DelayBeforeStartup = 0x56,		/* DV F- Power Device Delay Before Startup */
-	kHIDUsage_PD_DelayBeforeShutdown = 0x57,	/* DV F- Power Device Delay Before Shutdown */
-	kHIDUsage_PD_Test = 0x58,					/* DV F- Power Device Test Request/Result */
-	kHIDUsage_PD_ModuleReset = 0x59,			/* DV F- Power Device Reset Request/Result */
-	kHIDUsage_PD_AudibleAlarmControl = 0x5A,	/* DV F- Power Device Audible Alarm Control */
-	/* Reserved 0x5B - 0x5F */
-	kHIDUsage_PD_Present = 0x60,				/* DV IOF- Power Device Present */
-	kHIDUsage_PD_Good = 0x61,					/* DV IOF- Power Device Good */
-	kHIDUsage_PD_InternalFailure = 0x62,		/* DV IOF- Power Device Internal Failure */
-	kHIDUsage_PD_VoltageOutOfRange = 0x63,		/* DV IOF- Power Device Voltage Out Of Range */
-	kHIDUsage_PD_FrequencyOutOfRange = 0x64,	/* DV IOF- Power Device Frequency Out Of Range */
-	kHIDUsage_PD_Overload = 0x65,				/* DV IOF- Power Device Overload */
-	kHIDUsage_PD_OverCharged = 0x66,			/* DV IOF- Power Device Over Charged */
-	kHIDUsage_PD_OverTemperature = 0x67,		/* DV IOF- Power Device Over Temperature */
-	kHIDUsage_PD_ShutdownRequested = 0x68,		/* DV IOF- Power Device Shutdown Requested */
-	kHIDUsage_PD_ShutdownImminent = 0x69,		/* DV IOF- Power Device Shutdown Imminent */
-	/* Reserved 0x6A */
-	kHIDUsage_PD_SwitchOnOff = 0x6B,			/* DV IOF- Power Device On/Off Switch Status */
-	kHIDUsage_PD_Switchable = 0x6C,				/* DV IOF- Power Device Switchable */
-	kHIDUsage_PD_Used = 0x6D,					/* DV IOF- Power Device Used */
-	kHIDUsage_PD_Boost = 0x6E,					/* DV IOF- Power Device Boosted */
-	kHIDUsage_PD_Buck = 0x6F,					/* DV IOF- Power Device Bucked */
-	kHIDUsage_PD_Initialized = 0x70,			/* DV IOF- Power Device Initialized */
-	kHIDUsage_PD_Tested = 0x71,					/* DV IOF- Power Device Tested */
-	kHIDUsage_PD_AwaitingPower = 0x72,			/* DV IOF- Power Device Awaiting Power */
-	kHIDUsage_PD_CommunicationLost = 0x73,		/* DV IOF- Power Device Communication Lost */
-	/* Reserved 0x74 - 0xFC */
-	kHIDUsage_PD_iManufacturer = 0xFD,			/* SV F- Power Device Manufacturer String Index */
-	kHIDUsage_PD_iProduct = 0xFE,				/* SV F- Power Device Product String Index */
-	kHIDUsage_PD_iserialNumber = 0xFF			/* SV F- Power Device Serial Number String Index */
-};
-
-/* Battery System Page (x85) */
-/* This section provides detailed descriptions of the usages employed by Battery Systems. */	
-enum
-{
-	kHIDUsage_BS_Undefined = 0x00,				/* Battery System Undefined */
-	kHIDUsage_BS_SMBBatteryMode = 0x01,			/* CL - SMB Mode */
-	kHIDUsage_BS_SMBBatteryStatus = 0x02,		/* CL - SMB Status */
-	kHIDUsage_BS_SMBAlarmWarning = 0x03,		/* CL - SMB Alarm Warning */
-	kHIDUsage_BS_SMBChargerMode = 0x04,			/* CL - SMB Charger Mode */
-	kHIDUsage_BS_SMBChargerStatus = 0x05,		/* CL - SMB Charger Status */
-	kHIDUsage_BS_SMBChargerSpecInfo = 0x06,		/* CL - SMB Charger Extended Status */
-	kHIDUsage_BS_SMBSelectorState = 0x07,		/* CL - SMB Selector State */
-	kHIDUsage_BS_SMBSelectorPresets = 0x08,		/* CL - SMB Selector Presets */
-	kHIDUsage_BS_SMBSelectorInfo = 0x09,		/* CL - SMB Selector Info */
-	/* Reserved 0x0A - 0x0F */
-	kHIDUsage_BS_OptionalMfgFunction1 = 0x10,	/* DV F - Battery System Optional SMB Mfg Function 1 */
-	kHIDUsage_BS_OptionalMfgFunction2 = 0x11,	/* DV F - Battery System Optional SMB Mfg Function 2 */
-	kHIDUsage_BS_OptionalMfgFunction3 = 0x12,	/* DV F - Battery System Optional SMB Mfg Function 3 */
-	kHIDUsage_BS_OptionalMfgFunction4 = 0x13,	/* DV F - Battery System Optional SMB Mfg Function 4 */
-	kHIDUsage_BS_OptionalMfgFunction5 = 0x14,	/* DV F - Battery System Optional SMB Mfg Function 5 */
-	kHIDUsage_BS_ConnectionToSMBus = 0x15,		/* DF F - Battery System Connection To System Management Bus */
-	kHIDUsage_BS_OutputConnection = 0x16,		/* DF F - Battery System Output Connection Status */
-	kHIDUsage_BS_ChargerConnection = 0x17,		/* DF F - Battery System Charger Connection */
-	kHIDUsage_BS_BatteryInsertion = 0x18,		/* DF F - Battery System Battery Insertion */
-	kHIDUsage_BS_Usenext = 0x19,				/* DF F - Battery System Use Next */
-	kHIDUsage_BS_OKToUse = 0x1A,				/* DF F - Battery System OK To Use */
-	kHIDUsage_BS_BatterySupported = 0x1B,		/* DF F - Battery System Battery Supported */
-	kHIDUsage_BS_SelectorRevision = 0x1C,		/* DF F - Battery System Selector Revision */
-	kHIDUsage_BS_ChargingIndicator = 0x1D,		/* DF F - Battery System Charging Indicator */
-	/* Reserved 0x1E - 0x27 */
-	kHIDUsage_BS_ManufacturerAccess = 0x28,		/* DV F - Battery System Manufacturer Access */
-	kHIDUsage_BS_RemainingCapacityLimit = 0x29,	/* DV F - Battery System Remaining Capacity Limit */
-	kHIDUsage_BS_RemainingTimeLimit = 0x2A,		/* DV F - Battery System Remaining Time Limit */
-	kHIDUsage_BS_AtRate = 0x2B,					/* DV F - Battery System At Rate... */
-	kHIDUsage_BS_CapacityMode = 0x2C,			/* DV F - Battery System Capacity Mode */
-	kHIDUsage_BS_BroadcastToCharger = 0x2D,		/* DV F - Battery System Broadcast To Charger */
-	kHIDUsage_BS_PrimaryBattery = 0x2E,			/* DV F - Battery System Primary Battery */
-	kHIDUsage_BS_ChargeController = 0x2F,		/* DV F - Battery System Charge Controller */
-	/* Reserved 0x30 - 0x3F */
-	kHIDUsage_BS_TerminateCharge = 0x40,		/* DF IOF - Battery System Terminate Charge */
-	kHIDUsage_BS_TerminateDischarge = 0x41,		/* DF IOF - Battery System Terminate Discharge */
-	kHIDUsage_BS_BelowRemainingCapacityLimit = 0x42, /* DF IOF - Battery System Below Remaining Capacity Limit */
-	kHIDUsage_BS_RemainingTimeLimitExpired = 0x43, /* DF IOF - Battery System Remaining Time Limit Expired */
-	kHIDUsage_BS_Charging = 0x44,				/* DF IOF - Battery System Charging */
-	kHIDUsage_BS_Discharging = 0x45,			/* DV IOF - Battery System Discharging */
-	kHIDUsage_BS_FullyCharged = 0x46,			/* DF IOF - Battery System Fully Charged */
-	kHIDUsage_BS_FullyDischarged = 0x47,		/* DV IOF - Battery System Fully Discharged */
-	kHIDUsage_BS_ConditioningFlag = 0x48,		/* DV IOF - Battery System Conditioning Flag */
-	kHIDUsage_BS_AtRateOK = 0x49,				/* DV IOF - Battery System At Rate OK */
-	kHIDUsage_BS_SMBErrorCode = 0x4A,			/* DF IOF - Battery System SMB Error Code */
-	kHIDUsage_BS_NeedReplacement = 0x4B,		/* DF IOF - Battery System Need Replacement */
-	/* Reserved 0x4C - 0x5F */
-	kHIDUsage_BS_AtRateTimeToFull = 0x60,		/* DV IF - Battery System At Rate Time To Full */
-	kHIDUsage_BS_AtRateTimeToEmpty = 0x61,		/* DV IF - Battery System At Rate Time To Empty */
-	kHIDUsage_BS_AverageCurrent = 0x62,			/* DV IF - Battery System Average Current */
-	kHIDUsage_BS_Maxerror = 0x63,				/* DV IF - Battery System Max Error */
-	kHIDUsage_BS_RelativeStateOfCharge = 0x64,	/* DV IF - Battery System Relative State Of Charge */
-	kHIDUsage_BS_AbsoluteStateOfCharge = 0x65,	/* DV IF - Battery System Absolute State Of Charge */
-	kHIDUsage_BS_RemainingCapacity = 0x66,		/* DV IF - Battery System Remaining Capacity */
-	kHIDUsage_BS_FullChargeCapacity = 0x67,		/* DV IF - Battery System Full Charge Capacity */
-	kHIDUsage_BS_RunTimeToEmpty = 0x68,			/* DV IF - Battery System Run Time To Empty */
-	kHIDUsage_BS_AverageTimeToEmpty = 0x69,		/* DV IF - Battery System Average Time To Empty */
-	kHIDUsage_BS_AverageTimeToFull = 0x6A,		/* DV IF - Battery System Average Time To Full */
-	kHIDUsage_BS_CycleCount = 0x6B,				/* DV IF - Battery System Cycle Count */
-	/* Reserved 0x6C - 0x7F */
-	kHIDUsage_BS_BattPackModelLevel = 0x80,		/* SV F - Battery System Batt Pack Model Level */
-	kHIDUsage_BS_InternalChargeController = 0x81, /* SF F - Battery System Internal Charge Controller */
-	kHIDUsage_BS_PrimaryBatterySupport = 0x82,	/* SF F - Battery System Primary Battery Support */
-	kHIDUsage_BS_DesignCapacity = 0x83,			/* SV F - Battery System Design Capacity */
-	kHIDUsage_BS_SpecificationInfo = 0x84,		/* SV F - Battery System Specification Info */
-	kHIDUsage_BS_ManufacturerDate = 0x85,		/* SV F - Battery System Manufacturer Date */
-	kHIDUsage_BS_SerialNumber = 0x86,			/* SV F - Battery System Serial Number */
-	kHIDUsage_BS_iManufacturerName = 0x87,		/* SV F - Battery System Manufacturer Name Index */
-	kHIDUsage_BS_iDevicename = 0x88,			/* SV F - Battery System Device Name Index */
-	kHIDUsage_BS_iDeviceChemistry = 0x89,		/* SV F - Battery System Device Chemistry Index */
-	kHIDUsage_BS_ManufacturerData = 0x8A,		/* SV F - Battery System Manufacturer Data */
-	kHIDUsage_BS_Rechargable = 0x8B,			/* SV F - Battery System Rechargable */
-	kHIDUsage_BS_WarningCapacityLimit = 0x8C,	/* SV F - Battery System Warning Capacity Limit */
-	kHIDUsage_BS_CapacityGranularity1 = 0x8D,	/* SV F - Battery System Capacity Granularity 1 */
-	kHIDUsage_BS_CapacityGranularity2 = 0x8E,	/* SV F - Battery System Capacity Granularity 2 */
-	kHIDUsage_BS_iOEMInformation = 0x8F,		/* SV F - Battery System OEM Information Index */
-	/* Reserved 0x90 - 0xBF */
-	kHIDUsage_BS_InhibitCharge = 0xC0,			/* DF IOF - Battery System Inhibit Charge */
-	kHIDUsage_BS_EnablePolling = 0xC1,			/* DF IOF - Battery System Enable Polling */
-	kHIDUsage_BS_ResetToZero = 0xC2,			/* DF IOF - Battery System Reset To Zero */
-	/* Reserved 0xC3 - 0xCF */
-	kHIDUsage_BS_ACPresent = 0xD0,				/* DF IOF - Battery System AC Present */
-	kHIDUsage_BS_BatteryPresent = 0xD1,			/* DF IOF - Battery System Battery Present */
-	kHIDUsage_BS_PowerFail = 0xD2,				/* DF IOF - Battery System Power Fail */
-	kHIDUsage_BS_AlarmInhibited = 0xD3,			/* DF IOF - Battery System Alarm Inhibited */
-	kHIDUsage_BS_ThermistorUnderRange = 0xD4,	/* DF IOF - Battery System Thermistor Under Range */
-	kHIDUsage_BS_ThermistorHot = 0xD5,			/* DF IOF - Battery System Thermistor Hot */
-	kHIDUsage_BS_ThermistorCold = 0xD6,			/* DF IOF - Battery System Thermistor Cold */
-	kHIDUsage_BS_ThermistorOverRange = 0xD7,	/* DF IOF - Battery System Thermistor Over Range */
-	kHIDUsage_BS_VoltageOutOfRange = 0xD8,		/* DF IOF - Battery System Voltage Out Of Range */
-	kHIDUsage_BS_CurrentOutOfRange = 0xD9,		/* DF IOF - Battery System Current Out Of Range */
-	kHIDUsage_BS_CurrentNotRegulated = 0xDA,	/* DF IOF - Battery System Current Not Regulated */
-	kHIDUsage_BS_VoltageNotRegulated = 0xDB,	/* DF IOF - Battery System Voltage Not Regulated */
-	kHIDUsage_BS_MasterMode = 0xDC,				/* DF IOF - Battery System Master Mode */
-	/* Reserved 0xDD - 0xEF */
-	kHIDUsage_BS_ChargerSelectorSupport = 0xF0,	/* SF F- Battery System Charger Support Selector */
-	kHIDUsage_BS_ChargerSpec = 0xF1,			/* SF F- Battery System Charger Specification */
-	kHIDUsage_BS_Level2 = 0xF2,					/* SF F- Battery System Charger Level 2 */
-	kHIDUsage_BS_Level3 = 0xF3					/* SF F- Battery System Charger Level 3 */
-	/* Reserved 0xF2 - 0xFF */
-};
-
-/* Bar Code Scanner Page (0x8C) */
-/* This section provides detailed descriptions of the usages employed by Bar Code Scanner Devices. */
-enum
-{
-    kHIDUsage_BCS_Undefined = 0x00,                     /* Bar Code Scanner Undefined Usage */
-    kHIDUsage_BCS_BadgeReader = 0x01,                   /* CA - Bar Code Badge Reader */
-    kHIDUsage_BCS_BarCodeScanner = 0x02,                /* CA -Bar Code Scanner */
-    kHIDUsage_BCS_DumbBarCodeScanner = 0x03,            /* CA -Dumb Bar Code Scanner  Usage */
-    kHIDUsage_BCS_CordlessScannerBase = 0x04,           /* CA -Cordless Base Usage */
-    kHIDUsage_BCS_BarCodeScannerCradle = 0x05,          /* CA -Bar Code Scanner Cradle Usage */
-    /* Reserved 0x06 - 0x0F */
-    kHIDUsage_BCS_AttributeReport = 0x10,               /* CL - Attribute Report */
-    kHIDUsage_BCS_SettingsReport = 0x11,                /* CL - Settings Report */
-    kHIDUsage_BCS_ScannedDataReport = 0x12,             /* CL - Scanned Data Report */
-    kHIDUsage_BCS_RawScannedDataReport = 0x13,          /* CL - Raw Scanned Data Report */
-    kHIDUsage_BCS_TriggerReport = 0x14,                 /* CL - Trigger Report */
-    kHIDUsage_BCS_StatusReport = 0x15,                  /* CL - Status Report */
-    kHIDUsage_BCS_UPC_EANControlReport = 0x16,          /* CL - UPC/EAN Control Report */
-    kHIDUsage_BCS_EAN2_3LabelControlReport = 0x17,      /* CL - EAN 2/3 Label Control Report */
-    kHIDUsage_BCS_Code39ControlReport = 0x18,           /* CL - Code 39 Control Report */
-    kHIDUsage_BCS_Interleaved2of5ControlReport = 0x19,  /* CL - Interleaved 2 of 5 Control Report */
-    kHIDUsage_BCS_Standard2of5ControlReport = 0x1A,     /* CL - Standard 2 of 5 Control Report */
-    kHIDUsage_BCS_MSIPlesseyControlReport = 0x1B,       /* CL - MSI Plessey Control Report */
-    kHIDUsage_BCS_CodabarControlReport = 0x1C,          /* CL - Codabar Control Report */
-    kHIDUsage_BCS_Code128ControlReport = 0x1D,          /* CL - Code 128 Control Report */
-    kHIDUsage_BCS_Misc1DControlReport = 0x1E,           /* CL - Misc 1D Control Report */
-    kHIDUsage_BCS_2DControlReport = 0x1F,               /* CL - 2D Control Report */
-    /* Reserved 0x20 - 0x2F */
-    kHIDUsage_BCS_Aiming_PointerMide = 0x30,            /* SF - Aiming Pointer Mode */
-    kHIDUsage_BCS_BarCodePresentSensor = 0x31,          /* SF - Bar Code Present Sensor */
-    kHIDUsage_BCS_Class1ALaser = 0x32,                  /* SF - Class 1A Laser */
-    kHIDUsage_BCS_Class2Laser = 0x33,                   /* SF - Class 2 Laser */
-    kHIDUsage_BCS_HeaterPresent = 0x34,                 /* SF - Heater Present */
-    kHIDUsage_BCS_ContactScanner = 0x35,                /* SF - Contact Scanner */
-    kHIDUsage_BCS_ElectronicArticleSurveillanceNotification = 0x36, /* SF - Electronic Article Surveillance Notification */
-    kHIDUsage_BCS_ConstantElectronicArticleSurveillance = 0x37, /* SF - Constant Electronic Article Surveillance */
-    kHIDUsage_BCS_ErrorIndication = 0x38,               /* SF - Error Indication */
-    kHIDUsage_BCS_FixedBeeper = 0x39,                   /* SF - Fixed Beeper */
-    kHIDUsage_BCS_GoodDecodeIndication = 0x3A,          /* SF - Good Decode Indication */
-    kHIDUsage_BCS_HandsFreeScanning = 0x3B,             /* SF - Hands Free Scanning */
-    kHIDUsage_BCS_IntrinsicallySafe = 0x3C,             /* SF - Intrinsically Safe */
-    kHIDUsage_BCS_KlasseEinsLaser = 0x3D,               /* SF - Klasse Eins Laser */
-    kHIDUsage_BCS_LongRangeScanner = 0x3E,              /* SF - Long Range Scanner */
-    kHIDUsage_BCS_MirrorSpeedControl = 0x3F,            /* SF - Mirror Speed Control */
-    kHIDUsage_BCS_NotOnFileIndication = 0x40,           /* SF - Not On File Indication */
-    kHIDUsage_BCS_ProgrammableBeeper = 0x41,            /* SF - Programmable Beeper */
-    kHIDUsage_BCS_Triggerless = 0x42,                   /* SF - Triggerless */
-    kHIDUsage_BCS_Wand = 0x43,                          /* SF - Wand */
-    kHIDUsage_BCS_WaterResistant = 0x44,                /* SF - Water Resistant */
-    kHIDUsage_BCS_MultiRangeScanner = 0x45,             /* SF - Multi-Range Scanner */
-    kHIDUsage_BCS_ProximitySensor = 0x46,               /* SF - Proximity Sensor */
-    /* Reserved 0x47 - 0x4C */
-    kHIDUsage_BCS_FragmentDecoding = 0x4D,              /* DF - Fragment Decoding */
-    kHIDUsage_BCS_ScannerReadConfidence = 0x4E,         /* DV - Scanner Read Confidence */
-    kHIDUsage_BCS_DataPrefix = 0x4F,                    /* NAry - Data Prefix  */
-    kHIDUsage_BCS_PrefixAIMI = 0x50,                    /* SEL - Prefix AIMI */
-    kHIDUsage_BCS_PrefixNone = 0x51,                    /* SEL - Prefix None */
-    kHIDUsage_BCS_PrefixProprietary = 0x52,             /* SEL - Prefix Proprietary */
-    /* Reserved 0x53 - 0x54 */
-    kHIDUsage_BCS_ActiveTime = 0x55,                    /* DV - Active Time */
-    kHIDUsage_BCS_AimingLaserPattern = 0x56,            /* DF - Aiming Laser Pattern */
-    kHIDUsage_BCS_BarCodePresent = 0x57,                /* OOC - Bar Code Present */
-    kHIDUsage_BCS_BeeperState = 0x58,                   /* OOC - Beeper State */
-    kHIDUsage_BCS_LaserOnTime = 0x59,                   /* DV - Laser On Time */
-    kHIDUsage_BCS_LaserState = 0x5A,                    /* OOC - Laser State */
-    kHIDUsage_BCS_LockoutTime = 0x5B,                   /* DV - Lockout Time */
-    kHIDUsage_BCS_MotorState = 0x5C,                    /* OOC - Motor State */
-    kHIDUsage_BCS_MotorTimeout = 0x5D,                  /* DV - Motor Timeout */
-    kHIDUsage_BCS_PowerOnResetScanner = 0x5E,           /* DF - Power On Reset Scanner */
-    kHIDUsage_BCS_PreventReadOfBarcodes = 0x5F,         /* DF - Prevent Read of Barcodes */
-    kHIDUsage_BCS_InitiateBarcodeRead = 0x60,           /* DF - Initiate Barcode Read */
-    kHIDUsage_BCS_TriggerState = 0x61,                  /* DF - Trigger State */
-    kHIDUsage_BCS_TriggerMode = 0x62,                   /* NAry - Trigger Mode */
-    kHIDUsage_BCS_TriggerModeBlinkingLaserOn = 0x63,    /* SEL - Trigger Mode Blinking Laser On */
-    kHIDUsage_BCS_TriggerModeContinuousLaserOn = 0x64,  /* SEL - Trigger Mode Continuous Laser On */
-    kHIDUsage_BCS_TriggerModeLaserOnWhilePulled = 0x65, /* SEL - Trigger Mode Laser on while Pulled */
-    kHIDUsage_BCS_TriggerModeLaserStaysOnAfterTriggerRelease = 0x66, /* SEL - Trigger Mode Laser stays on after Trigger Release */
-    /* Reserved 0x67 - 0x6C */
-    kHIDUsage_BCS_CommitParametersToNVM = 0x6D,         /* DF - Commit Parameters to NVM */
-    kHIDUsage_BCS_ParameterScanning = 0x6E,             /* DF - Parameter Scanning */
-    kHIDUsage_BCS_ParametersChanged = 0x6F,             /* OOC - Parameters Changed */
-    kHIDUsage_BCS_SetParameterDefaultValues = 0x70,     /* DF - Set parameter default values */
-    /* Reserved 0x71 - 0x74 */
-    kHIDUsage_BCS_ScannerInCradle = 0x75,               /* OOC - Scanner In Cradle */
-    kHIDUsage_BCS_ScannerInRange = 0x76,                /* OOC - Scanner In Range */
-    /* Reserved 0x77 - 0x79 */
-    kHIDUsage_BCS_AimDuration = 0x7A,                   /* DV - Aim Duration */
-    kHIDUsage_BCS_GoodReadLampDuration = 0x7B,          /* DV - Good Read Lamp Duration */
-    kHIDUsage_BCS_GoodReadLampIntensity = 0x7C,         /* DV - Good Read Lamp Intensity */
-    kHIDUsage_BCS_GoodReadLED = 0x7D,                   /* DF - Good Read LED */
-    kHIDUsage_BCS_GoodReadToneFrequency = 0x7E,         /* DV - Good Read Tone Frequency*/
-    kHIDUsage_BCS_GoodReadToneLength = 0x7F,            /* DV - Good Read Tone Length */
-    kHIDUsage_BCS_GoodReadToneVolume = 0x80,            /* DV - Good Read Tone Volume */
-    /* Reserved 0x81 */
-    kHIDUsage_BCS_NoReadMessage = 0x82,                 /* DF - No Read Message */
-    kHIDUsage_BCS_NotOnFileVolume = 0x83,               /* DV - Not on File Volume */
-    kHIDUsage_BCS_PowerupBeep = 0x84,                   /* DF - Powerup Beep */
-    kHIDUsage_BCS_SoundErrorBeep = 0x85,               /* DF - Sound Error Beep */
-    kHIDUsage_BCS_SoundGoodReadBeep = 0x86,             /* DF - Sound Good Read Beep */
-    kHIDUsage_BCS_SoundNotOnFileBeep = 0x87,            /* DF - Sound Not On File Beep */
-    kHIDUsage_BCS_GoodReadWhenToWrite = 0x88,           /* NArry - Good Read When to Write */
-    kHIDUsage_BCS_GRWTIAfterDecode = 0x89,              /* SEL - GRWTI After Decode */
-    kHIDUsage_BCS_GRWTIBeep_LampAfterTransmit = 0x8A,   /* SEL - GRWTI Beep/Lamp after transmit */
-    kHIDUsage_BCS_GRWTINoBeep_LampUseAtAll = 0x8B,      /* SEL - GRWTI No Beep/Lamp at all */
-    /* Reserved 0x8C - 0x90 */
-    kHIDUsage_BCS_BooklandEAN = 0x91,                   /* DF - Bookland EAN */
-    kHIDUsage_BCS_ConvertEAN8To13Type = 0x92,           /* DF - Convert EAN 8 to 13 Type */
-    kHIDUsage_BCS_ConvertUPCAToEAN_13 = 0x93,           /* DF - Convert UPC A to EAN-13 */
-    kHIDUsage_BCS_ConvertUPC_EToA = 0x94,               /* DF - Convert UPC-E to A */
-    kHIDUsage_BCS_EAN_13 = 0x95,                        /* DF - EAN-13 */
-    kHIDUsage_BCS_EAN_8 = 0x96,                         /* DF - EAN_8 */
-    kHIDUsage_BCS_EAN_99_128_Mandatory  = 0x97,         /* DF - EAN-99 128_Mandatory  */
-    kHIDUsage_BCS_EAN_99_P5_128_Optional = 0x98,        /* DF - EAN-99 P5/128_Optional */
-    /* Reserved 0x99 */
-    kHIDUsage_BCS_UPC_EAN = 0x9A,                       /* DF - UPC/EAN */
-    kHIDUsage_BCS_UPC_EANCouponCode = 0x9B,             /* DF - UPC/EAN Coupon Code */
-    kHIDUsage_BCS_UPC_EANPeriodicals = 0x9C,            /* DV - UPC/EAN Periodicals */
-    kHIDUsage_BCS_UPC_A = 0x9D,                         /* DF - UPC-A */
-    kHIDUsage_BCS_UPC_AWith128Mandatory = 0x9E,         /* DF - UPC-A with 128 Mandatory */
-    kHIDUsage_BCS_UPC_AWith128Optical = 0x9F,           /* DF - UPC-A with 128 Optical */
-    kHIDUsage_BCS_UPC_AWithP5Optional = 0xA0,           /* DF - UPC-A with P5 Optional */
-    kHIDUsage_BCS_UPC_E = 0xA1,                         /* DF - UPC-E */
-    kHIDUsage_BCS_UPC_E1 = 0xA2,                        /* DF - UPC-E1 */
-    /* Reserved 0xA3 - 0xA8 */
-    kHIDUsage_BCS_Periodical = 0xA9,                    /* NArry - Periodical */
-    kHIDUsage_BCS_PeriodicalAutoDiscriminatePlus2 = 0xAA,/* SEL - Periodical Auto-Discriminate + 2 */
-    kHIDUsage_BCS_PeriodicalOnlyDecodeWithPlus2 = 0xAB, /* SEL - Periodical Only Decode with + 2 */
-    kHIDUsage_BCS_PeriodicalIgnorePlus2 = 0xAC,         /* SEL - Periodical Ignore + 2 */
-    kHIDUsage_BCS_PeriodicalAutoDiscriminatePlus5 = 0xAD,/* SEL - Periodical Auto-Discriminate + 5 */
-    kHIDUsage_BCS_PeriodicalOnlyDecodeWithPlus5 = 0xAE, /* SEL - Periodical Only Decode with + 5 */
-    kHIDUsage_BCS_PeriodicalIgnorePlus5 = 0xAF,         /* SEL - Periodical Ignore + 5 */
-    kHIDUsage_BCS_Check = 0xB0,                         /* NArry - Check */
-    kHIDUsage_BCS_CheckDisablePrice = 0xB1,             /* SEL - Check Disable Price */
-    kHIDUsage_BCS_CheckEnable4DigitPrice = 0xB2,        /* SEL - Check Enable 4 digit Price */
-    kHIDUsage_BCS_CheckEnable5DigitPrice = 0xB3,        /* SEL - Check Enable 5 digit Price */
-    kHIDUsage_BCS_CheckEnableEuropean4DigitPrice = 0xB4,/* SEL - Check Enable European 4 digit Price */
-    kHIDUsage_BCS_CheckEnableEuropean5DigitPrice = 0xB5,/* SEL - Check Enable European 5 digit Price */
-    /* Reserved 0xB6 */
-    kHIDUsage_BCS_EANTwoLabel = 0xB7,                   /* DF - EAN Two Label  */
-    kHIDUsage_BCS_EANThreeLabel  = 0xB8,                /* DF - EAN Thread Label */
-    kHIDUsage_BCS_EAN8FlagDigit1 = 0xB9,                /* DV - EAN 8 Flag Digit 1 */
-    kHIDUsage_BCS_EAN8FlagDigit2 = 0xBA,                /* DV - EAN 8 Flag Digit 2 */
-    kHIDUsage_BCS_EAN8FlagDigit3 = 0xBB,                /* DV - EAN 8 Flag Digit 3 */
-    kHIDUsage_BCS_EAN13FlagDigit1 = 0xBC,               /* DV - EAN 13 Flag Digit 1 */
-    kHIDUsage_BCS_EAN13FlagDigit2 = 0xBD,               /* DV - EAN 13 Flag Digit 2 */
-    kHIDUsage_BCS_EAN13FlagDigit3 = 0xBE,               /* DV - EAN 13 Flag Digit 3 */
-    kHIDUsage_BCS_AddEAN2_3LabelDefinition = 0xBF,      /* DF - Add EAN 2/3 Label Definition */
-    kHIDUsage_BCS_ClearAllEAN2_3LabelDefinitions = 0xC0,/* DF - Clear all EAN 2/3 Label Definitions */
-    /* Reserved 0xC1 - 0xC2 */
-    kHIDUsage_BCS_Codabar = 0xC3,                       /* DF - Codabar */
-    kHIDUsage_BCS_Code128 = 0xC4,                       /* DF - Code 128 */
-    /* Reserved 0xC5 - 0xC6 */
-    kHIDUsage_BCS_Code39 = 0xC7,                        /* DF - Code 39 */
-    kHIDUsage_BCS_Code93 = 0xC8,                        /* DF - Code 93 */
-    kHIDUsage_BCS_FullASCIIConversion = 0xC9,           /* DF - Full ASCII Conversion */
-    kHIDUsage_BCS_Interleaved2of5 = 0xCA,               /* DF - Interleaved 2 of 5 */
-    kHIDUsage_BCS_ItalianPharmacyCode = 0xCB,           /* DF - Italian Pharmacy Code */
-    kHIDUsage_BCS_MSI_Plessey = 0xCC,                   /* DF - MSI/Plessey */
-    kHIDUsage_BCS_Standard2of5IATA = 0xCD,              /* DF - Standard 2 of 5 IATA */
-    kHIDUsage_BCS_Standard2of5 = 0xCE,                  /* DF - Standard 2 of 5 */
-    /* Reserved 0xCF - 0xD2 */
-    kHIDUsage_BCS_TransmitStart_Stop = 0xD3,            /* DF - Transmit Start/Stop */
-    kHIDUsage_BCS_TriOptic = 0xD4,                      /* DF - Tri-Optic  */
-    kHIDUsage_BCS_UCC_EAN_128 = 0xD5,                   /* DF - UCC/EAN-128  */
-    kHIDUsage_BCS_CheckDigit = 0xD6,                    /* NArry - Check Digit */
-    kHIDUsage_BCS_CheckDigitDisable = 0xD7,             /* SEL - Check Digit Disable */
-    kHIDUsage_BCS_CheckDigitEnableInterleaved2of5OPCC = 0xD8, /* SEL - Check Digit Enable Interleaved 2 of 5 OPCC */
-    kHIDUsage_BCS_CheckDigitEnableInterleaved2of5USS = 0xD9, /* SEL - Check Digit Enable Interleaved 2 of 5 USS */
-    kHIDUsage_BCS_CheckDigitEnableStandard2of5OPCC = 0xD8, /* SEL - Check Digit Enable Standard 2 of 5 OPCC */
-    kHIDUsage_BCS_CheckDigitEnableStandard2of5USS = 0xD9, /* SEL - Check Digit Enable Standard 2 of 5 USS */
-    kHIDUsage_BCS_CheckDigitEnableOneMSIPlessey = 0xDC, /* SEL - Check Digit Enable One MSI Plessey */
-    kHIDUsage_BCS_CheckDigitEnableTwoMSIPlessey = 0xDD, /* SEL - Check Digit Enable Two MSI Plessey */
-    kHIDUsage_BCS_CheckDigitCodabarEnable = 0xDE,       /* SEL - Check Digit Codabar Enable */
-    kHIDUsage_BCS_CheckDigitCode99Enable = 0xDF,        /* SEL - Check Digit Code 99 Enable */
-    /* Reserved 0xE0 - 0xEF */
-    kHIDUsage_BCS_TransmitCheckDigit = 0xF0,            /* NArry - Transmit Check Digit */
-    kHIDUsage_BCS_DisableCheckDigitTransmit = 0xF1,     /* SEL - Disable Check Digit Transmit */
-    kHIDUsage_BCS_EnableCheckDigitTransmit = 0xF2,      /* SEL - Enable Check Digit Transmit */
-    /* Reserved 0xF3 - 0xFA */
-    kHIDUsage_BCS_SymbologyIdentifier1 = 0xFB,          /* DV - Symbology Identifier 1 */
-    kHIDUsage_BCS_SymbologyIdentifier2 = 0xFC,          /* DV - Symbology Identifier 2 */
-    kHIDUsage_BCS_SymbologyIdentifier3 = 0xFD,          /* DV - Symbology Identifier 3 */
-    kHIDUsage_BCS_DecodedData = 0xFE,                   /* DV - Decoded Data */
-    kHIDUsage_BCS_DecodeDataContinued = 0xFF,           /* DF - Decode Data Continued */
-    kHIDUsage_BCS_BarSpaceData = 0x100,                 /* DV - Bar Space Data */
-    kHIDUsage_BCS_ScannerDataAccuracy = 0x101,          /* DV - Scanner Data Accuracy */
-    kHIDUsage_BCS_RawDataPolarity = 0x102,              /* NArry - Raw Data Polarity */
-    kHIDUsage_BCS_PolarityInvertedBarCode = 0x103,      /* SEL - Polarity Inverted Bar Code */
-    kHIDUsage_BCS_PolarityNormalBarCode = 0x103,        /* SEL - Polarity Normal Bar Code */
-    /* Reserved 0x105 */
-    kHIDUsage_BCS_MinimumLengthToDecode = 0x106,        /* DV - Minimum Length to Decode */
-    kHIDUsage_BCS_MaximumLengthToDecode = 0x107,        /* DV - Maximum Length to Decode */
-    kHIDUsage_BCS_FirstDiscreteLengthToDecode = 0x108,  /* DV - First Discrete Length to Decode */
-    kHIDUsage_BCS_SecondDiscreteLengthToDecode = 0x109, /* DV - Second Discrete Length to Decode */
-    kHIDUsage_BCS_DataLengthMethod = 0x10A,             /* NArry - Data Length Method */
-    kHIDUsage_BCS_DLMethodReadAny = 0x10B,              /* DF - DL Method Read any */
-    kHIDUsage_BCS_DLMethodCheckInRange = 0x10C,         /* DF - DL Method Check in Range */
-    kHIDUsage_BCS_DLMethodCheckForDiscrete = 0x10D,     /* DF - DL Method Check for Discrete */
-    /* Reserved 0x10E - 0x10F */
-    kHIDUsage_BCS_AztecCode = 0x110,                    /* DF - Aztec Code */
-    kHIDUsage_BCS_BC412 = 0x111,                        /* DF - BC412 */
-    kHIDUsage_BCS_ChannelCode = 0x112,                  /* DF - Channel Code */
-    kHIDUsage_BCS_Code16 = 0x113,                       /* DF - Code 16 */
-    kHIDUsage_BCS_Code32 = 0x114,                       /* DF - Code 32 */
-    kHIDUsage_BCS_Code49 = 0x115,                       /* DF - Code 49 */
-    kHIDUsage_BCS_CodeOne = 0x116,                      /* DF - Code One */
-    kHIDUsage_BCS_Colorcode = 0x117,                    /* DF - Colorcode */
-    kHIDUsage_BCS_DataMatrix = 0x118,                   /* DF - Data Matrix */
-    kHIDUsage_BCS_MaxiCode = 0x119,                     /* DF - MaxiCode */
-    kHIDUsage_BCS_MicroPDF = 0x11A,                     /* DF - MicroPDF */
-    kHIDUsage_BCS_PDF_417 = 0x11B,                      /* DF - PDF-417 */
-    kHIDUsage_BCS_PosiCode = 0x11C,                     /* DF - PosiCode */
-    kHIDUsage_BCS_QRCode = 0x11D,                       /* DF - QR Code */
-    kHIDUsage_BCS_SuperCode = 0x11E,                    /* DF - SuperCode */
-    kHIDUsage_BCS_UltraCode = 0x11F,                    /* DF - UltraCode */
-    kHIDUsage_BCS_USB_5_SlugCode = 0x120,               /* DF - USD-5 (Slug Code) */
-    kHIDUsage_BCS_VeriCode = 0x121                      /* DF - VeriCode */
-    /* Reserved 0x122 - 0xFFFF */
-};
-
-/* Weighing Devices Page (0x8D) */
-/* This section provides detailed descriptions of the usages employed by Weighing Devices. */
-enum
-{
-    kHIDUsage_WD_Undefined = 0x00,                      /* Weighing Device Undefined Usage */
-    kHIDUsage_WD_WeighingDevice = 0x01,                 /* CA - Weighing Device */
-    /* Reserved 0x02 - 0x1F */
-    kHIDUsage_WD_ScaleScaleDevice = 0x20,               /* CL - Scale Device */
-    kHIDUsage_WD_ScaleScaleClassIMetricCL = 0x21,       /* CL - Scale Class I Metric */
-    kHIDUsage_WD_ScaleScaleClassIMetric = 0x22,         /* SEL - Scale Class I Metric */
-    kHIDUsage_WD_ScaleScaleClassIIMetric = 0x23,        /* SEL - Scale Class II Metric */
-    kHIDUsage_WD_ScaleScaleClassIIIMetric = 0x24,       /* SEL - Scale Class III Metric */
-    kHIDUsage_WD_ScaleScaleClassIIILMetric = 0x25,      /* SEL - Scale Class IIIL Metric */
-    kHIDUsage_WD_ScaleScaleClassIVMetric = 0x26,        /* SEL - Scale Class IV Metric */
-    kHIDUsage_WD_ScaleScaleClassIIIEnglish = 0x27,      /* SEL - Scale Class III English */
-    kHIDUsage_WD_ScaleScaleClassIIILEnglish = 0x28,     /* SEL - Scale Class IIIL English */
-    kHIDUsage_WD_ScaleScaleClassIVEnglish = 0x29,       /* SEL - Scale Class IV English */
-    kHIDUsage_WD_ScaleScaleClassGeneric = 0x2A,         /* SEL - Scale Class Generic */
-    /* Reserved 0x2B - 0x2F */
-    kHIDUsage_WD_ScaleAtrributeReport = 0x30,           /* CL - Scale Attribute Report */
-    kHIDUsage_WD_ScaleControlReport = 0x31,             /* CL - Scale Control Report */
-    kHIDUsage_WD_ScaleDataReport = 0x32,                /* CL - Scale Data Report */
-    kHIDUsage_WD_ScaleStatusReport = 0x33,              /* CL - Scale Status Report */
-    kHIDUsage_WD_ScaleWeightLimitReport = 0x34,         /* CL - Scale Weight Limit Report */
-    kHIDUsage_WD_ScaleStatisticsReport = 0x35,          /* CL - Scale Statistics Report */
-    /* Reserved 0x36 - 0x3F */
-    kHIDUsage_WD_DataWeight = 0x40,                     /* DV - Data Weight */
-    kHIDUsage_WD_DataScaling = 0x41,                    /* DV - Data Scaling */
-    /* Reserved 0x42 - 0x4F */
-    kHIDUsage_WD_WeightUnit = 0x50,                     /* CL - Weight Unit */
-    kHIDUsage_WD_WeightUnitMilligram = 0x51,            /* SEL - Weight Unit Milligram */
-    kHIDUsage_WD_WeightUnitGram = 0x52,                 /* SEL - Weight Unit Gram */
-    kHIDUsage_WD_WeightUnitKilogram = 0x53,             /* SEL - Weight Unit Kilogram */
-    kHIDUsage_WD_WeightUnitCarats = 0x54,               /* SEL - Weight Unit Carats */
-    kHIDUsage_WD_WeightUnitTaels = 0x55,                /* SEL - Weight Unit Taels */
-    kHIDUsage_WD_WeightUnitGrains = 0x56,               /* SEL - Weight Unit Grains */
-    kHIDUsage_WD_WeightUnitPennyweights = 0x57,         /* SEL - Weight Unit Pennyweights */
-    kHIDUsage_WD_WeightUnitMetricTon = 0x58,            /* SEL - Weight Unit Metric Ton */
-    kHIDUsage_WD_WeightUnitAvoirTon = 0x59,             /* SEL - Weight Unit Avoir Ton */
-    kHIDUsage_WD_WeightUnitTroyOunce = 0x5A,            /* SEL - Weight Unit Troy Ounce */
-    kHIDUsage_WD_WeightUnitOunce = 0x5B,                /* SEL - Weight Unit Ounce */
-    kHIDUsage_WD_WeightUnitPound = 0x5C,                /* SEL - Weight Unit Pound */
-    /* Reserved 0x5D - 0x5F */
-    kHIDUsage_WD_CalibrationCount = 0x60,               /* DV - Calibration Count */
-    kHIDUsage_WD_RezeroCount = 0x61,                    /* DV - Re-Zero Count*/
-    /* Reserved 0x62 - 0x6F */
-    kHIDUsage_WD_ScaleStatus = 0x70,                    /* CL - Scale Status */
-    kHIDUsage_WD_ScaleStatusFault = 0x71,               /* SEL - Scale Status Fault */
-    kHIDUsage_WD_ScaleStatusStableAtZero = 0x72,        /* SEL - Scale Status Stable at Center of  Zero */
-    kHIDUsage_WD_ScaleStatusInMotion = 0x73,            /* SEL - Scale Status In Motion */
-    kHIDUsage_WD_ScaleStatusWeightStable = 0x74,        /* SEL - Scale Status Weight Stable */
-    kHIDUsage_WD_ScaleStatusUnderZero = 0x75,           /* SEL - Scale Status Under Zero */
-    kHIDUsage_WD_ScaleStatusOverWeightLimit = 0x76,     /* SEL - Scale Status Over Weight Limit */
-    kHIDUsage_WD_ScaleStatusRequiresCalibration = 0x77, /* SEL - Scale Status Requires Calibration */
-    kHIDUsage_WD_ScaleStatusRequiresRezeroing = 0x78,   /* SEL - Scale Status Requires Re-zeroing */
-    /* Reserved 0x79 - 0x7F */
-    kHIDUsage_WD_ZeroScale = 0x80,                      /* OOC - Zero Scale */
-    kHIDUsage_WD_EnforcedZeroReturn = 0x81              /* OOC - Enforced Zero Return */
-    /* Reserved 0x82 - 0xFFFF */
-    
-};
-
-/* Magnetic Stripe Reader Page (0x8E) */
-/* This section provides detailed descriptions of the usages employed by Magnetic Stripe Reader Devices. */
-enum 
-{
-    kHIDUsage_MSR_Undefined = 0x00,                     /* MagStripe Undefined Usage */
-    kHIDUsage_MSR_DeviceReadOnly = 0x01,                /* CA - MSR Device Read-Only */
-    /* Reserved 0x02 - 0x10 */
-    kHIDUsage_MSR_Track1Length = 0x11,                     /* SF, DF, SEL - Track 1 Length */
-    kHIDUsage_MSR_Track2Length = 0x12,                     /* SF, DF, SEL - Track 2 Length */
-    kHIDUsage_MSR_Track3Length = 0x13,                     /* SF, DF, SEL - Track 3 Length */
-    kHIDUsage_MSR_TrackJISLength = 0x14,                   /* SF, DF, SEL - Track JIS Length */
-    /* Reserved 0x15 - 0x1F */
-    kHIDUsage_MSR_TrackData = 0x20,                        /* SF, DF, SEL - Track Data */
-    kHIDUsage_MSR_Track1Data = 0x21,                       /* SF, DF, SEL - Track 1 Data */
-    kHIDUsage_MSR_Track2Data = 0x22,                       /* SF, DF, SEL - Track 2 Data */
-    kHIDUsage_MSR_Track3Data = 0x23,                       /* SF, DF, SEL - Track 3 Data */
-    kHIDUsage_MSR_TrackJISData = 0x24                      /* SF, DF, SEL - Track JIS Data */
-    /* Reserved 0x25 - 0xFFFF */
-};
-
-#endif /* _IOHIDUSAGETABLES_H */
diff --git a/i386/include/IOKit/hidevent/IOHIDEventDriver.h b/i386/include/IOKit/hidevent/IOHIDEventDriver.h
deleted file mode 100644
index 9eddb24..0000000
--- a/i386/include/IOKit/hidevent/IOHIDEventDriver.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_HID_IOHIDEVENTDRIVER_H
-#define _IOKIT_HID_IOHIDEVENTDRIVER_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/hidsystem/IOHIDTypes.h>
-#include <IOKit/hid/IOHIDInterface.h>
-#include <IOKit/hidevent/IOHIDEventService.h>
-
-
-/*! @class IOHIDEventDriver : public IOHIDEventService
-    @abstract
-    @discussion
-*/
-struct  IOHIDReportHandler;
-
-class IOHIDEventDriver: public IOHIDEventService
-{
-    OSDeclareDefaultStructors( IOHIDEventDriver )
-
-private:
-    IOHIDInterface *            _interface;
-    IOHIDReportHandler *        _reportHandlers;
-    
-    IOHIDElement *              _ledElements[2];
-    OSArray *                   _supportedElements;
-        
-    UInt32                      _bootSupport;
-    bool                        _multipleReports;
-    bool                        _relativeButtonCollection;
-    UInt32                      _cachedButtonState;
-    bool                        _cachedRangeState;
-    
-    struct ExpansionData { 
-    };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *             _reserved;
-    
-    bool                    findElements ( OSArray * elementArray, UInt32 bootProtocol );
-    
-    bool                    storeReportElement ( IOHIDElement * element );
-
-    void                    handleBootPointingReport (
-                                IOMemoryDescriptor *        report,
-                                SInt32 *                    dX,
-                                SInt32 *                    dY,
-                                UInt32 *                    buttonState);
-    
-    static void             _handleInterruptReport (
-                                OSObject *                  target,
-                                AbsoluteTime                timeStamp,
-                                IOMemoryDescriptor *        report,
-                                IOHIDReportType             reportType,
-                                UInt32                      reportID,
-                                void *                      refcon);
-    
-protected:
-
-    virtual void            free();
-    
-    virtual OSArray *       getReportElements();
-    
-    virtual bool            handleStart( IOService * provider );
-
-    virtual void            handleStop(  IOService * provider );
-    
-    virtual void            handleInterruptReport (
-                                AbsoluteTime                timeStamp,
-                                IOMemoryDescriptor *        report,
-                                IOHIDReportType             reportType,
-                                UInt32                      reportID);
-
-    virtual OSString *      getTransport ();
-
-    virtual UInt32          getLocationID ();
-
-    virtual UInt32          getVendorID ();
-
-    virtual UInt32          getVendorIDSource ();
-
-    virtual UInt32          getProductID ();
-
-    virtual UInt32          getVersion ();
-
-    virtual UInt32          getCountryCode ();
-
-    virtual OSString *      getManufacturer ();
-
-    virtual OSString *      getProduct ();
-
-    virtual OSString *      getSerialNumber ();
-
-    virtual void            setElementValue (
-                                UInt32                      usagePage,
-                                UInt32                      usage,
-                                UInt32                      value );
-    
-    virtual UInt32          getElementValue ( 
-                                UInt32                      usagePage,
-                                UInt32                      usage );
-
-public:
-
-
-    virtual bool            init( OSDictionary * dictionary = 0 );
-
-    virtual bool            didTerminate(
-                                IOService *                 provider,
-                                IOOptionBits                options,
-                                bool *                      defer );
-    
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  0);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  1);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  2);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  3);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  4);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  5);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  6);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  7);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  8);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver,  9);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 10);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 11);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 12);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 13);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 14);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 15);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 16);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 17);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 18);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 19);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 20);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 21);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 22);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 23);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 24);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 25);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 26);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 27);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 28);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 29);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 30);
-    OSMetaClassDeclareReservedUnused(IOHIDEventDriver, 31);
-
-};
-
-#endif /* !_IOKIT_HID_IOHIDEVENTDRIVER_H */
diff --git a/i386/include/IOKit/hidevent/IOHIDEventService.h b/i386/include/IOKit/hidevent/IOHIDEventService.h
deleted file mode 100644
index bc82511..0000000
--- a/i386/include/IOKit/hidevent/IOHIDEventService.h
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2009 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_HID_IOHIDEVENTSERVICE_H
-#define _IOKIT_HID_IOHIDEVENTSERVICE_H
-
-#include <TargetConditionals.h>
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOTimerEventSource.h>
-#include <IOKit/hidsystem/IOHIDTypes.h>
-#include <IOKit/hid/IOHIDInterface.h>
-#include <IOKit/hid/IOHIDElement.h>
-#include <IOKit/hid/IOHIDKeys.h>
-
-#if TARGET_OS_EMBEDDED
-    #include <IOKit/hid/IOHIDEvent.h>
-#endif
-
-enum 
-{
-    kHIDDispatchOptionPointerNoAcceleration            = 0x01,
-    kHIDDispatchOptionPointerAffixToScreen             = 0x02,
-    kHIDDispatchOptionPointerAbsolutToRelative         = 0x04
-};
-
-enum
-{
-    kHIDDispatchOptionScrollNoAcceleration             = 0x01,
-    kHIDDispatchOptionScrollMomentumContinue           = 0x02,
-    kHIDDispatchOptionScrollMomentumStart              = 0x04,
-    kHIDDispatchOptionScrollMomentumEnd                = 0x08,
-
-    kHIDDispatchOptionScrollMomentumAny                = kHIDDispatchOptionScrollMomentumContinue | kHIDDispatchOptionScrollMomentumStart | kHIDDispatchOptionScrollMomentumEnd
-};
-
-enum 
-{
-    kHIDDispatchOptionKeyboardNoRepeat                 = 0x01
-};
-
-/*! @class IOHIDEventService : public IOService
-    @abstract
-    @discussion
-*/
-class   IOHIDPointing;
-class   IOHIDKeyboard;
-class   IOHIDConsumer;
-struct  TransducerData;
-
-class IOHIDEventService: public IOService
-{
-    OSDeclareAbstractStructors( IOHIDEventService )
-    
-    friend class IOHIDPointing;
-    friend class IOHIDKeyboard;
-    friend class IOHIDConsumer;
-    friend class AppleEmbeddedKeyboard;
-    friend class IOHIDEventServiceUserClient;
-
-private:
-    IOHIDKeyboard *         _keyboardNub;
-    IOHIDPointing *         _pointingNub;
-    IOHIDConsumer *         _consumerNub;
-
-    IONotifier *			_publishNotify;
-    IORecursiveLock *       _nubLock;
-    
-    OSArray *               _transducerDataArray;
-    
-    bool                    _readyForInputReports;
-
-
-    struct ExpansionData { 
-		IOService *				provider;
-        IOWorkLoop *            workLoop;
-        UInt32                  ejectDelayMS;
-        IOTimerEventSource 	*   ejectTimerEventSource;
-        UInt32                  ejectState;
-        IOOptionBits            ejectOptions;
-        UInt32                  capsDelayMS;
-        IOTimerEventSource 	*   capsTimerEventSource;
-        UInt32                  capsState;
-        IOOptionBits            capsOptions;
-        OSArray *               deviceUsagePairs;
-        
-#if TARGET_OS_EMBEDDED
-        OSDictionary *          clientDict;
-        UInt32                  debuggerMask;
-        UInt32                  startDebuggerMask;
-        IOTimerEventSource *    debuggerTimerEventSource;
-        bool                    shouldSwapISO;
-#endif
-    };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *         _reserved;
-    
-    IOHIDPointing *         newPointingShim (
-                                UInt32          buttonCount         = 1,
-                                IOFixed         pointerResolution   = (400 << 16),
-                                IOFixed         scrollResolution    = 0,
-                                IOOptionBits    options             = 0 );
-                                
-    IOHIDKeyboard *         newKeyboardShim (
-                                UInt32          supportedModifiers  = 0,
-                                IOOptionBits    options             = 0 );
-
-    IOHIDConsumer *         newConsumerShim ( IOOptionBits options = 0 );
-    
-    void                    parseSupportedElements ( 
-                                OSArray *                   elementArray, 
-                                UInt32                      bootProtocol );
-                                
-    void                    processTabletElement ( IOHIDElement * element );
-
-    void                    processTransducerData ();
-    
-    TransducerData *        createTransducerData ( UInt32 tranducerID );
-    
-    TransducerData *        getTransducerData ( UInt32 tranducerID );
-                                
-    IOFixed                 determineResolution ( IOHIDElement * element );
-                                    
-    static bool 			_publishMatchingNotificationHandler(void * target, void * ref, IOService * newService, IONotifier * notifier);
-
-    void                    ejectTimerCallback(IOTimerEventSource *sender);
-
-    void                    capsTimerCallback(IOTimerEventSource *sender);
-    
-#if TARGET_OS_EMBEDDED
-    void                    debuggerTimerCallback(IOTimerEventSource *sender);
-#endif
-	void					calculateCapsLockDelay();
-    
-    void                    calculateStandardType();
-
-protected:
-
-    virtual void            free();
-        
-/*! @function handleOpen
-    @abstract Handle a client open on the interface.
-    @discussion This method is called by IOService::open() with the
-    arbitration lock held, and must return true to accept the client open.
-    This method will in turn call handleClientOpen() to qualify the client
-    requesting the open.
-    @param client The client object that requested the open.
-    @param options Options passed to IOService::open().
-    @param argument Argument passed to IOService::open().
-    @result true to accept the client open, false otherwise. */
-
-    virtual bool handleOpen(IOService *  client,
-                            IOOptionBits options,
-                            void *       argument);
-
-/*! @function handleClose
-    @abstract Handle a client close on the interface.
-    @discussion This method is called by IOService::close() with the
-    arbitration lock held. This method will in turn call handleClientClose()
-    to notify interested subclasses about the client close. If this represents
-    the last close, then the interface will also close the controller before
-    this method returns. The controllerWillClose() method will be called before
-    closing the controller. Subclasses should not override this method.
-    @param client The client object that requested the close.
-    @param options Options passed to IOService::close(). */
-
-    virtual void handleClose(IOService * client, IOOptionBits options);
-
-/*! @function handleIsOpen
-    @abstract Query whether a client has an open on the interface.
-    @discussion This method is always called by IOService with the
-    arbitration lock held. Subclasses should not override this method.
-    @result true if the specified client, or any client if none (0) is
-    specified, presently has an open on this object. */
-
-    virtual bool handleIsOpen(const IOService * client) const;
-
-/*! @function handleStart
-    @abstract Prepare the hardware and driver to support I/O operations.
-    @discussion IOHIDEventService will call this method from start() before
-    any I/O operations are issued to the concrete subclass. Methods
-    such as getReportElements() are only called after handleStart()
-    has returned true. A subclass that overrides this method should
-    begin its implementation by calling the version in super, and
-    then check the return value.
-    @param provider The provider argument passed to start().
-    @result True on success, or false otherwise. Returning false will
-    cause start() to fail and return false. */
-
-    virtual bool            handleStart( IOService * provider );
-
-/*! @function handleStop
-    @abstract Quiesce the hardware and stop the driver.
-    @discussion IOHIDEventService will call this method from stop() to
-    signal that the hardware should be quiesced and the driver stopped.
-    A subclass that overrides this method should end its implementation
-    by calling the version in super.
-    @param provider The provider argument passed to stop(). */
-
-    virtual void            handleStop(  IOService * provider );
-    
-    virtual OSString *      getTransport ();
-    virtual UInt32          getLocationID ();
-    virtual UInt32          getVendorID ();
-    virtual UInt32          getVendorIDSource ();
-    virtual UInt32          getProductID ();
-    virtual UInt32          getVersion ();
-    virtual UInt32          getCountryCode ();
-    virtual OSString *      getManufacturer ();
-    virtual OSString *      getProduct ();
-    virtual OSString *      getSerialNumber ();
-    
-    virtual OSArray *       getReportElements();
-
-    virtual void            setElementValue (
-                                UInt32                      usagePage,
-                                UInt32                      usage,
-                                UInt32                      value );
-    
-    virtual UInt32          getElementValue ( 
-                                UInt32                      usagePage,
-                                UInt32                      usage );
-                                
-    virtual void            dispatchKeyboardEvent(
-                                AbsoluteTime                timeStamp,
-                                UInt32                      usagePage,
-                                UInt32                      usage,
-                                UInt32                      value,
-                                IOOptionBits                options = 0 );
-
-    virtual void            dispatchRelativePointerEvent(
-                                AbsoluteTime                timeStamp,
-                                SInt32                      dx,
-                                SInt32                      dy,
-                                UInt32                      buttonState,
-                                IOOptionBits                options = 0 );
-    
-    virtual void            dispatchAbsolutePointerEvent(
-                                AbsoluteTime                timeStamp,
-                                SInt32                      x,
-                                SInt32                      y,
-                                IOGBounds *                 bounds,
-                                UInt32                      buttonState,
-                                bool                        inRange,
-                                SInt32                      tipPressure,
-                                SInt32                      tipPressureMin,
-                                SInt32                      tipPressureMax,
-                                IOOptionBits                options = 0 );
-
-    virtual void            dispatchScrollWheelEvent(
-                                AbsoluteTime                timeStamp,
-                                SInt32                      deltaAxis1,
-                                SInt32                      deltaAxis2,
-                                SInt32                      deltaAxis3,
-                                IOOptionBits                options = 0 );
-
-    virtual void            dispatchTabletPointerEvent(
-                                AbsoluteTime                timeStamp,
-                                UInt32                      tranducerID,
-                                SInt32                      x,
-                                SInt32                      y,
-                                SInt32                      z,
-                                IOGBounds *                 bounds,
-                                UInt32                      buttonState,
-                                SInt32                      tipPressure,
-                                SInt32                      tipPressureMin,
-                                SInt32                      tipPressureMax,
-                                SInt32                      barrelPressure,
-                                SInt32                      barrelPressureMin,
-                                SInt32                      barrelPressureMax,
-                                SInt32                      tiltX,
-                                SInt32                      tiltY,
-                                UInt32                      twist,
-                                IOOptionBits                options = 0 );
-
-    virtual void            dispatchTabletProximityEvent(
-                                AbsoluteTime                timeStamp,
-                                UInt32                      tranducerID,
-                                bool                        inRange,
-                                bool                        invert,
-                                UInt32                      vendorTransducerUniqueID        = 0,
-                                UInt32                      vendorTransducerSerialNumber    = 0,
-                                IOOptionBits                options                         = 0 );
-
-public:
-    bool                    readyForReports();
-
-    virtual bool            init(OSDictionary * properties = 0);
-
-    virtual bool            start( IOService * provider );
-    
-    virtual void            stop( IOService * provider );
-
-    virtual bool            matchPropertyTable(OSDictionary * table, SInt32 * score);    
-    
-    virtual IOReturn        setSystemProperties( OSDictionary * properties );
-    
-    virtual IOReturn        setProperties( OSObject * properties );
-    
-protected:
-    OSMetaClassDeclareReservedUsed(IOHIDEventService,  0);
-    virtual OSArray *       getDeviceUsagePairs();
-    
-        
-#if TARGET_OS_EMBEDDED
-public:
-    typedef void (*Action)(OSObject *target, OSObject * sender, void *context, OSObject *event, IOOptionBits options);
-
-    OSMetaClassDeclareReservedUsed(IOHIDEventService,  1);
-    virtual bool            open(
-                                IOService *                 client,
-                                IOOptionBits                options,
-                                void *                      context,
-                                Action                      action);
-                                
-protected:    
-    OSMetaClassDeclareReservedUsed(IOHIDEventService,  2);
-    virtual void            dispatchEvent(IOHIDEvent * event, IOOptionBits options=0);
-
-    OSMetaClassDeclareReservedUsed(IOHIDEventService,  3);
-    virtual UInt32          getPrimaryUsagePage();
-    
-    OSMetaClassDeclareReservedUsed(IOHIDEventService,  4);
-    virtual UInt32          getPrimaryUsage();
-    
-    OSMetaClassDeclareReservedUsed(IOHIDEventService,  5);
-    virtual UInt32          getReportInterval();
-
-public:    
-    OSMetaClassDeclareReservedUsed(IOHIDEventService,  6);
-    virtual IOHIDEvent *    copyEvent(
-                                IOHIDEventType              type, 
-                                IOHIDEvent *                matching = 0,
-                                IOOptionBits                options = 0);
-#else
-    OSMetaClassDeclareReservedUnused(IOHIDEventService,  1);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService,  2);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService,  3);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService,  4);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService,  5);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService,  6);
-#endif    
-    OSMetaClassDeclareReservedUnused(IOHIDEventService,  7);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService,  8);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService,  9);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 10);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 11);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 12);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 13);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 14);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 15);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 16);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 17);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 18);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 19);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 20);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 21);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 22);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 23);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 24);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 25);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 26);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 27);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 28);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 29);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 30);
-    OSMetaClassDeclareReservedUnused(IOHIDEventService, 31);
-
-};
-
-#endif /* !_IOKIT_HID_IOHIDEVENTSERVICE_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIDDescriptorParser.h b/i386/include/IOKit/hidsystem/IOHIDDescriptorParser.h
deleted file mode 100644
index 0a32647..0000000
--- a/i386/include/IOKit/hidsystem/IOHIDDescriptorParser.h
+++ /dev/null
@@ -1,939 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef __IOHIDDescriptorParser__
-#define __IOHIDDescriptorParser__
-
-#include <TargetConditionals.h>
-#include <IOKit/IOTypes.h>
-#include <IOKit/hidsystem/IOHIDUsageTables.h>
-#if !TARGET_OS_EMBEDDED
-    #include <IOKit/ndrvsupport/IOMacOSTypes.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if TARGET_OS_EMBEDDED
-/* Types and enums required by these functions but not in IOTypes.h */
-
-typedef UInt8		Byte;
-typedef SInt8		SignedByte;
-typedef unsigned long	FourCharCode;
-typedef FourCharCode	OSType;
-typedef UInt32		ByteCount;
-
-enum {
-	noErr	= 0
-};
-#endif
-
-/* End missing types and enums */
-
-enum
-{
-	kHIDSuccess						= 0,
-	
-/* HID assigned error numbers are -13949 .. -13900 */
-	kHIDBaseError					= -13950,
-
-	kHIDNullStateErr,
-	kHIDBufferTooSmallErr,
-	kHIDValueOutOfRangeErr,
-	kHIDUsageNotFoundErr,
-	kHIDNotValueArrayErr,
-	kHIDInvalidPreparsedDataErr,
-	kHIDIncompatibleReportErr,
-	kHIDBadLogPhysValuesErr,
-	kHIDInvalidReportTypeErr,
-	kHIDInvalidReportLengthErr,
-	kHIDNullPointerErr,
-	kHIDBadParameterErr,
-	kHIDNotEnoughMemoryErr,
-	kHIDEndOfDescriptorErr,
-	kHIDUsagePageZeroErr,
-	kHIDBadLogicalMinimumErr,
-	kHIDBadLogicalMaximumErr,
-	kHIDInvertedLogicalRangeErr,
-	kHIDInvertedPhysicalRangeErr,
-	kHIDUnmatchedUsageRangeErr,
-	kHIDInvertedUsageRangeErr,
-	kHIDUnmatchedStringRangeErr,
-	kHIDUnmatchedDesignatorRangeErr,
-	kHIDReportSizeZeroErr,
-	kHIDReportCountZeroErr,
-	kHIDReportIDZeroErr,
-	kHIDInvalidRangePageErr,
-
-	// 
-	// HID device driver errors 
-	//
-	
-	kHIDDeviceNotReady 		= -13910, 		// The device is still initializing, try again later
-	kHIDVersionIncompatibleErr,
-};
-
-// types of HID reports (input, output, feature)
-enum
-{
-	kHIDInputReport			= 	1,
-	kHIDOutputReport,
-	kHIDFeatureReport,
-	kHIDUnknownReport		=	255
-};
-
-// flags passed to HIDOpenReportDescriptor
-enum
-{
-	kHIDFlag_StrictErrorChecking = 0x00000001
-};
-
-typedef UInt32	HIDReportType;
-typedef UInt32	HIDUsage;
-
-typedef void *HIDPreparsedDataRef;
-
-/*!
-  @typedef HIDUsageAndPage
-  @abstract The HIDUsageAndPage data structure is used by HID clients when obtaining status of buttons to hold the usage page and usage of a button that is down.
-  @discussion Clients use the HIDUSageAndPage structure with the HIDGetButtonsEx function to obtain both the usage page and usage identifiers of each button that is down.
-  @field usage Specifies the usage identifier within the usage page specified by usagePage of a button that is down.
-  @field usagePage Specifies the usage page identifier of a button that is down.
- */
-struct HIDUsageAndPage
-{
-	HIDUsage	usage;
-	HIDUsage	usagePage;
-};
-typedef struct HIDUsageAndPage HIDUsageAndPage, *HIDUsageAndPagePtr;
-
-/*!
-  @typedef HIDCaps
-  @abstract The HIDCaps data structure is used by HID clients to hold the capabilities of a HID device.
-  @discussion This structure holds the parsed capabilities and data maximums returned for a device by the HIDGetCaps function.
-  @field usage Specifies the specific class of functionality that this device provides.  This value is dependent and specific to the value provided in the usagePage field.  For example, a keyboard could have a usagePage of kHIDUsagePage_Generic and a usage of kHIDUsage_Generic_Keyboard.
-  @field usagePage Specifies the usage page identifier for this top level collection.
-  @field inputReportByteLength Specifies the maximum length, in bytes, of an input report for this device, including the report ID which is unilaterally prepended to the device data.
-  @field outputReportByteLength Specifies the maximum length, in bytes, of an output report for this device, including the report ID which is unilaterally prepended to the device data.
-  @field featureReportByteLength Specifies the maximum length, in bytes, of a feature report for this device, including the report ID which is unilaterally prepended to the device data.
-  @field numberCollectionNodes Specifies the number of HIDCollectionNode structures that are returned for this top level collection by the HIDGetConnectionNodes function.
-  @field numberInputButtonCaps Specifies the number of input buttons.
-  @field numberInputValueCaps Specifies the number of input values.
-  @field numberOutputButtonCaps Specifies the number of output buttons.
-  @field numberOutputValueCaps Specifies the number of output values
-  @field numberFeatureButtonCaps Specifies the number of feature buttons.
-  @field numberFeatureValueCaps Specifies the number of feature values.
- */
-struct HIDCaps
-{
-	HIDUsage	usage;
-	HIDUsage	usagePage;
-	ByteCount	inputReportByteLength;
-	ByteCount	outputReportByteLength;
-	ByteCount	featureReportByteLength;
-	UInt32		numberCollectionNodes;
-	UInt32		numberInputButtonCaps;
-	UInt32		numberInputValueCaps;
-	UInt32		numberOutputButtonCaps;
-	UInt32		numberOutputValueCaps;
-	UInt32		numberFeatureButtonCaps;
-	UInt32		numberFeatureValueCaps;
-};
-typedef struct HIDCaps HIDCaps, * HIDCapsPtr;
-
-struct HIDCapabilities {
-    HIDUsage                        usage;
-    HIDUsage                        usagePage;
-    ByteCount                       inputReportByteLength;
-    ByteCount                       outputReportByteLength;
-    ByteCount                       featureReportByteLength;
-    UInt32                          numberCollectionNodes;
-    UInt32                          numberInputButtonCaps;
-    UInt32                          numberInputValueCaps;
-    UInt32                          numberOutputButtonCaps;
-    UInt32                          numberOutputValueCaps;
-    UInt32                          numberFeatureButtonCaps;
-    UInt32                          numberFeatureValueCaps;
-};
-typedef struct HIDCapabilities HIDCapabilities, * HIDCapabilitiesPtr;
-
-
-struct HIDCollectionNode
-{
-	HIDUsage	collectionUsage;
-	HIDUsage	collectionUsagePage;
-	UInt32		parent;
-	UInt32		numberOfChildren;
-	UInt32		nextSibling;
-	UInt32		firstChild;
-};
-typedef struct HIDCollectionNode HIDCollectionNode, * HIDCollectionNodePtr;
-
-struct HIDButtonCaps
-{
-	HIDUsage	usagePage;
-	UInt32		reportID;
-	UInt32		bitField;
-	UInt32		collection;
-	HIDUsage	collectionUsage;
-	HIDUsage	collectionUsagePage;
-	Boolean		isRange;
-	Boolean		isStringRange;
-	Boolean		isDesignatorRange;
-	Boolean		isAbsolute;
-        SInt32 startBit;	// Added esb 9-29-99
-
-	union
-	{
-		struct
-		{
-			HIDUsage		usageMin;
-			HIDUsage		usageMax;
-			UInt32			stringMin;
-			UInt32			stringMax;
-			UInt32			designatorMin;
-			UInt32			designatorMax;
-		} range;
-		struct
-		{
-			HIDUsage		usage;
-			HIDUsage		reserved1;
-			UInt32			stringIndex;
-			UInt32			reserved2;
-			UInt32			designatorIndex;
-			UInt32			reserved3;
-		} notRange;
-	} u;
-};
-typedef struct HIDButtonCaps HIDButtonCaps, * HIDButtonCapsPtr;
-
-struct HIDButtonCapabilities
-{
-	HIDUsage	usagePage;
-	UInt32		reportID;
-	UInt32		bitField;
-	UInt32		collection;
-	HIDUsage	collectionUsage;
-	HIDUsage	collectionUsagePage;
-	Boolean		isRange;
-	Boolean		isStringRange;
-	Boolean		isDesignatorRange;
-	Boolean		isAbsolute;
-
-    SInt32                          unitExponent;	// Added KH 1/25/01
-    SInt32                          units;			// Added KH 1/25/01
-//    UInt32                          reserved;		// Not added KH 1/25/01
-        SInt32 startBit;	// Added esb 9-29-99
-    UInt32                          pbVersion;		// Added KH 1/25/01
-
-	union
-	{
-		struct
-		{
-			HIDUsage		usageMin;
-			HIDUsage		usageMax;
-			UInt32			stringMin;
-			UInt32			stringMax;
-			UInt32			designatorMin;
-			UInt32			designatorMax;
-		} range;
-		struct
-		{
-			HIDUsage		usage;
-			HIDUsage		reserved1;
-			UInt32			stringIndex;
-			UInt32			reserved2;
-			UInt32			designatorIndex;
-			UInt32			reserved3;
-		} notRange;
-	} u;
-};
-typedef struct HIDButtonCapabilities HIDButtonCapabilities, * HIDButtonCapabilitiesPtr;
-
-struct HIDValueCaps
-{
-	HIDUsage	usagePage;
-	UInt32		reportID;
-	UInt32		bitField;
-	UInt32		collection;
-	HIDUsage	collectionUsage;
-	HIDUsage	collectionUsagePage;
-
-	Boolean		isRange;
-	Boolean		isStringRange;
-	Boolean		isDesignatorRange;
-	Boolean		isAbsolute;
-
-        UInt32		startBit;	// Added by esb 9-28-99
-	UInt32		bitSize;
-	UInt32		reportCount;
-
-	SInt32		logicalMin;
-	SInt32		logicalMax;
-	SInt32		physicalMin;
-	SInt32		physicalMax;
-	
-	union
-	{
-		struct
-		{
-			HIDUsage		usageMin;
-			HIDUsage		usageMax;
-			UInt32			stringMin;
-			UInt32			stringMax;
-			UInt32			designatorMin;
-			UInt32			designatorMax;
-		} range;
-		struct
-		{
-			HIDUsage		usage;
-			HIDUsage		reserved1;
-			UInt32			stringIndex;
-			UInt32			reserved2;
-			UInt32			designatorIndex;
-			UInt32			reserved3;
-		} notRange;
-	} u;
-};
-typedef struct HIDValueCaps HIDValueCaps, * HIDValueCapsPtr;
-
-struct HIDValueCapabilities
-{
-	HIDUsage	usagePage;
-	UInt32		reportID;
-	UInt32		bitField;
-	UInt32		collection;
-	HIDUsage	collectionUsage;
-	HIDUsage	collectionUsagePage;
-
-	Boolean		isRange;
-	Boolean		isStringRange;
-	Boolean		isDesignatorRange;
-	Boolean		isAbsolute;
-
-	UInt32		bitSize;
-	UInt32		reportCount;
-
-	SInt32		logicalMin;
-	SInt32		logicalMax;
-	SInt32		physicalMin;
-	SInt32		physicalMax;
-	
-    SInt32                          unitExponent;	// Added KH 1/25/01
-    SInt32                          units;			// Added KH 1/25/01
-//    UInt32                          reserved;		// Not added KH 1/25/01
-        SInt32 startBit;	// Added esb 9-29-99	// Moved here KH 1/25/01
-    UInt32                          pbVersion;		// Added KH 1/25/01
-
-	union
-	{
-		struct
-		{
-			HIDUsage		usageMin;
-			HIDUsage		usageMax;
-			UInt32			stringMin;
-			UInt32			stringMax;
-			UInt32			designatorMin;
-			UInt32			designatorMax;
-		} range;
-		struct
-		{
-			HIDUsage		usage;
-			HIDUsage		reserved1;
-			UInt32			stringIndex;
-			UInt32			reserved2;
-			UInt32			designatorIndex;
-			UInt32			reserved3;
-		} notRange;
-	} u;
-};
-typedef struct HIDValueCapabilities HIDValueCapabilities, * HIDValueCapabilitiesPtr;
-
-/*!
-  @function HIDOpenReportDescriptor
-  @abstract The HIDOpenReportDescriptor function allocates the memory the parser needs to handle the given report descriptor, and then parses the report descriptor.
-  @discussion When the parsed information is no longer needed, clients should call the HIDCloseReportDescriptor function.
-  @param hidReportDescriptor Contains a pointer to the actual HID report descriptor from the USB device's firmware
-  @param descriptorLength The length of the HID report descriptor
-  @param preparsedDataRef Preparsed data reference to be used for subsequent function calls
-  @param flags Flags for this runction are kHIDFlag_StrictErrorChecking = 0x00000001
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDOpenReportDescriptor	   (void *					hidReportDescriptor,
-							ByteCount				descriptorLength,
-							HIDPreparsedDataRef *	preparsedDataRef,
-							UInt32					flags);
-
-/*!
-  @function HIDCloseReportDescriptor
-  @abstract Disposes of the memory the parser allocated for the HIDOpenReportDescriptor function.
-  @param hidReportDescriptor Contains a pointer to the actual HID report descriptor from the USB device's firmware
-  @param preparsedDataRef Preparsed data reference for the report that is returned by the HIDOpenReportDescriptor function.  After making a call to the HIDCloseReportDescriptor function, the preparsedDataRef is invalid and should not be used.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDCloseReportDescriptor   (HIDPreparsedDataRef		preparsedDataRef);
-
-/*!
-  @function HIDGetButtonCaps
-  @abstract Returns the button capabilities structures for a HID device based on the given preparsed data.
- @param reportType Specifies the type of report for which to retrieve the scaled value.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport
-  @param buttonCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDButtonCaps structures.  The structures contain information for all buttons that meet the search criteria
-  @param buttonCapsSize Contains the size of the buttonCaps array passed in to the function and is set to the number of elements actually placed in the array after the call completes.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetButtonCaps		   (HIDReportType			reportType,
-							HIDButtonCapsPtr		buttonCaps,
-							UInt32	*				buttonCapsSize,
-							HIDPreparsedDataRef		preparsedDataRef);
-
-/*!
-  @function HIDGetButtonCapabilities
-  @abstract Returns the button capabilities structures for a HID device based on the given preparsed data.
- @param reportType Specifies the type of report for which to retrieve the scaled value.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport
-  @param buttonCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDButtonCapabilities structures.  The structures contain information for all buttons that meet the search criteria
-  @param buttonCapsSize Contains the size of the buttonCaps array passed in to the function and is set to the number of elements actually placed in the array after the call completes.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetButtonCapabilities   (HIDReportType			reportType,
-							HIDButtonCapabilitiesPtr	buttonCaps,
-							UInt32	*				buttonCapsSize,
-							HIDPreparsedDataRef		preparsedDataRef);
-
-/*!
-  @function HIDGetCaps
-  @abstract Returns the capabilities of a HID device based on the given preparsed data.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param capabilities Points to a caller allocated buffer, that upon return contains the parsed capability information for this HID device.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetCaps				   (HIDPreparsedDataRef		preparsedDataRef,
-							HIDCapsPtr				capabilities);
-
-/*!
-  @function HIDGetCapabilities
-  @abstract Returns the capabilities of a HID device based on the given preparsed data.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param capabilities Points to a caller allocated buffer, that upon return contains the parsed capability information for this HID device.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetCapabilities		   (HIDPreparsedDataRef		preparsedDataRef,
-							HIDCapabilitiesPtr		capabilities);
-
-/*!
-  @function HIDGetCollectionNodes
-  @abstract Returns an array of HIDCollectionNode structures that describe the relationships and layout of the link collections within this top level collection.
-  @discussion The length of the buffer required, in array elements, for an entire collection node array is found in the HIDCaps structure member numberCollectionNodes.  You obtain the HIDCaps information by calling the HIDGetCaps function.  For information on the relationships of link collections described by the data returned from this routine, see the descripton of the HIDCollectionNode structure.
-  @param collectionNodes Points to a caller-allocated array of HIDCollectionNode structures in which this routine returns an entry for each collection within the top level collection.  A collection is a group of corresponding HID descriptors containing input, output, and feature items that have some common relationship to one another.  For example, a pointer collection contains items for x and y position data, and button data.
-  @param collectionNodesSize On input, specifies the length in array elements of the buffer provided at collectionNodes.  On output, this parameter is set to the number of entries in the collectionNodes array that were initialized.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetCollectionNodes	   (HIDCollectionNodePtr	collectionNodes,
-							UInt32 *				collectionNodesSize,
-							HIDPreparsedDataRef		preparsedDataRef);
-
-/*!
-  @function HIDGetScaledUsageValue
-  @abstract The HIDGetScaledUsageValue function returns the capabilities for all buttons for a given top level collection.
-  @discussion Clients who which to obtain all capabilities for a usage that contains multiple data items for a single usage that corresponds to a HID byte array, must call the HIDGetUsageValueArray function.
-  @param reportType Specifies the type of report for which to retrieve the scaled value.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Specifies the usage page of the value to be retrieved.
-  @param collection Optionally specifies the link collection identifier of the value to be retrieved.
-  @param usage Specifies the usage of the scaled value to be retrieved.
-  @param usageValue Points to a variable, that on return from this routine holds the scaled value retrieved from the device report.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param report Points to the caller-allocated buffer that contains the device report data
-  @param reportLength Specifies the length, in bytes, of the report data provided at report
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetScaledUsageValue	   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							SInt32 *				usageValue,
-							HIDPreparsedDataRef		preparsedDataRef,
-							void *					report,
-							ByteCount				reportLength);
-
-/*!
-  @function HIDGetSpecificButtonCaps
-  @abstract Retrieves the capabilities for all buttons in a specific type of report that meet the search criteria.
-  @discussion The HIDGetSpecificButtonCaps function retrieves capability data for buttons that meet a given search criteria, as opposed to the HIDGetButtonCaps function which returns the capability data for all buttons on the device.  Calling this routine specifying zero for usagePage, usage and collection is equivalent to calling the HIDGetButtonCaps function.
-  @param reportType Specifies the type of report for which to retrieve the button capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Specifies a usage page identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that specify this usage page will be retrieved.
-  @param collection Specifies a link collection identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that are part of the specified link collection are retrieved.
-  @param usage Specifies a usage identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that match the value specified are retrieved.
-  @param buttonCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDButtonCaps structures.  The structures contain information for all buttons that meet the search criteria.
-  @param buttonCapsLength On input, specifies the length, in array elements, of the buffer provided in the buttonCaps parameter.  On output, this parameter is set to the actual number of elements that were returned by the function call, in the buffer provided in the buttonCaps parameter, if the routine completed without error.  The correct length necessary to retrieve the button capabilities can be found in the capability data returned for the device by the HIDGetCaps function.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetSpecificButtonCaps   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							HIDButtonCapsPtr		buttonCaps,
-							UInt32 *				buttonCapsSize,
-							HIDPreparsedDataRef		preparsedDataRef);
-
-/*!
-  @function HIDGetSpecificButtonCapabilities
-  @abstract Retrieves the capabilities for all buttons in a specific type of report that meet the search criteria.
-  @discussion The HIDGetSpecificButtonCapabilities function retrieves capability data for buttons that meet a given search criteria, as opposed to the HIDGetButtonCapabilities function which returns the capability data for all buttons on the device.  Calling this routine specifying zero for usagePage, usage and collection is equivalent to calling the HIDGetButtonCapabilities function.
-  @param reportType Specifies the type of report for which to retrieve the button capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Specifies a usage page identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that specify this usage page will be retrieved.
-  @param collection Specifies a link collection identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that are part of the specified link collection are retrieved.
-  @param usage Specifies a usage identifier to use as a search criteria.  If this parameter is non-zero, then only buttons that match the value specified are retrieved.
-  @param buttonCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDButtonCapabilities structures.  The structures contain information for all buttons that meet the search criteria.
-  @param buttonCapsLength On input, specifies the length, in array elements, of the buffer provided in the buttonCaps parameter.  On output, this parameter is set to the actual number of elements that were returned by the function call, in the buffer provided in the buttonCaps parameter, if the routine completed without error.  The correct length necessary to retrieve the button capabilities can be found in the capability data returned for the device by the HIDGetCaps function.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetSpecificButtonCapabilities   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							HIDButtonCapabilitiesPtr	buttonCaps,
-							UInt32 *				buttonCapsSize,
-							HIDPreparsedDataRef		preparsedDataRef);
-
-/*!
-  @function HIDGetSpecificValueCaps
-  @abstract Retrieves the capabilities for all values in a specific type of report that meet the search criteria.
-  @discussion The HIDGetSpecificValueCaps function retrieves capability data for values that meet given search criteria, as opposed to the HIDGetValueCaps function, which returns the capability data for all values on the device.  Calling this routine with a value of zero for usagePage, usage and collection parameters is equivalent to calling the HIDGetValueCaps function.
-  @param reportType Specifies the type of report for which to retrieve the value capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport or kHIDFeatureReport.
-  @param usagePage Specifies a usage page identifier to use as a search criteria.  If this parameter is non-zero, then only values that specify this usage page will be retrieved.
-  @param collection Specifies a link collection identifier to use as a search criteria.  If this parameter is non-zero, then only values that are part of this link collection will be retrieved.
-  @param usage Specifies a usage identifier to use as a search criteria.  If this parameter is non-zero, then only values that specify this usage will be retrieved.
-  @param valueCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDValueCaps structures that contain information for all values that meet the search criteria.
-  @param valueCapsSize Specifies the length on input, in array elements, of the buffer provided in the valueCaps parameter.  On output, this parameter is set to the actual number of elements that were returned by this function call, in the buffer provided in the valueCaps parameter, if the routine completed without error.  The correct length necessary to retrieve the value capabilities can be found in the capability data returned for the device from the HIDGetCaps function.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetSpecificValueCaps	   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							HIDValueCapsPtr			valueCaps,
-							UInt32 *				valueCapsSize,
-							HIDPreparsedDataRef		preparsedDataRef);
-
-/*!
-  @function HIDGetSpecificValueCapabilities
-  @abstract Retrieves the capabilities for all values in a specific type of report that meet the search criteria.
-  @discussion The HIDGetSpecificValueCapabilities function retrieves capability data for values that meet given search criteria, as opposed to the HIDGetValueCapabilities function, which returns the capability data for all values on the device.  Calling this routine with a value of zero for usagePage, usage and collection parameters is equivalent to calling the HIDGetValueCapabilities function.
-  @param reportType Specifies the type of report for which to retrieve the value capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport or kHIDFeatureReport.
-  @param usagePage Specifies a usage page identifier to use as a search criteria.  If this parameter is non-zero, then only values that specify this usage page will be retrieved.
-  @param collection Specifies a link collection identifier to use as a search criteria.  If this parameter is non-zero, then only values that are part of this link collection will be retrieved.
-  @param usage Specifies a usage identifier to use as a search criteria.  If this parameter is non-zero, then only values that specify this usage will be retrieved.
-  @param valueCaps Points to a caller-allocated buffer that will contain, on return, an array of HIDValueCapabilities structures that contain information for all values that meet the search criteria.
-  @param valueCapsSize Specifies the length on input, in array elements, of the buffer provided in the valueCaps parameter.  On output, this parameter is set to the actual number of elements that were returned by this function call, in the buffer provided in the valueCaps parameter, if the routine completed without error.  The correct length necessary to retrieve the value capabilities can be found in the capability data returned for the device from the HIDGetCaps function.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetSpecificValueCapabilities	   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							HIDValueCapabilitiesPtr	valueCaps,
-							UInt32 *				valueCapsSize,
-							HIDPreparsedDataRef		preparsedDataRef);
-
-/*!
-  @function HIDGetButtonsOnPage
-  @abstract Retrieves the button stat information for buttons on a specified usage page.
-  @param reportType Specifies the type of report, provided in the report parameter, from which to retrieve the buttons.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport or kHIDFeatureReport.
-  @param usagePage Specifies the usage page of the buttons for which to retrieve the current state.
-  @param collection Optionally specifies the link collection identifier used to retrieve only specific button states.  If this value is non-zero, only the buttons that are part of the given collection are returned.
-  @param usageList On return, points to a caller-allocated buffer that contains the usages of all the buttons that are perssed and belong to the usage page specified in the usagePage parameter.
-  @param usageListSize Is the size, in array elements, of the buffer provided in the usageList parameter.  On return, this parameter contains the number of button states that were set by this routine.  If the error kHIDBufferTooSmallErr was returned, this parameter contains the number of array elements required to hold all button data requested.  The maximum number of buttons that can ever be returned for a given type of report can be obtained by calling the HIDMaxUsageListLength function.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param report Points to the caller-allocated buffer that contains the device report data
-  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetButtonsOnPage		   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage *				usageList,
-							UInt32 *				usageListSize,
-							HIDPreparsedDataRef		preparsedDataRef,
-							void *					report,
-							ByteCount				reportLength);
-
-/*!
-  @function HIDGetButtons
-  @abstract The HIDGetButtons function takes a report from a HID device and gets the current state of the buttons in that report.
-  @param reportType Specifies the type of report, provided in the report parameter, from which to retrieve the buttons.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport or kHIDFeatureReport
-  @param collection Optionally specifies the link collection identifier used to retrieve only specific button states.  If this value is non-zero, only the buttons that are part of the given collection are returned.
-  @param usageList On return, points to a caller-allocated buffer that contains the usages of all the buttons that are pressed.
-  @param usageListSize Is the size, in array elements, of the buffer provided in the usageList parameter.  On return, this parameter contains the number of button states that were set by this routine.  If the error kHIDBufferToSmallErr was returned, this parameter contains the number of array elements required to hold all button data requested.  The maximum number of buttons that can ever be returned for a given type of report can be obtained by calling the HIDMaxUsageListLength function.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param report Points to the caller-allocated buffer that contains the device report data.
-  @param reportLength Specifies the length, in bytes, of the report data provided in the report parameter.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetButtons			   (HIDReportType			reportType,
-							UInt32					collection,
-							HIDUsageAndPagePtr		usageList,
-							UInt32 *				usageListSize,
-							HIDPreparsedDataRef		preparsedDataRef,
-							void *					report,
-							ByteCount				reportLength);
-
-extern 
-OSStatus
-HIDGetNextButtonInfo       (HIDReportType          reportType,
-                            HIDUsage               usagePage,
-                            HIDUsage               usage,
-                            UInt32 *               collection,
-                            UInt8 *                reportID,
-                            HIDPreparsedDataRef    preparsedDataRef);
-
-extern 
-OSStatus
-HIDGetNextUsageValueInfo   (HIDReportType          reportType,
-                            HIDUsage               usagePage,
-                            HIDUsage               usage,
-                            UInt32 *               collection,
-                            UInt8 *                reportID,
-                            HIDPreparsedDataRef    preparsedDataRef);
-
-extern 
-OSStatus
-HIDGetReportLength         (HIDReportType          reportType,
-                            UInt8                  reportID,
-                            ByteCount *            reportLength,
-                            HIDPreparsedDataRef    preparsedDataRef);
-
-/*!
-  @function HIDGetUsageValue
-  @abstract The HIDGetUsageValue function returns a value from a device data report given a selected search criteria.
-  @discussion The HIDGetUsageValue function does not sign the value.  To have the sign bit automatically applied, use the HIDGetScaledUsageValue function instead.  For manually assigning the sign bit, the position of the sign bit can be found in the HIDValueCaps structure for this value.  Clients who wish to obtain all data for a usage that contains multiple data items for a single usage, corresponding to a HID byte array, must call the HIDGetUsageValueArray function instead.
-  @param reportType Specifies the type of report, provided in report, from which to retrieve the value.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Specifies the usage page of the value to retrieve.
-  @param collection Optionally specifies the link collection identifier of the value to be retrieved.
-  @param usage Specifies the usage of the value to be retrieved.
-  @param usageValue Points to a variable, that on return from this routine holds the value retrieved from the device report.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param report Points to the caller-allocated buffer that contains the device report data.
-  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetUsageValue		   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							SInt32 *				usageValue,
-							HIDPreparsedDataRef		preparsedDataRef,
-							void *					report,
-							ByteCount				reportLength);
-
-/*!
-  @function HIDGetUsageValueArray
-  @abstract The HIDGetUsageValueArray function returns a value from a device data report given a selected search criteria.
-  @discussion When the HIDGetUsageValueArray function retrieves the data, it fills in the buffer in little-endian order beginning with the least significant bit of the data for this usage.  The data is filled in without regard to byte alignment and is shifted such that the least significant bit is placed as the 1st bit of the given buffer.
-  @param reportType Specifies the type of report, provided in report, from which to retrieve the value.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Specifies the usage page of the data to be retrieved.
-  @param collection Optionally specifies the link collection identifier of the data to be retrieved.
-  @param usage Specifies the usage identifier of the value to be retrieved.
-  @param usageValueBuffer Points to a caller-allocated buffer that contains, on output, the data from the device.  The correct length for this buffer can be found by multiplying the reportCount and bitSize fields of the HIDValueCaps structure for the value and rounding the resulting value up to the nearest byte.
-  @param usageValueBufferSize Specifies the size, in bytes, of the buffer in the usageValueBuffer parameter.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param report Points to the caller-allocated buffer that contains the device report data.
-  @param reportLength Specifies the size, in bytes, of the report data provided in report.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetUsageValueArray	   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							Byte *					usageValueBuffer,
-							ByteCount				usageValueBufferSize,
-							HIDPreparsedDataRef		preparsedDataRef,
-							void *					report,
-							ByteCount				reportLength);
-
-/*!
-  @function HIDGetValueCaps
-  @abstract The HIDGetValueCaps function retrieves the capabilities for all values for a specified top level collection.
-  @discussion The HIDGetValueCaps function retrieves the capability data for all values in a top level collection without regard for the usage, usage page or collection of the value.  To retrieve value capabilities for a specific usage, usage page or collection, use the HIDGetSpecificValueCaps function.
-  @param reportType Specifies the type of report for which to retrieve the value capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param valueCaps On return, points to a caller-allocated buffer that contains an array of HIDValueCaps structures containing information for all values in the top level collection.
-  @param valueCapsSize On input, specifies the size in array elements of the buffer provided in the valueCaps parameter.  On output, this parameter is set to the actual number of elements that were returned in the buffer provided in the valueCaps parameter, if the function completed without error.  The correct length necessary to retrieve the value capabilities can be found in the capability data returned for the device by the HIDGetCaps function.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetValueCaps			   (HIDReportType			reportType,
-							HIDValueCapsPtr			valueCaps,
-							UInt32 *				valueCapsSize,
-							HIDPreparsedDataRef		preparsedDataRef);
-
-/*!
-  @function HIDGetValueCapabilities
-  @abstract The HIDGetValueCapabilities function retrieves the capabilities for all values for a specified top level collection.
-  @discussion The HIDGetValueCapabilities function retrieves the capability data for all values in a top level collection without regard for the usage, usage page or collection of the value.  To retrieve value capabilities for a specific usage, usage page or collection, use the HIDGetSpecificValueCapabilities function.
-  @param reportType Specifies the type of report for which to retrieve the value capabilities.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param valueCaps On return, points to a caller-allocated buffer that contains an array of HIDValueCapabilities structures containing information for all values in the top level collection.
-  @param valueCapsSize On input, specifies the size in array elements of the buffer provided in the valueCaps parameter.  On output, this parameter is set to the actual number of elements that were returned in the buffer provided in the valueCaps parameter, if the function completed without error.  The correct length necessary to retrieve the value capabilities can be found in the capability data returned for the device by the HIDGetCapabilities function.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDGetValueCapabilities	   (HIDReportType			reportType,
-							HIDValueCapabilitiesPtr	valueCaps,
-							UInt32 *				valueCapsSize,
-							HIDPreparsedDataRef		preparsedDataRef);
-
-extern 
-OSStatus
-HIDInitReport              (HIDReportType          reportType,
-                            UInt8                  reportID,
-                            HIDPreparsedDataRef    preparsedDataRef,
-                            void *                 report,
-                            ByteCount              reportLength);
-
-/*!
-  @function HIDMaxUsageListLength
-  @abstract The HIDMaxUsageListLength function returns the maximum number of buttons that can be returned from a given report type for the top level collection.
-  @param reportType Specifies the type of report for which to get a maximum usage count.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Optionally specifies the usage page identifier to use as a search criteria.  If this parameter is zero, the function returns the number of buttons for the entire top-level collection regardless of the actual value of the usage page.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern  
-UInt32
-HIDMaxUsageListLength	   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							HIDPreparsedDataRef		preparsedDataRef);
-
-/*!
-  @function HIDSetScaledUsageValue
-  @abstract The HIDSetScaledUsageValue function takes a signed physical (scaled) number and converts it to the logical, or device representation and inserts it in a given report.
-  @discussion The HIDSetScaledUsageValue function automatically handles the setting of the signed bit in the data to be sent to the device.
-  @param reportType Specifies the type of report.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Specifies the usage page identifier of the value to be set in the report.
-  @param collection Optionally specifies the link collection identifier to distinguish between values that have the same usage page and usage identifiers.  If this parameter is zero, it will be ignored.
-  @param usage Specifies the usage identifier of the value to be set in the report.
-  @param usageValue Specifies the physical, or scaled, value to be set in the value for the given report.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param report Points to the caller-allocated buffer that contains the device report data.
-  @param Specifies the length, in bytes of the report data specified in the report parameter.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDSetScaledUsageValue	   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							SInt32					usageValue,
-							HIDPreparsedDataRef		preparsedDataRef,
-							void *					report,
-							ByteCount				reportLength);
-
-/*!
-  @function HIDSetButtons
-  @abstract The HIDSetButtons function takes a report from a HID device and returns the current state of the buttons in that report.
-  @param reportType Specifies the type of repor.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Specifies the usage page identifier of the value to be set in the report.
-  @param collection Optionally specifies the link collection identifier to distinguish between buttons.  If this parameter is zero, it is ignored.
-  @param usageList Points to a caller-allocated buffer that contains an array of button data to be set in the report in the report parameter.
-  @param usageListSize Specifies the size, in array elements, of the buffer provided in the usageList parameter.  If an error is returned by a call to this function, the usageListLength parameter contains the location in the array provided in the usageList parameter where the error was encountered.  All array entries encountered prior to the error location were successfully set in the report provided in the report parameter.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param report Points to the caller-allocated buffer that contains the device report data.
-  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDSetButtons			   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage *				usageList,
-							UInt32 *				usageListSize,
-							HIDPreparsedDataRef		preparsedDataRef,
-							void *					report,
-							ByteCount				reportLength);
-
-/*!
-  @function HIDSetUsageValue
-  @abstract The HIDSetUsageValue function sets a value in a give report.
-  @discussion The HIDSetUsageVlaue function does not automatically handle the sign bit.  Clients must either manually set the sign bit, at the position provided in the HIDValueCaps structure for this value, or call the HIDSetScaledUsageValue function.
-  @param reportType Specifies the type of report.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Specifies the usage page identifier of the value to be set in the report.
-  @param collection Optionally specifies the link collection identifier to distinguish between values that have the same usage page and usage identifiers.  If this parameter is zero, it is ignored.
-  @param usage Specifies the usage identifier of the value to be set in the report.
-  @param usageValue Specifies the data that is to be set in the value for the given report.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param report Points to the caller-allocated buffer that contains the device report data.
-  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDSetUsageValue		   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							SInt32					usageValue,
-							HIDPreparsedDataRef		preparsedDataRef,
-							void *					report,
-							ByteCount				reportLength);
-
-/*!
-  @function HIDSetUsageValueArray
-  @abstract The HIDSetUsageValueArray function sets an array of values in a given report.
-  @discussion The HIDSetUsageValue function does not automatically handle the sign bit.  Clients must either manually set the sign bit, at the position provided in the HIDValueCaps structure for this value, or call the HIDSetScaledUsageValue function.
-  @param reportType Specifies the type of report.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Specifies the usage page identifier of the value to be set in the report.
-  @param collection Optionally specifies the link collection identifier to distinguish between values that have the same usage page and usage identifiers.  If this parameter is zero, it is ignored.
-  @param usage Specifies the usage identifier of the value to be set in the report.
-  @param usageValueBuffer Points to a caller-allocated buffer that contains, on output, the data from the device.  The correct length for this buffer can be found by multiplying the reportCount and bitSize fields of the HIDValueCaps structure for this value and rounding the resulting value up to the nearest byte.
-  @param usageValueBufferLength Specifies the size, in bytes, of the buffer in the usageValueBuffer parameter.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param report Points to the caller-allocated buffer that contains the device report data.
-  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDSetUsageValueArray	   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							Byte *					usageValueBuffer,
-							ByteCount				usageValueBufferLength,
-							HIDPreparsedDataRef		preparsedDataRef,
-							void *					report,
-							ByteCount				reportLength);
-
-/*!
-  @function HIDUsageListDifference
-  @abstract The HIDUsageListDifference function compares and provides the differences between two lists of buttons.
-  @param previousUsageList Points to the older button list to be used for comparison.
-  @param currentUsageList Points to the newer button list to be used for comparison.
-  @param breakUsageList On return, points to a caller-allocated buffer that contains the buttons set in the older list, specified in the previousUsageList parameter, but not set in the new list, specified in the currentUsageList parameter.
-  @param makeUsageList On return, points to a caller-allocated buffer that contains the buttons set in the new list, specified in the currentUsageList parameter, but not set in the old list, specified in the previousUsageList parameter.
-  @param usageListsLength Specifies the length, in array elements, of the buffers provided in the currentUsageList and previousUssageList parameters.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDUsageListDifference	   (HIDUsage *				previousUsageList,
-							HIDUsage *				currentUsageList,
-							HIDUsage *				breakUsageList,
-							HIDUsage *				makeUsageList,
-							UInt32					usageListsSize);
-
-/*!
-  @function HIDSetButton
-  @abstract The HIDSetButton function takes a report from a HID device and sets the current state of the specified button in that report.
-  @param reportType Specifies the type of report.  This parameter must be one of the following: kHIDInputReport, kHIDOutputReport, or kHIDFeatureReport.
-  @param usagePage Specifies the usage page identifier of the value to be set in the report.
-  @param collection Optionally specifies the link collection identifier to distinguish between buttons.  If this parameter is zero, it is ignored.
-  @param usage Points to a caller-allocated buffer that contains the button data to be set in the report in the report parameter.
-  @param preparsedDataRef Preparsed data reference for the report that is retuned by the HIDOpenReportDescriptor function
-  @param report Points to the caller-allocated buffer that contains the device report data.
-  @param reportLength Specifies the size, in bytes, of the report data provided in the report parameter.
-  @result OSStatus Returns an error code if an error was encountered or noErr on success.
- */
-
-extern 
-OSStatus
-HIDSetButton			   (HIDReportType			reportType,
-							HIDUsage				usagePage,
-							UInt32					collection,
-							HIDUsage				usage,
-							HIDPreparsedDataRef		preparsedDataRef,
-							void *					report,
-							ByteCount				reportLength);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/i386/include/IOKit/hidsystem/IOHIDParameter.h b/i386/include/IOKit/hidsystem/IOHIDParameter.h
deleted file mode 100644
index f528d03..0000000
--- a/i386/include/IOKit/hidsystem/IOHIDParameter.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/* 	Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved. 
- *
- * evsio.h - Get/Set parameter calls for Event Status Driver.
- *
- *	CAUTION: Developers should stick to the API exported in
- *		<drivers/event_status_driver.h> to guarantee
- *		binary compatability of their applications in future
- *		releases.
- *
- * HISTORY
- * 22 May 1992    Mike Paquette at NeXT
- *      Created. 
- */
-#ifndef _DEV_EVSIO_H
-#define _DEV_EVSIO_H
-
-/* Public type definitions. */
-#include <IOKit/hidsystem/IOHIDTypes.h>
-#include <IOKit/hidsystem/IOLLEvent.h>
-
-/*
- * Identify this driver as one that uses the new driverkit and messaging API
- */
-#ifndef _NeXT_MACH_EVENT_DRIVER_
-#define _NeXT_MACH_EVENT_DRIVER_	(1)
-#endif /* !_NeXT_MACH_EVENT_DRIVER_ */
-
-/* * */
-
-#define kIOHIDKindKey					"HIDKind"
-#define kIOHIDInterfaceIDKey			"HIDInterfaceID"
-#define kIOHIDSubinterfaceIDKey			"HIDSubinterfaceID"
-
-#define kIOHIDParametersKey				"HIDParameters"
-
-#define kIOHIDVirtualHIDevice                   "HIDVirtualDevice"
-
-#define kIOHIDKeyRepeatKey				"HIDKeyRepeat"
-#define kIOHIDInitialKeyRepeatKey		"HIDInitialKeyRepeat"
-#define kIOHIDKeyMappingKey				"HIDKeyMapping"
-#define kIOHIDResetKeyboardKey			"HIDResetKeyboard"
-
-#define kIOHIDKeyboardModifierMappingPairsKey   "HIDKeyboardModifierMappingPairs"
-#define kIOHIDKeyboardModifierMappingSrcKey     "HIDKeyboardModifierMappingSrc"
-#define kIOHIDKeyboardModifierMappingDstKey     "HIDKeyboardModifierMappingDst"
-
-#define kIOHIDKeyboardCapsLockDoesLockKey       "HIDKeyboardCapsLockDoesLock"
-#define kIOHIDKeyboardSupportsF12EjectKey       "HIDKeyboardSupportsF12Eject"
-#define kIOHIDKeyboardSupportedModifiersKey     "HIDKeyboardSupportedModifiers"
-
-#define kIOHIDPointerResolutionKey		"HIDPointerResolution"
-#define kIOHIDResetPointerKey			"HIDResetPointer"
-#define kIOHIDPointerConvertAbsoluteKey	"HIDPointerConvertAbsolute"
-#define kIOHIDPointerContactToMoveKey	"HIDPointerContactToMove"
-#define kIOHIDPointerPressureToClickKey	"HIDPointerPressureToClick"
-#define kIOHIDPointerButtonMode			"HIDPointerButtonMode"
-#define kIOHIDPointerButtonCountKey	"HIDPointerButtonCount"
-
-#define kIOHIDPointerAccelerationKey	"HIDPointerAcceleration"
-#define kIOHIDPointerAccelerationSettingsKey	"HIDPointerAccelerationSettings"
-#define kIOHIDPointerAccelerationTypeKey	"HIDPointerAccelerationType"
-#define kIOHIDPointerAccelerationTableKey  "HIDPointerAccelerationTable"
-
-#define kIOHIDScrollResetKey			"HIDScrollReset"
-#define kIOHIDScrollResolutionKey		"HIDScrollResolution"
-#define kIOHIDScrollReportRateKey       "HIDScrollReportRate"
-#define kIOHIDScrollAccelerationKey		"HIDScrollAcceleration"
-#define kIOHIDScrollAccelerationTypeKey     "HIDScrollAccelerationType"
-#define kIOHIDScrollAccelerationTableKey	"HIDScrollAccelerationTable"
-
-#define kIOHIDScrollResolutionXKey		"HIDScrollResolutionX"
-#define kIOHIDScrollResolutionYKey		"HIDScrollResolutionY"
-#define kIOHIDScrollResolutionZKey		"HIDScrollResolutionZ"
-
-#define kIOHIDScrollAccelerationTableXKey	"HIDScrollAccelerationTableX"
-#define kIOHIDScrollAccelerationTableYKey	"HIDScrollAccelerationTableY"
-#define kIOHIDScrollAccelerationTableZKey	"HIDScrollAccelerationTableZ"
-
-#define kIOHIDScrollMouseButtonKey      "HIDScrollMouseButton"
-
-#define kIOHIDScrollZoomModifierMaskKey "HIDScrollZoomModifierMask"
-
-#define kIOHIDTrackpadScrollAccelerationKey "HIDTrackpadScrollAcceleration"
-#define kIOHIDMouseScrollAccelerationKey   "HIDMouseScrollAcceleration"
-
-#define kIOHIDTrackpadAccelerationType	"HIDTrackpadAcceleration"
-#define kIOHIDMouseAccelerationType		"HIDMouseAcceleration"
-
-#define kIOHIDClickTimeKey				"HIDClickTime"
-#define kIOHIDClickSpaceKey				"HIDClickSpace"
-
-#define kIOHIDWaitCursorFrameIntervalKey	"HIDWaitCursorFrameInterval"
-
-#define kIOHIDAutoDimThresholdKey		"HIDAutoDimThreshold"
-#define kIOHIDAutoDimStateKey			"HIDAutoDimState"
-#define kIOHIDAutoDimTimeKey			"HIDAutoDimTime"
-#define kIOHIDIdleTimeKey				"HIDIdleTime"
-
-#define kIOHIDBrightnessKey				"HIDBrightness"
-#define kIOHIDAutoDimBrightnessKey		"HIDAutoDimBrightness"
-
-#define kIOHIDFKeyModeKey			"HIDFKeyMode"
-
-// if kIOHIDStickyKeysDisabledKey is 1, then all sticky keys functionality
-// is completely turned off. Multiple shifts will have no effect.
-#define kIOHIDStickyKeysDisabledKey		"HIDStickyKeysDisabled"
-
-// if kIOHIDStickyKeysOnKey is 1 then a depressed modifier will stay down
-// until a non-modifer key is pressed (or sticky keys is turned off)
-#define kIOHIDStickyKeysOnKey			"HIDStickyKeysOn"
-
-// if kIOHIDStickyKeysShiftTogglesKey is 1, then a sequence of five
-// shift keys in sequence will toggle sticky keys on or off
-#define kIOHIDStickyKeysShiftTogglesKey	"HIDStickyKeysShiftToggles"
-
-// if kIOHIDMouseKeysOptionTogglesKey is 1, then a sequence of five
-// option keys in sequence will toggle mouse keys on or off
-#define kIOHIDMouseKeysOptionTogglesKey	"HIDMouseKeysOptionToggles"
-
-// kIOHIDSlowKeysDelayKey represents the delay used for slow keys.
-// if kIOHIDSlowKeysDelayKey is 0, then slow keys off
-#define kIOHIDSlowKeysDelayKey			"HIDSlowKeysDelay"
-
-#define kIOHIDF12EjectDelayKey			"HIDF12EjectDelay"
-
-#define kIOHIDMouseKeysOnKey			"HIDMouseKeysOn"
-
-#define kIOHIDUseKeyswitchKey           "HIDUseKeyswitch"
-
-#define kIOHIDDisallowRemappingOfPrimaryClickKey	"HIDDisallowRemappingOfPrimaryClick"
-#define kIOHIDMouseKeysEnablesVirtualNumPadKey	"HIDMouseKeysEnablesVirtualNumPad"
-
-#define kIOHIDResetLEDsKey          "HIDResetLEDs"
-
-
-#ifdef __ppc__
-    // the following are misspelled keys present in the system
-    // they are being kept around, but will eventually be deprecated
-    #define kIOHIDSickyKeysDisabledKey		kIOHIDStickyKeysDisabledKey
-    #define kIOHIDSickyKeysOnKey			kIOHIDStickyKeysOnKey
-    #define kIOHIDSickyKeysShiftTogglesKey	kIOHIDStickyKeysShiftTogglesKey
-#endif
-
-// the following values are used in kIOHIDPointerButtonMode
-typedef enum {
-	kIOHIDButtonMode_BothLeftClicks = 0,
-	kIOHIDButtonMode_ReverseLeftRightClicks = 1,
-	kIOHIDButtonMode_EnableRightClick = 2
-} IOHIDButtonModes;
-
-#ifdef _undef
-#define EVS_PREFIX	"Evs_"	/* All EVS calls start with this string */
-
-/* WaitCursor-related ioctls */
-
-#define EVSIOSWT "Evs_SetWaitThreshold"
-#define EVSIOSWT_SIZE	EVS_PACKED_TIME_SIZE
-
-#define EVSIOSWS "Evs_SetWaitSustain"
-#define EVSIOSWS_SIZE	EVS_PACKED_TIME_SIZE
-
-#define EVSIOSWFI "Evs_SetWaitFrameInterval"
-#define EVSIOSWFI_SIZE	EVS_PACKED_TIME_SIZE
-
-#define EVSIOCWINFO	"Evs_CurrentWaitCursorInfo"
-#define EVSIOCWINFO_THRESH	0
-#define EVSIOCWINFO_SUSTAIN	(EVSIOCWINFO_THRESH + EVS_PACKED_TIME_SIZE)
-#define EVSIOCWINFO_FINTERVAL	(EVSIOCWINFO_SUSTAIN + EVS_PACKED_TIME_SIZE)
-#define EVSIOCWINFO_SIZE	(EVSIOCWINFO_FINTERVAL + EVS_PACKED_TIME_SIZE)
-#endif
-
-#define EVS_PACKED_TIME_SIZE (sizeof(UInt64) / sizeof( unsigned int))
-
-/* Device control ioctls. Levels specified may be in the range 0 - 64. */
-
-#define EVSIOSB	  	kIOHIDBrightnessKey
-#define EVSIOSB_SIZE	1
-
-#define EVSIOSADB 	kIOHIDAutoDimBrightnessKey
-#define EVSIOSADB_SIZE	1
-
-#ifdef _undef
-#define EVSIOSA	  "Evs_SetAttenuation"
-#define EVIOSA_SIZE	1
-
-#define EVSIO_DCTLINFO	"Evs_DeviceControlInfo"
-typedef enum {
-	EVSIO_DCTLINFO_BRIGHT,
-	EVSIO_DCTLINFO_ATTEN,
-	EVSIO_DCTLINFO_AUTODIMBRIGHT
-} evsio_DCTLINFOIndices;
-#define EVSIO_DCTLINFO_SIZE	(EVSIO_DCTLINFO_AUTODIMBRIGHT + 1)
-#endif
-
-/*
- * Device status request
- */
-#define	EVSIOINFO  NX_EVS_DEVICE_INFO
-
-
-/* Keyboard-related ioctls - implemented within Event Sources */
-
-#define EVSIOSKR  	kIOHIDKeyRepeatKey
-#define EVSIOSKR_SIZE	EVS_PACKED_TIME_SIZE
-
-#define EVSIOSIKR 	kIOHIDInitialKeyRepeatKey
-#define EVSIOSIKR_SIZE	EVS_PACKED_TIME_SIZE
-
-#define EVSIORKBD 	kIOHIDResetKeyboardKey
-#define EVSIORKBD_SIZE	1
-
-#define EVSIOCKR_SIZE	EVS_PACKED_TIME_SIZE
-
-#define	EVSIOCKML 	kIOHIDKeyMappingKey
-#define EVSIOCKML_SIZE	1
-
-/* The following two tokens are for use with the get/set character routines. */
-#define EVSIOSKM  	kIOHIDKeyMappingKey
-#define EVSIOSKM_SIZE	4096
-
-#define	EVSIOCKM  	kIOHIDKeyMappingKey
-#define EVSIOCKM_SIZE	4096
-
-/* Mouse-related ioctls - implemented within Event Sources */
-
-#define	EVSIOSMS  	kIOHIDPointerAccelerationKey
-#define	EVSIOSMS_SIZE		(1)
-
-#define	EVSIOCMS  	kIOHIDPointerAccelerationKey
-#define	EVSIOCMS_SIZE		(1)
-
-#ifdef _undef
-#define EVSIOSMH  "Evs_SetMouseHandedness"
-#define EVSIOSMH_SIZE	1		// value from NXMouseButton enum
-
-#define EVSIOCMH  "Evs_CurrentMouseHandedness"
-#define EVSIOCMH_SIZE	1
-#endif
-
-/* Generic pointer device controls, implemented by the Event Driver. */
-#define	EVSIOSCT  	kIOHIDClickTimeKey
-#define EVSIOSCT_SIZE	EVS_PACKED_TIME_SIZE
-
-#define	EVSIOSCS  	kIOHIDClickSpaceKey
-typedef enum {
-	EVSIOSCS_X,
-	EVSIOSCS_Y
-} evsioEVSIOSCSIndices;
-#define EVSIOSCS_SIZE	(EVSIOSCS_Y + 1)
-
-#define EVSIOSADT	 kIOHIDAutoDimThresholdKey
-#define EVSIOSADT_SIZE	EVS_PACKED_TIME_SIZE
-
-#define EVSIOSADS 	kIOHIDAutoDimStateKey
-#define EVSIOSADS_SIZE	1
-
-#define EVSIORMS  	kIOHIDResetPointerKey
-#define EVSIORMS_SIZE	1
-
-#define	EVSIOCCT  	kIOHIDClickTimeKey
-#define EVSIOCCT_SIZE	EVS_PACKED_TIME_SIZE
-
-#define EVSIOCADT 	kIOHIDAutoDimThresholdKey
-#define EVSIOCADT_SIZE	EVS_PACKED_TIME_SIZE
-
-#define EVSIOGDADT 	kIOHIDAutoDimTimeKey
-#define EVSIOGDADT_SIZE	EVS_PACKED_TIME_SIZE
-
-#define EVSIOIDLE 	kIOHIDIdleTimeKey
-#define EVSIOIDLE_SIZE	EVS_PACKED_TIME_SIZE
-
-#define	EVSIOCCS  	kIOHIDClickSpaceKey
-typedef enum {
-	EVSIOCCS_X,
-	EVSIOCCS_Y
-} evsioEVSIOCCSIndices;
-#define EVSIOCCS_SIZE	(EVSIOCCS_Y + 1)
-
-#define EVSIOCADS 	kIOHIDAutoDimStateKey
-#define EVSIOCADS_SIZE	1
-
-enum {
-    // Selectors for IOHIDGetModifierLockState and IOHIDSetModifierLockState
-    kIOHIDCapsLockState             = 0x00000001,
-    kIOHIDNumLockState              = 0x00000002,
-};
-
-#endif /* !_DEV_EVSIO_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIDShared.h b/i386/include/IOKit/hidsystem/IOHIDShared.h
deleted file mode 100644
index e7c5e3a..0000000
--- a/i386/include/IOKit/hidsystem/IOHIDShared.h
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/******************************************************************************
-
-    evio.h
-    Ioctl calls for the events driver
-    Leovitch 02Jan88
-    
-    Copyright 1988 NeXT, Inc.
-    
-	CAUTION: Developers should stick to the API exported in
-		<drivers/event_status_driver.h> to guarantee
-		binary compatability of their applications in future
-		releases.
-
-    Modified:
-    
-    09Dec88 Leo  Broken out from evsio.h
-    24Aug89 Ted  ANSI function prototyping.
-    19Feb90 Ted  Major revision for multiple driver support.
-    26Feb90 Ted  New evioScreen structure and EVIOST ioctl.
-    12Mar90 Ted  New ev_unregister_screen function, SCREENTOKEN constant.
-    06May90 Ted  Added AALastEventSent and AALastEventConsumed to EvVars.
-    22May90 Trey More wait cursor vars in EvVars.
-    13Jun90 Ted  NXCursorData structure.
-    18Jun90 Ted  Default wait cursor constants.
-    26Sep90 Ted  Enhanced cursor system to support intelligent drivers.
-    26Nov90 Ted  Removed NXSaveCursor and NXCursorData structures
-    28Nov90 Ted  Remove EvVars, rolled into EventGlobals
-    28Nov90 Ted  Renamed EventGlobals -> EvGlobals, eventGlobals -> evg
-    05May92 Mike Reworked for NRW driver architecture.
-
-******************************************************************************/
-
-#ifndef _DEV_EVIO_H
-#define _DEV_EVIO_H
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-#if KERNEL
-#include <IOKit/system.h>
-#else /* !KERNEL */
-#include <mach/message.h>
-#include <IOKit/IOKitLib.h>
-#endif /* KERNEL */
-
-#include <IOKit/IOReturn.h>
-#include <IOKit/graphics/IOGraphicsTypes.h>
-#include <IOKit/hidsystem/IOHIDTypes.h>
-#include <IOKit/hidsystem/IOLLEvent.h>
-
-/*
- * Identify this driver as one that uses the new driverkit and messaging API
- */
-#ifndef _NeXT_MACH_EVENT_DRIVER_
-#define _NeXT_MACH_EVENT_DRIVER_	(1)
-#endif /* _NeXT_MACH_EVENT_DRIVER_ */
-
-
-/* Pressure Constants */
-#define MINPRESSURE EV_MINPRESSURE
-#define MAXPRESSURE EV_MAXPRESSURE
-
-#define	LLEQSIZE 240	/* Entries in low-level event queue */
-
-typedef struct _NXEQElStruct {
-    int	next;		/* Slot of lleq for next event */
-    ev_lock_data_t sema; /* Is high-level code reading this event now? */
-    NXEvent event;	/* The event itself */
-} NXEQElement;
-
-
-/******************************************************************************
-    SHARED MEMORY OVERVIEW
-    
-    PERSPECTIVE
-    The ev driver and PostScript share at least one page of wired memory.
-    This memory contains the low-level event queue which ev deposits events
-    into and PostScript reads events from. Also, this memory contains other
-    important data such as wait cursor state and some general cursor state.
-    This memory is critical for speed.  That is, we avoid having to make
-    system calls for common operations.
-    
-    SHARED MEMORY REGIONS
-    There are currently three "regions" or "zones" delineated within this
-    shared memory.  The first zone is the EvOffsets structure. This structure
-    contains two offsets from the beginning of shared memory. The first offset
-    is to the second zone, EvGlobals. The second offset is to the third
-    zone, private shmem for drivers.
-    
-    INITIALIZATION OF SHARED MEMORY
-    When the WindowServer starts up, it finds all screens that will be active.
-    It then opens the ev driver and calls the EVIOSSCR ioctl repeatedly for
-    each screen in use. This lets the ev driver set up the evScreen array
-    and fill in each element. This ioctl also returns to PostScript a running
-    total shared memory size with which to allocate. PostScript then allocates
-    a region of memory this size and calls evmmap to "map in" this shared
-    region.  Evmmap initializes and fills in the EvOffsets and EvGlobals.
-    Next the WindowServer calls each screen in turn to register itself with
-    the ev driver in the same sequence as presented to EVIOSSCR.  Each screen
-    driver calls ev_register_screen() which among other things allocates a
-    part of the private shmem (of the third shared memory zone) for the driver.
-    
-    DEBUGGING NOTES
-    You can easily display and set this shared memory from kgdb, but usually
-    cannot do so from within PostScript.  Gdb (or some weird interaction
-    between gdb and the os) chokes on this shmem.  So if you read or write
-    this area of memory, copy-on-write will occur and you'll get a completely
-    new page for PostScript.  This will render the shared memory scheme
-    useless and you will have to restart PostScript.  It was my understanding
-    that before, we were able to "read" this area from PS, but not write to
-    it (the idea behind copy-on-WRITE).  However, this seems to be broken
-    in 2.0.  We think this is a kernel bug.
-******************************************************************************/
-
-typedef volatile struct _evOffsets {
-    int	evGlobalsOffset;	/* Offset to EvGlobals structure */
-    int evShmemOffset;		/* Offset to private shmem regions */
-} EvOffsets;
-
-/******************************************************************************
-    EvGlobals
-    This structures defines the portion of the events driver data structure
-    that is exported to the PostScript server. It contains the event queue
-    which is in memory shared between the driver and the PostScript server.
-    All the variables necessary to read and process events from the queue are
-    contained here.
-******************************************************************************/
-
-#ifndef __ppc__
-typedef volatile struct _evGlobals {
-    ev_lock_data_t cursorSema; 	/* set to disable periodic code */
-    int eNum;			/* Unique id for mouse events */
-    int buttons;		/* State of the mouse buttons 1==down, 0==up */
-    int eventFlags;		/* The current value of event.flags */
-    int VertRetraceClock;	/* The current value of event.time */
-    IOGPoint cursorLoc;		/* The current location of the cursor */
-    int frame;			/* current cursor frame */
-    IOGBounds workBounds;	/* bounding box of all screens */
-    IOGBounds mouseRect;	/* Rect for mouse-exited events */
-    int version;		/* for run time checks */
-    int	structSize;		/* for run time checks */
-    int lastFrame;
-    unsigned int reservedA[31];
-
-    unsigned reserved:27;
-    unsigned wantPressure:1;	/* pressure in current mouseRect? */
-    unsigned wantPrecision:1;	/* precise coordinates in current mouseRect? */
-    unsigned dontWantCoalesce:1;/* coalesce within the current mouseRect? */
-    unsigned dontCoalesce:1;	/* actual flag which determines coalescing */
-    unsigned mouseRectValid:1;	/* If nonzero, post a mouse-exited
-				   whenever mouse outside mouseRect. */
-    int movedMask;		/* This contains an event mask for the
-				   three events MOUSEMOVED,
-				   LMOUSEDRAGGED,  and RMOUSEDRAGGED.
-				   It says whether driver should
-				   generate those events. */
-    ev_lock_data_t waitCursorSema; /* protects wait cursor fields */
-    int AALastEventSent;	/* timestamp for wait cursor */
-    int AALastEventConsumed;	/* timestamp for wait cursor */	
-    int waitCursorUp;		/* Is wait cursor up? */
-    char ctxtTimedOut;		/* Has wait cursor timer expired? */
-    char waitCursorEnabled;	/* Play wait cursor game (per ctxt)? */
-    char globalWaitCursorEnabled; /* Play wait cursor game (global)? */
-    int waitThreshold;		/* time before wait cursor appears */
-
-    int LLEHead;		/* The next event to be read */
-    int LLETail;		/* Where the next event will go */
-    int LLELast;		/* The last event entered */
-    NXEQElement lleq[LLEQSIZE];	/* The event queue itself */
-} EvGlobals;
-
-#else
-
-typedef volatile struct _evGlobals {
-    ev_lock_data_t cursorSema; 	/* set to disable periodic code */
-    int LLEHead;		/* The next event to be read */
-    int LLETail;		/* Where the next event will go */
-    int LLELast;		/* The last event entered */
-    int eNum;			/* Unique id for mouse events */
-    int buttons;		/* State of the mouse buttons 1==down, 0==up */
-    int eventFlags;		/* The current value of event.flags */
-    int VertRetraceClock;	/* The current value of event.time */
-    IOGPoint cursorLoc;		/* The current location of the cursor */
-    int frame;			/* current cursor frame */
-    IOGBounds workBounds;	/* bounding box of all screens */
-    IOGBounds mouseRect;	/* Rect for mouse-exited events */
-    int version;		/* for run time checks */
-    int	structSize;		/* for run time checks */
-    int lastFrame;
-    unsigned int reservedA[31];
-
-    unsigned reserved:27;
-    unsigned wantPressure:1;	/* pressure in current mouseRect? */
-    unsigned wantPrecision:1;	/* precise coordinates in current mouseRect? */
-    unsigned dontWantCoalesce:1;/* coalesce within the current mouseRect? */
-    unsigned dontCoalesce:1;	/* actual flag which determines coalescing */
-    unsigned mouseRectValid:1;	/* If nonzero, post a mouse-exited
-				   whenever mouse outside mouseRect. */
-    int movedMask;		/* This contains an event mask for the
-				   three events MOUSEMOVED,
-				   LMOUSEDRAGGED,  and RMOUSEDRAGGED.
-				   It says whether driver should
-				   generate those events. */
-    int AALastEventSent;	/* timestamp for wait cursor */
-    int AALastEventConsumed;	/* timestamp for wait cursor */	
-    ev_lock_data_t waitCursorSema; /* protects wait cursor fields */
-    int waitCursorUp;		/* Is wait cursor up? */
-    char ctxtTimedOut;		/* Has wait cursor timer expired? */
-    char waitCursorEnabled;	/* Play wait cursor game (per ctxt)? */
-    char globalWaitCursorEnabled; /* Play wait cursor game (global)? */
-    int waitThreshold;		/* time before wait cursor appears */
-    NXEQElement lleq[LLEQSIZE];	/* The event queue itself */
-} EvGlobals;
-#endif
-
-/* These evio structs are used in various calls supported by the ev driver. */
-
-struct evioLLEvent {
-    int setCursor;
-    int type;
-    IOGPoint location;
-    NXEventData data;
-    int setFlags;
-    int flags;
-};
-
-typedef struct evioLLEvent _NXLLEvent;
-
-#ifdef mach3xxx
-
-/*
- * On a keypress of a VOL UP or VOL DOWN key, we send a message to the 
- * sound server to notify it of the volume change.  The message includes
- * a flag to indicate which key was pressed, and the machine independant
- * flag bits to indicate which modifier keys were pressed.
- */
-
-struct evioSpecialKeyMsg
-{
-	msg_header_t Head;
-	msg_type_t keyType;
-	int key;		// special key number, from bsd/dev/ev_keymap.h
-	msg_type_t directionType;
-	int direction;		// NX_KEYDOWN, NX_KEYUP from event.h
-	msg_type_t flagsType;
-	int flags;		// device independant flags from event.h
-	msg_type_t levelType;
-	int level;		// EV_AUDIO_MIN_VOLUME to EV_AUDIO_MAX_VOLUME
-};
-#else
-struct evioSpecialKeyMsg
-{
-	mach_msg_header_t Head;
-	int key;		// special key number, from bsd/dev/ev_keymap.h
-	int direction;		// NX_KEYDOWN, NX_KEYUP from event.h
-	int flags;		// device independant flags from event.h
-	int level;		// EV_AUDIO_MIN_VOLUME to EV_AUDIO_MAX_VOLUME
-};
-#endif
-
-#define EV_SPECIAL_KEY_MSG_ID	(('S'<<24) | ('k'<<16) | ('e'<<8) | ('y'))
-typedef struct evioSpecialKeyMsg *evioSpecialKeyMsg_t;
-
-/*
- * Volume ranges
- */
-#define EV_AUDIO_MIN_VOLUME	0
-#define EV_AUDIO_MAX_VOLUME	64
-
-#define kIOHIDSystemClass	"IOHIDSystem"
-#define kIOHIKeyboardClass	"IOHIKeyboard"
-#define kIOHIPointingClass	"IOHIPointing"
-
-#define IOHIDSYSTEM_CONFORMSTO	kIOHIDSystemClass
-
-enum {
-    kIOHIDCurrentShmemVersion	= 3,
-    kIOHIDEventNotification	= 0,
-};
-
-enum {
-    kIOHIDServerConnectType	= 0,
-    kIOHIDParamConnectType	= 1,
-    kIOHIDEventSystemConnectType = 3,
-};
-
-enum {
-    kIOHIDGlobalMemory          = 0
-};
-
-enum {
-    kIOHIDEventQueueTypeKernel  = 0,
-    kIOHIDEventQueueTypeUser    = 1
-};
-
-#ifdef KERNEL
-typedef UInt16 (*MasterVolumeUpdate)(void);
-typedef bool (*MasterMuteUpdate)(void);
-
-typedef struct {
-    MasterVolumeUpdate incrementMasterVolume;
-    MasterVolumeUpdate decrementMasterVolume;
-    MasterMuteUpdate toggleMasterMute;
-} MasterAudioFunctions;
-
-extern MasterAudioFunctions *masterAudioFunctions;
-#endif
-
-#ifndef KERNEL
-#ifndef _IOKIT_IOHIDLIB_H
-#include <IOKit/hidsystem/IOHIDLib.h>
-#endif
-#endif /* !KERNEL */
-
-__END_DECLS
-
-
-#endif /* !_DEV_EVIO_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIDSystem.h b/i386/include/IOKit/hidsystem/IOHIDSystem.h
deleted file mode 100644
index 1a78a38..0000000
--- a/i386/include/IOKit/hidsystem/IOHIDSystem.h
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2009 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/* 	Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved. 
- *
- * EventDriver.h - Exported Interface Event Driver object.
- *
- *		The EventDriver is a pseudo-device driver.
- *
- * HISTORY
- * 19 Mar 1992    Mike Paquette at NeXT
- *      Created. 
- * 4  Aug 1993	  Erik Kay at NeXT
- *	API cleanup
- */
-
-#ifndef	_IOHIDSYSTEM_H
-#define _IOHIDSYSTEM_H
-
-#include <TargetConditionals.h>
-#include <IOKit/IOTimerEventSource.h>
-#include <IOKit/IOInterruptEventSource.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/IOUserClient.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/pwr_mgt/IOPM.h>
-#if TARGET_OS_EMBEDDED
-class IOGraphicsDevice;
-#else
-#include <IOKit/graphics/IOGraphicsDevice.h>
-#endif
-#include <IOKit/hidsystem/IOHIDevice.h>
-#include <IOKit/hidsystem/IOHIDShared.h>
-#include <IOKit/hidsystem/IOHIDTypes.h>
-#include <IOKit/hidsystem/IOLLEvent.h>
-#include <IOKit/IODataQueue.h>
-#include <IOKit/hidsystem/ev_keymap.h>		/* For NX_NUM_SCANNED_SPECIALKEYS */
-
-           
-// The following messages should be unique across the entire system
-#ifndef sub_iokit_hidsystem
-#define sub_iokit_hidsystem                     err_sub(14)
-#endif
-
-#define kIOHIDSystem508MouseClickMessage        iokit_family_msg(sub_iokit_hidsystem, 1)
-#define kIOHIDSystemDeviceSeizeRequestMessage	iokit_family_msg(sub_iokit_hidsystem, 2)
-#define kIOHIDSystem508SpecialKeyDownMessage    iokit_family_msg(sub_iokit_hidsystem, 3)
-
-class IOHIDKeyboardDevice;
-class IOHIDPointingDevice;
-class IOHIDEvent;
-
-class IOHIDSystem : public IOService
-{
-	OSDeclareDefaultStructors(IOHIDSystem);
-
-	friend class IOHIDUserClient;
-	friend class IOHIDParamUserClient;
-	friend class IOHIDEventSystemUserClient;
-
-private:
-	IOWorkLoop *		workLoop;
-	IOTimerEventSource *  	timerES;
-	IOTimerEventSource *  	vblES;
-        IOInterruptEventSource * eventConsumerES;
-        IOInterruptEventSource * keyboardEQES;
-        IOCommandGate *		cmdGate;
-	IOUserClient *		serverConnect;
-	IOUserClient *		paramConnect;
-        IONotifier *		eventPublishNotify;
-        IONotifier *		eventTerminateNotify;
-        IONotifier *		publishNotify;
-        IONotifier *		terminateNotify;
-        
-        OSArray *		ioHIDevices;
-    OSSet             * touchEventPosters;
-
-	// Ports on which we hold send rights
-	mach_port_t	eventPort;	// Send msg here when event queue
-					// goes non-empty
-    mach_port_t stackShotPort;
-	mach_port_t	_specialKeyPort[NX_NUM_SCANNED_SPECIALKEYS]; // Special key msgs
-	void		*eventMsg;	// Msg to be sent to Window Server.
-	void		*stackShotMsg;	// Msg to be sent to Stack Shot.
-
-	// Shared memory area information
-    IOBufferMemoryDescriptor * globalMemory;
-	uintptr_t	shmem_addr;	// kernel address of shared memory
-	vm_size_t	shmem_size;	// size of shared memory
-    
-	// Pointers to structures which occupy the shared memory area.
-	volatile void	*evs;		// Pointer to private driver shmem
-	volatile EvGlobals *evg;	// Pointer to EvGlobals (shmem)
-	// Internal variables related to the shared memory area
-	int		lleqSize;	// # of entries in low-level queue
-                        // FIXME: why is this ivar lleqSize an ivar? {Dan]
-
-	// Screens list
-	vm_size_t	evScreenSize;	// Byte size of evScreen array
-	void		*evScreen;	// array of screens known to driver
-	volatile void	*lastShmemPtr;	// Pointer used to index thru shmem
-					// while assigning shared areas to
-					// drivers.
-	int		screens;	// running total of allocated screens
-	UInt32		cursorScreens;	// bit mask of screens with cursor present
-        UInt32		cursorPinScreen;// a screen to pin against
-	IOGBounds		cursorPin;	// Range to which cursor is pinned
-					// while on this screen.
-	IOGBounds		workSpace;	// IOGBounds of full workspace.
-	// Event Status state - This includes things like event timestamps,
-	// time til screen dim, and related things manipulated through the
-	// Event Status API.
-	//
-	IOGPoint	pointerLoc;	// Current pointing device location
-				// The value leads evg->cursorLoc.
-        IOGPoint	pointerDelta;	// The cumulative pointer delta values since
-                                // previous mouse move event was posted
-                                
-	IOGPoint	clickLoc;	// location of last mouse click
-	IOGPoint   clickSpaceThresh;	// max mouse delta to be a doubleclick
-	int	clickState;	// Current click state
-
-	bool evOpenCalled;	// Has the driver been opened?
-	bool evInitialized;	// Has the first-open-only initialization run?
-    bool evStateChanging;   // Is the event system state changing.
-	bool eventsOpen;	// Boolean: has evmmap been called yet?
-	bool cursorStarted;	// periodic events running?
-	bool cursorEnabled;	// cursor positioning ok?
-	bool cursorCoupled;	// cursor positioning on pointer moves ok?
-	bool cursorPinned;	// cursor positioning on pointer moves ok?
-
-	short leftENum;		// Unique ID for last left down event
-	short rightENum;	// Unique ID for last right down event
-	
-	// The periodic event mechanism timestamps and state
-	// are recorded here.
-	AbsoluteTime thisPeriodicRun;
-        AbsoluteTime periodicEventDelta;// Time between periodic events
-                                        // todo: make infinite
-        AbsoluteTime clickTime;		// Timestamps used to determine doubleclicks
-        AbsoluteTime clickTimeThresh;
-
-        AbsoluteTime waitSustain;	// Sustain time before removing cursor
-        AbsoluteTime waitSusTime;	// Sustain counter
-        AbsoluteTime waitFrameRate;	// Ticks per wait cursor frame
-        AbsoluteTime waitFrameTime;	// Wait cursor frame timer
-
-        AbsoluteTime lastRelativeEventTime;	// Used to post mouse events once per frame
-        AbsoluteTime lastRelativeMoveTime;
-        AbsoluteTime lastEventTime;
-        AbsoluteTime lastUndimEvent;
-        SInt32 postDeltaX, accumDX;
-        SInt32 postDeltaY, accumDY;
-
-	// Flags used in scheduling periodic event callbacks
-	bool		needSetCursorPosition;
-	bool		needToKickEventConsumer;
-        
-        IOService *	displayManager;	// points to display manager
-        IOPMPowerFlags	displayState;
-        
-        IOService *	rootDomain;
-        AbsoluteTime	stateChangeDeadline;
-        
-        OSDictionary *  savedParameters;	// keep user settings
-        
-        const char *    registryName;		// cache our name
-        UInt32		maxWaitCursorFrame;	// animation frames
-	UInt32		firstWaitCursorFrame;	//
-        
-        int		cachedEventFlags;
-        OSArray *  cachedButtonStates;
-        
-        OSArray * systemInfo;
-        
-        IOHIDPointingDevice * _hidPointingDevice;
-        IOHIDKeyboardDevice * _hidKeyboardDevice;
-
-        unsigned consumedKeyCode;
-        
-    OSObject * lastSender;
-    
-        UInt32 scrollZoomMask;
-        
-    bool setParamPropertiesInProgress;
-    
-    OSSet * dataQueueSet;
-        
-private:
-    void vblEvent(void);
-    UInt8 getSubtypeForSender(OSObject * sender);
-    void updateMouseEventForSender(OSObject * sender, NXEventData * evData);
-    void updateMouseMoveEventForSender(OSObject * sender, NXEventData * evData);
-    void updateScrollEventForSender(OSObject * sender, NXEventData * evData);
-    static void _vblEvent(OSObject *self, IOTimerEventSource *sender);
-
-  inline short getUniqueEventNum();
-
-  virtual IOReturn powerStateDidChangeTo( IOPMPowerFlags, unsigned long, IOService * );
- /* Resets */
-  void _resetMouseParameters();
-
-  /* Initialize the shared memory area */
-  void     initShmem(bool clean);
-  /* Dispatch low level events through shared memory to the WindowServer */
-  void postEvent(int           what,
-          /* at */       IOGPoint *       location,
-          /* atTime */   AbsoluteTime  ts,
-          /* withData */ NXEventData * myData,
-          /* sender */   OSObject *    sender   = 0,
-          /* pid */      UInt32        extPID   = 0,
-          /* processKEQ*/bool          processKEQ = true);
-  /* Dispatch mechanisms for screen state changes */
-  void evDispatch(
-            /* command */ EvCmd evcmd);
-  /* Dispatch mechanism for special key press */
-  void evSpecialKeyMsg(unsigned key,
-               /* direction */ unsigned dir,
-               /* flags */     unsigned f,
-               /* level */     unsigned l);
-  /* Message the event consumer to process posted events */
-  void kickEventConsumer();
-  void sendStackShotMessage();
-  
-  OSDictionary * createFilteredParamPropertiesForService(IOService * service, OSDictionary * dict);
-
-  static void _periodicEvents(IOHIDSystem * self,
-                              IOTimerEventSource *timer);
-
-  static void doSpecialKeyMsg(IOHIDSystem * self,
-					struct evioSpecialKeyMsg *msg);
-  static void doKickEventConsumer(IOHIDSystem * self);
-
-  static void doProcessKeyboardEQ(IOHIDSystem * self);
-  static void processKeyboardEQ(IOHIDSystem * self, AbsoluteTime * deadline = 0);
- 
-  static bool genericNotificationHandler( void * target, 
-				void * ref, IOService * newService );
-                
-  static bool handlePublishNotification( void * target, IOService * newService );
-
-  static bool handleTerminateNotification( void * target, IOService * service );
-
-  static void makeNumberParamProperty( OSDictionary * dict, const char * key,
-                            unsigned long long number, unsigned int bits );
-
-  static void makeInt32ArrayParamProperty( OSDictionary * dict, const char * key,
-                            UInt32 * array, unsigned int count );
-
-/*
- * HISTORICAL NOTE:
- *   The following methods were part of the IOHIDSystem(Input) category;
- *   the declarations have now been merged directly into this class.
- *
- * Exported Interface Event Driver object input services.
- */
-
-private:
-  // Schedule next periodic run based on current event system state.
-  void scheduleNextPeriodicEvent();
-  // Message invoked to run periodic events.  This method runs in the workloop.
-  void periodicEvents(IOTimerEventSource *timer);
-  // Start the cursor running.
-  bool startCursor();
-  // Repin cursor location.
-  bool resetCursor();
-  // Wait Cursor machinery.
-  void showWaitCursor();
-  void hideWaitCursor();
-  void animateWaitCursor();
-  void changeCursor(int frame);
-  // Return screen number a point lies on.
-  int  pointToScreen(IOGPoint * p);
-
-  inline void showCursor();
-  inline void hideCursor();
-  inline void moveCursor();
-  // Claim ownership of event sources.
-  void attachDefaultEventSources();
-  // Give up ownership of event sources.
-  void detachEventSources();
-  bool registerEventSource(IOService * source);
-
-  // Set abs cursor position.
-  void setCursorPosition(IOGPoint * newLoc, bool external, OSObject * sender=0);
-  void _setButtonState(int buttons,
-                       /* atTime */ AbsoluteTime ts,
-                       OSObject * sender);
-  void _setCursorPosition(IOGPoint * newLoc, bool external, bool proximityChange = false, OSObject * sender=0);
-
-  static bool _idleTimeSerializerCallback(void * target, void * ref, OSSerialize *s);
-
-  void _postMouseMoveEvent(int		what,
-                           IOGPoint *	location,
-                           AbsoluteTime	theClock,
-                           OSObject *	sender);
-  void createParameters( void );
-
-/* END HISTORICAL NOTE */
-
-public:
-  static IOHIDSystem * instance();     /* Return the current instance of the */
-				       /* EventDriver, or 0 if none. */
-  static void scaleLocationToCurrentScreen(IOGPoint *location, IOGBounds *bounds);
-
-  virtual bool init(OSDictionary * properties = 0);
-  virtual IOHIDSystem * probe(IOService *    provider,
-                              SInt32 * score);
-  virtual bool start(IOService * provider);
-  virtual IOReturn message(UInt32 type, IOService * provider,
-				void * argument);
-  virtual void free();
-  virtual bool attach( IOService * provider );
-  virtual void detach( IOService * provider );
-
-  virtual IOWorkLoop *getWorkLoop() const;
-
-  virtual IOReturn evOpen(void);
-  virtual IOReturn evClose(void);
-
-  virtual IOReturn  setProperties( OSObject * properties );
-  virtual IOReturn  setParamProperties(OSDictionary * dict);
-
-  /* Create the shared memory area */
-  virtual IOReturn createShmem(void*,void*,void*,void*,void*,void*);
-
-  /* register the IODataQueue for the new user events */
-  virtual IOReturn registerEventQueue(IODataQueue * queue);
-
-  /* Unregister the IODataQueue for the new user events */
-  virtual IOReturn unregisterEventQueue(IODataQueue * queue);
-
-  /* Set the port for event available notify msg */
-  virtual void     setEventPort(mach_port_t port);
-  /* Set the port for the special key keypress msg */
-  virtual IOReturn setSpecialKeyPort(
-                     /* keyFlavor */ int         special_key,
-                     /* keyPort */   mach_port_t key_port);
-  virtual mach_port_t specialKeyPort(int special_key);
-
-
-  virtual IOReturn newUserClient(task_t         owningTask,
-                 /* withToken */ void *         security_id,
-                 /* ofType */    UInt32         type,
-                 /* withProps*/  OSDictionary *  properties,
-                 /* client */    IOUserClient ** handler);
-
-/*
- * HISTORICAL NOTE:
- *   The following methods were part of the IOHIPointingEvents protocol;
- *   the declarations have now been merged directly into this class.
- */
-
-public: 
-  /* Mouse event reporting */
-  virtual void relativePointerEvent(int        buttons,
-                       /* deltaX */ int        dx,
-                       /* deltaY */ int        dy,
-                       /* atTime */ AbsoluteTime ts);
-
-  /* Tablet event reporting */
-  virtual void absolutePointerEvent(int        buttons,
-                 /* at */           IOGPoint *    newLoc,
-                 /* withBounds */   IOGBounds *bounds,
-                 /* inProximity */  bool       proximity,
-                 /* withPressure */ int        pressure,
-                 /* withAngle */    int        stylusAngle,
-                 /* atTime */       AbsoluteTime ts);
-
-  /* Mouse scroll wheel event reporting */
-  virtual void scrollWheelEvent(short deltaAxis1,
-                                short deltaAxis2,
-                                short deltaAxis3,
-                                AbsoluteTime ts);
-  
-
-  virtual void tabletEvent(NXEventData *tabletData,
-                           AbsoluteTime ts);
-
-  virtual void proximityEvent(NXEventData *proximityData,
-                              AbsoluteTime ts);
-
-/*
- * HISTORICAL NOTE:
- *   The following methods were part of the IOHIKeyboardEvents protocol;
- *   the declarations have now been merged directly into this class.
- */
-
-public:
-  virtual void keyboardEvent(unsigned   eventType,
-      /* flags */            unsigned   flags,
-      /* keyCode */          unsigned   key,
-      /* charCode */         unsigned   charCode,
-      /* charSet */          unsigned   charSet,
-      /* originalCharCode */ unsigned   origCharCode,
-      /* originalCharSet */  unsigned   origCharSet,
-      /* keyboardType */     unsigned   keyboardType,
-      /* repeat */           bool       repeat,
-      /* atTime */           AbsoluteTime ts);
-
-  virtual void keyboardSpecialEvent(   unsigned   eventType,
-                    /* flags */        unsigned   flags,
-                    /* keyCode  */     unsigned   key,
-                    /* specialty */    unsigned   flavor,
-                    /* guid */ 	       UInt64     guid,
-                    /* repeat */       bool       repeat,
-                    /* atTime */       AbsoluteTime ts);
-
-  virtual void updateEventFlags(unsigned flags);  /* Does not generate events */
-
-
-
-
-private:
-
-  /*
-   * statics for upstream callouts
-   */
-
-  void _scaleLocationToCurrentScreen(IOGPoint *location, IOGPoint *fraction, IOGBounds *bounds);  // Should this one be public???
-
-  static void _relativePointerEvent(IOHIDSystem * self,
-				    int        buttons,
-                       /* deltaX */ int        dx,
-                       /* deltaY */ int        dy,
-                       /* atTime */ AbsoluteTime ts,
-                                    OSObject * sender,
-                                    void *     refcon);
-
-  /* Tablet event reporting */
-  static void _absolutePointerEvent(IOHIDSystem * self,
-				    int        buttons,
-                 /* at */           IOGPoint *    newLoc,
-                 /* withBounds */   IOGBounds *bounds,
-                 /* inProximity */  bool       proximity,
-                 /* withPressure */ int        pressure,
-                 /* withAngle */    int        stylusAngle,
-                 /* atTime */       AbsoluteTime ts,
-                                    OSObject * sender,
-                                    void *     refcon);
-
-  /* Mouse scroll wheel event reporting */
-  static void _scrollWheelEvent(    IOHIDSystem *self,
-                                    short      deltaAxis1,
-                                    short      deltaAxis2,
-                                    short      deltaAxis3,
-                                    IOFixed    fixedDelta1,
-                                    IOFixed    fixedDelta2,
-                                    IOFixed    fixedDelta3,
-                                    SInt32  pointDeltaAxis1,
-                                    SInt32  pointDeltaAxis2,
-                                    SInt32  pointDeltaAxis3,
-                                    UInt32  options,
-                                    AbsoluteTime ts,
-                                    OSObject * sender,
-                                    void *     refcon);
-
-  static void _tabletEvent(         IOHIDSystem *self,
-                                    NXEventData *tabletData,
-                                    AbsoluteTime ts,
-                                    OSObject * sender,
-                                    void *     refcon);
-
-  static void _proximityEvent(      IOHIDSystem *self,
-                                    NXEventData *proximityData,
-                                    AbsoluteTime ts,
-                                    OSObject * sender,
-                                    void *     refcon);
-
-  static void _keyboardEvent(       IOHIDSystem * self,
-                                    unsigned   eventType,
-            /* flags */             unsigned   flags,
-            /* keyCode */           unsigned   key,
-            /* charCode */          unsigned   charCode,
-            /* charSet */           unsigned   charSet,
-            /* originalCharCode */  unsigned   origCharCode,
-            /* originalCharSet */   unsigned   origCharSet,
-            /* keyboardType */      unsigned   keyboardType,
-            /* repeat */            bool       repeat,
-            /* atTime */            AbsoluteTime ts,
-                                    OSObject * sender,
-                                    void *     refcon);
-            
-  static void _keyboardSpecialEvent(IOHIDSystem * self,
-                                    unsigned   eventType,
-                /* flags */         unsigned   flags,
-                /* keyCode  */      unsigned   key,
-                /* specialty */     unsigned   flavor,
-                /* guid */          UInt64     guid,
-                /* repeat */        bool       repeat,
-                /* atTime */        AbsoluteTime ts,
-                                    OSObject * sender,
-                                    void *     refcon);
-                
-  static void _updateEventFlags(    IOHIDSystem * self,
-                                    unsigned   flags,
-                                    OSObject * sender,
-                                    void *     refcon);  /* Does not generate events */
-
-
-/*
- * HISTORICAL NOTE:
- *   The following methods were part of the IOUserClient protocol;
- *   the declarations have now been merged directly into this class.
- */
-
-public:
-
-  virtual IOReturn setEventsEnable(void*,void*,void*,void*,void*,void*);
-  virtual IOReturn setCursorEnable(void*,void*,void*,void*,void*,void*);
-  virtual IOReturn extPostEvent(void*,void*,void*,void*,void*,void*);
-  virtual IOReturn extSetMouseLocation(void*,void*,void*,void*,void*,void*);
-  virtual IOReturn extGetButtonEventNum(void*,void*,void*,void*,void*,void*);
-  IOReturn extSetBounds( IOGBounds * bounds );
-    IOReturn extGetModifierLockState(void*,void*,void*,void*,void*,void*);
-    IOReturn extSetModifierLockState(void*,void*,void*,void*,void*,void*);
-
-/*
- * HISTORICAL NOTE:
- *   The following methods were part of the IOScreenRegistration protocol;
- *   the declarations have now been merged directly into this class.
- *
- * Methods exported by the EventDriver for display systems.
- *
- *	The screenRegister protocol is used by frame buffer drivers to register
- *	themselves with the Event Driver.  These methods are called in response
- *	to an _IOGetParameterInIntArray() call with "IO_Framebuffer_Register" or
- *	"IO_Framebuffer_Unregister".
- */
-
-public:
-  virtual int registerScreen(IOGraphicsDevice * instance,
-             /* bounds */    IOGBounds * bp);
-//           /* shmem */     void **  addr,
-//           /* size */      int *    size)
-  virtual void unregisterScreen(int index);
-    
-/*
- * HISTORICAL NOTE:
- *   The following methods were part of the IOWorkspaceBounds protocol;
- *   the declarations have now been merged directly into this class.
- *
- * Absolute position input devices and some specialized output devices
- * may need to know the bounding rectangle for all attached displays.
- * The following method returns a IOGBounds* for the workspace.  Please note
- * that the bounds are kept as signed values, and that on a multi-display
- * system the minx and miny values may very well be negative.
- */
-
-public:
-  virtual IOGBounds * workspaceBounds();
-
-/* END HISTORICAL NOTES */
-
-private:
-void relativePointerEvent(          int        buttons,
-                 /* deltaX */       int        dx,
-                 /* deltaY */       int        dy,
-                 /* atTime */       AbsoluteTime ts,
-                 /* senderID */     OSObject * sender);
-
-  /* Tablet event reporting */
-void absolutePointerEvent(          int        buttons,
-                 /* at */           IOGPoint *    newLoc,
-                 /* withBounds */   IOGBounds *bounds,
-                 /* inProximity */  bool       proximity,
-                 /* withPressure */ int        pressure,
-                 /* withAngle */    int        stylusAngle,
-                 /* atTime */       AbsoluteTime ts,
-                 /* senderID */     OSObject * sender);
-
-  /* Mouse scroll wheel event reporting */
-void scrollWheelEvent(	        short 	       deltaAxis1,
-                                short          deltaAxis2,
-                                short          deltaAxis3,
-                                IOFixed        fixedDelta1,
-                                IOFixed        fixedDelta2,
-                                IOFixed        fixedDelta3,
-                                SInt32         pointDeltaAxis1,
-                                SInt32         pointDeltaAxis2,
-                                SInt32         pointDeltaAxis3,
-                                UInt32         options,
-                                AbsoluteTime   ts,
-                                OSObject *     sender);
-
-void tabletEvent(	NXEventData * tabletData,
-                                AbsoluteTime ts,
-                                OSObject * sender);
-
-void proximityEvent(	NXEventData * proximityData,
-                                AbsoluteTime ts,
-                                OSObject * sender);
-
-void keyboardEvent(unsigned   eventType,
-      /* flags */            unsigned   flags,
-      /* keyCode */          unsigned   key,
-      /* charCode */         unsigned   charCode,
-      /* charSet */          unsigned   charSet,
-      /* originalCharCode */ unsigned   origCharCode,
-      /* originalCharSet */  unsigned   origCharSet,
-      /* keyboardType */     unsigned   keyboardType,
-      /* repeat */           bool       repeat,
-      /* atTime */           AbsoluteTime ts,
-      /* sender */           OSObject * sender);
-
-void keyboardSpecialEvent(   unsigned   eventType,
-      /* flags */        unsigned   flags,
-      /* keyCode  */     unsigned   key,
-      /* specialty */    unsigned   flavor,
-      /* guid */         UInt64     guid,
-      /* repeat */       bool       repeat,
-      /* atTime */       AbsoluteTime ts,
-      /* sender */       OSObject * sender);
-
-void updateEventFlags(unsigned flags, OSObject * sender);
-
-/*
- * COMMAND GATE COMPATIBILITY:
- *   The following method is part of the work needed to make IOHIDSystem
- *   compatible with IOCommandGate.  The use of IOCommandQueue has been
- *   deprecated, thus requiring this move.  This should allow for less
- *   context switching as all actions formerly run on the I/O Workloop
- *   thread, will now be run on the caller thread.  The static methods
- *   will be called from cmdGate->runAction and returns the appropriate 
- *   non-static helper method.  Arguments are stored in the void* array, 
- *   args, and are passed through.   Since we are returning in the static
- *   function, gcc3 should translate that to one instruction, thus 
- *   minimizing cost.
- */ 
-
-static	IOReturn	doEvClose (IOHIDSystem *self);
-        IOReturn	evCloseGated (void);
-        
-static	IOReturn	doSetEventsEnablePre (IOHIDSystem *self, void *p1);
-        IOReturn	setEventsEnablePreGated (void *p1);
-
-static	IOReturn	doSetEventsEnablePost (IOHIDSystem *self, void *p1);
-        IOReturn	setEventsEnablePostGated (void *p1);
-        
-static	IOReturn	doUnregisterScreen (IOHIDSystem *self, void * arg0);
-        void		unregisterScreenGated (int index);
-
-static	IOReturn	doCreateShmem (IOHIDSystem *self, void * arg0);
-        IOReturn	createShmemGated (void * p1);
-
-static	IOReturn	doRegisterEventQueue (IOHIDSystem *self, void * arg0);
-        IOReturn	registerEventQueueGated (void * p1);
-
-static	IOReturn	doUnregisterEventQueue (IOHIDSystem *self, void * arg0);
-        IOReturn	unregisterEventQueueGated (void * p1);
-
-static	IOReturn	doRelativePointerEvent (IOHIDSystem *self, void * args);
-        void		relativePointerEventGated(int buttons, 
-                                                    int dx, 
-                                                    int dy, 
-                                                    AbsoluteTime ts,
-                                                    OSObject * sender);
-
-static	IOReturn	doAbsolutePointerEvent (IOHIDSystem *self, void * args);        
-        void 		absolutePointerEventGated (int buttons,
-                                                    IOGPoint *    newLoc,
-                                                    IOGBounds *bounds,
-                                                    bool       proximity,
-                                                    int        pressure,
-                                                    int        stylusAngle,
-                                                    AbsoluteTime ts,
-                                                    OSObject * sender);
-
-static	IOReturn	doScrollWheelEvent(IOHIDSystem *self, void * args);        
-        void		scrollWheelEventGated (short deltaAxis1,
-                                                short deltaAxis2,
-                                                short deltaAxis3,
-                                               IOFixed  fixedDelta1,
-                                               IOFixed  fixedDelta2,
-                                               IOFixed  fixedDelta3,
-                                               SInt32   pointDeltaAxis1,
-                                               SInt32   pointDeltaAxis2,
-                                               SInt32   pointDeltaAxis3,
-                                               UInt32   options,
-                                                AbsoluteTime ts,
-                                                OSObject * sender);
-
-static	IOReturn	doTabletEvent (IOHIDSystem *self, void * arg0, void * arg1, void * arg2);        
-        void		tabletEventGated (	NXEventData *tabletData, 
-                                                AbsoluteTime ts, 
-                                                OSObject * sender);
-
-static	IOReturn	doProximityEvent (IOHIDSystem *self, void * arg0, void * arg1, void * arg2);        
-        void		proximityEventGated (	NXEventData *proximityData, 
-                                                AbsoluteTime ts, 
-                                                OSObject * sender);
-
-static	IOReturn	doKeyboardEvent (IOHIDSystem *self, void * args);        
-        void		keyboardEventGated (unsigned   eventType,
-                                            unsigned   flags,
-                                            unsigned   key,
-                                            unsigned   charCode,
-                                            unsigned   charSet,
-                                            unsigned   origCharCode,
-                                            unsigned   origCharSet,
-                                            unsigned   keyboardType,
-                                            bool       repeat,
-                                            AbsoluteTime ts,
-                                            OSObject * sender);
-
-static	IOReturn	doKeyboardSpecialEvent (IOHIDSystem *self, void * args);        
-        void		keyboardSpecialEventGated (   
-                                            unsigned   eventType,
-                                            unsigned   flags,
-                                            unsigned   key,
-                                            unsigned   flavor,
-                                            UInt64     guid,
-                                            bool       repeat,
-                                            AbsoluteTime ts,
-                                            OSObject * sender);
-
-static	IOReturn	doUpdateEventFlags (IOHIDSystem *self, void * args);        
-        void		updateEventFlagsGated (unsigned flags, OSObject * sender);
-
-static	IOReturn	doNewUserClient (IOHIDSystem *self, void * args);        
-        IOReturn 	newUserClientGated (task_t owningTask,
-                                            void * security_id,
-                                            UInt32 type,
-                                            OSDictionary *  properties,
-                                            IOUserClient ** handler);
-
-static	IOReturn	doSetCursorEnable (IOHIDSystem *self, void * arg0);        
-        IOReturn	setCursorEnableGated (void * p1);
-
-static	IOReturn	doExtPostEvent(IOHIDSystem *self, void * arg0, void * arg1, void * arg2, void * arg3);        
-        IOReturn	extPostEventGated (void * p1, void * p2, void * p3);
-
-static	IOReturn	doExtSetMouseLocation (IOHIDSystem *self, void * args);        
-        IOReturn	extSetMouseLocationGated (void * args);
-
-static	IOReturn	doExtGetButtonEventNum (IOHIDSystem *self, void * arg0, void * arg1);        
-        IOReturn	extGetButtonEventNumGated (void * p1, void * p2);
-
-static	IOReturn	doSetParamPropertiesPre (IOHIDSystem *self, void * arg0, void * arg1);        
-        IOReturn	setParamPropertiesPreGated (OSDictionary * dict, OSIterator ** pOpenIter);
-
-static	IOReturn	doSetParamPropertiesPost (IOHIDSystem *self, void * arg0);        
-        IOReturn	setParamPropertiesPostGated (OSDictionary * dict);
-        
-static	IOReturn	doExtGetToggleState (IOHIDSystem *self, void *p1, void *p2);        
-static	IOReturn	doExtSetToggleState (IOHIDSystem *self, void *p1, void *p2);        
-        IOReturn    getCapsLockState(unsigned int *state_O);
-        IOReturn    setCapsLockState(unsigned int state_I);
-        IOReturn    getNumLockState(unsigned int *state_O);
-        IOReturn    setNumLockState(unsigned int state_I);
-
-/* END COMMAND GATE COMPATIBILITY */
-
-public:
-    virtual void setStackShotPort(mach_port_t port);
-    
-    virtual UInt32 eventFlags();
-    
-    virtual void dispatchEvent(IOHIDEvent *event, IOOptionBits options=0);
-
-};
-
-#endif /* !_IOHIDSYSTEM_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIDTypes.h b/i386/include/IOKit/hidsystem/IOHIDTypes.h
deleted file mode 100644
index 786af07..0000000
--- a/i386/include/IOKit/hidsystem/IOHIDTypes.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/******************************************************************************
-	ev_types.h
-	Data types for the events status driver.
-	This file contains public API.
-	mpaque 11Oct91
-	
-	Copyright 1991 NeXT Computer, Inc.
-	
-	Modified:
-	
-******************************************************************************/
-
-#ifndef _DEV_EV_TYPES_H
-#define _DEV_EV_TYPES_H
-
-#include <mach/boolean.h>
-#include <IOKit/IOSharedLock.h>
-#include <IOKit/graphics/IOGraphicsTypes.h>
-
-/* Shared memory versions */
-#define EVENT_SYSTEM_VERSION   2
-
-/* Maximum length of SetMouseScaling arrays */
-#define NX_MAXMOUSESCALINGS 20
-
-typedef struct evsioKeymapping		/* Match old struct names in kernel */
-{
-    int size;
-    char *mapping;
-} NXKeyMapping;
-
-typedef struct evsioMouseScaling	/* Match old struct names in kernel */
-{
-    int numScaleLevels;
-    short scaleThresholds[NX_MAXMOUSESCALINGS];
-    short scaleFactors[NX_MAXMOUSESCALINGS];
-} NXMouseScaling;
-
-typedef enum {
-    NX_OneButton,
-    NX_LeftButton,
-    NX_RightButton
-} NXMouseButton;
-
-/*
- * NXEventSystemInfo() information structures.  These are designed to
- * allow for expansion.
- *
- * The current implementation of NXEventSystemInfo() uses an ioctl call.
- * THIS WILL CHANGE.
- */
- 
-/*
- * Generic query max size and typedefs.
- *
- *	The maximum size is selected to support anticipated future extensions
- *	of request flavors.  Certain flavors planned for future releases may 
- *	require roughtly 800 ints to represent.  We allow a little extra, in
- *	case further growth is needed.
- */
-typedef int *NXEventSystemInfoType;
-#define NX_EVS_INFO_MAX		(1024)	/* Max array size */
-typedef int NXEventSystemInfoData[NX_EVS_INFO_MAX];
-
-/* Event System Devices query */
-#define NX_EVS_DEVICE_MAX	16
-
-	/* Interface types */
-#define NX_EVS_DEVICE_INTERFACE_OTHER		0
-#define NX_EVS_DEVICE_INTERFACE_NeXT		1 // NeXT custom, in older sys
-#define NX_EVS_DEVICE_INTERFACE_ADB		2 // NeXT/fruit keybds/mice
-#define NX_EVS_DEVICE_INTERFACE_ACE		3 // For x86 PC keyboards
-#define NX_EVS_DEVICE_INTERFACE_SERIAL_ACE	4 // For PC serial mice 
-#define NX_EVS_DEVICE_INTERFACE_BUS_ACE		5 // For PC bus mice 
-#define NX_EVS_DEVICE_INTERFACE_HIL		6 // For HIL hp keyboard 
-#define NX_EVS_DEVICE_INTERFACE_TYPE5		7 // For Sun Type5 keyboard
-
-/*
- * Note! if any new interface types are added above, the following
- * definition of the number of interfaces supported must reflect this.
- * This is used in the libkeymap project (storemap.c module) which needs
- * to be cognizant of the number of new devices coming online
- * via support for heterogeneous architecture platforms.
- * e.g., PCs, HP's HIL, Sun's Type5 keyboard,...
- */
-#define NUM_SUPPORTED_INTERFACES	(NX_EVS_DEVICE_INTERFACE_TYPE5 + 1)
-					// Other, NeXT, ADB, ACE,...
-
-	/* Device types */
-#define NX_EVS_DEVICE_TYPE_OTHER	0
-#define NX_EVS_DEVICE_TYPE_KEYBOARD	1
-#define NX_EVS_DEVICE_TYPE_MOUSE	2	// Relative position devices
-#define NX_EVS_DEVICE_TYPE_TABLET	3	// Absolute position devices
-
-typedef struct {
-	int	interface;	/* NeXT, ADB, other */
-	int	interface_addr;	/* Device address on the interface */
-	int	dev_type;	/* Keyboard, mouse, tablet, other */
-	int	id;		/* manufacturer's device handler ID */
-} NXEventSystemDevice;
-
-typedef struct {
-	NXEventSystemDevice	dev[NX_EVS_DEVICE_MAX];
-} NXEventSystemDeviceList;
-
-#define __OLD_NX_EVS_DEVICE_INFO		1
-#define NX_EVS_DEVICE_INFO			"Evs_EventDeviceInfo"
-#define NX_EVS_DEVICE_INFO_COUNT \
-	(sizeof (NXEventSystemDeviceList) / sizeof (int))
-
-/*
- * Types used in evScreen protocol compliant operations.
- */
-
-typedef enum {EVNOP, EVHIDE, EVSHOW, EVMOVE, EVLEVEL} EvCmd; /* Cursor state */
-
-#define EV_SCREEN_MIN_BRIGHTNESS	0
-#define EV_SCREEN_MAX_BRIGHTNESS	64
-/* Scale should lie between MIN_BRIGHTNESS and MAX_BRIGHTNESS */
-#define EV_SCALE_BRIGHTNESS( scale, datum ) \
-	((((UInt32)(datum))*((UInt32)scale)) >> 6)
-
-/*
- * Definition of a tick, as a time in milliseconds. This controls how
- * often the event system periodic jobs are run.  All actual tick times
- * are derived from the nanosecond timer.  These values are typically used
- * as part of computing mouse velocity for acceleration purposes.
- */
-#define EV_TICK_TIME		16			/* 16 milliseconds */
-#define EV_TICKS_PER_SEC	(1000/EV_TICK_TIME)	/* ~ 62 Hz */
-
-/* Mouse Button bits, as passed from an EventSrc to the Event Driver */
-#define EV_RB			(0x01)
-#define EV_LB			(0x04)
-#define EV_MOUSEBUTTONMASK	(EV_LB | EV_RB)
-
-/* Tablet Pressure Constants, as passed from an EventSrc to the Event Driver */
-#define EV_MINPRESSURE 0
-#define EV_MAXPRESSURE 255
-
-/* Cursor size in pixels */
-#define EV_CURSOR_WIDTH		16
-#define EV_CURSOR_HEIGHT	16
-
-
-#define kAppleOnboardGUID 	0x0610000000000000ULL
-
-#endif /* !_DEV_EV_TYPES_H */
-
diff --git a/i386/include/IOKit/hidsystem/IOHIDUsageTables.h b/i386/include/IOKit/hidsystem/IOHIDUsageTables.h
deleted file mode 100644
index ff0fd88..0000000
--- a/i386/include/IOKit/hidsystem/IOHIDUsageTables.h
+++ /dev/null
@@ -1,1665 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _IOHIDUSAGETABLES_H
-#define _IOHIDUSAGETABLES_H
-
-/* ******************************************************************************************
- * HID Usage Tables
- *
- * The following constants are from the USB 'HID Usage Tables' specification, revision 1.1rc3
- * ****************************************************************************************** */
-
-
-/* Usage Pages */
-enum
-{
-	kHIDPage_Undefined	= 0x00,
-	kHIDPage_GenericDesktop	= 0x01,
-	kHIDPage_Simulation	= 0x02,
-	kHIDPage_VR	= 0x03,
-	kHIDPage_Sport	= 0x04,
-	kHIDPage_Game	= 0x05,
-	/* Reserved 0x06 */
-	kHIDPage_KeyboardOrKeypad	= 0x07,	/* USB Device Class Definition for Human Interface Devices (HID). Note: the usage type for all key codes is Selector (Sel). */
-	kHIDPage_LEDs	= 0x08,
-	kHIDPage_Button	= 0x09,
-	kHIDPage_Ordinal	= 0x0A,
-	kHIDPage_Telephony	= 0x0B,
-	kHIDPage_Consumer	= 0x0C,
-	kHIDPage_Digitizer	= 0x0D,
-	/* Reserved 0x0E */
-	kHIDPage_PID	= 0x0F,	/* USB Physical Interface Device definitions for force feedback and related devices. */
-	kHIDPage_Unicode	= 0x10,
-	/* Reserved 0x11 - 0x13 */
-	kHIDPage_AlphanumericDisplay	= 0x14,
-	/* Reserved 0x15 - 0x7F */
-	/* Monitor 0x80 - 0x83	 USB Device Class Definition for Monitor Devices */
-	/* Power 0x84 - 0x87	 USB Device Class Definition for Power Devices */
-	kHIDPage_PowerDevice = 0x84, 				/* Power Device Page */
-	kHIDPage_BatterySystem = 0x85, 				/* Battery System Page */
-	/* Reserved 0x88 - 0x8B */
-	kHIDPage_BarCodeScanner	= 0x8C,	/* (Point of Sale) USB Device Class Definition for Bar Code Scanner Devices */
-	kHIDPage_WeighingDevice	= 0x8D,	/* (Point of Sale) USB Device Class Definition for Weighing Devices */
-	kHIDPage_Scale	= 0x8D,	/* (Point of Sale) USB Device Class Definition for Scale Devices */
-    kHIDPage_MagneticStripeReader = 0x8E,
-	/* ReservedPointofSalepages 0x8F */
-	kHIDPage_CameraControl	= 0x90,	/* USB Device Class Definition for Image Class Devices */
-	kHIDPage_Arcade	= 0x91,	/* OAAF Definitions for arcade and coinop related Devices */
-	/* Reserved 0x92 - 0xFEFF */
-	/* VendorDefined 0xFF00 - 0xFFFF */
-	kHIDPage_VendorDefinedStart	= 0xFF00
-};
-
-/* Undefined Usage for all usage pages */
-enum
-{
-	kHIDUsage_Undefined	= 0x00
-};
-
-/* GenericDesktop Page (0x01) */
-enum
-{
-	kHIDUsage_GD_Pointer	= 0x01,	/* Physical Collection */
-	kHIDUsage_GD_Mouse	= 0x02,	/* Application Collection */
-	/* 0x03 Reserved */
-	kHIDUsage_GD_Joystick	= 0x04,	/* Application Collection */
-	kHIDUsage_GD_GamePad	= 0x05,	/* Application Collection */
-	kHIDUsage_GD_Keyboard	= 0x06,	/* Application Collection */
-	kHIDUsage_GD_Keypad	= 0x07,	/* Application Collection */
-	kHIDUsage_GD_MultiAxisController	= 0x08,	/* Application Collection */
-	/* 0x09 - 0x2F Reserved */
-	kHIDUsage_GD_X	= 0x30,	/* Dynamic Value */
-	kHIDUsage_GD_Y	= 0x31,	/* Dynamic Value */
-	kHIDUsage_GD_Z	= 0x32,	/* Dynamic Value */
-	kHIDUsage_GD_Rx	= 0x33,	/* Dynamic Value */
-	kHIDUsage_GD_Ry	= 0x34,	/* Dynamic Value */
-	kHIDUsage_GD_Rz	= 0x35,	/* Dynamic Value */
-	kHIDUsage_GD_Slider	= 0x36,	/* Dynamic Value */
-	kHIDUsage_GD_Dial	= 0x37,	/* Dynamic Value */
-	kHIDUsage_GD_Wheel	= 0x38,	/* Dynamic Value */
-	kHIDUsage_GD_Hatswitch	= 0x39,	/* Dynamic Value */
-	kHIDUsage_GD_CountedBuffer	= 0x3A,	/* Logical Collection */
-	kHIDUsage_GD_ByteCount	= 0x3B,	/* Dynamic Value */
-	kHIDUsage_GD_MotionWakeup	= 0x3C,	/* One-Shot Control */
-	kHIDUsage_GD_Start	= 0x3D,	/* On/Off Control */
-	kHIDUsage_GD_Select	= 0x3E,	/* On/Off Control */
-	/* 0x3F Reserved */
-	kHIDUsage_GD_Vx	= 0x40,	/* Dynamic Value */
-	kHIDUsage_GD_Vy	= 0x41,	/* Dynamic Value */
-	kHIDUsage_GD_Vz	= 0x42,	/* Dynamic Value */
-	kHIDUsage_GD_Vbrx	= 0x43,	/* Dynamic Value */
-	kHIDUsage_GD_Vbry	= 0x44,	/* Dynamic Value */
-	kHIDUsage_GD_Vbrz	= 0x45,	/* Dynamic Value */
-	kHIDUsage_GD_Vno	= 0x46,	/* Dynamic Value */
-	/* 0x47 - 0x7F Reserved */
-	kHIDUsage_GD_SystemControl	= 0x80,	/* Application Collection */
-	kHIDUsage_GD_SystemPowerDown	= 0x81,	/* One-Shot Control */
-	kHIDUsage_GD_SystemSleep	= 0x82,	/* One-Shot Control */
-	kHIDUsage_GD_SystemWakeUp	= 0x83,	/* One-Shot Control */
-	kHIDUsage_GD_SystemContextMenu	= 0x84,	/* One-Shot Control */
-	kHIDUsage_GD_SystemMainMenu	= 0x85,	/* One-Shot Control */
-	kHIDUsage_GD_SystemAppMenu	= 0x86,	/* One-Shot Control */
-	kHIDUsage_GD_SystemMenuHelp	= 0x87,	/* One-Shot Control */
-	kHIDUsage_GD_SystemMenuExit	= 0x88,	/* One-Shot Control */
-	kHIDUsage_GD_SystemMenu	= 0x89,	/* Selector */
-	kHIDUsage_GD_SystemMenuRight	= 0x8A,	/* Re-Trigger Control */
-	kHIDUsage_GD_SystemMenuLeft	= 0x8B,	/* Re-Trigger Control */
-	kHIDUsage_GD_SystemMenuUp	= 0x8C,	/* Re-Trigger Control */
-	kHIDUsage_GD_SystemMenuDown	= 0x8D,	/* Re-Trigger Control */
-	/* 0x8E - 0x8F Reserved */
-	kHIDUsage_GD_DPadUp	= 0x90,	/* On/Off Control */
-	kHIDUsage_GD_DPadDown	= 0x91,	/* On/Off Control */
-	kHIDUsage_GD_DPadRight	= 0x92,	/* On/Off Control */
-	kHIDUsage_GD_DPadLeft	= 0x93,	/* On/Off Control */
-	/* 0x94 - 0xFFFF Reserved */
-	kHIDUsage_GD_Reserved = 0xFFFF
-};
-
-/* Simulation Page (0x02) */
-/* This section provides detailed descriptions of the usages employed by simulation devices. */
-enum
-{
-	kHIDUsage_Sim_FlightSimulationDevice	= 0x01,	/* Application Collection */
-	kHIDUsage_Sim_AutomobileSimulationDevice	= 0x02,	/* Application Collection */
-	kHIDUsage_Sim_TankSimulationDevice	= 0x03,	/* Application Collection */
-	kHIDUsage_Sim_SpaceshipSimulationDevice	= 0x04,	/* Application Collection */
-	kHIDUsage_Sim_SubmarineSimulationDevice	= 0x05,	/* Application Collection */
-	kHIDUsage_Sim_SailingSimulationDevice	= 0x06,	/* Application Collection */
-	kHIDUsage_Sim_MotorcycleSimulationDevice	= 0x07,	/* Application Collection */
-	kHIDUsage_Sim_SportsSimulationDevice	= 0x08,	/* Application Collection */
-	kHIDUsage_Sim_AirplaneSimulationDevice	= 0x09,	/* Application Collection */
-	kHIDUsage_Sim_HelicopterSimulationDevice	= 0x0A,	/* Application Collection */
-	kHIDUsage_Sim_MagicCarpetSimulationDevice	= 0x0B,	/* Application Collection */
-	kHIDUsage_Sim_BicycleSimulationDevice	= 0x0C,	/* Application Collection */
-	/* 0x0D - 0x1F Reserved */
-	kHIDUsage_Sim_FlightControlStick	= 0x20,	/* Application Collection */
-	kHIDUsage_Sim_FlightStick	= 0x21,	/* Application Collection */
-	kHIDUsage_Sim_CyclicControl	= 0x22,	/* Physical Collection */
-	kHIDUsage_Sim_CyclicTrim	= 0x23,	/* Physical Collection */
-	kHIDUsage_Sim_FlightYoke	= 0x24,	/* Application Collection */
-	kHIDUsage_Sim_TrackControl	= 0x25,	/* Physical Collection */
-	/* 0x26 - 0xAF Reserved */
-	kHIDUsage_Sim_Aileron	= 0xB0,	/* Dynamic Value */
-	kHIDUsage_Sim_AileronTrim	= 0xB1,	/* Dynamic Value */
-	kHIDUsage_Sim_AntiTorqueControl	= 0xB2,	/* Dynamic Value */
-	kHIDUsage_Sim_AutopilotEnable	= 0xB3,	/* On/Off Control */
-	kHIDUsage_Sim_ChaffRelease	= 0xB4,	/* One-Shot Control */
-	kHIDUsage_Sim_CollectiveControl	= 0xB5,	/* Dynamic Value */
-	kHIDUsage_Sim_DiveBrake	= 0xB6,	/* Dynamic Value */
-	kHIDUsage_Sim_ElectronicCountermeasures	= 0xB7,	/* On/Off Control */
-	kHIDUsage_Sim_Elevator	= 0xB8,	/* Dynamic Value */
-	kHIDUsage_Sim_ElevatorTrim	= 0xB9,	/* Dynamic Value */
-	kHIDUsage_Sim_Rudder	= 0xBA,	/* Dynamic Value */
-	kHIDUsage_Sim_Throttle	= 0xBB,	/* Dynamic Value */
-	kHIDUsage_Sim_FlightCommunications	= 0xBC,	/* On/Off Control */
-	kHIDUsage_Sim_FlareRelease	= 0xBD,	/* One-Shot Control */
-	kHIDUsage_Sim_LandingGear	= 0xBE,	/* On/Off Control */
-	kHIDUsage_Sim_ToeBrake	= 0xBF,	/* Dynamic Value */
-	kHIDUsage_Sim_Trigger	= 0xC0,	/* Momentary Control */
-	kHIDUsage_Sim_WeaponsArm	= 0xC1,	/* On/Off Control */
-	kHIDUsage_Sim_Weapons	= 0xC2,	/* Selector */
-	kHIDUsage_Sim_WingFlaps	= 0xC3,	/* Dynamic Value */
-	kHIDUsage_Sim_Accelerator	= 0xC4,	/* Dynamic Value */
-	kHIDUsage_Sim_Brake	= 0xC5,	/* Dynamic Value */
-	kHIDUsage_Sim_Clutch	= 0xC6,	/* Dynamic Value */
-	kHIDUsage_Sim_Shifter	= 0xC7,	/* Dynamic Value */
-	kHIDUsage_Sim_Steering	= 0xC8,	/* Dynamic Value */
-	kHIDUsage_Sim_TurretDirection	= 0xC9,	/* Dynamic Value */
-	kHIDUsage_Sim_BarrelElevation	= 0xCA,	/* Dynamic Value */
-	kHIDUsage_Sim_DivePlane	= 0xCB,	/* Dynamic Value */
-	kHIDUsage_Sim_Ballast	= 0xCC,	/* Dynamic Value */
-	kHIDUsage_Sim_BicycleCrank	= 0xCD,	/* Dynamic Value */
-	kHIDUsage_Sim_HandleBars	= 0xCE,	/* Dynamic Value */
-	kHIDUsage_Sim_FrontBrake	= 0xCF,	/* Dynamic Value */
-	kHIDUsage_Sim_RearBrake	= 0xD0,	/* Dynamic Value */
-	/* 0xD1 - 0xFFFF Reserved */
-	kHIDUsage_Sim_Reserved = 0xFFFF
-};
-
-/* VR Page (0x03) */
-/* Virtual Reality controls depend on designators to identify the individual controls. Most of the following are */
-/* usages are applied to the collections of entities that comprise the actual device. */
-enum
-{
-	kHIDUsage_VR_Belt	= 0x01,	/* Application Collection */
-	kHIDUsage_VR_BodySuit	= 0x02,	/* Application Collection */
-	kHIDUsage_VR_Flexor	= 0x03,	/* Physical Collection */
-	kHIDUsage_VR_Glove	= 0x04,	/* Application Collection */
-	kHIDUsage_VR_HeadTracker	= 0x05,	/* Physical Collection */
-	kHIDUsage_VR_HeadMountedDisplay	= 0x06,	/* Application Collection */
-	kHIDUsage_VR_HandTracker	= 0x07,	/* Application Collection */
-	kHIDUsage_VR_Oculometer	= 0x08,	/* Application Collection */
-	kHIDUsage_VR_Vest	= 0x09,	/* Application Collection */
-	kHIDUsage_VR_AnimatronicDevice	= 0x0A,	/* Application Collection */
-	/* 0x0B - 0x1F Reserved */
-	kHIDUsage_VR_StereoEnable	= 0x20,	/* On/Off Control */
-	kHIDUsage_VR_DisplayEnable	= 0x21,	/* On/Off Control */
-	/* 0x22 - 0xFFFF Reserved */
-	kHIDUsage_VR_Reserved = 0xFFFF
-};
-
-/* Sport Page (0x04) */
-enum
-{
-	kHIDUsage_Sprt_BaseballBat	= 0x01,	/* Application Collection */
-	kHIDUsage_Sprt_GolfClub	= 0x02,	/* Application Collection */
-	kHIDUsage_Sprt_RowingMachine	= 0x03,	/* Application Collection */
-	kHIDUsage_Sprt_Treadmill	= 0x04,	/* Application Collection */
-	/* 0x05 - 0x2F Reserved */
-	kHIDUsage_Sprt_Oar	= 0x30,	/* Dynamic Value */
-	kHIDUsage_Sprt_Slope	= 0x31,	/* Dynamic Value */
-	kHIDUsage_Sprt_Rate	= 0x32,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickSpeed	= 0x33,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickFaceAngle	= 0x34,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickHeelOrToe	= 0x35,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickFollowThrough	= 0x36,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickTempo	= 0x37,	/* Dynamic Value */
-	kHIDUsage_Sprt_StickType	= 0x38,	/* Named Array */
-	kHIDUsage_Sprt_StickHeight	= 0x39,	/* Dynamic Value */
-	/* 0x3A - 0x4F Reserved */
-	kHIDUsage_Sprt_Putter	= 0x50,	/* Selector */
-	kHIDUsage_Sprt_1Iron	= 0x51,	/* Selector */
-	kHIDUsage_Sprt_2Iron	= 0x52,	/* Selector */
-	kHIDUsage_Sprt_3Iron	= 0x53,	/* Selector */
-	kHIDUsage_Sprt_4Iron	= 0x54,	/* Selector */
-	kHIDUsage_Sprt_5Iron	= 0x55,	/* Selector */
-	kHIDUsage_Sprt_6Iron	= 0x56,	/* Selector */
-	kHIDUsage_Sprt_7Iron	= 0x57,	/* Selector */
-	kHIDUsage_Sprt_8Iron	= 0x58,	/* Selector */
-	kHIDUsage_Sprt_9Iron	= 0x59,	/* Selector */
-	kHIDUsage_Sprt_10Iron	= 0x5A,	/* Selector */
-	kHIDUsage_Sprt_11Iron	= 0x5B,	/* Selector */
-	kHIDUsage_Sprt_SandWedge	= 0x5C,	/* Selector */
-	kHIDUsage_Sprt_LoftWedge	= 0x5D,	/* Selector */
-	kHIDUsage_Sprt_PowerWedge	= 0x5E,	/* Selector */
-	kHIDUsage_Sprt_1Wood	= 0x5F,	/* Selector */
-	kHIDUsage_Sprt_3Wood	= 0x60,	/* Selector */
-	kHIDUsage_Sprt_5Wood	= 0x61,	/* Selector */
-	kHIDUsage_Sprt_7Wood	= 0x62,	/* Selector */
-	kHIDUsage_Sprt_9Wood	= 0x63,	/* Selector */
-	/* 0x64 - 0xFFFF Reserved */
-	kHIDUsage_Sprt_Reserved = 0xFFFF
-};
-
-/* Game Page (0x05) */
-enum
-{
-	kHIDUsage_Game_3DGameController	= 0x01,	/* Application Collection */
-	kHIDUsage_Game_PinballDevice	= 0x02,	/* Application Collection */
-	kHIDUsage_Game_GunDevice	= 0x03,	/* Application Collection */
-	/* 0x04 - 0x1F Reserved */
-	kHIDUsage_Game_PointofView	= 0x20,	/* Physical Collection */
-	kHIDUsage_Game_TurnRightOrLeft	= 0x21,	/* Dynamic Value */
-	kHIDUsage_Game_PitchUpOrDown	= 0x22,	/* Dynamic Value */
-	kHIDUsage_Game_RollRightOrLeft	= 0x23,	/* Dynamic Value */
-	kHIDUsage_Game_MoveRightOrLeft	= 0x24,	/* Dynamic Value */
-	kHIDUsage_Game_MoveForwardOrBackward	= 0x25,	/* Dynamic Value */
-	kHIDUsage_Game_MoveUpOrDown	= 0x26,	/* Dynamic Value */
-	kHIDUsage_Game_LeanRightOrLeft	= 0x27,	/* Dynamic Value */
-	kHIDUsage_Game_LeanForwardOrBackward	= 0x28,	/* Dynamic Value */
-	kHIDUsage_Game_HeightOfPOV	= 0x29,	/* Dynamic Value */
-	kHIDUsage_Game_Flipper	= 0x2A,	/* Momentary Control */
-	kHIDUsage_Game_SecondaryFlipper	= 0x2B,	/* Momentary Control */
-	kHIDUsage_Game_Bump	= 0x2C,	/* Momentary Control */
-	kHIDUsage_Game_NewGame	= 0x2D,	/* One-Shot Control */
-	kHIDUsage_Game_ShootBall	= 0x2E,	/* One-Shot Control */
-	kHIDUsage_Game_Player	= 0x2F,	/* One-Shot Control */
-	kHIDUsage_Game_GunBolt	= 0x30,	/* On/Off Control */
-	kHIDUsage_Game_GunClip	= 0x31,	/* On/Off Control */
-	kHIDUsage_Game_Gun	= 0x32,	/* Selector */
-	kHIDUsage_Game_GunSingleShot	= 0x33,	/* Selector */
-	kHIDUsage_Game_GunBurst	= 0x34,	/* Selector */
-	kHIDUsage_Game_GunAutomatic	= 0x35,	/* Selector */
-	kHIDUsage_Game_GunSafety	= 0x36,	/* On/Off Control */
-	kHIDUsage_Game_GamepadFireOrJump	= 0x37,	/* Logical Collection */
-	kHIDUsage_Game_GamepadTrigger	= 0x39,	/* Logical Collection */
-	/* 0x3A - 0xFFFF Reserved */
-	kHIDUsage_Game_Reserved = 0xFFFF
-};
-
-/* KeyboardOrKeypad Page (0x07) */
-/* This section is the Usage Page for key codes to be used in implementing a USB keyboard. A Boot Keyboard (84-, 101- or 104-key) should at a minimum support all associated usage codes as indicated in the ÒBootÓ */
-/* column below. */
-/* The usage type of all key codes is Selectors (Sel), except for the modifier keys Keyboard Left Control (0x224) to Keyboard Right GUI (0x231) which are Dynamic Flags (DV). */
-/* Note: A general note on Usages and languages: Due to the variation of keyboards from language to language, it is not feasible to specify exact key mappings for every language. Where this list is not specific for a key function in a language, the closest equivalent key position should be used, so that a keyboard may be modified for a different language by simply printing different keycaps. One example is the Y key on a North American keyboard. In Germany this is typically Z. Rather than changing the keyboard firmware to put the Z Usage into that place in the descriptor list, the vendor should use the Y Usage on both the North American and German keyboards. This continues to be the existing practice in the industry, in order to minimize the number of changes to the electronics to accommodate otherlanguages. */
-enum
-{
-	kHIDUsage_KeyboardErrorRollOver	= 0x01,	/* ErrorRollOver */
-	kHIDUsage_KeyboardPOSTFail	= 0x02,	/* POSTFail */
-	kHIDUsage_KeyboardErrorUndefined	= 0x03,	/* ErrorUndefined */
-	kHIDUsage_KeyboardA	= 0x04,	/* a or A */
-	kHIDUsage_KeyboardB	= 0x05,	/* b or B */
-	kHIDUsage_KeyboardC	= 0x06,	/* c or C */
-	kHIDUsage_KeyboardD	= 0x07,	/* d or D */
-	kHIDUsage_KeyboardE	= 0x08,	/* e or E */
-	kHIDUsage_KeyboardF	= 0x09,	/* f or F */
-	kHIDUsage_KeyboardG	= 0x0A,	/* g or G */
-	kHIDUsage_KeyboardH	= 0x0B,	/* h or H */
-	kHIDUsage_KeyboardI	= 0x0C,	/* i or I */
-	kHIDUsage_KeyboardJ	= 0x0D,	/* j or J */
-	kHIDUsage_KeyboardK	= 0x0E,	/* k or K */
-	kHIDUsage_KeyboardL	= 0x0F,	/* l or L */
-	kHIDUsage_KeyboardM	= 0x10,	/* m or M */
-	kHIDUsage_KeyboardN	= 0x11,	/* n or N */
-	kHIDUsage_KeyboardO	= 0x12,	/* o or O */
-	kHIDUsage_KeyboardP	= 0x13,	/* p or P */
-	kHIDUsage_KeyboardQ	= 0x14,	/* q or Q */
-	kHIDUsage_KeyboardR	= 0x15,	/* r or R */
-	kHIDUsage_KeyboardS	= 0x16,	/* s or S */
-	kHIDUsage_KeyboardT	= 0x17,	/* t or T */
-	kHIDUsage_KeyboardU	= 0x18,	/* u or U */
-	kHIDUsage_KeyboardV	= 0x19,	/* v or V */
-	kHIDUsage_KeyboardW	= 0x1A,	/* w or W */
-	kHIDUsage_KeyboardX	= 0x1B,	/* x or X */
-	kHIDUsage_KeyboardY	= 0x1C,	/* y or Y */
-	kHIDUsage_KeyboardZ	= 0x1D,	/* z or Z */
-	kHIDUsage_Keyboard1	= 0x1E,	/* 1 or ! */
-	kHIDUsage_Keyboard2	= 0x1F,	/* 2 or @ */
-	kHIDUsage_Keyboard3	= 0x20,	/* 3 or # */
-	kHIDUsage_Keyboard4	= 0x21,	/* 4 or $ */
-	kHIDUsage_Keyboard5	= 0x22,	/* 5 or % */
-	kHIDUsage_Keyboard6	= 0x23,	/* 6 or ^ */
-	kHIDUsage_Keyboard7	= 0x24,	/* 7 or & */
-	kHIDUsage_Keyboard8	= 0x25,	/* 8 or * */
-	kHIDUsage_Keyboard9	= 0x26,	/* 9 or ( */
-	kHIDUsage_Keyboard0	= 0x27,	/* 0 or ) */
-	kHIDUsage_KeyboardReturnOrEnter	= 0x28,	/* Return (Enter) */
-	kHIDUsage_KeyboardEscape	= 0x29,	/* Escape */
-	kHIDUsage_KeyboardDeleteOrBackspace	= 0x2A,	/* Delete (Backspace) */
-	kHIDUsage_KeyboardTab	= 0x2B,	/* Tab */
-	kHIDUsage_KeyboardSpacebar	= 0x2C,	/* Spacebar */
-	kHIDUsage_KeyboardHyphen	= 0x2D,	/* - or _ */
-	kHIDUsage_KeyboardEqualSign	= 0x2E,	/* = or + */
-	kHIDUsage_KeyboardOpenBracket	= 0x2F,	/* [ or { */
-	kHIDUsage_KeyboardCloseBracket	= 0x30,	/* ] or } */
-	kHIDUsage_KeyboardBackslash	= 0x31,	/* \ or | */
-	kHIDUsage_KeyboardNonUSPound	= 0x32,	/* Non-US # or _ */
-	kHIDUsage_KeyboardSemicolon	= 0x33,	/* ; or : */
-	kHIDUsage_KeyboardQuote	= 0x34,	/* ' or " */
-	kHIDUsage_KeyboardGraveAccentAndTilde	= 0x35,	/* Grave Accent and Tilde */
-	kHIDUsage_KeyboardComma	= 0x36,	/* , or < */
-	kHIDUsage_KeyboardPeriod	= 0x37,	/* . or > */
-	kHIDUsage_KeyboardSlash	= 0x38,	/* / or ? */
-	kHIDUsage_KeyboardCapsLock	= 0x39,	/* Caps Lock */
-	kHIDUsage_KeyboardF1	= 0x3A,	/* F1 */
-	kHIDUsage_KeyboardF2	= 0x3B,	/* F2 */
-	kHIDUsage_KeyboardF3	= 0x3C,	/* F3 */
-	kHIDUsage_KeyboardF4	= 0x3D,	/* F4 */
-	kHIDUsage_KeyboardF5	= 0x3E,	/* F5 */
-	kHIDUsage_KeyboardF6	= 0x3F,	/* F6 */
-	kHIDUsage_KeyboardF7	= 0x40,	/* F7 */
-	kHIDUsage_KeyboardF8	= 0x41,	/* F8 */
-	kHIDUsage_KeyboardF9	= 0x42,	/* F9 */
-	kHIDUsage_KeyboardF10	= 0x43,	/* F10 */
-	kHIDUsage_KeyboardF11	= 0x44,	/* F11 */
-	kHIDUsage_KeyboardF12	= 0x45,	/* F12 */
-	kHIDUsage_KeyboardPrintScreen	= 0x46,	/* Print Screen */
-	kHIDUsage_KeyboardScrollLock	= 0x47,	/* Scroll Lock */
-	kHIDUsage_KeyboardPause	= 0x48,	/* Pause */
-	kHIDUsage_KeyboardInsert	= 0x49,	/* Insert */
-	kHIDUsage_KeyboardHome	= 0x4A,	/* Home */
-	kHIDUsage_KeyboardPageUp	= 0x4B,	/* Page Up */
-	kHIDUsage_KeyboardDeleteForward	= 0x4C,	/* Delete Forward */
-	kHIDUsage_KeyboardEnd	= 0x4D,	/* End */
-	kHIDUsage_KeyboardPageDown	= 0x4E,	/* Page Down */
-	kHIDUsage_KeyboardRightArrow	= 0x4F,	/* Right Arrow */
-	kHIDUsage_KeyboardLeftArrow	= 0x50,	/* Left Arrow */
-	kHIDUsage_KeyboardDownArrow	= 0x51,	/* Down Arrow */
-	kHIDUsage_KeyboardUpArrow	= 0x52,	/* Up Arrow */
-	kHIDUsage_KeypadNumLock	= 0x53,	/* Keypad NumLock or Clear */
-	kHIDUsage_KeypadSlash	= 0x54,	/* Keypad / */
-	kHIDUsage_KeypadAsterisk	= 0x55,	/* Keypad * */
-	kHIDUsage_KeypadHyphen	= 0x56,	/* Keypad - */
-	kHIDUsage_KeypadPlus	= 0x57,	/* Keypad + */
-	kHIDUsage_KeypadEnter	= 0x58,	/* Keypad Enter */
-	kHIDUsage_Keypad1	= 0x59,	/* Keypad 1 or End */
-	kHIDUsage_Keypad2	= 0x5A,	/* Keypad 2 or Down Arrow */
-	kHIDUsage_Keypad3	= 0x5B,	/* Keypad 3 or Page Down */
-	kHIDUsage_Keypad4	= 0x5C,	/* Keypad 4 or Left Arrow */
-	kHIDUsage_Keypad5	= 0x5D,	/* Keypad 5 */
-	kHIDUsage_Keypad6	= 0x5E,	/* Keypad 6 or Right Arrow */
-	kHIDUsage_Keypad7	= 0x5F,	/* Keypad 7 or Home */
-	kHIDUsage_Keypad8	= 0x60,	/* Keypad 8 or Up Arrow */
-	kHIDUsage_Keypad9	= 0x61,	/* Keypad 9 or Page Up */
-	kHIDUsage_Keypad0	= 0x62,	/* Keypad 0 or Insert */
-	kHIDUsage_KeypadPeriod	= 0x63,	/* Keypad . or Delete */
-	kHIDUsage_KeyboardNonUSBackslash	= 0x64,	/* Non-US \ or | */
-	kHIDUsage_KeyboardApplication	= 0x65,	/* Application */
-	kHIDUsage_KeyboardPower	= 0x66,	/* Power */
-	kHIDUsage_KeypadEqualSign	= 0x67,	/* Keypad = */
-	kHIDUsage_KeyboardF13	= 0x68,	/* F13 */
-	kHIDUsage_KeyboardF14	= 0x69,	/* F14 */
-	kHIDUsage_KeyboardF15	= 0x6A,	/* F15 */
-	kHIDUsage_KeyboardF16	= 0x6B,	/* F16 */
-	kHIDUsage_KeyboardF17	= 0x6C,	/* F17 */
-	kHIDUsage_KeyboardF18	= 0x6D,	/* F18 */
-	kHIDUsage_KeyboardF19	= 0x6E,	/* F19 */
-	kHIDUsage_KeyboardF20	= 0x6F,	/* F20 */
-	kHIDUsage_KeyboardF21	= 0x70,	/* F21 */
-	kHIDUsage_KeyboardF22	= 0x71,	/* F22 */
-	kHIDUsage_KeyboardF23	= 0x72,	/* F23 */
-	kHIDUsage_KeyboardF24	= 0x73,	/* F24 */
-	kHIDUsage_KeyboardExecute	= 0x74,	/* Execute */
-	kHIDUsage_KeyboardHelp	= 0x75,	/* Help */
-	kHIDUsage_KeyboardMenu	= 0x76,	/* Menu */
-	kHIDUsage_KeyboardSelect	= 0x77,	/* Select */
-	kHIDUsage_KeyboardStop	= 0x78,	/* Stop */
-	kHIDUsage_KeyboardAgain	= 0x79,	/* Again */
-	kHIDUsage_KeyboardUndo	= 0x7A,	/* Undo */
-	kHIDUsage_KeyboardCut	= 0x7B,	/* Cut */
-	kHIDUsage_KeyboardCopy	= 0x7C,	/* Copy */
-	kHIDUsage_KeyboardPaste	= 0x7D,	/* Paste */
-	kHIDUsage_KeyboardFind	= 0x7E,	/* Find */
-	kHIDUsage_KeyboardMute	= 0x7F,	/* Mute */
-	kHIDUsage_KeyboardVolumeUp	= 0x80,	/* Volume Up */
-	kHIDUsage_KeyboardVolumeDown	= 0x81,	/* Volume Down */
-	kHIDUsage_KeyboardLockingCapsLock	= 0x82,	/* Locking Caps Lock */
-	kHIDUsage_KeyboardLockingNumLock	= 0x83,	/* Locking Num Lock */
-	kHIDUsage_KeyboardLockingScrollLock	= 0x84,	/* Locking Scroll Lock */
-	kHIDUsage_KeypadComma	= 0x85,	/* Keypad Comma */
-	kHIDUsage_KeypadEqualSignAS400	= 0x86,	/* Keypad Equal Sign for AS/400 */
-	kHIDUsage_KeyboardInternational1	= 0x87,	/* International1 */
-	kHIDUsage_KeyboardInternational2	= 0x88,	/* International2 */
-	kHIDUsage_KeyboardInternational3	= 0x89,	/* International3 */
-	kHIDUsage_KeyboardInternational4	= 0x8A,	/* International4 */
-	kHIDUsage_KeyboardInternational5	= 0x8B,	/* International5 */
-	kHIDUsage_KeyboardInternational6	= 0x8C,	/* International6 */
-	kHIDUsage_KeyboardInternational7	= 0x8D,	/* International7 */
-	kHIDUsage_KeyboardInternational8	= 0x8E,	/* International8 */
-	kHIDUsage_KeyboardInternational9	= 0x8F,	/* International9 */
-	kHIDUsage_KeyboardLANG1	= 0x90,	/* LANG1 */
-	kHIDUsage_KeyboardLANG2	= 0x91,	/* LANG2 */
-	kHIDUsage_KeyboardLANG3	= 0x92,	/* LANG3 */
-	kHIDUsage_KeyboardLANG4	= 0x93,	/* LANG4 */
-	kHIDUsage_KeyboardLANG5	= 0x94,	/* LANG5 */
-	kHIDUsage_KeyboardLANG6	= 0x95,	/* LANG6 */
-	kHIDUsage_KeyboardLANG7	= 0x96,	/* LANG7 */
-	kHIDUsage_KeyboardLANG8	= 0x97,	/* LANG8 */
-	kHIDUsage_KeyboardLANG9	= 0x98,	/* LANG9 */
-	kHIDUsage_KeyboardAlternateErase	= 0x99,	/* AlternateErase */
-	kHIDUsage_KeyboardSysReqOrAttention	= 0x9A,	/* SysReq/Attention */
-	kHIDUsage_KeyboardCancel	= 0x9B,	/* Cancel */
-	kHIDUsage_KeyboardClear	= 0x9C,	/* Clear */
-	kHIDUsage_KeyboardPrior	= 0x9D,	/* Prior */
-	kHIDUsage_KeyboardReturn	= 0x9E,	/* Return */
-	kHIDUsage_KeyboardSeparator	= 0x9F,	/* Separator */
-	kHIDUsage_KeyboardOut	= 0xA0,	/* Out */
-	kHIDUsage_KeyboardOper	= 0xA1,	/* Oper */
-	kHIDUsage_KeyboardClearOrAgain	= 0xA2,	/* Clear/Again */
-	kHIDUsage_KeyboardCrSelOrProps	= 0xA3,	/* CrSel/Props */
-	kHIDUsage_KeyboardExSel	= 0xA4,	/* ExSel */
-	/* 0xA5-0xDF Reserved */
-	kHIDUsage_KeyboardLeftControl	= 0xE0,	/* Left Control */
-	kHIDUsage_KeyboardLeftShift	= 0xE1,	/* Left Shift */
-	kHIDUsage_KeyboardLeftAlt	= 0xE2,	/* Left Alt */
-	kHIDUsage_KeyboardLeftGUI	= 0xE3,	/* Left GUI */
-	kHIDUsage_KeyboardRightControl	= 0xE4,	/* Right Control */
-	kHIDUsage_KeyboardRightShift	= 0xE5,	/* Right Shift */
-	kHIDUsage_KeyboardRightAlt	= 0xE6,	/* Right Alt */
-	kHIDUsage_KeyboardRightGUI	= 0xE7,	/* Right GUI */
-	/* 0xE8-0xFFFF Reserved */
-	kHIDUsage_Keyboard_Reserved = 0xFFFF
-};
-
-/* LEDs Page (0x08) */
-/* An LED or indicator is implemented as an On/Off Control (OOF) using the ÒSingle button toggleÓ mode, where a value of 1 will turn on the indicator, and a value of 0 will turn it off. The exceptions are described below. */
-enum
-{
-	kHIDUsage_LED_NumLock	= 0x01,	/* On/Off Control */
-	kHIDUsage_LED_CapsLock	= 0x02,	/* On/Off Control */
-	kHIDUsage_LED_ScrollLock	= 0x03,	/* On/Off Control */
-	kHIDUsage_LED_Compose	= 0x04,	/* On/Off Control */
-	kHIDUsage_LED_Kana	= 0x05,	/* On/Off Control */
-	kHIDUsage_LED_Power	= 0x06,	/* On/Off Control */
-	kHIDUsage_LED_Shift	= 0x07,	/* On/Off Control */
-	kHIDUsage_LED_DoNotDisturb	= 0x08,	/* On/Off Control */
-	kHIDUsage_LED_Mute	= 0x09,	/* On/Off Control */
-	kHIDUsage_LED_ToneEnable	= 0x0A,	/* On/Off Control */
-	kHIDUsage_LED_HighCutFilter	= 0x0B,	/* On/Off Control */
-	kHIDUsage_LED_LowCutFilter	= 0x0C,	/* On/Off Control */
-	kHIDUsage_LED_EqualizerEnable	= 0x0D,	/* On/Off Control */
-	kHIDUsage_LED_SoundFieldOn	= 0x0E,	/* On/Off Control */
-	kHIDUsage_LED_SurroundOn	= 0x0F,	/* On/Off Control */
-	kHIDUsage_LED_Repeat	= 0x10,	/* On/Off Control */
-	kHIDUsage_LED_Stereo	= 0x11,	/* On/Off Control */
-	kHIDUsage_LED_SamplingRateDetect	= 0x12,	/* On/Off Control */
-	kHIDUsage_LED_Spinning	= 0x13,	/* On/Off Control */
-	kHIDUsage_LED_CAV	= 0x14,	/* On/Off Control */
-	kHIDUsage_LED_CLV	= 0x15,	/* On/Off Control */
-	kHIDUsage_LED_RecordingFormatDetect	= 0x16,	/* On/Off Control */
-	kHIDUsage_LED_OffHook	= 0x17,	/* On/Off Control */
-	kHIDUsage_LED_Ring	= 0x18,	/* On/Off Control */
-	kHIDUsage_LED_MessageWaiting	= 0x19,	/* On/Off Control */
-	kHIDUsage_LED_DataMode	= 0x1A,	/* On/Off Control */
-	kHIDUsage_LED_BatteryOperation	= 0x1B,	/* On/Off Control */
-	kHIDUsage_LED_BatteryOK	= 0x1C,	/* On/Off Control */
-	kHIDUsage_LED_BatteryLow	= 0x1D,	/* On/Off Control */
-	kHIDUsage_LED_Speaker	= 0x1E,	/* On/Off Control */
-	kHIDUsage_LED_HeadSet	= 0x1F,	/* On/Off Control */
-	kHIDUsage_LED_Hold	= 0x20,	/* On/Off Control */
-	kHIDUsage_LED_Microphone	= 0x21,	/* On/Off Control */
-	kHIDUsage_LED_Coverage	= 0x22,	/* On/Off Control */
-	kHIDUsage_LED_NightMode	= 0x23,	/* On/Off Control */
-	kHIDUsage_LED_SendCalls	= 0x24,	/* On/Off Control */
-	kHIDUsage_LED_CallPickup	= 0x25,	/* On/Off Control */
-	kHIDUsage_LED_Conference	= 0x26,	/* On/Off Control */
-	kHIDUsage_LED_StandBy	= 0x27,	/* On/Off Control */
-	kHIDUsage_LED_CameraOn	= 0x28,	/* On/Off Control */
-	kHIDUsage_LED_CameraOff	= 0x29,	/* On/Off Control */
-	kHIDUsage_LED_OnLine	= 0x2A,	/* On/Off Control */
-	kHIDUsage_LED_OffLine	= 0x2B,	/* On/Off Control */
-	kHIDUsage_LED_Busy	= 0x2C,	/* On/Off Control */
-	kHIDUsage_LED_Ready	= 0x2D,	/* On/Off Control */
-	kHIDUsage_LED_PaperOut	= 0x2E,	/* On/Off Control */
-	kHIDUsage_LED_PaperJam	= 0x2F,	/* On/Off Control */
-	kHIDUsage_LED_Remote	= 0x30,	/* On/Off Control */
-	kHIDUsage_LED_Forward	= 0x31,	/* On/Off Control */
-	kHIDUsage_LED_Reverse	= 0x32,	/* On/Off Control */
-	kHIDUsage_LED_Stop	= 0x33,	/* On/Off Control */
-	kHIDUsage_LED_Rewind	= 0x34,	/* On/Off Control */
-	kHIDUsage_LED_FastForward	= 0x35,	/* On/Off Control */
-	kHIDUsage_LED_Play	= 0x36,	/* On/Off Control */
-	kHIDUsage_LED_Pause	= 0x37,	/* On/Off Control */
-	kHIDUsage_LED_Record	= 0x38,	/* On/Off Control */
-	kHIDUsage_LED_Error	= 0x39,	/* On/Off Control */
-	kHIDUsage_LED_Usage	= 0x3A,	/* Selector */
-	kHIDUsage_LED_UsageInUseIndicator	= 0x3B,	/* Usage Switch */
-	kHIDUsage_LED_UsageMultiModeIndicator	= 0x3C,	/* Usage Modifier */
-	kHIDUsage_LED_IndicatorOn	= 0x3D,	/* Selector */
-	kHIDUsage_LED_IndicatorFlash	= 0x3E,	/* Selector */
-	kHIDUsage_LED_IndicatorSlowBlink	= 0x3F,	/* Selector */
-	kHIDUsage_LED_IndicatorFastBlink	= 0x40,	/* Selector */
-	kHIDUsage_LED_IndicatorOff	= 0x41,	/* Selector */
-	kHIDUsage_LED_FlashOnTime	= 0x42,	/* Dynamic Value */
-	kHIDUsage_LED_SlowBlinkOnTime	= 0x43,	/* Dynamic Value */
-	kHIDUsage_LED_SlowBlinkOffTime	= 0x44,	/* Dynamic Value */
-	kHIDUsage_LED_FastBlinkOnTime	= 0x45,	/* Dynamic Value */
-	kHIDUsage_LED_FastBlinkOffTime	= 0x46,	/* Dynamic Value */
-	kHIDUsage_LED_UsageIndicatorColor	= 0x47,	/* Usage Modifier */
-	kHIDUsage_LED_IndicatorRed	= 0x48,	/* Selector */
-	kHIDUsage_LED_IndicatorGreen	= 0x49,	/* Selector */
-	kHIDUsage_LED_IndicatorAmber	= 0x4A,	/* Selector */
-	kHIDUsage_LED_GenericIndicator	= 0x4B,	/* On/Off Control */
-	kHIDUsage_LED_SystemSuspend	= 0x4C,	/* On/Off Control */
-	kHIDUsage_LED_ExternalPowerConnected	= 0x4D,	/* On/Off Control */
-	/* 0x4E - 0xFFFF Reserved */
-	kHIDUsage_LED_Reserved = 0xFFFF
-};
-
-/* Button Page (0x09) */
-/* The Button page is the first place an application should look for user selection controls. System graphical user interfaces typically employ a pointer and a set of hierarchical selectors to select, move and otherwise manipulate their environment. For these purposes the following assignment of significance can be applied to the Button usages: */
-/* ¥ Button 1, Primary Button. Used for object selecting, dragging, and double click activation. On MacOS, this is the only button. Microsoft operating systems call this a logical left button, because it */
-/* is not necessarily physically located on the left of the pointing device. */
-/* ¥ Button 2, Secondary Button. Used by newer graphical user interfaces to browse object properties. Exposed by systems to applications that typically assign application-specific functionality. */
-/* ¥ Button 3, Tertiary Button. Optional control. Exposed to applications, but seldom assigned functionality due to prevalence of two- and one-button devices. */
-/* ¥ Buttons 4 -55. As the button number increases, its significance as a selector decreases. */
-/* In many ways the assignment of button numbers is similar to the assignment of Effort in Physical descriptors. Button 1 would be used to define the button a finger rests on when the hand is in the Òat restÓ position, that is, virtually no effort is required by the user to activate the button. Button values increment as the finger has to stretch to reach a control. See Section 6.2.3, ÒPhysical Descriptors,Ó in the HID Specification for methods of further qualifying buttons. */
-enum
-{
-	kHIDUsage_Button_1	= 0x01,	/* (primary/trigger) */
-	kHIDUsage_Button_2	= 0x02,	/* (secondary) */
-	kHIDUsage_Button_3	= 0x03,	/* (tertiary) */
-	kHIDUsage_Button_4	= 0x04, /* 4th button */
-	/* ... */
-	kHIDUsage_Button_65535	= 0xFFFF
-};
-
-/* Ordinal Page (0x0A) */
-/* The Ordinal page allows multiple instances of a control or sets of controls to be declared without requiring individual enumeration in the native usage page. For example, it is not necessary to declare usages of Pointer 1, Pointer 2, and so forth on the Generic Desktop page. When parsed, the ordinal instance number is, in essence, concatenated to the usages attached to the encompassing collection to create Pointer 1, Pointer 2, and so forth. */
-/* For an example, see Section A.5, ÒMultiple Instances of a Control,Ó in Appendix A, ÒUsage Examples.Ó By convention, an Ordinal collection is placed inside the collection for which it is declaring multiple instances. */
-/* Instances do not have to be identical. */
-enum
-{
-	/* 0x00 Reserved */
-	kHIDUsage_Ord_Instance1	= 0x01,	/* Usage Modifier */
-	kHIDUsage_Ord_Instance2	= 0x02,	/* Usage Modifier */
-	kHIDUsage_Ord_Instance3	= 0x03,	/* Usage Modifier */
-	kHIDUsage_Ord_Instance4	= 0x04,	/* Usage Modifier */
-	kHIDUsage_Ord_Instance65535	= 0xFFFF	/* Usage Modifier */
-};
-
-/* Telephony Page (0x0B) */
-/* This usage page defines the keytop and control usages for telephony devices. */
-/* Indicators on a phone are handled by wrapping them in LED: Usage In Use Indicator and LED: Usage Selected Indicator usages. For example, a message-indicator LED would be identified by a Telephony: Message usage declared as a Feature or Output in a LED: Usage In Use Indicator collection. */
-/* See Section 14, ÒConsumer Page (0x0C),Ó for audio volume and tone controls. */
-enum
-{
-	kHIDUsage_Tfon_Phone	= 0x01,	/* Application Collection */
-	kHIDUsage_Tfon_AnsweringMachine	= 0x02,	/* Application Collection */
-	kHIDUsage_Tfon_MessageControls	= 0x03,	/* Logical Collection */
-	kHIDUsage_Tfon_Handset	= 0x04,	/* Logical Collection */
-	kHIDUsage_Tfon_Headset	= 0x05,	/* Logical Collection */
-	kHIDUsage_Tfon_TelephonyKeyPad	= 0x06,	/* Named Array */
-	kHIDUsage_Tfon_ProgrammableButton	= 0x07,	/* Named Array */
-	/* 0x08 - 0x1F Reserved */
-	kHIDUsage_Tfon_HookSwitch	= 0x20,	/* On/Off Control */
-	kHIDUsage_Tfon_Flash	= 0x21,	/* Momentary Control */
-	kHIDUsage_Tfon_Feature	= 0x22,	/* One-Shot Control */
-	kHIDUsage_Tfon_Hold	= 0x23,	/* On/Off Control */
-	kHIDUsage_Tfon_Redial	= 0x24,	/* One-Shot Control */
-	kHIDUsage_Tfon_Transfer	= 0x25,	/* One-Shot Control */
-	kHIDUsage_Tfon_Drop	= 0x26,	/* One-Shot Control */
-	kHIDUsage_Tfon_Park	= 0x27,	/* On/Off Control */
-	kHIDUsage_Tfon_ForwardCalls	= 0x28,	/* On/Off Control */
-	kHIDUsage_Tfon_AlternateFunction	= 0x29,	/* Momentary Control */
-	kHIDUsage_Tfon_Line	= 0x2A,	/* One-Shot Control */
-	kHIDUsage_Tfon_SpeakerPhone	= 0x2B,	/* On/Off Control */
-	kHIDUsage_Tfon_Conference	= 0x2C,	/* On/Off Control */
-	kHIDUsage_Tfon_RingEnable	= 0x2D,	/* On/Off Control */
-	kHIDUsage_Tfon_Ring	= 0x2E,	/* Selector */
-	kHIDUsage_Tfon_PhoneMute	= 0x2F,	/* On/Off Control */
-	kHIDUsage_Tfon_CallerID	= 0x30,	/* Momentary Control */
-	/* 0x31 - 0x4F Reserved */
-	kHIDUsage_Tfon_SpeedDial	= 0x50,	/* One-Shot Control */
-	kHIDUsage_Tfon_StoreNumber	= 0x51,	/* One-Shot Control */
-	kHIDUsage_Tfon_RecallNumber	= 0x52,	/* One-Shot Control */
-	kHIDUsage_Tfon_PhoneDirectory	= 0x53,	/* On/Off Control */
-	/* 0x54 - 0x6F Reserved */
-	kHIDUsage_Tfon_VoiceMail	= 0x70,	/* On/Off Control */
-	kHIDUsage_Tfon_ScreenCalls	= 0x71,	/* On/Off Control */
-	kHIDUsage_Tfon_DoNotDisturb	= 0x72,	/* On/Off Control */
-	kHIDUsage_Tfon_Message	= 0x73,	/* One-Shot Control */
-	kHIDUsage_Tfon_AnswerOnOrOff	= 0x74,	/* On/Off Control */
-	/* 0x75 - 0x8F Reserved */
-	kHIDUsage_Tfon_InsideDialTone	= 0x90,	/* Momentary Control */
-	kHIDUsage_Tfon_OutsideDialTone	= 0x91,	/* Momentary Control */
-	kHIDUsage_Tfon_InsideRingTone	= 0x92,	/* Momentary Control */
-	kHIDUsage_Tfon_OutsideRingTone	= 0x93,	/* Momentary Control */
-	kHIDUsage_Tfon_PriorityRingTone	= 0x94,	/* Momentary Control */
-	kHIDUsage_Tfon_InsideRingback	= 0x95,	/* Momentary Control */
-	kHIDUsage_Tfon_PriorityRingback	= 0x96,	/* Momentary Control */
-	kHIDUsage_Tfon_LineBusyTone	= 0x97,	/* Momentary Control */
-	kHIDUsage_Tfon_ReorderTone	= 0x98,	/* Momentary Control */
-	kHIDUsage_Tfon_CallWaitingTone	= 0x99,	/* Momentary Control */
-	kHIDUsage_Tfon_ConfirmationTone1	= 0x9A,	/* Momentary Control */
-	kHIDUsage_Tfon_ConfirmationTone2	= 0x9B,	/* Momentary Control */
-	kHIDUsage_Tfon_TonesOff	= 0x9C,	/* On/Off Control */
-	kHIDUsage_Tfon_OutsideRingback	= 0x9D,	/* Momentary Control */
-	/* 0x9E - 0xAF Reserved */
-	kHIDUsage_Tfon_PhoneKey0	= 0xB0,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey1	= 0xB1,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey2	= 0xB2,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey3	= 0xB3,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey4	= 0xB4,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey5	= 0xB5,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey6	= 0xB6,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey7	= 0xB7,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey8	= 0xB8,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKey9	= 0xB9,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyStar	= 0xBA,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyPound	= 0xBB,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyA	= 0xBC,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyB	= 0xBD,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyC	= 0xBE,	/* Selector/One-Shot Control */
-	kHIDUsage_Tfon_PhoneKeyD	= 0xBF,	/* Selector/One-Shot Control */
-	/* 0xC0 - 0xFFFF Reserved */
-	kHIDUsage_TFon_Reserved = 0xFFFF
-};
-
-/* Consumer Page (0x0C) */
-/* All controls on the Consumer page are application-specific. That is, they affect a specific device, not the system as a whole. */
-enum
-{
-	kHIDUsage_Csmr_ConsumerControl	= 0x01,	/* Application Collection */
-	kHIDUsage_Csmr_NumericKeyPad	= 0x02,	/* Named Array */
-	kHIDUsage_Csmr_ProgrammableButtons	= 0x03,	/* Named Array */
-	/* 0x03 - 0x1F Reserved */
-	kHIDUsage_Csmr_Plus10	= 0x20,	/* One-Shot Control */
-	kHIDUsage_Csmr_Plus100	= 0x21,	/* One-Shot Control */
-	kHIDUsage_Csmr_AMOrPM	= 0x22,	/* One-Shot Control */
-	/* 0x23 - 0x3F Reserved */
-	kHIDUsage_Csmr_Power	= 0x30,	/* On/Off Control */
-	kHIDUsage_Csmr_Reset	= 0x31,	/* One-Shot Control */
-	kHIDUsage_Csmr_Sleep	= 0x32,	/* One-Shot Control */
-	kHIDUsage_Csmr_SleepAfter	= 0x33,	/* One-Shot Control */
-	kHIDUsage_Csmr_SleepMode	= 0x34,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_Illumination	= 0x35,	/* On/Off Control */
-	kHIDUsage_Csmr_FunctionButtons	= 0x36,	/* Named Array */
-	/* 0x37 - 0x3F Reserved */
-	kHIDUsage_Csmr_Menu	= 0x40,	/* On/Off Control */
-	kHIDUsage_Csmr_MenuPick	= 0x41,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuUp	= 0x42,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuDown	= 0x43,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuLeft	= 0x44,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuRight	= 0x45,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuEscape	= 0x46,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuValueIncrease	= 0x47,	/* One-Shot Control */
-	kHIDUsage_Csmr_MenuValueDecrease	= 0x48,	/* One-Shot Control */
-	/* 0x49 - 0x5F Reserved */
-	kHIDUsage_Csmr_DataOnScreen	= 0x60,	/* On/Off Control */
-	kHIDUsage_Csmr_ClosedCaption	= 0x61,	/* On/Off Control */
-	kHIDUsage_Csmr_ClosedCaptionSelect	= 0x62,	/* Selector */
-	kHIDUsage_Csmr_VCROrTV	= 0x63,	/* On/Off Control */
-	kHIDUsage_Csmr_BroadcastMode	= 0x64,	/* One-Shot Control */
-	kHIDUsage_Csmr_Snapshot	= 0x65,	/* One-Shot Control */
-	kHIDUsage_Csmr_Still	= 0x66,	/* One-Shot Control */
-	/* 0x67 - 0x7F Reserved */
-	kHIDUsage_Csmr_Selection	= 0x80,	/* Named Array */
-	kHIDUsage_Csmr_Assign	= 0x81,	/* Selector */
-	kHIDUsage_Csmr_ModeStep	= 0x82,	/* One-Shot Control */
-	kHIDUsage_Csmr_RecallLast	= 0x83,	/* One-Shot Control */
-	kHIDUsage_Csmr_EnterChannel	= 0x84,	/* One-Shot Control */
-	kHIDUsage_Csmr_OrderMovie	= 0x85,	/* One-Shot Control */
-	kHIDUsage_Csmr_Channel	= 0x86,	/* Linear Control */
-	kHIDUsage_Csmr_MediaSelection	= 0x87,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectComputer	= 0x88,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectTV	= 0x89,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectWWW	= 0x8A,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectDVD	= 0x8B,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectTelephone	= 0x8C,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectProgramGuide	= 0x8D,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectVideoPhone	= 0x8E,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectGames	= 0x8F,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectMessages	= 0x90,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectCD	= 0x91,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectVCR	= 0x92,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectTuner	= 0x93,	/* Selector */
-	kHIDUsage_Csmr_Quit	= 0x94,	/* One-Shot Control */
-	kHIDUsage_Csmr_Help	= 0x95,	/* On/Off Control */
-	kHIDUsage_Csmr_MediaSelectTape	= 0x96,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectCable	= 0x97,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectSatellite	= 0x98,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectSecurity	= 0x99,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectHome	= 0x9A,	/* Selector */
-	kHIDUsage_Csmr_MediaSelectCall	= 0x9B,	/* Selector */
-	kHIDUsage_Csmr_ChannelIncrement	= 0x9C,	/* One-Shot Control */
-	kHIDUsage_Csmr_ChannelDecrement	= 0x9D,	/* One-Shot Control */
-	kHIDUsage_Csmr_Media	= 0x9E,	/* Selector */
-	/* 0x9F Reserved */
-	kHIDUsage_Csmr_VCRPlus	= 0xA0,	/* One-Shot Control */
-	kHIDUsage_Csmr_Once	= 0xA1,	/* One-Shot Control */
-	kHIDUsage_Csmr_Daily	= 0xA2,	/* One-Shot Control */
-	kHIDUsage_Csmr_Weekly	= 0xA3,	/* One-Shot Control */
-	kHIDUsage_Csmr_Monthly	= 0xA4,	/* One-Shot Control */
-	/* 0xA5 - 0xAF Reserved */
-	kHIDUsage_Csmr_Play	= 0xB0,	/* On/Off Control */
-	kHIDUsage_Csmr_Pause	= 0xB1,	/* On/Off Control */
-	kHIDUsage_Csmr_Record	= 0xB2,	/* On/Off Control */
-	kHIDUsage_Csmr_FastForward	= 0xB3,	/* On/Off Control */
-	kHIDUsage_Csmr_Rewind	= 0xB4,	/* On/Off Control */
-	kHIDUsage_Csmr_ScanNextTrack	= 0xB5,	/* One-Shot Control */
-	kHIDUsage_Csmr_ScanPreviousTrack	= 0xB6,	/* One-Shot Control */
-	kHIDUsage_Csmr_Stop	= 0xB7,	/* One-Shot Control */
-	kHIDUsage_Csmr_Eject	= 0xB8,	/* One-Shot Control */
-	kHIDUsage_Csmr_RandomPlay	= 0xB9,	/* On/Off Control */
-	kHIDUsage_Csmr_SelectDisc	= 0xBA,	/* Named Array */
-	kHIDUsage_Csmr_EnterDisc	= 0xBB,	/* Momentary Control */
-	kHIDUsage_Csmr_Repeat	= 0xBC,	/* One-Shot Control */
-	kHIDUsage_Csmr_Tracking	= 0xBD,	/* Linear Control */
-	kHIDUsage_Csmr_TrackNormal	= 0xBE,	/* One-Shot Control */
-	kHIDUsage_Csmr_SlowTracking	= 0xBF,	/* Linear Control */
-	kHIDUsage_Csmr_FrameForward	= 0xC0,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_FrameBack	= 0xC1,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_Mark	= 0xC2,	/* One-Shot Control */
-	kHIDUsage_Csmr_ClearMark	= 0xC3,	/* One-Shot Control */
-	kHIDUsage_Csmr_RepeatFromMark	= 0xC4,	/* On/Off Control */
-	kHIDUsage_Csmr_ReturnToMark	= 0xC5,	/* One-Shot Control */
-	kHIDUsage_Csmr_SearchMarkForward	= 0xC6,	/* One-Shot Control */
-	kHIDUsage_Csmr_SearchMarkBackwards	= 0xC7,	/* One-Shot Control */
-	kHIDUsage_Csmr_CounterReset	= 0xC8,	/* One-Shot Control */
-	kHIDUsage_Csmr_ShowCounter	= 0xC9,	/* One-Shot Control */
-	kHIDUsage_Csmr_TrackingIncrement	= 0xCA,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_TrackingDecrement	= 0xCB,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_StopOrEject	= 0xCC,	/* One-Shot Control */
-	kHIDUsage_Csmr_PlayOrPause	= 0xCD,	/* One-Shot Control */
-	kHIDUsage_Csmr_PlayOrSkip	= 0xCE,	/* One-Shot Control */
-	/* 0xCF - 0xDF Reserved */
-	kHIDUsage_Csmr_Volume	= 0xE0,	/* Linear Control */
-	kHIDUsage_Csmr_Balance	= 0xE1,	/* Linear Control */
-	kHIDUsage_Csmr_Mute	= 0xE2,	/* On/Off Control */
-	kHIDUsage_Csmr_Bass	= 0xE3,	/* Linear Control */
-	kHIDUsage_Csmr_Treble	= 0xE4,	/* Linear Control */
-	kHIDUsage_Csmr_BassBoost	= 0xE5,	/* On/Off Control */
-	kHIDUsage_Csmr_SurroundMode	= 0xE6,	/* One-Shot Control */
-	kHIDUsage_Csmr_Loudness	= 0xE7,	/* On/Off Control */
-	kHIDUsage_Csmr_MPX	= 0xE8,	/* On/Off Control */
-	kHIDUsage_Csmr_VolumeIncrement	= 0xE9,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_VolumeDecrement	= 0xEA,	/* Re-Trigger Control */
-	/* 0xEB - 0xEF Reserved */
-	kHIDUsage_Csmr_Speed	= 0xF0,	/* Selector */
-	kHIDUsage_Csmr_PlaybackSpeed	= 0xF1,	/* Named Array */
-	kHIDUsage_Csmr_StandardPlay	= 0xF2,	/* Selector */
-	kHIDUsage_Csmr_LongPlay	= 0xF3,	/* Selector */
-	kHIDUsage_Csmr_ExtendedPlay	= 0xF4,	/* Selector */
-	kHIDUsage_Csmr_Slow	= 0xF5,	/* One-Shot Control */
-	/* 0xF6 - 0xFF Reserved */
-	kHIDUsage_Csmr_FanEnable	= 0x100,	/* On/Off Control */
-	kHIDUsage_Csmr_FanSpeed	= 0x101,	/* Linear Control */
-	kHIDUsage_Csmr_LightEnable	= 0x102,	/* On/Off Control */
-	kHIDUsage_Csmr_LightIlluminationLevel	= 0x103,	/* Linear Control */
-	kHIDUsage_Csmr_ClimateControlEnable	= 0x104,	/* On/Off Control */
-	kHIDUsage_Csmr_RoomTemperature	= 0x105,	/* Linear Control */
-	kHIDUsage_Csmr_SecurityEnable	= 0x106,	/* On/Off Control */
-	kHIDUsage_Csmr_FireAlarm	= 0x107,	/* One-Shot Control */
-	kHIDUsage_Csmr_PoliceAlarm	= 0x108,	/* One-Shot Control */
-	/* 0x109 - 0x14F Reserved */
-	kHIDUsage_Csmr_BalanceRight	= 0x150,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_BalanceLeft	= 0x151,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_BassIncrement	= 0x152,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_BassDecrement	= 0x153,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_TrebleIncrement	= 0x154,	/* Re-Trigger Control */
-	kHIDUsage_Csmr_TrebleDecrement	= 0x155,	/* Re-Trigger Control */
-	/* 0x156 - 0x15F Reserved */
-	kHIDUsage_Csmr_SpeakerSystem	= 0x160,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelLeft	= 0x161,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelRight	= 0x162,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelCenter	= 0x163,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelFront	= 0x164,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelCenterFront	= 0x165,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelSide	= 0x166,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelSurround	= 0x167,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelLowFrequencyEnhancement	= 0x168,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelTop	= 0x169,	/* Logical Collection */
-	kHIDUsage_Csmr_ChannelUnknown	= 0x16A,	/* Logical Collection */
-	/* 0x16B - 0x16F Reserved */
-	kHIDUsage_Csmr_SubChannel	= 0x170,	/* Linear Control */
-	kHIDUsage_Csmr_SubChannelIncrement	= 0x171,	/* One-Shot Control */
-	kHIDUsage_Csmr_SubChannelDecrement	= 0x172,	/* One-Shot Control */
-	kHIDUsage_Csmr_AlternateAudioIncrement	= 0x173,	/* One-Shot Control */
-	kHIDUsage_Csmr_AlternateAudioDecrement	= 0x174,	/* One-Shot Control */
-	/* 0x175 - 0x17F Reserved */
-	kHIDUsage_Csmr_ApplicationLaunchButtons	= 0x180,	/* Named Array */
-	kHIDUsage_Csmr_ALLaunchButtonConfigurationTool	= 0x181,	/* Selector */
-	kHIDUsage_Csmr_ALProgrammableButtonConfiguration	= 0x182,	/* Selector */
-	kHIDUsage_Csmr_ALConsumerControlConfiguration	= 0x183,	/* Selector */
-	kHIDUsage_Csmr_ALWordProcessor	= 0x184,	/* Selector */
-	kHIDUsage_Csmr_ALTextEditor	= 0x185,	/* Selector */
-	kHIDUsage_Csmr_ALSpreadsheet	= 0x186,	/* Selector */
-	kHIDUsage_Csmr_ALGraphicsEditor	= 0x187,	/* Selector */
-	kHIDUsage_Csmr_ALPresentationApp	= 0x188,	/* Selector */
-	kHIDUsage_Csmr_ALDatabaseApp	= 0x189,	/* Selector */
-	kHIDUsage_Csmr_ALEmailReader	= 0x18A,	/* Selector */
-	kHIDUsage_Csmr_ALNewsreader	= 0x18B,	/* Selector */
-	kHIDUsage_Csmr_ALVoicemail	= 0x18C,	/* Selector */
-	kHIDUsage_Csmr_ALContactsOrAddressBook	= 0x18D,	/* Selector */
-	kHIDUsage_Csmr_ALCalendarOrSchedule	= 0x18E,	/* Selector */
-	kHIDUsage_Csmr_ALTaskOrProjectManager	= 0x18F,	/* Selector */
-	kHIDUsage_Csmr_ALLogOrJournalOrTimecard	= 0x190,	/* Selector */
-	kHIDUsage_Csmr_ALCheckbookOrFinance	= 0x191,	/* Selector */
-	kHIDUsage_Csmr_ALCalculator	= 0x192,	/* Selector */
-	kHIDUsage_Csmr_ALAOrVCaptureOrPlayback	= 0x193,	/* Selector */
-	kHIDUsage_Csmr_ALLocalMachineBrowser	= 0x194,	/* Selector */
-	kHIDUsage_Csmr_ALLANOrWANBrowser	= 0x195,	/* Selector */
-	kHIDUsage_Csmr_ALInternetBrowser	= 0x196,	/* Selector */
-	kHIDUsage_Csmr_ALRemoteNetworkingOrISPConnect	= 0x197,	/* Selector */
-	kHIDUsage_Csmr_ALNetworkConference	= 0x198,	/* Selector */
-	kHIDUsage_Csmr_ALNetworkChat	= 0x199,	/* Selector */
-	kHIDUsage_Csmr_ALTelephonyOrDialer	= 0x19A,	/* Selector */
-	kHIDUsage_Csmr_ALLogon	= 0x19B,	/* Selector */
-	kHIDUsage_Csmr_ALLogoff	= 0x19C,	/* Selector */
-	kHIDUsage_Csmr_ALLogonOrLogoff	= 0x19D,	/* Selector */
-	kHIDUsage_Csmr_ALTerminalLockOrScreensaver	= 0x19E,	/* Selector */
-	kHIDUsage_Csmr_ALControlPanel	= 0x19F,	/* Selector */
-	kHIDUsage_Csmr_ALCommandLineProcessorOrRun	= 0x1A0,	/* Selector */
-	kHIDUsage_Csmr_ALProcessOrTaskManager	= 0x1A1,	/* Selector */
-	kHIDUsage_Csmr_AL	= 0x1A2,	/* Selector */
-	kHIDUsage_Csmr_ALNextTaskOrApplication	= 0x1A3,	/* Selector */
-	kHIDUsage_Csmr_ALPreviousTaskOrApplication	= 0x1A4,	/* Selector */
-	kHIDUsage_Csmr_ALPreemptiveHaltTaskOrApplication	= 0x1A5,	/* Selector */
-    kHIDUsage_Csmr_ALIntegratedHelpCenter   = 0x1A6, /* Selector */
-    kHIDUsage_Csmr_ALDocuments   = 0x1A7, /* Selector */
-    kHIDUsage_Csmr_ALThesaurus   = 0x1A8, /* Selector */
-    kHIDUsage_Csmr_ALDictionary   = 0x1A9, /* Selector */
-    kHIDUsage_Csmr_ALDesktop   = 0x1AA, /* Selector */
-    kHIDUsage_Csmr_ALSpellCheck   = 0x1AB, /* Selector */
-    kHIDUsage_Csmr_ALGrammerCheck   = 0x1AC, /* Selector */
-    kHIDUsage_Csmr_ALWirelessStatus   = 0x1AD, /* Selector */
-    kHIDUsage_Csmr_ALKeyboardLayout   = 0x1AE, /* Selector */
-    kHIDUsage_Csmr_ALVirusProtection   = 0x1AF, /* Selector */
-    kHIDUsage_Csmr_ALEncryption   = 0x1B0, /* Selector */
-    kHIDUsage_Csmr_ALScreenSaver   = 0x1B1, /* Selector */
-    kHIDUsage_Csmr_ALAlarms   = 0x1B2, /* Selector */
-    kHIDUsage_Csmr_ALClock   = 0x1B3, /* Selector */
-    kHIDUsage_Csmr_ALFileBrowser   = 0x1B4, /* Selector */
-    kHIDUsage_Csmr_ALPowerStatus   = 0x1B5, /* Selector */
-	/* 0x1A6 - 0x1FF Reserved */
-	kHIDUsage_Csmr_GenericGUIApplicationControls	= 0x200,	/* Named Array */
-	kHIDUsage_Csmr_ACNew	= 0x201,	/* Selector */
-	kHIDUsage_Csmr_ACOpen	= 0x202,	/* Selector */
-	kHIDUsage_Csmr_ACClose	= 0x203,	/* Selector */
-	kHIDUsage_Csmr_ACExit	= 0x204,	/* Selector */
-	kHIDUsage_Csmr_ACMaximize	= 0x205,	/* Selector */
-	kHIDUsage_Csmr_ACMinimize	= 0x206,	/* Selector */
-	kHIDUsage_Csmr_ACSave	= 0x207,	/* Selector */
-	kHIDUsage_Csmr_ACPrint	= 0x208,	/* Selector */
-	kHIDUsage_Csmr_ACProperties	= 0x209,	/* Selector */
-	kHIDUsage_Csmr_ACUndo	= 0x21A,	/* Selector */
-	kHIDUsage_Csmr_ACCopy	= 0x21B,	/* Selector */
-	kHIDUsage_Csmr_ACCut	= 0x21C,	/* Selector */
-	kHIDUsage_Csmr_ACPaste	= 0x21D,	/* Selector */
-	kHIDUsage_Csmr_AC	= 0x21E,	/* Selector */
-	kHIDUsage_Csmr_ACFind	= 0x21F,	/* Selector */
-	kHIDUsage_Csmr_ACFindandReplace	= 0x220,	/* Selector */
-	kHIDUsage_Csmr_ACSearch	= 0x221,	/* Selector */
-	kHIDUsage_Csmr_ACGoTo	= 0x222,	/* Selector */
-	kHIDUsage_Csmr_ACHome	= 0x223,	/* Selector */
-	kHIDUsage_Csmr_ACBack	= 0x224,	/* Selector */
-	kHIDUsage_Csmr_ACForward	= 0x225,	/* Selector */
-	kHIDUsage_Csmr_ACStop	= 0x226,	/* Selector */
-	kHIDUsage_Csmr_ACRefresh	= 0x227,	/* Selector */
-	kHIDUsage_Csmr_ACPreviousLink	= 0x228,	/* Selector */
-	kHIDUsage_Csmr_ACNextLink	= 0x229,	/* Selector */
-	kHIDUsage_Csmr_ACBookmarks	= 0x22A,	/* Selector */
-	kHIDUsage_Csmr_ACHistory	= 0x22B,	/* Selector */
-	kHIDUsage_Csmr_ACSubscriptions	= 0x22C,	/* Selector */
-	kHIDUsage_Csmr_ACZoomIn	= 0x22D,	/* Selector */
-	kHIDUsage_Csmr_ACZoomOut	= 0x22E,	/* Selector */
-	kHIDUsage_Csmr_ACZoom	= 0x22F,	/* Selector */
-	kHIDUsage_Csmr_ACFullScreenView	= 0x230,	/* Selector */
-	kHIDUsage_Csmr_ACNormalView	= 0x231,	/* Selector */
-	kHIDUsage_Csmr_ACViewToggle	= 0x232,	/* Selector */
-	kHIDUsage_Csmr_ACScrollUp	= 0x233,	/* Selector */
-	kHIDUsage_Csmr_ACScrollDown	= 0x234,	/* Selector */
-	kHIDUsage_Csmr_ACScroll	= 0x235,	/* Selector */
-	kHIDUsage_Csmr_ACPanLeft	= 0x236,	/* Selector */
-	kHIDUsage_Csmr_ACPanRight	= 0x237,	/* Selector */
-	kHIDUsage_Csmr_ACPan	= 0x238,	/* Selector */
-	kHIDUsage_Csmr_ACNewWindow	= 0x239,	/* Selector */
-	kHIDUsage_Csmr_ACTileHorizontally	= 0x23A,	/* Selector */
-	kHIDUsage_Csmr_ACTileVertically	= 0x23B,	/* Selector */
-	kHIDUsage_Csmr_ACFormat	= 0x23C,	/* Selector */
-	/* 0x23D - 0xFFFF Reserved */
-	kHIDUsage_Csmr_Reserved = 0xFFFF
-};
-
-/* Physical Interface Device Page (0x0F) */
-/* This section provides detailed descriptions of the usages employed by Digitizer Devices. */
-enum
-{
-	kHIDUsage_PID_PhysicalInterfaceDevice = 0x01,		/* CA - A collection of PID usages */
-	/* 0x02 - 0x1F Reserved */
-	kHIDUsage_PID_Normal = 0x20,						/* DV - A force applied perpendicular to the surface of an object */
-	kHIDUsage_PID_SetEffectReport = 0x21,				/* XXX */
-	kHIDUsage_PID_EffectBlockIndex = 0x22,				/* XXX */
-	kHIDUsage_PID_ParamBlockOffset = 0x23,				/* XXX */
-	kHIDUsage_PID_ROM_Flag = 0x24,						/* XXX */
-	kHIDUsage_PID_EffectType = 0x25,					/* XXX */
-	kHIDUsage_PID_ET_ConstantForce = 0x26,				/* XXX */
-	kHIDUsage_PID_ET_Ramp = 0x27,						/* XXX */
-	kHIDUsage_PID_ET_CustomForceData = 0x28,			/* XXX */
-	/* 0x29 - 0x2F Reserved */
-	kHIDUsage_PID_ET_Square = 0x30,						/* XXX */
-	kHIDUsage_PID_ET_Sine = 0x31,						/* XXX */
-	kHIDUsage_PID_ET_Triangle = 0x32,					/* XXX */
-	kHIDUsage_PID_ET_SawtoothUp = 0x33,					/* XXX */
-	kHIDUsage_PID_ET_SawtoothDown = 0x34,				/* XXX */
-	/* 0x35 - 0x3F Reserved */
-	kHIDUsage_PID_ET_Spring = 0x40,						/* XXX */
-	kHIDUsage_PID_ET_Damper = 0x41,						/* XXX */
-	kHIDUsage_PID_ET_Inertia = 0x42,					/* XXX */
-	kHIDUsage_PID_ET_Friction = 0x43,					/* XXX */
-	/* 0x44 - 0x4F Reserved */
-	kHIDUsage_PID_Duration = 0x50,						/* XXX */
-	kHIDUsage_PID_SamplePeriod = 0x51,					/* XXX */
-	kHIDUsage_PID_Gain = 0x52,							/* XXX */
-	kHIDUsage_PID_TriggerButton = 0x53,					/* XXX */
-	kHIDUsage_PID_TriggerRepeatInterval = 0x54,			/* XXX */
-	kHIDUsage_PID_AxesEnable = 0x55,					/* XXX */
-	kHIDUsage_PID_DirectionEnable = 0x56,				/* XXX */
-	kHIDUsage_PID_Direction = 0x57,						/* XXX */
-	kHIDUsage_PID_TypeSpecificBlockOffset = 0x58,		/* XXX */
-	kHIDUsage_PID_BlockType = 0x59,						/* XXX */
-	kHIDUsage_PID_SetEnvelopeReport = 0x5A,				/* XXX */
-	kHIDUsage_PID_AttackLevel = 0x5B,					/* XXX */
-	kHIDUsage_PID_AttackTime = 0x5C,					/* XXX */
-	kHIDUsage_PID_FadeLevel = 0x5D,						/* XXX */
-	kHIDUsage_PID_FadeTime = 0x5E,						/* XXX */
-	kHIDUsage_PID_SetConditionReport = 0x5F,			/* XXX */
-
-	kHIDUsage_PID_CP_Offset = 0x60,						/* XXX */
-	kHIDUsage_PID_PositiveCoefficient = 0x61,			/* XXX */
-	kHIDUsage_PID_NegativeCoefficient = 0x62,			/* XXX */
-	kHIDUsage_PID_PositiveSaturation = 0x63,			/* XXX */
-	kHIDUsage_PID_NegativeSaturation = 0x64,			/* XXX */
-	kHIDUsage_PID_DeadBand = 0x65,						/* XXX */
-	kHIDUsage_PID_DownloadForceSample = 0x66,			/* XXX */
-	kHIDUsage_PID_IsochCustomForceEnable = 0x67,		/* XXX */
-	kHIDUsage_PID_CustomForceDataReport = 0x68,			/* XXX */
-	kHIDUsage_PID_CustomForceData = 0x69,				/* XXX */
-	kHIDUsage_PID_CustomForceVendorDefinedData = 0x6A,	/* XXX */
-	kHIDUsage_PID_SetCustomForceReport = 0x6B,			/* XXX */
-	kHIDUsage_PID_CustomForceDataOffset = 0x6C,			/* XXX */
-	kHIDUsage_PID_SampleCount = 0x6D,					/* XXX */
-	kHIDUsage_PID_SetPeriodicReport = 0x6E,				/* XXX */
-	kHIDUsage_PID_Offset = 0x6F,						/* XXX */
-
-	kHIDUsage_PID_Magnitude = 0x70,						/* XXX */
-	kHIDUsage_PID_Phase = 0x71,							/* XXX */
-	kHIDUsage_PID_Period = 0x72,						/* XXX */
-	kHIDUsage_PID_SetConstantForceReport = 0x73,		/* XXX */
-	kHIDUsage_PID_SetRampForceReport = 0x74,			/* XXX */
-	kHIDUsage_PID_RampStart = 0x75,						/* XXX */
-	kHIDUsage_PID_RampEnd = 0x76,						/* XXX */
-	kHIDUsage_PID_EffectOperationReport = 0x77,			/* XXX */
-	kHIDUsage_PID_EffectOperation = 0x78,				/* XXX */
-	kHIDUsage_PID_OpEffectStart = 0x79,					/* XXX */
-	kHIDUsage_PID_OpEffectStartSolo = 0x7A,				/* XXX */
-	kHIDUsage_PID_OpEffectStop = 0x7B,					/* XXX */
-	kHIDUsage_PID_LoopCount = 0x7C,						/* XXX */
-	kHIDUsage_PID_DeviceGainReport = 0x7D,				/* XXX */
-	kHIDUsage_PID_DeviceGain = 0x7E,					/* XXX */
-	kHIDUsage_PID_PoolReport = 0x7F,					/* XXX */
-
-	kHIDUsage_PID_RAM_PoolSize = 0x80,					/* XXX */
-	kHIDUsage_PID_ROM_PoolSize = 0x81,					/* XXX */
-	kHIDUsage_PID_ROM_EffectBlockCount = 0x82,			/* XXX */
-	kHIDUsage_PID_SimultaneousEffectsMax = 0x83,		/* XXX */
-	kHIDUsage_PID_PoolAlignment = 0x84,					/* XXX */
-	kHIDUsage_PID_PoolMoveReport = 0x85,				/* XXX */
-	kHIDUsage_PID_MoveSource = 0x86,					/* XXX */
-	kHIDUsage_PID_MoveDestination = 0x87,				/* XXX */
-	kHIDUsage_PID_MoveLength = 0x88,					/* XXX */
-	kHIDUsage_PID_BlockLoadReport = 0x89,				/* XXX */
-	/* 0x8A Reserved */
-	kHIDUsage_PID_BlockLoadStatus = 0x8B,				/* XXX */
-	kHIDUsage_PID_BlockLoadSuccess = 0x8C,				/* XXX */
-	kHIDUsage_PID_BlockLoadFull = 0x8D,					/* XXX */
-	kHIDUsage_PID_BlockLoadError = 0x8E,				/* XXX */
-	kHIDUsage_PID_BlockHandle = 0x8F,					/* XXX */
-
-	kHIDUsage_PID_BlockFreeReport = 0x90,				/* XXX */
-	kHIDUsage_PID_TypeSpecificBlockHandle = 0x91,		/* XXX */
-	kHIDUsage_PID_StateReport = 0x92,					/* XXX */
-	/* 0x93 Reserved */
-	kHIDUsage_PID_EffectPlaying = 0x94,					/* XXX */
-	kHIDUsage_PID_DeviceControlReport = 0x95,			/* XXX */
-	kHIDUsage_PID_DeviceControl = 0x96,					/* XXX */
-	kHIDUsage_PID_DC_EnableActuators = 0x97,			/* XXX */
-	kHIDUsage_PID_DC_DisableActuators = 0x98,			/* XXX */
-	kHIDUsage_PID_DC_StopAllEffects = 0x99,				/* XXX */
-	kHIDUsage_PID_DC_DeviceReset = 0x9A,				/* XXX */
-	kHIDUsage_PID_DC_DevicePause = 0x9B,				/* XXX */
-	kHIDUsage_PID_DC_DeviceContinue = 0x9C,				/* XXX */
-	/* 0x9d - 0x9E Reserved */
-	kHIDUsage_PID_DevicePaused = 0x9F,					/* XXX */
-
-	kHIDUsage_PID_ActuatorsEnabled = 0xA0,				/* XXX */
-	/* 0xA1 - 0xA3 Reserved */
-	kHIDUsage_PID_SafetySwitch = 0xA4,					/* XXX */
-	kHIDUsage_PID_ActuatorOverrideSwitch = 0xA5,		/* XXX */
-	kHIDUsage_PID_ActuatorPower = 0xA6,					/* XXX */
-	kHIDUsage_PID_StartDelay = 0xA7,					/* XXX */
-	kHIDUsage_PID_ParameterBlockSize = 0xA8,			/* XXX */
-	kHIDUsage_PID_DeviceManagedPool = 0xA9,				/* XXX */
-	kHIDUsage_PID_SharedParameterBlocks = 0xAA,			/* XXX */
-	kHIDUsage_PID_CreateNewEffectReport = 0xAB,			/* XXX */
-	kHIDUsage_PID_RAM_PoolAvailable = 0xAC,				/* XXX */
-	/* 0xAD - 0xFFFF Reserved */
-	kHIDUsage_PID_Reserved = 0xFFFF
-};
-
-/* Digitizer Page (0x0D) */
-/* This section provides detailed descriptions of the usages employed by Digitizer Devices. */
-enum
-{
-	kHIDUsage_Dig_Digitizer	= 0x01,	/* Application Collection */
-	kHIDUsage_Dig_Pen	= 0x02,	/* Application Collection */
-	kHIDUsage_Dig_LightPen	= 0x03,	/* Application Collection */
-	kHIDUsage_Dig_TouchScreen	= 0x04,	/* Application Collection */
-	kHIDUsage_Dig_TouchPad	= 0x05,	/* Application Collection */
-	kHIDUsage_Dig_WhiteBoard	= 0x06,	/* Application Collection */
-	kHIDUsage_Dig_CoordinateMeasuringMachine	= 0x07,	/* Application Collection */
-	kHIDUsage_Dig_3DDigitizer	= 0x08,	/* Application Collection */
-	kHIDUsage_Dig_StereoPlotter	= 0x09,	/* Application Collection */
-	kHIDUsage_Dig_ArticulatedArm	= 0x0A,	/* Application Collection */
-	kHIDUsage_Dig_Armature	= 0x0B,	/* Application Collection */
-	kHIDUsage_Dig_MultiplePointDigitizer	= 0x0C,	/* Application Collection */
-	kHIDUsage_Dig_FreeSpaceWand	= 0x0D,	/* Application Collection */
-	/* 0x0E - 0x1F Reserved */
-	kHIDUsage_Dig_Stylus	= 0x20,	/* Logical Collection */
-	kHIDUsage_Dig_Puck	= 0x21,	/* Logical Collection */
-	kHIDUsage_Dig_Finger	= 0x22,	/* Logical Collection */
-	/* 0x23 - 0x2F Reserved */
-	kHIDUsage_Dig_TipPressure	= 0x30,	/* Dynamic Value */
-	kHIDUsage_Dig_BarrelPressure	= 0x31,	/* Dynamic Value */
-	kHIDUsage_Dig_InRange	= 0x32,	/* Momentary Control */
-	kHIDUsage_Dig_Touch	= 0x33,	/* Momentary Control */
-	kHIDUsage_Dig_Untouch	= 0x34,	/* One-Shot Control */
-	kHIDUsage_Dig_Tap	= 0x35,	/* One-Shot Control */
-	kHIDUsage_Dig_Quality	= 0x36,	/* Dynamic Value */
-	kHIDUsage_Dig_DataValid	= 0x37,	/* Momentary Control */
-	kHIDUsage_Dig_TransducerIndex	= 0x38,	/* Dynamic Value */
-	kHIDUsage_Dig_TabletFunctionKeys	= 0x39,	/* Logical Collection */
-	kHIDUsage_Dig_ProgramChangeKeys	= 0x3A,	/* Logical Collection */
-	kHIDUsage_Dig_BatteryStrength	= 0x3B,	/* Dynamic Value */
-	kHIDUsage_Dig_Invert	= 0x3C,	/* Momentary Control */
-	kHIDUsage_Dig_XTilt	= 0x3D,	/* Dynamic Value */
-	kHIDUsage_Dig_YTilt	= 0x3E,	/* Dynamic Value */
-	kHIDUsage_Dig_Azimuth	= 0x3F,	/* Dynamic Value */
-	kHIDUsage_Dig_Altitude	= 0x40,	/* Dynamic Value */
-	kHIDUsage_Dig_Twist	= 0x41,	/* Dynamic Value */
-	kHIDUsage_Dig_TipSwitch	= 0x42,	/* Momentary Control */
-	kHIDUsage_Dig_SecondaryTipSwitch	= 0x43,	/* Momentary Control */
-	kHIDUsage_Dig_BarrelSwitch	= 0x44,	/* Momentary Control */
-	kHIDUsage_Dig_Eraser	= 0x45,	/* Momentary Control */
-	kHIDUsage_Dig_TabletPick	= 0x46,	/* Momentary Control */
-	/* 0x47 - 0xFFFF Reserved */
-	kHIDUsage_Dig_Reserved = 0xFFFF
-};
-
-/* AlphanumericDisplay Page (0x14) */
-/* The Alphanumeric Display page is intended for use by simple alphanumeric displays that are used on consumer devices. */
-enum
-{
-	kHIDUsage_AD_AlphanumericDisplay	= 0x01,	/* Application Collection */
-	/* 0x02 - 0x1F Reserved */
-	kHIDUsage_AD_DisplayAttributesReport	= 0x20,	/* Logical Collection */
-	kHIDUsage_AD_ASCIICharacterSet	= 0x21,	/* Static Flag */
-	kHIDUsage_AD_DataReadBack	= 0x22,	/* Static Flag */
-	kHIDUsage_AD_FontReadBack	= 0x23,	/* Static Flag */
-	kHIDUsage_AD_DisplayControlReport	= 0x24,	/* Logical Collection */
-	kHIDUsage_AD_ClearDisplay	= 0x25,	/* Dynamic Flag */
-	kHIDUsage_AD_DisplayEnable	= 0x26,	/* Dynamic Flag */
-	kHIDUsage_AD_ScreenSaverDelay	= 0x27,	/* Static Value */
-	kHIDUsage_AD_ScreenSaverEnable	= 0x28,	/* Dynamic Flag */
-	kHIDUsage_AD_VerticalScroll	= 0x29,	/* Static Flag */
-	kHIDUsage_AD_HorizontalScroll	= 0x2A,	/* Static Flag */
-	kHIDUsage_AD_CharacterReport	= 0x2B,	/* Logical Collection */
-	kHIDUsage_AD_DisplayData	= 0x2C,	/* Dynamic Value */
-	kHIDUsage_AD_DisplayStatus	= 0x2D,	/* Logical Collection */
-	kHIDUsage_AD_StatNotReady	= 0x2E,	/* Selector */
-	kHIDUsage_AD_StatReady	= 0x2F,	/* Selector */
-	kHIDUsage_AD_ErrNotaloadablecharacter	= 0x30,	/* Selector */
-	kHIDUsage_AD_ErrFontdatacannotberead	= 0x31,	/* Selector */
-	kHIDUsage_AD_CursorPositionReport	= 0x32,	/* Logical Collection */
-	kHIDUsage_AD_Row	= 0x33,	/* Dynamic Value */
-	kHIDUsage_AD_Column	= 0x34,	/* Dynamic Value */
-	kHIDUsage_AD_Rows	= 0x35,	/* Static Value */
-	kHIDUsage_AD_Columns	= 0x36,	/* Static Value */
-	kHIDUsage_AD_CursorPixelPositioning	= 0x37,	/* Static Flag */
-	kHIDUsage_AD_CursorMode	= 0x38,	/* Dynamic Flag */
-	kHIDUsage_AD_CursorEnable	= 0x39,	/* Dynamic Flag */
-	kHIDUsage_AD_CursorBlink	= 0x3A,	/* Dynamic Flag */
-	kHIDUsage_AD_FontReport	= 0x3B,	/* Logical Collection */
-	kHIDUsage_AD_FontData	= 0x3C,	/* Buffered Byte */
-	kHIDUsage_AD_CharacterWidth	= 0x3D,	/* Static Value */
-	kHIDUsage_AD_CharacterHeight	= 0x3E,	/* Static Value */
-	kHIDUsage_AD_CharacterSpacingHorizontal	= 0x3F,	/* Static Value */
-	kHIDUsage_AD_CharacterSpacingVertical	= 0x40,	/* Static Value */
-	kHIDUsage_AD_UnicodeCharacterSet	= 0x41,	/* Static Flag */
-	/* 0x42 - 0xFFFF Reserved */
-	kHIDUsage_AD_Reserved = 0xFFFF
-};
-
-/* Power Device Page (0x84) */
-/* This section provides detailed descriptions of the usages employed by Power Devices. */
-enum
-{
-	
-	kHIDUsage_PD_Undefined = 0x00,				/* Power Device Undefined Usage */
-	kHIDUsage_PD_iName = 0x01,					/* CL- Power Device Name Index */
-	kHIDUsage_PD_PresentStatus = 0x02,			/* CL- Power Device Present Status */
-	kHIDUsage_PD_ChangedStatus = 0x03,			/* CA- Power Device Changed Status */
-	kHIDUsage_PD_UPS = 0x04,					/* CA- Uninterruptible Power Supply */
-	kHIDUsage_PD_PowerSupply = 0x05,			/* CA- Power Supply */
-	/* Reserved 0x06 - 0x0F */
-	kHIDUsage_PD_BatterySystem = 0x10,			/* CP- Battery System power module */
-	kHIDUsage_PD_BatterySystemID = 0x11,		/* SV IF- Battery System ID */
-	kHIDUsage_PD_Battery = 0x12,				/* CP- Battery */
-	kHIDUsage_PD_BatteryID = 0x13,				/* SV IF- Battery ID */
-	kHIDUsage_PD_Charger = 0x14,				/* CP- Charger */
-	kHIDUsage_PD_ChargerID = 0x15,				/* SV IF- Charger ID */
-	kHIDUsage_PD_PowerConverter = 0x16,			/* CP- Power Converter power module */
-	kHIDUsage_PD_PowerConverterID = 0x17,		/* SV IF- Power Converter ID */
-	kHIDUsage_PD_OutletSystem = 0x18,			/* CP- Outlet System power module */
-	kHIDUsage_PD_OutletSystemID = 0x19,			/* SV IF-Outlet System ID */
-	kHIDUsage_PD_Input = 0x1A,					/* CP- Power Device Input */
-	kHIDUsage_PD_InputID = 0x1B,				/* SV IF- Power Device Input ID */
-	kHIDUsage_PD_Output = 0x1C,					/* CP- Power Device Output */
-	kHIDUsage_PD_OutputID = 0x1D,				/* SV IF- Power Device Output ID */
-	kHIDUsage_PD_Flow = 0x1E,					/* CP- Power Device Flow */
-	kHIDUsage_PD_FlowID = 0x1F,					/* Item IF- Power Device Flow ID */
-	kHIDUsage_PD_Outlet = 0x20,					/* CP- Power Device Outlet */
-	kHIDUsage_PD_OutletID = 0x21,				/* SV IF- Power Device Outlet ID */
-	kHIDUsage_PD_Gang = 0x22,					/* CL/CP- Power Device Gang */
-	kHIDUsage_PD_GangID = 0x23,					/* SV IF- Power Device Gang ID */
-	kHIDUsage_PD_PowerSummary = 0x24,			/* CL/CP- Power Device Power Summary */
-	kHIDUsage_PD_PowerSummaryID = 0x25,			/* SV IF- Power Device Power Summary ID */
-	/* Reserved 0x26 - 0x2F */
-	kHIDUsage_PD_Voltage = 0x30,				/* DV IF- Power Device Voltage */
-	kHIDUsage_PD_Current = 0x31,				/* DV IF- Power Device Current */
-	kHIDUsage_PD_Frequency = 0x32,				/* DV IF- Power Device Frequency */
-	kHIDUsage_PD_ApparentPower = 0x33,			/* DV IF- Power Device Apparent Power */
-	kHIDUsage_PD_ActivePower = 0x34,			/* DV IF- Power Device RMS Power */
-	kHIDUsage_PD_PercentLoad = 0x35,			/* DV IF- Power Device Percent Load */
-	kHIDUsage_PD_Temperature = 0x36,			/* DV IF- Power Device Temperature */
-	kHIDUsage_PD_Humidity = 0x37,				/* DV IF- Power Device Humidity */
-	kHIDUsage_PD_BadCount = 0x38,				/* DV IF- Power Device Bad Condition Count */
-	/* Reserved 0x39 - 0x3F */
-	kHIDUsage_PD_ConfigVoltage = 0x40,			/* SV/DV F- Power Device Nominal Voltage */
-	kHIDUsage_PD_ConfigCurrent = 0x41,			/* SV/DV F- Power Device Nominal Current */
-	kHIDUsage_PD_ConfigFrequency = 0x42,		/* SV/DV F- Power Device Nominal Frequency */
-	kHIDUsage_PD_ConfigApparentPower = 0x43,	/* SV/DV F- Power Device Nominal Apparent Power */
-	kHIDUsage_PD_ConfigActivePower = 0x44,		/* SV/DV F- Power Device Nominal RMS Power */
-	kHIDUsage_PD_ConfigPercentLoad = 0x45,		/* SV/DV F- Power Device Nominal Percent Load */
-	kHIDUsage_PD_ConfigTemperature = 0x46,		/* SV/DV F- Power Device Nominal Temperature */
-	kHIDUsage_PD_ConfigHumidity = 0x47,			/* SV/DV F- Power Device Nominal Humidity */
-	/* Reserved 0x48 - 0x4F */
-	kHIDUsage_PD_SwitchOnControl = 0x50,		/* DV F- Power Device Switch On Control */
-	kHIDUsage_PD_SwitchOffControl = 0x51,		/* DV F- Power Device Switch Off Control */
-	kHIDUsage_PD_ToggleControl = 0x52,			/* DV F- Power Device Toogle Sequence Control */
-	kHIDUsage_PD_LowVoltageTransfer = 0x53,		/* DV F- Power Device Min Transfer Voltage */
-	kHIDUsage_PD_HighVoltageTransfer = 0x54,	/* DV F- Power Device Max Transfer Voltage */
-	kHIDUsage_PD_DelayBeforeReboot = 0x55,		/* DV F- Power Device Delay Before Reboot */
-	kHIDUsage_PD_DelayBeforeStartup = 0x56,		/* DV F- Power Device Delay Before Startup */
-	kHIDUsage_PD_DelayBeforeShutdown = 0x57,	/* DV F- Power Device Delay Before Shutdown */
-	kHIDUsage_PD_Test = 0x58,					/* DV F- Power Device Test Request/Result */
-	kHIDUsage_PD_ModuleReset = 0x59,			/* DV F- Power Device Reset Request/Result */
-	kHIDUsage_PD_AudibleAlarmControl = 0x5A,	/* DV F- Power Device Audible Alarm Control */
-	/* Reserved 0x5B - 0x5F */
-	kHIDUsage_PD_Present = 0x60,				/* DV IOF- Power Device Present */
-	kHIDUsage_PD_Good = 0x61,					/* DV IOF- Power Device Good */
-	kHIDUsage_PD_InternalFailure = 0x62,		/* DV IOF- Power Device Internal Failure */
-	kHIDUsage_PD_VoltageOutOfRange = 0x63,		/* DV IOF- Power Device Voltage Out Of Range */
-	kHIDUsage_PD_FrequencyOutOfRange = 0x64,	/* DV IOF- Power Device Frequency Out Of Range */
-	kHIDUsage_PD_Overload = 0x65,				/* DV IOF- Power Device Overload */
-	kHIDUsage_PD_OverCharged = 0x66,			/* DV IOF- Power Device Over Charged */
-	kHIDUsage_PD_OverTemperature = 0x67,		/* DV IOF- Power Device Over Temperature */
-	kHIDUsage_PD_ShutdownRequested = 0x68,		/* DV IOF- Power Device Shutdown Requested */
-	kHIDUsage_PD_ShutdownImminent = 0x69,		/* DV IOF- Power Device Shutdown Imminent */
-	/* Reserved 0x6A */
-	kHIDUsage_PD_SwitchOnOff = 0x6B,			/* DV IOF- Power Device On/Off Switch Status */
-	kHIDUsage_PD_Switchable = 0x6C,				/* DV IOF- Power Device Switchable */
-	kHIDUsage_PD_Used = 0x6D,					/* DV IOF- Power Device Used */
-	kHIDUsage_PD_Boost = 0x6E,					/* DV IOF- Power Device Boosted */
-	kHIDUsage_PD_Buck = 0x6F,					/* DV IOF- Power Device Bucked */
-	kHIDUsage_PD_Initialized = 0x70,			/* DV IOF- Power Device Initialized */
-	kHIDUsage_PD_Tested = 0x71,					/* DV IOF- Power Device Tested */
-	kHIDUsage_PD_AwaitingPower = 0x72,			/* DV IOF- Power Device Awaiting Power */
-	kHIDUsage_PD_CommunicationLost = 0x73,		/* DV IOF- Power Device Communication Lost */
-	/* Reserved 0x74 - 0xFC */
-	kHIDUsage_PD_iManufacturer = 0xFD,			/* SV F- Power Device Manufacturer String Index */
-	kHIDUsage_PD_iProduct = 0xFE,				/* SV F- Power Device Product String Index */
-	kHIDUsage_PD_iserialNumber = 0xFF			/* SV F- Power Device Serial Number String Index */
-};
-
-/* Battery System Page (x85) */
-/* This section provides detailed descriptions of the usages employed by Battery Systems. */	
-enum
-{
-	kHIDUsage_BS_Undefined = 0x00,				/* Battery System Undefined */
-	kHIDUsage_BS_SMBBatteryMode = 0x01,			/* CL - SMB Mode */
-	kHIDUsage_BS_SMBBatteryStatus = 0x02,		/* CL - SMB Status */
-	kHIDUsage_BS_SMBAlarmWarning = 0x03,		/* CL - SMB Alarm Warning */
-	kHIDUsage_BS_SMBChargerMode = 0x04,			/* CL - SMB Charger Mode */
-	kHIDUsage_BS_SMBChargerStatus = 0x05,		/* CL - SMB Charger Status */
-	kHIDUsage_BS_SMBChargerSpecInfo = 0x06,		/* CL - SMB Charger Extended Status */
-	kHIDUsage_BS_SMBSelectorState = 0x07,		/* CL - SMB Selector State */
-	kHIDUsage_BS_SMBSelectorPresets = 0x08,		/* CL - SMB Selector Presets */
-	kHIDUsage_BS_SMBSelectorInfo = 0x09,		/* CL - SMB Selector Info */
-	/* Reserved 0x0A - 0x0F */
-	kHIDUsage_BS_OptionalMfgFunction1 = 0x10,	/* DV F - Battery System Optional SMB Mfg Function 1 */
-	kHIDUsage_BS_OptionalMfgFunction2 = 0x11,	/* DV F - Battery System Optional SMB Mfg Function 2 */
-	kHIDUsage_BS_OptionalMfgFunction3 = 0x12,	/* DV F - Battery System Optional SMB Mfg Function 3 */
-	kHIDUsage_BS_OptionalMfgFunction4 = 0x13,	/* DV F - Battery System Optional SMB Mfg Function 4 */
-	kHIDUsage_BS_OptionalMfgFunction5 = 0x14,	/* DV F - Battery System Optional SMB Mfg Function 5 */
-	kHIDUsage_BS_ConnectionToSMBus = 0x15,		/* DF F - Battery System Connection To System Management Bus */
-	kHIDUsage_BS_OutputConnection = 0x16,		/* DF F - Battery System Output Connection Status */
-	kHIDUsage_BS_ChargerConnection = 0x17,		/* DF F - Battery System Charger Connection */
-	kHIDUsage_BS_BatteryInsertion = 0x18,		/* DF F - Battery System Battery Insertion */
-	kHIDUsage_BS_Usenext = 0x19,				/* DF F - Battery System Use Next */
-	kHIDUsage_BS_OKToUse = 0x1A,				/* DF F - Battery System OK To Use */
-	kHIDUsage_BS_BatterySupported = 0x1B,		/* DF F - Battery System Battery Supported */
-	kHIDUsage_BS_SelectorRevision = 0x1C,		/* DF F - Battery System Selector Revision */
-	kHIDUsage_BS_ChargingIndicator = 0x1D,		/* DF F - Battery System Charging Indicator */
-	/* Reserved 0x1E - 0x27 */
-	kHIDUsage_BS_ManufacturerAccess = 0x28,		/* DV F - Battery System Manufacturer Access */
-	kHIDUsage_BS_RemainingCapacityLimit = 0x29,	/* DV F - Battery System Remaining Capacity Limit */
-	kHIDUsage_BS_RemainingTimeLimit = 0x2A,		/* DV F - Battery System Remaining Time Limit */
-	kHIDUsage_BS_AtRate = 0x2B,					/* DV F - Battery System At Rate... */
-	kHIDUsage_BS_CapacityMode = 0x2C,			/* DV F - Battery System Capacity Mode */
-	kHIDUsage_BS_BroadcastToCharger = 0x2D,		/* DV F - Battery System Broadcast To Charger */
-	kHIDUsage_BS_PrimaryBattery = 0x2E,			/* DV F - Battery System Primary Battery */
-	kHIDUsage_BS_ChargeController = 0x2F,		/* DV F - Battery System Charge Controller */
-	/* Reserved 0x30 - 0x3F */
-	kHIDUsage_BS_TerminateCharge = 0x40,		/* DF IOF - Battery System Terminate Charge */
-	kHIDUsage_BS_TerminateDischarge = 0x41,		/* DF IOF - Battery System Terminate Discharge */
-	kHIDUsage_BS_BelowRemainingCapacityLimit = 0x42, /* DF IOF - Battery System Below Remaining Capacity Limit */
-	kHIDUsage_BS_RemainingTimeLimitExpired = 0x43, /* DF IOF - Battery System Remaining Time Limit Expired */
-	kHIDUsage_BS_Charging = 0x44,				/* DF IOF - Battery System Charging */
-	kHIDUsage_BS_Discharging = 0x45,			/* DV IOF - Battery System Discharging */
-	kHIDUsage_BS_FullyCharged = 0x46,			/* DF IOF - Battery System Fully Charged */
-	kHIDUsage_BS_FullyDischarged = 0x47,		/* DV IOF - Battery System Fully Discharged */
-	kHIDUsage_BS_ConditioningFlag = 0x48,		/* DV IOF - Battery System Conditioning Flag */
-	kHIDUsage_BS_AtRateOK = 0x49,				/* DV IOF - Battery System At Rate OK */
-	kHIDUsage_BS_SMBErrorCode = 0x4A,			/* DF IOF - Battery System SMB Error Code */
-	kHIDUsage_BS_NeedReplacement = 0x4B,		/* DF IOF - Battery System Need Replacement */
-	/* Reserved 0x4C - 0x5F */
-	kHIDUsage_BS_AtRateTimeToFull = 0x60,		/* DV IF - Battery System At Rate Time To Full */
-	kHIDUsage_BS_AtRateTimeToEmpty = 0x61,		/* DV IF - Battery System At Rate Time To Empty */
-	kHIDUsage_BS_AverageCurrent = 0x62,			/* DV IF - Battery System Average Current */
-	kHIDUsage_BS_Maxerror = 0x63,				/* DV IF - Battery System Max Error */
-	kHIDUsage_BS_RelativeStateOfCharge = 0x64,	/* DV IF - Battery System Relative State Of Charge */
-	kHIDUsage_BS_AbsoluteStateOfCharge = 0x65,	/* DV IF - Battery System Absolute State Of Charge */
-	kHIDUsage_BS_RemainingCapacity = 0x66,		/* DV IF - Battery System Remaining Capacity */
-	kHIDUsage_BS_FullChargeCapacity = 0x67,		/* DV IF - Battery System Full Charge Capacity */
-	kHIDUsage_BS_RunTimeToEmpty = 0x68,			/* DV IF - Battery System Run Time To Empty */
-	kHIDUsage_BS_AverageTimeToEmpty = 0x69,		/* DV IF - Battery System Average Time To Empty */
-	kHIDUsage_BS_AverageTimeToFull = 0x6A,		/* DV IF - Battery System Average Time To Full */
-	kHIDUsage_BS_CycleCount = 0x6B,				/* DV IF - Battery System Cycle Count */
-	/* Reserved 0x6C - 0x7F */
-	kHIDUsage_BS_BattPackModelLevel = 0x80,		/* SV F - Battery System Batt Pack Model Level */
-	kHIDUsage_BS_InternalChargeController = 0x81, /* SF F - Battery System Internal Charge Controller */
-	kHIDUsage_BS_PrimaryBatterySupport = 0x82,	/* SF F - Battery System Primary Battery Support */
-	kHIDUsage_BS_DesignCapacity = 0x83,			/* SV F - Battery System Design Capacity */
-	kHIDUsage_BS_SpecificationInfo = 0x84,		/* SV F - Battery System Specification Info */
-	kHIDUsage_BS_ManufacturerDate = 0x85,		/* SV F - Battery System Manufacturer Date */
-	kHIDUsage_BS_SerialNumber = 0x86,			/* SV F - Battery System Serial Number */
-	kHIDUsage_BS_iManufacturerName = 0x87,		/* SV F - Battery System Manufacturer Name Index */
-	kHIDUsage_BS_iDevicename = 0x88,			/* SV F - Battery System Device Name Index */
-	kHIDUsage_BS_iDeviceChemistry = 0x89,		/* SV F - Battery System Device Chemistry Index */
-	kHIDUsage_BS_ManufacturerData = 0x8A,		/* SV F - Battery System Manufacturer Data */
-	kHIDUsage_BS_Rechargable = 0x8B,			/* SV F - Battery System Rechargable */
-	kHIDUsage_BS_WarningCapacityLimit = 0x8C,	/* SV F - Battery System Warning Capacity Limit */
-	kHIDUsage_BS_CapacityGranularity1 = 0x8D,	/* SV F - Battery System Capacity Granularity 1 */
-	kHIDUsage_BS_CapacityGranularity2 = 0x8E,	/* SV F - Battery System Capacity Granularity 2 */
-	kHIDUsage_BS_iOEMInformation = 0x8F,		/* SV F - Battery System OEM Information Index */
-	/* Reserved 0x90 - 0xBF */
-	kHIDUsage_BS_InhibitCharge = 0xC0,			/* DF IOF - Battery System Inhibit Charge */
-	kHIDUsage_BS_EnablePolling = 0xC1,			/* DF IOF - Battery System Enable Polling */
-	kHIDUsage_BS_ResetToZero = 0xC2,			/* DF IOF - Battery System Reset To Zero */
-	/* Reserved 0xC3 - 0xCF */
-	kHIDUsage_BS_ACPresent = 0xD0,				/* DF IOF - Battery System AC Present */
-	kHIDUsage_BS_BatteryPresent = 0xD1,			/* DF IOF - Battery System Battery Present */
-	kHIDUsage_BS_PowerFail = 0xD2,				/* DF IOF - Battery System Power Fail */
-	kHIDUsage_BS_AlarmInhibited = 0xD3,			/* DF IOF - Battery System Alarm Inhibited */
-	kHIDUsage_BS_ThermistorUnderRange = 0xD4,	/* DF IOF - Battery System Thermistor Under Range */
-	kHIDUsage_BS_ThermistorHot = 0xD5,			/* DF IOF - Battery System Thermistor Hot */
-	kHIDUsage_BS_ThermistorCold = 0xD6,			/* DF IOF - Battery System Thermistor Cold */
-	kHIDUsage_BS_ThermistorOverRange = 0xD7,	/* DF IOF - Battery System Thermistor Over Range */
-	kHIDUsage_BS_VoltageOutOfRange = 0xD8,		/* DF IOF - Battery System Voltage Out Of Range */
-	kHIDUsage_BS_CurrentOutOfRange = 0xD9,		/* DF IOF - Battery System Current Out Of Range */
-	kHIDUsage_BS_CurrentNotRegulated = 0xDA,	/* DF IOF - Battery System Current Not Regulated */
-	kHIDUsage_BS_VoltageNotRegulated = 0xDB,	/* DF IOF - Battery System Voltage Not Regulated */
-	kHIDUsage_BS_MasterMode = 0xDC,				/* DF IOF - Battery System Master Mode */
-	/* Reserved 0xDD - 0xEF */
-	kHIDUsage_BS_ChargerSelectorSupport = 0xF0,	/* SF F- Battery System Charger Support Selector */
-	kHIDUsage_BS_ChargerSpec = 0xF1,			/* SF F- Battery System Charger Specification */
-	kHIDUsage_BS_Level2 = 0xF2,					/* SF F- Battery System Charger Level 2 */
-	kHIDUsage_BS_Level3 = 0xF3					/* SF F- Battery System Charger Level 3 */
-	/* Reserved 0xF2 - 0xFF */
-};
-
-/* Bar Code Scanner Page (0x8C) */
-/* This section provides detailed descriptions of the usages employed by Bar Code Scanner Devices. */
-enum
-{
-    kHIDUsage_BCS_Undefined = 0x00,                     /* Bar Code Scanner Undefined Usage */
-    kHIDUsage_BCS_BadgeReader = 0x01,                   /* CA - Bar Code Badge Reader */
-    kHIDUsage_BCS_BarCodeScanner = 0x02,                /* CA -Bar Code Scanner */
-    kHIDUsage_BCS_DumbBarCodeScanner = 0x03,            /* CA -Dumb Bar Code Scanner  Usage */
-    kHIDUsage_BCS_CordlessScannerBase = 0x04,           /* CA -Cordless Base Usage */
-    kHIDUsage_BCS_BarCodeScannerCradle = 0x05,          /* CA -Bar Code Scanner Cradle Usage */
-    /* Reserved 0x06 - 0x0F */
-    kHIDUsage_BCS_AttributeReport = 0x10,               /* CL - Attribute Report */
-    kHIDUsage_BCS_SettingsReport = 0x11,                /* CL - Settings Report */
-    kHIDUsage_BCS_ScannedDataReport = 0x12,             /* CL - Scanned Data Report */
-    kHIDUsage_BCS_RawScannedDataReport = 0x13,          /* CL - Raw Scanned Data Report */
-    kHIDUsage_BCS_TriggerReport = 0x14,                 /* CL - Trigger Report */
-    kHIDUsage_BCS_StatusReport = 0x15,                  /* CL - Status Report */
-    kHIDUsage_BCS_UPC_EANControlReport = 0x16,          /* CL - UPC/EAN Control Report */
-    kHIDUsage_BCS_EAN2_3LabelControlReport = 0x17,      /* CL - EAN 2/3 Label Control Report */
-    kHIDUsage_BCS_Code39ControlReport = 0x18,           /* CL - Code 39 Control Report */
-    kHIDUsage_BCS_Interleaved2of5ControlReport = 0x19,  /* CL - Interleaved 2 of 5 Control Report */
-    kHIDUsage_BCS_Standard2of5ControlReport = 0x1A,     /* CL - Standard 2 of 5 Control Report */
-    kHIDUsage_BCS_MSIPlesseyControlReport = 0x1B,       /* CL - MSI Plessey Control Report */
-    kHIDUsage_BCS_CodabarControlReport = 0x1C,          /* CL - Codabar Control Report */
-    kHIDUsage_BCS_Code128ControlReport = 0x1D,          /* CL - Code 128 Control Report */
-    kHIDUsage_BCS_Misc1DControlReport = 0x1E,           /* CL - Misc 1D Control Report */
-    kHIDUsage_BCS_2DControlReport = 0x1F,               /* CL - 2D Control Report */
-    /* Reserved 0x20 - 0x2F */
-    kHIDUsage_BCS_Aiming_PointerMide = 0x30,            /* SF - Aiming Pointer Mode */
-    kHIDUsage_BCS_BarCodePresentSensor = 0x31,          /* SF - Bar Code Present Sensor */
-    kHIDUsage_BCS_Class1ALaser = 0x32,                  /* SF - Class 1A Laser */
-    kHIDUsage_BCS_Class2Laser = 0x33,                   /* SF - Class 2 Laser */
-    kHIDUsage_BCS_HeaterPresent = 0x34,                 /* SF - Heater Present */
-    kHIDUsage_BCS_ContactScanner = 0x35,                /* SF - Contact Scanner */
-    kHIDUsage_BCS_ElectronicArticleSurveillanceNotification = 0x36, /* SF - Electronic Article Surveillance Notification */
-    kHIDUsage_BCS_ConstantElectronicArticleSurveillance = 0x37, /* SF - Constant Electronic Article Surveillance */
-    kHIDUsage_BCS_ErrorIndication = 0x38,               /* SF - Error Indication */
-    kHIDUsage_BCS_FixedBeeper = 0x39,                   /* SF - Fixed Beeper */
-    kHIDUsage_BCS_GoodDecodeIndication = 0x3A,          /* SF - Good Decode Indication */
-    kHIDUsage_BCS_HandsFreeScanning = 0x3B,             /* SF - Hands Free Scanning */
-    kHIDUsage_BCS_IntrinsicallySafe = 0x3C,             /* SF - Intrinsically Safe */
-    kHIDUsage_BCS_KlasseEinsLaser = 0x3D,               /* SF - Klasse Eins Laser */
-    kHIDUsage_BCS_LongRangeScanner = 0x3E,              /* SF - Long Range Scanner */
-    kHIDUsage_BCS_MirrorSpeedControl = 0x3F,            /* SF - Mirror Speed Control */
-    kHIDUsage_BCS_NotOnFileIndication = 0x40,           /* SF - Not On File Indication */
-    kHIDUsage_BCS_ProgrammableBeeper = 0x41,            /* SF - Programmable Beeper */
-    kHIDUsage_BCS_Triggerless = 0x42,                   /* SF - Triggerless */
-    kHIDUsage_BCS_Wand = 0x43,                          /* SF - Wand */
-    kHIDUsage_BCS_WaterResistant = 0x44,                /* SF - Water Resistant */
-    kHIDUsage_BCS_MultiRangeScanner = 0x45,             /* SF - Multi-Range Scanner */
-    kHIDUsage_BCS_ProximitySensor = 0x46,               /* SF - Proximity Sensor */
-    /* Reserved 0x47 - 0x4C */
-    kHIDUsage_BCS_FragmentDecoding = 0x4D,              /* DF - Fragment Decoding */
-    kHIDUsage_BCS_ScannerReadConfidence = 0x4E,         /* DV - Scanner Read Confidence */
-    kHIDUsage_BCS_DataPrefix = 0x4F,                    /* NAry - Data Prefix  */
-    kHIDUsage_BCS_PrefixAIMI = 0x50,                    /* SEL - Prefix AIMI */
-    kHIDUsage_BCS_PrefixNone = 0x51,                    /* SEL - Prefix None */
-    kHIDUsage_BCS_PrefixProprietary = 0x52,             /* SEL - Prefix Proprietary */
-    /* Reserved 0x53 - 0x54 */
-    kHIDUsage_BCS_ActiveTime = 0x55,                    /* DV - Active Time */
-    kHIDUsage_BCS_AimingLaserPattern = 0x56,            /* DF - Aiming Laser Pattern */
-    kHIDUsage_BCS_BarCodePresent = 0x57,                /* OOC - Bar Code Present */
-    kHIDUsage_BCS_BeeperState = 0x58,                   /* OOC - Beeper State */
-    kHIDUsage_BCS_LaserOnTime = 0x59,                   /* DV - Laser On Time */
-    kHIDUsage_BCS_LaserState = 0x5A,                    /* OOC - Laser State */
-    kHIDUsage_BCS_LockoutTime = 0x5B,                   /* DV - Lockout Time */
-    kHIDUsage_BCS_MotorState = 0x5C,                    /* OOC - Motor State */
-    kHIDUsage_BCS_MotorTimeout = 0x5D,                  /* DV - Motor Timeout */
-    kHIDUsage_BCS_PowerOnResetScanner = 0x5E,           /* DF - Power On Reset Scanner */
-    kHIDUsage_BCS_PreventReadOfBarcodes = 0x5F,         /* DF - Prevent Read of Barcodes */
-    kHIDUsage_BCS_InitiateBarcodeRead = 0x60,           /* DF - Initiate Barcode Read */
-    kHIDUsage_BCS_TriggerState = 0x61,                  /* DF - Trigger State */
-    kHIDUsage_BCS_TriggerMode = 0x62,                   /* NAry - Trigger Mode */
-    kHIDUsage_BCS_TriggerModeBlinkingLaserOn = 0x63,    /* SEL - Trigger Mode Blinking Laser On */
-    kHIDUsage_BCS_TriggerModeContinuousLaserOn = 0x64,  /* SEL - Trigger Mode Continuous Laser On */
-    kHIDUsage_BCS_TriggerModeLaserOnWhilePulled = 0x65, /* SEL - Trigger Mode Laser on while Pulled */
-    kHIDUsage_BCS_TriggerModeLaserStaysOnAfterTriggerRelease = 0x66, /* SEL - Trigger Mode Laser stays on after Trigger Release */
-    /* Reserved 0x67 - 0x6C */
-    kHIDUsage_BCS_CommitParametersToNVM = 0x6D,         /* DF - Commit Parameters to NVM */
-    kHIDUsage_BCS_ParameterScanning = 0x6E,             /* DF - Parameter Scanning */
-    kHIDUsage_BCS_ParametersChanged = 0x6F,             /* OOC - Parameters Changed */
-    kHIDUsage_BCS_SetParameterDefaultValues = 0x70,     /* DF - Set parameter default values */
-    /* Reserved 0x71 - 0x74 */
-    kHIDUsage_BCS_ScannerInCradle = 0x75,               /* OOC - Scanner In Cradle */
-    kHIDUsage_BCS_ScannerInRange = 0x76,                /* OOC - Scanner In Range */
-    /* Reserved 0x77 - 0x79 */
-    kHIDUsage_BCS_AimDuration = 0x7A,                   /* DV - Aim Duration */
-    kHIDUsage_BCS_GoodReadLampDuration = 0x7B,          /* DV - Good Read Lamp Duration */
-    kHIDUsage_BCS_GoodReadLampIntensity = 0x7C,         /* DV - Good Read Lamp Intensity */
-    kHIDUsage_BCS_GoodReadLED = 0x7D,                   /* DF - Good Read LED */
-    kHIDUsage_BCS_GoodReadToneFrequency = 0x7E,         /* DV - Good Read Tone Frequency*/
-    kHIDUsage_BCS_GoodReadToneLength = 0x7F,            /* DV - Good Read Tone Length */
-    kHIDUsage_BCS_GoodReadToneVolume = 0x80,            /* DV - Good Read Tone Volume */
-    /* Reserved 0x81 */
-    kHIDUsage_BCS_NoReadMessage = 0x82,                 /* DF - No Read Message */
-    kHIDUsage_BCS_NotOnFileVolume = 0x83,               /* DV - Not on File Volume */
-    kHIDUsage_BCS_PowerupBeep = 0x84,                   /* DF - Powerup Beep */
-    kHIDUsage_BCS_SoundErrorBeep = 0x85,               /* DF - Sound Error Beep */
-    kHIDUsage_BCS_SoundGoodReadBeep = 0x86,             /* DF - Sound Good Read Beep */
-    kHIDUsage_BCS_SoundNotOnFileBeep = 0x87,            /* DF - Sound Not On File Beep */
-    kHIDUsage_BCS_GoodReadWhenToWrite = 0x88,           /* NArry - Good Read When to Write */
-    kHIDUsage_BCS_GRWTIAfterDecode = 0x89,              /* SEL - GRWTI After Decode */
-    kHIDUsage_BCS_GRWTIBeep_LampAfterTransmit = 0x8A,   /* SEL - GRWTI Beep/Lamp after transmit */
-    kHIDUsage_BCS_GRWTINoBeep_LampUseAtAll = 0x8B,      /* SEL - GRWTI No Beep/Lamp at all */
-    /* Reserved 0x8C - 0x90 */
-    kHIDUsage_BCS_BooklandEAN = 0x91,                   /* DF - Bookland EAN */
-    kHIDUsage_BCS_ConvertEAN8To13Type = 0x92,           /* DF - Convert EAN 8 to 13 Type */
-    kHIDUsage_BCS_ConvertUPCAToEAN_13 = 0x93,           /* DF - Convert UPC A to EAN-13 */
-    kHIDUsage_BCS_ConvertUPC_EToA = 0x94,               /* DF - Convert UPC-E to A */
-    kHIDUsage_BCS_EAN_13 = 0x95,                        /* DF - EAN-13 */
-    kHIDUsage_BCS_EAN_8 = 0x96,                         /* DF - EAN_8 */
-    kHIDUsage_BCS_EAN_99_128_Mandatory  = 0x97,         /* DF - EAN-99 128_Mandatory  */
-    kHIDUsage_BCS_EAN_99_P5_128_Optional = 0x98,        /* DF - EAN-99 P5/128_Optional */
-    /* Reserved 0x99 */
-    kHIDUsage_BCS_UPC_EAN = 0x9A,                       /* DF - UPC/EAN */
-    kHIDUsage_BCS_UPC_EANCouponCode = 0x9B,             /* DF - UPC/EAN Coupon Code */
-    kHIDUsage_BCS_UPC_EANPeriodicals = 0x9C,            /* DV - UPC/EAN Periodicals */
-    kHIDUsage_BCS_UPC_A = 0x9D,                         /* DF - UPC-A */
-    kHIDUsage_BCS_UPC_AWith128Mandatory = 0x9E,         /* DF - UPC-A with 128 Mandatory */
-    kHIDUsage_BCS_UPC_AWith128Optical = 0x9F,           /* DF - UPC-A with 128 Optical */
-    kHIDUsage_BCS_UPC_AWithP5Optional = 0xA0,           /* DF - UPC-A with P5 Optional */
-    kHIDUsage_BCS_UPC_E = 0xA1,                         /* DF - UPC-E */
-    kHIDUsage_BCS_UPC_E1 = 0xA2,                        /* DF - UPC-E1 */
-    /* Reserved 0xA3 - 0xA8 */
-    kHIDUsage_BCS_Periodical = 0xA9,                    /* NArry - Periodical */
-    kHIDUsage_BCS_PeriodicalAutoDiscriminatePlus2 = 0xAA,/* SEL - Periodical Auto-Discriminate + 2 */
-    kHIDUsage_BCS_PeriodicalOnlyDecodeWithPlus2 = 0xAB, /* SEL - Periodical Only Decode with + 2 */
-    kHIDUsage_BCS_PeriodicalIgnorePlus2 = 0xAC,         /* SEL - Periodical Ignore + 2 */
-    kHIDUsage_BCS_PeriodicalAutoDiscriminatePlus5 = 0xAD,/* SEL - Periodical Auto-Discriminate + 5 */
-    kHIDUsage_BCS_PeriodicalOnlyDecodeWithPlus5 = 0xAE, /* SEL - Periodical Only Decode with + 5 */
-    kHIDUsage_BCS_PeriodicalIgnorePlus5 = 0xAF,         /* SEL - Periodical Ignore + 5 */
-    kHIDUsage_BCS_Check = 0xB0,                         /* NArry - Check */
-    kHIDUsage_BCS_CheckDisablePrice = 0xB1,             /* SEL - Check Disable Price */
-    kHIDUsage_BCS_CheckEnable4DigitPrice = 0xB2,        /* SEL - Check Enable 4 digit Price */
-    kHIDUsage_BCS_CheckEnable5DigitPrice = 0xB3,        /* SEL - Check Enable 5 digit Price */
-    kHIDUsage_BCS_CheckEnableEuropean4DigitPrice = 0xB4,/* SEL - Check Enable European 4 digit Price */
-    kHIDUsage_BCS_CheckEnableEuropean5DigitPrice = 0xB5,/* SEL - Check Enable European 5 digit Price */
-    /* Reserved 0xB6 */
-    kHIDUsage_BCS_EANTwoLabel = 0xB7,                   /* DF - EAN Two Label  */
-    kHIDUsage_BCS_EANThreeLabel  = 0xB8,                /* DF - EAN Thread Label */
-    kHIDUsage_BCS_EAN8FlagDigit1 = 0xB9,                /* DV - EAN 8 Flag Digit 1 */
-    kHIDUsage_BCS_EAN8FlagDigit2 = 0xBA,                /* DV - EAN 8 Flag Digit 2 */
-    kHIDUsage_BCS_EAN8FlagDigit3 = 0xBB,                /* DV - EAN 8 Flag Digit 3 */
-    kHIDUsage_BCS_EAN13FlagDigit1 = 0xBC,               /* DV - EAN 13 Flag Digit 1 */
-    kHIDUsage_BCS_EAN13FlagDigit2 = 0xBD,               /* DV - EAN 13 Flag Digit 2 */
-    kHIDUsage_BCS_EAN13FlagDigit3 = 0xBE,               /* DV - EAN 13 Flag Digit 3 */
-    kHIDUsage_BCS_AddEAN2_3LabelDefinition = 0xBF,      /* DF - Add EAN 2/3 Label Definition */
-    kHIDUsage_BCS_ClearAllEAN2_3LabelDefinitions = 0xC0,/* DF - Clear all EAN 2/3 Label Definitions */
-    /* Reserved 0xC1 - 0xC2 */
-    kHIDUsage_BCS_Codabar = 0xC3,                       /* DF - Codabar */
-    kHIDUsage_BCS_Code128 = 0xC4,                       /* DF - Code 128 */
-    /* Reserved 0xC5 - 0xC6 */
-    kHIDUsage_BCS_Code39 = 0xC7,                        /* DF - Code 39 */
-    kHIDUsage_BCS_Code93 = 0xC8,                        /* DF - Code 93 */
-    kHIDUsage_BCS_FullASCIIConversion = 0xC9,           /* DF - Full ASCII Conversion */
-    kHIDUsage_BCS_Interleaved2of5 = 0xCA,               /* DF - Interleaved 2 of 5 */
-    kHIDUsage_BCS_ItalianPharmacyCode = 0xCB,           /* DF - Italian Pharmacy Code */
-    kHIDUsage_BCS_MSI_Plessey = 0xCC,                   /* DF - MSI/Plessey */
-    kHIDUsage_BCS_Standard2of5IATA = 0xCD,              /* DF - Standard 2 of 5 IATA */
-    kHIDUsage_BCS_Standard2of5 = 0xCE,                  /* DF - Standard 2 of 5 */
-    /* Reserved 0xCF - 0xD2 */
-    kHIDUsage_BCS_TransmitStart_Stop = 0xD3,            /* DF - Transmit Start/Stop */
-    kHIDUsage_BCS_TriOptic = 0xD4,                      /* DF - Tri-Optic  */
-    kHIDUsage_BCS_UCC_EAN_128 = 0xD5,                   /* DF - UCC/EAN-128  */
-    kHIDUsage_BCS_CheckDigit = 0xD6,                    /* NArry - Check Digit */
-    kHIDUsage_BCS_CheckDigitDisable = 0xD7,             /* SEL - Check Digit Disable */
-    kHIDUsage_BCS_CheckDigitEnableInterleaved2of5OPCC = 0xD8, /* SEL - Check Digit Enable Interleaved 2 of 5 OPCC */
-    kHIDUsage_BCS_CheckDigitEnableInterleaved2of5USS = 0xD9, /* SEL - Check Digit Enable Interleaved 2 of 5 USS */
-    kHIDUsage_BCS_CheckDigitEnableStandard2of5OPCC = 0xD8, /* SEL - Check Digit Enable Standard 2 of 5 OPCC */
-    kHIDUsage_BCS_CheckDigitEnableStandard2of5USS = 0xD9, /* SEL - Check Digit Enable Standard 2 of 5 USS */
-    kHIDUsage_BCS_CheckDigitEnableOneMSIPlessey = 0xDC, /* SEL - Check Digit Enable One MSI Plessey */
-    kHIDUsage_BCS_CheckDigitEnableTwoMSIPlessey = 0xDD, /* SEL - Check Digit Enable Two MSI Plessey */
-    kHIDUsage_BCS_CheckDigitCodabarEnable = 0xDE,       /* SEL - Check Digit Codabar Enable */
-    kHIDUsage_BCS_CheckDigitCode99Enable = 0xDF,        /* SEL - Check Digit Code 99 Enable */
-    /* Reserved 0xE0 - 0xEF */
-    kHIDUsage_BCS_TransmitCheckDigit = 0xF0,            /* NArry - Transmit Check Digit */
-    kHIDUsage_BCS_DisableCheckDigitTransmit = 0xF1,     /* SEL - Disable Check Digit Transmit */
-    kHIDUsage_BCS_EnableCheckDigitTransmit = 0xF2,      /* SEL - Enable Check Digit Transmit */
-    /* Reserved 0xF3 - 0xFA */
-    kHIDUsage_BCS_SymbologyIdentifier1 = 0xFB,          /* DV - Symbology Identifier 1 */
-    kHIDUsage_BCS_SymbologyIdentifier2 = 0xFC,          /* DV - Symbology Identifier 2 */
-    kHIDUsage_BCS_SymbologyIdentifier3 = 0xFD,          /* DV - Symbology Identifier 3 */
-    kHIDUsage_BCS_DecodedData = 0xFE,                   /* DV - Decoded Data */
-    kHIDUsage_BCS_DecodeDataContinued = 0xFF,           /* DF - Decode Data Continued */
-    kHIDUsage_BCS_BarSpaceData = 0x100,                 /* DV - Bar Space Data */
-    kHIDUsage_BCS_ScannerDataAccuracy = 0x101,          /* DV - Scanner Data Accuracy */
-    kHIDUsage_BCS_RawDataPolarity = 0x102,              /* NArry - Raw Data Polarity */
-    kHIDUsage_BCS_PolarityInvertedBarCode = 0x103,      /* SEL - Polarity Inverted Bar Code */
-    kHIDUsage_BCS_PolarityNormalBarCode = 0x103,        /* SEL - Polarity Normal Bar Code */
-    /* Reserved 0x105 */
-    kHIDUsage_BCS_MinimumLengthToDecode = 0x106,        /* DV - Minimum Length to Decode */
-    kHIDUsage_BCS_MaximumLengthToDecode = 0x107,        /* DV - Maximum Length to Decode */
-    kHIDUsage_BCS_FirstDiscreteLengthToDecode = 0x108,  /* DV - First Discrete Length to Decode */
-    kHIDUsage_BCS_SecondDiscreteLengthToDecode = 0x109, /* DV - Second Discrete Length to Decode */
-    kHIDUsage_BCS_DataLengthMethod = 0x10A,             /* NArry - Data Length Method */
-    kHIDUsage_BCS_DLMethodReadAny = 0x10B,              /* DF - DL Method Read any */
-    kHIDUsage_BCS_DLMethodCheckInRange = 0x10C,         /* DF - DL Method Check in Range */
-    kHIDUsage_BCS_DLMethodCheckForDiscrete = 0x10D,     /* DF - DL Method Check for Discrete */
-    /* Reserved 0x10E - 0x10F */
-    kHIDUsage_BCS_AztecCode = 0x110,                    /* DF - Aztec Code */
-    kHIDUsage_BCS_BC412 = 0x111,                        /* DF - BC412 */
-    kHIDUsage_BCS_ChannelCode = 0x112,                  /* DF - Channel Code */
-    kHIDUsage_BCS_Code16 = 0x113,                       /* DF - Code 16 */
-    kHIDUsage_BCS_Code32 = 0x114,                       /* DF - Code 32 */
-    kHIDUsage_BCS_Code49 = 0x115,                       /* DF - Code 49 */
-    kHIDUsage_BCS_CodeOne = 0x116,                      /* DF - Code One */
-    kHIDUsage_BCS_Colorcode = 0x117,                    /* DF - Colorcode */
-    kHIDUsage_BCS_DataMatrix = 0x118,                   /* DF - Data Matrix */
-    kHIDUsage_BCS_MaxiCode = 0x119,                     /* DF - MaxiCode */
-    kHIDUsage_BCS_MicroPDF = 0x11A,                     /* DF - MicroPDF */
-    kHIDUsage_BCS_PDF_417 = 0x11B,                      /* DF - PDF-417 */
-    kHIDUsage_BCS_PosiCode = 0x11C,                     /* DF - PosiCode */
-    kHIDUsage_BCS_QRCode = 0x11D,                       /* DF - QR Code */
-    kHIDUsage_BCS_SuperCode = 0x11E,                    /* DF - SuperCode */
-    kHIDUsage_BCS_UltraCode = 0x11F,                    /* DF - UltraCode */
-    kHIDUsage_BCS_USB_5_SlugCode = 0x120,               /* DF - USD-5 (Slug Code) */
-    kHIDUsage_BCS_VeriCode = 0x121                      /* DF - VeriCode */
-    /* Reserved 0x122 - 0xFFFF */
-};
-
-/* Weighing Devices Page (0x8D) */
-/* This section provides detailed descriptions of the usages employed by Weighing Devices. */
-enum
-{
-    kHIDUsage_WD_Undefined = 0x00,                      /* Weighing Device Undefined Usage */
-    kHIDUsage_WD_WeighingDevice = 0x01,                 /* CA - Weighing Device */
-    /* Reserved 0x02 - 0x1F */
-    kHIDUsage_WD_ScaleScaleDevice = 0x20,               /* CL - Scale Device */
-    kHIDUsage_WD_ScaleScaleClassIMetricCL = 0x21,       /* CL - Scale Class I Metric */
-    kHIDUsage_WD_ScaleScaleClassIMetric = 0x22,         /* SEL - Scale Class I Metric */
-    kHIDUsage_WD_ScaleScaleClassIIMetric = 0x23,        /* SEL - Scale Class II Metric */
-    kHIDUsage_WD_ScaleScaleClassIIIMetric = 0x24,       /* SEL - Scale Class III Metric */
-    kHIDUsage_WD_ScaleScaleClassIIILMetric = 0x25,      /* SEL - Scale Class IIIL Metric */
-    kHIDUsage_WD_ScaleScaleClassIVMetric = 0x26,        /* SEL - Scale Class IV Metric */
-    kHIDUsage_WD_ScaleScaleClassIIIEnglish = 0x27,      /* SEL - Scale Class III English */
-    kHIDUsage_WD_ScaleScaleClassIIILEnglish = 0x28,     /* SEL - Scale Class IIIL English */
-    kHIDUsage_WD_ScaleScaleClassIVEnglish = 0x29,       /* SEL - Scale Class IV English */
-    kHIDUsage_WD_ScaleScaleClassGeneric = 0x2A,         /* SEL - Scale Class Generic */
-    /* Reserved 0x2B - 0x2F */
-    kHIDUsage_WD_ScaleAtrributeReport = 0x30,           /* CL - Scale Attribute Report */
-    kHIDUsage_WD_ScaleControlReport = 0x31,             /* CL - Scale Control Report */
-    kHIDUsage_WD_ScaleDataReport = 0x32,                /* CL - Scale Data Report */
-    kHIDUsage_WD_ScaleStatusReport = 0x33,              /* CL - Scale Status Report */
-    kHIDUsage_WD_ScaleWeightLimitReport = 0x34,         /* CL - Scale Weight Limit Report */
-    kHIDUsage_WD_ScaleStatisticsReport = 0x35,          /* CL - Scale Statistics Report */
-    /* Reserved 0x36 - 0x3F */
-    kHIDUsage_WD_DataWeight = 0x40,                     /* DV - Data Weight */
-    kHIDUsage_WD_DataScaling = 0x41,                    /* DV - Data Scaling */
-    /* Reserved 0x42 - 0x4F */
-    kHIDUsage_WD_WeightUnit = 0x50,                     /* CL - Weight Unit */
-    kHIDUsage_WD_WeightUnitMilligram = 0x51,            /* SEL - Weight Unit Milligram */
-    kHIDUsage_WD_WeightUnitGram = 0x52,                 /* SEL - Weight Unit Gram */
-    kHIDUsage_WD_WeightUnitKilogram = 0x53,             /* SEL - Weight Unit Kilogram */
-    kHIDUsage_WD_WeightUnitCarats = 0x54,               /* SEL - Weight Unit Carats */
-    kHIDUsage_WD_WeightUnitTaels = 0x55,                /* SEL - Weight Unit Taels */
-    kHIDUsage_WD_WeightUnitGrains = 0x56,               /* SEL - Weight Unit Grains */
-    kHIDUsage_WD_WeightUnitPennyweights = 0x57,         /* SEL - Weight Unit Pennyweights */
-    kHIDUsage_WD_WeightUnitMetricTon = 0x58,            /* SEL - Weight Unit Metric Ton */
-    kHIDUsage_WD_WeightUnitAvoirTon = 0x59,             /* SEL - Weight Unit Avoir Ton */
-    kHIDUsage_WD_WeightUnitTroyOunce = 0x5A,            /* SEL - Weight Unit Troy Ounce */
-    kHIDUsage_WD_WeightUnitOunce = 0x5B,                /* SEL - Weight Unit Ounce */
-    kHIDUsage_WD_WeightUnitPound = 0x5C,                /* SEL - Weight Unit Pound */
-    /* Reserved 0x5D - 0x5F */
-    kHIDUsage_WD_CalibrationCount = 0x60,               /* DV - Calibration Count */
-    kHIDUsage_WD_RezeroCount = 0x61,                    /* DV - Re-Zero Count*/
-    /* Reserved 0x62 - 0x6F */
-    kHIDUsage_WD_ScaleStatus = 0x70,                    /* CL - Scale Status */
-    kHIDUsage_WD_ScaleStatusFault = 0x71,               /* SEL - Scale Status Fault */
-    kHIDUsage_WD_ScaleStatusStableAtZero = 0x72,        /* SEL - Scale Status Stable at Center of  Zero */
-    kHIDUsage_WD_ScaleStatusInMotion = 0x73,            /* SEL - Scale Status In Motion */
-    kHIDUsage_WD_ScaleStatusWeightStable = 0x74,        /* SEL - Scale Status Weight Stable */
-    kHIDUsage_WD_ScaleStatusUnderZero = 0x75,           /* SEL - Scale Status Under Zero */
-    kHIDUsage_WD_ScaleStatusOverWeightLimit = 0x76,     /* SEL - Scale Status Over Weight Limit */
-    kHIDUsage_WD_ScaleStatusRequiresCalibration = 0x77, /* SEL - Scale Status Requires Calibration */
-    kHIDUsage_WD_ScaleStatusRequiresRezeroing = 0x78,   /* SEL - Scale Status Requires Re-zeroing */
-    /* Reserved 0x79 - 0x7F */
-    kHIDUsage_WD_ZeroScale = 0x80,                      /* OOC - Zero Scale */
-    kHIDUsage_WD_EnforcedZeroReturn = 0x81              /* OOC - Enforced Zero Return */
-    /* Reserved 0x82 - 0xFFFF */
-    
-};
-
-/* Magnetic Stripe Reader Page (0x8E) */
-/* This section provides detailed descriptions of the usages employed by Magnetic Stripe Reader Devices. */
-enum 
-{
-    kHIDUsage_MSR_Undefined = 0x00,                     /* MagStripe Undefined Usage */
-    kHIDUsage_MSR_DeviceReadOnly = 0x01,                /* CA - MSR Device Read-Only */
-    /* Reserved 0x02 - 0x10 */
-    kHIDUsage_MSR_Track1Length = 0x11,                     /* SF, DF, SEL - Track 1 Length */
-    kHIDUsage_MSR_Track2Length = 0x12,                     /* SF, DF, SEL - Track 2 Length */
-    kHIDUsage_MSR_Track3Length = 0x13,                     /* SF, DF, SEL - Track 3 Length */
-    kHIDUsage_MSR_TrackJISLength = 0x14,                   /* SF, DF, SEL - Track JIS Length */
-    /* Reserved 0x15 - 0x1F */
-    kHIDUsage_MSR_TrackData = 0x20,                        /* SF, DF, SEL - Track Data */
-    kHIDUsage_MSR_Track1Data = 0x21,                       /* SF, DF, SEL - Track 1 Data */
-    kHIDUsage_MSR_Track2Data = 0x22,                       /* SF, DF, SEL - Track 2 Data */
-    kHIDUsage_MSR_Track3Data = 0x23,                       /* SF, DF, SEL - Track 3 Data */
-    kHIDUsage_MSR_TrackJISData = 0x24                      /* SF, DF, SEL - Track JIS Data */
-    /* Reserved 0x25 - 0xFFFF */
-};
-
-#endif /* _IOHIDUSAGETABLES_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIDevice.h b/i386/include/IOKit/hidsystem/IOHIDevice.h
deleted file mode 100644
index bb705a8..0000000
--- a/i386/include/IOKit/hidsystem/IOHIDevice.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2009 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/* 	Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved. 
- *
- * IOHIDevice.h - Common Event Source object class.
- *
- * HISTORY
- * 22 May 1992    Mike Paquette at NeXT
- *      Created. 
- * 4  Aug 1993	  Erik Kay at NeXT
- *	API cleanup
- * 5  Aug 1993	  Erik Kay at NeXT
- *	added ivar space for future expansion
- */
-
-#ifndef _IOHIDEVICE_H
-#define _IOHIDEVICE_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOLocks.h>
-
-typedef enum {
-  kHIUnknownDevice          = 0,
-  kHIKeyboardDevice         = 1,
-  kHIRelativePointingDevice = 2
-} IOHIDKind;
-
-class IOHIDevice : public IOService
-{
-  OSDeclareDefaultStructors(IOHIDevice);
-
-public:
-  virtual bool init(OSDictionary * properties = 0);
-  virtual void free();
-  virtual bool start(IOService * provider);
-  virtual bool open(  IOService *    forClient,
-                      IOOptionBits   options = 0,
-                      void *         arg = 0 );
-
-  virtual UInt32    deviceType();
-  virtual IOHIDKind hidKind();
-  virtual UInt32    interfaceID();
-  virtual bool 	    updateProperties(void);
-  virtual IOReturn  setProperties( OSObject * properties );
-  virtual IOReturn  setParamProperties(OSDictionary * dict);
-  virtual UInt64    getGUID();
-  
-  static SInt32		GenerateKey(OSObject *object);
-};
-
-#endif /* !_IOHIDEVICE_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIKeyboard.h b/i386/include/IOKit/hidsystem/IOHIKeyboard.h
deleted file mode 100644
index f6db152..0000000
--- a/i386/include/IOKit/hidsystem/IOHIKeyboard.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/* 	Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved. 
- *
- * EventSrcPCKeyboard.h - PC Keyboard EventSrc subclass definition
- *
- * HISTORY
- * 28 Aug 1992    Joe Pasqua
- *      Created. 
- */
-
-#ifndef _IOHIKEYBOARD_H
-#define _IOHIKEYBOARD_H
-
-#include <IOKit/hidsystem/IOHIDevice.h>
-#include <IOKit/hidsystem/IOHIKeyboardMapper.h>
-
-/* Start Action Definitions */
-
-/*
- * HISTORICAL NOTE:
- *   The following entry points were part of the IOHIKeyboardEvents
- *   protocol.
- */
-
-typedef void (*KeyboardEventAction)(       OSObject * target,
-                    /* eventFlags  */      unsigned   eventType,
-                    /* flags */            unsigned   flags,
-                    /* keyCode */          unsigned   key,
-                    /* charCode */         unsigned   charCode,
-                    /* charSet */          unsigned   charSet,
-                    /* originalCharCode */ unsigned   origCharCode,
-                    /* originalCharSet */  unsigned   origCharSet,
-                    /* keyboardType */     unsigned   keyboardType,
-                    /* repeat */           bool       repeat,
-                    /* atTime */           AbsoluteTime ts);
-
-typedef void (*KeyboardSpecialEventAction)(OSObject * target,
-                    /* eventType */        unsigned   eventType,
-                    /* flags */            unsigned   flags,
-                    /* keyCode */          unsigned   key,
-                    /* specialty */        unsigned   flavor,
-                    /* source id */        UInt64     guid,
-                    /* repeat */           bool       repeat,
-                    /* atTime */           AbsoluteTime ts);
-
-typedef void (*UpdateEventFlagsAction)(    OSObject * target,
-                     /* flags */           unsigned   flags);
-
-/* Event Callback Definitions */
-
-typedef void (*KeyboardEventCallback)(
-                    /* target */           OSObject * target,
-                    /* eventFlags  */      unsigned   eventType,
-                    /* flags */            unsigned   flags,
-                    /* keyCode */          unsigned   key,
-                    /* charCode */         unsigned   charCode,
-                    /* charSet */          unsigned   charSet,
-                    /* originalCharCode */ unsigned   origCharCode,
-                    /* originalCharSet */  unsigned   origCharSet,
-                    /* keyboardType */     unsigned   keyboardType,
-                    /* repeat */           bool       repeat,
-                    /* atTime */           AbsoluteTime ts,
-                    /* sender */           OSObject * sender,
-                    /* refcon */           void *     refcon);
-
-typedef void (*KeyboardSpecialEventCallback)(
-                    /* target */           OSObject * target,
-                    /* eventType */        unsigned   eventType,
-                    /* flags */            unsigned   flags,
-                    /* keyCode */          unsigned   key,
-                    /* specialty */        unsigned   flavor,
-                    /* source id */        UInt64     guid,
-                    /* repeat */           bool       repeat,
-                    /* atTime */           AbsoluteTime ts,
-                    /* sender */           OSObject * sender,
-                    /* refcon */           void *     refcon);
-                    
-typedef void (*UpdateEventFlagsCallback)(
-                    /* target */           OSObject * target,
-                    /* flags */            unsigned   flags,
-                    /* sender */           OSObject * sender,
-                    /* refcon */           void *     refcon);
-
-/* End Action Definitions */
-
-
-
-/* Default key repeat parameters */
-#define EV_DEFAULTINITIALREPEAT 500000000ULL    // 1/2 sec in nanoseconds
-#define EV_DEFAULTKEYREPEAT     83333333ULL     // 1/12 sec in nanoseconds
-#define EV_MINKEYREPEAT         16700000ULL     // 1/60 sec
-
-class IOHIKeyboard : public IOHIDevice
-{
-    OSDeclareDefaultStructors(IOHIKeyboard);
-
-    friend class IOHIDKeyboardDevice;
-	friend class IOHIDKeyboard;
-	friend class IOHIDConsumer;
-
-protected:
-    IOLock *	         _deviceLock;	// Lock for all device access
-    IOHIKeyboardMapper * _keyMap;	// KeyMap instance
-
-    // The following fields describe the kind of keyboard
-    UInt32		_interfaceType;
-    UInt32		_deviceType;
-
-    // The following fields describe the state of the keyboard
-    UInt32 *	_keyState;		// kbdBitVector
-    IOByteCount _keyStateSize;		// kbdBitVector allocated size
-    unsigned	_eventFlags;		// Current eventFlags
-    bool	_alphaLock;		// true means alpha lock is on
-    bool	_numLock;		// true means num lock is on
-    bool	_charKeyActive;		// true means char gen. key active
-
-    // The following fields are used in performing key repeats
-    bool 	_isRepeat;		// true means we're generating repeat
-    unsigned	_codeToRepeat;		// What we are repeating
-    bool	_calloutPending;	// true means we've sched. a callout
-    AbsoluteTime	_lastEventTime;		// Time last event was dispatched
-    AbsoluteTime	_downRepeatTime;	// Time when we should next repeat
-    AbsoluteTime	_keyRepeat;		// Delay between key repeats
-    AbsoluteTime	_initialKeyRepeat;	// Delay before initial key repeat
-    UInt64		_guid;
-
-    OSObject *                 _keyboardEventTarget;
-    KeyboardEventAction        _keyboardEventAction;
-    OSObject *                 _keyboardSpecialEventTarget;
-    KeyboardSpecialEventAction _keyboardSpecialEventAction;
-    OSObject *                 _updateEventFlagsTarget;
-    UpdateEventFlagsAction     _updateEventFlagsAction;
-
-protected:
-  virtual void dispatchKeyboardEvent(unsigned int keyCode,
-		     /* direction */ bool         goingDown,
-		     /* timeStamp */ AbsoluteTime time);
-
-public:
-  virtual bool init(OSDictionary * properties = 0);
-  virtual bool start(IOService * provider);
-  virtual void stop(IOService * provider);
-  virtual void free();
-
-  virtual bool open(IOService *                client,
-		    IOOptionBits	       options,
-                    KeyboardEventAction        keAction,
-                    KeyboardSpecialEventAction kseAction,
-                    UpdateEventFlagsAction     uefAction);
-                    
-  bool open(        IOService *                  client,
-		    IOOptionBits	         options,
-                    void *,
-                    KeyboardEventCallback        keCallback,
-                    KeyboardSpecialEventCallback kseCallback,
-                    UpdateEventFlagsCallback     uefCallback);
-
-  virtual void close(IOService * client, IOOptionBits );
-
-  virtual IOReturn message( UInt32 type, IOService * provider,
-                    void * argument = 0 );
-
-  virtual IOHIDKind hidKind();
-  virtual bool 	    updateProperties( void );
-  virtual IOReturn  setParamProperties(OSDictionary * dict);
-  virtual IOReturn  setProperties( OSObject * properties );
-  
-  inline  bool	    isRepeat() {return _isRepeat;}
-
-protected: // for subclasses to implement
-  virtual const unsigned char * defaultKeymapOfLength(UInt32 * length);
-  virtual void setAlphaLockFeedback(bool val);
-  virtual void setNumLockFeedback(bool val);
-  virtual UInt32 maxKeyCodes();
-
-
-private:
-  virtual bool resetKeyboard();
-  virtual void scheduleAutoRepeat();
-  static void _autoRepeat(void * arg, void *);
-  virtual void autoRepeat();
-  virtual void setRepeat(unsigned eventType, unsigned keyCode);
-  void setRepeatMode(bool repeat);
-  static void _createKeyboardNub(thread_call_param_t param0, thread_call_param_t param1);
-
-/*
- * HISTORICAL NOTE:
- *   The following methods were part of the KeyMapDelegate protocol;
- *   the declarations have now been merged directly into this class.
- */
-
-public:
-  virtual void keyboardEvent(unsigned eventType,
-      /* flags */            unsigned flags,
-      /* keyCode */          unsigned keyCode,
-      /* charCode */         unsigned charCode,
-      /* charSet */          unsigned charSet,
-      /* originalCharCode */ unsigned origCharCode,
-      /* originalCharSet */  unsigned origCharSet);
-
-  virtual void keyboardSpecialEvent(unsigned eventType,
-		    /* flags */     unsigned flags,
-		    /* keyCode */   unsigned keyCode,
-		    /* specialty */ unsigned flavor);
-
-  virtual void updateEventFlags(unsigned flags); // Does not generate events
-
-  virtual unsigned eventFlags();           // Global event flags
-  virtual unsigned deviceFlags();          // per-device event flags
-  virtual void setDeviceFlags(unsigned flags); // Set device event flags
-  virtual bool alphaLock();                // current alpha-lock state
-  virtual void setAlphaLock(bool val);     // Set current alpha-lock state
-  virtual bool numLock();                
-  virtual void setNumLock(bool val);     
-  virtual bool charKeyActive();            // Is a character gen. key down?
-  virtual void setCharKeyActive(bool val); // Note that a char gen key is down.
-  virtual bool doesKeyLock(unsigned key);  //does key lock physically
-  virtual unsigned getLEDStatus();  //check hardware for LED status
-
-private:
-  static void _keyboardEvent( IOHIKeyboard * self,
-			     unsigned   eventType,
-      /* flags */            unsigned   flags,
-      /* keyCode */          unsigned   key,
-      /* charCode */         unsigned   charCode,
-      /* charSet */          unsigned   charSet,
-      /* originalCharCode */ unsigned   origCharCode,
-      /* originalCharSet */  unsigned   origCharSet,
-      /* keyboardType */     unsigned   keyboardType,
-      /* repeat */           bool       repeat,
-      /* atTime */           AbsoluteTime ts);
-  static void _keyboardSpecialEvent( 	
-                             IOHIKeyboard * self,
-                             unsigned   eventType,
-        /* flags */          unsigned   flags,
-        /* keyCode  */       unsigned   key,
-        /* specialty */      unsigned   flavor,
-        /* guid */           UInt64     guid,
-        /* repeat */         bool       repeat,
-        /* atTime */         AbsoluteTime ts);
-        
-  static void _updateEventFlags( IOHIKeyboard * self,
-				unsigned flags);  /* Does not generate events */
-
-};
-
-#endif /* !_IOHIKEYBOARD_H */
diff --git a/i386/include/IOKit/hidsystem/IOHIKeyboardMapper.h b/i386/include/IOKit/hidsystem/IOHIKeyboardMapper.h
deleted file mode 100644
index 374d25c..0000000
--- a/i386/include/IOKit/hidsystem/IOHIKeyboardMapper.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _IOHIKEYBOARDMAPPER_H
-#define _IOHIKEYBOARDMAPPER_H
-
-#include <IOKit/hidsystem/ev_keymap.h>
-#include <IOKit/hidsystem/IOLLEvent.h>
-#include <IOKit/IOTimerEventSource.h>
-#include <IOKit/IOInterruptEventSource.h>
-
-class IOHIKeyboard;
-class IOHIDSystem;
-
-/*
- * Key ip/down state is tracked in a bit list.  Bits are set
- * for key-down, and cleared for key-up.  The bit vector and macros
- * for it's manipulation are defined here.
- */
-
-typedef	UInt32 * kbdBitVector;
-
-#define EVK_BITS_PER_UNIT	32
-#define EVK_BITS_MASK		31
-#define EVK_BITS_SHIFT		5	// 1<<5 == 32, for cheap divide
-
-#define EVK_KEYDOWN(n, bits) \
-	(bits)[((n)>>EVK_BITS_SHIFT)] |= (1 << ((n) & EVK_BITS_MASK))
-
-#define EVK_KEYUP(n, bits) \
-	(bits)[((n)>>EVK_BITS_SHIFT)] &= ~(1 << ((n) & EVK_BITS_MASK))
-
-#define EVK_IS_KEYDOWN(n, bits) \
-	(((bits)[((n)>>EVK_BITS_SHIFT)] & (1 << ((n) & EVK_BITS_MASK))) != 0)
-
-/* the maximum number of modifier keys sticky keys can hold at once */
-#define kMAX_MODIFIERS					5
-
-/* the number of shift keys in a row that must be depressed to toggle state */
-#define kNUM_SHIFTS_TO_ACTIVATE			5
-
-/* the number of milliseconds all the shifts must be pressed in - 30 seconds (30000 mS)*/
-#define kDEFAULT_SHIFTEXPIREINTERVAL	30000
-
-
-// sticky keys state flags
-enum
-{
-    kState_Disabled_Flag	= 0x0001,	// disabled and will do nothing until this is changed
-    kState_ShiftActivates_Flag	= 0x0002,	// the 'on' gesture (5 shifts) will activate
-    kState_On			= 0x0004,	// currently on, will hold down modifiers when pressed
-    kState_On_ModifiersDown	= 0x0008,	// one or more modifiers being held down
-
-    kState_Mask			= 0x00FF,	// mask for all states
-};
-
-typedef struct _stickyKeys_ToggleInfo
-{
-	// size of this allocation
-	IOByteCount		size;
-
-	// which modifier key we are tracking (using NX_WHICHMODMASK)
-	unsigned		toggleModifier;
-
-	// the number of times the modifier must be pressed to toggle
-	unsigned		repetitionsToToggle;
-
-	// how long the user has to press the modifier repetitionsToToggle times
-	// the default is 30 seconds
-	AbsoluteTime	expireInterval;
-
-	// the number of times the modifier used within the alloted time
-	unsigned		currentCount;
-
-	// the times that the last shift must occer for this one to be used
-	// this array will actually be of size repetitionsToToggle
-	AbsoluteTime	deadlines[1];
-} StickyKeys_ToggleInfo;
-
-// Flags for each sticky key modifier
-// This will allow for chording of keys
-// and for key locking
-enum
-{
-    kModifier_DidPerformModifiy	= 0x01,
-    kModifier_DidKeyUp		= 0x02,
-    kModifier_Locked		= 0x04,
-};
-typedef struct _stickyKeys_ModifierInfo
-{
-	UInt8		key;		// Key code of the sticky modifier
-        UInt8		state;		// The state of the sticky modifier
-        UInt8		leftModBit;	// System Mod bit of the sticky modifier
-} StickyKeys_ModifierInfo;
-
-class IOHIDKeyboardDevice;
-
-class IOHIKeyboardMapper : public OSObject
-{
-  OSDeclareDefaultStructors(IOHIKeyboardMapper);
-
-private:
-	IOHIKeyboard *		_delegate;					// KeyMap delegate
-	bool				_mappingShouldBeFreed;		// true if map can be IOFree'd
-	NXParsedKeyMapping	_parsedMapping;				// current system-wide keymap
-	IOHIDSystem	 *		_hidSystem;					// target of IOHIKeyboard (should be IOHIDSystem)
-	
-	// binary compatibility padding
-    struct ExpansionData { 
-    
-        // This is for F12 eject
-	UInt16 			f12Eject_State;
-	UInt32 			eject_Delay_MS;
-	IOTimerEventSource 	*ejectTimerEventSource;
-
-        // This is for sticky keys
-        kbdBitVector		cached_KeyBits;
-        StickyKeys_ModifierInfo stickyKeys_StuckModifiers[kMAX_MODIFIERS];
-        IOInterruptEventSource  *stickyKeysMouseClickEventSource;
-        IOInterruptEventSource	*stickyKeysSetFnStateEventSource;
-        // The following should really be statics, but placing here 
-        // to match design by predecesor.
-        OSDictionary		*offFnParamDict;
-        OSDictionary		*onFnParamDict;
-
-        // This is for SlowKeys
-        UInt16			slowKeys_State;
-        UInt32 			slowKeys_Delay_MS;
-        IOTimerEventSource	*slowKeysTimerEventSource;
-        
-        // stored for slowKeysPostProcess
-        UInt8		slowKeys_Aborted_Key;
-        UInt8		slowKeys_Current_Key;        
-        
-        UInt32		specialKeyModifierFlags;
-        
-        bool		supportsF12Eject;
-        
-        SInt32      modifierSwap_Modifiers[NX_NUMMODIFIERS];
-		
-		unsigned char * cachedAlphaLockModDefs;
-    };
-    ExpansionData * _reserved;				    // Reserved for future use.  (Internal use only)
-    
-public:
-	static IOHIKeyboardMapper * keyboardMapper(
-										IOHIKeyboard * delegate,
-										const UInt8 *  mapping,
-										UInt32         mappingLength,
-										bool           mappingShouldBeFreed );
-	
-	virtual bool init(IOHIKeyboard * delegate,
-					const UInt8 *  mapping,
-					  UInt32         mappingLength,
-					  bool           mappingShouldBeFreed);
-	virtual void free();
-	
-	virtual const UInt8 *   mapping();
-	virtual UInt32          mappingLength();
-	virtual bool 		  	serialize(OSSerialize *s) const;
-	
-	virtual void 		translateKeyCode(UInt8 key, bool keyDown, kbdBitVector keyBits);
-	virtual UInt8  		getParsedSpecialKey(UInt8 logical);   //retrieve a key from _parsedMapping
-
-	virtual	void		setKeyboardTarget (IOService * keyboardTarget);
-	
-	virtual bool 	    updateProperties (void);
-	virtual IOReturn  	setParamProperties (OSDictionary * dict);
-	
-	// keyEventPostProcess is called while a lock is not held, so a recursive
-	// call back into HIKeyboard is possible
-	virtual void 	    keyEventPostProcess (void);
-
-private:
-	static void makeNumberParamProperty( OSDictionary * dict, const char * key,
-                            unsigned long long number, unsigned int bits );
-
-
-	virtual bool parseKeyMapping(const UInt8 *        mapping,
-								 UInt32               mappingLength,
-							     NXParsedKeyMapping * parsedMapping) const;
-	
-	virtual void calcModBit(int bit, kbdBitVector keyBits);
-	virtual void doModCalc(int key, kbdBitVector keyBits);
-	virtual void doCharGen(int keyCode, bool down);
-
-	/* sticky keys functionality */
-private:
-	// original translateKeyCode
-	void rawTranslateKeyCode (UInt8 key, bool keyDown, kbdBitVector keyBits);
-    bool modifierSwapFilterKey(UInt8 * key);
-
-	// the current state of stickyKeys
-	UInt32            	_stickyKeys_State; 
-	
-	// the number of modifiers being held down by stickyKeys
-	int		    		_stickyKeys_NumModifiersDown;
-        
-        //////////////////////////////////////////////////////////////
-        // THE FOLLOWING CLASS VARIABLE HAS BEEN DEPRECATED
-        //
-        // PLEASE USE _stickyKeys_StuckModifiers
-        //
-	UInt8		    	_stickyKeys_Modifiers[kMAX_MODIFIERS];
-        //////////////////////////////////////////////////////////////
-	
-	// contains the info needed to keep track of shift repetitions
-	StickyKeys_ToggleInfo * _stickyKeys_ShiftToggle;
-
-	// contains the info needed to keep track of option repetitions
-	StickyKeys_ToggleInfo * _stickyKeys_OptionToggle;
-
-	// dictionaries with cached on and off states, used to set params when state changes
-	bool				_stateDirty;
-	OSDictionary *		_onParamDict;
-	OSDictionary *		_offParamDict;
-
-	// init/free vars
-	bool stickyKeysinit (void);
-	void stickyKeysfree (void);
-
-	// allocate/free a StickyKeys_ToggleInfo struct
-	static StickyKeys_ToggleInfo * stickyKeysAllocToggleInfo (unsigned maxCount);
-	static void stickyKeysFreeToggleInfo (StickyKeys_ToggleInfo * toggleInfo);
-
-	// create on/off dicts as part of init
-	bool createParamDicts (void);
-  
-	// post special keyboard events thru the event system
-	void postKeyboardSpecialEvent (unsigned subtype, unsigned eventType=NX_SYSDEFINED);
-
-	// check any modifier to see if it is pressed 5 times
-	// based on StickyKeys_ToggleInfo
-	bool stickyKeysModifierToggleCheck(
-							StickyKeys_ToggleInfo * toggleInfo,
-							UInt8        key,
-							bool         keyDown,
-							kbdBitVector keyBits,
-                                                        bool 	     mouseClick = false);
-
-	// non-modifier key pressed
-	void stickyKeysNonModifierKey (UInt8 key, bool keyDown, kbdBitVector keyBits, bool mouseClick = false);
-
-	// modifier key pressed (shift, command, option, control)
-	bool stickyKeysModifierKey (UInt8 key, bool keyDown, kbdBitVector keyBits);
-
-	// main entry point, called for all keys (returns true if key handled)
-	bool stickyKeysFilterKey (UInt8 key, bool keyDown, kbdBitVector keyBits, bool mouseClick = false);
-
-        // called by interrupt event source to inform sticky keys of mouse down event
-        static void stickyKeysMouseUp(IOHIKeyboardMapper *owner, IOEventSource *sender);
-
-	void stickyKeysCleanup();
-
-        // called by interrupt event source to restore prior fn state
-	static void stickyKeysSetFnState(IOHIKeyboardMapper *owner, IOEventSource *sender);
-
-        /* F12 Eject Functionality */ 
-private:
-        
-        // Determining f12 eject key press
-        // Returns true if f12 held down for a predetermined period of time.
-        bool f12EjectFilterKey (UInt8 key, bool keyDown, kbdBitVector keyBits);
-        
-        // Timer function for eject
-        static void performF12Eject(IOHIKeyboardMapper *owner, IOTimerEventSource *sender);
-        
-        /* SlowKeys Functionality */
-private:
-        // Slow keys methods
-        bool slowKeysFilterKey (UInt8 key, bool keyDown, kbdBitVector keyBits);
-        
-        static void slowKeysPostProcess (IOHIKeyboardMapper *owner, IOTimerEventSource *sender);
-
-	
-public:	
-    OSMetaClassDeclareReservedUsed(IOHIKeyboardMapper,  0);
-    virtual IOReturn message( UInt32 type, IOService * provider, void * argument = 0 );
-
-	// binary compatibility padding
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  1);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  2);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  3);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  4);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  5);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  6);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  7);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  8);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper,  9);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 10);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 11);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 12);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 13);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 14);
-    OSMetaClassDeclareReservedUnused(IOHIKeyboardMapper, 15);
-};
-
-#endif _IOHIKEYBOARDMAPPER_H
-
-/*
- * HISTORICAL NOTE:
- *   The "delegate" object had to respond to the following protocol;
- *   this protocol has since been merged into the IOHIKeyboard class.
- *
- * @protocol KeyMapDelegate
- *
- * - keyboardEvent	:(unsigned)eventType
- * 	flags	:(unsigned)flags
- *	keyCode	:(unsigned)keyCode
- *	charCode:(unsigned)charCode
- *	charSet	:(unsigned)charSet
- *	originalCharCode:(unsigned)origCharCode
- *	originalCharSet:(unsigned)origCharSet;
- * 
- * - keyboardSpecialEvent:(unsigned)eventType
- *	flags	 :(unsigned)flags
- *	keyCode	:(unsigned)keyCode
- *	specialty:(unsigned)flavor;
- *
- * - updateEventFlags:(unsigned)flags;	// Does not generate events
- *
- * - (unsigned)eventFlags;		// Global event flags
- * - (unsigned)deviceFlags;		// per-device event flags
- * - setDeviceFlags:(unsigned)flags;	// Set device event flags
- * - (bool)alphaLock;			// current alpha-lock state
- * - setAlphaLock:(bool)val;		// Set current alpha-lock state
- * - (bool)charKeyActive;		// Is a character gen. key down?
- * - setCharKeyActive:(bool)val;	// Note that a char gen key is down.
- *
- * @end
- */
diff --git a/i386/include/IOKit/hidsystem/IOHIPointing.h b/i386/include/IOKit/hidsystem/IOHIPointing.h
deleted file mode 100644
index 1df225a..0000000
--- a/i386/include/IOKit/hidsystem/IOHIPointing.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2009 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _IOHIPOINTING_H
-#define _IOHIPOINTING_H
-
-#include <IOKit/hidsystem/IOHIPointing.h>
-#include <IOKit/hidsystem/IOHIDevice.h>
-#include <IOKit/hidsystem/IOHIDTypes.h>
-
-/* Start Action Definitions */
-
-/*
- * HISTORICAL NOTE:
- *   The following entry points were part of the IOHIPointingEvents
- *   protocol.
- */
-typedef void (*RelativePointerEventAction)(OSObject * target,
-                        /* buttons */      int        buttons,
-                        /* deltaX */       int        dx,
-                        /* deltaY */       int        dy,
-                        /* atTime */       AbsoluteTime ts);
-
-typedef void (*AbsolutePointerEventAction)(OSObject * target,
-                        /* buttons */      int        buttons,
-                        /* at */           IOGPoint * newLoc,
-                        /* withBounds */   IOGBounds *bounds,
-                        /* inProximity */  bool       proximity,
-                        /* withPressure */ int        pressure,
-                        /* withAngle */    int        stylusAngle,
-                        /* atTime */       AbsoluteTime ts);
-
-typedef void (*ScrollWheelEventAction)(OSObject * target,
-                                       short      deltaAxis1,
-                                       short      deltaAxis2,
-                                       short      deltaAxis3,
-                                       AbsoluteTime ts);
-
-/* Event Callback Definitions */
-
-typedef void (*RelativePointerEventCallback)(
-                        /* target */       OSObject * target,
-                        /* buttons */      int        buttons,
-                        /* deltaX */       int        dx,
-                        /* deltaY */       int        dy,
-                        /* atTime */       AbsoluteTime ts,
-                        /* sender */       OSObject * sender,
-                        /* refcon */       void *     refcon);
-
-typedef void (*AbsolutePointerEventCallback)(
-                        /* target */       OSObject * target,
-                        /* buttons */      int        buttons,
-                        /* at */           IOGPoint * newLoc,
-                        /* withBounds */   IOGBounds *bounds,
-                        /* inProximity */  bool       proximity,
-                        /* withPressure */ int        pressure,
-                        /* withAngle */    int        stylusAngle,
-                        /* atTime */       AbsoluteTime ts,
-                        /* sender */       OSObject * sender,
-                        /* refcon */       void *     refcon);
-
-typedef void (*ScrollWheelEventCallback)(
-                        /* target */       OSObject * target,
-                        /* delta1 */       short      deltaAxis1,
-                        /* delta2 */       short      deltaAxis2,
-                        /* delta3 */       short      deltaAxis3,
-                        /* fixedDelta1 */  IOFixed    fixedDelta1,
-                        /* fixedDelta2 */  IOFixed    fixedDelta2,
-                        /* fixedDelta3 */  IOFixed    fixedDelta3,
-                        /* pointDelta1 */  SInt32     pointDelta1,
-                        /* pointDelta2 */  SInt32     pointDelta2,
-                        /* pointDelta3 */  SInt32     pointDelta3,
-                        /* reserved */     SInt32     options,
-                        /* atTime */       AbsoluteTime ts,
-                        /* sender */       OSObject * sender,
-                        /* refcon */       void *     refcon);
-
-/* End Action Definitions */
-
-/* Default accel level parameters */
-#define EV_DEFAULTPOINTERACCELLEVEL 0x0000b000
-#define EV_DEFAULTSCROLLACCELLEVEL  0x00005000
-
-class IOHIDPointingDevice;
-struct ScrollAccelInfo;
-
-class IOHIPointing : public IOHIDevice
-{
-    OSDeclareDefaultStructors(IOHIPointing);
-    
-    friend class IOHITablet;
-    friend class IOHIDPointing;
-
-private:
-    IOLock *		_deviceLock;  // Lock for all device access
-    int			_buttonMode;  // The "handedness" of the pointer
-    IOFixed		_acceleration;
-    bool		_convertAbsoluteToRelative;
-    bool		_contactToMove;
-    bool		_hadContact;
-    IOGPoint    _previousLocation;
-    UInt8		_pressureThresholdToClick;	// A scale factor of 0 to 255 to determine how much pressure is necessary to generate a primary mouse click - a value of 255 means no click will be generated
-    void *		_scaleSegments;
-    IOItemCount		_scaleSegCount;
-    IOFixed		_fractX;
-    IOFixed		_fractY;
-
-    OSObject *                 _relativePointerEventTarget;
-    RelativePointerEventAction _relativePointerEventAction;
-    OSObject *                 _absolutePointerEventTarget;
-    AbsolutePointerEventAction _absolutePointerEventAction;
-    OSObject *                 _scrollWheelEventTarget;
-    ScrollWheelEventAction     _scrollWheelEventAction;
-    
-    struct ExpansionData { 
-        UInt32      scrollType;
-                
-        ScrollAccelInfo * scrollWheelInfo;
-        ScrollAccelInfo * scrollPointerInfo;
-
-        IOFixed		scrollFixedDeltaAxis1;
-        IOFixed		scrollFixedDeltaAxis2;
-        IOFixed		scrollFixedDeltaAxis3;
-        SInt32		scrollPointDeltaAxis1;
-        SInt32		scrollPointDeltaAxis2;
-        SInt32		scrollPointDeltaAxis3;
-        UInt32      scrollButtonMask;
-
-        // Added to post events to the HID Manager
-        IOHIDPointingDevice	* hidPointingNub;
-        IOService 		* openClient;
-        
-        bool		isSeized;
-        UInt32        accelerateMode;
-        
-        UInt32      scrollZoomMask;
-        bool        lastScrollWasZoom;
-        bool        scrollOff;
-    };
-
-    ExpansionData *  _reserved;
-    
-    void    setPointingMode(UInt32 accelerateMode);
-    UInt32  getPointingMode ();
-    void    setScrollType(UInt32 scrollType);
-    UInt32  getScrollType();
-
-    void dispatchScrollWheelEventWithAccelInfo(
-                                SInt32              deltaAxis1,
-                                SInt32              deltaAxis2,
-                                SInt32              deltaAxis3,
-                                ScrollAccelInfo *   info,
-                                AbsoluteTime        ts);
-    
-    
-protected:
-  virtual void dispatchRelativePointerEvent(int        dx,
-                                            int        dy,
-                                            UInt32     buttonState,
-                                            AbsoluteTime ts);
-    
-  virtual void dispatchAbsolutePointerEvent(IOGPoint *	newLoc,
-                                            IOGBounds *	bounds,
-                                            UInt32	buttonState,
-                                            bool	proximity,
-                                            int		pressure,
-                                            int		pressureMin,
-                                            int		pressureMax,
-                                            int		stylusAngle,
-                                            AbsoluteTime	ts);
-
-  virtual void dispatchScrollWheelEvent(short deltaAxis1,
-                                        short deltaAxis2,
-                                        short deltaAxis3,
-                                        AbsoluteTime ts);
-
-public:
-  virtual bool init(OSDictionary * properties = 0);
-  virtual bool start(IOService * provider);
-  virtual void free();
-
-  virtual bool open(IOService *                client,
-		    IOOptionBits	       options,
-                    RelativePointerEventAction rpeAction,
-                    AbsolutePointerEventAction apeAction,
-                    ScrollWheelEventAction     sweAction);
-                    
-  bool open(        IOService *				client,
-                    IOOptionBits			options,
-                    void *,
-                    RelativePointerEventCallback	rpeCallback,
-                    AbsolutePointerEventCallback	apeCallback,
-                    ScrollWheelEventCallback		sweCallback);
-
-  virtual void close(IOService * client, IOOptionBits );
-  virtual IOReturn message( UInt32 type, IOService * provider,
-                              void * argument = 0 );
-
-  virtual IOHIDKind hidKind();
-  virtual bool 	    updateProperties( void );
-  virtual IOReturn  setParamProperties( OSDictionary * dict );
-  virtual IOReturn  powerStateWillChangeTo( IOPMPowerFlags powerFlags,
-                        unsigned long newState, IOService * device);
-  virtual IOReturn  powerStateDidChangeTo( IOPMPowerFlags powerFlags,
-                        unsigned long newState, IOService * device);
-
-protected: // for subclasses to implement
-  virtual OSData *    copyAccelerationTable();
-  virtual IOItemCount buttonCount();
-  virtual IOFixed     resolution();
-
-  // RY: Adding method to copy scroll wheel accel table.
-  // Unfortunately, we don't have any padding, so this
-  // is going to be non-virtual.
-  /*virtual*/ OSData * copyScrollAccelerationTable();
-
-private:
-  virtual bool resetPointer();
-  virtual void scalePointer(int * dxp, int * dyp);
-  virtual void setupForAcceleration(IOFixed accl);
-  
-  // RY: Adding methods to support scroll wheel accel.
-  // Unfortunately, we don't have any padding, so these
-  // are going to be non-virtual.
-  /*virtual*/ bool 	resetScroll();
-  /*virtual*/ void 	setupScrollForAcceleration(IOFixed accl);
-  
-  // RY: We have to make sure that subclasses that will 
-  // take advantage of this have their defined resolution 
-  // in their property table.
-  /*virtual*/ IOFixed	scrollResolutionForType(SInt32 type=-1);
-  /*virtual*/ IOFixed   scrollReportRate();
-  /*virtual*/ OSData *  copyScrollAccelerationTableForType(SInt32 type=-1);
-  
-private:
-  static void _relativePointerEvent( IOHIPointing * self,
-				    int        buttons,
-                       /* deltaX */ int        dx,
-                       /* deltaY */ int        dy,
-                       /* atTime */ AbsoluteTime ts);
-
-  /* Tablet event reporting */
-  static void _absolutePointerEvent(IOHIPointing * self,
-				    int        buttons,
-                 /* at */           IOGPoint * newLoc,
-                 /* withBounds */   IOGBounds *bounds,
-                 /* inProximity */  bool       proximity,
-                 /* withPressure */ int        pressure,
-                 /* withAngle */    int        stylusAngle,
-                 /* atTime */       AbsoluteTime ts);
-
-  /* Mouse scroll wheel event reporting */
-  static void _scrollWheelEvent(IOHIPointing *self,
-                                short deltaAxis1,
-                                short deltaAxis2,
-                                short deltaAxis3,
-                                AbsoluteTime ts);
-
-};
-
-#endif /* !_IOHIPOINTING_H */
diff --git a/i386/include/IOKit/hidsystem/IOLLEvent.h b/i386/include/IOKit/hidsystem/IOLLEvent.h
deleted file mode 100644
index 53fd70c..0000000
--- a/i386/include/IOKit/hidsystem/IOLLEvent.h
+++ /dev/null
@@ -1,558 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2009 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/******************************************************************************
-	event.h (PostScript side version)
-	
-	CONFIDENTIAL
-	Copyright (c) 1988 NeXT, Inc. as an unpublished work.
-	All Rights Reserved.
-
-	Created Leo 01Mar88
-
-	Modified:
-	04May88 Leo  Final event types and record
-	22Aug88 Leo  Change short -> int for window, add reserved
-	26May90 Ted  Added NX_UNDIMMASK to correct triggering of UndoAutoDim
-	12Dec91 Mike Brought into sync with dpsclient/event.h, and fixed
-		     the #ifndef interlock with dpsclient/event.h that was
-		     broken during the Great Header Revision.
-
-	The PostScript version of this file differs from the
-	Window Kit version in that the coordinates here are
-	ints instead of floats.
-******************************************************************************/
-
-#ifndef _DEV_EVENT_H
-#define _DEV_EVENT_H
-
-#include <libkern/OSTypes.h>
-#include <IOKit/hidsystem/IOHIDTypes.h>
-
-#ifdef EVENT_H		/* Interlock with dpsclient/event.h */
-#if !defined(_NXSIZE_)	/* Work around patch for old event.h in Phase 3 projs*/
-#define _NXSIZE_	1	/* NXCoord, NXPoint, NXSize decl seen */
-#define _NXSize_	NXSize
-#endif /* _NXSIZE_ */
-#else  /* EVENT_H */		/* Haven't seen dpsclient/event.h, so define away */
-#define EVENT_H
-
-#ifdef	KERNEL
-#else	/* KERNEL */
-
-#if !defined(_NXSIZE_)	/* Work around patch for old event.h in Phase 3 projs*/
-#define _NXSIZE_	1	/* NXCoord, NXPoint, NXSize decl seen */
-typedef float   NXCoord;
-
-typedef struct _NXPoint {	/* point */
-    NXCoord         x, y;
-} NXPoint;
-
-typedef struct _NXSize {	/* size */
-    NXCoord         width, height;
-} NXSize;
-#define _NXSize_	NXSize	/* Correct usage in event_status_driver.h */
-#endif /* _NXSIZE_ */
-
-#endif	/* KERNEL */
-
-/* Event types */
-
-#define NX_NULLEVENT		0	/* internal use */
-
-/* mouse events */
-
-#define NX_LMOUSEDOWN		1	/* left mouse-down event */
-#define NX_LMOUSEUP		2	/* left mouse-up event */
-#define NX_RMOUSEDOWN		3	/* right mouse-down event */
-#define NX_RMOUSEUP		4	/* right mouse-up event */
-#define NX_MOUSEMOVED		5	/* mouse-moved event */
-#define NX_LMOUSEDRAGGED	6	/* left mouse-dragged event */
-#define NX_RMOUSEDRAGGED	7	/* right mouse-dragged event */
-#define NX_MOUSEENTERED		8	/* mouse-entered event */
-#define NX_MOUSEEXITED		9	/* mouse-exited event */
-
-/* other mouse events
- *
- * event.data.mouse.buttonNumber should contain the 
- * button number (2-31) changing state.
- */
-#define NX_OMOUSEDOWN		25	/* other mouse-down event */
-#define NX_OMOUSEUP		26	/* other mouse-up event */
-#define NX_OMOUSEDRAGGED	27	/* other mouse-dragged event */
-
-/* keyboard events */
-
-#define NX_KEYDOWN		10	/* key-down event */
-#define NX_KEYUP		11	/* key-up event */
-#define NX_FLAGSCHANGED		12	/* flags-changed event */
-
-/* composite events */
-
-#define NX_KITDEFINED		13	/* application-kit-defined event */
-#define NX_SYSDEFINED		14	/* system-defined event */
-#define NX_APPDEFINED		15	/* application-defined event */
-/* There are additional DPS client defined events past this point. */
-
-/* Scroll wheel events */
-
-#define NX_SCROLLWHEELMOVED	22
-
-/* Zoom events */
-#define NX_ZOOM             28
-
-/* tablet events */
-
-#define NX_TABLETPOINTER	23	/* for non-mousing transducers */
-#define NX_TABLETPROXIMITY	24  /* for non-mousing transducers */
-
-/* event range */
-
-#define NX_FIRSTEVENT		0
-#define NX_LASTEVENT		28
-#define NX_NUMPROCS		(NX_LASTEVENT-NX_FIRSTEVENT+1)
-
-/* Event masks */
-#define NX_NULLEVENTMASK        (1 << NX_NULLEVENT)     /* NULL event */
-#define NX_LMOUSEDOWNMASK       (1 << NX_LMOUSEDOWN)	/* left mouse-down */
-#define NX_LMOUSEUPMASK         (1 << NX_LMOUSEUP)      /* left mouse-up */
-#define NX_RMOUSEDOWNMASK       (1 << NX_RMOUSEDOWN)	/* right mouse-down */
-#define NX_RMOUSEUPMASK         (1 << NX_RMOUSEUP)      /* right mouse-up */
-#define NX_OMOUSEDOWNMASK       (1 << NX_OMOUSEDOWN)	/* other mouse-down */
-#define NX_OMOUSEUPMASK         (1 << NX_OMOUSEUP)      /* other mouse-up  */
-#define NX_MOUSEMOVEDMASK       (1 << NX_MOUSEMOVED)	/* mouse-moved */
-#define NX_LMOUSEDRAGGEDMASK	(1 << NX_LMOUSEDRAGGED)	/* left-dragged */
-#define NX_RMOUSEDRAGGEDMASK	(1 << NX_RMOUSEDRAGGED)	/* right-dragged */
-#define NX_OMOUSEDRAGGEDMASK	(1 << NX_OMOUSEDRAGGED)	/* other-dragged */
-#define NX_MOUSEENTEREDMASK     (1 << NX_MOUSEENTERED)	/* mouse-entered */
-#define NX_MOUSEEXITEDMASK      (1 << NX_MOUSEEXITED)	/* mouse-exited */
-#define NX_KEYDOWNMASK          (1 << NX_KEYDOWN)       /* key-down */
-#define NX_KEYUPMASK            (1 << NX_KEYUP)         /* key-up */
-#define NX_FLAGSCHANGEDMASK     (1 << NX_FLAGSCHANGED)	/* flags-changed */
-#define NX_KITDEFINEDMASK       (1 << NX_KITDEFINED)	/* kit-defined */
-#define NX_SYSDEFINEDMASK       (1 << NX_SYSDEFINED)	/* system-defined */
-#define NX_APPDEFINEDMASK       (1 << NX_APPDEFINED)	/* app-defined */
-#define NX_SCROLLWHEELMOVEDMASK	(1 << NX_SCROLLWHEELMOVED)	/* scroll wheel moved */
-#define NX_ZOOMMASK             (1 << NX_ZOOM)          /* Zoom */
-#define NX_TABLETPOINTERMASK	(1 << NX_TABLETPOINTER)	/* tablet pointer moved */
-#define NX_TABLETPROXIMITYMASK	(1 << NX_TABLETPROXIMITY)	/* tablet pointer proximity */
-
-#define EventCodeMask(type)	(1 << (type))
-#define NX_ALLEVENTS		-1	/* Check for all events */
-
-/* sub types for mouse and move events */
-
-#define NX_SUBTYPE_DEFAULT					0
-#define NX_SUBTYPE_TABLET_POINT				1
-#define NX_SUBTYPE_TABLET_PROXIMITY			2
-#define NX_SUBTYPE_MOUSE_TOUCH              3
-
-/* sub types for system defined events */
-
-#define NX_SUBTYPE_POWER_KEY				1
-#define NX_SUBTYPE_AUX_MOUSE_BUTTONS		7
-
-/* 
- * NX_SUBTYPE_AUX_CONTROL_BUTTONS usage
- *
- * The incoming NXEvent for other mouse button down/up has event.type 
- * NX_SYSDEFINED and event.data.compound.subtype NX_SUBTYPE_AUX_MOUSE_BUTTONS.
- * Within the event.data.compound.misc.L[0] contains bits for all the buttons 
- * that have changed state, and event.data.compound.misc.L[1] contains the 
- * current button state as a bitmask, with 1 representing down, and 0
- * representing up.  Bit 0 is the left button, bit one is the right button, 
- * bit 2 is the center button and so forth.
- */
-#define NX_SUBTYPE_AUX_CONTROL_BUTTONS		8
-
-#define NX_SUBTYPE_EJECT_KEY				10
-#define NX_SUBTYPE_SLEEP_EVENT				11
-#define NX_SUBTYPE_RESTART_EVENT			12
-#define NX_SUBTYPE_SHUTDOWN_EVENT			13
-
-#define NX_SUBTYPE_STICKYKEYS_ON			100
-#define NX_SUBTYPE_STICKYKEYS_OFF			101
-#define NX_SUBTYPE_STICKYKEYS_SHIFT			102
-#define NX_SUBTYPE_STICKYKEYS_CONTROL			103
-#define NX_SUBTYPE_STICKYKEYS_ALTERNATE			104
-#define NX_SUBTYPE_STICKYKEYS_COMMAND			105
-#define NX_SUBTYPE_STICKYKEYS_RELEASE			106
-#define NX_SUBTYPE_STICKYKEYS_TOGGLEMOUSEDRIVING	107
-
-// New stickykeys key events
-// These were created to send an event describing the 
-// different state of the modifiers
-#define NX_SUBTYPE_STICKYKEYS_SHIFT_DOWN		110
-#define NX_SUBTYPE_STICKYKEYS_CONTROL_DOWN		111
-#define NX_SUBTYPE_STICKYKEYS_ALTERNATE_DOWN		112
-#define NX_SUBTYPE_STICKYKEYS_COMMAND_DOWN		113
-#define NX_SUBTYPE_STICKYKEYS_FN_DOWN			114
-
-#define NX_SUBTYPE_STICKYKEYS_SHIFT_LOCK		120
-#define NX_SUBTYPE_STICKYKEYS_CONTROL_LOCK		121
-#define NX_SUBTYPE_STICKYKEYS_ALTERNATE_LOCK		122
-#define NX_SUBTYPE_STICKYKEYS_COMMAND_LOCK		123
-#define NX_SUBTYPE_STICKYKEYS_FN_LOCK			124
-
-#define NX_SUBTYPE_STICKYKEYS_SHIFT_UP			130
-#define NX_SUBTYPE_STICKYKEYS_CONTROL_UP		131
-#define NX_SUBTYPE_STICKYKEYS_ALTERNATE_UP		132
-#define NX_SUBTYPE_STICKYKEYS_COMMAND_UP		133
-#define NX_SUBTYPE_STICKYKEYS_FN_UP			134
-
-
-
-// SlowKeys 
-#define NX_SUBTYPE_SLOWKEYS_START			200
-#define NX_SUBTYPE_SLOWKEYS_ABORT			201
-#define NX_SUBTYPE_SLOWKEYS_END				202
-
-// HID Parameter Property Modified
-#define NX_SUBTYPE_HIDPARAMETER_MODIFIED		210
-
-/* Masks for the bits in event.flags */
-
-/* device-independent */
-
-#define	NX_ALPHASHIFTMASK	0x00010000
-#define	NX_SHIFTMASK		0x00020000
-#define	NX_CONTROLMASK		0x00040000
-#define	NX_ALTERNATEMASK	0x00080000
-#define	NX_COMMANDMASK		0x00100000
-#define	NX_NUMERICPADMASK	0x00200000
-#define	NX_HELPMASK		0x00400000
-#define	NX_SECONDARYFNMASK	0x00800000
-
-/* device-dependent (really?) */
-
-#define	NX_DEVICELCTLKEYMASK	0x00000001
-#define	NX_DEVICELSHIFTKEYMASK	0x00000002
-#define	NX_DEVICERSHIFTKEYMASK	0x00000004
-#define	NX_DEVICELCMDKEYMASK	0x00000008
-#define	NX_DEVICERCMDKEYMASK	0x00000010
-#define	NX_DEVICELALTKEYMASK	0x00000020
-#define	NX_DEVICERALTKEYMASK	0x00000040
-#define NX_DEVICERCTLKEYMASK	0x00002000
-
-/* 
- * Additional reserved bits in event.flags
- */
-
-#define NX_STYLUSPROXIMITYMASK	0x00000080	/* deprecated */
-#define NX_NONCOALSESCEDMASK	0x00000100
-
-/* click state values
- * If you have the following events in close succession, the click
- * field has the indicated value:
- *	
- *  Event	Click Value	Comments
- *  mouse-down	1		Not part of any click yet
- *  mouse-up	1		Aha! A click!
- *  mouse-down	2		Doing a double-click
- *  mouse-up	2		It's finished
- *  mouse-down	3		A triple
- *  mouse-up	3
- */
-
-/* Values for the character set in event.data.key.charSet */
-
-#define	NX_ASCIISET		0
-#define NX_SYMBOLSET		1
-#define	NX_DINGBATSSET		2
-
-/* tablet button masks
- * Mask bits for the tablet barrel buttons placed in tablet.buttons.
- * The buttons field uses adopts the following convention:
- *
- * Bit      Comments
- * 0        Left Mouse Button ( kHIDUsage_Button_1 )
- * 1        Right Mouse Button ( kHIDUsage_Button_2 )
- * 2        Middle Mouse Button ( kHIDUsage_Button_3 )
- * 3        4th Mouse Button ( kHIDUsage_Button_4 )
- * ...
- * 15       15th Mouse Button
- *
- * For your convenience, the following mask bits have been defined
- * for tablet specific application:
- */
- 
-#define NX_TABLET_BUTTON_PENTIPMASK             0x0001
-#define NX_TABLET_BUTTON_PENLOWERSIDEMASK       0x0002
-#define NX_TABLET_BUTTON_PENUPPERSIDEMASK       0x0004
-
-
-/* tablet capability masks
- * Mask bits for the tablet capabilities field.   Use these 
- * masks with the capabilities field of a proximity event to 
- * determine what fields in a Tablet Event are valid for this 
- * device.
- */
-#define NX_TABLET_CAPABILITY_DEVICEIDMASK           0x0001
-#define NX_TABLET_CAPABILITY_ABSXMASK               0x0002
-#define NX_TABLET_CAPABILITY_ABSYMASK               0x0004
-#define NX_TABLET_CAPABILITY_VENDOR1MASK            0x0008
-#define NX_TABLET_CAPABILITY_VENDOR2MASK            0x0010
-#define NX_TABLET_CAPABILITY_VENDOR3MASK            0x0020
-#define NX_TABLET_CAPABILITY_BUTTONSMASK            0x0040
-#define NX_TABLET_CAPABILITY_TILTXMASK              0x0080
-#define NX_TABLET_CAPABILITY_TILTYMASK              0x0100
-#define NX_TABLET_CAPABILITY_ABSZMASK               0x0200
-#define NX_TABLET_CAPABILITY_PRESSUREMASK           0x0400
-#define NX_TABLET_CAPABILITY_TANGENTIALPRESSUREMASK 0x0800
-#define NX_TABLET_CAPABILITY_ORIENTINFOMASK         0x1000
-#define NX_TABLET_CAPABILITY_ROTATIONMASK           0x2000
-
-/* proximity pointer types
- * Value that describes the type of pointing device placed in
- * proximity.pointerType.
- */
- 
-#define NX_TABLET_POINTER_UNKNOWN               0
-#define NX_TABLET_POINTER_PEN                   1
-#define NX_TABLET_POINTER_CURSOR                2
-#define NX_TABLET_POINTER_ERASER                3
-
-/* TabletPointData type: defines the tablet data for points included
- * in mouse events created by a tablet driver.
- */
-
-typedef struct _NXTabletPointData {
-	SInt32  x;  /* absolute x coordinate in tablet space at full tablet resolution */
-    SInt32  y;  /* absolute y coordinate in tablet space at full tablet resolution */
-	SInt32  z;  /* absolute z coordinate in tablet space at full tablet resolution */
-    UInt16  buttons;   /* one bit per button - bit 0 is first button - 1 = closed  */
-    UInt16  pressure;  /* scaled pressure value; MAX=(2^16)-1, MIN=0 */
-    struct {           /* tilt range is -((2^15)-1) to (2^15)-1 (-32767 to 32767)  */
-        SInt16 x;      /* scaled tilt x value */
-        SInt16 y;      /* scaled tilt y value */
-	} tilt;
-	UInt16  rotation;  /* Fixed-point representation of device rotation in a 10.6 format */
-	SInt16  tangentialPressure; /* tangential pressure on the device; same range as tilt */
-	UInt16  deviceID;  /* system-assigned unique device ID */
-	SInt16  vendor1;   /* vendor-defined signed 16-bit integer */
-	SInt16  vendor2;   /* vendor-defined signed 16-bit integer */
-	SInt16  vendor3;   /* vendor-defined signed 16-bit integer */
-} NXTabletPointData, *NXTabletPointDataPtr;
-
-/* TabletProximityData type: defines the tablet data for proximity
- * events included in mouse events created by a tablet driver.
- */
-
-typedef struct _NXTabletProximityData {
-    UInt16  vendorID;             /* vendor-defined ID - typically the USB vendor ID */
-	UInt16  tabletID;             /* vendor-defined tablet ID - typically the USB product ID */
-	UInt16  pointerID;            /* vendor-defined ID of the specific pointing device */
-	UInt16  deviceID;             /* system-assigned unique device ID */
-	UInt16  systemTabletID;       /* system-assigned unique tablet ID */
-	UInt16  vendorPointerType;    /* vendor-defined pointer type */
-	UInt32  pointerSerialNumber;  /* vendor-defined serial number */
-	UInt64  uniqueID __attribute__ ((packed));             /* vendor-defined unique ID */
-	UInt32  capabilityMask;       /* capabilities mask of the device */
-	UInt8   pointerType;          /* type of pointing device */
-	UInt8   enterProximity;       /* non-zero = entering; zero = leaving */
-	SInt16  reserved1;
-} NXTabletProximityData, *NXTabletProximityDataPtr;
-
-/* EventData type: defines the data field of an event */
-
-typedef	union {
-    struct {    /* For mouse-down and mouse-up events */
-        UInt8   subx;       /* sub-pixel position for x */
-        UInt8   suby;       /* sub-pixel position for y */
-        SInt16  eventNum;   /* unique identifier for this button */
-        SInt32  click;      /* click state of this event */
-        UInt8   pressure;   /* pressure value: 0=none, 255=full */
-        UInt8   buttonNumber;/* button generating other button event (0-31) */
-        UInt8   subType;
-        UInt8   reserved2;
-        SInt32  reserved3;
-        union {
-            NXTabletPointData      point;     /* tablet point data */
-            NXTabletProximityData  proximity; /* tablet proximity data */
-        } tablet;
-    } mouse;
-    struct {
-        SInt32  dx;
-        SInt32  dy;
-        UInt8   subx;
-        UInt8   suby;
-        UInt8   subType;
-        UInt8   reserved1;
-        SInt32  reserved2;
-        union {
-            NXTabletPointData      point;     /* tablet point data */
-            NXTabletProximityData  proximity; /* tablet proximity data */
-        } tablet;
-    } mouseMove;
-    struct {    /* For key-down and key-up events */
-        UInt16  origCharSet;    /* unmodified character set code */
-        SInt16  repeat;         /* for key-down: nonzero if really a repeat */
-        UInt16  charSet;        /* character set code */
-        UInt16  charCode;       /* character code in that set */
-        UInt16  keyCode;        /* device-dependent key number */
-        UInt16  origCharCode;   /* unmodified character code */
-        SInt32  reserved1;
-        UInt32  keyboardType;
-        SInt32  reserved2;
-        SInt32  reserved3;
-        SInt32  reserved4;
-        SInt32  reserved5[4];
-    } key;
-    struct {    /* For mouse-entered and mouse-exited events */
-        SInt16  reserved;
-        SInt16  eventNum;       /* unique identifier from mouse down event */
-        SInt32  trackingNum;    /* unique identifier from settrackingrect */
-        SInt32  userData;       /* uninterpreted integer from settrackingrect */
-        SInt32  reserved1;
-        SInt32  reserved2;
-        SInt32  reserved3;
-        SInt32  reserved4;
-        SInt32  reserved5;
-        SInt32  reserved6[4];
-    } tracking;
-    struct {
-        SInt16  deltaAxis1;
-        SInt16  deltaAxis2;
-        SInt16  deltaAxis3;
-        SInt16  reserved1;
-        SInt32  fixedDeltaAxis1;
-        SInt32  fixedDeltaAxis2;
-        SInt32  fixedDeltaAxis3;
-        SInt32  pointDeltaAxis1;
-        SInt32  pointDeltaAxis2;
-        SInt32  pointDeltaAxis3;
-        SInt32  reserved8[4];
-    } scrollWheel, zoom;
-    struct {    /* For window-changed, sys-defined, and app-defined events */
-        SInt16  reserved;
-        SInt16  subType;    /* event subtype for compound events */
-        union {
-            float   F[11];  /* for use in compound events */
-            SInt32  L[11];  /* for use in compound events */
-            SInt16  S[22];  /* for use in compound events */
-            char    C[44];  /* for use in compound events */
-        } misc;
-    } compound;
-    struct {
-        SInt32  x;  /* absolute x coordinate in tablet space at full tablet resolution */
-        SInt32  y;  /* absolute y coordinate in tablet space at full tablet resolution */
-        SInt32  z;  /* absolute z coordinate in tablet space at full tablet resolution */
-        UInt16  buttons;   /* one bit per button - bit 0 is first button - 1 = closed  */
-        UInt16  pressure;  /* scaled pressure value; MAX=(2^16)-1, MIN=0 */
-        struct {           /* tilt range is -((2^15)-1) to (2^15)-1 (-32767 to 32767)  */
-            SInt16 x;      /* scaled tilt x value */
-            SInt16 y;      /* scaled tilt y value */
-        } tilt;
-        UInt16  rotation;  /* Fixed-point representation of device rotation in a 10.6 format */
-        SInt16  tangentialPressure; /* tangential pressure on the device; same range as tilt */
-        UInt16  deviceID;  /* system-assigned unique device ID */
-        SInt16  vendor1;   /* vendor-defined signed 16-bit integer */
-        SInt16  vendor2;   /* vendor-defined signed 16-bit integer */
-        SInt16  vendor3;   /* vendor-defined signed 16-bit integer */
-        SInt32  reserved[4];
-    } tablet;
-    struct {
-        UInt16  vendorID;  /* vendor-defined ID - typically the USB vendor ID */
-        UInt16  tabletID;  /* vendor-defined tablet ID - typically the USB product ID */
-        UInt16  pointerID; /* vendor-defined ID of the specific pointing device */
-        UInt16  deviceID;             /* system-assigned unique device ID */
-        UInt16  systemTabletID;       /* system-assigned unique tablet ID */
-        UInt16  vendorPointerType;    /* vendor-defined pointer type */
-        UInt32  pointerSerialNumber;  /* vendor-defined serial number */
-        UInt64  uniqueID __attribute__ ((packed));             /* vendor-defined unique ID */
-        UInt32  capabilityMask;       /* capabilities mask of the device */
-        UInt8   pointerType;          /* type of pointing device */
-        UInt8   enterProximity;       /* non-zero = entering; zero = leaving */
-        SInt16  reserved1;
-        SInt32  reserved2[4];
-    } proximity;
-} NXEventData;
-
-/* The current version number of the NXEventData structure. */
-
-#define kNXEventDataVersion		2
-
-/* Finally! The event record! */
-#ifndef __ppc__
-typedef struct _NXEvent {
-	SInt32              type;		/* An event type from above */
-    struct {
-        SInt32	x, y;					/* Base coordinates in window, */
-    } 					location;	/* from bottom left */
-    UInt64              time __attribute__ ((packed));		/* time since launch */
-    SInt32              flags;		/* key state flags */
-    UInt32              window;		/* window number of assigned window */
-    UInt64              service_id __attribute__ ((packed)); /* service id */
-    SInt32              ext_pid;    /* external pid */
-    NXEventData			data;		/* type-dependent data */
-} NXEvent, *NXEventPtr;
-
-#else
-
-typedef struct _NXEvent {
-	SInt32              type;		/* An event type from above */
-    struct {
-        SInt32	x, y;					/* Base coordinates in window, */
-    } 					location;	/* from bottom left */
-    UInt64              time __attribute__ ((packed));		/* time since launch */
-    SInt32              flags;		/* key state flags */
-    UInt32              window;		/* window number of assigned window */
-    NXEventData			data;		/* type-dependent data */
-    UInt64              service_id __attribute__ ((packed)); /* service id */
-    SInt32              ext_pid;    /* external pid */
-} NXEvent, *NXEventPtr;
-#endif
-
-/* The current version number of the NXEvent structure. */
-
-#define kNXEventVersion		2
-
-/* How to pick window(s) for event (for PostEvent) */
-#define NX_NOWINDOW		-1
-#define NX_BYTYPE		0
-#define NX_BROADCAST		1
-#define NX_TOPWINDOW		2
-#define NX_FIRSTWINDOW		3
-#define NX_MOUSEWINDOW		4
-#define NX_NEXTWINDOW		5
-#define NX_LASTLEFT		6
-#define NX_LASTRIGHT		7
-#define NX_LASTKEY		8
-#define NX_EXPLICIT		9
-#define NX_TRANSMIT		10
-#define NX_BYPSCONTEXT		11
-
-#endif /* EVENT_H */	/* End of defs common with dpsclient/event.h */
-
-/* Mask of events that cause screen to undim */
-
-#define NX_UNDIMMASK		(NX_KEYDOWNMASK | NX_KEYUPMASK | \
-				 NX_LMOUSEDOWNMASK | NX_LMOUSEUPMASK | \
-				 NX_RMOUSEDOWNMASK | NX_RMOUSEUPMASK | \
-				 NX_MOUSEMOVEDMASK | NX_FLAGSCHANGEDMASK | \
-				 NX_MOUSEENTEREDMASK | NX_MOUSEEXITEDMASK | \
-				 NX_LMOUSEDRAGGEDMASK | NX_RMOUSEDRAGGEDMASK | \
-                                 NX_SCROLLWHEELMOVEDMASK | NX_TABLETPOINTERMASK | \
-                                 NX_TABLETPROXIMITYMASK | NX_NULLEVENTMASK)
-
-#endif /* !_DEV_EVENT_H */
-
diff --git a/i386/include/IOKit/hidsystem/ev_keymap.h b/i386/include/IOKit/hidsystem/ev_keymap.h
deleted file mode 100644
index a94cf11..0000000
--- a/i386/include/IOKit/hidsystem/ev_keymap.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/* 	Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved. 
- *
- *	ev_keymap.h
- *	Defines the structure used for parsing keymappings.  These structures
- *	and definitions are used by event sources in the kernel and by
- *	applications and utilities which manipulate keymaps.
- *	
- * HISTORY
- * 02-Jun-1992    Mike Paquette at NeXT
- *      Created. 
- */
-
-#ifndef _DEV_EV_KEYMAP_H
-#define _DEV_EV_KEYMAP_H
-
-#define	NX_NUMKEYCODES	256	/* Highest key code is 0xff. ADB used to use 0x80 for keydown state, but who the heck uses adb anymore. */
-#define NX_NUMSEQUENCES	128	/* Maximum possible number of sequences */
-#define	NX_NUMMODIFIERS	16	/* Maximum number of modifier bits */
-#define	NX_BYTE_CODES	0	/* If first short 0, all are bytes (else shorts) */
-
-#define	NX_WHICHMODMASK	0x0f 	/* bits out of keyBits for bucky bits */
-#define	NX_MODMASK	0x10	/* Bit out of keyBits indicates modifier bit */
-#define	NX_CHARGENMASK	0x20	/* bit out of keyBits for char gen */
-#define	NX_SPECIALKEYMASK 0x40	/* bit out of keyBits for specialty key */
-#define	NX_KEYSTATEMASK	0x80	/* OBSOLETE - DO NOT USE IN NEW DESIGNS */
-
-/*
- * Special keys currently known to and understood by the system.
- * If new specialty keys are invented, extend this list as appropriate.
- * The presence of these keys in a particular implementation is not
- * guaranteed.
- */
-#define NX_NOSPECIALKEY			0xFFFF
-#define NX_KEYTYPE_SOUND_UP		0
-#define NX_KEYTYPE_SOUND_DOWN		1
-#define NX_KEYTYPE_BRIGHTNESS_UP	2
-#define NX_KEYTYPE_BRIGHTNESS_DOWN	3
-#define NX_KEYTYPE_CAPS_LOCK		4
-#define NX_KEYTYPE_HELP			5
-#define NX_POWER_KEY			6
-#define	NX_KEYTYPE_MUTE			7
-#define NX_UP_ARROW_KEY			8
-#define NX_DOWN_ARROW_KEY		9
-#define NX_KEYTYPE_NUM_LOCK		10
-
-#define NX_KEYTYPE_CONTRAST_UP		11
-#define NX_KEYTYPE_CONTRAST_DOWN	12
-#define NX_KEYTYPE_LAUNCH_PANEL		13
-#define NX_KEYTYPE_EJECT		14
-#define NX_KEYTYPE_VIDMIRROR		15
-
-#define NX_KEYTYPE_PLAY			16
-#define NX_KEYTYPE_NEXT			17
-#define NX_KEYTYPE_PREVIOUS		18
-#define NX_KEYTYPE_FAST			19
-#define NX_KEYTYPE_REWIND		20
-
-#define NX_KEYTYPE_ILLUMINATION_UP	21
-#define NX_KEYTYPE_ILLUMINATION_DOWN	22
-#define NX_KEYTYPE_ILLUMINATION_TOGGLE	23
-
-#define	NX_NUMSPECIALKEYS		24 /* Maximum number of special keys */
-#define NX_NUM_SCANNED_SPECIALKEYS	24 /* First 24 special keys are */
-					  /* actively scanned in kernel */
-
-/* Mask of special keys that are posted as events */
-
-#define NX_SPECIALKEY_POST_MASK		\
-                                ((1 << NX_KEYTYPE_SOUND_UP) | (1 << NX_KEYTYPE_SOUND_DOWN) | \
-                                (1 << NX_POWER_KEY) | (1 << NX_KEYTYPE_MUTE) | \
-                                (1 << NX_KEYTYPE_BRIGHTNESS_UP) | (1 << NX_KEYTYPE_BRIGHTNESS_DOWN) | \
-                                (1 << NX_KEYTYPE_CONTRAST_UP) | (1 << NX_KEYTYPE_CONTRAST_UP) | \
-                                (1 << NX_KEYTYPE_LAUNCH_PANEL) | (1 << NX_KEYTYPE_EJECT) | \
-                                (1 << NX_KEYTYPE_VIDMIRROR) | (1 << NX_KEYTYPE_PLAY) | \
-                                (1 << NX_KEYTYPE_NEXT) | (1 << NX_KEYTYPE_PREVIOUS) | \
-                                (1 << NX_KEYTYPE_FAST) | (1 << NX_KEYTYPE_REWIND) | \
-                                (1 << NX_KEYTYPE_ILLUMINATION_UP) | \
-                                (1 << NX_KEYTYPE_ILLUMINATION_DOWN) | \
-                                (1 << NX_KEYTYPE_ILLUMINATION_TOGGLE) | 0)
-
-/* Modifier key indices into modDefs[] */
-#define NX_MODIFIERKEY_ALPHALOCK	0
-#define NX_MODIFIERKEY_SHIFT		1
-#define NX_MODIFIERKEY_CONTROL		2
-#define NX_MODIFIERKEY_ALTERNATE	3
-#define NX_MODIFIERKEY_COMMAND		4
-#define NX_MODIFIERKEY_NUMERICPAD	5
-#define NX_MODIFIERKEY_HELP		6
-#define NX_MODIFIERKEY_SECONDARYFN     	7
-#define NX_MODIFIERKEY_NUMLOCK		8
-
-/* support for right hand modifier */
-#define NX_MODIFIERKEY_RSHIFT		9
-#define NX_MODIFIERKEY_RCONTROL		10
-#define NX_MODIFIERKEY_RALTERNATE	11
-#define NX_MODIFIERKEY_RCOMMAND		12
-
-
-typedef struct _NXParsedKeyMapping_ {
- 	/* If nonzero, all numbers are shorts; if zero, all numbers are bytes*/
-	short	shorts;
-	
-	/*
-	 *  For each keycode, low order bit says if the key
-	 *  generates characters.
-	 *  High order bit says if the key is assigned to a modifier bit.
-	 *  The second to low order bit gives the current state of the key.
-	 */
-	char	keyBits[NX_NUMKEYCODES];
-	
-	/* Bit number of highest numbered modifier bit */
-	int			maxMod;
-	
-	/* Pointers to where the list of keys for each modifiers bit begins,
-	 * or NULL.
-	 */
-	unsigned char *modDefs[NX_NUMMODIFIERS];
-	
-	/* Key code of highest key deinfed to generate characters */
-	int			numDefs;
-	
-	/* Pointer into the keyMapping where this key's definitions begin */
-	unsigned char *keyDefs[NX_NUMKEYCODES];
-	
-	/* number of sequence definitions */
-	int			numSeqs;
-	
-	/* pointers to sequences */
-	unsigned char *seqDefs[NX_NUMSEQUENCES];
-	
-	/* Special key definitions */
-	int			numSpecialKeys;
-	
-	/* Special key values, or 0xFFFF if none */
-	unsigned short specialKeys[NX_NUMSPECIALKEYS];
-	
-	/* Pointer to the original keymapping string */	
-	const unsigned char *mapping;
-	
-	/* Length of the original string */
-	int	mappingLen;	
-} NXParsedKeyMapping;
-
-#endif /* !_DEV_EV_KEYMAP_H */
diff --git a/i386/include/IOKit/i2c/IOI2CInterface.h b/i386/include/IOKit/i2c/IOI2CInterface.h
deleted file mode 100644
index 70a38e2..0000000
--- a/i386/include/IOKit/i2c/IOI2CInterface.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOI2CINTERFACE_H
-#define _IOKIT_IOI2CINTERFACE_H
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-typedef struct IOI2CRequest IOI2CRequest;
-typedef struct IOI2CBuffer IOI2CBuffer;
-
-typedef void (*IOI2CRequestCompletion) (IOI2CRequest * request);
-
-// IOI2CRequest.sendTransactionType, IOI2CRequest.replyTransactionType
-enum {
-    kIOI2CNoTransactionType         = 0,
-    kIOI2CSimpleTransactionType     = 1,
-    kIOI2CDDCciReplyTransactionType = 2,
-    kIOI2CCombinedTransactionType   = 3,
-    kIOI2CDisplayPortNativeTransactionType = 4
-};
-
-// IOI2CRequest.commFlags
-enum {
-    kIOI2CUseSubAddressCommFlag     = 0x00000002
-};
-
-/*!
- * @struct IOI2CRequest
- * @abstract A structure defining an I2C bus transaction.
- * @discussion This structure is used to request an I2C transaction consisting of a send (write) to and reply (read) from a device, either of which is optional, to be carried out atomically on an I2C bus.
- * @field __reservedA Set to zero.
- * @field result The result of the transaction. Common errors are kIOReturnNoDevice if there is no device responding at the given address, kIOReturnUnsupportedMode if the type of transaction is unsupported on the requested bus.
- * @field completion A completion routine to be executed when the request completes. If NULL is passed, the request is synchronous, otherwise it may execute asynchronously.
- * @field commFlags Flags that modify the I2C transaction type. The following flags are defined:<br>
- *      kIOI2CUseSubAddressCommFlag Transaction includes a subaddress.<br>
- * @field minReplyDelay Minimum delay as absolute time between send and reply transactions.
- * @field sendAddress I2C address to write.
- * @field sendSubAddress I2C subaddress to write.
- * @field __reservedB Set to zero.
- * @field sendTransactionType The following types of transaction are defined for the send part of the request:<br>
- *      kIOI2CNoTransactionType No send transaction to perform. <br>
- *      kIOI2CSimpleTransactionType Simple I2C message. <br>
- *      kIOI2CCombinedTransactionType Combined format I2C R/~W transaction. <br>
- * @field sendBuffer Pointer to the send buffer.
- * @field sendBytes Number of bytes to send. Set to actual bytes sent on completion of the request.
- * @field replyAddress I2C Address from which to read.
- * @field replySubAddress I2C Address from which to read.
- * @field __reservedC Set to zero.
- * @field replyTransactionType The following types of transaction are defined for the reply part of the request:<br>
- *      kIOI2CNoTransactionType No reply transaction to perform. <br>
- *      kIOI2CSimpleTransactionType Simple I2C message. <br>
- *      kIOI2CDDCciReplyTransactionType DDC/ci message (with embedded length). See VESA DDC/ci specification. <br>
- *      kIOI2CCombinedTransactionType Combined format I2C R/~W transaction. <br>
- * @field replyBuffer Pointer to the reply buffer.
- * @field replyBytes Max bytes to reply (size of replyBuffer). Set to actual bytes received on completion of the request.
- * @field __reservedD Set to zero.
- */
-
-#pragma pack(push, 4)
-struct IOI2CRequest
-{
-    IOOptionBits                sendTransactionType;
-    IOOptionBits                replyTransactionType;
-    uint32_t                    sendAddress;
-    uint32_t                    replyAddress;
-    uint8_t                     sendSubAddress;
-    uint8_t                     replySubAddress;
-    uint8_t                     __reservedA[2];
-
-    uint64_t                    minReplyDelay;
-
-    IOReturn                    result;
-    IOOptionBits                commFlags;
-
-#if defined(__LP64__)
-    uint32_t                    __padA;
-#else
-    vm_address_t                sendBuffer;
-#endif
-    uint32_t                    sendBytes;
-
-    uint32_t                    __reservedB[2];
-
-#if defined(__LP64__)
-    uint32_t                    __padB;
-#else
-    vm_address_t                replyBuffer;
-#endif
-    uint32_t                    replyBytes;
-
-    IOI2CRequestCompletion      completion;
-#if !defined(__LP64__)
-    uint32_t                    __padC[5];
-#else
-    vm_address_t                sendBuffer;
-    vm_address_t                replyBuffer;
-#endif
-
-    uint32_t                    __reservedC[10];
-#ifdef __ppc__
-    uint32_t                    __reservedD;
-#endif
-};
-#pragma pack(pop)
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#define kIOI2CInterfaceClassName        "IOI2CInterface"
-
-#define kIOI2CInterfaceIDKey            "IOI2CInterfaceID"
-#define kIOI2CBusTypeKey                "IOI2CBusType"
-#define kIOI2CTransactionTypesKey       "IOI2CTransactionTypes"
-#define kIOI2CSupportedCommFlagsKey     "IOI2CSupportedCommFlags"
-
-#define kIOFBI2CInterfaceInfoKey        "IOFBI2CInterfaceInfo"
-#define kIOFBI2CInterfaceIDsKey         "IOFBI2CInterfaceIDs"
-
-// kIOI2CBusTypeKey values
-enum {
-    kIOI2CBusTypeI2C            = 1,
-    kIOI2CBusTypeDisplayPort    = 2
-};
-
-/*!
- * @struct IOI2CBusTiming
- * @abstract A structure defining low level timing for an I2C bus.
- * @discussion This structure is used to specify timeouts and pulse widths for an I2C bus implementation.
- * @field bitTimeout Maximum time a slave can delay (by pulling the clock line low) a single bit response.
- * @field byteTimeout Maximum time a slave can delay (by pulling the clock line low) the first bit of a byte response.
- * @field acknowledgeTimeout Maximum time to wait for a slave to respond with an ACK after writing a byte.
- * @field startTimeout Maximum time to wait for a slave to respond after a start signal.
- * @field riseFallTime Time to wait after any change in output signal.
- * @field __reservedA Set to zero.
- */
-
-struct IOI2CBusTiming
-{
-    AbsoluteTime                bitTimeout;
-    AbsoluteTime                byteTimeout;
-    AbsoluteTime                acknowledgeTimeout;
-    AbsoluteTime                startTimeout;
-    AbsoluteTime                holdTime;
-    AbsoluteTime                riseFallTime;
-    UInt32                      __reservedA[8];
-};
-typedef struct IOI2CBusTiming IOI2CBusTiming;
-
-#ifndef KERNEL
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-// options for IOFBCopyI2CInterfaceForBus()
-enum {
-    kIOI2CBusNumberMask                 = 0x000000ff
-};
-
-
-/*! @function IOFBGetI2CInterfaceCount
-    @abstract Returns a count of I2C interfaces available associated with an IOFramebuffer instance.
-    @discussion Returns a count of I2C interfaces available associated with an IOFramebuffer instance.
-    @param framebuffer The io_service_t of an IOFramebuffer instance. CoreGraphics will provide this for a CGDisplay with the CGDisplayIOServicePort() call.
-    @param count Interface count is returned.
-    @result An IOReturn code. */
-
-IOReturn IOFBGetI2CInterfaceCount( io_service_t framebuffer, IOItemCount * count );
-
-/*! @function IOFBCopyI2CInterfaceForBus
-    @abstract Returns an instance of an I2C bus interface, associated with an IOFramebuffer instance / bus index pair.
-    @discussion Some graphics devices will allow access to an I2C bus routed through a display connector in order to control external devices on that bus. This function returns an instance of an I2C bus interface, associated with an IOFramebuffer instance / bus index pair. The number of I2C buses is available from the IOFBGetI2CInterfaceCount() call. The interface may be used with the IOI2CInterfaceOpen/Close/SendRequest() calls to carry out I2C transactions on that bus. Not all graphics devices support this functionality.
-    @param bus The zero based index of the bus on the requested framebuffer.
-    @param interface The interface instance is returned. The caller should release this instance with IOObjectRelease().
-    @result An IOReturn code. */
-
-IOReturn IOFBCopyI2CInterfaceForBus( io_service_t framebuffer, IOOptionBits bus, io_service_t * interface );
-
-typedef struct IOI2CConnect * IOI2CConnectRef;  /* struct IOI2CConnect is opaque */
-
-IOReturn IOI2CCopyInterfaceForID( CFTypeRef identifier, io_service_t * interface );
-
-/*! @function IOI2CInterfaceOpen
-    @abstract Opens an instance of an I2C bus interface, allowing I2C requests to be made.
-    @discussion An instance of an I2C bus interface, obtained by IOFBCopyI2CInterfaceForBus, is opened with this function allowing I2C requests to be made.
-    @param interface An I2C bus interface (see IOFBCopyI2CInterfaceForBus). The interface may be released after this call is made.
-    @param options Pass kNilOptions.
-    @param connect The opaque IOI2CConnectRef is returned, for use with IOI2CSendRequest() and IOI2CInterfaceClose().
-    @result An IOReturn code. */
-
-IOReturn IOI2CInterfaceOpen( io_service_t interface, IOOptionBits options,
-                             IOI2CConnectRef * connect );
-
-/*! @function IOI2CInterfaceClose
-    @abstract Closes an IOI2CConnectRef.
-    @discussion Frees the resources associated with an IOI2CConnectRef.
-    @param connect The opaque IOI2CConnectRef returned by IOI2CInterfaceOpen().
-    @param options Pass kNilOptions.
-    @result An IOReturn code. */
-
-IOReturn IOI2CInterfaceClose( IOI2CConnectRef connect, IOOptionBits options );
-
-/*! @function IOI2CSendRequest
-    @abstract Carries out the I2C transaction specified by an IOI2CRequest structure.
-    @discussion Frees the resources associated with an IOI2CConnectRef.
-    @param connect The opaque IOI2CConnectRef returned by IOI2CInterfaceOpen().
-    @param options Pass kNilOptions.
-    @param request Pass a pointer to a IOI2CRequest structure describing the request. If an asynchronous request (with a non-NULL completion routine) the request structure must be valid for the life of the request.
-    @result An IOReturn code reflecting only the result of starting the transaction. If the result of IOI2CSendRequest() is kIOReturnSuccess, the I2C transaction result is returned in the result field of the request structure. */
-
-IOReturn IOI2CSendRequest( IOI2CConnectRef connect, IOOptionBits options, 
-                           IOI2CRequest * request );
-
-#else
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*! @class IOI2CInterface
-    @abstract The base class for an I2C bus interface.
-    @discussion The IOI2CInterface base class defines an I2C bus interface. Not useful for developers. */
-
-class IOI2CInterface : public IOService
-{
-    OSDeclareDefaultStructors(IOI2CInterface)
-    
-protected:
-    UInt64      fID;
-
-public:
-    IOReturn newUserClient( task_t              owningTask,
-                            void *              security_id,
-                            UInt32              type,
-                            IOUserClient **     handler );
-
-    bool registerI2C( UInt64 id );
-
-    virtual IOReturn startIO( IOI2CRequest * request ) = 0;
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#endif /* KERNEL */
-
-#endif /* ! _IOKIT_IOI2CINTERFACE_H */
-
diff --git a/i386/include/IOKit/ndrvsupport/IOMacOSTypes.h b/i386/include/IOKit/ndrvsupport/IOMacOSTypes.h
deleted file mode 100644
index 0a2aae7..0000000
--- a/i386/include/IOKit/ndrvsupport/IOMacOSTypes.h
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1997 Apple Computer, Inc.
- *
- *
- * HISTORY
- *
- * sdouglas  22 Oct 97 - first checked in.
- * sdouglas  21 July 98 - start IOKit
- */
-
-/*
-    File:       Types.h
- 
-    Contains:   Basic Macintosh data types.
- 
-    Version:    Technology: PowerSurge 1.0.2.
-                Package:    Universal Interfaces 2.1.2 on ETO #20
- 
-    Copyright:  � 1984-1995 by Apple Computer, Inc.
-                All rights reserved.
- 
-    Bugs?:      If you find a problem with this file, use the Apple Bug Reporter
-                stack.  Include the file and version information (from above)
-                in the problem description and send to:
-                    Internet:   apple.bugs@applelink.apple.com
-                    AppleLink:  APPLE.BUGS
- 
-*/
-
-#ifndef _IOKIT_IOMACOSTYPES_H
-#define _IOKIT_IOMACOSTYPES_H
-#ifndef __MACTYPES__
-
-#include <IOKit/IOTypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __LP64__
-#pragma options align=mac68k
-#endif
-
-#ifndef NULL
-#if !defined(__cplusplus) && (defined(__SC__) || defined(THINK_C))
-#define NULL ((void *) 0)
-#else
-#define NULL 0
-#endif
-#endif
-
-enum {
-    noErr                       = 0
-};
-
-typedef uintptr_t KernelProcessID;
-typedef uintptr_t AddressSpaceID;
-
-#if 0
-#ifndef __cplusplus
-enum { false, true };
-#endif
-#endif
-
-typedef unsigned char Byte;
-
-typedef signed char SignedByte;
-
-typedef UInt16 UniChar;
-
-typedef char *Ptr;
-
-typedef Ptr *Handle;
-
-typedef UInt32 Fixed;
-
-typedef Fixed *FixedPtr;
-
-typedef UInt32 Fract;
-
-typedef Fract *FractPtr;
-
-struct _extended80 {
-    short                           exp;
-    short                           man[4];
-};
-struct _extended96 {
-    short                           exp[2];
-    short                           man[4];
-};
-typedef struct wide                             *WidePtr;
-
-typedef struct UnsignedWide             *UnsignedWidePtr;
-
-
-/*
-enum {
-    false,
-    true
-};
-#if !__option(bool)
-    #ifndef true
-        #define true            1
-    #endif
-    #ifndef false
-        #define false           0
-    #endif
-#endif
-
-typedef unsigned char Boolean;
-*/
-
-
-typedef short OSErr;
-
-typedef unsigned int FourCharCode;
-
-typedef FourCharCode OSType;
-
-typedef FourCharCode ResType;
-
-typedef OSType *OSTypePtr;
-
-typedef ResType *ResTypePtr;
-
-struct Rect {
-    short                           top;
-    short                           left;
-    short                           bottom;
-    short                           right;
-};
-typedef struct Rect Rect;
-
-typedef Rect *RectPtr;
-
-// Quickdraw.i
-
-/*
-    kVariableLengthArray is used in array bounds to specify a variable length array.
-    It is ususally used in variable length structs when the last field is an array
-    of any size.  Before ANSI C, we used zero as the bounds of variable length 
-    array, but that is illegal in ANSI C.  Example:
-    
-        struct FooList 
-        {
-            short   listLength;
-            Foo     elements[kVariableLengthArray];
-        };
-*/
-
-enum {
-    kVariableLengthArray        = 1
-};
-
-/* Numeric version part of 'vers' resource */
-struct NumVersion {
-    UInt8                           majorRev;                   /*1st part of version number in BCD*/
-    UInt8                           minorAndBugRev;             /*2nd & 3rd part of version number share a byte*/
-    UInt8                           stage;                      /*stage code: dev, alpha, beta, final*/
-    UInt8                           nonRelRev;                  /*revision level of non-released version*/
-};
-typedef struct NumVersion NumVersion;
-
-typedef struct OpaqueRef *KernelID;
-
-typedef UInt8 *BytePtr;
-
-typedef IOByteCount ByteCount;
-
-typedef IOItemCount ItemCount;
-
-typedef void *LogicalAddress;
-
-#if !defined(__LP64__)
-typedef void *PhysicalAddress;
-#endif
-
-typedef UInt32 PBVersion;
-
-typedef SInt32 Duration;
-
-#define kInvalidID 0
-
-enum {
-    kNilOptions                 = 0
-};
-
-
-typedef unsigned char Str31[32];
-
-
-/*
-From:
-        File:           DriverFamilyMatching.i <18>
-        Copyright:      � 1995-1996 by Apple Computer, Inc., all rights reserved.
-*/
-
-//##############################################
-// Well known properties in the Name Registry
-//##############################################
-
-#define kPropertyName                                   "name"
-#define kPropertyCompatible                             "compatible"
-#define kPropertyDriverPtr                              "driver-ptr"
-#define kPropertyDriverDesc                             "driver-description"
-#define kPropertyReg                                    "reg"
-#define kPropertyAAPLAddress                            "AAPL,address"
-#define kPropertyMatching                               "matching"
-
-
-//#########################################################
-// Descriptor for Drivers and NDRVs
-//#########################################################
-/* Driver Typing Information Used to Match Drivers With Devices */
-struct DriverType {
-        Str31                                                   nameInfoStr;                            /* Driver Name/Info String*/
-        NumVersion                                              version;                                        /* Driver Version Number*/
-};
-typedef struct DriverType                       DriverType;
-typedef DriverType *                            DriverTypePtr;
-
-/* OS Runtime Information Used to Setup and Maintain a Driver's Runtime Environment */
-typedef OptionBits RuntimeOptions;
-
-
-enum {
-        kDriverIsLoadedUponDiscovery = 0x00000001,                                      /* auto-load driver when discovered*/
-        kDriverIsOpenedUponLoad         =  0x00000002,                                  /* auto-open driver when loaded*/
-        kDriverIsUnderExpertControl     =  0x00000004,                                  /* I/O expert handles loads/opens*/
-        kDriverIsConcurrent                     =  0x00000008,                                  /* supports concurrent requests*/
-        kDriverQueuesIOPB                       =  0x00000010,                                  /* device manager doesn't queue IOPB*/
-        kDriverIsLoadedAtBoot           =  0x00000020,                                  /* Driver is loaded at the boot time */
-        kDriverIsForVirtualDevice       =  0x00000040,                                  /* Driver is for a virtual Device */ 
-        kDriverSupportDMSuspendAndResume = 0x00000080                           /* Driver supports Device Manager Suspend and Resume command */
-};
-
-struct DriverOSRuntime {
-        RuntimeOptions                                  driverRuntime;                          /* Options for OS Runtime*/
-        Str31                                                   driverName;                                     /* Driver's name to the OS*/
-        UInt32                                                  driverDescReserved[8];          /* Reserved area*/
-};
-typedef struct DriverOSRuntime          DriverOSRuntime;
-typedef DriverOSRuntime *                       DriverOSRuntimePtr;
-
-/* OS Service Information Used To Declare What APIs a Driver Supports */
-typedef UInt32 ServiceCount;
-
-struct DriverServiceInfo {
-        OSType                                                  serviceCategory;                        /* Service Category Name*/
-        OSType                                                  serviceType;                            /* Type within Category*/
-        NumVersion                                              serviceVersion;                         /* Version of service*/
-};
-typedef struct DriverServiceInfo        DriverServiceInfo;
-typedef DriverServiceInfo *                     DriverServiceInfoPtr;
-
-struct DriverOSService {
-        ServiceCount                                    nServices;                                      /* Number of Services Supported*/
-        DriverServiceInfo                               service[1];                                     /* The List of Services (at least one)*/
-};
-typedef struct DriverOSService          DriverOSService;
-typedef DriverOSService *                       DriverOSServicePtr;
-
-/* Categories */
-
-enum {
-        kServiceCategoryDisplay                 = 'disp',                                               /* Display Manager*/
-        kServiceCategoryOpenTransport   = 'otan',                                               /* Open Transport*/
-        kServiceCategoryBlockStorage    = 'blok',                                               /* Block Storage*/
-        kServiceCategoryNdrvDriver              = 'ndrv',                                               /* Generic Native Driver*/
-        kServiceCategoryScsiSIM                 = 'scsi',                                               /* SCSI */
-        kServiceCategoryFileManager             = 'file',                                               /* File Manager */
-        kServiceCategoryIDE                             = 'ide-',                                               /* ide */
-        kServiceCategoryADB                             = 'adb-',                                               /* adb */
-        kServiceCategoryPCI                             = 'pci-',                                               /* pci bus */
-                                                                                                                                        /* Nu Bus */
-        kServiceCategoryDFM                             = 'dfm-',                                               /* DFM */
-        kServiceCategoryMotherBoard             = 'mrbd',                                               /* mother Board */
-        kServiceCategoryKeyboard                = 'kybd',                                               /* Keyboard */
-        kServiceCategoryPointing                = 'poit',                                               /* Pointing */
-        kServiceCategoryRTC                             = 'rtc-',                                               /* RTC */
-        kServiceCategoryNVRAM                   = 'nram',                                               /* NVRAM */
-        kServiceCategorySound                   = 'sond',                                               /* Sound (1/3/96 MCS) */
-        kServiceCategoryPowerMgt                = 'pgmt',                                               /* Power Management */
-        kServiceCategoryGeneric                 = 'genr'                                                /* Generic Service Category to receive general Events */
-};
-
-/* Ndrv ServiceCategory Types */
-enum {
-        kNdrvTypeIsGeneric                      = 'genr',                                               /* generic*/
-        kNdrvTypeIsVideo                        = 'vido',                                               /* video*/
-        kNdrvTypeIsBlockStorage         = 'blok',                                               /* block storage*/
-        kNdrvTypeIsNetworking           = 'netw',                                               /* networking*/
-        kNdrvTypeIsSerial                       = 'serl',                                               /* serial*/
-        kNdrvTypeIsParallel                     = 'parl',                                               /* parallel */
-        kNdrvTypeIsSound                        = 'sond',                                               /* sound*/
-        kNdrvTypeIsBusBridge            = 'brdg'
-};
-
-typedef UInt32 DriverDescVersion;
-
-/*      The Driver Description */
-enum {
-        kInitialDriverDescriptor        = 0,
-        kVersionOneDriverDescriptor     = 1
-};
-
-enum {
-        kTheDescriptionSignature        = 'mtej',
-        kDriverDescriptionSignature     = 'pdes'                                                
-};
-
-
-struct DriverDescription {
-        OSType                                                  driverDescSignature;            /* Signature field of this structure*/
-        DriverDescVersion                               driverDescVersion;                      /* Version of this data structure*/
-        DriverType                                              driverType;                                     /* Type of Driver*/
-        DriverOSRuntime                                 driverOSRuntimeInfo;            /* OS Runtime Requirements of Driver*/
-        DriverOSService                                 driverServices;                         /* Apple Service API Membership*/
-};
-typedef struct DriverDescription        DriverDescription;
-typedef DriverDescription *                     DriverDescriptionPtr;
-
-
-#ifndef __LP64__
-#pragma options align=reset
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MACTYPES__ */
-
-#ifndef __QUICKDRAW__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __LP64__
-#pragma options align=mac68k
-#endif
-
-struct RGBColor {
- unsigned short red;                /*magnitude of red component*/
- unsigned short green;              /*magnitude of green component*/
- unsigned short blue;               /*magnitude of blue component*/
-};
-typedef struct RGBColor     RGBColor;
-typedef RGBColor            *RGBColorPtr;
-typedef RGBColorPtr         *RGBColorHdl;
-
-struct ColorSpec {
- short value;                       /*index or other value*/
- RGBColor rgb;                      /*true color*/
-};
-
-typedef struct ColorSpec    ColorSpec;
-typedef ColorSpec           *ColorSpecPtr;
-
-struct GammaTbl {
- short gVersion;                    /*gamma version number*/
- short gType;                       /*gamma data type*/
- short gFormulaSize;                /*Formula data size*/
- short gChanCnt;                    /*number of channels of data*/
- short gDataCnt;                    /*number of values/channel*/
- short gDataWidth;                  /*bits/corrected value (data packed to next larger byte size)*/
- short gFormulaData[1];             /*data for formulas followed by gamma values*/
-};
-typedef struct GammaTbl     GammaTbl;
-typedef GammaTbl            *GammaTblPtr;
-
-struct RegEntryID
-{
-    void * opaque[4];
-};
-typedef struct RegEntryID RegEntryID;
-typedef RegEntryID *                    RegEntryIDPtr;
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-struct IONDRVControlParameters {
-    UInt8       __reservedA[0x1a];
-    UInt16      code;
-    void *      params;
-    UInt8       __reservedB[0x12];
-};
-
-enum {
-    kIONDRVOpenCommand                = 128 + 0,
-    kIONDRVCloseCommand               = 128 + 1,
-    kIONDRVReadCommand                = 128 + 2,
-    kIONDRVWriteCommand               = 128 + 3,
-    kIONDRVControlCommand             = 128 + 4,
-    kIONDRVStatusCommand              = 128 + 5,
-    kIONDRVKillIOCommand              = 128 + 6,
-    kIONDRVInitializeCommand          = 128 + 7,                /* init driver and device*/
-    kIONDRVFinalizeCommand            = 128 + 8,                /* shutdown driver and device*/
-    kIONDRVReplaceCommand             = 128 + 9,                /* replace an old driver*/
-    kIONDRVSupersededCommand          = 128 + 10                /* prepare to be replaced by a new driver*/
-};
-enum {
-    kIONDRVSynchronousIOCommandKind   = 0x00000001,
-    kIONDRVAsynchronousIOCommandKind  = 0x00000002,
-    kIONDRVImmediateIOCommandKind     = 0x00000004
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef __LP64__
-#pragma options align=reset
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __QUICKDRAW__ */
-
-#endif /* _IOKIT_IOMACOSTYPES_H */
diff --git a/i386/include/IOKit/ndrvsupport/IOMacOSVideo.h b/i386/include/IOKit/ndrvsupport/IOMacOSVideo.h
deleted file mode 100644
index 795072b..0000000
--- a/i386/include/IOKit/ndrvsupport/IOMacOSVideo.h
+++ /dev/null
@@ -1,1391 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
-     File:       Video.h
- 
-     Contains:   Video Driver Interfaces.
- 
-     Copyright:  (c) 1986-2000 by Apple Computer, Inc., all rights reserved
- 
-     Bugs?:      For bug reports, consult the following page on
-                 the World Wide Web:
- 
-                     http://developer.apple.com/bugreporter/
- 
-*/
-#ifndef __IOMACOSVIDEO__
-#define __IOMACOSVIDEO__
-
-#define PRAGMA_STRUCT_ALIGN 1
-#define FOUR_CHAR_CODE(x)           (x)
-#include <IOKit/ndrvsupport/IOMacOSTypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __LP64__
-#pragma options align=mac68k
-#endif
-
-enum {
-    mBaseOffset                 = 1,                            /*Id of mBaseOffset.*/
-    mRowBytes                   = 2,                            /*Video sResource parameter Id's */
-    mBounds                     = 3,                            /*Video sResource parameter Id's */
-    mVersion                    = 4,                            /*Video sResource parameter Id's */
-    mHRes                       = 5,                            /*Video sResource parameter Id's */
-    mVRes                       = 6,                            /*Video sResource parameter Id's */
-    mPixelType                  = 7,                            /*Video sResource parameter Id's */
-    mPixelSize                  = 8,                            /*Video sResource parameter Id's */
-    mCmpCount                   = 9,                            /*Video sResource parameter Id's */
-    mCmpSize                    = 10,                           /*Video sResource parameter Id's */
-    mPlaneBytes                 = 11,                           /*Video sResource parameter Id's */
-    mVertRefRate                = 14,                           /*Video sResource parameter Id's */
-    mVidParams                  = 1,                            /*Video parameter block id.*/
-    mTable                      = 2,                            /*Offset to the table.*/
-    mPageCnt                    = 3,                            /*Number of pages*/
-    mDevType                    = 4,                            /*Device Type*/
-    oneBitMode                  = 128,                          /*Id of OneBitMode Parameter list.*/
-    twoBitMode                  = 129,                          /*Id of TwoBitMode Parameter list.*/
-    fourBitMode                 = 130,                          /*Id of FourBitMode Parameter list.*/
-    eightBitMode                = 131                           /*Id of EightBitMode Parameter list.*/
-};
-
-enum {
-    sixteenBitMode              = 132,                          /*Id of SixteenBitMode Parameter list.*/
-    thirtyTwoBitMode            = 133,                          /*Id of ThirtyTwoBitMode Parameter list.*/
-    firstVidMode                = 128,                          /*The new, better way to do the above. */
-    secondVidMode               = 129,                          /* QuickDraw only supports six video */
-    thirdVidMode                = 130,                          /* at this time.      */
-    fourthVidMode               = 131,
-    fifthVidMode                = 132,
-    sixthVidMode                = 133,
-    spGammaDir                  = 64,
-    spVidNamesDir               = 65
-};
-
-typedef UInt32                          AVIDType;
-typedef AVIDType                        DisplayIDType;
-typedef IODisplayModeID                 DisplayModeID;
-typedef UInt16                          DepthMode;
-typedef UInt32                          VideoDeviceType;
-typedef UInt32                          GammaTableID;
-
-/* csTimingFormat values in VDTimingInfo */
-/* look in the declaration rom for timing info */
-enum {
-    kDeclROMtables              = FOUR_CHAR_CODE('decl'),
-    kDetailedTimingFormat       = FOUR_CHAR_CODE('arba')        /* Timing is a detailed timing*/
-};
-
-/* Size of a block of EDID (Extended Display Identification Data) */
-enum {
-    kDDCBlockSize               = 128
-};
-
-/* ddcBlockType constants*/
-enum {
-    kDDCBlockTypeEDID           = 0                             /* EDID block type. */
-};
-
-/* ddcFlags constants*/
-enum {
-    kDDCForceReadBit            = 0,                            /* Force a new read of the EDID. */
-    kDDCForceReadMask           = (1 << kDDCForceReadBit)       /* Mask for kddcForceReadBit. */
-};
-
-
-/* Timing mode constants for Display Manager MultiMode support
-    Corresponding   .h equates are in Video.h
-                    .a equates are in Video.a
-                    .r equates are in DepVideoEqu.r
-    
-    The second enum is the old names (for compatibility).
-    The first enum is the new names.
-*/
-enum {
-    timingInvalid               = 0,                            /*    Unknown timing... force user to confirm. */
-    timingInvalid_SM_T24        = 8,                            /*    Work around bug in SM Thunder24 card.*/
-    timingApple_FixedRateLCD    = 42,                           /*    Lump all fixed-rate LCDs into one category.*/
-    timingApple_512x384_60hz    = 130,                          /*  512x384  (60 Hz) Rubik timing. */
-    timingApple_560x384_60hz    = 135,                          /*  560x384  (60 Hz) Rubik-560 timing. */
-    timingApple_640x480_67hz    = 140,                          /*  640x480  (67 Hz) HR timing. */
-    timingApple_640x400_67hz    = 145,                          /*  640x400  (67 Hz) HR-400 timing. */
-    timingVESA_640x480_60hz     = 150,                          /*  640x480  (60 Hz) VGA timing. */
-    timingVESA_640x480_72hz     = 152,                          /*  640x480  (72 Hz) VGA timing. */
-    timingVESA_640x480_75hz     = 154,                          /*  640x480  (75 Hz) VGA timing. */
-    timingVESA_640x480_85hz     = 158,                          /*  640x480  (85 Hz) VGA timing. */
-    timingGTF_640x480_120hz     = 159,                          /*  640x480  (120 Hz) VESA Generalized Timing Formula */
-    timingApple_640x870_75hz    = 160,                          /*  640x870  (75 Hz) FPD timing.*/
-    timingApple_640x818_75hz    = 165,                          /*  640x818  (75 Hz) FPD-818 timing.*/
-    timingApple_832x624_75hz    = 170,                          /*  832x624  (75 Hz) GoldFish timing.*/
-    timingVESA_800x600_56hz     = 180,                          /*  800x600  (56 Hz) SVGA timing. */
-    timingVESA_800x600_60hz     = 182,                          /*  800x600  (60 Hz) SVGA timing. */
-    timingVESA_800x600_72hz     = 184,                          /*  800x600  (72 Hz) SVGA timing. */
-    timingVESA_800x600_75hz     = 186,                          /*  800x600  (75 Hz) SVGA timing. */
-    timingVESA_800x600_85hz     = 188,                          /*  800x600  (85 Hz) SVGA timing. */
-    timingVESA_1024x768_60hz    = 190,                          /* 1024x768  (60 Hz) VESA 1K-60Hz timing. */
-    timingVESA_1024x768_70hz    = 200,                          /* 1024x768  (70 Hz) VESA 1K-70Hz timing. */
-    timingVESA_1024x768_75hz    = 204,                          /* 1024x768  (75 Hz) VESA 1K-75Hz timing (very similar to timingApple_1024x768_75hz). */
-    timingVESA_1024x768_85hz    = 208,                          /* 1024x768  (85 Hz) VESA timing. */
-    timingApple_1024x768_75hz   = 210,                          /* 1024x768  (75 Hz) Apple 19" RGB. */
-    timingApple_1152x870_75hz   = 220,                          /* 1152x870  (75 Hz) Apple 21" RGB. */
-    timingAppleNTSC_ST          = 230,                          /*  512x384  (60 Hz, interlaced, non-convolved). */
-    timingAppleNTSC_FF          = 232,                          /*  640x480  (60 Hz, interlaced, non-convolved). */
-    timingAppleNTSC_STconv      = 234,                          /*  512x384  (60 Hz, interlaced, convolved). */
-    timingAppleNTSC_FFconv      = 236,                          /*  640x480  (60 Hz, interlaced, convolved). */
-    timingApplePAL_ST           = 238,                          /*  640x480  (50 Hz, interlaced, non-convolved). */
-    timingApplePAL_FF           = 240,                          /*  768x576  (50 Hz, interlaced, non-convolved). */
-    timingApplePAL_STconv       = 242,                          /*  640x480  (50 Hz, interlaced, convolved). */
-    timingApplePAL_FFconv       = 244,                          /*  768x576  (50 Hz, interlaced, convolved). */
-    timingVESA_1280x960_75hz    = 250,                          /* 1280x960  (75 Hz) */
-    timingVESA_1280x960_60hz    = 252,                          /* 1280x960  (60 Hz) */
-    timingVESA_1280x960_85hz    = 254,                          /* 1280x960  (85 Hz) */
-    timingVESA_1280x1024_60hz   = 260,                          /* 1280x1024 (60 Hz) */
-    timingVESA_1280x1024_75hz   = 262,                          /* 1280x1024 (75 Hz) */
-    timingVESA_1280x1024_85hz   = 268,                          /* 1280x1024 (85 Hz) */
-    timingVESA_1600x1200_60hz   = 280,                          /* 1600x1200 (60 Hz) VESA timing. */
-    timingVESA_1600x1200_65hz   = 282,                          /* 1600x1200 (65 Hz) VESA timing. */
-    timingVESA_1600x1200_70hz   = 284,                          /* 1600x1200 (70 Hz) VESA timing. */
-    timingVESA_1600x1200_75hz   = 286,                          /* 1600x1200 (75 Hz) VESA timing (pixel clock is 189.2 Mhz dot clock). */
-    timingVESA_1600x1200_80hz   = 288,                          /* 1600x1200 (80 Hz) VESA timing (pixel clock is 216>? Mhz dot clock) - proposed only. */
-    timingVESA_1600x1200_85hz   = 289,                          /* 1600x1200 (85 Hz) VESA timing (pixel clock is 229.5 Mhz dot clock). */
-    timingVESA_1792x1344_60hz   = 296,                          /* 1792x1344 (60 Hz) VESA timing (204.75 Mhz dot clock). */
-    timingVESA_1792x1344_75hz   = 298,                          /* 1792x1344 (75 Hz) VESA timing (261.75 Mhz dot clock). */
-    timingVESA_1856x1392_60hz   = 300,                          /* 1856x1392 (60 Hz) VESA timing (218.25 Mhz dot clock). */
-    timingVESA_1856x1392_75hz   = 302,                          /* 1856x1392 (75 Hz) VESA timing (288 Mhz dot clock). */
-    timingVESA_1920x1440_60hz   = 304,                          /* 1920x1440 (60 Hz) VESA timing (234 Mhz dot clock). */
-    timingVESA_1920x1440_75hz   = 306,                          /* 1920x1440 (75 Hz) VESA timing (297 Mhz dot clock). */
-    timingSMPTE240M_60hz        = 400,                          /* 60Hz V, 33.75KHz H, interlaced timing, 16:9 aspect, typical resolution of 1920x1035. */
-    timingFilmRate_48hz         = 410,                          /* 48Hz V, 25.20KHz H, non-interlaced timing, typical resolution of 640x480. */
-    timingSony_1600x1024_76hz   = 500,                          /* 1600x1024 (76 Hz) Sony timing (pixel clock is 170.447 Mhz dot clock). */
-    timingSony_1920x1080_60hz   = 510,                          /* 1920x1080 (60 Hz) Sony timing (pixel clock is 159.84 Mhz dot clock). */
-    timingSony_1920x1080_72hz   = 520,                          /* 1920x1080 (72 Hz) Sony timing (pixel clock is 216.023 Mhz dot clock). */
-    timingSony_1920x1200_76hz   = 540,                          /* 1900x1200 (76 Hz) Sony timing (pixel clock is 243.20 Mhz dot clock). */
-    timingApple_0x0_0hz_Offline = 550                           /* Indicates that this timing will take the display off-line and remove it from the system. */
-};
-
-
-/* Deprecated timing names.*/
-enum {
-    timingApple12               = timingApple_512x384_60hz,
-    timingApple12x              = timingApple_560x384_60hz,
-    timingApple13               = timingApple_640x480_67hz,
-    timingApple13x              = timingApple_640x400_67hz,
-    timingAppleVGA              = timingVESA_640x480_60hz,
-    timingApple15               = timingApple_640x870_75hz,
-    timingApple15x              = timingApple_640x818_75hz,
-    timingApple16               = timingApple_832x624_75hz,
-    timingAppleSVGA             = timingVESA_800x600_56hz,
-    timingApple1Ka              = timingVESA_1024x768_60hz,
-    timingApple1Kb              = timingVESA_1024x768_70hz,
-    timingApple19               = timingApple_1024x768_75hz,
-    timingApple21               = timingApple_1152x870_75hz,
-    timingSony_1900x1200_74hz   = 530,                          /* 1900x1200 (74 Hz) Sony timing (pixel clock is 236.25 Mhz dot clock). */
-    timingSony_1900x1200_76hz   = timingSony_1920x1200_76hz     /* 1900x1200 (76 Hz) Sony timing (pixel clock is 245.48 Mhz dot clock). */
-};
-
-/* csConnectFlags values in VDDisplayConnectInfo */
-enum {
-    kAllModesValid              = 0,                            /* All modes not trimmed by primary init are good close enough to try */
-    kAllModesSafe               = 1,                            /* All modes not trimmed by primary init are know to be safe */
-    kReportsTagging             = 2,                            /* Can detect tagged displays (to identify smart monitors) */
-    kHasDirectConnection        = 3,                            /* True implies that driver can talk directly to device (e.g. serial data link via sense lines) */
-    kIsMonoDev                  = 4,                            /* Says whether there's an RGB (0) or Monochrome (1) connection. */
-    kUncertainConnection        = 5,                            /* There may not be a display (no sense lines?). */
-    kTaggingInfoNonStandard     = 6,                            /* Set when csConnectTaggedType/csConnectTaggedData are non-standard (i.e., not the Apple CRT sense codes). */
-    kReportsDDCConnection       = 7,                            /* Card can do ddc (set kHasDirectConnect && kHasDDCConnect if you actually found a ddc display). */
-    kHasDDCConnection           = 8,                            /* Card has ddc connect now. */
-    kConnectionInactive         = 9,                            /* Set when the connection is NOT currently active (generally used in a multiconnection environment). */
-    kDependentConnection        = 10,                           /* Set when some ascpect of THIS connection depends on another (will generally be set in a kModeSimulscan environment). */
-    kBuiltInConnection          = 11,                           /* Set when connection is KNOWN to be built-in (this is not the same as kHasDirectConnection). */
-    kOverrideConnection         = 12,                           /* Set when the reported connection is not the true one, but is one that has been forced through a SetConnection call */
-    kFastCheckForDDC            = 13,                           /* Set when all 3 are true: 1) sense codes indicate DDC display could be attached 2) attempted fast check 3) DDC failed */
-    kReportsHotPlugging         = 14,                           /* Detects and reports hot pluggging on connector (via VSL also implies DDC will be up to date w/o force read) */
-    kStereoSyncConnection       = 15                            /* Connection supports stereo sync signalling */
-};
-
-
-/* csDisplayType values in VDDisplayConnectInfo */
-enum {
-    kUnknownConnect             = 1,                            /* Not sure how we'll use this, but seems like a good idea. */
-    kPanelConnect               = 2,                            /* For use with fixed-in-place LCD panels. */
-    kPanelTFTConnect            = 2,                            /* Alias for kPanelConnect */
-    kFixedModeCRTConnect        = 3,                            /*  For use with fixed-mode (i.e., very limited range) displays. */
-    kMultiModeCRT1Connect       = 4,                            /* 320x200 maybe, 12" maybe, 13" (default), 16" certain, 19" maybe, 21" maybe */
-    kMultiModeCRT2Connect       = 5,                            /* 320x200 maybe, 12" maybe, 13" certain, 16" (default), 19" certain, 21" maybe */
-    kMultiModeCRT3Connect       = 6,                            /* 320x200 maybe, 12" maybe, 13" certain, 16" certain, 19" default, 21" certain */
-    kMultiModeCRT4Connect       = 7,                            /* Expansion to large multi mode (not yet used) */
-    kModelessConnect            = 8,                            /* Expansion to modeless model (not yet used) */
-    kFullPageConnect            = 9,                            /* 640x818 (to get 8bpp in 512K case) and 640x870 (these two only) */
-    kVGAConnect                 = 10,                           /* 640x480 VGA default -- question everything else */
-    kNTSCConnect                = 11,                           /* NTSC ST (default), FF, STconv, FFconv */
-    kPALConnect                 = 12,                           /* PAL ST (default), FF, STconv, FFconv */
-    kHRConnect                  = 13,                           /* Straight-6 connect -- 640x480 and 640x400 (to get 8bpp in 256K case) (these two only) */
-    kPanelFSTNConnect           = 14,                           /* For use with fixed-in-place LCD FSTN (aka "Supertwist") panels */
-    kMonoTwoPageConnect         = 15,                           /* 1152x870 Apple color two-page display */
-    kColorTwoPageConnect        = 16,                           /* 1152x870 Apple B&W two-page display */
-    kColor16Connect             = 17,                           /* 832x624 Apple B&W two-page display */
-    kColor19Connect             = 18,                           /* 1024x768 Apple B&W two-page display */
-    kGenericCRT                 = 19,                           /* Indicates nothing except that connection is CRT in nature. */
-    kGenericLCD                 = 20,                           /* Indicates nothing except that connection is LCD in nature. */
-    kDDCConnect                 = 21,                           /* DDC connection, always set kHasDDCConnection */
-    kNoConnect                  = 22                            /* No display is connected - load sensing or similar level of hardware detection is assumed (used by resident drivers that support hot plugging when nothing is currently connected) */
-};
-
-/* csTimingFlags values in VDTimingInfoRec */
-enum {
-    kModeValid                  = 0,                            /* Says that this mode should NOT be trimmed. */
-    kModeSafe                   = 1,                            /* This mode does not need confirmation */
-    kModeDefault                = 2,                            /* This is the default mode for this type of connection */
-    kModeShowNow                = 3,                            /* This mode should always be shown (even though it may require a confirm) */
-    kModeNotResize              = 4,                            /* This mode should not be used to resize the display (eg. mode selects a different connector on card) */
-    kModeRequiresPan            = 5,                            /* This mode has more pixels than are actually displayed */
-    kModeInterlaced             = 6,                            /* This mode is interlaced (single pixel lines look bad). */
-    kModeShowNever              = 7,                            /* This mode should not be shown in the user interface. */
-    kModeSimulscan              = 8,                            /* Indicates that more than one display connection can be driven from a single framebuffer controller. */
-    kModeNotPreset              = 9,                            /* Indicates that the timing is not a factory preset for the current display (geometry may need correction) */
-    kModeBuiltIn                = 10,                           /* Indicates that the display mode is for the built-in connect only (on multiconnect devices like the PB 3400) Only the driver is quieried */
-    kModeStretched              = 11,                           /* Indicates that the display mode will be stretched/distorted to match the display aspect ratio */
-    kModeNotGraphicsQuality     = 12,                           /* Indicates that the display mode is not the highest quality (eg. stretching artifacts).  Intended as a hint */
-    kModeValidateAgainstDisplay = 13                            /* Indicates that this mode should be validated against the display EDID */
-};
-
-/* csDepthFlags in VDVideoParametersInfoRec */
-enum {
-    kDepthDependent             = 0,                            /* Says that this depth mode may cause dependent changes in other framebuffers (and . */
-    kDepthDependentMask         = (1 << kDepthDependent)        /* mask for kDepthDependent */    
-};
-
-/* csResolutionFlags bit flags for VDResolutionInfoRec */
-enum {
-    kResolutionHasMultipleDepthSizes = 0                        /* Says that this mode has different csHorizontalPixels, csVerticalLines at different depths (usually slightly larger at lower depths) */
-};
-
-
-enum {
-                                                                /*    Power Mode constants for VDPowerStateRec.powerState.  Note the numeric order does not match the power state order */
-    kAVPowerOff                 = 0,                            /* Power fully off*/
-    kAVPowerStandby             = 1,
-    kAVPowerSuspend             = 2,
-    kAVPowerOn                  = 3,
-    kHardwareSleep              = 128,
-    kHardwareWake               = 129,
-    kHardwareWakeFromSuspend    = 130,
-    kHardwareWakeToDoze         = 131,
-    kHardwareWakeToDozeFromSuspend = 132,
-    kHardwarePark               = 133,
-    kHardwareDrive              = 134
-};
-
-/* Reduced perf level, for GetPowerState, SetPowerState*/
-enum {
-    kPowerStateReducedPowerMask   = 0x00000300,
-    kPowerStateFullPower          = 0x00000000,
-    kPowerStateReducedPower1      = 0x00000100,
-    kPowerStateReducedPower2      = 0x00000200,
-    kPowerStateReducedPower3      = 0x00000300
-};
-
-enum {
-                                                                /*    Power Mode masks and bits for VDPowerStateRec.powerFlags.  */
-    kPowerStateNeedsRefresh     = 0,                            /* When leaving this power mode, a display will need refreshing   */
-    kPowerStateSleepAwareBit    = 1,                            /* if gestaltPCCardDockingSelectorFix, Docking mgr checks this bit before checking kPowerStateSleepAllowedBit */
-    kPowerStateSleepForbiddenBit = 2,                           /* if kPowerStateSleepAwareBit, Docking mgr checks this bit before sleeping */
-    kPowerStateSleepCanPowerOffBit = 3,                         /* supports power down sleep (ie PCI power off)*/
-    kPowerStateSleepNoDPMSBit   = 4,                            /* Bug #2425210.  Do not use DPMS with this display.*/
-    kPowerStateSleepWaketoDozeBit = 5,                          /* Supports Wake to Doze */
-    kPowerStateSleepWakeNeedsProbeBit = 6,                      /* Does not sense connection changes on wake */
-
-    kPowerStateNeedsRefreshMask = (1 << kPowerStateNeedsRefresh),
-    kPowerStateSleepAwareMask   = (1 << kPowerStateSleepAwareBit),
-    kPowerStateSleepForbiddenMask = (1 << kPowerStateSleepForbiddenBit),
-    kPowerStateSleepCanPowerOffMask = (1 << kPowerStateSleepCanPowerOffBit),
-    kPowerStateSleepNoDPMSMask  = (1 << kPowerStateSleepNoDPMSBit),
-    kPowerStateSleepWaketoDozeMask = (1 << kPowerStateSleepWaketoDozeBit),
-    kPowerStateSleepWakeNeedsProbeMask = (1 << kPowerStateSleepWakeNeedsProbeBit),
-
-    kPowerStateSupportsReducedPower1Bit = 10,
-    kPowerStateSupportsReducedPower2Bit = 11,
-    kPowerStateSupportsReducedPower3Bit = 12,
-    kPowerStateSupportsReducedPower1BitMask = (1 << 10),
-    kPowerStateSupportsReducedPower2BitMask = (1 << 11),
-    kPowerStateSupportsReducedPower3BitMask = (1 << 12)
-};
-
-
-enum {
-                                                                /* Control Codes */
-    cscReset                    = 0,
-    cscKillIO                   = 1,
-    cscSetMode                  = 2,
-    cscSetEntries               = 3,
-    cscSetGamma                 = 4,
-    cscGrayPage                 = 5,
-    cscGrayScreen               = 5,
-    cscSetGray                  = 6,
-    cscSetInterrupt             = 7,
-    cscDirectSetEntries         = 8,
-    cscSetDefaultMode           = 9,
-    cscSwitchMode               = 10,                           /* Takes a VDSwitchInfoPtr */         
-    cscSetSync                  = 11,                           /* Takes a VDSyncInfoPtr */           
-    cscSavePreferredConfiguration = 16,                         /* Takes a VDSwitchInfoPtr */         
-    cscSetHardwareCursor        = 22,                           /* Takes a VDSetHardwareCursorPtr */  
-    cscDrawHardwareCursor       = 23,                           /* Takes a VDDrawHardwareCursorPtr */ 
-    cscSetConvolution           = 24,                           /* Takes a VDConvolutionInfoPtr */    
-    cscSetPowerState            = 25,                           /* Takes a VDPowerStatePtr */         
-    cscPrivateControlCall       = 26,                           /* Takes a VDPrivateSelectorDataRec*/
-    cscSetMultiConnect          = 28,                           /* From a GDI point of view, this call should be implemented completely in the HAL and not at all in the core.*/
-    cscSetClutBehavior          = 29,                           /* Takes a VDClutBehavior */
-    cscSetDetailedTiming        = 31,                           /* Takes a VDDetailedTimingPtr */
-    cscDoCommunication          = 33,                           /* Takes a VDCommunicationPtr */
-    cscProbeConnection          = 34,                           /* Takes nil pointer */
-                                                                /* (may generate a kFBConnectInterruptServiceType service interrupt) */
-    cscSetScaler                = 36,                           /* Takes a VDScalerPtr */
-    cscSetMirror                = 37,                           /* Takes a VDMirrorPtr*/
-    cscSetFeatureConfiguration  = 38,                           /* Takes a VDConfigurationPtr*/
-    cscUnusedCall               = 127                           /* This call used to expand the scrn resource.  Its imbedded data contains more control info */
-};
-
-enum {
-                                                                /* Status Codes */
-    cscGetMode                  = 2,
-    cscGetEntries               = 3,
-    cscGetPageCnt               = 4,
-    cscGetPages                 = 4,                            /* This is what C&D 2 calls it. */
-    cscGetPageBase              = 5,
-    cscGetBaseAddr              = 5,                            /* This is what C&D 2 calls it. */
-    cscGetGray                  = 6,
-    cscGetInterrupt             = 7,
-    cscGetGamma                 = 8,
-    cscGetDefaultMode           = 9,
-    cscGetCurMode               = 10,                           /* Takes a VDSwitchInfoPtr */
-    cscGetSync                  = 11,                           /* Takes a VDSyncInfoPtr */  
-    cscGetConnection            = 12,                           /* Return information about the connection to the display */
-    cscGetModeTiming            = 13,                           /* Return timing info for a mode */
-    cscGetModeBaseAddress       = 14,                           /* Return base address information about a particular mode */
-    cscGetScanProc              = 15,                           /* QuickTime scan chasing routine */
-    cscGetPreferredConfiguration = 16,                          /* Takes a VDSwitchInfoPtr */               
-    cscGetNextResolution        = 17,                           /* Takes a VDResolutionInfoPtr */           
-    cscGetVideoParameters       = 18,                           /* Takes a VDVideoParametersInfoPtr */      
-    cscGetGammaInfoList         = 20,                           /* Takes a VDGetGammaListPtr */             
-    cscRetrieveGammaTable       = 21,                           /* Takes a VDRetrieveGammaPtr */            
-    cscSupportsHardwareCursor   = 22,                           /* Takes a VDSupportsHardwareCursorPtr */   
-    cscGetHardwareCursorDrawState = 23,                         /* Takes a VDHardwareCursorDrawStatePtr */  
-    cscGetConvolution           = 24,                           /* Takes a VDConvolutionInfoPtr */          
-    cscGetPowerState            = 25,                           /* Takes a VDPowerStatePtr */               
-    cscPrivateStatusCall        = 26,                           /* Takes a VDPrivateSelectorDataRec*/
-    cscGetDDCBlock              = 27,                           /* Takes a VDDDCBlockRec  */
-    cscGetMultiConnect          = 28,                           /* From a GDI point of view, this call should be implemented completely in the HAL and not at all in the core.*/
-    cscGetClutBehavior          = 29,                           /* Takes a VDClutBehavior */
-    cscGetTimingRanges          = 30,                           /* Takes a VDDisplayTimingRangePtr */
-    cscGetDetailedTiming        = 31,                           /* Takes a VDDetailedTimingPtr */
-    cscGetCommunicationInfo     = 32,                           /* Takes a VDCommunicationInfoPtr */
-    cscGetScalerInfo            = 35,                           /* Takes a VDScalerInfoPtr */
-    cscGetScaler                = 36,                           /* Takes a VDScalerPtr */
-    cscGetMirror                = 37,                           /* Takes a VDMirrorPtr*/
-    cscGetFeatureConfiguration  = 38,                           /* Takes a VDConfigurationPtr*/
-    cscGetFeatureList           = 39
-};
-
-/* Bit definitions for the Get/Set Sync call*/
-enum {
-    kDisableHorizontalSyncBit   = 0,
-    kDisableVerticalSyncBit     = 1,
-    kDisableCompositeSyncBit    = 2,
-    kEnableSyncOnBlue           = 3,
-    kEnableSyncOnGreen          = 4,
-    kEnableSyncOnRed            = 5,
-    kNoSeparateSyncControlBit   = 6,
-    kTriStateSyncBit            = 7,
-    kHorizontalSyncMask         = 0x01,
-    kVerticalSyncMask           = 0x02,
-    kCompositeSyncMask          = 0x04,
-    kDPMSSyncMask               = 0x07,
-    kTriStateSyncMask           = 0x80,
-    kSyncOnBlueMask             = 0x08,
-    kSyncOnGreenMask            = 0x10,
-    kSyncOnRedMask              = 0x20,
-    kSyncOnMask                 = 0x38
-};
-
-enum {
-                                                                /*    Power Mode constants for translating DPMS modes to Get/SetSync calls.  */
-    kDPMSSyncOn                 = 0,
-    kDPMSSyncStandby            = 1,
-    kDPMSSyncSuspend            = 2,
-    kDPMSSyncOff                = 7
-};
-
-/* Bit definitions for the Get/Set Convolution call*/
-enum {
-    kConvolved                  = 0,
-    kLiveVideoPassThru          = 1,
-    kConvolvedMask              = 0x01,
-    kLiveVideoPassThruMask      = 0x02
-};
-
-
-
-struct VPBlock {
-    UInt32                           vpBaseOffset;               /*Offset to page zero of video RAM (From minorBaseOS).*/
-#if __LP64__
-    UInt32                           vpRowBytes;                 /*Width of each row of video memory.*/
-#else
-    SInt16                           vpRowBytes;                 /*Width of each row of video memory.*/
-#endif
-    Rect                            vpBounds;                   /*BoundsRect for the video display (gives dimensions).*/
-    SInt16                           vpVersion;                  /*PixelMap version number.*/
-    SInt16                           vpPackType;
-    UInt32                           vpPackSize;
-    UInt32                            vpHRes;                     /*Horizontal resolution of the device (pixels per inch).*/
-    UInt32                            vpVRes;                     /*Vertical resolution of the device (pixels per inch).*/
-    SInt16                           vpPixelType;                /*Defines the pixel type.*/
-    SInt16                           vpPixelSize;                /*Number of bits in pixel.*/
-    SInt16                           vpCmpCount;                 /*Number of components in pixel.*/
-    SInt16                           vpCmpSize;                  /*Number of bits per component*/
-    UInt32                            vpPlaneBytes;               /*Offset from one plane to the next.*/
-};
-typedef struct VPBlock                  VPBlock;
-typedef VPBlock *                       VPBlockPtr;
-
-struct VDEntryRecord {
-    Ptr                             csTable;                    /* pointer to color table entry=value, r,g,b:INTEGER*/
-};
-typedef struct VDEntryRecord            VDEntryRecord;
-
-typedef VDEntryRecord *                 VDEntRecPtr;
-/* Parm block for SetGray control call */
-
-struct VDGrayRecord {
-    Boolean                         csMode;                     /*Same as GDDevType value (0=color, 1=mono)*/
-    SInt8                           filler;
-};
-typedef struct VDGrayRecord             VDGrayRecord;
-
-typedef VDGrayRecord *                  VDGrayPtr;
-/* Parm block for SetInterrupt call */
-
-struct VDFlagRecord {
-    SInt8                           csMode;
-    SInt8                           filler;
-};
-typedef struct VDFlagRecord             VDFlagRecord;
-
-typedef VDFlagRecord *                  VDFlagRecPtr;
-/* Parm block for SetEntries control call */
-
-struct VDSetEntryRecord {
-    ColorSpec *                     csTable;                    /*Pointer to an array of color specs*/
-    SInt16                           csStart;                    /*Which spec in array to start with, or -1*/
-    SInt16                           csCount;                    /*Number of color spec entries to set*/
-};
-typedef struct VDSetEntryRecord         VDSetEntryRecord;
-
-typedef VDSetEntryRecord *              VDSetEntryPtr;
-/* Parm block for SetGamma control call */
-
-struct VDGammaRecord {
-    Ptr                             csGTable;                   /*pointer to gamma table*/
-};
-typedef struct VDGammaRecord            VDGammaRecord;
-
-typedef VDGammaRecord *                 VDGamRecPtr;
-
-struct VDSwitchInfoRec {
-    DepthMode                  csMode;                     /* mode depth*/
-    DisplayModeID                   csData;                     /* functional sResource of mode*/
-    UInt16                  csPage;                     /* page to switch in*/
-    Ptr                             csBaseAddr;                 /* base address of page (return value)*/
-    uintptr_t                   csReserved;                 /* Reserved (set to 0) */
-};
-typedef struct VDSwitchInfoRec          VDSwitchInfoRec;
-
-typedef VDSwitchInfoRec *               VDSwitchInfoPtr;
-
-struct VDTimingInfoRec {
-    DisplayModeID                   csTimingMode;               /* timing mode (a la InitGDevice) */
-    uintptr_t                   csTimingReserved;           /* reserved */
-    UInt32                   csTimingFormat;             /* what format is the timing info */
-    UInt32                   csTimingData;               /* data supplied by driver */
-    UInt32                   csTimingFlags;              /* mode within device */
-};
-typedef struct VDTimingInfoRec          VDTimingInfoRec;
-
-typedef VDTimingInfoRec *               VDTimingInfoPtr;
-
-struct VDDisplayConnectInfoRec {
-    UInt16                  csDisplayType;              /* Type of display connected */
-    UInt8                   csConnectTaggedType;        /* type of tagging */
-    UInt8                   csConnectTaggedData;        /* tagging data */
-    UInt32                   csConnectFlags;             /* tell us about the connection */
-    uintptr_t                   csDisplayComponent;         /* if the card has a direct connection to the display, it returns the display component here (FUTURE) */
-    uintptr_t                   csConnectReserved;          /* reserved */
-};
-typedef struct VDDisplayConnectInfoRec  VDDisplayConnectInfoRec;
-
-typedef VDDisplayConnectInfoRec *       VDDisplayConnectInfoPtr;
-
-struct VDMultiConnectInfoRec {
-    UInt32                   csDisplayCountOrNumber;     /* For GetMultiConnect, returns count n of 1..n connections; otherwise, indicates the ith connection.*/
-    VDDisplayConnectInfoRec         csConnectInfo;              /* Standard VDDisplayConnectionInfo for connection i.*/
-};
-typedef struct VDMultiConnectInfoRec    VDMultiConnectInfoRec;
-
-typedef VDMultiConnectInfoRec *         VDMultiConnectInfoPtr;
-/* RawSenseCode
-    This abstract data type is not exactly abstract.  Rather, it is merely enumerated constants
-    for the possible raw sense code values when 'standard' sense code hardware is implemented.
-
-    For 'standard' sense code hardware, the raw sense is obtained as follows:
-        o Instruct the frame buffer controller NOT to actively drive any of the monitor sense lines
-        o Read the state of the monitor sense lines 2, 1, and 0.  (2 is the MSB, 0 the LSB)
-
-    IMPORTANT Note: 
-    When the 'kTaggingInfoNonStandard' bit of 'csConnectFlags' is FALSE, then these constants 
-    are valid 'csConnectTaggedType' values in 'VDDisplayConnectInfo' 
-
-*/
-typedef UInt8                   RawSenseCode;
-enum {
-    kRSCZero                    = 0,
-    kRSCOne                     = 1,
-    kRSCTwo                     = 2,
-    kRSCThree                   = 3,
-    kRSCFour                    = 4,
-    kRSCFive                    = 5,
-    kRSCSix                     = 6,
-    kRSCSeven                   = 7
-};
-
-
-/* ExtendedSenseCode
-    This abstract data type is not exactly abstract.  Rather, it is merely enumerated constants
-    for the values which are possible when the extended sense algorithm is applied to hardware
-    which implements 'standard' sense code hardware.
-
-    For 'standard' sense code hardware, the extended sense code algorithm is as follows:
-    (Note:  as described here, sense line 'A' corresponds to '2', 'B' to '1', and 'C' to '0')
-        o Drive sense line 'A' low and read the values of 'B' and 'C'.  
-        o Drive sense line 'B' low and read the values of 'A' and 'C'.
-        o Drive sense line 'C' low and read the values of 'A' and 'B'.
-
-    In this way, a six-bit number of the form BC/AC/AB is generated. 
-
-    IMPORTANT Note: 
-    When the 'kTaggingInfoNonStandard' bit of 'csConnectFlags' is FALSE, then these constants 
-    are valid 'csConnectTaggedData' values in 'VDDisplayConnectInfo' 
-
-*/
-typedef UInt8                   ExtendedSenseCode;
-enum {
-    kESCZero21Inch              = 0x00,                         /* 21" RGB                     */
-    kESCOnePortraitMono         = 0x14,                         /* Portrait Monochrome              */
-    kESCTwo12Inch               = 0x21,                         /* 12" RGB                    */
-    kESCThree21InchRadius       = 0x31,                         /* 21" RGB (Radius)               */
-    kESCThree21InchMonoRadius   = 0x34,                         /* 21" Monochrome (Radius)           */
-    kESCThree21InchMono         = 0x35,                         /* 21" Monochrome               */
-    kESCFourNTSC                = 0x0A,                         /* NTSC                     */
-    kESCFivePortrait            = 0x1E,                         /* Portrait RGB              */
-    kESCSixMSB1                 = 0x03,                         /* MultiScan Band-1 (12" thru 1Six")  */
-    kESCSixMSB2                 = 0x0B,                         /* MultiScan Band-2 (13" thru 19")       */
-    kESCSixMSB3                 = 0x23,                         /* MultiScan Band-3 (13" thru 21")       */
-    kESCSixStandard             = 0x2B,                         /* 13"/14" RGB or 12" Monochrome   */
-    kESCSevenPAL                = 0x00,                         /* PAL                        */
-    kESCSevenNTSC               = 0x14,                         /* NTSC                     */
-    kESCSevenVGA                = 0x17,                         /* VGA                        */
-    kESCSeven16Inch             = 0x2D,                         /* 16" RGB (GoldFish)               */
-    kESCSevenPALAlternate       = 0x30,                         /* PAL (Alternate)                */
-    kESCSeven19Inch             = 0x3A,                         /* Third-Party 19"                 */
-    kESCSevenDDC                = 0x3E,                         /* DDC display                   */
-    kESCSevenNoDisplay          = 0x3F                          /* No display connected           */
-};
-
-/* DepthMode
-    This abstract data type is used to to reference RELATIVE pixel depths.
-    Its definition is largely derived from its past usage, analogous to 'xxxVidMode'
-
-    Bits per pixel DOES NOT directly map to 'DepthMode'  For example, on some
-    graphics hardware, 'kDepthMode1' may represent 1 BPP, whereas on other
-    hardware, 'kDepthMode1' may represent 8BPP.
-
-    DepthMode IS considered to be ordinal, i.e., operations such as <, >, ==, etc.
-    behave as expected.  The values of the constants which comprise the set are such
-    that 'kDepthMode4 < kDepthMode6' behaves as expected.
-*/
-enum {
-    kDepthMode1                 = 128,
-    kDepthMode2                 = 129,
-    kDepthMode3                 = 130,
-    kDepthMode4                 = 131,
-    kDepthMode5                 = 132,
-    kDepthMode6                 = 133
-};
-
-enum {
-    kFirstDepthMode             = 128,                          /* These constants are obsolete, and just included    */
-    kSecondDepthMode            = 129,                          /* for clients that have converted to the above     */
-    kThirdDepthMode             = 130,                          /* kDepthModeXXX constants.                */
-    kFourthDepthMode            = 131,
-    kFifthDepthMode             = 132,
-    kSixthDepthMode             = 133
-};
-
-
-
-struct VDPageInfo {
-    DepthMode                           csMode;                     /* mode within device*/
-    DisplayModeID                            csData;                     /* data supplied by driver*/
-    SInt16                           csPage;                     /* page to switch in*/
-    Ptr                             csBaseAddr;                 /* base address of page*/
-};
-typedef struct VDPageInfo               VDPageInfo;
-
-typedef VDPageInfo *                    VDPgInfoPtr;
-
-struct VDSizeInfo {
-    SInt16                           csHSize;                    /* desired/returned h size*/
-    SInt16                           csHPos;                     /* desired/returned h position*/
-    SInt16                           csVSize;                    /* desired/returned v size*/
-    SInt16                           csVPos;                     /* desired/returned v position*/
-};
-typedef struct VDSizeInfo               VDSizeInfo;
-
-typedef VDSizeInfo *                    VDSzInfoPtr;
-
-struct VDSettings {
-    SInt16                           csParamCnt;                 /* number of params*/
-    SInt16                           csBrightMax;                /* max brightness*/
-    SInt16                           csBrightDef;                /* default brightness*/
-    SInt16                           csBrightVal;                /* current brightness*/
-    SInt16                           csCntrstMax;                /* max contrast*/
-    SInt16                           csCntrstDef;                /* default contrast*/
-    SInt16                           csCntrstVal;                /* current contrast*/
-    SInt16                           csTintMax;                  /* max tint*/
-    SInt16                           csTintDef;                  /* default tint*/
-    SInt16                           csTintVal;                  /* current tint*/
-    SInt16                           csHueMax;                   /* max hue*/
-    SInt16                           csHueDef;                   /* default hue*/
-    SInt16                           csHueVal;                   /* current hue*/
-    SInt16                           csHorizDef;                 /* default horizontal*/
-    SInt16                           csHorizVal;                 /* current horizontal*/
-    SInt16                           csHorizMax;                 /* max horizontal*/
-    SInt16                           csVertDef;                  /* default vertical*/
-    SInt16                           csVertVal;                  /* current vertical*/
-    SInt16                           csVertMax;                  /* max vertical*/
-};
-typedef struct VDSettings               VDSettings;
-typedef VDSettings *                    VDSettingsPtr;
-
-struct VDDefMode {
-    UInt8                           csID;
-    SInt8                           filler;
-};
-typedef struct VDDefMode                VDDefMode;
-typedef VDDefMode *                     VDDefModePtr;
-
-struct VDSyncInfoRec {
-    UInt8                           csMode;
-    UInt8                           csFlags;
-};
-typedef struct VDSyncInfoRec            VDSyncInfoRec;
-
-typedef VDSyncInfoRec *                 VDSyncInfoPtr;
-/*
-   All displayModeID values from 0x80000000 to 0xFFFFFFFF and 0x00
-   are reserved for Apple Computer.
-*/
-/* Constants for the cscGetNextResolution call */
-enum {
-    kDisplayModeIDCurrent       = 0x00,                         /* Reference the Current DisplayModeID */
-    kDisplayModeIDInvalid       = (IODisplayModeID)0xFFFFFFFF,             /* A bogus DisplayModeID in all cases */
-    kDisplayModeIDFindFirstResolution = (IODisplayModeID)0xFFFFFFFE,       /* Used in cscGetNextResolution to reset iterator */
-    kDisplayModeIDNoMoreResolutions = (IODisplayModeID)0xFFFFFFFD,         /* Used in cscGetNextResolution to indicate End Of List */
-    kDisplayModeIDFindFirstProgrammable = (IODisplayModeID)0xFFFFFFFC,     /* Used in cscGetNextResolution to find unused programmable timing */
-    kDisplayModeIDBootProgrammable = (IODisplayModeID)0xFFFFFFFB,          /* This is the ID given at boot time by the OF driver to a programmable timing */
-    kDisplayModeIDReservedBase  = (IODisplayModeID)0x80000000              /* Lowest (unsigned) DisplayModeID reserved by Apple */
-};
-
-/* Constants for the GetGammaInfoList call */
-enum {
-    kGammaTableIDFindFirst      = (GammaTableID)0xFFFFFFFE,             /* Get the first gamma table ID */
-    kGammaTableIDNoMoreTables   = (GammaTableID)0xFFFFFFFD,             /* Used to indicate end of list */
-    kGammaTableIDSpecific       = 0x00                          /* Return the info for the given table id */
-};
-
-/* Constants for GetMultiConnect call*/
-enum {
-    kGetConnectionCount         = 0xFFFFFFFF,             /* Used to get the number of possible connections in a "multi-headed" framebuffer environment.*/
-    kActivateConnection         = (0 << kConnectionInactive),   /* Used for activating a connection (csConnectFlags value).*/
-    kDeactivateConnection       = (1 << kConnectionInactive)    /* Used for deactivating a connection (csConnectFlags value.)*/
-};
-
-/* VDCommunicationRec.csBusID values*/
-enum {
-    kVideoDefaultBus            = 0
-};
-
-
-/* VDCommunicationInfoRec.csBusType values*/
-enum {
-    kVideoBusTypeInvalid        = 0,
-    kVideoBusTypeI2C            = 1,
-    kVideoBusTypeDisplayPort    = 2
-};
-
-
-/* VDCommunicationRec.csSendType and VDCommunicationRec.csReplyType values*/
-enum {
-    kVideoNoTransactionType     = 0,    /* No transaction*/
-    kVideoNoTransactionTypeMask = (1 << kVideoNoTransactionType),
-    kVideoSimpleI2CType         = 1,    /* Simple I2C message*/
-    kVideoSimpleI2CTypeMask     = (1 << kVideoSimpleI2CType),
-    kVideoDDCciReplyType        = 2,    /* DDC/ci message (with imbedded length)*/
-    kVideoDDCciReplyTypeMask    = (1 << kVideoDDCciReplyType),
-    kVideoCombinedI2CType       = 3,    /* Combined format I2C R/~W transaction*/
-    kVideoCombinedI2CTypeMask   = (1 << kVideoCombinedI2CType),
-    kVideoDisplayPortNativeType       = 4,    /* DisplayPort Native */
-    kVideoDisplayPortNativeTypeMask   = (1 << kVideoDisplayPortNativeType)
-};
-
-// VDCommunicationRec.csCommFlags and VDCommunicationInfoRec.csSupportedCommFlags
-enum {
-    kVideoReplyMicroSecDelayBit   = 0,    /* If bit set, the driver should delay csMinReplyDelay micro seconds between send and receive*/
-    kVideoReplyMicroSecDelayMask  = (1 << kVideoReplyMicroSecDelayBit),
-    kVideoUsageAddrSubAddrBit     = 1,    /* If bit set, the driver understands to use the lower 16 bits of the address field as two 8 bit values (address/subaddress) for the I2C transaction*/
-    kVideoUsageAddrSubAddrMask    = (1 << kVideoUsageAddrSubAddrBit)
-};
-
-
-struct VDResolutionInfoRec {
-    DisplayModeID                   csPreviousDisplayModeID;    /* ID of the previous resolution in a chain */
-    DisplayModeID                   csDisplayModeID;            /* ID of the next resolution */
-    UInt32                   csHorizontalPixels;         /* # of pixels in a horizontal line at the max depth */
-    UInt32                   csVerticalLines;            /* # of lines in a screen at the max depth */
-    Fixed                           csRefreshRate;              /* Vertical Refresh Rate in Hz */
-    DepthMode                       csMaxDepthMode;             /* 0x80-based number representing max bit depth */
-    UInt32                   csResolutionFlags;          /* Reserved - flag bits */
-    uintptr_t                   csReserved;                 /* Reserved */
-};
-typedef struct VDResolutionInfoRec      VDResolutionInfoRec;
-
-typedef VDResolutionInfoRec *           VDResolutionInfoPtr;
-
-struct VDVideoParametersInfoRec {
-    DisplayModeID                   csDisplayModeID;            /* the ID of the resolution we want info on */
-    DepthMode                       csDepthMode;                /* The bit depth we want the info on (0x80 based) */
-    VPBlockPtr                      csVPBlockPtr;               /* Pointer to a video parameter block */
-    UInt32                   csPageCount;                /* Number of pages supported by the resolution */
-    VideoDeviceType                 csDeviceType;               /* Device Type:  Direct, Fixed or CLUT; */
-    UInt32                          csDepthFlags;               /* Flags */
-};
-typedef struct VDVideoParametersInfoRec VDVideoParametersInfoRec;
-
-typedef VDVideoParametersInfoRec *      VDVideoParametersInfoPtr;
-
-struct VDGammaInfoRec {
-    GammaTableID                    csLastGammaID;              /* the ID of the previous gamma table */
-    GammaTableID                    csNextGammaID;              /* the ID of the next gamma table */
-    Ptr                             csGammaPtr;                 /* Ptr to a gamma table data */
-    uintptr_t                   csReserved;                 /* Reserved */
-};
-typedef struct VDGammaInfoRec           VDGammaInfoRec;
-
-typedef VDGammaInfoRec *                VDGammaInfoPtr;
-
-struct VDGetGammaListRec {
-    GammaTableID                    csPreviousGammaTableID;     /* ID of the previous gamma table */
-    GammaTableID                    csGammaTableID;             /* ID of the gamma table following csPreviousDisplayModeID */
-    UInt32                   csGammaTableSize;           /* Size of the gamma table in bytes */
-    char *                          csGammaTableName;           /* Gamma table name (c-string) */
-};
-typedef struct VDGetGammaListRec        VDGetGammaListRec;
-
-typedef VDGetGammaListRec *             VDGetGammaListPtr;
-
-struct VDRetrieveGammaRec {
-    GammaTableID                    csGammaTableID;             /* ID of gamma table to retrieve */
-    GammaTbl *                      csGammaTablePtr;            /* Location to copy desired gamma to */
-};
-typedef struct VDRetrieveGammaRec       VDRetrieveGammaRec;
-
-typedef VDRetrieveGammaRec *            VDRetrieveGammaPtr;
-
-struct VDSetHardwareCursorRec {
-    void *                          csCursorRef;                /* reference to cursor data */
-    UInt32                          csReserved1;                /* reserved for future use */
-    UInt32                          csReserved2;                /* should be ignored */
-};
-typedef struct VDSetHardwareCursorRec   VDSetHardwareCursorRec;
-
-typedef VDSetHardwareCursorRec *        VDSetHardwareCursorPtr;
-
-struct VDDrawHardwareCursorRec {
-    SInt32                          csCursorX;                  /* x coordinate */
-    SInt32                          csCursorY;                  /* y coordinate */
-    UInt32                          csCursorVisible;            /* true if cursor is must be visible */
-    UInt32                          csReserved1;                /* reserved for future use */
-    UInt32                          csReserved2;                /* should be ignored */
-};
-typedef struct VDDrawHardwareCursorRec  VDDrawHardwareCursorRec;
-
-typedef VDDrawHardwareCursorRec *       VDDrawHardwareCursorPtr;
-
-struct VDSupportsHardwareCursorRec {
-    UInt32                          csSupportsHardwareCursor;
-                                                                /* true if hardware cursor is supported */
-    UInt32                          csReserved1;                /* reserved for future use */
-    UInt32                          csReserved2;                /* must be zero */
-};
-typedef struct VDSupportsHardwareCursorRec VDSupportsHardwareCursorRec;
-
-typedef VDSupportsHardwareCursorRec *   VDSupportsHardwareCursorPtr;
-
-struct VDHardwareCursorDrawStateRec {
-    SInt32                          csCursorX;                  /* x coordinate */
-    SInt32                          csCursorY;                  /* y coordinate */
-    UInt32                          csCursorVisible;            /* true if cursor is visible */
-    UInt32                          csCursorSet;                /* true if cursor successfully set by last set control call */
-    UInt32                          csReserved1;                /* reserved for future use */
-    UInt32                          csReserved2;                /* must be zero */
-};
-typedef struct VDHardwareCursorDrawStateRec VDHardwareCursorDrawStateRec;
-
-typedef VDHardwareCursorDrawStateRec *  VDHardwareCursorDrawStatePtr;
-
-struct VDConvolutionInfoRec {
-    DisplayModeID                   csDisplayModeID;            /* the ID of the resolution we want info on */
-    DepthMode                       csDepthMode;                /* The bit depth we want the info on (0x80 based) */
-    UInt32                   csPage;
-    UInt32                          csFlags;
-    UInt32                          csReserved;
-};
-typedef struct VDConvolutionInfoRec     VDConvolutionInfoRec;
-
-typedef VDConvolutionInfoRec *          VDConvolutionInfoPtr;
-
-struct VDPowerStateRec {
-    UInt32                   powerState;
-    UInt32                   powerFlags;
-
-    uintptr_t                powerReserved1;
-    uintptr_t                powerReserved2;
-};
-typedef struct VDPowerStateRec          VDPowerStateRec;
-
-typedef VDPowerStateRec *               VDPowerStatePtr;
-/*
-    Private Data to video drivers.
-    
-    In versions of MacOS with multiple address spaces (System 8), the OS 
-    must know the extent of parameters in order to move them between the caller
-    and driver.  The old private-selector model for video drivers does not have
-    this information so:
-    
-    For post-7.x Systems private calls should be implemented using the cscPrivateCall
-*/
-
-struct VDPrivateSelectorDataRec {
-    LogicalAddress                  privateParameters;          /* Caller's parameters*/
-    ByteCount                       privateParametersSize;      /* Size of data sent from caller to driver*/
-    LogicalAddress                  privateResults;             /* Caller's return area. Can be nil, or same as privateParameters.*/
-    ByteCount                       privateResultsSize;         /* Size of data driver returns to caller. Can be nil, or same as privateParametersSize.*/
-};
-typedef struct VDPrivateSelectorDataRec VDPrivateSelectorDataRec;
-
-
-struct VDPrivateSelectorRec {
-    UInt32                          reserved;                   /* Reserved (set to 0). */
-    VDPrivateSelectorDataRec        data[1];
-};
-typedef struct VDPrivateSelectorRec     VDPrivateSelectorRec;
-
-struct VDDDCBlockRec {
-    UInt32                          ddcBlockNumber;             /* Input -- DDC EDID (Extended Display Identification Data) number (1-based) */
-    ResType                         ddcBlockType;               /* Input -- DDC block type (EDID/VDIF) */
-    UInt32                          ddcFlags;                   /* Input -- DDC Flags*/
-    UInt32                          ddcReserved;                /* Reserved */
-    Byte                            ddcBlockData[128];          /* Output -- DDC EDID/VDIF data (kDDCBlockSize) */
-};
-typedef struct VDDDCBlockRec            VDDDCBlockRec;
-
-typedef VDDDCBlockRec *                 VDDDCBlockPtr;
-
-enum {
-                                                                /* timingSyncConfiguration*/
-    kSyncInterlaceMask          = (1 << 7),
-    kSyncAnalogCompositeMask    = 0,
-    kSyncAnalogCompositeSerrateMask = (1 << 2),
-    kSyncAnalogCompositeRGBSyncMask = (1 << 1),
-    kSyncAnalogBipolarMask      = (1 << 3),
-    kSyncAnalogBipolarSerrateMask = (1 << 2),
-    kSyncAnalogBipolarSRGBSyncMask = (1 << 1),
-    kSyncDigitalCompositeMask   = (1 << 4),
-    kSyncDigitalCompositeSerrateMask = (1 << 2),
-    kSyncDigitalCompositeMatchHSyncMask = (1 << 2),
-    kSyncDigitalSeperateMask    = (1 << 4) + (1 << 3),
-    kSyncDigitalVSyncPositiveMask = (1 << 2),
-    kSyncDigitalHSyncPositiveMask = (1 << 1)
-};
-
-
-
-
-struct VDDisplayTimingRangeRec {
-    UInt32                          csRangeSize;                /* Init to sizeof(VDDisplayTimingRangeRec) */
-    UInt32                          csRangeType;                /* Init to 0 */
-    UInt32                          csRangeVersion;             /* Init to 0 */
-    UInt32                          csRangeReserved;            /* Init to 0 */
-
-    UInt32                          csRangeBlockIndex;          /* Requested block (first index is 0)*/
-    UInt32                          csRangeGroup;               /* set to 0 */
-    UInt32                          csRangeBlockCount;          /* # blocks */
-    UInt32                          csRangeFlags;               /* dependent video */
-
-    UInt64                          csMinPixelClock;            /* Min dot clock in Hz */
-    UInt64                          csMaxPixelClock;            /* Max dot clock in Hz */
-
-    UInt32                          csMaxPixelError;            /* Max dot clock error */
-    UInt32                          csTimingRangeSyncFlags;
-    UInt32                          csTimingRangeSignalLevels;
-    UInt32                          csTimingRangeSupportedSignalConfigs;
-
-    UInt32                          csMinFrameRate;             /* Hz */
-    UInt32                          csMaxFrameRate;             /* Hz */
-    UInt32                          csMinLineRate;              /* Hz */
-    UInt32                          csMaxLineRate;              /* Hz */
-
-
-    UInt32                          csMaxHorizontalTotal;       /* Clocks - Maximum total (active + blanking) */
-    UInt32                          csMaxVerticalTotal;         /* Clocks - Maximum total (active + blanking) */
-    UInt32                          csMaxTotalReserved1;        /* Reserved */
-    UInt32                          csMaxTotalReserved2;        /* Reserved */
-
-
-
-                                                                /* Some cards require that some timing elements*/
-                                                                /* be multiples of a "character size" (often 8*/
-                                                                /* clocks).  The "xxxxCharSize" fields document*/
-                                                                /* those requirements.*/
-
-
-    UInt8                           csCharSizeHorizontalActive; /* Character size */
-    UInt8                           csCharSizeHorizontalBlanking; /* Character size */
-    UInt8                           csCharSizeHorizontalSyncOffset; /* Character size */
-    UInt8                           csCharSizeHorizontalSyncPulse; /* Character size */
-
-    UInt8                           csCharSizeVerticalActive;   /* Character size */
-    UInt8                           csCharSizeVerticalBlanking; /* Character size */
-    UInt8                           csCharSizeVerticalSyncOffset; /* Character size */
-    UInt8                           csCharSizeVerticalSyncPulse; /* Character size */
-
-    UInt8                           csCharSizeHorizontalBorderLeft; /* Character size */
-    UInt8                           csCharSizeHorizontalBorderRight; /* Character size */
-    UInt8                           csCharSizeVerticalBorderTop; /* Character size */
-    UInt8                           csCharSizeVerticalBorderBottom; /* Character size */
-
-    UInt8                           csCharSizeHorizontalTotal;  /* Character size for active + blanking */
-    UInt8                           csCharSizeVerticalTotal;    /* Character size for active + blanking */
-    UInt16                          csCharSizeReserved1;        /* Reserved (Init to 0) */
-
-
-    UInt32                          csMinHorizontalActiveClocks;
-    UInt32                          csMaxHorizontalActiveClocks;
-    UInt32                          csMinHorizontalBlankingClocks;
-    UInt32                          csMaxHorizontalBlankingClocks;
-
-    UInt32                          csMinHorizontalSyncOffsetClocks;
-    UInt32                          csMaxHorizontalSyncOffsetClocks;
-    UInt32                          csMinHorizontalPulseWidthClocks;
-    UInt32                          csMaxHorizontalPulseWidthClocks;
-
-    UInt32                          csMinVerticalActiveClocks;
-    UInt32                          csMaxVerticalActiveClocks;
-    UInt32                          csMinVerticalBlankingClocks;
-    UInt32                          csMaxVerticalBlankingClocks;
-
-    UInt32                          csMinVerticalSyncOffsetClocks;
-    UInt32                          csMaxVerticalSyncOffsetClocks;
-    UInt32                          csMinVerticalPulseWidthClocks;
-    UInt32                          csMaxVerticalPulseWidthClocks;
-
-
-    UInt32                          csMinHorizontalBorderLeft;
-    UInt32                          csMaxHorizontalBorderLeft;
-    UInt32                          csMinHorizontalBorderRight;
-    UInt32                          csMaxHorizontalBorderRight;
-
-    UInt32                          csMinVerticalBorderTop;
-    UInt32                          csMaxVerticalBorderTop;
-    UInt32                          csMinVerticalBorderBottom;
-    UInt32                          csMaxVerticalBorderBottom;
-
-    UInt32                          csMaxNumLinks;                /* number of links, if zero, assume link 1 */
-    UInt32                          csMinLink0PixelClock;         /* min pixel clock for link 0 (kHz) */
-    UInt32                          csMaxLink0PixelClock;         /* max pixel clock for link 0 (kHz) */
-    UInt32                          csMinLink1PixelClock;         /* min pixel clock for link 1 (kHz) */
-    UInt32                          csMaxLink1PixelClock;         /* max pixel clock for link 1 (kHz) */
-
-    UInt32                          csReserved6;                /* Reserved (Init to 0)*/
-    UInt32                          csReserved7;                /* Reserved (Init to 0)*/
-    UInt32                          csReserved8;                /* Reserved (Init to 0)*/
-};
-typedef struct VDDisplayTimingRangeRec  VDDisplayTimingRangeRec;
-
-typedef VDDisplayTimingRangeRec *       VDDisplayTimingRangePtr;
-
-enum {
-                                                                /* csDisplayModeState*/
-    kDMSModeReady               = 0,                            /* Display Mode ID is configured and ready*/
-    kDMSModeNotReady            = 1,                            /* Display Mode ID is is being programmed*/
-    kDMSModeFree                = 2                             /* Display Mode ID is not associated with a timing*/
-};
-
-
-/* Video driver Errors -10930 to -10959 */
-enum {
-    kTimingChangeRestrictedErr  = -10930,
-    kVideoI2CReplyPendingErr    = -10931,
-    kVideoI2CTransactionErr     = -10932,
-    kVideoI2CBusyErr            = -10933,
-    kVideoI2CTransactionTypeErr = -10934,
-    kVideoBufferSizeErr         = -10935,
-    kVideoCannotMirrorErr       = -10936
-};
-
-
-enum {
-                                                                /* csTimingRangeSignalLevels*/
-    kRangeSupportsSignal_0700_0300_Bit = 0,
-    kRangeSupportsSignal_0714_0286_Bit = 1,
-    kRangeSupportsSignal_1000_0400_Bit = 2,
-    kRangeSupportsSignal_0700_0000_Bit = 3,
-    kRangeSupportsSignal_0700_0300_Mask = (1 << kRangeSupportsSignal_0700_0300_Bit),
-    kRangeSupportsSignal_0714_0286_Mask = (1 << kRangeSupportsSignal_0714_0286_Bit),
-    kRangeSupportsSignal_1000_0400_Mask = (1 << kRangeSupportsSignal_1000_0400_Bit),
-    kRangeSupportsSignal_0700_0000_Mask = (1 << kRangeSupportsSignal_0700_0000_Bit)
-};
-
-
-enum {
-                                                                /* csSignalConfig*/
-    kDigitalSignalBit            = 0,                            /* Do not set.  Mac OS does not currently support arbitrary digital timings*/
-    kAnalogSetupExpectedBit      = 1,                            /* Analog displays - display expects a blank-to-black setup or pedestal.  See VESA signal standards.*/
-    kInterlacedCEA861SyncModeBit = 2,
-
-    kDigitalSignalMask            = (1 << kDigitalSignalBit),
-    kAnalogSetupExpectedMask      = (1 << kAnalogSetupExpectedBit),
-    kInterlacedCEA861SyncModeMask = (1 << kInterlacedCEA861SyncModeBit)
-};
-
-
-enum {
-                                                                /* csSignalLevels for analog*/
-    kAnalogSignalLevel_0700_0300 = 0,
-    kAnalogSignalLevel_0714_0286 = 1,
-    kAnalogSignalLevel_1000_0400 = 2,
-    kAnalogSignalLevel_0700_0000 = 3
-};
-
-
-enum {
-                                                                /* csTimingRangeSyncFlags*/
-    kRangeSupportsSeperateSyncsBit = 0,
-    kRangeSupportsSyncOnGreenBit = 1,
-    kRangeSupportsCompositeSyncBit = 2,
-    kRangeSupportsVSyncSerrationBit = 3,
-    kRangeSupportsSeperateSyncsMask = (1 << kRangeSupportsSeperateSyncsBit),
-    kRangeSupportsSyncOnGreenMask = (1 << kRangeSupportsSyncOnGreenBit),
-    kRangeSupportsCompositeSyncMask = (1 << kRangeSupportsCompositeSyncBit),
-    kRangeSupportsVSyncSerrationMask = (1 << kRangeSupportsVSyncSerrationBit)
-};
-
-
-
-enum {
-                                                                /* csHorizontalSyncConfig and csVerticalSyncConfig*/
-    kSyncPositivePolarityBit    = 0,                            /* Digital separate sync polarity for analog interfaces (0 => negative polarity)*/
-    kSyncPositivePolarityMask   = (1 << kSyncPositivePolarityBit)
-};
-
-
-
-
-/* For timings with kDetailedTimingFormat.*/
-
-struct VDDetailedTimingRec {
-    UInt32                          csTimingSize;               /* Init to sizeof(VDDetailedTimingRec)*/
-    UInt32                          csTimingType;               /* Init to 0*/
-    UInt32                          csTimingVersion;            /* Init to 0*/
-    UInt32                          csTimingReserved;           /* Init to 0*/
-
-    DisplayModeID                   csDisplayModeID;            /* Init to 0*/
-    UInt32                          csDisplayModeSeed;          /* */
-    UInt32                          csDisplayModeState;         /* Display Mode state*/
-    UInt32                          csDisplayModeAlias;         /* Mode to use when programmed.*/
-
-    UInt32                          csSignalConfig;
-    UInt32                          csSignalLevels;
-
-    UInt64                          csPixelClock;               /* Hz*/
-
-    UInt64                          csMinPixelClock;            /* Hz - With error what is slowest actual clock */
-    UInt64                          csMaxPixelClock;            /* Hz - With error what is fasted actual clock */
-
-
-    UInt32                          csHorizontalActive;         /* Pixels*/
-    UInt32                          csHorizontalBlanking;       /* Pixels*/
-    UInt32                          csHorizontalSyncOffset;     /* Pixels*/
-    UInt32                          csHorizontalSyncPulseWidth; /* Pixels*/
-
-    UInt32                          csVerticalActive;           /* Lines*/
-    UInt32                          csVerticalBlanking;         /* Lines*/
-    UInt32                          csVerticalSyncOffset;       /* Lines*/
-    UInt32                          csVerticalSyncPulseWidth;   /* Lines*/
-
-    UInt32                          csHorizontalBorderLeft;     /* Pixels*/
-    UInt32                          csHorizontalBorderRight;    /* Pixels*/
-    UInt32                          csVerticalBorderTop;        /* Lines*/
-    UInt32                          csVerticalBorderBottom;     /* Lines*/
-
-    UInt32                          csHorizontalSyncConfig;
-    UInt32                          csHorizontalSyncLevel;      /* Future use (init to 0)*/
-    UInt32                          csVerticalSyncConfig;
-    UInt32                          csVerticalSyncLevel;        /* Future use (init to 0)*/
-
-    UInt32                          csNumLinks;                 /* number of links, if 0 = assume link - 0 */
-
-    UInt32                          csReserved2;                /* Init to 0*/
-    UInt32                          csReserved3;                /* Init to 0*/
-    UInt32                          csReserved4;                /* Init to 0*/
-
-    UInt32                          csReserved5;                /* Init to 0*/
-    UInt32                          csReserved6;                /* Init to 0*/
-    UInt32                          csReserved7;                /* Init to 0*/
-    UInt32                          csReserved8;                /* Init to 0*/
-};
-typedef struct VDDetailedTimingRec      VDDetailedTimingRec;
-
-typedef VDDetailedTimingRec *           VDDetailedTimingPtr;
-
-/* csScalerFeatures */
-enum {
-    kScaleStretchOnlyMask         = (1<<0),                     /* True means the driver cannot add borders to avoid non-square pixels */
-    kScaleCanUpSamplePixelsMask   = (1<<1),                     /* True means timings with more active clocks than pixels (ie 640x480 pixels on a 1600x1200 timing) */
-    kScaleCanDownSamplePixelsMask = (1<<2),                     /* True means timings with fewer active clocks than pixels (ie 1600x1200  pixels on a 640x480 timing) */
-    kScaleCanScaleInterlacedMask  = (1<<3),                     /* True means can scale an interlaced timing */
-    kScaleCanSupportInsetMask     = (1<<4),                     /* True means can scale a timing with insets */
-    kScaleCanRotateMask           = (1<<5),                     /* True means can rotate image */
-    kScaleCanBorderInsetOnlyMask  = (1<<6)                      /* True means can scale a timing with insets */
-};
-
-/* csScalerFlags */
-enum {
-    kScaleStretchToFitMask      = 0x00000001,                   /* True means the driver should avoid borders and allow non-square pixels */
-
-    kScaleRotateFlagsMask       = 0x000000f0,
-
-    kScaleSwapAxesMask          = 0x00000010,
-    kScaleInvertXMask           = 0x00000020,
-    kScaleInvertYMask           = 0x00000040,
-
-    kScaleRotate0Mask           = 0x00000000,
-    kScaleRotate90Mask          = kScaleSwapAxesMask | kScaleInvertXMask,
-    kScaleRotate180Mask         = kScaleInvertXMask  | kScaleInvertYMask,
-    kScaleRotate270Mask         = kScaleSwapAxesMask | kScaleInvertYMask
-};
-
-typedef UInt32                  VDClutBehavior;
-typedef VDClutBehavior *        VDClutBehaviorPtr;
-enum {
-    kSetClutAtSetEntries        = 0,                            /* SetEntries behavior is to update clut during SetEntries call*/
-    kSetClutAtVBL               = 1                             /* SetEntries behavior is to upate clut at next vbl*/
-};
-
-
-struct VDCommunicationRec {
-    SInt32                          csBusID;                    /* kVideoDefaultBus for single headed cards.*/
-    UInt32                          csCommFlags;                /* Always zero*/
-    UInt32                          csMinReplyDelay;            /* Minimum delay between send and reply transactions (units depend on csCommFlags)*/
-    UInt32                          csReserved2;                /* Always zero*/
-
-    UInt32                          csSendAddress;              /* Usually I2C address (eg 0x6E)*/
-    UInt32                          csSendType;                 /* See kVideoSimpleI2CType etc.*/
-    LogicalAddress                  csSendBuffer;               /* Pointer to the send buffer*/
-    ByteCount                       csSendSize;                 /* Number of bytes to send*/
-
-    UInt32                          csReplyAddress;             /* Address from which to read (eg 0x6F for kVideoDDCciReplyType I2C address)*/
-    UInt32                          csReplyType;                /* See kVideoDDCciReplyType etc.*/
-    LogicalAddress                  csReplyBuffer;              /* Pointer to the reply buffer*/
-    ByteCount                       csReplySize;                /* Max bytes to reply (size of csReplyBuffer)*/
-
-    UInt32                          csReserved3;
-    UInt32                          csReserved4;
-    UInt32                          csReserved5;                /* Always zero*/
-    UInt32                          csReserved6;                /* Always zero*/
-};
-typedef struct VDCommunicationRec       VDCommunicationRec;
-
-typedef VDCommunicationRec *            VDCommunicationPtr;
-
-struct VDCommunicationInfoRec {
-    SInt32                          csBusID;                    /* kVideoDefaultBus for single headed cards. */
-    UInt32                          csBusType;                  /* See kVideoBusI2C etc.*/
-    SInt32                          csMinBus;                   /* Minimum bus (usually kVideoDefaultBus).  Used to probe additional busses*/
-    SInt32                          csMaxBus;                   /* Max bus (usually kVideoDefaultBus).  Used to probe additional busses*/
-
-    UInt32                          csSupportedTypes;           /* Bit field for first 32 supported transaction types.  Eg. 0x07 => support for kVideoNoTransactionType, kVideoSimpleI2CType and kVideoDDCciReplyType.*/
-    UInt32                          csSupportedCommFlags;       /* Return the flags csCommFlags understood by this driver. */
-    UInt32                          csReserved2;                /* Always zero*/
-    UInt32                          csReserved3;                /* Always zero*/
-
-    UInt32                          csReserved4;                /* Always zero*/
-    UInt32                          csReserved5;                /* Always zero*/
-    UInt32                          csReserved6;                /* Always zero*/
-    UInt32                          csReserved7;                /* Always zero*/
-};
-typedef struct VDCommunicationInfoRec   VDCommunicationInfoRec;
-
-typedef VDCommunicationInfoRec *        VDCommunicationInfoPtr;
-
-
-struct VDScalerRec {
-    UInt32                          csScalerSize;               /* Init to sizeof(VDScalerRec) */
-    UInt32                          csScalerVersion;            /* Init to 0 */
-    UInt32                          csReserved1;                /* Init to 0 */
-    UInt32                          csReserved2;                /* Init to 0 */
-    
-    DisplayModeID                   csDisplayModeID;            /* Display Mode ID modified by this call. */
-    UInt32                          csDisplayModeSeed;          /*  */
-    UInt32                          csDisplayModeState;         /* Display Mode state */
-    UInt32                          csReserved3;                /* Init to 0 */
-    
-    UInt32                          csScalerFlags;              /* Init to 0 */
-    UInt32                          csHorizontalPixels;         /* Graphics system addressable pixels */
-    UInt32                          csVerticalPixels;           /* Graphics system addressable lines */
-    UInt32                          csHorizontalInset;          /* Border pixels for underscan */
-    UInt32                          csVerticalInset;            /* Border lines for underscan */
-    UInt32                          csReserved6;                /* Init to 0 */
-    UInt32                          csReserved7;                /* Init to 0 */
-    UInt32                          csReserved8;                /* Init to 0 */
-};
-typedef struct VDScalerRec   VDScalerRec;
-typedef VDScalerRec  *VDScalerPtr;
-
-struct VDScalerInfoRec {
-    UInt32                          csScalerInfoSize;           /* Init to sizeof(VDScalerInfoRec) */
-    UInt32                          csScalerInfoVersion;        /* Init to 0 */
-    UInt32                          csReserved1;                /* Init to 0 */
-    UInt32                          csReserved2;                /* Init to 0 */
-    
-    UInt32                          csScalerFeatures;           /* Feature flags */
-    UInt32                          csMaxHorizontalPixels;      /* limit to horizontal scaled pixels */
-    UInt32                          csMaxVerticalPixels;        /* limit to vertical scaled pixels */
-    UInt32                          csReserved3;                /* Init to 0 */
-
-    UInt32                          csReserved4;                /* Init to 0 */
-    UInt32                          csReserved5;                /* Init to 0 */
-    UInt32                          csReserved6;                /* Init to 0 */
-    UInt32                          csReserved7;                /* Init to 0 */
-};
-typedef struct VDScalerInfoRec   VDScalerInfoRec;
-typedef VDScalerInfoRec *VDScalerInfoPtr;
-
-enum {
-    /* csMirrorFeatures*/
-    kMirrorSameDepthOnlyMirrorMask = (1 << 0),                  /* Commonly true - Mirroring can only be done if the displays are the same bitdepth*/
-    kMirrorSameSizeOnlyMirrorMask = (1 << 1),                   /* Commonly false - Mirroring can only be done if the displays are the same size*/
-    kMirrorSameTimingOnlyMirrorMask = (1 << 2),                 /* Sometimes true - Mirroring can only be done if the displays are the same timing*/
-    kMirrorCommonGammaMask        = (1 << 3)                    /* Sometimes true - Only one gamma correction LUT.*/
-};
-
-enum {
-    /* csMirrorSupportedFlags and csMirrorFlags*/
-    kMirrorCanMirrorMask          = (1 << 0),                   /* Set means we can HW mirrored right now (uses csMirrorEntryID)*/
-    kMirrorAreMirroredMask        = (1 << 1),                   /* Set means we are HW mirrored right now (uses csMirrorEntryID)*/
-    kMirrorUnclippedMirrorMask    = (1 << 2),                   /* Set means mirrored displays are not clipped to their intersection*/
-    kMirrorHAlignCenterMirrorMask = (1 << 3),                   /* Set means mirrored displays can/should be centered horizontally*/
-    kMirrorVAlignCenterMirrorMask = (1 << 4),                   /* Set means mirrored displays can/should be centered vertically*/
-    kMirrorCanChangePixelFormatMask = (1 << 5),                 /* Set means mirrored the device should change the pixel format of mirrored displays to allow mirroring.*/
-    kMirrorCanChangeTimingMask    = (1 << 6),                   /* Set means mirrored the device should change the timing of mirrored displays to allow mirroring.*/
-    kMirrorClippedMirrorMask      = (1 << 7)                    /* Set means mirrored displays are clipped to their intersection (driver handles blacking and base address adjustment)*/
-};
-
-struct VDMirrorRec {
-    UInt32              csMirrorSize;           /* Init to sizeof(VDMirrorRec)*/
-    UInt32              csMirrorVersion;        /* Init to 0*/
-    
-    RegEntryID          csMirrorRequestID;   /* Input RegEntryID to check for mirroring support and state*/
-    RegEntryID          csMirrorResultID;    /* Output RegEntryID of the next mirrored device*/
-    
-    UInt32              csMirrorFeatures;       /* Output summary features of the driver*/
-    UInt32              csMirrorSupportedFlags; /* Output configuration options supported by the driver*/
-    UInt32              csMirrorFlags;          /* Output configuration options active now*/
-    UInt32              csReserved1;            /* Init to 0*/
-    
-    
-    UInt32              csReserved2;            /* Init to 0*/
-    UInt32              csReserved3;            /* Init to 0*/
-    UInt32              csReserved4;            /* Init to 0*/
-    UInt32              csReserved5;            /* Init to 0*/
-};
-typedef struct VDMirrorRec VDMirrorRec;
-typedef VDMirrorRec * VDMirrorPtr;
-
-struct VDConfigurationRec {
-    UInt32              csConfigFeature;        /* input what feature to config - always input*/
-    UInt32              csConfigSupport;        /* output support value - always output*/
-    uintptr_t           csConfigValue;          /* input/output feature value - input on Control(), output on Status()*/
-    uintptr_t           csReserved1;
-    uintptr_t           csReserved2;
-};
-typedef struct VDConfigurationRec       VDConfigurationRec;
-typedef VDConfigurationRec *            VDConfigurationPtr;
-
-enum
-{
-    kDVIPowerSwitchFeature        = (1 << 0),   /* Used for csConfigFeature*/
-    kDVIPowerSwitchSupportMask    = (1 << 0),   /* Read-only*/
-    kDVIPowerSwitchActiveMask     = (1 << 0),   /* Read/write for csConfigValue*/
-};
-
-struct VDConfigurationFeatureListRec
-{
-    OSType *    csConfigFeatureList;
-    ItemCount   csNumConfigFeatures;
-    uintptr_t   csReserved1;
-    uintptr_t   csReserved2;
-};
-typedef struct VDConfigurationFeatureListRec   VDConfigurationFeatureListRec;
-typedef VDConfigurationFeatureListRec *        VDConfigurationFeatureListRecPtr;
-
-
-#ifndef __LP64__
-#pragma options align=reset
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __IOMACOSVIDEO__ */
-
diff --git a/i386/include/IOKit/ndrvsupport/IONDRVFramebuffer.h b/i386/include/IOKit/ndrvsupport/IONDRVFramebuffer.h
deleted file mode 100644
index ca65891..0000000
--- a/i386/include/IOKit/ndrvsupport/IONDRVFramebuffer.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1997-1998 Apple Computer, Inc.
- *
- *
- * HISTORY
- *
- * sdouglas  22 Oct 97 - first checked in.
- * sdouglas  24 Jul 98 - start IOKit.
- * sdouglas  15 Dec 98 - cpp.
- *
- */
-
-#ifndef _IOKIT_IONDRVFRAMEBUFFER_H
-#define _IOKIT_IONDRVFRAMEBUFFER_H
-
-#include <IOKit/graphics/IOFramebuffer.h>
-#include <IOKit/ndrvsupport/IOMacOSVideo.h>
-#include <IOKit/ndrvsupport/IONDRVSupport.h>
-
-#define kIONDRVDisableKey       "AAPL,disable-ndrv"
-
-class IONDRVFramebuffer : public IOFramebuffer
-{
-    OSDeclareDefaultStructors(IONDRVFramebuffer)
-
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of this class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData * reserved;
-
-protected:
-
-    IOService *                 nub;
-    class IONDRV *              ndrv;
-
-    // current configuration
-    IODisplayModeID             currentDisplayMode;
-    IOIndex                     currentDepth;
-    IOIndex                     currentPage;
-    UInt8                       __reservedE;
-
-    IOPhysicalAddress           physicalFramebuffer;
-    IODeviceMemory      *       vramRange;
-
-    UInt8                       gammaWidth;
-    UInt8                       __reservedD;
-    UInt8                       lastGrayMode;
-    VDClutBehavior              lastClutSetting;
-    UInt8                       __reservedC;
-
-    bool                        consoleDevice;
-    UInt32                      powerState;
-    UInt32                      ndrvState;
-    SInt32                      ndrvEnter;
-    OSArray *                   detailedTimings;
-    UInt32                      detailedTimingsSeed;
-    UInt32 *                    detailedTimingsCurrent;
-
-    IODeviceMemory *            vramMemory;
-
-    VDResolutionInfoRec         cachedVDResolution;
-
-    struct _VSLService *        vslServices;
-
-    UInt32                      accessFlags;
-    unsigned int                shouldDoI2CPower:1;
-    unsigned int                online:1;
-    unsigned int                avJackState:1;
-    unsigned int                grayMode:1;
-    unsigned int                platformSleep:1;
-    unsigned int                forceReadEDID:1;
-    unsigned int                supportsProbe:1;
-    unsigned int                __reservedB:25;
-
-    IOService *                 device;
-
-    UInt32                      __reservedA[29];
-
-private:
-    struct IONDRVFramebufferPrivate * __private;
-
-public:
-    virtual IOReturn doDriverIO( UInt32 commandID, void * contents,
-                                 UInt32 commandCode, UInt32 commandKind );
-private:
-    OSMetaClassDeclareReservedUsed(IONDRVFramebuffer, 0);
-
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 1);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 2);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 3);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 4);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 5);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 6);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 7);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 8);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 9);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 10);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 11);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 12);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 13);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 14);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 15);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 16);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 17);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 18);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 19);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 20);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 21);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 22);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 23);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 24);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 25);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 26);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 27);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 28);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 29);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 30);
-    OSMetaClassDeclareReservedUnused(IONDRVFramebuffer, 31);
-
-private:
-
-    void initForPM ( void );
-
-    virtual unsigned long maxCapabilityForDomainState( IOPMPowerFlags domainState );
-    virtual unsigned long initialPowerStateForDomainState( IOPMPowerFlags domainState );
-    virtual unsigned long powerStateForDomainState( IOPMPowerFlags domainState );
-
-    virtual IOReturn checkDriver( void );
-    virtual UInt32 iterateAllModes( IODisplayModeID * displayModeIDs );
-    virtual IOReturn getResInfoForMode( IODisplayModeID modeID,
-                                    IODisplayModeInformation * theInfo );
-    virtual IOReturn getResInfoForArbMode( IODisplayModeID modeID,
-                                    IODisplayModeInformation * theInfo );
-    IOReturn getResInfoForDetailed( IODisplayModeID modeID,
-                                    VDDetailedTimingRec * detailed,
-                                    IODisplayModeInformation * info );
-    IOIndex mapDepthIndex( IODisplayModeID modeID, IOIndex depth, bool fromDepthMode );
-    virtual IOReturn validateDisplayMode(
-            IODisplayModeID mode, IOOptionBits flags,
-            VDDetailedTimingRec ** detailed );
-    virtual IOReturn setDetailedTiming(
-            IODisplayModeID mode, IOOptionBits options,
-            void * description, IOByteCount descripSize );
-    virtual void getCurrentConfiguration( void );
-    static const IOTVector * _undefinedSymbolHandler( void * self, 
-                            const char * libraryName, const char * symbolName );
-    static bool _videoJackStateChangeHandler( void * target, void * ref,
-                            IOService * newService, IONotifier * notifier );
-    static void _avProbeAction( OSObject * p0, IOTimerEventSource * evtSrc );
-    void displayI2CPower( bool enable );
-    IOReturn ndrvSetPowerState( UInt32 newState );
-    IOReturn ndrvUpdatePowerState( void );
-    IOReturn ndrvSetDisplayPowerState( UInt32 newState );
-    static IOReturn _probeAction( IONDRVFramebuffer * self, IOOptionBits options );
-    bool searchOfflineMode( IODisplayModeID * offlineMode );
-    IOReturn processConnectChange( uintptr_t * value );
-    IOReturn setMirror( IONDRVFramebuffer * other );
-    IOReturn setConnectionFlags( void );
-    bool getOnlineState( void );
-    IOReturn ndrvGetSetFeature( UInt32 feature, uintptr_t newValue, uintptr_t * currentValue );
-    static IOReturn _doControl( IONDRVFramebuffer * self, UInt32 code, void * params );
-    static IOReturn _doStatus( IONDRVFramebuffer * self, UInt32 code, void * params );
-    static IOReturn extControl( OSObject * owner, void * code, void * params );
-    static IOReturn extStatus( OSObject * owner, void * code, void * params );
-    IOReturn createI2C( void );
-    void setInfoProperties( void );
-
-public:
-    virtual IOReturn doControl( UInt32 code, void * params );
-    virtual IOReturn doStatus( UInt32 code, void * params );
-
-public:
-
-    virtual IOService * probe(  IOService *     provider,
-                                SInt32 *        score );
-
-    virtual bool start( IOService * provider );
-
-    virtual void stop( IOService * provider );
-
-    virtual void free( void );
-
-    virtual IOReturn setProperties( OSObject * properties );
-
-    virtual IOReturn requestProbe( IOOptionBits options );
-
-    virtual IOReturn enableController( void );
-
-    virtual IODeviceMemory * makeSubRange( IOPhysicalAddress start,
-                                           IOPhysicalLength length );
-    virtual IODeviceMemory * getApertureRange( IOPixelAperture aperture );
-    virtual IODeviceMemory * getVRAMRange( void );
-
-    virtual IODeviceMemory * findVRAM( void );
-
-    virtual bool isConsoleDevice( void );
-
-    virtual const IOTVector * undefinedSymbolHandler( const char * libraryName,
-                                                      const char * symbolName );
-
-    virtual const char * getPixelFormats( void );
-
-    // Array of supported display modes
-    virtual IOItemCount getDisplayModeCount( void );
-    virtual IOReturn getDisplayModes( IODisplayModeID * allDisplayModes );
-
-    // Info about a display mode
-    virtual IOReturn getInformationForDisplayMode( IODisplayModeID displayMode,
-                    IODisplayModeInformation * info );
-
-    // Mask of pixel formats available in mode and depth
-    virtual UInt64  getPixelFormatsForDisplayMode( IODisplayModeID displayMode,
-                    IOIndex depth );
-
-    virtual IOReturn getPixelInformation(
-        IODisplayModeID displayMode, IOIndex depth,
-        IOPixelAperture aperture, IOPixelInformation * pixelInfo );
-
-    // Framebuffer info
-
-    // Current display mode and depth
-    virtual IOReturn getCurrentDisplayMode( IODisplayModeID * displayMode,
-                            IOIndex * depth );
-
-    // Set display mode and depth
-    virtual IOReturn setDisplayMode( IODisplayModeID displayMode,
-                            IOIndex depth );
-
-    // For pages
-    virtual IOReturn setApertureEnable( IOPixelAperture aperture,
-                    IOOptionBits enable );
-
-    virtual IOReturn setStartupDisplayMode( IODisplayModeID displayMode,
-                            IOIndex depth );
-    virtual IOReturn getStartupDisplayMode( IODisplayModeID * displayMode,
-                            IOIndex * depth );
-
-    //// CLUTs
-
-    virtual IOReturn setCLUTWithEntries( IOColorEntry * colors, UInt32 index,
-                UInt32 numEntries, IOOptionBits options );
-
-    //// Gamma
-
-    virtual IOReturn setGammaTable( UInt32 channelCount, UInt32 dataCount,
-                    UInt32 dataWidth, void * data );
-
-    //// Display mode timing information
-
-    virtual IOReturn getTimingInfoForDisplayMode( IODisplayModeID displayMode,
-                IOTimingInformation * info );
-
-    //// Detailed timing information
-
-    virtual IOReturn validateDetailedTiming(
-                    void * description, IOByteCount descripSize );
-
-    virtual IOReturn setDetailedTimings( OSArray * array );
-
-    //// Controller attributes
-
-    virtual IOReturn setAttribute( IOSelect attribute, uintptr_t value );
-    virtual IOReturn getAttribute( IOSelect attribute, uintptr_t * value );
-
-    //// Connections
-
-    virtual IOItemCount getConnectionCount( void );
-
-    virtual IOReturn getAttributeForConnection( IOIndex connectIndex,
-                    IOSelect attribute, uintptr_t  * value );
-    
-    virtual IOReturn setAttributeForConnection( IOIndex connectIndex,
-                    IOSelect attribute, uintptr_t  info );
-
-    // Apple sensing
-
-    virtual IOReturn getAppleSense( IOIndex connectIndex,
-            UInt32 * senseType,
-            UInt32 * primary,
-            UInt32 * extended,
-            UInt32 * displayType );
-
-    virtual IOReturn connectFlags( IOIndex connectIndex,
-                    IODisplayModeID displayMode, IOOptionBits * flags );
-
-    //// IOHighLevelDDCSense
-
-    virtual bool hasDDCConnect( IOIndex connectIndex );
-    virtual IOReturn getDDCBlock( IOIndex connectIndex, UInt32 blockNumber,
-                    IOSelect blockType, IOOptionBits options,
-                    UInt8 * data, IOByteCount * length );
-
-    //// Interrupts
-
-    virtual IOReturn registerForInterruptType( IOSelect interruptType,
-                        IOFBInterruptProc proc, OSObject * target, void * ref,
-                        void ** interruptRef );
-    virtual IOReturn unregisterInterrupt( void * interruptRef );
-    virtual IOReturn setInterruptState( void * interruptRef, UInt32 state );
-
-    //// HW Cursors
-
-    virtual IOReturn setCursorImage( void * cursorImage );
-    virtual IOReturn setCursorState( SInt32 x, SInt32 y, bool visible );
-
-    //// I2C calls
-
-    virtual IOReturn doI2CRequest( UInt32 bus, IOI2CBusTiming * timing, IOI2CRequest * request );
-
-    //// VSL calls
-
-    static OSStatus VSLNewInterruptService(
-                            void * entryID,
-                            UInt32 serviceType,
-                            _VSLService ** serviceID );
-    static OSStatus VSLDisposeInterruptService( _VSLService * serviceID );
-    static OSStatus VSLDoInterruptService( _VSLService * serviceID );
-    static Boolean  VSLPrepareCursorForHardwareCursor(
-                            void * cursorRef,
-                            IOHardwareCursorDescriptor * hwDesc,
-                            IOHardwareCursorInfo * hwCursorInfo );
-};
-
-#endif /* ! _IOKIT_IONDRVFRAMEBUFFER_H */
-
-
diff --git a/i386/include/IOKit/ndrvsupport/IONDRVLibraries.h b/i386/include/IOKit/ndrvsupport/IONDRVLibraries.h
deleted file mode 100644
index ad4a26d..0000000
--- a/i386/include/IOKit/ndrvsupport/IONDRVLibraries.h
+++ /dev/null
@@ -1,696 +0,0 @@
-
-#ifndef __IONDRVLIBRARIES__
-#define __IONDRVLIBRARIES__
-
-#include <libkern/OSByteOrder.h>
-#include <libkern/OSAtomic.h>
-#include <IOKit/ndrvsupport/IOMacOSTypes.h>
-#include <IOKit/graphics/IOGraphicsTypes.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* NameRegistry error codes */
-enum {
-    nrLockedErr                         = -2536,
-    nrNotEnoughMemoryErr                = -2537,
-    nrInvalidNodeErr                    = -2538,
-    nrNotFoundErr                       = -2539,
-    nrNotCreatedErr                     = -2540,
-    nrNameErr                           = -2541,
-    nrNotSlotDeviceErr                  = -2542,
-    nrDataTruncatedErr                  = -2543,
-    nrPowerErr                          = -2544,
-    nrPowerSwitchAbortErr               = -2545,
-    nrTypeMismatchErr                   = -2546,
-    nrNotModifiedErr                    = -2547,
-    nrOverrunErr                        = -2548,
-    nrResultCodeBase                    = -2549,
-    nrPathNotFound                      = -2550,    /* a path component lookup failed */
-    nrPathBufferTooSmall                = -2551,    /* buffer for path is too small */
-    nrInvalidEntryIterationOp           = -2552,    /* invalid entry iteration operation */
-    nrPropertyAlreadyExists             = -2553,    /* property already exists */
-    nrIterationDone                     = -2554,    /* iteration operation is done */
-    nrExitedIteratorScope               = -2555,    /* outer scope of iterator was exited */
-    nrTransactionAborted                = -2556,        /* transaction was aborted */
-
-    gestaltUndefSelectorErr             = -5551 /*undefined selector was passed to Gestalt*/
-};
-
-enum {
-    kNVRAMProperty                      = 0x00000020,            // matches NR
-};
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef _IOKIT_IOSERVICE_H
-typedef struct IOService IOService;
-#endif
-
-IOReturn _IONDRVLibrariesInitialize( IOService * provider );
-IOReturn _IONDRVLibrariesFinalize( IOService * provider );
-
-#ifndef kAAPLRegEntryIDKey
-#define kAAPLRegEntryIDKey      "AAPL,RegEntryID"
-#endif
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-UInt32 EndianSwap32Bit( UInt32 data );
-
-UInt16 EndianSwap16Bit( UInt16 data );
-
-void SynchronizeIO(void);
-
-OSErr ExpMgrConfigReadLong(
-  RegEntryIDPtr    node,
-  LogicalAddress   configAddr,
-  UInt32 *         valuePtr);
-
-OSErr ExpMgrConfigWriteLong(
-  RegEntryIDPtr    node,
-  LogicalAddress   configAddr,
-  UInt32           value);
-
-OSErr ExpMgrConfigReadWord(
-  RegEntryIDPtr    node,
-  LogicalAddress   configAddr,
-  UInt16 *         valuePtr);
-
-OSErr ExpMgrConfigWriteWord(
-  RegEntryIDPtr    node,
-  LogicalAddress   configAddr,
-  UInt16           value);
-
-OSErr ExpMgrConfigReadByte(
-  RegEntryIDPtr    node,
-  LogicalAddress   configAddr,
-  UInt8 *          valuePtr);
-
-OSErr ExpMgrConfigWriteByte(
-  RegEntryIDPtr    node,
-  LogicalAddress   configAddr,
-  UInt8            value);
-
-OSErr ExpMgrIOReadLong(
-  RegEntryIDPtr    node,
-  LogicalAddress   ioAddr,
-  UInt32 *         valuePtr);
-
-OSErr ExpMgrIOWriteLong(
-  RegEntryIDPtr    node,
-  LogicalAddress   ioAddr,
-  UInt32           value);
-
-OSErr ExpMgrIOReadWord(
-  RegEntryIDPtr    node,
-  LogicalAddress   ioAddr,
-  UInt16 *         valuePtr);
-
-OSErr ExpMgrIOWriteWord(
-  RegEntryIDPtr    node,
-  LogicalAddress   ioAddr,
-  UInt16           value);
-
-OSErr ExpMgrIOReadByte(
-  RegEntryIDPtr    node,
-  LogicalAddress   ioAddr,
-  UInt8 *          valuePtr);
-
-OSErr ExpMgrIOWriteByte(
-  RegEntryIDPtr    node,
-  LogicalAddress   ioAddr,
-  UInt8            value);
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/*******************************************************************************
- * 
- * Foundation Types
- *
- */
-/* Value of a property */
-typedef void *                          RegPropertyValue;
-/* Length of property value */
-typedef UInt32                          RegPropertyValueSize;
-
-/*******************************************************************************/
-
-/*******************************************************************************
- *
- * Root Entry Name Definitions  (Applies to all Names in the RootNameSpace)
- *
- *  + Names are a colon-separated list of name components.  Name components
- *    may not themselves contain colons.  
- *  + Names are presented as null-terminated ASCII character strings.
- *  + Names follow similar parsing rules to Apple file system absolute
- *    and relative paths.  However the '::' parent directory syntax is
- *    not currently supported.
- */
-/* Max length of Entry Name */
-enum {
-  kRegCStrMaxEntryNameLength    = 47
-};
-
-/* Entry Names are single byte ASCII */
-typedef char                            RegCStrEntryName;
-typedef char *                          RegCStrEntryNamePtr;
-/* length of RegCStrEntryNameBuf =  kRegCStrMaxEntryNameLength+1*/
-typedef char                            RegCStrEntryNameBuf[48];
-typedef char                            RegCStrPathName;
-typedef UInt32                          RegPathNameSize;
-enum {
-  kRegPathNameSeparator         = ':',  /* 0x3A */
-  kRegEntryNameTerminator       = 0x00, /* '\0' */
-  kRegPathNameTerminator        = 0x00  /* '\0' */
-};
-
-/*******************************************************************************
- *
- * Property Name and ID Definitions
- *  (Applies to all Properties Regardless of NameSpace)
- */
-enum {
-  kRegMaximumPropertyNameLength = 31,   /* Max length of Property Name */
-  kRegPropertyNameTerminator    = 0x00  /* '\0' */
-};
-
-typedef char                            RegPropertyNameBuf[32];
-typedef char                            RegPropertyName;
-typedef char *                          RegPropertyNamePtr;
-enum {
-  kRegMaxPropertyNameLength     = kRegMaximumPropertyNameLength
-};
-
-/*******************************************************************************
- *
- * Iteration Operations
- *
- *  These specify direction when traversing the name relationships
- */
-typedef UInt32                          RegIterationOp;
-typedef RegIterationOp                  RegEntryIterationOp;
-enum {
-                                        /* Absolute locations*/
-  kRegIterRoot                  = 0x00000002, /* "Upward" Relationships */
-  kRegIterParents               = 0x00000003, /* include all  parent(s) of entry */
-                                        /* "Downward" Relationships*/
-  kRegIterChildren              = 0x00000004, /* include all children */
-  kRegIterSubTrees              = 0x00000005, /* include all sub trees of entry */
-  kRegIterDescendants           = 0x00000005, /* include all descendants of entry */
-                                        /* "Horizontal" Relationships */
-  kRegIterSibling               = 0x00000006, /* include all siblings */
-                                        /* Keep doing the same thing*/
-  kRegIterContinue              = 0x00000001
-};
-
-/*******************************************************************************
- *
- * Name Entry and Property Modifiers
- *
- *
- *
- * Modifiers describe special characteristics of names
- * and properties.  Modifiers might be supported for
- * some names and not others.
- * 
- * Device Drivers should not rely on functionality
- * specified as a modifier.
- */
-typedef UInt32                          RegModifiers;
-typedef RegModifiers                    RegEntryModifiers;
-typedef RegModifiers                    RegPropertyModifiers;
-enum {
-  kRegNoModifiers               = 0x00000000, /* no entry modifiers in place */
-  kRegUniversalModifierMask     = 0x0000FFFF, /* mods to all entries */
-  kRegNameSpaceModifierMask     = 0x00FF0000, /* mods to all entries within namespace */
-  kRegModifierMask              = (RegModifiers)0xFF000000 /* mods to just this entry */
-};
-
-/* Universal Property Modifiers */
-enum {
-  kRegPropertyValueIsSavedToNVRAM = 0x00000020, /* property is non-volatile (saved in NVRAM) */
-  kRegPropertyValueIsSavedToDisk = 0x00000040 /* property is non-volatile (saved on disk) */
-};
-
-typedef size_t Size;
-
-#ifndef _IOKIT_IOREGISTRYENTRY_H
-typedef struct IORegistryIterator IORegistryIterator;
-typedef struct OSIterator OSIterator;
-#endif /* _IOKIT_IOREGISTRYENTRY_H */
-typedef IORegistryIterator * RegEntryIter;
-typedef OSIterator * RegPropertyIter;
-
-OSStatus RegistryEntryIDCopy( const RegEntryID * entryID, RegEntryID * to );
-
-OSStatus RegistryEntryIDInit( RegEntryID * entryID );
-
-Boolean RegistryEntryIDCompare( const RegEntryID * id1, const RegEntryID * id2);
-
-OSStatus RegistryPropertyGetSize(
-  const RegEntryID *       entryID,
-  const RegPropertyName *  propertyName,
-  RegPropertyValueSize *   propertySize);
-
-OSStatus RegistryPropertyGet(
-  const RegEntryID *       entryID,
-  const RegPropertyName *  propertyName,
-  void *                   propertyValue,
-  RegPropertyValueSize *   propertySize);
-
-OSStatus RegistryPropertyCreate(
-  const RegEntryID *       entryID,
-  const RegPropertyName *  propertyName,
-  const void *             propertyValue,
-  RegPropertyValueSize     propertySize);
-
-OSStatus RegistryPropertyDelete(
-  const RegEntryID *       entryID,
-  const RegPropertyName *  propertyName);
-
-OSStatus RegistryPropertySet(
-  const RegEntryID *       entryID,
-  const RegPropertyName *  propertyName,
-  const void *             propertyValue,
-  RegPropertyValueSize     propertySize);
-
-OSStatus RegistryPropertyGetMod(
-  const RegEntryID *       entry,
-  const RegPropertyName *  name,
-  RegPropertyModifiers *   modifiers);
-
-OSStatus RegistryPropertySetMod(
-  const RegEntryID *       entry,
-  const RegPropertyName *  name,
-  RegPropertyModifiers     modifiers);
-
-OSStatus RegistryPropertyIterateCreate(
-  const RegEntryID *  entry,
-  RegPropertyIter *   cookie);
-
-OSStatus RegistryPropertyIterateDispose( RegPropertyIter * cookie);
-
-OSStatus RegistryPropertyIterate(
-  RegPropertyIter *  cookie,
-  RegPropertyName *  foundProperty,
-  Boolean *          done);
-
-OSStatus RegistryEntryIterateCreate( RegEntryIter * cookie);
-
-OSStatus RegistryEntryIterateDispose( RegEntryIter * cookie);
-
-OSStatus RegistryEntryIterateSet( RegEntryIter * cookie,
-                                    const RegEntryID * startEntryID);
-
-OSStatus RegistryEntryIterate( RegEntryIter *   cookie,
-                        RegEntryIterationOp     relationship,
-                        RegEntryID *    foundEntry,
-                        Boolean *       done);
-
-OSStatus RegistryCStrEntryToName( const RegEntryID *    entryID,
-                            RegEntryID *                parentEntry,
-                            RegCStrEntryName *          nameComponent,
-                            Boolean *                   done );
-
-OSStatus RegistryCStrEntryLookup(  const RegEntryID *   parentEntry,
-                            const RegCStrPathName *     path,
-                            RegEntryID *                newEntry);
-
-OSStatus RegistryCStrEntryCreate(  const RegEntryID *   parentEntry,
-                            const RegCStrPathName *     name,
-                            RegEntryID *                newEntry);
-
-OSStatus RegistryEntryDelete(const RegEntryID * entryID);
-
-OSStatus RegistryEntryIDDispose(RegEntryID * entryID);
-
-//
-
-OSStatus RegistryEntryCopy(
-  RegEntryID *  parentEntryID,
-  RegEntryID *  sourceDevice,
-  RegEntryID *  destDevice);
-
-OSStatus RegistryEntrySearch(
-  RegEntryIter *           cookie,
-  RegEntryIterationOp      relationship,
-  RegEntryID *             foundEntry,
-  Boolean *                done,
-  const RegPropertyName *  propertyName,
-  const void *             propertyValue,
-  RegPropertyValueSize     propertySize);
-
-OSStatus RegistryEntryToPathSize(
-  const RegEntryID *  entryID,
-  RegPathNameSize *   pathSize);
-
-OSStatus RegistryCStrEntryToPath(
-  const RegEntryID *  entryID,
-  RegCStrPathName *   pathName,
-  RegPathNameSize     pathSize);
-
-OSStatus RegistryPropertyRename(
-  const RegEntryID *       entry,
-  const RegPropertyName *  oldName,
-  const RegPropertyName *  newName);
-
-OSStatus RegistryEntryGetMod(
-  const RegEntryID *   entry,
-  RegEntryModifiers *  modifiers);
-
-OSStatus RegistryEntrySetMod(
-  const RegEntryID *  entry,
-  RegEntryModifiers   modifiers);
-
-OSStatus RegistryEntryMod(
-  RegEntryIter *        cookie,
-  RegEntryIterationOp   relationship,
-  RegEntryID *          foundEntry,
-  Boolean *             done,
-  RegEntryModifiers     matchingModifiers);
-
-OSStatus RegistryEntryPropertyMod(
-  RegEntryIter *         cookie,
-  RegEntryIterationOp    relationship,
-  RegEntryID *           foundEntry,
-  Boolean *              done,
-  RegPropertyModifiers   matchingModifiers);
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-void SynchronizeIO(void);
-
-Boolean CompareAndSwap(
-  UInt32    oldVvalue,
-  UInt32    newValue,
-  UInt32 *  OldValueAdr);
-
-UInt32 CStrLen(const char * src);
-
-char * CStrCopy( char * dst, const char * src);
-
-SInt16 CStrCmp(
-  const char *  s1,
-  const char *  s2);
-
-char * CStrCat(
-  char *        dst,
-  const char *  src);
-char * CStrNCopy(
-  char *        dst,
-  const char *  src,
-  UInt32        max);
-SInt16 CStrNCmp(
-  const char *  s1,
-  const char *  s2,
-  UInt32        max);
-char * CStrNCat(
-  char *        dst,
-  const char *  src,
-  UInt32        max);
-
-void BlockCopy(
-  const void *  srcPtr,
-  void *        destPtr,
-  Size          byteCount);
-void BlockMove(
-  const void *  srcPtr,
-  void *        destPtr,
-  Size          byteCount);
-void BlockMoveData(
-  const void *  srcPtr,
-  void *        destPtr,
-  Size          byteCount);
-void BlockMoveDataUncached(
-  const void *  srcPtr,
-  void *        destPtr,
-  Size          byteCount);
-void BlockMoveUncached(
-  const void *  srcPtr,
-  void *        destPtr,
-  Size          byteCount);
-void BlockZero(
-  const void *  srcPtr,
-  Size          byteCount);
-void BlockZeroUncached(
-  const void *  srcPtr,
-  Size          byteCount);
-
-char * PStrCopy( char *to, const char *from );
-
-void PStrToCStr( char *to, const char *from );
-
-void CStrToPStr( char *to, const char *from );
-
-LogicalAddress PoolAllocateResident(ByteCount byteSize, Boolean clear);
-
-OSStatus PoolDeallocate( LogicalAddress address );
-
-UInt32  CurrentExecutionLevel(void);
-
-UnsignedWide UpTime( void );
-
-UnsignedWide AddAbsoluteToAbsolute(UnsignedWide left, UnsignedWide right);
-
-UnsignedWide SubAbsoluteFromAbsolute(UnsignedWide left, UnsignedWide right);
-
-UnsignedWide DurationToAbsolute( Duration theDuration);
-
-UnsignedWide AddDurationToAbsolute( Duration duration, UnsignedWide absolute );
-
-UnsignedWide NanosecondsToAbsolute ( UnsignedWide theNanoseconds);
-
-UnsignedWide AbsoluteToNanoseconds( UnsignedWide absolute );
-
-Duration AbsoluteDeltaToDuration( UnsignedWide left, UnsignedWide right );
-
-Duration AbsoluteToDuration( UnsignedWide result );
-
-OSStatus DelayForHardware( UnsignedWide time );
-
-OSStatus DelayUntil( UnsignedWide time );
-
-OSStatus DelayFor( Duration theDuration );
-
-void SysDebugStr( const char * from );
-
-void SysDebug( void );
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-enum {
-  paramErr                      = -50,  /*error in user parameter list*/
-  noHardwareErr                 = -200, /*Sound Manager Error Returns*/
-  notEnoughHardwareErr          = -201, /*Sound Manager Error Returns*/
-  userCanceledErr               = -128,
-  qErr                          = -1,   /*queue element not found during deletion*/
-  vTypErr                       = -2,   /*invalid queue element*/
-  corErr                        = -3,   /*core routine number out of range*/
-  unimpErr                      = -4,   /*unimplemented core routine*/
-  SlpTypeErr                    = -5,   /*invalid queue element*/
-  seNoDB                        = -8,   /*no debugger installed to handle debugger command*/
-  controlErr                    = -17,  /*I/O System Errors*/
-  statusErr                     = -18,  /*I/O System Errors*/
-  readErr                       = -19,  /*I/O System Errors*/
-  writErr                       = -20,  /*I/O System Errors*/
-  badUnitErr                    = -21,  /*I/O System Errors*/
-  unitEmptyErr                  = -22,  /*I/O System Errors*/
-  openErr                       = -23,  /*I/O System Errors*/
-  closErr                       = -24,  /*I/O System Errors*/
-  dRemovErr                     = -25,  /*tried to remove an open driver*/
-  dInstErr                      = -26,   /*DrvrInstall couldn't find driver in resources*/
-
-  badCksmErr                    = -69,  /*addr mark checksum didn't check*/
-};
-enum {
-  durationMicrosecond           = -1,  /* Microseconds are negative*/
-  durationMillisecond           = 1,   /* Milliseconds are positive*/
-  durationSecond                = 1000, /* 1000 * durationMillisecond*/
-  durationMinute                = 60000, /* 60 * durationSecond,*/
-  durationHour                  = 3600000, /* 60 * durationMinute,*/
-  durationDay                   = 86400000, /* 24 * durationHour,*/
-  durationNoWait                = 0,   /* don't block*/
-  durationForever               = 0x7FFFFFFF /* no time limit*/
-};
-#ifndef NULL
-    #if !defined(__cplusplus) && (defined(__SC__) || defined(THINK_C))
-        /* Symantec C compilers (but not C++) want NULL and nil to be (void*)0  */
-        #define NULL ((void *) 0)
-    #else
-        /* in case int is 16-bits, make sure NULL is 32-bits */
-        #define NULL 0L
-    #endif
-#endif
-
-#ifndef nil
-    #define nil NULL
-#endif
-
-typedef ResType                         VSLGestaltType;
-
-enum {
-  clutType                      = 0,    /*0 if lookup table*/
-  fixedType                     = 1,    /*1 if fixed table*/
-  directType                    = 2,    /*2 if direct values*/
-  RGBDirect                     = 16   /* 16 & 32 bits/pixel pixelType value */
-};
-typedef UInt32 *                        UInt32Ptr;
-
-typedef struct IOHardwareCursorDescriptor HardwareCursorDescriptorRec;
-typedef HardwareCursorDescriptorRec *     HardwareCursorDescriptorPtr;
-typedef struct IOHardwareCursorInfo       HardwareCursorInfoRec;
-typedef HardwareCursorInfoRec *           HardwareCursorInfoPtr;
-
-typedef ResType                         InterruptServiceType;
-typedef struct _VSLService *            InterruptServiceIDType;
-typedef InterruptServiceIDType *        InterruptServiceIDPtr;
-
-enum {
-  kVBLInterruptServiceType      = 'vbl ',
-  kHBLInterruptServiceType      = 'hbl ',
-  kFrameInterruptServiceType    = 'fram',
-  kConnectInterruptServiceType  = 'dci ', /* Renamed -- Use kFBCheckInterruptServiceType*/
-  kFBConnectInterruptServiceType = kConnectInterruptServiceType, /* Demand to check configuration (Hardware unchanged)*/
-  kFBChangedInterruptServiceType = 'chng', /* Demand to rebuild (Hardware has reinitialized on dependent change)*/
-  kFBOfflineInterruptServiceType = 'remv', /* Demand to remove framebuffer (Hardware not available on dependent change -- but must not buserror)*/
-  kFBOnlineInterruptServiceType = 'add ' /* Notice that hardware is available (after being removed)*/
-};
-
-enum {
-    kVSLClamshellStateGestaltType = 'clam',
-};
-
-OSStatus
-VSLGestalt( VSLGestaltType selector, UInt32 * response );
-
-OSStatus 
-VSLSetDisplayConfiguration(RegEntryID * entryID,
-                                        RegPropertyName *  propertyName,
-                                        RegPropertyValue        configData,
-                                        RegPropertyValueSize configDataSize);
-OSErr
-VSLNewInterruptService(
-  RegEntryID *            serviceDevice,
-  InterruptServiceType    serviceType,
-  InterruptServiceIDPtr   serviceID);
-
-OSErr
-VSLWaitOnInterruptService(
-  InterruptServiceIDType   serviceID,
-  Duration                 timeout);
-
-OSErr
-VSLDisposeInterruptService(InterruptServiceIDType serviceID);
-
-OSErr
-VSLDoInterruptService(InterruptServiceIDType serviceID);
-
-Boolean
-VSLPrepareCursorForHardwareCursor(
-  void *                        cursorRef,
-  IOHardwareCursorDescriptor *  hardwareDescriptor,
-  IOHardwareCursorInfo *        hwCursorInfo);
-
-typedef UnsignedWide Nanoseconds;
-enum {
-                                        /* Version Release Stage Codes */
-  developStage                  = 0x20,
-  alphaStage                    = 0x40,
-  betaStage                     = 0x60,
-  finalStage                    = 0x80
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-typedef struct OpaqueIOCommandID*       IOCommandID;
-
-typedef UInt32 IOCommandKind;
-typedef UInt32 IOCommandCode;
-
-OSErr IOCommandIsComplete( IOCommandID commandID, OSErr result);
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifndef __IONDRV__
-typedef struct OpaqueInterruptSetID*    InterruptSetID;
-#else
-typedef class IONDRVInterruptSet *      InterruptSetID;
-#endif /* __IONDRV__ */
-
-typedef long                            InterruptMemberNumber;
-struct InterruptSetMember {
-  InterruptSetID      setID;
-  InterruptMemberNumber  member;
-};
-typedef struct InterruptSetMember       InterruptSetMember;
-enum {
-  kISTChipInterruptSource       = 0,
-  kISTOutputDMAInterruptSource  = 1,
-  kISTInputDMAInterruptSource   = 2,
-  kISTPropertyMemberCount       = 3
-};
-
-typedef InterruptSetMember              ISTProperty[3];
-#define kISTPropertyName    "driver-ist" 
-
-typedef long                            InterruptReturnValue;
-enum {
-  kFirstMemberNumber            = 1,
-  kIsrIsComplete                = 0,
-  kIsrIsNotComplete             = -1,
-  kMemberNumberParent           = -2
-};
-
-typedef Boolean                         InterruptSourceState;
-enum {
-  kSourceWasEnabled             = true,
-  kSourceWasDisabled            = false
-};
-
-typedef InterruptMemberNumber   (*InterruptHandler) (InterruptSetMember ISTmember, void *refCon, UInt32 theIntCount);
-typedef void                    (*InterruptEnabler) (InterruptSetMember ISTmember, void *refCon);
-typedef InterruptSourceState    (*InterruptDisabler)(InterruptSetMember ISTmember, void *refCon);
-
-enum {
-  kReturnToParentWhenComplete   = 0x00000001,
-  kReturnToParentWhenNotComplete = 0x00000002
-};
-
-typedef OptionBits      InterruptSetOptions;
-
-
-OSStatus GetInterruptFunctions(
-  InterruptSetID          setID,
-  InterruptMemberNumber   member,
-  void **                 refCon,
-  InterruptHandler *      handlerFunction,
-  InterruptEnabler *      enableFunction,
-  InterruptDisabler *     disableFunction);
-
-OSStatus InstallInterruptFunctions(
-  InterruptSetID          setID,
-  InterruptMemberNumber   member,
-  void *                  refCon,
-  InterruptHandler        handlerFunction,
-  InterruptEnabler        enableFunction,
-  InterruptDisabler       disableFunction);
-
-OSStatus CreateInterruptSet(
-  InterruptSetID          parentSet,
-  InterruptMemberNumber   parentMember,
-  InterruptMemberNumber   setSize,
-  InterruptSetID *        setID,
-  InterruptSetOptions     options);
-
-OSStatus DeleteInterruptSet( InterruptSetID setID );
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __IONDRVLIBRARIES__ */
-
diff --git a/i386/include/IOKit/ndrvsupport/IONDRVSupport.h b/i386/include/IOKit/ndrvsupport/IONDRVSupport.h
deleted file mode 100644
index 2fdfcb6..0000000
--- a/i386/include/IOKit/ndrvsupport/IONDRVSupport.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __IONDRVSUPPORT__
-#define __IONDRVSUPPORT__
-
-#include <libkern/OSTypes.h>
-
-#ifndef __LP64__
-#pragma options align=mac68k
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define kIONDRVIgnoreKey        "AAPL,iokit-ignore-ndrv"
-#define kIONDRVForXKey          "AAPL,iokit-ndrv"
-
-struct IOTVector {
-    void *      pc;
-    UInt32      toc;
-};
-typedef struct IOTVector IOTVector;
-
-struct IONDRVInterruptSetMember {
-        void *          setID;
-        UInt32          member;
-};
-typedef struct IONDRVInterruptSetMember IONDRVInterruptSetMember;
-
-typedef SInt32  (*IONDRVInterruptHandler)( IONDRVInterruptSetMember setMember, void *refCon, UInt32 theIntCount);
-typedef void    (*IONDRVInterruptEnabler)( IONDRVInterruptSetMember setMember, void *refCon);
-typedef Boolean (*IONDRVInterruptDisabler)( IONDRVInterruptSetMember setMember, void *refCon);
-
-enum {
-    kIONDRVFirstMemberNumber                    = 1,
-    kIONDRVIsrIsComplete                        = 0,
-    kIONDRVIsrIsNotComplete                     = -1,
-    kIONDRVMemberNumberParent                   = -2
-};
-
-enum {
-    kIONDRVReturnToParentWhenComplete           = 0x00000001,
-    kIONDRVReturnToParentWhenNotComplete        = 0x00000002
-};
-
-enum {
-    kIONDRVISTChipInterruptSource               = 0,
-    kIONDRVISTOutputDMAInterruptSource          = 1,
-    kIONDRVISTInputDMAInterruptSource           = 2,
-    kIONDRVISTPropertyMemberCount               = 3
-};
-
-#define kIONDRVISTPropertyName  "driver-ist" 
-
-IOReturn
-IONDRVInstallInterruptFunctions(void *  setID,
-                                UInt32  member,
-                                void *  refCon,
-                                IOTVector * handler,
-                                IOTVector * enabler,
-                                IOTVector * disabler );
-
-typedef const IOTVector * (*IONDRVUndefinedSymbolHandler)( void * self, 
-                            const char * libraryName, const char * symbolName );
-
-#ifndef __LP64__
-#pragma options align=reset
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __IONDRVSUPPORT__ */
diff --git a/i386/include/IOKit/network/IOBasicOutputQueue.h b/i386/include/IOKit/network/IOBasicOutputQueue.h
deleted file mode 100644
index 3519805..0000000
--- a/i386/include/IOKit/network/IOBasicOutputQueue.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOBASICOUTPUTQUEUE_H
-#define _IOBASICOUTPUTQUEUE_H
-
-#include <IOKit/IOLocks.h>
-#include <IOKit/network/IOOutputQueue.h>
-#include <IOKit/network/IOPacketQueue.h>  // FIXME - remove
-
-struct IOMbufQueue;
-
-/*! @class IOBasicOutputQueue
-    @abstract A concrete implementation of an IOOutputQueue. 
-    @discussion This object uses a spinlock to protect the packet queue from multiple producers.
-    A single producer is promoted to become a consumer when the queue is
-    not active. Otherwise, the producer will simply queue the packet and
-    return without blocking.
-
-    The flow of packets from the queue to its target can be controlled
-    by calling methods such as start(), stop(), or service(). The target
-    is expected to call those methods from a single threaded context,
-    i.e. the work loop context in a network driver. In addition, the
-    target must also return a status for every packet delivered by the
-    consumer thread. This return value is the only mechanism that the
-    target can use to manage the queue when it is running on the
-    consumer thread. 
-*/
-
-class IOBasicOutputQueue : public IOOutputQueue
-{
-    OSDeclareDefaultStructors( IOBasicOutputQueue )
-
-private:
-	static IOReturn dispatchNetworkDataNotification(void *          target,
-                                                    void *          param,
-                                                    IONetworkData * data,
-                                                    UInt32          type);
-
-    void dequeue();
-    
-protected:
-    OSObject *            _target;
-    IOOutputAction        _action;
-    IOOutputQueueStats *  _stats;
-    IONetworkData *       _statsData;
-	IOSimpleLock *        _spinlock;
-    IOMbufQueue *         _inQueue;
-    IOMbufQueue *         _queues[2];
-    volatile bool         _waitDequeueDone;
-    volatile UInt32       _state;
-    volatile UInt32       _serviceCount;
-
-/*! @function serviceThread
-    @abstract Provides an implementation for the serviceThread() method
-    defined in IOOutputQueue.
-    @discussion This method is called by the scheduled service thread when it
-    starts to run. The service thread is scheduled by service()
-    to restart a stalled queue when the kServiceAsync option is given.
-    @param param A parameter that was given to scheduleServiceThread().
-    This parameter is not used. 
-*/
-
-    virtual void serviceThread(void * param);
-
-/*! @function output
-    @abstract Transfers all packets in the mbuf queue to the target.
-    @param queue A queue of output packets.
-    @param state Returns a state bit defined by IOBasicOutputQueue that
-    declares the new state of the queue following this method call.
-    A kStateStalled is returned if the queue should stall, otherwise 0
-    is returned. 
-*/
-
-    virtual void output(IOMbufQueue * queue, UInt32 * state);
-
-/*! @function free
-    @abstract Frees the IOBasicOutputQueue object.
-    @discussion This function releases allocated resources, then call super::free(). 
-*/
-
-    virtual void free();
-
-/*! @function handleNetworkDataAccess
-    @abstract Handles an external access to the IONetworkData object
-    returned by getStatisticsData().
-    @param data The IONetworkData object being accessed.
-    @param type Description of the type of access being performed.
-    @param param An optional parameter for the handler.
-    @result Returns kIOReturnSuccess on success, or an error code otherwise.
-*/
-
-    virtual IOReturn handleNetworkDataAccess(IONetworkData * data,
-                                             UInt32          type,
-                                             void *          param);
-
-public:
-
-/*! @function init
-    @abstract Initializes an IOBasicOutputQueue object.
-    @param target The object that will handle packets removed from the
-    queue, which is usually a subclass of IONetworkController.
-    @param action The function that will handle packets removed from the
-    queue.
-    @param capacity The initial capacity of the output queue.
-    @result Returns true if initialized successfully, false otherwise. 
-*/
-
-    virtual bool init(OSObject *     target,
-                      IOOutputAction action,
-                      UInt32         capacity = 0);
-
-/*! @function withTarget
-    @abstract Factory method that constructs and initializes an
-    IOBasicOutputQueue object.
-    @param target An IONetworkController object that will handle packets
-    removed from the queue.
-    @param capacity The initial capacity of the output queue.
-    @result Returns an IOBasicOutputQueue object on success, or 0 otherwise. 
-*/
-
-    static IOBasicOutputQueue * withTarget(IONetworkController * target,
-                                           UInt32                capacity = 0);
-
-/*! @function withTarget
-    @abstract Factory method that constructs and initializes an
-    IOBasicOutputQueue object.
-    @param target The object that will handle packets removed from the
-    queue.
-    @param action The function that will handle packets removed from the
-    queue.
-    @param capacity The initial capacity of the output queue.
-    @result Returns an IOBasicOutputQueue object on success, or 0 otherwise. 
-*/
-
-    static IOBasicOutputQueue * withTarget(OSObject *     target,
-                                           IOOutputAction action,
-                                           UInt32         capacity = 0);
-
-/*! @function enqueue
-    @abstract Adds a packet, or a chain of packets,
-    to the queue.
-    @discussion This method is called by a client to add a packet, or a chain of packets,
-    to the queue.  A packet is described by an mbuf chain, while a chain
-    of packets is constructed by linking multiple mbuf chains via the
-    m_nextpkt field. This method can be called by multiple client
-    threads.
-    @param m A single packet, or a chain of packets.
-    @param param A parameter provided by the caller.
-    @result Always returns 0. 
-*/
-
-    virtual UInt32 enqueue(mbuf_t m, void * param);
-
-/*! @function start
-    @abstract Starts up the packet flow between the queue and its target.
-    @discussion Called by the target to start the queue. This will allow
-    packets to be removed from the queue, and then delivered to the target.
-    @result Returns true if the queue was started successfully, false otherwise. */
-
-    virtual bool start();
-
-/*! @function stop
-    @abstract Stops the packet flow between the queue and its target.
-    @discussion This method stops the queue and prevents it from sending packets to its
-    target. This call is synchronous and it may block. After this method
-    returns, the queue will no longer call the registered target/action,
-    even as new packets are added to the queue. The queue will continue to
-    absorb new packets until the size of the queue reaches its capacity.
-    The registered action must never call stop(), or a deadlock will occur.
-    @result Returns the previous running state of the queue,
-    true if the queue was running, false if the queue was already stopped. 
-*/
-
-    virtual bool stop();
-
-/*! @enum ServiceAsync
-    @abstract The option bits recognized by service().
-    @constant kServiceAsync Set this option to service the queue in
-    an asynchronous manner. The service() call will not block, but a
-    scheduling latency will be introduced before the queue is serviced. 
-*/
-
-    enum {
-        kServiceAsync = 0x1
-    };
-
-/*! @function service
-    @abstract Services a queue that was stalled by the target.
-    @discussion A target that stalls the queue must call service() when
-    it becomes ready to accept more packets. Calling this method when the
-    queue is not stalled is harmless.
-    @result Returns true if the queue was stalled and there were packets sitting in
-    the queue awaiting delivery, false otherwise. 
-*/
-
-    virtual bool service(IOOptionBits options = 0);
-
-/*! @function flush
-    @abstract Drops and frees all packets currently held by the queue.
-    @discussion To ensure that all packets are removed from the queue,
-    stop() should be called prior to flush(), to make sure there are
-    no packets in-flight and being delivered to the target.
-    @result Returns the number of packets that were dropped and freed. 
-*/
-
-    virtual UInt32 flush();
-
-/*! @function setCapacity
-    @abstract Changes the number of packets that the queue can hold
-    before it begins to drop excess packets.
-    @param capacity The new desired capacity.
-    @result Returns true if the new capacity was accepted, false otherwise. 
-*/
-
-    virtual bool setCapacity(UInt32 capacity);
-
-/*! @function getCapacity
-    @abstract Gets the number of packets that the queue can hold.
-    @discussion The queue will begin to drop incoming packets when the
-    size of the queue reaches its capacity.
-    @result Returns the current queue capacity. 
-*/
-
-    virtual UInt32 getCapacity() const;
-
-/*! @function getSize
-    @abstract Gets the number of packets currently held in the queue.
-    @result Returns the size of the queue. 
-*/
-
-    virtual UInt32 getSize() const;
-
-/*! @function getDropCount
-    @abstract Gets the number of packets dropped by the queue.
-    @result Returns the number of packets dropped due to over-capacity, or by
-    external calls to the flush() method. 
-*/
-
-    virtual UInt32 getDropCount();
-
-/*! @function getOutputCount
-    @abstract Gets the number of packets accepted by the target.
-    @result Returns the number of times that kIOOutputStatusAccepted is returned by
-    the target. 
-*/
-
-    virtual UInt32 getOutputCount();
-
-/*! @function getRetryCount
-    @abstract Gets the number of instances when the target has refused to
-    accept the packet provided.
-    @result Returns the number of times that kIOOutputStatusRetry is returned by the
-    target. 
-*/
-
-    virtual UInt32 getRetryCount();
-
-/*! @function getStallCount
-    @abstract Gets the number of instances when the target has stalled the
-    queue.
-    @result Returns the number of times that kIOOutputCommandStall is returned by the
-    target. 
-*/
-
-    virtual UInt32 getStallCount();
-
-/*! @enum GetStateBits
-    @abstract The bits in the value returned by getState().
-    @constant kStateRunning Set when the queue is running. Calling start()
-    and stop() will set or clear this bit.
-    @constant kStateStalled Set when the queue is stalled by the target.
-    @constant kStateActive  Set when a consumer thread is actively removing
-    packets from the queue and passing them to the target. 
-*/
-
-    enum {
-        kStateRunning            = 0x1,
-        kStateOutputStalled      = 0x2,
-        kStateOutputActive       = 0x4,
-        kStateOutputServiceMask  = 0xff00
-    };
-
-/*! @function getState
-    @abstract Gets the state of the queue object.
-    @result Returns the current state of the queue object. 
-*/ 
-
-    virtual UInt32 getState() const;
-
-/*! @function getStatisticsData
-    @abstract Returns an IONetworkData object containing statistics counters
-    updated by the queue.
-    @result Returns an IONetworkData object. 
-*/
-
-	virtual IONetworkData * getStatisticsData() const;
-};
-
-#endif /* !_IOBASICOUTPUTQUEUE_H */
diff --git a/i386/include/IOKit/network/IOEthernetController.h b/i386/include/IOKit/network/IOEthernetController.h
deleted file mode 100644
index c2f85e7..0000000
--- a/i386/include/IOKit/network/IOEthernetController.h
+++ /dev/null
@@ -1,502 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOETHERNETCONTROLLER_H
-#define _IOETHERNETCONTROLLER_H
-
-#include <IOKit/network/IONetworkController.h>
-
-/*! @defined kIOEthernetControllerClass
-    @abstract kIOEthernetControllerClass is the name of the
-        IOEthernetController class. */
-
-#define kIOEthernetControllerClass        "IOEthernetController"
-
-/*! @defined kIOEthernetAddressSize
-    @abstract The number of bytes in an Ethernet hardware address. */
-
-#define kIOEthernetAddressSize            6
-
-/*! @defined kIOEthernetMaxPacketSize
-    @abstract The maximum size of an Ethernet packet, including
-        the FCS bytes. */
-
-#define kIOEthernetMaxPacketSize          1518
-
-/*! @defined kIOEthernetMinPacketSize
-    @abstract The minimum size of an Ethernet packet, including
-        the FCS bytes. */
-
-#define kIOEthernetMinPacketSize          64
-
-/*! @defined kIOEthernetCRCSize
-    @abstract The size in bytes of the 32-bit CRC value appended
-        to the end of each Ethernet frame. */
-
-#define kIOEthernetCRCSize                4
-
-/*! @defined kIOEthernetWakeOnLANFilterGroup
-    @abstract kIOEthernetWakeOnLANFilterGroup describes the name assigned
-        to the Ethernet Wake-On-LAN filter group. This group represents
-        wake filters that are supported by the controller. */
-
-#define kIOEthernetWakeOnLANFilterGroup   "IOEthernetWakeOnLANFilterGroup"
-
-/*! @defined kIOEthernetDisabledWakeOnLANFilterGroup
-    @abstract kIOEthernetDisabledWakeOnLANFilterGroup describes the name
-        assigned to the disabled Ethernet Wake-On-LAN filter group. This
-        group represents wake filters that are currently disabled.
-        Membership in this group is dynamic. */
-
-#define kIOEthernetDisabledWakeOnLANFilterGroup \
-        "IOEthernetDisabledWakeOnLANFilterGroup"
-
-/*! @enum WakeOnLANFilters.
-    @abstract All filters in the Wake-on-LAN filter group.
-    @discussion Each filter listed will respond to a network event that
-        will trigger a system wake-up.
-    @constant kIOEthernetWakeOnMagicPacket Reception of a Magic Packet.
-    @constant kIOEthernetWakeOnPacketAddressMatch Reception of a packet
-    which passes through any of the address filtering mechanisms based
-    on its destination Ethernet address. This may include unicast,
-    broadcast, or multicast addresses depending on the current state
-    and setting of the corresponding packet filters. */
-
-enum {
-    kIOEthernetWakeOnMagicPacket         = 0x00000001,
-    kIOEthernetWakeOnPacketAddressMatch  = 0x00000002
-};
-
-/*
- * Kernel
- */
-#if defined(KERNEL) && defined(__cplusplus)
-
-struct IOEthernetAddress {
-	UInt8 bytes[kIOEthernetAddressSize];
-};
-
-/*! @const gIOEthernetWakeOnLANFilterGroup
-    @discussion gIOEthernetWakeOnLANFilterGroup is an OSSymbol object
-    that contains the name of the Ethernet Wake-on-LAN filter group
-    defined by kIOEthernetWakeOnLANFilterGroup. */
-
-extern const OSSymbol * gIOEthernetWakeOnLANFilterGroup;
-
-/*! @const gIOEthernetDisabledWakeOnLANFilterGroup
-    @discussion gIOEthernetDisabledWakeOnLANFilterGroup is an OSSymbol object
-    that contains the name of the disabled Ethernet Wake-on-LAN filter group
-    defined by kIOEthernetDisabledWakeOnLANFilterGroup. */
-
-extern const OSSymbol * gIOEthernetDisabledWakeOnLANFilterGroup;
-
-/*! @class IOEthernetController
-    @abstract Abstract superclass for Ethernet controllers. 
-    @discussion Ethernet controller drivers should subclass IOEthernetController, and implement
-    or override the hardware specific methods to create an Ethernet driver.
-    An interface object (an IOEthernetInterface instance) must be
-    instantiated by the driver, through attachInterface(), to connect
-    the controller driver to the data link layer. 
-*/
-
-class IOEthernetController : public IONetworkController
-{
-    OSDeclareAbstractStructors( IOEthernetController )
-
-protected:
-    struct ExpansionData { };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *  _reserved;
-
-
-public:
-
-/*! @function initialize
-    @abstract IOEthernetController class initializer.
-    @discussion Creates global OSSymbol objects that are used as keys. */
-
-    static void initialize();
-
-/*! @function init
-    @abstract Initializes an IOEthernetController object.
-    @param properties A dictionary object containing a property table
-        associated with this instance.
-    @result Returns true on success, false otherwise. 
-*/ 
-
-    virtual bool init(OSDictionary * properties);
-
-/*! @function getPacketFilters
-    @abstract Gets the set of packet filters supported by the Ethernet 
-    controller in the given filter group.
-    @discussion The default implementation of the abstract method inherited
-    from IONetworkController. When the filter group specified is
-    gIONetworkFilterGroup, then this method will return a value formed by
-    a bitwise OR of kIOPacketFilterUnicast, kIOPacketFilterBroadcast,
-    kIOPacketFilterMulticast, kIOPacketFilterPromiscuous. Otherwise, the 
-    return value will be set to zero (0). Subclasses must override this
-    method if their filtering capability differs from what is reported by
-    this default implementation. This method is called from the workloop
-    context, and the result is published to the I/O Kit Registry.
-    @param group The name of the filter group.
-    @param filters Pointer to the mask of supported filters returned by
-    	this method.
-    @result Returns kIOReturnSuccess. Drivers that override this
-    method must return kIOReturnSuccess to indicate success, or an error 
-    return code otherwise. 
-*/
-
-    virtual IOReturn getPacketFilters(const OSSymbol * group,
-                                      UInt32 *         filters) const;
-
-/*! @function enablePacketFilter
-    @abstract Enables one of the supported packet filters from the
-    given filter group.
-    @discussion The default implementation of the abstract method inherited
-    from IONetworkController. This method will call setMulticastMode() or
-    setPromiscuousMode() when the multicast or the promiscuous filter is to be
-    enabled. Requests to disable the Unicast or Broadcast filters are handled
-    silently, without informing the subclass. Subclasses can override this
-    method to change this default behavior, or to extend it to handle
-    additional filter types or filter groups. This method call is synchronized
-    by the workloop's gate.
-    @param group The name of the filter group containing the filter to be
-    enabled.
-    @param aFilter The filter to enable.
-    @param enabledFilters All filters currently enabled by the client.
-    @param options Optional flags for the enable request.
-    @result Returns the value returned by setMulticastMode() or setPromiscuousMode() if
-    either of those two methods are called. Returns kIOReturnSuccess if the filter
-    specified is kIOPacketFilterUnicast or kIOPacketFilterBroadcast.
-    Returns kIOReturnUnsupported if the filter group specified is not
-    gIONetworkFilterGroup. 
-*/
-
-    virtual IOReturn enablePacketFilter(const OSSymbol * group,
-                                        UInt32           aFilter,
-                                        UInt32           enabledFilters,
-                                        IOOptionBits     options = 0);
-
-/*! @function disablePacketFilter
-    @abstract Disables a packet filter that is currently enabled from the
-    given filter group.
-    @discussion The default implementation of the abstract method inherited
-    from IONetworkController. This method will call setMulticastMode() or
-    setPromiscuousMode() when the multicast or the promiscuous filter is to be
-    disabled. Requests to disable the Unicast or Broadcast filters are handled
-    silently, without informing the subclass. Subclasses can override this
-    method to change this default behavior, or to extend it to handle
-    additional filter types or filter groups. This method call is synchronized
-    by the workloop's gate.
-    @param group The name of the filter group containing the filter to be
-    disabled.
-    @param aFilter The filter to disable.
-    @param enabledFilters All filters currently enabled by the client.
-    @param options Optional flags for the disable request.
-    @result Returns the value returned by setMulticastMode() or setPromiscuousMode() if
-    either of those two methods are called. Returns kIOReturnSuccess if the filter
-    specified is kIOPacketFilterUnicast or kIOPacketFilterBroadcast.
-    Returns kIOReturnUnsupported if the filter group specified is not
-    gIONetworkFilterGroup. 
-*/
-
-    virtual IOReturn disablePacketFilter(const OSSymbol * group,
-                                         UInt32           aFilter,
-                                         UInt32           enabledFilters,
-                                         IOOptionBits     options = 0);
-
-/*! @function getHardwareAddress
-    @abstract Gets the Ethernet controller's station address.
-    @discussion The default implementation of the abstract method inherited
-    from IONetworkController. This method will call the overloaded form
-    IOEthernetController::getHardwareAddress() that subclasses are expected
-    to override.
-    @param addr The buffer where the controller's hardware address should
-           be written.
-    @param inOutAddrBytes The size of the address buffer provided by the
-           client, and replaced by this method with the actual size of
-           the hardware address in bytes.
-    @result Returns kIOReturnSuccess on success, or an error otherwise. 
-*/
-
-    virtual IOReturn getHardwareAddress(void *   addr,
-                                        UInt32 * inOutAddrBytes);
-
-/*! @function setHardwareAddress
-    @abstract Sets or changes the station address used by the Ethernet
-    controller.
-    @discussion The default implementation of the abstract method inherited
-    from IONetworkController. This method will call the overloaded form
-    IOEthernetController::setHardwareAddress() that subclasses are expected
-    to override.
-    @param addr The buffer containing the hardware address provided by
-    the client.
-    @param addrBytes The size of the address buffer provided by the
-    client in bytes.
-    @result Returns kIOReturnSuccess on success, or an error otherwise. 
-*/
-
-    virtual IOReturn setHardwareAddress(const void * addr,
-                                        UInt32       addrBytes);
-
-/*! @function getMaxPacketSize
-    @abstract Gets the maximum packet size supported by the Ethernet
-        controller, including the frame header and FCS.
-    @param maxSize Pointer to the return value.
-    @result Returns kIOReturnSuccess on success, or an error code otherwise. 
-*/
-
-    virtual IOReturn getMaxPacketSize(UInt32 * maxSize) const;
-
-/*! @function getMinPacketSize
-    @abstract Gets the minimum packet size supported by the Ethernet
-        controller, including the frame header and FCS.
-    @param minSize Pointer to the return value.
-    @result Returns kIOReturnSuccess on success, or an error code otherwise. 
-*/
-
-    virtual IOReturn getMinPacketSize(UInt32 * minSize) const;
-
-/*! @function getPacketFilters
-    @abstract Gets the set of packet filters supported by the Ethernet 
-    controller in the network filter group.
-    @param filters Pointer to the return value containing a mask of
-    supported filters.
-    @result Returns kIOReturnSuccess. Drivers that override this
-    method must return kIOReturnSuccess to indicate success, or an error 
-    return code otherwise. 
-*/
-
-    virtual IOReturn getPacketFilters(UInt32 * filters) const;
-
-/*! @function getHardwareAddress
-    @abstract Gets the Ethernet controller's permanent station address.
-    @discussion Ethernet drivers must implement this method, by reading the
-    address from hardware and writing it to the buffer provided. This method
-    is called from the workloop context.
-    @param addrP Pointer to an IOEthernetAddress where the hardware address
-    should be returned.
-    @result Returns kIOReturnSuccess on success, or an error return code otherwise. 
-*/
-
-    virtual IOReturn getHardwareAddress(IOEthernetAddress * addrP) = 0;
-
-/*! @function setHardwareAddress
-    @abstract Sets or changes the station address used by the Ethernet
-        controller.
-    @discussion This method is called in response to a client command to
-    change the station address used by the Ethernet controller. Implementation
-    of this method is optional. This method is called from the workloop context.
-    @param addrP Pointer to an IOEthernetAddress containing the new station
-    address.
-    @result The default implementation will always return kIOReturnUnsupported.
-    If overridden, drivers must return kIOReturnSuccess on success, or an error
-    return code otherwise. 
-*/
-
-    virtual IOReturn setHardwareAddress(const IOEthernetAddress * addrP);
-
-/*! @function setMulticastMode
-    @abstract Enables or disables multicast mode.
-    @discussion Called by enablePacketFilter() or disablePacketFilter()
-    when there is a change in the activation state of the multicast filter
-    identified by kIOPacketFilterMulticast. This method is called from the
-    workloop context.
-    @param active True to enable multicast mode, false to disable it.
-    @result Returns kIOReturnUnsupported. If overridden, drivers must return
-    kIOReturnSuccess on success, or an error return code otherwise. 
-*/
-
-    virtual IOReturn setMulticastMode(bool active);
-
-/*! @function setMulticastList
-    @abstract Sets the list of multicast addresses a multicast filter
-    should use to match against the destination address of an incoming frame.
-    @discussion This method sets the list of multicast addresses that the multicast filter
-    should use to match against the destination address of an incoming frame.
-    The frame should be accepted when a match occurs.  Called when the multicast group membership of an interface
-    object is changed. Drivers that support kIOPacketFilterMulticast should
-    override this method and update the hardware multicast filter using the
-    list of Ethernet addresses provided. Perfect multicast filtering is
-    preferred if supported by the hardware, in order to reduce the number of
-    unwanted packets received. If the number of multicast addresses in the
-    list exceeds what the hardware is capable of supporting, or if perfect
-    filtering is not supported, then ideally the hardware should be programmed
-    to perform imperfect filtering, through some form of hash filtering
-    mechanism. Only as a last resort should the driver enable reception of
-    all multicast packets to satisfy this request. This method is called
-    from the workloop context, and only if the driver reports
-    kIOPacketFilterMulticast support in getPacketFilters().
-    @param addrs An array of Ethernet addresses. This argument must be
-        ignored if the count argument is 0.
-    @param count The number of Ethernet addresses in the list. This value
-        will be zero when the list becomes empty.
-    @result Returns kIOReturnUnsupported. Drivers must return kIOReturnSuccess to
-    indicate success, or an error return code otherwise. 
-*/
-
-    virtual IOReturn setMulticastList(IOEthernetAddress * addrs, 
-                                      UInt32              count);
-
-/*! @function setPromiscuousMode
-    @abstract Enables or disables promiscuous mode.
-    @discussion Called by enablePacketFilter() or disablePacketFilter()
-    when there is a change in the activation state of the promiscuous
-    filter identified by kIOPacketFilterPromiscuous. This method is 
-    called from the workloop context.
-    @param active True to enable promiscuous mode, false to disable it.
-    @result Returns kIOReturnUnsupported. If overridden, drivers must return
-    kIOReturnSuccess on success, or an error return code otherwise. 
-*/
-
-    virtual IOReturn setPromiscuousMode(bool active);
-
-/*! @function setWakeOnMagicPacket
-    @abstract Enables or disables the wake on Magic Packet support.
-    @discussion Called by enablePacketFilter() or disablePacketFilter()
-    when there is a change in the activation state of the Wake-on-LAN
-    filter identified by kIOEthernetWakeOnMagicPacket. This method is
-    called from the workloop context.
-    @param active True to enable support for system wake on reception
-    of a Magic Packet, false to disable it.
-    @result Returns kIOReturnUnsupported. If overridden, drivers must return
-    kIOReturnSuccess on success, or an error return code otherwise. 
-*/
-
-    virtual IOReturn setWakeOnMagicPacket(bool active);
-
-protected:
-
-/*! @function createInterface
-    @abstract Creates an IOEthernetInterface object.
-    @discussion This method allocates and returns a new IOEthernetInterface instance.
-    A subclass of IONetworkController must implement this method and return
-    a matching interface object. The implementation in IOEthernetController
-    will return an IOEthernetInterface object. Subclasses of
-    IOEthernetController, such as Ethernet controller drivers, will have
-    little reason to override this implementation.
-    @result Returns a newly allocated and initialized IOEthernetInterface object. 
-*/
-
-    virtual IONetworkInterface * createInterface();
-
-/*! @function free
-    @abstract Frees the IOEthernetController instance. 
-    @discussion This method releases resources, and is
-    then followed by a call to super::free(). */
-
-    virtual void free();
-
-/*! @function publishProperties
-    @abstract Publishes Ethernet controller properties and capabilities.
-    @discussion This method publishes Ethernet controller properties to the property
-    table. For instance, getHardwareAddress() is called to fetch the
-    hardware address, and the address is then published to the property
-    table. This method call is synchronized by the workloop's gate,
-    and must never be called directly by subclasses.
-    @result Returns true if all properties and capabilities were discovered,
-    and published successfully, false otherwise. Returning false will
-    prevent client objects from attaching to the Ethernet controller
-    since a property that a client relies upon may be missing. 
-*/
-
-    virtual bool publishProperties();
-
-	/*! @function getVlanTagDemand
-		@abstract Fetch the demand for hardware vlan tag stuffing
-		for the given packet before it is transmitted on the network.
-		@discussion A network controller that can insert 802.1Q vlan tags for output
-		packets must call this method to obtain vlan tag information that it must
-		insert into the given output packet.
-		@param packet A mbuf containing a packet that may require vlan tag stuffing.
-		@param vlanTag After calling, the low order 16 bits contain the 802.1Q priority and
-		vlan ID tag in host order.  The hi-order 16 bits are currently unused and should be ignored.
-		@result true if vlanTag has been set and should be used.
-		false if no vlan tag stuffing is required for this packet. */
-
-    OSMetaClassDeclareReservedUsed( IOEthernetController,  0);
-	virtual bool getVlanTagDemand(mbuf_t m, UInt32 *vlanTag);
-
-	/*! @function setVlanTag
-		@abstract Encode a received packet with the vlan tag result reported
-		by the hardware.
-		@discussion A network controller that can strip 802.1Q vlan tag information for a
-		received packet should call this method to encode the result on the
-		packet, before passing it up towards the protocol stacks.
-		@param packet A mbuf containing a packet that has had its 802.1q vlan tag stripped by
-		the hardware.
-		@param vlanTag A value in host order that contains the 802.1q vlan tag and priority
-		in the low order 16 bits.  The hi order word is currently unused and should be set to 0. */
-
-	OSMetaClassDeclareReservedUsed( IOEthernetController,  1);
-	virtual void setVlanTag(mbuf_t m, UInt32 vlanTag);
-	
-    // Virtual function padding
-    OSMetaClassDeclareReservedUnused( IOEthernetController,  2);
-    OSMetaClassDeclareReservedUnused( IOEthernetController,  3);
-    OSMetaClassDeclareReservedUnused( IOEthernetController,  4);
-    OSMetaClassDeclareReservedUnused( IOEthernetController,  5);
-    OSMetaClassDeclareReservedUnused( IOEthernetController,  6);
-    OSMetaClassDeclareReservedUnused( IOEthernetController,  7);
-    OSMetaClassDeclareReservedUnused( IOEthernetController,  8);
-    OSMetaClassDeclareReservedUnused( IOEthernetController,  9);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 10);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 11);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 12);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 13);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 14);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 15);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 16);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 17);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 18);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 19);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 20);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 21);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 22);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 23);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 24);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 25);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 26);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 27);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 28);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 29);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 30);
-    OSMetaClassDeclareReservedUnused( IOEthernetController, 31);
-};
-
-/*
- * FIXME: remove this.
- */
-enum {
-    kIOEnetPromiscuousModeOff   = false,
-    kIOEnetPromiscuousModeOn    = true,
-    kIOEnetPromiscuousModeAll   = true,
-    kIOEnetMulticastModeOff     = false,
-    kIOEnetMulticastModeFilter  = true
-};
-typedef bool IOEnetPromiscuousMode;
-typedef bool IOEnetMulticastMode;
-
-#endif /* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* !_IOETHERNETCONTROLLER_H */
diff --git a/i386/include/IOKit/network/IOEthernetInterface.h b/i386/include/IOKit/network/IOEthernetInterface.h
deleted file mode 100644
index 96c7d95..0000000
--- a/i386/include/IOKit/network/IOEthernetInterface.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOETHERNETINTERFACE_H
-#define _IOETHERNETINTERFACE_H
-
-/*! @defined kIOEthernetInterfaceClass
-    @abstract The name of the
-        IOEthernetInterface class. 
-*/
-
-#define kIOEthernetInterfaceClass     "IOEthernetInterface"
-
-/*! @defined kIOActivePacketFilters
-    @abstract A property of IOEthernetInterface objects.
-    @discussion The kIOActivePacketFilters property has an OSDictionary value that describes the current
-        set of packet filters that have been successfully activated. Each
-        entry in the dictionary is a key/value pair consisting of the filter
-        group name, and an OSNumber describing the set of active filters for
-        that group. Entries in this dictionary will mirror those in
-        kIORequiredPacketFilters if the controller has reported success for
-        all filter change requests from the IOEthernetInterface object. 
-*/
-
-#define kIOActivePacketFilters        "IOActivePacketFilters"
-
-/*! @defined kIORequiredPacketFilters
-    @abstract A property of IOEthernetInterface objects.
-    @discussion The kIORequiredPacketFilters property has an OSDictionary value that describes the current
-        set of required packet filters. Each entry in the dictionary is a
-        key/value pair consisting of the filter group name, and an OSNumber
-        describing the set of required filters for that group. 
-*/
-
-#define kIORequiredPacketFilters      "IORequiredPacketFilters"
-
-/*! @defined kIOMulticastAddressList
-    @abstract A property of IOEthernetInterface objects.
-    @discussion The kIOMulticastAddressList property is an OSData object that describes the
-        list of multicast addresses that are being used by the
-        controller to match against the destination address of an
-        incoming frame. 
-*/
-
-#define kIOMulticastAddressList       "IOMulticastAddressList"
-#define kIOMulticastFilterData        kIOMulticastAddressList    
-
-/*
- * Kernel
- */
-#if defined(KERNEL) && defined(__cplusplus)
-
-#include <IOKit/network/IONetworkInterface.h>
-#include <IOKit/network/IOEthernetController.h>
-#include <IOKit/network/IOEthernetStats.h>
-
-/*! @class IOEthernetInterface
-    @abstract The Ethernet interface object. 
-    @discussion An Ethernet controller driver,
-    that is a subclass of IOEthernetController, will instantiate an object
-    of this class when the driver calls the attachInterface() method.
-    This interface object will then vend an Ethernet interface to DLIL,
-    and manage the connection between the controller driver and the upper
-    networking layers. Drivers will seldom need to subclass
-    IOEthernetInterface. 
-*/
-
-class IOEthernetInterface : public IONetworkInterface
-{
-    OSDeclareDefaultStructors( IOEthernetInterface )
-
-private:
-    thread_call_t    _inputEventThreadCall; // inputEvent() thread call
-    UInt32           _mcAddrCount;          // # of multicast addresses
-    bool             _ctrEnabled;           // Is controller enabled?
-    OSDictionary *   _supportedFilters;     // Controller's supported filters
-    OSDictionary *   _requiredFilters;      // The required filters
-    OSDictionary *   _activeFilters;        // Currently active filters    
-    bool             _controllerLostPower;  // true if controller is unusable
-
-    struct ExpansionData { 
-		UInt32      altMTU;                 // track the physical mtu of controller
-		UInt32      publishedFeatureID;     // id for published wake packet
-        uint32_t    supportedWakeFilters;   // bitmask of supported wake filters
-        OSNumber *  disabledWakeFilters;    // OSNumber of disabled wake filters
-	};
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *  _reserved;
-
-
-    IOReturn enableController(IONetworkController * ctr);
-    IOReturn setupMulticastFilter(IONetworkController * ctr);
-
-    UInt32 getFilters(const OSDictionary * dict,
-                      const OSSymbol *     group);
-
-    bool setFilters(OSDictionary *   dict,
-                    const OSSymbol * group,
-                    UInt32           filters);
-                                     
-    IOReturn disableFilter(IONetworkController * ctr,
-                           const OSSymbol *      group,
-                           UInt32                filter,
-                           IOOptionBits          options = 0);
-
-    IOReturn enableFilter(IONetworkController * ctr,
-                          const OSSymbol *      group,
-                          UInt32                filter,
-                          IOOptionBits          options = 0);
-
-    int syncSIOCSIFFLAGS(IONetworkController * ctr);
-    int syncSIOCSIFADDR(IONetworkController * ctr);
-    int syncSIOCADDMULTI(IONetworkController * ctr);
-    int syncSIOCDELMULTI(IONetworkController * ctr);
-    int syncSIOCSIFMTU(IONetworkController * ctr, struct ifreq * ifr, bool);
-    int syncSIOCGIFDEVMTU(IONetworkController * ctr, struct ifreq * ifr);
-    int syncSIOCSIFLLADDR(IONetworkController * ctr, const char * lladdr, int len);
-	void _fixupVlanPacket(mbuf_t, u_int16_t, int);
-    void reportInterfaceWakeFlags(void);
-
-    static void handleEthernetInputEvent(thread_call_param_t param0, thread_call_param_t param1);
-    static int performGatedCommand(void *, void *, void *, void *, void *);
-	static IOReturn enableFilter_Wrapper(
-        IOEthernetInterface *, IONetworkController *, const OSSymbol *, UInt32 , IOOptionBits);
-
-public:
-
-/*! @function init
-    @abstract Initializes an IOEthernetInterface instance.
-    @discussion Instance variables are initialized, and an arpcom
-    structure is allocated.
-    @param controller A network controller object that will service
-    the interface object being initialized.
-    @result Returns true on success, false otherwise. 
-*/
-
-    virtual bool init( IONetworkController * controller );
-
-/*! @function getNamePrefix
-    @abstract Returns a string containing the prefix to use when
-    creating a BSD name for this interface.
-    @discussion The BSD name for each interface object is created by
-    concatenating a string returned by this method, with an unique
-    unit number assigned by IONetworkStack.
-    @result Returns a pointer to a constant C string "en". Therefore, Ethernet
-    interfaces will be registered with BSD as en0, en1, etc. 
-*/
-
-    virtual const char * getNamePrefix() const;
-
-/*! @function setProperties
-    @abstract Handles a request to set Ethernet interface properties from
-    kernel or non-kernel clients. 
-    @discussion For non-kernel clients, the preferred
-    access mechanism is through a user client connection.
-    @param properties An OSDictionary containing a collection of
-    properties.
-    @result Returns kIOReturnUnsupported if the interface did not
-    recognize any of the properties provided. Otherwise, the return
-    code will be kIOReturnSuccess to indicate no errors, or an
-    IOReturn error code to indicate that an error occurred while
-    handling one of the properties. 
-*/
-
-    virtual IOReturn setProperties( OSObject * properties );
-
-protected:
-
-/*! @function free
-    @abstract Frees the IOEthernetInterface instance.
-    @discussion The memory allocated for the arpcom structure is released,
-    followed by a call to super::free(). 
-*/
-
-    virtual void free();
-
-/*! @function performCommand
-    @abstract Handles an ioctl command sent to the Ethernet interface.
-    @discussion This method handles socket ioctl commands sent to the Ethernet
-    interface from DLIL. Commands recognized and processed by this method are
-    SIOCSIFADDR, SIOCSIFFLAGS, SIOCADDMULTI, and SIOCDELMULTI. Other commands
-    are passed to the superclass.
-    @param controller The controller object.
-    @param cmd  The ioctl command code.
-    @param arg0 Command argument 0. Generally a pointer to an ifnet structure
-        associated with the interface.
-    @param arg1 Command argument 1.
-    @result Returns a BSD return value defined in bsd/sys/errno.h. 
-*/
-
-    virtual SInt32 performCommand(IONetworkController * controller,
-                                  unsigned long         cmd,
-                                  void *                arg0,
-                                  void *                arg1);
-
-/*! @function controllerDidOpen
-    @abstract A notification that the interface has opened the network
-    controller.
-    @discussion This method will be called by IONetworkInterface after a
-    network controller has accepted an open from this interface object.
-    IOEthernetInterface will first call the implementation in its
-    superclass, then inspect the controller through properties published
-    in the registry. This method is called with the arbitration lock held.
-    @param controller The controller object that was opened.
-    @result Returns true on success, false otherwise. Returning false will
-    cause the controller to be closed, and any pending client opens to be
-    rejected. 
-*/
-
-    virtual bool controllerDidOpen(IONetworkController * controller);
-
-/*! @function controllerWillClose
-    @abstract A notification that the interface will close the network
-    controller.
-    @discussion This method will simply call super to propagate the method
-    call. This method is called with the arbitration lock held.
-    @param controller The controller that is about to be closed. 
-*/
-
-    virtual void controllerWillClose(IONetworkController * controller);
-
-
-/*! @function controllerWillChangePowerState
-    @abstract Handles a notification that the network controller 
-    servicing this interface object is about to transition to a new power state.
-    @discussion If the controller is about to transition to an unusable state,
-    and it is currently enabled, then the disable() method on the controller is
-    called.
-    @param controller The network controller object.
-    @param flags Flags that describe the capability of the controller in the new
-    power state.
-    @param stateNumber An index to a state in the network controller's
-    power state array that the controller is switching to.
-    @param policyMaker A reference to the network controller's policy-maker,
-    and is also the originator of this notification.
-    @result Always returns kIOReturnSuccess. 
-*/
-
-    virtual IOReturn controllerWillChangePowerState(
-                               IONetworkController * controller,
-                               IOPMPowerFlags        flags,
-                               UInt32                stateNumber,
-                               IOService *           policyMaker);
-
-/*! @function controllerDidChangePowerState
-    @abstract Handles a notification that the network controller servicing
-    this interface object has transitioned to a new power state.
-    @discussion If the controller did transition to a usable state, and it was
-    previously disabled due to a previous power change, then it is re-enabled.
-    @param controller The network controller object.
-    @param flags Flags that describe the capability of the controller in the new
-    power state.
-    @param stateNumber An index to a state in the network controller's
-    power state array that the controller has switched to.
-    @param policyMaker A reference to the network controller's policy-maker,
-    and is also the originator of this notification.
-    @result Always returns kIOReturnSuccess. 
-*/
-
-    virtual IOReturn controllerDidChangePowerState( 
-                               IONetworkController * controller,
-                               IOPMPowerFlags        flags,
-                               UInt32                stateNumber,
-                               IOService *           policyMaker);
-
-public:
-    /* Override IONetworkInterface::willTerminate() */
-
-    virtual bool willTerminate( IOService *  provider,
-                                IOOptionBits options );
-
-    /* Override IONetworkInterface::attachToDataLinkLayer() */
-
-    virtual IOReturn attachToDataLinkLayer( IOOptionBits options,
-                                            void *       parameter );
-
-    /* Override IONetworkInterface::inputEvent() */
-
-    virtual bool inputEvent( UInt32 type, void * data );
-
-protected:
-	virtual void feedPacketInputTap(mbuf_t);
-	virtual void feedPacketOutputTap(mbuf_t);
-	virtual bool initIfnetParams(struct ifnet_init_params *params);
-
-public:
-    // Virtual function padding
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  0);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  1);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  2);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  3);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  4);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  5);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  6);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  7);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  8);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface,  9);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 10);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 11);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 12);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 13);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 14);
-    OSMetaClassDeclareReservedUnused( IOEthernetInterface, 15);
-};
-
-#endif /* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* !_IOETHERNETINTERFACE_H */
diff --git a/i386/include/IOKit/network/IOEthernetStats.h b/i386/include/IOKit/network/IOEthernetStats.h
deleted file mode 100644
index 6125c2d..0000000
--- a/i386/include/IOKit/network/IOEthernetStats.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * IOEthernetStats.h - Ethernet MIB statistics definitions.
- *
- * HISTORY
- */
-
-#ifndef _IOETHERNETSTATS_H
-#define _IOETHERNETSTATS_H
-
-/*! @header IOEthernetStats.h
-    @discussion Ethernet statistics. */
-
-//---------------------------------------------------------------------------
-// Ethernet-like statistics group.
-
-/*! @typedef IODot3StatsEntry
-    @discussion Ethernet MIB statistics structure.
-    @field alignmentErrors            dot3StatsAlignmentErrors.
-    @field fcsErrors                  dot3StatsFCSErrors.
-    @field singleCollisionFrames      dot3StatsSingleCollisionFrames.
-    @field multipleCollisionFrames    dot3StatsMultipleCollisionFrames.
-    @field sqeTestErrors              dot3StatsSQETestErrors.
-    @field deferredTransmissions      dot3StatsDeferredTransmissions.
-    @field lateCollisions             dot3StatsLateCollisions.
-    @field excessiveCollisions        dot3StatsExcessiveCollisions.
-    @field internalMacTransmitErrors  dot3StatsInternalMacTransmitErrors.
-    @field carrierSenseErrors         dot3StatsCarrierSenseErrors.
-    @field frameTooLongs              dot3StatsFrameTooLongs.
-    @field internalMacReceiveErrors   dot3StatsInternalMacReceiveErrors.
-    @field etherChipSet               dot3StatsEtherChipSet.
-    @field missedFrames               dot3StatsMissedFrames (not in RFC1650).
-    */
-
-typedef struct {
-    UInt32 alignmentErrors;
-    UInt32 fcsErrors;
-    UInt32 singleCollisionFrames;
-    UInt32 multipleCollisionFrames;
-    UInt32 sqeTestErrors;
-    UInt32 deferredTransmissions;
-    UInt32 lateCollisions;
-    UInt32 excessiveCollisions;
-    UInt32 internalMacTransmitErrors;
-    UInt32 carrierSenseErrors;
-    UInt32 frameTooLongs;
-    UInt32 internalMacReceiveErrors;
-    UInt32 etherChipSet;
-    UInt32 missedFrames;
-} IODot3StatsEntry;
-
-//---------------------------------------------------------------------------
-// Ethernet-like collision statistics group (optional).
-
-/*! @typedef IODot3CollEntry
-    @discussion Collision statistics structure.
-    @field collFrequencies            dot3StatsCollFrequencies. */
-
-typedef struct {
-    UInt32 collFrequencies[16];
-} IODot3CollEntry;
-
-//---------------------------------------------------------------------------
-// Receiver extra statistics group (not defined by RFC 1650).
-
-/*! @typedef IODot3RxExtraEntry
-    @discussion Extra receiver statistics not defined by RFC1650.
-    @field overruns            receiver overruns.
-    @field watchdogTimeouts    watchdog timer expirations.
-    @field frameTooShorts      runt frames.
-    @field collisionErrors     frames damages by late collision.
-    @field phyErrors           PHY receive errors.
-    @field timeouts            receiver timeouts.
-    @field interrupts          receiver interrupts.
-    @field resets              receiver resets.
-    @field resourceErrors      receiver resource shortages.
-    */
-
-typedef struct {
-    UInt32 overruns;
-    UInt32 watchdogTimeouts;
-    UInt32 frameTooShorts;
-    UInt32 collisionErrors;
-    UInt32 phyErrors;
-    UInt32 timeouts;
-    UInt32 interrupts;
-    UInt32 resets;
-    UInt32 resourceErrors;
-    UInt32 reserved[4];
-} IODot3RxExtraEntry;
-
-//---------------------------------------------------------------------------
-// Transmitter extra statistics group (not defined by RFC 1650).
-
-/*! @typedef IODot3TxExtraEntry
-    @discussion Extra transmitter statistics not defined by RFC1650.
-    @field underruns           transmit underruns.
-    @field jabbers             jabber events.
-    @field phyErrors           PHY transmit errors.
-    @field timeouts            transmitter timeouts.
-    @field interrupts          transmitter interrupts.
-    @field resets              transmitter resets.
-    @field resourceErrors      transmitter resource shortages.
-    */
-
-typedef struct {
-    UInt32 underruns;
-    UInt32 jabbers;
-    UInt32 phyErrors;
-    UInt32 timeouts;
-    UInt32 interrupts;
-    UInt32 resets;
-    UInt32 resourceErrors;
-    UInt32 reserved[4];
-} IODot3TxExtraEntry;
-
-//---------------------------------------------------------------------------
-// Aggregate Ethernet statistics.
-
-/*! @typedef IOEthernetStats
-    @discussion Aggregate Ethernet statistics structure.
-    @field dot3StatsEntry      IODot3StatsEntry statistics group.
-    @field dot3CollEntry       IODot3CollEntry statistics group.
-    @field dot3RxExtraEntry    IODot3RxExtraEntry statistics group.
-    @field dot3TxExtraEntry    IODot3TxExtraEntry statistics group.
-    */
-
-typedef struct {
-    IODot3StatsEntry    dot3StatsEntry;
-    IODot3CollEntry     dot3CollEntry;
-    IODot3RxExtraEntry  dot3RxExtraEntry;
-    IODot3TxExtraEntry  dot3TxExtraEntry;   
-} IOEthernetStats;
-
-/*! @defined kIOEthernetStatsKey
-    @discussion Defines the name of an IONetworkData that contains
-    an IOEthernetStats. */
-
-#define kIOEthernetStatsKey             "IOEthernetStatsKey"
-
-#endif /* !_IOETHERNETSTATS_H */
diff --git a/i386/include/IOKit/network/IOGatedOutputQueue.h b/i386/include/IOKit/network/IOGatedOutputQueue.h
deleted file mode 100644
index 48e9f79..0000000
--- a/i386/include/IOKit/network/IOGatedOutputQueue.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOGATEDOUTPUTQUEUE_H
-#define _IOGATEDOUTPUTQUEUE_H
-
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IOInterruptEventSource.h>
-#include <IOKit/network/IOBasicOutputQueue.h>
-
-/*! @class IOGatedOutputQueue
-    @abstract An extension of an IOBasicOutputQueue. 
-    @discussion An IOCommandGate
-    object is created by this queue and added to a work loop as an
-    event source. All calls to the target by the consumer thread must
-    occur with the gate closed. Therefore, all calls to the target of
-    this type of queue will be serialized with any other thread that
-    runs on the same work loop context. This is useful for network
-    drivers that have a tight hardware coupling between the transmit
-    and receive engines, and a single-threaded hardware access model
-    is desirable. 
-*/
-
-class IOGatedOutputQueue : public IOBasicOutputQueue
-{
-    OSDeclareDefaultStructors( IOGatedOutputQueue )
-
-private:
-    static void gatedOutput(OSObject *           owner,
-                            IOGatedOutputQueue * self,
-                            IOMbufQueue *        queue,
-                            UInt32 *             state);
-
-    static void restartDeferredOutput(OSObject *               owner,
-                                      IOInterruptEventSource * sender,
-                                      int                      count);
-
-protected:
-    IOCommandGate *           _gate;
-    IOInterruptEventSource *  _interruptSrc;
-
-/*! @function output
-    @abstract Transfers all packets in the mbuf queue to the target.
-    @param queue A queue of output packets.
-    @param state Return a state bit defined by IOBasicOutputQueue that
-    declares the new state of the queue following this method call.
-    A kStateStalled is returned if the queue should stall, otherwise 0
-    is returned. 
-*/
-
-    virtual void output(IOMbufQueue * queue, UInt32 * state);
-
-/*! @function free
-    @abstract Frees the IOGatedOutputQueue object.
-    @discussion Release allocated resources, then call super::free(). */
-
-    virtual void free();
-
-/*! @function output
-    @abstract Overrides the method inherited from IOOutputQueue.
-    @result Returns true if a thread was successfully scheduled to service
-    the queue. 
-*/
-
-    virtual bool scheduleServiceThread(void * param);
-
-public:
-
-/*! @function init
-    @abstract Initializes an IOGatedOutputQueue object.
-    @param target The object that will handle packets removed from the
-    queue, and is usually a subclass of IONetworkController.
-    @param action The function that will handle packets removed from the
-    queue.
-    @param workloop A workloop object. An IOCommandGate object is created
-    and added to this workloop as an event source.
-    @param capacity The initial capacity of the output queue.
-    @result Returns true if initialized successfully, false otherwise. 
-*/
-
-    virtual bool init(OSObject *     target,
-                      IOOutputAction action,
-                      IOWorkLoop *   workloop,
-                      UInt32         capacity = 0);
-
-/*! @function withTarget
-    @abstract Factory method that constructs and initializes an
-    IOGatedOutputQueue object.
-    @param target An IONetworkController object that will handle packets
-    removed from the queue.
-    @param workloop A workloop object. An IOCommandGate object is created
-    and added to this workloop as an event source.
-    @param capacity The initial capacity of the output queue.
-    @result Returns an IOGatedOutputQueue object on success, or 0 otherwise. 
-*/
-
-    static IOGatedOutputQueue * withTarget(IONetworkController * target,
-                                           IOWorkLoop *          workloop,
-                                           UInt32                capacity = 0);
-
-/*! @function withTarget
-    @abstract Factory method that constructs and initializes an
-    IOGatedOutputQueue object.
-    @param target The object that will handle packets removed from the
-    queue.
-    @param action The function that will handle packets removed from the
-    queue.
-    @param workloop A workloop object. An IOCommandGate object is created
-    and added to this workloop as an event source.
-    @param capacity The initial capacity of the output queue.
-    @result Returns an IOGatedOutputQueue object on success, or 0 otherwise. 
-*/
-
-    static IOGatedOutputQueue * withTarget(OSObject *     target,
-                                           IOOutputAction action,
-                                           IOWorkLoop *   workloop,
-                                           UInt32         capacity = 0);
-};
-
-#endif /* !_IOGATEDOUTPUTQUEUE_H */
diff --git a/i386/include/IOKit/network/IOKernelDebugger.h b/i386/include/IOKit/network/IOKernelDebugger.h
deleted file mode 100644
index 97fc905..0000000
--- a/i386/include/IOKit/network/IOKernelDebugger.h
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKERNELDEBUGGER_H
-#define _IOKERNELDEBUGGER_H
-
-#include <IOKit/IOService.h>
-
-/*! @typedef IODebuggerRxHandler
-    @discussion Defines the receive handler that must be implemented
-    by the target to service KDP receive requests. This handler is called
-    by kdpReceiveDispatcher().
-    @param target The target object.
-    @param buffer KDP receive buffer. The buffer allocated has room for
-           1518 bytes. The receive handler must not overflow this buffer.
-    @param length The amount of data received and placed into the buffer.
-           Set to 0 if no frame was received during the poll interval.
-    @param timeout The amount of time to poll in milliseconds while waiting
-           for a frame to arrive. */
-
-typedef void (*IODebuggerRxHandler)( IOService * target,
-                                     void *      buffer,
-                                     UInt32 *    length,
-                                     UInt32      timeout );
-
-/*! @typedef IODebuggerTxHandler
-    @discussion Defines the transmit handler that must be implemented
-    by the target to service KDP transmit requests. This handler is called
-    by kdpTransmitDispatcher().
-    @param target The target object.
-    @param buffer KDP transmit buffer. This buffer contains a KDP frame
-           to be sent on the network.
-    @param length The number of bytes in the transmit buffer. */
-
-typedef void (*IODebuggerTxHandler)( IOService * target,
-                                     void *      buffer,
-                                     UInt32      length );
-
-/*! @typedef IODebuggerLockState
-    @discussion Defines flags returned by IOKernelDebugger::lock().
-    @constant kIODebuggerLockTaken Set if the debugger lock was taken. */
-
-typedef enum {
-    kIODebuggerLockTaken = 0x1
-} IODebuggerLockState;
-
-/*! @class IOKernelDebugger
-    @abstract Kernel debugger nub.
-    @discussion This object interfaces with the KDP
-    (kernel debugger protocol) module and dispatches KDP requests to its
-    target (provider). The target, designated as the debugger device, must 
-    implement a pair of handler functions that are called to handle KDP 
-    transmit and receive requests during a debugging session. Only a single
-    IOKernelDebugger in the system can be active at a given time. The
-    active IOKernelDebugger is the one that has an IOKDP object attached
-    as a client.
-
-    The debugger device is usually a subclass of IOEthernetController.
-    However, any IOService can service an IOKernelDebugger client,
-    implement the two polled mode handlers, and transport the KDP
-    packets through a data channel. However, KDP assumes that the
-    debugger device is an Ethernet interface and therefore it will
-    always send, and expect to receive, an Ethernet frame. */
-
-class IOKernelDebugger : public IOService
-{
-    OSDeclareDefaultStructors( IOKernelDebugger )
-
-protected:
-    IOService *             _target;      // target (provider)
-    IODebuggerTxHandler     _txHandler;   // target's transmit handler.
-    IODebuggerRxHandler     _rxHandler;   // target's receive handler.
-    IOService *             _client;      // client that has opened us.
-    bool                    _pmDisabled;  // true if disabled by PM.
-
-    struct ExpansionData {
-        thread_call_t  activationChangeThreadCall;
-        UInt32         stateVars[2];
-		IONotifier  *  interfaceNotifier;
-    };
-
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *         _reserved;
-
-/*! @function kdpReceiveDispatcher
-    @abstract The KDP receive dispatch function.
-    @discussion Field KDP receives requests, then dispatches the call to the
-    registered receiver handler.
-    @param buffer KDP receive buffer. The buffer allocated by KDP has room
-           for 1518 bytes. The receive handler must not overflow this buffer.
-    @param length The amount of data received and placed into the buffer.
-           Set to 0 if a frame was not received during the poll interval.
-    @param timeout The amount of time to poll in milliseconds while waiting
-           for a frame to arrive. 
-*/
-
-    static void kdpReceiveDispatcher(void *   buffer,
-                                     UInt32 * length,
-                                     UInt32   timeout);
-
-/*! @function kdpTransmitDispatcher
-    @abstract The KDP transmit dispatch function.
-    @discussion Field KDP transmit requests, then dispatches the call to the
-    registered transmit handler.
-    @param buffer KDP transmit buffer. This buffer contains a KDP frame to
-           be sent on the network.
-    @param length The number of bytes in the transmit buffer. 
-*/
-
-    static void kdpTransmitDispatcher(void * buffer, UInt32 length);
-
-/*! @function free
-    @abstract Frees the IOKernelDebugger instance. */
-
-    virtual void free();
-
-/*! @function nullTxHandler
-    @abstract Null transmit handler.
-    @discussion This function is registered as the transmit handler when an
-    IOKernelDebugger object surrenders its status as the active debugger nub.
-    Until another IOKernelDebugger object gets promoted, this function will
-    handle polled transmit requests from KDP. This function does nothing
-    useful. 
-*/
-
-    static void nullTxHandler( IOService * target,
-                               void *      buffer,
-                               UInt32      length );
-
-/*! @function nullRxHandler
-    @abstract Null receive handler.
-    @discussion This function is registered as the receive handler when an
-    IOKernelDebugger object surrenders its status as the active debugger nub.
-    Until another IOKernelDebugger object gets promoted, this function will
-    handle polled receive requests from KDP. This function does nothing
-    except to log a warning message. 
-*/
-
-    static void nullRxHandler( IOService * target,
-                               void *      buffer,
-                               UInt32 *    length,
-                               UInt32      timeout );
-
-/*! @function registerHandler
-    @abstract Registers the target and the handler functions.
-    @discussion This method is called by handleOpen() and handleClose()
-    to register or unregister the target and its handler functions.
-    @param target The target object.
-    @param txHandler The transmit handler function. The null handler is
-    registered if the argument is zero.
-    @param rxHandler The receive handler function. The null handler is
-    registered if the argument is zero. 
-*/
-
-    static void registerHandler( IOService *          target,
-                                 IODebuggerTxHandler  txHandler = 0,
-                                 IODebuggerRxHandler  rxHandler = 0 );
-
-/*! @function powerStateWillChangeTo
-    @abstract Handles notification that the network controller will change
-    power state.
-    @discussion If the controller is about to become unusable, then the
-    controller's handlers are unregistered, and the controller is disabled.
-    @param flags Describe the capability of the controller in the new power 
-           state.
-    @param stateNumber The number of the state in the state array that the 
-           controller is switching to.
-    @param policyMaker The policy maker that manages the controller's
-           power state.
-    @result Returns the constant 3000000, to indicate a maximum of 3 seconds for the 
-            preparation to complete, and an acknowledgement delivered to the
-            policy maker. 
-*/
-
-    virtual IOReturn powerStateWillChangeTo( IOPMPowerFlags  flags,
-                                             unsigned long   stateNumber,
-                                             IOService *     policyMaker );
-
-/*! @function powerStateDidChangeTo
-    @abstract Handles notification that the network controller did change
-    power state.
-    @discussion If the controller became usable, then the controller is 
-    re-enabled, and the controller's handlers are re-registered.
-    @param flags Description of the capability of the controller in the new power 
-           state.
-    @param stateNumber The number of the state in the state array that the 
-           controller is switching to.
-    @param policyMaker The policy maker that manages the controller's
-           power state.
-    @result Returns the constant 3000000, to indicate a maximum of 3 seconds for the 
-            preparation to complete, and an acknowledgement delivered to the
-            policy maker. 
-*/
-
-    virtual IOReturn powerStateDidChangeTo( IOPMPowerFlags  flags,
-                                            unsigned long   stateNumber,
-                                            IOService *     policyMaker );
-
-/*! @function handleOpen
-    @abstract Handles a client open.
-    @discussion This method is called by IOService::open() to handle an
-    open from a client (IOKDP) with the arbitration lock held.
-    @param forClient The client (IOKDP) requesting the open.
-    @param options Options passed to the open() call. Not used.
-    @param arg A family defined argument passed to the open() call. Not used.
-    @result Returns true on success, false otherwise. 
-*/
-
-    virtual bool handleOpen( IOService *    forClient,
-                             IOOptionBits   options,
-                             void *         arg );
-
-/*! @function handleClose
-    @abstract Handles a client close.
-    @discussion This method is called by IOService::close() to handle a
-    close from a client with the arbitration lock held.
-    @param forClient The client (IOKDP) requesting the close.
-    @param options Options passed to the close() call. Not used. 
-*/
-
-    virtual void handleClose( IOService *   forClient,
-                              IOOptionBits  options );
-
-/*! @function handleIsOpen
-    @abstract Queries whether a client has an open on this object.
-    @discussion This method is called by IOService::isOpen() with the
-    arbitration lock held.
-    @result Returns true if the specified client, or any client if none (0) is
-    specified, presently has an open on this object. 
-*/
-
-    virtual bool handleIsOpen( const IOService * forClient ) const;
-
-	static bool interfacePublished( void *target, void *param, IOService *service );
-
-public:
-
-/*! @function lock
-    @abstract Takes the debugger lock conditionally.
-    @discussion This method takes the debugger lock if the object given matches the
-    target registered by registerHandler().
-    @param target The target or provider of an IOKernelDebugger object.
-    @result Returns kIODebuggerLockTaken if the lock was taken, or 0 otherwise. 
-*/
-
-    static IODebuggerLockState lock( IOService * target );
-
-/*! @function unlock
-    @abstract Releases the debugger lock.
-    @discussion This method releases the debugger lock if the kIODebuggerLockTaken flag is
-    set in the argument. 
-*/
-
-    static void unlock( IODebuggerLockState state );
-
-/*! @function init
-    @abstract Initializes an IOKernelDebugger instance.
-    @param target The target object that implements the debugger handlers.
-    @param txHandler The target's transmit handler. A pointer to a 'C' function.
-    @param rxHandler The target's receive handler. A pointer to a 'C' function.
-    @result Returns true if the instance initialized successfully, false otherwise. 
-*/
-
-    virtual bool init( IOService *          target,
-                       IODebuggerTxHandler  txHandler,
-                       IODebuggerRxHandler  rxHandler );
-
-/*! @function debugger
-    @abstract Factory method that performs allocation and initialization
-    of an IOKernelDebugger object.
-    @param target The target object that implements the debugger handlers.
-    @param txHandler The target's transmit handler. A pointer to a 'C' function.
-    @param rxHandler The target's receive handler. A pointer to a 'C' function.
-    @result Returns an IOKernelDebugger instance on success, 0 otherwise. 
-*/
-
-    static IOKernelDebugger * debugger( IOService *          target,
-                                        IODebuggerTxHandler  txHandler,
-                                        IODebuggerRxHandler  rxHandler );
-
-    /*
-     * Entry point for generic messages delivered from the provider.
-     */
-
-    virtual IOReturn message( UInt32 type, IOService * provider, void * arg );
-
-/*! @function signalDebugger
-    @abstract Signal the kernel to enter the debugger when safe.
-*/
-    static void signalDebugger(void);
-
-    // Virtual function padding
-    OSMetaClassDeclareReservedUnused( IOKernelDebugger,  0);
-    OSMetaClassDeclareReservedUnused( IOKernelDebugger,  1);
-    OSMetaClassDeclareReservedUnused( IOKernelDebugger,  2);
-    OSMetaClassDeclareReservedUnused( IOKernelDebugger,  3);
-};
-
-// Concise form of the lock()/unlock() static member functions.
-//
-#define IODebuggerLock    IOKernelDebugger::lock
-#define IODebuggerUnlock  IOKernelDebugger::unlock
-
-#endif /* !_IOKERNELDEBUGGER_H */
diff --git a/i386/include/IOKit/network/IOMbufMemoryCursor.h b/i386/include/IOKit/network/IOMbufMemoryCursor.h
deleted file mode 100644
index 4e40173..0000000
--- a/i386/include/IOKit/network/IOMbufMemoryCursor.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_NETWORK_IOMBUFMEMORYCURSOR_H
-#define _IOKIT_NETWORK_IOMBUFMEMORYCURSOR_H
-
-#include <IOKit/IOMemoryCursor.h>
-
-
-/*! @class IOMbufMemoryCursor
-    @abstract A mechanism to convert mbuf chains to physical addresses.
-    @discussion The IOMbufMemoryCursor defines the super class that all
-    specific mbuf cursors must inherit from, but a mbuf cursor can be created   
-    without a specific formal subclass by just providing a segment function to
-    the initializers. This class performs the task of walking a given
-    mbuf chain and creating a physical scatter/gather list appropriate for
-    the target hardware. When necessary, this class may also coalesce
-    mbuf chains when the generated scatter/gather list exceeds the specified 
-    hardware limit. However, this should be avoided since it exacts a 
-    performance cost.
-    <br><br>
-    A driver is expected to create a mbuf cursor and configure it to match the
-    limitations of it's DMA hardware; for instance the mbuf cursor used by
-    an Ethernet controller driver may have a maximum physical segment size
-    of 1520, and allow for up to 6 physical segments. Thus it would create a 
-    mbuf cursor with a maxSegmentSize of 1520 and a maxNumSegments of 6.
-    The driver may choose to supply an OutputSegmentFunc function to
-    format the output of each scatter/gather segment to match the
-    hardware descriptor format, or it may use a subclass of 
-    IOMbufMemoryCursor to generate IOPhysicalSegment segments with 
-    various byte orders.
-    <br><br>
-    A driver may also create more than one mbuf cursor, perhaps one
-    dedicated for the transmit thread, and the other for the receive thread.
-    This becomes a requirement when the driver is multi-threaded, since the 
-    mbuf cursor maintains state and does not support reentrancy. */
-
-class IOMbufMemoryCursor : public IOMemoryCursor
-{
-    OSDeclareDefaultStructors(IOMbufMemoryCursor)
-
-protected:
-    UInt32 maxNumSegments;
-    UInt32 coalesceCount;
-    UInt32 packetTooBigErrors;
-
-    struct ExpansionData { };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-    virtual bool initWithSpecification(OutputSegmentFunc outSeg,
-                                       UInt32 maxSegmentSize,
-                                       UInt32 maxTransferSize,
-                                       UInt32 align);
-
-public:
-/*! @function initWithSpecification
-    @abstract Primary initializer for the IOMbufMemoryCursor class.
-    @param outSeg Function to call to output one physical segment.
-    @param maxSegmentSize Maximum allowable size for one segment.
-    @param maxNumSegments Maximum number of segments.
-    @result Returns true if the inherited classes and this instance initialized
-    successfully.
-*/
-
-    virtual bool initWithSpecification(OutputSegmentFunc outSeg,
-                                       UInt32 maxSegmentSize,
-                                       UInt32 maxNumSegments);
-
-/*! @function genPhysicalSegments
-    @abstract Generates a physical scatter/gather list given a mbuf packet.
-    @discussion Generates a list of physical segments from the given mbuf.
-    @param packet The mbuf packet.
-    @param vector Void pointer to base of output physical scatter/gather list.
-    Always passed directly onto the OutputSegmentFunc without interpretation
-    by the cursor. 
-    @param maxSegs Maximum number of segments that can be written to segments
-    array.
-    @param doCoalesce Set to true to perform coalescing when the required 
-    number of segments exceeds the specified limit, otherwise abort and
-    return 0.
-    @result Returns the number of segments that were filled in, or
-    0 if an error occurred. 
-*/
-
-    virtual UInt32 genPhysicalSegments(mbuf_t packet, void * vector,
-                                       UInt32 maxSegs, bool doCoalesce);
-
-/*! @function getAndResetCoalesceCount
-    @abstract Returns a count of the total number of mbuf chains coalesced
-    by genPhysicalSegments().
-    @discussion This method returns a count of the total number of mbuf chains coalesced
-    by genPhysicalSegments(). The counter is then reset to 0.
-    @result Returns the coalesce count. 
-*/
-
-    UInt32 getAndResetCoalesceCount();
-
-    // Virtual function padding
-    OSMetaClassDeclareReservedUnused( IOMbufMemoryCursor,  0);
-    OSMetaClassDeclareReservedUnused( IOMbufMemoryCursor,  1);
-    OSMetaClassDeclareReservedUnused( IOMbufMemoryCursor,  2);
-    OSMetaClassDeclareReservedUnused( IOMbufMemoryCursor,  3);
-};
-
-
-/*! @class IOMbufNaturalMemoryCursor
-    @abstract An IOMbufMemoryCursor subclass that outputs a vector of
-    IOPhysicalSegments in the natural byte orientation for the cpu.  
-    @discussion The IOMbufNaturalMemoryCursor would be used when it is too
-    difficult to implement an OutputSegmentFunc that is more appropriate for
-    your hardware.  This cursor just outputs an array of IOPhysicalSegments. 
-*/
-
-class IOMbufNaturalMemoryCursor : public IOMbufMemoryCursor
-{
-    OSDeclareDefaultStructors(IOMbufNaturalMemoryCursor)
-
-public:
-
-/*! @function withSpecification
-    @abstract Factory function that creates and initializes an 
-    IOMbufNaturalMemoryCursor in one operation. 
-    @discussion See also IOMbufMemoryCursor::initWithSpecification.
-    @param maxSegmentSize Maximum allowable size for one segment.
-    @param maxNumSegments Maximum number of segments.
-    @result Returns a new mbuf cursor if successfully created and initialized,
-    0 otherwise. 
-*/
-
-    static IOMbufNaturalMemoryCursor * withSpecification(UInt32 maxSegmentSize, 
-                                                         UInt32 maxNumSegments);
-
-/*! @function getPhysicalSegments
-    @abstract Generates a cpu natural physical scatter/gather list from a given
-    mbuf.
-    @param packet The mbuf packet.
-    @param vector Pointer to an array of IOPhysicalSegments for the output 
-    physical scatter/gather list.
-    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
-    @result Returns the number of segments that were filled in, or
-    0 if an error occurred. 
-*/
-
-    UInt32 getPhysicalSegments(mbuf_t packet,
-                               struct IOPhysicalSegment * vector,
-                               UInt32 numVectorSegments = 0);
-
-/*! @function getPhysicalSegmentsWithCoalesce
-    @abstract Generates a cpu natural physical scatter/gather list from a given
-    mbuf.
-    @discussion Generate a cpu natural physical scatter/gather list from a 
-    given mbuf. Coalesce mbuf chain when the number of segments in the 
-    scatter/gather list exceeds numVectorSegments.
-    @param packet The mbuf packet.
-    @param vector Pointer to an array of IOPhysicalSegments for the output 
-    physical scatter/gather list.
-    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
-    @result Returns the number of segments that were filled in, or
-    0 if an error occurred. 
-*/
-
-    UInt32 getPhysicalSegmentsWithCoalesce(mbuf_t packet,
-                                           struct IOPhysicalSegment * vector,
-                                           UInt32 numVectorSegments = 0);
-};
-
-//===========================================================================
-//===========================================================================
-
-/*! @class IOMbufBigMemoryCursor
-    @abstract An IOMbufMemoryCursor subclass that outputs a vector of 
-    IOPhysicalSegments in the big endian byte order.  
-    @discussion The IOMbufBigMemoryCursor would be used when the DMA hardware 
-    requires a big endian address and length pair.  This cursor outputs an 
-    array of IOPhysicalSegments that are encoded in big-endian format. 
-*/
-
-class IOMbufBigMemoryCursor : public IOMbufMemoryCursor
-{
-    OSDeclareDefaultStructors(IOMbufBigMemoryCursor)
-
-public:
-
-/*! @function withSpecification
-    @abstract Factory function that creates and initializes an 
-    IOMbufBigMemoryCursor in one operation.
-    @discussion See also IOMbufMemoryCursor::initWithSpecification.
-    @param maxSegmentSize Maximum allowable size for one segment.
-    @param maxNumSegments Maximum number of segments.
-    @result Returns a new mbuf cursor if successfully created and initialized,
-    0 otherwise. 
-*/
-
-    static IOMbufBigMemoryCursor * withSpecification(UInt32 maxSegmentSize,
-                                                     UInt32 maxNumSegments);
-
-/*! @function getPhysicalSegments
-    @abstract Generates a big endian physical scatter/gather list from a given
-    mbuf.
-    @param packet The mbuf packet.
-    @param vector Pointer to an array of IOPhysicalSegments for the output 
-    physical scatter/gather list.
-    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
-    @result Returns the number of segments that were filled in, or
-    0 if an error occurred. 
-*/
-
-    UInt32 getPhysicalSegments(mbuf_t packet,
-                               struct IOPhysicalSegment * vector,
-                               UInt32 numVectorSegments = 0);
-
-/*! @function getPhysicalSegmentsWithCoalesce
-    @abstract Generates a big endian physical scatter/gather list from a given
-    mbuf.
-    @discussion Generate a big endian physical scatter/gather list from a 
-    given mbuf. Coalesce mbuf chain when the number of segments in the 
-    scatter/gather list exceeds numVectorSegments.
-    @param packet The mbuf packet.
-    @param vector Pointer to an array of IOPhysicalSegments for the output 
-    physical scatter/gather list.
-    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
-    @result Returns the number of segments that were filled in, or
-    0 if an error occurred. 
-*/
-
-    UInt32 getPhysicalSegmentsWithCoalesce(mbuf_t packet,
-                                           struct IOPhysicalSegment * vector,
-                                           UInt32 numVectorSegments = 0);
-};
-
-//===========================================================================
-//===========================================================================
-
-/*! @class IOMbufLittleMemoryCursor
-    @abstract An IOMbufMemoryCursor subclass that outputs a vector of 
-    IOPhysicalSegments in the little endian byte order.  
-    @discussion The IOMbufLittleMemoryCursor would be used when the DMA 
-    hardware requires a little endian address and length pair.  This cursor 
-    outputs an array of IOPhysicalSegments that are encoded in little endian 
-    format. 
-*/
-
-class IOMbufLittleMemoryCursor : public IOMbufMemoryCursor
-{
-    OSDeclareDefaultStructors(IOMbufLittleMemoryCursor)
-
-public:
-
-/*! @function withSpecification
-    @abstract Factory function that creates and initializes an 
-    IOMbufLittleMemoryCursor in one operation.
-    @discussion See also IOMbufMemoryCursor::initWithSpecification.
-    @param maxSegmentSize Maximum allowable size for one segment.
-    @param maxNumSegments Maximum number of segments.
-    @result Returns a new mbuf cursor if successfully created and initialized,
-    0 otherwise. 
-*/
-
-    static IOMbufLittleMemoryCursor * withSpecification(UInt32 maxSegmentSize, 
-                                                        UInt32 maxNumSegments);
-
-/*! @function getPhysicalSegments
-    @abstract Generates a little endian physical scatter/gather list from a 
-    given mbuf.
-    @param packet The mbuf packet.
-    @param vector Pointer to an array of IOPhysicalSegments for the output 
-    physical scatter/gather list.
-    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
-    @result Returns the number of segments that were filled in, or
-    0 if an error occurred. 
-*/
-
-    UInt32 getPhysicalSegments(mbuf_t packet,
-                               struct IOPhysicalSegment * vector,
-                               UInt32 numVectorSegments = 0);
-
-/*! @function getPhysicalSegmentsWithCoalesce
-    @abstract Generates a little endian physical scatter/gather list from a 
-    given mbuf.
-    @discussion Generate a little endian physical scatter/gather list from a 
-    given mbuf. Coalesce mbuf chain when the number of segments in the 
-    scatter/gather list exceeds numVectorSegments.
-    @param packet The mbuf packet.
-    @param vector Pointer to an array of IOPhysicalSegments for the output 
-    physical scatter/gather list.
-    @param numVectorSegments Maximum number of IOPhysicalSegments accepted.
-    @result Returns the number of segments that were filled in, or
-    0 if an error occurred. 
-*/
-
-    UInt32 getPhysicalSegmentsWithCoalesce(mbuf_t packet,
-                                           struct IOPhysicalSegment * vector,
-                                           UInt32 numVectorSegments = 0);
-};
-
-#ifdef __ppc__
-
-struct IODBDMADescriptor;
-
-//===========================================================================
-//===========================================================================
-
-/*! @class IOMbufDBDMAMemoryCursor
-    @abstract An IOMbufMemoryCursor subclass that outputs a vector of 
-    IODBDMADescriptors. 
-*/
-
-class IOMbufDBDMAMemoryCursor : public IOMbufMemoryCursor
-{
-    OSDeclareDefaultStructors(IOMbufDBDMAMemoryCursor)
-
-public:
-
-/*! @function withSpecification
-    @abstract Factory function that creates and initializes an 
-    IOMbufDBDMAMemoryCursor in one operation.
-    @discussion See also IOMbufMemoryCursor::initWithSpecification.
-    @param maxSegmentSize Maximum allowable size for one segment.
-    @param maxNumSegments Maximum number of segments.
-    @result Returns a new mbuf cursor if successfully created and initialized,
-    0 otherwise. 
-*/
-
-    static IOMbufDBDMAMemoryCursor * withSpecification(UInt32 maxSegmentSize, 
-                                                       UInt32 maxNumSegments);
-
-/*! @function getPhysicalSegments
-    @abstract Generates a DBDMA descriptor list from a given mbuf.
-    @param packet The mbuf packet.
-    @param vector Pointer to an array of IODBDMADescriptor for the output list.
-    @param numVectorSegments Maximum number of IODBDMADescriptors accepted.
-    @result Returns the number of segments that were filled in, or
-    0 if an error occurred. 
-*/
-
-    UInt32 getPhysicalSegments(mbuf_t packet,
-                               struct IODBDMADescriptor *vector,
-                               UInt32 numVectorSegments = 0);
-
-/*! @function getPhysicalSegmentsWithCoalesce
-    @abstract Generates a DBDMA descriptor list from a given mbuf.
-    @discussion Generate a DBDMA descriptor list from a given mbuf.
-    Coalesce mbuf chain when the number of elements in the list exceeds
-    numVectorSegments.
-    @param packet The mbuf packet.
-    @param vector Pointer to an array of IODBDMADescriptor for the output list.
-    @param numVectorSegments Maximum number of IODBDMADescriptors accepted.
-    @result Returns the number of segments that were filled in, or
-    0 if an error occurred. 
-*/
-
-    UInt32 getPhysicalSegmentsWithCoalesce(mbuf_t packet,
-                                           struct IODBDMADescriptor * vector,
-                                           UInt32 numVectorSegments = 0);
-};
-
-#endif /* __ppc__ */
-
-#endif /* !_IOKIT_NETWORK_IOMBUFMEMORYCURSOR_H */
-
diff --git a/i386/include/IOKit/network/IONetworkController.h b/i386/include/IOKit/network/IONetworkController.h
deleted file mode 100644
index 05b12d3..0000000
--- a/i386/include/IOKit/network/IONetworkController.h
+++ /dev/null
@@ -1,1452 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IONETWORKCONTROLLER_H
-#define _IONETWORKCONTROLLER_H
-
-/*! @defined kIONetworkControllerClass
-    @abstract The name of the IONetworkController class. */
-
-#define kIONetworkControllerClass   "IONetworkController"
-
-/*! @defined kIOVendor
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOVendor property is a property of IONetworkController objects.  It has an OSString value 	that describes the vendor of the network controller. */
-
-#define kIOVendor                "IOVendor"
-
-/*! @defined kIOModel
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOModel property is a property of IONetworkController objects.  It has an OSString value that 	describes the model of the network controller. */
-
-#define kIOModel                 "IOModel"
-
-/*! @defined kIORevision
-    @abstract A property of IONetworkController objects.
-    @discussion The kIORevision property is a property of IONetworkController objects.  It has an OSString value 	that describes the revision level of the network controller. */
-
-#define kIORevision              "IORevision"
-
-/*! @defined kIOFeatures
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOFeatures property is a property of IONetworkController objects. It has an OSNumber value 	that describes generic features defined by IONetworkController that are supported by the
-        network controller. */
-
-#define kIOFeatures              "IOFeatures"
-
-/*! @defined kIOMediumDictionary
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOMediumDictionary property is a property of IONetworkController
-        objects.  It has an OSDictionary value that is a container for the
-        collection of IONetworkMedium objects that represent the media
-        types supported by the network controller.
-        Each entry in the dictionary is a key/value pair consisting of
-        the medium name, and a dictionary value that contains the
-        properties for that medium entry. */
-
-#define kIOMediumDictionary      "IOMediumDictionary"
-
-/*! @defined kIODefaultMedium
-    @abstract A property of IONetworkController objects.
-    @discussion The kIODefaultMedium property is a property of IONetworkController
-        objects.  It has an OSString value that describes the name of the
-        default medium. This definition may change or disappear in the
-        future. */
-
-#define kIODefaultMedium         "IODefaultMedium"
-
-/*! @defined kIOSelectedMedium
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOSelectedMedium property is a property of IONetworkController
-        objects.  It has an OSSymbol value that describes the name of the
-        current selected medium. This name can be used as a key into the
-        medium dictionary to gather additional information about the
-        selected medium. */
-
-#define kIOSelectedMedium         "IOSelectedMedium"
-
-/*! @defined kIOActiveMedium
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOActiveMedium property is a property of IONetworkController
-        objects.  It has an OSSymbol value that describes the name of the
-        active medium. This is the name of the medium where an active
-        link has been established. This name can be used as a key into
-        the medium dictionary to gather additional information about the
-        active medium. */
-
-#define kIOActiveMedium          "IOActiveMedium"
-
-/*! @defined kIOLinkSpeed
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOLinkSpeed property is a property of IONetworkController
-        objects. It has an OSNumber value that describes the speed of the
-    	link established over the active medium in bits per second. */
-
-#define kIOLinkSpeed             "IOLinkSpeed"
-
-/*! @defined kIOLinkStatus
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOLinkStatus property is a property of IONetworkController
-        objects. It has an OSNumber value that describes the current network
-        link status. See IONetworkMedium for the definition of the link
-        status bits. */
-
-#define kIOLinkStatus            "IOLinkStatus"
-
-/*! @defined kIOLinkData
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOLinkData property is a property of IONetworkController
-        objects. It has an OSData value that contains additional information
-        describing the active link that was established.
-        Its interpretation is not defined. */
-
-#define kIOLinkData              "IOLinkData"
-
-/*! @defined kIOPacketFilters
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOPacketFilters property is a property of IONetworkController
-        objects. It has an OSDictionary value that describes the entire
-        set of packet filters supported by the controller. Each entry
-        in the dictionary is a key/value pair consisting of the filter
-        group name, and an OSNumber describing the set of supported
-        filters for that group. */
-
-#define kIOPacketFilters         "IOPacketFilters"
-
-/*! @defined kIOMACAddress
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOMACAddress property is a property of IONetworkController
-        objects. It has an OSData value that describes the hardware
-        MAC (media access controller) address, or station address,
-        of the network controller. */
-
-#define kIOMACAddress            "IOMACAddress"
-
-/*! @defined kIOMaxPacketSize
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOMaxPacketSize property is a property of IONetworkController
-        objects. It has an OSNumber value that describes the maximum
-        packet size supported by the controller. */
-
-#define kIOMaxPacketSize         "IOMaxPacketSize"
-
-/*! @defined kIOMinPacketSize
-    @abstract A property of IONetworkController objects.
-    @discussion The kIOMinPacketSize property is a property of IONetworkController
-        objects. It has an OSNumber value that describes the minimum
-        packet size supported by the controller. */
-
-#define kIOMinPacketSize         "IOMinPacketSize"
-
-/*! @defined kIONetworkFilterGroup
-    @abstract The name assigned to the standard network filter group. */
-
-#define kIONetworkFilterGroup    "IONetworkFilterGroup"
-
-/*! @enum StandardPacketFilters
-    @abstract All standard packet filters. 
-    @discussion Each filter will allow the reception of certain class of packets
-        depending on its destination MAC address.
-    @constant kIOPacketFilterUnicast Reception of unicast packets.
-    @constant kIOPacketFilterBroadcast Reception of broadcast packets.
-    @constant kIOPacketFilterMulticast Reception of multicast packets
-        addressed to a set of multicast addresses.
-    @constant kIOPacketFilterMulticastAll Reception of all multicast
-        packets.
-    @constant kIOPacketFilterPromiscuous Reception of all packets.
-    @constant kIOPacketFilterPromiscuousAll Reception of all packets,
-        including bad packets. */
-
-enum {
-    kIOPacketFilterUnicast         = 0x1,
-    kIOPacketFilterBroadcast       = 0x2,
-    kIOPacketFilterMulticast       = 0x10,
-    kIOPacketFilterMulticastAll    = 0x20,
-    kIOPacketFilterPromiscuous     = 0x100,
-    kIOPacketFilterPromiscuousAll  = 0x200
-};
-
-/*! @enum NetworkFeatureFlags
-    @abstract Feature flags returned by the getFeatures() method.
-    @constant kIONetworkFeatureNoBSDWait Set this bit in the value
-        returned by getFeatures() to disable the automatic wait for
-        "IOBSD" resource by the IONetworkController::start() method. 
-    @constant kIONetworkFeaturesHardwareVlan Set this bit in the value
-        returned by getFeatures() to indicate the controller supports hardware
-        stripping and stuffing of 802.1q vlan tags.  If the controller supports
-        this feature it must enable it when initializing so that all received
-        packets delivered to higher layers have the tag stripped.  The controller
-        should use setVlanTag() to provide the tag information out of band.
-    @constant kIONetworkFeaturesSoftwareVlan Set this bit in the value
-        returned by getFeatures() to indicate that the controller can support software
-        based vlan by transmitting and receiving packets 4 bytes longer that normal. 
-    @constant kIONetworkFeatureMultiPages Set this bit if the driver is
-	capable of handling packets coming down from the network stack that
-	reside in virtually, but not in physically contiguous span of the
-	external mbuf clusters.  In this case, the data area of a packet in
-	the external mbuf cluster might cross one or more physical pages that
-	are disjoint, depending on the interface MTU and the packet size.
-	Such a use of larger than system page size clusters by the network
-	stack is done for better system efficiency.  Drivers that utilize the
-	IOMbufNaturalMemoryCursor with the getPhysicalSegmentsWithCoalesce
-	interfaces and enumerate the list of vectors should set this flag
-	for possible gain in performance during bulk data transfer.
-    @constant kIONetworkFeatureTSOIPv4 Set this bit to advertise support
-        for TCP/IPv4 segmentation offload.
-    @constant kIONetworkFeatureTSOIPv6 Set this bit to advertise support
-        for TCP/IPv6 segmentation offload.
-*/
-
-enum {
-    kIONetworkFeatureNoBSDWait    = 0x01,
-	kIONetworkFeatureHardwareVlan = 0x02,
-	kIONetworkFeatureSoftwareVlan = 0x04,
-	kIONetworkFeatureMultiPages   = 0x08,
-	kIONetworkFeatureTSOIPv4      = 0x10,
-	kIONetworkFeatureTSOIPv6      = 0x20
-};
-
-/*
- * Kernel
- */
-#if defined(KERNEL) && defined(__cplusplus)
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/network/IONetworkInterface.h>
-#include <IOKit/network/IOKernelDebugger.h>
-
-class  IOCommandGate;
-class  IOOutputQueue;
-class  IONetworkMedium;
-
-/*! @typedef IOPacketBufferConstraints
-    @discussion Constraint parameters, specified by a driver,
-    for the data buffer in a packet mbuf. This is observed by
-    allocatePacket() to satisfy the stated requirements.
-    @field alignStart Starting address byte alignment.
-    @field alignLength Buffer length byte alignment. */
-
-typedef struct {
-    UInt32  alignStart;
-    UInt32  alignLength;
-    UInt32  reserved[6];
-} IOPacketBufferConstraints;
-
-// Some frequently used alignment constants.
-//
-enum {
-    kIOPacketBufferAlign1   = 1,
-    kIOPacketBufferAlign2   = 2,
-    kIOPacketBufferAlign4   = 4,
-    kIOPacketBufferAlign8   = 8,
-    kIOPacketBufferAlign16  = 16,
-    kIOPacketBufferAlign32  = 32
-};
-
-/*!	@const gIONetworkFilterGroup
-    @discussion gIONetworkFilterGroup is an OSSymbol object that contains
-        the name of the standard network filter group as defined by
-        kIONetworkFilterGroup. */
-
-extern const OSSymbol *  gIONetworkFilterGroup;
-
-/*! @class IONetworkController
-    @abstract Implements the framework for a generic 
-    network controller.
-    @discussion A subclass of IONetworkController must provide
-    additional functionality specific for a particular networking type.
-    In addition, the driver must implement (override) a basic set of 
-    hardware dependent methods to create a working driver.
-
-    IONetworkController attaches itself to the data link layer (DLIL) via
-    an IONetworkInterface object. A controller object without a companion
-    interface is not accessible to the networking system. The controller
-    interacts with DLIL by calling methods defined by the interface object.
-    And conversely, DLIL will issue commands and packets to the controller
-    through the interface object.
-
-    IONetworkController will create an IOCommandGate and attach this
-    event source to an IOWorkLoop object. All commands sent from the
-    interface object are handled through the IOCommandGate object,
-    which will serialize access to the controller. Outbound packets sent
-    from the interface to the controller have no implicit serialization. 
-    Drivers must implement an output function that is thread safe, or use
-    an IOOutputQueue object which will provide a serialization model.
-
-	Note: IONetworkController internally uses some private messaging constants
-	in the sys_iokit | sub_iokit_networking range defined in 
-	"IONetworkControllerPrivate.h".	If you create a client for your controller
-	(for example an IOUserClient), and it overrides the IOService::message 
-	method, your client may receive these messages.  It should ignore these 
-	messages and pass them to super::message() 	
-    */
-
-class IONetworkController : public IOService
-{
-    OSDeclareAbstractStructors( IONetworkController )
-
-private:
-
-    IOWorkLoop *             _workLoop;
-    IOCommandGate *          _cmdGate;
-    IOOutputQueue *          _outputQueue;
-    OSSet *                  _clientSet;
-    OSCollectionIterator *   _clientSetIter;
-    OSObject *               _cmdClient;
-    UInt32                   _alignStart;
-    UInt32                   _alignLength;
-    UInt32                   _alignPadding;
-    bool                     _propertiesPublished;
-    IOLock *                 _mediumLock;
-    IODebuggerLockState      _debugLockState;
-    SInt32                   _debugLockCount;
-    OSNumber *               _linkStatus;
-    OSNumber *               _linkSpeed;
-    const OSData *           _lastLinkData;
-    const OSSymbol *         _lastActiveMediumName;
-    const OSSymbol *         _lastCurrentMediumName;
-    mbuf_t                   _freeList;
-
-    struct ExpansionData { };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *	    _reserved;
-
-
-    bool _broadcastEvent(UInt32 type, void * data = 0);
-
-    static void debugRxHandler(IOService * handler,
-                               void *      buffer,
-                               UInt32 *    length,
-                               UInt32      timeout);
-
-    static void debugTxHandler(IOService * handler,
-                               void *      buffer,
-                               UInt32      length);
-
-    static IOReturn executeCommandAction(OSObject * owner,
-                                         void *     arg0,
-                                         void *     arg1,
-                                         void *     arg2,
-                                         void *     arg3);
-
-    static IOReturn handleCommand(void * target,
-                                  void * param0,
-                                  void * param1,
-                                  void * param2,
-                                  void * param3);
-
-public:
-
-/*! @function init
-    @abstract Initializes the IONetworkController object.
-    @discussion Instance variables are initialized, then super::init()
-    is called.
-    @param properties A dictionary object containing a property table
-        associated with this instance.
-    @result Returns true on success, false otherwise. 
-*/ 
-
-    virtual bool init(OSDictionary * properties);
-
-/*! @function start
-    @abstract Starts the network controller.
-    @discussion After the controller driver has successfully matched
-    to a provider, this method is called to start the network controller. 
-    IONetworkController will allocate resources and gather controller
-    properties in its implementation. No I/O will be performed until
-    the subclass tries to attach a client object. A driver must override
-    this method, and call super::start() at the beginning of its own
-    implementation. Then check the return value to make sure that its
-    superclass was started successfully before proceeding. Tasks that
-    are usually performed by a driver's start method are: resource
-    allocation, hardware initialization, allocation of IOEventSources
-    and attaching them to a workloop, publishing a medium dictionary,
-    and finally, attaching an interface object when it is ready to
-    handle client requests.
-    @param provider The provider that the controller was matched
-    (and attached) to.
-    @result Returns true on success, false otherwise. 
-*/
-
-    virtual bool start(IOService * provider);
-
-/*! @function stop
-    @abstract Stops the network controller.
-    @discussion The counterpart of start(). The controller has been
-    instructed to stop running. The stop() method should release
-    resources and undo actions performed by the start() method.
-    Subclasses must override this method and call super::stop()
-    at the end of its implementation.
-    @param provider The provider that the controller was matched
-    (and attached) to. */
-
-    virtual void stop(IOService * provider);
-
-/*! @typedef IONetworkController::Action
-    @discussion Definition of a C function that can be called
-    through executeCommand().
-    @param target The first argument passed to action.
-    @param param0 Action parameter 0.
-    @param param1 Action parameter 1.
-    @param param2 Action parameter 2.
-    @param param3 Action parameter 3. */
-
-    typedef IOReturn (*Action)(void * target, void * param0,
-                                              void * param1,
-                                              void * param2,
-                                              void * param3);
-
-/*! @function executeCommand
-    @abstract Makes a C function call through the command gate.
-    @discussion This method makes a call to a C function that will be synchronized 
-    with the workloop thread, and any other threads that are called
-    with the workloop's gate closed.
-    @param client The client requesting the action. This parameter is not
-    passed to the function.
-    @param action Pointer to a C function to be executed.
-    @param target The first parameter in the action callout.
-    @param param0 Action parameter 0.
-    @param param1 Action parameter 1.
-    @param param2 Action parameter 2.
-    @param param3 Action parameter 3.
-    @result Returns the value returned by the action. 
-*/
-
-    virtual IOReturn executeCommand(OSObject * client,
-                                    Action     action,
-                                    void *     target,
-                                    void *     param0 = 0,
-                                    void *     param1 = 0,
-                                    void *     param2 = 0,
-                                    void *     param3 = 0);
-
-/*! @function outputPacket
-    @abstract Transmits an output packet.
-    @discussion If an IOOutputQueue was created by createOutputQueue(),
-    then this method will be called by the output queue object.
-    Otherwise, an interface object will call this method directly when
-    it receives an output packet from the data link layer.
-
-    There is no upper limit on the number of mbufs, hence the number of
-    memory fragments, in the mbuf chain provided. Drivers must be able to
-    handle cases when the mbuf count might exceed the limit supported by their
-    DMA engines, and perform coalescing to copy the various memory fragments
-    into a lesser number of fragments. This complexity can be hidden from
-    the driver when an IOMbufMemoryCursor is used, which is able to convert
-    an mbuf chain into a physical address scatter-gather list that will not
-    exceed a specified number of physically contiguous memory segments.
-    See IOMbufMemoryCursor.
-
-    The implementation in IONetworkController performs no useful action
-    and will drop all packets. A driver must override this method and
-    process the output packet provided. The implementation in the driver
-    must not block, since this may cause the network stack to be reentered
-    from an unsafe point.
-    @param packet An mbuf chain containing the output packet to be sent on
-    the network.
-    @param param A parameter provided by the caller.
-    @result Returns a return code defined by the caller. 
-*/
-
-    virtual UInt32 outputPacket(mbuf_t, void * param);
-
-/*! @function getFeatures
-    @abstract Reports generic features supported by the controller and/or
-    the driver.
-    @result This method will always return 0. Subclasses may override
-    this method and return a bit mask of all supported features. */
-
-    virtual UInt32 getFeatures() const;
-
-/*! @function newVendorString
-    @result Returns a string describing the vendor of the network controller.
-    The caller is responsible for releasing the string object returned. */
-
-    virtual const OSString * newVendorString() const;
-
-/*! @function newModelString
-    @result Returns a string describing the model of the network controller.
-    The caller is responsible for releasing the string object returned. */
-
-    virtual const OSString * newModelString() const;
-
-/*! @function newRevisionString
-    @result Returns a string describing the hardware revision of the
-    network controller. The caller is responsible for releasing the
-    string object returned. */
-
-    virtual const OSString * newRevisionString() const;
-
-/*! @function getSelectedMedium
-    @abstract Gets the current selected medium.
-    @discussion If the driver has previously called setSelectedMedium() 
-    to indicate its current media selection, then this method will return
-    that medium object. Otherwise, the driver's property table is
-    consulted and a default medium property is examined, and the
-    corresponding entry in the medium dictionary is returned.
-    @result Returns the current selected medium, the default medium, or 0. 
-*/
-
-    virtual const IONetworkMedium * getSelectedMedium() const;
-	const IONetworkMedium * getCurrentMedium() const;
-
-/*! @function getMediumDictionary
-    @abstract Returns the medium dictionary published by the driver.
-    @discussion Returns the medium dictionary published by the driver
-    through publishMediumDictionary(). Use copyMediumDictionary() to
-    create and get a copy of the medium dictionary.
-    @result Returns the published medium dictionary, or 0 if the driver has not
-    yet published a medium dictionary through publishMediumDictionary(). 
-*/
-
-    virtual const OSDictionary * getMediumDictionary() const;
-
-/*! @function copyMediumDictionary
-    @abstract Returns a copy of the medium dictionary published by the
-    driver.
-    @discussion The caller is responsible for releasing the dictionary
-    object returned. Use getMediumDictionary() to get a reference to the
-    published medium dictionary instead of creating a copy.
-    @result Returns a copy of the medium dictionary, or 0 if the driver has not
-    published a medium dictionary through publishMediumDictionary().
-*/
-
-    virtual OSDictionary * copyMediumDictionary() const;
-
-/*! @function getOutputHandler
-    @abstract Gets the address of the method designated to handle output 
-    packets for the network controller.
-    @result Returns a pointer to the outputPacket() method. 
-*/
-
-    virtual IOOutputAction getOutputHandler() const;
-
-/*! @function doEnable
-    @abstract Makes a synchronized call to enable() through executeCommand().
-    @discussion Do not use this method, it may be removed in the future.
-    See enable(). 
-*/
-
-    virtual IOReturn doEnable(IOService * client);
-
-/*! @function doDisable
-    @abstract Makes a synchronized call to disable() through executeCommand().
-    @discussion Do not use this method, it may be removed in the future.
-    See disable(). 
-*/
-
-    virtual IOReturn doDisable(IOService * client);
-
-/*! @function getCommandGate
-    @abstract Gets the IOCommandGate object created by IONetworkController.
-    @discussion When IONetworkController is started, an IOCommandGate object
-    is instantiated and attached to the workloop returned by getWorkLoop().
-    This IOCommandGate object is used internally to synchronize client
-    commands handled through executeCommand(). Subclasses that need an
-    IOCommandGate should try to reuse the object returned by this method,
-    rather than creating a new instance. See IOCommandGate documentation.
-    @result Returns the IOCommandGate object created by IONetworkController. 
-*/
-
-    virtual IOCommandGate * getCommandGate() const;
-
-/*! @function getHardwareAddress
-    @abstract Gets the network controller's permanent hardware/station
-    address. 
-    @discussion This method call is synchronized by the workloop's gate.
-    @param addr The buffer where the controller's hardware address should
-           be stored.
-    @param inOutAddrBytes The size of the address buffer provided by the
-           client, and replaced by this method with the actual size of
-           the hardware address in bytes.
-    @result Returns kIOReturnSuccess on success, or an error otherwise. 
-*/
-
-    virtual IOReturn getHardwareAddress(void *   addr,
-                                        UInt32 * inOutAddrBytes) = 0;
-
-/*! @function setHardwareAddress
-    @abstract Sets or changes the station address used by the network
-    controller. 
-    @discussion This method call is synchronized by the workloop's gate.
-    @param buffer The buffer containing the hardware address provided by
-    the client.
-    @param addrBytes The size of the address buffer provided by the
-    client in bytes.
-    @result Returns kIOReturnSuccess on success, or an error otherwise. 
-*/
-
-    virtual IOReturn setHardwareAddress(const void * addr,
-                                        UInt32       addrBytes) = 0;
-
-/*! @function enable
-    @abstract Handles an enable request from a client.
-    @discussion This method handles an enable request from a client. A client will call
-    enable after it has opened the controller, and before it starts to use
-    the controller to send and to receive packets over the network. The
-    client object provided is typecasted using OSDynamicCast, and depending
-    on whether the client is an IOKernelDebugger or an IONetworkInterface,
-    then an overloaded enable method that takes a more specific argument
-    type is called. If the client matches neither type, then
-    kIOReturnBadArgument is returned. A driver has the option of overriding
-    this base enable method, or the overloaded form. This method call is
-    synchronized by the workloop's gate.
-    @param client The client object requesting the enable.
-    @result Returns the return value from the overloaded enable() method, or
-    kIOReturnBadArgument if the client type is unknown. 
-*/
-
-    virtual IOReturn enable(IOService * client);
-
-/*! @function disable
-    @abstract Handles a disable request from a client.
-    @discussion This method handles a disable request from a client. A client will call
-    disable if it has previously enabled the controller, and it no longer
-    needs to transport packets or perform I/O using the controller.
-    The client object is typecasted using OSDynamicCast, and depending on
-    whether the client is an IOKernelDebugger or an IONetworkInterface,
-    then an overloaded disable method that takes a more specific argument
-    type is called. If the client matches neither type, then
-    kIOReturnBadArgument is returned. A driver has the option of overriding
-    this base disable method, or the overloaded form. This method call is
-    synchronized by the workloop's gate.
-    @param client The client object requesting the disable.
-    @result Returns the return from the overloaded disable() method, or
-    kIOReturnBadArgument if the client type is unknown.
-*/
-    
-    virtual IOReturn disable(IOService * client);
-
-/*! @function setMaxPacketSize
-    @abstract A client request to change the maximum packet size.
-    @discussion This method call is synchronized by the workloop's gate.
-    @param maxSize The new maximum packet size.
-    @result Returns kIOReturnUnsupported. Drivers may override this method
-    and return either kIOReturnSuccess to indicate that the new size
-    was accepted and is in effect, or an error code to indicate failure. 
-*/
-
-    virtual IOReturn setMaxPacketSize(UInt32 maxSize);
-
-/*! @function getMaxPacketSize
-    @abstract Gets the maximum packet size supported by the controller.
-    @param maxSize Pointer to the return value.
-    @result Returns kIOReturnSuccess on success, or an error code otherwise. 
-*/
-
-    virtual IOReturn getMaxPacketSize(UInt32 * maxSize) const = 0;
-
-/*! @function getMinPacketSize
-    @abstract Gets the minimum packet size supported by the controller.
-    @param minSize Pointer to the return value.
-    @result Returns kIOReturnSuccess on success, or an error code otherwise. 
-*/
-
-    virtual IOReturn getMinPacketSize(UInt32 * minSize) const = 0;
-
-/*! @function selectMedium
-    @abstract A client request to change the medium selection.
-    @discussion This method is called when a client issues a command
-    for the controller to change its current medium selection.
-    The implementation must call setSelectedMedium() after the change
-    has occurred. This method call is synchronized by the workloop's
-    gate.
-    @param medium An entry from the published medium dictionary that
-    represents the selection chosen by the client.
-    @result Returns kIOReturnUnsupported. Drivers may override this method and
-    return kIOReturnSuccess if the selection was successful,
-    or an error code otherwise. 
-*/
-
-    virtual IOReturn selectMedium(const IONetworkMedium * medium);
-
-/*! @function selectMediumWithName
-    @abstract A client request to change the medium selection.
-    @discussion This method is called when a client issues a command
-    for the controller to change its current medium selection.
-    This implementation will look for an entry in the medium
-    dictionary published by the driver that is associated with the
-    key given. If a match is found, then selectMedium() is called to
-    perform the selection, otherwise an error is reported back to the
-    client. Subclasses should override selectMedium() and not this
-    method. This method call is synchronized by the workloop's gate.
-    @param mediumName An OSSymbol object that describes the name of the
-    new medium selected by the client.
-    @result Returns the return from selectMedium() if a matching entry was found
-    from the medium dictionary. Returns kIOReturnUnsupported if a medium
-    dictionary does not exist, or kIOReturnBadArgument if the name given
-    does not match any entry in the medium dictionary. 
-*/
-
-    virtual IOReturn selectMediumWithName(const OSSymbol * mediumName);
-
-/*! @function getPacketFilters
-    @abstract Gets the set of packet filters supported by the network 
-    controller for the given filter group.
-    @discussion A subclass must implement this method and report the
-    set of filters that are supported for the given filter group.
-    This method call is synchronized by the workloop's gate.
-    @param group The name of the filter group.
-    @param filters Pointer to the mask of supported filters returned by
-    	this method.
-    @result Returns kIOReturnSuccess on success, or an error to indicate a
-    failure to discover the set of supported filters. 
-*/
-
-    virtual IOReturn getPacketFilters(const OSSymbol * group,
-                                      UInt32 *         filters) const = 0;
-
-/*! @function enablePacketFilter
-    @abstract Enables one of the supported packet filters from the
-    given filter group.
-    @discussion A client will call this method to enable a supported filter
-    from the filter group specified. If the client wishes to enable more
-    than one filter, it must call this method multiple times to enable the
-    desired set of filters. This method call is synchronized by the
-    workloop's gate.
-    @param group The name of the filter group containing the filter to be
-    enabled.
-    @param aFilter The filter to enable.
-    @param enabledFilters All filters currently enabled by the client.
-    @param options Optional flags for the enable request.
-    @result Returns kIOReturnSuccess on success, or an error otherwise. 
-*/
-
-    virtual IOReturn enablePacketFilter(const OSSymbol * group,
-                                        UInt32           aFilter,
-                                        UInt32           enabledFilters,
-                                        IOOptionBits     options = 0) = 0;
-
-/*! @function disablePacketFilter
-    @abstract Disables a packet filter that is currently enabled from the
-    given filter group.
-    @discussion After a supported filter has been successfully enabled,
-    a client can call this method to disable that filter. This method call
-    is synchronized by the workloop's gate.
-    @param group The name of the filter group containing the filter to be
-    disabled.
-    @param aFilter The filter to disable.
-    @param enabledFilters All filters currently enabled by the client.
-    @param options Optional flags for the disable request.
-    @result Returns kIOReturnSuccess on success, or an error otherwise. 
-*/
-
-    virtual IOReturn disablePacketFilter(const OSSymbol * group,
-                                         UInt32           aFilter,
-                                         UInt32           enabledFilters,
-                                         IOOptionBits     options = 0) = 0;
-
-/*! @function getOutputQueue
-    @abstract Gets the IOOutputQueue object created by createOutputQueue().
-    @result Returns a reference to the output queue object created by
-    createOutputQueue(). 
-*/
-
-    virtual IOOutputQueue * getOutputQueue() const;
-
-/*! @function getPacketBufferConstraints
-    @abstract Gets the controller's packet buffer constraints.
-    @discussion Called by start() to obtain the constraints on the
-    memory buffer for each mbuf packet allocated through allocatePacket().
-    Drivers can override this method to specify the buffer constraints
-    imposed by their bus master hardware. Note that outbound packets,
-    those that originate from the network stack, are not currently
-    subject to the constraints reported here.
-    @param constraints A pointer to an IOPacketBufferConstraints
-    structure that this method is expected to initialize.
-    See IOPacketBufferConstraints structure definition. 
-*/
-
-    virtual void getPacketBufferConstraints(
-                    IOPacketBufferConstraints * constraints) const;
-
-/*! @function allocatePacket
-    @abstract Allocates a packet with a data buffer that is larger than
-    or equal to the size specified.
-    @discussion This method will always return a single mbuf unless the
-    size requested (plus the alignment padding) is greater than MCLBYTES.
-    The data buffer for the mbuf (or an mbuf chain) returned is aligned
-    according to the constraints reported by getPacketBufferConstraints().
-    The length fields in each mbuf returned are set by this method, thus
-    allowing the mbuf to be passed directly to an IOMbufMemoryCursor object
-    in order to convert the mbuf to a physical address scatter-gather list.
-    @param size The minimum size of the data buffer for the mbuf
-    packet allocated.
-    @result Returns an mbuf packet, or 0 if allocation failed. 
-*/
-
-    virtual mbuf_t allocatePacket(UInt32 size);
-
-/*! @function copyPacket
-    @abstract Allocates a new packet, containing data copied from an
-    existing source packet.
-    @discussion The source packet is not modified by this method.
-    @param m The source packet.
-    @param size The number of bytes to copy. If set to 0, then the
-    entire data buffer from the source packet is copied.
-    @result Returns a new packet containing the same data as the source packet. 
-*/
-
-    virtual mbuf_t copyPacket(const mbuf_t m, UInt32 size = 0);
-
-/*! @function replacePacket
-    @abstract Allocates a new packet to replace an existing packet, the
-    existing packet is then returned.
-    @param mp A handle to the existing packet.
-    @param size If size is 0, then the new packet shall have the same buffer
-    size as the original packet that is being replaced. Otherwise, the new
-    packet shall have the buffer size specified by this value.
-    @result If packet allocation was successful, then a replacement will
-    take place and the original packet will be returned. Otherwise, 0
-    is returned, and the original packet will be left untouched.
-*/
-
-    virtual mbuf_t replacePacket(mbuf_t * mp, UInt32 size = 0);
-
-/*! @function replaceOrCopyPacket
-    @abstract A helper method that combines the functionality of
-    copyPacket() and replacePacket() to process a packet containing
-    a received frame.
-    @discussion This method will either make a copy or replace the existing
-    packet, whichever is more time efficient. Packets containing small frames
-    are copied, otherwise they are replaced. If replaced, then the existing
-    packet is returned, and a new packet with the same buffer size is created
-    to take its place. If copied, the existing packet is left intact, while a
-    copy is returned that will hold a copy of the data from the source packet.
-    @param mp A handle to the existing packet that may be replaced.
-    @param length The number of bytes received held in the packet.
-        Must be greater than zero.
-    @param replaced Pointer to a return value that is set to true to indicate
-        that the existing packet was replaced, or false to indicate that the
-        existing packet was not replaced, and a copy was created.
-    @result Returns a replacement or a copy of the existing packet, or 0 if packet
-    allocation failed. 
-*/
-
-    virtual mbuf_t replaceOrCopyPacket(mbuf_t * mp,
-                                       UInt32   length,
-                                       bool *   replaced);
-
-    enum {
-        kDelayFree = 0x01
-    };
-
-/*! @function freePacket
-    @abstract Releases the packet given back to the free pool.
-    @param m The packet to be freed.
-    @param options When kDelayFree option is set, then the packet
-    provided to this function will be queued on the free packet queue.
-    A subsequent call to releaseFreePackets() will release all queued
-    packets by making a single BSD function call. Without the kDelayFree
-    option, the packet provided will be released immediately. 
-*/
-
-    virtual void freePacket(mbuf_t, IOOptionBits options = 0);
-
-/*! @function releaseFreePackets
-    @abstract Releases all packets held in the free packet queue.
-    @discussion The free packet queue is not protected by a lock. This
-    function must be called in a single-threaded manner with respect to
-    all calls to freePacket() with the kDelayFree option set.
-    @result Returns the number of packets queued and released. 
-*/
-
-    virtual UInt32 releaseFreePackets();
-
-/*! @enum TCP/IPChecksums
-    @abstract TCP/IP checksums that may be supported by the
-    hardware.
-    @constant kChecksumFamilyTCPIP A value that describes the collection
-    of TCP/IP checksums.
-    @constant kChecksumIP An IP header checksum.
-    @constant kChecksumTCP A TCP checksum that covers the TCP header and TCP
-    data.
-    @constant kChecksumUDP A UDP checksum that covers the UDP header and UDP
-    data.
-    @constant kChecksumTCPNoPseudoHeader A TCP checksum that covers the TCP
-    header and the TCP data, but the pseudo header is not included in the
-    checksum computation. A partial 16-bit checksum value must be provided
-    to allow the protocol stacks to calculate and verify the final checksum.
-    This type of checksum is not currently supported on the output path.
-    @constant kChecksumUDPNoPseudoHeader A UDP checksum that covers the UDP
-    header and the UDP data, but the pseudo header is not included in the
-    checksum computation. A partial 16-bit checksum value must be provided
-    to allow the protocol stacks to calculate and verify the final checksum.
-    This type of checksum is not currently supported on the output path.
-    @constant kChecksumTCPSum16 The hardware has a simple checksum engine
-    that can perform a TCP style ones complement sum of 16-bit words over 
-    a certain range of bytes in a packet. The hardware does not have the
-    ability to scan for IP or TCP headers, and the driver must pass/get
-    additional parameter(s) to or from the protocol stack to coordinate
-    the checksumming effort. 
-*/
-
-    enum {
-        kChecksumFamilyTCPIP         = 0x00000001,
-        kChecksumIP                  = 0x0001,
-        kChecksumTCP                 = 0x0002,
-        kChecksumUDP                 = 0x0004,
-        kChecksumTCPNoPseudoHeader   = 0x0100,
-        kChecksumUDPNoPseudoHeader   = 0x0200,
-        kChecksumTCPSum16            = 0x1000
-    };
-
-/*! @function getChecksumSupport
-    @abstract Gets checksums that are supported by the network controller for
-    the given checksum family.
-    @discussion A network controller that is capable of inserting and verifying
-    checksums on output and input packets, should override this method and
-    advertise its capability in order to assist or offload the software checksum
-    calculations performed by the protocol stacks.
-    @param checksumMask A pointer to the mask of supported checksums returned
-    by this method.
-    @param checksumFamily A value that specifies the checksum family.
-    @param isOutput Set to true to query the support for checksum insertion on
-    output packets, or false to query the support for checksum verification
-    on input packets. Controllers that have symmetric hardware checksum support 
-    can return a fixed checksum mask value, and ignore this argument.
-    @result Default return is kIOReturnUnsupported. Controllers that override
-    this method must return kIOReturnSuccess. Any other return value will be
-    interpretated as a lack of checksum support, regardless of the value
-    returned through the first argument. 
-*/
-
-    virtual IOReturn getChecksumSupport( UInt32 * checksumMask,
-                                         UInt32   checksumFamily,
-                                         bool     isOutput );
-
-/*! @function setChecksumResult
-    @abstract Encodes a received packet with the checksum result reported
-    by the hardware.
-    @discussion A network controller that can verify the checksum(s) for a
-    received packet, should call this method to encode the result on the
-    packet, before passing it up towards the protocol stacks.
-    @param packet An mbuf containing a packet that has been checksummed by
-    the hardware.
-    @param checksumFamily A value that specifies the checksum family.
-    @param resultMask A mask of all checksums that were checked or computed.
-    Setting a bit implies that the driver is able to report the result of
-    the checksum computation, by asserting the validity of the checksum,
-    or by returning a partial checksum value.
-    @param validMask A mask of all checksums are were computed and verified
-    by the hardware as valid. Certain types of checksum performed by the
-    hardware are inheritely incomplete, and therefore should never be marked
-    as valid. A checksum cannot be marked valid unless it has also been
-    checked.
-    @param param0 Optional parameter 0, defaults to 0.
-    @param param1 Optional parameter 1, defaults to 0.
-    @result Returns true if the checksum family is valid and the packet has been
-    encoded with the checksum result provided, false otherwise. 
-*/
-
-    virtual bool setChecksumResult( mbuf_t  packet,
-                                    UInt32  checksumFamily,
-                                    UInt32  resultMask,
-                                    UInt32  validMask,
-                                    UInt32  param0 = 0,
-                                    UInt32  param1 = 0 );
-
-/*! @function getChecksumDemand
-    @abstract Fetches the demand for hardware checksum computation and insertion
-    for the given packet before it is transmitted on the network.
-    @discussion A network controller that can insert a checksum for output
-    packets must call this method to obtain the set of checksums that it must
-    compute, and insert into the appropriate fields in the given output packet.
-    @param packet An mbuf containing a packet that may be missing one or more
-    checksums in the specified checksum family.
-    @param checksumFamily A value that specifies the checksum family.
-    @param demandMask A mask of all checksums that the hardware must compute
-    and insert into the appropriate checksum fields in the packet.
-    @param param0 Optional parameter 0, defaults to 0.
-    @param param1 Optional parameter 1, defaults to 0. 
-*/
-
-    virtual void getChecksumDemand( const mbuf_t packet,
-                                    UInt32       checksumFamily,
-                                    UInt32 *     demandMask,
-                                    void *       param0 = 0,
-                                    void *       param1 = 0 );
-
-/*! @function publishMediumDictionary
-    @abstract Publishes a dictionary of IONetworkMedium objects to
-    advertise the media selection supported by the network controller.
-    @discussion Called by drivers to publish their medium dictionary.
-    Each entry in the dictionary is an IONetworkMedium object that
-    represents a single medium that is supported by the controller.
-    This method will make a copy of the dictionary provided, then add
-    the copy to the driver's property table. The dictionary provided
-    can be released by the caller upon returning from this method.
-    It is permissible to call this method multiple times, which may be
-    necessary if the hardware's media capability changes dynamically.
-    However, if the capability is static, which is often the case,
-    then a driver will typically call this method only once from
-    its start() method.
-
-    Several methods depend on the presence of a medium dictionary.
-    They should be called after the medium dictionary has been
-    published. Those methods are:
-        setSelectedMedium()
-        getSelectedMedium()
-        getMediumDictionary()
-        copyMediumDictionary()
-
-    @param mediumDict A dictionary of IONetworkMedium objects.
-    @result Returns true if the dictionary is valid, and was successfully
-    exported to the property table, false otherwise. 
-*/
-
-    virtual bool publishMediumDictionary(const OSDictionary * mediumDict);
-
-/*! @function setSelectedMedium
-    @abstract Designates an entry in the published medium dictionary as
-    the current selected medium.
-    @discussion After the driver has configured the hardware to select
-    one of its supported media types, it must call this method to inform
-    its parent about the change that has occurred. IONetworkController
-    will update a property in the registry to reflect the current selection.
-    @param medium A medium object representing the current selection.
-    @result Returns true if the property table update was successful,
-    false if the update failed, or if the medium provided does not match
-    any entry from the published medium dictionary. 
-*/
-
-    virtual bool setSelectedMedium(const IONetworkMedium * medium);
-    bool setCurrentMedium(const IONetworkMedium * medium);
-
-/*! @function setLinkStatus
-    @abstract Reports the link status and the active medium.
-    @discussion Drivers must call this method when a link change is
-    detected. IONetworkController will update the link status properties
-    in the registry, and generate an event to inform the upper layers
-    about the change.
-    @param status Link status bits.
-           See IONetworkMedium for the definition of the link status bits.
-    @param activeMedium An object in the published medium dictionary
-    	   that represents the active medium. This may not be the same as
-    	   the selected medium. Set this to 0 if the link is inactive.
-    @param speed Link speed in units of bits per second. If zero, then
-           the link speed is taken from the medium object provided.
-    @param data An OSData containing any additional link parameter that
-           the driver wishes to publish to the registry.
-    @result Returns true if all link properties were successfully updated,
-    false otherwise. 
-*/
-
-    virtual bool setLinkStatus(
-                           UInt32                  status,
-                           const IONetworkMedium * activeMedium = 0,
-                           UInt64                  speed        = 0,
-                           OSData *                data         = 0);
-
-/*! @function systemWillShutdown
-    @abstract Handles system shutdown and restart notifications.
-    @discussion Overrides <code>IOService::systemWillShutdown</code> in order
-    to notify network clients that the power-managed controller should be disabled.
-    As a result, drivers can expect their <code>disable</code> method to be called
-    before system shutdown or restart. This implementation is synchronous and can
-    block before calling <code>IOService::systemWillShutdown</code> and return.
-    @param See <code>IOService::systemWillShutdown</code>.
-*/
-
-    virtual void systemWillShutdown( IOOptionBits specifier );
-
-    /* Override IOService::setAggressiveness() */
-
-    virtual IOReturn setAggressiveness(
-            unsigned long type, unsigned long newLevel );
-
-protected:
-
-/*! @function free
-    @abstract Frees the IONetworkController object.
-    @discussion Frees the IONetworkController object by releasing all
-    allocated resources, followed by a call to super::free(). 
-*/
-
-    virtual void free();
-
-/*! @function registerWithPolicyMaker
-    @abstract Implemented by controller drivers to register with
-    the power management policy-maker.
-    @discussion Drivers that are able to power manage their hardware
-    should override this method and register with the policy-maker
-    provided by calling IOService::registerPowerDriver().
-    IONetworkController will call this method before the initial
-    attempt is made to attach a client.
-    @param policyMaker The policy-maker chosen to manage power for
-    this network controller.
-    @result Returns kIOReturnSuccess on success, kIOReturnUnsupported if the
-    driver does not support power management, or an appropriate error
-    return code. The default return is kIOReturnUnsupported. */
-
-    virtual IOReturn registerWithPolicyMaker(IOService * policyMaker);
-
-/*! @function createWorkLoop
-    @abstract Method called by IONetworkController prior to the initial
-    getWorkLoop() call.
-    @discussion Before IONetworkController calls getWorkLoop() in its
-    start() method, it will call createWorkLoop() to make sure that a
-    subclass that wants to create a workloop, will do so before its
-    first use.
-    @result Returns true to indicate success, false otherwise. Returning false
-    will fail IONetworkController::start(). 
-*/
-
-    virtual bool createWorkLoop();
-
-/*! @function prepare
-    @abstract Prepares the controller before an IOService is created and
-    attached as a client.
-    @discussion This method is called by attachInterface() or
-    attachDebuggerClient() to prepare the controller before the new client
-    object is attached. This method will call publishProperties() to publish
-    controller capabilities and properties that may be used by client objects.
-    However, publishProperties() will be called only once, even if prepare()
-    is called multiple times. This method call is synchronized by the
-    workloop's gate.
-    @result Returns kIOReturnSuccess on success, or an error code otherwise.
-        Returning an error will fail the client attach. 
-*/
-
-    virtual IOReturn prepare();
-
-/*! @function publishProperties
-    @abstract Publishes controller properties and capabilities.
-    @discussion Called by IONetworkController to discover controller
-    properties, and publish them to the property table in the I/O Kit
-    Registry. This method is called once by prepare().
-    @result Returns true if all properties were discovered and published
-    successfully, false otherwise. Returning false will prevent client
-    objects from attaching to the controller, since a property that
-    a client relies upon may be missing. */
-
-    virtual bool publishProperties();
-
-/*! @function getCommandClient
-    @abstract Gets the command client object.
-    @discussion Methods called on the workloop context to service a
-    client request can call this method to get the client object that
-    initiated the command.
-    @result Returns the command client. If the caller is not running on the
-    workloop thread, or if the thread does not have the workloop's gate
-    closed, then 0 is returned. 
-*/
-
-    virtual OSObject * getCommandClient() const;
-
-/*! @function handleOpen
-    @abstract Handles a client open.
-    @discussion This method handles a client open on the controller object. IOService
-    calls this method with the arbitration lock held. Subclasses
-    should not override this method.
-    @param client The client that is attempting to open the controller.
-    @param options Not used. See IOService.
-    @param argument Not used. See IOService.
-    @result Returns true to accept the client open, false to refuse it. 
-*/
-
-    virtual bool handleOpen(IOService *  client,
-                            IOOptionBits options,
-                            void *       argument);
-
-/*! @function handleClose
-    @abstract Handles a client close.
-    @discussion This method handles a close from one of the client objects. IOService
-    calls this method with the arbitration lock held. Subclasses
-    should not override this method.
-    @param client The client that is closing the controller.
-    @param options Not used. See IOService. 
-*/
-
-    virtual void handleClose(IOService * client, IOOptionBits options);
-
-/*! @function handleIsOpen
-    @abstract Queries whether a client has an open on the controller.
-    @discussion This method is always called by IOService with the
-    arbitration lock held. Subclasses should not override this method.
-    @result Returns true if the specified client, or any client if none (0) is
-    specified, presently has an open on this object. 
-*/
-
-    virtual bool handleIsOpen(const IOService * client) const;
-
-/*! @function enable
-    @abstract A request from an interface client to enable the controller.
-    @discussion This method is called by an interface client to enable the controller.
-    Upon receiving this command, the controller driver must bring up the
-    hardware and become ready to transmit and receive packets. A driver
-    should also delay the allocation of most runtime resources until this
-    method is called in order to conserve system resources. This method call
-    is synchronized by the workloop's gate.
-    @param interface The interface client object that requested the enable.
-    @result Returns kIOReturnUnsupported. Drivers that override this method must
-    return kIOReturnSuccess on success, or an error code otherwise. 
-*/
-
-    virtual IOReturn enable(IONetworkInterface * interface);
-
-/*! @function disable
-    @abstract A request from an interface client to disable the controller.
-    @discussion This method is called by an interface client to disable the controller.
-    This method should stop the hardware and disable hardware interrupt
-    sources. Any resources allocated by enable() should also be deallocated.
-    This method call is synchronized by the workloop's gate.
-    @param interface The interface object that requested the disable.
-    @result kIOReturnUnsupported. Drivers that override this method must
-    return Returns kIOReturnSuccess on success, or an error code otherwise. 
-*/
-
-    virtual IOReturn disable(IONetworkInterface * interface);
-
-/*! @function attachInterface
-    @abstract Attaches a new interface client object.
-    @discussion This method creates a new interface object and attaches it to the
-    controller. The createInterface() method is called to perform
-    the interface allocation and initialization, followed by a call to 
-    configureInterface() to configure it. Subclasses can override those
-    two methods to customize the interface client attached. Drivers will
-    usually call this method from start(), after they are ready to process
-    client requests. Since most drivers will have a single interface
-    client, this method will likely be called only once.
-    @param interface Upon success (return value is true), the
-    interface object will be written to the handle provided.
-    @param doRegister If true, then registerService() is called to register
-    the interface, which will trigger the matching process, and will ultimately
-    cause the interface to become registered with the data link layer.
-    Drivers that wish to delay the registration can set doRegister to false,
-    and call registerService() on the interface object when the controller
-    becomes ready. This allows the driver to attach an interface without
-    making its services available to the rest of the system.
-    @result Returns true on success, false otherwise. 
-*/
-
-    virtual bool attachInterface(IONetworkInterface ** interface,
-                                 bool                  doRegister = true);
-
-/*! @function detachInterface
-    @abstract Detaches an interface client object.
-    @discussion This method will verify that the object provided is indeed
-    an IONetworkInterface instance, and then call its terminate() method.
-    Note that an interface object will close and detach from its 
-    controller after the data link layer has removed all references to 
-    all data structures exposed by the interface. The interface object
-    should be released following this call.
-    @param interface An interface object to be detached and terminated.
-    @param sync If true, the interface is terminated synchronously.
-           This may cause this method to block for an indeterminate
-           amount of time. */
-
-    virtual void detachInterface(IONetworkInterface * interface,
-                                 bool                 sync = false);
-
-/*! @function createInterface
-    @abstract Creates a new network interface object.
-    @discussion This method is called by attachInterface() to perform
-    allocation and initialization of a new interface object. A subclass of
-    IONetworkController must implement this method and return a matching
-    interface object. For example, IOEthernetController's implementation
-    will return an IOEthernetInterface object when createInterface() is
-    called.
-    @result Returns a newly allocated and initialized interface object. 
-*/
-
-    virtual IONetworkInterface * createInterface() = 0;
-
-/*! @function configureInterface
-    @abstract Configures a newly created network interface object.
-    @discussion This method configures an interface object that was created by
-    createInterface(). Subclasses can override this method to customize
-    and examine the interface object that will be attached to the
-    controller as a client.
-    @param interface The interface object to be configured.
-    @result Returns true if the operation was successful, false otherwise
-    (this will cause attachInterface() to fail and return 0). 
-*/
-
-    virtual bool configureInterface(IONetworkInterface * interface);
-
-/*! @function createOutputQueue
-    @abstract Creates an IOOutputQueue to handle output packet queueing,
-    and also to resolve contention for the controller's transmitter from
-    multiple client threads.
-    @discussion This method is called by start() to create an IOOutputQueue object to
-    handle output packet queueing. The default implementation will always
-    return 0, hence no output queue will be created. A driver may override
-    this method and return a subclass of IOOutputQueue. IONetworkController
-    will keep a reference to the queue created, and will release this
-    object when IONetworkController is freed. Also see getOutputQueue().
-    @result Returns a newly allocated and initialized IOOutputQueue object. 
-*/
-
-    virtual IOOutputQueue * createOutputQueue();
-
-/*! @function enable
-    @abstract An enable request from an IOKernelDebugger client.
-    @discussion Drivers that provide debugging support may either override
-    this method and set up the hardware to support the polled-mode send and
-    receive methods, receivePacket() and sendPacket(), or override the base
-    enable() and disable() methods that take an IOService argument.
-    @param debugger The IOKernelDebugger client requesting the enable.
-    @result Returns kIOReturnSuccess. Drivers must return kIOReturnSuccess
-    on success, or an error otherwise. 
-*/
-
-    virtual IOReturn enable(IOKernelDebugger * debugger);
-
-/*! @function disable
-    @abstract A disable request from an IOKernelDebugger client.
-    @discussion Drivers that provide debugging support may either override
-    this method to disable support for the polled-mode send and receive
-    methods, or override the base enable() and disable() methods that
-    take an IOService argument.
-    @param debugger The IOKernelDebugger client requesting the disable.
-    @result Returns kIOReturnSuccess. Drivers must return kIOReturnSuccess
-    on success, or an error otherwise. 
-*/
-
-    virtual IOReturn disable(IOKernelDebugger * debugger);
-
-/*! @function attachDebuggerClient
-    @abstract Attaches a new IOKernelDebugger client object.
-    @discussion This method allocates an IOKernelDebugger object and attaches it as
-    a client. Having a debugger client implies that the controller
-    supports kernel debugging, and therefore must implement the two
-    polled-mode methods that are called by the debugger client. See
-    sendPacket() and receivePacket(). Only a single debugger client
-    should be attached to each controller.
-    @param debuggerP A handle that will return the new
-           IOKernelDebugger object created.
-    @result Returns true on success, false otherwise. 
-*/
-
-    virtual bool attachDebuggerClient(IOKernelDebugger ** debuggerP);
-
-/*! @function detachDebuggerClient
-    @abstract Detaches an IOKernelDebugger client object.
-    @discussion This method detaches and terminates the IOKernelDebugger client object
-    provided. A synchronous termination is issued, and this method will
-    return after the debugger client has been terminated. The debugger
-    client should be released following this call.
-    @param debugger The IOKernelDebugger object to be detached and
-           terminated. If the argument provided is NULL or is not an
-           IOKernelDebugger, this method will return immediately. 
-*/
-
-    virtual void detachDebuggerClient(IOKernelDebugger * debugger);
-
-/*! @function reserveDebuggerLock
-    @abstract Takes the global debugger lock.
-    @discussion This method should not be used. Instead, call the
-    lock() method provided by IOKernelDebugger. 
-*/
-
-    void reserveDebuggerLock();
-
-/*! @function releaseDebuggerLock
-    @abstract Releases the global debugger lock.
-    @discussion This method should not be used. Instead, call the
-    unlock() method provided by IOKernelDebugger. 
-*/
-
-    void releaseDebuggerLock();
-
-/*! @function receivePacket
-    @abstract Debugger polled-mode receive handler.
-    @discussion This method must be implemented by a driver that supports
-    kernel debugging. After a debugger client has been attached through
-    attachDebuggerClient(), this method will be called by the debugger
-    client to poll for an incoming packet when the kernel debugger is active.
-    This method may be called from the primary interrupt context, and the
-    implementation must avoid any memory allocation, and must never block.
-    The receivePacket() method in IONetworkController is used as a placeholder,
-    it performs no useful action, and should not be called. A driver that
-    attaches a debugger client must override this method.
-    @param pkt Address of a receive buffer where the received packet should
-           be stored. This buffer has room for 1518 bytes.
-    @param pktSize Address where the number of bytes received must be
-           recorded. Set this to zero if no packets were received during
-           the timeout interval.
-    @param timeout The maximum amount of time in milliseconds to poll for
-           a packet to arrive before this method must return. 
-*/ 
-
-    virtual void receivePacket(void * pkt, UInt32 * pktSize, UInt32 timeout);
-
-/*! @function sendPacket
-    @abstract Debugger polled-mode transmit handler.
-    @discussion This method must be implemented by a driver that supports
-    kernel debugging. After a debugger client has been attached through
-    attachDebuggerClient(), this method will be called by the debugger
-    to send an outbound packet only when the kernel debugger is active.
-    This method may be called from the primary interrupt context, and the
-    implementation must avoid any memory allocation, and must never block.
-    The sendPacket() method in IONetworkController is used as a placeholder,
-    it performs no useful action, and should not be called. A driver that
-    attaches a debugger client must override this method.
-    @param pkt Pointer to a transmit buffer containing the packet to be
-        sent on the network.
-    @param pktSize The size of the transmit buffer in bytes. 
-*/
-
-    virtual void sendPacket(void * pkt, UInt32 pktSize);
-
-    // Virtual function padding
-    OSMetaClassDeclareReservedUnused( IONetworkController,  0);
-    OSMetaClassDeclareReservedUnused( IONetworkController,  1);
-    OSMetaClassDeclareReservedUnused( IONetworkController,  2);
-    OSMetaClassDeclareReservedUnused( IONetworkController,  3);
-    OSMetaClassDeclareReservedUnused( IONetworkController,  4);
-    OSMetaClassDeclareReservedUnused( IONetworkController,  5);
-    OSMetaClassDeclareReservedUnused( IONetworkController,  6);
-    OSMetaClassDeclareReservedUnused( IONetworkController,  7);
-    OSMetaClassDeclareReservedUnused( IONetworkController,  8);
-    OSMetaClassDeclareReservedUnused( IONetworkController,  9);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 10);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 11);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 12);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 13);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 14);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 15);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 16);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 17);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 18);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 19);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 20);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 21);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 22);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 23);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 24);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 25);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 26);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 27);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 28);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 29);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 30);
-    OSMetaClassDeclareReservedUnused( IONetworkController, 31);
-};
-
-#endif /* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* !_IONETWORKCONTROLLER_H */
-
diff --git a/i386/include/IOKit/network/IONetworkData.h b/i386/include/IOKit/network/IONetworkData.h
deleted file mode 100644
index c0d2de4..0000000
--- a/i386/include/IOKit/network/IONetworkData.h
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IONETWORKDATA_H
-#define _IONETWORKDATA_H
-
-#define IONetworkParameter IONetworkData  // FIXME
-
-/*! @enum NetworkDataAccessTypes
-    @abstract Constants that describe access types.
-    @constant kIONetworkDataAccessTypeRead  Read access.
-    @constant kIONetworkDataAccessTypeWrite Write access.
-    @constant kIONetworkDataAccessTypeReset Reset access.
-    @constant kIONetworkDataAccessTypeSerialize Serialization access. 
-*/
-
-enum {
-    kIONetworkDataAccessTypeRead        = 0x01,
-    kIONetworkDataAccessTypeWrite       = 0x02,
-    kIONetworkDataAccessTypeReset       = 0x04,
-    kIONetworkDataAccessTypeSerialize   = 0x08,
-    kIONetworkDataAccessTypeMask        = 0xff
-};
-
-/*! @define kIONetworkDataBasicAccessTypes
-    @discussion The default access types supported by an IONetworkData
-    object. Allow read() and serialize(). */
-
-#define kIONetworkDataBasicAccessTypes \
-       (kIONetworkDataAccessTypeRead | kIONetworkDataAccessTypeSerialize)
-
-/*! @enum NetworkDataBufferTypes
-    @abstract The types of data buffers that can be managed by an IONetworkData object.
-    @constant kIONetworkDataBufferTypeInternal An internal data buffer
-              allocated by the init() method.
-    @constant kIONetworkDataBufferTypeExternal An external (persistent) data
-              buffer.
-    @constant kIONetworkDataBufferTypeNone No data buffer. The only useful 
-              action perfomed by an IONetworkData object with this buffer type 
-              is to call the access notification handler. 
-*/
-
-enum {
-    kIONetworkDataBufferTypeInternal = 0,
-    kIONetworkDataBufferTypeExternal,
-    kIONetworkDataBufferTypeNone
-};
-
-/*! @defined kIONetworkDataBytes
-    @abstract A property of IONetworkData objects.
-    @discussion The kIONetworkDataBytes property is an OSData that describes
-        the data buffer of an IONetworkData object. This property is present
-        only if kIONetworkDataAccessTypeSerialize access is supported. 
-*/
-
-#define kIONetworkDataBytes             "Data"
-
-/*! @defined kIONetworkDataAccessTypes
-    @abstract A property of IONetworkData objects.
-    @discussion The kIONetworkDataAccessTypes property is an OSNumber that
-        describes the supported access types of an IONetworkData object. 
-*/
-
-#define kIONetworkDataAccessTypes       "Access Types"
-
-/*! @defined kIONetworkDataSize
-    @abstract A property of IONetworkData objects.
-    @discussion The kIONetworkDataSize property is an OSNumber that
-        describes the size of the data buffer of an IONetworkData object. 
-*/
-
-#define kIONetworkDataSize              "Size"
-
-#ifdef KERNEL
-
-#include <libkern/c++/OSSymbol.h>
-#include <libkern/c++/OSSerialize.h>
-
-/*! @class IONetworkData
-    @abstract An object that manages a fixed-size named buffer.
-    @discussion An IONetworkData object manages a fixed-size named buffer.
-    This object provides external access methods that can be used to
-    access the contents of the data buffer. In addition, serialization
-    is supported, and therefore this object can be added to a property
-    table to publish the data object. An unique name must be assigned to
-    the object during initialization. An OSSymbol key will be created
-    based on the assigned name, and this key can be used when the object
-    is added to a dictionary.
-
-    The level of access granted to the access methods can be restricted,
-    by specifying a set of supported access types when the object is
-    initialized, or modified later by calling setAccessTypes(). By default,
-    each IONetworkData object created will support serialization, and will
-    also allow its data buffer to be read through the read() access method.
-
-    An access notification handler, in the form of a 'C' function, can
-    be registered to receive a call each time the data buffer is accessed
-    through an access method. Arguments provided to the handler will identify 
-    the data object and the type of access that triggered the notification.
-    The handler can therefore perform lazy update of the data buffer until
-    an interested party tries to read or serialize the data. The notification
-    handler can also take over the default action performed by the access
-    methods when the buffer type is set to kIONetworkDataBufferTypeNone.
-    This will prevent the access methods from accessing the data buffer,
-    and allow the handler to override the access protocol.
-
-    This object is primarily used by IONetworkInterface to export interface
-    properties to user space. 
-*/
-
-
-class IONetworkData : public OSObject
-{
-    OSDeclareDefaultStructors( IONetworkData )
-
-public:
-
-/*! @typedef Action
-    @abstract Defines a C function that may be called by an IONetworkData object
-    when one of its access methods is called.
-    @param target The target of the notification.
-    @param param A parameter that was provided when the notification
-           handler was registered.
-    @param data The IONetworkData object being accessed, and the
-           sender of the notification.
-    @param accessType A bit will be set indicating the type of access
-           which triggered the notification.
-    @param buffer Pointer to the accessor's buffer. Only valid for
-           read() and write() accesses.
-    @param bufferSize Pointer to the size of the accessor's buffer.
-    @param offset An offset from the start of the data buffer to begin
-           reading or writing. 
-*/
-
-    typedef IOReturn (*Action)(void *           target,
-                               void *           param,
-                               IONetworkData *  data,
-                               UInt32           accessType,
-                               void *           buffer,
-                               UInt32 *         bufferSize,
-                               UInt32           offset);
-
-protected:
-    const OSSymbol *  _key;        // key associated with this object.
-    UInt32            _access;     // supported access types.
-    void *            _buffer;     // Data buffer.
-    UInt32            _bufType;    // buffer type
-    UInt32            _size;       // data buffer size.
-    void *            _tapTarget;  // target for access notification.
-    Action            _tapAction;  // the function to call.
-    void *            _tapParam;   // arbitrary notification param.
-
-    struct ExpansionData { };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *	_reserved;
-
-
-/*! @function free
-    @abstract Frees the IONetworkData object. 
-*/
-
-    virtual void free();
-
-/*! @function writeBytes
-    @abstract Writes to the data buffer with data from a source buffer
-    provided by the caller.
-    @param srcBuffer Pointer to a source buffer provided by the caller.
-    @param srcBufferSize The size of the source buffer.
-    @param writeOffset A byte offset from the start of the data buffer
-           to begin writting.
-    @result Returns true if the operation was successful, false otherwise. 
-*/
-
-    virtual bool writeBytes(const void * srcBuffer,
-                            UInt32       srcBufferSize,
-                            UInt32       writeOffset = 0);
-
-/*! @function readBytes
-    @abstract Reads from the data buffer and copies the data to a destination
-    buffer provided by the caller.
-    @param dstBuffer Pointer to the destination buffer.
-    @param dstBufferSize Pointer to an integer containing the size of the
-    destination buffer. And is overwritten by this method with the actual
-    number of bytes copied to the destination buffer.
-    @param readOffset A byte offset from the start of the data buffer
-           to begin reading.
-    @result Returns true if the operation was successful, false otherwise. 
-*/
-
-    virtual bool readBytes(void *   dstBuffer,
-                           UInt32 * dstBufferSize,
-                           UInt32   readOffset = 0) const;
-
-/*! @function clearBuffer
-    @abstract Clears the data buffer by filling it with zeroes.
-    @result Returns true if the operation was successful, false otherwise. 
-*/
-
-    virtual bool clearBuffer();
-
-public:
-
-/*! @function withInternalBuffer
-    @abstract Factory method that constructs and initializes an
-    IONetworkData object with an internal data buffer.
-    @param name A name to assign to this object.
-    @param bufferSize The number of bytes to allocate for the internal data
-           buffer.
-    @param accessTypes The initial supported access types.
-    @param target The notification target.
-    @param action The notification action.
-    @param param A parameter to pass to the notification action.
-    @result Returns an IONetworkData object on success, or 0 otherwise. 
-*/
-
-    static IONetworkData *
-           withInternalBuffer(const char * name,
-                              UInt32       bufferSize,
-                              UInt32       accessTypes = 
-                                           kIONetworkDataBasicAccessTypes,
-                              void *       target = 0,
-                              Action       action = 0,
-                              void *       param  = 0);
-
-/*! @function withExternalBuffer
-    @abstract Factory method that constructs and initializes an
-    IONetworkData object with an external data buffer.
-    @param name A name to assign to this object.
-    @param bufferSize The size of the external data buffer.
-    @param externalBuffer Pointer to the external data buffer.
-    @param accessTypes The initial supported access types.
-    @param target The notification target.
-    @param action The notification action.
-    @param param A parameter to pass to the notification action.
-    @result Returns an IONetworkData object on success, or 0 otherwise. 
-*/
-
-    static IONetworkData *
-           withExternalBuffer(const char * name,
-                              UInt32       bufferSize,
-                              void *       externalBuffer,
-                              UInt32       accessTypes =
-                                           kIONetworkDataBasicAccessTypes,
-                              void *       target = 0,
-                              Action       action = 0,
-                              void *       param  = 0);
-
-/*! @function withNoBuffer
-    @abstract Factory method that constructs and initializes an
-    IONetworkData object without a data buffer. 
-    @discussion The notification handler
-    must intervene when the IONetworkData is accessed.
-    @param name A name to assign to this object.
-    @param bufferSize The size of the phantom data buffer.
-    @param accessTypes The initial supported access types.
-    @param target The notification target.
-    @param action The notification action.
-    @param param A parameter to pass to the notification action.
-    @result Returns an IONetworkData object on success, or 0 otherwise. 
-*/
-
-    static IONetworkData * withNoBuffer(const char * name,
-                                        UInt32       bufferSize,
-                                        UInt32       accessTypes,
-                                        void *       target,
-                                        Action       action,
-                                        void *       param = 0);
-
-/*! @function init
-    @abstract Initializes an IONetworkData object.
-    @param name A name to assign to this object.
-    @param bufferType The type of buffer associated with this object.
-    @param bufferSize The size of the data buffer.
-    @param externalBuffer Pointer to an external data buffer.
-    @param accessTypes The initial supported access types.
-           Can be later modified by calling setAccessTypes().
-    @param target The notification target.
-    @param action The notification action.
-    @param param A parameter to pass to the notification action.
-    @result Returns true if initialized successfully, false otherwise. 
-*/
-
-    virtual bool init(const char * name,
-                      UInt32       bufferType,
-                      UInt32       bufferSize,
-                      void *       externalBuffer = 0,
-                      UInt32       accessTypes    =
-                                   kIONetworkDataBasicAccessTypes,
-                      void *       target         = 0,
-                      Action       action         = 0,
-                      void *       param          = 0);
-
-/*! @function setAccessTypes
-    @abstract Sets the types of access that are permitted on the data buffer.
-    @param types A mask of access types indicating the supported access
-                 types. 
-*/
-
-    virtual void setAccessTypes(UInt32 types);
-
-/*! @function setNotificationTarget
-    @abstract Registers a C function to handle access notifications sent
-    from this object.
-    @discussion A notification is sent by an IONetworkData object to the
-    registered notification handler, when an access method is called to
-    modify the contents of the data buffer.
-    @param target The first parameter passed to the notification handler.
-    @param action A pointer to a C function that will handle the notification.
-           If 0, then notification is disabled.
-    @param param An optional parameter passed to the notification handler. 
-*/
-
-    virtual void setNotificationTarget(void *  target,
-                                       Action  action,
-                                       void *  param = 0);
-
-/*! @function getBuffer
-    @abstract Gets a pointer to the data buffer.
-    @result Returns a pointer to the data buffer. Returns 0 if the buffer type is
-            kIONetworkDataBufferTypeNone. 
-*/
-
-    virtual const void *     getBuffer() const;
-
-/*! @function getBufferType
-    @abstract Gets the type of data buffer managed by this object.
-    @result Returns a constant that describes the type of the data buffer. 
-*/
-
-    virtual UInt32           getBufferType() const;
-
-/*! @function getAccessTypes
-    @abstract Gets the types of data access supported by this object.
-    @result Returns a mask of supported access types. 
-*/
-
-    virtual UInt32           getAccessTypes() const;
-
-/*! @function getNotificationTarget
-    @abstract Gets the first parameter that will be passed to the access
-              notification handler.
-    @result Returns the first parameter that will be passed to the access notification
-            handler. 
-*/
-
-    virtual void *           getNotificationTarget() const;
-
-/*! @function getNotificationAction
-    @abstract Gets the C function that was registered to handle access
-              notifications sent from this object.
-    @result Returns a pointer to a C function, or 0 if notification is disabled. 
-*/
-
-    virtual Action           getNotificationAction() const;
-
-/*! @function getNotificationParameter
-    @abstract Gets the parameter that will be passed to the access
-              notification handler.
-    @result Returns the parameter that will be passed to the access notification
-            handler. 
-*/
-
-    virtual void *           getNotificationParameter() const;
-
-/*! @function getKey
-    @abstract Gets a unique OSSymbol key associated with this object.
-    @discussion During initialization, IONetworkData will create an
-    OSSymbol key based on its assigned name.
-    @result Returns an OSSymbol key that was generated from the name assigned to
-    this object. 
-*/
-
-    virtual const OSSymbol * getKey() const;
-
-/*! @function getSize
-    @abstract Gets the size of the data buffer.
-    @result Returns the size of the data buffer managed by this object in bytes. 
-*/
-
-    virtual UInt32           getSize() const;
-
-/*! @function reset
-    @abstract An access method that resets the data buffer.
-    @discussion This method handles an external request to reset the data buffer.
-    If notification is enabled, then the notification handler is called
-    after the data buffer has been cleared.
-    @result Returns kIOReturnSuccess on success,
-            kIOReturnNotWritable if reset access is not permitted,
-            or an error from the notification handler. 
-*/
-
-    virtual IOReturn reset();
-
-/*! @function read
-    @abstract An access method that reads from the data buffer.
-    @discussion This method handles an external request to read from the data buffer
-    and copy it to the destination buffer provided by the accessor.
-    If notification is enabled, then the notification handler is called
-    before the data buffer is copied to the destination buffer. The 
-    notification handler may use this opportunity to intervene and
-    to update the contents of the data buffer.
-    @param dstBuffer Pointer to the destination buffer.
-    @param dstBufferSize Pointer to an integer containing the size of the
-    destination buffer. And is overwritten by this method to the actual number
-    of bytes copied to the destination buffer.
-    @param readOffset An offset from the start of the source data buffer to
-    begin reading.
-    @result Returns kIOReturnSuccess on success,
-            kIOReturnBadArgument if any of the arguments provided is invalid,
-            kIOReturnNotReadable if read access is not permitted,
-            or an error from the notification handler. 
-*/
-
-    virtual IOReturn read(void *   dstBuffer,
-                          UInt32 * dstBufferSize,
-                          UInt32   readOffset = 0);
-
-/*! @function write
-    @abstract An access method that writes to the data buffer.
-    @discussion This method handles an external request to write to the data buffer
-    from a source buffer provided by the accessor. After checking that
-    the data object supports write accesses, the data buffer is updated
-    if it exists. Then the registered notification handler is called.
-    @param srcBuffer Pointer to the source buffer.
-    @param srcBufferSize The number of bytes to write to the data buffer.
-    @param writeOffset An offset from the start of the destination data buffer
-    to begin writing.
-    @result Returns kIOReturnSuccess on success,
-            kIOReturnBadArgument if any of the arguments provided is invalid,
-            kIOReturnNotWritable if write access is not permitted,
-            or an error from the notification handler. 
-*/
-
-    virtual IOReturn write(void *  srcBuffer,
-                           UInt32  srcBufferSize,
-                           UInt32  writeOffset = 0);
-
-/*! @function serialize
-    @abstract Serializes the IONetworkData object.
-    @discussion If notification is enabled, then the notification
-    handler is called just before the data buffer is serialized.
-    @param s An OSSerialize object.
-    @result Returns true on success, false otherwise. 
-*/
-
-    virtual bool serialize(OSSerialize * s) const;
-
-    // Virtual function padding
-    OSMetaClassDeclareReservedUnused( IONetworkData,  0);
-    OSMetaClassDeclareReservedUnused( IONetworkData,  1);
-    OSMetaClassDeclareReservedUnused( IONetworkData,  2);
-    OSMetaClassDeclareReservedUnused( IONetworkData,  3);
-};
-
-#endif /* KERNEL */
-
-#endif /* !_IONETWORKDATA_H */
diff --git a/i386/include/IOKit/network/IONetworkInterface.h b/i386/include/IOKit/network/IONetworkInterface.h
deleted file mode 100644
index af02364..0000000
--- a/i386/include/IOKit/network/IONetworkInterface.h
+++ /dev/null
@@ -1,1104 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IONETWORKINTERFACE_H
-#define _IONETWORKINTERFACE_H
-
-/*! @defined kIONetworkInterfaceClass
-    @abstract The name of the IONetworkInterface class. 
-*/
-
-#define kIONetworkInterfaceClass  "IONetworkInterface"
-
-/*! @defined kIONetworkData
-    @abstract A property of IONetworkInterface
-        objects. 
-    @discussion The kIONetworkData property has an OSDictionary value and is a container for the
-        set of IONetworkData objects managed by the interface.
-        Each entry in the dictionary is a key/value pair consisting of
-        the network data name, and an OSDictionary describing the
-        contents of the network data. 
-*/
-
-#define kIONetworkData            "IONetworkData"
-
-/*! @defined kIOInterfaceType
-    @abstract A property of IONetworkInterface objects.
-    @discussion The kIOInterfaceType property has an OSNumber value that specifies the type of
-        network interface that this interface represents. The type
-        constants are defined in bsd/net/if_types.h. 
-*/
-
-#define kIOInterfaceType          "IOInterfaceType"
-
-/*! @defined kIOMaxTransferUnit
-    @abstract A property of IONetworkInterface objects.
-    @discussion The kIOMaxTransferUnit property has an OSNumber value that specifies the maximum
-        transfer unit for the interface in bytes.
-*/
-
-#define kIOMaxTransferUnit        "IOMaxTransferUnit"
-
-/*! @defined kIOMediaAddressLength
-    @abstract A property of IONetworkInterface objects.
-    @discussion The kIOMediaAddressLength property has an OSNumber value that specifies the size of the
-        media address in bytes. 
-*/
-
-#define kIOMediaAddressLength     "IOMediaAddressLength"
-
-/*! @defined kIOMediaHeaderLength
-    @abstract A property of IONetworkInterface objects.
-    @discussion The kIOMediaHeaderLength property has an OSNumber value that specifies the size of the
-        media header in bytes. 
-*/
-
-#define kIOMediaHeaderLength      "IOMediaHeaderLength"
-
-/*! @defined kIOInterfaceFlags
-    @abstract A property of IONetworkInterface objects.
-    @discussion The kIOInterfaceFlags property has an OSNumber value that specifies the current value
-        of the interface flags. The flag constants are defined in
-        bsd/net/if.h. 
-*/
-
-#define kIOInterfaceFlags         "IOInterfaceFlags"
-
-/*! @defined kIOInterfaceExtraFlags
-    @abstract A property of IONetworkInterface objects.
-    @discussion The kIOInterfaceExtraFlags property has an OSNumber value that specifies the current
-        value of the interface extra flags. The extra flag constants are
-        defined in bsd/net/if.h. 
-*/
-
-#define kIOInterfaceExtraFlags    "IOInterfaceExtraFlags"
-
-/*! @defined kIOInterfaceUnit
-    @abstract A property of IONetworkInterface objects.
-    @discussion The kIOInterfaceUnit property has an OSNumber value that describes the unit number
-        assigned to the interface object. 
-*/
-
-#define kIOInterfaceUnit          "IOInterfaceUnit"
-
-/*! @defined kIOInterfaceState
-    @abstract A property of IONetworkInterface objects.
-    @discussion The kIOInterfaceState property has an OSNumber value that describes the current state
-        of the interface object. This property is not exported to BSD via
-        the ifnet structure. 
-*/
-
-#define kIOInterfaceState         "IOInterfaceState"
-
-/*! @defined kIOInterfaceNamePrefix
-    @abstract A property of IONetworkInterface objects.
-    @discussion The kIOInterfaceNamePrefix property has an OSString value that describes the string
-        prefix for the BSD name assigned to the interface. 
-*/
-
-#define kIOInterfaceNamePrefix    "IOInterfaceNamePrefix"
-
-/*! @defined kIOPrimaryInterface
-    @abstract A property of IONetworkInterface objects.
-    @discussion The kIOInterfaceNamePrefix property has an OSBoolean value that describes whether the
-        interface is the primary or the built-in network interface. 
-*/
-
-#define kIOPrimaryInterface       "IOPrimaryInterface"
-
-/*! @defined kIOBuiltin
-    @abstract kIOBuiltin is a property of IONetworkInterface
-        objects. It has an OSBoolean value.
-    @discussion The kIOBuiltin property describes whether the
-        interface is built-in. 
-*/
-
-#define kIOBuiltin                "IOBuiltin"
-
-/*! @defined kIOLocation
-    @abstract kIOLocation is a property of IONetworkInterface
-        objects. It has an OSString value.
-    @discussion The kIOLocation property describes the physical 
-        location of built-in interfaces. 
-*/
-
-#define kIOLocation               "IOLocation"
-
-/*! @enum InterfaceObjectStates
-    @discussion Constants used to encode the state of the interface object.
-   @constant kIONetworkInterfaceRegisteredState The interface object has
-        registered with the data link layer.
-    @constant kIONetworkInterfaceOpenedState One or more clients have an
-        open on the interface object.
-    @constant kIONetworkInterfaceDisabledState The interface is temporarily
-        unable to service its clients. This will occur when the network
-        controller that is servicing the interface has entered a low power
-        state that renders it unusable. 
-*/
-
-enum {
-    kIONetworkInterfaceRegisteredState  = 0x1,
-    kIONetworkInterfaceOpenedState      = 0x2,
-    kIONetworkInterfaceDisabledState    = 0x4
-};
-
-/*
- * Kernel
- */
-#if defined(KERNEL) && defined(__cplusplus)
-
-#include <IOKit/IOService.h>
-#include <IOKit/network/IONetworkData.h>
-#include <IOKit/network/IONetworkStats.h>
-#include <IOKit/network/IONetworkMedium.h>
-#include <net/kpi_interface.h>
-
-class  IONetworkController;
-class  IONetworkStack;
-class  IOCommandGate;
-
-/*! @typedef IOOutputAction
-    @discussion Prototype for an output packet handler that will process
-    all outbound packets sent to the interface from the data link layer.
-    An output handler is registered with the interface by calling
-    registerOutputHandler().
-    @param m A packet mbuf.
-    @param param A parameter for the output request. */
-
-typedef UInt32 (OSObject::*IOOutputAction)(mbuf_t, void * param);
-
-/*! @typedef BPF_FUNC
-    @discussion Prototype for the BPF tap handler. This will disappear
-    when the correct DLIL header file is included. */
-
-typedef int (*BPF_FUNC)(struct ifnet *, struct mbuf *);
-
-// Network event types recognized by inputEvent().
-//
-enum {
-    /* DLIL defined event, argument must be a pointer to a
-       kern_event_msg structure. */
-    kIONetworkEventTypeDLIL      = 0xff000001,
-
-    /* Link up event, no argument */
-    kIONetworkEventTypeLinkUp    = 0xff000002,
-
-    /* Link down event, no argument */
-    kIONetworkEventTypeLinkDown  = 0xff000003,
-
-    /* Wake on LAN support changed, no argument */
-    kIONetworkEventWakeOnLANSupportChanged = 0xff000004
-};
-
-/*! @class IONetworkInterface
-    @abstract Abstract class that manages the connection between an IONetworkController and the data link interface layer.
-    @discussion An IONetworkInterface object manages the connection between
-    an IONetworkController and the data link interface layer (DLIL).
-    All interactions between the controller and DLIL must go through an
-    interface object. Any data structures that are required by DLIL for a
-    particular interface type shall be allocated and mantained by the
-    interface object. IONetworkInterface is an abstract class that must be
-    extended by a concrete subclass to specialize for a particular network
-    type.
-
-    Although most drivers will allocate a single interface object,
-    it is possible for multiple interfaces to be attached to a single
-    controller. This controller driver will be responsible for arbitrating
-    access among its multiple interface clients.
-    
-    IONetworkInterface also maintains a dictionary of IONetworkData
-    objects containing statistics structures. Controller drivers can
-    ask for a particular data object by name and update the
-    statistics counters within directly. This dictionary is added to
-    the interface's property table and is visible outside of the kernel. 
-*/
-
-class IONetworkInterface : public IOService
-{
-    OSDeclareAbstractStructors( IONetworkInterface )
-
-    friend class IONetworkStack;
-
-private:
-    IONetworkController *   _controller;
-    ifnet_t                 _backingIfnet;
-    IORecursiveLock *       _ifLock;
-    OSSet *                 _clientSet;
-    OSNumber *              _stateBits;
-	bpf_packet_func         _inputFilterFunc;
-    bpf_packet_func         _outputFilterFunc;
-	OSObject *              _outTarget;
-    IOOutputAction          _outAction;
-    UInt32                  _clientVar[4];
-    OSDictionary *          _dataDict;
-    mbuf_t                  _inputQHead;
-    mbuf_t                  _inputQTail;
-    UInt32                  _inputQCount;
-
-    struct ExpansionData {
-		int				unit;
-		int				type;
-		int				mtu;
-		int				flags;
-		int				eflags;
-		int				addrlen;
-		int				hdrlen;
-		IONetworkStats  driverStats;
-		IONetworkStats  lastDriverStats;
-		struct ifnet_stat_increment_param inputDeltas;
-		IOLock			*detachLock;
-                char                          *remote_NMI_pattern;
-                unsigned int                   remote_NMI_len;
-    };
-
-    ExpansionData *         _reserved;
-
-	void _syncFromBackingIfnet() const;
-	void _syncToBackingIfnet();
-
-    bool _syncNetworkDataDict();
-    bool _setInterfaceProperty(UInt32   value,
-                               UInt32   mask,
-                               UInt32   bytes,
-                               void *   addr,
-                               char *   name);
-
-    SInt32 syncSIOCSIFMEDIA(IONetworkController * ctlr, struct ifreq * ifr);
-    SInt32 syncSIOCGIFMEDIA(IONetworkController * ctlr, struct ifreq * ifr, unsigned long cmd);
-    SInt32 syncSIOCSIFMTU(IONetworkController * ctlr, struct ifreq * ifr);
-	
-    static int  performGatedCommand(void *, void *, void *, void *, void *);
-    static errno_t  ioctl_shim(ifnet_t ifp, unsigned long cmd, void * data);
-    static errno_t  set_bpf_tap_shim(ifnet_t ifn, bpf_tap_mode mode, bpf_packet_func func);
-    static int  output_shim(ifnet_t ifp, mbuf_t);
-	void DLIL_INPUT(mbuf_t m_head);
-	static void  detach_shim(ifnet_t ifp);
-    static void powerChangeHandler(void *, void *, void *);
-
-public:
-
-/*! @function isPrimaryInterface
-    @abstract Queries whether the interface object provided represents
-    the "primary" network interface for the system.
-    @result Returns true if the interface provided is the primary inteface,
-    false otherwise. 
-*/
-
-    virtual bool isPrimaryInterface() const;
-
-/*! @function init
-    @abstract Initializes an IONetworkInterface object.
-    @discussion Initializes instance variables, and allocates resources.
-    @param controller A network controller object that will service
-    the interface object being initialized.
-    @result Returns true on success, false otherwise. 
-*/
-
-    virtual bool init( IONetworkController * controller );
-
-/*! @function isRegistered
-    @abstract Returns true if the interface has been registered with
-    the data link layer.
-    @discussion Once registered, the interface will be assigned a
-    BSD name (such as en0), and a kIOBSDNameKey property is added to the
-    property table containing this name. Calling this method performs
-    the same function as checking for the kIONetworkInterfaceRegisteredState
-    bit in the value returned by getInterfaceState().
-    @result Returns true if interface is registered. Returns false if the data link layer
-    has no references to this network interface, which implies that either the
-    interface has yet to attach to the data link layer, or the interface has
-    been detached. 
-*/
-
-    virtual bool isRegistered() const;
-
-/*! @function getInterfaceState
-    @abstract Reports the current state of the interface object by returning
-    the interface state flags.
-    @result Returns the interface state flags. 
-*/
-
-    virtual UInt32 getInterfaceState() const;
-
-/*! @function matchPropertyTable
-    @abstract Overrides the implementation in IOService to
-    implement family-specific matching.
-    @discussion When the gIOLocationMatchKey property is present in the
-    dictionary provided, then fail the match unless the kIOBSDNameKey property
-    is found. This is to prevent a premature match when hunting for a root
-    device for BSD. The presence of the kIOBSDNameKey property indicates that
-    the interface has registered with BSD, and is a valid candidate for
-    matching against the gIOLocationMatchKey property. If the
-    gIOLocationMatchKey property is absent, then this method will always
-    return true.
-    @param table The dictionary of properties to match against.
-    @param score Pointer to the current driver's probe score, not used.
-    @result Returns true for a positive match, false otherwise. 
-*/
-
-    virtual bool matchPropertyTable( OSDictionary * table,
-                                     SInt32       * score );
-
-/*! @function getController
-    @abstract Returns the provider, an IONetworkController object, that
-    is servicing this interface object.
-    @discussion This is the same controller object that was supplied as
-    an argument to the init() method.
-    @result Returns the IONetworkController object that is providing service to
-    this interface object. 
-*/
-
-    virtual IONetworkController * getController() const;
-
-/*! @function inputPacket
-    @abstract Submits a single packet received from the network to the data link layer.
-    @discussion This method is called by the network controller to submit a single packet
-    received from the network to the data link layer.  The packet received by this method may be added to an input
-    queue on the interface object, which the controller can use to postpone
-    the packet handoff to the upper layers, until all received packets have
-    been transferred to the input queue. A subsequent call to flushInputQueue(),
-    will transfer the entire contents of the queue to the data link layer,
-    by making a single call to dlil_input(). Other methods that can be used
-    to manage the input queue are flushInputQueue() and clearInputQueue().
-    This input queue is not protected by a lock. Access to the queue by the
-    controller must be serialized, otherwise its use must be avoided.
-    @param m The mbuf containing the received packet.
-    @param length Specify the size of the received packet in the mbuf.
-           The mbuf length fields are updated with this value. If zero,
-           then the mbuf length fields are not updated.
-    @param options Options defined by inputPacket() that the caller
-           can use to specify this method call.
-    @param param A parameter provided by the caller. Not used by
-           IONetworkInterface.
-    @result Returns the number of packets that were submitted to the data link layer,
-            or 0 if the packet was queued. 
-*/
-
-    virtual UInt32 inputPacket(mbuf_t,
-                               UInt32        length  = 0,
-                               IOOptionBits  options = 0,
-                               void *        param   = 0);
-
-/*! @enum InputOptionQueuePacket
-    @discussion The option bits that can be specified
-    in the options argument when calling inputPacket().
-    @constant kInputOptionQueuePacket Keep the packet provided in the
-    input packet queue. No packets are sent to the data link layers,
-    and the caller's thread will not venture outside the interface
-    object. Calls to inputPacket() must be serialized. 
-*/
-
-    enum {
-        kInputOptionQueuePacket = 0x1
-    };
-
-/*! @function flushInputQueue
-    @abstract Sends all packets held in the input queue to the data
-    link layer.
-    @discussion Remove all packets from the input queue and
-    send them to the data link layer by calling dlil_input(). This
-    method should be used in connection with the inputPacket() method,
-    to flush the input queue after inputPacket() was used to queue up
-    some number of received packets. See inputPacket() and clearInputQueue().
-    @result Returns the number of packets that were submitted to the data link layer.
-            May be zero if the queue was empty. 
-*/
-
-    virtual UInt32 flushInputQueue();
-
-/*! @function clearInputQueue
-    @abstract Removes and discards all packets in the input queue.
-    @discussion This method removes all packets from the input queue and
-    releases them back to the free mbuf pool. Also see flushInputQueue().
-    @result Returns the number of packets freed. 
-*/
-
-    virtual UInt32 clearInputQueue();
-
-/*! @function inputEvent
-    @abstract Sends an event to the data link layer.
-    @discussion This method can be used by the network controller to
-    send an event to the data link layer.
-    @param type A constant describing the event type.
-    @param data Data associated with the event.
-    @result Returns true if the event was delivered, false if the event type
-    specified is invalid, or if the event delivery was unsuccesful. 
-*/
-
-    virtual bool inputEvent(UInt32 type, void * data);
-
-/*! @function registerOutputHandler
-    @abstract Registers a target/action to handle output packets.
-    @discussion The interface object will forward all output packets,
-    received from the data link layer, to the output handler registered
-    through this method. The default target and action are set by the init()
-    method to the controller, and the handler returned by the controller's
-    getOutputHandler() method. Once the interface becomes registered with
-    the data link layer, this method will return false and will reject any
-    further changes.
-    @param target Target object that implements the output handler.
-    @param action The function that will process output packets.
-    @result Returns true if the target/action provided was accepted,
-    false otherwise. 
-*/
-
-    virtual bool registerOutputHandler(OSObject *      target,
-                                       IOOutputAction  action);
-
-/*! @function getNamePrefix
-    @abstract Returns a string containing the prefix to use when
-    creating a BSD name for this interface.
-    @discussion The BSD name for each interface object is generated by
-    concatenating a string returned by this method, with an unique
-    unit number assigned by IONetworkStack.
-    A concrete subclass of IONetworkInterface must implement this method
-    and enforce a consistent name for all of its instances.
-    @result Returns a pointer to a constant C string.
-*/
-
-    virtual const char * getNamePrefix() const = 0;
-
-/*! @function getInterfaceType
-    @abstract Gets the interface type.
-    @discussion This method returns the value in the if_type field in the ifnet structure.
-    @result Returns a constant defined in bsd/net/if_types.h header file
-    that describes the interface type. 
-*/
-
-    virtual UInt8  getInterfaceType() const;
-
-/*! @function getMaxTransferUnit
-    @abstract Gets the maximum transfer unit for this interface.
-    @discussion This method returns the value in the if_mtu field in the ifnet structure.
-    @result Returns the interface MTU size in bytes. 
-*/
-
-    virtual UInt32 getMaxTransferUnit() const;
-
-/*! @function getFlags
-    @abstract Gets the value of the interface flags.
-    @discussion This method returns the value in the if_flags field in the ifnet structure.
-    @result Returns the value of the interface flags. 
-*/
-
-    virtual UInt16 getFlags() const;
-
-/*! @function getExtraFlags
-    @abstract Gets the value of the interface extra flags.
-    @discussion This method returns the value in the if_eflags field in the ifnet structure.
-    @result Returns the value of the interface extra flags. 
-*/
-
-    virtual UInt32 getExtraFlags() const;
-
-/*! @function getMediaAddressLength
-    @abstract Gets the size of the media (MAC-layer) address.
-    @discussion This method returns the value in the if_addrlen field in the ifnet structure.
-    @result Returns the size of the media address in bytes. 
-*/
-
-    virtual UInt8  getMediaAddressLength() const;
-
-/*! @function getMediaHeaderLength
-    @abstract Gets the size of the media header.
-    @discussion This method returns the value in the if_hdrlen field in the ifnet structure.
-    @result Returns the size of the media header in bytes. 
-*/
-
-    virtual UInt8  getMediaHeaderLength() const;
-
-/*! @function getUnitNumber
-    @abstract Gets the unit number assigned to this interface object.
-    @discussion This method returns the value in the if_unit field in the ifnet structure.
-    @result Returns the assigned interface unit number. 
-*/
-
-    virtual UInt16 getUnitNumber() const;
-
-/*! @function addNetworkData
-    @abstract Adds an IONetworkData object to a dictionary managed by
-    the interface.
-    @param aData An IONetworkData object to be added to a dictionary
-    managed by the interface. This object is retained by the dictionary.
-    @result Returns true if the operation was successful, false otherwise. 
-*/
-
-    virtual bool addNetworkData(IONetworkData * aData);
-
-/*! @function removeNetworkData
-    @abstract Removes an entry from the IONetworkData dictionary
-    managed by the interface.
-    @discussion This method removes an entry from the IONetworkData dictionary
-    managed by the interface. The removed object is released.
-    @param aKey A unique OSSymbol identifying the IONetworkData object
-           to be removed from the dictionary.
-    @result Returns true if the operation was successful, false otherwise. 
-*/
-
-    virtual bool removeNetworkData(const OSSymbol * aKey);
-
-/*! @function removeNetworkData
-    @abstract Removes an entry from the IONetworkData dictionary
-    managed by the interface.
-    @discussion This method removes an entry from the IONetworkData dictionary
-    managed by the interface. The removed object is released.
-    @param aKey A unique string identifying the IONetworkData object
-           to be removed from the dictionary.
-    @result Returns true if the operation was successful, false otherwise. 
-*/
-
-    virtual bool removeNetworkData(const char * aKey);
-
-/*! @function getNetworkData
-    @abstract Gets an IONetworkData object from the interface that is
-    associated with the given key.
-    @param aKey The unique string identifying the IONetworkData object to be
-    returned to caller.
-    @result Returns a reference to the matching IONetworkData object,
-    or 0 if no match was found.
-*/
-
-    virtual IONetworkData * getNetworkData(const char * aKey) const;
-
-/*! @function getNetworkData
-    @abstract Gets an IONetworkData object from the interface that is
-    associated with the given key.
-    @param aKey The unique OSSymbol identifying the IONetworkData object to be
-    returned to caller.
-    @result Returns a reference to the matching IONetworkData object,
-    or 0 if no match was found. 
-*/
-
-    virtual IONetworkData * getNetworkData(const OSSymbol * aKey) const;
-
-/*! @function setProperties
-    @abstract Handles a request to set network interface properties from
-    kernel or non-kernel clients. 
-    @discussion For non-kernel clients, the preferred
-    access mechanism is through a user client connection.
-    @param properties An OSDictionary containing a collection of
-    properties.
-    @result Returns kIOReturnUnsupported if the interface did not
-    recognize any of the properties provided. Otherwise, the return
-    code will be kIOReturnSuccess to indicate no errors, or an
-    IOReturn error code to indicate that an error occurred while
-    handling one of the properties. 
-*/
-
-    virtual IOReturn setProperties( OSObject * properties );
-
-    // FIXME - Compatibility methods (to be removed)
-    IONetworkData * getParameter(const char * aKey) const;
-	bool setExtendedFlags(UInt32 flags, UInt32 clear = 0);
-
-    virtual IOReturn message( UInt32 type, IOService * provider, void * argument );
-
-/*! @function debuggerRegistered
-    @abstract Tells the IONetworkInterface that this interface will be used
-    by the debugger.
-*/
-    void debuggerRegistered(void);
-
-protected:
-
-/*! @function setInterfaceType
-    @abstract Sest the interface type.
-    @discussion Both the if_type field in the ifnet structure, and the
-    kIOInterfaceType property are updated with the value provided.
-    @param type A constant defined in bsd/net/if_types.h header file
-    that describes the interface type.
-    @result Returns true if the update was successful, false otherwise. 
-*/
-
-    virtual bool setInterfaceType(UInt8 type);
-
-/*! @function setMaxTransferUnit
-    @abstract Sets the maximum transfer unit for this interface.
-    @discussion Both the if_mtu field in the ifnet structure, and the
-    kIOMaxTransferUnit property are updated with the value provided.
-    @param mtu The interface MTU size in bytes.
-    @result Returns true if the update was successful, false otherwise. 
-*/
-
-    virtual bool setMaxTransferUnit(UInt32 mtu);
-
-/*! @function setFlags
-    @abstract Performs a read-modify-write operation on the current
-    interface flags value.
-    @discussion See bsd/net/if.h header file for the definition of the
-    flag constants. Both the if_flags field in the ifnet structure, and
-    the kIOInterfaceFlags property are updated with the value provided.
-    @param flags The bits that should be set.
-    @param clear The bits that should be cleared. If 0, then non
-    of the flags are cleared and the result is formed by OR'ing the
-    original flags value with the new flags.
-    @result Returns true if the update was successful, false otherwise. 
-*/
-
-    virtual bool setFlags(UInt16 flags, UInt16 clear = 0);
-
-/*! @function setExtraFlags
-    @abstract Performs a read-modify-write operation on the current
-    interface extra flags value.
-    @discussion See bsd/net/if.h header file for the definition of the
-    extra flag constants. Both the if_eflags field in the ifnet structure,
-    and the kIOInterfaceExtraFlags property are updated with the value
-    provided.
-    @param flags The bits that should be set.
-    @param flags The bits that should be set.
-    @param clear The bits that should be cleared. If 0, then non
-    of the flags are cleared and the result is formed by OR'ing the
-    original flags with the new flags.
-    @result Returns true if the update was successful, false otherwise. 
-*/
-
-    virtual bool setExtraFlags(UInt32 flags, UInt32 clear = 0);
-
-/*! @function setMediaAddressLength
-    @abstract Sets the size of the media (MAC-layer) address.
-    @discussion Both the if_addrlen field in the ifnet structure, and the
-    kIOMediaAddressLength property are updated with the value provided.
-    @param length The size of the media address in bytes.
-    @result Returns true if the update was successful, false otherwise.
-*/
-
-    virtual bool setMediaAddressLength(UInt8 length);
-
-/*! @function setMediaHeaderLength
-    @abstract Sets the size of the media header.
-    @discussion Both the if_hdrlen field in the ifnet structure, and the
-    kIOMediaHeaderLength property are updated with the value provided.
-    @param length The size of the media header in bytes.
-    @result Returns true if the update was successful, false otherwise. 
-*/
-
-    virtual bool setMediaHeaderLength(UInt8 length);
-
-/*! @function setUnitNumber
-    @abstract Assigns a unique unit number to this interface.
-    @discussion This method is called by IONetworkStack before the
-    interface is registered with the data link layer, to assign a
-    unique unit number to the interface object. Both the if_unit field
-    in the ifnet structure, and the kIOInterfaceUnit property are updated
-    with the value provided.
-    @param unit The unit number assigned to this interface object.
-    @result Returns true if the update was successful, false otherwise. 
-*/
-
-    virtual bool setUnitNumber(UInt16 unit);
-
-/*! @function free
-    @abstract Frees the IONetworkInterface object.
-    @discussion Resource allocated by init() are released, and
-    clearInputQueue() is called to ensure that the input queue is empty.
-*/
-
-    virtual void free();
-
-/*! @function handleOpen
-    @abstract Handles a client open on the interface.
-    @discussion This method is called by IOService::open() with the
-    arbitration lock held, and must return true to accept the client open.
-    This method will in turn call handleClientOpen() to qualify the client
-    requesting the open. Since the controller is opened by the interface
-    in a lazy fashion, the interface may also perform an open on the
-    controller before this method returns. If the controller was opened,
-    then controllerDidOpen() is called to notify interested subclasses.
-    Subclasses should not override this method.
-    @param client The client object that requested the open.
-    @param options Options passed to IOService::open().
-    @param argument Argument passed to IOService::open().
-    @result Returns true to accept the client open, false otherwise. 
-*/
-
-    virtual bool handleOpen(IOService *  client,
-                            IOOptionBits options,
-                            void *       argument);
-
-/*! @function handleClose
-    @abstract Handles a client close on the interface.
-    @discussion This method is called by IOService::close() with the
-    arbitration lock held. This method will in turn call handleClientClose()
-    to notify interested subclasses about the client close. If this represents
-    the last close, then the interface will also close the controller before
-    this method returns. The controllerWillClose() method will be called before
-    closing the controller. Subclasses should not override this method.
-    @param client The client object that requested the close.
-    @param options Options passed to IOService::close().
-*/
-
-    virtual void handleClose(IOService * client, IOOptionBits options);
-
-/*! @function handleIsOpen
-    @abstract Queries whether a client has an open on the interface.
-    @discussion This method is always called by IOService with the
-    arbitration lock held. Subclasses should not override this method.
-    @result Returns true if the specified client, or any client if none (0) is
-    specified, presently has an open on this object. 
-*/
-
-    virtual bool handleIsOpen(const IOService * client) const;
-
-/*! @function lock
-    @abstract Takes the network interface lock.
-    @discussion This method takes the recursive lock that protects the interface
-    state. All updates to the interface state and to the ifnet structure
-    must be performed while holding this lock. This call must be balanced
-    by a subsequent call to unlock(). 
-*/
-
-    virtual void lock();
-
-/*! @function unlock
-    @abstract Releases the network interface lock.
-    @discussion This method releases the recursive lock that protects the interface
-    state to balance a previous lock() call. 
-*/
-
-    virtual void unlock();
-
-/*! @function controllerDidOpen
-    @abstract Sends a notification that the interface has opened the network
-    controller.
-    @discussion This method is called by handleOpen() to notify subclasses that the
-    controller has been opened. The open on the controller is done when
-    the interface receives the initial open request from a client.
-    Subclasses can override this method and inspect the controller before
-    allowing the client open. The implementation in the subclass must first
-    call the method in super and check the return value. This method is
-    called with our arbitration lock held, hence issuing I/O to the
-    controller must be avoided to eliminate the possibility of a
-    deadlock.
-    @param controller The controller that was opened.
-    @result Must return true in order for handleOpen() to accept 
-    the client open. If the return is false, then the controller will be
-    closed and the client open will be refused. 
-*/
-
-    virtual bool controllerDidOpen(IONetworkController * controller);
-
-/*! @function controllerWillClose
-    @abstract Sends a notification that the interface will close the network
-    controller.
-    @discussion This method is called by handleClose() after receiving a close from the
-    last client, and just before the controller is closed. Subclasses
-    can override this method to perform any cleanup action before the 
-    controller is closed. This method is called with our arbitration lock
-    held, hence issuing I/O to the controller must be avoided to eliminate
-    the possibility of a deadlock.
-    @param controller The controller that is about to be closed. 
-*/
-
-    virtual void controllerWillClose(IONetworkController * controller);
-
-/*! @function performCommand
-    @abstract Handles an ioctl command sent to the network interface.
-    @discussion This method handles socket ioctl commands sent to the
-    network interface from DLIL.
-    IONetworkInterface handles commands that are common for all network
-    interface types. A subclass of IONetworkInterface may override this
-    method to override the command handling in IONetworkInterface, or
-    to extend the command processing to handle additional commands,
-    and then call super for any commands not handled in the subclass.
-    The ioctl commands handled by IONetworkInterface are
-        SIOCGIFMTU (Get interface MTU size),
-        SIOCSIFMTU (Set interface MTU size),
-        SIOCSIFMEDIA (Set media), and
-        SIOCGIFMEDIA (Get media and link status).
-    @param controller The controller object.
-    @param cmd The ioctl command code.
-    @param arg0 Command argument 0. Generally a pointer to an ifnet structure
-        associated with the interface.
-    @param arg1 Command argument 1.
-    @result Returns a BSD return value defined in bsd/sys/errno.h. 
-*/
-
-    virtual SInt32 performCommand(IONetworkController * controller,
-                                  unsigned long         cmd,
-                                  void *                arg0,
-                                  void *                arg1);
-
-public:
-
-/*! @function getIfnet
-    @abstract Gets the ifnet_t allocated by the interface object.
-    @discussion Reveal the interface's ifnet_t.  The ifnet_t is managed
-		primarily by IONetworkInterface, however sub-classes or drivers
-        can use this method to get a reference to the ifnet_t object for
-        interface KPI calls.
-    @result Returns the ifnet_t object that is attached to the datalink layer.
-*/
-
-    virtual ifnet_t getIfnet() const ;
-
-protected:
-
-/*! @function initIfnet
-    @abstract Initializes the ifnet structure given.
-    @discussion A concrete subclass must override this method and initialize
-    the ifnet structure given. The implementation in the subclass must call
-    super before it returns, to allow IONetworkInterface to complete the
-    initialization, and to insert the BSD shim functions implemented in
-    IONetworkInterface to the appropriate function pointer fields in the
-    ifnet structure. IONetworkInterface will call this method during its
-    init() method. Subclasses are encouraged to use the ifnet accessor
-    methods to update the ifnet structure when possible, since this will
-    ensure that properties in the registry will also be updated to reflect
-    any changes made.
-    @param ifp Pointer to an ifnet structure obtained earlier through
-               the getIfnet() method call.
-    @result Returns true on success, false otherwise. 
-*/
-
-    virtual bool initIfnet(struct ifnet * ifp);
-
-/*! @function handleClientOpen
-    @abstract Handles a client open on the interface.
-    @discussion This method is called by handleOpen() to handle an open from a client object.
-    Unlike handleOpen(), subclasses may override this method to catch an open
-    request from a client. This method is called with the arbitration lock held.
-    @param client The client object requesting the open.
-    @param options Options passed to IONetworkInterface::handleOpen().
-    @param argument Argument passed to IONetworkInterface::handleOpen().
-    @result Returns true to accept the client open, false to refuse it. 
-*/
-
-    virtual bool handleClientOpen(IOService *  client,
-                                  IOOptionBits options,
-                                  void *       argument);
-
-/*! @function handleClientClose
-    @abstract Handles a client close on the interface.
-    @discussion This method is called by handleClose() to handle a close from a client object.
-    Unlike handleClose(), subclasses may override this method to catch a close
-    reuqest from a client. This method is called with the arbitration lock held.
-    @param client The client object requesting the close.
-    @param options Options passed to IONetworkInterface::handleClose(). 
-*/
-
-    virtual void handleClientClose(IOService *  client,
-                                   IOOptionBits options);
-
-/*! @function newUserClient
-    @abstract Creates a connection for a non kernel client.
-    @discussion This method creates a new IOUserClient to service a connection to a
-    non kernel client.
-    @param owningTask The mach task requesting the connection.
-    @param security_id A token representing the access level for the task.
-    @param type A constant specifying the type of connection to be created.
-    An IONetworkUserClient object is created if the type specified is
-    kIONetworkUserClientTypeID.
-    @param handler The IOUserClient object returned.
-    @result Returns kIOReturnSuccess if an IONetworkUserClient was created,
-    kIOReturnNoMemory for a memory allocation error, or
-    kIOReturnBadArgument if the type specified is unknown. 
-*/
-
-    virtual IOReturn newUserClient(task_t           owningTask,
-                                   void *           security_id,
-                                   UInt32           type,
-                                   IOUserClient **  handler);
-
-/*! @function setInterfaceState
-    @abstract Updates the interface object state flags.
-    @discussion The kIOInterfaceState property is updated with the value
-    provided.
-    @param flags The bits that should be set.
-    @param clear The bits that should be cleared.
-    @result Returns the resulting interface state flags following any changes
-    made by this method. 
-*/
-
-    virtual UInt32 setInterfaceState( UInt32 set, UInt32 clear = 0 );
-
-/*! @function powerStateWillChangeTo
-    @abstract Handles a notification that the network controller servicing
-    this interface object is about to transition to a new power state.
-    @discussion This method will call the controllerWillChangePowerState() method
-    on the controller's work loop context to prepare for the power state change.
-    Subclasses should not override this method.
-    @param flags Flags that describe the capability of the controller in the new
-    power state.
-    @param stateNumber An index to a state in the network controller's
-    power state array that the controller is switching to.
-    @param policyMaker A reference to the network controller's policy-maker,
-    and is also the originator of this notification.
-    @result The return will always be IOPMAckImplied to indicate that the
-    preparation for the power change has already completed when this method
-    returns. 
-*/
-
-    virtual IOReturn powerStateWillChangeTo( IOPMPowerFlags  flags,
-                                             unsigned long   stateNumber,
-                                             IOService *     policyMaker );
-
-/*! @function powerStateDidChangeTo
-    @abstract Handles a notification that the network controller servicing
-    this interface object has transitioned to a new power state.
-    @discussion This method will call the controllerDidChangePowerState() method
-    on the controller's work loop context to prepare for the power state change.
-    Subclasses should not override this method.
-    @param flags Flags that describe the capability of the controller in the new
-    power state.
-    @param stateNumber An index to a state in the network controller's
-    power state array that the controller has switched to.
-    @param policyMaker A reference to the network controller's policy-maker,
-    and is also the originator of this notification.
-    @result The return will always be IOPMAckImplied to indicate that the
-    preparation for the power change has already completed when this method
-    returns. 
-*/
-
-    virtual IOReturn powerStateDidChangeTo( IOPMPowerFlags  flags,
-                                            unsigned long   stateNumber,
-                                            IOService *     policyMaker );
-
-/*! @function controllerWillChangePowerState
-    @abstract Handles a notification that the network controller servicing
-    this interface object is about to transition to a new power state.
-    @param controller The network controller object.
-    @param flags Flags that describe the capability of the controller in the new
-    power state.
-    @param stateNumber An index to a state in the network controller's
-    power state array that the controller is switching to.
-    @param policyMaker A reference to the network controller's policy-maker,
-    and is also the originator of this notification.
-    @result The return value is always kIOReturnSuccess. 
-*/
-
-    virtual IOReturn controllerWillChangePowerState(
-                               IONetworkController * controller,
-                               IOPMPowerFlags        flags,
-                               UInt32                stateNumber,
-                               IOService *           policyMaker);
-
-/*! @function controllerDidChangePowerState
-    @abstract Handles a notification that the network controller servicing
-    this interface object has transitioned to a new power state.
-    @param controller The network controller object.
-    @param flags Flags that describe the capability of the controller in the new
-    power state.
-    @param stateNumber An index to a state in the network controller's
-    power state array that the controller has switched to.
-    @param policyMaker A reference to the network controller's policy-maker,
-    and is also the originator of this notification.
-    @result The return value is always kIOReturnSuccess. 
-*/
-
-    virtual IOReturn controllerDidChangePowerState(
-                               IONetworkController * controller,
-                               IOPMPowerFlags        flags,
-                               UInt32                stateNumber,
-                               IOService *           policyMaker);
-
-public:
-    /* Override IOService::willTerminate() */
-
-    virtual bool willTerminate( IOService *  provider,
-                                IOOptionBits options );
-
-    /* Override IOService::serializeProperties() */
-
-    virtual bool serializeProperties( OSSerialize * s ) const;
-
-/*! @function attachToDataLinkLayer
-    @abstract Attaches the network interface to the BSD data link layer.
-    @discussion This function is called by the family to attach the network
-    interface managed by an IONetworkInterface to the BSD data link layer.
-    This call occurs after the interface initialization and setup, and the
-    assignment of an interface unit number. The family does not implicitly
-    close the gate on the network controller's work loop when calling this
-    function. Prior to the data link attachment, services provided by an
-    IONetworkInterface will be inaccessible to BSD networking, though the
-    object can be found in the I/O Kit Registry. Subclasses can override
-    this function to perform interface specific work.
-    @param options Options for the attach call. None are currently defined.
-    @param parameter Parameter for the attach call. Not currently used.
-    @result Returns kIOReturnSuccess on success. 
-*/
-
-    virtual IOReturn attachToDataLinkLayer( IOOptionBits options,
-                                            void *       parameter );
-
-    OSMetaClassDeclareReservedUsed(IONetworkInterface, 0);
-
-/*! @function detachFromDataLinkLayer
-    @abstract Detaches the network interface from the BSD data link layer.
-    @discussion This function is called by the family to detach the network
-    interface managed by an IONetworkInterface from the BSD data link layer.
-    This call is made when the interface is terminated, before the last close.
-    The family does not implicitly close the gate on the network controller's
-    work loop when calling this function. Subclasses can override this function
-    to perform additional interface specific work.
-    @param options Options for the detach call. None are currently defined.
-    @param parameter Parameter for the detach call. Not currently used. 
-*/
-
-    virtual void detachFromDataLinkLayer( IOOptionBits options,
-                                          void *       parameter );
-
-    OSMetaClassDeclareReservedUsed(IONetworkInterface, 1);
-
-protected:
-/*! @function feedInputPacketTap
-    @abstract Feed received packets to the BPF
-    @discussion This function is called by the family for each inbound packet
-    to feed it to the BPF function.  Interface classes can override if they
-    need to provide class specific functionality or modifications to the BPF tap.
-    @param mbuf Pointer to the packet.
-*/
-    virtual void feedPacketInputTap(mbuf_t);
-
-	OSMetaClassDeclareReservedUsed( IONetworkInterface,  2);
-
-/*! @function feedOutputPacketTap
-    @abstract Feed sent packets to the BPF
-    @discussion This function is called by the family for each outbound packet
-    to feed it to the BPF function.  Interface classes can override if they
-    need to provide class specific functionality or modifications to the BPF tap.
-    @param mbuf Pointer to the packet.
-*/
-	virtual void feedPacketOutputTap(mbuf_t);
-
-	OSMetaClassDeclareReservedUsed( IONetworkInterface,  3);
-	
-	virtual bool initIfnetParams(struct ifnet_init_params *params);
-    OSMetaClassDeclareReservedUsed( IONetworkInterface,  4);
-	
-public:
-    // Virtual function padding
-	OSMetaClassDeclareReservedUnused( IONetworkInterface,  5);
-	OSMetaClassDeclareReservedUnused( IONetworkInterface,  6);
-    OSMetaClassDeclareReservedUnused( IONetworkInterface,  7);
-    OSMetaClassDeclareReservedUnused( IONetworkInterface,  8);
-    OSMetaClassDeclareReservedUnused( IONetworkInterface,  9);
-    OSMetaClassDeclareReservedUnused( IONetworkInterface, 10);
-    OSMetaClassDeclareReservedUnused( IONetworkInterface, 11);
-    OSMetaClassDeclareReservedUnused( IONetworkInterface, 12);
-    OSMetaClassDeclareReservedUnused( IONetworkInterface, 13);
-    OSMetaClassDeclareReservedUnused( IONetworkInterface, 14);
-    OSMetaClassDeclareReservedUnused( IONetworkInterface, 15);
-};
-
-#endif /* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* !_IONETWORKINTERFACE_H */
diff --git a/i386/include/IOKit/network/IONetworkMedium.h b/i386/include/IOKit/network/IONetworkMedium.h
deleted file mode 100644
index 2a64f3d..0000000
--- a/i386/include/IOKit/network/IONetworkMedium.h
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IONETWORKMEDIUM_H
-#define _IONETWORKMEDIUM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <net/if_media.h>
-
-/*! @typedef IOMediumType
-    @discussion A 32-bit value divided into fields which describes
-    a single medium type. */
-
-typedef UInt32 IOMediumType;
-
-/*! @defined kIOMediumType
-    @abstract A property of IONetworkMedium objects.
-    @discussion The kIOMediumType property is an OSNumber object that describes the type of
-        medium that this object represents. 
-*/
-
-#define kIOMediumType           "Type"
-
-/*! @defined kIOMediumFlags
-    @abstract A property of IONetworkMedium objects.
-    @discussion The kIOMediumFlags property is an OSNumber object that describes a set of
-        attributes assigned to the medium. 
-*/
-
-#define kIOMediumFlags          "Flags"
-
-/*! @defined kIOMediumSpeed
-    @abstract A property of IONetworkMedium objects.
-    @discussion The kIOMediumSpeed property is an OSNumber object that describes the maximum link
-        speed supported by the medium in bits per second. 
-*/
-
-#define kIOMediumSpeed          "Speed"
-
-/*! @defined kIOMediumIndex
-    @abstract A property of IONetworkMedium objects.
-    @discussion The kIOMediumIndex property is an OSNumber object that describes an index assigned
-        by the owner of the medium object. Its interpretation is driver
-        specific.
-*/
-
-#define kIOMediumIndex          "Index"
-
-//===========================================================================
-// Medium Type (IOMediumType).
-//
-// The medium type is encoded by a 32-bit value. The definitions of
-// the fields and the encoding for each field is adapted from FreeBSD.
-//
-// Bits     Definition
-// -------------------
-//  4-0     medium subtype
-//  7-5     network type
-// 15-8     network specific options
-// 19-16    reserved
-// 27-20    common options
-// 31-28    instance number
-
-// Ethernet.
-//
-enum {
-    kIOMediumEthernet             =  IFM_ETHER,
-    kIOMediumEthernetAuto         =  ( IFM_AUTO    | IFM_ETHER ),
-    kIOMediumEthernetManual       =  ( IFM_MANUAL  | IFM_ETHER ),
-    kIOMediumEthernetNone         =  ( IFM_NONE    | IFM_ETHER ),
-    kIOMediumEthernet10BaseT      =  ( IFM_10_T    | IFM_ETHER ),
-    kIOMediumEthernet10Base2      =  ( IFM_10_2    | IFM_ETHER ),
-    kIOMediumEthernet10Base5      =  ( IFM_10_5    | IFM_ETHER ),
-    kIOMediumEthernet100BaseTX    =  ( IFM_100_TX  | IFM_ETHER ),
-    kIOMediumEthernet100BaseFX    =  ( IFM_100_FX  | IFM_ETHER ),
-    kIOMediumEthernet100BaseT4    =  ( IFM_100_T4  | IFM_ETHER ),
-    kIOMediumEthernet100BaseVG    =  ( IFM_100_VG  | IFM_ETHER ),
-    kIOMediumEthernet100BaseT2    =  ( IFM_100_T2  | IFM_ETHER ),
-    kIOMediumEthernet1000BaseSX   =  ( IFM_1000_SX | IFM_ETHER ),
-    kIOMediumEthernet10BaseSTP    =  ( IFM_10_STP  | IFM_ETHER ),
-    kIOMediumEthernet10BaseFL     =  ( IFM_10_FL   | IFM_ETHER ),
-    kIOMediumEthernet1000BaseLX   =  ( IFM_1000_LX | IFM_ETHER ),
-    kIOMediumEthernet1000BaseCX   =  ( IFM_1000_CX | IFM_ETHER ),
-    kIOMediumEthernet1000BaseTX   =  ( IFM_1000_T  | IFM_ETHER ), //deprecated- use kIOMediumEthernet1000BaseT instead
-    kIOMediumEthernet1000BaseT    =  ( IFM_1000_T  | IFM_ETHER ),
-    kIOMediumEthernetHomePNA1     =  ( IFM_HPNA_1  | IFM_ETHER ),
-	kIOMediumEthernet10GBaseSR    =  ( IFM_10G_SR  | IFM_ETHER ),
-	kIOMediumEthernet10GBaseLR    =  ( IFM_10G_LR  | IFM_ETHER ),
-    kIOMediumEthernet10GBaseCX4   =  ( IFM_10G_CX4 | IFM_ETHER ),
-    kIOMediumEthernet10GBaseT     =  ( IFM_10G_T   | IFM_ETHER )
-};
-
-// IEEE 802.11 Wireless.
-//
-enum {
-    kIOMediumIEEE80211            =  IFM_IEEE80211,
-    kIOMediumIEEE80211Auto        =  ( IFM_AUTO           | IFM_IEEE80211 ),
-    kIOMediumIEEE80211Manual      =  ( IFM_MANUAL         | IFM_IEEE80211 ),
-    kIOMediumIEEE80211None        =  ( IFM_NONE           | IFM_IEEE80211 ),
-    kIOMediumIEEE80211FH1         =  ( IFM_IEEE80211_FH1  | IFM_IEEE80211 ),
-    kIOMediumIEEE80211FH2         =  ( IFM_IEEE80211_FH2  | IFM_IEEE80211 ),
-    kIOMediumIEEE80211DS2         =  ( IFM_IEEE80211_DS2  | IFM_IEEE80211 ),
-    kIOMediumIEEE80211DS5         =  ( IFM_IEEE80211_DS5  | IFM_IEEE80211 ),
-    kIOMediumIEEE80211DS11        =  ( IFM_IEEE80211_DS11 | IFM_IEEE80211 ),
-    kIOMediumIEEE80211DS1         =  ( IFM_IEEE80211_DS1  | IFM_IEEE80211 ),
-    kIOMediumIEEE80211OptionAdhoc =  IFM_IEEE80211_ADHOC
-};
-
-// Common options.
-//
-enum {
-    kIOMediumOptionFullDuplex     = IFM_FDX,
-    kIOMediumOptionHalfDuplex     = IFM_HDX,
-    kIOMediumOptionFlowControl    = IFM_FLOW,
-    kIOMediumOptionFlag0          = IFM_FLAG0,
-    kIOMediumOptionFlag1          = IFM_FLAG1,
-    kIOMediumOptionFlag2          = IFM_FLAG2,
-    kIOMediumOptionLoopback       = IFM_LOOP
-};
-
-// Medium type masks.
-//
-#define kIOMediumSubTypeMask        IFM_TMASK
-#define kIOMediumNetworkTypeMask    IFM_NMASK
-#define kIOMediumOptionsMask        IFM_OMASK
-#define kIOMediumCommonOptionsMask  IFM_GMASK
-#define kIOMediumInstanceShift      IFM_ISHIFT
-#define kIOMediumInstanceMask       IFM_IMASK
-
-// Medium type field accessors.
-//
-#define IOMediumGetSubType(x)       ((x)  & kIOMediumSubTypeMask)
-#define IOMediumGetNetworkType(x)   ((x)  & kIOMediumNetworkMask)
-#define IOMediumGetInstance(x)      (((x) & kIOMediumInstanceMask) >> \
-                                            kIOMediumInstanceShift)
-
-//===========================================================================
-// Medium flags.
-
-
-//===========================================================================
-// Link status bits.
-//
-enum {
-    kIONetworkLinkValid        = IFM_AVALID,    // link status is valid
-    kIONetworkLinkActive       = IFM_ACTIVE     // link is up/active.
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-//===========================================================================
-// IONetworkMedium class.
-
-#ifdef KERNEL
-
-#include <libkern/c++/OSObject.h>
-#include <libkern/c++/OSSymbol.h>
-
-/*! @class IONetworkMedium
-    @abstract An object that encapsulates information about a network
-    medium (i.e. 10Base-T, or 100Base-T Full Duplex). 
-    @discussion The main purpose of
-    this object is for a network driver to advertise its media capability,
-    through a collection of IONetworkMedium objects stored in a dictionary
-    in its property table. IONetworkMedium supports serialization, and will
-    encode its properties in the form of a dictionary to the serialization
-    stream when instructed. This will allow a user-space application to
-    browse the set of media types supported by the controller. 
-*/
-
-class IONetworkMedium : public OSObject
-{
-    OSDeclareDefaultStructors( IONetworkMedium )
-
-protected:
-    IOMediumType      _type;
-    UInt32            _flags;
-    UInt64            _speed;
-    UInt32            _index;
-    const OSSymbol *  _name;
-
-    struct ExpansionData { };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *_reserved;
-
-
-/*! @function free
-    @abstract Frees the IONetworkMedium object. 
-*/
-
-    virtual void free();
-
-public:
-
-/*! @function nameForType
-    @abstract Creates a name that describes a medium type.
-    @discussion Given a medium type, creates an OSymbol object that
-    describes the medium type. There is a 1-to-1 mapping between the
-    medium type, and the medium name created by this method. The caller
-    is responsible for releasing the OSSymbol object returned.
-    @param type A medium type. See IONetworkMedium.h for type encoding.
-    @result Returns an OSSymbol object is created based on the type provided. 
-*/
-
-    static const OSSymbol * nameForType(IOMediumType type);
-
-/*! @function addMedium
-    @abstract Adds an IONetworkMedium object to a dictionary.
-    @discussion A helper function to add an IONetworkMedium object to a
-    given dictionary. The name of the medium is used as the key for the
-    new dictionary entry.
-    @param dict An OSDictionary object where the medium object should be
-    added as a new entry.
-    @param medium The IONetworkMedium object to add to the dictionary.
-    @result Returns true on success, false otherwise. 
-*/
-
-    static bool addMedium(OSDictionary *          dict,
-                          const IONetworkMedium * medium);
-
-/*! @function removeMedium
-    @abstract Removes an IONetworkMedium object from a dictionary.
-    @discussion A helper function to remove an entry in a dictionary.
-    @param dict The OSDictionary object where the medium object should be
-    removed from.
-    @param medium The name of this medium object is used as the key. 
-*/
-
-    static void removeMedium(OSDictionary *          dict,
-                             const IONetworkMedium * medium);
-
-/*! @function getMediumWithType
-    @abstract Finds a medium object from a dictionary with a given type.
-    @discussion This method iterates through a dictionary and returns an IONetworkMedium
-    entry with the given type. An optional mask supplies the don't care bits.
-    @param dict The dictionary to look for a matching entry.
-    @param type Search for an entry with this type.
-    @param mask The don't care bits in IOMediumType. Defaults to 0, which
-    implies that a perfect match is desired.
-    @result Returns the first matching IONetworkMedium entry found,
-    or 0 if no match was found. 
-*/
-
-    static IONetworkMedium * getMediumWithType(const OSDictionary * dict,
-                                               IOMediumType         type,
-                                               IOMediumType         mask = 0);
-
-/*! @function getMediumWithIndex
-    @abstract Finds a medium object from a dictionary with a given index.
-    @discussion This method iterates through a dictionary and returns an IONetworkMedium
-    entry with the given index. An optional mask supplies the don't care bits.
-    @param dict The dictionary to look for a matching entry.
-    @param index Search for an entry with the given index.
-    @param mask The don't care bits in index. Defaults to 0, which
-    implies that a perfect match is desired.
-    @result Returns the first matching IONetworkMedium entry found,
-    or 0 if no match was found. 
-*/
-
-    static IONetworkMedium * getMediumWithIndex(const OSDictionary * dict,
-                                                UInt32               index,
-                                                UInt32               mask = 0);
-
-/*! @function init
-    @abstract Initializes an IONetworkMedium object.
-    @param type The medium type, this value is encoded with bits defined in
-           IONetworkMedium.h.
-    @param speed The maximum (or the only) link speed supported over this 
-           medium in units of bits per second.
-    @param flags An optional flag for the medium object.
-           See IONetworkMedium.h for defined flags.
-    @param index An optional index number assigned by the owner.
-           Drivers can use this to store an index to a media table in
-           the driver, or it may map to a driver-defined media type.
-    @param name An optional name assigned to this medium object. If 0,
-           then a name will be created based on the medium type by
-           calling IONetworkMedium::nameForType(). Since the name of
-           the medium is used as a key when inserted into a dictionary,
-           the name chosen must be unique within the scope of the owner.
-    @result Returns true on success, false otherwise. 
-*/
-
-    virtual bool init(IOMediumType  type,
-                      UInt64        speed,
-                      UInt32        flags = 0,
-                      UInt32        index = 0,
-                      const char *  name  = 0);
-
-/*! @function medium
-    @abstract Factory method that allocates and initializes an IONetworkMedium object.
-    @param type The medium type, this value is encoded with bits defined in
-           IONetworkMedium.h.
-    @param speed The maximum (or the only) link speed supported over this 
-           medium in units of bits per second.
-    @param flags An optional flag for the medium object.
-           See IONetworkMedium.h for defined flags.
-    @param index An optional index number assigned by the owner.
-           Drivers can use this to store an index to a media table in
-           the driver, or it may map to a driver-defined media type.
-    @param name An optional name assigned to this medium object. If 0,
-           then a name will be created based on the medium type by
-           calling IONetworkMedium::nameForType(). Since the name of
-           the medium is used as a key when inserted into a dictionary,
-           the name chosen must be unique within the scope of the owner.
-    @result Returns an IONetworkMedium instance on success, or 0 otherwise. 
-*/
-
-    static IONetworkMedium * medium(IOMediumType  type,
-                                    UInt64        speed,
-                                    UInt32        flags = 0,
-                                    UInt32        index = 0,
-                                    const char *  name  = 0);
-
-/*! @function getType
-    @result Returns the medium type assigned to this medium object. 
-*/
-
-    virtual IOMediumType  getType() const;
-
-/*! @function getSpeed
-    @result Returns the maximum link speed supported by this medium. 
-*/
-
-    virtual UInt64        getSpeed() const;
-
-/*! @function getFlags
-    @result Returns the medium flags. 
-*/
-
-    virtual UInt32        getFlags() const;
-
-/*! @function getIndex
-    @result Returns the assigned medium index. 
-*/
-
-    virtual UInt32        getIndex() const;
-
-/*! @function getName
-    @result Returns the name assigned to this medium object. 
-*/
-
-    virtual const OSSymbol * getName() const;
-
-/*! @function getKey
-    @result Returns the key to use for this medium object. This key should be
-    used when this object is added to a dictionary. Same as getName(). 
-*/
-
-    virtual const OSSymbol * getKey() const;
-
-/*! @function isEqualTo
-    @abstract Tests for equality between two IONetworkMedium objects.
-    @discussion Two IONetworkMedium objects are considered equal if
-    they have similar properties assigned to them during initialization.
-    @param medium An IONetworkMedium to test against the IONetworkMedium
-    object being called.
-    @result Returns true if equal, false otherwise. 
-*/
-
-    virtual bool isEqualTo(const IONetworkMedium * medium) const;
-
-/*! @function isEqualTo
-    @abstract Tests for equality between a IONetworkMedium object and an
-    OSObject.
-    @discussion The OSObject is considered equal to the IONetworkMedium
-    object if the OSObject is an IONetworkMedium, and they have
-    similar properties assigned to them during initialization.
-    @param obj An OSObject to test against an IONetworkMedium object.
-    @result Returns true if equal, false otherwise. 
-*/
-
-    virtual bool isEqualTo(const OSMetaClassBase * obj) const;
-
-/*! @function serialize
-    @abstract Serializes the IONetworkMedium object.
-    @discussion A dictionary is created containing the properties
-    assigned to this medium object, and this dictionary is then
-    serialized using the OSSerialize object provided.
-    @param s An OSSerialize object.
-    @result Returns true on success, false otherwise. 
-*/
-
-    virtual bool serialize(OSSerialize * s) const;
-
-    // Virtual function padding
-    OSMetaClassDeclareReservedUnused( IONetworkMedium,  0);
-    OSMetaClassDeclareReservedUnused( IONetworkMedium,  1);
-    OSMetaClassDeclareReservedUnused( IONetworkMedium,  2);
-    OSMetaClassDeclareReservedUnused( IONetworkMedium,  3);
-};
-
-// Translate getKey() to getName().
-//
-inline const OSSymbol * IONetworkMedium::getKey() const
-{
-    return getName();
-}
-
-#endif /* KERNEL */
-
-#endif /* !_IONETWORKMEDIUM_H */
diff --git a/i386/include/IOKit/network/IONetworkStats.h b/i386/include/IOKit/network/IONetworkStats.h
deleted file mode 100644
index f6e6f9f..0000000
--- a/i386/include/IOKit/network/IONetworkStats.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IONETWORKSTATS_H
-#define _IONETWORKSTATS_H
-
-/*! @header IONetworkStats.h
-    @discussion Generic network statistics. */
-
-//------------------------------------------------------------------------
-// Generic network statistics. Common to all network interfaces.
-//
-// WARNING: This structure must match the statistics field in
-// ifnet->if_data. This structure will overlay a portion of ifnet.
-
-/*! @typedef IONetworkStats
-        @discussion Generic network statistics structure.
-        @field inputPackets count input packets.
-        @field inputErrors count input errors.
-        @field outputPackets count output packets.
-        @field outputErrors count output errors.
-        @field collisions count collisions on CDMA networks. */
-
-typedef struct {
-        UInt32  inputPackets;
-        UInt32  inputErrors;
-        UInt32  outputPackets;
-        UInt32  outputErrors;
-        UInt32  collisions;
-} IONetworkStats;
-
-/*! @defined kIONetworkStatsKey
-        @discussion Defines the name of an IONetworkData that contains
-        an IONetworkStats. */
-
-#define kIONetworkStatsKey              "IONetworkStatsKey"
-
-//------------------------------------------------------------------------
-// Output queue statistics.
-
-/*! @typedef IOOutputQueueStats
-        @discussion Statistics recorded by IOOutputQueue objects.
-        @field capacity queue capacity.
-        @field size current size of the queue.
-        @field peakSize peak size of the queue.
-        @field dropCount number of packets dropped.
-        @field outputCount number of output packets.
-        @field retryCount number of retries.
-        @field stallCount number of queue stalls. */
-
-typedef struct {
-        UInt32  capacity;
-        UInt32  size;
-        UInt32  peakSize;
-        UInt32  dropCount;
-        UInt32  outputCount;
-        UInt32  retryCount;
-        UInt32  stallCount;
-        UInt32  reserved[4];
-} IOOutputQueueStats;
-
-/*! @defined kIOOutputQueueStatsKey
-        @discussion Defines the name of an IONetworkData that contains
-        an IOOutputQueueStats. */
-
-#define kIOOutputQueueStatsKey          "IOOutputQueueStatsKey"
-
-#endif /* !_IONETWORKSTATS_H */
diff --git a/i386/include/IOKit/network/IOOutputQueue.h b/i386/include/IOKit/network/IOOutputQueue.h
deleted file mode 100644
index cb40702..0000000
--- a/i386/include/IOKit/network/IOOutputQueue.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOOUTPUTQUEUE_H
-#define _IOOUTPUTQUEUE_H
-
-#include <IOKit/network/IONetworkInterface.h>
-
-// Forward declarations.
-//
-struct mbuf;
-class  IONetworkData;
-
-// FIXME - We do not want the enqueue/dequeue macros defined in queue.h.
-//
-#undef enqueue(queue,elt)
-#undef dequeue(queue)
-
-// FIXME - Belongs in IOBasicOutputQueue.h
-//
-/*! @enum OutputPacketStatus
-    @abstract The status of the packet sent to the target.
-    @constant kIOOutputStatusMask Define the status field in the return code.
-    @constant kIOOutputStatusAccept Packet was accepted by the target.
-    @constant kIOOutputStatusDropped Packet accepted, but was also dropped.
-    @constant kIOOutputStatusRetry Target ran out of resources, and is unable
-    to accept the packet. The ownership of the packet reverts back to the
-    queue. 
-*/
-
-enum {
-    kIOOutputStatusMask     = 0x00ff,
-    kIOOutputStatusAccepted = 0x0000,
-    kIOOutputStatusDropped  = 0x0001,
-    kIOOutputStatusRetry    = 0x0002
-};
-
-/*! @enum OutputCommands
-    @abstract A command requested by the target.
-    @constant kIOOutputCommandMask Define the command field in the return code.
-    @constant kIOOutputCommandNone No command.
-    @constant kIOOutputCommandStall A command to stall the queue. 
-*/
-
-enum {
-    kIOOutputCommandMask    = 0xff00,
-    kIOOutputCommandNone    = 0x0000,
-    kIOOutputCommandStall   = 0x0100
-};
-
-/*! @enum OutputHandlerReturnCodes
-    @abstract Common return codes returned by the target's output handler.
-    @constant kIOReturnOutputSuccess Packet was accepted.
-    @constant kIOReturnOutputDropped Packet was dropped.
-    @constant kIOReturnOutputStall   Stall the queue and retry the same packet
-              when the queue is restarted. 
-*/
-
-enum {
-    kIOReturnOutputSuccess = (kIOOutputStatusAccepted | kIOOutputCommandNone),
-    kIOReturnOutputDropped = (kIOOutputStatusDropped  | kIOOutputCommandNone),
-    kIOReturnOutputStall   = (kIOOutputStatusRetry    | kIOOutputCommandStall)
-};
-
-/*! @class IOOutputQueue
-    @abstract A packet queue that supports multiple producers and a single
-    consumer. 
-    @discussion Each producer, or a client thread, will deliver a chain of packets
-    to the queue. A single consumer will remove packets from the queue one at a
-    time and forward it to the registered target/action. This object may be used
-    by an IONetworkController on the output (transmit) side to handle the output
-    packet flow downstream from an IONetworkInterface, and then call the driver's
-    output function. IOOutputQueue is an abstract class that provides an interface
-    for its subclasses. Concrete subclasses will complete the implementation, and
-    specify the context that the target is called for packets removed from
-    the queue. 
-*/
-
-class IOOutputQueue : public OSObject
-{
-    OSDeclareAbstractStructors( IOOutputQueue )
-
-private:
-
-    static void runServiceThread(thread_call_param_t, thread_call_param_t);
-
-protected:
-
-    thread_call_t  _callEntry;  // callout entry structure.
-
-    struct ExpansionData { };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *_reserved;
-
-
-/*! @function init
-    @abstract Initializes an IOOutputQueue object.
-    @result Returns true if initialized successfully, false otherwise. 
-*/
-
-    virtual bool init();
-
-/*! @function free
-    @abstract Frees the IOOutputQueue object.
-    @discussion Release allocated resources, then call super::free(). 
-*/
-
-    virtual void free();
-
-/*! @function scheduleServiceThread
-    @abstract Schedules a service thread callout.
-    @discussion This method can be called by service() to schedule
-    a thread that will call serviceThread() when it starts running.
-    @param param A parameter to pass to the serviceThread() method.
-    @result Returns true if a thread callout was scheduled, false otherwise. 
-*/
-
-    virtual bool scheduleServiceThread(void * param);
-
-/*! @function cancelServiceThread
-    @abstract Cancels any pending service thread callout.
-    @result Returns true if a previously scheduled thread callout was canceled,
-    false otherwise. 
-*/
-
-    virtual bool cancelServiceThread();
-
-/*! @function serviceThread
-    @abstract Method called by the scheduled service thread when it
-    starts to run.
-    @discussion Must be implemented by a subclass that calls
-    scheduleServiceThread(). The default implementation does nothing.
-    @param param A parameter that was given to scheduleServiceThread()
-    when the service thread was scheduled. 
-*/
-
-    virtual void serviceThread(void * param);
-                                             
-public:
-
-/*! @function start
-    @abstract Starts up the queue.
-    @discussion This method is called by the target to start the queue. This will allow
-    packets to be removed from the queue, then delivered to the target.
-    @result Returns true if the queue was started successfully, false otherwise. 
-*/
-
-    virtual bool start() = 0;
-
-/*! @function stop
-    @abstract Stops the queue.
-    @discussion Stop the queue and prevent it from sending packets to its
-    target.
-    @result Returns the previous running state of the queue,
-    true if the queue was running, false if the queue was already stopped. 
-*/
-
-    virtual bool stop() = 0;
-
-/*! @function service
-    @abstract Services the queue.
-    @discussion Manage the queue after it has been started.
-    @param options Options for the service request.
-    @result Returns a return value to indicate the service result. 
-*/
-
-    virtual bool service(IOOptionBits options = 0) = 0;
-
-/*! @function flush
-    @abstract Drops and frees all packets currently held by the queue.
-    @result Returns the number of packets that were dropped and freed. 
-*/
-
-    virtual UInt32 flush() = 0;
-
-/*! @function setCapacity
-    @abstract Changes the number of packets that the queue can hold
-    before it begins to drop excess packets.
-    @param capacity The new desired capacity.
-    @result Returns true if the new capacity was accepted, false otherwise.
-*/
-
-    virtual bool setCapacity(UInt32 capacity) = 0;
-
-/*! @function getCapacity
-    @abstract Gets the number of packets that the queue can hold.
-    @discussion The queue will begin to drop incoming packets when the
-    size of queue reaches its capacity.
-    @result Returns the current queue capacity. 
-*/
-
-    virtual UInt32 getCapacity() const = 0;
-
-/*! @function getSize
-    @abstract Gets the number of packets currently held in the queue.
-    @result Returns the size of the queue. 
-*/
-
-    virtual UInt32 getSize() const = 0;
-
-/*! @function enqueue
-    @abstract Adds a packet, or a chain of packets, to the queue.
-    @discussion This method is called by a client to add a packet, or a chain of packets,
-    to the queue.  A packet is described by an mbuf chain, while a chain
-    of packets is constructed by linking multiple mbuf chains via the
-    m_nextpkt field.
-    @param m A single packet, or a chain of packets.
-    @param param A parameter provided by the caller.
-    @result Returns a return code. 
-*/
-
-    virtual UInt32 enqueue(mbuf_t m, void * param) = 0;
-
-/*! @function getOutputHandler
-    @abstract Returns the address of a function that is designated to handle
-    incoming packets sent to the queue object.
-    @result Returns the address of the enqueue() method. 
-*/
-
-    virtual IOOutputAction getOutputHandler() const;
-
-/*! @function getStatisticsData
-    @abstract Returns an IONetworkData object containing statistics counters
-    updated by the queue.
-    @result Returns an IONetworkData object. This implementation will always return
-    0. 
-*/
-
-    virtual IONetworkData * getStatisticsData() const;
-
-    // Virtual function padding
-    OSMetaClassDeclareReservedUnused( IOOutputQueue,  0);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue,  1);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue,  2);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue,  3);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue,  4);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue,  5);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue,  6);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue,  7);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue,  8);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue,  9);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue, 10);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue, 11);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue, 12);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue, 13);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue, 14);
-    OSMetaClassDeclareReservedUnused( IOOutputQueue, 15);
-};
-
-#endif /* !_IOOUTPUTQUEUE_H */
diff --git a/i386/include/IOKit/network/IOPacketQueue.h b/i386/include/IOKit/network/IOPacketQueue.h
deleted file mode 100644
index 88d8c21..0000000
--- a/i386/include/IOKit/network/IOPacketQueue.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright (c) 1998-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOPACKETQUEUE_H
-#define _IOPACKETQUEUE_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOLocks.h>
-extern "C" {
-#include <sys/kpi_mbuf.h>
-}
-// Forward declarations.
-//
-struct mbuf;
-struct IOMbufQueue;
-
-// We do not want the enqueue/dequeue macros defined in queue.h.
-//
-// #warning queue.h should not be included
-#undef enqueue(queue,elt)
-#undef dequeue(queue)
-
-/*! @class IOPacketQueue
-    @abstract Implements a bounded FIFO queue of mbuf packets. 
-    @discussion Packets are
-    removed from the head of the queue (dequeue), and new packets are added
-    to the tail of the queue (enqueue). A spinlock is used to synchronize
-    access to the queue between methods that have a "lock" prefix. 
-*/
-
-class IOPacketQueue : public OSObject
-{   
-    OSDeclareDefaultStructors( IOPacketQueue )
-
-protected:
-    IOMbufQueue *   _queue;   // mbuf queue
-    IOSimpleLock *  _lock;    // spinlock for synchronized methods
-
-    struct ExpansionData { };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData *_reserved;
-
-/*! @function free
-    @abstract Frees the IOPacketQueue object.
-    @discussion All packets held by the queue are released back to the free
-    pool, resource are deallocated, then super::free() is called. 
-*/
-
-    virtual void free();
-
-/*! @var IOPacketQueueDefaultCapacity 
-    @abstract Describes the default capacity of the 
-    queue object. 
-    @discussion The capacity is only observed by the enqueue() method.
-    Therefore, it is possible for the size of the queue to exceed its
-    capacity when other methods, such as prepend(), are used to add packets
-    to the queue. 
-*/
-
-    static const UInt32 IOPacketQueueDefaultCapacity = 100;
-
-public:
-
-/*! @function withCapacity
-    @abstract Factory method that constructs and initializes an
-    IOPacketQueue object.
-    @param capacity The initial capacity of the queue object. Can be
-    later changed by calling the setCapacity() method.
-    @result Returns an IOPacketQueue instance on success, or 0 otherwise. 
-*/
-
-    static IOPacketQueue * withCapacity(UInt32 capacity = 
-                                        IOPacketQueueDefaultCapacity);
-
-/*! @function initWithCapacity
-    @abstract Initializes an IOPacketQueue object.
-    @discussion This method initializes an IOPacketQueue object with the given capacity.
-    @param capacity The initial capacity of the queue. Can be later changed
-    by calling the setCapacity() method.
-    @result Returns true if initialized successfully, false otherwise. 
-*/
-
-    virtual bool initWithCapacity(UInt32 capacity = 
-                                  IOPacketQueueDefaultCapacity);
-
-/*! @function getSize
-    @abstract Gets the size of the queue.
-    @result Returns the number of packets currently held by the queue. 
-*/
-
-    virtual UInt32 getSize() const;
-
-/*! @function setCapacity
-    @abstract Changes the capacity of the queue.
-    @param capacity The new capacity.
-    @result Returns true if the new capacity was accepted, false otherwise. 
-*/
-
-    virtual bool setCapacity(UInt32 capacity);
-
-/*! @function getCapacity
-    @abstract Gets the current capacity of the queue.
-    @result Returns the current queue capacity. 
-*/
-
-    virtual UInt32 getCapacity() const;
-
-/*! @function peek
-    @abstract Examines the packet at the head of the queue without
-    removing it from the queue.
-    @discussion A following call to peek() or dequeue() will return
-    the same packet. The caller must never modify the mbuf packet returned.
-    @result Returns the packet at the head of the queue. 
-*/
-
-    virtual const mbuf_t peek() const;
-
-/*! @function prepend
-    @abstract Adds a chain of packets to the head of the queue.
-    @param m A chain of packets to add to the head of the queue. 
-*/
-
-    virtual void prepend(mbuf_t m);
-
-/*! @function prepend
-    @abstract Removes all packets from the specified queue, and adds them
-    to the head of this queue.
-    @param queue The source IOPacketQueue object containing the packets to
-    be transferred. 
-*/
-
-    virtual void prepend(IOPacketQueue * queue);
-
-/*! @function lockPrepend
-    @abstract Adds a chain of packets to the head of a synchronized queue.
-    @discussion A spinlock is used to synchronize access to the queue.
-    @param m A chain of packets to add to the head of the queue.
-    @result Always returns true. 
-*/
-
-    virtual void lockPrepend(mbuf_t m);
-
-/*! @function enqueue
-    @abstract Adds a chain of packets to the tail of the queue.
-    @discussion Packets are not added if the size of the queue has reached
-    its capacity.
-    @param m A chain of packets to add to the tail of the queue.
-    @result Returns true on success, or false to indicate over-capacity and refusal
-    to accept the packet chain provided. 
-*/
-
-    virtual bool enqueue(mbuf_t m);
-
-/*! @function enqueue
-    @abstract Removes all packets from the specified queue, and adds them
-    to the tail of this queue.
-    @param queue The source IOPacketQueue object containing the packets to
-    be transferred.
-    @result Always returns true. 
-*/
-
-    virtual bool enqueue(IOPacketQueue * queue);
-
-/*! @function enqueueWithDrop
-    @abstract Adds a chain of packets to the tail of the queue. 
-    @discussion Packets are
-    dropped if the size of the queue has reached its capacity.
-    @param m A chain of packets to add to the tail of the queue.
-    @result Returns the number of packets dropped and freed by the queue. 
-*/
-
-    virtual UInt32 enqueueWithDrop(mbuf_t m);
-
-/*! @function lockEnqueue
-    @abstract Adds a chain of packets to the tail of a synchronized queue.
-    @discussion Packets are not added if the size of the queue has reached
-    its capacity. A spinlock is used to synchronize access to the queue.
-    @param m A chain of packets to add to the tail of the queue.
-    @result Returns true on success, or false to indicate over-capacity and refusal
-    to accept the packet chain provided.
-*/
-
-    virtual bool lockEnqueue(mbuf_t m);
-
-/*! @function lockEnqueueWithDrop
-    @abstract Adds a chain of packets to the tail of a synchronized queue.
-    @discussion Packets are dropped if the size of the queue has reached its capacity.  A spinlock is used to synchronize access to the queue.
-    @param m A chain of packets to add to the tail of the queue.
-    @result Returns the number of packets dropped and freed by the queue. 
-*/
-
-    virtual UInt32 lockEnqueueWithDrop(mbuf_t m);
-
-/*! @function dequeue
-    @abstract Removes a single packet from the head of the queue.
-    @result Returns a packet removed from the head of the queue, or NULL if the
-    queue was empty. 
-*/
-
-    virtual mbuf_t dequeue();
-
-/*! @function lockDequeue
-    @abstract Removes a single packet from the head of a synchronized queue.
-    @discussion A spinlock is used to synchronize access to the queue.
-    @result Returns a packet removed from the head of the queue, or NULL if the
-    queue was empty. 
-*/
-
-    virtual mbuf_t lockDequeue();
-
-/*! @function dequeueAll
-    @abstract Removes all packets from the queue and returns the head of the
-    packet chain.
-    @discussion The size of the queue is cleared to zero.
-    @result Returns the head of a packet chain linking all packets that were held
-    in the queue, or NULL if the queue was empty. 
-*/
-
-    virtual mbuf_t dequeueAll();
-
-/*! @function lockDequeueAll
-    @abstract Removes all packets from a synchronized queue and returns the
-    head of the packet chain.
-    @discussion The size of the queue is cleared to zero. A spinlock is used
-    to synchronize access to the queue.
-    @result Returns the head of a packet chain linking all packets that were held
-    in the queue, or NULL if the queue was empty. 
-*/
-
-    virtual mbuf_t lockDequeueAll();
-
-/*! @function flush
-    @abstract Frees all packets currently held in the queue and releases them
-    back to the free mbuf pool.
-    @discussion The size of the queue is cleared to zero.
-    @result Returns the number of packets freed. 
-*/
-
-    virtual UInt32 flush();
-
-/*! @function lockFlush
-    @abstract Frees all packets currently held in a synchronized queue and
-    releases them back to the free mbuf pool.
-    @discussion The size of the queue is cleared to zero. A spinlock is used
-    to synchronize access to the queue.
-    @result Returns the number of packets freed. 
-*/
-
-    virtual UInt32 lockFlush();
-
-    // Virtual Pad functions
-    OSMetaClassDeclareReservedUnused( IOPacketQueue,  0);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue,  1);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue,  2);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue,  3);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue,  4);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue,  5);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue,  6);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue,  7);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue,  8);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue,  9);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue, 10);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue, 11);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue, 12);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue, 13);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue, 14);
-    OSMetaClassDeclareReservedUnused( IOPacketQueue, 15);
-};
-
-#endif /* !_IOPACKETQUEUE_H */
diff --git a/i386/include/IOKit/nvram/IONVRAMController.h b/i386/include/IOKit/nvram/IONVRAMController.h
deleted file mode 100644
index 307d666..0000000
--- a/i386/include/IOKit/nvram/IONVRAMController.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IONVRAMCONTROLLER_H
-#define _IOKIT_IONVRAMCONTROLLER_H
-
-#include <IOKit/IOService.h>
-
-class IONVRAMController: public IOService
-{
-  OSDeclareAbstractStructors(IONVRAMController);
-  
-public:
-  virtual bool start(IOService *provider);
-  
-  virtual void sync(void);
-  
-  virtual IOReturn read(IOByteCount offset, UInt8 *buffer,
-			IOByteCount length) = 0;
-  virtual IOReturn write(IOByteCount offset, UInt8 *buffer,
-			 IOByteCount length) = 0;
-};
-
-#endif /* !_IOKIT_IONVRAMCONTROLLER_H */
diff --git a/i386/include/IOKit/pci/IOAGPDevice.h b/i386/include/IOKit/pci/IOAGPDevice.h
deleted file mode 100644
index c3a7d90..0000000
--- a/i386/include/IOKit/pci/IOAGPDevice.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOAGPDEVICE_H
-#define _IOKIT_IOAGPDEVICE_H
-
-#include <IOKit/IORangeAllocator.h>
-#include <IOKit/pci/IOPCIDevice.h>
-
-/* Definitions of AGP config registers */
-enum {
-    kIOPCIConfigAGPStatusOffset  = 4,
-    kIOPCIConfigAGPCommandOffset = 8
-};
-
-/* Definitions of AGP Command & Status registers */
-enum {
-    kIOAGPRequestQueueMask      = 0xff000000,
-    kIOAGPSideBandAddresssing   = 0x00000200,
-    kIOAGPEnable                = 0x00000100,
-    kIOAGP4GbAddressing         = 0x00000020,
-    kIOAGPFastWrite             = 0x00000010,
-    kIOAGP4xDataRate            = 0x00000004,
-    kIOAGP2xDataRate            = 0x00000002,
-    kIOAGP1xDataRate            = 0x00000001
-};
-
-enum {
-    kIOAGPGartInvalidate        = 0x00000001
-};
-
-// getAGPStatus() defines
-enum {
-    kIOAGPDefaultStatus         = 0
-};
-enum {
-    kIOAGPIdle                  = 0x00000001,
-    kIOAGPInvalidGARTEntry      = 0x00000002,
-    kIOAGPAccessOutOfRange      = 0x00000004
-};
-
-#define kIOAGPBusFlagsKey       "IOAGPFlags"
-enum {
-    // the AGP target must be idle before invalidating its gart tlb
-    kIOAGPGartIdleInvalidate    = 0x00000001,
-
-    // the AGP target cannot handle operations that cross page boundaries
-    kIOAGPDisablePageSpans      = 0x00000002,
-
-    // the AGP target cannot handle master -> target AGP writes
-    kIOAGPDisableAGPWrites      = 0x00000004,
-
-    // the AGP target cannot handle target -> master PCI reads
-    kIOAGPDisablePCIReads       = 0x00000008,
-
-    // the AGP target cannot handle master -> target PCI writes
-    kIOAGPDisablePCIWrites      = 0x00000010,
-
-    // the AGP target cannot handle all unaligned transactions 
-    kIOAGPDisableUnaligned      = 0x00000020,
-
-    kIOAGPDisableFeature6       = 0x00000040,
-    kIOAGPDisableFeature7       = 0x00000080,
-    kIOAGPDisableFeature8       = 0x00000100,
-    kIOAGPDisableFeature9       = 0x00000200
-};
-
-// masterState
-enum {
-    kIOAGPStateEnabled          = 0x00000001,
-    kIOAGPStateEnablePending    = 0x00010000
-};
-
-
-/*! @class IOAGPDevice
-    @abstract An IOService class representing an AGP master device.
-    @discussion The discovery of an AGP master device by the PCI bus family results in an instance of the IOAGPDevice being created and published. It provides services specific to AGP, in addition to the PCI services supplied by its superclass IOPCIDevice.
-*/
-
-class IOAGPDevice : public IOPCIDevice
-{
-    OSDeclareDefaultStructors(IOAGPDevice)
-
-protected:
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-*/    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  
-*/
-    ExpansionData *reserved;
-
-public:
-    UInt32      masterState;
-    UInt8       masterAGPRegisters;
-
-/*! @function createAGPSpace
-    @abstract Allocates the AGP space, and enables AGP transactions on the master and slave.
-    @discussion This method should be called by the driver for the AGP master device to set the size of the space and enable AGP transactions. It will destroy any AGP space currently allocated.
-    @param options No options are currently defined, pass zero.
-    @param address The physical range allocated for the AGP space is passed back to the caller.
-    @param length An in/out parameter - the caller sets the devices maximum AGP addressing and the actual size created is passed back.
-    @result Returns an IOReturn code indicating success or failure. 
-*/
-
-    virtual IOReturn createAGPSpace( IOOptionBits options,
-                                    IOPhysicalAddress * address, 
-                                    IOPhysicalLength * length );
-
-/*! @function destroyAGPSpace
-    @abstract Destroys the AGP space, and disables AGP transactions on the master and slave.
-    @discussion This method should be called by the driver to shutdown AGP transactions and release resources. 
-*/
-
-    virtual IOReturn destroyAGPSpace( void );
-
-/*! @function getAGPRangeAllocator
-    @abstract Accessor to obtain the AGP range allocator.
-    @discussion To allocate ranges in AGP space, obtain a range allocator for the space with this method. It is retained while the space is created (until destroyAGPSpace is called) and should not be released by the caller.
-    @result Returns a pointer to the range allocator for the AGP space. 
-*/
-
-    virtual IORangeAllocator * getAGPRangeAllocator( void );
-
-/*! @function getAGPStatus
-    @abstract Returns the current state of the AGP bus.
-    @discussion Returns state bits for the AGP bus. Only one type of status is currently defined. 
-    @param which Type of status - only kIOAGPDefaultStatus is currently valid.
-    @result Returns mask of status bits for the AGP bus.
-*/
-
-    virtual IOOptionBits getAGPStatus( IOOptionBits which = kIOAGPDefaultStatus );
-
-/*! @function commitAGPMemory
-    @abstract Makes memory addressable by AGP transactions.
-    @discussion Makes the memory described by the IOMemoryDescriptor object addressable by AGP by entering its pages into the GART array, given an offset into AGP space supplied by the caller (usually allocated by the AGP range allocator). It is the caller's responsibility to prepare non-kernel pageable memory before calling this method, with IOMemoryDescriptor::prepare.
-    @param memory A IOMemoryDescriptor object describing the memory to add to the GART.
-    @param agpOffset An offset into AGP space that the caller has allocated - usually allocated by the AGP range allocator.
-    @param options Pass kIOAGPGartInvalidate if the AGP target should invalidate any GART TLB.
-    @result Returns an IOReturn code indicating success or failure.
-*/
-
-    virtual IOReturn commitAGPMemory( IOMemoryDescriptor * memory,
-                                        IOByteCount agpOffset,
-                                        IOOptionBits options = 0 );
-
-/*! @function releaseAGPMemory
-    @abstract Releases memory addressable by AGP transactions.
-    @discussion Makes the memory described by the IOMemoryDescriptor object unaddressable by AGP by removing its pages from the GART array, given an offset into AGP space supplied by the caller (usually allocated by the AGP range allocator). It is the caller's responsibility to complete non-kernel pageable memory before calling this method, with IOMemoryDescriptor::complete.
-    @param memory A IOMemoryDescriptor object describing the memory to remove from the GART.
-    @param agpOffset An offset into AGP space that the caller has allocated - usually allocated by the AGP range allocator.
-    @param options Pass kIOAGPGartInvalidate if the AGP target should invalidate any GART TLB.
-    @result Returns an IOReturn code indicating success or failure.
-*/
-
-    virtual IOReturn releaseAGPMemory( IOMemoryDescriptor * memory, 
-                                        IOByteCount agpOffset,
-                                        IOOptionBits options = 0 );
-
-    virtual IOReturn resetAGP( IOOptionBits options = 0 );
-
-/*! @function getAGPSpace
-    @abstract Returns the allocated AGP space.
-    @discussion This method can be called by the driver for the AGP master device to retrieve the physical address and size of the space created with createAGPSpace.
-    @param address The physical range allocated for the AGP space is passed back to the caller. Zero may be passed if the address is not needed by the caller.
-    @param length The size of the the AGP space created is passed back.  Zero may be passed if the length is not needed by the caller.
-    @result Returns an IOReturn code indicating success or failure. 
-*/
-
-    virtual IOReturn getAGPSpace( IOPhysicalAddress * address, 
-                                    IOPhysicalLength * length );
-
-    // Unused Padding
-    OSMetaClassDeclareReservedUnused(IOAGPDevice,  0);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice,  1);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice,  2);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice,  3);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice,  4);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice,  5);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice,  6);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice,  7);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice,  8);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice,  9);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice, 10);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice, 11);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice, 12);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice, 13);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice, 14);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice, 15);
-    OSMetaClassDeclareReservedUnused(IOAGPDevice, 16);
-};
-
-#endif /* ! _IOKIT_IOAGPDEVICE_H */
diff --git a/i386/include/IOKit/pci/IOPCIBridge.h b/i386/include/IOKit/pci/IOPCIBridge.h
deleted file mode 100644
index 2fac052..0000000
--- a/i386/include/IOKit/pci/IOPCIBridge.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOPCIBRIDGE_H
-#define _IOKIT_IOPCIBRIDGE_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IODeviceMemory.h>
-#include <IOKit/IOFilterInterruptEventSource.h>
-#include <IOKit/pci/IOAGPDevice.h>
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-typedef uint64_t IOPCIScalar;
-
-struct IOPCIRange
-{
-    IOPCIScalar         start;
-    IOPCIScalar         size;
-    IOPCIScalar         alignment;
-    UInt32              type;
-    UInt32              flags;
-    struct IOPCIRange * next;
-    struct IOPCIRange * nextSubRange;
-    struct IOPCIRange * subRange;
-};
-
-enum {
-    kIOPCIResourceTypeMemory = 0,
-    kIOPCIResourceTypePrefetchMemory,
-    kIOPCIResourceTypeIO,
-    kIOPCIResourceTypeBusNumber,
-    kIOPCIResourceTypeCount
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/*!
-    @class IOPCIBridge
-    @abstract   Base class for all PCI bridge drivers.
-*/
-class IOPCIConfigurator;
-class IOPCIDevice;
-
-class IOPCIBridge : public IOService
-{
-    friend class IOPCIDevice;
-    friend class IOPCIConfigurator;
-
-    OSDeclareAbstractStructors(IOPCIBridge)
-
-private:
-    static void initialize(void);
-    IORegistryEntry * findMatching( OSIterator * in, IOPCIAddressSpace space );
-    virtual bool isDTNub( IOPCIDevice * nub );
-    bool checkProperties( IOPCIDevice * entry );
-
-    void removeDevice( IOPCIDevice * device, IOOptionBits options = 0 );
-    IOReturn restoreMachineState( IOOptionBits options = 0);
-    IOReturn _restoreDeviceState( IOPCIDevice * device, IOOptionBits options );
-    IOReturn resolveLegacyInterrupts( IOService * provider, IOPCIDevice * nub );
-    IOReturn resolveMSIInterrupts   ( IOService * provider, IOPCIDevice * nub );
-
-protected:
-    static void nvLocation( IORegistryEntry * entry,
-                            UInt8 * busNum, UInt8 * deviceNum, UInt8 * functionNum );
-    static SInt32 compareAddressCell( UInt32 cellCount, UInt32 cleft[], UInt32 cright[] );
-        void checkTerminateChildren(IOService * bridgeDevice, bool eject);
-    IOReturn setDeviceASPMBits(IOPCIDevice * device, IOOptionBits state);
-
-    IORangeAllocator *  bridgeMemoryRanges;
-    IORangeAllocator *  bridgeIORanges;
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOPCIBridge in the future.
-*/    
-    struct ExpansionData
-    {
-        friend class IOPCIConfigurator;
-        IORangeAllocator * cardBusMemoryRanges;
-        IOPCIRange *       rangeLists[kIOPCIResourceTypeCount];
-    };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  
-*/
-    ExpansionData *reserved;
-
-protected:
-public:
-    virtual void probeBus( IOService * provider, UInt8 busNum );
-
-    virtual UInt8 firstBusNum( void );
-    virtual UInt8 lastBusNum( void );
-
-    virtual void spaceFromProperties( OSDictionary * propTable,
-                                        IOPCIAddressSpace * space );
-    virtual OSDictionary * constructProperties( IOPCIAddressSpace space );
-
-    virtual IOPCIDevice * createNub( OSDictionary * from );
-
-    virtual bool initializeNub( IOPCIDevice * nub, OSDictionary * from );
-
-    virtual bool publishNub( IOPCIDevice * nub, UInt32 index );
-
-    virtual bool addBridgeMemoryRange( IOPhysicalAddress start,
-                                        IOPhysicalLength length, bool host );
-
-    virtual bool addBridgeIORange( IOByteCount start, IOByteCount length );
-
-    virtual bool constructRange( IOPCIAddressSpace * flags,
-                                 IOPhysicalAddress phys, IOPhysicalLength len,
-                                 OSArray * array );
-
-    virtual bool matchNubWithPropertyTable( IOService * nub,
-                                            OSDictionary * propertyTable,
-                                            SInt32 * score );
-
-    virtual bool compareNubName( const IOService * nub, OSString * name,
-                                 OSString ** matched = 0 ) const;
-
-    virtual bool pciMatchNub( IOPCIDevice * nub,
-                                OSDictionary * table, SInt32 * score);
-
-    virtual bool matchKeys( IOPCIDevice * nub, const char * keys,
-                                UInt32 defaultMask, UInt8 regNum );
-
-    virtual IOReturn getNubResources( IOService * nub );
-
-    virtual IOReturn getNubAddressing( IOPCIDevice * nub );
-
-    virtual IOReturn getDTNubAddressing( IOPCIDevice * nub );
-
-public:
-    virtual void free( void );
-
-    virtual bool start( IOService * provider );
-
-    virtual void stop( IOService * provider );
-
-    virtual bool configure( IOService * provider );
-
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-    virtual IODeviceMemory * ioDeviceMemory( void ) = 0;
-
-    virtual UInt32 configRead32( IOPCIAddressSpace space, UInt8 offset ) = 0;
-    virtual void configWrite32( IOPCIAddressSpace space,
-                                        UInt8 offset, UInt32 data ) = 0;
-    virtual UInt16 configRead16( IOPCIAddressSpace space, UInt8 offset ) = 0;
-    virtual void configWrite16( IOPCIAddressSpace space,
-                                        UInt8 offset, UInt16 data ) = 0;
-    virtual UInt8 configRead8( IOPCIAddressSpace space, UInt8 offset ) = 0;
-    virtual void configWrite8( IOPCIAddressSpace space,
-                                        UInt8 offset, UInt8 data ) = 0;
-
-    virtual IOPCIAddressSpace getBridgeSpace( void ) = 0;
-
-    virtual UInt32 findPCICapability( IOPCIAddressSpace space,
-                                      UInt8 capabilityID, UInt8 * offset = 0 );
-
-    virtual IOReturn setDevicePowerState( IOPCIDevice * device,
-                                          unsigned long whatToDo );
-    virtual IOReturn saveDeviceState( IOPCIDevice * device,
-                                      IOOptionBits options = 0 );
-    virtual IOReturn restoreDeviceState( IOPCIDevice * device,
-                                         IOOptionBits options = 0 );
-
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-    virtual IOReturn createAGPSpace( IOAGPDevice * master,
-                                     IOOptionBits options,
-                                     IOPhysicalAddress * address, 
-                                     IOPhysicalLength * length );
-
-    virtual IOReturn destroyAGPSpace( IOAGPDevice * master );
-
-    virtual IORangeAllocator * getAGPRangeAllocator( IOAGPDevice * master );
-
-    virtual IOOptionBits getAGPStatus( IOAGPDevice * master,
-                                       IOOptionBits options = 0 );
-    virtual IOReturn resetAGPDevice( IOAGPDevice * master,
-                                     IOOptionBits options = 0 );
-
-    virtual IOReturn getAGPSpace( IOAGPDevice * master,
-                                  IOPhysicalAddress * address, 
-                                  IOPhysicalLength * length );
-
-    virtual IOReturn commitAGPMemory( IOAGPDevice * master, 
-                                      IOMemoryDescriptor * memory,
-                                      IOByteCount agpOffset,
-                                      IOOptionBits options );
-
-    virtual IOReturn releaseAGPMemory(  IOAGPDevice * master, 
-                                        IOMemoryDescriptor * memory, 
-                                        IOByteCount agpOffset,
-                                        IOOptionBits options );
-
-protected:
-    OSMetaClassDeclareReservedUsed(IOPCIBridge, 0);
-    virtual bool addBridgePrefetchableMemoryRange( IOPhysicalAddress start,
-                                                   IOPhysicalLength length,
-                                                   bool host );
-
-    OSMetaClassDeclareReservedUsed(IOPCIBridge, 1);
-    virtual UInt32 extendedFindPCICapability( IOPCIAddressSpace space,
-                                              UInt32 capabilityID, IOByteCount * offset = 0 );
-
-    OSMetaClassDeclareReservedUsed(IOPCIBridge, 2);
-    virtual IOReturn setDeviceASPMState(IOPCIDevice * device,
-                                IOService * client, IOOptionBits state);
-
-    // Unused Padding
-    OSMetaClassDeclareReservedUnused(IOPCIBridge,  3);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge,  4);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge,  5);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge,  6);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge,  7);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge,  8);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge,  9);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 10);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 11);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 12);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 13);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 14);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 15);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 16);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 17);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 18);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 19);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 20);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 21);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 22);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 23);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 24);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 25);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 26);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 27);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 28);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 29);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 30);
-    OSMetaClassDeclareReservedUnused(IOPCIBridge, 31);
-
-
-
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#define kIOPCIBridgeRegs (32)
-/*!
-    @class IOPCI2PCIBridge
-    @abstract Base class for all PCI-to-PCI bridge drivers.
-*/
-
-class IOPCI2PCIBridge : public IOPCIBridge
-{
-    OSDeclareDefaultStructors(IOPCI2PCIBridge)
-
-private:
-
-    IOPCIDevice * bridgeDevice;
-    UInt32        bridgeState[kIOPCIBridgeRegs];
-
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */    
-    struct ExpansionData
-    {
-    // /hotp
-        IOByteCount                 xpressCapability;
-        IOFilterInterruptEventSource *    bridgeInterruptSource;
-        IOWorkLoop *                workLoop;
-        uint32_t                    hotplugCount;
-        uint8_t                     presence;
-        uint8_t                     waitingLinkEnable;
-        uint8_t                     linkChangeOnly;
-        uint8_t                     interruptEnablePending;
-        uint8_t                     __reserved[4];
-    // hotp/
-    };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-public:
-
-    virtual UInt8 firstBusNum( void );
-    virtual UInt8 lastBusNum( void );
-
-public:
-    virtual void free();
-
-    virtual bool serializeProperties( OSSerialize * serialize ) const;
-
-    virtual IOService * probe(  IOService *     provider,
-                                SInt32 *        score );
-
-    virtual bool start( IOService * provider );
-
-    virtual void stop( IOService * provider );
-
-    virtual bool configure( IOService * provider );
-
-    virtual void probeBus( IOService * provider, UInt8 busNum );
-
-    virtual IOReturn requestProbe( IOOptionBits options );
-
-    virtual void saveBridgeState( void );
-
-    virtual void restoreBridgeState( void );
-
-    IOReturn setPowerState( unsigned long powerState,
-                            IOService * whatDevice );
-
-    virtual bool publishNub( IOPCIDevice * nub, UInt32 index );
-
-    virtual IODeviceMemory * ioDeviceMemory( void );
-
-    virtual IOPCIAddressSpace getBridgeSpace( void );
-
-    virtual UInt32 configRead32( IOPCIAddressSpace space, UInt8 offset );
-    virtual void configWrite32( IOPCIAddressSpace space,
-                                        UInt8 offset, UInt32 data );
-    virtual UInt16 configRead16( IOPCIAddressSpace space, UInt8 offset );
-    virtual void configWrite16( IOPCIAddressSpace space,
-                                        UInt8 offset, UInt16 data );
-    virtual UInt8 configRead8( IOPCIAddressSpace space, UInt8 offset );
-    virtual void configWrite8( IOPCIAddressSpace space,
-                                        UInt8 offset, UInt8 data );
-
-    virtual IOReturn setDeviceASPMState(IOPCIDevice * device,
-                                IOService * client, IOOptionBits state);
-
-    // Unused Padding
-    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  0);
-    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  1);
-    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  2);
-    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  3);
-    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  4);
-    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  5);
-    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  6);
-    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  7);
-    OSMetaClassDeclareReservedUnused(IOPCI2PCIBridge,  8);
-
-protected:
-    bool filterInterrupt( IOFilterInterruptEventSource * source);
-                            
-    void handleInterrupt( IOInterruptEventSource * source,
-                             int                      count );
-
-};
-
-#endif /* ! _IOKIT_IOPCIBRIDGE_H */
diff --git a/i386/include/IOKit/pci/IOPCIDevice.h b/i386/include/IOKit/pci/IOPCIDevice.h
deleted file mode 100644
index d031a06..0000000
--- a/i386/include/IOKit/pci/IOPCIDevice.h
+++ /dev/null
@@ -1,673 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IOPCIDEVICE_H
-#define _IOKIT_IOPCIDEVICE_H
-
-#include <IOKit/IOService.h>
-
-/* Definitions of PCI Config Registers */
-enum {
-    kIOPCIConfigVendorID                = 0x00,
-    kIOPCIConfigDeviceID                = 0x02,
-    kIOPCIConfigCommand                 = 0x04,
-    kIOPCIConfigStatus                  = 0x06,
-    kIOPCIConfigRevisionID              = 0x08,
-    kIOPCIConfigClassCode               = 0x09,
-    kIOPCIConfigCacheLineSize           = 0x0C,
-    kIOPCIConfigLatencyTimer            = 0x0D,
-    kIOPCIConfigHeaderType              = 0x0E,
-    kIOPCIConfigBIST                    = 0x0F,
-    kIOPCIConfigBaseAddress0            = 0x10,
-    kIOPCIConfigBaseAddress1            = 0x14,
-    kIOPCIConfigBaseAddress2            = 0x18,
-    kIOPCIConfigBaseAddress3            = 0x1C,
-    kIOPCIConfigBaseAddress4            = 0x20,
-    kIOPCIConfigBaseAddress5            = 0x24,
-    kIOPCIConfigCardBusCISPtr           = 0x28,
-    kIOPCIConfigSubSystemVendorID       = 0x2C,
-    kIOPCIConfigSubSystemID             = 0x2E,
-    kIOPCIConfigExpansionROMBase        = 0x30,
-    kIOPCIConfigCapabilitiesPtr         = 0x34,
-    kIOPCIConfigInterruptLine           = 0x3C,
-    kIOPCIConfigInterruptPin            = 0x3D,
-    kIOPCIConfigMinimumGrant            = 0x3E,
-    kIOPCIConfigMaximumLatency          = 0x3F
-};
-
-/* Definitions of Capabilities PCI Config Register */
-enum {
-    kIOPCICapabilityIDOffset            = 0x00,
-    kIOPCINextCapabilityOffset          = 0x01,
-
-    kIOPCIPowerManagementCapability     = 0x01,
-    kIOPCIAGPCapability                 = 0x02,
-    kIOPCIVitalProductDataCapability    = 0x03,
-    kIOPCISlotIDCapability              = 0x04,
-    kIOPCIMSICapability                 = 0x05,
-    kIOPCICPCIHotswapCapability         = 0x06,
-    kIOPCIPCIXCapability                = 0x07,
-    kIOPCILDTCapability                 = 0x08,
-    kIOPCIVendorSpecificCapability      = 0x09,
-    kIOPCIDebugPortCapability           = 0x0a,
-    kIOPCICPCIResourceControlCapability = 0x0b,
-    kIOPCIHotplugCapability             = 0x0c,
-    kIOPCIAGP8Capability                = 0x0e,
-    kIOPCISecureCapability              = 0x0f,
-    kIOPCIPCIExpressCapability          = 0x10,
-    kIOPCIMSIXCapability                = 0x11,
-
-    kIOPCIExpressErrorReportingCapability     = -1UL,
-    kIOPCIExpressVirtualChannelCapability     = -2UL,
-    kIOPCIExpressDeviceSerialNumberCapability = -3UL,
-    kIOPCIExpressPowerBudgetCapability        = -4UL
-};
-
-/* Space definitions */
-enum {
-    kIOPCIConfigSpace           = 0,
-    kIOPCIIOSpace               = 1,
-    kIOPCI32BitMemorySpace      = 2,
-    kIOPCI64BitMemorySpace      = 3
-};
-
-/* Command register definitions */
-enum {
-    kIOPCICommandIOSpace                = 0x0001,
-    kIOPCICommandMemorySpace            = 0x0002,
-    kIOPCICommandBusMaster              = 0x0004,
-    kIOPCICommandSpecialCycles          = 0x0008,
-    kIOPCICommandMemWrInvalidate        = 0x0010,
-    kIOPCICommandPaletteSnoop           = 0x0020,
-    kIOPCICommandParityError            = 0x0040,
-    kIOPCICommandAddressStepping        = 0x0080,
-    kIOPCICommandSERR                   = 0x0100,
-    kIOPCICommandFastBack2Back          = 0x0200,
-    kIOPCICommandInterruptDisable       = 0x0400
-};
-
-/* Status register definitions */
-enum {
-    kIOPCIStatusCapabilities            = 0x0010,
-    kIOPCIStatusPCI66                   = 0x0020,
-    kIOPCIStatusUDF                     = 0x0040,
-    kIOPCIStatusFastBack2Back           = 0x0080,
-    kIOPCIStatusDevSel0                 = 0x0000,
-    kIOPCIStatusDevSel1                 = 0x0200,
-    kIOPCIStatusDevSel2                 = 0x0400,
-    kIOPCIStatusDevSel3                 = 0x0600,
-    kIOPCIStatusTargetAbortCapable      = 0x0800,
-    kIOPCIStatusTargetAbortActive       = 0x1000,
-    kIOPCIStatusMasterAbortActive       = 0x2000,
-    kIOPCIStatusSERRActive              = 0x4000,
-    kIOPCIStatusParityErrActive         = 0x8000
-};
-
-// constants which are part of the PCI Bus Power Management Spec.
-enum
-{
-    // capabilities bits in the 16 bit capabilities register
-    kPCIPMCPMESupportFromD3Cold = 0x8000,
-    kPCIPMCPMESupportFromD3Hot  = 0x4000,
-    kPCIPMCPMESupportFromD2             = 0x2000,
-    kPCIPMCPMESupportFromD1             = 0x1000,
-    kPCIPMCPMESupportFromD0             = 0x0800,
-    kPCIPMCD2Support                    = 0x0400,
-    kPCIPMCD1Support                    = 0x0200,
- 
-    kPCIPMCD3Support                    = 0x0001
-};
-
-enum
-{
-    // bits in the power management control/status register
-    kPCIPMCSPMEStatus                   = 0x8000,
-    kPCIPMCSPMEEnable                   = 0x0100,
-    kPCIPMCSPowerStateMask              = 0x0003,
-    kPCIPMCSPowerStateD3                = 0x0003,
-    kPCIPMCSPowerStateD2                = 0x0002,
-    kPCIPMCSPowerStateD1                = 0x0001,
-    kPCIPMCSPowerStateD0                = 0x0000,
-    
-    kPCIPMCSDefaultEnableBits           = (~(IOOptionBits)0)
-};
-
-union IOPCIAddressSpace {
-    UInt32              bits;
-    struct {
-#if __BIG_ENDIAN__
-        unsigned int    reloc:1;
-        unsigned int    prefetch:1;
-        unsigned int    t:1;
-        unsigned int    resv:3;
-        unsigned int    space:2;
-        unsigned int    busNum:8;
-        unsigned int    deviceNum:5;
-        unsigned int    functionNum:3;
-        unsigned int    registerNum:8;
-#elif __LITTLE_ENDIAN__
-        unsigned int    registerNum:8;
-        unsigned int    functionNum:3;
-        unsigned int    deviceNum:5;
-        unsigned int    busNum:8;
-        unsigned int    space:2;
-        unsigned int    resv:3;
-        unsigned int    t:1;
-        unsigned int    prefetch:1;
-        unsigned int    reloc:1;
-#endif
-    } s;
-    struct {
-#if __BIG_ENDIAN__
-        unsigned int    resv:4;
-        unsigned int    registerNumExtended:4;
-        unsigned int    busNum:8;
-        unsigned int    deviceNum:5;
-        unsigned int    functionNum:3;
-        unsigned int    registerNum:8;
-#elif __LITTLE_ENDIAN__
-        unsigned int    registerNum:8;
-        unsigned int    functionNum:3;
-        unsigned int    deviceNum:5;
-        unsigned int    busNum:8;
-        unsigned int    registerNumExtended:4;
-        unsigned int    resv:4;
-#endif
-    } es;
-};
-
-struct IOPCIPhysicalAddress {
-    IOPCIAddressSpace   physHi;
-    UInt32              physMid;
-    UInt32              physLo;
-    UInt32              lengthHi;
-    UInt32              lengthLo;
-};
-
-// IOPCIDevice matching property names
-#define kIOPCIMatchKey                  "IOPCIMatch"
-#define kIOPCIPrimaryMatchKey           "IOPCIPrimaryMatch"
-#define kIOPCISecondaryMatchKey         "IOPCISecondaryMatch"
-#define kIOPCIClassMatchKey             "IOPCIClassMatch"
-
-// property to control PCI default config space save on sleep
-#define kIOPMPCIConfigSpaceVolatileKey  "IOPMPCIConfigSpaceVolatile"
-
-// pci express link status
-#define kIOPCIExpressLinkStatusKey       "IOPCIExpressLinkStatus"
-// pci express link capabilities
-#define kIOPCIExpressLinkCapabilitiesKey "IOPCIExpressLinkCapabilities"
-
-#ifndef kIOPlatformDeviceASPMEnableKey
-#define kIOPlatformDeviceASPMEnableKey  "IOPlatformDeviceASPMEnable"
-#endif
-
-#ifndef kIOPCIDeviceASPMSupportedKey
-#define kIOPCIDeviceASPMSupportedKey    "pci-aspm-supported"
-#endif
-
-#define kIOPCIPMEOptionsKey             "IOPCIPMEOptions"
-
-
-enum {
-    kIOPCIDevicePowerStateCount = 3,
-    kIOPCIDeviceOffState        = 0,
-    kIOPCIDeviceDozeState       = 1,
-    kIOPCIDeviceOnState         = 2,
-};
-
-enum
-{
-    // bits getInterruptType result
-    kIOInterruptTypePCIMessaged = 0x00010000
-};
-
-class IOPCIBridge;
-class IOPCI2PCIBridge;
-class IOPCIMessagedInterruptController;
-
-/*! @class IOPCIDevice : public IOService
-    @abstract An IOService class representing a PCI device.
-    @discussion The discovery of a PCI device by the PCI bus family results in an instance of the IOPCIDevice being created and published. It provides services for looking up and mapping memory mapped hardware, and access to the PCI configuration and I/O spaces. 
-
-<br><br>Matching Supported by IOPCIDevice<br><br>
-
-Two types of matching are available, OpenFirmware name matching and PCI register matching. Currently, only one of these two matching schemes can be used in the same property table.
-
-<br><br>OpenFirmware Name Matching<br><br>
-
-IOService performs matching based on the IONameMatch property (see IOService). IOPCIDevices created with OpenFirmware device tree entries will name match based on the standard OpenFirmware name matching properties.
-
-<br><br>PCI Register Matching<br><br>
-
-A PCI device driver can also match on the values of certain config space registers.
-
-In each case, several matching values can be specified, and an optional mask for the value of the config space register may follow the value, preceded by an '&' character.
-<br>
-<br>
-        kIOPCIMatchKey, "IOPCIMatch"
-<br>
-The kIOPCIMatchKey property matches the vendor and device ID (0x00) register, or the subsystem register (0x2c).
-<br>
-<br>
-        kIOPCIPrimaryMatchKey, "IOPCIPrimaryMatch"
-<br>
-The kIOPCIPrimaryMatchKey property matches the vendor and device ID (0x00) register.
-<br>
-<br>
-        kIOPCISecondaryMatchKey, "IOPCISecondaryMatch"
-<br>
-The kIOPCISecondaryMatchKey property matches the subsystem register (0x2c).
-<br>
-<br>
-        kIOPCIClassMatchKey, "IOPCIClassMatch"
-<br>
-The kIOPCIClassMatchKey property matches the class code register (0x08). The default mask for this register is 0xffffff00.
-<br>
-<br>
-Examples:
-<br>
-<br>
-      &ltkey&gtIOPCIMatch&lt/key&gt             <br>
-        &ltstring&gt0x00261011&lt/string&gt
-<br>
-Matches a device whose vendor ID is 0x1011, and device ID is 0x0026, including subsystem IDs.
-<br>
-<br>
-      &ltkey&gtIOPCIMatch&lt/key&gt             <br>
-        &ltstring&gt0x00789004&0x00ffffff 0x78009004&0x0xff00ffff&lt/string&gt
-<br>
-Matches with any device with a vendor ID of 0x9004, and a device ID of 0xzz78 or 0x78zz, where 'z' is don't care.
-<br>
-<br>
-      &ltkey&gtIOPCIClassMatch&lt/key&gt        <br>
-        &ltstring&gt0x02000000&0xffff0000&lt/string&gt
-<br>
-<br>
-Matches a device whose class code is 0x0200zz, an ethernet device.
-
-*/
-
-class IOPCIDevice : public IOService
-{
-    OSDeclareDefaultStructors(IOPCIDevice)
-
-    friend class IOPCIBridge;
-    friend class IOPCI2PCIBridge;
-    friend class IOPCIMessagedInterruptController;
-
-protected:
-    IOPCIBridge *       parent;
-    IOMemoryMap *       ioMap;
-    OSObject *          slotNameProperty;
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    struct IOPCIDeviceExpansionData * reserved;
-
-public:
-    IOPCIAddressSpace   space;
-    UInt32      *       savedConfig;
-
-public:
-    /* IOService/IORegistryEntry methods */
-
-    virtual bool init( OSDictionary *  propTable );
-    virtual bool init( IORegistryEntry * from,
-                                const IORegistryPlane * inPlane );
-    virtual void free();
-    virtual bool attach( IOService * provider );
-    virtual void detach( IOService * provider );
-
-    virtual IOReturn newUserClient( task_t owningTask, void * securityID,
-                                    UInt32 type,  OSDictionary * properties,
-                                    IOUserClient ** handler );
-
-    virtual IOReturn powerStateWillChangeTo (IOPMPowerFlags  capabilities, 
-                                             unsigned long   stateNumber, 
-                                             IOService*      whatDevice);
-    virtual IOReturn setPowerState( unsigned long, IOService * );
-
-    virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
-    virtual bool matchPropertyTable( OSDictionary *     table,
-                                     SInt32       *     score );
-    virtual IOService * matchLocation( IOService * client );
-    virtual IOReturn getResources( void );
-    virtual IOReturn setProperties(OSObject * properties);
-    virtual IOReturn callPlatformFunction(const OSSymbol * functionName,
-                                          bool waitForFunction,
-                                          void * p1, void * p2,
-                                          void * p3, void * p4);
-    virtual IOReturn callPlatformFunction(const char * functionName,
-                                          bool waitForFunction,
-                                          void * p1, void * p2,
-                                          void * p3, void * p4);
-
-    /* Config space accessors */
-
-    virtual UInt32 configRead32( IOPCIAddressSpace space, UInt8 offset );
-    virtual void configWrite32( IOPCIAddressSpace space,
-                                        UInt8 offset, UInt32 data );
-    virtual UInt16 configRead16( IOPCIAddressSpace space, UInt8 offset );
-    virtual void configWrite16( IOPCIAddressSpace space,
-                                        UInt8 offset, UInt16 data );
-    virtual UInt8 configRead8( IOPCIAddressSpace space, UInt8 offset );
-    virtual void configWrite8( IOPCIAddressSpace space,
-                                        UInt8 offset, UInt8 data );
-
-/*! @function configRead32
-    @abstract Reads a 32-bit value from the PCI device's configuration space.
-    @discussion This method reads a 32-bit configuration space register on the device and returns its value.
-    @param offset An 8-bit offset into configuration space, of which bits 0-1 are ignored.
-    @result An 32-bit value in host byte order (big endian on PPC). */
-
-    virtual UInt32 configRead32( UInt8 offset );
-
-/*! @function configRead16
-    @abstract Reads a 16-bit value from the PCI device's configuration space.
-    @discussion This method reads a 16-bit configuration space register on the device and returns its value.
-    @param offset An 8-bit offset into configuration space, of which bit 0 is ignored.
-    @result An 16-bit value in host byte order (big endian on PPC). */
-
-    virtual UInt16 configRead16( UInt8 offset );
-
-/*! @function configRead8
-    @abstract Reads a 8-bit value from the PCI device's configuration space.
-    @discussion This method reads a 8-bit configuration space register on the device and returns its value.
-    @param offset An 8-bit offset into configuration space.
-    @result An 8-bit value. */
-
-    virtual UInt8 configRead8( UInt8 offset );
-
-/*! @function configWrite32
-    @abstract Writes a 32-bit value to the PCI device's configuration space.
-    @discussion This method write a 32-bit value to a configuration space register on the device.
-    @param offset An 8-bit offset into configuration space, of which bits 0-1 are ignored.
-    @param data An 32-bit value to be written in host byte order (big endian on PPC). */
-
-    virtual void configWrite32( UInt8 offset, UInt32 data );
-
-/*! @function configWrite16
-    @abstract Writes a 16-bit value to the PCI device's configuration space.
-    @discussion This method write a 16-bit value to a configuration space register on the device.
-    @param offset An 8-bit offset into configuration space, of which bit 0 is ignored.
-    @param data An 16-bit value to be written in host byte order (big endian on PPC). */
-
-    virtual void configWrite16( UInt8 offset, UInt16 data );
-
-/*! @function configWrite8
-    @abstract Writes a 8-bit value to the PCI device's configuration space.
-    @discussion This method write a 8-bit value to a configuration space register on the device.
-    @param offset An 8-bit offset into configuration space.
-    @param data An 8-bit value to be written. */
-
-    virtual void configWrite8( UInt8 offset, UInt8 data );
-
-    virtual IOReturn saveDeviceState( IOOptionBits options = 0 );
-    virtual IOReturn restoreDeviceState( IOOptionBits options = 0 );
-
-/*! @function setConfigBits
-    @abstract Sets masked bits in a configuration space register.
-    @discussion This method sets masked bits in a configuration space register on the device by reading and writing the register. The value of the masked bits before the write is returned.
-    @param offset An 8-bit offset into configuration space, of which bits 0-1 are ignored.
-    @param mask An 32-bit mask indicating which bits in the value parameter are valid.
-    @param data An 32-bit value to be written in host byte order (big endian on PPC).
-    @result The value of the register masked with the mask before the write. */
-    
-    virtual UInt32 setConfigBits( UInt8 offset, UInt32 mask, UInt32 value );
-
-/*! @function setMemoryEnable
-    @abstract Sets the device's memory space response.
-    @discussion This method sets the memory space response bit in the device's command config space register to the passed value, and returns the previous state of the enable.
-    @param enable True or false to enable or disable the memory space response.
-    @result True if the memory space response was previously enabled, false otherwise. */
-
-    virtual bool setMemoryEnable( bool enable );
-
-/*! @function setIOEnable
-    @abstract Sets the device's I/O space response.
-    @discussion This method sets the I/O space response bit in the device's command config space register to the passed value, and returns the previous state of the enable. The exclusive option allows only one exclusive device on the bus to be enabled concurrently, this should be only for temporary access.
-    @param enable True or false to enable or disable the I/O space response.
-    @param exclusive If true, only one setIOEnable with the exclusive flag set will be allowed at a time on the bus, this should be only for temporary access.
-    @result True if the I/O space response was previously enabled, false otherwise. */
-
-    virtual bool setIOEnable( bool enable, bool exclusive = false );
-
-/*! @function setBusMasterEnable
-    @abstract Sets the device's bus master enable.
-    @discussion This method sets the bus master enable bit in the device's command config space register to the passed value, and returns the previous state of the enable.
-    @param enable True or false to enable or disable bus mastering.
-    @result True if bus mastering was previously enabled, false otherwise. */
-
-    virtual bool setBusMasterEnable( bool enable );
-
-/*! @function findPCICapability
-    @abstract Search configuration space for a PCI capability register.
-    @discussion This method searches the device's config space for a PCI capability register matching the passed capability ID, if the device supports PCI capabilities. To search for PCI Express extended capabilities or for multiple capablities with the same ID, use the extendedFindPCICapability() method.
-    @param capabilityID An 8-bit PCI capability ID.
-    @param offset An optional pointer to return the offset into config space where the capability was found.
-    @result The 32-bit value of the capability register if one was found, zero otherwise. */
-
-    virtual UInt32 findPCICapability( UInt8 capabilityID, UInt8 * offset = 0 );
-
-/*! @function getBusNumber
-    @abstract Accessor to return the PCI device's assigned bus number.
-    @discussion This method is an accessor to return the PCI device's assigned bus number.
-    @result The 8-bit value of device's PCI bus number. */
-
-    virtual UInt8 getBusNumber( void );
-
-/*! @function getDeviceNumber
-    @abstract Accessor to return the PCI device's device number.
-    @discussion This method is an accessor to return the PCI device's device number.
-    @result The 5-bit value of device's device number. */
-
-    virtual UInt8 getDeviceNumber( void );
-
-/*! @function getFunctionNumber
-    @abstract Accessor to return the PCI device's function number.
-    @discussion This method is an accessor to return the PCI device's function number.
-    @result The 3-bit value of device's function number. */
-
-    virtual UInt8 getFunctionNumber( void );
-
-    /* Device memory accessors */
-
-/*! @function getDeviceMemoryWithRegister
-    @abstract Returns an instance of IODeviceMemory representing one of the device's memory mapped ranges.
-    @discussion This method will return a pointer to an instance of IODeviceMemory for the physical memory range that was assigned to the configuration space base address register passed in. It is analogous to IOService::getDeviceMemoryWithIndex.
-    @param reg The 8-bit configuration space register that is the base address register for the desired range.
-    @result A pointer to an instance of IODeviceMemory, or zero no such range was found. The IODeviceMemory is retained by the provider, so is valid while attached, or while any mappings to it exist. It should not be released by the caller. */
-
-    virtual IODeviceMemory * getDeviceMemoryWithRegister( UInt8 reg );
-
-/*! @function mapDeviceMemoryWithRegister
-    @abstract Maps a physical range of the device.
-    @discussion This method will create a mapping for the IODeviceMemory for the physical memory range that was assigned to the configuration space base address register passed in, with IODeviceMemory::map(options). The mapping is represented by the returned instance of IOMemoryMap, which should not be released until the mapping is no longer required. This method is analogous to IOService::mapDeviceMemoryWithIndex.
-    @param reg The 8-bit configuration space register that is the base address register for the desired range.
-    @param options Options to be passed to the IOMemoryDescriptor::map() method.
-    @result An instance of IOMemoryMap, or zero if the index is beyond the count available. The mapping should be released only when access to it is no longer required. */
-
-    virtual IOMemoryMap * mapDeviceMemoryWithRegister( UInt8 reg,
-                                                IOOptionBits options = 0 );
-
-/*! @function ioDeviceMemory
-    @abstract Accessor to the I/O space aperture for the bus.
-    @discussion This method will return a reference to the IODeviceMemory for the I/O aperture of the bus the device is on.
-    @result A pointer to an IODeviceMemory object for the I/O aperture. The IODeviceMemory is retained by the provider, so is valid while attached, or while any mappings to it exist. It should not be released by the caller. */
-
-    virtual IODeviceMemory * ioDeviceMemory( void );
-
-    /* I/O space accessors */
-
-/*! @function ioWrite32
-    @abstract Writes a 32-bit value to an I/O space aperture.
-    @discussion This method will write a 32-bit value to a 4 byte aligned offset in an I/O space aperture. If a map object is passed in, the value is written relative to it, otherwise to the value is written relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
-    @param offset An offset into a bus or device's I/O space aperture.
-    @param value The value to be written in host byte order (big endian on PPC).
-    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space. */
-
-    virtual void ioWrite32( UInt16 offset, UInt32 value,
-                                IOMemoryMap * map = 0 );
-
-/*! @function ioWrite16
-    @abstract Writes a 16-bit value to an I/O space aperture.
-    @discussion This method will write a 16-bit value to a 2 byte aligned offset in an I/O space aperture. If a map object is passed in, the value is written relative to it, otherwise to the value is written relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
-    @param offset An offset into a bus or device's I/O space aperture.
-    @param value The value to be written in host byte order (big endian on PPC).
-    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space. */
-
-    virtual void ioWrite16( UInt16 offset, UInt16 value,
-                                IOMemoryMap * map = 0 );
-
-/*! @function ioWrite8
-    @abstract Writes a 8-bit value to an I/O space aperture.
-    @discussion This method will write a 8-bit value to an offset in an I/O space aperture. If a map object is passed in, the value is written relative to it, otherwise to the value is written relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
-    @param offset An offset into a bus or device's I/O space aperture.
-    @param value The value to be written in host byte order (big endian on PPC).
-    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space. */
-
-    virtual void ioWrite8( UInt16 offset, UInt8 value,
-                                IOMemoryMap * map = 0 );
-
-/*! @function ioRead32
-    @abstract Reads a 32-bit value from an I/O space aperture.
-    @discussion This method will read a 32-bit value from a 4 byte aligned offset in an I/O space aperture. If a map object is passed in, the value is read relative to it, otherwise to the value is read relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
-    @param offset An offset into a bus or device's I/O space aperture.
-    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space.
-    @result The value read in host byte order (big endian on PPC). */
-
-    virtual UInt32 ioRead32( UInt16 offset, IOMemoryMap * map = 0 );
-
-/*! @function ioRead16
-    @abstract Reads a 16-bit value from an I/O space aperture.
-    @discussion This method will read a 16-bit value from a 2 byte aligned offset in an I/O space aperture. If a map object is passed in, the value is read relative to it, otherwise to the value is read relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
-    @param offset An offset into a bus or device's I/O space aperture.
-    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space.
-    @result The value read in host byte order (big endian on PPC). */
-
-    virtual UInt16 ioRead16( UInt16 offset, IOMemoryMap * map = 0 );
-
-/*! @function ioRead8
-    @abstract Reads a 8-bit value from an I/O space aperture.
-    @discussion This method will read a 8-bit value from an offset in an I/O space aperture. If a map object is passed in, the value is read relative to it, otherwise to the value is read relative to the I/O space aperture for the bus. This function encapsulates the differences between architectures in generating I/O space operations. An eieio instruction is included on PPC.
-    @param offset An offset into a bus or device's I/O space aperture.
-    @param map If the offset is relative to the beginning of a device's aperture, an IOMemoryMap object for that object should be passed in. Otherwise, passing zero will write the value relative to the beginning of the bus' I/O space.
-    @result The value read. */
-
-    virtual UInt8 ioRead8( UInt16 offset, IOMemoryMap * map = 0 );
-
-    OSMetaClassDeclareReservedUsed(IOPCIDevice,  0);
-/*! @function hasPCIPowerManagement
-    @abstract determine whether or not the device supports PCI Bus Power Management.
-    @discussion This method will look at the device's capabilties registers and determine whether or not the device supports the PCI BUS Power Management Specification.
-    @param state(optional) Check for support of a specific state (e.g. kPCIPMCPMESupportFromD3Cold). If state is not suuplied or is 0, then check for a property in the registry which tells which state the hardware expects the device to go to during sleep.
-    @result true if the specified state is supported */
-    virtual bool hasPCIPowerManagement(IOOptionBits state = 0);
-    
-    OSMetaClassDeclareReservedUsed(IOPCIDevice,  1);
-/*! @function enablePCIPowerManagement
-    @abstract enable PCI power management for sleep state
-    @discussion This method will enable PCI Bus Powermanagement when going to sleep mode.
-    @param state(optional) Enables PCI Power Management by placing the function in the given state (e.g. kPCIPMCSPowerStateD3). If state is not specified or is 0xffffffff, then the IOPCIDevice determines the desired state. If state is kPCIPMCSPowerStateD0 (0) then PCI Power Management is disabled.
-    @result kIOReturnSuccess if there were no errors */
-    virtual IOReturn enablePCIPowerManagement(IOOptionBits state = 0xffffffff);
-    
-    OSMetaClassDeclareReservedUsed(IOPCIDevice,  2);
-/*! @function extendedFindPCICapability
-    @abstract Search configuration space for a PCI capability register.
-    @discussion This method searches the device's config space for a PCI capability register matching the passed capability ID, if the device supports PCI capabilities.
-    @param capabilityID A PCI capability ID. PCI Express devices may support extended capabilities in config space starting at offset 0x100. To search this space, the ID passed should be the negated value of the PCI-SIG assigned ID for the extended capability.
-    @param offset An optional in/out parameter to return the offset into config space where the capability was found, and to set the start point of the next search. Initialize the offset to zero before the first call to extendedFindPCICapability() and subsequent calls will find all capabilty blocks that may exist on the device with the same ID.
-    @result The 32-bit value of the capability register if one was found, zero otherwise. */
-
-    virtual UInt32 extendedFindPCICapability( UInt32 capabilityID, IOByteCount * offset = 0 );
-
-    // Unused Padding
-    OSMetaClassDeclareReservedUnused(IOPCIDevice,  3);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice,  4);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice,  5);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice,  6);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice,  7);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice,  8);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice,  9);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice, 10);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice, 11);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice, 12);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice, 13);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice, 14);
-    OSMetaClassDeclareReservedUnused(IOPCIDevice, 15);
-
-public:
-
-/*! @function extendedConfigRead32
-    @abstract Reads a 32-bit value from the PCI device's configuration space.
-    @discussion This method reads a 32-bit configuration space register on the device and returns its value.
-    @param offset A byte offset into configuration space, of which bits 0-1 are ignored.
-    @result An 32-bit value in host byte order (big endian on PPC). */
-
-    UInt32 extendedConfigRead32( IOByteCount offset );
-
-/*! @function extendedConfigRead16
-    @abstract Reads a 16-bit value from the PCI device's configuration space.
-    @discussion This method reads a 16-bit configuration space register on the device and returns its value.
-    @param offset A byte offset into configuration space, of which bit 0 is ignored.
-    @result An 16-bit value in host byte order (big endian on PPC). */
-
-    UInt16 extendedConfigRead16( IOByteCount offset );
-
-/*! @function extendedConfigRead8
-    @abstract Reads a 8-bit value from the PCI device's configuration space.
-    @discussion This method reads a 8-bit configuration space register on the device and returns its value.
-    @param offset A byte offset into configuration space.
-    @result An 8-bit value. */
-
-    UInt8 extendedConfigRead8( IOByteCount offset );
-
-/*! @function extendedConfigWrite32
-    @abstract Writes a 32-bit value to the PCI device's configuration space.
-    @discussion This method writes a 32-bit value to a configuration space register on the device.
-    @param offset A byte offset into configuration space, of which bits 0-1 are ignored.
-    @param data An 32-bit value to be written in host byte order (big endian on PPC). */
-
-    void extendedConfigWrite32( IOByteCount offset, UInt32 data );
-
-/*! @function extendedConfigWrite16
-    @abstract Writes a 16-bit value to the PCI device's configuration space.
-    @discussion This method writes a 16-bit value to a configuration space register on the device.
-    @param offset A byte offset into configuration space, of which bit 0 is ignored.
-    @param data An 16-bit value to be written in host byte order (big endian on PPC). */
-
-    void extendedConfigWrite16( IOByteCount offset, UInt16 data );
-
-/*! @function extendedConfigWrite8
-    @abstract Writes a 8-bit value to the PCI device's configuration space.
-    @discussion This method writes a 8-bit value to a configuration space register on the device.
-    @param offset A byte offset into configuration space.
-    @param data An 8-bit value to be written. */
-
-    void extendedConfigWrite8( IOByteCount offset, UInt8 data );
-};
-
-#endif /* ! _IOKIT_IOPCIDEVICE_H */
-
diff --git a/i386/include/IOKit/platform/.svn/all-wcprops b/i386/include/IOKit/platform/.svn/all-wcprops
deleted file mode 100644
index 895fe9d..0000000
--- a/i386/include/IOKit/platform/.svn/all-wcprops
+++ /dev/null
@@ -1,29 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 61
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/platform
-END
-AppleMacIO.h
-K 25
-svn:wc:ra_dav:version-url
-V 74
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/platform/AppleMacIO.h
-END
-AppleMacIODevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 80
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/platform/AppleMacIODevice.h
-END
-ApplePlatformExpert.h
-K 25
-svn:wc:ra_dav:version-url
-V 83
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/platform/ApplePlatformExpert.h
-END
-AppleNMI.h
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/platform/AppleNMI.h
-END
diff --git a/i386/include/IOKit/platform/.svn/entries b/i386/include/IOKit/platform/.svn/entries
deleted file mode 100644
index 51b93d8..0000000
--- a/i386/include/IOKit/platform/.svn/entries
+++ /dev/null
@@ -1,164 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/platform
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-AppleMacIO.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-e9614e104fdb0969eeaab8f5878c15db
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2553
-
-AppleMacIODevice.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-da33d4bcb4363ccb7d832f9b7019b3c9
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2153
-
-ApplePlatformExpert.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-227f5a69a8d7c83855c4dff7a0bdd68f
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2744
-
-AppleNMI.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-65ddf2ae2939f64b26b164cf5301970c
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2542
-
diff --git a/i386/include/IOKit/platform/.svn/text-base/AppleMacIO.h.svn-base b/i386/include/IOKit/platform/.svn/text-base/AppleMacIO.h.svn-base
deleted file mode 100644
index ae12eca..0000000
--- a/i386/include/IOKit/platform/.svn/text-base/AppleMacIO.h.svn-base
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_APPLEMACIO_H
-#define _IOKIT_APPLEMACIO_H
-
-#include <IOKit/IOService.h>
-
-#include <IOKit/platform/AppleMacIODevice.h>
-
-class AppleMacIO : public IOService
-{
-    OSDeclareAbstractStructors(AppleMacIO);
-
-    IOService *		fNub;
-    IOMemoryMap *	fMemory;
-
-    struct ExpansionData { };
-    ExpansionData *fReserved;
-    
-protected:
-    virtual bool selfTest( void );
-
-public:
-    virtual bool start(	IOService * provider );
-
-    virtual IOService * createNub( IORegistryEntry * from );
-
-    virtual void processNub( IOService * nub );
-
-    virtual void publishBelow( IORegistryEntry * root );
-
-    virtual const char * deleteList( void );
-    virtual const char * excludeList( void );
-
-    virtual bool compareNubName( const IOService * nub, OSString * name,
-				 OSString ** matched = 0 ) const;
-
-    virtual IOReturn getNubResources( IOService * nub );
-
-    OSMetaClassDeclareReservedUnused(AppleMacIO,  0);
-    OSMetaClassDeclareReservedUnused(AppleMacIO,  1);
-    OSMetaClassDeclareReservedUnused(AppleMacIO,  2);
-    OSMetaClassDeclareReservedUnused(AppleMacIO,  3);
-};
-
-#endif /* ! _IOKIT_APPLEMACIO_H */
diff --git a/i386/include/IOKit/platform/.svn/text-base/AppleMacIODevice.h.svn-base b/i386/include/IOKit/platform/.svn/text-base/AppleMacIODevice.h.svn-base
deleted file mode 100644
index 8d033fd..0000000
--- a/i386/include/IOKit/platform/.svn/text-base/AppleMacIODevice.h.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_APPLEMACIODEVICE_H
-#define _IOKIT_APPLEMACIODEVICE_H
-
-#include <IOKit/IOService.h>
-
-class AppleMacIODevice : public IOService
-{
-  OSDeclareDefaultStructors(AppleMacIODevice);
-
-private:  
-  struct ExpansionData { };
-  ExpansionData *reserved;
-
-public:
-  virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
-  virtual IOService *matchLocation(IOService *client);
-  virtual IOReturn getResources( void );
-    
-  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  0);
-  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  1);
-  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  2);
-  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  3);
-};
-
-#endif /* ! _IOKIT_APPLEMACIODEVICE_H */
diff --git a/i386/include/IOKit/platform/.svn/text-base/AppleNMI.h.svn-base b/i386/include/IOKit/platform/.svn/text-base/AppleNMI.h.svn-base
deleted file mode 100644
index 14cd1ed..0000000
--- a/i386/include/IOKit/platform/.svn/text-base/AppleNMI.h.svn-base
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998-9 Apple Computer, Inc.  All rights reserved.
- *
- *  DRI: Josh de Cesare
- *
- */
-
-#ifndef _IOKIT_APPLENMI_H
-#define _IOKIT_APPLENMI_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOInterrupts.h>
-
-// NMI Interrupt Constants
-enum
-{
-    kExtInt9_NMIIntSource      = 0x800506E0,
-    kNMIIntLevelMask           = 0x00004000,
-    kNMIIntMask                = 0x00000080
-};
-
-
-class AppleNMI : public IOService
-{
-  OSDeclareDefaultStructors(AppleNMI);
-
-private:
-  bool enable_debugger;
-  bool mask_NMI;
-
-  struct ExpansionData { };
-  ExpansionData * reserved;	// Reserved for future use
-
-public:
-  IOService *rootDomain;
-  virtual bool start(IOService *provider);
-  virtual IOReturn initNMI(IOInterruptController *parentController, OSData *parentSource);
-  virtual IOReturn handleInterrupt(void *refCon, IOService *nub, int source);
-
-  // Power handling methods:
-  virtual IOReturn powerStateWillChangeTo(IOPMPowerFlags, unsigned long, IOService*);
-
-  OSMetaClassDeclareReservedUnused(AppleNMI,  0);
-  OSMetaClassDeclareReservedUnused(AppleNMI,  1);
-  OSMetaClassDeclareReservedUnused(AppleNMI,  2);
-  OSMetaClassDeclareReservedUnused(AppleNMI,  3);
-};
-
-#endif /* ! _IOKIT_APPLENMI_H */
diff --git a/i386/include/IOKit/platform/.svn/text-base/ApplePlatformExpert.h.svn-base b/i386/include/IOKit/platform/.svn/text-base/ApplePlatformExpert.h.svn-base
deleted file mode 100644
index 59728d2..0000000
--- a/i386/include/IOKit/platform/.svn/text-base/ApplePlatformExpert.h.svn-base
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_APPLEPLATFORM_H
-#define _IOKIT_APPLEPLATFORM_H
-
-#include <IOKit/IOPlatformExpert.h>
-
-enum {
-  kBootROMTypeOldWorld = 0,
-  kBootROMTypeNewWorld
-};
-
-enum {
-  kChipSetTypePowerSurge = 0,
-  kChipSetTypePowerStar,
-  kChipSetTypeGossamer,
-  kChipSetTypePowerExpress,
-  kChipSetTypeCore99,
-  kChipSetTypeCore2001
-};
-
-enum {
-  kMachineTypeUnknown = 0
-};
-
-extern const OSSymbol *gGetDefaultBusSpeedsKey;
-
-class ApplePlatformExpert : public IODTPlatformExpert
-{
-  OSDeclareAbstractStructors(ApplePlatformExpert);
-  
-private:    
-  SInt32 _timeToGMT;
-
-  struct ExpansionData { };
-  ExpansionData *reserved;
-
-public:
-  virtual bool start( IOService * provider );
-  virtual bool configure( IOService * provider );
-  virtual const char * deleteList( void );
-  virtual const char * excludeList( void );
-  
-  virtual void registerNVRAMController( IONVRAMController * nvram );
-  
-  virtual long getGMTTimeOfDay(void);
-  virtual void setGMTTimeOfDay(long secs);
-  
-  virtual bool getMachineName(char *name, int maxLength);
-
-  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  0);
-  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  1);
-  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  2);
-  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  3);
-};
-
-
-#endif /* ! _IOKIT_APPLEPLATFORM_H */
diff --git a/i386/include/IOKit/platform/AppleMacIO.h b/i386/include/IOKit/platform/AppleMacIO.h
deleted file mode 100644
index ae12eca..0000000
--- a/i386/include/IOKit/platform/AppleMacIO.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_APPLEMACIO_H
-#define _IOKIT_APPLEMACIO_H
-
-#include <IOKit/IOService.h>
-
-#include <IOKit/platform/AppleMacIODevice.h>
-
-class AppleMacIO : public IOService
-{
-    OSDeclareAbstractStructors(AppleMacIO);
-
-    IOService *		fNub;
-    IOMemoryMap *	fMemory;
-
-    struct ExpansionData { };
-    ExpansionData *fReserved;
-    
-protected:
-    virtual bool selfTest( void );
-
-public:
-    virtual bool start(	IOService * provider );
-
-    virtual IOService * createNub( IORegistryEntry * from );
-
-    virtual void processNub( IOService * nub );
-
-    virtual void publishBelow( IORegistryEntry * root );
-
-    virtual const char * deleteList( void );
-    virtual const char * excludeList( void );
-
-    virtual bool compareNubName( const IOService * nub, OSString * name,
-				 OSString ** matched = 0 ) const;
-
-    virtual IOReturn getNubResources( IOService * nub );
-
-    OSMetaClassDeclareReservedUnused(AppleMacIO,  0);
-    OSMetaClassDeclareReservedUnused(AppleMacIO,  1);
-    OSMetaClassDeclareReservedUnused(AppleMacIO,  2);
-    OSMetaClassDeclareReservedUnused(AppleMacIO,  3);
-};
-
-#endif /* ! _IOKIT_APPLEMACIO_H */
diff --git a/i386/include/IOKit/platform/AppleMacIODevice.h b/i386/include/IOKit/platform/AppleMacIODevice.h
deleted file mode 100644
index 8d033fd..0000000
--- a/i386/include/IOKit/platform/AppleMacIODevice.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_APPLEMACIODEVICE_H
-#define _IOKIT_APPLEMACIODEVICE_H
-
-#include <IOKit/IOService.h>
-
-class AppleMacIODevice : public IOService
-{
-  OSDeclareDefaultStructors(AppleMacIODevice);
-
-private:  
-  struct ExpansionData { };
-  ExpansionData *reserved;
-
-public:
-  virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
-  virtual IOService *matchLocation(IOService *client);
-  virtual IOReturn getResources( void );
-    
-  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  0);
-  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  1);
-  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  2);
-  OSMetaClassDeclareReservedUnused(AppleMacIODevice,  3);
-};
-
-#endif /* ! _IOKIT_APPLEMACIODEVICE_H */
diff --git a/i386/include/IOKit/platform/AppleNMI.h b/i386/include/IOKit/platform/AppleNMI.h
deleted file mode 100644
index 14cd1ed..0000000
--- a/i386/include/IOKit/platform/AppleNMI.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998-9 Apple Computer, Inc.  All rights reserved.
- *
- *  DRI: Josh de Cesare
- *
- */
-
-#ifndef _IOKIT_APPLENMI_H
-#define _IOKIT_APPLENMI_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOInterrupts.h>
-
-// NMI Interrupt Constants
-enum
-{
-    kExtInt9_NMIIntSource      = 0x800506E0,
-    kNMIIntLevelMask           = 0x00004000,
-    kNMIIntMask                = 0x00000080
-};
-
-
-class AppleNMI : public IOService
-{
-  OSDeclareDefaultStructors(AppleNMI);
-
-private:
-  bool enable_debugger;
-  bool mask_NMI;
-
-  struct ExpansionData { };
-  ExpansionData * reserved;	// Reserved for future use
-
-public:
-  IOService *rootDomain;
-  virtual bool start(IOService *provider);
-  virtual IOReturn initNMI(IOInterruptController *parentController, OSData *parentSource);
-  virtual IOReturn handleInterrupt(void *refCon, IOService *nub, int source);
-
-  // Power handling methods:
-  virtual IOReturn powerStateWillChangeTo(IOPMPowerFlags, unsigned long, IOService*);
-
-  OSMetaClassDeclareReservedUnused(AppleNMI,  0);
-  OSMetaClassDeclareReservedUnused(AppleNMI,  1);
-  OSMetaClassDeclareReservedUnused(AppleNMI,  2);
-  OSMetaClassDeclareReservedUnused(AppleNMI,  3);
-};
-
-#endif /* ! _IOKIT_APPLENMI_H */
diff --git a/i386/include/IOKit/platform/ApplePlatformExpert.h b/i386/include/IOKit/platform/ApplePlatformExpert.h
deleted file mode 100644
index 59728d2..0000000
--- a/i386/include/IOKit/platform/ApplePlatformExpert.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_APPLEPLATFORM_H
-#define _IOKIT_APPLEPLATFORM_H
-
-#include <IOKit/IOPlatformExpert.h>
-
-enum {
-  kBootROMTypeOldWorld = 0,
-  kBootROMTypeNewWorld
-};
-
-enum {
-  kChipSetTypePowerSurge = 0,
-  kChipSetTypePowerStar,
-  kChipSetTypeGossamer,
-  kChipSetTypePowerExpress,
-  kChipSetTypeCore99,
-  kChipSetTypeCore2001
-};
-
-enum {
-  kMachineTypeUnknown = 0
-};
-
-extern const OSSymbol *gGetDefaultBusSpeedsKey;
-
-class ApplePlatformExpert : public IODTPlatformExpert
-{
-  OSDeclareAbstractStructors(ApplePlatformExpert);
-  
-private:    
-  SInt32 _timeToGMT;
-
-  struct ExpansionData { };
-  ExpansionData *reserved;
-
-public:
-  virtual bool start( IOService * provider );
-  virtual bool configure( IOService * provider );
-  virtual const char * deleteList( void );
-  virtual const char * excludeList( void );
-  
-  virtual void registerNVRAMController( IONVRAMController * nvram );
-  
-  virtual long getGMTTimeOfDay(void);
-  virtual void setGMTTimeOfDay(long secs);
-  
-  virtual bool getMachineName(char *name, int maxLength);
-
-  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  0);
-  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  1);
-  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  2);
-  OSMetaClassDeclareReservedUnused(ApplePlatformExpert,  3);
-};
-
-
-#endif /* ! _IOKIT_APPLEPLATFORM_H */
diff --git a/i386/include/IOKit/power/.svn/all-wcprops b/i386/include/IOKit/power/.svn/all-wcprops
deleted file mode 100644
index 3d3be10..0000000
--- a/i386/include/IOKit/power/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 58
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/power
-END
-IOPwrController.h
-K 25
-svn:wc:ra_dav:version-url
-V 76
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/power/IOPwrController.h
-END
diff --git a/i386/include/IOKit/power/.svn/entries b/i386/include/IOKit/power/.svn/entries
deleted file mode 100644
index 3875525..0000000
--- a/i386/include/IOKit/power/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/power
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IOPwrController.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-9c95987a30b51b9e00dd6f7400e645fb
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1513
-
diff --git a/i386/include/IOKit/power/.svn/text-base/IOPwrController.h.svn-base b/i386/include/IOKit/power/.svn/text-base/IOPwrController.h.svn-base
deleted file mode 100644
index 709a0fb..0000000
--- a/i386/include/IOKit/power/.svn/text-base/IOPwrController.h.svn-base
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * 24 Nov  1998 suurballe  Created.
- */
-
-#include <IOKit/IOService.h>
-
-class IOPwrController: public IOService
-{
-OSDeclareAbstractStructors(IOPwrController)
-
-public:
-
-};
-
diff --git a/i386/include/IOKit/power/IOPwrController.h b/i386/include/IOKit/power/IOPwrController.h
deleted file mode 100644
index 709a0fb..0000000
--- a/i386/include/IOKit/power/IOPwrController.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * 24 Nov  1998 suurballe  Created.
- */
-
-#include <IOKit/IOService.h>
-
-class IOPwrController: public IOService
-{
-OSDeclareAbstractStructors(IOPwrController)
-
-public:
-
-};
-
diff --git a/i386/include/IOKit/ppc/.svn/all-wcprops b/i386/include/IOKit/ppc/.svn/all-wcprops
deleted file mode 100644
index 419eea0..0000000
--- a/i386/include/IOKit/ppc/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 56
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/ppc
-END
-IODBDMA.h
-K 25
-svn:wc:ra_dav:version-url
-V 66
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/ppc/IODBDMA.h
-END
diff --git a/i386/include/IOKit/ppc/.svn/entries b/i386/include/IOKit/ppc/.svn/entries
deleted file mode 100644
index c49eb0a..0000000
--- a/i386/include/IOKit/ppc/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/ppc
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IODBDMA.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-15a4a0c26bd1a9295d2de0f0544051f1
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12529
-
diff --git a/i386/include/IOKit/ppc/.svn/text-base/IODBDMA.h.svn-base b/i386/include/IOKit/ppc/.svn/text-base/IODBDMA.h.svn-base
deleted file mode 100644
index afe1337..0000000
--- a/i386/include/IOKit/ppc/.svn/text-base/IODBDMA.h.svn-base
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1997 Apple Computer, Inc.
- *
- *
- * HISTORY
- *
- * Simon Douglas  10 Nov 97
- * - first checked in, mostly from MacOS DBDMA.i, machdep/ppc/dbdma.h
- *	but use byte reverse ops.
- */
-
-#ifndef _IODBDMA_H_
-#define _IODBDMA_H_
-
-#include <IOKit/IOTypes.h>
-#include <libkern/OSByteOrder.h>
-
-
-/* DBDMA definitions */
-
-struct IODBDMAChannelRegisters {
-    volatile unsigned long 	channelControl;
-    volatile unsigned long 	channelStatus;
-    volatile unsigned long 	commandPtrHi;		/* implementation optional*/
-    volatile unsigned long 	commandPtrLo;
-    volatile unsigned long 	interruptSelect;	/* implementation optional*/
-    volatile unsigned long 	branchSelect;		/* implementation optional*/
-    volatile unsigned long 	waitSelect;		/* implementation optional*/
-    volatile unsigned long 	transferModes;		/* implementation optional*/
-    volatile unsigned long 	data2PtrHi;		/* implementation optional*/
-    volatile unsigned long 	data2PtrLo;		/* implementation optional*/
-
-    volatile unsigned long 	reserved1;
-    volatile unsigned long 	addressHi;		/* implementation optional*/
-    volatile unsigned long 	reserved2[4];
-    volatile unsigned long 	unimplemented[16];
-
-/* This structure must remain fully padded to 256 bytes.*/
-    volatile unsigned long 	undefined[32];
-};
-typedef struct IODBDMAChannelRegisters IODBDMAChannelRegisters;
-
-/* These constants define the DB-DMA channel control words and status flags.*/
-
-enum {
-	kdbdmaRun	= 0x00008000,
-	kdbdmaPause	= 0x00004000,
-	kdbdmaFlush	= 0x00002000,
-	kdbdmaWake	= 0x00001000,
-	kdbdmaDead	= 0x00000800,
-	kdbdmaActive	= 0x00000400,
-	kdbdmaBt	= 0x00000100,
-	kdbdmaS7	= 0x00000080,
-	kdbdmaS6	= 0x00000040,
-	kdbdmaS5	= 0x00000020,
-	kdbdmaS4	= 0x00000010,
-	kdbdmaS3	= 0x00000008,
-	kdbdmaS2	= 0x00000004,
-	kdbdmaS1	= 0x00000002,
-	kdbdmaS0	= 0x00000001
-};
-
-
-#define	IOSetDBDMAChannelControlBits(mask)	( ((mask) | (mask) << 16) )
-#define	IOClearDBDMAChannelControlBits(mask)	( (mask) << 16)
-
-
-/* This structure defines the DB-DMA channel command descriptor.*/
-
-/*
-   *** WARNING:	Endian-ness issues must be considered when performing load/store! ***
-*/
-
-struct IODBDMADescriptor {
-	unsigned long            operation;   /* cmd || key || i || b || w || reqCount*/
-	unsigned long            address;
-	volatile unsigned long   cmdDep;
-	volatile unsigned long   result;      /* xferStatus || resCount*/
-};
-typedef struct IODBDMADescriptor IODBDMADescriptor;
-
-/* These constants define the DB-DMA channel command operations and modifiers.*/
-
-
-enum {
-/* Command.cmd operations*/
-	kdbdmaOutputMore	= 0,
-	kdbdmaOutputLast	= 1,
-	kdbdmaInputMore		= 2,
-	kdbdmaInputLast		= 3,
-	kdbdmaStoreQuad		= 4,
-	kdbdmaLoadQuad		= 5,
-	kdbdmaNop		= 6,
-	kdbdmaStop		= 7
-};
-
-
-enum {
-/* Command.key modifiers (choose one for INPUT, OUTPUT, LOAD, and STORE)*/
-	kdbdmaKeyStream0	= 0,	/* default modifier*/
-	kdbdmaKeyStream1	= 1,
-	kdbdmaKeyStream2	= 2,
-	kdbdmaKeyStream3	= 3,
-	kdbdmaKeyRegs		= 5,
-	kdbdmaKeySystem		= 6,
-	kdbdmaKeyDevice		= 7,
-
-	kdbdmaIntNever		= 0,	/* default modifier*/
-	kdbdmaIntIfTrue		= 1,
-	kdbdmaIntIfFalse	= 2,
-	kdbdmaIntAlways		= 3,
-
-	kdbdmaBranchNever	= 0,	/* default modifier*/
-	kdbdmaBranchIfTrue	= 1,
-	kdbdmaBranchIfFalse	= 2,
-	kdbdmaBranchAlways	= 3,
-
-	kdbdmaWaitNever		= 0,	/* default modifier*/
-	kdbdmaWaitIfTrue	= 1,
-	kdbdmaWaitIfFalse	= 2,
-	kdbdmaWaitAlways	= 3,
-
-	kdbdmaCommandMask	= (long)0xFFFF0000,
-	kdbdmaReqCountMask	= 0x0000FFFF
-};
-
-
-/* These constants define the DB-DMA channel command results.*/
-
-enum {
-	/* result masks*/
-	kdbdmaStatusRun		= kdbdmaRun << 16,
-	kdbdmaStatusPause	= kdbdmaPause << 16,
-	kdbdmaStatusFlush	= kdbdmaFlush << 16,
-	kdbdmaStatusWake	= kdbdmaWake << 16,
-	kdbdmaStatusDead	= kdbdmaDead << 16,
-	kdbdmaStatusActive	= kdbdmaActive << 16,
-	kdbdmaStatusBt		= kdbdmaBt << 16,
-	kdbdmaStatusS7		= kdbdmaS7 << 16,
-	kdbdmaStatusS6		= kdbdmaS6 << 16,
-	kdbdmaStatusS5		= kdbdmaS5 << 16,
-	kdbdmaStatusS4		= kdbdmaS4 << 16,
-	kdbdmaStatusS3		= kdbdmaS3 << 16,
-	kdbdmaStatusS2		= kdbdmaS2 << 16,
-	kdbdmaStatusS1		= kdbdmaS1 << 16,
-	kdbdmaStatusS0		= kdbdmaS0 << 16,
-	kdbdmaResCountMask	= 0x0000FFFF,
-	kdbdmaXferStatusMask	= 0xFFFF0000
-};
-
-
-/*  These macros are are IODBDMAChannelRegisters accessor functions. */
-
-#define IOSetDBDMAChannelRegister(registerSetPtr,field,value)	\
-OSWriteSwapInt32(registerSetPtr,offsetof(IODBDMAChannelRegisters,field),value)
-
-#define IOGetDBDMAChannelRegister(registerSetPtr, field)	\
-OSReadSwapInt32(registerSetPtr,offsetof(IODBDMAChannelRegisters, field))
-
-
-/* 	void IOSetDBDMAChannelControl (IODBDMAChannelRegisters *registerSetPtr, unsigned long ctlValue); */
-
-#define IOSetDBDMAChannelControl(registerSetPtr,ctlValue)		\
-do {									\
-    eieio();								\
-    IOSetDBDMAChannelRegister(registerSetPtr,channelControl,ctlValue);	\
-    eieio();								\
-} while(0)
-
-/* 	unsigned long IOGetDBDMAChannelStatus (IODBDMAChannelRegisters *registerSetPtr); */
-
-#define IOGetDBDMAChannelStatus(registerSetPtr)		\
-	IOGetDBDMAChannelRegister(registerSetPtr,channelStatus)
-
-/* 	unsigned long IOGetDBDMACommandPtr (IODBDMAChannelRegisters *registerSetPtr); */
-
-#define IOGetDBDMACommandPtr(registerSetPtr)			\
-	IOGetDBDMAChannelRegister(registerSetPtr,commandPtrLo)
-
-/* 	void IOSetDBDMACommandPtr (IODBDMAChannelRegisters *registerSetPtr, unsigned long cclPtr); */
-
-#define IOSetDBDMACommandPtr(registerSetPtr,cclPtr)			\
-do {									\
-    IOSetDBDMAChannelRegister(registerSetPtr,commandPtrHi,0);		\
-    eieio();								\
-    IOSetDBDMAChannelRegister(registerSetPtr,commandPtrLo,cclPtr);	\
-    eieio();								\
-} while(0)
-
-
-/* 	unsigned long IOGetDBDMAInterruptSelect (IODBDMAChannelRegisters *registerSetPtr); */
-
-#define IOGetDBDMAInterruptSelect(registerSetPtr)		\
-        IOGetDBDMAChannelRegister(registerSetPtr,interruptSelect)
-
-/* 	void IOSetDBDMAInterruptSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long intSelValue); */
-
-#define IOSetDBDMAInterruptSelect(registerSetPtr,intSelValue)		   \
-do {									   \
-    IOSetDBDMAChannelRegister(registerSetPtr,interruptSelect,intSelValue); \
-    eieio();								   \
-} while(0)
-
-/* 	unsigned long IOGetDBDMABranchSelect (IODBDMAChannelRegisters *registerSetPtr); */
-
-#define IOGetDBDMABranchSelect(registerSetPtr)				\
-	IOGetDBDMAChannelRegister(registerSetPtr,branchSelect)
-
-/* 	void IOSetDBDMABranchSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long braSelValue); */
-
-#define IOSetDBDMABranchSelect(registerSetPtr,braSelValue)		\
-do {									\
-    IOSetDBDMAChannelRegister(registerSetPtr,branchSelect,braSelValue);	\
-    eieio();								\
-} while(0)
-
-/* 	unsigned long IOGetDBDMAWaitSelect (IODBDMAChannelRegisters *registerSetPtr); */
-
-#define IOGetDBDMAWaitSelect(registerSetPtr)				\
-	IOGetDBDMAChannelRegister(registerSetPtr,waitSelect)
-
-/* 	void IOSetDBDMAWaitSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long waitSelValue); */
-
-#define IOSetDBDMAWaitSelect(registerSetPtr,waitSelValue)		\
-do {									\
-    IOSetDBDMAChannelRegister(registerSetPtr,waitSelect,waitSelValue);	\
-    eieio();								\
-} while(0)
-
-
-/*  These macros are IODBDMADescriptor accessor functions. */
-
-#define IOSetDBDMADescriptor(descPtr,field,value)		\
-OSWriteSwapInt32( descPtr, offsetof( IODBDMADescriptor, field), value)
-
-#define IOGetDBDMADescriptor(descPtr,field)	\
-OSReadSwapInt32( descPtr, offsetof( IODBDMADescriptor, field))
-
-#define	IOMakeDBDMAOperation(cmd,key,interrupt,branch,wait,count)	\
-    ( ((cmd) << 28) | ((key) << 24) | ((interrupt) << 20)		\
-      | ((branch) << 18) | ( (wait) << 16) | (count) )
-
-/* void  IOMakeDBDMADescriptor (IODBDMADescriptor *descPtr,
-				unsigned long cmd,
-				unsigned long key,
-				unsigned long interrupt,
-				unsigned long branch,
-				unsigned long wait,
-				unsigned long count,
-				unsigned long addr); */
-
-#define IOMakeDBDMADescriptor(descPtr,cmd,key,interrupt,branch,wait,count,addr)\
-do {									       \
-    IOSetDBDMADescriptor(descPtr, address, addr);			       \
-    IOSetDBDMADescriptor(descPtr, cmdDep,  0);				       \
-    IOSetDBDMADescriptor(descPtr, result,  0);				       \
-    eieio();								       \
-    IOSetDBDMADescriptor(descPtr, operation,				       \
-        IOMakeDBDMAOperation(cmd,key,interrupt,branch,wait,count));	       \
-    eieio();								       \
-} while(0)
-
-/* void IOMakeDBDMADescriptorDep (IODBDMADescriptor *descPtr,
-				unsigned long cmd,
-				unsigned long key,
-				unsigned long interrupt,
-				unsigned long branch,
-				unsigned long wait,
-				unsigned long count,
-				unsigned long addr,
-				unsigned long dep); */
-
-#define IOMakeDBDMADescriptorDep(descPtr,cmd,key,interrupt,branch,wait,count,addr,dep) \
-do {									       \
-    IOSetDBDMADescriptor(descPtr, address, addr);			       \
-    IOSetDBDMADescriptor(descPtr, cmdDep, dep);				       \
-    IOSetDBDMADescriptor(descPtr, result, 0);				       \
-    eieio();								       \
-    IOSetDBDMADescriptor(descPtr, operation,				       \
-        IOMakeDBDMAOperation(cmd, key, interrupt, branch, wait, count));       \
-    eieio();								       \
-} while(0)
-
-/*	Field accessors - NOTE: unsynchronized */
-
-/* 	unsigned long IOGetDBDMAOperation (IODBDMADescriptor *descPtr) */
-
-#define IOGetCCOperation(descPtr)				\
-	IOGetDBDMADescriptor(descPtr,operation)
-
-/* 	void IOSetCCOperation (IODBDMADescriptor *descPtr, unsigned long operationValue) */
-
-#define IOSetCCOperation(descPtr,operationValue)		\
-	IOSetDBDMADescriptor(descPtr,operation,operationValue)
-
-/* 	unsigned long IOGetCCAddress (IODBDMADescriptor *descPtr) */
-
-#define IOGetCCAddress(descPtr)				\
-	IOGetDBDMADescriptor(descPtr,address)
-
-/* 	void IOSetCCAddress (IODBDMADescriptor *descPtr, unsigned long addressValue) */
-
-#define IOSetCCAddress(descPtr,addressValue)		\
-	IOSetDBDMADescriptor(descPtr,address, addressValue)
-
-/* 	unsigned long IOGetCCCmdDep (IODBDMADescriptor *descPtr) */
-
-#define IOGetCCCmdDep(descPtr)				\
-	IOGetDBDMADescriptor(descPtr,cmdDep)
-
-/* 	void IOSetCCCmdDep (IODBDMADescriptor *descPtr, unsigned long cmdDepValue) */
-
-#define IOSetCCCmdDep(descPtr,cmdDepValue)		\
-	IOSetDBDMADescriptor(descPtr,cmdDep,cmdDepValue)
-
-/* 	unsigned long IOGetCCResult (IODBDMADescriptor *descPtr) */
-
-#define IOGetCCResult(descPtr)				\
-	IOGetDBDMADescriptor(descPtr,result)
-
-/* 	void IOSetCCResult (IODBDMADescriptor *descPtr, unsigned long resultValue) */
-
-#define IOSetCCResult(descPtr,resultValue)		\
-	IOSetDBDMADescriptor(descPtr,result,resultValue)
-
-
-/* DBDMA routines */
-
-extern void	IODBDMAStart( volatile IODBDMAChannelRegisters *registerSetPtr, volatile IODBDMADescriptor *physicalDescPtr);
-extern void	IODBDMAStop( volatile IODBDMAChannelRegisters *registerSetPtr);
-extern void	IODBDMAFlush( volatile IODBDMAChannelRegisters *registerSetPtr);
-extern void	IODBDMAReset( volatile IODBDMAChannelRegisters *registerSetPtr);
-extern void	IODBDMAContinue( volatile IODBDMAChannelRegisters *registerSetPtr);
-extern void	IODBDMAPause( volatile IODBDMAChannelRegisters *registerSetPtr);
-
-extern IOReturn	IOAllocatePhysicallyContiguousMemory( unsigned int size, unsigned int options,
-				     IOVirtualAddress * logical, IOPhysicalAddress * physical );
-extern IOReturn IOFreePhysicallyContiguousMemory( IOVirtualAddress * logical, unsigned int size);
-
-#endif /* !defined(_IODBDMA_H_) */
diff --git a/i386/include/IOKit/ppc/IODBDMA.h b/i386/include/IOKit/ppc/IODBDMA.h
deleted file mode 100644
index afe1337..0000000
--- a/i386/include/IOKit/ppc/IODBDMA.h
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1997 Apple Computer, Inc.
- *
- *
- * HISTORY
- *
- * Simon Douglas  10 Nov 97
- * - first checked in, mostly from MacOS DBDMA.i, machdep/ppc/dbdma.h
- *	but use byte reverse ops.
- */
-
-#ifndef _IODBDMA_H_
-#define _IODBDMA_H_
-
-#include <IOKit/IOTypes.h>
-#include <libkern/OSByteOrder.h>
-
-
-/* DBDMA definitions */
-
-struct IODBDMAChannelRegisters {
-    volatile unsigned long 	channelControl;
-    volatile unsigned long 	channelStatus;
-    volatile unsigned long 	commandPtrHi;		/* implementation optional*/
-    volatile unsigned long 	commandPtrLo;
-    volatile unsigned long 	interruptSelect;	/* implementation optional*/
-    volatile unsigned long 	branchSelect;		/* implementation optional*/
-    volatile unsigned long 	waitSelect;		/* implementation optional*/
-    volatile unsigned long 	transferModes;		/* implementation optional*/
-    volatile unsigned long 	data2PtrHi;		/* implementation optional*/
-    volatile unsigned long 	data2PtrLo;		/* implementation optional*/
-
-    volatile unsigned long 	reserved1;
-    volatile unsigned long 	addressHi;		/* implementation optional*/
-    volatile unsigned long 	reserved2[4];
-    volatile unsigned long 	unimplemented[16];
-
-/* This structure must remain fully padded to 256 bytes.*/
-    volatile unsigned long 	undefined[32];
-};
-typedef struct IODBDMAChannelRegisters IODBDMAChannelRegisters;
-
-/* These constants define the DB-DMA channel control words and status flags.*/
-
-enum {
-	kdbdmaRun	= 0x00008000,
-	kdbdmaPause	= 0x00004000,
-	kdbdmaFlush	= 0x00002000,
-	kdbdmaWake	= 0x00001000,
-	kdbdmaDead	= 0x00000800,
-	kdbdmaActive	= 0x00000400,
-	kdbdmaBt	= 0x00000100,
-	kdbdmaS7	= 0x00000080,
-	kdbdmaS6	= 0x00000040,
-	kdbdmaS5	= 0x00000020,
-	kdbdmaS4	= 0x00000010,
-	kdbdmaS3	= 0x00000008,
-	kdbdmaS2	= 0x00000004,
-	kdbdmaS1	= 0x00000002,
-	kdbdmaS0	= 0x00000001
-};
-
-
-#define	IOSetDBDMAChannelControlBits(mask)	( ((mask) | (mask) << 16) )
-#define	IOClearDBDMAChannelControlBits(mask)	( (mask) << 16)
-
-
-/* This structure defines the DB-DMA channel command descriptor.*/
-
-/*
-   *** WARNING:	Endian-ness issues must be considered when performing load/store! ***
-*/
-
-struct IODBDMADescriptor {
-	unsigned long            operation;   /* cmd || key || i || b || w || reqCount*/
-	unsigned long            address;
-	volatile unsigned long   cmdDep;
-	volatile unsigned long   result;      /* xferStatus || resCount*/
-};
-typedef struct IODBDMADescriptor IODBDMADescriptor;
-
-/* These constants define the DB-DMA channel command operations and modifiers.*/
-
-
-enum {
-/* Command.cmd operations*/
-	kdbdmaOutputMore	= 0,
-	kdbdmaOutputLast	= 1,
-	kdbdmaInputMore		= 2,
-	kdbdmaInputLast		= 3,
-	kdbdmaStoreQuad		= 4,
-	kdbdmaLoadQuad		= 5,
-	kdbdmaNop		= 6,
-	kdbdmaStop		= 7
-};
-
-
-enum {
-/* Command.key modifiers (choose one for INPUT, OUTPUT, LOAD, and STORE)*/
-	kdbdmaKeyStream0	= 0,	/* default modifier*/
-	kdbdmaKeyStream1	= 1,
-	kdbdmaKeyStream2	= 2,
-	kdbdmaKeyStream3	= 3,
-	kdbdmaKeyRegs		= 5,
-	kdbdmaKeySystem		= 6,
-	kdbdmaKeyDevice		= 7,
-
-	kdbdmaIntNever		= 0,	/* default modifier*/
-	kdbdmaIntIfTrue		= 1,
-	kdbdmaIntIfFalse	= 2,
-	kdbdmaIntAlways		= 3,
-
-	kdbdmaBranchNever	= 0,	/* default modifier*/
-	kdbdmaBranchIfTrue	= 1,
-	kdbdmaBranchIfFalse	= 2,
-	kdbdmaBranchAlways	= 3,
-
-	kdbdmaWaitNever		= 0,	/* default modifier*/
-	kdbdmaWaitIfTrue	= 1,
-	kdbdmaWaitIfFalse	= 2,
-	kdbdmaWaitAlways	= 3,
-
-	kdbdmaCommandMask	= (long)0xFFFF0000,
-	kdbdmaReqCountMask	= 0x0000FFFF
-};
-
-
-/* These constants define the DB-DMA channel command results.*/
-
-enum {
-	/* result masks*/
-	kdbdmaStatusRun		= kdbdmaRun << 16,
-	kdbdmaStatusPause	= kdbdmaPause << 16,
-	kdbdmaStatusFlush	= kdbdmaFlush << 16,
-	kdbdmaStatusWake	= kdbdmaWake << 16,
-	kdbdmaStatusDead	= kdbdmaDead << 16,
-	kdbdmaStatusActive	= kdbdmaActive << 16,
-	kdbdmaStatusBt		= kdbdmaBt << 16,
-	kdbdmaStatusS7		= kdbdmaS7 << 16,
-	kdbdmaStatusS6		= kdbdmaS6 << 16,
-	kdbdmaStatusS5		= kdbdmaS5 << 16,
-	kdbdmaStatusS4		= kdbdmaS4 << 16,
-	kdbdmaStatusS3		= kdbdmaS3 << 16,
-	kdbdmaStatusS2		= kdbdmaS2 << 16,
-	kdbdmaStatusS1		= kdbdmaS1 << 16,
-	kdbdmaStatusS0		= kdbdmaS0 << 16,
-	kdbdmaResCountMask	= 0x0000FFFF,
-	kdbdmaXferStatusMask	= 0xFFFF0000
-};
-
-
-/*  These macros are are IODBDMAChannelRegisters accessor functions. */
-
-#define IOSetDBDMAChannelRegister(registerSetPtr,field,value)	\
-OSWriteSwapInt32(registerSetPtr,offsetof(IODBDMAChannelRegisters,field),value)
-
-#define IOGetDBDMAChannelRegister(registerSetPtr, field)	\
-OSReadSwapInt32(registerSetPtr,offsetof(IODBDMAChannelRegisters, field))
-
-
-/* 	void IOSetDBDMAChannelControl (IODBDMAChannelRegisters *registerSetPtr, unsigned long ctlValue); */
-
-#define IOSetDBDMAChannelControl(registerSetPtr,ctlValue)		\
-do {									\
-    eieio();								\
-    IOSetDBDMAChannelRegister(registerSetPtr,channelControl,ctlValue);	\
-    eieio();								\
-} while(0)
-
-/* 	unsigned long IOGetDBDMAChannelStatus (IODBDMAChannelRegisters *registerSetPtr); */
-
-#define IOGetDBDMAChannelStatus(registerSetPtr)		\
-	IOGetDBDMAChannelRegister(registerSetPtr,channelStatus)
-
-/* 	unsigned long IOGetDBDMACommandPtr (IODBDMAChannelRegisters *registerSetPtr); */
-
-#define IOGetDBDMACommandPtr(registerSetPtr)			\
-	IOGetDBDMAChannelRegister(registerSetPtr,commandPtrLo)
-
-/* 	void IOSetDBDMACommandPtr (IODBDMAChannelRegisters *registerSetPtr, unsigned long cclPtr); */
-
-#define IOSetDBDMACommandPtr(registerSetPtr,cclPtr)			\
-do {									\
-    IOSetDBDMAChannelRegister(registerSetPtr,commandPtrHi,0);		\
-    eieio();								\
-    IOSetDBDMAChannelRegister(registerSetPtr,commandPtrLo,cclPtr);	\
-    eieio();								\
-} while(0)
-
-
-/* 	unsigned long IOGetDBDMAInterruptSelect (IODBDMAChannelRegisters *registerSetPtr); */
-
-#define IOGetDBDMAInterruptSelect(registerSetPtr)		\
-        IOGetDBDMAChannelRegister(registerSetPtr,interruptSelect)
-
-/* 	void IOSetDBDMAInterruptSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long intSelValue); */
-
-#define IOSetDBDMAInterruptSelect(registerSetPtr,intSelValue)		   \
-do {									   \
-    IOSetDBDMAChannelRegister(registerSetPtr,interruptSelect,intSelValue); \
-    eieio();								   \
-} while(0)
-
-/* 	unsigned long IOGetDBDMABranchSelect (IODBDMAChannelRegisters *registerSetPtr); */
-
-#define IOGetDBDMABranchSelect(registerSetPtr)				\
-	IOGetDBDMAChannelRegister(registerSetPtr,branchSelect)
-
-/* 	void IOSetDBDMABranchSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long braSelValue); */
-
-#define IOSetDBDMABranchSelect(registerSetPtr,braSelValue)		\
-do {									\
-    IOSetDBDMAChannelRegister(registerSetPtr,branchSelect,braSelValue);	\
-    eieio();								\
-} while(0)
-
-/* 	unsigned long IOGetDBDMAWaitSelect (IODBDMAChannelRegisters *registerSetPtr); */
-
-#define IOGetDBDMAWaitSelect(registerSetPtr)				\
-	IOGetDBDMAChannelRegister(registerSetPtr,waitSelect)
-
-/* 	void IOSetDBDMAWaitSelect (IODBDMAChannelRegisters *registerSetPtr, unsigned long waitSelValue); */
-
-#define IOSetDBDMAWaitSelect(registerSetPtr,waitSelValue)		\
-do {									\
-    IOSetDBDMAChannelRegister(registerSetPtr,waitSelect,waitSelValue);	\
-    eieio();								\
-} while(0)
-
-
-/*  These macros are IODBDMADescriptor accessor functions. */
-
-#define IOSetDBDMADescriptor(descPtr,field,value)		\
-OSWriteSwapInt32( descPtr, offsetof( IODBDMADescriptor, field), value)
-
-#define IOGetDBDMADescriptor(descPtr,field)	\
-OSReadSwapInt32( descPtr, offsetof( IODBDMADescriptor, field))
-
-#define	IOMakeDBDMAOperation(cmd,key,interrupt,branch,wait,count)	\
-    ( ((cmd) << 28) | ((key) << 24) | ((interrupt) << 20)		\
-      | ((branch) << 18) | ( (wait) << 16) | (count) )
-
-/* void  IOMakeDBDMADescriptor (IODBDMADescriptor *descPtr,
-				unsigned long cmd,
-				unsigned long key,
-				unsigned long interrupt,
-				unsigned long branch,
-				unsigned long wait,
-				unsigned long count,
-				unsigned long addr); */
-
-#define IOMakeDBDMADescriptor(descPtr,cmd,key,interrupt,branch,wait,count,addr)\
-do {									       \
-    IOSetDBDMADescriptor(descPtr, address, addr);			       \
-    IOSetDBDMADescriptor(descPtr, cmdDep,  0);				       \
-    IOSetDBDMADescriptor(descPtr, result,  0);				       \
-    eieio();								       \
-    IOSetDBDMADescriptor(descPtr, operation,				       \
-        IOMakeDBDMAOperation(cmd,key,interrupt,branch,wait,count));	       \
-    eieio();								       \
-} while(0)
-
-/* void IOMakeDBDMADescriptorDep (IODBDMADescriptor *descPtr,
-				unsigned long cmd,
-				unsigned long key,
-				unsigned long interrupt,
-				unsigned long branch,
-				unsigned long wait,
-				unsigned long count,
-				unsigned long addr,
-				unsigned long dep); */
-
-#define IOMakeDBDMADescriptorDep(descPtr,cmd,key,interrupt,branch,wait,count,addr,dep) \
-do {									       \
-    IOSetDBDMADescriptor(descPtr, address, addr);			       \
-    IOSetDBDMADescriptor(descPtr, cmdDep, dep);				       \
-    IOSetDBDMADescriptor(descPtr, result, 0);				       \
-    eieio();								       \
-    IOSetDBDMADescriptor(descPtr, operation,				       \
-        IOMakeDBDMAOperation(cmd, key, interrupt, branch, wait, count));       \
-    eieio();								       \
-} while(0)
-
-/*	Field accessors - NOTE: unsynchronized */
-
-/* 	unsigned long IOGetDBDMAOperation (IODBDMADescriptor *descPtr) */
-
-#define IOGetCCOperation(descPtr)				\
-	IOGetDBDMADescriptor(descPtr,operation)
-
-/* 	void IOSetCCOperation (IODBDMADescriptor *descPtr, unsigned long operationValue) */
-
-#define IOSetCCOperation(descPtr,operationValue)		\
-	IOSetDBDMADescriptor(descPtr,operation,operationValue)
-
-/* 	unsigned long IOGetCCAddress (IODBDMADescriptor *descPtr) */
-
-#define IOGetCCAddress(descPtr)				\
-	IOGetDBDMADescriptor(descPtr,address)
-
-/* 	void IOSetCCAddress (IODBDMADescriptor *descPtr, unsigned long addressValue) */
-
-#define IOSetCCAddress(descPtr,addressValue)		\
-	IOSetDBDMADescriptor(descPtr,address, addressValue)
-
-/* 	unsigned long IOGetCCCmdDep (IODBDMADescriptor *descPtr) */
-
-#define IOGetCCCmdDep(descPtr)				\
-	IOGetDBDMADescriptor(descPtr,cmdDep)
-
-/* 	void IOSetCCCmdDep (IODBDMADescriptor *descPtr, unsigned long cmdDepValue) */
-
-#define IOSetCCCmdDep(descPtr,cmdDepValue)		\
-	IOSetDBDMADescriptor(descPtr,cmdDep,cmdDepValue)
-
-/* 	unsigned long IOGetCCResult (IODBDMADescriptor *descPtr) */
-
-#define IOGetCCResult(descPtr)				\
-	IOGetDBDMADescriptor(descPtr,result)
-
-/* 	void IOSetCCResult (IODBDMADescriptor *descPtr, unsigned long resultValue) */
-
-#define IOSetCCResult(descPtr,resultValue)		\
-	IOSetDBDMADescriptor(descPtr,result,resultValue)
-
-
-/* DBDMA routines */
-
-extern void	IODBDMAStart( volatile IODBDMAChannelRegisters *registerSetPtr, volatile IODBDMADescriptor *physicalDescPtr);
-extern void	IODBDMAStop( volatile IODBDMAChannelRegisters *registerSetPtr);
-extern void	IODBDMAFlush( volatile IODBDMAChannelRegisters *registerSetPtr);
-extern void	IODBDMAReset( volatile IODBDMAChannelRegisters *registerSetPtr);
-extern void	IODBDMAContinue( volatile IODBDMAChannelRegisters *registerSetPtr);
-extern void	IODBDMAPause( volatile IODBDMAChannelRegisters *registerSetPtr);
-
-extern IOReturn	IOAllocatePhysicallyContiguousMemory( unsigned int size, unsigned int options,
-				     IOVirtualAddress * logical, IOPhysicalAddress * physical );
-extern IOReturn IOFreePhysicallyContiguousMemory( IOVirtualAddress * logical, unsigned int size);
-
-#endif /* !defined(_IODBDMA_H_) */
diff --git a/i386/include/IOKit/pwr_mgt/.svn/all-wcprops b/i386/include/IOKit/pwr_mgt/.svn/all-wcprops
deleted file mode 100644
index 3ea4d10..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/all-wcprops
+++ /dev/null
@@ -1,59 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 60
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt
-END
-RootDomain.h
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/RootDomain.h
-END
-IOPMLibDefs.h
-K 25
-svn:wc:ra_dav:version-url
-V 74
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMLibDefs.h
-END
-IOPMPowerSourceList.h
-K 25
-svn:wc:ra_dav:version-url
-V 82
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMPowerSourceList.h
-END
-IOPMPrivate.h
-K 25
-svn:wc:ra_dav:version-url
-V 74
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMPrivate.h
-END
-IOPMPowerSource.h
-K 25
-svn:wc:ra_dav:version-url
-V 78
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMPowerSource.h
-END
-IOPMpowerState.h
-K 25
-svn:wc:ra_dav:version-url
-V 77
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMpowerState.h
-END
-IOPM.h
-K 25
-svn:wc:ra_dav:version-url
-V 67
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPM.h
-END
-IOPowerConnection.h
-K 25
-svn:wc:ra_dav:version-url
-V 80
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPowerConnection.h
-END
-IOPMDeprecated.h
-K 25
-svn:wc:ra_dav:version-url
-V 77
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/pwr_mgt/IOPMDeprecated.h
-END
diff --git a/i386/include/IOKit/pwr_mgt/.svn/entries b/i386/include/IOKit/pwr_mgt/.svn/entries
deleted file mode 100644
index decf7eb..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/entries
+++ /dev/null
@@ -1,334 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/pwr_mgt
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-RootDomain.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-bdf4cb75458bc85f1bbb7f9d25e0b25b
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10815
-
-IOPMLibDefs.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-2f6d1ceef422ff8f504e009c9554720b
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1762
-
-IOPMPowerSourceList.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-ba4d08c61820252a5ed6241fd8b3c13a
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2024
-
-IOPMPrivate.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-875e737556ada49d86b951e79209bc3a
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11099
-
-IOPMPowerSource.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-8ec726b34101aecbd930216a9d944510
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9439
-
-IOPMpowerState.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-eb4e9833e8dc27f552ed3fa7704a0b8d
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3760
-
-IOPM.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-6e0b70a4a16a7c280dcfbe0c99e1c06c
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-27180
-
-IOPowerConnection.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-05e49f8d6c51a982ce29d3e16cb0c161
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6011
-
-IOPMDeprecated.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-ebebd77a291987f315e9719e9f1f53e9
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9112
-
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPM.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPM.h.svn-base
deleted file mode 100644
index 7d78225..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPM.h.svn-base
+++ /dev/null
@@ -1,654 +0,0 @@
-/*
- * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOKIT_IOPM_H
-#define _IOKIT_IOPM_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/IOReturn.h>
-
-#ifdef __ppc__
-#include <IOKit/pwr_mgt/IOPMDeprecated.h>
-#endif
-
-/*! @header IOPM.h
-    @abstract Defines power management constants and keys used by both in-kernel and user space power management.
-    @discussion IOPM.h defines a range of power management constants used in several in-kernel and user space APIs. Most significantly, the IOPMPowerFlags used to specify the fields of an IOPMPowerState struct are defined here.
-
-    Most of the constants defined in IOPM.h are deprecated or for Apple internal use only, and are not elaborated on in headerdoc.
-*/
-
-enum {
-    kIOPMMaxPowerStates = 10,
-    IOPMMaxPowerStates = kIOPMMaxPowerStates
-};
-
-/*! @enum IOPMPowerFlags
-    @abstract Bits are used in defining capabilityFlags, inputPowerRequirements, and outputPowerCharacter in the IOPMPowerState structure.
-    @discussion These bits may be bitwise-OR'd together in the IOPMPowerState capabilityFlags field, the outputPowerCharacter field, and/or the inputPowerRequirement field. 
-    
-    The comments clearly mark whether each flag should be used in the capabilityFlags field, outputPowerCharacter field, and inputPowerRequirement field, or all three.
-    
-    The value of capabilityFlags, inputPowerRequirement or outputPowerCharacter may be 0. Most drivers implement their 'OFF' state, used when asleep, by defininf each of the 3 fields as 0.
-    
-    The bits listed below are only the most common bits used to define a device's power states. Your device's IO family may require that your device specify other input or output power flags to interact properly. Consult family-specific documentation to determine if your IOPower plane parents or children require other power flags; they probably don't.
-
-    @constant kIOPMPowerOn Indicates the device is on, requires power, and provides power. Useful as a: Capability, InputPowerRequirement, OutputPowerCharacter
-
-    @constant kIOPMDeviceUsable Indicates the device is usable in this state. Useful only as a Capability
-
-    @constant kIOPMLowPower 
-    Indicates device is in a low power state. May be bitwis-OR'd together
-    with kIOPMDeviceUsable flag, to indicate the device is still usable.
-    
-    A device with a capability of kIOPMLowPower may:
-       Require either 0 or kIOPMPowerOn from its power parent
-       Offer either kIOPMLowPower, kIOPMPowerOn, or 0 (no power at all)
-         to its power plane children.
-
-    Useful only as a Capability, although USB drivers should consult USB family documentation for other valid circumstances to use the kIOPMLowPower bit.
-
-    @constant kIOPMPreventIdleSleep
-    In the capability field of a power state, disallows idle system sleep while the device is in that state.
-    
-    For example, displays and disks set this capability for their ON power state; since the system may not idle sleep while the display (and thus keyboard or mouse) or the disk is active.
-
-    Useful only as a Capability.
-    
-    @constant kIOPMSleepCapability 
-    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
-    
-    @constant kIOPMRestartCapability
-    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
-    
-    @constant kIOPMSleep
-    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
-
-    @constant kIOPMRestart
-    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
-*/
-typedef unsigned long IOPMPowerFlags;
-enum {
-    kIOPMPowerOn                    = 0x00000002,
-    kIOPMDeviceUsable               = 0x00008000,
-    kIOPMLowPower                   = 0x00010000,
-    kIOPMPreventIdleSleep           = 0x00000040,
-    kIOPMSleepCapability            = 0x00000004,
-    kIOPMRestartCapability          = 0x00000080,
-    kIOPMSleep                      = 0x00000001,
-    kIOPMRestart                    = 0x00000080
-};
-
-/*
- * Private IOPMPowerFlags
- *
- * For Apple use only
- * Not for use with non-Apple drivers
- * Their behavior is undefined
- */
-enum {
-    kIOPMClockNormal                = 0x0004,
-    kIOPMClockRunning               = 0x0008,
-    kIOPMPreventSystemSleep         = 0x0010,
-    kIOPMDoze                       = 0x0400,
-    kIOPMChildClamp                 = 0x0080,
-    kIOPMChildClamp2                = 0x0200,
-    kIOPMNotPowerManaged            = 0x0800
-};
-
-
-/*
- * Deprecated IOPMPowerFlags
- * Their behavior is undefined when used in IOPMPowerState
- * Capability, InputPowerRequirement, or OutputPowerCharacter fields.
- */
-enum {
-    kIOPMMaxPerformance             = 0x4000,
-    kIOPMPassThrough                = 0x0100,
-    kIOPMAuxPowerOn                 = 0x0020,
-    kIOPMNotAttainable              = 0x0001,
-    kIOPMContextRetained            = 0x2000,
-    kIOPMConfigRetained             = 0x1000,
-    kIOPMStaticPowerValid           = 0x0800,
-    kIOPMSoftSleep                  = 0x0400,
-    kIOPMCapabilitiesMask =     kIOPMPowerOn | kIOPMDeviceUsable | 
-                                kIOPMMaxPerformance | kIOPMContextRetained | 
-                                kIOPMConfigRetained | kIOPMSleepCapability |
-                                kIOPMRestartCapability
-};
-
-/*
- * Support for old names of IOPMPowerFlag constants
- */
-enum {
-    IOPMNotAttainable           = kIOPMNotAttainable,
-    IOPMPowerOn                 = kIOPMPowerOn,
-    IOPMClockNormal             = kIOPMClockNormal,
-    IOPMClockRunning            = kIOPMClockRunning,
-    IOPMAuxPowerOn              = kIOPMAuxPowerOn,
-    IOPMDeviceUsable            = kIOPMDeviceUsable,
-    IOPMMaxPerformance          = kIOPMMaxPerformance,
-    IOPMContextRetained         = kIOPMContextRetained,
-    IOPMConfigRetained          = kIOPMConfigRetained,
-    IOPMNotPowerManaged         = kIOPMNotPowerManaged,
-    IOPMSoftSleep               = kIOPMSoftSleep
-};
-
-
-enum {
-    kIOPMNextHigherState        = 1,
-    kIOPMHighestState           = 2,
-    kIOPMNextLowerState         = 3,
-    kIOPMLowestState            = 4
-};
-
-enum {
-    IOPMNextHigherState         = kIOPMNextHigherState,
-    IOPMHighestState            = kIOPMHighestState,
-    IOPMNextLowerState          = kIOPMNextLowerState,
-    IOPMLowestState             = kIOPMLowestState
-};
-
-// Internal commands used by power managment command queue
-enum {
-    kIOPMBroadcastAggressiveness = 1,
-    kIOPMUnidleDevice
-};
-
-// Power consumption unknown value
-enum {
-    kIOPMUnknown = 0xFFFF
-};
-
-/*******************************************************************************
- *
- * Root Domain property keys of interest
- *
- ******************************************************************************/
-
-/* AppleClamshellState 
- * reflects the state of the clamshell (lid) on a portable.
- * It has a boolean value.
- *  true        == clamshell is closed
- *  false       == clamshell is open
- *  not present == no clamshell on this hardware
- */
-#define kAppleClamshellStateKey             "AppleClamshellState"
-
-/* AppleClamshellCausesSleep 
- * reflects the clamshell close behavior on a portable. 
- * It has a boolean value.
- *  true        == system will sleep when clamshell is closed
- *  false       == system will not sleep on clamshell close 
- *                  (typically external display mode)
- *  not present == no clamshell on this hardware
- */
-#define kAppleClamshellCausesSleepKey       "AppleClamshellCausesSleep"
-
-/* kIOPMSleepWakeUUIDKey
- * Key refers to a CFStringRef that will uniquely identify
- * a sleep/wake cycle for logging & tracking.
- * The key becomes valid at the beginning of a sleep cycle - before we
- * initiate any sleep/wake notifications.
- * The key becomes invalid at the completion of a system wakeup. The
- * property will not be present in the IOPMrootDomain's registry entry
- * when it is invalid.
- * 
- * See IOPMrootDomain notification kIOPMMessageSleepWakeUUIDChange
- */
- #define kIOPMSleepWakeUUIDKey              "SleepWakeUUID"
-
-/*******************************************************************************
- *
- * Root Domain general interest messages
- *
- * Available by registering for interest type 'gIOGeneralInterest' 
- * on IOPMrootDomain. 
- *
- ******************************************************************************/
-
-/* kIOPMMessageClamshellStateChange
- * Delivered as a general interest notification on the IOPMrootDomain
- * IOPMrootDomain sends this message when state of either AppleClamshellState
- * or AppleClamshellCausesSleep changes. If this clamshell change results in
- * a sleep, the sleep will initiate soon AFTER delivery of this message.
- * The state of both variables is encoded in a bitfield argument sent with
- * the message. Check bits 0 and 1 using kClamshellStateBit & kClamshellSleepBit
- */
-enum {
-    kClamshellStateBit = (1 << 0),
-    kClamshellSleepBit = (1 << 1)
-};
-
-#define kIOPMMessageClamshellStateChange   \
-                iokit_family_msg(sub_iokit_powermanagement, 0x100)
-
-/* kIOPMMessageFeatureChange
- * Delivered when the set of supported features ("Supported Features" dictionary
- * under IOPMrootDomain registry) changes in some way. Typically addition or
- * removal of a supported feature.
- * RootDomain passes no argument with this message.
- */
-#define kIOPMMessageFeatureChange           \
-                iokit_family_msg(sub_iokit_powermanagement, 0x110)
-
-/* kIOPMMessageInflowDisableCancelled
- * The battery has drained completely to its "Fully Discharged" state. 
- * If a user process has disabled battery inflow for battery 
- * calibration, we forcibly re-enable Inflow at this point.
- * If inflow HAS been forcibly re-enabled, bit 0
- * (kInflowForciblyEnabledBit) will be set.
- */
-enum {
-    kInflowForciblyEnabledBit = (1 << 0)
-};
-
-/* kIOPMMessageInternalBatteryFullyDischarged
- * The battery has drained completely to its "Fully Discharged" state. 
- */
-#define kIOPMMessageInternalBatteryFullyDischarged  \
-                iokit_family_msg(sub_iokit_powermanagement, 0x120)
-
-/* kIOPMMessageSystemPowerEventOccurred
- * Some major system thermal property has changed, and interested clients may
- * modify their behavior.
- */
-#define kIOPMMessageSystemPowerEventOccurred  \
-                iokit_family_msg(sub_iokit_powermanagement, 0x130)
-
-/* kIOPMMessageSleepWakeUUIDChange
- * Either a new SleepWakeUUID has been specified at the beginning of a sleep,
- * or we're removing the existing property upon completion of a wakeup.
- */
-#define kIOPMMessageSleepWakeUUIDChange  \
-                iokit_family_msg(sub_iokit_powermanagement, 0x140)
-                
-/* kIOPMMessageSleepWakeUUIDSet
- * Argument accompanying the kIOPMMessageSleepWakeUUIDChange notification when 
- * a new UUID has been specified.
- */
-#define kIOPMMessageSleepWakeUUIDSet                    ((void *)1)
-
-/* kIOPMMessageSleepWakeUUIDCleared
- * Argument accompanying the kIOPMMessageSleepWakeUUIDChange notification when 
- * the current UUID has been removed.
- */
-#define kIOPMMessageSleepWakeUUIDCleared                ((void *)0)
-
-/*******************************************************************************
- *
- * Power commands issued to root domain
- * Use with IOPMrootDomain::receivePowerNotification()
- *
- * These commands are issued from system drivers only:
- *      ApplePMU, AppleSMU, IOGraphics, AppleACPIFamily
- *
- ******************************************************************************/
-enum {
-  kIOPMSleepNow                 = (1<<0),  // put machine to sleep now
-  kIOPMAllowSleep               = (1<<1),  // allow idle sleep
-  kIOPMPreventSleep             = (1<<2),  // do not allow idle sleep
-  kIOPMPowerButton              = (1<<3),  // power button was pressed
-  kIOPMClamshellClosed          = (1<<4),  // clamshell was closed
-  kIOPMPowerEmergency           = (1<<5),  // battery dangerously low
-  kIOPMDisableClamshell         = (1<<6),  // do not sleep on clamshell closure
-  kIOPMEnableClamshell          = (1<<7),  // sleep on clamshell closure
-  kIOPMProcessorSpeedChange     = (1<<8),  // change the processor speed
-  kIOPMOverTemp                 = (1<<9),  // system dangerously hot
-  kIOPMClamshellOpened          = (1<<10)  // clamshell was opened
-};
-
-
-/*******************************************************************************
- *
- * Power Management Return Codes
- *
- ******************************************************************************/
-enum {
-    kIOPMNoErr                  = 0,
-
-    // Returned by driver's setPowerState(), powerStateWillChangeTo(),
-    // powerStateDidChangeTo(), or acknowledgeSetPowerState() to
-    // implicitly acknowledge power change upon function return.
-    kIOPMAckImplied             = 0,
-
-    // Deprecated
-    kIOPMWillAckLater           = 1,
-
-    // Returned by requestPowerDomainState() to indicate
-    // unrecognized specification parameter.
-    kIOPMBadSpecification       = 4,
-
-    // Returned by requestPowerDomainState() to indicate
-    // no power state matches search specification.
-    kIOPMNoSuchState            = 5,
-
-    // Deprecated
-    kIOPMCannotRaisePower       = 6,
-
-    // Deprecated
-    kIOPMParameterError         = 7,
-
-    // Returned when power management state is accessed
-    // before driver has called PMinit().
-    kIOPMNotYetInitialized      = 8,
-
-    // And the old constants; deprecated
-    IOPMNoErr = kIOPMNoErr,
-    IOPMAckImplied = kIOPMAckImplied, 
-    IOPMWillAckLater = kIOPMWillAckLater,
-    IOPMBadSpecification = kIOPMBadSpecification,
-    IOPMNoSuchState = kIOPMNoSuchState,
-    IOPMCannotRaisePower = kIOPMCannotRaisePower,
-    IOPMParameterError = kIOPMParameterError,
-    IOPMNotYetInitialized = kIOPMNotYetInitialized
-};
-
-
-// IOPMPowerSource class descriptive strings
-// Power Source state is published as properties to the IORegistry under these 
-// keys.
-#define kIOPMPSExternalConnectedKey                 "ExternalConnected"
-#define kIOPMPSExternalChargeCapableKey             "ExternalChargeCapable"
-#define kIOPMPSBatteryInstalledKey                  "BatteryInstalled"
-#define kIOPMPSIsChargingKey                        "IsCharging"
-#define kIOPMFullyChargedKey                        "FullyCharged"
-#define kIOPMPSAtWarnLevelKey                       "AtWarnLevel"
-#define kIOPMPSAtCriticalLevelKey                   "AtCriticalLevel"
-#define kIOPMPSCurrentCapacityKey                   "CurrentCapacity"
-#define kIOPMPSMaxCapacityKey                       "MaxCapacity"
-#define kIOPMPSDesignCapacityKey                    "DesignCapacity"
-#define kIOPMPSTimeRemainingKey                     "TimeRemaining"
-#define kIOPMPSAmperageKey                          "Amperage"
-#define kIOPMPSVoltageKey                           "Voltage"
-#define kIOPMPSCycleCountKey                        "CycleCount"
-#define kIOPMPSMaxErrKey                            "MaxErr"
-#define kIOPMPSAdapterInfoKey                       "AdapterInfo"
-#define kIOPMPSLocationKey                          "Location"
-#define kIOPMPSErrorConditionKey                    "ErrorCondition"
-#define kIOPMPSManufacturerKey                      "Manufacturer"
-#define kIOPMPSManufactureDateKey                   "ManufactureDate"
-#define kIOPMPSModelKey                             "Model"
-#define kIOPMPSSerialKey                            "Serial"
-#define kIOPMDeviceNameKey                          "DeviceName"
-#define kIOPMPSLegacyBatteryInfoKey                 "LegacyBatteryInfo"
-#define kIOPMPSBatteryHealthKey                     "BatteryHealth"
-#define kIOPMPSHealthConfidenceKey                  "HealthConfidence"
-#define kIOPMPSCapacityEstimatedKey	                "CapacityEstimated"
-#define kIOPMPSBatteryChargeStatusKey               "ChargeStatus"
-#define kIOPMPSBatteryTemperatureKey                "Temperature"
-
-// kIOPMPSBatteryChargeStatusKey may have one of the following values, or may have
-// no value. If kIOPMBatteryChargeStatusKey has a NULL value (or no value) associated with it
-// then charge is proceeding normally. If one of these battery charge status reasons is listed,
-// then the charge may have been interrupted.
-#define kIOPMBatteryChargeStatusTooHot              "HighTemperature"
-#define kIOPMBatteryChargeStatusTooCold             "LowTemperature"
-#define kIOPMBatteryChargeStatusGradient            "BatteryTemperatureGradient"
-
-// Definitions for battery location, in case of multiple batteries.
-// A location of 0 is unspecified
-// Location is undefined for single battery systems
-enum {
-    kIOPMPSLocationLeft = 1001,
-    kIOPMPSLocationRight = 1002
-};
-
-// Battery quality health types, specified by BatteryHealth and HealthConfidence
-// properties in an IOPMPowerSource battery kext.
-enum {
-    kIOPMUndefinedValue = 0,
-    kIOPMPoorValue      = 1,
-    kIOPMFairValue      = 2,
-    kIOPMGoodValue      = 3
-};
-
-// Battery's time remaining estimate is invalid this long (seconds) after a wake
-#define kIOPMPSInvalidWakeSecondsKey           "BatteryInvalidWakeSeconds"
-
-// Battery must wait this long (seconds) after being completely charged before
-// the battery is settled.
-#define kIOPMPSPostChargeWaitSecondsKey        "PostChargeWaitSeconds"
-
-// Battery must wait this long (seconds) after being completely discharged 
-// before the battery is settled.
-#define kIOPMPSPostDishargeWaitSecondsKey      "PostDischargeWaitSeconds"
-
-
-/* CPU Power Management status keys
- * Pass as arguments to IOPMrootDomain::systemPowerEventOccurred
- * Or as arguments to IOPMSystemPowerEventOccurred()
- * Or to decode the dictionary obtained from IOPMCopyCPUPowerStatus()
- * These keys reflect restrictions placed on the CPU by the system
- * to bring the CPU's power consumption within allowable thermal and 
- * power constraints.
- */
-
-
-/* kIOPMGraphicsPowerLimitsKey
- *   The key representing the dictionary of graphics power limits.
- *   The dictionary contains the other kIOPMCPUPower keys & their associated
- *   values (e.g. Speed limit, Processor Count, and Schedule limits).
- */
-#define kIOPMGraphicsPowerLimitsKey                     "Graphics_Power_Limits"
-
-/* kIOPMGraphicsPowerLimitPerformanceKey
- *   The key representing the percent of overall performance made available
- *   by the graphics chip as a percentage (integer 0 - 100).
- */
-#define kIOPMGraphicsPowerLimitPerformanceKey           "Graphics_Power_Performance"
-
-
-
-/* kIOPMCPUPowerLimitsKey
- *   The key representing the dictionary of CPU Power Limits.
- *   The dictionary contains the other kIOPMCPUPower keys & their associated
- *   values (e.g. Speed limit, Processor Count, and Schedule limits).
- */
-#define kIOPMCPUPowerLimitsKey                          "CPU_Power_Limits"
-
-/* kIOPMCPUPowerLimitProcessorSpeedKey defines the speed & voltage limits placed 
- *   on the CPU.
- *   Represented as a percentage (0-100) of maximum CPU speed.
- */
-#define kIOPMCPUPowerLimitProcessorSpeedKey             "CPU_Speed_Limit"
-
-/* kIOPMCPUPowerLimitProcessorCountKey reflects how many, if any, CPUs have been
- *   taken offline. Represented as an integer number of CPUs (0 - Max CPUs).
- */
-#define kIOPMCPUPowerLimitProcessorCountKey             "CPU_Available_CPUs"
-
-/* kIOPMCPUPowerLimitSchedulerTimeKey represents the percentage (0-100) of CPU time 
- *   available. 100% at normal operation. The OS may limit this time for a percentage
- *   less than 100%.
- */
-#define kIOPMCPUPowerLimitSchedulerTimeKey              "CPU_Scheduler_Limit"
-
-
-/* Thermal Level Warning Key
- * Indicates the thermal constraints placed on the system. This value may 
- * cause clients to action to consume fewer system resources.
- * The value associated with this warning is defined by the platform.
- */
-#define kIOPMThermalLevelWarningKey                     "Thermal_Level_Warning"
-
-/* Thermal Warning Level values
- *      kIOPMThermalWarningLevelNormal - under normal operating conditions
- *      kIOPMThermalWarningLevelDanger - thermal pressure may cause system slowdown
- *      kIOPMThermalWarningLevelCrisis - thermal conditions may cause imminent shutdown
- *
- * The platform may define additional thermal levels if necessary.
- */
-enum {
-  kIOPMThermalWarningLevelNormal    = 0,
-  kIOPMThermalWarningLevelDanger    = 5,
-  kIOPMThermalWarningLevelCrisis    = 10
-};
-
-
-// PM Settings Controller setting types
-// Settings types used primarily with:
-//      IOPMrootDomain::registerPMSettingController
-// The values are identical to the similarly named keys for use in user space
-// PM settings work. Those keys are defined in IOPMLibPrivate.h.
-#define kIOPMSettingWakeOnRingKey                   "Wake On Modem Ring"
-#define kIOPMSettingRestartOnPowerLossKey           "Automatic Restart On Power Loss"
-#define kIOPMSettingWakeOnACChangeKey               "Wake On AC Change"
-#define kIOPMSettingSleepOnPowerButtonKey           "Sleep On Power Button"
-#define kIOPMSettingWakeOnClamshellKey              "Wake On Clamshell Open"
-#define kIOPMSettingReduceBrightnessKey             "ReduceBrightness"
-#define kIOPMSettingDisplaySleepUsesDimKey          "Display Sleep Uses Dim"
-#define kIOPMSettingTimeZoneOffsetKey               "TimeZoneOffsetSeconds"
-#define kIOPMSettingMobileMotionModuleKey           "MobileMotionModule"
-#define kIOPMSettingGraphicsSwitchKey               "GPUSwitch"
-
-// Setting controlling drivers can register to receive scheduled wake data
-// Either in "CF seconds" type, or structured calendar data in a formatted
-// IOPMCalendarStruct defined below.
-#define kIOPMSettingAutoWakeSecondsKey              "wake"
-#define kIOPMSettingAutoWakeCalendarKey             "WakeByCalendarDate"
-#define kIOPMSettingAutoPowerSecondsKey             "poweron"
-#define kIOPMSettingAutoPowerCalendarKey            "PowerByCalendarDate"
-
-// Debug seconds auto wake
-// Used by sleep cycling debug tools
-#define kIOPMSettingDebugWakeRelativeKey            "WakeRelativeToSleep"
-#define kIOPMSettingDebugPowerRelativeKey           "PowerRelativeToShutdown"
-
-// Maintenance wake calendar.
-#define kIOPMSettingMaintenanceWakeCalendarKey      "MaintenanceWakeCalendarDate"
-
-struct IOPMCalendarStruct {
-    UInt32      year;
-    UInt8       month;
-    UInt8       day;
-    UInt8       hour;
-    UInt8       minute;
-    UInt8       second;
-};
-typedef struct IOPMCalendarStruct IOPMCalendarStruct;
-
-// SetAggressiveness types
-enum {
-    kPMGeneralAggressiveness = 0,
-    kPMMinutesToDim,
-    kPMMinutesToSpinDown,
-    kPMMinutesToSleep,
-    kPMEthernetWakeOnLANSettings,
-    kPMSetProcessorSpeed,
-    kPMPowerSource,
-    kPMMotionSensor,
-    kPMLastAggressivenessType
-};
-#define kMaxType (kPMLastAggressivenessType-1)
-
-// SetAggressiveness values for the kPMPowerSource aggressiveness type
-enum {
-    kIOPMInternalPower = 1,
-    kIOPMExternalPower
-};
-
-#define kIOREMSleepEnabledKey               "REMSleepEnabled"
-
-// Strings for deciphering the dictionary returned from IOPMCopyBatteryInfo
-#define kIOBatteryInfoKey                   "IOBatteryInfo"
-#define kIOBatteryCurrentChargeKey          "Current"
-#define kIOBatteryCapacityKey               "Capacity"
-#define kIOBatteryFlagsKey                  "Flags"
-#define kIOBatteryVoltageKey                "Voltage"
-#define kIOBatteryAmperageKey               "Amperage"
-#define kIOBatteryCycleCountKey             "Cycle Count"
-
-enum {
-    kIOBatteryInstalled         = (1 << 2),
-    kIOBatteryCharge            = (1 << 1),
-    kIOBatteryChargerConnect    = (1 << 0)
-};
-
-
-// Private power management message indicating battery data has changed
-// Indicates new data resides in the IORegistry
-#define kIOPMMessageBatteryStatusHasChanged         iokit_family_msg(sub_iokit_pmu, 0x100)
-
-// Apple private Legacy messages for re-routing AutoWake and AutoPower messages to the PMU
-// through newer user space IOPMSchedulePowerEvent API
-#define kIOPMUMessageLegacyAutoWake                 iokit_family_msg(sub_iokit_pmu, 0x200)
-#define kIOPMUMessageLegacyAutoPower                iokit_family_msg(sub_iokit_pmu, 0x210)
-
-// For use with IOPMPowerSource bFlags
-#define IOPM_POWER_SOURCE_REV   2
-enum {
-  kIOPMACInstalled      = kIOBatteryChargerConnect,
-  kIOPMBatteryCharging  = kIOBatteryCharge,
-  kIOPMBatteryInstalled = kIOBatteryInstalled,
-  kIOPMUPSInstalled     = (1<<3),
-  kIOPMBatteryAtWarn    = (1<<4),
-  kIOPMBatteryDepleted  = (1<<5),
-  kIOPMACnoChargeCapability = (1<<6),     // AC adapter cannot charge battery
-  kIOPMRawLowBattery    = (1<<7),         // used only by  Platform Expert
-  kIOPMForceLowSpeed    = (1<<8),         // set by Platfm Expert, chk'd by Pwr Plugin
-  kIOPMClosedClamshell  = (1<<9),         // set by PMU - reflects state of the clamshell
-  kIOPMClamshellStateOnWake = (1<<10)     // used only by Platform Expert
-};
-
-
-// **********************************************
-// Internal power management data structures
-// **********************************************
-
-#if KERNEL && __cplusplus
-class IOService;
-
-enum {
-    kIOPowerEmergencyLevel = 1000
-};
-
-enum {
-    kIOPMSubclassPolicy,
-    kIOPMSuperclassPolicy1
-};
-
-struct stateChangeNote{
-    IOPMPowerFlags    stateFlags;
-    unsigned long    stateNum;
-    void *         powerRef;
-};
-typedef struct stateChangeNote stateChangeNote;
-
-struct IOPowerStateChangeNotification {
-    void *        powerRef;
-    unsigned long    returnValue;
-    unsigned long    stateNumber;
-    IOPMPowerFlags    stateFlags;
-};
-typedef struct IOPowerStateChangeNotification IOPowerStateChangeNotification;
-typedef IOPowerStateChangeNotification sleepWakeNote;
-#endif /* KERNEL && __cplusplus */
-
-#endif /* ! _IOKIT_IOPM_H */
-
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMDeprecated.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMDeprecated.h.svn-base
deleted file mode 100644
index 3bee01a..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMDeprecated.h.svn-base
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOPMDeprecated_h_
-#define _IOPMDeprecated_h_
-
-#ifdef __ppc__
-
-// Power events
-enum {
-  kClamshellClosedEventMask  = (1<<0),  // User closed lid
-  kDockingBarEventMask       = (1<<1),  // OBSOLETE
-  kACPlugEventMask           = (1<<2),  // User plugged or unplugged adapter
-  kFrontPanelButtonEventMask = (1<<3),  // User hit the front panel button
-  kBatteryStatusEventMask    = (1<<4)   // Battery status has changed
-};
-
-// PUBLIC power management features
-// NOTE: this is a direct port from classic, some of these bits
-//       are obsolete but are included for completeness
-enum {
-  kPMHasWakeupTimerMask        = (1<<0),  // 1=wake timer is supported
-  kPMHasSharedModemPortMask    = (1<<1),  // Not used
-  kPMHasProcessorCyclingMask   = (1<<2),  // 1=processor cycling supported
-  kPMMustProcessorCycleMask    = (1<<3),  // Not used
-  kPMHasReducedSpeedMask       = (1<<4),  // 1=supports reduced processor speed
-  kPMDynamicSpeedChangeMask    = (1<<5),  // 1=supports changing processor speed on the fly
-  kPMHasSCSIDiskModeMask       = (1<<6),  // 1=supports using machine as SCSI drive
-  kPMCanGetBatteryTimeMask     = (1<<7),  // 1=battery time can be calculated
-  kPMCanWakeupOnRingMask       = (1<<8),  // 1=machine can wake on modem ring
-  kPMHasDimmingSupportMask     = (1<<9),  // 1=has monitor dimming support
-  kPMHasStartupTimerMask       = (1<<10), // 1=can program startup timer
-  kPMHasChargeNotificationMask = (1<<11), // 1=client can determine charger status/get notifications
-  kPMHasDimSuspendSupportMask  = (1<<12), // 1=can dim diplay to DPMS ('off') state
-  kPMHasWakeOnNetActivityMask  = (1<<13), // 1=supports waking upon receipt of net packet
-  kPMHasWakeOnLidMask          = (1<<14), // 1=can wake upon lid/case opening
-  kPMCanPowerOffPCIBusMask     = (1<<15), // 1=can remove power from PCI bus on sleep
-  kPMHasDeepSleepMask          = (1<<16), // 1=supports deep (hibernation) sleep
-  kPMHasSleepMask              = (1<<17), // 1=machine support low power sleep (ala powerbooks)
-  kPMSupportsServerModeAPIMask = (1<<18), // 1=supports reboot on AC resume for unexpected power loss
-  kPMHasUPSIntegrationMask     = (1<<19)  // 1=supports incorporating UPS devices into power source calcs
-};
-
-// PRIVATE power management features
-// NOTE: this is a direct port from classic, some of these bits
-//       are obsolete but are included for completeness.
-enum {
-  kPMHasExtdBattInfoMask       = (1<<0),  // Not used
-  kPMHasBatteryIDMask          = (1<<1),  // Not used
-  kPMCanSwitchPowerMask        = (1<<2),  // Not used 
-  kPMHasCelsiusCyclingMask     = (1<<3),  // Not used
-  kPMHasBatteryPredictionMask  = (1<<4),  // Not used
-  kPMHasPowerLevelsMask        = (1<<5),  // Not used
-  kPMHasSleepCPUSpeedMask      = (1<<6),  // Not used
-  kPMHasBtnIntHandlersMask     = (1<<7),  // 1=supports individual button interrupt handlers
-  kPMHasSCSITermPowerMask      = (1<<8),  // 1=supports SCSI termination power switch
-  kPMHasADBButtonHandlersMask  = (1<<9),  // 1=supports button handlers via ADB
-  kPMHasICTControlMask         = (1<<10), // 1=supports ICT control
-  kPMHasLegacyDesktopSleepMask = (1<<11), // 1=supports 'doze' style sleep
-  kPMHasDeepIdleMask           = (1<<12), // 1=supports Idle2 in hardware
-  kPMOpenLidPreventsSleepMask  = (1<<13), // 1=open case prevent machine from sleeping
-  kPMClosedLidCausesSleepMask  = (1<<14), // 1=case closed (clamshell closed) causes sleep
-  kPMHasFanControlMask         = (1<<15), // 1=machine has software-programmable fan/thermostat controls
-  kPMHasThermalControlMask     = (1<<16), // 1=machine supports thermal monitoring
-  kPMHasVStepSpeedChangeMask   = (1<<17), // 1=machine supports processor voltage/clock change
-  kPMEnvironEventsPolledMask   = (1<<18)  // 1=machine doesn't generate pmu env ints, we must poll instead 
-};
-
-// DEFAULT public and private features for machines whose device tree
-// does NOT contain this information (pre-Core99).
-
-// For Cuda-based Desktops
-
-#define kStdDesktopPMFeatures   kPMHasWakeupTimerMask         |\
-                                kPMHasProcessorCyclingMask    |\
-                                kPMHasDimmingSupportMask      |\
-                                kPMHasStartupTimerMask        |\
-                                kPMSupportsServerModeAPIMask  |\
-                                kPMHasUPSIntegrationMask
-
-#define kStdDesktopPrivPMFeatures  kPMHasExtdBattInfoMask     |\
-                                   kPMHasICTControlMask       |\
-                                   kPMHasLegacyDesktopSleepMask
-
-#define kStdDesktopNumBatteries 0
-
-// For Wallstreet (PowerBook G3 Series 1998)
-
-#define kWallstreetPMFeatures   kPMHasWakeupTimerMask         |\
-                                kPMHasProcessorCyclingMask    |\
-                                kPMHasReducedSpeedMask        |\
-                                kPMDynamicSpeedChangeMask     |\
-                                kPMHasSCSIDiskModeMask        |\
-                                kPMCanGetBatteryTimeMask      |\
-                                kPMHasDimmingSupportMask      |\
-                                kPMHasChargeNotificationMask  |\
-                                kPMHasDimSuspendSupportMask   |\
-                                kPMHasSleepMask
-
-#define kWallstreetPrivPMFeatures  kPMHasExtdBattInfoMask      |\
-                                   kPMHasBatteryIDMask         |\
-                                   kPMCanSwitchPowerMask       |\
-                                   kPMHasADBButtonHandlersMask |\
-                                   kPMHasSCSITermPowerMask     |\
-                                   kPMHasICTControlMask        |\
-                                   kPMClosedLidCausesSleepMask |\
-                                   kPMEnvironEventsPolledMask
-
-#define kStdPowerBookPMFeatures      kWallstreetPMFeatures
-#define kStdPowerBookPrivPMFeatures  kWallstreetPrivPMFeatures
-
-#define kStdPowerBookNumBatteries 2
-
-// For 101 (PowerBook G3 Series 1999)
-
-#define k101PMFeatures          kPMHasWakeupTimerMask         |\
-                                kPMHasProcessorCyclingMask    |\
-                                kPMHasReducedSpeedMask        |\
-                                kPMDynamicSpeedChangeMask     |\
-                                kPMHasSCSIDiskModeMask        |\
-                                kPMCanGetBatteryTimeMask      |\
-                                kPMHasDimmingSupportMask      |\
-                                kPMHasChargeNotificationMask  |\
-                                kPMHasDimSuspendSupportMask   |\
-                                kPMHasSleepMask               |\
-                                kPMHasUPSIntegrationMask
-
-#define k101PrivPMFeatures      kPMHasExtdBattInfoMask        |\
-                                kPMHasBatteryIDMask           |\
-                                kPMCanSwitchPowerMask         |\
-                                kPMHasADBButtonHandlersMask   |\
-                                kPMHasSCSITermPowerMask       |\
-                                kPMHasICTControlMask          |\
-                                kPMClosedLidCausesSleepMask   |\
-                                kPMEnvironEventsPolledMask
-
-
-// These flags are deprecated. Use the version with the kIOPM prefix in IOPM.h
-enum {
-  kACInstalled      = (1<<0),
-  kBatteryCharging  = (1<<1),
-  kBatteryInstalled = (1<<2),
-  kUPSInstalled     = (1<<3),
-  kBatteryAtWarn    = (1<<4),
-  kBatteryDepleted  = (1<<5),
-  kACnoChargeCapability = (1<<6),     // AC adapter cannot charge battery
-  kRawLowBattery    = (1<<7),         // used only by  Platform Expert
-  kForceLowSpeed    = (1<<8)         // set by Platfm Expert, chk'd by Pwr Plugin};
-};
-
-#endif /* __ppc32 */
-#endif /* _IOPMDeprecated_h_ */
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMLibDefs.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMLibDefs.h.svn-base
deleted file mode 100644
index ff25bf3..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMLibDefs.h.svn-base
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-
-#define	kPMSetAggressiveness            0
-#define	kPMGetAggressiveness            1
-#define	kPMSleepSystem                  2
-#define	kPMAllowPowerChange             3
-#define	kPMCancelPowerChange            4
-#define	kPMShutdownSystem               5
-#define	kPMRestartSystem                6
-#define kPMSleepSystemOptions           7
-#define kPMSetMaintenanceWakeCalendar   8
-
-#define kNumPMMethods                   9
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSource.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSource.h.svn-base
deleted file mode 100644
index ed68918..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSource.h.svn-base
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
- 
-#ifndef _IOPMPowerSource_h_
-#define _IOPMPowerSource_h_
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/pwr_mgt/IOPM.h>
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOReturn.h>
-#include <IOKit/IOService.h>
-
-enum {
-    kSecondsPerHour = 3600,
-    kTenMinutesInSeconds = 600
-};
-
-/* class IOPMPowerSource
- *
- * See IOKit/pwr_mgt/IOPM.h for power source keys relevant to this class. These
- * report-type keys are required for calls to IOPMPowerSource::setReportables(),
- * and they define the IORegistry interface through which data is passed back
- * up to the rest of the system.
- *
- * A subclassing driver that doesn't want to do anything fancy should:
- *   1. Subclass IOPMPowerSource
- *   3. Install its own battery change notifications or polling routine that can
- *          converse with actual battery hardware.
- *   4. When battery state changes, change the relevant member variables
- *          through setCurrentCapacity() style accessors.
- *   5. Call updateStatus() on itself when all such settings have been updated.
- *   
- * The subclass driver should also initially populate its settings and call
- * updateStatus() on launch.
- *
- *
- * Settings
- *
- * ExternalConnected
- * Type: bool
- * IORegistry Key: kIOPMPSExternalConnectedKey
- * True if computer is drawing external power 
- *
- * ExternalChargeCapable
- * Type: bool
- * IORegistry Key: kIOPMPSExternalChargeCapableKey
- * True if external power is capable of charging internal battery
- *
- * BatteryInstalled
- * Type: bool
- * IORegistry Key: kIOPMPSBatteryInstalledKey
- * True if a battery is present; false if removed
- *
- * IsCharging
- * Type: bool
- * IORegistry Key: kIOPMPSIsChargingKey
- * True if battery is charging itself from external power
- *
- * AtWarnLevel
- * Type: bool
- * IORegistry Key: kIOPMPSAtWarnLevelKey
- * True if draining battery capacity and past warn level
- *
- * AtCriticalLevel
- * Type: bool
- * IORegistry Key: kIOPMPSAtCriticalLevelKey
- * True if draining battery capacity and past critical level
- *
- * CurrentCapacity
- * MaxCapacity
- * Type: unsigned int
- * IORegistry Key: kIOPMPSCurrentCapacityKey, kIOPMPSMaxCapacityKey
- * Capacity measured in mAh
- *
- * TimeRemaining
- * Type: int
- * IORegistry Key: kIOPMPSTimeRemainingKey
- * Time remaining measured in minutes
- *
- * Amperage
- * Type: int
- * IORegistry Key: kIOPMPSAmperageKey
- * Current is measured in mA
- *
- * Voltage
- * Type: unsigned int
- * IORegistry Key: kIOPMPSVoltageKey
- * Voltage measured in mV
- *
- * CycleCount
- * Type: unsigned int
- * IORegistry Key: kIOPMPSCycleCountKey
- * Number of charge/discharge cycles
- *
- * AdapterInfo
- * Type: int
- * IORegistry Key: kIOPMPSAdapterInfoKey
- * Power adapter information
- *
- * Location
- * Type: int
- * IORegistry Key: kIOPMPSLocationKey
- * Clue about battery's location in machine - Left vs. Right
- *
- * ErrorCondition
- * Type: OSSymbol
- * IORegistry Key: kIOPMPSErrorConditionKey
- * String describing error state of battery
- *
- * Manufacturer
- * Type: OSSymbol
- * IORegistry Key: kIOPMPSManufacturerKey
- * String describing battery manufacturer
- *
- * Manufactured Date
- * Type: unsigned 16-bit bitfield
- * IORegistry Key: kIOPMPSManufactureDateKey
- * Date is published in a bitfield per the Smart Battery Data spec rev 1.1 
- * in section 5.1.26
- *   Bits 0...4 => day (value 1-31; 5 bits)
- *   Bits 5...8 => month (value 1-12; 4 bits)
- *   Bits 9...15 => years since 1980 (value 0-127; 7 bits)
- *
- * Model
- * Type: OSSymbol
- * IORegistry Key: kIOPMPSModelKey
- * String describing model number
- *
- * Serial
- * Type: OSSymbol
- * IORegistry Key: kIOPMPSSerialKey
- * String describing serial number or unique info
- * The serial number published hear bears no correspondence to the Apple serial
- * number printed on each battery. This is a manufacturer serial number with 
- * no correlation to the printed serial number.
- *
- * LegacyIOBatteryInfo
- * Type: OSDictionary
- * IORegistry Key: kIOPMPSLegacyBatteryInfoKey
- * Dictionary conforming to the OS X 10.0-10.4 
- */
-
-class IOPMPowerSource : public IOService
-{
-    OSDeclareDefaultStructors(IOPMPowerSource)
-
-    friend class IOPMPowerSourceList;
-
- protected:
-
-/* bool settingsChangedSinceLastUpdate
- * Used by subclasses to determine if any settings have been modified via the
- * accessors below since last call to update(). true is settings have changed;
- * false otherwise.
- */
-    bool settingsChangedSinceUpdate;
-    
-/* OSDictionary properties
- * Stores power source state
- */
-    OSDictionary            *properties;
-
-    const OSSymbol *externalConnectedKey;
-    const OSSymbol *externalChargeCapableKey;
-    const OSSymbol *batteryInstalledKey;
-    const OSSymbol *chargingKey;
-    const OSSymbol *warnLevelKey;
-    const OSSymbol *criticalLevelKey;
-    const OSSymbol *currentCapacityKey;
-    const OSSymbol *maxCapacityKey;
-    const OSSymbol *timeRemainingKey;
-    const OSSymbol *amperageKey;
-    const OSSymbol *voltageKey;
-    const OSSymbol *cycleCountKey;
-    const OSSymbol *adapterInfoKey;
-    const OSSymbol *locationKey;
-    const OSSymbol *errorConditionKey;
-    const OSSymbol *manufacturerKey;
-    const OSSymbol *modelKey;
-    const OSSymbol *serialKey;
-    const OSSymbol *batteryInfoKey;
-
-    // Tracking for IOPMPowerSourceList
-    IOPMPowerSource         *nextInList;
-
- public:
-
-/*! @function powerSource
-    @abstract Creates a new IOPMPowerSource nub. Must be attached to IORegistry,
-        and registered by provider.
-*/
-    static IOPMPowerSource *powerSource(void);
-
-    virtual bool init(void);
-    
-    virtual void free(void);
-
-/*! @function updateStatus
-    @abstract Must be called by physical battery controller when battery state
-                has changed significantly.
-    @discussion The system will not poll this object for battery updates. Rather \
-    the battery's controller must call updateStatus() every time state changes \
-    and the settings will be relayed to higher levels of power management. \
-    The subclassing driver should override this only if the driver needs to add \
-    new settings to the base class.
-*/
-    virtual void updateStatus(void);
-
-/* Public accessors for battery state
- */
-    bool externalConnected(void);
-    bool externalChargeCapable(void);
-    bool batteryInstalled(void);
-    bool isCharging(void);
-    bool atWarnLevel(void);
-    bool atCriticalLevel(void);
-
-    unsigned int currentCapacity(void);
-    unsigned int maxCapacity(void);
-    unsigned int capacityPercentRemaining(void);
-    int timeRemaining(void);
-    int amperage(void);
-    unsigned int voltage(void);
-    unsigned int cycleCount(void);
-    int adapterInfo(void);
-    int location(void);
-    
-    OSSymbol *errorCondition(void);
-    OSSymbol *manufacturer(void);
-    OSSymbol *model(void);
-    OSSymbol *serial(void);
-    OSDictionary *legacyIOBatteryInfo(void);
-    
-    OSObject *getPSProperty(const OSSymbol *);
-    
-protected:
-
-/* Protected "setter" methods for subclasses
- * Subclasses should use these setters to modify all battery properties.
- * 
- * Subclasses must follow all property changes with a call to updateStatus() 
- * to flush settings changes to upper level battery API clients.
- *
- */
-    void setExternalConnected(bool);
-    void setExternalChargeCapable(bool);
-    void setBatteryInstalled(bool);
-    void setIsCharging(bool);
-    void setAtWarnLevel(bool);
-    void setAtCriticalLevel(bool);
-
-    void setCurrentCapacity(unsigned int);
-    void setMaxCapacity(unsigned int);    
-    void setTimeRemaining(int);
-    void setAmperage(int);    
-    void setVoltage(unsigned int);
-    void setCycleCount(unsigned int);
-    void setAdapterInfo(int);
-    void setLocation(int);
-
-    void setErrorCondition(OSSymbol *);
-    void setManufacturer(OSSymbol *);
-    void setModel(OSSymbol *);
-    void setSerial(OSSymbol *);
-    void setLegacyIOBatteryInfo(OSDictionary *);
-
-/* All of these methods funnel through the generic accessor method
-   setPSProperty. Caller can pass in any arbitrary OSSymbol key, and
-   that value will be stored in the PM settings dictionary, and relayed
-   onto the IORegistry at update time.
- */
-    void setPSProperty(const OSSymbol *, OSObject *);
-};
-
-#endif
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSourceList.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSourceList.h.svn-base
deleted file mode 100644
index cb1c8ea..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPowerSourceList.h.svn-base
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOReturn.h>
-
-class IOPMPowerSource;
-
-class IOPMPowerSourceList : public OSObject
-{
-    OSDeclareDefaultStructors(IOPMPowerSourceList)
- private:
-    // pointer to first power source in list
-    IOPMPowerSource         *firstItem;
-
-    // how many power sources are in the list
-    unsigned long           length;
-
-  public:
-    void initialize(void);
-    void free(void);
-
-    unsigned long numberOfItems(void);
-    IOReturn addToList(IOPMPowerSource *newPowerSource);
-    IOReturn removeFromList(IOPMPowerSource *theItem);
-    
-    IOPMPowerSource *firstInList(void);
-    IOPMPowerSource *nextInList(IOPMPowerSource *currentItem);
-};
-
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPrivate.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPrivate.h.svn-base
deleted file mode 100644
index bf50d78..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMPrivate.h.svn-base
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOKIT_IOPMPRIVATE_H
-#define _IOKIT_IOPMPRIVATE_H
-
-#include <IOKit/pwr_mgt/IOPM.h>
-
-/*****************************************************************************/
-
-// Private power commands issued to root domain
-// bits 0-7 in IOPM.h
-
-enum {
-    kIOPMSetValue                   = (1<<16),
-    // don't sleep on clamshell closure on a portable with AC connected
-    kIOPMSetDesktopMode             = (1<<17),
-    // set state of AC adaptor connected
-    kIOPMSetACAdaptorConnected      = (1<<18)
-};
-
-/*****************************************************************************/
-/*****************************************************************************/
-
-/*
- * PM notification types
- */
-
-/* @constant kIOPMStateConsoleUserShutdown
- * @abstract Notification of GUI shutdown state available to kexts.
- * @discussion This type can be passed as arguments to registerPMSettingController()
- * to receive callbacks.
- */
-#define kIOPMStateConsoleShutdown   "ConsoleShutdown"
-
-/* @enum ShutdownValues
- * @abstract Potential values shared with key kIOPMStateConsoleUserShutdown
- */
-enum {
-/* @constant kIOPMStateConsoleShutdownNone
- * @abstract System shutdown (or restart) hasn't started; system is ON.
- * @discussion Next state: 2
- */
-    kIOPMStateConsoleShutdownNone   = 1,
-/* @constant kIOPMStateConsoleShutdownPossible
- * @abstract User has been presented with the option to shutdown or restart. Shutdown may be cancelled.
- * @discussion Next state may be: 1, 4
- */
-    kIOPMStateConsoleShutdownPossible = 2,
-/* @constant kIOPMStateConsoleShutdownUnderway
- * @abstract Shutdown or restart is proceeding. It may still be cancelled.
- * @discussion Next state may be: 1, 4. This state is currently unused.
- */
-    kIOPMStateConsoleShutdownUnderway = 3,
-/* @constant kIOPMStateConsoleShutdownCertain
- * @abstract Shutdown is in progress and irrevocable.
- * @discussion State remains 4 until power is removed from CPU.
- */
-    kIOPMStateConsoleShutdownCertain = 4
-};
-
-/*****************************************************************************/
-/*****************************************************************************/
-
-/* PM Statistics - event indices 
- * These are arguments to IOPMrootDomain::pmStatsRecordEvent().
- */
-enum {
-    kIOPMStatsHibernateImageWrite         = 1,
-    kIOPMStatsHibernateImageRead,
-    kIOPMStatsDriversNotify,
-    kIOPMStatsApplicationNotify,
-    kIOPMStatsLateDriverAcknowledge,
-    kIOPMStatsLateAppAcknowledge,
-    
-    // To designate if you're specifying the start or stop end of 
-    // each of the above events, do a bitwise OR of the appropriate
-    // Start/Stop flag and pass the result to IOPMrootDomain to record
-    // the event.
-    kIOPMStatsEventStartFlag              = (1 << 24),
-    kIOPMStatsEventStopFlag               = (1 << 25)
-};
-
-// Keys for IOPMrootDomain registry properties
-#define kIOPMSleepStatisticsKey                 "SleepStatistics"
-#define kIOPMSleepStatisticsAppsKey             "AppStatistics"
-
-// Application response statistics
-#define kIOPMStatsNameKey                       "Name"
-#define kIOPMStatsPIDKey                        "Pid"
-#define kIOPMStatsTimeMSKey                     "TimeMS"
-#define kIOPMStatsApplicationResponseTypeKey    "ResponseType"
-#define kIOPMStatsMessageTypeKey                "MessageType"
- 
-// PM Statistics: potential values for the key kIOPMStatsApplicationResponseTypeKey
-// entry in the application results array.
-#define kIOPMStatsResponseTimedOut      "ResponseTimedOut"
-#define kIOPMStatsResponseCancel        "ResponseCancel"
-#define kIOPMStatsResponseSlow          "ResponseSlow"
-
-typedef struct {
-    struct bounds{
-        uint64_t start;
-        uint64_t stop;
-    };
-    
-    struct bounds    hibWrite;
-    struct bounds    hibRead;
-//    bounds    driverNotifySleep;
-//    bounds    driverNotifyWake;
-//    bounds    appNotifySleep;
-//    bounds    appNotifyWake;  
-//    OSDictionary    *tardyApps;    
-//    OSDictionary    *tardyDrivers;
-} PMStatsStruct;
-
-/*****************************************************************************/
-
-/* PM RootDomain tracePoints
- *
- * In the sleep/wake process, we expect the sleep trace points to proceed
- * in increasing order. Once sleep begins with code kIOPMTracePointSleepStarted = 0x11,
- * we expect sleep to continue in a monotonically increasing order of tracepoints
- * to kIOPMTracePointSystemLoginwindowPhase = 0x30. After trace point SystemLoginWindowPhase,
- * the system will return to kIOPMTracePointSystemUp = 0x00.
- *
- * If the trace point decreases (instead of increasing) before reaching kIOPMTracePointSystemUp,
- * that indicates that the sleep process was cancelled. The cancel reason shall be indicated
- * in the cancel tracepoint. (TBD)
- */
-
-enum {
-/* When kTracePointSystemUp is the latest tracePoint,
-   the system is awake. It is not asleep, sleeping, or waking.
-   
-   * Phase begins: At boot, at completion of wake from sleep,
-          immediately following kIOPMTracePointSystemLoginwindowPhase.
-   * Phase ends: When a sleep attempt is initiated.
- */
-    kIOPMTracePointSystemUp                     = 0,
-
-/* When kIOPMTracePointSleepStarted we have just initiated sleep.
-
-    Note: The state prior to kIOPMTracePointSleepStarted may be only one of:
-        * kIOPMTracePointSystemUp
-        * kIOPMTracePointSystemLoginwindowPhase or 
-
-   * Phase begins: At initiation of system sleep (idle or forced).
-   * Phase ends: As we start to notify applications of system sleep.
- */
-    kIOPMTracePointSleepStarted             = 0x11,
-
-/* When kTracePointSystemSleepAppsPhase is the latest tracePoint,
-   a system sleep has been irrevocably inititated and PM waits
-   for responses from notified applications.
-
-   * Phase begins: Begin to asynchronously fire kIOMessageSystemWillSleep notifications,
-   *        and in the case of an idle sleep kIOMessageCanSystemSleep as well.
-   * Phase ends: When we have received all user & interested kernel acknowledgements.
- */
-    kIOPMTracePointSystemSleepAppsPhase         = 0x12,
-
-
-/* When kIOPMTracePointSystemHibernatePhase is the latest tracePoint,
-    PM is writing the hiernate image to disk.
- */
-    kIOPMTracePointSystemHibernatePhase         = 0x13,
-
-/* When kTracePointSystemSleepDriversPhase is the latest tracePoint,
-    PM is iterating the driver tree powering off devices individually.
-
-   * Phase begins: When IOPMrootDomain has received all of its power acknowledgements and begins
-   *        executing IOService::powerDomainWillChangeTo()
-   * Phase ends: When IOPMrootDomain::powerChangeDone begins executing CPU shutoff code.
- */
-    kIOPMTracePointSystemSleepDriversPhase      = 0x14,
-
-/* When kTracePointSystemSleepPlatformPhase is the latest tracePoint,
-    all apps and drivers have notified of sleep. Plotfarm is powering
-    off CPU; or system is asleep; or low level wakeup is underway.
-
-    Note: If a system is asleep and then loses power, and it does not have a hibernate
-        image to restore from (e.g. hibernatemode = 0), then OS X may interpret this power
-        loss as a system crash in the kTracePointSystemSleepPlatformPhase, since the
-        power loss resembles a hang or crash, and the power being removed by the user.
-
-   * Phase begins: IOPMrootDomain has already shut off drivers, and is now powering off CPU.
-   * Phase ends: Immediately after CPU's are powered back on during wakeup.
- */
-    kIOPMTracePointSystemSleepPlatformPhase     = 0x15,
-
-/* When kTracePointSystemWakeDriversPhase is the latest tracePoint,
-    System CPU is powered, PM is notifying drivers of system wake.
-
-   * Phase begins: CPU's have successfully powered up and OS is executing.
-   * Phase ends: All drivers have handled power events & acknowledged completion.
-        IOPMrootDomain is about to deliver kIOMessageSystemHasPoweredOn.
- */
-    kIOPMTracePointSystemWakeDriversPhase       = 0x21,
-
-/* When kTracePointSystemWakeAppsPhase is the latest tracePoint,
-   System CPU is powered, PM has powered on each driver.
-
-   * Phase begins: IOPMrootDomain::tellChangeUp before sending asynchronous 
-        kIOMessageSystemHasPoweredOn notifications
-   * Phase ends: IOPMrootDomain::tellChangeUp after sending asynchronous notifications
- */
-    kIOPMTracePointSystemWakeAppsPhase          = 0x22,
-
-/* kIOPMTracePointSystemLoginwindowPhase
-    This phase represents a several minute window after the system has powered on.
-    Higher levels of system diagnostics are in a heightened state of alert in this phase,
-    in case any user errors occurred that we could not detect in software.
-    
-    This several minute window  
-
-   * Phase begins: After IOPMrootDomain sends kIOMessageSystemHasPoweredOn message.
-   * Phase ends: When loginwindow calls IOPMSleepWakeSetUUID(NULL) the system shall 
-        be considered awake and usable. The next phase shall be kIOPMTracePointSystemUp.
- */
-    kIOPMTracePointSystemLoginwindowPhase       = 0x30 
-};
-
-/*****************************************************************************/
-
-/*
-Ê* kIOPMLoginWindowSecurityDebugKey - identifies PM debug data specific to LoginWindow
- *  for use with IOPMrootDomain.
-Ê*/
-#define kIOPMLoginWindowSecurityDebugKey        "LoginWindowSecurity"
-
-// For PM internal use only - key to locate sleep failure results within SCDynamicStore.
-#define kIOPMDynamicStoreSleepFailureKey        "SleepFailure"
-
-/*****************************************************************************/
-
-// For IOPMLibPrivate.h
-#define kIOPMSleepWakeFailureKey            "PMFailurePhase"
-#define kIOPMSleepWakeFailureCodeKey        "PMStatusCode"
-#define kIOPMSleepWakeFailureLoginKey       "LWFailurePhase"
-#define kIOPMSleepWakeFailureUUIDKey        "UUID"
-#define kIOPMSleepWakeFailureDateKey        "Date"
-
-#endif /* ! _IOKIT_IOPMPRIVATE_H */
-
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMpowerState.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMpowerState.h.svn-base
deleted file mode 100644
index f7f4c8a..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPMpowerState.h.svn-base
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#include <IOKit/pwr_mgt/IOPM.h>
-
-/*! @header IOPMpowerState.h
-    @abstract Defines the struct IOPMPowerState that power managed drivers should use to describe their power states.
-*/
-
-/*! @struct IOPMPowerState
-    @abstract Describes a device's power state.
-    @discussion To take part in system power management, drivers should define an array of 2 or more power states and pass it to kernel power management through IOService::registerPowerDriver.
-    @field version Defines version number of this struct. Just use the value "1" when defining an IOPMPowerState.
-    @field	capabilityFlags Describes the capability of the device in this state.
-    @field	outputPowerCharacter Describes the power provided in this state.
-    @field	inputPowerRequirement Describes the input power required in this state.
-    @field	staticPower Describes average consumption in milliwatts. Unused; drivers may specify 0.
-    @field	unbudgetedPower Describes additional consumption from separate power supply (milliWatts). Unused; drivers may specify 0.
-    @field	powerToAttain Describes dditional power to attain this state from next lower state (in milliWatts). Unused; drivers may specify 0.
-    @field	timeToAttain Describes time required to enter this state from next lower state (in microseconds). Unused; drivers may specify 0.
-    @field	settleUpTime Describes settle time required after entering this state from next lower state (microseconds). Unused; drivers may specify 0.
-    @field timeToLower Describes time required to enter next lower state from this one (microseconds). Unused; drivers may specify 0.
-    @field	settleDownTime Settle time required after entering next lower state from this state (microseconds). Unused; drivers may specify 0.
-    @field	powerDomainBudget Describes power in milliWatts a domain in this state can deliver to its children. Unused; drivers may specify 0.
-}
-*/
-
-struct IOPMPowerState
-{
-    unsigned long	version;
-    IOPMPowerFlags	capabilityFlags;
-    IOPMPowerFlags	outputPowerCharacter;
-    IOPMPowerFlags	inputPowerRequirement;
-    unsigned long	staticPower;
-    unsigned long	unbudgetedPower;
-    unsigned long	powerToAttain;
-    unsigned long	timeToAttain;
-    unsigned long	settleUpTime;
-    unsigned long	timeToLower;
-    unsigned long	settleDownTime;
-    unsigned long	powerDomainBudget;
-};
-
-typedef struct IOPMPowerState IOPMPowerState;
-
-enum {
-    kIOPMPowerStateVersion1 = 1
-};
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPowerConnection.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPowerConnection.h.svn-base
deleted file mode 100644
index 179035b..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/text-base/IOPowerConnection.h.svn-base
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOPOWERCONNECTION_H
-#define _IOKIT_IOPOWERCONNECTION_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/pwr_mgt/IOPM.h>
-
-class IOPowerConnection : public IOService
-{
-    OSDeclareDefaultStructors(IOPowerConnection)
-
-protected:
-    /*! @field parentKnowsState	true: parent knows state of its domain
-					used by child */
-    bool		stateKnown;
-    /*! @field currentPowerFlags	power flags which describe  the current state of the power domain
-					used by child */
-    IOPMPowerFlags 	currentPowerFlags;
-    /*! @field desiredDomainState	state number which corresponds to the child's desire
-					used by parent */
-    unsigned long	desiredDomainState;
-
-    /*! @field requestFlag		set to true when desiredDomainState is set */
-    bool		requestFlag;
-
-    /*! @field preventIdleSleepFlag	true if child has this bit set in its desired state
-					used by parent */
-    unsigned long	preventIdleSleepFlag;
-
-    /*! @field preventSystemSleepFlag	true if child has this bit set in its desired state
-					used by parent */
-    unsigned long	preventSystemSleepFlag;
-
-    /*! @field awaitingAck		true if child has not yet acked our notification
-					used by parent */
-    bool		awaitingAck;
-
-    /*! @field readyFlag		true if the child has been added as a power child
-					used by parent */
-	bool		readyFlag;
-
-public:
-        /*! @function setParentKnowsState
-            @abstract Sets the stateKnown variable.
-            @discussion Called by the parent when the object is created and called by the child when it discovers that the parent now knows its state. */
-    void setParentKnowsState (bool );
-
-    /*! @function setParentCurrentPowerFlags
-        @abstract Sets the currentPowerFlags variable.
-        @discussion Called by the parent when the object is created and called by the child when it discovers that the parent state is changing. */
-    void setParentCurrentPowerFlags (IOPMPowerFlags );
-
-    /*! @function parentKnowsState
-        @abstract Returns the stateKnown variable. */
-    bool parentKnowsState (void );
-
-    /*! @function parentCurrentPowerFlags
-        @abstract Returns the currentPowerFlags variable. */
-    IOPMPowerFlags parentCurrentPowerFlags (void );
-
-    /*! @function setDesiredDomainState
-        @abstract Sets the desiredDomainState variable.
-        @discussion Called by the parent. */
-    void setDesiredDomainState (unsigned long );
-
-    /*! @function getDesiredDomainState
-        @abstract Returns the desiredDomainState variable.
-    @discussion Called by the parent. */
-    unsigned long getDesiredDomainState ( void );
-
-    /*! @function setChildHasRequestedPower
-        @abstract Set the flag that says that the child has called requestPowerDomainState.
-    @discussion Called by the parent. */
-    void setChildHasRequestedPower ( void );
-
-
-    /*! @function childHasRequestedPower
-        @abstract Return the flag that says whether the child has called requestPowerDomainState.
-    @discussion Called by the PCI Aux Power Supply Driver to see if a device driver
-        is power managed. */
-    bool childHasRequestedPower ( void );
-    
-    /*! @function setPreventIdleSleepFlag
-        @abstract Sets the preventIdleSleepFlag variable.
-        @discussion Called by the parent. */
-    void setPreventIdleSleepFlag (unsigned long );
-
-    /*! @function getPreventIdleSleepFlag
-        @abstract Returns the preventIdleSleepFlag variable.
-    @discussion Called by the parent. */
-    bool getPreventIdleSleepFlag ( void );
-    
-    /*! @function setPreventSystemSleepFlag
-        @abstract Sets the preventSystemSleepFlag variable.
-        @discussion Called by the parent. */
-    void setPreventSystemSleepFlag (unsigned long );
-
-    /*! @function getPreventSystemSleepFlag
-        @abstract Returns the preventSystemSleepFlag variable.
-        @discussion Called by the parent. */
-    bool getPreventSystemSleepFlag ( void );
-    
-    /*! @function setAwaitingAck
-        @abstract Sets the awaitingAck variable.
-        @discussion Called by the parent. */
-    void setAwaitingAck ( bool );
-
-    /*! @function getAwaitingAck
-        @abstract Returns the awaitingAck variable.
-        @discussion Called by the parent. */
-    bool getAwaitingAck ( void );
-
-    /*! @function setReadyFlag
-        @abstract Sets the readyFlag variable.
-        @discussion Called by the parent. */
-	void setReadyFlag( bool flag );
-
-    /*! @function getReadyFlag
-        @abstract Returns the readyFlag variable.
-        @discussion Called by the parent. */
-	bool getReadyFlag( void ) const;
-};
-
-#endif /* ! _IOKIT_IOPOWERCONNECTION_H */
-
diff --git a/i386/include/IOKit/pwr_mgt/.svn/text-base/RootDomain.h.svn-base b/i386/include/IOKit/pwr_mgt/.svn/text-base/RootDomain.h.svn-base
deleted file mode 100644
index 6f4ebee..0000000
--- a/i386/include/IOKit/pwr_mgt/.svn/text-base/RootDomain.h.svn-base
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOKIT_ROOTDOMAIN_H
-#define _IOKIT_ROOTDOMAIN_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/pwr_mgt/IOPM.h>
-#include "IOKit/pwr_mgt/IOPMPrivate.h"
-
-
-class IOPMPowerStateQueue;
-class RootDomainUserClient;
-class PMTraceWorker;
-
-/*
- * Flags for get/setSleepSupported()
- */
-enum {
-    kRootDomainSleepNotSupported	= 0x00000000,
-    kRootDomainSleepSupported 		= 0x00000001,
-    kFrameBufferDeepSleepSupported	= 0x00000002,
-    kPCICantSleep                   = 0x00000004
-};
-
-/* 
- *IOPMrootDomain registry property keys
- */
-#define kRootDomainSupportedFeatures        "Supported Features"
-#define kRootDomainSleepReasonKey           "Last Sleep Reason"
-#define kRootDomainSleepOptionsKey          "Last Sleep Options"
-#define kIOPMRootDomainWakeReasonKey        "Wake Reason"
-#define kIOPMRootDomainWakeTypeKey          "Wake Type"
-#define kIOPMRootDomainPowerStatusKey       "Power Status"
-
-/*
- * Possible sleep reasons found under kRootDomainSleepReasonsKey
- */
-#define kIOPMClamshellSleepKey              "Clamshell Sleep"
-#define kIOPMPowerButtonSleepKey            "Power Button Sleep"
-#define kIOPMSoftwareSleepKey               "Software Sleep"
-#define kIOPMOSSwitchHibernationKey         "OS Switch Sleep"
-#define kIOPMIdleSleepKey                   "Idle Sleep"
-#define kIOPMLowPowerSleepKey               "Low Power Sleep"
-#define kIOPMThermalEmergencySleepKey       "Thermal Emergency Sleep"
-#define kIOPMMaintenanceSleepKey            "Maintenance Sleep"
-
-/*
- * String constants for communication with PM CPU
- */
-#define kIOPMRootDomainLidCloseCString      "LidClose"
-#define kIOPMRootDomainBatPowerCString      "BatPower"
-
-/*
- * Supported Feature bitfields for IOPMrootDomain::publishFeature()
- */
-enum {
-    kIOPMSupportedOnAC      = (1<<0),
-    kIOPMSupportedOnBatt    = (1<<1),
-    kIOPMSupportedOnUPS     = (1<<2)
-};
-
-typedef IOReturn (*IOPMSettingControllerCallback)
-                    (OSObject *target, const OSSymbol *type,
-                     OSObject *val, uintptr_t refcon);
-
-__BEGIN_DECLS
-IONotifier *    registerSleepWakeInterest(
-                    IOServiceInterestHandler, void *, void * = 0);
-               
-IONotifier *    registerPrioritySleepWakeInterest(
-                    IOServiceInterestHandler handler, 
-                    void * self, void * ref = 0);
-
-IOReturn        acknowledgeSleepWakeNotification(void * );
-
-IOReturn        vetoSleepWakeNotification(void * PMrefcon);
-__END_DECLS
-
-#define IOPM_ROOTDOMAIN_REV		2
-
-class IOPMrootDomain: public IOService
-{
-    OSDeclareFinalStructors(IOPMrootDomain)
-
-public:
-    static IOPMrootDomain * construct( void );
-
-    virtual bool        start( IOService * provider );
-    virtual IOReturn    setAggressiveness( unsigned long, unsigned long );
-    virtual IOReturn    getAggressiveness( unsigned long, unsigned long * );
-
-    virtual IOReturn    sleepSystem( void );
-    IOReturn            sleepSystemOptions( OSDictionary *options );
-
-    virtual IOReturn    setProperties( OSObject * );
-
-/*! @function systemPowerEventOccurred
-    @abstract Other drivers may inform IOPMrootDomain of system PM events
-    @discussion systemPowerEventOccurred is a richer alternative to receivePowerNotification()
-        Only Apple-owned kexts should have reason to call systemPowerEventOccurred.
-    @param event An OSSymbol describing the type of power event.
-    @param value A 32-bit integer value associated with the event.
-    @param shouldUpdate indicates whether the root domain should send a notification
-        to interested parties. Pass false if you're calling systemPowerEventOccurred
-        several times in succession; and pass true only on the last invocatino.
-    @result kIOReturnSuccess on success */
-
-    IOReturn            systemPowerEventOccurred(
-                                    const OSSymbol *event, 
-                                    uint32_t intValue );
-
-    IOReturn            systemPowerEventOccurred(
-                                    const OSSymbol *event, 
-                                    OSObject *value );
-
-    virtual IOReturn    receivePowerNotification( UInt32 msg );
-
-    virtual void        setSleepSupported( IOOptionBits flags );
-
-    virtual IOOptionBits getSleepSupported( void );
-
-    void                wakeFromDoze( void );
-
-    // KEXT driver announces support of power management feature
-
-    void                publishFeature( const char *feature );
-    
-    // KEXT driver announces support of power management feature
-    // And specifies power sources with kIOPMSupportedOn{AC/Batt/UPS} bitfield.
-    // Returns a unique uint32_t identifier for later removing support for this
-    // feature. 
-    // NULL is acceptable for uniqueFeatureID for kexts without plans to unload.
-
-    void                publishFeature( const char *feature, 
-                                        uint32_t supportedWhere,
-                                        uint32_t *uniqueFeatureID);
-
-    // KEXT driver announces removal of a previously published power management 
-    // feature. Pass 'uniqueFeatureID' returned from publishFeature()
-
-    IOReturn            removePublishedFeature( uint32_t removeFeatureID );
-
-/*! @function copyPMSetting
-    @abstract Copy the current value for a PM setting. Returns an OSNumber or
-        OSData depending on the setting.
-    @param whichSetting Name of the desired setting.
-    @result OSObject value if valid, NULL otherwise. */
-
-    OSObject *          copyPMSetting( OSSymbol *whichSetting );
-
-/*! @function registerPMSettingController
-    @abstract Register for callbacks on changes to certain PM settings.
-    @param settings NULL terminated array of C strings, each string for a PM 
-        setting that the caller is interested in and wants to get callbacks for. 
-    @param callout C function ptr or member function cast as such.
-    @param target The target of the callback, usually 'this'
-    @param refcon Will be passed to caller in callback; for caller's use.
-    @param handle Caller should keep the OSObject * returned here. If non-NULL,
-        handle will have a retain count of 1 on return. To deregister, pass to
-        unregisterPMSettingController()
-    @result kIOReturnSuccess on success. */
-
-    IOReturn            registerPMSettingController(
-                                 const OSSymbol *settings[],
-                                 IOPMSettingControllerCallback callout,
-                                 OSObject   *target,
-                                 uintptr_t  refcon,
-                                 OSObject   **handle);    // out param
-
-/*! @function registerPMSettingController
-    @abstract Register for callbacks on changes to certain PM settings.
-    @param settings NULL terminated array of C strings, each string for a PM 
-        setting that the caller is interested in and wants to get callbacks for. 
-    @param supportedPowerSources bitfield indicating which power sources these
-        settings are supported for (kIOPMSupportedOnAC, etc.)
-    @param callout C function ptr or member function cast as such.
-    @param target The target of the callback, usually 'this'
-    @param refcon Will be passed to caller in callback; for caller's use.
-    @param handle Caller should keep the OSObject * returned here. If non-NULL,
-        handle will have a retain count of 1 on return. To deregister, pass to
-        unregisterPMSettingController()
-    @result kIOReturnSuccess on success. */
-
-    IOReturn            registerPMSettingController(
-                                 const OSSymbol *settings[],
-                                 uint32_t   supportedPowerSources,
-                                 IOPMSettingControllerCallback callout,
-                                 OSObject   *target,
-                                 uintptr_t  refcon,
-                                 OSObject   **handle);    // out param
-
-    virtual IONotifier * registerInterest(
-                                const OSSymbol * typeOfInterest,
-                                IOServiceInterestHandler handler,
-                                void * target, void * ref = 0 );
-                                
-    void                pmStatsRecordEvent(
-                                int             eventIndex,
-                                AbsoluteTime    timestamp);
-
-    void                pmStatsRecordApplicationResponse(
-                            const OSSymbol		*response,
-                            const char 		    *name,
-                            int                 messageType,
-                            uint32_t			delay_ms,
-                            int     			app_pid);
-
-    virtual IOReturn    callPlatformFunction(
-                                const OSSymbol *functionName,
-                                bool waitForFunction,
-                                void *param1, void *param2,
-                                void *param3, void *param4 );
-
-private:
-    virtual IOReturn    changePowerStateTo( unsigned long ordinal );
-    virtual IOReturn    changePowerStateToPriv( unsigned long ordinal );
-    virtual IOReturn    requestPowerDomainState( IOPMPowerFlags, IOPowerConnection *, unsigned long );
-    virtual void        powerChangeDone( unsigned long );
-    virtual bool        tellChangeDown( unsigned long );
-    virtual bool        askChangeDown( unsigned long );
-    virtual void        tellChangeUp( unsigned long );
-    virtual void        tellNoChangeDown( unsigned long );
-};
-
-
-#endif /* _IOKIT_ROOTDOMAIN_H */
diff --git a/i386/include/IOKit/pwr_mgt/IOPM.h b/i386/include/IOKit/pwr_mgt/IOPM.h
deleted file mode 100644
index 7d78225..0000000
--- a/i386/include/IOKit/pwr_mgt/IOPM.h
+++ /dev/null
@@ -1,654 +0,0 @@
-/*
- * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOKIT_IOPM_H
-#define _IOKIT_IOPM_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/IOReturn.h>
-
-#ifdef __ppc__
-#include <IOKit/pwr_mgt/IOPMDeprecated.h>
-#endif
-
-/*! @header IOPM.h
-    @abstract Defines power management constants and keys used by both in-kernel and user space power management.
-    @discussion IOPM.h defines a range of power management constants used in several in-kernel and user space APIs. Most significantly, the IOPMPowerFlags used to specify the fields of an IOPMPowerState struct are defined here.
-
-    Most of the constants defined in IOPM.h are deprecated or for Apple internal use only, and are not elaborated on in headerdoc.
-*/
-
-enum {
-    kIOPMMaxPowerStates = 10,
-    IOPMMaxPowerStates = kIOPMMaxPowerStates
-};
-
-/*! @enum IOPMPowerFlags
-    @abstract Bits are used in defining capabilityFlags, inputPowerRequirements, and outputPowerCharacter in the IOPMPowerState structure.
-    @discussion These bits may be bitwise-OR'd together in the IOPMPowerState capabilityFlags field, the outputPowerCharacter field, and/or the inputPowerRequirement field. 
-    
-    The comments clearly mark whether each flag should be used in the capabilityFlags field, outputPowerCharacter field, and inputPowerRequirement field, or all three.
-    
-    The value of capabilityFlags, inputPowerRequirement or outputPowerCharacter may be 0. Most drivers implement their 'OFF' state, used when asleep, by defininf each of the 3 fields as 0.
-    
-    The bits listed below are only the most common bits used to define a device's power states. Your device's IO family may require that your device specify other input or output power flags to interact properly. Consult family-specific documentation to determine if your IOPower plane parents or children require other power flags; they probably don't.
-
-    @constant kIOPMPowerOn Indicates the device is on, requires power, and provides power. Useful as a: Capability, InputPowerRequirement, OutputPowerCharacter
-
-    @constant kIOPMDeviceUsable Indicates the device is usable in this state. Useful only as a Capability
-
-    @constant kIOPMLowPower 
-    Indicates device is in a low power state. May be bitwis-OR'd together
-    with kIOPMDeviceUsable flag, to indicate the device is still usable.
-    
-    A device with a capability of kIOPMLowPower may:
-       Require either 0 or kIOPMPowerOn from its power parent
-       Offer either kIOPMLowPower, kIOPMPowerOn, or 0 (no power at all)
-         to its power plane children.
-
-    Useful only as a Capability, although USB drivers should consult USB family documentation for other valid circumstances to use the kIOPMLowPower bit.
-
-    @constant kIOPMPreventIdleSleep
-    In the capability field of a power state, disallows idle system sleep while the device is in that state.
-    
-    For example, displays and disks set this capability for their ON power state; since the system may not idle sleep while the display (and thus keyboard or mouse) or the disk is active.
-
-    Useful only as a Capability.
-    
-    @constant kIOPMSleepCapability 
-    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
-    
-    @constant kIOPMRestartCapability
-    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
-    
-    @constant kIOPMSleep
-    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
-
-    @constant kIOPMRestart
-    Used only by certain IOKit Families (USB). Not defined or used by generic Power Management. Read your family documentation to see if you should define a powerstate using these capabilities.
-*/
-typedef unsigned long IOPMPowerFlags;
-enum {
-    kIOPMPowerOn                    = 0x00000002,
-    kIOPMDeviceUsable               = 0x00008000,
-    kIOPMLowPower                   = 0x00010000,
-    kIOPMPreventIdleSleep           = 0x00000040,
-    kIOPMSleepCapability            = 0x00000004,
-    kIOPMRestartCapability          = 0x00000080,
-    kIOPMSleep                      = 0x00000001,
-    kIOPMRestart                    = 0x00000080
-};
-
-/*
- * Private IOPMPowerFlags
- *
- * For Apple use only
- * Not for use with non-Apple drivers
- * Their behavior is undefined
- */
-enum {
-    kIOPMClockNormal                = 0x0004,
-    kIOPMClockRunning               = 0x0008,
-    kIOPMPreventSystemSleep         = 0x0010,
-    kIOPMDoze                       = 0x0400,
-    kIOPMChildClamp                 = 0x0080,
-    kIOPMChildClamp2                = 0x0200,
-    kIOPMNotPowerManaged            = 0x0800
-};
-
-
-/*
- * Deprecated IOPMPowerFlags
- * Their behavior is undefined when used in IOPMPowerState
- * Capability, InputPowerRequirement, or OutputPowerCharacter fields.
- */
-enum {
-    kIOPMMaxPerformance             = 0x4000,
-    kIOPMPassThrough                = 0x0100,
-    kIOPMAuxPowerOn                 = 0x0020,
-    kIOPMNotAttainable              = 0x0001,
-    kIOPMContextRetained            = 0x2000,
-    kIOPMConfigRetained             = 0x1000,
-    kIOPMStaticPowerValid           = 0x0800,
-    kIOPMSoftSleep                  = 0x0400,
-    kIOPMCapabilitiesMask =     kIOPMPowerOn | kIOPMDeviceUsable | 
-                                kIOPMMaxPerformance | kIOPMContextRetained | 
-                                kIOPMConfigRetained | kIOPMSleepCapability |
-                                kIOPMRestartCapability
-};
-
-/*
- * Support for old names of IOPMPowerFlag constants
- */
-enum {
-    IOPMNotAttainable           = kIOPMNotAttainable,
-    IOPMPowerOn                 = kIOPMPowerOn,
-    IOPMClockNormal             = kIOPMClockNormal,
-    IOPMClockRunning            = kIOPMClockRunning,
-    IOPMAuxPowerOn              = kIOPMAuxPowerOn,
-    IOPMDeviceUsable            = kIOPMDeviceUsable,
-    IOPMMaxPerformance          = kIOPMMaxPerformance,
-    IOPMContextRetained         = kIOPMContextRetained,
-    IOPMConfigRetained          = kIOPMConfigRetained,
-    IOPMNotPowerManaged         = kIOPMNotPowerManaged,
-    IOPMSoftSleep               = kIOPMSoftSleep
-};
-
-
-enum {
-    kIOPMNextHigherState        = 1,
-    kIOPMHighestState           = 2,
-    kIOPMNextLowerState         = 3,
-    kIOPMLowestState            = 4
-};
-
-enum {
-    IOPMNextHigherState         = kIOPMNextHigherState,
-    IOPMHighestState            = kIOPMHighestState,
-    IOPMNextLowerState          = kIOPMNextLowerState,
-    IOPMLowestState             = kIOPMLowestState
-};
-
-// Internal commands used by power managment command queue
-enum {
-    kIOPMBroadcastAggressiveness = 1,
-    kIOPMUnidleDevice
-};
-
-// Power consumption unknown value
-enum {
-    kIOPMUnknown = 0xFFFF
-};
-
-/*******************************************************************************
- *
- * Root Domain property keys of interest
- *
- ******************************************************************************/
-
-/* AppleClamshellState 
- * reflects the state of the clamshell (lid) on a portable.
- * It has a boolean value.
- *  true        == clamshell is closed
- *  false       == clamshell is open
- *  not present == no clamshell on this hardware
- */
-#define kAppleClamshellStateKey             "AppleClamshellState"
-
-/* AppleClamshellCausesSleep 
- * reflects the clamshell close behavior on a portable. 
- * It has a boolean value.
- *  true        == system will sleep when clamshell is closed
- *  false       == system will not sleep on clamshell close 
- *                  (typically external display mode)
- *  not present == no clamshell on this hardware
- */
-#define kAppleClamshellCausesSleepKey       "AppleClamshellCausesSleep"
-
-/* kIOPMSleepWakeUUIDKey
- * Key refers to a CFStringRef that will uniquely identify
- * a sleep/wake cycle for logging & tracking.
- * The key becomes valid at the beginning of a sleep cycle - before we
- * initiate any sleep/wake notifications.
- * The key becomes invalid at the completion of a system wakeup. The
- * property will not be present in the IOPMrootDomain's registry entry
- * when it is invalid.
- * 
- * See IOPMrootDomain notification kIOPMMessageSleepWakeUUIDChange
- */
- #define kIOPMSleepWakeUUIDKey              "SleepWakeUUID"
-
-/*******************************************************************************
- *
- * Root Domain general interest messages
- *
- * Available by registering for interest type 'gIOGeneralInterest' 
- * on IOPMrootDomain. 
- *
- ******************************************************************************/
-
-/* kIOPMMessageClamshellStateChange
- * Delivered as a general interest notification on the IOPMrootDomain
- * IOPMrootDomain sends this message when state of either AppleClamshellState
- * or AppleClamshellCausesSleep changes. If this clamshell change results in
- * a sleep, the sleep will initiate soon AFTER delivery of this message.
- * The state of both variables is encoded in a bitfield argument sent with
- * the message. Check bits 0 and 1 using kClamshellStateBit & kClamshellSleepBit
- */
-enum {
-    kClamshellStateBit = (1 << 0),
-    kClamshellSleepBit = (1 << 1)
-};
-
-#define kIOPMMessageClamshellStateChange   \
-                iokit_family_msg(sub_iokit_powermanagement, 0x100)
-
-/* kIOPMMessageFeatureChange
- * Delivered when the set of supported features ("Supported Features" dictionary
- * under IOPMrootDomain registry) changes in some way. Typically addition or
- * removal of a supported feature.
- * RootDomain passes no argument with this message.
- */
-#define kIOPMMessageFeatureChange           \
-                iokit_family_msg(sub_iokit_powermanagement, 0x110)
-
-/* kIOPMMessageInflowDisableCancelled
- * The battery has drained completely to its "Fully Discharged" state. 
- * If a user process has disabled battery inflow for battery 
- * calibration, we forcibly re-enable Inflow at this point.
- * If inflow HAS been forcibly re-enabled, bit 0
- * (kInflowForciblyEnabledBit) will be set.
- */
-enum {
-    kInflowForciblyEnabledBit = (1 << 0)
-};
-
-/* kIOPMMessageInternalBatteryFullyDischarged
- * The battery has drained completely to its "Fully Discharged" state. 
- */
-#define kIOPMMessageInternalBatteryFullyDischarged  \
-                iokit_family_msg(sub_iokit_powermanagement, 0x120)
-
-/* kIOPMMessageSystemPowerEventOccurred
- * Some major system thermal property has changed, and interested clients may
- * modify their behavior.
- */
-#define kIOPMMessageSystemPowerEventOccurred  \
-                iokit_family_msg(sub_iokit_powermanagement, 0x130)
-
-/* kIOPMMessageSleepWakeUUIDChange
- * Either a new SleepWakeUUID has been specified at the beginning of a sleep,
- * or we're removing the existing property upon completion of a wakeup.
- */
-#define kIOPMMessageSleepWakeUUIDChange  \
-                iokit_family_msg(sub_iokit_powermanagement, 0x140)
-                
-/* kIOPMMessageSleepWakeUUIDSet
- * Argument accompanying the kIOPMMessageSleepWakeUUIDChange notification when 
- * a new UUID has been specified.
- */
-#define kIOPMMessageSleepWakeUUIDSet                    ((void *)1)
-
-/* kIOPMMessageSleepWakeUUIDCleared
- * Argument accompanying the kIOPMMessageSleepWakeUUIDChange notification when 
- * the current UUID has been removed.
- */
-#define kIOPMMessageSleepWakeUUIDCleared                ((void *)0)
-
-/*******************************************************************************
- *
- * Power commands issued to root domain
- * Use with IOPMrootDomain::receivePowerNotification()
- *
- * These commands are issued from system drivers only:
- *      ApplePMU, AppleSMU, IOGraphics, AppleACPIFamily
- *
- ******************************************************************************/
-enum {
-  kIOPMSleepNow                 = (1<<0),  // put machine to sleep now
-  kIOPMAllowSleep               = (1<<1),  // allow idle sleep
-  kIOPMPreventSleep             = (1<<2),  // do not allow idle sleep
-  kIOPMPowerButton              = (1<<3),  // power button was pressed
-  kIOPMClamshellClosed          = (1<<4),  // clamshell was closed
-  kIOPMPowerEmergency           = (1<<5),  // battery dangerously low
-  kIOPMDisableClamshell         = (1<<6),  // do not sleep on clamshell closure
-  kIOPMEnableClamshell          = (1<<7),  // sleep on clamshell closure
-  kIOPMProcessorSpeedChange     = (1<<8),  // change the processor speed
-  kIOPMOverTemp                 = (1<<9),  // system dangerously hot
-  kIOPMClamshellOpened          = (1<<10)  // clamshell was opened
-};
-
-
-/*******************************************************************************
- *
- * Power Management Return Codes
- *
- ******************************************************************************/
-enum {
-    kIOPMNoErr                  = 0,
-
-    // Returned by driver's setPowerState(), powerStateWillChangeTo(),
-    // powerStateDidChangeTo(), or acknowledgeSetPowerState() to
-    // implicitly acknowledge power change upon function return.
-    kIOPMAckImplied             = 0,
-
-    // Deprecated
-    kIOPMWillAckLater           = 1,
-
-    // Returned by requestPowerDomainState() to indicate
-    // unrecognized specification parameter.
-    kIOPMBadSpecification       = 4,
-
-    // Returned by requestPowerDomainState() to indicate
-    // no power state matches search specification.
-    kIOPMNoSuchState            = 5,
-
-    // Deprecated
-    kIOPMCannotRaisePower       = 6,
-
-    // Deprecated
-    kIOPMParameterError         = 7,
-
-    // Returned when power management state is accessed
-    // before driver has called PMinit().
-    kIOPMNotYetInitialized      = 8,
-
-    // And the old constants; deprecated
-    IOPMNoErr = kIOPMNoErr,
-    IOPMAckImplied = kIOPMAckImplied, 
-    IOPMWillAckLater = kIOPMWillAckLater,
-    IOPMBadSpecification = kIOPMBadSpecification,
-    IOPMNoSuchState = kIOPMNoSuchState,
-    IOPMCannotRaisePower = kIOPMCannotRaisePower,
-    IOPMParameterError = kIOPMParameterError,
-    IOPMNotYetInitialized = kIOPMNotYetInitialized
-};
-
-
-// IOPMPowerSource class descriptive strings
-// Power Source state is published as properties to the IORegistry under these 
-// keys.
-#define kIOPMPSExternalConnectedKey                 "ExternalConnected"
-#define kIOPMPSExternalChargeCapableKey             "ExternalChargeCapable"
-#define kIOPMPSBatteryInstalledKey                  "BatteryInstalled"
-#define kIOPMPSIsChargingKey                        "IsCharging"
-#define kIOPMFullyChargedKey                        "FullyCharged"
-#define kIOPMPSAtWarnLevelKey                       "AtWarnLevel"
-#define kIOPMPSAtCriticalLevelKey                   "AtCriticalLevel"
-#define kIOPMPSCurrentCapacityKey                   "CurrentCapacity"
-#define kIOPMPSMaxCapacityKey                       "MaxCapacity"
-#define kIOPMPSDesignCapacityKey                    "DesignCapacity"
-#define kIOPMPSTimeRemainingKey                     "TimeRemaining"
-#define kIOPMPSAmperageKey                          "Amperage"
-#define kIOPMPSVoltageKey                           "Voltage"
-#define kIOPMPSCycleCountKey                        "CycleCount"
-#define kIOPMPSMaxErrKey                            "MaxErr"
-#define kIOPMPSAdapterInfoKey                       "AdapterInfo"
-#define kIOPMPSLocationKey                          "Location"
-#define kIOPMPSErrorConditionKey                    "ErrorCondition"
-#define kIOPMPSManufacturerKey                      "Manufacturer"
-#define kIOPMPSManufactureDateKey                   "ManufactureDate"
-#define kIOPMPSModelKey                             "Model"
-#define kIOPMPSSerialKey                            "Serial"
-#define kIOPMDeviceNameKey                          "DeviceName"
-#define kIOPMPSLegacyBatteryInfoKey                 "LegacyBatteryInfo"
-#define kIOPMPSBatteryHealthKey                     "BatteryHealth"
-#define kIOPMPSHealthConfidenceKey                  "HealthConfidence"
-#define kIOPMPSCapacityEstimatedKey	                "CapacityEstimated"
-#define kIOPMPSBatteryChargeStatusKey               "ChargeStatus"
-#define kIOPMPSBatteryTemperatureKey                "Temperature"
-
-// kIOPMPSBatteryChargeStatusKey may have one of the following values, or may have
-// no value. If kIOPMBatteryChargeStatusKey has a NULL value (or no value) associated with it
-// then charge is proceeding normally. If one of these battery charge status reasons is listed,
-// then the charge may have been interrupted.
-#define kIOPMBatteryChargeStatusTooHot              "HighTemperature"
-#define kIOPMBatteryChargeStatusTooCold             "LowTemperature"
-#define kIOPMBatteryChargeStatusGradient            "BatteryTemperatureGradient"
-
-// Definitions for battery location, in case of multiple batteries.
-// A location of 0 is unspecified
-// Location is undefined for single battery systems
-enum {
-    kIOPMPSLocationLeft = 1001,
-    kIOPMPSLocationRight = 1002
-};
-
-// Battery quality health types, specified by BatteryHealth and HealthConfidence
-// properties in an IOPMPowerSource battery kext.
-enum {
-    kIOPMUndefinedValue = 0,
-    kIOPMPoorValue      = 1,
-    kIOPMFairValue      = 2,
-    kIOPMGoodValue      = 3
-};
-
-// Battery's time remaining estimate is invalid this long (seconds) after a wake
-#define kIOPMPSInvalidWakeSecondsKey           "BatteryInvalidWakeSeconds"
-
-// Battery must wait this long (seconds) after being completely charged before
-// the battery is settled.
-#define kIOPMPSPostChargeWaitSecondsKey        "PostChargeWaitSeconds"
-
-// Battery must wait this long (seconds) after being completely discharged 
-// before the battery is settled.
-#define kIOPMPSPostDishargeWaitSecondsKey      "PostDischargeWaitSeconds"
-
-
-/* CPU Power Management status keys
- * Pass as arguments to IOPMrootDomain::systemPowerEventOccurred
- * Or as arguments to IOPMSystemPowerEventOccurred()
- * Or to decode the dictionary obtained from IOPMCopyCPUPowerStatus()
- * These keys reflect restrictions placed on the CPU by the system
- * to bring the CPU's power consumption within allowable thermal and 
- * power constraints.
- */
-
-
-/* kIOPMGraphicsPowerLimitsKey
- *   The key representing the dictionary of graphics power limits.
- *   The dictionary contains the other kIOPMCPUPower keys & their associated
- *   values (e.g. Speed limit, Processor Count, and Schedule limits).
- */
-#define kIOPMGraphicsPowerLimitsKey                     "Graphics_Power_Limits"
-
-/* kIOPMGraphicsPowerLimitPerformanceKey
- *   The key representing the percent of overall performance made available
- *   by the graphics chip as a percentage (integer 0 - 100).
- */
-#define kIOPMGraphicsPowerLimitPerformanceKey           "Graphics_Power_Performance"
-
-
-
-/* kIOPMCPUPowerLimitsKey
- *   The key representing the dictionary of CPU Power Limits.
- *   The dictionary contains the other kIOPMCPUPower keys & their associated
- *   values (e.g. Speed limit, Processor Count, and Schedule limits).
- */
-#define kIOPMCPUPowerLimitsKey                          "CPU_Power_Limits"
-
-/* kIOPMCPUPowerLimitProcessorSpeedKey defines the speed & voltage limits placed 
- *   on the CPU.
- *   Represented as a percentage (0-100) of maximum CPU speed.
- */
-#define kIOPMCPUPowerLimitProcessorSpeedKey             "CPU_Speed_Limit"
-
-/* kIOPMCPUPowerLimitProcessorCountKey reflects how many, if any, CPUs have been
- *   taken offline. Represented as an integer number of CPUs (0 - Max CPUs).
- */
-#define kIOPMCPUPowerLimitProcessorCountKey             "CPU_Available_CPUs"
-
-/* kIOPMCPUPowerLimitSchedulerTimeKey represents the percentage (0-100) of CPU time 
- *   available. 100% at normal operation. The OS may limit this time for a percentage
- *   less than 100%.
- */
-#define kIOPMCPUPowerLimitSchedulerTimeKey              "CPU_Scheduler_Limit"
-
-
-/* Thermal Level Warning Key
- * Indicates the thermal constraints placed on the system. This value may 
- * cause clients to action to consume fewer system resources.
- * The value associated with this warning is defined by the platform.
- */
-#define kIOPMThermalLevelWarningKey                     "Thermal_Level_Warning"
-
-/* Thermal Warning Level values
- *      kIOPMThermalWarningLevelNormal - under normal operating conditions
- *      kIOPMThermalWarningLevelDanger - thermal pressure may cause system slowdown
- *      kIOPMThermalWarningLevelCrisis - thermal conditions may cause imminent shutdown
- *
- * The platform may define additional thermal levels if necessary.
- */
-enum {
-  kIOPMThermalWarningLevelNormal    = 0,
-  kIOPMThermalWarningLevelDanger    = 5,
-  kIOPMThermalWarningLevelCrisis    = 10
-};
-
-
-// PM Settings Controller setting types
-// Settings types used primarily with:
-//      IOPMrootDomain::registerPMSettingController
-// The values are identical to the similarly named keys for use in user space
-// PM settings work. Those keys are defined in IOPMLibPrivate.h.
-#define kIOPMSettingWakeOnRingKey                   "Wake On Modem Ring"
-#define kIOPMSettingRestartOnPowerLossKey           "Automatic Restart On Power Loss"
-#define kIOPMSettingWakeOnACChangeKey               "Wake On AC Change"
-#define kIOPMSettingSleepOnPowerButtonKey           "Sleep On Power Button"
-#define kIOPMSettingWakeOnClamshellKey              "Wake On Clamshell Open"
-#define kIOPMSettingReduceBrightnessKey             "ReduceBrightness"
-#define kIOPMSettingDisplaySleepUsesDimKey          "Display Sleep Uses Dim"
-#define kIOPMSettingTimeZoneOffsetKey               "TimeZoneOffsetSeconds"
-#define kIOPMSettingMobileMotionModuleKey           "MobileMotionModule"
-#define kIOPMSettingGraphicsSwitchKey               "GPUSwitch"
-
-// Setting controlling drivers can register to receive scheduled wake data
-// Either in "CF seconds" type, or structured calendar data in a formatted
-// IOPMCalendarStruct defined below.
-#define kIOPMSettingAutoWakeSecondsKey              "wake"
-#define kIOPMSettingAutoWakeCalendarKey             "WakeByCalendarDate"
-#define kIOPMSettingAutoPowerSecondsKey             "poweron"
-#define kIOPMSettingAutoPowerCalendarKey            "PowerByCalendarDate"
-
-// Debug seconds auto wake
-// Used by sleep cycling debug tools
-#define kIOPMSettingDebugWakeRelativeKey            "WakeRelativeToSleep"
-#define kIOPMSettingDebugPowerRelativeKey           "PowerRelativeToShutdown"
-
-// Maintenance wake calendar.
-#define kIOPMSettingMaintenanceWakeCalendarKey      "MaintenanceWakeCalendarDate"
-
-struct IOPMCalendarStruct {
-    UInt32      year;
-    UInt8       month;
-    UInt8       day;
-    UInt8       hour;
-    UInt8       minute;
-    UInt8       second;
-};
-typedef struct IOPMCalendarStruct IOPMCalendarStruct;
-
-// SetAggressiveness types
-enum {
-    kPMGeneralAggressiveness = 0,
-    kPMMinutesToDim,
-    kPMMinutesToSpinDown,
-    kPMMinutesToSleep,
-    kPMEthernetWakeOnLANSettings,
-    kPMSetProcessorSpeed,
-    kPMPowerSource,
-    kPMMotionSensor,
-    kPMLastAggressivenessType
-};
-#define kMaxType (kPMLastAggressivenessType-1)
-
-// SetAggressiveness values for the kPMPowerSource aggressiveness type
-enum {
-    kIOPMInternalPower = 1,
-    kIOPMExternalPower
-};
-
-#define kIOREMSleepEnabledKey               "REMSleepEnabled"
-
-// Strings for deciphering the dictionary returned from IOPMCopyBatteryInfo
-#define kIOBatteryInfoKey                   "IOBatteryInfo"
-#define kIOBatteryCurrentChargeKey          "Current"
-#define kIOBatteryCapacityKey               "Capacity"
-#define kIOBatteryFlagsKey                  "Flags"
-#define kIOBatteryVoltageKey                "Voltage"
-#define kIOBatteryAmperageKey               "Amperage"
-#define kIOBatteryCycleCountKey             "Cycle Count"
-
-enum {
-    kIOBatteryInstalled         = (1 << 2),
-    kIOBatteryCharge            = (1 << 1),
-    kIOBatteryChargerConnect    = (1 << 0)
-};
-
-
-// Private power management message indicating battery data has changed
-// Indicates new data resides in the IORegistry
-#define kIOPMMessageBatteryStatusHasChanged         iokit_family_msg(sub_iokit_pmu, 0x100)
-
-// Apple private Legacy messages for re-routing AutoWake and AutoPower messages to the PMU
-// through newer user space IOPMSchedulePowerEvent API
-#define kIOPMUMessageLegacyAutoWake                 iokit_family_msg(sub_iokit_pmu, 0x200)
-#define kIOPMUMessageLegacyAutoPower                iokit_family_msg(sub_iokit_pmu, 0x210)
-
-// For use with IOPMPowerSource bFlags
-#define IOPM_POWER_SOURCE_REV   2
-enum {
-  kIOPMACInstalled      = kIOBatteryChargerConnect,
-  kIOPMBatteryCharging  = kIOBatteryCharge,
-  kIOPMBatteryInstalled = kIOBatteryInstalled,
-  kIOPMUPSInstalled     = (1<<3),
-  kIOPMBatteryAtWarn    = (1<<4),
-  kIOPMBatteryDepleted  = (1<<5),
-  kIOPMACnoChargeCapability = (1<<6),     // AC adapter cannot charge battery
-  kIOPMRawLowBattery    = (1<<7),         // used only by  Platform Expert
-  kIOPMForceLowSpeed    = (1<<8),         // set by Platfm Expert, chk'd by Pwr Plugin
-  kIOPMClosedClamshell  = (1<<9),         // set by PMU - reflects state of the clamshell
-  kIOPMClamshellStateOnWake = (1<<10)     // used only by Platform Expert
-};
-
-
-// **********************************************
-// Internal power management data structures
-// **********************************************
-
-#if KERNEL && __cplusplus
-class IOService;
-
-enum {
-    kIOPowerEmergencyLevel = 1000
-};
-
-enum {
-    kIOPMSubclassPolicy,
-    kIOPMSuperclassPolicy1
-};
-
-struct stateChangeNote{
-    IOPMPowerFlags    stateFlags;
-    unsigned long    stateNum;
-    void *         powerRef;
-};
-typedef struct stateChangeNote stateChangeNote;
-
-struct IOPowerStateChangeNotification {
-    void *        powerRef;
-    unsigned long    returnValue;
-    unsigned long    stateNumber;
-    IOPMPowerFlags    stateFlags;
-};
-typedef struct IOPowerStateChangeNotification IOPowerStateChangeNotification;
-typedef IOPowerStateChangeNotification sleepWakeNote;
-#endif /* KERNEL && __cplusplus */
-
-#endif /* ! _IOKIT_IOPM_H */
-
diff --git a/i386/include/IOKit/pwr_mgt/IOPMDeprecated.h b/i386/include/IOKit/pwr_mgt/IOPMDeprecated.h
deleted file mode 100644
index 3bee01a..0000000
--- a/i386/include/IOKit/pwr_mgt/IOPMDeprecated.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOPMDeprecated_h_
-#define _IOPMDeprecated_h_
-
-#ifdef __ppc__
-
-// Power events
-enum {
-  kClamshellClosedEventMask  = (1<<0),  // User closed lid
-  kDockingBarEventMask       = (1<<1),  // OBSOLETE
-  kACPlugEventMask           = (1<<2),  // User plugged or unplugged adapter
-  kFrontPanelButtonEventMask = (1<<3),  // User hit the front panel button
-  kBatteryStatusEventMask    = (1<<4)   // Battery status has changed
-};
-
-// PUBLIC power management features
-// NOTE: this is a direct port from classic, some of these bits
-//       are obsolete but are included for completeness
-enum {
-  kPMHasWakeupTimerMask        = (1<<0),  // 1=wake timer is supported
-  kPMHasSharedModemPortMask    = (1<<1),  // Not used
-  kPMHasProcessorCyclingMask   = (1<<2),  // 1=processor cycling supported
-  kPMMustProcessorCycleMask    = (1<<3),  // Not used
-  kPMHasReducedSpeedMask       = (1<<4),  // 1=supports reduced processor speed
-  kPMDynamicSpeedChangeMask    = (1<<5),  // 1=supports changing processor speed on the fly
-  kPMHasSCSIDiskModeMask       = (1<<6),  // 1=supports using machine as SCSI drive
-  kPMCanGetBatteryTimeMask     = (1<<7),  // 1=battery time can be calculated
-  kPMCanWakeupOnRingMask       = (1<<8),  // 1=machine can wake on modem ring
-  kPMHasDimmingSupportMask     = (1<<9),  // 1=has monitor dimming support
-  kPMHasStartupTimerMask       = (1<<10), // 1=can program startup timer
-  kPMHasChargeNotificationMask = (1<<11), // 1=client can determine charger status/get notifications
-  kPMHasDimSuspendSupportMask  = (1<<12), // 1=can dim diplay to DPMS ('off') state
-  kPMHasWakeOnNetActivityMask  = (1<<13), // 1=supports waking upon receipt of net packet
-  kPMHasWakeOnLidMask          = (1<<14), // 1=can wake upon lid/case opening
-  kPMCanPowerOffPCIBusMask     = (1<<15), // 1=can remove power from PCI bus on sleep
-  kPMHasDeepSleepMask          = (1<<16), // 1=supports deep (hibernation) sleep
-  kPMHasSleepMask              = (1<<17), // 1=machine support low power sleep (ala powerbooks)
-  kPMSupportsServerModeAPIMask = (1<<18), // 1=supports reboot on AC resume for unexpected power loss
-  kPMHasUPSIntegrationMask     = (1<<19)  // 1=supports incorporating UPS devices into power source calcs
-};
-
-// PRIVATE power management features
-// NOTE: this is a direct port from classic, some of these bits
-//       are obsolete but are included for completeness.
-enum {
-  kPMHasExtdBattInfoMask       = (1<<0),  // Not used
-  kPMHasBatteryIDMask          = (1<<1),  // Not used
-  kPMCanSwitchPowerMask        = (1<<2),  // Not used 
-  kPMHasCelsiusCyclingMask     = (1<<3),  // Not used
-  kPMHasBatteryPredictionMask  = (1<<4),  // Not used
-  kPMHasPowerLevelsMask        = (1<<5),  // Not used
-  kPMHasSleepCPUSpeedMask      = (1<<6),  // Not used
-  kPMHasBtnIntHandlersMask     = (1<<7),  // 1=supports individual button interrupt handlers
-  kPMHasSCSITermPowerMask      = (1<<8),  // 1=supports SCSI termination power switch
-  kPMHasADBButtonHandlersMask  = (1<<9),  // 1=supports button handlers via ADB
-  kPMHasICTControlMask         = (1<<10), // 1=supports ICT control
-  kPMHasLegacyDesktopSleepMask = (1<<11), // 1=supports 'doze' style sleep
-  kPMHasDeepIdleMask           = (1<<12), // 1=supports Idle2 in hardware
-  kPMOpenLidPreventsSleepMask  = (1<<13), // 1=open case prevent machine from sleeping
-  kPMClosedLidCausesSleepMask  = (1<<14), // 1=case closed (clamshell closed) causes sleep
-  kPMHasFanControlMask         = (1<<15), // 1=machine has software-programmable fan/thermostat controls
-  kPMHasThermalControlMask     = (1<<16), // 1=machine supports thermal monitoring
-  kPMHasVStepSpeedChangeMask   = (1<<17), // 1=machine supports processor voltage/clock change
-  kPMEnvironEventsPolledMask   = (1<<18)  // 1=machine doesn't generate pmu env ints, we must poll instead 
-};
-
-// DEFAULT public and private features for machines whose device tree
-// does NOT contain this information (pre-Core99).
-
-// For Cuda-based Desktops
-
-#define kStdDesktopPMFeatures   kPMHasWakeupTimerMask         |\
-                                kPMHasProcessorCyclingMask    |\
-                                kPMHasDimmingSupportMask      |\
-                                kPMHasStartupTimerMask        |\
-                                kPMSupportsServerModeAPIMask  |\
-                                kPMHasUPSIntegrationMask
-
-#define kStdDesktopPrivPMFeatures  kPMHasExtdBattInfoMask     |\
-                                   kPMHasICTControlMask       |\
-                                   kPMHasLegacyDesktopSleepMask
-
-#define kStdDesktopNumBatteries 0
-
-// For Wallstreet (PowerBook G3 Series 1998)
-
-#define kWallstreetPMFeatures   kPMHasWakeupTimerMask         |\
-                                kPMHasProcessorCyclingMask    |\
-                                kPMHasReducedSpeedMask        |\
-                                kPMDynamicSpeedChangeMask     |\
-                                kPMHasSCSIDiskModeMask        |\
-                                kPMCanGetBatteryTimeMask      |\
-                                kPMHasDimmingSupportMask      |\
-                                kPMHasChargeNotificationMask  |\
-                                kPMHasDimSuspendSupportMask   |\
-                                kPMHasSleepMask
-
-#define kWallstreetPrivPMFeatures  kPMHasExtdBattInfoMask      |\
-                                   kPMHasBatteryIDMask         |\
-                                   kPMCanSwitchPowerMask       |\
-                                   kPMHasADBButtonHandlersMask |\
-                                   kPMHasSCSITermPowerMask     |\
-                                   kPMHasICTControlMask        |\
-                                   kPMClosedLidCausesSleepMask |\
-                                   kPMEnvironEventsPolledMask
-
-#define kStdPowerBookPMFeatures      kWallstreetPMFeatures
-#define kStdPowerBookPrivPMFeatures  kWallstreetPrivPMFeatures
-
-#define kStdPowerBookNumBatteries 2
-
-// For 101 (PowerBook G3 Series 1999)
-
-#define k101PMFeatures          kPMHasWakeupTimerMask         |\
-                                kPMHasProcessorCyclingMask    |\
-                                kPMHasReducedSpeedMask        |\
-                                kPMDynamicSpeedChangeMask     |\
-                                kPMHasSCSIDiskModeMask        |\
-                                kPMCanGetBatteryTimeMask      |\
-                                kPMHasDimmingSupportMask      |\
-                                kPMHasChargeNotificationMask  |\
-                                kPMHasDimSuspendSupportMask   |\
-                                kPMHasSleepMask               |\
-                                kPMHasUPSIntegrationMask
-
-#define k101PrivPMFeatures      kPMHasExtdBattInfoMask        |\
-                                kPMHasBatteryIDMask           |\
-                                kPMCanSwitchPowerMask         |\
-                                kPMHasADBButtonHandlersMask   |\
-                                kPMHasSCSITermPowerMask       |\
-                                kPMHasICTControlMask          |\
-                                kPMClosedLidCausesSleepMask   |\
-                                kPMEnvironEventsPolledMask
-
-
-// These flags are deprecated. Use the version with the kIOPM prefix in IOPM.h
-enum {
-  kACInstalled      = (1<<0),
-  kBatteryCharging  = (1<<1),
-  kBatteryInstalled = (1<<2),
-  kUPSInstalled     = (1<<3),
-  kBatteryAtWarn    = (1<<4),
-  kBatteryDepleted  = (1<<5),
-  kACnoChargeCapability = (1<<6),     // AC adapter cannot charge battery
-  kRawLowBattery    = (1<<7),         // used only by  Platform Expert
-  kForceLowSpeed    = (1<<8)         // set by Platfm Expert, chk'd by Pwr Plugin};
-};
-
-#endif /* __ppc32 */
-#endif /* _IOPMDeprecated_h_ */
diff --git a/i386/include/IOKit/pwr_mgt/IOPMLibDefs.h b/i386/include/IOKit/pwr_mgt/IOPMLibDefs.h
deleted file mode 100644
index ff25bf3..0000000
--- a/i386/include/IOKit/pwr_mgt/IOPMLibDefs.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-
-#define	kPMSetAggressiveness            0
-#define	kPMGetAggressiveness            1
-#define	kPMSleepSystem                  2
-#define	kPMAllowPowerChange             3
-#define	kPMCancelPowerChange            4
-#define	kPMShutdownSystem               5
-#define	kPMRestartSystem                6
-#define kPMSleepSystemOptions           7
-#define kPMSetMaintenanceWakeCalendar   8
-
-#define kNumPMMethods                   9
diff --git a/i386/include/IOKit/pwr_mgt/IOPMPowerSource.h b/i386/include/IOKit/pwr_mgt/IOPMPowerSource.h
deleted file mode 100644
index ed68918..0000000
--- a/i386/include/IOKit/pwr_mgt/IOPMPowerSource.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
- 
-#ifndef _IOPMPowerSource_h_
-#define _IOPMPowerSource_h_
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/pwr_mgt/IOPM.h>
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOReturn.h>
-#include <IOKit/IOService.h>
-
-enum {
-    kSecondsPerHour = 3600,
-    kTenMinutesInSeconds = 600
-};
-
-/* class IOPMPowerSource
- *
- * See IOKit/pwr_mgt/IOPM.h for power source keys relevant to this class. These
- * report-type keys are required for calls to IOPMPowerSource::setReportables(),
- * and they define the IORegistry interface through which data is passed back
- * up to the rest of the system.
- *
- * A subclassing driver that doesn't want to do anything fancy should:
- *   1. Subclass IOPMPowerSource
- *   3. Install its own battery change notifications or polling routine that can
- *          converse with actual battery hardware.
- *   4. When battery state changes, change the relevant member variables
- *          through setCurrentCapacity() style accessors.
- *   5. Call updateStatus() on itself when all such settings have been updated.
- *   
- * The subclass driver should also initially populate its settings and call
- * updateStatus() on launch.
- *
- *
- * Settings
- *
- * ExternalConnected
- * Type: bool
- * IORegistry Key: kIOPMPSExternalConnectedKey
- * True if computer is drawing external power 
- *
- * ExternalChargeCapable
- * Type: bool
- * IORegistry Key: kIOPMPSExternalChargeCapableKey
- * True if external power is capable of charging internal battery
- *
- * BatteryInstalled
- * Type: bool
- * IORegistry Key: kIOPMPSBatteryInstalledKey
- * True if a battery is present; false if removed
- *
- * IsCharging
- * Type: bool
- * IORegistry Key: kIOPMPSIsChargingKey
- * True if battery is charging itself from external power
- *
- * AtWarnLevel
- * Type: bool
- * IORegistry Key: kIOPMPSAtWarnLevelKey
- * True if draining battery capacity and past warn level
- *
- * AtCriticalLevel
- * Type: bool
- * IORegistry Key: kIOPMPSAtCriticalLevelKey
- * True if draining battery capacity and past critical level
- *
- * CurrentCapacity
- * MaxCapacity
- * Type: unsigned int
- * IORegistry Key: kIOPMPSCurrentCapacityKey, kIOPMPSMaxCapacityKey
- * Capacity measured in mAh
- *
- * TimeRemaining
- * Type: int
- * IORegistry Key: kIOPMPSTimeRemainingKey
- * Time remaining measured in minutes
- *
- * Amperage
- * Type: int
- * IORegistry Key: kIOPMPSAmperageKey
- * Current is measured in mA
- *
- * Voltage
- * Type: unsigned int
- * IORegistry Key: kIOPMPSVoltageKey
- * Voltage measured in mV
- *
- * CycleCount
- * Type: unsigned int
- * IORegistry Key: kIOPMPSCycleCountKey
- * Number of charge/discharge cycles
- *
- * AdapterInfo
- * Type: int
- * IORegistry Key: kIOPMPSAdapterInfoKey
- * Power adapter information
- *
- * Location
- * Type: int
- * IORegistry Key: kIOPMPSLocationKey
- * Clue about battery's location in machine - Left vs. Right
- *
- * ErrorCondition
- * Type: OSSymbol
- * IORegistry Key: kIOPMPSErrorConditionKey
- * String describing error state of battery
- *
- * Manufacturer
- * Type: OSSymbol
- * IORegistry Key: kIOPMPSManufacturerKey
- * String describing battery manufacturer
- *
- * Manufactured Date
- * Type: unsigned 16-bit bitfield
- * IORegistry Key: kIOPMPSManufactureDateKey
- * Date is published in a bitfield per the Smart Battery Data spec rev 1.1 
- * in section 5.1.26
- *   Bits 0...4 => day (value 1-31; 5 bits)
- *   Bits 5...8 => month (value 1-12; 4 bits)
- *   Bits 9...15 => years since 1980 (value 0-127; 7 bits)
- *
- * Model
- * Type: OSSymbol
- * IORegistry Key: kIOPMPSModelKey
- * String describing model number
- *
- * Serial
- * Type: OSSymbol
- * IORegistry Key: kIOPMPSSerialKey
- * String describing serial number or unique info
- * The serial number published hear bears no correspondence to the Apple serial
- * number printed on each battery. This is a manufacturer serial number with 
- * no correlation to the printed serial number.
- *
- * LegacyIOBatteryInfo
- * Type: OSDictionary
- * IORegistry Key: kIOPMPSLegacyBatteryInfoKey
- * Dictionary conforming to the OS X 10.0-10.4 
- */
-
-class IOPMPowerSource : public IOService
-{
-    OSDeclareDefaultStructors(IOPMPowerSource)
-
-    friend class IOPMPowerSourceList;
-
- protected:
-
-/* bool settingsChangedSinceLastUpdate
- * Used by subclasses to determine if any settings have been modified via the
- * accessors below since last call to update(). true is settings have changed;
- * false otherwise.
- */
-    bool settingsChangedSinceUpdate;
-    
-/* OSDictionary properties
- * Stores power source state
- */
-    OSDictionary            *properties;
-
-    const OSSymbol *externalConnectedKey;
-    const OSSymbol *externalChargeCapableKey;
-    const OSSymbol *batteryInstalledKey;
-    const OSSymbol *chargingKey;
-    const OSSymbol *warnLevelKey;
-    const OSSymbol *criticalLevelKey;
-    const OSSymbol *currentCapacityKey;
-    const OSSymbol *maxCapacityKey;
-    const OSSymbol *timeRemainingKey;
-    const OSSymbol *amperageKey;
-    const OSSymbol *voltageKey;
-    const OSSymbol *cycleCountKey;
-    const OSSymbol *adapterInfoKey;
-    const OSSymbol *locationKey;
-    const OSSymbol *errorConditionKey;
-    const OSSymbol *manufacturerKey;
-    const OSSymbol *modelKey;
-    const OSSymbol *serialKey;
-    const OSSymbol *batteryInfoKey;
-
-    // Tracking for IOPMPowerSourceList
-    IOPMPowerSource         *nextInList;
-
- public:
-
-/*! @function powerSource
-    @abstract Creates a new IOPMPowerSource nub. Must be attached to IORegistry,
-        and registered by provider.
-*/
-    static IOPMPowerSource *powerSource(void);
-
-    virtual bool init(void);
-    
-    virtual void free(void);
-
-/*! @function updateStatus
-    @abstract Must be called by physical battery controller when battery state
-                has changed significantly.
-    @discussion The system will not poll this object for battery updates. Rather \
-    the battery's controller must call updateStatus() every time state changes \
-    and the settings will be relayed to higher levels of power management. \
-    The subclassing driver should override this only if the driver needs to add \
-    new settings to the base class.
-*/
-    virtual void updateStatus(void);
-
-/* Public accessors for battery state
- */
-    bool externalConnected(void);
-    bool externalChargeCapable(void);
-    bool batteryInstalled(void);
-    bool isCharging(void);
-    bool atWarnLevel(void);
-    bool atCriticalLevel(void);
-
-    unsigned int currentCapacity(void);
-    unsigned int maxCapacity(void);
-    unsigned int capacityPercentRemaining(void);
-    int timeRemaining(void);
-    int amperage(void);
-    unsigned int voltage(void);
-    unsigned int cycleCount(void);
-    int adapterInfo(void);
-    int location(void);
-    
-    OSSymbol *errorCondition(void);
-    OSSymbol *manufacturer(void);
-    OSSymbol *model(void);
-    OSSymbol *serial(void);
-    OSDictionary *legacyIOBatteryInfo(void);
-    
-    OSObject *getPSProperty(const OSSymbol *);
-    
-protected:
-
-/* Protected "setter" methods for subclasses
- * Subclasses should use these setters to modify all battery properties.
- * 
- * Subclasses must follow all property changes with a call to updateStatus() 
- * to flush settings changes to upper level battery API clients.
- *
- */
-    void setExternalConnected(bool);
-    void setExternalChargeCapable(bool);
-    void setBatteryInstalled(bool);
-    void setIsCharging(bool);
-    void setAtWarnLevel(bool);
-    void setAtCriticalLevel(bool);
-
-    void setCurrentCapacity(unsigned int);
-    void setMaxCapacity(unsigned int);    
-    void setTimeRemaining(int);
-    void setAmperage(int);    
-    void setVoltage(unsigned int);
-    void setCycleCount(unsigned int);
-    void setAdapterInfo(int);
-    void setLocation(int);
-
-    void setErrorCondition(OSSymbol *);
-    void setManufacturer(OSSymbol *);
-    void setModel(OSSymbol *);
-    void setSerial(OSSymbol *);
-    void setLegacyIOBatteryInfo(OSDictionary *);
-
-/* All of these methods funnel through the generic accessor method
-   setPSProperty. Caller can pass in any arbitrary OSSymbol key, and
-   that value will be stored in the PM settings dictionary, and relayed
-   onto the IORegistry at update time.
- */
-    void setPSProperty(const OSSymbol *, OSObject *);
-};
-
-#endif
diff --git a/i386/include/IOKit/pwr_mgt/IOPMPowerSourceList.h b/i386/include/IOKit/pwr_mgt/IOPMPowerSourceList.h
deleted file mode 100644
index cb1c8ea..0000000
--- a/i386/include/IOKit/pwr_mgt/IOPMPowerSourceList.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1998-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOReturn.h>
-
-class IOPMPowerSource;
-
-class IOPMPowerSourceList : public OSObject
-{
-    OSDeclareDefaultStructors(IOPMPowerSourceList)
- private:
-    // pointer to first power source in list
-    IOPMPowerSource         *firstItem;
-
-    // how many power sources are in the list
-    unsigned long           length;
-
-  public:
-    void initialize(void);
-    void free(void);
-
-    unsigned long numberOfItems(void);
-    IOReturn addToList(IOPMPowerSource *newPowerSource);
-    IOReturn removeFromList(IOPMPowerSource *theItem);
-    
-    IOPMPowerSource *firstInList(void);
-    IOPMPowerSource *nextInList(IOPMPowerSource *currentItem);
-};
-
diff --git a/i386/include/IOKit/pwr_mgt/IOPMPrivate.h b/i386/include/IOKit/pwr_mgt/IOPMPrivate.h
deleted file mode 100644
index bf50d78..0000000
--- a/i386/include/IOKit/pwr_mgt/IOPMPrivate.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOKIT_IOPMPRIVATE_H
-#define _IOKIT_IOPMPRIVATE_H
-
-#include <IOKit/pwr_mgt/IOPM.h>
-
-/*****************************************************************************/
-
-// Private power commands issued to root domain
-// bits 0-7 in IOPM.h
-
-enum {
-    kIOPMSetValue                   = (1<<16),
-    // don't sleep on clamshell closure on a portable with AC connected
-    kIOPMSetDesktopMode             = (1<<17),
-    // set state of AC adaptor connected
-    kIOPMSetACAdaptorConnected      = (1<<18)
-};
-
-/*****************************************************************************/
-/*****************************************************************************/
-
-/*
- * PM notification types
- */
-
-/* @constant kIOPMStateConsoleUserShutdown
- * @abstract Notification of GUI shutdown state available to kexts.
- * @discussion This type can be passed as arguments to registerPMSettingController()
- * to receive callbacks.
- */
-#define kIOPMStateConsoleShutdown   "ConsoleShutdown"
-
-/* @enum ShutdownValues
- * @abstract Potential values shared with key kIOPMStateConsoleUserShutdown
- */
-enum {
-/* @constant kIOPMStateConsoleShutdownNone
- * @abstract System shutdown (or restart) hasn't started; system is ON.
- * @discussion Next state: 2
- */
-    kIOPMStateConsoleShutdownNone   = 1,
-/* @constant kIOPMStateConsoleShutdownPossible
- * @abstract User has been presented with the option to shutdown or restart. Shutdown may be cancelled.
- * @discussion Next state may be: 1, 4
- */
-    kIOPMStateConsoleShutdownPossible = 2,
-/* @constant kIOPMStateConsoleShutdownUnderway
- * @abstract Shutdown or restart is proceeding. It may still be cancelled.
- * @discussion Next state may be: 1, 4. This state is currently unused.
- */
-    kIOPMStateConsoleShutdownUnderway = 3,
-/* @constant kIOPMStateConsoleShutdownCertain
- * @abstract Shutdown is in progress and irrevocable.
- * @discussion State remains 4 until power is removed from CPU.
- */
-    kIOPMStateConsoleShutdownCertain = 4
-};
-
-/*****************************************************************************/
-/*****************************************************************************/
-
-/* PM Statistics - event indices 
- * These are arguments to IOPMrootDomain::pmStatsRecordEvent().
- */
-enum {
-    kIOPMStatsHibernateImageWrite         = 1,
-    kIOPMStatsHibernateImageRead,
-    kIOPMStatsDriversNotify,
-    kIOPMStatsApplicationNotify,
-    kIOPMStatsLateDriverAcknowledge,
-    kIOPMStatsLateAppAcknowledge,
-    
-    // To designate if you're specifying the start or stop end of 
-    // each of the above events, do a bitwise OR of the appropriate
-    // Start/Stop flag and pass the result to IOPMrootDomain to record
-    // the event.
-    kIOPMStatsEventStartFlag              = (1 << 24),
-    kIOPMStatsEventStopFlag               = (1 << 25)
-};
-
-// Keys for IOPMrootDomain registry properties
-#define kIOPMSleepStatisticsKey                 "SleepStatistics"
-#define kIOPMSleepStatisticsAppsKey             "AppStatistics"
-
-// Application response statistics
-#define kIOPMStatsNameKey                       "Name"
-#define kIOPMStatsPIDKey                        "Pid"
-#define kIOPMStatsTimeMSKey                     "TimeMS"
-#define kIOPMStatsApplicationResponseTypeKey    "ResponseType"
-#define kIOPMStatsMessageTypeKey                "MessageType"
- 
-// PM Statistics: potential values for the key kIOPMStatsApplicationResponseTypeKey
-// entry in the application results array.
-#define kIOPMStatsResponseTimedOut      "ResponseTimedOut"
-#define kIOPMStatsResponseCancel        "ResponseCancel"
-#define kIOPMStatsResponseSlow          "ResponseSlow"
-
-typedef struct {
-    struct bounds{
-        uint64_t start;
-        uint64_t stop;
-    };
-    
-    struct bounds    hibWrite;
-    struct bounds    hibRead;
-//    bounds    driverNotifySleep;
-//    bounds    driverNotifyWake;
-//    bounds    appNotifySleep;
-//    bounds    appNotifyWake;  
-//    OSDictionary    *tardyApps;    
-//    OSDictionary    *tardyDrivers;
-} PMStatsStruct;
-
-/*****************************************************************************/
-
-/* PM RootDomain tracePoints
- *
- * In the sleep/wake process, we expect the sleep trace points to proceed
- * in increasing order. Once sleep begins with code kIOPMTracePointSleepStarted = 0x11,
- * we expect sleep to continue in a monotonically increasing order of tracepoints
- * to kIOPMTracePointSystemLoginwindowPhase = 0x30. After trace point SystemLoginWindowPhase,
- * the system will return to kIOPMTracePointSystemUp = 0x00.
- *
- * If the trace point decreases (instead of increasing) before reaching kIOPMTracePointSystemUp,
- * that indicates that the sleep process was cancelled. The cancel reason shall be indicated
- * in the cancel tracepoint. (TBD)
- */
-
-enum {
-/* When kTracePointSystemUp is the latest tracePoint,
-   the system is awake. It is not asleep, sleeping, or waking.
-   
-   * Phase begins: At boot, at completion of wake from sleep,
-          immediately following kIOPMTracePointSystemLoginwindowPhase.
-   * Phase ends: When a sleep attempt is initiated.
- */
-    kIOPMTracePointSystemUp                     = 0,
-
-/* When kIOPMTracePointSleepStarted we have just initiated sleep.
-
-    Note: The state prior to kIOPMTracePointSleepStarted may be only one of:
-        * kIOPMTracePointSystemUp
-        * kIOPMTracePointSystemLoginwindowPhase or 
-
-   * Phase begins: At initiation of system sleep (idle or forced).
-   * Phase ends: As we start to notify applications of system sleep.
- */
-    kIOPMTracePointSleepStarted             = 0x11,
-
-/* When kTracePointSystemSleepAppsPhase is the latest tracePoint,
-   a system sleep has been irrevocably inititated and PM waits
-   for responses from notified applications.
-
-   * Phase begins: Begin to asynchronously fire kIOMessageSystemWillSleep notifications,
-   *        and in the case of an idle sleep kIOMessageCanSystemSleep as well.
-   * Phase ends: When we have received all user & interested kernel acknowledgements.
- */
-    kIOPMTracePointSystemSleepAppsPhase         = 0x12,
-
-
-/* When kIOPMTracePointSystemHibernatePhase is the latest tracePoint,
-    PM is writing the hiernate image to disk.
- */
-    kIOPMTracePointSystemHibernatePhase         = 0x13,
-
-/* When kTracePointSystemSleepDriversPhase is the latest tracePoint,
-    PM is iterating the driver tree powering off devices individually.
-
-   * Phase begins: When IOPMrootDomain has received all of its power acknowledgements and begins
-   *        executing IOService::powerDomainWillChangeTo()
-   * Phase ends: When IOPMrootDomain::powerChangeDone begins executing CPU shutoff code.
- */
-    kIOPMTracePointSystemSleepDriversPhase      = 0x14,
-
-/* When kTracePointSystemSleepPlatformPhase is the latest tracePoint,
-    all apps and drivers have notified of sleep. Plotfarm is powering
-    off CPU; or system is asleep; or low level wakeup is underway.
-
-    Note: If a system is asleep and then loses power, and it does not have a hibernate
-        image to restore from (e.g. hibernatemode = 0), then OS X may interpret this power
-        loss as a system crash in the kTracePointSystemSleepPlatformPhase, since the
-        power loss resembles a hang or crash, and the power being removed by the user.
-
-   * Phase begins: IOPMrootDomain has already shut off drivers, and is now powering off CPU.
-   * Phase ends: Immediately after CPU's are powered back on during wakeup.
- */
-    kIOPMTracePointSystemSleepPlatformPhase     = 0x15,
-
-/* When kTracePointSystemWakeDriversPhase is the latest tracePoint,
-    System CPU is powered, PM is notifying drivers of system wake.
-
-   * Phase begins: CPU's have successfully powered up and OS is executing.
-   * Phase ends: All drivers have handled power events & acknowledged completion.
-        IOPMrootDomain is about to deliver kIOMessageSystemHasPoweredOn.
- */
-    kIOPMTracePointSystemWakeDriversPhase       = 0x21,
-
-/* When kTracePointSystemWakeAppsPhase is the latest tracePoint,
-   System CPU is powered, PM has powered on each driver.
-
-   * Phase begins: IOPMrootDomain::tellChangeUp before sending asynchronous 
-        kIOMessageSystemHasPoweredOn notifications
-   * Phase ends: IOPMrootDomain::tellChangeUp after sending asynchronous notifications
- */
-    kIOPMTracePointSystemWakeAppsPhase          = 0x22,
-
-/* kIOPMTracePointSystemLoginwindowPhase
-    This phase represents a several minute window after the system has powered on.
-    Higher levels of system diagnostics are in a heightened state of alert in this phase,
-    in case any user errors occurred that we could not detect in software.
-    
-    This several minute window  
-
-   * Phase begins: After IOPMrootDomain sends kIOMessageSystemHasPoweredOn message.
-   * Phase ends: When loginwindow calls IOPMSleepWakeSetUUID(NULL) the system shall 
-        be considered awake and usable. The next phase shall be kIOPMTracePointSystemUp.
- */
-    kIOPMTracePointSystemLoginwindowPhase       = 0x30 
-};
-
-/*****************************************************************************/
-
-/*
-Ê* kIOPMLoginWindowSecurityDebugKey - identifies PM debug data specific to LoginWindow
- *  for use with IOPMrootDomain.
-Ê*/
-#define kIOPMLoginWindowSecurityDebugKey        "LoginWindowSecurity"
-
-// For PM internal use only - key to locate sleep failure results within SCDynamicStore.
-#define kIOPMDynamicStoreSleepFailureKey        "SleepFailure"
-
-/*****************************************************************************/
-
-// For IOPMLibPrivate.h
-#define kIOPMSleepWakeFailureKey            "PMFailurePhase"
-#define kIOPMSleepWakeFailureCodeKey        "PMStatusCode"
-#define kIOPMSleepWakeFailureLoginKey       "LWFailurePhase"
-#define kIOPMSleepWakeFailureUUIDKey        "UUID"
-#define kIOPMSleepWakeFailureDateKey        "Date"
-
-#endif /* ! _IOKIT_IOPMPRIVATE_H */
-
diff --git a/i386/include/IOKit/pwr_mgt/IOPMpowerState.h b/i386/include/IOKit/pwr_mgt/IOPMpowerState.h
deleted file mode 100644
index f7f4c8a..0000000
--- a/i386/include/IOKit/pwr_mgt/IOPMpowerState.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#include <IOKit/pwr_mgt/IOPM.h>
-
-/*! @header IOPMpowerState.h
-    @abstract Defines the struct IOPMPowerState that power managed drivers should use to describe their power states.
-*/
-
-/*! @struct IOPMPowerState
-    @abstract Describes a device's power state.
-    @discussion To take part in system power management, drivers should define an array of 2 or more power states and pass it to kernel power management through IOService::registerPowerDriver.
-    @field version Defines version number of this struct. Just use the value "1" when defining an IOPMPowerState.
-    @field	capabilityFlags Describes the capability of the device in this state.
-    @field	outputPowerCharacter Describes the power provided in this state.
-    @field	inputPowerRequirement Describes the input power required in this state.
-    @field	staticPower Describes average consumption in milliwatts. Unused; drivers may specify 0.
-    @field	unbudgetedPower Describes additional consumption from separate power supply (milliWatts). Unused; drivers may specify 0.
-    @field	powerToAttain Describes dditional power to attain this state from next lower state (in milliWatts). Unused; drivers may specify 0.
-    @field	timeToAttain Describes time required to enter this state from next lower state (in microseconds). Unused; drivers may specify 0.
-    @field	settleUpTime Describes settle time required after entering this state from next lower state (microseconds). Unused; drivers may specify 0.
-    @field timeToLower Describes time required to enter next lower state from this one (microseconds). Unused; drivers may specify 0.
-    @field	settleDownTime Settle time required after entering next lower state from this state (microseconds). Unused; drivers may specify 0.
-    @field	powerDomainBudget Describes power in milliWatts a domain in this state can deliver to its children. Unused; drivers may specify 0.
-}
-*/
-
-struct IOPMPowerState
-{
-    unsigned long	version;
-    IOPMPowerFlags	capabilityFlags;
-    IOPMPowerFlags	outputPowerCharacter;
-    IOPMPowerFlags	inputPowerRequirement;
-    unsigned long	staticPower;
-    unsigned long	unbudgetedPower;
-    unsigned long	powerToAttain;
-    unsigned long	timeToAttain;
-    unsigned long	settleUpTime;
-    unsigned long	timeToLower;
-    unsigned long	settleDownTime;
-    unsigned long	powerDomainBudget;
-};
-
-typedef struct IOPMPowerState IOPMPowerState;
-
-enum {
-    kIOPMPowerStateVersion1 = 1
-};
diff --git a/i386/include/IOKit/pwr_mgt/IOPowerConnection.h b/i386/include/IOKit/pwr_mgt/IOPowerConnection.h
deleted file mode 100644
index 179035b..0000000
--- a/i386/include/IOKit/pwr_mgt/IOPowerConnection.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOPOWERCONNECTION_H
-#define _IOKIT_IOPOWERCONNECTION_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/pwr_mgt/IOPM.h>
-
-class IOPowerConnection : public IOService
-{
-    OSDeclareDefaultStructors(IOPowerConnection)
-
-protected:
-    /*! @field parentKnowsState	true: parent knows state of its domain
-					used by child */
-    bool		stateKnown;
-    /*! @field currentPowerFlags	power flags which describe  the current state of the power domain
-					used by child */
-    IOPMPowerFlags 	currentPowerFlags;
-    /*! @field desiredDomainState	state number which corresponds to the child's desire
-					used by parent */
-    unsigned long	desiredDomainState;
-
-    /*! @field requestFlag		set to true when desiredDomainState is set */
-    bool		requestFlag;
-
-    /*! @field preventIdleSleepFlag	true if child has this bit set in its desired state
-					used by parent */
-    unsigned long	preventIdleSleepFlag;
-
-    /*! @field preventSystemSleepFlag	true if child has this bit set in its desired state
-					used by parent */
-    unsigned long	preventSystemSleepFlag;
-
-    /*! @field awaitingAck		true if child has not yet acked our notification
-					used by parent */
-    bool		awaitingAck;
-
-    /*! @field readyFlag		true if the child has been added as a power child
-					used by parent */
-	bool		readyFlag;
-
-public:
-        /*! @function setParentKnowsState
-            @abstract Sets the stateKnown variable.
-            @discussion Called by the parent when the object is created and called by the child when it discovers that the parent now knows its state. */
-    void setParentKnowsState (bool );
-
-    /*! @function setParentCurrentPowerFlags
-        @abstract Sets the currentPowerFlags variable.
-        @discussion Called by the parent when the object is created and called by the child when it discovers that the parent state is changing. */
-    void setParentCurrentPowerFlags (IOPMPowerFlags );
-
-    /*! @function parentKnowsState
-        @abstract Returns the stateKnown variable. */
-    bool parentKnowsState (void );
-
-    /*! @function parentCurrentPowerFlags
-        @abstract Returns the currentPowerFlags variable. */
-    IOPMPowerFlags parentCurrentPowerFlags (void );
-
-    /*! @function setDesiredDomainState
-        @abstract Sets the desiredDomainState variable.
-        @discussion Called by the parent. */
-    void setDesiredDomainState (unsigned long );
-
-    /*! @function getDesiredDomainState
-        @abstract Returns the desiredDomainState variable.
-    @discussion Called by the parent. */
-    unsigned long getDesiredDomainState ( void );
-
-    /*! @function setChildHasRequestedPower
-        @abstract Set the flag that says that the child has called requestPowerDomainState.
-    @discussion Called by the parent. */
-    void setChildHasRequestedPower ( void );
-
-
-    /*! @function childHasRequestedPower
-        @abstract Return the flag that says whether the child has called requestPowerDomainState.
-    @discussion Called by the PCI Aux Power Supply Driver to see if a device driver
-        is power managed. */
-    bool childHasRequestedPower ( void );
-    
-    /*! @function setPreventIdleSleepFlag
-        @abstract Sets the preventIdleSleepFlag variable.
-        @discussion Called by the parent. */
-    void setPreventIdleSleepFlag (unsigned long );
-
-    /*! @function getPreventIdleSleepFlag
-        @abstract Returns the preventIdleSleepFlag variable.
-    @discussion Called by the parent. */
-    bool getPreventIdleSleepFlag ( void );
-    
-    /*! @function setPreventSystemSleepFlag
-        @abstract Sets the preventSystemSleepFlag variable.
-        @discussion Called by the parent. */
-    void setPreventSystemSleepFlag (unsigned long );
-
-    /*! @function getPreventSystemSleepFlag
-        @abstract Returns the preventSystemSleepFlag variable.
-        @discussion Called by the parent. */
-    bool getPreventSystemSleepFlag ( void );
-    
-    /*! @function setAwaitingAck
-        @abstract Sets the awaitingAck variable.
-        @discussion Called by the parent. */
-    void setAwaitingAck ( bool );
-
-    /*! @function getAwaitingAck
-        @abstract Returns the awaitingAck variable.
-        @discussion Called by the parent. */
-    bool getAwaitingAck ( void );
-
-    /*! @function setReadyFlag
-        @abstract Sets the readyFlag variable.
-        @discussion Called by the parent. */
-	void setReadyFlag( bool flag );
-
-    /*! @function getReadyFlag
-        @abstract Returns the readyFlag variable.
-        @discussion Called by the parent. */
-	bool getReadyFlag( void ) const;
-};
-
-#endif /* ! _IOKIT_IOPOWERCONNECTION_H */
-
diff --git a/i386/include/IOKit/pwr_mgt/RootDomain.h b/i386/include/IOKit/pwr_mgt/RootDomain.h
deleted file mode 100644
index 6f4ebee..0000000
--- a/i386/include/IOKit/pwr_mgt/RootDomain.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOKIT_ROOTDOMAIN_H
-#define _IOKIT_ROOTDOMAIN_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/pwr_mgt/IOPM.h>
-#include "IOKit/pwr_mgt/IOPMPrivate.h"
-
-
-class IOPMPowerStateQueue;
-class RootDomainUserClient;
-class PMTraceWorker;
-
-/*
- * Flags for get/setSleepSupported()
- */
-enum {
-    kRootDomainSleepNotSupported	= 0x00000000,
-    kRootDomainSleepSupported 		= 0x00000001,
-    kFrameBufferDeepSleepSupported	= 0x00000002,
-    kPCICantSleep                   = 0x00000004
-};
-
-/* 
- *IOPMrootDomain registry property keys
- */
-#define kRootDomainSupportedFeatures        "Supported Features"
-#define kRootDomainSleepReasonKey           "Last Sleep Reason"
-#define kRootDomainSleepOptionsKey          "Last Sleep Options"
-#define kIOPMRootDomainWakeReasonKey        "Wake Reason"
-#define kIOPMRootDomainWakeTypeKey          "Wake Type"
-#define kIOPMRootDomainPowerStatusKey       "Power Status"
-
-/*
- * Possible sleep reasons found under kRootDomainSleepReasonsKey
- */
-#define kIOPMClamshellSleepKey              "Clamshell Sleep"
-#define kIOPMPowerButtonSleepKey            "Power Button Sleep"
-#define kIOPMSoftwareSleepKey               "Software Sleep"
-#define kIOPMOSSwitchHibernationKey         "OS Switch Sleep"
-#define kIOPMIdleSleepKey                   "Idle Sleep"
-#define kIOPMLowPowerSleepKey               "Low Power Sleep"
-#define kIOPMThermalEmergencySleepKey       "Thermal Emergency Sleep"
-#define kIOPMMaintenanceSleepKey            "Maintenance Sleep"
-
-/*
- * String constants for communication with PM CPU
- */
-#define kIOPMRootDomainLidCloseCString      "LidClose"
-#define kIOPMRootDomainBatPowerCString      "BatPower"
-
-/*
- * Supported Feature bitfields for IOPMrootDomain::publishFeature()
- */
-enum {
-    kIOPMSupportedOnAC      = (1<<0),
-    kIOPMSupportedOnBatt    = (1<<1),
-    kIOPMSupportedOnUPS     = (1<<2)
-};
-
-typedef IOReturn (*IOPMSettingControllerCallback)
-                    (OSObject *target, const OSSymbol *type,
-                     OSObject *val, uintptr_t refcon);
-
-__BEGIN_DECLS
-IONotifier *    registerSleepWakeInterest(
-                    IOServiceInterestHandler, void *, void * = 0);
-               
-IONotifier *    registerPrioritySleepWakeInterest(
-                    IOServiceInterestHandler handler, 
-                    void * self, void * ref = 0);
-
-IOReturn        acknowledgeSleepWakeNotification(void * );
-
-IOReturn        vetoSleepWakeNotification(void * PMrefcon);
-__END_DECLS
-
-#define IOPM_ROOTDOMAIN_REV		2
-
-class IOPMrootDomain: public IOService
-{
-    OSDeclareFinalStructors(IOPMrootDomain)
-
-public:
-    static IOPMrootDomain * construct( void );
-
-    virtual bool        start( IOService * provider );
-    virtual IOReturn    setAggressiveness( unsigned long, unsigned long );
-    virtual IOReturn    getAggressiveness( unsigned long, unsigned long * );
-
-    virtual IOReturn    sleepSystem( void );
-    IOReturn            sleepSystemOptions( OSDictionary *options );
-
-    virtual IOReturn    setProperties( OSObject * );
-
-/*! @function systemPowerEventOccurred
-    @abstract Other drivers may inform IOPMrootDomain of system PM events
-    @discussion systemPowerEventOccurred is a richer alternative to receivePowerNotification()
-        Only Apple-owned kexts should have reason to call systemPowerEventOccurred.
-    @param event An OSSymbol describing the type of power event.
-    @param value A 32-bit integer value associated with the event.
-    @param shouldUpdate indicates whether the root domain should send a notification
-        to interested parties. Pass false if you're calling systemPowerEventOccurred
-        several times in succession; and pass true only on the last invocatino.
-    @result kIOReturnSuccess on success */
-
-    IOReturn            systemPowerEventOccurred(
-                                    const OSSymbol *event, 
-                                    uint32_t intValue );
-
-    IOReturn            systemPowerEventOccurred(
-                                    const OSSymbol *event, 
-                                    OSObject *value );
-
-    virtual IOReturn    receivePowerNotification( UInt32 msg );
-
-    virtual void        setSleepSupported( IOOptionBits flags );
-
-    virtual IOOptionBits getSleepSupported( void );
-
-    void                wakeFromDoze( void );
-
-    // KEXT driver announces support of power management feature
-
-    void                publishFeature( const char *feature );
-    
-    // KEXT driver announces support of power management feature
-    // And specifies power sources with kIOPMSupportedOn{AC/Batt/UPS} bitfield.
-    // Returns a unique uint32_t identifier for later removing support for this
-    // feature. 
-    // NULL is acceptable for uniqueFeatureID for kexts without plans to unload.
-
-    void                publishFeature( const char *feature, 
-                                        uint32_t supportedWhere,
-                                        uint32_t *uniqueFeatureID);
-
-    // KEXT driver announces removal of a previously published power management 
-    // feature. Pass 'uniqueFeatureID' returned from publishFeature()
-
-    IOReturn            removePublishedFeature( uint32_t removeFeatureID );
-
-/*! @function copyPMSetting
-    @abstract Copy the current value for a PM setting. Returns an OSNumber or
-        OSData depending on the setting.
-    @param whichSetting Name of the desired setting.
-    @result OSObject value if valid, NULL otherwise. */
-
-    OSObject *          copyPMSetting( OSSymbol *whichSetting );
-
-/*! @function registerPMSettingController
-    @abstract Register for callbacks on changes to certain PM settings.
-    @param settings NULL terminated array of C strings, each string for a PM 
-        setting that the caller is interested in and wants to get callbacks for. 
-    @param callout C function ptr or member function cast as such.
-    @param target The target of the callback, usually 'this'
-    @param refcon Will be passed to caller in callback; for caller's use.
-    @param handle Caller should keep the OSObject * returned here. If non-NULL,
-        handle will have a retain count of 1 on return. To deregister, pass to
-        unregisterPMSettingController()
-    @result kIOReturnSuccess on success. */
-
-    IOReturn            registerPMSettingController(
-                                 const OSSymbol *settings[],
-                                 IOPMSettingControllerCallback callout,
-                                 OSObject   *target,
-                                 uintptr_t  refcon,
-                                 OSObject   **handle);    // out param
-
-/*! @function registerPMSettingController
-    @abstract Register for callbacks on changes to certain PM settings.
-    @param settings NULL terminated array of C strings, each string for a PM 
-        setting that the caller is interested in and wants to get callbacks for. 
-    @param supportedPowerSources bitfield indicating which power sources these
-        settings are supported for (kIOPMSupportedOnAC, etc.)
-    @param callout C function ptr or member function cast as such.
-    @param target The target of the callback, usually 'this'
-    @param refcon Will be passed to caller in callback; for caller's use.
-    @param handle Caller should keep the OSObject * returned here. If non-NULL,
-        handle will have a retain count of 1 on return. To deregister, pass to
-        unregisterPMSettingController()
-    @result kIOReturnSuccess on success. */
-
-    IOReturn            registerPMSettingController(
-                                 const OSSymbol *settings[],
-                                 uint32_t   supportedPowerSources,
-                                 IOPMSettingControllerCallback callout,
-                                 OSObject   *target,
-                                 uintptr_t  refcon,
-                                 OSObject   **handle);    // out param
-
-    virtual IONotifier * registerInterest(
-                                const OSSymbol * typeOfInterest,
-                                IOServiceInterestHandler handler,
-                                void * target, void * ref = 0 );
-                                
-    void                pmStatsRecordEvent(
-                                int             eventIndex,
-                                AbsoluteTime    timestamp);
-
-    void                pmStatsRecordApplicationResponse(
-                            const OSSymbol		*response,
-                            const char 		    *name,
-                            int                 messageType,
-                            uint32_t			delay_ms,
-                            int     			app_pid);
-
-    virtual IOReturn    callPlatformFunction(
-                                const OSSymbol *functionName,
-                                bool waitForFunction,
-                                void *param1, void *param2,
-                                void *param3, void *param4 );
-
-private:
-    virtual IOReturn    changePowerStateTo( unsigned long ordinal );
-    virtual IOReturn    changePowerStateToPriv( unsigned long ordinal );
-    virtual IOReturn    requestPowerDomainState( IOPMPowerFlags, IOPowerConnection *, unsigned long );
-    virtual void        powerChangeDone( unsigned long );
-    virtual bool        tellChangeDown( unsigned long );
-    virtual bool        askChangeDown( unsigned long );
-    virtual void        tellChangeUp( unsigned long );
-    virtual void        tellNoChangeDown( unsigned long );
-};
-
-
-#endif /* _IOKIT_ROOTDOMAIN_H */
diff --git a/i386/include/IOKit/rtc/.svn/all-wcprops b/i386/include/IOKit/rtc/.svn/all-wcprops
deleted file mode 100644
index b3140e1..0000000
--- a/i386/include/IOKit/rtc/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 56
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/rtc
-END
-IORTCController.h
-K 25
-svn:wc:ra_dav:version-url
-V 74
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/rtc/IORTCController.h
-END
diff --git a/i386/include/IOKit/rtc/.svn/entries b/i386/include/IOKit/rtc/.svn/entries
deleted file mode 100644
index 73fa41a..0000000
--- a/i386/include/IOKit/rtc/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/rtc
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IORTCController.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-44a0b2efb5c45175a1ba6782cedb471c
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1708
-
diff --git a/i386/include/IOKit/rtc/.svn/text-base/IORTCController.h.svn-base b/i386/include/IOKit/rtc/.svn/text-base/IORTCController.h.svn-base
deleted file mode 100644
index eaf681d..0000000
--- a/i386/include/IOKit/rtc/.svn/text-base/IORTCController.h.svn-base
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * 24 Nov  1998 suurballe  Created.
- */
-
-#include <IOKit/IOService.h>
-
-typedef void (*RTC_tick_handler)( IOService * );
-
-
-class IORTCController: public IOService
-{
-OSDeclareAbstractStructors(IORTCController)
-
-public:
-
-virtual IOReturn getRealTimeClock ( UInt8 * currentTime, IOByteCount * length ) = 0;
-virtual IOReturn setRealTimeClock ( UInt8 * newTime ) = 0;
-};
-
diff --git a/i386/include/IOKit/rtc/IORTCController.h b/i386/include/IOKit/rtc/IORTCController.h
deleted file mode 100644
index eaf681d..0000000
--- a/i386/include/IOKit/rtc/IORTCController.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * 24 Nov  1998 suurballe  Created.
- */
-
-#include <IOKit/IOService.h>
-
-typedef void (*RTC_tick_handler)( IOService * );
-
-
-class IORTCController: public IOService
-{
-OSDeclareAbstractStructors(IORTCController)
-
-public:
-
-virtual IOReturn getRealTimeClock ( UInt8 * currentTime, IOByteCount * length ) = 0;
-virtual IOReturn setRealTimeClock ( UInt8 * newTime ) = 0;
-};
-
diff --git a/i386/include/IOKit/sbp2/.svn/all-wcprops b/i386/include/IOKit/sbp2/.svn/all-wcprops
deleted file mode 100644
index 8860e60..0000000
--- a/i386/include/IOKit/sbp2/.svn/all-wcprops
+++ /dev/null
@@ -1,59 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 57
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2
-END
-IOFireWireSBP2UserClient.h
-K 25
-svn:wc:ra_dav:version-url
-V 84
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2UserClient.h
-END
-IOFireWireSBP2LUN.h
-K 25
-svn:wc:ra_dav:version-url
-V 77
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h
-END
-IOFireWireSBP2ManagementORB.h
-K 25
-svn:wc:ra_dav:version-url
-V 87
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2ManagementORB.h
-END
-IOFireWireSerialBusProtocolTransport.h
-K 25
-svn:wc:ra_dav:version-url
-V 96
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSerialBusProtocolTransport.h
-END
-IOFireWireSBP2LSIWorkaroundDescriptor.h
-K 25
-svn:wc:ra_dav:version-url
-V 97
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2LSIWorkaroundDescriptor.h
-END
-IOFireWireSBP2ORB.h
-K 25
-svn:wc:ra_dav:version-url
-V 77
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h
-END
-IOFireWireSBP2Target.h
-K 25
-svn:wc:ra_dav:version-url
-V 80
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2Target.h
-END
-IOFireWireSBP2UserClientCommon.h
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2UserClientCommon.h
-END
-IOFireWireSBP2Login.h
-K 25
-svn:wc:ra_dav:version-url
-V 79
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/sbp2/IOFireWireSBP2Login.h
-END
diff --git a/i386/include/IOKit/sbp2/.svn/entries b/i386/include/IOKit/sbp2/.svn/entries
deleted file mode 100644
index 57b7f83..0000000
--- a/i386/include/IOKit/sbp2/.svn/entries
+++ /dev/null
@@ -1,334 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/sbp2
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IOFireWireSBP2UserClient.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-abe67641efef3cf326ce18b1de817d57
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8267
-
-IOFireWireSBP2LUN.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-8fab521ac7af386c7d2772a0f69444b3
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10404
-
-IOFireWireSBP2ManagementORB.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-df7f1948a7790ed3d08f53f0426095f2
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11075
-
-IOFireWireSerialBusProtocolTransport.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-6e7bdeac9a9690b47e47421abda8d3c1
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-14111
-
-IOFireWireSBP2LSIWorkaroundDescriptor.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-8c4d66f15c56537e975892bec0dd721b
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12217
-
-IOFireWireSBP2ORB.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-387c5f66e2949189fc62b07fc183c7c3
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-21217
-
-IOFireWireSBP2Target.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-e7cdf79c998d9b81359b7c6adc3b1881
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7550
-
-IOFireWireSBP2UserClientCommon.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-96d96ad9f1106c7237f0485867e3f509
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4524
-
-IOFireWireSBP2Login.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-b78759007f3ff7e9e66d595d31ac6cf8
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-41499
-
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LSIWorkaroundDescriptor.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LSIWorkaroundDescriptor.h.svn-base
deleted file mode 100644
index 178ef00..0000000
--- a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LSIWorkaroundDescriptor.h.svn-base
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#if __ppc__
-
-/*!
-  @header IOFireWireSBP2LSIWorkaroundDescriptor
-  Contains the class definition for IOFireWireSBP2LSIWorkaroundDescriptor.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2LSIWORKAROUNDDESCRIPTOR_H
-#define _IOKIT_IOFIREWIRESBP2LSIWORKAROUNDDESCRIPTOR_H
-
-#include <IOKit/IOMemoryDescriptor.h>
-
-class IOFireWireSBP2LSIRange;
-
-/*!
-    @class IOFireWireSBP2LSIWorkaroundDescriptor
-    @abstract This is a subclass of IOGeneralMemoryDescriptor. It is designed to work around
-    a hardware problem in a common SBP2 target.  It takes a memory descriptor as
-	an argument.  It retains this descriptor and returns a new one with resegmented
-	physical segments and potentially some "unfixable" segments double buffered.
-
-    If the transfer will cause data to be sent from the Mac, syncBuffersForOutput
-    must be called before the transfer.
-    
-    If the transfer will cause data to be recieve by the Mac, syncBuffersForInput
-    must be called after the transfer.
-
-    This class calculates the new segmentation only once when it is created.
-    Any changes to the structure of the original memory descriptor will render
-    this one useless.  It must be released and a new IOFireWireSBP2LSIWorkaroundDescriptor
-    can be created.
-    
-    LSI Bridge Workaround Algorithm Details
-    
-    Goals:
-    1. Avoid LSI Logic "< 16 byte" bug - prevent any data packet smaller than 16 bytes
-    2. Minimize double-buffering
-    3. Support non-multiple-of-512-byte devices, e.g. CD Audio
-    
-    Solution:
-    Write a page table such that the bridge will nor use packets smaller than 16 bytes.
-    In other words, rearrange the memory descriptor to avoid the bug, and do it such
-    that the SBP-2 layer will not break up a segment (du ro the 64k-1 limit) and
-    re-introduces the problem
-
-    SBP-2 defines the kFWSBP2MaxPageClusterSize constant.   We simply make sure
-    none of our segments are larger than this size and SBP-2 will not break them
-    up when it writes the SBP-2 page table.
-    
-    Notes:
-    - Some double buffering is unavoidable.  Discontiguous pages may yield page
-    fragments at the start or end of the buffer (or both, with non-512x buffers).
-    solution uses less than 33 bytes of double-buffer per segment in original
-    memory descriptor.
-    - If driver must break up IO to meet ATA limit of 255 (250?) blocks, assume
-    the driver does this at a higher level (before applying workaround).
-    - It is expected that the original memory descriptor has been prepared (wired)
-*/
-
-class IOFireWireSBP2LSIWorkaroundDescriptor : public IOGeneralMemoryDescriptor
-{
-	OSDeclareDefaultStructors(IOFireWireSBP2LSIWorkaroundDescriptor)
-
-	friend class IOFireWireSBP2LSIRange;
-
-protected:
-
-    // reserved for future use
-    struct ExpansionData { };
-    ExpansionData *reserved; 
-    
-	bool	fFixedCapacity; 	// for both allocators
-	
-	//////////////////////////////////////
-	// for range allocator
-
-	OSArray *				fPermanentRanges;
-	UInt32					fAllocatedRangesCount;
-
-	virtual IOReturn rangeAllocatorInitialize( UInt32 rangeCount );
-	virtual void rangeAllocatorDeallocateAllRanges( void );
-	virtual IOFireWireSBP2LSIRange * rangeAllocatorNewRange( void );
-	virtual void rangeAllocatorFree( void );
-
-	//////////////////////////////////////
-	// for buffer allocator
-	
-	OSArray *				fBufferDescriptors;
-	UInt32					fPermanentPages;
-	IOByteCount				fAllocatedBytesCount;
-
-	virtual IOReturn bufferAllocatorInitialize( IOByteCount requestedBufferSize );
-	virtual void bufferAllocatorDeallocateAllBuffers( void );
-	virtual void * bufferAllocatorNewBuffer( IOPhysicalAddress * address );
-	virtual void bufferAllocatorFree( void );
-
-	//////////////////////////////////////
-	// for range table allocator
-	
-	IOPhysicalRange * 		fRangeTable;
-	IOByteCount				fRangeTableSize;
-
-	virtual IOReturn rangeTableAllocatorInitialize( UInt32 requestedBufferSize );
-	virtual IOPhysicalRange * rangeTableAllocatorNewTable( UInt32 entries );
-	virtual void rangeTableAllocatorFree( void );
-
-	//////////////////////////////////////
-	// for workaround
-
-	IOMemoryDescriptor * 	fOriginalDesc;	
-	OSArray *				fRanges;	
-	IOByteCount 			fOffset;
-	IOByteCount				fLength;
-	IODirection				fDirection;
-	
-						  
-	virtual bool initWithCapacity
-					( UInt32 permanentRanges, IOByteCount permanentBufferSpace, bool fixedCapacity );
-
-	virtual void free();
-	
-	virtual IOReturn resetToInitialCapacity( void );
-	virtual IOReturn initializeRangesArray( void );
-	virtual IOReturn recalculateSmallSegments( void );
-	virtual IOReturn splitLargeSegments( void );
-	virtual IOReturn resegmentOddLengthSegments( void );
-	virtual IOReturn initializeBuffers( void );
-
-	virtual bool initWithAddress( void *      address,       /* not supported */
-                                  IOByteCount withLength,
-                                  IODirection withDirection );
-
-    virtual bool initWithAddress( vm_address_t address,      /* not supported */
-                                  IOByteCount  withLength,
-                                  IODirection  withDirection,
-                                  task_t       withTask );
-
-    virtual bool initWithPhysicalAddress( 
-                                  IOPhysicalAddress address, /* not supported */
-                                  IOByteCount       withLength,
-                                  IODirection       withDirection );
-
-    virtual bool initWithPhysicalRanges( 
-                                  IOPhysicalRange * ranges,  /* not supported */
-                                  UInt32            withCount,
-                                  IODirection       withDirection,
-                                  bool              asReference = false );
-
-    virtual bool initWithRanges(  IOVirtualRange * ranges,   /* not supported */
-                                  UInt32           withCount,
-                                  IODirection      withDirection,
-                                  task_t           withTask,
-                                  bool             asReference = false );
-
-public:
-	
-	// static factory methods and intializers 
-	
-	//
-	// create a new instance
-	//
-	
-	
-    /*!
-		@function withDescriptor
-		@abstract Creates a new IOFireWireSBP2LSIWorkaroundDescriptor.
-		@discussion	Create a IOFireWireSBP2LSIWorkaroundDescriptor with no permanent capacity then 
-        inits it the given descriptor. This is basicly a short cut for calling 
-        withCapacity( 0, 0, false) and the initWithDescriptor()
-        @param desc Original memory descriptor.
-        @param offset Offset of data to "fix" in bytes from beginning of descriptor.
-        @param len Length of data in bytes to "fix"
-        @param direction IODirection of data transfer.
-        @result Returns a new IOFireWireSBP2LSIWorkaroundDescriptor if successful.
-	*/
-    
-	static IOFireWireSBP2LSIWorkaroundDescriptor * withDescriptor
-					( IOMemoryDescriptor * desc, IOByteCount offset = 0,  
-					  IOByteCount len = 0, IODirection direction = kIODirectionOutIn );
-	
-	// initialize with descriptor				  
-	
-    /*!
-		@function initWithDescriptor
-		@abstract Initialize an IOFireWireSBP2LSIWorkaroundDescriptor with the given descriptor.
-		@discussion	Initialize the workaround descriptor with the given descriptor. 
-        @param desc Original memory descriptor.
-        @param offset Offset of data to "fix" in bytes from beginning of descriptor.
-        @param len Length of data in bytes to "fix"
-        @param direction IODirection of data transfer.
-        @result Returns true if the initialization was successful.
-	*/
-    
-    virtual bool initWithDescriptor( IOMemoryDescriptor * desc, IOByteCount offset = 0,  
-								     IOByteCount len = 0, IODirection direction = kIODirectionOutIn );
-	
-	
-	///////////////////////////////////
-	
-    
-    /*!
-		@function withCapacity
-		@abstract Create a new descriptor with possibly a permanent capacity.
-		@discussion	Create and IOFireWireSBP2LSIWorkaroundDescriptor with a permanent fixed capacity. 
-        You should call initWithDescriptor afterward. permanentRanges is number of ranges to keep 
-        permanently allocated for use by the algorithm.  If fixedCapacity is false additional ranges 
-        may be allocated and deallocated dyanmicly if needed. The algorithm may require more or less 
-        ranges than either the original descriptor or the final fixed may decriptor contain.
-        permanentBufferSpace is the number of bytes of permanent buffer to keep arround. If fixedCapacity 
-        is false additional buffer space may be allocated and deallocated dynamically. permanentBufferSpace 
-        should generally be set to 32 * maximum number of ranges. fixedCapacity is a flag indicating 
-        whether dynamic allocations are allowed. When making decisions about the maximum amount of 
-        buffer space to keep around, it should be noted tha the maximum number of ranges maybe different 
-        from permanentRanges if fixedCapcity is false.
-        @param permanentRanges Count of permanent ranges.
-        @param permanentBufferSpace Byte count of permanent buffers.
-        @param fixedCapacity bool indicating if dynamic allocations can be made.
-        @result Returns true if the initialization was successful.
-	*/
-    
-	static IOFireWireSBP2LSIWorkaroundDescriptor * withCapacity
-						( UInt32 permanentRanges, IOByteCount permanentBufferSpace, bool fixedCapacity );
-
-
-	///////////////////////////////////
-
-	//
-	// manipulate buffers for IO
-	//
-
-    /*!
-		@function syncBuffersForOutput
-		@abstract Synchronize the buffers for output.
-		@discussion	Since double buffering may be invovled in the workaround.  The driver needs to 
-        indicate when these buffers should be syncronized with the original descriptor.  For data 
-        that will be output syncBuffersForOutput should be called before submiting the ORB.
-        @result Returns kIOReturnSuccess if sync was successful.
-	*/
-    	
-	virtual IOReturn syncBuffersForOutput( void );  // call before output
-
-    /*!
-		@function syncBuffersForInput
-		@abstract Synchronize the buffers for input.
-		@discussion	Since double buffering may be invovled in the workaround.  The driver needs to 
-        indicate when these buffers should be syncronized with the original descriptor.  For data 
-        that will be input syncBuffersForOutput should be called after receiving completion status 
-        for the ORB.
-        @result Returns kIOReturnSuccess if sync was successful.
-	*/
-    
-    virtual IOReturn syncBuffersForInput( void );	// call after input
-    
-private:
-
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 8);
-    
-};
-
-#endif
-
-#endif
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LUN.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LUN.h.svn-base
deleted file mode 100644
index e6c97de..0000000
--- a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2LUN.h.svn-base
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOFireWireSBP2LUN
-  Contains the class definition for IOFireWireSBP2LUN.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2LUN_H
-#define _IOKIT_IOFIREWIRESBP2LUN_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOCommandGate.h>
-
-#include <IOKit/firewire/IOFireWireUnit.h>
-
-#include <IOKit/sbp2/IOFireWireSBP2Login.h>
-#include <IOKit/sbp2/IOFireWireSBP2ManagementORB.h>
-
-class IOFireWireSBP2Target;
-
-/*!
-    @class IOFireWireSBP2LUN
-    @abstract Provider for most drivers. 
-    @discussion IOFireWireSBP2LUN objects are created by IOFireWireSBP2Target objects.  Each target may have zero or more IOFireWireSBP2LUN children. The LUN object serves as the matching nub for most drivers and therefore will be the provider for most drivers.  It supplies the methods that control the operation of the LUN as a whole.  Methods that control the behavior and execution of an SBP2 login session are supplied in a separate IOFireWireSBP2Login object. The LUN can be used to create one of these login objects.
-    The LUN can also create IOFireWireSBP2ManagementORBs for configuring and appending non-login related management functions.  Login related management functions (ie. Login, Logout, Reconnect) are supplied by the IOFireWireSBP2Login.
-    Finally the LUN can supply a reference to the IOFireWireUnit.  This can be useful if a driver wishes to access the standard FireWire APIs.  
-*/
-
-class IOFireWireSBP2LUN : public IOService
-{
-    OSDeclareDefaultStructors( IOFireWireSBP2LUN );
-
-	friend class IOFireWireSBP2ManagementORB;
-	friend class IOFireWireSBP2Login;
-	friend class IOFireWireSBP2UserClient;
-	
-protected: 
-
-    // reserved for future use
-    struct ExpansionData { };
-    ExpansionData *reserved;
-
-	////////////////////////////////////////////
-	// methods called by friend classes
-
-	// IOFireWireSBP2Login methods
-    virtual void removeLogin( IOFireWireSBP2Login * login );
-	virtual IOFireWireSBP2Target * getTarget( void );
-	
-	// IOFireWireSBP2ManagementORB methods
-	virtual void clearAllTasksInSet( void );  // assumes caller is on workloop
-	virtual void removeManagementORB( IOFireWireSBP2ManagementORB * orb ); 
-	
-	// IOFireWireSBP2UserClient methods
-	virtual void flushAllManagementORBs( void );
-
-public:
-
-	////////////////////////////////////////////
-	// IOService overrides
-
-    /*! @function attach
-        @abstract Attaches an IOService client to a provider in the registry.
-        @discussion See IOService for discussion.
-        @param provider The IOService object which will serve as this objects provider.
-        @result false if the provider is inactive or on a resource failure, otherwise true. 
-    */
-    
-    virtual bool attach( IOService *provider );
-
-	/*! @function handleOpen
-		@abstract Overrideable method to control the open / close behaviour of an IOService.
-		@discussion See IOService for discussion.		
-		@param forClient Designates the client of the provider requesting the open.
-		@param options Options for the open, may be interpreted by the implementor of handleOpen.
-		@result Return true if the open was successful, false otherwise. */
-
-    virtual bool handleOpen(  IOService *	  forClient,
-                              IOOptionBits	  options,
-                              void *		  arg );
-	/*! 
-		@function handleClose
-		@abstract Overrideable method to control the open / close behaviour of an IOService.
-		@discussion See IOService for discussion.
-		@param forClient Designates the client of the provider requesting the close.
-		@param options Options for the close, may be interpreted by the implementor of handleOpen. 
-	*/
-
-    virtual void handleClose(   IOService *		forClient,
-                                IOOptionBits	options );
-    
- 	/*! 
-		@function matchPropertyTable
-		@abstract Implements SBP2 specific matching.
-		@discussion See IOService for discussion.
-	    @param table The dictionary of properties to be matched against.
-		@result Returns false if the family considers the matching dictionary does not match in properties it 			understands, true otherwise.
-	*/
-    	
-	virtual bool matchPropertyTable(OSDictionary * table);
-																	
-protected:
-
-	////////////////////////////////////////////
-	// private fields
-	
-    IOFireWireSBP2Target * 	fProviderTarget;
-    UInt32					fLUNumber;
-    OSSet *					fLoginSet;
-    OSIterator *			fLoginSetIterator;
-	IOCommandGate * 		fGate;
-	OSSet *					fORBSet;
-    OSIterator *			fORBSetIterator;
-	OSObject * 				fDiagnostics;
-	
-	////////////////////////////////////////////
-	// private methods
-	
-	// IOService methods
-    virtual void free( void );
-    virtual IOReturn message( UInt32 type, IOService * provider, void * argument = 0 );
-    
-	// create management orb internals
-	static IOReturn staticCreateManagementORBAction( OSObject *self,
-													 void * refCon,
-													 void * completion, 
-													 void * orb, 
-													 void * );
-	virtual IOReturn createManagementORBAction( void * refCon,
-												FWSBP2ManagementCallback completion, 
-												IOFireWireSBP2ManagementORB ** orb );
-
-	// remove management orb internals
-	static IOReturn staticRemoveManagementORBAction( OSObject * self, void * orb, 
-													void *, void *, void * );
-	virtual IOReturn removeManagementORBAction( IOFireWireSBP2ManagementORB * orb );
-
-	// flush all management orb internals
-	static IOReturn staticExecuteFlushAllMgmtORBs( OSObject * self, void *, 
-													void *, void *, void * );
-	virtual IOReturn executeFlushAllMgmtORBs( void );
-
-	// IOFireWireSBP2ManagementORB friend class wrappers
-    virtual bool initMgmtORBWithLUN( IOFireWireSBP2ManagementORB * orb, IOFireWireSBP2LUN * lun, 
-									 void * refCon, 
-									 FWSBP2ManagementCallback completion );
-									 		
-	// IOFireWireSBP2Login friend class wrappers
-    virtual bool initLoginWithLUN( IOFireWireSBP2Login * login, IOFireWireSBP2LUN * lun );
-	virtual void suspendedNotify( void );
-	virtual void resumeNotify( void );
-		
-private:
-
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 0);
-
-public:
-
-	////////////////////////////////////////////
-    // client methods
-
-	// getters
-	
-    /*!
-		@function getFireWireUnit
-		@abstract Returns an IOFireWireUnit object.
-		@discussion An IOFireWireUnit is the provider of an IOFireWireSBP2Target.  In order to 
-        use the base FireWire services you will need a reference to the unit.  This method 
-        returns that reference.
-		@result Returns a pointer to an IOFireWireUnit.
-	*/
-    
-    virtual IOFireWireUnit * getFireWireUnit( void );
-    
-    /*!
-		@function getLUNumber
-		@abstract Returns the LUNs number.
-		@discussion Each LUN has a number to uniquely identify it on a device.  This method returns 
-        this value in a UInt32.		
-        @result Returns a UInt32 containing the Logical Unit Number.
-	*/
-    
-	virtual UInt32 getLUNumber( void );
-    
-	// factory methods
-    
-    /*!
-		@function createLogin
-		@abstract Creates a new IOFireWireSBP2Login object.
-		@discussion	Creates a new IOFireWireSBP2Login object for the LUN.  Login objects supply most 
-        of the SBP2 APIs related to login maintenance and Normal Command ORB execution.
-        @result Returns a pointer to a new IOFireWireSBP2Login.
-	*/
-
-    virtual IOFireWireSBP2Login *createLogin( void );	
-
-    /*!
-		@function createManagementORB
-		@abstract Creates a new IOFireWireSBP2ManagementORB object.
-		@discussion	Creates a new IOFireWireSBP2ManagementORB object.  Management objects let you 
-        execute commands like QueryLogins, LogicalUnitReset, and AbortTask.  These commands are 
-        configured after they are created here.  When they are done executing (after a call to submit) 
-        the supplied completion routine will be called with the supplied refcon.  Usually this refCon
-        is the "this" pointer of completion method's object.
-        @param refCon The refcon passed to the completion routine.
-        @param completion The completion routine.  Called when the ORB finishes execution.	
-        @result Returns a pointer to a new IOFireWireSBP2Login.
-	*/
-        
-    virtual IOFireWireSBP2ManagementORB * createManagementORB( void * refCon, FWSBP2ManagementCallback completion );
-
-protected:
-
-    static IOReturn staticCreateLogin( OSObject *self, void * login, void *, void *, void * );
-    virtual IOReturn createLoginAction( IOFireWireSBP2Login ** login );
-
-    static IOReturn staticRemoveLoginAction( OSObject *self, void * login, void *, void *, void * );
-    virtual IOReturn removeLoginAction( IOFireWireSBP2Login * login );
-
-public:
-
-    /*!
-		@function getDiagnostics
-		@abstract Debug-only method.
-		@discussion	Returns a reference to the internal diagnostics object when the services are built 
-        in debug mode. Should be a no-op in release builds.
-        @result Returns a pointer to the diagnostics object (if any).
-	*/
-    	
-	virtual OSObject * getDiagnostics( void );
-
-    virtual bool finalize( IOOptionBits options );
-
-protected:
-
-	void terminateNotify( void );
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 8);
-
-};
-
-#endif 
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Login.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Login.h.svn-base
deleted file mode 100644
index 42a838c..0000000
--- a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Login.h.svn-base
+++ /dev/null
@@ -1,1078 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOFireWireSBP2Login
-  Contains the class definition for IOFireWireSBP2Login.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2LOGIN_H
-#define _IOKIT_IOFIREWIRESBP2LOGIN_H
-
-#include <IOKit/IOCommandGate.h>
-
-#include <IOKit/firewire/IOFireWireUnit.h>
-
-#include <IOKit/sbp2/IOFireWireSBP2ORB.h>
-#include <IOKit/sbp2/IOFireWireSBP2Target.h>
-
-// login option flags
-enum
-{
-	kFWSBP2DontSynchronizeMgmtAgent = (1 << 0),
-    kFWSBP2ExclusiveLogin 			= (1 << 5)
-};
-
-// notification events
-enum
-{
-    kFWSBP2NormalCommandStatus	= 6,
-    kFWSBP2NormalCommandTimeout	= 7,
-    kFWSBP2UnsolicitedStatus	= 8,
-    kFWSBP2NormalCommandReset	= 9
-};
-
-#define kIOMessageFWSBP2ReconnectComplete	iokit_fw_err(0x3E8)
-#define kIOMessageFWSBP2ReconnectFailed		iokit_fw_err(0x3E9)
-
-/*! 
-    @typedef FWSBP2LoginResponse
-    @param length Length of login response.
-    @param loginID Unique id representing this login. 
-    @param commandBlockAgentAddressHi High 32 bits of command block agent address.
-    @param commandBlockAgentAddressLo Low 32 bits of command block agent address.
-    @param reserved Reserved.
-    @param reconnectHold Reconnect timeout encoded as 2^reconnectHold seconds.
-*/
-
-typedef struct
-{
-    UInt16		length;
-    UInt16		loginID;
-    UInt32		commandBlockAgentAddressHi;
-    UInt32		commandBlockAgentAddressLo;
-    UInt16		reserved;
-    UInt16		reconnectHold;
-} FWSBP2LoginResponse, *FWSBP2LoginResponsePtr;
-
-/*! 
-    @typedef FWSBP2StatusBlock
-    @param details Src, Resp, D, Len fields of status block format
-    @param sbpStatus SBP2 specific status
-    @param orbOffsetHi High 32 bits of address of orb status is for.
-    @param orbOffsetLo Low 32 bits of address of orb status is for.
-    @param status[6] Up to 48 bytes of additional data. Length is determined by len field.
-*/
-
-typedef struct
-{
-    UInt8		details;
-    UInt8		sbpStatus;
-    UInt16		orbOffsetHi;
-    UInt32		orbOffsetLo;
-    UInt32		status[6];	
-} FWSBP2StatusBlock;
-
-class IOFireWireSBP2LUN;
-class IOFireWireSBP2Login;
-
-// struct sent to login complete handler
-
-/*! 
-    @typedef FWSBP2LoginCompleteParams
-    @param login Pointer to IOFireWireSBP2Login object.
-    @param generation FireWire generation value.
-    @param status Status of login attempt.
-    @param loginResponse Pointer to login response struct.
-    @param statusBlock Pointer to status block buffer.
-    @param statusBlockLength Length of entire status block.
-*/
-
-typedef struct
-{
-    IOFireWireSBP2Login * 	login;			// login object this param is sent from
-    UInt32					generation;		// generation this login was attempted in 
-  
-    IOReturn				status;			// status of login attempt
-	
-    FWSBP2LoginResponsePtr	loginResponse;		// pointer to loginResponse buffer
-    FWSBP2StatusBlock *		statusBlock;		// pointer to statusBlock buffer
-    UInt32					statusBlockLength;	// size of statusBlock buffer
-	
-} FWSBP2LoginCompleteParams, *FWSBP2LoginCompleteParamsPtr;
-
-// struct sent to logout complete handler
-
-/*! 
-    @typedef FWSBP2LogoutCompleteParams
-    @param login Pointer to IOFireWireSBP2Login object.
-    @param generation FireWire generation value.
-    @param status Status of login attempt.
-    @param statusBlock Pointer to status block buffer.
-    @param statusBlockLength Length of entire status block.
-*/
-
-typedef struct
-{
-    IOFireWireSBP2Login * 	login;			// login object this param is sent from
-    UInt32					generation;		// generation this login was attempted in
-
-    IOReturn				status;			// status of login attempt
-	
-    FWSBP2StatusBlock *		statusBlock;		// pointer to statusBlock buffer
-    UInt32					statusBlockLength;	// size of statusBlock buffer
-	
-} FWSBP2LogoutCompleteParams, *FWSBP2LogoutCompleteParamsPtr;
-
-// struct sent with reconnect notification
-
-/*! 
-    @typedef FWSBP2LogoutCompleteParams
-    @param login Pointer to IOFireWireSBP2Login object.
-    @param generation FireWire generation value.
-    @param status Status of login attempt.
-    @param reconnectStatusBlock Pointer to status block buffer.
-    @param reconnectStatusBlockLength Length of entire status block.
-*/
-
-typedef struct
-{
-    IOFireWireSBP2Login * 	login;			// login object this param is sent from
-    UInt32					generation;		// generation this login was attempted in
-
-    IOReturn			status;			// status of reconnect attempt
-
-    void *			reconnectStatusBlock;		// pointer to statusBlock buffer
-    UInt32			reconnectStatusBlockLength;	// size of statusBlock buffer
-} FWSBP2ReconnectParams, *FWSBP2ReconnectParamsPtr;
-
-// Callback when login and logout commands complete asynchronously
-
-/*! 
-    @typedef FWSBP2LoginCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param params Structure containing additional information about the status of the login. 
-*/
-    
-typedef void (*FWSBP2LoginCallback)(void * refCon, FWSBP2LoginCompleteParamsPtr params);
-
-/*! 
-    @typedef FWSBP2LogoutCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param params Structure containing additional information about the status of the logout. 
-*/
-
-typedef void (*FWSBP2LogoutCallback)(void * refCon, FWSBP2LogoutCompleteParamsPtr params);
-
-/*! 
-    @typedef FWSBP2StatusCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param status Indicates success or failure of operation. 
-*/
-
-typedef void (*FWSBP2StatusCallback)(void * refCon, IOReturn status);
-
-/*! 
-    @typedef FWSBP2FetchAgentWriteCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param status Indicates success or failure of operation. 
-    @param orb Indicates current last orb in chain.
-*/
-
-typedef void (*FWSBP2FetchAgentWriteCallback)(void * refCon, IOReturn status, IOFireWireSBP2ORB * orb);
-
-/*! 
-    @typedef FWSBP2NotifyParams
-    @param notificationEvent Type of event we are being notified of.
-    @param message buffer containing message.
-    @param length length of message field.
-    @param generation FireWire generation value.
-*/
-
-typedef struct
-{
-    void *				commandObject;
-    UInt32 				notificationEvent;
-    const void * 		message;
-    UInt32				length;
-    UInt32				generation;
-} FWSBP2NotifyParams, *FWSBP2NotifyParamsPtr;
-
-
-/*! 
-    @typedef FWSBP2NotifyCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param params FWSBP2NotifyParams containing notification information.
-*/
-
-typedef void (*FWSBP2NotifyCallback)(void * refCon, FWSBP2NotifyParamsPtr params);
-
-/*!
-    @class IOFireWireSBP2Login
-    @abstract Supplies the login maintenance and Normal Command ORB execution portions of the API.
-    @discussion Supplies APIs for login maintenance and command execution.  Drivers can use this 
-    object to create IOFireWireSBP2ORB objects and execute them.  Solicited and unsolicited status 
-    callback routines can be registered and the SBP2 services will notify the driver when the 
-    appropriate status arrives.
-    This class also handles login maintenance.  Supplies APIs for logging in and logging out and 
-    attempts to reconnect to the LUN after bus resets.  The base FireWire services deliver bus 
-    reset notification via the IOKit message routine.  The SBP2 services build on this behavior 
-    and deliver reconnectFailed and reconnectComplete through the message routine as well.
-*/
-
-class IOFireWireSBP2Login : public OSObject
-{
-    OSDeclareDefaultStructors( IOFireWireSBP2Login )
-
-	friend class IOFireWireSBP2ORB;
-	friend class IOFireWireSBP2LUN;
-	friend class IOFireWireSBP2UserClient;
-	
-protected:
-
-    // command selectors
-    enum
-    {
-        kLoginCommandIdle		= 0,
-        kLoginCommandDoLogin 	= 1,
-        kLoginCommandDoLogout	= 2,
-        kLoginAddORB			= 3,
-        kLoginRemoveORB			= 4,
-		kLoginFetchAgentReset	= 5
-     };
-
-    // internal login states
-    enum
-    {
-        kLoginStateIdle			= 0,
-        kLoginStateLoggingIn	= 1,
-        kLoginStateConnected	= 2,
-        kLoginStateReconnect	= 3,
-        kLoginStateLoggingOut	= 4,
-		kLoginStateTerminated	= 5
-    };
-
-    // rom keys
-    enum
-    {
-        kUnitCharacteristicsKey 	= 0x3A,
-        kManagementAgentOffsetKey	= 0x54
-    };
-
-    // sbp2 defs
-    enum
-    {
-        kFWSBP2RequestComplete 	= 0,
-        kFWSBP2TransportFailure	= 1,
-        kFWSBP2IllegalRequest	= 2,
-        kFWSBP2VendorDependent	= 3
-    };
-
-    enum
-    {
-        kFWSBP2NoSense					= 0,
-        kFWSBP2RequestTypeNotSupported	= 1,
-        kFWSBP2SpeedNotSupported		= 2,
-        kFWSBP2PageSizeNotSupported		= 3,
-        kFWSBP2AccessDenied				= 4,
-        kFWSBP2LogicalUnitNotSupported	= 5,
-        kFWSBP2MaxPayloadTooSmall		= 6,
-        kFWSBP2FunctionRejected			= 9,
-        kFWSBP2LoginIDNotRecognized		= 10,
-        kFWSBP2DummyORBCompleted		= 11,
-        kFWSBP2RequestAborted			= 12,
-        kFWSBP2UnspecifiedError			= 0xFF
-    };
-
-    typedef struct
-    {
-        UInt32		password[2];
-        UInt32		loginResponseAddressHi;
-        UInt32		loginResponseAddressLo;
-        UInt16		options;
-        UInt16		lun;
-        UInt16		passwordLength;
-        UInt16		loginResponseLength;
-        UInt32		statusFIFOAddressHi;
-        UInt32		statusFIFOAddressLo;
-    } FWSBP2LoginORB;
-
-    typedef struct
-    {
-        UInt32		reserved1[4];
-        UInt16		options;
-        UInt16		loginID;
-        UInt32		reserved2;
-        UInt32		statusFIFOAddressHi;
-        UInt32		statusFIFOAddressLo;
-    } FWSBP2ReconnectORB;
-    
-    typedef struct
-    {
-        UInt32		reserved1[4];
-        UInt16		options;
-        UInt16		loginID;
-        UInt32		reserved2;
-        UInt32		statusFIFOAddressHi;
-        UInt32		statusFIFOAddressLo;
-    } FWSBP2LogoutORB;
-
-protected:
-
-    ///////////////////////////////////////////////////////////////////
-    // private interface methods
-
-	// IOFireWireSBP2LUN methods
-	virtual void clearAllTasksInSet( void );
-    virtual bool initWithLUN( IOFireWireSBP2LUN * lun );
-    virtual void suspendedNotify( void );
-    virtual void resumeNotify( void );
-	
-	// IOFireWireSBP2ORB methods
-	virtual IOFireWireUnit * getFireWireUnit( void );
-    virtual IOFireWireSBP2LUN * getFireWireLUN( void );
-    virtual bool isFetchAgentWriteInProgress( void );
-    virtual bool isConnected( void );
-    virtual IOReturn removeORB( IOFireWireSBP2ORB * orb );
-    virtual IOReturn appendORBImmediate( IOFireWireSBP2ORB * orb );
-    virtual IOReturn appendORB( IOFireWireSBP2ORB * orb );
-    virtual void sendTimeoutNotification( IOFireWireSBP2ORB * orb );
-     
-protected:
-  
-    // reserved for future use
-    struct ExpansionData { };
-    ExpansionData *reserved; 
-          
-    IOFireWireSBP2LUN * 	fLUN;
-    IOFireWireUnit *		fUnit;
-	IOFireWireController *	fControl;
-	IOCommandGate * 		fGate;
-
-    FWSBP2LoginCallback		fLoginCompletionCallback;
-    void *	  				fLoginCompletionRefCon;
-
-    FWSBP2LogoutCallback	fLogoutCompletionCallback;
-    void *					fLogoutCompletionRefCon;
-    
-    FWSBP2NotifyCallback	fStatusNotifyCallback;
-    void *					fStatusNotifyRefCon;
-
-    FWSBP2NotifyCallback	fUnsolicitedStatusNotifyCallback;
-    void *					fUnsolicitedStatusNotifyRefCon;
-    
-    UInt32					fLoginFlags;
-    UInt32					fReconnectTime;
-    
-    UInt32					fLoginState;
-    UInt32					fManagementOffset;
-    UInt32					fManagementTimeout;
-    UInt32					fMaxORBSize;
-    UInt32					fMaxCommandBlockSize;
-    UInt16					fLoginNodeID;
-    UInt32					fLoginGeneration;
-    UInt32					fLoginID;
-    UInt32					fReconnectHold;
-    UInt32					fMaxPayloadSize;
-    void *					fRefCon;
-    
-    // resources
-    
-    FWSBP2LoginORB			fLoginORB;
-    IOFWAddressSpace *		fLoginORBAddressSpace;
-    FWAddress				fLoginORBAddress;
-
-    FWSBP2LoginResponse		fLoginResponse;
-    IOFWAddressSpace *		fLoginResponseAddressSpace;
-    FWAddress				fLoginResponseAddress;
-
-    FWSBP2ReconnectORB		fReconnectORB;
-    IOFWAddressSpace *		fReconnectORBAddressSpace;
-    FWAddress				fReconnectORBAddress;
-    
-    FWSBP2StatusBlock		fStatusBlock;
-    IOFWAddressSpace *		fStatusBlockAddressSpace;
-    FWAddress				fStatusBlockAddress;
-
-    FWSBP2StatusBlock		fReconnectStatusBlock;
-    IOFWAddressSpace *		fReconnectStatusBlockAddressSpace;
-    FWAddress				fReconnectStatusBlockAddress;
-
-    FWSBP2LogoutORB			fLogoutORB;
-    IOFWAddressSpace *		fLogoutORBAddressSpace;
-    FWAddress				fLogoutORBAddress;
-    bool					fLogoutPending;
-	
-    IOFWWriteCommand *		fLoginWriteCommand;
-    IOMemoryDescriptor *	fLoginWriteCommandMemory;
-    bool					fLoginWriteInProgress;
-     
-    IOFWWriteCommand *		fReconnectWriteCommand;
-    IOMemoryDescriptor *	fReconnectWriteCommandMemory;
-    bool					fReconnectWriteInProgress;
-    bool					fReconnectWriteInterrupted;
-    
-    IOFWWriteCommand *		fLogoutWriteCommand;
-    IOMemoryDescriptor *	fLogoutWriteCommandMemory;
-    bool					fLogoutWriteInProgress;
-    
-    IOFWCommand *			fLoginTimeoutCommand;
-    bool					fLoginTimeoutTimerSet;
-
-    IOFWDelayCommand *		fReconnectTimeoutCommand;
-    bool					fReconnectTimeoutTimerSet;
-
-    IOFWCommand *			fLogoutTimeoutCommand;
-    bool					fLogoutTimeoutTimerSet;
-
-    FWAddress 				fFetchAgentAddress;
-    IOMemoryDescriptor *	fFetchAgentWriteCommandMemory;
-    FWAddress 				fLastORBAddress;
-    IOFireWireSBP2ORB *		fLastORB;
-    IOFWWriteCommand *		fFetchAgentWriteCommand;
-    bool					fFetchAgentWriteCommandInUse;
-	FWSBP2FetchAgentWriteCallback 	fFetchAgentWriteCompletion;
-	void * 							fFetchAgentWriteRefCon;
-	IOFireWireSBP2ORB *		fORBToWrite;
-	
-    OSSet *					fORBSet;
-    OSIterator *			fORBSetIterator;
- 
-    void *					fPasswordBuf;
-    UInt32					fPasswordLen;
-    IOFWAddressSpace *		fPasswordAddressSpace;
-    FWAddress				fPasswordAddress;
-	IOMemoryDescriptor *	fPasswordDescriptor;
-
-	bool fSuspended;
-	
-	UInt32					fLoginRetryDelay;
-	UInt32					fLoginRetryCount;
-	UInt32					fLoginRetryMax;
-	IOFWDelayCommand *		fLoginRetryTimeoutCommand;
-    bool					fLoginRetryTimeoutTimerSet;
-	IOFireWireSBP2Target * 	fTarget;
-	
-	bool					fUnsolicitedStatusEnableRequested;
-	
-	IOFWDelayCommand *		fReconnectRetryTimeoutCommand;
-    bool					fReconnectRetryTimeoutTimerSet;	
-
-	int						fCriticalSectionCount;
-	
-	// init / destroy
-    virtual IOReturn getUnitInformation( void );
-    virtual IOReturn allocateResources( void );
-    virtual void free( void );
-        	
-	// orb add / remove
-	virtual IOReturn addORB( IOFireWireSBP2ORB * orb );
-	static IOReturn staticExecuteAddORB( OSObject *self, void * orb, void *, void *, void * );
-	virtual IOReturn executeAddORB( IOFireWireSBP2ORB * orb );
-
-	static IOReturn staticExecuteRemoveORB( OSObject *self, void * orb, void *, void *, void * );
-	virtual IOReturn executeRemoveORB( IOFireWireSBP2ORB * orb );
-
-    //
-    // login
-    //
-
-    static IOReturn staticExecuteLogin( OSObject *self, void *, void *, void *, void * );
-    virtual IOReturn executeLogin( void );
-    virtual void abortLogin( void );
-    
-    // login write complete handler
-    static void loginWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-    virtual void loginWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-    // login timeout handler
-    static void loginTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-    virtual void loginTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-
-    // status block write handler
-    static UInt32 statusBlockWriteStatic(void *refcon, UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
-                                         const void *buf, IOFWRequestRefCon lockRead);
-   	virtual UInt32 statusBlockWrite( UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len, const void *buf, IOFWRequestRefCon lockRead);
-	virtual void completeLogin( IOReturn state, const void *buf = NULL, UInt32 len = 0, void * buf2 = NULL );
-
-    //
-    // reconnect
-    //
-    
-    virtual void doReconnect( void );
-    virtual void restartReconnect( void );
-    virtual void startReconnectTimer( void );
-
-    // reconnect write complete handler
-    static void reconnectWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-    virtual void reconnectWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-    // reconnect timeout handler
-    static void reconnectTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-    virtual void reconnectTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-
-    // reconnect status block
-    static UInt32 reconnectStatusBlockWriteStatic(void *refcon, UInt16 nodeID, IOFWSpeed &speed, FWAddress addr,
-                                                  UInt32 len, const void *buf, IOFWRequestRefCon lockRead);
-   	virtual UInt32 reconnectStatusBlockWrite( UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
-                                              const void *buf, IOFWRequestRefCon lockRead);
-
-    virtual void sendReconnectNotification( UInt32 event );
-    virtual void sendReconnectNotificationWithStatusBlock( UInt32 event );
-
-    //
-    // logout
-    //
-    
-	static IOReturn staticExecuteLogout( OSObject *self, void *, void *, void *, void * );
-    virtual IOReturn executeLogout( void );
-    
-    // logout write complete handler
-    static void logoutWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-    virtual void logoutWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-    // logout timeout handler
-    static void logoutTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-    virtual void logoutTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-	
-	virtual void completeLogout( IOReturn state, const void *buf = NULL, UInt32 len = 0);
-
-	// fetch agent write complete handler
-    static void fetchAgentWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-    virtual void fetchAgentWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-    //
-    // fetch agent
-    //
-
-	bool 							fFetchAgentResetInProgress;
-	UInt32 							fFetchAgentResetBuffer;
-	FWAddress 						fFetchAgentResetAddress;
-	IOFWWriteQuadCommand *			fFetchAgentResetCommand;
-	void * 							fFetchAgentResetRefCon;
-	FWSBP2StatusCallback 			fFetchAgentResetCompletion;
-
-	static IOReturn staticExecuteFetchAgentReset( OSObject *self, void *, void *, void *, void * );
-	virtual IOReturn executeFetchAgentReset( void );
-	static void fetchAgentResetCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-	virtual void fetchAgentResetComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-	//
-	// doorbell
-	//
-	
-	bool 							fDoorbellInProgress;
-	bool							fDoorbellRingAgain;
-	UInt32 							fDoorbellBuffer;
-	FWAddress 						fDoorbellAddress;
-	IOFWWriteQuadCommand *			fDoorbellCommand;
-	
-	static IOReturn staticExecuteDoorbell( OSObject *self, void *, void *, void *, void * );
-	virtual IOReturn executeDoorbell( void );
-	static void doorbellCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-	virtual void doorbellComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-	//
-	// enable unsolicited satus
-	//
-
-	bool 							fUnsolicitedStatusEnableInProgress;
-	UInt32 							fUnsolicitedStatusEnableBuffer;
-	FWAddress 						fUnsolicitedStatusEnableAddress;
-	IOFWWriteQuadCommand *			fUnsolicitedStatusEnableCommand;
-
-	static IOReturn staticExecuteUnsolicitedStatusEnable( OSObject *self, void *, void *, void *, void * );
-	virtual IOReturn executeUnsolicitedStatusEnable( void );
-	static void unsolicitedStatusEnableCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-	virtual void unsolicitedStatusEnableComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-	//
-	// busy timeout stuff
-	//
-	
-	bool 							fSetBusyTimeoutInProgress;
-	UInt32 							fSetBusyTimeoutBuffer;
-	FWAddress 						fSetBusyTimeoutAddress;
-	IOFWWriteQuadCommand *			fSetBusyTimeoutCommand;
-	
-	bool							fInCriticalSection;
-
-	UInt16					fLocalNodeID;
-	bool					fFastStartSupported;
-	UInt32					fFastStartOffset;
-	UInt32					fFastStartMaxPayload;
-	
-	UInt32					fUserLoginGeneration;
-	bool					fUserLoginGenerationSet;
-	
-	IOFWDelayCommand *		fFetchAgentRetryTimerCommand;
-    bool					fFetchAgentRetryTimerSet;	
-	
-	virtual IOReturn executeSetBusyTimeout( void );
-	static void setBusyTimeoutCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-	virtual void setBusyTimeoutComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-private:
-	// IOFireWireSBP2ORB friend class wrappers
-	OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 0);
-
-protected: 									
-	virtual bool initORBWithLogin( IOFireWireSBP2ORB * orb, IOFireWireSBP2Login * login );
-	virtual void setNextORBAddress( IOFireWireSBP2ORB * orb, FWAddress address );
-    virtual void fetchAgentWriteComplete( IOFireWireSBP2ORB * orb, IOReturn status );
-    virtual bool isORBTimerSet( IOFireWireSBP2ORB * orb );
-    virtual void cancelORBTimer( IOFireWireSBP2ORB * orb );
-	
-	// IOFireWireSBP2LUN friend class wrappers
-	virtual void removeLogin( void );
-	virtual IOFireWireSBP2Target * getTarget( void );
-	
-	UInt32		fARDMAMax;
-	bool		fPhysicalAccessEnabled;
-
-	bool					fLoginStatusReceived;
-	FWSBP2StatusBlock		fLoginStatusBlock;
-	UInt32					fLoginStatusBlockLen;
-		
-private:
-
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 4);
-	OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 5);
-
-public:
-
-	//////////////////////////////
-
-    /*!
-		@function createORB
-		@abstract Creates a new IOFireWireSBP2ORB for this login.
-		@discussion	Create a new IOFireWireSBP2ORB for this login.  It can be configured 
-        with it's accessors and executed with submitORB below.
-        @result Returns a pointer to the new ORB object.
-	*/
-    	
-	virtual IOFireWireSBP2ORB * createORB( void );
-	
-    /*!
-		@function submitORB
-		@abstract Submits the given orb
-		@discussion	Starts execution of the given ORB.  If the ORB is an immediate ORB it's 
-        addresss is written to the fetch agent.  If it is a non immediate orb its address 
-        is appended to the last orb of the currently processing chain.  The doorbell is not 
-        rung automatically it must be run manually with the ringDoorbell command described below.
-        @param orb The orb to be executed.	
-        @result Returns kIOReturnSuccess if the ORB has been started successfully.
-	*/
-    
-    virtual IOReturn submitORB( IOFireWireSBP2ORB * orb );
-
-    // set callbacks
-    
-    /*!
-		@function setStatusNotifyProc
-		@abstract Sets the callback to be called on normal command status.
-		@discussion The supplied callback is called when normal command status is recieved, when 
-        a normal command times out, or when a normal command is aborted. 
-        "notificationEvent" in the callback's params will indicate what happened.
-        It will be set to one of the following values: kFWSBP2NormalCommandReset, kFWSBP2NormalCommandStatus, 
-        or kFWSBP2NormalCommandTimeout.  If the event type is kFWSBP2NormalCommandTimeout and "len" is 
-        non-zero then "message" contains the data written to the status block.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2NotifyCallback.
-	*/
-    
-    virtual void setStatusNotifyProc( void * refCon, FWSBP2NotifyCallback callback );
-
-    /*!
-		@function getStatusNotifyProc
-		@abstract Returns the callback to be called on normal command status.
-		@discussion Returns the refCon and callback address of the status notify callback.
-        @param refCon output parameter returning the refCon to be passed to the callback.	
-        @param callback output parameter returning the address of the callback.
-	*/
-    
-    virtual void getStatusNotifyProc( void ** refCon, FWSBP2NotifyCallback * callback );
-
-    /*!
-		@function setUnsolicitedStatusNotifyProc
-		@abstract Sets the callback to be called on normal command status.
-		@discussion The supplied callback is called when unsolicited status is recieved.
-        "notificationEvent" in the callback's params will indicate what happened.  In this 
-        case it will be set to kFWSBP2UnsolicitedStatus. If "len" is 
-        non-zero then "message" contains the data written to the status block. Note: any buffers 
-        returned by callbacks are only valid for the duration of the login and should not have 
-        their contents modified.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2NotifyCallback.
-	*/
-    
-    virtual void setUnsolicitedStatusNotifyProc( void * refCon, FWSBP2NotifyCallback callback );
-    
-    /*!
-		@function getUnsolicitedStatusNotifyProc
-		@abstract Returns the callback to be called on unsolicited status.
-		@discussion Returns the refCon and callback address of the unsolicited status notify callback.
-        @param refCon output parameter returning the refCon to be passed to the callback.	
-        @param callback output parameter returning the address of the callback.
-	*/
-    
-    virtual void getUnsolicitedStatusNotifyProc( void ** refCon, FWSBP2NotifyCallback * callback );
-
-    // command handling
-    
-    /*!
-		@function setLoginCompletion
-		@abstract Sets the callback to be called when a login attempt is complete.
-		@discussion The supplied callback is called when a login attempt has completed. "status" in the
-        callback's params should be checked to determine the success or failure of the login attempt.  
-        If "statusBlock" is non-null then login status was written and it has been supplied here.  If 
-        the login attempt was successful then the login response will be supplied in the "loginResponse" 
-        buffer.  Note: all buffers supplied to callbacks are only valid for the duration of the callback.  
-        Also, you are not to modify the contents of any supplied buffer.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2LoginCallback.
-	*/
-    
-	virtual void setLoginCompletion( void * refCon, FWSBP2LoginCallback completion );
-    
-    /*!
-		@function submitLogin
-		@abstract Attempts to login to the LUN.		
-        @discussion This call begins the login process.  The login object should be configured prior 
-        to this call. If kIOReturnSuccess is returned from this call then the loginCompletion routine 
-        will be called when the login completes (successfully or unsuccesfully). 
-        @result Returns kIOReturnSuccess login has successlly begun.
-	*/
-    
-    virtual IOReturn submitLogin( void );
-	
-    /*!
-		@function submitLogout
-		@abstract Attempts to logout of the LUN.		
-        @discussion This call begins the logout process.  If kIOReturnSuccess is returned from this call then
-        the logoutCompletion routine will be called when the logout completes (successfully or unsuccesfully). 
-        @result Returns kIOReturnSuccess if logout has successfully begun.
-	*/
-    
-    virtual IOReturn submitLogout( void );
- 
-    /*!
-		@function setLogoutCompletion
-		@abstract Sets the callback to be called when a logout attempt is complete.
-		@discussion The supplied callback is called when a logout attempt has completed. "status" in the
-        callback's params should be checked to determine the success or failure of the logout attempt.  
-        If "statusBlock" is non-null then logout status was written and it has been supplied here. 
-        Note: all buffers supplied to callbacks are only valid for the duration of the callback.  
-        Also, you are not to modify the contents of any supplied buffer.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2LogoutCallback.
-	*/
-   
-    virtual void setLogoutCompletion( void * refCon, FWSBP2LogoutCallback completion );
- 
-    /*!
-		@function setFetchAgentWriteCompletion
-		@abstract Sets the callback to be called when the fetch agent write completes.
-		@discussion When an immediate orb is executed with submitORB, it's address is written to a 
-        specific address on the device.  This address is called the fetch agent.  The device the 
-        reads that orb from the Mac's memory and executes it.  With this call you can register to 
-        be called back when this write to the fetch agent completes.  The SBP2 services guarantee 
-        that the fetch agent write will be complete before status is reported for an ORB, so for 
-        most drivers this notification is not required.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2FetchAgentWriteCallback.
-	*/
-       
-	virtual void setFetchAgentWriteCompletion( void * refCon, FWSBP2FetchAgentWriteCallback completion );
-
-    /*!
-		@function setFetchAgentResetCompletion
-		@abstract Sets the callback to be called when a fetch agent reset completes.
-		@discussion The fetch agent state machine on the device can be reset by a write to a specific 
-        register.  The SBP2 services offer a utility method to reset the fetch agent.  You can register 
-        a callback routine here to be notified when this rest write completes.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2FetchAgentWriteCallback.
-	*/
-    
-    virtual void setFetchAgentResetCompletion( void * refCon, FWSBP2StatusCallback completion );
-
-    /*!
-		@function submitFetchAgentReset
-		@abstract Resets the LUN's fetch agent.
-		@discussion The fetch agent state machine on the device can be reset by a write to a specific 
-        register.  This reset can be intiated by a call to this method.  Notification of the completion 
-        of this write can be had by registering a callback with the setFetchAgentResetCompletion method.
-        @result Returns kIOReturnSuccess if the reset started successfully.
-	*/
-    
-	virtual IOReturn submitFetchAgentReset( void );
-
-    /*!
-		@function ringDoorbell
-		@abstract Rings the doorbell on the LUN.
-		@discussion Non-immediate appends to the ORB chain may require the fetch agent state machine 
-        to be notified of the new ORB's presence.  This is accomplished by writing to the so called 
-        doorbell register.  This method begins one of those writes.
-        @result Returns kIOReturnSuccess if the ring started successfully.
-	*/
-    
- 	virtual IOReturn ringDoorbell( void );
-    
-    /*!
-		@function enableUnsolicitedStatus
-		@abstract Enables unsolicited status.
-		@discussion After unsolicited is sent the device will not send any additional unsolicited status 
-        until a specific register is written.  This serves as a sort of flow-control for unsolicited status.  
-        After unsolicited status is recieved and processed drivers will want to reenable the delivery 
-        of unsolicted status by a call to this method.
-        @result Returns kIOReturnSuccess if the status enable write started successfully.
-	*/
-        
-	virtual IOReturn enableUnsolicitedStatus( void );
-	
-    // accessors
-    
-    /*!
-		@function getMaxCommandBlockSize
-		@abstract Returns the maximum command block size.
-		@discussion The device publishes an upper limit on the size of command block that it can 
-        accept.  That value can be accessed via this method.
-        @result Returns a UInt32 containing the maximum command block size.
-	*/
-    
-    virtual UInt32 getMaxCommandBlockSize( void );
-    
-    /*!
-		@function getLoginID
-		@abstract Returns the current login ID.
-		@discussion When we successfully login to a device.  The device gives us a unique login id.  
-        This is used internally for reconnecting to the device after bus resets and for certain other 
-        management ORBs.  Most drivers are probably not interested in this value.
-        @result Returns a UInt32 containing the current login ID.
-	*/
-    
-    virtual UInt32 getLoginID( void );
-
-    /*!
-		@function setLoginFlags
-		@abstract Sets login configuration flags.
-		@discussion Configures the login behavior according to the provided flags.  Currently two 
-        flags are defined for this API.  kFWSBP2ExclusiveLogin sets the exclusive login bit in the 
-        login ORB. kFWSBP2DontSynchronizeMgmtAgent allows simultaneous logins or reconnects to LUNs
-        with a common management agent (ie LUNs in the same unit directory).
-        @param loginFlags the login configuration flags.
-	*/
-    
-    virtual void setLoginFlags( UInt32 loginFlags );
-    
-    /*!
-		@function getLoginFlags
-		@abstract Returns the currently set login flags.
-		@discussion Returns the current state of the login flags.  Currently there is only one
-        flag defined for this API.  kFWSBP2ExclusiveLogin indicates that the exclusive login bit
-        should be set in the login ORB.
-        @result Returns a UInt32 containing the currently set login flags.
-	*/
-    
-    virtual UInt32 getLoginFlags( void );
-
-    /*!
-		@function setReconnectTime
-		@abstract Sets the desired reconnect duration.
-		@discussion The target and initiator arbitrate the duration of the reconnect timeout.  Here 
-        the initiator specifies its desired timeout time in 2^reconnectTime seconds.  After a 
-        successful login the device returns the actual timeout value it wishes to use.  This value 
-        may be less than the reconnect timeout that the intiator specified if this is all that the 
-        device can support.
-        @param reconnectTime The desired reconnect timeout encoded as 2^reconnectTime seconds.
-	*/
-    
-    virtual void setReconnectTime( UInt32 reconnectTime );
-    
-    /*!
-		@function getReconnectTime
-		@abstract Returns the currently set reconnect time.
-		@discussion Returns the currently desired initiator reconnect time encoded as 2^time seconds.
-        @result Returns a UInt32 containing the currently set reconnect time.
-	*/
-    
-    virtual UInt32 getReconnectTime( void );
-
-    /*!
-		@function setMaxPayloadSize
-		@abstract Sets the maximum data transfer length for a normal command ORB.
-		@discussion Sets the maximum data transfer length for a normal command ORB.  This value is 
-        the maximum for all ORBs sent to this LUN.  This can be trimmed further on an ORB by ORB basis, 
-        by a similar call in the IOFireWireSBP2ORB itself.
-        @param reconnectTime The desired maximum payload size in bytes.
-	*/
-    
-    virtual void setMaxPayloadSize( UInt32 maxPayloadSize );
-    
-    /*!
-		@function getMaxPayloadSize
-		@abstract Returns the currently set maximum payload size.
-		@discussion Returns the currently global maximum payload size in bytes.
-        @result Returns a UInt32 containing the currently set maximum payload size.
-	*/
-
-    virtual UInt32 getMaxPayloadSize( void );
-
-    /*!
-		@function setPassword
-		@abstract Sets the login password.
-		@discussion Sets the login password using a buffer and a length.  An alternate version exists 
-        that accepts an IOMemoryDescriptor.  If the password length is 8 or less the password is copied 
-        directly into the login orb.  If the length is greater than 8 the buffer is referenced by address 
-        in the login ORB.  In this case the buffer is not copied and should remain allocated for the 
-        duration of the login attempt.
-        @param buf a pointer to the password buffer.
-        @param len the length in bytes of the password buffer.
-        @result Returns kIOReturnSuccess on success.
-	*/
-
-    virtual IOReturn setPassword( void * buf, UInt32 len );
-
-    /*!
-		@function setPassword
-		@abstract Sets the login password.
-		@discussion Sets the login password using an IOMemoryDescriptor.  An alternate version exists 
-        that accepts a buffer and a length.  If the password length is 8 or less the password is copied 
-        directly into the login orb.  If the length is greater than 8 the buffer is referenced by address 
-        in the login ORB.
-        @param memory an IOMemoryDescriptor referencing the password.
-        @result Returns kIOReturnSuccess on success.
-	*/
-    
-    virtual IOReturn setPassword( IOMemoryDescriptor * memory );
-
-
-    /*!
-		@function setRefCon
-		@abstract Sets the login refCon.
-		@discussion Sets a user defined value on the login that can be retrieved later with the 
-        method getRefCon.
-        @param refCon a user defined value.
-    */
-    
-    virtual void setRefCon( void * refCon );
-    
-    /*!
-		@function getRefCon
-		@abstract Returns the refCon set with setRefCon.
-		@discussion Returns the user defined value previously stored in the login with setRefCon.
-        @result Returns the previously stored user defined value.
-	*/
-    
-    virtual void * getRefCon( void );
-	
-    /*!
-		@function setBusyTimeoutRegisterValue
-		@abstract Sets the value to be written to the BUSY_TIMEOUT register.
-		@discussion 1394-1995 defines a register known as the BUSY_TIMEOUT register. This register 
-        controls the busy retry behavior of your device.  The initial value for this register is 
-        0x00000000.  Which means busied transactions will not be retried.  Since most devices want 
-        their transactions retired on busy acks, the SBP2 service automatically updates the 
-        BUSY_TIMEOUT register with the value specified here whenever necessary.  Most drivers should 
-        set this value to 0x0000000f.
-        @param timeout desired value of the BUSY_TIMEOUT register.
-    */
-    
-	virtual void setBusyTimeoutRegisterValue( UInt32 timeout );
-    
-protected:
-
-    virtual void startORBTimer( IOFireWireSBP2ORB * orb );
-    virtual void prepareORBForExecution( IOFireWireSBP2ORB * orb );
-
-    static IOReturn staticExecuteORB( OSObject *self, void * orb, void *, void *, void * );
-    virtual IOReturn executeORB( IOFireWireSBP2ORB * orb );
-
-public:
-
-    /*! 
-        @function release
-        @abstract Primary implementation of the release mechanism.
-        @discussion See OSObject.h for more information.  When retainCount == when then call free(). 
-    */
-    
-    virtual void release() const;
-	
-	/*! 
-        @function setLoginRetryCountAndDelayTime
-        @abstract Sets login retry behavior.
-        @discussion Sets login retry behavior.
-        @param retryCount number of times to retry logins
-		@param uSecs delay time in microseconds between login retries
-    */
-	
-	virtual void setLoginRetryCountAndDelayTime( UInt32 retryCount, UInt32 uSecs );
-	
-protected:
-	virtual IOReturn initialExecuteLogin( void );
-	virtual void startLoginRetryTimer( void );
-	virtual void stopLoginRetryTimer( void );
-	static void loginRetryTimeoutStatic( void *refcon, IOReturn status,
-										 IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-	virtual void loginRetryTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd);
-
-	virtual void startReconnectRetryTimer( void );
-	virtual void stopReconnectRetryTimer( void );
-	static void reconnectRetryTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-	virtual void reconnectRetryTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-
-	virtual bool isORBAppended( IOFireWireSBP2ORB * orb );
-	virtual void setORBIsAppended( IOFireWireSBP2ORB * orb, bool state );
-
-public:    
-	virtual void setAddressLoForLoginORBAndResponse( UInt32 addressLoORB, UInt32 addresLoResponse );
-	
-	virtual void setLoginGeneration( UInt32 generation );
-	virtual void clearLoginGeneration( void );
-
-protected:
-	void startFetchAgentRetryTimer( UInt32 duration );
-	void stopFetchAgentRetryTimer( void );
-	static void fetchAgentRetryTimerStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-	void fetchAgentRetryTimer( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-	
-	void terminateNotify( void );
-	void processLoginWrite( void );
-
-public:
-	
-	bool	isPhysicalAccessEnabled( void );
-	UInt32	getARDMMax( void );
-	
-private:
-    
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 8);
-
- };
-
-#endif
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ManagementORB.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ManagementORB.h.svn-base
deleted file mode 100644
index 9455383..0000000
--- a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ManagementORB.h.svn-base
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOFireWireSBP2ManagementORB
-  Contains the class definition for IOFireWireSBP2ManagementORB.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2MANAGEMENTORB_H
-#define _IOKIT_IOFIREWIRESBP2MANAGEMENTORB_H
-
-#include <IOKit/firewire/IOFWCommand.h>
-#include <IOKit/firewire/IOFireWireUnit.h>
-
-#include <IOKit/IOUserClient.h>
-
-class IOFireWireSBP2LUN;
-class IOFireWireSBP2ManagementORB;
-class IOFireWireSBP2ORB;
-
-enum
-{
-    kFWSBP2QueryLogins			= 1,
-    kFWSBP2AbortTask			= 0xb,
-    kFWSBP2AbortTaskSet			= 0xc,
-    kFWSBP2LogicalUnitReset		= 0xe,
-    kFWSBP2TargetReset			= 0xf
-};
-
-// Callback when management command completes asynchronously
-
-/*! 
-    @typedef FWSBP2ManagementCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param status Indicates success or failure of operation. 
-    @param orb Indicates current orb status is for.
-*/
-
-typedef void (*FWSBP2ManagementCallback)(void * refCon, IOReturn status, IOFireWireSBP2ManagementORB * orb);
-
-/*!
-    @class IOFireWireSBP2ManagementORB
-    @abstract Supplies non login related management ORBs.  Management ORBs can be executed independent 
-    of a login, if necessary.  Management ORBs are created using the IOFireWireSBP2LUN interface.
-*/
-
-class IOFireWireSBP2ManagementORB : public IOFWCommand
-{
-    OSDeclareDefaultStructors( IOFireWireSBP2ManagementORB )
-
-	friend class IOFireWireSBP2LUN;
-	friend class IOFireWireSBP2UserClient;
-	
-protected:
-
-	////////////////////////////////////////            
-    // rom keys
-	
-    enum
-    {
-        kUnitCharacteristicsKey 	= 0x3A,
-        kManagementAgentOffsetKey	= 0x54
-    };
-
-	////////////////////////////////////////        
-	// structs
-	
-    typedef struct
-    {
-        UInt32		orbOffsetHi;
-        UInt32		orbOffsetLo;
-        UInt32		reserved1[2];
-        UInt16		options;
-        UInt16		loginID;
-        UInt32		reserved2;
-        UInt32		statusFIFOAddressHi;
-        UInt32		statusFIFOAddressLo;
-    } FWSBP2TaskManagementORB;
-
-    typedef struct
-    {
-        UInt32		reserved1[2];
-        UInt32		queryResponseAddressHi;
-        UInt32		queryResponseAddressLo;
-        UInt16		options;
-        UInt16		lun;
-        UInt16		reserved2;
-        UInt16		queryResponseLength;
-        UInt32		statusFIFOAddressHi;
-        UInt32		statusFIFOAddressLo;
-    } FWSBP2QueryLoginsORB;
-    
-    typedef struct
-    {
-        UInt8		details;
-        UInt8		sbpStatus;
-        UInt16		orbOffsetHi;
-        UInt32		orbOffsetLo;
-        UInt32		status[6];
-    } FWSBP2StatusBlock;
-
-protected:
-
-	////////////////////////////////////////        
-	// friend methods
-	
-    // IOFireWireSBP2LUN methods
-    virtual bool initWithLUN( 	IOFireWireSBP2LUN * lun, 
-								void * refCon,
-								FWSBP2ManagementCallback completion  );
-	
-	// IOFireWireSBP2UserClient methods
-    virtual void setAsyncCallbackReference( void * asyncRef );
-    virtual void getAsyncCallbackReference( void * asyncRef );
-
-protected:
-   
-    // reserved for future use
-    struct ExpansionData 
-	{
-		bool fInCriticalSection; 
-	};
-    ExpansionData * fExpansionData; 
-         
-    IOFireWireSBP2LUN * 		fLUN;
-    IOFireWireUnit *			fUnit;
-    
-    UInt32						fManagementOffset;
-    UInt32						fManagementTimeout;
-    UInt32						fFunction;
-    OSObject * 					fManageeCommand;
-    
-	// our orb
-    FWSBP2TaskManagementORB		fManagementORB;
-    IOFWAddressSpace *			fManagementORBAddressSpace;
-    FWAddress					fManagementORBAddress;
-
-	// command to write management agent
-    IOFWWriteCommand *			fWriteCommand;
-    IOMemoryDescriptor *		fWriteCommandMemory;
-
-	// timeout
-    IOFWCommand *				fTimeoutCommand;
-    bool						fTimeoutTimerSet;
-
-	// status block
-    FWSBP2StatusBlock			fStatusBlock;
-    IOFWAddressSpace *			fStatusBlockAddressSpace;
-    FWAddress					fStatusBlockAddress;
-
-	// response buffer
-    void *						fResponseBuf;
-    UInt32						fResponseLen;
-    IOFWAddressSpace *			fResponseAddressSpace;
-    FWAddress					fResponseAddress;
-
-	// competion routine
-	FWSBP2ManagementCallback	fCompletionCallback;
-    void * 						fCompletionRefCon;
-
-    // for user client
-    OSAsyncReference64			fCallbackAsyncRef;
-	
-	IOMemoryMap *				fResponseMap;
-	
-	bool						fCompleting;
-	
-	////////////////////////////////////////        
-
-    // init / destroy
-    virtual IOReturn getUnitInformation( void );
-    virtual IOReturn allocateResources( void );
-    virtual void free( void );
-        
-    // command execution
-    virtual IOReturn execute( void );
-    virtual IOReturn complete( IOReturn state );
-
-    // write complete handler
-    static void writeCompleteStatic( 	void *refcon, 
-										IOReturn status, 
-										IOFireWireNub *device, 
-										IOFWCommand *fwCmd );
-    virtual void writeComplete( IOReturn status, 
-								IOFireWireNub *device, 
-								IOFWCommand *fwCmd );
-
-    // timeout handler
-    static void handleTimeoutStatic( 	void *refcon, 
-										IOReturn status, 
-										IOFireWireBus *bus, 
-										IOFWBusCommand *fwCmd );
-    virtual void handleTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-
-    // status block write handler
-    static UInt32 statusBlockWriteStatic( 	void *refcon, 
-											UInt16 nodeID, 
-											IOFWSpeed &speed, 
-											FWAddress addr, 
-											UInt32 len,
-											const void *buf, 
-											IOFWRequestRefCon lockRead );
-    virtual UInt32 statusBlockWrite( 	UInt16 nodeID, 
-										FWAddress addr, 
-										UInt32 len, 
-										const void *buf, 
-										IOFWRequestRefCon lockRead );
-
-	// IOFireWireSBP2LUN friend class wrappers
-	virtual void clearAllTasksInSet( void );
-	virtual void removeManagementORB( IOFireWireSBP2ManagementORB * orb );
-	
-public:
-    
-	////////////////////////////////////////        
-    // client methods
-
-    /*!
-		@function setCommandFunction
-		@abstract Sets the function of the management ORB.
-		@discussion Sets the the function of the management ORB.  Legal values are kFWSBP2QueryLogins,
-        kFWSBP2AbortTask, kFWSBP2AbortTaskSet,  kFWSBP2LogicalUnitReset, and kFWSBP2TargetReset.
-        @param function a value indicating the desired management function.
-        @result Returns kIOReturnSuccess if function was a legal function.
-	*/
-    	
-    virtual IOReturn setCommandFunction( UInt32 function );
-    
-    /*!
-		@function getCommandFunction
-		@abstract Returns the current function of the management ORB.
-		@discussion Returns the function of the management ORB.  This is the same value that was 
-        set with setCommandFunction.
-        @result Returns the function of the management ORB.
-	*/
-    
-    virtual UInt32 getCommandFunction( void );
-
-    /*!
-		@function setManageeCommand
-		@abstract Sets the command to be managed by the management ORB.
-		@discussion All management functions except kFWSBP2QueryLogins require a reference to an ORB of 
-        some sort.  kFWSBP2AbortTaskSet,  kFWSBP2LogicalUnitReset, and kFWSBP2TargetReset require a 
-        reference to the login ORB.  kFWSBP2AbortTask requires a reference to the ORB to be aborted.  
-        This method allows you to set the ORB to be managed.
-        @param command a reference to an IOFireWireSBP2Login or an IOFireWireSBP2ORB.
- 	*/
-    
-    virtual void setManageeCommand( OSObject * command );
-    
-    /*!
-		@function getCommandFunction
-		@abstract Returns the current managee command of the management ORB.
-		@discussion Returns the current managee command of the management ORB.  This is the same value that was 
-        set with setManageeCommand.
-        @result  Returns the current managee command of the management ORB.
-	*/
-    
-    virtual OSObject* getManageeCommand( void );
-
-    /*!
-		@function setResponseBuffer
-		@abstract Sets the response buffer for the management ORB.
-		@discussion Sets the response buffer for the management ORB.  kFWSBP2QueryLogins returns 
-        a response to its query and needs to write it somewhere.  This routine allows you to 
-        specify the location.
-        @param desc memory descriptor for buffer.
-        @result Returns kIOReturnSuccess on a success.
-	*/
-    
-	virtual IOReturn setResponseBuffer( IOMemoryDescriptor * desc );
-    
-    /*!
-		@function setResponseBuffer
-		@abstract Sets the response buffer for the management ORB.
-		@discussion Sets the response buffer for the management ORB.  kFWSBP2QueryLogins returns 
-        a response to its query and needs to write it somewhere.  This routine allows you to 
-        specify the location.        
-        @param buf backing store for buffer
-        @param len length of buffer.
-        @result Returns kIOReturnSuccess on a success.
-	*/
-    
-    virtual IOReturn setResponseBuffer( void * buf, UInt32 len );
-    
-    /*!
-		@function getResponseBuffer
-		@abstract Returns the response buffer for the management ORB.
-		@discussion Returns the response buffer set in setResponseBuffer above        
-        @param desc memory descriptor for buffer.
-        @param buf output parameter for backing store for buffer
-        @param len output parameter for length of buffer.
-	*/
-    
-    virtual void getResponseBuffer( void ** buf, UInt32 * len );
-
-    /*! 
-        @function release
-        @abstract Primary implementation of the release mechanism.
-        @discussion See OSObject.h for more information. 
-        @param when When retainCount == when then call free(). 
-    */
-    
-	virtual void release() const;
-
-protected:
-
-	virtual void setORBToDummy( IOFireWireSBP2ORB * orb );
-
-	virtual void suspendedNotify();
-
-private:
-
-    OSMetaClassDeclareReservedUsed(IOFireWireSBP2ManagementORB, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 8);
-    
-};
-
-#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ORB.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ORB.h.svn-base
deleted file mode 100644
index 5c11593..0000000
--- a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2ORB.h.svn-base
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOFireWireSBP2ORB
-  Contains the class definition for IOFireWireSBP2ORB.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2ORB_H
-#define _IOKIT_IOFIREWIRESBP2ORB_H
-
-#include <IOKit/firewire/IOFireWireUnit.h>
-
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/IOUserClient.h>
-#include <IOKit/IODMACommand.h>
-
-enum
-{
-    kFWSBP2ConstraintForceDoubleBuffer		= (1 << 0)
-};
-
-// login option flags
-enum
-{
-    kFWSBP2CommandCompleteNotify			= (1 << 0),
-    kFWSBP2CommandTransferDataFromTarget	= (1 << 1),
-    kFWSBP2CommandImmediate					= (1 << 2),
-    
-    kFWSBP2CommandNormalORB					= (1 << 5),
-    kFWSBP2CommandReservedORB				= (1 << 6),
-    kFWSBP2CommandVendorORB					= (1 << 7),
-    kFWSBP2CommandDummyORB					= (1 << 8),
-    kFWSBP2CommandCheckGeneration			= (1 << 9),
-	
-	kFWSBP2CommandFixedSize					= (1 << 10),
-	kFWSBP2CommandVirtualORBs				= (1 << 11)     // handy for debugging
-};
-
-enum
-{
-    kFWSBP2MaxPageClusterSize = 0xf000
-};
-
-class IOFireWireSBP2ORB;
-class IOFireWireSBP2LUN;
-class IOFireWireSBP2Login;
-
-/*!
-    @class IOFireWireSBP2ORB
-    @abstract Represents an SBP2 normal command ORB.  Supplies the APIs for configuring normal
-    command ORBs.  This includes setting the command block and writing the page tables for I/O.
-    The ORBs are executed using the submitORB method in IOFireWireSBP2Login.
-*/
-
-class IOFireWireSBP2ORB : public IOCommand
-{
-    OSDeclareDefaultStructors( IOFireWireSBP2ORB )
-
-	friend class IOFireWireSBP2Login;
-	friend class IOFireWireSBP2ManagementORB;
-	
-protected:
-    
-    typedef struct
-    {
-        UInt32		nextORBAddressHi;
-        UInt32		nextORBAddressLo;
-        UInt32		dataDescriptorHi;
-        UInt32		dataDescriptorLo;
-        UInt16		options;
-        UInt16		dataSize;
-        UInt32		commandBlock[1];  // will be variable sized
-     } FWSBP2ORB;
-
-    typedef struct
-    {
-        UInt16		segmentLength;
-        UInt16		segmentBaseAddressHi;
-        UInt32		segmentBaseAddressLo;
-    } FWSBP2PTE;
-
-private:
-
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 8);
-
-protected:    
-
-    virtual void deallocateBufferAddressSpace( void );
-    virtual IOReturn allocateTimer( void );
-    virtual void deallocateTimer( void );
-    
-    /*!
-		@function deallocatePageTable
-		@abstract Frees up memory allocated for the page table.
-		@discussion	Frees all memory associated with the page table.  Undoes what allocatePageTable does. 
-        Calling allocatePageTable again will automatically deallocate the existing page table before 
-        allocating a new one, so this method is not used in most cases.
-	*/
-    
-    virtual void deallocatePageTable( void );
-
-protected:
-	
-    // IOFireWireSBP2Login methods
-	virtual bool initWithLogin( IOFireWireSBP2Login * login );
-    virtual void setNextORBAddress( FWAddress address );
-
-public:
-
-    /*!
-		@function allocatePageTable
-		@abstract Allocates memory for the page table.
-		@discussion	Page table allocation is handle automatically by the ORB, except if the 
-        kFWSBP2CommandFixedSize flags is set.  In this case we will fail to write a page table if we 
-        need more page table space than we have already.  This method is exposed so these drivers 
-        can preallocate as much page table as they need.  This is useful if your driver is part of 
-        the paging path and cannot allow allocations to occur.
-        @param entryCount number of entries of page table to be allocated.
-	*/
-
-    virtual IOReturn allocatePageTable( UInt32 entryCount );
-
-protected:
-
-    virtual bool isTimerSet( void );
-    virtual void cancelTimer( void );
-    
-protected:
-  
-    // reserved for future use
-    struct ExpansionData { };
-    ExpansionData *reserved; 
-       
-    IOFireWireSBP2Login *	fLogin;
-    IOFireWireSBP2LUN * 	fLUN;
-    IOFireWireUnit *		fUnit;
-    IOFireWireController *	fControl;
-    IODMACommand *			fDMACommand;
-	void *					fUnused2;
-	
-    UInt32			fCommandFlags;
-    UInt32			fMaxPayloadSize;
-    UInt32			fTimeoutDuration;
-    UInt32			fGeneration;
-    UInt64			fRefCon;
-
-	//
-    // orb
-    //
-	
-	IOMemoryDescriptor *		fORBDescriptor;
-    FWSBP2ORB *					fORBBuffer;
-	
-    FWAddress 					fORBPseudoAddress;
-    IOFWAddressSpace *			fORBPseudoAddressSpace;
-
-    IOFWAddressSpace *			fORBPhysicalAddressSpace;
-	FWAddress					fORBPhysicalAddress;
-
-	//
-    // page table
-    //
-	
-	UInt32						fPageTableSize;
-    IOBufferMemoryDescriptor *	fPageTableDescriptor;
-
-    IOFWAddressSpace *			fPageTablePhysicalAddressSpace;
-	FWAddress					fPageTablePhysicalAddress;
-	UInt32						fPageTablePhysicalLength;
-	
-	IOFWAddressSpace *			fPageTablePseudoAddressSpace;   
-	FWAddress					fPageTablePseudoAddress;
-
-	//
-    // buffers
-    //
-	
-	IOFWAddressSpace *		fBufferAddressSpace;
-    bool					fBufferAddressSpaceAllocated;
-    IOMemoryDescriptor *	fBufferDescriptor;
-    
-	//
-    // timer
-    //
-	
-	IOFWDelayCommand *		fTimeoutCommand;
-    bool					fTimeoutTimerSet;
-
-	bool					fInProgress;
-	bool					fIsAppended;
-	
-    UInt32					fFetchAgentWriteRetries;
-    UInt32					fPTECount;
-    UInt32					fFetchAgentWriteRetryInterval;
-
-	UInt32					fConstraintOptions;
-
-    virtual IOReturn allocateResources( void );
-    virtual void free( void );
-
-    // orb timeout handler
-    static void orbTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-    virtual void orbTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-
-	// login friend class wrappers
-	virtual IOFireWireUnit * getFireWireUnit( void );
-	virtual IOFireWireSBP2LUN * getFireWireLUN( void );
-  	virtual void deallocateORB( void );
-	virtual IOReturn allocateORB( UInt32 orbSize );
-    virtual IOReturn removeORB( IOFireWireSBP2ORB * orb );
-    virtual void prepareORBForExecution( void );
-    virtual void startTimer( void );
-    virtual void sendTimeoutNotification( IOFireWireSBP2ORB * orb );
-
-public:
- 
-    /*! 
-        @function release
-        @abstract Primary implementation of the release mechanism.
-        @discussion See OSObject.h for more information. 
-        @param when When retainCount == when then call free(). 
-    */
-       
-	virtual void release() const;
-
-    /*! 
-        @function getLogin
-        @abstract Gets the login associated with this ORB.
-        @discussion Returns the IOFireWireSBP2Login object associated with this ORB.
-        @result Returns a pointer to an IOFireWireSBP2Login. 
-    */
-    
-    virtual IOFireWireSBP2Login * getLogin( void );
-
-    /*! 
-        @function setCommandBuffersAsRanges
-        @abstract Creates a page table from a list of ranges.
-        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
-        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
-        The SBP2 services do not release references to the command buffers just because the command 
-        has completed.
-        @param ranges An array of ranges representing the data to be transfered.
-        @param withCount The number of ranges in the ranges array.
-        @param withDirection An IODirection indicating the direction of data transfer.
-        @param withTask The task that these adressses reside in.
-        @param offset Offset in bytes into data to begin writing table at.
-        @param length Number of bytes of data to map from offset.
-        @result Returns KIOReturnSuccess if the page table was written successfully. 
-    */
-    
-    virtual IOReturn setCommandBuffersAsRanges(  IOVirtualRange * ranges,
-                                                 UInt32           withCount,
-                                                 IODirection      withDirection,
-                                                 task_t           withTask,
-                                                 UInt32		offset = 0,
-                                                 UInt32		length = 0 );
-    /*! 
-        @function setCommandBuffersAsRanges
-        @abstract Creates a page table from a list of ranges.
-        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
-        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
-        The SBP2 services do not release references to the command buffers just because the command 
-        has completed.
-        @param memoryDescriptor IOMemoryDescriptor describe ranges to be written to a page table.
-        @param offset Offset in bytes into data to begin writing table at.
-        @param length Number of bytes of data to map from offset.
-        @result Returns KIOReturnSuccess if the page table was written successfully. 
-    */
-    
-    virtual IOReturn setCommandBuffers( IOMemoryDescriptor * memoryDescriptor, UInt32 offset = 0, 
-																				UInt32 length = 0 );
-
-
-    /*! 
-        @function releaseCommandBuffers
-        @abstract Releases SBP2's reference to the command buffers.
-        @discussion When you create a page table with one of the variants of setCommandBuffers.  
-        SBP2 holds on to a reference to the buffers until this method is called.  This means that 
-        if a command completed and you manipulated the memory descriptor or released the buffers 
-        without calling this method you could leave FW in an inconsistent state.  
-        @result Returns KIOReturnSuccess if the page table was cleared successfully. 
-    */
-
-    virtual IOReturn releaseCommandBuffers( void );
-    
-    /*! 
-        @function setCommandBlock
-        @abstract Sets the command block portion of the ORB.
-        @discussion Copys the data provided in the buffer to the command block portion of the ORB.
-        @param buffer Pointer to buffer to copy command block from.
-        @param length Number of bytes of data to copy.
-        @result Returns KIOReturnSuccess if the command block was updated successfully. 
-    */
-    
-    virtual IOReturn setCommandBlock( void * buffer, UInt32 length );
-    
-    /*! 
-        @function setCommandBlock
-        @abstract Sets the command block portion of the ORB.
-        @discussion Copys the data provided in the buffer to the command block portion of the ORB.
-        @param memory IOMemoryDescriptor representing the command block buffer.
-        @result Returns KIOReturnSuccess if the command block was updated successfully. 
-    */
-    
-    virtual IOReturn setCommandBlock( IOMemoryDescriptor * memory );
-    
-    /*! 
-        @function getCommandBufferDescriptor
-        @abstract Returns the memory descriptor representing the command buffer.
-        @discussion Returns the IOMemoryDescriptor for the data mapped by setCommandBuffer variants.  
-        Works for setCommandBuffersAsRanges too.
-        @result Returns memory descriptor representing mapped data buffers. 
-    */
-    
-	virtual IOMemoryDescriptor * getCommandBufferDescriptor( void );
-	
-    // accessors
-    
-    /*! 
-        @function setCommandFlags
-        @abstract Sets configuration flags for the ORB.
-        @discussion Sets the configuration flags for the ORB.  These can be any of the following:
-		<p>kFWSBP2CommandCompleteNotify - Set the notify bit as specified in SBP2 standard. Set to receive completion/timeout notification on this ORB.  You almost always want to set this.</p>
-		<p>kFWSBP2CommandTransferDataFromTarget - Transfer direction as specified in SBP2 standard.  Set if data is to be written by the device into the host's memory.</p>
-		<p>kFWSBP2CommandImmediate - Immediate Append.  ORB address will be written to fetch agent and not chained.  It is only legal to have one immediate ORB in progress at a time.</p>
-		<p>kFWSBP2CommandNormalORB - ORB format 0 - Format specified by SBP2 standard.  Set this for most ORBs.</p>
-		<p>kFWSBP2CommandReservedORB - ORB format 1 - Format reserved by SBP2 standard for future standardization.</p>
-		<p>kFWSBP2CommandVendorORB - ORB format 2 - Format specified by SBP2 standard for vendor dependent ORBs.</p>
-		<p>kFWSBP2CommandDummyORB - ORB format 3 - Format specified by SBP2 standard for dummy ORBs.</p>
-		<p>kFWSBP2CommandCheckGeneration - If set upon submitORB, the ORB will only be appended if generation set with setCommandGeneration() matches the current generation.  Pretty much all SBP2 drivers need sophisticated logic to track login state, so this is generally not used. </p>
-		<p>kFWSBP2CommandFixedSize - Do not allocate more memory for page table if needed.  If there is not enough space in the currently allocated page table, the setCommandBuffers call will fail.  This is important to set if your device is the backing store, as we don't want to cause memory allocations on the paging path. </p>
-		<p>kFWSBP2CommandVirtualORBs - Normally ORBs are backed by physical address spaces.  Setting this flag makes this ORB backed by a pseudo address space.  This can make ORBs easier to see in a bus trace.  Virtual ORBs will have an address in the form of ffcX.XXXX.0000.0000.  Pseudo address space backed ORBs are slower, so you won't want to set for deployment builds.</p>
-        @param flags The flags to be set.
-    */
-    
-    virtual void setCommandFlags( UInt32 flags );
-
-    /*! 
-        @function getCommandFlags
-        @abstract Sets configuration flags for the ORB.
-        @discussion Returns the current configuration flags set on this ORB.
-        @result Return The current ORB flags.
-    */
-    
-    virtual UInt32 getCommandFlags( void );
-
-    /*! 
-        @function setMaxPayloadSize
-        @abstract Sets max payload size for the ORB.
-        @discussion This sets the maximum payload size for this ORB only.  This size is clipped by 
-        the global max payload size set in the login object.
-        @param maxPayloadSize The maximum payload size in bytes.
-    */
-    
-    virtual void setMaxPayloadSize( UInt32 maxPayloadSize );
-
-    /*! 
-        @function getMaxPayloadSize
-        @abstract Gets max payload size for the ORB.
-        @discussion This gets the maximum payload size for this ORB only.
-        @result Returns the maximum payload size in bytes.
-    */
-    
-    virtual UInt32 getMaxPayloadSize( void );
-
-    /*! 
-        @function setCommandTimeout
-        @abstract Sets the timeout of the ORB.
-        @discussion This sets the timeout for the ORB in milliseconds. Note that ORBs without timeouts 
-        can be "lost."  You will obviously not recieve timeout notification for timeouts of zero.  But 
-        perhaps less obviously you will not recieve orb reset notification, which is really a sort of
-        accelerated timeout notification for bus reset situations.  
-        @param timeout The timeout duration in milliseconds.
-    */
-    
-    virtual void setCommandTimeout( UInt32 timeout );
-    
-    /*! 
-        @function getCommandTimeout
-        @abstract Gets the timeout of the ORB.
-        @discussion This method gets the timeout for this ORB in milliseconds.
-        @result Returns the timeout for the orb in milliseconds.
-    */
-    
-    virtual UInt32 getCommandTimeout( void );
-
-
-    /*! 
-        @function setCommandGeneration
-        @abstract Sets the command generation.
-        @discussion This sets the bus generation this ORB should be appended in.  It is only meaningful 
-        when combined with the kFWSBP2CommandCheckGeneration flags above.
-        @param gen The bus generation for command execution.
-    */
-    
-    virtual void setCommandGeneration( UInt32 gen );
-    
-    /*! 
-        @function getCommandGeneration
-        @abstract Gets the command generation.
-        @discussion This gets the bus generation this ORB should be appended in.
-        @result Returns the bus generation for command execution.
-    */
-    
-    virtual UInt32 getCommandGeneration( void );
-
-    /*!
-		@function setRefCon
-		@abstract Sets the ORB refCon.
-		@discussion Sets a user defined value on the ORB that can be retrieved later with the 
-        method getRefCon.
-        @param refCon a user defined value.
-    */
-    
-    virtual void setRefCon( void * refCon );
-
-    /*!
-		@function getRefCon
-		@abstract Returns the refCon set with setRefCon.
-		@discussion Returns the user defined value previously stored in the ORB with setRefCon.
-        @result Returns the previously stored user defined value.
-	*/
-    
-    virtual void * getRefCon( void );
-
-protected:    
-
-    virtual void setToDummy( void );
-
-public:	
-    /*!
-		@function getORBAddress
-		@abstract Returns the FireWire address of this ORB.
-		@discussion Returns the FireWire bus address of this ORB.  This is not the same as the Macintosh 
-        address for the IOFireWireSBP2ORB.
-        @result Returns the FireWire address of this ORB.
-	*/
-    
-    virtual void getORBAddress( FWAddress * address );
-
-protected:
-	
-	virtual bool isAppended( void );
-	virtual void setIsAppended( bool state );
-	virtual UInt32 getFetchAgentWriteRetries( void );
-    virtual void setFetchAgentWriteRetries( UInt32 retries );
-
-    virtual void prepareFastStartPacket( IOBufferMemoryDescriptor * descriptor );
-
-	UInt32 getFetchAgentWriteRetryInterval( void );
-    void setFetchAgentWriteRetryInterval( UInt32 interval );
-
-	IOReturn completeBufferAddressSpace( void );
-	IOReturn prepareBufferAddressSpace( IOMemoryDescriptor * memoryDescriptor );
-
-public:
-
-    /*!
-		@function setBufferConstraints
-		@abstract Configures page table generation parameters
-		@discussion Sets the maximums size of any page table segment and the required alignemnt.  Double buffering
-		may be used to satisfy these constraints. The only supported option is kFWSBP2ConstraintForceDoubleBuffer which
-		forces a page aligned double buffering of the entire descriptor.
-        @result May return an error if there is a problem allocating the underlying resources or if buffers are currently attached.
-	*/
-
-	IOReturn setBufferConstraints( UInt64 maxSegmentSize, UInt32 alignment, UInt32 options = 0);
-
-
-    /*! 
-        @function setCommandBuffersAsRanges64
-        @abstract Creates a page table from a list of 64 bit ranges.
-        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
-        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
-        The SBP2 services do not release references to the command buffers just because the command 
-        has completed. This is a 64 bit compatible version of setCommandBuffersAsRanges.
-        @param ranges An array of ranges representing the data to be transfered.
-        @param withCount The number of ranges in the ranges array.
-        @param withDirection An IODirection indicating the direction of data transfer.
-        @param withTask The task that these adressses reside in.
-        @param offset Offset in bytes into data to begin writing table at.
-        @param length Number of bytes of data to map from offset.
-        @result Returns KIOReturnSuccess if the page table was written successfully. 
-    */
-	   
-    IOReturn setCommandBuffersAsRanges64(	IOAddressRange *	ranges,
-											uint64_t			withCount,
-											IODirection			withDirection,
-											task_t				withTask,
-											uint64_t			offset = 0,
-											uint64_t			length = 0);
-
-    /*!
-		@function setRefCon64
-		@abstract Sets the ORB refCon as a 64 bit value.
-		@discussion Sets a user defined value on the ORB that can be retrieved later with the 
-        method getRefCon.
-        @param refCon a user defined value.
-    */
-    
-    virtual void setRefCon64( UInt64 refCon );
-
-    /*!
-		@function getRefCon64
-		@abstract Returns the 64 bit refCon set with setRefCon64.
-		@discussion Returns the user defined value previously stored in the ORB with setRefCon.
-        @result Returns the previously stored user defined value.
-	*/
-    
-    virtual UInt64 getRefCon64( void );
-
-protected:
-	
-	UInt32	calculateTransferSizeLog( bool * clipping );
-
-
-};
-    
-#endif
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Target.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Target.h.svn-base
deleted file mode 100644
index 4288ce9..0000000
--- a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2Target.h.svn-base
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOFireWireSBP2Target
-  Contains the class definition for IOFireWireSBP2Target.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2TARGET_H
-#define _IOKIT_IOFIREWIRESBP2TARGET_H
-
-#include <IOKit/firewire/IOFireWireUnit.h>
-#include <IOKit/IOService.h>
-
-enum
-{
-    kIOFWSBP2FailsOnAckBusy = (1 << 0),
-	kIOFWSBP2FailsOnBusResetsDuringIO = (1 << 1),
-	kIOFWSBP2DontUsePTPacketLimit = (1 << 2)
-};
-
-/*!
-    @class IOFireWireSBP2Target
-    @abstract Serves as bridge between IOFireWireUnit and IOFireWireLUN.
-    @discussion Matches against IOFireWireUnits supporting the SBP2 protocol.  Creates IOFireWireSBP2LUN nubs 	for matching. Most drivers will match against an IOFireWireSBP2LUN, but matching against an 	IOFireWireSBP2Target is also supported. This can be useful in cases where a single driver wishes to 
-    control all LUNs on a device. Support for this technique is minimal, however, and the driver will be
-    required to discover it's LUNs through the registry.
-*/
-
-class IOFireWireSBP2Target : public IOService
-{
-    OSDeclareDefaultStructors(IOFireWireSBP2Target);
-
-protected:
-	
-	/////////////////////////////////////////
-    // rom keys
-	
-    enum
-    {
-        kCmdSpecIDKey 				= 0x38,
-        kCmdSetKey					= 0x39,
-        kSoftwareRevKey				= 0x3b,
-        kFirmwareRevKey	 			= 0x3c,
-        kLUNKey						= 0x14,
-        kLUNDirectoryKey			= 0xd4,
-        kManagementAgentOffsetKey	= 0x54,
-		kUnitCharacteristicsKey 	= 0x3A,
-		kRevisionKey				= 0x21,
-		kFastStartKey				= 0x3E
-    };
-
-    typedef struct
-    {
-		UInt32 cmdSpecID; 
-		UInt32 cmdSet;
-		UInt32 vendorID;
-		UInt32 softwareRev;
-		UInt32 firmwareRev; 
-		UInt32 lun;
-		UInt32 devType;
-		UInt32 unitCharacteristics;
-		UInt32 managementOffset;
-		UInt32 revision;
-		bool fastStartSupported;
-		UInt32 fastStart;
-    } LUNInfo;
-	
-    // reserved for future use
-    struct ExpansionData 
-	{
-		bool				fStarted;
-		OSArray *			fPendingMgtAgentCommands ;
-		UInt32				fNumberPendingMgtAgentOrbs;
-		UInt32				fNumLUNs;
-	};
-    ExpansionData * fExpansionData; 
-    
-	/////////////////////////////////////////
-	// private fields
-	
-    bool 				fOpenFromTarget;
-    UInt32				fOpenFromLUNCount;    
-    IOFireWireUnit * 	fProviderUnit;
-    UInt32				fFlags;
-    
-	IOFireWireController * fControl;
-	
-	UInt32 				fIOCriticalSectionCount;
-	
-	/////////////////////////////////////////
-	// private internals
-
-    virtual void free( void );	
-    virtual IOReturn message( 	UInt32 type, 
-								IOService * provider,
-								void * argument = 0);
-    
-    virtual void scanForLUNs( void );
-    IOReturn createLUN( LUNInfo * info );
-
-public:
-
-	/////////////////////////////////////////
-	// public methods
-	
-	/*! @function handleOpen
-		@abstract Overrideable method to control the open / close behaviour of an IOService.
-		@discussion See IOService for discussion.		
-		@param forClient Designates the client of the provider requesting the open.
-		@param options Options for the open, may be interpreted by the implementor of handleOpen.
-		@result Return true if the open was successful, false otherwise. */
-
-    virtual bool handleOpen( IOService * forClient, IOOptionBits options, void * arg );
-	
-	/*! 
-		@function handleClose
-		@abstract Overrideable method to control the open / close behaviour of an IOService.
-		@discussion See IOService for discussion.
-		@param forClient Designates the client of the provider requesting the close.
-		@param options Options for the close, may be interpreted by the implementor of handleOpen. 
-	*/
-
-	virtual void handleClose( IOService * forClient, IOOptionBits options );
-
-	/*! 
-		@function handleIsOpen
-		@abstract Overrideable method to control the open / close behaviour of an IOService.
-		@discussion See IOService for discussion.		
-		@param forClient If non-zero, isOpen returns the open state for that client. If zero is passed, isOpen returns the open state for all clients.
-		@result Returns true if the specific, or any, client has the IOService open. 
-	*/
-	
-    virtual bool handleIsOpen(  const IOService * forClient ) const;
-    
-	/*! 
-		@function start
-		@abstract During an IOService instantiation, the start method is called when the IOService has been selected to run on the provider.
-		@discussion See IOService for discussion.
-		@result Return true if the start was successful, false otherwise (which will cause the instance to be detached and usually freed).
-	*/
-	
-    virtual bool start( IOService *provider );
- 
-	/*! 
-		@function stop
-		@abstract During an IOService termination, the stop method is called in its clients before they are detached & it is destroyed.
-		@discussion See IOService for discussion.
-	*/
-   
-	virtual void stop( IOService *provider );
-
-	/*!
-		@function getFireWireUnit
-		@abstract Returns an IOFireWireUnit object.
-		@discussion An IOFireWireUnit is the provider of an IOFireWireSBP2Target.  In order to use the base FireWire services
-		you will need a reference to the unit.  This method returns that reference.
-		@result Returns a pointer to an IOFireWireUnit.
-	*/
-	
-    virtual IOFireWireUnit * getFireWireUnit( void );
-	
-	/*! 
-		@function matchPropertyTable
-		@abstract Implements SBP2 specific matching.
-		@discussion See IOService for discussion.
-	    @param table The dictionary of properties to be matched against.
-		@result Returns false if the family considers the matching dictionary does not match in properties it understands, true otherwise.
-	*/
-	
-	virtual bool matchPropertyTable( OSDictionary * table );
-
-    virtual void setTargetFlags( UInt32 flags );
-    virtual UInt32 getTargetFlags( void );
-
-protected:
-    virtual void configurePhysicalFilter( void );
-
-public:
-    virtual void clearTargetFlags( UInt32 flags );
-	virtual IOReturn beginIOCriticalSection( void );
-	virtual void endIOCriticalSection( void );
-
-    virtual bool finalize( IOOptionBits options );
-    
-    IOReturn 	synchMgmtAgentAccess( IOFWCommand * mgmtOrbCommand );
-	void		completeMgmtAgentAccess( );
-	void 		clearMgmtAgentAccess( );
-	void		cancelMgmtAgentAccess( IOFWCommand * mgmtOrbCommand );
-
-protected:
-
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 8);	
-    
-};
-
-#endif
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClient.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClient.h.svn-base
deleted file mode 100644
index 939dbf0..0000000
--- a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClient.h.svn-base
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOFIREWIRESBP2USERCLIENT_H
-#define _IOKIT_IOFIREWIRESBP2USERCLIENT_H
-
-#include <IOKit/IOUserClient.h>
-
-#define FIREWIREPRIVATE
-#include <IOKit/firewire/IOFireWireController.h>
-#undef FIREWIREPRIVATE
-
-#include <IOKit/firewire/IOFWUserObjectExporter.h>
-
-#include <IOKit/sbp2/IOFireWireSBP2UserClientCommon.h>
-#include <IOKit/sbp2/IOFireWireSBP2LUN.h>
-
-class IOFireWireSBP2UserClient : public IOUserClient
-{
-    OSDeclareDefaultStructors(IOFireWireSBP2UserClient)
-
-protected:
-
-    bool					fOpened;
-	bool					fStarted;
-    IOFireWireSBP2Login * 	fLogin;
-    task_t					fTask;
-	
-    IOFireWireSBP2LUN *		fProviderLUN;
-    OSAsyncReference64		fMessageCallbackAsyncRef;
-    OSAsyncReference64		fLoginCallbackAsyncRef;
-    OSAsyncReference64		fLogoutCallbackAsyncRef;
-    OSAsyncReference64		fUnsolicitedStatusNotifyAsyncRef;
-    OSAsyncReference64		fStatusNotifyAsyncRef;
-    OSAsyncReference64		fFetchAgentResetAsyncRef;
-	OSAsyncReference64		fFetchAgentWriteAsyncRef;
-	
-	IOFWUserObjectExporter	*	fExporter;
-	
-	IOFireWireLib::UserObjectHandle		fSessionRef;
-	
- 	virtual IOReturn externalMethod(	uint32_t selector, 
-										IOExternalMethodArguments * args,
-										IOExternalMethodDispatch * dispatch, 
-										OSObject * target, 
-										void * reference );
-public:
-
-	virtual bool initWithTask( task_t owningTask, void * securityToken, UInt32 type, OSDictionary * properties );
-	virtual void free ();
-				
-    virtual bool start( IOService * provider );
-
-    virtual IOReturn clientClose( void );
-    virtual IOReturn clientDied( void );
-
-	// IOFireWireSBP2ManagementORB friend class wrappers
-	virtual void flushAllManagementORBs( void );
-
-    /////////////////////////////////////////////////
-    // IOFireWireSBP2LUN
-
-    IOReturn open( IOExternalMethodArguments * arguments );
-	IOReturn openWithSessionRef( IOExternalMethodArguments * arguments );
-	IOReturn getSessionRef( IOExternalMethodArguments * arguments );
-    IOReturn close( IOExternalMethodArguments * arguments );
-
-    // callbacks
-	IOReturn setMessageCallback( IOExternalMethodArguments * arguments );
-    virtual IOReturn message( UInt32 type, IOService * provider, void * arg );
-
-    /////////////////////////////////////////////////
-    // IOFireWireSBP2Login
-    
-    IOReturn setLoginCallback( IOExternalMethodArguments * arguments );
-	IOReturn setLogoutCallback( IOExternalMethodArguments * arguments );
-    IOReturn setUnsolicitedStatusNotify( IOExternalMethodArguments * arguments );
-    IOReturn setStatusNotify( IOExternalMethodArguments * arguments );
-	IOReturn createLogin( IOExternalMethodArguments * arguments );
-    IOReturn releaseLogin( IOExternalMethodArguments * arguments );
-    IOReturn submitLogin( IOExternalMethodArguments * arguments );
-    IOReturn submitLogout( IOExternalMethodArguments * arguments );
-	IOReturn setLoginFlags( IOExternalMethodArguments * arguments );
-    IOReturn getMaxCommandBlockSize( IOExternalMethodArguments * arguments );
-    IOReturn getLoginID( IOExternalMethodArguments * arguments );
-    IOReturn setReconnectTime( IOExternalMethodArguments * arguments );
-	IOReturn setMaxPayloadSize( IOExternalMethodArguments * arguments );
-    
-	IOReturn submitFetchAgentReset( IOExternalMethodArguments * arguments );
-	IOReturn setFetchAgentWriteCompletion( IOExternalMethodArguments * arguments );
-	IOReturn ringDoorbell( IOExternalMethodArguments * arguments );
-	IOReturn enableUnsolicitedStatus( IOExternalMethodArguments * arguments );
-	IOReturn setBusyTimeoutRegisterValue( IOExternalMethodArguments * arguments );
-    IOReturn setPassword( IOExternalMethodArguments * arguments );
-
-	// callbacks
-	
-	static void staticLoginCallback( void * refCon, FWSBP2LoginCompleteParamsPtr params );
-    virtual void loginCallback( FWSBP2LoginCompleteParamsPtr params );
-
-	static void staticLogoutCallback( void * refCon, FWSBP2LogoutCompleteParamsPtr params );
-    virtual void logoutCallback( FWSBP2LogoutCompleteParamsPtr params );
-
-	static void staticStatusNotify( void * refCon, FWSBP2NotifyParams * params );
-    virtual void statusNotify( FWSBP2NotifyParams * params );
-
-	static void staticUnsolicitedNotify( void * refCon, FWSBP2NotifyParams * params );
-    virtual void unsolicitedNotify( FWSBP2NotifyParams * params );
-
-	static void staticFetchAgentWriteComplete( void * refCon, IOReturn status, IOFireWireSBP2ORB * orb );
-	virtual void fetchAgentWriteComplete( IOReturn status, IOFireWireSBP2ORB * orb );
-
-    static void staticFetchAgentResetComplete( void * refCon, IOReturn status );
-    virtual void fetchAgentResetComplete( IOReturn status );
-	
-    /////////////////////////////////////////////////
-    // IOFireWireSBP2ORB
-
-    IOReturn createORB(  IOExternalMethodArguments * arguments );
-    IOReturn releaseORB(  IOExternalMethodArguments * arguments );
-	IOReturn submitORB(  IOExternalMethodArguments * arguments );
-    IOReturn setCommandFlags(  IOExternalMethodArguments * arguments );
-    IOReturn setORBRefCon(  IOExternalMethodArguments * arguments );
-	IOReturn setMaxORBPayloadSize(  IOExternalMethodArguments * arguments );
-    IOReturn setCommandTimeout(  IOExternalMethodArguments * arguments );
-	IOReturn setCommandGeneration(  IOExternalMethodArguments * arguments );
-    IOReturn setToDummy(  IOExternalMethodArguments * arguments );
-    IOReturn setCommandBuffersAsRanges(  IOExternalMethodArguments * arguments );
-    IOReturn releaseCommandBuffers(  IOExternalMethodArguments * arguments );
-    IOReturn setCommandBlock(  IOExternalMethodArguments * arguments );
-	
-	// LSI workaround
-    IOReturn LSIWorkaroundSetCommandBuffersAsRanges(  IOExternalMethodArguments * arguments );
-	IOReturn LSIWorkaroundSyncBuffersForOutput(  IOExternalMethodArguments * arguments );
-	IOReturn LSIWorkaroundSyncBuffersForInput(  IOExternalMethodArguments * arguments );
-															
-    /////////////////////////////////////////////////
-    // IOFireWireSBP2MgmtORB
-
-	IOReturn createMgmtORB(  IOExternalMethodArguments * arguments );
-    IOReturn releaseMgmtORB(  IOExternalMethodArguments * arguments );
-    IOReturn setMgmtORBCallback(  IOExternalMethodArguments * arguments );
-    IOReturn submitMgmtORB(  IOExternalMethodArguments * arguments );	
-	IOReturn setMgmtORBCommandFunction(  IOExternalMethodArguments * arguments );
-	IOReturn setMgmtORBManageeORB(  IOExternalMethodArguments * arguments );
-	IOReturn setMgmtORBManageeLogin(  IOExternalMethodArguments * arguments );
-	IOReturn setMgmtORBResponseBuffer(  IOExternalMethodArguments * arguments );
-
-	// callbacks
-    static void staticMgmtORBCallback( void * refCon, IOReturn status, IOFireWireSBP2ManagementORB * orb );
-    virtual void mgmtORBCallback( IOReturn status, IOFireWireSBP2ManagementORB * orb );
-	
-	// IOFireWireSBP2MgmtORB friend class wrappers
-	virtual void setMgmtORBAsyncCallbackReference( IOFireWireSBP2ManagementORB * orb, void * asyncRef );    
-	virtual void getMgmtORBAsyncCallbackReference( IOFireWireSBP2ManagementORB * orb, void * asyncRef );
-
-	    uint32_t		   checkScalarInputCount;
-    uint32_t		   checkStructureInputSize;
-    uint32_t		   checkScalarOutputCount;
-    uint32_t		   checkStructureOutputSize;
-    
-    IOReturn checkArguments( IOExternalMethodArguments * args, uint32_t scalarInCount, uint32_t structInCount, 
-    													uint32_t scalarOutCount, uint32_t structOutCount );
-
-};
-
-#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClientCommon.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClientCommon.h.svn-base
deleted file mode 100644
index cb114ba..0000000
--- a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSBP2UserClientCommon.h.svn-base
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOFIREWIRESBP2USERCLIENTCOMMON_H_
-#define _IOKIT_IOFIREWIRESBP2USERCLIENTCOMMON_H_
-
-#define kIOFireWireSBP2LibConnection 12
-
-enum IOFWSBP2UserClientCommandCodes {
-    kIOFWSBP2UserClientOpen,						// kIOUCScalarIScalarO 0,0
-    kIOFWSBP2UserClientClose,						// kIOUCScalarIScalarO 0,0
-    kIOFWSBP2UserClientCreateLogin,					// kIOUCScalarIScalarO 0,1
-    kIOFWSBP2UserClientReleaseLogin,				// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSubmitLogin,					// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSubmitLogout,				// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSetLoginFlags,				// kIOUCScalarIScalarO 2,0
-    kIOFWSBP2UserClientGetMaxCommandBlockSize,		// kIOUCScalarIScalarO 1,1
-    kIOFWSBP2UserClientGetLoginID,					// kIOUCScalarIScalarO 1,1
-    kIOFWSBP2UserClientSetReconnectTime,			// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSetMaxPayloadSize,			// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientCreateORB,					// kIOUCScalarIScalarO 0,1
-    kIOFWSBP2UserClientReleaseORB,					// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSubmitORB,					// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSetCommandFlags,  			// kIOUCScalarIScalarO 2,0
-    kIOFWSBP2UserClientSetMaxORBPayloadSize, 		// kIOUCScalarIScalarO 2,0
-    kIOFWSBP2UserClientSetCommandTimeout, 			// kIOUCScalarIScalarO 2,0
-    kIOFWSBP2UserClientSetCommandGeneration, 		// kIOUCScalarIScalarO 2,0
-    kIOFWSBP2UserClientSetToDummy,	  				// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSetCommandBuffersAsRanges,	// kIOUCScalarIScalarO 6,0
-    kIOFWSBP2UserClientReleaseCommandBuffers, 		// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSetCommandBlock,	  			// kIOUCScalarIScalarO 3,0
-	kIOFWSBP2UserClientCreateMgmtORB,     			// kIOUCScalarIScalarO 0,1
-	kIOFWSBP2UserClientReleaseMgmtORB,   			// kIOUCScalarIScalarO 1,0
-	kIOFWSBP2UserClientSubmitMgmtORB,    			// kIOUCScalarIScalarO 1,0
-	kIOFWSBP2UserClientMgmtORBSetCommandFunction,   // kIOUCScalarIScalarO 2,0
-	kIOFWSBP2UserClientMgmtORBSetManageeORB,  		// kIOUCScalarIScalarO 2,0
-	kIOFWSBP2UserClientMgmtORBSetManageeLogin,    	// kIOUCScalarIScalarO 2,0
-	kIOFWSBP2UserClientMgmtORBSetResponseBuffer,    // kIOUCScalarIScalarO 3,0
-	kIOFWSBP2UserClientLSIWorkaroundSetCommandBuffersAsRanges, // kIOUCScalarIScalarO 6,0
-	kIOFWSBP2UserClientMgmtORBLSIWorkaroundSyncBuffersForOutput, // kIOUCScalarIScalarO 1,0
-	kIOFWSBP2UserClientMgmtORBLSIWorkaroundSyncBuffersForInput, // kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientOpenWithSessionRef,			// kIOUCScalarIScalarO 1,0
-	kIOFWSBP2UserClientGetSessionRef,				// kIOUCScalarIScalarO 0,1
-	kIOFWSBP2UserClientRingDoorbell,				// kIOUCScalarIScalarO 1, 0
-	kIOFWSBP2UserClientEnableUnsolicitedStatus, // kIOUCScalarIScalarO 1, 0
-	kIOFWSBP2UserClientSetBusyTimeoutRegisterValue,   // kIOUCScalarIScalarO 2, 0
-	kIOFWSBP2UserClientSetORBRefCon, 				// kIOUCScalarIScalarO 2, 0
-	kIOFWSBP2UserClientSetPassword,					// kIOUCScalarIScalarO 3, 0
-    kIOFWSBP2UserClientSetMessageCallback,   		// kIOUCScalarIScalarO 2, 0
-    kIOFWSBP2UserClientSetLoginCallback,			// kIOUCScalarIScalarO 2, 0
-    kIOFWSBP2UserClientSetLogoutCallback,			// kIOUCScalarIScalarO 2, 0
-    kIOFWSBP2UserClientSetUnsolicitedStatusNotify, 	// kIOUCScalarIScalarO 2, 0
-    kIOFWSBP2UserClientSetStatusNotify, 			// kIOUCScalarIScalarO 2, 0
-	kIOFWSBP2UserClientSetMgmtORBCallback,  		// kIOUCScalarIScalarO 3, 0
-	kIOFWSBP2UserClientSubmitFetchAgentReset,  		// kIOUCScalarIScalarO 3, 0
-	kIOFWSBP2UserClientSetFetchAgentWriteCompletion, // kIOUCScalarIScalaO 2, 0
-    kIOFWSBP2UserClientNumCommands
-};
-
-#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSerialBusProtocolTransport.h.svn-base b/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSerialBusProtocolTransport.h.svn-base
deleted file mode 100644
index 53e6195..0000000
--- a/i386/include/IOKit/sbp2/.svn/text-base/IOFireWireSerialBusProtocolTransport.h.svn-base
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-/*!
-  @header IOFireWireSerialBusProtocolTransport
-  Contains the class definition for IOFireWireSerialBusProtocolTransport.
-*/
-
-
-#ifndef _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_
-#define _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_
-
-
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/IOLib.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOCommandPool.h>
-#include <IOKit/firewire/IOFireWireUnit.h>
-#include <IOKit/sbp2/IOFireWireSBP2LUN.h>
-
-#include <IOKit/scsi/IOSCSIProtocolServices.h>
-
-/*!
-	@class IOFireWireSerialBusProtocolTransport
-	@abstract SCSI Protocol Driver Family for FireWire SBP2 Devices. 
-	@discussion IOFireWireSerialBusProtocolTransport contains all the bus specific support for FireWire
-	SBP2 compliant devices. To add vendor specific features or workarounds you will sub-class the appropriate
-	methods of this family. 
-*/
-
-class IOFireWireSerialBusProtocolTransport : public IOSCSIProtocolServices
-{
-	
-	OSDeclareDefaultStructors ( IOFireWireSerialBusProtocolTransport )
-	
-private:
-	
-	IOFireWireUnit *				fUnit;
-	IOFireWireSBP2LUN *				fSBPTarget;
-	IOFireWireSBP2Login *			fLogin;
-	IOFireWireSBP2ORB *				fORB;
-	IOFireWireSBP2ManagementORB * 	fLUNResetORB;
-	
-	// /!\ WARNING! NOT USED left behind for legacy binary reasons
-	IOSimpleLock *					fQueueLock;
-	
-	UInt32							fLoginRetryCount;
-	bool							fDeferRegisterService;
-	bool							fNeedLogin;
-    
-    // /!\ WARNING! NOT USED left behind for legacy binary reasons
-	bool							fPhysicallyConnected;
-	
-	static void
-	StatusNotifyStatic ( void * refCon, FWSBP2NotifyParamsPtr params );
-	
-	static void
-	UnsolicitedStatusNotifyStatic (	void * 					refCon,
-									FWSBP2NotifyParamsPtr 	params );
-	
-	static void
-	LunResetCompleteStatic (	void * 							refCon,
-								IOReturn						status,
-								IOFireWireSBP2ManagementORB * 	orb );
-	
-	static void
-	FetchAgentResetCompleteStatic (	void * refcon,
-									IOReturn status );
-	
-	static IOReturn
-	ConnectToDeviceStatic (	OSObject * refCon, void *, void *, void *, void * );
-	
-	virtual void
-	FetchAgentResetComplete ( IOReturn status );
-	
-	static void LoginCompletionStatic ( void * refCon, FWSBP2LoginCompleteParams * params );
-	
-	static void
-	LogoutCompletionStatic ( void * refCon, FWSBP2LogoutCompleteParams * params );
-	
-	/*!
-		@function CoalesceSenseData
-		@abstract CoalesceSenseData convert a SBP-2 status block into a SPC-2 sense block.
-		@discussion	CoalesceSenseData pulls the appropriate bits out of the SBP2 sense block
-		as defined in SBP-2 Annex B section B.2 and dynamically builds a sense data block as
-		defined in SPC-2 section 7.23.2.
-	*/
-	
-	SCSITaskStatus
-	CoalesceSenseData (	FWSBP2StatusBlock *	sourceData,
-						UInt8				quadletCount,
-						SCSI_Sense_Data *	targetData );
-	
-	virtual void ConnectToDevice ( void );
-	
-	virtual void DisconnectFromDevice ( void );
-	
-	virtual bool IsDeviceCPUInDiskMode ( void );
-
-protected:
-    
-	/*!
-		@function AllocateResources
-		@abstract Allocate Resources.
-		@discussion	Called from start method to allocate needed resources.
-	*/
-    
-	virtual IOReturn AllocateResources ( void );
-    
-	/*!
-		@function DeallocateResources
-		@abstract Deallocate Resources.
-		@discussion	Called from cleanUp method to deallocate resources.
-	*/
-    
-	virtual void DeallocateResources ( void );
-	
-	enum SBP2LoginState
-	{
-		kFirstTimeLoggingInState,
-		kLogginSucceededState,
-		kLogginFailedState
-	};
-	
-	/*! 
-		@typedef SBP2ClientOrbData
-		@param orb IOFireWireSBP2ORB for request.
-		@param scsiTask SCSITaskIdentifier of request. 
-		@param serviceResponse SCSIServiceResponse of request.
-		@param taskStatus SCSITaskStatus of request.
-		@discussion This structure is stuffed into the refcon so we can associate which
-		IOFireWireSBP2ORB and SCSITaskIdentifier is completing.
-	*/
-	
-	typedef struct {
-		IOFireWireSBP2ORB *				orb;
-		SCSITaskIdentifier 				scsiTask;
-		SCSIServiceResponse 			serviceResponse;
-		SCSITaskStatus					taskStatus;
-		IOBufferMemoryDescriptor *		quadletAlignedBuffer;
-	} SBP2ClientOrbData;
-	
-	static const UInt32 kDefaultBusyTimeoutValue	= 0x0000000F;
-	static const UInt64 kMaxFireWireLUN				= 0xFFFF;
-	static const UInt32 kMaxFireWirePayload			= 4096;
-	static const UInt32 kMaxLoginRetryCount			= 8;
-	static const UInt32 kMaxReconnectCount			= 128;
-	static const UInt32 kCSRModelInfoKey			= 0x17;
-
-	UInt32	fReconnectCount;
-	bool 	fLoggedIn;
-	
-	// binary compatibility instance variable expansion
-	struct ExpansionData
-	{ 
-		IOCommandPool *		fCommandPool;
-		IOCommandPool *		fSubmitQueue;
-		SBP2LoginState		fLoginState;
-		bool				fLUNResetPathFlag;
-		int					fLUNResetCount;
-		bool				fAlwaysSetSenseData;
-		bool				fAutonomousSpinDownWorkAround;
-	};
-	
-	ExpansionData * reserved;
-	
-	bool fObjectIsOpen;
-
-	/*!
-		@function CommandORBAccessor
-		@abstract accessor function for fORB.
-		@discussion	xxx.
-	*/
-
-	IOFireWireSBP2ORB * CommandORBAccessor ( void );
-   
-	/*!
-		@function SBP2LoginAccessor
-		@abstract accessor function for fLogin.
-		@discussion	xxx.
-	*/
-
-	IOFireWireSBP2Login * SBP2LoginAccessor ( void );
-
-	virtual IOReturn
-	message ( UInt32 type, IOService * provider, void * argument = 0 );
-
-	/*!
-		@function SendSCSICommand
-		@abstract Prepare and send a SCSI command to the device.
-		@discussion	The incoming SCSITaskIdentifier gets turned into a IOFireWireSBP2ORB
-		and is submitted to the SBP2 layer. See IOSCSIProtocolServices.h for more details
-		regarding SendSCSICommand. Also see IOFireWireSBP2Lib.h for details regarding the
-		IOFireWireSBP2ORB structure and the submitORB method.
-		@result If the command was sent to the device and is pending completion, the
-		subclass should return true and return back the kSCSIServiceResponse_Request_In_Process response.
-		If the command completes immediately with an error, the subclass will return true
-		and return back the appropriate status. If the subclass is currently processing all the
-		commands it can, the subclass will return false and the command will be resent next time
-		CommandCompleted is called.
-	*/
-
-	virtual bool 
-	SendSCSICommand (	SCSITaskIdentifier 		request,
-						SCSIServiceResponse *	serviceResponse,
-						SCSITaskStatus *		taskStatus );
-
-	/*!
-		@function SetCommandBuffers
-		@abstract Method to set orb's buffers.
-		@discussion	This method was added so that subclasses can override and massage buffers as
-		needed. The default simply calls setCommandBuffers. See IOFireWireSBP2Lib.h for details
-		regarding the setCommandBuffers method.
-		@result xxx.
-	*/
-	
-	virtual IOReturn
-	SetCommandBuffers (	IOFireWireSBP2ORB * orb, SCSITaskIdentifier request );
-
-	/*!
-		@function CompleteSCSITask
-		@abstract This qualifies and sets appropriate data then calls CommandCompleted.
-		@discussion	See IOSCSIProtocolServices.h for more details
-		regarding CommandCompleted.
-	*/
-	
-	virtual void 
-	CompleteSCSITask ( IOFireWireSBP2ORB * orb );
-
-	/*!
-		@function AbortSCSICommand
-		@abstract This method is intended to abort an in progress SCSI Task.
-		@discussion	Currently not implemented in super class. This is a stub method for adding
-		the abort command in the near future.
-		@result See SCSITask.h for SCSIServiceResponse codes.
-	*/
-	
-	virtual SCSIServiceResponse 
-	AbortSCSICommand ( SCSITaskIdentifier request );
-
-	/*!
-		@function StatusNotify
-		@abstract This is our handler for status.
-		@discussion See IOFireWireSBP2Lib.h for details regarding the FWSBP2NotifyParams
-		structure that is passed in to the completion..
-	*/
-	
-	virtual void
-	StatusNotify ( FWSBP2NotifyParams * params );
-
-	/*!
-		@function SetValidAutoSenseData
-		@abstract Set the auto sense data that was returned for a given SCSI Task.
-		@discussion	SetValidAutoSenseData is called to qualify sense data that is copied to the
-		client via the SetAutoSenseData method. See IOSCSIProtocolServices.h for more details
-		regarding SetAutoSenseData.
-	*/
-	
-	void
-	SetValidAutoSenseData (	SBP2ClientOrbData *	clientData,
-							FWSBP2StatusBlock *	statusBlock,
-							SCSI_Sense_Data *	targetData );
-	
-	/*!
-		@function UnsolicitedStatusNotify
-		@abstract This is our handler for unsolicited status.
-		@discussion	After we have parsed and handled the unsolicited status we call 
-		enableUnsolicitedStatus. See IOFireWireSBP2Lib.h for details regarding the
-		enableUnsolicitedStatus method.
-	*/
-	
-	virtual void
-	UnsolicitedStatusNotify ( FWSBP2NotifyParamsPtr params );
-
-	/*!
-		@function LoginCompletion
-		@abstract Completion routine for login complete.
-		@discussion	See IOFireWireSBP2Lib.h for details regarding the FWSBP2LogoutCompleteParams
-		structure that is passed in to the completion.
-	*/
-	
-	virtual void 
-	LoginCompletion ( FWSBP2LoginCompleteParams * params );
-
-	/*!
-		@function LogoutCompletion
-		@abstract Completion routine for logout complete.
-		@discussion	See IOFireWireSBP2Lib.h for details regarding the FWSBP2LogoutCompleteParams
-		structure that is passed in to the completion.
-	*/
-	
-	virtual void 
-	LogoutCompletion ( FWSBP2LogoutCompleteParams * params );
-
-	/*!
-		@function IsProtocolServiceSupported
-		@abstract Determine is specified feature is supported by the protocol layer.
-		@discussion	If the service has a value that must be returned, it will be returned in the
-		serviceValue output parameter. See IOSCSIProtocolServices.h for more details regarding
-		IsProtocolServiceSupported.
-		@result Will return true if the specified feature is supported by the protocol layer.
-	*/
-
-	virtual bool
-	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
-
-	/*!
-		@function HandleProtocolServiceFeature
-		@abstract Handle specified feature supported by the protocol layer.
-		@discussion	See IOSCSIProtocolServices.h for more details regarding HandleProtocolServiceFeature.
-		@result Will return true if the specified feature is supported by the protocol layer.
-	*/
-
-	virtual bool
-	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
-   
-	/*!
-		@function LunResetComplete
-		@abstract Callback to submit Fetch Agent Reset.
-		@discussion	See IOFireWireSBP2Lib.h for details regarding the submitFetchAgentReset
-		method.
-	*/
-	
-	virtual void
-	LunResetComplete ( IOReturn status, IOFireWireSBP2ManagementORB * orb );
-
-public:
-
-	/*!
-		@function init
-		@abstract See IOService for discussion.
-		@discussion	Setup and prime class into known state.
-	*/
-	
-	bool init ( OSDictionary * propTable );
-
-	/*! 
-		@function start
-		@discussion See IOService for discussion.
-		@result Return true if the start was successful, false otherwise ( which will
-		cause the instance to be detached and usually freed ).
-	*/
-
-	virtual bool start ( IOService * provider );
-	
-	/*!
-	 	@function cleanUp
-		@abstract cleanUp is called to tear down IOFireWireSerialBusProtocolTransport.
-		@discussion	cleanUp is called when we receive a kIOFWMessageServiceIsRequestingClose
-		message or if we fail our initialization.
-	*/
-	
-	virtual void cleanUp ( void );
-	
-	/*!
-		@function finalize
-		@abstract See IOService for discussion.
-		@result Returns true.
-	*/
-	
-	virtual bool finalize ( IOOptionBits options );
-
-	/*! 
-		@function free
-		@discussion See IOService for discussion.
-		@result none.
-	*/
-	
-	virtual void free ( void );
-		
-protected:
-	
-	virtual IOReturn login ( void );
-    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 1 );
-    
-	virtual IOReturn submitLogin ( void );
-    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 2 );
-    
-	virtual void loginLost ( void );
-    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 3 );
-    
-    void loginSuspended ( void );
-	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 4 );
-   
-	virtual void loginResumed ( void );
-	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 5 );
-
-	static IOReturn CriticalOrbSubmissionStatic ( 
-			OSObject * refCon, 
-			void * val1,
-			void * val2,
-			void * val3,
-			void * val4 );
-
-	/*!
-		@function CriticalOrbSubmission
-		@abstract xxx.
-		@discussion	xxx.
-		@result none.
-	*/
-	
-	void
-		CriticalOrbSubmission (
-			IOFireWireSBP2ORB * orb,
-			SCSITaskIdentifier request );
-	
-	virtual void submitOrbFromQueue ( void );
-	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 6 );
-	
-private:
-	
-	// binary compatibility reserved method space
-    
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 7 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 8 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 9 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 10 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 11 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 12 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 13 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 14 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 15 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 16 );
-	
-};
-
-#endif	/* _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2LSIWorkaroundDescriptor.h b/i386/include/IOKit/sbp2/IOFireWireSBP2LSIWorkaroundDescriptor.h
deleted file mode 100644
index 178ef00..0000000
--- a/i386/include/IOKit/sbp2/IOFireWireSBP2LSIWorkaroundDescriptor.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#if __ppc__
-
-/*!
-  @header IOFireWireSBP2LSIWorkaroundDescriptor
-  Contains the class definition for IOFireWireSBP2LSIWorkaroundDescriptor.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2LSIWORKAROUNDDESCRIPTOR_H
-#define _IOKIT_IOFIREWIRESBP2LSIWORKAROUNDDESCRIPTOR_H
-
-#include <IOKit/IOMemoryDescriptor.h>
-
-class IOFireWireSBP2LSIRange;
-
-/*!
-    @class IOFireWireSBP2LSIWorkaroundDescriptor
-    @abstract This is a subclass of IOGeneralMemoryDescriptor. It is designed to work around
-    a hardware problem in a common SBP2 target.  It takes a memory descriptor as
-	an argument.  It retains this descriptor and returns a new one with resegmented
-	physical segments and potentially some "unfixable" segments double buffered.
-
-    If the transfer will cause data to be sent from the Mac, syncBuffersForOutput
-    must be called before the transfer.
-    
-    If the transfer will cause data to be recieve by the Mac, syncBuffersForInput
-    must be called after the transfer.
-
-    This class calculates the new segmentation only once when it is created.
-    Any changes to the structure of the original memory descriptor will render
-    this one useless.  It must be released and a new IOFireWireSBP2LSIWorkaroundDescriptor
-    can be created.
-    
-    LSI Bridge Workaround Algorithm Details
-    
-    Goals:
-    1. Avoid LSI Logic "< 16 byte" bug - prevent any data packet smaller than 16 bytes
-    2. Minimize double-buffering
-    3. Support non-multiple-of-512-byte devices, e.g. CD Audio
-    
-    Solution:
-    Write a page table such that the bridge will nor use packets smaller than 16 bytes.
-    In other words, rearrange the memory descriptor to avoid the bug, and do it such
-    that the SBP-2 layer will not break up a segment (du ro the 64k-1 limit) and
-    re-introduces the problem
-
-    SBP-2 defines the kFWSBP2MaxPageClusterSize constant.   We simply make sure
-    none of our segments are larger than this size and SBP-2 will not break them
-    up when it writes the SBP-2 page table.
-    
-    Notes:
-    - Some double buffering is unavoidable.  Discontiguous pages may yield page
-    fragments at the start or end of the buffer (or both, with non-512x buffers).
-    solution uses less than 33 bytes of double-buffer per segment in original
-    memory descriptor.
-    - If driver must break up IO to meet ATA limit of 255 (250?) blocks, assume
-    the driver does this at a higher level (before applying workaround).
-    - It is expected that the original memory descriptor has been prepared (wired)
-*/
-
-class IOFireWireSBP2LSIWorkaroundDescriptor : public IOGeneralMemoryDescriptor
-{
-	OSDeclareDefaultStructors(IOFireWireSBP2LSIWorkaroundDescriptor)
-
-	friend class IOFireWireSBP2LSIRange;
-
-protected:
-
-    // reserved for future use
-    struct ExpansionData { };
-    ExpansionData *reserved; 
-    
-	bool	fFixedCapacity; 	// for both allocators
-	
-	//////////////////////////////////////
-	// for range allocator
-
-	OSArray *				fPermanentRanges;
-	UInt32					fAllocatedRangesCount;
-
-	virtual IOReturn rangeAllocatorInitialize( UInt32 rangeCount );
-	virtual void rangeAllocatorDeallocateAllRanges( void );
-	virtual IOFireWireSBP2LSIRange * rangeAllocatorNewRange( void );
-	virtual void rangeAllocatorFree( void );
-
-	//////////////////////////////////////
-	// for buffer allocator
-	
-	OSArray *				fBufferDescriptors;
-	UInt32					fPermanentPages;
-	IOByteCount				fAllocatedBytesCount;
-
-	virtual IOReturn bufferAllocatorInitialize( IOByteCount requestedBufferSize );
-	virtual void bufferAllocatorDeallocateAllBuffers( void );
-	virtual void * bufferAllocatorNewBuffer( IOPhysicalAddress * address );
-	virtual void bufferAllocatorFree( void );
-
-	//////////////////////////////////////
-	// for range table allocator
-	
-	IOPhysicalRange * 		fRangeTable;
-	IOByteCount				fRangeTableSize;
-
-	virtual IOReturn rangeTableAllocatorInitialize( UInt32 requestedBufferSize );
-	virtual IOPhysicalRange * rangeTableAllocatorNewTable( UInt32 entries );
-	virtual void rangeTableAllocatorFree( void );
-
-	//////////////////////////////////////
-	// for workaround
-
-	IOMemoryDescriptor * 	fOriginalDesc;	
-	OSArray *				fRanges;	
-	IOByteCount 			fOffset;
-	IOByteCount				fLength;
-	IODirection				fDirection;
-	
-						  
-	virtual bool initWithCapacity
-					( UInt32 permanentRanges, IOByteCount permanentBufferSpace, bool fixedCapacity );
-
-	virtual void free();
-	
-	virtual IOReturn resetToInitialCapacity( void );
-	virtual IOReturn initializeRangesArray( void );
-	virtual IOReturn recalculateSmallSegments( void );
-	virtual IOReturn splitLargeSegments( void );
-	virtual IOReturn resegmentOddLengthSegments( void );
-	virtual IOReturn initializeBuffers( void );
-
-	virtual bool initWithAddress( void *      address,       /* not supported */
-                                  IOByteCount withLength,
-                                  IODirection withDirection );
-
-    virtual bool initWithAddress( vm_address_t address,      /* not supported */
-                                  IOByteCount  withLength,
-                                  IODirection  withDirection,
-                                  task_t       withTask );
-
-    virtual bool initWithPhysicalAddress( 
-                                  IOPhysicalAddress address, /* not supported */
-                                  IOByteCount       withLength,
-                                  IODirection       withDirection );
-
-    virtual bool initWithPhysicalRanges( 
-                                  IOPhysicalRange * ranges,  /* not supported */
-                                  UInt32            withCount,
-                                  IODirection       withDirection,
-                                  bool              asReference = false );
-
-    virtual bool initWithRanges(  IOVirtualRange * ranges,   /* not supported */
-                                  UInt32           withCount,
-                                  IODirection      withDirection,
-                                  task_t           withTask,
-                                  bool             asReference = false );
-
-public:
-	
-	// static factory methods and intializers 
-	
-	//
-	// create a new instance
-	//
-	
-	
-    /*!
-		@function withDescriptor
-		@abstract Creates a new IOFireWireSBP2LSIWorkaroundDescriptor.
-		@discussion	Create a IOFireWireSBP2LSIWorkaroundDescriptor with no permanent capacity then 
-        inits it the given descriptor. This is basicly a short cut for calling 
-        withCapacity( 0, 0, false) and the initWithDescriptor()
-        @param desc Original memory descriptor.
-        @param offset Offset of data to "fix" in bytes from beginning of descriptor.
-        @param len Length of data in bytes to "fix"
-        @param direction IODirection of data transfer.
-        @result Returns a new IOFireWireSBP2LSIWorkaroundDescriptor if successful.
-	*/
-    
-	static IOFireWireSBP2LSIWorkaroundDescriptor * withDescriptor
-					( IOMemoryDescriptor * desc, IOByteCount offset = 0,  
-					  IOByteCount len = 0, IODirection direction = kIODirectionOutIn );
-	
-	// initialize with descriptor				  
-	
-    /*!
-		@function initWithDescriptor
-		@abstract Initialize an IOFireWireSBP2LSIWorkaroundDescriptor with the given descriptor.
-		@discussion	Initialize the workaround descriptor with the given descriptor. 
-        @param desc Original memory descriptor.
-        @param offset Offset of data to "fix" in bytes from beginning of descriptor.
-        @param len Length of data in bytes to "fix"
-        @param direction IODirection of data transfer.
-        @result Returns true if the initialization was successful.
-	*/
-    
-    virtual bool initWithDescriptor( IOMemoryDescriptor * desc, IOByteCount offset = 0,  
-								     IOByteCount len = 0, IODirection direction = kIODirectionOutIn );
-	
-	
-	///////////////////////////////////
-	
-    
-    /*!
-		@function withCapacity
-		@abstract Create a new descriptor with possibly a permanent capacity.
-		@discussion	Create and IOFireWireSBP2LSIWorkaroundDescriptor with a permanent fixed capacity. 
-        You should call initWithDescriptor afterward. permanentRanges is number of ranges to keep 
-        permanently allocated for use by the algorithm.  If fixedCapacity is false additional ranges 
-        may be allocated and deallocated dyanmicly if needed. The algorithm may require more or less 
-        ranges than either the original descriptor or the final fixed may decriptor contain.
-        permanentBufferSpace is the number of bytes of permanent buffer to keep arround. If fixedCapacity 
-        is false additional buffer space may be allocated and deallocated dynamically. permanentBufferSpace 
-        should generally be set to 32 * maximum number of ranges. fixedCapacity is a flag indicating 
-        whether dynamic allocations are allowed. When making decisions about the maximum amount of 
-        buffer space to keep around, it should be noted tha the maximum number of ranges maybe different 
-        from permanentRanges if fixedCapcity is false.
-        @param permanentRanges Count of permanent ranges.
-        @param permanentBufferSpace Byte count of permanent buffers.
-        @param fixedCapacity bool indicating if dynamic allocations can be made.
-        @result Returns true if the initialization was successful.
-	*/
-    
-	static IOFireWireSBP2LSIWorkaroundDescriptor * withCapacity
-						( UInt32 permanentRanges, IOByteCount permanentBufferSpace, bool fixedCapacity );
-
-
-	///////////////////////////////////
-
-	//
-	// manipulate buffers for IO
-	//
-
-    /*!
-		@function syncBuffersForOutput
-		@abstract Synchronize the buffers for output.
-		@discussion	Since double buffering may be invovled in the workaround.  The driver needs to 
-        indicate when these buffers should be syncronized with the original descriptor.  For data 
-        that will be output syncBuffersForOutput should be called before submiting the ORB.
-        @result Returns kIOReturnSuccess if sync was successful.
-	*/
-    	
-	virtual IOReturn syncBuffersForOutput( void );  // call before output
-
-    /*!
-		@function syncBuffersForInput
-		@abstract Synchronize the buffers for input.
-		@discussion	Since double buffering may be invovled in the workaround.  The driver needs to 
-        indicate when these buffers should be syncronized with the original descriptor.  For data 
-        that will be input syncBuffersForOutput should be called after receiving completion status 
-        for the ORB.
-        @result Returns kIOReturnSuccess if sync was successful.
-	*/
-    
-    virtual IOReturn syncBuffersForInput( void );	// call after input
-    
-private:
-
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LSIWorkaroundDescriptor, 8);
-    
-};
-
-#endif
-
-#endif
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h b/i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h
deleted file mode 100644
index e6c97de..0000000
--- a/i386/include/IOKit/sbp2/IOFireWireSBP2LUN.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOFireWireSBP2LUN
-  Contains the class definition for IOFireWireSBP2LUN.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2LUN_H
-#define _IOKIT_IOFIREWIRESBP2LUN_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOCommandGate.h>
-
-#include <IOKit/firewire/IOFireWireUnit.h>
-
-#include <IOKit/sbp2/IOFireWireSBP2Login.h>
-#include <IOKit/sbp2/IOFireWireSBP2ManagementORB.h>
-
-class IOFireWireSBP2Target;
-
-/*!
-    @class IOFireWireSBP2LUN
-    @abstract Provider for most drivers. 
-    @discussion IOFireWireSBP2LUN objects are created by IOFireWireSBP2Target objects.  Each target may have zero or more IOFireWireSBP2LUN children. The LUN object serves as the matching nub for most drivers and therefore will be the provider for most drivers.  It supplies the methods that control the operation of the LUN as a whole.  Methods that control the behavior and execution of an SBP2 login session are supplied in a separate IOFireWireSBP2Login object. The LUN can be used to create one of these login objects.
-    The LUN can also create IOFireWireSBP2ManagementORBs for configuring and appending non-login related management functions.  Login related management functions (ie. Login, Logout, Reconnect) are supplied by the IOFireWireSBP2Login.
-    Finally the LUN can supply a reference to the IOFireWireUnit.  This can be useful if a driver wishes to access the standard FireWire APIs.  
-*/
-
-class IOFireWireSBP2LUN : public IOService
-{
-    OSDeclareDefaultStructors( IOFireWireSBP2LUN );
-
-	friend class IOFireWireSBP2ManagementORB;
-	friend class IOFireWireSBP2Login;
-	friend class IOFireWireSBP2UserClient;
-	
-protected: 
-
-    // reserved for future use
-    struct ExpansionData { };
-    ExpansionData *reserved;
-
-	////////////////////////////////////////////
-	// methods called by friend classes
-
-	// IOFireWireSBP2Login methods
-    virtual void removeLogin( IOFireWireSBP2Login * login );
-	virtual IOFireWireSBP2Target * getTarget( void );
-	
-	// IOFireWireSBP2ManagementORB methods
-	virtual void clearAllTasksInSet( void );  // assumes caller is on workloop
-	virtual void removeManagementORB( IOFireWireSBP2ManagementORB * orb ); 
-	
-	// IOFireWireSBP2UserClient methods
-	virtual void flushAllManagementORBs( void );
-
-public:
-
-	////////////////////////////////////////////
-	// IOService overrides
-
-    /*! @function attach
-        @abstract Attaches an IOService client to a provider in the registry.
-        @discussion See IOService for discussion.
-        @param provider The IOService object which will serve as this objects provider.
-        @result false if the provider is inactive or on a resource failure, otherwise true. 
-    */
-    
-    virtual bool attach( IOService *provider );
-
-	/*! @function handleOpen
-		@abstract Overrideable method to control the open / close behaviour of an IOService.
-		@discussion See IOService for discussion.		
-		@param forClient Designates the client of the provider requesting the open.
-		@param options Options for the open, may be interpreted by the implementor of handleOpen.
-		@result Return true if the open was successful, false otherwise. */
-
-    virtual bool handleOpen(  IOService *	  forClient,
-                              IOOptionBits	  options,
-                              void *		  arg );
-	/*! 
-		@function handleClose
-		@abstract Overrideable method to control the open / close behaviour of an IOService.
-		@discussion See IOService for discussion.
-		@param forClient Designates the client of the provider requesting the close.
-		@param options Options for the close, may be interpreted by the implementor of handleOpen. 
-	*/
-
-    virtual void handleClose(   IOService *		forClient,
-                                IOOptionBits	options );
-    
- 	/*! 
-		@function matchPropertyTable
-		@abstract Implements SBP2 specific matching.
-		@discussion See IOService for discussion.
-	    @param table The dictionary of properties to be matched against.
-		@result Returns false if the family considers the matching dictionary does not match in properties it 			understands, true otherwise.
-	*/
-    	
-	virtual bool matchPropertyTable(OSDictionary * table);
-																	
-protected:
-
-	////////////////////////////////////////////
-	// private fields
-	
-    IOFireWireSBP2Target * 	fProviderTarget;
-    UInt32					fLUNumber;
-    OSSet *					fLoginSet;
-    OSIterator *			fLoginSetIterator;
-	IOCommandGate * 		fGate;
-	OSSet *					fORBSet;
-    OSIterator *			fORBSetIterator;
-	OSObject * 				fDiagnostics;
-	
-	////////////////////////////////////////////
-	// private methods
-	
-	// IOService methods
-    virtual void free( void );
-    virtual IOReturn message( UInt32 type, IOService * provider, void * argument = 0 );
-    
-	// create management orb internals
-	static IOReturn staticCreateManagementORBAction( OSObject *self,
-													 void * refCon,
-													 void * completion, 
-													 void * orb, 
-													 void * );
-	virtual IOReturn createManagementORBAction( void * refCon,
-												FWSBP2ManagementCallback completion, 
-												IOFireWireSBP2ManagementORB ** orb );
-
-	// remove management orb internals
-	static IOReturn staticRemoveManagementORBAction( OSObject * self, void * orb, 
-													void *, void *, void * );
-	virtual IOReturn removeManagementORBAction( IOFireWireSBP2ManagementORB * orb );
-
-	// flush all management orb internals
-	static IOReturn staticExecuteFlushAllMgmtORBs( OSObject * self, void *, 
-													void *, void *, void * );
-	virtual IOReturn executeFlushAllMgmtORBs( void );
-
-	// IOFireWireSBP2ManagementORB friend class wrappers
-    virtual bool initMgmtORBWithLUN( IOFireWireSBP2ManagementORB * orb, IOFireWireSBP2LUN * lun, 
-									 void * refCon, 
-									 FWSBP2ManagementCallback completion );
-									 		
-	// IOFireWireSBP2Login friend class wrappers
-    virtual bool initLoginWithLUN( IOFireWireSBP2Login * login, IOFireWireSBP2LUN * lun );
-	virtual void suspendedNotify( void );
-	virtual void resumeNotify( void );
-		
-private:
-
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 0);
-
-public:
-
-	////////////////////////////////////////////
-    // client methods
-
-	// getters
-	
-    /*!
-		@function getFireWireUnit
-		@abstract Returns an IOFireWireUnit object.
-		@discussion An IOFireWireUnit is the provider of an IOFireWireSBP2Target.  In order to 
-        use the base FireWire services you will need a reference to the unit.  This method 
-        returns that reference.
-		@result Returns a pointer to an IOFireWireUnit.
-	*/
-    
-    virtual IOFireWireUnit * getFireWireUnit( void );
-    
-    /*!
-		@function getLUNumber
-		@abstract Returns the LUNs number.
-		@discussion Each LUN has a number to uniquely identify it on a device.  This method returns 
-        this value in a UInt32.		
-        @result Returns a UInt32 containing the Logical Unit Number.
-	*/
-    
-	virtual UInt32 getLUNumber( void );
-    
-	// factory methods
-    
-    /*!
-		@function createLogin
-		@abstract Creates a new IOFireWireSBP2Login object.
-		@discussion	Creates a new IOFireWireSBP2Login object for the LUN.  Login objects supply most 
-        of the SBP2 APIs related to login maintenance and Normal Command ORB execution.
-        @result Returns a pointer to a new IOFireWireSBP2Login.
-	*/
-
-    virtual IOFireWireSBP2Login *createLogin( void );	
-
-    /*!
-		@function createManagementORB
-		@abstract Creates a new IOFireWireSBP2ManagementORB object.
-		@discussion	Creates a new IOFireWireSBP2ManagementORB object.  Management objects let you 
-        execute commands like QueryLogins, LogicalUnitReset, and AbortTask.  These commands are 
-        configured after they are created here.  When they are done executing (after a call to submit) 
-        the supplied completion routine will be called with the supplied refcon.  Usually this refCon
-        is the "this" pointer of completion method's object.
-        @param refCon The refcon passed to the completion routine.
-        @param completion The completion routine.  Called when the ORB finishes execution.	
-        @result Returns a pointer to a new IOFireWireSBP2Login.
-	*/
-        
-    virtual IOFireWireSBP2ManagementORB * createManagementORB( void * refCon, FWSBP2ManagementCallback completion );
-
-protected:
-
-    static IOReturn staticCreateLogin( OSObject *self, void * login, void *, void *, void * );
-    virtual IOReturn createLoginAction( IOFireWireSBP2Login ** login );
-
-    static IOReturn staticRemoveLoginAction( OSObject *self, void * login, void *, void *, void * );
-    virtual IOReturn removeLoginAction( IOFireWireSBP2Login * login );
-
-public:
-
-    /*!
-		@function getDiagnostics
-		@abstract Debug-only method.
-		@discussion	Returns a reference to the internal diagnostics object when the services are built 
-        in debug mode. Should be a no-op in release builds.
-        @result Returns a pointer to the diagnostics object (if any).
-	*/
-    	
-	virtual OSObject * getDiagnostics( void );
-
-    virtual bool finalize( IOOptionBits options );
-
-protected:
-
-	void terminateNotify( void );
-	
-private:
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2LUN, 8);
-
-};
-
-#endif 
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2Login.h b/i386/include/IOKit/sbp2/IOFireWireSBP2Login.h
deleted file mode 100644
index 42a838c..0000000
--- a/i386/include/IOKit/sbp2/IOFireWireSBP2Login.h
+++ /dev/null
@@ -1,1078 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOFireWireSBP2Login
-  Contains the class definition for IOFireWireSBP2Login.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2LOGIN_H
-#define _IOKIT_IOFIREWIRESBP2LOGIN_H
-
-#include <IOKit/IOCommandGate.h>
-
-#include <IOKit/firewire/IOFireWireUnit.h>
-
-#include <IOKit/sbp2/IOFireWireSBP2ORB.h>
-#include <IOKit/sbp2/IOFireWireSBP2Target.h>
-
-// login option flags
-enum
-{
-	kFWSBP2DontSynchronizeMgmtAgent = (1 << 0),
-    kFWSBP2ExclusiveLogin 			= (1 << 5)
-};
-
-// notification events
-enum
-{
-    kFWSBP2NormalCommandStatus	= 6,
-    kFWSBP2NormalCommandTimeout	= 7,
-    kFWSBP2UnsolicitedStatus	= 8,
-    kFWSBP2NormalCommandReset	= 9
-};
-
-#define kIOMessageFWSBP2ReconnectComplete	iokit_fw_err(0x3E8)
-#define kIOMessageFWSBP2ReconnectFailed		iokit_fw_err(0x3E9)
-
-/*! 
-    @typedef FWSBP2LoginResponse
-    @param length Length of login response.
-    @param loginID Unique id representing this login. 
-    @param commandBlockAgentAddressHi High 32 bits of command block agent address.
-    @param commandBlockAgentAddressLo Low 32 bits of command block agent address.
-    @param reserved Reserved.
-    @param reconnectHold Reconnect timeout encoded as 2^reconnectHold seconds.
-*/
-
-typedef struct
-{
-    UInt16		length;
-    UInt16		loginID;
-    UInt32		commandBlockAgentAddressHi;
-    UInt32		commandBlockAgentAddressLo;
-    UInt16		reserved;
-    UInt16		reconnectHold;
-} FWSBP2LoginResponse, *FWSBP2LoginResponsePtr;
-
-/*! 
-    @typedef FWSBP2StatusBlock
-    @param details Src, Resp, D, Len fields of status block format
-    @param sbpStatus SBP2 specific status
-    @param orbOffsetHi High 32 bits of address of orb status is for.
-    @param orbOffsetLo Low 32 bits of address of orb status is for.
-    @param status[6] Up to 48 bytes of additional data. Length is determined by len field.
-*/
-
-typedef struct
-{
-    UInt8		details;
-    UInt8		sbpStatus;
-    UInt16		orbOffsetHi;
-    UInt32		orbOffsetLo;
-    UInt32		status[6];	
-} FWSBP2StatusBlock;
-
-class IOFireWireSBP2LUN;
-class IOFireWireSBP2Login;
-
-// struct sent to login complete handler
-
-/*! 
-    @typedef FWSBP2LoginCompleteParams
-    @param login Pointer to IOFireWireSBP2Login object.
-    @param generation FireWire generation value.
-    @param status Status of login attempt.
-    @param loginResponse Pointer to login response struct.
-    @param statusBlock Pointer to status block buffer.
-    @param statusBlockLength Length of entire status block.
-*/
-
-typedef struct
-{
-    IOFireWireSBP2Login * 	login;			// login object this param is sent from
-    UInt32					generation;		// generation this login was attempted in 
-  
-    IOReturn				status;			// status of login attempt
-	
-    FWSBP2LoginResponsePtr	loginResponse;		// pointer to loginResponse buffer
-    FWSBP2StatusBlock *		statusBlock;		// pointer to statusBlock buffer
-    UInt32					statusBlockLength;	// size of statusBlock buffer
-	
-} FWSBP2LoginCompleteParams, *FWSBP2LoginCompleteParamsPtr;
-
-// struct sent to logout complete handler
-
-/*! 
-    @typedef FWSBP2LogoutCompleteParams
-    @param login Pointer to IOFireWireSBP2Login object.
-    @param generation FireWire generation value.
-    @param status Status of login attempt.
-    @param statusBlock Pointer to status block buffer.
-    @param statusBlockLength Length of entire status block.
-*/
-
-typedef struct
-{
-    IOFireWireSBP2Login * 	login;			// login object this param is sent from
-    UInt32					generation;		// generation this login was attempted in
-
-    IOReturn				status;			// status of login attempt
-	
-    FWSBP2StatusBlock *		statusBlock;		// pointer to statusBlock buffer
-    UInt32					statusBlockLength;	// size of statusBlock buffer
-	
-} FWSBP2LogoutCompleteParams, *FWSBP2LogoutCompleteParamsPtr;
-
-// struct sent with reconnect notification
-
-/*! 
-    @typedef FWSBP2LogoutCompleteParams
-    @param login Pointer to IOFireWireSBP2Login object.
-    @param generation FireWire generation value.
-    @param status Status of login attempt.
-    @param reconnectStatusBlock Pointer to status block buffer.
-    @param reconnectStatusBlockLength Length of entire status block.
-*/
-
-typedef struct
-{
-    IOFireWireSBP2Login * 	login;			// login object this param is sent from
-    UInt32					generation;		// generation this login was attempted in
-
-    IOReturn			status;			// status of reconnect attempt
-
-    void *			reconnectStatusBlock;		// pointer to statusBlock buffer
-    UInt32			reconnectStatusBlockLength;	// size of statusBlock buffer
-} FWSBP2ReconnectParams, *FWSBP2ReconnectParamsPtr;
-
-// Callback when login and logout commands complete asynchronously
-
-/*! 
-    @typedef FWSBP2LoginCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param params Structure containing additional information about the status of the login. 
-*/
-    
-typedef void (*FWSBP2LoginCallback)(void * refCon, FWSBP2LoginCompleteParamsPtr params);
-
-/*! 
-    @typedef FWSBP2LogoutCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param params Structure containing additional information about the status of the logout. 
-*/
-
-typedef void (*FWSBP2LogoutCallback)(void * refCon, FWSBP2LogoutCompleteParamsPtr params);
-
-/*! 
-    @typedef FWSBP2StatusCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param status Indicates success or failure of operation. 
-*/
-
-typedef void (*FWSBP2StatusCallback)(void * refCon, IOReturn status);
-
-/*! 
-    @typedef FWSBP2FetchAgentWriteCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param status Indicates success or failure of operation. 
-    @param orb Indicates current last orb in chain.
-*/
-
-typedef void (*FWSBP2FetchAgentWriteCallback)(void * refCon, IOReturn status, IOFireWireSBP2ORB * orb);
-
-/*! 
-    @typedef FWSBP2NotifyParams
-    @param notificationEvent Type of event we are being notified of.
-    @param message buffer containing message.
-    @param length length of message field.
-    @param generation FireWire generation value.
-*/
-
-typedef struct
-{
-    void *				commandObject;
-    UInt32 				notificationEvent;
-    const void * 		message;
-    UInt32				length;
-    UInt32				generation;
-} FWSBP2NotifyParams, *FWSBP2NotifyParamsPtr;
-
-
-/*! 
-    @typedef FWSBP2NotifyCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param params FWSBP2NotifyParams containing notification information.
-*/
-
-typedef void (*FWSBP2NotifyCallback)(void * refCon, FWSBP2NotifyParamsPtr params);
-
-/*!
-    @class IOFireWireSBP2Login
-    @abstract Supplies the login maintenance and Normal Command ORB execution portions of the API.
-    @discussion Supplies APIs for login maintenance and command execution.  Drivers can use this 
-    object to create IOFireWireSBP2ORB objects and execute them.  Solicited and unsolicited status 
-    callback routines can be registered and the SBP2 services will notify the driver when the 
-    appropriate status arrives.
-    This class also handles login maintenance.  Supplies APIs for logging in and logging out and 
-    attempts to reconnect to the LUN after bus resets.  The base FireWire services deliver bus 
-    reset notification via the IOKit message routine.  The SBP2 services build on this behavior 
-    and deliver reconnectFailed and reconnectComplete through the message routine as well.
-*/
-
-class IOFireWireSBP2Login : public OSObject
-{
-    OSDeclareDefaultStructors( IOFireWireSBP2Login )
-
-	friend class IOFireWireSBP2ORB;
-	friend class IOFireWireSBP2LUN;
-	friend class IOFireWireSBP2UserClient;
-	
-protected:
-
-    // command selectors
-    enum
-    {
-        kLoginCommandIdle		= 0,
-        kLoginCommandDoLogin 	= 1,
-        kLoginCommandDoLogout	= 2,
-        kLoginAddORB			= 3,
-        kLoginRemoveORB			= 4,
-		kLoginFetchAgentReset	= 5
-     };
-
-    // internal login states
-    enum
-    {
-        kLoginStateIdle			= 0,
-        kLoginStateLoggingIn	= 1,
-        kLoginStateConnected	= 2,
-        kLoginStateReconnect	= 3,
-        kLoginStateLoggingOut	= 4,
-		kLoginStateTerminated	= 5
-    };
-
-    // rom keys
-    enum
-    {
-        kUnitCharacteristicsKey 	= 0x3A,
-        kManagementAgentOffsetKey	= 0x54
-    };
-
-    // sbp2 defs
-    enum
-    {
-        kFWSBP2RequestComplete 	= 0,
-        kFWSBP2TransportFailure	= 1,
-        kFWSBP2IllegalRequest	= 2,
-        kFWSBP2VendorDependent	= 3
-    };
-
-    enum
-    {
-        kFWSBP2NoSense					= 0,
-        kFWSBP2RequestTypeNotSupported	= 1,
-        kFWSBP2SpeedNotSupported		= 2,
-        kFWSBP2PageSizeNotSupported		= 3,
-        kFWSBP2AccessDenied				= 4,
-        kFWSBP2LogicalUnitNotSupported	= 5,
-        kFWSBP2MaxPayloadTooSmall		= 6,
-        kFWSBP2FunctionRejected			= 9,
-        kFWSBP2LoginIDNotRecognized		= 10,
-        kFWSBP2DummyORBCompleted		= 11,
-        kFWSBP2RequestAborted			= 12,
-        kFWSBP2UnspecifiedError			= 0xFF
-    };
-
-    typedef struct
-    {
-        UInt32		password[2];
-        UInt32		loginResponseAddressHi;
-        UInt32		loginResponseAddressLo;
-        UInt16		options;
-        UInt16		lun;
-        UInt16		passwordLength;
-        UInt16		loginResponseLength;
-        UInt32		statusFIFOAddressHi;
-        UInt32		statusFIFOAddressLo;
-    } FWSBP2LoginORB;
-
-    typedef struct
-    {
-        UInt32		reserved1[4];
-        UInt16		options;
-        UInt16		loginID;
-        UInt32		reserved2;
-        UInt32		statusFIFOAddressHi;
-        UInt32		statusFIFOAddressLo;
-    } FWSBP2ReconnectORB;
-    
-    typedef struct
-    {
-        UInt32		reserved1[4];
-        UInt16		options;
-        UInt16		loginID;
-        UInt32		reserved2;
-        UInt32		statusFIFOAddressHi;
-        UInt32		statusFIFOAddressLo;
-    } FWSBP2LogoutORB;
-
-protected:
-
-    ///////////////////////////////////////////////////////////////////
-    // private interface methods
-
-	// IOFireWireSBP2LUN methods
-	virtual void clearAllTasksInSet( void );
-    virtual bool initWithLUN( IOFireWireSBP2LUN * lun );
-    virtual void suspendedNotify( void );
-    virtual void resumeNotify( void );
-	
-	// IOFireWireSBP2ORB methods
-	virtual IOFireWireUnit * getFireWireUnit( void );
-    virtual IOFireWireSBP2LUN * getFireWireLUN( void );
-    virtual bool isFetchAgentWriteInProgress( void );
-    virtual bool isConnected( void );
-    virtual IOReturn removeORB( IOFireWireSBP2ORB * orb );
-    virtual IOReturn appendORBImmediate( IOFireWireSBP2ORB * orb );
-    virtual IOReturn appendORB( IOFireWireSBP2ORB * orb );
-    virtual void sendTimeoutNotification( IOFireWireSBP2ORB * orb );
-     
-protected:
-  
-    // reserved for future use
-    struct ExpansionData { };
-    ExpansionData *reserved; 
-          
-    IOFireWireSBP2LUN * 	fLUN;
-    IOFireWireUnit *		fUnit;
-	IOFireWireController *	fControl;
-	IOCommandGate * 		fGate;
-
-    FWSBP2LoginCallback		fLoginCompletionCallback;
-    void *	  				fLoginCompletionRefCon;
-
-    FWSBP2LogoutCallback	fLogoutCompletionCallback;
-    void *					fLogoutCompletionRefCon;
-    
-    FWSBP2NotifyCallback	fStatusNotifyCallback;
-    void *					fStatusNotifyRefCon;
-
-    FWSBP2NotifyCallback	fUnsolicitedStatusNotifyCallback;
-    void *					fUnsolicitedStatusNotifyRefCon;
-    
-    UInt32					fLoginFlags;
-    UInt32					fReconnectTime;
-    
-    UInt32					fLoginState;
-    UInt32					fManagementOffset;
-    UInt32					fManagementTimeout;
-    UInt32					fMaxORBSize;
-    UInt32					fMaxCommandBlockSize;
-    UInt16					fLoginNodeID;
-    UInt32					fLoginGeneration;
-    UInt32					fLoginID;
-    UInt32					fReconnectHold;
-    UInt32					fMaxPayloadSize;
-    void *					fRefCon;
-    
-    // resources
-    
-    FWSBP2LoginORB			fLoginORB;
-    IOFWAddressSpace *		fLoginORBAddressSpace;
-    FWAddress				fLoginORBAddress;
-
-    FWSBP2LoginResponse		fLoginResponse;
-    IOFWAddressSpace *		fLoginResponseAddressSpace;
-    FWAddress				fLoginResponseAddress;
-
-    FWSBP2ReconnectORB		fReconnectORB;
-    IOFWAddressSpace *		fReconnectORBAddressSpace;
-    FWAddress				fReconnectORBAddress;
-    
-    FWSBP2StatusBlock		fStatusBlock;
-    IOFWAddressSpace *		fStatusBlockAddressSpace;
-    FWAddress				fStatusBlockAddress;
-
-    FWSBP2StatusBlock		fReconnectStatusBlock;
-    IOFWAddressSpace *		fReconnectStatusBlockAddressSpace;
-    FWAddress				fReconnectStatusBlockAddress;
-
-    FWSBP2LogoutORB			fLogoutORB;
-    IOFWAddressSpace *		fLogoutORBAddressSpace;
-    FWAddress				fLogoutORBAddress;
-    bool					fLogoutPending;
-	
-    IOFWWriteCommand *		fLoginWriteCommand;
-    IOMemoryDescriptor *	fLoginWriteCommandMemory;
-    bool					fLoginWriteInProgress;
-     
-    IOFWWriteCommand *		fReconnectWriteCommand;
-    IOMemoryDescriptor *	fReconnectWriteCommandMemory;
-    bool					fReconnectWriteInProgress;
-    bool					fReconnectWriteInterrupted;
-    
-    IOFWWriteCommand *		fLogoutWriteCommand;
-    IOMemoryDescriptor *	fLogoutWriteCommandMemory;
-    bool					fLogoutWriteInProgress;
-    
-    IOFWCommand *			fLoginTimeoutCommand;
-    bool					fLoginTimeoutTimerSet;
-
-    IOFWDelayCommand *		fReconnectTimeoutCommand;
-    bool					fReconnectTimeoutTimerSet;
-
-    IOFWCommand *			fLogoutTimeoutCommand;
-    bool					fLogoutTimeoutTimerSet;
-
-    FWAddress 				fFetchAgentAddress;
-    IOMemoryDescriptor *	fFetchAgentWriteCommandMemory;
-    FWAddress 				fLastORBAddress;
-    IOFireWireSBP2ORB *		fLastORB;
-    IOFWWriteCommand *		fFetchAgentWriteCommand;
-    bool					fFetchAgentWriteCommandInUse;
-	FWSBP2FetchAgentWriteCallback 	fFetchAgentWriteCompletion;
-	void * 							fFetchAgentWriteRefCon;
-	IOFireWireSBP2ORB *		fORBToWrite;
-	
-    OSSet *					fORBSet;
-    OSIterator *			fORBSetIterator;
- 
-    void *					fPasswordBuf;
-    UInt32					fPasswordLen;
-    IOFWAddressSpace *		fPasswordAddressSpace;
-    FWAddress				fPasswordAddress;
-	IOMemoryDescriptor *	fPasswordDescriptor;
-
-	bool fSuspended;
-	
-	UInt32					fLoginRetryDelay;
-	UInt32					fLoginRetryCount;
-	UInt32					fLoginRetryMax;
-	IOFWDelayCommand *		fLoginRetryTimeoutCommand;
-    bool					fLoginRetryTimeoutTimerSet;
-	IOFireWireSBP2Target * 	fTarget;
-	
-	bool					fUnsolicitedStatusEnableRequested;
-	
-	IOFWDelayCommand *		fReconnectRetryTimeoutCommand;
-    bool					fReconnectRetryTimeoutTimerSet;	
-
-	int						fCriticalSectionCount;
-	
-	// init / destroy
-    virtual IOReturn getUnitInformation( void );
-    virtual IOReturn allocateResources( void );
-    virtual void free( void );
-        	
-	// orb add / remove
-	virtual IOReturn addORB( IOFireWireSBP2ORB * orb );
-	static IOReturn staticExecuteAddORB( OSObject *self, void * orb, void *, void *, void * );
-	virtual IOReturn executeAddORB( IOFireWireSBP2ORB * orb );
-
-	static IOReturn staticExecuteRemoveORB( OSObject *self, void * orb, void *, void *, void * );
-	virtual IOReturn executeRemoveORB( IOFireWireSBP2ORB * orb );
-
-    //
-    // login
-    //
-
-    static IOReturn staticExecuteLogin( OSObject *self, void *, void *, void *, void * );
-    virtual IOReturn executeLogin( void );
-    virtual void abortLogin( void );
-    
-    // login write complete handler
-    static void loginWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-    virtual void loginWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-    // login timeout handler
-    static void loginTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-    virtual void loginTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-
-    // status block write handler
-    static UInt32 statusBlockWriteStatic(void *refcon, UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
-                                         const void *buf, IOFWRequestRefCon lockRead);
-   	virtual UInt32 statusBlockWrite( UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len, const void *buf, IOFWRequestRefCon lockRead);
-	virtual void completeLogin( IOReturn state, const void *buf = NULL, UInt32 len = 0, void * buf2 = NULL );
-
-    //
-    // reconnect
-    //
-    
-    virtual void doReconnect( void );
-    virtual void restartReconnect( void );
-    virtual void startReconnectTimer( void );
-
-    // reconnect write complete handler
-    static void reconnectWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-    virtual void reconnectWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-    // reconnect timeout handler
-    static void reconnectTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-    virtual void reconnectTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-
-    // reconnect status block
-    static UInt32 reconnectStatusBlockWriteStatic(void *refcon, UInt16 nodeID, IOFWSpeed &speed, FWAddress addr,
-                                                  UInt32 len, const void *buf, IOFWRequestRefCon lockRead);
-   	virtual UInt32 reconnectStatusBlockWrite( UInt16 nodeID, IOFWSpeed &speed, FWAddress addr, UInt32 len,
-                                              const void *buf, IOFWRequestRefCon lockRead);
-
-    virtual void sendReconnectNotification( UInt32 event );
-    virtual void sendReconnectNotificationWithStatusBlock( UInt32 event );
-
-    //
-    // logout
-    //
-    
-	static IOReturn staticExecuteLogout( OSObject *self, void *, void *, void *, void * );
-    virtual IOReturn executeLogout( void );
-    
-    // logout write complete handler
-    static void logoutWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-    virtual void logoutWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-    // logout timeout handler
-    static void logoutTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-    virtual void logoutTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-	
-	virtual void completeLogout( IOReturn state, const void *buf = NULL, UInt32 len = 0);
-
-	// fetch agent write complete handler
-    static void fetchAgentWriteCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-    virtual void fetchAgentWriteComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-    //
-    // fetch agent
-    //
-
-	bool 							fFetchAgentResetInProgress;
-	UInt32 							fFetchAgentResetBuffer;
-	FWAddress 						fFetchAgentResetAddress;
-	IOFWWriteQuadCommand *			fFetchAgentResetCommand;
-	void * 							fFetchAgentResetRefCon;
-	FWSBP2StatusCallback 			fFetchAgentResetCompletion;
-
-	static IOReturn staticExecuteFetchAgentReset( OSObject *self, void *, void *, void *, void * );
-	virtual IOReturn executeFetchAgentReset( void );
-	static void fetchAgentResetCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-	virtual void fetchAgentResetComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-	//
-	// doorbell
-	//
-	
-	bool 							fDoorbellInProgress;
-	bool							fDoorbellRingAgain;
-	UInt32 							fDoorbellBuffer;
-	FWAddress 						fDoorbellAddress;
-	IOFWWriteQuadCommand *			fDoorbellCommand;
-	
-	static IOReturn staticExecuteDoorbell( OSObject *self, void *, void *, void *, void * );
-	virtual IOReturn executeDoorbell( void );
-	static void doorbellCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-	virtual void doorbellComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-	//
-	// enable unsolicited satus
-	//
-
-	bool 							fUnsolicitedStatusEnableInProgress;
-	UInt32 							fUnsolicitedStatusEnableBuffer;
-	FWAddress 						fUnsolicitedStatusEnableAddress;
-	IOFWWriteQuadCommand *			fUnsolicitedStatusEnableCommand;
-
-	static IOReturn staticExecuteUnsolicitedStatusEnable( OSObject *self, void *, void *, void *, void * );
-	virtual IOReturn executeUnsolicitedStatusEnable( void );
-	static void unsolicitedStatusEnableCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-	virtual void unsolicitedStatusEnableComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-	//
-	// busy timeout stuff
-	//
-	
-	bool 							fSetBusyTimeoutInProgress;
-	UInt32 							fSetBusyTimeoutBuffer;
-	FWAddress 						fSetBusyTimeoutAddress;
-	IOFWWriteQuadCommand *			fSetBusyTimeoutCommand;
-	
-	bool							fInCriticalSection;
-
-	UInt16					fLocalNodeID;
-	bool					fFastStartSupported;
-	UInt32					fFastStartOffset;
-	UInt32					fFastStartMaxPayload;
-	
-	UInt32					fUserLoginGeneration;
-	bool					fUserLoginGenerationSet;
-	
-	IOFWDelayCommand *		fFetchAgentRetryTimerCommand;
-    bool					fFetchAgentRetryTimerSet;	
-	
-	virtual IOReturn executeSetBusyTimeout( void );
-	static void setBusyTimeoutCompleteStatic( void *refcon, IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-	virtual void setBusyTimeoutComplete( IOReturn status, IOFireWireNub *device, IOFWCommand *fwCmd );
-
-private:
-	// IOFireWireSBP2ORB friend class wrappers
-	OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 0);
-
-protected: 									
-	virtual bool initORBWithLogin( IOFireWireSBP2ORB * orb, IOFireWireSBP2Login * login );
-	virtual void setNextORBAddress( IOFireWireSBP2ORB * orb, FWAddress address );
-    virtual void fetchAgentWriteComplete( IOFireWireSBP2ORB * orb, IOReturn status );
-    virtual bool isORBTimerSet( IOFireWireSBP2ORB * orb );
-    virtual void cancelORBTimer( IOFireWireSBP2ORB * orb );
-	
-	// IOFireWireSBP2LUN friend class wrappers
-	virtual void removeLogin( void );
-	virtual IOFireWireSBP2Target * getTarget( void );
-	
-	UInt32		fARDMAMax;
-	bool		fPhysicalAccessEnabled;
-
-	bool					fLoginStatusReceived;
-	FWSBP2StatusBlock		fLoginStatusBlock;
-	UInt32					fLoginStatusBlockLen;
-		
-private:
-
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 4);
-	OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 5);
-
-public:
-
-	//////////////////////////////
-
-    /*!
-		@function createORB
-		@abstract Creates a new IOFireWireSBP2ORB for this login.
-		@discussion	Create a new IOFireWireSBP2ORB for this login.  It can be configured 
-        with it's accessors and executed with submitORB below.
-        @result Returns a pointer to the new ORB object.
-	*/
-    	
-	virtual IOFireWireSBP2ORB * createORB( void );
-	
-    /*!
-		@function submitORB
-		@abstract Submits the given orb
-		@discussion	Starts execution of the given ORB.  If the ORB is an immediate ORB it's 
-        addresss is written to the fetch agent.  If it is a non immediate orb its address 
-        is appended to the last orb of the currently processing chain.  The doorbell is not 
-        rung automatically it must be run manually with the ringDoorbell command described below.
-        @param orb The orb to be executed.	
-        @result Returns kIOReturnSuccess if the ORB has been started successfully.
-	*/
-    
-    virtual IOReturn submitORB( IOFireWireSBP2ORB * orb );
-
-    // set callbacks
-    
-    /*!
-		@function setStatusNotifyProc
-		@abstract Sets the callback to be called on normal command status.
-		@discussion The supplied callback is called when normal command status is recieved, when 
-        a normal command times out, or when a normal command is aborted. 
-        "notificationEvent" in the callback's params will indicate what happened.
-        It will be set to one of the following values: kFWSBP2NormalCommandReset, kFWSBP2NormalCommandStatus, 
-        or kFWSBP2NormalCommandTimeout.  If the event type is kFWSBP2NormalCommandTimeout and "len" is 
-        non-zero then "message" contains the data written to the status block.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2NotifyCallback.
-	*/
-    
-    virtual void setStatusNotifyProc( void * refCon, FWSBP2NotifyCallback callback );
-
-    /*!
-		@function getStatusNotifyProc
-		@abstract Returns the callback to be called on normal command status.
-		@discussion Returns the refCon and callback address of the status notify callback.
-        @param refCon output parameter returning the refCon to be passed to the callback.	
-        @param callback output parameter returning the address of the callback.
-	*/
-    
-    virtual void getStatusNotifyProc( void ** refCon, FWSBP2NotifyCallback * callback );
-
-    /*!
-		@function setUnsolicitedStatusNotifyProc
-		@abstract Sets the callback to be called on normal command status.
-		@discussion The supplied callback is called when unsolicited status is recieved.
-        "notificationEvent" in the callback's params will indicate what happened.  In this 
-        case it will be set to kFWSBP2UnsolicitedStatus. If "len" is 
-        non-zero then "message" contains the data written to the status block. Note: any buffers 
-        returned by callbacks are only valid for the duration of the login and should not have 
-        their contents modified.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2NotifyCallback.
-	*/
-    
-    virtual void setUnsolicitedStatusNotifyProc( void * refCon, FWSBP2NotifyCallback callback );
-    
-    /*!
-		@function getUnsolicitedStatusNotifyProc
-		@abstract Returns the callback to be called on unsolicited status.
-		@discussion Returns the refCon and callback address of the unsolicited status notify callback.
-        @param refCon output parameter returning the refCon to be passed to the callback.	
-        @param callback output parameter returning the address of the callback.
-	*/
-    
-    virtual void getUnsolicitedStatusNotifyProc( void ** refCon, FWSBP2NotifyCallback * callback );
-
-    // command handling
-    
-    /*!
-		@function setLoginCompletion
-		@abstract Sets the callback to be called when a login attempt is complete.
-		@discussion The supplied callback is called when a login attempt has completed. "status" in the
-        callback's params should be checked to determine the success or failure of the login attempt.  
-        If "statusBlock" is non-null then login status was written and it has been supplied here.  If 
-        the login attempt was successful then the login response will be supplied in the "loginResponse" 
-        buffer.  Note: all buffers supplied to callbacks are only valid for the duration of the callback.  
-        Also, you are not to modify the contents of any supplied buffer.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2LoginCallback.
-	*/
-    
-	virtual void setLoginCompletion( void * refCon, FWSBP2LoginCallback completion );
-    
-    /*!
-		@function submitLogin
-		@abstract Attempts to login to the LUN.		
-        @discussion This call begins the login process.  The login object should be configured prior 
-        to this call. If kIOReturnSuccess is returned from this call then the loginCompletion routine 
-        will be called when the login completes (successfully or unsuccesfully). 
-        @result Returns kIOReturnSuccess login has successlly begun.
-	*/
-    
-    virtual IOReturn submitLogin( void );
-	
-    /*!
-		@function submitLogout
-		@abstract Attempts to logout of the LUN.		
-        @discussion This call begins the logout process.  If kIOReturnSuccess is returned from this call then
-        the logoutCompletion routine will be called when the logout completes (successfully or unsuccesfully). 
-        @result Returns kIOReturnSuccess if logout has successfully begun.
-	*/
-    
-    virtual IOReturn submitLogout( void );
- 
-    /*!
-		@function setLogoutCompletion
-		@abstract Sets the callback to be called when a logout attempt is complete.
-		@discussion The supplied callback is called when a logout attempt has completed. "status" in the
-        callback's params should be checked to determine the success or failure of the logout attempt.  
-        If "statusBlock" is non-null then logout status was written and it has been supplied here. 
-        Note: all buffers supplied to callbacks are only valid for the duration of the callback.  
-        Also, you are not to modify the contents of any supplied buffer.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2LogoutCallback.
-	*/
-   
-    virtual void setLogoutCompletion( void * refCon, FWSBP2LogoutCallback completion );
- 
-    /*!
-		@function setFetchAgentWriteCompletion
-		@abstract Sets the callback to be called when the fetch agent write completes.
-		@discussion When an immediate orb is executed with submitORB, it's address is written to a 
-        specific address on the device.  This address is called the fetch agent.  The device the 
-        reads that orb from the Mac's memory and executes it.  With this call you can register to 
-        be called back when this write to the fetch agent completes.  The SBP2 services guarantee 
-        that the fetch agent write will be complete before status is reported for an ORB, so for 
-        most drivers this notification is not required.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2FetchAgentWriteCallback.
-	*/
-       
-	virtual void setFetchAgentWriteCompletion( void * refCon, FWSBP2FetchAgentWriteCallback completion );
-
-    /*!
-		@function setFetchAgentResetCompletion
-		@abstract Sets the callback to be called when a fetch agent reset completes.
-		@discussion The fetch agent state machine on the device can be reset by a write to a specific 
-        register.  The SBP2 services offer a utility method to reset the fetch agent.  You can register 
-        a callback routine here to be notified when this rest write completes.
-        @param refCon refCon passed to callback.	
-        @param callback address of callback method of type FWSBP2FetchAgentWriteCallback.
-	*/
-    
-    virtual void setFetchAgentResetCompletion( void * refCon, FWSBP2StatusCallback completion );
-
-    /*!
-		@function submitFetchAgentReset
-		@abstract Resets the LUN's fetch agent.
-		@discussion The fetch agent state machine on the device can be reset by a write to a specific 
-        register.  This reset can be intiated by a call to this method.  Notification of the completion 
-        of this write can be had by registering a callback with the setFetchAgentResetCompletion method.
-        @result Returns kIOReturnSuccess if the reset started successfully.
-	*/
-    
-	virtual IOReturn submitFetchAgentReset( void );
-
-    /*!
-		@function ringDoorbell
-		@abstract Rings the doorbell on the LUN.
-		@discussion Non-immediate appends to the ORB chain may require the fetch agent state machine 
-        to be notified of the new ORB's presence.  This is accomplished by writing to the so called 
-        doorbell register.  This method begins one of those writes.
-        @result Returns kIOReturnSuccess if the ring started successfully.
-	*/
-    
- 	virtual IOReturn ringDoorbell( void );
-    
-    /*!
-		@function enableUnsolicitedStatus
-		@abstract Enables unsolicited status.
-		@discussion After unsolicited is sent the device will not send any additional unsolicited status 
-        until a specific register is written.  This serves as a sort of flow-control for unsolicited status.  
-        After unsolicited status is recieved and processed drivers will want to reenable the delivery 
-        of unsolicted status by a call to this method.
-        @result Returns kIOReturnSuccess if the status enable write started successfully.
-	*/
-        
-	virtual IOReturn enableUnsolicitedStatus( void );
-	
-    // accessors
-    
-    /*!
-		@function getMaxCommandBlockSize
-		@abstract Returns the maximum command block size.
-		@discussion The device publishes an upper limit on the size of command block that it can 
-        accept.  That value can be accessed via this method.
-        @result Returns a UInt32 containing the maximum command block size.
-	*/
-    
-    virtual UInt32 getMaxCommandBlockSize( void );
-    
-    /*!
-		@function getLoginID
-		@abstract Returns the current login ID.
-		@discussion When we successfully login to a device.  The device gives us a unique login id.  
-        This is used internally for reconnecting to the device after bus resets and for certain other 
-        management ORBs.  Most drivers are probably not interested in this value.
-        @result Returns a UInt32 containing the current login ID.
-	*/
-    
-    virtual UInt32 getLoginID( void );
-
-    /*!
-		@function setLoginFlags
-		@abstract Sets login configuration flags.
-		@discussion Configures the login behavior according to the provided flags.  Currently two 
-        flags are defined for this API.  kFWSBP2ExclusiveLogin sets the exclusive login bit in the 
-        login ORB. kFWSBP2DontSynchronizeMgmtAgent allows simultaneous logins or reconnects to LUNs
-        with a common management agent (ie LUNs in the same unit directory).
-        @param loginFlags the login configuration flags.
-	*/
-    
-    virtual void setLoginFlags( UInt32 loginFlags );
-    
-    /*!
-		@function getLoginFlags
-		@abstract Returns the currently set login flags.
-		@discussion Returns the current state of the login flags.  Currently there is only one
-        flag defined for this API.  kFWSBP2ExclusiveLogin indicates that the exclusive login bit
-        should be set in the login ORB.
-        @result Returns a UInt32 containing the currently set login flags.
-	*/
-    
-    virtual UInt32 getLoginFlags( void );
-
-    /*!
-		@function setReconnectTime
-		@abstract Sets the desired reconnect duration.
-		@discussion The target and initiator arbitrate the duration of the reconnect timeout.  Here 
-        the initiator specifies its desired timeout time in 2^reconnectTime seconds.  After a 
-        successful login the device returns the actual timeout value it wishes to use.  This value 
-        may be less than the reconnect timeout that the intiator specified if this is all that the 
-        device can support.
-        @param reconnectTime The desired reconnect timeout encoded as 2^reconnectTime seconds.
-	*/
-    
-    virtual void setReconnectTime( UInt32 reconnectTime );
-    
-    /*!
-		@function getReconnectTime
-		@abstract Returns the currently set reconnect time.
-		@discussion Returns the currently desired initiator reconnect time encoded as 2^time seconds.
-        @result Returns a UInt32 containing the currently set reconnect time.
-	*/
-    
-    virtual UInt32 getReconnectTime( void );
-
-    /*!
-		@function setMaxPayloadSize
-		@abstract Sets the maximum data transfer length for a normal command ORB.
-		@discussion Sets the maximum data transfer length for a normal command ORB.  This value is 
-        the maximum for all ORBs sent to this LUN.  This can be trimmed further on an ORB by ORB basis, 
-        by a similar call in the IOFireWireSBP2ORB itself.
-        @param reconnectTime The desired maximum payload size in bytes.
-	*/
-    
-    virtual void setMaxPayloadSize( UInt32 maxPayloadSize );
-    
-    /*!
-		@function getMaxPayloadSize
-		@abstract Returns the currently set maximum payload size.
-		@discussion Returns the currently global maximum payload size in bytes.
-        @result Returns a UInt32 containing the currently set maximum payload size.
-	*/
-
-    virtual UInt32 getMaxPayloadSize( void );
-
-    /*!
-		@function setPassword
-		@abstract Sets the login password.
-		@discussion Sets the login password using a buffer and a length.  An alternate version exists 
-        that accepts an IOMemoryDescriptor.  If the password length is 8 or less the password is copied 
-        directly into the login orb.  If the length is greater than 8 the buffer is referenced by address 
-        in the login ORB.  In this case the buffer is not copied and should remain allocated for the 
-        duration of the login attempt.
-        @param buf a pointer to the password buffer.
-        @param len the length in bytes of the password buffer.
-        @result Returns kIOReturnSuccess on success.
-	*/
-
-    virtual IOReturn setPassword( void * buf, UInt32 len );
-
-    /*!
-		@function setPassword
-		@abstract Sets the login password.
-		@discussion Sets the login password using an IOMemoryDescriptor.  An alternate version exists 
-        that accepts a buffer and a length.  If the password length is 8 or less the password is copied 
-        directly into the login orb.  If the length is greater than 8 the buffer is referenced by address 
-        in the login ORB.
-        @param memory an IOMemoryDescriptor referencing the password.
-        @result Returns kIOReturnSuccess on success.
-	*/
-    
-    virtual IOReturn setPassword( IOMemoryDescriptor * memory );
-
-
-    /*!
-		@function setRefCon
-		@abstract Sets the login refCon.
-		@discussion Sets a user defined value on the login that can be retrieved later with the 
-        method getRefCon.
-        @param refCon a user defined value.
-    */
-    
-    virtual void setRefCon( void * refCon );
-    
-    /*!
-		@function getRefCon
-		@abstract Returns the refCon set with setRefCon.
-		@discussion Returns the user defined value previously stored in the login with setRefCon.
-        @result Returns the previously stored user defined value.
-	*/
-    
-    virtual void * getRefCon( void );
-	
-    /*!
-		@function setBusyTimeoutRegisterValue
-		@abstract Sets the value to be written to the BUSY_TIMEOUT register.
-		@discussion 1394-1995 defines a register known as the BUSY_TIMEOUT register. This register 
-        controls the busy retry behavior of your device.  The initial value for this register is 
-        0x00000000.  Which means busied transactions will not be retried.  Since most devices want 
-        their transactions retired on busy acks, the SBP2 service automatically updates the 
-        BUSY_TIMEOUT register with the value specified here whenever necessary.  Most drivers should 
-        set this value to 0x0000000f.
-        @param timeout desired value of the BUSY_TIMEOUT register.
-    */
-    
-	virtual void setBusyTimeoutRegisterValue( UInt32 timeout );
-    
-protected:
-
-    virtual void startORBTimer( IOFireWireSBP2ORB * orb );
-    virtual void prepareORBForExecution( IOFireWireSBP2ORB * orb );
-
-    static IOReturn staticExecuteORB( OSObject *self, void * orb, void *, void *, void * );
-    virtual IOReturn executeORB( IOFireWireSBP2ORB * orb );
-
-public:
-
-    /*! 
-        @function release
-        @abstract Primary implementation of the release mechanism.
-        @discussion See OSObject.h for more information.  When retainCount == when then call free(). 
-    */
-    
-    virtual void release() const;
-	
-	/*! 
-        @function setLoginRetryCountAndDelayTime
-        @abstract Sets login retry behavior.
-        @discussion Sets login retry behavior.
-        @param retryCount number of times to retry logins
-		@param uSecs delay time in microseconds between login retries
-    */
-	
-	virtual void setLoginRetryCountAndDelayTime( UInt32 retryCount, UInt32 uSecs );
-	
-protected:
-	virtual IOReturn initialExecuteLogin( void );
-	virtual void startLoginRetryTimer( void );
-	virtual void stopLoginRetryTimer( void );
-	static void loginRetryTimeoutStatic( void *refcon, IOReturn status,
-										 IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-	virtual void loginRetryTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd);
-
-	virtual void startReconnectRetryTimer( void );
-	virtual void stopReconnectRetryTimer( void );
-	static void reconnectRetryTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-	virtual void reconnectRetryTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-
-	virtual bool isORBAppended( IOFireWireSBP2ORB * orb );
-	virtual void setORBIsAppended( IOFireWireSBP2ORB * orb, bool state );
-
-public:    
-	virtual void setAddressLoForLoginORBAndResponse( UInt32 addressLoORB, UInt32 addresLoResponse );
-	
-	virtual void setLoginGeneration( UInt32 generation );
-	virtual void clearLoginGeneration( void );
-
-protected:
-	void startFetchAgentRetryTimer( UInt32 duration );
-	void stopFetchAgentRetryTimer( void );
-	static void fetchAgentRetryTimerStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-	void fetchAgentRetryTimer( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-	
-	void terminateNotify( void );
-	void processLoginWrite( void );
-
-public:
-	
-	bool	isPhysicalAccessEnabled( void );
-	UInt32	getARDMMax( void );
-	
-private:
-    
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Login, 8);
-
- };
-
-#endif
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2ManagementORB.h b/i386/include/IOKit/sbp2/IOFireWireSBP2ManagementORB.h
deleted file mode 100644
index 9455383..0000000
--- a/i386/include/IOKit/sbp2/IOFireWireSBP2ManagementORB.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOFireWireSBP2ManagementORB
-  Contains the class definition for IOFireWireSBP2ManagementORB.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2MANAGEMENTORB_H
-#define _IOKIT_IOFIREWIRESBP2MANAGEMENTORB_H
-
-#include <IOKit/firewire/IOFWCommand.h>
-#include <IOKit/firewire/IOFireWireUnit.h>
-
-#include <IOKit/IOUserClient.h>
-
-class IOFireWireSBP2LUN;
-class IOFireWireSBP2ManagementORB;
-class IOFireWireSBP2ORB;
-
-enum
-{
-    kFWSBP2QueryLogins			= 1,
-    kFWSBP2AbortTask			= 0xb,
-    kFWSBP2AbortTaskSet			= 0xc,
-    kFWSBP2LogicalUnitReset		= 0xe,
-    kFWSBP2TargetReset			= 0xf
-};
-
-// Callback when management command completes asynchronously
-
-/*! 
-    @typedef FWSBP2ManagementCallback
-    @param refCon Reference constant supplied when the notification was registered.
-    @param status Indicates success or failure of operation. 
-    @param orb Indicates current orb status is for.
-*/
-
-typedef void (*FWSBP2ManagementCallback)(void * refCon, IOReturn status, IOFireWireSBP2ManagementORB * orb);
-
-/*!
-    @class IOFireWireSBP2ManagementORB
-    @abstract Supplies non login related management ORBs.  Management ORBs can be executed independent 
-    of a login, if necessary.  Management ORBs are created using the IOFireWireSBP2LUN interface.
-*/
-
-class IOFireWireSBP2ManagementORB : public IOFWCommand
-{
-    OSDeclareDefaultStructors( IOFireWireSBP2ManagementORB )
-
-	friend class IOFireWireSBP2LUN;
-	friend class IOFireWireSBP2UserClient;
-	
-protected:
-
-	////////////////////////////////////////            
-    // rom keys
-	
-    enum
-    {
-        kUnitCharacteristicsKey 	= 0x3A,
-        kManagementAgentOffsetKey	= 0x54
-    };
-
-	////////////////////////////////////////        
-	// structs
-	
-    typedef struct
-    {
-        UInt32		orbOffsetHi;
-        UInt32		orbOffsetLo;
-        UInt32		reserved1[2];
-        UInt16		options;
-        UInt16		loginID;
-        UInt32		reserved2;
-        UInt32		statusFIFOAddressHi;
-        UInt32		statusFIFOAddressLo;
-    } FWSBP2TaskManagementORB;
-
-    typedef struct
-    {
-        UInt32		reserved1[2];
-        UInt32		queryResponseAddressHi;
-        UInt32		queryResponseAddressLo;
-        UInt16		options;
-        UInt16		lun;
-        UInt16		reserved2;
-        UInt16		queryResponseLength;
-        UInt32		statusFIFOAddressHi;
-        UInt32		statusFIFOAddressLo;
-    } FWSBP2QueryLoginsORB;
-    
-    typedef struct
-    {
-        UInt8		details;
-        UInt8		sbpStatus;
-        UInt16		orbOffsetHi;
-        UInt32		orbOffsetLo;
-        UInt32		status[6];
-    } FWSBP2StatusBlock;
-
-protected:
-
-	////////////////////////////////////////        
-	// friend methods
-	
-    // IOFireWireSBP2LUN methods
-    virtual bool initWithLUN( 	IOFireWireSBP2LUN * lun, 
-								void * refCon,
-								FWSBP2ManagementCallback completion  );
-	
-	// IOFireWireSBP2UserClient methods
-    virtual void setAsyncCallbackReference( void * asyncRef );
-    virtual void getAsyncCallbackReference( void * asyncRef );
-
-protected:
-   
-    // reserved for future use
-    struct ExpansionData 
-	{
-		bool fInCriticalSection; 
-	};
-    ExpansionData * fExpansionData; 
-         
-    IOFireWireSBP2LUN * 		fLUN;
-    IOFireWireUnit *			fUnit;
-    
-    UInt32						fManagementOffset;
-    UInt32						fManagementTimeout;
-    UInt32						fFunction;
-    OSObject * 					fManageeCommand;
-    
-	// our orb
-    FWSBP2TaskManagementORB		fManagementORB;
-    IOFWAddressSpace *			fManagementORBAddressSpace;
-    FWAddress					fManagementORBAddress;
-
-	// command to write management agent
-    IOFWWriteCommand *			fWriteCommand;
-    IOMemoryDescriptor *		fWriteCommandMemory;
-
-	// timeout
-    IOFWCommand *				fTimeoutCommand;
-    bool						fTimeoutTimerSet;
-
-	// status block
-    FWSBP2StatusBlock			fStatusBlock;
-    IOFWAddressSpace *			fStatusBlockAddressSpace;
-    FWAddress					fStatusBlockAddress;
-
-	// response buffer
-    void *						fResponseBuf;
-    UInt32						fResponseLen;
-    IOFWAddressSpace *			fResponseAddressSpace;
-    FWAddress					fResponseAddress;
-
-	// competion routine
-	FWSBP2ManagementCallback	fCompletionCallback;
-    void * 						fCompletionRefCon;
-
-    // for user client
-    OSAsyncReference64			fCallbackAsyncRef;
-	
-	IOMemoryMap *				fResponseMap;
-	
-	bool						fCompleting;
-	
-	////////////////////////////////////////        
-
-    // init / destroy
-    virtual IOReturn getUnitInformation( void );
-    virtual IOReturn allocateResources( void );
-    virtual void free( void );
-        
-    // command execution
-    virtual IOReturn execute( void );
-    virtual IOReturn complete( IOReturn state );
-
-    // write complete handler
-    static void writeCompleteStatic( 	void *refcon, 
-										IOReturn status, 
-										IOFireWireNub *device, 
-										IOFWCommand *fwCmd );
-    virtual void writeComplete( IOReturn status, 
-								IOFireWireNub *device, 
-								IOFWCommand *fwCmd );
-
-    // timeout handler
-    static void handleTimeoutStatic( 	void *refcon, 
-										IOReturn status, 
-										IOFireWireBus *bus, 
-										IOFWBusCommand *fwCmd );
-    virtual void handleTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-
-    // status block write handler
-    static UInt32 statusBlockWriteStatic( 	void *refcon, 
-											UInt16 nodeID, 
-											IOFWSpeed &speed, 
-											FWAddress addr, 
-											UInt32 len,
-											const void *buf, 
-											IOFWRequestRefCon lockRead );
-    virtual UInt32 statusBlockWrite( 	UInt16 nodeID, 
-										FWAddress addr, 
-										UInt32 len, 
-										const void *buf, 
-										IOFWRequestRefCon lockRead );
-
-	// IOFireWireSBP2LUN friend class wrappers
-	virtual void clearAllTasksInSet( void );
-	virtual void removeManagementORB( IOFireWireSBP2ManagementORB * orb );
-	
-public:
-    
-	////////////////////////////////////////        
-    // client methods
-
-    /*!
-		@function setCommandFunction
-		@abstract Sets the function of the management ORB.
-		@discussion Sets the the function of the management ORB.  Legal values are kFWSBP2QueryLogins,
-        kFWSBP2AbortTask, kFWSBP2AbortTaskSet,  kFWSBP2LogicalUnitReset, and kFWSBP2TargetReset.
-        @param function a value indicating the desired management function.
-        @result Returns kIOReturnSuccess if function was a legal function.
-	*/
-    	
-    virtual IOReturn setCommandFunction( UInt32 function );
-    
-    /*!
-		@function getCommandFunction
-		@abstract Returns the current function of the management ORB.
-		@discussion Returns the function of the management ORB.  This is the same value that was 
-        set with setCommandFunction.
-        @result Returns the function of the management ORB.
-	*/
-    
-    virtual UInt32 getCommandFunction( void );
-
-    /*!
-		@function setManageeCommand
-		@abstract Sets the command to be managed by the management ORB.
-		@discussion All management functions except kFWSBP2QueryLogins require a reference to an ORB of 
-        some sort.  kFWSBP2AbortTaskSet,  kFWSBP2LogicalUnitReset, and kFWSBP2TargetReset require a 
-        reference to the login ORB.  kFWSBP2AbortTask requires a reference to the ORB to be aborted.  
-        This method allows you to set the ORB to be managed.
-        @param command a reference to an IOFireWireSBP2Login or an IOFireWireSBP2ORB.
- 	*/
-    
-    virtual void setManageeCommand( OSObject * command );
-    
-    /*!
-		@function getCommandFunction
-		@abstract Returns the current managee command of the management ORB.
-		@discussion Returns the current managee command of the management ORB.  This is the same value that was 
-        set with setManageeCommand.
-        @result  Returns the current managee command of the management ORB.
-	*/
-    
-    virtual OSObject* getManageeCommand( void );
-
-    /*!
-		@function setResponseBuffer
-		@abstract Sets the response buffer for the management ORB.
-		@discussion Sets the response buffer for the management ORB.  kFWSBP2QueryLogins returns 
-        a response to its query and needs to write it somewhere.  This routine allows you to 
-        specify the location.
-        @param desc memory descriptor for buffer.
-        @result Returns kIOReturnSuccess on a success.
-	*/
-    
-	virtual IOReturn setResponseBuffer( IOMemoryDescriptor * desc );
-    
-    /*!
-		@function setResponseBuffer
-		@abstract Sets the response buffer for the management ORB.
-		@discussion Sets the response buffer for the management ORB.  kFWSBP2QueryLogins returns 
-        a response to its query and needs to write it somewhere.  This routine allows you to 
-        specify the location.        
-        @param buf backing store for buffer
-        @param len length of buffer.
-        @result Returns kIOReturnSuccess on a success.
-	*/
-    
-    virtual IOReturn setResponseBuffer( void * buf, UInt32 len );
-    
-    /*!
-		@function getResponseBuffer
-		@abstract Returns the response buffer for the management ORB.
-		@discussion Returns the response buffer set in setResponseBuffer above        
-        @param desc memory descriptor for buffer.
-        @param buf output parameter for backing store for buffer
-        @param len output parameter for length of buffer.
-	*/
-    
-    virtual void getResponseBuffer( void ** buf, UInt32 * len );
-
-    /*! 
-        @function release
-        @abstract Primary implementation of the release mechanism.
-        @discussion See OSObject.h for more information. 
-        @param when When retainCount == when then call free(). 
-    */
-    
-	virtual void release() const;
-
-protected:
-
-	virtual void setORBToDummy( IOFireWireSBP2ORB * orb );
-
-	virtual void suspendedNotify();
-
-private:
-
-    OSMetaClassDeclareReservedUsed(IOFireWireSBP2ManagementORB, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ManagementORB, 8);
-    
-};
-
-#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h b/i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h
deleted file mode 100644
index 5c11593..0000000
--- a/i386/include/IOKit/sbp2/IOFireWireSBP2ORB.h
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOFireWireSBP2ORB
-  Contains the class definition for IOFireWireSBP2ORB.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2ORB_H
-#define _IOKIT_IOFIREWIRESBP2ORB_H
-
-#include <IOKit/firewire/IOFireWireUnit.h>
-
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/IOUserClient.h>
-#include <IOKit/IODMACommand.h>
-
-enum
-{
-    kFWSBP2ConstraintForceDoubleBuffer		= (1 << 0)
-};
-
-// login option flags
-enum
-{
-    kFWSBP2CommandCompleteNotify			= (1 << 0),
-    kFWSBP2CommandTransferDataFromTarget	= (1 << 1),
-    kFWSBP2CommandImmediate					= (1 << 2),
-    
-    kFWSBP2CommandNormalORB					= (1 << 5),
-    kFWSBP2CommandReservedORB				= (1 << 6),
-    kFWSBP2CommandVendorORB					= (1 << 7),
-    kFWSBP2CommandDummyORB					= (1 << 8),
-    kFWSBP2CommandCheckGeneration			= (1 << 9),
-	
-	kFWSBP2CommandFixedSize					= (1 << 10),
-	kFWSBP2CommandVirtualORBs				= (1 << 11)     // handy for debugging
-};
-
-enum
-{
-    kFWSBP2MaxPageClusterSize = 0xf000
-};
-
-class IOFireWireSBP2ORB;
-class IOFireWireSBP2LUN;
-class IOFireWireSBP2Login;
-
-/*!
-    @class IOFireWireSBP2ORB
-    @abstract Represents an SBP2 normal command ORB.  Supplies the APIs for configuring normal
-    command ORBs.  This includes setting the command block and writing the page tables for I/O.
-    The ORBs are executed using the submitORB method in IOFireWireSBP2Login.
-*/
-
-class IOFireWireSBP2ORB : public IOCommand
-{
-    OSDeclareDefaultStructors( IOFireWireSBP2ORB )
-
-	friend class IOFireWireSBP2Login;
-	friend class IOFireWireSBP2ManagementORB;
-	
-protected:
-    
-    typedef struct
-    {
-        UInt32		nextORBAddressHi;
-        UInt32		nextORBAddressLo;
-        UInt32		dataDescriptorHi;
-        UInt32		dataDescriptorLo;
-        UInt16		options;
-        UInt16		dataSize;
-        UInt32		commandBlock[1];  // will be variable sized
-     } FWSBP2ORB;
-
-    typedef struct
-    {
-        UInt16		segmentLength;
-        UInt16		segmentBaseAddressHi;
-        UInt32		segmentBaseAddressLo;
-    } FWSBP2PTE;
-
-private:
-
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2ORB, 8);
-
-protected:    
-
-    virtual void deallocateBufferAddressSpace( void );
-    virtual IOReturn allocateTimer( void );
-    virtual void deallocateTimer( void );
-    
-    /*!
-		@function deallocatePageTable
-		@abstract Frees up memory allocated for the page table.
-		@discussion	Frees all memory associated with the page table.  Undoes what allocatePageTable does. 
-        Calling allocatePageTable again will automatically deallocate the existing page table before 
-        allocating a new one, so this method is not used in most cases.
-	*/
-    
-    virtual void deallocatePageTable( void );
-
-protected:
-	
-    // IOFireWireSBP2Login methods
-	virtual bool initWithLogin( IOFireWireSBP2Login * login );
-    virtual void setNextORBAddress( FWAddress address );
-
-public:
-
-    /*!
-		@function allocatePageTable
-		@abstract Allocates memory for the page table.
-		@discussion	Page table allocation is handle automatically by the ORB, except if the 
-        kFWSBP2CommandFixedSize flags is set.  In this case we will fail to write a page table if we 
-        need more page table space than we have already.  This method is exposed so these drivers 
-        can preallocate as much page table as they need.  This is useful if your driver is part of 
-        the paging path and cannot allow allocations to occur.
-        @param entryCount number of entries of page table to be allocated.
-	*/
-
-    virtual IOReturn allocatePageTable( UInt32 entryCount );
-
-protected:
-
-    virtual bool isTimerSet( void );
-    virtual void cancelTimer( void );
-    
-protected:
-  
-    // reserved for future use
-    struct ExpansionData { };
-    ExpansionData *reserved; 
-       
-    IOFireWireSBP2Login *	fLogin;
-    IOFireWireSBP2LUN * 	fLUN;
-    IOFireWireUnit *		fUnit;
-    IOFireWireController *	fControl;
-    IODMACommand *			fDMACommand;
-	void *					fUnused2;
-	
-    UInt32			fCommandFlags;
-    UInt32			fMaxPayloadSize;
-    UInt32			fTimeoutDuration;
-    UInt32			fGeneration;
-    UInt64			fRefCon;
-
-	//
-    // orb
-    //
-	
-	IOMemoryDescriptor *		fORBDescriptor;
-    FWSBP2ORB *					fORBBuffer;
-	
-    FWAddress 					fORBPseudoAddress;
-    IOFWAddressSpace *			fORBPseudoAddressSpace;
-
-    IOFWAddressSpace *			fORBPhysicalAddressSpace;
-	FWAddress					fORBPhysicalAddress;
-
-	//
-    // page table
-    //
-	
-	UInt32						fPageTableSize;
-    IOBufferMemoryDescriptor *	fPageTableDescriptor;
-
-    IOFWAddressSpace *			fPageTablePhysicalAddressSpace;
-	FWAddress					fPageTablePhysicalAddress;
-	UInt32						fPageTablePhysicalLength;
-	
-	IOFWAddressSpace *			fPageTablePseudoAddressSpace;   
-	FWAddress					fPageTablePseudoAddress;
-
-	//
-    // buffers
-    //
-	
-	IOFWAddressSpace *		fBufferAddressSpace;
-    bool					fBufferAddressSpaceAllocated;
-    IOMemoryDescriptor *	fBufferDescriptor;
-    
-	//
-    // timer
-    //
-	
-	IOFWDelayCommand *		fTimeoutCommand;
-    bool					fTimeoutTimerSet;
-
-	bool					fInProgress;
-	bool					fIsAppended;
-	
-    UInt32					fFetchAgentWriteRetries;
-    UInt32					fPTECount;
-    UInt32					fFetchAgentWriteRetryInterval;
-
-	UInt32					fConstraintOptions;
-
-    virtual IOReturn allocateResources( void );
-    virtual void free( void );
-
-    // orb timeout handler
-    static void orbTimeoutStatic( void *refcon, IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-    virtual void orbTimeout( IOReturn status, IOFireWireBus *bus, IOFWBusCommand *fwCmd );
-
-	// login friend class wrappers
-	virtual IOFireWireUnit * getFireWireUnit( void );
-	virtual IOFireWireSBP2LUN * getFireWireLUN( void );
-  	virtual void deallocateORB( void );
-	virtual IOReturn allocateORB( UInt32 orbSize );
-    virtual IOReturn removeORB( IOFireWireSBP2ORB * orb );
-    virtual void prepareORBForExecution( void );
-    virtual void startTimer( void );
-    virtual void sendTimeoutNotification( IOFireWireSBP2ORB * orb );
-
-public:
- 
-    /*! 
-        @function release
-        @abstract Primary implementation of the release mechanism.
-        @discussion See OSObject.h for more information. 
-        @param when When retainCount == when then call free(). 
-    */
-       
-	virtual void release() const;
-
-    /*! 
-        @function getLogin
-        @abstract Gets the login associated with this ORB.
-        @discussion Returns the IOFireWireSBP2Login object associated with this ORB.
-        @result Returns a pointer to an IOFireWireSBP2Login. 
-    */
-    
-    virtual IOFireWireSBP2Login * getLogin( void );
-
-    /*! 
-        @function setCommandBuffersAsRanges
-        @abstract Creates a page table from a list of ranges.
-        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
-        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
-        The SBP2 services do not release references to the command buffers just because the command 
-        has completed.
-        @param ranges An array of ranges representing the data to be transfered.
-        @param withCount The number of ranges in the ranges array.
-        @param withDirection An IODirection indicating the direction of data transfer.
-        @param withTask The task that these adressses reside in.
-        @param offset Offset in bytes into data to begin writing table at.
-        @param length Number of bytes of data to map from offset.
-        @result Returns KIOReturnSuccess if the page table was written successfully. 
-    */
-    
-    virtual IOReturn setCommandBuffersAsRanges(  IOVirtualRange * ranges,
-                                                 UInt32           withCount,
-                                                 IODirection      withDirection,
-                                                 task_t           withTask,
-                                                 UInt32		offset = 0,
-                                                 UInt32		length = 0 );
-    /*! 
-        @function setCommandBuffersAsRanges
-        @abstract Creates a page table from a list of ranges.
-        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
-        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
-        The SBP2 services do not release references to the command buffers just because the command 
-        has completed.
-        @param memoryDescriptor IOMemoryDescriptor describe ranges to be written to a page table.
-        @param offset Offset in bytes into data to begin writing table at.
-        @param length Number of bytes of data to map from offset.
-        @result Returns KIOReturnSuccess if the page table was written successfully. 
-    */
-    
-    virtual IOReturn setCommandBuffers( IOMemoryDescriptor * memoryDescriptor, UInt32 offset = 0, 
-																				UInt32 length = 0 );
-
-
-    /*! 
-        @function releaseCommandBuffers
-        @abstract Releases SBP2's reference to the command buffers.
-        @discussion When you create a page table with one of the variants of setCommandBuffers.  
-        SBP2 holds on to a reference to the buffers until this method is called.  This means that 
-        if a command completed and you manipulated the memory descriptor or released the buffers 
-        without calling this method you could leave FW in an inconsistent state.  
-        @result Returns KIOReturnSuccess if the page table was cleared successfully. 
-    */
-
-    virtual IOReturn releaseCommandBuffers( void );
-    
-    /*! 
-        @function setCommandBlock
-        @abstract Sets the command block portion of the ORB.
-        @discussion Copys the data provided in the buffer to the command block portion of the ORB.
-        @param buffer Pointer to buffer to copy command block from.
-        @param length Number of bytes of data to copy.
-        @result Returns KIOReturnSuccess if the command block was updated successfully. 
-    */
-    
-    virtual IOReturn setCommandBlock( void * buffer, UInt32 length );
-    
-    /*! 
-        @function setCommandBlock
-        @abstract Sets the command block portion of the ORB.
-        @discussion Copys the data provided in the buffer to the command block portion of the ORB.
-        @param memory IOMemoryDescriptor representing the command block buffer.
-        @result Returns KIOReturnSuccess if the command block was updated successfully. 
-    */
-    
-    virtual IOReturn setCommandBlock( IOMemoryDescriptor * memory );
-    
-    /*! 
-        @function getCommandBufferDescriptor
-        @abstract Returns the memory descriptor representing the command buffer.
-        @discussion Returns the IOMemoryDescriptor for the data mapped by setCommandBuffer variants.  
-        Works for setCommandBuffersAsRanges too.
-        @result Returns memory descriptor representing mapped data buffers. 
-    */
-    
-	virtual IOMemoryDescriptor * getCommandBufferDescriptor( void );
-	
-    // accessors
-    
-    /*! 
-        @function setCommandFlags
-        @abstract Sets configuration flags for the ORB.
-        @discussion Sets the configuration flags for the ORB.  These can be any of the following:
-		<p>kFWSBP2CommandCompleteNotify - Set the notify bit as specified in SBP2 standard. Set to receive completion/timeout notification on this ORB.  You almost always want to set this.</p>
-		<p>kFWSBP2CommandTransferDataFromTarget - Transfer direction as specified in SBP2 standard.  Set if data is to be written by the device into the host's memory.</p>
-		<p>kFWSBP2CommandImmediate - Immediate Append.  ORB address will be written to fetch agent and not chained.  It is only legal to have one immediate ORB in progress at a time.</p>
-		<p>kFWSBP2CommandNormalORB - ORB format 0 - Format specified by SBP2 standard.  Set this for most ORBs.</p>
-		<p>kFWSBP2CommandReservedORB - ORB format 1 - Format reserved by SBP2 standard for future standardization.</p>
-		<p>kFWSBP2CommandVendorORB - ORB format 2 - Format specified by SBP2 standard for vendor dependent ORBs.</p>
-		<p>kFWSBP2CommandDummyORB - ORB format 3 - Format specified by SBP2 standard for dummy ORBs.</p>
-		<p>kFWSBP2CommandCheckGeneration - If set upon submitORB, the ORB will only be appended if generation set with setCommandGeneration() matches the current generation.  Pretty much all SBP2 drivers need sophisticated logic to track login state, so this is generally not used. </p>
-		<p>kFWSBP2CommandFixedSize - Do not allocate more memory for page table if needed.  If there is not enough space in the currently allocated page table, the setCommandBuffers call will fail.  This is important to set if your device is the backing store, as we don't want to cause memory allocations on the paging path. </p>
-		<p>kFWSBP2CommandVirtualORBs - Normally ORBs are backed by physical address spaces.  Setting this flag makes this ORB backed by a pseudo address space.  This can make ORBs easier to see in a bus trace.  Virtual ORBs will have an address in the form of ffcX.XXXX.0000.0000.  Pseudo address space backed ORBs are slower, so you won't want to set for deployment builds.</p>
-        @param flags The flags to be set.
-    */
-    
-    virtual void setCommandFlags( UInt32 flags );
-
-    /*! 
-        @function getCommandFlags
-        @abstract Sets configuration flags for the ORB.
-        @discussion Returns the current configuration flags set on this ORB.
-        @result Return The current ORB flags.
-    */
-    
-    virtual UInt32 getCommandFlags( void );
-
-    /*! 
-        @function setMaxPayloadSize
-        @abstract Sets max payload size for the ORB.
-        @discussion This sets the maximum payload size for this ORB only.  This size is clipped by 
-        the global max payload size set in the login object.
-        @param maxPayloadSize The maximum payload size in bytes.
-    */
-    
-    virtual void setMaxPayloadSize( UInt32 maxPayloadSize );
-
-    /*! 
-        @function getMaxPayloadSize
-        @abstract Gets max payload size for the ORB.
-        @discussion This gets the maximum payload size for this ORB only.
-        @result Returns the maximum payload size in bytes.
-    */
-    
-    virtual UInt32 getMaxPayloadSize( void );
-
-    /*! 
-        @function setCommandTimeout
-        @abstract Sets the timeout of the ORB.
-        @discussion This sets the timeout for the ORB in milliseconds. Note that ORBs without timeouts 
-        can be "lost."  You will obviously not recieve timeout notification for timeouts of zero.  But 
-        perhaps less obviously you will not recieve orb reset notification, which is really a sort of
-        accelerated timeout notification for bus reset situations.  
-        @param timeout The timeout duration in milliseconds.
-    */
-    
-    virtual void setCommandTimeout( UInt32 timeout );
-    
-    /*! 
-        @function getCommandTimeout
-        @abstract Gets the timeout of the ORB.
-        @discussion This method gets the timeout for this ORB in milliseconds.
-        @result Returns the timeout for the orb in milliseconds.
-    */
-    
-    virtual UInt32 getCommandTimeout( void );
-
-
-    /*! 
-        @function setCommandGeneration
-        @abstract Sets the command generation.
-        @discussion This sets the bus generation this ORB should be appended in.  It is only meaningful 
-        when combined with the kFWSBP2CommandCheckGeneration flags above.
-        @param gen The bus generation for command execution.
-    */
-    
-    virtual void setCommandGeneration( UInt32 gen );
-    
-    /*! 
-        @function getCommandGeneration
-        @abstract Gets the command generation.
-        @discussion This gets the bus generation this ORB should be appended in.
-        @result Returns the bus generation for command execution.
-    */
-    
-    virtual UInt32 getCommandGeneration( void );
-
-    /*!
-		@function setRefCon
-		@abstract Sets the ORB refCon.
-		@discussion Sets a user defined value on the ORB that can be retrieved later with the 
-        method getRefCon.
-        @param refCon a user defined value.
-    */
-    
-    virtual void setRefCon( void * refCon );
-
-    /*!
-		@function getRefCon
-		@abstract Returns the refCon set with setRefCon.
-		@discussion Returns the user defined value previously stored in the ORB with setRefCon.
-        @result Returns the previously stored user defined value.
-	*/
-    
-    virtual void * getRefCon( void );
-
-protected:    
-
-    virtual void setToDummy( void );
-
-public:	
-    /*!
-		@function getORBAddress
-		@abstract Returns the FireWire address of this ORB.
-		@discussion Returns the FireWire bus address of this ORB.  This is not the same as the Macintosh 
-        address for the IOFireWireSBP2ORB.
-        @result Returns the FireWire address of this ORB.
-	*/
-    
-    virtual void getORBAddress( FWAddress * address );
-
-protected:
-	
-	virtual bool isAppended( void );
-	virtual void setIsAppended( bool state );
-	virtual UInt32 getFetchAgentWriteRetries( void );
-    virtual void setFetchAgentWriteRetries( UInt32 retries );
-
-    virtual void prepareFastStartPacket( IOBufferMemoryDescriptor * descriptor );
-
-	UInt32 getFetchAgentWriteRetryInterval( void );
-    void setFetchAgentWriteRetryInterval( UInt32 interval );
-
-	IOReturn completeBufferAddressSpace( void );
-	IOReturn prepareBufferAddressSpace( IOMemoryDescriptor * memoryDescriptor );
-
-public:
-
-    /*!
-		@function setBufferConstraints
-		@abstract Configures page table generation parameters
-		@discussion Sets the maximums size of any page table segment and the required alignemnt.  Double buffering
-		may be used to satisfy these constraints. The only supported option is kFWSBP2ConstraintForceDoubleBuffer which
-		forces a page aligned double buffering of the entire descriptor.
-        @result May return an error if there is a problem allocating the underlying resources or if buffers are currently attached.
-	*/
-
-	IOReturn setBufferConstraints( UInt64 maxSegmentSize, UInt32 alignment, UInt32 options = 0);
-
-
-    /*! 
-        @function setCommandBuffersAsRanges64
-        @abstract Creates a page table from a list of 64 bit ranges.
-        @discussion Creates a page table with the given parameters. Any addresses mapped by this method 
-        must remain valid until setCommandBuffers is called again or releaseCommandBuffers is called.  
-        The SBP2 services do not release references to the command buffers just because the command 
-        has completed. This is a 64 bit compatible version of setCommandBuffersAsRanges.
-        @param ranges An array of ranges representing the data to be transfered.
-        @param withCount The number of ranges in the ranges array.
-        @param withDirection An IODirection indicating the direction of data transfer.
-        @param withTask The task that these adressses reside in.
-        @param offset Offset in bytes into data to begin writing table at.
-        @param length Number of bytes of data to map from offset.
-        @result Returns KIOReturnSuccess if the page table was written successfully. 
-    */
-	   
-    IOReturn setCommandBuffersAsRanges64(	IOAddressRange *	ranges,
-											uint64_t			withCount,
-											IODirection			withDirection,
-											task_t				withTask,
-											uint64_t			offset = 0,
-											uint64_t			length = 0);
-
-    /*!
-		@function setRefCon64
-		@abstract Sets the ORB refCon as a 64 bit value.
-		@discussion Sets a user defined value on the ORB that can be retrieved later with the 
-        method getRefCon.
-        @param refCon a user defined value.
-    */
-    
-    virtual void setRefCon64( UInt64 refCon );
-
-    /*!
-		@function getRefCon64
-		@abstract Returns the 64 bit refCon set with setRefCon64.
-		@discussion Returns the user defined value previously stored in the ORB with setRefCon.
-        @result Returns the previously stored user defined value.
-	*/
-    
-    virtual UInt64 getRefCon64( void );
-
-protected:
-	
-	UInt32	calculateTransferSizeLog( bool * clipping );
-
-
-};
-    
-#endif
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2Target.h b/i386/include/IOKit/sbp2/IOFireWireSBP2Target.h
deleted file mode 100644
index 4288ce9..0000000
--- a/i386/include/IOKit/sbp2/IOFireWireSBP2Target.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOFireWireSBP2Target
-  Contains the class definition for IOFireWireSBP2Target.
-*/
-
-#ifndef _IOKIT_IOFIREWIRESBP2TARGET_H
-#define _IOKIT_IOFIREWIRESBP2TARGET_H
-
-#include <IOKit/firewire/IOFireWireUnit.h>
-#include <IOKit/IOService.h>
-
-enum
-{
-    kIOFWSBP2FailsOnAckBusy = (1 << 0),
-	kIOFWSBP2FailsOnBusResetsDuringIO = (1 << 1),
-	kIOFWSBP2DontUsePTPacketLimit = (1 << 2)
-};
-
-/*!
-    @class IOFireWireSBP2Target
-    @abstract Serves as bridge between IOFireWireUnit and IOFireWireLUN.
-    @discussion Matches against IOFireWireUnits supporting the SBP2 protocol.  Creates IOFireWireSBP2LUN nubs 	for matching. Most drivers will match against an IOFireWireSBP2LUN, but matching against an 	IOFireWireSBP2Target is also supported. This can be useful in cases where a single driver wishes to 
-    control all LUNs on a device. Support for this technique is minimal, however, and the driver will be
-    required to discover it's LUNs through the registry.
-*/
-
-class IOFireWireSBP2Target : public IOService
-{
-    OSDeclareDefaultStructors(IOFireWireSBP2Target);
-
-protected:
-	
-	/////////////////////////////////////////
-    // rom keys
-	
-    enum
-    {
-        kCmdSpecIDKey 				= 0x38,
-        kCmdSetKey					= 0x39,
-        kSoftwareRevKey				= 0x3b,
-        kFirmwareRevKey	 			= 0x3c,
-        kLUNKey						= 0x14,
-        kLUNDirectoryKey			= 0xd4,
-        kManagementAgentOffsetKey	= 0x54,
-		kUnitCharacteristicsKey 	= 0x3A,
-		kRevisionKey				= 0x21,
-		kFastStartKey				= 0x3E
-    };
-
-    typedef struct
-    {
-		UInt32 cmdSpecID; 
-		UInt32 cmdSet;
-		UInt32 vendorID;
-		UInt32 softwareRev;
-		UInt32 firmwareRev; 
-		UInt32 lun;
-		UInt32 devType;
-		UInt32 unitCharacteristics;
-		UInt32 managementOffset;
-		UInt32 revision;
-		bool fastStartSupported;
-		UInt32 fastStart;
-    } LUNInfo;
-	
-    // reserved for future use
-    struct ExpansionData 
-	{
-		bool				fStarted;
-		OSArray *			fPendingMgtAgentCommands ;
-		UInt32				fNumberPendingMgtAgentOrbs;
-		UInt32				fNumLUNs;
-	};
-    ExpansionData * fExpansionData; 
-    
-	/////////////////////////////////////////
-	// private fields
-	
-    bool 				fOpenFromTarget;
-    UInt32				fOpenFromLUNCount;    
-    IOFireWireUnit * 	fProviderUnit;
-    UInt32				fFlags;
-    
-	IOFireWireController * fControl;
-	
-	UInt32 				fIOCriticalSectionCount;
-	
-	/////////////////////////////////////////
-	// private internals
-
-    virtual void free( void );	
-    virtual IOReturn message( 	UInt32 type, 
-								IOService * provider,
-								void * argument = 0);
-    
-    virtual void scanForLUNs( void );
-    IOReturn createLUN( LUNInfo * info );
-
-public:
-
-	/////////////////////////////////////////
-	// public methods
-	
-	/*! @function handleOpen
-		@abstract Overrideable method to control the open / close behaviour of an IOService.
-		@discussion See IOService for discussion.		
-		@param forClient Designates the client of the provider requesting the open.
-		@param options Options for the open, may be interpreted by the implementor of handleOpen.
-		@result Return true if the open was successful, false otherwise. */
-
-    virtual bool handleOpen( IOService * forClient, IOOptionBits options, void * arg );
-	
-	/*! 
-		@function handleClose
-		@abstract Overrideable method to control the open / close behaviour of an IOService.
-		@discussion See IOService for discussion.
-		@param forClient Designates the client of the provider requesting the close.
-		@param options Options for the close, may be interpreted by the implementor of handleOpen. 
-	*/
-
-	virtual void handleClose( IOService * forClient, IOOptionBits options );
-
-	/*! 
-		@function handleIsOpen
-		@abstract Overrideable method to control the open / close behaviour of an IOService.
-		@discussion See IOService for discussion.		
-		@param forClient If non-zero, isOpen returns the open state for that client. If zero is passed, isOpen returns the open state for all clients.
-		@result Returns true if the specific, or any, client has the IOService open. 
-	*/
-	
-    virtual bool handleIsOpen(  const IOService * forClient ) const;
-    
-	/*! 
-		@function start
-		@abstract During an IOService instantiation, the start method is called when the IOService has been selected to run on the provider.
-		@discussion See IOService for discussion.
-		@result Return true if the start was successful, false otherwise (which will cause the instance to be detached and usually freed).
-	*/
-	
-    virtual bool start( IOService *provider );
- 
-	/*! 
-		@function stop
-		@abstract During an IOService termination, the stop method is called in its clients before they are detached & it is destroyed.
-		@discussion See IOService for discussion.
-	*/
-   
-	virtual void stop( IOService *provider );
-
-	/*!
-		@function getFireWireUnit
-		@abstract Returns an IOFireWireUnit object.
-		@discussion An IOFireWireUnit is the provider of an IOFireWireSBP2Target.  In order to use the base FireWire services
-		you will need a reference to the unit.  This method returns that reference.
-		@result Returns a pointer to an IOFireWireUnit.
-	*/
-	
-    virtual IOFireWireUnit * getFireWireUnit( void );
-	
-	/*! 
-		@function matchPropertyTable
-		@abstract Implements SBP2 specific matching.
-		@discussion See IOService for discussion.
-	    @param table The dictionary of properties to be matched against.
-		@result Returns false if the family considers the matching dictionary does not match in properties it understands, true otherwise.
-	*/
-	
-	virtual bool matchPropertyTable( OSDictionary * table );
-
-    virtual void setTargetFlags( UInt32 flags );
-    virtual UInt32 getTargetFlags( void );
-
-protected:
-    virtual void configurePhysicalFilter( void );
-
-public:
-    virtual void clearTargetFlags( UInt32 flags );
-	virtual IOReturn beginIOCriticalSection( void );
-	virtual void endIOCriticalSection( void );
-
-    virtual bool finalize( IOOptionBits options );
-    
-    IOReturn 	synchMgmtAgentAccess( IOFWCommand * mgmtOrbCommand );
-	void		completeMgmtAgentAccess( );
-	void 		clearMgmtAgentAccess( );
-	void		cancelMgmtAgentAccess( IOFWCommand * mgmtOrbCommand );
-
-protected:
-
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 0);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 1);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 2);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 3);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 4);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 5);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 6);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 7);
-    OSMetaClassDeclareReservedUnused(IOFireWireSBP2Target, 8);	
-    
-};
-
-#endif
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2UserClient.h b/i386/include/IOKit/sbp2/IOFireWireSBP2UserClient.h
deleted file mode 100644
index 939dbf0..0000000
--- a/i386/include/IOKit/sbp2/IOFireWireSBP2UserClient.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOFIREWIRESBP2USERCLIENT_H
-#define _IOKIT_IOFIREWIRESBP2USERCLIENT_H
-
-#include <IOKit/IOUserClient.h>
-
-#define FIREWIREPRIVATE
-#include <IOKit/firewire/IOFireWireController.h>
-#undef FIREWIREPRIVATE
-
-#include <IOKit/firewire/IOFWUserObjectExporter.h>
-
-#include <IOKit/sbp2/IOFireWireSBP2UserClientCommon.h>
-#include <IOKit/sbp2/IOFireWireSBP2LUN.h>
-
-class IOFireWireSBP2UserClient : public IOUserClient
-{
-    OSDeclareDefaultStructors(IOFireWireSBP2UserClient)
-
-protected:
-
-    bool					fOpened;
-	bool					fStarted;
-    IOFireWireSBP2Login * 	fLogin;
-    task_t					fTask;
-	
-    IOFireWireSBP2LUN *		fProviderLUN;
-    OSAsyncReference64		fMessageCallbackAsyncRef;
-    OSAsyncReference64		fLoginCallbackAsyncRef;
-    OSAsyncReference64		fLogoutCallbackAsyncRef;
-    OSAsyncReference64		fUnsolicitedStatusNotifyAsyncRef;
-    OSAsyncReference64		fStatusNotifyAsyncRef;
-    OSAsyncReference64		fFetchAgentResetAsyncRef;
-	OSAsyncReference64		fFetchAgentWriteAsyncRef;
-	
-	IOFWUserObjectExporter	*	fExporter;
-	
-	IOFireWireLib::UserObjectHandle		fSessionRef;
-	
- 	virtual IOReturn externalMethod(	uint32_t selector, 
-										IOExternalMethodArguments * args,
-										IOExternalMethodDispatch * dispatch, 
-										OSObject * target, 
-										void * reference );
-public:
-
-	virtual bool initWithTask( task_t owningTask, void * securityToken, UInt32 type, OSDictionary * properties );
-	virtual void free ();
-				
-    virtual bool start( IOService * provider );
-
-    virtual IOReturn clientClose( void );
-    virtual IOReturn clientDied( void );
-
-	// IOFireWireSBP2ManagementORB friend class wrappers
-	virtual void flushAllManagementORBs( void );
-
-    /////////////////////////////////////////////////
-    // IOFireWireSBP2LUN
-
-    IOReturn open( IOExternalMethodArguments * arguments );
-	IOReturn openWithSessionRef( IOExternalMethodArguments * arguments );
-	IOReturn getSessionRef( IOExternalMethodArguments * arguments );
-    IOReturn close( IOExternalMethodArguments * arguments );
-
-    // callbacks
-	IOReturn setMessageCallback( IOExternalMethodArguments * arguments );
-    virtual IOReturn message( UInt32 type, IOService * provider, void * arg );
-
-    /////////////////////////////////////////////////
-    // IOFireWireSBP2Login
-    
-    IOReturn setLoginCallback( IOExternalMethodArguments * arguments );
-	IOReturn setLogoutCallback( IOExternalMethodArguments * arguments );
-    IOReturn setUnsolicitedStatusNotify( IOExternalMethodArguments * arguments );
-    IOReturn setStatusNotify( IOExternalMethodArguments * arguments );
-	IOReturn createLogin( IOExternalMethodArguments * arguments );
-    IOReturn releaseLogin( IOExternalMethodArguments * arguments );
-    IOReturn submitLogin( IOExternalMethodArguments * arguments );
-    IOReturn submitLogout( IOExternalMethodArguments * arguments );
-	IOReturn setLoginFlags( IOExternalMethodArguments * arguments );
-    IOReturn getMaxCommandBlockSize( IOExternalMethodArguments * arguments );
-    IOReturn getLoginID( IOExternalMethodArguments * arguments );
-    IOReturn setReconnectTime( IOExternalMethodArguments * arguments );
-	IOReturn setMaxPayloadSize( IOExternalMethodArguments * arguments );
-    
-	IOReturn submitFetchAgentReset( IOExternalMethodArguments * arguments );
-	IOReturn setFetchAgentWriteCompletion( IOExternalMethodArguments * arguments );
-	IOReturn ringDoorbell( IOExternalMethodArguments * arguments );
-	IOReturn enableUnsolicitedStatus( IOExternalMethodArguments * arguments );
-	IOReturn setBusyTimeoutRegisterValue( IOExternalMethodArguments * arguments );
-    IOReturn setPassword( IOExternalMethodArguments * arguments );
-
-	// callbacks
-	
-	static void staticLoginCallback( void * refCon, FWSBP2LoginCompleteParamsPtr params );
-    virtual void loginCallback( FWSBP2LoginCompleteParamsPtr params );
-
-	static void staticLogoutCallback( void * refCon, FWSBP2LogoutCompleteParamsPtr params );
-    virtual void logoutCallback( FWSBP2LogoutCompleteParamsPtr params );
-
-	static void staticStatusNotify( void * refCon, FWSBP2NotifyParams * params );
-    virtual void statusNotify( FWSBP2NotifyParams * params );
-
-	static void staticUnsolicitedNotify( void * refCon, FWSBP2NotifyParams * params );
-    virtual void unsolicitedNotify( FWSBP2NotifyParams * params );
-
-	static void staticFetchAgentWriteComplete( void * refCon, IOReturn status, IOFireWireSBP2ORB * orb );
-	virtual void fetchAgentWriteComplete( IOReturn status, IOFireWireSBP2ORB * orb );
-
-    static void staticFetchAgentResetComplete( void * refCon, IOReturn status );
-    virtual void fetchAgentResetComplete( IOReturn status );
-	
-    /////////////////////////////////////////////////
-    // IOFireWireSBP2ORB
-
-    IOReturn createORB(  IOExternalMethodArguments * arguments );
-    IOReturn releaseORB(  IOExternalMethodArguments * arguments );
-	IOReturn submitORB(  IOExternalMethodArguments * arguments );
-    IOReturn setCommandFlags(  IOExternalMethodArguments * arguments );
-    IOReturn setORBRefCon(  IOExternalMethodArguments * arguments );
-	IOReturn setMaxORBPayloadSize(  IOExternalMethodArguments * arguments );
-    IOReturn setCommandTimeout(  IOExternalMethodArguments * arguments );
-	IOReturn setCommandGeneration(  IOExternalMethodArguments * arguments );
-    IOReturn setToDummy(  IOExternalMethodArguments * arguments );
-    IOReturn setCommandBuffersAsRanges(  IOExternalMethodArguments * arguments );
-    IOReturn releaseCommandBuffers(  IOExternalMethodArguments * arguments );
-    IOReturn setCommandBlock(  IOExternalMethodArguments * arguments );
-	
-	// LSI workaround
-    IOReturn LSIWorkaroundSetCommandBuffersAsRanges(  IOExternalMethodArguments * arguments );
-	IOReturn LSIWorkaroundSyncBuffersForOutput(  IOExternalMethodArguments * arguments );
-	IOReturn LSIWorkaroundSyncBuffersForInput(  IOExternalMethodArguments * arguments );
-															
-    /////////////////////////////////////////////////
-    // IOFireWireSBP2MgmtORB
-
-	IOReturn createMgmtORB(  IOExternalMethodArguments * arguments );
-    IOReturn releaseMgmtORB(  IOExternalMethodArguments * arguments );
-    IOReturn setMgmtORBCallback(  IOExternalMethodArguments * arguments );
-    IOReturn submitMgmtORB(  IOExternalMethodArguments * arguments );	
-	IOReturn setMgmtORBCommandFunction(  IOExternalMethodArguments * arguments );
-	IOReturn setMgmtORBManageeORB(  IOExternalMethodArguments * arguments );
-	IOReturn setMgmtORBManageeLogin(  IOExternalMethodArguments * arguments );
-	IOReturn setMgmtORBResponseBuffer(  IOExternalMethodArguments * arguments );
-
-	// callbacks
-    static void staticMgmtORBCallback( void * refCon, IOReturn status, IOFireWireSBP2ManagementORB * orb );
-    virtual void mgmtORBCallback( IOReturn status, IOFireWireSBP2ManagementORB * orb );
-	
-	// IOFireWireSBP2MgmtORB friend class wrappers
-	virtual void setMgmtORBAsyncCallbackReference( IOFireWireSBP2ManagementORB * orb, void * asyncRef );    
-	virtual void getMgmtORBAsyncCallbackReference( IOFireWireSBP2ManagementORB * orb, void * asyncRef );
-
-	    uint32_t		   checkScalarInputCount;
-    uint32_t		   checkStructureInputSize;
-    uint32_t		   checkScalarOutputCount;
-    uint32_t		   checkStructureOutputSize;
-    
-    IOReturn checkArguments( IOExternalMethodArguments * args, uint32_t scalarInCount, uint32_t structInCount, 
-    													uint32_t scalarOutCount, uint32_t structOutCount );
-
-};
-
-#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/IOFireWireSBP2UserClientCommon.h b/i386/include/IOKit/sbp2/IOFireWireSBP2UserClientCommon.h
deleted file mode 100644
index cb114ba..0000000
--- a/i386/include/IOKit/sbp2/IOFireWireSBP2UserClientCommon.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOFIREWIRESBP2USERCLIENTCOMMON_H_
-#define _IOKIT_IOFIREWIRESBP2USERCLIENTCOMMON_H_
-
-#define kIOFireWireSBP2LibConnection 12
-
-enum IOFWSBP2UserClientCommandCodes {
-    kIOFWSBP2UserClientOpen,						// kIOUCScalarIScalarO 0,0
-    kIOFWSBP2UserClientClose,						// kIOUCScalarIScalarO 0,0
-    kIOFWSBP2UserClientCreateLogin,					// kIOUCScalarIScalarO 0,1
-    kIOFWSBP2UserClientReleaseLogin,				// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSubmitLogin,					// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSubmitLogout,				// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSetLoginFlags,				// kIOUCScalarIScalarO 2,0
-    kIOFWSBP2UserClientGetMaxCommandBlockSize,		// kIOUCScalarIScalarO 1,1
-    kIOFWSBP2UserClientGetLoginID,					// kIOUCScalarIScalarO 1,1
-    kIOFWSBP2UserClientSetReconnectTime,			// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSetMaxPayloadSize,			// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientCreateORB,					// kIOUCScalarIScalarO 0,1
-    kIOFWSBP2UserClientReleaseORB,					// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSubmitORB,					// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSetCommandFlags,  			// kIOUCScalarIScalarO 2,0
-    kIOFWSBP2UserClientSetMaxORBPayloadSize, 		// kIOUCScalarIScalarO 2,0
-    kIOFWSBP2UserClientSetCommandTimeout, 			// kIOUCScalarIScalarO 2,0
-    kIOFWSBP2UserClientSetCommandGeneration, 		// kIOUCScalarIScalarO 2,0
-    kIOFWSBP2UserClientSetToDummy,	  				// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSetCommandBuffersAsRanges,	// kIOUCScalarIScalarO 6,0
-    kIOFWSBP2UserClientReleaseCommandBuffers, 		// kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientSetCommandBlock,	  			// kIOUCScalarIScalarO 3,0
-	kIOFWSBP2UserClientCreateMgmtORB,     			// kIOUCScalarIScalarO 0,1
-	kIOFWSBP2UserClientReleaseMgmtORB,   			// kIOUCScalarIScalarO 1,0
-	kIOFWSBP2UserClientSubmitMgmtORB,    			// kIOUCScalarIScalarO 1,0
-	kIOFWSBP2UserClientMgmtORBSetCommandFunction,   // kIOUCScalarIScalarO 2,0
-	kIOFWSBP2UserClientMgmtORBSetManageeORB,  		// kIOUCScalarIScalarO 2,0
-	kIOFWSBP2UserClientMgmtORBSetManageeLogin,    	// kIOUCScalarIScalarO 2,0
-	kIOFWSBP2UserClientMgmtORBSetResponseBuffer,    // kIOUCScalarIScalarO 3,0
-	kIOFWSBP2UserClientLSIWorkaroundSetCommandBuffersAsRanges, // kIOUCScalarIScalarO 6,0
-	kIOFWSBP2UserClientMgmtORBLSIWorkaroundSyncBuffersForOutput, // kIOUCScalarIScalarO 1,0
-	kIOFWSBP2UserClientMgmtORBLSIWorkaroundSyncBuffersForInput, // kIOUCScalarIScalarO 1,0
-    kIOFWSBP2UserClientOpenWithSessionRef,			// kIOUCScalarIScalarO 1,0
-	kIOFWSBP2UserClientGetSessionRef,				// kIOUCScalarIScalarO 0,1
-	kIOFWSBP2UserClientRingDoorbell,				// kIOUCScalarIScalarO 1, 0
-	kIOFWSBP2UserClientEnableUnsolicitedStatus, // kIOUCScalarIScalarO 1, 0
-	kIOFWSBP2UserClientSetBusyTimeoutRegisterValue,   // kIOUCScalarIScalarO 2, 0
-	kIOFWSBP2UserClientSetORBRefCon, 				// kIOUCScalarIScalarO 2, 0
-	kIOFWSBP2UserClientSetPassword,					// kIOUCScalarIScalarO 3, 0
-    kIOFWSBP2UserClientSetMessageCallback,   		// kIOUCScalarIScalarO 2, 0
-    kIOFWSBP2UserClientSetLoginCallback,			// kIOUCScalarIScalarO 2, 0
-    kIOFWSBP2UserClientSetLogoutCallback,			// kIOUCScalarIScalarO 2, 0
-    kIOFWSBP2UserClientSetUnsolicitedStatusNotify, 	// kIOUCScalarIScalarO 2, 0
-    kIOFWSBP2UserClientSetStatusNotify, 			// kIOUCScalarIScalarO 2, 0
-	kIOFWSBP2UserClientSetMgmtORBCallback,  		// kIOUCScalarIScalarO 3, 0
-	kIOFWSBP2UserClientSubmitFetchAgentReset,  		// kIOUCScalarIScalarO 3, 0
-	kIOFWSBP2UserClientSetFetchAgentWriteCompletion, // kIOUCScalarIScalaO 2, 0
-    kIOFWSBP2UserClientNumCommands
-};
-
-#endif
\ No newline at end of file
diff --git a/i386/include/IOKit/sbp2/IOFireWireSerialBusProtocolTransport.h b/i386/include/IOKit/sbp2/IOFireWireSerialBusProtocolTransport.h
deleted file mode 100644
index 53e6195..0000000
--- a/i386/include/IOKit/sbp2/IOFireWireSerialBusProtocolTransport.h
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-/*!
-  @header IOFireWireSerialBusProtocolTransport
-  Contains the class definition for IOFireWireSerialBusProtocolTransport.
-*/
-
-
-#ifndef _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_
-#define _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_
-
-
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/IOLib.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOCommandPool.h>
-#include <IOKit/firewire/IOFireWireUnit.h>
-#include <IOKit/sbp2/IOFireWireSBP2LUN.h>
-
-#include <IOKit/scsi/IOSCSIProtocolServices.h>
-
-/*!
-	@class IOFireWireSerialBusProtocolTransport
-	@abstract SCSI Protocol Driver Family for FireWire SBP2 Devices. 
-	@discussion IOFireWireSerialBusProtocolTransport contains all the bus specific support for FireWire
-	SBP2 compliant devices. To add vendor specific features or workarounds you will sub-class the appropriate
-	methods of this family. 
-*/
-
-class IOFireWireSerialBusProtocolTransport : public IOSCSIProtocolServices
-{
-	
-	OSDeclareDefaultStructors ( IOFireWireSerialBusProtocolTransport )
-	
-private:
-	
-	IOFireWireUnit *				fUnit;
-	IOFireWireSBP2LUN *				fSBPTarget;
-	IOFireWireSBP2Login *			fLogin;
-	IOFireWireSBP2ORB *				fORB;
-	IOFireWireSBP2ManagementORB * 	fLUNResetORB;
-	
-	// /!\ WARNING! NOT USED left behind for legacy binary reasons
-	IOSimpleLock *					fQueueLock;
-	
-	UInt32							fLoginRetryCount;
-	bool							fDeferRegisterService;
-	bool							fNeedLogin;
-    
-    // /!\ WARNING! NOT USED left behind for legacy binary reasons
-	bool							fPhysicallyConnected;
-	
-	static void
-	StatusNotifyStatic ( void * refCon, FWSBP2NotifyParamsPtr params );
-	
-	static void
-	UnsolicitedStatusNotifyStatic (	void * 					refCon,
-									FWSBP2NotifyParamsPtr 	params );
-	
-	static void
-	LunResetCompleteStatic (	void * 							refCon,
-								IOReturn						status,
-								IOFireWireSBP2ManagementORB * 	orb );
-	
-	static void
-	FetchAgentResetCompleteStatic (	void * refcon,
-									IOReturn status );
-	
-	static IOReturn
-	ConnectToDeviceStatic (	OSObject * refCon, void *, void *, void *, void * );
-	
-	virtual void
-	FetchAgentResetComplete ( IOReturn status );
-	
-	static void LoginCompletionStatic ( void * refCon, FWSBP2LoginCompleteParams * params );
-	
-	static void
-	LogoutCompletionStatic ( void * refCon, FWSBP2LogoutCompleteParams * params );
-	
-	/*!
-		@function CoalesceSenseData
-		@abstract CoalesceSenseData convert a SBP-2 status block into a SPC-2 sense block.
-		@discussion	CoalesceSenseData pulls the appropriate bits out of the SBP2 sense block
-		as defined in SBP-2 Annex B section B.2 and dynamically builds a sense data block as
-		defined in SPC-2 section 7.23.2.
-	*/
-	
-	SCSITaskStatus
-	CoalesceSenseData (	FWSBP2StatusBlock *	sourceData,
-						UInt8				quadletCount,
-						SCSI_Sense_Data *	targetData );
-	
-	virtual void ConnectToDevice ( void );
-	
-	virtual void DisconnectFromDevice ( void );
-	
-	virtual bool IsDeviceCPUInDiskMode ( void );
-
-protected:
-    
-	/*!
-		@function AllocateResources
-		@abstract Allocate Resources.
-		@discussion	Called from start method to allocate needed resources.
-	*/
-    
-	virtual IOReturn AllocateResources ( void );
-    
-	/*!
-		@function DeallocateResources
-		@abstract Deallocate Resources.
-		@discussion	Called from cleanUp method to deallocate resources.
-	*/
-    
-	virtual void DeallocateResources ( void );
-	
-	enum SBP2LoginState
-	{
-		kFirstTimeLoggingInState,
-		kLogginSucceededState,
-		kLogginFailedState
-	};
-	
-	/*! 
-		@typedef SBP2ClientOrbData
-		@param orb IOFireWireSBP2ORB for request.
-		@param scsiTask SCSITaskIdentifier of request. 
-		@param serviceResponse SCSIServiceResponse of request.
-		@param taskStatus SCSITaskStatus of request.
-		@discussion This structure is stuffed into the refcon so we can associate which
-		IOFireWireSBP2ORB and SCSITaskIdentifier is completing.
-	*/
-	
-	typedef struct {
-		IOFireWireSBP2ORB *				orb;
-		SCSITaskIdentifier 				scsiTask;
-		SCSIServiceResponse 			serviceResponse;
-		SCSITaskStatus					taskStatus;
-		IOBufferMemoryDescriptor *		quadletAlignedBuffer;
-	} SBP2ClientOrbData;
-	
-	static const UInt32 kDefaultBusyTimeoutValue	= 0x0000000F;
-	static const UInt64 kMaxFireWireLUN				= 0xFFFF;
-	static const UInt32 kMaxFireWirePayload			= 4096;
-	static const UInt32 kMaxLoginRetryCount			= 8;
-	static const UInt32 kMaxReconnectCount			= 128;
-	static const UInt32 kCSRModelInfoKey			= 0x17;
-
-	UInt32	fReconnectCount;
-	bool 	fLoggedIn;
-	
-	// binary compatibility instance variable expansion
-	struct ExpansionData
-	{ 
-		IOCommandPool *		fCommandPool;
-		IOCommandPool *		fSubmitQueue;
-		SBP2LoginState		fLoginState;
-		bool				fLUNResetPathFlag;
-		int					fLUNResetCount;
-		bool				fAlwaysSetSenseData;
-		bool				fAutonomousSpinDownWorkAround;
-	};
-	
-	ExpansionData * reserved;
-	
-	bool fObjectIsOpen;
-
-	/*!
-		@function CommandORBAccessor
-		@abstract accessor function for fORB.
-		@discussion	xxx.
-	*/
-
-	IOFireWireSBP2ORB * CommandORBAccessor ( void );
-   
-	/*!
-		@function SBP2LoginAccessor
-		@abstract accessor function for fLogin.
-		@discussion	xxx.
-	*/
-
-	IOFireWireSBP2Login * SBP2LoginAccessor ( void );
-
-	virtual IOReturn
-	message ( UInt32 type, IOService * provider, void * argument = 0 );
-
-	/*!
-		@function SendSCSICommand
-		@abstract Prepare and send a SCSI command to the device.
-		@discussion	The incoming SCSITaskIdentifier gets turned into a IOFireWireSBP2ORB
-		and is submitted to the SBP2 layer. See IOSCSIProtocolServices.h for more details
-		regarding SendSCSICommand. Also see IOFireWireSBP2Lib.h for details regarding the
-		IOFireWireSBP2ORB structure and the submitORB method.
-		@result If the command was sent to the device and is pending completion, the
-		subclass should return true and return back the kSCSIServiceResponse_Request_In_Process response.
-		If the command completes immediately with an error, the subclass will return true
-		and return back the appropriate status. If the subclass is currently processing all the
-		commands it can, the subclass will return false and the command will be resent next time
-		CommandCompleted is called.
-	*/
-
-	virtual bool 
-	SendSCSICommand (	SCSITaskIdentifier 		request,
-						SCSIServiceResponse *	serviceResponse,
-						SCSITaskStatus *		taskStatus );
-
-	/*!
-		@function SetCommandBuffers
-		@abstract Method to set orb's buffers.
-		@discussion	This method was added so that subclasses can override and massage buffers as
-		needed. The default simply calls setCommandBuffers. See IOFireWireSBP2Lib.h for details
-		regarding the setCommandBuffers method.
-		@result xxx.
-	*/
-	
-	virtual IOReturn
-	SetCommandBuffers (	IOFireWireSBP2ORB * orb, SCSITaskIdentifier request );
-
-	/*!
-		@function CompleteSCSITask
-		@abstract This qualifies and sets appropriate data then calls CommandCompleted.
-		@discussion	See IOSCSIProtocolServices.h for more details
-		regarding CommandCompleted.
-	*/
-	
-	virtual void 
-	CompleteSCSITask ( IOFireWireSBP2ORB * orb );
-
-	/*!
-		@function AbortSCSICommand
-		@abstract This method is intended to abort an in progress SCSI Task.
-		@discussion	Currently not implemented in super class. This is a stub method for adding
-		the abort command in the near future.
-		@result See SCSITask.h for SCSIServiceResponse codes.
-	*/
-	
-	virtual SCSIServiceResponse 
-	AbortSCSICommand ( SCSITaskIdentifier request );
-
-	/*!
-		@function StatusNotify
-		@abstract This is our handler for status.
-		@discussion See IOFireWireSBP2Lib.h for details regarding the FWSBP2NotifyParams
-		structure that is passed in to the completion..
-	*/
-	
-	virtual void
-	StatusNotify ( FWSBP2NotifyParams * params );
-
-	/*!
-		@function SetValidAutoSenseData
-		@abstract Set the auto sense data that was returned for a given SCSI Task.
-		@discussion	SetValidAutoSenseData is called to qualify sense data that is copied to the
-		client via the SetAutoSenseData method. See IOSCSIProtocolServices.h for more details
-		regarding SetAutoSenseData.
-	*/
-	
-	void
-	SetValidAutoSenseData (	SBP2ClientOrbData *	clientData,
-							FWSBP2StatusBlock *	statusBlock,
-							SCSI_Sense_Data *	targetData );
-	
-	/*!
-		@function UnsolicitedStatusNotify
-		@abstract This is our handler for unsolicited status.
-		@discussion	After we have parsed and handled the unsolicited status we call 
-		enableUnsolicitedStatus. See IOFireWireSBP2Lib.h for details regarding the
-		enableUnsolicitedStatus method.
-	*/
-	
-	virtual void
-	UnsolicitedStatusNotify ( FWSBP2NotifyParamsPtr params );
-
-	/*!
-		@function LoginCompletion
-		@abstract Completion routine for login complete.
-		@discussion	See IOFireWireSBP2Lib.h for details regarding the FWSBP2LogoutCompleteParams
-		structure that is passed in to the completion.
-	*/
-	
-	virtual void 
-	LoginCompletion ( FWSBP2LoginCompleteParams * params );
-
-	/*!
-		@function LogoutCompletion
-		@abstract Completion routine for logout complete.
-		@discussion	See IOFireWireSBP2Lib.h for details regarding the FWSBP2LogoutCompleteParams
-		structure that is passed in to the completion.
-	*/
-	
-	virtual void 
-	LogoutCompletion ( FWSBP2LogoutCompleteParams * params );
-
-	/*!
-		@function IsProtocolServiceSupported
-		@abstract Determine is specified feature is supported by the protocol layer.
-		@discussion	If the service has a value that must be returned, it will be returned in the
-		serviceValue output parameter. See IOSCSIProtocolServices.h for more details regarding
-		IsProtocolServiceSupported.
-		@result Will return true if the specified feature is supported by the protocol layer.
-	*/
-
-	virtual bool
-	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
-
-	/*!
-		@function HandleProtocolServiceFeature
-		@abstract Handle specified feature supported by the protocol layer.
-		@discussion	See IOSCSIProtocolServices.h for more details regarding HandleProtocolServiceFeature.
-		@result Will return true if the specified feature is supported by the protocol layer.
-	*/
-
-	virtual bool
-	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
-   
-	/*!
-		@function LunResetComplete
-		@abstract Callback to submit Fetch Agent Reset.
-		@discussion	See IOFireWireSBP2Lib.h for details regarding the submitFetchAgentReset
-		method.
-	*/
-	
-	virtual void
-	LunResetComplete ( IOReturn status, IOFireWireSBP2ManagementORB * orb );
-
-public:
-
-	/*!
-		@function init
-		@abstract See IOService for discussion.
-		@discussion	Setup and prime class into known state.
-	*/
-	
-	bool init ( OSDictionary * propTable );
-
-	/*! 
-		@function start
-		@discussion See IOService for discussion.
-		@result Return true if the start was successful, false otherwise ( which will
-		cause the instance to be detached and usually freed ).
-	*/
-
-	virtual bool start ( IOService * provider );
-	
-	/*!
-	 	@function cleanUp
-		@abstract cleanUp is called to tear down IOFireWireSerialBusProtocolTransport.
-		@discussion	cleanUp is called when we receive a kIOFWMessageServiceIsRequestingClose
-		message or if we fail our initialization.
-	*/
-	
-	virtual void cleanUp ( void );
-	
-	/*!
-		@function finalize
-		@abstract See IOService for discussion.
-		@result Returns true.
-	*/
-	
-	virtual bool finalize ( IOOptionBits options );
-
-	/*! 
-		@function free
-		@discussion See IOService for discussion.
-		@result none.
-	*/
-	
-	virtual void free ( void );
-		
-protected:
-	
-	virtual IOReturn login ( void );
-    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 1 );
-    
-	virtual IOReturn submitLogin ( void );
-    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 2 );
-    
-	virtual void loginLost ( void );
-    OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 3 );
-    
-    void loginSuspended ( void );
-	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 4 );
-   
-	virtual void loginResumed ( void );
-	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 5 );
-
-	static IOReturn CriticalOrbSubmissionStatic ( 
-			OSObject * refCon, 
-			void * val1,
-			void * val2,
-			void * val3,
-			void * val4 );
-
-	/*!
-		@function CriticalOrbSubmission
-		@abstract xxx.
-		@discussion	xxx.
-		@result none.
-	*/
-	
-	void
-		CriticalOrbSubmission (
-			IOFireWireSBP2ORB * orb,
-			SCSITaskIdentifier request );
-	
-	virtual void submitOrbFromQueue ( void );
-	OSMetaClassDeclareReservedUsed ( IOFireWireSerialBusProtocolTransport, 6 );
-	
-private:
-	
-	// binary compatibility reserved method space
-    
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 7 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 8 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 9 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 10 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 11 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 12 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 13 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 14 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 15 );
-	OSMetaClassDeclareReservedUnused ( IOFireWireSerialBusProtocolTransport, 16 );
-	
-};
-
-#endif	/* _IOKIT_IO_FIREWIRE_SERIAL_BUS_PROTOCOL_TRANSPORT_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/scsi/.svn/all-wcprops b/i386/include/IOKit/scsi/.svn/all-wcprops
deleted file mode 100644
index 5e074ca..0000000
--- a/i386/include/IOKit/scsi/.svn/all-wcprops
+++ /dev/null
@@ -1,155 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 57
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi
-END
-IOSCSIPeripheralDeviceNub.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceNub.h
-END
-IOSCSIProtocolInterface.h
-K 25
-svn:wc:ra_dav:version-url
-V 83
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIProtocolInterface.h
-END
-IOSCSIPeripheralDeviceType05.h
-K 25
-svn:wc:ra_dav:version-url
-V 88
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType05.h
-END
-SCSICommandDefinitions.h
-K 25
-svn:wc:ra_dav:version-url
-V 82
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICommandDefinitions.h
-END
-IOSCSIPeripheralDeviceType07.h
-K 25
-svn:wc:ra_dav:version-url
-V 88
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType07.h
-END
-IOSCSIPrimaryCommandsDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 87
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPrimaryCommandsDevice.h
-END
-SCSICmds_REPORT_LUNS_Definitions.h
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICmds_REPORT_LUNS_Definitions.h
-END
-SCSICommandOperationCodes.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICommandOperationCodes.h
-END
-IOSCSIReducedBlockCommandsDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h
-END
-IOSCSIMultimediaCommandsDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIMultimediaCommandsDevice.h
-END
-IOSCSIBlockCommandsDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIBlockCommandsDevice.h
-END
-SCSIPort.h
-K 25
-svn:wc:ra_dav:version-url
-V 68
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSIPort.h
-END
-SCSICmds_MODE_Definitions.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICmds_MODE_Definitions.h
-END
-IODVDServices.h
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IODVDServices.h
-END
-SCSICmds_READ_CAPACITY_Definitions.h
-K 25
-svn:wc:ra_dav:version-url
-V 94
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICmds_READ_CAPACITY_Definitions.h
-END
-IOBlockStorageServices.h
-K 25
-svn:wc:ra_dav:version-url
-V 82
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOBlockStorageServices.h
-END
-IOSCSIPeripheralDeviceType0E.h
-K 25
-svn:wc:ra_dav:version-url
-V 88
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType0E.h
-END
-SCSICmds_REQUEST_SENSE_Defs.h
-K 25
-svn:wc:ra_dav:version-url
-V 87
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h
-END
-IOSCSIProtocolServices.h
-K 25
-svn:wc:ra_dav:version-url
-V 82
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIProtocolServices.h
-END
-IOBDServices.h
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOBDServices.h
-END
-IOReducedBlockServices.h
-K 25
-svn:wc:ra_dav:version-url
-V 82
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOReducedBlockServices.h
-END
-SCSICmds_INQUIRY_Definitions.h
-K 25
-svn:wc:ra_dav:version-url
-V 88
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSICmds_INQUIRY_Definitions.h
-END
-SCSITask.h
-K 25
-svn:wc:ra_dav:version-url
-V 68
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/SCSITask.h
-END
-IOCompactDiscServices.h
-K 25
-svn:wc:ra_dav:version-url
-V 81
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOCompactDiscServices.h
-END
-IOSCSIPeripheralDeviceType00.h
-K 25
-svn:wc:ra_dav:version-url
-V 88
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType00.h
-END
diff --git a/i386/include/IOKit/scsi/.svn/entries b/i386/include/IOKit/scsi/.svn/entries
deleted file mode 100644
index ff8f8bc..0000000
--- a/i386/include/IOKit/scsi/.svn/entries
+++ /dev/null
@@ -1,881 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/scsi
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IOSCSIPeripheralDeviceNub.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-41004b82709f5c563fa2c10264853dd1
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8628
-
-IOSCSIProtocolInterface.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-3dc4c00e753dcf3fd49d0cfdac02faef
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-35912
-
-IOSCSIPeripheralDeviceType05.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-7943859208badb3751dbf4ffea748f66
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2852
-
-SCSICommandDefinitions.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-6d33c5041ea6862346397f9e30a91dbd
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12845
-
-IOSCSIPeripheralDeviceType07.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-0e53abdb3759ef029098176c7b372012
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2792
-
-IOSCSIPrimaryCommandsDevice.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-fbc3c7570862069f2faeb236d5b2ff80
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-28729
-
-SCSICmds_REPORT_LUNS_Definitions.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-cbb458517cee16286d9b71b82ff8ca70
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4122
-
-SCSICommandOperationCodes.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-f9c55b591e06c0fc73a8f0c46850d142
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-51055
-
-IOSCSIReducedBlockCommandsDevice.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-7e8c5ee237fa3d53e59c8742aa21ec29
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-15569
-
-spi
-dir
-
-IOSCSIMultimediaCommandsDevice.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-c4523e2a816d92b1a21bab51e554f3c3
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-37497
-
-IOSCSIBlockCommandsDevice.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-9524329c076b5320b814e3c7e4c8af9a
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-38443
-
-SCSIPort.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-3023213196d2d300e6427aed35b87293
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2037
-
-SCSICmds_MODE_Definitions.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-6bba8330f0f798e8a696d1b9aa84dcfc
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-14817
-
-IODVDServices.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-81e92ebecd5deed264767c5a704c1f31
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8553
-
-IOBlockStorageServices.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-f8ceba9851285be5ab564838e387d3b2
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5384
-
-SCSICmds_READ_CAPACITY_Definitions.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-b023866fc55360a68903eeb70772e116
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3642
-
-IOSCSIPeripheralDeviceType0E.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-b6fa75f60eb13eeb00333a44a40eddff
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2909
-
-SCSICmds_REQUEST_SENSE_Defs.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-2195af654461960fd9c521835ae05059
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7152
-
-IOSCSIProtocolServices.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-8a1ac65d04de801e378c58362ff162bc
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-15109
-
-IOBDServices.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-75fa500daf479f56138fa835c1f7647e
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8045
-
-IOReducedBlockServices.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-3dc85f77ebd728e36274c154c0640593
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5077
-
-SCSICmds_INQUIRY_Definitions.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-ca84e5d42cea279808d672eb093d3594
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-29732
-
-SCSITask.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-b9a85db4a5adf25cab94ad27fdb533b5
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-14455
-
-IOCompactDiscServices.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-c61102d918a2bc4d6211ecc704a97c55
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7947
-
-IOSCSIPeripheralDeviceType00.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-81de59f70dd7471492d42f58c176a6f0
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3475
-
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOBDServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOBDServices.h.svn-base
deleted file mode 100644
index 70482d7..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOBDServices.h.svn-base
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_BD_SERVICES_H_
-#define _IOKIT_IO_BD_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// IOKit includes
-#include <IOKit/IOTypes.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOBDTypes.h>
-#include <IOKit/storage/IOBDBlockStorageDevice.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
-
-class IOMemoryDescriptor;
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOBDServices : public IOBDBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IOBDServices )
-		
-protected:
-	
-	OSSet *								fClients;
-	IOSCSIPeripheralDeviceType05 *		fProvider;
-	
-	virtual void	free ( void );			
-	
-    // Reserve space for future expansion.
-    struct IOBDServicesExpansionData { };
-    IOBDServicesExpansionData *		fIOBDServicesReserved;
-	
-public:
-	
-	static void			AsyncReadWriteComplete ( void * 		clientData,
-		                          				 IOReturn		status,
-		                      					 UInt64 		actualByteCount );
-	
-	// Deprecated
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageCompletion		completion );
-											
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageAttributes *   attributes,
-											IOStorageCompletion *	completion );
-
-    virtual IOReturn	doEjectMedia ( void );
-
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-
-    virtual IOReturn	doSynchronizeCache ( void );
-	
-	virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-        
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-    
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-        
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-
-	/* CD Specific */
-	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
-										UInt32 block,
-										UInt32 nblks,
-										CDSectorArea sectorArea,
-										CDSectorType sectorType,
-										IOStorageCompletion completion );
-	
-	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
-	
-	virtual IOReturn	readMCN ( CDMCN mcn);
-	
-	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
-	
-	virtual IOReturn	audioPause ( bool pause );
-	
-	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
-	
-	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
-	
-	virtual IOReturn	audioStop ( void );
-	
-	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
-	
-	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
-	
-	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
-
-	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
-	
-	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
-	
-	/* DVD Specific */
-	virtual UInt32			getMediaType		( void );
-    
-	virtual IOReturn		reportKey			( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt32 lba,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-												  
-	virtual IOReturn		sendKey				( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-
-	virtual IOReturn		readDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
-													const UInt8					structureFormat,
-													const UInt32				logicalBlockAddress,
-													const UInt8					layer,
-													const UInt8 				agid );
-
-	/* BD Specific */
-    virtual IOReturn		readDiscStructure	(	IOMemoryDescriptor * buffer,
-													UInt8                structureFormat,
-													UInt32               logicalBlockAddress,
-													UInt8                layer,
-													UInt8                agid,
-													UInt8                mediaType );
-
-	/* 10.6.0 */
-    virtual IOReturn		requestIdle ( void );
-	
-	/* System Specific */
-	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
-    virtual IOReturn	setProperties ( OSObject * properties );
-
-	/* User Client Specific */
-	virtual bool start ( IOService * provider );
-	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
-	
-	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
-	virtual void handleClose ( IOService * client, IOOptionBits options );
-	virtual bool handleIsOpen ( const IOService * client ) const;
-
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
-									CDTOCFormat				format,
-									UInt8					msf,
-									UInt8					trackSessionNumber,
-									UInt16 *				actualByteCount ); 
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
-										UInt32					address,
-										CDTrackInfoAddressType	addressType,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.5 */
-	virtual IOReturn	splitTrack ( UInt32 address );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 1 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 2 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 3 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 4 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 5 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 6 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 7 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_BD_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOBlockStorageServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOBlockStorageServices.h.svn-base
deleted file mode 100644
index d62a02b..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOBlockStorageServices.h.svn-base
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_
-#define _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// IOKit includes
-#include <IOKit/IOTypes.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOBlockStorageDevice.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOBlockStorageServices : public IOBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IOBlockStorageServices )
-	
-private:
-	
-	bool							fMediaChanged;  /* DEPRECATED */
-	bool							fMediaPresent;
-	
-protected:
-	
-    IOSCSIBlockCommandsDevice *     fProvider;
-	
-	UInt64							fMaxReadBlocks;
-	UInt64							fMaxWriteBlocks;
-	
-	virtual bool		attach ( IOService * provider );
-	virtual void		detach ( IOService * provider );
-    virtual IOReturn	newUserClient (
-    						   task_t			owningTask,
-    						   void *			securityID,
-    						   UInt32			type,
-    						   OSDictionary * 	properties,
-    						   IOUserClient **	handler );
-	
-    // Reserve space for future expansion.
-    struct IOBlockStorageServicesExpansionData { };
-    IOBlockStorageServicesExpansionData * fIOBlockStorageServicesReserved;
-	
-public:
-	
-	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
-	
-	static void 		AsyncReadWriteComplete ( void * 			clientData,
-                                				 IOReturn			status,
-                                				 UInt64 			actualByteCount );
-	
-	// Deprecated
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-											
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageCompletion 	completion );
-
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageAttributes *   attributes,
-											IOStorageCompletion *	completion );
-													
-    virtual IOReturn	doEjectMedia ( void );
-	
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-	
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-	
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-	
-    virtual IOReturn	doSynchronizeCache ( void );
-	
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-        
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-        
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-	
-	virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 1 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 2 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 3 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 4 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 5 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 6 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 7 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOCompactDiscServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOCompactDiscServices.h.svn-base
deleted file mode 100644
index a9d4a31..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOCompactDiscServices.h.svn-base
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_COMPACT_DISC_SERVICES_H_
-#define _IOKIT_IO_COMPACT_DISC_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// IOKit includes
-#include <IOKit/IOTypes.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOCDTypes.h>
-#include <IOKit/storage/IOCDBlockStorageDevice.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
-
-class IOMemoryDescriptor;
-
-// Use this switch to turn off the data cache.
-#define _USE_DATA_CACHING_		1
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOCompactDiscServices : public IOCDBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IOCompactDiscServices )
-	
-#if (_USE_DATA_CACHING_)
-	// Data Cache members
-	bool				fUseDataCache;			// Indicates if cache should be used.  This
-												// will be set to false if all the necessary support
-												// for the data cache could not be allocated or
-												// initialized.
-	UInt8 *				fDataCacheStorage;		// Storage space for the cache
-	UInt32				fDataCacheStartBlock;	// Starting block of the data in the cache.
-	UInt32				fDataCacheBlockCount;	// Number of contiguous blocks in the cache  
-												// starting with fDataCacheStartBlock. A value of
-												// zero in this member indicates that all data
-												// in the cache is invalid.
-	
-	IOSimpleLock *		fDataCacheLock; 		// This is the lock for preventing multiple access 
-												// while manipulating the data cache.
-#endif
-
-protected:
-	
-	OSSet *								fClients;
-	IOSCSIPeripheralDeviceType05 *		fProvider;
-	
-	virtual void	free ( void );			
-
-    // Reserve space for future expansion.
-    struct IOCompactDiscServicesExpansionData { };
-    IOCompactDiscServicesExpansionData * fIOCompactDiscServicesReserved;
-
-public:
-
-	static 	void 		AsyncReadWriteComplete ( 	void * 			clientData,
-                                					IOReturn		status,
-                                					UInt64 			actualByteCount );
-
-	// Deprecated
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageCompletion		completion );
-											
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageAttributes *   attributes,
-											IOStorageCompletion *	completion );
-
-    virtual IOReturn	doEjectMedia ( void );
-
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-
-    virtual IOReturn	doSynchronizeCache ( void );
-
-	virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-        
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-        
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-        
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-
-	/* CD Specific */
-	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
-										UInt32 block,
-										UInt32 nblks,
-										CDSectorArea sectorArea,
-										CDSectorType sectorType,
-										IOStorageCompletion completion );
-	
-	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
-	
-	virtual IOReturn	readMCN ( CDMCN mcn);
-	
-	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
-	
-	virtual IOReturn	audioPause ( bool pause );
-	
-	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
-	
-	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
-	
-	virtual IOReturn	audioStop ( void );
-	
-	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
-	
-	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
-	
-	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
-
-	virtual UInt32		getMediaType ( void );
-	
-	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
-	
-	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
-			
-	/* System Specific */
-	virtual IOReturn message ( UInt32 type, IOService * provider, void * argument );
-    virtual IOReturn setProperties ( OSObject * properties );
-	
-	/* User Client Specific */
-	virtual bool start ( IOService * provider );
-	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
-	
-	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
-	virtual void handleClose ( IOService * client, IOOptionBits options );
-	virtual bool handleIsOpen ( const IOService * client ) const;
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
-									CDTOCFormat				format,
-									UInt8					msf,
-									UInt8					trackSessionNumber,
-									UInt16 *				actualByteCount ); 
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
-										UInt32					address,
-										CDTrackInfoAddressType	addressType,
-										UInt16 *				actualByteCount );
-
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 1 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 2 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 3 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 4 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 5 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 6 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 7 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_COMPACT_DISC_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IODVDServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IODVDServices.h.svn-base
deleted file mode 100644
index 8dccb17..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IODVDServices.h.svn-base
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_DVD_SERVICES_H_
-#define _IOKIT_IO_DVD_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// IOKit includes
-#include <IOKit/IOTypes.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IODVDTypes.h>
-#include <IOKit/storage/IODVDBlockStorageDevice.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
-
-class IOMemoryDescriptor;
-
-// Use this switch to turn off the data cache.
-#define _DVD_USE_DATA_CACHING_		1
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IODVDServices : public IODVDBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IODVDServices )
-	
-#if (_DVD_USE_DATA_CACHING_)
-	// Data Cache members
-	bool				fUseDataCache;			// Indicates if cache should be used.  This
-												// will be set to false if all the necessary support
-												// for the data cache could not be allocated or
-												// initialized.
-	UInt8 *				fDataCacheStorage;		// Storage space for the cache
-	UInt32				fDataCacheStartBlock;	// Starting block of the data in the cache.
-	UInt32				fDataCacheBlockCount;	// Number of contiguous blocks in the cache  
-												// starting with fDataCacheStartBlock. A value of
-												// zero in this member indicates that all data
-												// in the cache is invalid.
-	
-	IOSimpleLock *		fDataCacheLock; 		// This is the lock for preventing multiple access 
-												// while manipulating the data cache.
-#endif
-	
-protected:
-	
-	OSSet *								fClients;
-	IOSCSIPeripheralDeviceType05 *		fProvider;
-	
-	virtual void	free ( void );			
-	
-    // Reserve space for future expansion.
-    struct IODVDServicesExpansionData { };
-    IODVDServicesExpansionData * fIODVDServicesReserved;
-	
-public:
-	
-	static void			AsyncReadWriteComplete ( void * 		clientData,
-		                          				 IOReturn		status,
-		                      					 UInt64 		actualByteCount );
-	
-	// Deprecated
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageCompletion		completion );
-											
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageAttributes *   attributes,
-											IOStorageCompletion *	completion );
-
-    virtual IOReturn	doEjectMedia ( void );
-
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-
-    virtual IOReturn	doSynchronizeCache ( void );
-	
-	virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-        
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-        
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-        
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-
-	/* CD Specific */
-	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
-										UInt32 block,
-										UInt32 nblks,
-										CDSectorArea sectorArea,
-										CDSectorType sectorType,
-										IOStorageCompletion completion );
-	
-	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
-	
-	virtual IOReturn	readMCN ( CDMCN mcn);
-	
-	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
-	
-	virtual IOReturn	audioPause ( bool pause );
-	
-	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
-	
-	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
-	
-	virtual IOReturn	audioStop ( void );
-	
-	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
-	
-	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
-	
-	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
-
-	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
-	
-	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
-	
-	/* DVD Specific */
-	virtual UInt32			getMediaType		( void );
-    
-	virtual IOReturn		reportKey			( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt32 lba,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-												  
-	virtual IOReturn		sendKey				( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-
-	virtual IOReturn		readDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
-													const UInt8					structureFormat,
-													const UInt32				logicalBlockAddress,
-													const UInt8					layer,
-													const UInt8 				agid );
-
-	/* 10.6.0 */
-    virtual IOReturn		requestIdle ( void );
-	
-	/* System Specific */
-	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
-    virtual IOReturn	setProperties ( OSObject * properties );
-
-	/* User Client Specific */
-	virtual bool start ( IOService * provider );
-	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
-	
-	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
-	virtual void handleClose ( IOService * client, IOOptionBits options );
-	virtual bool handleIsOpen ( const IOService * client ) const;
-
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
-									CDTOCFormat				format,
-									UInt8					msf,
-									UInt8					trackSessionNumber,
-									UInt16 *				actualByteCount ); 
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
-										UInt32					address,
-										CDTrackInfoAddressType	addressType,
-										UInt16 *				actualByteCount );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 1 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 2 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 3 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 4 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 5 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 6 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 7 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_DVD_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOReducedBlockServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOReducedBlockServices.h.svn-base
deleted file mode 100644
index 87ad8ed..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOReducedBlockServices.h.svn-base
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_
-#define _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// Generic IOKit related headers
-#include <IOKit/IOTypes.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOBlockStorageDevice.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPeripheralDeviceType0E.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOReducedBlockServices : public IOBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IOReducedBlockServices )
-	
-	
-protected:
-    // Reserve space for future expansion.
-    struct IOReducedBlockServicesExpansionData { };
-    IOReducedBlockServicesExpansionData * fIOReducedBlockServicesReserved;
-	
-	IOSCSIPeripheralDeviceType0E *     fProvider;
-	
-	virtual bool	attach ( IOService * provider );
-	virtual void	detach ( IOService * provider );
-	
-	
-public:
-
-	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
-	
-	static void			AsyncReadWriteComplete ( void * 			clientData,
-                                				 IOReturn			status,
-                                				 UInt64 			actualByteCount );
-                                				
-	// Deprecated
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageCompletion		completion );
-											
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageAttributes *   attributes,
-											IOStorageCompletion *	completion );
-
-    virtual IOReturn	doEjectMedia ( void );
-
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-
-    virtual IOReturn	doSynchronizeCache ( void );
-	
-	virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-        
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-        
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-        
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 1 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 2 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 3 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 4 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 5 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 6 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 7 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 8 );
-    
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIBlockCommandsDevice.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIBlockCommandsDevice.h.svn-base
deleted file mode 100644
index 2cb4a6d..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIBlockCommandsDevice.h.svn-base
+++ /dev/null
@@ -1,1146 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_
-#define _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-// SBC power states as defined in T10:996D SCSI Block Commands - 3 (SBC-3)
-// Revision 8c, November 13, 1997, pages 10-11.
-enum
-{
-	kSBCPowerStateSystemSleep 	= 0,
-	kSBCPowerStateSleep 		= 1,
-	kSBCPowerStateStandby 		= 2,
-	kSBCPowerStateIdle			= 3,
-	kSBCPowerStateActive		= 4,
-	kSBCNumPowerStates			= 5
-};
-
-enum
-{
-	kMediaStateUnlocked	= 0,
-	kMediaStateLocked 	= 1
-};
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOUserClient.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOStorage.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
-
-
-// Forward declaration for the SCSIBlockCommands that is used internally by the
-// IOSCSIBlockCommandsDevice class.
-class SCSIBlockCommands;
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIBlockCommandsDevice : public IOSCSIPrimaryCommandsDevice
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIBlockCommandsDevice )
-	
-private:
-	
-
-#ifndef __LP64__
-	
-	SCSIBlockCommands *		fSCSIBlockCommandObject;
-	SCSIBlockCommands *		GetSCSIBlockCommandObject ( void );
-	
-#endif	/* !__LP64__ */
-
-	IOReturn				GetWriteCacheState ( IOMemoryDescriptor * 	buffer,
-												 UInt8					modePageControlValue );
-	
-	static void				AsyncReadWriteComplete ( SCSITaskIdentifier	completedTask );
-	
-protected:
-	
-	// Reserve space for future expansion.
-    struct IOSCSIBlockCommandsDeviceExpansionData
-	{
-		IONotifier *		fPowerDownNotifier;
-		bool				fWriteCacheEnabled;
-		bool				fDeviceIsShared;
-		UInt64				fMediumBlockCount64;
-		bool				fDeviceHasSATTranslation;
-		bool				fProtocolSpecificPowerControl;
-		bool				fRequiresEjectWithStartStopUnit;
-	};
-    IOSCSIBlockCommandsDeviceExpansionData * fIOSCSIBlockCommandsDeviceReserved;
-	
-	#define fPowerDownNotifier	fIOSCSIBlockCommandsDeviceReserved->fPowerDownNotifier
-	#define fWriteCacheEnabled	fIOSCSIBlockCommandsDeviceReserved->fWriteCacheEnabled
-	
-	// The fDeviceIsShared is used to indicate whether this device exists on a Physical
-	// Interconnect that allows multiple initiators to access it.  This is used mainly
-	// by the power management code to not send power state related START_STOP_UNIT
-	// commands to the device.
-	// The fDeviceIsShared value is also used to prevent power state commands from being
-	// sent to manual eject device since these devices behave better when allowed to
-	// manage their own power.
-	#define fDeviceIsShared	fIOSCSIBlockCommandsDeviceReserved->fDeviceIsShared
-	
-	// The fMediumBlockCount64 provides support for 64 bit LBAs and
-	// replaces fMediumBlockCount which only supports 32 bits.
-	// This value should not be directly accessed and instead the member routine 
-	// ReportMediumTotalBlockCount() should be used to retrieve it and the member routine
-	// SetMediumCharacteristics() should be used to set it.
-	#define fMediumBlockCount64	fIOSCSIBlockCommandsDeviceReserved->fMediumBlockCount64
-	
-	#define fDeviceHasSATTranslation fIOSCSIBlockCommandsDeviceReserved->fDeviceHasSATTranslation
-	
-	// Device support protocol specific power off
-	#define fProtocolSpecificPowerControl fIOSCSIBlockCommandsDeviceReserved->fProtocolSpecificPowerControl
-	
-	// Device requires START_STOP_UNIT for ejects, regardless if PREVENT_ALLOW_MEIDUMREMOVAL
-	// failed. 
-	#define fRequiresEjectWithStartStopUnit fIOSCSIBlockCommandsDeviceReserved->fRequiresEjectWithStartStopUnit
-	
-private:
-	/* OBSOLETE. Use IOSCSIPrimaryCommandsDevice::Get/SetANSIVersion */
-	UInt8				fANSIVersion;
-
-protected:
-	// ---- Device Characteristics ----
-	bool				fMediaIsRemovable;
-	
-	// ---- Medium Characteristics ----
-	bool				fMediumPresent;
-	
-private:
-	// The byte count of each physical block on the medium.
-	// This value should not be directly accessed and instead the member routine 
-	// ReportMediumBlockSize() should be used to retrieve it and the member routine
-	// SetMediumCharacteristics() should be used to set it.
-	UInt32				fMediumBlockSize;
-	
-	// The total number of blocks of fMediumBlockSize on the medium.
-	// OBSOLETE.  Use fMediumBlockCount64 instead which allows for support of
-	// devices that have 33 through 64 bit LBA values.
-	UInt32				fMediumBlockCount;
-	
-protected:
-	// Whether the installed medium is protected from writes
-	bool				fMediumIsWriteProtected;
-	
-	// Whether user removal of medium has been prevented	
-	bool				fMediumRemovalPrevented;
-	
-	// Indicates whether this is a known manual eject device
-	bool				fKnownManualEject;
-	
-	// Polling thread variables
-	thread_call_t		fPollingThread;
-	UInt32				fPollingMode;
-	enum
-	{
-		kPollingMode_Suspended		= 0,
-		kPollingMode_NewMedia 		= 1,
-		kPollingMode_MediaRemoval	= 2
-	};
-	
-	// ---- Methods for controlling the current state of device support ----
-	virtual bool		InitializeDeviceSupport ( void );
-	virtual void		StartDeviceSupport ( void );
-	virtual void		SuspendDeviceSupport ( void );
-	virtual void		ResumeDeviceSupport ( void );
-	virtual void		StopDeviceSupport ( void );
-	virtual void		TerminateDeviceSupport ( void );
-
-	virtual void 		free ( void );
-
-#ifndef __LP64__
-	
-	// This method will retrieve the SCSI Primary Command Set object for
-	// the class.  For subclasses, this will be overridden using a
-	// dynamic cast on the subclasses base command set object.
-	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
-	
-	virtual bool		CreateCommandSetObjects ( void );
-	virtual void		FreeCommandSetObjects ( void );
-	
-#endif	/* !__LP64__ */
-
-	virtual bool		ClearNotReadyStatus ( void );
-	virtual void 		CreateStorageServiceNub ( void );
-	virtual bool		DetermineDeviceCharacteristics ( void );
-	
-	// ---- Methods used for controlling the polling thread ----
-	virtual void		ProcessPoll ( void );
-	virtual void		EnablePolling ( void );
-	virtual void		DisablePolling ( void );
-	
-	// Main and support methods for polling for new Media
-	virtual void		PollForNewMedia ( void );
-	virtual bool		DetermineMediaPresence ( void );
-	virtual bool		PreventMediumRemoval ( void );
-	virtual bool		DetermineMediumCapacity (
-							UInt64 * 				blockSize,
-							UInt64 * 				blockCount );
-	virtual bool		DetermineMediumWriteProtectState ( void );
-	
-	// Main and support methods for polling for Media removal
-	virtual void		PollForMediaRemoval ( void );
-	
-	// ---- Methods used for handling medium characteristics ----
-	
-	// OBSOLETE - Use the version compatible with 64 bit LBAs instead.
-	virtual void		SetMediumCharacteristics (
-							UInt32 					blockSize,
-							UInt32 					blockCount );
-
-	void				SetMediumCharacteristics (
-							UInt64 					blockSize,
-							UInt64 					blockCount );
-	
-	virtual void		ResetMediumCharacteristics ( void );
-
-	virtual IOReturn	IssueRead (
-							IOMemoryDescriptor *	buffer,
-						 	UInt64					startBlock,
-					 		UInt64					blockCount );
-	
-	virtual IOReturn	IssueRead (
-							IOMemoryDescriptor *	buffer,
-					  		UInt64					startBlock,
-					 		UInt64					blockCount,
-					   		void * 					clientData );
-	
-	virtual IOReturn	IssueWrite (
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-					   		UInt64					blockCount );
-	
-	virtual IOReturn	IssueWrite (
-							IOMemoryDescriptor *	buffer,
-						 	UInt64					startBlock,
-					  		UInt64					blockCount,
-							void * 					clientData );
-	
-	// ----- Power Management Support ------
-	
-	// We override this method to set our power states and register ourselves
-	// as a power policy maker.
-	virtual void 		InitializePowerManagement ( IOService * provider );
-	
-	// We override this method so that when we register for power management,
-	// we go to our active power state (which the drive is definitely in
-	// at startup time).
-	virtual UInt32		GetInitialPowerState ( void );
-	
-	// We override this method in order to provide the number of transitions
-	// from Fully active to Sleep state so that the idle timer can be adjusted
-	// to the appropriate time period based on the disk spindown time set in
-	// the Energy Saver prefs panel.
-	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
-	
-	// The TicklePowerManager method is called to tell the power manager that
-	// the device needs to be in a certain power state to handle requests.
-	virtual void		TicklePowerManager ( void );
-	
-	// The HandlePowerChange method is the state machine for power management.
-	// It is guaranteed to be on its own thread of execution (different from
-	// the power manager thread AND the workloop thread. This routine can
-	// send sync or async calls to the drive without worrying about threading
-	// issues.
-	virtual void		HandlePowerChange ( void );
-	
-	// The HandleCheckPowerState (void) method is on the serialized side of the
-	// command gate and can change member variables safely without
-	// multi-threading issues. It's main purpose is to call the superclass'
-	// HandleCheckPowerState ( UInt32 maxPowerState ) with the max power state
-	// the class registered with.
-	virtual void		HandleCheckPowerState ( void );
-	
-	// The VerifyMediumPresence method is called to see if the medium which we
-	// anticipated being there is still there.
-	virtual bool		VerifyMediumPresence ( void );
-	
-public:
-	
-	static 	void		sProcessPoll ( void * pdtDriver, void * refCon );
-	
-	// ---- Methods for controlling the device ----
-	virtual IOReturn	SyncReadWrite (
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-							UInt64					blockCount,
-							UInt64					blockSize );
-	
-	virtual IOReturn	AsyncReadWrite (
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-							UInt64					blockCount,
-							UInt64					blockSize,
-							void * 					clientData );
-	
-	IOReturn	GetWriteCacheState ( bool * enabled );	
-	IOReturn	SetWriteCacheState ( bool enabled );
-	void		DetermineMediumGeometry ( void );
-	
-	// ---- Methods for controlling medium state ----
-	virtual IOReturn	EjectTheMedium ( void );
-	virtual IOReturn	LockUnlockMedium ( bool doLock );
-	virtual IOReturn	SynchronizeCache ( void );
-	
-	// ---- Methods for controlling media format ----
-	virtual IOReturn	FormatMedium (
-							UInt64 					blockCount,
-							UInt64 					blockSize );
-	virtual UInt32		GetFormatCapacities (
-							UInt64 * 				capacities,
-			 				UInt32   				capacitiesMaxCount ) const;
-	
-	// ---- Query methods to report device characteristics ----
-	
-	// Report the maximum number of blocks that the device can handle per
-	// read or write.  A value of 0 (zero) indicates there is no limit aside
-	// from the size of the method's return parameter.
-	virtual UInt64		ReportDeviceMaxBlocksReadTransfer ( void );
-	virtual UInt64		ReportDeviceMaxBlocksWriteTransfer ( void );
-	
-	// Report whether the device supports removal of the media.
-	virtual bool		ReportDeviceMediaRemovability ( void );
-	
-	// ---- Query methods to report installed medium characteristics ----
-	virtual UInt64		ReportMediumBlockSize ( void );
-	virtual UInt64		ReportMediumTotalBlockCount ( void );
-	virtual bool		ReportMediumWriteProtection ( void );
-	
-	
-protected:
-	
-
-#ifndef __LP64__
-	
-	// Command methods to access all commands available to SBC based devices.
-	virtual bool ERASE_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			ERA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool ERASE_12 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			ERA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool FORMAT_UNIT (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						IOByteCount					defectListSize,
-						SCSICmdField1Bit 			FMTDATA,
-						SCSICmdField1Bit 			CMPLST,
-						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
-						SCSICmdField1Byte 			VENDOR_SPECIFIC,
-						SCSICmdField2Byte 			INTERLEAVE,
-						SCSICmdField1Byte 			CONTROL );
-	
-	//  Defined in SBC-2 Section 5.41
-	bool FORMAT_UNIT (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						IOByteCount					defectListSize,
-						SCSICmdField1Bit			FMTPINFO,
-						SCSICmdField1Bit			RTO_REQ,
-						SCSICmdField1Bit			LONGLIST,
-						SCSICmdField1Bit 			FMTDATA, 
-						SCSICmdField1Bit 			CMPLST,
-						SCSICmdField3Bit 			DEFECT_LIST_FORMAT, 
-						SCSICmdField1Byte 			VENDOR_SPECIFIC, 
-						SCSICmdField1Byte 			CONTROL );
-	  	  
-	virtual bool LOCK_UNLOCK_CACHE (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			LOCK,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.5
-	bool LOCK_UNLOCK_CACHE (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			LOCK,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool LOCK_UNLOCK_CACHE_16 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit			LOCK,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte			CONTROL );
-						
-	virtual bool MEDIUM_SCAN (
-						SCSITaskIdentifier			request,
-			 			IOMemoryDescriptor *		dataBuffer,
-		   				SCSICmdField1Bit 			WBS,
-		   				SCSICmdField1Bit 			ASA,
-		   				SCSICmdField1Bit 			PSD,
-		   				SCSICmdField1Bit 			PRA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool PREFETCH (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	// Defined in SBC-2 section 5.7
-	bool PREFETCH (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool PREFETCH_16 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit			IMMED,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-	
-	virtual bool READ_6 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField21Bit 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-#endif	/* __LP64__ */
-	
-	virtual bool READ_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	// Defined in SBC-2 section 5.10
-	bool READ_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit 			RDPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool READ_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	// Defined in SBC-2 section 5.11
-	bool READ_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			RDPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool READ_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			RDPROTECT,
-						SCSICmdField1Bit			DPO,
-						SCSICmdField1Bit			FUA,
-						SCSICmdField1Bit			FUA_NV,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-	
-	virtual bool READ_CAPACITY (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Bit 			PMI,
-						SCSICmdField1Byte 			CONTROL );
-	
-	bool READ_CAPACITY_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			ALLOCATION_LENGTH,
-						SCSICmdField1Bit 			PMI,
-						SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
-	virtual bool READ_DEFECT_DATA_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			PLIST,
-						SCSICmdField1Bit 			GLIST,
-						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool READ_DEFECT_DATA_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			PLIST,
-						SCSICmdField1Bit 			GLIST,
-						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
-						SCSICmdField4Byte 			ALLOCATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool READ_GENERATION (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			ALLOCATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool READ_LONG (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			CORRCT,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			BYTE_TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool READ_LONG_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte			BYTE_TRANSFER_LENGTH,
-						SCSICmdField1Bit			CORRCT,
-						SCSICmdField1Byte			CONTROL );
-		
-	virtual bool READ_UPDATED_BLOCK_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-					 	SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Bit 			LATEST,
-					 	SCSICmdField15Bit 			GENERATION_ADDRESS,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool REASSIGN_BLOCKS (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.20
-	bool REASSIGN_BLOCKS (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit			LONGLBA,
-						SCSICmdField1Bit			LONGLIST,
-						SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool REBUILD (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-					 	SCSICmdField1Bit 			INTDATA,
-						SCSICmdField2Bit 			PORT_CONTROL,
-					 	SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			REBUILD_LENGTH,
-						SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool REGENERATE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit			DPO,
-						SCSICmdField1Bit 			FUA,
-					 	SCSICmdField1Bit 			INTDATA,
-					 	SCSICmdField2Bit 			PORT_CONTROL,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			REBUILD_LENGTH,
-						SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool REZERO_UNIT (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SEARCH_DATA_EQUAL_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			INVERT,
-						SCSICmdField1Bit 			SPNDAT,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SEARCH_DATA_HIGH_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			INVERT,
-						SCSICmdField1Bit 			SPNDAT,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SEARCH_DATA_LOW_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			INVERT,
-						SCSICmdField1Bit 			SPNDAT,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SEEK_6 (
-						SCSITaskIdentifier			request,
-						SCSICmdField21Bit 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SEEK_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SET_LIMITS_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			RDINH,
-						SCSICmdField1Bit 			WRINH,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SET_LIMITS_12 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			RDINH,
-						SCSICmdField1Bit 			WRINH,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-#endif	/* __LP64__ */
-	
-	virtual bool START_STOP_UNIT (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED,
-						SCSICmdField4Bit 			POWER_CONDITIONS,
-						SCSICmdField1Bit 			LOEJ,
-						SCSICmdField1Bit 			START,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SYNCHRONIZE_CACHE (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-	// Defined in SBC-2 section 5.22
-	bool SYNCHRONIZE_CACHE (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED,
-						SCSICmdField1Bit 			SYNC_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool SYNCRONIZE_CACHE_16 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit			SYNC_NV,
-						SCSICmdField1Bit			IMMED,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			NUMBER_OF_BLOCKS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-						
-#ifndef __LP64__
-
-	virtual bool UPDATE_BLOCK (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool VERIFY_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BLKVFY,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			VERIFICATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-	
-	//  Defined in SBC-2 section 5.24
-	bool VERIFY_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField3Bit 			VRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			VERIFICATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool VERIFY_12 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BLKVFY,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			VERIFICATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.25
-	bool VERIFY_12 (
-						SCSITaskIdentifier			request,
-						SCSICmdField3Bit 			VRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField4Byte 			VERIFICATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool VERIFY_16 (
-						SCSITaskIdentifier			request,
-						SCSICmdField3Bit			VRPROTECT,
-						SCSICmdField1Bit			DPO,
-						SCSICmdField1Bit			BYTCHK,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			VERIFICATION_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-	
-	virtual bool WRITE_6 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField2Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-	
-#endif	/* __LP64__ */
-
-	virtual bool WRITE_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			EBP,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.29
-	bool WRITE_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool WRITE_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			EBP,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.30
-	bool WRITE_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool WRITE_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit			DPO,
-						SCSICmdField1Bit			FUA,
-						SCSICmdField1Bit			FUA_NV,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-
-#ifndef __LP64__
-				
-	virtual bool WRITE_AND_VERIFY_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			EBP,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.33
-	bool WRITE_AND_VERIFY_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool WRITE_AND_VERIFY_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			EBP,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-	
-	//  Defined in SBC-2 section 5.34
-	bool WRITE_AND_VERIFY_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool WRITE_AND_VERIFY_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte 			CONTROL );
-
-
-	virtual bool WRITE_LONG (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool WRITE_LONG_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Bit			CORRCT,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool WRITE_SAME (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			PBDATA,
-						SCSICmdField1Bit 			LBDATA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.39
-	bool WRITE_SAME (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			PBDATA,
-						SCSICmdField1Bit 			LBDATA,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool WRITE_SAME_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit			PBDATA,
-						SCSICmdField1Bit			LBDATA,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-
-	virtual bool XDREAD (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.42
-	bool XDREAD (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit			XORPINFO,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool XDWRITE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			DISABLE_WRITE,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.43
-	bool XDWRITE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			DISABLE_WRITE,
-						SCSICmdField1Bit			FUA_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool XDWRITE_EXTENDED (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			TABLE_ADDRESS,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			DISABLE_WRITE,
-						SCSICmdField2Bit 			PORT_CONTROL,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			SECONDARY_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			SECONDARY_ADDRESS,
-						SCSICmdField1Byte 			CONTROL );
-	
-	//  Defined in SBC-2 section 5.46
-	bool XDWRITEREAD_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			DISABLE_WRITE,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField1Bit 			XORPINFO,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool XPWRITE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.48
-	bool XPWRITE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField1Bit 			XORPINFO,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-#endif	/* __LP64__ */
-	
-	
-	/* Added with 10.2 */	
-	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 1 );
-	
-public:
-	
-	virtual IOReturn	PowerDownHandler (	void * 			refCon,
-											UInt32 			messageType,
-											IOService * 	provider,
-											void * 			messageArgument,
-											vm_size_t 		argSize );
-	
-
-	/* Added with 10.2 */	
-	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 2 );
-	
-protected:
-	
-	virtual	void		SetMediumIcon ( void );
-	
-	
-	/* Added with 10.3.3 */		
-	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 3 );
-	
-protected:
-
-	virtual	void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
-	
-	
-	/* Added with 10.6.0 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 4 );
-	
-public:
-	
-	virtual	IOReturn AsyncReadWrite (
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-							UInt64					blockCount,
-							UInt64					blockSize,
-							IOStorageAttributes *	attributes,
-							void * 					clientData );
-	
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 16 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIMultimediaCommandsDevice.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIMultimediaCommandsDevice.h.svn-base
deleted file mode 100644
index f812a39..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIMultimediaCommandsDevice.h.svn-base
+++ /dev/null
@@ -1,1057 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_
-#define _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-
-// Message constants
-#define kIOMessageTrayStateChange			0x69000035
-#define kIOMessageTrayStateHasChanged		kIOMessageTrayStateChange // DEPRECATED, use kIOMessageTrayStateChange instead
-
-// Message values for kIOMessageTrayStateChange
-enum
-{
-	kMessageTrayStateChangeRequestAccepted	= 0,
-	kMessageTrayStateChangeRequestRejected	= 1
-};
-
-#define kIOMessageMediaAccessChange			0x69000036
-
-// Message values for kIOMessageMediaAccessChange
-enum
-{
-	kMessageDeterminingMediaPresence	= 0,
-	kMessageFoundMedia					= 1,
-	kMessageMediaTypeDetermined			= 2
-};
-
-// IOKit property keys and constants
-#define	kIOPropertySupportedCDFeatures		kIOPropertySupportedCDFeaturesKey
-#define	kIOPropertySupportedDVDFeatures		kIOPropertySupportedDVDFeaturesKey
-#define	kIOPropertySupportedBDFeatures		kIOPropertySupportedBDFeaturesKey
-#define kIOPropertyLowPowerPolling			"Low Power Polling"
-
-typedef UInt32 CDFeatures;
-enum
-{
-	kCDFeaturesAnalogAudioBit			= 0,	// Analog Audio playback
-	kCDFeaturesReadStructuresBit		= 1,	// CD-ROM
-	kCDFeaturesWriteOnceBit				= 2,	// CD-R
-	kCDFeaturesReWriteableBit			= 3,	// CD-R/W
-	kCDFeaturesCDDAStreamAccurateBit	= 4,	// CD-DA stream accurate
-	kCDFeaturesPacketWriteBit			= 5,	// Packet Writing
-	kCDFeaturesTAOWriteBit				= 6,	// CD Track At Once
-	kCDFeaturesSAOWriteBit				= 7,	// CD Mastering - Session At Once
-	kCDFeaturesRawWriteBit				= 8,	// CD Mastering - Raw
-	kCDFeaturesTestWriteBit				= 9,	// CD Mastering/TAO - Test Write
-	kCDFeaturesBUFWriteBit				= 10	// CD Mastering/TAO - Buffer Underrun Free
-};
-
-enum
-{
-	kCDFeaturesAnalogAudioMask 			= (1 << kCDFeaturesAnalogAudioBit),
-	kCDFeaturesReadStructuresMask		= (1 << kCDFeaturesReadStructuresBit),
-	kCDFeaturesWriteOnceMask			= (1 << kCDFeaturesWriteOnceBit),
-	kCDFeaturesReWriteableMask			= (1 << kCDFeaturesReWriteableBit),
-	kCDFeaturesCDDAStreamAccurateMask	= (1 << kCDFeaturesCDDAStreamAccurateBit),
-	kCDFeaturesPacketWriteMask			= (1 << kCDFeaturesPacketWriteBit),
-	kCDFeaturesTAOWriteMask				= (1 << kCDFeaturesTAOWriteBit),
-	kCDFeaturesSAOWriteMask				= (1 << kCDFeaturesSAOWriteBit),
-	kCDFeaturesRawWriteMask				= (1 << kCDFeaturesRawWriteBit),
-	kCDFeaturesTestWriteMask			= (1 << kCDFeaturesTestWriteBit),
-	kCDFeaturesBUFWriteMask				= (1 << kCDFeaturesBUFWriteBit)
-};
-
-typedef	UInt32 DVDFeatures;
-enum
-{
-	kDVDFeaturesCSSBit 					= 0,	// DVD-CSS
-	kDVDFeaturesReadStructuresBit 		= 1,	// DVD-ROM
-	kDVDFeaturesWriteOnceBit			= 2,	// DVD-R
-	kDVDFeaturesRandomWriteableBit		= 3,	// DVD-RAM
-	kDVDFeaturesReWriteableBit			= 4,	// DVD-RW
-	kDVDFeaturesTestWriteBit			= 5,	// DVD-R Write - Test Write
-	kDVDFeaturesBUFWriteBit				= 6,	// DVD-R Write - Buffer Underrun Free
-	kDVDFeaturesPlusRBit				= 7,	// DVD+R
-	kDVDFeaturesPlusRWBit				= 8,	// DVD+RW (implies backgound format support)
-	kDVDFeaturesHDReadBit				= 9,	// HD DVD-ROM
-	kDVDFeaturesHDRBit					= 10,	// HD DVD-R
-	kDVDFeaturesHDRAMBit				= 11,	// HD DVD-RAM
-	kDVDFeaturesHDRWBit					= 12	// HD DVD-RW
-};
-
-enum
-{
-	kDVDFeaturesCSSMask 				= (1 << kDVDFeaturesCSSBit),
-	kDVDFeaturesReadStructuresMask 		= (1 << kDVDFeaturesReadStructuresBit),
-	kDVDFeaturesWriteOnceMask			= (1 << kDVDFeaturesWriteOnceBit),
-	kDVDFeaturesRandomWriteableMask		= (1 << kDVDFeaturesRandomWriteableBit),
-	kDVDFeaturesReWriteableMask			= (1 << kDVDFeaturesReWriteableBit),
-	kDVDFeaturesTestWriteMask			= (1 << kDVDFeaturesTestWriteBit),
-	kDVDFeaturesBUFWriteMask			= (1 << kDVDFeaturesBUFWriteBit),
-	kDVDFeaturesPlusRMask				= (1 << kDVDFeaturesPlusRBit),
-	kDVDFeaturesPlusRWMask				= (1 << kDVDFeaturesPlusRWBit),
-	kDVDFeaturesHDReadMask				= (1 << kDVDFeaturesHDReadBit),
-	kDVDFeaturesHDRMask					= (1 << kDVDFeaturesHDRBit),
-	kDVDFeaturesHDRAMMask				= (1 << kDVDFeaturesHDRAMBit),
-	kDVDFeaturesHDRWMask				= (1 << kDVDFeaturesHDRWBit)
-};
-
-typedef	UInt32 BDFeatures;
-enum
-{
-	kBDFeaturesReadBit					= 0,	// BD-ROM
-	kBDFeaturesWriteBit					= 1		// BD-R / BD-RE
-};
-
-enum
-{
-	kBDFeaturesReadMask					= (1 << kBDFeaturesReadBit),
-	kBDFeaturesWriteMask				= (1 << kBDFeaturesWriteBit)
-};
-
-enum
-{
-	kDiscStatusEmpty 					= 0,
-	kDiscStatusIncomplete				= 1,
-	kDiscStatusComplete					= 2,
-	kDiscStatusOther					= 3,
-	kDiscStatusMask						= 0x03,
-	kDiscStatusErasableMask				= 0x10
-};
-
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-// MMC power states as defined in T10:1228D SCSI Multimedia Commands - 2 (MMC-2)
-// Revision 11a, August 30, 1999, page 312 (Annex F).
-enum
-{
-	kMMCPowerStateSystemSleep	= 0,
-	kMMCPowerStateSleep 		= 1,
-	kMMCPowerStateStandby 		= 2,
-	kMMCPowerStateIdle			= 3,
-	kMMCPowerStateActive		= 4,
-	kMMCNumPowerStates			= 5
-};
-
-enum
-{
-	kMediaStateUnlocked	= 0,
-	kMediaStateLocked 	= 1
-};
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOMemoryDescriptor.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOStorage.h>
-#include <IOKit/storage/IOCDTypes.h>
-#include <IOKit/storage/IODVDTypes.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
-
-// Forward definitions for internal use only classes
-class SCSIMultimediaCommands;
-class SCSIBlockCommands;
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIMultimediaCommandsDevice : public IOSCSIPrimaryCommandsDevice
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIMultimediaCommandsDevice )
-	
-private:
-
-#ifndef __LP64__
-
-    SCSIMultimediaCommands *	fSCSIMultimediaCommandObject;
-    SCSIMultimediaCommands *	GetSCSIMultimediaCommandObject ( void );
-	
-    SCSIBlockCommands *			fSCSIBlockCommandObject;			/* OBSOLETE */
-    SCSIBlockCommands *			GetSCSIBlockCommandObject ( void );	/* OBSOLETE */
-
-#endif	/* !__LP64__ */
-	
-	static void		AsyncReadWriteComplete ( SCSITaskIdentifier completedTask );
-	
-protected:
-	
-    // Reserve space for future expansion.
-    struct IOSCSIMultimediaCommandsDeviceExpansionData
-	{
-		IONotifier *		fPowerDownNotifier;
-		bool				fDeviceSupportsPowerOff;
-		BDFeatures			fSupportedBDFeatures;
-		bool				fDeviceSupportsAsyncNotification;
-		bool				fDeviceSupportsFastSpindown;
-		UInt8				fCDLoadingMechanism;
-	};
-    IOSCSIMultimediaCommandsDeviceExpansionData * fIOSCSIMultimediaCommandsDeviceReserved;
-	
-	#define fPowerDownNotifier 					fIOSCSIMultimediaCommandsDeviceReserved->fPowerDownNotifier
-	#define fDeviceSupportsPowerOff 			fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsPowerOff
-	#define fSupportedBDFeatures				fIOSCSIMultimediaCommandsDeviceReserved->fSupportedBDFeatures
-	#define fDeviceSupportsAsyncNotification	fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsAsyncNotification
-	#define fDeviceSupportsFastSpindown			fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsFastSpindown
-	#define fCDLoadingMechanism					fIOSCSIMultimediaCommandsDeviceReserved->fCDLoadingMechanism
-	
-#ifndef __LP64__
-	
-	// This method will retreive the SCSI Primary Command Set object for
-	// the class.  For subclasses, this will be overridden using a
-	// dynamic cast on the subclasses base command set object.
-	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
-	
-#endif	/* !__LP64__ */
-	
-	CDFeatures						fSupportedCDFeatures;
-	DVDFeatures						fSupportedDVDFeatures;
-
-	UInt16							fCurrentDiscSpeed;	
-	bool							fMediaChanged; 
-	bool							fMediaPresent;
-	
-	// The byte count of each physical block on the media.
-	UInt32							fMediaBlockSize;
-	
-	// The total number of blocks of fMediaBlockSize on the media.
-	UInt32							fMediaBlockCount;
-	
-	// Flags used to indicate device feature
-	bool							fMediaIsRemovable;
-	bool							fMediaIsWriteProtected;
-	UInt32							fMediaType;
-	
-	thread_call_t					fPollingThread;
-	bool							fDeviceSupportsLowPowerPolling;
-	bool							fLowPowerPollingEnabled;
-	UInt32							fPollingMode;
-	
-	enum
-	{
-		kPollingMode_Suspended		= 0,
-		kPollingMode_NewMedia 		= 1,
-		kPollingMode_MediaRemoval	= 2
-	};
-	
-	virtual IOReturn	setProperties ( OSObject * properties );
-	
-	virtual void 		CreateStorageServiceNub ( void );
-	virtual bool		DetermineDeviceCharacteristics ( void );
-	virtual IOReturn	DetermineIfMediaIsRemovable ( void );
-	virtual IOReturn	DetermineDeviceFeatures ( void );
-	virtual void		DetermineMediaType ( void );
-	virtual bool		CheckForDVDMediaType ( void );
-	virtual bool		CheckForCDMediaType ( void );
-	virtual void		PollForMedia ( void );
-	virtual void		EnablePolling ( void );
-	virtual void		DisablePolling ( void );
-	virtual void		CheckWriteProtection ( void );
-	virtual bool		ClearNotReadyStatus ( void );
-		
-	virtual IOReturn	GetDeviceConfiguration ( void );
-	virtual IOReturn	GetDeviceConfigurationSize ( UInt32 * size );
-	virtual IOReturn	ParseFeatureList ( UInt32 numProfiles, UInt8 * firstFeaturePtr );
-	
-	virtual IOReturn	GetMechanicalCapabilities ( void );
-	virtual IOReturn	GetMechanicalCapabilitiesSize ( UInt32 * size );
-	virtual IOReturn	ParseMechanicalCapabilities ( UInt8 * mechanicalCapabilitiesPtr );
-
-	virtual IOReturn	CheckForLowPowerPollingSupport ( void );
-	virtual IOReturn	GetCurrentPowerStateOfDrive ( UInt32 * powerState );
-
-	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
-									UInt64					startBlock,
-									UInt64					blockCount );
-
-	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
-									void *					clientData,
-									UInt64					startBlock,
-									UInt64					blockCount );
-	
-	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
-									UInt64					startBlock,
-									UInt64					blockCount );
-	
-	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
-									void *					clientData,
-									UInt64					startBlock,
-									UInt64					blockCount );
-
-    virtual void		SetMediaCharacteristics ( UInt32 blockSize, UInt32 blockCount );
- 	virtual void		ResetMediaCharacteristics ( void );
-
-	UInt8				ConvertBCDToHex ( UInt8 binaryCodedDigit );
-
-	// ------ User Client Support ------
-	
-	virtual IOReturn 	HandleSetUserClientExclusivityState ( IOService * userClient, bool state );
-
-	// ----- Power Management Support ------
-	
-	// We override this method to set our power states and register ourselves
-	// as a power policy maker.
-	virtual void 		InitializePowerManagement ( IOService * provider );
-	
-	// We override this method so that when we register for power management,
-	// we go to our active power state (which the drive is definitely in
-	// at startup time).
-	virtual UInt32		GetInitialPowerState ( void );
-
-	// We override this method in order to provide the number of transitions
-	// from Fully active to Sleep state so that the idle timer can be adjusted
-	// to the appropriate time period based on the disk spindown time set in
-	// the Energy Saver prefs panel.
-	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
-	
-	// The TicklePowerManager method is called to tell the power manager that the
-	// device needs to be in a certain power state to handle requests.
-	virtual void		TicklePowerManager ( void );
-
-	// The HandlePowerChange method is the state machine for power management.
-	// It is guaranteed to be on its own thread of execution (different from
-	// the power manager thread AND the workloop thread. This routine can
-	// send sync or async calls to the drive without worrying about threading
-	// issues.
-	virtual void		HandlePowerChange ( void );
-
-	// The HandleCheckPowerState (void) method is on the serialized side of the command
-	// gate and can change member variables safely without multi-threading issues.
-	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
-	// with the max power state the class registered with.
-	virtual void		HandleCheckPowerState ( void );
-
-	// The CheckMediaPresence method is called to see if the media which we
-	// anticipated being there is still there.
-	virtual bool		CheckMediaPresence ( void );
-	
-	virtual bool		InitializeDeviceSupport ( void );
-	virtual void		StartDeviceSupport ( void );
-	virtual void		SuspendDeviceSupport ( void );
-	virtual void		ResumeDeviceSupport ( void );
-	virtual void		StopDeviceSupport ( void );
-	virtual void		TerminateDeviceSupport ( void );
-	
-	virtual void		free ( void );
-	
-#ifndef __LP64__
-
-	virtual bool 		CreateCommandSetObjects ( void );
-	virtual void 		FreeCommandSetObjects ( void );
-
-#endif	/* !__LP64__ */
-
-	virtual IOReturn	VerifyDeviceState ( void );
-
-
-public:
-	
-	virtual IOReturn 	setAggressiveness ( unsigned long type, unsigned long minutes );
-	
-	virtual IOReturn	SyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					startBlock,
-											UInt64					blockCount );
-	
-	virtual IOReturn	AsyncReadWrite (	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											void *					clientData );
-
-	virtual IOReturn	EjectTheMedia ( void );
-	virtual IOReturn	GetTrayState ( UInt8 * trayState );
-	virtual IOReturn	SetTrayState ( UInt8 trayState );
-	virtual IOReturn	FormatMedia ( UInt64 byteCapacity );
-	virtual UInt32		GetFormatCapacities ( 	UInt64 * capacities,
-												UInt32   capacitiesMaxCount ) const;
-	virtual IOReturn	LockUnlockMedia ( bool doLock );
-	virtual IOReturn	SynchronizeCache ( void );
-	virtual IOReturn	ReportBlockSize ( UInt64 * blockSize );
-	virtual IOReturn	ReportEjectability ( bool * isEjectable );
-	virtual IOReturn	ReportLockability ( bool * isLockable );
-	virtual IOReturn	ReportPollRequirements ( bool * pollIsRequired,
-												 bool * pollIsExpensive );
-	virtual IOReturn	ReportMaxReadTransfer (  UInt64 	blockSize,
-												 UInt64 * 	max );
-	virtual IOReturn	ReportMaxValidBlock ( UInt64 * maxBlock );
-	virtual IOReturn	ReportMaxWriteTransfer ( UInt64	blockSize,
-												UInt64 * max );
-	virtual IOReturn	ReportMediaState ( 	bool * mediaPresent,
-											bool * changed );
-	virtual IOReturn	ReportRemovability ( bool * isRemovable );
-	virtual IOReturn	ReportWriteProtection ( bool * isWriteProtected );
-	
-	static 	void		sPollForMedia ( void * pdtDriver, void * refCon );
-
-	/* CD Specific */
-	virtual IOReturn	SetMediaAccessSpeed ( UInt16 kilobytesPerSecond );
-	
-	virtual IOReturn	GetMediaAccessSpeed ( UInt16 * kilobytesPerSecond );
-
-	virtual IOReturn	AsyncReadCD ( 	IOMemoryDescriptor * buffer,
-										UInt32 block,
-										UInt32 nblks,
-										CDSectorArea sectorArea,
-										CDSectorType sectorType,
-										void *	clientData );
-	
-	virtual IOReturn	ReadISRC ( UInt8 track, CDISRC isrc );
-	
-	virtual IOReturn	ReadMCN ( CDMCN mcn);
-	
-	virtual IOReturn	ReadTOC ( IOMemoryDescriptor * buffer );
-
-#ifndef __LP64__
-	
-	virtual IOReturn	AudioPause ( bool pause );
-	
-	virtual IOReturn	AudioPlay ( CDMSF timeStart, CDMSF timeStop );
-	
-	virtual IOReturn	AudioScan ( CDMSF timeStart, bool reverse );
-	
-	virtual IOReturn	AudioStop ( void );
-	
-	virtual IOReturn	GetAudioStatus ( CDAudioStatus * status );
-	
-	virtual IOReturn	GetAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
-	
-	virtual IOReturn	SetAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
-
-#endif	/* !__LP64__ */
-	
-	/* DVD Specific */
-	virtual UInt32			GetMediaType		( void );
-    
-	virtual IOReturn		ReportKey			( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt32 lba,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-												  
-	virtual IOReturn		SendKey				( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-												  
-	virtual IOReturn		ReadDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
-													const UInt32 				length,
-													const UInt8					structureFormat,
-													const UInt32				logicalBlockAddress,
-													const UInt8					layer,
-													const UInt8 				agid );
-
-	// The block size decoding for Read CD and Read CD MSF  as defined in table 255
-    bool	GetBlockSize (
-						UInt32 *					requestedByteCount,
-						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
-						SCSICmdField1Bit 			SYNC,
-						SCSICmdField2Bit 			HEADER_CODES,
-						SCSICmdField1Bit 			USER_DATA,
-						SCSICmdField1Bit 			EDC_ECC,
-						SCSICmdField2Bit 			ERROR_FIELD,
-						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS );
-	
-	SCSICmdField4Byte ConvertMSFToLBA ( SCSICmdField3Byte MSF );
-
-#ifndef __LP64__
-
-	// Command methods to access all commands available to MMC based devices.
-	// The BLANK command as defined in section 6.1.1
-	virtual bool BLANK (
-						SCSITaskIdentifier			request,
-		    			SCSICmdField1Bit 			IMMED, 
-						SCSICmdField3Bit 			BLANKING_TYPE, 
-						SCSICmdField4Byte 			START_ADDRESS_TRACK_NUMBER, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The CLOSE TRACK/SESSION command as defined in section 6.1.2
-    virtual bool CLOSE_TRACK_SESSION (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField1Bit 			SESSION, 
-						SCSICmdField1Bit 			TRACK, 
-						SCSICmdField2Byte 			TRACK_NUMBER, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The FORMAT UNIT command as defined in section 6.1.3
-    virtual bool FORMAT_UNIT (
-						SCSITaskIdentifier			request,
-		    			IOMemoryDescriptor *		dataBuffer,
-		    			IOByteCount					parameterListSize,
-						SCSICmdField1Bit 			FMT_DATA, 
-						SCSICmdField1Bit 			CMP_LIST, 
-						SCSICmdField3Bit 			FORMAT_CODE, 
-						SCSICmdField2Byte 			INTERLEAVE_VALUE, 
-						SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	
-	// The GET CONFIGURATION command as defined in section 6.1.4
-    virtual bool GET_CONFIGURATION (
-						SCSITaskIdentifier			request,
-   						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField2Bit 			RT, 
-						SCSICmdField2Byte 			STARTING_FEATURE_NUMBER, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The GET EVENT/STATUS NOTIFICATION command as defined in section 6.1.5
-    virtual bool GET_EVENT_STATUS_NOTIFICATION (
-						SCSITaskIdentifier			request,
-	    				IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField1Byte 			NOTIFICATION_CLASS_REQUEST, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The GET PERFORMANCE command as defined in section 6.1.6
-    virtual bool GET_PERFORMANCE (
-						SCSITaskIdentifier			request,
-	   					IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Bit 			TOLERANCE, 
-						SCSICmdField1Bit 			WRITE, 
-						SCSICmdField2Bit 			EXCEPT, 
-						SCSICmdField4Byte 			STARTING_LBA, 
-						SCSICmdField2Byte 			MAXIMUM_NUMBER_OF_DESCRIPTORS, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The LOAD/UNLOAD MEDIUM command as defined in section 6.1.7
-    virtual bool LOAD_UNLOAD_MEDIUM (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField1Bit 			LO_UNLO, 
-						SCSICmdField1Bit 			START, 
-						SCSICmdField1Byte 			SLOT, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The MECHANISM STATUS command as defined in section 6.1.8
-    virtual bool MECHANISM_STATUS (
-						SCSITaskIdentifier			request,
-	   					IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
-	// The PAUSE/RESUME command as defined in section 6.1.9
-    virtual bool PAUSE_RESUME (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			RESUME, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The PLAY AUDIO (10) command as defined in section 6.1.10
-    virtual bool PLAY_AUDIO_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField2Byte 			PLAY_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The PLAY AUDIO (12) command as defined in section 6.1.11
-    virtual bool PLAY_AUDIO_12 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField4Byte 			PLAY_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The PLAY AUDIO MSF command as defined in section 6.1.12
-    virtual bool PLAY_AUDIO_MSF (
-						SCSITaskIdentifier			request,
-						SCSICmdField3Byte 			STARTING_MSF, 
-						SCSICmdField3Byte 			ENDING_MSF, 
-						SCSICmdField1Byte 			CONTROL );
-	
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The PLAY CD command as defined in section 6.1.13
-    virtual bool PLAY_CD (
-						SCSITaskIdentifier			request,
-						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
-						SCSICmdField1Bit 			CMSF,
-						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField4Byte 			PLAY_LENGTH_IN_BLOCKS, 
-						SCSICmdField1Bit 			SPEED,
-						SCSICmdField1Bit 			PORT2,
-						SCSICmdField1Bit 			PORT1,
-						SCSICmdField1Bit 			COMPOSITE,
-						SCSICmdField1Bit 			AUDIO,
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT *******************/
-
-#endif	/* !__LP64__ */
-	
-	virtual bool READ_10 (
-						SCSITaskIdentifier			request,
-		    			IOMemoryDescriptor 			*dataBuffer, 
-		    			UInt32						blockSize,
-		    			SCSICmdField1Bit 			DPO, 
-		    			SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField2Byte 			TRANSFER_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	
-#ifndef __LP64__
-	
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The READ BUFFER CAPACITY command as defined in section 6.1.14
-    virtual bool READ_BUFFER_CAPACITY (
-						SCSITaskIdentifier			request,
-    					IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT *******************/
-	
-#endif	/* !__LP64__ */
-	
-	// The READ CD command as defined in section 6.1.15
-    virtual bool READ_CD (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField3Byte 			TRANSFER_LENGTH, 
-						SCSICmdField1Bit 			SYNC,
-						SCSICmdField2Bit 			HEADER_CODES,
-						SCSICmdField1Bit 			USER_DATA,
-						SCSICmdField1Bit 			EDC_ECC,
-						SCSICmdField2Bit 			ERROR_FIELD,
-						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ CD MSF command as defined in section 6.1.16
-    virtual bool READ_CD_MSF (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
-						SCSICmdField3Byte 			STARTING_MSF, 
-						SCSICmdField3Byte 			ENDING_MSF, 
-						SCSICmdField1Bit 			SYNC,
-						SCSICmdField2Bit 			HEADER_CODES,
-						SCSICmdField1Bit 			USER_DATA,
-						SCSICmdField1Bit 			EDC_ECC,
-						SCSICmdField2Bit 			ERROR_FIELD,
-						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ CAPACITY command as defined in section 6.1.17
-    virtual bool READ_CAPACITY (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Bit 			PMI,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ DISC INFORMATION command as defined in section 6.1.18
-    virtual bool READ_DISC_INFORMATION (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ DVD STRUCTURE command as defined in section 6.1.19
-    virtual bool READ_DVD_STRUCTURE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField4Byte 			ADDRESS,
-						SCSICmdField1Byte 			LAYER_NUMBER, 
-						SCSICmdField1Byte 			FORMAT, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField2Bit 			AGID,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ FORMAT CAPACITIES command as defined in section 6.1.20
-    virtual bool READ_FORMAT_CAPACITIES (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-	
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The READ HEADER command as defined in section 6.1.21
-    virtual bool READ_HEADER (
-						SCSITaskIdentifier			request,
-    					IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			MSF,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT ***********************/
-
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The READ MASTER CUE command as defined in section 6.1.22
-    virtual bool READ_MASTER_CUE (
-						SCSITaskIdentifier			request,
-   						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Byte 			SHEET_NUMBER, 
-						SCSICmdField3Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT ***********************/
-
-#endif	/* !__LP64__ */
-	
-	// The READ SUB-CHANNEL command as defined in section 6.1.23
-    virtual bool READ_SUB_CHANNEL (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			MSF,
-						SCSICmdField1Bit 			SUBQ,
-						SCSICmdField1Byte 			SUB_CHANNEL_PARAMETER_LIST, 
-						SCSICmdField1Byte 			TRACK_NUMBER, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ TOC/PMA/ATIP command as defined in section 6.1.24/25
-    virtual bool READ_TOC_PMA_ATIP (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField1Bit 			MSF,
-						SCSICmdField4Bit 			FORMAT,
-						SCSICmdField1Byte			TRACK_SESSION_NUMBER,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ TRACK INFORMATION command as defined in section 6.1.26
-    virtual bool READ_TRACK_INFORMATION (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Bit 			ADDRESS_NUMBER_TYPE,
-						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS_TRACK_SESSION_NUMBER,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The REPAIR TRACK command as defined in section 6.1.27
-    virtual bool REPAIR_TRACK (
-						SCSITaskIdentifier			request,
-						SCSICmdField2Byte 			TRACK_NUMBER, 
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT ***********************/
-	
-	// The REPORT KEY command as defined in section 6.1.28
-    virtual bool REPORT_KEY (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField2Bit 			AGID,
-						SCSICmdField6Bit 			KEY_FORMAT,
-						SCSICmdField1Byte 			CONTROL );
-	
-	// The RESERVE TRACK command as defined in section 6.1.29
-    virtual bool RESERVE_TRACK (
-						SCSITaskIdentifier			request,
-						SCSICmdField4Byte			RESERVATION_SIZE,
-						SCSICmdField1Byte 			CONTROL );
-	
-	// The SCAN command as defined in section 6.1.30
-    virtual bool SCAN (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			DIRECT,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte			SCAN_STARTING_ADDRESS_FIELD,
-						SCSICmdField2Bit 			TYPE,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The SEND CUE SHEET command as defined in section 6.1.31
-    virtual bool SEND_CUE_SHEET (
-						SCSITaskIdentifier			request,
-	    				IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField3Byte			CUE_SHEET_SIZE,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The SEND DVD STRUCTURE command as defined in section 6.1.32
-    virtual bool SEND_DVD_STRUCTURE (
-						SCSITaskIdentifier			request,
-	   	 				IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Byte			FORMAT,
-						SCSICmdField2Byte 			STRUCTURE_DATA_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The SEND EVENT command as defined in section 6.1.33
-    virtual bool SEND_EVENT (
-						SCSITaskIdentifier			request,
-	   		 			IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	
-	// The SEND KEY command as defined in section 6.1.34
-    virtual bool SEND_KEY (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
-						SCSICmdField2Bit 			AGID,
-						SCSICmdField6Bit 			KEY_FORMAT,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The SEND OPC INFORMATION command as defined in section 6.1.35
-    virtual bool SEND_OPC_INFORMATION (
-						SCSITaskIdentifier			request,
-	    				IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DO_OPC, 
-						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-#endif	/* !__LP64__ */
-
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The SET CD SPEED command as defined in section 6.1.36
-    virtual bool SET_CD_SPEED (
-						SCSITaskIdentifier			request,
-						SCSICmdField2Byte 			LOGICAL_UNIT_READ_SPEED, 
-						SCSICmdField2Byte 			LOGICAL_UNIT_WRITE_SPEED, 
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT ***********************/
-
-	// The SET READ AHEAD command as defined in section 6.1.37
-    virtual bool SET_READ_AHEAD (
-						SCSITaskIdentifier			request,
-						SCSICmdField4Byte 			TRIGGER_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField4Byte 			READ_AHEAD_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The SET STREAMING command as defined in section 6.1.38
-    virtual bool SET_STREAMING (
-						SCSITaskIdentifier			request,
-	 		   			IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool START_STOP_UNIT ( 
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField4Bit 			POWER_CONDITIONS, 
-						SCSICmdField1Bit 			LOEJ, 
-						SCSICmdField1Bit 			START, 
-						SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-	
-	// The STOP PLAY/SCAN command as defined in section 6.1.39
-    virtual bool STOP_PLAY_SCAN (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-
-	// The SYNCHRONIZE CACHE command as defined in section 6.1.40
-    virtual bool SYNCHRONIZE_CACHE (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The WRITE (10) command as defined in section 6.1.41
-    virtual bool WRITE_10 (
-						SCSITaskIdentifier			request,
-		    			IOMemoryDescriptor *		dataBuffer, 
-		    			UInt32						blockSize,
-						SCSICmdField1Bit 			DPO, 
-						SCSICmdField1Bit 			FUA, 
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField2Byte 			TRANSFER_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The WRITE AND VERIFY (10) command as defined in section 6.1.42
-    virtual bool WRITE_AND_VERIFY_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-		    			UInt32						blockSize,
-						SCSICmdField1Bit 			DPO, 
-						SCSICmdField1Bit 			BYT_CHK, 
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField4Byte 			TRANSFER_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	
-	/* Added with 10.1.3 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 1 );
-	
-	virtual IOReturn	ReadTOC (	IOMemoryDescriptor *	buffer,
-									CDTOCFormat				format,
-									UInt8					msf,
-									UInt32					trackSessionNumber,
-									UInt16 *				actualByteCount );
-	
-	/* Added with 10.1.3 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 2 );
-    
-	virtual IOReturn	ReadDiscInfo (	IOMemoryDescriptor *	buffer,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.1.3 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 3 );
-	
-	virtual IOReturn	ReadTrackInfo (	IOMemoryDescriptor *	buffer,
-										UInt32					address,
-										CDTrackInfoAddressType	addressType,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.2 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 4 );
-	
-	virtual IOReturn	PowerDownHandler ( void * 		refCon,
-										   UInt32 		messageType,
-										   IOService * 	provider,
-										   void * 		messageArgument,
-										   vm_size_t 	argSize );
-	
-	/* Added with 10.3.3 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 5 );
-	
-	
-protected:
-	
-	
-	virtual void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
-	
-	
-public:
-	
-	
-	/* Added with 10.5 */
-    OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 6 );
-	
-	virtual	IOReturn	ReadDiscStructure (	IOMemoryDescriptor * 		buffer,
-											const UInt32 				length,
-											const UInt8					structureFormat,
-											const UInt32				logicalBlockAddress,
-											const UInt8					layer,
-											const UInt8 				agid,
-											const UInt8					mediaType );
-	
-	
-	bool		CheckForBDMediaType ( void );
-	
-	
-    bool		READ_DISC_STRUCTURE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField4Bit 			MEDIA_TYPE,
-						SCSICmdField4Byte 			ADDRESS,
-						SCSICmdField1Byte 			LAYER_NUMBER, 
-						SCSICmdField1Byte 			FORMAT, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField2Bit 			AGID,
-						SCSICmdField1Byte 			CONTROL );
-	
-	
-    OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 7 );
-	
-	virtual	IOReturn	ReserveTrack (	UInt8		reservationType,
-										UInt8		reservationFormat,
-										UInt64		ReservationParameter );
-	
-	
-	bool		RESERVE_TRACK_V2 (	SCSITaskIdentifier		request,
-									SCSICmdField1Bit		RMZ,
-									SCSICmdField1Bit		ARSV,
-									SCSICmdField7Byte		RESERVATION_PARAMETER,
-									SCSICmdField1Byte 		CONTROL					);
-	
-	
-	bool		REPORT_KEY_V2 (	SCSITaskIdentifier			request,
-								IOMemoryDescriptor *		dataBuffer,
-								SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
-								SCSICmdField1Byte			KEY_CLASS,
-								SCSICmdField2Byte 			ALLOCATION_LENGTH,
-								SCSICmdField2Bit 			AGID,
-								SCSICmdField6Bit 			KEY_FORMAT,
-								SCSICmdField1Byte 			CONTROL					);
-	
-	
-	bool		SEND_KEY_V2 (	SCSITaskIdentifier			request,
-								IOMemoryDescriptor *		dataBuffer,
-								SCSICmdField1Byte			KEY_CLASS,
-								SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-								SCSICmdField2Bit 			AGID,
-								SCSICmdField6Bit 			KEY_FORMAT,
-								SCSICmdField1Byte 			CONTROL					);
-	
-	
-protected:
-	
-	
-	void		SetPollingMode ( UInt32 newPollingMode );
-	
-	
-public:
-	
-	
-	/* 10.6.0 */
-	
-	IOReturn	RequestIdle ( void );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 	8 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 	9 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 10 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 11 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 12 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 13 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 14 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 15 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 16 );
-    
-};
-
-#endif /* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceNub.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceNub.h.svn-base
deleted file mode 100644
index f88a1e9..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceNub.h.svn-base
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_
-#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-// Probe score values
-enum
-{
-	kPeripheralDeviceTypeNoMatch 	= 0,
-	kDefaultProbeRanking 			= 5000,
-	kFirstOrderRanking 				= 10000,
-	kSecondOrderRanking 			= 15000,
-	kThirdOrderRanking 				= 20000
-};
-
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOSyncer.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIProtocolServices.h>
-
-
-// Forward definitions for internal use only classes.
-class SCSIPrimaryCommands;
-
-//-----------------------------------------------------------------------------
-//	Class Declarations
-//-----------------------------------------------------------------------------
-
-class IOSCSIPeripheralDeviceNub : public IOSCSIProtocolServices
-{
-	
-	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceNub )
-	
-private:
-	
-	static bool		sCompareIOProperty (
-										IOService *		object,
-										OSDictionary *	table,
-										char *			propertyKeyName,
-										bool *			matches );
-	
-	static void		TaskCallback ( SCSITaskIdentifier completedTask );
-	void			TaskCompletion ( SCSITaskIdentifier completedTask );
-	
-	static IOReturn	sWaitForTask ( void * object, SCSITask * request );
-	IOReturn		GatedWaitForTask ( SCSITask * request );
-	
-protected:
-
-	SCSIServiceResponse SendTask ( SCSITask * request );
-	
-	bool			InterrogateDevice ( void );										
-
-	// Reserve space for future expansion.
-	struct IOSCSIPeripheralDeviceNubExpansionData { };
-	IOSCSIPeripheralDeviceNubExpansionData * fIOSCSIPeripheralDeviceNubReserved;
-	
-	IOSCSIProtocolInterface *		fProvider;
-#ifndef __LP64__
-	SCSIPrimaryCommands *			fSCSIPrimaryCommandObject;
-#endif
-	UInt8							fDefaultInquiryCount;
-	
-	virtual bool		SendSCSICommand ( 	SCSITaskIdentifier 		request, 
-											SCSIServiceResponse * 	serviceResponse,
-											SCSITaskStatus * 		taskStatus );
-	
-	virtual SCSIServiceResponse	AbortSCSICommand ( SCSITaskIdentifier request );
-	
-	// The IsProtocolServiceSupported will return true if the specified
-	// feature is supported by the protocol layer.  If the service has a value that must be
-	// returned, it will be returned in the serviceValue output parameter.
-	virtual bool	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
-	
-	virtual bool	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
-	
-	// We override this method in order to NOT do power management
-	virtual void	InitializePowerManagement ( IOService * provider );
-	
-public:
-	
-	bool				init	( OSDictionary * propTable );
-	virtual bool		start	( IOService * provider );
-	virtual void		free	( void );
-	
-	virtual IOReturn	message ( UInt32 type, IOService * nub, void * arg );
-										
-	virtual bool		matchPropertyTable ( OSDictionary * table,
-											 SInt32 * score );
-	
-	// The ExecuteCommand method will take a SCSITask object and transport
-	// it across the physical wires to the device
-	virtual	void		ExecuteCommand ( SCSITaskIdentifier	request );
-	
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a specific task be aborted.
-	virtual SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
-
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a all tasks curerntly in the task set be aborted.
-	virtual SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
-
-	virtual SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
-
-	virtual SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
-    
-	virtual SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
-
-	virtual SCSIServiceResponse		TargetReset ( void );
-
-    // ************* Obsoleted Member Routine ****************
-    // The AbortCommand method is replaced by the AbortTask Management function and
-    // should no longer be called.
-	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier abortTask );
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  1 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  2 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 16 );
-	
-};
-
-
-
-class IOSCSILogicalUnitNub : public IOSCSIPeripheralDeviceNub
-{
-	
-	OSDeclareDefaultStructors ( IOSCSILogicalUnitNub )
-	
-private:
-	
-	UInt8				fLogicalUnitNumber;
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSILogicalUnitNubExpansionData { };
-	IOSCSILogicalUnitNubExpansionData * fIOSCSILogicalUnitNubReserved;
-	
-public:
-	
-	virtual bool		start	( IOService * provider );
-	
-	virtual void		SetLogicalUnitNumber ( UInt8 newLUN );
-	
-	UInt8				GetLogicalUnitNumber ( void );
-	
-	// The ExecuteCommand method will take a SCSITask object and transport
-	// it across the physical wires to the device
-	virtual	void		ExecuteCommand ( SCSITaskIdentifier	request );
-	
-	// The AbortCommand method will abort the indicated SCSI Task object,
-	// if it is possible and the SCSI Task has not already completed.
-	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier	abortTask );
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  1 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  2 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 16 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType00.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType00.h.svn-base
deleted file mode 100644
index 34fdb18..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType00.h.svn-base
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_
-#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIPeripheralDeviceType00 : public IOSCSIBlockCommandsDevice
-{
-	
-	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType00 )
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSIPeripheralDeviceType00ExpansionData
-	{
-		OSSet *	fClients;
-	};
-	IOSCSIPeripheralDeviceType00ExpansionData * fIOSCSIPeripheralDeviceType00Reserved;
-	
-public:
-	
-	bool				init ( OSDictionary * propTable );
-	virtual bool		start ( IOService * provider );
-	virtual void		free ( void );
-
-	virtual bool		handleOpen (
-							  IOService * 	client,
-							  IOOptionBits 	options,
-							  void * 		access );
-	
-	virtual void		handleClose (
-							IOService * 	client,
-							IOOptionBits 	options );
-	
-	virtual bool		handleIsOpen ( const IOService * client ) const;
-	
-    virtual IOReturn	newUserClient (
-    						   task_t			owningTask,
-    						   void *			securityID,
-    						   UInt32			type,
-    						   OSDictionary * 	properties,
-    						   IOUserClient **	handler );
-	virtual void 		CreateStorageServiceNub ( void );
-
-	virtual char *		GetVendorString ( void );
-	virtual char *		GetProductString ( void );
-	virtual char *		GetRevisionString ( void );
-	
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 1 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 2 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType05.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType05.h.svn-base
deleted file mode 100644
index 22066f0..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType05.h.svn-base
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_
-#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIPeripheralDeviceType05 : public IOSCSIMultimediaCommandsDevice
-{
-	
-	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType05 )
-	
-protected:
-    
-    // Reserve space for future expansion.
-    struct IOSCSIPeripheralDeviceType05ExpansionData { };
-    IOSCSIPeripheralDeviceType05ExpansionData * fIOSCSIPeripheralDeviceType05Reserved;
-	
-public:
-    
-    bool			init	( OSDictionary * propTable );
-    virtual bool	start	( IOService * provider );
-    virtual void 	stop	( IOService *  provider );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 1 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 2 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 3 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 4 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 5 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 6 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 7 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 8 );
-    
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType07.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType07.h.svn-base
deleted file mode 100644
index 661136d..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType07.h.svn-base
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_
-#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIPeripheralDeviceType07 : public IOSCSIBlockCommandsDevice
-{
-	
-	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType07 )
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSIPeripheralDeviceType07ExpansionData { };
-	IOSCSIPeripheralDeviceType07ExpansionData * fIOSCSIPeripheralDeviceType07Reserved;
-	
-public:
-	
-	bool			init ( OSDictionary * propTable );
-	virtual bool	start ( IOService * provider );
-	virtual void 	stop ( IOService *  provider );
-		
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 1 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 2 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType0E.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType0E.h.svn-base
deleted file mode 100644
index cc9ec06..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPeripheralDeviceType0E.h.svn-base
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_
-#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIPeripheralDeviceType0E : public IOSCSIReducedBlockCommandsDevice
-{
-	
-	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType0E )
-	
-protected:
-    
-    // Reserve space for future expansion.
-    struct IOSCSIPeripheralDeviceType0EExpansionData { };
-    IOSCSIPeripheralDeviceType0EExpansionData * fIOSCSIPeripheralDeviceType0EReserved;
-	
-public:
-    
-    bool			init 	( OSDictionary * propTable );
-    virtual bool	start 	( IOService * provider );
-    virtual void 	stop 	( IOService *  provider );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 1 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 2 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 3 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 4 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 5 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 6 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 7 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 8 );
-    
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPrimaryCommandsDevice.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPrimaryCommandsDevice.h.svn-base
deleted file mode 100644
index ba0f1a0..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIPrimaryCommandsDevice.h.svn-base
+++ /dev/null
@@ -1,805 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_
-#define _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOReturn.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOSyncer.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/SCSICommandDefinitions.h>
-#include <IOKit/scsi/SCSICmds_INQUIRY_Definitions.h>
-#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
-#include <IOKit/scsi/IOSCSIProtocolInterface.h>
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-// Notification messages
-enum
-{
-	kSCSIServicesNotification_Suspend	= 0x69000080,
-	kSCSIServicesNotification_Resume	= 0x69000090
-};
-
-
-// Timeout values
-enum
-{
-	kOneSecondTimeoutInMS 		= 1000,
-	kTenSecondTimeoutInMS 		= 10 * kOneSecondTimeoutInMS,
-	kThirtySecondTimeoutInMS	= 30 * kOneSecondTimeoutInMS,
-    kFortyFiveSecondTimeoutInMS	= 45 * kOneSecondTimeoutInMS
-};
-
-// Mode page values for page control field
-enum
-{
-	kModePageControlCurrentValues		= 0x00,
-	kModePageControlChangeableValues	= 0x01,
-	kModePageControlDefaultValues		= 0x02,
-	kModePageControlSavedValues			= 0x03
-};
-
-// The command should be tried 5 times.  The original attempt 
-// plus 4 retries.
-#define kDefaultRetryCount		4
-
-// Forward declarations for internal use only classes
-class SCSIPrimaryCommands;
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIPrimaryCommandsDevice : public IOSCSIProtocolInterface
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIPrimaryCommandsDevice )
-	
-private:
-	
-#ifndef __LP64__
-	SCSIPrimaryCommands *			fSCSIPrimaryCommandObject;
-#endif
-
-	IOSCSIProtocolInterface *		fProtocolDriver;
-	
-	// The fProtocolAccessEnabled member variable indicates whether
-	// requests coming from the client can be sent to the device.
-	// This will be set to true after the Protocol Service driver is successfully 
-	// opened and before the call to InitializeDeviceSupport and set to false before 
-	// TerminateDeviceSupport is called.
-	bool							fProtocolAccessEnabled;
-	
-	// The fDeviceAccessEnabled member variable indicates whether
-	// requests coming from the client can be sent to the device.
-	// This will be set to true after InitializeDeviceSupport is called and
-	// set to false before StopDeviceSupport is called.
-	bool							fDeviceAccessEnabled;
-	bool							fDeviceAccessSuspended;
-	
-	static bool		ServerKeyswitchCallback ( void *		target,
-											  void *		refCon,
-											  IOService *	newService );
-	
-	static void		TaskCallback ( SCSITaskIdentifier completedTask );
-	void			TaskCompletion ( SCSITaskIdentifier completedTask );
-	
-	static IOReturn	sWaitForTask ( void * object, SCSITaskIdentifier request );
-	IOReturn		GatedWaitForTask ( SCSITaskIdentifier request );
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSIPrimaryCommandsDeviceExpansionData
-	{
-		IONotifier *				fKeySwitchNotifier;
-		UInt8						fANSIVersion;
-		UInt32						fReadTimeoutDuration;
-		UInt32						fWriteTimeoutDuration;
-		bool						fCMDQUE;
-		SCSITaggedTaskIdentifier	fTaskID;
-		IOSimpleLock *				fTaskIDLock;
-		UInt32						fRetryCount;
-	};
-	IOSCSIPrimaryCommandsDeviceExpansionData * fIOSCSIPrimaryCommandsDeviceReserved;
-	
-	#define	fReadTimeoutDuration		fIOSCSIPrimaryCommandsDeviceReserved->fReadTimeoutDuration
-	#define	fWriteTimeoutDuration		fIOSCSIPrimaryCommandsDeviceReserved->fWriteTimeoutDuration
-	#define	fRetryCount					fIOSCSIPrimaryCommandsDeviceReserved->fRetryCount
-	
-	
-	UInt8							fDefaultInquiryCount;
-	OSDictionary *					fDeviceCharacteristicsDictionary;
-	UInt32							fNumCommandsOutstanding;
-	
-	virtual void 					free ( void );
-	void							SetANSIVersion ( UInt8 );
-	void							SetCMDQUE ( bool value );
-	IOReturn						GetModeSense ( 
-										IOMemoryDescriptor *		dataBuffer,
-										SCSICmdField6Bit 			PAGE_CODE,
-										SCSICmdField2Byte 			ALLOCATION_LENGTH,
-										bool *						use10ByteModeSense );
-	bool							RetrieveINQUIRYData (
-										UInt8						EVPD,
-										UInt8						inquiryPage,
-										UInt8 *						inquiryBuffer,
-										UInt16 *					dataSize );
-	
-	// This flag is set if the device responds to a MODE_SENSE_10 command
-	// with the page code set to 0x1A (Power Conditions Mode Page)
-	bool							fDeviceSupportsPowerConditions;
-	
-	// This method will retreive the SCSI Primary Command Set object for
-	// the class.  For subclasses, this will be overridden using a
-	// dynamic cast on the base command set object of the subclass.
-
-#ifndef __LP64__
-	
-	// ------ DEPRECATED API ----------
-	// This should no longer be called by subclasses as the command builder
-	// objects will be removed in a later release.
-	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );	
-	
-	// This method is called by the start method to create all the command
-	// objects needed by the class.  For subclasses, this will be overridden
-	// to create its needed command set objects.
-	virtual bool					CreateCommandSetObjects ( void );
-	
-	// This method is called by the free method to free all the command
-	// objects needed by the class.  For subclasses, this will be overridden
-	// to free its needed command set objects.
-	virtual void					FreeCommandSetObjects ( void );
-
-#endif
-	
-	
-	// This method is called by the start method to obtain information from
-	// the device with regards to whether it supports the power conditions mode page.
-	virtual void					CheckPowerConditionsModePage ( void );
-	
-	// This will return back the Protocol driver that is used to
-	// send service requests to the device.
-	virtual IOSCSIProtocolInterface * GetProtocolDriver ( void );
-	
-	// This will get a new SCSITask for the caller
-	virtual SCSITaskIdentifier		GetSCSITask ( void );
-	
-	// This will release a SCSITask (eventually return it to a pool)
-	virtual void					ReleaseSCSITask ( SCSITaskIdentifier request );
-	
-	// This will return a unique value for the tagged task identifier
-	SCSITaggedTaskIdentifier		GetUniqueTagID ( void );
-	
-	// Call for executing the command synchronously	
-	SCSIServiceResponse 			SendCommand ( 	
-										SCSITaskIdentifier 	request,
-										UInt32 				timeoutDuration );
-														
-	// Call for executing the command asycnchronously	
-	void 							SendCommand ( 
-										SCSITaskIdentifier 	request,
-										UInt32 				timeoutDuration,
-										SCSITaskCompletion 	taskCompletion );
-	
-	
-	virtual bool 					InitializeDeviceSupport ( void ) = 0;
-	virtual void 					StartDeviceSupport ( void ) = 0;
-	virtual void 					SuspendDeviceSupport ( void ) = 0;
-	virtual void 					ResumeDeviceSupport ( void ) = 0;
-	virtual void 					StopDeviceSupport ( void ) = 0;
-	virtual void 					TerminateDeviceSupport ( void ) = 0;
-	virtual UInt32					GetNumberOfPowerStateTransitions ( void ) = 0;
-	
-	virtual IOReturn				VerifyDeviceState ( void );
-	// Called to clear any power-on/reset status in the drive
-	virtual bool					ClearPowerOnReset ( void );
-	virtual bool					ClearNotReadyStatus ( void ) = 0;
-	
-	bool							IsProtocolAccessEnabled ( void );
-	bool							IsDeviceAccessEnabled ( void );
-	bool							IsDeviceAccessSuspended ( void );
-
-	// Accessors for saving and retrieving data from an SCSITask object.
-	bool 							ResetForNewTask(	
-										SCSITaskIdentifier 		request );
-	bool							SetTaskAttribute ( 
-										SCSITaskIdentifier 		request, 
-										SCSITaskAttribute 		newAttribute );
-	SCSITaskAttribute				GetTaskAttribute ( 
-										SCSITaskIdentifier 		request );
-	bool							SetTaggedTaskIdentifier ( 
-										SCSITaskIdentifier 			request, 
-										SCSITaggedTaskIdentifier	taggedTaskIdentifier );
-	SCSITaggedTaskIdentifier		GetTaggedTaskIdentifier ( 
-										SCSITaskIdentifier 		request );
-	bool							SetTaskState ( 	
-										SCSITaskIdentifier 		request,
-										SCSITaskState 			newTaskState );
-	SCSITaskState					GetTaskState ( 
-										SCSITaskIdentifier 		request );
-	bool							SetTaskStatus ( 
-										SCSITaskIdentifier 		request, 
-										SCSITaskStatus 			newStatus );
-	SCSITaskStatus					GetTaskStatus ( 
-										SCSITaskIdentifier 		request );
-	bool 							SetCommandDescriptorBlock ( 
-										SCSITaskIdentifier 		request,
-										UInt8					cdbByte0,
-										UInt8					cdbByte1,
-										UInt8					cdbByte2,
-										UInt8					cdbByte3,
-										UInt8					cdbByte4,
-										UInt8					cdbByte5 );
-	
-	// Populate the 10 Byte Command Descriptor Block
-	bool 							SetCommandDescriptorBlock ( 
-										SCSITaskIdentifier 		request,
-										UInt8					cdbByte0,
-										UInt8					cdbByte1,
-										UInt8					cdbByte2,
-										UInt8					cdbByte3,
-										UInt8					cdbByte4,
-										UInt8					cdbByte5,
-										UInt8					cdbByte6,
-										UInt8					cdbByte7,
-										UInt8					cdbByte8,
-										UInt8					cdbByte9 );
-	
-	// Populate the 12 Byte Command Descriptor Block
-	bool 							SetCommandDescriptorBlock ( 
-										SCSITaskIdentifier 		request,
-										UInt8					cdbByte0,
-										UInt8					cdbByte1,
-										UInt8					cdbByte2,
-										UInt8					cdbByte3,
-										UInt8					cdbByte4,
-										UInt8					cdbByte5,
-										UInt8					cdbByte6,
-										UInt8					cdbByte7,
-										UInt8					cdbByte8,
-										UInt8					cdbByte9,
-										UInt8					cdbByte10,
-										UInt8					cdbByte11 );
-	
-	// Populate the 16 Byte Command Descriptor Block
-	bool 							SetCommandDescriptorBlock ( 
-										SCSITaskIdentifier 		request,
-										UInt8					cdbByte0,
-										UInt8					cdbByte1,
-										UInt8					cdbByte2,
-										UInt8					cdbByte3,
-										UInt8					cdbByte4,
-										UInt8					cdbByte5,
-										UInt8					cdbByte6,
-										UInt8					cdbByte7,
-										UInt8					cdbByte8,
-										UInt8					cdbByte9,
-										UInt8					cdbByte10,
-										UInt8					cdbByte11,
-										UInt8					cdbByte12,
-										UInt8					cdbByte13,
-										UInt8					cdbByte14,
-										UInt8					cdbByte15 );
-										
-	bool							SetDataTransferDirection ( 
-										SCSITaskIdentifier 		request, 
-										UInt8 					newDirection );
-	UInt8							GetDataTransferDirection ( 
-										SCSITaskIdentifier 		request );
-	bool							SetRequestedDataTransferCount (
-										SCSITaskIdentifier 		request, 
-										UInt64 					newRequestedCount );
-	UInt64							GetRequestedDataTransferCount (
-										SCSITaskIdentifier 		request );
-	bool							SetRealizedDataTransferCount (
-										SCSITaskIdentifier 		request,
-										UInt64 					newRealizedDataCount );
-	UInt64							GetRealizedDataTransferCount ( 
-										SCSITaskIdentifier 		request );
-	bool							SetDataBuffer ( 
-										SCSITaskIdentifier 		request, 
-										IOMemoryDescriptor * 	newBuffer );
-	IOMemoryDescriptor *			GetDataBuffer ( 
-										SCSITaskIdentifier 		request );
-	bool							SetTimeoutDuration ( 
-										SCSITaskIdentifier 		request, 
-										UInt32 					newTimeout );
-	UInt32							GetTimeoutDuration ( 
-										SCSITaskIdentifier 		request );
-	bool							SetTaskCompletionCallback ( 
-										SCSITaskIdentifier 		request,
-										SCSITaskCompletion 		newCallback );
-	void							TaskCompletedNotification ( 
-										SCSITaskIdentifier 		request );
-	
-	bool							SetServiceResponse (
-										SCSITaskIdentifier 		request,
-										SCSIServiceResponse 	serviceResponse );
-	SCSIServiceResponse 			GetServiceResponse (
-										SCSITaskIdentifier 		request );
-	bool							SetAutosenseCommand (
-										SCSITaskIdentifier 		request,
-										UInt8					cdbByte0,
-										UInt8					cdbByte1,
-										UInt8					cdbByte2,
-										UInt8					cdbByte3,
-										UInt8					cdbByte4,
-										UInt8					cdbByte5 );
-	bool							GetAutoSenseData (
-										SCSITaskIdentifier 		request,
-										SCSI_Sense_Data * 		senseData ); // DEPRECATED, use below function instead
-	bool							GetAutoSenseData (
-										SCSITaskIdentifier 		request,
-										SCSI_Sense_Data * 		senseData,
-										UInt8					senseDataSize );
-	UInt8							GetAutoSenseDataSize (
-										SCSITaskIdentifier 		request );
-	
-	bool							SetApplicationLayerReference (
-										SCSITaskIdentifier 		request,
-										void * 					newReferenceValue );
-	void *							GetApplicationLayerReference (
-										SCSITaskIdentifier 		request );
-	
-	void 							IncrementOutstandingCommandsCount ( void );
-	static void						sIncrementOutstandingCommandsCount ( 
-										IOSCSIPrimaryCommandsDevice * self );
-	virtual void					HandleIncrementOutstandingCommandsCount ( void );	
-	
-
-	// This static member routine provides a mechanism for retrieving a pointer to
-	// the object that is claimed as the owner of the specified SCSITask.
-	static OSObject *				sGetOwnerForTask ( SCSITaskIdentifier request );
-	
-public:
-	
-	bool				init ( OSDictionary * propTable );
-	virtual bool		start ( IOService * provider );
-	virtual void		stop ( IOService *  provider );
-	virtual IOReturn 	message ( UInt32 type, IOService * nub, void * arg );
-	
-	// The setAgressiveness method is called by the power manager
-	// to notify us of certain power management settings. We override
-	// this method in order to catch the kPMMinutesToSpinDown message
-	// in order to set our idle timer.
-	virtual IOReturn 	setAggressiveness ( unsigned long type, unsigned long minutes );
-	
-	// Methods for getting device information strings
-	virtual char *		GetVendorString ( void );
-	virtual char *		GetProductString ( void );
-	virtual char *		GetRevisionString ( void );
-	OSDictionary *		GetProtocolCharacteristicsDictionary ( void );
-	OSDictionary *		GetDeviceCharacteristicsDictionary ( void );	
-	UInt8				GetANSIVersion ( void );
-	bool				GetCMDQUE ( void );
-    OSString *          MapINQUIRYDataToIconFile ( void );
-	UInt32				GetRetryCount ( void );
-	
-	// -- SCSI Protocol Interface Methods	--
-	// The ExecuteCommand method will take a SCSI Task and transport
-	// it across the physical wire(s) to the device
-	virtual void		ExecuteCommand ( SCSITaskIdentifier request );
-	
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a specific task be aborted.
-	SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
-
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a all tasks curerntly in the task set be aborted.
-	SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
-    
-	SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		TargetReset ( void );
-
-	// The AbortCommand method will abort the indicated SCSI Task,
-	// if it is possible and the task has not already completed.
-	virtual SCSIServiceResponse	AbortCommand ( SCSITaskIdentifier request );
-	
-	// The IsProtocolServiceSupported will return true if the specified
-	// feature is supported by the protocol layer.  If the service has a value that must be
-	// returned, it will be returned in the serviceValue output parameter.
-	virtual bool		IsProtocolServiceSupported (
-											SCSIProtocolFeature feature,
-											void *				serviceValue );
-	
-	// The HandleProtocolServiceFeature will return true if the specified feature could
-	// be handled properly by the protocol layer.
-	virtual bool		HandleProtocolServiceFeature (
-											SCSIProtocolFeature	feature,
-											void *				serviceValue );
-	
-	// Utility methods for use by all peripheral device objects.
-
-	// isParameterValid are used to validate that the parameter passed into
-	// the command methods are of the correct value.
-	
-	// Validate Parameter used for 1 bit to 1 byte paramaters
-    bool 				IsParameterValid ( 
-							SCSICmdField1Byte 			param,
-							SCSICmdField1Byte 			mask );
-	
-	// Validate Parameter used for 9 bit to 2 byte paramaters
-	bool 				IsParameterValid ( 
-							SCSICmdField2Byte 			param,
-							SCSICmdField2Byte 			mask );
-	
-	// Validate Parameter used for 17 bit to 4 byte paramaters
-	bool 				IsParameterValid ( 
-							SCSICmdField4Byte 			param,
-							SCSICmdField4Byte 			mask );
-	
-	// Validate Parameter used for 33 bit to 8 byte paramaters
-	bool 				IsParameterValid ( 
-							SCSICmdField8Byte 			param,
-							SCSICmdField8Byte 			mask );
-	
-
-	bool 				IsMemoryDescriptorValid (
-							IOMemoryDescriptor * 		dataBuffer );
-	
-	bool 				IsMemoryDescriptorValid (
-							IOMemoryDescriptor * 		dataBuffer,
-							UInt64						requiredSize );
-
-#ifndef __LP64__
-	
-	// SCSI Primary command implementations
-	virtual bool		CHANGE_DEFINITION (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			SAVE,
-							SCSICmdField7Bit 			DEFINITION_PARAMETER,
-							SCSICmdField1Byte 			PARAMETER_DATA_LENGTH,
-			 				SCSICmdField1Byte 			CONTROL );
-	  
-	virtual bool		COMPARE (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-	 						SCSICmdField1Bit 			PAD,
-							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-			
-	virtual bool		COPY (
-							SCSITaskIdentifier			request,
-   							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PAD,
-							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-	  
-	virtual bool		COPY_AND_VERIFY (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			BYTCHK,
-							SCSICmdField1Bit 			PAD,
-							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		EXTENDED_COPY (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	virtual bool		INQUIRY (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			CMDDT,
-							SCSICmdField1Bit 			EVPD,
-							SCSICmdField1Byte 			PAGE_OR_OPERATION_CODE,
-							SCSICmdField1Byte 			ALLOCATION_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		LOG_SELECT (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PCR,
-							SCSICmdField1Bit 			SP,
-							SCSICmdField2Bit 			PC,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );  
-
-	virtual bool		LOG_SENSE (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PPC,
-							SCSICmdField1Bit 			SP,
-							SCSICmdField2Bit 			PC,
-							SCSICmdField6Bit 			PAGE_CODE,
-							SCSICmdField2Byte 			PARAMETER_POINTER,
-							SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );  
-	
-	virtual bool		MODE_SELECT_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PF,
-							SCSICmdField1Bit 			SP,
-							SCSICmdField1Byte 			PARAMETER_LIST_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );  
-
-   	virtual bool		MODE_SELECT_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PF,
-							SCSICmdField1Bit 			SP,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );  
-
-   	virtual bool		MODE_SENSE_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			DBD,
-	   						SCSICmdField2Bit 			PC,
-	   						SCSICmdField6Bit 			PAGE_CODE,
-	   						SCSICmdField1Byte 			ALLOCATION_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-   	virtual bool		MODE_SENSE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			LLBAA,
-							SCSICmdField1Bit 			DBD,
-	   						SCSICmdField2Bit 			PC,
-	   						SCSICmdField6Bit 			PAGE_CODE,
-	   						SCSICmdField2Byte 			ALLOCATION_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-  	virtual bool		PERSISTENT_RESERVE_IN (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-	   						SCSICmdField5Bit 			SERVICE_ACTION,
-	   						SCSICmdField2Byte 			ALLOCATION_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-   	virtual bool		PERSISTENT_RESERVE_OUT (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-	   						SCSICmdField5Bit 			SERVICE_ACTION,
-	   						SCSICmdField4Bit 			SCOPE,
-	   						SCSICmdField4Bit 			TYPE,
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		PREVENT_ALLOW_MEDIUM_REMOVAL (
-							SCSITaskIdentifier			request,
-		 					SCSICmdField2Bit 			PREVENT, 
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		READ_BUFFER (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField4Bit 			MODE,
-							SCSICmdField1Byte 			BUFFER_ID,
-							SCSICmdField3Byte 			BUFFER_OFFSET,
-							SCSICmdField3Byte 			ALLOCATION_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		RECEIVE (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-		 					SCSICmdField3Byte 			TRANSFER_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		RECEIVE_DIAGNOSTICS_RESULTS (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-		 					SCSICmdField1Bit 			PCV,
-		 					SCSICmdField1Byte			PAGE_CODE,
-		 					SCSICmdField2Byte 			ALLOCATION_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		RELEASE_6 (
-							SCSITaskIdentifier			request,
-							SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
-	virtual bool		RELEASE_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			EXTENT,
-							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
-							SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	virtual bool		RELEASE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			THRDPTY,
-							SCSICmdField1Bit 			LONGID,
-							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
-	virtual bool		RELEASE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			THRDPTY,
-							SCSICmdField1Bit 			LONGID,
-							SCSICmdField1Bit 			EXTENT,
-							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
-							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	virtual bool		REPORT_DEVICE_IDENTIFIER ( 
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField4Byte 			ALLOCATION_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-   	virtual bool		REPORT_LUNS ( 
-							SCSITaskIdentifier			request,
-   							IOMemoryDescriptor *		dataBuffer,
-				   			SCSICmdField4Byte 			ALLOCATION_LENGTH,
-				   			SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool		REQUEST_SENSE (
-							SCSITaskIdentifier			request,
-   							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Byte 			ALLOCATION_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );
- 	
- 	virtual bool		RESERVE_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
- 	virtual bool		RESERVE_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			EXTENT,
-							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	virtual bool		RESERVE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			THRDPTY,
-							SCSICmdField1Bit 			LONGID,
-							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
-	virtual bool		RESERVE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			THRDPTY,
-							SCSICmdField1Bit 			LONGID,
-							SCSICmdField1Bit 			EXTENT,
-							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
-							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	virtual bool		SEND (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit			AER,
-		 					SCSICmdField3Byte 			TRANSFER_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-  	virtual bool		SEND_DIAGNOSTICS (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-				  		 	SCSICmdField3Bit 			SELF_TEST_CODE,
-				  		 	SCSICmdField1Bit 			PF,
-				  		 	SCSICmdField1Bit 			SELF_TEST,
-				  		 	SCSICmdField1Bit 			DEVOFFL,
-				  		 	SCSICmdField1Bit 			UNITOFFL,
-				  	 		SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-				  	 		SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool		SET_DEVICE_IDENTIFIER (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField5Bit 			SERVICE_ACTION,
-							SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool		TEST_UNIT_READY (
-							SCSITaskIdentifier			request,
-							SCSICmdField1Byte 			CONTROL );
- 	
-	virtual bool		WRITE_BUFFER (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField4Bit 			MODE,
-							SCSICmdField1Byte 			BUFFER_ID,
-							SCSICmdField3Byte 			BUFFER_OFFSET,
-							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-	
-	// The SPC-3 INQUIRY command as defined in section 6.4.1 of SPC-3.
-	bool				INQUIRY (
-							SCSITaskIdentifier			request,
-  							IOMemoryDescriptor *		dataBuffer,
-    						SCSICmdField1Bit 			EVPD,
-    						SCSICmdField1Byte 			PAGE_CODE,
-    						SCSICmdField2Byte 			ALLOCATION_LENGTH,
-    						SCSICmdField1Byte 			CONTROL );
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  1 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  2 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 16 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolInterface.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolInterface.h.svn-base
deleted file mode 100644
index bb74ce4..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolInterface.h.svn-base
+++ /dev/null
@@ -1,854 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_
-#define _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_
-
-
-/*! @header SCSI Protocol Interface
-	@discussion
-	This file contains definitions for the IOSCSIProtocolInterface class,
-	SCSI Protocol Features used by this interface, and additional constants
-	used by this interface.
-*/
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-/*
-SCSI Device Characteristics - Defined between SCSI Application Layer and
-							  SCSI Protocol Layer only.
-*/
-
-/*!
-@constant kIOPropertySCSIDeviceCharacteristicsKey
-@discussion
-This key is used to define SCSI Device Characteristics for a particular device.
-It is the key for the dictionary containing the keys of characteristics. These keys
-are only defined between the SCSI Protocol Layer and the SCSI Applicaiton Layer. Some
-properties may be copied from this dictionary to the more generic Device Characteristics
-or Protocol Characteristics dictionaries.
-*/
-#define kIOPropertySCSIDeviceCharacteristicsKey		"SCSI Device Characteristics"
-
-/*!
-@constant kIOPropertySCSIInquiryLengthKey
-@discussion
-This key is used to define a default INQUIRY length to issue to the device. The
-value is a UInt32 corresponding to the number of bytes to request in the INQUIRY
-command.
-*/
-#define kIOPropertySCSIInquiryLengthKey				"Inquiry Length"
-
-/*!
-@constant kIOPropertySCSIManualEjectKey
-@discussion
-This key is used to indicate that the device is known to be a manual ejectable media
-device.  This property overrides all of the driver checks for determining this capability.
-This property is a string, although if it exists it should always be true.
-*/
-#define kIOPropertySCSIManualEjectKey				"Manual Eject"
-
-/*!
-@constant kIOPropertyReadTimeOutDurationKey
-@discussion
-This key is used to define the Read Time Out for a particular device.
-This property overrides all of the protocol defaults.
-This property is a value, in milliseconds.
-*/
-#define kIOPropertyReadTimeOutDurationKey			"Read Time Out Duration"
-
-/*!
-@constant kIOPropertyWriteTimeOutDurationKey
-@discussion
-This key is used to define the Write Time Out for a particular device.
-This property overrides all of the protocol defaults.
-This property is a value, in milliseconds.
-*/
-#define kIOPropertyWriteTimeOutDurationKey			"Write Time Out Duration"
-
-/*!
-@constant kIOPropertyRetryCountKey
-@discussion
-This key is used to define the number of Read/Write retries for a particular device.
-This property overrides all of the protocol defaults.
-The value is a UInt32 corresponding to the number of retries.
-*/
-#define kIOPropertyRetryCountKey					"Retry Count"
-
-/*!
- @constant kIOPropertyAutonomousSpinDownKey
- @discussion
- This key is used to indicate that the device is known to have its own internal logic
- for idle disk spin down. This key is used to mark device which respon poorly to our
- efforts to manually spin down or spin up the device when it is already in the desired 
- state. 
- */
-#define kIOPropertyAutonomousSpinDownKey			"Autonomous Spin Down"
-
-/*!
- @constant kIOPropertyEjectRequireStartStopUnitKey
- @discussion
- This key is used to indicate that while the device may have failed PREVENT_ALLOW_MEDIUM
- REMOVAL it still requires a START_STOP_UNIT to eject/unload media. 
- */
-#define kIOPropertyEjectRequireStartStopUnitKey		"Eject Requires START_STOP_UNIT"
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-/*!
-@constant kCFBundleIdentifierKey
-@discussion
-Property key for CFBundleIdentifier.
-*/
-#define kCFBundleIdentifierKey					"CFBundleIdentifier"
-
-/*!
-@constant kIOSCSIArchitectureBundleIdentifierKey
-@discussion
-IOSCSIArchitectureModelFamily's CFBundle identifier.
-*/
-#define kIOSCSIArchitectureBundleIdentifierKey	"com.apple.iokit.IOSCSIArchitectureModelFamily"
-
-
-// General kernel headers
-#include <kern/thread.h>
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IOWorkLoop.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/SCSITask.h>
-
-
-/*!
-@enum SCSI Protocol Interface Device Notification values
-@discussion
-Message values for SCSI Protocol Interface Device Notifications.
-@constant kSCSIProtocolNotification_DeviceRemoved
-Private message sent between a SCSI protocol service provider and
-SCSI application layer driver to indicate device removal.
-@constant kSCSIProtocolNotification_VerifyDeviceState
-Private message sent between a SCSI protocol service provider and
-SCSI application layer driver to indicate device state may have
-changed and the device state should be re-verified by the SCSI
-Application Layer driver. An example would be a bus reset which clears
-the tray locking state of an ATAPI device.
-@constant kSCSIServicesNotification_ExclusivityChanged
-Message sent when a change in exclusivity state occurs. Usually in
-response to acquiring/releasing exclusive access to a device via a user client.
-*/
-enum
-{
-	kSCSIProtocolNotification_DeviceRemoved			= 0x69000010,
-	kSCSIProtocolNotification_VerifyDeviceState		= 0x69000020,
-	kSCSIServicesNotification_ExclusivityChanged	= 0x69000030
-};
-
-
-/*!
-@typedef SCSIProtocolFeature
-@discussion
-Typedef for SCSIProtocolFeature, a 32-bit quantity.
-*/
-typedef UInt32 SCSIProtocolFeature;
-
-/*!
-@enum SCSI Protocol Features
-@discussion
-The list of SCSI Protocol Features currently supported.
-*/
-enum
-{
-	
-	/*!
-	@constant kSCSIProtocolFeature_ACA Not yet used.
-	*/
-	kSCSIProtocolFeature_ACA								= 1,
-	
-	/*!
-	@constant kSCSIProtocolFeature_CPUInDiskMode Used to determine
-	if the SCSI Protocol Services Driver supports a CPU which is in
-	target disk mode.
-	*/
-	kSCSIProtocolFeature_CPUInDiskMode						= 2,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolSpecificPolling Used
-	to determine if the SCSI Protocol Services Driver supports
-	protocol specific polling for media. This is used for low-power
-	polling specifically for ATAPI devices on ATA buses
-	*/
-	kSCSIProtocolFeature_ProtocolSpecificPolling			= 3,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolSpecificSleepCommand Used
-	to determine if the SCSI Protocol Services Driver supports
-	protocol specific sleep commands to a drive. This is used for
-	sleeping drives specifically ATAPI devices on ATA buses.
-	*/
-	kSCSIProtocolFeature_ProtocolSpecificSleepCommand		= 4,
-	
-	/*!
-	@constant kSCSIProtocolFeature_GetMaximumLogicalUnitNumber If
-	the SCSI Protocol Services Driver supports logical units, it will
-	report the maximum addressable ID that it supports in the UInt32 pointer
-	that is passed in as the serviceValue. If only one unit is supported,
-	the driver should return false for this query.
-	*/
-	kSCSIProtocolFeature_GetMaximumLogicalUnitNumber		= 5,
-	
-	/*!
-	@constant kSCSIProtocolFeature_MaximumReadBlockTransferCount If
-	the SCSI Protocol Services Driver has a maximum number of
-	blocks that can be transfered in a read request, it will return
-	true to this query and return the block count in the UInt32 pointer
-	that is passed in as the serviceValue.
-	*/
-	kSCSIProtocolFeature_MaximumReadBlockTransferCount		= 6,
-
-	/*!
-	@constant kSCSIProtocolFeature_MaximumWriteBlockTransferCount If
-	the SCSI Protocol Services Driver has a maximum number of
-	blocks that can be transferred in a write request, it will return
-	true to this query and return the block count in the UInt32 pointer
-	that is passed in as the serviceValue.
-	*/
-	kSCSIProtocolFeature_MaximumWriteBlockTransferCount		= 7,
-
-	/*!
-	@constant kSCSIProtocolFeature_MaximumReadTransferByteCount If
-	the SCSI Protocol Services Driver has a maximum byte count
-	that can be transferred in a read request, it will return
-	true to this query and return the byte count in the UInt64 pointer
-	that is passed in as the serviceValue.
-	*/
-	kSCSIProtocolFeature_MaximumReadTransferByteCount		= 8,
-
-	/*!
-	@constant kSCSIProtocolFeature_MaximumWriteTransferByteCount If
-	the SCSI Protocol Services Driver has a maximum byte count
-	that can be transferred in a write request, it will return
-	true to this query and return the byte count in the UInt64 pointer
-	that is passed in as the serviceValue.
-	*/
-	kSCSIProtocolFeature_MaximumWriteTransferByteCount		= 9,
-	
-	/*!
-	@constant kSCSIProtocolFeature_SubmitDefaultInquiryData If
-	the SCSI Protocol Services Driver needs any extra information to
-	make any negotiation settings from the standard INQUIRY data, this 
-	will be called to set that appropriately. The serviceValue will
-	point to a SCSICmd_INQUIRY_StandardData buffer. The size
-	of the buffer depends on the SCSI Device Characteristics
-	dictionary for the device or bus. If there is no
-	kIOPropertySCSIInquiryLengthKey value set in the dictionary
-	or if it doesn't exist, then the size of the data will be
-	the size of the full amount of Inquiry retrieved from the device.
-	*/
-	kSCSIProtocolFeature_SubmitDefaultInquiryData			= 10,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolAlwaysReportsAutosenseData If
-	the SCSI Protocol Services Driver always reports available
-	autosense data when a kSCSITaskStatus_CHECK_CONDITION is set,
-	then the protocol layer should return true. E.g. FireWire
-	transport drivers should respond true to this.
-	*/
-	kSCSIProtocolFeature_ProtocolAlwaysReportsAutosenseData	= 11,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolSpecificPowerOff If
-	the SCSI Protocol Services Driver supports removing the power
-	to the drive, then the protocol layer should return true. This is
-	used for aggressive power management, specifically for ATAPI
-	devices on ATA buses.
-	*/
-	kSCSIProtocolFeature_ProtocolSpecificPowerOff			= 12,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolSpecificPowerControl
-	Used to determine if the SCSI Protocol Services Driver supports
-	switching the power to the drive on and off. This is used for aggressive
-	power management, specifically for SATAPI devices on AHCI buses.
-	*/
-	kSCSIProtocolFeature_ProtocolSpecificPowerControl		= 13,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolSpecificAsyncNotification
-	Used to determine if the SCSI Protocol Services Driver supports
-	asynchronous notifications from the drive. This is used to prevent
-	polling for media, specifically for SATAPI devices on AHCI buses.
-	*/
-	kSCSIProtocolFeature_ProtocolSpecificAsyncNotification	= 14
-	
-};
-
-
-/*!
-@typedef SCSIProtocolPowerState
-@discussion
-Typedef for SCSIProtocolPowerState, a 32-bit quantity.
-*/
-typedef UInt32 SCSIProtocolPowerState;
-
-/*!
-@enum SCSI Protocol Power States
-@discussion
-The list of SCSI Protocol Power States.
-*/
-enum
-{
-	/*!
-	@constant kSCSIProtocolPowerStateOff
-	Off power state.
-	*/
-	kSCSIProtocolPowerStateOff			= 0,
-
-	/*!
-	@constant kSCSIProtocolPowerStateOn
-	On power state.
-	*/
-	kSCSIProtocolPowerStateOn			= 1
-};
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-/*!
-@class IOSCSIProtocolInterface
-@superclass IOService
-@discussion
-This class defines the public SCSI Protocol Layer API for any class that
-provides Protocol services or needs to provide the Protocol Service API
-for passing service requests to a Protocol Service driver.
-*/
-class IOSCSIProtocolInterface : public IOService
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIProtocolInterface )
-	
-public:
-	
-	/*!
-	@function start
-	@abstract During an IOService object's instantiation, starts the IOService object that has been selected to run on the provider.
-	@discussion See IOService.h for details.
-	@result <code>true</code> if the start was successful; <code>false</code> otherwise (which will cause the instance to be detached and usually freed).
-	*/
-	virtual bool	start ( IOService * provider );
-	
-	/*!
-	@function free
-	@abstract Called to release all resources held by the object.
-	@discussion Release all resources held by the object, then call super::free().  
-	*/	
-	virtual void	free ( void );
-
-	/*!
-	@function willTerminate
-	@abstract Passes a termination up the stack.
-	@discussion Notification that a provider has been terminated, sent before recursing up the stack, in root-to-leaf order.
-	@param provider The terminated provider of this object.
-	@param options Options originally passed to terminate().
-	@result <code>true</code>.
-	*/
-	virtual bool	willTerminate ( IOService * provider, IOOptionBits options );
-	
-	/*!
-	@function GetUserClientExclusivityState
-	@abstract Gets the current exclusivity state of the user client.
-	@discussion The GetUserClientExclusivityState() method is called by the SCSITaskUserClient
-	to determine if any user client is holding exclusive access at the current time. This is simply
-	a preflight check and a return value of <code>false</code> does not guarantee that a subsequent
-	call to SetUserClientExclusivityState() will return successfully.
-	@result <code>true</code> if a user client is in exclusive control of the device, <code>false</code> otherwise.
-	*/
-	virtual bool 		GetUserClientExclusivityState ( void );
-	
-	/*!
-	@function SetUserClientExclusivityState
-	@abstract Sets the current exclusivity state of the user client.
-	@discussion The SetUserClientExclusivityState() method is called by the SCSITaskUserClient
-	to set the exclusive access mode.
-	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
-	@param state Exclusivity state. <code>true</code> means exclusive access is desired, <code>false</code>
-	means exclusive access is being released.
-	@result A valid IOReturn code indicating success or the type of failure.
-	*/
-	virtual IOReturn	SetUserClientExclusivityState ( IOService * userClient, bool state );
-	
-	
-	/*!
-	@function initialPowerStateForDomainState
-	@abstract Determines which power state a device is in, given the current power domain state.
-	@discussion Power management calls this method once, when the driver is initializing power management.
-	Subclasses should not need to override this method.
-	@param flags Flags that describe the character of "domain power"; they represent the <code>outputPowerCharacter</code> field of a state in the power domain's power state array. 
-	@result A state number. 
-	*/
-	virtual unsigned long	initialPowerStateForDomainState ( IOPMPowerFlags flags );
-	
-	/*!
-	@function setPowerState
-	@abstract Requests a power managed driver to change the power state of its device.
-	@discussion Requests a power managed driver to change the power state of its device. Most subclasses
-	of IOSCSIProtocolInterface have class-specific mechanisms and should not override this routine.
-	See IOSCSIProtocolServices.h, IOSCSIBlockCommandsDevice.h, IOSCSIReducedBlockCommandsDevice.h, and
-	IOSCSIMultimediaCommandsDevice.h for more information about power management changes.
-	Subclasses should not need to override this method.
-	@param powerStateOrdinal The number in the power state array to which the drive is being instructed to change.
-	@param whichDevice A pointer to the power management object which registered to manage power for this device.
-	The whichDevice field is not pertinent to us since the driver is both the "policy maker" for the device,
-	and the "policy implementor" for the device.
-	@result See IOService.h for details.
-	*/
-	virtual IOReturn 	setPowerState ( unsigned long powerStateOrdinal, IOService * whichDevice );
-	
-	/*!
-	@function IsPowerManagementIntialized
-	@abstract Called to determine if power management is initialized.
-	@discussion Called to determine if power management is initialized.
-	Subclasses should not need to override this method.
-	@result <code>true</code> if power management has been initialized, <code>false</code> otherwise.
-	*/
-	virtual bool		IsPowerManagementIntialized ( void );
-	
-	/*!
-	@function CheckPowerState
-	@abstract Called by clients to ensure device is in correct power state before issuing I/O.
-	@discussion Called by clients to ensure device is in correct power state before issuing I/O.
-	If the device is not ready to handle such requests, it gives the driver a chance to block the
-	thread until the device is ready. Subclasses should not need to override this method.
-	*/
-	virtual void 		CheckPowerState ( void );
-	
-	/*!
-	@function ExecuteCommand
-	@abstract Called to send a SCSITask and transport it across the physical wire(s) to the device.
-	@discussion Called to send a SCSITask and transport it across the physical wire(s) to the device.
-	Subclasses internal to IOSCSIArchitectureModelFamily will need to override this method. Third
-	party subclasses should not need to override this method.
-	@param request A valid SCSITaskIdentifier representing the task to transport across the wire(s).
-	*/
-	virtual void		ExecuteCommand ( SCSITaskIdentifier request ) = 0;
-	
-	/*!
-	@function AbortCommand
-	@abstract Obsolete. Do not use this method.
-	@discussion Obsolete. Do not use this method.
-	*/
-	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier request ) = 0;
-	
-	/*!
-	@function IsProtocolServiceSupported
-	@abstract This method is called to query for support of a protocol specific service feature.
-	@discussion This method is called to query for support of a protocol specific service feature.
-	Subclasses of IOSCSIProtocolServices should override this method.
-	@param feature A valid SCSIProtocolFeature. See enums for SCSIProtocolFeature.
-	@param serviceValue A pointer to a structure/value that is used in conjunction with the feature
-	requested. See enums for SCSIProtocolFeature. NB: This parameter may be NULL for certain
-	feature requests.
-	@result <code>true</code> if the feature is supported, <code>false</code> otherwise.
-	*/
-	virtual bool		IsProtocolServiceSupported ( 
-								SCSIProtocolFeature 	feature, 
-								void * 					serviceValue ) = 0;
-	
-	/*!
-	@function HandleProtocolServiceFeature
-	@abstract This method is called to enact support of a protocol specific service feature.
-	@discussion This method is called to enact support of a protocol specific service feature.
-	Subclasses of IOSCSIProtocolServices should override this method.
-	@param feature A valid SCSIProtocolFeature. See enums for SCSIProtocolFeature.
-	@param serviceValue A pointer to a structure/value that is used in conjunction with the feature
-	requested. See enums for SCSIProtocolFeature. NB: This parameter may be NULL for certain
-	feature requests.
-	@result <code>true</code> if the service feature request succeeded, <code>false</code> otherwise.
-	*/
-	virtual bool		HandleProtocolServiceFeature ( 
-								SCSIProtocolFeature 	feature, 
-								void * 					serviceValue ) = 0;
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSIProtocolInterfaceExpansionData
-	{
-		IOWorkLoop *	fWorkLoop;
-	};
-	IOSCSIProtocolInterfaceExpansionData * fIOSCSIProtocolInterfaceReserved;
-	
-	// ------ Power Management Support ------
-	
-	thread_call_t		fPowerManagementThread;
-	IOCommandGate *		fCommandGate;
-	UInt32				fCurrentPowerState;
-	UInt32				fProposedPowerState;
-	bool				fPowerTransitionInProgress;
-	bool				fPowerAckInProgress;
-	bool				fPowerManagementInitialized;
-	
-	/*!
-	@function GetCommandGate
-	@abstract Accessor method to obtain the IOCommandGate.
-	@discussion Accessor method to obtain the IOCommandGate.
-	@result The IOCommandGate for this instance. May return NULL.
-	*/
-	IOCommandGate *		GetCommandGate ( void );
-	
-	/*!
-	@function InitializePowerManagement
-	@abstract This method is called to initialize power management.
-	@discussion This method is called to initialize power management. It will call PMinit(), joinPMTree(),
-	setIdleTimerPeriod(), and makeUsable(). This method does not call registerPowerDriver().
-	Subclasses may override this method to change the behavior (such as the number of power states).
-	@param provider The power management provider (i.e. the provider to attach to in the PowerManagement
-	tree). This may be a device that is not in the PM Tree itself, in which case, the IOService plane
-	is traversed towards the root node in an effort to find a node in the PM Tree.
-	*/
-	virtual void		InitializePowerManagement ( IOService * provider );
-	
-	/*!
-	@function GetInitialPowerState
-	@abstract This method is called to obtain the initial power state of the device (usually the highest).
-	@discussion This method is called to obtain the initial power state of the device (usually the highest).
-	Subclasses must override this method.
-	@result A power state ordinal.
-	*/
-	virtual UInt32		GetInitialPowerState ( void ) = 0;
-	
-	/*!
-	@function finalize
-	@abstract Finalizes the destruction of an IOService object.
-	@discussion See IOService.h
-	Subclasses may override this method, but should call super::finalize().
-    @result <code>true</code>.
-	*/
-	virtual bool		finalize ( IOOptionBits options );
-	
-	/*!
-	@function sHandleSetPowerState
-	@abstract The sHandleSetPowerState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@discussion The sHandleSetPowerState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@param self The 'this' pointer for the class.
-	@param powerStateOrdinal The power state to which device shall be changed.
-    @result A valid IOReturn code indicating success or failure.
-	*/
-	static IOReturn 	sHandleSetPowerState ( IOSCSIProtocolInterface * self, UInt32 powerStateOrdinal );
-	
-	/*!
-	@function sGetPowerTransistionInProgress
-	@abstract The sGetPowerTransistionInProgress method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@discussion The sGetPowerTransistionInProgress method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@param self The 'this' pointer for the class.
-    @result <code>true</code> if a power state is in progress, otherwise <code>false</code>.
-	*/
-	static bool sGetPowerTransistionInProgress ( IOSCSIProtocolInterface * 	self );
-	
-	/*!
-	@function HandleSetPowerState
-	@abstract The HandleSetPowerState method is called by the glue code and is on the
-	serialized side of the command gate.
-	@discussion The HandleSetPowerState method is called by the glue code and is on the
-	serialized side of the command gate. This allows us to touch any member
-	variables as necessary without any multi-threading issues.
-	Subclasses may override this method to change behavior. Third party subclasses
-	should not need to override this method, but may.
-	@param powerStateOrdinal The power state to which device shall be changed.
-	*/
-	virtual void		HandleSetPowerState ( UInt32 powerStateOrdinal );
-	
-	/*!
-	@function sPowerManagement
-	@abstract The sPowerManagement method is a static C-function which is called using
-	mach's thread_call API. It guarantees us a thread of execution which is
-	different than the power management thread and the workloop thread on which
-	we can issue commands to the device synchronously or asynchronously without
-	worrying about deadlocks. It calls through to HandlePowerChange, which is
-	a state machine used to direct power management.
-	@discussion The sPowerManagement method is a static C-function which is called using
-	mach's thread_call API. It guarantees us a thread of execution which is
-	different than the power management thread and the workloop thread on which
-	we can issue commands to the device synchronously or asynchronously without
-	worrying about deadlocks. It calls through to HandlePowerChange, which is
-	a state machine used to direct power management.
-	@param whichDevice The 'this' pointer.
-	*/
-	static void			sPowerManagement ( thread_call_param_t whichDevice );
-	
-	/*!
-	@function HandlePowerChange
-	@abstract The HandlePowerChange method is pure virtual and is left to each protocol or
-	application layer driver to implement. It is guaranteed to be called on its
-	own thread of execution and can make synchronous or asynchronous calls.
-	@discussion The HandlePowerChange method is pure virtual and is left to each protocol or
-	application layer driver to implement. It is guaranteed to be called on its
-	own thread of execution and can make synchronous or asynchronous calls.
-	Subclasses must override this method. Third party subclasses shouldn't need to override
-	this method but can to alter the default behavior.
-	*/
-	virtual void		HandlePowerChange ( void ) = 0;
-		
-	/*!
-	@function sHandleCheckPowerState
-	@abstract The sHandleCheckPowerState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@discussion The sHandleCheckPowerState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@param self The 'this' pointer for the class.
-	*/
-	static void			sHandleCheckPowerState ( IOSCSIProtocolInterface * self );
-	
-	/*!
-	@function HandleCheckPowerState(void)
-	@abstract The HandleCheckPowerState (void) method is on the serialized side of the command
-	gate and can change member variables safely without multi-threading issues.
-	It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
-	with the max power state the class registered with.
-	@discussion The HandleCheckPowerState (void) method is on the serialized side of the command
-	gate and can change member variables safely without multi-threading issues.
-	It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
-	with the max power state the class registered with.
-	Subclasses must override this method. Third party subclasses shouldn't need to override
-	this method but can to alter the default behavior.
-	*/
-	virtual void		HandleCheckPowerState ( void ) = 0;
-	
-	/*!
-	@function HandleCheckPowerState(UInt32 maxPowerState)
-	@abstract The HandleCheckPowerState(UInt32 maxPowerState) method is called by
-	the subclasses and is passed the maxPowerState number given to the power
-	manager at initialization time. This guarantees the threads block until that
-	power state has been achieved.
-	@discussion The HandleCheckPowerState(UInt32 maxPowerState) method is called by
-	the subclasses and is passed the maxPowerState number given to the power
-	manager at initialization time. This guarantees the threads block until that
-	power state has been achieved.
-	@param maxPowerState The maximum power state in the power state array.
-	*/
-	void 				HandleCheckPowerState ( UInt32 maxPowerState );
-	
-	/*!
-	@function TicklePowerManager(void)
-	@abstract The TicklePowerManager(void) method is called by CheckPowerState and
-	sends an activity tickle to the power manager so that the idle timer is
-	reset.
-	@discussion The TicklePowerManager(void) method is called by CheckPowerState and
-	sends an activity tickle to the power manager so that the idle timer is
-	reset.
-	Subclasses must override this method. Third party subclasses shouldn't need to override
-	this method but can to alter the default behavior.
-	*/
-	virtual void		TicklePowerManager ( void ) = 0;
-	
-	/*!
-	@function TicklePowerManager(UInt32 maxPowerState)
-	@abstract The TicklePowerManager(UInt32 maxPowerState) method is a convenience
-	function which can be called by subclasses in TicklePowerManager (void)
-	in order to tell the power manager to reset idle timer or bring the device
-	into the requested state. It returns whatever is returned by activityTickle
-	(true if device is in the requested state, false if it is not).
-	@discussion The TicklePowerManager(UInt32 maxPowerState) method is a convenience
-	function which can be called by subclasses in TicklePowerManager(void)
-	in order to tell the power manager to reset idle timer or bring the device
-	into the requested state. It returns whatever is returned by activityTickle
-	(true if device is in the requested state, false if it is not).
-	@param maxPowerState The maximum power state in the power state array.
-	@result The result of the call to activityTickle(). See IOService.h for details.
-	*/
-	bool				TicklePowerManager ( UInt32 maxPowerState );
-	
-	// ------ User Client Support ------
-	
-	bool				fUserClientExclusiveControlled;
-	IOService *			fUserClient;
-	
-	/*!
-	@function sGetUserClientExclusivityState
-	@abstract The sGetUserClientExclusivityState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@discussion The sGetUserClientExclusivityState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@param self The 'this' pointer for the class.
-	@param state A pointer to a bool in which the state should be set.
-	*/
-	static void 	sGetUserClientExclusivityState ( IOSCSIProtocolInterface * self, bool * state );
-	
-	/*!
-	@function sSetUserClientExclusivityState
-	@abstract The sSetUserClientExclusivityState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@discussion The sSetUserClientExclusivityState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@param self The 'this' pointer for the class.
-	@param result A pointer to an IOReturn for the resulting status.
-	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
-	@param state A bool indicating the desired state to set.
-	*/
-	static void		sSetUserClientExclusivityState ( IOSCSIProtocolInterface * self, IOReturn * result, IOService * userClient, bool state );
-
-	/*!
-	@function HandleGetUserClientExclusivityState
-	@abstract Gets the current exclusivity state of the user client.
-	@discussion The HandleGetUserClientExclusivityState() method is called on the serialized side
-	of the command gate to determine if any user client is holding exclusive access at the current
-	time. See discussion for GetUserClientExclusivityState().
-	Subclasses may override this method to alter default behavior. Third party subclasses should
-	not need to override this method.
-	@result <code>true</code> if a user client is in exclusive control of the device, <code>false</code> otherwise.
-	*/
-	virtual bool	HandleGetUserClientExclusivityState ( void );
-
-	/*!
-	@function HandleSetUserClientExclusivityState
-	@abstract Sets the current exclusivity state of the user client.
-	@discussion The HandleSetUserClientExclusivityState() method is called on the serialized side
-	of the command gate to set the exclusive access mode.
-	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
-	@param state Exclusivity state. <code>true</code> means exclusive access is desired, <code>false</code>
-	means exclusive access is being released.
-	@result A valid IOReturn code indicating success or the type of failure.
-	*/
-	virtual IOReturn	HandleSetUserClientExclusivityState ( IOService * userClient, bool state );
-	
-public:
-	
-	// ------- SCSI Architecture Model Task Management Functions ------
-
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 1 );
-	/*!
-	@function AbortTask
-	@abstract Aborts a task based on the Logical Unit and tagged task identifier.
-	@discussion Aborts a task based on the Logical Unit and tagged task identifier.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@param theLogicalUnit This value should be zero unless the device driver is
-	more complex and managing multiple Logical Units.
-	@param theTag A valid SCSITaggedTaskIdentifier representing an outstanding SCSITask.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag ) = 0;
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 2 );
-	/*!
-	@function AbortTaskSet
-	@abstract Aborts a task set based on the Logical Unit.
-	@discussion Aborts a task set based on the Logical Unit.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@param theLogicalUnit This value should be zero unless the device driver is
-	more complex and managing multiple Logical Units.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit ) = 0;
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 3 );
-	/*!
-	@function ClearACA
-	@abstract Clears an Auto-Contingent Allegiance (ACA) for the specified Logical Unit.
-	@discussion Clears an Auto-Contingent Allegiance (ACA) for the specified Logical Unit.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@param theLogicalUnit This value should be zero unless the device driver is
-	more complex and managing multiple Logical Units.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit ) = 0;
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 4 );
-	/*!
-	@function ClearTaskSet
-	@abstract Clears a task set for the specified Logical Unit.
-	@discussion Clears a task set for the specified Logical Unit.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@param theLogicalUnit This value should be zero unless the device driver is
-	more complex and managing multiple Logical Units.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit ) = 0;
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 5 );
-	/*!
-	@function LogicalUnitReset
-	@abstract Resets the specified Logical Unit.
-	@discussion Resets the specified Logical Unit.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@param theLogicalUnit This value should be zero unless the device driver is
-	more complex and managing multiple Logical Units.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit ) = 0;
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 6 );
-	
-	/*!
-	@function TargetReset
-	@abstract Resets the target device.
-	@discussion Resets the target device.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		TargetReset ( void ) = 0;
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 16 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolServices.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolServices.h.svn-base
deleted file mode 100644
index 6b9df79..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIProtocolServices.h.svn-base
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_
-#define _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// Mach includes
-#include <kern/queue.h>
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOCommandGate.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/SCSITask.h>
-#include <IOKit/scsi/IOSCSIProtocolInterface.h>
-#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-// Power Management values
-enum
-{
-	kSCSIProtocolLayerPowerStateOff				= 0,
-	kSCSIProtocolLayerPowerStateOn				= 1,
-	kSCSIProtocolLayerNumDefaultStates			= 2
-};
-
-// Forward definitions of internal use only classes
-class SCSITask;
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIProtocolServices : public IOSCSIProtocolInterface
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIProtocolServices )
-	
-private:
-	
-	// The head pointer for the queue of waiting SCSI Tasks.
-	SCSITask *		fSCSITaskQueueHead;		/* OBSOLETE */
-	
-	// This is the lock for preventing multiple access while
-	// manipulating the SCSI Task queue.
-	IOSimpleLock *	fQueueLock;
-	
-	// The internal flag to indicate whether service requests should be
-	// executed or immediately errored, such as when a device is removed.
-	bool			fAllowServiceRequests;
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSIProtocolServicesExpansionData
-	{
-		// For internal use only. Do not use.
-		UInt32				fSemaphore;
-		bool				fRequiresAutosenseDescriptor;
-		SCSITaskCompletion	fCompletionRoutine;
-		queue_head_t		fTaskQueueHead;
-		queue_head_t		fAutoSenseQueueHead;
-	};
-	IOSCSIProtocolServicesExpansionData * fIOSCSIProtocolServicesReserved;
-	
-	// ---- Protocol transport methods overridden by each subclass ----
-	
-	// Send a SCSI Command to the device.  If the command was sent to the
-	// device and is pending completion, the subclass should return true and
-	// return back the kSCSIServiceResponse_Request_In_Process response. 
-	// If the command completes immediately with an error, the subclass will
-	// return true and return back the appropriate status.
-	// if the subclass is currently processing all the commands it can, the
-	// subclass will return false and the command will be resent next time
-	// CommandCompleted is called.  
-	virtual bool		SendSCSICommand ( 	SCSITaskIdentifier 		request, 
-											SCSIServiceResponse *	serviceResponse,
-											SCSITaskStatus *		taskStatus ) = 0;
-	
-	virtual SCSIServiceResponse	AbortSCSICommand ( SCSITaskIdentifier request ) = 0;
-	
-	// ---- Command completion notification method ---------
-	// Subclasses will call this inherited method when the command
-	// executed by SendSCSICommand has completed.
-	// The subclasses will return a service response that is derived
-	// from protocol specific status information and as specified in 
-	// the specification for that protocol.
-	// If the service response is kSCSIServiceResponse_TASK_COMPLETE,
-	// the subclass will also return a SCSI status value.
-	void	CommandCompleted ( 	SCSITaskIdentifier 	request, 
-								SCSIServiceResponse serviceResponse,
-								SCSITaskStatus		taskStatus );
-	
-	// ---- Utility methods for accessing SCSITask attributes ----
-	// Method for retreiving the attribute for a task.
-	SCSITaskAttribute	GetTaskAttribute ( SCSITaskIdentifier request );
-	
-	bool			SetTaskState ( 	SCSITaskIdentifier request, 
-									SCSITaskState newTaskState );
-	SCSITaskState	GetTaskState ( 	SCSITaskIdentifier request );
-	
-	UInt8			GetLogicalUnitNumber ( SCSITaskIdentifier request );
-	
-	// Method to determine the size of the command descriptor block.
-	UInt8	GetCommandDescriptorBlockSize ( SCSITaskIdentifier request );
-	
-	// This will always return the define max CDB size.  If the Protocol Layer
-	// driver only supports a smaller size CDB, it will have to create a local
-	// SCSICommandDescriptorBlock variable to get the CDB data and then 
-	// transfer the needed bytes from there.
-	bool	GetCommandDescriptorBlock ( SCSITaskIdentifier 				request, 
-										SCSICommandDescriptorBlock * 	cdbData );
-	
-	// Get the transfer direction for the request.
-	UInt8	GetDataTransferDirection ( SCSITaskIdentifier request );
-	
-	UInt64	GetRequestedDataTransferCount ( SCSITaskIdentifier request );
-	
-	bool	SetRealizedDataTransferCount ( SCSITaskIdentifier request,
-										   UInt64 newRealizedDataCount );
-	
-	UInt64	GetRealizedDataTransferCount ( SCSITaskIdentifier request );
-	
-	IOMemoryDescriptor *	GetDataBuffer ( SCSITaskIdentifier request );
-	
-	UInt64	GetDataBufferOffset ( SCSITaskIdentifier request );
-	
-	UInt32	GetTimeoutDuration ( SCSITaskIdentifier request );
-	
-	UInt64	GetAutosenseRequestedDataTransferCount ( SCSITaskIdentifier	request );
-	
-	// Set the auto sense data that was returned for the SCSI Task.
-	// A return value of true indicates that the data was copied to the member 
-	// sense data structure, false indicates that the data could not be copied.
-	bool	SetAutoSenseData ( SCSITaskIdentifier	request,
-							   SCSI_Sense_Data *	senseData ); // DEPRECATED, use the one on the line below.
-	
-	bool	SetAutoSenseData ( SCSITaskIdentifier	request,
-							   SCSI_Sense_Data *	senseData,
-							   UInt8				senseDataSize );
-	
-	void	EnsureAutosenseDescriptorExists ( SCSITaskIdentifier request );
-	
-	bool	SetProtocolLayerReference ( 
-				SCSITaskIdentifier 		request, 
-				void *					newReferenceValue );
-	void *	GetProtocolLayerReference ( SCSITaskIdentifier request );
-	
-	
-	bool	SetTaskExecutionMode (
-				SCSITaskIdentifier 		request, 
-				SCSITaskMode 			newTaskMode );
-	SCSITaskMode	GetTaskExecutionMode ( SCSITaskIdentifier request );
-	
-	// ---- Method calls for messaging device connectedness ----
-	void 	SendNotification_DeviceRemoved ( void );
-	
-	void 	SendNotification_VerifyDeviceState ( void );   
-	
-	// -- SCSI Task Queue Management Methods --
-	// Following are the commands used to manipulate the queue of pending SCSI Tasks.
-	
-	// Add the SCSI Task to the queue.  The Task's Attribute determines where in
-	// the queue the Task is placed.
-	void 	AddSCSITaskToQueue ( SCSITaskIdentifier request );
-	
-	// Add the SCSI Task to the head of the queue.  This is used when the task
-	// has been removed from the head of the queue, but the subclass indicates
-	// that it can not yet process this task.
-	void 	AddSCSITaskToHeadOfQueue ( SCSITask * request );
-	
-	// Remove the next SCSI Task for the queue and return it.
-	SCSITask * RetrieveNextSCSITaskFromQueue ( void );
-	
-	// Check to see if the SCSI Task resides in the queue and abort it if it does.
-	bool 	AbortSCSITaskFromQueue ( SCSITask * request );
-	
-	// Methods for sending and completing SCSI tasks
-	void	SendSCSITasksFromQueue ( void );
-	
-	void	RejectSCSITasksCurrentlyQueued ( void );
-	
-	void	ProcessCompletedTask ( 	SCSITaskIdentifier 	request, 
-									SCSIServiceResponse serviceResponse,
-									SCSITaskStatus		taskStatus );
-	void	RejectTask ( SCSITaskIdentifier		request );
-	
-	// ------ Power Management Support ------
-	
-	// The InitializePowerManagement method is called to initialize power management.
-	// In the protocol services layer, this method calls the protocol interface layer
-	// to initialize power management state variables and then registers the protocol
-	// layer driver with the power manager with two(2) states, ON and OFF.	
-	virtual void		InitializePowerManagement ( IOService * provider );
-	
-	// The GetInitialPowerState method is called once, right after InitializePowerManagement()
-	// in order to determine what state the device is initially in at startup time (usually
-	// the highest power mode).
-	virtual UInt32		GetInitialPowerState ( void );
-	
-	// The HandlePowerChange method is pure virtual and is left to each protocol or
-	// application layer driver to implement. It is guaranteed to be called on its
-	// own thread of execution and can make synchronous or asynchronous calls.
-	virtual void		HandlePowerChange ( void );
-	
-	// The HandleCheckPowerState (void) method is on the serialized side of the command
-	// gate and can change member variables safely without multi-threading issues.
-	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
-	// with the max power state the class registered with.
-	virtual void		HandleCheckPowerState ( void );
-	
-	// The TicklePowerManager ( void ) method is called by CheckPowerState and
-	// sends an activity tickle to the power manager so that the idle timer is
-	// reset.
-	virtual void		TicklePowerManager ( void );
-	
-	// The HandlePowerOff method is called to do any bus specific activity
-	// necessary before shutting down and going to sleep.
-	virtual IOReturn	HandlePowerOff ( void );
-	
-	// The HandlePowerOn method is called to do any bus specific activity
-	// necessary to recover from power-on/wake from sleep (e.g. bus reset on ATAPI)
-	virtual IOReturn	HandlePowerOn ( void );
-	
-public:
-	
-	virtual bool	start	( IOService * provider );
-	virtual void	free	( void );
-	
-	void RegisterSCSITaskCompletionRoutine ( SCSITaskCompletion completion );
-	
-	// ------- SCSI Architecture Model Task Management Functions ------
-	// The ExecuteCommand method will take a SCSI Task and transport
-	// it across the physical wire(s) to the device
-	void					ExecuteCommand ( SCSITaskIdentifier	request );
-	
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a specific task be aborted.
-	SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
-
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a all tasks curerntly in the task set be aborted.
-	SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
-    
-	SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		TargetReset ( void );
-	
-    // ************* Obsoleted Member Routine ****************
-    // The AbortCommand method is replaced by the AbortTask Management function and
-    // should no longer be called.
-	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier	request );
-
-	
-	// ---- Method used for determining protocol or physical interconnect characteristics. ----
-	// The IsProtocolServiceSupported will return true if the specified
-	// feature is supported by the protocol layer.  If the service has a value that must be
-	// returned, it will be returned in the serviceValue output parameter.
-	virtual bool	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue ) = 0;
-
-	// The HandleProtocolServiceFeature instructs the Protocol Services driver to perform the necessary 
-	// tasks for the indicated feature.
-	virtual bool	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue ) = 0;
-
-protected:
-	
-	// ----- Protocol Services Driver request handlers for Task Management functions -----
-	// These should be abstract so that every Protocol Services Driver would have to
-	// override them, but since they are new member routines, this class will provide
-	// a default implementation.
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 1 );
-	virtual SCSIServiceResponse		HandleAbortTask ( 
-											UInt8 						theLogicalUnit, 
-											SCSITaggedTaskIdentifier 	theTag );
-    
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 2 );
-	virtual SCSIServiceResponse		HandleAbortTaskSet ( 
-											UInt8 						theLogicalUnit );
-	
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 3 );
-	virtual SCSIServiceResponse		HandleClearACA ( 
-											UInt8 						theLogicalUnit );
-	
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 4 );
-	virtual SCSIServiceResponse		HandleClearTaskSet (
-											UInt8 						theLogicalUnit );
-	
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 5 );
-	virtual SCSIServiceResponse		HandleLogicalUnitReset (
-											UInt8 						theLogicalUnit );
-											
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 6 );
-    // The HandleTargetReset member routine requests that the Protocol Services Driver
-    // perform the necessary steps detailed in the specification that defines the 
-    // protocol the driver represents for the TargetReset management function.
-	virtual SCSIServiceResponse		HandleTargetReset ( void );
-
-
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices,  7 );
-    // The CreateSCSITargetDevice member routine will create the appropriate object
-    // to represent the Target portion of a SCSI Device.  This object is responsible
-    // for managing the Target functions of the SCSI Device including the Task Manager and
-    // Logical Units.
-    // If the SCSITargetDevice object was successfully created, a true value will be
-    // returned, otherwisw, this will return false.
-	virtual bool					CreateSCSITargetDevice ( void );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices,  8 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 	9 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 10 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 11 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 12 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 13 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 14 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 15 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 16 );
-    
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIReducedBlockCommandsDevice.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/IOSCSIReducedBlockCommandsDevice.h.svn-base
deleted file mode 100644
index 955fd6e..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/IOSCSIReducedBlockCommandsDevice.h.svn-base
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_
-#define _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOMemoryDescriptor.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOStorage.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-
-// RBC power states as defined in T10:1240D SCSI Reduced Block Commands (RBC)
-// Revision 10a, August 18, 1999, page 13.
-enum
-{
-	kRBCPowerStateSystemSleep	= 0,
-	kRBCPowerStateSleep 		= 1,
-	kRBCPowerStateStandby 		= 2,
-	kRBCPowerStateIdle			= 3,
-	kRBCPowerStateActive		= 4,
-	kRBCNumPowerStates			= 5
-};
-
-enum
-{
-	kMediaStateUnlocked	= 0,
-	kMediaStateLocked 	= 1
-};
-
-#define kCapacityDataBufferSize				8
-
-// Forward declaration for the SCSIReducedBlockCommands that is used internally by the
-// IOSCSIReducedBlockCommandsDevice class.
-class SCSIReducedBlockCommands;
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIReducedBlockCommandsDevice : public IOSCSIPrimaryCommandsDevice
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIReducedBlockCommandsDevice );
-	
-private:
-	
-#ifndef __LP64__
-	
-    SCSIReducedBlockCommands *		fSCSIReducedBlockCommandObject;
-    SCSIReducedBlockCommands *		GetSCSIReducedBlockCommandObject ( void );
-	
-#endif	/* !__LP64__ */
-	
-	static void			AsyncReadWriteComplete ( SCSITaskIdentifier completedTask );
-	
-protected:
-    
-    // Reserve space for future expansion.
-    struct IOSCSIReducedBlockCommandsDeviceExpansionData
-	{
-		IONotifier *	fPowerDownNotifier;
-        bool			fMediumRemovalPrevented;
-        bool			fKnownManualEject;
-        UInt32			fPollingMode;
-		bool			fProtocolSpecificPowerControl;
-	};
-    IOSCSIReducedBlockCommandsDeviceExpansionData * fIOSCSIReducedBlockCommandsDeviceReserved;
-	
-	#define fPowerDownNotifier				fIOSCSIReducedBlockCommandsDeviceReserved->fPowerDownNotifier
-	#define fMediumRemovalPrevented			fIOSCSIReducedBlockCommandsDeviceReserved->fMediumRemovalPrevented
-	#define fKnownManualEject				fIOSCSIReducedBlockCommandsDeviceReserved->fKnownManualEject
-	#define fPollingMode					fIOSCSIReducedBlockCommandsDeviceReserved->fPollingMode
-	#define fProtocolSpecificPowerControl	fIOSCSIReducedBlockCommandsDeviceReserved->fProtocolSpecificPowerControl
-	
-	bool				fMediaChanged;
-	bool				fMediaPresent;
-	
-	// The byte count of each physical block on the media.
-	UInt32				fMediaBlockSize;
-	
-	// The total number of blocks of mediaBlockSize on the media.
-	UInt32				fMediaBlockCount;
-	
-	// Flags used to indicate device feature
-	bool				fMediaIsRemovable;
-	bool				fMediaIsWriteProtected;
-	
-	thread_call_t		fPollingThread;
-	
-	enum
-	{
-		kPollingMode_Suspended			= 0,
-		kPollingMode_NewMedia 			= 1,
-		kPollingMode_MediaRemoval		= 2
-	};
-	
-	virtual void 		CreateStorageServiceNub ( void );
-	virtual bool		DetermineDeviceCharacteristics ( void );	
-	virtual void		PollForMedia ( void );
-	virtual void		EnablePolling ( void );
-	virtual void		DisablePolling ( void );
-	virtual void		CheckWriteProtection ( void );
-	virtual void		SetMediaCharacteristics ( UInt32 blockSize, UInt32 blockCount );
- 	virtual void		ResetMediaCharacteristics ( void );
-	virtual bool		ClearNotReadyStatus ( void );
-	
-	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
-									UInt64					startBlock,
-									UInt64					blockCount );
-	
-	virtual IOReturn	IssueWrite ( IOMemoryDescriptor*	buffer,
-									 UInt64					startBlock,
-									 UInt64					blockCount );
-	
-	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
-									UInt64					startBlock,
-									UInt64					blockCount,
-									void *					clientData );
-	
-	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
-									 UInt64					startBlock,
-									 UInt64					blockCount,
-									 void *					clientData );
-
-#ifndef __LP64__
-	
-	// This method will retreive the SCSI Primary Command Set object for
-	// the class.  For subclasses, this will be overridden using a
-	// dynamic cast on the subclasses base command set object.
-	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
-
-#endif	/* !__LP64__ */
-	
-	// ----- Power Management Support ------
-		
-	// We override this method to set our power states and register ourselves
-	// as a power policy maker.
-	virtual void 		InitializePowerManagement ( IOService * provider );
-	
-	// We override this method so that when we register for power management,
-	// we go to our active power state (which the drive is definitely in
-	// at startup time).
-	virtual UInt32		GetInitialPowerState ( void );
-	
-	// We override this method in order to provide the number of transitions
-	// from Fully active to Sleep state so that the idle timer can be adjusted
-	// to the appropriate time period based on the disk spindown time set in
-	// the Energy Saver prefs panel.
-	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
-	
-	// The TicklePowerManager method is called to tell the power manager that the
-	// device needs to be in a certain power state to handle requests.
-	virtual void		TicklePowerManager ( void );
-	
-	// The HandlePowerChange method is the state machine for power management.
-	// It is guaranteed to be on its own thread of execution (different from
-	// the power manager thread AND the workloop thread. This routine can
-	// send sync or async calls to the drive without worrying about threading
-	// issues.
-	virtual void		HandlePowerChange ( void );
-	
-	// The HandleCheckPowerState (void) method is on the serialized side of the command
-	// gate and can change member variables safely without multi-threading issues.
-	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
-	// with the max power state the class registered with.
-	virtual void		HandleCheckPowerState ( void );
-	
-	// The CheckMediaPresence method is called to see if the media which we
-	// anticipated being there is still there.
-	virtual bool		CheckMediaPresence ( void );
-	
-	virtual bool		InitializeDeviceSupport ( void );
-	virtual void		StartDeviceSupport ( void );
-	virtual void		SuspendDeviceSupport ( void );
-	virtual void		ResumeDeviceSupport ( void );
-	virtual void		StopDeviceSupport ( void );
-	virtual void		TerminateDeviceSupport ( void );
-	
-	virtual void 		free ( void );
-	
-#ifndef __LP64__
-	
-	virtual bool		CreateCommandSetObjects ( void );
-	virtual void		FreeCommandSetObjects ( void );
-
-#endif	/* !__LP64__ */
-	
-public:
-	
-	virtual IOReturn	SyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					startBlock,
-											UInt64					blockCount );
-	
-	virtual IOReturn	AsyncReadWrite (	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											void *					clientData );
-	
-	
-	virtual IOReturn	EjectTheMedia ( void );	
-	virtual IOReturn	FormatMedia ( UInt64 byteCapacity );
-	virtual UInt32		GetFormatCapacities ( 	UInt64 * capacities,
-												UInt32   capacitiesMaxCount ) const;
-	virtual IOReturn	LockUnlockMedia ( bool doLock );
-	virtual IOReturn	SynchronizeCache ( void );
-	virtual IOReturn	ReportBlockSize ( UInt64 * blockSize );
-	virtual IOReturn	ReportEjectability ( bool * isEjectable );
-	virtual IOReturn	ReportLockability ( bool * isLockable );
-	virtual IOReturn	ReportPollRequirements ( bool * pollIsRequired,
-												 bool * pollIsExpensive );
-	virtual IOReturn	ReportMaxReadTransfer (  UInt64 	blockSize,
-												 UInt64 * 	max );
-	virtual IOReturn	ReportMaxValidBlock ( UInt64 * maxBlock );
-	virtual IOReturn	ReportMaxWriteTransfer ( UInt64	blockSize,
-												UInt64 * max );
-	virtual IOReturn	ReportMediaState ( 	bool * mediaPresent,
-											bool * changed );
-	virtual IOReturn	ReportRemovability ( bool * isRemovable );
-	virtual IOReturn	ReportWriteProtection ( bool * isWriteProtected );
-	
-	static 	void		sPollForMedia ( void * pdtDriver, void * refCon );
-	
-	
-protected:
-	
-	
-	// The FORMAT_UNIT command as defined in section 5.1
-	virtual bool FORMAT_UNIT (
-							SCSITaskIdentifier			request,
-							SCSICmdField1Bit			IMMED,
-	   						SCSICmdField1Bit			PROGRESS,
-	   						SCSICmdField1Bit			PERCENT_TIME,
-	   						SCSICmdField1Bit			INCREMENT );
-	
-	// The INQUIRY command as defined in SPC-2 w/o CONTROL byte
-	virtual bool INQUIRY (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit			CMDDT,
-							SCSICmdField1Bit			EVPD,
-							SCSICmdField1Byte			PAGE_OR_OPERATION_CODE,
-							SCSICmdField1Byte			ALLOCATION_LENGTH );
-	
-	// The MODE_SELECT(6) command as defined in SPC-2 w/o CONTROL byte
-	virtual bool MODE_SELECT_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PF,
-							SCSICmdField1Bit 			SP,
-							SCSICmdField1Byte 			PARAMETER_LIST_LENGTH );
-	
-	// The MODE_SENSE(6) command as defined in SPC-2 w/o CONTROL byte
-	virtual bool MODE_SENSE_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			DBD,
-		   					SCSICmdField2Bit 			PC,
-		   					SCSICmdField6Bit 			PAGE_CODE,
-		   					SCSICmdField1Byte 			ALLOCATION_LENGTH );
-	
-	// The PERSISTENT_RESERVE_IN command as defined in SPC-2 w/o CONTROL byte
-	virtual bool PERSISTENT_RESERVE_IN (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-		   					SCSICmdField5Bit 			SERVICE_ACTION,
-		   					SCSICmdField2Byte 			ALLOCATION_LENGTH );
-	
-	// The PERSISTENT_RESERVE_OUT command as defined in SPC-2 w/o CONTROL byte
-	virtual bool PERSISTENT_RESERVE_OUT (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-		   					SCSICmdField5Bit			SERVICE_ACTION,
-		   					SCSICmdField4Bit			SCOPE,
-		   					SCSICmdField4Bit			TYPE );
-	
-	// The PREVENT_ALLOW_MEDIUM_REMOVAL command as defined in SPC-2 w/o CONTROL byte
-	virtual bool PREVENT_ALLOW_MEDIUM_REMOVAL ( 
-							SCSITaskIdentifier			request,
-	 						SCSICmdField2Bit			PREVENT );
-	
-   	// The READ_10 command as defined in section 5.2
-	virtual bool READ_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							UInt32						blockSize,
-							SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
-							SCSICmdField2Byte			TRANSFER_LENGTH );
-	
-	// The READ_CAPACITY command as defined in section 5.3
-	virtual bool READ_CAPACITY (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer );
-	
-	// The RELEASE(6) command as defined in SPC-2 w/o CONTROL byte
-	virtual bool RELEASE_6 (								
-							SCSITaskIdentifier			request );
-	
-	// The REQUEST_SENSE command as defined in SPC-2 w/o CONTROL byte
-	virtual bool REQUEST_SENSE (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Byte 			ALLOCATION_LENGTH );
-	
-	// The RESERVE(6) command as defined in SPC-2 w/o CONTROL byte
-	virtual bool RESERVE_6 (	
-							SCSITaskIdentifier			request );
-	
-	// The START_STOP_UNIT command as defined in section 5.4
-	virtual bool START_STOP_UNIT (
-							SCSITaskIdentifier			request,
-							SCSICmdField1Bit			IMMED,
-							SCSICmdField4Bit			POWER_CONDITIONS,
-							SCSICmdField1Bit			LEOJ,
-							SCSICmdField1Bit			START );
-	
-	// The SYNCRONIZE_CACHE command as defined in section 5.5
-	virtual bool SYNCHRONIZE_CACHE (
-							SCSITaskIdentifier			request );
-	
-	// The TEST_UNIT_READY command as defined in SPC-2 w/o CONTROL byte
-	virtual bool TEST_UNIT_READY (
-							SCSITaskIdentifier			request );
-	
-	// The VERIFY command as defined in section 5.7
-	virtual bool VERIFY (
-							SCSITaskIdentifier			request,
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-							SCSICmdField2Byte 			VERIFICATION_LENGTH );
-	
-	// The WRITE_10 command	as defined in section 5.6
-	virtual bool WRITE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							UInt32						blockSize,
-							SCSICmdField1Bit			FUA,
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-							SCSICmdField2Byte 			TRANSFER_LENGTH );
-	
-	// The WRITE_BUFFER command as defined in SPC-2 w/o CONTROL byte
-	virtual bool WRITE_BUFFER ( 
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField4Bit 			MODE,
-							SCSICmdField1Byte 			BUFFER_ID,
-							SCSICmdField3Byte 			BUFFER_OFFSET,
-							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH );
-	
-	
-
-	/* Added with 10.2 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 1 );
-	
-public:
-	
-	virtual IOReturn	PowerDownHandler (	void * 			refCon,
-											UInt32 			messageType,
-											IOService * 	provider,
-											void * 			messageArgument,
-											vm_size_t 		argSize );
-	
-	
-	/* Added with 10.2 */	
-	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 2 );
-	
-protected:
-
-	virtual	void		SetMediaIcon ( void );
-	
-
-	/* Added with 10.3.3 */		
-	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 3 );
-	
-protected:
-
-	virtual	void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
-	
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 16 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_INQUIRY_Definitions.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_INQUIRY_Definitions.h.svn-base
deleted file mode 100644
index 55a6a4c..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_INQUIRY_Definitions.h.svn-base
+++ /dev/null
@@ -1,923 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_CMDS_INQUIRY_H_
-#define _IOKIT_SCSI_CMDS_INQUIRY_H_
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSI Inquiry Definitions
-	@discussion
-	This file contains all definitions for the data returned from
-	the INQUIRY (0x12) command.
-*/
-
-
-/*!
- * @enum Payload sizes
- * @discussion
- * Definitions for sizes related to the INQUIRY data.
- * @constant kINQUIRY_StandardDataHeaderSize
- * INQUIRY data header size.
- * @constant kINQUIRY_MaximumDataSize
- * Maximum size for INQUIRY data.
-*/
-enum
-{
-	kINQUIRY_StandardDataHeaderSize			= 5,
-	kINQUIRY_MaximumDataSize				= 255	
-};
-
-
-/*!
-@enum INQUIRY field sizes
-@discussion
-Sizes for some of the inquiry data fields.
-@constant kINQUIRY_VENDOR_IDENTIFICATION_Length
-Size of VENDOR_IDENTIFICATION field.
-@constant kINQUIRY_PRODUCT_IDENTIFICATION_Length
-Size of PRODUCT_IDENTIFICATION field.
-@constant kINQUIRY_PRODUCT_REVISION_LEVEL_Length
-Size of PRODUCT_REVISION_LEVEL field.
-*/
-enum
-{
-	kINQUIRY_VENDOR_IDENTIFICATION_Length	= 8,
-	kINQUIRY_PRODUCT_IDENTIFICATION_Length	= 16,
-	kINQUIRY_PRODUCT_REVISION_LEVEL_Length	= 4
-};
-
-
-/*!
-@struct SCSICmd_INQUIRY_StandardData
-@discussion
-This structure defines the format of the required standard data that is 
-returned for the INQUIRY command.  This is the data that is required to
-be returned from all devices.
-*/
-typedef struct SCSICmd_INQUIRY_StandardData
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		RMB;								// 7 = removable
-	UInt8		VERSION;							// 7/6 = ISO/IEC, 5-3 = ECMA, 2-0 = ANSI.
-	UInt8		RESPONSE_DATA_FORMAT;				// 7 = AERC, 6 = Obsolete, 5 = NormACA, 4 = HiSup 3-0 = Response data format. (SPC-3 obsoletes AERC)
-													// If ANSI Version = 0, this is ATAPI and bits 7-4 = ATAPI version.
-	UInt8		ADDITIONAL_LENGTH;					// Number of additional bytes available in inquiry data
-	UInt8		SCCSReserved;						// SCC-2 device flag and reserved fields (SPC-3 adds PROTECT 3PC TPGS, and ACC)
-	UInt8		flags1;								// First byte of support flags (See SPC-3 section 6.4.2)
-	UInt8		flags2;								// Second byte of support flags (Byte 7) (See SPC-3 section 6.4.2)
-	char		VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
-	char		PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
-	char		PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
-} SCSICmd_INQUIRY_StandardData;
-typedef SCSICmd_INQUIRY_StandardData * SCSICmd_INQUIRY_StandardDataPtr;
-
-
-/*!
-@struct SCSICmd_INQUIRY_StandardDataAll
-@discussion
-This structure defines the all of the fields that can be returned in
-repsonse to the INQUIRy request for the standard data.  There is no
-requirement as to how much of the additional data must be returned by a device.
-*/
-typedef struct SCSICmd_INQUIRY_StandardDataAll
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		RMB;								// 7 = removable
-	UInt8		VERSION;							// 7/6 = ISO/IEC, 5-3 = ECMA, 2-0 = ANSI.
-	UInt8		RESPONSE_DATA_FORMAT;				// 7 = AERC, 6 = Obsolete, 5 = NormACA, 4 = HiSup 3-0 = Response data format.
-													// If ANSI Version = 0, this is ATAPI and bits 7-4 = ATAPI version.
-	UInt8		ADDITIONAL_LENGTH;					// Number of additional bytes available in inquiry data
-	UInt8		SCCSReserved;						// SCC-2 device flag and reserved fields
-	UInt8		flags1;								// First byte of support flags (Byte 6)
-	UInt8		flags2;								// Second byte of support flags (Byte 7)
-	char		VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
-	char		PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
-	char		PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
-	
-	// Following is the optional data that may be returned by a device.
-	UInt8		VendorSpecific1[20];
-	UInt8		flags3;								// Third byte of support flags, mainly SPI-3 (Byte 56)
-	UInt8		Reserved1;
-	UInt16		VERSION_DESCRIPTOR[8];
-	UInt8		Reserved2[22];
-	UInt8		VendorSpecific2[160];
-} SCSICmd_INQUIRY_StandardDataAll;
-
-
-/*!
-@enum Peripheral Qualifier
-@discussion
-Inquiry Peripheral Qualifier definitions
-@constant kINQUIRY_PERIPHERAL_QUALIFIER_Connected
-Peripheral Device is connected.
-@constant kINQUIRY_PERIPHERAL_QUALIFIER_SupportedButNotConnected
-Peripheral Device is supported, but not connected.
-@constant kINQUIRY_PERIPHERAL_QUALIFIER_NotSupported
-Peripheral Device is not supported.
-@constant kINQUIRY_PERIPHERAL_QUALIFIER_Mask
-Mask to use for PERIPHERAL_DEVICE_TYPE field.
-*/
-enum
-{
-	kINQUIRY_PERIPHERAL_QUALIFIER_Connected					= 0x00,
-	kINQUIRY_PERIPHERAL_QUALIFIER_SupportedButNotConnected	= 0x20,
-	kINQUIRY_PERIPHERAL_QUALIFIER_NotSupported				= 0x60,
-	kINQUIRY_PERIPHERAL_QUALIFIER_Mask						= 0xE0
-};
-
-
-/*!
-@enum Peripheral Device types
-@discussion
-Inquiry Peripheral Device type definitions
-@constant kINQUIRY_PERIPHERAL_TYPE_DirectAccessSBCDevice
-SBC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_SequentialAccessSSCDevice
-Sequential Access (Tape) SSC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_PrinterSSCDevice
-SSC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_ProcessorSPCDevice
-SPC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_WriteOnceSBCDevice
-SBC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_CDROM_MMCDevice
-MMC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_ScannerSCSI2Device
-SCSI2 Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_OpticalMemorySBCDevice
-SBC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_MediumChangerSMCDevice
-SMC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_CommunicationsSSCDevice
-Comms SSC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_StorageArrayControllerSCC2Device
-SCC2 Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_EnclosureServicesSESDevice
-SES Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_SimplifiedDirectAccessRBCDevice
-RBC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_OpticalCardReaderOCRWDevice
-OCRW Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_ObjectBasedStorageDevice
-OSD device.
-@constant kINQUIRY_PERIPHERAL_TYPE_AutomationDriveInterface
-Automation Drive Interface device.
-@constant kINQUIRY_PERIPHERAL_TYPE_WellKnownLogicalUnit
-Well known logical unit.
-@constant kINQUIRY_PERIPHERAL_TYPE_UnknownOrNoDeviceType
-Unknown or no device.
-@constant kINQUIRY_PERIPHERAL_TYPE_Mask
-Mask to use for PERIPHERAL_DEVICE_TYPE field.
-*/
-enum
-{
-	kINQUIRY_PERIPHERAL_TYPE_DirectAccessSBCDevice				= 0x00,
-	kINQUIRY_PERIPHERAL_TYPE_SequentialAccessSSCDevice			= 0x01,
-	kINQUIRY_PERIPHERAL_TYPE_PrinterSSCDevice					= 0x02,
-	kINQUIRY_PERIPHERAL_TYPE_ProcessorSPCDevice					= 0x03,
-	kINQUIRY_PERIPHERAL_TYPE_WriteOnceSBCDevice					= 0x04,
-	kINQUIRY_PERIPHERAL_TYPE_CDROM_MMCDevice					= 0x05,
-	kINQUIRY_PERIPHERAL_TYPE_ScannerSCSI2Device					= 0x06,
-	kINQUIRY_PERIPHERAL_TYPE_OpticalMemorySBCDevice				= 0x07,
-	kINQUIRY_PERIPHERAL_TYPE_MediumChangerSMCDevice				= 0x08,
-	kINQUIRY_PERIPHERAL_TYPE_CommunicationsSSCDevice			= 0x09,
-	/* 0x0A - 0x0B ASC IT8 Graphic Arts Prepress Devices */
-	kINQUIRY_PERIPHERAL_TYPE_StorageArrayControllerSCC2Device	= 0x0C,
-	kINQUIRY_PERIPHERAL_TYPE_EnclosureServicesSESDevice			= 0x0D,
-	kINQUIRY_PERIPHERAL_TYPE_SimplifiedDirectAccessRBCDevice	= 0x0E,
-	kINQUIRY_PERIPHERAL_TYPE_OpticalCardReaderOCRWDevice		= 0x0F,
-	/* 0x10 - 0x1E Reserved Device Types */
-	kINQUIRY_PERIPHERAL_TYPE_ObjectBasedStorageDevice			= 0x11,
-	kINQUIRY_PERIPHERAL_TYPE_AutomationDriveInterface			= 0x12,
-	kINQUIRY_PERIPHERAL_TYPE_WellKnownLogicalUnit				= 0x1E,
-	kINQUIRY_PERIPHERAL_TYPE_UnknownOrNoDeviceType				= 0x1F,
-	
-	
-	kINQUIRY_PERIPHERAL_TYPE_Mask								= 0x1F
-};
-
-
-/*!
-@enum Removable Bit field definitions
-@discussion
-Inquiry Removable Bit field definitions
-@constant kINQUIRY_PERIPHERAL_RMB_MediumFixed
-Medium type is fixed disk.
-@constant kINQUIRY_PERIPHERAL_RMB_MediumRemovable
-Medium type is removable disk.
-@constant kINQUIRY_PERIPHERAL_RMB_BitMask
-Mask to use for RMB field.
-*/
-enum
-{
-	kINQUIRY_PERIPHERAL_RMB_MediumFixed 						= 0x00,
-	kINQUIRY_PERIPHERAL_RMB_MediumRemovable 					= 0x80,
-	kINQUIRY_PERIPHERAL_RMB_BitMask 							= 0x80
-};
-
-
-/*!
-@enum Version field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY Version field.
-@constant kINQUIRY_ISO_IEC_VERSION_Mask
-Mask for valid bits for ISO/IEC Version.
-@constant kINQUIRY_ECMA_VERSION_Mask
-Mask for valid bits for ECMA Version.
-@constant kINQUIRY_ANSI_VERSION_NoClaimedConformance
-No ANSI conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_SCSI_1_Compliant
-SCSI-1 conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_SCSI_2_Compliant
-SCSI-2 conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant
-SPC conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_2_Compliant
-SPC-2 conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_3_Compliant
-SPC-3 conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_Mask
-Mask for valid bits for ANSI Version.
-*/
-enum
-{
-	kINQUIRY_ISO_IEC_VERSION_Mask								= 0xC0,
-	
-	kINQUIRY_ECMA_VERSION_Mask									= 0x38,
-	
-	kINQUIRY_ANSI_VERSION_NoClaimedConformance					= 0x00,
-	kINQUIRY_ANSI_VERSION_SCSI_1_Compliant						= 0x01,
-	kINQUIRY_ANSI_VERSION_SCSI_2_Compliant						= 0x02,
-	kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant					= 0x03,
-	kINQUIRY_ANSI_VERSION_SCSI_SPC_2_Compliant					= 0x04,
-	kINQUIRY_ANSI_VERSION_SCSI_SPC_3_Compliant					= 0x05,
-	kINQUIRY_ANSI_VERSION_Mask									= 0x07
-};
-
-
-/*!
-@enum Response Data Format field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY RESPONSE_DATA_FORMAT field.
-@constant kINQUIRY_Byte3_HISUP_Bit
-HISUP bit definition.
-@constant kINQUIRY_Byte3_NORMACA_Bit
-NORMACA bit definition.
-@constant kINQUIRY_Byte3_AERC_Bit
-AERC bit definition.
-@constant kINQUIRY_RESPONSE_DATA_FORMAT_Mask
-Mask for valid bits for RESPONSE_DATA_FORMAT.
-@constant kINQUIRY_Byte3_HISUP_Mask
-Mask to use to test the HISUP bit.
-@constant kINQUIRY_Byte3_NORMACA_Mask
-Mask to use to test the NORMACA bit.
-@constant kINQUIRY_Byte3_AERC_Mask
-Mask to use to test the AERC bit.
-*/
-enum
-{
-	// Bit definitions
-	// Bits 0-3: RESPONSE DATA FORMAT
-	kINQUIRY_Byte3_HISUP_Bit				= 4,
-	kINQUIRY_Byte3_NORMACA_Bit				= 5,
-	// Bit 6 is Obsolete
-	kINQUIRY_Byte3_AERC_Bit					= 7,
-	
-	// Masks
-	kINQUIRY_RESPONSE_DATA_FORMAT_Mask		= 0x0F, // Bits 0-3
-	kINQUIRY_Byte3_HISUP_Mask				= (1 << kINQUIRY_Byte3_HISUP_Bit),
-	kINQUIRY_Byte3_NORMACA_Mask				= (1 << kINQUIRY_Byte3_NORMACA_Bit),
-	// Bit 6 is Obsolete
-	kINQUIRY_Byte3_AERC_Mask				= (1 << kINQUIRY_Byte3_AERC_Bit)
-};
-
-
-/*!
-@enum SCCS field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY SCCSReserved field.
-@constant kINQUIRY_Byte5_SCCS_Bit
-SCCS bit definition.
-@constant kINQUIRY_Byte5_ACC_Bit
-ACC bit definition.
-@constant kINQUIRY_Byte5_3PC_Bit
-3PC bit definition.
-@constant kINQUIRY_Byte5_PROTECT_Bit
-PROTECT bit definition.
-@constant kINQUIRY_Byte5_SCCS_Mask
-Mask to use to test the SCCS bit.
-@constant kINQUIRY_Byte5_ACC_Mask
-Mask to use to test the ACC bit.
-@constant kINQUIRY_Byte5_TPGS_Mask
-Mask to use for the TPGS bits.
-@constant kINQUIRY_Byte5_3PC_Mask
-Mask to use to test the 3PC bit.
-@constant kINQUIRY_Byte5_PROTECT_Mask
-Mask to use to test the PROTECT bit.
-*/
-enum
-{
-	// Bit definitions
-	kINQUIRY_Byte5_SCCS_Bit					= 7,
-	kINQUIRY_Byte5_ACC_Bit					= 6,
-	// Bits 4-5: TPGS
-	kINQUIRY_Byte5_3PC_Bit					= 3,
-	// Bits 1-2: Reserved
-	kINQUIRY_Byte5_PROTECT_Bit				= 0,
-	
-	// Masks
-	kINQUIRY_Byte5_SCCS_Mask				= (1 << kINQUIRY_Byte5_SCCS_Bit),
-	kINQUIRY_Byte5_ACC_Mask					= (1 << kINQUIRY_Byte5_ACC_Bit),
-	kINQUIRY_Byte5_TPGS_Mask				= 0x18,
-	kINQUIRY_Byte5_3PC_Mask					= (1 << kINQUIRY_Byte5_3PC_Bit),
-	// Bits 1-2: Reserved
-	kINQUIRY_Byte5_PROTECT_Mask				= (1 << kINQUIRY_Byte5_PROTECT_Bit)
-};
-
-
-/*!
-@enum flags1 field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY flags1 field.
-@constant kINQUIRY_Byte6_ADDR16_Bit
-ADDR16 bit definition.
-@constant kINQUIRY_Byte6_MCHNGR_Bit
-MCHNGR bit definition.
-@constant kINQUIRY_Byte6_MULTIP_Bit
-MULTIP bit definition.
-@constant kINQUIRY_Byte6_VS_Bit
-VS bit definition.
-@constant kINQUIRY_Byte6_ENCSERV_Bit
-ENCSERV bit definition.
-@constant kINQUIRY_Byte6_BQUE_Bit
-BQUE bit definition.
-@constant kINQUIRY_Byte6_ADDR16_Mask
-Mask to use to test the ADDR16 bit.
-@constant kINQUIRY_Byte6_MCHNGR_Mask
-Mask to use to test the MCHNGR bit.
-@constant kINQUIRY_Byte6_MULTIP_Mask
-Mask to use to test the MULTIP bit.
-@constant kINQUIRY_Byte6_VS_Mask
-Mask to use to test the VS bit.
-@constant kINQUIRY_Byte6_ENCSERV_Mask
-Mask to use to test the ENCSERV bit.
-@constant kINQUIRY_Byte6_BQUE_Mask
-Mask to use to test the BQUE bit.
-*/
-enum
-{
-	// Byte offset
-	kINQUIRY_Byte6_Offset					= 6,
-	
-	// Bit definitions
-	kINQUIRY_Byte6_ADDR16_Bit				= 0,	// SPI Specific
-	// Bit 1 is Obsolete
-	// Bit 2 is Obsolete
-	kINQUIRY_Byte6_MCHNGR_Bit				= 3,
-	kINQUIRY_Byte6_MULTIP_Bit				= 4,
-	kINQUIRY_Byte6_VS_Bit					= 5,	
-	kINQUIRY_Byte6_ENCSERV_Bit				= 6,	
-	kINQUIRY_Byte6_BQUE_Bit					= 7,	
-
-	// Masks
-	kINQUIRY_Byte6_ADDR16_Mask				= (1 << kINQUIRY_Byte6_ADDR16_Bit),	// SPI Specific
-	// Bit 1 is Obsolete
-	// Bit 2 is Obsolete
-	kINQUIRY_Byte6_MCHNGR_Mask				= (1 << kINQUIRY_Byte6_MCHNGR_Bit),
-	kINQUIRY_Byte6_MULTIP_Mask				= (1 << kINQUIRY_Byte6_MULTIP_Bit),
-	kINQUIRY_Byte6_VS_Mask					= (1 << kINQUIRY_Byte6_VS_Bit),
-	kINQUIRY_Byte6_ENCSERV_Mask				= (1 << kINQUIRY_Byte6_ENCSERV_Bit),
-	kINQUIRY_Byte6_BQUE_Mask				= (1 << kINQUIRY_Byte6_BQUE_Bit)
-};
-
-
-/*!
-@enum flags2 field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY flags2 field.
-@constant kINQUIRY_Byte7_VS_Bit
-VS bit definition.
-@constant kINQUIRY_Byte7_CMDQUE_Bit
-CMDQUE bit definition.
-@constant kINQUIRY_Byte7_TRANDIS_Bit
-TRANDIS bit definition.
-@constant kINQUIRY_Byte7_LINKED_Bit
-LINKED bit definition.
-@constant kINQUIRY_Byte7_SYNC_Bit
-SYNC bit definition.
-@constant kINQUIRY_Byte7_WBUS16_Bit
-WBUS16 bit definition.
-@constant kINQUIRY_Byte7_RELADR_Bit
-RELADR bit definition.
-@constant kINQUIRY_Byte7_VS_Mask
-Mask to use to test the VS bit.
-@constant kINQUIRY_Byte7_CMDQUE_Mask
-Mask to use to test the CMDQUE bit.
-@constant kINQUIRY_Byte7_TRANDIS_Mask
-Mask to use to test the TRANDIS bit.
-@constant kINQUIRY_Byte7_LINKED_Mask
-Mask to use to test the LINKED bit.
-@constant kINQUIRY_Byte7_SYNC_Mask
-Mask to use to test the SYNC bit.
-@constant kINQUIRY_Byte7_WBUS16_Mask
-Mask to use to test the WBUS16 bit.
-@constant kINQUIRY_Byte7_RELADR_Mask
-Mask to use to test the RELADR bit.
-*/
-enum
-{
-	// Byte offset
-	kINQUIRY_Byte7_Offset					= 7,
-	
-	// Bit definitions
-	kINQUIRY_Byte7_VS_Bit					= 0,
-	kINQUIRY_Byte7_CMDQUE_Bit				= 1,
-	kINQUIRY_Byte7_TRANDIS_Bit				= 2,	// SPI Specific
-	kINQUIRY_Byte7_LINKED_Bit				= 3,
-	kINQUIRY_Byte7_SYNC_Bit					= 4,	// SPI Specific
-	kINQUIRY_Byte7_WBUS16_Bit				= 5,	// SPI Specific
-	// Bit 6 is Obsolete
-	kINQUIRY_Byte7_RELADR_Bit				= 7,
-	
-	// Masks
-	kINQUIRY_Byte7_VS_Mask					= (1 << kINQUIRY_Byte7_VS_Bit),
-	kINQUIRY_Byte7_CMDQUE_Mask				= (1 << kINQUIRY_Byte7_CMDQUE_Bit),
-	kINQUIRY_Byte7_TRANDIS_Mask				= (1 << kINQUIRY_Byte7_TRANDIS_Bit),// SPI Specific
-	kINQUIRY_Byte7_LINKED_Mask				= (1 << kINQUIRY_Byte7_LINKED_Bit),
-	kINQUIRY_Byte7_SYNC_Mask				= (1 << kINQUIRY_Byte7_SYNC_Bit),	// SPI Specific
-	kINQUIRY_Byte7_WBUS16_Mask				= (1 << kINQUIRY_Byte7_WBUS16_Bit),	// SPI Specific
-	// Bit 6 is Obsolete
-	kINQUIRY_Byte7_RELADR_Mask				= (1 << kINQUIRY_Byte7_RELADR_Bit)
-};
-
-
-/*!
-@enum Byte 56 features field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY Byte 56 field.
-Inquiry Byte 56 features (for devices that report an ANSI VERSION of
-kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant or later).
-These are SPI-3 Specific.
-@constant kINQUIRY_Byte56_IUS_Bit
-IUS bit definition.
-@constant kINQUIRY_Byte56_QAS_Bit
-QAS bit definition.
-@constant kINQUIRY_Byte56_IUS_Mask
-Mask to use to test the IUS bit.
-@constant kINQUIRY_Byte56_QAS_Mask
-Mask to use to test the QAS bit.
-@constant kINQUIRY_Byte56_CLOCKING_Mask
-Mask to use to test CLOCKING bits.
-@constant kINQUIRY_Byte56_CLOCKING_ONLY_ST
-Single-transition clocking only.
-@constant kINQUIRY_Byte56_CLOCKING_ONLY_DT
-Double-transition clocking only.
-@constant kINQUIRY_Byte56_CLOCKING_ST_AND_DT
-Single-transition and double-transition clocking.
-*/
-enum
-{
-	// Byte offset
-	kINQUIRY_Byte56_Offset					= 56,
-
-	// Bit definitions
-	kINQUIRY_Byte56_IUS_Bit					= 0,
-	kINQUIRY_Byte56_QAS_Bit					= 1,
-	// Bits 2 and 3 are the CLOCKING bits
-	// All other bits are reserved
-	
-	kINQUIRY_Byte56_IUS_Mask				= (1 << kINQUIRY_Byte56_IUS_Bit),
-	kINQUIRY_Byte56_QAS_Mask				= (1 << kINQUIRY_Byte56_QAS_Bit),
-	kINQUIRY_Byte56_CLOCKING_Mask			= 0x0C,
-
-	// Definitions for the CLOCKING bits
-	kINQUIRY_Byte56_CLOCKING_ONLY_ST		= 0x00,
-	kINQUIRY_Byte56_CLOCKING_ONLY_DT		= 0x04,
-	// kINQUIRY_Byte56_CLOCKING_RESERVED	= 0x08,
-	kINQUIRY_Byte56_CLOCKING_ST_AND_DT		= 0x0C
-};
-
-
-/*!
-@define kINQUIRY_VERSION_DESCRIPTOR_MaxCount
-Maximum number of INQUIRY version descriptors supported.
-*/
-#define	kINQUIRY_VERSION_DESCRIPTOR_MaxCount		8
-
-
-/*!
-@enum kINQUIRY_VERSION_DESCRIPTOR_SAT
-SAT specification version descriptor.
-*/
-enum
-{
-	kINQUIRY_VERSION_DESCRIPTOR_SAT					= 0x1EA0
-};
-
-
-/*
-IORegistry property names for information derived from the Inquiry data.
-The Peripheral Device Type is the only property that the 
-generic Logical Unit Drivers will use to match. These properties are
-listed in order of matching priority. First is the Peripheral Device Type.
-Second is the Vendor Identification. Third is the Product Identification.
-Last is the Product Revision Level. To match a particular product, you would
-specify the Peripheral Device Type, Vendor Identification, and Product
-Identification. To restrict the match to a particular firmware revision, you
-would add the Product Revision Level. To not match on a particular product,
-but on a particular vendor's products, you would only include the 
-Peripheral Device Type and the Vendor Identification.
-*/
-
-/*!
-@define kIOPropertySCSIPeripheralDeviceType
-SCSI Peripheral Device Type as reported in the INQUIRY data.
-*/
-#define kIOPropertySCSIPeripheralDeviceType			"Peripheral Device Type"
-
-/*!
-@define kIOPropertySCSIPeripheralDeviceTypeSize
-Size of the kIOPropertySCSIPeripheralDeviceType key.
-*/
-#define kIOPropertySCSIPeripheralDeviceTypeSize		8
-
-/* These properties are listed in order of matching priority */
-
-/*!
-@define kIOPropertySCSIVendorIdentification
-Vendor ID as reported in the INQUIRY data. Additional space characters (0x20)
-are truncated.
-*/
-#define kIOPropertySCSIVendorIdentification			"Vendor Identification"
-
-/*!
-@define kIOPropertySCSIProductIdentification
-Product ID as reported in the INQUIRY data. Additional space characters (0x20)
-are truncated.
-*/
-#define kIOPropertySCSIProductIdentification		"Product Identification"
-
-/*!
-@define kIOPropertySCSIProductRevisionLevel
-Product Revision Level as reported in the INQUIRY data.
-*/
-#define kIOPropertySCSIProductRevisionLevel			"Product Revision Level"
-
-
-/*!
-@enum INQUIRY Page Codes
-@discussion INQUIRY Page Codes to be used when EVPD is set in the
-INQUIRY command.
-@constant kINQUIRY_Page00_PageCode
-Page Code 00h.
-@constant kINQUIRY_Page80_PageCode
-Page Code 80h.
-@constant kINQUIRY_Page83_PageCode
-Page Code 83h.
-@constant kINQUIRY_Page89_PageCode
-Page Code 89h.
-*/
-enum
-{
-	kINQUIRY_Page00_PageCode				= 0x00,
-	kINQUIRY_Page80_PageCode				= 0x80,
-	kINQUIRY_Page83_PageCode				= 0x83,
-	kINQUIRY_Page89_PageCode				= 0x89
-};	
-
-
-/*!
-@struct SCSICmd_INQUIRY_Page00_Header
-@discussion INQUIRY Page 00h Header.
-*/
-typedef struct SCSICmd_INQUIRY_Page00_Header
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		PAGE_CODE;							// Must be equal to 00h
-	UInt8		RESERVED;							// reserved field
-	UInt8		PAGE_LENGTH;						// n-3 bytes
-} SCSICmd_INQUIRY_Page00_Header;
-
-
-/*!
-@struct SCSICmd_INQUIRY_Page80_Header
-@discussion INQUIRY Page 80h Header.
-*/
-typedef struct SCSICmd_INQUIRY_Page80_Header
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		PAGE_CODE;							// Must be equal to 80h
-	UInt8		RESERVED;							// reserved field
-	UInt8		PAGE_LENGTH;						// n-3 bytes
-	UInt8		PRODUCT_SERIAL_NUMBER;				// 4-n
-} SCSICmd_INQUIRY_Page80_Header;
-
-
-/*!
-@define kIOPropertySCSIINQUIRYUnitSerialNumber
-Key that describes the INQUIRY Unit Serial Number in the IORegistry.
-*/
-#define kIOPropertySCSIINQUIRYUnitSerialNumber		"INQUIRY Unit Serial Number"
-
-
-/*!
-@struct SCSICmd_INQUIRY_Page83_Header
-@discussion INQUIRY Page 83h Header.
-*/
-typedef struct SCSICmd_INQUIRY_Page83_Header
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		PAGE_CODE;							// Must be equal to 83h
-	UInt8		RESERVED;							// reserved field
-	UInt8		PAGE_LENGTH;						// n-3 bytes
-} SCSICmd_INQUIRY_Page83_Header;
-
-
-/*!
-@struct SCSICmd_INQUIRY_Page83_Header_SPC_16
-@discussion INQUIRY Page 83h Header used with the 16 byte INQUIRY command.
-*/
-typedef struct SCSICmd_INQUIRY_Page83_Header_SPC_16
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		PAGE_CODE;							// Must be equal to 83h
-	UInt16		PAGE_LENGTH;						// n-3 bytes
-} SCSICmd_INQUIRY_Page83_Header_SPC_16;
-
-
-/*!
-@struct SCSICmd_INQUIRY_Page83_Identification_Descriptor
-@discussion INQUIRY Page 83h Identification Descriptor.
-*/
-typedef struct SCSICmd_INQUIRY_Page83_Identification_Descriptor
-{
-	UInt8		CODE_SET;							// 7-4 = Protocol Identifier. 3-0 = Code Set
-	UInt8		IDENTIFIER_TYPE;					// 7 = PIV 5-4 = ASSOCIATION 3-0 = Identifier
-	UInt8		RESERVED;							
-	UInt8		IDENTIFIER_LENGTH;
-	UInt8		IDENTIFIER;
-} SCSICmd_INQUIRY_Page83_Identification_Descriptor;
-
-
-/*!
-@enum INQUIRY Page 83h Code Set
-@discussion
-Definitions for the Code Set field.
-@constant kINQUIRY_Page83_CodeSetBinaryData
-The identifier contains binary data.
-@constant kINQUIRY_Page83_CodeSetASCIIData
-The identifier contains ASCII data.
-@constant kINQUIRY_Page83_CodeSetUTF8Data
-The identifier contains UTF-8 data.
-*/
-enum
-{
-	kINQUIRY_Page83_CodeSetReserved			= 0x0,
-	kINQUIRY_Page83_CodeSetBinaryData		= 0x1,
-	kINQUIRY_Page83_CodeSetASCIIData		= 0x2,
-	kINQUIRY_Page83_CodeSetUTF8Data			= 0x3,
-	// 0x4 - 0xF reserved
-	kINQUIRY_Page83_CodeSetMask				= 0xF
-};	
-
-
-/*!
-@enum INQUIRY Page 83h Association
-@discussion
-Definitions for the Association field.
-@constant kINQUIRY_Page83_AssociationLogicalUnit
-Association of the identifier is with the logical unit.
-@constant kINQUIRY_Page83_AssociationDevice
-Association of the identifier is with the device (same as logical unit in SPC-2).
-@constant kINQUIRY_Page83_AssociationTargetPort
-Association of the identifier is with the target port.
-@constant kINQUIRY_Page83_AssociationTargetDevice
-Association of the identifier is with the target device (i.e. all ports).
-@constant kINQUIRY_Page83_AssociationMask
-Mask to use to determine association.
-*/
-enum
-{	
-	// SPC-3 - Association is changed to be specific to 
-	// Logical Units
-	kINQUIRY_Page83_AssociationLogicalUnit	= 0x00,
-	
-	// Backwards compatibility for SPC-2
-	kINQUIRY_Page83_AssociationDevice 		= kINQUIRY_Page83_AssociationLogicalUnit,
-	
-	// Association is related to a Target Port
-	kINQUIRY_Page83_AssociationTargetPort	= 0x10,
-	
-	// SPC-3 - Added as specific association to
-	// a Target device.
-	kINQUIRY_Page83_AssociationTargetDevice	= 0x20,
-	
-	kINQUIRY_Page83_AssociationMask			= 0x30
-};	
-		
-
-/*!
-@enum INQUIRY Page 83h Identifier Type
-@discussion
-Definitions for the Identifier Type field.
-@constant kINQUIRY_Page83_IdentifierTypeUndefined
-Undefined Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeVendorID
-Vendor Specific Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeIEEE_EUI64
-EUI-64 Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeNAAIdentifier
-NAA Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeRelativePortIdentifier
-Relative Target Port Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeTargetPortGroup
-Target Port Group Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeLogicalUnitGroup
-Logical Unit Group Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeMD5LogicalUnitIdentifier
-MD5 Logical Unit Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeSCSINameString
-SCSI Name String Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeMask
-Mask to use to determine association.
-@constant kINQUIRY_Page83_ProtocolIdentifierValidBit
-PIV Bit definition.
-@constant kINQUIRY_Page83_ProtocolIdentifierValidMask
-Mask to use to determine if PIV is set.
-*/
-enum
-{
-	kINQUIRY_Page83_IdentifierTypeUndefined					= 0,
-	kINQUIRY_Page83_IdentifierTypeVendorID					= 1,
-	kINQUIRY_Page83_IdentifierTypeIEEE_EUI64				= 2,
-	kINQUIRY_Page83_IdentifierTypeNAAIdentifier				= 3,
-	kINQUIRY_Page83_IdentifierTypeRelativePortIdentifier	= 4,
-	kINQUIRY_Page83_IdentifierTypeTargetPortGroup			= 5,
-	kINQUIRY_Page83_IdentifierTypeLogicalUnitGroup			= 6,
-	kINQUIRY_Page83_IdentifierTypeMD5LogicalUnitIdentifier  = 7,
-	kINQUIRY_Page83_IdentifierTypeSCSINameString			= 8,
-	// 0x9 - 0xF Reserved
-	
-	kINQUIRY_Page83_IdentifierTypeMask						= 0xF,
-	
-	kINQUIRY_Page83_ProtocolIdentifierValidBit				= 7,
-	kINQUIRY_Page83_ProtocolIdentifierValidMask				= (1 << kINQUIRY_Page83_ProtocolIdentifierValidBit)
-	
-};	
-
-// Backwards compatibility
-#define kINQUIRY_Page83_IdentifierTypeFCNameIdentifier		kINQUIRY_Page83_IdentifierTypeNAAIdentifier
-
-
-/*!
-@enum Protocol Identifier values
-@discussion
-Definitions for the protocol identifier values.
-@constant kSCSIProtocolIdentifier_FibreChannel
-FibreChannel Protocol Identifier.
-@constant kSCSIProtocolIdentifier_ParallelSCSI
-Parallel SCSI Protocol Identifier.
-@constant kSCSIProtocolIdentifier_SSA
-SSA Protocol Identifier.
-@constant kSCSIProtocolIdentifier_FireWire
-FireWire (IEEE-1394) Protocol Identifier.
-@constant kSCSIProtocolIdentifier_RDMA
-RDMA Protocol Identifier.
-@constant kSCSIProtocolIdentifier_iSCSI
-iSCSI Protocol Identifier.
-@constant kSCSIProtocolIdentifier_SAS
-SAS Protocol Identifier.
-@constant kSCSIProtocolIdentifier_ADT
-ADT Protocol Identifier.
-@constant kSCSIProtocolIdentifier_ATAPI
-ATAPI Protocol Identifier.
-@constant kSCSIProtocolIdentifier_None
-No Protocol Identifier.
-*/
-enum
-{
-	kSCSIProtocolIdentifier_FibreChannel					= 0,
-	kSCSIProtocolIdentifier_ParallelSCSI					= 1,
-	kSCSIProtocolIdentifier_SSA								= 2,
-	kSCSIProtocolIdentifier_FireWire						= 3,
-	kSCSIProtocolIdentifier_RDMA							= 4,
-	kSCSIProtocolIdentifier_iSCSI							= 5,
-	kSCSIProtocolIdentifier_SAS								= 6,
-	kSCSIProtocolIdentifier_ADT								= 7,
-	kSCSIProtocolIdentifier_ATAPI							= 8,
-	// 0x9-0xE Reserved
-	kSCSIProtocolIdentifier_None							= 0xF
-};
-
-
-/*!
-@define kIOPropertySCSIINQUIRYDeviceIdentification
-Device Identification key.
-*/
-#define kIOPropertySCSIINQUIRYDeviceIdentification		"INQUIRY Device Identification"
-
-
-/*!
-@define kIOPropertySCSIINQUIRYDeviceIdCodeSet
-Code Set type key.
-*/
-#define kIOPropertySCSIINQUIRYDeviceIdCodeSet			"Code Set"
-
-
-/*!
-@define kIOPropertySCSIINQUIRYDeviceIdType
-Identifier Type key.
-*/
-#define kIOPropertySCSIINQUIRYDeviceIdType				"Identifier Type"
-
-
-/*!
-@define kIOPropertySCSIINQUIRYDeviceIdAssociation
-Association key.
-*/
-#define kIOPropertySCSIINQUIRYDeviceIdAssociation		"Association"
-
-
-/*!
-@define kIOPropertySCSIINQUIRYDeviceIdentifier
-Identifier key (data or string).
-*/
-#define kIOPropertySCSIINQUIRYDeviceIdentifier			"Identifier"
-		
-
-/*!
-@struct SCSICmd_INQUIRY_Page89_Data
-@discussion INQUIRY Page 89h data as defined in the SAT 1.0
-specification. This section contians all structures and
-definitions used by the INQUIRY command in response to a request
-for page 89h - ATA information VPD Page.
-*/
-typedef struct SCSICmd_INQUIRY_Page89_Data
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		PAGE_CODE;							// Must be equal to 89h
-	UInt16		PAGE_LENGTH;						// Must be equal to 238h
-	UInt32		Reserved;
-	UInt8		SAT_VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
-	UInt8		SAT_PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
-	UInt8		SAT_PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
-	UInt8		ATA_DEVICE_SIGNATURE[20];
-	UInt8		COMMAND_CODE;
-	UInt8		Reserved2[3];
-	UInt8		IDENTIFY_DATA[512];
-} SCSICmd_INQUIRY_Page89_Data;
-
-
-/*!
-@define kIOPropertySATVendorIdentification
-Vendor Identification of the SATL.
-*/
-#define kIOPropertySATVendorIdentification			"SAT Vendor Identification"
-
-
-/*!
-@define kIOPropertySATProductIdentification
-Product Identification of the SATL.
-*/
-#define kIOPropertySATProductIdentification			"SAT Product Identification"
-
-
-/*!
-@define kIOPropertySATProductRevisonLevel
-Product Revision Level of the SATL.
-*/
-#define kIOPropertySATProductRevisonLevel			"SAT Product Revision Level"
-
-
-#endif	/* _IOKIT_SCSI_CMDS_INQUIRY_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_MODE_Definitions.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_MODE_Definitions.h.svn-base
deleted file mode 100644
index 8d9c250..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_MODE_Definitions.h.svn-base
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_
-#define _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSI Request Sense Definitions
-	@discussion
-	This file contains all definitions for the data returned from
-	the MODE_SENSE_6 and MODE_SENSE_10 commands.
-*/
-
-#pragma pack(1)
-
-/*!
-@struct SPCModeParameterHeader6
-@discussion
-Mode Parameter Header for the MODE_SENSE_6 command.
-*/
-typedef struct SPCModeParameterHeader6
-{
-	UInt8		MODE_DATA_LENGTH;
-	UInt8		MEDIUM_TYPE;
-	UInt8		DEVICE_SPECIFIC_PARAMETER;
-	UInt8		BLOCK_DESCRIPTOR_LENGTH;
-} SPCModeParameterHeader6;
-
-
-/*!
-@struct SPCModeParameterHeader10
-@discussion
-Mode Parameter Header for the MODE_SENSE_10 command.
-*/
-typedef struct SPCModeParameterHeader10
-{
-	UInt16		MODE_DATA_LENGTH;
-	UInt8		MEDIUM_TYPE;
-	UInt8		DEVICE_SPECIFIC_PARAMETER;
-	UInt8		LONGLBA;
-	UInt8		RESERVED;
-	UInt16		BLOCK_DESCRIPTOR_LENGTH;
-} SPCModeParameterHeader10;
-
-
-/*!
-@enum Long LBA Bitfield definitions
-@discussion
-Long LBA Bitfield definitions for Mode Parameter Header
-for MODE_SENSE_10 command.
-@constant kModeSenseParameterHeader10_LongLBABit
-Bit to indicate Long LBA block descriptors follow.
-@constant kModeSenseParameterHeader10_LongLBAMask
-Mask to test for kModeSenseParameterHeader10_LongLBABit.
-*/
-enum
-{
-	kModeSenseParameterHeader10_LongLBABit	=  0,
-	kModeSenseParameterHeader10_LongLBAMask	=  (1 << kModeSenseParameterHeader10_LongLBABit),
-};
-
-
-/*!
-@enum Device Specific Parameter Bitfield definitions
-@discussion
-SBC definitions for Device Specific Parameter in the
-Mode Sense Header Block.
-@constant kModeSenseSBCDeviceSpecific_DPOFUABit
-Bit to indicate DPO and FUA bits are accepted by the device server.
-@constant kModeSenseSBCDeviceSpecific_WriteProtectBit
-Bit to indicate medium is write protected.
-@constant kModeSenseSBCDeviceSpecific_DPOFUAMask
-Mask to test for kModeSenseSBCDeviceSpecific_DPOFUABit.
-@constant kModeSenseSBCDeviceSpecific_WriteProtectMask
-Mask to test for kModeSenseSBCDeviceSpecific_WriteProtectBit.
-*/
-enum
-{
-	kModeSenseSBCDeviceSpecific_DPOFUABit	 		=  4,
-	kModeSenseSBCDeviceSpecific_WriteProtectBit	 	=  7,
-	kModeSenseSBCDeviceSpecific_DPOFUAMask 			=  (1 << kModeSenseSBCDeviceSpecific_DPOFUABit),
-	kModeSenseSBCDeviceSpecific_WriteProtectMask 	=  (1 << kModeSenseSBCDeviceSpecific_WriteProtectBit)
-};
-
-
-/*!
-@struct ModeParameterBlockDescriptor
-@discussion
-General mode parameter block descriptor.
-*/
-typedef struct ModeParameterBlockDescriptor
-{
-	UInt8		DENSITY_CODE;
-	UInt8		NUMBER_OF_BLOCKS[3];
-	UInt8		RESERVED;
-	UInt8		BLOCK_LENGTH[3];
-} ModeParameterBlockDescriptor;
-
-
-/*!
-@struct DASDModeParameterBlockDescriptor
-@discussion
-Direct Access Storage Device mode parameter block descriptor.
-*/
-typedef struct DASDModeParameterBlockDescriptor
-{
-	UInt32		NUMBER_OF_BLOCKS;
-	UInt8		DENSITY_CODE;
-	UInt8		BLOCK_LENGTH[3];
-} DASDModeParameterBlockDescriptor;
-
-
-/*!
-@struct LongLBAModeParameterBlockDescriptor
-@discussion
-Long LBA mode parameter block descriptor.
-*/
-typedef struct LongLBAModeParameterBlockDescriptor
-{
-	UInt64		NUMBER_OF_BLOCKS;
-	UInt8		DENSITY_CODE;
-	UInt8		RESERVED[3];
-	UInt32		BLOCK_LENGTH;
-} LongLBAModeParameterBlockDescriptor;
-
-
-/*!
-@struct ModePageFormatHeader
-@discussion
-Mode Page format header.
-*/
-typedef struct ModePageFormatHeader
-{
-	UInt8		PS_PAGE_CODE;
-	UInt8		PAGE_LENGTH;
-} ModePageFormatHeader;
-
-
-/*!
-@enum Mode Page Format bit definitions
-@discussion
-Mode Page Format bit definitions.
-@constant kModePageFormat_PS_Bit
-Bit to indicate Parameters Saveable.
-@constant kModePageFormat_PAGE_CODE_Mask
-Mask to obtain the PAGE_CODE from the PS_PAGE_CODE field.
-@constant kModePageFormat_PS_Mask
-Mask to test for kModePageFormat_PS_Bit.
-*/
-enum
-{
-	kModePageFormat_PS_Bit			= 7,
-	
-	kModePageFormat_PAGE_CODE_Mask	= 0x3F,
-	kModePageFormat_PS_Mask			= (1 << kModePageFormat_PS_Bit)
-};
-
-
-#if 0
-#pragma mark -
-#pragma mark SPC Mode Pages
-#pragma mark -
-#endif
-
-
-/*!
-@enum SPC Mode Pages
-@discussion
-SPC Mode Page definitions.
-@constant kSPCModePagePowerConditionCode
-Power Conditions Mode Page value.
-@constant kSPCModePageAllPagesCode
-All Mode Pages value.
-*/
-enum
-{
-	kSPCModePagePowerConditionCode		= 0x1A,
-	kSPCModePageAllPagesCode			= 0x3F
-};
-
-/*!
-@struct SPCModePagePowerCondition
-@discussion
-Power Conditions Mode Page (PAGE CODE 0x1A) format.
-*/
-typedef struct SPCModePagePowerCondition
-{
-	ModePageFormatHeader	header;
-	UInt8					RESERVED;
-	UInt8					IDLE_STANDBY;
-	UInt32					IDLE_CONDITION_TIMER;
-	UInt32					STANDBY_CONDITION_TIMER;
-} SPCModePagePowerCondition;
-
-
-#if 0
-#pragma mark -
-#pragma mark 0x00 SBC Direct Access Mode Pages
-#pragma mark -
-#endif
-
-
-/*!
-@enum SBC Mode Pages
-@discussion
-SBC Mode Page definitions.
-@constant kSBCModePageFormatDeviceCode
-Format Device Mode Page value.
-@constant kSBCModePageRigidDiskGeometryCode
-Rigid Disk Geometry Page value.
-@constant kSBCModePageFlexibleDiskCode
-Flexible Disk Page value.
-@constant kSBCModePageCachingCode
-Caching Page value.
-*/
-enum
-{
-	kSBCModePageFormatDeviceCode		= 0x03,
-	kSBCModePageRigidDiskGeometryCode	= 0x04,
-	kSBCModePageFlexibleDiskCode		= 0x05,
-	kSBCModePageCachingCode				= 0x08
-};
-
-
-/*!
-@struct SBCModePageFormatDevice
-@discussion
-Format Device Mode Page (PAGE CODE 0x03) format.
-*/
-typedef struct SBCModePageFormatDevice
-{
-	ModePageFormatHeader	header;
-	UInt16					TRACKS_PER_ZONE;
-	UInt16					ALTERNATE_SECTORS_PER_ZONE;
-	UInt16					ALTERNATE_TRACKS_PER_ZONE;
-	UInt16					ALTERNATE_TRACKS_PER_LOGICAL_UNIT;
-	UInt16					SECTORS_PER_TRACK;
-	UInt16					DATA_BYTES_PER_PHYSICAL_SECTOR;
-	UInt16					INTERLEAVE;
-	UInt16					TRACK_SKEW_FACTOR;
-	UInt16					CYLINDER_SKEW_FACTOR;
-	UInt8					SSEC_HSEC_RMB_SURF;
-	UInt8					RESERVED[3];
-} SBCModePageFormatDevice;
-
-
-/*!
-@struct SBCModePageRigidDiskGeometry
-@discussion
-Rigid Disk Geometry Mode Page (PAGE CODE 0x04) format.
-*/
-typedef struct SBCModePageRigidDiskGeometry
-{
-	ModePageFormatHeader	header;
-	UInt8					NUMBER_OF_CYLINDERS[3];
-	UInt8					NUMBER_OF_HEADS;
-	UInt8					STARTING_CYLINDER_WRITE_PRECOMPENSATION[3];
-	UInt8					STARTING_CYLINDER_REDUCED_WRITE_CURRENT[3];
-	UInt16					DEVICE_STEP_RATE;
-	UInt8					LANDING_ZONE_CYLINDER[3];
-	UInt8					RPL;
-	UInt8					ROTATIONAL_OFFSET;
-	UInt8					RESERVED;
-	UInt16					MEDIUM_ROTATION_RATE;
-	UInt8					RESERVED1[2];
-} SBCModePageRigidDiskGeometry;
-
-
-/*!
-@enum Rigid Disk Geometry bitfields
-@discussion
-Bit field masks for Rigid Disk Geometry structure fields.
-@constant kSBCModePageRigidDiskGeometry_RPL_Mask
-Mask for use with the RPL field.
-*/
-enum
-{
-	kSBCModePageRigidDiskGeometry_RPL_Mask	= 0x03
-};
-
-
-/*!
-@struct SBCModePageFlexibleDisk
-@discussion
-Flexible Disk Mode Page (PAGE CODE 0x05) format.
-*/
-typedef struct SBCModePageFlexibleDisk
-{
-	ModePageFormatHeader	header;
-	UInt16					TRANSFER_RATE;
-	UInt8					NUMBER_OF_HEADS;
-	UInt8					SECTORS_PER_TRACK;
-	UInt16					DATA_BYTES_PER_SECTOR;
-	UInt16					NUMBER_OF_CYLINDERS;
-	UInt16					STARTING_CYLINDER_WRITE_PRECOMPENSATION;
-	UInt16					STARTING_CYLINDER_REDUCED_WRITE_CURRENT;
-	UInt16					DEVICE_STEP_RATE;
-	UInt8					DEVICE_STEP_PULSE_WIDTH;
-	UInt16					HEAD_SETTLE_DELAY;
-	UInt8					MOTOR_ON_DELAY;
-	UInt8					MOTOR_OFF_DELAY;
-	UInt8					TRDY_SSN_MO;
-	UInt8					SPC;
-	UInt8					WRITE_COMPENSATION;
-	UInt8					HEAD_LOAD_DELAY;
-	UInt8					HEAD_UNLOAD_DELAY;
-	UInt8					PIN_34_PIN_2;
-	UInt8					PIN_4_PIN_1;
-	UInt16					MEDIUM_ROTATION_RATE;
-	UInt8					RESERVED[2];
-} SBCModePageFlexibleDisk;
-
-
-/*!
-@enum TRDY_SSN_MO bitfields
-@discussion
-Bit field definitions and masks for Flexible Disk TRDY_SSN_MO field.
-@constant kSBCModePageFlexibleDisk_MO_Bit
-MO Bit definition.
-@constant kSBCModePageFlexibleDisk_SSN_Bit
-SSN Bit definition.
-@constant kSBCModePageFlexibleDisk_TRDY_Bit
-TRDY Bit definition.
-@constant kSBCModePageFlexibleDisk_MO_Mask
-Mask for use with TRDY_SSN_MO field.
-@constant kSBCModePageFlexibleDisk_SSN_Mask
-Mask for use with TRDY_SSN_MO field.
-@constant kSBCModePageFlexibleDisk_TRDY_Mask
-Mask for use with TRDY_SSN_MO field.
-*/
-enum
-{
-	// Bits 0:4 Reserved
-	kSBCModePageFlexibleDisk_MO_Bit		= 5,
-	kSBCModePageFlexibleDisk_SSN_Bit	= 6,
-	kSBCModePageFlexibleDisk_TRDY_Bit	= 7,
-	
-	kSBCModePageFlexibleDisk_MO_Mask	= (1 << kSBCModePageFlexibleDisk_MO_Bit),
-	kSBCModePageFlexibleDisk_SSN_Mask	= (1 << kSBCModePageFlexibleDisk_SSN_Bit),
-	kSBCModePageFlexibleDisk_TRDY_Mask	= (1 << kSBCModePageFlexibleDisk_TRDY_Bit)
-};
-
-
-/*!
-@enum SPC bitfields
-@discussion
-Bit field definitions and masks for Flexible Disk SPC field.
-@constant kSBCModePageFlexibleDisk_SPC_Mask
-Mask for use with SPC field.
-*/
-enum
-{
-	kSBCModePageFlexibleDisk_SPC_Mask	= 0x0F
-};
-
-
-/*!
-@enum PIN_34_PIN_2 bitfields
-@discussion
-Bit field definitions and masks for Flexible Disk PIN_34_PIN_2 field.
-@constant kSBCModePageFlexibleDisk_PIN_2_Mask
-Mask for use with PIN_34_PIN_2 field.
-@constant kSBCModePageFlexibleDisk_PIN_34_Mask
-Mask for use with PIN_34_PIN_2 field.
-*/
-enum
-{
-	kSBCModePageFlexibleDisk_PIN_2_Mask		= 0x0F,
-	kSBCModePageFlexibleDisk_PIN_34_Mask	= 0xF0
-};
-
-
-/*!
-@enum PIN_4_PIN_1 bitfields
-@discussion
-Bit field definitions and masks for Flexible Disk PIN_4_PIN_1 field.
-@constant kSBCModePageFlexibleDisk_PIN_1_Mask
-Mask for use with PIN_4_PIN_1 field.
-@constant kSBCModePageFlexibleDisk_PIN_4_Mask
-Mask for use with PIN_4_PIN_1 field.
-*/
-enum
-{
-	kSBCModePageFlexibleDisk_PIN_1_Mask		= 0x0F,
-	kSBCModePageFlexibleDisk_PIN_4_Mask		= 0xF0
-};
-
-
-/*!
-@struct SBCModePageCaching
-@discussion
-Caching Mode Page (PAGE CODE 0x08) format.
-*/
-typedef struct SBCModePageCaching
-{
-	ModePageFormatHeader	header;
-	UInt8					flags;
-	UInt8					DEMAND_READ_WRITE_RETENTION_PRIORITY;
-	UInt16					DISABLE_PREFETCH_TRANSFER_LENGTH;
-	UInt16					MINIMUM_PREFETCH;
-	UInt16					MAXIMUM_PREFETCH;
-	UInt16					MAXIMUM_PREFETCH_CEILING;
-	UInt8					flags2;
-	UInt8					NUMBER_OF_CACHE_SEGMENTS;
-	UInt16					CACHE_SEGMENT_SIZE;
-	UInt8					RESERVED;
-	UInt8					NON_CACHE_SEGMENT_SIZE[3];
-} SBCModePageCaching;
-
-
-/*!
-@enum Caching flags bitfields
-@discussion
-Bit field definitions and masks for Caching flags field.
-@constant kSBCModePageCaching_RCD_Bit
-RCD Bit definition.
-@constant kSBCModePageCaching_MF_Bit
-MF Bit definition.
-@constant kSBCModePageCaching_WCE_Bit
-WCE Bit definition.
-@constant kSBCModePageCaching_SIZE_Bit
-SIZE Bit definition.
-@constant kSBCModePageCaching_DISC_Bit
-DISC Bit definition.
-@constant kSBCModePageCaching_CAP_Bit
-CAP Bit definition.
-@constant kSBCModePageCaching_ABPF_Bit
-ABPF Bit definition.
-@constant kSBCModePageCaching_IC_Bit
-IC Bit definition.
-@constant kSBCModePageCaching_RCD_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_MF_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_WCE_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_SIZE_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_DISC_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_CAP_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_ABPF_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_IC_Mask
-Mask for use with flags field.
-*/
-enum
-{
-	kSBCModePageCaching_RCD_Bit		= 0,
-	kSBCModePageCaching_MF_Bit		= 1,
-	kSBCModePageCaching_WCE_Bit		= 2,
-	kSBCModePageCaching_SIZE_Bit	= 3,
-	kSBCModePageCaching_DISC_Bit	= 4,
-	kSBCModePageCaching_CAP_Bit		= 5,
-	kSBCModePageCaching_ABPF_Bit	= 6,
-	kSBCModePageCaching_IC_Bit		= 7,
-
-	kSBCModePageCaching_RCD_Mask	= (1 << kSBCModePageCaching_RCD_Bit),
-	kSBCModePageCaching_MF_Mask		= (1 << kSBCModePageCaching_MF_Bit),
-	kSBCModePageCaching_WCE_Mask	= (1 << kSBCModePageCaching_WCE_Bit),
-	kSBCModePageCaching_SIZE_Mask	= (1 << kSBCModePageCaching_SIZE_Bit),
-	kSBCModePageCaching_DISC_Mask	= (1 << kSBCModePageCaching_DISC_Bit),
-	kSBCModePageCaching_CAP_Mask	= (1 << kSBCModePageCaching_CAP_Bit),
-	kSBCModePageCaching_ABPF_Mask	= (1 << kSBCModePageCaching_ABPF_Bit),
-	kSBCModePageCaching_IC_Mask		= (1 << kSBCModePageCaching_IC_Bit)
-};
-
-
-/*!
-@enum Demand Read/Write Retention masks
-@discussion
-Demand Read/Write Retention masks.
-@constant kSBCModePageCaching_DEMAND_WRITE_Mask
-Mask for the DEMAND_READ_WRITE_RETENTION_PRIORITY field.
-@constant kSBCModePageCaching_DEMAND_READ_Mask
-Mask for the DEMAND_READ_WRITE_RETENTION_PRIORITY field.
-*/
-enum
-{
-	kSBCModePageCaching_DEMAND_WRITE_Mask	= 0x00FF,
-	kSBCModePageCaching_DEMAND_READ_Mask 	= 0xFF00
-};
-
-/*!
-@enum Caching flags2 bitfields
-@discussion
-Bit field definitions and masks for Caching flags2 field.
-@constant kSBCModePageCaching_VS1_Bit
-VS1 Bit definition.
-@constant kSBCModePageCaching_VS2_Bit
-VS2 Bit definition.
-@constant kSBCModePageCaching_DRA_Bit
-DRA Bit definition.
-@constant kSBCModePageCaching_LBCSS_Bit
-LBCSS Bit definition.
-@constant kSBCModePageCaching_FSW_Bit
-FSW Bit definition.
-@constant kSBCModePageCaching_VS1_Mask
-Mask for use with flags2 field.
-@constant kSBCModePageCaching_VS2_Mask
-Mask for use with flags2 field.
-@constant kSBCModePageCaching_DRA_Mask
-Mask for use with flags2 field.
-@constant kSBCModePageCaching_LBCSS_Mask
-Mask for use with flags2 field.
-@constant kSBCModePageCaching_FSW_Mask
-Mask for use with flags2 field.
-*/
-enum
-{
-	// Bits 0:2 Reserved
-	kSBCModePageCaching_VS1_Bit		= 3,
-	kSBCModePageCaching_VS2_Bit		= 4,
-	kSBCModePageCaching_DRA_Bit		= 5,
-	kSBCModePageCaching_LBCSS_Bit	= 6,
-	kSBCModePageCaching_FSW_Bit		= 7,
-
-	kSBCModePageCaching_VS1_Mask	= (1 << kSBCModePageCaching_VS1_Bit),
-	kSBCModePageCaching_VS2_Mask	= (1 << kSBCModePageCaching_VS2_Bit),
-	kSBCModePageCaching_DRA_Mask	= (1 << kSBCModePageCaching_DRA_Bit),
-	kSBCModePageCaching_LBCSS_Mask	= (1 << kSBCModePageCaching_LBCSS_Bit),
-	kSBCModePageCaching_FSW_Mask	= (1 << kSBCModePageCaching_FSW_Bit)
-};
-
-#pragma options align=reset
-
-#endif	/* _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_READ_CAPACITY_Definitions.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_READ_CAPACITY_Definitions.h.svn-base
deleted file mode 100644
index 59abde3..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_READ_CAPACITY_Definitions.h.svn-base
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_CMDS_READ_CAPACITY_H_
-#define _IOKIT_SCSI_CMDS_READ_CAPACITY_H_
-
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSI Request Sense Definitions
-	@discussion
-	This file contains all definitions for the data returned from
-	the READ CAPACITY 10 (0x25) and READ CAPACITY 16 (0x9E) commands.
-*/
-
-/*!
-@enum READ CAPACITY Payload Sizes
-@discussion
-Sizes of the payload for the READ CAPACITY 10 and
-READ CAPACITY 16 commands.
-@constant kREPORT_CAPACITY_DataSize
-Data size for a READ_CAPACITY command.
-@constant kREPORT_CAPACITY_16_DataSize
-Data size for a READ_CAPACITY_16 command.
-*/
-enum
-{
-	kREPORT_CAPACITY_DataSize		= 8,
-	kREPORT_CAPACITY_16_DataSize	= 32
-};
-
-
-/*!
-@constant kREPORT_CAPACITY_MaximumLBA
-@discussion
-Maximum LBA supported via READ CAPACITY 10 command.
-*/
-#define 	kREPORT_CAPACITY_MaximumLBA			0xFFFFFFFFUL
-
-
-/*!
-@constant kREPORT_CAPACITY_16_MaximumLBA
-@discussion
-Maximum LBA supported via READ CAPACITY 16 command.
-*/
-#define 	kREPORT_CAPACITY_16_MaximumLBA		0xFFFFFFFFFFFFFFFFULL
-
-
-/*!
-@struct SCSI_Capacity_Data
-@discussion
-Capacity return structure for READ CAPACITY 10 command.
-*/
-typedef struct SCSI_Capacity_Data
-{
-	UInt32		RETURNED_LOGICAL_BLOCK_ADDRESS;
-	UInt32		BLOCK_LENGTH_IN_BYTES;
-} SCSI_Capacity_Data;
-
-
-/*!
-@struct SCSI_Capacity_Data_Long
-@discussion
-Capacity return structure for READ CAPACITY 16 command.
-*/
-typedef struct SCSI_Capacity_Data_Long
-{
-	UInt64		RETURNED_LOGICAL_BLOCK_ADDRESS;
-	UInt32		BLOCK_LENGTH_IN_BYTES;
-	UInt8		RTO_EN_PROT_EN;
-	UInt8		Reserved[19];
-} SCSI_Capacity_Data_Long;
-
-
-/*!
-@enum RTO_EN definitions
-@discussion
-Values for the REFERENCE TAG OWN (RTO_EN) bit in the
-READ CAPACITY Long Data structure.
-@constant kREAD_CAPACITY_RTO_Enabled
-Reference Tag Own enabled.
-@constant kREAD_CAPACITY_RTO_Disabled
-Reference Tag Own disabled.
-@constant kREAD_CAPACITY_RTO_Mask
-Mask to use when checking the RTO_EN_PROT_EN field.
-*/
-enum
-{
-	kREAD_CAPACITY_RTO_Enabled								= 0x02,
-	kREAD_CAPACITY_RTO_Disabled								= 0x00,
-	kREAD_CAPACITY_RTO_Mask									= 0x02
-};
-
-
-/*!
-@enum PROTECTION INFORMATION definitions
-@discussion
-Values for the PROTECTION INFORMATION (PROT_EN) bit in the
-READ CAPACITY Long Data structure.
-@constant kREAD_CAPACITY_PROT_Enabled
-Protection Information enabled.
-@constant kREAD_CAPACITY_PROT_Disabled
-Protection Information disabled.
-@constant kREAD_CAPACITY_PROT_Mask
-Mask to use when checking the RTO_EN_PROT_EN field.
-*/
-
-enum
-{
-	kREAD_CAPACITY_PROT_Enabled								= 0x01,
-	kREAD_CAPACITY_PROT_Disabled							= 0x00,
-	kREAD_CAPACITY_PROT_Mask								= 0x01
-};
-
-
-#endif	/* _IOKIT_SCSI_CMDS_READ_CAPACITY_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REPORT_LUNS_Definitions.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REPORT_LUNS_Definitions.h.svn-base
deleted file mode 100644
index 6616e84..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REPORT_LUNS_Definitions.h.svn-base
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_
-#define _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_
-
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSI Request Sense Definitions
-	@discussion
-	This file contains all definitions for the data returned from
-	the REPORT_LUNS (0xA0) command.
-*/
-
-
-/*!
-@struct SCSICmd_REPORT_LUNS_LUN_ENTRY
-@discussion
-This structure represents a single LUN entry in a LUN list
-returned via the REPORT_LUNS command.
-*/
-typedef struct SCSICmd_REPORT_LUNS_LUN_ENTRY
-{
-	UInt16		FIRST_LEVEL_ADDRESSING;
-	UInt16		SECOND_LEVEL_ADDRESSING;
-	UInt16		THIRD_LEVEL_ADDRESSING;
-	UInt16		FOURTH_LEVEL_ADDRESSING;
-} SCSICmd_REPORT_LUNS_LUN_ENTRY;
-
-
-/*!
-@constant kREPORT_LUNS_HeaderSize
-@discussion
-Size of the REPORT_LUNS header as defined in the SPC-3 specification.
-*/
-#define kREPORT_LUNS_HeaderSize		8
-
-/*!
-@enum REPORT_LUNS addressing methods.
-@discussion
-REPORT_LUNS addressing methods described in
-SAM-2 documents.
-@constant kREPORT_LUNS_ADDRESS_METHOD_PERIPHERAL_DEVICE
-Peripheral Device Addressing Method.
-@constant kREPORT_LUNS_ADDRESS_DEVICE_TYPE_SPECIFIC
-Device Type Specific Addressing Method.
-@constant kREPORT_LUNS_ADDRESS_METHOD_LOGICAL_UNIT
-Logical Unit Specific Addressing Method.
-@constant kREPORT_LUNS_ADDRESS_METHOD_OFFSET
-Offset to the address method data.
-*/
-enum
-{
-	kREPORT_LUNS_ADDRESS_METHOD_PERIPHERAL_DEVICE	= 0,
-	kREPORT_LUNS_ADDRESS_DEVICE_TYPE_SPECIFIC		= 1,
-	kREPORT_LUNS_ADDRESS_METHOD_LOGICAL_UNIT 		= 2,
-	// Reserved [3]
-	kREPORT_LUNS_ADDRESS_METHOD_OFFSET				= 14
-};
-
-
-/*!
-@struct REPORT_LUNS_LOGICAL_UNIT_ADDRESSING
-@discussion
-This structure represents a LUN Addressing scheme.
-*/
-typedef struct REPORT_LUNS_LOGICAL_UNIT_ADDRESSING
-{
-#ifdef __LITTLE_ENDIAN__
-	UInt16		LUN			: 5;
-	UInt16		BUS_NUMBER	: 3;
-	UInt16		TARGET		: 6;
-	UInt16		reserved2	: 1;
-	UInt16		reserved	: 1;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt16		reserved	: 1;
-	UInt16		reserved2	: 1;
-	UInt16		TARGET		: 6;
-	UInt16		BUS_NUMBER	: 3;
-	UInt16		LUN			: 5;
-#endif /* !__LITTLE_ENDIAN__ */
-} REPORT_LUNS_LOGICAL_UNIT_ADDRESSING;
-
-
-/*!
-@struct REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING
-@discussion
-This structure represents a Peripheral Device Addressing scheme.
-*/
-typedef struct REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING
-{
-#ifdef __LITTLE_ENDIAN__
-	UInt16		TARGET_LUN		: 8;
-	UInt16		BUS_IDENTIFIER	: 6;
-	UInt16		reserved2		: 1;
-	UInt16		reserved		: 1;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt16		reserved		: 1;
-	UInt16		reserved2		: 1;
-	UInt16		BUS_IDENTIFIER	: 6;
-	UInt16		TARGET_LUN		: 8;
-#endif /* !__LITTLE_ENDIAN__ */
-} REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING;
-
-
-/*!
-@struct SCSICmd_REPORT_LUNS_Header
-@discussion
-This structure defines the format of the data that is returned for
-the REPORT_LUNS command.
-*/
-typedef struct SCSICmd_REPORT_LUNS_Header
-{
-	UInt32							LUN_LIST_LENGTH;	// LUN list length in bytes.
-	UInt32							RESERVED;
-	SCSICmd_REPORT_LUNS_LUN_ENTRY	LUN[1];				// Variable length list. Must have at least LUN 0 if
-} SCSICmd_REPORT_LUNS_Header;							// Target supports REPORT_LUNS command.
-
-
-#endif	/* _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REQUEST_SENSE_Defs.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REQUEST_SENSE_Defs.h.svn-base
deleted file mode 100644
index 8cfabb0..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/SCSICmds_REQUEST_SENSE_Defs.h.svn-base
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_
-#define _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_
-
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSI Request Sense Definitions
-	@discussion
-	This file contains all definitions for the data returned from
-	the REQUEST SENSE (0x03) command and from auto sense on protocols
-	that support it.
-*/
-
-
-/*!
-@enum kSenseDefaultSize
-@discussion
-The default size for SCSI Request Sense data.
-*/
-enum
-{
-	kSenseDefaultSize	= 18
-};
-
-
-/*!
-@struct SCSI_Sense_Data
-@discussion
-The basic SCSI Request Sense data structure.
-*/
-typedef struct SCSI_Sense_Data
-{
-	UInt8		VALID_RESPONSE_CODE;				// 7 = Valid. 6-0 = Response Code.
-	UInt8		SEGMENT_NUMBER;						// Segment number
-	UInt8		SENSE_KEY;							// 7 = FILEMARK, 6 = EOM, 5 = ILI, 3-0 = SENSE KEY.
-	UInt8		INFORMATION_1;						// INFORMATION.
-	UInt8		INFORMATION_2;						// INFORMATION.
-	UInt8		INFORMATION_3;						// INFORMATION.
-	UInt8		INFORMATION_4;						// INFORMATION.
-	UInt8		ADDITIONAL_SENSE_LENGTH;			// Number of additional bytes available in sense data
-	UInt8		COMMAND_SPECIFIC_INFORMATION_1;		// Command Specific Information
-	UInt8		COMMAND_SPECIFIC_INFORMATION_2;		// Command Specific Information
-	UInt8		COMMAND_SPECIFIC_INFORMATION_3;		// Command Specific Information
-	UInt8		COMMAND_SPECIFIC_INFORMATION_4;		// Command Specific Information
-	UInt8		ADDITIONAL_SENSE_CODE;				// Additional Sense Code
-	UInt8		ADDITIONAL_SENSE_CODE_QUALIFIER;	// Additional Sense Code Qualifier
-	UInt8		FIELD_REPLACEABLE_UNIT_CODE;		// Field Replaceable Unit Code
-	UInt8		SKSV_SENSE_KEY_SPECIFIC_MSB;		// 7 = Sense Key Specific Valid bit, 6-0 Sense Key Specific MSB
-	UInt8		SENSE_KEY_SPECIFIC_MID;				// Sense Key Specific Middle
-	UInt8		SENSE_KEY_SPECIFIC_LSB;				// Sense Key Specific LSB
-} SCSI_Sense_Data;
-
-
-/*!
-@enum Sense Valid
-@discussion
-Masks to use to determine if sense data is valid or not.
-@constant kSENSE_DATA_VALID
-Sense data is valid.
-@constant kSENSE_NOT_DATA_VALID
-Sense data is not valid.
-@constant kSENSE_DATA_VALID_Mask
-Validity mask to use when checking the VALID_RESPONSE_CODE field.
-*/
-enum
-{
-	kSENSE_DATA_VALID										= 0x80,
-	kSENSE_NOT_DATA_VALID									= 0x00,
-	kSENSE_DATA_VALID_Mask									= 0x80
-};
-
-
-/*!
-@enum Sense Response Codes
-@discussion
-Masks and values to determine the Response Code.
-@constant kSENSE_RESPONSE_CODE_Current_Errors
-Response code indicating current errors are reported.
-@constant kSENSE_RESPONSE_CODE_Deferred_Errors
-Response code indicating deferred errors are reported.
-@constant kSENSE_RESPONSE_CODE_Mask
-Mask to use when checking the VALID_RESPONSE_CODE field.
-*/
-enum
-{
-	kSENSE_RESPONSE_CODE_Current_Errors						= 0x70,
-	kSENSE_RESPONSE_CODE_Deferred_Errors					= 0x71,
-	kSENSE_RESPONSE_CODE_Mask								= 0x7F
-};
-
-
-/*!
-@enum FILEMARK bit field definitions
-@discussion
-Masks and values to determine the FileMark bit field.
-@constant kSENSE_FILEMARK_Set
-Filemark bit is set.
-@constant kSENSE_FILEMARK_Not_Set
-Filemark bit is not set.
-@constant kSENSE_FILEMARK_Mask
-Mask to use when checking the SENSE_KEY field for the FILEMARK bit.
-*/
-enum
-{
-	kSENSE_FILEMARK_Set										= 0x80,
-	kSENSE_FILEMARK_Not_Set 								= 0x00,
-	kSENSE_FILEMARK_Mask 									= 0x80
-};
-
-
-/*!
-@enum EOM bit field definitions
-@discussion
-Masks and values to determine the End Of Medium bit field.
-@constant kSENSE_EOM_Set
-End Of Medium bit is set.
-@constant kSENSE_EOM_Not_Set
-End Of Medium bit is not set.
-@constant kSENSE_EOM_Mask
-Mask to use when checking the SENSE_KEY field for the EOM bit.
-*/
-enum
-{
-	kSENSE_EOM_Set											= 0x40,
-	kSENSE_EOM_Not_Set 										= 0x00,
-	kSENSE_EOM_Mask 										= 0x40
-};
-
-
-/*!
-@enum ILI bit field definitions
-@discussion
-Masks and values to determine the Incorrect Length Indicator bit field.
-@constant kSENSE_ILI_Set
-Incorrect Length Indicator bit is set.
-@constant kSENSE_ILI_Not_Set
-Incorrect Length Indicator bit is not set.
-@constant kSENSE_ILI_Mask
-Mask to use when checking the SENSE_KEY field for the ILI bit.
-*/
-enum
-{
-	kSENSE_ILI_Set											= 0x20,
-	kSENSE_ILI_Not_Set 										= 0x00,
-	kSENSE_ILI_Mask 										= 0x20
-};
-
-
-/*!
-@enum Sense Key definitions
-@discussion
-Masks and values to determine the SENSE_KEY.
-@constant kSENSE_KEY_NO_SENSE
-No sense data is present.
-@constant kSENSE_KEY_RECOVERED_ERROR
-A recovered error has occurred.
-@constant kSENSE_KEY_NOT_READY
-Device server is not ready.
-@constant kSENSE_KEY_MEDIUM_ERROR
-Device server detected a medium error.
-@constant kSENSE_KEY_HARDWARE_ERROR
-Device server detected a hardware error.
-@constant kSENSE_KEY_ILLEGAL_REQUEST
-Device server detected an illegal request.
-@constant kSENSE_KEY_UNIT_ATTENTION
-Device server indicates a unit attention condition.
-@constant kSENSE_KEY_DATA_PROTECT
-Device server indicates a data protect condition.
-@constant kSENSE_KEY_BLANK_CHECK
-Device server indicates a blank check condition.
-@constant kSENSE_KEY_VENDOR_SPECIFIC
-Device server indicates a vendor specific condition.
-@constant kSENSE_KEY_COPY_ABORTED
-Device server indicates a copy aborted condition.
-@constant kSENSE_KEY_ABORTED_COMMAND
-Device server indicates an aborted command condition.
-@constant kSENSE_KEY_VOLUME_OVERFLOW
-Device server indicates a volume overflow condition.
-@constant kSENSE_KEY_MISCOMPARE
-Device server indicates a miscompare condition.
-@constant kSENSE_KEY_Mask
-Mask to use when checking the SENSE_KEY field for the SENSE_KEY value.
-*/
-enum
-{
-	kSENSE_KEY_NO_SENSE										= 0x00,
-	kSENSE_KEY_RECOVERED_ERROR								= 0x01,
-	kSENSE_KEY_NOT_READY									= 0x02,
-	kSENSE_KEY_MEDIUM_ERROR									= 0x03,
-	kSENSE_KEY_HARDWARE_ERROR								= 0x04,
-	kSENSE_KEY_ILLEGAL_REQUEST								= 0x05,
-	kSENSE_KEY_UNIT_ATTENTION								= 0x06,
-	kSENSE_KEY_DATA_PROTECT									= 0x07,
-	kSENSE_KEY_BLANK_CHECK									= 0x08,
-	kSENSE_KEY_VENDOR_SPECIFIC								= 0x09,
-	kSENSE_KEY_COPY_ABORTED									= 0x0A,
-	kSENSE_KEY_ABORTED_COMMAND								= 0x0B,
-	/* SENSE KEY 0x0C is obsoleted */
-	kSENSE_KEY_VOLUME_OVERFLOW								= 0x0D,
-	kSENSE_KEY_MISCOMPARE									= 0x0E,
-	/* SENSE KEY 0x0F is reserved */
-	kSENSE_KEY_Mask 										= 0x0F
-};
-
-
-#endif	/* _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICommandDefinitions.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICommandDefinitions.h.svn-base
deleted file mode 100644
index d33aed6..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/SCSICommandDefinitions.h.svn-base
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * Copyright (c) 2001-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_COMMAND_DEFINITIONS_H_
-#define _IOKIT_SCSI_COMMAND_DEFINITIONS_H_
-
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSICommandDefinitions
-	@discussion
-	This file contains all the definitions for types and constants that are
-	used by the command set classes for building CDBs. The field type
-	definitions are used for the parameters passed to a method that builds and
-	sends any SCSI defined command to clearly identify the type of value
-	expected for a parameter.
-	
-	The command methods will then use the appropriate mask to verify that the
-	value passed into a parameter is of the specified type.
-	
-	Currently only types and masks are defined for 8 bytes and smaller fields.
-	If a command is defined that uses a larger field, these should be expanded
-	to include those sizes.
-*/ 
-
-#pragma mark Field Type Definitions
-/* These are the type definitions used for the parameters of methods that
- * build and send Command Descriptor Blocks.
- */
-
-/* 1 Byte or smaller fields. */
-
-/*! @typedef SCSICmdField1Bit */
-typedef UInt8	SCSICmdField1Bit;
-
-/*! @typedef SCSICmdField2Bit */
-typedef UInt8	SCSICmdField2Bit;
-
-/*! @typedef SCSICmdField3Bit */
-typedef UInt8	SCSICmdField3Bit;
-
-/*! @typedef SCSICmdField4Bit */
-typedef UInt8	SCSICmdField4Bit;
-
-/*! @typedef SCSICmdField5Bit */
-typedef UInt8	SCSICmdField5Bit;
-
-/*! @typedef SCSICmdField6Bit */
-typedef UInt8	SCSICmdField6Bit;
-
-/*! @typedef SCSICmdField7Bit */
-typedef UInt8	SCSICmdField7Bit;
-
-/*! @typedef SCSICmdField1Byte */
-typedef UInt8	SCSICmdField1Byte;
-
-/* 2 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField9Bit */
-typedef UInt16	SCSICmdField9Bit;
-
-/*! @typedef SCSICmdField10Bit */
-typedef UInt16	SCSICmdField10Bit;
-
-/*! @typedef SCSICmdField11Bit */
-typedef UInt16	SCSICmdField11Bit;
-
-/*! @typedef SCSICmdField12Bit */
-typedef UInt16	SCSICmdField12Bit;
-
-/*! @typedef SCSICmdField13Bit */
-typedef UInt16	SCSICmdField13Bit;
-
-/*! @typedef SCSICmdField14Bit */
-typedef UInt16	SCSICmdField14Bit;
-
-/*! @typedef SCSICmdField15Bit */
-typedef UInt16	SCSICmdField15Bit;
-
-/*! @typedef SCSICmdField2Byte */
-typedef UInt16	SCSICmdField2Byte;
-
-/* 3 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField17Bit */
-typedef UInt32	SCSICmdField17Bit;
-
-/*! @typedef SCSICmdField18Bit */
-typedef UInt32	SCSICmdField18Bit;
-
-/*! @typedef SCSICmdField19Bit */
-typedef UInt32	SCSICmdField19Bit;
-
-/*! @typedef SCSICmdField20Bit */
-typedef UInt32	SCSICmdField20Bit;
-
-/*! @typedef SCSICmdField21Bit */
-typedef UInt32	SCSICmdField21Bit;
-
-/*! @typedef SCSICmdField22Bit */
-typedef UInt32	SCSICmdField22Bit;
-
-/*! @typedef SCSICmdField23Bit */
-typedef UInt32	SCSICmdField23Bit;
-
-/*! @typedef SCSICmdField3Byte */
-typedef UInt32	SCSICmdField3Byte;
-
-/* 4 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField25Bit */
-typedef UInt32	SCSICmdField25Bit;
-
-/*! @typedef SCSICmdField26Bit */
-typedef UInt32	SCSICmdField26Bit;
-
-/*! @typedef SCSICmdField27Bit */
-typedef UInt32	SCSICmdField27Bit;
-
-/*! @typedef SCSICmdField28Bit */
-typedef UInt32	SCSICmdField28Bit;
-
-/*! @typedef SCSICmdField29Bit */
-typedef UInt32	SCSICmdField29Bit;
-
-/*! @typedef SCSICmdField30Bit */
-typedef UInt32	SCSICmdField30Bit;
-
-/*! @typedef SCSICmdField31Bit */
-typedef UInt32	SCSICmdField31Bit;
-
-/*! @typedef SCSICmdField4Byte */
-typedef UInt32	SCSICmdField4Byte;
-
-/* 5 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField33Bit */
-typedef UInt64	SCSICmdField33Bit;
-
-/*! @typedef SCSICmdField34Bit */
-typedef UInt64	SCSICmdField34Bit;
-
-/*! @typedef SCSICmdField35Bit */
-typedef UInt64	SCSICmdField35Bit;
-
-/*! @typedef SCSICmdField36Bit */
-typedef UInt64	SCSICmdField36Bit;
-
-/*! @typedef SCSICmdField37Bit */
-typedef UInt64	SCSICmdField37Bit;
-
-/*! @typedef SCSICmdField38Bit */
-typedef UInt64	SCSICmdField38Bit;
-
-/*! @typedef SCSICmdField39Bit */
-typedef UInt64	SCSICmdField39Bit;
-
-/*! @typedef SCSICmdField5Byte */
-typedef UInt64	SCSICmdField5Byte;
-
-/* 6 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField41Bit */
-typedef UInt64	SCSICmdField41Bit;
-
-/*! @typedef SCSICmdField42Bit */
-typedef UInt64	SCSICmdField42Bit;
-
-/*! @typedef SCSICmdField43Bit */
-typedef UInt64	SCSICmdField43Bit;
-
-/*! @typedef SCSICmdField44Bit */
-typedef UInt64	SCSICmdField44Bit;
-
-/*! @typedef SCSICmdField45Bit */
-typedef UInt64	SCSICmdField45Bit;
-
-/*! @typedef SCSICmdField46Bit */
-typedef UInt64	SCSICmdField46Bit;
-
-/*! @typedef SCSICmdField47Bit */
-typedef UInt64	SCSICmdField47Bit;
-
-/*! @typedef SCSICmdField6Byte */
-typedef UInt64	SCSICmdField6Byte;
-
-/* 7 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField49Bit */
-typedef UInt64	SCSICmdField49Bit;
-
-/*! @typedef SCSICmdField50Bit */
-typedef UInt64	SCSICmdField50Bit;
-
-/*! @typedef SCSICmdField51Bit */
-typedef UInt64	SCSICmdField51Bit;
-
-/*! @typedef SCSICmdField52Bit */
-typedef UInt64	SCSICmdField52Bit;
-
-/*! @typedef SCSICmdField53Bit */
-typedef UInt64	SCSICmdField53Bit;
-
-/*! @typedef SCSICmdField54Bit */
-typedef UInt64	SCSICmdField54Bit;
-
-/*! @typedef SCSICmdField55Bit */
-typedef UInt64	SCSICmdField55Bit;
-
-/*! @typedef SCSICmdField7Byte */
-typedef UInt64	SCSICmdField7Byte;
-
-/* 8 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField57Bit */
-typedef UInt64	SCSICmdField57Bit;
-
-/*! @typedef SCSICmdField58Bit */
-typedef UInt64	SCSICmdField58Bit;
-
-/*! @typedef SCSICmdField59Bit */
-typedef UInt64	SCSICmdField59Bit;
-
-/*! @typedef SCSICmdField60Bit */
-typedef UInt64	SCSICmdField60Bit;
-
-/*! @typedef SCSICmdField61Bit */
-typedef UInt64	SCSICmdField61Bit;
-
-/*! @typedef SCSICmdField62Bit */
-typedef UInt64	SCSICmdField62Bit;
-
-/*! @typedef SCSICmdField63Bit */
-typedef UInt64	SCSICmdField63Bit;
-
-/*! @typedef SCSICmdField8Byte */
-typedef UInt64	SCSICmdField8Byte;
-
-
-#pragma mark Field Mask Definitions
-/* These are masks that are used to verify that the values passed into the
- * parameters for the fields are not larger than the field size.
- *
- * NB: These have changed from enums to #define since enums greater than
- * 32 bits in size are not well-defined in C99.
- */
-
-/* 1 Byte or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask1Bit */
-#define 	kSCSICmdFieldMask1Bit		0x01
-
-/*! @constant kSCSICmdFieldMask2Bit */
-#define 	kSCSICmdFieldMask2Bit		0x03
-
-/*! @constant kSCSICmdFieldMask3Bit */
-#define 	kSCSICmdFieldMask3Bit		0x07
-
-/*! @constant kSCSICmdFieldMask4Bit */
-#define 	kSCSICmdFieldMask4Bit		0x0F
-
-/*! @constant kSCSICmdFieldMask5Bit */
-#define 	kSCSICmdFieldMask5Bit		0x1F
-
-/*! @constant kSCSICmdFieldMask6Bit */
-#define 	kSCSICmdFieldMask6Bit		0x3F
-
-/*! @constant kSCSICmdFieldMask7Bit */
-#define 	kSCSICmdFieldMask7Bit		0x7F
-
-#define 	kSCSICmdFieldMask1Byte		0xFF
-
-/* 2 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask9Bit */
-#define 	kSCSICmdFieldMask9Bit		0x01FF
-
-/*! @constant kSCSICmdFieldMask10Bit */
-#define 	kSCSICmdFieldMask10Bit		0x03FF
-
-/*! @constant kSCSICmdFieldMask11Bit */
-#define 	kSCSICmdFieldMask11Bit		0x07FF
-
-/*! @constant kSCSICmdFieldMask12Bit */
-#define 	kSCSICmdFieldMask12Bit		0x0FFF
-
-/*! @constant kSCSICmdFieldMask13Bit */
-#define 	kSCSICmdFieldMask13Bit		0x1FFF
-
-/*! @constant kSCSICmdFieldMask14Bit */
-#define 	kSCSICmdFieldMask14Bit		0x3FFF
-
-/*! @constant kSCSICmdFieldMask15Bit */
-#define 	kSCSICmdFieldMask15Bit		0x7FFF
-
-/*! @constant kSCSICmdFieldMask2Byte */
-#define 	kSCSICmdFieldMask2Byte		0xFFFF
-
-/* 3 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask17Bit */
-#define 	kSCSICmdFieldMask17Bit		0x01FFFF
-
-/*! @constant kSCSICmdFieldMask18Bit */
-#define 	kSCSICmdFieldMask18Bit		0x03FFFF
-
-/*! @constant kSCSICmdFieldMask19Bit */
-#define 	kSCSICmdFieldMask19Bit		0x07FFFF
-
-/*! @constant kSCSICmdFieldMask20Bit */
-#define 	kSCSICmdFieldMask20Bit		0x0FFFFF
-
-/*! @constant kSCSICmdFieldMask21Bit */
-#define 	kSCSICmdFieldMask21Bit		0x1FFFFF
-
-/*! @constant kSCSICmdFieldMask22Bit */
-#define 	kSCSICmdFieldMask22Bit		0x3FFFFF
-
-/*! @constant kSCSICmdFieldMask23Bit */
-#define 	kSCSICmdFieldMask23Bit		0x7FFFFF
-
-/*! @constant kSCSICmdFieldMask3Byte */
-#define 	kSCSICmdFieldMask3Byte		0xFFFFFF
-
-/* 4 Bytes or smaller fields. */
-/*! @constant kSCSICmdFieldMask25Bit */
-#define 	kSCSICmdFieldMask25Bit		0x01FFFFFFUL
-
-/*! @constant kSCSICmdFieldMask26Bit */
-#define 	kSCSICmdFieldMask26Bit		0x03FFFFFFUL
-
-/*! @constant kSCSICmdFieldMask27Bit */
-#define 	kSCSICmdFieldMask27Bit		0x07FFFFFFUL
-
-/*! @constant kSCSICmdFieldMask28Bit */
-#define 	kSCSICmdFieldMask28Bit		0x0FFFFFFFUL
-
-/*! @constant kSCSICmdFieldMask29Bit */
-#define 	kSCSICmdFieldMask29Bit		0x1FFFFFFFUL
-
-/*! @constant kSCSICmdFieldMask30Bit */
-#define 	kSCSICmdFieldMask30Bit		0x3FFFFFFFUL
-
-/*! @constant kSCSICmdFieldMask31Bit */
-#define 	kSCSICmdFieldMask31Bit		0x7FFFFFFFUL
-
-/*! @constant kSCSICmdFieldMask4Byte */
-#define 	kSCSICmdFieldMask4Byte		0xFFFFFFFFUL
-
-/* 5 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask33Bit */
-#define 	kSCSICmdFieldMask33Bit		0x01FFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask34Bit */
-#define 	kSCSICmdFieldMask34Bit		0x03FFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask35Bit */
-#define 	kSCSICmdFieldMask35Bit		0x07FFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask36Bit */
-#define 	kSCSICmdFieldMask36Bit		0x0FFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask37Bit */
-#define 	kSCSICmdFieldMask37Bit		0x1FFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask38Bit */
-#define 	kSCSICmdFieldMask38Bit		0x3FFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask39Bit */
-#define 	kSCSICmdFieldMask39Bit		0x7FFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask5Byte */
-#define 	kSCSICmdFieldMask5Byte		0xFFFFFFFFFFULL
-
-/* 6 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask41Bit */
-#define 	kSCSICmdFieldMask41Bit		0x01FFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask42Bit */
-#define 	kSCSICmdFieldMask42Bit		0x03FFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask43Bit */
-#define 	kSCSICmdFieldMask43Bit		0x07FFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask44Bit */
-#define 	kSCSICmdFieldMask44Bit		0x0FFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask45Bit */
-#define 	kSCSICmdFieldMask45Bit		0x1FFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask46Bit */
-#define 	kSCSICmdFieldMask46Bit		0x3FFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask47Bit */
-#define 	kSCSICmdFieldMask47Bit		0x7FFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask6Byte */
-#define 	kSCSICmdFieldMask6Byte		0xFFFFFFFFFFFFULL
-
-/* 7 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask49Bit */
-#define 	kSCSICmdFieldMask49Bit		0x01FFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask50Bit */
-#define 	kSCSICmdFieldMask50Bit		0x03FFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask51Bit */
-#define 	kSCSICmdFieldMask51Bit		0x07FFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask52Bit */
-#define 	kSCSICmdFieldMask52Bit		0x0FFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask53Bit */
-#define 	kSCSICmdFieldMask53Bit		0x1FFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask54Bit */
-#define 	kSCSICmdFieldMask54Bit		0x3FFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask55Bit */
-#define 	kSCSICmdFieldMask55Bit		0x7FFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask7Byte */
-#define 	kSCSICmdFieldMask7Byte		0xFFFFFFFFFFFFFFULL
-
-/* 8 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask57Bit */
-#define 	kSCSICmdFieldMask57Bit		0x01FFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask58Bit */
-#define 	kSCSICmdFieldMask58Bit		0x03FFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask59Bit */
-#define 	kSCSICmdFieldMask59Bit		0x07FFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask60Bit */
-#define 	kSCSICmdFieldMask60Bit		0x0FFFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask61Bit */
-#define 	kSCSICmdFieldMask61Bit		0x1FFFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask62Bit */
-#define 	kSCSICmdFieldMask62Bit		0x3FFFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask63Bit */
-#define 	kSCSICmdFieldMask63Bit		0x7FFFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask8Byte */
-#define 	kSCSICmdFieldMask8Byte		0xFFFFFFFFFFFFFFFFULL
-
-#endif	/* _IOKIT_SCSI_COMMAND_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSICommandOperationCodes.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSICommandOperationCodes.h.svn-base
deleted file mode 100644
index 21d9d1e..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/SCSICommandOperationCodes.h.svn-base
+++ /dev/null
@@ -1,941 +0,0 @@
-/*
- * Copyright (c) 2001-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _SCSI_COMMAND_OPERATION_CODES_H_
-#define _SCSI_COMMAND_OPERATION_CODES_H_
-
-#pragma mark About this file
-/* This file contains the operation code definitions for all commands defined
- * by the SCSI specifications.  The commands are listed in three formats:
- * 1) All commands are listed in alphabetical order.  This list is the live
- * enumeration for all of the command constants.
- * 2) The commands are listed in ascending numerical order.
- * 3) The commands are grouped by Peripheral Device Type.
- * 
- * In the command listings by Peripheral Device Type, there will be a comment
- * following each command.  This comment indentifies the section of the related
- * specification where the commands is defined and the requirement type of the
- * command, Mandatory or Optional.
- * If a specification redefines an optional command from SPC as mandatory,
- * the command will be relisted in the Peripheral Device Type command list with
- * the mandatory tag next to it.
- * All commands that are listed in SPC as Device Type Specifc will be relisted
- * as a comment in all specifications lists that support that command with the
- * appropriate Mandatory or Optional tag for that specification.
- *
- * The section number and the requirement type of the command are based on the 
- * version of the specification listed in the header comment for the Peripheral
- * Device Type.  This data is provided for informational purposes only.  The 
- * specification document and version that the device adheres to as indicated 
- * by the data returned in response to the INQUIRY command should be used as
- * the authorative source for supported and required behavior of the device.
- * 
- * The SPC set is listed before all other Peripheral Device Type commands as
- * this is the base document from which all of the other documents are derived.  
- *
- * The Peripheral Device Types and associated command sets as defined by SPC-2,
- * section 7.4.1 are as follows:
- *  Peripheral Device Type                  Associated Command Specification
- *  ------------------------------------    -----------------------------------
- *  0x00 Direct Access Device               SBC - SCSI-3 Block Commands
- *  0x01 Sequential Access Device           SSC - SCSI-3 Stream Commands
- *  0x02 Printer Device                     SSC - SCSI-3 Stream Commands
- *  0x03 Processor Device                   SPC - SCSI Primary Commands-2
- *  0x04 Write Once Device                  SBC - SCSI-3 Block Commands
- *  0x05 CD-ROM Device                      MMC - SCSI Multimedia Commands-2
- *  0x06 Scanner Device                     SGC - SCSI-3 Graphics Commands
- *  0x07 Optical Memory Device              SBC - SCSI-3 Block Commands
- *  0x08 Medium Changer Device              SMC - SCSI-3 Medium Changer Cmds
- *  0x09 Communications Device              SSC - SCSI-3 Stream Commands
- *  0x0A - 0x0B Graphic Arts Prepress Dev   ASC IT8
- *  0x0C Storage Array Controller Device    SCC-2 - SCSI Controller Commands-2
- *  0x0D Enclosure Services                 SES - SCSI-3 Enclosure Services
- *  0x0E Simplified Direct Access Device    RBC - SCSI Reduced Block Commands
- *  0x0F Optical Card Reader/Writer Device  OCRW - SCSI Specification for 
- *                                              Optical Card Reader/Writer
- *  0x10 Reserved                    		No command specification
- *	0x11 Object-Based Storage Device		OSD - SCSI Object Based Storage 
- *												Device Commands
- *  0x12 - 0x14 Reserved                    No command specification
- *  0x15 Multimedia Media Access Engine     RMC - Reduced Multimedia Commands
- *  0x16 - 0x1E Reserved                    No command specification
- *  0x1F Unknown or No Device               No command specification
- */ 
-
-#pragma mark -
-#pragma mark Command Definitions by Name
-/* All SCSI Commands listed in alphabetical order.  These are the live
- * definitions of the commands.  All other command lists are informative.
- */
-enum 
-{
-    kSCSICmd_ACCESS_CONTROL_IN              = 0x86,
-    kSCSICmd_ACCESS_CONTROL_OUT             = 0x87,
-    kSCSICmd_BLANK                          = 0xA1,
-    kSCSICmd_CHANGE_DEFINITION              = 0x40,
-    kSCSICmd_CLOSE_TRACK_SESSION            = 0x5B,
-    kSCSICmd_COMPARE                        = 0x39,
-    kSCSICmd_COPY                           = 0x18,
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A,
-    kSCSICmd_ERASE_10						= 0x2C,
-    kSCSICmd_ERASE_12						= 0xAC,
-    kSCSICmd_EXTENDED_COPY                  = 0x83,
-    kSCSICmd_FORMAT_UNIT                    = 0x04,
-    kSCSICmd_GET_CONFIGURATION              = 0x46,
-    kSCSICmd_GET_EVENT_STATUS_NOTIFICATION  = 0x4A,
-    kSCSICmd_GET_PERFORMANCE                = 0xAC,
-    kSCSICmd_INQUIRY                        = 0x12,
-    kSCSICmd_LOAD_UNLOAD_MEDIUM             = 0xA6,
-    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36,
-    kSCSICmd_LOCK_UNLOCK_CACHE_16           = 0x92,
-    kSCSICmd_LOG_SELECT                     = 0x4C,
-    kSCSICmd_LOG_SENSE                      = 0x4D,
-    kSCSICmd_MAINTENANCE_IN               	= 0xA3,
-    kSCSICmd_MAINTENANCE_OUT                = 0xA4,
-    kSCSICmd_MECHANISM_STATUS               = 0xBD,
-    kSCSICmd_MEDIUM_SCAN                    = 0x38,
-    kSCSICmd_MODE_SELECT_6                  = 0x15,
-    kSCSICmd_MODE_SELECT_10                 = 0x55,
-    kSCSICmd_MODE_SENSE_6                   = 0x1A,
-    kSCSICmd_MODE_SENSE_10                  = 0x5A,
-    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7,
-    kSCSICmd_PAUSE_RESUME                   = 0x4B,
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E,
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F,
-    kSCSICmd_PLAY_AUDIO_10                  = 0x45,
-    kSCSICmd_PLAY_AUDIO_12                  = 0xA5,
-    kSCSICmd_PLAY_AUDIO_MSF                 = 0x47,
-    kSCSICmd_PLAY_AUDIO_TRACK_INDEX         = 0x48,
-    kSCSICmd_PLAY_CD                        = 0xBC,
-    kSCSICmd_PLAY_RELATIVE_10               = 0x49,
-    kSCSICmd_PLAY_RELATIVE_12               = 0xA9,
-    kSCSICmd_PREFETCH                       = 0x34,
-    kSCSICmd_PREFETCH_16                    = 0x90,
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E,
-    kSCSICmd_READ_6                         = 0x08,
-    kSCSICmd_READ_10                        = 0x28,
-    kSCSICmd_READ_12                        = 0xA8,
-    kSCSICmd_READ_16                        = 0x88,
-    kSCSICmd_READ_ATTRIBUTE                 = 0x8C,
-    kSCSICmd_READ_BUFFER                    = 0x3C,
-    kSCSICmd_READ_BUFFER_CAPACITY           = 0x5C,
-    kSCSICmd_READ_CAPACITY                  = 0x25,
-    kSCSICmd_READ_CD                        = 0xBE,
-    kSCSICmd_READ_CD_MSF                    = 0xB9,
-    kSCSICmd_READ_DEFECT_DATA_10            = 0x37,
-    kSCSICmd_READ_DEFECT_DATA_12            = 0xB7,
-    kSCSICmd_READ_DISC_INFORMATION          = 0x51,
-    kSCSICmd_READ_DVD_STRUCTURE             = 0xAD,
-    kSCSICmd_READ_DISC_STRUCTURE            = 0xAD,
-    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4,
-    kSCSICmd_READ_FORMAT_CAPACITIES         = 0x23,
-    kSCSICmd_READ_GENERATION				= 0x29,
-    kSCSICmd_READ_HEADER                    = 0x44,
-    kSCSICmd_READ_LONG                      = 0x3E,
-    kSCSICmd_READ_MASTER_CUE                = 0x59,
-    kSCSICmd_READ_SUB_CHANNEL               = 0x42,
-    kSCSICmd_READ_TOC_PMA_ATIP              = 0x43,
-    kSCSICmd_READ_TRACK_INFORMATION         = 0x52,
-    kSCSICmd_READ_UPDATED_BLOCK_10			= 0x2D,
-    kSCSICmd_REASSIGN_BLOCKS                = 0x07,
-    kSCSICmd_REBUILD                        = 0x81,
-    kSCSICmd_RECEIVE                        = 0x08,
-    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84,
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C,
-    kSCSICmd_REDUNDANCY_GROUP_IN			= 0xBA,
-    kSCSICmd_REDUNDANCY_GROUP_OUT			= 0xBB,
-    kSCSICmd_REGENERATE                     = 0x82,
-    kSCSICmd_RELEASE_6                      = 0x17,
-    kSCSICmd_RELEASE_10                     = 0x57,
-    kSCSICmd_REPAIR_TRACK                   = 0x58,
-    kSCSICmd_REPORT_DEVICE_IDENTIFIER    	= 0xA3,
-    kSCSICmd_REPORT_KEY                     = 0xA4,
-    kSCSICmd_REPORT_LUNS                    = 0xA0, 
-    kSCSICmd_REQUEST_SENSE                  = 0x03,
-    kSCSICmd_RESERVE_6                      = 0x16,
-    kSCSICmd_RESERVE_10                     = 0x56,
-    kSCSICmd_RESERVE_TRACK                  = 0x53,
-    kSCSICmd_REZERO_UNIT                    = 0x01,
-    kSCSICmd_SCAN_MMC                       = 0xBA,
-    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31,
-    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1,
-    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30,
-    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0,
-    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32,
-    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2,
-    kSCSICmd_SEEK_6                         = 0x0B,
-    kSCSICmd_SEEK_10                        = 0x2B,
-    kSCSICmd_SEND                           = 0x0A,
-    kSCSICmd_SEND_CUE_SHEET                 = 0x5D,
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D,
-    kSCSICmd_SEND_DVD_STRUCTURE             = 0xBF,
-    kSCSICmd_SEND_EVENT                     = 0xA2,
-    kSCSICmd_SEND_KEY                       = 0xA3,
-    kSCSICmd_SEND_OPC_INFORMATION           = 0x54,
-    kSCSICmd_SERVICE_ACTION_IN		        = 0x9E,
-    kSCSICmd_SERVICE_ACTION_OUT		        = 0x9F,
-    kSCSICmd_SET_CD_SPEED                   = 0xBB,
-    kSCSICmd_SET_DEVICE_IDENTIFIER      	= 0xA4,
-    kSCSICmd_SET_LIMITS_10                  = 0x33,
-    kSCSICmd_SET_LIMITS_12                  = 0xB3,
-    kSCSICmd_SET_READ_AHEAD                 = 0xA7,
-    kSCSICmd_SET_STREAMING                  = 0xB6,
-    kSCSICmd_SPARE_IN		                = 0xBC,
-    kSCSICmd_SPARE_OUT		                = 0xBD,
-    kSCSICmd_START_STOP_UNIT                = 0x1B,
-    kSCSICmd_STOP_PLAY_SCAN                 = 0x4E,
-    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35,
-    kSCSICmd_SYNCHRONIZE_CACHE_16           = 0x91,
-    kSCSICmd_TEST_UNIT_READY                = 0x00,
-	kSCSICmd_UPDATE_BLOCK					= 0x3D,
-    kSCSICmd_VERIFY_10                      = 0x2F,
-    kSCSICmd_VERIFY_12                      = 0xAF,
-    kSCSICmd_VERIFY_16                      = 0x8F,
-    kSCSICmd_VOLUME_SET_IN                  = 0xBE,
-    kSCSICmd_VOLUME_SET_OUT                 = 0xBF,
-    kSCSICmd_WRITE_6                        = 0x0A,
-    kSCSICmd_WRITE_10                       = 0x2A,
-    kSCSICmd_WRITE_12                       = 0xAA,
-    kSCSICmd_WRITE_16                       = 0x8A,
-    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E,
-	kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE,
-	kSCSICmd_WRITE_AND_VERIFY_16            = 0x8E,
-	kSCSICmd_WRITE_ATTRIBUTE	            = 0x8D,
-    kSCSICmd_WRITE_BUFFER                   = 0x3B,
-    kSCSICmd_WRITE_LONG                     = 0x3F,
-    kSCSICmd_WRITE_SAME                     = 0x41,
-    kSCSICmd_WRITE_SAME_16                  = 0x93,
-    kSCSICmd_XDREAD                         = 0x52,
-    kSCSICmd_XDWRITE                        = 0x50,
-    kSCSICmd_XDWRITE_EXTENDED               = 0x80,
-    kSCSICmd_XDWRITEREAD_10           		= 0x53,
-    kSCSICmd_XPWRITE                        = 0x51,
-    
-    kSCSICmdVariableLengthCDB				= 0x7F
-};
-
-/* Service Action Definitions for the Variable Length CDB (7Fh) command */
-enum
-{
-	kSCSIServiceAction_READ_32				= 0x0009,
-	kSCSIServiceAction_VERIFY_32			= 0x000A,
-	kSCSIServiceAction_WRITE_32				= 0x000B,
-	kSCSIServiceAction_WRITE_AND_VERIFY_32	= 0x000C,
-	kSCSIServiceAction_WRITE_SAME_32		= 0x000D,
-	kSCSIServiceAction_XDREAD_32			= 0x0003,
-	kSCSIServiceAction_XDWRITE_32			= 0x0004,
-	kSCSIServiceAction_XDWRITEREAD_32		= 0x0007,
-	kSCSIServiceAction_XPWRITE_32			= 0x0006
-};
-
-/* Service Action Definitions for the MAINTENANCE IN (A3h) command */
-enum
-{
-	kSCSIServiceAction_REPORT_ALIASES								= 0x0B,
-	kSCSIServiceAction_REPORT_DEVICE_IDENTIFIER						= 0x05,
-	kSCSIServiceAction_REPORT_PRIORITY								= 0x0E,
-	kSCSIServiceAction_REPORT_SUPPORTED_OPERATION_CODES				= 0x0C,
-	kSCSIServiceAction_REPORT_SUPPORTED_TASK_MANAGEMENT_FUNCTIONS	= 0x0D,
-	kSCSIServiceAction_REPORT_TARGET_PORT_GROUPS					= 0x0A
-};
-
-/* Service Action Definitions for the MAINTENANCE OUT (A4h) command */
-enum
-{
-	kSCSIServiceAction_CHANGE_ALIASES			= 0x0B,
-	kSCSIServiceAction_SET_DEVICE_IDENTIFIER	= 0x06,
-	kSCSIServiceAction_SET_PRIORITY				= 0x0E,
-	kSCSIServiceAction_SET_TARGET_PORT_GROUPS	= 0x0A	
-};
-
-/* Service Action Definitions for the SERVICE ACTION IN (9Eh) command */
-enum
-{
-	kSCSIServiceAction_READ_CAPACITY_16		= 0x10,
-	kSCSIServiceAction_READ_LONG_16			= 0x11	
-};
-
-/* Service Action Definitions for the SERVICE ACTION OUT (9Fh) command */
-enum
-{
-	kSCSIServiceAction_WRITE_LONG_16		= 0x11	
-};
-
-#pragma mark -
-#pragma mark Command Definitions by Number
-#if 0
-enum 
-{
-};
-#endif
-
-
-#pragma mark -
-#pragma mark All Types SPC Commands
-/* Commands defined by the T10:1236-D SCSI Primary Commands-2 (SPC-2) 
- * command specification.  The definitions and section numbers are based on
- * section 7 of the revision 18, 21 May 2000 version of the specification.
- *
- * These commands are defined for all devices.
- */
-#if 0
-enum 
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_COMPARE                        = 0x39, /* Sec. 7.2: Optional */
-    kSCSICmd_COPY                           = 0x18, /* Sec. 7.3: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* Sec. 7.4: Optional */
-    kSCSICmd_EXTENDED_COPY                  = 0x83, /* Sec. 7.5: Optional */
-    kSCSICmd_INQUIRY                        = 0x12, /* Sec. 7.6: Mandatory */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* Sec. 7.7: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* Sec. 7.8: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Sec. 7.9: Device Type
-                                                     * Specific */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Sec. 7.10: Device Type
-                                                     * Specific */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Sec. 7.11: Device Type
-                                                     * Specific */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Sec. 7.12: Device Type
-                                                     * Specific */
-    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* Defined in SMC */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Sec. 7.13: Device Type
-                                                     * Specific */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Sec. 7.14: Device Type
-                                                     * Specific */
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* Sec. 7.15: Device Type
-                                                     * Specific */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* Sec. 7.16: Optional */
-    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* Defined in SMC */
-    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84, /* Sec. 7.17: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Sec. 7.18: Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* Sec. 7.19: Device Type
-                                                     * Specific */
-    kSCSICmd_RELEASE_6                      = 0x17, /* Sec. 7.20: Device Type
-                                                     * Specific */
-    kSCSICmd_REPORT_DEVICE_IDENTIFIER    	= 0xA3, /* Sec. 7.21: Optional */
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Sec. 7.22: Mandatory for
-                                                     * LUN Supporting devices*/
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Sec. 7.23: Device Type
-                                                     * Specific */
-    kSCSICmd_RESERVE_10                     = 0x56, /* Sec. 7.24: Device Type
-                                                     * Specific */
-    kSCSICmd_RESERVE_6                      = 0x16, /* Sec. 7.25: Device Type
-                                                     * Specific */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Sec. 7.26: Optional */
-    kSCSICmd_SET_DEVICE_IDENTIFIER       	= 0xA4, /* Sec. 7.27: Optional */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Sec. 7.28: Mandatory */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Sec. 7.29: Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x00 SBC Direct Access Commands
-/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) command
- * specification.  The definitions and section numbers are based on section 6.1
- * of the revision 8c, 13 November 1997 version of the specification. 
- */
-#if 0
-enum
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional*/
-    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Sec. 6.1.1: Mandatory */
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36, /* Sec. 6.1.2: Optional */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
-    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* SMC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
-    kSCSICmd_PREFETCH                       = 0x34, /* Sec. 6.1.3: Optional */
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
-    kSCSICmd_READ_6                         = 0x08, /* Sec. 6.1.4: Mandatory */
-    kSCSICmd_READ_10                        = 0x28, /* Sec. 6.1.5: Mandatory */
-    kSCSICmd_READ_12                        = 0xA8, /* Sec. 6.2.4: Optional */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
-    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.6: Mandatory */
-    kSCSICmd_READ_DEFECT_DATA_10            = 0x37, /* Sec. 6.1.7: Optional */
-    kSCSICmd_READ_DEFECT_DATA_12            = 0xB7, /* Sec. 6.2.5: Optional */
-    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* SMC: Optional */
-    kSCSICmd_READ_GENERATION				= 0x29,	/* Sec. 6.2.6: Optional */
-    kSCSICmd_READ_LONG                      = 0x3E, /* Sec. 6.1.8: Optional */
-    kSCSICmd_READ_UPDATED_BLOCK_10			= 0x2D, /* Sec. 6.2.7: Optional */
-    kSCSICmd_REASSIGN_BLOCKS                = 0x07, /* Sec. 6.1.9: Optional */
-    kSCSICmd_REBUILD                        = 0x81, /* Sec. 6.1.10: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
-    kSCSICmd_REGENERATE                     = 0x82, /* Sec. 6.1.11: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Optional */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Optional */
-    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
-    kSCSICmd_REZERO_UNIT                    = 0x01, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
-    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
-    kSCSICmd_SEEK_10                        = 0x2B, /* Sec. 6.1.12: Optional */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
-    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Sec. 6.1.13: Optional */
-    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Sec. 6.2.8: Optional */
-    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Sec. 6.1.14: Optional */
-    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.15: Optional */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
-	kSCSICmd_UPDATE_BLOCK					= 0x3D,	/* Sec. 6.2.9: Optional */
-    kSCSICmd_VERIFY_10                      = 0x2F, /* Sec. 6.1.16: Optional */
-    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 6.1.17: Optional */
-    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.1.18: Optional */
-    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.2.13: Optional */
-    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.1.19: Optional */
-    kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE, /* Sec. 6.2.15: Optional */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
-    kSCSICmd_WRITE_LONG                     = 0x3F, /* Sec. 6.1.20: Optional */
-    kSCSICmd_WRITE_SAME                     = 0x41, /* Sec. 6.1.21: Optional */
-    kSCSICmd_XDREAD                         = 0x52, /* Sec. 6.1.22: Optional */
-    kSCSICmd_XDWRITE                        = 0x50, /* Sec. 6.1.23: Optional */
-    kSCSICmd_XDWRITE_EXTENDED               = 0x80, /* Sec. 6.1.24: Optional */
-    kSCSICmd_XPWRITE                        = 0x51  /* Sec. 6.1.25: Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x01 SSC Sequential Access Commands
-/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) command
- * specification.  The definitions and section numbers are based on section 5
- * of the revision 22, January 1, 2000 version of the specification. 
- */
-#if 0
-enum
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
-    kSCSICmd_ERASE                          = 0x19, /* Sec. 5.3.1: Mandatory */
-    kSCSICmd_FORMAT_MEDIUM                  = 0x04, /* Sec. 5.3.2: Optional */
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOAD_UNLOAD                    = 0x1B, /* Sec. 5.3.3: Optional */
-    kSCSICmd_LOCATE                         = 0x2B, /* Sec. 5.3.4: Optional */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
-    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* SMC: Optional */
-    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* SMC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
-    kSCSICmd_READ_6                         = 0x08, /* Sec. 5.3.5: Mandatory */
-    kSCSICmd_READ_BLOCK_LIMITS              = 0x05, /* Sec. 5.3.6: Mandatory */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
-    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* SMC: Optional */
-    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* SMC: Optional */
-    kSCSICmd_READ_POSITION                  = 0x34, /* Sec. 5.3.7: Mandatory */
-    kSCSICmd_READ_REVERSE                   = 0x0F, /* Sec. 5.3.8: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
-    kSCSICmd_RECOVER_BUFFERED_DATA          = 0x14, /* Sec. 5.3.9: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
-    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
-    kSCSICmd_REPORT_DENSITY_SUPPORT         = 0x44, /* Sec. 5.3.10: Mandatory*/
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Mandatory */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
-    kSCSICmd_REWIND                         = 0x01, /* Sec. 5.3.11: Mandatory*/
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
-    kSCSICmd_SPACE                          = 0x11, /* Sec. 5.3.12: Mandatory*/
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
-    kSCSICmd_VERIFY_6                       = 0x13, /* Sec. 5.3.13: Optional */
-    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 5.3.14: Mandatory*/
-    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
-    kSCSICmd_WRITE_FILEMARKS                = 0x10  /* Sec. 5.3.15: Mandatory*/
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x02 SSC Printer Commands
-/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) command
- * specification.  The definitions and section numbers are based on section 6
- * of the revision 22, January 1, 2000 version of the specification. 
- */
-#if 0
-enum 
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
-    kSCSICmd_FORMAT                         = 0x04, /* Sec. 6.2.1: Optional */
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
-    kSCSICmd_PRINT                          = 0x0A, /* Sec. 6.2.2: Mandatory */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
-    kSCSICmd_RECOVER_BUFFERED_DATA          = 0x14, /* Sec. 6.2.3: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
-    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Mandatory */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
-    kSCSICmd_SLEW_AND_PRINT                 = 0x0B, /* Sec. 6.2.4: Optional */
-    kSCSICmd_STOP_PRINT                     = 0x1B, /* Sec. 6.2.5: Optional */
-    kSCSICmd_SYNCHRONIZE_BUFFER             = 0x10, /* Sec. 6.2.6: Optional */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* SPC: Optional */
-};
-#endif
-  
-#pragma mark -
-#pragma mark 0x03 SPC Processor Commands
-/* Commands defined by the T10:1236-D SCSI Primary Commands-2 (SPC-2) 
- * command specification.  The definitions and section numbers are based on
- * section 9 of the revision 18, 21 May 2000 version of the specification.
- */
-#if 0
-enum 
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_COMPARE                        = 0x39, /* Sec. 7.2: Optional */
-    kSCSICmd_COPY                           = 0x18, /* Sec. 7.3: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* Sec. 7.4: Optional */
-    kSCSICmd_EXTENDED_COPY                  = 0x83, /* Sec. 7.5: Optional */
-    kSCSICmd_INQUIRY                        = 0x12, /* Sec. 7.6: Mandatory */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* Sec. 7.7: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* Sec. 7.8: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Sec. 7.13: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Sec. 7.14: Optional */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* Sec. 7.16: Optional */
-    kSCSICmd_RECEIVE                        = 0x08, /* Sec. 9.2: Optional */
-    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84, /* Sec. 7.17: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Sec. 7.18: Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* Sec. 7.19: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* Sec. 7.20: Optional */
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Sec. 7.22: Optional */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Sec. 7.23: Mandatory */
-    kSCSICmd_RESERVE_10                     = 0x56, /* Sec. 7.24: Optional */
-    kSCSICmd_RESERVE_6                      = 0x16, /* Sec. 7.25: Optional */
-    kSCSICmd_SEND                           = 0x0A, /* Sec. 9.3: Optional */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Sec. 7.26: Mandatory */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Sec. 7.27: Mandatory */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Sec. 7.29: Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x04 SBC Write Once Commands
-/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) command
- * specification.  The definitions and section numbers are based on section 6.3
- * of the revision 8c, 13 November 1997 version of the specification. 
- */
-#if 0
-enum
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* SPC: Optional */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional*/
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36, /* Sec. 6.1.2: Optional */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MEDIUM_SCAN                    = 0x38, /* Sec. 6.2.3: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
-    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* SMC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
-    kSCSICmd_PREFETCH                       = 0x34, /* Sec. 6.1.3: Optional */
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
-    kSCSICmd_READ_6                         = 0x08, /* Sec. 6.1.4: Optional */
-    kSCSICmd_READ_10                        = 0x28, /* Sec. 6.1.5: Mandatory */
-    kSCSICmd_READ_12                        = 0xA8, /* Sec. 6.2.4: Optional */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
-    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.6: Mandatory */
-    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* SMC: Optional */
-    kSCSICmd_READ_LONG                      = 0x3E, /* Sec. 6.1.8: Optional */
-    kSCSICmd_REASSIGN_BLOCKS                = 0x07, /* Sec. 6.1.9: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Optional */
-    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
-    kSCSICmd_REZERO_UNIT                    = 0x01, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2, /* Obsolete */
-    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
-    kSCSICmd_SEEK_10                        = 0x2B, /* Sec. 6.1.12: Optional */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
-    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Sec. 6.1.13: Optional */
-    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Sec. 6.2.8: Optional */
-    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Sec. 6.1.14: Optional */
-    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.15: Optional */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
-    kSCSICmd_VERIFY_10                      = 0x2F, /* Sec. 6.2.10: Optional */
-    kSCSICmd_VERIFY_12                      = 0xAF, /* Sec. 6.2.11: Optional */
-    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 6.1.17: Optional */
-    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.2.10: Mandatory*/
-    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.2.13: Optional */
-    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.2.14: Optional */
-    kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE, /* Sec. 6.2.15: Optional */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
-    kSCSICmd_WRITE_LONG                     = 0x3F  /* Sec. 6.1.20: Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x05 MMC CD-ROM Commands
-/* Commands defined by the T10:1363-D SCSI Multimedia Commands-3 (MMC-3) 
- * specification.  The definitions and section numbers are based on section 6.1
- * of the revision 01, March 03, 2000 version of the specification. 
- *
- * NOTE: The comments following each command may not be accurate.  These are
- * not from the MMC-3 specification, but have been derived from the SCSI-2 and
- * original MMC specifications.  Unlike the other SCSI command specifications,
- * MMC-2 and MMC-3 do not provide a command requirement type and therefore does
- * not relist the SPC commands with these requirements as they apply to MMC
- * devices.  The MMC-2 and MMC-3 specifications also refer back to the SBC
- * specification which seems invalid since MMC devices do not represent a
- * Peripheral Device Type defined by SBC.  It is assumed that the SBC
- * references refer to the Peripheral Device Type 0x00 - Direct Access Commands
- * definitions from that specification.
- */
-#if 0
-enum 
-{
-    kSCSICmd_BLANK                          = 0xA1, /* Sec. 6.1.1: */
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_CLOSE_TRACK_SESSION            = 0x5B, /* Sec. 6.1.2: */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
-    kSCSICmd_ERASE                          = 0x2C, /* SBC: */
-    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Sec. 6.1.3: */
-    kSCSICmd_GET_CONFIGURATION              = 0x46, /* Sec. 6.1.4: */
-    kSCSICmd_GET_EVENT_STATUS_NOTIFICATION  = 0x4A, /* Sec. 6.1.5: */
-    kSCSICmd_GET_PERFORMANCE                = 0xAC, /* Sec. 6.1.6: */
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOAD_UNLOAD_MEDIUM             = 0xA6, /* Sec. 6.1.7: */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MECHANISM_STATUS               = 0xBD, /* Sec. 6.1.8: */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Mandatory */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Mandatory */
-    kSCSICmd_PAUSE_RESUME                   = 0x4B, /* Sec. 6.1.9: */
-    kSCSICmd_PLAY_AUDIO_10                  = 0x45, /* Sec. 6.1.10: */
-    kSCSICmd_PLAY_AUDIO_12                  = 0xA5, /* Sec. 6.1.11: */
-    kSCSICmd_PLAY_AUDIO_MSF                 = 0x47, /* Sec. 6.1.12: */
-    kSCSICmd_PLAY_AUDIO_TRACK_INDEX         = 0x48, /* Obsolete */
-    kSCSICmd_PLAY_CD                        = 0xBC, /* Sec. 6.1.13: */
-    kSCSICmd_PLAY_RELATIVE_10               = 0x49, /* Obsolete */
-    kSCSICmd_PLAY_RELATIVE_12               = 0xA9, /* Obsolete */
-    kSCSICmd_PREFETCH                       = 0x34, /* Optional */
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* Optional */
-    kSCSICmd_READ_6                         = 0x08, /* Optional */
-    kSCSICmd_READ_10                        = 0x28, /* Mandatory */
-    kSCSICmd_READ_12                        = 0xA8, /* Optional */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* Optional */
-    kSCSICmd_READ_BUFFER_CAPACITY           = 0x5C, /* Sec. 6.1.15: */
-    kSCSICmd_READ_CD                        = 0xBE, /* Sec. 6.1.16: */
-    kSCSICmd_READ_CD_MSF                    = 0xB9, /* Sec. 6.1.17: */
-    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.18: */
-    kSCSICmd_READ_DISC_INFORMATION          = 0x51, /* Sec. 6.1.19: */
-    kSCSICmd_READ_DVD_STRUCTURE             = 0xAD, /* Sec. 6.1.20: */
-    kSCSICmd_READ_DISC_STRUCTURE            = 0xAD, /* Sec. 6.1.20: */
-    kSCSICmd_READ_FORMAT_CAPACITIES         = 0x23, /* Sec. 6.1.21: */
-    kSCSICmd_READ_HEADER                    = 0x44, /* Sec. 6.1.22: */
-    kSCSICmd_READ_LONG                      = 0x3E, /* Optional */
-    kSCSICmd_READ_MASTER_CUE                = 0x59, /* Sec. 6.1.23: */
-    kSCSICmd_READ_SUB_CHANNEL               = 0x42, /* Sec. 6.1.24: */
-    kSCSICmd_READ_TOC_PMA_ATIP              = 0x43, /* Sec. 6.1.25: */
-    kSCSICmd_READ_TRACK_INFORMATION         = 0x52, /* Sec. 6.1.27: */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* Mandatory */
-    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
-    kSCSICmd_REPAIR_TRACK                   = 0x58, /* Sec. 6.1.28: */
-    kSCSICmd_REPORT_KEY                     = 0xA4, /* Sec. 6.1.29: */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* Mandatory */
-    kSCSICmd_RESERVE_10                     = 0x56, /* Optional */
-    kSCSICmd_RESERVE_TRACK                  = 0x53, /* Sec. 6.1.30: */
-    kSCSICmd_SCAN_MMC                       = 0xBA, /* Sec. 6.1.31: */
-    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2, /* Obsolete */
-    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
-    kSCSICmd_SEEK_10                        = 0x2B, /* SBC: */
-    kSCSICmd_SEND_CUE_SHEET                 = 0x5D, /* Sec. 6.1.32: */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Mandatory */
-    kSCSICmd_SEND_DVD_STRUCTURE             = 0xBF, /* Sec. 6.1.33: */
-    kSCSICmd_SEND_EVENT                     = 0xA2, /* Sec. 6.1.34: */
-    kSCSICmd_SEND_KEY                       = 0xA3, /* Sec. 6.1.35: */
-    kSCSICmd_SEND_OPC_INFORMATION           = 0x54, /* Sec. 6.1.36: */
-    kSCSICmd_SET_CD_SPEED                   = 0xBB, /* Sec. 6.1.37: */
-    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Optional */
-    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Optional */
-    kSCSICmd_SET_READ_AHEAD                 = 0xA7, /* Sec. 6.1.38: */
-    kSCSICmd_SET_STREAMING                  = 0xB6, /* Sec. 6.1.39: */
-    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Optional */
-    kSCSICmd_STOP_PLAY_SCAN                 = 0x4E, /* Sec. 6.1.40: */
-    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.41: */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Mandatory */
-    kSCSICmd_VERIFY_10                      = 0x2F, /* Optional */
-    kSCSICmd_VERIFY_12                      = 0xAF, /* Optional */
-    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.1.42: */
-    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.1.43: */
-    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.1.44: */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x06 SGC Scanner Commands
-/* Commands defined by the T10:998-D SCSI-3 Graphics Commands (SGC)
- * specification.  The definitions and section numbers are based on section 6
- * of the revision 0, April 1995 version of the specification. 
- */
-#if 0
-enum 
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* SPC: Optional */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
-    kSCSICmd_GET_DATA_BUFFER_STATUS         = 0x34, /* Sec. 6.1.1: Optional */
-    kSCSICmd_GET_WINDOW                     = 0x25, /* Sec. 6.1.2: Optional */
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
-    kSCSICmd_OBJECT_POSITION                = 0x31, /* Sec. 6.1.3: Optional */
-    kSCSICmd_PORT_STATUS                    = 0x11, /* SPC (??): Mandatory
-                                                     * for dual port devices */
-    kSCSICmd_READ                           = 0x28, /* Sec. 6.1.4: Mandatory */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
-    kSCSICmd_SCAN                           = 0x1B, /* Sec. 6.1.5: Optional */
-    kSCSICmd_SEND                           = 0x1B, /* Sec. 6.1.6: Optional */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
-    kSCSICmd_SET_WINDOW                     = 0x24, /* Sec. 6.1.7: Mandatory */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* SPC: Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x07 SBC Optical Media Commands
-/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) 
- * (revision 8c, 13 November 1998) command specification.  
- */
-
-#pragma mark -
-#pragma mark 0x08 SMC Medium Changer Commands
-/* Commands defined by the T10:1228-D SCSI-3 Medium Changer Commands-2 (SMC-2)
- * (revision 0, March 16, 2000) command specification.  
- */
-#if 0
-enum
-{
-    /* Commands For Independent Medium Changers */
-    kSCSICmd_EXCHANGE_MEDIUM                = 0xA6, /* Optional */
-    kSCSICmd_INITIALIZE_ELEMENT_STATUS      = 0x07, /* Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
-    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* Mandatory */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
-    kSCSICmd_POSITION_TO_ELEMENT            = 0x2B, /* Optional */
-    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* Mandatory */
-    kSCSICmd_RELEASE_ELEMENT_6              = 0x16, /* Optional */
-    kSCSICmd_RELEASE_ELEMENT_10             = 0x56, /* Optional */
-    kSCSICmd_REQUEST_VOLUME_ELEMENT_ADDRESS = 0xB5, /* Optional */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
-    kSCSICmd_RESERVE_ELEMENT_6              = 0x16, /* Optional */
-    kSCSICmd_RESERVE_ELEMENT_10             = 0x56  /* Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x09 SSC Communications Commands
-/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) 
- * (revision 22, January 1, 2000) command specification. 
- */
-  
-#pragma mark -
-#pragma mark 0x0A ASC IT8 Prepress Commands
-#pragma mark 0x0B ASC IT8 Prepress Commands
-/* Commands defined by the ASC IT8 <title goes here> specification
- * (revision xx, month day, year) command specification.  
- */
-#if 0
-enum
-{
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x0C SCC Array Controller Commands
-/* Commands defined by the ANSI NCITS.318-199x SCSI Controller
- * Commands (SCC-2) ratified command specification.  
- */
-#if 0
-enum
-{
-    kSCSICmd_MAINTENANCE_IN                 = 0xA3, /* Mandatory */
-    kSCSICmd_MAINTENANCE_OUT                = 0xA4, /* Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
-    kSCSICmd_PORT_STATUS                    = 0x1F, /* Optional */
-    kSCSICmd_REDUNDANCY_GROUP_IN            = 0xBA, /* Mandatory */
-    kSCSICmd_REDUNDANCY_GROUP_OUT           = 0xBB, /* Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Mandatory */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* Optional */
-    kSCSICmd_RESERVE_10                     = 0x56, /* Optional*/
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Optional */
-    kSCSICmd_SPARE_IN                       = 0xBC, /* Mandatory */
-    kSCSICmd_SPARE_OUT                      = 0xBD  /* Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x0D SES Enclosure Services Commands
-/* Commands defined by the T10:1212-D SCSI-3 Enclosure Services (SES) 
- * (revision 8b, February 11, 1998) command specification.  
- */
-#if 0
-enum
-{
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x17, /* Mandatory */
-    kSCSICmd_RELEASE_6                      = 0x17, /* Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* Optional */
-    kSCSICmd_RESERVE_10                     = 0x56, /* Optional */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D  /* Mandatory */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x0E RBC Reduced Block Commands
-/* Commands defined by the T10:1240-D Reduced Block Commands (RBC) 
- * (revision 10a, August 18, 1999) command specification.  
- */
-#if 0
-enum
-{
-    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Optional */
-    kSCSICmd_READ_10                        = 0x28, /* Mandatory */
-    kSCSICmd_READ_CAPACITY                  = 0x25, /* Mandatory */
-    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Mandatory */
-    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Optional */
-    kSCSICmd_VERIFY_10                      = 0x2F, /* Mandatory */
-    kSCSICmd_WRITE_10                       = 0x2A, /* Mandatory */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Mandatory for fixed media
-     *                                              Optional for removable */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x0F OCRW Optical Card Commands
-/* Commands defined by the ISO/IEC 14776-381 SCSI Specification for
- * Optical Card Reader/Writer (OCRW) ratified command specification.  
- */
-#if 0
-enum
-{
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x11 OSD Object-based Storage Commands
-/* Commands defined by the T10:1355-D Object-based Storage Commands (OSD) 
- * (revision 1, 18 May 2000) command specification.  
- */
-#if 0
-enum
-{
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x15 RMC Simplified Multimedia Commands
-/* Commands defined by the T10:1364-D Reduced Multimedia Commands (RMC) 
- * (revision 1, November 11, 1999) command specification.  
- */
-#if 0
-enum
-{
-};
-#endif
-
-#endif	/* _SCSI_COMMAND_OPERATION_CODES_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSIPort.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSIPort.h.svn-base
deleted file mode 100644
index 8eefbeb..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/SCSIPort.h.svn-base
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_PORTS_H_
-#define _IOKIT_SCSI_PORTS_H_
-
-
-/*! @header SCSIPort
-	@discussion
-	This file contains all the definitions for SCSIPort notifications and status.
-*/
-
-
-/*!
-@enum kSCSIPort_NotificationStatusChange
-@discussion
-Message definition to be used with the messageClients
-call to inform of a change in port status.
-*/
-enum
-{
-	kSCSIPort_NotificationStatusChange		= 0x68000001
-};
-
-
-/*! @typedef SCSIPortStatus
-	@abstract 32-bit number to represent a SCSIPortStatus.
-	@discussion Type for SCSIPortStatus.
-*/
-
-typedef UInt32 SCSIPortStatus;
-
-/*! @enum SCSI Port Status Values
-	@discussion Definitions for the possible port status values
-*/
-enum
-{
-	/*!
-	@constant kSCSIPort_StatusOnline
-	The port is online.
-	*/
-	kSCSIPort_StatusOnline	= 0,
-
-	/*!
-	@constant kSCSIPort_StatusOffline
-	The port is offline (e.g. unplugged cable).
-	*/
-	kSCSIPort_StatusOffline	= 1,
-
-	/*!
-	@constant kSCSIPort_StatusFailure
-	Driver has detected unrecoverable port failure (e.g. hardware port failure)
-	*/
-	kSCSIPort_StatusFailure	= 2
-};
-
-#endif	/* _IOKIT_SCSI_PORTS_H_ */
diff --git a/i386/include/IOKit/scsi/.svn/text-base/SCSITask.h.svn-base b/i386/include/IOKit/scsi/.svn/text-base/SCSITask.h.svn-base
deleted file mode 100644
index 154c187..0000000
--- a/i386/include/IOKit/scsi/.svn/text-base/SCSITask.h.svn-base
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_SCSI_TASK_H_
-#define _IOKIT_SCSI_TASK_H_
-
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSITask
-SCSITask typedefs and constants used inside the kernel and user space.
-
-Note that the SCSITaskIdentifier is an opaque object and that directly
-casting the SCSITaskIdentifier to any other type is discouraged. The SCSITask
-implementation changes when necessary to accomodate architectural changes,
-performance improvements, and bug fixes.
-
-Device and protocol layer drivers that need to access information
-contained in a SCSITask should use the appropriate accessor methods in
-IOSCSIPrimaryCommandsDevice.h or IOSCSIProtocolServices.h
-*/
-
-
-/*! @typedef SCSIDeviceIdentifier
-    @abstract 64-bit number to represent a SCSI Device.
-	@discussion If the identifier can either be that of an initiator or a target,
-    SCSIDeviceIdentifier should be used.
-*/
-
-typedef UInt64 					SCSIDeviceIdentifier;
-
-/*! @typedef SCSITargetIdentifier
-    @abstract 64-bit number to represent a SCSI Target Device.
-	@discussion If the identifier is for a target only and not an initiator, then
-	SCSITargetIdentifier should be used.
-*/
-
-typedef SCSIDeviceIdentifier 	SCSITargetIdentifier;
-
-/*! @typedef SCSIInitiatorIdentifier
-    @abstract 64-bit number to represent a SCSI Initiator Device.
-	@discussion If the identifier is for an initiator only and not a target, then
-	SCSIInitiatorIdentifier should be used.
-*/
-
-typedef SCSIDeviceIdentifier 	SCSIInitiatorIdentifier;
-
-/*! @typedef SCSILogicalUnitNumber
-    @abstract 64-bit number to represent a logical unit.
-	@discussion 64-bit number to represent a logical unit.
-*/
-
-typedef UInt64 					SCSILogicalUnitNumber;
-
-/*! @typedef SCSITaggedTaskIdentifier
-    @abstract 64-bit number to represent a unique task identifier.
-	@discussion The Tagged Task Identifier is used when a Task has a Task Attribute other
-	than SIMPLE. The SCSI Application Layer client that controls the Logical
-	Unit for which a Task is intended is required to guarantee that the Task
-	Tag Identifier is unique. Zero cannot be used a a Tag value as this is used
-	to when a Tagged Task Identifier value is needed for a Task with a SIMPLE 
-	attribute.
-*/
-
-typedef UInt64 SCSITaggedTaskIdentifier;
-
-/*!
-	@enum Untagged Task Identifier
-	@discussion The Untagged Task Identifier is used to indicate no unique tag
-	is associated with the Task.
-	@constant kSCSIUntaggedTaskIdentifier This value means the task is untagged.
- */
-
-enum
-{
-	kSCSIUntaggedTaskIdentifier = 0
-};
-
-/*!
-	@typedef SCSITaskAttribute
-	@abstract Attributes for task delivery.
-	@discussion The Task Attribute defines how this task should be managed
-	when determing order for queueing and submission to the 
-	appropriate device server. The Task Attribute is set by the SCSI
-	Application Layer and cannot be modified by the SCSI Protocol Layer.
-	@constant kSCSITask_SIMPLE The task has a simple attribute.
-	@constant kSCSITask_ORDERED The task has an ordered attribute.
-	@constant kSCSITask_HEAD_OF_QUEUE The task has a head-of-queue attribute.
-	@constant kSCSITask_ACA The task has an auto-contingent-allegiance attribute.
- */
-
-typedef enum SCSITaskAttribute
-{
-	kSCSITask_SIMPLE			= 0,
-	kSCSITask_ORDERED			= 1,
-	kSCSITask_HEAD_OF_QUEUE		= 2,
-	kSCSITask_ACA				= 3
-} SCSITaskAttribute;
-
-/*!
-	@typedef SCSITaskState
-	@abstract Attributes for task state.
-	@discussion The Task State represents the current state of the task.
-	The state is set to NEW_TASK when the task is created.  The SCSI Protocol
-	Layer will then adjust the state as the task is queued and during
-	execution. The SCSI Application Layer can examine the state to monitor
-	the progress of a task. The Task State can only be modified by the SCSI
-	Protocol Layer.  The SCSI Application Layer can only read the state.
-	@constant kSCSITaskState_NEW_TASK The task state is new task.
-	@constant kSCSITaskState_ENABLED The task is enabled and queued.
-	@constant kSCSITaskState_BLOCKED The task is blocked.
-	@constant kSCSITaskState_DORMANT The task is dormant.
-	@constant kSCSITaskState_ENDED The task is complete.
- */
-
-typedef enum SCSITaskState
-{
-	kSCSITaskState_NEW_TASK		= 0,
-	kSCSITaskState_ENABLED		= 1,
-	kSCSITaskState_BLOCKED		= 2,
-	kSCSITaskState_DORMANT		= 3,
-	kSCSITaskState_ENDED		= 4
-} SCSITaskState;
-
-
-/*!
-	@typedef SCSIServiceResponse
-	@abstract Attributes for task service response.
-	@discussion The Service Response represents the execution status of
-	a service request made to a Protocol Services Driver. The Service
-	Response can only be modified by the SCSI Protocol Layer. The SCSI
-	Application Layer can only read the state.
- */
-
-typedef enum SCSIServiceResponse
-{
-	/*!
-	@constant kSCSIServiceResponse_Request_In_Process
-	Not defined in SAM specification, but is a service response used
-	for asynchronous commands that are not yet completed.
-	*/
-	kSCSIServiceResponse_Request_In_Process					= 0,
-
-	/*!
-	@constant kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE
-	The service request failed because of a delivery or target failure.
-	*/
-	kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE	= 1,
-
-	/*!
-	@constant kSCSIServiceResponse_TASK_COMPLETE
-	The task completed.
-	*/
-	kSCSIServiceResponse_TASK_COMPLETE 						= 2,
-	
-	/*!
-	@constant kSCSIServiceResponse_LINK_COMMAND_COMPLETE
-	The linked command completed.
-	*/
-	kSCSIServiceResponse_LINK_COMMAND_COMPLETE				= 3,
-	
-	/*!
-	@constant kSCSIServiceResponse_FUNCTION_COMPLETE
-	The task management function completed.
-	*/
-	kSCSIServiceResponse_FUNCTION_COMPLETE					= 4,
-	
-	/*!
-	@constant kSCSIServiceResponse_FUNCTION_REJECTED
-	The task management function was rejected.
-	*/
-	kSCSIServiceResponse_FUNCTION_REJECTED					= 5
-} SCSIServiceResponse;
-
-/*!
-	@typedef SCSITaskStatus
-	@abstract Attributes for task status.
-	@discussion The Task Status represents the completion status
-	of the task which provides the  SCSI Application Layer with
-	additional information about how to procede in handling a
-	completed task.
-	
-	The SCSI Architecture Model specification only defines task
-	status values for when a task completes with a service response
-	of either TASK_COMPLETED or LINK_COMMAND_COMPLETE.
-	
-	Since additional information will aid in error recovery when
-	a task fails to be completed by a device due to a service
-	response of kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE,
-	additional values have been defined that can be returned by the
-	SCSI Protocol Layer to inform the SCSI Application Layer of the
-	cause of the delivery failure.
-	
-	The Task Status can only be modified by the SCSI Protocol Layer.
-	The SCSI Application Layer can only read the status
-*/
-typedef enum SCSITaskStatus
-{
-	
-	/*!
-	@constant kSCSITaskStatus_GOOD
-	The task completed with a status of GOOD.
-	*/
-	
-	kSCSITaskStatus_GOOD						= 0x00,
-
-	/*!
-	@constant kSCSITaskStatus_CHECK_CONDITION
-	The task completed with a status of CHECK_CONDITION. Additional
-	information about the condition should be available in the sense data.
-	*/
-	
-	kSCSITaskStatus_CHECK_CONDITION				= 0x02,
-	
-	/*!
-	@constant kSCSITaskStatus_CONDITION_MET
-	The task completed with a status of CONDITION_MET.
-	*/
-	
-	kSCSITaskStatus_CONDITION_MET				= 0x04,
-	
-	/*!
-	@constant kSCSITaskStatus_BUSY
-	The task completed with a status of BUSY. The device server might need
-	time to process a request and a delay may be required.
-	*/
-	kSCSITaskStatus_BUSY						= 0x08,
-
-	/*!
-	@constant kSCSITaskStatus_INTERMEDIATE
-	The task completed with a status of INTERMEDIATE.
-	*/
-	kSCSITaskStatus_INTERMEDIATE				= 0x10,
-
-	/*!
-	@constant kSCSITaskStatus_INTERMEDIATE_CONDITION_MET
-	The task completed with a status of INTERMEDIATE_CONDITION_MET.
-	*/
-	kSCSITaskStatus_INTERMEDIATE_CONDITION_MET	= 0x14,
-
-	/*!
-	@constant kSCSITaskStatus_RESERVATION_CONFLICT
-	The task completed with a status of RESERVATION_CONFLICT.
-	*/
-	kSCSITaskStatus_RESERVATION_CONFLICT		= 0x18,
-
-	/*!
-	@constant kSCSITaskStatus_TASK_SET_FULL
-	The task completed with a status of TASK_SET_FULL. The device server
-	may need to complete a task before the initiator sends another.
-	*/
-	kSCSITaskStatus_TASK_SET_FULL				= 0x28,
-	
-	/*!
-	@constant kSCSITaskStatus_ACA_ACTIVE
-	The task completed with a status of ACA_ACTIVE. The device server may
-	need the initiator to clear the Auto-Contingent Allegiance condition
-	before it will respond to new commands.
-	*/
-	kSCSITaskStatus_ACA_ACTIVE					= 0x30,
-	
-	/*!
-	@constant kSCSITaskStatus_TaskTimeoutOccurred
-	If a task is aborted by the SCSI Protocol Layer due to it exceeding
-	the timeout value specified by the task, the task status shall be
-	set to kSCSITaskStatus_TaskTimeoutOccurred.
-	*/
-	
-	kSCSITaskStatus_TaskTimeoutOccurred			= 0x01,
-	
-	/*!
-	@constant kSCSITaskStatus_ProtocolTimeoutOccurred
-	If a task is aborted by the SCSI Protocol Layer due to it exceeding a
-	timeout value specified by the support for the protocol or a related
-	specification, the task status shall be set to
-	kSCSITaskStatus_ProtocolTimeoutOccurred.
-	*/
-	
-	kSCSITaskStatus_ProtocolTimeoutOccurred		= 0x02,
-	
-	/*!
-	@constant kSCSITaskStatus_DeviceNotResponding
-	If a task is unable to be delivered due to a failure of the device not
-	accepting the task or the device acknowledging the attempt to send it the
-	device the task status shall be set to kSCSITaskStatus_DeviceNotResponding.
-	This will allow the SCSI Application driver to perform the necessary steps
-	to try to recover the device. This shall only be reported after the SCSI
-	Protocol Layer driver has attempted all protocol specific attempts to recover
-	the device.
-	*/
-	
-	kSCSITaskStatus_DeviceNotResponding			= 0x03,
-	
-	/*!
-	@constant kSCSITaskStatus_DeviceNotPresent
-	If the task is unable to be delivered because the device has been
-	detached, the task status shall be set to kSCSITaskStatus_DeviceNotPresent.
-	This will allow the SCSI Application Layer to halt the sending of tasks
-	to the device and, if supported, perform any device failover or system
-	cleanup.
-	*/
-	kSCSITaskStatus_DeviceNotPresent			= 0x04,
-	
-	/*!
-	@constant kSCSITaskStatus_DeliveryFailure
-	If the task is unable to be
-	delivered to the device due to a failure in the SCSI Protocol Layer,
-	such as a bus reset or communications error, but the device is is
-	known to be functioning properly, the task status shall be set to 
-	kSCSITaskStatus_DeliveryFailure. This can also be reported if the
-	task could not be delivered due to a protocol error that has since
-	been corrected.
-	 */
-	kSCSITaskStatus_DeliveryFailure				= 0x05,
-	
-	/*!
-	@constant kSCSITaskStatus_No_Status
-	This status is not defined by
-	the SCSI specifications, but is here to provide a status that can
-	be returned in cases where there is not status available from the
-	device or protocol, for example, when the service response is
-	neither TASK_COMPLETED nor LINK_COMMAND_COMPLETE or when the
-	service response is SERVICE_DELIVERY_OR_TARGET_FAILURE and the
-	reason for failure could not be determined.
-	*/
-	kSCSITaskStatus_No_Status					= 0xFF
-} SCSITaskStatus;
-
-/*!
-	@enum Command Descriptor Block Size
-	@discussion Command Descriptor Block Size constants.
-*/
-enum
-{
-	/*!
-	@constant kSCSICDBSize_Maximum This is the largest size a Command Descriptor
-	Block can be as specified in SPC-2.
-	*/
-	kSCSICDBSize_Maximum 	= 16,
-
-	/*!
-	@constant kSCSICDBSize_6Byte Use this for a 6-byte CDB.
-	*/
-	kSCSICDBSize_6Byte 		= 6,
-
-	/*!
-	@constant kSCSICDBSize_10Byte Use this for a 10-byte CDB.
-	*/
-	kSCSICDBSize_10Byte 	= 10,
-
-	/*!
-	@constant kSCSICDBSize_12Byte Use this for a 12-byte CDB.
-	*/
-	kSCSICDBSize_12Byte 	= 12,
-
-	/*!
-	@constant kSCSICDBSize_16Byte Use this for a 16-byte CDB.
-	*/
-	kSCSICDBSize_16Byte 	= 16
-};
-
-typedef UInt8 SCSICommandDescriptorBlock[kSCSICDBSize_Maximum];
-
-/*!
-	@enum Data Transfer Direction
-	@discussion DataTransferDirection constants.
-*/
-enum
-{
-	/*!
-	@constant kSCSIDataTransfer_NoDataTransfer Use this for tasks
-	that transfer no data.
-	*/
-	kSCSIDataTransfer_NoDataTransfer		= 0x00,
-
-	/*!
-	@constant kSCSIDataTransfer_FromInitiatorToTarget Use this for tasks that transfer
-	data from the initiator to the target.
-	*/
-	kSCSIDataTransfer_FromInitiatorToTarget	= 0x01,
-
-	/*!
-	@constant kSCSIDataTransfer_FromTargetToInitiator Use this for tasks that transfer
-	data from the target to the initiator.
-	*/
-	kSCSIDataTransfer_FromTargetToInitiator	= 0x02
-};
-
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-/* Libkern includes */
-#include <libkern/c++/OSObject.h>
-
-
-/*!
-	@enum SCSITaskMode
-	@discussion The SCSI Task mode is used by the SCSI
-	Protocol Layer to indicate what mode the task is executing.
-*/
-typedef enum SCSITaskMode
-{
-	kSCSITaskMode_CommandExecution	= 1,
-	kSCSITaskMode_Autosense			= 2
-} SCSITaskMode;
-
-/*!
-	@typedef SCSITaskIdentifier
-	@discussion This is an opaque object that represents a task.
-	This is used so that drivers for both the SCSI Protocol Layer
-	and the SCSI  Application Layer cannot modify the SCSITask object
-	directly but must instead use the inherited methods to do so. This
-	allows the implementation of SCSITask to change without directly
-	impacting device and protocol layer drivers. In addition, it
-	prevents changing of properties that are not allowed to be
-	changed by a given layer.
-*/
-typedef OSObject *	SCSITaskIdentifier;
-
-
-/*!
-	@typedef SCSITaskCompletion
-	@discussion This is the typedef for completion routines that
-	work with SCSITaskIdentifiers.
-*/
-typedef void ( *SCSITaskCompletion )( SCSITaskIdentifier completedTask );
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_SCSI_TASK_H_ */
diff --git a/i386/include/IOKit/scsi/IOBDServices.h b/i386/include/IOKit/scsi/IOBDServices.h
deleted file mode 100644
index 70482d7..0000000
--- a/i386/include/IOKit/scsi/IOBDServices.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_BD_SERVICES_H_
-#define _IOKIT_IO_BD_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// IOKit includes
-#include <IOKit/IOTypes.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOBDTypes.h>
-#include <IOKit/storage/IOBDBlockStorageDevice.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
-
-class IOMemoryDescriptor;
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOBDServices : public IOBDBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IOBDServices )
-		
-protected:
-	
-	OSSet *								fClients;
-	IOSCSIPeripheralDeviceType05 *		fProvider;
-	
-	virtual void	free ( void );			
-	
-    // Reserve space for future expansion.
-    struct IOBDServicesExpansionData { };
-    IOBDServicesExpansionData *		fIOBDServicesReserved;
-	
-public:
-	
-	static void			AsyncReadWriteComplete ( void * 		clientData,
-		                          				 IOReturn		status,
-		                      					 UInt64 		actualByteCount );
-	
-	// Deprecated
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageCompletion		completion );
-											
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageAttributes *   attributes,
-											IOStorageCompletion *	completion );
-
-    virtual IOReturn	doEjectMedia ( void );
-
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-
-    virtual IOReturn	doSynchronizeCache ( void );
-	
-	virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-        
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-    
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-        
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-
-	/* CD Specific */
-	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
-										UInt32 block,
-										UInt32 nblks,
-										CDSectorArea sectorArea,
-										CDSectorType sectorType,
-										IOStorageCompletion completion );
-	
-	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
-	
-	virtual IOReturn	readMCN ( CDMCN mcn);
-	
-	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
-	
-	virtual IOReturn	audioPause ( bool pause );
-	
-	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
-	
-	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
-	
-	virtual IOReturn	audioStop ( void );
-	
-	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
-	
-	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
-	
-	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
-
-	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
-	
-	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
-	
-	/* DVD Specific */
-	virtual UInt32			getMediaType		( void );
-    
-	virtual IOReturn		reportKey			( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt32 lba,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-												  
-	virtual IOReturn		sendKey				( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-
-	virtual IOReturn		readDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
-													const UInt8					structureFormat,
-													const UInt32				logicalBlockAddress,
-													const UInt8					layer,
-													const UInt8 				agid );
-
-	/* BD Specific */
-    virtual IOReturn		readDiscStructure	(	IOMemoryDescriptor * buffer,
-													UInt8                structureFormat,
-													UInt32               logicalBlockAddress,
-													UInt8                layer,
-													UInt8                agid,
-													UInt8                mediaType );
-
-	/* 10.6.0 */
-    virtual IOReturn		requestIdle ( void );
-	
-	/* System Specific */
-	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
-    virtual IOReturn	setProperties ( OSObject * properties );
-
-	/* User Client Specific */
-	virtual bool start ( IOService * provider );
-	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
-	
-	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
-	virtual void handleClose ( IOService * client, IOOptionBits options );
-	virtual bool handleIsOpen ( const IOService * client ) const;
-
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
-									CDTOCFormat				format,
-									UInt8					msf,
-									UInt8					trackSessionNumber,
-									UInt16 *				actualByteCount ); 
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
-										UInt32					address,
-										CDTrackInfoAddressType	addressType,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.5 */
-	virtual IOReturn	splitTrack ( UInt32 address );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 1 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 2 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 3 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 4 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 5 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 6 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 7 );
-    OSMetaClassDeclareReservedUnused ( IOBDServices, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_BD_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IOBlockStorageServices.h b/i386/include/IOKit/scsi/IOBlockStorageServices.h
deleted file mode 100644
index d62a02b..0000000
--- a/i386/include/IOKit/scsi/IOBlockStorageServices.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_
-#define _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// IOKit includes
-#include <IOKit/IOTypes.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOBlockStorageDevice.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOBlockStorageServices : public IOBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IOBlockStorageServices )
-	
-private:
-	
-	bool							fMediaChanged;  /* DEPRECATED */
-	bool							fMediaPresent;
-	
-protected:
-	
-    IOSCSIBlockCommandsDevice *     fProvider;
-	
-	UInt64							fMaxReadBlocks;
-	UInt64							fMaxWriteBlocks;
-	
-	virtual bool		attach ( IOService * provider );
-	virtual void		detach ( IOService * provider );
-    virtual IOReturn	newUserClient (
-    						   task_t			owningTask,
-    						   void *			securityID,
-    						   UInt32			type,
-    						   OSDictionary * 	properties,
-    						   IOUserClient **	handler );
-	
-    // Reserve space for future expansion.
-    struct IOBlockStorageServicesExpansionData { };
-    IOBlockStorageServicesExpansionData * fIOBlockStorageServicesReserved;
-	
-public:
-	
-	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
-	
-	static void 		AsyncReadWriteComplete ( void * 			clientData,
-                                				 IOReturn			status,
-                                				 UInt64 			actualByteCount );
-	
-	// Deprecated
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-											
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageCompletion 	completion );
-
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageAttributes *   attributes,
-											IOStorageCompletion *	completion );
-													
-    virtual IOReturn	doEjectMedia ( void );
-	
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-	
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-	
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-	
-    virtual IOReturn	doSynchronizeCache ( void );
-	
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-        
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-        
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-	
-	virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 1 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 2 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 3 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 4 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 5 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 6 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 7 );
-    OSMetaClassDeclareReservedUnused ( IOBlockStorageServices, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_BLOCK_STORAGE_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IOCompactDiscServices.h b/i386/include/IOKit/scsi/IOCompactDiscServices.h
deleted file mode 100644
index a9d4a31..0000000
--- a/i386/include/IOKit/scsi/IOCompactDiscServices.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_COMPACT_DISC_SERVICES_H_
-#define _IOKIT_IO_COMPACT_DISC_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// IOKit includes
-#include <IOKit/IOTypes.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOCDTypes.h>
-#include <IOKit/storage/IOCDBlockStorageDevice.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
-
-class IOMemoryDescriptor;
-
-// Use this switch to turn off the data cache.
-#define _USE_DATA_CACHING_		1
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOCompactDiscServices : public IOCDBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IOCompactDiscServices )
-	
-#if (_USE_DATA_CACHING_)
-	// Data Cache members
-	bool				fUseDataCache;			// Indicates if cache should be used.  This
-												// will be set to false if all the necessary support
-												// for the data cache could not be allocated or
-												// initialized.
-	UInt8 *				fDataCacheStorage;		// Storage space for the cache
-	UInt32				fDataCacheStartBlock;	// Starting block of the data in the cache.
-	UInt32				fDataCacheBlockCount;	// Number of contiguous blocks in the cache  
-												// starting with fDataCacheStartBlock. A value of
-												// zero in this member indicates that all data
-												// in the cache is invalid.
-	
-	IOSimpleLock *		fDataCacheLock; 		// This is the lock for preventing multiple access 
-												// while manipulating the data cache.
-#endif
-
-protected:
-	
-	OSSet *								fClients;
-	IOSCSIPeripheralDeviceType05 *		fProvider;
-	
-	virtual void	free ( void );			
-
-    // Reserve space for future expansion.
-    struct IOCompactDiscServicesExpansionData { };
-    IOCompactDiscServicesExpansionData * fIOCompactDiscServicesReserved;
-
-public:
-
-	static 	void 		AsyncReadWriteComplete ( 	void * 			clientData,
-                                					IOReturn		status,
-                                					UInt64 			actualByteCount );
-
-	// Deprecated
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageCompletion		completion );
-											
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageAttributes *   attributes,
-											IOStorageCompletion *	completion );
-
-    virtual IOReturn	doEjectMedia ( void );
-
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-
-    virtual IOReturn	doSynchronizeCache ( void );
-
-	virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-        
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-        
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-        
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-
-	/* CD Specific */
-	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
-										UInt32 block,
-										UInt32 nblks,
-										CDSectorArea sectorArea,
-										CDSectorType sectorType,
-										IOStorageCompletion completion );
-	
-	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
-	
-	virtual IOReturn	readMCN ( CDMCN mcn);
-	
-	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
-	
-	virtual IOReturn	audioPause ( bool pause );
-	
-	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
-	
-	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
-	
-	virtual IOReturn	audioStop ( void );
-	
-	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
-	
-	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
-	
-	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
-
-	virtual UInt32		getMediaType ( void );
-	
-	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
-	
-	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
-			
-	/* System Specific */
-	virtual IOReturn message ( UInt32 type, IOService * provider, void * argument );
-    virtual IOReturn setProperties ( OSObject * properties );
-	
-	/* User Client Specific */
-	virtual bool start ( IOService * provider );
-	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
-	
-	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
-	virtual void handleClose ( IOService * client, IOOptionBits options );
-	virtual bool handleIsOpen ( const IOService * client ) const;
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
-									CDTOCFormat				format,
-									UInt8					msf,
-									UInt8					trackSessionNumber,
-									UInt16 *				actualByteCount ); 
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
-										UInt32					address,
-										CDTrackInfoAddressType	addressType,
-										UInt16 *				actualByteCount );
-
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 1 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 2 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 3 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 4 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 5 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 6 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 7 );
-    OSMetaClassDeclareReservedUnused ( IOCompactDiscServices, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_COMPACT_DISC_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IODVDServices.h b/i386/include/IOKit/scsi/IODVDServices.h
deleted file mode 100644
index 8dccb17..0000000
--- a/i386/include/IOKit/scsi/IODVDServices.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_DVD_SERVICES_H_
-#define _IOKIT_IO_DVD_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// IOKit includes
-#include <IOKit/IOTypes.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IODVDTypes.h>
-#include <IOKit/storage/IODVDBlockStorageDevice.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPeripheralDeviceType05.h>
-
-class IOMemoryDescriptor;
-
-// Use this switch to turn off the data cache.
-#define _DVD_USE_DATA_CACHING_		1
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IODVDServices : public IODVDBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IODVDServices )
-	
-#if (_DVD_USE_DATA_CACHING_)
-	// Data Cache members
-	bool				fUseDataCache;			// Indicates if cache should be used.  This
-												// will be set to false if all the necessary support
-												// for the data cache could not be allocated or
-												// initialized.
-	UInt8 *				fDataCacheStorage;		// Storage space for the cache
-	UInt32				fDataCacheStartBlock;	// Starting block of the data in the cache.
-	UInt32				fDataCacheBlockCount;	// Number of contiguous blocks in the cache  
-												// starting with fDataCacheStartBlock. A value of
-												// zero in this member indicates that all data
-												// in the cache is invalid.
-	
-	IOSimpleLock *		fDataCacheLock; 		// This is the lock for preventing multiple access 
-												// while manipulating the data cache.
-#endif
-	
-protected:
-	
-	OSSet *								fClients;
-	IOSCSIPeripheralDeviceType05 *		fProvider;
-	
-	virtual void	free ( void );			
-	
-    // Reserve space for future expansion.
-    struct IODVDServicesExpansionData { };
-    IODVDServicesExpansionData * fIODVDServicesReserved;
-	
-public:
-	
-	static void			AsyncReadWriteComplete ( void * 		clientData,
-		                          				 IOReturn		status,
-		                      					 UInt64 		actualByteCount );
-	
-	// Deprecated
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageCompletion		completion );
-											
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageAttributes *   attributes,
-											IOStorageCompletion *	completion );
-
-    virtual IOReturn	doEjectMedia ( void );
-
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-
-    virtual IOReturn	doSynchronizeCache ( void );
-	
-	virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-        
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-        
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-        
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-
-	/* CD Specific */
-	virtual IOReturn	doAsyncReadCD ( IOMemoryDescriptor * buffer,
-										UInt32 block,
-										UInt32 nblks,
-										CDSectorArea sectorArea,
-										CDSectorType sectorType,
-										IOStorageCompletion completion );
-	
-	virtual IOReturn	readISRC ( UInt8 track, CDISRC isrc );
-	
-	virtual IOReturn	readMCN ( CDMCN mcn);
-	
-	virtual IOReturn	readTOC ( IOMemoryDescriptor * buffer );
-	
-	virtual IOReturn	audioPause ( bool pause );
-	
-	virtual IOReturn	audioPlay ( CDMSF timeStart, CDMSF timeStop );
-	
-	virtual IOReturn	audioScan ( CDMSF timeStart, bool reverse );
-	
-	virtual IOReturn	audioStop ( void );
-	
-	virtual IOReturn	getAudioStatus ( CDAudioStatus * status );
-	
-	virtual IOReturn	getAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
-	
-	virtual IOReturn	setAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
-
-	virtual IOReturn	getSpeed ( UInt16 * kilobytesPerSecond );
-	
-	virtual IOReturn	setSpeed ( UInt16 kilobytesPerSecond );
-	
-	/* DVD Specific */
-	virtual UInt32			getMediaType		( void );
-    
-	virtual IOReturn		reportKey			( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt32 lba,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-												  
-	virtual IOReturn		sendKey				( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-
-	virtual IOReturn		readDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
-													const UInt8					structureFormat,
-													const UInt32				logicalBlockAddress,
-													const UInt8					layer,
-													const UInt8 				agid );
-
-	/* 10.6.0 */
-    virtual IOReturn		requestIdle ( void );
-	
-	/* System Specific */
-	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
-    virtual IOReturn	setProperties ( OSObject * properties );
-
-	/* User Client Specific */
-	virtual bool start ( IOService * provider );
-	virtual bool open ( IOService * client, IOOptionBits options, IOStorageAccess access );
-	
-	virtual bool handleOpen	( IOService * client, IOOptionBits options, void * access );
-	virtual void handleClose ( IOService * client, IOOptionBits options );
-	virtual bool handleIsOpen ( const IOService * client ) const;
-
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTOC (	IOMemoryDescriptor *	buffer,
-									CDTOCFormat				format,
-									UInt8					msf,
-									UInt8					trackSessionNumber,
-									UInt16 *				actualByteCount ); 
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readDiscInfo (	IOMemoryDescriptor *	buffer,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.1.3 */
-	virtual IOReturn	readTrackInfo (	IOMemoryDescriptor *	buffer,
-										UInt32					address,
-										CDTrackInfoAddressType	addressType,
-										UInt16 *				actualByteCount );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 1 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 2 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 3 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 4 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 5 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 6 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 7 );
-    OSMetaClassDeclareReservedUnused ( IODVDServices, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_DVD_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IOReducedBlockServices.h b/i386/include/IOKit/scsi/IOReducedBlockServices.h
deleted file mode 100644
index 87ad8ed..0000000
--- a/i386/include/IOKit/scsi/IOReducedBlockServices.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_
-#define _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// Generic IOKit related headers
-#include <IOKit/IOTypes.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOBlockStorageDevice.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPeripheralDeviceType0E.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOReducedBlockServices : public IOBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IOReducedBlockServices )
-	
-	
-protected:
-    // Reserve space for future expansion.
-    struct IOReducedBlockServicesExpansionData { };
-    IOReducedBlockServicesExpansionData * fIOReducedBlockServicesReserved;
-	
-	IOSCSIPeripheralDeviceType0E *     fProvider;
-	
-	virtual bool	attach ( IOService * provider );
-	virtual void	detach ( IOService * provider );
-	
-	
-public:
-
-	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
-	
-	static void			AsyncReadWriteComplete ( void * 			clientData,
-                                				 IOReturn			status,
-                                				 UInt64 			actualByteCount );
-                                				
-	// Deprecated
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageCompletion		completion );
-											
-	virtual IOReturn	doAsyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											IOStorageAttributes *   attributes,
-											IOStorageCompletion *	completion );
-
-    virtual IOReturn	doEjectMedia ( void );
-
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-
-    virtual IOReturn	doSynchronizeCache ( void );
-	
-	virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-        
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-        
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-        
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 1 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 2 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 3 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 4 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 5 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 6 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 7 );
-    OSMetaClassDeclareReservedUnused ( IOReducedBlockServices, 8 );
-    
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_REDUCED_BLOCK_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIBlockCommandsDevice.h b/i386/include/IOKit/scsi/IOSCSIBlockCommandsDevice.h
deleted file mode 100644
index 2cb4a6d..0000000
--- a/i386/include/IOKit/scsi/IOSCSIBlockCommandsDevice.h
+++ /dev/null
@@ -1,1146 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_
-#define _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-// SBC power states as defined in T10:996D SCSI Block Commands - 3 (SBC-3)
-// Revision 8c, November 13, 1997, pages 10-11.
-enum
-{
-	kSBCPowerStateSystemSleep 	= 0,
-	kSBCPowerStateSleep 		= 1,
-	kSBCPowerStateStandby 		= 2,
-	kSBCPowerStateIdle			= 3,
-	kSBCPowerStateActive		= 4,
-	kSBCNumPowerStates			= 5
-};
-
-enum
-{
-	kMediaStateUnlocked	= 0,
-	kMediaStateLocked 	= 1
-};
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOUserClient.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOStorage.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
-
-
-// Forward declaration for the SCSIBlockCommands that is used internally by the
-// IOSCSIBlockCommandsDevice class.
-class SCSIBlockCommands;
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIBlockCommandsDevice : public IOSCSIPrimaryCommandsDevice
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIBlockCommandsDevice )
-	
-private:
-	
-
-#ifndef __LP64__
-	
-	SCSIBlockCommands *		fSCSIBlockCommandObject;
-	SCSIBlockCommands *		GetSCSIBlockCommandObject ( void );
-	
-#endif	/* !__LP64__ */
-
-	IOReturn				GetWriteCacheState ( IOMemoryDescriptor * 	buffer,
-												 UInt8					modePageControlValue );
-	
-	static void				AsyncReadWriteComplete ( SCSITaskIdentifier	completedTask );
-	
-protected:
-	
-	// Reserve space for future expansion.
-    struct IOSCSIBlockCommandsDeviceExpansionData
-	{
-		IONotifier *		fPowerDownNotifier;
-		bool				fWriteCacheEnabled;
-		bool				fDeviceIsShared;
-		UInt64				fMediumBlockCount64;
-		bool				fDeviceHasSATTranslation;
-		bool				fProtocolSpecificPowerControl;
-		bool				fRequiresEjectWithStartStopUnit;
-	};
-    IOSCSIBlockCommandsDeviceExpansionData * fIOSCSIBlockCommandsDeviceReserved;
-	
-	#define fPowerDownNotifier	fIOSCSIBlockCommandsDeviceReserved->fPowerDownNotifier
-	#define fWriteCacheEnabled	fIOSCSIBlockCommandsDeviceReserved->fWriteCacheEnabled
-	
-	// The fDeviceIsShared is used to indicate whether this device exists on a Physical
-	// Interconnect that allows multiple initiators to access it.  This is used mainly
-	// by the power management code to not send power state related START_STOP_UNIT
-	// commands to the device.
-	// The fDeviceIsShared value is also used to prevent power state commands from being
-	// sent to manual eject device since these devices behave better when allowed to
-	// manage their own power.
-	#define fDeviceIsShared	fIOSCSIBlockCommandsDeviceReserved->fDeviceIsShared
-	
-	// The fMediumBlockCount64 provides support for 64 bit LBAs and
-	// replaces fMediumBlockCount which only supports 32 bits.
-	// This value should not be directly accessed and instead the member routine 
-	// ReportMediumTotalBlockCount() should be used to retrieve it and the member routine
-	// SetMediumCharacteristics() should be used to set it.
-	#define fMediumBlockCount64	fIOSCSIBlockCommandsDeviceReserved->fMediumBlockCount64
-	
-	#define fDeviceHasSATTranslation fIOSCSIBlockCommandsDeviceReserved->fDeviceHasSATTranslation
-	
-	// Device support protocol specific power off
-	#define fProtocolSpecificPowerControl fIOSCSIBlockCommandsDeviceReserved->fProtocolSpecificPowerControl
-	
-	// Device requires START_STOP_UNIT for ejects, regardless if PREVENT_ALLOW_MEIDUMREMOVAL
-	// failed. 
-	#define fRequiresEjectWithStartStopUnit fIOSCSIBlockCommandsDeviceReserved->fRequiresEjectWithStartStopUnit
-	
-private:
-	/* OBSOLETE. Use IOSCSIPrimaryCommandsDevice::Get/SetANSIVersion */
-	UInt8				fANSIVersion;
-
-protected:
-	// ---- Device Characteristics ----
-	bool				fMediaIsRemovable;
-	
-	// ---- Medium Characteristics ----
-	bool				fMediumPresent;
-	
-private:
-	// The byte count of each physical block on the medium.
-	// This value should not be directly accessed and instead the member routine 
-	// ReportMediumBlockSize() should be used to retrieve it and the member routine
-	// SetMediumCharacteristics() should be used to set it.
-	UInt32				fMediumBlockSize;
-	
-	// The total number of blocks of fMediumBlockSize on the medium.
-	// OBSOLETE.  Use fMediumBlockCount64 instead which allows for support of
-	// devices that have 33 through 64 bit LBA values.
-	UInt32				fMediumBlockCount;
-	
-protected:
-	// Whether the installed medium is protected from writes
-	bool				fMediumIsWriteProtected;
-	
-	// Whether user removal of medium has been prevented	
-	bool				fMediumRemovalPrevented;
-	
-	// Indicates whether this is a known manual eject device
-	bool				fKnownManualEject;
-	
-	// Polling thread variables
-	thread_call_t		fPollingThread;
-	UInt32				fPollingMode;
-	enum
-	{
-		kPollingMode_Suspended		= 0,
-		kPollingMode_NewMedia 		= 1,
-		kPollingMode_MediaRemoval	= 2
-	};
-	
-	// ---- Methods for controlling the current state of device support ----
-	virtual bool		InitializeDeviceSupport ( void );
-	virtual void		StartDeviceSupport ( void );
-	virtual void		SuspendDeviceSupport ( void );
-	virtual void		ResumeDeviceSupport ( void );
-	virtual void		StopDeviceSupport ( void );
-	virtual void		TerminateDeviceSupport ( void );
-
-	virtual void 		free ( void );
-
-#ifndef __LP64__
-	
-	// This method will retrieve the SCSI Primary Command Set object for
-	// the class.  For subclasses, this will be overridden using a
-	// dynamic cast on the subclasses base command set object.
-	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
-	
-	virtual bool		CreateCommandSetObjects ( void );
-	virtual void		FreeCommandSetObjects ( void );
-	
-#endif	/* !__LP64__ */
-
-	virtual bool		ClearNotReadyStatus ( void );
-	virtual void 		CreateStorageServiceNub ( void );
-	virtual bool		DetermineDeviceCharacteristics ( void );
-	
-	// ---- Methods used for controlling the polling thread ----
-	virtual void		ProcessPoll ( void );
-	virtual void		EnablePolling ( void );
-	virtual void		DisablePolling ( void );
-	
-	// Main and support methods for polling for new Media
-	virtual void		PollForNewMedia ( void );
-	virtual bool		DetermineMediaPresence ( void );
-	virtual bool		PreventMediumRemoval ( void );
-	virtual bool		DetermineMediumCapacity (
-							UInt64 * 				blockSize,
-							UInt64 * 				blockCount );
-	virtual bool		DetermineMediumWriteProtectState ( void );
-	
-	// Main and support methods for polling for Media removal
-	virtual void		PollForMediaRemoval ( void );
-	
-	// ---- Methods used for handling medium characteristics ----
-	
-	// OBSOLETE - Use the version compatible with 64 bit LBAs instead.
-	virtual void		SetMediumCharacteristics (
-							UInt32 					blockSize,
-							UInt32 					blockCount );
-
-	void				SetMediumCharacteristics (
-							UInt64 					blockSize,
-							UInt64 					blockCount );
-	
-	virtual void		ResetMediumCharacteristics ( void );
-
-	virtual IOReturn	IssueRead (
-							IOMemoryDescriptor *	buffer,
-						 	UInt64					startBlock,
-					 		UInt64					blockCount );
-	
-	virtual IOReturn	IssueRead (
-							IOMemoryDescriptor *	buffer,
-					  		UInt64					startBlock,
-					 		UInt64					blockCount,
-					   		void * 					clientData );
-	
-	virtual IOReturn	IssueWrite (
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-					   		UInt64					blockCount );
-	
-	virtual IOReturn	IssueWrite (
-							IOMemoryDescriptor *	buffer,
-						 	UInt64					startBlock,
-					  		UInt64					blockCount,
-							void * 					clientData );
-	
-	// ----- Power Management Support ------
-	
-	// We override this method to set our power states and register ourselves
-	// as a power policy maker.
-	virtual void 		InitializePowerManagement ( IOService * provider );
-	
-	// We override this method so that when we register for power management,
-	// we go to our active power state (which the drive is definitely in
-	// at startup time).
-	virtual UInt32		GetInitialPowerState ( void );
-	
-	// We override this method in order to provide the number of transitions
-	// from Fully active to Sleep state so that the idle timer can be adjusted
-	// to the appropriate time period based on the disk spindown time set in
-	// the Energy Saver prefs panel.
-	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
-	
-	// The TicklePowerManager method is called to tell the power manager that
-	// the device needs to be in a certain power state to handle requests.
-	virtual void		TicklePowerManager ( void );
-	
-	// The HandlePowerChange method is the state machine for power management.
-	// It is guaranteed to be on its own thread of execution (different from
-	// the power manager thread AND the workloop thread. This routine can
-	// send sync or async calls to the drive without worrying about threading
-	// issues.
-	virtual void		HandlePowerChange ( void );
-	
-	// The HandleCheckPowerState (void) method is on the serialized side of the
-	// command gate and can change member variables safely without
-	// multi-threading issues. It's main purpose is to call the superclass'
-	// HandleCheckPowerState ( UInt32 maxPowerState ) with the max power state
-	// the class registered with.
-	virtual void		HandleCheckPowerState ( void );
-	
-	// The VerifyMediumPresence method is called to see if the medium which we
-	// anticipated being there is still there.
-	virtual bool		VerifyMediumPresence ( void );
-	
-public:
-	
-	static 	void		sProcessPoll ( void * pdtDriver, void * refCon );
-	
-	// ---- Methods for controlling the device ----
-	virtual IOReturn	SyncReadWrite (
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-							UInt64					blockCount,
-							UInt64					blockSize );
-	
-	virtual IOReturn	AsyncReadWrite (
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-							UInt64					blockCount,
-							UInt64					blockSize,
-							void * 					clientData );
-	
-	IOReturn	GetWriteCacheState ( bool * enabled );	
-	IOReturn	SetWriteCacheState ( bool enabled );
-	void		DetermineMediumGeometry ( void );
-	
-	// ---- Methods for controlling medium state ----
-	virtual IOReturn	EjectTheMedium ( void );
-	virtual IOReturn	LockUnlockMedium ( bool doLock );
-	virtual IOReturn	SynchronizeCache ( void );
-	
-	// ---- Methods for controlling media format ----
-	virtual IOReturn	FormatMedium (
-							UInt64 					blockCount,
-							UInt64 					blockSize );
-	virtual UInt32		GetFormatCapacities (
-							UInt64 * 				capacities,
-			 				UInt32   				capacitiesMaxCount ) const;
-	
-	// ---- Query methods to report device characteristics ----
-	
-	// Report the maximum number of blocks that the device can handle per
-	// read or write.  A value of 0 (zero) indicates there is no limit aside
-	// from the size of the method's return parameter.
-	virtual UInt64		ReportDeviceMaxBlocksReadTransfer ( void );
-	virtual UInt64		ReportDeviceMaxBlocksWriteTransfer ( void );
-	
-	// Report whether the device supports removal of the media.
-	virtual bool		ReportDeviceMediaRemovability ( void );
-	
-	// ---- Query methods to report installed medium characteristics ----
-	virtual UInt64		ReportMediumBlockSize ( void );
-	virtual UInt64		ReportMediumTotalBlockCount ( void );
-	virtual bool		ReportMediumWriteProtection ( void );
-	
-	
-protected:
-	
-
-#ifndef __LP64__
-	
-	// Command methods to access all commands available to SBC based devices.
-	virtual bool ERASE_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			ERA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool ERASE_12 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			ERA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool FORMAT_UNIT (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						IOByteCount					defectListSize,
-						SCSICmdField1Bit 			FMTDATA,
-						SCSICmdField1Bit 			CMPLST,
-						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
-						SCSICmdField1Byte 			VENDOR_SPECIFIC,
-						SCSICmdField2Byte 			INTERLEAVE,
-						SCSICmdField1Byte 			CONTROL );
-	
-	//  Defined in SBC-2 Section 5.41
-	bool FORMAT_UNIT (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						IOByteCount					defectListSize,
-						SCSICmdField1Bit			FMTPINFO,
-						SCSICmdField1Bit			RTO_REQ,
-						SCSICmdField1Bit			LONGLIST,
-						SCSICmdField1Bit 			FMTDATA, 
-						SCSICmdField1Bit 			CMPLST,
-						SCSICmdField3Bit 			DEFECT_LIST_FORMAT, 
-						SCSICmdField1Byte 			VENDOR_SPECIFIC, 
-						SCSICmdField1Byte 			CONTROL );
-	  	  
-	virtual bool LOCK_UNLOCK_CACHE (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			LOCK,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.5
-	bool LOCK_UNLOCK_CACHE (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			LOCK,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool LOCK_UNLOCK_CACHE_16 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit			LOCK,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte			CONTROL );
-						
-	virtual bool MEDIUM_SCAN (
-						SCSITaskIdentifier			request,
-			 			IOMemoryDescriptor *		dataBuffer,
-		   				SCSICmdField1Bit 			WBS,
-		   				SCSICmdField1Bit 			ASA,
-		   				SCSICmdField1Bit 			PSD,
-		   				SCSICmdField1Bit 			PRA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool PREFETCH (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	// Defined in SBC-2 section 5.7
-	bool PREFETCH (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool PREFETCH_16 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit			IMMED,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-	
-	virtual bool READ_6 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField21Bit 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-#endif	/* __LP64__ */
-	
-	virtual bool READ_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	// Defined in SBC-2 section 5.10
-	bool READ_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit 			RDPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool READ_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	// Defined in SBC-2 section 5.11
-	bool READ_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			RDPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool READ_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			RDPROTECT,
-						SCSICmdField1Bit			DPO,
-						SCSICmdField1Bit			FUA,
-						SCSICmdField1Bit			FUA_NV,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-	
-	virtual bool READ_CAPACITY (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Bit 			PMI,
-						SCSICmdField1Byte 			CONTROL );
-	
-	bool READ_CAPACITY_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			ALLOCATION_LENGTH,
-						SCSICmdField1Bit 			PMI,
-						SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
-	virtual bool READ_DEFECT_DATA_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			PLIST,
-						SCSICmdField1Bit 			GLIST,
-						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool READ_DEFECT_DATA_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			PLIST,
-						SCSICmdField1Bit 			GLIST,
-						SCSICmdField3Bit 			DEFECT_LIST_FORMAT,
-						SCSICmdField4Byte 			ALLOCATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool READ_GENERATION (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			ALLOCATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool READ_LONG (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			CORRCT,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			BYTE_TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool READ_LONG_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte			BYTE_TRANSFER_LENGTH,
-						SCSICmdField1Bit			CORRCT,
-						SCSICmdField1Byte			CONTROL );
-		
-	virtual bool READ_UPDATED_BLOCK_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-					 	SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Bit 			LATEST,
-					 	SCSICmdField15Bit 			GENERATION_ADDRESS,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool REASSIGN_BLOCKS (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.20
-	bool REASSIGN_BLOCKS (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit			LONGLBA,
-						SCSICmdField1Bit			LONGLIST,
-						SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool REBUILD (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-					 	SCSICmdField1Bit 			INTDATA,
-						SCSICmdField2Bit 			PORT_CONTROL,
-					 	SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			REBUILD_LENGTH,
-						SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool REGENERATE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit			DPO,
-						SCSICmdField1Bit 			FUA,
-					 	SCSICmdField1Bit 			INTDATA,
-					 	SCSICmdField2Bit 			PORT_CONTROL,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			REBUILD_LENGTH,
-						SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool REZERO_UNIT (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SEARCH_DATA_EQUAL_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			INVERT,
-						SCSICmdField1Bit 			SPNDAT,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SEARCH_DATA_HIGH_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			INVERT,
-						SCSICmdField1Bit 			SPNDAT,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SEARCH_DATA_LOW_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			INVERT,
-						SCSICmdField1Bit 			SPNDAT,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS_TO_SEARCH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SEEK_6 (
-						SCSITaskIdentifier			request,
-						SCSICmdField21Bit 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SEEK_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SET_LIMITS_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			RDINH,
-						SCSICmdField1Bit 			WRINH,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SET_LIMITS_12 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			RDINH,
-						SCSICmdField1Bit 			WRINH,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-#endif	/* __LP64__ */
-	
-	virtual bool START_STOP_UNIT (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED,
-						SCSICmdField4Bit 			POWER_CONDITIONS,
-						SCSICmdField1Bit 			LOEJ,
-						SCSICmdField1Bit 			START,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool SYNCHRONIZE_CACHE (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-	// Defined in SBC-2 section 5.22
-	bool SYNCHRONIZE_CACHE (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED,
-						SCSICmdField1Bit 			SYNC_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool SYNCRONIZE_CACHE_16 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit			SYNC_NV,
-						SCSICmdField1Bit			IMMED,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			NUMBER_OF_BLOCKS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-						
-#ifndef __LP64__
-
-	virtual bool UPDATE_BLOCK (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool VERIFY_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BLKVFY,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			VERIFICATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-	
-	//  Defined in SBC-2 section 5.24
-	bool VERIFY_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField3Bit 			VRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			VERIFICATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool VERIFY_12 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BLKVFY,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			VERIFICATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.25
-	bool VERIFY_12 (
-						SCSITaskIdentifier			request,
-						SCSICmdField3Bit 			VRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField4Byte 			VERIFICATION_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool VERIFY_16 (
-						SCSITaskIdentifier			request,
-						SCSICmdField3Bit			VRPROTECT,
-						SCSICmdField1Bit			DPO,
-						SCSICmdField1Bit			BYTCHK,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			VERIFICATION_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-	
-	virtual bool WRITE_6 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField2Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-	
-#endif	/* __LP64__ */
-
-	virtual bool WRITE_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			EBP,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.29
-	bool WRITE_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool WRITE_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			EBP,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.30
-	bool WRITE_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool WRITE_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit			DPO,
-						SCSICmdField1Bit			FUA,
-						SCSICmdField1Bit			FUA_NV,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-
-#ifndef __LP64__
-				
-	virtual bool WRITE_AND_VERIFY_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			EBP,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.33
-	bool WRITE_AND_VERIFY_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool WRITE_AND_VERIFY_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			EBP,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-	
-	//  Defined in SBC-2 section 5.34
-	bool WRITE_AND_VERIFY_12 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool WRITE_AND_VERIFY_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						UInt32						blockSize,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			BYTCHK,
-						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte 			CONTROL );
-
-
-	virtual bool WRITE_LONG (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool WRITE_LONG_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField8Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Bit			CORRCT,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool WRITE_SAME (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			PBDATA,
-						SCSICmdField1Bit 			LBDATA,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.39
-	bool WRITE_SAME (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			PBDATA,
-						SCSICmdField1Bit 			LBDATA,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	bool WRITE_SAME_16 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit			PBDATA,
-						SCSICmdField1Bit			LBDATA,
-						SCSICmdField8Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte			TRANSFER_LENGTH,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField1Byte			CONTROL );
-
-	virtual bool XDREAD (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.42
-	bool XDREAD (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit			XORPINFO,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool XDWRITE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			DISABLE_WRITE,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.43
-	bool XDWRITE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			DISABLE_WRITE,
-						SCSICmdField1Bit			FUA_NV,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	virtual bool XDWRITE_EXTENDED (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			TABLE_ADDRESS,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			DISABLE_WRITE,
-						SCSICmdField2Bit 			PORT_CONTROL,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			SECONDARY_BLOCK_ADDRESS,
-						SCSICmdField4Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			SECONDARY_ADDRESS,
-						SCSICmdField1Byte 			CONTROL );
-	
-	//  Defined in SBC-2 section 5.46
-	bool XDWRITEREAD_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField3Bit			WRPROTECT,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			DISABLE_WRITE,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField1Bit 			XORPINFO,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool XPWRITE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-	//  Defined in SBC-2 section 5.48
-	bool XPWRITE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DPO,
-						SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			FUA_NV,
-						SCSICmdField1Bit 			XORPINFO,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField5Bit			GROUP_NUMBER,
-						SCSICmdField2Byte 			TRANSFER_LENGTH,
-						SCSICmdField1Byte 			CONTROL );
-
-#endif	/* __LP64__ */
-	
-	
-	/* Added with 10.2 */	
-	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 1 );
-	
-public:
-	
-	virtual IOReturn	PowerDownHandler (	void * 			refCon,
-											UInt32 			messageType,
-											IOService * 	provider,
-											void * 			messageArgument,
-											vm_size_t 		argSize );
-	
-
-	/* Added with 10.2 */	
-	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 2 );
-	
-protected:
-	
-	virtual	void		SetMediumIcon ( void );
-	
-	
-	/* Added with 10.3.3 */		
-	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 3 );
-	
-protected:
-
-	virtual	void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
-	
-	
-	/* Added with 10.6.0 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIBlockCommandsDevice, 4 );
-	
-public:
-	
-	virtual	IOReturn AsyncReadWrite (
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-							UInt64					blockCount,
-							UInt64					blockSize,
-							IOStorageAttributes *	attributes,
-							void * 					clientData );
-	
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIBlockCommandsDevice, 16 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_SCSI_BLOCK_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIMultimediaCommandsDevice.h b/i386/include/IOKit/scsi/IOSCSIMultimediaCommandsDevice.h
deleted file mode 100644
index f812a39..0000000
--- a/i386/include/IOKit/scsi/IOSCSIMultimediaCommandsDevice.h
+++ /dev/null
@@ -1,1057 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_
-#define _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-
-// Message constants
-#define kIOMessageTrayStateChange			0x69000035
-#define kIOMessageTrayStateHasChanged		kIOMessageTrayStateChange // DEPRECATED, use kIOMessageTrayStateChange instead
-
-// Message values for kIOMessageTrayStateChange
-enum
-{
-	kMessageTrayStateChangeRequestAccepted	= 0,
-	kMessageTrayStateChangeRequestRejected	= 1
-};
-
-#define kIOMessageMediaAccessChange			0x69000036
-
-// Message values for kIOMessageMediaAccessChange
-enum
-{
-	kMessageDeterminingMediaPresence	= 0,
-	kMessageFoundMedia					= 1,
-	kMessageMediaTypeDetermined			= 2
-};
-
-// IOKit property keys and constants
-#define	kIOPropertySupportedCDFeatures		kIOPropertySupportedCDFeaturesKey
-#define	kIOPropertySupportedDVDFeatures		kIOPropertySupportedDVDFeaturesKey
-#define	kIOPropertySupportedBDFeatures		kIOPropertySupportedBDFeaturesKey
-#define kIOPropertyLowPowerPolling			"Low Power Polling"
-
-typedef UInt32 CDFeatures;
-enum
-{
-	kCDFeaturesAnalogAudioBit			= 0,	// Analog Audio playback
-	kCDFeaturesReadStructuresBit		= 1,	// CD-ROM
-	kCDFeaturesWriteOnceBit				= 2,	// CD-R
-	kCDFeaturesReWriteableBit			= 3,	// CD-R/W
-	kCDFeaturesCDDAStreamAccurateBit	= 4,	// CD-DA stream accurate
-	kCDFeaturesPacketWriteBit			= 5,	// Packet Writing
-	kCDFeaturesTAOWriteBit				= 6,	// CD Track At Once
-	kCDFeaturesSAOWriteBit				= 7,	// CD Mastering - Session At Once
-	kCDFeaturesRawWriteBit				= 8,	// CD Mastering - Raw
-	kCDFeaturesTestWriteBit				= 9,	// CD Mastering/TAO - Test Write
-	kCDFeaturesBUFWriteBit				= 10	// CD Mastering/TAO - Buffer Underrun Free
-};
-
-enum
-{
-	kCDFeaturesAnalogAudioMask 			= (1 << kCDFeaturesAnalogAudioBit),
-	kCDFeaturesReadStructuresMask		= (1 << kCDFeaturesReadStructuresBit),
-	kCDFeaturesWriteOnceMask			= (1 << kCDFeaturesWriteOnceBit),
-	kCDFeaturesReWriteableMask			= (1 << kCDFeaturesReWriteableBit),
-	kCDFeaturesCDDAStreamAccurateMask	= (1 << kCDFeaturesCDDAStreamAccurateBit),
-	kCDFeaturesPacketWriteMask			= (1 << kCDFeaturesPacketWriteBit),
-	kCDFeaturesTAOWriteMask				= (1 << kCDFeaturesTAOWriteBit),
-	kCDFeaturesSAOWriteMask				= (1 << kCDFeaturesSAOWriteBit),
-	kCDFeaturesRawWriteMask				= (1 << kCDFeaturesRawWriteBit),
-	kCDFeaturesTestWriteMask			= (1 << kCDFeaturesTestWriteBit),
-	kCDFeaturesBUFWriteMask				= (1 << kCDFeaturesBUFWriteBit)
-};
-
-typedef	UInt32 DVDFeatures;
-enum
-{
-	kDVDFeaturesCSSBit 					= 0,	// DVD-CSS
-	kDVDFeaturesReadStructuresBit 		= 1,	// DVD-ROM
-	kDVDFeaturesWriteOnceBit			= 2,	// DVD-R
-	kDVDFeaturesRandomWriteableBit		= 3,	// DVD-RAM
-	kDVDFeaturesReWriteableBit			= 4,	// DVD-RW
-	kDVDFeaturesTestWriteBit			= 5,	// DVD-R Write - Test Write
-	kDVDFeaturesBUFWriteBit				= 6,	// DVD-R Write - Buffer Underrun Free
-	kDVDFeaturesPlusRBit				= 7,	// DVD+R
-	kDVDFeaturesPlusRWBit				= 8,	// DVD+RW (implies backgound format support)
-	kDVDFeaturesHDReadBit				= 9,	// HD DVD-ROM
-	kDVDFeaturesHDRBit					= 10,	// HD DVD-R
-	kDVDFeaturesHDRAMBit				= 11,	// HD DVD-RAM
-	kDVDFeaturesHDRWBit					= 12	// HD DVD-RW
-};
-
-enum
-{
-	kDVDFeaturesCSSMask 				= (1 << kDVDFeaturesCSSBit),
-	kDVDFeaturesReadStructuresMask 		= (1 << kDVDFeaturesReadStructuresBit),
-	kDVDFeaturesWriteOnceMask			= (1 << kDVDFeaturesWriteOnceBit),
-	kDVDFeaturesRandomWriteableMask		= (1 << kDVDFeaturesRandomWriteableBit),
-	kDVDFeaturesReWriteableMask			= (1 << kDVDFeaturesReWriteableBit),
-	kDVDFeaturesTestWriteMask			= (1 << kDVDFeaturesTestWriteBit),
-	kDVDFeaturesBUFWriteMask			= (1 << kDVDFeaturesBUFWriteBit),
-	kDVDFeaturesPlusRMask				= (1 << kDVDFeaturesPlusRBit),
-	kDVDFeaturesPlusRWMask				= (1 << kDVDFeaturesPlusRWBit),
-	kDVDFeaturesHDReadMask				= (1 << kDVDFeaturesHDReadBit),
-	kDVDFeaturesHDRMask					= (1 << kDVDFeaturesHDRBit),
-	kDVDFeaturesHDRAMMask				= (1 << kDVDFeaturesHDRAMBit),
-	kDVDFeaturesHDRWMask				= (1 << kDVDFeaturesHDRWBit)
-};
-
-typedef	UInt32 BDFeatures;
-enum
-{
-	kBDFeaturesReadBit					= 0,	// BD-ROM
-	kBDFeaturesWriteBit					= 1		// BD-R / BD-RE
-};
-
-enum
-{
-	kBDFeaturesReadMask					= (1 << kBDFeaturesReadBit),
-	kBDFeaturesWriteMask				= (1 << kBDFeaturesWriteBit)
-};
-
-enum
-{
-	kDiscStatusEmpty 					= 0,
-	kDiscStatusIncomplete				= 1,
-	kDiscStatusComplete					= 2,
-	kDiscStatusOther					= 3,
-	kDiscStatusMask						= 0x03,
-	kDiscStatusErasableMask				= 0x10
-};
-
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-// MMC power states as defined in T10:1228D SCSI Multimedia Commands - 2 (MMC-2)
-// Revision 11a, August 30, 1999, page 312 (Annex F).
-enum
-{
-	kMMCPowerStateSystemSleep	= 0,
-	kMMCPowerStateSleep 		= 1,
-	kMMCPowerStateStandby 		= 2,
-	kMMCPowerStateIdle			= 3,
-	kMMCPowerStateActive		= 4,
-	kMMCNumPowerStates			= 5
-};
-
-enum
-{
-	kMediaStateUnlocked	= 0,
-	kMediaStateLocked 	= 1
-};
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOMemoryDescriptor.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOStorage.h>
-#include <IOKit/storage/IOCDTypes.h>
-#include <IOKit/storage/IODVDTypes.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
-
-// Forward definitions for internal use only classes
-class SCSIMultimediaCommands;
-class SCSIBlockCommands;
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIMultimediaCommandsDevice : public IOSCSIPrimaryCommandsDevice
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIMultimediaCommandsDevice )
-	
-private:
-
-#ifndef __LP64__
-
-    SCSIMultimediaCommands *	fSCSIMultimediaCommandObject;
-    SCSIMultimediaCommands *	GetSCSIMultimediaCommandObject ( void );
-	
-    SCSIBlockCommands *			fSCSIBlockCommandObject;			/* OBSOLETE */
-    SCSIBlockCommands *			GetSCSIBlockCommandObject ( void );	/* OBSOLETE */
-
-#endif	/* !__LP64__ */
-	
-	static void		AsyncReadWriteComplete ( SCSITaskIdentifier completedTask );
-	
-protected:
-	
-    // Reserve space for future expansion.
-    struct IOSCSIMultimediaCommandsDeviceExpansionData
-	{
-		IONotifier *		fPowerDownNotifier;
-		bool				fDeviceSupportsPowerOff;
-		BDFeatures			fSupportedBDFeatures;
-		bool				fDeviceSupportsAsyncNotification;
-		bool				fDeviceSupportsFastSpindown;
-		UInt8				fCDLoadingMechanism;
-	};
-    IOSCSIMultimediaCommandsDeviceExpansionData * fIOSCSIMultimediaCommandsDeviceReserved;
-	
-	#define fPowerDownNotifier 					fIOSCSIMultimediaCommandsDeviceReserved->fPowerDownNotifier
-	#define fDeviceSupportsPowerOff 			fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsPowerOff
-	#define fSupportedBDFeatures				fIOSCSIMultimediaCommandsDeviceReserved->fSupportedBDFeatures
-	#define fDeviceSupportsAsyncNotification	fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsAsyncNotification
-	#define fDeviceSupportsFastSpindown			fIOSCSIMultimediaCommandsDeviceReserved->fDeviceSupportsFastSpindown
-	#define fCDLoadingMechanism					fIOSCSIMultimediaCommandsDeviceReserved->fCDLoadingMechanism
-	
-#ifndef __LP64__
-	
-	// This method will retreive the SCSI Primary Command Set object for
-	// the class.  For subclasses, this will be overridden using a
-	// dynamic cast on the subclasses base command set object.
-	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
-	
-#endif	/* !__LP64__ */
-	
-	CDFeatures						fSupportedCDFeatures;
-	DVDFeatures						fSupportedDVDFeatures;
-
-	UInt16							fCurrentDiscSpeed;	
-	bool							fMediaChanged; 
-	bool							fMediaPresent;
-	
-	// The byte count of each physical block on the media.
-	UInt32							fMediaBlockSize;
-	
-	// The total number of blocks of fMediaBlockSize on the media.
-	UInt32							fMediaBlockCount;
-	
-	// Flags used to indicate device feature
-	bool							fMediaIsRemovable;
-	bool							fMediaIsWriteProtected;
-	UInt32							fMediaType;
-	
-	thread_call_t					fPollingThread;
-	bool							fDeviceSupportsLowPowerPolling;
-	bool							fLowPowerPollingEnabled;
-	UInt32							fPollingMode;
-	
-	enum
-	{
-		kPollingMode_Suspended		= 0,
-		kPollingMode_NewMedia 		= 1,
-		kPollingMode_MediaRemoval	= 2
-	};
-	
-	virtual IOReturn	setProperties ( OSObject * properties );
-	
-	virtual void 		CreateStorageServiceNub ( void );
-	virtual bool		DetermineDeviceCharacteristics ( void );
-	virtual IOReturn	DetermineIfMediaIsRemovable ( void );
-	virtual IOReturn	DetermineDeviceFeatures ( void );
-	virtual void		DetermineMediaType ( void );
-	virtual bool		CheckForDVDMediaType ( void );
-	virtual bool		CheckForCDMediaType ( void );
-	virtual void		PollForMedia ( void );
-	virtual void		EnablePolling ( void );
-	virtual void		DisablePolling ( void );
-	virtual void		CheckWriteProtection ( void );
-	virtual bool		ClearNotReadyStatus ( void );
-		
-	virtual IOReturn	GetDeviceConfiguration ( void );
-	virtual IOReturn	GetDeviceConfigurationSize ( UInt32 * size );
-	virtual IOReturn	ParseFeatureList ( UInt32 numProfiles, UInt8 * firstFeaturePtr );
-	
-	virtual IOReturn	GetMechanicalCapabilities ( void );
-	virtual IOReturn	GetMechanicalCapabilitiesSize ( UInt32 * size );
-	virtual IOReturn	ParseMechanicalCapabilities ( UInt8 * mechanicalCapabilitiesPtr );
-
-	virtual IOReturn	CheckForLowPowerPollingSupport ( void );
-	virtual IOReturn	GetCurrentPowerStateOfDrive ( UInt32 * powerState );
-
-	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
-									UInt64					startBlock,
-									UInt64					blockCount );
-
-	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
-									void *					clientData,
-									UInt64					startBlock,
-									UInt64					blockCount );
-	
-	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
-									UInt64					startBlock,
-									UInt64					blockCount );
-	
-	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
-									void *					clientData,
-									UInt64					startBlock,
-									UInt64					blockCount );
-
-    virtual void		SetMediaCharacteristics ( UInt32 blockSize, UInt32 blockCount );
- 	virtual void		ResetMediaCharacteristics ( void );
-
-	UInt8				ConvertBCDToHex ( UInt8 binaryCodedDigit );
-
-	// ------ User Client Support ------
-	
-	virtual IOReturn 	HandleSetUserClientExclusivityState ( IOService * userClient, bool state );
-
-	// ----- Power Management Support ------
-	
-	// We override this method to set our power states and register ourselves
-	// as a power policy maker.
-	virtual void 		InitializePowerManagement ( IOService * provider );
-	
-	// We override this method so that when we register for power management,
-	// we go to our active power state (which the drive is definitely in
-	// at startup time).
-	virtual UInt32		GetInitialPowerState ( void );
-
-	// We override this method in order to provide the number of transitions
-	// from Fully active to Sleep state so that the idle timer can be adjusted
-	// to the appropriate time period based on the disk spindown time set in
-	// the Energy Saver prefs panel.
-	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
-	
-	// The TicklePowerManager method is called to tell the power manager that the
-	// device needs to be in a certain power state to handle requests.
-	virtual void		TicklePowerManager ( void );
-
-	// The HandlePowerChange method is the state machine for power management.
-	// It is guaranteed to be on its own thread of execution (different from
-	// the power manager thread AND the workloop thread. This routine can
-	// send sync or async calls to the drive without worrying about threading
-	// issues.
-	virtual void		HandlePowerChange ( void );
-
-	// The HandleCheckPowerState (void) method is on the serialized side of the command
-	// gate and can change member variables safely without multi-threading issues.
-	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
-	// with the max power state the class registered with.
-	virtual void		HandleCheckPowerState ( void );
-
-	// The CheckMediaPresence method is called to see if the media which we
-	// anticipated being there is still there.
-	virtual bool		CheckMediaPresence ( void );
-	
-	virtual bool		InitializeDeviceSupport ( void );
-	virtual void		StartDeviceSupport ( void );
-	virtual void		SuspendDeviceSupport ( void );
-	virtual void		ResumeDeviceSupport ( void );
-	virtual void		StopDeviceSupport ( void );
-	virtual void		TerminateDeviceSupport ( void );
-	
-	virtual void		free ( void );
-	
-#ifndef __LP64__
-
-	virtual bool 		CreateCommandSetObjects ( void );
-	virtual void 		FreeCommandSetObjects ( void );
-
-#endif	/* !__LP64__ */
-
-	virtual IOReturn	VerifyDeviceState ( void );
-
-
-public:
-	
-	virtual IOReturn 	setAggressiveness ( unsigned long type, unsigned long minutes );
-	
-	virtual IOReturn	SyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					startBlock,
-											UInt64					blockCount );
-	
-	virtual IOReturn	AsyncReadWrite (	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											void *					clientData );
-
-	virtual IOReturn	EjectTheMedia ( void );
-	virtual IOReturn	GetTrayState ( UInt8 * trayState );
-	virtual IOReturn	SetTrayState ( UInt8 trayState );
-	virtual IOReturn	FormatMedia ( UInt64 byteCapacity );
-	virtual UInt32		GetFormatCapacities ( 	UInt64 * capacities,
-												UInt32   capacitiesMaxCount ) const;
-	virtual IOReturn	LockUnlockMedia ( bool doLock );
-	virtual IOReturn	SynchronizeCache ( void );
-	virtual IOReturn	ReportBlockSize ( UInt64 * blockSize );
-	virtual IOReturn	ReportEjectability ( bool * isEjectable );
-	virtual IOReturn	ReportLockability ( bool * isLockable );
-	virtual IOReturn	ReportPollRequirements ( bool * pollIsRequired,
-												 bool * pollIsExpensive );
-	virtual IOReturn	ReportMaxReadTransfer (  UInt64 	blockSize,
-												 UInt64 * 	max );
-	virtual IOReturn	ReportMaxValidBlock ( UInt64 * maxBlock );
-	virtual IOReturn	ReportMaxWriteTransfer ( UInt64	blockSize,
-												UInt64 * max );
-	virtual IOReturn	ReportMediaState ( 	bool * mediaPresent,
-											bool * changed );
-	virtual IOReturn	ReportRemovability ( bool * isRemovable );
-	virtual IOReturn	ReportWriteProtection ( bool * isWriteProtected );
-	
-	static 	void		sPollForMedia ( void * pdtDriver, void * refCon );
-
-	/* CD Specific */
-	virtual IOReturn	SetMediaAccessSpeed ( UInt16 kilobytesPerSecond );
-	
-	virtual IOReturn	GetMediaAccessSpeed ( UInt16 * kilobytesPerSecond );
-
-	virtual IOReturn	AsyncReadCD ( 	IOMemoryDescriptor * buffer,
-										UInt32 block,
-										UInt32 nblks,
-										CDSectorArea sectorArea,
-										CDSectorType sectorType,
-										void *	clientData );
-	
-	virtual IOReturn	ReadISRC ( UInt8 track, CDISRC isrc );
-	
-	virtual IOReturn	ReadMCN ( CDMCN mcn);
-	
-	virtual IOReturn	ReadTOC ( IOMemoryDescriptor * buffer );
-
-#ifndef __LP64__
-	
-	virtual IOReturn	AudioPause ( bool pause );
-	
-	virtual IOReturn	AudioPlay ( CDMSF timeStart, CDMSF timeStop );
-	
-	virtual IOReturn	AudioScan ( CDMSF timeStart, bool reverse );
-	
-	virtual IOReturn	AudioStop ( void );
-	
-	virtual IOReturn	GetAudioStatus ( CDAudioStatus * status );
-	
-	virtual IOReturn	GetAudioVolume ( UInt8 * leftVolume, UInt8 * rightVolume );
-	
-	virtual IOReturn	SetAudioVolume ( UInt8 leftVolume, UInt8 rightVolume );
-
-#endif	/* !__LP64__ */
-	
-	/* DVD Specific */
-	virtual UInt32			GetMediaType		( void );
-    
-	virtual IOReturn		ReportKey			( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt32 lba,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-												  
-	virtual IOReturn		SendKey				( IOMemoryDescriptor * buffer,
-												  const DVDKeyClass keyClass,
-												  const UInt8 agid,
-												  const DVDKeyFormat keyFormat );
-												  
-	virtual IOReturn		ReadDVDStructure 	( 	IOMemoryDescriptor * 		buffer,
-													const UInt32 				length,
-													const UInt8					structureFormat,
-													const UInt32				logicalBlockAddress,
-													const UInt8					layer,
-													const UInt8 				agid );
-
-	// The block size decoding for Read CD and Read CD MSF  as defined in table 255
-    bool	GetBlockSize (
-						UInt32 *					requestedByteCount,
-						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
-						SCSICmdField1Bit 			SYNC,
-						SCSICmdField2Bit 			HEADER_CODES,
-						SCSICmdField1Bit 			USER_DATA,
-						SCSICmdField1Bit 			EDC_ECC,
-						SCSICmdField2Bit 			ERROR_FIELD,
-						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS );
-	
-	SCSICmdField4Byte ConvertMSFToLBA ( SCSICmdField3Byte MSF );
-
-#ifndef __LP64__
-
-	// Command methods to access all commands available to MMC based devices.
-	// The BLANK command as defined in section 6.1.1
-	virtual bool BLANK (
-						SCSITaskIdentifier			request,
-		    			SCSICmdField1Bit 			IMMED, 
-						SCSICmdField3Bit 			BLANKING_TYPE, 
-						SCSICmdField4Byte 			START_ADDRESS_TRACK_NUMBER, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The CLOSE TRACK/SESSION command as defined in section 6.1.2
-    virtual bool CLOSE_TRACK_SESSION (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField1Bit 			SESSION, 
-						SCSICmdField1Bit 			TRACK, 
-						SCSICmdField2Byte 			TRACK_NUMBER, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The FORMAT UNIT command as defined in section 6.1.3
-    virtual bool FORMAT_UNIT (
-						SCSITaskIdentifier			request,
-		    			IOMemoryDescriptor *		dataBuffer,
-		    			IOByteCount					parameterListSize,
-						SCSICmdField1Bit 			FMT_DATA, 
-						SCSICmdField1Bit 			CMP_LIST, 
-						SCSICmdField3Bit 			FORMAT_CODE, 
-						SCSICmdField2Byte 			INTERLEAVE_VALUE, 
-						SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	
-	// The GET CONFIGURATION command as defined in section 6.1.4
-    virtual bool GET_CONFIGURATION (
-						SCSITaskIdentifier			request,
-   						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField2Bit 			RT, 
-						SCSICmdField2Byte 			STARTING_FEATURE_NUMBER, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The GET EVENT/STATUS NOTIFICATION command as defined in section 6.1.5
-    virtual bool GET_EVENT_STATUS_NOTIFICATION (
-						SCSITaskIdentifier			request,
-	    				IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField1Byte 			NOTIFICATION_CLASS_REQUEST, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The GET PERFORMANCE command as defined in section 6.1.6
-    virtual bool GET_PERFORMANCE (
-						SCSITaskIdentifier			request,
-	   					IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Bit 			TOLERANCE, 
-						SCSICmdField1Bit 			WRITE, 
-						SCSICmdField2Bit 			EXCEPT, 
-						SCSICmdField4Byte 			STARTING_LBA, 
-						SCSICmdField2Byte 			MAXIMUM_NUMBER_OF_DESCRIPTORS, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The LOAD/UNLOAD MEDIUM command as defined in section 6.1.7
-    virtual bool LOAD_UNLOAD_MEDIUM (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField1Bit 			LO_UNLO, 
-						SCSICmdField1Bit 			START, 
-						SCSICmdField1Byte 			SLOT, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The MECHANISM STATUS command as defined in section 6.1.8
-    virtual bool MECHANISM_STATUS (
-						SCSITaskIdentifier			request,
-	   					IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
-	// The PAUSE/RESUME command as defined in section 6.1.9
-    virtual bool PAUSE_RESUME (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			RESUME, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The PLAY AUDIO (10) command as defined in section 6.1.10
-    virtual bool PLAY_AUDIO_10 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField2Byte 			PLAY_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The PLAY AUDIO (12) command as defined in section 6.1.11
-    virtual bool PLAY_AUDIO_12 (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField4Byte 			PLAY_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The PLAY AUDIO MSF command as defined in section 6.1.12
-    virtual bool PLAY_AUDIO_MSF (
-						SCSITaskIdentifier			request,
-						SCSICmdField3Byte 			STARTING_MSF, 
-						SCSICmdField3Byte 			ENDING_MSF, 
-						SCSICmdField1Byte 			CONTROL );
-	
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The PLAY CD command as defined in section 6.1.13
-    virtual bool PLAY_CD (
-						SCSITaskIdentifier			request,
-						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
-						SCSICmdField1Bit 			CMSF,
-						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField4Byte 			PLAY_LENGTH_IN_BLOCKS, 
-						SCSICmdField1Bit 			SPEED,
-						SCSICmdField1Bit 			PORT2,
-						SCSICmdField1Bit 			PORT1,
-						SCSICmdField1Bit 			COMPOSITE,
-						SCSICmdField1Bit 			AUDIO,
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT *******************/
-
-#endif	/* !__LP64__ */
-	
-	virtual bool READ_10 (
-						SCSITaskIdentifier			request,
-		    			IOMemoryDescriptor 			*dataBuffer, 
-		    			UInt32						blockSize,
-		    			SCSICmdField1Bit 			DPO, 
-		    			SCSICmdField1Bit 			FUA,
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField2Byte 			TRANSFER_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	
-#ifndef __LP64__
-	
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The READ BUFFER CAPACITY command as defined in section 6.1.14
-    virtual bool READ_BUFFER_CAPACITY (
-						SCSITaskIdentifier			request,
-    					IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT *******************/
-	
-#endif	/* !__LP64__ */
-	
-	// The READ CD command as defined in section 6.1.15
-    virtual bool READ_CD (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			STARTING_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField3Byte 			TRANSFER_LENGTH, 
-						SCSICmdField1Bit 			SYNC,
-						SCSICmdField2Bit 			HEADER_CODES,
-						SCSICmdField1Bit 			USER_DATA,
-						SCSICmdField1Bit 			EDC_ECC,
-						SCSICmdField2Bit 			ERROR_FIELD,
-						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ CD MSF command as defined in section 6.1.16
-    virtual bool READ_CD_MSF (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField3Bit 			EXPECTED_SECTOR_TYPE,
-						SCSICmdField3Byte 			STARTING_MSF, 
-						SCSICmdField3Byte 			ENDING_MSF, 
-						SCSICmdField1Bit 			SYNC,
-						SCSICmdField2Bit 			HEADER_CODES,
-						SCSICmdField1Bit 			USER_DATA,
-						SCSICmdField1Bit 			EDC_ECC,
-						SCSICmdField2Bit 			ERROR_FIELD,
-						SCSICmdField3Bit 			SUBCHANNEL_SELECTION_BITS,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ CAPACITY command as defined in section 6.1.17
-    virtual bool READ_CAPACITY (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField1Bit 			PMI,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ DISC INFORMATION command as defined in section 6.1.18
-    virtual bool READ_DISC_INFORMATION (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ DVD STRUCTURE command as defined in section 6.1.19
-    virtual bool READ_DVD_STRUCTURE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField4Byte 			ADDRESS,
-						SCSICmdField1Byte 			LAYER_NUMBER, 
-						SCSICmdField1Byte 			FORMAT, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField2Bit 			AGID,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ FORMAT CAPACITIES command as defined in section 6.1.20
-    virtual bool READ_FORMAT_CAPACITIES (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-	
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The READ HEADER command as defined in section 6.1.21
-    virtual bool READ_HEADER (
-						SCSITaskIdentifier			request,
-    					IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			MSF,
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT ***********************/
-
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The READ MASTER CUE command as defined in section 6.1.22
-    virtual bool READ_MASTER_CUE (
-						SCSITaskIdentifier			request,
-   						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Byte 			SHEET_NUMBER, 
-						SCSICmdField3Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT ***********************/
-
-#endif	/* !__LP64__ */
-	
-	// The READ SUB-CHANNEL command as defined in section 6.1.23
-    virtual bool READ_SUB_CHANNEL (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			MSF,
-						SCSICmdField1Bit 			SUBQ,
-						SCSICmdField1Byte 			SUB_CHANNEL_PARAMETER_LIST, 
-						SCSICmdField1Byte 			TRACK_NUMBER, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ TOC/PMA/ATIP command as defined in section 6.1.24/25
-    virtual bool READ_TOC_PMA_ATIP (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer, 
-						SCSICmdField1Bit 			MSF,
-						SCSICmdField4Bit 			FORMAT,
-						SCSICmdField1Byte			TRACK_SESSION_NUMBER,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The READ TRACK INFORMATION command as defined in section 6.1.26
-    virtual bool READ_TRACK_INFORMATION (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Bit 			ADDRESS_NUMBER_TYPE,
-						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS_TRACK_SESSION_NUMBER,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The REPAIR TRACK command as defined in section 6.1.27
-    virtual bool REPAIR_TRACK (
-						SCSITaskIdentifier			request,
-						SCSICmdField2Byte 			TRACK_NUMBER, 
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT ***********************/
-	
-	// The REPORT KEY command as defined in section 6.1.28
-    virtual bool REPORT_KEY (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField2Bit 			AGID,
-						SCSICmdField6Bit 			KEY_FORMAT,
-						SCSICmdField1Byte 			CONTROL );
-	
-	// The RESERVE TRACK command as defined in section 6.1.29
-    virtual bool RESERVE_TRACK (
-						SCSITaskIdentifier			request,
-						SCSICmdField4Byte			RESERVATION_SIZE,
-						SCSICmdField1Byte 			CONTROL );
-	
-	// The SCAN command as defined in section 6.1.30
-    virtual bool SCAN (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			DIRECT,
-						SCSICmdField1Bit 			RELADR,
-						SCSICmdField4Byte			SCAN_STARTING_ADDRESS_FIELD,
-						SCSICmdField2Bit 			TYPE,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The SEND CUE SHEET command as defined in section 6.1.31
-    virtual bool SEND_CUE_SHEET (
-						SCSITaskIdentifier			request,
-	    				IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField3Byte			CUE_SHEET_SIZE,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The SEND DVD STRUCTURE command as defined in section 6.1.32
-    virtual bool SEND_DVD_STRUCTURE (
-						SCSITaskIdentifier			request,
-	   	 				IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Byte			FORMAT,
-						SCSICmdField2Byte 			STRUCTURE_DATA_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The SEND EVENT command as defined in section 6.1.33
-    virtual bool SEND_EVENT (
-						SCSITaskIdentifier			request,
-	   		 			IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	
-	// The SEND KEY command as defined in section 6.1.34
-    virtual bool SEND_KEY (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
-						SCSICmdField2Bit 			AGID,
-						SCSICmdField6Bit 			KEY_FORMAT,
-						SCSICmdField1Byte 			CONTROL );
-
-	// The SEND OPC INFORMATION command as defined in section 6.1.35
-    virtual bool SEND_OPC_INFORMATION (
-						SCSITaskIdentifier			request,
-	    				IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField1Bit 			DO_OPC, 
-						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-#endif	/* !__LP64__ */
-
-	/*********************** LEGACY COMMAND SUPPORT ***********************/
-	// The SET CD SPEED command as defined in section 6.1.36
-    virtual bool SET_CD_SPEED (
-						SCSITaskIdentifier			request,
-						SCSICmdField2Byte 			LOGICAL_UNIT_READ_SPEED, 
-						SCSICmdField2Byte 			LOGICAL_UNIT_WRITE_SPEED, 
-						SCSICmdField1Byte 			CONTROL );
-	/*********************** END LEGACY COMMAND SUPPORT ***********************/
-
-	// The SET READ AHEAD command as defined in section 6.1.37
-    virtual bool SET_READ_AHEAD (
-						SCSITaskIdentifier			request,
-						SCSICmdField4Byte 			TRIGGER_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField4Byte 			READ_AHEAD_LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The SET STREAMING command as defined in section 6.1.38
-    virtual bool SET_STREAMING (
-						SCSITaskIdentifier			request,
-	 		   			IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool START_STOP_UNIT ( 
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField4Bit 			POWER_CONDITIONS, 
-						SCSICmdField1Bit 			LOEJ, 
-						SCSICmdField1Bit 			START, 
-						SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-	
-	// The STOP PLAY/SCAN command as defined in section 6.1.39
-    virtual bool STOP_PLAY_SCAN (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-
-	// The SYNCHRONIZE CACHE command as defined in section 6.1.40
-    virtual bool SYNCHRONIZE_CACHE (
-						SCSITaskIdentifier			request,
-						SCSICmdField1Bit 			IMMED, 
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField2Byte 			NUMBER_OF_BLOCKS, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The WRITE (10) command as defined in section 6.1.41
-    virtual bool WRITE_10 (
-						SCSITaskIdentifier			request,
-		    			IOMemoryDescriptor *		dataBuffer, 
-		    			UInt32						blockSize,
-						SCSICmdField1Bit 			DPO, 
-						SCSICmdField1Bit 			FUA, 
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField2Byte 			TRANSFER_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-
-	// The WRITE AND VERIFY (10) command as defined in section 6.1.42
-    virtual bool WRITE_AND_VERIFY_10 (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-		    			UInt32						blockSize,
-						SCSICmdField1Bit 			DPO, 
-						SCSICmdField1Bit 			BYT_CHK, 
-						SCSICmdField1Bit 			RELADR, 
-						SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-						SCSICmdField4Byte 			TRANSFER_LENGTH, 
-						SCSICmdField1Byte 			CONTROL );
-	
-	/* Added with 10.1.3 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 1 );
-	
-	virtual IOReturn	ReadTOC (	IOMemoryDescriptor *	buffer,
-									CDTOCFormat				format,
-									UInt8					msf,
-									UInt32					trackSessionNumber,
-									UInt16 *				actualByteCount );
-	
-	/* Added with 10.1.3 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 2 );
-    
-	virtual IOReturn	ReadDiscInfo (	IOMemoryDescriptor *	buffer,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.1.3 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 3 );
-	
-	virtual IOReturn	ReadTrackInfo (	IOMemoryDescriptor *	buffer,
-										UInt32					address,
-										CDTrackInfoAddressType	addressType,
-										UInt16 *				actualByteCount );
-	
-	/* Added with 10.2 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 4 );
-	
-	virtual IOReturn	PowerDownHandler ( void * 		refCon,
-										   UInt32 		messageType,
-										   IOService * 	provider,
-										   void * 		messageArgument,
-										   vm_size_t 	argSize );
-	
-	/* Added with 10.3.3 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 5 );
-	
-	
-protected:
-	
-	
-	virtual void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
-	
-	
-public:
-	
-	
-	/* Added with 10.5 */
-    OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 6 );
-	
-	virtual	IOReturn	ReadDiscStructure (	IOMemoryDescriptor * 		buffer,
-											const UInt32 				length,
-											const UInt8					structureFormat,
-											const UInt32				logicalBlockAddress,
-											const UInt8					layer,
-											const UInt8 				agid,
-											const UInt8					mediaType );
-	
-	
-	bool		CheckForBDMediaType ( void );
-	
-	
-    bool		READ_DISC_STRUCTURE (
-						SCSITaskIdentifier			request,
-						IOMemoryDescriptor *		dataBuffer,
-						SCSICmdField4Bit 			MEDIA_TYPE,
-						SCSICmdField4Byte 			ADDRESS,
-						SCSICmdField1Byte 			LAYER_NUMBER, 
-						SCSICmdField1Byte 			FORMAT, 
-						SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-						SCSICmdField2Bit 			AGID,
-						SCSICmdField1Byte 			CONTROL );
-	
-	
-    OSMetaClassDeclareReservedUsed ( IOSCSIMultimediaCommandsDevice, 7 );
-	
-	virtual	IOReturn	ReserveTrack (	UInt8		reservationType,
-										UInt8		reservationFormat,
-										UInt64		ReservationParameter );
-	
-	
-	bool		RESERVE_TRACK_V2 (	SCSITaskIdentifier		request,
-									SCSICmdField1Bit		RMZ,
-									SCSICmdField1Bit		ARSV,
-									SCSICmdField7Byte		RESERVATION_PARAMETER,
-									SCSICmdField1Byte 		CONTROL					);
-	
-	
-	bool		REPORT_KEY_V2 (	SCSITaskIdentifier			request,
-								IOMemoryDescriptor *		dataBuffer,
-								SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
-								SCSICmdField1Byte			KEY_CLASS,
-								SCSICmdField2Byte 			ALLOCATION_LENGTH,
-								SCSICmdField2Bit 			AGID,
-								SCSICmdField6Bit 			KEY_FORMAT,
-								SCSICmdField1Byte 			CONTROL					);
-	
-	
-	bool		SEND_KEY_V2 (	SCSITaskIdentifier			request,
-								IOMemoryDescriptor *		dataBuffer,
-								SCSICmdField1Byte			KEY_CLASS,
-								SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-								SCSICmdField2Bit 			AGID,
-								SCSICmdField6Bit 			KEY_FORMAT,
-								SCSICmdField1Byte 			CONTROL					);
-	
-	
-protected:
-	
-	
-	void		SetPollingMode ( UInt32 newPollingMode );
-	
-	
-public:
-	
-	
-	/* 10.6.0 */
-	
-	IOReturn	RequestIdle ( void );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 	8 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 	9 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 10 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 11 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 12 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 13 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 14 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 15 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIMultimediaCommandsDevice, 16 );
-    
-};
-
-#endif /* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_SCSI_MULTIMEDIA_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceNub.h b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceNub.h
deleted file mode 100644
index f88a1e9..0000000
--- a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceNub.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_
-#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-// Probe score values
-enum
-{
-	kPeripheralDeviceTypeNoMatch 	= 0,
-	kDefaultProbeRanking 			= 5000,
-	kFirstOrderRanking 				= 10000,
-	kSecondOrderRanking 			= 15000,
-	kThirdOrderRanking 				= 20000
-};
-
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOSyncer.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIProtocolServices.h>
-
-
-// Forward definitions for internal use only classes.
-class SCSIPrimaryCommands;
-
-//-----------------------------------------------------------------------------
-//	Class Declarations
-//-----------------------------------------------------------------------------
-
-class IOSCSIPeripheralDeviceNub : public IOSCSIProtocolServices
-{
-	
-	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceNub )
-	
-private:
-	
-	static bool		sCompareIOProperty (
-										IOService *		object,
-										OSDictionary *	table,
-										char *			propertyKeyName,
-										bool *			matches );
-	
-	static void		TaskCallback ( SCSITaskIdentifier completedTask );
-	void			TaskCompletion ( SCSITaskIdentifier completedTask );
-	
-	static IOReturn	sWaitForTask ( void * object, SCSITask * request );
-	IOReturn		GatedWaitForTask ( SCSITask * request );
-	
-protected:
-
-	SCSIServiceResponse SendTask ( SCSITask * request );
-	
-	bool			InterrogateDevice ( void );										
-
-	// Reserve space for future expansion.
-	struct IOSCSIPeripheralDeviceNubExpansionData { };
-	IOSCSIPeripheralDeviceNubExpansionData * fIOSCSIPeripheralDeviceNubReserved;
-	
-	IOSCSIProtocolInterface *		fProvider;
-#ifndef __LP64__
-	SCSIPrimaryCommands *			fSCSIPrimaryCommandObject;
-#endif
-	UInt8							fDefaultInquiryCount;
-	
-	virtual bool		SendSCSICommand ( 	SCSITaskIdentifier 		request, 
-											SCSIServiceResponse * 	serviceResponse,
-											SCSITaskStatus * 		taskStatus );
-	
-	virtual SCSIServiceResponse	AbortSCSICommand ( SCSITaskIdentifier request );
-	
-	// The IsProtocolServiceSupported will return true if the specified
-	// feature is supported by the protocol layer.  If the service has a value that must be
-	// returned, it will be returned in the serviceValue output parameter.
-	virtual bool	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
-	
-	virtual bool	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
-	
-	// We override this method in order to NOT do power management
-	virtual void	InitializePowerManagement ( IOService * provider );
-	
-public:
-	
-	bool				init	( OSDictionary * propTable );
-	virtual bool		start	( IOService * provider );
-	virtual void		free	( void );
-	
-	virtual IOReturn	message ( UInt32 type, IOService * nub, void * arg );
-										
-	virtual bool		matchPropertyTable ( OSDictionary * table,
-											 SInt32 * score );
-	
-	// The ExecuteCommand method will take a SCSITask object and transport
-	// it across the physical wires to the device
-	virtual	void		ExecuteCommand ( SCSITaskIdentifier	request );
-	
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a specific task be aborted.
-	virtual SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
-
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a all tasks curerntly in the task set be aborted.
-	virtual SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
-
-	virtual SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
-
-	virtual SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
-    
-	virtual SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
-
-	virtual SCSIServiceResponse		TargetReset ( void );
-
-    // ************* Obsoleted Member Routine ****************
-    // The AbortCommand method is replaced by the AbortTask Management function and
-    // should no longer be called.
-	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier abortTask );
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  1 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  2 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub,  9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceNub, 16 );
-	
-};
-
-
-
-class IOSCSILogicalUnitNub : public IOSCSIPeripheralDeviceNub
-{
-	
-	OSDeclareDefaultStructors ( IOSCSILogicalUnitNub )
-	
-private:
-	
-	UInt8				fLogicalUnitNumber;
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSILogicalUnitNubExpansionData { };
-	IOSCSILogicalUnitNubExpansionData * fIOSCSILogicalUnitNubReserved;
-	
-public:
-	
-	virtual bool		start	( IOService * provider );
-	
-	virtual void		SetLogicalUnitNumber ( UInt8 newLUN );
-	
-	UInt8				GetLogicalUnitNumber ( void );
-	
-	// The ExecuteCommand method will take a SCSITask object and transport
-	// it across the physical wires to the device
-	virtual	void		ExecuteCommand ( SCSITaskIdentifier	request );
-	
-	// The AbortCommand method will abort the indicated SCSI Task object,
-	// if it is possible and the SCSI Task has not already completed.
-	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier	abortTask );
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  1 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  2 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub,  9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSILogicalUnitNub, 16 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_NUB_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType00.h b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType00.h
deleted file mode 100644
index 34fdb18..0000000
--- a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType00.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_
-#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIPeripheralDeviceType00 : public IOSCSIBlockCommandsDevice
-{
-	
-	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType00 )
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSIPeripheralDeviceType00ExpansionData
-	{
-		OSSet *	fClients;
-	};
-	IOSCSIPeripheralDeviceType00ExpansionData * fIOSCSIPeripheralDeviceType00Reserved;
-	
-public:
-	
-	bool				init ( OSDictionary * propTable );
-	virtual bool		start ( IOService * provider );
-	virtual void		free ( void );
-
-	virtual bool		handleOpen (
-							  IOService * 	client,
-							  IOOptionBits 	options,
-							  void * 		access );
-	
-	virtual void		handleClose (
-							IOService * 	client,
-							IOOptionBits 	options );
-	
-	virtual bool		handleIsOpen ( const IOService * client ) const;
-	
-    virtual IOReturn	newUserClient (
-    						   task_t			owningTask,
-    						   void *			securityID,
-    						   UInt32			type,
-    						   OSDictionary * 	properties,
-    						   IOUserClient **	handler );
-	virtual void 		CreateStorageServiceNub ( void );
-
-	virtual char *		GetVendorString ( void );
-	virtual char *		GetProductString ( void );
-	virtual char *		GetRevisionString ( void );
-	
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 1 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 2 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType00, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_OO_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType05.h b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType05.h
deleted file mode 100644
index 22066f0..0000000
--- a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType05.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_
-#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIMultimediaCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIPeripheralDeviceType05 : public IOSCSIMultimediaCommandsDevice
-{
-	
-	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType05 )
-	
-protected:
-    
-    // Reserve space for future expansion.
-    struct IOSCSIPeripheralDeviceType05ExpansionData { };
-    IOSCSIPeripheralDeviceType05ExpansionData * fIOSCSIPeripheralDeviceType05Reserved;
-	
-public:
-    
-    bool			init	( OSDictionary * propTable );
-    virtual bool	start	( IOService * provider );
-    virtual void 	stop	( IOService *  provider );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 1 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 2 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 3 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 4 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 5 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 6 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 7 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType05, 8 );
-    
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_05_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType07.h b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType07.h
deleted file mode 100644
index 661136d..0000000
--- a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType07.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_
-#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIBlockCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIPeripheralDeviceType07 : public IOSCSIBlockCommandsDevice
-{
-	
-	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType07 )
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSIPeripheralDeviceType07ExpansionData { };
-	IOSCSIPeripheralDeviceType07ExpansionData * fIOSCSIPeripheralDeviceType07Reserved;
-	
-public:
-	
-	bool			init ( OSDictionary * propTable );
-	virtual bool	start ( IOService * provider );
-	virtual void 	stop ( IOService *  provider );
-		
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 1 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 2 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType07, 8 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_07_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType0E.h b/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType0E.h
deleted file mode 100644
index cc9ec06..0000000
--- a/i386/include/IOKit/scsi/IOSCSIPeripheralDeviceType0E.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_
-#define _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIPeripheralDeviceType0E : public IOSCSIReducedBlockCommandsDevice
-{
-	
-	OSDeclareDefaultStructors ( IOSCSIPeripheralDeviceType0E )
-	
-protected:
-    
-    // Reserve space for future expansion.
-    struct IOSCSIPeripheralDeviceType0EExpansionData { };
-    IOSCSIPeripheralDeviceType0EExpansionData * fIOSCSIPeripheralDeviceType0EReserved;
-	
-public:
-    
-    bool			init 	( OSDictionary * propTable );
-    virtual bool	start 	( IOService * provider );
-    virtual void 	stop 	( IOService *  provider );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 1 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 2 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 3 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 4 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 5 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 6 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 7 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIPeripheralDeviceType0E, 8 );
-    
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PERIPHERAL_DEVICE_TYPE_0E_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIPrimaryCommandsDevice.h b/i386/include/IOKit/scsi/IOSCSIPrimaryCommandsDevice.h
deleted file mode 100644
index ba0f1a0..0000000
--- a/i386/include/IOKit/scsi/IOSCSIPrimaryCommandsDevice.h
+++ /dev/null
@@ -1,805 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_
-#define _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOReturn.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOSyncer.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/SCSICommandDefinitions.h>
-#include <IOKit/scsi/SCSICmds_INQUIRY_Definitions.h>
-#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
-#include <IOKit/scsi/IOSCSIProtocolInterface.h>
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-// Notification messages
-enum
-{
-	kSCSIServicesNotification_Suspend	= 0x69000080,
-	kSCSIServicesNotification_Resume	= 0x69000090
-};
-
-
-// Timeout values
-enum
-{
-	kOneSecondTimeoutInMS 		= 1000,
-	kTenSecondTimeoutInMS 		= 10 * kOneSecondTimeoutInMS,
-	kThirtySecondTimeoutInMS	= 30 * kOneSecondTimeoutInMS,
-    kFortyFiveSecondTimeoutInMS	= 45 * kOneSecondTimeoutInMS
-};
-
-// Mode page values for page control field
-enum
-{
-	kModePageControlCurrentValues		= 0x00,
-	kModePageControlChangeableValues	= 0x01,
-	kModePageControlDefaultValues		= 0x02,
-	kModePageControlSavedValues			= 0x03
-};
-
-// The command should be tried 5 times.  The original attempt 
-// plus 4 retries.
-#define kDefaultRetryCount		4
-
-// Forward declarations for internal use only classes
-class SCSIPrimaryCommands;
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIPrimaryCommandsDevice : public IOSCSIProtocolInterface
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIPrimaryCommandsDevice )
-	
-private:
-	
-#ifndef __LP64__
-	SCSIPrimaryCommands *			fSCSIPrimaryCommandObject;
-#endif
-
-	IOSCSIProtocolInterface *		fProtocolDriver;
-	
-	// The fProtocolAccessEnabled member variable indicates whether
-	// requests coming from the client can be sent to the device.
-	// This will be set to true after the Protocol Service driver is successfully 
-	// opened and before the call to InitializeDeviceSupport and set to false before 
-	// TerminateDeviceSupport is called.
-	bool							fProtocolAccessEnabled;
-	
-	// The fDeviceAccessEnabled member variable indicates whether
-	// requests coming from the client can be sent to the device.
-	// This will be set to true after InitializeDeviceSupport is called and
-	// set to false before StopDeviceSupport is called.
-	bool							fDeviceAccessEnabled;
-	bool							fDeviceAccessSuspended;
-	
-	static bool		ServerKeyswitchCallback ( void *		target,
-											  void *		refCon,
-											  IOService *	newService );
-	
-	static void		TaskCallback ( SCSITaskIdentifier completedTask );
-	void			TaskCompletion ( SCSITaskIdentifier completedTask );
-	
-	static IOReturn	sWaitForTask ( void * object, SCSITaskIdentifier request );
-	IOReturn		GatedWaitForTask ( SCSITaskIdentifier request );
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSIPrimaryCommandsDeviceExpansionData
-	{
-		IONotifier *				fKeySwitchNotifier;
-		UInt8						fANSIVersion;
-		UInt32						fReadTimeoutDuration;
-		UInt32						fWriteTimeoutDuration;
-		bool						fCMDQUE;
-		SCSITaggedTaskIdentifier	fTaskID;
-		IOSimpleLock *				fTaskIDLock;
-		UInt32						fRetryCount;
-	};
-	IOSCSIPrimaryCommandsDeviceExpansionData * fIOSCSIPrimaryCommandsDeviceReserved;
-	
-	#define	fReadTimeoutDuration		fIOSCSIPrimaryCommandsDeviceReserved->fReadTimeoutDuration
-	#define	fWriteTimeoutDuration		fIOSCSIPrimaryCommandsDeviceReserved->fWriteTimeoutDuration
-	#define	fRetryCount					fIOSCSIPrimaryCommandsDeviceReserved->fRetryCount
-	
-	
-	UInt8							fDefaultInquiryCount;
-	OSDictionary *					fDeviceCharacteristicsDictionary;
-	UInt32							fNumCommandsOutstanding;
-	
-	virtual void 					free ( void );
-	void							SetANSIVersion ( UInt8 );
-	void							SetCMDQUE ( bool value );
-	IOReturn						GetModeSense ( 
-										IOMemoryDescriptor *		dataBuffer,
-										SCSICmdField6Bit 			PAGE_CODE,
-										SCSICmdField2Byte 			ALLOCATION_LENGTH,
-										bool *						use10ByteModeSense );
-	bool							RetrieveINQUIRYData (
-										UInt8						EVPD,
-										UInt8						inquiryPage,
-										UInt8 *						inquiryBuffer,
-										UInt16 *					dataSize );
-	
-	// This flag is set if the device responds to a MODE_SENSE_10 command
-	// with the page code set to 0x1A (Power Conditions Mode Page)
-	bool							fDeviceSupportsPowerConditions;
-	
-	// This method will retreive the SCSI Primary Command Set object for
-	// the class.  For subclasses, this will be overridden using a
-	// dynamic cast on the base command set object of the subclass.
-
-#ifndef __LP64__
-	
-	// ------ DEPRECATED API ----------
-	// This should no longer be called by subclasses as the command builder
-	// objects will be removed in a later release.
-	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );	
-	
-	// This method is called by the start method to create all the command
-	// objects needed by the class.  For subclasses, this will be overridden
-	// to create its needed command set objects.
-	virtual bool					CreateCommandSetObjects ( void );
-	
-	// This method is called by the free method to free all the command
-	// objects needed by the class.  For subclasses, this will be overridden
-	// to free its needed command set objects.
-	virtual void					FreeCommandSetObjects ( void );
-
-#endif
-	
-	
-	// This method is called by the start method to obtain information from
-	// the device with regards to whether it supports the power conditions mode page.
-	virtual void					CheckPowerConditionsModePage ( void );
-	
-	// This will return back the Protocol driver that is used to
-	// send service requests to the device.
-	virtual IOSCSIProtocolInterface * GetProtocolDriver ( void );
-	
-	// This will get a new SCSITask for the caller
-	virtual SCSITaskIdentifier		GetSCSITask ( void );
-	
-	// This will release a SCSITask (eventually return it to a pool)
-	virtual void					ReleaseSCSITask ( SCSITaskIdentifier request );
-	
-	// This will return a unique value for the tagged task identifier
-	SCSITaggedTaskIdentifier		GetUniqueTagID ( void );
-	
-	// Call for executing the command synchronously	
-	SCSIServiceResponse 			SendCommand ( 	
-										SCSITaskIdentifier 	request,
-										UInt32 				timeoutDuration );
-														
-	// Call for executing the command asycnchronously	
-	void 							SendCommand ( 
-										SCSITaskIdentifier 	request,
-										UInt32 				timeoutDuration,
-										SCSITaskCompletion 	taskCompletion );
-	
-	
-	virtual bool 					InitializeDeviceSupport ( void ) = 0;
-	virtual void 					StartDeviceSupport ( void ) = 0;
-	virtual void 					SuspendDeviceSupport ( void ) = 0;
-	virtual void 					ResumeDeviceSupport ( void ) = 0;
-	virtual void 					StopDeviceSupport ( void ) = 0;
-	virtual void 					TerminateDeviceSupport ( void ) = 0;
-	virtual UInt32					GetNumberOfPowerStateTransitions ( void ) = 0;
-	
-	virtual IOReturn				VerifyDeviceState ( void );
-	// Called to clear any power-on/reset status in the drive
-	virtual bool					ClearPowerOnReset ( void );
-	virtual bool					ClearNotReadyStatus ( void ) = 0;
-	
-	bool							IsProtocolAccessEnabled ( void );
-	bool							IsDeviceAccessEnabled ( void );
-	bool							IsDeviceAccessSuspended ( void );
-
-	// Accessors for saving and retrieving data from an SCSITask object.
-	bool 							ResetForNewTask(	
-										SCSITaskIdentifier 		request );
-	bool							SetTaskAttribute ( 
-										SCSITaskIdentifier 		request, 
-										SCSITaskAttribute 		newAttribute );
-	SCSITaskAttribute				GetTaskAttribute ( 
-										SCSITaskIdentifier 		request );
-	bool							SetTaggedTaskIdentifier ( 
-										SCSITaskIdentifier 			request, 
-										SCSITaggedTaskIdentifier	taggedTaskIdentifier );
-	SCSITaggedTaskIdentifier		GetTaggedTaskIdentifier ( 
-										SCSITaskIdentifier 		request );
-	bool							SetTaskState ( 	
-										SCSITaskIdentifier 		request,
-										SCSITaskState 			newTaskState );
-	SCSITaskState					GetTaskState ( 
-										SCSITaskIdentifier 		request );
-	bool							SetTaskStatus ( 
-										SCSITaskIdentifier 		request, 
-										SCSITaskStatus 			newStatus );
-	SCSITaskStatus					GetTaskStatus ( 
-										SCSITaskIdentifier 		request );
-	bool 							SetCommandDescriptorBlock ( 
-										SCSITaskIdentifier 		request,
-										UInt8					cdbByte0,
-										UInt8					cdbByte1,
-										UInt8					cdbByte2,
-										UInt8					cdbByte3,
-										UInt8					cdbByte4,
-										UInt8					cdbByte5 );
-	
-	// Populate the 10 Byte Command Descriptor Block
-	bool 							SetCommandDescriptorBlock ( 
-										SCSITaskIdentifier 		request,
-										UInt8					cdbByte0,
-										UInt8					cdbByte1,
-										UInt8					cdbByte2,
-										UInt8					cdbByte3,
-										UInt8					cdbByte4,
-										UInt8					cdbByte5,
-										UInt8					cdbByte6,
-										UInt8					cdbByte7,
-										UInt8					cdbByte8,
-										UInt8					cdbByte9 );
-	
-	// Populate the 12 Byte Command Descriptor Block
-	bool 							SetCommandDescriptorBlock ( 
-										SCSITaskIdentifier 		request,
-										UInt8					cdbByte0,
-										UInt8					cdbByte1,
-										UInt8					cdbByte2,
-										UInt8					cdbByte3,
-										UInt8					cdbByte4,
-										UInt8					cdbByte5,
-										UInt8					cdbByte6,
-										UInt8					cdbByte7,
-										UInt8					cdbByte8,
-										UInt8					cdbByte9,
-										UInt8					cdbByte10,
-										UInt8					cdbByte11 );
-	
-	// Populate the 16 Byte Command Descriptor Block
-	bool 							SetCommandDescriptorBlock ( 
-										SCSITaskIdentifier 		request,
-										UInt8					cdbByte0,
-										UInt8					cdbByte1,
-										UInt8					cdbByte2,
-										UInt8					cdbByte3,
-										UInt8					cdbByte4,
-										UInt8					cdbByte5,
-										UInt8					cdbByte6,
-										UInt8					cdbByte7,
-										UInt8					cdbByte8,
-										UInt8					cdbByte9,
-										UInt8					cdbByte10,
-										UInt8					cdbByte11,
-										UInt8					cdbByte12,
-										UInt8					cdbByte13,
-										UInt8					cdbByte14,
-										UInt8					cdbByte15 );
-										
-	bool							SetDataTransferDirection ( 
-										SCSITaskIdentifier 		request, 
-										UInt8 					newDirection );
-	UInt8							GetDataTransferDirection ( 
-										SCSITaskIdentifier 		request );
-	bool							SetRequestedDataTransferCount (
-										SCSITaskIdentifier 		request, 
-										UInt64 					newRequestedCount );
-	UInt64							GetRequestedDataTransferCount (
-										SCSITaskIdentifier 		request );
-	bool							SetRealizedDataTransferCount (
-										SCSITaskIdentifier 		request,
-										UInt64 					newRealizedDataCount );
-	UInt64							GetRealizedDataTransferCount ( 
-										SCSITaskIdentifier 		request );
-	bool							SetDataBuffer ( 
-										SCSITaskIdentifier 		request, 
-										IOMemoryDescriptor * 	newBuffer );
-	IOMemoryDescriptor *			GetDataBuffer ( 
-										SCSITaskIdentifier 		request );
-	bool							SetTimeoutDuration ( 
-										SCSITaskIdentifier 		request, 
-										UInt32 					newTimeout );
-	UInt32							GetTimeoutDuration ( 
-										SCSITaskIdentifier 		request );
-	bool							SetTaskCompletionCallback ( 
-										SCSITaskIdentifier 		request,
-										SCSITaskCompletion 		newCallback );
-	void							TaskCompletedNotification ( 
-										SCSITaskIdentifier 		request );
-	
-	bool							SetServiceResponse (
-										SCSITaskIdentifier 		request,
-										SCSIServiceResponse 	serviceResponse );
-	SCSIServiceResponse 			GetServiceResponse (
-										SCSITaskIdentifier 		request );
-	bool							SetAutosenseCommand (
-										SCSITaskIdentifier 		request,
-										UInt8					cdbByte0,
-										UInt8					cdbByte1,
-										UInt8					cdbByte2,
-										UInt8					cdbByte3,
-										UInt8					cdbByte4,
-										UInt8					cdbByte5 );
-	bool							GetAutoSenseData (
-										SCSITaskIdentifier 		request,
-										SCSI_Sense_Data * 		senseData ); // DEPRECATED, use below function instead
-	bool							GetAutoSenseData (
-										SCSITaskIdentifier 		request,
-										SCSI_Sense_Data * 		senseData,
-										UInt8					senseDataSize );
-	UInt8							GetAutoSenseDataSize (
-										SCSITaskIdentifier 		request );
-	
-	bool							SetApplicationLayerReference (
-										SCSITaskIdentifier 		request,
-										void * 					newReferenceValue );
-	void *							GetApplicationLayerReference (
-										SCSITaskIdentifier 		request );
-	
-	void 							IncrementOutstandingCommandsCount ( void );
-	static void						sIncrementOutstandingCommandsCount ( 
-										IOSCSIPrimaryCommandsDevice * self );
-	virtual void					HandleIncrementOutstandingCommandsCount ( void );	
-	
-
-	// This static member routine provides a mechanism for retrieving a pointer to
-	// the object that is claimed as the owner of the specified SCSITask.
-	static OSObject *				sGetOwnerForTask ( SCSITaskIdentifier request );
-	
-public:
-	
-	bool				init ( OSDictionary * propTable );
-	virtual bool		start ( IOService * provider );
-	virtual void		stop ( IOService *  provider );
-	virtual IOReturn 	message ( UInt32 type, IOService * nub, void * arg );
-	
-	// The setAgressiveness method is called by the power manager
-	// to notify us of certain power management settings. We override
-	// this method in order to catch the kPMMinutesToSpinDown message
-	// in order to set our idle timer.
-	virtual IOReturn 	setAggressiveness ( unsigned long type, unsigned long minutes );
-	
-	// Methods for getting device information strings
-	virtual char *		GetVendorString ( void );
-	virtual char *		GetProductString ( void );
-	virtual char *		GetRevisionString ( void );
-	OSDictionary *		GetProtocolCharacteristicsDictionary ( void );
-	OSDictionary *		GetDeviceCharacteristicsDictionary ( void );	
-	UInt8				GetANSIVersion ( void );
-	bool				GetCMDQUE ( void );
-    OSString *          MapINQUIRYDataToIconFile ( void );
-	UInt32				GetRetryCount ( void );
-	
-	// -- SCSI Protocol Interface Methods	--
-	// The ExecuteCommand method will take a SCSI Task and transport
-	// it across the physical wire(s) to the device
-	virtual void		ExecuteCommand ( SCSITaskIdentifier request );
-	
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a specific task be aborted.
-	SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
-
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a all tasks curerntly in the task set be aborted.
-	SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
-    
-	SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		TargetReset ( void );
-
-	// The AbortCommand method will abort the indicated SCSI Task,
-	// if it is possible and the task has not already completed.
-	virtual SCSIServiceResponse	AbortCommand ( SCSITaskIdentifier request );
-	
-	// The IsProtocolServiceSupported will return true if the specified
-	// feature is supported by the protocol layer.  If the service has a value that must be
-	// returned, it will be returned in the serviceValue output parameter.
-	virtual bool		IsProtocolServiceSupported (
-											SCSIProtocolFeature feature,
-											void *				serviceValue );
-	
-	// The HandleProtocolServiceFeature will return true if the specified feature could
-	// be handled properly by the protocol layer.
-	virtual bool		HandleProtocolServiceFeature (
-											SCSIProtocolFeature	feature,
-											void *				serviceValue );
-	
-	// Utility methods for use by all peripheral device objects.
-
-	// isParameterValid are used to validate that the parameter passed into
-	// the command methods are of the correct value.
-	
-	// Validate Parameter used for 1 bit to 1 byte paramaters
-    bool 				IsParameterValid ( 
-							SCSICmdField1Byte 			param,
-							SCSICmdField1Byte 			mask );
-	
-	// Validate Parameter used for 9 bit to 2 byte paramaters
-	bool 				IsParameterValid ( 
-							SCSICmdField2Byte 			param,
-							SCSICmdField2Byte 			mask );
-	
-	// Validate Parameter used for 17 bit to 4 byte paramaters
-	bool 				IsParameterValid ( 
-							SCSICmdField4Byte 			param,
-							SCSICmdField4Byte 			mask );
-	
-	// Validate Parameter used for 33 bit to 8 byte paramaters
-	bool 				IsParameterValid ( 
-							SCSICmdField8Byte 			param,
-							SCSICmdField8Byte 			mask );
-	
-
-	bool 				IsMemoryDescriptorValid (
-							IOMemoryDescriptor * 		dataBuffer );
-	
-	bool 				IsMemoryDescriptorValid (
-							IOMemoryDescriptor * 		dataBuffer,
-							UInt64						requiredSize );
-
-#ifndef __LP64__
-	
-	// SCSI Primary command implementations
-	virtual bool		CHANGE_DEFINITION (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			SAVE,
-							SCSICmdField7Bit 			DEFINITION_PARAMETER,
-							SCSICmdField1Byte 			PARAMETER_DATA_LENGTH,
-			 				SCSICmdField1Byte 			CONTROL );
-	  
-	virtual bool		COMPARE (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-	 						SCSICmdField1Bit 			PAD,
-							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-			
-	virtual bool		COPY (
-							SCSITaskIdentifier			request,
-   							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PAD,
-							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-	  
-	virtual bool		COPY_AND_VERIFY (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			BYTCHK,
-							SCSICmdField1Bit 			PAD,
-							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		EXTENDED_COPY (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	virtual bool		INQUIRY (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			CMDDT,
-							SCSICmdField1Bit 			EVPD,
-							SCSICmdField1Byte 			PAGE_OR_OPERATION_CODE,
-							SCSICmdField1Byte 			ALLOCATION_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		LOG_SELECT (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PCR,
-							SCSICmdField1Bit 			SP,
-							SCSICmdField2Bit 			PC,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );  
-
-	virtual bool		LOG_SENSE (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PPC,
-							SCSICmdField1Bit 			SP,
-							SCSICmdField2Bit 			PC,
-							SCSICmdField6Bit 			PAGE_CODE,
-							SCSICmdField2Byte 			PARAMETER_POINTER,
-							SCSICmdField2Byte 			ALLOCATION_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );  
-	
-	virtual bool		MODE_SELECT_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PF,
-							SCSICmdField1Bit 			SP,
-							SCSICmdField1Byte 			PARAMETER_LIST_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );  
-
-   	virtual bool		MODE_SELECT_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PF,
-							SCSICmdField1Bit 			SP,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );  
-
-   	virtual bool		MODE_SENSE_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			DBD,
-	   						SCSICmdField2Bit 			PC,
-	   						SCSICmdField6Bit 			PAGE_CODE,
-	   						SCSICmdField1Byte 			ALLOCATION_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-   	virtual bool		MODE_SENSE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			LLBAA,
-							SCSICmdField1Bit 			DBD,
-	   						SCSICmdField2Bit 			PC,
-	   						SCSICmdField6Bit 			PAGE_CODE,
-	   						SCSICmdField2Byte 			ALLOCATION_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-  	virtual bool		PERSISTENT_RESERVE_IN (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-	   						SCSICmdField5Bit 			SERVICE_ACTION,
-	   						SCSICmdField2Byte 			ALLOCATION_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-   	virtual bool		PERSISTENT_RESERVE_OUT (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-	   						SCSICmdField5Bit 			SERVICE_ACTION,
-	   						SCSICmdField4Bit 			SCOPE,
-	   						SCSICmdField4Bit 			TYPE,
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		PREVENT_ALLOW_MEDIUM_REMOVAL (
-							SCSITaskIdentifier			request,
-		 					SCSICmdField2Bit 			PREVENT, 
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		READ_BUFFER (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField4Bit 			MODE,
-							SCSICmdField1Byte 			BUFFER_ID,
-							SCSICmdField3Byte 			BUFFER_OFFSET,
-							SCSICmdField3Byte 			ALLOCATION_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		RECEIVE (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-		 					SCSICmdField3Byte 			TRANSFER_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		RECEIVE_DIAGNOSTICS_RESULTS (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-		 					SCSICmdField1Bit 			PCV,
-		 					SCSICmdField1Byte			PAGE_CODE,
-		 					SCSICmdField2Byte 			ALLOCATION_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-	virtual bool		RELEASE_6 (
-							SCSITaskIdentifier			request,
-							SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
-	virtual bool		RELEASE_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			EXTENT,
-							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
-							SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	virtual bool		RELEASE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			THRDPTY,
-							SCSICmdField1Bit 			LONGID,
-							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
-	virtual bool		RELEASE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			THRDPTY,
-							SCSICmdField1Bit 			LONGID,
-							SCSICmdField1Bit 			EXTENT,
-							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
-							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	virtual bool		REPORT_DEVICE_IDENTIFIER ( 
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField4Byte 			ALLOCATION_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-   	virtual bool		REPORT_LUNS ( 
-							SCSITaskIdentifier			request,
-   							IOMemoryDescriptor *		dataBuffer,
-				   			SCSICmdField4Byte 			ALLOCATION_LENGTH,
-				   			SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool		REQUEST_SENSE (
-							SCSITaskIdentifier			request,
-   							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Byte 			ALLOCATION_LENGTH, 
-							SCSICmdField1Byte 			CONTROL );
- 	
- 	virtual bool		RESERVE_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
- 	virtual bool		RESERVE_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			EXTENT,
-							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	virtual bool		RESERVE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			THRDPTY,
-							SCSICmdField1Bit 			LONGID,
-							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#ifndef __LP64__
-
-	virtual bool		RESERVE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			THRDPTY,
-							SCSICmdField1Bit 			LONGID,
-							SCSICmdField1Bit 			EXTENT,
-							SCSICmdField1Byte 			RESERVATION_IDENTIFICATION,
-							SCSICmdField1Byte 			THIRD_PARTY_DEVICE_ID,
-							SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-#endif	/* !__LP64__ */
-	
-	virtual bool		SEND (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit			AER,
-		 					SCSICmdField3Byte 			TRANSFER_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-
-  	virtual bool		SEND_DIAGNOSTICS (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-				  		 	SCSICmdField3Bit 			SELF_TEST_CODE,
-				  		 	SCSICmdField1Bit 			PF,
-				  		 	SCSICmdField1Bit 			SELF_TEST,
-				  		 	SCSICmdField1Bit 			DEVOFFL,
-				  		 	SCSICmdField1Bit 			UNITOFFL,
-				  	 		SCSICmdField2Byte 			PARAMETER_LIST_LENGTH,
-				  	 		SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool		SET_DEVICE_IDENTIFIER (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField5Bit 			SERVICE_ACTION,
-							SCSICmdField4Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-	
-	virtual bool		TEST_UNIT_READY (
-							SCSITaskIdentifier			request,
-							SCSICmdField1Byte 			CONTROL );
- 	
-	virtual bool		WRITE_BUFFER (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField4Bit 			MODE,
-							SCSICmdField1Byte 			BUFFER_ID,
-							SCSICmdField3Byte 			BUFFER_OFFSET,
-							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH,
-							SCSICmdField1Byte 			CONTROL );
-	
-	// The SPC-3 INQUIRY command as defined in section 6.4.1 of SPC-3.
-	bool				INQUIRY (
-							SCSITaskIdentifier			request,
-  							IOMemoryDescriptor *		dataBuffer,
-    						SCSICmdField1Bit 			EVPD,
-    						SCSICmdField1Byte 			PAGE_CODE,
-    						SCSICmdField2Byte 			ALLOCATION_LENGTH,
-    						SCSICmdField1Byte 			CONTROL );
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  1 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  2 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice,  9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIPrimaryCommandsDevice, 16 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_SCSI_PRIMARY_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIProtocolInterface.h b/i386/include/IOKit/scsi/IOSCSIProtocolInterface.h
deleted file mode 100644
index bb74ce4..0000000
--- a/i386/include/IOKit/scsi/IOSCSIProtocolInterface.h
+++ /dev/null
@@ -1,854 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_
-#define _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_
-
-
-/*! @header SCSI Protocol Interface
-	@discussion
-	This file contains definitions for the IOSCSIProtocolInterface class,
-	SCSI Protocol Features used by this interface, and additional constants
-	used by this interface.
-*/
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-/*
-SCSI Device Characteristics - Defined between SCSI Application Layer and
-							  SCSI Protocol Layer only.
-*/
-
-/*!
-@constant kIOPropertySCSIDeviceCharacteristicsKey
-@discussion
-This key is used to define SCSI Device Characteristics for a particular device.
-It is the key for the dictionary containing the keys of characteristics. These keys
-are only defined between the SCSI Protocol Layer and the SCSI Applicaiton Layer. Some
-properties may be copied from this dictionary to the more generic Device Characteristics
-or Protocol Characteristics dictionaries.
-*/
-#define kIOPropertySCSIDeviceCharacteristicsKey		"SCSI Device Characteristics"
-
-/*!
-@constant kIOPropertySCSIInquiryLengthKey
-@discussion
-This key is used to define a default INQUIRY length to issue to the device. The
-value is a UInt32 corresponding to the number of bytes to request in the INQUIRY
-command.
-*/
-#define kIOPropertySCSIInquiryLengthKey				"Inquiry Length"
-
-/*!
-@constant kIOPropertySCSIManualEjectKey
-@discussion
-This key is used to indicate that the device is known to be a manual ejectable media
-device.  This property overrides all of the driver checks for determining this capability.
-This property is a string, although if it exists it should always be true.
-*/
-#define kIOPropertySCSIManualEjectKey				"Manual Eject"
-
-/*!
-@constant kIOPropertyReadTimeOutDurationKey
-@discussion
-This key is used to define the Read Time Out for a particular device.
-This property overrides all of the protocol defaults.
-This property is a value, in milliseconds.
-*/
-#define kIOPropertyReadTimeOutDurationKey			"Read Time Out Duration"
-
-/*!
-@constant kIOPropertyWriteTimeOutDurationKey
-@discussion
-This key is used to define the Write Time Out for a particular device.
-This property overrides all of the protocol defaults.
-This property is a value, in milliseconds.
-*/
-#define kIOPropertyWriteTimeOutDurationKey			"Write Time Out Duration"
-
-/*!
-@constant kIOPropertyRetryCountKey
-@discussion
-This key is used to define the number of Read/Write retries for a particular device.
-This property overrides all of the protocol defaults.
-The value is a UInt32 corresponding to the number of retries.
-*/
-#define kIOPropertyRetryCountKey					"Retry Count"
-
-/*!
- @constant kIOPropertyAutonomousSpinDownKey
- @discussion
- This key is used to indicate that the device is known to have its own internal logic
- for idle disk spin down. This key is used to mark device which respon poorly to our
- efforts to manually spin down or spin up the device when it is already in the desired 
- state. 
- */
-#define kIOPropertyAutonomousSpinDownKey			"Autonomous Spin Down"
-
-/*!
- @constant kIOPropertyEjectRequireStartStopUnitKey
- @discussion
- This key is used to indicate that while the device may have failed PREVENT_ALLOW_MEDIUM
- REMOVAL it still requires a START_STOP_UNIT to eject/unload media. 
- */
-#define kIOPropertyEjectRequireStartStopUnitKey		"Eject Requires START_STOP_UNIT"
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-/*!
-@constant kCFBundleIdentifierKey
-@discussion
-Property key for CFBundleIdentifier.
-*/
-#define kCFBundleIdentifierKey					"CFBundleIdentifier"
-
-/*!
-@constant kIOSCSIArchitectureBundleIdentifierKey
-@discussion
-IOSCSIArchitectureModelFamily's CFBundle identifier.
-*/
-#define kIOSCSIArchitectureBundleIdentifierKey	"com.apple.iokit.IOSCSIArchitectureModelFamily"
-
-
-// General kernel headers
-#include <kern/thread.h>
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IOWorkLoop.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/SCSITask.h>
-
-
-/*!
-@enum SCSI Protocol Interface Device Notification values
-@discussion
-Message values for SCSI Protocol Interface Device Notifications.
-@constant kSCSIProtocolNotification_DeviceRemoved
-Private message sent between a SCSI protocol service provider and
-SCSI application layer driver to indicate device removal.
-@constant kSCSIProtocolNotification_VerifyDeviceState
-Private message sent between a SCSI protocol service provider and
-SCSI application layer driver to indicate device state may have
-changed and the device state should be re-verified by the SCSI
-Application Layer driver. An example would be a bus reset which clears
-the tray locking state of an ATAPI device.
-@constant kSCSIServicesNotification_ExclusivityChanged
-Message sent when a change in exclusivity state occurs. Usually in
-response to acquiring/releasing exclusive access to a device via a user client.
-*/
-enum
-{
-	kSCSIProtocolNotification_DeviceRemoved			= 0x69000010,
-	kSCSIProtocolNotification_VerifyDeviceState		= 0x69000020,
-	kSCSIServicesNotification_ExclusivityChanged	= 0x69000030
-};
-
-
-/*!
-@typedef SCSIProtocolFeature
-@discussion
-Typedef for SCSIProtocolFeature, a 32-bit quantity.
-*/
-typedef UInt32 SCSIProtocolFeature;
-
-/*!
-@enum SCSI Protocol Features
-@discussion
-The list of SCSI Protocol Features currently supported.
-*/
-enum
-{
-	
-	/*!
-	@constant kSCSIProtocolFeature_ACA Not yet used.
-	*/
-	kSCSIProtocolFeature_ACA								= 1,
-	
-	/*!
-	@constant kSCSIProtocolFeature_CPUInDiskMode Used to determine
-	if the SCSI Protocol Services Driver supports a CPU which is in
-	target disk mode.
-	*/
-	kSCSIProtocolFeature_CPUInDiskMode						= 2,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolSpecificPolling Used
-	to determine if the SCSI Protocol Services Driver supports
-	protocol specific polling for media. This is used for low-power
-	polling specifically for ATAPI devices on ATA buses
-	*/
-	kSCSIProtocolFeature_ProtocolSpecificPolling			= 3,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolSpecificSleepCommand Used
-	to determine if the SCSI Protocol Services Driver supports
-	protocol specific sleep commands to a drive. This is used for
-	sleeping drives specifically ATAPI devices on ATA buses.
-	*/
-	kSCSIProtocolFeature_ProtocolSpecificSleepCommand		= 4,
-	
-	/*!
-	@constant kSCSIProtocolFeature_GetMaximumLogicalUnitNumber If
-	the SCSI Protocol Services Driver supports logical units, it will
-	report the maximum addressable ID that it supports in the UInt32 pointer
-	that is passed in as the serviceValue. If only one unit is supported,
-	the driver should return false for this query.
-	*/
-	kSCSIProtocolFeature_GetMaximumLogicalUnitNumber		= 5,
-	
-	/*!
-	@constant kSCSIProtocolFeature_MaximumReadBlockTransferCount If
-	the SCSI Protocol Services Driver has a maximum number of
-	blocks that can be transfered in a read request, it will return
-	true to this query and return the block count in the UInt32 pointer
-	that is passed in as the serviceValue.
-	*/
-	kSCSIProtocolFeature_MaximumReadBlockTransferCount		= 6,
-
-	/*!
-	@constant kSCSIProtocolFeature_MaximumWriteBlockTransferCount If
-	the SCSI Protocol Services Driver has a maximum number of
-	blocks that can be transferred in a write request, it will return
-	true to this query and return the block count in the UInt32 pointer
-	that is passed in as the serviceValue.
-	*/
-	kSCSIProtocolFeature_MaximumWriteBlockTransferCount		= 7,
-
-	/*!
-	@constant kSCSIProtocolFeature_MaximumReadTransferByteCount If
-	the SCSI Protocol Services Driver has a maximum byte count
-	that can be transferred in a read request, it will return
-	true to this query and return the byte count in the UInt64 pointer
-	that is passed in as the serviceValue.
-	*/
-	kSCSIProtocolFeature_MaximumReadTransferByteCount		= 8,
-
-	/*!
-	@constant kSCSIProtocolFeature_MaximumWriteTransferByteCount If
-	the SCSI Protocol Services Driver has a maximum byte count
-	that can be transferred in a write request, it will return
-	true to this query and return the byte count in the UInt64 pointer
-	that is passed in as the serviceValue.
-	*/
-	kSCSIProtocolFeature_MaximumWriteTransferByteCount		= 9,
-	
-	/*!
-	@constant kSCSIProtocolFeature_SubmitDefaultInquiryData If
-	the SCSI Protocol Services Driver needs any extra information to
-	make any negotiation settings from the standard INQUIRY data, this 
-	will be called to set that appropriately. The serviceValue will
-	point to a SCSICmd_INQUIRY_StandardData buffer. The size
-	of the buffer depends on the SCSI Device Characteristics
-	dictionary for the device or bus. If there is no
-	kIOPropertySCSIInquiryLengthKey value set in the dictionary
-	or if it doesn't exist, then the size of the data will be
-	the size of the full amount of Inquiry retrieved from the device.
-	*/
-	kSCSIProtocolFeature_SubmitDefaultInquiryData			= 10,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolAlwaysReportsAutosenseData If
-	the SCSI Protocol Services Driver always reports available
-	autosense data when a kSCSITaskStatus_CHECK_CONDITION is set,
-	then the protocol layer should return true. E.g. FireWire
-	transport drivers should respond true to this.
-	*/
-	kSCSIProtocolFeature_ProtocolAlwaysReportsAutosenseData	= 11,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolSpecificPowerOff If
-	the SCSI Protocol Services Driver supports removing the power
-	to the drive, then the protocol layer should return true. This is
-	used for aggressive power management, specifically for ATAPI
-	devices on ATA buses.
-	*/
-	kSCSIProtocolFeature_ProtocolSpecificPowerOff			= 12,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolSpecificPowerControl
-	Used to determine if the SCSI Protocol Services Driver supports
-	switching the power to the drive on and off. This is used for aggressive
-	power management, specifically for SATAPI devices on AHCI buses.
-	*/
-	kSCSIProtocolFeature_ProtocolSpecificPowerControl		= 13,
-	
-	/*!
-	@constant kSCSIProtocolFeature_ProtocolSpecificAsyncNotification
-	Used to determine if the SCSI Protocol Services Driver supports
-	asynchronous notifications from the drive. This is used to prevent
-	polling for media, specifically for SATAPI devices on AHCI buses.
-	*/
-	kSCSIProtocolFeature_ProtocolSpecificAsyncNotification	= 14
-	
-};
-
-
-/*!
-@typedef SCSIProtocolPowerState
-@discussion
-Typedef for SCSIProtocolPowerState, a 32-bit quantity.
-*/
-typedef UInt32 SCSIProtocolPowerState;
-
-/*!
-@enum SCSI Protocol Power States
-@discussion
-The list of SCSI Protocol Power States.
-*/
-enum
-{
-	/*!
-	@constant kSCSIProtocolPowerStateOff
-	Off power state.
-	*/
-	kSCSIProtocolPowerStateOff			= 0,
-
-	/*!
-	@constant kSCSIProtocolPowerStateOn
-	On power state.
-	*/
-	kSCSIProtocolPowerStateOn			= 1
-};
-
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-/*!
-@class IOSCSIProtocolInterface
-@superclass IOService
-@discussion
-This class defines the public SCSI Protocol Layer API for any class that
-provides Protocol services or needs to provide the Protocol Service API
-for passing service requests to a Protocol Service driver.
-*/
-class IOSCSIProtocolInterface : public IOService
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIProtocolInterface )
-	
-public:
-	
-	/*!
-	@function start
-	@abstract During an IOService object's instantiation, starts the IOService object that has been selected to run on the provider.
-	@discussion See IOService.h for details.
-	@result <code>true</code> if the start was successful; <code>false</code> otherwise (which will cause the instance to be detached and usually freed).
-	*/
-	virtual bool	start ( IOService * provider );
-	
-	/*!
-	@function free
-	@abstract Called to release all resources held by the object.
-	@discussion Release all resources held by the object, then call super::free().  
-	*/	
-	virtual void	free ( void );
-
-	/*!
-	@function willTerminate
-	@abstract Passes a termination up the stack.
-	@discussion Notification that a provider has been terminated, sent before recursing up the stack, in root-to-leaf order.
-	@param provider The terminated provider of this object.
-	@param options Options originally passed to terminate().
-	@result <code>true</code>.
-	*/
-	virtual bool	willTerminate ( IOService * provider, IOOptionBits options );
-	
-	/*!
-	@function GetUserClientExclusivityState
-	@abstract Gets the current exclusivity state of the user client.
-	@discussion The GetUserClientExclusivityState() method is called by the SCSITaskUserClient
-	to determine if any user client is holding exclusive access at the current time. This is simply
-	a preflight check and a return value of <code>false</code> does not guarantee that a subsequent
-	call to SetUserClientExclusivityState() will return successfully.
-	@result <code>true</code> if a user client is in exclusive control of the device, <code>false</code> otherwise.
-	*/
-	virtual bool 		GetUserClientExclusivityState ( void );
-	
-	/*!
-	@function SetUserClientExclusivityState
-	@abstract Sets the current exclusivity state of the user client.
-	@discussion The SetUserClientExclusivityState() method is called by the SCSITaskUserClient
-	to set the exclusive access mode.
-	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
-	@param state Exclusivity state. <code>true</code> means exclusive access is desired, <code>false</code>
-	means exclusive access is being released.
-	@result A valid IOReturn code indicating success or the type of failure.
-	*/
-	virtual IOReturn	SetUserClientExclusivityState ( IOService * userClient, bool state );
-	
-	
-	/*!
-	@function initialPowerStateForDomainState
-	@abstract Determines which power state a device is in, given the current power domain state.
-	@discussion Power management calls this method once, when the driver is initializing power management.
-	Subclasses should not need to override this method.
-	@param flags Flags that describe the character of "domain power"; they represent the <code>outputPowerCharacter</code> field of a state in the power domain's power state array. 
-	@result A state number. 
-	*/
-	virtual unsigned long	initialPowerStateForDomainState ( IOPMPowerFlags flags );
-	
-	/*!
-	@function setPowerState
-	@abstract Requests a power managed driver to change the power state of its device.
-	@discussion Requests a power managed driver to change the power state of its device. Most subclasses
-	of IOSCSIProtocolInterface have class-specific mechanisms and should not override this routine.
-	See IOSCSIProtocolServices.h, IOSCSIBlockCommandsDevice.h, IOSCSIReducedBlockCommandsDevice.h, and
-	IOSCSIMultimediaCommandsDevice.h for more information about power management changes.
-	Subclasses should not need to override this method.
-	@param powerStateOrdinal The number in the power state array to which the drive is being instructed to change.
-	@param whichDevice A pointer to the power management object which registered to manage power for this device.
-	The whichDevice field is not pertinent to us since the driver is both the "policy maker" for the device,
-	and the "policy implementor" for the device.
-	@result See IOService.h for details.
-	*/
-	virtual IOReturn 	setPowerState ( unsigned long powerStateOrdinal, IOService * whichDevice );
-	
-	/*!
-	@function IsPowerManagementIntialized
-	@abstract Called to determine if power management is initialized.
-	@discussion Called to determine if power management is initialized.
-	Subclasses should not need to override this method.
-	@result <code>true</code> if power management has been initialized, <code>false</code> otherwise.
-	*/
-	virtual bool		IsPowerManagementIntialized ( void );
-	
-	/*!
-	@function CheckPowerState
-	@abstract Called by clients to ensure device is in correct power state before issuing I/O.
-	@discussion Called by clients to ensure device is in correct power state before issuing I/O.
-	If the device is not ready to handle such requests, it gives the driver a chance to block the
-	thread until the device is ready. Subclasses should not need to override this method.
-	*/
-	virtual void 		CheckPowerState ( void );
-	
-	/*!
-	@function ExecuteCommand
-	@abstract Called to send a SCSITask and transport it across the physical wire(s) to the device.
-	@discussion Called to send a SCSITask and transport it across the physical wire(s) to the device.
-	Subclasses internal to IOSCSIArchitectureModelFamily will need to override this method. Third
-	party subclasses should not need to override this method.
-	@param request A valid SCSITaskIdentifier representing the task to transport across the wire(s).
-	*/
-	virtual void		ExecuteCommand ( SCSITaskIdentifier request ) = 0;
-	
-	/*!
-	@function AbortCommand
-	@abstract Obsolete. Do not use this method.
-	@discussion Obsolete. Do not use this method.
-	*/
-	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier request ) = 0;
-	
-	/*!
-	@function IsProtocolServiceSupported
-	@abstract This method is called to query for support of a protocol specific service feature.
-	@discussion This method is called to query for support of a protocol specific service feature.
-	Subclasses of IOSCSIProtocolServices should override this method.
-	@param feature A valid SCSIProtocolFeature. See enums for SCSIProtocolFeature.
-	@param serviceValue A pointer to a structure/value that is used in conjunction with the feature
-	requested. See enums for SCSIProtocolFeature. NB: This parameter may be NULL for certain
-	feature requests.
-	@result <code>true</code> if the feature is supported, <code>false</code> otherwise.
-	*/
-	virtual bool		IsProtocolServiceSupported ( 
-								SCSIProtocolFeature 	feature, 
-								void * 					serviceValue ) = 0;
-	
-	/*!
-	@function HandleProtocolServiceFeature
-	@abstract This method is called to enact support of a protocol specific service feature.
-	@discussion This method is called to enact support of a protocol specific service feature.
-	Subclasses of IOSCSIProtocolServices should override this method.
-	@param feature A valid SCSIProtocolFeature. See enums for SCSIProtocolFeature.
-	@param serviceValue A pointer to a structure/value that is used in conjunction with the feature
-	requested. See enums for SCSIProtocolFeature. NB: This parameter may be NULL for certain
-	feature requests.
-	@result <code>true</code> if the service feature request succeeded, <code>false</code> otherwise.
-	*/
-	virtual bool		HandleProtocolServiceFeature ( 
-								SCSIProtocolFeature 	feature, 
-								void * 					serviceValue ) = 0;
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSIProtocolInterfaceExpansionData
-	{
-		IOWorkLoop *	fWorkLoop;
-	};
-	IOSCSIProtocolInterfaceExpansionData * fIOSCSIProtocolInterfaceReserved;
-	
-	// ------ Power Management Support ------
-	
-	thread_call_t		fPowerManagementThread;
-	IOCommandGate *		fCommandGate;
-	UInt32				fCurrentPowerState;
-	UInt32				fProposedPowerState;
-	bool				fPowerTransitionInProgress;
-	bool				fPowerAckInProgress;
-	bool				fPowerManagementInitialized;
-	
-	/*!
-	@function GetCommandGate
-	@abstract Accessor method to obtain the IOCommandGate.
-	@discussion Accessor method to obtain the IOCommandGate.
-	@result The IOCommandGate for this instance. May return NULL.
-	*/
-	IOCommandGate *		GetCommandGate ( void );
-	
-	/*!
-	@function InitializePowerManagement
-	@abstract This method is called to initialize power management.
-	@discussion This method is called to initialize power management. It will call PMinit(), joinPMTree(),
-	setIdleTimerPeriod(), and makeUsable(). This method does not call registerPowerDriver().
-	Subclasses may override this method to change the behavior (such as the number of power states).
-	@param provider The power management provider (i.e. the provider to attach to in the PowerManagement
-	tree). This may be a device that is not in the PM Tree itself, in which case, the IOService plane
-	is traversed towards the root node in an effort to find a node in the PM Tree.
-	*/
-	virtual void		InitializePowerManagement ( IOService * provider );
-	
-	/*!
-	@function GetInitialPowerState
-	@abstract This method is called to obtain the initial power state of the device (usually the highest).
-	@discussion This method is called to obtain the initial power state of the device (usually the highest).
-	Subclasses must override this method.
-	@result A power state ordinal.
-	*/
-	virtual UInt32		GetInitialPowerState ( void ) = 0;
-	
-	/*!
-	@function finalize
-	@abstract Finalizes the destruction of an IOService object.
-	@discussion See IOService.h
-	Subclasses may override this method, but should call super::finalize().
-    @result <code>true</code>.
-	*/
-	virtual bool		finalize ( IOOptionBits options );
-	
-	/*!
-	@function sHandleSetPowerState
-	@abstract The sHandleSetPowerState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@discussion The sHandleSetPowerState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@param self The 'this' pointer for the class.
-	@param powerStateOrdinal The power state to which device shall be changed.
-    @result A valid IOReturn code indicating success or failure.
-	*/
-	static IOReturn 	sHandleSetPowerState ( IOSCSIProtocolInterface * self, UInt32 powerStateOrdinal );
-	
-	/*!
-	@function sGetPowerTransistionInProgress
-	@abstract The sGetPowerTransistionInProgress method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@discussion The sGetPowerTransistionInProgress method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@param self The 'this' pointer for the class.
-    @result <code>true</code> if a power state is in progress, otherwise <code>false</code>.
-	*/
-	static bool sGetPowerTransistionInProgress ( IOSCSIProtocolInterface * 	self );
-	
-	/*!
-	@function HandleSetPowerState
-	@abstract The HandleSetPowerState method is called by the glue code and is on the
-	serialized side of the command gate.
-	@discussion The HandleSetPowerState method is called by the glue code and is on the
-	serialized side of the command gate. This allows us to touch any member
-	variables as necessary without any multi-threading issues.
-	Subclasses may override this method to change behavior. Third party subclasses
-	should not need to override this method, but may.
-	@param powerStateOrdinal The power state to which device shall be changed.
-	*/
-	virtual void		HandleSetPowerState ( UInt32 powerStateOrdinal );
-	
-	/*!
-	@function sPowerManagement
-	@abstract The sPowerManagement method is a static C-function which is called using
-	mach's thread_call API. It guarantees us a thread of execution which is
-	different than the power management thread and the workloop thread on which
-	we can issue commands to the device synchronously or asynchronously without
-	worrying about deadlocks. It calls through to HandlePowerChange, which is
-	a state machine used to direct power management.
-	@discussion The sPowerManagement method is a static C-function which is called using
-	mach's thread_call API. It guarantees us a thread of execution which is
-	different than the power management thread and the workloop thread on which
-	we can issue commands to the device synchronously or asynchronously without
-	worrying about deadlocks. It calls through to HandlePowerChange, which is
-	a state machine used to direct power management.
-	@param whichDevice The 'this' pointer.
-	*/
-	static void			sPowerManagement ( thread_call_param_t whichDevice );
-	
-	/*!
-	@function HandlePowerChange
-	@abstract The HandlePowerChange method is pure virtual and is left to each protocol or
-	application layer driver to implement. It is guaranteed to be called on its
-	own thread of execution and can make synchronous or asynchronous calls.
-	@discussion The HandlePowerChange method is pure virtual and is left to each protocol or
-	application layer driver to implement. It is guaranteed to be called on its
-	own thread of execution and can make synchronous or asynchronous calls.
-	Subclasses must override this method. Third party subclasses shouldn't need to override
-	this method but can to alter the default behavior.
-	*/
-	virtual void		HandlePowerChange ( void ) = 0;
-		
-	/*!
-	@function sHandleCheckPowerState
-	@abstract The sHandleCheckPowerState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@discussion The sHandleCheckPowerState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@param self The 'this' pointer for the class.
-	*/
-	static void			sHandleCheckPowerState ( IOSCSIProtocolInterface * self );
-	
-	/*!
-	@function HandleCheckPowerState(void)
-	@abstract The HandleCheckPowerState (void) method is on the serialized side of the command
-	gate and can change member variables safely without multi-threading issues.
-	It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
-	with the max power state the class registered with.
-	@discussion The HandleCheckPowerState (void) method is on the serialized side of the command
-	gate and can change member variables safely without multi-threading issues.
-	It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
-	with the max power state the class registered with.
-	Subclasses must override this method. Third party subclasses shouldn't need to override
-	this method but can to alter the default behavior.
-	*/
-	virtual void		HandleCheckPowerState ( void ) = 0;
-	
-	/*!
-	@function HandleCheckPowerState(UInt32 maxPowerState)
-	@abstract The HandleCheckPowerState(UInt32 maxPowerState) method is called by
-	the subclasses and is passed the maxPowerState number given to the power
-	manager at initialization time. This guarantees the threads block until that
-	power state has been achieved.
-	@discussion The HandleCheckPowerState(UInt32 maxPowerState) method is called by
-	the subclasses and is passed the maxPowerState number given to the power
-	manager at initialization time. This guarantees the threads block until that
-	power state has been achieved.
-	@param maxPowerState The maximum power state in the power state array.
-	*/
-	void 				HandleCheckPowerState ( UInt32 maxPowerState );
-	
-	/*!
-	@function TicklePowerManager(void)
-	@abstract The TicklePowerManager(void) method is called by CheckPowerState and
-	sends an activity tickle to the power manager so that the idle timer is
-	reset.
-	@discussion The TicklePowerManager(void) method is called by CheckPowerState and
-	sends an activity tickle to the power manager so that the idle timer is
-	reset.
-	Subclasses must override this method. Third party subclasses shouldn't need to override
-	this method but can to alter the default behavior.
-	*/
-	virtual void		TicklePowerManager ( void ) = 0;
-	
-	/*!
-	@function TicklePowerManager(UInt32 maxPowerState)
-	@abstract The TicklePowerManager(UInt32 maxPowerState) method is a convenience
-	function which can be called by subclasses in TicklePowerManager (void)
-	in order to tell the power manager to reset idle timer or bring the device
-	into the requested state. It returns whatever is returned by activityTickle
-	(true if device is in the requested state, false if it is not).
-	@discussion The TicklePowerManager(UInt32 maxPowerState) method is a convenience
-	function which can be called by subclasses in TicklePowerManager(void)
-	in order to tell the power manager to reset idle timer or bring the device
-	into the requested state. It returns whatever is returned by activityTickle
-	(true if device is in the requested state, false if it is not).
-	@param maxPowerState The maximum power state in the power state array.
-	@result The result of the call to activityTickle(). See IOService.h for details.
-	*/
-	bool				TicklePowerManager ( UInt32 maxPowerState );
-	
-	// ------ User Client Support ------
-	
-	bool				fUserClientExclusiveControlled;
-	IOService *			fUserClient;
-	
-	/*!
-	@function sGetUserClientExclusivityState
-	@abstract The sGetUserClientExclusivityState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@discussion The sGetUserClientExclusivityState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@param self The 'this' pointer for the class.
-	@param state A pointer to a bool in which the state should be set.
-	*/
-	static void 	sGetUserClientExclusivityState ( IOSCSIProtocolInterface * self, bool * state );
-	
-	/*!
-	@function sSetUserClientExclusivityState
-	@abstract The sSetUserClientExclusivityState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@discussion The sSetUserClientExclusivityState method is a static function used as C->C++ glue
-	for going behind the command gate.
-	@param self The 'this' pointer for the class.
-	@param result A pointer to an IOReturn for the resulting status.
-	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
-	@param state A bool indicating the desired state to set.
-	*/
-	static void		sSetUserClientExclusivityState ( IOSCSIProtocolInterface * self, IOReturn * result, IOService * userClient, bool state );
-
-	/*!
-	@function HandleGetUserClientExclusivityState
-	@abstract Gets the current exclusivity state of the user client.
-	@discussion The HandleGetUserClientExclusivityState() method is called on the serialized side
-	of the command gate to determine if any user client is holding exclusive access at the current
-	time. See discussion for GetUserClientExclusivityState().
-	Subclasses may override this method to alter default behavior. Third party subclasses should
-	not need to override this method.
-	@result <code>true</code> if a user client is in exclusive control of the device, <code>false</code> otherwise.
-	*/
-	virtual bool	HandleGetUserClientExclusivityState ( void );
-
-	/*!
-	@function HandleSetUserClientExclusivityState
-	@abstract Sets the current exclusivity state of the user client.
-	@discussion The HandleSetUserClientExclusivityState() method is called on the serialized side
-	of the command gate to set the exclusive access mode.
-	@param userClient The instance of SCSITaskUserClient for which to change exclusivity state.
-	@param state Exclusivity state. <code>true</code> means exclusive access is desired, <code>false</code>
-	means exclusive access is being released.
-	@result A valid IOReturn code indicating success or the type of failure.
-	*/
-	virtual IOReturn	HandleSetUserClientExclusivityState ( IOService * userClient, bool state );
-	
-public:
-	
-	// ------- SCSI Architecture Model Task Management Functions ------
-
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 1 );
-	/*!
-	@function AbortTask
-	@abstract Aborts a task based on the Logical Unit and tagged task identifier.
-	@discussion Aborts a task based on the Logical Unit and tagged task identifier.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@param theLogicalUnit This value should be zero unless the device driver is
-	more complex and managing multiple Logical Units.
-	@param theTag A valid SCSITaggedTaskIdentifier representing an outstanding SCSITask.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag ) = 0;
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 2 );
-	/*!
-	@function AbortTaskSet
-	@abstract Aborts a task set based on the Logical Unit.
-	@discussion Aborts a task set based on the Logical Unit.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@param theLogicalUnit This value should be zero unless the device driver is
-	more complex and managing multiple Logical Units.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit ) = 0;
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 3 );
-	/*!
-	@function ClearACA
-	@abstract Clears an Auto-Contingent Allegiance (ACA) for the specified Logical Unit.
-	@discussion Clears an Auto-Contingent Allegiance (ACA) for the specified Logical Unit.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@param theLogicalUnit This value should be zero unless the device driver is
-	more complex and managing multiple Logical Units.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit ) = 0;
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 4 );
-	/*!
-	@function ClearTaskSet
-	@abstract Clears a task set for the specified Logical Unit.
-	@discussion Clears a task set for the specified Logical Unit.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@param theLogicalUnit This value should be zero unless the device driver is
-	more complex and managing multiple Logical Units.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit ) = 0;
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 5 );
-	/*!
-	@function LogicalUnitReset
-	@abstract Resets the specified Logical Unit.
-	@discussion Resets the specified Logical Unit.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@param theLogicalUnit This value should be zero unless the device driver is
-	more complex and managing multiple Logical Units.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit ) = 0;
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIProtocolInterface, 6 );
-	
-	/*!
-	@function TargetReset
-	@abstract Resets the target device.
-	@discussion Resets the target device.
-	Subclasses must override this method. Third party subclasses should not need to override
-	this method.
-	@result A valid SCSIServiceResponse code.
-	*/
-	virtual SCSIServiceResponse		TargetReset ( void ) = 0;
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface,  9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIProtocolInterface, 16 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PROTOCOL_INTERFACE_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIProtocolServices.h b/i386/include/IOKit/scsi/IOSCSIProtocolServices.h
deleted file mode 100644
index 6b9df79..0000000
--- a/i386/include/IOKit/scsi/IOSCSIProtocolServices.h
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_
-#define _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// Mach includes
-#include <kern/queue.h>
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOCommandGate.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/SCSITask.h>
-#include <IOKit/scsi/IOSCSIProtocolInterface.h>
-#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-// Power Management values
-enum
-{
-	kSCSIProtocolLayerPowerStateOff				= 0,
-	kSCSIProtocolLayerPowerStateOn				= 1,
-	kSCSIProtocolLayerNumDefaultStates			= 2
-};
-
-// Forward definitions of internal use only classes
-class SCSITask;
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIProtocolServices : public IOSCSIProtocolInterface
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIProtocolServices )
-	
-private:
-	
-	// The head pointer for the queue of waiting SCSI Tasks.
-	SCSITask *		fSCSITaskQueueHead;		/* OBSOLETE */
-	
-	// This is the lock for preventing multiple access while
-	// manipulating the SCSI Task queue.
-	IOSimpleLock *	fQueueLock;
-	
-	// The internal flag to indicate whether service requests should be
-	// executed or immediately errored, such as when a device is removed.
-	bool			fAllowServiceRequests;
-	
-protected:
-	
-	// Reserve space for future expansion.
-	struct IOSCSIProtocolServicesExpansionData
-	{
-		// For internal use only. Do not use.
-		UInt32				fSemaphore;
-		bool				fRequiresAutosenseDescriptor;
-		SCSITaskCompletion	fCompletionRoutine;
-		queue_head_t		fTaskQueueHead;
-		queue_head_t		fAutoSenseQueueHead;
-	};
-	IOSCSIProtocolServicesExpansionData * fIOSCSIProtocolServicesReserved;
-	
-	// ---- Protocol transport methods overridden by each subclass ----
-	
-	// Send a SCSI Command to the device.  If the command was sent to the
-	// device and is pending completion, the subclass should return true and
-	// return back the kSCSIServiceResponse_Request_In_Process response. 
-	// If the command completes immediately with an error, the subclass will
-	// return true and return back the appropriate status.
-	// if the subclass is currently processing all the commands it can, the
-	// subclass will return false and the command will be resent next time
-	// CommandCompleted is called.  
-	virtual bool		SendSCSICommand ( 	SCSITaskIdentifier 		request, 
-											SCSIServiceResponse *	serviceResponse,
-											SCSITaskStatus *		taskStatus ) = 0;
-	
-	virtual SCSIServiceResponse	AbortSCSICommand ( SCSITaskIdentifier request ) = 0;
-	
-	// ---- Command completion notification method ---------
-	// Subclasses will call this inherited method when the command
-	// executed by SendSCSICommand has completed.
-	// The subclasses will return a service response that is derived
-	// from protocol specific status information and as specified in 
-	// the specification for that protocol.
-	// If the service response is kSCSIServiceResponse_TASK_COMPLETE,
-	// the subclass will also return a SCSI status value.
-	void	CommandCompleted ( 	SCSITaskIdentifier 	request, 
-								SCSIServiceResponse serviceResponse,
-								SCSITaskStatus		taskStatus );
-	
-	// ---- Utility methods for accessing SCSITask attributes ----
-	// Method for retreiving the attribute for a task.
-	SCSITaskAttribute	GetTaskAttribute ( SCSITaskIdentifier request );
-	
-	bool			SetTaskState ( 	SCSITaskIdentifier request, 
-									SCSITaskState newTaskState );
-	SCSITaskState	GetTaskState ( 	SCSITaskIdentifier request );
-	
-	UInt8			GetLogicalUnitNumber ( SCSITaskIdentifier request );
-	
-	// Method to determine the size of the command descriptor block.
-	UInt8	GetCommandDescriptorBlockSize ( SCSITaskIdentifier request );
-	
-	// This will always return the define max CDB size.  If the Protocol Layer
-	// driver only supports a smaller size CDB, it will have to create a local
-	// SCSICommandDescriptorBlock variable to get the CDB data and then 
-	// transfer the needed bytes from there.
-	bool	GetCommandDescriptorBlock ( SCSITaskIdentifier 				request, 
-										SCSICommandDescriptorBlock * 	cdbData );
-	
-	// Get the transfer direction for the request.
-	UInt8	GetDataTransferDirection ( SCSITaskIdentifier request );
-	
-	UInt64	GetRequestedDataTransferCount ( SCSITaskIdentifier request );
-	
-	bool	SetRealizedDataTransferCount ( SCSITaskIdentifier request,
-										   UInt64 newRealizedDataCount );
-	
-	UInt64	GetRealizedDataTransferCount ( SCSITaskIdentifier request );
-	
-	IOMemoryDescriptor *	GetDataBuffer ( SCSITaskIdentifier request );
-	
-	UInt64	GetDataBufferOffset ( SCSITaskIdentifier request );
-	
-	UInt32	GetTimeoutDuration ( SCSITaskIdentifier request );
-	
-	UInt64	GetAutosenseRequestedDataTransferCount ( SCSITaskIdentifier	request );
-	
-	// Set the auto sense data that was returned for the SCSI Task.
-	// A return value of true indicates that the data was copied to the member 
-	// sense data structure, false indicates that the data could not be copied.
-	bool	SetAutoSenseData ( SCSITaskIdentifier	request,
-							   SCSI_Sense_Data *	senseData ); // DEPRECATED, use the one on the line below.
-	
-	bool	SetAutoSenseData ( SCSITaskIdentifier	request,
-							   SCSI_Sense_Data *	senseData,
-							   UInt8				senseDataSize );
-	
-	void	EnsureAutosenseDescriptorExists ( SCSITaskIdentifier request );
-	
-	bool	SetProtocolLayerReference ( 
-				SCSITaskIdentifier 		request, 
-				void *					newReferenceValue );
-	void *	GetProtocolLayerReference ( SCSITaskIdentifier request );
-	
-	
-	bool	SetTaskExecutionMode (
-				SCSITaskIdentifier 		request, 
-				SCSITaskMode 			newTaskMode );
-	SCSITaskMode	GetTaskExecutionMode ( SCSITaskIdentifier request );
-	
-	// ---- Method calls for messaging device connectedness ----
-	void 	SendNotification_DeviceRemoved ( void );
-	
-	void 	SendNotification_VerifyDeviceState ( void );   
-	
-	// -- SCSI Task Queue Management Methods --
-	// Following are the commands used to manipulate the queue of pending SCSI Tasks.
-	
-	// Add the SCSI Task to the queue.  The Task's Attribute determines where in
-	// the queue the Task is placed.
-	void 	AddSCSITaskToQueue ( SCSITaskIdentifier request );
-	
-	// Add the SCSI Task to the head of the queue.  This is used when the task
-	// has been removed from the head of the queue, but the subclass indicates
-	// that it can not yet process this task.
-	void 	AddSCSITaskToHeadOfQueue ( SCSITask * request );
-	
-	// Remove the next SCSI Task for the queue and return it.
-	SCSITask * RetrieveNextSCSITaskFromQueue ( void );
-	
-	// Check to see if the SCSI Task resides in the queue and abort it if it does.
-	bool 	AbortSCSITaskFromQueue ( SCSITask * request );
-	
-	// Methods for sending and completing SCSI tasks
-	void	SendSCSITasksFromQueue ( void );
-	
-	void	RejectSCSITasksCurrentlyQueued ( void );
-	
-	void	ProcessCompletedTask ( 	SCSITaskIdentifier 	request, 
-									SCSIServiceResponse serviceResponse,
-									SCSITaskStatus		taskStatus );
-	void	RejectTask ( SCSITaskIdentifier		request );
-	
-	// ------ Power Management Support ------
-	
-	// The InitializePowerManagement method is called to initialize power management.
-	// In the protocol services layer, this method calls the protocol interface layer
-	// to initialize power management state variables and then registers the protocol
-	// layer driver with the power manager with two(2) states, ON and OFF.	
-	virtual void		InitializePowerManagement ( IOService * provider );
-	
-	// The GetInitialPowerState method is called once, right after InitializePowerManagement()
-	// in order to determine what state the device is initially in at startup time (usually
-	// the highest power mode).
-	virtual UInt32		GetInitialPowerState ( void );
-	
-	// The HandlePowerChange method is pure virtual and is left to each protocol or
-	// application layer driver to implement. It is guaranteed to be called on its
-	// own thread of execution and can make synchronous or asynchronous calls.
-	virtual void		HandlePowerChange ( void );
-	
-	// The HandleCheckPowerState (void) method is on the serialized side of the command
-	// gate and can change member variables safely without multi-threading issues.
-	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
-	// with the max power state the class registered with.
-	virtual void		HandleCheckPowerState ( void );
-	
-	// The TicklePowerManager ( void ) method is called by CheckPowerState and
-	// sends an activity tickle to the power manager so that the idle timer is
-	// reset.
-	virtual void		TicklePowerManager ( void );
-	
-	// The HandlePowerOff method is called to do any bus specific activity
-	// necessary before shutting down and going to sleep.
-	virtual IOReturn	HandlePowerOff ( void );
-	
-	// The HandlePowerOn method is called to do any bus specific activity
-	// necessary to recover from power-on/wake from sleep (e.g. bus reset on ATAPI)
-	virtual IOReturn	HandlePowerOn ( void );
-	
-public:
-	
-	virtual bool	start	( IOService * provider );
-	virtual void	free	( void );
-	
-	void RegisterSCSITaskCompletionRoutine ( SCSITaskCompletion completion );
-	
-	// ------- SCSI Architecture Model Task Management Functions ------
-	// The ExecuteCommand method will take a SCSI Task and transport
-	// it across the physical wire(s) to the device
-	void					ExecuteCommand ( SCSITaskIdentifier	request );
-	
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a specific task be aborted.
-	SCSIServiceResponse		AbortTask ( UInt8 theLogicalUnit, SCSITaggedTaskIdentifier theTag );
-
-	// The Task Management function to allow the SCSI Application Layer client to request
-	// that a all tasks curerntly in the task set be aborted.
-	SCSIServiceResponse		AbortTaskSet ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		ClearACA ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		ClearTaskSet ( UInt8 theLogicalUnit );
-    
-	SCSIServiceResponse		LogicalUnitReset ( UInt8 theLogicalUnit );
-
-	SCSIServiceResponse		TargetReset ( void );
-	
-    // ************* Obsoleted Member Routine ****************
-    // The AbortCommand method is replaced by the AbortTask Management function and
-    // should no longer be called.
-	virtual SCSIServiceResponse		AbortCommand ( SCSITaskIdentifier	request );
-
-	
-	// ---- Method used for determining protocol or physical interconnect characteristics. ----
-	// The IsProtocolServiceSupported will return true if the specified
-	// feature is supported by the protocol layer.  If the service has a value that must be
-	// returned, it will be returned in the serviceValue output parameter.
-	virtual bool	IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue ) = 0;
-
-	// The HandleProtocolServiceFeature instructs the Protocol Services driver to perform the necessary 
-	// tasks for the indicated feature.
-	virtual bool	HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue ) = 0;
-
-protected:
-	
-	// ----- Protocol Services Driver request handlers for Task Management functions -----
-	// These should be abstract so that every Protocol Services Driver would have to
-	// override them, but since they are new member routines, this class will provide
-	// a default implementation.
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 1 );
-	virtual SCSIServiceResponse		HandleAbortTask ( 
-											UInt8 						theLogicalUnit, 
-											SCSITaggedTaskIdentifier 	theTag );
-    
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 2 );
-	virtual SCSIServiceResponse		HandleAbortTaskSet ( 
-											UInt8 						theLogicalUnit );
-	
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 3 );
-	virtual SCSIServiceResponse		HandleClearACA ( 
-											UInt8 						theLogicalUnit );
-	
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 4 );
-	virtual SCSIServiceResponse		HandleClearTaskSet (
-											UInt8 						theLogicalUnit );
-	
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 5 );
-	virtual SCSIServiceResponse		HandleLogicalUnitReset (
-											UInt8 						theLogicalUnit );
-											
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices, 6 );
-    // The HandleTargetReset member routine requests that the Protocol Services Driver
-    // perform the necessary steps detailed in the specification that defines the 
-    // protocol the driver represents for the TargetReset management function.
-	virtual SCSIServiceResponse		HandleTargetReset ( void );
-
-
-    OSMetaClassDeclareReservedUsed ( IOSCSIProtocolServices,  7 );
-    // The CreateSCSITargetDevice member routine will create the appropriate object
-    // to represent the Target portion of a SCSI Device.  This object is responsible
-    // for managing the Target functions of the SCSI Device including the Task Manager and
-    // Logical Units.
-    // If the SCSITargetDevice object was successfully created, a true value will be
-    // returned, otherwisw, this will return false.
-	virtual bool					CreateSCSITargetDevice ( void );
-	
-private:
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices,  8 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 	9 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 10 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 11 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 12 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 13 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 14 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 15 );
-    OSMetaClassDeclareReservedUnused ( IOSCSIProtocolServices, 16 );
-    
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_SCSI_PROTOCOL_SERVICES_H_ */
diff --git a/i386/include/IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h b/i386/include/IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h
deleted file mode 100644
index 955fd6e..0000000
--- a/i386/include/IOKit/scsi/IOSCSIReducedBlockCommandsDevice.h
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_
-#define _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit headers
-#include <IOKit/IOLib.h>
-#include <IOKit/IOMemoryDescriptor.h>
-
-// Generic IOKit storage related headers
-#include <IOKit/storage/IOStorage.h>
-
-// SCSI Architecture Model Family includes
-#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
-
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-
-// RBC power states as defined in T10:1240D SCSI Reduced Block Commands (RBC)
-// Revision 10a, August 18, 1999, page 13.
-enum
-{
-	kRBCPowerStateSystemSleep	= 0,
-	kRBCPowerStateSleep 		= 1,
-	kRBCPowerStateStandby 		= 2,
-	kRBCPowerStateIdle			= 3,
-	kRBCPowerStateActive		= 4,
-	kRBCNumPowerStates			= 5
-};
-
-enum
-{
-	kMediaStateUnlocked	= 0,
-	kMediaStateLocked 	= 1
-};
-
-#define kCapacityDataBufferSize				8
-
-// Forward declaration for the SCSIReducedBlockCommands that is used internally by the
-// IOSCSIReducedBlockCommandsDevice class.
-class SCSIReducedBlockCommands;
-
-//-----------------------------------------------------------------------------
-//	Class Declaration
-//-----------------------------------------------------------------------------
-
-class IOSCSIReducedBlockCommandsDevice : public IOSCSIPrimaryCommandsDevice
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIReducedBlockCommandsDevice );
-	
-private:
-	
-#ifndef __LP64__
-	
-    SCSIReducedBlockCommands *		fSCSIReducedBlockCommandObject;
-    SCSIReducedBlockCommands *		GetSCSIReducedBlockCommandObject ( void );
-	
-#endif	/* !__LP64__ */
-	
-	static void			AsyncReadWriteComplete ( SCSITaskIdentifier completedTask );
-	
-protected:
-    
-    // Reserve space for future expansion.
-    struct IOSCSIReducedBlockCommandsDeviceExpansionData
-	{
-		IONotifier *	fPowerDownNotifier;
-        bool			fMediumRemovalPrevented;
-        bool			fKnownManualEject;
-        UInt32			fPollingMode;
-		bool			fProtocolSpecificPowerControl;
-	};
-    IOSCSIReducedBlockCommandsDeviceExpansionData * fIOSCSIReducedBlockCommandsDeviceReserved;
-	
-	#define fPowerDownNotifier				fIOSCSIReducedBlockCommandsDeviceReserved->fPowerDownNotifier
-	#define fMediumRemovalPrevented			fIOSCSIReducedBlockCommandsDeviceReserved->fMediumRemovalPrevented
-	#define fKnownManualEject				fIOSCSIReducedBlockCommandsDeviceReserved->fKnownManualEject
-	#define fPollingMode					fIOSCSIReducedBlockCommandsDeviceReserved->fPollingMode
-	#define fProtocolSpecificPowerControl	fIOSCSIReducedBlockCommandsDeviceReserved->fProtocolSpecificPowerControl
-	
-	bool				fMediaChanged;
-	bool				fMediaPresent;
-	
-	// The byte count of each physical block on the media.
-	UInt32				fMediaBlockSize;
-	
-	// The total number of blocks of mediaBlockSize on the media.
-	UInt32				fMediaBlockCount;
-	
-	// Flags used to indicate device feature
-	bool				fMediaIsRemovable;
-	bool				fMediaIsWriteProtected;
-	
-	thread_call_t		fPollingThread;
-	
-	enum
-	{
-		kPollingMode_Suspended			= 0,
-		kPollingMode_NewMedia 			= 1,
-		kPollingMode_MediaRemoval		= 2
-	};
-	
-	virtual void 		CreateStorageServiceNub ( void );
-	virtual bool		DetermineDeviceCharacteristics ( void );	
-	virtual void		PollForMedia ( void );
-	virtual void		EnablePolling ( void );
-	virtual void		DisablePolling ( void );
-	virtual void		CheckWriteProtection ( void );
-	virtual void		SetMediaCharacteristics ( UInt32 blockSize, UInt32 blockCount );
- 	virtual void		ResetMediaCharacteristics ( void );
-	virtual bool		ClearNotReadyStatus ( void );
-	
-	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
-									UInt64					startBlock,
-									UInt64					blockCount );
-	
-	virtual IOReturn	IssueWrite ( IOMemoryDescriptor*	buffer,
-									 UInt64					startBlock,
-									 UInt64					blockCount );
-	
-	virtual IOReturn	IssueRead ( IOMemoryDescriptor *	buffer,
-									UInt64					startBlock,
-									UInt64					blockCount,
-									void *					clientData );
-	
-	virtual IOReturn	IssueWrite ( IOMemoryDescriptor *	buffer,
-									 UInt64					startBlock,
-									 UInt64					blockCount,
-									 void *					clientData );
-
-#ifndef __LP64__
-	
-	// This method will retreive the SCSI Primary Command Set object for
-	// the class.  For subclasses, this will be overridden using a
-	// dynamic cast on the subclasses base command set object.
-	virtual SCSIPrimaryCommands *	GetSCSIPrimaryCommandObject ( void );
-
-#endif	/* !__LP64__ */
-	
-	// ----- Power Management Support ------
-		
-	// We override this method to set our power states and register ourselves
-	// as a power policy maker.
-	virtual void 		InitializePowerManagement ( IOService * provider );
-	
-	// We override this method so that when we register for power management,
-	// we go to our active power state (which the drive is definitely in
-	// at startup time).
-	virtual UInt32		GetInitialPowerState ( void );
-	
-	// We override this method in order to provide the number of transitions
-	// from Fully active to Sleep state so that the idle timer can be adjusted
-	// to the appropriate time period based on the disk spindown time set in
-	// the Energy Saver prefs panel.
-	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
-	
-	// The TicklePowerManager method is called to tell the power manager that the
-	// device needs to be in a certain power state to handle requests.
-	virtual void		TicklePowerManager ( void );
-	
-	// The HandlePowerChange method is the state machine for power management.
-	// It is guaranteed to be on its own thread of execution (different from
-	// the power manager thread AND the workloop thread. This routine can
-	// send sync or async calls to the drive without worrying about threading
-	// issues.
-	virtual void		HandlePowerChange ( void );
-	
-	// The HandleCheckPowerState (void) method is on the serialized side of the command
-	// gate and can change member variables safely without multi-threading issues.
-	// It's main purpose is to call the superclass' HandleCheckPowerState ( UInt32 maxPowerState )
-	// with the max power state the class registered with.
-	virtual void		HandleCheckPowerState ( void );
-	
-	// The CheckMediaPresence method is called to see if the media which we
-	// anticipated being there is still there.
-	virtual bool		CheckMediaPresence ( void );
-	
-	virtual bool		InitializeDeviceSupport ( void );
-	virtual void		StartDeviceSupport ( void );
-	virtual void		SuspendDeviceSupport ( void );
-	virtual void		ResumeDeviceSupport ( void );
-	virtual void		StopDeviceSupport ( void );
-	virtual void		TerminateDeviceSupport ( void );
-	
-	virtual void 		free ( void );
-	
-#ifndef __LP64__
-	
-	virtual bool		CreateCommandSetObjects ( void );
-	virtual void		FreeCommandSetObjects ( void );
-
-#endif	/* !__LP64__ */
-	
-public:
-	
-	virtual IOReturn	SyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt64					startBlock,
-											UInt64					blockCount );
-	
-	virtual IOReturn	AsyncReadWrite (	IOMemoryDescriptor *	buffer,
-											UInt64					block,
-											UInt64					nblks,
-											void *					clientData );
-	
-	
-	virtual IOReturn	EjectTheMedia ( void );	
-	virtual IOReturn	FormatMedia ( UInt64 byteCapacity );
-	virtual UInt32		GetFormatCapacities ( 	UInt64 * capacities,
-												UInt32   capacitiesMaxCount ) const;
-	virtual IOReturn	LockUnlockMedia ( bool doLock );
-	virtual IOReturn	SynchronizeCache ( void );
-	virtual IOReturn	ReportBlockSize ( UInt64 * blockSize );
-	virtual IOReturn	ReportEjectability ( bool * isEjectable );
-	virtual IOReturn	ReportLockability ( bool * isLockable );
-	virtual IOReturn	ReportPollRequirements ( bool * pollIsRequired,
-												 bool * pollIsExpensive );
-	virtual IOReturn	ReportMaxReadTransfer (  UInt64 	blockSize,
-												 UInt64 * 	max );
-	virtual IOReturn	ReportMaxValidBlock ( UInt64 * maxBlock );
-	virtual IOReturn	ReportMaxWriteTransfer ( UInt64	blockSize,
-												UInt64 * max );
-	virtual IOReturn	ReportMediaState ( 	bool * mediaPresent,
-											bool * changed );
-	virtual IOReturn	ReportRemovability ( bool * isRemovable );
-	virtual IOReturn	ReportWriteProtection ( bool * isWriteProtected );
-	
-	static 	void		sPollForMedia ( void * pdtDriver, void * refCon );
-	
-	
-protected:
-	
-	
-	// The FORMAT_UNIT command as defined in section 5.1
-	virtual bool FORMAT_UNIT (
-							SCSITaskIdentifier			request,
-							SCSICmdField1Bit			IMMED,
-	   						SCSICmdField1Bit			PROGRESS,
-	   						SCSICmdField1Bit			PERCENT_TIME,
-	   						SCSICmdField1Bit			INCREMENT );
-	
-	// The INQUIRY command as defined in SPC-2 w/o CONTROL byte
-	virtual bool INQUIRY (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit			CMDDT,
-							SCSICmdField1Bit			EVPD,
-							SCSICmdField1Byte			PAGE_OR_OPERATION_CODE,
-							SCSICmdField1Byte			ALLOCATION_LENGTH );
-	
-	// The MODE_SELECT(6) command as defined in SPC-2 w/o CONTROL byte
-	virtual bool MODE_SELECT_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			PF,
-							SCSICmdField1Bit 			SP,
-							SCSICmdField1Byte 			PARAMETER_LIST_LENGTH );
-	
-	// The MODE_SENSE(6) command as defined in SPC-2 w/o CONTROL byte
-	virtual bool MODE_SENSE_6 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Bit 			DBD,
-		   					SCSICmdField2Bit 			PC,
-		   					SCSICmdField6Bit 			PAGE_CODE,
-		   					SCSICmdField1Byte 			ALLOCATION_LENGTH );
-	
-	// The PERSISTENT_RESERVE_IN command as defined in SPC-2 w/o CONTROL byte
-	virtual bool PERSISTENT_RESERVE_IN (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-		   					SCSICmdField5Bit 			SERVICE_ACTION,
-		   					SCSICmdField2Byte 			ALLOCATION_LENGTH );
-	
-	// The PERSISTENT_RESERVE_OUT command as defined in SPC-2 w/o CONTROL byte
-	virtual bool PERSISTENT_RESERVE_OUT (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-		   					SCSICmdField5Bit			SERVICE_ACTION,
-		   					SCSICmdField4Bit			SCOPE,
-		   					SCSICmdField4Bit			TYPE );
-	
-	// The PREVENT_ALLOW_MEDIUM_REMOVAL command as defined in SPC-2 w/o CONTROL byte
-	virtual bool PREVENT_ALLOW_MEDIUM_REMOVAL ( 
-							SCSITaskIdentifier			request,
-	 						SCSICmdField2Bit			PREVENT );
-	
-   	// The READ_10 command as defined in section 5.2
-	virtual bool READ_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							UInt32						blockSize,
-							SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS,
-							SCSICmdField2Byte			TRANSFER_LENGTH );
-	
-	// The READ_CAPACITY command as defined in section 5.3
-	virtual bool READ_CAPACITY (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer );
-	
-	// The RELEASE(6) command as defined in SPC-2 w/o CONTROL byte
-	virtual bool RELEASE_6 (								
-							SCSITaskIdentifier			request );
-	
-	// The REQUEST_SENSE command as defined in SPC-2 w/o CONTROL byte
-	virtual bool REQUEST_SENSE (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField1Byte 			ALLOCATION_LENGTH );
-	
-	// The RESERVE(6) command as defined in SPC-2 w/o CONTROL byte
-	virtual bool RESERVE_6 (	
-							SCSITaskIdentifier			request );
-	
-	// The START_STOP_UNIT command as defined in section 5.4
-	virtual bool START_STOP_UNIT (
-							SCSITaskIdentifier			request,
-							SCSICmdField1Bit			IMMED,
-							SCSICmdField4Bit			POWER_CONDITIONS,
-							SCSICmdField1Bit			LEOJ,
-							SCSICmdField1Bit			START );
-	
-	// The SYNCRONIZE_CACHE command as defined in section 5.5
-	virtual bool SYNCHRONIZE_CACHE (
-							SCSITaskIdentifier			request );
-	
-	// The TEST_UNIT_READY command as defined in SPC-2 w/o CONTROL byte
-	virtual bool TEST_UNIT_READY (
-							SCSITaskIdentifier			request );
-	
-	// The VERIFY command as defined in section 5.7
-	virtual bool VERIFY (
-							SCSITaskIdentifier			request,
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-							SCSICmdField2Byte 			VERIFICATION_LENGTH );
-	
-	// The WRITE_10 command	as defined in section 5.6
-	virtual bool WRITE_10 (
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							UInt32						blockSize,
-							SCSICmdField1Bit			FUA,
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS,
-							SCSICmdField2Byte 			TRANSFER_LENGTH );
-	
-	// The WRITE_BUFFER command as defined in SPC-2 w/o CONTROL byte
-	virtual bool WRITE_BUFFER ( 
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer,
-							SCSICmdField4Bit 			MODE,
-							SCSICmdField1Byte 			BUFFER_ID,
-							SCSICmdField3Byte 			BUFFER_OFFSET,
-							SCSICmdField3Byte 			PARAMETER_LIST_LENGTH );
-	
-	
-
-	/* Added with 10.2 */
-	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 1 );
-	
-public:
-	
-	virtual IOReturn	PowerDownHandler (	void * 			refCon,
-											UInt32 			messageType,
-											IOService * 	provider,
-											void * 			messageArgument,
-											vm_size_t 		argSize );
-	
-	
-	/* Added with 10.2 */	
-	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 2 );
-	
-protected:
-
-	virtual	void		SetMediaIcon ( void );
-	
-
-	/* Added with 10.3.3 */		
-	OSMetaClassDeclareReservedUsed ( IOSCSIReducedBlockCommandsDevice, 3 );
-	
-protected:
-
-	virtual	void AsyncReadWriteCompletion ( SCSITaskIdentifier completedTask );
-	
-	
-private:
-	
-	// Space reserved for future expansion.
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  8 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice,  9 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 10 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 11 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 12 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIReducedBlockCommandsDevice, 16 );
-	
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_IO_SCSI_REDUCED_BLOCK_COMMANDS_DEVICE_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICmds_INQUIRY_Definitions.h b/i386/include/IOKit/scsi/SCSICmds_INQUIRY_Definitions.h
deleted file mode 100644
index 55a6a4c..0000000
--- a/i386/include/IOKit/scsi/SCSICmds_INQUIRY_Definitions.h
+++ /dev/null
@@ -1,923 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_CMDS_INQUIRY_H_
-#define _IOKIT_SCSI_CMDS_INQUIRY_H_
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSI Inquiry Definitions
-	@discussion
-	This file contains all definitions for the data returned from
-	the INQUIRY (0x12) command.
-*/
-
-
-/*!
- * @enum Payload sizes
- * @discussion
- * Definitions for sizes related to the INQUIRY data.
- * @constant kINQUIRY_StandardDataHeaderSize
- * INQUIRY data header size.
- * @constant kINQUIRY_MaximumDataSize
- * Maximum size for INQUIRY data.
-*/
-enum
-{
-	kINQUIRY_StandardDataHeaderSize			= 5,
-	kINQUIRY_MaximumDataSize				= 255	
-};
-
-
-/*!
-@enum INQUIRY field sizes
-@discussion
-Sizes for some of the inquiry data fields.
-@constant kINQUIRY_VENDOR_IDENTIFICATION_Length
-Size of VENDOR_IDENTIFICATION field.
-@constant kINQUIRY_PRODUCT_IDENTIFICATION_Length
-Size of PRODUCT_IDENTIFICATION field.
-@constant kINQUIRY_PRODUCT_REVISION_LEVEL_Length
-Size of PRODUCT_REVISION_LEVEL field.
-*/
-enum
-{
-	kINQUIRY_VENDOR_IDENTIFICATION_Length	= 8,
-	kINQUIRY_PRODUCT_IDENTIFICATION_Length	= 16,
-	kINQUIRY_PRODUCT_REVISION_LEVEL_Length	= 4
-};
-
-
-/*!
-@struct SCSICmd_INQUIRY_StandardData
-@discussion
-This structure defines the format of the required standard data that is 
-returned for the INQUIRY command.  This is the data that is required to
-be returned from all devices.
-*/
-typedef struct SCSICmd_INQUIRY_StandardData
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		RMB;								// 7 = removable
-	UInt8		VERSION;							// 7/6 = ISO/IEC, 5-3 = ECMA, 2-0 = ANSI.
-	UInt8		RESPONSE_DATA_FORMAT;				// 7 = AERC, 6 = Obsolete, 5 = NormACA, 4 = HiSup 3-0 = Response data format. (SPC-3 obsoletes AERC)
-													// If ANSI Version = 0, this is ATAPI and bits 7-4 = ATAPI version.
-	UInt8		ADDITIONAL_LENGTH;					// Number of additional bytes available in inquiry data
-	UInt8		SCCSReserved;						// SCC-2 device flag and reserved fields (SPC-3 adds PROTECT 3PC TPGS, and ACC)
-	UInt8		flags1;								// First byte of support flags (See SPC-3 section 6.4.2)
-	UInt8		flags2;								// Second byte of support flags (Byte 7) (See SPC-3 section 6.4.2)
-	char		VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
-	char		PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
-	char		PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
-} SCSICmd_INQUIRY_StandardData;
-typedef SCSICmd_INQUIRY_StandardData * SCSICmd_INQUIRY_StandardDataPtr;
-
-
-/*!
-@struct SCSICmd_INQUIRY_StandardDataAll
-@discussion
-This structure defines the all of the fields that can be returned in
-repsonse to the INQUIRy request for the standard data.  There is no
-requirement as to how much of the additional data must be returned by a device.
-*/
-typedef struct SCSICmd_INQUIRY_StandardDataAll
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		RMB;								// 7 = removable
-	UInt8		VERSION;							// 7/6 = ISO/IEC, 5-3 = ECMA, 2-0 = ANSI.
-	UInt8		RESPONSE_DATA_FORMAT;				// 7 = AERC, 6 = Obsolete, 5 = NormACA, 4 = HiSup 3-0 = Response data format.
-													// If ANSI Version = 0, this is ATAPI and bits 7-4 = ATAPI version.
-	UInt8		ADDITIONAL_LENGTH;					// Number of additional bytes available in inquiry data
-	UInt8		SCCSReserved;						// SCC-2 device flag and reserved fields
-	UInt8		flags1;								// First byte of support flags (Byte 6)
-	UInt8		flags2;								// Second byte of support flags (Byte 7)
-	char		VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
-	char		PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
-	char		PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
-	
-	// Following is the optional data that may be returned by a device.
-	UInt8		VendorSpecific1[20];
-	UInt8		flags3;								// Third byte of support flags, mainly SPI-3 (Byte 56)
-	UInt8		Reserved1;
-	UInt16		VERSION_DESCRIPTOR[8];
-	UInt8		Reserved2[22];
-	UInt8		VendorSpecific2[160];
-} SCSICmd_INQUIRY_StandardDataAll;
-
-
-/*!
-@enum Peripheral Qualifier
-@discussion
-Inquiry Peripheral Qualifier definitions
-@constant kINQUIRY_PERIPHERAL_QUALIFIER_Connected
-Peripheral Device is connected.
-@constant kINQUIRY_PERIPHERAL_QUALIFIER_SupportedButNotConnected
-Peripheral Device is supported, but not connected.
-@constant kINQUIRY_PERIPHERAL_QUALIFIER_NotSupported
-Peripheral Device is not supported.
-@constant kINQUIRY_PERIPHERAL_QUALIFIER_Mask
-Mask to use for PERIPHERAL_DEVICE_TYPE field.
-*/
-enum
-{
-	kINQUIRY_PERIPHERAL_QUALIFIER_Connected					= 0x00,
-	kINQUIRY_PERIPHERAL_QUALIFIER_SupportedButNotConnected	= 0x20,
-	kINQUIRY_PERIPHERAL_QUALIFIER_NotSupported				= 0x60,
-	kINQUIRY_PERIPHERAL_QUALIFIER_Mask						= 0xE0
-};
-
-
-/*!
-@enum Peripheral Device types
-@discussion
-Inquiry Peripheral Device type definitions
-@constant kINQUIRY_PERIPHERAL_TYPE_DirectAccessSBCDevice
-SBC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_SequentialAccessSSCDevice
-Sequential Access (Tape) SSC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_PrinterSSCDevice
-SSC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_ProcessorSPCDevice
-SPC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_WriteOnceSBCDevice
-SBC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_CDROM_MMCDevice
-MMC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_ScannerSCSI2Device
-SCSI2 Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_OpticalMemorySBCDevice
-SBC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_MediumChangerSMCDevice
-SMC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_CommunicationsSSCDevice
-Comms SSC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_StorageArrayControllerSCC2Device
-SCC2 Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_EnclosureServicesSESDevice
-SES Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_SimplifiedDirectAccessRBCDevice
-RBC Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_OpticalCardReaderOCRWDevice
-OCRW Device.
-@constant kINQUIRY_PERIPHERAL_TYPE_ObjectBasedStorageDevice
-OSD device.
-@constant kINQUIRY_PERIPHERAL_TYPE_AutomationDriveInterface
-Automation Drive Interface device.
-@constant kINQUIRY_PERIPHERAL_TYPE_WellKnownLogicalUnit
-Well known logical unit.
-@constant kINQUIRY_PERIPHERAL_TYPE_UnknownOrNoDeviceType
-Unknown or no device.
-@constant kINQUIRY_PERIPHERAL_TYPE_Mask
-Mask to use for PERIPHERAL_DEVICE_TYPE field.
-*/
-enum
-{
-	kINQUIRY_PERIPHERAL_TYPE_DirectAccessSBCDevice				= 0x00,
-	kINQUIRY_PERIPHERAL_TYPE_SequentialAccessSSCDevice			= 0x01,
-	kINQUIRY_PERIPHERAL_TYPE_PrinterSSCDevice					= 0x02,
-	kINQUIRY_PERIPHERAL_TYPE_ProcessorSPCDevice					= 0x03,
-	kINQUIRY_PERIPHERAL_TYPE_WriteOnceSBCDevice					= 0x04,
-	kINQUIRY_PERIPHERAL_TYPE_CDROM_MMCDevice					= 0x05,
-	kINQUIRY_PERIPHERAL_TYPE_ScannerSCSI2Device					= 0x06,
-	kINQUIRY_PERIPHERAL_TYPE_OpticalMemorySBCDevice				= 0x07,
-	kINQUIRY_PERIPHERAL_TYPE_MediumChangerSMCDevice				= 0x08,
-	kINQUIRY_PERIPHERAL_TYPE_CommunicationsSSCDevice			= 0x09,
-	/* 0x0A - 0x0B ASC IT8 Graphic Arts Prepress Devices */
-	kINQUIRY_PERIPHERAL_TYPE_StorageArrayControllerSCC2Device	= 0x0C,
-	kINQUIRY_PERIPHERAL_TYPE_EnclosureServicesSESDevice			= 0x0D,
-	kINQUIRY_PERIPHERAL_TYPE_SimplifiedDirectAccessRBCDevice	= 0x0E,
-	kINQUIRY_PERIPHERAL_TYPE_OpticalCardReaderOCRWDevice		= 0x0F,
-	/* 0x10 - 0x1E Reserved Device Types */
-	kINQUIRY_PERIPHERAL_TYPE_ObjectBasedStorageDevice			= 0x11,
-	kINQUIRY_PERIPHERAL_TYPE_AutomationDriveInterface			= 0x12,
-	kINQUIRY_PERIPHERAL_TYPE_WellKnownLogicalUnit				= 0x1E,
-	kINQUIRY_PERIPHERAL_TYPE_UnknownOrNoDeviceType				= 0x1F,
-	
-	
-	kINQUIRY_PERIPHERAL_TYPE_Mask								= 0x1F
-};
-
-
-/*!
-@enum Removable Bit field definitions
-@discussion
-Inquiry Removable Bit field definitions
-@constant kINQUIRY_PERIPHERAL_RMB_MediumFixed
-Medium type is fixed disk.
-@constant kINQUIRY_PERIPHERAL_RMB_MediumRemovable
-Medium type is removable disk.
-@constant kINQUIRY_PERIPHERAL_RMB_BitMask
-Mask to use for RMB field.
-*/
-enum
-{
-	kINQUIRY_PERIPHERAL_RMB_MediumFixed 						= 0x00,
-	kINQUIRY_PERIPHERAL_RMB_MediumRemovable 					= 0x80,
-	kINQUIRY_PERIPHERAL_RMB_BitMask 							= 0x80
-};
-
-
-/*!
-@enum Version field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY Version field.
-@constant kINQUIRY_ISO_IEC_VERSION_Mask
-Mask for valid bits for ISO/IEC Version.
-@constant kINQUIRY_ECMA_VERSION_Mask
-Mask for valid bits for ECMA Version.
-@constant kINQUIRY_ANSI_VERSION_NoClaimedConformance
-No ANSI conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_SCSI_1_Compliant
-SCSI-1 conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_SCSI_2_Compliant
-SCSI-2 conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant
-SPC conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_2_Compliant
-SPC-2 conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_SCSI_SPC_3_Compliant
-SPC-3 conformance claimed by the device server.
-@constant kINQUIRY_ANSI_VERSION_Mask
-Mask for valid bits for ANSI Version.
-*/
-enum
-{
-	kINQUIRY_ISO_IEC_VERSION_Mask								= 0xC0,
-	
-	kINQUIRY_ECMA_VERSION_Mask									= 0x38,
-	
-	kINQUIRY_ANSI_VERSION_NoClaimedConformance					= 0x00,
-	kINQUIRY_ANSI_VERSION_SCSI_1_Compliant						= 0x01,
-	kINQUIRY_ANSI_VERSION_SCSI_2_Compliant						= 0x02,
-	kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant					= 0x03,
-	kINQUIRY_ANSI_VERSION_SCSI_SPC_2_Compliant					= 0x04,
-	kINQUIRY_ANSI_VERSION_SCSI_SPC_3_Compliant					= 0x05,
-	kINQUIRY_ANSI_VERSION_Mask									= 0x07
-};
-
-
-/*!
-@enum Response Data Format field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY RESPONSE_DATA_FORMAT field.
-@constant kINQUIRY_Byte3_HISUP_Bit
-HISUP bit definition.
-@constant kINQUIRY_Byte3_NORMACA_Bit
-NORMACA bit definition.
-@constant kINQUIRY_Byte3_AERC_Bit
-AERC bit definition.
-@constant kINQUIRY_RESPONSE_DATA_FORMAT_Mask
-Mask for valid bits for RESPONSE_DATA_FORMAT.
-@constant kINQUIRY_Byte3_HISUP_Mask
-Mask to use to test the HISUP bit.
-@constant kINQUIRY_Byte3_NORMACA_Mask
-Mask to use to test the NORMACA bit.
-@constant kINQUIRY_Byte3_AERC_Mask
-Mask to use to test the AERC bit.
-*/
-enum
-{
-	// Bit definitions
-	// Bits 0-3: RESPONSE DATA FORMAT
-	kINQUIRY_Byte3_HISUP_Bit				= 4,
-	kINQUIRY_Byte3_NORMACA_Bit				= 5,
-	// Bit 6 is Obsolete
-	kINQUIRY_Byte3_AERC_Bit					= 7,
-	
-	// Masks
-	kINQUIRY_RESPONSE_DATA_FORMAT_Mask		= 0x0F, // Bits 0-3
-	kINQUIRY_Byte3_HISUP_Mask				= (1 << kINQUIRY_Byte3_HISUP_Bit),
-	kINQUIRY_Byte3_NORMACA_Mask				= (1 << kINQUIRY_Byte3_NORMACA_Bit),
-	// Bit 6 is Obsolete
-	kINQUIRY_Byte3_AERC_Mask				= (1 << kINQUIRY_Byte3_AERC_Bit)
-};
-
-
-/*!
-@enum SCCS field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY SCCSReserved field.
-@constant kINQUIRY_Byte5_SCCS_Bit
-SCCS bit definition.
-@constant kINQUIRY_Byte5_ACC_Bit
-ACC bit definition.
-@constant kINQUIRY_Byte5_3PC_Bit
-3PC bit definition.
-@constant kINQUIRY_Byte5_PROTECT_Bit
-PROTECT bit definition.
-@constant kINQUIRY_Byte5_SCCS_Mask
-Mask to use to test the SCCS bit.
-@constant kINQUIRY_Byte5_ACC_Mask
-Mask to use to test the ACC bit.
-@constant kINQUIRY_Byte5_TPGS_Mask
-Mask to use for the TPGS bits.
-@constant kINQUIRY_Byte5_3PC_Mask
-Mask to use to test the 3PC bit.
-@constant kINQUIRY_Byte5_PROTECT_Mask
-Mask to use to test the PROTECT bit.
-*/
-enum
-{
-	// Bit definitions
-	kINQUIRY_Byte5_SCCS_Bit					= 7,
-	kINQUIRY_Byte5_ACC_Bit					= 6,
-	// Bits 4-5: TPGS
-	kINQUIRY_Byte5_3PC_Bit					= 3,
-	// Bits 1-2: Reserved
-	kINQUIRY_Byte5_PROTECT_Bit				= 0,
-	
-	// Masks
-	kINQUIRY_Byte5_SCCS_Mask				= (1 << kINQUIRY_Byte5_SCCS_Bit),
-	kINQUIRY_Byte5_ACC_Mask					= (1 << kINQUIRY_Byte5_ACC_Bit),
-	kINQUIRY_Byte5_TPGS_Mask				= 0x18,
-	kINQUIRY_Byte5_3PC_Mask					= (1 << kINQUIRY_Byte5_3PC_Bit),
-	// Bits 1-2: Reserved
-	kINQUIRY_Byte5_PROTECT_Mask				= (1 << kINQUIRY_Byte5_PROTECT_Bit)
-};
-
-
-/*!
-@enum flags1 field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY flags1 field.
-@constant kINQUIRY_Byte6_ADDR16_Bit
-ADDR16 bit definition.
-@constant kINQUIRY_Byte6_MCHNGR_Bit
-MCHNGR bit definition.
-@constant kINQUIRY_Byte6_MULTIP_Bit
-MULTIP bit definition.
-@constant kINQUIRY_Byte6_VS_Bit
-VS bit definition.
-@constant kINQUIRY_Byte6_ENCSERV_Bit
-ENCSERV bit definition.
-@constant kINQUIRY_Byte6_BQUE_Bit
-BQUE bit definition.
-@constant kINQUIRY_Byte6_ADDR16_Mask
-Mask to use to test the ADDR16 bit.
-@constant kINQUIRY_Byte6_MCHNGR_Mask
-Mask to use to test the MCHNGR bit.
-@constant kINQUIRY_Byte6_MULTIP_Mask
-Mask to use to test the MULTIP bit.
-@constant kINQUIRY_Byte6_VS_Mask
-Mask to use to test the VS bit.
-@constant kINQUIRY_Byte6_ENCSERV_Mask
-Mask to use to test the ENCSERV bit.
-@constant kINQUIRY_Byte6_BQUE_Mask
-Mask to use to test the BQUE bit.
-*/
-enum
-{
-	// Byte offset
-	kINQUIRY_Byte6_Offset					= 6,
-	
-	// Bit definitions
-	kINQUIRY_Byte6_ADDR16_Bit				= 0,	// SPI Specific
-	// Bit 1 is Obsolete
-	// Bit 2 is Obsolete
-	kINQUIRY_Byte6_MCHNGR_Bit				= 3,
-	kINQUIRY_Byte6_MULTIP_Bit				= 4,
-	kINQUIRY_Byte6_VS_Bit					= 5,	
-	kINQUIRY_Byte6_ENCSERV_Bit				= 6,	
-	kINQUIRY_Byte6_BQUE_Bit					= 7,	
-
-	// Masks
-	kINQUIRY_Byte6_ADDR16_Mask				= (1 << kINQUIRY_Byte6_ADDR16_Bit),	// SPI Specific
-	// Bit 1 is Obsolete
-	// Bit 2 is Obsolete
-	kINQUIRY_Byte6_MCHNGR_Mask				= (1 << kINQUIRY_Byte6_MCHNGR_Bit),
-	kINQUIRY_Byte6_MULTIP_Mask				= (1 << kINQUIRY_Byte6_MULTIP_Bit),
-	kINQUIRY_Byte6_VS_Mask					= (1 << kINQUIRY_Byte6_VS_Bit),
-	kINQUIRY_Byte6_ENCSERV_Mask				= (1 << kINQUIRY_Byte6_ENCSERV_Bit),
-	kINQUIRY_Byte6_BQUE_Mask				= (1 << kINQUIRY_Byte6_BQUE_Bit)
-};
-
-
-/*!
-@enum flags2 field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY flags2 field.
-@constant kINQUIRY_Byte7_VS_Bit
-VS bit definition.
-@constant kINQUIRY_Byte7_CMDQUE_Bit
-CMDQUE bit definition.
-@constant kINQUIRY_Byte7_TRANDIS_Bit
-TRANDIS bit definition.
-@constant kINQUIRY_Byte7_LINKED_Bit
-LINKED bit definition.
-@constant kINQUIRY_Byte7_SYNC_Bit
-SYNC bit definition.
-@constant kINQUIRY_Byte7_WBUS16_Bit
-WBUS16 bit definition.
-@constant kINQUIRY_Byte7_RELADR_Bit
-RELADR bit definition.
-@constant kINQUIRY_Byte7_VS_Mask
-Mask to use to test the VS bit.
-@constant kINQUIRY_Byte7_CMDQUE_Mask
-Mask to use to test the CMDQUE bit.
-@constant kINQUIRY_Byte7_TRANDIS_Mask
-Mask to use to test the TRANDIS bit.
-@constant kINQUIRY_Byte7_LINKED_Mask
-Mask to use to test the LINKED bit.
-@constant kINQUIRY_Byte7_SYNC_Mask
-Mask to use to test the SYNC bit.
-@constant kINQUIRY_Byte7_WBUS16_Mask
-Mask to use to test the WBUS16 bit.
-@constant kINQUIRY_Byte7_RELADR_Mask
-Mask to use to test the RELADR bit.
-*/
-enum
-{
-	// Byte offset
-	kINQUIRY_Byte7_Offset					= 7,
-	
-	// Bit definitions
-	kINQUIRY_Byte7_VS_Bit					= 0,
-	kINQUIRY_Byte7_CMDQUE_Bit				= 1,
-	kINQUIRY_Byte7_TRANDIS_Bit				= 2,	// SPI Specific
-	kINQUIRY_Byte7_LINKED_Bit				= 3,
-	kINQUIRY_Byte7_SYNC_Bit					= 4,	// SPI Specific
-	kINQUIRY_Byte7_WBUS16_Bit				= 5,	// SPI Specific
-	// Bit 6 is Obsolete
-	kINQUIRY_Byte7_RELADR_Bit				= 7,
-	
-	// Masks
-	kINQUIRY_Byte7_VS_Mask					= (1 << kINQUIRY_Byte7_VS_Bit),
-	kINQUIRY_Byte7_CMDQUE_Mask				= (1 << kINQUIRY_Byte7_CMDQUE_Bit),
-	kINQUIRY_Byte7_TRANDIS_Mask				= (1 << kINQUIRY_Byte7_TRANDIS_Bit),// SPI Specific
-	kINQUIRY_Byte7_LINKED_Mask				= (1 << kINQUIRY_Byte7_LINKED_Bit),
-	kINQUIRY_Byte7_SYNC_Mask				= (1 << kINQUIRY_Byte7_SYNC_Bit),	// SPI Specific
-	kINQUIRY_Byte7_WBUS16_Mask				= (1 << kINQUIRY_Byte7_WBUS16_Bit),	// SPI Specific
-	// Bit 6 is Obsolete
-	kINQUIRY_Byte7_RELADR_Mask				= (1 << kINQUIRY_Byte7_RELADR_Bit)
-};
-
-
-/*!
-@enum Byte 56 features field definitions
-@discussion
-Definitions for bits/masks in the INQUIRY Byte 56 field.
-Inquiry Byte 56 features (for devices that report an ANSI VERSION of
-kINQUIRY_ANSI_VERSION_SCSI_SPC_Compliant or later).
-These are SPI-3 Specific.
-@constant kINQUIRY_Byte56_IUS_Bit
-IUS bit definition.
-@constant kINQUIRY_Byte56_QAS_Bit
-QAS bit definition.
-@constant kINQUIRY_Byte56_IUS_Mask
-Mask to use to test the IUS bit.
-@constant kINQUIRY_Byte56_QAS_Mask
-Mask to use to test the QAS bit.
-@constant kINQUIRY_Byte56_CLOCKING_Mask
-Mask to use to test CLOCKING bits.
-@constant kINQUIRY_Byte56_CLOCKING_ONLY_ST
-Single-transition clocking only.
-@constant kINQUIRY_Byte56_CLOCKING_ONLY_DT
-Double-transition clocking only.
-@constant kINQUIRY_Byte56_CLOCKING_ST_AND_DT
-Single-transition and double-transition clocking.
-*/
-enum
-{
-	// Byte offset
-	kINQUIRY_Byte56_Offset					= 56,
-
-	// Bit definitions
-	kINQUIRY_Byte56_IUS_Bit					= 0,
-	kINQUIRY_Byte56_QAS_Bit					= 1,
-	// Bits 2 and 3 are the CLOCKING bits
-	// All other bits are reserved
-	
-	kINQUIRY_Byte56_IUS_Mask				= (1 << kINQUIRY_Byte56_IUS_Bit),
-	kINQUIRY_Byte56_QAS_Mask				= (1 << kINQUIRY_Byte56_QAS_Bit),
-	kINQUIRY_Byte56_CLOCKING_Mask			= 0x0C,
-
-	// Definitions for the CLOCKING bits
-	kINQUIRY_Byte56_CLOCKING_ONLY_ST		= 0x00,
-	kINQUIRY_Byte56_CLOCKING_ONLY_DT		= 0x04,
-	// kINQUIRY_Byte56_CLOCKING_RESERVED	= 0x08,
-	kINQUIRY_Byte56_CLOCKING_ST_AND_DT		= 0x0C
-};
-
-
-/*!
-@define kINQUIRY_VERSION_DESCRIPTOR_MaxCount
-Maximum number of INQUIRY version descriptors supported.
-*/
-#define	kINQUIRY_VERSION_DESCRIPTOR_MaxCount		8
-
-
-/*!
-@enum kINQUIRY_VERSION_DESCRIPTOR_SAT
-SAT specification version descriptor.
-*/
-enum
-{
-	kINQUIRY_VERSION_DESCRIPTOR_SAT					= 0x1EA0
-};
-
-
-/*
-IORegistry property names for information derived from the Inquiry data.
-The Peripheral Device Type is the only property that the 
-generic Logical Unit Drivers will use to match. These properties are
-listed in order of matching priority. First is the Peripheral Device Type.
-Second is the Vendor Identification. Third is the Product Identification.
-Last is the Product Revision Level. To match a particular product, you would
-specify the Peripheral Device Type, Vendor Identification, and Product
-Identification. To restrict the match to a particular firmware revision, you
-would add the Product Revision Level. To not match on a particular product,
-but on a particular vendor's products, you would only include the 
-Peripheral Device Type and the Vendor Identification.
-*/
-
-/*!
-@define kIOPropertySCSIPeripheralDeviceType
-SCSI Peripheral Device Type as reported in the INQUIRY data.
-*/
-#define kIOPropertySCSIPeripheralDeviceType			"Peripheral Device Type"
-
-/*!
-@define kIOPropertySCSIPeripheralDeviceTypeSize
-Size of the kIOPropertySCSIPeripheralDeviceType key.
-*/
-#define kIOPropertySCSIPeripheralDeviceTypeSize		8
-
-/* These properties are listed in order of matching priority */
-
-/*!
-@define kIOPropertySCSIVendorIdentification
-Vendor ID as reported in the INQUIRY data. Additional space characters (0x20)
-are truncated.
-*/
-#define kIOPropertySCSIVendorIdentification			"Vendor Identification"
-
-/*!
-@define kIOPropertySCSIProductIdentification
-Product ID as reported in the INQUIRY data. Additional space characters (0x20)
-are truncated.
-*/
-#define kIOPropertySCSIProductIdentification		"Product Identification"
-
-/*!
-@define kIOPropertySCSIProductRevisionLevel
-Product Revision Level as reported in the INQUIRY data.
-*/
-#define kIOPropertySCSIProductRevisionLevel			"Product Revision Level"
-
-
-/*!
-@enum INQUIRY Page Codes
-@discussion INQUIRY Page Codes to be used when EVPD is set in the
-INQUIRY command.
-@constant kINQUIRY_Page00_PageCode
-Page Code 00h.
-@constant kINQUIRY_Page80_PageCode
-Page Code 80h.
-@constant kINQUIRY_Page83_PageCode
-Page Code 83h.
-@constant kINQUIRY_Page89_PageCode
-Page Code 89h.
-*/
-enum
-{
-	kINQUIRY_Page00_PageCode				= 0x00,
-	kINQUIRY_Page80_PageCode				= 0x80,
-	kINQUIRY_Page83_PageCode				= 0x83,
-	kINQUIRY_Page89_PageCode				= 0x89
-};	
-
-
-/*!
-@struct SCSICmd_INQUIRY_Page00_Header
-@discussion INQUIRY Page 00h Header.
-*/
-typedef struct SCSICmd_INQUIRY_Page00_Header
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		PAGE_CODE;							// Must be equal to 00h
-	UInt8		RESERVED;							// reserved field
-	UInt8		PAGE_LENGTH;						// n-3 bytes
-} SCSICmd_INQUIRY_Page00_Header;
-
-
-/*!
-@struct SCSICmd_INQUIRY_Page80_Header
-@discussion INQUIRY Page 80h Header.
-*/
-typedef struct SCSICmd_INQUIRY_Page80_Header
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		PAGE_CODE;							// Must be equal to 80h
-	UInt8		RESERVED;							// reserved field
-	UInt8		PAGE_LENGTH;						// n-3 bytes
-	UInt8		PRODUCT_SERIAL_NUMBER;				// 4-n
-} SCSICmd_INQUIRY_Page80_Header;
-
-
-/*!
-@define kIOPropertySCSIINQUIRYUnitSerialNumber
-Key that describes the INQUIRY Unit Serial Number in the IORegistry.
-*/
-#define kIOPropertySCSIINQUIRYUnitSerialNumber		"INQUIRY Unit Serial Number"
-
-
-/*!
-@struct SCSICmd_INQUIRY_Page83_Header
-@discussion INQUIRY Page 83h Header.
-*/
-typedef struct SCSICmd_INQUIRY_Page83_Header
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		PAGE_CODE;							// Must be equal to 83h
-	UInt8		RESERVED;							// reserved field
-	UInt8		PAGE_LENGTH;						// n-3 bytes
-} SCSICmd_INQUIRY_Page83_Header;
-
-
-/*!
-@struct SCSICmd_INQUIRY_Page83_Header_SPC_16
-@discussion INQUIRY Page 83h Header used with the 16 byte INQUIRY command.
-*/
-typedef struct SCSICmd_INQUIRY_Page83_Header_SPC_16
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		PAGE_CODE;							// Must be equal to 83h
-	UInt16		PAGE_LENGTH;						// n-3 bytes
-} SCSICmd_INQUIRY_Page83_Header_SPC_16;
-
-
-/*!
-@struct SCSICmd_INQUIRY_Page83_Identification_Descriptor
-@discussion INQUIRY Page 83h Identification Descriptor.
-*/
-typedef struct SCSICmd_INQUIRY_Page83_Identification_Descriptor
-{
-	UInt8		CODE_SET;							// 7-4 = Protocol Identifier. 3-0 = Code Set
-	UInt8		IDENTIFIER_TYPE;					// 7 = PIV 5-4 = ASSOCIATION 3-0 = Identifier
-	UInt8		RESERVED;							
-	UInt8		IDENTIFIER_LENGTH;
-	UInt8		IDENTIFIER;
-} SCSICmd_INQUIRY_Page83_Identification_Descriptor;
-
-
-/*!
-@enum INQUIRY Page 83h Code Set
-@discussion
-Definitions for the Code Set field.
-@constant kINQUIRY_Page83_CodeSetBinaryData
-The identifier contains binary data.
-@constant kINQUIRY_Page83_CodeSetASCIIData
-The identifier contains ASCII data.
-@constant kINQUIRY_Page83_CodeSetUTF8Data
-The identifier contains UTF-8 data.
-*/
-enum
-{
-	kINQUIRY_Page83_CodeSetReserved			= 0x0,
-	kINQUIRY_Page83_CodeSetBinaryData		= 0x1,
-	kINQUIRY_Page83_CodeSetASCIIData		= 0x2,
-	kINQUIRY_Page83_CodeSetUTF8Data			= 0x3,
-	// 0x4 - 0xF reserved
-	kINQUIRY_Page83_CodeSetMask				= 0xF
-};	
-
-
-/*!
-@enum INQUIRY Page 83h Association
-@discussion
-Definitions for the Association field.
-@constant kINQUIRY_Page83_AssociationLogicalUnit
-Association of the identifier is with the logical unit.
-@constant kINQUIRY_Page83_AssociationDevice
-Association of the identifier is with the device (same as logical unit in SPC-2).
-@constant kINQUIRY_Page83_AssociationTargetPort
-Association of the identifier is with the target port.
-@constant kINQUIRY_Page83_AssociationTargetDevice
-Association of the identifier is with the target device (i.e. all ports).
-@constant kINQUIRY_Page83_AssociationMask
-Mask to use to determine association.
-*/
-enum
-{	
-	// SPC-3 - Association is changed to be specific to 
-	// Logical Units
-	kINQUIRY_Page83_AssociationLogicalUnit	= 0x00,
-	
-	// Backwards compatibility for SPC-2
-	kINQUIRY_Page83_AssociationDevice 		= kINQUIRY_Page83_AssociationLogicalUnit,
-	
-	// Association is related to a Target Port
-	kINQUIRY_Page83_AssociationTargetPort	= 0x10,
-	
-	// SPC-3 - Added as specific association to
-	// a Target device.
-	kINQUIRY_Page83_AssociationTargetDevice	= 0x20,
-	
-	kINQUIRY_Page83_AssociationMask			= 0x30
-};	
-		
-
-/*!
-@enum INQUIRY Page 83h Identifier Type
-@discussion
-Definitions for the Identifier Type field.
-@constant kINQUIRY_Page83_IdentifierTypeUndefined
-Undefined Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeVendorID
-Vendor Specific Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeIEEE_EUI64
-EUI-64 Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeNAAIdentifier
-NAA Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeRelativePortIdentifier
-Relative Target Port Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeTargetPortGroup
-Target Port Group Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeLogicalUnitGroup
-Logical Unit Group Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeMD5LogicalUnitIdentifier
-MD5 Logical Unit Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeSCSINameString
-SCSI Name String Identifier Type.
-@constant kINQUIRY_Page83_IdentifierTypeMask
-Mask to use to determine association.
-@constant kINQUIRY_Page83_ProtocolIdentifierValidBit
-PIV Bit definition.
-@constant kINQUIRY_Page83_ProtocolIdentifierValidMask
-Mask to use to determine if PIV is set.
-*/
-enum
-{
-	kINQUIRY_Page83_IdentifierTypeUndefined					= 0,
-	kINQUIRY_Page83_IdentifierTypeVendorID					= 1,
-	kINQUIRY_Page83_IdentifierTypeIEEE_EUI64				= 2,
-	kINQUIRY_Page83_IdentifierTypeNAAIdentifier				= 3,
-	kINQUIRY_Page83_IdentifierTypeRelativePortIdentifier	= 4,
-	kINQUIRY_Page83_IdentifierTypeTargetPortGroup			= 5,
-	kINQUIRY_Page83_IdentifierTypeLogicalUnitGroup			= 6,
-	kINQUIRY_Page83_IdentifierTypeMD5LogicalUnitIdentifier  = 7,
-	kINQUIRY_Page83_IdentifierTypeSCSINameString			= 8,
-	// 0x9 - 0xF Reserved
-	
-	kINQUIRY_Page83_IdentifierTypeMask						= 0xF,
-	
-	kINQUIRY_Page83_ProtocolIdentifierValidBit				= 7,
-	kINQUIRY_Page83_ProtocolIdentifierValidMask				= (1 << kINQUIRY_Page83_ProtocolIdentifierValidBit)
-	
-};	
-
-// Backwards compatibility
-#define kINQUIRY_Page83_IdentifierTypeFCNameIdentifier		kINQUIRY_Page83_IdentifierTypeNAAIdentifier
-
-
-/*!
-@enum Protocol Identifier values
-@discussion
-Definitions for the protocol identifier values.
-@constant kSCSIProtocolIdentifier_FibreChannel
-FibreChannel Protocol Identifier.
-@constant kSCSIProtocolIdentifier_ParallelSCSI
-Parallel SCSI Protocol Identifier.
-@constant kSCSIProtocolIdentifier_SSA
-SSA Protocol Identifier.
-@constant kSCSIProtocolIdentifier_FireWire
-FireWire (IEEE-1394) Protocol Identifier.
-@constant kSCSIProtocolIdentifier_RDMA
-RDMA Protocol Identifier.
-@constant kSCSIProtocolIdentifier_iSCSI
-iSCSI Protocol Identifier.
-@constant kSCSIProtocolIdentifier_SAS
-SAS Protocol Identifier.
-@constant kSCSIProtocolIdentifier_ADT
-ADT Protocol Identifier.
-@constant kSCSIProtocolIdentifier_ATAPI
-ATAPI Protocol Identifier.
-@constant kSCSIProtocolIdentifier_None
-No Protocol Identifier.
-*/
-enum
-{
-	kSCSIProtocolIdentifier_FibreChannel					= 0,
-	kSCSIProtocolIdentifier_ParallelSCSI					= 1,
-	kSCSIProtocolIdentifier_SSA								= 2,
-	kSCSIProtocolIdentifier_FireWire						= 3,
-	kSCSIProtocolIdentifier_RDMA							= 4,
-	kSCSIProtocolIdentifier_iSCSI							= 5,
-	kSCSIProtocolIdentifier_SAS								= 6,
-	kSCSIProtocolIdentifier_ADT								= 7,
-	kSCSIProtocolIdentifier_ATAPI							= 8,
-	// 0x9-0xE Reserved
-	kSCSIProtocolIdentifier_None							= 0xF
-};
-
-
-/*!
-@define kIOPropertySCSIINQUIRYDeviceIdentification
-Device Identification key.
-*/
-#define kIOPropertySCSIINQUIRYDeviceIdentification		"INQUIRY Device Identification"
-
-
-/*!
-@define kIOPropertySCSIINQUIRYDeviceIdCodeSet
-Code Set type key.
-*/
-#define kIOPropertySCSIINQUIRYDeviceIdCodeSet			"Code Set"
-
-
-/*!
-@define kIOPropertySCSIINQUIRYDeviceIdType
-Identifier Type key.
-*/
-#define kIOPropertySCSIINQUIRYDeviceIdType				"Identifier Type"
-
-
-/*!
-@define kIOPropertySCSIINQUIRYDeviceIdAssociation
-Association key.
-*/
-#define kIOPropertySCSIINQUIRYDeviceIdAssociation		"Association"
-
-
-/*!
-@define kIOPropertySCSIINQUIRYDeviceIdentifier
-Identifier key (data or string).
-*/
-#define kIOPropertySCSIINQUIRYDeviceIdentifier			"Identifier"
-		
-
-/*!
-@struct SCSICmd_INQUIRY_Page89_Data
-@discussion INQUIRY Page 89h data as defined in the SAT 1.0
-specification. This section contians all structures and
-definitions used by the INQUIRY command in response to a request
-for page 89h - ATA information VPD Page.
-*/
-typedef struct SCSICmd_INQUIRY_Page89_Data
-{
-	UInt8		PERIPHERAL_DEVICE_TYPE;				// 7-5 = Qualifier. 4-0 = Device type.
-	UInt8		PAGE_CODE;							// Must be equal to 89h
-	UInt16		PAGE_LENGTH;						// Must be equal to 238h
-	UInt32		Reserved;
-	UInt8		SAT_VENDOR_IDENTIFICATION[kINQUIRY_VENDOR_IDENTIFICATION_Length];
-	UInt8		SAT_PRODUCT_IDENTIFICATION[kINQUIRY_PRODUCT_IDENTIFICATION_Length];
-	UInt8		SAT_PRODUCT_REVISION_LEVEL[kINQUIRY_PRODUCT_REVISION_LEVEL_Length];
-	UInt8		ATA_DEVICE_SIGNATURE[20];
-	UInt8		COMMAND_CODE;
-	UInt8		Reserved2[3];
-	UInt8		IDENTIFY_DATA[512];
-} SCSICmd_INQUIRY_Page89_Data;
-
-
-/*!
-@define kIOPropertySATVendorIdentification
-Vendor Identification of the SATL.
-*/
-#define kIOPropertySATVendorIdentification			"SAT Vendor Identification"
-
-
-/*!
-@define kIOPropertySATProductIdentification
-Product Identification of the SATL.
-*/
-#define kIOPropertySATProductIdentification			"SAT Product Identification"
-
-
-/*!
-@define kIOPropertySATProductRevisonLevel
-Product Revision Level of the SATL.
-*/
-#define kIOPropertySATProductRevisonLevel			"SAT Product Revision Level"
-
-
-#endif	/* _IOKIT_SCSI_CMDS_INQUIRY_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICmds_MODE_Definitions.h b/i386/include/IOKit/scsi/SCSICmds_MODE_Definitions.h
deleted file mode 100644
index 8d9c250..0000000
--- a/i386/include/IOKit/scsi/SCSICmds_MODE_Definitions.h
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_
-#define _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSI Request Sense Definitions
-	@discussion
-	This file contains all definitions for the data returned from
-	the MODE_SENSE_6 and MODE_SENSE_10 commands.
-*/
-
-#pragma pack(1)
-
-/*!
-@struct SPCModeParameterHeader6
-@discussion
-Mode Parameter Header for the MODE_SENSE_6 command.
-*/
-typedef struct SPCModeParameterHeader6
-{
-	UInt8		MODE_DATA_LENGTH;
-	UInt8		MEDIUM_TYPE;
-	UInt8		DEVICE_SPECIFIC_PARAMETER;
-	UInt8		BLOCK_DESCRIPTOR_LENGTH;
-} SPCModeParameterHeader6;
-
-
-/*!
-@struct SPCModeParameterHeader10
-@discussion
-Mode Parameter Header for the MODE_SENSE_10 command.
-*/
-typedef struct SPCModeParameterHeader10
-{
-	UInt16		MODE_DATA_LENGTH;
-	UInt8		MEDIUM_TYPE;
-	UInt8		DEVICE_SPECIFIC_PARAMETER;
-	UInt8		LONGLBA;
-	UInt8		RESERVED;
-	UInt16		BLOCK_DESCRIPTOR_LENGTH;
-} SPCModeParameterHeader10;
-
-
-/*!
-@enum Long LBA Bitfield definitions
-@discussion
-Long LBA Bitfield definitions for Mode Parameter Header
-for MODE_SENSE_10 command.
-@constant kModeSenseParameterHeader10_LongLBABit
-Bit to indicate Long LBA block descriptors follow.
-@constant kModeSenseParameterHeader10_LongLBAMask
-Mask to test for kModeSenseParameterHeader10_LongLBABit.
-*/
-enum
-{
-	kModeSenseParameterHeader10_LongLBABit	=  0,
-	kModeSenseParameterHeader10_LongLBAMask	=  (1 << kModeSenseParameterHeader10_LongLBABit),
-};
-
-
-/*!
-@enum Device Specific Parameter Bitfield definitions
-@discussion
-SBC definitions for Device Specific Parameter in the
-Mode Sense Header Block.
-@constant kModeSenseSBCDeviceSpecific_DPOFUABit
-Bit to indicate DPO and FUA bits are accepted by the device server.
-@constant kModeSenseSBCDeviceSpecific_WriteProtectBit
-Bit to indicate medium is write protected.
-@constant kModeSenseSBCDeviceSpecific_DPOFUAMask
-Mask to test for kModeSenseSBCDeviceSpecific_DPOFUABit.
-@constant kModeSenseSBCDeviceSpecific_WriteProtectMask
-Mask to test for kModeSenseSBCDeviceSpecific_WriteProtectBit.
-*/
-enum
-{
-	kModeSenseSBCDeviceSpecific_DPOFUABit	 		=  4,
-	kModeSenseSBCDeviceSpecific_WriteProtectBit	 	=  7,
-	kModeSenseSBCDeviceSpecific_DPOFUAMask 			=  (1 << kModeSenseSBCDeviceSpecific_DPOFUABit),
-	kModeSenseSBCDeviceSpecific_WriteProtectMask 	=  (1 << kModeSenseSBCDeviceSpecific_WriteProtectBit)
-};
-
-
-/*!
-@struct ModeParameterBlockDescriptor
-@discussion
-General mode parameter block descriptor.
-*/
-typedef struct ModeParameterBlockDescriptor
-{
-	UInt8		DENSITY_CODE;
-	UInt8		NUMBER_OF_BLOCKS[3];
-	UInt8		RESERVED;
-	UInt8		BLOCK_LENGTH[3];
-} ModeParameterBlockDescriptor;
-
-
-/*!
-@struct DASDModeParameterBlockDescriptor
-@discussion
-Direct Access Storage Device mode parameter block descriptor.
-*/
-typedef struct DASDModeParameterBlockDescriptor
-{
-	UInt32		NUMBER_OF_BLOCKS;
-	UInt8		DENSITY_CODE;
-	UInt8		BLOCK_LENGTH[3];
-} DASDModeParameterBlockDescriptor;
-
-
-/*!
-@struct LongLBAModeParameterBlockDescriptor
-@discussion
-Long LBA mode parameter block descriptor.
-*/
-typedef struct LongLBAModeParameterBlockDescriptor
-{
-	UInt64		NUMBER_OF_BLOCKS;
-	UInt8		DENSITY_CODE;
-	UInt8		RESERVED[3];
-	UInt32		BLOCK_LENGTH;
-} LongLBAModeParameterBlockDescriptor;
-
-
-/*!
-@struct ModePageFormatHeader
-@discussion
-Mode Page format header.
-*/
-typedef struct ModePageFormatHeader
-{
-	UInt8		PS_PAGE_CODE;
-	UInt8		PAGE_LENGTH;
-} ModePageFormatHeader;
-
-
-/*!
-@enum Mode Page Format bit definitions
-@discussion
-Mode Page Format bit definitions.
-@constant kModePageFormat_PS_Bit
-Bit to indicate Parameters Saveable.
-@constant kModePageFormat_PAGE_CODE_Mask
-Mask to obtain the PAGE_CODE from the PS_PAGE_CODE field.
-@constant kModePageFormat_PS_Mask
-Mask to test for kModePageFormat_PS_Bit.
-*/
-enum
-{
-	kModePageFormat_PS_Bit			= 7,
-	
-	kModePageFormat_PAGE_CODE_Mask	= 0x3F,
-	kModePageFormat_PS_Mask			= (1 << kModePageFormat_PS_Bit)
-};
-
-
-#if 0
-#pragma mark -
-#pragma mark SPC Mode Pages
-#pragma mark -
-#endif
-
-
-/*!
-@enum SPC Mode Pages
-@discussion
-SPC Mode Page definitions.
-@constant kSPCModePagePowerConditionCode
-Power Conditions Mode Page value.
-@constant kSPCModePageAllPagesCode
-All Mode Pages value.
-*/
-enum
-{
-	kSPCModePagePowerConditionCode		= 0x1A,
-	kSPCModePageAllPagesCode			= 0x3F
-};
-
-/*!
-@struct SPCModePagePowerCondition
-@discussion
-Power Conditions Mode Page (PAGE CODE 0x1A) format.
-*/
-typedef struct SPCModePagePowerCondition
-{
-	ModePageFormatHeader	header;
-	UInt8					RESERVED;
-	UInt8					IDLE_STANDBY;
-	UInt32					IDLE_CONDITION_TIMER;
-	UInt32					STANDBY_CONDITION_TIMER;
-} SPCModePagePowerCondition;
-
-
-#if 0
-#pragma mark -
-#pragma mark 0x00 SBC Direct Access Mode Pages
-#pragma mark -
-#endif
-
-
-/*!
-@enum SBC Mode Pages
-@discussion
-SBC Mode Page definitions.
-@constant kSBCModePageFormatDeviceCode
-Format Device Mode Page value.
-@constant kSBCModePageRigidDiskGeometryCode
-Rigid Disk Geometry Page value.
-@constant kSBCModePageFlexibleDiskCode
-Flexible Disk Page value.
-@constant kSBCModePageCachingCode
-Caching Page value.
-*/
-enum
-{
-	kSBCModePageFormatDeviceCode		= 0x03,
-	kSBCModePageRigidDiskGeometryCode	= 0x04,
-	kSBCModePageFlexibleDiskCode		= 0x05,
-	kSBCModePageCachingCode				= 0x08
-};
-
-
-/*!
-@struct SBCModePageFormatDevice
-@discussion
-Format Device Mode Page (PAGE CODE 0x03) format.
-*/
-typedef struct SBCModePageFormatDevice
-{
-	ModePageFormatHeader	header;
-	UInt16					TRACKS_PER_ZONE;
-	UInt16					ALTERNATE_SECTORS_PER_ZONE;
-	UInt16					ALTERNATE_TRACKS_PER_ZONE;
-	UInt16					ALTERNATE_TRACKS_PER_LOGICAL_UNIT;
-	UInt16					SECTORS_PER_TRACK;
-	UInt16					DATA_BYTES_PER_PHYSICAL_SECTOR;
-	UInt16					INTERLEAVE;
-	UInt16					TRACK_SKEW_FACTOR;
-	UInt16					CYLINDER_SKEW_FACTOR;
-	UInt8					SSEC_HSEC_RMB_SURF;
-	UInt8					RESERVED[3];
-} SBCModePageFormatDevice;
-
-
-/*!
-@struct SBCModePageRigidDiskGeometry
-@discussion
-Rigid Disk Geometry Mode Page (PAGE CODE 0x04) format.
-*/
-typedef struct SBCModePageRigidDiskGeometry
-{
-	ModePageFormatHeader	header;
-	UInt8					NUMBER_OF_CYLINDERS[3];
-	UInt8					NUMBER_OF_HEADS;
-	UInt8					STARTING_CYLINDER_WRITE_PRECOMPENSATION[3];
-	UInt8					STARTING_CYLINDER_REDUCED_WRITE_CURRENT[3];
-	UInt16					DEVICE_STEP_RATE;
-	UInt8					LANDING_ZONE_CYLINDER[3];
-	UInt8					RPL;
-	UInt8					ROTATIONAL_OFFSET;
-	UInt8					RESERVED;
-	UInt16					MEDIUM_ROTATION_RATE;
-	UInt8					RESERVED1[2];
-} SBCModePageRigidDiskGeometry;
-
-
-/*!
-@enum Rigid Disk Geometry bitfields
-@discussion
-Bit field masks for Rigid Disk Geometry structure fields.
-@constant kSBCModePageRigidDiskGeometry_RPL_Mask
-Mask for use with the RPL field.
-*/
-enum
-{
-	kSBCModePageRigidDiskGeometry_RPL_Mask	= 0x03
-};
-
-
-/*!
-@struct SBCModePageFlexibleDisk
-@discussion
-Flexible Disk Mode Page (PAGE CODE 0x05) format.
-*/
-typedef struct SBCModePageFlexibleDisk
-{
-	ModePageFormatHeader	header;
-	UInt16					TRANSFER_RATE;
-	UInt8					NUMBER_OF_HEADS;
-	UInt8					SECTORS_PER_TRACK;
-	UInt16					DATA_BYTES_PER_SECTOR;
-	UInt16					NUMBER_OF_CYLINDERS;
-	UInt16					STARTING_CYLINDER_WRITE_PRECOMPENSATION;
-	UInt16					STARTING_CYLINDER_REDUCED_WRITE_CURRENT;
-	UInt16					DEVICE_STEP_RATE;
-	UInt8					DEVICE_STEP_PULSE_WIDTH;
-	UInt16					HEAD_SETTLE_DELAY;
-	UInt8					MOTOR_ON_DELAY;
-	UInt8					MOTOR_OFF_DELAY;
-	UInt8					TRDY_SSN_MO;
-	UInt8					SPC;
-	UInt8					WRITE_COMPENSATION;
-	UInt8					HEAD_LOAD_DELAY;
-	UInt8					HEAD_UNLOAD_DELAY;
-	UInt8					PIN_34_PIN_2;
-	UInt8					PIN_4_PIN_1;
-	UInt16					MEDIUM_ROTATION_RATE;
-	UInt8					RESERVED[2];
-} SBCModePageFlexibleDisk;
-
-
-/*!
-@enum TRDY_SSN_MO bitfields
-@discussion
-Bit field definitions and masks for Flexible Disk TRDY_SSN_MO field.
-@constant kSBCModePageFlexibleDisk_MO_Bit
-MO Bit definition.
-@constant kSBCModePageFlexibleDisk_SSN_Bit
-SSN Bit definition.
-@constant kSBCModePageFlexibleDisk_TRDY_Bit
-TRDY Bit definition.
-@constant kSBCModePageFlexibleDisk_MO_Mask
-Mask for use with TRDY_SSN_MO field.
-@constant kSBCModePageFlexibleDisk_SSN_Mask
-Mask for use with TRDY_SSN_MO field.
-@constant kSBCModePageFlexibleDisk_TRDY_Mask
-Mask for use with TRDY_SSN_MO field.
-*/
-enum
-{
-	// Bits 0:4 Reserved
-	kSBCModePageFlexibleDisk_MO_Bit		= 5,
-	kSBCModePageFlexibleDisk_SSN_Bit	= 6,
-	kSBCModePageFlexibleDisk_TRDY_Bit	= 7,
-	
-	kSBCModePageFlexibleDisk_MO_Mask	= (1 << kSBCModePageFlexibleDisk_MO_Bit),
-	kSBCModePageFlexibleDisk_SSN_Mask	= (1 << kSBCModePageFlexibleDisk_SSN_Bit),
-	kSBCModePageFlexibleDisk_TRDY_Mask	= (1 << kSBCModePageFlexibleDisk_TRDY_Bit)
-};
-
-
-/*!
-@enum SPC bitfields
-@discussion
-Bit field definitions and masks for Flexible Disk SPC field.
-@constant kSBCModePageFlexibleDisk_SPC_Mask
-Mask for use with SPC field.
-*/
-enum
-{
-	kSBCModePageFlexibleDisk_SPC_Mask	= 0x0F
-};
-
-
-/*!
-@enum PIN_34_PIN_2 bitfields
-@discussion
-Bit field definitions and masks for Flexible Disk PIN_34_PIN_2 field.
-@constant kSBCModePageFlexibleDisk_PIN_2_Mask
-Mask for use with PIN_34_PIN_2 field.
-@constant kSBCModePageFlexibleDisk_PIN_34_Mask
-Mask for use with PIN_34_PIN_2 field.
-*/
-enum
-{
-	kSBCModePageFlexibleDisk_PIN_2_Mask		= 0x0F,
-	kSBCModePageFlexibleDisk_PIN_34_Mask	= 0xF0
-};
-
-
-/*!
-@enum PIN_4_PIN_1 bitfields
-@discussion
-Bit field definitions and masks for Flexible Disk PIN_4_PIN_1 field.
-@constant kSBCModePageFlexibleDisk_PIN_1_Mask
-Mask for use with PIN_4_PIN_1 field.
-@constant kSBCModePageFlexibleDisk_PIN_4_Mask
-Mask for use with PIN_4_PIN_1 field.
-*/
-enum
-{
-	kSBCModePageFlexibleDisk_PIN_1_Mask		= 0x0F,
-	kSBCModePageFlexibleDisk_PIN_4_Mask		= 0xF0
-};
-
-
-/*!
-@struct SBCModePageCaching
-@discussion
-Caching Mode Page (PAGE CODE 0x08) format.
-*/
-typedef struct SBCModePageCaching
-{
-	ModePageFormatHeader	header;
-	UInt8					flags;
-	UInt8					DEMAND_READ_WRITE_RETENTION_PRIORITY;
-	UInt16					DISABLE_PREFETCH_TRANSFER_LENGTH;
-	UInt16					MINIMUM_PREFETCH;
-	UInt16					MAXIMUM_PREFETCH;
-	UInt16					MAXIMUM_PREFETCH_CEILING;
-	UInt8					flags2;
-	UInt8					NUMBER_OF_CACHE_SEGMENTS;
-	UInt16					CACHE_SEGMENT_SIZE;
-	UInt8					RESERVED;
-	UInt8					NON_CACHE_SEGMENT_SIZE[3];
-} SBCModePageCaching;
-
-
-/*!
-@enum Caching flags bitfields
-@discussion
-Bit field definitions and masks for Caching flags field.
-@constant kSBCModePageCaching_RCD_Bit
-RCD Bit definition.
-@constant kSBCModePageCaching_MF_Bit
-MF Bit definition.
-@constant kSBCModePageCaching_WCE_Bit
-WCE Bit definition.
-@constant kSBCModePageCaching_SIZE_Bit
-SIZE Bit definition.
-@constant kSBCModePageCaching_DISC_Bit
-DISC Bit definition.
-@constant kSBCModePageCaching_CAP_Bit
-CAP Bit definition.
-@constant kSBCModePageCaching_ABPF_Bit
-ABPF Bit definition.
-@constant kSBCModePageCaching_IC_Bit
-IC Bit definition.
-@constant kSBCModePageCaching_RCD_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_MF_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_WCE_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_SIZE_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_DISC_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_CAP_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_ABPF_Mask
-Mask for use with flags field.
-@constant kSBCModePageCaching_IC_Mask
-Mask for use with flags field.
-*/
-enum
-{
-	kSBCModePageCaching_RCD_Bit		= 0,
-	kSBCModePageCaching_MF_Bit		= 1,
-	kSBCModePageCaching_WCE_Bit		= 2,
-	kSBCModePageCaching_SIZE_Bit	= 3,
-	kSBCModePageCaching_DISC_Bit	= 4,
-	kSBCModePageCaching_CAP_Bit		= 5,
-	kSBCModePageCaching_ABPF_Bit	= 6,
-	kSBCModePageCaching_IC_Bit		= 7,
-
-	kSBCModePageCaching_RCD_Mask	= (1 << kSBCModePageCaching_RCD_Bit),
-	kSBCModePageCaching_MF_Mask		= (1 << kSBCModePageCaching_MF_Bit),
-	kSBCModePageCaching_WCE_Mask	= (1 << kSBCModePageCaching_WCE_Bit),
-	kSBCModePageCaching_SIZE_Mask	= (1 << kSBCModePageCaching_SIZE_Bit),
-	kSBCModePageCaching_DISC_Mask	= (1 << kSBCModePageCaching_DISC_Bit),
-	kSBCModePageCaching_CAP_Mask	= (1 << kSBCModePageCaching_CAP_Bit),
-	kSBCModePageCaching_ABPF_Mask	= (1 << kSBCModePageCaching_ABPF_Bit),
-	kSBCModePageCaching_IC_Mask		= (1 << kSBCModePageCaching_IC_Bit)
-};
-
-
-/*!
-@enum Demand Read/Write Retention masks
-@discussion
-Demand Read/Write Retention masks.
-@constant kSBCModePageCaching_DEMAND_WRITE_Mask
-Mask for the DEMAND_READ_WRITE_RETENTION_PRIORITY field.
-@constant kSBCModePageCaching_DEMAND_READ_Mask
-Mask for the DEMAND_READ_WRITE_RETENTION_PRIORITY field.
-*/
-enum
-{
-	kSBCModePageCaching_DEMAND_WRITE_Mask	= 0x00FF,
-	kSBCModePageCaching_DEMAND_READ_Mask 	= 0xFF00
-};
-
-/*!
-@enum Caching flags2 bitfields
-@discussion
-Bit field definitions and masks for Caching flags2 field.
-@constant kSBCModePageCaching_VS1_Bit
-VS1 Bit definition.
-@constant kSBCModePageCaching_VS2_Bit
-VS2 Bit definition.
-@constant kSBCModePageCaching_DRA_Bit
-DRA Bit definition.
-@constant kSBCModePageCaching_LBCSS_Bit
-LBCSS Bit definition.
-@constant kSBCModePageCaching_FSW_Bit
-FSW Bit definition.
-@constant kSBCModePageCaching_VS1_Mask
-Mask for use with flags2 field.
-@constant kSBCModePageCaching_VS2_Mask
-Mask for use with flags2 field.
-@constant kSBCModePageCaching_DRA_Mask
-Mask for use with flags2 field.
-@constant kSBCModePageCaching_LBCSS_Mask
-Mask for use with flags2 field.
-@constant kSBCModePageCaching_FSW_Mask
-Mask for use with flags2 field.
-*/
-enum
-{
-	// Bits 0:2 Reserved
-	kSBCModePageCaching_VS1_Bit		= 3,
-	kSBCModePageCaching_VS2_Bit		= 4,
-	kSBCModePageCaching_DRA_Bit		= 5,
-	kSBCModePageCaching_LBCSS_Bit	= 6,
-	kSBCModePageCaching_FSW_Bit		= 7,
-
-	kSBCModePageCaching_VS1_Mask	= (1 << kSBCModePageCaching_VS1_Bit),
-	kSBCModePageCaching_VS2_Mask	= (1 << kSBCModePageCaching_VS2_Bit),
-	kSBCModePageCaching_DRA_Mask	= (1 << kSBCModePageCaching_DRA_Bit),
-	kSBCModePageCaching_LBCSS_Mask	= (1 << kSBCModePageCaching_LBCSS_Bit),
-	kSBCModePageCaching_FSW_Mask	= (1 << kSBCModePageCaching_FSW_Bit)
-};
-
-#pragma options align=reset
-
-#endif	/* _IOKIT_SCSI_CMDS_MODE_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICmds_READ_CAPACITY_Definitions.h b/i386/include/IOKit/scsi/SCSICmds_READ_CAPACITY_Definitions.h
deleted file mode 100644
index 59abde3..0000000
--- a/i386/include/IOKit/scsi/SCSICmds_READ_CAPACITY_Definitions.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_CMDS_READ_CAPACITY_H_
-#define _IOKIT_SCSI_CMDS_READ_CAPACITY_H_
-
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSI Request Sense Definitions
-	@discussion
-	This file contains all definitions for the data returned from
-	the READ CAPACITY 10 (0x25) and READ CAPACITY 16 (0x9E) commands.
-*/
-
-/*!
-@enum READ CAPACITY Payload Sizes
-@discussion
-Sizes of the payload for the READ CAPACITY 10 and
-READ CAPACITY 16 commands.
-@constant kREPORT_CAPACITY_DataSize
-Data size for a READ_CAPACITY command.
-@constant kREPORT_CAPACITY_16_DataSize
-Data size for a READ_CAPACITY_16 command.
-*/
-enum
-{
-	kREPORT_CAPACITY_DataSize		= 8,
-	kREPORT_CAPACITY_16_DataSize	= 32
-};
-
-
-/*!
-@constant kREPORT_CAPACITY_MaximumLBA
-@discussion
-Maximum LBA supported via READ CAPACITY 10 command.
-*/
-#define 	kREPORT_CAPACITY_MaximumLBA			0xFFFFFFFFUL
-
-
-/*!
-@constant kREPORT_CAPACITY_16_MaximumLBA
-@discussion
-Maximum LBA supported via READ CAPACITY 16 command.
-*/
-#define 	kREPORT_CAPACITY_16_MaximumLBA		0xFFFFFFFFFFFFFFFFULL
-
-
-/*!
-@struct SCSI_Capacity_Data
-@discussion
-Capacity return structure for READ CAPACITY 10 command.
-*/
-typedef struct SCSI_Capacity_Data
-{
-	UInt32		RETURNED_LOGICAL_BLOCK_ADDRESS;
-	UInt32		BLOCK_LENGTH_IN_BYTES;
-} SCSI_Capacity_Data;
-
-
-/*!
-@struct SCSI_Capacity_Data_Long
-@discussion
-Capacity return structure for READ CAPACITY 16 command.
-*/
-typedef struct SCSI_Capacity_Data_Long
-{
-	UInt64		RETURNED_LOGICAL_BLOCK_ADDRESS;
-	UInt32		BLOCK_LENGTH_IN_BYTES;
-	UInt8		RTO_EN_PROT_EN;
-	UInt8		Reserved[19];
-} SCSI_Capacity_Data_Long;
-
-
-/*!
-@enum RTO_EN definitions
-@discussion
-Values for the REFERENCE TAG OWN (RTO_EN) bit in the
-READ CAPACITY Long Data structure.
-@constant kREAD_CAPACITY_RTO_Enabled
-Reference Tag Own enabled.
-@constant kREAD_CAPACITY_RTO_Disabled
-Reference Tag Own disabled.
-@constant kREAD_CAPACITY_RTO_Mask
-Mask to use when checking the RTO_EN_PROT_EN field.
-*/
-enum
-{
-	kREAD_CAPACITY_RTO_Enabled								= 0x02,
-	kREAD_CAPACITY_RTO_Disabled								= 0x00,
-	kREAD_CAPACITY_RTO_Mask									= 0x02
-};
-
-
-/*!
-@enum PROTECTION INFORMATION definitions
-@discussion
-Values for the PROTECTION INFORMATION (PROT_EN) bit in the
-READ CAPACITY Long Data structure.
-@constant kREAD_CAPACITY_PROT_Enabled
-Protection Information enabled.
-@constant kREAD_CAPACITY_PROT_Disabled
-Protection Information disabled.
-@constant kREAD_CAPACITY_PROT_Mask
-Mask to use when checking the RTO_EN_PROT_EN field.
-*/
-
-enum
-{
-	kREAD_CAPACITY_PROT_Enabled								= 0x01,
-	kREAD_CAPACITY_PROT_Disabled							= 0x00,
-	kREAD_CAPACITY_PROT_Mask								= 0x01
-};
-
-
-#endif	/* _IOKIT_SCSI_CMDS_READ_CAPACITY_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICmds_REPORT_LUNS_Definitions.h b/i386/include/IOKit/scsi/SCSICmds_REPORT_LUNS_Definitions.h
deleted file mode 100644
index 6616e84..0000000
--- a/i386/include/IOKit/scsi/SCSICmds_REPORT_LUNS_Definitions.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_
-#define _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_
-
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSI Request Sense Definitions
-	@discussion
-	This file contains all definitions for the data returned from
-	the REPORT_LUNS (0xA0) command.
-*/
-
-
-/*!
-@struct SCSICmd_REPORT_LUNS_LUN_ENTRY
-@discussion
-This structure represents a single LUN entry in a LUN list
-returned via the REPORT_LUNS command.
-*/
-typedef struct SCSICmd_REPORT_LUNS_LUN_ENTRY
-{
-	UInt16		FIRST_LEVEL_ADDRESSING;
-	UInt16		SECOND_LEVEL_ADDRESSING;
-	UInt16		THIRD_LEVEL_ADDRESSING;
-	UInt16		FOURTH_LEVEL_ADDRESSING;
-} SCSICmd_REPORT_LUNS_LUN_ENTRY;
-
-
-/*!
-@constant kREPORT_LUNS_HeaderSize
-@discussion
-Size of the REPORT_LUNS header as defined in the SPC-3 specification.
-*/
-#define kREPORT_LUNS_HeaderSize		8
-
-/*!
-@enum REPORT_LUNS addressing methods.
-@discussion
-REPORT_LUNS addressing methods described in
-SAM-2 documents.
-@constant kREPORT_LUNS_ADDRESS_METHOD_PERIPHERAL_DEVICE
-Peripheral Device Addressing Method.
-@constant kREPORT_LUNS_ADDRESS_DEVICE_TYPE_SPECIFIC
-Device Type Specific Addressing Method.
-@constant kREPORT_LUNS_ADDRESS_METHOD_LOGICAL_UNIT
-Logical Unit Specific Addressing Method.
-@constant kREPORT_LUNS_ADDRESS_METHOD_OFFSET
-Offset to the address method data.
-*/
-enum
-{
-	kREPORT_LUNS_ADDRESS_METHOD_PERIPHERAL_DEVICE	= 0,
-	kREPORT_LUNS_ADDRESS_DEVICE_TYPE_SPECIFIC		= 1,
-	kREPORT_LUNS_ADDRESS_METHOD_LOGICAL_UNIT 		= 2,
-	// Reserved [3]
-	kREPORT_LUNS_ADDRESS_METHOD_OFFSET				= 14
-};
-
-
-/*!
-@struct REPORT_LUNS_LOGICAL_UNIT_ADDRESSING
-@discussion
-This structure represents a LUN Addressing scheme.
-*/
-typedef struct REPORT_LUNS_LOGICAL_UNIT_ADDRESSING
-{
-#ifdef __LITTLE_ENDIAN__
-	UInt16		LUN			: 5;
-	UInt16		BUS_NUMBER	: 3;
-	UInt16		TARGET		: 6;
-	UInt16		reserved2	: 1;
-	UInt16		reserved	: 1;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt16		reserved	: 1;
-	UInt16		reserved2	: 1;
-	UInt16		TARGET		: 6;
-	UInt16		BUS_NUMBER	: 3;
-	UInt16		LUN			: 5;
-#endif /* !__LITTLE_ENDIAN__ */
-} REPORT_LUNS_LOGICAL_UNIT_ADDRESSING;
-
-
-/*!
-@struct REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING
-@discussion
-This structure represents a Peripheral Device Addressing scheme.
-*/
-typedef struct REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING
-{
-#ifdef __LITTLE_ENDIAN__
-	UInt16		TARGET_LUN		: 8;
-	UInt16		BUS_IDENTIFIER	: 6;
-	UInt16		reserved2		: 1;
-	UInt16		reserved		: 1;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt16		reserved		: 1;
-	UInt16		reserved2		: 1;
-	UInt16		BUS_IDENTIFIER	: 6;
-	UInt16		TARGET_LUN		: 8;
-#endif /* !__LITTLE_ENDIAN__ */
-} REPORT_LUNS_PERIPHERAL_DEVICE_ADDRESSING;
-
-
-/*!
-@struct SCSICmd_REPORT_LUNS_Header
-@discussion
-This structure defines the format of the data that is returned for
-the REPORT_LUNS command.
-*/
-typedef struct SCSICmd_REPORT_LUNS_Header
-{
-	UInt32							LUN_LIST_LENGTH;	// LUN list length in bytes.
-	UInt32							RESERVED;
-	SCSICmd_REPORT_LUNS_LUN_ENTRY	LUN[1];				// Variable length list. Must have at least LUN 0 if
-} SCSICmd_REPORT_LUNS_Header;							// Target supports REPORT_LUNS command.
-
-
-#endif	/* _IOKIT_SCSI_CMDS_REPORT_LUNS_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h b/i386/include/IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h
deleted file mode 100644
index 8cfabb0..0000000
--- a/i386/include/IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_
-#define _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_
-
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSI Request Sense Definitions
-	@discussion
-	This file contains all definitions for the data returned from
-	the REQUEST SENSE (0x03) command and from auto sense on protocols
-	that support it.
-*/
-
-
-/*!
-@enum kSenseDefaultSize
-@discussion
-The default size for SCSI Request Sense data.
-*/
-enum
-{
-	kSenseDefaultSize	= 18
-};
-
-
-/*!
-@struct SCSI_Sense_Data
-@discussion
-The basic SCSI Request Sense data structure.
-*/
-typedef struct SCSI_Sense_Data
-{
-	UInt8		VALID_RESPONSE_CODE;				// 7 = Valid. 6-0 = Response Code.
-	UInt8		SEGMENT_NUMBER;						// Segment number
-	UInt8		SENSE_KEY;							// 7 = FILEMARK, 6 = EOM, 5 = ILI, 3-0 = SENSE KEY.
-	UInt8		INFORMATION_1;						// INFORMATION.
-	UInt8		INFORMATION_2;						// INFORMATION.
-	UInt8		INFORMATION_3;						// INFORMATION.
-	UInt8		INFORMATION_4;						// INFORMATION.
-	UInt8		ADDITIONAL_SENSE_LENGTH;			// Number of additional bytes available in sense data
-	UInt8		COMMAND_SPECIFIC_INFORMATION_1;		// Command Specific Information
-	UInt8		COMMAND_SPECIFIC_INFORMATION_2;		// Command Specific Information
-	UInt8		COMMAND_SPECIFIC_INFORMATION_3;		// Command Specific Information
-	UInt8		COMMAND_SPECIFIC_INFORMATION_4;		// Command Specific Information
-	UInt8		ADDITIONAL_SENSE_CODE;				// Additional Sense Code
-	UInt8		ADDITIONAL_SENSE_CODE_QUALIFIER;	// Additional Sense Code Qualifier
-	UInt8		FIELD_REPLACEABLE_UNIT_CODE;		// Field Replaceable Unit Code
-	UInt8		SKSV_SENSE_KEY_SPECIFIC_MSB;		// 7 = Sense Key Specific Valid bit, 6-0 Sense Key Specific MSB
-	UInt8		SENSE_KEY_SPECIFIC_MID;				// Sense Key Specific Middle
-	UInt8		SENSE_KEY_SPECIFIC_LSB;				// Sense Key Specific LSB
-} SCSI_Sense_Data;
-
-
-/*!
-@enum Sense Valid
-@discussion
-Masks to use to determine if sense data is valid or not.
-@constant kSENSE_DATA_VALID
-Sense data is valid.
-@constant kSENSE_NOT_DATA_VALID
-Sense data is not valid.
-@constant kSENSE_DATA_VALID_Mask
-Validity mask to use when checking the VALID_RESPONSE_CODE field.
-*/
-enum
-{
-	kSENSE_DATA_VALID										= 0x80,
-	kSENSE_NOT_DATA_VALID									= 0x00,
-	kSENSE_DATA_VALID_Mask									= 0x80
-};
-
-
-/*!
-@enum Sense Response Codes
-@discussion
-Masks and values to determine the Response Code.
-@constant kSENSE_RESPONSE_CODE_Current_Errors
-Response code indicating current errors are reported.
-@constant kSENSE_RESPONSE_CODE_Deferred_Errors
-Response code indicating deferred errors are reported.
-@constant kSENSE_RESPONSE_CODE_Mask
-Mask to use when checking the VALID_RESPONSE_CODE field.
-*/
-enum
-{
-	kSENSE_RESPONSE_CODE_Current_Errors						= 0x70,
-	kSENSE_RESPONSE_CODE_Deferred_Errors					= 0x71,
-	kSENSE_RESPONSE_CODE_Mask								= 0x7F
-};
-
-
-/*!
-@enum FILEMARK bit field definitions
-@discussion
-Masks and values to determine the FileMark bit field.
-@constant kSENSE_FILEMARK_Set
-Filemark bit is set.
-@constant kSENSE_FILEMARK_Not_Set
-Filemark bit is not set.
-@constant kSENSE_FILEMARK_Mask
-Mask to use when checking the SENSE_KEY field for the FILEMARK bit.
-*/
-enum
-{
-	kSENSE_FILEMARK_Set										= 0x80,
-	kSENSE_FILEMARK_Not_Set 								= 0x00,
-	kSENSE_FILEMARK_Mask 									= 0x80
-};
-
-
-/*!
-@enum EOM bit field definitions
-@discussion
-Masks and values to determine the End Of Medium bit field.
-@constant kSENSE_EOM_Set
-End Of Medium bit is set.
-@constant kSENSE_EOM_Not_Set
-End Of Medium bit is not set.
-@constant kSENSE_EOM_Mask
-Mask to use when checking the SENSE_KEY field for the EOM bit.
-*/
-enum
-{
-	kSENSE_EOM_Set											= 0x40,
-	kSENSE_EOM_Not_Set 										= 0x00,
-	kSENSE_EOM_Mask 										= 0x40
-};
-
-
-/*!
-@enum ILI bit field definitions
-@discussion
-Masks and values to determine the Incorrect Length Indicator bit field.
-@constant kSENSE_ILI_Set
-Incorrect Length Indicator bit is set.
-@constant kSENSE_ILI_Not_Set
-Incorrect Length Indicator bit is not set.
-@constant kSENSE_ILI_Mask
-Mask to use when checking the SENSE_KEY field for the ILI bit.
-*/
-enum
-{
-	kSENSE_ILI_Set											= 0x20,
-	kSENSE_ILI_Not_Set 										= 0x00,
-	kSENSE_ILI_Mask 										= 0x20
-};
-
-
-/*!
-@enum Sense Key definitions
-@discussion
-Masks and values to determine the SENSE_KEY.
-@constant kSENSE_KEY_NO_SENSE
-No sense data is present.
-@constant kSENSE_KEY_RECOVERED_ERROR
-A recovered error has occurred.
-@constant kSENSE_KEY_NOT_READY
-Device server is not ready.
-@constant kSENSE_KEY_MEDIUM_ERROR
-Device server detected a medium error.
-@constant kSENSE_KEY_HARDWARE_ERROR
-Device server detected a hardware error.
-@constant kSENSE_KEY_ILLEGAL_REQUEST
-Device server detected an illegal request.
-@constant kSENSE_KEY_UNIT_ATTENTION
-Device server indicates a unit attention condition.
-@constant kSENSE_KEY_DATA_PROTECT
-Device server indicates a data protect condition.
-@constant kSENSE_KEY_BLANK_CHECK
-Device server indicates a blank check condition.
-@constant kSENSE_KEY_VENDOR_SPECIFIC
-Device server indicates a vendor specific condition.
-@constant kSENSE_KEY_COPY_ABORTED
-Device server indicates a copy aborted condition.
-@constant kSENSE_KEY_ABORTED_COMMAND
-Device server indicates an aborted command condition.
-@constant kSENSE_KEY_VOLUME_OVERFLOW
-Device server indicates a volume overflow condition.
-@constant kSENSE_KEY_MISCOMPARE
-Device server indicates a miscompare condition.
-@constant kSENSE_KEY_Mask
-Mask to use when checking the SENSE_KEY field for the SENSE_KEY value.
-*/
-enum
-{
-	kSENSE_KEY_NO_SENSE										= 0x00,
-	kSENSE_KEY_RECOVERED_ERROR								= 0x01,
-	kSENSE_KEY_NOT_READY									= 0x02,
-	kSENSE_KEY_MEDIUM_ERROR									= 0x03,
-	kSENSE_KEY_HARDWARE_ERROR								= 0x04,
-	kSENSE_KEY_ILLEGAL_REQUEST								= 0x05,
-	kSENSE_KEY_UNIT_ATTENTION								= 0x06,
-	kSENSE_KEY_DATA_PROTECT									= 0x07,
-	kSENSE_KEY_BLANK_CHECK									= 0x08,
-	kSENSE_KEY_VENDOR_SPECIFIC								= 0x09,
-	kSENSE_KEY_COPY_ABORTED									= 0x0A,
-	kSENSE_KEY_ABORTED_COMMAND								= 0x0B,
-	/* SENSE KEY 0x0C is obsoleted */
-	kSENSE_KEY_VOLUME_OVERFLOW								= 0x0D,
-	kSENSE_KEY_MISCOMPARE									= 0x0E,
-	/* SENSE KEY 0x0F is reserved */
-	kSENSE_KEY_Mask 										= 0x0F
-};
-
-
-#endif	/* _IOKIT_SCSI_CMDS_REQUEST_SENSE_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICommandDefinitions.h b/i386/include/IOKit/scsi/SCSICommandDefinitions.h
deleted file mode 100644
index d33aed6..0000000
--- a/i386/include/IOKit/scsi/SCSICommandDefinitions.h
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * Copyright (c) 2001-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_COMMAND_DEFINITIONS_H_
-#define _IOKIT_SCSI_COMMAND_DEFINITIONS_H_
-
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSICommandDefinitions
-	@discussion
-	This file contains all the definitions for types and constants that are
-	used by the command set classes for building CDBs. The field type
-	definitions are used for the parameters passed to a method that builds and
-	sends any SCSI defined command to clearly identify the type of value
-	expected for a parameter.
-	
-	The command methods will then use the appropriate mask to verify that the
-	value passed into a parameter is of the specified type.
-	
-	Currently only types and masks are defined for 8 bytes and smaller fields.
-	If a command is defined that uses a larger field, these should be expanded
-	to include those sizes.
-*/ 
-
-#pragma mark Field Type Definitions
-/* These are the type definitions used for the parameters of methods that
- * build and send Command Descriptor Blocks.
- */
-
-/* 1 Byte or smaller fields. */
-
-/*! @typedef SCSICmdField1Bit */
-typedef UInt8	SCSICmdField1Bit;
-
-/*! @typedef SCSICmdField2Bit */
-typedef UInt8	SCSICmdField2Bit;
-
-/*! @typedef SCSICmdField3Bit */
-typedef UInt8	SCSICmdField3Bit;
-
-/*! @typedef SCSICmdField4Bit */
-typedef UInt8	SCSICmdField4Bit;
-
-/*! @typedef SCSICmdField5Bit */
-typedef UInt8	SCSICmdField5Bit;
-
-/*! @typedef SCSICmdField6Bit */
-typedef UInt8	SCSICmdField6Bit;
-
-/*! @typedef SCSICmdField7Bit */
-typedef UInt8	SCSICmdField7Bit;
-
-/*! @typedef SCSICmdField1Byte */
-typedef UInt8	SCSICmdField1Byte;
-
-/* 2 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField9Bit */
-typedef UInt16	SCSICmdField9Bit;
-
-/*! @typedef SCSICmdField10Bit */
-typedef UInt16	SCSICmdField10Bit;
-
-/*! @typedef SCSICmdField11Bit */
-typedef UInt16	SCSICmdField11Bit;
-
-/*! @typedef SCSICmdField12Bit */
-typedef UInt16	SCSICmdField12Bit;
-
-/*! @typedef SCSICmdField13Bit */
-typedef UInt16	SCSICmdField13Bit;
-
-/*! @typedef SCSICmdField14Bit */
-typedef UInt16	SCSICmdField14Bit;
-
-/*! @typedef SCSICmdField15Bit */
-typedef UInt16	SCSICmdField15Bit;
-
-/*! @typedef SCSICmdField2Byte */
-typedef UInt16	SCSICmdField2Byte;
-
-/* 3 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField17Bit */
-typedef UInt32	SCSICmdField17Bit;
-
-/*! @typedef SCSICmdField18Bit */
-typedef UInt32	SCSICmdField18Bit;
-
-/*! @typedef SCSICmdField19Bit */
-typedef UInt32	SCSICmdField19Bit;
-
-/*! @typedef SCSICmdField20Bit */
-typedef UInt32	SCSICmdField20Bit;
-
-/*! @typedef SCSICmdField21Bit */
-typedef UInt32	SCSICmdField21Bit;
-
-/*! @typedef SCSICmdField22Bit */
-typedef UInt32	SCSICmdField22Bit;
-
-/*! @typedef SCSICmdField23Bit */
-typedef UInt32	SCSICmdField23Bit;
-
-/*! @typedef SCSICmdField3Byte */
-typedef UInt32	SCSICmdField3Byte;
-
-/* 4 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField25Bit */
-typedef UInt32	SCSICmdField25Bit;
-
-/*! @typedef SCSICmdField26Bit */
-typedef UInt32	SCSICmdField26Bit;
-
-/*! @typedef SCSICmdField27Bit */
-typedef UInt32	SCSICmdField27Bit;
-
-/*! @typedef SCSICmdField28Bit */
-typedef UInt32	SCSICmdField28Bit;
-
-/*! @typedef SCSICmdField29Bit */
-typedef UInt32	SCSICmdField29Bit;
-
-/*! @typedef SCSICmdField30Bit */
-typedef UInt32	SCSICmdField30Bit;
-
-/*! @typedef SCSICmdField31Bit */
-typedef UInt32	SCSICmdField31Bit;
-
-/*! @typedef SCSICmdField4Byte */
-typedef UInt32	SCSICmdField4Byte;
-
-/* 5 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField33Bit */
-typedef UInt64	SCSICmdField33Bit;
-
-/*! @typedef SCSICmdField34Bit */
-typedef UInt64	SCSICmdField34Bit;
-
-/*! @typedef SCSICmdField35Bit */
-typedef UInt64	SCSICmdField35Bit;
-
-/*! @typedef SCSICmdField36Bit */
-typedef UInt64	SCSICmdField36Bit;
-
-/*! @typedef SCSICmdField37Bit */
-typedef UInt64	SCSICmdField37Bit;
-
-/*! @typedef SCSICmdField38Bit */
-typedef UInt64	SCSICmdField38Bit;
-
-/*! @typedef SCSICmdField39Bit */
-typedef UInt64	SCSICmdField39Bit;
-
-/*! @typedef SCSICmdField5Byte */
-typedef UInt64	SCSICmdField5Byte;
-
-/* 6 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField41Bit */
-typedef UInt64	SCSICmdField41Bit;
-
-/*! @typedef SCSICmdField42Bit */
-typedef UInt64	SCSICmdField42Bit;
-
-/*! @typedef SCSICmdField43Bit */
-typedef UInt64	SCSICmdField43Bit;
-
-/*! @typedef SCSICmdField44Bit */
-typedef UInt64	SCSICmdField44Bit;
-
-/*! @typedef SCSICmdField45Bit */
-typedef UInt64	SCSICmdField45Bit;
-
-/*! @typedef SCSICmdField46Bit */
-typedef UInt64	SCSICmdField46Bit;
-
-/*! @typedef SCSICmdField47Bit */
-typedef UInt64	SCSICmdField47Bit;
-
-/*! @typedef SCSICmdField6Byte */
-typedef UInt64	SCSICmdField6Byte;
-
-/* 7 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField49Bit */
-typedef UInt64	SCSICmdField49Bit;
-
-/*! @typedef SCSICmdField50Bit */
-typedef UInt64	SCSICmdField50Bit;
-
-/*! @typedef SCSICmdField51Bit */
-typedef UInt64	SCSICmdField51Bit;
-
-/*! @typedef SCSICmdField52Bit */
-typedef UInt64	SCSICmdField52Bit;
-
-/*! @typedef SCSICmdField53Bit */
-typedef UInt64	SCSICmdField53Bit;
-
-/*! @typedef SCSICmdField54Bit */
-typedef UInt64	SCSICmdField54Bit;
-
-/*! @typedef SCSICmdField55Bit */
-typedef UInt64	SCSICmdField55Bit;
-
-/*! @typedef SCSICmdField7Byte */
-typedef UInt64	SCSICmdField7Byte;
-
-/* 8 Bytes or smaller fields. */
-
-/*! @typedef SCSICmdField57Bit */
-typedef UInt64	SCSICmdField57Bit;
-
-/*! @typedef SCSICmdField58Bit */
-typedef UInt64	SCSICmdField58Bit;
-
-/*! @typedef SCSICmdField59Bit */
-typedef UInt64	SCSICmdField59Bit;
-
-/*! @typedef SCSICmdField60Bit */
-typedef UInt64	SCSICmdField60Bit;
-
-/*! @typedef SCSICmdField61Bit */
-typedef UInt64	SCSICmdField61Bit;
-
-/*! @typedef SCSICmdField62Bit */
-typedef UInt64	SCSICmdField62Bit;
-
-/*! @typedef SCSICmdField63Bit */
-typedef UInt64	SCSICmdField63Bit;
-
-/*! @typedef SCSICmdField8Byte */
-typedef UInt64	SCSICmdField8Byte;
-
-
-#pragma mark Field Mask Definitions
-/* These are masks that are used to verify that the values passed into the
- * parameters for the fields are not larger than the field size.
- *
- * NB: These have changed from enums to #define since enums greater than
- * 32 bits in size are not well-defined in C99.
- */
-
-/* 1 Byte or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask1Bit */
-#define 	kSCSICmdFieldMask1Bit		0x01
-
-/*! @constant kSCSICmdFieldMask2Bit */
-#define 	kSCSICmdFieldMask2Bit		0x03
-
-/*! @constant kSCSICmdFieldMask3Bit */
-#define 	kSCSICmdFieldMask3Bit		0x07
-
-/*! @constant kSCSICmdFieldMask4Bit */
-#define 	kSCSICmdFieldMask4Bit		0x0F
-
-/*! @constant kSCSICmdFieldMask5Bit */
-#define 	kSCSICmdFieldMask5Bit		0x1F
-
-/*! @constant kSCSICmdFieldMask6Bit */
-#define 	kSCSICmdFieldMask6Bit		0x3F
-
-/*! @constant kSCSICmdFieldMask7Bit */
-#define 	kSCSICmdFieldMask7Bit		0x7F
-
-#define 	kSCSICmdFieldMask1Byte		0xFF
-
-/* 2 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask9Bit */
-#define 	kSCSICmdFieldMask9Bit		0x01FF
-
-/*! @constant kSCSICmdFieldMask10Bit */
-#define 	kSCSICmdFieldMask10Bit		0x03FF
-
-/*! @constant kSCSICmdFieldMask11Bit */
-#define 	kSCSICmdFieldMask11Bit		0x07FF
-
-/*! @constant kSCSICmdFieldMask12Bit */
-#define 	kSCSICmdFieldMask12Bit		0x0FFF
-
-/*! @constant kSCSICmdFieldMask13Bit */
-#define 	kSCSICmdFieldMask13Bit		0x1FFF
-
-/*! @constant kSCSICmdFieldMask14Bit */
-#define 	kSCSICmdFieldMask14Bit		0x3FFF
-
-/*! @constant kSCSICmdFieldMask15Bit */
-#define 	kSCSICmdFieldMask15Bit		0x7FFF
-
-/*! @constant kSCSICmdFieldMask2Byte */
-#define 	kSCSICmdFieldMask2Byte		0xFFFF
-
-/* 3 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask17Bit */
-#define 	kSCSICmdFieldMask17Bit		0x01FFFF
-
-/*! @constant kSCSICmdFieldMask18Bit */
-#define 	kSCSICmdFieldMask18Bit		0x03FFFF
-
-/*! @constant kSCSICmdFieldMask19Bit */
-#define 	kSCSICmdFieldMask19Bit		0x07FFFF
-
-/*! @constant kSCSICmdFieldMask20Bit */
-#define 	kSCSICmdFieldMask20Bit		0x0FFFFF
-
-/*! @constant kSCSICmdFieldMask21Bit */
-#define 	kSCSICmdFieldMask21Bit		0x1FFFFF
-
-/*! @constant kSCSICmdFieldMask22Bit */
-#define 	kSCSICmdFieldMask22Bit		0x3FFFFF
-
-/*! @constant kSCSICmdFieldMask23Bit */
-#define 	kSCSICmdFieldMask23Bit		0x7FFFFF
-
-/*! @constant kSCSICmdFieldMask3Byte */
-#define 	kSCSICmdFieldMask3Byte		0xFFFFFF
-
-/* 4 Bytes or smaller fields. */
-/*! @constant kSCSICmdFieldMask25Bit */
-#define 	kSCSICmdFieldMask25Bit		0x01FFFFFFUL
-
-/*! @constant kSCSICmdFieldMask26Bit */
-#define 	kSCSICmdFieldMask26Bit		0x03FFFFFFUL
-
-/*! @constant kSCSICmdFieldMask27Bit */
-#define 	kSCSICmdFieldMask27Bit		0x07FFFFFFUL
-
-/*! @constant kSCSICmdFieldMask28Bit */
-#define 	kSCSICmdFieldMask28Bit		0x0FFFFFFFUL
-
-/*! @constant kSCSICmdFieldMask29Bit */
-#define 	kSCSICmdFieldMask29Bit		0x1FFFFFFFUL
-
-/*! @constant kSCSICmdFieldMask30Bit */
-#define 	kSCSICmdFieldMask30Bit		0x3FFFFFFFUL
-
-/*! @constant kSCSICmdFieldMask31Bit */
-#define 	kSCSICmdFieldMask31Bit		0x7FFFFFFFUL
-
-/*! @constant kSCSICmdFieldMask4Byte */
-#define 	kSCSICmdFieldMask4Byte		0xFFFFFFFFUL
-
-/* 5 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask33Bit */
-#define 	kSCSICmdFieldMask33Bit		0x01FFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask34Bit */
-#define 	kSCSICmdFieldMask34Bit		0x03FFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask35Bit */
-#define 	kSCSICmdFieldMask35Bit		0x07FFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask36Bit */
-#define 	kSCSICmdFieldMask36Bit		0x0FFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask37Bit */
-#define 	kSCSICmdFieldMask37Bit		0x1FFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask38Bit */
-#define 	kSCSICmdFieldMask38Bit		0x3FFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask39Bit */
-#define 	kSCSICmdFieldMask39Bit		0x7FFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask5Byte */
-#define 	kSCSICmdFieldMask5Byte		0xFFFFFFFFFFULL
-
-/* 6 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask41Bit */
-#define 	kSCSICmdFieldMask41Bit		0x01FFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask42Bit */
-#define 	kSCSICmdFieldMask42Bit		0x03FFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask43Bit */
-#define 	kSCSICmdFieldMask43Bit		0x07FFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask44Bit */
-#define 	kSCSICmdFieldMask44Bit		0x0FFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask45Bit */
-#define 	kSCSICmdFieldMask45Bit		0x1FFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask46Bit */
-#define 	kSCSICmdFieldMask46Bit		0x3FFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask47Bit */
-#define 	kSCSICmdFieldMask47Bit		0x7FFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask6Byte */
-#define 	kSCSICmdFieldMask6Byte		0xFFFFFFFFFFFFULL
-
-/* 7 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask49Bit */
-#define 	kSCSICmdFieldMask49Bit		0x01FFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask50Bit */
-#define 	kSCSICmdFieldMask50Bit		0x03FFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask51Bit */
-#define 	kSCSICmdFieldMask51Bit		0x07FFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask52Bit */
-#define 	kSCSICmdFieldMask52Bit		0x0FFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask53Bit */
-#define 	kSCSICmdFieldMask53Bit		0x1FFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask54Bit */
-#define 	kSCSICmdFieldMask54Bit		0x3FFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask55Bit */
-#define 	kSCSICmdFieldMask55Bit		0x7FFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask7Byte */
-#define 	kSCSICmdFieldMask7Byte		0xFFFFFFFFFFFFFFULL
-
-/* 8 Bytes or smaller fields. */
-
-/*! @constant kSCSICmdFieldMask57Bit */
-#define 	kSCSICmdFieldMask57Bit		0x01FFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask58Bit */
-#define 	kSCSICmdFieldMask58Bit		0x03FFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask59Bit */
-#define 	kSCSICmdFieldMask59Bit		0x07FFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask60Bit */
-#define 	kSCSICmdFieldMask60Bit		0x0FFFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask61Bit */
-#define 	kSCSICmdFieldMask61Bit		0x1FFFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask62Bit */
-#define 	kSCSICmdFieldMask62Bit		0x3FFFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask63Bit */
-#define 	kSCSICmdFieldMask63Bit		0x7FFFFFFFFFFFFFFFULL
-
-/*! @constant kSCSICmdFieldMask8Byte */
-#define 	kSCSICmdFieldMask8Byte		0xFFFFFFFFFFFFFFFFULL
-
-#endif	/* _IOKIT_SCSI_COMMAND_DEFINITIONS_H_ */
diff --git a/i386/include/IOKit/scsi/SCSICommandOperationCodes.h b/i386/include/IOKit/scsi/SCSICommandOperationCodes.h
deleted file mode 100644
index 21d9d1e..0000000
--- a/i386/include/IOKit/scsi/SCSICommandOperationCodes.h
+++ /dev/null
@@ -1,941 +0,0 @@
-/*
- * Copyright (c) 2001-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _SCSI_COMMAND_OPERATION_CODES_H_
-#define _SCSI_COMMAND_OPERATION_CODES_H_
-
-#pragma mark About this file
-/* This file contains the operation code definitions for all commands defined
- * by the SCSI specifications.  The commands are listed in three formats:
- * 1) All commands are listed in alphabetical order.  This list is the live
- * enumeration for all of the command constants.
- * 2) The commands are listed in ascending numerical order.
- * 3) The commands are grouped by Peripheral Device Type.
- * 
- * In the command listings by Peripheral Device Type, there will be a comment
- * following each command.  This comment indentifies the section of the related
- * specification where the commands is defined and the requirement type of the
- * command, Mandatory or Optional.
- * If a specification redefines an optional command from SPC as mandatory,
- * the command will be relisted in the Peripheral Device Type command list with
- * the mandatory tag next to it.
- * All commands that are listed in SPC as Device Type Specifc will be relisted
- * as a comment in all specifications lists that support that command with the
- * appropriate Mandatory or Optional tag for that specification.
- *
- * The section number and the requirement type of the command are based on the 
- * version of the specification listed in the header comment for the Peripheral
- * Device Type.  This data is provided for informational purposes only.  The 
- * specification document and version that the device adheres to as indicated 
- * by the data returned in response to the INQUIRY command should be used as
- * the authorative source for supported and required behavior of the device.
- * 
- * The SPC set is listed before all other Peripheral Device Type commands as
- * this is the base document from which all of the other documents are derived.  
- *
- * The Peripheral Device Types and associated command sets as defined by SPC-2,
- * section 7.4.1 are as follows:
- *  Peripheral Device Type                  Associated Command Specification
- *  ------------------------------------    -----------------------------------
- *  0x00 Direct Access Device               SBC - SCSI-3 Block Commands
- *  0x01 Sequential Access Device           SSC - SCSI-3 Stream Commands
- *  0x02 Printer Device                     SSC - SCSI-3 Stream Commands
- *  0x03 Processor Device                   SPC - SCSI Primary Commands-2
- *  0x04 Write Once Device                  SBC - SCSI-3 Block Commands
- *  0x05 CD-ROM Device                      MMC - SCSI Multimedia Commands-2
- *  0x06 Scanner Device                     SGC - SCSI-3 Graphics Commands
- *  0x07 Optical Memory Device              SBC - SCSI-3 Block Commands
- *  0x08 Medium Changer Device              SMC - SCSI-3 Medium Changer Cmds
- *  0x09 Communications Device              SSC - SCSI-3 Stream Commands
- *  0x0A - 0x0B Graphic Arts Prepress Dev   ASC IT8
- *  0x0C Storage Array Controller Device    SCC-2 - SCSI Controller Commands-2
- *  0x0D Enclosure Services                 SES - SCSI-3 Enclosure Services
- *  0x0E Simplified Direct Access Device    RBC - SCSI Reduced Block Commands
- *  0x0F Optical Card Reader/Writer Device  OCRW - SCSI Specification for 
- *                                              Optical Card Reader/Writer
- *  0x10 Reserved                    		No command specification
- *	0x11 Object-Based Storage Device		OSD - SCSI Object Based Storage 
- *												Device Commands
- *  0x12 - 0x14 Reserved                    No command specification
- *  0x15 Multimedia Media Access Engine     RMC - Reduced Multimedia Commands
- *  0x16 - 0x1E Reserved                    No command specification
- *  0x1F Unknown or No Device               No command specification
- */ 
-
-#pragma mark -
-#pragma mark Command Definitions by Name
-/* All SCSI Commands listed in alphabetical order.  These are the live
- * definitions of the commands.  All other command lists are informative.
- */
-enum 
-{
-    kSCSICmd_ACCESS_CONTROL_IN              = 0x86,
-    kSCSICmd_ACCESS_CONTROL_OUT             = 0x87,
-    kSCSICmd_BLANK                          = 0xA1,
-    kSCSICmd_CHANGE_DEFINITION              = 0x40,
-    kSCSICmd_CLOSE_TRACK_SESSION            = 0x5B,
-    kSCSICmd_COMPARE                        = 0x39,
-    kSCSICmd_COPY                           = 0x18,
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A,
-    kSCSICmd_ERASE_10						= 0x2C,
-    kSCSICmd_ERASE_12						= 0xAC,
-    kSCSICmd_EXTENDED_COPY                  = 0x83,
-    kSCSICmd_FORMAT_UNIT                    = 0x04,
-    kSCSICmd_GET_CONFIGURATION              = 0x46,
-    kSCSICmd_GET_EVENT_STATUS_NOTIFICATION  = 0x4A,
-    kSCSICmd_GET_PERFORMANCE                = 0xAC,
-    kSCSICmd_INQUIRY                        = 0x12,
-    kSCSICmd_LOAD_UNLOAD_MEDIUM             = 0xA6,
-    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36,
-    kSCSICmd_LOCK_UNLOCK_CACHE_16           = 0x92,
-    kSCSICmd_LOG_SELECT                     = 0x4C,
-    kSCSICmd_LOG_SENSE                      = 0x4D,
-    kSCSICmd_MAINTENANCE_IN               	= 0xA3,
-    kSCSICmd_MAINTENANCE_OUT                = 0xA4,
-    kSCSICmd_MECHANISM_STATUS               = 0xBD,
-    kSCSICmd_MEDIUM_SCAN                    = 0x38,
-    kSCSICmd_MODE_SELECT_6                  = 0x15,
-    kSCSICmd_MODE_SELECT_10                 = 0x55,
-    kSCSICmd_MODE_SENSE_6                   = 0x1A,
-    kSCSICmd_MODE_SENSE_10                  = 0x5A,
-    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7,
-    kSCSICmd_PAUSE_RESUME                   = 0x4B,
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E,
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F,
-    kSCSICmd_PLAY_AUDIO_10                  = 0x45,
-    kSCSICmd_PLAY_AUDIO_12                  = 0xA5,
-    kSCSICmd_PLAY_AUDIO_MSF                 = 0x47,
-    kSCSICmd_PLAY_AUDIO_TRACK_INDEX         = 0x48,
-    kSCSICmd_PLAY_CD                        = 0xBC,
-    kSCSICmd_PLAY_RELATIVE_10               = 0x49,
-    kSCSICmd_PLAY_RELATIVE_12               = 0xA9,
-    kSCSICmd_PREFETCH                       = 0x34,
-    kSCSICmd_PREFETCH_16                    = 0x90,
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E,
-    kSCSICmd_READ_6                         = 0x08,
-    kSCSICmd_READ_10                        = 0x28,
-    kSCSICmd_READ_12                        = 0xA8,
-    kSCSICmd_READ_16                        = 0x88,
-    kSCSICmd_READ_ATTRIBUTE                 = 0x8C,
-    kSCSICmd_READ_BUFFER                    = 0x3C,
-    kSCSICmd_READ_BUFFER_CAPACITY           = 0x5C,
-    kSCSICmd_READ_CAPACITY                  = 0x25,
-    kSCSICmd_READ_CD                        = 0xBE,
-    kSCSICmd_READ_CD_MSF                    = 0xB9,
-    kSCSICmd_READ_DEFECT_DATA_10            = 0x37,
-    kSCSICmd_READ_DEFECT_DATA_12            = 0xB7,
-    kSCSICmd_READ_DISC_INFORMATION          = 0x51,
-    kSCSICmd_READ_DVD_STRUCTURE             = 0xAD,
-    kSCSICmd_READ_DISC_STRUCTURE            = 0xAD,
-    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4,
-    kSCSICmd_READ_FORMAT_CAPACITIES         = 0x23,
-    kSCSICmd_READ_GENERATION				= 0x29,
-    kSCSICmd_READ_HEADER                    = 0x44,
-    kSCSICmd_READ_LONG                      = 0x3E,
-    kSCSICmd_READ_MASTER_CUE                = 0x59,
-    kSCSICmd_READ_SUB_CHANNEL               = 0x42,
-    kSCSICmd_READ_TOC_PMA_ATIP              = 0x43,
-    kSCSICmd_READ_TRACK_INFORMATION         = 0x52,
-    kSCSICmd_READ_UPDATED_BLOCK_10			= 0x2D,
-    kSCSICmd_REASSIGN_BLOCKS                = 0x07,
-    kSCSICmd_REBUILD                        = 0x81,
-    kSCSICmd_RECEIVE                        = 0x08,
-    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84,
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C,
-    kSCSICmd_REDUNDANCY_GROUP_IN			= 0xBA,
-    kSCSICmd_REDUNDANCY_GROUP_OUT			= 0xBB,
-    kSCSICmd_REGENERATE                     = 0x82,
-    kSCSICmd_RELEASE_6                      = 0x17,
-    kSCSICmd_RELEASE_10                     = 0x57,
-    kSCSICmd_REPAIR_TRACK                   = 0x58,
-    kSCSICmd_REPORT_DEVICE_IDENTIFIER    	= 0xA3,
-    kSCSICmd_REPORT_KEY                     = 0xA4,
-    kSCSICmd_REPORT_LUNS                    = 0xA0, 
-    kSCSICmd_REQUEST_SENSE                  = 0x03,
-    kSCSICmd_RESERVE_6                      = 0x16,
-    kSCSICmd_RESERVE_10                     = 0x56,
-    kSCSICmd_RESERVE_TRACK                  = 0x53,
-    kSCSICmd_REZERO_UNIT                    = 0x01,
-    kSCSICmd_SCAN_MMC                       = 0xBA,
-    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31,
-    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1,
-    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30,
-    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0,
-    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32,
-    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2,
-    kSCSICmd_SEEK_6                         = 0x0B,
-    kSCSICmd_SEEK_10                        = 0x2B,
-    kSCSICmd_SEND                           = 0x0A,
-    kSCSICmd_SEND_CUE_SHEET                 = 0x5D,
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D,
-    kSCSICmd_SEND_DVD_STRUCTURE             = 0xBF,
-    kSCSICmd_SEND_EVENT                     = 0xA2,
-    kSCSICmd_SEND_KEY                       = 0xA3,
-    kSCSICmd_SEND_OPC_INFORMATION           = 0x54,
-    kSCSICmd_SERVICE_ACTION_IN		        = 0x9E,
-    kSCSICmd_SERVICE_ACTION_OUT		        = 0x9F,
-    kSCSICmd_SET_CD_SPEED                   = 0xBB,
-    kSCSICmd_SET_DEVICE_IDENTIFIER      	= 0xA4,
-    kSCSICmd_SET_LIMITS_10                  = 0x33,
-    kSCSICmd_SET_LIMITS_12                  = 0xB3,
-    kSCSICmd_SET_READ_AHEAD                 = 0xA7,
-    kSCSICmd_SET_STREAMING                  = 0xB6,
-    kSCSICmd_SPARE_IN		                = 0xBC,
-    kSCSICmd_SPARE_OUT		                = 0xBD,
-    kSCSICmd_START_STOP_UNIT                = 0x1B,
-    kSCSICmd_STOP_PLAY_SCAN                 = 0x4E,
-    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35,
-    kSCSICmd_SYNCHRONIZE_CACHE_16           = 0x91,
-    kSCSICmd_TEST_UNIT_READY                = 0x00,
-	kSCSICmd_UPDATE_BLOCK					= 0x3D,
-    kSCSICmd_VERIFY_10                      = 0x2F,
-    kSCSICmd_VERIFY_12                      = 0xAF,
-    kSCSICmd_VERIFY_16                      = 0x8F,
-    kSCSICmd_VOLUME_SET_IN                  = 0xBE,
-    kSCSICmd_VOLUME_SET_OUT                 = 0xBF,
-    kSCSICmd_WRITE_6                        = 0x0A,
-    kSCSICmd_WRITE_10                       = 0x2A,
-    kSCSICmd_WRITE_12                       = 0xAA,
-    kSCSICmd_WRITE_16                       = 0x8A,
-    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E,
-	kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE,
-	kSCSICmd_WRITE_AND_VERIFY_16            = 0x8E,
-	kSCSICmd_WRITE_ATTRIBUTE	            = 0x8D,
-    kSCSICmd_WRITE_BUFFER                   = 0x3B,
-    kSCSICmd_WRITE_LONG                     = 0x3F,
-    kSCSICmd_WRITE_SAME                     = 0x41,
-    kSCSICmd_WRITE_SAME_16                  = 0x93,
-    kSCSICmd_XDREAD                         = 0x52,
-    kSCSICmd_XDWRITE                        = 0x50,
-    kSCSICmd_XDWRITE_EXTENDED               = 0x80,
-    kSCSICmd_XDWRITEREAD_10           		= 0x53,
-    kSCSICmd_XPWRITE                        = 0x51,
-    
-    kSCSICmdVariableLengthCDB				= 0x7F
-};
-
-/* Service Action Definitions for the Variable Length CDB (7Fh) command */
-enum
-{
-	kSCSIServiceAction_READ_32				= 0x0009,
-	kSCSIServiceAction_VERIFY_32			= 0x000A,
-	kSCSIServiceAction_WRITE_32				= 0x000B,
-	kSCSIServiceAction_WRITE_AND_VERIFY_32	= 0x000C,
-	kSCSIServiceAction_WRITE_SAME_32		= 0x000D,
-	kSCSIServiceAction_XDREAD_32			= 0x0003,
-	kSCSIServiceAction_XDWRITE_32			= 0x0004,
-	kSCSIServiceAction_XDWRITEREAD_32		= 0x0007,
-	kSCSIServiceAction_XPWRITE_32			= 0x0006
-};
-
-/* Service Action Definitions for the MAINTENANCE IN (A3h) command */
-enum
-{
-	kSCSIServiceAction_REPORT_ALIASES								= 0x0B,
-	kSCSIServiceAction_REPORT_DEVICE_IDENTIFIER						= 0x05,
-	kSCSIServiceAction_REPORT_PRIORITY								= 0x0E,
-	kSCSIServiceAction_REPORT_SUPPORTED_OPERATION_CODES				= 0x0C,
-	kSCSIServiceAction_REPORT_SUPPORTED_TASK_MANAGEMENT_FUNCTIONS	= 0x0D,
-	kSCSIServiceAction_REPORT_TARGET_PORT_GROUPS					= 0x0A
-};
-
-/* Service Action Definitions for the MAINTENANCE OUT (A4h) command */
-enum
-{
-	kSCSIServiceAction_CHANGE_ALIASES			= 0x0B,
-	kSCSIServiceAction_SET_DEVICE_IDENTIFIER	= 0x06,
-	kSCSIServiceAction_SET_PRIORITY				= 0x0E,
-	kSCSIServiceAction_SET_TARGET_PORT_GROUPS	= 0x0A	
-};
-
-/* Service Action Definitions for the SERVICE ACTION IN (9Eh) command */
-enum
-{
-	kSCSIServiceAction_READ_CAPACITY_16		= 0x10,
-	kSCSIServiceAction_READ_LONG_16			= 0x11	
-};
-
-/* Service Action Definitions for the SERVICE ACTION OUT (9Fh) command */
-enum
-{
-	kSCSIServiceAction_WRITE_LONG_16		= 0x11	
-};
-
-#pragma mark -
-#pragma mark Command Definitions by Number
-#if 0
-enum 
-{
-};
-#endif
-
-
-#pragma mark -
-#pragma mark All Types SPC Commands
-/* Commands defined by the T10:1236-D SCSI Primary Commands-2 (SPC-2) 
- * command specification.  The definitions and section numbers are based on
- * section 7 of the revision 18, 21 May 2000 version of the specification.
- *
- * These commands are defined for all devices.
- */
-#if 0
-enum 
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_COMPARE                        = 0x39, /* Sec. 7.2: Optional */
-    kSCSICmd_COPY                           = 0x18, /* Sec. 7.3: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* Sec. 7.4: Optional */
-    kSCSICmd_EXTENDED_COPY                  = 0x83, /* Sec. 7.5: Optional */
-    kSCSICmd_INQUIRY                        = 0x12, /* Sec. 7.6: Mandatory */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* Sec. 7.7: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* Sec. 7.8: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Sec. 7.9: Device Type
-                                                     * Specific */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Sec. 7.10: Device Type
-                                                     * Specific */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Sec. 7.11: Device Type
-                                                     * Specific */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Sec. 7.12: Device Type
-                                                     * Specific */
-    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* Defined in SMC */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Sec. 7.13: Device Type
-                                                     * Specific */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Sec. 7.14: Device Type
-                                                     * Specific */
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* Sec. 7.15: Device Type
-                                                     * Specific */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* Sec. 7.16: Optional */
-    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* Defined in SMC */
-    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84, /* Sec. 7.17: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Sec. 7.18: Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* Sec. 7.19: Device Type
-                                                     * Specific */
-    kSCSICmd_RELEASE_6                      = 0x17, /* Sec. 7.20: Device Type
-                                                     * Specific */
-    kSCSICmd_REPORT_DEVICE_IDENTIFIER    	= 0xA3, /* Sec. 7.21: Optional */
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Sec. 7.22: Mandatory for
-                                                     * LUN Supporting devices*/
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Sec. 7.23: Device Type
-                                                     * Specific */
-    kSCSICmd_RESERVE_10                     = 0x56, /* Sec. 7.24: Device Type
-                                                     * Specific */
-    kSCSICmd_RESERVE_6                      = 0x16, /* Sec. 7.25: Device Type
-                                                     * Specific */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Sec. 7.26: Optional */
-    kSCSICmd_SET_DEVICE_IDENTIFIER       	= 0xA4, /* Sec. 7.27: Optional */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Sec. 7.28: Mandatory */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Sec. 7.29: Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x00 SBC Direct Access Commands
-/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) command
- * specification.  The definitions and section numbers are based on section 6.1
- * of the revision 8c, 13 November 1997 version of the specification. 
- */
-#if 0
-enum
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional*/
-    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Sec. 6.1.1: Mandatory */
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36, /* Sec. 6.1.2: Optional */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
-    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* SMC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
-    kSCSICmd_PREFETCH                       = 0x34, /* Sec. 6.1.3: Optional */
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
-    kSCSICmd_READ_6                         = 0x08, /* Sec. 6.1.4: Mandatory */
-    kSCSICmd_READ_10                        = 0x28, /* Sec. 6.1.5: Mandatory */
-    kSCSICmd_READ_12                        = 0xA8, /* Sec. 6.2.4: Optional */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
-    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.6: Mandatory */
-    kSCSICmd_READ_DEFECT_DATA_10            = 0x37, /* Sec. 6.1.7: Optional */
-    kSCSICmd_READ_DEFECT_DATA_12            = 0xB7, /* Sec. 6.2.5: Optional */
-    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* SMC: Optional */
-    kSCSICmd_READ_GENERATION				= 0x29,	/* Sec. 6.2.6: Optional */
-    kSCSICmd_READ_LONG                      = 0x3E, /* Sec. 6.1.8: Optional */
-    kSCSICmd_READ_UPDATED_BLOCK_10			= 0x2D, /* Sec. 6.2.7: Optional */
-    kSCSICmd_REASSIGN_BLOCKS                = 0x07, /* Sec. 6.1.9: Optional */
-    kSCSICmd_REBUILD                        = 0x81, /* Sec. 6.1.10: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
-    kSCSICmd_REGENERATE                     = 0x82, /* Sec. 6.1.11: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Optional */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Optional */
-    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
-    kSCSICmd_REZERO_UNIT                    = 0x01, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
-    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
-    kSCSICmd_SEEK_10                        = 0x2B, /* Sec. 6.1.12: Optional */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
-    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Sec. 6.1.13: Optional */
-    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Sec. 6.2.8: Optional */
-    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Sec. 6.1.14: Optional */
-    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.15: Optional */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
-	kSCSICmd_UPDATE_BLOCK					= 0x3D,	/* Sec. 6.2.9: Optional */
-    kSCSICmd_VERIFY_10                      = 0x2F, /* Sec. 6.1.16: Optional */
-    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 6.1.17: Optional */
-    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.1.18: Optional */
-    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.2.13: Optional */
-    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.1.19: Optional */
-    kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE, /* Sec. 6.2.15: Optional */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
-    kSCSICmd_WRITE_LONG                     = 0x3F, /* Sec. 6.1.20: Optional */
-    kSCSICmd_WRITE_SAME                     = 0x41, /* Sec. 6.1.21: Optional */
-    kSCSICmd_XDREAD                         = 0x52, /* Sec. 6.1.22: Optional */
-    kSCSICmd_XDWRITE                        = 0x50, /* Sec. 6.1.23: Optional */
-    kSCSICmd_XDWRITE_EXTENDED               = 0x80, /* Sec. 6.1.24: Optional */
-    kSCSICmd_XPWRITE                        = 0x51  /* Sec. 6.1.25: Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x01 SSC Sequential Access Commands
-/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) command
- * specification.  The definitions and section numbers are based on section 5
- * of the revision 22, January 1, 2000 version of the specification. 
- */
-#if 0
-enum
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
-    kSCSICmd_ERASE                          = 0x19, /* Sec. 5.3.1: Mandatory */
-    kSCSICmd_FORMAT_MEDIUM                  = 0x04, /* Sec. 5.3.2: Optional */
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOAD_UNLOAD                    = 0x1B, /* Sec. 5.3.3: Optional */
-    kSCSICmd_LOCATE                         = 0x2B, /* Sec. 5.3.4: Optional */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
-    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* SMC: Optional */
-    kSCSICmd_MOVE_MEDIUM_ATTACHED           = 0xA7, /* SMC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
-    kSCSICmd_READ_6                         = 0x08, /* Sec. 5.3.5: Mandatory */
-    kSCSICmd_READ_BLOCK_LIMITS              = 0x05, /* Sec. 5.3.6: Mandatory */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
-    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* SMC: Optional */
-    kSCSICmd_READ_ELEMENT_STATUS_ATTACHED   = 0xB4, /* SMC: Optional */
-    kSCSICmd_READ_POSITION                  = 0x34, /* Sec. 5.3.7: Mandatory */
-    kSCSICmd_READ_REVERSE                   = 0x0F, /* Sec. 5.3.8: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
-    kSCSICmd_RECOVER_BUFFERED_DATA          = 0x14, /* Sec. 5.3.9: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
-    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
-    kSCSICmd_REPORT_DENSITY_SUPPORT         = 0x44, /* Sec. 5.3.10: Mandatory*/
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Mandatory */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
-    kSCSICmd_REWIND                         = 0x01, /* Sec. 5.3.11: Mandatory*/
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
-    kSCSICmd_SPACE                          = 0x11, /* Sec. 5.3.12: Mandatory*/
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
-    kSCSICmd_VERIFY_6                       = 0x13, /* Sec. 5.3.13: Optional */
-    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 5.3.14: Mandatory*/
-    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
-    kSCSICmd_WRITE_FILEMARKS                = 0x10  /* Sec. 5.3.15: Mandatory*/
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x02 SSC Printer Commands
-/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) command
- * specification.  The definitions and section numbers are based on section 6
- * of the revision 22, January 1, 2000 version of the specification. 
- */
-#if 0
-enum 
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
-    kSCSICmd_FORMAT                         = 0x04, /* Sec. 6.2.1: Optional */
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
-    kSCSICmd_PRINT                          = 0x0A, /* Sec. 6.2.2: Mandatory */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
-    kSCSICmd_RECOVER_BUFFERED_DATA          = 0x14, /* Sec. 6.2.3: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
-    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* SPC: Mandatory */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
-    kSCSICmd_SLEW_AND_PRINT                 = 0x0B, /* Sec. 6.2.4: Optional */
-    kSCSICmd_STOP_PRINT                     = 0x1B, /* Sec. 6.2.5: Optional */
-    kSCSICmd_SYNCHRONIZE_BUFFER             = 0x10, /* Sec. 6.2.6: Optional */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* SPC: Optional */
-};
-#endif
-  
-#pragma mark -
-#pragma mark 0x03 SPC Processor Commands
-/* Commands defined by the T10:1236-D SCSI Primary Commands-2 (SPC-2) 
- * command specification.  The definitions and section numbers are based on
- * section 9 of the revision 18, 21 May 2000 version of the specification.
- */
-#if 0
-enum 
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_COMPARE                        = 0x39, /* Sec. 7.2: Optional */
-    kSCSICmd_COPY                           = 0x18, /* Sec. 7.3: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* Sec. 7.4: Optional */
-    kSCSICmd_EXTENDED_COPY                  = 0x83, /* Sec. 7.5: Optional */
-    kSCSICmd_INQUIRY                        = 0x12, /* Sec. 7.6: Mandatory */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* Sec. 7.7: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* Sec. 7.8: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Sec. 7.13: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Sec. 7.14: Optional */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* Sec. 7.16: Optional */
-    kSCSICmd_RECEIVE                        = 0x08, /* Sec. 9.2: Optional */
-    kSCSICmd_RECEIVE_COPY_RESULTS           = 0x84, /* Sec. 7.17: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Sec. 7.18: Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* Sec. 7.19: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* Sec. 7.20: Optional */
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Sec. 7.22: Optional */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Sec. 7.23: Mandatory */
-    kSCSICmd_RESERVE_10                     = 0x56, /* Sec. 7.24: Optional */
-    kSCSICmd_RESERVE_6                      = 0x16, /* Sec. 7.25: Optional */
-    kSCSICmd_SEND                           = 0x0A, /* Sec. 9.3: Optional */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Sec. 7.26: Mandatory */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Sec. 7.27: Mandatory */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Sec. 7.29: Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x04 SBC Write Once Commands
-/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) command
- * specification.  The definitions and section numbers are based on section 6.3
- * of the revision 8c, 13 November 1997 version of the specification. 
- */
-#if 0
-enum
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* SPC: Optional */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional*/
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOCK_UNLOCK_CACHE              = 0x36, /* Sec. 6.1.2: Optional */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MEDIUM_SCAN                    = 0x38, /* Sec. 6.2.3: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
-    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* SMC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* SPC: Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* SPC: Optional */
-    kSCSICmd_PREFETCH                       = 0x34, /* Sec. 6.1.3: Optional */
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* SPC: Optional */
-    kSCSICmd_READ_6                         = 0x08, /* Sec. 6.1.4: Optional */
-    kSCSICmd_READ_10                        = 0x28, /* Sec. 6.1.5: Mandatory */
-    kSCSICmd_READ_12                        = 0xA8, /* Sec. 6.2.4: Optional */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
-    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.6: Mandatory */
-    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* SMC: Optional */
-    kSCSICmd_READ_LONG                      = 0x3E, /* Sec. 6.1.8: Optional */
-    kSCSICmd_REASSIGN_BLOCKS                = 0x07, /* Sec. 6.1.9: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* SPC: Mandatory */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Optional */
-    kSCSICmd_RESERVE_10                     = 0x56, /* SPC: Mandatory */
-    kSCSICmd_REZERO_UNIT                    = 0x01, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2, /* Obsolete */
-    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
-    kSCSICmd_SEEK_10                        = 0x2B, /* Sec. 6.1.12: Optional */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
-    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Sec. 6.1.13: Optional */
-    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Sec. 6.2.8: Optional */
-    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Sec. 6.1.14: Optional */
-    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.15: Optional */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
-    kSCSICmd_VERIFY_10                      = 0x2F, /* Sec. 6.2.10: Optional */
-    kSCSICmd_VERIFY_12                      = 0xAF, /* Sec. 6.2.11: Optional */
-    kSCSICmd_WRITE_6                        = 0x0A, /* Sec. 6.1.17: Optional */
-    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.2.10: Mandatory*/
-    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.2.13: Optional */
-    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.2.14: Optional */
-    kSCSICmd_WRITE_AND_VERIFY_12            = 0xAE, /* Sec. 6.2.15: Optional */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B, /* SPC: Optional */
-    kSCSICmd_WRITE_LONG                     = 0x3F  /* Sec. 6.1.20: Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x05 MMC CD-ROM Commands
-/* Commands defined by the T10:1363-D SCSI Multimedia Commands-3 (MMC-3) 
- * specification.  The definitions and section numbers are based on section 6.1
- * of the revision 01, March 03, 2000 version of the specification. 
- *
- * NOTE: The comments following each command may not be accurate.  These are
- * not from the MMC-3 specification, but have been derived from the SCSI-2 and
- * original MMC specifications.  Unlike the other SCSI command specifications,
- * MMC-2 and MMC-3 do not provide a command requirement type and therefore does
- * not relist the SPC commands with these requirements as they apply to MMC
- * devices.  The MMC-2 and MMC-3 specifications also refer back to the SBC
- * specification which seems invalid since MMC devices do not represent a
- * Peripheral Device Type defined by SBC.  It is assumed that the SBC
- * references refer to the Peripheral Device Type 0x00 - Direct Access Commands
- * definitions from that specification.
- */
-#if 0
-enum 
-{
-    kSCSICmd_BLANK                          = 0xA1, /* Sec. 6.1.1: */
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* Obsolete */
-    kSCSICmd_CLOSE_TRACK_SESSION            = 0x5B, /* Sec. 6.1.2: */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
-    kSCSICmd_ERASE                          = 0x2C, /* SBC: */
-    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Sec. 6.1.3: */
-    kSCSICmd_GET_CONFIGURATION              = 0x46, /* Sec. 6.1.4: */
-    kSCSICmd_GET_EVENT_STATUS_NOTIFICATION  = 0x4A, /* Sec. 6.1.5: */
-    kSCSICmd_GET_PERFORMANCE                = 0xAC, /* Sec. 6.1.6: */
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOAD_UNLOAD_MEDIUM             = 0xA6, /* Sec. 6.1.7: */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MECHANISM_STATUS               = 0xBD, /* Sec. 6.1.8: */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Mandatory */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Mandatory */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Mandatory */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Mandatory */
-    kSCSICmd_PAUSE_RESUME                   = 0x4B, /* Sec. 6.1.9: */
-    kSCSICmd_PLAY_AUDIO_10                  = 0x45, /* Sec. 6.1.10: */
-    kSCSICmd_PLAY_AUDIO_12                  = 0xA5, /* Sec. 6.1.11: */
-    kSCSICmd_PLAY_AUDIO_MSF                 = 0x47, /* Sec. 6.1.12: */
-    kSCSICmd_PLAY_AUDIO_TRACK_INDEX         = 0x48, /* Obsolete */
-    kSCSICmd_PLAY_CD                        = 0xBC, /* Sec. 6.1.13: */
-    kSCSICmd_PLAY_RELATIVE_10               = 0x49, /* Obsolete */
-    kSCSICmd_PLAY_RELATIVE_12               = 0xA9, /* Obsolete */
-    kSCSICmd_PREFETCH                       = 0x34, /* Optional */
-    kSCSICmd_PREVENT_ALLOW_MEDIUM_REMOVAL   = 0x1E, /* Optional */
-    kSCSICmd_READ_6                         = 0x08, /* Optional */
-    kSCSICmd_READ_10                        = 0x28, /* Mandatory */
-    kSCSICmd_READ_12                        = 0xA8, /* Optional */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* Optional */
-    kSCSICmd_READ_BUFFER_CAPACITY           = 0x5C, /* Sec. 6.1.15: */
-    kSCSICmd_READ_CD                        = 0xBE, /* Sec. 6.1.16: */
-    kSCSICmd_READ_CD_MSF                    = 0xB9, /* Sec. 6.1.17: */
-    kSCSICmd_READ_CAPACITY                  = 0x25, /* Sec. 6.1.18: */
-    kSCSICmd_READ_DISC_INFORMATION          = 0x51, /* Sec. 6.1.19: */
-    kSCSICmd_READ_DVD_STRUCTURE             = 0xAD, /* Sec. 6.1.20: */
-    kSCSICmd_READ_DISC_STRUCTURE            = 0xAD, /* Sec. 6.1.20: */
-    kSCSICmd_READ_FORMAT_CAPACITIES         = 0x23, /* Sec. 6.1.21: */
-    kSCSICmd_READ_HEADER                    = 0x44, /* Sec. 6.1.22: */
-    kSCSICmd_READ_LONG                      = 0x3E, /* Optional */
-    kSCSICmd_READ_MASTER_CUE                = 0x59, /* Sec. 6.1.23: */
-    kSCSICmd_READ_SUB_CHANNEL               = 0x42, /* Sec. 6.1.24: */
-    kSCSICmd_READ_TOC_PMA_ATIP              = 0x43, /* Sec. 6.1.25: */
-    kSCSICmd_READ_TRACK_INFORMATION         = 0x52, /* Sec. 6.1.27: */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* Mandatory */
-    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
-    kSCSICmd_REPAIR_TRACK                   = 0x58, /* Sec. 6.1.28: */
-    kSCSICmd_REPORT_KEY                     = 0xA4, /* Sec. 6.1.29: */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* Mandatory */
-    kSCSICmd_RESERVE_10                     = 0x56, /* Optional */
-    kSCSICmd_RESERVE_TRACK                  = 0x53, /* Sec. 6.1.30: */
-    kSCSICmd_SCAN_MMC                       = 0xBA, /* Sec. 6.1.31: */
-    kSCSICmd_SEARCH_DATA_EQUAL_10           = 0x31, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_EQUAL_12           = 0xB1, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_HIGH_10            = 0x30, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_HIGH_12            = 0xB0, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_LOW_10             = 0x32, /* Obsolete */
-    kSCSICmd_SEARCH_DATA_LOW_12             = 0xB2, /* Obsolete */
-    kSCSICmd_SEEK_6                         = 0x0B, /* Obsolete */
-    kSCSICmd_SEEK_10                        = 0x2B, /* SBC: */
-    kSCSICmd_SEND_CUE_SHEET                 = 0x5D, /* Sec. 6.1.32: */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Mandatory */
-    kSCSICmd_SEND_DVD_STRUCTURE             = 0xBF, /* Sec. 6.1.33: */
-    kSCSICmd_SEND_EVENT                     = 0xA2, /* Sec. 6.1.34: */
-    kSCSICmd_SEND_KEY                       = 0xA3, /* Sec. 6.1.35: */
-    kSCSICmd_SEND_OPC_INFORMATION           = 0x54, /* Sec. 6.1.36: */
-    kSCSICmd_SET_CD_SPEED                   = 0xBB, /* Sec. 6.1.37: */
-    kSCSICmd_SET_LIMITS_10                  = 0x33, /* Optional */
-    kSCSICmd_SET_LIMITS_12                  = 0xB3, /* Optional */
-    kSCSICmd_SET_READ_AHEAD                 = 0xA7, /* Sec. 6.1.38: */
-    kSCSICmd_SET_STREAMING                  = 0xB6, /* Sec. 6.1.39: */
-    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Optional */
-    kSCSICmd_STOP_PLAY_SCAN                 = 0x4E, /* Sec. 6.1.40: */
-    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Sec. 6.1.41: */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* Mandatory */
-    kSCSICmd_VERIFY_10                      = 0x2F, /* Optional */
-    kSCSICmd_VERIFY_12                      = 0xAF, /* Optional */
-    kSCSICmd_WRITE_10                       = 0x2A, /* Sec. 6.1.42: */
-    kSCSICmd_WRITE_12                       = 0xAA, /* Sec. 6.1.43: */
-    kSCSICmd_WRITE_AND_VERIFY_10            = 0x2E, /* Sec. 6.1.44: */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x06 SGC Scanner Commands
-/* Commands defined by the T10:998-D SCSI-3 Graphics Commands (SGC)
- * specification.  The definitions and section numbers are based on section 6
- * of the revision 0, April 1995 version of the specification. 
- */
-#if 0
-enum 
-{
-    kSCSICmd_CHANGE_DEFINITION              = 0x40, /* SPC: Optional */
-    kSCSICmd_COMPARE                        = 0x39, /* SPC: Optional */
-    kSCSICmd_COPY                           = 0x18, /* SPC: Optional */
-    kSCSICmd_COPY_AND_VERIFY                = 0x3A, /* SPC: Optional */
-    kSCSICmd_GET_DATA_BUFFER_STATUS         = 0x34, /* Sec. 6.1.1: Optional */
-    kSCSICmd_GET_WINDOW                     = 0x25, /* Sec. 6.1.2: Optional */
-    kSCSICmd_INQUIRY                        = 0x12, /* SPC: Mandatory */
-    kSCSICmd_LOG_SELECT                     = 0x4C, /* SPC: Optional */
-    kSCSICmd_LOG_SENSE                      = 0x4D, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* SPC: Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* SPC: Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* SPC: Optional */
-    kSCSICmd_OBJECT_POSITION                = 0x31, /* Sec. 6.1.3: Optional */
-    kSCSICmd_PORT_STATUS                    = 0x11, /* SPC (??): Mandatory
-                                                     * for dual port devices */
-    kSCSICmd_READ                           = 0x28, /* Sec. 6.1.4: Mandatory */
-    kSCSICmd_READ_BUFFER                    = 0x3C, /* SPC: Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x1C, /* SPC: Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* SPC: Mandatory */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* SPC: Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* SPC: Mandatory */
-    kSCSICmd_SCAN                           = 0x1B, /* Sec. 6.1.5: Optional */
-    kSCSICmd_SEND                           = 0x1B, /* Sec. 6.1.6: Optional */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* SPC: Mandatory */
-    kSCSICmd_SET_WINDOW                     = 0x24, /* Sec. 6.1.7: Mandatory */
-    kSCSICmd_TEST_UNIT_READY                = 0x00, /* SPC: Mandatory */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* SPC: Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x07 SBC Optical Media Commands
-/* Commands defined by the T10:990-D SCSI-3 Block Commands (SBC) 
- * (revision 8c, 13 November 1998) command specification.  
- */
-
-#pragma mark -
-#pragma mark 0x08 SMC Medium Changer Commands
-/* Commands defined by the T10:1228-D SCSI-3 Medium Changer Commands-2 (SMC-2)
- * (revision 0, March 16, 2000) command specification.  
- */
-#if 0
-enum
-{
-    /* Commands For Independent Medium Changers */
-    kSCSICmd_EXCHANGE_MEDIUM                = 0xA6, /* Optional */
-    kSCSICmd_INITIALIZE_ELEMENT_STATUS      = 0x07, /* Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
-    kSCSICmd_MOVE_MEDIUM                    = 0xA5, /* Mandatory */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
-    kSCSICmd_POSITION_TO_ELEMENT            = 0x2B, /* Optional */
-    kSCSICmd_READ_ELEMENT_STATUS            = 0xB8, /* Mandatory */
-    kSCSICmd_RELEASE_ELEMENT_6              = 0x16, /* Optional */
-    kSCSICmd_RELEASE_ELEMENT_10             = 0x56, /* Optional */
-    kSCSICmd_REQUEST_VOLUME_ELEMENT_ADDRESS = 0xB5, /* Optional */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
-    kSCSICmd_RESERVE_ELEMENT_6              = 0x16, /* Optional */
-    kSCSICmd_RESERVE_ELEMENT_10             = 0x56  /* Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x09 SSC Communications Commands
-/* Commands defined by the T10:997-D SCSI-3 Stream Commands (SSC) 
- * (revision 22, January 1, 2000) command specification. 
- */
-  
-#pragma mark -
-#pragma mark 0x0A ASC IT8 Prepress Commands
-#pragma mark 0x0B ASC IT8 Prepress Commands
-/* Commands defined by the ASC IT8 <title goes here> specification
- * (revision xx, month day, year) command specification.  
- */
-#if 0
-enum
-{
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x0C SCC Array Controller Commands
-/* Commands defined by the ANSI NCITS.318-199x SCSI Controller
- * Commands (SCC-2) ratified command specification.  
- */
-#if 0
-enum
-{
-    kSCSICmd_MAINTENANCE_IN                 = 0xA3, /* Mandatory */
-    kSCSICmd_MAINTENANCE_OUT                = 0xA4, /* Optional */
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
-    kSCSICmd_PORT_STATUS                    = 0x1F, /* Optional */
-    kSCSICmd_REDUNDANCY_GROUP_IN            = 0xBA, /* Mandatory */
-    kSCSICmd_REDUNDANCY_GROUP_OUT           = 0xBB, /* Optional */
-    kSCSICmd_RELEASE_6                      = 0x17, /* Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
-    kSCSICmd_REPORT_LUNS                    = 0xA0, /* Mandatory */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* Optional */
-    kSCSICmd_RESERVE_10                     = 0x56, /* Optional*/
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D, /* Optional */
-    kSCSICmd_SPARE_IN                       = 0xBC, /* Mandatory */
-    kSCSICmd_SPARE_OUT                      = 0xBD  /* Optional */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x0D SES Enclosure Services Commands
-/* Commands defined by the T10:1212-D SCSI-3 Enclosure Services (SES) 
- * (revision 8b, February 11, 1998) command specification.  
- */
-#if 0
-enum
-{
-    kSCSICmd_MODE_SELECT_6                  = 0x15, /* Optional */
-    kSCSICmd_MODE_SELECT_10                 = 0x55, /* Optional */
-    kSCSICmd_MODE_SENSE_6                   = 0x1A, /* Optional */
-    kSCSICmd_MODE_SENSE_10                  = 0x5A, /* Optional */
-    kSCSICmd_PERSISTENT_RESERVE_IN          = 0x5E, /* Optional */
-    kSCSICmd_PERSISTENT_RESERVE_OUT         = 0x5F, /* Optional */
-    kSCSICmd_RECEIVE_DIAGNOSTICS_RESULTS    = 0x17, /* Mandatory */
-    kSCSICmd_RELEASE_6                      = 0x17, /* Optional */
-    kSCSICmd_RELEASE_10                     = 0x57, /* Optional */
-    kSCSICmd_REQUEST_SENSE                  = 0x03, /* Mandatory */
-    kSCSICmd_RESERVE_6                      = 0x16, /* Optional */
-    kSCSICmd_RESERVE_10                     = 0x56, /* Optional */
-    kSCSICmd_SEND_DIAGNOSTICS               = 0x1D  /* Mandatory */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x0E RBC Reduced Block Commands
-/* Commands defined by the T10:1240-D Reduced Block Commands (RBC) 
- * (revision 10a, August 18, 1999) command specification.  
- */
-#if 0
-enum
-{
-    kSCSICmd_FORMAT_UNIT                    = 0x04, /* Optional */
-    kSCSICmd_READ_10                        = 0x28, /* Mandatory */
-    kSCSICmd_READ_CAPACITY                  = 0x25, /* Mandatory */
-    kSCSICmd_START_STOP_UNIT                = 0x1B, /* Mandatory */
-    kSCSICmd_SYNCHRONIZE_CACHE              = 0x35, /* Optional */
-    kSCSICmd_VERIFY_10                      = 0x2F, /* Mandatory */
-    kSCSICmd_WRITE_10                       = 0x2A, /* Mandatory */
-    kSCSICmd_WRITE_BUFFER                   = 0x3B  /* Mandatory for fixed media
-     *                                              Optional for removable */
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x0F OCRW Optical Card Commands
-/* Commands defined by the ISO/IEC 14776-381 SCSI Specification for
- * Optical Card Reader/Writer (OCRW) ratified command specification.  
- */
-#if 0
-enum
-{
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x11 OSD Object-based Storage Commands
-/* Commands defined by the T10:1355-D Object-based Storage Commands (OSD) 
- * (revision 1, 18 May 2000) command specification.  
- */
-#if 0
-enum
-{
-};
-#endif
-
-#pragma mark -
-#pragma mark 0x15 RMC Simplified Multimedia Commands
-/* Commands defined by the T10:1364-D Reduced Multimedia Commands (RMC) 
- * (revision 1, November 11, 1999) command specification.  
- */
-#if 0
-enum
-{
-};
-#endif
-
-#endif	/* _SCSI_COMMAND_OPERATION_CODES_H_ */
diff --git a/i386/include/IOKit/scsi/SCSIPort.h b/i386/include/IOKit/scsi/SCSIPort.h
deleted file mode 100644
index 8eefbeb..0000000
--- a/i386/include/IOKit/scsi/SCSIPort.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_SCSI_PORTS_H_
-#define _IOKIT_SCSI_PORTS_H_
-
-
-/*! @header SCSIPort
-	@discussion
-	This file contains all the definitions for SCSIPort notifications and status.
-*/
-
-
-/*!
-@enum kSCSIPort_NotificationStatusChange
-@discussion
-Message definition to be used with the messageClients
-call to inform of a change in port status.
-*/
-enum
-{
-	kSCSIPort_NotificationStatusChange		= 0x68000001
-};
-
-
-/*! @typedef SCSIPortStatus
-	@abstract 32-bit number to represent a SCSIPortStatus.
-	@discussion Type for SCSIPortStatus.
-*/
-
-typedef UInt32 SCSIPortStatus;
-
-/*! @enum SCSI Port Status Values
-	@discussion Definitions for the possible port status values
-*/
-enum
-{
-	/*!
-	@constant kSCSIPort_StatusOnline
-	The port is online.
-	*/
-	kSCSIPort_StatusOnline	= 0,
-
-	/*!
-	@constant kSCSIPort_StatusOffline
-	The port is offline (e.g. unplugged cable).
-	*/
-	kSCSIPort_StatusOffline	= 1,
-
-	/*!
-	@constant kSCSIPort_StatusFailure
-	Driver has detected unrecoverable port failure (e.g. hardware port failure)
-	*/
-	kSCSIPort_StatusFailure	= 2
-};
-
-#endif	/* _IOKIT_SCSI_PORTS_H_ */
diff --git a/i386/include/IOKit/scsi/SCSITask.h b/i386/include/IOKit/scsi/SCSITask.h
deleted file mode 100644
index 154c187..0000000
--- a/i386/include/IOKit/scsi/SCSITask.h
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_SCSI_TASK_H_
-#define _IOKIT_SCSI_TASK_H_
-
-
-#if KERNEL
-#include <IOKit/IOTypes.h>
-#else
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
-
-/*! @header SCSITask
-SCSITask typedefs and constants used inside the kernel and user space.
-
-Note that the SCSITaskIdentifier is an opaque object and that directly
-casting the SCSITaskIdentifier to any other type is discouraged. The SCSITask
-implementation changes when necessary to accomodate architectural changes,
-performance improvements, and bug fixes.
-
-Device and protocol layer drivers that need to access information
-contained in a SCSITask should use the appropriate accessor methods in
-IOSCSIPrimaryCommandsDevice.h or IOSCSIProtocolServices.h
-*/
-
-
-/*! @typedef SCSIDeviceIdentifier
-    @abstract 64-bit number to represent a SCSI Device.
-	@discussion If the identifier can either be that of an initiator or a target,
-    SCSIDeviceIdentifier should be used.
-*/
-
-typedef UInt64 					SCSIDeviceIdentifier;
-
-/*! @typedef SCSITargetIdentifier
-    @abstract 64-bit number to represent a SCSI Target Device.
-	@discussion If the identifier is for a target only and not an initiator, then
-	SCSITargetIdentifier should be used.
-*/
-
-typedef SCSIDeviceIdentifier 	SCSITargetIdentifier;
-
-/*! @typedef SCSIInitiatorIdentifier
-    @abstract 64-bit number to represent a SCSI Initiator Device.
-	@discussion If the identifier is for an initiator only and not a target, then
-	SCSIInitiatorIdentifier should be used.
-*/
-
-typedef SCSIDeviceIdentifier 	SCSIInitiatorIdentifier;
-
-/*! @typedef SCSILogicalUnitNumber
-    @abstract 64-bit number to represent a logical unit.
-	@discussion 64-bit number to represent a logical unit.
-*/
-
-typedef UInt64 					SCSILogicalUnitNumber;
-
-/*! @typedef SCSITaggedTaskIdentifier
-    @abstract 64-bit number to represent a unique task identifier.
-	@discussion The Tagged Task Identifier is used when a Task has a Task Attribute other
-	than SIMPLE. The SCSI Application Layer client that controls the Logical
-	Unit for which a Task is intended is required to guarantee that the Task
-	Tag Identifier is unique. Zero cannot be used a a Tag value as this is used
-	to when a Tagged Task Identifier value is needed for a Task with a SIMPLE 
-	attribute.
-*/
-
-typedef UInt64 SCSITaggedTaskIdentifier;
-
-/*!
-	@enum Untagged Task Identifier
-	@discussion The Untagged Task Identifier is used to indicate no unique tag
-	is associated with the Task.
-	@constant kSCSIUntaggedTaskIdentifier This value means the task is untagged.
- */
-
-enum
-{
-	kSCSIUntaggedTaskIdentifier = 0
-};
-
-/*!
-	@typedef SCSITaskAttribute
-	@abstract Attributes for task delivery.
-	@discussion The Task Attribute defines how this task should be managed
-	when determing order for queueing and submission to the 
-	appropriate device server. The Task Attribute is set by the SCSI
-	Application Layer and cannot be modified by the SCSI Protocol Layer.
-	@constant kSCSITask_SIMPLE The task has a simple attribute.
-	@constant kSCSITask_ORDERED The task has an ordered attribute.
-	@constant kSCSITask_HEAD_OF_QUEUE The task has a head-of-queue attribute.
-	@constant kSCSITask_ACA The task has an auto-contingent-allegiance attribute.
- */
-
-typedef enum SCSITaskAttribute
-{
-	kSCSITask_SIMPLE			= 0,
-	kSCSITask_ORDERED			= 1,
-	kSCSITask_HEAD_OF_QUEUE		= 2,
-	kSCSITask_ACA				= 3
-} SCSITaskAttribute;
-
-/*!
-	@typedef SCSITaskState
-	@abstract Attributes for task state.
-	@discussion The Task State represents the current state of the task.
-	The state is set to NEW_TASK when the task is created.  The SCSI Protocol
-	Layer will then adjust the state as the task is queued and during
-	execution. The SCSI Application Layer can examine the state to monitor
-	the progress of a task. The Task State can only be modified by the SCSI
-	Protocol Layer.  The SCSI Application Layer can only read the state.
-	@constant kSCSITaskState_NEW_TASK The task state is new task.
-	@constant kSCSITaskState_ENABLED The task is enabled and queued.
-	@constant kSCSITaskState_BLOCKED The task is blocked.
-	@constant kSCSITaskState_DORMANT The task is dormant.
-	@constant kSCSITaskState_ENDED The task is complete.
- */
-
-typedef enum SCSITaskState
-{
-	kSCSITaskState_NEW_TASK		= 0,
-	kSCSITaskState_ENABLED		= 1,
-	kSCSITaskState_BLOCKED		= 2,
-	kSCSITaskState_DORMANT		= 3,
-	kSCSITaskState_ENDED		= 4
-} SCSITaskState;
-
-
-/*!
-	@typedef SCSIServiceResponse
-	@abstract Attributes for task service response.
-	@discussion The Service Response represents the execution status of
-	a service request made to a Protocol Services Driver. The Service
-	Response can only be modified by the SCSI Protocol Layer. The SCSI
-	Application Layer can only read the state.
- */
-
-typedef enum SCSIServiceResponse
-{
-	/*!
-	@constant kSCSIServiceResponse_Request_In_Process
-	Not defined in SAM specification, but is a service response used
-	for asynchronous commands that are not yet completed.
-	*/
-	kSCSIServiceResponse_Request_In_Process					= 0,
-
-	/*!
-	@constant kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE
-	The service request failed because of a delivery or target failure.
-	*/
-	kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE	= 1,
-
-	/*!
-	@constant kSCSIServiceResponse_TASK_COMPLETE
-	The task completed.
-	*/
-	kSCSIServiceResponse_TASK_COMPLETE 						= 2,
-	
-	/*!
-	@constant kSCSIServiceResponse_LINK_COMMAND_COMPLETE
-	The linked command completed.
-	*/
-	kSCSIServiceResponse_LINK_COMMAND_COMPLETE				= 3,
-	
-	/*!
-	@constant kSCSIServiceResponse_FUNCTION_COMPLETE
-	The task management function completed.
-	*/
-	kSCSIServiceResponse_FUNCTION_COMPLETE					= 4,
-	
-	/*!
-	@constant kSCSIServiceResponse_FUNCTION_REJECTED
-	The task management function was rejected.
-	*/
-	kSCSIServiceResponse_FUNCTION_REJECTED					= 5
-} SCSIServiceResponse;
-
-/*!
-	@typedef SCSITaskStatus
-	@abstract Attributes for task status.
-	@discussion The Task Status represents the completion status
-	of the task which provides the  SCSI Application Layer with
-	additional information about how to procede in handling a
-	completed task.
-	
-	The SCSI Architecture Model specification only defines task
-	status values for when a task completes with a service response
-	of either TASK_COMPLETED or LINK_COMMAND_COMPLETE.
-	
-	Since additional information will aid in error recovery when
-	a task fails to be completed by a device due to a service
-	response of kSCSIServiceResponse_SERVICE_DELIVERY_OR_TARGET_FAILURE,
-	additional values have been defined that can be returned by the
-	SCSI Protocol Layer to inform the SCSI Application Layer of the
-	cause of the delivery failure.
-	
-	The Task Status can only be modified by the SCSI Protocol Layer.
-	The SCSI Application Layer can only read the status
-*/
-typedef enum SCSITaskStatus
-{
-	
-	/*!
-	@constant kSCSITaskStatus_GOOD
-	The task completed with a status of GOOD.
-	*/
-	
-	kSCSITaskStatus_GOOD						= 0x00,
-
-	/*!
-	@constant kSCSITaskStatus_CHECK_CONDITION
-	The task completed with a status of CHECK_CONDITION. Additional
-	information about the condition should be available in the sense data.
-	*/
-	
-	kSCSITaskStatus_CHECK_CONDITION				= 0x02,
-	
-	/*!
-	@constant kSCSITaskStatus_CONDITION_MET
-	The task completed with a status of CONDITION_MET.
-	*/
-	
-	kSCSITaskStatus_CONDITION_MET				= 0x04,
-	
-	/*!
-	@constant kSCSITaskStatus_BUSY
-	The task completed with a status of BUSY. The device server might need
-	time to process a request and a delay may be required.
-	*/
-	kSCSITaskStatus_BUSY						= 0x08,
-
-	/*!
-	@constant kSCSITaskStatus_INTERMEDIATE
-	The task completed with a status of INTERMEDIATE.
-	*/
-	kSCSITaskStatus_INTERMEDIATE				= 0x10,
-
-	/*!
-	@constant kSCSITaskStatus_INTERMEDIATE_CONDITION_MET
-	The task completed with a status of INTERMEDIATE_CONDITION_MET.
-	*/
-	kSCSITaskStatus_INTERMEDIATE_CONDITION_MET	= 0x14,
-
-	/*!
-	@constant kSCSITaskStatus_RESERVATION_CONFLICT
-	The task completed with a status of RESERVATION_CONFLICT.
-	*/
-	kSCSITaskStatus_RESERVATION_CONFLICT		= 0x18,
-
-	/*!
-	@constant kSCSITaskStatus_TASK_SET_FULL
-	The task completed with a status of TASK_SET_FULL. The device server
-	may need to complete a task before the initiator sends another.
-	*/
-	kSCSITaskStatus_TASK_SET_FULL				= 0x28,
-	
-	/*!
-	@constant kSCSITaskStatus_ACA_ACTIVE
-	The task completed with a status of ACA_ACTIVE. The device server may
-	need the initiator to clear the Auto-Contingent Allegiance condition
-	before it will respond to new commands.
-	*/
-	kSCSITaskStatus_ACA_ACTIVE					= 0x30,
-	
-	/*!
-	@constant kSCSITaskStatus_TaskTimeoutOccurred
-	If a task is aborted by the SCSI Protocol Layer due to it exceeding
-	the timeout value specified by the task, the task status shall be
-	set to kSCSITaskStatus_TaskTimeoutOccurred.
-	*/
-	
-	kSCSITaskStatus_TaskTimeoutOccurred			= 0x01,
-	
-	/*!
-	@constant kSCSITaskStatus_ProtocolTimeoutOccurred
-	If a task is aborted by the SCSI Protocol Layer due to it exceeding a
-	timeout value specified by the support for the protocol or a related
-	specification, the task status shall be set to
-	kSCSITaskStatus_ProtocolTimeoutOccurred.
-	*/
-	
-	kSCSITaskStatus_ProtocolTimeoutOccurred		= 0x02,
-	
-	/*!
-	@constant kSCSITaskStatus_DeviceNotResponding
-	If a task is unable to be delivered due to a failure of the device not
-	accepting the task or the device acknowledging the attempt to send it the
-	device the task status shall be set to kSCSITaskStatus_DeviceNotResponding.
-	This will allow the SCSI Application driver to perform the necessary steps
-	to try to recover the device. This shall only be reported after the SCSI
-	Protocol Layer driver has attempted all protocol specific attempts to recover
-	the device.
-	*/
-	
-	kSCSITaskStatus_DeviceNotResponding			= 0x03,
-	
-	/*!
-	@constant kSCSITaskStatus_DeviceNotPresent
-	If the task is unable to be delivered because the device has been
-	detached, the task status shall be set to kSCSITaskStatus_DeviceNotPresent.
-	This will allow the SCSI Application Layer to halt the sending of tasks
-	to the device and, if supported, perform any device failover or system
-	cleanup.
-	*/
-	kSCSITaskStatus_DeviceNotPresent			= 0x04,
-	
-	/*!
-	@constant kSCSITaskStatus_DeliveryFailure
-	If the task is unable to be
-	delivered to the device due to a failure in the SCSI Protocol Layer,
-	such as a bus reset or communications error, but the device is is
-	known to be functioning properly, the task status shall be set to 
-	kSCSITaskStatus_DeliveryFailure. This can also be reported if the
-	task could not be delivered due to a protocol error that has since
-	been corrected.
-	 */
-	kSCSITaskStatus_DeliveryFailure				= 0x05,
-	
-	/*!
-	@constant kSCSITaskStatus_No_Status
-	This status is not defined by
-	the SCSI specifications, but is here to provide a status that can
-	be returned in cases where there is not status available from the
-	device or protocol, for example, when the service response is
-	neither TASK_COMPLETED nor LINK_COMMAND_COMPLETE or when the
-	service response is SERVICE_DELIVERY_OR_TARGET_FAILURE and the
-	reason for failure could not be determined.
-	*/
-	kSCSITaskStatus_No_Status					= 0xFF
-} SCSITaskStatus;
-
-/*!
-	@enum Command Descriptor Block Size
-	@discussion Command Descriptor Block Size constants.
-*/
-enum
-{
-	/*!
-	@constant kSCSICDBSize_Maximum This is the largest size a Command Descriptor
-	Block can be as specified in SPC-2.
-	*/
-	kSCSICDBSize_Maximum 	= 16,
-
-	/*!
-	@constant kSCSICDBSize_6Byte Use this for a 6-byte CDB.
-	*/
-	kSCSICDBSize_6Byte 		= 6,
-
-	/*!
-	@constant kSCSICDBSize_10Byte Use this for a 10-byte CDB.
-	*/
-	kSCSICDBSize_10Byte 	= 10,
-
-	/*!
-	@constant kSCSICDBSize_12Byte Use this for a 12-byte CDB.
-	*/
-	kSCSICDBSize_12Byte 	= 12,
-
-	/*!
-	@constant kSCSICDBSize_16Byte Use this for a 16-byte CDB.
-	*/
-	kSCSICDBSize_16Byte 	= 16
-};
-
-typedef UInt8 SCSICommandDescriptorBlock[kSCSICDBSize_Maximum];
-
-/*!
-	@enum Data Transfer Direction
-	@discussion DataTransferDirection constants.
-*/
-enum
-{
-	/*!
-	@constant kSCSIDataTransfer_NoDataTransfer Use this for tasks
-	that transfer no data.
-	*/
-	kSCSIDataTransfer_NoDataTransfer		= 0x00,
-
-	/*!
-	@constant kSCSIDataTransfer_FromInitiatorToTarget Use this for tasks that transfer
-	data from the initiator to the target.
-	*/
-	kSCSIDataTransfer_FromInitiatorToTarget	= 0x01,
-
-	/*!
-	@constant kSCSIDataTransfer_FromTargetToInitiator Use this for tasks that transfer
-	data from the target to the initiator.
-	*/
-	kSCSIDataTransfer_FromTargetToInitiator	= 0x02
-};
-
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-/* Libkern includes */
-#include <libkern/c++/OSObject.h>
-
-
-/*!
-	@enum SCSITaskMode
-	@discussion The SCSI Task mode is used by the SCSI
-	Protocol Layer to indicate what mode the task is executing.
-*/
-typedef enum SCSITaskMode
-{
-	kSCSITaskMode_CommandExecution	= 1,
-	kSCSITaskMode_Autosense			= 2
-} SCSITaskMode;
-
-/*!
-	@typedef SCSITaskIdentifier
-	@discussion This is an opaque object that represents a task.
-	This is used so that drivers for both the SCSI Protocol Layer
-	and the SCSI  Application Layer cannot modify the SCSITask object
-	directly but must instead use the inherited methods to do so. This
-	allows the implementation of SCSITask to change without directly
-	impacting device and protocol layer drivers. In addition, it
-	prevents changing of properties that are not allowed to be
-	changed by a given layer.
-*/
-typedef OSObject *	SCSITaskIdentifier;
-
-
-/*!
-	@typedef SCSITaskCompletion
-	@discussion This is the typedef for completion routines that
-	work with SCSITaskIdentifiers.
-*/
-typedef void ( *SCSITaskCompletion )( SCSITaskIdentifier completedTask );
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif /* _IOKIT_SCSI_TASK_H_ */
diff --git a/i386/include/IOKit/scsi/spi/.svn/all-wcprops b/i386/include/IOKit/scsi/spi/.svn/all-wcprops
deleted file mode 100644
index b14b4a8..0000000
--- a/i386/include/IOKit/scsi/spi/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 61
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/spi
-END
-IOSCSIParallelInterfaceController.h
-K 25
-svn:wc:ra_dav:version-url
-V 97
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/scsi/spi/IOSCSIParallelInterfaceController.h
-END
diff --git a/i386/include/IOKit/scsi/spi/.svn/entries b/i386/include/IOKit/scsi/spi/.svn/entries
deleted file mode 100644
index 49bbda1..0000000
--- a/i386/include/IOKit/scsi/spi/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/scsi/spi
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IOSCSIParallelInterfaceController.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-bce86d456d916867cf05e6e916d27b7f
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-59066
-
diff --git a/i386/include/IOKit/scsi/spi/.svn/text-base/IOSCSIParallelInterfaceController.h.svn-base b/i386/include/IOKit/scsi/spi/.svn/text-base/IOSCSIParallelInterfaceController.h.svn-base
deleted file mode 100644
index 0bd7981..0000000
--- a/i386/include/IOKit/scsi/spi/.svn/text-base/IOSCSIParallelInterfaceController.h.svn-base
+++ /dev/null
@@ -1,1568 +0,0 @@
-/*
- * Copyright (c) 2002-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__
-#define __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__
-
-
- /*!
-  @header IOSCSIParallelInterfaceController
-	The IOSCSIParallelInterfaceController class and the associated HBA child
-	class is responsible for the management of all related hardware. This
-	includes the onboard HBA controller chip and the physical state of the
-	bus. These classes are not responsible for any of the management of
-	the SCSI Devices on the bus with the exception of maintaining the queue that 
-	holds the objects representing those SCSI Devices.
-*/
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit includes
-#include <IOKit/IOService.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IODMACommand.h>
-#include <IOKit/IOInterruptEventSource.h>
-#include <IOKit/IOFilterInterruptEventSource.h>
-#include <IOKit/IOTimerEventSource.h>
-#include <IOKit/IOCommandPool.h>
-
-// IOKit SCSI ArchitectureModel Family includes
-#include <IOKit/scsi/SCSITask.h>
-#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
-#include <IOKit/scsi/SCSIPort.h>
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-
-#define kIOPropertySCSIDeviceFeaturesKey			"SCSI Device Features"
-#define kIOPropertySCSI_I_T_NexusFeaturesKey		"SCSI I_T Nexus Features"
-
-// This is the alignment mask used when allocating per-task HBA data. It allows
-// the HBA to declare whether or not it supports 64-bit addressability and what the
-// minimum byte alignment is for the data. E.g. By specifying 0x0000FFFFFFFFFFFEULL,
-// the controller would be indicating that it supports 48-bits of addressability, but
-// at a minimum of being 2-byte aligned.
-#define kIOMinimumHBADataAlignmentMaskKey			"HBA Data Alignment"
-
-// The Feature Selectors used to identify features of the SCSI Parallel
-// Interface.  These are used by the DoesHBASupportSCSIParallelFeature
-// to report whether the HBA supports a given SCSI Parallel Interface
-// feature and are used for requesting negotiation and reporting negotiation
-// results between the controller and the device.
-
-// When the DoesHBASupportSCSIParallelFeature() member routine of the controller 
-// child class is called, it will return true if the HBA that it controls 
-// supports the specified SCSIParallelFeature or false if it does not.
-typedef enum SCSIParallelFeature
-{
-	// The selector for support of Wide Data Transfers.  Only Wide16 is supported 
-	// as Wide32 has been obsoleted by the SPI-3 specification.
-	kSCSIParallelFeature_WideDataTransfer 					= 0,
-	
-	// The selector for support of Synchronous Data Transfers.
-	kSCSIParallelFeature_SynchronousDataTransfer 			= 1,
-	
-	// The selector for support of Quick Arbitration and Selection (QAS).
-	kSCSIParallelFeature_QuickArbitrationAndSelection 		= 2,
-	
-	// The selector for support of Double Transition (DT) data transfers.
-	kSCSIParallelFeature_DoubleTransitionDataTransfers 		= 3,
-	
-	// The selector for SPI Information Unit (IU) transfers.
-	kSCSIParallelFeature_InformationUnitTransfers 			= 4,
-	
-	// Since the Feature selectors are zero base, this will always have the 
-	// correct total.
-	kSCSIParallelFeature_TotalFeatureCount	
-} SCSIParallelFeature;
-
-
-typedef enum SCSIParallelFeatureRequest
-{
-	// This selector indicates that current negotiation 
-	// should be used. 
-	kSCSIParallelFeature_NoNegotiation 			= 0,
-	
-	// This selector indicates that the controller
-	// should attempt negotiation for the feature
-	kSCSIParallelFeature_AttemptNegotiation 	= 1,
-	
-	// This selector indicates that the controller
-	// should clear any negotiation for the feature
-	kSCSIParallelFeature_ClearNegotiation 		= 2
-};
-	
-typedef enum SCSIParallelFeatureResult
-{
-	kSCSIParallelFeature_NegotitiationUnchanged	= 0,
-	kSCSIParallelFeature_NegotitiationCleared	= 1,
-	kSCSIParallelFeature_NegotitiationSuccess	= 2
-};
-
-
-// The SCSI Message Codes used for MESSAGE IN and MESSAGE OUT phases.
-enum SCSIParallelMessages
-{
-	// Link Control Messages
-	kSCSIParallelMessage_TASK_COMPLETE						= 0x00,
-	kSCSIParallelMessage_EXTENDED_MESSAGE					= 0x01,
-	kSCSIParallelMessage_SAVE_DATA_POINTER	 				= 0x02,
-	kSCSIParallelMessage_RESTORE_POINTERS					= 0x03,
-	kSCSIParallelMessage_DISCONNECT							= 0x04,
-	kSCSIParallelMessage_INITIATOR_DETECTED_ERROR 			= 0x05,
-	kSCSIParallelMessage_MESSAGE_REJECT		 				= 0x07,
-	kSCSIParallelMessage_NO_OPERATION		 				= 0x08,
-	kSCSIParallelMessage_MESSAGE_PARITY_ERROR 				= 0x09,
-	kSCSIParallelMessage_IGNORE_WIDE_RESIDUE				= 0x23,
-	kSCSIParallelMessage_QAS_REQUEST		 				= 0x55,
-	kSCSIParallelMessage_IDENTIFY							= 0x80,
-	
-	// The Message Codes used in the EXTENDED_MESSAGE message.
-	kSCSIParallelMessage_MODIFY_DATA_POINTER				= 0x00,
-	kSCSIParallelMessage_SYNCHONOUS_DATA_TRANSFER_REQUEST	= 0x01,
-	// Reserved												= 0x02
-	kSCSIParallelMessage_WIDE_DATA_TRANSFER_REQUEST			= 0x03,
-	kSCSIParallelMessage_PARALLEL_PROTOCOL_REQUEST			= 0x04,
-	// Reserved												= 0x05 through 0xFF
-	
-	// Task Attribute Message Codes
-	kSCSIParallelMessage_ACA								= 0x24,
-	kSCSIParallelMessage_HEAD_OF_QUEUE						= 0x21,
-	kSCSIParallelMessage_LINKED_COMMAND_COMPLETE			= 0x0A,
-	kSCSIParallelMessage_ORDERED							= 0x22,
-	kSCSIParallelMessage_SIMPLE								= 0x20,
-	
-	// Task Management Message Codes
-	kSCSIParallelMessage_ABORT_TASK							= 0x0D,
-	kSCSIParallelMessage_ABORT_TASK_SET						= 0x06,
-	kSCSIParallelMessage_CLEAR_ACA							= 0x16,
-	kSCSIParallelMessage_CLEAR_TASK_SET						= 0x0E,
-	kSCSIParallelMessage_LOGICAL_UNIT_RESET					= 0x17,
-	kSCSIParallelMessage_TARGET_RESET						= 0x0C
-};
-
-enum
-{
-	kSCSIParallelTaskControllerIDQueueHead 		= 0
-};
-
-// Notifications
-enum
-{
-	kSCSIControllerNotificationBusReset			= 0x68000000
-};
-
-// Forward declaration for the internally used Parallel Device object.
-class IOSCSIParallelInterfaceDevice;
-
-// This is the identifier that is used to specify a given parallel Task.
-typedef OSObject *	SCSIParallelTaskIdentifier;
-
-
-//-----------------------------------------------------------------------------
-//	Class Declarations
-//-----------------------------------------------------------------------------
-
-/*! @class IOSCSIParallelInterfaceController
-	@abstract Class that represents a SCSI Host Bus Adapter.
-	@discussion Class that represents a SCSI Host Bus Adapter.
-*/
-class IOSCSIParallelInterfaceController : public IOService
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIParallelInterfaceController )
-	
-#if 0
-#pragma mark -
-#pragma mark Client API
-#endif
-	
-	
-public:
-	
-	/*!
-		@function GetSCSIParallelTask
-		@abstract Method to allow the client to get a SCSIParallelTask
-		@discussion Get a SCSIParallelTask from the controller so that a request
-		can be issued to the HBA driver.
-		@param blockForCommand If the blockForCommand parameter is set to false
-		and there are no free SCSIParallelTasks, this method will return NULL, 
-		otherwise it will wait for one to become available before returning.
-		@result If there is a SCSI Parallel Task available, a reference to it 
-		will be returned.
-	*/
-	
-	SCSIParallelTaskIdentifier	GetSCSIParallelTask ( bool blockForCommand );
-	
-	/*!
-		@function FreeSCSIParallelTask
-		@abstract Method to allow the client to release a SCSIParallelTask
-		@discussion	The FreeSCSIParallelTask method is called by the client when 
-		a SCSIParallelTask has been completed and the associated returnTask
-		needs to be returned to the pool.
-		@param returnTask is a reference to the SCSIParallelTaskIdentifier to be 
-		returned.
-	*/
-	
-	void FreeSCSIParallelTask ( SCSIParallelTaskIdentifier returnTask );
-	
-	/*!
-		@function FindTaskForAddress
-		@abstract Find a task for a given Task Address, if one exists.
-		@discussion If a valid Tagged Task Identifier is specified, this method 
-		will return the task specified by the Tagged Task Address if one is 
-		found, or else NULL will be returned.  If zero is used as the Tagged 
-		Task Identifier, then this routine will search for an outstanding task 
-		based on the Untagged Task Address and return the task or else, if one 
-		is not found, return NULL.
-		@param theT is the Target component of the I_T_L or I_T_L_Q nexus.
-		@param theL is the Logical Unit component of the I_T_L or I_T_L_Q nexus.
-		@param theQ is the Queue Tag component of the I_T_L_Q nexus.  If this is
-		an I_T_L nexus, then the kSCSIUntaggedTaskIdentifier constant should be
-		used for theQ.
-		@result returns a valid SCSIParallelTaskIdentifier or NULL if none 
-		found.
-	*/
-	
-	SCSIParallelTaskIdentifier	FindTaskForAddress ( 
-							SCSIDeviceIdentifier 		theT,
-							SCSILogicalUnitNumber		theL,
-							SCSITaggedTaskIdentifier	theQ );
-	
-	
-	/*!
-		@function FindTaskForControllerIdentifier
-		@abstract Find a task for a given Target and Controller Task Identifier
-		@discussion Allows the controller child class to find an outstanding task
-		for a specified target and controller task identifier
-		@param theTarget is the Target that the task .
-		@param theIdentifier is the controller task identifier set using the SCSI
-		Parallel Task's SetControllerTaskIdentifier() method.
-		@result returns a valid SCSIParallelTaskIdentifier or NULL if none 
-		found.
-	*/
-	
-	SCSIParallelTaskIdentifier	FindTaskForControllerIdentifier ( 
-							SCSIDeviceIdentifier 		theTarget,
-							UInt64						theIdentifier );
-	
-	
-	/*!
-		@function ExecuteParallelTask
-		@abstract Submit a SCSIParallelTask for execution.
-		@discussion	The ExecuteParallelTask call is made by the client to submit 
-		a SCSIParallelTask for execution.
-		@param parallelRequest is a reference to the SCSIParallelTaskIdentifier
-		to be executed.
-		@result is an appropriate SCSIServiceResponse which are defined in the
-		file <IOKit/scsi/SCSITask.h>.
-	*/
-	
-	SCSIServiceResponse ExecuteParallelTask ( 
-							SCSIParallelTaskIdentifier	parallelRequest );
-	
-	// --- Public API methods provided by HBA child classes ----
-	
-	/*!
-		@function ReportHBAHighestLogicalUnitNumber
-		@abstract Gets the Highest Logical Unit Number.
-		@discussion	This method is used to query the HBA child class to 
-		determine what the highest Logical Unit Number that the controller can 
-		address.
-		@result returns a valid 64-bit logical unit number.
-	*/
-	
-	virtual SCSILogicalUnitNumber	ReportHBAHighestLogicalUnitNumber ( void ) = 0;
-	
-	/*!
-		@function DoesHBASupportSCSIParallelFeature
-		@abstract Queries the HBA child class to determine if it supports a 
-		specific SPI feature.
-		@discussion	Queries the HBA child class to determine if it supports the 
-		specified feature as defined by the SCSI Parallel Interconnect 
-		specifications.
-		@result Returns true if requested feature is supported.
-	*/
-	
-	virtual bool	DoesHBASupportSCSIParallelFeature ( 
-							SCSIParallelFeature 		theFeature ) = 0;
-	
-	/*!
-		@function InitializeTargetForID
-		@abstract Called to initialize a target device.
-		@discussion	This method will be called to initialize a target device in 
-		a single-threaded manner.  The HBA can use this method to probe the 
-		target or do anything else necessary before the device object is 
-		registered with IOKit for matching.
-		@result Returns true if the target was successfully initialized.
-	*/
-	
-	virtual bool	InitializeTargetForID (  
-							SCSITargetIdentifier 		targetID ) = 0;
-	
-	// The SCSI Task Management Functions as defined in the SCSI Architecture
-	// Model - 2 (SAM-2) specification.  These are used by the client to request
-	// the specified function.  The controller can complete these immmediately 
-	// by returning the appropriate SCSIServiceResponse, or these can be completed
-	// asyncronously by the controller returning a SCSIServiceResponse of
-	// kSCSIServiceResponse_Request_In_Process and then calling the appropriate
-	// function complete member routine listed in the child class API section.
-	
-	virtual SCSIServiceResponse	AbortTaskRequest ( 	
-							SCSITargetIdentifier 		theT,
-							SCSILogicalUnitNumber		theL,
-							SCSITaggedTaskIdentifier	theQ ) = 0;
-	
-	virtual	SCSIServiceResponse AbortTaskSetRequest (
-							SCSITargetIdentifier 		theT,
-							SCSILogicalUnitNumber		theL ) = 0;
-	
-	virtual	SCSIServiceResponse ClearACARequest (
-							SCSITargetIdentifier 		theT,
-							SCSILogicalUnitNumber		theL ) = 0;
-	
-	virtual	SCSIServiceResponse ClearTaskSetRequest (
-							SCSITargetIdentifier 		theT,
-							SCSILogicalUnitNumber		theL ) = 0;
-	
-	virtual	SCSIServiceResponse LogicalUnitResetRequest (
-							SCSITargetIdentifier 		theT,
-							SCSILogicalUnitNumber		theL ) = 0;
-	
-	virtual	SCSIServiceResponse TargetResetRequest (
-							SCSITargetIdentifier 		theT ) = 0;
-	
-	
-
-	/*!
-		@function DoesHBAPerformAutoSense
-		@abstract Queries the HBA child class to determine if it automatically
-		performs AutoSense and provides AutoSense data for each I/O. If the HBA
-		allocates space for AutoSense in its HBA specific data region on a per
-		task basis, the HBA should respond true.
-		@discussion	Queries the HBA child class to determine if it automatically
-		performs AutoSense and provides AutoSense data for each I/O. If the HBA
-		allocates space for AutoSense in its HBA specific data region on a per
-		task basis, the HBA should respond true.
-		@result Return true if HBA performs AutoSense into its own private data
-		buffer.
-	*/
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 1 );
-	
-	virtual bool	DoesHBAPerformAutoSense ( void );
-	
-	/*!
-		@function ReportHBAConstraints
-		@abstract Called to report the I/O constraints for this controller.
-		A list of valid keys includes:
-			kIOMaximumSegmentCountReadKey, (required)
-			kIOMaximumSegmentCountWriteKey, (required)
-			kIOMaximumSegmentByteCountReadKey, (required)
-			kIOMaximumSegmentByteCountWriteKey, (required)
-			kIOMinimumSegmentAlignmentByteCountKey, (required)
-			kIOMaximumSegmentAddressableBitCountKey, (required)
-			kIOMinimumHBADataAlignmentMaskKey (required).
-		NB: These keys and their values are described in this header and <IOKit/IOKitKeys.h>
-		@param constraints. An OSDictionary object used to aggregate the key/value pairs.
-		Subclasses must set the required keys if they override this method. If a subclass does
-		not provide the required keys, the system will panic.
-	*/
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 2 );
-	
-	virtual void	ReportHBAConstraints ( OSDictionary * constraints );
-	
-	// Padding for the Client API
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 8 );
-	
-	
-#if 0
-#pragma mark -
-#pragma mark Child Class API
-#endif
-	
-	
-protected:
-	
-	// ---- Target Creation and Destruction methods ---
-	
-	/*!
-		@function CreateTargetForID
-		@abstract Method to perform device creation.
-		@discussion	For HBA child classes that report true to the 
-		DoesHBAPerformDeviceManagement() method, the child class will be 
-		responsible for all device management by using these methods;
-		otherwise, the superclass will be responsible for all device management.
-		This method must be used to perform SCSI Parallel Device creation and 
-		cannot be overridden.
-		@param  targetID SCSIDeviceIdentifier of desired targetID.
-		@result returns true if successful.
-	*/
-	
-	bool	CreateTargetForID ( SCSIDeviceIdentifier targetID );
-	
-	 /*!
-		@function CreateTargetForID
-		@abstract Method to perform device creation.
-		@discussion	For HBA child classes that report true to the
-		DoesHBAPerformDeviceManagement() method, the child class will be
-		responsible for all device management by using these methods;
-		otherwise, the superclass will be responsible for all device management.
-		This method must be used to perform SCSI Parallel Device creation and
-		cannot be overridden.
-		@param  targetID SCSIDeviceIdentifier of desired targetID.
-		@param	properties A dictionary of properties to associate with the device
-				upon creation. The list of valid property keys is as follows:
-				kIOPropertySASAddressKey,
-				kIOPropertyFibreChannelNodeWorldWideNameKey,
-				kIOPropertyFibreChannelPortWorldWideNameKey,
-				kIOPropertyFibreChannelAddressIdentifierKey, and
-				kIOPropertyFibreChannelALPAKey.
-				These keys are defined in
-				<IOKit/storage/IOStorageProtocolCharacteristics.h> and the values
-				associated with these keys must be of the proper type/size,
-				or the target creation will not succeed.
-		@result returns true if successful.
-	*/
-	
-	bool	CreateTargetForID ( SCSIDeviceIdentifier 	targetID,
-								OSDictionary * 			properties );
-	
-	 /*!
-		@function DestroyTargetForID
-		@abstract Method to perform device destruction.
-		@discussion	For HBA child classes that report true to the 
-		DoesHBAPerformDeviceManagement() method, the child class will be 
-		responsible for all device management by using these methods; otherwise, 
-		the superclass will be responsible for all device management.
-		This method must be used to perform SCSI Parallel Device destruction and
-		cannot be overridden.
-		@param  targetID SCSIDeviceIdentifier of desired targetID.
-	*/
-	
-	void	DestroyTargetForID ( SCSIDeviceIdentifier targetID );
-	
-	/*!
-		@function GetTargetForID
-		@abstract Accessor for getting pointer to IOSCSIParallelInterfaceDevice.
-		@param targetID SCSIDeviceIdentifier of desired targetID.
-		@result returns pointer to IOSCSIParallelInterfaceDevice or NULL if not 
-		found.
-	*/
-	
-	IOSCSIParallelInterfaceDevice *	GetTargetForID ( 
-							SCSIDeviceIdentifier 		targetID ); 
-	
-	/*!
-		@function SetTargetProperty
-		@abstract Accessor for setting a property for a specific target.
-		@param device A pointer to a valid IOSCSIParallelInterfaceDevice.
-		@param key A pointer to a valid OSString object which represents the key.
-		A list of valid keys includes:
-			kIOPropertySASAddressKey,
-			kIOPropertyFibreChannelNodeWorldWideNameKey,
-			kIOPropertyFibreChannelPortWorldWideNameKey,
-			kIOPropertyFibreChannelAddressIdentifierKey, and
-			kIOPropertyFibreChannelALPAKey.
-		NB: These keys and their values are described in <IOKit/storage/IOStorageProtocolCharacteristics.h>
-		@param value Pointer to an OSObject (one of type OSData, OSString, etc.)
-		which represents the value for the property. The value must be of the proper type
-		and size for the specified key.
-		@result returns true if identifier was properly set, otherwise false. 
-	*/
-	
-	bool	SetTargetProperty ( SCSIDeviceIdentifier 		targetID,
-								const char *		 		key,
-								OSObject *					value );
-
-	/*!
-		@function RemoveTargetProperty
-		@abstract Accessor for removing a property from a specific target.
-		@param device A pointer to a valid IOSCSIParallelInterfaceDevice.
-		@param key A pointer to a valid OSString object which represents the key.
-	*/
-	
-	void	RemoveTargetProperty ( SCSIDeviceIdentifier 		targetID,
-								   const char *		 			key );
-	
-	// ---- Methods for HBA specifics. ----
-	
-	/*!
-		@function SetHBAProperty
-		@abstract Accessor for setting a property for this object.
-		@param key A pointer to a valid OSString object which represents the key.
-		A list of valid keys includes:
-			kIOPropertyVendorNameKey,
-			kIOPropertyProductNameKey,
-			kIOPropertyProductRevisionLevelKey,
-			kIOPropertyPortDescriptionKey,
-			kIOPropertyPortSpeedKey,
-			kIOPropertyPortTopologyKey,
-			kIOPropertySCSIParallelSignalingTypeKey,
-			kIOPropertyFibreChannelCableDescriptionKey,
-			kIOPropertyFibreChannelNodeWorldWideNameKey,
-			kIOPropertyFibreChannelPortWorldWideNameKey,
-			kIOPropertyFibreChannelAddressIdentifierKey, and
-			kIOPropertyFibreChannelALPAKey.
-		NB: These keys and their values are described in <IOKit/storage/IOStorageDeviceCharacteristics.h>
-		and <IOKit/storage/IOStorageProtocolCharacteristics.h>
-		@param value Pointer to an OSObject (one of type OSData, OSString, etc.)
-		which represents the value for the property. The value must be of the proper type,
-		and/or size for the specified key.
-		@result returns true if identifier was properly set, otherwise false. 
-	*/
-	
-	bool	SetHBAProperty ( const char *	key,
-							 OSObject *	 	value );
-
-	/*!
-		@function RemoveHBAProperty
-		@abstract Accessor for removing a property for this object.
-		@param key A pointer to a valid OSString object which represents the key.
-		See the SetHBAProperty() method for a list of valid keys.
-	*/
-	
-	void	RemoveHBAProperty ( const char * key );
-	
-	// These methods will not be called before the InitializeController() call,
-	// and will not be called after the TerminateController() call.  But in the
-	// interval between those calls, they shall report the correct requested
-	// information. They are implemented as seperate pure virtual methods
-	// instead of a selector driven method because the HBA child class is
-	// required to report this information.
-	
-	/*!
-		@function ReportInitiatorIdentifier
-		@abstract Get the SCSI Device Identifier for the HBA.
-		@discussion This method will be called to determine the SCSI Device 
-		Identifier that the Initiator has assigned for this HBA.
-		@result returns SCSIInitiatorIdentifier.
-	*/
-	
-	virtual SCSIInitiatorIdentifier	ReportInitiatorIdentifier ( void ) = 0;
-	
-	/*!
-		@function ReportHighestSupportedDeviceID
-		@abstract Get the highest supported SCSI Device Identifier.
-		@discussion This method will be called to determine the value of the 
-		highest SCSI Device Identifier supported by the HBA. This value will be 
-		used to determine the last ID to process.
-		@result returns highest SCSIDeviceIdentifier
-	*/
-	
-	virtual SCSIDeviceIdentifier	ReportHighestSupportedDeviceID ( void ) = 0;
-	
-	/*!
-		@function ReportMaximumTaskCount
-		@abstract Report Maximum Task Count
-		@discussion This method will be called to retrieve the maximum number of
-		outstanding tasks the HBA can process. This number must be greater than
-		zero or the controller driver will fail to match and load.
-		@result returns maximum (non-zero) task count.
-	*/
-	
-	virtual UInt32		ReportMaximumTaskCount ( void ) = 0;
-	
-  	/*!
-		@function ReportHBASpecificTaskDataSize
-		@abstract Determine memory needed for HBA Task specific use.
-		@discussion This method is used to retrieve the amount of memory that 
-		will be allocated in the SCSI Parallel Task for HBA specific use.
-		@result returns memory required in bytes
-	*/
-	
-	virtual UInt32		ReportHBASpecificTaskDataSize ( void ) = 0;
-	
-  	/*!
-		@function ReportHBASpecificDeviceDataSize
-		@abstract  Determine memory needed for HBA Device specific use.
-		@discussion This method is used to retrieve the amount of memory that 
-		will be allocated in the SCSI Parallel Device for HBA specific use.
-		@result  returns memory required in bytes
-	*/
-	
-	virtual UInt32		ReportHBASpecificDeviceDataSize ( void ) = 0;
-	
-  	/*!
-		@function DoesHBAPerformDeviceManagement
-		@abstract  Determine if HBA will manage devices.
-		@discussion This method is used to determine if the HBA will manage 
-		target device creation and destruction.  
-		@result return true means objects for target devices will only be 	
-		created when the child class calls the CreateTargetForID method.
-	*/
-	
-	virtual bool		DoesHBAPerformDeviceManagement ( void ) = 0;
-	
-	// ---- Initialize and Terminate methods for the subclass to implement -----
-	// The subclass shall not override the IOKit init and terminate methods,
-	// but shall instead rely on these methods for initialization and
-	// termination.
-	
-	// This is done to allow for this superclass to manage all IOKit specifics 
-	// and to require only a Family specific API to be implemented by the
-	// subclass drivers.
-	
-  	/*!
-		@function InitializeController
-		@abstract  Called to initialize the controller
-		@discussion It is guaranteed that the InitializeController() will only be 
-		called once per instantiation.  The InitializeController() methods allows 
-		the subclass driver to do all the necessary initialization required by 
-		the hardware before it is able to accept requests to execute. All 
-		necessary allocation of resources should be made during this method 
-		call. This is the first method that will be called in the subclass.
-		@result return true means that initialization was successful.
-	*/
-	
-	virtual bool	InitializeController ( void ) = 0;
-	
-  	/*!
-		@function TerminateController
-		@abstract  Called to terminate the controller
-		@discussion It is guaranteed that the TerminateController() will only be 
-		called once and only after the InitializeController() method and only if 
-		true was returned in response to the InitializeController() method.
-		The TerminateController() method allows the subclass to release all 
-		resources that were acquired for operation of the hardware and shutdown 
-		all hardware services.
-		This is the last method of the subclass that will be called before the 		
-		class is destroyed.
-	*/
-	
-	virtual void	TerminateController ( void ) = 0;
-	
-	// ---- Start and Stop methods for the subclass ----
-	
-	/*!
-		@function StartController
-		@abstract Called to start the controller
-		@discussion The StartController will always be called before any 
-		requests are sent to the driver for execution. This method is called 
-		after an initialize to start the services provided by the specific HBA 
-		driver or called after a StopController call to restart those services. 
-		After this call completes, all services provided by the HBA driver are 
-		available to the client.
-		@result return true means that start was successful.
-	*/
-	
-	virtual bool	StartController ( void ) = 0;
-	
-	/*!
-		@function StopController
-		@abstract Called to stop the controller
-		@discussion The StopController method will be called any time that the 
-		system wants the card to stop accepting requests. ( See StartController 
-		discussion ). The subclass should disable the hardware interrupt for
-		the particular controller (if possible) in this method.
-	*/
-	
-	virtual void	StopController ( void ) = 0;
-	
-	// ---- Suspend and Resume Methods for the subclass ----
-	
-	/*!
-		@function SuspendServices
-		@abstract Called to suspend controller services
-		@discussion Method will be called when the system wants to suspend the
-		services that are provided by the HBA driver. This call is not a reset
-		and the driver shall retain all state data between this so that if a
-		ResumeServices call is received, the driver can continue providing
-		services without a visible difference to the client. The driver may 
-		receive multiple SuspendServices calls without receiving a 
-		ResumeServices call and should ignore any after the first until a 
-		ResumeServices call is received.
-	*/
-	
-	virtual void	SuspendServices ( void );
-	
-	/*!
-		@function ResumeServices
-		@abstract Called to resume controller services
-		@discussion Method that will be called to resume services
-		provided by the driver. ( See SuspendServices discussion )
-	*/
-	
-	virtual void	ResumeServices ( void );
-	
-	/*!
-		@function HandleInterruptRequest
-		@abstract Handle Interrupt Request
-		@discussion The HandleInterruptRequest is used to notify an HBA 
-		specific subclass that an interrupt request needs to be serviced. It is 
-		called on the workloop (it holds the gate) at secondary interrupt level.
-	*/
-	
-	virtual void	HandleInterruptRequest ( void ) = 0;
-	
-	/*!
-		@function EnableInterrupt
-		@abstract Enable Interrupt
-		@discussion Method that the HBA child class can call to enable 
-		the associated IOInterruptEventSource.
-	*/
-	
-	void	EnableInterrupt ( void );
-	
-	/*!
-		@function DisableInterrupt
-		@abstract Disable Interrupt
-		@discussion Method that the HBA child class can call to disable 
-		the associated IOInterruptEventSource.
-	*/
-	
-	void	DisableInterrupt ( void );
-	
-	/*!
-		@function SignalInterrupt
-		@abstract Signals that an interrupt has occurred.
-		@discussion Subclasses of IOSCSIParallelInterfaceController
-		should call this method in order to get the secondary interrupt
-		thread scheduled if and only if they will be returning false from
-		their overriden FilterInterruptRequest() method. See the
-		discussion for the FilterInterruptRequest() method for more
-		details.
-		
-		NOTE: This method should only be called from within the
-		FilterInterruptRequest() method and at no other time.
-		
-		Available in 10.3.3 or later.
-		
-	*/
-	
-	void	SignalInterrupt ( void );
-	
-	/*!
-		@function ProcessParallelTask
-		@abstract Called by client to process a parallel task.
-		@discussion This method is called to process a parallel task (i.e. put
-		the command on the bus). The HBA specific sublcass must implement this 
-		method.
-		@param parallelRequest A valid SCSIParallelTaskIdentifier.
-		@result serviceResponse (see <IOKit/scsi/SCSITask.h>)
-	*/
-	
-	virtual SCSIServiceResponse ProcessParallelTask (
-							SCSIParallelTaskIdentifier parallelRequest ) = 0;
-	
-	/*!
-		@function CompleteParallelTask
-		@abstract Parallel Task Completion
-		@discussion The HBA specific sublcass inherits the CompleteParallelTask() 
-		method which shall be called when the HBA has completed the processing 
-		of a parallel task.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param completionStatus The status of the SCSI bus.
-		@param serviceResponse (see <IOKit/scsi/SCSITask.h>)
-	*/
-	
-	void	CompleteParallelTask (
-						SCSIParallelTaskIdentifier	parallelRequest,
-						SCSITaskStatus 				completionStatus,
-						SCSIServiceResponse 		serviceResponse );
-	
-	
-	// Completion routines for the SCSI Task Management functions as described
-	// in the SCSI ArchitectureModel - 2 (SAM-2) specification.  Each of these
-	// correspond to a client request for the specific Task Management functions.
-	// If the Controller Child Class completed the request by returning a 
-	// SCSIServiceResponse of anything other than kSCSIServiceResponse_Request_In_Process,
-	// then the controller class does not need to call the completion member routine.
-	// If the controller did not complete the request immediately, then it will
-	// need to call the appropriate completion member routine listed here.
-	void	CompleteAbortTask ( 	
-						SCSITargetIdentifier 		theT,
-						SCSILogicalUnitNumber		theL,
-						SCSITaggedTaskIdentifier	theQ,
-						SCSIServiceResponse 		serviceResponse );
-	
-	void 	CompleteAbortTaskSet (
-						SCSITargetIdentifier 		theT,
-						SCSILogicalUnitNumber		theL,
-						SCSIServiceResponse 		serviceResponse );
-	
-	void 	CompleteClearACA (
-						SCSITargetIdentifier 		theT,
-						SCSILogicalUnitNumber		theL,
-						SCSIServiceResponse 		serviceResponse );
-	
-	void 	CompleteClearTaskSet (
-						SCSITargetIdentifier 		theT,
-						SCSILogicalUnitNumber		theL,
-						SCSIServiceResponse 		serviceResponse );
-	
-	void 	CompleteLogicalUnitReset (
-						SCSITargetIdentifier 		theT,
-						SCSILogicalUnitNumber		theL,
-						SCSIServiceResponse 		serviceResponse );
-	
-	void 	CompleteTargetReset (
-						SCSITargetIdentifier 		theT,
-						SCSIServiceResponse 		serviceResponse );
-	
-	/*!
-		@function NotifyClientsOfBusReset
-		@abstract Method called to notify clients that a bus reset has occurred.
-		@discussion This method is used by the HBA child class to inform the 
-		parent class and any clients that a bus reset has occurred.
-	*/
-	
-	void	NotifyClientsOfBusReset ( void );
-	
-	/*!
-		@function NotifyClientsOfPortStatusChange
-		@abstract Method called to notify clients of port status change events.
-		@discussion This method is used by the HBA child class to inform the 
-		parent class and any clients that a port has changed status.
-	*/
-	
-	void	NotifyClientsOfPortStatusChange ( SCSIPortStatus newStatus );
-	
-	/*!
-		@function GetSCSIDomainIdentifier
-		@abstract Accessor method to get the SCSI Domain Identifier.
-		@discussion Accessor method to get the SCSI Domain Identifier.
-		@result returns SCSI Domain Identifier.
-	*/
-	
-	SInt32	GetSCSIDomainIdentifier ( void );
-	
-	/*!
-		@function GetProvider
-		@abstract Accessor method to get the IOService which is the controller's
-		provider.
-		@discussion Accessor method to get the IOService which is the 
-		controller's provider.
-		@result returns pointer to IOService.
-	*/
-	
-	IOService *		GetProvider ( void );
-	
-	/*!
-		@function GetWorkLoop
-		@abstract Accessor method to get the IOWorkLoop associated with this 
-		HBA.
-		@discussion Accessor method to get the IOWorkLoop associated with this 
-		HBA.
-		@result returns pointer to IOWorkLoop.
-	*/
-	
-	IOWorkLoop *	GetWorkLoop ( void ) const;
-	
-	/*!
-		@function GetCommandGate
-		@abstract Accessor to get an IOCommandGate associated with the workloop.
-		@discussion Accessor to get an IOCommandGate associated with the 
-		workloop.
-		@result returns pointer to IOCommandGate.
-	*/
-	
-	IOCommandGate *		GetCommandGate ( void );
-	
-	// ---- SCSI Parallel Task Object Accessors ----
-	
-	/*!
-		@function GetSCSITaskIdentifier
-		@abstract Method to retrieve a SCSITaskIdentifier from a valid 
-		SCSIParallelTaskIdentifier.
-		@discussion Method to retrieve a SCSITaskIdentifier from a valid 
-		SCSIParallelTaskIdentifier.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns SCSITaskIdentifier that represents the original request 
-		from the SCSI Application Layer client.
-	*/
-	
-	SCSITaskIdentifier	GetSCSITaskIdentifier ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetTargetIdentifier
-		@abstract Method to get the SCSITargetIdentifier associated with a 
-		request.
-		@discussion	Method to get the SCSITargetIdentifier associated with a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns SCSITargetIdentifier 
-	*/
-	
-	SCSITargetIdentifier	GetTargetIdentifier ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	// ---- Methods for Accessing data in the client's SCSI Task Object ----	
-	// Method to retrieve the LUN that identifies the Logical Unit whose Task
-	// Set to which this task is to be added.
-	
-	/*!
-		@function GetLogicalUnitNumber
-		@abstract Method to get the logical unit number associated with a 
-		request.
-		@discussion Method to get the logical unit number associated with a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns a valid 64-bit logical unit number.
-	*/
-	
-	SCSILogicalUnitNumber	GetLogicalUnitNumber ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetTaggedTaskIdentifier
-		@abstract Method to retrieve the SCSI Tagged Task Identifier of the 
-		task.  If the returned value is equal to kSCSIUntaggedTaskIdentifier,
-		then this task is untagged.  
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result an SCSITaskAttribute value.
-	*/
-	
-	SCSITaggedTaskIdentifier GetTaggedTaskIdentifier (
-							SCSIParallelTaskIdentifier	parallelTask );
-	
-	/*!
-		@function GetTaskAttribute
-		@abstract Method to retrieve the SCSI Task Attribute of the task 
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result an SCSITaskAttribute value.
-	*/
-	
-	SCSITaskAttribute		GetTaskAttribute (
-							SCSIParallelTaskIdentifier	parallelTask );
-	
-	/*!
-		@function GetCommandDescriptorBlockSize
-		@abstract Method to retrieve the size of the SCSI Command Descriptor 
-		Block (CDB).
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns the size of the SCSI Command Descriptor Block in bytes.
-	*/
-	
-	UInt8	GetCommandDescriptorBlockSize ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetCommandDescriptorBlock
-		@abstract Method to retrieve the SCSI Command Descriptor Block (CDB).
-		@discussion This will always return a 16 Byte CDB. If the Protocol Layer 
-		driver does not support 16 Byte CDBs, it will have to create a local 
-		SCSICommandDescriptorBlock variable to get the CDB data and then 
-		transfer the needed bytes from there.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param cdbData is a SCSICommandDescriptorBlock pointer to 16 byte CDB
-		@result returns true if data was copied to cdbData pointer
-	*/
-	
-	bool	GetCommandDescriptorBlock (
-							SCSIParallelTaskIdentifier 		parallelTask,
-							SCSICommandDescriptorBlock * 	cdbData );
-	
-	/*!
-		@function GetDataTransferDirection
-		@abstract Retrieves the data transfer direction for any data associated
-		with the request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result One of the valid data transfer directions described in 
-		<IOKit/scsi/SCSITask.h>
-	*/
-	
-	UInt8	GetDataTransferDirection ( SCSIParallelTaskIdentifier parallelTask );
-	
-	/*!
-		@function GetRequestedDataTransferCount
-		@abstract Retrieves the requested data transfer count for any data 
-		associated with the request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result The requested data transfer count in bytes.
-	*/
-	
-	UInt64	GetRequestedDataTransferCount ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetRealizedDataTransferCount
-		@abstract Retrieves the realized data transfer count for any data 
-		associated with the request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result The realized data transfer count in bytes.
-	*/
-	
-	UInt64	GetRealizedDataTransferCount (
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function SetRealizedDataTransferCount
-		@abstract Sets the realized data transfer count in bytes.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param realizedTransferCountInBytes is the number of bytes actually 
-		transferred.
-		@result true means the data transfer count was successfully set.
-	*/
-	
-	bool	SetRealizedDataTransferCount ( 
-							SCSIParallelTaskIdentifier 	parallelTask,
-							UInt64 		realizedTransferCountInBytes );
-	
-	/*!
-		@function IncrementRealizedDataTransferCount
-		@abstract Increments the realized data transfer count. This method is
-		helpful for when the HBA has to do multiple passes of DMA because there 
-		are more scatter-gather elements than it can process in one pass.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param realizedTransferCountInBytes is the number of bytes to add to the
-		realized data count for the task.
-	*/
-	
-	void	IncrementRealizedDataTransferCount (
-							SCSIParallelTaskIdentifier 	parallelTask,
-							UInt64 		realizedTransferCountInBytes );
-	
-	/*!
-		@function GetDataBuffer
-		@abstract Method to retrieve client buffer from the request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns pointer to an IOMemoryDescriptor which represents the 
-		buffer.
-	*/
-	
-	IOMemoryDescriptor * GetDataBuffer ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetDataBufferOffset
-		@abstract Method to retrieve offset into client buffer at which to start
-		processing.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns offset in bytes
-	*/
-	
-	UInt64	GetDataBufferOffset ( SCSIParallelTaskIdentifier parallelTask );
-
-	/*!
-		@function GetDMACommand
-		@abstract Method to retrieve a pointer to an IODMACommand from the request.
-		@discussion For devices utilizing DMA, the IODMACommand object should be 
-		obtained via GetDMACommand(). The subclass is responsible for calling prepare()
-		on the IODMACommand object using the proper offset obtained via GetDataBufferOffset()
-		and correct size obtained via GetRequestedDataTransferCount(). The subclass
-		is further responsible for calling complete() on the IODMACommand object once
-		all DMA operations have finished.
-		NB: Subclasses should not call IODMACommand::setMemoryDescriptor().
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns pointer to an IODMACommand which is used in conjunction
-		with the task.
-	*/
-	
-	IODMACommand * GetDMACommand ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetTimeoutDuration
-		@abstract Method to retrieve the timeout duration in milliseconds for a 
-		request.
-		@discussion Method to retrieve the timeout duration in milliseconds for
-		a request. A value of zero represents an infinite timeout, or on 
-		hardware where infinite timeouts are not possible, substitute the 
-		longest timeout possible.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns timeout duration in milliseconds
-	*/
-	
-	UInt32	GetTimeoutDuration ( SCSIParallelTaskIdentifier parallelTask );
-
-	/*!
-		@function SetAutoSenseData
-		@abstract Method to set the auto sense data buffer associated with a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param newSensedata pointer to auto sense data buffer
-		@result returns true if data in newSenseData was succesfully into the 
-		task object
-	*/
-	
-	bool	SetAutoSenseData ( 
-							SCSIParallelTaskIdentifier 	parallelTask,
-							SCSI_Sense_Data * 			newSenseData,
-							UInt8						senseDataSize );
-	
-	/*!
-		@function GetAutoSenseData
-		@abstract Method to retrieve auto sense data buffer associated with a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param receivingBuffer pointer to auto sense data buffer
-		@result returns true if successfully copied data into receivingBuffer
-	*/
-	
- 	bool	GetAutoSenseData ( 
- 							SCSIParallelTaskIdentifier 	parallelTask,
- 							SCSI_Sense_Data * 			receivingBuffer,
- 							UInt8						senseDataSize );
- 	
-	/*!
-		@function GetAutoSenseDataSize
-		@abstract Method to retrieve auto sense data buffer size associated with a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns Size of auto sense data buffer.
-	*/
-	
- 	UInt8	GetAutoSenseDataSize ( 
- 							SCSIParallelTaskIdentifier 	parallelTask );
- 	
-	
-	/*!
-		@function GetSCSIParallelFeatureNegotiation
-		@abstract Method to retrieve the requested value for negotiation of the.
-		@discussion Query as to whether the SCSI Parallel Device object has 
-		negotiated wide data transfers.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result A valid SCSIParallelFeatureControl.
-	*/
-	
-	SCSIParallelFeatureRequest		GetSCSIParallelFeatureNegotiation ( 
-							SCSIParallelTaskIdentifier 	parallelTask,
-							SCSIParallelFeature 		requestedFeature );
-	
-	/*!
-		@function GetSCSIParallelFeatureNegotiationCount
-		@abstract Method to retrieve the number of requested negotiations.
-		@discussion Query as to the number of SCSI Parallel Features that are
-		requested to either be negotitated or cleared.  These are all features
-		that are set to either kSCSIParallelFeature_AttemptNegotiation or 
-		kSCSIParallelFeature_ClearNegotiation.  If the return value is zero,
-		then all features are set to kSCSIParallelFeature_NoNegotiation
-		and all feature negotiations are to remain as they currently exist.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result an unsigned integer up to 64 bits in size.
-	*/
-	
-	UInt64		GetSCSIParallelFeatureNegotiationCount ( 
-							SCSIParallelTaskIdentifier 	parallelTask);
-	
-	/*!
-		@function SetSCSIParallelFeatureNegotiationResult
-		@abstract Method to set the wide data transfer negotiation result.
-		@discussion Method to set the wide data transfer negotiation result.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param requestedFeature The SCSIParallelFeature that the has been set to 	
-		newResult.
-		@param newResult A valid SCSIParallelFeatureResult value.
-	*/
-	
-	void		SetSCSIParallelFeatureNegotiationResult ( 
-							SCSIParallelTaskIdentifier 	parallelTask,
-							SCSIParallelFeature 		requestedFeature, 
-							SCSIParallelFeatureResult 	newResult );
-	
-	/*!
-		@function GetSCSIParallelFeatureNegotiationResult
-		@abstract Method to retrieve the result of any wide transfer 
-		negotiations.
-		@discussion Query as to whether the SCSI Parallel Controller object has 
-		negotiated wide data transfers.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result A valid SCSIParallelFeatureResult.
-	*/
-	
-	SCSIParallelFeatureResult		GetSCSIParallelFeatureNegotiationResult ( 
-							SCSIParallelTaskIdentifier 	parallelTask,
-							SCSIParallelFeature 		requestedFeature );
-	
-	/*!
-		@function GetSCSIParallelFeatureNegotiationResultCount
-		@abstract Method to retrieve the number of changed negotiations.
-		@discussion Query as to the number of SCSI Parallel Features that have
-		been changed to either negotitated or cleared.  These are all features
-		that are set to either kSCSIParallelFeature_NegotitiationCleared or 
-		kSCSIParallelFeature_NegotitiationSuccess.  If the return value is zero,
-		then all features are set to kSCSIParallelFeature_NegotitiationUnchanged.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result an unsigned integer up to 64 bits in size.
-	*/
-	
-	UInt64		GetSCSIParallelFeatureNegotiationResultCount ( 
-							SCSIParallelTaskIdentifier 	parallelTask);
-	
-	// Controller Task Identifier related member routines
-	
-	/*!
-		@function SetControllerTaskIdentifier
-		@abstract Method to set the Controller Task Identifier.
-		@discussion This method allows the Controller Child Class
-		driver to set a unique identifier to associate with the specified
-		SCSI Parallel Task.  This identifier is designed to be used by
-		controllers that do not have access to the LUN and Tag information
-		when notified by the HBA that a request has completed.
-		If the kSCSIParallelTaskControllerIDQueueHead is used, this
-		member routine will return the first Task on the queue.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param newIdentifier unsigned 64 bit integer token.
-		@result none
-	*/
-	
-	void	SetControllerTaskIdentifier (
-							SCSIParallelTaskIdentifier 	parallelTask,
-							UInt64 						newIdentifier );
-	
-	UInt64	GetControllerTaskIdentifier (
-							SCSIParallelTaskIdentifier 	parallelTask);
-	
-	
-	// The HBA Data related fields
-	
-	/*!
-		@function GetHBADataSize
-		@abstract Method to retrieve the HBA Data Size in bytes.
-		@discussion Method to retrieve the HBA Data Size in bytes.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns HBA Data size in bytes.
-	*/
-	
-	UInt32	GetHBADataSize ( SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetHBADataPointer
-		@abstract Method to retrieve the HBA Data pointer.
-		@discussion Method to retrieve the HBA Data pointer.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns pointer to buffer for HBA specific data, NULL if 
-		none found or GetHBADataSize() returns zero.
-	*/
-	
-	void *	GetHBADataPointer ( SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetHBADataDescriptor
-		@abstract Method to retrieve the IOMemoryDescriptor associated with
-		the HBA Data.
-		@discussion Method to retrieve the IOMemoryDescriptor associated with
-		the HBA Data.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns pointer to an IOMemoryDescriptor that wraps the HBA 
-		specific data buffer, NULL if none found or GetHBADataSize() returns zero.
-	*/
-	
-	IOMemoryDescriptor *	GetHBADataDescriptor (
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	// ---- SCSI Parallel Device Object Accessors ----
-	
-	// The HBA Data related fields
-	
-	/*!
-		@function GetHBATargetDataSize
-		@abstract Method to retrieve the HBA Data Size in bytes.
-		@discussion Method to retrieve the HBA Data Size in bytes.
-		@param targetDevice A valid SCSITargetIdentifier.
-		@result returns HBA Data size in bytes.
-	*/
-	
-	UInt32	GetHBATargetDataSize ( SCSITargetIdentifier 	targetID );
-	
-	/*!
-		@function GetHBATargetDataPointer
-		@abstract Method to retrieve the HBA Data pointer.
-		@discussion Method to retrieve the HBA Data pointer.
-		@param targetDevice A valid SCSITargetIdentifier.
-		@result returns pointer to buffer for HBA specific data, NULL if 
-		none found or GetHBADataSize is zero.
-	*/
-	
-	void *	GetHBATargetDataPointer ( SCSITargetIdentifier 	targetID );
-	
-	
-#if 0
-#pragma mark -
-#pragma mark Additional Child Class APIs
-#endif
-	
-	
-	// ---- Timeout Related Methods ----
-	
-	/*!
-		@function SetTimeoutForTask
-		@abstract Method to set the timeout duration in milliseconds for a 
-		request.
-		@discussion Method to set the timeout duration in milliseconds for a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param timeoutOverride A timeout value in milliseconds in case the
-		HBA driver wishes to override the default value provided in the
-		parallelTask.
-	*/
-	
-	void	SetTimeoutForTask ( SCSIParallelTaskIdentifier 	parallelTask,
-								UInt32						timeoutOverride = 0 );
-	
-	/*!
-		@function HandleTimeout
-		@abstract Method to handle command timeouts.
-		@discussion Method to handle command timeouts. This should
-		be overridden by the child class in order to clean up HBA
-		specific structures after a timeout has occurred. This method
-		is called on the workloop (it holds the gate).
-		@param parallelRequest A valid SCSIParallelTaskIdentifier.
-	*/
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 9 );
-	
-	virtual void		HandleTimeout (
-							SCSIParallelTaskIdentifier parallelRequest );
-	
-	
-	// ---- Filter Interrupt ----
-	
-	/*!
-		@function FilterInterruptRequest
-		@abstract Filter method called at primary interrupt time.
-		@discussion Filter method called at primary interrupt time.
-		This should only be overridden by the child class in order
-		to determine if an interrupt occurred for this controller instance.
-		Since all work occurs at primary interrupt time, this routine
-		should be quick and efficient and defer as much processing as
-		possible to the HandleInterruptRequest() method.
-		
-		NOTE: Unlike the HandleInterruptRequest() and HandleTimeout()
-		methods, FilterInterruptRequest() is NOT called with the
-		workloop lock held.
-		
-		If the value returned by FilterInterruptRequest() is true, the
-		secondary interrupt thread will be scheduled and the hardware
-		interrupt line will be disabled. If the controller instance shares
-		that interrupt line with other devices, it can cause large
-		interrupt latencies. If the controller instance can disable the
-		interrupt in the chip itself, the following can be done to reduce
-		interrupt latencies:
-		
-		- Interrupt occurs
-		- FilterInterruptRequest() method is called.
-			- If the interrupt is not for this controller, return false
-			  immediately.
-			- If the interrupt is for this controller, and the controller
-			  can disable interrupts for this chip, the controller should
-			  disable the interrupts for this chip, call SignalInterrupt(),
-			  and return false. This causes the secondary interrupt thread
-			  to get scheduled, yet does not disable the interrupt line for
-			  all devices tied to that interrupt. This effectively allows
-			  other devices to process their interrrupts, thus reducing
-			  interrupt latency for those devices.
-		- HandleInterruptRequest() method is called.
-			- Controller processes interrupt and completes I/O requests.
-			- Controller re-enables interrupts for the device.
-		
-		NOTE: If you use this approach, the interrupting condition MUST be
-		cleared from the hardware, otherwise an infinite process interrupt
-		loop will occur.
-		
-		If the controller cannot disable interrupts on the chip, it should
-		simply return true if an interrupt has occurred for its device.
-		
-		@result True if the hardware interrupt line should be disabled,
-		otherwise false.
-	*/
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 10 );
-	
-	virtual bool		FilterInterruptRequest ( void );
-	
-	/*!
-		@function InitializeDMASpecification
-		@abstract Called to initialize an IODMACommand with a DMA specification.
-		@param command A pointer to a valid IODMACommand object. Subclasses
-		should override this method and call IODMACommand::initWithSpecification()
-		supplying the proper arguments to that method based on the DMA strategy.
-		@result boolean value indicating success or failure.
-	*/
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 11 );
-	
-	virtual bool	InitializeDMASpecification ( IODMACommand * command );
-	
-	/*!
-		@function CreateDeviceInterrupt
-		@abstract Called to create an IOInterruptEventSource for the device. Subclasses
-		may wish to use a different interrupt index than 0 (e.g. for using PCI Message
-		Signaled Interrupts) or might not need an interrupt at all (virtual HBA).
-		@param action A pointer to the action routine that should be passed to either
-		IOInterruptEventSource::interruptEventSource() or
-		IOFilterInterruptEventSource::filterInterruptEventSource as the method to call
-		when an interrupt occurs for the device (sometimes called the "deferred procedure call"
-		or the "secondary context method". By passing this routine along, it will
-		properly wire up the HandleInterruptRequest() method you should override to handle
-		interrupts.
-		@param filter A pointer to the filter routine that should be passed to
-		IOFilterInterruptEventSource::filterInterruptEventSource as the method to call
-		at primary interrupt time when an interrupt occurs for the device.
-		By passing this routine along, it will properly wire up the
-		FilterInterruptRequest() method you may override to handle primary interrupts.
-		@result IOInterruptEventSource. May return NULL if and only if there is no
-		hardware interrupt associated with this device.
-	*/
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 12 );
-	
-	virtual IOInterruptEventSource *	CreateDeviceInterrupt (
-											IOInterruptEventSource::Action			action,
-											IOFilterInterruptEventSource::Filter	filter,
-											IOService *								provider );
-	
-	// Padding for the Child Class API
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 16 );
-	
-	
-#if 0
-#pragma mark -
-#pragma mark Internal Use Only
-#endif
-	
-private:
-	
-	// binary compatibility instance variable expansion
-	struct ExpansionData { };
-	ExpansionData * fIOSCSIParallelInterfaceControllerExpansionData;
-	
-	IOService *					fProvider;
-	OSSet *						fClients;
-	
-	static SInt32				fSCSIParallelDomainCount;
-	SInt32						fSCSIDomainIdentifier;
-	
-	// The HBA attributes
-	SCSIInitiatorIdentifier		fInitiatorIdentifier;
-	
-	// The maximum SCSI Device Identifier support by the HBA
-	// This is retreived from the child class via the 
-	SCSIDeviceIdentifier		fHighestSupportedDeviceID;
-	
-	// The total number of tasks that the HBA can proccess at a time.
-	// This is retrieved from the child class via ReportMaximumTaskCount
-	UInt32						fSupportedTaskCount;
-	
-	// The Number of requests that are currently outstanding for the current
-	// instantiation.
-	UInt16						fOutstandingRequests;
-	
-	// The member variable to indicate if the current instantiation has been
-	// succesfully intialized.
-	bool						fHBAHasBeenInitialized;
-	
-	// The member variable to indicate if the current instantiation is running.
-	// A true means that the last or only Start call made was successful.  A
-	// false value means that either a successful Start has not been made or a
-	// Stop call has been made.
-	bool						fHBACanAcceptClientRequests;
-	
-	// The pool for the available SCSI Parallel Task objects
-	IOCommandPool *				fParallelTaskPool;
-	
-	// WorkLoop variables
-	IOWorkLoop *				fWorkLoop;
-	IOTimerEventSource *		fTimerEvent;
-	IOInterruptEventSource *	fDispatchEvent;
-	
-	IOCommandGate *				fControllerGate;
-	
-	bool						AllocateSCSIParallelTasks ( void );
-	void						DeallocateSCSIParallelTasks ( void );
-	
-	IOWorkLoop *				getWorkLoop ( void ) const;
-	bool 						CreateWorkLoop ( IOService * provider );
-	void 						ReleaseWorkLoop ( void );
-	
-	// SCSI Parallel Device List
-	// The SCSI Parallel Device List will consist of 16 elements to represent 
-	// identifiers that end in 0h through Fh.  Each array element will point
-	// to a device object that represents the beginning of a linked list of
-	// device objects.  By using an array of linked lists, the traversal time
-	// to find an object on a bus that supports a large number of devices, such
-	// as Fibre Channel, will be significantly lower than having to walk a list 
-	// that is comprised of all devices on the bus.  For parallel wide and 
-	// narrow busses, which support 16 and 8 devices respectively, this will act 
-	// like a simple array of device objects.
-	enum
-	{
-		kSCSIParallelDeviceListArrayCount 	= 16,
-		kSCSIParallelDeviceListIndexMask	= 0x0F
-	};
-	
-	IOSimpleLock * 					fDeviceLock;
-	IOSCSIParallelInterfaceDevice *	
-					fParallelDeviceList[kSCSIParallelDeviceListArrayCount];
-	
-	void			InitializeDeviceList ( void );
-	void			AddDeviceToTargetList ( 
-							IOSCSIParallelInterfaceDevice *	newDevice );
-	void			RemoveDeviceFromTargetList ( 
-							IOSCSIParallelInterfaceDevice * victimDevice );
-	
-	// The Interrupt Service Routine for the controller.
-	static void		ServiceInterrupt (
-							OSObject *					theObject, 
-							IOInterruptEventSource *	theSource,
-							int							count );
-	
-	static void		TimeoutOccurred ( OSObject * owner, IOTimerEventSource * sender );
-	
-	static bool		FilterInterrupt (
-							OSObject *						theObject,
-							IOFilterInterruptEventSource *	theSource );
-	
-	// IOService support methods
-	// These shall not be overridden by the HBA child classes.
-	bool			start ( IOService * 				provider );
-	void			stop ( 	IOService *  				provider );
-
-
-protected:
-	
-	// These may be overriden by the HBA child classes if necessary, but should
-	// call the superclass implementation.
-	virtual bool	handleOpen ( 
-							IOService * 				client, 
-							IOOptionBits 				options, 
-							void * 						arg );
-
-	virtual void	handleClose ( 
-							IOService * 				client, 
-							IOOptionBits 				options );
-
-	virtual bool	handleIsOpen ( 
-							const IOService * 			client ) const;
-	
-	virtual bool	willTerminate ( IOService * provider, IOOptionBits options );
-	virtual bool	didTerminate ( IOService * provider, IOOptionBits options, bool * defer );
-	
-};
-
-
-#endif	/* __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__ */
\ No newline at end of file
diff --git a/i386/include/IOKit/scsi/spi/IOSCSIParallelInterfaceController.h b/i386/include/IOKit/scsi/spi/IOSCSIParallelInterfaceController.h
deleted file mode 100644
index 0bd7981..0000000
--- a/i386/include/IOKit/scsi/spi/IOSCSIParallelInterfaceController.h
+++ /dev/null
@@ -1,1568 +0,0 @@
-/*
- * Copyright (c) 2002-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__
-#define __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__
-
-
- /*!
-  @header IOSCSIParallelInterfaceController
-	The IOSCSIParallelInterfaceController class and the associated HBA child
-	class is responsible for the management of all related hardware. This
-	includes the onboard HBA controller chip and the physical state of the
-	bus. These classes are not responsible for any of the management of
-	the SCSI Devices on the bus with the exception of maintaining the queue that 
-	holds the objects representing those SCSI Devices.
-*/
-
-
-//-----------------------------------------------------------------------------
-//	Includes
-//-----------------------------------------------------------------------------
-
-// General IOKit includes
-#include <IOKit/IOService.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IODMACommand.h>
-#include <IOKit/IOInterruptEventSource.h>
-#include <IOKit/IOFilterInterruptEventSource.h>
-#include <IOKit/IOTimerEventSource.h>
-#include <IOKit/IOCommandPool.h>
-
-// IOKit SCSI ArchitectureModel Family includes
-#include <IOKit/scsi/SCSITask.h>
-#include <IOKit/scsi/SCSICmds_REQUEST_SENSE_Defs.h>
-#include <IOKit/scsi/SCSIPort.h>
-
-//-----------------------------------------------------------------------------
-//	Constants
-//-----------------------------------------------------------------------------
-
-
-#define kIOPropertySCSIDeviceFeaturesKey			"SCSI Device Features"
-#define kIOPropertySCSI_I_T_NexusFeaturesKey		"SCSI I_T Nexus Features"
-
-// This is the alignment mask used when allocating per-task HBA data. It allows
-// the HBA to declare whether or not it supports 64-bit addressability and what the
-// minimum byte alignment is for the data. E.g. By specifying 0x0000FFFFFFFFFFFEULL,
-// the controller would be indicating that it supports 48-bits of addressability, but
-// at a minimum of being 2-byte aligned.
-#define kIOMinimumHBADataAlignmentMaskKey			"HBA Data Alignment"
-
-// The Feature Selectors used to identify features of the SCSI Parallel
-// Interface.  These are used by the DoesHBASupportSCSIParallelFeature
-// to report whether the HBA supports a given SCSI Parallel Interface
-// feature and are used for requesting negotiation and reporting negotiation
-// results between the controller and the device.
-
-// When the DoesHBASupportSCSIParallelFeature() member routine of the controller 
-// child class is called, it will return true if the HBA that it controls 
-// supports the specified SCSIParallelFeature or false if it does not.
-typedef enum SCSIParallelFeature
-{
-	// The selector for support of Wide Data Transfers.  Only Wide16 is supported 
-	// as Wide32 has been obsoleted by the SPI-3 specification.
-	kSCSIParallelFeature_WideDataTransfer 					= 0,
-	
-	// The selector for support of Synchronous Data Transfers.
-	kSCSIParallelFeature_SynchronousDataTransfer 			= 1,
-	
-	// The selector for support of Quick Arbitration and Selection (QAS).
-	kSCSIParallelFeature_QuickArbitrationAndSelection 		= 2,
-	
-	// The selector for support of Double Transition (DT) data transfers.
-	kSCSIParallelFeature_DoubleTransitionDataTransfers 		= 3,
-	
-	// The selector for SPI Information Unit (IU) transfers.
-	kSCSIParallelFeature_InformationUnitTransfers 			= 4,
-	
-	// Since the Feature selectors are zero base, this will always have the 
-	// correct total.
-	kSCSIParallelFeature_TotalFeatureCount	
-} SCSIParallelFeature;
-
-
-typedef enum SCSIParallelFeatureRequest
-{
-	// This selector indicates that current negotiation 
-	// should be used. 
-	kSCSIParallelFeature_NoNegotiation 			= 0,
-	
-	// This selector indicates that the controller
-	// should attempt negotiation for the feature
-	kSCSIParallelFeature_AttemptNegotiation 	= 1,
-	
-	// This selector indicates that the controller
-	// should clear any negotiation for the feature
-	kSCSIParallelFeature_ClearNegotiation 		= 2
-};
-	
-typedef enum SCSIParallelFeatureResult
-{
-	kSCSIParallelFeature_NegotitiationUnchanged	= 0,
-	kSCSIParallelFeature_NegotitiationCleared	= 1,
-	kSCSIParallelFeature_NegotitiationSuccess	= 2
-};
-
-
-// The SCSI Message Codes used for MESSAGE IN and MESSAGE OUT phases.
-enum SCSIParallelMessages
-{
-	// Link Control Messages
-	kSCSIParallelMessage_TASK_COMPLETE						= 0x00,
-	kSCSIParallelMessage_EXTENDED_MESSAGE					= 0x01,
-	kSCSIParallelMessage_SAVE_DATA_POINTER	 				= 0x02,
-	kSCSIParallelMessage_RESTORE_POINTERS					= 0x03,
-	kSCSIParallelMessage_DISCONNECT							= 0x04,
-	kSCSIParallelMessage_INITIATOR_DETECTED_ERROR 			= 0x05,
-	kSCSIParallelMessage_MESSAGE_REJECT		 				= 0x07,
-	kSCSIParallelMessage_NO_OPERATION		 				= 0x08,
-	kSCSIParallelMessage_MESSAGE_PARITY_ERROR 				= 0x09,
-	kSCSIParallelMessage_IGNORE_WIDE_RESIDUE				= 0x23,
-	kSCSIParallelMessage_QAS_REQUEST		 				= 0x55,
-	kSCSIParallelMessage_IDENTIFY							= 0x80,
-	
-	// The Message Codes used in the EXTENDED_MESSAGE message.
-	kSCSIParallelMessage_MODIFY_DATA_POINTER				= 0x00,
-	kSCSIParallelMessage_SYNCHONOUS_DATA_TRANSFER_REQUEST	= 0x01,
-	// Reserved												= 0x02
-	kSCSIParallelMessage_WIDE_DATA_TRANSFER_REQUEST			= 0x03,
-	kSCSIParallelMessage_PARALLEL_PROTOCOL_REQUEST			= 0x04,
-	// Reserved												= 0x05 through 0xFF
-	
-	// Task Attribute Message Codes
-	kSCSIParallelMessage_ACA								= 0x24,
-	kSCSIParallelMessage_HEAD_OF_QUEUE						= 0x21,
-	kSCSIParallelMessage_LINKED_COMMAND_COMPLETE			= 0x0A,
-	kSCSIParallelMessage_ORDERED							= 0x22,
-	kSCSIParallelMessage_SIMPLE								= 0x20,
-	
-	// Task Management Message Codes
-	kSCSIParallelMessage_ABORT_TASK							= 0x0D,
-	kSCSIParallelMessage_ABORT_TASK_SET						= 0x06,
-	kSCSIParallelMessage_CLEAR_ACA							= 0x16,
-	kSCSIParallelMessage_CLEAR_TASK_SET						= 0x0E,
-	kSCSIParallelMessage_LOGICAL_UNIT_RESET					= 0x17,
-	kSCSIParallelMessage_TARGET_RESET						= 0x0C
-};
-
-enum
-{
-	kSCSIParallelTaskControllerIDQueueHead 		= 0
-};
-
-// Notifications
-enum
-{
-	kSCSIControllerNotificationBusReset			= 0x68000000
-};
-
-// Forward declaration for the internally used Parallel Device object.
-class IOSCSIParallelInterfaceDevice;
-
-// This is the identifier that is used to specify a given parallel Task.
-typedef OSObject *	SCSIParallelTaskIdentifier;
-
-
-//-----------------------------------------------------------------------------
-//	Class Declarations
-//-----------------------------------------------------------------------------
-
-/*! @class IOSCSIParallelInterfaceController
-	@abstract Class that represents a SCSI Host Bus Adapter.
-	@discussion Class that represents a SCSI Host Bus Adapter.
-*/
-class IOSCSIParallelInterfaceController : public IOService
-{
-	
-	OSDeclareAbstractStructors ( IOSCSIParallelInterfaceController )
-	
-#if 0
-#pragma mark -
-#pragma mark Client API
-#endif
-	
-	
-public:
-	
-	/*!
-		@function GetSCSIParallelTask
-		@abstract Method to allow the client to get a SCSIParallelTask
-		@discussion Get a SCSIParallelTask from the controller so that a request
-		can be issued to the HBA driver.
-		@param blockForCommand If the blockForCommand parameter is set to false
-		and there are no free SCSIParallelTasks, this method will return NULL, 
-		otherwise it will wait for one to become available before returning.
-		@result If there is a SCSI Parallel Task available, a reference to it 
-		will be returned.
-	*/
-	
-	SCSIParallelTaskIdentifier	GetSCSIParallelTask ( bool blockForCommand );
-	
-	/*!
-		@function FreeSCSIParallelTask
-		@abstract Method to allow the client to release a SCSIParallelTask
-		@discussion	The FreeSCSIParallelTask method is called by the client when 
-		a SCSIParallelTask has been completed and the associated returnTask
-		needs to be returned to the pool.
-		@param returnTask is a reference to the SCSIParallelTaskIdentifier to be 
-		returned.
-	*/
-	
-	void FreeSCSIParallelTask ( SCSIParallelTaskIdentifier returnTask );
-	
-	/*!
-		@function FindTaskForAddress
-		@abstract Find a task for a given Task Address, if one exists.
-		@discussion If a valid Tagged Task Identifier is specified, this method 
-		will return the task specified by the Tagged Task Address if one is 
-		found, or else NULL will be returned.  If zero is used as the Tagged 
-		Task Identifier, then this routine will search for an outstanding task 
-		based on the Untagged Task Address and return the task or else, if one 
-		is not found, return NULL.
-		@param theT is the Target component of the I_T_L or I_T_L_Q nexus.
-		@param theL is the Logical Unit component of the I_T_L or I_T_L_Q nexus.
-		@param theQ is the Queue Tag component of the I_T_L_Q nexus.  If this is
-		an I_T_L nexus, then the kSCSIUntaggedTaskIdentifier constant should be
-		used for theQ.
-		@result returns a valid SCSIParallelTaskIdentifier or NULL if none 
-		found.
-	*/
-	
-	SCSIParallelTaskIdentifier	FindTaskForAddress ( 
-							SCSIDeviceIdentifier 		theT,
-							SCSILogicalUnitNumber		theL,
-							SCSITaggedTaskIdentifier	theQ );
-	
-	
-	/*!
-		@function FindTaskForControllerIdentifier
-		@abstract Find a task for a given Target and Controller Task Identifier
-		@discussion Allows the controller child class to find an outstanding task
-		for a specified target and controller task identifier
-		@param theTarget is the Target that the task .
-		@param theIdentifier is the controller task identifier set using the SCSI
-		Parallel Task's SetControllerTaskIdentifier() method.
-		@result returns a valid SCSIParallelTaskIdentifier or NULL if none 
-		found.
-	*/
-	
-	SCSIParallelTaskIdentifier	FindTaskForControllerIdentifier ( 
-							SCSIDeviceIdentifier 		theTarget,
-							UInt64						theIdentifier );
-	
-	
-	/*!
-		@function ExecuteParallelTask
-		@abstract Submit a SCSIParallelTask for execution.
-		@discussion	The ExecuteParallelTask call is made by the client to submit 
-		a SCSIParallelTask for execution.
-		@param parallelRequest is a reference to the SCSIParallelTaskIdentifier
-		to be executed.
-		@result is an appropriate SCSIServiceResponse which are defined in the
-		file <IOKit/scsi/SCSITask.h>.
-	*/
-	
-	SCSIServiceResponse ExecuteParallelTask ( 
-							SCSIParallelTaskIdentifier	parallelRequest );
-	
-	// --- Public API methods provided by HBA child classes ----
-	
-	/*!
-		@function ReportHBAHighestLogicalUnitNumber
-		@abstract Gets the Highest Logical Unit Number.
-		@discussion	This method is used to query the HBA child class to 
-		determine what the highest Logical Unit Number that the controller can 
-		address.
-		@result returns a valid 64-bit logical unit number.
-	*/
-	
-	virtual SCSILogicalUnitNumber	ReportHBAHighestLogicalUnitNumber ( void ) = 0;
-	
-	/*!
-		@function DoesHBASupportSCSIParallelFeature
-		@abstract Queries the HBA child class to determine if it supports a 
-		specific SPI feature.
-		@discussion	Queries the HBA child class to determine if it supports the 
-		specified feature as defined by the SCSI Parallel Interconnect 
-		specifications.
-		@result Returns true if requested feature is supported.
-	*/
-	
-	virtual bool	DoesHBASupportSCSIParallelFeature ( 
-							SCSIParallelFeature 		theFeature ) = 0;
-	
-	/*!
-		@function InitializeTargetForID
-		@abstract Called to initialize a target device.
-		@discussion	This method will be called to initialize a target device in 
-		a single-threaded manner.  The HBA can use this method to probe the 
-		target or do anything else necessary before the device object is 
-		registered with IOKit for matching.
-		@result Returns true if the target was successfully initialized.
-	*/
-	
-	virtual bool	InitializeTargetForID (  
-							SCSITargetIdentifier 		targetID ) = 0;
-	
-	// The SCSI Task Management Functions as defined in the SCSI Architecture
-	// Model - 2 (SAM-2) specification.  These are used by the client to request
-	// the specified function.  The controller can complete these immmediately 
-	// by returning the appropriate SCSIServiceResponse, or these can be completed
-	// asyncronously by the controller returning a SCSIServiceResponse of
-	// kSCSIServiceResponse_Request_In_Process and then calling the appropriate
-	// function complete member routine listed in the child class API section.
-	
-	virtual SCSIServiceResponse	AbortTaskRequest ( 	
-							SCSITargetIdentifier 		theT,
-							SCSILogicalUnitNumber		theL,
-							SCSITaggedTaskIdentifier	theQ ) = 0;
-	
-	virtual	SCSIServiceResponse AbortTaskSetRequest (
-							SCSITargetIdentifier 		theT,
-							SCSILogicalUnitNumber		theL ) = 0;
-	
-	virtual	SCSIServiceResponse ClearACARequest (
-							SCSITargetIdentifier 		theT,
-							SCSILogicalUnitNumber		theL ) = 0;
-	
-	virtual	SCSIServiceResponse ClearTaskSetRequest (
-							SCSITargetIdentifier 		theT,
-							SCSILogicalUnitNumber		theL ) = 0;
-	
-	virtual	SCSIServiceResponse LogicalUnitResetRequest (
-							SCSITargetIdentifier 		theT,
-							SCSILogicalUnitNumber		theL ) = 0;
-	
-	virtual	SCSIServiceResponse TargetResetRequest (
-							SCSITargetIdentifier 		theT ) = 0;
-	
-	
-
-	/*!
-		@function DoesHBAPerformAutoSense
-		@abstract Queries the HBA child class to determine if it automatically
-		performs AutoSense and provides AutoSense data for each I/O. If the HBA
-		allocates space for AutoSense in its HBA specific data region on a per
-		task basis, the HBA should respond true.
-		@discussion	Queries the HBA child class to determine if it automatically
-		performs AutoSense and provides AutoSense data for each I/O. If the HBA
-		allocates space for AutoSense in its HBA specific data region on a per
-		task basis, the HBA should respond true.
-		@result Return true if HBA performs AutoSense into its own private data
-		buffer.
-	*/
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 1 );
-	
-	virtual bool	DoesHBAPerformAutoSense ( void );
-	
-	/*!
-		@function ReportHBAConstraints
-		@abstract Called to report the I/O constraints for this controller.
-		A list of valid keys includes:
-			kIOMaximumSegmentCountReadKey, (required)
-			kIOMaximumSegmentCountWriteKey, (required)
-			kIOMaximumSegmentByteCountReadKey, (required)
-			kIOMaximumSegmentByteCountWriteKey, (required)
-			kIOMinimumSegmentAlignmentByteCountKey, (required)
-			kIOMaximumSegmentAddressableBitCountKey, (required)
-			kIOMinimumHBADataAlignmentMaskKey (required).
-		NB: These keys and their values are described in this header and <IOKit/IOKitKeys.h>
-		@param constraints. An OSDictionary object used to aggregate the key/value pairs.
-		Subclasses must set the required keys if they override this method. If a subclass does
-		not provide the required keys, the system will panic.
-	*/
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 2 );
-	
-	virtual void	ReportHBAConstraints ( OSDictionary * constraints );
-	
-	// Padding for the Client API
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 3 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 4 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 5 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 6 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 7 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 8 );
-	
-	
-#if 0
-#pragma mark -
-#pragma mark Child Class API
-#endif
-	
-	
-protected:
-	
-	// ---- Target Creation and Destruction methods ---
-	
-	/*!
-		@function CreateTargetForID
-		@abstract Method to perform device creation.
-		@discussion	For HBA child classes that report true to the 
-		DoesHBAPerformDeviceManagement() method, the child class will be 
-		responsible for all device management by using these methods;
-		otherwise, the superclass will be responsible for all device management.
-		This method must be used to perform SCSI Parallel Device creation and 
-		cannot be overridden.
-		@param  targetID SCSIDeviceIdentifier of desired targetID.
-		@result returns true if successful.
-	*/
-	
-	bool	CreateTargetForID ( SCSIDeviceIdentifier targetID );
-	
-	 /*!
-		@function CreateTargetForID
-		@abstract Method to perform device creation.
-		@discussion	For HBA child classes that report true to the
-		DoesHBAPerformDeviceManagement() method, the child class will be
-		responsible for all device management by using these methods;
-		otherwise, the superclass will be responsible for all device management.
-		This method must be used to perform SCSI Parallel Device creation and
-		cannot be overridden.
-		@param  targetID SCSIDeviceIdentifier of desired targetID.
-		@param	properties A dictionary of properties to associate with the device
-				upon creation. The list of valid property keys is as follows:
-				kIOPropertySASAddressKey,
-				kIOPropertyFibreChannelNodeWorldWideNameKey,
-				kIOPropertyFibreChannelPortWorldWideNameKey,
-				kIOPropertyFibreChannelAddressIdentifierKey, and
-				kIOPropertyFibreChannelALPAKey.
-				These keys are defined in
-				<IOKit/storage/IOStorageProtocolCharacteristics.h> and the values
-				associated with these keys must be of the proper type/size,
-				or the target creation will not succeed.
-		@result returns true if successful.
-	*/
-	
-	bool	CreateTargetForID ( SCSIDeviceIdentifier 	targetID,
-								OSDictionary * 			properties );
-	
-	 /*!
-		@function DestroyTargetForID
-		@abstract Method to perform device destruction.
-		@discussion	For HBA child classes that report true to the 
-		DoesHBAPerformDeviceManagement() method, the child class will be 
-		responsible for all device management by using these methods; otherwise, 
-		the superclass will be responsible for all device management.
-		This method must be used to perform SCSI Parallel Device destruction and
-		cannot be overridden.
-		@param  targetID SCSIDeviceIdentifier of desired targetID.
-	*/
-	
-	void	DestroyTargetForID ( SCSIDeviceIdentifier targetID );
-	
-	/*!
-		@function GetTargetForID
-		@abstract Accessor for getting pointer to IOSCSIParallelInterfaceDevice.
-		@param targetID SCSIDeviceIdentifier of desired targetID.
-		@result returns pointer to IOSCSIParallelInterfaceDevice or NULL if not 
-		found.
-	*/
-	
-	IOSCSIParallelInterfaceDevice *	GetTargetForID ( 
-							SCSIDeviceIdentifier 		targetID ); 
-	
-	/*!
-		@function SetTargetProperty
-		@abstract Accessor for setting a property for a specific target.
-		@param device A pointer to a valid IOSCSIParallelInterfaceDevice.
-		@param key A pointer to a valid OSString object which represents the key.
-		A list of valid keys includes:
-			kIOPropertySASAddressKey,
-			kIOPropertyFibreChannelNodeWorldWideNameKey,
-			kIOPropertyFibreChannelPortWorldWideNameKey,
-			kIOPropertyFibreChannelAddressIdentifierKey, and
-			kIOPropertyFibreChannelALPAKey.
-		NB: These keys and their values are described in <IOKit/storage/IOStorageProtocolCharacteristics.h>
-		@param value Pointer to an OSObject (one of type OSData, OSString, etc.)
-		which represents the value for the property. The value must be of the proper type
-		and size for the specified key.
-		@result returns true if identifier was properly set, otherwise false. 
-	*/
-	
-	bool	SetTargetProperty ( SCSIDeviceIdentifier 		targetID,
-								const char *		 		key,
-								OSObject *					value );
-
-	/*!
-		@function RemoveTargetProperty
-		@abstract Accessor for removing a property from a specific target.
-		@param device A pointer to a valid IOSCSIParallelInterfaceDevice.
-		@param key A pointer to a valid OSString object which represents the key.
-	*/
-	
-	void	RemoveTargetProperty ( SCSIDeviceIdentifier 		targetID,
-								   const char *		 			key );
-	
-	// ---- Methods for HBA specifics. ----
-	
-	/*!
-		@function SetHBAProperty
-		@abstract Accessor for setting a property for this object.
-		@param key A pointer to a valid OSString object which represents the key.
-		A list of valid keys includes:
-			kIOPropertyVendorNameKey,
-			kIOPropertyProductNameKey,
-			kIOPropertyProductRevisionLevelKey,
-			kIOPropertyPortDescriptionKey,
-			kIOPropertyPortSpeedKey,
-			kIOPropertyPortTopologyKey,
-			kIOPropertySCSIParallelSignalingTypeKey,
-			kIOPropertyFibreChannelCableDescriptionKey,
-			kIOPropertyFibreChannelNodeWorldWideNameKey,
-			kIOPropertyFibreChannelPortWorldWideNameKey,
-			kIOPropertyFibreChannelAddressIdentifierKey, and
-			kIOPropertyFibreChannelALPAKey.
-		NB: These keys and their values are described in <IOKit/storage/IOStorageDeviceCharacteristics.h>
-		and <IOKit/storage/IOStorageProtocolCharacteristics.h>
-		@param value Pointer to an OSObject (one of type OSData, OSString, etc.)
-		which represents the value for the property. The value must be of the proper type,
-		and/or size for the specified key.
-		@result returns true if identifier was properly set, otherwise false. 
-	*/
-	
-	bool	SetHBAProperty ( const char *	key,
-							 OSObject *	 	value );
-
-	/*!
-		@function RemoveHBAProperty
-		@abstract Accessor for removing a property for this object.
-		@param key A pointer to a valid OSString object which represents the key.
-		See the SetHBAProperty() method for a list of valid keys.
-	*/
-	
-	void	RemoveHBAProperty ( const char * key );
-	
-	// These methods will not be called before the InitializeController() call,
-	// and will not be called after the TerminateController() call.  But in the
-	// interval between those calls, they shall report the correct requested
-	// information. They are implemented as seperate pure virtual methods
-	// instead of a selector driven method because the HBA child class is
-	// required to report this information.
-	
-	/*!
-		@function ReportInitiatorIdentifier
-		@abstract Get the SCSI Device Identifier for the HBA.
-		@discussion This method will be called to determine the SCSI Device 
-		Identifier that the Initiator has assigned for this HBA.
-		@result returns SCSIInitiatorIdentifier.
-	*/
-	
-	virtual SCSIInitiatorIdentifier	ReportInitiatorIdentifier ( void ) = 0;
-	
-	/*!
-		@function ReportHighestSupportedDeviceID
-		@abstract Get the highest supported SCSI Device Identifier.
-		@discussion This method will be called to determine the value of the 
-		highest SCSI Device Identifier supported by the HBA. This value will be 
-		used to determine the last ID to process.
-		@result returns highest SCSIDeviceIdentifier
-	*/
-	
-	virtual SCSIDeviceIdentifier	ReportHighestSupportedDeviceID ( void ) = 0;
-	
-	/*!
-		@function ReportMaximumTaskCount
-		@abstract Report Maximum Task Count
-		@discussion This method will be called to retrieve the maximum number of
-		outstanding tasks the HBA can process. This number must be greater than
-		zero or the controller driver will fail to match and load.
-		@result returns maximum (non-zero) task count.
-	*/
-	
-	virtual UInt32		ReportMaximumTaskCount ( void ) = 0;
-	
-  	/*!
-		@function ReportHBASpecificTaskDataSize
-		@abstract Determine memory needed for HBA Task specific use.
-		@discussion This method is used to retrieve the amount of memory that 
-		will be allocated in the SCSI Parallel Task for HBA specific use.
-		@result returns memory required in bytes
-	*/
-	
-	virtual UInt32		ReportHBASpecificTaskDataSize ( void ) = 0;
-	
-  	/*!
-		@function ReportHBASpecificDeviceDataSize
-		@abstract  Determine memory needed for HBA Device specific use.
-		@discussion This method is used to retrieve the amount of memory that 
-		will be allocated in the SCSI Parallel Device for HBA specific use.
-		@result  returns memory required in bytes
-	*/
-	
-	virtual UInt32		ReportHBASpecificDeviceDataSize ( void ) = 0;
-	
-  	/*!
-		@function DoesHBAPerformDeviceManagement
-		@abstract  Determine if HBA will manage devices.
-		@discussion This method is used to determine if the HBA will manage 
-		target device creation and destruction.  
-		@result return true means objects for target devices will only be 	
-		created when the child class calls the CreateTargetForID method.
-	*/
-	
-	virtual bool		DoesHBAPerformDeviceManagement ( void ) = 0;
-	
-	// ---- Initialize and Terminate methods for the subclass to implement -----
-	// The subclass shall not override the IOKit init and terminate methods,
-	// but shall instead rely on these methods for initialization and
-	// termination.
-	
-	// This is done to allow for this superclass to manage all IOKit specifics 
-	// and to require only a Family specific API to be implemented by the
-	// subclass drivers.
-	
-  	/*!
-		@function InitializeController
-		@abstract  Called to initialize the controller
-		@discussion It is guaranteed that the InitializeController() will only be 
-		called once per instantiation.  The InitializeController() methods allows 
-		the subclass driver to do all the necessary initialization required by 
-		the hardware before it is able to accept requests to execute. All 
-		necessary allocation of resources should be made during this method 
-		call. This is the first method that will be called in the subclass.
-		@result return true means that initialization was successful.
-	*/
-	
-	virtual bool	InitializeController ( void ) = 0;
-	
-  	/*!
-		@function TerminateController
-		@abstract  Called to terminate the controller
-		@discussion It is guaranteed that the TerminateController() will only be 
-		called once and only after the InitializeController() method and only if 
-		true was returned in response to the InitializeController() method.
-		The TerminateController() method allows the subclass to release all 
-		resources that were acquired for operation of the hardware and shutdown 
-		all hardware services.
-		This is the last method of the subclass that will be called before the 		
-		class is destroyed.
-	*/
-	
-	virtual void	TerminateController ( void ) = 0;
-	
-	// ---- Start and Stop methods for the subclass ----
-	
-	/*!
-		@function StartController
-		@abstract Called to start the controller
-		@discussion The StartController will always be called before any 
-		requests are sent to the driver for execution. This method is called 
-		after an initialize to start the services provided by the specific HBA 
-		driver or called after a StopController call to restart those services. 
-		After this call completes, all services provided by the HBA driver are 
-		available to the client.
-		@result return true means that start was successful.
-	*/
-	
-	virtual bool	StartController ( void ) = 0;
-	
-	/*!
-		@function StopController
-		@abstract Called to stop the controller
-		@discussion The StopController method will be called any time that the 
-		system wants the card to stop accepting requests. ( See StartController 
-		discussion ). The subclass should disable the hardware interrupt for
-		the particular controller (if possible) in this method.
-	*/
-	
-	virtual void	StopController ( void ) = 0;
-	
-	// ---- Suspend and Resume Methods for the subclass ----
-	
-	/*!
-		@function SuspendServices
-		@abstract Called to suspend controller services
-		@discussion Method will be called when the system wants to suspend the
-		services that are provided by the HBA driver. This call is not a reset
-		and the driver shall retain all state data between this so that if a
-		ResumeServices call is received, the driver can continue providing
-		services without a visible difference to the client. The driver may 
-		receive multiple SuspendServices calls without receiving a 
-		ResumeServices call and should ignore any after the first until a 
-		ResumeServices call is received.
-	*/
-	
-	virtual void	SuspendServices ( void );
-	
-	/*!
-		@function ResumeServices
-		@abstract Called to resume controller services
-		@discussion Method that will be called to resume services
-		provided by the driver. ( See SuspendServices discussion )
-	*/
-	
-	virtual void	ResumeServices ( void );
-	
-	/*!
-		@function HandleInterruptRequest
-		@abstract Handle Interrupt Request
-		@discussion The HandleInterruptRequest is used to notify an HBA 
-		specific subclass that an interrupt request needs to be serviced. It is 
-		called on the workloop (it holds the gate) at secondary interrupt level.
-	*/
-	
-	virtual void	HandleInterruptRequest ( void ) = 0;
-	
-	/*!
-		@function EnableInterrupt
-		@abstract Enable Interrupt
-		@discussion Method that the HBA child class can call to enable 
-		the associated IOInterruptEventSource.
-	*/
-	
-	void	EnableInterrupt ( void );
-	
-	/*!
-		@function DisableInterrupt
-		@abstract Disable Interrupt
-		@discussion Method that the HBA child class can call to disable 
-		the associated IOInterruptEventSource.
-	*/
-	
-	void	DisableInterrupt ( void );
-	
-	/*!
-		@function SignalInterrupt
-		@abstract Signals that an interrupt has occurred.
-		@discussion Subclasses of IOSCSIParallelInterfaceController
-		should call this method in order to get the secondary interrupt
-		thread scheduled if and only if they will be returning false from
-		their overriden FilterInterruptRequest() method. See the
-		discussion for the FilterInterruptRequest() method for more
-		details.
-		
-		NOTE: This method should only be called from within the
-		FilterInterruptRequest() method and at no other time.
-		
-		Available in 10.3.3 or later.
-		
-	*/
-	
-	void	SignalInterrupt ( void );
-	
-	/*!
-		@function ProcessParallelTask
-		@abstract Called by client to process a parallel task.
-		@discussion This method is called to process a parallel task (i.e. put
-		the command on the bus). The HBA specific sublcass must implement this 
-		method.
-		@param parallelRequest A valid SCSIParallelTaskIdentifier.
-		@result serviceResponse (see <IOKit/scsi/SCSITask.h>)
-	*/
-	
-	virtual SCSIServiceResponse ProcessParallelTask (
-							SCSIParallelTaskIdentifier parallelRequest ) = 0;
-	
-	/*!
-		@function CompleteParallelTask
-		@abstract Parallel Task Completion
-		@discussion The HBA specific sublcass inherits the CompleteParallelTask() 
-		method which shall be called when the HBA has completed the processing 
-		of a parallel task.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param completionStatus The status of the SCSI bus.
-		@param serviceResponse (see <IOKit/scsi/SCSITask.h>)
-	*/
-	
-	void	CompleteParallelTask (
-						SCSIParallelTaskIdentifier	parallelRequest,
-						SCSITaskStatus 				completionStatus,
-						SCSIServiceResponse 		serviceResponse );
-	
-	
-	// Completion routines for the SCSI Task Management functions as described
-	// in the SCSI ArchitectureModel - 2 (SAM-2) specification.  Each of these
-	// correspond to a client request for the specific Task Management functions.
-	// If the Controller Child Class completed the request by returning a 
-	// SCSIServiceResponse of anything other than kSCSIServiceResponse_Request_In_Process,
-	// then the controller class does not need to call the completion member routine.
-	// If the controller did not complete the request immediately, then it will
-	// need to call the appropriate completion member routine listed here.
-	void	CompleteAbortTask ( 	
-						SCSITargetIdentifier 		theT,
-						SCSILogicalUnitNumber		theL,
-						SCSITaggedTaskIdentifier	theQ,
-						SCSIServiceResponse 		serviceResponse );
-	
-	void 	CompleteAbortTaskSet (
-						SCSITargetIdentifier 		theT,
-						SCSILogicalUnitNumber		theL,
-						SCSIServiceResponse 		serviceResponse );
-	
-	void 	CompleteClearACA (
-						SCSITargetIdentifier 		theT,
-						SCSILogicalUnitNumber		theL,
-						SCSIServiceResponse 		serviceResponse );
-	
-	void 	CompleteClearTaskSet (
-						SCSITargetIdentifier 		theT,
-						SCSILogicalUnitNumber		theL,
-						SCSIServiceResponse 		serviceResponse );
-	
-	void 	CompleteLogicalUnitReset (
-						SCSITargetIdentifier 		theT,
-						SCSILogicalUnitNumber		theL,
-						SCSIServiceResponse 		serviceResponse );
-	
-	void 	CompleteTargetReset (
-						SCSITargetIdentifier 		theT,
-						SCSIServiceResponse 		serviceResponse );
-	
-	/*!
-		@function NotifyClientsOfBusReset
-		@abstract Method called to notify clients that a bus reset has occurred.
-		@discussion This method is used by the HBA child class to inform the 
-		parent class and any clients that a bus reset has occurred.
-	*/
-	
-	void	NotifyClientsOfBusReset ( void );
-	
-	/*!
-		@function NotifyClientsOfPortStatusChange
-		@abstract Method called to notify clients of port status change events.
-		@discussion This method is used by the HBA child class to inform the 
-		parent class and any clients that a port has changed status.
-	*/
-	
-	void	NotifyClientsOfPortStatusChange ( SCSIPortStatus newStatus );
-	
-	/*!
-		@function GetSCSIDomainIdentifier
-		@abstract Accessor method to get the SCSI Domain Identifier.
-		@discussion Accessor method to get the SCSI Domain Identifier.
-		@result returns SCSI Domain Identifier.
-	*/
-	
-	SInt32	GetSCSIDomainIdentifier ( void );
-	
-	/*!
-		@function GetProvider
-		@abstract Accessor method to get the IOService which is the controller's
-		provider.
-		@discussion Accessor method to get the IOService which is the 
-		controller's provider.
-		@result returns pointer to IOService.
-	*/
-	
-	IOService *		GetProvider ( void );
-	
-	/*!
-		@function GetWorkLoop
-		@abstract Accessor method to get the IOWorkLoop associated with this 
-		HBA.
-		@discussion Accessor method to get the IOWorkLoop associated with this 
-		HBA.
-		@result returns pointer to IOWorkLoop.
-	*/
-	
-	IOWorkLoop *	GetWorkLoop ( void ) const;
-	
-	/*!
-		@function GetCommandGate
-		@abstract Accessor to get an IOCommandGate associated with the workloop.
-		@discussion Accessor to get an IOCommandGate associated with the 
-		workloop.
-		@result returns pointer to IOCommandGate.
-	*/
-	
-	IOCommandGate *		GetCommandGate ( void );
-	
-	// ---- SCSI Parallel Task Object Accessors ----
-	
-	/*!
-		@function GetSCSITaskIdentifier
-		@abstract Method to retrieve a SCSITaskIdentifier from a valid 
-		SCSIParallelTaskIdentifier.
-		@discussion Method to retrieve a SCSITaskIdentifier from a valid 
-		SCSIParallelTaskIdentifier.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns SCSITaskIdentifier that represents the original request 
-		from the SCSI Application Layer client.
-	*/
-	
-	SCSITaskIdentifier	GetSCSITaskIdentifier ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetTargetIdentifier
-		@abstract Method to get the SCSITargetIdentifier associated with a 
-		request.
-		@discussion	Method to get the SCSITargetIdentifier associated with a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns SCSITargetIdentifier 
-	*/
-	
-	SCSITargetIdentifier	GetTargetIdentifier ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	// ---- Methods for Accessing data in the client's SCSI Task Object ----	
-	// Method to retrieve the LUN that identifies the Logical Unit whose Task
-	// Set to which this task is to be added.
-	
-	/*!
-		@function GetLogicalUnitNumber
-		@abstract Method to get the logical unit number associated with a 
-		request.
-		@discussion Method to get the logical unit number associated with a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns a valid 64-bit logical unit number.
-	*/
-	
-	SCSILogicalUnitNumber	GetLogicalUnitNumber ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetTaggedTaskIdentifier
-		@abstract Method to retrieve the SCSI Tagged Task Identifier of the 
-		task.  If the returned value is equal to kSCSIUntaggedTaskIdentifier,
-		then this task is untagged.  
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result an SCSITaskAttribute value.
-	*/
-	
-	SCSITaggedTaskIdentifier GetTaggedTaskIdentifier (
-							SCSIParallelTaskIdentifier	parallelTask );
-	
-	/*!
-		@function GetTaskAttribute
-		@abstract Method to retrieve the SCSI Task Attribute of the task 
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result an SCSITaskAttribute value.
-	*/
-	
-	SCSITaskAttribute		GetTaskAttribute (
-							SCSIParallelTaskIdentifier	parallelTask );
-	
-	/*!
-		@function GetCommandDescriptorBlockSize
-		@abstract Method to retrieve the size of the SCSI Command Descriptor 
-		Block (CDB).
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns the size of the SCSI Command Descriptor Block in bytes.
-	*/
-	
-	UInt8	GetCommandDescriptorBlockSize ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetCommandDescriptorBlock
-		@abstract Method to retrieve the SCSI Command Descriptor Block (CDB).
-		@discussion This will always return a 16 Byte CDB. If the Protocol Layer 
-		driver does not support 16 Byte CDBs, it will have to create a local 
-		SCSICommandDescriptorBlock variable to get the CDB data and then 
-		transfer the needed bytes from there.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param cdbData is a SCSICommandDescriptorBlock pointer to 16 byte CDB
-		@result returns true if data was copied to cdbData pointer
-	*/
-	
-	bool	GetCommandDescriptorBlock (
-							SCSIParallelTaskIdentifier 		parallelTask,
-							SCSICommandDescriptorBlock * 	cdbData );
-	
-	/*!
-		@function GetDataTransferDirection
-		@abstract Retrieves the data transfer direction for any data associated
-		with the request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result One of the valid data transfer directions described in 
-		<IOKit/scsi/SCSITask.h>
-	*/
-	
-	UInt8	GetDataTransferDirection ( SCSIParallelTaskIdentifier parallelTask );
-	
-	/*!
-		@function GetRequestedDataTransferCount
-		@abstract Retrieves the requested data transfer count for any data 
-		associated with the request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result The requested data transfer count in bytes.
-	*/
-	
-	UInt64	GetRequestedDataTransferCount ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetRealizedDataTransferCount
-		@abstract Retrieves the realized data transfer count for any data 
-		associated with the request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result The realized data transfer count in bytes.
-	*/
-	
-	UInt64	GetRealizedDataTransferCount (
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function SetRealizedDataTransferCount
-		@abstract Sets the realized data transfer count in bytes.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param realizedTransferCountInBytes is the number of bytes actually 
-		transferred.
-		@result true means the data transfer count was successfully set.
-	*/
-	
-	bool	SetRealizedDataTransferCount ( 
-							SCSIParallelTaskIdentifier 	parallelTask,
-							UInt64 		realizedTransferCountInBytes );
-	
-	/*!
-		@function IncrementRealizedDataTransferCount
-		@abstract Increments the realized data transfer count. This method is
-		helpful for when the HBA has to do multiple passes of DMA because there 
-		are more scatter-gather elements than it can process in one pass.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param realizedTransferCountInBytes is the number of bytes to add to the
-		realized data count for the task.
-	*/
-	
-	void	IncrementRealizedDataTransferCount (
-							SCSIParallelTaskIdentifier 	parallelTask,
-							UInt64 		realizedTransferCountInBytes );
-	
-	/*!
-		@function GetDataBuffer
-		@abstract Method to retrieve client buffer from the request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns pointer to an IOMemoryDescriptor which represents the 
-		buffer.
-	*/
-	
-	IOMemoryDescriptor * GetDataBuffer ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetDataBufferOffset
-		@abstract Method to retrieve offset into client buffer at which to start
-		processing.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns offset in bytes
-	*/
-	
-	UInt64	GetDataBufferOffset ( SCSIParallelTaskIdentifier parallelTask );
-
-	/*!
-		@function GetDMACommand
-		@abstract Method to retrieve a pointer to an IODMACommand from the request.
-		@discussion For devices utilizing DMA, the IODMACommand object should be 
-		obtained via GetDMACommand(). The subclass is responsible for calling prepare()
-		on the IODMACommand object using the proper offset obtained via GetDataBufferOffset()
-		and correct size obtained via GetRequestedDataTransferCount(). The subclass
-		is further responsible for calling complete() on the IODMACommand object once
-		all DMA operations have finished.
-		NB: Subclasses should not call IODMACommand::setMemoryDescriptor().
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns pointer to an IODMACommand which is used in conjunction
-		with the task.
-	*/
-	
-	IODMACommand * GetDMACommand ( 
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetTimeoutDuration
-		@abstract Method to retrieve the timeout duration in milliseconds for a 
-		request.
-		@discussion Method to retrieve the timeout duration in milliseconds for
-		a request. A value of zero represents an infinite timeout, or on 
-		hardware where infinite timeouts are not possible, substitute the 
-		longest timeout possible.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns timeout duration in milliseconds
-	*/
-	
-	UInt32	GetTimeoutDuration ( SCSIParallelTaskIdentifier parallelTask );
-
-	/*!
-		@function SetAutoSenseData
-		@abstract Method to set the auto sense data buffer associated with a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param newSensedata pointer to auto sense data buffer
-		@result returns true if data in newSenseData was succesfully into the 
-		task object
-	*/
-	
-	bool	SetAutoSenseData ( 
-							SCSIParallelTaskIdentifier 	parallelTask,
-							SCSI_Sense_Data * 			newSenseData,
-							UInt8						senseDataSize );
-	
-	/*!
-		@function GetAutoSenseData
-		@abstract Method to retrieve auto sense data buffer associated with a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param receivingBuffer pointer to auto sense data buffer
-		@result returns true if successfully copied data into receivingBuffer
-	*/
-	
- 	bool	GetAutoSenseData ( 
- 							SCSIParallelTaskIdentifier 	parallelTask,
- 							SCSI_Sense_Data * 			receivingBuffer,
- 							UInt8						senseDataSize );
- 	
-	/*!
-		@function GetAutoSenseDataSize
-		@abstract Method to retrieve auto sense data buffer size associated with a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns Size of auto sense data buffer.
-	*/
-	
- 	UInt8	GetAutoSenseDataSize ( 
- 							SCSIParallelTaskIdentifier 	parallelTask );
- 	
-	
-	/*!
-		@function GetSCSIParallelFeatureNegotiation
-		@abstract Method to retrieve the requested value for negotiation of the.
-		@discussion Query as to whether the SCSI Parallel Device object has 
-		negotiated wide data transfers.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result A valid SCSIParallelFeatureControl.
-	*/
-	
-	SCSIParallelFeatureRequest		GetSCSIParallelFeatureNegotiation ( 
-							SCSIParallelTaskIdentifier 	parallelTask,
-							SCSIParallelFeature 		requestedFeature );
-	
-	/*!
-		@function GetSCSIParallelFeatureNegotiationCount
-		@abstract Method to retrieve the number of requested negotiations.
-		@discussion Query as to the number of SCSI Parallel Features that are
-		requested to either be negotitated or cleared.  These are all features
-		that are set to either kSCSIParallelFeature_AttemptNegotiation or 
-		kSCSIParallelFeature_ClearNegotiation.  If the return value is zero,
-		then all features are set to kSCSIParallelFeature_NoNegotiation
-		and all feature negotiations are to remain as they currently exist.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result an unsigned integer up to 64 bits in size.
-	*/
-	
-	UInt64		GetSCSIParallelFeatureNegotiationCount ( 
-							SCSIParallelTaskIdentifier 	parallelTask);
-	
-	/*!
-		@function SetSCSIParallelFeatureNegotiationResult
-		@abstract Method to set the wide data transfer negotiation result.
-		@discussion Method to set the wide data transfer negotiation result.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param requestedFeature The SCSIParallelFeature that the has been set to 	
-		newResult.
-		@param newResult A valid SCSIParallelFeatureResult value.
-	*/
-	
-	void		SetSCSIParallelFeatureNegotiationResult ( 
-							SCSIParallelTaskIdentifier 	parallelTask,
-							SCSIParallelFeature 		requestedFeature, 
-							SCSIParallelFeatureResult 	newResult );
-	
-	/*!
-		@function GetSCSIParallelFeatureNegotiationResult
-		@abstract Method to retrieve the result of any wide transfer 
-		negotiations.
-		@discussion Query as to whether the SCSI Parallel Controller object has 
-		negotiated wide data transfers.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result A valid SCSIParallelFeatureResult.
-	*/
-	
-	SCSIParallelFeatureResult		GetSCSIParallelFeatureNegotiationResult ( 
-							SCSIParallelTaskIdentifier 	parallelTask,
-							SCSIParallelFeature 		requestedFeature );
-	
-	/*!
-		@function GetSCSIParallelFeatureNegotiationResultCount
-		@abstract Method to retrieve the number of changed negotiations.
-		@discussion Query as to the number of SCSI Parallel Features that have
-		been changed to either negotitated or cleared.  These are all features
-		that are set to either kSCSIParallelFeature_NegotitiationCleared or 
-		kSCSIParallelFeature_NegotitiationSuccess.  If the return value is zero,
-		then all features are set to kSCSIParallelFeature_NegotitiationUnchanged.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result an unsigned integer up to 64 bits in size.
-	*/
-	
-	UInt64		GetSCSIParallelFeatureNegotiationResultCount ( 
-							SCSIParallelTaskIdentifier 	parallelTask);
-	
-	// Controller Task Identifier related member routines
-	
-	/*!
-		@function SetControllerTaskIdentifier
-		@abstract Method to set the Controller Task Identifier.
-		@discussion This method allows the Controller Child Class
-		driver to set a unique identifier to associate with the specified
-		SCSI Parallel Task.  This identifier is designed to be used by
-		controllers that do not have access to the LUN and Tag information
-		when notified by the HBA that a request has completed.
-		If the kSCSIParallelTaskControllerIDQueueHead is used, this
-		member routine will return the first Task on the queue.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param newIdentifier unsigned 64 bit integer token.
-		@result none
-	*/
-	
-	void	SetControllerTaskIdentifier (
-							SCSIParallelTaskIdentifier 	parallelTask,
-							UInt64 						newIdentifier );
-	
-	UInt64	GetControllerTaskIdentifier (
-							SCSIParallelTaskIdentifier 	parallelTask);
-	
-	
-	// The HBA Data related fields
-	
-	/*!
-		@function GetHBADataSize
-		@abstract Method to retrieve the HBA Data Size in bytes.
-		@discussion Method to retrieve the HBA Data Size in bytes.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns HBA Data size in bytes.
-	*/
-	
-	UInt32	GetHBADataSize ( SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetHBADataPointer
-		@abstract Method to retrieve the HBA Data pointer.
-		@discussion Method to retrieve the HBA Data pointer.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns pointer to buffer for HBA specific data, NULL if 
-		none found or GetHBADataSize() returns zero.
-	*/
-	
-	void *	GetHBADataPointer ( SCSIParallelTaskIdentifier 	parallelTask );
-	
-	/*!
-		@function GetHBADataDescriptor
-		@abstract Method to retrieve the IOMemoryDescriptor associated with
-		the HBA Data.
-		@discussion Method to retrieve the IOMemoryDescriptor associated with
-		the HBA Data.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@result returns pointer to an IOMemoryDescriptor that wraps the HBA 
-		specific data buffer, NULL if none found or GetHBADataSize() returns zero.
-	*/
-	
-	IOMemoryDescriptor *	GetHBADataDescriptor (
-							SCSIParallelTaskIdentifier 	parallelTask );
-	
-	// ---- SCSI Parallel Device Object Accessors ----
-	
-	// The HBA Data related fields
-	
-	/*!
-		@function GetHBATargetDataSize
-		@abstract Method to retrieve the HBA Data Size in bytes.
-		@discussion Method to retrieve the HBA Data Size in bytes.
-		@param targetDevice A valid SCSITargetIdentifier.
-		@result returns HBA Data size in bytes.
-	*/
-	
-	UInt32	GetHBATargetDataSize ( SCSITargetIdentifier 	targetID );
-	
-	/*!
-		@function GetHBATargetDataPointer
-		@abstract Method to retrieve the HBA Data pointer.
-		@discussion Method to retrieve the HBA Data pointer.
-		@param targetDevice A valid SCSITargetIdentifier.
-		@result returns pointer to buffer for HBA specific data, NULL if 
-		none found or GetHBADataSize is zero.
-	*/
-	
-	void *	GetHBATargetDataPointer ( SCSITargetIdentifier 	targetID );
-	
-	
-#if 0
-#pragma mark -
-#pragma mark Additional Child Class APIs
-#endif
-	
-	
-	// ---- Timeout Related Methods ----
-	
-	/*!
-		@function SetTimeoutForTask
-		@abstract Method to set the timeout duration in milliseconds for a 
-		request.
-		@discussion Method to set the timeout duration in milliseconds for a 
-		request.
-		@param parallelTask A valid SCSIParallelTaskIdentifier.
-		@param timeoutOverride A timeout value in milliseconds in case the
-		HBA driver wishes to override the default value provided in the
-		parallelTask.
-	*/
-	
-	void	SetTimeoutForTask ( SCSIParallelTaskIdentifier 	parallelTask,
-								UInt32						timeoutOverride = 0 );
-	
-	/*!
-		@function HandleTimeout
-		@abstract Method to handle command timeouts.
-		@discussion Method to handle command timeouts. This should
-		be overridden by the child class in order to clean up HBA
-		specific structures after a timeout has occurred. This method
-		is called on the workloop (it holds the gate).
-		@param parallelRequest A valid SCSIParallelTaskIdentifier.
-	*/
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 9 );
-	
-	virtual void		HandleTimeout (
-							SCSIParallelTaskIdentifier parallelRequest );
-	
-	
-	// ---- Filter Interrupt ----
-	
-	/*!
-		@function FilterInterruptRequest
-		@abstract Filter method called at primary interrupt time.
-		@discussion Filter method called at primary interrupt time.
-		This should only be overridden by the child class in order
-		to determine if an interrupt occurred for this controller instance.
-		Since all work occurs at primary interrupt time, this routine
-		should be quick and efficient and defer as much processing as
-		possible to the HandleInterruptRequest() method.
-		
-		NOTE: Unlike the HandleInterruptRequest() and HandleTimeout()
-		methods, FilterInterruptRequest() is NOT called with the
-		workloop lock held.
-		
-		If the value returned by FilterInterruptRequest() is true, the
-		secondary interrupt thread will be scheduled and the hardware
-		interrupt line will be disabled. If the controller instance shares
-		that interrupt line with other devices, it can cause large
-		interrupt latencies. If the controller instance can disable the
-		interrupt in the chip itself, the following can be done to reduce
-		interrupt latencies:
-		
-		- Interrupt occurs
-		- FilterInterruptRequest() method is called.
-			- If the interrupt is not for this controller, return false
-			  immediately.
-			- If the interrupt is for this controller, and the controller
-			  can disable interrupts for this chip, the controller should
-			  disable the interrupts for this chip, call SignalInterrupt(),
-			  and return false. This causes the secondary interrupt thread
-			  to get scheduled, yet does not disable the interrupt line for
-			  all devices tied to that interrupt. This effectively allows
-			  other devices to process their interrrupts, thus reducing
-			  interrupt latency for those devices.
-		- HandleInterruptRequest() method is called.
-			- Controller processes interrupt and completes I/O requests.
-			- Controller re-enables interrupts for the device.
-		
-		NOTE: If you use this approach, the interrupting condition MUST be
-		cleared from the hardware, otherwise an infinite process interrupt
-		loop will occur.
-		
-		If the controller cannot disable interrupts on the chip, it should
-		simply return true if an interrupt has occurred for its device.
-		
-		@result True if the hardware interrupt line should be disabled,
-		otherwise false.
-	*/
-	
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 10 );
-	
-	virtual bool		FilterInterruptRequest ( void );
-	
-	/*!
-		@function InitializeDMASpecification
-		@abstract Called to initialize an IODMACommand with a DMA specification.
-		@param command A pointer to a valid IODMACommand object. Subclasses
-		should override this method and call IODMACommand::initWithSpecification()
-		supplying the proper arguments to that method based on the DMA strategy.
-		@result boolean value indicating success or failure.
-	*/
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 11 );
-	
-	virtual bool	InitializeDMASpecification ( IODMACommand * command );
-	
-	/*!
-		@function CreateDeviceInterrupt
-		@abstract Called to create an IOInterruptEventSource for the device. Subclasses
-		may wish to use a different interrupt index than 0 (e.g. for using PCI Message
-		Signaled Interrupts) or might not need an interrupt at all (virtual HBA).
-		@param action A pointer to the action routine that should be passed to either
-		IOInterruptEventSource::interruptEventSource() or
-		IOFilterInterruptEventSource::filterInterruptEventSource as the method to call
-		when an interrupt occurs for the device (sometimes called the "deferred procedure call"
-		or the "secondary context method". By passing this routine along, it will
-		properly wire up the HandleInterruptRequest() method you should override to handle
-		interrupts.
-		@param filter A pointer to the filter routine that should be passed to
-		IOFilterInterruptEventSource::filterInterruptEventSource as the method to call
-		at primary interrupt time when an interrupt occurs for the device.
-		By passing this routine along, it will properly wire up the
-		FilterInterruptRequest() method you may override to handle primary interrupts.
-		@result IOInterruptEventSource. May return NULL if and only if there is no
-		hardware interrupt associated with this device.
-	*/
-	OSMetaClassDeclareReservedUsed ( IOSCSIParallelInterfaceController, 12 );
-	
-	virtual IOInterruptEventSource *	CreateDeviceInterrupt (
-											IOInterruptEventSource::Action			action,
-											IOFilterInterruptEventSource::Filter	filter,
-											IOService *								provider );
-	
-	// Padding for the Child Class API
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 13 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 14 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 15 );
-	OSMetaClassDeclareReservedUnused ( IOSCSIParallelInterfaceController, 16 );
-	
-	
-#if 0
-#pragma mark -
-#pragma mark Internal Use Only
-#endif
-	
-private:
-	
-	// binary compatibility instance variable expansion
-	struct ExpansionData { };
-	ExpansionData * fIOSCSIParallelInterfaceControllerExpansionData;
-	
-	IOService *					fProvider;
-	OSSet *						fClients;
-	
-	static SInt32				fSCSIParallelDomainCount;
-	SInt32						fSCSIDomainIdentifier;
-	
-	// The HBA attributes
-	SCSIInitiatorIdentifier		fInitiatorIdentifier;
-	
-	// The maximum SCSI Device Identifier support by the HBA
-	// This is retreived from the child class via the 
-	SCSIDeviceIdentifier		fHighestSupportedDeviceID;
-	
-	// The total number of tasks that the HBA can proccess at a time.
-	// This is retrieved from the child class via ReportMaximumTaskCount
-	UInt32						fSupportedTaskCount;
-	
-	// The Number of requests that are currently outstanding for the current
-	// instantiation.
-	UInt16						fOutstandingRequests;
-	
-	// The member variable to indicate if the current instantiation has been
-	// succesfully intialized.
-	bool						fHBAHasBeenInitialized;
-	
-	// The member variable to indicate if the current instantiation is running.
-	// A true means that the last or only Start call made was successful.  A
-	// false value means that either a successful Start has not been made or a
-	// Stop call has been made.
-	bool						fHBACanAcceptClientRequests;
-	
-	// The pool for the available SCSI Parallel Task objects
-	IOCommandPool *				fParallelTaskPool;
-	
-	// WorkLoop variables
-	IOWorkLoop *				fWorkLoop;
-	IOTimerEventSource *		fTimerEvent;
-	IOInterruptEventSource *	fDispatchEvent;
-	
-	IOCommandGate *				fControllerGate;
-	
-	bool						AllocateSCSIParallelTasks ( void );
-	void						DeallocateSCSIParallelTasks ( void );
-	
-	IOWorkLoop *				getWorkLoop ( void ) const;
-	bool 						CreateWorkLoop ( IOService * provider );
-	void 						ReleaseWorkLoop ( void );
-	
-	// SCSI Parallel Device List
-	// The SCSI Parallel Device List will consist of 16 elements to represent 
-	// identifiers that end in 0h through Fh.  Each array element will point
-	// to a device object that represents the beginning of a linked list of
-	// device objects.  By using an array of linked lists, the traversal time
-	// to find an object on a bus that supports a large number of devices, such
-	// as Fibre Channel, will be significantly lower than having to walk a list 
-	// that is comprised of all devices on the bus.  For parallel wide and 
-	// narrow busses, which support 16 and 8 devices respectively, this will act 
-	// like a simple array of device objects.
-	enum
-	{
-		kSCSIParallelDeviceListArrayCount 	= 16,
-		kSCSIParallelDeviceListIndexMask	= 0x0F
-	};
-	
-	IOSimpleLock * 					fDeviceLock;
-	IOSCSIParallelInterfaceDevice *	
-					fParallelDeviceList[kSCSIParallelDeviceListArrayCount];
-	
-	void			InitializeDeviceList ( void );
-	void			AddDeviceToTargetList ( 
-							IOSCSIParallelInterfaceDevice *	newDevice );
-	void			RemoveDeviceFromTargetList ( 
-							IOSCSIParallelInterfaceDevice * victimDevice );
-	
-	// The Interrupt Service Routine for the controller.
-	static void		ServiceInterrupt (
-							OSObject *					theObject, 
-							IOInterruptEventSource *	theSource,
-							int							count );
-	
-	static void		TimeoutOccurred ( OSObject * owner, IOTimerEventSource * sender );
-	
-	static bool		FilterInterrupt (
-							OSObject *						theObject,
-							IOFilterInterruptEventSource *	theSource );
-	
-	// IOService support methods
-	// These shall not be overridden by the HBA child classes.
-	bool			start ( IOService * 				provider );
-	void			stop ( 	IOService *  				provider );
-
-
-protected:
-	
-	// These may be overriden by the HBA child classes if necessary, but should
-	// call the superclass implementation.
-	virtual bool	handleOpen ( 
-							IOService * 				client, 
-							IOOptionBits 				options, 
-							void * 						arg );
-
-	virtual void	handleClose ( 
-							IOService * 				client, 
-							IOOptionBits 				options );
-
-	virtual bool	handleIsOpen ( 
-							const IOService * 			client ) const;
-	
-	virtual bool	willTerminate ( IOService * provider, IOOptionBits options );
-	virtual bool	didTerminate ( IOService * provider, IOOptionBits options, bool * defer );
-	
-};
-
-
-#endif	/* __IOKIT_IO_SCSI_PARALLEL_INTERFACE_CONTROLLER_H__ */
\ No newline at end of file
diff --git a/i386/include/IOKit/serial/.svn/all-wcprops b/i386/include/IOKit/serial/.svn/all-wcprops
deleted file mode 100644
index 26769b8..0000000
--- a/i386/include/IOKit/serial/.svn/all-wcprops
+++ /dev/null
@@ -1,35 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 59
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial
-END
-IORS232SerialStreamSync.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial/IORS232SerialStreamSync.h
-END
-IOSerialDriverSync.h
-K 25
-svn:wc:ra_dav:version-url
-V 80
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial/IOSerialDriverSync.h
-END
-IOSerialStreamSync.h
-K 25
-svn:wc:ra_dav:version-url
-V 80
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial/IOSerialStreamSync.h
-END
-IOModemSerialStreamSync.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial/IOModemSerialStreamSync.h
-END
-IOSerialKeys.h
-K 25
-svn:wc:ra_dav:version-url
-V 74
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/serial/IOSerialKeys.h
-END
diff --git a/i386/include/IOKit/serial/.svn/entries b/i386/include/IOKit/serial/.svn/entries
deleted file mode 100644
index 20342de..0000000
--- a/i386/include/IOKit/serial/.svn/entries
+++ /dev/null
@@ -1,198 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/serial
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IORS232SerialStreamSync.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-0c2a5b36af70b8a5fc48f9f984e42b8f
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7628
-
-IOSerialDriverSync.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-1de76939037928e06b59a471b77174ea
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3579
-
-IOSerialStreamSync.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-91e7b9256b39f31244ba4cfa14404a6c
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11947
-
-IOModemSerialStreamSync.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-9ef1d5116b75c1c73a3ccb151f3eec13
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1425
-
-IOSerialKeys.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-85af242f0159d91cac30a3e340bb7ffb
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2856
-
diff --git a/i386/include/IOKit/serial/.svn/text-base/IOModemSerialStreamSync.h.svn-base b/i386/include/IOKit/serial/.svn/text-base/IOModemSerialStreamSync.h.svn-base
deleted file mode 100644
index be75287..0000000
--- a/i386/include/IOKit/serial/.svn/text-base/IOModemSerialStreamSync.h.svn-base
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *
- * IOModemSerialStreamSync.h
- * This file contains Modem specific extensions to the IOSerialStreamSync class.
- *
- * 2000-10-21	gvdl	Initial real change to IOKit serial family.
- *
- */  
-
-#ifndef _SERIAL_IOMODEMSERIALSTREAMSYNC_H
-#define _SERIAL_IOMODEMSERIALSTREAMSYNC_H
-
-#include <IOKit/serial/IOSerialStreamSync.h>
-
-class IOModemSerialStreamSync : public IOSerialStreamSync
-{
-    OSDeclareDefaultStructors(IOModemSerialStreamSync)
-};
-
-#endif /* !_SERIAL_IOMODEMSERIALSTREAMSYNC_H */
-
diff --git a/i386/include/IOKit/serial/.svn/text-base/IORS232SerialStreamSync.h.svn-base b/i386/include/IOKit/serial/.svn/text-base/IORS232SerialStreamSync.h.svn-base
deleted file mode 100644
index 15d520a..0000000
--- a/i386/include/IOKit/serial/.svn/text-base/IORS232SerialStreamSync.h.svn-base
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * IORS232SerialStreamSync.h
- * This file contains RS232 specific extensions to the IOSerialStreamSync class.
- *
- * 2000-10-21	gvdl	Initial real change to IOKit serial family.
- */  
-
-#ifndef _SERIAL_IORS232SERIALSTREAMSYNC_H
-#define _SERIAL_IORS232SERIALSTREAMSYNC_H
-
-#include <sys/ioctl.h>
-#include <IOKit/serial/IOSerialStreamSync.h>
-
-/*
- * Extra events for RS232 based PortDevices
- */  
-
-#define PD_RS232_E_RX_LINE_BREAK      (PD_DATA_VOID|PD_OP(63))  // line break was received
-#define PD_RS232_E_LINE_BREAK         (PD_DATA_BYTE|PD_OP(62))  // BOOL set/clear line break    
-
-#define PD_RS232_E_RX_STOP_BITS       (PD_DATA_LONG|PD_OP(61))  // half stop bits
-#define PD_RS232_E_STOP_BITS          (PD_DATA_LONG|PD_OP(60))  // half stop bits
-
-#define PD_RS232_E_XON_BYTE           (PD_DATA_BYTE|PD_OP(59))  // The XON char for TX&RX
-#define PD_RS232_E_XOFF_BYTE          (PD_DATA_BYTE|PD_OP(58))  // The XOFF char for TX&RX
-
-#define PD_RS232_E_MIN_LATENCY        (PD_DATA_BYTE|PD_OP(57))  // BOOL true if low latency req
-
-/*
- * RS232 Parity stuff, used with the DATA_INTEGRITY event
- */  
-#define PD_RS232_PARITY_DEFAULT	0	// Valid only for RX, means follow TX
-#define PD_RS232_PARITY_NONE	1	// No Parity bit inserted or expected
-#define PD_RS232_PARITY_ODD	2	// Odd Parity bit inserted or expected
-#define PD_RS232_PARITY_EVEN	3	// Even Parity bit inserted or expected
-#define PD_RS232_PARITY_MARK	4	// Mark inserted or expected
-#define PD_RS232_PARITY_SPACE	5	// Space inserted or expected
-#define PD_RS232_PARITY_ANY	6	// Valid only for RX, means discard parity
-
-/*
- * RS232 Flow Control specifiers, used with the FLOW_CONTROL event
- * NB. The XON  character is set with FLOW_START_DATA
- * and the XOFF character is set with FLOW_STOP_DATA.
- *
- * Signal  Name                          Direction
- *  RFR     Ready For Receive             Output generated by UART
- *  RTS     Ready To Send (alias of RFR)  Output generated by UART
- *  CTS     Clear To Send		  Input sensed by UART
- *  DTR     Data Terminal Ready           Output generated by UART
- *  DSR     Data Set Ready                Input sensed by UART
- *  TXO     XON/XOFF/XANY protocol        Characters received by UART
- *  RXO     XON/XOFF protocol             Characters transmitted by UART
- *  DCD     Data Carrier Detect           Input sensed by UART
- */
-
-/*
- * RS232 State Word extensions, based on <bsd/sys/ioctl.h>
- * Also the 'current state' bits for enq/deq of Flow Control event
- */  
-#define PD_RS232_S_MASK   0x0000ffffUL
-#define PD_RS232_S_SHIFT  0	// to align State bits for enq/deq event
-#define PD_RS232_D_MASK   0xffff0000UL
-#define PD_RS232_D_SHIFT  16	// to align Delta bits for enq/deq event
-#define PD_RS232_A_MASK   0x0000ffffUL
-#define PD_RS232_A_SHIFT  0	// to align Auto bits for req/exec event
-#define PD_RS232_N_MASK   0xffff0000UL
-#define PD_RS232_N_SHIFT  16	// to align Notify bits for req/exec event
-
-#define	PD_RS232_S_LE	TIOCM_LE	// line enable
-#define	PD_RS232_S_DTR	TIOCM_DTR	// data terminal ready
-#define	PD_RS232_S_RTS	TIOCM_RTS	// request to send
-#define	PD_RS232_S_RFR	PD_RS232_S_RTS	// ready for receive
-#define	PD_RS232_S_TXO	TIOCM_ST	// TX XON/XOFF
-#define	PD_RS232_S_RXO	TIOCM_SR	// RX XON/XOFF
-#define	PD_RS232_S_CTS	TIOCM_CTS	// clear to send
-#define	PD_RS232_S_CAR	TIOCM_CAR	// carrier detect
-#define	PD_RS232_S_DCD	PD_RS232_S_CAR
-#define	PD_RS232_S_RNG	TIOCM_RNG	// ring
-#define	PD_RS232_S_RI	PD_RS232_S_RNG
-#define	PD_RS232_S_DSR	TIOCM_DSR	// data set ready
-
-#define	PD_RS232_S_BRK	0x00000800UL	// break active Extension to TIOCM   
-#define	PD_RS232_S_LOOP	0x00001000UL	// LOOP back Extension to TIOCM
-#define PD_RS232_S_TXQ	0x00002000UL	// User flowcontrol bit
-#define PD_RS232_S_RXQ	0x00004000UL	// User flowcontrol bit
-
-// The 'delta' bits for enq/deq of Flow Control event
-#define	PD_RS232_D_LE	(PD_RS232_S_LE  << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_DTR	(PD_RS232_S_DTR << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_RTS	(PD_RS232_S_RTS << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_RFR	(PD_RS232_S_RFR << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_TXO	(PD_RS232_S_TXO << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_RXO	(PD_RS232_S_RXO << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_CTS	(PD_RS232_S_CTS << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_CAR	(PD_RS232_S_CAR << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_DCD	(PD_RS232_S_DCD << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_RNG	(PD_RS232_S_RNG << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_RI	(PD_RS232_S_RI  << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_DSR	(PD_RS232_S_DSR << PD_RS232_D_SHIFT)
- 
-#define	PD_RS232_D_BRK	(PD_RS232_S_BRK  << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_LOOP (PD_RS232_S_LOOP << PD_RS232_D_SHIFT)
-#define PD_RS232_D_TXQ	(PD_RS232_S_TXQ  << PD_RS232_D_SHIFT)
-#define PD_RS232_D_RXQ	(PD_RS232_S_RXQ  << PD_RS232_D_SHIFT)
-
-// The 'auto' bits for exec/req of Flow Control event
-#define	PD_RS232_A_LE	PD_RS232_S_LE
-#define	PD_RS232_A_DTR	PD_RS232_S_DTR
-#define	PD_RS232_A_RTS	PD_RS232_S_RTS
-#define	PD_RS232_A_RFR	PD_RS232_S_RFR
-#define	PD_RS232_A_TXO	PD_RS232_S_TXO
-#define	PD_RS232_A_RXO	PD_RS232_S_RXO
-#define	PD_RS232_A_CTS	PD_RS232_S_CTS
-#define	PD_RS232_A_CAR	PD_RS232_S_CAR
-#define	PD_RS232_A_DCD	PD_RS232_S_DCD
-#define	PD_RS232_A_RNG	PD_RS232_S_RNG
-#define	PD_RS232_A_RI	PD_RS232_S_RI
-#define	PD_RS232_A_DSR	PD_RS232_S_DSR
-#define PD_RS232_A_XANY	0x00000400	// changes _A_TXO from XON/XOFF to XANY/XOFF
-#define	PD_RS232_A_BRK	PD_RS232_S_BRK   
-#define	PD_RS232_A_LOOP PD_RS232_S_LOOP
-#define PD_RS232_A_TXQ	PD_RS232_S_TXQ
-#define PD_RS232_A_RXQ	PD_RS232_S_RXQ
-
-// The 'notify' bits for exec/req of Flow Control event
-#define	PD_RS232_N_LE	(PD_RS232_S_LE  << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_DTR	(PD_RS232_S_DTR << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_RTS	(PD_RS232_S_RTS << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_RFR	(PD_RS232_S_RFR << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_TXO	(PD_RS232_S_TXO << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_RXO	(PD_RS232_S_RXO << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_CTS	(PD_RS232_S_CTS << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_CAR	(PD_RS232_S_CAR << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_DCD	(PD_RS232_S_DCD << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_RNG	(PD_RS232_S_RNG << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_RI	(PD_RS232_S_RI  << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_DSR	(PD_RS232_S_DSR << PD_RS232_N_SHIFT)
-
-#define	PD_RS232_N_BRK	(PD_RS232_S_BRK  << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_LOOP (PD_RS232_S_LOOP << PD_RS232_N_SHIFT)
-#define PD_RS232_N_TXQ	(PD_RS232_S_TXQ  << PD_RS232_N_SHIFT)
-#define PD_RS232_N_RXQ	(PD_RS232_S_RXQ  << PD_RS232_N_SHIFT)
-
-class IORS232SerialStreamSync : public IOSerialStreamSync
-{
-    OSDeclareDefaultStructors(IORS232SerialStreamSync)
-};
-
-#endif /* !_SERIAL_IORS232SERIALSTREAMSYNC_H */
-
diff --git a/i386/include/IOKit/serial/.svn/text-base/IOSerialDriverSync.h.svn-base b/i386/include/IOKit/serial/.svn/text-base/IOSerialDriverSync.h.svn-base
deleted file mode 100644
index 92f69df..0000000
--- a/i386/include/IOKit/serial/.svn/text-base/IOSerialDriverSync.h.svn-base
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- *@APPLE_LICENSE_HEADER_START@
- *
- *The contents of this file constitute Original Code as defined in and
- *are subject to the Apple Public Source License Version 1.1 (the
- *"License").  You may not use this file except in compliance with the
- *License.  Please obtain a copy of the License at
- *http://www.apple.com/publicsource and read it before using this file.
- *
- *This Original Code and all software distributed under the License are
- *distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- *EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- *INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- *FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- *License for the specific language governing rights and limitations
- *under the License.
- *
- *@APPLE_LICENSE_HEADER_END@
- */
-
-/*  
- * IOSerialDriverSync.h
- * This file contains the abstract parent class for any IOSerialDriver
- * interface, which is a generic serial interface, designed for devices
- * that do character oriented transfers (async) rather than block or
- * packet transfers.  Most notably RS-232, Printer, Mouse, and Keyboard
- * type devices.
- *
- * 2000-10-21	gvdl	Initial real change to IOKit serial family.
- */
-
-#ifndef _SERIAL_IOSERIALDRIVERSYNC_H
-#define _SERIAL_IOSERIALDRIVERSYNC_H
-
-#include <IOKit/IOService.h>
-
-class IOSerialDriverSync : public IOService
-{
-    OSDeclareAbstractStructors(IOSerialDriverSync);
-
-public:
-    virtual IOReturn acquirePort(bool sleep, void *refCon) = 0;
-
-    virtual IOReturn releasePort(void *refCon) = 0;
-
-    virtual IOReturn setState(UInt32 state, UInt32 mask, void *refCon) = 0;
-
-    virtual UInt32 getState(void *refCon) = 0;
-
-    virtual IOReturn watchState(UInt32 *state, UInt32 mask, void *refCon) = 0;
-
-    virtual UInt32 nextEvent(void *refCon) = 0;
-
-    virtual IOReturn executeEvent(UInt32 event, UInt32 data, void *refCon) = 0;
-
-    virtual IOReturn requestEvent(UInt32 event, UInt32 *data, void *refCon) = 0;
-
-    virtual IOReturn enqueueEvent(UInt32 event, UInt32 data,
-                                  bool sleep, void *refCon) = 0;
-
-    virtual IOReturn dequeueEvent(UInt32 *event, UInt32 *data,
-                                  bool sleep, void *refCon) = 0;
-
-    virtual IOReturn enqueueData(UInt8 *buffer, UInt32 size, UInt32 *count,
-                                 bool sleep, void *refCon) = 0;
-
-    virtual IOReturn dequeueData(UInt8 *buffer, UInt32 size, UInt32 *count,
-                                 UInt32 min, void *refCon) = 0;
-
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  0);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  1);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  2);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  3);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  4);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  5);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  6);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  7);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  8);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  9);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 10);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 11);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 12);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 13);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 14);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 15);
-
-};
-
-#endif /* !_SERIAL_IOSERIALDRIVERSYNC_H */
diff --git a/i386/include/IOKit/serial/.svn/text-base/IOSerialKeys.h.svn-base b/i386/include/IOKit/serial/.svn/text-base/IOSerialKeys.h.svn-base
deleted file mode 100644
index 9538a24..0000000
--- a/i386/include/IOKit/serial/.svn/text-base/IOSerialKeys.h.svn-base
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * IOSerialKeys.h
- *
- * 2000-10-21	gvdl	Initial real change to IOKit serial family.
- *
- */
-
-/*
-Sample Matching dictionary
-{
-    IOProviderClass = kIOSerialBSDServiceValue;
-    kIOSerialBSDTypeKey = kIOSerialBSDAllTypes
-			| kIOSerialBSDModemType
-			| kIOSerialBSDRS232Type;
-    kIOTTYDeviceKey = <Raw Unique Device Name>;
-    kIOTTYBaseNameKey = <Raw Unique Device Name>;
-    kIOTTYSuffixKey = <Raw Unique Device Name>;
-    kIOCalloutDeviceKey = <Callout Device Name>;
-    kIODialinDeviceKey = <Dialin Device Name>;
-}
-
-Note only the IOProviderClass is mandatory.  The other keys allow the searcher to reduce the size of the set of matching devices.
-*/
-
-/* Service Matching That is the 'IOProviderClass' */
-#define kIOSerialBSDServiceValue	"IOSerialBSDClient"
-
-/* Matching keys */
-#define kIOSerialBSDTypeKey		"IOSerialBSDClientType"
-
-/* Currently possible kIOSerialBSDTypeKey values. */
-#define kIOSerialBSDAllTypes		"IOSerialStream"
-#define kIOSerialBSDModemType		"IOModemSerialStream"
-#define kIOSerialBSDRS232Type		"IORS232SerialStream"
-
-// Properties that resolve to a /dev device node to open for
-// a particular service
-#define kIOTTYDeviceKey			"IOTTYDevice"
-#define kIOTTYBaseNameKey		"IOTTYBaseName"
-#define kIOTTYSuffixKey			"IOTTYSuffix"
-
-#define kIOCalloutDeviceKey		"IOCalloutDevice"
-#define kIODialinDeviceKey		"IODialinDevice"
-
-// Property 'ioctl' wait for the tty device to go idle.
-#define kIOTTYWaitForIdleKey		"IOTTYWaitForIdle"
-
-#if KERNEL
-extern const OSSymbol *gIOSerialBSDServiceValue;
-extern const OSSymbol *gIOSerialBSDTypeKey;
-extern const OSSymbol *gIOSerialBSDAllTypes;
-extern const OSSymbol *gIOSerialBSDModemType;
-extern const OSSymbol *gIOSerialBSDRS232Type;
-extern const OSSymbol *gIOTTYDeviceKey;
-extern const OSSymbol *gIOTTYBaseNameKey;
-extern const OSSymbol *gIOTTYSuffixKey;
-extern const OSSymbol *gIOCalloutDeviceKey;
-extern const OSSymbol *gIODialinDeviceKey;
-#endif /* KERNEL */
diff --git a/i386/include/IOKit/serial/.svn/text-base/IOSerialStreamSync.h.svn-base b/i386/include/IOKit/serial/.svn/text-base/IOSerialStreamSync.h.svn-base
deleted file mode 100644
index b654adb..0000000
--- a/i386/include/IOKit/serial/.svn/text-base/IOSerialStreamSync.h.svn-base
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- *Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- *@APPLE_LICENSE_HEADER_START@
- *
- *The contents of this file constitute Original Code as defined in and
- *are subject to the Apple Public Source License Version 1.1 (the
- *"License").  You may not use this file except in compliance with the
- *License.  Please obtain a copy of the License at
- *http://www.apple.com/publicsource and read it before using this file.
- *
- *This Original Code and all software distributed under the License are
- *distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- *EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- *INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- *FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- *License for the specific language governing rights and limitations
- *under the License.
- *
- *@APPLE_LICENSE_HEADER_END@
- */
-/*
- *  IOSerialStreamSync.h
- *
- *  2000-10-21	gvdl	Initial real change to IOKit serial family.
- *
- */
-
-#ifndef	_SERIAL_IOSERIALSTREAMSYNC_H
-#define	_SERIAL_IOSERIALSTREAMSYNC_H
-
-#include <IOKit/IOService.h>
-
-#ifdef __LP64__
-
-#define PD_DATA_MASK 0x03U
-#define PD_DATA_VOID 0x00U
-#define PD_DATA_BYTE 0x01U
-#define PD_DATA_WORD 0x02U
-#define PD_DATA_LONG 0x03U
-
-#else
-
-#define PD_DATA_MASK 0x03UL
-#define PD_DATA_VOID 0x00UL
-#define PD_DATA_BYTE 0x01UL
-#define PD_DATA_WORD 0x02UL
-#define PD_DATA_LONG 0x03UL
-
-#endif
-
-#define PD_OP(x)	((x) << 2)
-#define PD_E_MASK	(~PD_DATA_MASK)
-
-/* General Command & Status events */
-#define PD_E_EOQ		(PD_DATA_VOID|PD_OP( 0))	// Always nextEvent on empty queue
-#define PD_E_ACTIVE		(PD_DATA_BYTE|PD_OP( 1))	// BOOL start/shutdown chip
-
-/* Queue management events - all units are multiples of characters
- *based on the current character size
- */
-#define PD_E_TXQ_SIZE 		(PD_DATA_LONG|PD_OP( 2))
-#define PD_E_RXQ_SIZE		(PD_DATA_LONG|PD_OP( 3))
-#define PD_E_TXQ_LOW_WATER	(PD_DATA_LONG|PD_OP( 4))
-#define PD_E_RXQ_LOW_WATER	(PD_DATA_LONG|PD_OP( 5))
-#define PD_E_TXQ_HIGH_WATER	(PD_DATA_LONG|PD_OP( 6))
-#define PD_E_RXQ_HIGH_WATER	(PD_DATA_LONG|PD_OP( 7))
-#define PD_E_TXQ_AVAILABLE	(PD_DATA_LONG|PD_OP( 8))
-#define PD_E_RXQ_AVAILABLE	(PD_DATA_LONG|PD_OP( 9))
-#define PD_E_TXQ_FLUSH 		(PD_DATA_VOID|PD_OP(10))
-#define PD_E_RXQ_FLUSH		(PD_DATA_LONG|PD_OP(11))
-
-/* port & link characteristics - units are half bits */
-#define PD_E_DATA_RATE 		(PD_DATA_LONG|PD_OP(12))	// raw bits of symbols per second
-#define PD_E_RX_DATA_RATE	(PD_DATA_LONG|PD_OP(13))
-#define PD_E_DATA_SIZE 		(PD_DATA_LONG|PD_OP(14))	// raw bits per symbol
-#define PD_E_RX_DATA_SIZE	(PD_DATA_LONG|PD_OP(15))
-#define PD_E_DATA_INTEGRITY	(PD_DATA_LONG|PD_OP(16))	// parity or ECC method
-#define PD_E_RX_DATA_INTEGRITY	(PD_DATA_LONG|PD_OP(17))
-#define PD_E_EXTERNAL_CLOCK_MODE (PD_DATA_LONG|PD_OP(28))	// multiplier between clock and data rates
-
-/* timeout events */
-#define PD_E_DELAY		(PD_DATA_LONG|PD_OP(18))	// inter-character delay (us)
-#define PD_E_DATA_LATENCY	(PD_DATA_LONG|PD_OP(19))	// A dequeueData Latency timeout
-								// rcs Secondary Timer mainly to fix performance 
-								// problems with MIDI and IRDA drivers.
-								// Midi and Irda drivers will issue an IOCTL
-								// call with this as the selector and
-								// the Data as the value they want the rate set
-								// to (Typically 1 for IrDA devices) 
-#define PD_E_FLOW_CONTROL       (PD_DATA_LONG|PD_OP(20))  	// enable/disable each flow mechanism
-
-/* I/O events */
-#define PD_E_VALID_DATA 	(PD_DATA_VOID|PD_OP(21))	// A valid frame was received
-#define PD_E_VALID_DATA_BYTE 	(PD_DATA_BYTE|PD_E_VALID_DATA)
-#define PD_E_VALID_DATA_WORD 	(PD_DATA_WORD|PD_E_VALID_DATA)
-#define PD_E_VALID_DATA_LONG 	(PD_DATA_LONG|PD_E_VALID_DATA)
-
-#define PD_E_SPECIAL		(PD_DATA_VOID|PD_OP(22))	// valid data received with 'special' value
-#define PD_E_SPECIAL_BYTE 	(PD_DATA_BYTE|PD_E_SPECIAL)
-#define PD_E_SPECIAL_WORD 	(PD_DATA_WORD|PD_E_SPECIAL)
-#define PD_E_SPECIAL_LONG 	(PD_DATA_LONG|PD_E_SPECIAL)
-
-#define PD_E_FRAMING_ERROR 	(PD_DATA_VOID|PD_OP(23))	// Failure occured assembling frame
-#define PD_E_FRAMING_BYTE 	(PD_DATA_BYTE|PD_E_FRAMING_ERROR)
-#define PD_E_FRAMING_WORD 	(PD_DATA_WORD|PD_E_FRAMING_ERROR)
-#define PD_E_FRAMING_LONG 	(PD_DATA_LONG|PD_E_FRAMING_ERROR)
-
-#define PD_E_INTEGRITY_ERROR 	(PD_DATA_VOID|PD_OP(24))	// An uncorrectable frame was received
-#define PD_E_INTEGRITY_BYTE 	(PD_DATA_BYTE|PD_E_INTEGRITY_ERROR)
-#define PD_E_INTEGRITY_WORD 	(PD_DATA_WORD|PD_E_INTEGRITY_ERROR)
-#define PD_E_INTEGRITY_LONG 	(PD_DATA_LONG|PD_E_INTEGRITY_ERROR)
-
-#define PD_E_INTEGRITY_WARNING 	(PD_DATA_VOID|PD_OP(25))	// A correctable frame was received
-#define PD_E_HW_OVERRUN_ERROR 	(PD_DATA_VOID|PD_OP(26))	// Hardware's buffer overflowed, data lost
-#define PD_E_SW_OVERRUN_ERROR 	(PD_DATA_VOID|PD_OP(27))	// Driver's buffer overflowed, data lost
-
-/*
- *The variables below make up the bits returned
- *by the State methods:- getState, setState, watchState
- */
-#define PD_S_MASK		0xffff0000UL
-#define PD_S_RX_OFFSET		7
-
-#define PD_S_ACQUIRED		0x80000000UL
-#define PD_S_ACTIVE		0x40000000UL
-
-#define PD_S_TX_ENABLE		0x20000000UL
-#define PD_S_TX_BUSY		0x10000000UL
-#define PD_S_TX_EVENT 		0x08000000UL
-#define PD_S_TXQ_EMPTY 		0x04000000UL
-#define PD_S_TXQ_LOW_WATER 	0x02000000UL
-#define PD_S_TXQ_HIGH_WATER 	0x01000000UL
-#define PD_S_TXQ_FULL 		0x00800000UL
-#define PD_S_TXQ_MASK		( PD_S_TXQ_EMPTY | PD_S_TXQ_LOW_WATER \
-                                | PD_S_TXQ_FULL  | PD_S_TXQ_HIGH_WATER )
-
-#define PD_S_RX_ENABLE		(PD_S_TX_ENABLE      >> PD_S_RX_OFFSET)
-#define PD_S_RX_BUSY		(PD_S_TX_BUSY        >> PD_S_RX_OFFSET)
-#define PD_S_RX_EVENT		(PD_S_TX_EVENT       >> PD_S_RX_OFFSET)
-#define PD_S_RXQ_EMPTY 		(PD_S_TXQ_EMPTY      >> PD_S_RX_OFFSET)
-#define PD_S_RXQ_LOW_WATER	(PD_S_TXQ_LOW_WATER  >> PD_S_RX_OFFSET)
-#define PD_S_RXQ_HIGH_WATER	(PD_S_TXQ_HIGH_WATER >> PD_S_RX_OFFSET)
-#define PD_S_RXQ_FULL 		(PD_S_TXQ_FULL       >> PD_S_RX_OFFSET)
-#define PD_S_RXQ_MASK		(PD_S_TXQ_MASK       >> PD_S_RX_OFFSET)
-
-class IOSerialDriverSync;
-class IOSerialStreamSync : public IOService
-{
-    OSDeclareDefaultStructors(IOSerialStreamSync);
-
-protected:
-    IOSerialDriverSync *fProvider;
-    void *fRefCon;
-
-public:
-    /* acquire tests and sets the state of the port object.  If the port was
-    *available, then the state is set to busy, and kIOReturnSuccess is returned.
-    *If the port was already busy and sleep is YES, then the thread will sleep
-    *until the port is freed, then re-attempts the acquire.  If the port was
-    *already busy and sleep in NO, then kIOReturnExclusiveAccess is returned.
-    */   
-    virtual IOReturn acquirePort(bool sleep);
-    
-    /* release sets the state of the port object to available and wakes up any
-    *threads sleeping for access to this port.  It will return kIOReturnSuccess
-    *if the port was in a busy state, and kIOReturnNotOpen if it was available.
-    */
-    virtual IOReturn releasePort();
-    
-    /*
-     *Set the state for the port device.
-     */
-    virtual IOReturn setState(UInt32 state, UInt32 mask);
-
-    /*
-     *Get the state for the port device.
-     */
-    virtual UInt32 getState();
-    
-    /*
-     *Wait for the at least one of the state bits defined in mask to be equal
-     *to the value defined in state.
-     *Check on entry then sleep until necessary.
-     */
-    virtual IOReturn watchState(UInt32 *state, UInt32 mask);
-
-    /* nextEvent returns the type of the next event on the RX queue.  If no
-     *events are present on the RX queue, then EOQ is returned.
-     */
-    virtual UInt32 nextEvent();
-
-    /* executeEvent causes the specified event to be processed immediately.
-     *This is primarily used for channel control commands like START & STOP
-     */
-    virtual IOReturn executeEvent(UInt32 event, UInt32 data);
-
-    /* requestEvent processes the specified event as an immediate request and
-     *returns the results in data.  This is primarily used for getting link
-     *status information and verifying baud rate and such.
-     */
-    virtual IOReturn requestEvent(UInt32 event, UInt32 *data);
-
-    /* enqueueEvent will place the specified event into the TX queue.  The
-     *sleep argument allows the caller to specify the enqueueEvent's
-     *behaviour when the TX queue is full.  If sleep is true, then this
-     *method will sleep until the event is enqueued.  If sleep is false,
-     *then enqueueEvent will immediatly return kIOReturnNoResources.
-     */
-    virtual IOReturn enqueueEvent(UInt32 event, UInt32 data, bool sleep);
-
-    /* dequeueEvent will remove the oldest event from the RX queue and return
-     *it in event & data.  The sleep argument defines the behaviour if the RX
-     *queue is empty.  If sleep is true, then this method will sleep until an
-     *event is available.  If sleep is false, then an EOQ event will be
-     *returned.  In either case kIOReturnSuccess is returned.
-     */
-    virtual IOReturn dequeueEvent(UInt32 *event, UInt32 *data, bool sleep);
-
-    /* enqueueData will attempt to copy data from the specified buffer to the
-     *TX queue as a sequence of VALID_DATA events.  The argument bufferSize
-     *specifies the number of bytes to be sent.  The actual number of bytes
-     *transferred is returned in transferCount.  If sleep is true, then this
-     *method will sleep until all bytes can be transferred.  If sleep is
-     *false, then as many bytes as possible will be copied to the TX queue.
-     */
-    virtual IOReturn enqueueData(UInt8 *buffer,  UInt32 size, UInt32 *count, bool sleep );
-
-    /* dequeueData will attempt to copy data from the RX queue to the specified
-     *buffer.  No more than bufferSize VALID_DATA events will be transferred.
-     *In other words, copying will continue until either a non-data event is
-     *encountered or the transfer buffer is full.  The actual number of bytes
-     *transferred is returned in transferCount.
-     *
-     *The sleep semantics of this method are slightly more complicated than
-     *other methods in this API:  Basically, this method will continue to
-     *sleep until either minCount characters have been received or a non
-     *data event is next in the RX queue.  If minCount is zero, then this
-     *method never sleeps and will return immediatly if the queue is empty.
-     *
-     *The latency parameter specifies the maximum amount of time that should
-     *pass after the first character is available before the routine returns.
-     *This allows the caller to specify a 'packet' timeout.  The unit of the
-     *latency parameter is microseconds, though the exact delay may vary
-     *depending on the granularity of the timeout services available to the
-     *driver.
-     */
-    virtual IOReturn dequeueData(UInt8 *buffer, UInt32 size, UInt32 *count, UInt32 min);
-
-    /*	Internal for IOSerialDriver only */
-    virtual bool init(OSDictionary *dictionary = 0, void *refCon = 0);
-    virtual bool attach(IOService *provider);
-    void *getRefCon() const { return fRefCon; }
-
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  0);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  1);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  2);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  3);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  4);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  5);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  6);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  7);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  8);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  9);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 10);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 11);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 12);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 13);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 14);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 15);
-};
-
-#endif /* !_SERIAL_IOSERIALSTREAMSYNC_H */
-
-
diff --git a/i386/include/IOKit/serial/IOModemSerialStreamSync.h b/i386/include/IOKit/serial/IOModemSerialStreamSync.h
deleted file mode 100644
index be75287..0000000
--- a/i386/include/IOKit/serial/IOModemSerialStreamSync.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *
- * IOModemSerialStreamSync.h
- * This file contains Modem specific extensions to the IOSerialStreamSync class.
- *
- * 2000-10-21	gvdl	Initial real change to IOKit serial family.
- *
- */  
-
-#ifndef _SERIAL_IOMODEMSERIALSTREAMSYNC_H
-#define _SERIAL_IOMODEMSERIALSTREAMSYNC_H
-
-#include <IOKit/serial/IOSerialStreamSync.h>
-
-class IOModemSerialStreamSync : public IOSerialStreamSync
-{
-    OSDeclareDefaultStructors(IOModemSerialStreamSync)
-};
-
-#endif /* !_SERIAL_IOMODEMSERIALSTREAMSYNC_H */
-
diff --git a/i386/include/IOKit/serial/IORS232SerialStreamSync.h b/i386/include/IOKit/serial/IORS232SerialStreamSync.h
deleted file mode 100644
index 15d520a..0000000
--- a/i386/include/IOKit/serial/IORS232SerialStreamSync.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * IORS232SerialStreamSync.h
- * This file contains RS232 specific extensions to the IOSerialStreamSync class.
- *
- * 2000-10-21	gvdl	Initial real change to IOKit serial family.
- */  
-
-#ifndef _SERIAL_IORS232SERIALSTREAMSYNC_H
-#define _SERIAL_IORS232SERIALSTREAMSYNC_H
-
-#include <sys/ioctl.h>
-#include <IOKit/serial/IOSerialStreamSync.h>
-
-/*
- * Extra events for RS232 based PortDevices
- */  
-
-#define PD_RS232_E_RX_LINE_BREAK      (PD_DATA_VOID|PD_OP(63))  // line break was received
-#define PD_RS232_E_LINE_BREAK         (PD_DATA_BYTE|PD_OP(62))  // BOOL set/clear line break    
-
-#define PD_RS232_E_RX_STOP_BITS       (PD_DATA_LONG|PD_OP(61))  // half stop bits
-#define PD_RS232_E_STOP_BITS          (PD_DATA_LONG|PD_OP(60))  // half stop bits
-
-#define PD_RS232_E_XON_BYTE           (PD_DATA_BYTE|PD_OP(59))  // The XON char for TX&RX
-#define PD_RS232_E_XOFF_BYTE          (PD_DATA_BYTE|PD_OP(58))  // The XOFF char for TX&RX
-
-#define PD_RS232_E_MIN_LATENCY        (PD_DATA_BYTE|PD_OP(57))  // BOOL true if low latency req
-
-/*
- * RS232 Parity stuff, used with the DATA_INTEGRITY event
- */  
-#define PD_RS232_PARITY_DEFAULT	0	// Valid only for RX, means follow TX
-#define PD_RS232_PARITY_NONE	1	// No Parity bit inserted or expected
-#define PD_RS232_PARITY_ODD	2	// Odd Parity bit inserted or expected
-#define PD_RS232_PARITY_EVEN	3	// Even Parity bit inserted or expected
-#define PD_RS232_PARITY_MARK	4	// Mark inserted or expected
-#define PD_RS232_PARITY_SPACE	5	// Space inserted or expected
-#define PD_RS232_PARITY_ANY	6	// Valid only for RX, means discard parity
-
-/*
- * RS232 Flow Control specifiers, used with the FLOW_CONTROL event
- * NB. The XON  character is set with FLOW_START_DATA
- * and the XOFF character is set with FLOW_STOP_DATA.
- *
- * Signal  Name                          Direction
- *  RFR     Ready For Receive             Output generated by UART
- *  RTS     Ready To Send (alias of RFR)  Output generated by UART
- *  CTS     Clear To Send		  Input sensed by UART
- *  DTR     Data Terminal Ready           Output generated by UART
- *  DSR     Data Set Ready                Input sensed by UART
- *  TXO     XON/XOFF/XANY protocol        Characters received by UART
- *  RXO     XON/XOFF protocol             Characters transmitted by UART
- *  DCD     Data Carrier Detect           Input sensed by UART
- */
-
-/*
- * RS232 State Word extensions, based on <bsd/sys/ioctl.h>
- * Also the 'current state' bits for enq/deq of Flow Control event
- */  
-#define PD_RS232_S_MASK   0x0000ffffUL
-#define PD_RS232_S_SHIFT  0	// to align State bits for enq/deq event
-#define PD_RS232_D_MASK   0xffff0000UL
-#define PD_RS232_D_SHIFT  16	// to align Delta bits for enq/deq event
-#define PD_RS232_A_MASK   0x0000ffffUL
-#define PD_RS232_A_SHIFT  0	// to align Auto bits for req/exec event
-#define PD_RS232_N_MASK   0xffff0000UL
-#define PD_RS232_N_SHIFT  16	// to align Notify bits for req/exec event
-
-#define	PD_RS232_S_LE	TIOCM_LE	// line enable
-#define	PD_RS232_S_DTR	TIOCM_DTR	// data terminal ready
-#define	PD_RS232_S_RTS	TIOCM_RTS	// request to send
-#define	PD_RS232_S_RFR	PD_RS232_S_RTS	// ready for receive
-#define	PD_RS232_S_TXO	TIOCM_ST	// TX XON/XOFF
-#define	PD_RS232_S_RXO	TIOCM_SR	// RX XON/XOFF
-#define	PD_RS232_S_CTS	TIOCM_CTS	// clear to send
-#define	PD_RS232_S_CAR	TIOCM_CAR	// carrier detect
-#define	PD_RS232_S_DCD	PD_RS232_S_CAR
-#define	PD_RS232_S_RNG	TIOCM_RNG	// ring
-#define	PD_RS232_S_RI	PD_RS232_S_RNG
-#define	PD_RS232_S_DSR	TIOCM_DSR	// data set ready
-
-#define	PD_RS232_S_BRK	0x00000800UL	// break active Extension to TIOCM   
-#define	PD_RS232_S_LOOP	0x00001000UL	// LOOP back Extension to TIOCM
-#define PD_RS232_S_TXQ	0x00002000UL	// User flowcontrol bit
-#define PD_RS232_S_RXQ	0x00004000UL	// User flowcontrol bit
-
-// The 'delta' bits for enq/deq of Flow Control event
-#define	PD_RS232_D_LE	(PD_RS232_S_LE  << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_DTR	(PD_RS232_S_DTR << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_RTS	(PD_RS232_S_RTS << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_RFR	(PD_RS232_S_RFR << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_TXO	(PD_RS232_S_TXO << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_RXO	(PD_RS232_S_RXO << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_CTS	(PD_RS232_S_CTS << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_CAR	(PD_RS232_S_CAR << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_DCD	(PD_RS232_S_DCD << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_RNG	(PD_RS232_S_RNG << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_RI	(PD_RS232_S_RI  << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_DSR	(PD_RS232_S_DSR << PD_RS232_D_SHIFT)
- 
-#define	PD_RS232_D_BRK	(PD_RS232_S_BRK  << PD_RS232_D_SHIFT)
-#define	PD_RS232_D_LOOP (PD_RS232_S_LOOP << PD_RS232_D_SHIFT)
-#define PD_RS232_D_TXQ	(PD_RS232_S_TXQ  << PD_RS232_D_SHIFT)
-#define PD_RS232_D_RXQ	(PD_RS232_S_RXQ  << PD_RS232_D_SHIFT)
-
-// The 'auto' bits for exec/req of Flow Control event
-#define	PD_RS232_A_LE	PD_RS232_S_LE
-#define	PD_RS232_A_DTR	PD_RS232_S_DTR
-#define	PD_RS232_A_RTS	PD_RS232_S_RTS
-#define	PD_RS232_A_RFR	PD_RS232_S_RFR
-#define	PD_RS232_A_TXO	PD_RS232_S_TXO
-#define	PD_RS232_A_RXO	PD_RS232_S_RXO
-#define	PD_RS232_A_CTS	PD_RS232_S_CTS
-#define	PD_RS232_A_CAR	PD_RS232_S_CAR
-#define	PD_RS232_A_DCD	PD_RS232_S_DCD
-#define	PD_RS232_A_RNG	PD_RS232_S_RNG
-#define	PD_RS232_A_RI	PD_RS232_S_RI
-#define	PD_RS232_A_DSR	PD_RS232_S_DSR
-#define PD_RS232_A_XANY	0x00000400	// changes _A_TXO from XON/XOFF to XANY/XOFF
-#define	PD_RS232_A_BRK	PD_RS232_S_BRK   
-#define	PD_RS232_A_LOOP PD_RS232_S_LOOP
-#define PD_RS232_A_TXQ	PD_RS232_S_TXQ
-#define PD_RS232_A_RXQ	PD_RS232_S_RXQ
-
-// The 'notify' bits for exec/req of Flow Control event
-#define	PD_RS232_N_LE	(PD_RS232_S_LE  << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_DTR	(PD_RS232_S_DTR << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_RTS	(PD_RS232_S_RTS << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_RFR	(PD_RS232_S_RFR << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_TXO	(PD_RS232_S_TXO << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_RXO	(PD_RS232_S_RXO << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_CTS	(PD_RS232_S_CTS << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_CAR	(PD_RS232_S_CAR << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_DCD	(PD_RS232_S_DCD << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_RNG	(PD_RS232_S_RNG << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_RI	(PD_RS232_S_RI  << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_DSR	(PD_RS232_S_DSR << PD_RS232_N_SHIFT)
-
-#define	PD_RS232_N_BRK	(PD_RS232_S_BRK  << PD_RS232_N_SHIFT)
-#define	PD_RS232_N_LOOP (PD_RS232_S_LOOP << PD_RS232_N_SHIFT)
-#define PD_RS232_N_TXQ	(PD_RS232_S_TXQ  << PD_RS232_N_SHIFT)
-#define PD_RS232_N_RXQ	(PD_RS232_S_RXQ  << PD_RS232_N_SHIFT)
-
-class IORS232SerialStreamSync : public IOSerialStreamSync
-{
-    OSDeclareDefaultStructors(IORS232SerialStreamSync)
-};
-
-#endif /* !_SERIAL_IORS232SERIALSTREAMSYNC_H */
-
diff --git a/i386/include/IOKit/serial/IOSerialDriverSync.h b/i386/include/IOKit/serial/IOSerialDriverSync.h
deleted file mode 100644
index 92f69df..0000000
--- a/i386/include/IOKit/serial/IOSerialDriverSync.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- *@APPLE_LICENSE_HEADER_START@
- *
- *The contents of this file constitute Original Code as defined in and
- *are subject to the Apple Public Source License Version 1.1 (the
- *"License").  You may not use this file except in compliance with the
- *License.  Please obtain a copy of the License at
- *http://www.apple.com/publicsource and read it before using this file.
- *
- *This Original Code and all software distributed under the License are
- *distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- *EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- *INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- *FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- *License for the specific language governing rights and limitations
- *under the License.
- *
- *@APPLE_LICENSE_HEADER_END@
- */
-
-/*  
- * IOSerialDriverSync.h
- * This file contains the abstract parent class for any IOSerialDriver
- * interface, which is a generic serial interface, designed for devices
- * that do character oriented transfers (async) rather than block or
- * packet transfers.  Most notably RS-232, Printer, Mouse, and Keyboard
- * type devices.
- *
- * 2000-10-21	gvdl	Initial real change to IOKit serial family.
- */
-
-#ifndef _SERIAL_IOSERIALDRIVERSYNC_H
-#define _SERIAL_IOSERIALDRIVERSYNC_H
-
-#include <IOKit/IOService.h>
-
-class IOSerialDriverSync : public IOService
-{
-    OSDeclareAbstractStructors(IOSerialDriverSync);
-
-public:
-    virtual IOReturn acquirePort(bool sleep, void *refCon) = 0;
-
-    virtual IOReturn releasePort(void *refCon) = 0;
-
-    virtual IOReturn setState(UInt32 state, UInt32 mask, void *refCon) = 0;
-
-    virtual UInt32 getState(void *refCon) = 0;
-
-    virtual IOReturn watchState(UInt32 *state, UInt32 mask, void *refCon) = 0;
-
-    virtual UInt32 nextEvent(void *refCon) = 0;
-
-    virtual IOReturn executeEvent(UInt32 event, UInt32 data, void *refCon) = 0;
-
-    virtual IOReturn requestEvent(UInt32 event, UInt32 *data, void *refCon) = 0;
-
-    virtual IOReturn enqueueEvent(UInt32 event, UInt32 data,
-                                  bool sleep, void *refCon) = 0;
-
-    virtual IOReturn dequeueEvent(UInt32 *event, UInt32 *data,
-                                  bool sleep, void *refCon) = 0;
-
-    virtual IOReturn enqueueData(UInt8 *buffer, UInt32 size, UInt32 *count,
-                                 bool sleep, void *refCon) = 0;
-
-    virtual IOReturn dequeueData(UInt8 *buffer, UInt32 size, UInt32 *count,
-                                 UInt32 min, void *refCon) = 0;
-
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  0);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  1);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  2);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  3);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  4);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  5);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  6);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  7);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  8);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync,  9);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 10);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 11);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 12);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 13);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 14);
-OSMetaClassDeclareReservedUnused(IOSerialDriverSync, 15);
-
-};
-
-#endif /* !_SERIAL_IOSERIALDRIVERSYNC_H */
diff --git a/i386/include/IOKit/serial/IOSerialKeys.h b/i386/include/IOKit/serial/IOSerialKeys.h
deleted file mode 100644
index 9538a24..0000000
--- a/i386/include/IOKit/serial/IOSerialKeys.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * IOSerialKeys.h
- *
- * 2000-10-21	gvdl	Initial real change to IOKit serial family.
- *
- */
-
-/*
-Sample Matching dictionary
-{
-    IOProviderClass = kIOSerialBSDServiceValue;
-    kIOSerialBSDTypeKey = kIOSerialBSDAllTypes
-			| kIOSerialBSDModemType
-			| kIOSerialBSDRS232Type;
-    kIOTTYDeviceKey = <Raw Unique Device Name>;
-    kIOTTYBaseNameKey = <Raw Unique Device Name>;
-    kIOTTYSuffixKey = <Raw Unique Device Name>;
-    kIOCalloutDeviceKey = <Callout Device Name>;
-    kIODialinDeviceKey = <Dialin Device Name>;
-}
-
-Note only the IOProviderClass is mandatory.  The other keys allow the searcher to reduce the size of the set of matching devices.
-*/
-
-/* Service Matching That is the 'IOProviderClass' */
-#define kIOSerialBSDServiceValue	"IOSerialBSDClient"
-
-/* Matching keys */
-#define kIOSerialBSDTypeKey		"IOSerialBSDClientType"
-
-/* Currently possible kIOSerialBSDTypeKey values. */
-#define kIOSerialBSDAllTypes		"IOSerialStream"
-#define kIOSerialBSDModemType		"IOModemSerialStream"
-#define kIOSerialBSDRS232Type		"IORS232SerialStream"
-
-// Properties that resolve to a /dev device node to open for
-// a particular service
-#define kIOTTYDeviceKey			"IOTTYDevice"
-#define kIOTTYBaseNameKey		"IOTTYBaseName"
-#define kIOTTYSuffixKey			"IOTTYSuffix"
-
-#define kIOCalloutDeviceKey		"IOCalloutDevice"
-#define kIODialinDeviceKey		"IODialinDevice"
-
-// Property 'ioctl' wait for the tty device to go idle.
-#define kIOTTYWaitForIdleKey		"IOTTYWaitForIdle"
-
-#if KERNEL
-extern const OSSymbol *gIOSerialBSDServiceValue;
-extern const OSSymbol *gIOSerialBSDTypeKey;
-extern const OSSymbol *gIOSerialBSDAllTypes;
-extern const OSSymbol *gIOSerialBSDModemType;
-extern const OSSymbol *gIOSerialBSDRS232Type;
-extern const OSSymbol *gIOTTYDeviceKey;
-extern const OSSymbol *gIOTTYBaseNameKey;
-extern const OSSymbol *gIOTTYSuffixKey;
-extern const OSSymbol *gIOCalloutDeviceKey;
-extern const OSSymbol *gIODialinDeviceKey;
-#endif /* KERNEL */
diff --git a/i386/include/IOKit/serial/IOSerialStreamSync.h b/i386/include/IOKit/serial/IOSerialStreamSync.h
deleted file mode 100644
index b654adb..0000000
--- a/i386/include/IOKit/serial/IOSerialStreamSync.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- *Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- *@APPLE_LICENSE_HEADER_START@
- *
- *The contents of this file constitute Original Code as defined in and
- *are subject to the Apple Public Source License Version 1.1 (the
- *"License").  You may not use this file except in compliance with the
- *License.  Please obtain a copy of the License at
- *http://www.apple.com/publicsource and read it before using this file.
- *
- *This Original Code and all software distributed under the License are
- *distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- *EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- *INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- *FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- *License for the specific language governing rights and limitations
- *under the License.
- *
- *@APPLE_LICENSE_HEADER_END@
- */
-/*
- *  IOSerialStreamSync.h
- *
- *  2000-10-21	gvdl	Initial real change to IOKit serial family.
- *
- */
-
-#ifndef	_SERIAL_IOSERIALSTREAMSYNC_H
-#define	_SERIAL_IOSERIALSTREAMSYNC_H
-
-#include <IOKit/IOService.h>
-
-#ifdef __LP64__
-
-#define PD_DATA_MASK 0x03U
-#define PD_DATA_VOID 0x00U
-#define PD_DATA_BYTE 0x01U
-#define PD_DATA_WORD 0x02U
-#define PD_DATA_LONG 0x03U
-
-#else
-
-#define PD_DATA_MASK 0x03UL
-#define PD_DATA_VOID 0x00UL
-#define PD_DATA_BYTE 0x01UL
-#define PD_DATA_WORD 0x02UL
-#define PD_DATA_LONG 0x03UL
-
-#endif
-
-#define PD_OP(x)	((x) << 2)
-#define PD_E_MASK	(~PD_DATA_MASK)
-
-/* General Command & Status events */
-#define PD_E_EOQ		(PD_DATA_VOID|PD_OP( 0))	// Always nextEvent on empty queue
-#define PD_E_ACTIVE		(PD_DATA_BYTE|PD_OP( 1))	// BOOL start/shutdown chip
-
-/* Queue management events - all units are multiples of characters
- *based on the current character size
- */
-#define PD_E_TXQ_SIZE 		(PD_DATA_LONG|PD_OP( 2))
-#define PD_E_RXQ_SIZE		(PD_DATA_LONG|PD_OP( 3))
-#define PD_E_TXQ_LOW_WATER	(PD_DATA_LONG|PD_OP( 4))
-#define PD_E_RXQ_LOW_WATER	(PD_DATA_LONG|PD_OP( 5))
-#define PD_E_TXQ_HIGH_WATER	(PD_DATA_LONG|PD_OP( 6))
-#define PD_E_RXQ_HIGH_WATER	(PD_DATA_LONG|PD_OP( 7))
-#define PD_E_TXQ_AVAILABLE	(PD_DATA_LONG|PD_OP( 8))
-#define PD_E_RXQ_AVAILABLE	(PD_DATA_LONG|PD_OP( 9))
-#define PD_E_TXQ_FLUSH 		(PD_DATA_VOID|PD_OP(10))
-#define PD_E_RXQ_FLUSH		(PD_DATA_LONG|PD_OP(11))
-
-/* port & link characteristics - units are half bits */
-#define PD_E_DATA_RATE 		(PD_DATA_LONG|PD_OP(12))	// raw bits of symbols per second
-#define PD_E_RX_DATA_RATE	(PD_DATA_LONG|PD_OP(13))
-#define PD_E_DATA_SIZE 		(PD_DATA_LONG|PD_OP(14))	// raw bits per symbol
-#define PD_E_RX_DATA_SIZE	(PD_DATA_LONG|PD_OP(15))
-#define PD_E_DATA_INTEGRITY	(PD_DATA_LONG|PD_OP(16))	// parity or ECC method
-#define PD_E_RX_DATA_INTEGRITY	(PD_DATA_LONG|PD_OP(17))
-#define PD_E_EXTERNAL_CLOCK_MODE (PD_DATA_LONG|PD_OP(28))	// multiplier between clock and data rates
-
-/* timeout events */
-#define PD_E_DELAY		(PD_DATA_LONG|PD_OP(18))	// inter-character delay (us)
-#define PD_E_DATA_LATENCY	(PD_DATA_LONG|PD_OP(19))	// A dequeueData Latency timeout
-								// rcs Secondary Timer mainly to fix performance 
-								// problems with MIDI and IRDA drivers.
-								// Midi and Irda drivers will issue an IOCTL
-								// call with this as the selector and
-								// the Data as the value they want the rate set
-								// to (Typically 1 for IrDA devices) 
-#define PD_E_FLOW_CONTROL       (PD_DATA_LONG|PD_OP(20))  	// enable/disable each flow mechanism
-
-/* I/O events */
-#define PD_E_VALID_DATA 	(PD_DATA_VOID|PD_OP(21))	// A valid frame was received
-#define PD_E_VALID_DATA_BYTE 	(PD_DATA_BYTE|PD_E_VALID_DATA)
-#define PD_E_VALID_DATA_WORD 	(PD_DATA_WORD|PD_E_VALID_DATA)
-#define PD_E_VALID_DATA_LONG 	(PD_DATA_LONG|PD_E_VALID_DATA)
-
-#define PD_E_SPECIAL		(PD_DATA_VOID|PD_OP(22))	// valid data received with 'special' value
-#define PD_E_SPECIAL_BYTE 	(PD_DATA_BYTE|PD_E_SPECIAL)
-#define PD_E_SPECIAL_WORD 	(PD_DATA_WORD|PD_E_SPECIAL)
-#define PD_E_SPECIAL_LONG 	(PD_DATA_LONG|PD_E_SPECIAL)
-
-#define PD_E_FRAMING_ERROR 	(PD_DATA_VOID|PD_OP(23))	// Failure occured assembling frame
-#define PD_E_FRAMING_BYTE 	(PD_DATA_BYTE|PD_E_FRAMING_ERROR)
-#define PD_E_FRAMING_WORD 	(PD_DATA_WORD|PD_E_FRAMING_ERROR)
-#define PD_E_FRAMING_LONG 	(PD_DATA_LONG|PD_E_FRAMING_ERROR)
-
-#define PD_E_INTEGRITY_ERROR 	(PD_DATA_VOID|PD_OP(24))	// An uncorrectable frame was received
-#define PD_E_INTEGRITY_BYTE 	(PD_DATA_BYTE|PD_E_INTEGRITY_ERROR)
-#define PD_E_INTEGRITY_WORD 	(PD_DATA_WORD|PD_E_INTEGRITY_ERROR)
-#define PD_E_INTEGRITY_LONG 	(PD_DATA_LONG|PD_E_INTEGRITY_ERROR)
-
-#define PD_E_INTEGRITY_WARNING 	(PD_DATA_VOID|PD_OP(25))	// A correctable frame was received
-#define PD_E_HW_OVERRUN_ERROR 	(PD_DATA_VOID|PD_OP(26))	// Hardware's buffer overflowed, data lost
-#define PD_E_SW_OVERRUN_ERROR 	(PD_DATA_VOID|PD_OP(27))	// Driver's buffer overflowed, data lost
-
-/*
- *The variables below make up the bits returned
- *by the State methods:- getState, setState, watchState
- */
-#define PD_S_MASK		0xffff0000UL
-#define PD_S_RX_OFFSET		7
-
-#define PD_S_ACQUIRED		0x80000000UL
-#define PD_S_ACTIVE		0x40000000UL
-
-#define PD_S_TX_ENABLE		0x20000000UL
-#define PD_S_TX_BUSY		0x10000000UL
-#define PD_S_TX_EVENT 		0x08000000UL
-#define PD_S_TXQ_EMPTY 		0x04000000UL
-#define PD_S_TXQ_LOW_WATER 	0x02000000UL
-#define PD_S_TXQ_HIGH_WATER 	0x01000000UL
-#define PD_S_TXQ_FULL 		0x00800000UL
-#define PD_S_TXQ_MASK		( PD_S_TXQ_EMPTY | PD_S_TXQ_LOW_WATER \
-                                | PD_S_TXQ_FULL  | PD_S_TXQ_HIGH_WATER )
-
-#define PD_S_RX_ENABLE		(PD_S_TX_ENABLE      >> PD_S_RX_OFFSET)
-#define PD_S_RX_BUSY		(PD_S_TX_BUSY        >> PD_S_RX_OFFSET)
-#define PD_S_RX_EVENT		(PD_S_TX_EVENT       >> PD_S_RX_OFFSET)
-#define PD_S_RXQ_EMPTY 		(PD_S_TXQ_EMPTY      >> PD_S_RX_OFFSET)
-#define PD_S_RXQ_LOW_WATER	(PD_S_TXQ_LOW_WATER  >> PD_S_RX_OFFSET)
-#define PD_S_RXQ_HIGH_WATER	(PD_S_TXQ_HIGH_WATER >> PD_S_RX_OFFSET)
-#define PD_S_RXQ_FULL 		(PD_S_TXQ_FULL       >> PD_S_RX_OFFSET)
-#define PD_S_RXQ_MASK		(PD_S_TXQ_MASK       >> PD_S_RX_OFFSET)
-
-class IOSerialDriverSync;
-class IOSerialStreamSync : public IOService
-{
-    OSDeclareDefaultStructors(IOSerialStreamSync);
-
-protected:
-    IOSerialDriverSync *fProvider;
-    void *fRefCon;
-
-public:
-    /* acquire tests and sets the state of the port object.  If the port was
-    *available, then the state is set to busy, and kIOReturnSuccess is returned.
-    *If the port was already busy and sleep is YES, then the thread will sleep
-    *until the port is freed, then re-attempts the acquire.  If the port was
-    *already busy and sleep in NO, then kIOReturnExclusiveAccess is returned.
-    */   
-    virtual IOReturn acquirePort(bool sleep);
-    
-    /* release sets the state of the port object to available and wakes up any
-    *threads sleeping for access to this port.  It will return kIOReturnSuccess
-    *if the port was in a busy state, and kIOReturnNotOpen if it was available.
-    */
-    virtual IOReturn releasePort();
-    
-    /*
-     *Set the state for the port device.
-     */
-    virtual IOReturn setState(UInt32 state, UInt32 mask);
-
-    /*
-     *Get the state for the port device.
-     */
-    virtual UInt32 getState();
-    
-    /*
-     *Wait for the at least one of the state bits defined in mask to be equal
-     *to the value defined in state.
-     *Check on entry then sleep until necessary.
-     */
-    virtual IOReturn watchState(UInt32 *state, UInt32 mask);
-
-    /* nextEvent returns the type of the next event on the RX queue.  If no
-     *events are present on the RX queue, then EOQ is returned.
-     */
-    virtual UInt32 nextEvent();
-
-    /* executeEvent causes the specified event to be processed immediately.
-     *This is primarily used for channel control commands like START & STOP
-     */
-    virtual IOReturn executeEvent(UInt32 event, UInt32 data);
-
-    /* requestEvent processes the specified event as an immediate request and
-     *returns the results in data.  This is primarily used for getting link
-     *status information and verifying baud rate and such.
-     */
-    virtual IOReturn requestEvent(UInt32 event, UInt32 *data);
-
-    /* enqueueEvent will place the specified event into the TX queue.  The
-     *sleep argument allows the caller to specify the enqueueEvent's
-     *behaviour when the TX queue is full.  If sleep is true, then this
-     *method will sleep until the event is enqueued.  If sleep is false,
-     *then enqueueEvent will immediatly return kIOReturnNoResources.
-     */
-    virtual IOReturn enqueueEvent(UInt32 event, UInt32 data, bool sleep);
-
-    /* dequeueEvent will remove the oldest event from the RX queue and return
-     *it in event & data.  The sleep argument defines the behaviour if the RX
-     *queue is empty.  If sleep is true, then this method will sleep until an
-     *event is available.  If sleep is false, then an EOQ event will be
-     *returned.  In either case kIOReturnSuccess is returned.
-     */
-    virtual IOReturn dequeueEvent(UInt32 *event, UInt32 *data, bool sleep);
-
-    /* enqueueData will attempt to copy data from the specified buffer to the
-     *TX queue as a sequence of VALID_DATA events.  The argument bufferSize
-     *specifies the number of bytes to be sent.  The actual number of bytes
-     *transferred is returned in transferCount.  If sleep is true, then this
-     *method will sleep until all bytes can be transferred.  If sleep is
-     *false, then as many bytes as possible will be copied to the TX queue.
-     */
-    virtual IOReturn enqueueData(UInt8 *buffer,  UInt32 size, UInt32 *count, bool sleep );
-
-    /* dequeueData will attempt to copy data from the RX queue to the specified
-     *buffer.  No more than bufferSize VALID_DATA events will be transferred.
-     *In other words, copying will continue until either a non-data event is
-     *encountered or the transfer buffer is full.  The actual number of bytes
-     *transferred is returned in transferCount.
-     *
-     *The sleep semantics of this method are slightly more complicated than
-     *other methods in this API:  Basically, this method will continue to
-     *sleep until either minCount characters have been received or a non
-     *data event is next in the RX queue.  If minCount is zero, then this
-     *method never sleeps and will return immediatly if the queue is empty.
-     *
-     *The latency parameter specifies the maximum amount of time that should
-     *pass after the first character is available before the routine returns.
-     *This allows the caller to specify a 'packet' timeout.  The unit of the
-     *latency parameter is microseconds, though the exact delay may vary
-     *depending on the granularity of the timeout services available to the
-     *driver.
-     */
-    virtual IOReturn dequeueData(UInt8 *buffer, UInt32 size, UInt32 *count, UInt32 min);
-
-    /*	Internal for IOSerialDriver only */
-    virtual bool init(OSDictionary *dictionary = 0, void *refCon = 0);
-    virtual bool attach(IOService *provider);
-    void *getRefCon() const { return fRefCon; }
-
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  0);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  1);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  2);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  3);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  4);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  5);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  6);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  7);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  8);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync,  9);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 10);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 11);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 12);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 13);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 14);
-OSMetaClassDeclareReservedUnused(IOSerialStreamSync, 15);
-};
-
-#endif /* !_SERIAL_IOSERIALSTREAMSYNC_H */
-
-
diff --git a/i386/include/IOKit/storage/.svn/all-wcprops b/i386/include/IOKit/storage/.svn/all-wcprops
deleted file mode 100644
index 394531d..0000000
--- a/i386/include/IOKit/storage/.svn/all-wcprops
+++ /dev/null
@@ -1,185 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 60
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage
-END
-IOBDBlockStorageDriver.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOBDBlockStorageDriver.h
-END
-IOCDBlockStorageDriver.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOCDBlockStorageDriver.h
-END
-IODVDTypes.h
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IODVDTypes.h
-END
-IOStorage.h
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOStorage.h
-END
-IOCDPartitionScheme.h
-K 25
-svn:wc:ra_dav:version-url
-V 82
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOCDPartitionScheme.h
-END
-IOBDBlockStorageDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOBDBlockStorageDevice.h
-END
-IODVDMediaBSDClient.h
-K 25
-svn:wc:ra_dav:version-url
-V 82
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IODVDMediaBSDClient.h
-END
-IOCDBlockStorageDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOCDBlockStorageDevice.h
-END
-IOGUIDPartitionScheme.h
-K 25
-svn:wc:ra_dav:version-url
-V 84
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOGUIDPartitionScheme.h
-END
-IOMediaBSDClient.h
-K 25
-svn:wc:ra_dav:version-url
-V 79
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOMediaBSDClient.h
-END
-IOBDTypes.h
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOBDTypes.h
-END
-IOFilterScheme.h
-K 25
-svn:wc:ra_dav:version-url
-V 77
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOFilterScheme.h
-END
-IOCDTypes.h
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOCDTypes.h
-END
-IOBDMediaBSDClient.h
-K 25
-svn:wc:ra_dav:version-url
-V 81
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOBDMediaBSDClient.h
-END
-IODVDMedia.h
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IODVDMedia.h
-END
-IOCDMediaBSDClient.h
-K 25
-svn:wc:ra_dav:version-url
-V 81
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOCDMediaBSDClient.h
-END
-IOFDiskPartitionScheme.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOFDiskPartitionScheme.h
-END
-IOMedia.h
-K 25
-svn:wc:ra_dav:version-url
-V 70
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOMedia.h
-END
-IOApplePartitionScheme.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOApplePartitionScheme.h
-END
-IOStorageDeviceCharacteristics.h
-K 25
-svn:wc:ra_dav:version-url
-V 93
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOStorageDeviceCharacteristics.h
-END
-IOStorageProtocolCharacteristics.h
-K 25
-svn:wc:ra_dav:version-url
-V 95
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOStorageProtocolCharacteristics.h
-END
-IOBDMedia.h
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOBDMedia.h
-END
-IOCDMedia.h
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOCDMedia.h
-END
-IOAppleLabelScheme.h
-K 25
-svn:wc:ra_dav:version-url
-V 81
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOAppleLabelScheme.h
-END
-IODVDBlockStorageDriver.h
-K 25
-svn:wc:ra_dav:version-url
-V 86
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IODVDBlockStorageDriver.h
-END
-IOBlockStorageDriver.h
-K 25
-svn:wc:ra_dav:version-url
-V 83
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOBlockStorageDriver.h
-END
-IODVDBlockStorageDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 86
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IODVDBlockStorageDevice.h
-END
-IOFireWireStorageCharacteristics.h
-K 25
-svn:wc:ra_dav:version-url
-V 95
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOFireWireStorageCharacteristics.h
-END
-IOPartitionScheme.h
-K 25
-svn:wc:ra_dav:version-url
-V 80
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/IOPartitionScheme.h
-END
-IOBlockStorageDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 83
-/svn/chameleon/!svn/ver/916/trunk/i386/include/IOKit/storage/IOBlockStorageDevice.h
-END
diff --git a/i386/include/IOKit/storage/.svn/entries b/i386/include/IOKit/storage/.svn/entries
deleted file mode 100644
index a1d8a49..0000000
--- a/i386/include/IOKit/storage/.svn/entries
+++ /dev/null
@@ -1,1051 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/storage
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IODVDTypes.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-e483ef56f42ffa0797fc8f07728e977b
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10778
-
-IOCDBlockStorageDriver.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-7e573eee203505f040b6c91952fd27ed
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1784
-
-IOStorage.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-6861395312a6c4d8504025439259a31d
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6542
-
-IOCDBlockStorageDevice.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-be4d88548b1a690ae872cd2bf28b314f
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1824
-
-IOMediaBSDClient.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-a223d0e3c33fa4525eed3f70692b2d17
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1089
-
-IOBDMediaBSDClient.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-a69c6652c046f1a8e2f067ee0e24abc3
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5362
-
-IODVDMedia.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-ae6b1b0b9061f9a228168c7e85b9c301
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11327
-
-IOApplePartitionScheme.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-a056bad5bd21b62813749928b63112e8
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5490
-
-IOBlockStorageDriver.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-91aa9b08fb435bcbe41cd3c05ac1c928
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8744
-
-IOPartitionScheme.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-0860e541b3aff31008ce2090fb58f93a
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-13964
-
-IOBlockStorageDevice.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-6f8ecd4d8450d6756ab68814db44e1ce
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2369
-
-IOBDBlockStorageDriver.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-7cf5b5bb3b93251c88ce55e0df8066a8
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6051
-
-IODVDMediaBSDClient.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-08191d1ae4cc6a238b9316ab3b38b716
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5926
-
-IOBDBlockStorageDevice.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-2c1c0ef6332409dae6b2795d999febbd
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5189
-
-IOCDPartitionScheme.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-844d9d0d2381539689b148fd89410116
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8152
-
-IOGUIDPartitionScheme.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-530816f5541c8445445c5fea0f26732f
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2402
-
-IOFilterScheme.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-e33b7cb7900db1f675747ebcce9eabac
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11039
-
-IOBDTypes.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-f925111d2be6068af39a1455b650c50e
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3423
-
-IOCDTypes.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-568a8b5033fcc89b9bf5e2f5477f3898
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12304
-
-IOCDMediaBSDClient.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-a923162dc13ec3c65bf9a8630545768b
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6004
-
-IOMedia.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-81f4dba74563d2f012e1f1132ff141e5
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6890
-
-IOFDiskPartitionScheme.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-f9744ba40c80f31b76dd1dffad9efd77
-2011-05-29T20:31:39.361475Z
-916
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4057
-
-IOStorageDeviceCharacteristics.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-8684062918e25591b2a0428cee9832b2
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-14734
-
-IOStorageProtocolCharacteristics.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-325514be8136f0b9e64be88e35e9fe8d
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-40195
-
-IOBDMedia.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-1ebd0da1f4d15c3942b7afad837f8401
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9148
-
-IOAppleLabelScheme.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-5694e06bb45c5a8e4be155f216878cc8
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5461
-
-IOCDMedia.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-6678a0743a966704a1b36bc02b9d5703
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-21272
-
-ata
-dir
-
-IODVDBlockStorageDriver.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-e4adcc63709c7d75558955fb8607ba2d
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9113
-
-IOFireWireStorageCharacteristics.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-c2f19d1a81610ee239cb252b99f75f74
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2057
-
-IODVDBlockStorageDevice.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-c7b8a53c5a82f8f283d2da92e6d3f903
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5839
-
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOAppleLabelScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOAppleLabelScheme.h.svn-base
deleted file mode 100644
index 6e290a4..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOAppleLabelScheme.h.svn-base
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * This header contains the IOAppleLabelScheme class definition.
- */
-
-#ifndef _IOAPPLELABELSCHEME_H
-#define _IOAPPLELABELSCHEME_H
-
-#include <IOKit/IOTypes.h>
-
-/*
- * kIOAppleLabelSchemeClass is the name of the IOAppleLabelScheme class.
- */
-
-#define kIOAppleLabelSchemeClass "IOAppleLabelScheme"
-
-/*
- * Apple Label Scheme Definitions
- */
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/* Label scheme. */
-
-struct applelabel
-{
-    uint8_t  al_boot0[416];               /* (reserved for boot area)         */
-    uint16_t al_magic;                    /* (the magic number)               */
-    uint16_t al_type;                     /* (label type)                     */
-    uint32_t al_flags;                    /* (generic flags)                  */
-    uint64_t al_offset;                   /* (offset of property area, bytes) */
-    uint32_t al_size;                     /* (size of property area, bytes)   */
-    uint32_t al_checksum;                 /* (checksum of property area)      */
-    uint8_t  al_boot1[72];                /* (reserved for boot area)         */
-};
-
-/* Label scheme signature (al_magic). */
-
-#define AL_MAGIC 0x414C
-
-/* Label scheme version (al_type). */
-
-#define AL_TYPE_DEFAULT 0x0000
-
-/* Label scheme flags (al_flags). */
-
-#define AL_FLAG_DEFAULT 0x00000000
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOFilterScheme.h>
-
-/*
- * Class
- */
-
-class IOAppleLabelScheme : public IOFilterScheme
-{
-    OSDeclareDefaultStructors(IOAppleLabelScheme);
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    IOMedia * _content;
-
-    /*
-     * Free all of this object's outstanding resources.
-     */
-
-    virtual void free(void);
-
-    /*
-     * Scan the provider media for an Apple label scheme.
-     */
-
-    virtual IOMedia * scan(SInt32 * score);
-
-    /*
-     * Ask whether the given content appears to be corrupt.
-     */
-
-    virtual bool isContentCorrupt(OSDictionary * properties);
-
-    /*
-     * Ask whether the given content appears to be invalid.
-     */
-
-    virtual bool isContentInvalid(OSDictionary * properties);
-
-    /*
-     * Instantiate a new media object to represent the given content.
-     */
-
-    virtual IOMedia * instantiateMediaObject(OSDictionary * properties);
-
-    /*
-     * Allocate a new media object (called from instantiateMediaObject).
-     */
-
-    virtual IOMedia * instantiateDesiredMediaObject(OSDictionary * properties);
-
-    /*
-     * Attach the given media object to the device tree plane.
-     */
-
-    virtual bool attachMediaObjectToDeviceTree(IOMedia * media);
-
-    /*
-     * Detach the given media object from the device tree plane.
-     */
-
-    virtual void detachMediaObjectFromDeviceTree(IOMedia * media);
-
-public:
-
-    /*
-     * Initialize this object's minimal state.
-     */
-
-    virtual bool init(OSDictionary * properties = 0);
-
-    /*
-     * Determine whether the provider media contains an Apple label scheme.
-     */
-
-    virtual IOService * probe(IOService * provider, SInt32 * score);
-
-    /*
-     * Publish the new media object which represents our content.
-     */
-
-    virtual bool start(IOService * provider);
-
-    /*
-     * Clean up after the media object we published before terminating.
-     */
-
-    virtual void stop(IOService * provider);
-
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  0);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  1);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  2);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  3);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  4);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  5);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  6);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  7);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  8);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  9);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 10);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 11);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 12);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 13);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 14);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 15);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOAPPLELABELSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOApplePartitionScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOApplePartitionScheme.h.svn-base
deleted file mode 100644
index ace1f3b..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOApplePartitionScheme.h.svn-base
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * This header contains the IOApplePartitionScheme class definition.
- */
-
-#ifndef _IOAPPLEPARTITIONSCHEME_H
-#define _IOAPPLEPARTITIONSCHEME_H
-
-#include <IOKit/IOTypes.h>
-
-/*
- * kIOApplePartitionSchemeClass is the name of the IOApplePartitionScheme class.
- */
-
-#define kIOApplePartitionSchemeClass "IOApplePartitionScheme"
-
-/*
- * Apple Partition Map Definitions
- */
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/* Structure constants. */
-
-#define DPISTRLEN 32
-
-/* Partition map entry, as found in blocks 1 to dpme_map_entries of the disk. */
-
-typedef struct dpme
-{
-    UInt16  dpme_signature;       /* (unique value for partition entry, 'PM') */
-    UInt16  dpme_reserved_1;      /* (reserved for future use)                */
-    UInt32  dpme_map_entries;     /* (number of partition entries)            */
-    UInt32  dpme_pblock_start;    /* (physical block start of partition)      */
-    UInt32  dpme_pblocks;         /* (physical block count of partition)      */
-    char    dpme_name[DPISTRLEN]; /* (name of partition)                      */
-    char    dpme_type[DPISTRLEN]; /* (type of partition, eg. Apple_HFS)       */
-    UInt32  dpme_lblock_start;    /* (logical block start of partition)       */
-    UInt32  dpme_lblocks;         /* (logical block count of partition)       */
-    UInt32  dpme_flags;           /* (partition flags, see defines below)     */
-    UInt32  dpme_boot_block;      /* (logical block start of boot code)       */
-    UInt32  dpme_boot_bytes;      /* (byte count of boot code)                */
-    UInt32  dpme_load_addr;       /* (load address in memory of boot code)    */
-    UInt32  dpme_load_addr_2;     /* (reserved for future use)                */
-    UInt32  dpme_goto_addr;       /* (jump address in memory of boot code)    */
-    UInt32  dpme_goto_addr_2;     /* (reserved for future use)                */
-    UInt32  dpme_checksum;        /* (checksum of boot code)                  */
-    UInt8   dpme_process_id[16];  /* (processor type)                         */
-    UInt32  dpme_reserved_2[32];  /* (reserved for future use)                */
-    UInt32  dpme_reserved_3[62];  /* (reserved for future use)                */
-} DPME;
-
-/* Driver descriptor map entry. */
-
-typedef struct DDMap
-{
-    UInt32  ddBlock;              /* (driver's block start, sbBlkSize-blocks) */
-    UInt16  ddSize;               /* (driver's block count, 512-blocks)       */
-    UInt16  ddType;               /* (driver's system type)                   */
-} DDMap;
-
-/* Driver descriptor map, as found in block zero of the disk. */
-
-typedef struct Block0
-{
-    UInt16  sbSig;                     /* (unique value for block zero, 'ER') */
-    UInt16  sbBlkSize;                 /* (block size for this device)        */
-    UInt32  sbBlkCount;                /* (block count for this device)       */
-    UInt16  sbDevType;                 /* (device type)                       */
-    UInt16  sbDevId;                   /* (device id)                         */
-    UInt32  sbDrvrData;                /* (driver data)                       */
-    UInt16  sbDrvrCount;               /* (driver descriptor count)           */
-    DDMap   sbDrvrMap[8];              /* (driver descriptor table)           */
-    UInt8   sbReserved[430];           /* (reserved for future use)           */
-} Block0;
-
-/* Partition map signature (sbSig). */
-
-#define BLOCK0_SIGNATURE 0x4552
-
-/* Partition map entry signature (dpme_signature). */
-
-#define DPME_SIGNATURE 0x504D
-
-/* Partition map entry flags (dpme_flags). */
-
-#define DPME_FLAGS_VALID          0x00000001                   /* (bit 0)     */
-#define DPME_FLAGS_ALLOCATED      0x00000002                   /* (bit 1)     */
-#define DPME_FLAGS_IN_USE         0x00000004                   /* (bit 2)     */
-#define DPME_FLAGS_BOOTABLE       0x00000008                   /* (bit 3)     */
-#define DPME_FLAGS_READABLE       0x00000010                   /* (bit 4)     */
-#define DPME_FLAGS_WRITABLE       0x00000020                   /* (bit 5)     */
-#define DPME_FLAGS_OS_PIC_CODE    0x00000040                   /* (bit 6)     */
-#define DPME_FLAGS_OS_SPECIFIC_2  0x00000080                   /* (bit 7)     */
-#define DPME_FLAGS_OS_SPECIFIC_1  0x00000100                   /* (bit 8)     */
-#define DPME_FLAGS_RESERVED_2     0xFFFFFE00                   /* (bit 9..31) */
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* !_IOAPPLEPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDevice.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDevice.h.svn-base
deleted file mode 100644
index 66a09d7..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDevice.h.svn-base
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOBDBlockStorageDevice
- * @abstract
- * This header contains the IOBDBlockStorageDevice class definition.
- */
-
-#ifndef	_IOBDBLOCKSTORAGEDEVICE_H
-#define	_IOBDBLOCKSTORAGEDEVICE_H
-
-#include <IOKit/storage/IOBDTypes.h>
-
-/*!
- * @defined kIOBDBlockStorageDeviceClass
- * @abstract
- * kIOBDBlockStorageDeviceClass is the name of the IOBDBlockStorageDevice class.
- * @discussion
- * kIOBDBlockStorageDeviceClass is the name of the IOBDBlockStorageDevice class.
- */
-
-#define kIOBDBlockStorageDeviceClass "IOBDBlockStorageDevice"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IODVDBlockStorageDevice.h>
-
-/* Property used for matching, so the generic driver gets the nub it wants. */
-#define	kIOBlockStorageDeviceTypeBD	"BD"
-
-/*!
- * @class
- * IOBDBlockStorageDevice
- * @abstract
- * The IOBDBlockStorageDevice class is a generic BD block storage device
- * abstraction.
- * @discussion
- * This class is the protocol for generic BD functionality, independent of
- * the physical connection protocol (e.g. SCSI, ATA, USB).
- *
- * The APIs are the union of CD APIs, DVD APIs, and all
- * necessary new low-level BD APIs.
- *
- * A subclass implements relay methods that translate our requests into
- * calls to a protocol- and device-specific provider.
- */
-
-class IOBDBlockStorageDevice : public IODVDBlockStorageDevice
-{
-    OSDeclareAbstractStructors(IOBDBlockStorageDevice)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*!
-     * @function init
-     * @discussion
-     * Initialize this object's minimal state.
-     * @param properties
-     * Substitute property table for this object (optional).
-     * @result
-     * Returns true on success, false otherwise.
-     */
-
-    virtual bool init(OSDictionary * properties);
-
-    /*!
-     * @function readDiscStructure
-     * @discussion
-     * Issue an MMC READ DISC STRUCTURE command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param format
-     * As documented by MMC.
-     * @param address
-     * As documented by MMC.
-     * @param layer
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @param type
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readDiscStructure( IOMemoryDescriptor * buffer,
-                                        UInt8                format,
-                                        UInt32               address,
-                                        UInt8                layer,
-                                        UInt8                grantID,
-                                        UInt8                type ) = 0;
-
-    /*!
-     * @function splitTrack
-     * @discussion
-     * Issue an MMC RESERVE TRACK command with the ARSV bit.
-     * @param address
-     * As documented by MMC.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn splitTrack(UInt32 address) = 0;
-
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  0);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  1);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  2);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  3);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  4);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  5);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  6);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  7);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  8);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  9);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 10);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 11);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 12);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 13);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 14);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 15);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOBDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDriver.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDriver.h.svn-base
deleted file mode 100644
index 199218c..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOBDBlockStorageDriver.h.svn-base
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOBDBlockStorageDriver
- * @abstract
- * This header contains the IOBDBlockStorageDriver class definition.
- * @discussion
- * This class implements BD functionality, independent of
- * the physical connection protocol (e.g. SCSI, ATA, USB).
- *
- * A protocol-specific provider implements the functionality using an appropriate
- * protocol and commands.
- */
-
-#ifndef	_IOBDBLOCKSTORAGEDRIVER_H
-#define	_IOBDBLOCKSTORAGEDRIVER_H
-
-#include <IOKit/storage/IOBDBlockStorageDevice.h>
-#include <IOKit/storage/IODVDBlockStorageDriver.h>
-
-/*!
- * @defined kIOBDBlockStorageDriverClass
- * @abstract
- * kIOBDBlockStorageDriverClass is the name of the IOBDBlockStorageDriver class.
- * @discussion
- * kIOBDBlockStorageDriverClass is the name of the IOBDBlockStorageDriver class.
- */
-
-#define kIOBDBlockStorageDriverClass "IOBDBlockStorageDriver"
-
-/*!
- * @class
- * IOBDBlockStorageDriver
- * @abstract
- * Generic BD Driver.
- * @discussion
- * Storage drivers are split into two parts: the Generic Driver handles
- * all generic device issues, independent of the lower-level transport
- * mechanism (e.g. SCSI, ATA, USB, FireWire). All storage operations
- * at the Generic Driver level are translated into a series of generic
- * device operations. These operations are passed via the Device Nub
- * to a Transport Driver, which implements the appropriate
- * transport-dependent protocol to execute these operations.
- * 
- * To determine the write-protect state of a device (or media), for
- * example, the generic driver would issue a call to the
- * Transport Driver's reportWriteProtection method. If this were a SCSI
- * device, its Transport Driver would issue a Mode Sense command to
- * extract the write-protection status bit. The Transport Driver then
- * reports true or false to the generic driver.
- * 
- * The generic driver therefore has no knowledge of, or involvement
- * with, the actual commands and mechanisms used to communicate with
- * the device. It is expected that the generic driver will rarely, if
- * ever, need to be subclassed to handle device idiosyncrasies; rather,
- * the Transport Driver should be changed via overrides.
- * 
- * A generic driver could be subclassed to create a different type of
- * generic device. The generic driver IOBDBlockStorageDriver class is a subclass
- * of IODVDBlockStorageDriver, adding BD functions. Similarly, the Transport Driver
- * IOBDBlockStorageDevice is a subclass of IODVDBlockStorageDevice, adding BD 
- * functions.
-*/
-
-class IOBDBlockStorageDriver : public IODVDBlockStorageDriver
-{
-    OSDeclareDefaultStructors(IOBDBlockStorageDriver)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    /* Overrides of IODVDBlockStorageDriver. */
-
-    virtual IOReturn acceptNewMedia(void);
-
-    /* End of IODVDBlockStorageDriver overrides. */
-
-public:
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method to
-     * return a more specific subclass of IOService -- IOBDBlockStorageDevice.
-     * This method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOBDBlockStorageDevice * getProvider() const;
-
-    /* Overrides of IODVDBlockStorageDriver: */
-
-    virtual const char * getDeviceTypeName(void);
-    virtual IOMedia * instantiateDesiredMediaObject(void);
-    virtual IOMedia * instantiateMediaObject(UInt64 base,UInt64 byteSize,
-                                            UInt32 blockSize,char *mediaName);
-    virtual IOReturn readStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
-                                        const UInt32 address,const UInt8 layer,const UInt8 agid);
-
-    /* End of IODVDBlockStorageDriver overrides. */
-
-    /*!
-     * @function splitTrack
-     * @discussion
-     * Issue an MMC RESERVE TRACK command with the ARSV bit.
-     * @param address
-     * As documented by MMC.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn splitTrack(UInt32 address);
-
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  0);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  1);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  2);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  3);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  4);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  5);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  6);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  7);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  8);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  9);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 10);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 11);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 12);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 13);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 14);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 15);
-};
-
-#endif  /* !_IOBDBLOCKSTORAGEDRIVER_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBDMedia.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBDMedia.h.svn-base
deleted file mode 100644
index e204a1e..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOBDMedia.h.svn-base
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOBDMedia
- * @abstract
- * This header contains the IOBDMedia class definition.
- */
-
-#ifndef _IOBDMEDIA_H
-#define _IOBDMEDIA_H
-
-/*!
- * @defined kIOBDMediaClass
- * @abstract
- * kIOBDMediaClass is the name of the IOBDMedia class.
- * @discussion
- * kIOBDMediaClass is the name of the IOBDMedia class.
- */
-
-#define kIOBDMediaClass "IOBDMedia"
-
-/*!
- * @defined kIOBDMediaTypeKey
- * @abstract
- * kIOBDMediaTypeKey is a property of IOBDMedia objects.  It has an OSString
- * value.
- * @discussion
- * The kIOBDMediaTypeKey property identifies the BD media type (BD-ROM, BD-R,
- * BD-RE, etc).  See the kIOBDMediaType contants for possible values.
- */
-
-#define kIOBDMediaTypeKey "Type"
-
-/*!
- * @defined kIOBDMediaTypeROM
- * The kIOBDMediaTypeKey constant for BD-ROM media.
- */
-
-#define kIOBDMediaTypeROM "BD-ROM"
-
-/*!
- * @defined kIOBDMediaTypeR
- * The kIOBDMediaTypeKey constant for BD-R media.
- */
-
-#define kIOBDMediaTypeR "BD-R"
-
-/*!
- * @defined kIOBDMediaTypeRE
- * The kIOBDMediaTypeKey constant for BD-RE media.
- */
-
-#define kIOBDMediaTypeRE "BD-RE"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOBDBlockStorageDriver.h>
-#include <IOKit/storage/IOMedia.h>
-
-/*!
- * @class IOBDMedia
- * @abstract
- * The IOBDMedia class is a random-access disk device abstraction for BDs.
- * @discussion
- * The IOBDMedia class is a random-access disk device abstraction for BDs.
- */
-
-class IOBDMedia : public IOMedia
-{
-    OSDeclareDefaultStructors(IOBDMedia)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*
-     * Obtain this object's provider.   We override the superclass's method to
-     * return a more specific subclass of IOService -- IOBDBlockStorageDriver.
-     * This method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOBDBlockStorageDriver * getProvider() const;
-
-    /*
-     * Compare the properties in the supplied table to this object's properties.
-     */
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
-
-    /*!
-     * @function reportKey
-     * @discussion
-     * Issue an MMC REPORT KEY command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param keyClass
-     * As documented by MMC.
-     * @param address
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @param format
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn reportKey( IOMemoryDescriptor * buffer,
-                                UInt8                keyClass,
-                                UInt32               address,
-                                UInt8                grantID,
-                                UInt8                format );
-
-    /*!
-     * @function sendKey
-     * @discussion
-     * Issue an MMC SEND KEY command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param keyClass
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @param format
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn sendKey( IOMemoryDescriptor * buffer,
-                              UInt8                keyClass,
-                              UInt8                grantID,
-                              UInt8                format );
-
-    /*!
-     * @function readStructure
-     * @discussion
-     * Issue an MMC READ DISC STRUCTURE command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param format
-     * As documented by MMC.
-     * @param address
-     * As documented by MMC.
-     * @param layer
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readStructure( IOMemoryDescriptor *     buffer,
-                                    UInt8                    format,
-                                    UInt32                   address,
-                                    UInt8                    layer,
-                                    UInt8                    grantID );
-
-    /*!
-     * @function getSpeed
-     * @discussion
-     * Get the current speed used for data transfers.
-     * @param kilobytesPerSecond
-     * Returns the current speed used for data transfers, in kB/s.
-     *
-     * kBDSpeedMin specifies the minimum speed for all BD media (1X).
-     * kBDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond);
-
-    /*!
-     * @function setSpeed
-     * @discussion
-     * Set the speed to be used for data transfers.
-     * @param kilobytesPerSecond
-     * Speed to be used for data transfers, in kB/s.
-     *
-     * kBDSpeedMin specifies the minimum speed for all BD media (1X).
-     * kBDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond);
-
-    /*!
-     * @function readDiscInfo
-     * @discussion
-     * Issue an MMC READ DISC INFORMATION command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param type
-     * Reserved for future use.  Set to zero.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readDiscInfo( IOMemoryDescriptor * buffer,
-                                   UInt8                type,
-                                   UInt16 *             actualByteCount );
-
-    /*!
-     * @function readTrackInfo
-     * @discussion
-     * Issue an MMC READ TRACK INFORMATION command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param address
-     * As documented by MMC.
-     * @param addressType
-     * As documented by MMC.
-     * @param open
-     * Reserved for future use.  Set to zero.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readTrackInfo( IOMemoryDescriptor * buffer,
-                                    UInt32               address,
-                                    UInt8                addressType,
-                                    UInt8                open,
-                                    UInt16 *             actualByteCount );
-
-    /*!
-     * @function splitTrack
-     * @discussion
-     * Issue an MMC RESERVE TRACK command with the ARSV bit.
-     * @param address
-     * As documented by MMC.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn splitTrack(UInt32 address);
-
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  0);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  1);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  2);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  3);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  4);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  5);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  6);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  7);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  8);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  9);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 10);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 11);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 12);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 13);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 14);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 15);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOBDMEDIA_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBDMediaBSDClient.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBDMediaBSDClient.h.svn-base
deleted file mode 100644
index ee356f5..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOBDMediaBSDClient.h.svn-base
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOBDMEDIABSDCLIENT_H
-#define _IOBDMEDIABSDCLIENT_H
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
-
-#include <IOKit/storage/IOBDTypes.h>
-
-/*
- * Definitions
- *
- * ioctl                        description
- * ---------------------------- ------------------------------------------------
- * DKIOCBDREADSTRUCTURE         see IOBDMedia::readStructure()    in IOBDMedia.h
- *
- * DKIOCBDREADDISCINFO          see IOBDMedia::readDiscInfo()     in IOBDMedia.h
- * DKIOCBDREADTRACKINFO         see IOBDMedia::readTrackInfo()    in IOBDMedia.h
- *
- * DKIOCBDREPORTKEY             see IOBDMedia::reportKey()        in IOBDMedia.h
- * DKIOCBDSENDKEY               see IOBDMedia::sendKey()          in IOBDMedia.h
- *
- * DKIOCBDGETSPEED              see IOBDMedia::getSpeed()         in IOBDMedia.h
- * DKIOCBDSETSPEED              see IOBDMedia::setSpeed()         in IOBDMedia.h
- *
- *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
- */
-
-typedef struct
-{
-    uint8_t  format;
-
-    uint8_t  reserved0008[3];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  grantID;
-    uint8_t  layer;
-
-    uint8_t  reserved0080[4];                      /* reserved, clear to zero */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_bd_read_structure_t;
-
-typedef struct
-{
-    uint8_t  format;
-    uint8_t  keyClass;
-
-    uint8_t  reserved0016[2];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  grantID;
-
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_bd_report_key_t;
-
-typedef struct
-{
-    uint8_t  format;
-    uint8_t  keyClass;
-
-    uint8_t  reserved0016[6];                      /* reserved, clear to zero */
-
-    uint8_t  grantID;
-
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_bd_send_key_t;
-
-typedef struct
-{
-    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_bd_read_disc_info_t;
-
-typedef struct
-{
-    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  addressType;
-
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_bd_read_track_info_t;
-
-#define DKIOCBDREADSTRUCTURE _IOW('d', 160, dk_bd_read_structure_t)
-#define DKIOCBDREPORTKEY     _IOW('d', 161, dk_bd_report_key_t)
-#define DKIOCBDSENDKEY       _IOW('d', 162, dk_bd_send_key_t)
-
-#define DKIOCBDGETSPEED      _IOR('d', 163, uint16_t)
-#define DKIOCBDSETSPEED      _IOW('d', 163, uint16_t)
-
-#define DKIOCBDREADDISCINFO  _IOWR('d', 164, dk_bd_read_disc_info_t)
-#define DKIOCBDREADTRACKINFO _IOWR('d', 165, dk_bd_read_track_info_t)
-
-#define DKIOCBDSPLITTRACK    _IOW('d', 166, uint32_t)
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOBDMedia.h>
-#include <IOKit/storage/IOMediaBSDClient.h>
-
-/*
- * Class
- */
-
-class IOBDMediaBSDClient : public IOMediaBSDClient
-{
-    OSDeclareDefaultStructors(IOBDMediaBSDClient)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method
-     * to return a more specific subclass of IOService -- IOBDMedia.  This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOBDMedia * getProvider() const;
-
-    /*
-     * Process a BD-specific ioctl.
-     */
-
-    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
-
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 0);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 1);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 2);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 3);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 4);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 5);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 6);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 7);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOBDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBDTypes.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBDTypes.h.svn-base
deleted file mode 100644
index f5b7927..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOBDTypes.h.svn-base
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef	_BDTYPES_H
-#define	_BDTYPES_H
-
-#include <IOKit/IOTypes.h>
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/*
- * Media Types
- */
-
-enum
-{
-    kBDMediaTypeUnknown   = 0x0300,
-    kBDMediaTypeROM       = 0x0302, /* BD-ROM */
-    kBDMediaTypeRE        = 0x0303, /* BD-RE  */
-    kBDMediaTypeR         = 0x0304, /* BD-R   */
-
-    kBDMediaTypeMin       = 0x0300,
-    kBDMediaTypeMax       = 0x03FF
-};
-
-typedef UInt32 BDMediaType;
-
-/*
- * Media Speed (kB/s)
- */
-
-#define kBDSpeedMin 0x1126
-#define kBDSpeedMax 0xFFFF
-
-/*
- * MMC Formats
- */
-
-// Read Disc Information Format
-struct BDDiscInfo
-{
-    UInt16 dataLength;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  discStatus:2;
-    UInt8  stateOfLastSession:2;
-    UInt8  erasable:1;
-    UInt8  dataType:3;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  dataType:3;
-    UInt8  erasable:1;
-    UInt8  stateOfLastSession:2;
-    UInt8  discStatus:2;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved2;
-    UInt8  numberOfSessionsLSB;
-    UInt8  firstTrackNumberInLastSessionLSB;
-    UInt8  lastTrackNumberInLastSessionLSB;
-    UInt8  reserved4[2];
-    UInt8  numberOfSessionsMSB;
-    UInt8  firstTrackNumberInLastSessionMSB;
-    UInt8  lastTrackNumberInLastSessionMSB;
-    UInt8  reserved6[22];
-};
-typedef struct BDDiscInfo BDDiscInfo;
-
-// Read Track Information Format
-struct BDTrackInfo
-{
-    UInt16 dataLength;
-    UInt8  trackNumberLSB;
-    UInt8  sessionNumberLSB;
-    UInt8  reserved;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  reserved2:5;
-    UInt8  damage:1;
-    UInt8  reserved3:2;
-
-    UInt8  reserved4:6;
-    UInt8  blank:1;
-    UInt8  reservedTrack:1;
-
-    UInt8  nextWritableAddressValid:1;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  reserved5:6;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved3:2;
-    UInt8  damage:1;
-    UInt8  reserved2:5;
-
-    UInt8  reservedTrack:1;
-    UInt8  blank:1;
-    UInt8  reserved4:6;
-
-    UInt8  reserved5:6;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  nextWritableAddressValid:1;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt32 trackStartAddress;
-    UInt32 nextWritableAddress;
-    UInt32 freeBlocks;
-    UInt32 clusterSize;
-    UInt32 trackSize;
-    UInt32 lastRecordedAddress;
-    UInt8  trackNumberMSB;
-    UInt8  sessionNumberMSB;
-    UInt8  reserved6;
-    UInt8  reserved7;
-};
-typedef struct BDTrackInfo BDTrackInfo;
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* _BDTYPES_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDevice.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDevice.h.svn-base
deleted file mode 100644
index bbec146..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDevice.h.svn-base
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOBlockStorageDevice
- * @abstract
- * This header contains the IOBlockStorageDevice class definition.
- */
-
-#ifndef _IOBLOCKSTORAGEDEVICE_H
-#define _IOBLOCKSTORAGEDEVICE_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
-
-/*!
- * @defined kIOBlockStorageDeviceClass
- * @abstract
- * The name of the IOBlockStorageDevice class.
- */
-
-#define kIOBlockStorageDeviceClass "IOBlockStorageDevice"
-
-/*!
- * @defined kIOBlockStorageDeviceWriteCacheStateKey
- * @abstract
- * The name of the property used to get or set the write cache state of the
- * block storage device.
- */
-#define kIOBlockStorageDeviceWriteCacheStateKey	"WriteCacheState"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/IOService.h>
-#include <IOKit/storage/IOMedia.h>
-
-/* Property used for matching, so the generic driver gets the nub it wants. */
-/*!
- * @defined kIOBlockStorageDeviceTypeKey
- * @abstract The name of the property tested for nub type matching by the generic block
- * storage driver.
- */
-#define	kIOBlockStorageDeviceTypeKey	"device-type"
-/*!
- * @defined kIOBlockStorageDeviceTypeGeneric
- * @abstract A character string used for nub matching.
- */
-#define	kIOBlockStorageDeviceTypeGeneric	"Generic"
-
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDriver.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDriver.h.svn-base
deleted file mode 100644
index 24ac3c2..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOBlockStorageDriver.h.svn-base
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOBlockStorageDriver
- * @abstract
- * This header contains the IOBlockStorageDriver class definition.
- */
-
-#ifndef _IOBLOCKSTORAGEDRIVER_H
-#define _IOBLOCKSTORAGEDRIVER_H
-
-#include <IOKit/IOTypes.h>
-
-/*!
- * @defined kIOBlockStorageDriverClass
- * @abstract
- * The name of the IOBlockStorageDriver class.
- */
-
-#define kIOBlockStorageDriverClass "IOBlockStorageDriver"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsKey
- * @abstract
- * Holds a table of numeric values describing the driver's
- * operating statistics.
- * @discussion
- * This property holds a table of numeric values describing the driver's
- * operating statistics.  The table is an OSDictionary, where each entry
- * describes one given statistic.
- */
-
-#define kIOBlockStorageDriverStatisticsKey "Statistics"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsBytesReadKey
- * @abstract
- * Describes the number of bytes read since the block storage
- * driver was instantiated.
- * @discussion
- * This property describes the number of bytes read since the block storage
- * driver was instantiated.  It is one of the statistic entries listed under
- * the top-level kIOBlockStorageDriverStatisticsKey property table.  It has
- * an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsBytesReadKey "Bytes (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsBytesWrittenKey
- * @abstract
- * Describes the number of bytes written since the block storage
- * driver was instantiated. 
- * @discussion
- * This property describes the number of bytes written since the block storage
- * driver was instantiated.  It is one of the statistic entries listed under the
- * top-level kIOBlockStorageDriverStatisticsKey property table.  It has an
- * OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsBytesWrittenKey "Bytes (Write)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsReadErrorsKey
- * @abstract
- * Describes the number of read errors encountered since the block
- * storage driver was instantiated. 
- * @discussion
- * This property describes the number of read errors encountered since the block
- * storage driver was instantiated.  It is one of the statistic entries listed
- * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
- * has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsReadErrorsKey "Errors (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsWriteErrorsKey
- * @abstract
- * Describes the number of write errors encountered since the
- * block storage driver was instantiated.
- * @discussion
- * This property describes the number of write errors encountered since the
- * block storage driver was instantiated.  It is one of the statistic entries
- * listed under the top-level kIOBlockStorageDriverStatisticsKey property table. 
- * It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsWriteErrorsKey "Errors (Write)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsLatentReadTimeKey
- * @abstract
- * Describes the number of nanoseconds of latency during reads
- * since the block storage driver was instantiated. 
- * @discussion
- * This property describes the number of nanoseconds of latency during reads
- * since the block storage driver was instantiated.  It is one of the statistic
- * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
- * property table.  It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsLatentReadTimeKey "Latency Time (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsLatentWriteTimeKey
- * @abstract
- * Describes the number of nanoseconds of latency during writes
- * since the block storage driver was instantiated. 
- * @discussion
- * This property describes the number of nanoseconds of latency during writes
- * since the block storage driver was instantiated.  It is one of the statistic
- * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
- * property table.  It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsLatentWriteTimeKey "Latency Time (Write)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsReadsKey
- * @abstract
- * Describes the number of read operations processed since the
- * block storage driver was instantiated.
- * @discussion
- * This property describes the number of read operations processed since the
- * block storage driver was instantiated.  It is one of the statistic entries
- * listed under the top-level kIOBlockStorageDriverStatisticsKey property table.
- * It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsReadsKey "Operations (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsWritesKey
- * @abstract
- * Describes the number of write operations processed since the
- * block storage driver was instantiated.
- * @discussion
- * This property describes the number of write operations processed since the
- * block storage driver was instantiated.  It is one of the statistic entries
- * listed under the top-level kIOBlockStorageDriverStatisticsKey property table.
- * It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsWritesKey "Operations (Write)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsReadRetriesKey
- * @abstract
- * Describes the number of read retries required since the block
- * storage driver was instantiated.
- * @discussion
- * This property describes the number of read retries required since the block
- * storage driver was instantiated.  It is one of the statistic entries listed
- * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
- * has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsReadRetriesKey "Retries (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsWriteRetriesKey
- * @abstract
- * Describes the number of write retries required since the block
- * storage driver was instantiated.
- * @discussion
- * This property describes the number of write retries required since the block
- * storage driver was instantiated.  It is one of the statistic entries listed
- * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
- * has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsWriteRetriesKey "Retries (Write)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsTotalReadTimeKey
- * @abstract
- * Describes the number of nanoseconds spent performing reads
- * since the block storage driver was instantiated.
- * @discussion
- * This property describes the number of nanoseconds spent performing reads
- * since the block storage driver was instantiated.  It is one of the statistic
- * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
- * property table.  It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsTotalReadTimeKey "Total Time (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsTotalWriteTimeKey
- * @abstract
- * Describes the number of nanoseconds spent performing writes
- * since the block storage driver was instantiated.
- * @discussion
- * This property describes the number of nanoseconds spent performing writes
- * since the block storage driver was instantiated.  It is one of the statistic
- * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
- * property table.  It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsTotalWriteTimeKey "Total Time (Write)"
-
-/*!
- * @enum IOMediaState
- * @abstract
- * The different states that getMediaState() can report.
- * @constant kIOMediaStateOffline
- * Media is not available.
- * @constant kIOMediaStateOnline
- * Media is available and ready for operations.
- * @constant kIOMediaStateBusy
- * Media is available, but not ready for operations.
- */
-
-enum
-{
-    kIOMediaStateOffline = 0,
-    kIOMediaStateOnline  = 1,
-    kIOMediaStateBusy    = 2
-};
-
-typedef UInt32 IOMediaState;
-
-#endif /* !_IOBLOCKSTORAGEDRIVER_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDevice.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDevice.h.svn-base
deleted file mode 100644
index 706da40..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDevice.h.svn-base
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOCDBlockStorageDevice
- * @abstract
- * This header contains the IOCDBlockStorageDevice class definition.
- */
-
-#ifndef _IOCDBLOCKSTORAGEDEVICE_H
-#define _IOCDBLOCKSTORAGEDEVICE_H
-
-#include <IOKit/storage/IOCDTypes.h>
-
-/*!
- * @defined kIOCDBlockStorageDeviceClass
- * @abstract
- * kIOCDBlockStorageDeviceClass is the name of the IOCDBlockStorageDevice class.
- * @discussion
- * kIOCDBlockStorageDeviceClass is the name of the IOCDBlockStorageDevice class.
- */
-
-#define kIOCDBlockStorageDeviceClass "IOCDBlockStorageDevice"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOBlockStorageDevice.h>
-
-/* Property used for matching, so the generic driver gets the nub it wants. */
-#define	kIOBlockStorageDeviceTypeCDROM	"CDROM"
-
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOCDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDriver.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDriver.h.svn-base
deleted file mode 100644
index f88a406..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOCDBlockStorageDriver.h.svn-base
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * IOCDBlockStorageDriver.h
- *
- * This class implements  CD functionality, independent of
- * the physical connection protocol (e.g. SCSI, ATA, USB).
- *
- * A protocol-specific provider implements the functionality using an appropriate
- * protocol and commands.
- */
-
-#ifndef	_IOCDBLOCKSTORAGEDRIVER_H
-#define	_IOCDBLOCKSTORAGEDRIVER_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/storage/IOCDBlockStorageDevice.h>
-#include <IOKit/storage/IOCDTypes.h>
-#include <IOKit/storage/IOBlockStorageDriver.h>
-
-/*!
- * @defined kIOCDBlockStorageDriverClass
- * @abstract
- * kIOCDBlockStorageDriverClass is the name of the IOCDBlockStorageDriver class.
- * @discussion
- * kIOCDBlockStorageDriverClass is the name of the IOCDBlockStorageDriver class.
- */
-
-#define kIOCDBlockStorageDriverClass "IOCDBlockStorageDriver"
-
-#endif
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDMedia.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDMedia.h.svn-base
deleted file mode 100644
index 85ad72d..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOCDMedia.h.svn-base
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOCDMedia
- * @abstract
- * This header contains the IOCDMedia class definition.
- */
-
-#ifndef _IOCDMEDIA_H
-#define _IOCDMEDIA_H
-
-/*!
- * @defined kIOCDMediaClass
- * @abstract
- * kIOCDMediaClass is the name of the IOCDMedia class.
- * @discussion
- * kIOCDMediaClass is the name of the IOCDMedia class.
- */
-
-#define kIOCDMediaClass "IOCDMedia"
-
-/*!
- * @defined kIOCDMediaTOCKey
- * @abstract
- * kIOCDMediaTOCKey is a property of IOCDMedia objects.  It has an OSData value
- * and a CDTOC structure.
- * @discussion
- * The kIOCDMediaTOCKey property contains the CD's full table of contents,
- * formatted as a CDTOC structure.  The CDTOC structure is same as what is
- * returned by a READ TOC command, format 0x02.  All fields in the TOC are
- * guaranteed to be binary-encoded (no BCD-encoded numbers are ever passed).
- */
-
-#define kIOCDMediaTOCKey "TOC"
-
-/*!
- * @defined kIOCDMediaTypeKey
- * @abstract
- * kIOCDMediaTypeKey is a property of IOCDMedia objects.  It has an OSString
- * value.
- * @discussion
- * The kIOCDMediaTypeKey property identifies the CD media type (CD-ROM, CD-R,
- * CD-RW, etc).  See the kIOCDMediaType contants for possible values.
- */
-
-#define kIOCDMediaTypeKey "Type"
-
-/*!
- * @defined kIOCDMediaTypeROM
- * The kIOCDMediaTypeKey constant for CD-ROM media (inclusive of the CD-I,
- * CD-ROM XA, and CD Audio standards, and mixed mode combinations thereof).
- */
-
-#define kIOCDMediaTypeROM "CD-ROM"
-
-/*!
- * @defined kIOCDMediaTypeR
- * The kIOCDMediaTypeKey constant for CD Recordable (CD-R) media.
- */
-
-#define kIOCDMediaTypeR "CD-R"
-
-/*!
- * @defined kIOCDMediaTypeRW
- * The kIOCDMediaTypeKey constant for CD ReWritable (CD-RW) media.
- */
-
-#define kIOCDMediaTypeRW "CD-RW"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOCDBlockStorageDriver.h>
-#include <IOKit/storage/IOMedia.h>
-
-/*!
- * @class IOCDMedia
- * @abstract
- * The IOCDMedia class is a random-access disk device abstraction for CDs.
- * @discussion
- * The IOCDMedia class is a random-access disk device abstraction for CDs. It
- * extends the IOMedia class by implementing special CD APIs, such as readCD,
- * and publishing the TOC as a property of the IOCDMedia object.
- */
-
-class IOCDMedia : public IOMedia
-{
-    OSDeclareDefaultStructors(IOCDMedia)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    using IOStorage::read;
-    using IOStorage::write;
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method to
-     * return a more specific subclass of IOService -- IOCDBlockStorageDriver.  
-     * This method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOCDBlockStorageDriver * getProvider() const;
-
-    /*
-     * Compare the properties in the supplied table to this object's properties.
-     */
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
-
-    /*!
-     * @function read
-     * @discussion
-     * Read data from the storage object at the specified byte offset into the
-     * specified buffer, asynchronously.   When the read completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the read.
-     * @param client
-     * Client requesting the read.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void read(IOService *           client,
-                      UInt64                byteStart,
-                      IOMemoryDescriptor *  buffer,
-                      IOStorageAttributes * attributes,
-                      IOStorageCompletion * completion);
-
-    /*
-     * @function write
-     * @discussion
-     * Write data into the storage object at the specified byte offset from the
-     * specified buffer, asynchronously.   When the write completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the write.
-     * @param client
-     * Client requesting the write.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void write(IOService *           client,
-                       UInt64                byteStart,
-                       IOMemoryDescriptor *  buffer,
-                       IOStorageAttributes * attributes,
-                       IOStorageCompletion * completion);
-
-    /*!
-     * @function readCD
-     * @discussion
-     * Read data from the CD media object at the specified byte offset into the
-     * specified buffer, asynchronously.  Special areas of the CD sector can be
-     * read via this method, such as the header and subchannel data.   When the
-     * read completes, the caller will be notified via the specified completion
-     * action.
-     *
-     * The buffer will be retained for the duration of the read.
-     * @param client
-     * Client requesting the read.
-     * @param byteStart
-     * Starting byte offset for the data transfer (see sectorArea parameter).
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param sectorArea
-     * Sector area(s) to read.  The sum of each area's size defines the natural
-     * block size of the media for the call.  This should be taken into account
-     * when computing the address of byteStart.  See IOCDTypes.h.
-     * @param sectorType
-     * Sector type that is expected.  The data transfer is terminated as soon as
-     * data is encountered that does not match the expected type.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-#ifdef __LP64__
-    virtual void readCD(IOService *           client,
-                        UInt64                byteStart,
-                        IOMemoryDescriptor *  buffer,
-                        CDSectorArea          sectorArea,
-                        CDSectorType          sectorType,
-                        IOStorageAttributes * attributes,
-                        IOStorageCompletion * completion);
-#else /* !__LP64__ */
-    virtual void readCD(IOService *           client,
-                        UInt64                byteStart,
-                        IOMemoryDescriptor *  buffer,
-                        CDSectorArea          sectorArea,
-                        CDSectorType          sectorType,
-                        IOStorageCompletion   completion);
-#endif /* !__LP64__ */
-
-    /*!
-     * @function readCD
-     * @discussion
-     * Read data from the CD media object at the specified byte offset into the
-     * specified buffer, synchronously.   Special areas of the CD sector can be
-     * read via this method, such as the header and subchannel data.   When the
-     * read completes, this method will return to the caller.   The actual byte
-     * count field is optional.
-     * @param client
-     * Client requesting the read.
-     * @param byteStart
-     * Starting byte offset for the data transfer (see sectorArea parameter).
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param sectorArea
-     * Sector area(s) to read.  The sum of each area's size defines the natural
-     * block size of the media for the call.  This should be taken into account
-     * when computing the address of byteStart.  See IOCDTypes.h.
-     * @param sectorType
-     * Sector type that is expected.  The data transfer is terminated as soon as
-     * data is encountered that does not match the expected type.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-#ifdef __LP64__
-    virtual IOReturn readCD(IOService *           client,
-                            UInt64                byteStart,
-                            IOMemoryDescriptor *  buffer,
-                            CDSectorArea          sectorArea,
-                            CDSectorType          sectorType,
-                            IOStorageAttributes * attributes      = 0,
-                            UInt64 *              actualByteCount = 0);
-#else /* !__LP64__ */
-    virtual IOReturn readCD(IOService *           client,
-                            UInt64                byteStart,
-                            IOMemoryDescriptor *  buffer,
-                            CDSectorArea          sectorArea,
-                            CDSectorType          sectorType,
-                            UInt64 *              actualByteCount = 0);
-#endif /* !__LP64__ */
-
-    /*!
-     * @function readISRC
-     * @discussion
-     * Read the International Standard Recording Code for the specified track.
-     * @param track
-     * Track number from which to read the ISRC.
-     * @param isrc
-     * Buffer for the ISRC data.  Buffer contents will be zero-terminated.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn readISRC(UInt8 track, CDISRC isrc);
-    
-    /*!
-     * @function readMCN
-     * @discussion
-     * Read the Media Catalog Number (also known as the Universal Product Code).
-     * @param mcn
-     * Buffer for the MCN data.  Buffer contents will be zero-terminated.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn readMCN(CDMCN mcn);
-
-    /*!
-     * @function getTOC
-     * @discussion
-     * Get the full Table Of Contents.
-     *
-     * All CDTOC fields passed across I/O Kit APIs are guaranteed to be
-     * binary-encoded (no BCD-encoded numbers are ever passed).
-     * @result
-     * Returns a pointer to the TOC buffer (do not deallocate).
-     */
-     
-    virtual CDTOC * getTOC();
-
-    /*!
-     * @function getSpeed
-     * @discussion
-     * Get the current speed used for data transfers.
-     * @param kilobytesPerSecond
-     * Returns the current speed used for data transfers, in kB/s.
-     *
-     * kCDSpeedMin specifies the minimum speed for all CD media (1X).
-     * kCDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond); /* 10.1.0 */
-
-    /*!
-     * @function setSpeed
-     * @discussion
-     * Set the speed to be used for data transfers.
-     * @param kilobytesPerSecond
-     * Speed to be used for data transfers, in kB/s.
-     *
-     * kCDSpeedMin specifies the minimum speed for all CD media (1X).
-     * kCDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond); /* 10.1.0 */
-
-    /*!
-     * @function readTOC
-     * @discussion
-     * Issue an MMC READ TOC/PMA/ATIP command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param format
-     * As documented by MMC.
-     * @param formatAsTime
-     * As documented by MMC.
-     * @param trackOrSessionNumber
-     * As documented by MMC.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readTOC(IOMemoryDescriptor * buffer,
-                             CDTOCFormat          format,
-                             UInt8                formatAsTime,
-                             UInt8                trackOrSessionNumber,
-                             UInt16 *             actualByteCount); /* 10.1.3 */
-
-    /*!
-     * @function readDiscInfo
-     * @discussion
-     * Issue an MMC READ DISC INFORMATION command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readDiscInfo(IOMemoryDescriptor * buffer,
-                                  UInt16 *             actualByteCount); /* 10.1.3 */
-
-    /*!
-     * @function readTrackInfo
-     * @discussion
-     * Issue an MMC READ TRACK INFORMATION command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param address
-     * As documented by MMC.
-     * @param addressType
-     * As documented by MMC.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readTrackInfo(IOMemoryDescriptor *   buffer,
-                                   UInt32                 address,
-                                   CDTrackInfoAddressType addressType,
-                                   UInt16 *               actualByteCount); /* 10.1.3 */
-
-    /*
-     * @function writeCD
-     * @discussion
-     * Write data into the CD media object at the specified byte offset from the
-     * specified buffer, asynchronously.    When the write completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the write.
-     * @param client
-     * Client requesting the write.
-     * @param byteStart
-     * Starting byte offset for the data transfer (see sectorArea parameter).
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param sectorArea
-     * Sector area(s) to write.  The sum of each area's size defines the natural
-     * block size of the media for the call.   This should be taken into account
-     * when computing the address of byteStart.  See IOCDTypes.h.
-     * @param sectorType
-     * Sector type that is expected.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-#ifdef __LP64__
-    virtual void writeCD(IOService *           client,
-                         UInt64                byteStart,
-                         IOMemoryDescriptor *  buffer,
-                         CDSectorArea          sectorArea,
-                         CDSectorType          sectorType,
-                         IOStorageAttributes * attributes,
-                         IOStorageCompletion * completion);
-#else /* !__LP64__ */
-    virtual void writeCD(IOService *           client,
-                         UInt64                byteStart,
-                         IOMemoryDescriptor *  buffer,
-                         CDSectorArea          sectorArea,
-                         CDSectorType          sectorType,
-                         IOStorageCompletion   completion); /* 10.2.0 */
-#endif /* !__LP64__ */
-
-    /*
-     * @function writeCD
-     * @discussion
-     * Write data into the CD media object at the specified byte offset from the
-     * specified buffer, synchronously.    When the write completes, this method
-     * will return to the caller.  The actual byte count field is optional.
-     * @param client
-     * Client requesting the write.
-     * @param byteStart
-     * Starting byte offset for the data transfer (see sectorArea parameter).
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param sectorArea
-     * Sector area(s) to write.  The sum of each area's size defines the natural
-     * block size of the media for the call.   This should be taken into account
-     * when computing the address of byteStart.  See IOCDTypes.h.
-     * @param sectorType
-     * Sector type that is expected.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-#ifdef __LP64__
-    virtual IOReturn writeCD(IOService *           client,
-                             UInt64                byteStart,
-                             IOMemoryDescriptor *  buffer,
-                             CDSectorArea          sectorArea,
-                             CDSectorType          sectorType,
-                             IOStorageAttributes * attributes      = 0,
-                             UInt64 *              actualByteCount = 0);
-#else /* !__LP64__ */
-    virtual IOReturn writeCD(IOService *           client,
-                             UInt64                byteStart,
-                             IOMemoryDescriptor *  buffer,
-                             CDSectorArea          sectorArea,
-                             CDSectorType          sectorType,
-                             UInt64 *              actualByteCount = 0); /* 10.2.0 */
-#endif /* !__LP64__ */
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  0);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  1);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  2);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  3);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  4);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  5);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  6);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  0);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  1);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  2);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  3);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  4);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  5);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  6);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  7);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  8);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  9);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 10);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 11);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 12);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 13);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 14);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 15);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOCDMEDIA_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDMediaBSDClient.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDMediaBSDClient.h.svn-base
deleted file mode 100644
index ce31863..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOCDMediaBSDClient.h.svn-base
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOCDMEDIABSDCLIENT_H
-#define _IOCDMEDIABSDCLIENT_H
-
-#include <sys/ioctl.h>
-
-#include <IOKit/storage/IOCDTypes.h>
-
-/*
- * Definitions
- *
- * ioctl                        description
- * ---------------------------- ------------------------------------------------
- * DKIOCCDREAD                  see IOCDMedia::readCD()           in IOCDMedia.h
- * DKIOCCDREADTOC               see IOCDMedia::readTOC()          in IOCDMedia.h
- *
- * DKIOCCDREADDISCINFO          see IOCDMedia::readDiscInfo()     in IOCDMedia.h
- * DKIOCCDREADTRACKINFO         see IOCDMedia::readTrackInfo()    in IOCDMedia.h
- *
- * DKIOCCDREADISRC              see IOCDMedia::readISRC()         in IOCDMedia.h
- * DKIOCCDREADMCN               see IOCDMedia::readMCN()          in IOCDMedia.h
- *
- * DKIOCCDGETSPEED              see IOCDMedia::getSpeed()         in IOCDMedia.h
- * DKIOCCDSETSPEED              see IOCDMedia::setSpeed()         in IOCDMedia.h
- *
- *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
- */
-
-typedef struct
-{
-    uint64_t offset;
-
-    uint8_t  sectorArea;
-    uint8_t  sectorType;
-
-#ifdef __LP64__
-    uint8_t  reserved0080[10];                     /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0080[6];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint32_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_cd_read_t;
-
-typedef struct
-{
-    CDISRC   isrc;
-    uint8_t  track;
-
-    uint8_t  reserved0112[2];                      /* reserved, clear to zero */
-} dk_cd_read_isrc_t;
-
-typedef struct
-{
-    CDMCN    mcn;
-
-    uint8_t  reserved0112[2];                      /* reserved, clear to zero */
-} dk_cd_read_mcn_t;
-
-typedef struct
-{
-    uint8_t  format;
-    uint8_t  formatAsTime;
-
-    uint8_t  reserved0016[5];                      /* reserved, clear to zero */
-
-    union
-    {
-        uint8_t session;
-        uint8_t track;
-    } address;
-
-#ifdef __LP64__
-    uint8_t  reserved0064[6];                      /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0064[2];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_cd_read_toc_t;
-
-typedef struct
-{
-#ifdef __LP64__
-    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0000[10];                     /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_cd_read_disc_info_t;
-
-typedef struct
-{
-    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  addressType;
-
-#ifdef __LP64__
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_cd_read_track_info_t;
-
-#define DKIOCCDREAD          _IOWR('d', 96, dk_cd_read_t)
-
-#define DKIOCCDREADISRC      _IOWR('d', 97, dk_cd_read_isrc_t)
-#define DKIOCCDREADMCN       _IOWR('d', 98, dk_cd_read_mcn_t)
-
-#define DKIOCCDGETSPEED      _IOR('d', 99, uint16_t)
-#define DKIOCCDSETSPEED      _IOW('d', 99, uint16_t)
-
-#define DKIOCCDREADTOC       _IOWR('d', 100, dk_cd_read_toc_t)
-
-#define DKIOCCDREADDISCINFO  _IOWR('d', 101, dk_cd_read_disc_info_t)
-#define DKIOCCDREADTRACKINFO _IOWR('d', 102, dk_cd_read_track_info_t)
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOCDMedia.h>
-#include <IOKit/storage/IOMediaBSDClient.h>
-
-/*
- * Class
- */
-
-class IOCDMediaBSDClient : public IOMediaBSDClient
-{
-    OSDeclareDefaultStructors(IOCDMediaBSDClient)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method
-     * to return a more specific subclass of IOService -- IOCDMedia.  This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOCDMedia * getProvider() const;
-
-    /*
-     * Process a CD-specific ioctl.
-     */
-
-    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
-
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 0);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 1);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 2);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 3);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 4);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 5);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 6);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 7);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOCDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDPartitionScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDPartitionScheme.h.svn-base
deleted file mode 100644
index 1ff58c4..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOCDPartitionScheme.h.svn-base
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOCDPartitionScheme
- * @abstract
- * This header contains the IOCDPartitionScheme class definition.
- */
-
-#ifndef _IOCDPARTITIONSCHEME_H
-#define _IOCDPARTITIONSCHEME_H
-
-#include <IOKit/storage/IOCDTypes.h>
-
-/*!
- * @defined kIOCDPartitionSchemeClass
- * @abstract
- * kIOCDPartitionSchemeClass is the name of the IOCDPartitionScheme class.
- * @discussion
- * kIOCDPartitionSchemeClass is the name of the IOCDPartitionScheme class.
- */
-
-#define kIOCDPartitionSchemeClass "IOCDPartitionScheme"
-
-/*!
- * @defined kIOMediaSessionIDKey
- * @abstract
- * kIOMediaSessionIDKey is property of IOMedia objects.  It has an OSNumber
- * value.
- * @discussion
- * The kIOMediaSessionIDKey property is placed into each IOMedia instance
- * created by the CD partition scheme.  It identifies the session number
- * the track was recorded on.
- */
-
-#define kIOMediaSessionIDKey "Session ID"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOCDMedia.h>
-#include <IOKit/storage/IOPartitionScheme.h>
-
-/*
- * Class
- */
-
-class IOCDPartitionScheme : public IOPartitionScheme
-{
-    OSDeclareDefaultStructors(IOCDPartitionScheme);
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    OSSet * _partitions;    /* (set of media objects representing partitions) */
-
-    /*
-     * Free all of this object's outstanding resources.
-     */
-
-    virtual void free(void);
-
-    /*
-     * Scan the provider media for CD partitions (in TOC).  Returns the set
-     * of media objects representing each of the partitions (the retain for
-     * the set is passed to the caller), or null should no CD partitions be
-     * found.  The default probe score can be adjusted up or down, based on
-     * the confidence of the scan.
-     */
-
-    virtual OSSet * scan(SInt32 * score);
-
-    /*
-     * Ask whether the given partition appears to be corrupt.  A partition that
-     * is corrupt will cause the failure of the CD partition scheme altogether.
-     */
-
-    virtual bool isPartitionCorrupt( CDTOCDescriptor * partition,
-                                     UInt64            partitionSize,
-                                     UInt32            partitionBlockSize,
-                                     CDSectorType      partitionBlockType,
-                                     CDTOC *           toc );
-
-    /*
-     * Ask whether the given partition appears to be invalid.  A partition that
-     * is invalid will cause it to be skipped in the scan, but will not cause a
-     * failure of the CD partition scheme.
-     */
-
-    virtual bool isPartitionInvalid( CDTOCDescriptor * partition,
-                                     UInt64            partitionSize,
-                                     UInt32            partitionBlockSize,
-                                     CDSectorType      partitionBlockType,
-                                     CDTOC *           toc );
-
-    /*
-     * Instantiate a new media object to represent the given partition.
-     */
-
-    virtual IOMedia * instantiateMediaObject(
-                                           CDTOCDescriptor * partition,
-                                           UInt64            partitionSize,
-                                           UInt32            partitionBlockSize,
-                                           CDSectorType      partitionBlockType,
-                                           CDTOC *           toc );
-
-    /*
-     * Allocate a new media object (called from instantiateMediaObject).
-     */
-
-    virtual IOMedia * instantiateDesiredMediaObject(
-                                           CDTOCDescriptor * partition,
-                                           UInt64            partitionSize,
-                                           UInt32            partitionBlockSize,
-                                           CDSectorType      partitionBlockType,
-                                           CDTOC *           toc );
-
-public:
-
-    /*
-     * Initialize this object's minimal state.
-     */
-
-    virtual bool init(OSDictionary * properties = 0);
-
-    /*
-     * Scan the provider media for CD partitions.
-     */
-
-    virtual IOService * probe(IOService * provider, SInt32 * score);
-
-    /*
-     * Determine whether the provider media contains CD partitions.
-     */
-
-    virtual bool start(IOService * provider);
-
-    /*
-     * Read data from the storage object at the specified byte offset into the
-     * specified buffer, asynchronously.   When the read completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the read.
-     *
-     * For the CD partition scheme, we convert the read from a partition
-     * object into the appropriate readCD command to our provider media.
-     */
-
-    virtual void read(IOService *           client,
-                      UInt64                byteStart,
-                      IOMemoryDescriptor *  buffer,
-                      IOStorageAttributes * attributes,
-                      IOStorageCompletion * completion);
-
-    /*
-     * Write data into the storage object at the specified byte offset from the
-     * specified buffer, asynchronously.   When the write completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the write.
-     *
-     * For the CD partition scheme, we convert the write from a partition
-     * object into the appropriate writeCD command to our provider media.
-     */
-
-    virtual void write(IOService *           client,
-                       UInt64                byteStart,
-                       IOMemoryDescriptor *  buffer,
-                       IOStorageAttributes * attributes,
-                       IOStorageCompletion * completion);
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method
-     * to return a more specific subclass of OSObject -- IOCDMedia.   This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOCDMedia * getProvider() const;
-
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  0);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  1);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  2);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  3);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  4);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  5);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  6);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  7);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  8);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  9);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 10);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 11);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 12);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 13);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 14);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 15);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOCDPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOCDTypes.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOCDTypes.h.svn-base
deleted file mode 100644
index 6b1af29..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOCDTypes.h.svn-base
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef	_IOCDTYPES_H
-#define	_IOCDTYPES_H
-
-#include <IOKit/IOTypes.h>
-#include <libkern/OSByteOrder.h>
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/*
- * Minutes, Seconds, Frames (M:S:F)
- *
- * All M:S:F values passed across I/O Kit APIs are guaranteed to be
- * binary-encoded numbers (no BCD-encoded numbers are ever passed).
- */
-
-typedef struct
-{
-    UInt8 minute;
-    UInt8 second;
-    UInt8 frame;
-} CDMSF;
-
-/*
- * Media Catalogue Numbers (MCN), International Standard Recording Codes (ISRC)
- *
- * All MCN and ISRC values passed across I/O Kit APIs are guaranteed
- * to have a zero-terminating byte, for convenient use as C strings.
- */
-
-#define kCDMCNMaxLength  13
-#define kCDISRCMaxLength 12
-
-typedef char CDMCN [kCDMCNMaxLength  + 1];
-typedef char CDISRC[kCDISRCMaxLength + 1];
-
-/*
- * Audio Status
- *
- * All CDAudioStatus fields passed across I/O Kit APIs are guaranteed to
- * be binary-encoded numbers (no BCD-encoded numbers are ever passed).
- */
-
-#define kCDAudioStatusUnsupported 0x00
-#define kCDAudioStatusActive      0x11
-#define kCDAudioStatusPaused      0x12
-#define kCDAudioStatusSuccess     0x13
-#define kCDAudioStatusFailure     0x14
-#define kCDAudioStatusNone        0x15
-
-typedef struct
-{
-    UInt8 status;
-    struct
-    {
-        CDMSF time;
-        struct
-        {
-            UInt8 index;
-            UInt8 number;
-            CDMSF time;
-        } track;
-    } position;
-} CDAudioStatus;
-
-/*
- * Table Of Contents
- *
- * All CDTOC fields passed across I/O Kit APIs are guaranteed to be
- * binary-encoded numbers (no BCD-encoded numbers are ever passed).
- */
-
-typedef struct
-{
-    UInt8 session;
-#ifdef __LITTLE_ENDIAN__
-    UInt8 control:4, adr:4;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8 adr:4, control:4;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8 tno;
-    UInt8 point;
-    CDMSF address;
-    UInt8 zero;
-    CDMSF p;
-} CDTOCDescriptor;
-
-typedef struct
-{
-    UInt16          length;
-    UInt8           sessionFirst;
-    UInt8           sessionLast;
-    CDTOCDescriptor descriptors[0];
-} CDTOC;
-
-/*
- * Table Of Contents Descriptor Count Convenience Function
- */
-
-static inline UInt32 CDTOCGetDescriptorCount(CDTOC * toc)
-{
-    UInt32 tocSize = OSSwapBigToHostInt16(toc->length) + (UInt32) sizeof(toc->length);
-
-    return (tocSize < (UInt32) sizeof(CDTOC)) ? 0 : 
-           (tocSize - (UInt32) sizeof(CDTOC)) / (UInt32) sizeof(CDTOCDescriptor);
-}
-
-/*
- * M:S:F To LBA Convenience Function
- */
-
-static inline UInt32 CDConvertMSFToLBA(CDMSF msf)
-{
-    return (((msf.minute * 60U) + msf.second) * 75U) + msf.frame - 150U;
-}
-
-/*
- * M:S:F To Clipped LBA Convenience Function
- */
-
-static inline UInt32 CDConvertMSFToClippedLBA(CDMSF msf)
-{
-    return (msf.minute == 0 && msf.second <= 1) ? 0 : CDConvertMSFToLBA(msf);
-}
-
-/*
- * LBA To M:S:F Convenience Function
- */
-
-static inline CDMSF CDConvertLBAToMSF(UInt32 lba)
-{
-    CDMSF msf;
-
-    lba += 150;
-    msf.minute = (lba / (75 * 60));
-    msf.second = (lba % (75 * 60)) / 75;
-    msf.frame  = (lba % (75     ));
-    
-    return msf;
-}
-
-/*
- * Track Number To M:S:F Convenience Function
- *
- * The CDTOC structure is assumed to be complete, that is, none of
- * the descriptors are missing or clipped due to an insufficiently
- * sized buffer holding the CDTOC contents.
- */
-
-static inline CDMSF CDConvertTrackNumberToMSF(UInt8 track, CDTOC * toc)
-{
-    UInt32 count = CDTOCGetDescriptorCount(toc);
-    UInt32 i;
-    CDMSF  msf   = { 0xFF, 0xFF, 0xFF };
-
-    for (i = 0; i < count; i++)
-    {
-        if (toc->descriptors[i].point == track && toc->descriptors[i].adr == 1)
-        {
-            msf = toc->descriptors[i].p;
-            break;
-        }
-    }
-
-    return msf;
-}
-
-/*
- * Sector Areas, Sector Types
- *
- * Bytes Per Type      CDDA       Mode1      Mode2   Mode2Form1 Mode2Form2
- *       Per Area  +----------+----------+----------+----------+----------+
- * Sync            | 0        | 12       | 12       | 12       | 12       |
- * Header          | 0        | 4        | 4        | 4        | 4        |
- * SubHeader       | 0        | 0        | 0        | 8        | 8        |
- * User            | 2352     | 2048     | 2336     | 2048     | 2328     |
- * Auxiliary       | 0        | 288      | 0        | 280      | 0        |
- * ErrorFlags      | 294      | 294      | 294      | 294      | 294      |
- * SubChannel      | 96       | 96       | 96       | 96       | 96       |
- * SubChannelQ     | 16       | 16       | 16       | 16       | 16       |
- *                 +----------+----------+----------+----------+----------+
- */
-
-typedef enum
-{
-    kCDSectorAreaSync        = 0x80,
-    kCDSectorAreaHeader      = 0x20,
-    kCDSectorAreaSubHeader   = 0x40,
-    kCDSectorAreaUser        = 0x10,
-    kCDSectorAreaAuxiliary   = 0x08,
-    kCDSectorAreaErrorFlags  = 0x02,
-    kCDSectorAreaSubChannel  = 0x01,
-    kCDSectorAreaSubChannelQ = 0x04
-} CDSectorArea;
-
-typedef enum
-{
-    kCDSectorTypeUnknown     = 0x00,
-    kCDSectorTypeCDDA        = 0x01,
-    kCDSectorTypeMode1       = 0x02,
-    kCDSectorTypeMode2       = 0x03,
-    kCDSectorTypeMode2Form1  = 0x04,
-    kCDSectorTypeMode2Form2  = 0x05,
-    kCDSectorTypeCount       = 0x06
-} CDSectorType;
-
-typedef enum
-{
-    kCDSectorSizeCDDA        = 2352,
-    kCDSectorSizeMode1       = 2048,
-    kCDSectorSizeMode2       = 2336,
-    kCDSectorSizeMode2Form1  = 2048,
-    kCDSectorSizeMode2Form2  = 2328,
-    kCDSectorSizeWhole       = 2352
-} CDSectorSize;
-
-/*
- * Media Types
- */
-
-typedef enum
-{
-    kCDMediaTypeUnknown      = 0x0100,
-    kCDMediaTypeROM          = 0x0102, /* CD-ROM */
-    kCDMediaTypeR            = 0x0104, /* CD-R   */
-    kCDMediaTypeRW           = 0x0105, /* CD-RW  */
-
-    kCDMediaTypeMin          = 0x0100,
-    kCDMediaTypeMax          = 0x01FF
-};
-
-typedef UInt32 CDMediaType;
-
-/*
- * Media Speed (kB/s)
- */
-
-#define kCDSpeedMin 0x00B0
-#define kCDSpeedMax 0xFFFF
-
-/*
- * MMC Formats
- */
-
-// Read Table Of Contents Format Types
-typedef UInt8 CDTOCFormat;
-enum
-{
-    kCDTOCFormatTOC  = 0x02, // CDTOC
-    kCDTOCFormatPMA  = 0x03, // CDPMA
-    kCDTOCFormatATIP = 0x04, // CDATIP
-    kCDTOCFormatTEXT = 0x05  // CDTEXT
-};
-
-// Read Table Of Contents Format 0x03
-struct CDPMADescriptor
-{
-    UInt8 reserved;
-#ifdef __LITTLE_ENDIAN__
-    UInt8 control:4, adr:4;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8 adr:4, control:4;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8 tno;
-    UInt8 point;
-    CDMSF address;
-    UInt8 zero;
-    CDMSF p;
-};
-typedef struct CDPMADescriptor CDPMADescriptor;
-
-struct CDPMA
-{
-    UInt16          dataLength;
-    UInt8           reserved;
-    UInt8           reserved2;
-    CDPMADescriptor descriptors[0];
-};
-typedef struct CDPMA CDPMA;
-
-// Read Table Of Contents Format 0x04
-struct CDATIP
-{
-    UInt16 dataLength;
-    UInt8  reserved[2];
-#ifdef __LITTLE_ENDIAN__
-    UInt8  referenceSpeed:3;
-    UInt8  reserved3:1;
-    UInt8  indicativeTargetWritingPower:3;
-    UInt8  reserved2:1;
-
-    UInt8  reserved5:6;
-    UInt8  unrestrictedUse:1;
-    UInt8  reserved4:1;
-
-    UInt8  a3Valid:1;
-    UInt8  a2Valid:1;
-    UInt8  a1Valid:1;
-    UInt8  discSubType:3;
-    UInt8  discType:1;
-    UInt8  reserved6:1;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved2:1;
-    UInt8  indicativeTargetWritingPower:3;
-    UInt8  reserved3:1;
-    UInt8  referenceSpeed:3;
-
-    UInt8  reserved4:1;
-    UInt8  unrestrictedUse:1;
-    UInt8  reserved5:6;
-
-    UInt8  reserved6:1;
-    UInt8  discType:1;
-    UInt8  discSubType:3;
-    UInt8  a1Valid:1;
-    UInt8  a2Valid:1;
-    UInt8  a3Valid:1;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved7;
-    CDMSF  startTimeOfLeadIn;
-    UInt8  reserved8;
-    CDMSF  lastPossibleStartTimeOfLeadOut;
-    UInt8  reserved9;
-    UInt8  a1[3];
-    UInt8  reserved10;
-    UInt8  a2[3];
-    UInt8  reserved11;
-    UInt8  a3[3];
-    UInt8  reserved12;
-};
-typedef struct CDATIP CDATIP;
-
-// Read Table Of Contents Format 0x05
-struct CDTEXTDescriptor
-{
-    UInt8 packType;
-    UInt8 trackNumber;
-    UInt8 sequenceNumber;
-#ifdef __LITTLE_ENDIAN__
-    UInt8 characterPosition:4;
-    UInt8 blockNumber:3;
-    UInt8 doubleByteCharacterCode:1;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8 doubleByteCharacterCode:1;
-    UInt8 blockNumber:3;
-    UInt8 characterPosition:4;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8 textData[12];
-    UInt8 reserved[2];
-};
-typedef struct CDTEXTDescriptor CDTEXTDescriptor;
-
-struct CDTEXT
-{
-    UInt16           dataLength;
-    UInt8            reserved;
-    UInt8            reserved2;
-    CDTEXTDescriptor descriptors[0];
-};
-typedef struct CDTEXT CDTEXT;
-
-// Read Disc Information Format
-struct CDDiscInfo
-{
-    UInt16 dataLength;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  discStatus:2;
-    UInt8  stateOfLastSession:2;
-    UInt8  erasable:1;
-    UInt8  reserved:3;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved:3;
-    UInt8  erasable:1;
-    UInt8  stateOfLastSession:2;
-    UInt8  discStatus:2;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  numberOfFirstTrack;
-    UInt8  numberOfSessionsLSB;
-    UInt8  firstTrackNumberInLastSessionLSB;
-    UInt8  lastTrackNumberInLastSessionLSB;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  reserved3:5;
-    UInt8  unrestrictedUse:1;
-    UInt8  discBarCodeValid:1;
-    UInt8  discIdentificationValid:1;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  discIdentificationValid:1;
-    UInt8  discBarCodeValid:1;
-    UInt8  unrestrictedUse:1;
-    UInt8  reserved3:5;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  discType;
-    UInt8  numberOfSessionsMSB;
-    UInt8  firstTrackNumberInLastSessionMSB;
-    UInt8  lastTrackNumberInLastSessionMSB;
-    UInt32 discIdentification;
-    UInt8  reserved7;
-    CDMSF  lastSessionLeadInStartTime;
-    UInt8  reserved8;
-    CDMSF  lastPossibleStartTimeOfLeadOut;
-    UInt8  discBarCode[8];
-    UInt8  reserved9;
-    UInt8  numberOfOPCTableEntries;
-    UInt8  opcTableEntries[0];
-};
-typedef struct CDDiscInfo CDDiscInfo;
-
-// Read Track Information Address Types
-typedef UInt8 CDTrackInfoAddressType;
-enum
-{
-    kCDTrackInfoAddressTypeLBA           = 0x00,
-    kCDTrackInfoAddressTypeTrackNumber   = 0x01,
-    kCDTrackInfoAddressTypeSessionNumber = 0x02,
-};
-
-// Read Track Information Format
-struct CDTrackInfo
-{
-    UInt16 dataLength;
-    UInt8  trackNumberLSB;
-    UInt8  sessionNumberLSB;
-    UInt8  reserved;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  trackMode:4;
-    UInt8  copy:1;
-    UInt8  damage:1;
-    UInt8  reserved3:2;
-
-    UInt8  dataMode:4;
-    UInt8  fixedPacket:1;
-    UInt8  packet:1;
-    UInt8  blank:1;
-    UInt8  reservedTrack:1;
-
-    UInt8  nextWritableAddressValid:1;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  reserved5:6;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved3:2;
-    UInt8  damage:1;
-    UInt8  copy:1;
-    UInt8  trackMode:4;
-
-    UInt8  reservedTrack:1;
-    UInt8  blank:1;
-    UInt8  packet:1;
-    UInt8  fixedPacket:1;
-    UInt8  dataMode:4;
-
-    UInt8  reserved5:6;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  nextWritableAddressValid:1;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt32 trackStartAddress;
-    UInt32 nextWritableAddress;
-    UInt32 freeBlocks;
-    UInt32 fixedPacketSize;
-    UInt32 trackSize;
-    UInt32 lastRecordedAddress;
-    UInt8  trackNumberMSB;
-    UInt8  sessionNumberMSB;
-    UInt8  reserved6;
-    UInt8  reserved7;
-};
-typedef struct CDTrackInfo CDTrackInfo;
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* _IOCDTYPES_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDevice.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDevice.h.svn-base
deleted file mode 100644
index 161651c..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDevice.h.svn-base
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IODVDBlockStorageDevice
- * @abstract
- * This header contains the IODVDBlockStorageDevice class definition.
- */
-
-#ifndef	_IODVDBLOCKSTORAGEDEVICE_H
-#define	_IODVDBLOCKSTORAGEDEVICE_H
-
-#include <IOKit/storage/IODVDTypes.h>
-
-/*!
- * @defined kIODVDBlockStorageDeviceClass
- * @abstract
- * kIODVDBlockStorageDeviceClass is the name of the IODVDBlockStorageDevice class.
- * @discussion
- * kIODVDBlockStorageDeviceClass is the name of the IODVDBlockStorageDevice class.
- */
-
-#define kIODVDBlockStorageDeviceClass "IODVDBlockStorageDevice"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOCDBlockStorageDevice.h>
-
-/* Property used for matching, so the generic driver gets the nub it wants. */
-#define	kIOBlockStorageDeviceTypeDVD	"DVD"
-
-/*!
- * @class
- * IODVDBlockStorageDevice : public IOCDBlockStorageDevice
- * @abstract
- * The IODVDBlockStorageDevice class is a generic DVD block storage device
- * abstraction.
- * @discussion
- * This class is the protocol for generic DVD functionality, independent of
- * the physical connection protocol (e.g. SCSI, ATA, USB).
- *
- * The APIs are the union of CD APIs and all
- * necessary new low-level DVD APIs.
- *
- * A subclass implements relay methods that translate our requests into
- * calls to a protocol- and device-specific provider.
- */
-
-class IODVDBlockStorageDevice : public IOCDBlockStorageDevice {
-
-    OSDeclareAbstractStructors(IODVDBlockStorageDevice)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /* Overrides from IORegistryEntry */
-    
-    virtual bool	init(OSDictionary * properties);
-
-    /* New APIs for DVD */
-
-    virtual IOReturn	reportKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
-                                        const UInt32 lba,const UInt8 agid,const DVDKeyFormat keyFormat)	= 0;
-
-    virtual IOReturn	sendKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
-                                        const UInt8 agid,const DVDKeyFormat keyFormat)	= 0;
-
-#ifdef __LP64__
-    virtual IOReturn	readDVDStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
-                                        const UInt32 address,const UInt8 layer,const UInt8 agid)	= 0;
-#else /* !__LP64__ */
-    virtual IOReturn	readDVDStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
-                                        const UInt32 address,const UInt8 layer,const UInt8 agid); /* 10.1.0 */
-#endif /* !__LP64__ */
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  0);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IODVDBlockStorageDevice,  0);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  1);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  2);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  3);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  4);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  5);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  6);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  7);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  8);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  9);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 10);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 11);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 12);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 13);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 14);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 15);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 16);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 17);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 18);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 19);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 20);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 21);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 22);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 23);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 24);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 25);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 26);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 27);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 28);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 29);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 30);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 31);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IODVDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDriver.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDriver.h.svn-base
deleted file mode 100644
index d9471f6..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IODVDBlockStorageDriver.h.svn-base
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * IODVDBlockStorageDriver.h
- *
- * This class implements DVD functionality, independent of
- * the physical connection protocol (e.g. SCSI, ATA, USB).
- *
- * A protocol-specific provider implements the functionality using an appropriate
- * protocol and commands.
- */
-
-#ifndef	_IODVDBLOCKSTORAGEDRIVER_H
-#define	_IODVDBLOCKSTORAGEDRIVER_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/storage/IOCDBlockStorageDriver.h>
-#include <IOKit/storage/IODVDBlockStorageDevice.h>
-#include <IOKit/storage/IODVDTypes.h>
-
-/*!
- * @defined kIODVDBlockStorageDriverClass
- * @abstract
- * kIODVDBlockStorageDriverClass is the name of the IODVDBlockStorageDriver class.
- * @discussion
- * kIODVDBlockStorageDriverClass is the name of the IODVDBlockStorageDriver class.
- */
-
-#define kIODVDBlockStorageDriverClass "IODVDBlockStorageDriver"
-
-class IODVDBlockStorageDevice;
-
-/*!
- * @class
- * IODVDBlockStorageDriver : public IOCDBlockStorageDriver
- * @abstract
- * Generic DVD Driver.
- * @discussion
- * Storage drivers are split into two parts: the Generic Driver handles
- * all generic device issues, independent of the lower-level transport
- * mechanism (e.g. SCSI, ATA, USB, FireWire). All storage operations
- * at the Generic Driver level are translated into a series of generic
- * device operations. These operations are passed via the Device Nub
- * to a Transport Driver, which implements the appropriate
- * transport-dependent protocol to execute these operations.
- * 
- * To determine the write-protect state of a device (or media), for
- * example, the generic driver would issue a call to the
- * Transport Driver's reportWriteProtection method. If this were a SCSI
- * device, its Transport Driver would issue a Mode Sense command to
- * extract the write-protection status bit. The Transport Driver then
- * reports true or false to the generic driver.
- * 
- * The generic driver therefore has no knowledge of, or involvement
- * with, the actual commands and mechanisms used to communicate with
- * the device. It is expected that the generic driver will rarely, if
- * ever, need to be subclassed to handle device idiosyncrasies; rather,
- * the Transport Driver should be changed via overrides.
- * 
- * A generic driver could be subclassed to create a different type of
- * generic device. The generic driver IODVDBlockStorageDriver class is a subclass
- * of IOCDBlockStorageDriver, adding DVD functions. Similarly, the Transport Driver
- * IODVDBlockStorageDevice is a subclass of IOCDBlockStorageDevice, adding DVD 
- * functions.
-*/
-
-class IODVDBlockStorageDriver : public IOCDBlockStorageDriver {
-
-    OSDeclareDefaultStructors(IODVDBlockStorageDriver)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    /* Overrides of IOCDBlockStorageDriver. */
-
-    virtual IOReturn	acceptNewMedia(void);
-
-    /* End of IOCDBlockStorageDriver overrides. */
-
-public:
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method to
-     * return a more specific subclass of IOService -- IODVDBlockStorageDevice.
-     * This method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IODVDBlockStorageDevice * getProvider() const;
-
-    /* Overrides of IOCDBlockStorageDriver: */
-
-    virtual const char * getDeviceTypeName(void);
-    virtual IOMedia *	instantiateDesiredMediaObject(void);
-    virtual IOMedia *	instantiateMediaObject(UInt64 base,UInt64 byteSize,
-                                            UInt32 blockSize,char *mediaName);
-
-    /* End of IOCDBlockStorageDriver overrides. */
-
-    /*!
-     * @function reportKey
-     * @abstract
-     * Get key info from the DVD drive.
-     * @discussion
-     * This function handles the getting of key- and encryption-related data for the drive.
-     * @param buffer
-     * A buffer containing information, as documented in the specification
-     * "MtFuji Commands For Multimedia Devices."
-     * @param keyClass
-     * As documented by MtFuji. See DVDKeyClass.
-     * @param lba
-     * As documented by MtFuji.
-     * @param agid
-     * As documented by MtFuji.
-     * @param keyFormat
-     * As documented by MtFuji. See DVDKeyFormat.
-     */
-    virtual IOReturn	reportKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
-                                        const UInt32 lba,const UInt8 agid,const DVDKeyFormat keyFormat);
-
-    /*!
-     * @function sendKey
-     * @abstract
-     * Send key info to the DVD drive.
-     * @discussion
-     * This function handles the setting of key- and encryption-related data for the drive.
-     * @param buffer
-     * A buffer containing information, as documented in the specification
-     * "MtFuji Commands For Multimedia Devices."
-     * @param keyClass
-     * As documented by MtFuji. See DVDKeyClass.
-     * @param agid
-     * As documented by MtFuji.
-     * @param keyFormat
-     * As documented by MtFuji. See DVDKeyFormat.
-     */
-    virtual IOReturn	sendKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
-                                        const UInt8 agid,const DVDKeyFormat keyFormat);
-
-    /*!
-     * @function readStructure
-     * @abstract
-     * Get control structures from the DVD media.
-     * @discussion
-     * This function handles the getting of control structure data for the media.
-     * @param buffer
-     * A buffer containing information, as documented in the specification
-     * "MtFuji Commands For Multimedia Devices."
-     * @param format
-     * As documented by MtFuji. See DVDStructureFormat.
-     * @param address
-     * As documented by MtFuji.
-     * @param layer
-     * As documented by MtFuji.
-     * @param agid
-     * As documented by MtFuji.
-     */
-    virtual IOReturn	readStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
-                                        const UInt32 address,const UInt8 layer,const UInt8 agid); /* 10.1.0 */
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  0);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IODVDBlockStorageDriver,  0);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  1);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  2);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  3);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  4);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  5);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  6);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  7);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  8);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  9);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 10);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 11);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 12);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 13);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 14);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 15);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 16);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 17);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 18);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 19);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 20);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 21);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 22);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 23);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 24);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 25);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 26);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 27);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 28);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 29);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 30);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 31);
-};
-#endif
diff --git a/i386/include/IOKit/storage/.svn/text-base/IODVDMedia.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IODVDMedia.h.svn-base
deleted file mode 100644
index 02119c3..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IODVDMedia.h.svn-base
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IODVDMedia
- * @abstract
- * This header contains the IODVDMedia class definition.
- */
-
-#ifndef _IODVDMEDIA_H
-#define _IODVDMEDIA_H
-
-/*!
- * @defined kIODVDMediaClass
- * @abstract
- * kIODVDMediaClass is the name of the IODVDMedia class.
- * @discussion
- * kIODVDMediaClass is the name of the IODVDMedia class.
- */
-
-#define kIODVDMediaClass "IODVDMedia"
-
-/*!
- * @defined kIODVDMediaTypeKey
- * @abstract
- * kIODVDMediaTypeKey is a property of IODVDMedia objects.  It has an OSString
- * value.
- * @discussion
- * The kIODVDMediaTypeKey property identifies the DVD media type (DVD-ROM,
- * DVD-R, DVD-RW, DVD+RW, DVD-RAM, etc).  See the kIODVDMediaType contants
- * for possible values.
- */
-
-#define kIODVDMediaTypeKey "Type"
-
-/*!
- * @defined kIODVDMediaTypeROM
- * The kIODVDMediaTypeKey constant for DVD-ROM media.
- */
-
-#define kIODVDMediaTypeROM "DVD-ROM"
-
-/*!
- * @defined kIODVDMediaTypeR
- * The kIODVDMediaTypeKey constant for DVD Recordable (DVD-R) media.
- */
-
-#define kIODVDMediaTypeR "DVD-R"
-
-/*!
- * @defined kIODVDMediaTypeRW
- * The kIODVDMediaTypeKey constant for DVD ReWritable (DVD-RW) media.
- */
-
-#define kIODVDMediaTypeRW "DVD-RW"
-
-/*!
- * @defined kIODVDMediaTypePlusR
- * The kIODVDMediaTypeKey constant for DVD "Plus" Recordable (DVD+R) media.
- */
-
-#define kIODVDMediaTypePlusR "DVD+R"
-
-/*!
- * @defined kIODVDMediaTypePlusRW
- * The kIODVDMediaTypeKey constant for DVD "Plus" ReWritable (DVD+RW) media.
- */
-
-#define kIODVDMediaTypePlusRW "DVD+RW"
-
-/*!
- * @defined kIODVDMediaTypeRAM
- * The kIODVDMediaTypeKey constant for DVD-RAM media.
- */
-
-#define kIODVDMediaTypeRAM "DVD-RAM"
-
-/*!
- * @defined kIODVDMediaTypeHDROM
- * The kIODVDMediaTypeKey constant for HD DVD-ROM media.
- */
-
-#define kIODVDMediaTypeHDROM "HD DVD-ROM"
-
-/*!
- * @defined kIODVDMediaTypeHDR
- * The kIODVDMediaTypeKey constant for HD DVD Recordable (HD DVD-R) media.
- */
-
-#define kIODVDMediaTypeHDR "HD DVD-R"
-
-/*!
- * @defined kIODVDMediaTypeHDRW
- * The kIODVDMediaTypeKey constant for HD DVD ReWritable (HD DVD-RW) media.
- */
-
-#define kIODVDMediaTypeHDRW "HD DVD-RW"
-
-/*!
- * @defined kIODVDMediaTypeHDRAM
- * The kIODVDMediaTypeKey constant for HD DVD-RAM media.
- */
-
-#define kIODVDMediaTypeHDRAM "HD DVD-RAM"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IODVDBlockStorageDriver.h>
-#include <IOKit/storage/IOMedia.h>
-
-/*!
- * @class IODVDMedia
- * @abstract
- * The IODVDMedia class is a random-access disk device abstraction for DVDs.
- * @discussion
- * The IODVDMedia class is a random-access disk device abstraction for DVDs.
- */
-
-class IODVDMedia : public IOMedia
-{
-    OSDeclareDefaultStructors(IODVDMedia)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*
-     * Obtain this object's provider.   We override the superclass's method to
-     * return a more specific subclass of IOService -- IODVDBlockStorageDriver.
-     * This method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IODVDBlockStorageDriver * getProvider() const;
-
-    /*
-     * Compare the properties in the supplied table to this object's properties.
-     */
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
-
-    /*!
-     * @function reportKey
-     * @discussion
-     * Issue an MMC REPORT KEY command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.  Pass null for the kDVDKeyFormatAGID_Invalidate format
-     * case.
-     * @param keyClass
-     * As documented by MMC.
-     * @param address
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @param format
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn reportKey( IOMemoryDescriptor * buffer,
-                                const DVDKeyClass    keyClass,
-                                const UInt32         address,
-                                const UInt8          grantID,
-                                const DVDKeyFormat   format ); /* 10.1.0 */
-
-    /*!
-     * @function sendKey
-     * @discussion
-     * Issue an MMC SEND KEY command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.  Pass null for the kDVDKeyFormatAGID_Invalidate format
-     * case.
-     * @param keyClass
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @param format
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn sendKey( IOMemoryDescriptor * buffer,
-                              const DVDKeyClass    keyClass,
-                              const UInt8          grantID,
-                              const DVDKeyFormat   format ); /* 10.1.0 */
-
-    /*!
-     * @function readStructure
-     * @discussion
-     * Issue an MMC READ DVD STRUCTURE command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param format
-     * As documented by MMC.
-     * @param address
-     * As documented by MMC.
-     * @param layer
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readStructure( IOMemoryDescriptor *     buffer,
-                                    const DVDStructureFormat format,
-                                    const UInt32             address,
-                                    const UInt8              layer,
-                                    const UInt8              grantID ); /* 10.1.0 */
-
-    /*!
-     * @function getSpeed
-     * @discussion
-     * Get the current speed used for data transfers.
-     * @param kilobytesPerSecond
-     * Returns the current speed used for data transfers, in kB/s.
-     *
-     * kDVDSpeedMin specifies the minimum speed for all DVD media (1X).
-     * kDVDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond); /* 10.1.0 */
-
-    /*!
-     * @function setSpeed
-     * @discussion
-     * Set the speed to be used for data transfers.
-     * @param kilobytesPerSecond
-     * Speed to be used for data transfers, in kB/s.
-     *
-     * kDVDSpeedMin specifies the minimum speed for all DVD media (1X).
-     * kDVDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond); /* 10.1.0 */
-
-    /*!
-     * @function readDiscInfo
-     * @discussion
-     * Issue an MMC READ DISC INFORMATION command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readDiscInfo( IOMemoryDescriptor * buffer,
-                                   UInt16 *             actualByteCount ); /* 10.2.0 */
-
-    /*!
-     * @function readRZoneInfo
-     * @discussion
-     * Issue an MMC READ RZONE INFORMATION (READ TRACK INFORMATION) command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param address
-     * As documented by MMC.
-     * @param addressType
-     * As documented by MMC.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readRZoneInfo( IOMemoryDescriptor *    buffer,
-                                    UInt32                  address,
-                                    DVDRZoneInfoAddressType addressType,
-                                    UInt16 *                actualByteCount ); /* 10.2.0 */
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  0);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  1);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  2);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  3);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  4);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  5);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  6);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  0);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  1);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  2);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  3);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  4);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  5);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  6);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  7);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  8);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  9);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 10);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 11);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 12);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 13);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 14);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 15);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 16);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 17);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 18);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 19);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 20);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 21);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 22);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 23);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 24);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 25);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 26);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 27);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 28);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 29);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 30);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 31);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IODVDMEDIA_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IODVDMediaBSDClient.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IODVDMediaBSDClient.h.svn-base
deleted file mode 100644
index 2258bf6..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IODVDMediaBSDClient.h.svn-base
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IODVDMEDIABSDCLIENT_H
-#define _IODVDMEDIABSDCLIENT_H
-
-#include <sys/ioctl.h>
-
-#include <IOKit/storage/IODVDTypes.h>
-
-/*
- * Definitions
- *
- * ioctl                        description
- * ---------------------------- ------------------------------------------------
- * DKIOCDVDREADSTRUCTURE        see IODVDMedia::readStructure()  in IODVDMedia.h
- *
- * DKIOCDVDREADDISCINFO         see IODVDMedia::readDiscInfo()   in IODVDMedia.h
- * DKIOCDVDREADRZONEINFO        see IODVDMedia::readRZoneInfo()  in IODVDMedia.h
- *
- * DKIOCDVDREPORTKEY            see IODVDMedia::reportKey()      in IODVDMedia.h
- * DKIOCDVDSENDKEY              see IODVDMedia::sendKey()        in IODVDMedia.h
- *
- * DKIOCDVDGETSPEED             see IODVDMedia::getSpeed()       in IODVDMedia.h
- * DKIOCDVDSETSPEED             see IODVDMedia::setSpeed()       in IODVDMedia.h
- *
- *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
- */
-
-typedef struct
-{
-    uint8_t  format;
-
-    uint8_t  reserved0008[3];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  grantID;
-    uint8_t  layer;
-
-#ifdef __LP64__
-    uint8_t  reserved0080[4];                      /* reserved, clear to zero */
-#endif /* __LP64__ */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_dvd_read_structure_t;
-
-typedef struct
-{
-    uint8_t  format;
-    uint8_t  keyClass;
-
-    uint8_t  reserved0016[2];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  grantID;
-
-#ifdef __LP64__
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_dvd_report_key_t;
-
-typedef struct
-{
-    uint8_t  format;
-    uint8_t  keyClass;
-
-    uint8_t  reserved0016[6];                      /* reserved, clear to zero */
-
-    uint8_t  grantID;
-
-#ifdef __LP64__
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_dvd_send_key_t;
-
-typedef struct
-{
-#ifdef __LP64__
-    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0000[10];                     /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_dvd_read_disc_info_t;
-
-typedef struct
-{
-    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  addressType;
-
-#ifdef __LP64__
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_dvd_read_rzone_info_t;
-
-#define DKIOCDVDREADSTRUCTURE _IOW('d', 128, dk_dvd_read_structure_t)
-#define DKIOCDVDREPORTKEY     _IOW('d', 129, dk_dvd_report_key_t)
-#define DKIOCDVDSENDKEY       _IOW('d', 130, dk_dvd_send_key_t)
-
-#define DKIOCDVDGETSPEED      _IOR('d', 131, uint16_t)
-#define DKIOCDVDSETSPEED      _IOW('d', 131, uint16_t)
-
-#define DKIOCDVDREADDISCINFO  _IOWR('d', 132, dk_dvd_read_disc_info_t)
-#define DKIOCDVDREADRZONEINFO _IOWR('d', 133, dk_dvd_read_rzone_info_t)
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IODVDMedia.h>
-#include <IOKit/storage/IOMediaBSDClient.h>
-
-/*
- * Class
- */
-
-class IODVDMediaBSDClient : public IOMediaBSDClient
-{
-    OSDeclareDefaultStructors(IODVDMediaBSDClient)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*
-     * Obtain this object's provider.   We override the superclass's method
-     * to return a more specific subclass of IOService -- IODVDMedia.  This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IODVDMedia * getProvider() const;
-
-    /*
-     * Process a DVD-specific ioctl.
-     */
-
-    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
-
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 0);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 1);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 2);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 3);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 4);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 5);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 6);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 7);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IODVDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IODVDTypes.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IODVDTypes.h.svn-base
deleted file mode 100644
index 039b8fb..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IODVDTypes.h.svn-base
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef	_IODVDTYPES_H
-#define	_IODVDTYPES_H
-
-#include <IOKit/IOTypes.h>
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/*
- * Media Types
- */
-
-enum
-{
-    kDVDMediaTypeUnknown   = 0x0200,
-    kDVDMediaTypeROM       = 0x0202, /* DVD-ROM    */
-    kDVDMediaTypeRAM       = 0x0203, /* DVD-RAM    */
-    kDVDMediaTypeR         = 0x0204, /* DVD-R      */
-    kDVDMediaTypeRW        = 0x0205, /* DVD-RW     */
-    kDVDMediaTypePlusRW    = 0x0206, /* DVD+RW     */
-    kDVDMediaTypePlusR     = 0x0207, /* DVD+R      */
-    kDVDMediaTypeHDROM     = 0x0212, /* HD DVD-ROM */
-    kDVDMediaTypeHDRAM     = 0x0213, /* HD DVD-RAM */
-    kDVDMediaTypeHDR       = 0x0214, /* HD DVD-R   */
-    kDVDMediaTypeHDRW      = 0x0215, /* HD DVD-RW  */
-
-    kDVDMediaTypeMin       = 0x0200,
-    kDVDMediaTypeMax       = 0x02FF
-};
-
-typedef UInt32 DVDMediaType;
-
-/*
- * Media Speed (kB/s)
- */
-
-#define kDVDSpeedMin 0x0546
-#define kDVDSpeedMax 0xFFFF
-
-/*
- * MMC Formats
- */
-
-typedef UInt8	DVDCPRMRegionCode;
-enum
-{
-	kDVDCPRMRegion1		= 0xFE,
-	kDVDCPRMRegion2		= 0xFD,
-	kDVDCPRMRegion3		= 0xFB,
-	kDVDCPRMRegion4		= 0xF7,
-	kDVDCPRMRegion5		= 0xEF,
-	kDVDCPRMRegion6		= 0xDF
-};
-
-typedef UInt8	DVDRegionalPlaybackControlScheme;
-enum
-{
-	kDVDRegionalPlaybackControlSchemePhase1		= 0x00,
-	kDVDRegionalPlaybackControlSchemePhase2		= 0x01
-};
-
-typedef UInt8	DVDBookType;
-enum
-{
-	kDVDBookTypeROM					= 0x0,
-	kDVDBookTypeRAM					= 0x1,
-	kDVDBookTypeR					= 0x2,
-	kDVDBookTypeRW					= 0x3,
-	kDVDBookTypeHDROM				= 0x4,
-	kDVDBookTypeHDRAM				= 0x5,
-	kDVDBookTypeHDR					= 0x6,
-	kDVDBookTypeHDRW				= 0x7,
-	kDVDBookTypePlusRW				= 0x9,
-	kDVDBookTypePlusR				= 0xA,
-	kDVDBookTypePlusRWDoubleLayer	= 0xD,
-	kDVDBookTypePlusRDoubleLayer	= 0xE
-};
-
-#ifdef __LP64__
-typedef UInt8	DVDKeyClass;
-enum
-#else /* !__LP64__ */
-enum DVDKeyClass
-#endif /* !__LP64__ */
-{
-	kDVDKeyClassCSS_CPPM_CPRM	= 0x00,
-	kDVDKeyClassRSSA			= 0x01
-};
-#ifndef __LP64__
-typedef enum DVDKeyClass DVDKeyClass;
-#endif /* !__LP64__ */
-
-#ifdef __LP64__
-typedef UInt8	DVDKeyFormat;
-enum
-#else /* !__LP64__ */
-enum DVDKeyFormat
-#endif /* !__LP64__ */
-{
-	kDVDKeyFormatAGID_CSS			= 0x00,
-	kDVDKeyFormatChallengeKey		= 0x01,
-	kDVDKeyFormatKey1				= 0x02,
-	kDVDKeyFormatKey2				= 0x03,
-	kDVDKeyFormatTitleKey			= 0x04,
-	kDVDKeyFormatASF				= 0x05,
-	kDVDKeyFormatSetRegion			= 0x06,
-	kDVDKeyFormatRegionState		= 0x08,
-	kDVDKeyFormatAGID_CSS2			= 0x10,
-	kDVDKeyFormatAGID_CPRM			= 0x11,
-	kDVDKeyFormatAGID_Invalidate	= 0x3F
-};	
-#ifndef __LP64__
-typedef enum DVDKeyFormat DVDKeyFormat;
-#endif /* !__LP64__ */
-
-typedef UInt8	DVDStructureFormat;
-enum
-{
-	kDVDStructureFormatPhysicalFormatInfo			= 0x00,
-	kDVDStructureFormatCopyrightInfo				= 0x01,
-	kDVDStructureFormatDiscKeyInfo					= 0x02,
-	// skip BCA
-	kDVDStructureFormatManufacturingInfo			= 0x04
-};
-
-// Read DVD Structures Format 0x00
-struct DVDPhysicalFormatInfo
-{
-	UInt8		dataLength[2];
-	UInt8		reserved[2];
-#ifdef __LITTLE_ENDIAN__
-	// Byte 0
-	UInt8		partVersion:4;
-	UInt8		bookType:4;
-	
-	// Byte 1
-	UInt8		minimumRate:4;
-	UInt8		discSize:4;
-	
-	// Byte 2
-	UInt8		layerType:4;
-	UInt8		trackPath:1;
-	UInt8		numberOfLayers:2;
-	UInt8		reserved2:1;
-	
-	// Byte 3
-	UInt8		trackDensity:4;
-	UInt8		linearDensity:4;
-#else /* !__LITTLE_ENDIAN__ */
-	// Byte 0
-	UInt8		bookType:4;
-	UInt8		partVersion:4;
-	
-	// Byte 1
-	UInt8		discSize:4;
-	UInt8		minimumRate:4;
-	
-	// Byte 2
-	UInt8		reserved2:1;
-	UInt8		numberOfLayers:2;
-	UInt8		trackPath:1;
-	UInt8		layerType:4;
-	
-	// Byte 3
-	UInt8		linearDensity:4;
-	UInt8		trackDensity:4;
-#endif /* !__LITTLE_ENDIAN__ */
-	
-	// Bytes 4-15
-	UInt8		zero1;		// always 0x00
-	UInt8		startingPhysicalSectorNumberOfDataArea[3];
-	UInt8		zero2;		// always 0x00
-	UInt8		endPhysicalSectorNumberOfDataArea[3];
-	UInt8		zero3;		// always 0x00
-	UInt8		endSectorNumberInLayerZero[3];
-	
-	// Byte 16
-#ifdef __LITTLE_ENDIAN__
-	UInt8		reserved1:7;
-	UInt8		bcaFlag:1;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt8		bcaFlag:1;
-	UInt8		reserved1:7;
-#endif /* !__LITTLE_ENDIAN__ */
-	
-	// Bytes 17-2047
-	UInt8		mediaSpecific[2031];
-};
-typedef struct DVDPhysicalFormatInfo DVDPhysicalFormatInfo;
-
-// Read DVD Structures Format 0x01
-struct DVDCopyrightInfo
-{
-	UInt8				dataLength[2];
-	UInt8				reserved[2];
-	UInt8				copyrightProtectionSystemType;
-	DVDCPRMRegionCode	regionMask;
-	UInt8				reserved2[2];
-};
-typedef struct DVDCopyrightInfo DVDCopyrightInfo;
-
-// Read DVD Structures Format 0x02
-struct DVDDiscKeyInfo
-{
-	UInt8		dataLength[2];
-	UInt8		reserved[2];
-	UInt8		discKeyStructures[2048];
-};
-typedef struct DVDDiscKeyInfo DVDDiscKeyInfo;
-
-// Read DVD Structures Format 0x04
-struct DVDManufacturingInfo
-{
-	UInt8		dataLength[2];
-	UInt8		reserved[2];
-	UInt8		discManufacturingInfo[2048];
-};
-typedef struct DVDManufacturingInfo DVDManufacturingInfo;
-
-// ReportKey Format 0x00
-struct DVDAuthenticationGrantIDInfo
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-	UInt8	reserved2[3];
-#ifdef __LITTLE_ENDIAN__
-	UInt8	reservedBits:6;
-	UInt8	grantID:2;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt8	grantID:2;
-	UInt8	reservedBits:6;
-#endif /* !__LITTLE_ENDIAN__ */
-};
-typedef struct DVDAuthenticationGrantIDInfo DVDAuthenticationGrantIDInfo;
-
-// ReportKey and SendKey Format 0x01
-struct DVDChallengeKeyInfo
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-	UInt8	challengeKeyValue[10];
-	UInt8	reserved2[2];
-};
-typedef struct DVDChallengeKeyInfo DVDChallengeKeyInfo;
-
-// ReportKey Format 0x02
-struct DVDKey1Info
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-	UInt8	key1Value[5];
-	UInt8	reserved2[3];
-};
-typedef struct DVDKey1Info DVDKey1Info;
-
-// SendKey Format 0x03
-struct DVDKey2Info
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-	UInt8	key2Value[5];
-	UInt8	reserved2[3];
-};
-typedef struct DVDKey2Info DVDKey2Info;
-
-// ReportKey Format 0x04
-struct DVDTitleKeyInfo
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-#ifdef __LITTLE_ENDIAN__
-	UInt8	CP_MOD:4;
-	UInt8	CGMS:2;
-	UInt8	CP_SEC:1;
-	UInt8	CPM:1;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt8	CPM:1;
-	UInt8	CP_SEC:1;
-	UInt8	CGMS:2;
-	UInt8	CP_MOD:4;
-#endif /* !__LITTLE_ENDIAN__ */
-	UInt8	titleKeyValue[5];
-	UInt8	reserved2[2];
-};
-typedef struct DVDTitleKeyInfo DVDTitleKeyInfo;
-
-// ReportKey Format 0x05
-struct DVDAuthenticationSuccessFlagInfo
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-	UInt8	reserved2[3];
-#ifdef __LITTLE_ENDIAN__
-	UInt8	successFlag:1;
-	UInt8	reservedBits:7;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt8	reservedBits:7;
-	UInt8	successFlag:1;
-#endif /* !__LITTLE_ENDIAN__ */
-};
-typedef struct DVDAuthenticationSuccessFlagInfo DVDAuthenticationSuccessFlagInfo;
-
-// ReportKey Format 0x08
-struct DVDRegionPlaybackControlInfo
-{
-	UInt8									dataLength[2];
-	UInt8									reserved[2];
-#ifdef __LITTLE_ENDIAN__
-	UInt8									numberUserResets:3;
-	UInt8									numberVendorResets:3;
-	UInt8									typeCode:2;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt8									typeCode:2;
-	UInt8									numberVendorResets:3;
-	UInt8									numberUserResets:3;
-#endif /* !__LITTLE_ENDIAN__ */
-	DVDCPRMRegionCode						driveRegion;
-	DVDRegionalPlaybackControlScheme		rpcScheme;
-	UInt8									reserved2;
-};
-typedef struct DVDRegionPlaybackControlInfo DVDRegionPlaybackControlInfo;
-
-// Read Disc Information Format
-struct DVDDiscInfo
-{
-    UInt16 dataLength;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  discStatus:2;
-    UInt8  stateOfLastBorder:2;
-    UInt8  erasable:1;
-    UInt8  reserved:3;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved:3;
-    UInt8  erasable:1;
-    UInt8  stateOfLastBorder:2;
-    UInt8  discStatus:2;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved2;
-    UInt8  numberOfBordersLSB;
-    UInt8  firstRZoneNumberInLastBorderLSB;
-    UInt8  lastRZoneNumberInLastBorderLSB;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  reserved3:5;
-    UInt8  unrestrictedUse:1;
-    UInt8  discBarCodeValid:1;
-    UInt8  reserved4:1;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved4:1;
-    UInt8  discBarCodeValid:1;
-    UInt8  unrestrictedUse:1;
-    UInt8  reserved3:5;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved5;
-    UInt8  numberOfBordersMSB;
-    UInt8  firstRZoneNumberInLastBorderMSB;
-    UInt8  lastRZoneNumberInLastBorderMSB;
-    UInt8  reserved6[4];
-    UInt8  reserved7[4];
-    UInt8  reserved8[4];
-    UInt8  discBarCode[8];
-    UInt8  reserved9;
-    UInt8  numberOfOPCTableEntries;
-    UInt8  opcTableEntries[0];
-};
-typedef struct DVDDiscInfo DVDDiscInfo;
-
-// Read RZone Information Address Types
-typedef UInt8 DVDRZoneInfoAddressType;
-enum
-{
-    kDVDRZoneInfoAddressTypeLBA          = 0x00,
-    kDVDRZoneInfoAddressTypeRZoneNumber  = 0x01,
-    kDVDRZoneInfoAddressTypeBorderNumber = 0x02,
-};
-
-// Read RZone Information Format
-struct DVDRZoneInfo
-{
-    UInt16 dataLength;
-    UInt8  rzoneNumberLSB;
-    UInt8  borderNumberLSB;
-    UInt8  reserved;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  reserved2:4;
-    UInt8  copy:1;
-    UInt8  damage:1;
-    UInt8  reserved3:2;
-
-    UInt8  reserved4:4;
-    UInt8  restrictedOverwrite:1;
-    UInt8  incremental:1;
-    UInt8  blank:1;
-    UInt8  reservedRZone:1;
-
-    UInt8  nextWritableAddressValid:1;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  reserved5:6;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved3:2;
-    UInt8  damage:1;
-    UInt8  copy:1;
-    UInt8  reserved2:4;
-
-    UInt8  reservedRZone:1;
-    UInt8  blank:1;
-    UInt8  incremental:1;
-    UInt8  restrictedOverwrite:1;
-    UInt8  reserved4:4;
-
-    UInt8  reserved5:6;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  nextWritableAddressValid:1;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt32 rzoneStartAddress;
-    UInt32 nextWritableAddress;
-    UInt32 freeBlocks;
-    UInt32 blockingFactor;
-    UInt32 rzoneSize;
-    UInt32 lastRecordedAddress;
-    UInt8  rzoneNumberMSB;
-    UInt8  borderNumberMSB;
-    UInt8  reserved6;
-    UInt8  reserved7;
-};
-typedef struct DVDRZoneInfo DVDRZoneInfo;
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* _IODVDTYPES_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOFDiskPartitionScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOFDiskPartitionScheme.h.svn-base
deleted file mode 100644
index 7f96255..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOFDiskPartitionScheme.h.svn-base
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * This header contains the IOFDiskPartitionScheme class definition.
- */
-
-#ifndef _IOFDISKPARTITIONSCHEME_H
-#define _IOFDISKPARTITIONSCHEME_H
-
-#include <IOKit/IOTypes.h>
-
-/*
- * kIOFDiskPartitionSchemeClass is the name of the IOFDiskPartitionScheme class.
- */
-
-#define kIOFDiskPartitionSchemeClass "IOFDiskPartitionScheme"
-
-/*
- * FDisk Partition Map Definitions
- */
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/* Structure constants. */
-
-#define DISK_BLK0SZ sizeof(struct disk_blk0)    /* (size of partition map)    */
-#define DISK_BOOTSZ 446                         /* (size of boot code in map) */
-#define DISK_NPART  4                           /* (number of entries in map) */
-
-/* Partition map entry. */
-
-struct fdisk_part
-{
-    UInt8   bootid;    /* (is active boot partition?)                         */
-    UInt8   beghead;   /* (beginning head)                                    */
-    UInt8   begsect;   /* (beginning sector; beginning cylinder, high 2 bits) */
-    UInt8   begcyl;    /* (beginning cylinder, low 8 bits)                    */
-    UInt8   systid;    /* (type)                                              */
-    UInt8   endhead;   /* (ending head)                                       */
-    UInt8   endsect;   /* (ending sector; ending cylinder, high 2 bits)       */
-    UInt8   endcyl;    /* (ending cylinder, low 8 bits)                       */
-    UInt32  relsect;   /* (block start)                                       */
-    UInt32  numsect;   /* (block count)                                       */
-};
-
-/* Partition map, as found in block zero of the disk (or extended partition). */
-
-struct disk_blk0
-{
-    UInt8             bootcode[DISK_BOOTSZ];    /* (boot code)                */
-    struct fdisk_part parts[DISK_NPART];        /* (partition entries)        */
-    UInt16            signature;                /* (unique signature for map) */
-};
-
-/* Partition map signature (signature). */
-
-#define DISK_SIGNATURE 0xAA55
-
-/* Partition map entry types (systid). */
-
-#define FDISK_PARTITION_TYPE_01 "DOS_FAT_12"
-#define FDISK_PARTITION_TYPE_04 "DOS_FAT_16_S"
-#define FDISK_PARTITION_TYPE_06 "DOS_FAT_16"
-#define FDISK_PARTITION_TYPE_07 "Windows_NTFS"
-#define FDISK_PARTITION_TYPE_0B "DOS_FAT_32"
-#define FDISK_PARTITION_TYPE_0C "Windows_FAT_32"
-#define FDISK_PARTITION_TYPE_0E "Windows_FAT_16"
-#define FDISK_PARTITION_TYPE_42 "Windows_LDM"
-#define FDISK_PARTITION_TYPE_82 "Linux_Swap"
-#define FDISK_PARTITION_TYPE_83 "Linux"
-#define FDISK_PARTITION_TYPE_8E "Linux_LVM"
-#define FDISK_PARTITION_TYPE_A5 "FreeBSD"
-#define FDISK_PARTITION_TYPE_A6 "OpenBSD"
-#define FDISK_PARTITION_TYPE_A7 "Apple_Rhapsody_UFS"
-#define FDISK_PARTITION_TYPE_A8 "Apple_UFS"
-#define FDISK_PARTITION_TYPE_A9 "NetBSD"
-#define FDISK_PARTITION_TYPE_AB "Apple_Boot"
-#define FDISK_PARTITION_TYPE_AE "Apple_Encrypted"
-#define FDISK_PARTITION_TYPE_AF "Apple_HFS"
-#define FDISK_PARTITION_TYPE_FD "Linux_RAID"
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* !_IOFDISKPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOFilterScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOFilterScheme.h.svn-base
deleted file mode 100644
index 406b596..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOFilterScheme.h.svn-base
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOFilterScheme
- * @abstract
- * This header contains the IOFilterScheme class definition.
- */
-
-#ifndef _IOFILTERSCHEME_H
-#define _IOFILTERSCHEME_H
-
-/*!
- * @defined kIOFilterSchemeClass
- * @abstract
- * The name of the IOFilterScheme class.
- * @discussion
- * kIOFilterSchemeClass is the name of the IOFilterScheme class.
- */
-
-#define kIOFilterSchemeClass "IOFilterScheme"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOMedia.h>
-#include <IOKit/storage/IOStorage.h>
-
-/*!
- * @class IOFilterScheme
- * @abstract
- * The common base class for all filter scheme
- * objects.
- * @discussion
- * The IOFilterScheme class is the common base class for all filter scheme
- * objects.  It extends the IOStorage class by implementing the appropriate
- * open and close semantics for filter objects (standard semantics are act
- * as a relay for incoming opens, producing one outgoing open for each
- * incoming open).  It also implements the default read and write semantics,
- * which pass all reads and writes through to the provider media unprocessed.
- * For simple schemes, the default behavior is sufficient.  More complex
- * filter schemes such as RAID will want to do extra processing for reads
- * and writes.
- */
-
-class IOFilterScheme : public IOStorage
-{
-    OSDeclareDefaultStructors(IOFilterScheme);
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    /*!
-     * @function handleOpen
-     * @discussion
-     * The handleOpen method grants or denies permission to access this object
-     * to an interested client.  The argument is an IOStorageAccess value that
-     * specifies the level of access desired -- reader or reader-writer.
-     *
-     * This method can be invoked to upgrade or downgrade the access level for
-     * an existing client as well.  The previous access level will prevail for
-     * upgrades that fail, of course.   A downgrade should never fail.  If the
-     * new access level should be the same as the old for a given client, this
-     * method will do nothing and return success.  In all cases, one, singular
-     * close-per-client is expected for all opens-per-client received.
-     *
-     * This implementation replaces the IOService definition of handleOpen().
-     * @param client
-     * Client requesting the open.
-     * @param options
-     * Options for the open.  Set to zero.
-     * @param access
-     * Access level for the open.  Set to kIOStorageAccessReader or
-     * kIOStorageAccessReaderWriter.
-     * @result
-     * Returns true if the open was successful, false otherwise.
-     */
-
-    virtual bool handleOpen(IOService *  client,
-                            IOOptionBits options,
-                            void *       access);
-
-    /*!
-     * @function handleIsOpen
-     * @discussion
-     * The handleIsOpen method determines whether the specified client, or any
-     * client if none is specified, presently has an open on this object.
-     *
-     * This implementation replaces the IOService definition of handleIsOpen().
-     * @param client
-     * Client to check the open state of.  Set to zero to check the open state
-     * of all clients.
-     * @result
-     * Returns true if the client was (or clients were) open, false otherwise.
-     */
-
-    virtual bool handleIsOpen(const IOService * client) const;
-
-    /*!
-     * @function handleClose
-     * @discussion
-     * The handleClose method closes the client's access to this object.
-     *
-     * This implementation replaces the IOService definition of handleClose().
-     * @param client
-     * Client requesting the close.
-     * @param options
-     * Options for the close.  Set to zero.
-     */
-
-    virtual void handleClose(IOService * client, IOOptionBits options);
-
-public:
-
-    using IOStorage::read;
-    using IOStorage::write;
-
-    /*!
-     * @function read
-     * @discussion
-     * Read data from the storage object at the specified byte offset into the
-     * specified buffer, asynchronously.   When the read completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the read.
-     *
-     * For simple filter schemes, the default behavior is to simply pass the
-     * read through to the provider media.  More complex filter schemes such
-     * as RAID will need to do extra processing here.
-     * @param client
-     * Client requesting the read.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void read(IOService *           client,
-                      UInt64                byteStart,
-                      IOMemoryDescriptor *  buffer,
-                      IOStorageAttributes * attributes,
-                      IOStorageCompletion * completion);
-
-    /*!
-     * @function write
-     * @discussion
-     * Write data into the storage object at the specified byte offset from the
-     * specified buffer, asynchronously.   When the write completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the write.
-     *
-     * For simple filter schemes, the default behavior is to simply pass the
-     * write through to the provider media. More complex filter schemes such
-     * as RAID will need to do extra processing here.
-     * @param client
-     * Client requesting the write.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void write(IOService *           client,
-                       UInt64                byteStart,
-                       IOMemoryDescriptor *  buffer,
-                       IOStorageAttributes * attributes,
-                       IOStorageCompletion * completion);
-
-    /*!
-     * @function synchronizeCache
-     * @discussion
-     * Flush the cached data in the storage object, if any, synchronously.
-     * @param client
-     * Client requesting the cache synchronization.
-     * @result
-     * Returns the status of the cache synchronization.
-     */
-
-    virtual IOReturn synchronizeCache(IOService * client);
-
-    /*!
-     * @function discard
-     * @discussion
-     * Delete unused data from the storage object at the specified byte offset,
-     * synchronously.
-     * @param client
-     * Client requesting the operation.
-     * @param byteStart
-     * Starting byte offset for the operation.
-     * @param byteCount
-     * Size of the operation.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn discard(IOService * client,
-                             UInt64      byteStart,
-                             UInt64      byteCount);
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method
-     * to return a more specific subclass of OSObject -- an IOMedia.  This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOMedia * getProvider() const;
-
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  0);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  1);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  2);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  3);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  4);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  5);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  6);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  7);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  8);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  9);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 10);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 11);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 12);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 13);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 14);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 15);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 16);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 17);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 18);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 19);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 20);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 21);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 22);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 23);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 24);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 25);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 26);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 27);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 28);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 29);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 30);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 31);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOFILTERSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOFireWireStorageCharacteristics.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOFireWireStorageCharacteristics.h.svn-base
deleted file mode 100644
index 710f29f..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOFireWireStorageCharacteristics.h.svn-base
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_
-#define _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_
-
-//
-//	Bridge Characteristics - Characteristics defined for FireWire bridges.
-//
-
-/*!
-@defined kIOPropertyBridgeCharacteristicsKey
-@discussion This key is used to define Bridge Characteristics for a particular
-devices's bridge chipset. It has an associated dictionary which lists the
-bridge characteristics.
-
-Requirement: Optional
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Bridge Characteristics</key>
-	<dict>
-		<key>Bridge Vendor Name</key>
-		<string>Oxford Semiconductor</string>
-		<key>Bridge Model Name</key>
-		<string>FW911</string>
-		<key>Bridge Revision Level</key>
-		<string>3.7</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-
-#define kIOPropertyBridgeCharacteristicsKey		"Bridge Characteristics"
-#define kIOPropertyBridgeVendorNameKey			"Bridge Vendor Name"
-#define kIOPropertyBridgeModelNameKey			"Bridge Model Name"
-#define kIOPropertyBridgeRevisionLevelKey		"Bridge Revision Level"
-
-#endif	/* _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOGUIDPartitionScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOGUIDPartitionScheme.h.svn-base
deleted file mode 100644
index 3e197d0..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOGUIDPartitionScheme.h.svn-base
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * This header contains the IOGUIDPartitionScheme class definition.
- */
-
-#ifndef _IOGUIDPARTITIONSCHEME_H
-#define _IOGUIDPARTITIONSCHEME_H
-
-#include <IOKit/IOTypes.h>
-
-typedef unsigned char uuid_t[16];
-/*
- * kIOGUIDPartitionSchemeClass is the name of the IOGUIDPartitionScheme class.
- */
-
-#define kIOGUIDPartitionSchemeClass "IOGUIDPartitionScheme"
-
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/* Partition map. */
-
-struct gpt_hdr
-{
-    uint8_t  hdr_sig[8];
-    uint32_t hdr_revision;
-    uint32_t hdr_size;
-    uint32_t hdr_crc_self;
-    uint32_t __reserved;
-    uint64_t hdr_lba_self;
-    uint64_t hdr_lba_alt;
-    uint64_t hdr_lba_start;
-    uint64_t hdr_lba_end;
-    uuid_t   hdr_uuid;
-    uint64_t hdr_lba_table;
-    uint32_t hdr_entries;
-    uint32_t hdr_entsz;
-    uint32_t hdr_crc_table;
-    uint32_t padding;
-};
-
-/* Partition map entry. */
-
-struct gpt_ent
-{
-    uuid_t   ent_type;
-    uuid_t   ent_uuid;
-    uint64_t ent_lba_start;
-    uint64_t ent_lba_end;
-    uint64_t ent_attr;
-    uint16_t ent_name[36];
-};
-
-/* Partition map signature (hdr_sig). */
-
-#define GPT_HDR_SIG "EFI PART"
-
-/* Partition map version (hdr_revision). */
-
-#define GPT_HDR_REVISION 0x00010000
-
-/* Partition map entry flags (ent_attr). */
-
-#define GPT_ENT_ATTR_PLATFORM 0x00000001
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* !_IOGUIDPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOMedia.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOMedia.h.svn-base
deleted file mode 100644
index 64052ec..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOMedia.h.svn-base
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOMedia
- * @abstract
- * This header contains the IOMedia class definition.
- */
-
-#ifndef _IOMEDIA_H
-#define _IOMEDIA_H
-
-#include <IOKit/IOTypes.h>
-
-/*!
- * @defined kIOMediaClass
- * @abstract
- * The name of the IOMedia class.
- */
-
-#define kIOMediaClass "IOMedia"
-
-/*!
- * @defined kIOMediaContentKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaContentKey property has an OSString
- * value and contains a description of the media's
- * contents.  The description is the same as the hint at the time of the
- * object's creation, but it is possible that the description has been overridden
- * by a client (which has probed the media and identified the content correctly)
- * of the media object.  It is more accurate than the hint for this reason.  The
- * string is formed in the likeness of Apple's "Apple_HFS" strings or in the
- * likeness of a UUID.
- */
-
-#define kIOMediaContentKey "Content"
-
-/*!
- * @defined kIOMediaContentHintKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaContentHintKey property has an OSString
- * value and contains a hint of the media's contents.
- * The hint is set at the time of the object's creation, should the creator have
- * a clue as to what it may contain.  The hint string does not change for the
- * lifetime of the object and is formed in the likeness of Apple's "Apple_HFS"
- * strings or in the likeness of a UUID.
- */
-
-#define kIOMediaContentHintKey "Content Hint"
-
-/*!
- * @defined kIOMediaEjectableKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaEjectableKey property has an OSBoolean
- * value and describes whether the media is ejectable
- * from the drive mechanism under software control.  Implies IOMediaRemovable
- * is also true.
- */
-
-#define kIOMediaEjectableKey "Ejectable"
-
-/*!
- * @defined kIOMediaLeafKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaLeafKey property has an OSBoolean value and describes whether the media is a leaf, that is,
- * it is the deepest media object in this branch of the I/O Registry.
- */
-
-#define kIOMediaLeafKey "Leaf"
-
-/*!
- * @defined kIOMediaOpenKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaOpenKey property has an OSBoolean value and describes whether
- * a client presently has an open on this media.
- */
-
-#define kIOMediaOpenKey "Open"
-
-/*!
- * @defined kIOMediaPreferredBlockSizeKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaPreferredBlockSizeKey property has an
- * OSNumber value and describes the media's natural
- * block size in bytes.  This information is useful to clients that want to
- * optimize access to the media.
- */
-
-#define kIOMediaPreferredBlockSizeKey "Preferred Block Size"
-
-/*!
- * @defined kIOMediaRemovableKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaRemovableKey property has an OSBoolean
- * value and describes whether the media is removable
- * from the drive mechanism.
- */
-
-#define kIOMediaRemovableKey "Removable"
-
-/*!
- * @defined kIOMediaSizeKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaSizeKey property has an OSNumber value and describes the total length of the media in
- * bytes.
- */
-
-#define kIOMediaSizeKey "Size"
-
-/*!
- * @defined kIOMediaUUIDKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaUUIDKey property has an OSString value and contains a persistent
- * Universal Unique Identifier for the media if such an identifier is available.
- */
-
-#define kIOMediaUUIDKey "UUID"
-
-/*!
- * @defined kIOMediaWholeKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaWholeKey property has an OSBoolean
- * value and describes whether the media is whole, that is,
- * it represents the whole disk (the physical disk, or a virtual replica
- * thereof).
- */
-
-#define kIOMediaWholeKey "Whole"
-
-/*!
- * @defined kIOMediaWritableKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaWritableKey property has an OSBoolean
- * value and describes whether the media is writable.
- */
-
-#define kIOMediaWritableKey "Writable"
-
-/*!
- * @defined kIOMediaContentMaskKey
- * @abstract
- * A property of IOMedia clients.
- * @discussion
- * The kIOMediaContentMaskKey property has an OSString
- * value and must exist in all IOMedia clients that
- * drive new content (that is, produce new media objects).  When the client
- * matches against the provider media, the value of the client's
- * kIOMediaContentMaskKey property is used to replace the provider's
- * kIOMediaContentKey property.
- */
-
-#define kIOMediaContentMaskKey "Content Mask"
-
-/*!
- * @defined kIOMediaIconKey
- * @abstract
- * A property of any object in the media stack.
- * @discussion
- * kIOMediaIconKey is a property of any object in the media stack that wishes
- * to override the default icon shown for the media objects in the stack.  It
- * is usually defined in a provider object below the media object.  It has an
- * OSDictionary value, with properties identical to the kIOIconKey definition,
- * that is, kCFBundleIdentifierKey and kIOBundleResourceFileKey.
- */
-
-#define kIOMediaIconKey "IOMediaIcon"
-
-/*!
- * @enum IOMediaAttributeMask
- * @discussion
- * The IOMediaAttributeMask bit mask describes various attributes of
- * the media object, such as its ejectability and its removability.
- * @constant kIOMediaAttributeEjectableMask
- * Indicates whether the media is ejectable from the drive mechanism
- * under software control.  Implies kIOMediaAttributeRemovableMask.
- * @constant kIOMediaAttributeRemovableMask
- * Indicates whether the media is removable from the drive mechanism.
- */
-
-enum
-{
-    kIOMediaAttributeEjectableMask = 0x00000001,
-    kIOMediaAttributeRemovableMask = 0x00000002,
-    kIOMediaAttributeReservedMask  = 0xFFFFFFFC
-};
-
-typedef UInt32 IOMediaAttributeMask;
-
-#endif /* !_IOMEDIA_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOMediaBSDClient.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOMediaBSDClient.h.svn-base
deleted file mode 100644
index 56a3117..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOMediaBSDClient.h.svn-base
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOMEDIABSDCLIENT_H
-#define _IOMEDIABSDCLIENT_H
-
-#include <sys/disk.h>
-
-#endif /* !_IOMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOPartitionScheme.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOPartitionScheme.h.svn-base
deleted file mode 100644
index 7a1de37..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOPartitionScheme.h.svn-base
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOPartitionScheme
- * @abstract
- * This header contains the IOPartitionScheme class definition.
- */
-
-#ifndef _IOPARTITIONSCHEME_H
-#define _IOPARTITIONSCHEME_H
-
-/*!
- * @defined kIOPartitionSchemeClass
- * @abstract
- * The name of the IOPartitionScheme class.
- * @discussion
- * kIOPartitionSchemeClass is the name of the IOPartitionScheme class.
- */
-
-#define kIOPartitionSchemeClass "IOPartitionScheme"
-
-/*!
- * @defined kIOMediaLiveKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaLiveKey property has an OSBoolean
- * value and is placed into an IOMedia instance
- * created via the partition scheme.  It describes whether the
- * partition is live, that is, it is up-to-date with respect
- * to the on-disk partition table.
- */
-
-#define kIOMediaLiveKey "Live"
-
-/*!
- * @defined kIOMediaPartitionIDKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaPartitionIDKey property has an OSNumber
- * value and is placed into an IOMedia instance
- * created via the partition scheme.  It is an ID that differentiates one 
- * partition from the other (within a given scheme).  It is typically an index
- * into the on-disk partition table.
- */
-
-#define kIOMediaPartitionIDKey "Partition ID"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOMedia.h>
-#include <IOKit/storage/IOStorage.h>
-
-/*!
- * @class IOPartitionScheme
- * @abstract
- * The common base class for all partition scheme
- * objects.
- * @discussion
- * The IOPartitionScheme class is the common base class for all partition scheme
- * objects.  It extends the IOStorage class by implementing the appropriate open
- * and close semantics for partition objects (standard semantics are to act as a
- * multiplexor for incoming opens,  producing one outgoing open with the correct
- * access).  It also implements the default read and write semantics, which pass
- * all reads and writes through to the provider media unprocessed.    For simple
- * schemes, the default behavior is sufficient.   More complex partition schemes
- * such as RAID will want to do extra processing for reads and writes.
- */
-
-class IOPartitionScheme : public IOStorage
-{
-    OSDeclareDefaultStructors(IOPartitionScheme);
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    IOStorageAccess _openLevel;
-    OSSet *         _openReaders;
-    OSSet *         _openReaderWriters;
-
-    /*
-     * Free all of this object's outstanding resources.
-     */
-
-    virtual void free();
-
-    /*!
-     * @function handleOpen
-     * @discussion
-     * The handleOpen method grants or denies permission to access this object
-     * to an interested client.  The argument is an IOStorageAccess value that
-     * specifies the level of access desired -- reader or reader-writer.
-     *
-     * This method can be invoked to upgrade or downgrade the access level for
-     * an existing client as well.  The previous access level will prevail for
-     * upgrades that fail, of course.   A downgrade should never fail.  If the
-     * new access level should be the same as the old for a given client, this
-     * method will do nothing and return success.  In all cases, one, singular
-     * close-per-client is expected for all opens-per-client received.
-     *
-     * This implementation replaces the IOService definition of handleOpen().
-     * @param client
-     * Client requesting the open.
-     * @param options
-     * Options for the open.  Set to zero.
-     * @param access
-     * Access level for the open.  Set to kIOStorageAccessReader or
-     * kIOStorageAccessReaderWriter.
-     * @result
-     * Returns true if the open was successful, false otherwise.
-     */
-
-    virtual bool handleOpen(IOService *  client,
-                            IOOptionBits options,
-                            void *       access);
-
-    /*!
-     * @function handleIsOpen
-     * @discussion
-     * The handleIsOpen method determines whether the specified client, or any
-     * client if none is specified, presently has an open on this object.
-     *
-     * This implementation replaces the IOService definition of handleIsOpen().
-     * @param client
-     * Client to check the open state of.  Set to zero to check the open state
-     * of all clients.
-     * @result
-     * Returns true if the client was (or clients were) open, false otherwise.
-     */
-
-    virtual bool handleIsOpen(const IOService * client) const;
-
-    /*!
-     * @function handleClose
-     * @discussion
-     * The handleClose method closes the client's access to this object.
-     *
-     * This implementation replaces the IOService definition of handleClose().
-     * @param client
-     * Client requesting the close.
-     * @param options
-     * Options for the close.  Set to zero.
-     */
-
-    virtual void handleClose(IOService * client, IOOptionBits options);
-
-    /*
-     * Attach the given media object to the device tree plane.
-     */
-
-#ifdef __LP64__
-    virtual bool attachMediaObjectToDeviceTree(IOMedia * media);
-#else /* !__LP64__ */
-    virtual bool attachMediaObjectToDeviceTree(IOMedia *    media,
-                                               IOOptionBits options = 0); /* 10.5.0 */
-#endif /* !__LP64__ */
-
-    /*
-     * Detach the given media object from the device tree plane.
-     */
-
-#ifdef __LP64__
-    virtual void detachMediaObjectFromDeviceTree(IOMedia * media);
-#else /* !__LP64__ */
-    virtual void detachMediaObjectFromDeviceTree(IOMedia *    media,
-                                                 IOOptionBits options = 0); /* 10.5.0 */
-#endif /* !__LP64__ */
-
-    /*
-     * Updates a set of existing partitions, represented by partitionsOld,
-     * with possible updates from a rescan of the disk, represented by
-     * partitionsNew.  It returns a new set of partitions with the results,
-     * removing partitions from partitionsOld where applicable, adding
-     * partitions from partitionsNew where applicable, and folding in property
-     * changes to partitions from partitionsNew into partitionsOld where
-     * applicable.
-     */
-
-    virtual OSSet * juxtaposeMediaObjects(OSSet * partitionsOld,
-                                          OSSet * partitionsNew); /* 10.5.0 */
-
-public:
-
-    using IOStorage::read;
-    using IOStorage::write;
-
-    /*
-     * Initialize this object's minimal state.
-     */
-
-    virtual bool init(OSDictionary * properties = 0);
-
-    /*!
-     * @function read
-     * @discussion
-     * Read data from the storage object at the specified byte offset into the
-     * specified buffer, asynchronously.   When the read completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the read.
-     *
-     * For simple partition schemes, the default behavior is to simply pass the
-     * read through to the provider media.  More complex partition schemes such
-     * as RAID will need to do extra processing here.
-     * @param client
-     * Client requesting the read.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void read(IOService *           client,
-                      UInt64                byteStart,
-                      IOMemoryDescriptor *  buffer,
-                      IOStorageAttributes * attributes,
-                      IOStorageCompletion * completion);
-
-    /*!
-     * @function write
-     * @discussion
-     * Write data into the storage object at the specified byte offset from the
-     * specified buffer, asynchronously.   When the write completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the write.
-     *
-     * For simple partition schemes, the default behavior is to simply pass the
-     * write through to the provider media. More complex partition schemes such
-     * as RAID will need to do extra processing here.
-     * @param client
-     * Client requesting the write.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void write(IOService *           client,
-                       UInt64                byteStart,
-                       IOMemoryDescriptor *  buffer,
-                       IOStorageAttributes * attributes,
-                       IOStorageCompletion * completion);
-
-    /*!
-     * @function synchronizeCache
-     * @discussion
-     * Flush the cached data in the storage object, if any, synchronously.
-     * @param client
-     * Client requesting the cache synchronization.
-     * @result
-     * Returns the status of the cache synchronization.
-     */
-
-    virtual IOReturn synchronizeCache(IOService * client);
-
-    /*!
-     * @function discard
-     * @discussion
-     * Delete unused data from the storage object at the specified byte offset,
-     * synchronously.
-     * @param client
-     * Client requesting the operation.
-     * @param byteStart
-     * Starting byte offset for the operation.
-     * @param byteCount
-     * Size of the operation.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn discard(IOService * client,
-                             UInt64      byteStart,
-                             UInt64      byteCount);
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method
-     * to return a more specific subclass of OSObject -- an IOMedia.  This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOMedia * getProvider() const;
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  0);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  1);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  2);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  0);
-    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  1);
-    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  2);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  3);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  4);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  5);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  6);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  7);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  8);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  9);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 10);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 11);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 12);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 13);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 14);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 15);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 16);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 17);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 18);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 19);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 20);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 21);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 22);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 23);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 24);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 25);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 26);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 27);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 28);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 29);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 30);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 31);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOStorage.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOStorage.h.svn-base
deleted file mode 100644
index d5725c2..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOStorage.h.svn-base
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOStorage
- * @abstract
- * This header contains the IOStorage class definition.
- */
-
-#ifndef _IOSTORAGE_H
-#define _IOSTORAGE_H
-
-#include <IOKit/IOTypes.h>
-
-/*!
- * @defined kIOStorageClass
- * @abstract
- * The name of the IOStorage class.
- */
-
-#define kIOStorageClass "IOStorage"
-
-/*!
- * @defined kIOStorageCategory
- * @abstract
- * kIOStorageCategory is a value for IOService's kIOMatchCategoryKey property.
- * @discussion
- * The kIOStorageCategory value is the standard value for the IOService property
- * kIOMatchCategoryKey ("IOMatchCategory") for all storage drivers.  All storage
- * objects that expect to drive new content (that is, produce new media objects)
- * are expected to compete within the kIOStorageCategory namespace.
- *
- * See the IOService documentation for more information on match categories.
- */
-
-#define kIOStorageCategory "IOStorage"                /* (as IOMatchCategory) */
-
-/*!
- * @defined kIOStorageFeaturesKey
- * @abstract
- * A property of any object in the storage stack.
- * @discussion
- * kIOStorageFeaturesKey is a property of any object in the storage stack that
- * wishes to express support of additional features, such as Force Unit Access.
- * It is typically defined in the device object below the block storage driver
- * object.  It has an OSDictionary value, where each entry describes one given
- * feature.
- */
-
-#define kIOStorageFeaturesKey "IOStorageFeatures"
-
-/*!
- * @defined kIOStorageFeatureDiscard
- * @abstract
- * Describes the presence of the Discard feature.
- * @discussion
- * This property describes the ability of the storage stack to delete unused
- * data from the media.  It is one of the feature entries listed under the top-
- * level kIOStorageFeaturesKey property table.  It has an OSBoolean value.
- */
-
-#define kIOStorageFeatureDiscard "Discard"
-
-/*!
- * @defined kIOStorageFeatureForceUnitAccess
- * @abstract
- * Describes the presence of the Force Unit Access feature.
- * @discussion
- * This property describes the ability of the storage stack to force a request
- * to access the media.  It is one of the feature entries listed under the top-
- * level kIOStorageFeaturesKey property table.  It has an OSBoolean value.
- */
-
-#define kIOStorageFeatureForceUnitAccess "Force Unit Access"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/assert.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOService.h>
-
-/*!
- * @enum IOStorageAccess
- * @discussion
- * The IOStorageAccess enumeration describes the possible access levels for open
- * requests.
- * @constant kIOStorageAccessNone
- * No access is requested; should not be passed to open().
- * @constant kIOStorageAccessReader
- * Read-only access is requested.
- * @constant kIOStorageAccessReaderWriter
- * Read and write access is requested.
- * @constant kIOStorageAccessSharedLock
- * Shared access is requested.
- * @constant kIOStorageAccessExclusiveLock
- * Exclusive access is requested.
- */
-
-enum
-{
-    kIOStorageAccessNone          = 0x00,
-    kIOStorageAccessReader        = 0x01,
-    kIOStorageAccessReaderWriter  = 0x03,
-    kIOStorageAccessSharedLock    = 0x04,
-    kIOStorageAccessExclusiveLock = 0x08
-};
-
-typedef UInt32 IOStorageAccess;
-
-/*!
- * @enum IOStorageOptions
- * @discussion
- * Options for read and write storage requests.
- * @constant kIOStorageOptionForceUnitAccess
- * Force the request to access the media.
- */
-
-enum
-{
-    kIOStorageOptionNone            = 0x00000000,
-    kIOStorageOptionForceUnitAccess = 0x00000001,
-    kIOStorageOptionReserved        = 0xFFFFFFFE
-};
-
-typedef UInt32 IOStorageOptions;
-
-/*!
- * @struct IOStorageAttributes
- * @discussion
- * Attributes of read and write storage requests.
- * @field options
- * Options for the request.  See IOStorageOptions.
- * @field reserved
- * Reserved for future use.  Set to zero.
- */
-
-struct IOStorageAttributes
-{
-    IOStorageOptions options;
-    UInt32           reserved0032;
-    UInt64           reserved0064;
-#ifdef __LP64__
-    UInt64           reserved0128;
-    UInt64           reserved0192;
-#endif /* __LP64__ */
-};
-
-/*!
- * @typedef IOStorageCompletionAction
- * @discussion
- * The IOStorageCompletionAction declaration describes the C (or C++) completion
- * routine that is called once an asynchronous storage operation completes.
- * @param target
- * Opaque client-supplied pointer (or an instance pointer for a C++ callback).
- * @param parameter
- * Opaque client-supplied pointer.
- * @param status
- * Status of the data transfer.
- * @param actualByteCount
- * Actual number of bytes transferred in the data transfer.
- */
-
-typedef void (*IOStorageCompletionAction)(void *   target,
-                                          void *   parameter,
-                                          IOReturn status,
-                                          UInt64   actualByteCount);
-
-/*!
- * @struct IOStorageCompletion
- * @discussion
- * The IOStorageCompletion structure describes the C (or C++) completion routine
- * that is called once an asynchronous storage operation completes.   The values
- * passed for the target and parameter fields will be passed to the routine when
- * it is called.
- * @field target
- * Opaque client-supplied pointer (or an instance pointer for a C++ callback).
- * @field action
- * Completion routine to call on completion of the data transfer.
- * @field parameter
- * Opaque client-supplied pointer.
- */
-
-struct IOStorageCompletion
-{
-    void *                    target;
-    IOStorageCompletionAction action;
-    void *                    parameter;
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOSTORAGE_H */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOStorageDeviceCharacteristics.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOStorageDeviceCharacteristics.h.svn-base
deleted file mode 100644
index 19a73a2..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOStorageDeviceCharacteristics.h.svn-base
+++ /dev/null
@@ -1,659 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_
-#define _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_
-
-#include <IOKit/storage/IOStorageProtocolCharacteristics.h>
-
-/*
- *	Device Characteristics - Characteristics defined for devices.
- */
-
-/*!
-@defined kIOPropertyDeviceCharacteristicsKey
-@discussion This key is used to define Device Characteristics for a particular
-device and it has an associated dictionary which lists the
-device characteristics. The device characteristics are Command Set specific
-and are listed in the header files for each command set.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyDeviceCharacteristicsKey		"Device Characteristics"
-
-
-/*!
-@defined kIOPropertyVendorNameKey
-@discussion This key is used to define the Vendor Name for a particular device
-and it has an associated string.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyVendorNameKey				"Vendor Name"
-
-
-/*!
-@defined kIOPropertyProductNameKey
-@discussion This key is used to define the Product Name for a particular device
-and it has an associated string.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyProductNameKey				"Product Name"
-
-
-/*!
-@defined kIOPropertyProductRevisionLevelKey
-@discussion This key is used to define the Product Revision Level for a
-particular device and it has an associated string.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyProductRevisionLevelKey		"Product Revision Level"
-
-
-/*!
-@defined kIOPropertyProductSerialNumberKey
-@discussion This key is used to define the Product Serial Number for a
-particular device and it has an associated data.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Serial Number</key>
-		<string>123456789</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyProductSerialNumberKey		"Serial Number"
-
-
-/*!
-@defined kIOPropertySupportedCDFeaturesKey
-@discussion This key is used to define the supported CD Features for a
-particular optical device and it has an associated bitfield. See
-<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
-bits and associated bitmasks.
-
-Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>SuperDrive</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>CD Features</key>
-		<integer>1663</integer>
-		<key>DVD Features</key>
-		<integer>103</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySupportedCDFeaturesKey		"CD Features"
-
-
-/*!
-@defined kIOPropertySupportedDVDFeaturesKey
-@discussion This key is used to define the supported DVD Features for a
-particular optical device and it has an associated bitfield. See
-<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
-bits and associated bitmasks.
-
-Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>SuperDrive</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>CD Features</key>
-		<integer>1663</integer>
-		<key>DVD Features</key>
-		<integer>103</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySupportedDVDFeaturesKey		"DVD Features"
-
-
-/*!
-@defined kIOPropertySupportedBDFeaturesKey
-@discussion This key is used to define the supported BD Features for a
-particular optical device and it has an associated bitfield. See
-<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
-bits and associated bitmasks.
-
-Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>SuperDrive</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>CD Features</key>
-		<integer>1663</integer>
-		<key>DVD Features</key>
-		<integer>103</integer>
-		<key>BD Features</key>
-		<integer>21</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySupportedBDFeaturesKey		"BD Features"
-
-
-/*!
-@defined kIOPropertyRigidDiskGeometryKey
-@discussion This key is used to define a dictionary containing
-rigid disk geometry information.
-
-Requirement: Optional. If a device publishes this dictionary, it
-must publish all key/value pairs which are deemed Mandatory.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Rigid Disk Geometry</key>
-		<dict>
-			<key>Sector Count per Track</key>
-			<integer>12345</integer>
-			<key>Head Count</key>
-			<integer>12</integer>
-			<key>Cylinder Count</key>
-			<integer>12345</integer>
-			<key>Bytes per Physical Sector</key>
-			<integer>512</integer>
-		</dict>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyRigidDiskGeometryKey			"Rigid Disk Geometry"
-
-
-/*!
-@defined kIOPropertySectorCountPerTrackKey
-@discussion This key is used to define the number of sectors per
-each track for a particular medium.
-
-Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Rigid Disk Geometry</key>
-		<dict>
-			<key>Sector Count per Track</key>
-			<integer>12345</integer>
-		</dict>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySectorCountPerTrackKey		"Sector Count per Track"
-
-
-/*!
-@defined kIOPropertyHeadCountKey
-@discussion This key is used to define the number of heads for
-a particular medium.
-
-Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Rigid Disk Geometry</key>
-		<dict>
-			<key>Sector Count per Track</key>
-			<integer>12345</integer>
-			<key>Head Count</key>
-			<integer>12</integer>
-			<key>Cylinder Count</key>
-			<integer>12345</integer>
-			<key>Bytes per Physical Sector</key>
-			<integer>512</integer>
-		</dict>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyHeadCountKey					"Head Count"
-
-
-/*!
-@defined kIOPropertyCylinderCountKey
-@discussion This key is used to define the number of heads for
-a particular medium.
-
-Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Rigid Disk Geometry</key>
-		<dict>
-			<key>Sector Count per Track</key>
-			<integer>12345</integer>
-			<key>Head Count</key>
-			<integer>12</integer>
-			<key>Cylinder Count</key>
-			<integer>12345</integer>
-			<key>Bytes per Physical Sector</key>
-			<integer>512</integer>
-		</dict>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyCylinderCountKey				"Cylinder Count"
-
-
-/*!
-@defined kIOPropertyBytesPerPhysicalSectorKey
-@discussion This key is used to define the number of heads for
-a particular medium.
-
-Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Rigid Disk Geometry</key>
-		<dict>
-			<key>Sector Count per Track</key>
-			<integer>12345</integer>
-			<key>Head Count</key>
-			<integer>12</integer>
-			<key>Cylinder Count</key>
-			<integer>12345</integer>
-			<key>Bytes per Physical Sector</key>
-			<integer>512</integer>
-		</dict>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyBytesPerPhysicalSectorKey	"Bytes per Physical Sector"
-
-
-/*!
-@defined kIOPropertyPhysicalBlockSizeKey
-@discussion This key is used to define the physical block size of a hard disk drive.
-
-Requirement: Mandatory for hard disk drives with physical block size other than 512 bytes.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Physical Block Size</key>
-		<integer>4096</integer>
-		<key>Logical Block Size</key>
-		<integer>512</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalBlockSizeKey		"Physical Block Size"
-
-
-/*!
-@defined kIOPropertyLogicalBlockSizeKey
-@discussion This key is used to define the logical block size of a hard disk drive.
-
-Requirement: Mandatory for hard disk drives with logical block size other than 512 bytes
-or that does not match its physical block size.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Physical Block Size</key>
-		<integer>4096</integer>
-		<key>Logical Block Size</key>
-		<integer>512</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyLogicalBlockSizeKey		"Logical Block Size"
-
-
-/*!
-@defined kIOPropertyTargetDiskModeKey
-@discussion This key is used to indicate the device is another computer in Target Disk Mode.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>AAPL</string>
-		<key>Product Name</key>
-		<string>FireWire Target</string>
-		<key>Product Revision Level</key>
-		<string>0000</string>
-		<key>Target Disk Mode</key>
-		<true/>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyTargetDiskModeKey		"Target Disk Mode"
-
-
-/*!
-@defined kIOPropertyMediumTypeKey
-@discussion This key is used to indicate the medium type of the device.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>AAPL</string>
-		<key>Product Name</key>
-		<string>FireWire Target</string>
-		<key>Product Revision Level</key>
-		<string>0000</string>
-		<key>Medium Type</key>
-		<string>Rotational</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyMediumTypeKey		"Medium Type"
-
-
-/*!
-@defined kIOPropertyMediumTypeRotationalKey
-@discussion This key is used to indicate the medium type of the device is rotational.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>AAPL</string>
-		<key>Product Name</key>
-		<string>FireWire Target</string>
-		<key>Product Revision Level</key>
-		<string>0000</string>
-		<key>Medium Type</key>
-		<string>Rotational</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyMediumTypeRotationalKey		"Rotational"
-
-
-/*!
-@defined kIOPropertyMediumTypeSolidStateKey
-@discussion This key is used to indicate the medium type of the device is solid state.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>AAPL</string>
-		<key>Product Name</key>
-		<string>FireWire Target</string>
-		<key>Product Revision Level</key>
-		<string>0000</string>
-		<key>Medium Type</key>
-		<string>Solid State</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyMediumTypeSolidStateKey		"Solid State"
-
-
-/*!
-@defined kIOPropertyMediumRotationRateKey
-@discussion This key is used to indicate the medium rotation rate in RPM of the device.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>AAPL</string>
-		<key>Product Name</key>
-		<string>FireWire Target</string>
-		<key>Product Revision Level</key>
-		<string>0000</string>
-		<key>Rotation Rate</key>
-		<integer>7200</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyMediumRotationRateKey		"Rotation Rate"
-
-
-#endif	/* _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_ */
diff --git a/i386/include/IOKit/storage/.svn/text-base/IOStorageProtocolCharacteristics.h.svn-base b/i386/include/IOKit/storage/.svn/text-base/IOStorageProtocolCharacteristics.h.svn-base
deleted file mode 100644
index 18a726f..0000000
--- a/i386/include/IOKit/storage/.svn/text-base/IOStorageProtocolCharacteristics.h.svn-base
+++ /dev/null
@@ -1,1758 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_
-#define _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_
-
-
-/*
- *	Protocol Characteristics - Characteristics defined for protocols.
- */
-
-
-/*!
-@defined kIOPropertyProtocolCharacteristicsKey
-@discussion This key is used to define Protocol Characteristics for a particular
-protocol and it has an associated dictionary which lists the
-protocol characteristics.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>ATAPI</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define	kIOPropertyProtocolCharacteristicsKey		"Protocol Characteristics"
-
-
-/*!
-@defined kIOPropertySCSIInitiatorIdentifierKey
-@discussion An identifier that will uniquely identify this SCSI Initiator for the
-SCSI Domain.
-
-Requirement: Mandatory for SCSI Parallel Interface, SAS,
-and Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-		<key>SCSI Initiator Identifier</key>
-		<integer>7</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIInitiatorIdentifierKey		"SCSI Initiator Identifier"
-
-
-/*!
-@defined kIOPropertySCSIDomainIdentifierKey
-@discussion An identifier that will uniquely identify this SCSI Domain for the
-Physical Interconnect type. This identifier is only guaranteed to be unique for
-any given Physical Interconnect and is not guaranteed to be the same across
-restarts or shutdowns.
-
-Requirement: Mandatory for SCSI Parallel Interface and Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-		<key>SCSI Domain Identifier</key>
-		<integer>0</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIDomainIdentifierKey			"SCSI Domain Identifier"
-
-
-/*!
-@defined kIOPropertySCSITargetIdentifierKey
-@discussion This is the SCSI Target Identifier for a given SCSI Target Device.
-
-Requirement: Mandatory for SCSI Parallel Interface and Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-		<key>SCSI Target Identifier</key>
-		<integer>3</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSITargetIdentifierKey			"SCSI Target Identifier"
-
-
-/*!
-@defined kIOPropertySCSILogicalUnitNumberKey
-@discussion This key is the SCSI Logical Unit Number for the device server
-controlled by the driver.
-
-Requirement: Mandatory for SCSI Parallel Interface, SAS, and Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-		<key>SCSI Logical Unit Number</key>
-		<integer>2</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSILogicalUnitNumberKey			"SCSI Logical Unit Number"
-
-
-/*!
-@defined kIOPropertySASAddressKey
-@discussion This key is the unique 64-bit SAS Address for the device server
-node located at this port, or for the initiating host port.
-
-Requirement: Mandatory for SAS.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SAS</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>SAS Address</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-
-Example2:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>SAS Address</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySASAddressKey					"SAS Address"
-
-
-/*!
-@defined kIOPropertyFibreChannelNodeWorldWideNameKey
-@discussion This key is the unique 64-bit World Wide Name for the device server
-node located at this port, or for the initiating host port.
-
-Requirement: Mandatory for Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>Node World Wide Name</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-
-Example2:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Node World Wide Name</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelNodeWorldWideNameKey		"Node World Wide Name"
-
-
-/*!
-@defined kIOPropertyFibreChannelPortWorldWideNameKey
-@discussion This key is the unique 64-bit World Wide Name for the port.
-
-Requirement: Mandatory for Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>Port World Wide Name</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-
-Example2:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port World Wide Name</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelPortWorldWideNameKey		"Port World Wide Name"
-
-
-/*!
-@defined kIOPropertyFibreChannelAddressIdentifierKey
-@discussion This key is the 24-bit Address Identifier (S_ID or D_ID) as
-defined in the FC-FS specification. It contains the address identifier
-of the source or destination Nx_Port.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional (only necessary for Fibre Channel Interface).
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>Address Identifier</key>
-		<data>001122</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-
-Example2:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Address Identifier</key>
-		<data>001122</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelAddressIdentifierKey		"Address Identifier"
-
-
-/*!
-@defined kIOPropertyFibreChannelALPAKey
-@discussion This key is the 8-bit Arbitrated Loop Physical Address
-(AL_PA) value as defined in the FC-AL-2 specification.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional (only necessary for Fibre Channel Interface).
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>AL_PA</key>
-		<data>04</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-
-Example2:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>AL_PA</key>
-		<data>04</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelALPAKey					"AL_PA"
-
-
-/*!
-@defined kIOPropertyPortStatusKey
-@discussion This key is associated with the current port
-status of the physical link. The port status is either
-"Link Established", "No Link Established", or "Link Failed".
-
-Note: This value can change when the port status changes. It
-is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Status</key>
-		<string>Link Established</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortStatusKey						"Port Status"
-
-
-/*!
-@defined kIOPropertyPortSpeedKey
-@discussion This key is associated with the current port
-speed. The port speed can be any valid speed for the interconnect.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (1 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedKey							"Port Speed"
-
-
-/*!
-@defined kIOPropertyPortTopologyKey
-@discussion This key is associated with the current port
-topology. The port topology can be any valid topology for the interconnect.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>Automatic (N_Port)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyKey						"Port Topology"
-
-
-/*!
-@defined kIOPropertyPortDescriptionKey
-@discussion This key is associated with an human
-readable port description. Examples include
-"Channel A", "Port 1", etc.
-
-Requirement: Optional for all interconnects.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Description</key>
-		<string>Channel A</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortDescriptionKey					"Port Description"
-
-
-/*!
-@defined kIOPropertySCSIParallelSignalingTypeKey
-@discussion This key is associated with the signaling type
-used for this SCSI Parallel bus. Valid values include
-"High Voltage Differential", "Low Voltage Differential",
-and "Single Ended".
-
-Requirement: Optional for SCSI Parallel Interface. Not
-defined for any other physical interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>SCSI Parallel Signaling Type</key>
-		<string>High Voltage Differential</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIParallelSignalingTypeKey			"SCSI Parallel Signaling Type"
-
-
-/*!
-@defined kIOPropertyFibreChannelCableDescriptionKey
-@discussion This key is associated with the cabling type
-used for this Fibre Channel port. Valid values include
-"Copper" and "Fiber Optic".
-
-Requirement: Optional for Fibre Channel Interface. Not
-defined for any other physical interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Fibre Channel Cabling Type</key>
-		<string>Copper</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelCableDescriptionKey		"Fibre Channel Cabling Type"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeKey
-@discussion This key is used to define the Physical Interconnect to which
-a device is attached.
-
-Requirement: Mandatory.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeKey		"Physical Interconnect"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectLocationKey
-@discussion This key is used to define the Physical Interconnect
-Location.
-
-Requirement: Mandatory.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectLocationKey	"Physical Interconnect Location"
-
-
-/*!
-@defined kIOPropertySCSIProtocolMultiInitKey
-@discussion This protocol characteristics key is used to inform the system
-that the protocol supports having multiple devices that act as initiators.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>Multiple Initiators</key>
-		<string>True</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIProtocolMultiInitKey			"Multiple Initiators"
-
-
-/*
- *	Values - Values for the characteristics defined above.
- */
-
-
-/*!
-@defined kIOPropertyInternalKey
-@discussion This key defines the value of Internal for the key
-kIOPropertyPhysicalInterconnectLocationKey. If the device is
-connected to an internal bus, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>ATA</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyInternalKey						"Internal"
-
-
-/*!
-@defined kIOPropertyExternalKey
-@discussion This key defines the value of External for the key
-kIOPropertyPhysicalInterconnectLocationKey. If the device is
-connected to an external bus, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyExternalKey						"External"
-
-
-/*!
-@defined kIOPropertyInternalExternalKey
-@discussion This key defines the value of Internal/External for the key
-kIOPropertyPhysicalInterconnectLocationKey. If the device is connected
-to a bus and it is indeterminate whether it is internal or external,
-this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal/External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyInternalExternalKey				"Internal/External"
-
-
-/*!
-@defined kIOPropertyInterconnectFileKey
-@discussion This key defines the value of File for the key
-kIOPropertyPhysicalInterconnectLocationKey. If the device is a file
-that is being represented as a storage device, this key should be set.
-
-NOTE: This key should only be used when the Physical Interconnect is set to
-Virtual Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Virtual Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>File</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyInterconnectFileKey						"File"
-
-
-/*!
-@defined kIOPropertyInterconnectRAMKey
-@discussion This key defines the value of RAM for the key
-kIOPropertyPhysicalInterconnectLocationKey. If the device is system memory
-that is being represented as a storage device, this key should be set.
-
-NOTE: This key should only be used when the Physical Interconnect is set to
-Virtual Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Virtual Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>RAM</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyInterconnectRAMKey						"RAM"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeATA
-@discussion This key defines the value of ATA for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to an ATA bus, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>ATA</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeATA				"ATA"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeSerialATA
-@discussion This key defines the value of SATA for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a SATA bus, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SATA</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeSerialATA		"SATA"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeSerialAttachedSCSI
-@discussion This key defines the value of SAS for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a SAS bus, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SAS</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeSerialAttachedSCSI	"SAS"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeATAPI
-@discussion This key defines the value of ATAPI for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to an ATA bus and follows the ATAPI command specification, this key
-should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>ATAPI</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeATAPI			"ATAPI"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeUSB
-@discussion This key defines the value of USB for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a USB port, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>USB</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeUSB				"USB"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeFireWire
-@discussion This key defines the value of USB for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a FireWire port, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>FireWire</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeFireWire			"FireWire"
-
-
-/*!
- @defined kIOPropertyPhysicalInterconnectTypeSecureDigital
- @discussion This key defines the value of Secure Digital for the key
- kIOPropertyPhysicalInterconnectTypeSecureDigital. If the device is a
- connected to a Secure Digital port and follows the Secure Digital 
- specification, this key should be set. 
- 
- Example:
- <pre>
- @textblock
- <dict>
-    <key>Protocol Characteristics</key>
-    <dict>
-        <key>Physical Interconnect</key>
-        <string>Secure Digital</string>
-        <key>Physical Interconnect Location</key>
-        <string>Internal</string>
-    </dict>
- </dict>
- @/textblock
- </pre>
- */
-#define kIOPropertyPhysicalInterconnectTypeSecureDigital	"Secure Digital"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeSCSIParallel
-@discussion This key defines the value of SCSI Parallel Interface for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a SCSI Parallel port, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeSCSIParallel		"SCSI Parallel Interface"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeFibreChannel
-@discussion This key defines the value of Fibre Channel Interface for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a Fibre Channel port, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeFibreChannel		"Fibre Channel Interface"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeVirtual
-@discussion This key defines the value of Virtual Interface for the key
-kIOPropertyPhysicalInterconnectTypeVirtual. If the device is being made to look
-like a storage device, but is not such in actuality, such as a File or RAM, this
-key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Virtual Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>File</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeVirtual		"Virtual Interface"
-
-
-/*!
-@defined kIOPropertyPortStatusLinkEstablishedKey
-@discussion This key defines the value of Link Established for the key
-kIOPropertyPortStatusKey.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Status</key>
-		<string>Link Established</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortStatusLinkEstablishedKey			"Link Established"
-
-
-/*!
-@defined kIOPropertyPortStatusNoLinkEstablishedKey
-@discussion This key defines the value of No Link Established for the key
-kIOPropertyPortStatusKey.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Status</key>
-		<string>No Link Established</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortStatusNoLinkEstablishedKey		"No Link Established"
-
-
-/*!
-@defined kIOPropertyPortStatusLinkFailedKey
-@discussion This key defines the value of Link Failed for the key
-kIOPropertyPortStatusKey.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Status</key>
-		<string>Link Failed</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortStatusLinkFailedKey				"Link Failed"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomaticKey
-@discussion This key defines the value of Automatic for the key
-kIOPropertyPortSpeedKey. If the speed of the port is automatically
-adjusted by the host/device and a definitive speed is not known,
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomaticKey				"Automatic"
-
-
-/*!
-@defined kIOPropertyPortSpeed1GigabitKey
-@discussion This key defines the value of 1 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 1 Gigabit
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>1 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed1GigabitKey					"1 Gigabit"
-
-/*!
-@defined kIOPropertyPortSpeed1_5GigabitKey
-@discussion This key defines the value of 1.5 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 1.5 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>1.5 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed1_5GigabitKey				"1.5 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeed2GigabitKey
-@discussion This key defines the value of 2 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 2 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>2 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed2GigabitKey					"2 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeed3GigabitKey
-@discussion This key defines the value of 3 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 3 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>3 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed3GigabitKey					"3 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeed4GigabitKey
-@discussion This key defines the value of 4 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 4 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>4 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed4GigabitKey					"4 Gigabit"
-
-/*!
-@defined kIOPropertyPortSpeed6GigabitKey
-@discussion This key defines the value of 6 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 6 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>6 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed6GigabitKey					"6 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeed8GigabitKey
-@discussion This key defines the value of 8 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 8 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>8 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed8GigabitKey					"8 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeed10GigabitKey
-@discussion This key defines the value of 10 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 10 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>10 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed10GigabitKey				"10 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic1GigabitKey
-@discussion This key defines the value of Automatic (1 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-1 Gigabit per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (1 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic1GigabitKey		"Automatic (1 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic1_5GigabitKey
-@discussion This key defines the value of Automatic (1.5 Gigabit) for the key
-kIOPropertyPortSpeedKey. If the speed of the port is
-1.5 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (1.5 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic1_5GigabitKey		"Automatic (1.5 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic2GigabitKey
-@discussion This key defines the value of Automatic (2 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-2 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (2 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic2GigabitKey		"Automatic (2 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic3GigabitKey
-@discussion This key defines the value of Automatic (3 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-3 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (3 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic3GigabitKey		"Automatic (3 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic4GigabitKey
-@discussion This key defines the value of Automatic (4 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-4 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (4 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic4GigabitKey		"Automatic (4 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic6GigabitKey
-@discussion This key defines the value of Automatic (6 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-6 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (6 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic6GigabitKey		"Automatic (6 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic8GigabitKey
-@discussion This key defines the value of Automatic (8 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-8 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (8 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic8GigabitKey		"Automatic (8 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic10GigabitKey
-@discussion This key defines the value of Automatic (10 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-10 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (10 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic10GigabitKey		"Automatic (10 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortTopologyAutomaticKey
-@discussion This key defines the value of Automatic for the key
-kIOPropertyPortTopologyKey. If the topology of the port is automatically
-adjusted by the host/device and a definitive topology is not known,
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>Automatic</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyAutomaticKey				"Automatic"
-
-
-/*!
-@defined kIOPropertyPortTopologyNPortKey
-@discussion This key defines the value of N_Port for the key
-kIOPropertyPortTopologyKey. If the topology of the port is an N_Port,
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>N_Port</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyNPortKey					"N_Port"
-
-
-/*!
-@defined kIOPropertyPortTopologyNLPortKey
-@discussion This key defines the value of NL_Port for the key
-kIOPropertyPortTopologyKey. If the topology of the port is an NL_Port,
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>NL_Port</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyNLPortKey				"NL_Port"
-
-
-/*!
-@defined kIOPropertyPortTopologyAutomaticNPortKey
-@discussion This key defines the value of Automatic (N_Port) for the key
-kIOPropertyPortTopologyKey. If the topology of the port is
-N_Port and is automatically determined by host software, this
-key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>Automatic (N_Port)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyAutomaticNPortKey		"Automatic (N_Port)"
-
-
-/*!
-@defined kIOPropertyPortTopologyAutomaticNLPortKey
-@discussion This key defines the value of Automatic (NL_Port) for the key
-kIOPropertyPortTopologyKey. If the topology of the port is
-NL_Port and is automatically determined by host software, this
-key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>Automatic (NL_Port)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyAutomaticNLPortKey		"Automatic (NL_Port)"
-
-
-/*!
-@defined kIOPropertySCSIParallelSignalingTypeHVDKey
-@discussion This key defines the value of High Voltage Differential for the key
-kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
-High Voltage Differential, this key should be used.
-
-Requirement: Optional for SCSI Parallel Interface interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>SCSI Parallel Signaling Type</key>
-		<string>High Voltage Differential</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIParallelSignalingTypeHVDKey		"High Voltage Differential"
-
-
-/*!
-@defined kIOPropertySCSIParallelSignalingTypeLVDKey
-@discussion This key defines the value of Low Voltage Differential for the key
-kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
-Low Voltage Differential, this key should be used.
-
-Requirement: Optional for SCSI Parallel Interface interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>SCSI Parallel Signaling Type</key>
-		<string>Low Voltage Differential</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIParallelSignalingTypeLVDKey		"Low Voltage Differential"
-
-
-/*!
-@defined kIOPropertySCSIParallelSignalingTypeSEKey
-@discussion This key defines the value of Single Ended for the key
-kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
-Single Ended, this key should be used.
-
-Requirement: Optional for SCSI Parallel Interface interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>SCSI Parallel Signaling Type</key>
-		<string>Single Ended</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIParallelSignalingTypeSEKey		"Single Ended"
-
-
-/*!
-@defined kIOPropertyFibreChannelCableDescriptionCopperKey
-@discussion This key defines the value of Copper for the key
-kIOPropertyFibreChannelCableDescriptionKey. If the cabling is
-Copper, this key should be used.
-
-Requirement: Optional for Fibre Channel Interface interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Fibre Channel Cabling Type</key>
-		<string>Copper</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelCableDescriptionCopperKey		"Copper"
-
-
-/*!
-@defined kIOPropertyFibreChannelCableDescriptionFiberOpticKey
-@discussion This key defines the value of Fiber Optic for the key
-kIOPropertyFibreChannelCableDescriptionKey. If the cabling is
-Fiber Optic, this key should be used.
-
-Requirement: Optional for Fibre Channel Interface interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Fibre Channel Cabling Type</key>
-		<string>Fiber Optic</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelCableDescriptionFiberOpticKey	"Fiber Optic"
-
-
-#endif	/* _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_ */
diff --git a/i386/include/IOKit/storage/IOAppleLabelScheme.h b/i386/include/IOKit/storage/IOAppleLabelScheme.h
deleted file mode 100644
index 6e290a4..0000000
--- a/i386/include/IOKit/storage/IOAppleLabelScheme.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * This header contains the IOAppleLabelScheme class definition.
- */
-
-#ifndef _IOAPPLELABELSCHEME_H
-#define _IOAPPLELABELSCHEME_H
-
-#include <IOKit/IOTypes.h>
-
-/*
- * kIOAppleLabelSchemeClass is the name of the IOAppleLabelScheme class.
- */
-
-#define kIOAppleLabelSchemeClass "IOAppleLabelScheme"
-
-/*
- * Apple Label Scheme Definitions
- */
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/* Label scheme. */
-
-struct applelabel
-{
-    uint8_t  al_boot0[416];               /* (reserved for boot area)         */
-    uint16_t al_magic;                    /* (the magic number)               */
-    uint16_t al_type;                     /* (label type)                     */
-    uint32_t al_flags;                    /* (generic flags)                  */
-    uint64_t al_offset;                   /* (offset of property area, bytes) */
-    uint32_t al_size;                     /* (size of property area, bytes)   */
-    uint32_t al_checksum;                 /* (checksum of property area)      */
-    uint8_t  al_boot1[72];                /* (reserved for boot area)         */
-};
-
-/* Label scheme signature (al_magic). */
-
-#define AL_MAGIC 0x414C
-
-/* Label scheme version (al_type). */
-
-#define AL_TYPE_DEFAULT 0x0000
-
-/* Label scheme flags (al_flags). */
-
-#define AL_FLAG_DEFAULT 0x00000000
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOFilterScheme.h>
-
-/*
- * Class
- */
-
-class IOAppleLabelScheme : public IOFilterScheme
-{
-    OSDeclareDefaultStructors(IOAppleLabelScheme);
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    IOMedia * _content;
-
-    /*
-     * Free all of this object's outstanding resources.
-     */
-
-    virtual void free(void);
-
-    /*
-     * Scan the provider media for an Apple label scheme.
-     */
-
-    virtual IOMedia * scan(SInt32 * score);
-
-    /*
-     * Ask whether the given content appears to be corrupt.
-     */
-
-    virtual bool isContentCorrupt(OSDictionary * properties);
-
-    /*
-     * Ask whether the given content appears to be invalid.
-     */
-
-    virtual bool isContentInvalid(OSDictionary * properties);
-
-    /*
-     * Instantiate a new media object to represent the given content.
-     */
-
-    virtual IOMedia * instantiateMediaObject(OSDictionary * properties);
-
-    /*
-     * Allocate a new media object (called from instantiateMediaObject).
-     */
-
-    virtual IOMedia * instantiateDesiredMediaObject(OSDictionary * properties);
-
-    /*
-     * Attach the given media object to the device tree plane.
-     */
-
-    virtual bool attachMediaObjectToDeviceTree(IOMedia * media);
-
-    /*
-     * Detach the given media object from the device tree plane.
-     */
-
-    virtual void detachMediaObjectFromDeviceTree(IOMedia * media);
-
-public:
-
-    /*
-     * Initialize this object's minimal state.
-     */
-
-    virtual bool init(OSDictionary * properties = 0);
-
-    /*
-     * Determine whether the provider media contains an Apple label scheme.
-     */
-
-    virtual IOService * probe(IOService * provider, SInt32 * score);
-
-    /*
-     * Publish the new media object which represents our content.
-     */
-
-    virtual bool start(IOService * provider);
-
-    /*
-     * Clean up after the media object we published before terminating.
-     */
-
-    virtual void stop(IOService * provider);
-
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  0);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  1);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  2);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  3);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  4);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  5);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  6);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  7);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  8);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme,  9);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 10);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 11);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 12);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 13);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 14);
-    OSMetaClassDeclareReservedUnused(IOAppleLabelScheme, 15);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOAPPLELABELSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOApplePartitionScheme.h b/i386/include/IOKit/storage/IOApplePartitionScheme.h
deleted file mode 100644
index ace1f3b..0000000
--- a/i386/include/IOKit/storage/IOApplePartitionScheme.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * This header contains the IOApplePartitionScheme class definition.
- */
-
-#ifndef _IOAPPLEPARTITIONSCHEME_H
-#define _IOAPPLEPARTITIONSCHEME_H
-
-#include <IOKit/IOTypes.h>
-
-/*
- * kIOApplePartitionSchemeClass is the name of the IOApplePartitionScheme class.
- */
-
-#define kIOApplePartitionSchemeClass "IOApplePartitionScheme"
-
-/*
- * Apple Partition Map Definitions
- */
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/* Structure constants. */
-
-#define DPISTRLEN 32
-
-/* Partition map entry, as found in blocks 1 to dpme_map_entries of the disk. */
-
-typedef struct dpme
-{
-    UInt16  dpme_signature;       /* (unique value for partition entry, 'PM') */
-    UInt16  dpme_reserved_1;      /* (reserved for future use)                */
-    UInt32  dpme_map_entries;     /* (number of partition entries)            */
-    UInt32  dpme_pblock_start;    /* (physical block start of partition)      */
-    UInt32  dpme_pblocks;         /* (physical block count of partition)      */
-    char    dpme_name[DPISTRLEN]; /* (name of partition)                      */
-    char    dpme_type[DPISTRLEN]; /* (type of partition, eg. Apple_HFS)       */
-    UInt32  dpme_lblock_start;    /* (logical block start of partition)       */
-    UInt32  dpme_lblocks;         /* (logical block count of partition)       */
-    UInt32  dpme_flags;           /* (partition flags, see defines below)     */
-    UInt32  dpme_boot_block;      /* (logical block start of boot code)       */
-    UInt32  dpme_boot_bytes;      /* (byte count of boot code)                */
-    UInt32  dpme_load_addr;       /* (load address in memory of boot code)    */
-    UInt32  dpme_load_addr_2;     /* (reserved for future use)                */
-    UInt32  dpme_goto_addr;       /* (jump address in memory of boot code)    */
-    UInt32  dpme_goto_addr_2;     /* (reserved for future use)                */
-    UInt32  dpme_checksum;        /* (checksum of boot code)                  */
-    UInt8   dpme_process_id[16];  /* (processor type)                         */
-    UInt32  dpme_reserved_2[32];  /* (reserved for future use)                */
-    UInt32  dpme_reserved_3[62];  /* (reserved for future use)                */
-} DPME;
-
-/* Driver descriptor map entry. */
-
-typedef struct DDMap
-{
-    UInt32  ddBlock;              /* (driver's block start, sbBlkSize-blocks) */
-    UInt16  ddSize;               /* (driver's block count, 512-blocks)       */
-    UInt16  ddType;               /* (driver's system type)                   */
-} DDMap;
-
-/* Driver descriptor map, as found in block zero of the disk. */
-
-typedef struct Block0
-{
-    UInt16  sbSig;                     /* (unique value for block zero, 'ER') */
-    UInt16  sbBlkSize;                 /* (block size for this device)        */
-    UInt32  sbBlkCount;                /* (block count for this device)       */
-    UInt16  sbDevType;                 /* (device type)                       */
-    UInt16  sbDevId;                   /* (device id)                         */
-    UInt32  sbDrvrData;                /* (driver data)                       */
-    UInt16  sbDrvrCount;               /* (driver descriptor count)           */
-    DDMap   sbDrvrMap[8];              /* (driver descriptor table)           */
-    UInt8   sbReserved[430];           /* (reserved for future use)           */
-} Block0;
-
-/* Partition map signature (sbSig). */
-
-#define BLOCK0_SIGNATURE 0x4552
-
-/* Partition map entry signature (dpme_signature). */
-
-#define DPME_SIGNATURE 0x504D
-
-/* Partition map entry flags (dpme_flags). */
-
-#define DPME_FLAGS_VALID          0x00000001                   /* (bit 0)     */
-#define DPME_FLAGS_ALLOCATED      0x00000002                   /* (bit 1)     */
-#define DPME_FLAGS_IN_USE         0x00000004                   /* (bit 2)     */
-#define DPME_FLAGS_BOOTABLE       0x00000008                   /* (bit 3)     */
-#define DPME_FLAGS_READABLE       0x00000010                   /* (bit 4)     */
-#define DPME_FLAGS_WRITABLE       0x00000020                   /* (bit 5)     */
-#define DPME_FLAGS_OS_PIC_CODE    0x00000040                   /* (bit 6)     */
-#define DPME_FLAGS_OS_SPECIFIC_2  0x00000080                   /* (bit 7)     */
-#define DPME_FLAGS_OS_SPECIFIC_1  0x00000100                   /* (bit 8)     */
-#define DPME_FLAGS_RESERVED_2     0xFFFFFE00                   /* (bit 9..31) */
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* !_IOAPPLEPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOBDBlockStorageDevice.h b/i386/include/IOKit/storage/IOBDBlockStorageDevice.h
deleted file mode 100644
index 66a09d7..0000000
--- a/i386/include/IOKit/storage/IOBDBlockStorageDevice.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOBDBlockStorageDevice
- * @abstract
- * This header contains the IOBDBlockStorageDevice class definition.
- */
-
-#ifndef	_IOBDBLOCKSTORAGEDEVICE_H
-#define	_IOBDBLOCKSTORAGEDEVICE_H
-
-#include <IOKit/storage/IOBDTypes.h>
-
-/*!
- * @defined kIOBDBlockStorageDeviceClass
- * @abstract
- * kIOBDBlockStorageDeviceClass is the name of the IOBDBlockStorageDevice class.
- * @discussion
- * kIOBDBlockStorageDeviceClass is the name of the IOBDBlockStorageDevice class.
- */
-
-#define kIOBDBlockStorageDeviceClass "IOBDBlockStorageDevice"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IODVDBlockStorageDevice.h>
-
-/* Property used for matching, so the generic driver gets the nub it wants. */
-#define	kIOBlockStorageDeviceTypeBD	"BD"
-
-/*!
- * @class
- * IOBDBlockStorageDevice
- * @abstract
- * The IOBDBlockStorageDevice class is a generic BD block storage device
- * abstraction.
- * @discussion
- * This class is the protocol for generic BD functionality, independent of
- * the physical connection protocol (e.g. SCSI, ATA, USB).
- *
- * The APIs are the union of CD APIs, DVD APIs, and all
- * necessary new low-level BD APIs.
- *
- * A subclass implements relay methods that translate our requests into
- * calls to a protocol- and device-specific provider.
- */
-
-class IOBDBlockStorageDevice : public IODVDBlockStorageDevice
-{
-    OSDeclareAbstractStructors(IOBDBlockStorageDevice)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*!
-     * @function init
-     * @discussion
-     * Initialize this object's minimal state.
-     * @param properties
-     * Substitute property table for this object (optional).
-     * @result
-     * Returns true on success, false otherwise.
-     */
-
-    virtual bool init(OSDictionary * properties);
-
-    /*!
-     * @function readDiscStructure
-     * @discussion
-     * Issue an MMC READ DISC STRUCTURE command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param format
-     * As documented by MMC.
-     * @param address
-     * As documented by MMC.
-     * @param layer
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @param type
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readDiscStructure( IOMemoryDescriptor * buffer,
-                                        UInt8                format,
-                                        UInt32               address,
-                                        UInt8                layer,
-                                        UInt8                grantID,
-                                        UInt8                type ) = 0;
-
-    /*!
-     * @function splitTrack
-     * @discussion
-     * Issue an MMC RESERVE TRACK command with the ARSV bit.
-     * @param address
-     * As documented by MMC.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn splitTrack(UInt32 address) = 0;
-
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  0);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  1);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  2);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  3);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  4);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  5);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  6);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  7);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  8);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice,  9);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 10);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 11);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 12);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 13);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 14);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDevice, 15);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOBDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/IOBDBlockStorageDriver.h b/i386/include/IOKit/storage/IOBDBlockStorageDriver.h
deleted file mode 100644
index 199218c..0000000
--- a/i386/include/IOKit/storage/IOBDBlockStorageDriver.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOBDBlockStorageDriver
- * @abstract
- * This header contains the IOBDBlockStorageDriver class definition.
- * @discussion
- * This class implements BD functionality, independent of
- * the physical connection protocol (e.g. SCSI, ATA, USB).
- *
- * A protocol-specific provider implements the functionality using an appropriate
- * protocol and commands.
- */
-
-#ifndef	_IOBDBLOCKSTORAGEDRIVER_H
-#define	_IOBDBLOCKSTORAGEDRIVER_H
-
-#include <IOKit/storage/IOBDBlockStorageDevice.h>
-#include <IOKit/storage/IODVDBlockStorageDriver.h>
-
-/*!
- * @defined kIOBDBlockStorageDriverClass
- * @abstract
- * kIOBDBlockStorageDriverClass is the name of the IOBDBlockStorageDriver class.
- * @discussion
- * kIOBDBlockStorageDriverClass is the name of the IOBDBlockStorageDriver class.
- */
-
-#define kIOBDBlockStorageDriverClass "IOBDBlockStorageDriver"
-
-/*!
- * @class
- * IOBDBlockStorageDriver
- * @abstract
- * Generic BD Driver.
- * @discussion
- * Storage drivers are split into two parts: the Generic Driver handles
- * all generic device issues, independent of the lower-level transport
- * mechanism (e.g. SCSI, ATA, USB, FireWire). All storage operations
- * at the Generic Driver level are translated into a series of generic
- * device operations. These operations are passed via the Device Nub
- * to a Transport Driver, which implements the appropriate
- * transport-dependent protocol to execute these operations.
- * 
- * To determine the write-protect state of a device (or media), for
- * example, the generic driver would issue a call to the
- * Transport Driver's reportWriteProtection method. If this were a SCSI
- * device, its Transport Driver would issue a Mode Sense command to
- * extract the write-protection status bit. The Transport Driver then
- * reports true or false to the generic driver.
- * 
- * The generic driver therefore has no knowledge of, or involvement
- * with, the actual commands and mechanisms used to communicate with
- * the device. It is expected that the generic driver will rarely, if
- * ever, need to be subclassed to handle device idiosyncrasies; rather,
- * the Transport Driver should be changed via overrides.
- * 
- * A generic driver could be subclassed to create a different type of
- * generic device. The generic driver IOBDBlockStorageDriver class is a subclass
- * of IODVDBlockStorageDriver, adding BD functions. Similarly, the Transport Driver
- * IOBDBlockStorageDevice is a subclass of IODVDBlockStorageDevice, adding BD 
- * functions.
-*/
-
-class IOBDBlockStorageDriver : public IODVDBlockStorageDriver
-{
-    OSDeclareDefaultStructors(IOBDBlockStorageDriver)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    /* Overrides of IODVDBlockStorageDriver. */
-
-    virtual IOReturn acceptNewMedia(void);
-
-    /* End of IODVDBlockStorageDriver overrides. */
-
-public:
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method to
-     * return a more specific subclass of IOService -- IOBDBlockStorageDevice.
-     * This method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOBDBlockStorageDevice * getProvider() const;
-
-    /* Overrides of IODVDBlockStorageDriver: */
-
-    virtual const char * getDeviceTypeName(void);
-    virtual IOMedia * instantiateDesiredMediaObject(void);
-    virtual IOMedia * instantiateMediaObject(UInt64 base,UInt64 byteSize,
-                                            UInt32 blockSize,char *mediaName);
-    virtual IOReturn readStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
-                                        const UInt32 address,const UInt8 layer,const UInt8 agid);
-
-    /* End of IODVDBlockStorageDriver overrides. */
-
-    /*!
-     * @function splitTrack
-     * @discussion
-     * Issue an MMC RESERVE TRACK command with the ARSV bit.
-     * @param address
-     * As documented by MMC.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn splitTrack(UInt32 address);
-
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  0);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  1);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  2);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  3);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  4);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  5);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  6);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  7);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  8);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver,  9);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 10);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 11);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 12);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 13);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 14);
-    OSMetaClassDeclareReservedUnused(IOBDBlockStorageDriver, 15);
-};
-
-#endif  /* !_IOBDBLOCKSTORAGEDRIVER_H */
diff --git a/i386/include/IOKit/storage/IOBDMedia.h b/i386/include/IOKit/storage/IOBDMedia.h
deleted file mode 100644
index e204a1e..0000000
--- a/i386/include/IOKit/storage/IOBDMedia.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOBDMedia
- * @abstract
- * This header contains the IOBDMedia class definition.
- */
-
-#ifndef _IOBDMEDIA_H
-#define _IOBDMEDIA_H
-
-/*!
- * @defined kIOBDMediaClass
- * @abstract
- * kIOBDMediaClass is the name of the IOBDMedia class.
- * @discussion
- * kIOBDMediaClass is the name of the IOBDMedia class.
- */
-
-#define kIOBDMediaClass "IOBDMedia"
-
-/*!
- * @defined kIOBDMediaTypeKey
- * @abstract
- * kIOBDMediaTypeKey is a property of IOBDMedia objects.  It has an OSString
- * value.
- * @discussion
- * The kIOBDMediaTypeKey property identifies the BD media type (BD-ROM, BD-R,
- * BD-RE, etc).  See the kIOBDMediaType contants for possible values.
- */
-
-#define kIOBDMediaTypeKey "Type"
-
-/*!
- * @defined kIOBDMediaTypeROM
- * The kIOBDMediaTypeKey constant for BD-ROM media.
- */
-
-#define kIOBDMediaTypeROM "BD-ROM"
-
-/*!
- * @defined kIOBDMediaTypeR
- * The kIOBDMediaTypeKey constant for BD-R media.
- */
-
-#define kIOBDMediaTypeR "BD-R"
-
-/*!
- * @defined kIOBDMediaTypeRE
- * The kIOBDMediaTypeKey constant for BD-RE media.
- */
-
-#define kIOBDMediaTypeRE "BD-RE"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOBDBlockStorageDriver.h>
-#include <IOKit/storage/IOMedia.h>
-
-/*!
- * @class IOBDMedia
- * @abstract
- * The IOBDMedia class is a random-access disk device abstraction for BDs.
- * @discussion
- * The IOBDMedia class is a random-access disk device abstraction for BDs.
- */
-
-class IOBDMedia : public IOMedia
-{
-    OSDeclareDefaultStructors(IOBDMedia)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*
-     * Obtain this object's provider.   We override the superclass's method to
-     * return a more specific subclass of IOService -- IOBDBlockStorageDriver.
-     * This method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOBDBlockStorageDriver * getProvider() const;
-
-    /*
-     * Compare the properties in the supplied table to this object's properties.
-     */
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
-
-    /*!
-     * @function reportKey
-     * @discussion
-     * Issue an MMC REPORT KEY command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param keyClass
-     * As documented by MMC.
-     * @param address
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @param format
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn reportKey( IOMemoryDescriptor * buffer,
-                                UInt8                keyClass,
-                                UInt32               address,
-                                UInt8                grantID,
-                                UInt8                format );
-
-    /*!
-     * @function sendKey
-     * @discussion
-     * Issue an MMC SEND KEY command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param keyClass
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @param format
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn sendKey( IOMemoryDescriptor * buffer,
-                              UInt8                keyClass,
-                              UInt8                grantID,
-                              UInt8                format );
-
-    /*!
-     * @function readStructure
-     * @discussion
-     * Issue an MMC READ DISC STRUCTURE command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param format
-     * As documented by MMC.
-     * @param address
-     * As documented by MMC.
-     * @param layer
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readStructure( IOMemoryDescriptor *     buffer,
-                                    UInt8                    format,
-                                    UInt32                   address,
-                                    UInt8                    layer,
-                                    UInt8                    grantID );
-
-    /*!
-     * @function getSpeed
-     * @discussion
-     * Get the current speed used for data transfers.
-     * @param kilobytesPerSecond
-     * Returns the current speed used for data transfers, in kB/s.
-     *
-     * kBDSpeedMin specifies the minimum speed for all BD media (1X).
-     * kBDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond);
-
-    /*!
-     * @function setSpeed
-     * @discussion
-     * Set the speed to be used for data transfers.
-     * @param kilobytesPerSecond
-     * Speed to be used for data transfers, in kB/s.
-     *
-     * kBDSpeedMin specifies the minimum speed for all BD media (1X).
-     * kBDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond);
-
-    /*!
-     * @function readDiscInfo
-     * @discussion
-     * Issue an MMC READ DISC INFORMATION command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param type
-     * Reserved for future use.  Set to zero.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readDiscInfo( IOMemoryDescriptor * buffer,
-                                   UInt8                type,
-                                   UInt16 *             actualByteCount );
-
-    /*!
-     * @function readTrackInfo
-     * @discussion
-     * Issue an MMC READ TRACK INFORMATION command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param address
-     * As documented by MMC.
-     * @param addressType
-     * As documented by MMC.
-     * @param open
-     * Reserved for future use.  Set to zero.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readTrackInfo( IOMemoryDescriptor * buffer,
-                                    UInt32               address,
-                                    UInt8                addressType,
-                                    UInt8                open,
-                                    UInt16 *             actualByteCount );
-
-    /*!
-     * @function splitTrack
-     * @discussion
-     * Issue an MMC RESERVE TRACK command with the ARSV bit.
-     * @param address
-     * As documented by MMC.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn splitTrack(UInt32 address);
-
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  0);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  1);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  2);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  3);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  4);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  5);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  6);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  7);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  8);
-    OSMetaClassDeclareReservedUnused(IOBDMedia,  9);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 10);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 11);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 12);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 13);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 14);
-    OSMetaClassDeclareReservedUnused(IOBDMedia, 15);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOBDMEDIA_H */
diff --git a/i386/include/IOKit/storage/IOBDMediaBSDClient.h b/i386/include/IOKit/storage/IOBDMediaBSDClient.h
deleted file mode 100644
index ee356f5..0000000
--- a/i386/include/IOKit/storage/IOBDMediaBSDClient.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOBDMEDIABSDCLIENT_H
-#define _IOBDMEDIABSDCLIENT_H
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
-
-#include <IOKit/storage/IOBDTypes.h>
-
-/*
- * Definitions
- *
- * ioctl                        description
- * ---------------------------- ------------------------------------------------
- * DKIOCBDREADSTRUCTURE         see IOBDMedia::readStructure()    in IOBDMedia.h
- *
- * DKIOCBDREADDISCINFO          see IOBDMedia::readDiscInfo()     in IOBDMedia.h
- * DKIOCBDREADTRACKINFO         see IOBDMedia::readTrackInfo()    in IOBDMedia.h
- *
- * DKIOCBDREPORTKEY             see IOBDMedia::reportKey()        in IOBDMedia.h
- * DKIOCBDSENDKEY               see IOBDMedia::sendKey()          in IOBDMedia.h
- *
- * DKIOCBDGETSPEED              see IOBDMedia::getSpeed()         in IOBDMedia.h
- * DKIOCBDSETSPEED              see IOBDMedia::setSpeed()         in IOBDMedia.h
- *
- *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
- */
-
-typedef struct
-{
-    uint8_t  format;
-
-    uint8_t  reserved0008[3];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  grantID;
-    uint8_t  layer;
-
-    uint8_t  reserved0080[4];                      /* reserved, clear to zero */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_bd_read_structure_t;
-
-typedef struct
-{
-    uint8_t  format;
-    uint8_t  keyClass;
-
-    uint8_t  reserved0016[2];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  grantID;
-
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_bd_report_key_t;
-
-typedef struct
-{
-    uint8_t  format;
-    uint8_t  keyClass;
-
-    uint8_t  reserved0016[6];                      /* reserved, clear to zero */
-
-    uint8_t  grantID;
-
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_bd_send_key_t;
-
-typedef struct
-{
-    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_bd_read_disc_info_t;
-
-typedef struct
-{
-    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  addressType;
-
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_bd_read_track_info_t;
-
-#define DKIOCBDREADSTRUCTURE _IOW('d', 160, dk_bd_read_structure_t)
-#define DKIOCBDREPORTKEY     _IOW('d', 161, dk_bd_report_key_t)
-#define DKIOCBDSENDKEY       _IOW('d', 162, dk_bd_send_key_t)
-
-#define DKIOCBDGETSPEED      _IOR('d', 163, uint16_t)
-#define DKIOCBDSETSPEED      _IOW('d', 163, uint16_t)
-
-#define DKIOCBDREADDISCINFO  _IOWR('d', 164, dk_bd_read_disc_info_t)
-#define DKIOCBDREADTRACKINFO _IOWR('d', 165, dk_bd_read_track_info_t)
-
-#define DKIOCBDSPLITTRACK    _IOW('d', 166, uint32_t)
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOBDMedia.h>
-#include <IOKit/storage/IOMediaBSDClient.h>
-
-/*
- * Class
- */
-
-class IOBDMediaBSDClient : public IOMediaBSDClient
-{
-    OSDeclareDefaultStructors(IOBDMediaBSDClient)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method
-     * to return a more specific subclass of IOService -- IOBDMedia.  This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOBDMedia * getProvider() const;
-
-    /*
-     * Process a BD-specific ioctl.
-     */
-
-    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
-
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 0);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 1);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 2);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 3);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 4);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 5);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 6);
-    OSMetaClassDeclareReservedUnused(IOBDMediaBSDClient, 7);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOBDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/IOBDTypes.h b/i386/include/IOKit/storage/IOBDTypes.h
deleted file mode 100644
index f5b7927..0000000
--- a/i386/include/IOKit/storage/IOBDTypes.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef	_BDTYPES_H
-#define	_BDTYPES_H
-
-#include <IOKit/IOTypes.h>
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/*
- * Media Types
- */
-
-enum
-{
-    kBDMediaTypeUnknown   = 0x0300,
-    kBDMediaTypeROM       = 0x0302, /* BD-ROM */
-    kBDMediaTypeRE        = 0x0303, /* BD-RE  */
-    kBDMediaTypeR         = 0x0304, /* BD-R   */
-
-    kBDMediaTypeMin       = 0x0300,
-    kBDMediaTypeMax       = 0x03FF
-};
-
-typedef UInt32 BDMediaType;
-
-/*
- * Media Speed (kB/s)
- */
-
-#define kBDSpeedMin 0x1126
-#define kBDSpeedMax 0xFFFF
-
-/*
- * MMC Formats
- */
-
-// Read Disc Information Format
-struct BDDiscInfo
-{
-    UInt16 dataLength;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  discStatus:2;
-    UInt8  stateOfLastSession:2;
-    UInt8  erasable:1;
-    UInt8  dataType:3;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  dataType:3;
-    UInt8  erasable:1;
-    UInt8  stateOfLastSession:2;
-    UInt8  discStatus:2;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved2;
-    UInt8  numberOfSessionsLSB;
-    UInt8  firstTrackNumberInLastSessionLSB;
-    UInt8  lastTrackNumberInLastSessionLSB;
-    UInt8  reserved4[2];
-    UInt8  numberOfSessionsMSB;
-    UInt8  firstTrackNumberInLastSessionMSB;
-    UInt8  lastTrackNumberInLastSessionMSB;
-    UInt8  reserved6[22];
-};
-typedef struct BDDiscInfo BDDiscInfo;
-
-// Read Track Information Format
-struct BDTrackInfo
-{
-    UInt16 dataLength;
-    UInt8  trackNumberLSB;
-    UInt8  sessionNumberLSB;
-    UInt8  reserved;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  reserved2:5;
-    UInt8  damage:1;
-    UInt8  reserved3:2;
-
-    UInt8  reserved4:6;
-    UInt8  blank:1;
-    UInt8  reservedTrack:1;
-
-    UInt8  nextWritableAddressValid:1;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  reserved5:6;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved3:2;
-    UInt8  damage:1;
-    UInt8  reserved2:5;
-
-    UInt8  reservedTrack:1;
-    UInt8  blank:1;
-    UInt8  reserved4:6;
-
-    UInt8  reserved5:6;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  nextWritableAddressValid:1;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt32 trackStartAddress;
-    UInt32 nextWritableAddress;
-    UInt32 freeBlocks;
-    UInt32 clusterSize;
-    UInt32 trackSize;
-    UInt32 lastRecordedAddress;
-    UInt8  trackNumberMSB;
-    UInt8  sessionNumberMSB;
-    UInt8  reserved6;
-    UInt8  reserved7;
-};
-typedef struct BDTrackInfo BDTrackInfo;
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* _BDTYPES_H */
diff --git a/i386/include/IOKit/storage/IOBlockStorageDevice.h b/i386/include/IOKit/storage/IOBlockStorageDevice.h
deleted file mode 100644
index bbec146..0000000
--- a/i386/include/IOKit/storage/IOBlockStorageDevice.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOBlockStorageDevice
- * @abstract
- * This header contains the IOBlockStorageDevice class definition.
- */
-
-#ifndef _IOBLOCKSTORAGEDEVICE_H
-#define _IOBLOCKSTORAGEDEVICE_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/storage/IOStorageDeviceCharacteristics.h>
-
-/*!
- * @defined kIOBlockStorageDeviceClass
- * @abstract
- * The name of the IOBlockStorageDevice class.
- */
-
-#define kIOBlockStorageDeviceClass "IOBlockStorageDevice"
-
-/*!
- * @defined kIOBlockStorageDeviceWriteCacheStateKey
- * @abstract
- * The name of the property used to get or set the write cache state of the
- * block storage device.
- */
-#define kIOBlockStorageDeviceWriteCacheStateKey	"WriteCacheState"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/IOService.h>
-#include <IOKit/storage/IOMedia.h>
-
-/* Property used for matching, so the generic driver gets the nub it wants. */
-/*!
- * @defined kIOBlockStorageDeviceTypeKey
- * @abstract The name of the property tested for nub type matching by the generic block
- * storage driver.
- */
-#define	kIOBlockStorageDeviceTypeKey	"device-type"
-/*!
- * @defined kIOBlockStorageDeviceTypeGeneric
- * @abstract A character string used for nub matching.
- */
-#define	kIOBlockStorageDeviceTypeGeneric	"Generic"
-
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/IOBlockStorageDriver.h b/i386/include/IOKit/storage/IOBlockStorageDriver.h
deleted file mode 100644
index 24ac3c2..0000000
--- a/i386/include/IOKit/storage/IOBlockStorageDriver.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOBlockStorageDriver
- * @abstract
- * This header contains the IOBlockStorageDriver class definition.
- */
-
-#ifndef _IOBLOCKSTORAGEDRIVER_H
-#define _IOBLOCKSTORAGEDRIVER_H
-
-#include <IOKit/IOTypes.h>
-
-/*!
- * @defined kIOBlockStorageDriverClass
- * @abstract
- * The name of the IOBlockStorageDriver class.
- */
-
-#define kIOBlockStorageDriverClass "IOBlockStorageDriver"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsKey
- * @abstract
- * Holds a table of numeric values describing the driver's
- * operating statistics.
- * @discussion
- * This property holds a table of numeric values describing the driver's
- * operating statistics.  The table is an OSDictionary, where each entry
- * describes one given statistic.
- */
-
-#define kIOBlockStorageDriverStatisticsKey "Statistics"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsBytesReadKey
- * @abstract
- * Describes the number of bytes read since the block storage
- * driver was instantiated.
- * @discussion
- * This property describes the number of bytes read since the block storage
- * driver was instantiated.  It is one of the statistic entries listed under
- * the top-level kIOBlockStorageDriverStatisticsKey property table.  It has
- * an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsBytesReadKey "Bytes (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsBytesWrittenKey
- * @abstract
- * Describes the number of bytes written since the block storage
- * driver was instantiated. 
- * @discussion
- * This property describes the number of bytes written since the block storage
- * driver was instantiated.  It is one of the statistic entries listed under the
- * top-level kIOBlockStorageDriverStatisticsKey property table.  It has an
- * OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsBytesWrittenKey "Bytes (Write)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsReadErrorsKey
- * @abstract
- * Describes the number of read errors encountered since the block
- * storage driver was instantiated. 
- * @discussion
- * This property describes the number of read errors encountered since the block
- * storage driver was instantiated.  It is one of the statistic entries listed
- * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
- * has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsReadErrorsKey "Errors (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsWriteErrorsKey
- * @abstract
- * Describes the number of write errors encountered since the
- * block storage driver was instantiated.
- * @discussion
- * This property describes the number of write errors encountered since the
- * block storage driver was instantiated.  It is one of the statistic entries
- * listed under the top-level kIOBlockStorageDriverStatisticsKey property table. 
- * It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsWriteErrorsKey "Errors (Write)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsLatentReadTimeKey
- * @abstract
- * Describes the number of nanoseconds of latency during reads
- * since the block storage driver was instantiated. 
- * @discussion
- * This property describes the number of nanoseconds of latency during reads
- * since the block storage driver was instantiated.  It is one of the statistic
- * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
- * property table.  It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsLatentReadTimeKey "Latency Time (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsLatentWriteTimeKey
- * @abstract
- * Describes the number of nanoseconds of latency during writes
- * since the block storage driver was instantiated. 
- * @discussion
- * This property describes the number of nanoseconds of latency during writes
- * since the block storage driver was instantiated.  It is one of the statistic
- * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
- * property table.  It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsLatentWriteTimeKey "Latency Time (Write)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsReadsKey
- * @abstract
- * Describes the number of read operations processed since the
- * block storage driver was instantiated.
- * @discussion
- * This property describes the number of read operations processed since the
- * block storage driver was instantiated.  It is one of the statistic entries
- * listed under the top-level kIOBlockStorageDriverStatisticsKey property table.
- * It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsReadsKey "Operations (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsWritesKey
- * @abstract
- * Describes the number of write operations processed since the
- * block storage driver was instantiated.
- * @discussion
- * This property describes the number of write operations processed since the
- * block storage driver was instantiated.  It is one of the statistic entries
- * listed under the top-level kIOBlockStorageDriverStatisticsKey property table.
- * It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsWritesKey "Operations (Write)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsReadRetriesKey
- * @abstract
- * Describes the number of read retries required since the block
- * storage driver was instantiated.
- * @discussion
- * This property describes the number of read retries required since the block
- * storage driver was instantiated.  It is one of the statistic entries listed
- * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
- * has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsReadRetriesKey "Retries (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsWriteRetriesKey
- * @abstract
- * Describes the number of write retries required since the block
- * storage driver was instantiated.
- * @discussion
- * This property describes the number of write retries required since the block
- * storage driver was instantiated.  It is one of the statistic entries listed
- * under the top-level kIOBlockStorageDriverStatisticsKey property table.  It
- * has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsWriteRetriesKey "Retries (Write)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsTotalReadTimeKey
- * @abstract
- * Describes the number of nanoseconds spent performing reads
- * since the block storage driver was instantiated.
- * @discussion
- * This property describes the number of nanoseconds spent performing reads
- * since the block storage driver was instantiated.  It is one of the statistic
- * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
- * property table.  It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsTotalReadTimeKey "Total Time (Read)"
-
-/*!
- * @defined kIOBlockStorageDriverStatisticsTotalWriteTimeKey
- * @abstract
- * Describes the number of nanoseconds spent performing writes
- * since the block storage driver was instantiated.
- * @discussion
- * This property describes the number of nanoseconds spent performing writes
- * since the block storage driver was instantiated.  It is one of the statistic
- * entries listed under the top-level kIOBlockStorageDriverStatisticsKey
- * property table.  It has an OSNumber value.
- */
-
-#define kIOBlockStorageDriverStatisticsTotalWriteTimeKey "Total Time (Write)"
-
-/*!
- * @enum IOMediaState
- * @abstract
- * The different states that getMediaState() can report.
- * @constant kIOMediaStateOffline
- * Media is not available.
- * @constant kIOMediaStateOnline
- * Media is available and ready for operations.
- * @constant kIOMediaStateBusy
- * Media is available, but not ready for operations.
- */
-
-enum
-{
-    kIOMediaStateOffline = 0,
-    kIOMediaStateOnline  = 1,
-    kIOMediaStateBusy    = 2
-};
-
-typedef UInt32 IOMediaState;
-
-#endif /* !_IOBLOCKSTORAGEDRIVER_H */
diff --git a/i386/include/IOKit/storage/IOCDBlockStorageDevice.h b/i386/include/IOKit/storage/IOCDBlockStorageDevice.h
deleted file mode 100644
index 706da40..0000000
--- a/i386/include/IOKit/storage/IOCDBlockStorageDevice.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOCDBlockStorageDevice
- * @abstract
- * This header contains the IOCDBlockStorageDevice class definition.
- */
-
-#ifndef _IOCDBLOCKSTORAGEDEVICE_H
-#define _IOCDBLOCKSTORAGEDEVICE_H
-
-#include <IOKit/storage/IOCDTypes.h>
-
-/*!
- * @defined kIOCDBlockStorageDeviceClass
- * @abstract
- * kIOCDBlockStorageDeviceClass is the name of the IOCDBlockStorageDevice class.
- * @discussion
- * kIOCDBlockStorageDeviceClass is the name of the IOCDBlockStorageDevice class.
- */
-
-#define kIOCDBlockStorageDeviceClass "IOCDBlockStorageDevice"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOBlockStorageDevice.h>
-
-/* Property used for matching, so the generic driver gets the nub it wants. */
-#define	kIOBlockStorageDeviceTypeCDROM	"CDROM"
-
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOCDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/IOCDBlockStorageDriver.h b/i386/include/IOKit/storage/IOCDBlockStorageDriver.h
deleted file mode 100644
index f88a406..0000000
--- a/i386/include/IOKit/storage/IOCDBlockStorageDriver.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * IOCDBlockStorageDriver.h
- *
- * This class implements  CD functionality, independent of
- * the physical connection protocol (e.g. SCSI, ATA, USB).
- *
- * A protocol-specific provider implements the functionality using an appropriate
- * protocol and commands.
- */
-
-#ifndef	_IOCDBLOCKSTORAGEDRIVER_H
-#define	_IOCDBLOCKSTORAGEDRIVER_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/storage/IOCDBlockStorageDevice.h>
-#include <IOKit/storage/IOCDTypes.h>
-#include <IOKit/storage/IOBlockStorageDriver.h>
-
-/*!
- * @defined kIOCDBlockStorageDriverClass
- * @abstract
- * kIOCDBlockStorageDriverClass is the name of the IOCDBlockStorageDriver class.
- * @discussion
- * kIOCDBlockStorageDriverClass is the name of the IOCDBlockStorageDriver class.
- */
-
-#define kIOCDBlockStorageDriverClass "IOCDBlockStorageDriver"
-
-#endif
diff --git a/i386/include/IOKit/storage/IOCDMedia.h b/i386/include/IOKit/storage/IOCDMedia.h
deleted file mode 100644
index 85ad72d..0000000
--- a/i386/include/IOKit/storage/IOCDMedia.h
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOCDMedia
- * @abstract
- * This header contains the IOCDMedia class definition.
- */
-
-#ifndef _IOCDMEDIA_H
-#define _IOCDMEDIA_H
-
-/*!
- * @defined kIOCDMediaClass
- * @abstract
- * kIOCDMediaClass is the name of the IOCDMedia class.
- * @discussion
- * kIOCDMediaClass is the name of the IOCDMedia class.
- */
-
-#define kIOCDMediaClass "IOCDMedia"
-
-/*!
- * @defined kIOCDMediaTOCKey
- * @abstract
- * kIOCDMediaTOCKey is a property of IOCDMedia objects.  It has an OSData value
- * and a CDTOC structure.
- * @discussion
- * The kIOCDMediaTOCKey property contains the CD's full table of contents,
- * formatted as a CDTOC structure.  The CDTOC structure is same as what is
- * returned by a READ TOC command, format 0x02.  All fields in the TOC are
- * guaranteed to be binary-encoded (no BCD-encoded numbers are ever passed).
- */
-
-#define kIOCDMediaTOCKey "TOC"
-
-/*!
- * @defined kIOCDMediaTypeKey
- * @abstract
- * kIOCDMediaTypeKey is a property of IOCDMedia objects.  It has an OSString
- * value.
- * @discussion
- * The kIOCDMediaTypeKey property identifies the CD media type (CD-ROM, CD-R,
- * CD-RW, etc).  See the kIOCDMediaType contants for possible values.
- */
-
-#define kIOCDMediaTypeKey "Type"
-
-/*!
- * @defined kIOCDMediaTypeROM
- * The kIOCDMediaTypeKey constant for CD-ROM media (inclusive of the CD-I,
- * CD-ROM XA, and CD Audio standards, and mixed mode combinations thereof).
- */
-
-#define kIOCDMediaTypeROM "CD-ROM"
-
-/*!
- * @defined kIOCDMediaTypeR
- * The kIOCDMediaTypeKey constant for CD Recordable (CD-R) media.
- */
-
-#define kIOCDMediaTypeR "CD-R"
-
-/*!
- * @defined kIOCDMediaTypeRW
- * The kIOCDMediaTypeKey constant for CD ReWritable (CD-RW) media.
- */
-
-#define kIOCDMediaTypeRW "CD-RW"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOCDBlockStorageDriver.h>
-#include <IOKit/storage/IOMedia.h>
-
-/*!
- * @class IOCDMedia
- * @abstract
- * The IOCDMedia class is a random-access disk device abstraction for CDs.
- * @discussion
- * The IOCDMedia class is a random-access disk device abstraction for CDs. It
- * extends the IOMedia class by implementing special CD APIs, such as readCD,
- * and publishing the TOC as a property of the IOCDMedia object.
- */
-
-class IOCDMedia : public IOMedia
-{
-    OSDeclareDefaultStructors(IOCDMedia)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    using IOStorage::read;
-    using IOStorage::write;
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method to
-     * return a more specific subclass of IOService -- IOCDBlockStorageDriver.  
-     * This method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOCDBlockStorageDriver * getProvider() const;
-
-    /*
-     * Compare the properties in the supplied table to this object's properties.
-     */
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
-
-    /*!
-     * @function read
-     * @discussion
-     * Read data from the storage object at the specified byte offset into the
-     * specified buffer, asynchronously.   When the read completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the read.
-     * @param client
-     * Client requesting the read.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void read(IOService *           client,
-                      UInt64                byteStart,
-                      IOMemoryDescriptor *  buffer,
-                      IOStorageAttributes * attributes,
-                      IOStorageCompletion * completion);
-
-    /*
-     * @function write
-     * @discussion
-     * Write data into the storage object at the specified byte offset from the
-     * specified buffer, asynchronously.   When the write completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the write.
-     * @param client
-     * Client requesting the write.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void write(IOService *           client,
-                       UInt64                byteStart,
-                       IOMemoryDescriptor *  buffer,
-                       IOStorageAttributes * attributes,
-                       IOStorageCompletion * completion);
-
-    /*!
-     * @function readCD
-     * @discussion
-     * Read data from the CD media object at the specified byte offset into the
-     * specified buffer, asynchronously.  Special areas of the CD sector can be
-     * read via this method, such as the header and subchannel data.   When the
-     * read completes, the caller will be notified via the specified completion
-     * action.
-     *
-     * The buffer will be retained for the duration of the read.
-     * @param client
-     * Client requesting the read.
-     * @param byteStart
-     * Starting byte offset for the data transfer (see sectorArea parameter).
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param sectorArea
-     * Sector area(s) to read.  The sum of each area's size defines the natural
-     * block size of the media for the call.  This should be taken into account
-     * when computing the address of byteStart.  See IOCDTypes.h.
-     * @param sectorType
-     * Sector type that is expected.  The data transfer is terminated as soon as
-     * data is encountered that does not match the expected type.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-#ifdef __LP64__
-    virtual void readCD(IOService *           client,
-                        UInt64                byteStart,
-                        IOMemoryDescriptor *  buffer,
-                        CDSectorArea          sectorArea,
-                        CDSectorType          sectorType,
-                        IOStorageAttributes * attributes,
-                        IOStorageCompletion * completion);
-#else /* !__LP64__ */
-    virtual void readCD(IOService *           client,
-                        UInt64                byteStart,
-                        IOMemoryDescriptor *  buffer,
-                        CDSectorArea          sectorArea,
-                        CDSectorType          sectorType,
-                        IOStorageCompletion   completion);
-#endif /* !__LP64__ */
-
-    /*!
-     * @function readCD
-     * @discussion
-     * Read data from the CD media object at the specified byte offset into the
-     * specified buffer, synchronously.   Special areas of the CD sector can be
-     * read via this method, such as the header and subchannel data.   When the
-     * read completes, this method will return to the caller.   The actual byte
-     * count field is optional.
-     * @param client
-     * Client requesting the read.
-     * @param byteStart
-     * Starting byte offset for the data transfer (see sectorArea parameter).
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param sectorArea
-     * Sector area(s) to read.  The sum of each area's size defines the natural
-     * block size of the media for the call.  This should be taken into account
-     * when computing the address of byteStart.  See IOCDTypes.h.
-     * @param sectorType
-     * Sector type that is expected.  The data transfer is terminated as soon as
-     * data is encountered that does not match the expected type.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-#ifdef __LP64__
-    virtual IOReturn readCD(IOService *           client,
-                            UInt64                byteStart,
-                            IOMemoryDescriptor *  buffer,
-                            CDSectorArea          sectorArea,
-                            CDSectorType          sectorType,
-                            IOStorageAttributes * attributes      = 0,
-                            UInt64 *              actualByteCount = 0);
-#else /* !__LP64__ */
-    virtual IOReturn readCD(IOService *           client,
-                            UInt64                byteStart,
-                            IOMemoryDescriptor *  buffer,
-                            CDSectorArea          sectorArea,
-                            CDSectorType          sectorType,
-                            UInt64 *              actualByteCount = 0);
-#endif /* !__LP64__ */
-
-    /*!
-     * @function readISRC
-     * @discussion
-     * Read the International Standard Recording Code for the specified track.
-     * @param track
-     * Track number from which to read the ISRC.
-     * @param isrc
-     * Buffer for the ISRC data.  Buffer contents will be zero-terminated.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn readISRC(UInt8 track, CDISRC isrc);
-    
-    /*!
-     * @function readMCN
-     * @discussion
-     * Read the Media Catalog Number (also known as the Universal Product Code).
-     * @param mcn
-     * Buffer for the MCN data.  Buffer contents will be zero-terminated.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn readMCN(CDMCN mcn);
-
-    /*!
-     * @function getTOC
-     * @discussion
-     * Get the full Table Of Contents.
-     *
-     * All CDTOC fields passed across I/O Kit APIs are guaranteed to be
-     * binary-encoded (no BCD-encoded numbers are ever passed).
-     * @result
-     * Returns a pointer to the TOC buffer (do not deallocate).
-     */
-     
-    virtual CDTOC * getTOC();
-
-    /*!
-     * @function getSpeed
-     * @discussion
-     * Get the current speed used for data transfers.
-     * @param kilobytesPerSecond
-     * Returns the current speed used for data transfers, in kB/s.
-     *
-     * kCDSpeedMin specifies the minimum speed for all CD media (1X).
-     * kCDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond); /* 10.1.0 */
-
-    /*!
-     * @function setSpeed
-     * @discussion
-     * Set the speed to be used for data transfers.
-     * @param kilobytesPerSecond
-     * Speed to be used for data transfers, in kB/s.
-     *
-     * kCDSpeedMin specifies the minimum speed for all CD media (1X).
-     * kCDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond); /* 10.1.0 */
-
-    /*!
-     * @function readTOC
-     * @discussion
-     * Issue an MMC READ TOC/PMA/ATIP command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param format
-     * As documented by MMC.
-     * @param formatAsTime
-     * As documented by MMC.
-     * @param trackOrSessionNumber
-     * As documented by MMC.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readTOC(IOMemoryDescriptor * buffer,
-                             CDTOCFormat          format,
-                             UInt8                formatAsTime,
-                             UInt8                trackOrSessionNumber,
-                             UInt16 *             actualByteCount); /* 10.1.3 */
-
-    /*!
-     * @function readDiscInfo
-     * @discussion
-     * Issue an MMC READ DISC INFORMATION command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readDiscInfo(IOMemoryDescriptor * buffer,
-                                  UInt16 *             actualByteCount); /* 10.1.3 */
-
-    /*!
-     * @function readTrackInfo
-     * @discussion
-     * Issue an MMC READ TRACK INFORMATION command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param address
-     * As documented by MMC.
-     * @param addressType
-     * As documented by MMC.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readTrackInfo(IOMemoryDescriptor *   buffer,
-                                   UInt32                 address,
-                                   CDTrackInfoAddressType addressType,
-                                   UInt16 *               actualByteCount); /* 10.1.3 */
-
-    /*
-     * @function writeCD
-     * @discussion
-     * Write data into the CD media object at the specified byte offset from the
-     * specified buffer, asynchronously.    When the write completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the write.
-     * @param client
-     * Client requesting the write.
-     * @param byteStart
-     * Starting byte offset for the data transfer (see sectorArea parameter).
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param sectorArea
-     * Sector area(s) to write.  The sum of each area's size defines the natural
-     * block size of the media for the call.   This should be taken into account
-     * when computing the address of byteStart.  See IOCDTypes.h.
-     * @param sectorType
-     * Sector type that is expected.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-#ifdef __LP64__
-    virtual void writeCD(IOService *           client,
-                         UInt64                byteStart,
-                         IOMemoryDescriptor *  buffer,
-                         CDSectorArea          sectorArea,
-                         CDSectorType          sectorType,
-                         IOStorageAttributes * attributes,
-                         IOStorageCompletion * completion);
-#else /* !__LP64__ */
-    virtual void writeCD(IOService *           client,
-                         UInt64                byteStart,
-                         IOMemoryDescriptor *  buffer,
-                         CDSectorArea          sectorArea,
-                         CDSectorType          sectorType,
-                         IOStorageCompletion   completion); /* 10.2.0 */
-#endif /* !__LP64__ */
-
-    /*
-     * @function writeCD
-     * @discussion
-     * Write data into the CD media object at the specified byte offset from the
-     * specified buffer, synchronously.    When the write completes, this method
-     * will return to the caller.  The actual byte count field is optional.
-     * @param client
-     * Client requesting the write.
-     * @param byteStart
-     * Starting byte offset for the data transfer (see sectorArea parameter).
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param sectorArea
-     * Sector area(s) to write.  The sum of each area's size defines the natural
-     * block size of the media for the call.   This should be taken into account
-     * when computing the address of byteStart.  See IOCDTypes.h.
-     * @param sectorType
-     * Sector type that is expected.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-#ifdef __LP64__
-    virtual IOReturn writeCD(IOService *           client,
-                             UInt64                byteStart,
-                             IOMemoryDescriptor *  buffer,
-                             CDSectorArea          sectorArea,
-                             CDSectorType          sectorType,
-                             IOStorageAttributes * attributes      = 0,
-                             UInt64 *              actualByteCount = 0);
-#else /* !__LP64__ */
-    virtual IOReturn writeCD(IOService *           client,
-                             UInt64                byteStart,
-                             IOMemoryDescriptor *  buffer,
-                             CDSectorArea          sectorArea,
-                             CDSectorType          sectorType,
-                             UInt64 *              actualByteCount = 0); /* 10.2.0 */
-#endif /* !__LP64__ */
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  0);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  1);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  2);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  3);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  4);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  5);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  6);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  0);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  1);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  2);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  3);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  4);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  5);
-    OSMetaClassDeclareReservedUsed(IOCDMedia,  6);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  7);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  8);
-    OSMetaClassDeclareReservedUnused(IOCDMedia,  9);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 10);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 11);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 12);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 13);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 14);
-    OSMetaClassDeclareReservedUnused(IOCDMedia, 15);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOCDMEDIA_H */
diff --git a/i386/include/IOKit/storage/IOCDMediaBSDClient.h b/i386/include/IOKit/storage/IOCDMediaBSDClient.h
deleted file mode 100644
index ce31863..0000000
--- a/i386/include/IOKit/storage/IOCDMediaBSDClient.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOCDMEDIABSDCLIENT_H
-#define _IOCDMEDIABSDCLIENT_H
-
-#include <sys/ioctl.h>
-
-#include <IOKit/storage/IOCDTypes.h>
-
-/*
- * Definitions
- *
- * ioctl                        description
- * ---------------------------- ------------------------------------------------
- * DKIOCCDREAD                  see IOCDMedia::readCD()           in IOCDMedia.h
- * DKIOCCDREADTOC               see IOCDMedia::readTOC()          in IOCDMedia.h
- *
- * DKIOCCDREADDISCINFO          see IOCDMedia::readDiscInfo()     in IOCDMedia.h
- * DKIOCCDREADTRACKINFO         see IOCDMedia::readTrackInfo()    in IOCDMedia.h
- *
- * DKIOCCDREADISRC              see IOCDMedia::readISRC()         in IOCDMedia.h
- * DKIOCCDREADMCN               see IOCDMedia::readMCN()          in IOCDMedia.h
- *
- * DKIOCCDGETSPEED              see IOCDMedia::getSpeed()         in IOCDMedia.h
- * DKIOCCDSETSPEED              see IOCDMedia::setSpeed()         in IOCDMedia.h
- *
- *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
- */
-
-typedef struct
-{
-    uint64_t offset;
-
-    uint8_t  sectorArea;
-    uint8_t  sectorType;
-
-#ifdef __LP64__
-    uint8_t  reserved0080[10];                     /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0080[6];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint32_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_cd_read_t;
-
-typedef struct
-{
-    CDISRC   isrc;
-    uint8_t  track;
-
-    uint8_t  reserved0112[2];                      /* reserved, clear to zero */
-} dk_cd_read_isrc_t;
-
-typedef struct
-{
-    CDMCN    mcn;
-
-    uint8_t  reserved0112[2];                      /* reserved, clear to zero */
-} dk_cd_read_mcn_t;
-
-typedef struct
-{
-    uint8_t  format;
-    uint8_t  formatAsTime;
-
-    uint8_t  reserved0016[5];                      /* reserved, clear to zero */
-
-    union
-    {
-        uint8_t session;
-        uint8_t track;
-    } address;
-
-#ifdef __LP64__
-    uint8_t  reserved0064[6];                      /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0064[2];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_cd_read_toc_t;
-
-typedef struct
-{
-#ifdef __LP64__
-    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0000[10];                     /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_cd_read_disc_info_t;
-
-typedef struct
-{
-    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  addressType;
-
-#ifdef __LP64__
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_cd_read_track_info_t;
-
-#define DKIOCCDREAD          _IOWR('d', 96, dk_cd_read_t)
-
-#define DKIOCCDREADISRC      _IOWR('d', 97, dk_cd_read_isrc_t)
-#define DKIOCCDREADMCN       _IOWR('d', 98, dk_cd_read_mcn_t)
-
-#define DKIOCCDGETSPEED      _IOR('d', 99, uint16_t)
-#define DKIOCCDSETSPEED      _IOW('d', 99, uint16_t)
-
-#define DKIOCCDREADTOC       _IOWR('d', 100, dk_cd_read_toc_t)
-
-#define DKIOCCDREADDISCINFO  _IOWR('d', 101, dk_cd_read_disc_info_t)
-#define DKIOCCDREADTRACKINFO _IOWR('d', 102, dk_cd_read_track_info_t)
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOCDMedia.h>
-#include <IOKit/storage/IOMediaBSDClient.h>
-
-/*
- * Class
- */
-
-class IOCDMediaBSDClient : public IOMediaBSDClient
-{
-    OSDeclareDefaultStructors(IOCDMediaBSDClient)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method
-     * to return a more specific subclass of IOService -- IOCDMedia.  This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOCDMedia * getProvider() const;
-
-    /*
-     * Process a CD-specific ioctl.
-     */
-
-    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
-
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 0);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 1);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 2);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 3);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 4);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 5);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 6);
-    OSMetaClassDeclareReservedUnused(IOCDMediaBSDClient, 7);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOCDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/IOCDPartitionScheme.h b/i386/include/IOKit/storage/IOCDPartitionScheme.h
deleted file mode 100644
index 1ff58c4..0000000
--- a/i386/include/IOKit/storage/IOCDPartitionScheme.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOCDPartitionScheme
- * @abstract
- * This header contains the IOCDPartitionScheme class definition.
- */
-
-#ifndef _IOCDPARTITIONSCHEME_H
-#define _IOCDPARTITIONSCHEME_H
-
-#include <IOKit/storage/IOCDTypes.h>
-
-/*!
- * @defined kIOCDPartitionSchemeClass
- * @abstract
- * kIOCDPartitionSchemeClass is the name of the IOCDPartitionScheme class.
- * @discussion
- * kIOCDPartitionSchemeClass is the name of the IOCDPartitionScheme class.
- */
-
-#define kIOCDPartitionSchemeClass "IOCDPartitionScheme"
-
-/*!
- * @defined kIOMediaSessionIDKey
- * @abstract
- * kIOMediaSessionIDKey is property of IOMedia objects.  It has an OSNumber
- * value.
- * @discussion
- * The kIOMediaSessionIDKey property is placed into each IOMedia instance
- * created by the CD partition scheme.  It identifies the session number
- * the track was recorded on.
- */
-
-#define kIOMediaSessionIDKey "Session ID"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOCDMedia.h>
-#include <IOKit/storage/IOPartitionScheme.h>
-
-/*
- * Class
- */
-
-class IOCDPartitionScheme : public IOPartitionScheme
-{
-    OSDeclareDefaultStructors(IOCDPartitionScheme);
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    OSSet * _partitions;    /* (set of media objects representing partitions) */
-
-    /*
-     * Free all of this object's outstanding resources.
-     */
-
-    virtual void free(void);
-
-    /*
-     * Scan the provider media for CD partitions (in TOC).  Returns the set
-     * of media objects representing each of the partitions (the retain for
-     * the set is passed to the caller), or null should no CD partitions be
-     * found.  The default probe score can be adjusted up or down, based on
-     * the confidence of the scan.
-     */
-
-    virtual OSSet * scan(SInt32 * score);
-
-    /*
-     * Ask whether the given partition appears to be corrupt.  A partition that
-     * is corrupt will cause the failure of the CD partition scheme altogether.
-     */
-
-    virtual bool isPartitionCorrupt( CDTOCDescriptor * partition,
-                                     UInt64            partitionSize,
-                                     UInt32            partitionBlockSize,
-                                     CDSectorType      partitionBlockType,
-                                     CDTOC *           toc );
-
-    /*
-     * Ask whether the given partition appears to be invalid.  A partition that
-     * is invalid will cause it to be skipped in the scan, but will not cause a
-     * failure of the CD partition scheme.
-     */
-
-    virtual bool isPartitionInvalid( CDTOCDescriptor * partition,
-                                     UInt64            partitionSize,
-                                     UInt32            partitionBlockSize,
-                                     CDSectorType      partitionBlockType,
-                                     CDTOC *           toc );
-
-    /*
-     * Instantiate a new media object to represent the given partition.
-     */
-
-    virtual IOMedia * instantiateMediaObject(
-                                           CDTOCDescriptor * partition,
-                                           UInt64            partitionSize,
-                                           UInt32            partitionBlockSize,
-                                           CDSectorType      partitionBlockType,
-                                           CDTOC *           toc );
-
-    /*
-     * Allocate a new media object (called from instantiateMediaObject).
-     */
-
-    virtual IOMedia * instantiateDesiredMediaObject(
-                                           CDTOCDescriptor * partition,
-                                           UInt64            partitionSize,
-                                           UInt32            partitionBlockSize,
-                                           CDSectorType      partitionBlockType,
-                                           CDTOC *           toc );
-
-public:
-
-    /*
-     * Initialize this object's minimal state.
-     */
-
-    virtual bool init(OSDictionary * properties = 0);
-
-    /*
-     * Scan the provider media for CD partitions.
-     */
-
-    virtual IOService * probe(IOService * provider, SInt32 * score);
-
-    /*
-     * Determine whether the provider media contains CD partitions.
-     */
-
-    virtual bool start(IOService * provider);
-
-    /*
-     * Read data from the storage object at the specified byte offset into the
-     * specified buffer, asynchronously.   When the read completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the read.
-     *
-     * For the CD partition scheme, we convert the read from a partition
-     * object into the appropriate readCD command to our provider media.
-     */
-
-    virtual void read(IOService *           client,
-                      UInt64                byteStart,
-                      IOMemoryDescriptor *  buffer,
-                      IOStorageAttributes * attributes,
-                      IOStorageCompletion * completion);
-
-    /*
-     * Write data into the storage object at the specified byte offset from the
-     * specified buffer, asynchronously.   When the write completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the write.
-     *
-     * For the CD partition scheme, we convert the write from a partition
-     * object into the appropriate writeCD command to our provider media.
-     */
-
-    virtual void write(IOService *           client,
-                       UInt64                byteStart,
-                       IOMemoryDescriptor *  buffer,
-                       IOStorageAttributes * attributes,
-                       IOStorageCompletion * completion);
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method
-     * to return a more specific subclass of OSObject -- IOCDMedia.   This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOCDMedia * getProvider() const;
-
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  0);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  1);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  2);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  3);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  4);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  5);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  6);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  7);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  8);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme,  9);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 10);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 11);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 12);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 13);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 14);
-    OSMetaClassDeclareReservedUnused(IOCDPartitionScheme, 15);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOCDPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOCDTypes.h b/i386/include/IOKit/storage/IOCDTypes.h
deleted file mode 100644
index 6b1af29..0000000
--- a/i386/include/IOKit/storage/IOCDTypes.h
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef	_IOCDTYPES_H
-#define	_IOCDTYPES_H
-
-#include <IOKit/IOTypes.h>
-#include <libkern/OSByteOrder.h>
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/*
- * Minutes, Seconds, Frames (M:S:F)
- *
- * All M:S:F values passed across I/O Kit APIs are guaranteed to be
- * binary-encoded numbers (no BCD-encoded numbers are ever passed).
- */
-
-typedef struct
-{
-    UInt8 minute;
-    UInt8 second;
-    UInt8 frame;
-} CDMSF;
-
-/*
- * Media Catalogue Numbers (MCN), International Standard Recording Codes (ISRC)
- *
- * All MCN and ISRC values passed across I/O Kit APIs are guaranteed
- * to have a zero-terminating byte, for convenient use as C strings.
- */
-
-#define kCDMCNMaxLength  13
-#define kCDISRCMaxLength 12
-
-typedef char CDMCN [kCDMCNMaxLength  + 1];
-typedef char CDISRC[kCDISRCMaxLength + 1];
-
-/*
- * Audio Status
- *
- * All CDAudioStatus fields passed across I/O Kit APIs are guaranteed to
- * be binary-encoded numbers (no BCD-encoded numbers are ever passed).
- */
-
-#define kCDAudioStatusUnsupported 0x00
-#define kCDAudioStatusActive      0x11
-#define kCDAudioStatusPaused      0x12
-#define kCDAudioStatusSuccess     0x13
-#define kCDAudioStatusFailure     0x14
-#define kCDAudioStatusNone        0x15
-
-typedef struct
-{
-    UInt8 status;
-    struct
-    {
-        CDMSF time;
-        struct
-        {
-            UInt8 index;
-            UInt8 number;
-            CDMSF time;
-        } track;
-    } position;
-} CDAudioStatus;
-
-/*
- * Table Of Contents
- *
- * All CDTOC fields passed across I/O Kit APIs are guaranteed to be
- * binary-encoded numbers (no BCD-encoded numbers are ever passed).
- */
-
-typedef struct
-{
-    UInt8 session;
-#ifdef __LITTLE_ENDIAN__
-    UInt8 control:4, adr:4;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8 adr:4, control:4;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8 tno;
-    UInt8 point;
-    CDMSF address;
-    UInt8 zero;
-    CDMSF p;
-} CDTOCDescriptor;
-
-typedef struct
-{
-    UInt16          length;
-    UInt8           sessionFirst;
-    UInt8           sessionLast;
-    CDTOCDescriptor descriptors[0];
-} CDTOC;
-
-/*
- * Table Of Contents Descriptor Count Convenience Function
- */
-
-static inline UInt32 CDTOCGetDescriptorCount(CDTOC * toc)
-{
-    UInt32 tocSize = OSSwapBigToHostInt16(toc->length) + (UInt32) sizeof(toc->length);
-
-    return (tocSize < (UInt32) sizeof(CDTOC)) ? 0 : 
-           (tocSize - (UInt32) sizeof(CDTOC)) / (UInt32) sizeof(CDTOCDescriptor);
-}
-
-/*
- * M:S:F To LBA Convenience Function
- */
-
-static inline UInt32 CDConvertMSFToLBA(CDMSF msf)
-{
-    return (((msf.minute * 60U) + msf.second) * 75U) + msf.frame - 150U;
-}
-
-/*
- * M:S:F To Clipped LBA Convenience Function
- */
-
-static inline UInt32 CDConvertMSFToClippedLBA(CDMSF msf)
-{
-    return (msf.minute == 0 && msf.second <= 1) ? 0 : CDConvertMSFToLBA(msf);
-}
-
-/*
- * LBA To M:S:F Convenience Function
- */
-
-static inline CDMSF CDConvertLBAToMSF(UInt32 lba)
-{
-    CDMSF msf;
-
-    lba += 150;
-    msf.minute = (lba / (75 * 60));
-    msf.second = (lba % (75 * 60)) / 75;
-    msf.frame  = (lba % (75     ));
-    
-    return msf;
-}
-
-/*
- * Track Number To M:S:F Convenience Function
- *
- * The CDTOC structure is assumed to be complete, that is, none of
- * the descriptors are missing or clipped due to an insufficiently
- * sized buffer holding the CDTOC contents.
- */
-
-static inline CDMSF CDConvertTrackNumberToMSF(UInt8 track, CDTOC * toc)
-{
-    UInt32 count = CDTOCGetDescriptorCount(toc);
-    UInt32 i;
-    CDMSF  msf   = { 0xFF, 0xFF, 0xFF };
-
-    for (i = 0; i < count; i++)
-    {
-        if (toc->descriptors[i].point == track && toc->descriptors[i].adr == 1)
-        {
-            msf = toc->descriptors[i].p;
-            break;
-        }
-    }
-
-    return msf;
-}
-
-/*
- * Sector Areas, Sector Types
- *
- * Bytes Per Type      CDDA       Mode1      Mode2   Mode2Form1 Mode2Form2
- *       Per Area  +----------+----------+----------+----------+----------+
- * Sync            | 0        | 12       | 12       | 12       | 12       |
- * Header          | 0        | 4        | 4        | 4        | 4        |
- * SubHeader       | 0        | 0        | 0        | 8        | 8        |
- * User            | 2352     | 2048     | 2336     | 2048     | 2328     |
- * Auxiliary       | 0        | 288      | 0        | 280      | 0        |
- * ErrorFlags      | 294      | 294      | 294      | 294      | 294      |
- * SubChannel      | 96       | 96       | 96       | 96       | 96       |
- * SubChannelQ     | 16       | 16       | 16       | 16       | 16       |
- *                 +----------+----------+----------+----------+----------+
- */
-
-typedef enum
-{
-    kCDSectorAreaSync        = 0x80,
-    kCDSectorAreaHeader      = 0x20,
-    kCDSectorAreaSubHeader   = 0x40,
-    kCDSectorAreaUser        = 0x10,
-    kCDSectorAreaAuxiliary   = 0x08,
-    kCDSectorAreaErrorFlags  = 0x02,
-    kCDSectorAreaSubChannel  = 0x01,
-    kCDSectorAreaSubChannelQ = 0x04
-} CDSectorArea;
-
-typedef enum
-{
-    kCDSectorTypeUnknown     = 0x00,
-    kCDSectorTypeCDDA        = 0x01,
-    kCDSectorTypeMode1       = 0x02,
-    kCDSectorTypeMode2       = 0x03,
-    kCDSectorTypeMode2Form1  = 0x04,
-    kCDSectorTypeMode2Form2  = 0x05,
-    kCDSectorTypeCount       = 0x06
-} CDSectorType;
-
-typedef enum
-{
-    kCDSectorSizeCDDA        = 2352,
-    kCDSectorSizeMode1       = 2048,
-    kCDSectorSizeMode2       = 2336,
-    kCDSectorSizeMode2Form1  = 2048,
-    kCDSectorSizeMode2Form2  = 2328,
-    kCDSectorSizeWhole       = 2352
-} CDSectorSize;
-
-/*
- * Media Types
- */
-
-typedef enum
-{
-    kCDMediaTypeUnknown      = 0x0100,
-    kCDMediaTypeROM          = 0x0102, /* CD-ROM */
-    kCDMediaTypeR            = 0x0104, /* CD-R   */
-    kCDMediaTypeRW           = 0x0105, /* CD-RW  */
-
-    kCDMediaTypeMin          = 0x0100,
-    kCDMediaTypeMax          = 0x01FF
-};
-
-typedef UInt32 CDMediaType;
-
-/*
- * Media Speed (kB/s)
- */
-
-#define kCDSpeedMin 0x00B0
-#define kCDSpeedMax 0xFFFF
-
-/*
- * MMC Formats
- */
-
-// Read Table Of Contents Format Types
-typedef UInt8 CDTOCFormat;
-enum
-{
-    kCDTOCFormatTOC  = 0x02, // CDTOC
-    kCDTOCFormatPMA  = 0x03, // CDPMA
-    kCDTOCFormatATIP = 0x04, // CDATIP
-    kCDTOCFormatTEXT = 0x05  // CDTEXT
-};
-
-// Read Table Of Contents Format 0x03
-struct CDPMADescriptor
-{
-    UInt8 reserved;
-#ifdef __LITTLE_ENDIAN__
-    UInt8 control:4, adr:4;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8 adr:4, control:4;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8 tno;
-    UInt8 point;
-    CDMSF address;
-    UInt8 zero;
-    CDMSF p;
-};
-typedef struct CDPMADescriptor CDPMADescriptor;
-
-struct CDPMA
-{
-    UInt16          dataLength;
-    UInt8           reserved;
-    UInt8           reserved2;
-    CDPMADescriptor descriptors[0];
-};
-typedef struct CDPMA CDPMA;
-
-// Read Table Of Contents Format 0x04
-struct CDATIP
-{
-    UInt16 dataLength;
-    UInt8  reserved[2];
-#ifdef __LITTLE_ENDIAN__
-    UInt8  referenceSpeed:3;
-    UInt8  reserved3:1;
-    UInt8  indicativeTargetWritingPower:3;
-    UInt8  reserved2:1;
-
-    UInt8  reserved5:6;
-    UInt8  unrestrictedUse:1;
-    UInt8  reserved4:1;
-
-    UInt8  a3Valid:1;
-    UInt8  a2Valid:1;
-    UInt8  a1Valid:1;
-    UInt8  discSubType:3;
-    UInt8  discType:1;
-    UInt8  reserved6:1;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved2:1;
-    UInt8  indicativeTargetWritingPower:3;
-    UInt8  reserved3:1;
-    UInt8  referenceSpeed:3;
-
-    UInt8  reserved4:1;
-    UInt8  unrestrictedUse:1;
-    UInt8  reserved5:6;
-
-    UInt8  reserved6:1;
-    UInt8  discType:1;
-    UInt8  discSubType:3;
-    UInt8  a1Valid:1;
-    UInt8  a2Valid:1;
-    UInt8  a3Valid:1;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved7;
-    CDMSF  startTimeOfLeadIn;
-    UInt8  reserved8;
-    CDMSF  lastPossibleStartTimeOfLeadOut;
-    UInt8  reserved9;
-    UInt8  a1[3];
-    UInt8  reserved10;
-    UInt8  a2[3];
-    UInt8  reserved11;
-    UInt8  a3[3];
-    UInt8  reserved12;
-};
-typedef struct CDATIP CDATIP;
-
-// Read Table Of Contents Format 0x05
-struct CDTEXTDescriptor
-{
-    UInt8 packType;
-    UInt8 trackNumber;
-    UInt8 sequenceNumber;
-#ifdef __LITTLE_ENDIAN__
-    UInt8 characterPosition:4;
-    UInt8 blockNumber:3;
-    UInt8 doubleByteCharacterCode:1;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8 doubleByteCharacterCode:1;
-    UInt8 blockNumber:3;
-    UInt8 characterPosition:4;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8 textData[12];
-    UInt8 reserved[2];
-};
-typedef struct CDTEXTDescriptor CDTEXTDescriptor;
-
-struct CDTEXT
-{
-    UInt16           dataLength;
-    UInt8            reserved;
-    UInt8            reserved2;
-    CDTEXTDescriptor descriptors[0];
-};
-typedef struct CDTEXT CDTEXT;
-
-// Read Disc Information Format
-struct CDDiscInfo
-{
-    UInt16 dataLength;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  discStatus:2;
-    UInt8  stateOfLastSession:2;
-    UInt8  erasable:1;
-    UInt8  reserved:3;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved:3;
-    UInt8  erasable:1;
-    UInt8  stateOfLastSession:2;
-    UInt8  discStatus:2;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  numberOfFirstTrack;
-    UInt8  numberOfSessionsLSB;
-    UInt8  firstTrackNumberInLastSessionLSB;
-    UInt8  lastTrackNumberInLastSessionLSB;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  reserved3:5;
-    UInt8  unrestrictedUse:1;
-    UInt8  discBarCodeValid:1;
-    UInt8  discIdentificationValid:1;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  discIdentificationValid:1;
-    UInt8  discBarCodeValid:1;
-    UInt8  unrestrictedUse:1;
-    UInt8  reserved3:5;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  discType;
-    UInt8  numberOfSessionsMSB;
-    UInt8  firstTrackNumberInLastSessionMSB;
-    UInt8  lastTrackNumberInLastSessionMSB;
-    UInt32 discIdentification;
-    UInt8  reserved7;
-    CDMSF  lastSessionLeadInStartTime;
-    UInt8  reserved8;
-    CDMSF  lastPossibleStartTimeOfLeadOut;
-    UInt8  discBarCode[8];
-    UInt8  reserved9;
-    UInt8  numberOfOPCTableEntries;
-    UInt8  opcTableEntries[0];
-};
-typedef struct CDDiscInfo CDDiscInfo;
-
-// Read Track Information Address Types
-typedef UInt8 CDTrackInfoAddressType;
-enum
-{
-    kCDTrackInfoAddressTypeLBA           = 0x00,
-    kCDTrackInfoAddressTypeTrackNumber   = 0x01,
-    kCDTrackInfoAddressTypeSessionNumber = 0x02,
-};
-
-// Read Track Information Format
-struct CDTrackInfo
-{
-    UInt16 dataLength;
-    UInt8  trackNumberLSB;
-    UInt8  sessionNumberLSB;
-    UInt8  reserved;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  trackMode:4;
-    UInt8  copy:1;
-    UInt8  damage:1;
-    UInt8  reserved3:2;
-
-    UInt8  dataMode:4;
-    UInt8  fixedPacket:1;
-    UInt8  packet:1;
-    UInt8  blank:1;
-    UInt8  reservedTrack:1;
-
-    UInt8  nextWritableAddressValid:1;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  reserved5:6;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved3:2;
-    UInt8  damage:1;
-    UInt8  copy:1;
-    UInt8  trackMode:4;
-
-    UInt8  reservedTrack:1;
-    UInt8  blank:1;
-    UInt8  packet:1;
-    UInt8  fixedPacket:1;
-    UInt8  dataMode:4;
-
-    UInt8  reserved5:6;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  nextWritableAddressValid:1;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt32 trackStartAddress;
-    UInt32 nextWritableAddress;
-    UInt32 freeBlocks;
-    UInt32 fixedPacketSize;
-    UInt32 trackSize;
-    UInt32 lastRecordedAddress;
-    UInt8  trackNumberMSB;
-    UInt8  sessionNumberMSB;
-    UInt8  reserved6;
-    UInt8  reserved7;
-};
-typedef struct CDTrackInfo CDTrackInfo;
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* _IOCDTYPES_H */
diff --git a/i386/include/IOKit/storage/IODVDBlockStorageDevice.h b/i386/include/IOKit/storage/IODVDBlockStorageDevice.h
deleted file mode 100644
index 161651c..0000000
--- a/i386/include/IOKit/storage/IODVDBlockStorageDevice.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IODVDBlockStorageDevice
- * @abstract
- * This header contains the IODVDBlockStorageDevice class definition.
- */
-
-#ifndef	_IODVDBLOCKSTORAGEDEVICE_H
-#define	_IODVDBLOCKSTORAGEDEVICE_H
-
-#include <IOKit/storage/IODVDTypes.h>
-
-/*!
- * @defined kIODVDBlockStorageDeviceClass
- * @abstract
- * kIODVDBlockStorageDeviceClass is the name of the IODVDBlockStorageDevice class.
- * @discussion
- * kIODVDBlockStorageDeviceClass is the name of the IODVDBlockStorageDevice class.
- */
-
-#define kIODVDBlockStorageDeviceClass "IODVDBlockStorageDevice"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOCDBlockStorageDevice.h>
-
-/* Property used for matching, so the generic driver gets the nub it wants. */
-#define	kIOBlockStorageDeviceTypeDVD	"DVD"
-
-/*!
- * @class
- * IODVDBlockStorageDevice : public IOCDBlockStorageDevice
- * @abstract
- * The IODVDBlockStorageDevice class is a generic DVD block storage device
- * abstraction.
- * @discussion
- * This class is the protocol for generic DVD functionality, independent of
- * the physical connection protocol (e.g. SCSI, ATA, USB).
- *
- * The APIs are the union of CD APIs and all
- * necessary new low-level DVD APIs.
- *
- * A subclass implements relay methods that translate our requests into
- * calls to a protocol- and device-specific provider.
- */
-
-class IODVDBlockStorageDevice : public IOCDBlockStorageDevice {
-
-    OSDeclareAbstractStructors(IODVDBlockStorageDevice)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /* Overrides from IORegistryEntry */
-    
-    virtual bool	init(OSDictionary * properties);
-
-    /* New APIs for DVD */
-
-    virtual IOReturn	reportKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
-                                        const UInt32 lba,const UInt8 agid,const DVDKeyFormat keyFormat)	= 0;
-
-    virtual IOReturn	sendKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
-                                        const UInt8 agid,const DVDKeyFormat keyFormat)	= 0;
-
-#ifdef __LP64__
-    virtual IOReturn	readDVDStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
-                                        const UInt32 address,const UInt8 layer,const UInt8 agid)	= 0;
-#else /* !__LP64__ */
-    virtual IOReturn	readDVDStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
-                                        const UInt32 address,const UInt8 layer,const UInt8 agid); /* 10.1.0 */
-#endif /* !__LP64__ */
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  0);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IODVDBlockStorageDevice,  0);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  1);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  2);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  3);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  4);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  5);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  6);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  7);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  8);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice,  9);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 10);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 11);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 12);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 13);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 14);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 15);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 16);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 17);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 18);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 19);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 20);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 21);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 22);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 23);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 24);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 25);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 26);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 27);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 28);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 29);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 30);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDevice, 31);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IODVDBLOCKSTORAGEDEVICE_H */
diff --git a/i386/include/IOKit/storage/IODVDBlockStorageDriver.h b/i386/include/IOKit/storage/IODVDBlockStorageDriver.h
deleted file mode 100644
index d9471f6..0000000
--- a/i386/include/IOKit/storage/IODVDBlockStorageDriver.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * IODVDBlockStorageDriver.h
- *
- * This class implements DVD functionality, independent of
- * the physical connection protocol (e.g. SCSI, ATA, USB).
- *
- * A protocol-specific provider implements the functionality using an appropriate
- * protocol and commands.
- */
-
-#ifndef	_IODVDBLOCKSTORAGEDRIVER_H
-#define	_IODVDBLOCKSTORAGEDRIVER_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/storage/IOCDBlockStorageDriver.h>
-#include <IOKit/storage/IODVDBlockStorageDevice.h>
-#include <IOKit/storage/IODVDTypes.h>
-
-/*!
- * @defined kIODVDBlockStorageDriverClass
- * @abstract
- * kIODVDBlockStorageDriverClass is the name of the IODVDBlockStorageDriver class.
- * @discussion
- * kIODVDBlockStorageDriverClass is the name of the IODVDBlockStorageDriver class.
- */
-
-#define kIODVDBlockStorageDriverClass "IODVDBlockStorageDriver"
-
-class IODVDBlockStorageDevice;
-
-/*!
- * @class
- * IODVDBlockStorageDriver : public IOCDBlockStorageDriver
- * @abstract
- * Generic DVD Driver.
- * @discussion
- * Storage drivers are split into two parts: the Generic Driver handles
- * all generic device issues, independent of the lower-level transport
- * mechanism (e.g. SCSI, ATA, USB, FireWire). All storage operations
- * at the Generic Driver level are translated into a series of generic
- * device operations. These operations are passed via the Device Nub
- * to a Transport Driver, which implements the appropriate
- * transport-dependent protocol to execute these operations.
- * 
- * To determine the write-protect state of a device (or media), for
- * example, the generic driver would issue a call to the
- * Transport Driver's reportWriteProtection method. If this were a SCSI
- * device, its Transport Driver would issue a Mode Sense command to
- * extract the write-protection status bit. The Transport Driver then
- * reports true or false to the generic driver.
- * 
- * The generic driver therefore has no knowledge of, or involvement
- * with, the actual commands and mechanisms used to communicate with
- * the device. It is expected that the generic driver will rarely, if
- * ever, need to be subclassed to handle device idiosyncrasies; rather,
- * the Transport Driver should be changed via overrides.
- * 
- * A generic driver could be subclassed to create a different type of
- * generic device. The generic driver IODVDBlockStorageDriver class is a subclass
- * of IOCDBlockStorageDriver, adding DVD functions. Similarly, the Transport Driver
- * IODVDBlockStorageDevice is a subclass of IOCDBlockStorageDevice, adding DVD 
- * functions.
-*/
-
-class IODVDBlockStorageDriver : public IOCDBlockStorageDriver {
-
-    OSDeclareDefaultStructors(IODVDBlockStorageDriver)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    /* Overrides of IOCDBlockStorageDriver. */
-
-    virtual IOReturn	acceptNewMedia(void);
-
-    /* End of IOCDBlockStorageDriver overrides. */
-
-public:
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method to
-     * return a more specific subclass of IOService -- IODVDBlockStorageDevice.
-     * This method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IODVDBlockStorageDevice * getProvider() const;
-
-    /* Overrides of IOCDBlockStorageDriver: */
-
-    virtual const char * getDeviceTypeName(void);
-    virtual IOMedia *	instantiateDesiredMediaObject(void);
-    virtual IOMedia *	instantiateMediaObject(UInt64 base,UInt64 byteSize,
-                                            UInt32 blockSize,char *mediaName);
-
-    /* End of IOCDBlockStorageDriver overrides. */
-
-    /*!
-     * @function reportKey
-     * @abstract
-     * Get key info from the DVD drive.
-     * @discussion
-     * This function handles the getting of key- and encryption-related data for the drive.
-     * @param buffer
-     * A buffer containing information, as documented in the specification
-     * "MtFuji Commands For Multimedia Devices."
-     * @param keyClass
-     * As documented by MtFuji. See DVDKeyClass.
-     * @param lba
-     * As documented by MtFuji.
-     * @param agid
-     * As documented by MtFuji.
-     * @param keyFormat
-     * As documented by MtFuji. See DVDKeyFormat.
-     */
-    virtual IOReturn	reportKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
-                                        const UInt32 lba,const UInt8 agid,const DVDKeyFormat keyFormat);
-
-    /*!
-     * @function sendKey
-     * @abstract
-     * Send key info to the DVD drive.
-     * @discussion
-     * This function handles the setting of key- and encryption-related data for the drive.
-     * @param buffer
-     * A buffer containing information, as documented in the specification
-     * "MtFuji Commands For Multimedia Devices."
-     * @param keyClass
-     * As documented by MtFuji. See DVDKeyClass.
-     * @param agid
-     * As documented by MtFuji.
-     * @param keyFormat
-     * As documented by MtFuji. See DVDKeyFormat.
-     */
-    virtual IOReturn	sendKey(IOMemoryDescriptor *buffer,const DVDKeyClass keyClass,
-                                        const UInt8 agid,const DVDKeyFormat keyFormat);
-
-    /*!
-     * @function readStructure
-     * @abstract
-     * Get control structures from the DVD media.
-     * @discussion
-     * This function handles the getting of control structure data for the media.
-     * @param buffer
-     * A buffer containing information, as documented in the specification
-     * "MtFuji Commands For Multimedia Devices."
-     * @param format
-     * As documented by MtFuji. See DVDStructureFormat.
-     * @param address
-     * As documented by MtFuji.
-     * @param layer
-     * As documented by MtFuji.
-     * @param agid
-     * As documented by MtFuji.
-     */
-    virtual IOReturn	readStructure(IOMemoryDescriptor *buffer,const DVDStructureFormat format,
-                                        const UInt32 address,const UInt8 layer,const UInt8 agid); /* 10.1.0 */
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  0);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IODVDBlockStorageDriver,  0);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  1);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  2);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  3);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  4);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  5);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  6);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  7);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  8);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver,  9);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 10);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 11);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 12);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 13);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 14);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 15);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 16);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 17);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 18);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 19);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 20);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 21);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 22);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 23);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 24);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 25);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 26);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 27);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 28);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 29);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 30);
-    OSMetaClassDeclareReservedUnused(IODVDBlockStorageDriver, 31);
-};
-#endif
diff --git a/i386/include/IOKit/storage/IODVDMedia.h b/i386/include/IOKit/storage/IODVDMedia.h
deleted file mode 100644
index 02119c3..0000000
--- a/i386/include/IOKit/storage/IODVDMedia.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IODVDMedia
- * @abstract
- * This header contains the IODVDMedia class definition.
- */
-
-#ifndef _IODVDMEDIA_H
-#define _IODVDMEDIA_H
-
-/*!
- * @defined kIODVDMediaClass
- * @abstract
- * kIODVDMediaClass is the name of the IODVDMedia class.
- * @discussion
- * kIODVDMediaClass is the name of the IODVDMedia class.
- */
-
-#define kIODVDMediaClass "IODVDMedia"
-
-/*!
- * @defined kIODVDMediaTypeKey
- * @abstract
- * kIODVDMediaTypeKey is a property of IODVDMedia objects.  It has an OSString
- * value.
- * @discussion
- * The kIODVDMediaTypeKey property identifies the DVD media type (DVD-ROM,
- * DVD-R, DVD-RW, DVD+RW, DVD-RAM, etc).  See the kIODVDMediaType contants
- * for possible values.
- */
-
-#define kIODVDMediaTypeKey "Type"
-
-/*!
- * @defined kIODVDMediaTypeROM
- * The kIODVDMediaTypeKey constant for DVD-ROM media.
- */
-
-#define kIODVDMediaTypeROM "DVD-ROM"
-
-/*!
- * @defined kIODVDMediaTypeR
- * The kIODVDMediaTypeKey constant for DVD Recordable (DVD-R) media.
- */
-
-#define kIODVDMediaTypeR "DVD-R"
-
-/*!
- * @defined kIODVDMediaTypeRW
- * The kIODVDMediaTypeKey constant for DVD ReWritable (DVD-RW) media.
- */
-
-#define kIODVDMediaTypeRW "DVD-RW"
-
-/*!
- * @defined kIODVDMediaTypePlusR
- * The kIODVDMediaTypeKey constant for DVD "Plus" Recordable (DVD+R) media.
- */
-
-#define kIODVDMediaTypePlusR "DVD+R"
-
-/*!
- * @defined kIODVDMediaTypePlusRW
- * The kIODVDMediaTypeKey constant for DVD "Plus" ReWritable (DVD+RW) media.
- */
-
-#define kIODVDMediaTypePlusRW "DVD+RW"
-
-/*!
- * @defined kIODVDMediaTypeRAM
- * The kIODVDMediaTypeKey constant for DVD-RAM media.
- */
-
-#define kIODVDMediaTypeRAM "DVD-RAM"
-
-/*!
- * @defined kIODVDMediaTypeHDROM
- * The kIODVDMediaTypeKey constant for HD DVD-ROM media.
- */
-
-#define kIODVDMediaTypeHDROM "HD DVD-ROM"
-
-/*!
- * @defined kIODVDMediaTypeHDR
- * The kIODVDMediaTypeKey constant for HD DVD Recordable (HD DVD-R) media.
- */
-
-#define kIODVDMediaTypeHDR "HD DVD-R"
-
-/*!
- * @defined kIODVDMediaTypeHDRW
- * The kIODVDMediaTypeKey constant for HD DVD ReWritable (HD DVD-RW) media.
- */
-
-#define kIODVDMediaTypeHDRW "HD DVD-RW"
-
-/*!
- * @defined kIODVDMediaTypeHDRAM
- * The kIODVDMediaTypeKey constant for HD DVD-RAM media.
- */
-
-#define kIODVDMediaTypeHDRAM "HD DVD-RAM"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IODVDBlockStorageDriver.h>
-#include <IOKit/storage/IOMedia.h>
-
-/*!
- * @class IODVDMedia
- * @abstract
- * The IODVDMedia class is a random-access disk device abstraction for DVDs.
- * @discussion
- * The IODVDMedia class is a random-access disk device abstraction for DVDs.
- */
-
-class IODVDMedia : public IOMedia
-{
-    OSDeclareDefaultStructors(IODVDMedia)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*
-     * Obtain this object's provider.   We override the superclass's method to
-     * return a more specific subclass of IOService -- IODVDBlockStorageDriver.
-     * This method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IODVDBlockStorageDriver * getProvider() const;
-
-    /*
-     * Compare the properties in the supplied table to this object's properties.
-     */
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 * score);
-
-    /*!
-     * @function reportKey
-     * @discussion
-     * Issue an MMC REPORT KEY command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.  Pass null for the kDVDKeyFormatAGID_Invalidate format
-     * case.
-     * @param keyClass
-     * As documented by MMC.
-     * @param address
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @param format
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn reportKey( IOMemoryDescriptor * buffer,
-                                const DVDKeyClass    keyClass,
-                                const UInt32         address,
-                                const UInt8          grantID,
-                                const DVDKeyFormat   format ); /* 10.1.0 */
-
-    /*!
-     * @function sendKey
-     * @discussion
-     * Issue an MMC SEND KEY command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.  Pass null for the kDVDKeyFormatAGID_Invalidate format
-     * case.
-     * @param keyClass
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @param format
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn sendKey( IOMemoryDescriptor * buffer,
-                              const DVDKeyClass    keyClass,
-                              const UInt8          grantID,
-                              const DVDKeyFormat   format ); /* 10.1.0 */
-
-    /*!
-     * @function readStructure
-     * @discussion
-     * Issue an MMC READ DVD STRUCTURE command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param format
-     * As documented by MMC.
-     * @param address
-     * As documented by MMC.
-     * @param layer
-     * As documented by MMC.
-     * @param grantID
-     * As documented by MMC.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readStructure( IOMemoryDescriptor *     buffer,
-                                    const DVDStructureFormat format,
-                                    const UInt32             address,
-                                    const UInt8              layer,
-                                    const UInt8              grantID ); /* 10.1.0 */
-
-    /*!
-     * @function getSpeed
-     * @discussion
-     * Get the current speed used for data transfers.
-     * @param kilobytesPerSecond
-     * Returns the current speed used for data transfers, in kB/s.
-     *
-     * kDVDSpeedMin specifies the minimum speed for all DVD media (1X).
-     * kDVDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn getSpeed(UInt16 * kilobytesPerSecond); /* 10.1.0 */
-
-    /*!
-     * @function setSpeed
-     * @discussion
-     * Set the speed to be used for data transfers.
-     * @param kilobytesPerSecond
-     * Speed to be used for data transfers, in kB/s.
-     *
-     * kDVDSpeedMin specifies the minimum speed for all DVD media (1X).
-     * kDVDSpeedMax specifies the maximum speed supported in hardware.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn setSpeed(UInt16 kilobytesPerSecond); /* 10.1.0 */
-
-    /*!
-     * @function readDiscInfo
-     * @discussion
-     * Issue an MMC READ DISC INFORMATION command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readDiscInfo( IOMemoryDescriptor * buffer,
-                                   UInt16 *             actualByteCount ); /* 10.2.0 */
-
-    /*!
-     * @function readRZoneInfo
-     * @discussion
-     * Issue an MMC READ RZONE INFORMATION (READ TRACK INFORMATION) command.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param address
-     * As documented by MMC.
-     * @param addressType
-     * As documented by MMC.
-     * @param actualByteCount
-     * Returns the actual number of bytes transferred in the data transfer.
-     * @result
-     * Returns the status of the data transfer.
-     */
-
-    virtual IOReturn readRZoneInfo( IOMemoryDescriptor *    buffer,
-                                    UInt32                  address,
-                                    DVDRZoneInfoAddressType addressType,
-                                    UInt16 *                actualByteCount ); /* 10.2.0 */
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  0);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  1);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  2);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  3);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  4);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  5);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  6);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  0);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  1);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  2);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  3);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  4);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  5);
-    OSMetaClassDeclareReservedUsed(IODVDMedia,  6);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  7);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  8);
-    OSMetaClassDeclareReservedUnused(IODVDMedia,  9);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 10);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 11);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 12);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 13);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 14);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 15);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 16);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 17);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 18);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 19);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 20);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 21);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 22);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 23);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 24);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 25);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 26);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 27);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 28);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 29);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 30);
-    OSMetaClassDeclareReservedUnused(IODVDMedia, 31);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IODVDMEDIA_H */
diff --git a/i386/include/IOKit/storage/IODVDMediaBSDClient.h b/i386/include/IOKit/storage/IODVDMediaBSDClient.h
deleted file mode 100644
index 2258bf6..0000000
--- a/i386/include/IOKit/storage/IODVDMediaBSDClient.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IODVDMEDIABSDCLIENT_H
-#define _IODVDMEDIABSDCLIENT_H
-
-#include <sys/ioctl.h>
-
-#include <IOKit/storage/IODVDTypes.h>
-
-/*
- * Definitions
- *
- * ioctl                        description
- * ---------------------------- ------------------------------------------------
- * DKIOCDVDREADSTRUCTURE        see IODVDMedia::readStructure()  in IODVDMedia.h
- *
- * DKIOCDVDREADDISCINFO         see IODVDMedia::readDiscInfo()   in IODVDMedia.h
- * DKIOCDVDREADRZONEINFO        see IODVDMedia::readRZoneInfo()  in IODVDMedia.h
- *
- * DKIOCDVDREPORTKEY            see IODVDMedia::reportKey()      in IODVDMedia.h
- * DKIOCDVDSENDKEY              see IODVDMedia::sendKey()        in IODVDMedia.h
- *
- * DKIOCDVDGETSPEED             see IODVDMedia::getSpeed()       in IODVDMedia.h
- * DKIOCDVDSETSPEED             see IODVDMedia::setSpeed()       in IODVDMedia.h
- *
- *         in /System/Library/Frameworks/Kernel.framework/Headers/IOKit/storage/
- */
-
-typedef struct
-{
-    uint8_t  format;
-
-    uint8_t  reserved0008[3];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  grantID;
-    uint8_t  layer;
-
-#ifdef __LP64__
-    uint8_t  reserved0080[4];                      /* reserved, clear to zero */
-#endif /* __LP64__ */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_dvd_read_structure_t;
-
-typedef struct
-{
-    uint8_t  format;
-    uint8_t  keyClass;
-
-    uint8_t  reserved0016[2];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  grantID;
-
-#ifdef __LP64__
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_dvd_report_key_t;
-
-typedef struct
-{
-    uint8_t  format;
-    uint8_t  keyClass;
-
-    uint8_t  reserved0016[6];                      /* reserved, clear to zero */
-
-    uint8_t  grantID;
-
-#ifdef __LP64__
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;
-    void *   buffer;
-} dk_dvd_send_key_t;
-
-typedef struct
-{
-#ifdef __LP64__
-    uint8_t  reserved0000[14];                     /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0000[10];                     /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_dvd_read_disc_info_t;
-
-typedef struct
-{
-    uint8_t  reserved0000[4];                      /* reserved, clear to zero */
-
-    uint32_t address;
-    uint8_t  addressType;
-
-#ifdef __LP64__
-    uint8_t  reserved0072[5];                      /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t  reserved0072[1];                      /* reserved, clear to zero */
-#endif /* !__LP64__ */
-
-    uint16_t bufferLength;                         /* actual length on return */
-    void *   buffer;
-} dk_dvd_read_rzone_info_t;
-
-#define DKIOCDVDREADSTRUCTURE _IOW('d', 128, dk_dvd_read_structure_t)
-#define DKIOCDVDREPORTKEY     _IOW('d', 129, dk_dvd_report_key_t)
-#define DKIOCDVDSENDKEY       _IOW('d', 130, dk_dvd_send_key_t)
-
-#define DKIOCDVDGETSPEED      _IOR('d', 131, uint16_t)
-#define DKIOCDVDSETSPEED      _IOW('d', 131, uint16_t)
-
-#define DKIOCDVDREADDISCINFO  _IOWR('d', 132, dk_dvd_read_disc_info_t)
-#define DKIOCDVDREADRZONEINFO _IOWR('d', 133, dk_dvd_read_rzone_info_t)
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IODVDMedia.h>
-#include <IOKit/storage/IOMediaBSDClient.h>
-
-/*
- * Class
- */
-
-class IODVDMediaBSDClient : public IOMediaBSDClient
-{
-    OSDeclareDefaultStructors(IODVDMediaBSDClient)
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-public:
-
-    /*
-     * Obtain this object's provider.   We override the superclass's method
-     * to return a more specific subclass of IOService -- IODVDMedia.  This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IODVDMedia * getProvider() const;
-
-    /*
-     * Process a DVD-specific ioctl.
-     */
-
-    virtual int ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, proc_t proc);
-
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 0);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 1);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 2);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 3);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 4);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 5);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 6);
-    OSMetaClassDeclareReservedUnused(IODVDMediaBSDClient, 7);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IODVDMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/IODVDTypes.h b/i386/include/IOKit/storage/IODVDTypes.h
deleted file mode 100644
index 039b8fb..0000000
--- a/i386/include/IOKit/storage/IODVDTypes.h
+++ /dev/null
@@ -1,451 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef	_IODVDTYPES_H
-#define	_IODVDTYPES_H
-
-#include <IOKit/IOTypes.h>
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/*
- * Media Types
- */
-
-enum
-{
-    kDVDMediaTypeUnknown   = 0x0200,
-    kDVDMediaTypeROM       = 0x0202, /* DVD-ROM    */
-    kDVDMediaTypeRAM       = 0x0203, /* DVD-RAM    */
-    kDVDMediaTypeR         = 0x0204, /* DVD-R      */
-    kDVDMediaTypeRW        = 0x0205, /* DVD-RW     */
-    kDVDMediaTypePlusRW    = 0x0206, /* DVD+RW     */
-    kDVDMediaTypePlusR     = 0x0207, /* DVD+R      */
-    kDVDMediaTypeHDROM     = 0x0212, /* HD DVD-ROM */
-    kDVDMediaTypeHDRAM     = 0x0213, /* HD DVD-RAM */
-    kDVDMediaTypeHDR       = 0x0214, /* HD DVD-R   */
-    kDVDMediaTypeHDRW      = 0x0215, /* HD DVD-RW  */
-
-    kDVDMediaTypeMin       = 0x0200,
-    kDVDMediaTypeMax       = 0x02FF
-};
-
-typedef UInt32 DVDMediaType;
-
-/*
- * Media Speed (kB/s)
- */
-
-#define kDVDSpeedMin 0x0546
-#define kDVDSpeedMax 0xFFFF
-
-/*
- * MMC Formats
- */
-
-typedef UInt8	DVDCPRMRegionCode;
-enum
-{
-	kDVDCPRMRegion1		= 0xFE,
-	kDVDCPRMRegion2		= 0xFD,
-	kDVDCPRMRegion3		= 0xFB,
-	kDVDCPRMRegion4		= 0xF7,
-	kDVDCPRMRegion5		= 0xEF,
-	kDVDCPRMRegion6		= 0xDF
-};
-
-typedef UInt8	DVDRegionalPlaybackControlScheme;
-enum
-{
-	kDVDRegionalPlaybackControlSchemePhase1		= 0x00,
-	kDVDRegionalPlaybackControlSchemePhase2		= 0x01
-};
-
-typedef UInt8	DVDBookType;
-enum
-{
-	kDVDBookTypeROM					= 0x0,
-	kDVDBookTypeRAM					= 0x1,
-	kDVDBookTypeR					= 0x2,
-	kDVDBookTypeRW					= 0x3,
-	kDVDBookTypeHDROM				= 0x4,
-	kDVDBookTypeHDRAM				= 0x5,
-	kDVDBookTypeHDR					= 0x6,
-	kDVDBookTypeHDRW				= 0x7,
-	kDVDBookTypePlusRW				= 0x9,
-	kDVDBookTypePlusR				= 0xA,
-	kDVDBookTypePlusRWDoubleLayer	= 0xD,
-	kDVDBookTypePlusRDoubleLayer	= 0xE
-};
-
-#ifdef __LP64__
-typedef UInt8	DVDKeyClass;
-enum
-#else /* !__LP64__ */
-enum DVDKeyClass
-#endif /* !__LP64__ */
-{
-	kDVDKeyClassCSS_CPPM_CPRM	= 0x00,
-	kDVDKeyClassRSSA			= 0x01
-};
-#ifndef __LP64__
-typedef enum DVDKeyClass DVDKeyClass;
-#endif /* !__LP64__ */
-
-#ifdef __LP64__
-typedef UInt8	DVDKeyFormat;
-enum
-#else /* !__LP64__ */
-enum DVDKeyFormat
-#endif /* !__LP64__ */
-{
-	kDVDKeyFormatAGID_CSS			= 0x00,
-	kDVDKeyFormatChallengeKey		= 0x01,
-	kDVDKeyFormatKey1				= 0x02,
-	kDVDKeyFormatKey2				= 0x03,
-	kDVDKeyFormatTitleKey			= 0x04,
-	kDVDKeyFormatASF				= 0x05,
-	kDVDKeyFormatSetRegion			= 0x06,
-	kDVDKeyFormatRegionState		= 0x08,
-	kDVDKeyFormatAGID_CSS2			= 0x10,
-	kDVDKeyFormatAGID_CPRM			= 0x11,
-	kDVDKeyFormatAGID_Invalidate	= 0x3F
-};	
-#ifndef __LP64__
-typedef enum DVDKeyFormat DVDKeyFormat;
-#endif /* !__LP64__ */
-
-typedef UInt8	DVDStructureFormat;
-enum
-{
-	kDVDStructureFormatPhysicalFormatInfo			= 0x00,
-	kDVDStructureFormatCopyrightInfo				= 0x01,
-	kDVDStructureFormatDiscKeyInfo					= 0x02,
-	// skip BCA
-	kDVDStructureFormatManufacturingInfo			= 0x04
-};
-
-// Read DVD Structures Format 0x00
-struct DVDPhysicalFormatInfo
-{
-	UInt8		dataLength[2];
-	UInt8		reserved[2];
-#ifdef __LITTLE_ENDIAN__
-	// Byte 0
-	UInt8		partVersion:4;
-	UInt8		bookType:4;
-	
-	// Byte 1
-	UInt8		minimumRate:4;
-	UInt8		discSize:4;
-	
-	// Byte 2
-	UInt8		layerType:4;
-	UInt8		trackPath:1;
-	UInt8		numberOfLayers:2;
-	UInt8		reserved2:1;
-	
-	// Byte 3
-	UInt8		trackDensity:4;
-	UInt8		linearDensity:4;
-#else /* !__LITTLE_ENDIAN__ */
-	// Byte 0
-	UInt8		bookType:4;
-	UInt8		partVersion:4;
-	
-	// Byte 1
-	UInt8		discSize:4;
-	UInt8		minimumRate:4;
-	
-	// Byte 2
-	UInt8		reserved2:1;
-	UInt8		numberOfLayers:2;
-	UInt8		trackPath:1;
-	UInt8		layerType:4;
-	
-	// Byte 3
-	UInt8		linearDensity:4;
-	UInt8		trackDensity:4;
-#endif /* !__LITTLE_ENDIAN__ */
-	
-	// Bytes 4-15
-	UInt8		zero1;		// always 0x00
-	UInt8		startingPhysicalSectorNumberOfDataArea[3];
-	UInt8		zero2;		// always 0x00
-	UInt8		endPhysicalSectorNumberOfDataArea[3];
-	UInt8		zero3;		// always 0x00
-	UInt8		endSectorNumberInLayerZero[3];
-	
-	// Byte 16
-#ifdef __LITTLE_ENDIAN__
-	UInt8		reserved1:7;
-	UInt8		bcaFlag:1;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt8		bcaFlag:1;
-	UInt8		reserved1:7;
-#endif /* !__LITTLE_ENDIAN__ */
-	
-	// Bytes 17-2047
-	UInt8		mediaSpecific[2031];
-};
-typedef struct DVDPhysicalFormatInfo DVDPhysicalFormatInfo;
-
-// Read DVD Structures Format 0x01
-struct DVDCopyrightInfo
-{
-	UInt8				dataLength[2];
-	UInt8				reserved[2];
-	UInt8				copyrightProtectionSystemType;
-	DVDCPRMRegionCode	regionMask;
-	UInt8				reserved2[2];
-};
-typedef struct DVDCopyrightInfo DVDCopyrightInfo;
-
-// Read DVD Structures Format 0x02
-struct DVDDiscKeyInfo
-{
-	UInt8		dataLength[2];
-	UInt8		reserved[2];
-	UInt8		discKeyStructures[2048];
-};
-typedef struct DVDDiscKeyInfo DVDDiscKeyInfo;
-
-// Read DVD Structures Format 0x04
-struct DVDManufacturingInfo
-{
-	UInt8		dataLength[2];
-	UInt8		reserved[2];
-	UInt8		discManufacturingInfo[2048];
-};
-typedef struct DVDManufacturingInfo DVDManufacturingInfo;
-
-// ReportKey Format 0x00
-struct DVDAuthenticationGrantIDInfo
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-	UInt8	reserved2[3];
-#ifdef __LITTLE_ENDIAN__
-	UInt8	reservedBits:6;
-	UInt8	grantID:2;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt8	grantID:2;
-	UInt8	reservedBits:6;
-#endif /* !__LITTLE_ENDIAN__ */
-};
-typedef struct DVDAuthenticationGrantIDInfo DVDAuthenticationGrantIDInfo;
-
-// ReportKey and SendKey Format 0x01
-struct DVDChallengeKeyInfo
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-	UInt8	challengeKeyValue[10];
-	UInt8	reserved2[2];
-};
-typedef struct DVDChallengeKeyInfo DVDChallengeKeyInfo;
-
-// ReportKey Format 0x02
-struct DVDKey1Info
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-	UInt8	key1Value[5];
-	UInt8	reserved2[3];
-};
-typedef struct DVDKey1Info DVDKey1Info;
-
-// SendKey Format 0x03
-struct DVDKey2Info
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-	UInt8	key2Value[5];
-	UInt8	reserved2[3];
-};
-typedef struct DVDKey2Info DVDKey2Info;
-
-// ReportKey Format 0x04
-struct DVDTitleKeyInfo
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-#ifdef __LITTLE_ENDIAN__
-	UInt8	CP_MOD:4;
-	UInt8	CGMS:2;
-	UInt8	CP_SEC:1;
-	UInt8	CPM:1;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt8	CPM:1;
-	UInt8	CP_SEC:1;
-	UInt8	CGMS:2;
-	UInt8	CP_MOD:4;
-#endif /* !__LITTLE_ENDIAN__ */
-	UInt8	titleKeyValue[5];
-	UInt8	reserved2[2];
-};
-typedef struct DVDTitleKeyInfo DVDTitleKeyInfo;
-
-// ReportKey Format 0x05
-struct DVDAuthenticationSuccessFlagInfo
-{
-	UInt8	dataLength[2];
-	UInt8	reserved[2];
-	UInt8	reserved2[3];
-#ifdef __LITTLE_ENDIAN__
-	UInt8	successFlag:1;
-	UInt8	reservedBits:7;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt8	reservedBits:7;
-	UInt8	successFlag:1;
-#endif /* !__LITTLE_ENDIAN__ */
-};
-typedef struct DVDAuthenticationSuccessFlagInfo DVDAuthenticationSuccessFlagInfo;
-
-// ReportKey Format 0x08
-struct DVDRegionPlaybackControlInfo
-{
-	UInt8									dataLength[2];
-	UInt8									reserved[2];
-#ifdef __LITTLE_ENDIAN__
-	UInt8									numberUserResets:3;
-	UInt8									numberVendorResets:3;
-	UInt8									typeCode:2;
-#else /* !__LITTLE_ENDIAN__ */
-	UInt8									typeCode:2;
-	UInt8									numberVendorResets:3;
-	UInt8									numberUserResets:3;
-#endif /* !__LITTLE_ENDIAN__ */
-	DVDCPRMRegionCode						driveRegion;
-	DVDRegionalPlaybackControlScheme		rpcScheme;
-	UInt8									reserved2;
-};
-typedef struct DVDRegionPlaybackControlInfo DVDRegionPlaybackControlInfo;
-
-// Read Disc Information Format
-struct DVDDiscInfo
-{
-    UInt16 dataLength;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  discStatus:2;
-    UInt8  stateOfLastBorder:2;
-    UInt8  erasable:1;
-    UInt8  reserved:3;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved:3;
-    UInt8  erasable:1;
-    UInt8  stateOfLastBorder:2;
-    UInt8  discStatus:2;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved2;
-    UInt8  numberOfBordersLSB;
-    UInt8  firstRZoneNumberInLastBorderLSB;
-    UInt8  lastRZoneNumberInLastBorderLSB;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  reserved3:5;
-    UInt8  unrestrictedUse:1;
-    UInt8  discBarCodeValid:1;
-    UInt8  reserved4:1;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved4:1;
-    UInt8  discBarCodeValid:1;
-    UInt8  unrestrictedUse:1;
-    UInt8  reserved3:5;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved5;
-    UInt8  numberOfBordersMSB;
-    UInt8  firstRZoneNumberInLastBorderMSB;
-    UInt8  lastRZoneNumberInLastBorderMSB;
-    UInt8  reserved6[4];
-    UInt8  reserved7[4];
-    UInt8  reserved8[4];
-    UInt8  discBarCode[8];
-    UInt8  reserved9;
-    UInt8  numberOfOPCTableEntries;
-    UInt8  opcTableEntries[0];
-};
-typedef struct DVDDiscInfo DVDDiscInfo;
-
-// Read RZone Information Address Types
-typedef UInt8 DVDRZoneInfoAddressType;
-enum
-{
-    kDVDRZoneInfoAddressTypeLBA          = 0x00,
-    kDVDRZoneInfoAddressTypeRZoneNumber  = 0x01,
-    kDVDRZoneInfoAddressTypeBorderNumber = 0x02,
-};
-
-// Read RZone Information Format
-struct DVDRZoneInfo
-{
-    UInt16 dataLength;
-    UInt8  rzoneNumberLSB;
-    UInt8  borderNumberLSB;
-    UInt8  reserved;
-#ifdef __LITTLE_ENDIAN__
-    UInt8  reserved2:4;
-    UInt8  copy:1;
-    UInt8  damage:1;
-    UInt8  reserved3:2;
-
-    UInt8  reserved4:4;
-    UInt8  restrictedOverwrite:1;
-    UInt8  incremental:1;
-    UInt8  blank:1;
-    UInt8  reservedRZone:1;
-
-    UInt8  nextWritableAddressValid:1;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  reserved5:6;
-#else /* !__LITTLE_ENDIAN__ */
-    UInt8  reserved3:2;
-    UInt8  damage:1;
-    UInt8  copy:1;
-    UInt8  reserved2:4;
-
-    UInt8  reservedRZone:1;
-    UInt8  blank:1;
-    UInt8  incremental:1;
-    UInt8  restrictedOverwrite:1;
-    UInt8  reserved4:4;
-
-    UInt8  reserved5:6;
-    UInt8  lastRecordedAddressValid:1;
-    UInt8  nextWritableAddressValid:1;
-#endif /* !__LITTLE_ENDIAN__ */
-    UInt32 rzoneStartAddress;
-    UInt32 nextWritableAddress;
-    UInt32 freeBlocks;
-    UInt32 blockingFactor;
-    UInt32 rzoneSize;
-    UInt32 lastRecordedAddress;
-    UInt8  rzoneNumberMSB;
-    UInt8  borderNumberMSB;
-    UInt8  reserved6;
-    UInt8  reserved7;
-};
-typedef struct DVDRZoneInfo DVDRZoneInfo;
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* _IODVDTYPES_H */
diff --git a/i386/include/IOKit/storage/IOFDiskPartitionScheme.h b/i386/include/IOKit/storage/IOFDiskPartitionScheme.h
deleted file mode 100644
index 7f96255..0000000
--- a/i386/include/IOKit/storage/IOFDiskPartitionScheme.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * This header contains the IOFDiskPartitionScheme class definition.
- */
-
-#ifndef _IOFDISKPARTITIONSCHEME_H
-#define _IOFDISKPARTITIONSCHEME_H
-
-#include <IOKit/IOTypes.h>
-
-/*
- * kIOFDiskPartitionSchemeClass is the name of the IOFDiskPartitionScheme class.
- */
-
-#define kIOFDiskPartitionSchemeClass "IOFDiskPartitionScheme"
-
-/*
- * FDisk Partition Map Definitions
- */
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/* Structure constants. */
-
-#define DISK_BLK0SZ sizeof(struct disk_blk0)    /* (size of partition map)    */
-#define DISK_BOOTSZ 446                         /* (size of boot code in map) */
-#define DISK_NPART  4                           /* (number of entries in map) */
-
-/* Partition map entry. */
-
-struct fdisk_part
-{
-    UInt8   bootid;    /* (is active boot partition?)                         */
-    UInt8   beghead;   /* (beginning head)                                    */
-    UInt8   begsect;   /* (beginning sector; beginning cylinder, high 2 bits) */
-    UInt8   begcyl;    /* (beginning cylinder, low 8 bits)                    */
-    UInt8   systid;    /* (type)                                              */
-    UInt8   endhead;   /* (ending head)                                       */
-    UInt8   endsect;   /* (ending sector; ending cylinder, high 2 bits)       */
-    UInt8   endcyl;    /* (ending cylinder, low 8 bits)                       */
-    UInt32  relsect;   /* (block start)                                       */
-    UInt32  numsect;   /* (block count)                                       */
-};
-
-/* Partition map, as found in block zero of the disk (or extended partition). */
-
-struct disk_blk0
-{
-    UInt8             bootcode[DISK_BOOTSZ];    /* (boot code)                */
-    struct fdisk_part parts[DISK_NPART];        /* (partition entries)        */
-    UInt16            signature;                /* (unique signature for map) */
-};
-
-/* Partition map signature (signature). */
-
-#define DISK_SIGNATURE 0xAA55
-
-/* Partition map entry types (systid). */
-
-#define FDISK_PARTITION_TYPE_01 "DOS_FAT_12"
-#define FDISK_PARTITION_TYPE_04 "DOS_FAT_16_S"
-#define FDISK_PARTITION_TYPE_06 "DOS_FAT_16"
-#define FDISK_PARTITION_TYPE_07 "Windows_NTFS"
-#define FDISK_PARTITION_TYPE_0B "DOS_FAT_32"
-#define FDISK_PARTITION_TYPE_0C "Windows_FAT_32"
-#define FDISK_PARTITION_TYPE_0E "Windows_FAT_16"
-#define FDISK_PARTITION_TYPE_42 "Windows_LDM"
-#define FDISK_PARTITION_TYPE_82 "Linux_Swap"
-#define FDISK_PARTITION_TYPE_83 "Linux"
-#define FDISK_PARTITION_TYPE_8E "Linux_LVM"
-#define FDISK_PARTITION_TYPE_A5 "FreeBSD"
-#define FDISK_PARTITION_TYPE_A6 "OpenBSD"
-#define FDISK_PARTITION_TYPE_A7 "Apple_Rhapsody_UFS"
-#define FDISK_PARTITION_TYPE_A8 "Apple_UFS"
-#define FDISK_PARTITION_TYPE_A9 "NetBSD"
-#define FDISK_PARTITION_TYPE_AB "Apple_Boot"
-#define FDISK_PARTITION_TYPE_AE "Apple_Encrypted"
-#define FDISK_PARTITION_TYPE_AF "Apple_HFS"
-#define FDISK_PARTITION_TYPE_FD "Linux_RAID"
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* !_IOFDISKPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOFilterScheme.h b/i386/include/IOKit/storage/IOFilterScheme.h
deleted file mode 100644
index 406b596..0000000
--- a/i386/include/IOKit/storage/IOFilterScheme.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOFilterScheme
- * @abstract
- * This header contains the IOFilterScheme class definition.
- */
-
-#ifndef _IOFILTERSCHEME_H
-#define _IOFILTERSCHEME_H
-
-/*!
- * @defined kIOFilterSchemeClass
- * @abstract
- * The name of the IOFilterScheme class.
- * @discussion
- * kIOFilterSchemeClass is the name of the IOFilterScheme class.
- */
-
-#define kIOFilterSchemeClass "IOFilterScheme"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOMedia.h>
-#include <IOKit/storage/IOStorage.h>
-
-/*!
- * @class IOFilterScheme
- * @abstract
- * The common base class for all filter scheme
- * objects.
- * @discussion
- * The IOFilterScheme class is the common base class for all filter scheme
- * objects.  It extends the IOStorage class by implementing the appropriate
- * open and close semantics for filter objects (standard semantics are act
- * as a relay for incoming opens, producing one outgoing open for each
- * incoming open).  It also implements the default read and write semantics,
- * which pass all reads and writes through to the provider media unprocessed.
- * For simple schemes, the default behavior is sufficient.  More complex
- * filter schemes such as RAID will want to do extra processing for reads
- * and writes.
- */
-
-class IOFilterScheme : public IOStorage
-{
-    OSDeclareDefaultStructors(IOFilterScheme);
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    /*!
-     * @function handleOpen
-     * @discussion
-     * The handleOpen method grants or denies permission to access this object
-     * to an interested client.  The argument is an IOStorageAccess value that
-     * specifies the level of access desired -- reader or reader-writer.
-     *
-     * This method can be invoked to upgrade or downgrade the access level for
-     * an existing client as well.  The previous access level will prevail for
-     * upgrades that fail, of course.   A downgrade should never fail.  If the
-     * new access level should be the same as the old for a given client, this
-     * method will do nothing and return success.  In all cases, one, singular
-     * close-per-client is expected for all opens-per-client received.
-     *
-     * This implementation replaces the IOService definition of handleOpen().
-     * @param client
-     * Client requesting the open.
-     * @param options
-     * Options for the open.  Set to zero.
-     * @param access
-     * Access level for the open.  Set to kIOStorageAccessReader or
-     * kIOStorageAccessReaderWriter.
-     * @result
-     * Returns true if the open was successful, false otherwise.
-     */
-
-    virtual bool handleOpen(IOService *  client,
-                            IOOptionBits options,
-                            void *       access);
-
-    /*!
-     * @function handleIsOpen
-     * @discussion
-     * The handleIsOpen method determines whether the specified client, or any
-     * client if none is specified, presently has an open on this object.
-     *
-     * This implementation replaces the IOService definition of handleIsOpen().
-     * @param client
-     * Client to check the open state of.  Set to zero to check the open state
-     * of all clients.
-     * @result
-     * Returns true if the client was (or clients were) open, false otherwise.
-     */
-
-    virtual bool handleIsOpen(const IOService * client) const;
-
-    /*!
-     * @function handleClose
-     * @discussion
-     * The handleClose method closes the client's access to this object.
-     *
-     * This implementation replaces the IOService definition of handleClose().
-     * @param client
-     * Client requesting the close.
-     * @param options
-     * Options for the close.  Set to zero.
-     */
-
-    virtual void handleClose(IOService * client, IOOptionBits options);
-
-public:
-
-    using IOStorage::read;
-    using IOStorage::write;
-
-    /*!
-     * @function read
-     * @discussion
-     * Read data from the storage object at the specified byte offset into the
-     * specified buffer, asynchronously.   When the read completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the read.
-     *
-     * For simple filter schemes, the default behavior is to simply pass the
-     * read through to the provider media.  More complex filter schemes such
-     * as RAID will need to do extra processing here.
-     * @param client
-     * Client requesting the read.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void read(IOService *           client,
-                      UInt64                byteStart,
-                      IOMemoryDescriptor *  buffer,
-                      IOStorageAttributes * attributes,
-                      IOStorageCompletion * completion);
-
-    /*!
-     * @function write
-     * @discussion
-     * Write data into the storage object at the specified byte offset from the
-     * specified buffer, asynchronously.   When the write completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the write.
-     *
-     * For simple filter schemes, the default behavior is to simply pass the
-     * write through to the provider media. More complex filter schemes such
-     * as RAID will need to do extra processing here.
-     * @param client
-     * Client requesting the write.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void write(IOService *           client,
-                       UInt64                byteStart,
-                       IOMemoryDescriptor *  buffer,
-                       IOStorageAttributes * attributes,
-                       IOStorageCompletion * completion);
-
-    /*!
-     * @function synchronizeCache
-     * @discussion
-     * Flush the cached data in the storage object, if any, synchronously.
-     * @param client
-     * Client requesting the cache synchronization.
-     * @result
-     * Returns the status of the cache synchronization.
-     */
-
-    virtual IOReturn synchronizeCache(IOService * client);
-
-    /*!
-     * @function discard
-     * @discussion
-     * Delete unused data from the storage object at the specified byte offset,
-     * synchronously.
-     * @param client
-     * Client requesting the operation.
-     * @param byteStart
-     * Starting byte offset for the operation.
-     * @param byteCount
-     * Size of the operation.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn discard(IOService * client,
-                             UInt64      byteStart,
-                             UInt64      byteCount);
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method
-     * to return a more specific subclass of OSObject -- an IOMedia.  This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOMedia * getProvider() const;
-
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  0);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  1);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  2);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  3);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  4);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  5);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  6);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  7);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  8);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme,  9);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 10);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 11);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 12);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 13);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 14);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 15);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 16);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 17);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 18);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 19);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 20);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 21);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 22);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 23);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 24);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 25);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 26);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 27);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 28);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 29);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 30);
-    OSMetaClassDeclareReservedUnused(IOFilterScheme, 31);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOFILTERSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOFireWireStorageCharacteristics.h b/i386/include/IOKit/storage/IOFireWireStorageCharacteristics.h
deleted file mode 100644
index 710f29f..0000000
--- a/i386/include/IOKit/storage/IOFireWireStorageCharacteristics.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_
-#define _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_
-
-//
-//	Bridge Characteristics - Characteristics defined for FireWire bridges.
-//
-
-/*!
-@defined kIOPropertyBridgeCharacteristicsKey
-@discussion This key is used to define Bridge Characteristics for a particular
-devices's bridge chipset. It has an associated dictionary which lists the
-bridge characteristics.
-
-Requirement: Optional
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Bridge Characteristics</key>
-	<dict>
-		<key>Bridge Vendor Name</key>
-		<string>Oxford Semiconductor</string>
-		<key>Bridge Model Name</key>
-		<string>FW911</string>
-		<key>Bridge Revision Level</key>
-		<string>3.7</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-
-#define kIOPropertyBridgeCharacteristicsKey		"Bridge Characteristics"
-#define kIOPropertyBridgeVendorNameKey			"Bridge Vendor Name"
-#define kIOPropertyBridgeModelNameKey			"Bridge Model Name"
-#define kIOPropertyBridgeRevisionLevelKey		"Bridge Revision Level"
-
-#endif	/* _IOKIT_IO_FIREWIRE_STORAGE_DEVICE_CHARACTERISTICS_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/storage/IOGUIDPartitionScheme.h b/i386/include/IOKit/storage/IOGUIDPartitionScheme.h
deleted file mode 100644
index 3e197d0..0000000
--- a/i386/include/IOKit/storage/IOGUIDPartitionScheme.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * This header contains the IOGUIDPartitionScheme class definition.
- */
-
-#ifndef _IOGUIDPARTITIONSCHEME_H
-#define _IOGUIDPARTITIONSCHEME_H
-
-#include <IOKit/IOTypes.h>
-
-typedef unsigned char uuid_t[16];
-/*
- * kIOGUIDPartitionSchemeClass is the name of the IOGUIDPartitionScheme class.
- */
-
-#define kIOGUIDPartitionSchemeClass "IOGUIDPartitionScheme"
-
-
-#pragma pack(push, 1)                        /* (enable 8-bit struct packing) */
-
-/* Partition map. */
-
-struct gpt_hdr
-{
-    uint8_t  hdr_sig[8];
-    uint32_t hdr_revision;
-    uint32_t hdr_size;
-    uint32_t hdr_crc_self;
-    uint32_t __reserved;
-    uint64_t hdr_lba_self;
-    uint64_t hdr_lba_alt;
-    uint64_t hdr_lba_start;
-    uint64_t hdr_lba_end;
-    uuid_t   hdr_uuid;
-    uint64_t hdr_lba_table;
-    uint32_t hdr_entries;
-    uint32_t hdr_entsz;
-    uint32_t hdr_crc_table;
-    uint32_t padding;
-};
-
-/* Partition map entry. */
-
-struct gpt_ent
-{
-    uuid_t   ent_type;
-    uuid_t   ent_uuid;
-    uint64_t ent_lba_start;
-    uint64_t ent_lba_end;
-    uint64_t ent_attr;
-    uint16_t ent_name[36];
-};
-
-/* Partition map signature (hdr_sig). */
-
-#define GPT_HDR_SIG "EFI PART"
-
-/* Partition map version (hdr_revision). */
-
-#define GPT_HDR_REVISION 0x00010000
-
-/* Partition map entry flags (ent_attr). */
-
-#define GPT_ENT_ATTR_PLATFORM 0x00000001
-
-#pragma pack(pop)                        /* (reset to default struct packing) */
-
-#endif /* !_IOGUIDPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOMedia.h b/i386/include/IOKit/storage/IOMedia.h
deleted file mode 100644
index 64052ec..0000000
--- a/i386/include/IOKit/storage/IOMedia.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOMedia
- * @abstract
- * This header contains the IOMedia class definition.
- */
-
-#ifndef _IOMEDIA_H
-#define _IOMEDIA_H
-
-#include <IOKit/IOTypes.h>
-
-/*!
- * @defined kIOMediaClass
- * @abstract
- * The name of the IOMedia class.
- */
-
-#define kIOMediaClass "IOMedia"
-
-/*!
- * @defined kIOMediaContentKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaContentKey property has an OSString
- * value and contains a description of the media's
- * contents.  The description is the same as the hint at the time of the
- * object's creation, but it is possible that the description has been overridden
- * by a client (which has probed the media and identified the content correctly)
- * of the media object.  It is more accurate than the hint for this reason.  The
- * string is formed in the likeness of Apple's "Apple_HFS" strings or in the
- * likeness of a UUID.
- */
-
-#define kIOMediaContentKey "Content"
-
-/*!
- * @defined kIOMediaContentHintKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaContentHintKey property has an OSString
- * value and contains a hint of the media's contents.
- * The hint is set at the time of the object's creation, should the creator have
- * a clue as to what it may contain.  The hint string does not change for the
- * lifetime of the object and is formed in the likeness of Apple's "Apple_HFS"
- * strings or in the likeness of a UUID.
- */
-
-#define kIOMediaContentHintKey "Content Hint"
-
-/*!
- * @defined kIOMediaEjectableKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaEjectableKey property has an OSBoolean
- * value and describes whether the media is ejectable
- * from the drive mechanism under software control.  Implies IOMediaRemovable
- * is also true.
- */
-
-#define kIOMediaEjectableKey "Ejectable"
-
-/*!
- * @defined kIOMediaLeafKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaLeafKey property has an OSBoolean value and describes whether the media is a leaf, that is,
- * it is the deepest media object in this branch of the I/O Registry.
- */
-
-#define kIOMediaLeafKey "Leaf"
-
-/*!
- * @defined kIOMediaOpenKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaOpenKey property has an OSBoolean value and describes whether
- * a client presently has an open on this media.
- */
-
-#define kIOMediaOpenKey "Open"
-
-/*!
- * @defined kIOMediaPreferredBlockSizeKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaPreferredBlockSizeKey property has an
- * OSNumber value and describes the media's natural
- * block size in bytes.  This information is useful to clients that want to
- * optimize access to the media.
- */
-
-#define kIOMediaPreferredBlockSizeKey "Preferred Block Size"
-
-/*!
- * @defined kIOMediaRemovableKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaRemovableKey property has an OSBoolean
- * value and describes whether the media is removable
- * from the drive mechanism.
- */
-
-#define kIOMediaRemovableKey "Removable"
-
-/*!
- * @defined kIOMediaSizeKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaSizeKey property has an OSNumber value and describes the total length of the media in
- * bytes.
- */
-
-#define kIOMediaSizeKey "Size"
-
-/*!
- * @defined kIOMediaUUIDKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaUUIDKey property has an OSString value and contains a persistent
- * Universal Unique Identifier for the media if such an identifier is available.
- */
-
-#define kIOMediaUUIDKey "UUID"
-
-/*!
- * @defined kIOMediaWholeKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaWholeKey property has an OSBoolean
- * value and describes whether the media is whole, that is,
- * it represents the whole disk (the physical disk, or a virtual replica
- * thereof).
- */
-
-#define kIOMediaWholeKey "Whole"
-
-/*!
- * @defined kIOMediaWritableKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaWritableKey property has an OSBoolean
- * value and describes whether the media is writable.
- */
-
-#define kIOMediaWritableKey "Writable"
-
-/*!
- * @defined kIOMediaContentMaskKey
- * @abstract
- * A property of IOMedia clients.
- * @discussion
- * The kIOMediaContentMaskKey property has an OSString
- * value and must exist in all IOMedia clients that
- * drive new content (that is, produce new media objects).  When the client
- * matches against the provider media, the value of the client's
- * kIOMediaContentMaskKey property is used to replace the provider's
- * kIOMediaContentKey property.
- */
-
-#define kIOMediaContentMaskKey "Content Mask"
-
-/*!
- * @defined kIOMediaIconKey
- * @abstract
- * A property of any object in the media stack.
- * @discussion
- * kIOMediaIconKey is a property of any object in the media stack that wishes
- * to override the default icon shown for the media objects in the stack.  It
- * is usually defined in a provider object below the media object.  It has an
- * OSDictionary value, with properties identical to the kIOIconKey definition,
- * that is, kCFBundleIdentifierKey and kIOBundleResourceFileKey.
- */
-
-#define kIOMediaIconKey "IOMediaIcon"
-
-/*!
- * @enum IOMediaAttributeMask
- * @discussion
- * The IOMediaAttributeMask bit mask describes various attributes of
- * the media object, such as its ejectability and its removability.
- * @constant kIOMediaAttributeEjectableMask
- * Indicates whether the media is ejectable from the drive mechanism
- * under software control.  Implies kIOMediaAttributeRemovableMask.
- * @constant kIOMediaAttributeRemovableMask
- * Indicates whether the media is removable from the drive mechanism.
- */
-
-enum
-{
-    kIOMediaAttributeEjectableMask = 0x00000001,
-    kIOMediaAttributeRemovableMask = 0x00000002,
-    kIOMediaAttributeReservedMask  = 0xFFFFFFFC
-};
-
-typedef UInt32 IOMediaAttributeMask;
-
-#endif /* !_IOMEDIA_H */
diff --git a/i386/include/IOKit/storage/IOMediaBSDClient.h b/i386/include/IOKit/storage/IOMediaBSDClient.h
deleted file mode 100644
index 56a3117..0000000
--- a/i386/include/IOKit/storage/IOMediaBSDClient.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOMEDIABSDCLIENT_H
-#define _IOMEDIABSDCLIENT_H
-
-#include <sys/disk.h>
-
-#endif /* !_IOMEDIABSDCLIENT_H */
diff --git a/i386/include/IOKit/storage/IOPartitionScheme.h b/i386/include/IOKit/storage/IOPartitionScheme.h
deleted file mode 100644
index 7a1de37..0000000
--- a/i386/include/IOKit/storage/IOPartitionScheme.h
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOPartitionScheme
- * @abstract
- * This header contains the IOPartitionScheme class definition.
- */
-
-#ifndef _IOPARTITIONSCHEME_H
-#define _IOPARTITIONSCHEME_H
-
-/*!
- * @defined kIOPartitionSchemeClass
- * @abstract
- * The name of the IOPartitionScheme class.
- * @discussion
- * kIOPartitionSchemeClass is the name of the IOPartitionScheme class.
- */
-
-#define kIOPartitionSchemeClass "IOPartitionScheme"
-
-/*!
- * @defined kIOMediaLiveKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaLiveKey property has an OSBoolean
- * value and is placed into an IOMedia instance
- * created via the partition scheme.  It describes whether the
- * partition is live, that is, it is up-to-date with respect
- * to the on-disk partition table.
- */
-
-#define kIOMediaLiveKey "Live"
-
-/*!
- * @defined kIOMediaPartitionIDKey
- * @abstract
- * A property of IOMedia objects.
- * @discussion
- * The kIOMediaPartitionIDKey property has an OSNumber
- * value and is placed into an IOMedia instance
- * created via the partition scheme.  It is an ID that differentiates one 
- * partition from the other (within a given scheme).  It is typically an index
- * into the on-disk partition table.
- */
-
-#define kIOMediaPartitionIDKey "Partition ID"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/storage/IOMedia.h>
-#include <IOKit/storage/IOStorage.h>
-
-/*!
- * @class IOPartitionScheme
- * @abstract
- * The common base class for all partition scheme
- * objects.
- * @discussion
- * The IOPartitionScheme class is the common base class for all partition scheme
- * objects.  It extends the IOStorage class by implementing the appropriate open
- * and close semantics for partition objects (standard semantics are to act as a
- * multiplexor for incoming opens,  producing one outgoing open with the correct
- * access).  It also implements the default read and write semantics, which pass
- * all reads and writes through to the provider media unprocessed.    For simple
- * schemes, the default behavior is sufficient.   More complex partition schemes
- * such as RAID will want to do extra processing for reads and writes.
- */
-
-class IOPartitionScheme : public IOStorage
-{
-    OSDeclareDefaultStructors(IOPartitionScheme);
-
-protected:
-
-    struct ExpansionData { /* */ };
-    ExpansionData * _expansionData;
-
-    IOStorageAccess _openLevel;
-    OSSet *         _openReaders;
-    OSSet *         _openReaderWriters;
-
-    /*
-     * Free all of this object's outstanding resources.
-     */
-
-    virtual void free();
-
-    /*!
-     * @function handleOpen
-     * @discussion
-     * The handleOpen method grants or denies permission to access this object
-     * to an interested client.  The argument is an IOStorageAccess value that
-     * specifies the level of access desired -- reader or reader-writer.
-     *
-     * This method can be invoked to upgrade or downgrade the access level for
-     * an existing client as well.  The previous access level will prevail for
-     * upgrades that fail, of course.   A downgrade should never fail.  If the
-     * new access level should be the same as the old for a given client, this
-     * method will do nothing and return success.  In all cases, one, singular
-     * close-per-client is expected for all opens-per-client received.
-     *
-     * This implementation replaces the IOService definition of handleOpen().
-     * @param client
-     * Client requesting the open.
-     * @param options
-     * Options for the open.  Set to zero.
-     * @param access
-     * Access level for the open.  Set to kIOStorageAccessReader or
-     * kIOStorageAccessReaderWriter.
-     * @result
-     * Returns true if the open was successful, false otherwise.
-     */
-
-    virtual bool handleOpen(IOService *  client,
-                            IOOptionBits options,
-                            void *       access);
-
-    /*!
-     * @function handleIsOpen
-     * @discussion
-     * The handleIsOpen method determines whether the specified client, or any
-     * client if none is specified, presently has an open on this object.
-     *
-     * This implementation replaces the IOService definition of handleIsOpen().
-     * @param client
-     * Client to check the open state of.  Set to zero to check the open state
-     * of all clients.
-     * @result
-     * Returns true if the client was (or clients were) open, false otherwise.
-     */
-
-    virtual bool handleIsOpen(const IOService * client) const;
-
-    /*!
-     * @function handleClose
-     * @discussion
-     * The handleClose method closes the client's access to this object.
-     *
-     * This implementation replaces the IOService definition of handleClose().
-     * @param client
-     * Client requesting the close.
-     * @param options
-     * Options for the close.  Set to zero.
-     */
-
-    virtual void handleClose(IOService * client, IOOptionBits options);
-
-    /*
-     * Attach the given media object to the device tree plane.
-     */
-
-#ifdef __LP64__
-    virtual bool attachMediaObjectToDeviceTree(IOMedia * media);
-#else /* !__LP64__ */
-    virtual bool attachMediaObjectToDeviceTree(IOMedia *    media,
-                                               IOOptionBits options = 0); /* 10.5.0 */
-#endif /* !__LP64__ */
-
-    /*
-     * Detach the given media object from the device tree plane.
-     */
-
-#ifdef __LP64__
-    virtual void detachMediaObjectFromDeviceTree(IOMedia * media);
-#else /* !__LP64__ */
-    virtual void detachMediaObjectFromDeviceTree(IOMedia *    media,
-                                                 IOOptionBits options = 0); /* 10.5.0 */
-#endif /* !__LP64__ */
-
-    /*
-     * Updates a set of existing partitions, represented by partitionsOld,
-     * with possible updates from a rescan of the disk, represented by
-     * partitionsNew.  It returns a new set of partitions with the results,
-     * removing partitions from partitionsOld where applicable, adding
-     * partitions from partitionsNew where applicable, and folding in property
-     * changes to partitions from partitionsNew into partitionsOld where
-     * applicable.
-     */
-
-    virtual OSSet * juxtaposeMediaObjects(OSSet * partitionsOld,
-                                          OSSet * partitionsNew); /* 10.5.0 */
-
-public:
-
-    using IOStorage::read;
-    using IOStorage::write;
-
-    /*
-     * Initialize this object's minimal state.
-     */
-
-    virtual bool init(OSDictionary * properties = 0);
-
-    /*!
-     * @function read
-     * @discussion
-     * Read data from the storage object at the specified byte offset into the
-     * specified buffer, asynchronously.   When the read completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the read.
-     *
-     * For simple partition schemes, the default behavior is to simply pass the
-     * read through to the provider media.  More complex partition schemes such
-     * as RAID will need to do extra processing here.
-     * @param client
-     * Client requesting the read.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void read(IOService *           client,
-                      UInt64                byteStart,
-                      IOMemoryDescriptor *  buffer,
-                      IOStorageAttributes * attributes,
-                      IOStorageCompletion * completion);
-
-    /*!
-     * @function write
-     * @discussion
-     * Write data into the storage object at the specified byte offset from the
-     * specified buffer, asynchronously.   When the write completes, the caller
-     * will be notified via the specified completion action.
-     *
-     * The buffer will be retained for the duration of the write.
-     *
-     * For simple partition schemes, the default behavior is to simply pass the
-     * write through to the provider media. More complex partition schemes such
-     * as RAID will need to do extra processing here.
-     * @param client
-     * Client requesting the write.
-     * @param byteStart
-     * Starting byte offset for the data transfer.
-     * @param buffer
-     * Buffer for the data transfer.  The size of the buffer implies the size of
-     * the data transfer.
-     * @param attributes
-     * Attributes of the data transfer.  See IOStorageAttributes.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     * @param completion
-     * Completion routine to call once the data transfer is complete.  It is the
-     * responsibility of the callee to maintain the information for the duration
-     * of the data transfer, as necessary.
-     */
-
-    virtual void write(IOService *           client,
-                       UInt64                byteStart,
-                       IOMemoryDescriptor *  buffer,
-                       IOStorageAttributes * attributes,
-                       IOStorageCompletion * completion);
-
-    /*!
-     * @function synchronizeCache
-     * @discussion
-     * Flush the cached data in the storage object, if any, synchronously.
-     * @param client
-     * Client requesting the cache synchronization.
-     * @result
-     * Returns the status of the cache synchronization.
-     */
-
-    virtual IOReturn synchronizeCache(IOService * client);
-
-    /*!
-     * @function discard
-     * @discussion
-     * Delete unused data from the storage object at the specified byte offset,
-     * synchronously.
-     * @param client
-     * Client requesting the operation.
-     * @param byteStart
-     * Starting byte offset for the operation.
-     * @param byteCount
-     * Size of the operation.
-     * @result
-     * Returns the status of the operation.
-     */
-
-    virtual IOReturn discard(IOService * client,
-                             UInt64      byteStart,
-                             UInt64      byteCount);
-
-    /*
-     * Obtain this object's provider.  We override the superclass's method
-     * to return a more specific subclass of OSObject -- an IOMedia.  This
-     * method serves simply as a convenience to subclass developers.
-     */
-
-    virtual IOMedia * getProvider() const;
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  0);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  1);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  2);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  0);
-    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  1);
-    OSMetaClassDeclareReservedUsed(IOPartitionScheme,  2);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  3);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  4);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  5);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  6);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  7);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  8);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme,  9);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 10);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 11);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 12);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 13);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 14);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 15);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 16);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 17);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 18);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 19);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 20);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 21);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 22);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 23);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 24);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 25);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 26);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 27);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 28);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 29);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 30);
-    OSMetaClassDeclareReservedUnused(IOPartitionScheme, 31);
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOPARTITIONSCHEME_H */
diff --git a/i386/include/IOKit/storage/IOStorage.h b/i386/include/IOKit/storage/IOStorage.h
deleted file mode 100644
index d5725c2..0000000
--- a/i386/include/IOKit/storage/IOStorage.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
- * @header IOStorage
- * @abstract
- * This header contains the IOStorage class definition.
- */
-
-#ifndef _IOSTORAGE_H
-#define _IOSTORAGE_H
-
-#include <IOKit/IOTypes.h>
-
-/*!
- * @defined kIOStorageClass
- * @abstract
- * The name of the IOStorage class.
- */
-
-#define kIOStorageClass "IOStorage"
-
-/*!
- * @defined kIOStorageCategory
- * @abstract
- * kIOStorageCategory is a value for IOService's kIOMatchCategoryKey property.
- * @discussion
- * The kIOStorageCategory value is the standard value for the IOService property
- * kIOMatchCategoryKey ("IOMatchCategory") for all storage drivers.  All storage
- * objects that expect to drive new content (that is, produce new media objects)
- * are expected to compete within the kIOStorageCategory namespace.
- *
- * See the IOService documentation for more information on match categories.
- */
-
-#define kIOStorageCategory "IOStorage"                /* (as IOMatchCategory) */
-
-/*!
- * @defined kIOStorageFeaturesKey
- * @abstract
- * A property of any object in the storage stack.
- * @discussion
- * kIOStorageFeaturesKey is a property of any object in the storage stack that
- * wishes to express support of additional features, such as Force Unit Access.
- * It is typically defined in the device object below the block storage driver
- * object.  It has an OSDictionary value, where each entry describes one given
- * feature.
- */
-
-#define kIOStorageFeaturesKey "IOStorageFeatures"
-
-/*!
- * @defined kIOStorageFeatureDiscard
- * @abstract
- * Describes the presence of the Discard feature.
- * @discussion
- * This property describes the ability of the storage stack to delete unused
- * data from the media.  It is one of the feature entries listed under the top-
- * level kIOStorageFeaturesKey property table.  It has an OSBoolean value.
- */
-
-#define kIOStorageFeatureDiscard "Discard"
-
-/*!
- * @defined kIOStorageFeatureForceUnitAccess
- * @abstract
- * Describes the presence of the Force Unit Access feature.
- * @discussion
- * This property describes the ability of the storage stack to force a request
- * to access the media.  It is one of the feature entries listed under the top-
- * level kIOStorageFeaturesKey property table.  It has an OSBoolean value.
- */
-
-#define kIOStorageFeatureForceUnitAccess "Force Unit Access"
-
-#ifdef KERNEL
-#ifdef __cplusplus
-
-/*
- * Kernel
- */
-
-#include <IOKit/assert.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOService.h>
-
-/*!
- * @enum IOStorageAccess
- * @discussion
- * The IOStorageAccess enumeration describes the possible access levels for open
- * requests.
- * @constant kIOStorageAccessNone
- * No access is requested; should not be passed to open().
- * @constant kIOStorageAccessReader
- * Read-only access is requested.
- * @constant kIOStorageAccessReaderWriter
- * Read and write access is requested.
- * @constant kIOStorageAccessSharedLock
- * Shared access is requested.
- * @constant kIOStorageAccessExclusiveLock
- * Exclusive access is requested.
- */
-
-enum
-{
-    kIOStorageAccessNone          = 0x00,
-    kIOStorageAccessReader        = 0x01,
-    kIOStorageAccessReaderWriter  = 0x03,
-    kIOStorageAccessSharedLock    = 0x04,
-    kIOStorageAccessExclusiveLock = 0x08
-};
-
-typedef UInt32 IOStorageAccess;
-
-/*!
- * @enum IOStorageOptions
- * @discussion
- * Options for read and write storage requests.
- * @constant kIOStorageOptionForceUnitAccess
- * Force the request to access the media.
- */
-
-enum
-{
-    kIOStorageOptionNone            = 0x00000000,
-    kIOStorageOptionForceUnitAccess = 0x00000001,
-    kIOStorageOptionReserved        = 0xFFFFFFFE
-};
-
-typedef UInt32 IOStorageOptions;
-
-/*!
- * @struct IOStorageAttributes
- * @discussion
- * Attributes of read and write storage requests.
- * @field options
- * Options for the request.  See IOStorageOptions.
- * @field reserved
- * Reserved for future use.  Set to zero.
- */
-
-struct IOStorageAttributes
-{
-    IOStorageOptions options;
-    UInt32           reserved0032;
-    UInt64           reserved0064;
-#ifdef __LP64__
-    UInt64           reserved0128;
-    UInt64           reserved0192;
-#endif /* __LP64__ */
-};
-
-/*!
- * @typedef IOStorageCompletionAction
- * @discussion
- * The IOStorageCompletionAction declaration describes the C (or C++) completion
- * routine that is called once an asynchronous storage operation completes.
- * @param target
- * Opaque client-supplied pointer (or an instance pointer for a C++ callback).
- * @param parameter
- * Opaque client-supplied pointer.
- * @param status
- * Status of the data transfer.
- * @param actualByteCount
- * Actual number of bytes transferred in the data transfer.
- */
-
-typedef void (*IOStorageCompletionAction)(void *   target,
-                                          void *   parameter,
-                                          IOReturn status,
-                                          UInt64   actualByteCount);
-
-/*!
- * @struct IOStorageCompletion
- * @discussion
- * The IOStorageCompletion structure describes the C (or C++) completion routine
- * that is called once an asynchronous storage operation completes.   The values
- * passed for the target and parameter fields will be passed to the routine when
- * it is called.
- * @field target
- * Opaque client-supplied pointer (or an instance pointer for a C++ callback).
- * @field action
- * Completion routine to call on completion of the data transfer.
- * @field parameter
- * Opaque client-supplied pointer.
- */
-
-struct IOStorageCompletion
-{
-    void *                    target;
-    IOStorageCompletionAction action;
-    void *                    parameter;
-};
-
-#endif /* __cplusplus */
-#endif /* KERNEL */
-#endif /* !_IOSTORAGE_H */
diff --git a/i386/include/IOKit/storage/IOStorageDeviceCharacteristics.h b/i386/include/IOKit/storage/IOStorageDeviceCharacteristics.h
deleted file mode 100644
index 19a73a2..0000000
--- a/i386/include/IOKit/storage/IOStorageDeviceCharacteristics.h
+++ /dev/null
@@ -1,659 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_
-#define _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_
-
-#include <IOKit/storage/IOStorageProtocolCharacteristics.h>
-
-/*
- *	Device Characteristics - Characteristics defined for devices.
- */
-
-/*!
-@defined kIOPropertyDeviceCharacteristicsKey
-@discussion This key is used to define Device Characteristics for a particular
-device and it has an associated dictionary which lists the
-device characteristics. The device characteristics are Command Set specific
-and are listed in the header files for each command set.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyDeviceCharacteristicsKey		"Device Characteristics"
-
-
-/*!
-@defined kIOPropertyVendorNameKey
-@discussion This key is used to define the Vendor Name for a particular device
-and it has an associated string.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyVendorNameKey				"Vendor Name"
-
-
-/*!
-@defined kIOPropertyProductNameKey
-@discussion This key is used to define the Product Name for a particular device
-and it has an associated string.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyProductNameKey				"Product Name"
-
-
-/*!
-@defined kIOPropertyProductRevisionLevelKey
-@discussion This key is used to define the Product Revision Level for a
-particular device and it has an associated string.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyProductRevisionLevelKey		"Product Revision Level"
-
-
-/*!
-@defined kIOPropertyProductSerialNumberKey
-@discussion This key is used to define the Product Serial Number for a
-particular device and it has an associated data.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Serial Number</key>
-		<string>123456789</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyProductSerialNumberKey		"Serial Number"
-
-
-/*!
-@defined kIOPropertySupportedCDFeaturesKey
-@discussion This key is used to define the supported CD Features for a
-particular optical device and it has an associated bitfield. See
-<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
-bits and associated bitmasks.
-
-Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>SuperDrive</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>CD Features</key>
-		<integer>1663</integer>
-		<key>DVD Features</key>
-		<integer>103</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySupportedCDFeaturesKey		"CD Features"
-
-
-/*!
-@defined kIOPropertySupportedDVDFeaturesKey
-@discussion This key is used to define the supported DVD Features for a
-particular optical device and it has an associated bitfield. See
-<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
-bits and associated bitmasks.
-
-Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>SuperDrive</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>CD Features</key>
-		<integer>1663</integer>
-		<key>DVD Features</key>
-		<integer>103</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySupportedDVDFeaturesKey		"DVD Features"
-
-
-/*!
-@defined kIOPropertySupportedBDFeaturesKey
-@discussion This key is used to define the supported BD Features for a
-particular optical device and it has an associated bitfield. See
-<IOKit/scsi/IOSCSIMultimediaCommandsDevice.h> for definitions of the
-bits and associated bitmasks.
-
-Requirement: Mandatory for optical devices (Peripheral Device Type 05h).
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>SuperDrive</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>CD Features</key>
-		<integer>1663</integer>
-		<key>DVD Features</key>
-		<integer>103</integer>
-		<key>BD Features</key>
-		<integer>21</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySupportedBDFeaturesKey		"BD Features"
-
-
-/*!
-@defined kIOPropertyRigidDiskGeometryKey
-@discussion This key is used to define a dictionary containing
-rigid disk geometry information.
-
-Requirement: Optional. If a device publishes this dictionary, it
-must publish all key/value pairs which are deemed Mandatory.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Rigid Disk Geometry</key>
-		<dict>
-			<key>Sector Count per Track</key>
-			<integer>12345</integer>
-			<key>Head Count</key>
-			<integer>12</integer>
-			<key>Cylinder Count</key>
-			<integer>12345</integer>
-			<key>Bytes per Physical Sector</key>
-			<integer>512</integer>
-		</dict>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyRigidDiskGeometryKey			"Rigid Disk Geometry"
-
-
-/*!
-@defined kIOPropertySectorCountPerTrackKey
-@discussion This key is used to define the number of sectors per
-each track for a particular medium.
-
-Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Rigid Disk Geometry</key>
-		<dict>
-			<key>Sector Count per Track</key>
-			<integer>12345</integer>
-		</dict>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySectorCountPerTrackKey		"Sector Count per Track"
-
-
-/*!
-@defined kIOPropertyHeadCountKey
-@discussion This key is used to define the number of heads for
-a particular medium.
-
-Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Rigid Disk Geometry</key>
-		<dict>
-			<key>Sector Count per Track</key>
-			<integer>12345</integer>
-			<key>Head Count</key>
-			<integer>12</integer>
-			<key>Cylinder Count</key>
-			<integer>12345</integer>
-			<key>Bytes per Physical Sector</key>
-			<integer>512</integer>
-		</dict>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyHeadCountKey					"Head Count"
-
-
-/*!
-@defined kIOPropertyCylinderCountKey
-@discussion This key is used to define the number of heads for
-a particular medium.
-
-Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Rigid Disk Geometry</key>
-		<dict>
-			<key>Sector Count per Track</key>
-			<integer>12345</integer>
-			<key>Head Count</key>
-			<integer>12</integer>
-			<key>Cylinder Count</key>
-			<integer>12345</integer>
-			<key>Bytes per Physical Sector</key>
-			<integer>512</integer>
-		</dict>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyCylinderCountKey				"Cylinder Count"
-
-
-/*!
-@defined kIOPropertyBytesPerPhysicalSectorKey
-@discussion This key is used to define the number of heads for
-a particular medium.
-
-Requirement: Mandatory element of the Rigid Disk Geometry dictionary.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Rigid Disk Geometry</key>
-		<dict>
-			<key>Sector Count per Track</key>
-			<integer>12345</integer>
-			<key>Head Count</key>
-			<integer>12</integer>
-			<key>Cylinder Count</key>
-			<integer>12345</integer>
-			<key>Bytes per Physical Sector</key>
-			<integer>512</integer>
-		</dict>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyBytesPerPhysicalSectorKey	"Bytes per Physical Sector"
-
-
-/*!
-@defined kIOPropertyPhysicalBlockSizeKey
-@discussion This key is used to define the physical block size of a hard disk drive.
-
-Requirement: Mandatory for hard disk drives with physical block size other than 512 bytes.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Physical Block Size</key>
-		<integer>4096</integer>
-		<key>Logical Block Size</key>
-		<integer>512</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalBlockSizeKey		"Physical Block Size"
-
-
-/*!
-@defined kIOPropertyLogicalBlockSizeKey
-@discussion This key is used to define the logical block size of a hard disk drive.
-
-Requirement: Mandatory for hard disk drives with logical block size other than 512 bytes
-or that does not match its physical block size.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>Apple</string>
-		<key>Product Name</key>
-		<string>iPod</string>
-		<key>Product Revision Level</key>
-		<string>1.0</string>
-		<key>Physical Block Size</key>
-		<integer>4096</integer>
-		<key>Logical Block Size</key>
-		<integer>512</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyLogicalBlockSizeKey		"Logical Block Size"
-
-
-/*!
-@defined kIOPropertyTargetDiskModeKey
-@discussion This key is used to indicate the device is another computer in Target Disk Mode.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>AAPL</string>
-		<key>Product Name</key>
-		<string>FireWire Target</string>
-		<key>Product Revision Level</key>
-		<string>0000</string>
-		<key>Target Disk Mode</key>
-		<true/>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyTargetDiskModeKey		"Target Disk Mode"
-
-
-/*!
-@defined kIOPropertyMediumTypeKey
-@discussion This key is used to indicate the medium type of the device.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>AAPL</string>
-		<key>Product Name</key>
-		<string>FireWire Target</string>
-		<key>Product Revision Level</key>
-		<string>0000</string>
-		<key>Medium Type</key>
-		<string>Rotational</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyMediumTypeKey		"Medium Type"
-
-
-/*!
-@defined kIOPropertyMediumTypeRotationalKey
-@discussion This key is used to indicate the medium type of the device is rotational.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>AAPL</string>
-		<key>Product Name</key>
-		<string>FireWire Target</string>
-		<key>Product Revision Level</key>
-		<string>0000</string>
-		<key>Medium Type</key>
-		<string>Rotational</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyMediumTypeRotationalKey		"Rotational"
-
-
-/*!
-@defined kIOPropertyMediumTypeSolidStateKey
-@discussion This key is used to indicate the medium type of the device is solid state.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>AAPL</string>
-		<key>Product Name</key>
-		<string>FireWire Target</string>
-		<key>Product Revision Level</key>
-		<string>0000</string>
-		<key>Medium Type</key>
-		<string>Solid State</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyMediumTypeSolidStateKey		"Solid State"
-
-
-/*!
-@defined kIOPropertyMediumRotationRateKey
-@discussion This key is used to indicate the medium rotation rate in RPM of the device.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Device Characteristics</key>
-	<dict>
-		<key>Vendor Name</key>
-		<string>AAPL</string>
-		<key>Product Name</key>
-		<string>FireWire Target</string>
-		<key>Product Revision Level</key>
-		<string>0000</string>
-		<key>Rotation Rate</key>
-		<integer>7200</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyMediumRotationRateKey		"Rotation Rate"
-
-
-#endif	/* _IOKIT_IO_STORAGE_DEVICE_CHARACTERISTICS_H_ */
diff --git a/i386/include/IOKit/storage/IOStorageProtocolCharacteristics.h b/i386/include/IOKit/storage/IOStorageProtocolCharacteristics.h
deleted file mode 100644
index 18a726f..0000000
--- a/i386/include/IOKit/storage/IOStorageProtocolCharacteristics.h
+++ /dev/null
@@ -1,1758 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_
-#define _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_
-
-
-/*
- *	Protocol Characteristics - Characteristics defined for protocols.
- */
-
-
-/*!
-@defined kIOPropertyProtocolCharacteristicsKey
-@discussion This key is used to define Protocol Characteristics for a particular
-protocol and it has an associated dictionary which lists the
-protocol characteristics.
-
-Requirement: Mandatory
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>ATAPI</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define	kIOPropertyProtocolCharacteristicsKey		"Protocol Characteristics"
-
-
-/*!
-@defined kIOPropertySCSIInitiatorIdentifierKey
-@discussion An identifier that will uniquely identify this SCSI Initiator for the
-SCSI Domain.
-
-Requirement: Mandatory for SCSI Parallel Interface, SAS,
-and Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-		<key>SCSI Initiator Identifier</key>
-		<integer>7</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIInitiatorIdentifierKey		"SCSI Initiator Identifier"
-
-
-/*!
-@defined kIOPropertySCSIDomainIdentifierKey
-@discussion An identifier that will uniquely identify this SCSI Domain for the
-Physical Interconnect type. This identifier is only guaranteed to be unique for
-any given Physical Interconnect and is not guaranteed to be the same across
-restarts or shutdowns.
-
-Requirement: Mandatory for SCSI Parallel Interface and Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-		<key>SCSI Domain Identifier</key>
-		<integer>0</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIDomainIdentifierKey			"SCSI Domain Identifier"
-
-
-/*!
-@defined kIOPropertySCSITargetIdentifierKey
-@discussion This is the SCSI Target Identifier for a given SCSI Target Device.
-
-Requirement: Mandatory for SCSI Parallel Interface and Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-		<key>SCSI Target Identifier</key>
-		<integer>3</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSITargetIdentifierKey			"SCSI Target Identifier"
-
-
-/*!
-@defined kIOPropertySCSILogicalUnitNumberKey
-@discussion This key is the SCSI Logical Unit Number for the device server
-controlled by the driver.
-
-Requirement: Mandatory for SCSI Parallel Interface, SAS, and Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-		<key>SCSI Logical Unit Number</key>
-		<integer>2</integer>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSILogicalUnitNumberKey			"SCSI Logical Unit Number"
-
-
-/*!
-@defined kIOPropertySASAddressKey
-@discussion This key is the unique 64-bit SAS Address for the device server
-node located at this port, or for the initiating host port.
-
-Requirement: Mandatory for SAS.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SAS</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>SAS Address</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-
-Example2:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>SAS Address</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySASAddressKey					"SAS Address"
-
-
-/*!
-@defined kIOPropertyFibreChannelNodeWorldWideNameKey
-@discussion This key is the unique 64-bit World Wide Name for the device server
-node located at this port, or for the initiating host port.
-
-Requirement: Mandatory for Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>Node World Wide Name</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-
-Example2:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Node World Wide Name</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelNodeWorldWideNameKey		"Node World Wide Name"
-
-
-/*!
-@defined kIOPropertyFibreChannelPortWorldWideNameKey
-@discussion This key is the unique 64-bit World Wide Name for the port.
-
-Requirement: Mandatory for Fibre Channel Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>Port World Wide Name</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-
-Example2:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port World Wide Name</key>
-		<data>0011223344556677</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelPortWorldWideNameKey		"Port World Wide Name"
-
-
-/*!
-@defined kIOPropertyFibreChannelAddressIdentifierKey
-@discussion This key is the 24-bit Address Identifier (S_ID or D_ID) as
-defined in the FC-FS specification. It contains the address identifier
-of the source or destination Nx_Port.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional (only necessary for Fibre Channel Interface).
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>Address Identifier</key>
-		<data>001122</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-
-Example2:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Address Identifier</key>
-		<data>001122</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelAddressIdentifierKey		"Address Identifier"
-
-
-/*!
-@defined kIOPropertyFibreChannelALPAKey
-@discussion This key is the 8-bit Arbitrated Loop Physical Address
-(AL_PA) value as defined in the FC-AL-2 specification.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional (only necessary for Fibre Channel Interface).
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>AL_PA</key>
-		<data>04</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-
-Example2:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>AL_PA</key>
-		<data>04</data>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelALPAKey					"AL_PA"
-
-
-/*!
-@defined kIOPropertyPortStatusKey
-@discussion This key is associated with the current port
-status of the physical link. The port status is either
-"Link Established", "No Link Established", or "Link Failed".
-
-Note: This value can change when the port status changes. It
-is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Status</key>
-		<string>Link Established</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortStatusKey						"Port Status"
-
-
-/*!
-@defined kIOPropertyPortSpeedKey
-@discussion This key is associated with the current port
-speed. The port speed can be any valid speed for the interconnect.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (1 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedKey							"Port Speed"
-
-
-/*!
-@defined kIOPropertyPortTopologyKey
-@discussion This key is associated with the current port
-topology. The port topology can be any valid topology for the interconnect.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>Automatic (N_Port)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyKey						"Port Topology"
-
-
-/*!
-@defined kIOPropertyPortDescriptionKey
-@discussion This key is associated with an human
-readable port description. Examples include
-"Channel A", "Port 1", etc.
-
-Requirement: Optional for all interconnects.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Description</key>
-		<string>Channel A</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortDescriptionKey					"Port Description"
-
-
-/*!
-@defined kIOPropertySCSIParallelSignalingTypeKey
-@discussion This key is associated with the signaling type
-used for this SCSI Parallel bus. Valid values include
-"High Voltage Differential", "Low Voltage Differential",
-and "Single Ended".
-
-Requirement: Optional for SCSI Parallel Interface. Not
-defined for any other physical interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>SCSI Parallel Signaling Type</key>
-		<string>High Voltage Differential</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIParallelSignalingTypeKey			"SCSI Parallel Signaling Type"
-
-
-/*!
-@defined kIOPropertyFibreChannelCableDescriptionKey
-@discussion This key is associated with the cabling type
-used for this Fibre Channel port. Valid values include
-"Copper" and "Fiber Optic".
-
-Requirement: Optional for Fibre Channel Interface. Not
-defined for any other physical interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Fibre Channel Cabling Type</key>
-		<string>Copper</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelCableDescriptionKey		"Fibre Channel Cabling Type"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeKey
-@discussion This key is used to define the Physical Interconnect to which
-a device is attached.
-
-Requirement: Mandatory.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeKey		"Physical Interconnect"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectLocationKey
-@discussion This key is used to define the Physical Interconnect
-Location.
-
-Requirement: Mandatory.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectLocationKey	"Physical Interconnect Location"
-
-
-/*!
-@defined kIOPropertySCSIProtocolMultiInitKey
-@discussion This protocol characteristics key is used to inform the system
-that the protocol supports having multiple devices that act as initiators.
-
-Requirement: Optional.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-		<key>Multiple Initiators</key>
-		<string>True</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIProtocolMultiInitKey			"Multiple Initiators"
-
-
-/*
- *	Values - Values for the characteristics defined above.
- */
-
-
-/*!
-@defined kIOPropertyInternalKey
-@discussion This key defines the value of Internal for the key
-kIOPropertyPhysicalInterconnectLocationKey. If the device is
-connected to an internal bus, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>ATA</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyInternalKey						"Internal"
-
-
-/*!
-@defined kIOPropertyExternalKey
-@discussion This key defines the value of External for the key
-kIOPropertyPhysicalInterconnectLocationKey. If the device is
-connected to an external bus, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyExternalKey						"External"
-
-
-/*!
-@defined kIOPropertyInternalExternalKey
-@discussion This key defines the value of Internal/External for the key
-kIOPropertyPhysicalInterconnectLocationKey. If the device is connected
-to a bus and it is indeterminate whether it is internal or external,
-this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal/External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyInternalExternalKey				"Internal/External"
-
-
-/*!
-@defined kIOPropertyInterconnectFileKey
-@discussion This key defines the value of File for the key
-kIOPropertyPhysicalInterconnectLocationKey. If the device is a file
-that is being represented as a storage device, this key should be set.
-
-NOTE: This key should only be used when the Physical Interconnect is set to
-Virtual Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Virtual Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>File</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyInterconnectFileKey						"File"
-
-
-/*!
-@defined kIOPropertyInterconnectRAMKey
-@discussion This key defines the value of RAM for the key
-kIOPropertyPhysicalInterconnectLocationKey. If the device is system memory
-that is being represented as a storage device, this key should be set.
-
-NOTE: This key should only be used when the Physical Interconnect is set to
-Virtual Interface.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Virtual Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>RAM</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyInterconnectRAMKey						"RAM"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeATA
-@discussion This key defines the value of ATA for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to an ATA bus, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>ATA</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeATA				"ATA"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeSerialATA
-@discussion This key defines the value of SATA for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a SATA bus, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SATA</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeSerialATA		"SATA"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeSerialAttachedSCSI
-@discussion This key defines the value of SAS for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a SAS bus, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SAS</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeSerialAttachedSCSI	"SAS"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeATAPI
-@discussion This key defines the value of ATAPI for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to an ATA bus and follows the ATAPI command specification, this key
-should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>ATAPI</string>
-		<key>Physical Interconnect Location</key>
-		<string>Internal</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeATAPI			"ATAPI"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeUSB
-@discussion This key defines the value of USB for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a USB port, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>USB</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeUSB				"USB"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeFireWire
-@discussion This key defines the value of USB for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a FireWire port, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>FireWire</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeFireWire			"FireWire"
-
-
-/*!
- @defined kIOPropertyPhysicalInterconnectTypeSecureDigital
- @discussion This key defines the value of Secure Digital for the key
- kIOPropertyPhysicalInterconnectTypeSecureDigital. If the device is a
- connected to a Secure Digital port and follows the Secure Digital 
- specification, this key should be set. 
- 
- Example:
- <pre>
- @textblock
- <dict>
-    <key>Protocol Characteristics</key>
-    <dict>
-        <key>Physical Interconnect</key>
-        <string>Secure Digital</string>
-        <key>Physical Interconnect Location</key>
-        <string>Internal</string>
-    </dict>
- </dict>
- @/textblock
- </pre>
- */
-#define kIOPropertyPhysicalInterconnectTypeSecureDigital	"Secure Digital"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeSCSIParallel
-@discussion This key defines the value of SCSI Parallel Interface for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a SCSI Parallel port, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>SCSI Parallel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeSCSIParallel		"SCSI Parallel Interface"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeFibreChannel
-@discussion This key defines the value of Fibre Channel Interface for the key
-kIOPropertyPhysicalInterconnectTypeKey. If the device is connected
-to a Fibre Channel port, this key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Fibre Channel Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>External</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeFibreChannel		"Fibre Channel Interface"
-
-
-/*!
-@defined kIOPropertyPhysicalInterconnectTypeVirtual
-@discussion This key defines the value of Virtual Interface for the key
-kIOPropertyPhysicalInterconnectTypeVirtual. If the device is being made to look
-like a storage device, but is not such in actuality, such as a File or RAM, this
-key should be set.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Protocol Characteristics</key>
-	<dict>
-		<key>Physical Interconnect</key>
-		<string>Virtual Interface</string>
-		<key>Physical Interconnect Location</key>
-		<string>File</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPhysicalInterconnectTypeVirtual		"Virtual Interface"
-
-
-/*!
-@defined kIOPropertyPortStatusLinkEstablishedKey
-@discussion This key defines the value of Link Established for the key
-kIOPropertyPortStatusKey.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Status</key>
-		<string>Link Established</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortStatusLinkEstablishedKey			"Link Established"
-
-
-/*!
-@defined kIOPropertyPortStatusNoLinkEstablishedKey
-@discussion This key defines the value of No Link Established for the key
-kIOPropertyPortStatusKey.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Status</key>
-		<string>No Link Established</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortStatusNoLinkEstablishedKey		"No Link Established"
-
-
-/*!
-@defined kIOPropertyPortStatusLinkFailedKey
-@discussion This key defines the value of Link Failed for the key
-kIOPropertyPortStatusKey.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Status</key>
-		<string>Link Failed</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortStatusLinkFailedKey				"Link Failed"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomaticKey
-@discussion This key defines the value of Automatic for the key
-kIOPropertyPortSpeedKey. If the speed of the port is automatically
-adjusted by the host/device and a definitive speed is not known,
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomaticKey				"Automatic"
-
-
-/*!
-@defined kIOPropertyPortSpeed1GigabitKey
-@discussion This key defines the value of 1 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 1 Gigabit
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>1 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed1GigabitKey					"1 Gigabit"
-
-/*!
-@defined kIOPropertyPortSpeed1_5GigabitKey
-@discussion This key defines the value of 1.5 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 1.5 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>1.5 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed1_5GigabitKey				"1.5 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeed2GigabitKey
-@discussion This key defines the value of 2 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 2 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>2 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed2GigabitKey					"2 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeed3GigabitKey
-@discussion This key defines the value of 3 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 3 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>3 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed3GigabitKey					"3 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeed4GigabitKey
-@discussion This key defines the value of 4 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 4 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>4 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed4GigabitKey					"4 Gigabit"
-
-/*!
-@defined kIOPropertyPortSpeed6GigabitKey
-@discussion This key defines the value of 6 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 6 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>6 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed6GigabitKey					"6 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeed8GigabitKey
-@discussion This key defines the value of 8 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 8 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>8 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed8GigabitKey					"8 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeed10GigabitKey
-@discussion This key defines the value of 10 Gigabit for the key
-kIOPropertyPortSpeedKey. If the speed of the port is 10 Gigabits
-per second and is not automatically determined (i.e. the user
-configured the port to be exactly this speed),
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>10 Gigabit</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeed10GigabitKey				"10 Gigabit"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic1GigabitKey
-@discussion This key defines the value of Automatic (1 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-1 Gigabit per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (1 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic1GigabitKey		"Automatic (1 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic1_5GigabitKey
-@discussion This key defines the value of Automatic (1.5 Gigabit) for the key
-kIOPropertyPortSpeedKey. If the speed of the port is
-1.5 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (1.5 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic1_5GigabitKey		"Automatic (1.5 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic2GigabitKey
-@discussion This key defines the value of Automatic (2 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-2 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (2 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic2GigabitKey		"Automatic (2 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic3GigabitKey
-@discussion This key defines the value of Automatic (3 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-3 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (3 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic3GigabitKey		"Automatic (3 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic4GigabitKey
-@discussion This key defines the value of Automatic (4 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-4 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (4 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic4GigabitKey		"Automatic (4 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic6GigabitKey
-@discussion This key defines the value of Automatic (6 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-6 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (6 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic6GigabitKey		"Automatic (6 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic8GigabitKey
-@discussion This key defines the value of Automatic (8 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-8 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (8 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic8GigabitKey		"Automatic (8 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortSpeedAutomatic10GigabitKey
-@discussion This key defines the value of Automatic (10 Gigabit)
-for the key kIOPropertyPortSpeedKey. If the speed of the port is
-10 Gigabits per second and is automatically determined by host
-software, this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Speed</key>
-		<string>Automatic (10 Gigabit)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortSpeedAutomatic10GigabitKey		"Automatic (10 Gigabit)"
-
-
-/*!
-@defined kIOPropertyPortTopologyAutomaticKey
-@discussion This key defines the value of Automatic for the key
-kIOPropertyPortTopologyKey. If the topology of the port is automatically
-adjusted by the host/device and a definitive topology is not known,
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>Automatic</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyAutomaticKey				"Automatic"
-
-
-/*!
-@defined kIOPropertyPortTopologyNPortKey
-@discussion This key defines the value of N_Port for the key
-kIOPropertyPortTopologyKey. If the topology of the port is an N_Port,
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>N_Port</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyNPortKey					"N_Port"
-
-
-/*!
-@defined kIOPropertyPortTopologyNLPortKey
-@discussion This key defines the value of NL_Port for the key
-kIOPropertyPortTopologyKey. If the topology of the port is an NL_Port,
-this key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>NL_Port</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyNLPortKey				"NL_Port"
-
-
-/*!
-@defined kIOPropertyPortTopologyAutomaticNPortKey
-@discussion This key defines the value of Automatic (N_Port) for the key
-kIOPropertyPortTopologyKey. If the topology of the port is
-N_Port and is automatically determined by host software, this
-key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>Automatic (N_Port)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyAutomaticNPortKey		"Automatic (N_Port)"
-
-
-/*!
-@defined kIOPropertyPortTopologyAutomaticNLPortKey
-@discussion This key defines the value of Automatic (NL_Port) for the key
-kIOPropertyPortTopologyKey. If the topology of the port is
-NL_Port and is automatically determined by host software, this
-key should be used.
-
-Note: This value can change. It is not a static value.
-
-Requirement: Optional for any interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Port Topology</key>
-		<string>Automatic (NL_Port)</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyPortTopologyAutomaticNLPortKey		"Automatic (NL_Port)"
-
-
-/*!
-@defined kIOPropertySCSIParallelSignalingTypeHVDKey
-@discussion This key defines the value of High Voltage Differential for the key
-kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
-High Voltage Differential, this key should be used.
-
-Requirement: Optional for SCSI Parallel Interface interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>SCSI Parallel Signaling Type</key>
-		<string>High Voltage Differential</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIParallelSignalingTypeHVDKey		"High Voltage Differential"
-
-
-/*!
-@defined kIOPropertySCSIParallelSignalingTypeLVDKey
-@discussion This key defines the value of Low Voltage Differential for the key
-kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
-Low Voltage Differential, this key should be used.
-
-Requirement: Optional for SCSI Parallel Interface interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>SCSI Parallel Signaling Type</key>
-		<string>Low Voltage Differential</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIParallelSignalingTypeLVDKey		"Low Voltage Differential"
-
-
-/*!
-@defined kIOPropertySCSIParallelSignalingTypeSEKey
-@discussion This key defines the value of Single Ended for the key
-kIOPropertySCSIParallelSignalingTypeKey. If the signaling type of the port is
-Single Ended, this key should be used.
-
-Requirement: Optional for SCSI Parallel Interface interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>SCSI Parallel Signaling Type</key>
-		<string>Single Ended</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertySCSIParallelSignalingTypeSEKey		"Single Ended"
-
-
-/*!
-@defined kIOPropertyFibreChannelCableDescriptionCopperKey
-@discussion This key defines the value of Copper for the key
-kIOPropertyFibreChannelCableDescriptionKey. If the cabling is
-Copper, this key should be used.
-
-Requirement: Optional for Fibre Channel Interface interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Fibre Channel Cabling Type</key>
-		<string>Copper</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelCableDescriptionCopperKey		"Copper"
-
-
-/*!
-@defined kIOPropertyFibreChannelCableDescriptionFiberOpticKey
-@discussion This key defines the value of Fiber Optic for the key
-kIOPropertyFibreChannelCableDescriptionKey. If the cabling is
-Fiber Optic, this key should be used.
-
-Requirement: Optional for Fibre Channel Interface interconnect.
-
-Example:
-<pre>
-@textblock
-<dict>
-	<key>Controller Characteristics</key>
-	<dict>
-		<key>Fibre Channel Cabling Type</key>
-		<string>Fiber Optic</string>
-	</dict>
-</dict>
-@/textblock
-</pre>
-*/
-#define kIOPropertyFibreChannelCableDescriptionFiberOpticKey	"Fiber Optic"
-
-
-#endif	/* _IOKIT_IO_STORAGE_PROTOCOL_CHARACTERISTICS_H_ */
diff --git a/i386/include/IOKit/storage/ata/.svn/all-wcprops b/i386/include/IOKit/storage/ata/.svn/all-wcprops
deleted file mode 100644
index 730c632..0000000
--- a/i386/include/IOKit/storage/ata/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 64
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/ata
-END
-IOATAStorageDefines.h
-K 25
-svn:wc:ra_dav:version-url
-V 86
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/ata/IOATAStorageDefines.h
-END
-IOATAPIProtocolTransport.h
-K 25
-svn:wc:ra_dav:version-url
-V 91
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/storage/ata/IOATAPIProtocolTransport.h
-END
diff --git a/i386/include/IOKit/storage/ata/.svn/entries b/i386/include/IOKit/storage/ata/.svn/entries
deleted file mode 100644
index dc54b6f..0000000
--- a/i386/include/IOKit/storage/ata/.svn/entries
+++ /dev/null
@@ -1,96 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/storage/ata
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IOATAStorageDefines.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-2636f67bb1c6a3bf217e724e581bbc77
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9421
-
-IOATAPIProtocolTransport.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-216442f064c65df79d52e27fa6006097
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-14901
-
diff --git a/i386/include/IOKit/storage/ata/.svn/text-base/IOATAPIProtocolTransport.h.svn-base b/i386/include/IOKit/storage/ata/.svn/text-base/IOATAPIProtocolTransport.h.svn-base
deleted file mode 100644
index 3356ae7..0000000
--- a/i386/include/IOKit/storage/ata/.svn/text-base/IOATAPIProtocolTransport.h.svn-base
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOATAPIProtocolTransport
-  Contains the class definition for IOATAPIProtocolTransport.
-*/
-
-
-#ifndef _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_
-#define _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_
-
-#define kIOPropertyATAPIMassStorageCharacteristics 		"ATAPI Mass Storage Characteristics"
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-/* General IOKit includes */
-#include <IOKit/IOLib.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOCommandPool.h>
-
-/* IOKit ATA Family includes */
-#include <IOKit/ata/IOATADevice.h>
-#include <IOKit/ata/IOATATypes.h>
-
-/* IOKit ATA Storage includes */
-#include <IOKit/storage/ata/IOATAStorageDefines.h>
-
-/* SCSI Architecture Model Family includes */
-#include <IOKit/scsi/IOSCSIProtocolServices.h>
-
-// Forward class declaration
-class IOATAPIProtocolTransport;
-
-/*! 
-	@typedef ATAPIClientData
-	@param cmd IOATACommand for request.
-	@param self Pointer to the object. 
-	@param scsiTask SCSITaskIdentifier of request. 
-	@discussion This structure is stuffed into the refcon so we can associate which
-	IOATACommand and SCSITaskIdentifier is completing.
-*/
-
-struct ATAPIClientData
-{
-	IOATACommand *				cmd;
-	IOATAPIProtocolTransport *	self;
-	SCSITaskIdentifier			scsiTask;
-};
-typedef struct ATAPIClientData ATAPIClientData;
-
-
-/*!
-	@class IOATAPIProtocolTransport
-	@abstract SCSI Protocol Driver Family for ATAPI Devices. 
-	@discussion IOATAPIProtocolTransport contains all the bus specific support for ATAPI compliant devices.
-	To add vendor specific features or workarounds you will sub-class the appropriate
-	methods of this family. 
-*/
-
-class IOATAPIProtocolTransport : public IOSCSIProtocolServices
-{
-	
-	OSDeclareDefaultStructors ( IOATAPIProtocolTransport )
-	
-public:
-
-	// ---- IOService methods overridden ----
-	
-	bool 			init 	( OSDictionary * propTable );
-	
-	// The start method is called to start our services. If the device
-	// can be controlled by this object, then we return true, else we
-	// return false. start() is usually used to allocate resources once
-	// it is determined that the device can be controlled by this object.
-	virtual bool 	start 	( IOService * provider );
-	
-	// The stop method is called to stop our services. It is primarily
-	// called for deallocation of resources.
-	virtual void 	stop 	( IOService *  provider );
-	
-	// This method is our last chance to free all resources allocated.
-	virtual void	free	( void );
-	
-	
-protected:
-
-	// ---- member variables ----
-	
-	IOATADevice *			fATADevice;
-	ataUnitID				fATAUnitID;
-	ataDeviceType			fATADeviceType;
-	ataSocketType			fATASocketType;
-	atapiConfig				fATAPIPacketConfig;
-	UInt8					fPIOMode;
-	UInt8					fDMAMode;
-	UInt8					fUltraDMAMode;
-	IOCommandGate *			fCommandGate;
-	IOCommandPool *			fCommandPool;
-	IOATACommand *			fResetCommand;
-	IOATACommand *			fConfigCommand;
-	IOATACommand *			fIdentifyCommand;
-	char					fRevision[kSizeOfATARevisionString + 1];
-	char					fModel[kSizeOfATAModelString + 1];
-	bool					fWakeUpResetOccurred;
-	bool					fPhysicallyConnected;
-	
-	// Used for low-power polling support
-	thread_call_t			fPollingThread;
-	
-	UInt16					fDeviceIdentifyData[256];
-	IOMemoryDescriptor *	fDeviceIdentifyBuffer;
-	bool					fResetInProgress;
-
-	// Binary Compatibility instance variable expansion
-	struct ExpansionData
-	{
-		UInt32		fSemaphore;
-		UInt32		fMediaNotifyValue;
-	};
-	ExpansionData * reserved;
-	
-	// ---- IOService methods overridden ----
-	
-	// The message method is used to listen to messages from our provider, the ATA controller.
-	// It sends messages for bus reset notifications and for device removal (such as MediaBay,
-	// PC card, etc.)
-	virtual IOReturn message ( UInt32 type, IOService * provider, void * argument = 0 );
-	
-	// ---- Protocol transport methods overridden ----
-
-	// Send a SCSI Command to the device.  If the command was sent to the
-	// device and is pending completion, the subclass should return true and
-	// return back the kSCSIServiceResponse_Request_In_Process response. 
-	// If the command completes immediately with an error, the subclass will
-	// return true and return back the appropriate status.
-	// if the subclass is currently processing all the commands it can, the
-	// subclass will return false and the command will be resent next time
-	// CommandCompleted is called.  
-	virtual bool SendSCSICommand ( 	SCSITaskIdentifier 		request,
-									SCSIServiceResponse * 	serviceResponse,
-									SCSITaskStatus *		taskStatus );
-		
-	// This is a stub - not implemented in upper layer yet. Eventually, there
-	// will be a way to abort a task or task set and this method will be called.
-	// It will abort any commands which have not been executed by the ATA controller
-	virtual SCSIServiceResponse AbortSCSICommand ( SCSITaskIdentifier request );
-	
-	// The IsProtocolServiceSupported method will return true if the protocol
-	// layer supports the specified feature.
-	virtual bool IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
-	
-	// The HandleProtocolServiceFeature method will return true if the protocol
-	// layer properly handled the specified feature.
-	virtual bool HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
-
-	// ------ Power Management Support ------
-
-	// The HandlePowerOff method is called to do any bus specific activity
-	// necessary before shutting down and going to sleep.
-	virtual IOReturn 		HandlePowerOff 	( void );
-
-	// The HandlePowerOn method is called to do any bus specific activity
-	// necessary to recover from power-on/wake from sleep (e.g. device reset on ATAPI)
-	virtual IOReturn 		HandlePowerOn 	( void );
-
-	
-	// ---- Methods defined by this class ----
-
-	// Static callback proc for all SCSITask objects, it calls through to
-	// SCSITaskCallbackFunction.
-	static void 			sSCSITaskCallbackProc ( IOATACommand * cmd );
-	
-	// Callback proc for synchronous ATA only type commands.
-	static void 			sATACallbackSync ( IOATACommand * cmd );
-
-	// Callback proc for asynchronous ATAPI resets.
-	static void 			sATAPIResetCallback ( IOATACommand * cmd );
-
-	// Callback proc that does nothing.
-	static void 			sATAPIVoidCallback ( IOATACommand * cmd );
-
-	// State machine for device configuration.
-	static void				sATAPIConfigStateMachine ( IOATACommand * cmd );
-	
-	// Used for low-power polling.
-	static void				sPollStatusRegister ( void * xptDriver, void * refCon );
-	
-	// Static callback for low-power polling.
-	static void				sPollStatusRegisterCallback ( IOATACommand * cmd );
-
-	// This method is called by the SCSITaskCallbackFunction and it calls the
-	// inherited CommandCompleted message with the results of the task.
-	virtual void CompleteSCSITask ( SCSITaskIdentifier 	scsiTask,
-									SCSIServiceResponse serviceResponse,
-									SCSITaskStatus		taskStatus );
-
-	// The SCSITaskCallbackFunction method is called by the static callback procedure
-	// to complete SCSITask operations. This method may be subclassed if a device
-	// workaround is necessary.
-	virtual void SCSITaskCallbackFunction ( IOATACommand * 		cmd,
-											SCSITaskIdentifier 	scsiTask );
-	
-	// The ReportATAPIDeviceType method returns the ataDeviceType for ATAPI
-	virtual ataDeviceType 	ReportATAPIDeviceType ( void ) const;
-	
-	// The InspectDevice method is called to inspect the ATA device and verify
-	// that it is a device which can be controlled by this object
-	virtual bool			InspectDevice ( IOATADevice * ataDevice );
-	
-	// The AllocateATACommandObjects method is called to allocate a pool of
-	// IOATACommands for general purpose I/O usage.
-	virtual void 			AllocateATACommandObjects ( void );
-	
-	// The DeallocateATACommandObjects method is called to deallocate a pool of
-	// IOATACommands for general purpose I/O usage.
-	virtual void 			DeallocateATACommandObjects ( void );
-	
-	// The GetATACommandObject method is called to retrieve a command from
-	// the pool. Pass true to allow the method to sleep waiting for a command,
-	// else pass false. If false is passed, there is NO guarantee that a valid
-	// command will be returned. If true is passed, it IS guaranteed that a
-	// valid command will be returned, but the thread may be slept waiting for
-	// those resources.
-	virtual IOATACommand *	GetATACommandObject	( bool okToSleep = true );
-	
-	// The ReturnATACommandObject method is called to return a command to
-	// the pool.
-	virtual void			ReturnATACommandObject	( IOATACommand * cmd );
-
-	// The sSwapBytes16 method is used to word-swap the Device Identify data
-	// on big endian systems. Since all identify data is returned in little endian
-	// values, it must be word-swapped before inspected.
-	static void				sSwapBytes16 ( UInt8 * buffer, IOByteCount numBytesToSwap );
-	
-	// The sConvertHighestBitToNumber method is used to find the highest bit in a
-	// word and return a numeric value.	This is used to find the highest possible
-	// values for PIO, DMA, and UltraDMA transfer modes.
-	static UInt8			sConvertHighestBitToNumber ( UInt16 bitField );
-
-	// The sSetWakeupResetOccurred method is used to safely set member variables
-	// behind the command gate.
-	static void				sSetWakeupResetOccurred ( IOATAPIProtocolTransport * driver,
-												   	  bool resetOccurred );
-
-	// The sCheckWakeupResetOccur method is used to safely check member variables
-	// behind the command gate.
-	static void				sCheckWakeupResetOccurred ( IOATAPIProtocolTransport * driver,
-														bool * resetOccurred );
-	
-	// The DidWakeupResetOccur method is used to safely find out if a reset
-	// occurred while we were asleep.
-	virtual bool			CheckWakeupResetOccurred ( void );
-	
-	// The WakeupResetOccurred method is used to safely set/clear the reset flag.
-	virtual void			SetWakeupResetOccurred ( bool resetOccurred );
-
-	// The SetPIOTransferMode method is used to set the programmed input-output (PIO)
-	// transfer mode. The highest value reported by the device is used.
-	virtual IOReturn		SetPIOTransferMode ( IOATACommand * cmd, bool forceSync );
-	
-	// The SetDMATransferMode method is used to set the direct memory access (DMA)
-	// transfer mode. The highest value reported by the device is used.
-	virtual IOReturn		SetDMATransferMode ( IOATACommand * cmd, bool forceSync );
-	
-	// The IdentifyAndConfigureATAPIDevice method is called to correctly identify
-	// and configure an ATAPI device.
-	virtual IOReturn 		IdentifyAndConfigureATAPIDevice ( void );
-	
-	// The ConfigureATAPIDevice method is called to correctly configure the ATAPI
-	// device. It currently configures any PIO/DMA/UDMA transfer modes but may be
-	// expanded in the future.
-	virtual IOReturn 		ConfigureATAPIDevice ( void );
-
-	// The ReconfigureATAPIDevice method is called to correctly reconfigure the ATAPI
-	// device after a reset event has occurred (bus reset or device reset). It
-	// currently reconfigures any PIO/DMA/UDMA transfer modes but may be expanded in
-	// the future.
-	virtual IOReturn 		ReconfigureATAPIDevice ( void );
-	
-	// The IdentifyATAPIDevice method is called to correctly identify the ATAPI
-	// device. It currently issues the Identify ATAPI Device packet command and
-	// uses the data to correctly configure the device.
-	virtual IOReturn 		IdentifyATAPIDevice ( void );
-	
-	// The ResetATAPIDevice method is called to issue a Device Reset (also known
-	// as a SOFT RESET). This method will only reset the specified device on the
-	// bus.
-	virtual IOReturn 		ResetATAPIDevice ( void );
-	
-	// The SendATASleepCommand method is called to put an ATAPI drive in sleep
-	// mode.
-	virtual IOReturn		SendATASleepCommand ( void );
-	
-	// The EnablePollingOfStatusRegister method is called to set up a timer for
-	// the call to PollStatusRegister. It is called when the SCSI Application Layer
-	// driver wants to enable low-power polling and after a poll which does not
-	// see a change in the register status.
-	virtual void			EnablePollingOfStatusRegister ( void );
-
-	// The DisablePollingOfStatusRegister method is called to cancel any thread
-	// call which is doing a poll and drop the retain count on the object.
-	virtual void			DisablePollingOfStatusRegister ( void );
-	
-	// The PollStatusRegister method is used to do low-power polling on drives which
-	// support it. This feature is enabled by the SCSI Application Layer driver.
-	virtual void			PollStatusRegister ( void * refCon );
-	
-	// Callback method for the polling of the status register.
-	virtual void			PollStatusRegisterCallback ( IOATACommand * cmd );
-	
-	// The TurnDrivePowerOff method is called to turn power to the drive OFF
-	IOReturn				TurnDrivePowerOff ( void );
-	
-	IOReturn				SendCommand ( IOATACommand * cmd );
-	IOReturn				GatedWaitForRequest ( void * data );
-	
-private:
-	
-	// Binary Compatibility reserved method space
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 1 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 2 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 3 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 4 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 5 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 6 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 7 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 8 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 9 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 10 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 11 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 12 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 13 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 14 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 15 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 16 );
-	
-};
-
-#endif /* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/storage/ata/.svn/text-base/IOATAStorageDefines.h.svn-base b/i386/include/IOKit/storage/ata/.svn/text-base/IOATAStorageDefines.h.svn-base
deleted file mode 100644
index fdac8b3..0000000
--- a/i386/include/IOKit/storage/ata/.svn/text-base/IOATAStorageDefines.h.svn-base
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_ATA_STORAGE_DEFINES_H_
-#define _IOKIT_IO_ATA_STORAGE_DEFINES_H_
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-/*
- * Important word offsets in device identify data as
- * defined in ATA-5 standard
- */
-	
-enum
-{
-	kATAIdentifyConfiguration				= 0,
-	kATAIdentifyLogicalCylinderCount 		= 1,
-	kATAIdentifyLogicalHeadCount			= 3,
-	kATAIdentifySectorsPerTrack				= 6,
-	kATAIdentifySerialNumber				= 10,
-	kATAIdentifyFirmwareRevision			= 23,
-	kATAIdentifyModelNumber					= 27,
-	kATAIdentifyMultipleSectorCount			= 47,
-	kATAIdentifyDriveCapabilities			= 49,
-	kATAIdentifyDriveCapabilitiesExtended	= 50,
-	kATAIdentifyPIOTiming					= 51,
-	kATAIdentifyExtendedInfoSupport			= 53,
-	kATAIdentifyCurrentCylinders			= 54,
-	kATAIdentifyCurrentHeads				= 55,
-	kATAIdentifyCurrentSectors				= 56,
-	kATAIdentifyCurrentCapacity				= 57,
-	kATAIdentifyCurrentMultipleSectors		= 59,
-	kATAIdentifyLBACapacity					= 60,
-	kATAIdentifySingleWordDMA				= 62,
-	kATAIdentifyMultiWordDMA				= 63,
-	kATAIdentifyAdvancedPIOModes			= 64,
-	kATAIdentifyMinMultiWordDMATime			= 65,
-	kATAIdentifyRecommendedMultiWordDMATime	= 66,
-	kATAIdentifyMinPIOTime					= 67,
-	kATAIdentifyMinPIOTimeWithIORDY			= 68,
-	kATAIdentifyQueueDepth					= 75,
-	kATAIdentifyMajorVersion				= 80,
-	kATAIdentifyMinorVersion				= 81,
-	kATAIdentifyCommandSetSupported			= 82,
-	kATAIdentifyCommandSetSupported2		= 83,
-	kATAIdentifyCommandExtension1			= 84,
-	kATAIdentifyCommandExtension2			= 85,
-	kATAIdentifyCommandsEnabled				= 86,
-	kATAIdentifyCommandsDefault				= 87,
-	kATAIdentifyUltraDMASupported			= 88,
-	kATAIdentifyPhysicalLogicalSectorSize	= 106,
-	kATAIdentifyWordsPerLogicalSector1		= 117,
-	kATAIdentifyWordsPerLogicalSector2		= 118,
-	kATAIdentifyLogicalSectorAlignment		= 209,
-	kATAIdentifyIntegrity					= 255
-};
-	
-
-/* 
- * Important bits in device identify data
- * as defined in ATA-5 standard
- */
- 
-enum
-{
-	// Configuration field (word 0)
-	kFixedDeviceBit			= 6,							// Fixed disk indicator bit
-	kRemoveableMediaBit		= 7,							// Removable media indicator bit
-	kNonMagneticDriveBit	= 15,							// Non-magnetic drive indicator bit
-	
-	kFixedDeviceMask		= (1 << kFixedDeviceBit),		// Mask for fixed disk indicator
-	kRemoveableMediaMask	= (1 << kRemoveableMediaBit),	// Mask for removable media indicator
-	kNonMagneticDriveMask	= (1 << kNonMagneticDriveBit),	// Mask for non-magnetic drive indicator
-
-	// Capabilities field (word 49)
-	kDMABit					= 8,							// DMA supported bit
-	kLBABit					= 9,							// LBA supported bit
-	kIORDYDisableBit		= 10,							// IORDY can be disabled bit
-	kIORDYBit				= 11,							// IORDY supported bit
-	kStandbyTimerBit		= 13,							// Standby timer supported bit
-
-	kDMASupportedMask		= (1 << kDMABit),				// Mask for DMA supported
-	kLBASupportedMask		= (1 << kLBABit),				// Mask for LBA supported
-	kDMADisableMask			= (1 << kIORDYDisableBit),		// Mask for DMA supported
-	kIORDYSupportedMask		= (1 << kIORDYBit),				// Mask for IORDY supported
-	kStandbySupportedMask	= (1 << kStandbyTimerBit),		// Mask for Standby Timer supported
-
-	// Extensions field (word 53)
-	kCurFieldsValidBit		= 0,							// Bit to show words 54-58 are valid
-	kExtFieldsValidBit		= 1,							// Bit to show words 64-70 are valid
-	kCurFieldsValidMask		= (1 << kCurFieldsValidBit),	// Mask for current fields valid
-	kExtFieldsValidMask		= (1 << kExtFieldsValidBit),	// Extension word valid
-
-	// Advanced PIO Transfer Modes field (word 64)
-	kMode3Bit				= 0,							// Bit to indicate mode 3 is supported
-	kMode3Mask				= (1 << kMode3Bit),				// Mask for mode 3 support
-	
-	// Integrity of Identify data (word 255)
-	kChecksumValidCookie	= 0xA5							// Bits 7:0 if device supports feature
-	
-};
-
-
-/* String size constants */
-enum
-{
-	kSizeOfATAModelString 		= 40,
-	kSizeOfATARevisionString	= 8
-};
-
-/* ATA Command timeout constants ( in milliseconds ) */
-enum
-{
-	kATATimeout10Seconds	= 10000,
-	kATATimeout30Seconds	= 30000,
-	kATATimeout45Seconds	= 45000,
-	kATATimeout1Minute		= 60000,
-	kATADefaultTimeout		= kATATimeout30Seconds
-};
-
-
-/* Retry constants */
-enum
-{
-	kATAZeroRetries		= 0,
-	kATADefaultRetries	= 4
-};
-
-/* max number of blocks supported in ATA transaction */
-enum
-{
-	kIOATASectorCount8Bit	= 8,
-	kIOATASectorCount16Bit	= 16
-};
-
-enum
-{
-	kIOATAMaximumBlockCount8Bit		= (1 << kIOATASectorCount8Bit),
-	kIOATAMaximumBlockCount16Bit	= (1 << kIOATASectorCount16Bit),
-	
-	// For backwards compatibility
-	kIOATAMaxBlocksPerXfer			= kIOATAMaximumBlockCount8Bit
-};
-
-
-
-/* Power Management time constants (in seconds) */
-enum
-{
-	kSecondsInAMinute	= 60,
-	k5Minutes			= 5 * kSecondsInAMinute
-};
-
-/* Bits for features published in Word 82 of device identify data */
-enum
-{
-	kATASupportsSMARTBit					= 0,
-	kATASupportsPowerManagementBit  		= 3,
-	kATASupportsWriteCacheBit				= 5
-};
-
-/* Masks for features published in Word 82 of device identify data */
-enum
-{
-	kATASupportsSMARTMask					= (1 << kATASupportsSMARTBit),
-	kATASupportsPowerManagementMask 		= (1 << kATASupportsPowerManagementBit),
-	kATASupportsWriteCacheMask				= (1 << kATASupportsWriteCacheBit)
-};
-
-/* Bits for features published in Word 83 of device identify data */
-enum
-{
-	kATASupportsCompactFlashBit				= 2,
-	kATASupportsAdvancedPowerManagementBit 	= 3,
-	
-	kATASupports48BitAddressingBit			= 10,
-	
-	kATASupportsFlushCacheBit				= 12,
-	kATASupportsFlushCacheExtendedBit		= 13
-};
-
-/* Masks for features published in Word 83 of device identify data */
-enum
-{
-	kATASupportsCompactFlashMask			= (1 << kATASupportsCompactFlashBit),
-	kATASupportsAdvancedPowerManagementMask = (1 << kATASupportsAdvancedPowerManagementBit),
-	
-	kATASupports48BitAddressingMask			= (1 << kATASupports48BitAddressingBit),
-	
-	kATASupportsFlushCacheMask				= (1 << kATASupportsFlushCacheBit),
-	kATASupportsFlushCacheExtendedMask		= (1 << kATASupportsFlushCacheExtendedBit),
-	
-	// Mask to ensure data is valid
-	kIdentifyWordValidationMask				= 0xC000,
-	kIdentifyWordValid						= 0x4000
-};
-
-/* Bits for features published in Word 84 of device identify data */
-enum
-{
-	kATAForceUnitAccessFeatureBit			= 6,
-};
-
-/* Masks for features published in Word 84 of device identify data */
-enum
-{
-	kATAForceUnitAccessFeatureMask			= (1 << kATAForceUnitAccessFeatureBit),
-};
-
-/* Bits for features published in Word 85 of device identify data */
-enum
-{
-	kATAWriteCacheEnabledBit				= 5
-};
-
-/* Masks for features published in Word 85 of device identify data */
-enum
-{
-	kATAWriteCacheEnabledMask				= (1 << kATAWriteCacheEnabledBit)
-};
-
-
-/* Bits for features published in Word 106 of device identify data */
-enum
-{
-	kATAPhysicalLogicalEnabledBit0			= 15,
-	kATAPhysicalLogicalEnabledBit1			= 14,
-	kATAMultipleLogicalSectorsBit			= 13,
-	kATAValidLogicalSectorSizeBit			= 12	
-};
-
-/* Masks for features published in Word 106 of device identify data */
-enum
-{
-	kATAPhysicalLogicalEnabledMask			= (1 << kATAPhysicalLogicalEnabledBit0) | (1 << kATAPhysicalLogicalEnabledBit1),
-	kATAPhysicalLogicalEnabledValue			= (0 << kATAPhysicalLogicalEnabledBit0) | (1 << kATAPhysicalLogicalEnabledBit1),
-	kATAMultipleLogicalSectorsMask			= (1 << kATAMultipleLogicalSectorsBit),
-	kATAValidLogicalSectorSizeMask			= (1 << kATAValidLogicalSectorSizeBit),
-	kATAPhysicalSectorSizeMask				= 0xF,
-	kATALogicalSectorAlignmentMask			= 0x3FFF
-};
-
-// Property table keys
-#define kIOATASupportedFeaturesKey		"ATA Features"
-
-/* ATA supported features */
-enum
-{
-	kIOATAFeaturePowerManagement			= 0x01,		/* OBSOLETE */
-	kIOATAFeatureWriteCache					= 0x02,		/* OBSOLETE */
-	kIOATAFeatureAdvancedPowerManagement 	= 0x04,
-	kIOATAFeatureCompactFlash				= 0x08,
-	kIOATAFeature48BitLBA					= 0x10,
-	kIOATAFeatureSMART						= 0x20
-};
-
-/* ATA Advanced Power Management settings (valid settings range from 1-254),
-the settings below are the more common settings */
-enum
-{
-	kIOATAMaxPerformance					= 0xFE,
-	kIOATADefaultPerformance			 	= 0x80,
-	kIOATAMaxPowerSavings					= 0x01
-};
-
-/* ATA Transfer Mode bit masks */
-enum
-{
-	kATAEnableUltraDMAModeMask 		= 0x40,
-	kATAEnableMultiWordDMAModeMask	= 0x20,
-	kATAEnablePIOModeMask			= 0x08
-};
-
-
-typedef uint32_t	ATAOperationType;
-enum
-{
-	kATAOperationTypeRead				= 0,
-	kATAOperationTypeWrite				= 1,
-	kATAOperationTypeFlushCache			= 2,
-	kATAOperationTypeSMART				= 3,
-	kATAOperationTypeConfiguration		= 4,
-	kATAOperationTypePowerManagement	= 5,
-	kATAOperationTypeSMS				= 6
-};
-
-#if defined(KERNEL)
-
-typedef struct __ATAIORequest *	ATARequestIdentifier;
-
-#endif	// defined(KERNEL)
-	
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* _IOKIT_IO_ATA_STORAGE_DEFINES_H_ */
diff --git a/i386/include/IOKit/storage/ata/IOATAPIProtocolTransport.h b/i386/include/IOKit/storage/ata/IOATAPIProtocolTransport.h
deleted file mode 100644
index 3356ae7..0000000
--- a/i386/include/IOKit/storage/ata/IOATAPIProtocolTransport.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*!
-  @header IOATAPIProtocolTransport
-  Contains the class definition for IOATAPIProtocolTransport.
-*/
-
-
-#ifndef _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_
-#define _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_
-
-#define kIOPropertyATAPIMassStorageCharacteristics 		"ATAPI Mass Storage Characteristics"
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-/* General IOKit includes */
-#include <IOKit/IOLib.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOCommandPool.h>
-
-/* IOKit ATA Family includes */
-#include <IOKit/ata/IOATADevice.h>
-#include <IOKit/ata/IOATATypes.h>
-
-/* IOKit ATA Storage includes */
-#include <IOKit/storage/ata/IOATAStorageDefines.h>
-
-/* SCSI Architecture Model Family includes */
-#include <IOKit/scsi/IOSCSIProtocolServices.h>
-
-// Forward class declaration
-class IOATAPIProtocolTransport;
-
-/*! 
-	@typedef ATAPIClientData
-	@param cmd IOATACommand for request.
-	@param self Pointer to the object. 
-	@param scsiTask SCSITaskIdentifier of request. 
-	@discussion This structure is stuffed into the refcon so we can associate which
-	IOATACommand and SCSITaskIdentifier is completing.
-*/
-
-struct ATAPIClientData
-{
-	IOATACommand *				cmd;
-	IOATAPIProtocolTransport *	self;
-	SCSITaskIdentifier			scsiTask;
-};
-typedef struct ATAPIClientData ATAPIClientData;
-
-
-/*!
-	@class IOATAPIProtocolTransport
-	@abstract SCSI Protocol Driver Family for ATAPI Devices. 
-	@discussion IOATAPIProtocolTransport contains all the bus specific support for ATAPI compliant devices.
-	To add vendor specific features or workarounds you will sub-class the appropriate
-	methods of this family. 
-*/
-
-class IOATAPIProtocolTransport : public IOSCSIProtocolServices
-{
-	
-	OSDeclareDefaultStructors ( IOATAPIProtocolTransport )
-	
-public:
-
-	// ---- IOService methods overridden ----
-	
-	bool 			init 	( OSDictionary * propTable );
-	
-	// The start method is called to start our services. If the device
-	// can be controlled by this object, then we return true, else we
-	// return false. start() is usually used to allocate resources once
-	// it is determined that the device can be controlled by this object.
-	virtual bool 	start 	( IOService * provider );
-	
-	// The stop method is called to stop our services. It is primarily
-	// called for deallocation of resources.
-	virtual void 	stop 	( IOService *  provider );
-	
-	// This method is our last chance to free all resources allocated.
-	virtual void	free	( void );
-	
-	
-protected:
-
-	// ---- member variables ----
-	
-	IOATADevice *			fATADevice;
-	ataUnitID				fATAUnitID;
-	ataDeviceType			fATADeviceType;
-	ataSocketType			fATASocketType;
-	atapiConfig				fATAPIPacketConfig;
-	UInt8					fPIOMode;
-	UInt8					fDMAMode;
-	UInt8					fUltraDMAMode;
-	IOCommandGate *			fCommandGate;
-	IOCommandPool *			fCommandPool;
-	IOATACommand *			fResetCommand;
-	IOATACommand *			fConfigCommand;
-	IOATACommand *			fIdentifyCommand;
-	char					fRevision[kSizeOfATARevisionString + 1];
-	char					fModel[kSizeOfATAModelString + 1];
-	bool					fWakeUpResetOccurred;
-	bool					fPhysicallyConnected;
-	
-	// Used for low-power polling support
-	thread_call_t			fPollingThread;
-	
-	UInt16					fDeviceIdentifyData[256];
-	IOMemoryDescriptor *	fDeviceIdentifyBuffer;
-	bool					fResetInProgress;
-
-	// Binary Compatibility instance variable expansion
-	struct ExpansionData
-	{
-		UInt32		fSemaphore;
-		UInt32		fMediaNotifyValue;
-	};
-	ExpansionData * reserved;
-	
-	// ---- IOService methods overridden ----
-	
-	// The message method is used to listen to messages from our provider, the ATA controller.
-	// It sends messages for bus reset notifications and for device removal (such as MediaBay,
-	// PC card, etc.)
-	virtual IOReturn message ( UInt32 type, IOService * provider, void * argument = 0 );
-	
-	// ---- Protocol transport methods overridden ----
-
-	// Send a SCSI Command to the device.  If the command was sent to the
-	// device and is pending completion, the subclass should return true and
-	// return back the kSCSIServiceResponse_Request_In_Process response. 
-	// If the command completes immediately with an error, the subclass will
-	// return true and return back the appropriate status.
-	// if the subclass is currently processing all the commands it can, the
-	// subclass will return false and the command will be resent next time
-	// CommandCompleted is called.  
-	virtual bool SendSCSICommand ( 	SCSITaskIdentifier 		request,
-									SCSIServiceResponse * 	serviceResponse,
-									SCSITaskStatus *		taskStatus );
-		
-	// This is a stub - not implemented in upper layer yet. Eventually, there
-	// will be a way to abort a task or task set and this method will be called.
-	// It will abort any commands which have not been executed by the ATA controller
-	virtual SCSIServiceResponse AbortSCSICommand ( SCSITaskIdentifier request );
-	
-	// The IsProtocolServiceSupported method will return true if the protocol
-	// layer supports the specified feature.
-	virtual bool IsProtocolServiceSupported ( SCSIProtocolFeature feature, void * serviceValue );
-	
-	// The HandleProtocolServiceFeature method will return true if the protocol
-	// layer properly handled the specified feature.
-	virtual bool HandleProtocolServiceFeature ( SCSIProtocolFeature feature, void * serviceValue );
-
-	// ------ Power Management Support ------
-
-	// The HandlePowerOff method is called to do any bus specific activity
-	// necessary before shutting down and going to sleep.
-	virtual IOReturn 		HandlePowerOff 	( void );
-
-	// The HandlePowerOn method is called to do any bus specific activity
-	// necessary to recover from power-on/wake from sleep (e.g. device reset on ATAPI)
-	virtual IOReturn 		HandlePowerOn 	( void );
-
-	
-	// ---- Methods defined by this class ----
-
-	// Static callback proc for all SCSITask objects, it calls through to
-	// SCSITaskCallbackFunction.
-	static void 			sSCSITaskCallbackProc ( IOATACommand * cmd );
-	
-	// Callback proc for synchronous ATA only type commands.
-	static void 			sATACallbackSync ( IOATACommand * cmd );
-
-	// Callback proc for asynchronous ATAPI resets.
-	static void 			sATAPIResetCallback ( IOATACommand * cmd );
-
-	// Callback proc that does nothing.
-	static void 			sATAPIVoidCallback ( IOATACommand * cmd );
-
-	// State machine for device configuration.
-	static void				sATAPIConfigStateMachine ( IOATACommand * cmd );
-	
-	// Used for low-power polling.
-	static void				sPollStatusRegister ( void * xptDriver, void * refCon );
-	
-	// Static callback for low-power polling.
-	static void				sPollStatusRegisterCallback ( IOATACommand * cmd );
-
-	// This method is called by the SCSITaskCallbackFunction and it calls the
-	// inherited CommandCompleted message with the results of the task.
-	virtual void CompleteSCSITask ( SCSITaskIdentifier 	scsiTask,
-									SCSIServiceResponse serviceResponse,
-									SCSITaskStatus		taskStatus );
-
-	// The SCSITaskCallbackFunction method is called by the static callback procedure
-	// to complete SCSITask operations. This method may be subclassed if a device
-	// workaround is necessary.
-	virtual void SCSITaskCallbackFunction ( IOATACommand * 		cmd,
-											SCSITaskIdentifier 	scsiTask );
-	
-	// The ReportATAPIDeviceType method returns the ataDeviceType for ATAPI
-	virtual ataDeviceType 	ReportATAPIDeviceType ( void ) const;
-	
-	// The InspectDevice method is called to inspect the ATA device and verify
-	// that it is a device which can be controlled by this object
-	virtual bool			InspectDevice ( IOATADevice * ataDevice );
-	
-	// The AllocateATACommandObjects method is called to allocate a pool of
-	// IOATACommands for general purpose I/O usage.
-	virtual void 			AllocateATACommandObjects ( void );
-	
-	// The DeallocateATACommandObjects method is called to deallocate a pool of
-	// IOATACommands for general purpose I/O usage.
-	virtual void 			DeallocateATACommandObjects ( void );
-	
-	// The GetATACommandObject method is called to retrieve a command from
-	// the pool. Pass true to allow the method to sleep waiting for a command,
-	// else pass false. If false is passed, there is NO guarantee that a valid
-	// command will be returned. If true is passed, it IS guaranteed that a
-	// valid command will be returned, but the thread may be slept waiting for
-	// those resources.
-	virtual IOATACommand *	GetATACommandObject	( bool okToSleep = true );
-	
-	// The ReturnATACommandObject method is called to return a command to
-	// the pool.
-	virtual void			ReturnATACommandObject	( IOATACommand * cmd );
-
-	// The sSwapBytes16 method is used to word-swap the Device Identify data
-	// on big endian systems. Since all identify data is returned in little endian
-	// values, it must be word-swapped before inspected.
-	static void				sSwapBytes16 ( UInt8 * buffer, IOByteCount numBytesToSwap );
-	
-	// The sConvertHighestBitToNumber method is used to find the highest bit in a
-	// word and return a numeric value.	This is used to find the highest possible
-	// values for PIO, DMA, and UltraDMA transfer modes.
-	static UInt8			sConvertHighestBitToNumber ( UInt16 bitField );
-
-	// The sSetWakeupResetOccurred method is used to safely set member variables
-	// behind the command gate.
-	static void				sSetWakeupResetOccurred ( IOATAPIProtocolTransport * driver,
-												   	  bool resetOccurred );
-
-	// The sCheckWakeupResetOccur method is used to safely check member variables
-	// behind the command gate.
-	static void				sCheckWakeupResetOccurred ( IOATAPIProtocolTransport * driver,
-														bool * resetOccurred );
-	
-	// The DidWakeupResetOccur method is used to safely find out if a reset
-	// occurred while we were asleep.
-	virtual bool			CheckWakeupResetOccurred ( void );
-	
-	// The WakeupResetOccurred method is used to safely set/clear the reset flag.
-	virtual void			SetWakeupResetOccurred ( bool resetOccurred );
-
-	// The SetPIOTransferMode method is used to set the programmed input-output (PIO)
-	// transfer mode. The highest value reported by the device is used.
-	virtual IOReturn		SetPIOTransferMode ( IOATACommand * cmd, bool forceSync );
-	
-	// The SetDMATransferMode method is used to set the direct memory access (DMA)
-	// transfer mode. The highest value reported by the device is used.
-	virtual IOReturn		SetDMATransferMode ( IOATACommand * cmd, bool forceSync );
-	
-	// The IdentifyAndConfigureATAPIDevice method is called to correctly identify
-	// and configure an ATAPI device.
-	virtual IOReturn 		IdentifyAndConfigureATAPIDevice ( void );
-	
-	// The ConfigureATAPIDevice method is called to correctly configure the ATAPI
-	// device. It currently configures any PIO/DMA/UDMA transfer modes but may be
-	// expanded in the future.
-	virtual IOReturn 		ConfigureATAPIDevice ( void );
-
-	// The ReconfigureATAPIDevice method is called to correctly reconfigure the ATAPI
-	// device after a reset event has occurred (bus reset or device reset). It
-	// currently reconfigures any PIO/DMA/UDMA transfer modes but may be expanded in
-	// the future.
-	virtual IOReturn 		ReconfigureATAPIDevice ( void );
-	
-	// The IdentifyATAPIDevice method is called to correctly identify the ATAPI
-	// device. It currently issues the Identify ATAPI Device packet command and
-	// uses the data to correctly configure the device.
-	virtual IOReturn 		IdentifyATAPIDevice ( void );
-	
-	// The ResetATAPIDevice method is called to issue a Device Reset (also known
-	// as a SOFT RESET). This method will only reset the specified device on the
-	// bus.
-	virtual IOReturn 		ResetATAPIDevice ( void );
-	
-	// The SendATASleepCommand method is called to put an ATAPI drive in sleep
-	// mode.
-	virtual IOReturn		SendATASleepCommand ( void );
-	
-	// The EnablePollingOfStatusRegister method is called to set up a timer for
-	// the call to PollStatusRegister. It is called when the SCSI Application Layer
-	// driver wants to enable low-power polling and after a poll which does not
-	// see a change in the register status.
-	virtual void			EnablePollingOfStatusRegister ( void );
-
-	// The DisablePollingOfStatusRegister method is called to cancel any thread
-	// call which is doing a poll and drop the retain count on the object.
-	virtual void			DisablePollingOfStatusRegister ( void );
-	
-	// The PollStatusRegister method is used to do low-power polling on drives which
-	// support it. This feature is enabled by the SCSI Application Layer driver.
-	virtual void			PollStatusRegister ( void * refCon );
-	
-	// Callback method for the polling of the status register.
-	virtual void			PollStatusRegisterCallback ( IOATACommand * cmd );
-	
-	// The TurnDrivePowerOff method is called to turn power to the drive OFF
-	IOReturn				TurnDrivePowerOff ( void );
-	
-	IOReturn				SendCommand ( IOATACommand * cmd );
-	IOReturn				GatedWaitForRequest ( void * data );
-	
-private:
-	
-	// Binary Compatibility reserved method space
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 1 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 2 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 3 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 4 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 5 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 6 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 7 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 8 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 9 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 10 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 11 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 12 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 13 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 14 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 15 );
-	OSMetaClassDeclareReservedUnused ( IOATAPIProtocolTransport, 16 );
-	
-};
-
-#endif /* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_ATAPI_PROTOCOL_TRANSPORT_H_ */
\ No newline at end of file
diff --git a/i386/include/IOKit/storage/ata/IOATAStorageDefines.h b/i386/include/IOKit/storage/ata/IOATAStorageDefines.h
deleted file mode 100644
index fdac8b3..0000000
--- a/i386/include/IOKit/storage/ata/IOATAStorageDefines.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IO_ATA_STORAGE_DEFINES_H_
-#define _IOKIT_IO_ATA_STORAGE_DEFINES_H_
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-/*
- * Important word offsets in device identify data as
- * defined in ATA-5 standard
- */
-	
-enum
-{
-	kATAIdentifyConfiguration				= 0,
-	kATAIdentifyLogicalCylinderCount 		= 1,
-	kATAIdentifyLogicalHeadCount			= 3,
-	kATAIdentifySectorsPerTrack				= 6,
-	kATAIdentifySerialNumber				= 10,
-	kATAIdentifyFirmwareRevision			= 23,
-	kATAIdentifyModelNumber					= 27,
-	kATAIdentifyMultipleSectorCount			= 47,
-	kATAIdentifyDriveCapabilities			= 49,
-	kATAIdentifyDriveCapabilitiesExtended	= 50,
-	kATAIdentifyPIOTiming					= 51,
-	kATAIdentifyExtendedInfoSupport			= 53,
-	kATAIdentifyCurrentCylinders			= 54,
-	kATAIdentifyCurrentHeads				= 55,
-	kATAIdentifyCurrentSectors				= 56,
-	kATAIdentifyCurrentCapacity				= 57,
-	kATAIdentifyCurrentMultipleSectors		= 59,
-	kATAIdentifyLBACapacity					= 60,
-	kATAIdentifySingleWordDMA				= 62,
-	kATAIdentifyMultiWordDMA				= 63,
-	kATAIdentifyAdvancedPIOModes			= 64,
-	kATAIdentifyMinMultiWordDMATime			= 65,
-	kATAIdentifyRecommendedMultiWordDMATime	= 66,
-	kATAIdentifyMinPIOTime					= 67,
-	kATAIdentifyMinPIOTimeWithIORDY			= 68,
-	kATAIdentifyQueueDepth					= 75,
-	kATAIdentifyMajorVersion				= 80,
-	kATAIdentifyMinorVersion				= 81,
-	kATAIdentifyCommandSetSupported			= 82,
-	kATAIdentifyCommandSetSupported2		= 83,
-	kATAIdentifyCommandExtension1			= 84,
-	kATAIdentifyCommandExtension2			= 85,
-	kATAIdentifyCommandsEnabled				= 86,
-	kATAIdentifyCommandsDefault				= 87,
-	kATAIdentifyUltraDMASupported			= 88,
-	kATAIdentifyPhysicalLogicalSectorSize	= 106,
-	kATAIdentifyWordsPerLogicalSector1		= 117,
-	kATAIdentifyWordsPerLogicalSector2		= 118,
-	kATAIdentifyLogicalSectorAlignment		= 209,
-	kATAIdentifyIntegrity					= 255
-};
-	
-
-/* 
- * Important bits in device identify data
- * as defined in ATA-5 standard
- */
- 
-enum
-{
-	// Configuration field (word 0)
-	kFixedDeviceBit			= 6,							// Fixed disk indicator bit
-	kRemoveableMediaBit		= 7,							// Removable media indicator bit
-	kNonMagneticDriveBit	= 15,							// Non-magnetic drive indicator bit
-	
-	kFixedDeviceMask		= (1 << kFixedDeviceBit),		// Mask for fixed disk indicator
-	kRemoveableMediaMask	= (1 << kRemoveableMediaBit),	// Mask for removable media indicator
-	kNonMagneticDriveMask	= (1 << kNonMagneticDriveBit),	// Mask for non-magnetic drive indicator
-
-	// Capabilities field (word 49)
-	kDMABit					= 8,							// DMA supported bit
-	kLBABit					= 9,							// LBA supported bit
-	kIORDYDisableBit		= 10,							// IORDY can be disabled bit
-	kIORDYBit				= 11,							// IORDY supported bit
-	kStandbyTimerBit		= 13,							// Standby timer supported bit
-
-	kDMASupportedMask		= (1 << kDMABit),				// Mask for DMA supported
-	kLBASupportedMask		= (1 << kLBABit),				// Mask for LBA supported
-	kDMADisableMask			= (1 << kIORDYDisableBit),		// Mask for DMA supported
-	kIORDYSupportedMask		= (1 << kIORDYBit),				// Mask for IORDY supported
-	kStandbySupportedMask	= (1 << kStandbyTimerBit),		// Mask for Standby Timer supported
-
-	// Extensions field (word 53)
-	kCurFieldsValidBit		= 0,							// Bit to show words 54-58 are valid
-	kExtFieldsValidBit		= 1,							// Bit to show words 64-70 are valid
-	kCurFieldsValidMask		= (1 << kCurFieldsValidBit),	// Mask for current fields valid
-	kExtFieldsValidMask		= (1 << kExtFieldsValidBit),	// Extension word valid
-
-	// Advanced PIO Transfer Modes field (word 64)
-	kMode3Bit				= 0,							// Bit to indicate mode 3 is supported
-	kMode3Mask				= (1 << kMode3Bit),				// Mask for mode 3 support
-	
-	// Integrity of Identify data (word 255)
-	kChecksumValidCookie	= 0xA5							// Bits 7:0 if device supports feature
-	
-};
-
-
-/* String size constants */
-enum
-{
-	kSizeOfATAModelString 		= 40,
-	kSizeOfATARevisionString	= 8
-};
-
-/* ATA Command timeout constants ( in milliseconds ) */
-enum
-{
-	kATATimeout10Seconds	= 10000,
-	kATATimeout30Seconds	= 30000,
-	kATATimeout45Seconds	= 45000,
-	kATATimeout1Minute		= 60000,
-	kATADefaultTimeout		= kATATimeout30Seconds
-};
-
-
-/* Retry constants */
-enum
-{
-	kATAZeroRetries		= 0,
-	kATADefaultRetries	= 4
-};
-
-/* max number of blocks supported in ATA transaction */
-enum
-{
-	kIOATASectorCount8Bit	= 8,
-	kIOATASectorCount16Bit	= 16
-};
-
-enum
-{
-	kIOATAMaximumBlockCount8Bit		= (1 << kIOATASectorCount8Bit),
-	kIOATAMaximumBlockCount16Bit	= (1 << kIOATASectorCount16Bit),
-	
-	// For backwards compatibility
-	kIOATAMaxBlocksPerXfer			= kIOATAMaximumBlockCount8Bit
-};
-
-
-
-/* Power Management time constants (in seconds) */
-enum
-{
-	kSecondsInAMinute	= 60,
-	k5Minutes			= 5 * kSecondsInAMinute
-};
-
-/* Bits for features published in Word 82 of device identify data */
-enum
-{
-	kATASupportsSMARTBit					= 0,
-	kATASupportsPowerManagementBit  		= 3,
-	kATASupportsWriteCacheBit				= 5
-};
-
-/* Masks for features published in Word 82 of device identify data */
-enum
-{
-	kATASupportsSMARTMask					= (1 << kATASupportsSMARTBit),
-	kATASupportsPowerManagementMask 		= (1 << kATASupportsPowerManagementBit),
-	kATASupportsWriteCacheMask				= (1 << kATASupportsWriteCacheBit)
-};
-
-/* Bits for features published in Word 83 of device identify data */
-enum
-{
-	kATASupportsCompactFlashBit				= 2,
-	kATASupportsAdvancedPowerManagementBit 	= 3,
-	
-	kATASupports48BitAddressingBit			= 10,
-	
-	kATASupportsFlushCacheBit				= 12,
-	kATASupportsFlushCacheExtendedBit		= 13
-};
-
-/* Masks for features published in Word 83 of device identify data */
-enum
-{
-	kATASupportsCompactFlashMask			= (1 << kATASupportsCompactFlashBit),
-	kATASupportsAdvancedPowerManagementMask = (1 << kATASupportsAdvancedPowerManagementBit),
-	
-	kATASupports48BitAddressingMask			= (1 << kATASupports48BitAddressingBit),
-	
-	kATASupportsFlushCacheMask				= (1 << kATASupportsFlushCacheBit),
-	kATASupportsFlushCacheExtendedMask		= (1 << kATASupportsFlushCacheExtendedBit),
-	
-	// Mask to ensure data is valid
-	kIdentifyWordValidationMask				= 0xC000,
-	kIdentifyWordValid						= 0x4000
-};
-
-/* Bits for features published in Word 84 of device identify data */
-enum
-{
-	kATAForceUnitAccessFeatureBit			= 6,
-};
-
-/* Masks for features published in Word 84 of device identify data */
-enum
-{
-	kATAForceUnitAccessFeatureMask			= (1 << kATAForceUnitAccessFeatureBit),
-};
-
-/* Bits for features published in Word 85 of device identify data */
-enum
-{
-	kATAWriteCacheEnabledBit				= 5
-};
-
-/* Masks for features published in Word 85 of device identify data */
-enum
-{
-	kATAWriteCacheEnabledMask				= (1 << kATAWriteCacheEnabledBit)
-};
-
-
-/* Bits for features published in Word 106 of device identify data */
-enum
-{
-	kATAPhysicalLogicalEnabledBit0			= 15,
-	kATAPhysicalLogicalEnabledBit1			= 14,
-	kATAMultipleLogicalSectorsBit			= 13,
-	kATAValidLogicalSectorSizeBit			= 12	
-};
-
-/* Masks for features published in Word 106 of device identify data */
-enum
-{
-	kATAPhysicalLogicalEnabledMask			= (1 << kATAPhysicalLogicalEnabledBit0) | (1 << kATAPhysicalLogicalEnabledBit1),
-	kATAPhysicalLogicalEnabledValue			= (0 << kATAPhysicalLogicalEnabledBit0) | (1 << kATAPhysicalLogicalEnabledBit1),
-	kATAMultipleLogicalSectorsMask			= (1 << kATAMultipleLogicalSectorsBit),
-	kATAValidLogicalSectorSizeMask			= (1 << kATAValidLogicalSectorSizeBit),
-	kATAPhysicalSectorSizeMask				= 0xF,
-	kATALogicalSectorAlignmentMask			= 0x3FFF
-};
-
-// Property table keys
-#define kIOATASupportedFeaturesKey		"ATA Features"
-
-/* ATA supported features */
-enum
-{
-	kIOATAFeaturePowerManagement			= 0x01,		/* OBSOLETE */
-	kIOATAFeatureWriteCache					= 0x02,		/* OBSOLETE */
-	kIOATAFeatureAdvancedPowerManagement 	= 0x04,
-	kIOATAFeatureCompactFlash				= 0x08,
-	kIOATAFeature48BitLBA					= 0x10,
-	kIOATAFeatureSMART						= 0x20
-};
-
-/* ATA Advanced Power Management settings (valid settings range from 1-254),
-the settings below are the more common settings */
-enum
-{
-	kIOATAMaxPerformance					= 0xFE,
-	kIOATADefaultPerformance			 	= 0x80,
-	kIOATAMaxPowerSavings					= 0x01
-};
-
-/* ATA Transfer Mode bit masks */
-enum
-{
-	kATAEnableUltraDMAModeMask 		= 0x40,
-	kATAEnableMultiWordDMAModeMask	= 0x20,
-	kATAEnablePIOModeMask			= 0x08
-};
-
-
-typedef uint32_t	ATAOperationType;
-enum
-{
-	kATAOperationTypeRead				= 0,
-	kATAOperationTypeWrite				= 1,
-	kATAOperationTypeFlushCache			= 2,
-	kATAOperationTypeSMART				= 3,
-	kATAOperationTypeConfiguration		= 4,
-	kATAOperationTypePowerManagement	= 5,
-	kATAOperationTypeSMS				= 6
-};
-
-#if defined(KERNEL)
-
-typedef struct __ATAIORequest *	ATARequestIdentifier;
-
-#endif	// defined(KERNEL)
-	
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* _IOKIT_IO_ATA_STORAGE_DEFINES_H_ */
diff --git a/i386/include/IOKit/stream/.svn/all-wcprops b/i386/include/IOKit/stream/.svn/all-wcprops
deleted file mode 100644
index cdf93a5..0000000
--- a/i386/include/IOKit/stream/.svn/all-wcprops
+++ /dev/null
@@ -1,29 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 59
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/stream
-END
-IOStreamShared.h
-K 25
-svn:wc:ra_dav:version-url
-V 76
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/stream/IOStreamShared.h
-END
-IOStreamUserClient.h
-K 25
-svn:wc:ra_dav:version-url
-V 80
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/stream/IOStreamUserClient.h
-END
-IOStream.h
-K 25
-svn:wc:ra_dav:version-url
-V 70
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/stream/IOStream.h
-END
-IOStreamFamily.h
-K 25
-svn:wc:ra_dav:version-url
-V 76
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/stream/IOStreamFamily.h
-END
diff --git a/i386/include/IOKit/stream/.svn/entries b/i386/include/IOKit/stream/.svn/entries
deleted file mode 100644
index 1c63f86..0000000
--- a/i386/include/IOKit/stream/.svn/entries
+++ /dev/null
@@ -1,164 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/stream
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IOStreamShared.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-925f10b148830bcae4312aa8a7ee2fea
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4647
-
-IOStreamUserClient.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-bdc9cf99229f3972604d4952b63a3aa2
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2502
-
-IOStream.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-3b670008c3567c9dc3699542b69dca37
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-21734
-
-IOStreamFamily.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-f66e1be35cc893be907e91b6bc0f76e7
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-256
-
diff --git a/i386/include/IOKit/stream/.svn/text-base/IOStream.h.svn-base b/i386/include/IOKit/stream/.svn/text-base/IOStream.h.svn-base
deleted file mode 100644
index 01efad4..0000000
--- a/i386/include/IOKit/stream/.svn/text-base/IOStream.h.svn-base
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- *  Copyright 2006 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#if !defined(__IOKIT_IOSTREAM_H)
-#define __IOKIT_IOSTREAM_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/IOUserClient.h>
-
-#include <IOKit/stream/IOStreamShared.h>
-
-/*!
-    @header IOStream.h
-    Definitions for IOStream family.
- */
-
-class IOStreamBuffer;
-
-/*!
-    @class IOStream
-    @abstract
-    A class representing a stream of data buffers passed from kernel to
-    user space and back again.
-    @discussion
-    The IOStream class defines a mechanism for moving buffers of data from
-    kernel space to user space or vice-versa.  The policy for which direction
-    the data flows and the nature of the data is left up the the implementer
-    of the driver which uses IOStream.
-
-    Although it is expected that the client of an IOStream will be in user space,
-    this is not required.
- 
-    References to "output" mean "from the IOStream to the user client", and
-    "input" means "from the user client to the IOStream."
-
- */
-
-class IOStream : public IOService
-{
-    OSDeclareDefaultStructors(IOStream);
-
- protected:
-    OSArray *               _buffers;       // IOStreamBuffer objects in this stream
-
-    IOItemCount             _queueCount;    // Number of entries for the queues
-    
-    IOMemoryDescriptor *    _inputQueueDescriptor;
-    IOMemoryMap *           _inputQueueMap;
-    
-    IOMemoryDescriptor *    _outputQueueDescriptor;
-    IOMemoryMap *           _outputQueueMap;
-    
-    IOStreamBufferQueue *   _outputQueue;   // Shared memory for buffers out to user space
-    IOStreamBufferQueue *   _inputQueue;    // Shared memory for buffers in from user space
-    
-    mach_port_t             _outputPort;
-    mach_port_t             _inputPort;
-    
-    OSArray *               _memoryMaps;    // Maps for data queues
-    
-    IOStreamMode            _streamMode;
-    
- public:
-        
-    /*!
-        @functiongroup Creating IOStream objects
-     */
-        
-    /*!
-        @function withBuffers
-     @param mode The initial mode of the stream, either output, input, or input/output.
-     @param queueLength The nuber of queue entries to reserve in the input and output queue.
-     Zero means to make the queues big enough to accommodate all the buffers at once.
-     @param properties
-     A dictionary of properties which will be set on the stream.
-     @param buffers
-     An array of IOStreamBuffer objects which will be the buffers for this stream.
-     */
-        
-    static IOStream *withBuffers(OSArray *buffers, IOStreamMode mode = kIOStreamModeOutput, IOItemCount queueLength = 0, OSDictionary *properties = 0);
-    
-    virtual bool init(OSDictionary *properties = 0);
-    
-    /*!
-        @function initWithBuffers
-     @param mode The initial mode of the stream, either output, input, or input/output.
-     @param queueLength The nuber of queue entries to reserve in the input and output queue.
-     Zero means to make the queues big enough to accommodate all the buffers at once.
-     @param properties
-     A dictionary of properties which will be set on the stream.
-     @param buffers
-     An array of IOStreamBuffer objects which will be the buffers for this stream.
-     */
-    virtual bool initWithBuffers(OSArray *buffers, IOStreamMode mode = kIOStreamModeOutput, IOItemCount queueLength = 0, OSDictionary *properties = 0);
-    
-    /*!
-        @function free
-     */
-    virtual void free(void);
-    
-    /*!
-        @functiongroup Opening and closing streams
-     */
-    
-    /*!
-        @function handleOpen
-        @abstract The handleOpen() method relies on the default IOService behavior
-        to ensure that
-        only one client has the stream open at a time.
-        The shared input and output queues are created at open time.
-     @param options
-     @param arg
-     */
-    virtual bool handleOpen( 	IOService *	  forClient,
-                                IOOptionBits	  options,
-                                void *		  arg );
-    
-    /*!
-        @function handleClose
-        @abstract The handleClose method destroys the shared input and output
-        queues.
-     @param options
-     */
-    virtual void handleClose(   IOService *	  forClient,
-                                IOOptionBits  options );
-
-    /*!
-        @functiongroup Managing shared queues
-     */
-    
-    /*!
-        @function createQueues
-        @abstract Creates the shared input and output queues, without regard
-        to whether the stream is open or not.
-        Normally this is called by handleOpen().
-     @param queueLength
-     @param options
-     @result Returns kIOReturnSuccess if the queues were successfully created.
-     */
-    virtual IOReturn createQueues( IOItemCount queueLength = 0, IOOptionBits options = 0 );
-    
-    /*!
-        @function destroyQueues
-        @abstract Releases the shared input and output queues.
-     @result Returns kIOReturnSuccess if the queues were successfully destroyed.
-     The queues cannot be destroyed while the stream is open by a client.
-     */
-    virtual IOReturn destroyQueues( void );
-    
-    /*!
-        @function getOutputQueue
-     @result A pointer to the output IOStreamBufferQueue structure for the stream,
-     or NULL if the stream is not open and the queue has not been created yet.
-     */
-    virtual IOStreamBufferQueue *getOutputQueue(void);           // get shared-memory output queue
-    
-    /*!
-        @function getOutputQueueMemoryDescriptor
-     @result An IOMemoryDescriptor object repesenting the shared memory
-     output queue buffer.
-     */
-    virtual IOMemoryDescriptor *getOutputQueueMemoryDescriptor(void);
-    
-    /*!
-        @function getInputQueue
-     @result A pointer to the input IOStreamBufferQueue structure for the stream,
-     or NULL if the stream is not open and the queue has not been created yet.
-     */
-    virtual IOStreamBufferQueue *getInputQueue(void);            // get shared-memory input queue
-    
-    /*!
-        @function getInputQueueMemoryDescriptor
-     @result An IOMemoryDescriptor object repesenting the shared memory
-     input queue buffer.
-     */
-    virtual IOMemoryDescriptor *getInputQueueMemoryDescriptor(void);
-    
-    
-    /*!
-        @functiongroup Managing buffers in an IOStream
-     */
-    
-    /*!
-        @function addBuffer
-        @abstract Add a buffer to an IOStream.
-        @param buffer
-        @discussion
-        Adds an IOStreamBuffer to an IOStream.  It will be added to the end
-     of the buffer array, so the buffer ID of existing buffers will not change.
-     */
-    virtual IOReturn addBuffer(IOStreamBuffer *buffer);  // add a new buffer to the stream
-    
-    /*!
-        @function addBuffers
-     @param buffers
-     @result
-     */
-    virtual IOReturn addBuffers(OSArray *buffers);
-
-    /*!
-        @function removeBuffer
-     @param buffer A pointer to an IOStreamBuffer object in the stream.
-     @result Returns kIOReturnSuccess if the buffer was removed, or kIOReturnNotFound
-     if the buffer was not in this stream.
-     @abstract
-     Removes a buffer from the stream.  Buffers cannot be removed
-     while the stream is open, as this will change the buffer IDs of existing
-     buffers.
-     */
-    virtual IOReturn removeBuffer(IOStreamBuffer *buffer);
-    
-    /*!
-        @function removeBuffer
-     @param bufferID The ID of the buffer to remove.
-     @result Returns kIOReturnSuccess if the buffer was removed.
-     @abstract
-     Removes a buffer from the stream.  Buffers cannot be removed
-     while the stream is open, as this will change the buffer IDs of existing
-     buffers.
-     */
-    
-    virtual IOReturn removeBuffer(IOStreamBufferID bufferID);
-    
-    /*!
-        @function removeAllBuffers
-     @result
-     */
-    virtual IOReturn removeAllBuffers( void );
-    
-    /*!
-        @function removeAllBuffers
-     @result Returns kIOReturnSuccess if all the buffers were successfully
-     removed.   Buffers cannot be removed
-     while the stream is open, as this will change the buffer IDs of existing
-     buffers.
-     
-     */
-    virtual IOItemCount getBufferCount( void );
-    
-    /*!
-        @function getBuffers
-        @abstract Get an array containing all the buffers in the stream.
-        @discussion
-        Returns an OSArray containing all the buffers in the stream in order of their buffer ID.
-     */
-    virtual OSArray *getBuffers( void );
-    
-    
-    /*!
-        @function getBufferWithID
-     @param bufferID
-     The ID of the buffer to get.
-     @result
-     A pointer to an IOStreamBuffer object, or NULL if the
-     buffer ID was invalid for this stream.
-     */
-    
-    virtual IOStreamBuffer *getBufferWithID(IOStreamBufferID bufferID);
-    
-    /*!
-        @functiongroup Managing notification ports
-     */
-    
-    /*!
-        @function getInputPort
-        @abstract Get the Mach port used to receive notifications
-        from user space that a buffer has been added to the input queue.
-     */
-    virtual mach_port_t getInputPort(void);
-    
-    /*!
-        @function setInputPort
-        @abstract Set the Mach port used to receive notifications from
-        user space that a buffer has been added to the input queue.
-        @param port
-
-     */
-    virtual IOReturn setInputPort(mach_port_t port);
-    
-    /*!
-        @function getOutputPort
-        @abstract Get the Mach port used to send notifications to user space
-        that a buffer has been added to the output queue.
-     */
-    virtual mach_port_t getOutputPort(void);
-    
-    /*!
-        @function setOutputPort
-        @abstract Set the Mach port used to send notifications to user space
-        that a buffer has been added to the output queue.
-        @param port
-     */
-    virtual IOReturn setOutputPort(mach_port_t port);
-    
-    /*!
-        @function sendOutputNotification
-     @abstract Send a notification to the user client that data is available
-     for reading on the output queue.  This will result in the user's output
-     handler being called, if they registered one.
-     @result Returns kIOReturnSuccess if the notification was successfully sent.
-     */
-    virtual IOReturn sendOutputNotification(void);
-    
-    /*!
-        @functiongroup Queueing and dequeueing buffers
-     */
-    
-    /*!
-        @function enqueueOutputBuffer
-        @abstract A convenience method for enqueueing a buffer.
-        @param buffer
-     @param dataOffset
-     @param dataLength
-     @param controlOffset
-     @param controlLength
-     @result
-     */
-    virtual IOReturn enqueueOutputBuffer(IOStreamBuffer *buffer,
-                                         IOByteCount dataOffset = 0,
-                                         IOByteCount dataLength = 0,
-                                         IOByteCount controlOffset = 0,
-                                         IOByteCount controlLength = 0);
-    
-    
-    /*!
-        @function enqueueOutputEntry
-        @param entry
-        @result
-     */
-    virtual IOReturn enqueueOutputEntry( IOStreamBufferQueueEntry *entry );
-    
-    /*!
-        @function dequeueInputEntry
-        @param entry
-     @result
-     */
-    virtual IOReturn dequeueInputEntry( IOStreamBufferQueueEntry *entry );
-    
-    /*!
-        @functiongroup Managing notifications
-     */
-    
-    /*!
-        @function inputCallback
-        @abstract Input callback function to be implemented by a subclass;
-        @param token
-        A 32-bit token value that can be used by convention to communicate
-        from user space to the stream.  The semantics of this value are
-        defined by the IOStream subclass.
-        @discussion
-        The inputCallback() method is called as a result of a fast trap
-        from user space.  It is called on the same thread as the user request,
-        but the subclass should implement this call as a notification sent
-        to a workloop so that the request is asynchronous.
-     */
-    virtual void inputCallback( UInt32 token );
-    
-    /*!
-        @function inputSyncCallback
-        @abstract Input callback function to be implemented by a subclass.
-        @param token
-        A 32-bit token value that can be used by convention to communicate
-        from user space to the stream.  The semantics of this value are
-        defined by the IOStream subclass.
-        @discussion
-        The inputSyncCallback() method is called as a result of a fast trap
-        from user space.  It is called on the same thread as the user request,
-        so no context switch is necessary.
-     */
-    virtual void inputSyncCallback( UInt32 token );
-    
-    /*!
-        @functiongroup Stream control
-     */
-    
-    /*!
-        @function getStreamMode
-     @abstract Returns the mode of the stream, either input or output.
-     @result The mode of the stream, either kIOStreamModeInput
-     (from user space to kernel space) or the default
-     kIOStreamModeOutput (from kernel space to user space).
-     */
-    virtual IOStreamMode getStreamMode(void);
-    
-    /*!
-        @function setStreamMode
-     @abstract Sets the mode of the stream, either input or output.
-     @discussion Subclasses may define whether it is possible
-     to change the mode of a stream.
-     */
-    virtual IOReturn setStreamMode(IOStreamMode mode);
-
-    /*!
-        @function startStream
-     @abstract Start sending data on a stream.
-     @result Returns kIOReturnSuccess if the stream was successfully started.
-     @discussion This must be implemented by a subclass.
-     */
-    virtual IOReturn startStream(void);
-    
-    /*!
-        @function stopStream
-     @abstract Stop sending data on a stream.
-     @result Returns kIOReturnSuccess if the stream was successfully stopped.
-     @discussion This must be implemented by a subclass.
-     */
-    virtual IOReturn stopStream(void);
-    
-    /*!
-        @function suspendStream
-     @abstract Temporarily suspend data flow on the stream.
-     @result Returns kIOReturnSuccess if the stream was successfully suspended.
-     @discussion This must be implemented by a subclass.
-     */
-    virtual IOReturn suspendStream(void);
-    
-    /*!
-        @functiongroup Managing user clients
-     */
-    
-    /*!
-        @function newUserClient
-     @abstract See the documentation for the IOService method newUserClient.
-     */
-    virtual IOReturn newUserClient( task_t owningTask, void * securityID,
-                                    UInt32 type,  OSDictionary * properties,
-                                    IOUserClient ** handler );
-    
-
-    /* Reserved slots */
-    
-    OSMetaClassDeclareReservedUnused(IOStream, 0);
-    OSMetaClassDeclareReservedUnused(IOStream, 1);
-    OSMetaClassDeclareReservedUnused(IOStream, 2);
-    OSMetaClassDeclareReservedUnused(IOStream, 3);
-    OSMetaClassDeclareReservedUnused(IOStream, 4);
-    OSMetaClassDeclareReservedUnused(IOStream, 5);
-    OSMetaClassDeclareReservedUnused(IOStream, 6);
-    OSMetaClassDeclareReservedUnused(IOStream, 7);
-    OSMetaClassDeclareReservedUnused(IOStream, 8);
-    OSMetaClassDeclareReservedUnused(IOStream, 9);
-    OSMetaClassDeclareReservedUnused(IOStream, 10);
-    OSMetaClassDeclareReservedUnused(IOStream, 11);
-    OSMetaClassDeclareReservedUnused(IOStream, 12);
-    OSMetaClassDeclareReservedUnused(IOStream, 13);
-    OSMetaClassDeclareReservedUnused(IOStream, 14);
-    OSMetaClassDeclareReservedUnused(IOStream, 15);
-    OSMetaClassDeclareReservedUnused(IOStream, 16);
-    OSMetaClassDeclareReservedUnused(IOStream, 17);
-    OSMetaClassDeclareReservedUnused(IOStream, 18);
-    OSMetaClassDeclareReservedUnused(IOStream, 19);
-    OSMetaClassDeclareReservedUnused(IOStream, 20);
-    OSMetaClassDeclareReservedUnused(IOStream, 21);
-    OSMetaClassDeclareReservedUnused(IOStream, 22);
-    OSMetaClassDeclareReservedUnused(IOStream, 23);
-    OSMetaClassDeclareReservedUnused(IOStream, 24);
-    OSMetaClassDeclareReservedUnused(IOStream, 25);
-    OSMetaClassDeclareReservedUnused(IOStream, 26);
-    OSMetaClassDeclareReservedUnused(IOStream, 27);
-    OSMetaClassDeclareReservedUnused(IOStream, 28);
-    OSMetaClassDeclareReservedUnused(IOStream, 29);
-    OSMetaClassDeclareReservedUnused(IOStream, 30);
-    OSMetaClassDeclareReservedUnused(IOStream, 31);
-    
-};
-
-
-/*!
-    @class IOStreamBuffer
-    A class representing a data buffer that is part of an IOStream.
- */
-
-class IOStreamBuffer : public OSObject
-{
-    OSDeclareDefaultStructors(IOStreamBuffer);
-
-protected:
-    IOMemoryDescriptor *     _dataBuffer;        // The data buffer is expected to be filled by hardware.
-    IOMemoryDescriptor *     _controlBuffer;     // The control buffer is expected to be defined by the hardware driver.
-    
-    IOStreamBufferID         _bufferID;          // Client handle for this buffer.
-    
-    OSArray *                _clientMemoryMaps;  // Maps for clients who are sharing these buffers.
-    
-    SInt32                   _clientReferenceCount;    // Count of client uses of this buffer.  May be negative.
-    
-public:
-    /*!
-        @function initWithMemoryDescriptors
-     */        
-    virtual bool initWithMemoryDescriptors(IOMemoryDescriptor *dataBuffer,
-                                           IOMemoryDescriptor *controlBuffer,
-                                           IOStreamBufferID bufferID = 0);
-    
-    /*!
-        @function withMemoryDescriptors
-     */    
-    static IOStreamBuffer *withMemoryDescriptors(IOMemoryDescriptor *dataBuffer,
-                                                 IOMemoryDescriptor *controlBuffer,
-                                                 IOStreamBufferID bufferID = 0);
-    
-    virtual void free(void);
-    
-    /*!
-        @function getBufferID
-        @abstract Gets the buffer identifier for the IOStreamBuffer object.
-        @discussion The buffer identifier is unique across all buffers in a stream.
-     */
-    virtual IOStreamBufferID getBufferID(void);
-    
-    /*!
-        @function setBufferID
-        @abstract Sets the buffer identifier for the IOStreamBuffer object.
-     */
-    
-    virtual void setBufferID( IOStreamBufferID bufferID );
-    
-    /*!
-        @function setDataBuffer
-        @abstract Sets the data buffer for the IOStreamBuffer object.
-     */
-    virtual void setDataBuffer(IOMemoryDescriptor *dataBuffer);
-    
-    /*!
-        @function setControlBuffer
-        @abstract Sets the control buffer for the IOStreamBuffer object.
-     */
-    virtual void setControlBuffer(IOMemoryDescriptor *controlBuffer);
-    
-    /*!
-        @function getDataBuffer
-     @result A pointer to the IOMemoryDescriptor for the data buffer.
-     */
-    virtual IOMemoryDescriptor *getDataBuffer(void);
-    
-    /*!
-        @function getControlBuffer
-     @result A pointer to the IOMemoryDescriptor for the control buffer.
-     */
-    virtual IOMemoryDescriptor *getControlBuffer(void);
-    
-    /*!
-        @function getClientReferenceCount
-     @result The count of client references to this buffer.  It may be positive
-     or negative, depending on whether the client is sending data into the kernel,
-     or the kernel is sending data out to the client.
-     */
-    virtual SInt32 getClientReferenceCount( void );
-    
-    /*!
-        @function sendClientReference
-     @param offset The offset in the buffer of the data sent to the client.
-     @param length The length of the data sent to the client.
-     @result The new client reference count.
-     @abstract
-     */
-    virtual SInt32 sendClientReference( IOByteCount offset = 0, IOByteCount length = 0 );
-    
-    /*!
-        @function receiveClientReference
-     @param offset The offset in the buffer of the data from the client.
-     @param length The length of the data from the client.
-     @abstract
-     */
-    virtual SInt32 receiveClientReference( IOByteCount offset = 0, IOByteCount length = 0 );
-    
-    /* Reserved slots */
-    
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 0);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 1);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 2);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 3);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 4);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 5);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 6);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 7);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 8);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 9);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 10);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 11);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 12);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 13);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 14);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 15);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 16);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 17);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 18);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 19);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 20);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 21);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 22);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 23);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 24);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 25);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 26);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 27);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 28);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 29);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 30);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 31);
-    
-};
-
-#endif /* ! __IOKIT_IOSTREAM_H */
-
diff --git a/i386/include/IOKit/stream/.svn/text-base/IOStreamFamily.h.svn-base b/i386/include/IOKit/stream/.svn/text-base/IOStreamFamily.h.svn-base
deleted file mode 100644
index a4eb7f0..0000000
--- a/i386/include/IOKit/stream/.svn/text-base/IOStreamFamily.h.svn-base
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  Copyright 2006 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#ifndef __IOKIT_IOSTREAMFAMILY_H
-#define __IOKIT_IOSTREAMFAMILY_H
-
-#include <IOKit/stream/IOStream.h>
-#include <IOKit/stream/IOStreamShared.h>
-
-
-#endif /* !__IOKIT_IOSTREAMFAMILY_H */
diff --git a/i386/include/IOKit/stream/.svn/text-base/IOStreamShared.h.svn-base b/i386/include/IOKit/stream/.svn/text-base/IOStreamShared.h.svn-base
deleted file mode 100644
index 5b2c0a3..0000000
--- a/i386/include/IOKit/stream/.svn/text-base/IOStreamShared.h.svn-base
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  IOStreamShared.h
- *  IOStreamFamily
- *
- *  Copyright 2006 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#if !defined(__IOKIT_IOSTREAMSHARED_H)
-#define __IOKIT_IOSTREAMSHARED_H
-
-#include <sys/cdefs.h>
-
-#include <IOKit/IOTypes.h>
-
-/*!
-    @header IOStreamShared.h
-    IOStream definitions shared between kernel and user space.
- */
-
-__BEGIN_DECLS    
-   
-// Buffer numbers are guaranteed to go from 0 to bufferCount - 1.
-/*!
-    @typedef IOStreamBufferID
- */
-typedef UInt32 IOStreamBufferID;
-#define kIOStreamBufferIDInvalid (~0)
-
-// This is the header for the shared-memory queue used to send buffer notifications
-// from kernel to user space or vice versa.
-
-// Queue entry in input or output queue
-
-#ifdef __cplusplus
-
-/*!
-    @struct IOStreamBufferQueueEntry
-    @field bufferID     The ID of the buffer passed in this queue entry.
-    @field dataLength   The length of the valid data in the buffer.
-    @field reserved     Reserved for future use.
-*/
-    
-struct IOStreamBufferQueueEntry {
-    IOStreamBufferID    bufferID;
-    UInt32              dataOffset;
-    UInt32              dataLength;
-    UInt32              controlOffset;
-    UInt32              controlLength;
-    UInt32              reserved[3];
-};
-
-
-/*!
-    @struct IOStreamBufferQueue
-    @field entryCount   The number of queue entries in the queue.
-    @field headIndex    The index of the next queue slot that will be filled in by the queue writer.
-    @field tailIndex    The index of the next queue slot that can be read by the queue reader.
-    @field reserved     Reserved for future use.
-    @field queue        The array of queue entries.
- */
-
-struct IOStreamBufferQueue {
-    UInt32                      entryCount;
-    volatile UInt32             headIndex;
-    volatile UInt32             tailIndex;
-    UInt32                      reserved;
-    IOStreamBufferQueueEntry    queue[0];
-};
-
-#else
-
-typedef struct __IOStreamBufferQueueEntry {
-    IOStreamBufferID    bufferID;
-    UInt32              dataOffset;
-    UInt32              dataLength;
-    UInt32              controlOffset;
-    UInt32              controlLength;
-    UInt32              reserved[3];
-} IOStreamBufferQueueEntry;
-
-typedef struct __IOStreamBufferQueue {
-    UInt32                      entryCount;
-    volatile UInt32             headIndex;
-    volatile UInt32             tailIndex;
-    UInt32                      reserved;
-    IOStreamBufferQueueEntry    queue[0];
-} IOStreamBufferQueue;
-
-#endif
-
-/*!
-    @enum Memory mapping types
-    @constant kIOStreamMemoryTypeOutputQueue
-    @constant kIOStreamMemoryTypeInputQueue
-    @constant kIOStreamMemoryTypeBufferData
-    @constant kIOStreamMemoryTypeBufferControl
-    @constant kIOStreamBufferIDMask
-    @constant kIOStreamMemoryTypeMask
-    @abstract Memory types used with IOConnectMapMemory().
- */
-enum {
-    kIOStreamMemoryTypeOutputQueue   = 0x10000000,
-    kIOStreamMemoryTypeInputQueue    = 0x20000000,
-    kIOStreamMemoryTypeBufferData    = 0x30000000,
-    kIOStreamMemoryTypeBufferControl = 0x40000000,
-    kIOStreamBufferIDMask            = 0x0FFFFFFF,
-    kIOStreamMemoryTypeMask          = 0xF0000000
-};
-
-/*!
-    @enum Mach port types
-    @constant kIOStreamPortTypeOutput
-    @constant kIOStreamPortTypeInput
-    @abstract Port types used with IOConnectSetNotificationPort().
- */
-enum {
-    kIOStreamPortTypeOutput,
-    kIOStreamPortTypeInput
-};
-
-/*!
-    @enum IOStream open options
- */
- 
-enum {
-    kIOStreamOptionOpenExclusive = 0x00010000,
-    kIOStreamOptionOpenShared    = 0x00020000
-};
-
-/*!
-    @enum User client methods
-    @constant kIOStreamMethodOpen
-    @constant kIOStreamMethodClose
-    @constant kIOStreamMethodStart
-    @constant kIOStreamMethodStop
-    @constant kIOStreamMethodSuspend
-    @constant kIOStreamMethodGetMode
-    @constant kIOStreamMethodSetMode
- 
-    @abstract Client method numbers used with IOConnectMethod...() functions.
- */
-enum {
-    kIOStreamMethodOpen,
-    kIOStreamMethodClose,
-    kIOStreamMethodStart,
-    kIOStreamMethodStop,
-    kIOStreamMethodSuspend,
-    kIOStreamMethodGetMode,
-    kIOStreamMethodSetMode,
-    kIOStreamMethodGetBufferCount
-};
-
-/*!
-    @enum User client traps
-    @constant kIOStreamEnqueueInputTrap
-    @constant kIOStreamEnqueueInputSyncTrap
-    @abstract Client trap numbers used with IOConnectTrap..() functions.
- */
-enum {
-    kIOStreamEnqueueInputTrap,
-    kIOStreamEnqueueInputSyncTrap
-};
-
-typedef enum {
-    kIOStreamModeInput,         // From user to kernel space
-    kIOStreamModeOutput,        // From kernel to user space
-    kIOStreamModeInputOutput    // bidirectional
-} IOStreamMode;
-
-
-__END_DECLS
-
-#endif /* ! __IOKIT_IOSTREAMSHARED_H */
-
diff --git a/i386/include/IOKit/stream/.svn/text-base/IOStreamUserClient.h.svn-base b/i386/include/IOKit/stream/.svn/text-base/IOStreamUserClient.h.svn-base
deleted file mode 100644
index 887575a..0000000
--- a/i386/include/IOKit/stream/.svn/text-base/IOStreamUserClient.h.svn-base
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  IOStreamUserClient.h
- *  IOStreamFamily
- *
- *  Copyright 2006 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#if !defined( __IOKIT_IOSTREAMUSERCLIENT_H )
-#define __IOKIT_IOSTREAMUSERCLIENT_H
-
-
-#include <IOKit/IOUserClient.h>
-
-#include <IOKit/stream/IOStreamShared.h>
-#include <IOKit/stream/IOStream.h>
-
-class IOStreamUserClient : public IOUserClient
-{
-    OSDeclareDefaultStructors( IOStreamUserClient )
-    
-protected:
-    IOStream * _owner;
-    task_t     _task;
-    
-public:
-    virtual bool initWithTask(
-                                  task_t owningTask, void * securityToken, UInt32 type,
-                                  OSDictionary * properties);
-    virtual bool initWithTask(
-                              task_t owningTask, void * securityToken, UInt32 type);
-    
-    virtual IOReturn clientClose( void );
-    virtual IOReturn clientDied( void );
-
-    virtual IOService * getService( void );
-    
-    virtual IOReturn registerNotificationPort(
-                                              mach_port_t port, UInt32 type, UInt32 refCon );
-    
-    virtual IOReturn connectClient( IOUserClient * client );
-    
-    virtual IOExternalMethod * getTargetAndMethodForIndex(
-                                                          IOService ** targetP, UInt32 index );
-    
-    virtual IOExternalTrap *
-      getTargetAndTrapForIndex( IOService **targetP, UInt32 index );
-
-    virtual IOReturn clientMemoryForType( UInt32 type,
-                                          IOOptionBits * options,
-                                          IOMemoryDescriptor ** memory );
-    
-    virtual bool start( IOService * provider );
-    
-    
-protected:
-    virtual IOReturn openMethod(  char * dataIn, char * dataOut,
-                                  IOByteCount inputSize, IOByteCount * outputSize );
-    virtual IOReturn closeMethod( void );
-    virtual IOReturn startMethod( void );
-    virtual IOReturn stopMethod( void );
-    virtual IOReturn suspendMethod( void );
-    virtual IOReturn getModeMethod(  char * dataOut,
-                                     IOByteCount * outputSize );
-    virtual IOReturn setModeMethod(  char * dataIn, 
-                                     IOByteCount inputSize );
-    virtual IOReturn getBufferCountMethod(  char * dataOut,
-                                            IOByteCount * outputSize );
-    
-    virtual IOReturn inputTrap( UInt32 token );
-    virtual IOReturn inputSyncTrap( UInt32 token );
-
-};
-
-#endif /* ! __IOKIT_IOSTREAMUSERCLIENT_H */
-
diff --git a/i386/include/IOKit/stream/IOStream.h b/i386/include/IOKit/stream/IOStream.h
deleted file mode 100644
index 01efad4..0000000
--- a/i386/include/IOKit/stream/IOStream.h
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- *  Copyright 2006 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#if !defined(__IOKIT_IOSTREAM_H)
-#define __IOKIT_IOSTREAM_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/IOUserClient.h>
-
-#include <IOKit/stream/IOStreamShared.h>
-
-/*!
-    @header IOStream.h
-    Definitions for IOStream family.
- */
-
-class IOStreamBuffer;
-
-/*!
-    @class IOStream
-    @abstract
-    A class representing a stream of data buffers passed from kernel to
-    user space and back again.
-    @discussion
-    The IOStream class defines a mechanism for moving buffers of data from
-    kernel space to user space or vice-versa.  The policy for which direction
-    the data flows and the nature of the data is left up the the implementer
-    of the driver which uses IOStream.
-
-    Although it is expected that the client of an IOStream will be in user space,
-    this is not required.
- 
-    References to "output" mean "from the IOStream to the user client", and
-    "input" means "from the user client to the IOStream."
-
- */
-
-class IOStream : public IOService
-{
-    OSDeclareDefaultStructors(IOStream);
-
- protected:
-    OSArray *               _buffers;       // IOStreamBuffer objects in this stream
-
-    IOItemCount             _queueCount;    // Number of entries for the queues
-    
-    IOMemoryDescriptor *    _inputQueueDescriptor;
-    IOMemoryMap *           _inputQueueMap;
-    
-    IOMemoryDescriptor *    _outputQueueDescriptor;
-    IOMemoryMap *           _outputQueueMap;
-    
-    IOStreamBufferQueue *   _outputQueue;   // Shared memory for buffers out to user space
-    IOStreamBufferQueue *   _inputQueue;    // Shared memory for buffers in from user space
-    
-    mach_port_t             _outputPort;
-    mach_port_t             _inputPort;
-    
-    OSArray *               _memoryMaps;    // Maps for data queues
-    
-    IOStreamMode            _streamMode;
-    
- public:
-        
-    /*!
-        @functiongroup Creating IOStream objects
-     */
-        
-    /*!
-        @function withBuffers
-     @param mode The initial mode of the stream, either output, input, or input/output.
-     @param queueLength The nuber of queue entries to reserve in the input and output queue.
-     Zero means to make the queues big enough to accommodate all the buffers at once.
-     @param properties
-     A dictionary of properties which will be set on the stream.
-     @param buffers
-     An array of IOStreamBuffer objects which will be the buffers for this stream.
-     */
-        
-    static IOStream *withBuffers(OSArray *buffers, IOStreamMode mode = kIOStreamModeOutput, IOItemCount queueLength = 0, OSDictionary *properties = 0);
-    
-    virtual bool init(OSDictionary *properties = 0);
-    
-    /*!
-        @function initWithBuffers
-     @param mode The initial mode of the stream, either output, input, or input/output.
-     @param queueLength The nuber of queue entries to reserve in the input and output queue.
-     Zero means to make the queues big enough to accommodate all the buffers at once.
-     @param properties
-     A dictionary of properties which will be set on the stream.
-     @param buffers
-     An array of IOStreamBuffer objects which will be the buffers for this stream.
-     */
-    virtual bool initWithBuffers(OSArray *buffers, IOStreamMode mode = kIOStreamModeOutput, IOItemCount queueLength = 0, OSDictionary *properties = 0);
-    
-    /*!
-        @function free
-     */
-    virtual void free(void);
-    
-    /*!
-        @functiongroup Opening and closing streams
-     */
-    
-    /*!
-        @function handleOpen
-        @abstract The handleOpen() method relies on the default IOService behavior
-        to ensure that
-        only one client has the stream open at a time.
-        The shared input and output queues are created at open time.
-     @param options
-     @param arg
-     */
-    virtual bool handleOpen( 	IOService *	  forClient,
-                                IOOptionBits	  options,
-                                void *		  arg );
-    
-    /*!
-        @function handleClose
-        @abstract The handleClose method destroys the shared input and output
-        queues.
-     @param options
-     */
-    virtual void handleClose(   IOService *	  forClient,
-                                IOOptionBits  options );
-
-    /*!
-        @functiongroup Managing shared queues
-     */
-    
-    /*!
-        @function createQueues
-        @abstract Creates the shared input and output queues, without regard
-        to whether the stream is open or not.
-        Normally this is called by handleOpen().
-     @param queueLength
-     @param options
-     @result Returns kIOReturnSuccess if the queues were successfully created.
-     */
-    virtual IOReturn createQueues( IOItemCount queueLength = 0, IOOptionBits options = 0 );
-    
-    /*!
-        @function destroyQueues
-        @abstract Releases the shared input and output queues.
-     @result Returns kIOReturnSuccess if the queues were successfully destroyed.
-     The queues cannot be destroyed while the stream is open by a client.
-     */
-    virtual IOReturn destroyQueues( void );
-    
-    /*!
-        @function getOutputQueue
-     @result A pointer to the output IOStreamBufferQueue structure for the stream,
-     or NULL if the stream is not open and the queue has not been created yet.
-     */
-    virtual IOStreamBufferQueue *getOutputQueue(void);           // get shared-memory output queue
-    
-    /*!
-        @function getOutputQueueMemoryDescriptor
-     @result An IOMemoryDescriptor object repesenting the shared memory
-     output queue buffer.
-     */
-    virtual IOMemoryDescriptor *getOutputQueueMemoryDescriptor(void);
-    
-    /*!
-        @function getInputQueue
-     @result A pointer to the input IOStreamBufferQueue structure for the stream,
-     or NULL if the stream is not open and the queue has not been created yet.
-     */
-    virtual IOStreamBufferQueue *getInputQueue(void);            // get shared-memory input queue
-    
-    /*!
-        @function getInputQueueMemoryDescriptor
-     @result An IOMemoryDescriptor object repesenting the shared memory
-     input queue buffer.
-     */
-    virtual IOMemoryDescriptor *getInputQueueMemoryDescriptor(void);
-    
-    
-    /*!
-        @functiongroup Managing buffers in an IOStream
-     */
-    
-    /*!
-        @function addBuffer
-        @abstract Add a buffer to an IOStream.
-        @param buffer
-        @discussion
-        Adds an IOStreamBuffer to an IOStream.  It will be added to the end
-     of the buffer array, so the buffer ID of existing buffers will not change.
-     */
-    virtual IOReturn addBuffer(IOStreamBuffer *buffer);  // add a new buffer to the stream
-    
-    /*!
-        @function addBuffers
-     @param buffers
-     @result
-     */
-    virtual IOReturn addBuffers(OSArray *buffers);
-
-    /*!
-        @function removeBuffer
-     @param buffer A pointer to an IOStreamBuffer object in the stream.
-     @result Returns kIOReturnSuccess if the buffer was removed, or kIOReturnNotFound
-     if the buffer was not in this stream.
-     @abstract
-     Removes a buffer from the stream.  Buffers cannot be removed
-     while the stream is open, as this will change the buffer IDs of existing
-     buffers.
-     */
-    virtual IOReturn removeBuffer(IOStreamBuffer *buffer);
-    
-    /*!
-        @function removeBuffer
-     @param bufferID The ID of the buffer to remove.
-     @result Returns kIOReturnSuccess if the buffer was removed.
-     @abstract
-     Removes a buffer from the stream.  Buffers cannot be removed
-     while the stream is open, as this will change the buffer IDs of existing
-     buffers.
-     */
-    
-    virtual IOReturn removeBuffer(IOStreamBufferID bufferID);
-    
-    /*!
-        @function removeAllBuffers
-     @result
-     */
-    virtual IOReturn removeAllBuffers( void );
-    
-    /*!
-        @function removeAllBuffers
-     @result Returns kIOReturnSuccess if all the buffers were successfully
-     removed.   Buffers cannot be removed
-     while the stream is open, as this will change the buffer IDs of existing
-     buffers.
-     
-     */
-    virtual IOItemCount getBufferCount( void );
-    
-    /*!
-        @function getBuffers
-        @abstract Get an array containing all the buffers in the stream.
-        @discussion
-        Returns an OSArray containing all the buffers in the stream in order of their buffer ID.
-     */
-    virtual OSArray *getBuffers( void );
-    
-    
-    /*!
-        @function getBufferWithID
-     @param bufferID
-     The ID of the buffer to get.
-     @result
-     A pointer to an IOStreamBuffer object, or NULL if the
-     buffer ID was invalid for this stream.
-     */
-    
-    virtual IOStreamBuffer *getBufferWithID(IOStreamBufferID bufferID);
-    
-    /*!
-        @functiongroup Managing notification ports
-     */
-    
-    /*!
-        @function getInputPort
-        @abstract Get the Mach port used to receive notifications
-        from user space that a buffer has been added to the input queue.
-     */
-    virtual mach_port_t getInputPort(void);
-    
-    /*!
-        @function setInputPort
-        @abstract Set the Mach port used to receive notifications from
-        user space that a buffer has been added to the input queue.
-        @param port
-
-     */
-    virtual IOReturn setInputPort(mach_port_t port);
-    
-    /*!
-        @function getOutputPort
-        @abstract Get the Mach port used to send notifications to user space
-        that a buffer has been added to the output queue.
-     */
-    virtual mach_port_t getOutputPort(void);
-    
-    /*!
-        @function setOutputPort
-        @abstract Set the Mach port used to send notifications to user space
-        that a buffer has been added to the output queue.
-        @param port
-     */
-    virtual IOReturn setOutputPort(mach_port_t port);
-    
-    /*!
-        @function sendOutputNotification
-     @abstract Send a notification to the user client that data is available
-     for reading on the output queue.  This will result in the user's output
-     handler being called, if they registered one.
-     @result Returns kIOReturnSuccess if the notification was successfully sent.
-     */
-    virtual IOReturn sendOutputNotification(void);
-    
-    /*!
-        @functiongroup Queueing and dequeueing buffers
-     */
-    
-    /*!
-        @function enqueueOutputBuffer
-        @abstract A convenience method for enqueueing a buffer.
-        @param buffer
-     @param dataOffset
-     @param dataLength
-     @param controlOffset
-     @param controlLength
-     @result
-     */
-    virtual IOReturn enqueueOutputBuffer(IOStreamBuffer *buffer,
-                                         IOByteCount dataOffset = 0,
-                                         IOByteCount dataLength = 0,
-                                         IOByteCount controlOffset = 0,
-                                         IOByteCount controlLength = 0);
-    
-    
-    /*!
-        @function enqueueOutputEntry
-        @param entry
-        @result
-     */
-    virtual IOReturn enqueueOutputEntry( IOStreamBufferQueueEntry *entry );
-    
-    /*!
-        @function dequeueInputEntry
-        @param entry
-     @result
-     */
-    virtual IOReturn dequeueInputEntry( IOStreamBufferQueueEntry *entry );
-    
-    /*!
-        @functiongroup Managing notifications
-     */
-    
-    /*!
-        @function inputCallback
-        @abstract Input callback function to be implemented by a subclass;
-        @param token
-        A 32-bit token value that can be used by convention to communicate
-        from user space to the stream.  The semantics of this value are
-        defined by the IOStream subclass.
-        @discussion
-        The inputCallback() method is called as a result of a fast trap
-        from user space.  It is called on the same thread as the user request,
-        but the subclass should implement this call as a notification sent
-        to a workloop so that the request is asynchronous.
-     */
-    virtual void inputCallback( UInt32 token );
-    
-    /*!
-        @function inputSyncCallback
-        @abstract Input callback function to be implemented by a subclass.
-        @param token
-        A 32-bit token value that can be used by convention to communicate
-        from user space to the stream.  The semantics of this value are
-        defined by the IOStream subclass.
-        @discussion
-        The inputSyncCallback() method is called as a result of a fast trap
-        from user space.  It is called on the same thread as the user request,
-        so no context switch is necessary.
-     */
-    virtual void inputSyncCallback( UInt32 token );
-    
-    /*!
-        @functiongroup Stream control
-     */
-    
-    /*!
-        @function getStreamMode
-     @abstract Returns the mode of the stream, either input or output.
-     @result The mode of the stream, either kIOStreamModeInput
-     (from user space to kernel space) or the default
-     kIOStreamModeOutput (from kernel space to user space).
-     */
-    virtual IOStreamMode getStreamMode(void);
-    
-    /*!
-        @function setStreamMode
-     @abstract Sets the mode of the stream, either input or output.
-     @discussion Subclasses may define whether it is possible
-     to change the mode of a stream.
-     */
-    virtual IOReturn setStreamMode(IOStreamMode mode);
-
-    /*!
-        @function startStream
-     @abstract Start sending data on a stream.
-     @result Returns kIOReturnSuccess if the stream was successfully started.
-     @discussion This must be implemented by a subclass.
-     */
-    virtual IOReturn startStream(void);
-    
-    /*!
-        @function stopStream
-     @abstract Stop sending data on a stream.
-     @result Returns kIOReturnSuccess if the stream was successfully stopped.
-     @discussion This must be implemented by a subclass.
-     */
-    virtual IOReturn stopStream(void);
-    
-    /*!
-        @function suspendStream
-     @abstract Temporarily suspend data flow on the stream.
-     @result Returns kIOReturnSuccess if the stream was successfully suspended.
-     @discussion This must be implemented by a subclass.
-     */
-    virtual IOReturn suspendStream(void);
-    
-    /*!
-        @functiongroup Managing user clients
-     */
-    
-    /*!
-        @function newUserClient
-     @abstract See the documentation for the IOService method newUserClient.
-     */
-    virtual IOReturn newUserClient( task_t owningTask, void * securityID,
-                                    UInt32 type,  OSDictionary * properties,
-                                    IOUserClient ** handler );
-    
-
-    /* Reserved slots */
-    
-    OSMetaClassDeclareReservedUnused(IOStream, 0);
-    OSMetaClassDeclareReservedUnused(IOStream, 1);
-    OSMetaClassDeclareReservedUnused(IOStream, 2);
-    OSMetaClassDeclareReservedUnused(IOStream, 3);
-    OSMetaClassDeclareReservedUnused(IOStream, 4);
-    OSMetaClassDeclareReservedUnused(IOStream, 5);
-    OSMetaClassDeclareReservedUnused(IOStream, 6);
-    OSMetaClassDeclareReservedUnused(IOStream, 7);
-    OSMetaClassDeclareReservedUnused(IOStream, 8);
-    OSMetaClassDeclareReservedUnused(IOStream, 9);
-    OSMetaClassDeclareReservedUnused(IOStream, 10);
-    OSMetaClassDeclareReservedUnused(IOStream, 11);
-    OSMetaClassDeclareReservedUnused(IOStream, 12);
-    OSMetaClassDeclareReservedUnused(IOStream, 13);
-    OSMetaClassDeclareReservedUnused(IOStream, 14);
-    OSMetaClassDeclareReservedUnused(IOStream, 15);
-    OSMetaClassDeclareReservedUnused(IOStream, 16);
-    OSMetaClassDeclareReservedUnused(IOStream, 17);
-    OSMetaClassDeclareReservedUnused(IOStream, 18);
-    OSMetaClassDeclareReservedUnused(IOStream, 19);
-    OSMetaClassDeclareReservedUnused(IOStream, 20);
-    OSMetaClassDeclareReservedUnused(IOStream, 21);
-    OSMetaClassDeclareReservedUnused(IOStream, 22);
-    OSMetaClassDeclareReservedUnused(IOStream, 23);
-    OSMetaClassDeclareReservedUnused(IOStream, 24);
-    OSMetaClassDeclareReservedUnused(IOStream, 25);
-    OSMetaClassDeclareReservedUnused(IOStream, 26);
-    OSMetaClassDeclareReservedUnused(IOStream, 27);
-    OSMetaClassDeclareReservedUnused(IOStream, 28);
-    OSMetaClassDeclareReservedUnused(IOStream, 29);
-    OSMetaClassDeclareReservedUnused(IOStream, 30);
-    OSMetaClassDeclareReservedUnused(IOStream, 31);
-    
-};
-
-
-/*!
-    @class IOStreamBuffer
-    A class representing a data buffer that is part of an IOStream.
- */
-
-class IOStreamBuffer : public OSObject
-{
-    OSDeclareDefaultStructors(IOStreamBuffer);
-
-protected:
-    IOMemoryDescriptor *     _dataBuffer;        // The data buffer is expected to be filled by hardware.
-    IOMemoryDescriptor *     _controlBuffer;     // The control buffer is expected to be defined by the hardware driver.
-    
-    IOStreamBufferID         _bufferID;          // Client handle for this buffer.
-    
-    OSArray *                _clientMemoryMaps;  // Maps for clients who are sharing these buffers.
-    
-    SInt32                   _clientReferenceCount;    // Count of client uses of this buffer.  May be negative.
-    
-public:
-    /*!
-        @function initWithMemoryDescriptors
-     */        
-    virtual bool initWithMemoryDescriptors(IOMemoryDescriptor *dataBuffer,
-                                           IOMemoryDescriptor *controlBuffer,
-                                           IOStreamBufferID bufferID = 0);
-    
-    /*!
-        @function withMemoryDescriptors
-     */    
-    static IOStreamBuffer *withMemoryDescriptors(IOMemoryDescriptor *dataBuffer,
-                                                 IOMemoryDescriptor *controlBuffer,
-                                                 IOStreamBufferID bufferID = 0);
-    
-    virtual void free(void);
-    
-    /*!
-        @function getBufferID
-        @abstract Gets the buffer identifier for the IOStreamBuffer object.
-        @discussion The buffer identifier is unique across all buffers in a stream.
-     */
-    virtual IOStreamBufferID getBufferID(void);
-    
-    /*!
-        @function setBufferID
-        @abstract Sets the buffer identifier for the IOStreamBuffer object.
-     */
-    
-    virtual void setBufferID( IOStreamBufferID bufferID );
-    
-    /*!
-        @function setDataBuffer
-        @abstract Sets the data buffer for the IOStreamBuffer object.
-     */
-    virtual void setDataBuffer(IOMemoryDescriptor *dataBuffer);
-    
-    /*!
-        @function setControlBuffer
-        @abstract Sets the control buffer for the IOStreamBuffer object.
-     */
-    virtual void setControlBuffer(IOMemoryDescriptor *controlBuffer);
-    
-    /*!
-        @function getDataBuffer
-     @result A pointer to the IOMemoryDescriptor for the data buffer.
-     */
-    virtual IOMemoryDescriptor *getDataBuffer(void);
-    
-    /*!
-        @function getControlBuffer
-     @result A pointer to the IOMemoryDescriptor for the control buffer.
-     */
-    virtual IOMemoryDescriptor *getControlBuffer(void);
-    
-    /*!
-        @function getClientReferenceCount
-     @result The count of client references to this buffer.  It may be positive
-     or negative, depending on whether the client is sending data into the kernel,
-     or the kernel is sending data out to the client.
-     */
-    virtual SInt32 getClientReferenceCount( void );
-    
-    /*!
-        @function sendClientReference
-     @param offset The offset in the buffer of the data sent to the client.
-     @param length The length of the data sent to the client.
-     @result The new client reference count.
-     @abstract
-     */
-    virtual SInt32 sendClientReference( IOByteCount offset = 0, IOByteCount length = 0 );
-    
-    /*!
-        @function receiveClientReference
-     @param offset The offset in the buffer of the data from the client.
-     @param length The length of the data from the client.
-     @abstract
-     */
-    virtual SInt32 receiveClientReference( IOByteCount offset = 0, IOByteCount length = 0 );
-    
-    /* Reserved slots */
-    
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 0);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 1);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 2);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 3);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 4);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 5);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 6);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 7);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 8);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 9);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 10);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 11);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 12);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 13);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 14);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 15);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 16);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 17);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 18);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 19);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 20);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 21);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 22);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 23);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 24);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 25);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 26);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 27);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 28);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 29);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 30);
-    OSMetaClassDeclareReservedUnused(IOStreamBuffer, 31);
-    
-};
-
-#endif /* ! __IOKIT_IOSTREAM_H */
-
diff --git a/i386/include/IOKit/stream/IOStreamFamily.h b/i386/include/IOKit/stream/IOStreamFamily.h
deleted file mode 100644
index a4eb7f0..0000000
--- a/i386/include/IOKit/stream/IOStreamFamily.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  Copyright 2006 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#ifndef __IOKIT_IOSTREAMFAMILY_H
-#define __IOKIT_IOSTREAMFAMILY_H
-
-#include <IOKit/stream/IOStream.h>
-#include <IOKit/stream/IOStreamShared.h>
-
-
-#endif /* !__IOKIT_IOSTREAMFAMILY_H */
diff --git a/i386/include/IOKit/stream/IOStreamShared.h b/i386/include/IOKit/stream/IOStreamShared.h
deleted file mode 100644
index 5b2c0a3..0000000
--- a/i386/include/IOKit/stream/IOStreamShared.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  IOStreamShared.h
- *  IOStreamFamily
- *
- *  Copyright 2006 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#if !defined(__IOKIT_IOSTREAMSHARED_H)
-#define __IOKIT_IOSTREAMSHARED_H
-
-#include <sys/cdefs.h>
-
-#include <IOKit/IOTypes.h>
-
-/*!
-    @header IOStreamShared.h
-    IOStream definitions shared between kernel and user space.
- */
-
-__BEGIN_DECLS    
-   
-// Buffer numbers are guaranteed to go from 0 to bufferCount - 1.
-/*!
-    @typedef IOStreamBufferID
- */
-typedef UInt32 IOStreamBufferID;
-#define kIOStreamBufferIDInvalid (~0)
-
-// This is the header for the shared-memory queue used to send buffer notifications
-// from kernel to user space or vice versa.
-
-// Queue entry in input or output queue
-
-#ifdef __cplusplus
-
-/*!
-    @struct IOStreamBufferQueueEntry
-    @field bufferID     The ID of the buffer passed in this queue entry.
-    @field dataLength   The length of the valid data in the buffer.
-    @field reserved     Reserved for future use.
-*/
-    
-struct IOStreamBufferQueueEntry {
-    IOStreamBufferID    bufferID;
-    UInt32              dataOffset;
-    UInt32              dataLength;
-    UInt32              controlOffset;
-    UInt32              controlLength;
-    UInt32              reserved[3];
-};
-
-
-/*!
-    @struct IOStreamBufferQueue
-    @field entryCount   The number of queue entries in the queue.
-    @field headIndex    The index of the next queue slot that will be filled in by the queue writer.
-    @field tailIndex    The index of the next queue slot that can be read by the queue reader.
-    @field reserved     Reserved for future use.
-    @field queue        The array of queue entries.
- */
-
-struct IOStreamBufferQueue {
-    UInt32                      entryCount;
-    volatile UInt32             headIndex;
-    volatile UInt32             tailIndex;
-    UInt32                      reserved;
-    IOStreamBufferQueueEntry    queue[0];
-};
-
-#else
-
-typedef struct __IOStreamBufferQueueEntry {
-    IOStreamBufferID    bufferID;
-    UInt32              dataOffset;
-    UInt32              dataLength;
-    UInt32              controlOffset;
-    UInt32              controlLength;
-    UInt32              reserved[3];
-} IOStreamBufferQueueEntry;
-
-typedef struct __IOStreamBufferQueue {
-    UInt32                      entryCount;
-    volatile UInt32             headIndex;
-    volatile UInt32             tailIndex;
-    UInt32                      reserved;
-    IOStreamBufferQueueEntry    queue[0];
-} IOStreamBufferQueue;
-
-#endif
-
-/*!
-    @enum Memory mapping types
-    @constant kIOStreamMemoryTypeOutputQueue
-    @constant kIOStreamMemoryTypeInputQueue
-    @constant kIOStreamMemoryTypeBufferData
-    @constant kIOStreamMemoryTypeBufferControl
-    @constant kIOStreamBufferIDMask
-    @constant kIOStreamMemoryTypeMask
-    @abstract Memory types used with IOConnectMapMemory().
- */
-enum {
-    kIOStreamMemoryTypeOutputQueue   = 0x10000000,
-    kIOStreamMemoryTypeInputQueue    = 0x20000000,
-    kIOStreamMemoryTypeBufferData    = 0x30000000,
-    kIOStreamMemoryTypeBufferControl = 0x40000000,
-    kIOStreamBufferIDMask            = 0x0FFFFFFF,
-    kIOStreamMemoryTypeMask          = 0xF0000000
-};
-
-/*!
-    @enum Mach port types
-    @constant kIOStreamPortTypeOutput
-    @constant kIOStreamPortTypeInput
-    @abstract Port types used with IOConnectSetNotificationPort().
- */
-enum {
-    kIOStreamPortTypeOutput,
-    kIOStreamPortTypeInput
-};
-
-/*!
-    @enum IOStream open options
- */
- 
-enum {
-    kIOStreamOptionOpenExclusive = 0x00010000,
-    kIOStreamOptionOpenShared    = 0x00020000
-};
-
-/*!
-    @enum User client methods
-    @constant kIOStreamMethodOpen
-    @constant kIOStreamMethodClose
-    @constant kIOStreamMethodStart
-    @constant kIOStreamMethodStop
-    @constant kIOStreamMethodSuspend
-    @constant kIOStreamMethodGetMode
-    @constant kIOStreamMethodSetMode
- 
-    @abstract Client method numbers used with IOConnectMethod...() functions.
- */
-enum {
-    kIOStreamMethodOpen,
-    kIOStreamMethodClose,
-    kIOStreamMethodStart,
-    kIOStreamMethodStop,
-    kIOStreamMethodSuspend,
-    kIOStreamMethodGetMode,
-    kIOStreamMethodSetMode,
-    kIOStreamMethodGetBufferCount
-};
-
-/*!
-    @enum User client traps
-    @constant kIOStreamEnqueueInputTrap
-    @constant kIOStreamEnqueueInputSyncTrap
-    @abstract Client trap numbers used with IOConnectTrap..() functions.
- */
-enum {
-    kIOStreamEnqueueInputTrap,
-    kIOStreamEnqueueInputSyncTrap
-};
-
-typedef enum {
-    kIOStreamModeInput,         // From user to kernel space
-    kIOStreamModeOutput,        // From kernel to user space
-    kIOStreamModeInputOutput    // bidirectional
-} IOStreamMode;
-
-
-__END_DECLS
-
-#endif /* ! __IOKIT_IOSTREAMSHARED_H */
-
diff --git a/i386/include/IOKit/stream/IOStreamUserClient.h b/i386/include/IOKit/stream/IOStreamUserClient.h
deleted file mode 100644
index 887575a..0000000
--- a/i386/include/IOKit/stream/IOStreamUserClient.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  IOStreamUserClient.h
- *  IOStreamFamily
- *
- *  Copyright 2006 Apple Computer, Inc. All rights reserved.
- *
- */
-
-#if !defined( __IOKIT_IOSTREAMUSERCLIENT_H )
-#define __IOKIT_IOSTREAMUSERCLIENT_H
-
-
-#include <IOKit/IOUserClient.h>
-
-#include <IOKit/stream/IOStreamShared.h>
-#include <IOKit/stream/IOStream.h>
-
-class IOStreamUserClient : public IOUserClient
-{
-    OSDeclareDefaultStructors( IOStreamUserClient )
-    
-protected:
-    IOStream * _owner;
-    task_t     _task;
-    
-public:
-    virtual bool initWithTask(
-                                  task_t owningTask, void * securityToken, UInt32 type,
-                                  OSDictionary * properties);
-    virtual bool initWithTask(
-                              task_t owningTask, void * securityToken, UInt32 type);
-    
-    virtual IOReturn clientClose( void );
-    virtual IOReturn clientDied( void );
-
-    virtual IOService * getService( void );
-    
-    virtual IOReturn registerNotificationPort(
-                                              mach_port_t port, UInt32 type, UInt32 refCon );
-    
-    virtual IOReturn connectClient( IOUserClient * client );
-    
-    virtual IOExternalMethod * getTargetAndMethodForIndex(
-                                                          IOService ** targetP, UInt32 index );
-    
-    virtual IOExternalTrap *
-      getTargetAndTrapForIndex( IOService **targetP, UInt32 index );
-
-    virtual IOReturn clientMemoryForType( UInt32 type,
-                                          IOOptionBits * options,
-                                          IOMemoryDescriptor ** memory );
-    
-    virtual bool start( IOService * provider );
-    
-    
-protected:
-    virtual IOReturn openMethod(  char * dataIn, char * dataOut,
-                                  IOByteCount inputSize, IOByteCount * outputSize );
-    virtual IOReturn closeMethod( void );
-    virtual IOReturn startMethod( void );
-    virtual IOReturn stopMethod( void );
-    virtual IOReturn suspendMethod( void );
-    virtual IOReturn getModeMethod(  char * dataOut,
-                                     IOByteCount * outputSize );
-    virtual IOReturn setModeMethod(  char * dataIn, 
-                                     IOByteCount inputSize );
-    virtual IOReturn getBufferCountMethod(  char * dataOut,
-                                            IOByteCount * outputSize );
-    
-    virtual IOReturn inputTrap( UInt32 token );
-    virtual IOReturn inputSyncTrap( UInt32 token );
-
-};
-
-#endif /* ! __IOKIT_IOSTREAMUSERCLIENT_H */
-
diff --git a/i386/include/IOKit/system_management/.svn/all-wcprops b/i386/include/IOKit/system_management/.svn/all-wcprops
deleted file mode 100644
index 3d336c3..0000000
--- a/i386/include/IOKit/system_management/.svn/all-wcprops
+++ /dev/null
@@ -1,11 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 70
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/system_management
-END
-IOWatchDogTimer.h
-K 25
-svn:wc:ra_dav:version-url
-V 88
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/system_management/IOWatchDogTimer.h
-END
diff --git a/i386/include/IOKit/system_management/.svn/entries b/i386/include/IOKit/system_management/.svn/entries
deleted file mode 100644
index 0e7985e..0000000
--- a/i386/include/IOKit/system_management/.svn/entries
+++ /dev/null
@@ -1,62 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/system_management
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-IOWatchDogTimer.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-e2ec51de6352bd52efa9e10f4dcc69f0
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2076
-
diff --git a/i386/include/IOKit/system_management/.svn/text-base/IOWatchDogTimer.h.svn-base b/i386/include/IOKit/system_management/.svn/text-base/IOWatchDogTimer.h.svn-base
deleted file mode 100644
index a89b95b..0000000
--- a/i386/include/IOKit/system_management/.svn/text-base/IOWatchDogTimer.h.svn-base
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOWATCHDOGTIMER_H
-#define _IOWATCHDOGTIMER_H
-
-#include <IOKit/IOService.h>
-
-class IOWatchDogTimer : public IOService
-{
-  OSDeclareAbstractStructors(IOWatchDogTimer);
-  
-protected:
-  IONotifier *notifier;
-  struct ExpansionData { };
-  ExpansionData *reserved;
-  
-public:
-  virtual bool start(IOService *provider);
-  virtual void stop(IOService *provider);
-  virtual IOReturn setProperties(OSObject *properties);
-  virtual void setWatchDogTimer(UInt32 timeOut) = 0;
-  
-  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  0);
-  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  1);
-  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  2);
-  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  3);
-};
-
-#endif /* !_IOWATCHDOGTIMER_H */
diff --git a/i386/include/IOKit/system_management/IOWatchDogTimer.h b/i386/include/IOKit/system_management/IOWatchDogTimer.h
deleted file mode 100644
index a89b95b..0000000
--- a/i386/include/IOKit/system_management/IOWatchDogTimer.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOWATCHDOGTIMER_H
-#define _IOWATCHDOGTIMER_H
-
-#include <IOKit/IOService.h>
-
-class IOWatchDogTimer : public IOService
-{
-  OSDeclareAbstractStructors(IOWatchDogTimer);
-  
-protected:
-  IONotifier *notifier;
-  struct ExpansionData { };
-  ExpansionData *reserved;
-  
-public:
-  virtual bool start(IOService *provider);
-  virtual void stop(IOService *provider);
-  virtual IOReturn setProperties(OSObject *properties);
-  virtual void setWatchDogTimer(UInt32 timeOut) = 0;
-  
-  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  0);
-  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  1);
-  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  2);
-  OSMetaClassDeclareReservedUnused(IOWatchDogTimer,  3);
-};
-
-#endif /* !_IOWATCHDOGTIMER_H */
diff --git a/i386/include/IOKit/usb/.svn/all-wcprops b/i386/include/IOKit/usb/.svn/all-wcprops
deleted file mode 100644
index 2069f31..0000000
--- a/i386/include/IOKit/usb/.svn/all-wcprops
+++ /dev/null
@@ -1,155 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 56
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb
-END
-USB.h
-K 25
-svn:wc:ra_dav:version-url
-V 62
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/USB.h
-END
-IOUSBControllerListElement.h
-K 25
-svn:wc:ra_dav:version-url
-V 85
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBControllerListElement.h
-END
-IOUSBBus.h
-K 25
-svn:wc:ra_dav:version-url
-V 67
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBBus.h
-END
-IOUSBControllerV2.h
-K 25
-svn:wc:ra_dav:version-url
-V 76
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBControllerV2.h
-END
-IOUSBMassStorageUFISubclass.h
-K 25
-svn:wc:ra_dav:version-url
-V 86
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBMassStorageUFISubclass.h
-END
-IOUSBControllerV3.h
-K 25
-svn:wc:ra_dav:version-url
-V 76
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBControllerV3.h
-END
-IOUSBPipe.h
-K 25
-svn:wc:ra_dav:version-url
-V 68
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBPipe.h
-END
-IOUSBHubDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBHubDevice.h
-END
-IOUSBDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 70
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBDevice.h
-END
-IOUSBInterface.h
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBInterface.h
-END
-IOUFIStorageServices.h
-K 25
-svn:wc:ra_dav:version-url
-V 79
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUFIStorageServices.h
-END
-IOUSBRootHubDevice.h
-K 25
-svn:wc:ra_dav:version-url
-V 77
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBRootHubDevice.h
-END
-USBSpec.h
-K 25
-svn:wc:ra_dav:version-url
-V 66
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/USBSpec.h
-END
-USBTracepoints.h
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/USBTracepoints.h
-END
-IOUSBWorkLoop.h
-K 25
-svn:wc:ra_dav:version-url
-V 72
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBWorkLoop.h
-END
-IOUSBUserClient.h
-K 25
-svn:wc:ra_dav:version-url
-V 74
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBUserClient.h
-END
-IOUSBMassStorageClass.h
-K 25
-svn:wc:ra_dav:version-url
-V 80
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBMassStorageClass.h
-END
-IOUSBHubPolicyMaker.h
-K 25
-svn:wc:ra_dav:version-url
-V 78
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBHubPolicyMaker.h
-END
-IOUSBCompositeDriver.h
-K 25
-svn:wc:ra_dav:version-url
-V 79
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBCompositeDriver.h
-END
-IOUSBCommand.h
-K 25
-svn:wc:ra_dav:version-url
-V 71
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBCommand.h
-END
-IOUSBHIDDriver.h
-K 25
-svn:wc:ra_dav:version-url
-V 73
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBHIDDriver.h
-END
-IOUSBLog.h
-K 25
-svn:wc:ra_dav:version-url
-V 67
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBLog.h
-END
-IOUSBController.h
-K 25
-svn:wc:ra_dav:version-url
-V 74
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBController.h
-END
-IOUSBNub.h
-K 25
-svn:wc:ra_dav:version-url
-V 67
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/IOUSBNub.h
-END
-USBHub.h
-K 25
-svn:wc:ra_dav:version-url
-V 65
-/svn/chameleon/!svn/ver/881/trunk/i386/include/IOKit/usb/USBHub.h
-END
diff --git a/i386/include/IOKit/usb/.svn/entries b/i386/include/IOKit/usb/.svn/entries
deleted file mode 100644
index ffd827b..0000000
--- a/i386/include/IOKit/usb/.svn/entries
+++ /dev/null
@@ -1,878 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/IOKit/usb
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-USB.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-8bf23d0dad1a9225363c787a94ec58bc
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-45107
-
-IOUSBControllerListElement.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-e919de00cc53e1f24ba901f60aa320e3
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4738
-
-IOUSBBus.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-ad6cbbbb1af98d5a96673d2b761ba9e5
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1183
-
-IOUSBControllerV2.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-5883ee016e6e171b318462f148c4d64d
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-20855
-
-IOUSBMassStorageUFISubclass.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-378eb3a378af0fb004606ffed9d9136c
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11928
-
-IOUSBControllerV3.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-9932d9ac063d5f679fe298271057ead4
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12479
-
-IOUSBPipe.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-5b768a7a705b59ee7b8165ebb65fbcdf
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-17471
-
-IOUSBHubDevice.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-e2d30f06c2626b944387f533cd6d0828
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10211
-
-IOUSBDevice.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-7e6687d8ebc8537c69885481626bcce5
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-28373
-
-IOUSBInterface.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-59d558e91299bdbcd54eca2005080b56
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-12213
-
-IOUFIStorageServices.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-60a9064a8b4272e667e4a57281afbb3f
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4777
-
-IOUSBRootHubDevice.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-4c9f61f93aca3228f4c7556b0056821e
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3376
-
-USBSpec.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-3136341088b9dbc0e613e3beb7ba1af8
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-15028
-
-USBTracepoints.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-b1631300f3a48e7b698ab3e4baf60dd3
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-20349
-
-IOUSBWorkLoop.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-4b4594c45a9238ed70acee961217da1d
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2000
-
-IOUSBUserClient.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-f22ed4f18efbd8826acc1a651f368cca
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5331
-
-IOUSBMassStorageClass.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-51cb0b7ba0d53f61721664ef0325a539
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-17705
-
-IOUSBHubPolicyMaker.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-138fe70e48636d05d0b66dfc39842385
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-9227
-
-IOUSBCompositeDriver.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-1de600100621201d642fb2bb395f9758
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5382
-
-IOUSBCommand.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-af982f7c12ee99330cb6ffaa73b32a03
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10859
-
-IOUSBHIDDriver.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-1d0f69397c09ecc6c1a685d252418bd6
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-11853
-
-IOUSBLog.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-79f3680f444a5eb350afeec515f05e49
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7979
-
-IOUSBController.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-e5238919996dfc66485bb3f01e35de2e
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-50775
-
-IOUSBNub.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-e436676a1824525edd3ef6f8ee62f088
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2165
-
-USBHub.h
-file
-
-
-
-
-2012-10-03T17:50:20.000000Z
-7f59dcf439d351c5f6e8b4bb4ecceb9b
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-7420
-
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUFIStorageServices.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUFIStorageServices.h.svn-base
deleted file mode 100644
index cac43f4..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUFIStorageServices.h.svn-base
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-
-#ifndef _IOKIT_UFI_STORAGE_SERVICES_H_
-#define _IOKIT_UFI_STORAGE_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/storage/IOBlockStorageDevice.h>
-#include <IOKit/usb/IOUSBMassStorageUFISubclass.h>
-
-
-class IOUFIStorageServices : public IOBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IOUFIStorageServices )
-
-private:
-	bool							fMediaChanged;
-	bool							fMediaPresent;
-
-protected:
-	
-    IOUSBMassStorageUFIDevice *		fProvider;
-
-	UInt64							fMaxReadBlocks;
-	UInt64							fMaxWriteBlocks;
-	
-	virtual bool	attach ( IOService * provider );
-	virtual void	detach ( IOService * provider );
-	
-    // Reserve space for future expansion.
-    struct IOUFIStorageServicesExpansionData { };
-    IOUFIStorageServicesExpansionData *fIOUFIStorageServicesReserved;
-	
-public:
-
-	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
-
-	static void 		AsyncReadWriteComplete ( void * 			clientData,
-                                				 IOReturn			status,
-                                				 UInt64 			actualByteCount );
-
-    // Deprecated
-    virtual IOReturn    doAsyncReadWrite (	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-                                            
-	virtual IOReturn	doAsyncReadWrite (  IOMemoryDescriptor *    buffer,
-                                            UInt64                  block, 
-                                            UInt64                  nblks,
-                                            IOStorageAttributes *   attributes,
-                                            IOStorageCompletion *   completion );
-
-	virtual IOReturn	doSyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks );
-
-    virtual IOReturn	doEjectMedia ( void );
-
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-
-    virtual IOReturn	doSynchronizeCache ( void );
-        
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-    
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-    
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-
-    virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-    
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 1 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 2 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 3 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 4 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 5 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 6 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 7 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 8 );
-
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_UFI_STORAGE_SERVICES_H_ */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBBus.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBBus.h.svn-base
deleted file mode 100644
index a42191a..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBBus.h.svn-base
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBBUS_H
-#define _IOKIT_IOUSBBUS_H
-
-#include <IOKit/IOService.h>
-
-class IOUSBBus : public IOService
-{
-    OSDeclareAbstractStructors(IOUSBBus)
-};
-
-#endif /* ! _IOKIT_IOUSBBUS_H */
-
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBCommand.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBCommand.h.svn-base
deleted file mode 100644
index 0f7c36b..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBCommand.h.svn-base
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBCOMMAND_H
-#define _IOKIT_IOUSBCOMMAND_H
-
-#include <IOKit/IOCommand.h>
-#include <IOKit/IOCommandPool.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IODMACommand.h>
-#include <IOKit/usb/USB.h>
-
-/*
- * USB Command
- * This is the command block for a USB command to be queued on the
- * Command Gate of the WorkLoop.  Although the actual work of creating
- * the command and enqueueing it is done for them via the deviceRequest,
- * read, and write methods, this is the primary way that devices will get
- * work done.
- * Note: This is private to IOUSBController and should be moved to a
- * private header.
- */
-
-typedef enum {
-    DEVICE_REQUEST,						// Device request using pointer
-    READ,
-    WRITE,
-    CREATE_EP,
-    DELETE_EP,
-    DEVICE_REQUEST_DESC,				// Device request using descriptor
-	DEVICE_REQUEST_BUFFERCOMMAND		// Device request using a second IOUSBCommand in _bufferCommand
-} usbCommand;
-
-
-
-/*!
- @class IOUSBCommand
- @abstract A subclass of IOCommand that is used to add USB specific data.
- */
-class IOUSBCommand : public IOCommand
-{
-    OSDeclareAbstractStructors(IOUSBCommand)
-
-protected:
-    usbCommand				_selector;
-    IOUSBDeviceRequestPtr	_request;
-    USBDeviceAddress		_address;
-    UInt8					_endpoint;
-    UInt8					_direction;
-    UInt8					_type;
-    bool					_bufferRounding;
-    IOMemoryDescriptor *	_buffer;
-    IOUSBCompletion			_uslCompletion;
-    IOUSBCompletion			_clientCompletion;
-    UInt32					_dataRemaining;							// For Control transfers
-    UInt8					_stage;									// For Control transfers
-    IOReturn				_status;
-    IOMemoryDescriptor *	_origBuffer;
-    IOUSBCompletion			_disjointCompletion;
-    IOByteCount				_dblBufLength;
-    UInt32					_noDataTimeout;
-    UInt32					_completionTimeout;
-    UInt32					_UIMScratch[10];
-    
-    struct ExpansionData
-    {
-        IOByteCount			_reqCount;
-		IOMemoryDescriptor *_requestMemoryDescriptor;
-		IOMemoryDescriptor *_bufferMemoryDescriptor;
-		bool				_multiTransferTransaction;
-		bool				_finalTransferInTransaction;
-        bool				_useTimeStamp;
-        AbsoluteTime		_timeStamp;
-		bool				_isSyncTransfer;						// Returns true if the command is used for a synchronous transfer
-		IODMACommand		*_dmaCommand;							// used to get memory mapping
-		IOUSBCommand		*_bufferUSBCommand;						// points to another IOUSBCommand used for phase 2 of control transactions
-		IOUSBCommand		*_masterUSBCommand;						// points from the bufferUSBCommand back to the parent command
-    };
-    ExpansionData * 		_expansionData;
-    
-    // we override these OSObject method in order to allocate and release our expansion data
-    virtual bool init();
-    virtual void free();
-
-public:
-
-    // static constructor
-    static IOUSBCommand *	NewCommand(void);
-
-    // Manipulators
-    void					SetSelector(usbCommand sel);
-    void  					SetRequest(IOUSBDeviceRequestPtr req);
-    void  					SetAddress(USBDeviceAddress addr);
-    void  					SetEndpoint(UInt8 ep);
-    void  					SetDirection(UInt8 dir);
-    void  					SetType(UInt8 type);
-    void  					SetBufferRounding(bool br);
-    void  					SetBuffer(IOMemoryDescriptor *buf);
-    void  					SetUSLCompletion(IOUSBCompletion completion);
-    void  					SetClientCompletion(IOUSBCompletion completion);
-    void  					SetDataRemaining(UInt32 dr);
-    void  					SetStage(UInt8 stage);
-    void 					SetStatus(IOReturn stat);
-    void 					SetOrigBuffer(IOMemoryDescriptor *buf);
-    void 					SetDisjointCompletion(IOUSBCompletion completion);
-    void 					SetDblBufLength(IOByteCount len);
-    void 					SetNoDataTimeout(UInt32 to);
-    void 					SetCompletionTimeout(UInt32 to);
-    void 					SetUIMScratch(UInt32 index, UInt32 value);
-    void 					SetReqCount(IOByteCount reqCount);
-    void					SetRequestMemoryDescriptor(IOMemoryDescriptor *requestMemoryDescriptor);
-    void					SetBufferMemoryDescriptor(IOMemoryDescriptor *bufferMemoryDescriptor);
-    void					SetMultiTransferTransaction(bool);
-    void					SetFinalTransferInTransaction(bool);
-    void					SetUseTimeStamp(bool);
-    void					SetTimeStamp(AbsoluteTime timeStamp);
-	void					SetIsSyncTransfer(bool);
-	inline void				SetDMACommand(IODMACommand *dmaCommand)					{ _expansionData->_dmaCommand = dmaCommand; }
-	void					SetBufferUSBCommand(IOUSBCommand *bufferUSBCommand);
-	
-	// Accessors
-    usbCommand					GetSelector(void);
-    IOUSBDeviceRequestPtr		GetRequest(void);
-    USBDeviceAddress			GetAddress(void);
-    UInt8						GetEndpoint(void);
-    UInt8						GetDirection(void);
-    UInt8						GetType(void);
-    bool						GetBufferRounding(void);
-    IOMemoryDescriptor *		GetBuffer(void);
-    IOUSBCompletion				GetUSLCompletion(void);
-    IOUSBCompletion				GetClientCompletion(void);
-    UInt32						GetDataRemaining(void);
-    UInt8						GetStage(void);
-    IOReturn					GetStatus(void);
-    IOMemoryDescriptor *		GetOrigBuffer(void);
-    IOUSBCompletion				GetDisjointCompletion(void);
-    IOByteCount					GetDblBufLength(void);
-    UInt32						GetNoDataTimeout(void);
-    UInt32						GetCompletionTimeout(void);
-    UInt32						GetUIMScratch(UInt32 index);
-    IOByteCount					GetReqCount(void);
-    IOMemoryDescriptor *		GetRequestMemoryDescriptor(void);
-    IOMemoryDescriptor *		GetBufferMemoryDescriptor(void);
-    bool						GetMultiTransferTransaction(void);
-    bool						GetFinalTransferInTransaction(void);
-    bool						GetUseTimeStamp(void);
-    AbsoluteTime				GetTimeStamp(void);
-	bool						GetIsSyncTransfer(void);
-	inline IODMACommand *		GetDMACommand(void)							{return _expansionData->_dmaCommand; }
-	inline IOUSBCommand *		GetBufferUSBCommand(void)					{return _expansionData->_bufferUSBCommand; }
-};
-
-
-class IOUSBIsocCommand : public IOCommand
-{
-    OSDeclareAbstractStructors(IOUSBIsocCommand)
-
-protected:
-    usbCommand				_selector;
-    USBDeviceAddress		_address;
-    UInt8					_endpoint;
-    UInt8					_direction;
-    IOMemoryDescriptor *	_buffer;
-    IOUSBIsocCompletion		_completion;
-    UInt64					_startFrame;
-    UInt32					_numFrames;
-    IOUSBIsocFrame *		_frameList;
-    IOReturn				_status;
-    
-    struct ExpansionData
-    {
-        UInt32				_updateFrequency;
-        bool				_useTimeStamp;
-        AbsoluteTime		_timeStamp;
-		bool				_isSyncTransfer;								// Returns true if the command is used for a synchronous transfer
-		bool				_rosettaClient;
-		IODMACommand *		_dmaCommand;
-		IOUSBIsocCompletion	_uslCompletion;
-		bool				_lowLatency;
-    };
-    ExpansionData * 		_expansionData;
-
-    // we override these OSObject method in order to allocate and release our expansion data
-    virtual bool init();
-    virtual void free();
-
-public:
-    // static constructor
-    static IOUSBIsocCommand *NewCommand(void);
-    
-    // Manipulators
-    void					SetSelector(usbCommand sel)							{_selector = sel; }
-    void					SetAddress(USBDeviceAddress addr)					{_address = addr; }
-    void					SetEndpoint(UInt8 ep)								{_endpoint = ep; }
-    void					SetDirection(UInt8 dir)								{_direction = dir; }
-    void					SetBuffer(IOMemoryDescriptor *buf)					{_buffer = buf; }
-    void					SetCompletion(IOUSBIsocCompletion completion)		{_completion = completion; }
-    void					SetStartFrame(UInt64 sf)							{_startFrame = sf; }
-    void					SetNumFrames(UInt32 nf)								{_numFrames = nf; }
-    void					SetFrameList(IOUSBIsocFrame *fl)					{_frameList = fl; }
-    void					SetStatus(IOReturn stat)							{_status = stat; }
-    void					SetUpdateFrequency( UInt32 fr)						{ _expansionData->_updateFrequency = fr; }
-    void					SetUseTimeStamp(bool useIt)							{ _expansionData->_useTimeStamp= useIt; }
-    void					SetTimeStamp(AbsoluteTime timeStamp)				{ _expansionData->_timeStamp= timeStamp; }
- 	void					SetIsSyncTransfer(bool isSync)						{ _expansionData->_isSyncTransfer = isSync; }
- 	void					SetRosettaClient(bool isRosetta)					{ _expansionData->_rosettaClient = isRosetta; }
- 	void					SetDMACommand(IODMACommand *dmaCommand)				{ _expansionData->_dmaCommand = dmaCommand; }
-    void					SetUSLCompletion(IOUSBIsocCompletion completion)	{ _expansionData->_uslCompletion = completion; }
- 	void					SetLowLatency(bool lowLatency)						{ _expansionData->_lowLatency = lowLatency; }
-
-	// Accessors
-    usbCommand				GetSelector(void)								{ return _selector; }
-    USBDeviceAddress		GetAddress(void)								{ return _address; }
-    UInt8					GetEndpoint(void)								{ return _endpoint; }
-    UInt8					GetDirection(void)								{ return _direction; }
-    IOMemoryDescriptor *	GetBuffer(void)									{ return _buffer; }
-    IOUSBIsocCompletion		GetCompletion(void)								{ return _completion; }
-    UInt64					GetStartFrame(void)								{ return _startFrame; }
-    UInt32					GetNumFrames(void)								{ return _numFrames; }
-    IOUSBIsocFrame *		GetFrameList(void)								{ return _frameList; }
-    UInt32					GetUpdateFrequency(void)						{ return _expansionData->_updateFrequency; }
-    IOReturn				GetStatus(void)									{ return _status; }
-    bool					GetUseTimeStamp(void)							{ return _expansionData->_useTimeStamp; }
-    AbsoluteTime			GetTimeStamp(void)								{ return _expansionData->_timeStamp; }
-	bool					GetIsSyncTransfer(void)							{ return _expansionData->_isSyncTransfer; }
-	bool					GetIsRosettaClient(void)						{ return _expansionData->_rosettaClient; }
-	IODMACommand *			GetDMACommand(void)								{ return _expansionData->_dmaCommand; }
-    IOUSBIsocCompletion		GetUSLCompletion(void)							{ return _expansionData->_uslCompletion; }
-	bool					GetLowLatency(void)								{ return _expansionData->_lowLatency; }
-};
-
-class IOUSBCommandPool : public IOCommandPool
-{
-    OSDeclareDefaultStructors( IOUSBCommandPool )
-	
-protected:
-    virtual IOReturn gatedReturnCommand(IOCommand * command);
-	virtual IOReturn gatedGetCommand(IOCommand ** command, bool blockForCommand);
-	
-public:
-    static IOCommandPool * withWorkLoop(IOWorkLoop * inWorkLoop);
-};
-
-
-#endif
-
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBCompositeDriver.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBCompositeDriver.h.svn-base
deleted file mode 100644
index ef72cf4..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBCompositeDriver.h.svn-base
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1998-2006 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBCompositeDriver_H
-#define _IOKIT_IOUSBCompositeDriver_H
-
-//================================================================================================
-//
-//   Headers
-//
-//================================================================================================
-//
-#include <libkern/OSByteOrder.h>
-#include <IOKit/IOLib.h>
-#include <IOKit/IONotifier.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/usb/IOUSBBus.h>
-#include <IOKit/usb/IOUSBDevice.h>
-#include <IOKit/usb/IOUSBInterface.h>
-#include <IOKit/usb/IOUSBLog.h>
-#include <IOKit/usb/USB.h>
-
-
-//================================================================================================
-//
-//   Class Declaration for IOUSBCompositeDriver
-//
-//================================================================================================
-//
-/*!
- @class IOUSBCompositeDriver
- @abstract Driver that matches to USB composite devices.
- @discussion This class can be overriden to provide for specific behaviors.  The driver itself essentially
- just calls SetConfiguration().
- */
-class IOUSBCompositeDriver : public IOService
-{
-    OSDeclareDefaultStructors(IOUSBCompositeDriver)
-    
-    IOUSBDevice	* 	fDevice;
-    IONotifier * 	fNotifier;
-    bool		fExpectingClose;
-    UInt8               fConfigValue;
-    UInt8               fConfigbmAttributes;
-    
-    struct IOUSBCompositeDriverExpansionData 
-    {
-    };
-    
-    IOUSBCompositeDriverExpansionData * fIOUSBCompositeExpansionData;
-    
-    static IOReturn         CompositeDriverInterestHandler(  void * target, void * refCon, UInt32 messageType, IOService * provider,  void * messageArgument, vm_size_t argSize );
-    
-public:
-        
-		// IOService Methods
-		//
-		virtual bool            start(IOService * provider);
-    virtual IOReturn        message( UInt32 type, IOService * provider,  void * argument = 0 );
-    virtual bool            willTerminate( IOService * provider, IOOptionBits options );
-    virtual bool            didTerminate( IOService * provider, IOOptionBits options, bool * defer );
-    
-    // IOUSBCompositeDriver Methods
-    //
-    virtual bool            ConfigureDevice();
-    virtual IOReturn        ReConfigureDevice();
-    /*!
-		@function SetConfiguration
-     @abstract Call IOUSBDevice to do a SetConfiguration call to the device.
-     @param configValue The desired configuration value.
-     @param startInterfaceMatching A boolean specifying whether IOKit should begin the process of finding
-     matching drivers for the new IOUSBInterface objects.
-     */
-    virtual IOReturn SetConfiguration(UInt8 configValue, bool startInterfaceMatching=true);
-    
-    // Getters
-    //
-    bool                                GetExpectingClose()         { return fExpectingClose; }
-    UInt8                               GetConfigValue()            { return fConfigValue; }
-    UInt8                               GetConfigbmAttributes()     { return fConfigbmAttributes; }
-    IONotifier *                        GetNotifier()               { return fNotifier; }
-	
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  0);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  1);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  2);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  3);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  4);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  5);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  6);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  7);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  8);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  9);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 10);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 11);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 12);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 13);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 14);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 15);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 16);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 17);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 18);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 19);
-};
-
-#endif _IOKIT_IOUSBCompositeDriver_H
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBController.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBController.h.svn-base
deleted file mode 100644
index 18940f2..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBController.h.svn-base
+++ /dev/null
@@ -1,1073 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.2 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
- * Please see the License for the specific language governing rights and 
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBCONTROLLER_H
-#define _IOKIT_IOUSBCONTROLLER_H
-
-//================================================================================================
-//
-//   Headers
-//
-//================================================================================================
-//
-#include <libkern/c++/OSArray.h>
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IODeviceMemory.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IOCommandPool.h>
-
-#include <IOKit/usb/USB.h>
-#include <IOKit/usb/USBHub.h>
-#include <IOKit/usb/IOUSBBus.h>
-#include <IOKit/usb/IOUSBNub.h>
-#include <IOKit/usb/IOUSBCommand.h>
-#include <IOKit/usb/IOUSBWorkLoop.h>
-
-
-//================================================================================================
-//
-//   Types and Constants
-//
-//================================================================================================
-//
-enum
-{
-    kErrataCMDDisableTestMode					= (1 << 0),		// turn off UHCI test mode
-    kErrataOnlySinglePageTransfers				= (1 << 1),		// Don't cross page boundaries in a single transfer
-    kErrataRetryBufferUnderruns					= (1 << 2),		// Don't cross page boundaries in a single transfer
-    kErrataLSHSOpti								= (1 << 3),		// Don't cross page boundaries in a single transfer
-    kErrataDisableOvercurrent					= (1 << 4),		// Always set the NOCP bit in rhDescriptorA register
-    kErrataLucentSuspendResume					= (1 << 5),		// Don't allow port suspend at the root hub
-    kErrataNeedsWatchdogTimer					= (1 << 6),		// Use Watchdog timer to reset confused controllers
-    kErrataNeedsPortPowerOff					= (1 << 7),		// Power off the ports and back on again to clear weird status.
-    kErrataAgereEHCIAsyncSched					= (1 << 8),		// needs workaround for Async Sched bug
-    kErrataNECOHCIIsochWraparound				= (1 << 9),		// needs workaround for NEC isoch buffer wraparound problem
-	kErrataNECIncompleteWrite					= (1 << 10),	// needs workaround for NEC bits not sticking (errata IBB-2UE-00030 Jun 23 2005)
-	kErrataICH6PowerSequencing					= (1 << 11),	// needs special power sequencing for early Transition machines
-	kErrataICH7ISTBuffer						= (1 << 12),	// buffer for Isochronous Scheduling Threshold
-	kErrataUHCISupportsOvercurrent				= (1 << 13),	// UHCI controller supports overcurrent detection
-	kErrataNeedsOvercurrentDebounce				= (1 << 14),	// The overcurrent indicator should be debounced by 10ms
-	kErrataSupportsPortResumeEnable				= (1 << 15),	// UHCI has resume enable bits at config address 0xC4
-	kErrataNoCSonSplitIsoch						= (1 << 16),	// MCP79 - split iscoh is a little different
-	kErrataOHCINoGlobalSuspendOnSleep			= (1 << 17),	// when sleeping, do not put the OHCI controller in SUSPEND state. just leave it Operational with suspended downstream ports
-	kErrataMissingPortChangeInt					= (1 << 18),	// sometimes the port change interrupt may be missing
-	kErrataMCP79IgnoreDisconnect				= (1 << 19),	// MCP79 - need to ignore a connect/disconnect on wake
-	kErrataUse32bitEHCI							= (1 << 20)	,	// MCP79 - EHCI should only run with 32 bit DMA addresses
-	kErrataUHCISupportsResumeDetectOnConnect	= (1 << 21),	// UHCI controller will generate a ResumeDetect interrupt while in Global Suspend if a device is plugged in
-	kErrataDontUseCompanionController			= (1 << 22)		// For systems which will end up being EHCI only
-};
-
-enum
-{
-    kUSBWatchdogTimeoutMS = 1000
-};
-
-
-/*!
-    @struct
-    @discussion This table contains the list of errata that are necessary for known problems with particular devices.
-    The format is vendorID, product ID, lowest revisionID needing errata, highest rev needing errata, errataBits.
-    The result of all matches is ORed together, so more than one entry may match.
-    Typically for a given errata a list of revisions that this applies to is supplied.
-     @field vendID      The Vendor ID of the device
-     @field deviceID    Product ID of device
-     @field revisionLo  Lowest product revsion to apply errata to
-     @field revisionHi  Highest product revision to apply errata to
-     @field errata      Bit field flagging which errata to apply to device.
-*/
-
-struct ErrataListEntryStruct
-{
-    UInt16 				vendID;
-    UInt16 				deviceID;
-    UInt16 				revisionLo;
-    UInt16 				revisionHi;
-    UInt32 				errata;
-};
-
-typedef struct ErrataListEntryStruct  ErrataListEntry, *ErrataListEntryPtr;
-
-
-//================================================================================================
-//
-//   Routines used to implement synchronous I/O
-//
-//================================================================================================
-//
-void IOUSBSyncCompletion(void *target, void * parameter, IOReturn status, UInt32 bufferSizeRemaining);
-
-void  IOUSBSyncIsoCompletion(void *target, void * parameter, IOReturn status, IOUSBIsocFrame *pFrames);
-
-
-//================================================================================================
-//
-//   Forward Declarations
-//
-//================================================================================================
-//
-class IOUSBDevice;
-class IOUSBLog;
-class IOUSBHubDevice;
-class IOUSBRootHubDevice;
-class IOMemoryDescriptor;
-
-
-//================================================================================================
-//
-//   IOUSBController Class
-//
-//================================================================================================
-//
-/*!
-    @class IOUSBController
-    @abstract Base class for USB hardware driver
-    @discussion Not many directly useful methods for USB device driver writers,
-    IOUSBDevice, IOUSBInterface and IOUSBPipe provide more useful abstractions.
-    The bulk of this class interfaces between IOKit and the low-level UIM, which is
-    based on the MacOS9 UIM. To impliment a new controller type, subclass
-    IOUSBController and impiment all the "UIM functions". AppleUSBOHCI
-    is an example of this implementing all the functions necessary to drive an
-    OHCI controller.
-*/
-class IOUSBController : public IOUSBBus
-{
-    OSDeclareAbstractStructors(IOUSBController)
-    friend class IOUSBControllerV2;
-    friend class IOUSBControllerV3;
-
-protected:
-
-    IOUSBWorkLoop *			_workLoop;
-    IOCommandGate *			_commandGate;
-    IOUSBRootHubDevice *	_rootHubDevice;
-    UInt32					_devZeroLock;
-    static UInt32			_busCount;
-    static bool				gUsedBusIDs[256];
-    
-    struct ExpansionData 
-    {
-		IOCommandPool		*freeUSBCommandPool;
-		IOCommandPool		*freeUSBIsocCommandPool;
-        IOTimerEventSource	*watchdogUSBTimer;
-        bool				_terminating;
-        bool				_watchdogTimerActive;
-        bool				_pcCardEjected;						// Obsolete
-        UInt32				_busNumber;
-        UInt32				_currentSizeOfCommandPool;
-        UInt32				_currentSizeOfIsocCommandPool;
-        UInt8				_controllerSpeed;					// Controller speed, passed down for splits
-        thread_call_t		_terminatePCCardThread;				// Obsolete
-        bool				_addressPending[128];
-		SInt32				_activeIsochTransfers;				// isochronous transfers in the queue
-		IOService			*_provider;							// common name for our provider
-		bool				_controllerCanSleep;				// true iff the controller is able to support sleep/wake
-		bool				_needToClose;
-		UInt32				_isochMaxBusStall;					// value (in ns) of the maximum PCI bus stall allowed for Isoch..
-    };
-    ExpansionData *_expansionData;
-	
-    // The following methods do not use and upper case initial letter because they are part of IOKit
-    //
-
-public:
-    virtual bool 		init( OSDictionary *  propTable );
-    virtual bool 		start( IOService *  provider );
-    virtual void 		stop( IOService * provider );
-    virtual bool 		finalize(IOOptionBits options);
-    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
-    virtual bool		didTerminate( IOService * provider, IOOptionBits options, bool * defer );
-	
-protected:
-		
-    IOReturn			getNubResources( IOService *  regEntry );
-
-    virtual UInt32 		GetErrataBits(
-                                            UInt16 vendorID, 
-                                            UInt16 deviceID, 
-                                            UInt16 revisionID );    
-    
-
-    static IOReturn 		DoDeleteEP( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoAbortEP( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoClearEPStall( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoCreateEP( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-    static IOReturn 		DoControlTransfer( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoIOTransfer( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoIsocTransfer(	
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoLowLatencyIsocTransfer(	
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static void			ControlPacketHandler( 
-                                                    OSObject *	target,
-                                                    void *	parameter,
-                                                    IOReturn	status,
-                                                    UInt32	bufferSizeRemaining );
-                                                    
-    static void			InterruptPacketHandler(
-                                                    OSObject *	target,
-                                                    void * 	parameter,
-                                                    IOReturn	status,
-                                                    UInt32	bufferSizeRemaining );
-                                                    
-    static void			BulkPacketHandler(
-                                                    OSObject *	target,
-                                                    void * 	parameter,
-                                                    IOReturn	status,
-                                                    UInt32	bufferSizeRemaining );
-
-    static void			IsocCompletionHandler(
-                                                    OSObject *		target,
-                                                    void * 		parameter,
-                                                    IOReturn		status,
-                                                    IOUSBIsocFrame	*pFrames );
-                                                    
-    static void			LowLatencyIsocCompletionHandler(
-                                                    OSObject *		target,
-                                                    void * 		parameter,
-                                                    IOReturn		status,
-                                                    IOUSBLowLatencyIsocFrame	*pFrames );
-                                                    
-    static void			WatchdogTimer(OSObject *target, IOTimerEventSource *sender);
-
-	// Obsolete
-    static void 		TerminatePCCard(OSObject *target);
-
-    static IOReturn		ProtectedDevZeroLock(OSObject *target, void* lock, void *, void *, void*);
-
-
-    USBDeviceAddress		GetNewAddress( void );
-    
-    IOReturn    		ControlTransaction( IOUSBCommand *  command );
-    
-    IOReturn    		InterruptTransaction( IOUSBCommand *  command );
-    
-    IOReturn    		BulkTransaction( IOUSBCommand *	command );
-    
-    IOReturn    		IsocTransaction( IOUSBIsocCommand *  command );
-    
-    IOReturn    		LowLatencyIsocTransaction( IOUSBIsocCommand *  command );
-    
-    void 			FreeCommand( IOUSBCommand *  command );
-
-    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    // Invokes the specified completion action of the request.  If
-    // the completion action is unspecified, no action is taken.
-    void 			Complete(
-                     IOUSBCompletion	completion,
-                     IOReturn		status,
-                     UInt32		actualByteCount = 0 );
-
-    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    // Invokes the specified completion action of the request.  If
-    // the completion action is unspecified, no action is taken.
-    void	CompleteWithTimeStamp (
-                                IOUSBCompletionWithTimeStamp		completion,
-                                IOReturn				status,
-                                UInt32					actualByteCount,
-                                AbsoluteTime				timeStamp);
-
-    
-
-    //
-    // UIM methods
-    //
-
-/*!
-    @function UIMInitialize
-    @abstract UIM function, initialise the controller and UIM data structures.
-*/
-    virtual IOReturn 		UIMInitialize( IOService * provider ) = 0;
-    
-/*!
-    @function UIMFinalize
-    @abstract UIM function, finalise the controller and UIM data structures prior to removal.
-*/
-    virtual IOReturn 		UIMFinalize() = 0;
-
-    // Control
-/*!
-    @function UIMCreateControlEndpoint
-    @abstract UIM function, create a control endpoint for the controller.
-    @param functionNumber  The USB device ID of the device for this endpoint
-    @param endpointNumber  The endpoint number for this endpoint
-    @param maxPacketSize   Maximum packet size of this endpoint
-    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
-*/
-    virtual IOReturn 		UIMCreateControlEndpoint(
-                                                            UInt8	functionNumber,
-                                                            UInt8	endpointNumber,
-                                                            UInt16	maxPacketSize,
-                                                            UInt8	speed) = 0;
-
-/* Note: this function has been superceded. */
-    virtual IOReturn 		UIMCreateControlTransfer(   short		functionNumber,
-                                                            short		endpointNumber,
-                                                            IOUSBCompletion	completion,
-                                                            void *		CBP,
-                                                            bool		bufferRounding,
-                                                            UInt32		bufferSize,
-                                                            short		direction) = 0;
-
-/*!
-    @function UIMCreateControlTransfer
-    @abstract UIM function, Do a transfer on a control endpoint.
-                This method supercedes the method which takes a void * parameter.
-    @param functionNumber  The USB device ID of the device to perform the transaction with
-    @param endpointNumber  The endpoint number for the transaction
-    @param completion      Action to perform when I/O completes
-    @param CBP             Memory descriptor describing the buffer to transfer. Will never describe
-                             memory which has disjoint packets.
-    @param bufferRounding  If true, short packets are OK and do not cause an error
-    @param bufferSize      Size of the data to transfer in the data phase. (C
-    @param direction       Specifies direction and PID for transaction. kUSBIn, KUSBOut (DATA PID) or kUSBSetup (SETUP PID).
-*/
-    virtual IOReturn 		UIMCreateControlTransfer(   short			functionNumber,
-                                                            short			endpointNumber,
-                                                            IOUSBCompletion		completion,
-                                                            IOMemoryDescriptor *	CBP,
-                                                            bool			bufferRounding,
-                                                            UInt32			bufferSize,
-                                                            short			direction) = 0;
-    
-    // Bulk
-/*!
-    @function UIMCreateBulkEndpoint
-    @abstract UIM function, create a bulk endpoint for the controller.
-    @param functionNumber  The USB device ID of the device for this endpoint
-    @param endpointNumber  The endpoint number for this endpoint
-    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
-    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
-    @param maxPacketSize   Maximum packet size of this endpoint
-*/
-    virtual IOReturn 		UIMCreateBulkEndpoint(
-                                                        UInt8		functionNumber,
-                                                        UInt8		endpointNumber,
-                                                        UInt8		direction,
-                                                        UInt8		speed,
-                                                        UInt8		maxPacketSize) = 0;
-
-/* Note: this function has been superceded. */
-    virtual IOReturn 		UIMCreateBulkTransfer(  short			functionNumber,
-                                                        short			endpointNumber,
-                                                        IOUSBCompletion		completion,
-                                                        IOMemoryDescriptor *	CBP,
-                                                        bool			bufferRounding,
-                                                        UInt32			bufferSize,
-                                                        short			direction) = 0;
-
-    // Interrupt
-/*!
-    @function UIMCreateInterruptEndpoint
-    @abstract UIM function, create an interrupt endpoint for the controller.
-    @param functionNumber  The USB device ID of the device for this endpoint
-    @param endpointNumber  The endpoint number for this endpoint
-    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
-    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
-    @param maxPacketSize   Maximum packet size of this endpoint
-    @param pollingRate     The maximum polling interval from the endpoint descriptor.
-*/
-    virtual IOReturn		UIMCreateInterruptEndpoint(
-                                                                short		functionAddress,
-                                                                short		endpointNumber,
-                                                                UInt8		direction,
-                                                                short		speed,
-                                                                UInt16		maxPacketSize,
-                                                                short		pollingRate) = 0;
-
-/* Note: this function has been superceded. */
-    virtual IOReturn 		UIMCreateInterruptTransfer( short			functionNumber,
-                                                            short			endpointNumber,
-                                                            IOUSBCompletion		completion,
-                                                            IOMemoryDescriptor *	CBP,
-                                                            bool			bufferRounding,
-                                                            UInt32			bufferSize,
-                                                            short			direction) = 0;
-
-    // Isoch
-/*!
-	@function UIMCreateIsochEndpoint
-    @abstract Create an Isochronous endpoint in the controller.
-    @param functionNumber  The USB device ID of the device for this endpoint
-    @param endpointNumber  The endpoint number for this endpoint
-    @param maxPacketSize   Maximum packet size of this endpoint
-    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
-*/
-    virtual IOReturn 		UIMCreateIsochEndpoint(
-                                                        short		functionAddress,
-                                                        short		endpointNumber,
-                                                        UInt32		maxPacketSize,
-                                                        UInt8		direction) = 0;
-
-/*!
-    @function UIMCreateIsochTransfer
-    @abstract UIM function, Do a transfer on an Isocchronous endpoint.
-    @param functionNumber  The USB device ID of the device to perform the transaction with
-    @param endpointNumber  The endpoint number for the transaction
-    @param completion      Action to perform when I/O completes
-    @param direction       Specifies direction for transfer. kUSBIn or KUSBOut.
-    @param frameStart      The frame number in which to start the transactions
-    @param pBuffer         describes memory buffer. 
-    @param frameCount      number of frames to do transactions in
-    @param pFrames         Describes transactions in individual frames, gives sizes and reults for transactions.
-*/
-    virtual IOReturn 		UIMCreateIsochTransfer(
-                                                        short			functionAddress,
-                                                        short			endpointNumber,
-                                                        IOUSBIsocCompletion	completion,
-                                                        UInt8			direction,
-                                                        UInt64			frameStart,
-                                                        IOMemoryDescriptor *	pBuffer,
-                                                        UInt32			frameCount,
-                                                        IOUSBIsocFrame		*pFrames) = 0;
-
-/*!
-    @function UIMAbortEndpoint
-    @abstract UIM function  Abort the specified endpoint, return all transactions queued on it.
-    @param functionNumber  The USB device ID of the device to Abort
-    @param endpointNumber  The endpoint number to Abort
-    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
-*/
-    virtual IOReturn 		UIMAbortEndpoint(
-                                                short		functionNumber,
-                                                short		endpointNumber,
-                                                short		direction) = 0;
-
-/*!
-    @function UIMDeleteEndpoint
-    @abstract UIM function  Delete the specified endpoint, returning all transactions queued on it.
-    @param functionNumber  The USB device ID of the device to Delete
-    @param endpointNumber  The endpoint number to Delete
-    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
-*/
-    virtual IOReturn 		UIMDeleteEndpoint(
-                                                    short	functionNumber,
-                                                    short	endpointNumber,
-                                                    short	direction) = 0;
-    
-/*!
-    @function UIMClearEndpointStall
-    @abstract UIM function  Clear stall on the specified endpoint, set data toggle to zero,
-                              return all transactions queued on it.
-    @param functionNumber  The USB device ID of the device to Clear
-    @param endpointNumber  The endpoint number to Clear
-    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
-*/
-    virtual IOReturn 		UIMClearEndpointStall(
-                                                        short		functionNumber,
-                                                        short		endpointNumber,
-                                                        short		direction) = 0;
-
-/*!
-    @function UIMRootHubStatusChange
-    @abstract UIM function  UIMRootHubStatusChange - This method was internal to the UIM (never called by the superclass) until
-							IOUSBControllerV3. For UIMs which are a subclass of IOUSBController or IOUSBControllerV2, it can
-							still be used internally only. For subclasses of IOUSBControllerV3, however, the meaning has changed
-							slightly. Now, it is used to determine if there is a status change on the root hub, and if so, it 
-							needs to update the IOUSBControllerV3 instance variable _rootHubStatusChangedBitmap
-*/
-    virtual void 		UIMRootHubStatusChange(void) = 0;
-
-    static const IORegistryPlane	*gIOUSBPlane;
-    
-public:
-
-    static IOUSBLog		*_log;
-	
-    IOCommandGate *		GetCommandGate(void);
-
-    /*!
-	@struct Endpoint
-        Describes an endpoint of a device.
-	Simply an easier to use version of the endpoint descriptor.
-        @field descriptor The raw endpoint descriptor.
-        @field number Endpoint number
-	@field direction Endpoint direction: kUSBOut, kUSBIn, kUSBAnyDirn
-	@field transferType Type of endpoint: kUSBControl, kUSBIsoc, kUSBBulk, kUSBInterrupt
-	@field maxPacketSize Maximum packet size for endpoint
-	@field interval Polling interval in milliseconds (only relevent for Interrupt endpoints)
-    */
-    struct Endpoint {
-        IOUSBEndpointDescriptor	*	descriptor;
-        UInt8 				number;
-        UInt8				direction;	// in, out
-        UInt8				transferType;	// cntrl, bulk, isoc, int
-        UInt16				maxPacketSize;
-        UInt8				interval;
-    };
-
-    // Implements IOService::getWorkLoop const member function
-    virtual IOWorkLoop *	getWorkLoop() const;
-    
-    /*
-     * Root hub methods
-     * Only of interest to the IOUSBRootHubDevice object
-     */
-/*!
-    @function GetRootHubDeviceDescriptor
-    @abstract UIM function, return the device descriptor of the simulated root hub device
-                           As GET_DESCRIPTOR control request for device descrptor
-    @param  desc   Descriptor structure to return data in
-*/
-    virtual IOReturn 		GetRootHubDeviceDescriptor( IOUSBDeviceDescriptor *desc ) = 0;
-    
-/*!
-    @function GetRootHubDescriptor
-    @abstract UIM function, return the hub descriptor of the simulated root hub device
-                           As GET_DESCRIPTOR control request for hub descrptor
-    @param  desc   Descriptor structure to return data in
-*/
-    virtual IOReturn 		GetRootHubDescriptor( IOUSBHubDescriptor *desc ) = 0;
-    
-/*!
-    @function SetRootHubDescriptor
-    @abstract UIM function, optional. Set the hub descriptor data.
-                           As SET_DESCRIPTOR control request for hub descrptor
-    @param  buffer   Descriptor data
-*/
-    virtual IOReturn 		SetRootHubDescriptor( OSData *buffer ) = 0;
-    
-/*!
-    @function GetRootHubConfDescriptor
-    @abstract UIM function, retrun the configuration descriptor of the simulated root hub device
-                           As GET_DESCRIPTOR control request for configuration descrptor
-    @param  desc   Descriptor structure to return data in
-*/
-    virtual IOReturn 		GetRootHubConfDescriptor( OSData *desc ) = 0;
-    
-/*!
-    @function GetRootHubStatus
-    @abstract UIM function, get the status of the root hub. As GET_STATUS control request to device.
-    @param status  Status structure to return
-*/
-    virtual IOReturn 		GetRootHubStatus( IOUSBHubStatus *status ) = 0;
-    
-/*!
-    @function SetRootHubFeature
-    @abstract UIM function, set feature of root hub, As SET_FEATURE control request.
-    @param wValue  The feature to set, as would be transferred in wValue field of SETUP packet.
-*/
-    virtual IOReturn 		SetRootHubFeature( UInt16 wValue ) = 0;
-    
-/*!
-    @function ClearRootHubFeature
-    @abstract UIM function, set feature of root hub, As CLEAR_FEATURE control request.
-    @param wValue  The feature to clear, as would be transferred in wValue field of SETUP packet.
-*/
-    virtual IOReturn		ClearRootHubFeature( UInt16 wValue ) = 0;
-    
-/*!
-    @function GetRootHubPortStatus
-    @abstract UIM function, get the status of a root hub port. As GET_STATUS control request to the port.
-    @param status  Status structure to return
-    @param port    Port to get status for.
-*/
-    virtual IOReturn 		GetRootHubPortStatus( IOUSBHubPortStatus *status, UInt16 port ) = 0;
-    
-/*!
-    @function SetRootHubPortFeature
-    @abstract UIM function, set feature of a root hub port, As SET_FEATURE control request to a port.
-    @param wValue  The feature to set, as would be transferred in wValue field of SETUP packet.
-    @param port    Port to set feature for
-*/
-    virtual IOReturn 		SetRootHubPortFeature( UInt16 wValue, UInt16 port ) = 0;
-    
-/*!
-    @function ClearRootHubPortFeature
-    @abstract UIM function, clear feature of a root hub port, As CLEAR_FEATURE control request to a port.
-    @param wValue  The feature to clear, as would be transferred in wValue field of SETUP packet.
-    @param port    Port to clear feature for
-*/
-    virtual IOReturn 		ClearRootHubPortFeature( UInt16 wValue, UInt16 port ) = 0;
-    
-/*!
-    @function ClearRootHubPortFeature
-    @abstract UIM function, Impliments GET_BUS_STATE control request, now obsolete.
-*/
-    virtual IOReturn 		GetRootHubPortState( UInt8 *state, UInt16 port ) = 0;
-    
-/*!
-    @function SetHubAddress
-    @abstract UIM function, set the address of the simulated root hub device, as SET_ADDRESS
-    @param wValue	 New address for root hub.
-*/
-    virtual IOReturn 		SetHubAddress( UInt16 wValue ) = 0;
-    
-
-    /*!
-		@function openPipe
-        Open a pipe to the specified device endpoint
-        @param address Address of the device on the USB bus
-		@param speed of the device: kUSBHighSpeed or kUSBLowSpeed
-        @param endpoint description of endpoint to connect to
-    */
-    virtual IOReturn 		OpenPipe(   USBDeviceAddress 	address, 
-										UInt8				speed,
-                                        Endpoint *			endpoint );
-    /*!
-        @function closePipe
-        Close a pipe to the specified device endpoint
-        @param address Address of the device on the USB bus
-		@param endpoint description of endpoint
-    */
-    virtual IOReturn 		ClosePipe(	USBDeviceAddress 	address,
-                                        Endpoint *			endpoint );
-
-    // Controlling pipe state
-    /*!
-        @function abortPipe
-        Abort pending I/O to/from the specified endpoint, causing them to complete with return code kIOReturnAborted
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-    */
-    virtual IOReturn 		AbortPipe(
-                                            USBDeviceAddress 	address,
-                                            Endpoint *			endpoint );
-    /*!
-        @function resetPipe
-        Abort pending I/O and clear stalled state - this method is a combination of abortPipe and clearPipeStall
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-    */
-    virtual IOReturn 		ResetPipe(	USBDeviceAddress 	address,
-                                        Endpoint *			endpoint );
-    /*!
-        @function clearPipeStall
-        Clear a pipe stall.
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-    */
-    virtual IOReturn 		ClearPipeStall(	USBDeviceAddress 	address,
-											Endpoint *			endpoint );
-
-    // Transferring Data
-    /*!
-        @function read
-        Read from an interrupt or bulk endpoint
-		@param buffer place to put the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-		@param completion describes action to take when buffer has been filled 
-    */
-    virtual IOReturn 		Read(	IOMemoryDescriptor * 	buffer,
-									USBDeviceAddress		address,
-									Endpoint *				endpoint,
-									IOUSBCompletion *		completion );
-    /*!
-        @function write
-        Write to an interrupt or bulk endpoint
-        @param buffer place to get the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-        @param completion describes action to take when buffer has been emptied
-    */
-    virtual IOReturn 		Write(	IOMemoryDescriptor *	buffer,
-									USBDeviceAddress 	address,
-									Endpoint *		endpoint,
-									IOUSBCompletion *	completion );
-
-    /*!
-        @function isocIO
-        Read from or write to an isochronous endpoint
-        @param buffer place to put the transferred data
-        @param frameStart USB frame number of the frame to start transfer
-        @param numFrames Number of frames to transfer
-        @param frameList Bytes to transfer and result for each frame
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-        @param completion describes action to take when buffer has been filled
-    */
-    virtual IOReturn 		IsocIO(	IOMemoryDescriptor * 	buffer,
-									UInt64					frameStart,
-									UInt32					numFrames,
-									IOUSBIsocFrame *		frameList,
-									USBDeviceAddress		address,
-									Endpoint *				endpoint,
-									IOUSBIsocCompletion *	completion );
-    /*!
-        @function deviceRequest
-        Make a control request to the specified endpoint
-		There are two versions of this method, one uses a simple void *
-        to point to the data portion of the transfer, the other uses an
-		IOMemoryDescriptor to point to the data.
-		@param request parameter block for the control request
-		@param completion describes action to take when the request has been executed
-        @param address Address of the device on the USB bus
-		@param epNum endpoint number
-    */
-    virtual IOReturn 		DeviceRequest(	IOUSBDevRequest *	request,
-											IOUSBCompletion *	completion,
-											USBDeviceAddress 	address, 
-											UInt8				epNum );
-											
-    virtual IOReturn 		DeviceRequest(	IOUSBDevRequestDesc *	request,
-											IOUSBCompletion *		completion,
-											USBDeviceAddress		address, 
-											UInt8					epNum );
-
-    /*
-     * Methods used by the hub driver to initialize a device
-     */
-    /*!
-	@function AcquireDeviceZero
-	Get the device zero lock - call this before resetting a device, to ensure there's
-	only one device with address 0
-    */
-    virtual IOReturn 		AcquireDeviceZero( void );
-    /*!
-        @function ReleaseDeviceZero
-        Release the device zero lock - call this to release the device zero lock,
-		when there is no longer a device at address 0
-    */
-    virtual void			ReleaseDeviceZero( void );
-
-	// non-virtual methods
-    void				WaitForReleaseDeviceZero( void );
-    IOReturn			ConfigureDeviceZero( UInt8 maxPacketSize, UInt8 speed );
-    IOReturn			GetDeviceZeroDescriptor( IOUSBDeviceDescriptor *  desc, UInt16 size );
-    IOReturn			SetDeviceZeroAddress(USBDeviceAddress address);
-    IOUSBDevice *		MakeDevice(USBDeviceAddress *address); 
-    IOUSBHubDevice *	MakeHubDevice(USBDeviceAddress *address); 
-	IOReturn			CreateDevice(	IOUSBDevice *		device,
-										USBDeviceAddress	deviceAddress,
-										UInt8				maxPacketSize,
-										UInt8				speed,
-										UInt32				powerAvailable );
-
-   /*!
-	@function GetBandwidthAvailable
-        Returns the available bandwidth (in bytes) per frame or microframe for
-	isochronous transfers.
-	@result maximum number of bytes that a new iso pipe could transfer
-	per frame given current allocations.
-    */
-    virtual UInt32 		GetBandwidthAvailable( void ) = 0;
-
-    /*!
-        @function GetFrameNumber
-        Returns the full current frame number.
-        @result The frame number.
-    */
-    virtual UInt64 		GetFrameNumber( void ) = 0;
-
-    /*!
-        @function GetFrameNumber32
-        Returns the least significant 32 bits of the frame number.
-        @result The lsb 32 bits of the frame number.
-    */
-    virtual UInt32 		GetFrameNumber32( void ) = 0;
-
-    // Debugger polled mode
-    virtual void 		PollInterrupts( IOUSBCompletionAction safeAction = 0 ) = 0;
- 
-    virtual IOReturn 		PolledRead(
-                                            short			functionNumber,
-                                            short			endpointNumber,
-                                            IOUSBCompletion		completion,
-                                            IOMemoryDescriptor *	CBP,
-                                            bool			bufferRounding,
-                                            UInt32			bufferSize);
-                                            
-    OSMetaClassDeclareReservedUsed(IOUSBController,  0);
-    virtual void UIMCheckForTimeouts(void);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBController,  1);
-    virtual IOReturn 		UIMCreateControlTransfer(   short		functionNumber,
-                                                            short		endpointNumber,
-                                                            IOUSBCommand*	command,
-                                                            void*		CBP,
-                                                            bool		bufferRounding,
-                                                            UInt32		bufferSize,
-                                                            short		direction);
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  2);
-    virtual IOReturn 		UIMCreateControlTransfer(   short			functionNumber,
-                                                            short			endpointNumber,
-                                                            IOUSBCommand*		command,
-                                                            IOMemoryDescriptor*		CBP,
-                                                            bool			bufferRounding,
-                                                            UInt32			bufferSize,
-                                                            short			direction);
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  3);
-/*!
-    @function UIMCreateBulkTransfer
-    @abstract UIM function, Do a transfer on a bulk endpoint.
-                This method supercedes the method which takes multiple parameters.
-    @param command  paramters for transfer.
-*/
-    virtual IOReturn 		UIMCreateBulkTransfer(IOUSBCommand* command);
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  4);
-/*!
-    @function UIMCreateInterruptTransfer
-    @abstract UIM function, Do a transfer on an interrupt endpoint.
-                This method supercedes the method which takes multiple parameters.
-    @param command  paramters for transfer.
-*/
-    virtual IOReturn 		UIMCreateInterruptTransfer(IOUSBCommand* command);
-
-    /*!
-        @function deviceRequest
-        Make a control request to the specified endpoint
-		There are two versions of this method, one uses a simple void *
-        to point to the data portion of the transfer, the other uses an
-		IOMemoryDescriptor to point to the data.
-		@param request parameter block for the control request
-		@param completion describes action to take when the request has been executed
-        @param address Address of the device on the USB bus
-		@param epNum endpoint number
-    */
-    OSMetaClassDeclareReservedUsed(IOUSBController,  5);
-    virtual IOReturn 		DeviceRequest(  IOUSBDevRequest *	request,
-                                                IOUSBCompletion *	completion,
-                                                USBDeviceAddress 	address, 
-                                                UInt8 			epNum,
-						UInt32			noDataTimeout,
-						UInt32			completionTimeout );
-						
-    OSMetaClassDeclareReservedUsed(IOUSBController,  6);
-    virtual IOReturn 		DeviceRequest(  IOUSBDevRequestDesc *	request,
-                                                IOUSBCompletion *	completion,
-                                                USBDeviceAddress 	address, 
-                                                UInt8 			epNum,
-						UInt32			noDataTimeout,
-						UInt32			completionTimeout );
-
-    
-    
-    OSMetaClassDeclareReservedUsed(IOUSBController,  7);
-    /*!
-        @function read
-        Read from an interrupt or bulk endpoint
-		@param buffer place to put the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-		@param completion describes action to take when buffer has been filled 
-    */
-    virtual IOReturn 		Read(   IOMemoryDescriptor * 	buffer,
-                                        USBDeviceAddress 	address,
-                                        Endpoint *		endpoint,
-                                        IOUSBCompletion *	completion,
-					UInt32			noDataTimeout,
-					UInt32			completionTimeout );
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  8);
-    /*!
-        @function write
-        Write to an interrupt or bulk endpoint
-        @param buffer place to get the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-        @param completion describes action to take when buffer has been emptied
-    */
-    virtual IOReturn 		Write(  IOMemoryDescriptor *	buffer,
-                                        USBDeviceAddress 	address,
-                                        Endpoint *		endpoint,
-                                        IOUSBCompletion *	completion,
-					UInt32			noDataTimeout,
-					UInt32			completionTimeout );
-
-    // this should really not be using a padding slot, since free is in our superclas, but we shipped this way so now we need to leave it.
-    OSMetaClassDeclareReservedUsed(IOUSBController,  9);
-    virtual void free();
-
-protected:
-    	
-/*!
-    @function UIMRootHubStatusChange(bool)
-    @abstract UIM function  UIMRootHubStatusChange(bool) - This method was internal to the UIM (never called by the superclass) until
-							IOUSBControllerV3. For UIMs which are a subclass of IOUSBController or IOUSBControllerV2, it can
-							still be used internally only. For subclasses of IOUSBControllerV3, however, it has become obsolete
-							(it still needs to be implemented since it is pure virtual)
-*/
-    OSMetaClassDeclareReservedUsed(IOUSBController,  10);
-    virtual void 		UIMRootHubStatusChange( bool abort ) = 0;
-
-public:
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  11);
-    virtual IOReturn CreateRootHubDevice( IOService * provider, IOUSBRootHubDevice ** rootHubDevice);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBController,  12);
-    /*!
-        @function Read
-        Read from an interrupt or bulk endpoint
-		@param buffer place to put the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-		@param completion describes action to take when buffer has been filled
-		@param noDataTimeout number of milliseconds of no data movement before the request is aborted
-		@param completionTimeout number of milliseonds after the command is on the bus in which it must complete
-		@param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
-    */
-    virtual IOReturn 		Read(   IOMemoryDescriptor * 	buffer,
-                                        USBDeviceAddress 	address,
-                                        Endpoint *		endpoint,
-                                        IOUSBCompletion *	completion,
-					UInt32			noDataTimeout,
-					UInt32			completionTimeout,
-					IOByteCount		reqCount );
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  13);
-    /*!
-        @function Write
-        Write to an interrupt or bulk endpoint
-        @param buffer place to get the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-        @param completion describes action to take when buffer has been emptied
-		@param noDataTimeout number of milliseconds of no data movement before the request is aborted
-		@param completionTimeout number of milliseonds after the command is on the bus in which it must complete
-		@param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
-    */
-    virtual IOReturn 		Write(  IOMemoryDescriptor *	buffer,
-                                        USBDeviceAddress 	address,
-                                        Endpoint *		endpoint,
-                                        IOUSBCompletion *	completion,
-					UInt32			noDataTimeout,
-					UInt32			completionTimeout,
-					IOByteCount		reqCount );
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  14);
-    
-    virtual IOReturn GetRootHubStringDescriptor(UInt8	index, OSData *desc) = 0;
-    
-    OSMetaClassDeclareReservedUsed(IOUSBController,  15);
-    /*!
-        @function IsocIO
-        Read from or write to an isochronous endpoint
-        @param buffer place to put the transferred data
-        @param frameStart USB frame number of the frame to start transfer
-        @param numFrames Number of frames to transfer
-        @param frameList Bytes to transfer and result for each frame
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-        @param completion describes action to take when buffer has been filled
-        @param updateFrequency describes how often to update the framelist once the transfer has completed (in ms)
-    */
-    virtual IOReturn IsocIO(  IOMemoryDescriptor * 			buffer,
-                                        UInt64 				frameStart,
-                                        UInt32 				numFrames,
-                                        IOUSBLowLatencyIsocFrame *	frameList,
-                                        USBDeviceAddress 		address,
-                                        Endpoint *			endpoint,
-                                        IOUSBLowLatencyIsocCompletion *	completion,
-                                        UInt32				updateFrequency );
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  16);
-    
-    /*!
-		@function UIMCreateIsochTransfer
-		@abstract UIM function, Do a transfer on an Isocchronous endpoint.
-		@param functionNumber  The USB device ID of the device to perform the transaction with
-		@param endpointNumber  The endpoint number for the transaction
-		@param completion      Action to perform when I/O completes
-		@param direction       Specifies direction for transfer. kUSBIn or KUSBOut.
-		@param frameStart      The frame number in which to start the transactions
-		@param pBuffer         describes memory buffer. 
-		@param frameCount      number of frames to do transactions in
-		@param pFrames         Describes transactions in individual frames, gives sizes and reults for transactions.
-		@param updateFrequency Describes how often we update the frameList parameters (in ms)
-	*/
-    virtual IOReturn 		UIMCreateIsochTransfer(
-                                                        short			functionAddress,
-                                                        short			endpointNumber,
-                                                        IOUSBIsocCompletion	completion,
-                                                        UInt8			direction,
-                                                        UInt64			frameStart,
-                                                        IOMemoryDescriptor *	pBuffer,
-                                                        UInt32			frameCount,
-                                                        IOUSBLowLatencyIsocFrame *pFrames,
-                                                        UInt32			updateFrequency);
-
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  17);
-    virtual IOReturn 		CheckForDisjointDescriptor(IOUSBCommand *command, UInt16 maxPacketSize);
-    
-    /*!
-		@function UIMCreateIsochTransfer
-		@abstract UIM function, Do a transfer on an Isocchronous endpoint.
-		@param command  an IOUSBIsocCommand object with all the necessary information
-	 */
-    OSMetaClassDeclareReservedUsed(IOUSBController,  18);
-	virtual IOReturn UIMCreateIsochTransfer(IOUSBIsocCommand *command);
-	
-	// do not use this slot without first checking bug rdar://6022420
-    OSMetaClassDeclareReservedUnused(IOUSBController,  19);
-    
-protected:
-    void	IncreaseIsocCommandPool();
-    void 	IncreaseCommandPool();
-    void	ParsePCILocation(const char *str, int *deviceNum, int *functionNum);
-    int		ValueOfHexDigit(char c);
-};
-
-#endif /* ! _IOKIT_IOUSBCONTROLLER_H */
-
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerListElement.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerListElement.h.svn-base
deleted file mode 100644
index 7351177..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerListElement.h.svn-base
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1998-2007 Apple Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOUSBCONTROLLERLISTELEMENT_H
-#define _IOUSBCONTROLLERLISTELEMENT_H
-
-
-#include <libkern/c++/OSObject.h>
-
-#include <IOKit/IOTypes.h>
-
-#include <IOKit/usb/USB.h>
-
-
-/*!
- @class IOUSBControllerListElement
- @abstract Used by the IOUSBController to manage the USB controller lists that are common between EHCI and UHCI.
- */
-class IOUSBControllerListElement : public OSObject
-{
-    OSDeclareDefaultStructors(IOUSBControllerListElement)
-	
-private:    
-	
-public:
-	
-    virtual void					SetPhysicalLink(IOPhysicalAddress next) = 0;
-    virtual IOPhysicalAddress		GetPhysicalLink(void) = 0;
-    virtual IOPhysicalAddress		GetPhysicalAddrWithType(void) = 0;
-    virtual void					print(int level);
-	
-    IOPhysicalAddress				_sharedPhysical;			// phys address of the memory shared with the controller			
-    void *							_sharedLogical;				// logical address of the above
-    IOUSBControllerListElement		*_logicalNext;				// the next element in the list
-    
-};
-
-
-class IOUSBControllerV2;										// needed for a parameter
-class IOUSBControllerIsochEndpoint;
-
-class IOUSBControllerIsochListElement : public IOUSBControllerListElement
-{
-    OSDeclareDefaultStructors(IOUSBControllerIsochListElement)
-	
-private:
-    
-public:
-	
-    virtual void					SetPhysicalLink(IOPhysicalAddress next) = 0;
-    virtual IOPhysicalAddress		GetPhysicalLink(void) = 0;
-    virtual IOPhysicalAddress		GetPhysicalAddrWithType(void) = 0;
-    virtual void					print(int level);
-	
-    IOUSBControllerIsochEndpoint	*_pEndpoint;
-    IOUSBIsocFrame					*_pFrames;
-    IOUSBIsocCompletion				_completion;
-    Boolean							_lowLatency;
-	bool							_requestFromRosettaClient; // True if the request originated from a Rosetta client in user space
-	UInt8							_framesInTD;			// used for HS Isoch only
-    UInt64							_frameNumber;			// frame number for scheduling purposes
-    UInt32							_frameIndex;			// index into the myFrames array
-    IOUSBControllerIsochListElement *_doneQueueLink;		// linkage used by done queue processing
-	
-    // pure virtual methods which must be implemented by descendants
-    virtual IOReturn				UpdateFrameList(AbsoluteTime timeStamp) = 0;
-    virtual IOReturn				Deallocate(IOUSBControllerV2 *uim) = 0;
-};
-
-class IOUSBControllerIsochEndpoint : public OSObject
-{
-    OSDeclareDefaultStructors(IOUSBControllerIsochEndpoint)
-	
-public:
-	
-	virtual bool init();
-
-    IOUSBControllerIsochEndpoint		*nextEP;
-    IOUSBControllerIsochListElement  	*toDoList;					// ITD or SITD
-    IOUSBControllerIsochListElement  	*toDoEnd;					// ITD or SITD
-    IOUSBControllerIsochListElement  	*doneQueue;					// ITD or SITD
-    IOUSBControllerIsochListElement  	*doneEnd;					// ITD or SITD
-    IOUSBControllerIsochListElement  	*deferredQueue;				// ITD or SITD
-    IOUSBControllerIsochListElement  	*deferredEnd;				// ITD or SITD
-    UInt64								firstAvailableFrame;		// next frame available for a transfer on this EP
-    UInt32								maxPacketSize;
-    UInt32								activeTDs;					// + when added to todo list, - when taken from done queue
-    UInt32								onToDoList;					// + when added to todo list, - when taken from done queue
-    UInt32								onDoneQueue;					// + when added to todo list, - when taken from done queue
-	volatile SInt32						scheduledTDs;				// + when linked onto periodic list, - when unlinked
-	UInt32								deferredTDs;
-	UInt32								onProducerQ;
-	UInt32								onReversedList;
-    UInt16								inSlot;						// where Isoc TDs are being put in the periodic list 
-    short								functionAddress;
-    short								endpointNumber;
-    IOReturn							accumulatedStatus;
-	UInt32								interval;					// this is the decoded interval value for HS endpoints and is 1 for FS endpoints
-    UInt8								direction;
-	bool								aborting;
-};
-
-
-#endif
-
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV2.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV2.h.svn-base
deleted file mode 100644
index 4d2c306..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV2.h.svn-base
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.2 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
- * Please see the License for the specific language governing rights and 
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBCONTROLLERV2_H
-#define _IOKIT_IOUSBCONTROLLERV2_H
-
-#include <IOKit/IODMACommand.h>
-
-#include <IOKit/usb/IOUSBControllerListElement.h>
-#include <IOKit/usb/IOUSBController.h>
-
-enum
-{
-    kUSBHSHubCommandAddHub	= 1,
-    kUSBHSHubCommandRemoveHub	= 2,
-    
-    kUSBHSHubFlagsMultiTT	= 1
-};
-
-
-/*!
-    @class IOUSBControllerV2
-    @abstract subclass of the IOUSBController to provide support for high speed 
-                devices and split transactions.
-    @discussion The IOUSBController class provide sufficient functionality to 
-                work with full (12Mb/s) and low (1.5Mb/s) devices. IOUSBControllerV2
-                introduces the support for high (480Mb/s) speed devices from the
-                USB 2.0 spec. In particular IOUSBControllerV2 indicates the high
-                speed hub a full or low speed device is attached to so that split
-                transactions can be directed to the hub at high speed to be forwarded
-                to the full or low speed device by the hub.
-                It also gives support for bulk endoints of greater than 256 bytes.
-*/
-
-class IOUSBControllerV2 : public IOUSBController
-{
-    OSDeclareAbstractStructors(IOUSBControllerV2)
-
-protected:
-    
-    // These for keeping track of high speed ancestor to allow controller to do splits.
-    //
-    UInt8 _highSpeedHub[128];
-    UInt8 _highSpeedPort[128];
-
-    struct V2ExpansionData { 
-		UInt8										_multiTT[128];
-		IOUSBCommand								*ClearTTCommand;
-		IOUSBControllerIsochEndpoint				*_isochEPList;						// linked list of active Isoch "endpoints"
-		IOUSBControllerIsochEndpoint				*_freeIsochEPList;					// linked list of freed Isoch EP data structures
-		thread_call_t								_returnIsochDoneQueueThread;
-	};
-    V2ExpansionData *_v2ExpansionData;
-
-    // Super's expansion data
-    #define _freeUSBCommandPool					_expansionData->freeUSBCommandPool
-    #define _freeUSBIsocCommandPool				_expansionData->freeUSBIsocCommandPool
-    #define _watchdogUSBTimer					_expansionData->watchdogUSBTimer
-    #define _controllerTerminating				_expansionData->_terminating
-    #define _watchdogTimerActive				_expansionData->_watchdogTimerActive
-    #define _busNumber							_expansionData->_busNumber
-    #define _currentSizeOfCommandPool			_expansionData->_currentSizeOfCommandPool
-    #define _currentSizeOfIsocCommandPool		_expansionData->_currentSizeOfIsocCommandPool
-    #define _controllerSpeed					_expansionData->_controllerSpeed
-	#define _activeIsochTransfers				_expansionData->_activeIsochTransfers
-
-	// this class's expansion data
-	#define _isochEPList						_v2ExpansionData->_isochEPList
-	#define _freeIsochEPList					_v2ExpansionData->_freeIsochEPList
-	#define _returnIsochDoneQueueThread			_v2ExpansionData->_returnIsochDoneQueueThread
-	
-    virtual bool 		init( OSDictionary *  propTable );
-    virtual bool 		start( IOService *  provider );
-    virtual void		free();
-
-    static IOReturn  DoCreateEP(OSObject *owner,
-                           void *arg0, void *arg1,
-                           void *arg2, void *arg3);
-
-    static void		clearTTHandler( 
-							OSObject *	target,
-                            void *	parameter,
-                            IOReturn	status,
-                            UInt32	bufferSizeRemaining );
-
-public:
-
-        /*!
-        @function openPipe
-         Open a pipe to the specified device endpoint
-         @param address Address of the device on the USB bus
-         @param speed of the device: kUSBDeviceSpeedLow, kUSBDeviceSpeedFull or kUSBDeviceSpeedHigh
-         @param endpoint description of endpoint to connect to
-         */
-        virtual IOReturn 		OpenPipe(   USBDeviceAddress 	address,
-                                       UInt8 		speed,
-                                       Endpoint *		endpoint );
-
-    /*!
-    @function CreateDevice
-    @abstract Create a new device as IOUSBController, making a note of the
-                high speed hub device ID and port number the full/low speed
-                device is attached to.
-    @param newDevice       new device object to work with
-    @param deviceAddress   USB device ID
-    @param maxPacketSize   max packet size of endpoint zero
-    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
-    @param powerAvailable  power available to the device 
-    @param hub             USB ID of hub the device is immediatly attached to. (Not necessarily high speed)
-    @param port            port number of port the device is attached to.
-*/
-    virtual  IOReturn CreateDevice(	IOUSBDevice 		*newDevice,
-                                    USBDeviceAddress	deviceAddress,
-                                    UInt8		 	maxPacketSize,
-                                    UInt8			speed,
-                                    UInt32			powerAvailable,
-                                    USBDeviceAddress		hub,
-                                    int      port);
-
-/*!
-	@function ConfigureDeviceZero
-    @abstract configure pipe zero of device zero, as IOUSBController, but also keeping 
-                 note of high speed hub device is attached to.
-    @param maxPacketSize  max packet size for the pipe
-    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
-    @param hub            USB ID of hub the device is immediatly attached to.  (Not necessarily high speed)
-    @param port           port number of port the device is attached to.
-*/
-    virtual  IOReturn ConfigureDeviceZero(UInt8 maxPacketSize, UInt8 speed, USBDeviceAddress hub, int port);
-
-/*!
-	@function UIMCreateControlEndpoint
-    @abstract Create an endpoint in the controller to do control transactions.
-    @param functionNumber  USB device ID of device
-    @param endpointNumber  endpoint address of the endpoint in the device
-    @param maxPacketSize   maximum packet size of this endpoint
-    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
-    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
-                           address split transactions to.
-    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
-*/
-    virtual IOReturn 		UIMCreateControlEndpoint(
-                                                            UInt8	functionNumber,
-                                                            UInt8	endpointNumber,
-                                                            UInt16	maxPacketSize,
-                                                            UInt8	speed,
-                                                            USBDeviceAddress highSpeedHub,
-                                                            int      highSpeedPort) = 0;
-
-/*!
-	@function UIMCreateBulkEndpoint
-    @abstract Create an endpoint in the controller to do bulk transactions.
-    @param functionNumber  USB device ID of device
-    @param endpointNumber  endpoint address of the endpoint in the device
-    @param direction       Direction of data flow. kUSBIn or kUSBOut
-    @param maxPacketSize   maximum packet size of this endpoint
-    @param speed           speed of the device kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
-    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
-                           address split transactions to.
-    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
-*/
-    virtual IOReturn 		UIMCreateBulkEndpoint(
-                                                        UInt8		functionNumber,
-                                                        UInt8		endpointNumber,
-                                                        UInt8		direction,
-                                                        UInt8		speed,
-                                                        UInt16		maxPacketSize,
-                                                        USBDeviceAddress highSpeedHub,
-                                                        int      highSpeedPort) = 0;
-
-/*!
-	@function UIMCreateInterruptEndpoint
-    @abstract Create an endpoint in the controller to do interrupt transactions.
-    @param functionAddress USB device ID of device
-    @param endpointNumber  endpoint address of the endpoint in the device
-    @param direction       Direction of data flow. kUSBIn or kUSBOut
-    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
-    @param maxPacketSize   maximum packet size of this endpoint
-    @param pollingRate     The maximum polling interval from the endpoint descriptor.
-    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
-                           address split transactions to.
-    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
-*/
-    virtual IOReturn		UIMCreateInterruptEndpoint(
-                                                                short		functionAddress,
-                                                                short		endpointNumber,
-                                                                UInt8		direction,
-                                                                short		speed,
-                                                                UInt16		maxPacketSize,
-                                                                short		pollingRate,
-                                                                USBDeviceAddress highSpeedHub,
-                                                                int      highSpeedPort) = 0;
-
-/*!
-	@function UIMCreateIsochEndpoint
-    @abstract Create an endpoint in the controller to do Isochronous transactions.
-    @param functionAddress USB device ID of device
-    @param endpointNumber  endpoint address of the endpoint in the device
-    @param maxPacketSize   maximum packet size of this endpoint
-    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
-    @param highSpeedHub    If non zero, this is a full speed device, the address of the high speed hub to
-                           address split transactions to.
-    @param highSpeedPort   If highSpeedHub is non zero, the hub port to address split transactions to
-*/
-    virtual IOReturn 		UIMCreateIsochEndpoint(
-                                                        short				functionAddress,
-                                                        short				endpointNumber,
-                                                        UInt32				maxPacketSize,
-                                                        UInt8				direction,
-                                                        USBDeviceAddress	highSpeedHub,
-                                                        int					highSpeedPort) = 0;
-
-
-	static void 				ReturnIsochDoneQueueEntry(OSObject *target, thread_call_param_t endpointPtr);
-
-	
-	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  0);
-    virtual IOReturn		AddHSHub(USBDeviceAddress highSpeedHub, UInt32 flags);
-    
-    static IOReturn DOHSHubMaintenance(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  1);
-    virtual IOReturn 		UIMHubMaintenance(USBDeviceAddress highSpeedHub, UInt32 highSpeedPort, UInt32 command, UInt32 flags);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  2);
-    virtual IOReturn		RemoveHSHub(USBDeviceAddress highSpeedHub);
-    
-    static IOReturn DOSetTestMode(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  3);
-    virtual IOReturn		SetTestMode(UInt32 mode, UInt32 port);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  4);
-    virtual IOReturn		UIMSetTestMode(UInt32 mode, UInt32 port);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  5);
-    virtual UInt64		GetMicroFrameNumber( void );
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  6);
-    virtual void ClearTT(USBDeviceAddress addr, UInt8 endpt, Boolean IN);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  7);
-    /*!
-        @function Read
-     Read from an interrupt or bulk endpoint
-     @param buffer place to put the transferred data
-     @param address Address of the device on the USB bus
-     @param endpoint description of endpoint
-     @param completion describes action to take when buffer has been filled
-     @param noDataTimeout number of milliseconds of no data movement before the request is aborted
-     @param completionTimeout number of milliseonds after the command is on the bus in which it must complete
-     @param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
-     */
-    virtual IOReturn ReadV2( IOMemoryDescriptor *			buffer,
-                           USBDeviceAddress					address,
-                           Endpoint *						endpoint,
-                           IOUSBCompletionWithTimeStamp *	completion,
-                           UInt32							noDataTimeout,
-                           UInt32							completionTimeout,
-                           IOByteCount						reqCount );
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  8);
-/*!
-	@function UIMCreateIsochEndpoint
-    @abstract Create an endpoint in the controller to do Isochronous transactions.
-    @param functionAddress USB device ID of device
-    @param endpointNumber  endpoint address of the endpoint in the device
-    @param maxPacketSize   maximum packet size of this endpoint
-    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
-    @param highSpeedHub    If non zero, this is a full speed device, the address of the high speed hub to
-                           address split transactions to.
-    @param highSpeedPort   If highSpeedHub is non zero, the hub port to address split transactions to
-	@param interval		   The encoded interval value from the endpoint descriptor
-*/
-    virtual IOReturn 		UIMCreateIsochEndpoint(		short				functionAddress,
-                                                        short				endpointNumber,
-                                                        UInt32				maxPacketSize,
-                                                        UInt8				direction,
-                                                        USBDeviceAddress	highSpeedHub,
-                                                        int					highSpeedPort,
-														UInt8				interval);
-
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  9);
-	virtual IOUSBControllerIsochEndpoint*		AllocateIsochEP(void);	
-	
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  10);
-	virtual IOReturn							DeallocateIsochEP(IOUSBControllerIsochEndpoint *pEP);
-
-	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  11);
-    virtual IOUSBControllerIsochEndpoint* 	FindIsochronousEndpoint(short functionNumber, short endpointNumber, short direction, IOUSBControllerIsochEndpoint* *pEDBack);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  12);
-    virtual IOUSBControllerIsochEndpoint*	CreateIsochronousEndpoint(short functionNumber, short endpointNumber, short direction);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  13);
-    virtual void								PutTDonToDoList(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  14);
-    virtual IOUSBControllerIsochListElement		*GetTDfromToDoList(IOUSBControllerIsochEndpoint* pED);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  15);
-    virtual void								PutTDonDeferredQueue(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  16);
-	virtual IOUSBControllerIsochListElement		*GetTDfromDeferredQueue(IOUSBControllerIsochEndpoint* pED);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  17);
-    virtual void								PutTDonDoneQueue(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD, bool checkDeferred);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  18);
-    virtual IOUSBControllerIsochListElement		*GetTDfromDoneQueue(IOUSBControllerIsochEndpoint* pED);
-	
-	// 7185026 - this is to make this call from behind the gate
-    static IOReturn		GatedGetTDfromDoneQueue(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  19);
-    virtual void								ReturnIsochDoneQueue(IOUSBControllerIsochEndpoint*);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  20);
-	virtual IODMACommand						*GetNewDMACommand();
-	
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  21);
-	/*!
-	 @function GetLowLatencyOptionsAndPhysicalMask
-	 @abstract Low Latency transfers require that the client have access to the memory after the Isochronous I/O request has already been scheduled. This might be used, for example to fill in outgoing data "just in time." Some controllers, however, may have requirements which need to be followed in order to make sure that the memory buffer isn't moved after the call is made. This call will return an IOOptionBits and mach_vm_address_t which can be used in a call to IOBufferMemoryDescriptor::inTaskWithPhysicalMask which will help meet these requirements.
-	 @param optionBits Pointer to an an IOOptionBits. The only bit which may be returned is kIOMemoryPhysicallyContiguous. Other bits, e.g. direction bits, must be ORd in by the client as needed. This call replaces the old property based method of obtaining this information.
-	 @param physicalMask  Pointer to a mach_vm_address_t which should be used in the call to IOBufferMemoryDescriptor::inTaskWithPhysicalMask and will guarantee that when the memory is wired down it will be accessible by both the client and the USB controller at the same time.
-	 @result returns kIOReturnSuccess if the method is implemented by the controller, otherwise kIOReturnUnsupported
-	 */
-    virtual IOReturn 		GetLowLatencyOptionsAndPhysicalMask(IOOptionBits *optionBits, mach_vm_address_t *physicalMask);
-	
-	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  22);
-	/*!
-	 @function GetFrameNumberWithTime
-	 @abstract Real Time A/V applications send and receive Iscohronous data scheduled on certain USB frame numbers. The clock for these frame numbers is independent of the system clock, and drivers need to synchronize these two clocks. This routine will return a system time which corresponds to the beginning of a USB frame number. It is not necessarily the currrent frame, but it will be a frame in the recent past (within the past minute). The jitter between the start of the USB frame and the system time will be as low as possible, but due to hardware interrupt latencies could be as high as 200 microseconds.
-	 @param frameNumber A pointer to a UInt64 in which to hold the USB frame number corresponding to the given system time.
-	 @param theTime A pointer to an AbsoluteTime corresponding to the system time at the beginning of the given USB frame number.
-	 @result returns kIOReturnSuccess if the method is implemented by the controller, otherwise kIOReturnUnsupported
-	 */
-	virtual IOReturn		GetFrameNumberWithTime(UInt64* frameNumber, AbsoluteTime *theTime);
-	
-	
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  23);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  24);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  25);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  26);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  27);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  28);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  29);
-    
-};
-
-
-#endif /* ! _IOKIT_IOUSBCONTROLLERV2_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV3.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV3.h.svn-base
deleted file mode 100644
index 22da915..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBControllerV3.h.svn-base
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-* Copyright (c) 2007-2008 Apple Inc. All rights reserved.
-*
-* @APPLE_LICENSE_HEADER_START@
-* 
-* The contents of this file constitute Original Code as defined in and
-* are subject to the Apple Public Source License Version 1.2 (the
-* "License").  You may not use this file except in compliance with the
-* License.  Please obtain a copy of the License at
-* http://www.apple.com/publicsource and read it before using this file.
-* 
-* This Original Code and all software distributed under the License are
-* distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
-* Please see the License for the specific language governing rights and 
-* limitations under the License.
-* 
-* @APPLE_LICENSE_HEADER_END@
-*/
-
-#ifndef _IOKIT_IOUSBCONTROLLERV3_H
-#define _IOKIT_IOUSBCONTROLLERV3_H
-
-#include <IOKit/pci/IOPCIDevice.h>
-
-#include <IOKit/usb/IOUSBControllerV2.h>
-#include <IOKit/usb/IOUSBHubDevice.h>
-
-// Constants that define the different power states in the setPowerState call
-enum
-{
-    kUSBPowerStateOff				= 0,				// controller is reset, nothing is attached
-    kUSBPowerStateRestart			= 1,				// same as OFF
-    kUSBPowerStateSleep				= 2,				// controller is suspended, preparing to lose main power
-    kUSBPowerStateLowPower			= 3,				// controller is suspended, power remains on
-    kUSBPowerStateOn				= 4,				// up and running
-	kUSBNumberBusPowerStates		= 5
-};
-
-#define kUSBPowerStateStable		-1
-
-enum
-{
-    kUSBBusStateReset				= 0,				// bus is in RESET
-    kUSBBusStateSuspended			= 1,				// bus is in SUSPEND mode
-    kUSBBusStateRunning				= 2					// bus is operational
-};
-
-
-// Root Hub things
-typedef struct IOUSBRootHubInterruptTransaction 
-{
-    IOMemoryDescriptor *		buf;
-    UInt32						bufLen;
-    IOUSBCompletion				completion;
-} IOUSBRootHubInterruptTransaction;
-
-enum 
-{
-	  kIOUSBMaxRootHubTransactions  = 2
-};
-
-
-
-/*!
- @class IOUSBControllerV3
- @abstract subclass of the IOUSBControllerV2 to provide support for new USB Power Management techniques.
- @discussion With Leopard, we are providing more information to USB Device Drivers in the IOPower
- tree to allow for more efficient Power Management. This controller class encapulates many of the changes
- needed for that, without disturbing third party subclasses of IOUSBController or IOUSBControllerV2
- */
-
-class IOUSBControllerV3 : public IOUSBControllerV2
-{	
-		OSDeclareAbstractStructors(IOUSBControllerV3)
-
-	protected:
-		// static variable shared by all instances
-		static uint32_t *				_gHibernateState;
-
-	
-		UInt8							_myBusState;					// kUSBBusStateReset, kUSBBusStateSuspended, kUSBBusStateRunning
-		bool							_wakingFromHibernation;			// True while the Hibernation Wake thread is active
-		bool							_needToAckPowerDown;			// True while we are changing power state due to shutdown/restart
-		bool							_onCardBus;						// OBSOLETE
-		bool							_controllerAvailable;			// true if we can talk to the controller
-		SInt32							_powerStateChangingTo;			// a power state that we are in the process of changing to, or -1 if we are stable
-		bool							_poweringDown;					// true is the controller is powering down because of a systemWillPowerDown message
-		bool							_restarting;					// true is the controller is restarting because of a systemWillPowerDown message
-		unsigned long					_myPowerState;					// my current state (since getPowerState doesn't always change in time)
-		IOUSBControllerV3				*_ehciController;				// set if I am a companion controller
-		unsigned long					_numPowerStates;				// how many power states do I support (defaults to kUSBNumDefaultPowerStates)
-		IOPMPowerState					*_myPowerStates;				// my power state array (allocated on the fly)
-		IOPCIDevice						*_device;						// my PCI device
-
-		// root hub support
-	    IOTimerEventSource					*_rootHubTimer;				// timer which fires at the rate of the root hub interrupt endpoint
-		UInt8								_rootHubPollingRate;		// Obsolete -- we need to have it be a uint32_t
-		UInt8								_rootHubNumPorts;			// number of root hub ports - should be 15 or fewer!
-		UInt16								_rootHubStatusChangedBitmap;	// support up to 15 ports for status changes
-		bool								_rootHubTimerActive;		// UNUSED
-		IOUSBRootHubInterruptTransaction	_outstandingRHTrans[4];		// Transactions for the Root Hub.  We need 2, one for the current transaction and one for the next.  This is declared as 4 for binary compatibility
-
-		struct V3ExpansionData { 
-			uint32_t				_rootHubPollingRate32;
-			bool					_rootHubTransactionWasAborted;
-		};
-		V3ExpansionData *_v3ExpansionData;
-
-		// IOKit methods
-		virtual bool					init( OSDictionary *  propTable );
-		virtual bool					start( IOService *  provider );
-		virtual void					stop( IOService * provider );
-		virtual unsigned long			maxCapabilityForDomainState ( IOPMPowerFlags domainState );
-		virtual unsigned long			initialPowerStateForDomainState ( IOPMPowerFlags domainState );
-		virtual IOReturn				powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
-		virtual IOReturn				setPowerState( unsigned long powerStateOrdinal, IOService* whatDevice );
-		virtual IOReturn				powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
-		virtual void					powerChangeDone ( unsigned long fromState);
-		virtual void					systemWillShutdown( IOOptionBits specifier );
-		virtual void					free(void);
-	
-		// IOUSBController methods
-		// we override these to deal with methods attempting to go through the workloop while we are in sleep
-		virtual IOReturn 		AcquireDeviceZero( void );
-		virtual void			ReleaseDeviceZero( void );
-		virtual IOReturn 		DeviceRequest(IOUSBDevRequest *request,  IOUSBCompletion *completion, USBDeviceAddress address, UInt8 epNum, UInt32 noDataTimeout, UInt32 completionTimeout);
-		virtual IOReturn 		DeviceRequest(IOUSBDevRequestDesc *request,  IOUSBCompletion *completion, USBDeviceAddress address, UInt8 epNum, UInt32 noDataTimeout, UInt32 completionTimeout);
-		virtual IOReturn 		ClosePipe(USBDeviceAddress address, Endpoint *endpoint);
-		virtual IOReturn 		AbortPipe(USBDeviceAddress address, Endpoint *endpoint);
-		virtual IOReturn 		ResetPipe(USBDeviceAddress address, Endpoint *endpoint);
-		virtual IOReturn 		ClearPipeStall(USBDeviceAddress address, Endpoint *endpoint);
-		virtual IOReturn 		Read(IOMemoryDescriptor *buffer, USBDeviceAddress address, Endpoint *endpoint, IOUSBCompletion *completion, UInt32 noDataTimeout, UInt32 completionTimeout, IOByteCount reqCount);
-		virtual IOReturn 		Write(IOMemoryDescriptor *buffer, USBDeviceAddress address, Endpoint *endpoint, IOUSBCompletion *completion, UInt32 noDataTimeout, UInt32 completionTimeout, IOByteCount reqCount);
-		virtual IOReturn		IsocIO(IOMemoryDescriptor *buffer, UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList, USBDeviceAddress address, Endpoint *endpoint, IOUSBIsocCompletion *completion );
-		virtual IOReturn		IsocIO(IOMemoryDescriptor *buffer, UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList, USBDeviceAddress address, Endpoint *endpoint, IOUSBLowLatencyIsocCompletion *completion, UInt32 updateFrequency );	
-
-		// IOUSBControllerV2 methods
-		// we override these to deal with methods attempting to go through the workloop while we are in sleep
-		virtual IOReturn 		OpenPipe(USBDeviceAddress address, UInt8 speed, Endpoint *endpoint);
-		virtual IOReturn		AddHSHub(USBDeviceAddress highSpeedHub, UInt32 flags);
-		virtual IOReturn		RemoveHSHub(USBDeviceAddress highSpeedHub);
-		virtual IOReturn		SetTestMode(UInt32 mode, UInt32 port);
-		virtual IOReturn		ReadV2(IOMemoryDescriptor *buffer, USBDeviceAddress	address, Endpoint *endpoint, IOUSBCompletionWithTimeStamp *completion, UInt32 noDataTimeout, UInt32	completionTimeout, IOByteCount reqCount);
-	
-		// IOUSBControllerV3 methods
-	
-		// these are called through the workloop
-		static IOReturn					DoEnableAddressEndpoints(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
-		static IOReturn					DoEnableAllEndpoints(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
-		static IOReturn					GatedPowerChange(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
-
-		// also on the workloop
-	    static void						RootHubTimerFired(OSObject *owner, IOTimerEventSource *sender);
-	
-		// subclassable methods
-		virtual IOReturn				CheckForEHCIController(IOService *provider);
-		virtual	IOReturn				AllocatePowerStateArray(void);
-		virtual	IOReturn				InitForPM(void);
-		virtual IOReturn				CheckPowerModeBeforeGatedCall(char *fromStr);
-		virtual IOReturn				EnableAllEndpoints(bool enable);
-		virtual IOReturn				EnableBusMastering(bool enable);
-		virtual IOReturn				EnsureUsability(void);
-		virtual IOReturn				CheckForRootHubChanges(void);
-		virtual IOReturn				RootHubQueueInterruptRead(IOMemoryDescriptor *buf, UInt32 bufLen, IOUSBCompletion completion);
-		virtual IOReturn				RootHubAbortInterruptRead(void);
-		virtual IOReturn				RootHubStartTimer(UInt8 pollingRate);			// Obsolete see RootHubStartTimer32
-		virtual IOReturn				RootHubStopTimer(void);
-	
-		// these methods have a default implementation using some of the virtual methods below
-		virtual	void					ControllerOff(void);
-		virtual	void					ControllerRestart(void);
-		virtual	void					ControllerSleep(void);
-		virtual	void					ControllerDoze(void);
-		virtual	void					ControllerOn(void);
-
-		// these methods are pure virtual, and need to be implemented in the subclass driver
-		virtual	IOReturn				ResetControllerState(void) = 0;
-		virtual IOReturn				RestartControllerFromReset(void) = 0;
-		virtual	IOReturn				SaveControllerStateForSleep(void) = 0;
-		virtual	IOReturn				RestoreControllerStateFromSleep(void) = 0;
-		virtual IOReturn				DozeController(void) = 0;
-		virtual IOReturn				WakeControllerFromDoze(void) = 0;
-		virtual IOReturn				UIMEnableAddressEndpoints(USBDeviceAddress address, bool enable) = 0;
-		virtual IOReturn				UIMEnableAllEndpoints(bool enable) = 0;
-		virtual IOReturn				EnableInterruptsFromController(bool enable) = 0;
-	
-	public:
-	
-		// public methods
-		virtual IOReturn				EnableAddressEndpoints(USBDeviceAddress address, bool enable);
-		virtual bool					IsControllerAvailable(void);
-		virtual IOReturn				HandlePowerChange(unsigned long powerStateOrdinal);
-		virtual	UInt32					AllocateExtraRootHubPortPower(UInt32 extraPowerRequested);
-		virtual	void					ReturnExtraRootHubPortPower(UInt32 extraPowerReturned);
-	
-	OSMetaClassDeclareReservedUsed(IOUSBControllerV3,  0);
-	virtual IOReturn				RootHubStartTimer32(uint32_t pollingRate);
-	
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  1);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  2);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  3);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  4);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  5);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  6);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  7);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  8);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  9);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  10);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  11);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  12);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  13);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  14);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  15);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  16);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  17);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  18);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  19);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  20);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  21);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  22);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  23);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  24);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  25);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  26);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  27);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  28);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  29);
-};
-
-#endif		// _IOKIT_IOUSBCONTROLLERV3_H
\ No newline at end of file
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBDevice.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBDevice.h.svn-base
deleted file mode 100644
index 58d73a0..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBDevice.h.svn-base
+++ /dev/null
@@ -1,639 +0,0 @@
-/*
- * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.2 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
- * Please see the License for the specific language governing rights and 
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __OPEN_SOURCE__
-/*
- *
- *	$Log: IOUSBDevice.h,v $
- *	Revision 1.65  2009/10/18 20:20:37  nano
- *	Bring in fixes in 390.4.0 QL:  7310698 7301024 7307079 and 7310698
- *
- *	Revision 1.64.32.4  2009/10/15 21:17:43  nano
- *	If OverrideAtLocationID does not see a override property, return true
- *	
- *	Revision 1.64.32.3.2.1  2009/10/15 21:36:27  nano
- *	If OverrideAtLocationID does not see a override property, return true
- *	
- *	Revision 1.64.32.3  2009/10/14 19:16:15  nano
- *	Minor name changes
- *	
- *	Revision 1.64.32.2  2009/10/14 19:05:21  nano
- *	7284477 7293893 Simplify scheme to decide whether we want to override a property for a hub at a particular ID for a particular MacModel.  Added a IOUSBDevice API that tells us if we are in the right model and locationID to override a property
- *	
- *	Revision 1.64.32.1  2009/10/08 19:55:56  nano
- *	rdar://7284477 Allow us to overide the config descriptor of a 2514 hub on a K23F
- *	
- *	Revision 1.64  2009/09/08 12:28:45  nano
- *	<rdar://problem/7195788> IOUSBDevice headerdoc comment problem - GetNumConfigs name is wrong, should be GetNumConfigurations
- *	
- *	Revision 1.63  2009/05/07 19:43:09  nano
- *	Move our SnowLeopard branch to TOT
- *	
- *	Revision 1.57.84.6  2009/03/13 22:45:11  nano
- *	Bring in branches to fix 6676089 6675858 6567987 6490273
- *	
- *	Revision 1.57.84.5.4.1  2009/03/11 20:01:56  nano
- *	rdar://6567987  Do not let a Reset or a ReEnumerate through while the other is executing.
- *	
- *	Revision 1.57.84.5  2009/02/26 13:44:32  nano
- *	Bring in rdar://6536090&6586312 to SL branch
- *	
- *	Revision 1.57.84.4.10.1  2009/02/25 00:51:06  rhoads
- *	change the mechanism of getConfigLock so as to prevent a deadlock
- *	
- *	Revision 1.57.84.4  2009/02/13 15:57:33  rhoads
- *	roll in rdars: 6213394, 6489431, 6513000, 6515115, 6535200, 6567783
- *	
- *	Revision 1.57.84.3.48.3  2009/02/11 19:19:08  rhoads
- *	add back an expansionData variable to preserve binary compatibility
- *	
- *	Revision 1.57.84.3.48.2  2009/02/11 03:05:56  arulchan
- *	more ::SuspendDevice changes
- *	
- *	Revision 1.57.84.3.48.1  2009/01/23 21:34:15  arulchan
- *	fix for rdar://6213394
- *	
- *	Revision 1.57.84.3  2008/06/16 21:31:16  nano
- *	Bring in changes from Foxhound 320.2.17
- *	
- *	Revision 1.57.84.2  2008/04/22 22:38:01  nano
- *	Bring in changes from Foxhound-320.2.9
- *	
- *	Revision 1.60.28.2  2008/05/22 17:36:18  nano
- *	Fix the reporting of the internal bit for GetDeviceInformation
- *	
- *	Revision 1.60.28.1  2008/05/21 17:51:43  nano
- *	<rdar://problem/5952635> GetDeviceInformation needs some fixes
- *	
- *	Revision 1.60  2008/04/18 22:03:28  nano
- *	Bring in fix for rdar://5874560
- *	
- *	Revision 1.59.4.1  2008/04/18 21:55:55  nano
- *	<rdar://problem/5874560> Need API to know how much extra power has been allocated
- *	
- *	Revision 1.59  2008/04/17 16:56:57  nano
- *	Bring in branches for rdar://5867990 & rdar://5768343
- *	
- *	Revision 1.58.4.1  2008/04/16 20:26:13  nano
- *	<rdar://problem/5867990> Add API to allocate sleep current, as well as making sure that we return any extra power if our client dies or our device is terminated without returning it
- *	
- *	Revision 1.58  2008/04/14 16:08:38  nano
- *	Add new APIs for high power and for GetDeviceInformation.
- *	
- *	Revision 1.57.126.2  2008/04/13 05:25:40  nano
- *	Call into PolicyMaker for the GetPortInformation
- *	
- *	Revision 1.57.126.1  2008/04/11 22:25:44  nano
- *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
- *	
- *	Revision 1.57  2007/08/07 20:30:36  rhoads
- *	rolled in a few branches to TOT
- *	
- *	Revision 1.56.92.1  2007/08/07 03:43:34  nano
- *	Bring in more changes for M89 suppport -- like actually use the dang power if the properties are available
- *	
- *	Revision 1.56  2007/03/06 12:23:41  rhoads
- *	roll in 5024412, 5035829, and 5039670
- *	
- *	Revision 1.55.30.1  2007/02/27 16:08:33  rhoads
- *	some fine tuning of our IOService overrides, including not overriding willTerminate and didTerminate (5024412)
- *	
- *	Revision 1.55  2007/01/19 17:58:48  rhoads
- *	roll in branches for a leopard build
- *	
- *	Revision 1.54.30.1  2007/01/17 16:37:02  rhoads
- *	remove the IOUSBDevice::attach method which is not really useful
- *	
- *	Revision 1.54  2006/10/06 04:42:01  rhoads
- *	roll in branches 4727961, 4758404, 4759810, 4760274, and 4762769
- *	
- *	Revision 1.53.4.1  2006/10/04 16:03:57  rhoads
- *	better IOUSBHubDevice design
- *	
- */
-#endif
-
-#ifndef _IOKIT_IOUSBDEVICE_H
-#define _IOKIT_IOUSBDEVICE_H
-
-#include <IOKit/usb/IOUSBNub.h>
-#include <IOKit/usb/IOUSBPipe.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOCommandGate.h>
-
-#include <kern/thread_call.h>
-
-// The following are definitions for errata properties needed for different devices.  This
-// should be but in the dictionary of the IOUSBDevice in question.  This can be achieved
-// by using the AppleUSBMergeNub class and having an IOProviderMergeProperties dictionary
-// with the required properties.
-
-// This property allows a device to specify a configuration value of 0 in its configuration
-// descriptor.  This does not follow the spec, but we will allow it in order to get the device 
-// to work.  The property should be a Boolean
-//
-#define kAllowConfigValueOfZero		"kAllowZeroConfigValue"
-#define kAllowNumConfigsOfZero		"kAllowZeroNumConfigs"
-
-
-class IOUSBController;
-class IOUSBControllerV2;
-class IOUSBInterface;
-class IOUSBHubPolicyMaker;
-/*!
-    @class IOUSBDevice
-    @abstract The IOService object representing a device on the USB bus.
-    @discussion This class provides functionality to configure a device and to create
-	IOUSBInterface objects to represent the interfaces of the device.
-*/
-
-class IOUSBDevice : public IOUSBNub
-{
-    friend class IOUSBController;
-    friend class IOUSBControllerV2;
-    friend class IOUSBInterface;
-    friend class IOUSBPipe;
-   
-    OSDeclareDefaultStructors(IOUSBDevice)
-
-protected:
-
-    USBDeviceAddress				_address;
-    IOUSBController *	     		_controller;
-    IOUSBPipe *						_pipeZero;
-    IOUSBDeviceDescriptor			_descriptor;
-    UInt32							_busPowerAvailable;
-    UInt8							_speed;
-    IOUSBEndpointDescriptor			_endpointZero; 				// Fake ep for control pipe
-    void *							_port;					// Obsolete, do not use
-    IOBufferMemoryDescriptor**		_configList;
-    IOUSBInterface**				_interfaceList;
-    UInt8							_currentConfigValue;
-    UInt8							_numInterfaces;
-    
-    struct ExpansionData 
-    {
-        UInt32					_portNumber;
-        thread_call_t			_doPortResetThread;
-        IOUSBDevice *			_usbPlaneParent;
-        bool					_portResetThreadActive;
-        bool					_allowConfigValueOfZero;
-        thread_call_t			_doPortSuspendThread;
-        bool					_portSuspendThreadActive;
-        thread_call_t			_doPortReEnumerateThread;
-        bool					_resetInProgress;
-        bool					_portHasBeenReset;
-        IORecursiveLock*		_XgetConfigLock;				// Obsolete
-        bool					_doneWaiting;                   // Obsolete
-        bool					_notifiedWhileBooting;          // Obsolete
-        IOWorkLoop *			_workLoop;
-        IOTimerEventSource *	_notifierHandlerTimer;
-        UInt32					_notificationType;
-        bool					_suspendInProgress;
-        bool					_portHasBeenSuspendedOrResumed;
-        bool					_addExtraResetTime;
-		bool					_suspendCommand;
-		IOCommandGate *			_commandGate;
-		OSSet *					_openInterfaces;
-		bool					_resetCommand;
-		IOReturn				_resetError;
-		IOReturn				_suspendError;
-        thread_call_t			_doMessageClientsThread;
-		IOUSBHubPolicyMaker *	_hubPolicyMaker;
-		UInt32					_sleepPowerAllocated;				// how much sleep power we already gave to our client
-		UInt32					_wakePowerAllocated;				// how much extra power during wake did we already give our client
-		UInt32					_devicePortInfo;
-		bool					_deviceIsInternal;					// Will be set if all our upstream hubs are captive (internal to the computer)
-		bool					_deviceIsInternalIsValid;			// true if we have already determined whether the device is internal
-		bool					_newGetConfigLock;					// new lock, taken within the WL gate, when doing a GetConfig
-		UInt32					_resetAndReEnumerateLock;			// "Lock" to prevent us from doing a reset or a re-enumerate while the other one is in progress		
-		UInt32					_locationID;
-    };	
-    ExpansionData * _expansionData;
-
-    const IOUSBConfigurationDescriptor *FindConfig(UInt8 configValue, UInt8 *configIndex=0);
-
-    virtual IOUSBInterface * GetInterface(const IOUSBInterfaceDescriptor *interface);
-
-public:
-    virtual IOReturn SetFeature(UInt8 feature);
-
-protected:    
-    virtual IOReturn GetConfigDescriptor(UInt8 configIndex, void *data, UInt32 len);
-
-    virtual IOReturn GetDeviceDescriptor(IOUSBDeviceDescriptor *desc, UInt32 size);
-
-    virtual bool init(USBDeviceAddress deviceAddress, UInt32 powerAvaiable, UInt8 speed, UInt8 maxPacketSize );
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 *score);
-    
-public:
-    // IOService methods
-    virtual bool		init( void );
-    virtual bool		start( IOService *provider );	
-	virtual bool		handleIsOpen(const IOService *forClient) const;
-	virtual bool		handleOpen(IOService *forClient, IOOptionBits options, void *arg);
-	virtual void		handleClose(IOService *forClient, IOOptionBits options);
-    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
-    virtual bool		terminate( IOOptionBits options = 0 );
-    virtual bool		requestTerminate( IOService * provider, IOOptionBits options );
-    virtual void		stop( IOService *provider );
-    virtual bool		finalize(IOOptionBits options);
-	virtual void		free( void );	
-
-	// IOUSBDevice methods
-    virtual void SetProperties();
-    
-    static IOUSBDevice *NewDevice(void);
-    
-    virtual void SetPort(void *port);			// Obsolete, do NOT use
-
-    /*!
-	@function FindNextInterfaceDescriptor
-	return a pointer to the next interface descriptor within the given full configuration descriptor satisfying the requirements specified, or NULL if there aren't any.
-        @param configDescIn the configuration descriptor within which to search. obtained from GetFullConfigurationDescriptor(configIndex). use NULL to specify the current configuration's descriptor.
-        @param intfDesc interface descriptor from which to start the search. NULL for the first interface descriptor in the given configuration descriptor
-        @param request IOUSBFindInterfaceRequest specifying the desired interface. Not changed.
-        @param descOut pointer to placeholder for the returned descriptor ptr
-	@result returns kIOReturnBadArgument if configDesc is not correct, or if configDesc is NULL and the device is not configured, or if intfDesc is not in configDesc. Otherwise returns kIOReturnSuccess or kIOUSBInterfaceNotFound.
-    */
-    virtual IOReturn FindNextInterfaceDescriptor(const IOUSBConfigurationDescriptor *configDescIn, 
-                                                 const IOUSBInterfaceDescriptor *intfDesc,
-                                                 const IOUSBFindInterfaceRequest *request,
-                                                 IOUSBInterfaceDescriptor **descOut);
-    /*!
-	@function FindNextInterface
-	return an pointer to an IOUSBInterface object satisfying the requirements specified in request, or NULL if there aren't any. the device
-        must be configured for there to be any interfaces.
-        @param current interface to start searching from, NULL to start at the beginning of the device's interface list for the current configuration.
-	@param request specifies what properties an interface must have to match.
-	@result Pointer to a matching IOUSBInterface, or NULL if none match. Note: The IOUSBInterface is NOT retained for the caller. If the caller wishes to continue to use the returned object, it should call retain() on that object.
-    */
-    virtual IOUSBInterface *FindNextInterface(IOUSBInterface *current,
-                                              IOUSBFindInterfaceRequest *request);
-
-    /*!
-        @function CreateInterfaceIterator 
-        return an OSIterator to iterate through interfaces satisfying the requirements specified in request.                        
-        @param request specifies what properties an interface must have to match.
-        @result Pointer to an OSIterator.
-    */
-    virtual OSIterator *CreateInterfaceIterator(IOUSBFindInterfaceRequest *request);
-
-    // Get pointer to full config info (cached in device, don't free returned pointer)
-    /*!
-	@function GetFullConfigurationDescriptor
-	return a pointer to all the descriptors for the requested configuration.
-        @param configIndex The configuration index (not the configuration value)
-	@result Pointer to the descriptors, which are cached in the IOUSBDevice object.
-    */
-    virtual const IOUSBConfigurationDescriptor *GetFullConfigurationDescriptor(UInt8 configIndex);
-
-    /*!
-	@function GetConfigurationDescriptor
-        Copy the specified amount of data for a configuration into the suppled buffer.
-        @param configValue The configuration value
-	@param data Buffer to copy data into
-	@param len number of bytes to copy
-    */
-    virtual IOReturn GetConfigurationDescriptor(UInt8 configValue, void *data, UInt32 len);
-
-    /*!
-	@function ResetDevice
-	Reset the device, returning it to the addressed, unconfigured state.
-	This is useful if a device has got badly confused. Note that the AppleUSBComposite driver will automatically
-        reconfigure the device if it is a composite device.
-    */
-    virtual IOReturn ResetDevice();
-
-    /*!
-	@function SetConfiguration
-	Do a USB SetConfiguration call to the device. The caller must have the device open() in order to 
-	actually cause a configuration change. If the device is currently configured, all IOUSBInterface objects
-	associated with the device are freed. After the new configuration has been set, all of its IOUSBInterface objects are
-	instantiated automatically.
-	@param forClient The client requesting the configuration change
-	@param configValue The desired configuration value.
-	@param startInterfaceMatching A boolean specifying whether IOKit should begin the process of finding
-	matching drivers for the new IOUSBInterface objects.
-    */
-    virtual IOReturn SetConfiguration(IOService *forClient, UInt8 configValue, bool startInterfaceMatching=true);
-    
-    // Access to addressing and cached info
-    /*!
-        @function GetAddress
-        returns the bus address of the device
-    */
-    virtual USBDeviceAddress GetAddress(void);
-    
-    /*!
-        @function GetSpeed
-        returns the speed of the device
-    */
-    virtual UInt8 GetSpeed(void);
-    /*!
-        @function GetBus
-        returns a pointer to the IOUSBController object for the device
-    */
-    virtual IOUSBController *GetBus(void);
-    /*!
-        @function GetBusPowerAvailable
-        returns the power available to the device, in units of 2mA
-    */
-    virtual UInt32 GetBusPowerAvailable( void );
-    /*!
-        @function GetMaxPacketSize
-        returns the maximum packet size for endpoint zero (only 8, 16, 32, 64 are valid)
-    */
-    virtual UInt8 GetMaxPacketSize(void);
-    /*!
-        @function GetVendorID
-        returns the Vendor ID of the device
-    */
-    virtual UInt16 GetVendorID(void);
-    /*!
-        @function GetProductID
-        returns the Product ID of the device
-    */
-    virtual UInt16 GetProductID(void);
-    /*!
-        @function GetDeviceRelease
-        returns the DeviceRelease information
-    */
-    virtual UInt16 GetDeviceRelease(void);
-    /*!
-        @function GetNumConfigurations
-        returns the number of configs in the device config descriptor
-    */
-    virtual UInt8 GetNumConfigurations(void);
-    /*!
-        @function GetManufacturerStringIndex
-        returns the index of string descriptor describing manufacturer
-    */
-    virtual UInt8 GetManufacturerStringIndex(void );
-    /*!
-        @function GetProductStringIndex
-        returns the index of string descriptor describing product
-    */
-    virtual UInt8 GetProductStringIndex(void );
-    /*!
-        @function GetSerialNumberStringIndex
-        returns the index of string descriptor describing the device's serial number
-    */
-    virtual UInt8 GetSerialNumberStringIndex(void );
-    /*!
-        @function GetPipeZero
-        returns a pointer to the device's default control pipe
-    */
-    virtual IOUSBPipe * GetPipeZero(void);
-
-	// Deprecated but needed for binary compatibility
-    virtual IOUSBPipe*	MakePipe(const IOUSBEndpointDescriptor *ep);
-    
-    // this method is deprecated. use the other DeviceRequest methods
-    virtual IOReturn DeviceRequest(IOUSBDevRequest	*request,
-                                IOUSBCompletion	*completion = 0);
-
-    // Same but with a memory descriptor
-    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc	*request,
-                                   IOUSBCompletion	*completion = 0);
-
-    /*!
-	@function GetConfiguration
-	Gets the current configuration from the IOUSBDevice object.  Note that this call will send a control
-        request on the bus to get the current configuration from the physical device.
-	@param configNum Pointer to place to store configuration value.
-    */
-    virtual IOReturn GetConfiguration(UInt8 *configNumber);
-
-    /*!
-        @function GetDeviceStatus
-        Gets the device's status.  Note that this sends a control request to the physical device.
-        @param status Pointer to place to store the status.
-    */
-    virtual IOReturn GetDeviceStatus(USBStatus *status);
-
-    /*! 
-	@function GetStringDescriptor
-	Get a string descriptor as ASCII, in the specified language (default is US English)
-	@param index Index of the string descriptor to get.
-	@param buf Pointer to place to store ASCII string
-	@param maxLen Size of buffer pointed to by buf
-        @param lang Language to get string in (default is US English)
-    */
-    virtual IOReturn GetStringDescriptor(UInt8 index, char *buf, int maxLen, UInt16 lang=0x409);
-    
-    /*! 
-	@function GetChildLocationID
-	Get the locationID (UInt32) given the port number and the parent's location
-	@param parentLocationID locationID for the hub to which this device is attached.
-	@param port Port number of the hub where this device is attached
-    */
-    virtual UInt32 GetChildLocationID(UInt32 parentLocationID, int port);
-
-    virtual const IOUSBDescriptorHeader* FindNextDescriptor(const void *cur, UInt8 descType);
-
-    virtual void 	DisplayNotEnoughPowerNotice();
-    
-    // this is a non-virtual function so that we don't have to take up a binary compatibility slot.
-    UInt16	GetbcdUSB(void);
-    UInt8	GetProtocol(void);
-	void	SetBusPowerAvailable(UInt32 newPower);
-
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  0);
-    /*!
-	@function DeviceRequest
-        @abstract execute a control request to the default control pipe (pipe zero)
-        @param request The parameter block to send to the device
-        @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
-        if no data has been transferred on the bus.
-        @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
-        not been completed.
-		@param completion Function to call when request completes. If omitted then
-	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
-	 the IOUSBDevRequest is not released until the callback has occurred.
-
-    */
-    virtual IOReturn DeviceRequest(IOUSBDevRequest	*request,
-				UInt32 noDataTimeout,
-				UInt32 completionTimeout,
-                                IOUSBCompletion	*completion = 0);
-
-    /*!
-	 @function DeviceRequest
-	 @abstract execute a control request to the default control pipe (pipe zero)
-	 @param request The parameter block to send to the device (with the pData as an IOMemoryDesriptor)
-	 @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
-	 if no data has been transferred on the bus.
-	 @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
-	 not been completed.
-	 @param completion Function to call when request completes. If omitted then
-	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
-	 the IOUSBDevRequest is not released until the callback has occurred.
-	 
-	 */
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  1);
-    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc	*request,
-				    UInt32 noDataTimeout,
-				    UInt32 completionTimeout,
-				    IOUSBCompletion	*completion = 0);
-
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  2);
-    /*!
-	@function SuspendDevice
-        @abstract Instruct the hub to which this device is attached to suspend or resume the port to which the device is attached.
-        Note that if there are any outstanding transactions on any pipes in the device, those transactions will get returned with a 
-        kIOReturnNotResponding error.
-        @param suspend Boolean value. true = suspend, false = resume.
-    */
-    virtual IOReturn SuspendDevice( bool suspend);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  3);
-    /*!
-	@function ReEnumerateDevice
-        @abstract Instruct the hub to which this device is attached to reset the port to which this device is attached. This causes the
-        IOUSBDevice object and any child objects (IOUSBInterface objects or driver objects) to be terminated, and the device to be
-        completely reenumerated, as if it had been detached and reattached.
-        @param options Reserved for future use.
-    */
-    virtual IOReturn ReEnumerateDevice( UInt32 options );
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  4);
-    /*!
-        @function DisplayUserNotification
-        @abstract  Will use the KUNCUserNotification mechanism to display a notification to the user.
-        @param notificationType Which notification to display.
-     */
-    virtual void	DisplayUserNotification(UInt32 notificationType);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  5);
-	/*!
-        @function MakePipe
-	 @abstract build a pipe on a given endpoint
-	 @param ep A description of the endpoint
-	 @param interface The IOUSBInterface object requesting the pipe
-	 returns the desired IOUSBPipe object
-	 */
-    virtual IOUSBPipe*	MakePipe(const IOUSBEndpointDescriptor *ep, IOUSBInterface *interface);
-    
-	
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  6);
-	/*!
-	 @function SetHubParent
-	 @abstract Used by the hub driver to give the nub a pointer to its HubPolicyMaker object
-	 @param hubPolicyMaker	The object representing the Hub driver
-	 */
-    virtual void	SetHubParent(IOUSBHubPolicyMaker *hubParent);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  7);
-	/*!
-	 @function GetHubParent
-	 @abstract Used by the hub driver to give the nub a pointer to its HubPolicyMaker object
-	 @param hubPolicyMaker	The object representing the Hub driver
-	 */
-    virtual IOUSBHubPolicyMaker*	GetHubParent();
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  8);
-    /*!
-	 @function 	GetDeviceInformation
-	 @abstract 	Returns status information about the USB device, such as whether the device is captive or whether it is in the suspended state.
-	 @param requestedPower 	The desired amount of power that the client wishes to reserve
-	 @result 		Actual power that was reserved
-	 
-		*/
-	virtual IOReturn	GetDeviceInformation(UInt32 *info);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  9);
-    /*!
-	 @function				RequestExtraPower
-	 @abstract				Clients can use this API to reserve extra power for use by this device while the machine is asleep or while it is awake.  Units are milliAmps (mA).
-	 @param type			Indicates whether the power is to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
-	 @param requestedPower 	Amount of power desired, in mA
-	 @result				Amount of power actually reserved, in mA.  It can be less than the requested or zero.
-	 
-	 */
-	virtual UInt32	RequestExtraPower(UInt32 type, UInt32 requestedPower);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  10);
-    /*!
-	 @function				ReturnExtraPower
-	 @abstract				Clients can use this API to tell the system that they will not use power that was previously reserved by using the RequestExtraPower API.
-	 @param type			Indicates whether the power is to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
-	 @param returnedPower 	Amount of power that is no longer needed, in mA
-	 @result				If the returnedPower was not previously allocated, an error will be returned.  This will include the case for power that was requested for sleep but was returned for wake.
-	 
-	 */
-	virtual IOReturn		ReturnExtraPower(UInt32 type, UInt32 returnedPower);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  11);
-    /*!
-	 @function				GetExtraPowerAllocated
-	 @abstract				Clients can use this API to ask how much extra power has already been reserved by this device.  Units are milliAmps (mA).
-	 @param type			Indicates whether the allocated power was to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
-	 @result				Amount of power allocated, in mA.
-	 
-	 */
-	virtual UInt32			GetExtraPowerAllocated(UInt32 type);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  12);
-    /*!
-	 @function				DoLocationOverrideAndModelMatch
-	 @abstract				Will look for a kOverrideIfAtLocationID array proerty with locationID entries and a "MacModel" property.  If any of the locationIDs match to the Mac Model, will return true.
-	 						If there is no kOverrideAtLocationID property, it will also return true.
-	 @result				True if we have a match, false otherwise
-	 */
-	virtual	bool			DoLocationOverrideAndModelMatch();
-	
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  13);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  14);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  15);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  16);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  17);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  18);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  19);
-    
-private:
-
-    static void 	ProcessPortResetEntry(OSObject *target);
-    void 		ProcessPortReset(void);
-
-    void 		TerminateInterfaces(void);
-
-    static void 	ProcessPortReEnumerateEntry(OSObject *target, thread_call_param_t options);
-    void 		ProcessPortReEnumerate(UInt32 options);
-	
-    static void 	DoMessageClientsEntry(OSObject *target, thread_call_param_t messageStruct);
-    void 		DoMessageClients( void * messageStructPtr);
-	
-    static void 	DisplayUserNotificationForDeviceEntry (OSObject *owner, IOTimerEventSource *sender);
-    void		DisplayUserNotificationForDevice( );
-    
-    UInt32              SimpleUnicodeToUTF8(UInt16 uChar, UInt8 utf8Bytes[4]);
-    void                SwapUniWords (UInt16  **unicodeString, UInt32 uniSize);
-
-    IOReturn			TakeGetConfigLock(void);
-    IOReturn			ReleaseGetConfigLock(void);
-    static IOReturn		ChangeGetConfigLock(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-};
-
-#endif /* _IOKIT_IOUSBDEVICE_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBHIDDriver.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBHIDDriver.h.svn-base
deleted file mode 100644
index 5e76887..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBHIDDriver.h.svn-base
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef IOUSBHIDDRIVER_H
-#define IOUSBHIDDRIVER_H
-
-#include <IOKit/IOBufferMemoryDescriptor.h>
-
-#include <IOKit/hid/IOHIDDevice.h>
-
-#include <IOKit/usb/IOUSBBus.h>
-#include <IOKit/usb/IOUSBInterface.h>
-#include <IOKit/usb/USB.h>
-
-
-#define ENABLE_HIDREPORT_LOGGING	0
-
-// Report types from low level USB:
-//	from USBSpec.h:
-//    enum {
-//        kHIDRtInputReport		= 1,
-//        kHIDRtOutputReport		= 2,
-//        kHIDRtFeatureReport		= 3
-//    };
-//    
-//	from IOHIDDescriptorParser.h:
-//    // types of HID reports (input, output, feature)
-//    enum
-//    {
-//        kHIDInputReport			= 	1,
-//        kHIDOutputReport,
-//        kHIDFeatureReport,
-//        kHIDUnknownReport		=	255
-//    };
-//    
-// Report types from high level HID Manager:
-//	from IOHIDKeys.h:
-//    enum IOHIDReportType
-//    {
-//        kIOHIDReportTypeInput = 0,
-//        kIOHIDReportTypeOutput,
-//        kIOHIDReportTypeFeature,
-//        kIOHIDReportTypeCount
-//    };
-//
-#define HIDMGR2USBREPORTTYPE(x) (x + 1)
-#define USB2HIDMGRREPORTTYPE(x) (x - 1)
-
-
-// Note: In other Neptune files, kMaxHIDReportSize was defined as 64. But Ferg & Keithen were unable to
-// find that value in the USB HID 1.1 specs. Brent had previously changed it to 256 in the OS 9 HID Driver
-// to  allow for reports spanning multiple packets. 256 may be no more a hard and fast limit, but it's 
-// working for now in OS 9.
-#define kMaxHIDReportSize 256			// Max packet size = 8 for low speed & 64 for high speed.
-#define kHIDDriverRetryCount	3
-#define	kUSBHIDReportLoggingLevel	"USB HID Report Logging Level"
-
-
-// power states for the driver (awake or suspended)
-enum
-{
-	kUSBHIDPowerStateOff		= 0,
-	kUSBHIDPowerStateRestart	= 1,
-	kUSBHIDPowerStateSleep		= 2,			// this could be system sleep or idle sleep
-	kUSBHIDPowerStateLowPower	= 3,			// this is idling
-	kUSBHIDPowerStateOn			= 4,			// this is fully on
-	kUSBHIDNumberPowerStates	= 5
-};
-
-
-/*!
- @class IOUSBHIDDriver
- @abstract Driver that matches to USB HID devices.
- @discussion This class can be overriden to provide for specific behaviors.
- */
-class IOUSBHIDDriver : public IOHIDDevice
-{
-    OSDeclareDefaultStructors(IOUSBHIDDriver)
-
-    IOUSBInterface *			_interface;
-    IOUSBDevice	*				_device;
-    IOUSBPipe *					_interruptPipe;
-    UInt32						_maxReportSize;
-    IOBufferMemoryDescriptor *	_buffer;
-    IOUSBCompletion				_completion;
-    UInt32						_retryCount;
-    thread_call_t				_deviceDeadCheckThread;
-    thread_call_t				_clearFeatureEndpointHaltThread;
-    bool						_deviceDeadThreadActive;
-    bool						_deviceIsDead;                          // Should really be called "abort expected"
-    bool						_deviceHasBeenDisconnected;
-    bool						_needToClose;
-    UInt32						_outstandingIO;
-    IOCommandGate *				_gate;
-    IOUSBPipe *					_interruptOutPipe;
-    UInt32						_locationID; 	
-    IOBufferMemoryDescriptor *	_outBuffer;								// Obsolete
-    UInt32						_deviceUsage;							// Obsolete
-    UInt32						_deviceUsagePage;						// Obsolete
-
-    struct IOUSBHIDDriverExpansionData 
-    {
-        IOWorkLoop	*					_workLoop;
-        thread_call_t					_handleReportThread;
-        IOService *						_rootDomain;
-        AbsoluteTime					_wakeUpTime;
-        IOUSBCompletionWithTimeStamp	_completionWithTimeStamp;
-        bool							_checkForTimeStamp;
-        UInt32							_msToIgnoreTransactionsAfterWake;
-        IOTimerEventSource	*			_suspendPortTimer;
-		bool							_portSuspended;
-		UInt32							_suspendTimeoutInMS;
-		UInt8							_interfaceNumber;
-		bool							_logHIDReports;
-		UInt8							_hidLoggingLevel;
-		bool							_needToClearPipeStall;
-		SInt32							_queuedReports;
-		AbsoluteTime					_interruptTimeStamp;
-		bool							_powerStateChanging;
-		unsigned long					_myPowerState;
-		bool							_pendingRead;
-		UInt32							_deviceDeadCheckLock;			// "Lock" to prevent us from executing the device dead check while in progress		
-    };
-    IOUSBHIDDriverExpansionData *_usbHIDExpansionData;
-    
-    static void 		InterruptReadHandlerEntry(OSObject *target, void *param, IOReturn status, UInt32 bufferSizeRemaining);
-    static void 		InterruptReadHandlerWithTimeStampEntry(OSObject *target, void *param, IOReturn status, UInt32 bufferSizeRemaining, AbsoluteTime timeStamp);
-    void				InterruptReadHandler(IOReturn status, UInt32 bufferSizeRemaining, AbsoluteTime timeStamp);
-
-    static void 		CheckForDeadDeviceEntry(OSObject *target);
-    void				CheckForDeadDevice();
-
-    static void			ClearFeatureEndpointHaltEntry(OSObject *target);
-    void				ClearFeatureEndpointHalt(void);
-    
-    static void			HandleReportEntry(OSObject *target, thread_call_param_t timeStamp);
-    void				HandleReport(AbsoluteTime timeStamp);
-    
-    virtual void 		processPacket(void *data, UInt32 size);		// Obsolete
-
-    static IOReturn		ChangeOutstandingIO(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-    static IOReturn		ClaimPendingRead(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-
-    static void			SuspendPortTimer(OSObject *target, IOTimerEventSource *sender);
-
-public:
-        
-    // IOService methods
-    //
-    virtual bool			init(OSDictionary *properties);
-    virtual bool			start(IOService * provider);
-    virtual bool			didTerminate( IOService * provider, IOOptionBits options, bool * defer );
-    virtual bool			willTerminate( IOService * provider, IOOptionBits options );
-    virtual void			stop(IOService *  provider);
-    virtual void			free();
-    virtual IOReturn		message( UInt32 type, IOService * provider,  void * argument = 0 );
-	virtual unsigned long	maxCapabilityForDomainState ( IOPMPowerFlags domainState );
-	virtual IOReturn		powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
-	virtual IOReturn		setPowerState ( unsigned long powerStateOrdinal, IOService* whatDevice );
-	virtual IOReturn		powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
- 	virtual void			powerChangeDone ( unsigned long fromState);
-  
-
-    // IOHIDDevice methods
-    //
-    virtual bool		handleStart(IOService * provider);
-    virtual void		handleStop(IOService *  provider);
-
-    virtual IOReturn 	newReportDescriptor( IOMemoryDescriptor ** descriptor ) const;
-                        
-    virtual OSString * 	newTransportString() const;
-
-    virtual OSNumber * 	newVendorIDNumber() const;
-
-    virtual OSNumber * 	newProductIDNumber() const;
-
-    virtual OSNumber * 	newVersionNumber() const;
-
-    virtual OSString * 	newManufacturerString() const;
-
-    virtual OSString * 	newProductString() const;
-
-    virtual OSString * 	newSerialNumberString() const;
-
-    virtual OSNumber * 	newLocationIDNumber() const;
-
-    virtual OSNumber * 	newCountryCodeNumber() const;
-
-    virtual IOReturn	getReport( IOMemoryDescriptor * report,
-                                IOHIDReportType      reportType,
-                                IOOptionBits         options = 0 );
-                                
-    virtual IOReturn 	setReport( IOMemoryDescriptor * report,
-                                IOHIDReportType      reportType,
-                                IOOptionBits         options = 0 );
-
-    // HID driver methods
-    //
-    virtual OSString * 	newIndexedString(UInt8 index) const;
-
-    virtual UInt32		getMaxReportSize();
-	
-    virtual void		DecrementOutstandingIO(void);
-    virtual void		IncrementOutstandingIO(void);
-    virtual IOReturn	StartFinalProcessing();
-    virtual IOReturn	SetIdleMillisecs(UInt16 msecs);
-    
-private:
-
-	IOReturn			GetHIDDescriptor(UInt8 inDescriptorType, UInt8 inDescriptorIndex, UInt8 *vOutBuf, UInt32 *vOutSize);
-	IOReturn			GetReport(UInt8 inReportType, UInt8 inReportID, UInt8 *vInBuf, UInt32 *vInSize);
-	IOReturn			SetReport(UInt8 outReportType, UInt8 outReportID, UInt8 *vOutBuf, UInt32 vOutSize);
-	IOReturn			GetIndexedString(UInt8 index, UInt8 *vOutBuf, UInt32 *vOutSize, UInt16 lang = 0x409) const;
-	IOReturn			SetProtocol(UInt32 protocolType);
-	char				GetHexChar(char hexChar);
-	IOReturn			AbortAndSuspend( bool suspend );
-	
-        
-
-#if ENABLE_HIDREPORT_LOGGING
-    void LogBufferReport(char *report, UInt32 len);
-    void LogMemReport(IOMemoryDescriptor * reportBuffer);
-    char GetHexChar(char hexChar);
-#endif
-
-public:
-    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  0);
-    virtual IOReturn    RearmInterruptRead();
-    
-    /*!
-		@function SuspendPort
-	 @abstract Suspends the port for this device or optionally sets a timeout to suspend after a period of inactivity.
-	 @discussion  This call can be used to immediately suspend/resume a port or to enable the suspension of the port after a period of inactivity.  If called with suspendPort = true (no timeout parameter), the HID driver
-	 will immediately suspend the port, after aborting any outstanding reads on the interrupt pipe.  If called with suspendPort = true and timeout != 0, it will suspend the port after the timeout number of ms have
-	 passed without any read completions.  If called with suspendPort = false, the port will be immediately resumed and the reads will be re-issued.  If a timeout was enabled, it will be cancelled.
-	 @param suspendPort Boolean value. true = suspend the port, false = resume the port.
-	 @param timeoutMS	Value in milliseconds If value is non-zero, the port will be suspended after the timeout milliseconds have passed without any read completions.
-	 @result The IOReturn value from the IOUSBDevice::Suspend() call. 
-	*/
-    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  1);
-	virtual IOReturn	SuspendPort(bool suspendPort, UInt32 timeoutMS = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  2);
-	virtual bool		IsPortSuspended();
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  3);
-    virtual void		LogMemReport(UInt8 level, IOMemoryDescriptor * reportBuffer, IOByteCount size);
-
-    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  4);
-	virtual IOReturn	InitializeUSBHIDPowerManagement(IOService *provider);
-	
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  5);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  6);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  7);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  8);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  9);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 10);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 11);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 12);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 13);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 14);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 15);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 16);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 17);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 18);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 19);
-};
-
-#endif	// IOUSBHIDDRIVER_H
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBHubDevice.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBHubDevice.h.svn-base
deleted file mode 100644
index 91c728c..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBHubDevice.h.svn-base
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __OPEN_SOURCE__
-/*
- *
- *	$Log: IOUSBHubDevice.h,v $
- *	Revision 1.11  2009/09/12 03:42:16  rhoads
- *	merge in the changes for the 390.3.4b QL
- *
- *	Revision 1.10.52.1  2009/09/10 18:50:52  nano
- *	<rdar://problem/7134800> Task: Extra Current support for Ibex Peak RMHs -- look for a property that tells us to ask our USB plane parent for the extra current.  This will allow the RMH to pass on the request to it's parent.
- *	
- *	Revision 1.10  2009/05/07 19:43:09  nano
- *	Move our SnowLeopard branch to TOT
- *	
- *	Revision 1.6.102.3  2008/06/16 22:02:16  nano
- *	Bring in changes from Foxound 320.2.19
- *	
-
- *	Revision 1.6.102.2  2008/04/22 22:38:01  nano
- *	Bring in changes from Foxhound-320.2.9
- *	
- *	Revision 1.8.62.2  2008/06/06 21:08:44  nano
- *	Enable dynamic allocation of power for M89, so we don't reserve it if there isn't a high power device attached
- *	
- *	Revision 1.8.62.1  2008/06/06 04:14:32  nano
- *	Fix SleepCurrent allocation so it will work with hub devices and root hub devices as well as consolidating it across all controllers
- *	
- *	Revision 1.8  2008/04/17 16:56:57  nano
- *	Bring in branches for rdar://5867990 & rdar://5768343
- *	
- *	Revision 1.7.4.1  2008/04/17 15:54:07  nano
- *	Merged PR-5768343 into this branch and fixed a couple of issues
- *	
- *	Revision 1.7.2.1  2008/04/16 00:48:49  ferg
- *	Bug #: 5768343
- *	Add support for hubs with high-power downstream port capability.  This is
- *	controlled by the properties "AAPL,current-available" and "AAPL,current-extra".
- *	
- *	Revision 1.7  2008/04/14 16:08:38  nano
- *	Add new APIs for high power and for GetDeviceInformation.
- *	
- *	Revision 1.6.144.1  2008/04/11 22:25:44  nano
- *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
- *	
- *	Revision 1.6  2007/08/01 16:10:18  rhoads
- *	roll in extra power changes
- *	
- *	Revision 1.5.118.1  2007/07/27 16:49:10  rhoads
- *	merge the extra current stuff into Leopard, and add extra sleep current for self powered hubs
- *	
- *	Revision 1.5  2007/01/20 00:47:01  rhoads
- *	roll in Hub Policy Maker changes
- *	
- *	Revision 1.4  2006/12/22 23:05:46  rhoads
- *	roll in branches 4364835 and 4277683-2
- *	
- *	Revision 1.3.20.3  2007/01/15 19:58:07  rhoads
- *	saving more changes
- *	
- *	Revision 1.3.20.2  2007/01/09 21:55:53  rhoads
- *	commit some stuff to try to fix a permissions issue
- *	
- *	Revision 1.3.20.1  2006/12/18 19:13:56  rhoads
- *	re-integrate the old branch into TOT
- *	
- *	Revision 1.3.12.4  2006/12/18 17:33:48  rhoads
- *	looking good except for sleep/wake
- *	
- *	Revision 1.3.12.3  2006/12/08 05:42:40  rhoads
- *	mostly working
- *	
- *	Revision 1.3.12.2  2006/11/14 22:37:06  rhoads
- *	more changes with the root hubs
- *	
- *	Revision 1.3.12.1  2006/11/07 16:55:52  rhoads
- *	change to get the IOUSBHubDevice nubs into the IOPower tree
- *	
- *	Revision 1.3  2006/10/06 04:42:02  rhoads
- *	roll in branches 4727961, 4758404, 4759810, 4760274, and 4762769
- *	
- *	Revision 1.2.4.2  2006/10/04 23:01:24  rhoads
- *	better naming
- *	
- *	Revision 1.2.4.1  2006/10/04 16:03:57  rhoads
- *	better IOUSBHubDevice design
- *	
- */
-#endif
-
-
-#ifndef _IOKIT_IOUSBHUBDEVICE_H
-#define _IOKIT_IOUSBHUBDEVICE_H
-
-#include <IOKit/usb/IOUSBDevice.h>						// our superclass
-
-// forward refeference. we don't include the header file because it would cause a circular reference
-class IOUSBHubPolicyMaker;
-
-enum {
-	kIOUSBHubDeviceIsRootHub			=	0x0001,
-	kIOUSBHubDeviceIsOnHighSpeedBus		=	0x0002,
-	kIOUSBHubDeviceCanSleep				=	0x0004
-};
-
-/*!
-    @class IOUSBHubDevice
-    @abstract New in MAC OS X 10.5. The IOKit object representing a hub device on the USB bus. It is a subclass of IOUSBDevice.
-    @discussion With the exception of the IOUSBRootHubDevice objects representing the root hubs, every IOUSBDevice
-	will have an IOUSBHubDevice as its parent in the IOUSB plane. USB KEXT drivers will have the ability to 
-	query this device for characteristics of the hub into which they are connected. This class will also give a dive driver
-	the abilty to get an IOService* pointing to the hub driver itself, which can then be used as the parent in the power plane.
-*/
-
-class IOUSBHubDevice : public IOUSBDevice
-{
-	friend class IOUSBHubPolicyMaker;
-	friend class AppleUSBHub;
-	friend class IOUSBController;								// for the "can sleep" characteristic
-	
-private:
-    OSDeclareDefaultStructors(IOUSBHubDevice)
-
-	UInt32					_myCharacteristics;					// bitmap of my characteristics
-	IOUSBHubPolicyMaker		*_myPolicyMaker;					// pointer to the policy maker in the IOPower tree for this hub
-
-    struct ExpansionData 
-	{ 
-		UInt32					_maxPortCurrent;				// maximum current in milliamps per downstream port
-		UInt32					_totalExtraCurrent;				// total amount of current above the spec'ed current per port available (during normal operation)
-		UInt32					_totalSleepCurrent;				// total amount of current that can be drawn during sleep
-		UInt32					_canRequestExtraPower;			// If 0, this hub does not support requesting extra power from its parent, non-zero:  how much power we need to request in order to give out _extraPowerForPorts
-		UInt32					_extraPowerForPorts;			// Of the power requested from our parent, how much can we parcel out -- the rest is consumed by voltage drop thru the cable
-		UInt32					_extraPowerAllocated;			// Amount of power that we actually got from our parent
-		bool					_requestFromParent;				// True if we are to request the extra power from our parent, without modifying the request.  Used for RMHs
-	};
-    ExpansionData			*_expansionData;
-	
-protected:
-	// IOUSBHubDevice methods which will be used by the hub driver (which is also the Policy Maker)
-	virtual	void			SetPolicyMaker(IOUSBHubPolicyMaker *policyMaker);
-	virtual void			SetHubCharacteristics(UInt32);
-	virtual bool			InitializeCharacteristics(void);					// used at start
-	
-public:
-	// static constructor
-    static IOUSBHubDevice	*NewHubDevice(void);
-
-	// IOKit methods
-    virtual bool			init();
-	virtual bool			start( IOService * provider );
-    virtual void			stop( IOService *provider );
-    virtual void			free();
-	
-	// public IOUSBHubDevice methods
-
-	void					SetTotalSleepCurrent(UInt32 sleepCurrent);
-	UInt32					GetTotalSleepCurrent();
-	
-    /*!
-	 @function GetPolicyMaker
-	 returns a pointer to the policy maker for the hub, which can be used as the power plane parent.
-	 @result returns an IOUSBHubPolicyMaker* pointing to the policy maker for this hub. returns NULL is no policy maker is active on the hub device.
-	 */
-	virtual IOUSBHubPolicyMaker *GetPolicyMaker(void);
-	
-    /*!
-	@function GetHubCharacteristics
-	returns characteristics of the hub device which might be useful for the driver of a device connected to the hub.
-		kIOUSBHubDeviceIsRootHub indicates that the hub is a root hub
-		kIOUSBHubDeviceIsOnHighSpeedBus indicates that the hub is running on a High Speed bus. If this bit is set and kIOUSBHubDeviceIsHighSpeed is clear, then this is a Classic Speed hub running on a High Speed bus, which means that Split Transactions will be used to communicate with downstream devices.
-
-	@result returns a bitmap of characteristics
-    */
-	virtual	UInt32			GetHubCharacteristics();
-	
-    /*!
-	@function GetMaxProvidedPower
-	returns the maximum amount of power available on any downstream port of this hub
-	@result the power is returned in milliamps - usually 100ma or 500 ma.
-    */
-	virtual UInt32			GetMaxProvidedPower();
-
-    /*!
-	@function RequestProvidedPower
-	requests power from the hub device
-	@param requestedPower - the amount of power requested in milliamps (usually 100ma or 500 ma)
-	@result the amount of power allocated for this driver in milliamps (usually 100ma or 500 ma)
-    */
-	virtual UInt32			RequestProvidedPower(UInt32 requestedPower);
-
-	virtual UInt32			RequestExtraPower(UInt32 requestedPower);
-
-	virtual void			ReturnExtraPower(UInt32 returnedPower);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  0);
-	
-	virtual void			InitializeExtraPower(UInt32 maxPortCurrent, UInt32 totalExtraCurrent);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  1);
-	virtual UInt32			RequestSleepPower(UInt32 requestedPower);
-
-    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  2);
-	virtual void			ReturnSleepPower(UInt32 returnedPower);
-
-    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  3);
-	virtual void			SetSleepCurrent(UInt32 sleepCurrent);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  4);
-	virtual	UInt32			GetSleepCurrent();
-	
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  5);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  6);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  7);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  8);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  9);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  10);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  11);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  12);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  13);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  14);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  15);
-};
-
-#endif /* _IOKIT_IOUSBROOTHUBDEVICE_H */
-
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBHubPolicyMaker.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBHubPolicyMaker.h.svn-base
deleted file mode 100644
index a0021d3..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBHubPolicyMaker.h.svn-base
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2007 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __OPEN_SOURCE__
-/*
- *
- *	$Log: IOUSBHubPolicyMaker.h,v $
- *	Revision 1.10  2009/05/07 19:43:09  nano
- *	Move our SnowLeopard branch to TOT
- *
- *	Revision 1.7.72.3  2008/07/23 17:43:32  nano
- *	<rdar://problem/5939357> IOUSBHIDDriver, IOHIDEventService missing HeaderDoc class declarations
- *	
- *	Revision 1.7.72.2  2008/04/22 22:38:01  nano
- *	Bring in changes from Foxhound-320.2.9
- *	
- *	Revision 1.9  2008/04/17 16:56:57  nano
- *	Bring in branches for rdar://5867990 & rdar://5768343
- *	
- *	Revision 1.8.4.1  2008/04/16 20:26:15  nano
- *	<rdar://problem/5867990> Add API to allocate sleep current, as well as making sure that we return any extra power if our client dies or our device is terminated without returning it
- *	
- *	Revision 1.8  2008/04/14 16:08:38  nano
- *	Add new APIs for high power and for GetDeviceInformation.
- *	
- *	Revision 1.7.114.1  2008/04/11 22:25:44  nano
- *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
- *	
- *	Revision 1.7  2007/08/17 22:41:11  nano
- *	Bring in branch that fixes <rdar://problem/5414582> USB not honoring Resume recovery time (hub driver) and adds extra time for iPods
- *	
- *	Revision 1.6.30.1  2007/08/16 19:14:02  nano
- *	ResumeRecovery additions.
- *	
- *	Revision 1.6  2007/08/01 16:10:18  rhoads
- *	roll in extra power changes
- *	
- *	Revision 1.5.12.1  2007/07/27 16:49:10  rhoads
- *	merge the extra current stuff into Leopard, and add extra sleep current for self powered hubs
- *	
- *	Revision 1.5  2007/07/20 22:31:22  rhoads
- *	roll in branch300-3-2
- *	
- *	Revision 1.4.40.1  2007/07/18 18:44:24  rhoads
- *	this is the 300.3.2g version plus some quieter logs
- *	
- *	Revision 1.4.34.2  2007/07/17 06:30:35  rhoads
- *	more hub chain fixes
- *	
- *	Revision 1.4.34.1  2007/07/16 16:45:00  rhoads
- *	more power management and termination tweaks
- *	
- *	Revision 1.4  2007/05/18 01:59:12  rhoads
- *	roll in 5112084 and 5204170
- *	
- *	Revision 1.3.2.1  2007/05/15 18:23:48  rhoads
- *	some initial power state bug fixes
- *	
- *	Revision 1.3  2007/05/10 22:25:35  rhoads
- *	roll in branch 5113395 - the last major piece of the new power architecture
- *	
- *	Revision 1.2.64.4  2007/04/13 22:34:59  rhoads
- *	fix restart and shutdown
- *	
- *	Revision 1.2.64.3  2007/04/11 23:56:23  rhoads
- *	first mostly working dozing hub
- *	
- *	Revision 1.2.64.2  2007/04/10 02:09:09  rhoads
- *	got UHCI almost working
- *	
- *	Revision 1.2.64.1  2007/04/05 02:57:50  rhoads
- *	move power management out of AppleUSBHub and into IOUSBHubPolicyMaker
- *	
- *	Revision 1.2  2007/01/20 00:47:01  rhoads
- *	roll in Hub Policy Maker changes
- *	
- *	Revision 1.1.2.4  2007/01/18 22:51:08  rhoads
- *	add some padding
- *	
- *	Revision 1.1.2.3  2007/01/15 19:58:07  rhoads
- *	saving more changes
- *	
- *	Revision 1.1.2.2  2007/01/09 23:55:36  rhoads
- *	working version
- *	
- *	Revision 1.1.2.1  2007/01/09 21:57:02  rhoads
- *	commit some stuff to try to fix a permissions issue
- *	
- *	
- */
-#endif
-#ifndef _IOKIT_IOUSBHUBPOLICYMAKER_H
-#define _IOKIT_IOUSBHUBPOLICYMAKER_H
-
-#include	<IOKit/IOService.h>
-#include	<IOKit/usb/IOUSBController.h>
-#include	<IOKit/usb/IOUSBHubDevice.h>
-
-
-enum {
-	kIOUSBHubPowerStateOff		= 0,				// losing power
-	kIOUSBHubPowerStateRestart	= 1,				// reseting bus, but may maintain power
-	kIOUSBHubPowerStateSleep	= 2,				// upstream port and all downstream ports suspended (from the top)
-	kIOUSBHubPowerStateLowPower	= 3,				// upstream port and all downstream ports suspended (from the bottom)
-	kIOUSBHubPowerStateOn		= 4,				// upstream port and at least one downstream port on
-	kIOUSBHubNumberPowerStates	= 5
-};
-
-enum {
-	kHubResumeRecoveryTime	=	10,								// 10 ms to recover after I resume myself
-	kPortResumeRecoveryTime =	10								// 10 ms to recover another device
-};
-
-#define kIOUSBHubPowerStateStable	-1
-
-/*!
- @class IOUSBHubPolicyMaker
- @abstract Super class for Hub drivers to incorporate common Power Management code.
- */
-class IOUSBHubPolicyMaker : public IOService
-{
-	OSDeclareAbstractStructors(IOUSBHubPolicyMaker)
-
-protected:
-    IOUSBControllerV2 *					_bus;
-    IOUSBHubDevice *					_device;					// our provider
-    IOUSBHubDevice *					_parentHubDevice;			// for non root hub drivers, this is the hub device that my hub device is connected to
-    bool								_isRootHub;					// this is a root hub
-	bool								_dozeEnabled;				// true if the controller has been enabled to go into doze mode
-	bool								_dontAllowLowPower;			// If true, we will not allow the hub to go into low power mode.
-	bool								_dontAllowSleepPower;		// If true, we will not allow extra sleep power for a self powered hub.
-	SInt32								_powerStateChangingTo;		// a power state if we are changing to one, or -1 if we are stable
-	unsigned long						_myPowerState;				// my current state (since getPowerState doesn't always change in time)
-	UInt32								_extraPower;				// how much extra power we might be able to get from our parent hub
-	UInt32								_extraPowerRemaining;		// how many milliamps we can still give to any one port
-	UInt32								_hubResumeRecoveryTime;		// # of ms that we will wait before issuing any transactions on our port (nominally 10ms)
-    struct ExpansionData 
-	{ 
-	};
-    ExpansionData			*_expansionData;
-
-public:
-	// IOService methods
-    virtual bool						start(IOService * provider);
-	virtual IOReturn					powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
-	virtual unsigned long				powerStateForDomainState ( IOPMPowerFlags domainState );
-	virtual IOReturn					setPowerState ( unsigned long powerStateOrdinal, IOService* whatDevice );
-	virtual IOReturn					powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
-	virtual unsigned long				maxCapabilityForDomainState ( IOPMPowerFlags domainState );
-	virtual void						powerChangeDone ( unsigned long fromState );
-
-	// public methods which MAY be implemented in subclass
-	virtual IOReturn					EnsureUsability(void);
-		
-	// Extra Port Power calls
-	void								AllocateExtraPower();
-	IOReturn							GetExtraPortPower(UInt32 portNum, UInt32 *extraPower);
-	IOReturn							ReturnExtraPortPower(UInt32 portNum, UInt32 extraPower);
-    
-	// virtual methods to be implemented in the controlling driver subclass
-	virtual bool						ConfigureHubDriver(void) = 0;
-	virtual IOReturn					HubPowerChange(unsigned long powerStateOrdinal) = 0;
-
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  0);
-	virtual	IOReturn					GetPortInformation(UInt32 portNum, UInt32 *info);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  1);
-	virtual	IOReturn					ResetPort(UInt32 portNum);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  2);
-	virtual	IOReturn					SuspendPort(UInt32 portNum, bool suspend);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  3);
-	virtual	IOReturn					ReEnumeratePort(UInt32 portNum, UInt32 options);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  4);
-	virtual UInt32						RequestExtraPower(UInt32 portNum, UInt32 type, UInt32 requestedPower);
-
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  5);
-	virtual IOReturn					ReturnExtraPower(UInt32 portNum, UInt32 type, UInt32 returnedPower);
-
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  6);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  7);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  8);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  9);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  10);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  11);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  12);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  13);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  14);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  15);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  16);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  17);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  18);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  19);
-};
-
-#endif _IOKIT_IOUSBHUBPOLICYMAKER_H
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBInterface.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBInterface.h.svn-base
deleted file mode 100644
index 4777e50..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBInterface.h.svn-base
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBINTERFACE_H
-#define _IOKIT_IOUSBINTERFACE_H
-
-#include <IOKit/IOService.h>
-#include <libkern/c++/OSData.h>
-
-#include <IOKit/usb/USB.h>
-#include <IOKit/usb/IOUSBNub.h>
-#include <IOKit/usb/IOUSBDevice.h>
-
-/*!
-    @class IOUSBInterface
-    @abstract The object representing an interface of a device on the USB bus.
-    @discussion This class provides functionality to find the pipes of an interface and
-	to read the descriptors associated with an interface. When an interface is open()ed,
-	all its pipes are created
-*/
-class IOUSBInterface : public IOUSBNub
-{
-    friend class IOUSBInterfaceUserClientV2;
-    
-    OSDeclareDefaultStructors(IOUSBInterface)
-
-protected:
-    IOUSBPipe * 			_pipeList[kUSBMaxPipes];
-    const IOUSBConfigurationDescriptor *_configDesc;
-    const IOUSBInterfaceDescriptor *	_interfaceDesc;
-    IOUSBDevice *			_device;
-
-    // these variable are the parsed interface descriptor
-    UInt8				_bInterfaceNumber;
-    UInt8				_bAlternateSetting;
-    UInt8				_bNumEndpoints;
-    UInt8				_bInterfaceClass;
-    UInt8				_bInterfaceSubClass;
-    UInt8				_bInterfaceProtocol;
-    UInt8				_iInterface;
-
-    struct ExpansionData {
-        IOCommandGate		*_gate;
-        IOWorkLoop			*_workLoop;
-		bool				_needToClose;
-		IOLock *			_pipeObjLock;											// Lock to synchronize accesses to our pipeObjects
-    };
-    ExpansionData * _expansionData;
-
-    // private methods
-    virtual void		ClosePipes(void);				// close all pipes (except pipe zero)
-    virtual IOReturn	CreatePipes(void);				// open all pipes in the current interface/alt interface
-    virtual void		SetProperties(void);			// update my property table with the correct properties		
-	
-public:
-	// static methods
-    static IOUSBInterface *withDescriptors(const IOUSBConfigurationDescriptor *cfDesc, const IOUSBInterfaceDescriptor *ifDesc);
-    static IOReturn	CallSuperOpen(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-    static IOReturn     CallSuperClose(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-	static UInt8 hex2char( UInt8 digit );
-    
-	// IOService methods
-    virtual bool		start(IOService * provider);
-    virtual bool		handleOpen(IOService *forClient, IOOptionBits options = 0, void *arg = 0 );
-    virtual bool		open(IOService *forClient, IOOptionBits options = 0, void *arg = 0 );
-    virtual void		close(IOService *forClient, IOOptionBits options = 0);
-    virtual void		handleClose(IOService *forClient, IOOptionBits options = 0);
-    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
-    virtual bool		finalize(IOOptionBits options);
-    virtual void		stop(IOService *  provider);
-    virtual bool		terminate( IOOptionBits options = 0 );
-    virtual void		free();	
-
-	// IOUSBInterface class methods
-	virtual bool		init(	const IOUSBConfigurationDescriptor *cfDesc,
-							 const IOUSBInterfaceDescriptor *ifDesc);
-   /*!
-        @function FindNextAltInterface
-        return alternate interface descriptor satisfying the requirements specified in request, or NULL if there aren't any.
-        request is updated with the properties of the returned interface.
-        @param current interface descriptor to start searching from, NULL to start at alternate interface 0.
-        @param request specifies what properties an interface must have to match.
-        @result Pointer to a matching interface descriptor, or NULL if none match.
-    */
-    virtual const IOUSBInterfaceDescriptor *FindNextAltInterface(const IOUSBInterfaceDescriptor *current,
-                                                                 IOUSBFindInterfaceRequest *request);
-
-    /*!
-	@function FindNextPipe
-	Find a pipe of the interface that matches the requirements, either
-	starting from the beginning of the interface's pipe list or from a specified
-	pipe.
-	@param current Pipe to start searching from, NULL to start from beginning of list.
-	@param request Requirements for pipe to match, updated with the found pipe's
-	properties.
-	@result Pointer to the pipe, or NULL if no pipe matches the request.
-    */
-    virtual IOUSBPipe *FindNextPipe(IOUSBPipe *current, IOUSBFindEndpointRequest *request);
-
-    /*!
-        @function FindNextAssociatedDescriptor
-        Find the next descriptor of the requested type associated with the interface.
-	@param current Descriptor to start searching from, NULL to start from beginning of list.
-	@param type Descriptor type to search for, or kUSBAnyDesc to return any descriptor type.
-	@result Pointer to the descriptor, or NULL if no matching descriptors found.
-    */
-    virtual const IOUSBDescriptorHeader * FindNextAssociatedDescriptor(const void *current, UInt8 type);
-
-    /*!
-        @function SetAlternateInterface
-        Select the specified alternate interface.
-        @param forClient The client requesting the alternate setting. This client must have the interface open in order to perform the request.
-	@param alternateSetting Alternate setting (from the alternate interface's interface descriptor).
-        @result exclusive access error if the interface is not open. otherwise the result of the transaction
-    */
-    virtual IOReturn SetAlternateInterface(IOService *forClient, UInt16 alternateSetting);
-
-     /*!
-        @function GetPipeObj
-	returns a handle to the pipe at the corresponding index
-        @param index value from zero to kUSBMaxPipes-1
-	@result The IOUSBPipe object. Note that the client does not own a reference to this pipe, so the client should retain() the IOUSBPipe object if necessary.
-    */
-    virtual IOUSBPipe *GetPipeObj(UInt8 index);
-    /*!
-        @function GetConfigValue
-	returns the device configuration value for the interface
-	@result The device configuration value.
-    */
-    virtual UInt8 GetConfigValue();
-    /*!
-        @function GetDevice
-        returns the device the interface is part of.
-	@result Pointer to the IOUSBDevice object which is the parent of this IOUSBInterface object.
-    */
-    virtual IOUSBDevice *GetDevice();
-    /*!
-        @function GetInterfaceNumber
-        returns the zero based value identifying the index in the array of concurrent
-        interfaces supported by the current configuration
-        @result the interface index
-    */
-    virtual UInt8 GetInterfaceNumber();
-    /*!
-        @function GetAlternateSetting
-        returns the alternate setting for this interface.
-        @result the alternate setting
-    */
-    virtual UInt8 GetAlternateSetting();
-    /*!
-        @function GetNumEndpoints
-        returns the number of endpoints used by this interface (excluding
-        device endpoint zero. If the value is zero, this interface only
-        uses endpoint zero.
-        @result the number of endpoints
-    */
-    virtual UInt8 GetNumEndpoints();
-    /*!
-        @function GetInterfaceClass
-        returns the class code for this interface (assigned by the USB)
-        a value of zero is reserved
-        if the value is FFh, the interface class is vendor-specific
-        all other values are reserved for assignment by the USB
-        @result the interface class
-    */
-    virtual UInt8 GetInterfaceClass();
-    /*!
-        @function GetInterfaceSubClass
-        returns the subclass code (assigned by the USB).
-        These codes are qualified by the value returned by GetInterfaceClass
-        @result the interface subclass
-    */
-    virtual UInt8 GetInterfaceSubClass();
-    /*!
-        @function GetInterfaceProtocol
-        returns the protocol code (assigned by the USB).
-        @result the interface index
-    */
-    virtual UInt8 GetInterfaceProtocol();
-    /*!
-        @function GetInterfaceStringIndex
-        returns the index of the string descriptor describing the interface
-        @result the string index
-    */
-    virtual UInt8 GetInterfaceStringIndex();
-    
-    /*!
-	@function DeviceRequest
-        @abstract Sends a control request to the default control pipe in the device (pipe zero)
-        @param request The parameter block to send to the device
-		@param completion Function to call when request completes. If omitted then
-        DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
-		the IOUSBDevRequest is not released until the callback has occurred.
-    */
-    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, IOUSBCompletion *completion = 0); 
-
-    /*!
-	 @function DeviceRequest
-	 @abstract Sends a control request to the default control pipe in the device (pipe zero)
-	 @param request The parameter block to send to the device (with the pData as an IOMemoryDesriptor)
-	 @param completion Function to call when request completes. If omitted then
-	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
-	 the IOUSBDevRequest is not released until the callback has occurred.
-	 */
-    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc *request, IOUSBCompletion *completion = 0);
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 *score);
-
-    OSMetaClassDeclareReservedUsed(IOUSBInterface,  0);
-    /*!
-	@function GetEndpointProperties
-        @abstract Returns the properties of an endpoint, possibly in an alternate interface.
-        @param alternateSetting specifies the desired alternate setting
-        @param endpointNumber specifies the endpoint number
-        @param direction specifies the direction (kUSBIn, kUSBOut)
-        @param transferType a pointer to hold the transfer type (kUSBControl, kUSBBulk, etc.) of the endpoint if found.
-        @param maxPacketSize a pointer to hold the maxPacketSize in the endpoint descriptor.
-        @param interval a pointer to hold the interval value in the endpoint descriptor.
-	@result returns kIOReturnSuccess if the endpoint is found, and kIOUSBEndpointNotFound if it is not.
-    */
-    virtual IOReturn GetEndpointProperties(UInt8 alternateSetting, UInt8 endpointNumber, UInt8 direction, UInt8 *transferType, UInt16 *maxPacketSize, UInt8 *interval);
-    
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  1);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  2);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  3);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  4);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  5);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  6);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  7);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  8);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  9);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  10);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  11);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  12);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  13);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  14);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  15);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  16);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  17);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  18);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  19);
-};
-
-#endif /* _IOKIT_IOUSBINTERFACE_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBLog.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBLog.h.svn-base
deleted file mode 100644
index 7f8f2a3..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBLog.h.svn-base
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright © 1998-20010 Apple Inc.  All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBLOG_H
-#define _IOKIT_IOUSBLOG_H
-
-#include 	<IOKit/IOService.h>
-#include	<IOKit/IOLib.h>
-
-
-#ifdef	__cplusplus
-	extern "C" {
-#endif
-
-// USB Specific defines
-#define USBLog( LEVEL, ARGS...)		KernelDebugLogTag( LEVEL, 'USBF', ## ARGS )
-#define USBError( LEVEL, ARGS...)	KernelDebugLogInternal( ( LEVEL ), 'USBF', ## ARGS )
-#define USBStringFromReturn( IORETURN)	(IOUSBController::_log)->stringFromReturn( IORETURN )
-
-
-// Possible Debug levels. If DEBUG_LEVEL is set to DEBUG_LEVEL_PRODUCTION, all debug logs will be 
-// stripped of the final code. 
-
-#define	DEBUG_LEVEL_PRODUCTION		0
-#define	DEBUG_LEVEL_DEVELOPMENT		1
-#define	DEBUG_LEVEL_ALPHA			2
-#define	DEBUG_LEVEL_BETA			3
-#define	DEBUG_LEVEL_FINAL			DEBUG_LEVEL_PRODUCTION
-
-// Allow clients to define their own debug level.
-
-#if ( !defined( DEBUG_LEVEL ) )
-	#define	DEBUG_LEVEL			DEBUG_LEVEL_PRODUCTION
-#endif
-
-// Index for user client methods
-//
-enum
-{
-    kUSBControllerUserClientOpen = 0,
-    kUSBControllerUserClientClose,
-    kUSBControllerUserClientEnableLogger,
-    kUSBControllerUserClientSetDebuggingLevel,
-    kUSBControllerUserClientSetDebuggingType,
-    kUSBControllerUserClientGetDebuggingLevel,
-    kUSBControllerUserClientGetDebuggingType,
-#ifndef __OPEN_SOURCE__
-    kUSBControllerUserClientSetTestMode,
-    kUSBControllerUserClientReadRegister,
-    kUSBControllerUserClientWriteRegister,
-    kUSBControllerUserClientMessageController,
-#endif
-    kNumUSBControllerMethods
-};
-
-#ifndef __OPEN_SOURCE__
-// Enums for the private kIOUSBMessageController message
-enum
-{
-	kIOUSBMessageControllerDoGPIOReset = 0x00000001
-};
-#endif
-
-// Info Debug Output Types.
-
-typedef UInt32		KernelDebuggingOutputType;
-enum
-{
-	kKernelDebugOutputIOLogType		= 0x00000001, 
-	kKernelDebugOutputKextLoggerType	= 0x00000002
-};
-
-
-// Info Debug levels.
-
-typedef UInt32		KernelDebugLevel;
-enum
-{
-	kKernelDebugInfoLevel 		= 1000, 
-	kKernelDebugRareInfoLevel	= 2000, 
-	kKernelDebugAllowedErrorLevel	= 3000, 
-	kKernelDebugAssertLevel 	= 4000, 
-	kKernelDebugRequireLevel	= 5000, 
-	kKernelDebugErrorLevel		= 6000, 
-	kKernelDebugCriticalErrorLevel	= 7000, 
-	kKernelDebugTragicErrorLevel	= 8000, 
-	kKernelDebugAnyLevel		= 0
-};
-
-// Function prototypes.
-
-void			KernelDebugSetLevel( KernelDebugLevel inLevel );
-KernelDebugLevel	KernelDebugGetLevel();
-void			KernelDebugSetOutputType( KernelDebuggingOutputType inType );
-KernelDebuggingOutputType	KernelDebugGetOutputType();
-IOReturn 		KernelDebugFindKernelLogger();
-void			KernelDebugEnable( bool enable );
-
-//	Yes, you can call this directly. But, why? If you use the macros declared below, such as
-//	KernelIOLog, you get the benefit of having your logs compiled out when you set the
-//	DEBUG_LEVEL to production mode and recompile. Dude. Sweet. What's mine say?
-
-void			KernelDebugLogInternal( KernelDebugLevel inLevel, UInt32 inTag, char const *inFormatString, ... )  __attribute__ ((format(printf,3,4)));;
-void 			KernelDebugLogDataInternal( UInt32 inLevel,  UInt32 inTag, void *buffer, UInt32 byteCount, bool preBuffer);
-
-// Handy macros.
-
-#define REQUIRE_NO_ERR_PRINTF( VALUE, LABEL, ARGS... )							\
-	if ( VALUE != kIOReturnSuccess )									\
-	{												\
-		KernelDebugLogInternal( kDebugInfoLevel, 'BluD', ## ARGS );				\
-		goto LABEL;										\
-	}
-
-#define REQUIRE_PRINTF( TEST, LABEL, ARGS... )								\
-	do												\
-	{												\
-		if ( !( TEST ) )										\
-		{											\
-			KernelDebugLogInternal( kDebugInfoLevel, 'BluD',  ## ARGS );			\
-			goto LABEL;									\
-		}											\
-	} while( false )
-
-// Some macros to call the debugging outputs. We'll strip out the debug logs if we are production code.
-
-#if DEBUG_LEVEL != DEBUG_LEVEL_PRODUCTION
-#define	KernelDebugLog( LEVEL, ARGS... )			KernelDebugLogInternal( ( LEVEL ), 'KDbg', ## ARGS ) __attribute__ ((format(printf,1,2)));
-	#define	KernelDebugLogTag( LEVEL, TAG, ARGS... )		KernelDebugLogInternal( ( LEVEL ), ( TAG ),  ## ARGS )
-	#define KernelDebugLogData( LEVEL, TAG, BUFFER, SIZE, HOLD)	KernelDebugLogDataInternal( ( LEVEL ), ( TAG ), ( BUFFER ), ( SIZE ), ( HOLD ))
-#else
-	#define	KernelDebugLog( LEVEL, ARGS... )
-	#define	KernelDebugLogTag( LEVEL, TAG, ARGS... )
-	#define KernelDebugLogData( LEVEL, TAG, BUFFER, SIZE, HOLD)
-#endif
-
-
-#ifdef	__cplusplus
-	}
-        
-//================================================================================================
-//   Forward declarations
-//================================================================================================
-class com_apple_iokit_KLogClient;
-
-//================================================================================================
-//   Defines
-//================================================================================================
-#define kLogKextName 	"com_apple_iokit_KLog"
-#define MAXUSERS 	5
-
-//================================================================================================
-//   Custom Types
-//================================================================================================
-
-typedef UInt32 KLogLevel;
-typedef UInt32 KLogTag;
-
-//================================================================================================
-//   com_apple_iokit_KLog
-//================================================================================================
-
-class com_apple_iokit_KLog : public IOService
-{
-
-    OSDeclareDefaultStructors(com_apple_iokit_KLog)
-
-    com_apple_iokit_KLogClient *	mClientPtr[MAXUSERS+1];
-
-    unsigned char *			mMsgBuffer;
-    UInt8 				mClientCount;
-    UInt8 				mMsgSize;
-    bool 				mErrFlag;
-    struct timeval *			mTimeVal;
-    IOLock *				mLogLock;
-    
-public:
-
-    static com_apple_iokit_KLog	*	logger;
-    
-    virtual bool 			init(OSDictionary *dictionary = 0);
-    virtual void 			free(void);
-   
-    virtual IOService *			probe(IOService *provider, SInt32 *score);
-    virtual bool 			start(IOService *provider);
-    virtual void 			stop(IOService *provider);
-    virtual IOReturn 			newUserClient( task_t owningTask, void * securityID,
-                                                UInt32 type, IOUserClient ** handler );
-
-    virtual SInt8			Log( KLogLevel level, KLogTag tag, const char *format, ... );
-    virtual SInt8			vLog( KLogLevel level, KLogTag tag, const char *format, va_list in_va_list );
-	
-    void 				closeChild(com_apple_iokit_KLogClient *ptr);
-    void 				setErr(bool set);
-    
-};
-
-#define kMaxStatusBufSize	(8*1024)
-
-
-class IOUSBLog : public IOService
-{
-    OSDeclareAbstractStructors(IOUSBLog)
-
-private:
-public:
-    virtual bool	init( OSDictionary * dictionary = 0 );
-  	virtual const char *			stringFromReturn( IOReturn rtn );
-	static IOUSBLog	*usblog();
-    virtual void 	AddStatusLevel (UInt32 level, UInt32 ref, char *status, UInt32 value);
-    virtual void	AddStatus(char *message);
-    virtual void	AddStatus(UInt32 level, char *message);
-    virtual void 	USBLogPrintf(UInt32 level, char *format,...);
-	virtual char *	strstr(const char *in, const char *str);
-};
-
-
-#endif
-#endif /* ! _IOKIT_IOUSBLOG_H */
-
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageClass.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageClass.h.svn-base
deleted file mode 100644
index 02c8557..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageClass.h.svn-base
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-
-#ifndef _IOKIT_IOUSBMASSSTORAGECLASS_H
-#define _IOKIT_IOUSBMASSSTORAGECLASS_H
-
-// Headers for general IOKit definitions
-#include <IOKit/IOLib.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOMessage.h>
-
-// Headers for USB specific definitions
-#include <IOKit/usb/IOUSBInterface.h>
-#include <IOKit/usb/IOUSBPipe.h>
-#include <IOKit/usb/USBSpec.h>
-#include <IOKit/usb/USB.h>
-
-// Headers for SCSI Protocol support definitions
-#include <IOKit/scsi/IOSCSIProtocolServices.h>
-
-// BSD includes
-#include <sys/sysctl.h>
-
-#define UNUSED(x) ((void)x)
-
-
-#pragma mark -
-#pragma mark Vendor Specific Device Support
-#define kIOUSBMassStorageCharacteristics		"USB Mass Storage Characteristics"
-#define kIOUSBMassStoragePreferredSubclass		"Preferred Subclass"
-#define kIOUSBMassStoragePreferredProtocol		"Preferred Protocol"
-#define kIOUSBMassStorageResetOnResume			"Reset On Resume"
-#define kIOUSBMassStorageUseStandardUSBReset	"Use Standard USB Reset"
-#define kIOUSBKnownCSWTagIssues					"Known CSW Tag Issues"
-#define kIOUSBMassStorageMaxLogicalUnitNumber	"Max Logical Unit Number"
-#define kIOPropertyIOUnitKey					"IOUnit"
-#define kIOUSBMassStorageDoNotMatch				"Do Not Match MSC"
-#define kIOUSBMassStorageDoNotOperate			"Do Not Operate"
-#define kIOUSBMassStorageEnableSuspendResumePM	"Enable Port Suspend-Resume PM"
-
-enum 
-{
-	kUSBDAddressLength = 10
-};
-
-#pragma mark -
-#pragma mark CBI Protocol Strutures
-// Structure for the global PB's
-struct CBIRequestBlock
-{
-	SCSITaskIdentifier			request;
-	IOUSBDevRequest				cbiDevRequest;
-	SCSICommandDescriptorBlock	cbiCDB;
-	IOUSBCompletion				cbiCompletion;
-	UInt32						currentState;
-	IOMemoryDescriptor *		cbiPhaseDesc;
-	UInt8						cbiGetStatusBuffer[2];	// 2 bytes as specified in the USB spec
-};
-
-typedef struct CBIRequestBlock	CBIRequestBlock;
-
-#pragma mark -
-#pragma mark Bulk Only Protocol Structures
-
-struct StorageBulkOnlyCBW
-{
-	UInt32		cbwSignature;
-	UInt32		cbwTag;
-	UInt32		cbwTransferLength;
-	UInt8		cbwFlags;
-	UInt8		cbwLUN;					// Bits 0-3: LUN, 4-7: Reserved
-	UInt8		cbwCDBLength;			// Bits 0-4: CDB Length, 5-7: Reserved
-	UInt8		cbwCDB[16];
-};
-
-typedef struct StorageBulkOnlyCBW	StorageBulkOnlyCBW;
-
-struct	StorageBulkOnlyCSW
-{
-	UInt32		cswSignature;
-	UInt32		cswTag;
-	UInt32		cswDataResidue;
-	UInt8		cswStatus;
-};
-
-typedef struct StorageBulkOnlyCSW	StorageBulkOnlyCSW;
-
-struct	BulkOnlyRequestBlock
-{
-	SCSITaskIdentifier		request;
-	IOUSBCompletion			boCompletion;
-	UInt32					currentState;
-	StorageBulkOnlyCBW		boCBW;
-	StorageBulkOnlyCSW		boCSW;
-	IOMemoryDescriptor *	boPhaseDesc;
-	UInt8					boGetStatusBuffer[2];	// 2 bytes as specified in the USB spec
-};
-
-typedef struct BulkOnlyRequestBlock		BulkOnlyRequestBlock;
-
-
-#pragma mark -
-#pragma mark IOUSBMassStorageClass definition
-
-class IOUSBMassStorageClass : public IOSCSIProtocolServices
-{
-    OSDeclareDefaultStructors(IOUSBMassStorageClass)
-
-private:
-	// ---- Member variables used by all protocols ----
-	// The interface object that provides the driver with access to the 
-	// USB so that it may talk to its device.
-    IOUSBInterface *			fInterface;
-
-	// The pipe objects that the driver uses to transport data through a
-	// pipe to the appropriate endpoint.
-    IOUSBPipe *					fBulkInPipe;
-    IOUSBPipe *					fBulkOutPipe;
-    IOUSBPipe *					fInterruptPipe;
-	IOUSBDevRequest				fUSBDeviceRequest;
-	UInt8						fPreferredSubclass;
-	UInt8						fPreferredProtocol;
-	
-  	// The maximum Logical Unit Number.  This is the highest valid LUN
-  	// that the USB device supports, so if the device only supports one
-  	// LUN, such as CBI and CB, this number will be zero.
-  	UInt8						fMaxLogicalUnitNumber;
-
-	// ---- Member variables used by CBI protocol ----
-	bool						fCBICommandStructInUse; 
-
-	CBIRequestBlock				fCBICommandRequestBlock;
-	
-	// ---- Member variables used by Bulk Only protocol ----
- 	// Command tag, this driver just uses a sequential counter that is
- 	// incremented for each CBW that is sent to the device.
- 	UInt32 						fBulkOnlyCommandTag;
-
-	bool						fBulkOnlyCommandStructInUse; 
-    
-    // Dedicated CBW and CSW IOMemoryDescriptors are listed in the ExpansionData struct.
-		
- 	// The Request block that contains all the necessary data for 
- 	// transporting a Bulk Only request across the USB.
- 	BulkOnlyRequestBlock		fBulkOnlyCommandRequestBlock;
-
-protected:
-    // Reserve space for future expansion.
-    struct ExpansionData
-	{
-		bool					fResetInProgress;
-		OSSet *					fClients;
-		IOUSBPipe *				fPotentiallyStalledPipe;
-		bool					fUseUSBResetNotBOReset;
-		bool					fAbortCurrentSCSITaskInProgress;
-		IOMemoryDescriptor *	fCBIMemoryDescriptor;
-		IOMemoryDescriptor *	fBulkOnlyCBWMemoryDescriptor;
-		IOMemoryDescriptor *	fBulkOnlyCSWMemoryDescriptor;
-        bool                    fDeviceAttached;
-		bool                    fWaitingForReconfigurationMessage;
-		bool					fTerminating;
-        bool                    fKnownCSWTagMismatchIssues;
-        bool                    fPortSuspendResumeForPMEnabled;
-        bool                    fPortIsSuspended;
-		bool					fRequiresResetOnResume;
-		bool					fAutonomousSpinDownWorkAround;
-		UInt8					fConsecutiveResetCount;
-		bool					fClearStallInProgress;				/* OBSOLETE */
-		bool					fTerminationDeferred;
-	};
-    ExpansionData *				reserved;
-	
-	#define fResetInProgress					reserved->fResetInProgress
-	#define fClients							reserved->fClients
-	#define fPotentiallyStalledPipe				reserved->fPotentiallyStalledPipe
-    #define fUseUSBResetNotBOReset				reserved->fUseUSBResetNotBOReset
-	#define fAbortCurrentSCSITaskInProgress		reserved->fAbortCurrentSCSITaskInProgress
-	#define fCBIMemoryDescriptor                reserved->fCBIMemoryDescriptor
-	#define	fBulkOnlyCBWMemoryDescriptor		reserved->fBulkOnlyCBWMemoryDescriptor
-	#define	fBulkOnlyCSWMemoryDescriptor		reserved->fBulkOnlyCSWMemoryDescriptor
-    #define fDeviceAttached                     reserved->fDeviceAttached
-	#define fWaitingForReconfigurationMessage	reserved->fWaitingForReconfigurationMessage
-	#define fTerminating						reserved->fTerminating
-    #define fKnownCSWTagMismatchIssues          reserved->fKnownCSWTagMismatchIssues
-    #define fPortSuspendResumeForPMEnabled      reserved->fPortSuspendResumeForPMEnabled
-    #define fPortIsSuspended                    reserved->fPortIsSuspended
-	#define fRequiresResetOnResume				reserved->fRequiresResetOnResume
-	#define fAutonomousSpinDownWorkAround		reserved->fAutonomousSpinDownWorkAround
-	#define fConsecutiveResetCount				reserved->fConsecutiveResetCount
-	#define fClearStallInProgress				reserved->fClearStallInProgress
-	#define fTerminationDeferred				reserved->fTerminationDeferred
-	
-	// Enumerated constants used to control various aspects of this
-	// driver.
-	
-	// Enumerations for Mass Storage Class Subclass types
-	enum
-	{
-		kUSBStorageRBCSubclass 				= 1,
-		kUSBStorageSFF8020iSubclass 		= 2,
-		kUSBStorageQIC157Subclass			= 3,
-		kUSBStorageUFISubclass				= 4,
-		kUSBStorageSFF8070iSubclass			= 5,
-		kUSBStorageSCSITransparentSubclass	= 6
-	};
-
-	// The supported USB Mass Storage Class transport protocols.
-	enum
-	{
-		kProtocolControlBulkInterrupt	= 0x00,
-		kProtocolControlBulk			= 0x01,
-		kProtocolBulkOnly				= 0x50
-	};
-
-	// ------- Protocol support functions ------------
-	// The SendSCSICommand function will take a SCSITask Object and transport
-	// it across the physical wire(s) to the device
-	virtual bool    		SendSCSICommand( 	
-								SCSITaskIdentifier 		request, 
-								SCSIServiceResponse *	serviceResponse,
-								SCSITaskStatus		*	taskStatus );
-
-	// The AbortSCSICommand function will abort the indicated SCSITask object,
-	// if it is possible and the SCSITask has not already completed.
-    virtual SCSIServiceResponse    	AbortSCSICommand( SCSITaskIdentifier abortTask );
-
-	virtual bool					IsProtocolServiceSupported( 
-										SCSIProtocolFeature 	feature, 
-										void * 					serviceValue );
-
-	virtual bool					HandleProtocolServiceFeature( 
-										SCSIProtocolFeature 	feature, 
-										void * 					serviceValue );
- 
-	// Methods for retrieving and setting the object for the Interface
-	IOUSBInterface *		GetInterfaceReference( void );
-	void					SetInterfaceReference( IOUSBInterface * newInterface );
-	
-	UInt8					GetInterfaceSubclass( void );
-	UInt8					GetInterfaceProtocol( void );
-	
-	// Methods for retrieving an object for a Pipe.
-	IOUSBPipe *				GetControlPipe( void );
-	IOUSBPipe *				GetBulkInPipe( void );
-	IOUSBPipe *				GetBulkOutPipe( void );
-	IOUSBPipe *				GetInterruptPipe( void );
-	
-	// Methods for getting and setting the maximum LUN of a device.
-	UInt8					GetMaxLogicalUnitNumber( void ) const;
-	void					SetMaxLogicalUnitNumber( UInt8 maxLUN );
-	
-	virtual void 			CompleteSCSICommand( 
-								SCSITaskIdentifier request, 
-								IOReturn status );
-
-	virtual	bool			BeginProvidedServices( void );
-	virtual	bool			EndProvidedServices( void );
-	
-	// The Protocol specific helper methods for SendSCSICommand	
-	virtual IOReturn		SendSCSICommandForCBIProtocol(
-                  				SCSITaskIdentifier request );
-	
-	virtual IOReturn		SendSCSICommandForBulkOnlyProtocol(
-								SCSITaskIdentifier request );
-
-	// The Protocol specific helper methods for AbortSCSICommand	
-	virtual IOReturn		AbortSCSICommandForCBIProtocol(
-								SCSITaskIdentifier abortTask );
-	
-	virtual IOReturn		AbortSCSICommandForBulkOnlyProtocol(
-								SCSITaskIdentifier abortTask );
-
-	// Helper methods for performing general USB device requests
-	virtual IOReturn		ClearFeatureEndpointStall( 
-								IOUSBPipe *			thePipe,
-								IOUSBCompletion	*	completion );
-	virtual IOReturn 		GetStatusEndpointStatus(
-								IOUSBPipe *			thePipe,
-								void *				endpointStatus,
-								IOUSBCompletion	*	completion );
-	
- 	/* All CBI transport related methods.
- 	 */
-	// All definitions and structures for the CBI Protocol
-	enum
-	{
- 		kUSBStorageAutoStatusSize	= 2		// Per the USB CBI Protocol
- 	};
-
- 	// Methods for accessing Bulk Only specific member variables.
-	CBIRequestBlock *		GetCBIRequestBlock( void );
-
-	void 					ReleaseCBIRequestBlock( 
-								CBIRequestBlock *	cbiRequestBlock );
-
-	// Methods used for CBI/CB command transportation.
-	static void		CBIProtocolUSBCompletionAction(
-						void *					target,
-		                void *					parameter,
-		                IOReturn				status,
-		                UInt32					bufferSizeRemaining);
-
-	IOReturn		CBIProtocolTransferData( 
-						CBIRequestBlock *		cbiRequestBlock,
-						UInt32					nextExecutionState );
-		                
-	IOReturn		CBIProtocolReadInterrupt( 
-						CBIRequestBlock *		cbiRequestBlock,
-						UInt32					nextExecutionState );
-
-	IOReturn		CBIGetStatusEndpointStatus( 
-						IOUSBPipe *				targetPipe,
-						CBIRequestBlock *		cbiRequestBlock,
-						UInt32					nextExecutionState );
-
-	IOReturn		CBIClearFeatureEndpointStall( 
-						IOUSBPipe *				targetPipe,
-						CBIRequestBlock *		cbiRequestBlock,
-						UInt32					nextExecutionState );
-						
-	void 			CBIProtocolCommandCompletion(
-						CBIRequestBlock *		cbiRequestBlock,
-		                IOReturn				resultingStatus,
-		                UInt32					bufferSizeRemaining );
-		                
- 	/* All Bulk Only transport related methods, structures and enums.
- 	 */
- 	// All Bulk Only specific structures and enums.
-	
-	// All definitions and structures for the Bulk Only Protocol
-	// Command Block Wrapper (CBW)
-	enum
-	{
-		// CBW general struture definitions
-		kCommandBlockWrapperSignature	= OSSwapHostToBigConstInt32 ( 'USBC' ),
-		kByteCountOfCBW					= 31,
-
-		// CBW LUN related definitions
-		kCBWLUNMask						= 0x0F,
-
-		kCBWFlagsDataOut				= 0x00,
-		kCBWFlagsDataIn					= 0x80
-	};
-	
-	// All definitions and structures for the Bulk Only Protocol
-	// Command Status Wrapper (CSW)
-	enum
-	{
-		// CSW general struture definitions
-		kCommandStatusWrapperSignature	= OSSwapHostToBigConstInt32 ( 'USBS' ),
-		kByteCountOfCSW					= 13,
-
-		// CSW status definitions
-		kCSWCommandPassedError 			= 0x00,	// No error occurred
-		kCSWCommandFailedError			= 0x01,	/* An error occurred (probably a 
-											 	 * bad command or parameter ) */
-		kCSWPhaseError					= 0x02	/* A transfer was performed in 
-											 	 * the wrong sequence */
-	};
-
- 	// Methods for accessing Bulk Only specific member variables.
-	BulkOnlyRequestBlock *	GetBulkOnlyRequestBlock( void );
-
-	void 			ReleaseBulkOnlyRequestBlock( 
-						BulkOnlyRequestBlock * 		boRequestBlock );
-
-	UInt32			GetNextBulkOnlyCommandTag( void );
-
-	// Methods for Bulk Only specific utility commands
-	IOReturn		BulkDeviceResetDevice(
-						BulkOnlyRequestBlock *		boRequestBlock,
-						UInt32						nextExecutionState );
-						
-	// Methods used for Bulk Only command transportation.
-	IOReturn		BulkOnlySendCBWPacket(
-						BulkOnlyRequestBlock *		boRequestBlock,
-						UInt32						nextExecutionState );
-	
-	IOReturn		BulkOnlyTransferData( 
-						BulkOnlyRequestBlock *		boRequestBlock,
-						UInt32						nextExecutionState );
-	
-	IOReturn		BulkOnlyReceiveCSWPacket(
-						BulkOnlyRequestBlock *		boRequestBlock,
-						UInt32						nextExecutionState );
-	
-	void			BulkOnlyExecuteCommandCompletion (
-						BulkOnlyRequestBlock *		boRequestBlock,
-		                IOReturn					resultingStatus,
-		                UInt32						bufferSizeRemaining );
-
-	static void		BulkOnlyUSBCompletionAction (
-		                void *			target,
-		                void *			parameter,
-		                IOReturn		status,
-		                UInt32			bufferSizeRemaining );
-	
-public:
-
-    bool				init( OSDictionary * 	propTable );
-    virtual bool		start( IOService *	 	provider );
-    virtual void 		stop( IOService * 		provider );
-	virtual void		free( void );
-	virtual	IOReturn	message( UInt32 type, IOService * provider, void * argument = 0 );
-	
-	virtual bool        willTerminate(  IOService *     provider, 
-                                        IOOptionBits    options );
-										
-	virtual bool        didTerminate(	IOService *     provider, 
-                                        IOOptionBits    options, 
-										bool *			defer );
-                                        
-	virtual bool		handleOpen( IOService *		client,
-									IOOptionBits	options,
-									void *			arg );
-	
-	virtual void		handleClose( IOService *	client,
-									 IOOptionBits	options );
-	
-	virtual bool		handleIsOpen(  const IOService * client ) const;
-	
-	virtual IOReturn	HandlePowerOn( void );
-	
-protected:
-
-	static IOReturn		sWaitForReset( void * refcon );
-	IOReturn			GatedWaitForReset( void );
-	
-	static IOReturn		sWaitForTaskAbort( void * refcon );			/* OBSOLETE */
-	IOReturn			GatedWaitForTaskAbort( void );				/* OBSOLETE */
-	
-	static void			sResetDevice( void * refcon );
-	
-	static void			sAbortCurrentSCSITask( void * refcon );		/* OBSOLETE */
-	
-    OSMetaClassDeclareReservedUsed( IOUSBMassStorageClass, 1 );
-	virtual IOReturn	StartDeviceRecovery( void );				/* OBSOLETE */
-
-    OSMetaClassDeclareReservedUsed( IOUSBMassStorageClass, 2 );
-	virtual void		FinishDeviceRecovery( IOReturn	status );	/* OBSOLETE */
-
-	static void			DeviceRecoveryCompletionAction(
-		                	void *			target,
-		                	void *			parameter,
-		                	IOReturn		status,
-		                	UInt32			bufferSizeRemaining );	/* OBSOLETE */
-
-    void                ResetDeviceNow( bool waitForReset );
-	
-	void                AbortCurrentSCSITask( void );
-	
-	bool                IsPhysicalInterconnectLocationInternal ( void );
-	    
-	IOReturn            SuspendPort ( bool suspend );
-	
-private:
-	
-	void				ClearPipeStall ( void );
-	
-	IOReturn			AcceptSCSITask ( SCSITaskIdentifier scsiTask, bool * pAccepted );
-	
-	void				CheckDeferredTermination ( void );
-	
-	void				GatedCompleteSCSICommand ( SCSITaskIdentifier request, SCSIServiceResponse * serviceResponse, SCSITaskStatus * taskStatus );
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 3 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 4 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 5 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 6 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 7 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 8 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 9 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 10 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 11 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 12 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 13 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 14 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 15 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 16 );
-	
-};
-
-
-#endif _IOKIT_IOUSBMASSSTORAGECLASS_H
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageUFISubclass.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageUFISubclass.h.svn-base
deleted file mode 100644
index cbfe3c8..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBMassStorageUFISubclass.h.svn-base
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
-#define _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
-
-// This class' header file
-#include <IOKit/usb/IOUSBMassStorageClass.h>
-#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
-
-
-#pragma mark -
-#pragma mark IOUSBMassStorageUFIDevice declaration
-
-class IOUSBMassStorageUFIDevice : public IOSCSIPrimaryCommandsDevice
-{
-    OSDeclareDefaultStructors(IOUSBMassStorageUFIDevice)
-
-private:
-	static void			AsyncReadWriteComplete( SCSITaskIdentifier	completedTask );
-	
-protected:
-    // Reserve space for future expansion.
-    struct IOUSBMassStorageUFIDeviceExpansionData
-	{
-	};
-    IOUSBMassStorageUFIDeviceExpansionData *fIOUSBMassStorageUFIDeviceReserved;
-
-	// ---- Medium Characteristics ----
-	bool				fMediumPresent;
-
-	// The byte count of each physical block on the medium.
-	UInt32				fMediumBlockSize;
-
-	// The total number of blocks of fMediumBlockSize on the medium.
-	UInt32				fMediumBlockCount;
-
-	// Whether the installed medium is protected from writes
-	bool				fMediumIsWriteProtected;
-
-	// Polling thread variables
-	thread_call_t		fPollingThread;
-	UInt32				fPollingMode;
-	enum
-	{
-		kPollingMode_Suspended		= 0,
-		kPollingMode_NewMedia 		= 1,
-		kPollingMode_MediaRemoval	= 2
-	};
-	
-	// ---- Methods for controlling the current state of device support ----
-	virtual bool		InitializeDeviceSupport( void );
-	virtual void 		StartDeviceSupport ( void );
-	virtual void		SuspendDeviceSupport( void );
-	virtual void		ResumeDeviceSupport( void );
-	virtual void 		StopDeviceSupport ( void );
-	virtual void		TerminateDeviceSupport( void );
-
-	// ---- Methods used for misc  ----
-	virtual bool		ClearNotReadyStatus( void );
-	virtual void 		CreateStorageServiceNub( void );
-	virtual bool		DetermineDeviceCharacteristics( void );
-
-	// ---- Methods used for controlling the polling thread ----
-	virtual void		ProcessPoll( void );
-	virtual void		EnablePolling( void );
-	virtual void		DisablePolling( void );
-
-	// ---- Main and support methods for polling for new Media ----
-	virtual void		PollForNewMedia( void );
-	virtual bool		DetermineMediaPresence( void );
-	virtual bool		DetermineMediumCapacity( 
-							UInt64 * 				blockSize, 
-							UInt64 * 				blockCount );
-	virtual bool		DetermineMediumWriteProtectState( void );
-
-	// ---- Main and support methods for polling for Media removal ----
-	virtual void		PollForMediaRemoval( void );
-	
-	// ---- Methods used for power managment ----
-	virtual UInt32		GetInitialPowerState ( void );
-	virtual void 		InitializePowerManagement ( IOService * provider );
-	virtual void		HandlePowerChange ( void );
-	virtual void		HandleCheckPowerState ( void );
-	virtual void		TicklePowerManager ( void );
-	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
-
-	// ---- Methods used for handling medium characteristics ----
-    virtual void		SetMediumCharacteristics( 
-    						UInt32 					blockSize, 
-    						UInt32 					blockCount );
-	
-	virtual void		ResetMediumCharacteristics( void );
-
-	virtual IOReturn	IssueRead( 	
-							IOMemoryDescriptor *	buffer,
-                         	UInt64					startBlock,
-                     		UInt64					blockCount );
-	
-	virtual IOReturn	IssueRead(	
-							IOMemoryDescriptor *	buffer,
-                      		UInt64					startBlock,
-                     		UInt64					blockCount,
-                       		void * 					clientData );
-
-
-	virtual IOReturn	IssueWrite( 
-							IOMemoryDescriptor *	buffer,
-                    		UInt64					startBlock,
-                       		UInt64					blockCount );
-
-	virtual IOReturn	IssueWrite(	
-							IOMemoryDescriptor *	buffer,
-                         	UInt64					startBlock,
-                      		UInt64					blockCount,
-							void * 					clientData );
-
-public:
-											
-	static 	void		sProcessPoll( void * pdtDriver, void * refCon );
-
-	// Interface to the UFI Storage Services Driver
-	// ---- Methods for controlling the device ----
-	virtual IOReturn	SyncReadWrite(
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-							UInt64					blockCount,
-							UInt64					blockSize );
-
-	virtual IOReturn	AsyncReadWrite(
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-							UInt64					blockCount,
-							UInt64					blockSize,
-							void * 					clientData );
-
-	// ---- Methods for controlling medium state ----
-	virtual IOReturn	EjectTheMedium( void );
-
-	// ---- Methods for controlling media format ----
-	virtual IOReturn	FormatMedium( 
-							UInt64 					blockCount, 
-							UInt64 					blockSize );
-	virtual UInt32		GetFormatCapacities( 	
-							UInt64 * 				capacities,
-             				UInt32   				capacitiesMaxCount ) const;
-
-	// ---- Query methods to report device characteristics ----
-	// Report the maximum number of blocks that the device can handle per
-	// read or write.  A value of 0 (zero) indicates there is no limit aside
-	// from the size of the method's return parameter.
-	virtual UInt64		ReportDeviceMaxBlocksReadTransfer( void );
-	virtual UInt64		ReportDeviceMaxBlocksWriteTransfer( void );
-	
-	// ---- Query methods to report installed medium characteristics ----
-	virtual UInt64		ReportMediumBlockSize( void );
-	virtual UInt64		ReportMediumTotalBlockCount( void );
-	virtual bool		ReportMediumWriteProtection( void );
-        
-	// Methods for getting device information strings
-	virtual char *		GetVendorString( void );
-	virtual char *		GetProductString( void );
-	virtual char *		GetRevisionString( void );
-	OSDictionary *		GetProtocolCharacteristicsDictionary ( void );
-	OSDictionary *		GetDeviceCharacteristicsDictionary ( void );	
-	
-protected:
-	// Utility methods used by all SCSI Command Set objects
-	
-	// isParameterValid methods are used to validate that the parameter passed into
-	// the command methods are of the correct value.
-	
-	// Validate Parameter used for 1 bit to 1 byte paramaters
-    bool		 	IsParameterValid( 
-							SCSICmdField1Byte 			param,
-							SCSICmdField1Byte 			mask );
-	
-	// Validate Parameter used for 9 bit to 2 byte paramaters
-	bool		 	IsParameterValid( 
-							SCSICmdField2Byte 			param,
-							SCSICmdField2Byte 			mask );
-	
-	// Validate Parameter used for 17 bit to 4 byte paramaters
-	bool		 	IsParameterValid( 
-							SCSICmdField4Byte 			param,
-							SCSICmdField4Byte 			mask );
-	
-	// UFI Required Commands
-	virtual bool 	FORMAT_UNIT(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer,
-			    			IOByteCount					defectListSize,
-			    			SCSICmdField1Byte 			TRACK_NUMBER, 
-			    			SCSICmdField2Byte 			INTERLEAVE );
-
-	virtual bool	INQUIRY(
-							SCSITaskIdentifier			request,
-    						IOMemoryDescriptor 			*dataBuffer,
-    						SCSICmdField1Byte 			PAGE_OR_OPERATION_CODE,
-    						SCSICmdField1Byte 			ALLOCATION_LENGTH );
-
-   	virtual bool	MODE_SELECT_10(
-							SCSITaskIdentifier			request,
-    						IOMemoryDescriptor 			*dataBuffer,
-    						SCSICmdField1Bit 			PF,
-    						SCSICmdField1Bit 			SP,
-    						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH );  
-
-   	virtual bool	MODE_SENSE_10(
-							SCSITaskIdentifier			request,
-    						IOMemoryDescriptor 			*dataBuffer,
-    						SCSICmdField1Bit 			DBD,
-	   						SCSICmdField2Bit 			PC,
-	   						SCSICmdField6Bit 			PAGE_CODE,
-	   						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH );
-
-    virtual bool	PREVENT_ALLOW_MEDIUM_REMOVAL( 
-							SCSITaskIdentifier			request,
-	     					SCSICmdField1Bit 			PREVENT );
-
-	virtual bool 	READ_10(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			UInt32						blockSize,
-			    			SCSICmdField1Bit 			DPO, 
-			    			SCSICmdField1Bit 			FUA,
-							SCSICmdField1Bit 			RELADR, 
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField2Byte 			TRANSFER_LENGTH );
-
-	virtual bool 	READ_12(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			UInt32						blockSize,
-			    			SCSICmdField1Bit 			DPO, 
-			    			SCSICmdField1Bit 			FUA,
-							SCSICmdField1Bit 			RELADR, 
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField4Byte 			TRANSFER_LENGTH );
-
-	virtual bool 	READ_CAPACITY(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			SCSICmdField1Bit 			RELADR,
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField1Bit 			PMI );
-
-	virtual bool 	READ_FORMAT_CAPACITIES(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			SCSICmdField2Byte 			ALLOCATION_LENGTH );
-
-	virtual bool 	REQUEST_SENSE(
-							SCSITaskIdentifier			request,
-   							IOMemoryDescriptor 			*dataBuffer,
-			    			SCSICmdField1Byte 			ALLOCATION_LENGTH );
- 	
-	virtual bool 	REZERO_UNIT( 
-							SCSITaskIdentifier			request );
-
-	virtual bool 	SEEK( 
-							SCSITaskIdentifier			request,
-			    			SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS );
-
-	virtual bool 	SEND_DIAGNOSTICS( 
-							SCSITaskIdentifier			request,
-							SCSICmdField1Bit 			PF, 
-							SCSICmdField1Bit 			SELF_TEST, 
-							SCSICmdField1Bit 			DEF_OFL, 
-							SCSICmdField1Bit 			UNIT_OFL );
-
-	virtual bool 	START_STOP_UNIT( 
-							SCSITaskIdentifier			request,
-							SCSICmdField1Bit 			IMMED, 
-							SCSICmdField1Bit 			LOEJ, 
-							SCSICmdField1Bit 			START );
-
-    virtual bool 	TEST_UNIT_READY(  
-							SCSITaskIdentifier			request );
- 
-	virtual bool 	VERIFY( 
-							SCSITaskIdentifier			request,
-							SCSICmdField1Bit 			DPO, 
-							SCSICmdField1Bit 			BYTCHK, 
-							SCSICmdField1Bit 			RELADR,
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField2Byte 			VERIFICATION_LENGTH );
-
-	virtual bool 	WRITE_10(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			UInt32						blockSize,
-			    			SCSICmdField1Bit 			DPO, 
-			    			SCSICmdField1Bit 			FUA,
-							SCSICmdField1Bit 			RELADR, 
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField2Byte 			TRANSFER_LENGTH );
-
-	virtual bool 	WRITE_12(
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer, 
-			    			UInt32						blockSize,
-			    			SCSICmdField1Bit 			DPO, 
-							SCSICmdField1Bit 			EBP, 
-							SCSICmdField1Bit 			RELADR, 
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField4Byte 			TRANSFER_LENGTH );
-
-	virtual bool 	WRITE_AND_VERIFY(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			UInt32						blockSize,
-			    			SCSICmdField1Bit 			DPO,
-			    			SCSICmdField1Bit 			BYTCHK, 
-			    			SCSICmdField1Bit 			RELADR, 
-			    			SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS, 
-			    			SCSICmdField2Byte 			TRANSFER_LENGTH );
-};
-
-
-#pragma mark -
-#pragma mark IOUSBMassStorageUFISubclass declaration
-
-
-class IOUSBMassStorageUFISubclass : public IOUSBMassStorageClass
-{
-    OSDeclareDefaultStructors(IOUSBMassStorageUFISubclass)
-
-protected:
-	virtual	bool		BeginProvidedServices( void );
-	virtual	bool		EndProvidedServices( void );
-};
-
-#endif _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBNub.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBNub.h.svn-base
deleted file mode 100644
index a998e5b..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBNub.h.svn-base
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBNUB_H
-#define _IOKIT_IOUSBNUB_H
-
-#include <IOKit/IOService.h>
-#include <libkern/c++/OSData.h>
-#include <IOKit/IOMemoryDescriptor.h>
-
-#include <IOKit/usb/USB.h>
-
-class IOUSBController;
-class IOUSBPipe;
-
-/*!
- @class IOUSBNub
- @abstract Super class for for IOUSBDevice and IOUSBInterface.
- */
-class IOUSBNub : public IOService
-{
-    OSDeclareDefaultStructors(IOUSBNub)
-
-public:
-	
-	// IOKit method
-	virtual void					joinPMtree ( IOService * driver );
-
-    virtual bool					USBCompareProperty(OSDictionary   * matching, const char     * key );
-    
-    bool							IsWildCardMatch( OSDictionary   * matching, const char     * key );
-    bool							USBComparePropertyWithMask( OSDictionary *matching, const char *key, const char * maskKey );
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void printDescriptor(const IOUSBDescriptorHeader *desc);
-void printDeviceDescriptor(const IOUSBDeviceDescriptor *desc);
-void printConfigDescriptor(const IOUSBConfigurationDescriptor *cd);
-void printEndpointDescriptor(const IOUSBEndpointDescriptor *ed);
-void printInterfaceDescriptor(const IOUSBInterfaceDescriptor *id);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _IOKIT_IOUSBNUB_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBPipe.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBPipe.h.svn-base
deleted file mode 100644
index 3286b92..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBPipe.h.svn-base
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.2 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
- * Please see the License for the specific language governing rights and 
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBPIPE_H
-#define _IOKIT_IOUSBPIPE_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOMemoryDescriptor.h>
-
-#include <IOKit/usb/USB.h>
-#include <IOKit/usb/IOUSBController.h>
-#include <IOKit/usb/IOUSBControllerV2.h>
-
-class IOUSBInterface;
-
-/*!
-    @class IOUSBPipe
-    @abstract The object representing an open pipe for a device.
-*/
-class IOUSBPipe : public OSObject
-{
-    friend class IOUSBInterface;
-    friend class IOUSBDevice;
-	
-    OSDeclareDefaultStructors(IOUSBPipe)
-		
-protected:
-	
-	const IOUSBEndpointDescriptor *	_descriptor;
-    IOUSBController::Endpoint		_endpoint;	// tidied up version of descriptor
-    IOUSBController *				_controller;
-    USBDeviceAddress				_address;
-    UInt8							_status;	// was previously used for status.  Now used to detect whether a property exists or not
-	
-    struct ExpansionData
-    {
-        IOReturn					_correctStatus;		
-		IOUSBDevice *				_device;	// Remember containing device for clearing TTs
-		UInt8						_speed;
-		IOUSBInterface	*			_interface;
-		bool						_crossEndianCompatible;
-		UInt32						_locationID;
-    };
-    ExpansionData * _expansionData;
-    
-    virtual void free();
-    
-    IOReturn ClosePipe(void);
-	
-public:
-		
-		virtual bool InitToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
-									USBDeviceAddress address, IOUSBController * controller);
-	
-    // The following 2 methods are obsolete
-    //
-    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
-                                 USBDeviceAddress address, IOUSBController * controller);
-	
-    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint,
-                                 IOUSBDevice * device, IOUSBController * controller);
-	
-    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint,
-                                 IOUSBDevice * device, IOUSBController * controller, IOUSBInterface *interface);
-	
-    // Controlling pipe state
-    /*!
-        @function GetStatus
-	 This method does NOT work.  Do not call it. See GetPipeStatus for the correct method.
-	 GetStatus will always return 0.
-	 */
-    virtual UInt8 GetStatus(void);
-    /*!
-        @function Abort
-	 This method causes all outstanding I/O on a pipe to complete with return code kIOReturnAborted. It  clears the halted bit but does NOT clear the
-	 toggle bit on the endpoint in the controller.  If you wish to clear the toggle bit, see ClearPipeStall
-	 */
-    virtual IOReturn Abort(void);
-    /*!
-        @function Reset
-	 This method is identical to ClearPipeStall(false). The use of that API is preferred.
-	 */
-    virtual IOReturn Reset(void);
-    /*!
-        @function ClearStall
-	 This method is equivalent to ClearPipeStall(false). This method is available before version 1.9.
-	 */
-    virtual IOReturn ClearStall(void);
-	
-    //
-    // Transferring Data
-    //
-    
-    // deprecated
-    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
-                          IOUSBCompletion *	completion = 0,
-						  IOByteCount *		bytesRead = 0);
-	
-    // deprecated
-    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
-                           IOUSBCompletion *	completion = 0);
-	
-    // Transfer data over Isochronous pipes
-    /*!
-        @function Read
-	 Read from an isochronous endpoint
-	 @param buffer place to put the transferred data
-	 @param frameStart USB frame number of the frame to start transfer
-	 @param numFrames Number of frames to transfer
-	 @param frameList Bytes to transfer and result for each frame
-	 @param completion describes action to take when buffer has been filled
-	 */
-    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
-                          UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList,
-                          IOUSBIsocCompletion *	completion = 0);
-    /*!
-        @function Write
-	 Write to an isochronous endpoint
-	 @param buffer place to get the transferred data
-	 @param frameStart USB frame number of the frame to start transfer
-	 @param numFrames Number of frames to transfer
-	 @param frameList Bytes to transfer and result for each frame
-	 @param completion describes action to take when buffer has been emptied
-	 */
-    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
-                           UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList,
-                           IOUSBIsocCompletion * completion = 0);
-	
-    // Do a control request over a Control pipe, using a memory descriptor
-    /*!
-        @function ControlRequest
-	 Make a control request
-	 There are two versions of this method, one uses a simple void *
-	 to point to the data portion of the transfer, the other uses an
-	 IOMemoryDescriptor to point to the data.
-	 @param request parameter block for the control request
-	 @param completion describes action to take when the request has been executed
-	 */
-    virtual IOReturn ControlRequest(IOUSBDevRequestDesc	*request,
-                                    IOUSBCompletion	*completion = 0);
-	
-    // Do a control request over a Control pipe, using a simple buffer
-    virtual IOReturn ControlRequest(IOUSBDevRequest	*request,
-                                    IOUSBCompletion	*completion = 0);
-	
-	/*
-	 *  Accessors
-	 */
-    /*!
-        @function GetEndpoint
-	 returns a pointer to the Endpoint structure for the pipe.
-	 */
-    virtual const IOUSBController::Endpoint *	GetEndpoint();
-    /*!
-        @function GetEndpointDescriptor
-	 returns the endpoint descriptor for the pipe.
-	 */
-    virtual const IOUSBEndpointDescriptor *	GetEndpointDescriptor();
-    /*!
-        @function GetDirection
-	 returns the direction of the pipe:kUSBOut/kUSBIn for a bulk or interrupt pipe,
-	 kUSBAnyDirn for a control pipe.
-	 */
-    virtual UInt8 GetDirection();
-    /*!
-        @function GetType
-	 returns the pipe type: kUSBControl, kUSBBulk or kUSBInterrupt.
-	 */
-    virtual UInt8 GetType();
-    /*!
-        @function GetEndpointNumber
-	 returns the endpoint number in the device that the pipe is connected to.
-	 */
-    virtual UInt8 GetEndpointNumber();
-    virtual USBDeviceAddress GetAddress();
-    virtual UInt16 GetMaxPacketSize();
-    virtual UInt8 GetInterval();
-	
-    // Transfer data over Bulk pipes with timeouts.
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  0);
-	
-    // deprecated
-    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
-						  UInt32		noDataTimeout,
-						  UInt32		completionTimeout,
-                          IOUSBCompletion *	completion = 0,
-						  IOByteCount *		bytesRead = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  1);
-	
-    // deprecated
-    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
-						   UInt32		noDataTimeout,
-						   UInt32		completionTimeout,
-                           IOUSBCompletion *	completion = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  2);
-    // Do a control request over a Control pipe, using a memory descriptor
-    /*!
-        @function ControlRequest
-	 Make a control request. 
-	 There are two versions of this method, one uses a simple void *
-	 to point to the data portion of the transfer, the other uses an
-	 IOMemoryDescriptor to point to the data.
-	 @param request parameter block for the control request
-	 @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
-	 if no data has been transferred on the bus.
-	 @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
-	 not been completed.
-	 @param completion describes action to take when the request has been executed
-	 */
-    virtual IOReturn ControlRequest(IOUSBDevRequestDesc	*request,
-									UInt32		noDataTimeout,
-									UInt32		completionTimeout,
-                                    IOUSBCompletion	*completion = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  3);
-    // Do a control request over a Control pipe, using a simple buffer
-    virtual IOReturn ControlRequest(IOUSBDevRequest	*request,
-									UInt32		noDataTimeout,
-									UInt32		completionTimeout,
-                                    IOUSBCompletion	*completion = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  4);
-    /*!
-        @function Read
-	 Read from an interrupt or bulk endpoint
-	 @param buffer place to put the transferred data
-	 @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
-	 the driver software may have to resynchronize the data toggle. See ClearPipeStall.
-	 @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
-	 @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
-	 @param completion describes action to take when buffer has been filled
-	 @param bytesRead returns total bytes read for synchronous reads
-	 */
-    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
-						  UInt32		noDataTimeout,
-						  UInt32		completionTimeout,
-						  IOByteCount		reqCount,
-						  IOUSBCompletion *	completion = 0,
-						  IOByteCount *		bytesRead = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  5);
-    /*!
-        @function Write
-	 Write to an interrupt or bulk endpoint
-	 @param buffer place to get the transferred data
-	 @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
-	 the driver software may have to resynchronize the data toggle. See ClearPipeStall.
-	 @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
-	 @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
-	 @param completion describes action to take when buffer has been emptied
-	 */
-    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
-						   UInt32		noDataTimeout,
-						   UInt32		completionTimeout,
-						   IOByteCount		reqCount,
-                           IOUSBCompletion *	completion = 0);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  6);
-    /*!
-        @function GetPipeStatus
-	 Returns the status of the pipe (kIOUSBPipeStalled of the pipe is stalled, else kIOReturnSuccess)
-	 */
-    virtual IOReturn GetPipeStatus(void);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  7);
-    /*!
-		@function ClearPipeStall
-	 AVAILABLE ONLY IN VERSION 1.9 AND ABOVE
-	 This method causes all outstanding I/O on a pipe to complete with return code kIOUSBTransactionReturned. It also clears both the halted bit and the
-	 toggle bit on the endpoint in the controller. The driver may need to reset the data toggle within the device to avoid losing any data. If the
-	 device correctly handles the ClearFeature(ENDPOINT_HALT) device request, then this API will handle that by sending the correct request to the
-	 device.
-	 @param withDeviceRequest if true, a ClearFeature(ENDPOINT_HALT) is sent to the appropriate endpoint on the device after the transactions on the 
-	 controllers endpoint are returned and the toggle bit on the controllers endpoint is cleared. if this parameter is false, then this is equivalent
-	 to the pre-1.9 API. This means that the endpoint on the controller is cleared, but no DeviceRequest is sent to the device's endpoint.
-	 */
-    virtual IOReturn ClearPipeStall(bool withDeviceRequest);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  8);
-    /*!
-		@function SetPipePolicy
-	 AVAILABLE ONLY IN VERSION 1.9 AND ABOVE
-	 This method allows a driver to change the maxPacketSize of an Isochronous pipe, or the polling interval for an interrupt pipe. There is a limited
-	 amount of bandwidth on any single bus, and isochronous pipes tend to use much of this bandwidth. The driver may know, however, that there
-	 will never be as much bandwidth used as is specified in the pipe's endpoint descriptor. Therefore, the driver may return some of this 
-	 bandwidth to the system by using this method. Additionally, if on an open of an IOUSBInterface any of the Isochronous pipes is unable to be 
-	 opened because of a lack of bandwidth, the pipe will be created with a bandwidth of zero, and the driver may get some of the limited bandwidth
-	 remaining by using this call.
-	 This method returns kIOReturnBadArgument if the pipe is a bulk on control pipe, or if the maxPacketSize parameter is larger than the amount specified
-	 in the endpoint descriptor. It returns kIOReturnNoBandwidth if the bandwidth requested cannot be allocated. Otherwise it returns kIOReturnSuccess.
-	 @param maxPacketSize specifies the maximum number of bytes to be used in any one millisecond frame by this pipe. The value must be less than or 
-	 equal to the maxPacketSize specified in the endpoint descriptor.
-	 @param maxInterval not currently used. reserved for future expansion
-	 
-	 */
-    virtual IOReturn SetPipePolicy(UInt16 maxPacketSize, UInt8 maxInterval);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  9);
-	
-    // Transfer data over Isochronous pipes and process the frame list at hardware interrupt time
-    /*!
-        @function Read
-	 AVAILABLE ONLY IN VERSION 1.9.2 AND ABOVE
-	 Read from an isochronous endpoint and process the IOUSBLowLatencyIsocFrame fields at 
-	 hardware interrupt time
-	 @param buffer place to put the transferred data
-	 @param frameStart USB frame number of the frame to start transfer
-	 @param numFrames Number of frames to transfer
-	 @param frameList Bytes to transfer, result, and time stamp for each frame
-	 @param completion describes action to take when buffer has been filled
-	 @param updateFrequency describes how often (in milliseconds) should the frame list be processed
-	 */
-    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
-                          UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList,
-                          IOUSBLowLatencyIsocCompletion *	completion = 0, UInt32 updateFrequency = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  10);
-    /*!
-        @function Write
-	 AVAILABLE ONLY IN VERSION 1.9.2 AND ABOVE
-	 Write to an isochronous endpoint
-	 @param buffer place to get the data to transfer
-	 @param frameStart USB frame number of the frame to start transfer
-	 @param numFrames Number of frames to transfer
-	 @param frameList Pointer to list of frames indicating bytes to transfer and result for each frame
-	 @param completion describes action to take when buffer has been emptied
-	 @param updateFrequency describes how often (in milliseconds) should the frame list be processed
-	 */
-    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
-                           UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList,
-                           IOUSBLowLatencyIsocCompletion * completion = 0, UInt32 updateFrequency = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  11);
-    /*!
-        @function Read
-     Read from an interrupt or bulk endpoint
-     @param buffer place to put the transferred data
-     @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
-     the driver software may have to resynchronize the data toggle. See ClearPipeStall.
-     @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
-     @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
-     @param completion describes action to take when buffer has been filled
-     @param bytesRead returns total bytes read for synchronous reads
-     */
-    virtual IOReturn Read(IOMemoryDescriptor *			buffer,
-                          UInt32				noDataTimeout,
-                          UInt32				completionTimeout,
-                          IOByteCount				reqCount,
-                          IOUSBCompletionWithTimeStamp *	completion = 0,
-                          IOByteCount *				bytesRead = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  12);
-	virtual bool InitToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
-								USBDeviceAddress address, IOUSBController * controller, IOUSBDevice * device, IOUSBInterface * interface);
-
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  13);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  14);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  15);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  16);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  17);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  18);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  19);
-	
-};
-
-#endif /* _IOKIT_IOUSBPIPE_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBRootHubDevice.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBRootHubDevice.h.svn-base
deleted file mode 100644
index 19a17c4..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBRootHubDevice.h.svn-base
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBROOTHUBDEVICE_H
-#define _IOKIT_IOUSBROOTHUBDEVICE_H
-
-#include <IOKit/usb/IOUSBHubDevice.h>
-
-/*!
- @class IOUSBRootHubDevice
- @abstract The object representing the Root Hub simulation.
- */
-class IOUSBRootHubDevice : public IOUSBHubDevice
-{
-    OSDeclareDefaultStructors(IOUSBRootHubDevice)
-
-private:
-    UInt16				configuration;
-	IOCommandGate		*_commandGate;
-
-	// private method which overrides the same method in IOUSBHubDevice
-	virtual bool			InitializeCharacteristics(void);					// used at start
-	
-    struct ExpansionData 
-	{
-		IOService *		_IOResourcesEntry;
-	};
-    ExpansionData *_expansionData;
-
-public:
-	// static methods
-    static IOUSBRootHubDevice	*NewRootHubDevice(void);
-    static IOReturn				GatedDeviceRequest (OSObject *	owner, 
-												void *		arg0, 
-												void *		arg1, 
-												void *		arg2, 
-												void *		arg3 );
-    
-	// IOKit methods
-    virtual bool 	init();
-	virtual bool 	start( IOService * provider );
-    virtual void 	stop( IOService *provider );
-    virtual void	free();
-
-	// IOUSBHubDevice methods
-	virtual bool			IsRootHub(void);
-	virtual UInt32			RequestExtraPower(UInt32 requestedPower);
-	virtual void			ReturnExtraPower(UInt32 returnedPower);
-
-	// 
-	virtual UInt32			RequestSleepPower(UInt32 requestedPower);
-	virtual void			ReturnSleepPower(UInt32 returnedPower);
-	
-	// a non static but non-virtual function
-	IOReturn DeviceRequestWorker(IOUSBDevRequest *request, UInt32 noDataTimeout, UInt32 completionTimeout, IOUSBCompletion *completion);
-    
-	// IOUSBDevice methods overriden here
-    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, IOUSBCompletion *completion = 0);
-    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, UInt32 noDataTimeout, UInt32 completionTimeout, IOUSBCompletion *completion = 0);
-
-    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  0);
-	virtual IOReturn		GetDeviceInformation(UInt32 *info);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  1);
-	virtual void			InitializeExtraPower(UInt32 maxPortCurrent, UInt32 totalExtraCurrent);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  2);
-	virtual void			SetSleepCurrent(UInt32 sleepCurrent);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  3);
-	virtual UInt32			GetSleepCurrent();
-
-    OSMetaClassDeclareReservedUnused(IOUSBRootHubDevice,  4);
-};
-
-#endif /* _IOKIT_IOUSBROOTHUBDEVICE_H */
-
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBUserClient.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBUserClient.h.svn-base
deleted file mode 100644
index 1cd47a8..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBUserClient.h.svn-base
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBUSERCLIENT_H
-#define _IOKIT_IOUSBUSERCLIENT_H
-
-// these are the new User Client method names    
-enum {
-    kUSBDeviceUserClientOpen,
-    kUSBDeviceUserClientClose,
-    kUSBDeviceUserClientSetConfig,
-    kUSBDeviceUserClientGetConfig,
-    kUSBDeviceUserClientGetConfigDescriptor,
-    kUSBDeviceUserClientGetFrameNumber,
-    kUSBDeviceUserClientDeviceRequestOut,
-    kUSBDeviceUserClientDeviceRequestIn,
-    kUSBDeviceUserClientCreateInterfaceIterator,
-    kUSBDeviceUserClientResetDevice,
-    kUSBDeviceUserClientSuspend,
-    kUSBDeviceUserClientAbortPipeZero,
-    kUSBDeviceUserClientReEnumerateDevice,
-    kUSBDeviceUserClientGetMicroFrameNumber,
-    kUSBDeviceUserClientGetFrameNumberWithTime,
-    kUSBDeviceUserClientSetAsyncPort,
-	kUSBDeviceUserClientGetDeviceInformation,
-	kUSBDeviceUserClientRequestExtraPower,
-	kUSBDeviceUserClientReturnExtraPower,
-	kUSBDeviceUserClientGetExtraPowerAllocated,
-    kIOUSBLibDeviceUserClientNumCommands
-    };
-
-enum {
-    kUSBInterfaceUserClientOpen,
-    kUSBInterfaceUserClientClose,
-    kUSBInterfaceUserClientGetDevice,
-    kUSBInterfaceUserClientSetAlternateInterface,
-    kUSBInterfaceUserClientGetFrameNumber,
-    kUSBInterfaceUserClientGetPipeProperties,
-    kUSBInterfaceUserClientReadPipe,
-    kUSBInterfaceUserClientWritePipe,
-    kUSBInterfaceUserClientGetPipeStatus,
-    kUSBInterfaceUserClientAbortPipe,
-    kUSBInterfaceUserClientResetPipe,
-    kUSBInterfaceUserClientClearPipeStall,
-    kUSBInterfaceUserClientControlRequestOut,
-    kUSBInterfaceUserClientControlRequestIn,
-    kUSBInterfaceUserClientSetPipePolicy,
-    kUSBInterfaceUserClientGetBandwidthAvailable,
-    kUSBInterfaceUserClientGetEndpointProperties,
-    kUSBInterfaceUserClientLowLatencyPrepareBuffer,
-    kUSBInterfaceUserClientLowLatencyReleaseBuffer,
-    kUSBInterfaceUserClientGetMicroFrameNumber,
-    kUSBInterfaceUserClientGetFrameListTime,
-    kUSBInterfaceUserClientGetFrameNumberWithTime,
-    kUSBInterfaceUserClientSetAsyncPort,
-    kUSBInterfaceUserClientReadIsochPipe,
-    kUSBInterfaceUserClientWriteIsochPipe,
-    kUSBInterfaceUserClientLowLatencyReadIsochPipe,
-    kUSBInterfaceUserClientLowLatencyWriteIsochPipe,
-	kUSBInterfaceUserClientGetConfigDescriptor,
-    kIOUSBLibInterfaceUserClientNumCommands
-    };
-
-
-#if KERNEL
-#include <IOKit/IOService.h>
-#include <IOKit/IOUserClient.h>
-#include <IOKit/usb/USB.h>
-
-//================================================================================================
-//
-//   Structure declarations
-//
-//================================================================================================
-//
-typedef struct IOUSBUserClientAsyncParamBlock IOUSBUserClientAsyncParamBlock;
-
-struct IOUSBUserClientAsyncParamBlock 
-{
-    OSAsyncReference64			fAsyncRef;
-    uint32_t					fAsyncCount;
-    uint32_t					fMax;
-    IOMemoryDescriptor *		fMem;
-    IOUSBDevRequestDesc			req;
-};
-
-typedef struct IOUSBInterfaceUserClientISOAsyncParamBlock IOUSBInterfaceUserClientISOAsyncParamBlock;
-struct IOUSBInterfaceUserClientISOAsyncParamBlock 
-{
-    OSAsyncReference64			fAsyncRef;
-	uint32_t					fAsyncCount;
-    mach_vm_size_t				frameLen;	// In bytes
-    mach_vm_address_t           frameBase;	// In user task
-    IOMemoryDescriptor *        dataMem;
-    IOMemoryDescriptor *        countMem;
-	uint64_t					numFrames;
-    IOUSBIsocFrame              frames[0];  // Must be the last one
-};
-
-
-//================================================================================================
-//
-// This class is used to add an IOProviderMergeProperties dictionary entry to a provider's
-// property list, thus providing a tie between hardware and a CFBundle at hardware
-// load time.  This property usually contains the user client class name and the CFPlugInTypes UUID's
-// but it can contain other properties.
-//
-//================================================================================================
-//
-class IOUSBUserClientInit : public IOService 
-{
-    OSDeclareDefaultStructors(IOUSBUserClientInit);
-
-public:
-    
-    virtual bool		start(IOService *  provider) ;
-    virtual bool 		MergeDictionaryIntoProvider(IOService *  provider, OSDictionary *  mergeDict);
-    virtual bool		MergeDictionaryIntoDictionary(OSDictionary *  sourceDictionary,  OSDictionary *  targetDictionary);
-};
-
-#endif // KERNEL
-
-#endif /* ! _IOKIT_IOUSBUSERCLIENT_H */
-
diff --git a/i386/include/IOKit/usb/.svn/text-base/IOUSBWorkLoop.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/IOUSBWorkLoop.h.svn-base
deleted file mode 100644
index 7630704..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/IOUSBWorkLoop.h.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2001-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBWORKLOOP_H
-#define _IOKIT_IOUSBWORKLOOP_H
-
-#include <IOKit/IOWorkLoop.h>
-
-/*!
- @class IOUSBWorkLoop
- @abstract Subclass of IOWorkloop that allows the USB stack to more finely control sleep and wake.
- */
-class IOUSBWorkLoop : public IOWorkLoop
-{    
-    OSDeclareDefaultStructors(IOUSBWorkLoop)
-    
-protected:
-    void *			fSleepToken;
-#ifndef __OPEN_SOURCE__
-	lck_grp_t *		fLockGroup;
-#endif
-	bool init ( const char * controllerLocation );
-	void free ( void );
-	
-    // Overrides to check for sleeping
-    virtual void closeGate();
-    virtual bool tryCloseGate();
-    
-public:
-    // Create a workloop
-    static IOUSBWorkLoop * workLoop(const char * controllerLocation);
-    
-    // Put workloop to sleep (Must have gate closed, opens gate if successful)
-    virtual IOReturn sleep(void *token);
-    
-    // Wake workloop up (closes gate if successful)
-    virtual IOReturn wake(void *token);
-    
-    void CloseGate(void);
-    void OpenGate(void);
-};
-
-#endif /* ! _IOKIT_IOUSBWORKLOOP_H */
-
diff --git a/i386/include/IOKit/usb/.svn/text-base/USB.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/USB.h.svn-base
deleted file mode 100644
index 8ba12bb..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/USB.h.svn-base
+++ /dev/null
@@ -1,1076 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _USB_H
-#define _USB_H
-
-#if KERNEL
-	#include <libkern/OSByteOrder.h>
-	#include <IOKit/IOMemoryDescriptor.h>
-#else
-	#include <libkern/OSByteOrder.h>
-#endif
-
-#include <IOKit/IOTypes.h>
-
-#if !defined(__USB__)
-#    include <IOKit/usb/USBSpec.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    /*!
-    @header		USB.h
-     @abstract	Public Interfaces to the USB implementation in Mac OS X.
-     @discussion	This header file contains definitions and structures that are used in the different USB API's in Mac OS X, both in the kernel and in the user space.
-     */
-
-    /*!
-    @defined	Endian conversion definitions
-     @discussion The USB API's use a convention of specifying parameters in the host order.  The USB spec specifies that multi-byte items should be
-     formatted in little endian order.  The following macros allow one to translate multi-byte values from Host order to USB order and vice versa.  There are separate macros for
-     in-kernel use and for user space use.
-     */
-#define USBToHostWord OSSwapLittleToHostInt16
-#define HostToUSBWord OSSwapHostToLittleInt16
-#define USBToHostLong OSSwapLittleToHostInt32
-#define HostToUSBLong OSSwapHostToLittleInt32
-
-    /*!
-    @enum Miscellaneous Constants
-    @discussion 
-    */
-    enum {
-    kUSBDeviceIDShift = 7,
-    kUSBMaxDevices = 128,
-    kUSBMaxDevice = kUSBMaxDevices-1,
-    kUSBDeviceIDMask = 0x7f,
-
-    kUSBPipeIDMask = 0xf,
-    kUSBMaxPipes = 32,	// In and Out pipes can have same pipe number.
-
-    kUSBInterfaceIDShift = 8,
-    kUSBMaxInterfaces = 1 << kUSBInterfaceIDShift,
-    kUSBInterfaceIDMask = kUSBMaxInterfaces-1,
-
-    kUSBEndPtShift = 7,
-    kUSBDeviceMask = ((1 << kUSBEndPtShift) -1),
-
-    kUSBNoPipeIdx = -1
-};
-
-/*!
-@enum bRequest Shifts and Masks 
-@discussion These are used to create the macro to encode the bRequest filed of a Device Request
-*/
-enum {
-    kUSBRqDirnShift = 7,
-    kUSBRqDirnMask = 1,
-
-    kUSBRqTypeShift = 5,
-    kUSBRqTypeMask = 3,
-
-    kUSBRqRecipientMask = 0X1F
-};
-
-/*!
-@defined USBmakebmRequestType 
-@discussion Macro to encode the bRequest field of a Device Request.  It is used when constructing an IOUSBDevRequest.
-*/
-#define USBmakebmRequestType(direction, type, recipient)		\
-    ((direction & kUSBRqDirnMask) << kUSBRqDirnShift) |			\
-    ((type & kUSBRqTypeMask) << kUSBRqTypeShift) |			\
-    (recipient & kUSBRqRecipientMask)
-
-/*!
-@enum kUSBMaxIsocFrameReqCount 
-@discussion Maximum size in bytes allowed for one Isochronous frame
-*/
-enum {
-    kUSBMaxFSIsocEndpointReqCount = 1023,	// max size (bytes) of any one Isoc frame for 1 FS endpoint
-	kUSBMaxHSIsocEndpointReqCount = 3072,	// max size (bytes) of any one Isoc frame for 1 HS endpoint
-	kUSBMaxHSIsocFrameCount = 7168			// max size (bytes) of all Isoc transfers in a HS frame
-};
-
-/*!
-@defined EncodeRequest 
-@discussion Macro that encodes the bRequest and bRequestType fields of a IOUSBDevRequest into a single value.  It is useful when one needs
-to know what type of request the IOUSBDevRequest encodes and simplifies comparisons.
-*/
-#define EncodeRequest(request, direction, type, recipient)		\
-    (((UInt16)request << 8) +	    					\
-              ((UInt16)recipient +					\
-                        ((UInt16)type << kUSBRqTypeShift) +		\
-                        ((UInt16)direction << kUSBRqDirnShift)))
-
-
-/*!
-@enum Standard Device Requests
-@discussion Encoding of the standard device requests.
-<tt>
-<pre><b>
-bmRequestType bRequest          wValue        wIndex     wLength Data</b>
-00000000B     CLEAR_FEATURE     Feature       Zero       Zero    None (device)
-00000001B                       Feature       Interface  Zero    None (Interface)
-00000010B                       Feature       Endpoint   Zero    None (Endpoint)
-
-10000000B     GET_CONFIGURATION Zero          Zero       One     Configuration
-10000000B     GET_DESCRIPTOR    Type          LangID     Length  Descriptor
-10000001B     GET_INTERFACE     Zero          Interface  One     Alternate
-
-10000000B     GET_STATUS        Zero          Zero       Two     status (device)
-10000001B                       Zero          Interface  Two     status (Interface)
-10000010B                       Zero          Endpoint   Two     status (Endpoint)
-
-00000000B     SET_ADDRESS       Address       Zero       Zero    None
-00000000B     SET_CONFIGURATION Configuration Zero       Zero    None
-00000000B     SET_DESCRIPTOR    Type          LangID     Length  Descriptor
-
-00000000B     SET_FEATURE       Feature       Zero       Zero    None (device)
-00000001B                       Feature       Interface  Zero    None (Interface)
-00000010B                       Feature       Endpoint   Zero    None (Endpoint)
-
-00000001B     SET_INTERFACE     Alternate     Interface  Zero    None
-10000010B     SYNCH_FRAME       Zero          Endpoint   Two     Frame Number
-</pre>
-</tt>
-*/
-enum {
-    kClearDeviceFeature     = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBDevice),
-    kClearInterfaceFeature  = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBInterface),
-    kClearEndpointFeature   = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBEndpoint),
-    kGetConfiguration       = EncodeRequest(kUSBRqGetConfig,     kUSBIn,  kUSBStandard, kUSBDevice),
-    kGetDescriptor          = EncodeRequest(kUSBRqGetDescriptor, kUSBIn,  kUSBStandard, kUSBDevice),
-    kGetInterface           = EncodeRequest(kUSBRqGetInterface,  kUSBIn,  kUSBStandard, kUSBInterface),
-    kGetDeviceStatus        = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBDevice),
-    kGetInterfaceStatus     = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBInterface),
-    kGetEndpointStatus      = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBEndpoint),
-    kSetAddress             = EncodeRequest(kUSBRqSetAddress,    kUSBOut, kUSBStandard, kUSBDevice),
-    kSetConfiguration       = EncodeRequest(kUSBRqSetConfig,     kUSBOut, kUSBStandard, kUSBDevice),
-    kSetDescriptor          = EncodeRequest(kUSBRqSetDescriptor, kUSBOut, kUSBStandard, kUSBDevice),
-    kSetDeviceFeature       = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBDevice),
-    kSetInterfaceFeature    = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBInterface),
-    kSetEndpointFeature     = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBEndpoint),
-    kSetInterface           = EncodeRequest(kUSBRqSetInterface,  kUSBOut, kUSBStandard, kUSBInterface),
-    kSyncFrame              = EncodeRequest(kUSBRqSyncFrame,     kUSBIn,  kUSBStandard, kUSBEndpoint),
-};
-
-/*!
-@defined kCallInterfaceOpenWithGate
- @discussion If the USB Device has this property, drivers for any of its interfaces will have their handleOpen method called while holding the workloop gate.
- */
-#define kCallInterfaceOpenWithGate	"kCallInterfaceOpenWithGate"
-
-// TYPES
-
-typedef UInt16 USBDeviceAddress;
-
-typedef uint32_t USBPhysicalAddress32;
-
-/*!
-    @typedef IOUSBIsocFrame
-    @discussion Structure used to encode information about each isoc frame.
-    @param frStatus Returns status associated with the frame.
-    @param frReqCount Input specifiying how many bytes to read or write.
-    @param frActCount Actual # of bytes transferred.
-*/
-typedef struct IOUSBIsocFrame {
-    IOReturn                        frStatus;
-    UInt16                          frReqCount;
-    UInt16                          frActCount;
-} IOUSBIsocFrame;
-
-
-/*!
-    @typedef IOUSBLowLatencyIsocFrame
-    @discussion    Structure used to encode information about each isoc frame that is processed
-    at hardware interrupt time (low latency).
-    @param frStatus Returns status associated with the frame.
-    @param frReqCount Input specifiying how many bytes to read or write.
-    @param frActCount Actual # of bytes transferred.
-    @param frTimeStamp Time stamp that indicates time when frame was procesed.
-*/
-struct IOUSBLowLatencyIsocFrame {
-    IOReturn                        frStatus;
-    UInt16                          frReqCount;
-    UInt16                          frActCount;
-    AbsoluteTime		    frTimeStamp;
-};
-typedef struct IOUSBLowLatencyIsocFrame IOUSBLowLatencyIsocFrame;
-
-/*!
-@typedef IOUSBCompletionAction
- @discussion Function called when USB I/O completes.
- @param target The target specified in the IOUSBCompletion struct.
- @param parameter The parameter specified in the IOUSBCompletion struct.
- @param status Completion status.
- @param bufferSizeRemaining Bytes left to be transferred.
- */
-typedef void (*IOUSBCompletionAction)(
-                                      void *			target,
-                                      void *			parameter,
-                                      IOReturn		status,
-                                      UInt32			bufferSizeRemaining);
-
-/*!
-@typedef IOUSBCompletionActionWithTimeStamp
- @discussion Function called when USB I/O completes.
- @param target The target specified in the IOUSBCompletion struct.
- @param parameter The parameter specified in the IOUSBCompletion struct.
- @param status Completion status.
- @param bufferSizeRemaining Bytes left to be transferred.
- @param timeStamp Time at which the transaction was processed.
- */
-typedef void (*IOUSBCompletionActionWithTimeStamp)(
-                                      void *		target,
-                                      void *		parameter,
-                                      IOReturn		status,
-                                      UInt32		bufferSizeRemaining,
-                                      AbsoluteTime	timeStamp);
-
-/*!
-    @typedef IOUSBIsocCompletionAction
-    @discussion Function called when Isochronous USB I/O completes.
-    @param target The target specified in the IOUSBIsocCompletionn struct.
-    @param parameter The parameter specified in the IOUSBIsocCompletion struct.
-    @param status Completion status.
-    @param pFrames Pointer to the frame list containing the status for each frame transferred.
-*/
-typedef void (*IOUSBIsocCompletionAction)(
-                void *			target,
-                void *			parameter,
-                IOReturn		status,
-                IOUSBIsocFrame		*pFrames);
-
-/*!
-    @typedef IOUSBLowLatencyIsocCompletionAction
-    @discussion Function called when Low Latency Isochronous USB I/O completes.
-    @param target The target specified in the IOUSBLowLatencyIsocCompletion struct.
-    @param parameter The parameter specified in the IOUSBLowLatencyIsocCompletion struct.
-    @param status Completion status.
-    @param pFrames Pointer to the low latency frame list containing the status for each frame transferred.
-*/
-typedef void (*IOUSBLowLatencyIsocCompletionAction)(
-                void *				target,
-                void *				parameter,
-                IOReturn			status,
-                IOUSBLowLatencyIsocFrame	*pFrames);
-
-/*!
-@typedef IOUSBCompletion
- @discussion Struct specifying action to perform when a USB I/O completes.
- @param target The target to pass to the action function.
- @param action The function to call.
- @param parameter The parameter to pass to the action function.
- */
-typedef struct IOUSBCompletion {
-    void * 			target;
-    IOUSBCompletionAction	action;
-    void *			parameter;
-} IOUSBCompletion;
-
-/*!
-@typedef IOUSBCompletionWithTimeStamp
- @discussion Struct specifying action to perform when a USB I/O completes.
- @param target The target to pass to the action function.
- @param action The function to call.
- @param parameter The parameter to pass to the action function.
- */
-typedef struct IOUSBCompletionWithTimeStamp {
-    void * 				target;
-    IOUSBCompletionActionWithTimeStamp	action;
-    void *				parameter;
-} IOUSBCompletionWithTimeStamp;
-
-/*!
-    @typedef IOUSBIsocCompletion
-    @discussion Struct specifying action to perform when an Isochronous USB I/O completes.
-    @param target The target to pass to the action function.
-    @param action The function to call.
-    @param parameter The parameter to pass to the action function.
-*/
-typedef struct IOUSBIsocCompletion {
-    void * 			target;
-    IOUSBIsocCompletionAction	action;
-    void *			parameter;
-} IOUSBIsocCompletion;
-
-/*!
-    @typedef IOUSBLowLatencyIsocCompletion
-    @discussion Struct specifying action to perform when an Low Latency Isochronous USB I/O completes.
-    @param target The target to pass to the action function.
-    @param action The function to call.
-    @param parameter The parameter to pass to the action function.
-*/
-typedef struct IOUSBLowLatencyIsocCompletion {
-    void * 				target;
-    IOUSBLowLatencyIsocCompletionAction	action;
-    void *				parameter;
-} IOUSBLowLatencyIsocCompletion;
-
-
-/*!
-@defined IOUSBFamily error codes
-@discussion  Errors specific to the IOUSBFamily.  Note that the iokit_usb_err(x) translates to 0xe0004xxx, where xxx is the value in parenthesis as a hex number.
-*/
-#define	iokit_usb_err(return)       (sys_iokit|sub_iokit_usb|return)
-#define kIOUSBUnknownPipeErr        iokit_usb_err(0x61)			// 0xe0004061  Pipe ref not recognized
-#define kIOUSBTooManyPipesErr       iokit_usb_err(0x60)			// 0xe0004060  Too many pipes
-#define kIOUSBNoAsyncPortErr        iokit_usb_err(0x5f)			// 0xe000405f  no async port
-#define kIOUSBNotEnoughPipesErr     iokit_usb_err(0x5e)			// 0xe000405e  not enough pipes in interface
-#define kIOUSBNotEnoughPowerErr     iokit_usb_err(0x5d)			// 0xe000405d  not enough power for selected configuration
-#define kIOUSBEndpointNotFound      iokit_usb_err(0x57)			// 0xe0004057  Endpoint Not found
-#define kIOUSBConfigNotFound        iokit_usb_err(0x56)			// 0xe0004056  Configuration Not found
-#define kIOUSBTransactionTimeout    iokit_usb_err(0x51)			// 0xe0004051  Transaction timed out
-#define kIOUSBTransactionReturned   iokit_usb_err(0x50)			// 0xe0004050  The transaction has been returned to the caller
-#define kIOUSBPipeStalled           iokit_usb_err(0x4f)			// 0xe000404f  Pipe has stalled, error needs to be cleared
-#define kIOUSBInterfaceNotFound     iokit_usb_err(0x4e)			// 0xe000404e  Interface ref not recognized
-#define kIOUSBLowLatencyBufferNotPreviouslyAllocated        iokit_usb_err(0x4d)			// 0xe000404d  Attempted to use user land low latency isoc calls w/out calling PrepareBuffer (on the data buffer) first 
-#define kIOUSBLowLatencyFrameListNotPreviouslyAllocated     iokit_usb_err(0x4c)			// 0xe000404c  Attempted to use user land low latency isoc calls w/out calling PrepareBuffer (on the frame list) first
-#define kIOUSBHighSpeedSplitError     iokit_usb_err(0x4b)		// 0xe000404b Error to hub on high speed bus trying to do split transaction
-#define kIOUSBSyncRequestOnWLThread	iokit_usb_err(0x4a)			// 0xe000404a  A synchronous USB request was made on the workloop thread (from a callback?).  Only async requests are permitted in that case
-#define kIOUSBDeviceNotHighSpeed	iokit_usb_err(0x49)			// 0xe0004049  The device is not a high speed device, so the EHCI driver returns an error
-#define kIOUSBDevicePortWasNotSuspended iokit_usb_err(0x50)		// 0xe0004050  Port was not suspended
-	
-/*!
-@defined IOUSBFamily hardware error codes
-@discussion These errors are returned by the OHCI controller.  The # in parenthesis (xx) corresponds to the OHCI Completion Code.
-For the following Completion codes, we return a generic IOKit error instead of a USB specific error.  
-<tt>
-<pre>
-Completion Code         Error Returned              Description
-9                       kIOReturnUnderrun           (Data Underrun) EP returned less data than max packet size
-8                       kIOReturnOverrun            (Data Overrun) Packet too large or more data than buffer
-5                       kIOReturnNotResponding      Device Not responding
-4                       kIOUSBPipeStalled           Endpoint returned a STALL PID
-</pre>
-</tt>
-*/
-#define kIOUSBLinkErr           iokit_usb_err(0x10)		// 0xe0004010
-#define kIOUSBNotSent2Err       iokit_usb_err(0x0f)		// 0xe000400f Transaction not sent
-#define kIOUSBNotSent1Err       iokit_usb_err(0x0e)		// 0xe000400e Transaction not sent
-#define kIOUSBBufferUnderrunErr iokit_usb_err(0x0d)		// 0xe000400d Buffer Underrun (Host hardware failure on data out, PCI busy?)
-#define kIOUSBBufferOverrunErr  iokit_usb_err(0x0c)		// 0xe000400c Buffer Overrun (Host hardware failure on data out, PCI busy?)
-#define kIOUSBReserved2Err      iokit_usb_err(0x0b)		// 0xe000400b Reserved
-#define kIOUSBReserved1Err      iokit_usb_err(0x0a)		// 0xe000400a Reserved
-#define kIOUSBWrongPIDErr       iokit_usb_err(0x07)		// 0xe0004007 Pipe stall, Bad or wrong PID
-#define kIOUSBPIDCheckErr       iokit_usb_err(0x06)		// 0xe0004006 Pipe stall, PID CRC error
-#define kIOUSBDataToggleErr     iokit_usb_err(0x03)		// 0xe0004003 Pipe stall, Bad data toggle
-#define kIOUSBBitstufErr        iokit_usb_err(0x02)		// 0xe0004002 Pipe stall, bitstuffing
-#define kIOUSBCRCErr            iokit_usb_err(0x01)		// 0xe0004001 Pipe stall, bad CRC
-
-/*!
-@defined IOUSBFamily message codes
-@discussion  Messages specific to the IOUSBFamily.  Note that the iokit_usb_msg(x) translates to 0xe0004xxx, where xxx is the value in parenthesis as a hex number.
-*/
-#define iokit_usb_msg(message)						(UInt32)(sys_iokit|sub_iokit_usb|message)
-#define kIOUSBMessageHubResetPort					iokit_usb_msg(0x01)		// 0xe0004001  Message sent to a hub to reset a particular port
-#define kIOUSBMessageHubSuspendPort					iokit_usb_msg(0x02)		// 0xe0004002  Message sent to a hub to suspend a particular port
-#define kIOUSBMessageHubResumePort					iokit_usb_msg(0x03)		// 0xe0004003  Message sent to a hub to resume a particular port
-#define kIOUSBMessageHubIsDeviceConnected			iokit_usb_msg(0x04)		// 0xe0004004  Message sent to a hub to inquire whether a particular port has a device connected or not
-#define kIOUSBMessageHubIsPortEnabled				iokit_usb_msg(0x05)		// 0xe0004005  Message sent to a hub to inquire whether a particular port is enabled or not
-#define kIOUSBMessageHubReEnumeratePort				iokit_usb_msg(0x06)		// 0xe0004006  Message sent to a hub to reenumerate the device attached to a particular port
-#define kIOUSBMessagePortHasBeenReset				iokit_usb_msg(0x0a)		// 0xe000400a  Message sent to a device indicating that the port it is attached to has been reset
-#define kIOUSBMessagePortHasBeenResumed				iokit_usb_msg(0x0b)		// 0xe000400b  Message sent to a device indicating that the port it is attached to has been resumed
-#define kIOUSBMessageHubPortClearTT					iokit_usb_msg(0x0c)		// 0xe000400c  Message sent to a hub to clear the transaction translator
-#define kIOUSBMessagePortHasBeenSuspended			iokit_usb_msg(0x0d)		// 0xe000400d  Message sent to a device indicating that the port it is attached to has been suspended
-#define kIOUSBMessageFromThirdParty					iokit_usb_msg(0x0e)		// 0xe000400e  Message sent from a third party.  Uses IOUSBThirdPartyParam to encode the sender's ID
-#define kIOUSBMessagePortWasNotSuspended			iokit_usb_msg(0x0f)		// 0xe000400f  Message indicating that the hub driver received a resume request for a port that was not suspended
-#define kIOUSBMessageExpressCardCantWake			iokit_usb_msg(0x10)		// 0xe0004010  Message from a driver to a bus that an express card will disconnect on sleep and thus shouldn't wake
-#define kIOUSBMessageCompositeDriverReconfigured    iokit_usb_msg(0x11)		// 0xe0004011  Message from the composite driver indicating that it has finished re-configuring the device after a reset
-#define kIOUSBMessageHubSetPortRecoveryTime			iokit_usb_msg(0x12)		// 0xe0004012  Message sent to a hub to set the # of ms required when resuming a particular port
-#define kIOUSBMessageOvercurrentCondition			iokit_usb_msg(0x13)     // 0xe0004013  Message sent to the clients of the device's hub parent, when a device causes an overcurrent condition.  The message argument contains the locationID of the device
-#define kIOUSBMessageNotEnoughPower					iokit_usb_msg(0x14)     // 0xe0004014  Message sent to the clients of the device's hub parent, when a device causes an low power notice to be displayed.  The message argument contains the locationID of the device
-#define kIOUSBMessageController						iokit_usb_msg(0x15)		// 0xe0004015  Generic message sent from controller user client to controllers 
-#define	kIOUSBMessageRootHubWakeEvent				iokit_usb_msg(0x16)		// 0xe0004016  Message from the HC Wakeup code indicating that a Root Hub port has a wake event
-
-// Obsolete
-//
-struct IOUSBMouseData {
-    UInt16 				buttons;
-    SInt16 				XDelta;
-    SInt16 				YDelta;
-};
-typedef struct IOUSBMouseData		IOUSBMouseData;
-typedef IOUSBMouseData *		IOUSBMouseDataPtr;
-
-// Obsolete
-//
-struct IOUSBKeyboardData {
-    UInt16 				keycount;
-    UInt16 				usbkeycode[32];
-};
-typedef struct IOUSBKeyboardData	IOUSBKeyboardData;
-typedef IOUSBKeyboardData *		IOUSBKeyboardDataPtr;
-
-// Obsolete
-//
-union IOUSBHIDData {
-    IOUSBKeyboardData 			kbd;
-    IOUSBMouseData 			mouse;
-};
-typedef union IOUSBHIDData		IOUSBHIDData;
-typedef IOUSBHIDData *			IOUSBHIDDataPtr;
-
-/*!
-    @typedef IOUSBDeviceDescriptor
-    @discussion Descriptor for a USB Device.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-struct IOUSBDeviceDescriptor {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt16 			bcdUSB;
-	UInt8 			bDeviceClass;
-	UInt8 			bDeviceSubClass;
-	UInt8 			bDeviceProtocol;
-	UInt8 			bMaxPacketSize0;
-	UInt16 			idVendor;
-	UInt16 			idProduct;
-	UInt16 			bcdDevice;
-	UInt8 			iManufacturer;
-	UInt8 			iProduct;
-	UInt8 			iSerialNumber;
-	UInt8 			bNumConfigurations;
-};
-typedef struct IOUSBDeviceDescriptor		IOUSBDeviceDescriptor;
-typedef IOUSBDeviceDescriptor *			IOUSBDeviceDescriptorPtr;
-
-/*!
-    @typedef IOUSBDescriptorHeader
-    @discussion Standard header used for all USB descriptors.  Used to read the length of a descriptor so that we can allocate storage for the whole descriptor later on.
-*/
-struct IOUSBDescriptorHeader {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-};
-typedef struct IOUSBDescriptorHeader		IOUSBDescriptorHeader;
-typedef IOUSBDescriptorHeader *			IOUSBDescriptorHeaderPtr;
-
-/*!
-    @typedef IOUSBConfigurationDescriptor
-    @discussion Standard USB Configuration Descriptor.  It is variable length, so this only specifies the known fields.  We use the wTotalLength field to read the whole descriptor.
-    See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-struct IOUSBConfigurationDescriptor {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt16 			wTotalLength;
-	UInt8 			bNumInterfaces;
-	UInt8 			bConfigurationValue;
-	UInt8 			iConfiguration;
-	UInt8 			bmAttributes;
-	UInt8 			MaxPower;
-};
-typedef struct IOUSBConfigurationDescriptor 	IOUSBConfigurationDescriptor;
-typedef IOUSBConfigurationDescriptor *		IOUSBConfigurationDescriptorPtr;
-
-/*!
-    @typedef IOUSBConfigurationDescHeader
-    @discussion Header of a IOUSBConfigurationDescriptor.  Used to get the total length of the descriptor.
-*/
-struct IOUSBConfigurationDescHeader {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt16 			wTotalLength;
-};
-typedef struct IOUSBConfigurationDescHeader 	IOUSBConfigurationDescHeader;
-typedef IOUSBConfigurationDescHeader *		IOUSBConfigurationDescHeaderPtr;
-
-/*!
-    @typedef IOUSBInterfaceDescriptor
-    @discussion Descriptor for a USB Interface.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-struct IOUSBInterfaceDescriptor {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt8 			bInterfaceNumber;
-	UInt8 			bAlternateSetting;
-	UInt8 			bNumEndpoints;
-	UInt8 			bInterfaceClass;
-	UInt8 			bInterfaceSubClass;
-	UInt8 			bInterfaceProtocol;
-	UInt8 			iInterface;
-};
-typedef struct IOUSBInterfaceDescriptor	IOUSBInterfaceDescriptor;
-typedef IOUSBInterfaceDescriptor *	IOUSBInterfaceDescriptorPtr;
-
-/*!
-    @typedef IOUSBEndpointDescriptor
-    @discussion Descriptor for a USB Endpoint.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-struct IOUSBEndpointDescriptor {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt8 			bEndpointAddress;
-	UInt8 			bmAttributes;
-	UInt16 			wMaxPacketSize;	
-	UInt8 			bInterval;
-};
-typedef struct IOUSBEndpointDescriptor	IOUSBEndpointDescriptor;
-typedef IOUSBEndpointDescriptor *	IOUSBEndpointDescriptorPtr;
-
-enum{addPacketShift = 11};  // Bits for additional packets in maxPacketField. (Table 9-13)
-#define mungeMaxPacketSize(w) ((w>1024)?(((w>>(addPacketShift))+1)*(w&((1<<addPacketShift)-1))):w)
-
-/*!
-    @typedef IOUSBHIDDescriptor
-    @discussion USB HID Descriptor.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.  (This structure
-    should have used the #pragma pack(1) compiler directive to get byte alignment.
-*/
-struct IOUSBHIDDescriptor {
-	UInt8 			descLen;
-	UInt8 			descType;
-	UInt16 			descVersNum;
-	UInt8 			hidCountryCode;
-	UInt8 			hidNumDescriptors;
-	UInt8 			hidDescriptorType;
-	UInt8 			hidDescriptorLengthLo;
-	UInt8 			hidDescriptorLengthHi;
-};
-typedef struct IOUSBHIDDescriptor	IOUSBHIDDescriptor;
-typedef IOUSBHIDDescriptor *IOUSBHIDDescriptorPtr;
-
-/*!
-    @typedef IOUSBHIDReportDesc
-    @discussion USB HID Report Descriptor header.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.  (This structure
-    should have used the #pragma pack(1) compiler directive to get byte alignment.
-*/
-struct IOUSBHIDReportDesc {
-	UInt8 			hidDescriptorType;
-	UInt8 			hidDescriptorLengthLo;	
-	UInt8 			hidDescriptorLengthHi;
-};
-typedef struct IOUSBHIDReportDesc	IOUSBHIDReportDesc;
-typedef IOUSBHIDReportDesc *		IOUSBHIDReportDescPtr;
-
-/*!
-    @typedef IOUSBDeviceQualifierDescriptor
-    @discussion USB Device Qualifier Descriptor.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-#pragma pack(1)
-struct IOUSBDeviceQualifierDescriptor
-{
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt16 			bcdUSB;
-	UInt8 			bDeviceClass;
-	UInt8 			bDeviceSubClass;
-	UInt8 			bDeviceProtocol;
-	UInt8 			bMaxPacketSize0;
-	UInt8 			bNumConfigurations;
-	UInt8 			bReserved;
-};
-typedef struct IOUSBDeviceQualifierDescriptor	IOUSBDeviceQualifierDescriptor;
-typedef IOUSBDeviceQualifierDescriptor *	IOUSBDeviceQualifierDescriptorPtr;
-#pragma options align=reset
-
-/*!
-    @typedef IOUSBDFUDescriptor
-    @discussion USB Device Firmware Update Descriptor.  See the USB Device Firmware Update Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-#pragma pack(1)
-struct IOUSBDFUDescriptor 
-{
-        UInt8 			bLength;
-        UInt8 			bDescriptorType;
-        UInt8 			bmAttributes;
-        UInt16 			wDetachTimeout;
-        UInt16 			wTransferSize;
-};
-typedef struct 	IOUSBDFUDescriptor 		IOUSBDFUDescriptor;
-typedef 		IOUSBDFUDescriptor *	IOUSBDFUDescriptorPtr;
-
-#pragma options align=reset
-
-/*!
-@typedef IOUSBInterfaceAssociationDescriptor
- @discussion USB Inerface Association Descriptor.  ECN to the USB 2.0 Spec.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
- */
-#pragma pack(1)
-struct IOUSBInterfaceAssociationDescriptor
-{
-    UInt8 			bLength;
-    UInt8 			bDescriptorType;
-    UInt8 			bFirstInterface;
-    UInt8 			bInterfaceCount;
-    UInt8 			bFunctionClass;
-    UInt8 			bFunctionSubClass;
-    UInt8 			bFunctionProtocol;
-    UInt8			iFunction;
-};
-typedef struct IOUSBInterfaceAssociationDescriptor	IOUSBInterfaceAssociationDescriptor;
-typedef IOUSBInterfaceAssociationDescriptor *	IOUSBInterfaceAssociationDescriptorPtr;
-#pragma options align=reset
-
-/*!
-    @typedef USBStatus
-    @discussion Type used to get a DeviceStatus as a single quantity.
-*/
-typedef UInt16				USBStatus;
-typedef USBStatus *			USBStatusPtr;
-
-// These constants are obsolete
-//
-enum {
-    kIOUSBAnyClass	= 0xFFFF,
-    kIOUSBAnySubClass	= 0xFFFF,
-    kIOUSBAnyProtocol	= 0xFFFF,
-    kIOUSBAnyVendor	= 0xFFFF,
-    kIOUSBAnyProduct	= 0xFFFF
-};
-
-// This structure are obsolete
-//
-typedef struct IOUSBMatch {
-    UInt16	usbClass;
-    UInt16	usbSubClass;
-    UInt16	usbProtocol;
-    UInt16	usbVendor;
-    UInt16	usbProduct;
-} IOUSBMatch;
-
-/*!
-    @typedef IOUSBFindEndpointRequest
-    @discussion Struct used to find endpoints of an interface
-    type and direction are used to match endpoints,
-    type, direction, maxPacketSize and interval are updated
-    with the properties of the found endpoint.
-    @field type Type of endpoint: kUSBControl, kUSBIsoc, kUSBBulk, kUSBInterrupt, kUSBAnyType.  If kUSBAnyType is specified, this field is treated as a don't care.
-    @field direction Direction of endpoint: kUSBOut, kUSBIn, kUSBAnyDirn.   If kUSBAnyDirn is specified, this field is treated as a don't care.
-    @field maxPacketSize maximum packet size of endpoint.
-    @field interval Polling interval in mSec for endpoint.
-*/
-typedef struct {
-	UInt8 type;	
-	UInt8 direction;
-    UInt16 maxPacketSize;
-    UInt8 interval;
-} IOUSBFindEndpointRequest;
-
-/*!
-    @struct IOUSBDevRequest
-    @discussion Parameter block for control requests, using a simple pointer
-    for the data to be transferred.
-    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
-    @field bRequest Request code
-    @field wValue 16 bit parameter for request, host endianess
-    @field wIndex 16 bit parameter for request, host endianess
-    @field wLength Length of data part of request, 16 bits, host endianess
-    @field pData Pointer to data for request - data returned in bus endianess
-    @field wLenDone Set by standard completion routine to number of data bytes
-	actually transferred
-*/
-typedef struct {
-    UInt8       bmRequestType;
-    UInt8       bRequest;
-    UInt16      wValue;
-    UInt16      wIndex;
-    UInt16      wLength;
-    void *      pData;
-    UInt32      wLenDone;
-} IOUSBDevRequest;
-typedef IOUSBDevRequest * IOUSBDeviceRequestPtr;
-
-/*!
-    @struct IOUSBDevRequestTO
-    @discussion Parameter block for control requests with timeouts, using a simple pointer
-    for the data to be transferred.  Same as a IOUSBDevRequest except for the two extra timeout fields.
-    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
-    @field bRequest Request code
-    @field wValue 16 bit parameter for request, host endianess
-    @field wIndex 16 bit parameter for request, host endianess
-    @field wLength Length of data part of request, 16 bits, host endianess
-    @field pData Pointer to data for request - data returned in bus endianess
-    @field wLenDone Set by standard completion routine to number of data bytes
-	actually transferred
-    @field noDataTimeout Specifies a time value in milliseconds. Once the request is queued on the bus, if no data is transferred in this amount of time, the request will be aborted and returned.
-    @field completionTimeout Specifies a time value in milliseconds. Once the request is queued on the bus, if the entire request is not completed in this amount of time, the request will be aborted and returned 
-*/
-typedef struct {
-    UInt8       bmRequestType;
-    UInt8       bRequest;
-    UInt16      wValue;
-    UInt16      wIndex;
-    UInt16      wLength;
-    void *      pData;
-    UInt32      wLenDone;
-    UInt32      noDataTimeout;
-    UInt32      completionTimeout;
-} IOUSBDevRequestTO;
-
-/*!
-    @enum Default timeout values
-    @discussion default values used for data and completion timeouts.
-*/
-enum
-{
-    kUSBDefaultControlNoDataTimeoutMS = 5000,
-    kUSBDefaultControlCompletionTimeoutMS = 0
-};
-
-// Internal structure to pass parameters between IOUSBLib and UserClient
-//
-typedef struct
-{
-    UInt32      pipeRef;
-    void *      buf;
-    UInt32      size;
-    UInt32      noDataTimeout;
-    UInt32      completionTimeout;
-} IOUSBBulkPipeReq;
-
-
-#if KERNEL
-/*!
-    @struct IOUSBDevRequestDesc
-    @discussion Parameter block for control requests, using a memory descriptor
-    for the data to be transferred.  Only available in the kernel.
-    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
-    @field bRequest Request code
-    @field wValue 16 bit parameter for request, host endianess
-    @field wIndex 16 bit parameter for request, host endianess
-    @field wLength Length of data part of request, 16 bits, host endianess
-    @field pData Pointer to memory descriptor for data for request - data returned in bus endianess
-    @field wLenDone Set by standard completion routine to number of data bytes
-     actually transferred
-*/
-typedef struct {
-    UInt8                   bmRequestType;
-    UInt8                   bRequest;
-    UInt16                  wValue;
-    UInt16                  wIndex;
-    UInt16                  wLength;
-    IOMemoryDescriptor *    pData;
-    UInt32                  wLenDone;
-} IOUSBDevRequestDesc;
-
-
-/*!
-    @enum IOOptionBits
-    @discussion Parameter passed to an IOService::open() call.
-    @constant kIOUSBInterfaceOpenAlt Open the alternate interface specified when creating the interface.
-*/
-enum {
-    kIOUSBInterfaceOpenAlt	= 0x00010000
-};
-
-#endif
-
-// Internal structure to pass parameters between IOUSBLib and UserClient
-//
-// use a structure because there's a limit of 6 total arguments
-// to a user client method.
-typedef struct {
-    UInt8   	bmRequestType;
-    UInt8 	bRequest;
-    UInt16 	wValue;
-    UInt16 	wIndex;
-    UInt16	wLength;
-    void * 	pData;		// data pointer
-    UInt32	wLenDone;	// # bytes transferred
-    UInt8	pipeRef;
-} IOUSBDevReqOOL;
-
-// Internal structure to pass parameters between IOUSBLib and UserClient
-//
-typedef struct {
-    UInt8   	bmRequestType;
-    UInt8 	bRequest;
-    UInt16 	wValue;
-    UInt16 	wIndex;
-    UInt16	wLength;
-    void * 	pData;		// data pointer
-    UInt32	wLenDone;	// # bytes transferred
-    UInt8	pipeRef;
-    UInt32	noDataTimeout;
-    UInt32	completionTimeout;
-} IOUSBDevReqOOLTO;
-
-// Internal structure to pass parameters between IOUSBLib and UserClient
-//
-// Structure to request isochronous transfer
-//
-typedef struct {
-    UInt32 		fPipe;
-    void 		*fBuffer;
-    UInt32 		fBufSize;
-    UInt64 		fStartFrame;
-    UInt32 		fNumFrames;
-    IOUSBIsocFrame 	*fFrameCounts;
-} IOUSBIsocStruct;
-
-// Internal structure to pass parameters between IOUSBLib and UserClient
-//
-// Structure to request low latency isochronous transfer
-//
-struct IOUSBLowLatencyIsocStruct {
-    UInt32 			fPipe;
-    UInt32 			fBufSize;
-    UInt64 			fStartFrame;
-    UInt32 			fNumFrames;
-    UInt32			fUpdateFrequency;
-    UInt32			fDataBufferCookie;
-    UInt32			fDataBufferOffset;
-    UInt32			fFrameListBufferCookie;
-    UInt32			fFrameListBufferOffset;
-};
-
-typedef struct IOUSBLowLatencyIsocStruct IOUSBLowLatencyIsocStruct;
-
-
-/*!
-    @struct IOUSBGetFrameStruct
-    @discussion Structure used from user space to return the frame number and a timestamp on when the frame register was read.
-    @field frame frame number
-    @field timeStamp  AbsoluteTime when the frame was updated
-*/
-typedef struct {
-    UInt64			frame;
-    AbsoluteTime	timeStamp;
-} IOUSBGetFrameStruct;
-
-
-/*!
-    @struct IOUSBFindInterfaceRequest
-    @discussion Structure used with FindNextInterface.
-*/
-typedef struct {
-    UInt16	bInterfaceClass;		// requested class
-    UInt16 	bInterfaceSubClass;		// requested subclass
-    UInt16 	bInterfaceProtocol;		// requested protocol
-    UInt16	bAlternateSetting;		// requested alt setting
-} IOUSBFindInterfaceRequest;
-
-/*!
-    @enum kIOUSBFindInterfaceDontCare
-    @discussion Constant that can be used for the fields of IOUSBFindInterfaceRequest to specify that they should not be matched. 
-*/
-enum {
-        kIOUSBFindInterfaceDontCare		= 0xFFFF
-        };
-
-/*!
-    @enum kIOUSBVendorIDAppleComputer
-    @discussion USB Vendor ID for Apple Computer, Inc. 
-*/
-enum {
-	kIOUSBVendorIDAppleComputer		= 0x05AC
-        };
-
-/*!
-    @enum USBDeviceSpeed
-    @discussion Returns the speed of a particular USB device. 
-    @constant	kUSBDeviceSpeedLow	The device a low speed device.
-    @constant	kUSBDeviceSpeedFull	The device a full speed device.
-    @constant	kUSBDeviceSpeedHigh	The device a high speed device.
-*/
-enum {
-        kUSBDeviceSpeedLow		= 0,
-        kUSBDeviceSpeedFull		= 1,
-        kUSBDeviceSpeedHigh		= 2
-        };
-
-/*!
-    @enum MicrosecondsInFrame
-    @discussion Returns the number of microseconds in a USB frame. 
-    @constant	kUSBFullSpeedMicrosecondsInFrame	The device is attached to a bus running at full speed (1 ms / frame).
-    @constant	kUSBHighSpeedMicrosecondsInFrame	The device is attached to a bus running at high speed (125 microseconds / frame).
-*/
-enum {
-    kUSBFullSpeedMicrosecondsInFrame		= 1000,	
-    kUSBHighSpeedMicrosecondsInFrame		= 125
-};
-
-//  During low latency transfers, the stack will set the frStatus for each frame to this value.  A client can check that to see if the transfer has completed.  We set the frStatus to a 
-//  valid return code when the transfer completes.
-//
-enum {
-        kUSBLowLatencyIsochTransferKey	= 'llit'	// Set frStatus field of first frame in isoch transfer to designate as low latency
-    };
-    
-// This structure is DEPRECATED.  See the LowLatencyUserBufferInfoV2  
-//
-typedef struct LowLatencyUserBufferInfo LowLatencyUserBufferInfo;
-
-struct LowLatencyUserBufferInfo {
-    UInt32				cookie;
-    void *				bufferAddress;
-    IOByteCount			bufferSize;
-    UInt32				bufferType;
-    Boolean				isPrepared;
-    LowLatencyUserBufferInfo *	nextBuffer;
-};
-
-// This structure is DEPRECATED.  See the LowLatencyUserBufferInfoV3  
-
-typedef struct LowLatencyUserBufferInfoV2 LowLatencyUserBufferInfoV2;
-
-struct LowLatencyUserBufferInfoV2 
-{
-	UInt32							cookie;
-	void *							bufferAddress;
-	IOByteCount						bufferSize;
-	UInt32							bufferType;
-	Boolean							isPrepared;
-	void *							mappedUHCIAddress;
-	LowLatencyUserBufferInfoV2 *	nextBuffer;
-};
-
-	
-// This structure is used to pass information for the low latency calls between user space and the kernel.  
-//
-typedef struct LowLatencyUserBufferInfoV3 LowLatencyUserBufferInfoV3;
-
-struct LowLatencyUserBufferInfoV3 
-{
-	uint64_t						cookie;
-	mach_vm_address_t				bufferAddress;
-	mach_vm_size_t					bufferSize;
-	uint64_t						bufferType;
-	uint64_t						isPrepared;
-	mach_vm_address_t				mappedUHCIAddress;
-	LowLatencyUserBufferInfoV3 *	nextBuffer;
-};
-	
-	
-	/*!
-    @enum USBLowLatencyBufferType
-    @discussion Used to specify what kind of buffer to create when calling LowLatencyCreateBuffer(). 
-    @constant	kUSBLowLatencyWriteBuffer	The buffer will be used to write data out to a device.
-    @constant	kUSBLowLatencyReadBuffer	The buffer will be used to read data from a device.
-    @constant	kUSBLowLatencyFrameListBuffer	The buffer will be used for a low latency isoch frame list.
-*/
-typedef enum {
-    kUSBLowLatencyWriteBuffer 		= 0,
-    kUSBLowLatencyReadBuffer		= 1,
-    kUSBLowLatencyFrameListBuffer	= 2
-} USBLowLatencyBufferType;
-
-// USB User Notification Types
-//
-enum {
-    kUSBNoUserNotificationType			= 0,
-    kUSBNotEnoughPowerNotificationType		= 1,
-    kUSBIndividualOverCurrentNotificationType	= 2,
-    kUSBGangOverCurrentNotificationType		= 3
-};
-
-/*!
-    @defined Property Definitions
-    @discussion Useful property names in USB land. 
-*/
-#define kUSBDevicePropertySpeed                 "Device Speed"
-#define kUSBDevicePropertyBusPowerAvailable     "Bus Power Available"
-#define kUSBDevicePropertyAddress               "USB Address"
-#define kUSBDevicePropertyLocationID            "locationID"
-#define kUSBProductIDMask						"idProductMask"
-#define kUSBPreferredConfiguration				"Preferred Configuration"
-#define kUSBSuspendPort							"kSuspendPort"
-#define kUSBExpressCardCantWake					"ExpressCardCantWake"
-#define kUSBControllerNeedsContiguousMemoryForIsoch	"Need contiguous memory for isoch"
-#define kUSBHubDontAllowLowPower				"kUSBHubDontAllowLowPower"
-#define kUSBDeviceResumeRecoveryTime			"kUSBDeviceResumeRecoveryTime"
-#define kUSBOutOfSpecMPSOK						"Out of spec MPS OK"
-#define kConfigurationDescriptorOverride		"ConfigurationDescriptorOverride"
-#define kOverrideIfAtLocationID					"OverrideIfAtLocationID"
-
-/*!
-@enum USBReEnumerateOptions
- @discussion Options used when calling ReEnumerateDevice. 
- @constant	kUSBAddExtraResetTimeBit	Setting this bit will cause the Hub driver to wait 100ms before addressing the device after the reset following the re-enumeration.
- */
-typedef enum {
-    kUSBAddExtraResetTimeBit 		= 31,
-    kUSBAddExtraResetTimeMask		= ( 1 << kUSBAddExtraResetTimeBit)
-} USBReEnumerateOptions;
-
-/*!
- @enum USBDeviceInformationBits
- @discussion 	GetUSBDeviceInformation will return a unit32_t value with bits set indicating that a particular state is present in the USB device.  These bits are described here 
- 
- @constant	kUSBInformationDeviceIsCaptiveBit			The USB device is directly attached to its hub and cannot be removed.
- @constant	kUSBInformationDeviceIsAttachedToRootHubBit	The USB device is directly attached to the root hub
- @constant	kUSBInformationDeviceIsInternalBit			The USB device is internal to the computer (all the hubs it attaches to are captive)
- @constant	kUSBInformationDeviceIsConnectedBit			The USB device is connected to its hub
- @constant	kUSBInformationDeviceIsEnabledBit			The hub port to which the USB device is attached is enabled
- @constant	kUSBInformationDeviceIsSuspendedBit			The hub port to which the USB device is attached is suspended
- @constant	kUSBInformationDeviceIsInResetBit			The hub port to which the USB device is attached is being reset
- @constant	kUSBInformationDeviceOvercurrentBit			The USB device generated an overcurrent
- @constant	kUSBInformationDevicePortIsInTestModeBit	The hub port to which the USB device is attached is in test mode
- @constant  kUSBInformationDeviceIsRootHub				The device is actually the root hub simulation
- @constant  kUSBInformationRootHubisBuiltIn				If this is a root hub simulation and it's built into the machine, this bit is set.  If it's on an expansion card, it will be cleared
- 
- */
-	typedef enum {
-		kUSBInformationDeviceIsCaptiveBit				= 0,
-		kUSBInformationDeviceIsAttachedToRootHubBit		= 1,
-		kUSBInformationDeviceIsInternalBit				= 2,
-		kUSBInformationDeviceIsConnectedBit				= 3,
-		kUSBInformationDeviceIsEnabledBit				= 4,
-		kUSBInformationDeviceIsSuspendedBit				= 5,
-		kUSBInformationDeviceIsInResetBit				= 6,
-		kUSBInformationDeviceOvercurrentBit				= 7,
-		kUSBInformationDevicePortIsInTestModeBit		= 8,
-		kUSBInformationDeviceIsRootHub					= 9,
-		kUSBInformationRootHubisBuiltIn					= 10,
-		kUSBInformationDeviceIsRemote					= 11,
-		kUSBInformationDeviceIsCaptiveMask				= (1 << kUSBInformationDeviceIsCaptiveBit),
-		kUSBInformationDeviceIsAttachedToRootHubMask	= (1 << kUSBInformationDeviceIsAttachedToRootHubBit),
-		kUSBInformationDeviceIsInternalMask				= (1 << kUSBInformationDeviceIsInternalBit),
-		kUSBInformationDeviceIsConnectedMask			= (1 << kUSBInformationDeviceIsConnectedBit),
-		kUSBInformationDeviceIsEnabledMask				= (1 << kUSBInformationDeviceIsEnabledBit),
-		kUSBInformationDeviceIsSuspendedMask			= (1 << kUSBInformationDeviceIsSuspendedBit),
-		kUSBInformationDeviceIsInResetMask				= (1 << kUSBInformationDeviceIsInResetBit),
-		kUSBInformationDeviceOvercurrentMask			= (1 << kUSBInformationDeviceOvercurrentBit),
-		kUSBInformationDevicePortIsInTestModeMask		= (1 << kUSBInformationDevicePortIsInTestModeBit),
-		kUSBInformationDeviceIsRootHubMask				= (1 << kUSBInformationDeviceIsRootHub),
-		kUSBInformationRootHubisBuiltInMask				= (1 << kUSBInformationRootHubisBuiltIn),
-		kUSBInformationDeviceIsRemoteMask				= (1 << kUSBInformationDeviceIsRemote)
-	} USBDeviceInformationBits;
-	
-	/*!
-	 @enum USBPowerRequestTypes
-	 @discussion Used to specify what kind of power will be reserved using the IOUSBDevice RequestExtraPower and ReturnExtraPower APIs. 
-	 @constant	kUSBPowerDuringSleep	The power is to be used during sleep.
-	 @constant	kUSBPowerDuringWake		The power is to be used while the system is awake (i.e not sleeping)
-	 */
-	typedef enum {
-		kUSBPowerDuringSleep 		= 0,
-		kUSBPowerDuringWake			= 1
-	} USBPowerRequestTypes;
-	
-	// Apple specific properties
-#define kAppleCurrentAvailable		"AAPL,current-available"
-#define kAppleCurrentInSleep		"AAPL,current-in-sleep"
-#define kAppleCurrentExtra			"AAPL,current-extra"
-#define kAppleInternalUSBDevice		"AAPL,device-internal"
-#define kUSBBusID					"AAPL,bus-id"
-	
-
-#ifdef __cplusplus
-}       
-#endif
-
-#endif /* _USB_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/USBHub.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/USBHub.h.svn-base
deleted file mode 100644
index 4bbda15..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/USBHub.h.svn-base
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _USBHUB_H
-#define _USBHUB_H
-
-#include <IOKit/usb/USB.h>
-#include <IOKit/usb/USBSpec.h>
-
-    /*!
-    @header     USBHub.h
-     @abstract  Constants and definitions used with Hub devices.
-     @discussion    
-     */
-
-    /*!
-    @enum Hub Descriptor Type
-    @discussion
-    */
-enum {
-    kUSBHubDescriptorType       = 0x29
-};
-
-    /*!
-    @enum HubFeatures
-    @discussion Used with SET_FEATURE to set hub and port features
-    */
-enum {
-                            
-    kUSBHubLocalPowerChangeFeature      = 0,    /* Hub features */
-    kUSBHubOverCurrentChangeFeature     = 1,
-
-    kUSBHubPortConnectionFeature        = 0,    /* port features */
-    kUSBHubPortEnableFeature            = 1,
-    kUSBHubPortSuspendFeature           = 2,
-    kUSBHubPortOverCurrentFeature       = 3,
-    kUSBHubPortResetFeature             = 4,
-    kUSBHubPortPowerFeature             = 8,
-    kUSBHubPortLowSpeedFeature          = 9,
-    kUSBHubPortConnectionChangeFeature  = 16,
-    kUSBHubPortEnableChangeFeature      = 17,
-    kUSBHubPortSuspendChangeFeature     = 18,
-    kUSBHubPortOverCurrentChangeFeature = 19,
-    kUSBHubPortResetChangeFeature       = 20,
-    kUSBHubPortTestFeature				= 21,
-	kUSBHubPortIndicatorFeature			= 22
-};
-
-    /*!
-    @enum HubPortStatus
-    @discussion Used to decode the Port Status and Change 
-    */
-enum {
-    kHubPortConnection		= 0x0001,
-    kHubPortEnabled			= 0x0002,
-    kHubPortSuspend			= 0x0004,
-    kHubPortOverCurrent		= 0x0008,
-    kHubPortBeingReset		= 0x0010,
-    kHubPortPower			= 0x0100,
-    kHubPortLowSpeed		= 0x0200,
-    kHubPortHighSpeed		= 0x0400,
-    kHubPortTestMode		= 0x0800,
-    kHubPortIndicator		= 0x1000,
-
-    // these are the bits which cause the hub port state machine to keep moving
-    kHubPortStateChangeMask		= kHubPortConnection | kHubPortEnabled | kHubPortSuspend | kHubPortOverCurrent | kHubPortBeingReset
-};
-
-
-    /*!
-    @enum HubStatus
-    @discussion Used to decode the Hub Status and Change 
-    */
-enum {
-    kHubLocalPowerStatus        = 1,
-    kHubOverCurrentIndicator    = 2,
-    kHubLocalPowerStatusChange  = 1,
-    kHubOverCurrentIndicatorChange  = 2
-};
-
-    /*!
-    @enum HubCharacteristics
-    @discussion 
-    */
-enum {
-    kPerPortSwitchingBit    = (1 << 0),
-    kNoPowerSwitchingBit    = (1 << 1),
-    kCompoundDeviceBit      = (1 << 2),
-    kPerPortOverCurrentBit  = (1 << 3),
-    kNoOverCurrentBit       = (1 << 4),
-	
-	kHubPortIndicatorBit	= 7,
-	kHubPortIndicatorMask	= 0x0080
-};
-
-/*!
-@enum PowerSwitching
- @discussion 
- */
-enum {
-	kHubSupportsGangPower	= 0,
-	kHubSupportsIndividualPortPower = 1,
-	kHubPortSetPowerOff		= 0,
-	kHubPortSetPowerOn		= 1
-};
-
-/*!
-@enum PortIndicatorSelectors
- @discussion 
- */
-enum {
-	kHubPortIndicatorAutomatic	= 0,
-	kHubPortIndicatorAmber,
-	kHubPortIndicatorGreen,
-	kHubPortIndicatorOff
-};
-
-/*!
- @enum Root Hub specific 
- @discussion 
- */
-enum {
-	kPrdRootHubApple			= 0x8005,	// ProductID for classic speed root hubs
-	kPrdRootHubAppleE			= 0x8006,	// ProductID for high speed root hubs
-	kUSBRootHubPollingRate		= 32		// Enpoint polling rate interval for root hubs
-};
-
-/*!
-@enum Hub Device Requests
-@discussion  Encoding of the hub specific standard requests
-<tt>
-<pre><b>
-Request          bmRequestType bRequest       wValue  wIndex wLength Data</b>
-ClearHubFeature  0010 0000B    CLEAR_FEATURE  Feature Zero    Zero   None
-ClearPortFeature 0010 0011B                   Feature Port    Zero   None
-
-GetBusState      1010 0011B    GET_STATE      Zero    Port    One    Port Bus State
-
-GetHubDescriptor 1010 0000B    GET_DESCRIPTOR Type    Zero    Length Descriptor
-
-GetHubStatus     1010 0000B    GET_STATUS     Zero    Zero    Four   Hub Status
-GetPortStatus    1010 0011B                   Zero    Port    Four   Port Status
-
-SetHubDescriptor 0010 0000B    SET_DESCRIPTOR Type    Zero    Length Descriptor
-
-SetHubFeature    0010 0000B    SET_FEATURE    Feature Zero    Zero   None
-SetPortFeature   0010 0011B                   Feature Port    Zero   None
-</pre>
-</tt>
-    */
-enum {
-    kClearHubFeature  = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBClass, kUSBDevice),
-    kClearPortFeature = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBClass, kUSBOther),
-    kGetPortState     = EncodeRequest(kUSBRqGetState,      kUSBIn,  kUSBClass, kUSBOther),
-    kGetHubDescriptor = EncodeRequest(kUSBRqGetDescriptor, kUSBIn,  kUSBClass, kUSBDevice),
-    kGetHubStatus     = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBClass, kUSBDevice),
-    kGetPortStatus    = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBClass, kUSBOther),
-    kSetHubDescriptor = EncodeRequest(kUSBRqGetDescriptor, kUSBOut, kUSBClass, kUSBDevice),
-    kSetHubFeature    = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBClass, kUSBDevice),
-    kSetPortFeature   = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBClass, kUSBOther)
-};
-
-
-/*!
-    @typedef IOUSBHubDescriptor
-    @discussion USB Hub Descriptor.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-struct IOUSBHubDescriptor {
-    UInt8   length;
-    UInt8   hubType;
-    UInt8   numPorts;
-    UInt16  characteristics __attribute__((packed));
-    UInt8   powerOnToGood;  /* Port settling time, in 2ms */
-    UInt8   hubCurrent;
-    /* These are received packed, will have to be unpacked */
-    UInt8   removablePortFlags[8];
-    UInt8   pwrCtlPortFlags[8];
-};
-
-typedef struct IOUSBHubDescriptor IOUSBHubDescriptor;
-
-/*!
-    @typedef IOUSBHubStatus
-    @discussion Used to get the port status and change flags using GetPortStatus()
-*/
-struct IOUSBHubStatus {
-    UInt16          statusFlags;
-    UInt16          changeFlags;
-};
-typedef struct IOUSBHubStatus   IOUSBHubStatus;
-typedef IOUSBHubStatus *    IOUSBHubStatusPtr;
-
-typedef struct IOUSBHubStatus   IOUSBHubPortStatus;
-
-
-/*!
-    @typedef IOUSBHubPortReEnumerateParam
-    @discussion Used to specify the port that needs to be reenumerated
-*/
-typedef struct IOUSBHubPortReEnumerateParam IOUSBHubPortReEnumerateParam;
-
-struct IOUSBHubPortReEnumerateParam {
-    UInt32   portNumber;
-    UInt32   options;
-};
-
-typedef struct IOUSBHubPortClearTTParam IOUSBHubPortClearTTParam;
-
-struct IOUSBHubPortClearTTParam {
-    UInt32	 portNumber;
-    UInt32	 options;
-#if 0
-    UInt8 	 deviceAddress;  <<0
-	UInt8	 endpointNum;    <<8
-	UInt8 	 endpointType;	 <<16 // As split transaction. 00 Control, 10 Bulk
-	UInt8 	 IN;		 <<24 // Direction, 1 = IN, 0 = OUT
-#endif
-};
-
-#endif /* _USBHUB_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/USBSpec.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/USBSpec.h.svn-base
deleted file mode 100644
index 0665819..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/USBSpec.h.svn-base
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-/*
- * Constants that both OS9 and OSX want to define, and whose values are
- * specified by the USB Standard.
- * Put in a seperate file so they can be included if the OS9 include file isn't already
- * included.
- */
-#ifndef _USBSPEC_H
-#define _USBSPEC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    /*!
-    @header     USBSpec.h
-     @abstract  Constants and definitions of parameters that are used in communcating with USB devices and interfaces.
-     @discussion    
-     */
-
-    /*!
-    @enum Endpoint type
-    @discussion Used in IOUSBFindEndpointRequest's type field
-    */
-enum {
-    kUSBControl     = 0,
-    kUSBIsoc        = 1,
-    kUSBBulk        = 2,
-    kUSBInterrupt   = 3,
-    kUSBAnyType     = 0xFF
-};
-
-    /*!
-    @enum Endpoint direction
-    @discussion Used in IOUSBFindEndpointRequest's direction field
-    */
-enum {
-    kUSBOut         = 0,
-    kUSBIn          = 1,
-    kUSBNone        = 2,
-    kUSBAnyDirn     = 3
-};
-
-    /*!
-    @enum Device Request Type
-    @discussion This type is encoded in the bmRequestType field of a Device Request.  It specifies the type of request: standard, class or vendor specific.
-    */
-enum {
-    kUSBStandard    = 0,
-    kUSBClass       = 1,
-    kUSBVendor      = 2
-};
-
-    /*!
-    @enum Device Request Recipient
-    @discussion This recipient is encoded in the bmRequestType field of a Device Request.  It specifies the type of recipient for a request:  the device, the interface, or an endpoint.
-    */
-enum {
-    kUSBDevice      = 0,
-    kUSBInterface   = 1,
-    kUSBEndpoint    = 2,
-    kUSBOther       = 3
-};
-
-    /*!
-    @enum Device Request
-    @discussion Specifies values for the bRequest field of a Device Request.
-    */
-enum {
-    kUSBRqGetStatus     = 0,
-    kUSBRqClearFeature  = 1,
-    kUSBRqGetState      = 2,
-    kUSBRqSetFeature    = 3,
-    kUSBRqReserved2     = 4,
-    kUSBRqSetAddress    = 5,
-    kUSBRqGetDescriptor = 6,
-    kUSBRqSetDescriptor = 7,
-    kUSBRqGetConfig     = 8,
-    kUSBRqSetConfig     = 9,
-    kUSBRqGetInterface  = 10,
-    kUSBRqSetInterface  = 11,
-    kUSBRqSyncFrame     = 12
-};
-
-    /*!
-    @enum USB Descriptors
-    @discussion Specifies values for diffent descriptor types.
-    */
-enum {
-    kUSBAnyDesc             = 0,    // Wildcard for searches
-    kUSBDeviceDesc          = 1,
-    kUSBConfDesc            = 2,
-    kUSBStringDesc          = 3,
-    kUSBInterfaceDesc       = 4,
-    kUSBEndpointDesc        = 5,
-    kUSBDeviceQualifierDesc = 6,
-    kUSBOtherSpeedConfDesc  = 7,
-    kUSBInterfacePowerDesc  = 8,
-    kUSBOnTheGoDesc	    = 9,
-    kUSDebugDesc	    = 10,
-    kUSBInterfaceAssociationDesc 	= 11,
-    kUSBHIDDesc             		= 0x21,
-    kUSBReportDesc          		= 0x22,
-    kUSBPhysicalDesc        		= 0x23,
-    kUSBHUBDesc             		= 0x29
-};
-
-    /*!
-    @enum Feature Selectors
-    @discussion Used with SET/CLEAR_FEATURE requests.
-    */
-enum {
-        kUSBFeatureEndpointStall = 0,
-        kUSBFeatureDeviceRemoteWakeup = 1
-}; 
-
-    /*!
-    @enum USB Power constants
-    @discussion Constants relating to USB Power.
-    */
-enum {
-    kUSB100mAAvailable  = 50,
-    kUSB500mAAvailable  = 250,
-    kUSB100mA           = 50,
-    kUSBAtrBusPowered   = 0x80,
-    kUSBAtrSelfPowered  = 0x40,
-    kUSBAtrRemoteWakeup = 0x20
-};
-
-    /*!
-    @enum USB Release constants
-    @discussion Constants relating to USB releases as found in the bcdUSB field of the Device Descriptor.
-    */
-enum {
-    kUSBRel10       = 0x0100,
-    kUSBRel11       = 0x0110,
-    kUSBRel20       = 0x0200
-};
-
-
-    /*!
-    @enum HID requests
-    @discussion Constants for HID requests.
-    */
-enum {
-    kHIDRqGetReport     = 1,
-    kHIDRqGetIdle       = 2,
-    kHIDRqGetProtocol   = 3,
-    kHIDRqSetReport     = 9,
-    kHIDRqSetIdle       = 10,
-    kHIDRqSetProtocol   = 11
-};
-
-    /*!
-    @enum HID report types
-    @discussion Constants for the three kinds of HID reports.
-    */
-enum {
-    kHIDRtInputReport       = 1,
-    kHIDRtOutputReport      = 2,
-    kHIDRtFeatureReport     = 3
-};
-
-
-    /*!
-    @enum HID Protocol
-    @discussion  Used in the SET_PROTOCOL device request
-    */
-enum {
-    kHIDBootProtocolValue   = 0,
-    kHIDReportProtocolValue = 1
-};
-
-
-
-enum {
-    kUSBCapsLockKey         = 0x39,
-    kUSBNumLockKey          = 0x53,
-    kUSBScrollLockKey       = 0x47
-};
-
-/*!
-@enum Device Class Codes
- @discussion Constants for USB Device classes (bDeviceClass).
- */
-enum {
-    kUSBCompositeClass          	= 0,
-    kUSBCommClass               	= 2,		// Deprecated
-    kUSBCommunicationClass			= 2,	
-    kUSBHubClass                	= 9,
-    kUSBDataClass               	= 10,
-	kUSBPersonalHealthcareClass		= 15,
-    kUSBDiagnosticClass				= 220,
-    kUSBWirelessControllerClass 	= 224,
-    kUSBMiscellaneousClass			= 239,
-    kUSBApplicationSpecificClass 	= 254,
-    kUSBVendorSpecificClass     	= 255
-};
-
-/*!
-@enum Interface Class
- @discussion Constants for Interface classes (bInterfaceClass).
- */
-enum {
-    kUSBAudioClass							= 1,		// Deprecated
-    kUSBAudioInterfaceClass					= 1,
-
-    kUSBCommunicationControlInterfaceClass	= 2,
-    kUSBCommunicationDataInterfaceClass		= 10,
-
-    kUSBHIDClass							= 3,
-    kUSBHIDInterfaceClass					= 3,
-
-    kUSBPhysicalInterfaceClass				= 5,
-
-    kUSBImageInterfaceClass					= 6,
-
-    kUSBPrintingClass						= 7,		// Deprecated
-    kUSBPrintingInterfaceClass				= 7,
-
-    kUSBMassStorageClass					= 8,		// Deprecated
-    kUSBMassStorageInterfaceClass			= 8,
-
-    kUSBChipSmartCardInterfaceClass			= 11,
-    
-    kUSBContentSecurityInterfaceClass 		= 13,
-    
-    kUSBVideoInterfaceClass					= 14,
-	
-	kUSBPersonalHealthcareInterfaceClass	= 15,
-    
-    kUSBDiagnosticDeviceInterfaceClass 		= 220,
-
-    kUSBWirelessControllerInterfaceClass	= 224,
-
-    kUSBApplicationSpecificInterfaceClass	= 254,
-    
-    kUSBVendorSpecificInterfaceClass     	= 255
-};
-
-// Obsolete
-enum {
-        
-    kUSBDisplayClass            = 4,		// Obsolete
-};
-
-/*!
-    @enum Interface SubClass
-    @discussion Constants for USB Interface SubClasses (bInterfaceSubClass).
-*/
-enum {
-    kUSBCompositeSubClass               = 0,
-    
-    kUSBHubSubClass                     = 0,
-
-    // For the kUSBAudioInterfaceClass
-    //
-    kUSBAudioControlSubClass		= 0x01,
-    kUSBAudioStreamingSubClass		= 0x02,
-    kUSBMIDIStreamingSubClass		= 0x03,
-    
-    // For the kUSBApplicationSpecificInterfaceClass
-    //
-    kUSBDFUSubClass                     = 0x01,
-    kUSBIrDABridgeSubClass              = 0x02,
-    kUSBTestMeasurementSubClass		= 0x03,
-
-    // For the kUSBMassStorageInterfaceClass
-    //
-    kUSBMassStorageRBCSubClass          = 0x01,
-    kUSBMassStorageATAPISubClass        = 0x02,
-    kUSBMassStorageQIC157SubClass       = 0x03,
-    kUSBMassStorageUFISubClass          = 0x04,
-    kUSBMassStorageSFF8070iSubClass     = 0x05,
-    kUSBMassStorageSCSISubClass         = 0x06,
-
-    // For the kUSBHIDInterfaceClass
-    //
-    kUSBHIDBootInterfaceSubClass        = 0x01,
-
-    // For the kUSBCommunicationDataInterfaceClass
-    //
-    kUSBCommDirectLineSubClass          = 0x01,
-    kUSBCommAbstractSubClass            = 0x02,
-    kUSBCommTelephoneSubClass           = 0x03,
-    kUSBCommMultiChannelSubClass        = 0x04,
-    kUSBCommCAPISubClass                = 0x05,
-    kUSBCommEthernetNetworkingSubClass  = 0x06,
-    kUSBATMNetworkingSubClass           = 0x07,
-
-    // For the kUSBDiagnosticDeviceInterfaceClass
-    //
-    kUSBReprogrammableDiagnosticSubClass	= 0x01,
-
-    // For the kUSBWirelessControllerInterfaceClass
-    //
-    kUSBRFControllerSubClass		= 0x01,
-
-    // For the kUSBMiscellaneousClass
-    //
-    kUSBCommonClassSubClass		= 0x02,
-
-    // For the kUSBVideoInterfaceClass
-    //
-    kUSBVideoControlSubClass		= 0x01,
-    kUSBVideoStreamingSubClass		= 0x02,
-    kUSBVideoInterfaceCollectionSubClass = 0x03
-    
-};
-
-/*!
-@enum	Interface Protocol
- @discussion Reported in the bInterfaceProtocol field of the Interface Descriptor.
- */
-enum {
-
-    // For kUSBHIDInterfaceClass
-    //
-    kHIDNoInterfaceProtocol		= 0,
-    kHIDKeyboardInterfaceProtocol	= 1,
-    kHIDMouseInterfaceProtocol		= 2,
-    kUSBVendorSpecificProtocol		= 0xff,
-
-    // For kUSBDiagnosticDeviceInterfaceClass
-    //
-    kUSB2ComplianceDeviceProtocol	= 0x01,
-
-    // For kUSBWirelessControllerInterfaceClass
-    //
-    kUSBBluetoothProgrammingInterfaceProtocol	= 0x01,
-
-    // For kUSBMiscellaneousClass
-    //
-    KUSBInterfaceAssociationDescriptorProtocol	= 0x01
-    
-};
-
-
-/*!
-    @enum DFU Class Attributes
-    @discussion 
-*/
-enum {
-    kUSBDFUAttributesMask       = 0x07,
-    kUSBDFUCanDownloadBit       = 0,
-    kUSBDFUCanUploadBit         = 1,
-    kUSBDFUManifestationTolerantBit     = 2
-};
-
-/*!
- @enum Printer Class Requests
- @discussion The bRequest parameter for Printing Class Sepcific Requests
- */
-enum {
-	kUSPrintingClassGetDeviceID		= 0,
-	kUSPrintingClassGePortStatus	= 1,
-	kUSPrintingClassSoftReset		= 2
-};
-
-	/*!
-@enum Endpoint Descriptor bits
- @discussion Bit definitions for endpoint descriptor fields
- */
-enum {
-    kUSBbEndpointAddressMask				= 0x0f,
-    kUSBbEndpointDirectionBit				= 7,
-    kUSBbEndpointDirectionMask				= ( 1 << kUSBbEndpointDirectionBit ),
-    kUSBEndpointDirectionOut				= 0x00,
-    kUSBEndpointDirectionIn				= 0x80,
-    kUSBEndpointbmAttributesTransferTypeMask		= 0x03,
-    kUSBEndpointbmAttributesSynchronizationTypeMask	= 0x0c,
-    kUSBEndpointbmAttributesSynchronizationTypeShift	= 2,
-    kUSBEndpointbmAttributesUsageTypeMask		= 0x30,
-    kUSBEndpointbmAttributesUsageTypeShift		= 4
-};
-
-	/*!
-	 @defineblock USB Descriptor and IORegistry constants
-	 @discussion 	Various constants used to describe the fields in the various USB Device Descriptors and IORegistry names used for some of those fields 
-	 
-	 @define	kUSBDeviceClass				The field in the USB Device Descriptor corresponding to the device class
-	 @define	kUSBDeviceSubClass			The field in the USB Device Descriptor corresponding to the device sub class
-	 @define	kUSBDeviceProtocol			The field in the USB Device Descriptor corresponding to the device protocol
-	 @define	kUSBDeviceMaxPacketSize		The field in the USB Device Descriptor corresponding to the maximum packet size for endpoint 0
-	 @define	kUSBVendorID				The field in the USB Device Descriptor corresponding to the device USB Vendor ID
-	 @define	kUSBVendorName				Deprecated.  Use kUSBVendorID 
-	 @define	kUSBProductID				The field in the USB Device Descriptor corresponding to the device USB Product ID
-	 @define	kUSBProductName				Deprecated.  Use kUSBProductID
-	 @define	kUSBDeviceReleaseNumber		The field in the USB Device Descriptor corresponding to the device release version
-	 @define	kUSBManufacturerStringIndex	The field in the USB Device Descriptor corresponding to the index for the manufacturer's string
-	 @define	kUSBProductStringIndex		The field in the USB Device Descriptor corresponding to the index for the product name's string
-	 @define	kUSBSerialNumberStringIndex	The field in the USB Device Descriptor corresponding to the index for the serial number's string
-	 @define	kUSBDeviceNumConfigs		The field in the USB Configuration Descriptor corresponding to the number of configurations
-	 @define	kUSBInterfaceNumber			The field in the USB Configuration Descriptor corresponding to the number of configurations
-	 @define	kUSBAlternateSetting		The field in the USB Configuration Descriptor corresponding to the number of configurations
-	 @define	kUSBNumEndpoints			The field in the USB Configuration Descriptor corresponding to the number of configurations
-	 @define	kUSBInterfaceClass			The field in the USB Interface Descriptor corresponding to the interface class
-	 @define	kUSBInterfaceSubClass		The field in the USB Interface Descriptor corresponding to the interface sub class
-	 @define	kUSBInterfaceProtocol		The field in the USB Interface Descriptor corresponding to the interface protocol
-	 @define	kUSBInterfaceStringIndex	The field in the USB Interface Descriptor corresponding to the index for the interface name's string
-	 @define	kUSBConfigurationValue		The field in the USB Interface Descriptor corresponding to the configuration
-	 @define	kUSBProductString			IORegistry key for the device's USB Product string
-	 @define	kUSBVendorString			IORegistry key for the device's USB manufacturer string
-	 @define	kUSBSerialNumberString		IORegistry key for the device's USB serial number string
-	 @define	kUSB1284DeviceID			IORegistry key for the 1284 Device ID of a printer
-	 
-	 */
-#define kUSBDeviceClass             "bDeviceClass"
-#define kUSBDeviceSubClass          "bDeviceSubClass"
-#define kUSBDeviceProtocol          "bDeviceProtocol"
-#define kUSBDeviceMaxPacketSize     "bMaxPacketSize0"
-#define kUSBVendorID                "idVendor"          // good name
-#define kUSBVendorName              kUSBVendorID        // bad name - keep for backward compatibility
-#define kUSBProductID               "idProduct"         // good name
-#define kUSBProductName             kUSBProductID       // bad name - keep for backward compatibility
-#define kUSBDeviceReleaseNumber     "bcdDevice"
-#define kUSBManufacturerStringIndex "iManufacturer"
-#define kUSBProductStringIndex      "iProduct"
-#define kUSBSerialNumberStringIndex "iSerialNumber"
-#define kUSBDeviceNumConfigs        "bNumConfigurations"
-#define kUSBInterfaceNumber         "bInterfaceNumber"
-#define kUSBAlternateSetting        "bAlternateSetting"
-#define kUSBNumEndpoints            "bNumEndpoints"
-#define kUSBInterfaceClass          "bInterfaceClass"
-#define kUSBInterfaceSubClass       "bInterfaceSubClass"
-#define kUSBInterfaceProtocol       "bInterfaceProtocol"
-#define kUSBInterfaceStringIndex    "iInterface"
-#define kUSBConfigurationValue      "bConfigurationValue"
-#define kUSBProductString			"USB Product Name"	
-#define kUSBVendorString			"USB Vendor Name"
-#define kUSBSerialNumberString		"USB Serial Number"
-#define kUSB1284DeviceID			"1284 Device ID"
- /*! @/defineblock */
-	
-	/*!
-    @enum Apple USB Vendor ID
-    @discussion Apple's vendor ID, assigned by the USB-IF
-*/
-enum {
-	kAppleVendorID      = 0x05AC
-};
-	
-#ifdef __cplusplus
-}       
-#endif
-
-#endif /* _USBSPEC_H */
diff --git a/i386/include/IOKit/usb/.svn/text-base/USBTracepoints.h.svn-base b/i386/include/IOKit/usb/.svn/text-base/USBTracepoints.h.svn-base
deleted file mode 100644
index f2fe81e..0000000
--- a/i386/include/IOKit/usb/.svn/text-base/USBTracepoints.h.svn-base
+++ /dev/null
@@ -1,662 +0,0 @@
-/*
- * Copyright � 2009 Apple Inc.  All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __IOKIT_IO_USB_FAMILY_TRACEPOINTS__
-#define __IOKIT_IO_USB_FAMILY_TRACEPOINTS__
-
-#include <IOKit/IOTypes.h>
-
-#include <sys/kdebug.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-#define USB_SYSCTL			"debug.USB"
-#define kUSBTypeDebug		'USBD'
-#define DEBUG_UNUSED( X )	( void )( X )
-	
-	extern UInt32 gUSBStackDebugFlags;
-	
-	typedef struct USBSysctlArgs
-		{
-			uint32_t		type;
-			uint32_t		operation;
-			uint32_t		debugFlags;
-		} USBSysctlArgs;
-	
-	enum
-	{
-		kUSBOperationGetFlags 	= 0,
-		kUSBOperationSetFlags	= 1
-	};
-	
-	// the following bits/masks are for use in the usb boot args
-	// e.g. boot-args="usb=0x102" will turn on Trace Points and set the EHCI retry count to 1
-	// the bits can also be set with a sysctl call
-	enum
-	{
-		kUSBEnableDebugLoggingBit		= 0,	// bit 0 currently not used
-		kUSBEnableTracePointsBit		= 1,	// bit 1 used to turn on Trace Points when a USB controller first loads
-		kUSBEnableErrorLogBit			= 2,	// bit 2 (4) turns level 1 log for errors
-		kUSBDebugRetryCountShift		= 8,	// bits 8 and 9 will set the retry count for low level bus transactions
-		kUSBDebugRetryCountReserved		= 9,	// must be 1, 2, or 3 (0 is invalid, 3 is the default)
-		
-		kUSBEnableDebugLoggingMask		= (1 << kUSBEnableDebugLoggingBit),
-		kUSBEnableTracePointsMask		= (1 << kUSBEnableTracePointsBit),
-		kUSBDebugRetryCountMask			= (3 << kUSBDebugRetryCountShift),
-		kUSBEnableErrorLogMask				= (1 << kUSBEnableErrorLogBit)
-	};
-	
-	
-	/* Kernel Tracepoints
-	 *
-	 * Kernel tracepoints are a logging mechanism reduces the size of a log-laden binary.
-	 * Codes are placed into a buffer, from the kernel, and picked up by a userspace
-	 * tool that displays a unique log message for each tracepoint. Additionally, each
-	 * tracepoint may contain up-to four 32-bit (may change with LP64) arguments. 
-	 *
-	 * To add a tracepoint, use the code below as an example:
-	 * USBTrace( kUSBTController, kTPControllerStart, (uintptr_t)myArgValue );
-	 * Next, add the corresponding tracepoint code in the USBTracer tool, using
-	 * the existing examples. Avoid using confidential information in the log strings.
-	 * Some functions have a argument counter, to signify which of the function's tracepoints
-	 * are actually being logged. When adding a tracepoint using an existing code, you
-	 * must verify that you increment this argument counter properly.
-	 *
-	 * The trace codes consist of the following:
-	 *
-	 * ----------------------------------------------------------------------
-	 *| Class (8)      | SubClass (8)   | USBGroup(6) | Code (8)    |Func   |
-	 *| DBG_IOKIT      | DBG_IOUSB      |             |             |Qual(2)|
-	 * ----------------------------------------------------------------------
-	 *
-	 * DBG_IOKIT(05h)  DBG_IOUSB(2Dh)
-	 *
-	 * See <sys/kdebug.h> and IOTimeStamp.h for more details.
-	 */
-	
-	
-	// USB groupings (max of 64)
-	enum
-	{
-		// Family groupings
-		kUSBTController				= 0,
-		kUSBTControllerUserClient	= 1,
-		
-		kUSBTDevice					= 2,
-		kUSBTDeviceUserClient		= 3,
-
-		kUSBTHub					= 4,
-		kUSBTHubPort				= 5,
-		kUSBTHSHubUserClient		= 6,
-		kUSBTHID					= 7,
-		kUSBTPipe					= 8,
-
-		kUSBTInterfaceUserClient	= 9,
-		
-		kUSBTEnumeration				= 10,		// Tracepoints in various components to debug USB enumeration
-
-		
-		// UIM groupings
-		kUSBTUHCI					= 11,
-		kUSBTUHCIUIM				= 12,
-		kUSBTUHCIInterrupts			= 13,
-
-		kUSBTOHCI					= 14,
-		kUSBTOHCIInterrupts			= 15,
-		
-		kUSBTEHCI					= 20,
-		kUSBTEHCIHubInfo			= 22,
-		kUSBTEHCIInterrupts			= 23,
-		
-		// 30-33 reserved
-
-		// 21-25 reserved
-		kUSBTHubPolicyMaker			= 35,
-		kUSBTCompositeDriver		= 36,
-		
-		// Actions
-		kUSBTOutstandingIO			= 42,
-
-		// kUSBAudio
-		kUSBAudio					= 50
-
-		// 61-63 reserved
-	};
-	
-	// USB Controller Tracepoints		0x052D0000 - 0x052D03FF
-	// kUSBTController
-	enum
-	{
-		kTPControllerStart							= 1,
-		kTPControllerControlPacketHandler			= 2,
-		kTPControllerMakeDevice						= 3,
-		kTPControllerMakeHubDevice					= 4,
-		kTPControllerCreateRootHubDevice			= 5,
-		kTPControllerClearTTHandler					= 6,
-		kTPControllerClearTT						= 7,
-		kTPControllerDoCreateEP						= 8,
-		kTPControllerReadV2							= 9,
-		kTPControllerReturnIsochDoneQueue			= 10,
-		kTPControllersetPowerState					= 11,
-		kTPControllerCheckPowerModeBeforeGatedCall	= 12,
-		kTPControllerGatedPowerChange				= 13,
-		kTPControllerCheckForRootHubChanges			= 14,
-		kTPControllerRootHubQueueInterruptRead		= 15,
-		kTPControllerRootHubTimer					= 16,
-		kTPControllerDisjointCompletion				= 17,
-		kTPControllerCheckForDisjointDescriptor		= 18,
-		kTPControllerRead							= 19,
-		kTPControllerV3Start						= 20,
-		kTPAllocatePowerStateArray					= 21,
-		kTPInitForPM								= 22,
-		kTPIsocIOLL									= 23,
-		kTPIsocIO									= 24,
-		kTPControllerWrite							= 25,
-		kTPCompletionCall							= 26,
-		kTPControlTransaction						= 27,
-		kTPInterruptTransaction						= 28,
-		kTPInterruptTransactionData					= 29,
-		kTPBulkTransaction							= 30,
-		kTPBulkTransactionData						= 31,
-		kTPIsocTransaction							= 32,
-		kTPInterruptPacketHandler					= 33,
-		kTPBulkPacketHandler						= 34,
-		kTPDevZeroLock								= 35,
-		kTPControlPacketHandlerData					= 36,
-		kTPDoIOTransferIntrSync						= 37,
-		kTPDoIOTransferBulkSync						= 38,
-		kTPBulkPacketHandlerData					= 39,
-		kTPInterruptPacketHandlerData				= 40
-	};
-	
-	// USB Device Tracepoints			
-	// kUSBTDevice
-	enum
-	{
-		kTPDeviceInit								= 1,
-		kTPDeviceMessage							= 2,
-		kTPDeviceResetDevice						= 3,
-		kTPDeviceGetFullConfigurationDescriptor		= 4,
-		kTPDeviceGetDeviceDescriptor				= 5,
-		kTPDeviceGetConfigDescriptor				= 6,
-		kTPDeviceSetConfiguration					= 7,
-		kTPDeviceSetFeature							= 8,
-		kTPDeviceDeviceRequest						= 9,
-		kTPDeviceGetConfiguration					= 10,
-		kTPDeviceGetDeviceStatus					= 11,
-		kTPDeviceSuspendDevice						= 12,
-		kTPDeviceReEnumerateDevice					= 13,
-		kTPDeviceConfigLock							= 14
-	};
-	
-	// USB Pipe Tracepoints			
-	// kUSBTPipe
-	enum
-	{
-		kTPPipeInitToEndpoint						= 1,
-		kTPBulkPipeRead								= 2,
-		kTPBulkPipeWrite							= 3,
-		kTPIsocPipeRead								= 4,
-		kTPIsocPipeWrite							= 5,
-		kTPIsocPipeReadLL							= 6,
-		kTPIsocPipeWriteLL							= 7,
-		kTPIBulkReadTS								= 8,
-		kTPPipeControlRequest						= 9,
-		kTPPipeControlRequestMemDesc				= 10
-	};
-	
-	
-	// USB kUSBTControllerUserClient Tracepoints			
-	// kUSBTControllerUserClient
-	enum
-	{
-		kTPControllerUCStart					= 1,
-		kTPControllerUCOpen						= 2,
-		kTPControllerUCReadRegister				= 3,
-		kTPControllerUCWriteRegister			= 4
-	};
-	
-	// USB kUSBTDeviceUserClient Tracepoints			
-	// kUSBTDeviceUserClient
-	enum
-	{
-		kTPDeviceUCDeviceRequestIn				= 1,
-		kTPDeviceUCDeviceRequestOut				= 2,
-		kTPDeviceUCChangeOutstandingIO			= 3,
-		kTPDeviceUCGetGatedOutstandingIO		= 4,
-		kTPDeviceUCReqComplete					= 5
-	};
-	
-	// USB InterfaceUserClient Tracepoints			
-	// kUSBTInterfaceUserClient
-	enum
-	{
-		kTPInterfaceUCReadPipe					= 1,
-		kTPInterfaceUCWritePipe					= 2,
-		kTPInterfaceUCControlRequestOut			= 3,
-		kTPInterfaceUCControlRequestIn			= 4,
-		kTPInterfaceUCDoIsochPipeAsync			= 5,
-		kTPInterfaceUCLowLatencyPrepareBuffer	= 6,
-		kTPInterfaceUCChangeOutstandingIO		= 7,
-		kTPInterfaceUCReqComplete				= 8,
-		kTPInterfaceUCIsoReqComplete			= 9,
-		kTPInterfaceUCLLIsoReqComplete			= 10
-	};
-	
-	
-	// USB HSHubUserClient Tracepoints			
-	// kUSBTHSHubUserClient
-	enum
-	{
-		kTPHSHubUCInitWithTask					= 1,
-		kTPHSHubUCStart							= 2,
-		kTPHSHubUCClose							= 3,
-		kTPHSHubUCGetNumberOfPorts				= 4,
-		kTPHSHubUCGetLocationID					= 5,
-		kTPHSHubUCPutPortIntoTestMode			= 6,
-		kTPHSHubUCSupportsIndicators			= 7,
-		kTPHSHubUCSetIndicatorForPort			= 8,
-		kTPHSHubUCGetPortIndicatorControl		= 9,
-		kTPHSHubUCSetIndicatorsToAutomatic		= 10,
-		kTPHSHubUCGetPowerSwitchingMode			= 11,
-		kTPHSHubUCGetPortPower					= 12,
-		kTPHSHubUCSetPortPower					= 13,
-		kTPHSHubUCDisablePwrMgmt				= 14
-	};
-	
-	// USB Hub Tracepoints			
-	// kUSBTHub
-	enum
-	{
-		kTPHubStart								= 1,
-		kTPHubMessage							= 2,
-		kTPHubWillTerminate						= 3,
-		kTPHubPowerStateWillChangeTo			= 4,
-		kTPHubPowerChangeDone					= 5,
-		kTPHubConfigureHub						= 6,
-		kTPHubCheckPowerPowerRequirements		= 7,
-		kTPHubHubPowerChange					= 8,
-		kTPHubAreAllPortsDisconnectedOrSuspended= 9,
-		kTPHubSuspendPorts						= 10,
-		kTPHubSetPortFeature					= 11,
-		kTPHubClearPortFeature					= 12,
-		kTPHubDoPortAction						= 13,
-		kTPHubInterruptReadHandler				= 14,
-		kTPHubResetPortZero						= 15,
-		kTPHubProcessStateChanged				= 16,
-		kTPHubRearmInterruptRead				= 17,
-		kTPHubDoDeviceRequest					= 18,
-		kTPHubWaitForPortResumes				= 19,
-		kTPHubResetMyPort						= 20,
-		kTPHubDecrementOutstandingIO			= 21,
-		kTPHubChangeOutstandingIO				= 22, 
-		kTPHubChangeRaisedPowerState			= 23,
-		kTPHubChangeOutstandingResumes			= 24,
-		kTPHubEnterTestMode						= 25,
-		kTPHubLeaveTestMode						= 26,
-		kTPHubPutPortIntoTestMode				= 27,
-		kTPHubGetPortIndicatorControl			= 28,
-		kTPHubSetIndicatorsToAutomatic			= 29,
-		kTPHubGetPortPower						= 30,
-		kTPHubEnsureUsability					= 31,
-		kTPHubCheckPowerRequirements			= 32,
-		kTPHubWaitForPowerOn					= 33,
-		kTPHubDoPortActionLock					= 34,
-		kTPHubCheckForDeadDevice				= 35
-	};
-	
-	// USB HubPort Tracepoints			
-	// kUSBTHubPort
-	enum
-	{
-		kTPHubPortStop								= 1,
-		kTPHubPortAddDevice							= 2,
-		kTPHubPortSuspendPort						= 3,
-		kTPHubPortFatalError						= 4,
-		kTPHubPortAddDeviceResetChangeHandler		= 5,
-		kTPHubPortHandleResetPortHandler			= 6,
-		kTPHubPortDefaultOverCrntChangeHandler		= 7,
-		kTPHubPortDefaultConnectionChangeHandler	= 8,
-		kTPHubPortReleaseDevZeroLock				= 9,
-		kTPHubPortDetachDevice						= 10,
-		kTPHubPortGetDevZeroDescriptorWithRetries	= 11,
-		kTPHubPortDisplayOverCurrentNotice			= 12,
-		kTPHubPortWakeSuspendCommand				= 13,
-		kTPHubPortWaitForSuspendCommand				= 14,
-		kTPHubPortEnablePowerAfterOvercurrent		= 15
-	};
-	
-	// USB HID Tracepoints			
-	// kUSBTHID
-	enum
-	{
-		kTPHIDStart							= 1,
-		kTPHIDpowerStateWillChangeTo		= 2,
-		kTPHIDsetPowerState					= 3,
-		kTPHIDpowerStateDidChangeTo			= 4,
-		kTPHIDpowerChangeDone				= 5,
-		kTPHIDhandleStart					= 6,
-		kTPHIDClearFeatureEndpointHalt		= 7,
-		kTPHIDHandleReport					= 8,
-		kTPHIDSuspendPort					= 9,
-		kTPHIDAbortAndSuspend				= 10,
-		kTPHIDClaimPendingRead				= 11,
-		kTPHIDChangeOutstandingIO			= 12,
-		kTPHIDRearmInterruptRead			= 13,
-		kTPHIDInitializeUSBHIDPowerManagement = 14,
-		kTPHIDInterruptRead					= 15,
-		kTPHIDInterruptReadError			= 16,
-		kTPHIDCheckForDeadDevice			= 17
-	};
-	
-	// USB Enumeration Tracepoints			
-	// kUSBTEnumeration
-	enum
-	{
-		kTPEnumerationProcessStatusChanged	= 1,
-		kTPEnumerationInitialGetPortStatus	= 2,
-		kTPEnumerationCallAddDevice			= 3,
-		kTPEnumerationAddDevice				= 4,
-		kTPEnumerationResetPort				= 5,
-		kTPEnumerationAddDeviceResetChangeHandler	= 6,
-		kTPEnumerationRegisterService		= 7,
-		kTPEnumerationLowSpeedDevice		= 8,
-		kTPEnumerationFullSpeedDevice		= 9
-		
-	};
-	
-	// USB UHCI Tracepoints			
-	// kUSBTUHCI
-	enum
-	{
-		kTPUHCIMessage						= 1,
-		kTPUHCIGetFrameNumber				= 2,
-		kTPUHCIScavengeIsocTransactions		= 3,
-		kTPUHCIScavengeQueueHeads			= 4,
-		kTPUHCIAllocateQH					= 5,
-		kTPUHCIRootHubStatusChange			= 6,
-		kTPUHCIRHSuspendPort				= 7,
-		kTPUHCIRHHoldPortReset				= 8,
-		kTPUHCIRHResumePortCompletion		= 9,
-		kTPUHCISuspendController			= 10,
-		KTPUHCIResumeController				= 11,
-		KTPUHCIResetControllerState			= 12,
-		KTPUHCIRestartControllerFromReset	= 13,
-		KTPUHCIEnableInterrupts				= 14,
-		KTPUHCIDozeController				= 15,
-		KTPUHCIWakeFromDoze					= 16,
-		KTPUHCIPowerState					= 17,
-	};
-
-	
-	// USB UHCI Tracepoints			
-	// kUSBTUHCIUIM
-	enum
-	{
-		kTPUHCIUIMCreateControlEndpoint		= 1,
-		kTPUHCIUIMCreateBulkEndpoint		= 2,
-		kTPUHCIUIMCreateInterruptEndpoint	= 3,
-		kTPUHCIUIMCreateIsochEndpoint		= 4,
-		kTPUHCIUIMCreateIsochTransfer		= 5,
-		kTPUHCIUIMDeleteEndpoint			= 6,
-		kTPUHCIUIMUnlinkQueueHead			= 7,
-		kTPUHCIUIMCheckForTimeouts			= 8,
-		kTPUHCIUIMReturnOneTransaction		= 9,
-		kTPUHCIUIMAllocateTDChain			= 10,
-		kTPUHCIUIMAddIsochFramesToSchedule	= 11,
-		kTPUHCIUIMAbortIsochEP				= 12,
-		kTPUHCIUIMCreateInterruptTransfer	= 13,
-		kTPUHCIUIMHandleEndpointAbort		= 14
-	};
-	
-	// USB UHCI Interrupt Tracepoints			
-	// kUSBTUHCIInterrupts
-	enum
-	{
-		kTPUHCIInterruptsGetFrameNumberInternal	= 1,
-		kTPUHCIInterruptsFilterInterrupt		= 2,
-		kTPUHCIInterruptsHandleInterrupt		= 3,
-		kTPUHCIUpdateFrameList					= 4
-	};
-	
-	// USB EHCI Tracepoints			
-	// kUSBTEHCI
-	enum
-	{
-		kTPEHCIRootHubResetPort					= 1,
-		kTPEHCIRootHubPortEnable				= 2,
-		kTPEHCIRootHubPortSuspend				= 3,
-		// kTPEHCIRootHubStatusChange			= 4,
-		kTPEHCIRHResumePortCompletion			= 5,
-		kTPEHCIUIMFinalize						= 6,
-		kTPEHCIGetFrameNumber32					= 7, 
-		kTPEHCIGetFrameNumber					= 8,
-		kTPEHCIAllocateQH						= 9,
-		kTPEHCIEnableAsyncSchedule				= 10,
-		kTPEHCIDisableAsyncSchedule				= 11,
-		kTPEHCIEnablePeriodicSchedule			= 12,
-		kTPEHCIDisablePeriodicSchedule			= 13,
-		kTPEHCIMessage							= 14,
-		kTPEHCIMakeEmptyEndPoint				= 15,
-		kTPEHCIAllocateTDs						= 16,
-		kTPEHCIMungeECHIStatus					= 17,
-		kTPEHCIScavengeIsocTransactions			= 18,
-		kTPEHCIScavengeAnEndpointQueue			= 19,
-		kTPEHCIScavengeCompletedTransactions	= 20,
-		kTPEHCICreateBulkEndpoint				= 21,
-		kTPEHCICreateBulkTransfer				= 22,
-
-		kTPEHCICreateInterruptEndpoint			= 24,
-		kTPEHCICreateIsochEndpoint				= 25,
-		kTPEHCIAbortIsochEP						= 26,
-		kTPEHCIHandleEndpointAbort				= 27,
-		kTPEHCICreateInterruptTransfer			= 28,
-		kTPEHCIUnlinkAsyncEndpoint				= 29,
-		kTPEHCIDeleteEndpoint					= 30,
-		kTPEHCICreateHSIsochTransfer			= 31,
-		kTPEHCICreateSplitIsochTransfer			= 32,
-		kTPEHCICreateIsochTransfer				= 33,
-		kTPEHCIAddIsocFramesToSchedule			= 34,
-		kTPEHCIReturnOneTransaction				= 35,
-		kTPEHCICheckEDListForTimeouts			= 36,
-		kTPEHCISuspendUSBBus					= 37,
-		kTPEHCICheckForTimeouts					= 38,
-		kTPEHCIResumeUSBBus						= 39,
-		kTPEHCIRestartUSBBus					= 40,
-		kTPEHCIResetControllerState				= 41,
-		kTPEHCIDozeController					= 42,
-		kTPEHCIWakeControllerFromDoze			= 43,
-		kTPEHCIEnableInterrupts					= 44,
-		kTPEHCIPowerState						= 45,
-		kTPEHCIStopUSBBus						= 46,
-		kTPEHCIRestartControllerFromReset		= 47
-	};
-
-	// USB EHCI Interrupt Tracepoints			
-	// kUSBTEHCIInterrupts
-	enum
-	{
-		kTPEHCIInterruptsPollInterrupts			= 1,
-		kTPEHCIInterruptsPrimaryInterruptFilter	= 2,
-		kTPEHCIUpdateFrameList					= 3,
-	};
-	
-	
-	// USB EHCI Interrupt Tracepoints			
-	// kUSBTEHCIHubInfo
-	enum
-	{
-		kTPEHCIAvailableIsochBandwidth			= 1,
-		kTPEHCIAllocateIsochBandwidth			= 2
-	};
-	
-	// USB OHCI Tracepoints			
-	// kUSBTOHCI
-	enum
-	{
-		kTPOHCIInitialize						= 1,
-		kTPOHCICreateGeneralTransfer			= 2,
-		kTPOHCIAbortEndpoint					= 3,
-		kTPOHCIDeleteEndpoint					= 4,
-		kTPOHCIEndpointStall					= 5,
-		kTPOHCICreateIsochTransfer				= 6,
-		kTPOHCIAllocateTD						= 7,
-		kTPOHCIAllocateITD						= 8,
-		kTPOHCIAllocateED						= 9,
-		kTPOHCIProcessCompletedITD				= 10,
-		kTPOHCIReturnTransactions				= 11,
-		kTPOHCIMessage							= 12,
-		KTPOHCISuspendUSBBus					= 13,
-		KTPOHCIResumeUSBBus						= 14,
-		KTPOHCIResetControllerState				= 15,
-		KTPOHCIRestartControllerFromReset		= 16,
-		KTPOHCIEnableInterrupts					= 17,
-		KTPOHCIDozeController					= 18,
-		KTPOHCIWakeControllerFromDoze			= 19,
-		KTPOHCIPowerState						= 20,
-		kTPOHCIDoneQueueCompletion				= 21
-	};
-		
-	// USB OHCI Interrupt Tracepoints			
-	// kUSBTOHCIInterrupts
-	enum
-	{
-		kTPOHCIInterruptsPollInterrupts			= 1,
-		kTPOHCIInterruptsPrimaryInterruptFilter	= 2,
-		kTPOHCIUpdateFrameList					= 3
-	};
-	
-
-	// USB HubPolicyMaker Tracepoints			
-	// kUSBTHubPolicyMaker
-	enum
-	{
-		kTPSetPowerState						 = 1
-	};
-	
-	// USB CompositeDriver Tracepoints			
-	// kUSBTCompositeDriver
-	enum
-	{
-		kTPCompositeDriverConfigureDevice		 = 1
-	};
-
-	// USB USB OutstandingIO Tracepoints			
-	// kUSBTOutstandingIO
-	enum
-	{
-		kTPDeviceUCDecrement	= 1,
-		kTPDeviceUCIncrement	= 2,
-		kTPInterfaceUCDecrement	= 3,
-		kTPInterfaceUCIncrement	= 4,
-		kTPHubDecrement			= 5,
-		kTPHubIncrement			= 6,
-		kTPHIDDecrement			= 7,
-		kTPHIDIncrement			= 8
-	};
-	
-	// USB Audio driver Tracepoints			
-	// kUSBAudio
-	enum
-	{
-		kTPAudioDriverRead						= 1,
-		kTPAudioDriverCoalesceInputSamples		= 2,
-		kTPAudioDriverCoalesceError				= 3,
-		kTPAudioDriverCoalesce					= 4,
-		kTPAudioDriverReadHandler				= 5,
-		kTPAudioDriverCoalesceError2			= 6,
-		kTPAudioDriverConvertInputSamples		= 7
-	};
-	
-	// Tracepoint macros.
-#define USB_TRACE(USBClass, code, funcQualifier)	( ( ( DBG_IOKIT & 0xFF ) << 24) | ( ( DBG_IOUSB & 0xFF ) << 16 ) | ( ( USBClass & 0x3F ) << 10 ) | ( ( code & 0xFF ) << 2 ) | ( funcQualifier & 0x3 ) )
-
-#define kTPAllUSB								USB_TRACE ( 0, 0, 0 )
-
-#define USB_CONTROLLER_TRACE(code)				USB_TRACE( kUSBTController, code, DBG_FUNC_NONE )
-#define USB_CONTROLLER_UC_TRACE(code)			USB_TRACE( kUSBTControllerUserClient, code, DBG_FUNC_NONE )
-#define USB_DEVICE_TRACE(code)					USB_TRACE( kUSBTDevice, code, DBG_FUNC_NONE )
-#define USB_DEVICE_UC_TRACE(code)				USB_TRACE( kUSBTDeviceUserClient, code, DBG_FUNC_NONE )
-
-#define USB_HUB_TRACE(code)						USB_TRACE( kUSBTHub, code, DBG_FUNC_NONE )
-#define USB_HUB_PORT_TRACE(code)				USB_TRACE( kUSBTHubPort, code, DBG_FUNC_NONE )
-#define USB_HUB_UC_TRACE(code)					USB_TRACE( kUSBTHSHubUserClient, code, DBG_FUNC_NONE )
-#define USB_HID_TRACE(code)						USB_TRACE( kUSBTHID, code, DBG_FUNC_NONE )
-#define USB_PIPE_TRACE(code)					USB_TRACE( kUSBTPipe, code, DBG_FUNC_NONE )
-
-#define USB_INTERFACE_UC_TRACE(code)			USB_TRACE( kUSBTInterfaceUserClient, code, DBG_FUNC_NONE )
-
-#define USB_ENUMERATION_TRACE(code)				USB_TRACE( kUSBTEnumeration, code, DBG_FUNC_NONE )
-
-#define USB_UHCI_TRACE(code)					USB_TRACE( kUSBTUHCI, code, DBG_FUNC_NONE )
-#define USB_UHCI_UIM_TRACE(code)				USB_TRACE( kUSBTUHCIUIM, code, DBG_FUNC_NONE )
-#define USB_UHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTUHCIInterrupts, code, DBG_FUNC_NONE )
-
-#define USB_OHCI_TRACE(code)					USB_TRACE( kUSBTOHCI, code, DBG_FUNC_NONE )
-#define USB_OHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTOHCIInterrupts, code, DBG_FUNC_NONE )
-
-#define USB_EHCI_TRACE(code)					USB_TRACE( kUSBTEHCI, code, DBG_FUNC_NONE )
-#define USB_EHCI_HUBINFO_TRACE(code)			USB_TRACE( kUSBTEHCIHubInfo, code, DBG_FUNC_NONE )
-#define USB_EHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTEHCIInterrupts, code, DBG_FUNC_NONE )
-
-#define USB_HUB_POLICYMAKER_TRACE(code)			USB_TRACE( kUSBTHubPolicyMaker, code, DBG_FUNC_NONE )
-#define USB_COMPOSITE_DRIVER_TRACE(code)		USB_TRACE( kUSBTCompositeDriver, code, DBG_FUNC_NONE )
-
-#define USB_OUTSTANDING_IO_TRACE(code)			USB_TRACE( kUSBTOutstandingIO, code, DBG_FUNC_NONE )	
-	
-#define USB_AUDIO_DRIVER_TRACE(code)			USB_TRACE( kUSBAudio, code, DBG_FUNC_NONE )	
-
-#ifdef KERNEL
-	
-#include <IOKit/IOTimeStamp.h>
-		
-#define USBTrace(USBClass, code, a, b, c, d) {														\
-			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
-				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_NONE), a, b, c, d );		\
-			}																						\
-		}
-
-#define USBTrace_Start(USBClass, code, a, b, c, d) {												\
-			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
-				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_START), a, b, c, d );		\
-			}																						\
-		}
-
-#define USBTrace_End(USBClass, code, a, b, c, d) {														\
-			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
-				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_END), a, b, c, d );			\
-			}																						\
-		}
-
-#endif
-	
-	
-	
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif	/* __IOKIT_IO_USB_FAMILY_TRACEPOINTS__ */
diff --git a/i386/include/IOKit/usb/IOUFIStorageServices.h b/i386/include/IOKit/usb/IOUFIStorageServices.h
deleted file mode 100644
index cac43f4..0000000
--- a/i386/include/IOKit/usb/IOUFIStorageServices.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-
-#ifndef _IOKIT_UFI_STORAGE_SERVICES_H_
-#define _IOKIT_UFI_STORAGE_SERVICES_H_
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/storage/IOBlockStorageDevice.h>
-#include <IOKit/usb/IOUSBMassStorageUFISubclass.h>
-
-
-class IOUFIStorageServices : public IOBlockStorageDevice
-{
-	
-	OSDeclareDefaultStructors ( IOUFIStorageServices )
-
-private:
-	bool							fMediaChanged;
-	bool							fMediaPresent;
-
-protected:
-	
-    IOUSBMassStorageUFIDevice *		fProvider;
-
-	UInt64							fMaxReadBlocks;
-	UInt64							fMaxWriteBlocks;
-	
-	virtual bool	attach ( IOService * provider );
-	virtual void	detach ( IOService * provider );
-	
-    // Reserve space for future expansion.
-    struct IOUFIStorageServicesExpansionData { };
-    IOUFIStorageServicesExpansionData *fIOUFIStorageServicesReserved;
-	
-public:
-
-	virtual IOReturn 	message ( UInt32 type, IOService * provider, void * argument );
-
-	static void 		AsyncReadWriteComplete ( void * 			clientData,
-                                				 IOReturn			status,
-                                				 UInt64 			actualByteCount );
-
-    // Deprecated
-    virtual IOReturn    doAsyncReadWrite (	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks,
-											IOStorageCompletion		completion );
-                                            
-	virtual IOReturn	doAsyncReadWrite (  IOMemoryDescriptor *    buffer,
-                                            UInt64                  block, 
-                                            UInt64                  nblks,
-                                            IOStorageAttributes *   attributes,
-                                            IOStorageCompletion *   completion );
-
-	virtual IOReturn	doSyncReadWrite ( 	IOMemoryDescriptor *	buffer,
-											UInt32					block,
-											UInt32					nblks );
-
-    virtual IOReturn	doEjectMedia ( void );
-
-    virtual IOReturn	doFormatMedia ( UInt64 byteCapacity );
-
-    virtual UInt32		doGetFormatCapacities ( UInt64 *	capacities,
-    											UInt32		capacitiesMaxCount ) const;
-
-    virtual IOReturn	doLockUnlockMedia ( bool doLock );
-
-    virtual IOReturn	doSynchronizeCache ( void );
-        
-    virtual char *		getVendorString ( void );
-    
-    virtual char *		getProductString ( void );
-    
-    virtual char *		getRevisionString ( void );
-    
-    virtual char *		getAdditionalDeviceInfoString ( void );
-    
-    virtual IOReturn	reportBlockSize ( UInt64 * blockSize );
-    
-    virtual IOReturn	reportEjectability ( bool * isEjectable );
-    
-    virtual IOReturn	reportLockability ( bool * isLockable );
-    
-    virtual IOReturn	reportMediaState ( bool * mediaPresent, bool * changed );
-    
-    virtual IOReturn	reportPollRequirements ( 	bool * pollIsRequired,
-    												bool * pollIsExpensive );
-    
-    virtual IOReturn	reportMaxValidBlock ( UInt64 * maxBlock );
-    
-    virtual IOReturn	reportRemovability ( bool * isRemovable );
-    
-    virtual IOReturn	reportWriteProtection ( bool * isWriteProtected );
-
-    virtual IOReturn	getWriteCacheState ( bool * enabled );
-	
-	virtual IOReturn	setWriteCacheState ( bool enabled );
-    
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 1 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 2 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 3 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 4 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 5 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 6 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 7 );
-    OSMetaClassDeclareReservedUnused( IOUFIStorageServices, 8 );
-
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_UFI_STORAGE_SERVICES_H_ */
diff --git a/i386/include/IOKit/usb/IOUSBBus.h b/i386/include/IOKit/usb/IOUSBBus.h
deleted file mode 100644
index a42191a..0000000
--- a/i386/include/IOKit/usb/IOUSBBus.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBBUS_H
-#define _IOKIT_IOUSBBUS_H
-
-#include <IOKit/IOService.h>
-
-class IOUSBBus : public IOService
-{
-    OSDeclareAbstractStructors(IOUSBBus)
-};
-
-#endif /* ! _IOKIT_IOUSBBUS_H */
-
diff --git a/i386/include/IOKit/usb/IOUSBCommand.h b/i386/include/IOKit/usb/IOUSBCommand.h
deleted file mode 100644
index 0f7c36b..0000000
--- a/i386/include/IOKit/usb/IOUSBCommand.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBCOMMAND_H
-#define _IOKIT_IOUSBCOMMAND_H
-
-#include <IOKit/IOCommand.h>
-#include <IOKit/IOCommandPool.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IODMACommand.h>
-#include <IOKit/usb/USB.h>
-
-/*
- * USB Command
- * This is the command block for a USB command to be queued on the
- * Command Gate of the WorkLoop.  Although the actual work of creating
- * the command and enqueueing it is done for them via the deviceRequest,
- * read, and write methods, this is the primary way that devices will get
- * work done.
- * Note: This is private to IOUSBController and should be moved to a
- * private header.
- */
-
-typedef enum {
-    DEVICE_REQUEST,						// Device request using pointer
-    READ,
-    WRITE,
-    CREATE_EP,
-    DELETE_EP,
-    DEVICE_REQUEST_DESC,				// Device request using descriptor
-	DEVICE_REQUEST_BUFFERCOMMAND		// Device request using a second IOUSBCommand in _bufferCommand
-} usbCommand;
-
-
-
-/*!
- @class IOUSBCommand
- @abstract A subclass of IOCommand that is used to add USB specific data.
- */
-class IOUSBCommand : public IOCommand
-{
-    OSDeclareAbstractStructors(IOUSBCommand)
-
-protected:
-    usbCommand				_selector;
-    IOUSBDeviceRequestPtr	_request;
-    USBDeviceAddress		_address;
-    UInt8					_endpoint;
-    UInt8					_direction;
-    UInt8					_type;
-    bool					_bufferRounding;
-    IOMemoryDescriptor *	_buffer;
-    IOUSBCompletion			_uslCompletion;
-    IOUSBCompletion			_clientCompletion;
-    UInt32					_dataRemaining;							// For Control transfers
-    UInt8					_stage;									// For Control transfers
-    IOReturn				_status;
-    IOMemoryDescriptor *	_origBuffer;
-    IOUSBCompletion			_disjointCompletion;
-    IOByteCount				_dblBufLength;
-    UInt32					_noDataTimeout;
-    UInt32					_completionTimeout;
-    UInt32					_UIMScratch[10];
-    
-    struct ExpansionData
-    {
-        IOByteCount			_reqCount;
-		IOMemoryDescriptor *_requestMemoryDescriptor;
-		IOMemoryDescriptor *_bufferMemoryDescriptor;
-		bool				_multiTransferTransaction;
-		bool				_finalTransferInTransaction;
-        bool				_useTimeStamp;
-        AbsoluteTime		_timeStamp;
-		bool				_isSyncTransfer;						// Returns true if the command is used for a synchronous transfer
-		IODMACommand		*_dmaCommand;							// used to get memory mapping
-		IOUSBCommand		*_bufferUSBCommand;						// points to another IOUSBCommand used for phase 2 of control transactions
-		IOUSBCommand		*_masterUSBCommand;						// points from the bufferUSBCommand back to the parent command
-    };
-    ExpansionData * 		_expansionData;
-    
-    // we override these OSObject method in order to allocate and release our expansion data
-    virtual bool init();
-    virtual void free();
-
-public:
-
-    // static constructor
-    static IOUSBCommand *	NewCommand(void);
-
-    // Manipulators
-    void					SetSelector(usbCommand sel);
-    void  					SetRequest(IOUSBDeviceRequestPtr req);
-    void  					SetAddress(USBDeviceAddress addr);
-    void  					SetEndpoint(UInt8 ep);
-    void  					SetDirection(UInt8 dir);
-    void  					SetType(UInt8 type);
-    void  					SetBufferRounding(bool br);
-    void  					SetBuffer(IOMemoryDescriptor *buf);
-    void  					SetUSLCompletion(IOUSBCompletion completion);
-    void  					SetClientCompletion(IOUSBCompletion completion);
-    void  					SetDataRemaining(UInt32 dr);
-    void  					SetStage(UInt8 stage);
-    void 					SetStatus(IOReturn stat);
-    void 					SetOrigBuffer(IOMemoryDescriptor *buf);
-    void 					SetDisjointCompletion(IOUSBCompletion completion);
-    void 					SetDblBufLength(IOByteCount len);
-    void 					SetNoDataTimeout(UInt32 to);
-    void 					SetCompletionTimeout(UInt32 to);
-    void 					SetUIMScratch(UInt32 index, UInt32 value);
-    void 					SetReqCount(IOByteCount reqCount);
-    void					SetRequestMemoryDescriptor(IOMemoryDescriptor *requestMemoryDescriptor);
-    void					SetBufferMemoryDescriptor(IOMemoryDescriptor *bufferMemoryDescriptor);
-    void					SetMultiTransferTransaction(bool);
-    void					SetFinalTransferInTransaction(bool);
-    void					SetUseTimeStamp(bool);
-    void					SetTimeStamp(AbsoluteTime timeStamp);
-	void					SetIsSyncTransfer(bool);
-	inline void				SetDMACommand(IODMACommand *dmaCommand)					{ _expansionData->_dmaCommand = dmaCommand; }
-	void					SetBufferUSBCommand(IOUSBCommand *bufferUSBCommand);
-	
-	// Accessors
-    usbCommand					GetSelector(void);
-    IOUSBDeviceRequestPtr		GetRequest(void);
-    USBDeviceAddress			GetAddress(void);
-    UInt8						GetEndpoint(void);
-    UInt8						GetDirection(void);
-    UInt8						GetType(void);
-    bool						GetBufferRounding(void);
-    IOMemoryDescriptor *		GetBuffer(void);
-    IOUSBCompletion				GetUSLCompletion(void);
-    IOUSBCompletion				GetClientCompletion(void);
-    UInt32						GetDataRemaining(void);
-    UInt8						GetStage(void);
-    IOReturn					GetStatus(void);
-    IOMemoryDescriptor *		GetOrigBuffer(void);
-    IOUSBCompletion				GetDisjointCompletion(void);
-    IOByteCount					GetDblBufLength(void);
-    UInt32						GetNoDataTimeout(void);
-    UInt32						GetCompletionTimeout(void);
-    UInt32						GetUIMScratch(UInt32 index);
-    IOByteCount					GetReqCount(void);
-    IOMemoryDescriptor *		GetRequestMemoryDescriptor(void);
-    IOMemoryDescriptor *		GetBufferMemoryDescriptor(void);
-    bool						GetMultiTransferTransaction(void);
-    bool						GetFinalTransferInTransaction(void);
-    bool						GetUseTimeStamp(void);
-    AbsoluteTime				GetTimeStamp(void);
-	bool						GetIsSyncTransfer(void);
-	inline IODMACommand *		GetDMACommand(void)							{return _expansionData->_dmaCommand; }
-	inline IOUSBCommand *		GetBufferUSBCommand(void)					{return _expansionData->_bufferUSBCommand; }
-};
-
-
-class IOUSBIsocCommand : public IOCommand
-{
-    OSDeclareAbstractStructors(IOUSBIsocCommand)
-
-protected:
-    usbCommand				_selector;
-    USBDeviceAddress		_address;
-    UInt8					_endpoint;
-    UInt8					_direction;
-    IOMemoryDescriptor *	_buffer;
-    IOUSBIsocCompletion		_completion;
-    UInt64					_startFrame;
-    UInt32					_numFrames;
-    IOUSBIsocFrame *		_frameList;
-    IOReturn				_status;
-    
-    struct ExpansionData
-    {
-        UInt32				_updateFrequency;
-        bool				_useTimeStamp;
-        AbsoluteTime		_timeStamp;
-		bool				_isSyncTransfer;								// Returns true if the command is used for a synchronous transfer
-		bool				_rosettaClient;
-		IODMACommand *		_dmaCommand;
-		IOUSBIsocCompletion	_uslCompletion;
-		bool				_lowLatency;
-    };
-    ExpansionData * 		_expansionData;
-
-    // we override these OSObject method in order to allocate and release our expansion data
-    virtual bool init();
-    virtual void free();
-
-public:
-    // static constructor
-    static IOUSBIsocCommand *NewCommand(void);
-    
-    // Manipulators
-    void					SetSelector(usbCommand sel)							{_selector = sel; }
-    void					SetAddress(USBDeviceAddress addr)					{_address = addr; }
-    void					SetEndpoint(UInt8 ep)								{_endpoint = ep; }
-    void					SetDirection(UInt8 dir)								{_direction = dir; }
-    void					SetBuffer(IOMemoryDescriptor *buf)					{_buffer = buf; }
-    void					SetCompletion(IOUSBIsocCompletion completion)		{_completion = completion; }
-    void					SetStartFrame(UInt64 sf)							{_startFrame = sf; }
-    void					SetNumFrames(UInt32 nf)								{_numFrames = nf; }
-    void					SetFrameList(IOUSBIsocFrame *fl)					{_frameList = fl; }
-    void					SetStatus(IOReturn stat)							{_status = stat; }
-    void					SetUpdateFrequency( UInt32 fr)						{ _expansionData->_updateFrequency = fr; }
-    void					SetUseTimeStamp(bool useIt)							{ _expansionData->_useTimeStamp= useIt; }
-    void					SetTimeStamp(AbsoluteTime timeStamp)				{ _expansionData->_timeStamp= timeStamp; }
- 	void					SetIsSyncTransfer(bool isSync)						{ _expansionData->_isSyncTransfer = isSync; }
- 	void					SetRosettaClient(bool isRosetta)					{ _expansionData->_rosettaClient = isRosetta; }
- 	void					SetDMACommand(IODMACommand *dmaCommand)				{ _expansionData->_dmaCommand = dmaCommand; }
-    void					SetUSLCompletion(IOUSBIsocCompletion completion)	{ _expansionData->_uslCompletion = completion; }
- 	void					SetLowLatency(bool lowLatency)						{ _expansionData->_lowLatency = lowLatency; }
-
-	// Accessors
-    usbCommand				GetSelector(void)								{ return _selector; }
-    USBDeviceAddress		GetAddress(void)								{ return _address; }
-    UInt8					GetEndpoint(void)								{ return _endpoint; }
-    UInt8					GetDirection(void)								{ return _direction; }
-    IOMemoryDescriptor *	GetBuffer(void)									{ return _buffer; }
-    IOUSBIsocCompletion		GetCompletion(void)								{ return _completion; }
-    UInt64					GetStartFrame(void)								{ return _startFrame; }
-    UInt32					GetNumFrames(void)								{ return _numFrames; }
-    IOUSBIsocFrame *		GetFrameList(void)								{ return _frameList; }
-    UInt32					GetUpdateFrequency(void)						{ return _expansionData->_updateFrequency; }
-    IOReturn				GetStatus(void)									{ return _status; }
-    bool					GetUseTimeStamp(void)							{ return _expansionData->_useTimeStamp; }
-    AbsoluteTime			GetTimeStamp(void)								{ return _expansionData->_timeStamp; }
-	bool					GetIsSyncTransfer(void)							{ return _expansionData->_isSyncTransfer; }
-	bool					GetIsRosettaClient(void)						{ return _expansionData->_rosettaClient; }
-	IODMACommand *			GetDMACommand(void)								{ return _expansionData->_dmaCommand; }
-    IOUSBIsocCompletion		GetUSLCompletion(void)							{ return _expansionData->_uslCompletion; }
-	bool					GetLowLatency(void)								{ return _expansionData->_lowLatency; }
-};
-
-class IOUSBCommandPool : public IOCommandPool
-{
-    OSDeclareDefaultStructors( IOUSBCommandPool )
-	
-protected:
-    virtual IOReturn gatedReturnCommand(IOCommand * command);
-	virtual IOReturn gatedGetCommand(IOCommand ** command, bool blockForCommand);
-	
-public:
-    static IOCommandPool * withWorkLoop(IOWorkLoop * inWorkLoop);
-};
-
-
-#endif
-
diff --git a/i386/include/IOKit/usb/IOUSBCompositeDriver.h b/i386/include/IOKit/usb/IOUSBCompositeDriver.h
deleted file mode 100644
index ef72cf4..0000000
--- a/i386/include/IOKit/usb/IOUSBCompositeDriver.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1998-2006 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBCompositeDriver_H
-#define _IOKIT_IOUSBCompositeDriver_H
-
-//================================================================================================
-//
-//   Headers
-//
-//================================================================================================
-//
-#include <libkern/OSByteOrder.h>
-#include <IOKit/IOLib.h>
-#include <IOKit/IONotifier.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOMessage.h>
-#include <IOKit/usb/IOUSBBus.h>
-#include <IOKit/usb/IOUSBDevice.h>
-#include <IOKit/usb/IOUSBInterface.h>
-#include <IOKit/usb/IOUSBLog.h>
-#include <IOKit/usb/USB.h>
-
-
-//================================================================================================
-//
-//   Class Declaration for IOUSBCompositeDriver
-//
-//================================================================================================
-//
-/*!
- @class IOUSBCompositeDriver
- @abstract Driver that matches to USB composite devices.
- @discussion This class can be overriden to provide for specific behaviors.  The driver itself essentially
- just calls SetConfiguration().
- */
-class IOUSBCompositeDriver : public IOService
-{
-    OSDeclareDefaultStructors(IOUSBCompositeDriver)
-    
-    IOUSBDevice	* 	fDevice;
-    IONotifier * 	fNotifier;
-    bool		fExpectingClose;
-    UInt8               fConfigValue;
-    UInt8               fConfigbmAttributes;
-    
-    struct IOUSBCompositeDriverExpansionData 
-    {
-    };
-    
-    IOUSBCompositeDriverExpansionData * fIOUSBCompositeExpansionData;
-    
-    static IOReturn         CompositeDriverInterestHandler(  void * target, void * refCon, UInt32 messageType, IOService * provider,  void * messageArgument, vm_size_t argSize );
-    
-public:
-        
-		// IOService Methods
-		//
-		virtual bool            start(IOService * provider);
-    virtual IOReturn        message( UInt32 type, IOService * provider,  void * argument = 0 );
-    virtual bool            willTerminate( IOService * provider, IOOptionBits options );
-    virtual bool            didTerminate( IOService * provider, IOOptionBits options, bool * defer );
-    
-    // IOUSBCompositeDriver Methods
-    //
-    virtual bool            ConfigureDevice();
-    virtual IOReturn        ReConfigureDevice();
-    /*!
-		@function SetConfiguration
-     @abstract Call IOUSBDevice to do a SetConfiguration call to the device.
-     @param configValue The desired configuration value.
-     @param startInterfaceMatching A boolean specifying whether IOKit should begin the process of finding
-     matching drivers for the new IOUSBInterface objects.
-     */
-    virtual IOReturn SetConfiguration(UInt8 configValue, bool startInterfaceMatching=true);
-    
-    // Getters
-    //
-    bool                                GetExpectingClose()         { return fExpectingClose; }
-    UInt8                               GetConfigValue()            { return fConfigValue; }
-    UInt8                               GetConfigbmAttributes()     { return fConfigbmAttributes; }
-    IONotifier *                        GetNotifier()               { return fNotifier; }
-	
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  0);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  1);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  2);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  3);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  4);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  5);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  6);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  7);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  8);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver,  9);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 10);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 11);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 12);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 13);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 14);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 15);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 16);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 17);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 18);
-    OSMetaClassDeclareReservedUnused(IOUSBCompositeDriver, 19);
-};
-
-#endif _IOKIT_IOUSBCompositeDriver_H
diff --git a/i386/include/IOKit/usb/IOUSBController.h b/i386/include/IOKit/usb/IOUSBController.h
deleted file mode 100644
index 18940f2..0000000
--- a/i386/include/IOKit/usb/IOUSBController.h
+++ /dev/null
@@ -1,1073 +0,0 @@
-/*
- * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.2 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
- * Please see the License for the specific language governing rights and 
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBCONTROLLER_H
-#define _IOKIT_IOUSBCONTROLLER_H
-
-//================================================================================================
-//
-//   Headers
-//
-//================================================================================================
-//
-#include <libkern/c++/OSArray.h>
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IODeviceMemory.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IOCommandPool.h>
-
-#include <IOKit/usb/USB.h>
-#include <IOKit/usb/USBHub.h>
-#include <IOKit/usb/IOUSBBus.h>
-#include <IOKit/usb/IOUSBNub.h>
-#include <IOKit/usb/IOUSBCommand.h>
-#include <IOKit/usb/IOUSBWorkLoop.h>
-
-
-//================================================================================================
-//
-//   Types and Constants
-//
-//================================================================================================
-//
-enum
-{
-    kErrataCMDDisableTestMode					= (1 << 0),		// turn off UHCI test mode
-    kErrataOnlySinglePageTransfers				= (1 << 1),		// Don't cross page boundaries in a single transfer
-    kErrataRetryBufferUnderruns					= (1 << 2),		// Don't cross page boundaries in a single transfer
-    kErrataLSHSOpti								= (1 << 3),		// Don't cross page boundaries in a single transfer
-    kErrataDisableOvercurrent					= (1 << 4),		// Always set the NOCP bit in rhDescriptorA register
-    kErrataLucentSuspendResume					= (1 << 5),		// Don't allow port suspend at the root hub
-    kErrataNeedsWatchdogTimer					= (1 << 6),		// Use Watchdog timer to reset confused controllers
-    kErrataNeedsPortPowerOff					= (1 << 7),		// Power off the ports and back on again to clear weird status.
-    kErrataAgereEHCIAsyncSched					= (1 << 8),		// needs workaround for Async Sched bug
-    kErrataNECOHCIIsochWraparound				= (1 << 9),		// needs workaround for NEC isoch buffer wraparound problem
-	kErrataNECIncompleteWrite					= (1 << 10),	// needs workaround for NEC bits not sticking (errata IBB-2UE-00030 Jun 23 2005)
-	kErrataICH6PowerSequencing					= (1 << 11),	// needs special power sequencing for early Transition machines
-	kErrataICH7ISTBuffer						= (1 << 12),	// buffer for Isochronous Scheduling Threshold
-	kErrataUHCISupportsOvercurrent				= (1 << 13),	// UHCI controller supports overcurrent detection
-	kErrataNeedsOvercurrentDebounce				= (1 << 14),	// The overcurrent indicator should be debounced by 10ms
-	kErrataSupportsPortResumeEnable				= (1 << 15),	// UHCI has resume enable bits at config address 0xC4
-	kErrataNoCSonSplitIsoch						= (1 << 16),	// MCP79 - split iscoh is a little different
-	kErrataOHCINoGlobalSuspendOnSleep			= (1 << 17),	// when sleeping, do not put the OHCI controller in SUSPEND state. just leave it Operational with suspended downstream ports
-	kErrataMissingPortChangeInt					= (1 << 18),	// sometimes the port change interrupt may be missing
-	kErrataMCP79IgnoreDisconnect				= (1 << 19),	// MCP79 - need to ignore a connect/disconnect on wake
-	kErrataUse32bitEHCI							= (1 << 20)	,	// MCP79 - EHCI should only run with 32 bit DMA addresses
-	kErrataUHCISupportsResumeDetectOnConnect	= (1 << 21),	// UHCI controller will generate a ResumeDetect interrupt while in Global Suspend if a device is plugged in
-	kErrataDontUseCompanionController			= (1 << 22)		// For systems which will end up being EHCI only
-};
-
-enum
-{
-    kUSBWatchdogTimeoutMS = 1000
-};
-
-
-/*!
-    @struct
-    @discussion This table contains the list of errata that are necessary for known problems with particular devices.
-    The format is vendorID, product ID, lowest revisionID needing errata, highest rev needing errata, errataBits.
-    The result of all matches is ORed together, so more than one entry may match.
-    Typically for a given errata a list of revisions that this applies to is supplied.
-     @field vendID      The Vendor ID of the device
-     @field deviceID    Product ID of device
-     @field revisionLo  Lowest product revsion to apply errata to
-     @field revisionHi  Highest product revision to apply errata to
-     @field errata      Bit field flagging which errata to apply to device.
-*/
-
-struct ErrataListEntryStruct
-{
-    UInt16 				vendID;
-    UInt16 				deviceID;
-    UInt16 				revisionLo;
-    UInt16 				revisionHi;
-    UInt32 				errata;
-};
-
-typedef struct ErrataListEntryStruct  ErrataListEntry, *ErrataListEntryPtr;
-
-
-//================================================================================================
-//
-//   Routines used to implement synchronous I/O
-//
-//================================================================================================
-//
-void IOUSBSyncCompletion(void *target, void * parameter, IOReturn status, UInt32 bufferSizeRemaining);
-
-void  IOUSBSyncIsoCompletion(void *target, void * parameter, IOReturn status, IOUSBIsocFrame *pFrames);
-
-
-//================================================================================================
-//
-//   Forward Declarations
-//
-//================================================================================================
-//
-class IOUSBDevice;
-class IOUSBLog;
-class IOUSBHubDevice;
-class IOUSBRootHubDevice;
-class IOMemoryDescriptor;
-
-
-//================================================================================================
-//
-//   IOUSBController Class
-//
-//================================================================================================
-//
-/*!
-    @class IOUSBController
-    @abstract Base class for USB hardware driver
-    @discussion Not many directly useful methods for USB device driver writers,
-    IOUSBDevice, IOUSBInterface and IOUSBPipe provide more useful abstractions.
-    The bulk of this class interfaces between IOKit and the low-level UIM, which is
-    based on the MacOS9 UIM. To impliment a new controller type, subclass
-    IOUSBController and impiment all the "UIM functions". AppleUSBOHCI
-    is an example of this implementing all the functions necessary to drive an
-    OHCI controller.
-*/
-class IOUSBController : public IOUSBBus
-{
-    OSDeclareAbstractStructors(IOUSBController)
-    friend class IOUSBControllerV2;
-    friend class IOUSBControllerV3;
-
-protected:
-
-    IOUSBWorkLoop *			_workLoop;
-    IOCommandGate *			_commandGate;
-    IOUSBRootHubDevice *	_rootHubDevice;
-    UInt32					_devZeroLock;
-    static UInt32			_busCount;
-    static bool				gUsedBusIDs[256];
-    
-    struct ExpansionData 
-    {
-		IOCommandPool		*freeUSBCommandPool;
-		IOCommandPool		*freeUSBIsocCommandPool;
-        IOTimerEventSource	*watchdogUSBTimer;
-        bool				_terminating;
-        bool				_watchdogTimerActive;
-        bool				_pcCardEjected;						// Obsolete
-        UInt32				_busNumber;
-        UInt32				_currentSizeOfCommandPool;
-        UInt32				_currentSizeOfIsocCommandPool;
-        UInt8				_controllerSpeed;					// Controller speed, passed down for splits
-        thread_call_t		_terminatePCCardThread;				// Obsolete
-        bool				_addressPending[128];
-		SInt32				_activeIsochTransfers;				// isochronous transfers in the queue
-		IOService			*_provider;							// common name for our provider
-		bool				_controllerCanSleep;				// true iff the controller is able to support sleep/wake
-		bool				_needToClose;
-		UInt32				_isochMaxBusStall;					// value (in ns) of the maximum PCI bus stall allowed for Isoch..
-    };
-    ExpansionData *_expansionData;
-	
-    // The following methods do not use and upper case initial letter because they are part of IOKit
-    //
-
-public:
-    virtual bool 		init( OSDictionary *  propTable );
-    virtual bool 		start( IOService *  provider );
-    virtual void 		stop( IOService * provider );
-    virtual bool 		finalize(IOOptionBits options);
-    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
-    virtual bool		didTerminate( IOService * provider, IOOptionBits options, bool * defer );
-	
-protected:
-		
-    IOReturn			getNubResources( IOService *  regEntry );
-
-    virtual UInt32 		GetErrataBits(
-                                            UInt16 vendorID, 
-                                            UInt16 deviceID, 
-                                            UInt16 revisionID );    
-    
-
-    static IOReturn 		DoDeleteEP( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoAbortEP( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoClearEPStall( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoCreateEP( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-    static IOReturn 		DoControlTransfer( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoIOTransfer( 
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoIsocTransfer(	
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static IOReturn 		DoLowLatencyIsocTransfer(	
-                                            OSObject *	owner, 
-                                            void *	arg0, 
-                                            void *	arg1, 
-                                            void *	arg2, 
-                                            void *	arg3 );
-                                            
-    static void			ControlPacketHandler( 
-                                                    OSObject *	target,
-                                                    void *	parameter,
-                                                    IOReturn	status,
-                                                    UInt32	bufferSizeRemaining );
-                                                    
-    static void			InterruptPacketHandler(
-                                                    OSObject *	target,
-                                                    void * 	parameter,
-                                                    IOReturn	status,
-                                                    UInt32	bufferSizeRemaining );
-                                                    
-    static void			BulkPacketHandler(
-                                                    OSObject *	target,
-                                                    void * 	parameter,
-                                                    IOReturn	status,
-                                                    UInt32	bufferSizeRemaining );
-
-    static void			IsocCompletionHandler(
-                                                    OSObject *		target,
-                                                    void * 		parameter,
-                                                    IOReturn		status,
-                                                    IOUSBIsocFrame	*pFrames );
-                                                    
-    static void			LowLatencyIsocCompletionHandler(
-                                                    OSObject *		target,
-                                                    void * 		parameter,
-                                                    IOReturn		status,
-                                                    IOUSBLowLatencyIsocFrame	*pFrames );
-                                                    
-    static void			WatchdogTimer(OSObject *target, IOTimerEventSource *sender);
-
-	// Obsolete
-    static void 		TerminatePCCard(OSObject *target);
-
-    static IOReturn		ProtectedDevZeroLock(OSObject *target, void* lock, void *, void *, void*);
-
-
-    USBDeviceAddress		GetNewAddress( void );
-    
-    IOReturn    		ControlTransaction( IOUSBCommand *  command );
-    
-    IOReturn    		InterruptTransaction( IOUSBCommand *  command );
-    
-    IOReturn    		BulkTransaction( IOUSBCommand *	command );
-    
-    IOReturn    		IsocTransaction( IOUSBIsocCommand *  command );
-    
-    IOReturn    		LowLatencyIsocTransaction( IOUSBIsocCommand *  command );
-    
-    void 			FreeCommand( IOUSBCommand *  command );
-
-    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    // Invokes the specified completion action of the request.  If
-    // the completion action is unspecified, no action is taken.
-    void 			Complete(
-                     IOUSBCompletion	completion,
-                     IOReturn		status,
-                     UInt32		actualByteCount = 0 );
-
-    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    // Invokes the specified completion action of the request.  If
-    // the completion action is unspecified, no action is taken.
-    void	CompleteWithTimeStamp (
-                                IOUSBCompletionWithTimeStamp		completion,
-                                IOReturn				status,
-                                UInt32					actualByteCount,
-                                AbsoluteTime				timeStamp);
-
-    
-
-    //
-    // UIM methods
-    //
-
-/*!
-    @function UIMInitialize
-    @abstract UIM function, initialise the controller and UIM data structures.
-*/
-    virtual IOReturn 		UIMInitialize( IOService * provider ) = 0;
-    
-/*!
-    @function UIMFinalize
-    @abstract UIM function, finalise the controller and UIM data structures prior to removal.
-*/
-    virtual IOReturn 		UIMFinalize() = 0;
-
-    // Control
-/*!
-    @function UIMCreateControlEndpoint
-    @abstract UIM function, create a control endpoint for the controller.
-    @param functionNumber  The USB device ID of the device for this endpoint
-    @param endpointNumber  The endpoint number for this endpoint
-    @param maxPacketSize   Maximum packet size of this endpoint
-    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
-*/
-    virtual IOReturn 		UIMCreateControlEndpoint(
-                                                            UInt8	functionNumber,
-                                                            UInt8	endpointNumber,
-                                                            UInt16	maxPacketSize,
-                                                            UInt8	speed) = 0;
-
-/* Note: this function has been superceded. */
-    virtual IOReturn 		UIMCreateControlTransfer(   short		functionNumber,
-                                                            short		endpointNumber,
-                                                            IOUSBCompletion	completion,
-                                                            void *		CBP,
-                                                            bool		bufferRounding,
-                                                            UInt32		bufferSize,
-                                                            short		direction) = 0;
-
-/*!
-    @function UIMCreateControlTransfer
-    @abstract UIM function, Do a transfer on a control endpoint.
-                This method supercedes the method which takes a void * parameter.
-    @param functionNumber  The USB device ID of the device to perform the transaction with
-    @param endpointNumber  The endpoint number for the transaction
-    @param completion      Action to perform when I/O completes
-    @param CBP             Memory descriptor describing the buffer to transfer. Will never describe
-                             memory which has disjoint packets.
-    @param bufferRounding  If true, short packets are OK and do not cause an error
-    @param bufferSize      Size of the data to transfer in the data phase. (C
-    @param direction       Specifies direction and PID for transaction. kUSBIn, KUSBOut (DATA PID) or kUSBSetup (SETUP PID).
-*/
-    virtual IOReturn 		UIMCreateControlTransfer(   short			functionNumber,
-                                                            short			endpointNumber,
-                                                            IOUSBCompletion		completion,
-                                                            IOMemoryDescriptor *	CBP,
-                                                            bool			bufferRounding,
-                                                            UInt32			bufferSize,
-                                                            short			direction) = 0;
-    
-    // Bulk
-/*!
-    @function UIMCreateBulkEndpoint
-    @abstract UIM function, create a bulk endpoint for the controller.
-    @param functionNumber  The USB device ID of the device for this endpoint
-    @param endpointNumber  The endpoint number for this endpoint
-    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
-    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
-    @param maxPacketSize   Maximum packet size of this endpoint
-*/
-    virtual IOReturn 		UIMCreateBulkEndpoint(
-                                                        UInt8		functionNumber,
-                                                        UInt8		endpointNumber,
-                                                        UInt8		direction,
-                                                        UInt8		speed,
-                                                        UInt8		maxPacketSize) = 0;
-
-/* Note: this function has been superceded. */
-    virtual IOReturn 		UIMCreateBulkTransfer(  short			functionNumber,
-                                                        short			endpointNumber,
-                                                        IOUSBCompletion		completion,
-                                                        IOMemoryDescriptor *	CBP,
-                                                        bool			bufferRounding,
-                                                        UInt32			bufferSize,
-                                                        short			direction) = 0;
-
-    // Interrupt
-/*!
-    @function UIMCreateInterruptEndpoint
-    @abstract UIM function, create an interrupt endpoint for the controller.
-    @param functionNumber  The USB device ID of the device for this endpoint
-    @param endpointNumber  The endpoint number for this endpoint
-    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
-    @param speed           speed of the device: kUSBDeviceSpeedLow or kUSBDeviceSpeedFull 
-    @param maxPacketSize   Maximum packet size of this endpoint
-    @param pollingRate     The maximum polling interval from the endpoint descriptor.
-*/
-    virtual IOReturn		UIMCreateInterruptEndpoint(
-                                                                short		functionAddress,
-                                                                short		endpointNumber,
-                                                                UInt8		direction,
-                                                                short		speed,
-                                                                UInt16		maxPacketSize,
-                                                                short		pollingRate) = 0;
-
-/* Note: this function has been superceded. */
-    virtual IOReturn 		UIMCreateInterruptTransfer( short			functionNumber,
-                                                            short			endpointNumber,
-                                                            IOUSBCompletion		completion,
-                                                            IOMemoryDescriptor *	CBP,
-                                                            bool			bufferRounding,
-                                                            UInt32			bufferSize,
-                                                            short			direction) = 0;
-
-    // Isoch
-/*!
-	@function UIMCreateIsochEndpoint
-    @abstract Create an Isochronous endpoint in the controller.
-    @param functionNumber  The USB device ID of the device for this endpoint
-    @param endpointNumber  The endpoint number for this endpoint
-    @param maxPacketSize   Maximum packet size of this endpoint
-    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
-*/
-    virtual IOReturn 		UIMCreateIsochEndpoint(
-                                                        short		functionAddress,
-                                                        short		endpointNumber,
-                                                        UInt32		maxPacketSize,
-                                                        UInt8		direction) = 0;
-
-/*!
-    @function UIMCreateIsochTransfer
-    @abstract UIM function, Do a transfer on an Isocchronous endpoint.
-    @param functionNumber  The USB device ID of the device to perform the transaction with
-    @param endpointNumber  The endpoint number for the transaction
-    @param completion      Action to perform when I/O completes
-    @param direction       Specifies direction for transfer. kUSBIn or KUSBOut.
-    @param frameStart      The frame number in which to start the transactions
-    @param pBuffer         describes memory buffer. 
-    @param frameCount      number of frames to do transactions in
-    @param pFrames         Describes transactions in individual frames, gives sizes and reults for transactions.
-*/
-    virtual IOReturn 		UIMCreateIsochTransfer(
-                                                        short			functionAddress,
-                                                        short			endpointNumber,
-                                                        IOUSBIsocCompletion	completion,
-                                                        UInt8			direction,
-                                                        UInt64			frameStart,
-                                                        IOMemoryDescriptor *	pBuffer,
-                                                        UInt32			frameCount,
-                                                        IOUSBIsocFrame		*pFrames) = 0;
-
-/*!
-    @function UIMAbortEndpoint
-    @abstract UIM function  Abort the specified endpoint, return all transactions queued on it.
-    @param functionNumber  The USB device ID of the device to Abort
-    @param endpointNumber  The endpoint number to Abort
-    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
-*/
-    virtual IOReturn 		UIMAbortEndpoint(
-                                                short		functionNumber,
-                                                short		endpointNumber,
-                                                short		direction) = 0;
-
-/*!
-    @function UIMDeleteEndpoint
-    @abstract UIM function  Delete the specified endpoint, returning all transactions queued on it.
-    @param functionNumber  The USB device ID of the device to Delete
-    @param endpointNumber  The endpoint number to Delete
-    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
-*/
-    virtual IOReturn 		UIMDeleteEndpoint(
-                                                    short	functionNumber,
-                                                    short	endpointNumber,
-                                                    short	direction) = 0;
-    
-/*!
-    @function UIMClearEndpointStall
-    @abstract UIM function  Clear stall on the specified endpoint, set data toggle to zero,
-                              return all transactions queued on it.
-    @param functionNumber  The USB device ID of the device to Clear
-    @param endpointNumber  The endpoint number to Clear
-    @param direction       Specifies direction of the endpoint for uniqueness. kUSBIn or KUSBOut.
-*/
-    virtual IOReturn 		UIMClearEndpointStall(
-                                                        short		functionNumber,
-                                                        short		endpointNumber,
-                                                        short		direction) = 0;
-
-/*!
-    @function UIMRootHubStatusChange
-    @abstract UIM function  UIMRootHubStatusChange - This method was internal to the UIM (never called by the superclass) until
-							IOUSBControllerV3. For UIMs which are a subclass of IOUSBController or IOUSBControllerV2, it can
-							still be used internally only. For subclasses of IOUSBControllerV3, however, the meaning has changed
-							slightly. Now, it is used to determine if there is a status change on the root hub, and if so, it 
-							needs to update the IOUSBControllerV3 instance variable _rootHubStatusChangedBitmap
-*/
-    virtual void 		UIMRootHubStatusChange(void) = 0;
-
-    static const IORegistryPlane	*gIOUSBPlane;
-    
-public:
-
-    static IOUSBLog		*_log;
-	
-    IOCommandGate *		GetCommandGate(void);
-
-    /*!
-	@struct Endpoint
-        Describes an endpoint of a device.
-	Simply an easier to use version of the endpoint descriptor.
-        @field descriptor The raw endpoint descriptor.
-        @field number Endpoint number
-	@field direction Endpoint direction: kUSBOut, kUSBIn, kUSBAnyDirn
-	@field transferType Type of endpoint: kUSBControl, kUSBIsoc, kUSBBulk, kUSBInterrupt
-	@field maxPacketSize Maximum packet size for endpoint
-	@field interval Polling interval in milliseconds (only relevent for Interrupt endpoints)
-    */
-    struct Endpoint {
-        IOUSBEndpointDescriptor	*	descriptor;
-        UInt8 				number;
-        UInt8				direction;	// in, out
-        UInt8				transferType;	// cntrl, bulk, isoc, int
-        UInt16				maxPacketSize;
-        UInt8				interval;
-    };
-
-    // Implements IOService::getWorkLoop const member function
-    virtual IOWorkLoop *	getWorkLoop() const;
-    
-    /*
-     * Root hub methods
-     * Only of interest to the IOUSBRootHubDevice object
-     */
-/*!
-    @function GetRootHubDeviceDescriptor
-    @abstract UIM function, return the device descriptor of the simulated root hub device
-                           As GET_DESCRIPTOR control request for device descrptor
-    @param  desc   Descriptor structure to return data in
-*/
-    virtual IOReturn 		GetRootHubDeviceDescriptor( IOUSBDeviceDescriptor *desc ) = 0;
-    
-/*!
-    @function GetRootHubDescriptor
-    @abstract UIM function, return the hub descriptor of the simulated root hub device
-                           As GET_DESCRIPTOR control request for hub descrptor
-    @param  desc   Descriptor structure to return data in
-*/
-    virtual IOReturn 		GetRootHubDescriptor( IOUSBHubDescriptor *desc ) = 0;
-    
-/*!
-    @function SetRootHubDescriptor
-    @abstract UIM function, optional. Set the hub descriptor data.
-                           As SET_DESCRIPTOR control request for hub descrptor
-    @param  buffer   Descriptor data
-*/
-    virtual IOReturn 		SetRootHubDescriptor( OSData *buffer ) = 0;
-    
-/*!
-    @function GetRootHubConfDescriptor
-    @abstract UIM function, retrun the configuration descriptor of the simulated root hub device
-                           As GET_DESCRIPTOR control request for configuration descrptor
-    @param  desc   Descriptor structure to return data in
-*/
-    virtual IOReturn 		GetRootHubConfDescriptor( OSData *desc ) = 0;
-    
-/*!
-    @function GetRootHubStatus
-    @abstract UIM function, get the status of the root hub. As GET_STATUS control request to device.
-    @param status  Status structure to return
-*/
-    virtual IOReturn 		GetRootHubStatus( IOUSBHubStatus *status ) = 0;
-    
-/*!
-    @function SetRootHubFeature
-    @abstract UIM function, set feature of root hub, As SET_FEATURE control request.
-    @param wValue  The feature to set, as would be transferred in wValue field of SETUP packet.
-*/
-    virtual IOReturn 		SetRootHubFeature( UInt16 wValue ) = 0;
-    
-/*!
-    @function ClearRootHubFeature
-    @abstract UIM function, set feature of root hub, As CLEAR_FEATURE control request.
-    @param wValue  The feature to clear, as would be transferred in wValue field of SETUP packet.
-*/
-    virtual IOReturn		ClearRootHubFeature( UInt16 wValue ) = 0;
-    
-/*!
-    @function GetRootHubPortStatus
-    @abstract UIM function, get the status of a root hub port. As GET_STATUS control request to the port.
-    @param status  Status structure to return
-    @param port    Port to get status for.
-*/
-    virtual IOReturn 		GetRootHubPortStatus( IOUSBHubPortStatus *status, UInt16 port ) = 0;
-    
-/*!
-    @function SetRootHubPortFeature
-    @abstract UIM function, set feature of a root hub port, As SET_FEATURE control request to a port.
-    @param wValue  The feature to set, as would be transferred in wValue field of SETUP packet.
-    @param port    Port to set feature for
-*/
-    virtual IOReturn 		SetRootHubPortFeature( UInt16 wValue, UInt16 port ) = 0;
-    
-/*!
-    @function ClearRootHubPortFeature
-    @abstract UIM function, clear feature of a root hub port, As CLEAR_FEATURE control request to a port.
-    @param wValue  The feature to clear, as would be transferred in wValue field of SETUP packet.
-    @param port    Port to clear feature for
-*/
-    virtual IOReturn 		ClearRootHubPortFeature( UInt16 wValue, UInt16 port ) = 0;
-    
-/*!
-    @function ClearRootHubPortFeature
-    @abstract UIM function, Impliments GET_BUS_STATE control request, now obsolete.
-*/
-    virtual IOReturn 		GetRootHubPortState( UInt8 *state, UInt16 port ) = 0;
-    
-/*!
-    @function SetHubAddress
-    @abstract UIM function, set the address of the simulated root hub device, as SET_ADDRESS
-    @param wValue	 New address for root hub.
-*/
-    virtual IOReturn 		SetHubAddress( UInt16 wValue ) = 0;
-    
-
-    /*!
-		@function openPipe
-        Open a pipe to the specified device endpoint
-        @param address Address of the device on the USB bus
-		@param speed of the device: kUSBHighSpeed or kUSBLowSpeed
-        @param endpoint description of endpoint to connect to
-    */
-    virtual IOReturn 		OpenPipe(   USBDeviceAddress 	address, 
-										UInt8				speed,
-                                        Endpoint *			endpoint );
-    /*!
-        @function closePipe
-        Close a pipe to the specified device endpoint
-        @param address Address of the device on the USB bus
-		@param endpoint description of endpoint
-    */
-    virtual IOReturn 		ClosePipe(	USBDeviceAddress 	address,
-                                        Endpoint *			endpoint );
-
-    // Controlling pipe state
-    /*!
-        @function abortPipe
-        Abort pending I/O to/from the specified endpoint, causing them to complete with return code kIOReturnAborted
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-    */
-    virtual IOReturn 		AbortPipe(
-                                            USBDeviceAddress 	address,
-                                            Endpoint *			endpoint );
-    /*!
-        @function resetPipe
-        Abort pending I/O and clear stalled state - this method is a combination of abortPipe and clearPipeStall
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-    */
-    virtual IOReturn 		ResetPipe(	USBDeviceAddress 	address,
-                                        Endpoint *			endpoint );
-    /*!
-        @function clearPipeStall
-        Clear a pipe stall.
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-    */
-    virtual IOReturn 		ClearPipeStall(	USBDeviceAddress 	address,
-											Endpoint *			endpoint );
-
-    // Transferring Data
-    /*!
-        @function read
-        Read from an interrupt or bulk endpoint
-		@param buffer place to put the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-		@param completion describes action to take when buffer has been filled 
-    */
-    virtual IOReturn 		Read(	IOMemoryDescriptor * 	buffer,
-									USBDeviceAddress		address,
-									Endpoint *				endpoint,
-									IOUSBCompletion *		completion );
-    /*!
-        @function write
-        Write to an interrupt or bulk endpoint
-        @param buffer place to get the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-        @param completion describes action to take when buffer has been emptied
-    */
-    virtual IOReturn 		Write(	IOMemoryDescriptor *	buffer,
-									USBDeviceAddress 	address,
-									Endpoint *		endpoint,
-									IOUSBCompletion *	completion );
-
-    /*!
-        @function isocIO
-        Read from or write to an isochronous endpoint
-        @param buffer place to put the transferred data
-        @param frameStart USB frame number of the frame to start transfer
-        @param numFrames Number of frames to transfer
-        @param frameList Bytes to transfer and result for each frame
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-        @param completion describes action to take when buffer has been filled
-    */
-    virtual IOReturn 		IsocIO(	IOMemoryDescriptor * 	buffer,
-									UInt64					frameStart,
-									UInt32					numFrames,
-									IOUSBIsocFrame *		frameList,
-									USBDeviceAddress		address,
-									Endpoint *				endpoint,
-									IOUSBIsocCompletion *	completion );
-    /*!
-        @function deviceRequest
-        Make a control request to the specified endpoint
-		There are two versions of this method, one uses a simple void *
-        to point to the data portion of the transfer, the other uses an
-		IOMemoryDescriptor to point to the data.
-		@param request parameter block for the control request
-		@param completion describes action to take when the request has been executed
-        @param address Address of the device on the USB bus
-		@param epNum endpoint number
-    */
-    virtual IOReturn 		DeviceRequest(	IOUSBDevRequest *	request,
-											IOUSBCompletion *	completion,
-											USBDeviceAddress 	address, 
-											UInt8				epNum );
-											
-    virtual IOReturn 		DeviceRequest(	IOUSBDevRequestDesc *	request,
-											IOUSBCompletion *		completion,
-											USBDeviceAddress		address, 
-											UInt8					epNum );
-
-    /*
-     * Methods used by the hub driver to initialize a device
-     */
-    /*!
-	@function AcquireDeviceZero
-	Get the device zero lock - call this before resetting a device, to ensure there's
-	only one device with address 0
-    */
-    virtual IOReturn 		AcquireDeviceZero( void );
-    /*!
-        @function ReleaseDeviceZero
-        Release the device zero lock - call this to release the device zero lock,
-		when there is no longer a device at address 0
-    */
-    virtual void			ReleaseDeviceZero( void );
-
-	// non-virtual methods
-    void				WaitForReleaseDeviceZero( void );
-    IOReturn			ConfigureDeviceZero( UInt8 maxPacketSize, UInt8 speed );
-    IOReturn			GetDeviceZeroDescriptor( IOUSBDeviceDescriptor *  desc, UInt16 size );
-    IOReturn			SetDeviceZeroAddress(USBDeviceAddress address);
-    IOUSBDevice *		MakeDevice(USBDeviceAddress *address); 
-    IOUSBHubDevice *	MakeHubDevice(USBDeviceAddress *address); 
-	IOReturn			CreateDevice(	IOUSBDevice *		device,
-										USBDeviceAddress	deviceAddress,
-										UInt8				maxPacketSize,
-										UInt8				speed,
-										UInt32				powerAvailable );
-
-   /*!
-	@function GetBandwidthAvailable
-        Returns the available bandwidth (in bytes) per frame or microframe for
-	isochronous transfers.
-	@result maximum number of bytes that a new iso pipe could transfer
-	per frame given current allocations.
-    */
-    virtual UInt32 		GetBandwidthAvailable( void ) = 0;
-
-    /*!
-        @function GetFrameNumber
-        Returns the full current frame number.
-        @result The frame number.
-    */
-    virtual UInt64 		GetFrameNumber( void ) = 0;
-
-    /*!
-        @function GetFrameNumber32
-        Returns the least significant 32 bits of the frame number.
-        @result The lsb 32 bits of the frame number.
-    */
-    virtual UInt32 		GetFrameNumber32( void ) = 0;
-
-    // Debugger polled mode
-    virtual void 		PollInterrupts( IOUSBCompletionAction safeAction = 0 ) = 0;
- 
-    virtual IOReturn 		PolledRead(
-                                            short			functionNumber,
-                                            short			endpointNumber,
-                                            IOUSBCompletion		completion,
-                                            IOMemoryDescriptor *	CBP,
-                                            bool			bufferRounding,
-                                            UInt32			bufferSize);
-                                            
-    OSMetaClassDeclareReservedUsed(IOUSBController,  0);
-    virtual void UIMCheckForTimeouts(void);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBController,  1);
-    virtual IOReturn 		UIMCreateControlTransfer(   short		functionNumber,
-                                                            short		endpointNumber,
-                                                            IOUSBCommand*	command,
-                                                            void*		CBP,
-                                                            bool		bufferRounding,
-                                                            UInt32		bufferSize,
-                                                            short		direction);
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  2);
-    virtual IOReturn 		UIMCreateControlTransfer(   short			functionNumber,
-                                                            short			endpointNumber,
-                                                            IOUSBCommand*		command,
-                                                            IOMemoryDescriptor*		CBP,
-                                                            bool			bufferRounding,
-                                                            UInt32			bufferSize,
-                                                            short			direction);
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  3);
-/*!
-    @function UIMCreateBulkTransfer
-    @abstract UIM function, Do a transfer on a bulk endpoint.
-                This method supercedes the method which takes multiple parameters.
-    @param command  paramters for transfer.
-*/
-    virtual IOReturn 		UIMCreateBulkTransfer(IOUSBCommand* command);
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  4);
-/*!
-    @function UIMCreateInterruptTransfer
-    @abstract UIM function, Do a transfer on an interrupt endpoint.
-                This method supercedes the method which takes multiple parameters.
-    @param command  paramters for transfer.
-*/
-    virtual IOReturn 		UIMCreateInterruptTransfer(IOUSBCommand* command);
-
-    /*!
-        @function deviceRequest
-        Make a control request to the specified endpoint
-		There are two versions of this method, one uses a simple void *
-        to point to the data portion of the transfer, the other uses an
-		IOMemoryDescriptor to point to the data.
-		@param request parameter block for the control request
-		@param completion describes action to take when the request has been executed
-        @param address Address of the device on the USB bus
-		@param epNum endpoint number
-    */
-    OSMetaClassDeclareReservedUsed(IOUSBController,  5);
-    virtual IOReturn 		DeviceRequest(  IOUSBDevRequest *	request,
-                                                IOUSBCompletion *	completion,
-                                                USBDeviceAddress 	address, 
-                                                UInt8 			epNum,
-						UInt32			noDataTimeout,
-						UInt32			completionTimeout );
-						
-    OSMetaClassDeclareReservedUsed(IOUSBController,  6);
-    virtual IOReturn 		DeviceRequest(  IOUSBDevRequestDesc *	request,
-                                                IOUSBCompletion *	completion,
-                                                USBDeviceAddress 	address, 
-                                                UInt8 			epNum,
-						UInt32			noDataTimeout,
-						UInt32			completionTimeout );
-
-    
-    
-    OSMetaClassDeclareReservedUsed(IOUSBController,  7);
-    /*!
-        @function read
-        Read from an interrupt or bulk endpoint
-		@param buffer place to put the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-		@param completion describes action to take when buffer has been filled 
-    */
-    virtual IOReturn 		Read(   IOMemoryDescriptor * 	buffer,
-                                        USBDeviceAddress 	address,
-                                        Endpoint *		endpoint,
-                                        IOUSBCompletion *	completion,
-					UInt32			noDataTimeout,
-					UInt32			completionTimeout );
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  8);
-    /*!
-        @function write
-        Write to an interrupt or bulk endpoint
-        @param buffer place to get the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-        @param completion describes action to take when buffer has been emptied
-    */
-    virtual IOReturn 		Write(  IOMemoryDescriptor *	buffer,
-                                        USBDeviceAddress 	address,
-                                        Endpoint *		endpoint,
-                                        IOUSBCompletion *	completion,
-					UInt32			noDataTimeout,
-					UInt32			completionTimeout );
-
-    // this should really not be using a padding slot, since free is in our superclas, but we shipped this way so now we need to leave it.
-    OSMetaClassDeclareReservedUsed(IOUSBController,  9);
-    virtual void free();
-
-protected:
-    	
-/*!
-    @function UIMRootHubStatusChange(bool)
-    @abstract UIM function  UIMRootHubStatusChange(bool) - This method was internal to the UIM (never called by the superclass) until
-							IOUSBControllerV3. For UIMs which are a subclass of IOUSBController or IOUSBControllerV2, it can
-							still be used internally only. For subclasses of IOUSBControllerV3, however, it has become obsolete
-							(it still needs to be implemented since it is pure virtual)
-*/
-    OSMetaClassDeclareReservedUsed(IOUSBController,  10);
-    virtual void 		UIMRootHubStatusChange( bool abort ) = 0;
-
-public:
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  11);
-    virtual IOReturn CreateRootHubDevice( IOService * provider, IOUSBRootHubDevice ** rootHubDevice);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBController,  12);
-    /*!
-        @function Read
-        Read from an interrupt or bulk endpoint
-		@param buffer place to put the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-		@param completion describes action to take when buffer has been filled
-		@param noDataTimeout number of milliseconds of no data movement before the request is aborted
-		@param completionTimeout number of milliseonds after the command is on the bus in which it must complete
-		@param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
-    */
-    virtual IOReturn 		Read(   IOMemoryDescriptor * 	buffer,
-                                        USBDeviceAddress 	address,
-                                        Endpoint *		endpoint,
-                                        IOUSBCompletion *	completion,
-					UInt32			noDataTimeout,
-					UInt32			completionTimeout,
-					IOByteCount		reqCount );
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  13);
-    /*!
-        @function Write
-        Write to an interrupt or bulk endpoint
-        @param buffer place to get the transferred data
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-        @param completion describes action to take when buffer has been emptied
-		@param noDataTimeout number of milliseconds of no data movement before the request is aborted
-		@param completionTimeout number of milliseonds after the command is on the bus in which it must complete
-		@param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
-    */
-    virtual IOReturn 		Write(  IOMemoryDescriptor *	buffer,
-                                        USBDeviceAddress 	address,
-                                        Endpoint *		endpoint,
-                                        IOUSBCompletion *	completion,
-					UInt32			noDataTimeout,
-					UInt32			completionTimeout,
-					IOByteCount		reqCount );
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  14);
-    
-    virtual IOReturn GetRootHubStringDescriptor(UInt8	index, OSData *desc) = 0;
-    
-    OSMetaClassDeclareReservedUsed(IOUSBController,  15);
-    /*!
-        @function IsocIO
-        Read from or write to an isochronous endpoint
-        @param buffer place to put the transferred data
-        @param frameStart USB frame number of the frame to start transfer
-        @param numFrames Number of frames to transfer
-        @param frameList Bytes to transfer and result for each frame
-        @param address Address of the device on the USB bus
-        @param endpoint description of endpoint
-        @param completion describes action to take when buffer has been filled
-        @param updateFrequency describes how often to update the framelist once the transfer has completed (in ms)
-    */
-    virtual IOReturn IsocIO(  IOMemoryDescriptor * 			buffer,
-                                        UInt64 				frameStart,
-                                        UInt32 				numFrames,
-                                        IOUSBLowLatencyIsocFrame *	frameList,
-                                        USBDeviceAddress 		address,
-                                        Endpoint *			endpoint,
-                                        IOUSBLowLatencyIsocCompletion *	completion,
-                                        UInt32				updateFrequency );
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  16);
-    
-    /*!
-		@function UIMCreateIsochTransfer
-		@abstract UIM function, Do a transfer on an Isocchronous endpoint.
-		@param functionNumber  The USB device ID of the device to perform the transaction with
-		@param endpointNumber  The endpoint number for the transaction
-		@param completion      Action to perform when I/O completes
-		@param direction       Specifies direction for transfer. kUSBIn or KUSBOut.
-		@param frameStart      The frame number in which to start the transactions
-		@param pBuffer         describes memory buffer. 
-		@param frameCount      number of frames to do transactions in
-		@param pFrames         Describes transactions in individual frames, gives sizes and reults for transactions.
-		@param updateFrequency Describes how often we update the frameList parameters (in ms)
-	*/
-    virtual IOReturn 		UIMCreateIsochTransfer(
-                                                        short			functionAddress,
-                                                        short			endpointNumber,
-                                                        IOUSBIsocCompletion	completion,
-                                                        UInt8			direction,
-                                                        UInt64			frameStart,
-                                                        IOMemoryDescriptor *	pBuffer,
-                                                        UInt32			frameCount,
-                                                        IOUSBLowLatencyIsocFrame *pFrames,
-                                                        UInt32			updateFrequency);
-
-
-    OSMetaClassDeclareReservedUsed(IOUSBController,  17);
-    virtual IOReturn 		CheckForDisjointDescriptor(IOUSBCommand *command, UInt16 maxPacketSize);
-    
-    /*!
-		@function UIMCreateIsochTransfer
-		@abstract UIM function, Do a transfer on an Isocchronous endpoint.
-		@param command  an IOUSBIsocCommand object with all the necessary information
-	 */
-    OSMetaClassDeclareReservedUsed(IOUSBController,  18);
-	virtual IOReturn UIMCreateIsochTransfer(IOUSBIsocCommand *command);
-	
-	// do not use this slot without first checking bug rdar://6022420
-    OSMetaClassDeclareReservedUnused(IOUSBController,  19);
-    
-protected:
-    void	IncreaseIsocCommandPool();
-    void 	IncreaseCommandPool();
-    void	ParsePCILocation(const char *str, int *deviceNum, int *functionNum);
-    int		ValueOfHexDigit(char c);
-};
-
-#endif /* ! _IOKIT_IOUSBCONTROLLER_H */
-
diff --git a/i386/include/IOKit/usb/IOUSBControllerListElement.h b/i386/include/IOKit/usb/IOUSBControllerListElement.h
deleted file mode 100644
index 7351177..0000000
--- a/i386/include/IOKit/usb/IOUSBControllerListElement.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1998-2007 Apple Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOUSBCONTROLLERLISTELEMENT_H
-#define _IOUSBCONTROLLERLISTELEMENT_H
-
-
-#include <libkern/c++/OSObject.h>
-
-#include <IOKit/IOTypes.h>
-
-#include <IOKit/usb/USB.h>
-
-
-/*!
- @class IOUSBControllerListElement
- @abstract Used by the IOUSBController to manage the USB controller lists that are common between EHCI and UHCI.
- */
-class IOUSBControllerListElement : public OSObject
-{
-    OSDeclareDefaultStructors(IOUSBControllerListElement)
-	
-private:    
-	
-public:
-	
-    virtual void					SetPhysicalLink(IOPhysicalAddress next) = 0;
-    virtual IOPhysicalAddress		GetPhysicalLink(void) = 0;
-    virtual IOPhysicalAddress		GetPhysicalAddrWithType(void) = 0;
-    virtual void					print(int level);
-	
-    IOPhysicalAddress				_sharedPhysical;			// phys address of the memory shared with the controller			
-    void *							_sharedLogical;				// logical address of the above
-    IOUSBControllerListElement		*_logicalNext;				// the next element in the list
-    
-};
-
-
-class IOUSBControllerV2;										// needed for a parameter
-class IOUSBControllerIsochEndpoint;
-
-class IOUSBControllerIsochListElement : public IOUSBControllerListElement
-{
-    OSDeclareDefaultStructors(IOUSBControllerIsochListElement)
-	
-private:
-    
-public:
-	
-    virtual void					SetPhysicalLink(IOPhysicalAddress next) = 0;
-    virtual IOPhysicalAddress		GetPhysicalLink(void) = 0;
-    virtual IOPhysicalAddress		GetPhysicalAddrWithType(void) = 0;
-    virtual void					print(int level);
-	
-    IOUSBControllerIsochEndpoint	*_pEndpoint;
-    IOUSBIsocFrame					*_pFrames;
-    IOUSBIsocCompletion				_completion;
-    Boolean							_lowLatency;
-	bool							_requestFromRosettaClient; // True if the request originated from a Rosetta client in user space
-	UInt8							_framesInTD;			// used for HS Isoch only
-    UInt64							_frameNumber;			// frame number for scheduling purposes
-    UInt32							_frameIndex;			// index into the myFrames array
-    IOUSBControllerIsochListElement *_doneQueueLink;		// linkage used by done queue processing
-	
-    // pure virtual methods which must be implemented by descendants
-    virtual IOReturn				UpdateFrameList(AbsoluteTime timeStamp) = 0;
-    virtual IOReturn				Deallocate(IOUSBControllerV2 *uim) = 0;
-};
-
-class IOUSBControllerIsochEndpoint : public OSObject
-{
-    OSDeclareDefaultStructors(IOUSBControllerIsochEndpoint)
-	
-public:
-	
-	virtual bool init();
-
-    IOUSBControllerIsochEndpoint		*nextEP;
-    IOUSBControllerIsochListElement  	*toDoList;					// ITD or SITD
-    IOUSBControllerIsochListElement  	*toDoEnd;					// ITD or SITD
-    IOUSBControllerIsochListElement  	*doneQueue;					// ITD or SITD
-    IOUSBControllerIsochListElement  	*doneEnd;					// ITD or SITD
-    IOUSBControllerIsochListElement  	*deferredQueue;				// ITD or SITD
-    IOUSBControllerIsochListElement  	*deferredEnd;				// ITD or SITD
-    UInt64								firstAvailableFrame;		// next frame available for a transfer on this EP
-    UInt32								maxPacketSize;
-    UInt32								activeTDs;					// + when added to todo list, - when taken from done queue
-    UInt32								onToDoList;					// + when added to todo list, - when taken from done queue
-    UInt32								onDoneQueue;					// + when added to todo list, - when taken from done queue
-	volatile SInt32						scheduledTDs;				// + when linked onto periodic list, - when unlinked
-	UInt32								deferredTDs;
-	UInt32								onProducerQ;
-	UInt32								onReversedList;
-    UInt16								inSlot;						// where Isoc TDs are being put in the periodic list 
-    short								functionAddress;
-    short								endpointNumber;
-    IOReturn							accumulatedStatus;
-	UInt32								interval;					// this is the decoded interval value for HS endpoints and is 1 for FS endpoints
-    UInt8								direction;
-	bool								aborting;
-};
-
-
-#endif
-
diff --git a/i386/include/IOKit/usb/IOUSBControllerV2.h b/i386/include/IOKit/usb/IOUSBControllerV2.h
deleted file mode 100644
index 4d2c306..0000000
--- a/i386/include/IOKit/usb/IOUSBControllerV2.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.2 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
- * Please see the License for the specific language governing rights and 
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBCONTROLLERV2_H
-#define _IOKIT_IOUSBCONTROLLERV2_H
-
-#include <IOKit/IODMACommand.h>
-
-#include <IOKit/usb/IOUSBControllerListElement.h>
-#include <IOKit/usb/IOUSBController.h>
-
-enum
-{
-    kUSBHSHubCommandAddHub	= 1,
-    kUSBHSHubCommandRemoveHub	= 2,
-    
-    kUSBHSHubFlagsMultiTT	= 1
-};
-
-
-/*!
-    @class IOUSBControllerV2
-    @abstract subclass of the IOUSBController to provide support for high speed 
-                devices and split transactions.
-    @discussion The IOUSBController class provide sufficient functionality to 
-                work with full (12Mb/s) and low (1.5Mb/s) devices. IOUSBControllerV2
-                introduces the support for high (480Mb/s) speed devices from the
-                USB 2.0 spec. In particular IOUSBControllerV2 indicates the high
-                speed hub a full or low speed device is attached to so that split
-                transactions can be directed to the hub at high speed to be forwarded
-                to the full or low speed device by the hub.
-                It also gives support for bulk endoints of greater than 256 bytes.
-*/
-
-class IOUSBControllerV2 : public IOUSBController
-{
-    OSDeclareAbstractStructors(IOUSBControllerV2)
-
-protected:
-    
-    // These for keeping track of high speed ancestor to allow controller to do splits.
-    //
-    UInt8 _highSpeedHub[128];
-    UInt8 _highSpeedPort[128];
-
-    struct V2ExpansionData { 
-		UInt8										_multiTT[128];
-		IOUSBCommand								*ClearTTCommand;
-		IOUSBControllerIsochEndpoint				*_isochEPList;						// linked list of active Isoch "endpoints"
-		IOUSBControllerIsochEndpoint				*_freeIsochEPList;					// linked list of freed Isoch EP data structures
-		thread_call_t								_returnIsochDoneQueueThread;
-	};
-    V2ExpansionData *_v2ExpansionData;
-
-    // Super's expansion data
-    #define _freeUSBCommandPool					_expansionData->freeUSBCommandPool
-    #define _freeUSBIsocCommandPool				_expansionData->freeUSBIsocCommandPool
-    #define _watchdogUSBTimer					_expansionData->watchdogUSBTimer
-    #define _controllerTerminating				_expansionData->_terminating
-    #define _watchdogTimerActive				_expansionData->_watchdogTimerActive
-    #define _busNumber							_expansionData->_busNumber
-    #define _currentSizeOfCommandPool			_expansionData->_currentSizeOfCommandPool
-    #define _currentSizeOfIsocCommandPool		_expansionData->_currentSizeOfIsocCommandPool
-    #define _controllerSpeed					_expansionData->_controllerSpeed
-	#define _activeIsochTransfers				_expansionData->_activeIsochTransfers
-
-	// this class's expansion data
-	#define _isochEPList						_v2ExpansionData->_isochEPList
-	#define _freeIsochEPList					_v2ExpansionData->_freeIsochEPList
-	#define _returnIsochDoneQueueThread			_v2ExpansionData->_returnIsochDoneQueueThread
-	
-    virtual bool 		init( OSDictionary *  propTable );
-    virtual bool 		start( IOService *  provider );
-    virtual void		free();
-
-    static IOReturn  DoCreateEP(OSObject *owner,
-                           void *arg0, void *arg1,
-                           void *arg2, void *arg3);
-
-    static void		clearTTHandler( 
-							OSObject *	target,
-                            void *	parameter,
-                            IOReturn	status,
-                            UInt32	bufferSizeRemaining );
-
-public:
-
-        /*!
-        @function openPipe
-         Open a pipe to the specified device endpoint
-         @param address Address of the device on the USB bus
-         @param speed of the device: kUSBDeviceSpeedLow, kUSBDeviceSpeedFull or kUSBDeviceSpeedHigh
-         @param endpoint description of endpoint to connect to
-         */
-        virtual IOReturn 		OpenPipe(   USBDeviceAddress 	address,
-                                       UInt8 		speed,
-                                       Endpoint *		endpoint );
-
-    /*!
-    @function CreateDevice
-    @abstract Create a new device as IOUSBController, making a note of the
-                high speed hub device ID and port number the full/low speed
-                device is attached to.
-    @param newDevice       new device object to work with
-    @param deviceAddress   USB device ID
-    @param maxPacketSize   max packet size of endpoint zero
-    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
-    @param powerAvailable  power available to the device 
-    @param hub             USB ID of hub the device is immediatly attached to. (Not necessarily high speed)
-    @param port            port number of port the device is attached to.
-*/
-    virtual  IOReturn CreateDevice(	IOUSBDevice 		*newDevice,
-                                    USBDeviceAddress	deviceAddress,
-                                    UInt8		 	maxPacketSize,
-                                    UInt8			speed,
-                                    UInt32			powerAvailable,
-                                    USBDeviceAddress		hub,
-                                    int      port);
-
-/*!
-	@function ConfigureDeviceZero
-    @abstract configure pipe zero of device zero, as IOUSBController, but also keeping 
-                 note of high speed hub device is attached to.
-    @param maxPacketSize  max packet size for the pipe
-    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
-    @param hub            USB ID of hub the device is immediatly attached to.  (Not necessarily high speed)
-    @param port           port number of port the device is attached to.
-*/
-    virtual  IOReturn ConfigureDeviceZero(UInt8 maxPacketSize, UInt8 speed, USBDeviceAddress hub, int port);
-
-/*!
-	@function UIMCreateControlEndpoint
-    @abstract Create an endpoint in the controller to do control transactions.
-    @param functionNumber  USB device ID of device
-    @param endpointNumber  endpoint address of the endpoint in the device
-    @param maxPacketSize   maximum packet size of this endpoint
-    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
-    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
-                           address split transactions to.
-    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
-*/
-    virtual IOReturn 		UIMCreateControlEndpoint(
-                                                            UInt8	functionNumber,
-                                                            UInt8	endpointNumber,
-                                                            UInt16	maxPacketSize,
-                                                            UInt8	speed,
-                                                            USBDeviceAddress highSpeedHub,
-                                                            int      highSpeedPort) = 0;
-
-/*!
-	@function UIMCreateBulkEndpoint
-    @abstract Create an endpoint in the controller to do bulk transactions.
-    @param functionNumber  USB device ID of device
-    @param endpointNumber  endpoint address of the endpoint in the device
-    @param direction       Direction of data flow. kUSBIn or kUSBOut
-    @param maxPacketSize   maximum packet size of this endpoint
-    @param speed           speed of the device kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
-    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
-                           address split transactions to.
-    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
-*/
-    virtual IOReturn 		UIMCreateBulkEndpoint(
-                                                        UInt8		functionNumber,
-                                                        UInt8		endpointNumber,
-                                                        UInt8		direction,
-                                                        UInt8		speed,
-                                                        UInt16		maxPacketSize,
-                                                        USBDeviceAddress highSpeedHub,
-                                                        int      highSpeedPort) = 0;
-
-/*!
-	@function UIMCreateInterruptEndpoint
-    @abstract Create an endpoint in the controller to do interrupt transactions.
-    @param functionAddress USB device ID of device
-    @param endpointNumber  endpoint address of the endpoint in the device
-    @param direction       Direction of data flow. kUSBIn or kUSBOut
-    @param speed           speed of the device kUSBDeviceSpeedLow, kUSBDeviceSpeedFull, kUSBDeviceSpeedHigh
-    @param maxPacketSize   maximum packet size of this endpoint
-    @param pollingRate     The maximum polling interval from the endpoint descriptor.
-    @param highSpeedHub    If speed is not kUSBDeviceSpeedHigh, the address of the high speed hub to
-                           address split transactions to.
-    @param highSpeedPort   If speed is not kUSBDeviceSpeedHigh, the hub port to address split transactions to
-*/
-    virtual IOReturn		UIMCreateInterruptEndpoint(
-                                                                short		functionAddress,
-                                                                short		endpointNumber,
-                                                                UInt8		direction,
-                                                                short		speed,
-                                                                UInt16		maxPacketSize,
-                                                                short		pollingRate,
-                                                                USBDeviceAddress highSpeedHub,
-                                                                int      highSpeedPort) = 0;
-
-/*!
-	@function UIMCreateIsochEndpoint
-    @abstract Create an endpoint in the controller to do Isochronous transactions.
-    @param functionAddress USB device ID of device
-    @param endpointNumber  endpoint address of the endpoint in the device
-    @param maxPacketSize   maximum packet size of this endpoint
-    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
-    @param highSpeedHub    If non zero, this is a full speed device, the address of the high speed hub to
-                           address split transactions to.
-    @param highSpeedPort   If highSpeedHub is non zero, the hub port to address split transactions to
-*/
-    virtual IOReturn 		UIMCreateIsochEndpoint(
-                                                        short				functionAddress,
-                                                        short				endpointNumber,
-                                                        UInt32				maxPacketSize,
-                                                        UInt8				direction,
-                                                        USBDeviceAddress	highSpeedHub,
-                                                        int					highSpeedPort) = 0;
-
-
-	static void 				ReturnIsochDoneQueueEntry(OSObject *target, thread_call_param_t endpointPtr);
-
-	
-	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  0);
-    virtual IOReturn		AddHSHub(USBDeviceAddress highSpeedHub, UInt32 flags);
-    
-    static IOReturn DOHSHubMaintenance(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  1);
-    virtual IOReturn 		UIMHubMaintenance(USBDeviceAddress highSpeedHub, UInt32 highSpeedPort, UInt32 command, UInt32 flags);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  2);
-    virtual IOReturn		RemoveHSHub(USBDeviceAddress highSpeedHub);
-    
-    static IOReturn DOSetTestMode(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  3);
-    virtual IOReturn		SetTestMode(UInt32 mode, UInt32 port);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  4);
-    virtual IOReturn		UIMSetTestMode(UInt32 mode, UInt32 port);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  5);
-    virtual UInt64		GetMicroFrameNumber( void );
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  6);
-    virtual void ClearTT(USBDeviceAddress addr, UInt8 endpt, Boolean IN);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  7);
-    /*!
-        @function Read
-     Read from an interrupt or bulk endpoint
-     @param buffer place to put the transferred data
-     @param address Address of the device on the USB bus
-     @param endpoint description of endpoint
-     @param completion describes action to take when buffer has been filled
-     @param noDataTimeout number of milliseconds of no data movement before the request is aborted
-     @param completionTimeout number of milliseonds after the command is on the bus in which it must complete
-     @param reqCount number of bytes requested for the transfer (must not be greater than the length of the buffer)
-     */
-    virtual IOReturn ReadV2( IOMemoryDescriptor *			buffer,
-                           USBDeviceAddress					address,
-                           Endpoint *						endpoint,
-                           IOUSBCompletionWithTimeStamp *	completion,
-                           UInt32							noDataTimeout,
-                           UInt32							completionTimeout,
-                           IOByteCount						reqCount );
-    
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  8);
-/*!
-	@function UIMCreateIsochEndpoint
-    @abstract Create an endpoint in the controller to do Isochronous transactions.
-    @param functionAddress USB device ID of device
-    @param endpointNumber  endpoint address of the endpoint in the device
-    @param maxPacketSize   maximum packet size of this endpoint
-    @param direction       Specifies direction for the endpoint. kUSBIn or KUSBOut.
-    @param highSpeedHub    If non zero, this is a full speed device, the address of the high speed hub to
-                           address split transactions to.
-    @param highSpeedPort   If highSpeedHub is non zero, the hub port to address split transactions to
-	@param interval		   The encoded interval value from the endpoint descriptor
-*/
-    virtual IOReturn 		UIMCreateIsochEndpoint(		short				functionAddress,
-                                                        short				endpointNumber,
-                                                        UInt32				maxPacketSize,
-                                                        UInt8				direction,
-                                                        USBDeviceAddress	highSpeedHub,
-                                                        int					highSpeedPort,
-														UInt8				interval);
-
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  9);
-	virtual IOUSBControllerIsochEndpoint*		AllocateIsochEP(void);	
-	
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  10);
-	virtual IOReturn							DeallocateIsochEP(IOUSBControllerIsochEndpoint *pEP);
-
-	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  11);
-    virtual IOUSBControllerIsochEndpoint* 	FindIsochronousEndpoint(short functionNumber, short endpointNumber, short direction, IOUSBControllerIsochEndpoint* *pEDBack);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  12);
-    virtual IOUSBControllerIsochEndpoint*	CreateIsochronousEndpoint(short functionNumber, short endpointNumber, short direction);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  13);
-    virtual void								PutTDonToDoList(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  14);
-    virtual IOUSBControllerIsochListElement		*GetTDfromToDoList(IOUSBControllerIsochEndpoint* pED);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  15);
-    virtual void								PutTDonDeferredQueue(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  16);
-	virtual IOUSBControllerIsochListElement		*GetTDfromDeferredQueue(IOUSBControllerIsochEndpoint* pED);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  17);
-    virtual void								PutTDonDoneQueue(IOUSBControllerIsochEndpoint* pED, IOUSBControllerIsochListElement *pTD, bool checkDeferred);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  18);
-    virtual IOUSBControllerIsochListElement		*GetTDfromDoneQueue(IOUSBControllerIsochEndpoint* pED);
-	
-	// 7185026 - this is to make this call from behind the gate
-    static IOReturn		GatedGetTDfromDoneQueue(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  19);
-    virtual void								ReturnIsochDoneQueue(IOUSBControllerIsochEndpoint*);
-
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  20);
-	virtual IODMACommand						*GetNewDMACommand();
-	
-    OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  21);
-	/*!
-	 @function GetLowLatencyOptionsAndPhysicalMask
-	 @abstract Low Latency transfers require that the client have access to the memory after the Isochronous I/O request has already been scheduled. This might be used, for example to fill in outgoing data "just in time." Some controllers, however, may have requirements which need to be followed in order to make sure that the memory buffer isn't moved after the call is made. This call will return an IOOptionBits and mach_vm_address_t which can be used in a call to IOBufferMemoryDescriptor::inTaskWithPhysicalMask which will help meet these requirements.
-	 @param optionBits Pointer to an an IOOptionBits. The only bit which may be returned is kIOMemoryPhysicallyContiguous. Other bits, e.g. direction bits, must be ORd in by the client as needed. This call replaces the old property based method of obtaining this information.
-	 @param physicalMask  Pointer to a mach_vm_address_t which should be used in the call to IOBufferMemoryDescriptor::inTaskWithPhysicalMask and will guarantee that when the memory is wired down it will be accessible by both the client and the USB controller at the same time.
-	 @result returns kIOReturnSuccess if the method is implemented by the controller, otherwise kIOReturnUnsupported
-	 */
-    virtual IOReturn 		GetLowLatencyOptionsAndPhysicalMask(IOOptionBits *optionBits, mach_vm_address_t *physicalMask);
-	
-	OSMetaClassDeclareReservedUsed(IOUSBControllerV2,  22);
-	/*!
-	 @function GetFrameNumberWithTime
-	 @abstract Real Time A/V applications send and receive Iscohronous data scheduled on certain USB frame numbers. The clock for these frame numbers is independent of the system clock, and drivers need to synchronize these two clocks. This routine will return a system time which corresponds to the beginning of a USB frame number. It is not necessarily the currrent frame, but it will be a frame in the recent past (within the past minute). The jitter between the start of the USB frame and the system time will be as low as possible, but due to hardware interrupt latencies could be as high as 200 microseconds.
-	 @param frameNumber A pointer to a UInt64 in which to hold the USB frame number corresponding to the given system time.
-	 @param theTime A pointer to an AbsoluteTime corresponding to the system time at the beginning of the given USB frame number.
-	 @result returns kIOReturnSuccess if the method is implemented by the controller, otherwise kIOReturnUnsupported
-	 */
-	virtual IOReturn		GetFrameNumberWithTime(UInt64* frameNumber, AbsoluteTime *theTime);
-	
-	
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  23);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  24);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  25);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  26);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  27);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  28);
-    OSMetaClassDeclareReservedUnused(IOUSBControllerV2,  29);
-    
-};
-
-
-#endif /* ! _IOKIT_IOUSBCONTROLLERV2_H */
diff --git a/i386/include/IOKit/usb/IOUSBControllerV3.h b/i386/include/IOKit/usb/IOUSBControllerV3.h
deleted file mode 100644
index 22da915..0000000
--- a/i386/include/IOKit/usb/IOUSBControllerV3.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-* Copyright (c) 2007-2008 Apple Inc. All rights reserved.
-*
-* @APPLE_LICENSE_HEADER_START@
-* 
-* The contents of this file constitute Original Code as defined in and
-* are subject to the Apple Public Source License Version 1.2 (the
-* "License").  You may not use this file except in compliance with the
-* License.  Please obtain a copy of the License at
-* http://www.apple.com/publicsource and read it before using this file.
-* 
-* This Original Code and all software distributed under the License are
-* distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
-* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
-* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
-* Please see the License for the specific language governing rights and 
-* limitations under the License.
-* 
-* @APPLE_LICENSE_HEADER_END@
-*/
-
-#ifndef _IOKIT_IOUSBCONTROLLERV3_H
-#define _IOKIT_IOUSBCONTROLLERV3_H
-
-#include <IOKit/pci/IOPCIDevice.h>
-
-#include <IOKit/usb/IOUSBControllerV2.h>
-#include <IOKit/usb/IOUSBHubDevice.h>
-
-// Constants that define the different power states in the setPowerState call
-enum
-{
-    kUSBPowerStateOff				= 0,				// controller is reset, nothing is attached
-    kUSBPowerStateRestart			= 1,				// same as OFF
-    kUSBPowerStateSleep				= 2,				// controller is suspended, preparing to lose main power
-    kUSBPowerStateLowPower			= 3,				// controller is suspended, power remains on
-    kUSBPowerStateOn				= 4,				// up and running
-	kUSBNumberBusPowerStates		= 5
-};
-
-#define kUSBPowerStateStable		-1
-
-enum
-{
-    kUSBBusStateReset				= 0,				// bus is in RESET
-    kUSBBusStateSuspended			= 1,				// bus is in SUSPEND mode
-    kUSBBusStateRunning				= 2					// bus is operational
-};
-
-
-// Root Hub things
-typedef struct IOUSBRootHubInterruptTransaction 
-{
-    IOMemoryDescriptor *		buf;
-    UInt32						bufLen;
-    IOUSBCompletion				completion;
-} IOUSBRootHubInterruptTransaction;
-
-enum 
-{
-	  kIOUSBMaxRootHubTransactions  = 2
-};
-
-
-
-/*!
- @class IOUSBControllerV3
- @abstract subclass of the IOUSBControllerV2 to provide support for new USB Power Management techniques.
- @discussion With Leopard, we are providing more information to USB Device Drivers in the IOPower
- tree to allow for more efficient Power Management. This controller class encapulates many of the changes
- needed for that, without disturbing third party subclasses of IOUSBController or IOUSBControllerV2
- */
-
-class IOUSBControllerV3 : public IOUSBControllerV2
-{	
-		OSDeclareAbstractStructors(IOUSBControllerV3)
-
-	protected:
-		// static variable shared by all instances
-		static uint32_t *				_gHibernateState;
-
-	
-		UInt8							_myBusState;					// kUSBBusStateReset, kUSBBusStateSuspended, kUSBBusStateRunning
-		bool							_wakingFromHibernation;			// True while the Hibernation Wake thread is active
-		bool							_needToAckPowerDown;			// True while we are changing power state due to shutdown/restart
-		bool							_onCardBus;						// OBSOLETE
-		bool							_controllerAvailable;			// true if we can talk to the controller
-		SInt32							_powerStateChangingTo;			// a power state that we are in the process of changing to, or -1 if we are stable
-		bool							_poweringDown;					// true is the controller is powering down because of a systemWillPowerDown message
-		bool							_restarting;					// true is the controller is restarting because of a systemWillPowerDown message
-		unsigned long					_myPowerState;					// my current state (since getPowerState doesn't always change in time)
-		IOUSBControllerV3				*_ehciController;				// set if I am a companion controller
-		unsigned long					_numPowerStates;				// how many power states do I support (defaults to kUSBNumDefaultPowerStates)
-		IOPMPowerState					*_myPowerStates;				// my power state array (allocated on the fly)
-		IOPCIDevice						*_device;						// my PCI device
-
-		// root hub support
-	    IOTimerEventSource					*_rootHubTimer;				// timer which fires at the rate of the root hub interrupt endpoint
-		UInt8								_rootHubPollingRate;		// Obsolete -- we need to have it be a uint32_t
-		UInt8								_rootHubNumPorts;			// number of root hub ports - should be 15 or fewer!
-		UInt16								_rootHubStatusChangedBitmap;	// support up to 15 ports for status changes
-		bool								_rootHubTimerActive;		// UNUSED
-		IOUSBRootHubInterruptTransaction	_outstandingRHTrans[4];		// Transactions for the Root Hub.  We need 2, one for the current transaction and one for the next.  This is declared as 4 for binary compatibility
-
-		struct V3ExpansionData { 
-			uint32_t				_rootHubPollingRate32;
-			bool					_rootHubTransactionWasAborted;
-		};
-		V3ExpansionData *_v3ExpansionData;
-
-		// IOKit methods
-		virtual bool					init( OSDictionary *  propTable );
-		virtual bool					start( IOService *  provider );
-		virtual void					stop( IOService * provider );
-		virtual unsigned long			maxCapabilityForDomainState ( IOPMPowerFlags domainState );
-		virtual unsigned long			initialPowerStateForDomainState ( IOPMPowerFlags domainState );
-		virtual IOReturn				powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
-		virtual IOReturn				setPowerState( unsigned long powerStateOrdinal, IOService* whatDevice );
-		virtual IOReturn				powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
-		virtual void					powerChangeDone ( unsigned long fromState);
-		virtual void					systemWillShutdown( IOOptionBits specifier );
-		virtual void					free(void);
-	
-		// IOUSBController methods
-		// we override these to deal with methods attempting to go through the workloop while we are in sleep
-		virtual IOReturn 		AcquireDeviceZero( void );
-		virtual void			ReleaseDeviceZero( void );
-		virtual IOReturn 		DeviceRequest(IOUSBDevRequest *request,  IOUSBCompletion *completion, USBDeviceAddress address, UInt8 epNum, UInt32 noDataTimeout, UInt32 completionTimeout);
-		virtual IOReturn 		DeviceRequest(IOUSBDevRequestDesc *request,  IOUSBCompletion *completion, USBDeviceAddress address, UInt8 epNum, UInt32 noDataTimeout, UInt32 completionTimeout);
-		virtual IOReturn 		ClosePipe(USBDeviceAddress address, Endpoint *endpoint);
-		virtual IOReturn 		AbortPipe(USBDeviceAddress address, Endpoint *endpoint);
-		virtual IOReturn 		ResetPipe(USBDeviceAddress address, Endpoint *endpoint);
-		virtual IOReturn 		ClearPipeStall(USBDeviceAddress address, Endpoint *endpoint);
-		virtual IOReturn 		Read(IOMemoryDescriptor *buffer, USBDeviceAddress address, Endpoint *endpoint, IOUSBCompletion *completion, UInt32 noDataTimeout, UInt32 completionTimeout, IOByteCount reqCount);
-		virtual IOReturn 		Write(IOMemoryDescriptor *buffer, USBDeviceAddress address, Endpoint *endpoint, IOUSBCompletion *completion, UInt32 noDataTimeout, UInt32 completionTimeout, IOByteCount reqCount);
-		virtual IOReturn		IsocIO(IOMemoryDescriptor *buffer, UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList, USBDeviceAddress address, Endpoint *endpoint, IOUSBIsocCompletion *completion );
-		virtual IOReturn		IsocIO(IOMemoryDescriptor *buffer, UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList, USBDeviceAddress address, Endpoint *endpoint, IOUSBLowLatencyIsocCompletion *completion, UInt32 updateFrequency );	
-
-		// IOUSBControllerV2 methods
-		// we override these to deal with methods attempting to go through the workloop while we are in sleep
-		virtual IOReturn 		OpenPipe(USBDeviceAddress address, UInt8 speed, Endpoint *endpoint);
-		virtual IOReturn		AddHSHub(USBDeviceAddress highSpeedHub, UInt32 flags);
-		virtual IOReturn		RemoveHSHub(USBDeviceAddress highSpeedHub);
-		virtual IOReturn		SetTestMode(UInt32 mode, UInt32 port);
-		virtual IOReturn		ReadV2(IOMemoryDescriptor *buffer, USBDeviceAddress	address, Endpoint *endpoint, IOUSBCompletionWithTimeStamp *completion, UInt32 noDataTimeout, UInt32	completionTimeout, IOByteCount reqCount);
-	
-		// IOUSBControllerV3 methods
-	
-		// these are called through the workloop
-		static IOReturn					DoEnableAddressEndpoints(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
-		static IOReturn					DoEnableAllEndpoints(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
-		static IOReturn					GatedPowerChange(OSObject *owner, void *arg0, void *arg1, void *arg2, void *arg3 );
-
-		// also on the workloop
-	    static void						RootHubTimerFired(OSObject *owner, IOTimerEventSource *sender);
-	
-		// subclassable methods
-		virtual IOReturn				CheckForEHCIController(IOService *provider);
-		virtual	IOReturn				AllocatePowerStateArray(void);
-		virtual	IOReturn				InitForPM(void);
-		virtual IOReturn				CheckPowerModeBeforeGatedCall(char *fromStr);
-		virtual IOReturn				EnableAllEndpoints(bool enable);
-		virtual IOReturn				EnableBusMastering(bool enable);
-		virtual IOReturn				EnsureUsability(void);
-		virtual IOReturn				CheckForRootHubChanges(void);
-		virtual IOReturn				RootHubQueueInterruptRead(IOMemoryDescriptor *buf, UInt32 bufLen, IOUSBCompletion completion);
-		virtual IOReturn				RootHubAbortInterruptRead(void);
-		virtual IOReturn				RootHubStartTimer(UInt8 pollingRate);			// Obsolete see RootHubStartTimer32
-		virtual IOReturn				RootHubStopTimer(void);
-	
-		// these methods have a default implementation using some of the virtual methods below
-		virtual	void					ControllerOff(void);
-		virtual	void					ControllerRestart(void);
-		virtual	void					ControllerSleep(void);
-		virtual	void					ControllerDoze(void);
-		virtual	void					ControllerOn(void);
-
-		// these methods are pure virtual, and need to be implemented in the subclass driver
-		virtual	IOReturn				ResetControllerState(void) = 0;
-		virtual IOReturn				RestartControllerFromReset(void) = 0;
-		virtual	IOReturn				SaveControllerStateForSleep(void) = 0;
-		virtual	IOReturn				RestoreControllerStateFromSleep(void) = 0;
-		virtual IOReturn				DozeController(void) = 0;
-		virtual IOReturn				WakeControllerFromDoze(void) = 0;
-		virtual IOReturn				UIMEnableAddressEndpoints(USBDeviceAddress address, bool enable) = 0;
-		virtual IOReturn				UIMEnableAllEndpoints(bool enable) = 0;
-		virtual IOReturn				EnableInterruptsFromController(bool enable) = 0;
-	
-	public:
-	
-		// public methods
-		virtual IOReturn				EnableAddressEndpoints(USBDeviceAddress address, bool enable);
-		virtual bool					IsControllerAvailable(void);
-		virtual IOReturn				HandlePowerChange(unsigned long powerStateOrdinal);
-		virtual	UInt32					AllocateExtraRootHubPortPower(UInt32 extraPowerRequested);
-		virtual	void					ReturnExtraRootHubPortPower(UInt32 extraPowerReturned);
-	
-	OSMetaClassDeclareReservedUsed(IOUSBControllerV3,  0);
-	virtual IOReturn				RootHubStartTimer32(uint32_t pollingRate);
-	
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  1);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  2);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  3);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  4);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  5);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  6);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  7);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  8);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  9);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  10);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  11);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  12);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  13);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  14);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  15);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  16);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  17);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  18);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  19);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  20);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  21);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  22);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  23);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  24);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  25);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  26);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  27);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  28);
-	OSMetaClassDeclareReservedUnused(IOUSBControllerV3,  29);
-};
-
-#endif		// _IOKIT_IOUSBCONTROLLERV3_H
\ No newline at end of file
diff --git a/i386/include/IOKit/usb/IOUSBDevice.h b/i386/include/IOKit/usb/IOUSBDevice.h
deleted file mode 100644
index 58d73a0..0000000
--- a/i386/include/IOKit/usb/IOUSBDevice.h
+++ /dev/null
@@ -1,639 +0,0 @@
-/*
- * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.2 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
- * Please see the License for the specific language governing rights and 
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __OPEN_SOURCE__
-/*
- *
- *	$Log: IOUSBDevice.h,v $
- *	Revision 1.65  2009/10/18 20:20:37  nano
- *	Bring in fixes in 390.4.0 QL:  7310698 7301024 7307079 and 7310698
- *
- *	Revision 1.64.32.4  2009/10/15 21:17:43  nano
- *	If OverrideAtLocationID does not see a override property, return true
- *	
- *	Revision 1.64.32.3.2.1  2009/10/15 21:36:27  nano
- *	If OverrideAtLocationID does not see a override property, return true
- *	
- *	Revision 1.64.32.3  2009/10/14 19:16:15  nano
- *	Minor name changes
- *	
- *	Revision 1.64.32.2  2009/10/14 19:05:21  nano
- *	7284477 7293893 Simplify scheme to decide whether we want to override a property for a hub at a particular ID for a particular MacModel.  Added a IOUSBDevice API that tells us if we are in the right model and locationID to override a property
- *	
- *	Revision 1.64.32.1  2009/10/08 19:55:56  nano
- *	rdar://7284477 Allow us to overide the config descriptor of a 2514 hub on a K23F
- *	
- *	Revision 1.64  2009/09/08 12:28:45  nano
- *	<rdar://problem/7195788> IOUSBDevice headerdoc comment problem - GetNumConfigs name is wrong, should be GetNumConfigurations
- *	
- *	Revision 1.63  2009/05/07 19:43:09  nano
- *	Move our SnowLeopard branch to TOT
- *	
- *	Revision 1.57.84.6  2009/03/13 22:45:11  nano
- *	Bring in branches to fix 6676089 6675858 6567987 6490273
- *	
- *	Revision 1.57.84.5.4.1  2009/03/11 20:01:56  nano
- *	rdar://6567987  Do not let a Reset or a ReEnumerate through while the other is executing.
- *	
- *	Revision 1.57.84.5  2009/02/26 13:44:32  nano
- *	Bring in rdar://6536090&6586312 to SL branch
- *	
- *	Revision 1.57.84.4.10.1  2009/02/25 00:51:06  rhoads
- *	change the mechanism of getConfigLock so as to prevent a deadlock
- *	
- *	Revision 1.57.84.4  2009/02/13 15:57:33  rhoads
- *	roll in rdars: 6213394, 6489431, 6513000, 6515115, 6535200, 6567783
- *	
- *	Revision 1.57.84.3.48.3  2009/02/11 19:19:08  rhoads
- *	add back an expansionData variable to preserve binary compatibility
- *	
- *	Revision 1.57.84.3.48.2  2009/02/11 03:05:56  arulchan
- *	more ::SuspendDevice changes
- *	
- *	Revision 1.57.84.3.48.1  2009/01/23 21:34:15  arulchan
- *	fix for rdar://6213394
- *	
- *	Revision 1.57.84.3  2008/06/16 21:31:16  nano
- *	Bring in changes from Foxhound 320.2.17
- *	
- *	Revision 1.57.84.2  2008/04/22 22:38:01  nano
- *	Bring in changes from Foxhound-320.2.9
- *	
- *	Revision 1.60.28.2  2008/05/22 17:36:18  nano
- *	Fix the reporting of the internal bit for GetDeviceInformation
- *	
- *	Revision 1.60.28.1  2008/05/21 17:51:43  nano
- *	<rdar://problem/5952635> GetDeviceInformation needs some fixes
- *	
- *	Revision 1.60  2008/04/18 22:03:28  nano
- *	Bring in fix for rdar://5874560
- *	
- *	Revision 1.59.4.1  2008/04/18 21:55:55  nano
- *	<rdar://problem/5874560> Need API to know how much extra power has been allocated
- *	
- *	Revision 1.59  2008/04/17 16:56:57  nano
- *	Bring in branches for rdar://5867990 & rdar://5768343
- *	
- *	Revision 1.58.4.1  2008/04/16 20:26:13  nano
- *	<rdar://problem/5867990> Add API to allocate sleep current, as well as making sure that we return any extra power if our client dies or our device is terminated without returning it
- *	
- *	Revision 1.58  2008/04/14 16:08:38  nano
- *	Add new APIs for high power and for GetDeviceInformation.
- *	
- *	Revision 1.57.126.2  2008/04/13 05:25:40  nano
- *	Call into PolicyMaker for the GetPortInformation
- *	
- *	Revision 1.57.126.1  2008/04/11 22:25:44  nano
- *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
- *	
- *	Revision 1.57  2007/08/07 20:30:36  rhoads
- *	rolled in a few branches to TOT
- *	
- *	Revision 1.56.92.1  2007/08/07 03:43:34  nano
- *	Bring in more changes for M89 suppport -- like actually use the dang power if the properties are available
- *	
- *	Revision 1.56  2007/03/06 12:23:41  rhoads
- *	roll in 5024412, 5035829, and 5039670
- *	
- *	Revision 1.55.30.1  2007/02/27 16:08:33  rhoads
- *	some fine tuning of our IOService overrides, including not overriding willTerminate and didTerminate (5024412)
- *	
- *	Revision 1.55  2007/01/19 17:58:48  rhoads
- *	roll in branches for a leopard build
- *	
- *	Revision 1.54.30.1  2007/01/17 16:37:02  rhoads
- *	remove the IOUSBDevice::attach method which is not really useful
- *	
- *	Revision 1.54  2006/10/06 04:42:01  rhoads
- *	roll in branches 4727961, 4758404, 4759810, 4760274, and 4762769
- *	
- *	Revision 1.53.4.1  2006/10/04 16:03:57  rhoads
- *	better IOUSBHubDevice design
- *	
- */
-#endif
-
-#ifndef _IOKIT_IOUSBDEVICE_H
-#define _IOKIT_IOUSBDEVICE_H
-
-#include <IOKit/usb/IOUSBNub.h>
-#include <IOKit/usb/IOUSBPipe.h>
-#include <IOKit/IOBufferMemoryDescriptor.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOCommandGate.h>
-
-#include <kern/thread_call.h>
-
-// The following are definitions for errata properties needed for different devices.  This
-// should be but in the dictionary of the IOUSBDevice in question.  This can be achieved
-// by using the AppleUSBMergeNub class and having an IOProviderMergeProperties dictionary
-// with the required properties.
-
-// This property allows a device to specify a configuration value of 0 in its configuration
-// descriptor.  This does not follow the spec, but we will allow it in order to get the device 
-// to work.  The property should be a Boolean
-//
-#define kAllowConfigValueOfZero		"kAllowZeroConfigValue"
-#define kAllowNumConfigsOfZero		"kAllowZeroNumConfigs"
-
-
-class IOUSBController;
-class IOUSBControllerV2;
-class IOUSBInterface;
-class IOUSBHubPolicyMaker;
-/*!
-    @class IOUSBDevice
-    @abstract The IOService object representing a device on the USB bus.
-    @discussion This class provides functionality to configure a device and to create
-	IOUSBInterface objects to represent the interfaces of the device.
-*/
-
-class IOUSBDevice : public IOUSBNub
-{
-    friend class IOUSBController;
-    friend class IOUSBControllerV2;
-    friend class IOUSBInterface;
-    friend class IOUSBPipe;
-   
-    OSDeclareDefaultStructors(IOUSBDevice)
-
-protected:
-
-    USBDeviceAddress				_address;
-    IOUSBController *	     		_controller;
-    IOUSBPipe *						_pipeZero;
-    IOUSBDeviceDescriptor			_descriptor;
-    UInt32							_busPowerAvailable;
-    UInt8							_speed;
-    IOUSBEndpointDescriptor			_endpointZero; 				// Fake ep for control pipe
-    void *							_port;					// Obsolete, do not use
-    IOBufferMemoryDescriptor**		_configList;
-    IOUSBInterface**				_interfaceList;
-    UInt8							_currentConfigValue;
-    UInt8							_numInterfaces;
-    
-    struct ExpansionData 
-    {
-        UInt32					_portNumber;
-        thread_call_t			_doPortResetThread;
-        IOUSBDevice *			_usbPlaneParent;
-        bool					_portResetThreadActive;
-        bool					_allowConfigValueOfZero;
-        thread_call_t			_doPortSuspendThread;
-        bool					_portSuspendThreadActive;
-        thread_call_t			_doPortReEnumerateThread;
-        bool					_resetInProgress;
-        bool					_portHasBeenReset;
-        IORecursiveLock*		_XgetConfigLock;				// Obsolete
-        bool					_doneWaiting;                   // Obsolete
-        bool					_notifiedWhileBooting;          // Obsolete
-        IOWorkLoop *			_workLoop;
-        IOTimerEventSource *	_notifierHandlerTimer;
-        UInt32					_notificationType;
-        bool					_suspendInProgress;
-        bool					_portHasBeenSuspendedOrResumed;
-        bool					_addExtraResetTime;
-		bool					_suspendCommand;
-		IOCommandGate *			_commandGate;
-		OSSet *					_openInterfaces;
-		bool					_resetCommand;
-		IOReturn				_resetError;
-		IOReturn				_suspendError;
-        thread_call_t			_doMessageClientsThread;
-		IOUSBHubPolicyMaker *	_hubPolicyMaker;
-		UInt32					_sleepPowerAllocated;				// how much sleep power we already gave to our client
-		UInt32					_wakePowerAllocated;				// how much extra power during wake did we already give our client
-		UInt32					_devicePortInfo;
-		bool					_deviceIsInternal;					// Will be set if all our upstream hubs are captive (internal to the computer)
-		bool					_deviceIsInternalIsValid;			// true if we have already determined whether the device is internal
-		bool					_newGetConfigLock;					// new lock, taken within the WL gate, when doing a GetConfig
-		UInt32					_resetAndReEnumerateLock;			// "Lock" to prevent us from doing a reset or a re-enumerate while the other one is in progress		
-		UInt32					_locationID;
-    };	
-    ExpansionData * _expansionData;
-
-    const IOUSBConfigurationDescriptor *FindConfig(UInt8 configValue, UInt8 *configIndex=0);
-
-    virtual IOUSBInterface * GetInterface(const IOUSBInterfaceDescriptor *interface);
-
-public:
-    virtual IOReturn SetFeature(UInt8 feature);
-
-protected:    
-    virtual IOReturn GetConfigDescriptor(UInt8 configIndex, void *data, UInt32 len);
-
-    virtual IOReturn GetDeviceDescriptor(IOUSBDeviceDescriptor *desc, UInt32 size);
-
-    virtual bool init(USBDeviceAddress deviceAddress, UInt32 powerAvaiable, UInt8 speed, UInt8 maxPacketSize );
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 *score);
-    
-public:
-    // IOService methods
-    virtual bool		init( void );
-    virtual bool		start( IOService *provider );	
-	virtual bool		handleIsOpen(const IOService *forClient) const;
-	virtual bool		handleOpen(IOService *forClient, IOOptionBits options, void *arg);
-	virtual void		handleClose(IOService *forClient, IOOptionBits options);
-    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
-    virtual bool		terminate( IOOptionBits options = 0 );
-    virtual bool		requestTerminate( IOService * provider, IOOptionBits options );
-    virtual void		stop( IOService *provider );
-    virtual bool		finalize(IOOptionBits options);
-	virtual void		free( void );	
-
-	// IOUSBDevice methods
-    virtual void SetProperties();
-    
-    static IOUSBDevice *NewDevice(void);
-    
-    virtual void SetPort(void *port);			// Obsolete, do NOT use
-
-    /*!
-	@function FindNextInterfaceDescriptor
-	return a pointer to the next interface descriptor within the given full configuration descriptor satisfying the requirements specified, or NULL if there aren't any.
-        @param configDescIn the configuration descriptor within which to search. obtained from GetFullConfigurationDescriptor(configIndex). use NULL to specify the current configuration's descriptor.
-        @param intfDesc interface descriptor from which to start the search. NULL for the first interface descriptor in the given configuration descriptor
-        @param request IOUSBFindInterfaceRequest specifying the desired interface. Not changed.
-        @param descOut pointer to placeholder for the returned descriptor ptr
-	@result returns kIOReturnBadArgument if configDesc is not correct, or if configDesc is NULL and the device is not configured, or if intfDesc is not in configDesc. Otherwise returns kIOReturnSuccess or kIOUSBInterfaceNotFound.
-    */
-    virtual IOReturn FindNextInterfaceDescriptor(const IOUSBConfigurationDescriptor *configDescIn, 
-                                                 const IOUSBInterfaceDescriptor *intfDesc,
-                                                 const IOUSBFindInterfaceRequest *request,
-                                                 IOUSBInterfaceDescriptor **descOut);
-    /*!
-	@function FindNextInterface
-	return an pointer to an IOUSBInterface object satisfying the requirements specified in request, or NULL if there aren't any. the device
-        must be configured for there to be any interfaces.
-        @param current interface to start searching from, NULL to start at the beginning of the device's interface list for the current configuration.
-	@param request specifies what properties an interface must have to match.
-	@result Pointer to a matching IOUSBInterface, or NULL if none match. Note: The IOUSBInterface is NOT retained for the caller. If the caller wishes to continue to use the returned object, it should call retain() on that object.
-    */
-    virtual IOUSBInterface *FindNextInterface(IOUSBInterface *current,
-                                              IOUSBFindInterfaceRequest *request);
-
-    /*!
-        @function CreateInterfaceIterator 
-        return an OSIterator to iterate through interfaces satisfying the requirements specified in request.                        
-        @param request specifies what properties an interface must have to match.
-        @result Pointer to an OSIterator.
-    */
-    virtual OSIterator *CreateInterfaceIterator(IOUSBFindInterfaceRequest *request);
-
-    // Get pointer to full config info (cached in device, don't free returned pointer)
-    /*!
-	@function GetFullConfigurationDescriptor
-	return a pointer to all the descriptors for the requested configuration.
-        @param configIndex The configuration index (not the configuration value)
-	@result Pointer to the descriptors, which are cached in the IOUSBDevice object.
-    */
-    virtual const IOUSBConfigurationDescriptor *GetFullConfigurationDescriptor(UInt8 configIndex);
-
-    /*!
-	@function GetConfigurationDescriptor
-        Copy the specified amount of data for a configuration into the suppled buffer.
-        @param configValue The configuration value
-	@param data Buffer to copy data into
-	@param len number of bytes to copy
-    */
-    virtual IOReturn GetConfigurationDescriptor(UInt8 configValue, void *data, UInt32 len);
-
-    /*!
-	@function ResetDevice
-	Reset the device, returning it to the addressed, unconfigured state.
-	This is useful if a device has got badly confused. Note that the AppleUSBComposite driver will automatically
-        reconfigure the device if it is a composite device.
-    */
-    virtual IOReturn ResetDevice();
-
-    /*!
-	@function SetConfiguration
-	Do a USB SetConfiguration call to the device. The caller must have the device open() in order to 
-	actually cause a configuration change. If the device is currently configured, all IOUSBInterface objects
-	associated with the device are freed. After the new configuration has been set, all of its IOUSBInterface objects are
-	instantiated automatically.
-	@param forClient The client requesting the configuration change
-	@param configValue The desired configuration value.
-	@param startInterfaceMatching A boolean specifying whether IOKit should begin the process of finding
-	matching drivers for the new IOUSBInterface objects.
-    */
-    virtual IOReturn SetConfiguration(IOService *forClient, UInt8 configValue, bool startInterfaceMatching=true);
-    
-    // Access to addressing and cached info
-    /*!
-        @function GetAddress
-        returns the bus address of the device
-    */
-    virtual USBDeviceAddress GetAddress(void);
-    
-    /*!
-        @function GetSpeed
-        returns the speed of the device
-    */
-    virtual UInt8 GetSpeed(void);
-    /*!
-        @function GetBus
-        returns a pointer to the IOUSBController object for the device
-    */
-    virtual IOUSBController *GetBus(void);
-    /*!
-        @function GetBusPowerAvailable
-        returns the power available to the device, in units of 2mA
-    */
-    virtual UInt32 GetBusPowerAvailable( void );
-    /*!
-        @function GetMaxPacketSize
-        returns the maximum packet size for endpoint zero (only 8, 16, 32, 64 are valid)
-    */
-    virtual UInt8 GetMaxPacketSize(void);
-    /*!
-        @function GetVendorID
-        returns the Vendor ID of the device
-    */
-    virtual UInt16 GetVendorID(void);
-    /*!
-        @function GetProductID
-        returns the Product ID of the device
-    */
-    virtual UInt16 GetProductID(void);
-    /*!
-        @function GetDeviceRelease
-        returns the DeviceRelease information
-    */
-    virtual UInt16 GetDeviceRelease(void);
-    /*!
-        @function GetNumConfigurations
-        returns the number of configs in the device config descriptor
-    */
-    virtual UInt8 GetNumConfigurations(void);
-    /*!
-        @function GetManufacturerStringIndex
-        returns the index of string descriptor describing manufacturer
-    */
-    virtual UInt8 GetManufacturerStringIndex(void );
-    /*!
-        @function GetProductStringIndex
-        returns the index of string descriptor describing product
-    */
-    virtual UInt8 GetProductStringIndex(void );
-    /*!
-        @function GetSerialNumberStringIndex
-        returns the index of string descriptor describing the device's serial number
-    */
-    virtual UInt8 GetSerialNumberStringIndex(void );
-    /*!
-        @function GetPipeZero
-        returns a pointer to the device's default control pipe
-    */
-    virtual IOUSBPipe * GetPipeZero(void);
-
-	// Deprecated but needed for binary compatibility
-    virtual IOUSBPipe*	MakePipe(const IOUSBEndpointDescriptor *ep);
-    
-    // this method is deprecated. use the other DeviceRequest methods
-    virtual IOReturn DeviceRequest(IOUSBDevRequest	*request,
-                                IOUSBCompletion	*completion = 0);
-
-    // Same but with a memory descriptor
-    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc	*request,
-                                   IOUSBCompletion	*completion = 0);
-
-    /*!
-	@function GetConfiguration
-	Gets the current configuration from the IOUSBDevice object.  Note that this call will send a control
-        request on the bus to get the current configuration from the physical device.
-	@param configNum Pointer to place to store configuration value.
-    */
-    virtual IOReturn GetConfiguration(UInt8 *configNumber);
-
-    /*!
-        @function GetDeviceStatus
-        Gets the device's status.  Note that this sends a control request to the physical device.
-        @param status Pointer to place to store the status.
-    */
-    virtual IOReturn GetDeviceStatus(USBStatus *status);
-
-    /*! 
-	@function GetStringDescriptor
-	Get a string descriptor as ASCII, in the specified language (default is US English)
-	@param index Index of the string descriptor to get.
-	@param buf Pointer to place to store ASCII string
-	@param maxLen Size of buffer pointed to by buf
-        @param lang Language to get string in (default is US English)
-    */
-    virtual IOReturn GetStringDescriptor(UInt8 index, char *buf, int maxLen, UInt16 lang=0x409);
-    
-    /*! 
-	@function GetChildLocationID
-	Get the locationID (UInt32) given the port number and the parent's location
-	@param parentLocationID locationID for the hub to which this device is attached.
-	@param port Port number of the hub where this device is attached
-    */
-    virtual UInt32 GetChildLocationID(UInt32 parentLocationID, int port);
-
-    virtual const IOUSBDescriptorHeader* FindNextDescriptor(const void *cur, UInt8 descType);
-
-    virtual void 	DisplayNotEnoughPowerNotice();
-    
-    // this is a non-virtual function so that we don't have to take up a binary compatibility slot.
-    UInt16	GetbcdUSB(void);
-    UInt8	GetProtocol(void);
-	void	SetBusPowerAvailable(UInt32 newPower);
-
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  0);
-    /*!
-	@function DeviceRequest
-        @abstract execute a control request to the default control pipe (pipe zero)
-        @param request The parameter block to send to the device
-        @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
-        if no data has been transferred on the bus.
-        @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
-        not been completed.
-		@param completion Function to call when request completes. If omitted then
-	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
-	 the IOUSBDevRequest is not released until the callback has occurred.
-
-    */
-    virtual IOReturn DeviceRequest(IOUSBDevRequest	*request,
-				UInt32 noDataTimeout,
-				UInt32 completionTimeout,
-                                IOUSBCompletion	*completion = 0);
-
-    /*!
-	 @function DeviceRequest
-	 @abstract execute a control request to the default control pipe (pipe zero)
-	 @param request The parameter block to send to the device (with the pData as an IOMemoryDesriptor)
-	 @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
-	 if no data has been transferred on the bus.
-	 @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
-	 not been completed.
-	 @param completion Function to call when request completes. If omitted then
-	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
-	 the IOUSBDevRequest is not released until the callback has occurred.
-	 
-	 */
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  1);
-    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc	*request,
-				    UInt32 noDataTimeout,
-				    UInt32 completionTimeout,
-				    IOUSBCompletion	*completion = 0);
-
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  2);
-    /*!
-	@function SuspendDevice
-        @abstract Instruct the hub to which this device is attached to suspend or resume the port to which the device is attached.
-        Note that if there are any outstanding transactions on any pipes in the device, those transactions will get returned with a 
-        kIOReturnNotResponding error.
-        @param suspend Boolean value. true = suspend, false = resume.
-    */
-    virtual IOReturn SuspendDevice( bool suspend);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  3);
-    /*!
-	@function ReEnumerateDevice
-        @abstract Instruct the hub to which this device is attached to reset the port to which this device is attached. This causes the
-        IOUSBDevice object and any child objects (IOUSBInterface objects or driver objects) to be terminated, and the device to be
-        completely reenumerated, as if it had been detached and reattached.
-        @param options Reserved for future use.
-    */
-    virtual IOReturn ReEnumerateDevice( UInt32 options );
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  4);
-    /*!
-        @function DisplayUserNotification
-        @abstract  Will use the KUNCUserNotification mechanism to display a notification to the user.
-        @param notificationType Which notification to display.
-     */
-    virtual void	DisplayUserNotification(UInt32 notificationType);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  5);
-	/*!
-        @function MakePipe
-	 @abstract build a pipe on a given endpoint
-	 @param ep A description of the endpoint
-	 @param interface The IOUSBInterface object requesting the pipe
-	 returns the desired IOUSBPipe object
-	 */
-    virtual IOUSBPipe*	MakePipe(const IOUSBEndpointDescriptor *ep, IOUSBInterface *interface);
-    
-	
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  6);
-	/*!
-	 @function SetHubParent
-	 @abstract Used by the hub driver to give the nub a pointer to its HubPolicyMaker object
-	 @param hubPolicyMaker	The object representing the Hub driver
-	 */
-    virtual void	SetHubParent(IOUSBHubPolicyMaker *hubParent);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  7);
-	/*!
-	 @function GetHubParent
-	 @abstract Used by the hub driver to give the nub a pointer to its HubPolicyMaker object
-	 @param hubPolicyMaker	The object representing the Hub driver
-	 */
-    virtual IOUSBHubPolicyMaker*	GetHubParent();
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  8);
-    /*!
-	 @function 	GetDeviceInformation
-	 @abstract 	Returns status information about the USB device, such as whether the device is captive or whether it is in the suspended state.
-	 @param requestedPower 	The desired amount of power that the client wishes to reserve
-	 @result 		Actual power that was reserved
-	 
-		*/
-	virtual IOReturn	GetDeviceInformation(UInt32 *info);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  9);
-    /*!
-	 @function				RequestExtraPower
-	 @abstract				Clients can use this API to reserve extra power for use by this device while the machine is asleep or while it is awake.  Units are milliAmps (mA).
-	 @param type			Indicates whether the power is to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
-	 @param requestedPower 	Amount of power desired, in mA
-	 @result				Amount of power actually reserved, in mA.  It can be less than the requested or zero.
-	 
-	 */
-	virtual UInt32	RequestExtraPower(UInt32 type, UInt32 requestedPower);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  10);
-    /*!
-	 @function				ReturnExtraPower
-	 @abstract				Clients can use this API to tell the system that they will not use power that was previously reserved by using the RequestExtraPower API.
-	 @param type			Indicates whether the power is to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
-	 @param returnedPower 	Amount of power that is no longer needed, in mA
-	 @result				If the returnedPower was not previously allocated, an error will be returned.  This will include the case for power that was requested for sleep but was returned for wake.
-	 
-	 */
-	virtual IOReturn		ReturnExtraPower(UInt32 type, UInt32 returnedPower);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  11);
-    /*!
-	 @function				GetExtraPowerAllocated
-	 @abstract				Clients can use this API to ask how much extra power has already been reserved by this device.  Units are milliAmps (mA).
-	 @param type			Indicates whether the allocated power was to be used during wake or sleep (One of kUSBPowerDuringSleep or kUSBPowerDuringWake)
-	 @result				Amount of power allocated, in mA.
-	 
-	 */
-	virtual UInt32			GetExtraPowerAllocated(UInt32 type);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBDevice,  12);
-    /*!
-	 @function				DoLocationOverrideAndModelMatch
-	 @abstract				Will look for a kOverrideIfAtLocationID array proerty with locationID entries and a "MacModel" property.  If any of the locationIDs match to the Mac Model, will return true.
-	 						If there is no kOverrideAtLocationID property, it will also return true.
-	 @result				True if we have a match, false otherwise
-	 */
-	virtual	bool			DoLocationOverrideAndModelMatch();
-	
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  13);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  14);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  15);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  16);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  17);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  18);
-    OSMetaClassDeclareReservedUnused(IOUSBDevice,  19);
-    
-private:
-
-    static void 	ProcessPortResetEntry(OSObject *target);
-    void 		ProcessPortReset(void);
-
-    void 		TerminateInterfaces(void);
-
-    static void 	ProcessPortReEnumerateEntry(OSObject *target, thread_call_param_t options);
-    void 		ProcessPortReEnumerate(UInt32 options);
-	
-    static void 	DoMessageClientsEntry(OSObject *target, thread_call_param_t messageStruct);
-    void 		DoMessageClients( void * messageStructPtr);
-	
-    static void 	DisplayUserNotificationForDeviceEntry (OSObject *owner, IOTimerEventSource *sender);
-    void		DisplayUserNotificationForDevice( );
-    
-    UInt32              SimpleUnicodeToUTF8(UInt16 uChar, UInt8 utf8Bytes[4]);
-    void                SwapUniWords (UInt16  **unicodeString, UInt32 uniSize);
-
-    IOReturn			TakeGetConfigLock(void);
-    IOReturn			ReleaseGetConfigLock(void);
-    static IOReturn		ChangeGetConfigLock(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-};
-
-#endif /* _IOKIT_IOUSBDEVICE_H */
diff --git a/i386/include/IOKit/usb/IOUSBHIDDriver.h b/i386/include/IOKit/usb/IOUSBHIDDriver.h
deleted file mode 100644
index 5e76887..0000000
--- a/i386/include/IOKit/usb/IOUSBHIDDriver.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef IOUSBHIDDRIVER_H
-#define IOUSBHIDDRIVER_H
-
-#include <IOKit/IOBufferMemoryDescriptor.h>
-
-#include <IOKit/hid/IOHIDDevice.h>
-
-#include <IOKit/usb/IOUSBBus.h>
-#include <IOKit/usb/IOUSBInterface.h>
-#include <IOKit/usb/USB.h>
-
-
-#define ENABLE_HIDREPORT_LOGGING	0
-
-// Report types from low level USB:
-//	from USBSpec.h:
-//    enum {
-//        kHIDRtInputReport		= 1,
-//        kHIDRtOutputReport		= 2,
-//        kHIDRtFeatureReport		= 3
-//    };
-//    
-//	from IOHIDDescriptorParser.h:
-//    // types of HID reports (input, output, feature)
-//    enum
-//    {
-//        kHIDInputReport			= 	1,
-//        kHIDOutputReport,
-//        kHIDFeatureReport,
-//        kHIDUnknownReport		=	255
-//    };
-//    
-// Report types from high level HID Manager:
-//	from IOHIDKeys.h:
-//    enum IOHIDReportType
-//    {
-//        kIOHIDReportTypeInput = 0,
-//        kIOHIDReportTypeOutput,
-//        kIOHIDReportTypeFeature,
-//        kIOHIDReportTypeCount
-//    };
-//
-#define HIDMGR2USBREPORTTYPE(x) (x + 1)
-#define USB2HIDMGRREPORTTYPE(x) (x - 1)
-
-
-// Note: In other Neptune files, kMaxHIDReportSize was defined as 64. But Ferg & Keithen were unable to
-// find that value in the USB HID 1.1 specs. Brent had previously changed it to 256 in the OS 9 HID Driver
-// to  allow for reports spanning multiple packets. 256 may be no more a hard and fast limit, but it's 
-// working for now in OS 9.
-#define kMaxHIDReportSize 256			// Max packet size = 8 for low speed & 64 for high speed.
-#define kHIDDriverRetryCount	3
-#define	kUSBHIDReportLoggingLevel	"USB HID Report Logging Level"
-
-
-// power states for the driver (awake or suspended)
-enum
-{
-	kUSBHIDPowerStateOff		= 0,
-	kUSBHIDPowerStateRestart	= 1,
-	kUSBHIDPowerStateSleep		= 2,			// this could be system sleep or idle sleep
-	kUSBHIDPowerStateLowPower	= 3,			// this is idling
-	kUSBHIDPowerStateOn			= 4,			// this is fully on
-	kUSBHIDNumberPowerStates	= 5
-};
-
-
-/*!
- @class IOUSBHIDDriver
- @abstract Driver that matches to USB HID devices.
- @discussion This class can be overriden to provide for specific behaviors.
- */
-class IOUSBHIDDriver : public IOHIDDevice
-{
-    OSDeclareDefaultStructors(IOUSBHIDDriver)
-
-    IOUSBInterface *			_interface;
-    IOUSBDevice	*				_device;
-    IOUSBPipe *					_interruptPipe;
-    UInt32						_maxReportSize;
-    IOBufferMemoryDescriptor *	_buffer;
-    IOUSBCompletion				_completion;
-    UInt32						_retryCount;
-    thread_call_t				_deviceDeadCheckThread;
-    thread_call_t				_clearFeatureEndpointHaltThread;
-    bool						_deviceDeadThreadActive;
-    bool						_deviceIsDead;                          // Should really be called "abort expected"
-    bool						_deviceHasBeenDisconnected;
-    bool						_needToClose;
-    UInt32						_outstandingIO;
-    IOCommandGate *				_gate;
-    IOUSBPipe *					_interruptOutPipe;
-    UInt32						_locationID; 	
-    IOBufferMemoryDescriptor *	_outBuffer;								// Obsolete
-    UInt32						_deviceUsage;							// Obsolete
-    UInt32						_deviceUsagePage;						// Obsolete
-
-    struct IOUSBHIDDriverExpansionData 
-    {
-        IOWorkLoop	*					_workLoop;
-        thread_call_t					_handleReportThread;
-        IOService *						_rootDomain;
-        AbsoluteTime					_wakeUpTime;
-        IOUSBCompletionWithTimeStamp	_completionWithTimeStamp;
-        bool							_checkForTimeStamp;
-        UInt32							_msToIgnoreTransactionsAfterWake;
-        IOTimerEventSource	*			_suspendPortTimer;
-		bool							_portSuspended;
-		UInt32							_suspendTimeoutInMS;
-		UInt8							_interfaceNumber;
-		bool							_logHIDReports;
-		UInt8							_hidLoggingLevel;
-		bool							_needToClearPipeStall;
-		SInt32							_queuedReports;
-		AbsoluteTime					_interruptTimeStamp;
-		bool							_powerStateChanging;
-		unsigned long					_myPowerState;
-		bool							_pendingRead;
-		UInt32							_deviceDeadCheckLock;			// "Lock" to prevent us from executing the device dead check while in progress		
-    };
-    IOUSBHIDDriverExpansionData *_usbHIDExpansionData;
-    
-    static void 		InterruptReadHandlerEntry(OSObject *target, void *param, IOReturn status, UInt32 bufferSizeRemaining);
-    static void 		InterruptReadHandlerWithTimeStampEntry(OSObject *target, void *param, IOReturn status, UInt32 bufferSizeRemaining, AbsoluteTime timeStamp);
-    void				InterruptReadHandler(IOReturn status, UInt32 bufferSizeRemaining, AbsoluteTime timeStamp);
-
-    static void 		CheckForDeadDeviceEntry(OSObject *target);
-    void				CheckForDeadDevice();
-
-    static void			ClearFeatureEndpointHaltEntry(OSObject *target);
-    void				ClearFeatureEndpointHalt(void);
-    
-    static void			HandleReportEntry(OSObject *target, thread_call_param_t timeStamp);
-    void				HandleReport(AbsoluteTime timeStamp);
-    
-    virtual void 		processPacket(void *data, UInt32 size);		// Obsolete
-
-    static IOReturn		ChangeOutstandingIO(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-    static IOReturn		ClaimPendingRead(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-
-    static void			SuspendPortTimer(OSObject *target, IOTimerEventSource *sender);
-
-public:
-        
-    // IOService methods
-    //
-    virtual bool			init(OSDictionary *properties);
-    virtual bool			start(IOService * provider);
-    virtual bool			didTerminate( IOService * provider, IOOptionBits options, bool * defer );
-    virtual bool			willTerminate( IOService * provider, IOOptionBits options );
-    virtual void			stop(IOService *  provider);
-    virtual void			free();
-    virtual IOReturn		message( UInt32 type, IOService * provider,  void * argument = 0 );
-	virtual unsigned long	maxCapabilityForDomainState ( IOPMPowerFlags domainState );
-	virtual IOReturn		powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
-	virtual IOReturn		setPowerState ( unsigned long powerStateOrdinal, IOService* whatDevice );
-	virtual IOReturn		powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
- 	virtual void			powerChangeDone ( unsigned long fromState);
-  
-
-    // IOHIDDevice methods
-    //
-    virtual bool		handleStart(IOService * provider);
-    virtual void		handleStop(IOService *  provider);
-
-    virtual IOReturn 	newReportDescriptor( IOMemoryDescriptor ** descriptor ) const;
-                        
-    virtual OSString * 	newTransportString() const;
-
-    virtual OSNumber * 	newVendorIDNumber() const;
-
-    virtual OSNumber * 	newProductIDNumber() const;
-
-    virtual OSNumber * 	newVersionNumber() const;
-
-    virtual OSString * 	newManufacturerString() const;
-
-    virtual OSString * 	newProductString() const;
-
-    virtual OSString * 	newSerialNumberString() const;
-
-    virtual OSNumber * 	newLocationIDNumber() const;
-
-    virtual OSNumber * 	newCountryCodeNumber() const;
-
-    virtual IOReturn	getReport( IOMemoryDescriptor * report,
-                                IOHIDReportType      reportType,
-                                IOOptionBits         options = 0 );
-                                
-    virtual IOReturn 	setReport( IOMemoryDescriptor * report,
-                                IOHIDReportType      reportType,
-                                IOOptionBits         options = 0 );
-
-    // HID driver methods
-    //
-    virtual OSString * 	newIndexedString(UInt8 index) const;
-
-    virtual UInt32		getMaxReportSize();
-	
-    virtual void		DecrementOutstandingIO(void);
-    virtual void		IncrementOutstandingIO(void);
-    virtual IOReturn	StartFinalProcessing();
-    virtual IOReturn	SetIdleMillisecs(UInt16 msecs);
-    
-private:
-
-	IOReturn			GetHIDDescriptor(UInt8 inDescriptorType, UInt8 inDescriptorIndex, UInt8 *vOutBuf, UInt32 *vOutSize);
-	IOReturn			GetReport(UInt8 inReportType, UInt8 inReportID, UInt8 *vInBuf, UInt32 *vInSize);
-	IOReturn			SetReport(UInt8 outReportType, UInt8 outReportID, UInt8 *vOutBuf, UInt32 vOutSize);
-	IOReturn			GetIndexedString(UInt8 index, UInt8 *vOutBuf, UInt32 *vOutSize, UInt16 lang = 0x409) const;
-	IOReturn			SetProtocol(UInt32 protocolType);
-	char				GetHexChar(char hexChar);
-	IOReturn			AbortAndSuspend( bool suspend );
-	
-        
-
-#if ENABLE_HIDREPORT_LOGGING
-    void LogBufferReport(char *report, UInt32 len);
-    void LogMemReport(IOMemoryDescriptor * reportBuffer);
-    char GetHexChar(char hexChar);
-#endif
-
-public:
-    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  0);
-    virtual IOReturn    RearmInterruptRead();
-    
-    /*!
-		@function SuspendPort
-	 @abstract Suspends the port for this device or optionally sets a timeout to suspend after a period of inactivity.
-	 @discussion  This call can be used to immediately suspend/resume a port or to enable the suspension of the port after a period of inactivity.  If called with suspendPort = true (no timeout parameter), the HID driver
-	 will immediately suspend the port, after aborting any outstanding reads on the interrupt pipe.  If called with suspendPort = true and timeout != 0, it will suspend the port after the timeout number of ms have
-	 passed without any read completions.  If called with suspendPort = false, the port will be immediately resumed and the reads will be re-issued.  If a timeout was enabled, it will be cancelled.
-	 @param suspendPort Boolean value. true = suspend the port, false = resume the port.
-	 @param timeoutMS	Value in milliseconds If value is non-zero, the port will be suspended after the timeout milliseconds have passed without any read completions.
-	 @result The IOReturn value from the IOUSBDevice::Suspend() call. 
-	*/
-    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  1);
-	virtual IOReturn	SuspendPort(bool suspendPort, UInt32 timeoutMS = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  2);
-	virtual bool		IsPortSuspended();
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  3);
-    virtual void		LogMemReport(UInt8 level, IOMemoryDescriptor * reportBuffer, IOByteCount size);
-
-    OSMetaClassDeclareReservedUsed(IOUSBHIDDriver,  4);
-	virtual IOReturn	InitializeUSBHIDPowerManagement(IOService *provider);
-	
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  5);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  6);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  7);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  8);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver,  9);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 10);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 11);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 12);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 13);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 14);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 15);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 16);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 17);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 18);
-    OSMetaClassDeclareReservedUnused(IOUSBHIDDriver, 19);
-};
-
-#endif	// IOUSBHIDDRIVER_H
diff --git a/i386/include/IOKit/usb/IOUSBHubDevice.h b/i386/include/IOKit/usb/IOUSBHubDevice.h
deleted file mode 100644
index 91c728c..0000000
--- a/i386/include/IOKit/usb/IOUSBHubDevice.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __OPEN_SOURCE__
-/*
- *
- *	$Log: IOUSBHubDevice.h,v $
- *	Revision 1.11  2009/09/12 03:42:16  rhoads
- *	merge in the changes for the 390.3.4b QL
- *
- *	Revision 1.10.52.1  2009/09/10 18:50:52  nano
- *	<rdar://problem/7134800> Task: Extra Current support for Ibex Peak RMHs -- look for a property that tells us to ask our USB plane parent for the extra current.  This will allow the RMH to pass on the request to it's parent.
- *	
- *	Revision 1.10  2009/05/07 19:43:09  nano
- *	Move our SnowLeopard branch to TOT
- *	
- *	Revision 1.6.102.3  2008/06/16 22:02:16  nano
- *	Bring in changes from Foxound 320.2.19
- *	
-
- *	Revision 1.6.102.2  2008/04/22 22:38:01  nano
- *	Bring in changes from Foxhound-320.2.9
- *	
- *	Revision 1.8.62.2  2008/06/06 21:08:44  nano
- *	Enable dynamic allocation of power for M89, so we don't reserve it if there isn't a high power device attached
- *	
- *	Revision 1.8.62.1  2008/06/06 04:14:32  nano
- *	Fix SleepCurrent allocation so it will work with hub devices and root hub devices as well as consolidating it across all controllers
- *	
- *	Revision 1.8  2008/04/17 16:56:57  nano
- *	Bring in branches for rdar://5867990 & rdar://5768343
- *	
- *	Revision 1.7.4.1  2008/04/17 15:54:07  nano
- *	Merged PR-5768343 into this branch and fixed a couple of issues
- *	
- *	Revision 1.7.2.1  2008/04/16 00:48:49  ferg
- *	Bug #: 5768343
- *	Add support for hubs with high-power downstream port capability.  This is
- *	controlled by the properties "AAPL,current-available" and "AAPL,current-extra".
- *	
- *	Revision 1.7  2008/04/14 16:08:38  nano
- *	Add new APIs for high power and for GetDeviceInformation.
- *	
- *	Revision 1.6.144.1  2008/04/11 22:25:44  nano
- *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
- *	
- *	Revision 1.6  2007/08/01 16:10:18  rhoads
- *	roll in extra power changes
- *	
- *	Revision 1.5.118.1  2007/07/27 16:49:10  rhoads
- *	merge the extra current stuff into Leopard, and add extra sleep current for self powered hubs
- *	
- *	Revision 1.5  2007/01/20 00:47:01  rhoads
- *	roll in Hub Policy Maker changes
- *	
- *	Revision 1.4  2006/12/22 23:05:46  rhoads
- *	roll in branches 4364835 and 4277683-2
- *	
- *	Revision 1.3.20.3  2007/01/15 19:58:07  rhoads
- *	saving more changes
- *	
- *	Revision 1.3.20.2  2007/01/09 21:55:53  rhoads
- *	commit some stuff to try to fix a permissions issue
- *	
- *	Revision 1.3.20.1  2006/12/18 19:13:56  rhoads
- *	re-integrate the old branch into TOT
- *	
- *	Revision 1.3.12.4  2006/12/18 17:33:48  rhoads
- *	looking good except for sleep/wake
- *	
- *	Revision 1.3.12.3  2006/12/08 05:42:40  rhoads
- *	mostly working
- *	
- *	Revision 1.3.12.2  2006/11/14 22:37:06  rhoads
- *	more changes with the root hubs
- *	
- *	Revision 1.3.12.1  2006/11/07 16:55:52  rhoads
- *	change to get the IOUSBHubDevice nubs into the IOPower tree
- *	
- *	Revision 1.3  2006/10/06 04:42:02  rhoads
- *	roll in branches 4727961, 4758404, 4759810, 4760274, and 4762769
- *	
- *	Revision 1.2.4.2  2006/10/04 23:01:24  rhoads
- *	better naming
- *	
- *	Revision 1.2.4.1  2006/10/04 16:03:57  rhoads
- *	better IOUSBHubDevice design
- *	
- */
-#endif
-
-
-#ifndef _IOKIT_IOUSBHUBDEVICE_H
-#define _IOKIT_IOUSBHUBDEVICE_H
-
-#include <IOKit/usb/IOUSBDevice.h>						// our superclass
-
-// forward refeference. we don't include the header file because it would cause a circular reference
-class IOUSBHubPolicyMaker;
-
-enum {
-	kIOUSBHubDeviceIsRootHub			=	0x0001,
-	kIOUSBHubDeviceIsOnHighSpeedBus		=	0x0002,
-	kIOUSBHubDeviceCanSleep				=	0x0004
-};
-
-/*!
-    @class IOUSBHubDevice
-    @abstract New in MAC OS X 10.5. The IOKit object representing a hub device on the USB bus. It is a subclass of IOUSBDevice.
-    @discussion With the exception of the IOUSBRootHubDevice objects representing the root hubs, every IOUSBDevice
-	will have an IOUSBHubDevice as its parent in the IOUSB plane. USB KEXT drivers will have the ability to 
-	query this device for characteristics of the hub into which they are connected. This class will also give a dive driver
-	the abilty to get an IOService* pointing to the hub driver itself, which can then be used as the parent in the power plane.
-*/
-
-class IOUSBHubDevice : public IOUSBDevice
-{
-	friend class IOUSBHubPolicyMaker;
-	friend class AppleUSBHub;
-	friend class IOUSBController;								// for the "can sleep" characteristic
-	
-private:
-    OSDeclareDefaultStructors(IOUSBHubDevice)
-
-	UInt32					_myCharacteristics;					// bitmap of my characteristics
-	IOUSBHubPolicyMaker		*_myPolicyMaker;					// pointer to the policy maker in the IOPower tree for this hub
-
-    struct ExpansionData 
-	{ 
-		UInt32					_maxPortCurrent;				// maximum current in milliamps per downstream port
-		UInt32					_totalExtraCurrent;				// total amount of current above the spec'ed current per port available (during normal operation)
-		UInt32					_totalSleepCurrent;				// total amount of current that can be drawn during sleep
-		UInt32					_canRequestExtraPower;			// If 0, this hub does not support requesting extra power from its parent, non-zero:  how much power we need to request in order to give out _extraPowerForPorts
-		UInt32					_extraPowerForPorts;			// Of the power requested from our parent, how much can we parcel out -- the rest is consumed by voltage drop thru the cable
-		UInt32					_extraPowerAllocated;			// Amount of power that we actually got from our parent
-		bool					_requestFromParent;				// True if we are to request the extra power from our parent, without modifying the request.  Used for RMHs
-	};
-    ExpansionData			*_expansionData;
-	
-protected:
-	// IOUSBHubDevice methods which will be used by the hub driver (which is also the Policy Maker)
-	virtual	void			SetPolicyMaker(IOUSBHubPolicyMaker *policyMaker);
-	virtual void			SetHubCharacteristics(UInt32);
-	virtual bool			InitializeCharacteristics(void);					// used at start
-	
-public:
-	// static constructor
-    static IOUSBHubDevice	*NewHubDevice(void);
-
-	// IOKit methods
-    virtual bool			init();
-	virtual bool			start( IOService * provider );
-    virtual void			stop( IOService *provider );
-    virtual void			free();
-	
-	// public IOUSBHubDevice methods
-
-	void					SetTotalSleepCurrent(UInt32 sleepCurrent);
-	UInt32					GetTotalSleepCurrent();
-	
-    /*!
-	 @function GetPolicyMaker
-	 returns a pointer to the policy maker for the hub, which can be used as the power plane parent.
-	 @result returns an IOUSBHubPolicyMaker* pointing to the policy maker for this hub. returns NULL is no policy maker is active on the hub device.
-	 */
-	virtual IOUSBHubPolicyMaker *GetPolicyMaker(void);
-	
-    /*!
-	@function GetHubCharacteristics
-	returns characteristics of the hub device which might be useful for the driver of a device connected to the hub.
-		kIOUSBHubDeviceIsRootHub indicates that the hub is a root hub
-		kIOUSBHubDeviceIsOnHighSpeedBus indicates that the hub is running on a High Speed bus. If this bit is set and kIOUSBHubDeviceIsHighSpeed is clear, then this is a Classic Speed hub running on a High Speed bus, which means that Split Transactions will be used to communicate with downstream devices.
-
-	@result returns a bitmap of characteristics
-    */
-	virtual	UInt32			GetHubCharacteristics();
-	
-    /*!
-	@function GetMaxProvidedPower
-	returns the maximum amount of power available on any downstream port of this hub
-	@result the power is returned in milliamps - usually 100ma or 500 ma.
-    */
-	virtual UInt32			GetMaxProvidedPower();
-
-    /*!
-	@function RequestProvidedPower
-	requests power from the hub device
-	@param requestedPower - the amount of power requested in milliamps (usually 100ma or 500 ma)
-	@result the amount of power allocated for this driver in milliamps (usually 100ma or 500 ma)
-    */
-	virtual UInt32			RequestProvidedPower(UInt32 requestedPower);
-
-	virtual UInt32			RequestExtraPower(UInt32 requestedPower);
-
-	virtual void			ReturnExtraPower(UInt32 returnedPower);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  0);
-	
-	virtual void			InitializeExtraPower(UInt32 maxPortCurrent, UInt32 totalExtraCurrent);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  1);
-	virtual UInt32			RequestSleepPower(UInt32 requestedPower);
-
-    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  2);
-	virtual void			ReturnSleepPower(UInt32 returnedPower);
-
-    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  3);
-	virtual void			SetSleepCurrent(UInt32 sleepCurrent);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubDevice,  4);
-	virtual	UInt32			GetSleepCurrent();
-	
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  5);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  6);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  7);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  8);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  9);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  10);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  11);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  12);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  13);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  14);
-    OSMetaClassDeclareReservedUnused(IOUSBHubDevice,  15);
-};
-
-#endif /* _IOKIT_IOUSBROOTHUBDEVICE_H */
-
diff --git a/i386/include/IOKit/usb/IOUSBHubPolicyMaker.h b/i386/include/IOKit/usb/IOUSBHubPolicyMaker.h
deleted file mode 100644
index a0021d3..0000000
--- a/i386/include/IOKit/usb/IOUSBHubPolicyMaker.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2007 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __OPEN_SOURCE__
-/*
- *
- *	$Log: IOUSBHubPolicyMaker.h,v $
- *	Revision 1.10  2009/05/07 19:43:09  nano
- *	Move our SnowLeopard branch to TOT
- *
- *	Revision 1.7.72.3  2008/07/23 17:43:32  nano
- *	<rdar://problem/5939357> IOUSBHIDDriver, IOHIDEventService missing HeaderDoc class declarations
- *	
- *	Revision 1.7.72.2  2008/04/22 22:38:01  nano
- *	Bring in changes from Foxhound-320.2.9
- *	
- *	Revision 1.9  2008/04/17 16:56:57  nano
- *	Bring in branches for rdar://5867990 & rdar://5768343
- *	
- *	Revision 1.8.4.1  2008/04/16 20:26:15  nano
- *	<rdar://problem/5867990> Add API to allocate sleep current, as well as making sure that we return any extra power if our client dies or our device is terminated without returning it
- *	
- *	Revision 1.8  2008/04/14 16:08:38  nano
- *	Add new APIs for high power and for GetDeviceInformation.
- *	
- *	Revision 1.7.114.1  2008/04/11 22:25:44  nano
- *	Initial work on new user-client APIs and new IOUSBDevice APIs to return port state information and manage extra power requests, as well as groundwork for calling the policy maker directly from the IOUSBDevice
- *	
- *	Revision 1.7  2007/08/17 22:41:11  nano
- *	Bring in branch that fixes <rdar://problem/5414582> USB not honoring Resume recovery time (hub driver) and adds extra time for iPods
- *	
- *	Revision 1.6.30.1  2007/08/16 19:14:02  nano
- *	ResumeRecovery additions.
- *	
- *	Revision 1.6  2007/08/01 16:10:18  rhoads
- *	roll in extra power changes
- *	
- *	Revision 1.5.12.1  2007/07/27 16:49:10  rhoads
- *	merge the extra current stuff into Leopard, and add extra sleep current for self powered hubs
- *	
- *	Revision 1.5  2007/07/20 22:31:22  rhoads
- *	roll in branch300-3-2
- *	
- *	Revision 1.4.40.1  2007/07/18 18:44:24  rhoads
- *	this is the 300.3.2g version plus some quieter logs
- *	
- *	Revision 1.4.34.2  2007/07/17 06:30:35  rhoads
- *	more hub chain fixes
- *	
- *	Revision 1.4.34.1  2007/07/16 16:45:00  rhoads
- *	more power management and termination tweaks
- *	
- *	Revision 1.4  2007/05/18 01:59:12  rhoads
- *	roll in 5112084 and 5204170
- *	
- *	Revision 1.3.2.1  2007/05/15 18:23:48  rhoads
- *	some initial power state bug fixes
- *	
- *	Revision 1.3  2007/05/10 22:25:35  rhoads
- *	roll in branch 5113395 - the last major piece of the new power architecture
- *	
- *	Revision 1.2.64.4  2007/04/13 22:34:59  rhoads
- *	fix restart and shutdown
- *	
- *	Revision 1.2.64.3  2007/04/11 23:56:23  rhoads
- *	first mostly working dozing hub
- *	
- *	Revision 1.2.64.2  2007/04/10 02:09:09  rhoads
- *	got UHCI almost working
- *	
- *	Revision 1.2.64.1  2007/04/05 02:57:50  rhoads
- *	move power management out of AppleUSBHub and into IOUSBHubPolicyMaker
- *	
- *	Revision 1.2  2007/01/20 00:47:01  rhoads
- *	roll in Hub Policy Maker changes
- *	
- *	Revision 1.1.2.4  2007/01/18 22:51:08  rhoads
- *	add some padding
- *	
- *	Revision 1.1.2.3  2007/01/15 19:58:07  rhoads
- *	saving more changes
- *	
- *	Revision 1.1.2.2  2007/01/09 23:55:36  rhoads
- *	working version
- *	
- *	Revision 1.1.2.1  2007/01/09 21:57:02  rhoads
- *	commit some stuff to try to fix a permissions issue
- *	
- *	
- */
-#endif
-#ifndef _IOKIT_IOUSBHUBPOLICYMAKER_H
-#define _IOKIT_IOUSBHUBPOLICYMAKER_H
-
-#include	<IOKit/IOService.h>
-#include	<IOKit/usb/IOUSBController.h>
-#include	<IOKit/usb/IOUSBHubDevice.h>
-
-
-enum {
-	kIOUSBHubPowerStateOff		= 0,				// losing power
-	kIOUSBHubPowerStateRestart	= 1,				// reseting bus, but may maintain power
-	kIOUSBHubPowerStateSleep	= 2,				// upstream port and all downstream ports suspended (from the top)
-	kIOUSBHubPowerStateLowPower	= 3,				// upstream port and all downstream ports suspended (from the bottom)
-	kIOUSBHubPowerStateOn		= 4,				// upstream port and at least one downstream port on
-	kIOUSBHubNumberPowerStates	= 5
-};
-
-enum {
-	kHubResumeRecoveryTime	=	10,								// 10 ms to recover after I resume myself
-	kPortResumeRecoveryTime =	10								// 10 ms to recover another device
-};
-
-#define kIOUSBHubPowerStateStable	-1
-
-/*!
- @class IOUSBHubPolicyMaker
- @abstract Super class for Hub drivers to incorporate common Power Management code.
- */
-class IOUSBHubPolicyMaker : public IOService
-{
-	OSDeclareAbstractStructors(IOUSBHubPolicyMaker)
-
-protected:
-    IOUSBControllerV2 *					_bus;
-    IOUSBHubDevice *					_device;					// our provider
-    IOUSBHubDevice *					_parentHubDevice;			// for non root hub drivers, this is the hub device that my hub device is connected to
-    bool								_isRootHub;					// this is a root hub
-	bool								_dozeEnabled;				// true if the controller has been enabled to go into doze mode
-	bool								_dontAllowLowPower;			// If true, we will not allow the hub to go into low power mode.
-	bool								_dontAllowSleepPower;		// If true, we will not allow extra sleep power for a self powered hub.
-	SInt32								_powerStateChangingTo;		// a power state if we are changing to one, or -1 if we are stable
-	unsigned long						_myPowerState;				// my current state (since getPowerState doesn't always change in time)
-	UInt32								_extraPower;				// how much extra power we might be able to get from our parent hub
-	UInt32								_extraPowerRemaining;		// how many milliamps we can still give to any one port
-	UInt32								_hubResumeRecoveryTime;		// # of ms that we will wait before issuing any transactions on our port (nominally 10ms)
-    struct ExpansionData 
-	{ 
-	};
-    ExpansionData			*_expansionData;
-
-public:
-	// IOService methods
-    virtual bool						start(IOService * provider);
-	virtual IOReturn					powerStateWillChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
-	virtual unsigned long				powerStateForDomainState ( IOPMPowerFlags domainState );
-	virtual IOReturn					setPowerState ( unsigned long powerStateOrdinal, IOService* whatDevice );
-	virtual IOReturn					powerStateDidChangeTo ( IOPMPowerFlags capabilities, unsigned long stateNumber, IOService* whatDevice);
-	virtual unsigned long				maxCapabilityForDomainState ( IOPMPowerFlags domainState );
-	virtual void						powerChangeDone ( unsigned long fromState );
-
-	// public methods which MAY be implemented in subclass
-	virtual IOReturn					EnsureUsability(void);
-		
-	// Extra Port Power calls
-	void								AllocateExtraPower();
-	IOReturn							GetExtraPortPower(UInt32 portNum, UInt32 *extraPower);
-	IOReturn							ReturnExtraPortPower(UInt32 portNum, UInt32 extraPower);
-    
-	// virtual methods to be implemented in the controlling driver subclass
-	virtual bool						ConfigureHubDriver(void) = 0;
-	virtual IOReturn					HubPowerChange(unsigned long powerStateOrdinal) = 0;
-
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  0);
-	virtual	IOReturn					GetPortInformation(UInt32 portNum, UInt32 *info);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  1);
-	virtual	IOReturn					ResetPort(UInt32 portNum);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  2);
-	virtual	IOReturn					SuspendPort(UInt32 portNum, bool suspend);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  3);
-	virtual	IOReturn					ReEnumeratePort(UInt32 portNum, UInt32 options);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  4);
-	virtual UInt32						RequestExtraPower(UInt32 portNum, UInt32 type, UInt32 requestedPower);
-
-    OSMetaClassDeclareReservedUsed(IOUSBHubPolicyMaker,  5);
-	virtual IOReturn					ReturnExtraPower(UInt32 portNum, UInt32 type, UInt32 returnedPower);
-
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  6);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  7);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  8);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  9);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  10);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  11);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  12);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  13);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  14);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  15);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  16);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  17);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  18);
-    OSMetaClassDeclareReservedUnused(IOUSBHubPolicyMaker,  19);
-};
-
-#endif _IOKIT_IOUSBHUBPOLICYMAKER_H
diff --git a/i386/include/IOKit/usb/IOUSBInterface.h b/i386/include/IOKit/usb/IOUSBInterface.h
deleted file mode 100644
index 4777e50..0000000
--- a/i386/include/IOKit/usb/IOUSBInterface.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBINTERFACE_H
-#define _IOKIT_IOUSBINTERFACE_H
-
-#include <IOKit/IOService.h>
-#include <libkern/c++/OSData.h>
-
-#include <IOKit/usb/USB.h>
-#include <IOKit/usb/IOUSBNub.h>
-#include <IOKit/usb/IOUSBDevice.h>
-
-/*!
-    @class IOUSBInterface
-    @abstract The object representing an interface of a device on the USB bus.
-    @discussion This class provides functionality to find the pipes of an interface and
-	to read the descriptors associated with an interface. When an interface is open()ed,
-	all its pipes are created
-*/
-class IOUSBInterface : public IOUSBNub
-{
-    friend class IOUSBInterfaceUserClientV2;
-    
-    OSDeclareDefaultStructors(IOUSBInterface)
-
-protected:
-    IOUSBPipe * 			_pipeList[kUSBMaxPipes];
-    const IOUSBConfigurationDescriptor *_configDesc;
-    const IOUSBInterfaceDescriptor *	_interfaceDesc;
-    IOUSBDevice *			_device;
-
-    // these variable are the parsed interface descriptor
-    UInt8				_bInterfaceNumber;
-    UInt8				_bAlternateSetting;
-    UInt8				_bNumEndpoints;
-    UInt8				_bInterfaceClass;
-    UInt8				_bInterfaceSubClass;
-    UInt8				_bInterfaceProtocol;
-    UInt8				_iInterface;
-
-    struct ExpansionData {
-        IOCommandGate		*_gate;
-        IOWorkLoop			*_workLoop;
-		bool				_needToClose;
-		IOLock *			_pipeObjLock;											// Lock to synchronize accesses to our pipeObjects
-    };
-    ExpansionData * _expansionData;
-
-    // private methods
-    virtual void		ClosePipes(void);				// close all pipes (except pipe zero)
-    virtual IOReturn	CreatePipes(void);				// open all pipes in the current interface/alt interface
-    virtual void		SetProperties(void);			// update my property table with the correct properties		
-	
-public:
-	// static methods
-    static IOUSBInterface *withDescriptors(const IOUSBConfigurationDescriptor *cfDesc, const IOUSBInterfaceDescriptor *ifDesc);
-    static IOReturn	CallSuperOpen(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-    static IOReturn     CallSuperClose(OSObject *target, void *arg0, void *arg1, void *arg2, void *arg3);
-	static UInt8 hex2char( UInt8 digit );
-    
-	// IOService methods
-    virtual bool		start(IOService * provider);
-    virtual bool		handleOpen(IOService *forClient, IOOptionBits options = 0, void *arg = 0 );
-    virtual bool		open(IOService *forClient, IOOptionBits options = 0, void *arg = 0 );
-    virtual void		close(IOService *forClient, IOOptionBits options = 0);
-    virtual void		handleClose(IOService *forClient, IOOptionBits options = 0);
-    virtual IOReturn 	message( UInt32 type, IOService * provider,  void * argument = 0 );
-    virtual bool		finalize(IOOptionBits options);
-    virtual void		stop(IOService *  provider);
-    virtual bool		terminate( IOOptionBits options = 0 );
-    virtual void		free();	
-
-	// IOUSBInterface class methods
-	virtual bool		init(	const IOUSBConfigurationDescriptor *cfDesc,
-							 const IOUSBInterfaceDescriptor *ifDesc);
-   /*!
-        @function FindNextAltInterface
-        return alternate interface descriptor satisfying the requirements specified in request, or NULL if there aren't any.
-        request is updated with the properties of the returned interface.
-        @param current interface descriptor to start searching from, NULL to start at alternate interface 0.
-        @param request specifies what properties an interface must have to match.
-        @result Pointer to a matching interface descriptor, or NULL if none match.
-    */
-    virtual const IOUSBInterfaceDescriptor *FindNextAltInterface(const IOUSBInterfaceDescriptor *current,
-                                                                 IOUSBFindInterfaceRequest *request);
-
-    /*!
-	@function FindNextPipe
-	Find a pipe of the interface that matches the requirements, either
-	starting from the beginning of the interface's pipe list or from a specified
-	pipe.
-	@param current Pipe to start searching from, NULL to start from beginning of list.
-	@param request Requirements for pipe to match, updated with the found pipe's
-	properties.
-	@result Pointer to the pipe, or NULL if no pipe matches the request.
-    */
-    virtual IOUSBPipe *FindNextPipe(IOUSBPipe *current, IOUSBFindEndpointRequest *request);
-
-    /*!
-        @function FindNextAssociatedDescriptor
-        Find the next descriptor of the requested type associated with the interface.
-	@param current Descriptor to start searching from, NULL to start from beginning of list.
-	@param type Descriptor type to search for, or kUSBAnyDesc to return any descriptor type.
-	@result Pointer to the descriptor, or NULL if no matching descriptors found.
-    */
-    virtual const IOUSBDescriptorHeader * FindNextAssociatedDescriptor(const void *current, UInt8 type);
-
-    /*!
-        @function SetAlternateInterface
-        Select the specified alternate interface.
-        @param forClient The client requesting the alternate setting. This client must have the interface open in order to perform the request.
-	@param alternateSetting Alternate setting (from the alternate interface's interface descriptor).
-        @result exclusive access error if the interface is not open. otherwise the result of the transaction
-    */
-    virtual IOReturn SetAlternateInterface(IOService *forClient, UInt16 alternateSetting);
-
-     /*!
-        @function GetPipeObj
-	returns a handle to the pipe at the corresponding index
-        @param index value from zero to kUSBMaxPipes-1
-	@result The IOUSBPipe object. Note that the client does not own a reference to this pipe, so the client should retain() the IOUSBPipe object if necessary.
-    */
-    virtual IOUSBPipe *GetPipeObj(UInt8 index);
-    /*!
-        @function GetConfigValue
-	returns the device configuration value for the interface
-	@result The device configuration value.
-    */
-    virtual UInt8 GetConfigValue();
-    /*!
-        @function GetDevice
-        returns the device the interface is part of.
-	@result Pointer to the IOUSBDevice object which is the parent of this IOUSBInterface object.
-    */
-    virtual IOUSBDevice *GetDevice();
-    /*!
-        @function GetInterfaceNumber
-        returns the zero based value identifying the index in the array of concurrent
-        interfaces supported by the current configuration
-        @result the interface index
-    */
-    virtual UInt8 GetInterfaceNumber();
-    /*!
-        @function GetAlternateSetting
-        returns the alternate setting for this interface.
-        @result the alternate setting
-    */
-    virtual UInt8 GetAlternateSetting();
-    /*!
-        @function GetNumEndpoints
-        returns the number of endpoints used by this interface (excluding
-        device endpoint zero. If the value is zero, this interface only
-        uses endpoint zero.
-        @result the number of endpoints
-    */
-    virtual UInt8 GetNumEndpoints();
-    /*!
-        @function GetInterfaceClass
-        returns the class code for this interface (assigned by the USB)
-        a value of zero is reserved
-        if the value is FFh, the interface class is vendor-specific
-        all other values are reserved for assignment by the USB
-        @result the interface class
-    */
-    virtual UInt8 GetInterfaceClass();
-    /*!
-        @function GetInterfaceSubClass
-        returns the subclass code (assigned by the USB).
-        These codes are qualified by the value returned by GetInterfaceClass
-        @result the interface subclass
-    */
-    virtual UInt8 GetInterfaceSubClass();
-    /*!
-        @function GetInterfaceProtocol
-        returns the protocol code (assigned by the USB).
-        @result the interface index
-    */
-    virtual UInt8 GetInterfaceProtocol();
-    /*!
-        @function GetInterfaceStringIndex
-        returns the index of the string descriptor describing the interface
-        @result the string index
-    */
-    virtual UInt8 GetInterfaceStringIndex();
-    
-    /*!
-	@function DeviceRequest
-        @abstract Sends a control request to the default control pipe in the device (pipe zero)
-        @param request The parameter block to send to the device
-		@param completion Function to call when request completes. If omitted then
-        DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
-		the IOUSBDevRequest is not released until the callback has occurred.
-    */
-    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, IOUSBCompletion *completion = 0); 
-
-    /*!
-	 @function DeviceRequest
-	 @abstract Sends a control request to the default control pipe in the device (pipe zero)
-	 @param request The parameter block to send to the device (with the pData as an IOMemoryDesriptor)
-	 @param completion Function to call when request completes. If omitted then
-	 DeviceRequest() executes synchronously, blocking until the request is complete.  If the request is asynchronous, the client must make sure that
-	 the IOUSBDevRequest is not released until the callback has occurred.
-	 */
-    virtual IOReturn DeviceRequest(IOUSBDevRequestDesc *request, IOUSBCompletion *completion = 0);
-
-    virtual bool matchPropertyTable(OSDictionary * table, SInt32 *score);
-
-    OSMetaClassDeclareReservedUsed(IOUSBInterface,  0);
-    /*!
-	@function GetEndpointProperties
-        @abstract Returns the properties of an endpoint, possibly in an alternate interface.
-        @param alternateSetting specifies the desired alternate setting
-        @param endpointNumber specifies the endpoint number
-        @param direction specifies the direction (kUSBIn, kUSBOut)
-        @param transferType a pointer to hold the transfer type (kUSBControl, kUSBBulk, etc.) of the endpoint if found.
-        @param maxPacketSize a pointer to hold the maxPacketSize in the endpoint descriptor.
-        @param interval a pointer to hold the interval value in the endpoint descriptor.
-	@result returns kIOReturnSuccess if the endpoint is found, and kIOUSBEndpointNotFound if it is not.
-    */
-    virtual IOReturn GetEndpointProperties(UInt8 alternateSetting, UInt8 endpointNumber, UInt8 direction, UInt8 *transferType, UInt16 *maxPacketSize, UInt8 *interval);
-    
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  1);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  2);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  3);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  4);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  5);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  6);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  7);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  8);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  9);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  10);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  11);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  12);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  13);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  14);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  15);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  16);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  17);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  18);
-    OSMetaClassDeclareReservedUnused(IOUSBInterface,  19);
-};
-
-#endif /* _IOKIT_IOUSBINTERFACE_H */
diff --git a/i386/include/IOKit/usb/IOUSBLog.h b/i386/include/IOKit/usb/IOUSBLog.h
deleted file mode 100644
index 7f8f2a3..0000000
--- a/i386/include/IOKit/usb/IOUSBLog.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright © 1998-20010 Apple Inc.  All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBLOG_H
-#define _IOKIT_IOUSBLOG_H
-
-#include 	<IOKit/IOService.h>
-#include	<IOKit/IOLib.h>
-
-
-#ifdef	__cplusplus
-	extern "C" {
-#endif
-
-// USB Specific defines
-#define USBLog( LEVEL, ARGS...)		KernelDebugLogTag( LEVEL, 'USBF', ## ARGS )
-#define USBError( LEVEL, ARGS...)	KernelDebugLogInternal( ( LEVEL ), 'USBF', ## ARGS )
-#define USBStringFromReturn( IORETURN)	(IOUSBController::_log)->stringFromReturn( IORETURN )
-
-
-// Possible Debug levels. If DEBUG_LEVEL is set to DEBUG_LEVEL_PRODUCTION, all debug logs will be 
-// stripped of the final code. 
-
-#define	DEBUG_LEVEL_PRODUCTION		0
-#define	DEBUG_LEVEL_DEVELOPMENT		1
-#define	DEBUG_LEVEL_ALPHA			2
-#define	DEBUG_LEVEL_BETA			3
-#define	DEBUG_LEVEL_FINAL			DEBUG_LEVEL_PRODUCTION
-
-// Allow clients to define their own debug level.
-
-#if ( !defined( DEBUG_LEVEL ) )
-	#define	DEBUG_LEVEL			DEBUG_LEVEL_PRODUCTION
-#endif
-
-// Index for user client methods
-//
-enum
-{
-    kUSBControllerUserClientOpen = 0,
-    kUSBControllerUserClientClose,
-    kUSBControllerUserClientEnableLogger,
-    kUSBControllerUserClientSetDebuggingLevel,
-    kUSBControllerUserClientSetDebuggingType,
-    kUSBControllerUserClientGetDebuggingLevel,
-    kUSBControllerUserClientGetDebuggingType,
-#ifndef __OPEN_SOURCE__
-    kUSBControllerUserClientSetTestMode,
-    kUSBControllerUserClientReadRegister,
-    kUSBControllerUserClientWriteRegister,
-    kUSBControllerUserClientMessageController,
-#endif
-    kNumUSBControllerMethods
-};
-
-#ifndef __OPEN_SOURCE__
-// Enums for the private kIOUSBMessageController message
-enum
-{
-	kIOUSBMessageControllerDoGPIOReset = 0x00000001
-};
-#endif
-
-// Info Debug Output Types.
-
-typedef UInt32		KernelDebuggingOutputType;
-enum
-{
-	kKernelDebugOutputIOLogType		= 0x00000001, 
-	kKernelDebugOutputKextLoggerType	= 0x00000002
-};
-
-
-// Info Debug levels.
-
-typedef UInt32		KernelDebugLevel;
-enum
-{
-	kKernelDebugInfoLevel 		= 1000, 
-	kKernelDebugRareInfoLevel	= 2000, 
-	kKernelDebugAllowedErrorLevel	= 3000, 
-	kKernelDebugAssertLevel 	= 4000, 
-	kKernelDebugRequireLevel	= 5000, 
-	kKernelDebugErrorLevel		= 6000, 
-	kKernelDebugCriticalErrorLevel	= 7000, 
-	kKernelDebugTragicErrorLevel	= 8000, 
-	kKernelDebugAnyLevel		= 0
-};
-
-// Function prototypes.
-
-void			KernelDebugSetLevel( KernelDebugLevel inLevel );
-KernelDebugLevel	KernelDebugGetLevel();
-void			KernelDebugSetOutputType( KernelDebuggingOutputType inType );
-KernelDebuggingOutputType	KernelDebugGetOutputType();
-IOReturn 		KernelDebugFindKernelLogger();
-void			KernelDebugEnable( bool enable );
-
-//	Yes, you can call this directly. But, why? If you use the macros declared below, such as
-//	KernelIOLog, you get the benefit of having your logs compiled out when you set the
-//	DEBUG_LEVEL to production mode and recompile. Dude. Sweet. What's mine say?
-
-void			KernelDebugLogInternal( KernelDebugLevel inLevel, UInt32 inTag, char const *inFormatString, ... )  __attribute__ ((format(printf,3,4)));;
-void 			KernelDebugLogDataInternal( UInt32 inLevel,  UInt32 inTag, void *buffer, UInt32 byteCount, bool preBuffer);
-
-// Handy macros.
-
-#define REQUIRE_NO_ERR_PRINTF( VALUE, LABEL, ARGS... )							\
-	if ( VALUE != kIOReturnSuccess )									\
-	{												\
-		KernelDebugLogInternal( kDebugInfoLevel, 'BluD', ## ARGS );				\
-		goto LABEL;										\
-	}
-
-#define REQUIRE_PRINTF( TEST, LABEL, ARGS... )								\
-	do												\
-	{												\
-		if ( !( TEST ) )										\
-		{											\
-			KernelDebugLogInternal( kDebugInfoLevel, 'BluD',  ## ARGS );			\
-			goto LABEL;									\
-		}											\
-	} while( false )
-
-// Some macros to call the debugging outputs. We'll strip out the debug logs if we are production code.
-
-#if DEBUG_LEVEL != DEBUG_LEVEL_PRODUCTION
-#define	KernelDebugLog( LEVEL, ARGS... )			KernelDebugLogInternal( ( LEVEL ), 'KDbg', ## ARGS ) __attribute__ ((format(printf,1,2)));
-	#define	KernelDebugLogTag( LEVEL, TAG, ARGS... )		KernelDebugLogInternal( ( LEVEL ), ( TAG ),  ## ARGS )
-	#define KernelDebugLogData( LEVEL, TAG, BUFFER, SIZE, HOLD)	KernelDebugLogDataInternal( ( LEVEL ), ( TAG ), ( BUFFER ), ( SIZE ), ( HOLD ))
-#else
-	#define	KernelDebugLog( LEVEL, ARGS... )
-	#define	KernelDebugLogTag( LEVEL, TAG, ARGS... )
-	#define KernelDebugLogData( LEVEL, TAG, BUFFER, SIZE, HOLD)
-#endif
-
-
-#ifdef	__cplusplus
-	}
-        
-//================================================================================================
-//   Forward declarations
-//================================================================================================
-class com_apple_iokit_KLogClient;
-
-//================================================================================================
-//   Defines
-//================================================================================================
-#define kLogKextName 	"com_apple_iokit_KLog"
-#define MAXUSERS 	5
-
-//================================================================================================
-//   Custom Types
-//================================================================================================
-
-typedef UInt32 KLogLevel;
-typedef UInt32 KLogTag;
-
-//================================================================================================
-//   com_apple_iokit_KLog
-//================================================================================================
-
-class com_apple_iokit_KLog : public IOService
-{
-
-    OSDeclareDefaultStructors(com_apple_iokit_KLog)
-
-    com_apple_iokit_KLogClient *	mClientPtr[MAXUSERS+1];
-
-    unsigned char *			mMsgBuffer;
-    UInt8 				mClientCount;
-    UInt8 				mMsgSize;
-    bool 				mErrFlag;
-    struct timeval *			mTimeVal;
-    IOLock *				mLogLock;
-    
-public:
-
-    static com_apple_iokit_KLog	*	logger;
-    
-    virtual bool 			init(OSDictionary *dictionary = 0);
-    virtual void 			free(void);
-   
-    virtual IOService *			probe(IOService *provider, SInt32 *score);
-    virtual bool 			start(IOService *provider);
-    virtual void 			stop(IOService *provider);
-    virtual IOReturn 			newUserClient( task_t owningTask, void * securityID,
-                                                UInt32 type, IOUserClient ** handler );
-
-    virtual SInt8			Log( KLogLevel level, KLogTag tag, const char *format, ... );
-    virtual SInt8			vLog( KLogLevel level, KLogTag tag, const char *format, va_list in_va_list );
-	
-    void 				closeChild(com_apple_iokit_KLogClient *ptr);
-    void 				setErr(bool set);
-    
-};
-
-#define kMaxStatusBufSize	(8*1024)
-
-
-class IOUSBLog : public IOService
-{
-    OSDeclareAbstractStructors(IOUSBLog)
-
-private:
-public:
-    virtual bool	init( OSDictionary * dictionary = 0 );
-  	virtual const char *			stringFromReturn( IOReturn rtn );
-	static IOUSBLog	*usblog();
-    virtual void 	AddStatusLevel (UInt32 level, UInt32 ref, char *status, UInt32 value);
-    virtual void	AddStatus(char *message);
-    virtual void	AddStatus(UInt32 level, char *message);
-    virtual void 	USBLogPrintf(UInt32 level, char *format,...);
-	virtual char *	strstr(const char *in, const char *str);
-};
-
-
-#endif
-#endif /* ! _IOKIT_IOUSBLOG_H */
-
diff --git a/i386/include/IOKit/usb/IOUSBMassStorageClass.h b/i386/include/IOKit/usb/IOUSBMassStorageClass.h
deleted file mode 100644
index 02c8557..0000000
--- a/i386/include/IOKit/usb/IOUSBMassStorageClass.h
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-
-#ifndef _IOKIT_IOUSBMASSSTORAGECLASS_H
-#define _IOKIT_IOUSBMASSSTORAGECLASS_H
-
-// Headers for general IOKit definitions
-#include <IOKit/IOLib.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOMessage.h>
-
-// Headers for USB specific definitions
-#include <IOKit/usb/IOUSBInterface.h>
-#include <IOKit/usb/IOUSBPipe.h>
-#include <IOKit/usb/USBSpec.h>
-#include <IOKit/usb/USB.h>
-
-// Headers for SCSI Protocol support definitions
-#include <IOKit/scsi/IOSCSIProtocolServices.h>
-
-// BSD includes
-#include <sys/sysctl.h>
-
-#define UNUSED(x) ((void)x)
-
-
-#pragma mark -
-#pragma mark Vendor Specific Device Support
-#define kIOUSBMassStorageCharacteristics		"USB Mass Storage Characteristics"
-#define kIOUSBMassStoragePreferredSubclass		"Preferred Subclass"
-#define kIOUSBMassStoragePreferredProtocol		"Preferred Protocol"
-#define kIOUSBMassStorageResetOnResume			"Reset On Resume"
-#define kIOUSBMassStorageUseStandardUSBReset	"Use Standard USB Reset"
-#define kIOUSBKnownCSWTagIssues					"Known CSW Tag Issues"
-#define kIOUSBMassStorageMaxLogicalUnitNumber	"Max Logical Unit Number"
-#define kIOPropertyIOUnitKey					"IOUnit"
-#define kIOUSBMassStorageDoNotMatch				"Do Not Match MSC"
-#define kIOUSBMassStorageDoNotOperate			"Do Not Operate"
-#define kIOUSBMassStorageEnableSuspendResumePM	"Enable Port Suspend-Resume PM"
-
-enum 
-{
-	kUSBDAddressLength = 10
-};
-
-#pragma mark -
-#pragma mark CBI Protocol Strutures
-// Structure for the global PB's
-struct CBIRequestBlock
-{
-	SCSITaskIdentifier			request;
-	IOUSBDevRequest				cbiDevRequest;
-	SCSICommandDescriptorBlock	cbiCDB;
-	IOUSBCompletion				cbiCompletion;
-	UInt32						currentState;
-	IOMemoryDescriptor *		cbiPhaseDesc;
-	UInt8						cbiGetStatusBuffer[2];	// 2 bytes as specified in the USB spec
-};
-
-typedef struct CBIRequestBlock	CBIRequestBlock;
-
-#pragma mark -
-#pragma mark Bulk Only Protocol Structures
-
-struct StorageBulkOnlyCBW
-{
-	UInt32		cbwSignature;
-	UInt32		cbwTag;
-	UInt32		cbwTransferLength;
-	UInt8		cbwFlags;
-	UInt8		cbwLUN;					// Bits 0-3: LUN, 4-7: Reserved
-	UInt8		cbwCDBLength;			// Bits 0-4: CDB Length, 5-7: Reserved
-	UInt8		cbwCDB[16];
-};
-
-typedef struct StorageBulkOnlyCBW	StorageBulkOnlyCBW;
-
-struct	StorageBulkOnlyCSW
-{
-	UInt32		cswSignature;
-	UInt32		cswTag;
-	UInt32		cswDataResidue;
-	UInt8		cswStatus;
-};
-
-typedef struct StorageBulkOnlyCSW	StorageBulkOnlyCSW;
-
-struct	BulkOnlyRequestBlock
-{
-	SCSITaskIdentifier		request;
-	IOUSBCompletion			boCompletion;
-	UInt32					currentState;
-	StorageBulkOnlyCBW		boCBW;
-	StorageBulkOnlyCSW		boCSW;
-	IOMemoryDescriptor *	boPhaseDesc;
-	UInt8					boGetStatusBuffer[2];	// 2 bytes as specified in the USB spec
-};
-
-typedef struct BulkOnlyRequestBlock		BulkOnlyRequestBlock;
-
-
-#pragma mark -
-#pragma mark IOUSBMassStorageClass definition
-
-class IOUSBMassStorageClass : public IOSCSIProtocolServices
-{
-    OSDeclareDefaultStructors(IOUSBMassStorageClass)
-
-private:
-	// ---- Member variables used by all protocols ----
-	// The interface object that provides the driver with access to the 
-	// USB so that it may talk to its device.
-    IOUSBInterface *			fInterface;
-
-	// The pipe objects that the driver uses to transport data through a
-	// pipe to the appropriate endpoint.
-    IOUSBPipe *					fBulkInPipe;
-    IOUSBPipe *					fBulkOutPipe;
-    IOUSBPipe *					fInterruptPipe;
-	IOUSBDevRequest				fUSBDeviceRequest;
-	UInt8						fPreferredSubclass;
-	UInt8						fPreferredProtocol;
-	
-  	// The maximum Logical Unit Number.  This is the highest valid LUN
-  	// that the USB device supports, so if the device only supports one
-  	// LUN, such as CBI and CB, this number will be zero.
-  	UInt8						fMaxLogicalUnitNumber;
-
-	// ---- Member variables used by CBI protocol ----
-	bool						fCBICommandStructInUse; 
-
-	CBIRequestBlock				fCBICommandRequestBlock;
-	
-	// ---- Member variables used by Bulk Only protocol ----
- 	// Command tag, this driver just uses a sequential counter that is
- 	// incremented for each CBW that is sent to the device.
- 	UInt32 						fBulkOnlyCommandTag;
-
-	bool						fBulkOnlyCommandStructInUse; 
-    
-    // Dedicated CBW and CSW IOMemoryDescriptors are listed in the ExpansionData struct.
-		
- 	// The Request block that contains all the necessary data for 
- 	// transporting a Bulk Only request across the USB.
- 	BulkOnlyRequestBlock		fBulkOnlyCommandRequestBlock;
-
-protected:
-    // Reserve space for future expansion.
-    struct ExpansionData
-	{
-		bool					fResetInProgress;
-		OSSet *					fClients;
-		IOUSBPipe *				fPotentiallyStalledPipe;
-		bool					fUseUSBResetNotBOReset;
-		bool					fAbortCurrentSCSITaskInProgress;
-		IOMemoryDescriptor *	fCBIMemoryDescriptor;
-		IOMemoryDescriptor *	fBulkOnlyCBWMemoryDescriptor;
-		IOMemoryDescriptor *	fBulkOnlyCSWMemoryDescriptor;
-        bool                    fDeviceAttached;
-		bool                    fWaitingForReconfigurationMessage;
-		bool					fTerminating;
-        bool                    fKnownCSWTagMismatchIssues;
-        bool                    fPortSuspendResumeForPMEnabled;
-        bool                    fPortIsSuspended;
-		bool					fRequiresResetOnResume;
-		bool					fAutonomousSpinDownWorkAround;
-		UInt8					fConsecutiveResetCount;
-		bool					fClearStallInProgress;				/* OBSOLETE */
-		bool					fTerminationDeferred;
-	};
-    ExpansionData *				reserved;
-	
-	#define fResetInProgress					reserved->fResetInProgress
-	#define fClients							reserved->fClients
-	#define fPotentiallyStalledPipe				reserved->fPotentiallyStalledPipe
-    #define fUseUSBResetNotBOReset				reserved->fUseUSBResetNotBOReset
-	#define fAbortCurrentSCSITaskInProgress		reserved->fAbortCurrentSCSITaskInProgress
-	#define fCBIMemoryDescriptor                reserved->fCBIMemoryDescriptor
-	#define	fBulkOnlyCBWMemoryDescriptor		reserved->fBulkOnlyCBWMemoryDescriptor
-	#define	fBulkOnlyCSWMemoryDescriptor		reserved->fBulkOnlyCSWMemoryDescriptor
-    #define fDeviceAttached                     reserved->fDeviceAttached
-	#define fWaitingForReconfigurationMessage	reserved->fWaitingForReconfigurationMessage
-	#define fTerminating						reserved->fTerminating
-    #define fKnownCSWTagMismatchIssues          reserved->fKnownCSWTagMismatchIssues
-    #define fPortSuspendResumeForPMEnabled      reserved->fPortSuspendResumeForPMEnabled
-    #define fPortIsSuspended                    reserved->fPortIsSuspended
-	#define fRequiresResetOnResume				reserved->fRequiresResetOnResume
-	#define fAutonomousSpinDownWorkAround		reserved->fAutonomousSpinDownWorkAround
-	#define fConsecutiveResetCount				reserved->fConsecutiveResetCount
-	#define fClearStallInProgress				reserved->fClearStallInProgress
-	#define fTerminationDeferred				reserved->fTerminationDeferred
-	
-	// Enumerated constants used to control various aspects of this
-	// driver.
-	
-	// Enumerations for Mass Storage Class Subclass types
-	enum
-	{
-		kUSBStorageRBCSubclass 				= 1,
-		kUSBStorageSFF8020iSubclass 		= 2,
-		kUSBStorageQIC157Subclass			= 3,
-		kUSBStorageUFISubclass				= 4,
-		kUSBStorageSFF8070iSubclass			= 5,
-		kUSBStorageSCSITransparentSubclass	= 6
-	};
-
-	// The supported USB Mass Storage Class transport protocols.
-	enum
-	{
-		kProtocolControlBulkInterrupt	= 0x00,
-		kProtocolControlBulk			= 0x01,
-		kProtocolBulkOnly				= 0x50
-	};
-
-	// ------- Protocol support functions ------------
-	// The SendSCSICommand function will take a SCSITask Object and transport
-	// it across the physical wire(s) to the device
-	virtual bool    		SendSCSICommand( 	
-								SCSITaskIdentifier 		request, 
-								SCSIServiceResponse *	serviceResponse,
-								SCSITaskStatus		*	taskStatus );
-
-	// The AbortSCSICommand function will abort the indicated SCSITask object,
-	// if it is possible and the SCSITask has not already completed.
-    virtual SCSIServiceResponse    	AbortSCSICommand( SCSITaskIdentifier abortTask );
-
-	virtual bool					IsProtocolServiceSupported( 
-										SCSIProtocolFeature 	feature, 
-										void * 					serviceValue );
-
-	virtual bool					HandleProtocolServiceFeature( 
-										SCSIProtocolFeature 	feature, 
-										void * 					serviceValue );
- 
-	// Methods for retrieving and setting the object for the Interface
-	IOUSBInterface *		GetInterfaceReference( void );
-	void					SetInterfaceReference( IOUSBInterface * newInterface );
-	
-	UInt8					GetInterfaceSubclass( void );
-	UInt8					GetInterfaceProtocol( void );
-	
-	// Methods for retrieving an object for a Pipe.
-	IOUSBPipe *				GetControlPipe( void );
-	IOUSBPipe *				GetBulkInPipe( void );
-	IOUSBPipe *				GetBulkOutPipe( void );
-	IOUSBPipe *				GetInterruptPipe( void );
-	
-	// Methods for getting and setting the maximum LUN of a device.
-	UInt8					GetMaxLogicalUnitNumber( void ) const;
-	void					SetMaxLogicalUnitNumber( UInt8 maxLUN );
-	
-	virtual void 			CompleteSCSICommand( 
-								SCSITaskIdentifier request, 
-								IOReturn status );
-
-	virtual	bool			BeginProvidedServices( void );
-	virtual	bool			EndProvidedServices( void );
-	
-	// The Protocol specific helper methods for SendSCSICommand	
-	virtual IOReturn		SendSCSICommandForCBIProtocol(
-                  				SCSITaskIdentifier request );
-	
-	virtual IOReturn		SendSCSICommandForBulkOnlyProtocol(
-								SCSITaskIdentifier request );
-
-	// The Protocol specific helper methods for AbortSCSICommand	
-	virtual IOReturn		AbortSCSICommandForCBIProtocol(
-								SCSITaskIdentifier abortTask );
-	
-	virtual IOReturn		AbortSCSICommandForBulkOnlyProtocol(
-								SCSITaskIdentifier abortTask );
-
-	// Helper methods for performing general USB device requests
-	virtual IOReturn		ClearFeatureEndpointStall( 
-								IOUSBPipe *			thePipe,
-								IOUSBCompletion	*	completion );
-	virtual IOReturn 		GetStatusEndpointStatus(
-								IOUSBPipe *			thePipe,
-								void *				endpointStatus,
-								IOUSBCompletion	*	completion );
-	
- 	/* All CBI transport related methods.
- 	 */
-	// All definitions and structures for the CBI Protocol
-	enum
-	{
- 		kUSBStorageAutoStatusSize	= 2		// Per the USB CBI Protocol
- 	};
-
- 	// Methods for accessing Bulk Only specific member variables.
-	CBIRequestBlock *		GetCBIRequestBlock( void );
-
-	void 					ReleaseCBIRequestBlock( 
-								CBIRequestBlock *	cbiRequestBlock );
-
-	// Methods used for CBI/CB command transportation.
-	static void		CBIProtocolUSBCompletionAction(
-						void *					target,
-		                void *					parameter,
-		                IOReturn				status,
-		                UInt32					bufferSizeRemaining);
-
-	IOReturn		CBIProtocolTransferData( 
-						CBIRequestBlock *		cbiRequestBlock,
-						UInt32					nextExecutionState );
-		                
-	IOReturn		CBIProtocolReadInterrupt( 
-						CBIRequestBlock *		cbiRequestBlock,
-						UInt32					nextExecutionState );
-
-	IOReturn		CBIGetStatusEndpointStatus( 
-						IOUSBPipe *				targetPipe,
-						CBIRequestBlock *		cbiRequestBlock,
-						UInt32					nextExecutionState );
-
-	IOReturn		CBIClearFeatureEndpointStall( 
-						IOUSBPipe *				targetPipe,
-						CBIRequestBlock *		cbiRequestBlock,
-						UInt32					nextExecutionState );
-						
-	void 			CBIProtocolCommandCompletion(
-						CBIRequestBlock *		cbiRequestBlock,
-		                IOReturn				resultingStatus,
-		                UInt32					bufferSizeRemaining );
-		                
- 	/* All Bulk Only transport related methods, structures and enums.
- 	 */
- 	// All Bulk Only specific structures and enums.
-	
-	// All definitions and structures for the Bulk Only Protocol
-	// Command Block Wrapper (CBW)
-	enum
-	{
-		// CBW general struture definitions
-		kCommandBlockWrapperSignature	= OSSwapHostToBigConstInt32 ( 'USBC' ),
-		kByteCountOfCBW					= 31,
-
-		// CBW LUN related definitions
-		kCBWLUNMask						= 0x0F,
-
-		kCBWFlagsDataOut				= 0x00,
-		kCBWFlagsDataIn					= 0x80
-	};
-	
-	// All definitions and structures for the Bulk Only Protocol
-	// Command Status Wrapper (CSW)
-	enum
-	{
-		// CSW general struture definitions
-		kCommandStatusWrapperSignature	= OSSwapHostToBigConstInt32 ( 'USBS' ),
-		kByteCountOfCSW					= 13,
-
-		// CSW status definitions
-		kCSWCommandPassedError 			= 0x00,	// No error occurred
-		kCSWCommandFailedError			= 0x01,	/* An error occurred (probably a 
-											 	 * bad command or parameter ) */
-		kCSWPhaseError					= 0x02	/* A transfer was performed in 
-											 	 * the wrong sequence */
-	};
-
- 	// Methods for accessing Bulk Only specific member variables.
-	BulkOnlyRequestBlock *	GetBulkOnlyRequestBlock( void );
-
-	void 			ReleaseBulkOnlyRequestBlock( 
-						BulkOnlyRequestBlock * 		boRequestBlock );
-
-	UInt32			GetNextBulkOnlyCommandTag( void );
-
-	// Methods for Bulk Only specific utility commands
-	IOReturn		BulkDeviceResetDevice(
-						BulkOnlyRequestBlock *		boRequestBlock,
-						UInt32						nextExecutionState );
-						
-	// Methods used for Bulk Only command transportation.
-	IOReturn		BulkOnlySendCBWPacket(
-						BulkOnlyRequestBlock *		boRequestBlock,
-						UInt32						nextExecutionState );
-	
-	IOReturn		BulkOnlyTransferData( 
-						BulkOnlyRequestBlock *		boRequestBlock,
-						UInt32						nextExecutionState );
-	
-	IOReturn		BulkOnlyReceiveCSWPacket(
-						BulkOnlyRequestBlock *		boRequestBlock,
-						UInt32						nextExecutionState );
-	
-	void			BulkOnlyExecuteCommandCompletion (
-						BulkOnlyRequestBlock *		boRequestBlock,
-		                IOReturn					resultingStatus,
-		                UInt32						bufferSizeRemaining );
-
-	static void		BulkOnlyUSBCompletionAction (
-		                void *			target,
-		                void *			parameter,
-		                IOReturn		status,
-		                UInt32			bufferSizeRemaining );
-	
-public:
-
-    bool				init( OSDictionary * 	propTable );
-    virtual bool		start( IOService *	 	provider );
-    virtual void 		stop( IOService * 		provider );
-	virtual void		free( void );
-	virtual	IOReturn	message( UInt32 type, IOService * provider, void * argument = 0 );
-	
-	virtual bool        willTerminate(  IOService *     provider, 
-                                        IOOptionBits    options );
-										
-	virtual bool        didTerminate(	IOService *     provider, 
-                                        IOOptionBits    options, 
-										bool *			defer );
-                                        
-	virtual bool		handleOpen( IOService *		client,
-									IOOptionBits	options,
-									void *			arg );
-	
-	virtual void		handleClose( IOService *	client,
-									 IOOptionBits	options );
-	
-	virtual bool		handleIsOpen(  const IOService * client ) const;
-	
-	virtual IOReturn	HandlePowerOn( void );
-	
-protected:
-
-	static IOReturn		sWaitForReset( void * refcon );
-	IOReturn			GatedWaitForReset( void );
-	
-	static IOReturn		sWaitForTaskAbort( void * refcon );			/* OBSOLETE */
-	IOReturn			GatedWaitForTaskAbort( void );				/* OBSOLETE */
-	
-	static void			sResetDevice( void * refcon );
-	
-	static void			sAbortCurrentSCSITask( void * refcon );		/* OBSOLETE */
-	
-    OSMetaClassDeclareReservedUsed( IOUSBMassStorageClass, 1 );
-	virtual IOReturn	StartDeviceRecovery( void );				/* OBSOLETE */
-
-    OSMetaClassDeclareReservedUsed( IOUSBMassStorageClass, 2 );
-	virtual void		FinishDeviceRecovery( IOReturn	status );	/* OBSOLETE */
-
-	static void			DeviceRecoveryCompletionAction(
-		                	void *			target,
-		                	void *			parameter,
-		                	IOReturn		status,
-		                	UInt32			bufferSizeRemaining );	/* OBSOLETE */
-
-    void                ResetDeviceNow( bool waitForReset );
-	
-	void                AbortCurrentSCSITask( void );
-	
-	bool                IsPhysicalInterconnectLocationInternal ( void );
-	    
-	IOReturn            SuspendPort ( bool suspend );
-	
-private:
-	
-	void				ClearPipeStall ( void );
-	
-	IOReturn			AcceptSCSITask ( SCSITaskIdentifier scsiTask, bool * pAccepted );
-	
-	void				CheckDeferredTermination ( void );
-	
-	void				GatedCompleteSCSICommand ( SCSITaskIdentifier request, SCSIServiceResponse * serviceResponse, SCSITaskStatus * taskStatus );
-	
-	// Space reserved for future expansion.
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 3 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 4 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 5 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 6 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 7 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 8 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 9 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 10 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 11 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 12 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 13 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 14 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 15 );
-    OSMetaClassDeclareReservedUnused( IOUSBMassStorageClass, 16 );
-	
-};
-
-
-#endif _IOKIT_IOUSBMASSSTORAGECLASS_H
diff --git a/i386/include/IOKit/usb/IOUSBMassStorageUFISubclass.h b/i386/include/IOKit/usb/IOUSBMassStorageUFISubclass.h
deleted file mode 100644
index cbfe3c8..0000000
--- a/i386/include/IOKit/usb/IOUSBMassStorageUFISubclass.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-#ifndef _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
-#define _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
-
-// This class' header file
-#include <IOKit/usb/IOUSBMassStorageClass.h>
-#include <IOKit/scsi/IOSCSIPrimaryCommandsDevice.h>
-
-
-#pragma mark -
-#pragma mark IOUSBMassStorageUFIDevice declaration
-
-class IOUSBMassStorageUFIDevice : public IOSCSIPrimaryCommandsDevice
-{
-    OSDeclareDefaultStructors(IOUSBMassStorageUFIDevice)
-
-private:
-	static void			AsyncReadWriteComplete( SCSITaskIdentifier	completedTask );
-	
-protected:
-    // Reserve space for future expansion.
-    struct IOUSBMassStorageUFIDeviceExpansionData
-	{
-	};
-    IOUSBMassStorageUFIDeviceExpansionData *fIOUSBMassStorageUFIDeviceReserved;
-
-	// ---- Medium Characteristics ----
-	bool				fMediumPresent;
-
-	// The byte count of each physical block on the medium.
-	UInt32				fMediumBlockSize;
-
-	// The total number of blocks of fMediumBlockSize on the medium.
-	UInt32				fMediumBlockCount;
-
-	// Whether the installed medium is protected from writes
-	bool				fMediumIsWriteProtected;
-
-	// Polling thread variables
-	thread_call_t		fPollingThread;
-	UInt32				fPollingMode;
-	enum
-	{
-		kPollingMode_Suspended		= 0,
-		kPollingMode_NewMedia 		= 1,
-		kPollingMode_MediaRemoval	= 2
-	};
-	
-	// ---- Methods for controlling the current state of device support ----
-	virtual bool		InitializeDeviceSupport( void );
-	virtual void 		StartDeviceSupport ( void );
-	virtual void		SuspendDeviceSupport( void );
-	virtual void		ResumeDeviceSupport( void );
-	virtual void 		StopDeviceSupport ( void );
-	virtual void		TerminateDeviceSupport( void );
-
-	// ---- Methods used for misc  ----
-	virtual bool		ClearNotReadyStatus( void );
-	virtual void 		CreateStorageServiceNub( void );
-	virtual bool		DetermineDeviceCharacteristics( void );
-
-	// ---- Methods used for controlling the polling thread ----
-	virtual void		ProcessPoll( void );
-	virtual void		EnablePolling( void );
-	virtual void		DisablePolling( void );
-
-	// ---- Main and support methods for polling for new Media ----
-	virtual void		PollForNewMedia( void );
-	virtual bool		DetermineMediaPresence( void );
-	virtual bool		DetermineMediumCapacity( 
-							UInt64 * 				blockSize, 
-							UInt64 * 				blockCount );
-	virtual bool		DetermineMediumWriteProtectState( void );
-
-	// ---- Main and support methods for polling for Media removal ----
-	virtual void		PollForMediaRemoval( void );
-	
-	// ---- Methods used for power managment ----
-	virtual UInt32		GetInitialPowerState ( void );
-	virtual void 		InitializePowerManagement ( IOService * provider );
-	virtual void		HandlePowerChange ( void );
-	virtual void		HandleCheckPowerState ( void );
-	virtual void		TicklePowerManager ( void );
-	virtual UInt32		GetNumberOfPowerStateTransitions ( void );
-
-	// ---- Methods used for handling medium characteristics ----
-    virtual void		SetMediumCharacteristics( 
-    						UInt32 					blockSize, 
-    						UInt32 					blockCount );
-	
-	virtual void		ResetMediumCharacteristics( void );
-
-	virtual IOReturn	IssueRead( 	
-							IOMemoryDescriptor *	buffer,
-                         	UInt64					startBlock,
-                     		UInt64					blockCount );
-	
-	virtual IOReturn	IssueRead(	
-							IOMemoryDescriptor *	buffer,
-                      		UInt64					startBlock,
-                     		UInt64					blockCount,
-                       		void * 					clientData );
-
-
-	virtual IOReturn	IssueWrite( 
-							IOMemoryDescriptor *	buffer,
-                    		UInt64					startBlock,
-                       		UInt64					blockCount );
-
-	virtual IOReturn	IssueWrite(	
-							IOMemoryDescriptor *	buffer,
-                         	UInt64					startBlock,
-                      		UInt64					blockCount,
-							void * 					clientData );
-
-public:
-											
-	static 	void		sProcessPoll( void * pdtDriver, void * refCon );
-
-	// Interface to the UFI Storage Services Driver
-	// ---- Methods for controlling the device ----
-	virtual IOReturn	SyncReadWrite(
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-							UInt64					blockCount,
-							UInt64					blockSize );
-
-	virtual IOReturn	AsyncReadWrite(
-							IOMemoryDescriptor *	buffer,
-							UInt64					startBlock,
-							UInt64					blockCount,
-							UInt64					blockSize,
-							void * 					clientData );
-
-	// ---- Methods for controlling medium state ----
-	virtual IOReturn	EjectTheMedium( void );
-
-	// ---- Methods for controlling media format ----
-	virtual IOReturn	FormatMedium( 
-							UInt64 					blockCount, 
-							UInt64 					blockSize );
-	virtual UInt32		GetFormatCapacities( 	
-							UInt64 * 				capacities,
-             				UInt32   				capacitiesMaxCount ) const;
-
-	// ---- Query methods to report device characteristics ----
-	// Report the maximum number of blocks that the device can handle per
-	// read or write.  A value of 0 (zero) indicates there is no limit aside
-	// from the size of the method's return parameter.
-	virtual UInt64		ReportDeviceMaxBlocksReadTransfer( void );
-	virtual UInt64		ReportDeviceMaxBlocksWriteTransfer( void );
-	
-	// ---- Query methods to report installed medium characteristics ----
-	virtual UInt64		ReportMediumBlockSize( void );
-	virtual UInt64		ReportMediumTotalBlockCount( void );
-	virtual bool		ReportMediumWriteProtection( void );
-        
-	// Methods for getting device information strings
-	virtual char *		GetVendorString( void );
-	virtual char *		GetProductString( void );
-	virtual char *		GetRevisionString( void );
-	OSDictionary *		GetProtocolCharacteristicsDictionary ( void );
-	OSDictionary *		GetDeviceCharacteristicsDictionary ( void );	
-	
-protected:
-	// Utility methods used by all SCSI Command Set objects
-	
-	// isParameterValid methods are used to validate that the parameter passed into
-	// the command methods are of the correct value.
-	
-	// Validate Parameter used for 1 bit to 1 byte paramaters
-    bool		 	IsParameterValid( 
-							SCSICmdField1Byte 			param,
-							SCSICmdField1Byte 			mask );
-	
-	// Validate Parameter used for 9 bit to 2 byte paramaters
-	bool		 	IsParameterValid( 
-							SCSICmdField2Byte 			param,
-							SCSICmdField2Byte 			mask );
-	
-	// Validate Parameter used for 17 bit to 4 byte paramaters
-	bool		 	IsParameterValid( 
-							SCSICmdField4Byte 			param,
-							SCSICmdField4Byte 			mask );
-	
-	// UFI Required Commands
-	virtual bool 	FORMAT_UNIT(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer,
-			    			IOByteCount					defectListSize,
-			    			SCSICmdField1Byte 			TRACK_NUMBER, 
-			    			SCSICmdField2Byte 			INTERLEAVE );
-
-	virtual bool	INQUIRY(
-							SCSITaskIdentifier			request,
-    						IOMemoryDescriptor 			*dataBuffer,
-    						SCSICmdField1Byte 			PAGE_OR_OPERATION_CODE,
-    						SCSICmdField1Byte 			ALLOCATION_LENGTH );
-
-   	virtual bool	MODE_SELECT_10(
-							SCSITaskIdentifier			request,
-    						IOMemoryDescriptor 			*dataBuffer,
-    						SCSICmdField1Bit 			PF,
-    						SCSICmdField1Bit 			SP,
-    						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH );  
-
-   	virtual bool	MODE_SENSE_10(
-							SCSITaskIdentifier			request,
-    						IOMemoryDescriptor 			*dataBuffer,
-    						SCSICmdField1Bit 			DBD,
-	   						SCSICmdField2Bit 			PC,
-	   						SCSICmdField6Bit 			PAGE_CODE,
-	   						SCSICmdField2Byte 			PARAMETER_LIST_LENGTH );
-
-    virtual bool	PREVENT_ALLOW_MEDIUM_REMOVAL( 
-							SCSITaskIdentifier			request,
-	     					SCSICmdField1Bit 			PREVENT );
-
-	virtual bool 	READ_10(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			UInt32						blockSize,
-			    			SCSICmdField1Bit 			DPO, 
-			    			SCSICmdField1Bit 			FUA,
-							SCSICmdField1Bit 			RELADR, 
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField2Byte 			TRANSFER_LENGTH );
-
-	virtual bool 	READ_12(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			UInt32						blockSize,
-			    			SCSICmdField1Bit 			DPO, 
-			    			SCSICmdField1Bit 			FUA,
-							SCSICmdField1Bit 			RELADR, 
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField4Byte 			TRANSFER_LENGTH );
-
-	virtual bool 	READ_CAPACITY(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			SCSICmdField1Bit 			RELADR,
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField1Bit 			PMI );
-
-	virtual bool 	READ_FORMAT_CAPACITIES(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			SCSICmdField2Byte 			ALLOCATION_LENGTH );
-
-	virtual bool 	REQUEST_SENSE(
-							SCSITaskIdentifier			request,
-   							IOMemoryDescriptor 			*dataBuffer,
-			    			SCSICmdField1Byte 			ALLOCATION_LENGTH );
- 	
-	virtual bool 	REZERO_UNIT( 
-							SCSITaskIdentifier			request );
-
-	virtual bool 	SEEK( 
-							SCSITaskIdentifier			request,
-			    			SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS );
-
-	virtual bool 	SEND_DIAGNOSTICS( 
-							SCSITaskIdentifier			request,
-							SCSICmdField1Bit 			PF, 
-							SCSICmdField1Bit 			SELF_TEST, 
-							SCSICmdField1Bit 			DEF_OFL, 
-							SCSICmdField1Bit 			UNIT_OFL );
-
-	virtual bool 	START_STOP_UNIT( 
-							SCSITaskIdentifier			request,
-							SCSICmdField1Bit 			IMMED, 
-							SCSICmdField1Bit 			LOEJ, 
-							SCSICmdField1Bit 			START );
-
-    virtual bool 	TEST_UNIT_READY(  
-							SCSITaskIdentifier			request );
- 
-	virtual bool 	VERIFY( 
-							SCSITaskIdentifier			request,
-							SCSICmdField1Bit 			DPO, 
-							SCSICmdField1Bit 			BYTCHK, 
-							SCSICmdField1Bit 			RELADR,
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField2Byte 			VERIFICATION_LENGTH );
-
-	virtual bool 	WRITE_10(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			UInt32						blockSize,
-			    			SCSICmdField1Bit 			DPO, 
-			    			SCSICmdField1Bit 			FUA,
-							SCSICmdField1Bit 			RELADR, 
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField2Byte 			TRANSFER_LENGTH );
-
-	virtual bool 	WRITE_12(
-							SCSITaskIdentifier			request,
-							IOMemoryDescriptor *		dataBuffer, 
-			    			UInt32						blockSize,
-			    			SCSICmdField1Bit 			DPO, 
-							SCSICmdField1Bit 			EBP, 
-							SCSICmdField1Bit 			RELADR, 
-							SCSICmdField4Byte 			LOGICAL_BLOCK_ADDRESS, 
-							SCSICmdField4Byte 			TRANSFER_LENGTH );
-
-	virtual bool 	WRITE_AND_VERIFY(
-							SCSITaskIdentifier			request,
-			    			IOMemoryDescriptor *		dataBuffer, 
-			    			UInt32						blockSize,
-			    			SCSICmdField1Bit 			DPO,
-			    			SCSICmdField1Bit 			BYTCHK, 
-			    			SCSICmdField1Bit 			RELADR, 
-			    			SCSICmdField4Byte			LOGICAL_BLOCK_ADDRESS, 
-			    			SCSICmdField2Byte 			TRANSFER_LENGTH );
-};
-
-
-#pragma mark -
-#pragma mark IOUSBMassStorageUFISubclass declaration
-
-
-class IOUSBMassStorageUFISubclass : public IOUSBMassStorageClass
-{
-    OSDeclareDefaultStructors(IOUSBMassStorageUFISubclass)
-
-protected:
-	virtual	bool		BeginProvidedServices( void );
-	virtual	bool		EndProvidedServices( void );
-};
-
-#endif _IOKIT_IOUSBMASSSTORAGEUFISUBCLASS_H
diff --git a/i386/include/IOKit/usb/IOUSBNub.h b/i386/include/IOKit/usb/IOUSBNub.h
deleted file mode 100644
index a998e5b..0000000
--- a/i386/include/IOKit/usb/IOUSBNub.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBNUB_H
-#define _IOKIT_IOUSBNUB_H
-
-#include <IOKit/IOService.h>
-#include <libkern/c++/OSData.h>
-#include <IOKit/IOMemoryDescriptor.h>
-
-#include <IOKit/usb/USB.h>
-
-class IOUSBController;
-class IOUSBPipe;
-
-/*!
- @class IOUSBNub
- @abstract Super class for for IOUSBDevice and IOUSBInterface.
- */
-class IOUSBNub : public IOService
-{
-    OSDeclareDefaultStructors(IOUSBNub)
-
-public:
-	
-	// IOKit method
-	virtual void					joinPMtree ( IOService * driver );
-
-    virtual bool					USBCompareProperty(OSDictionary   * matching, const char     * key );
-    
-    bool							IsWildCardMatch( OSDictionary   * matching, const char     * key );
-    bool							USBComparePropertyWithMask( OSDictionary *matching, const char *key, const char * maskKey );
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void printDescriptor(const IOUSBDescriptorHeader *desc);
-void printDeviceDescriptor(const IOUSBDeviceDescriptor *desc);
-void printConfigDescriptor(const IOUSBConfigurationDescriptor *cd);
-void printEndpointDescriptor(const IOUSBEndpointDescriptor *ed);
-void printInterfaceDescriptor(const IOUSBInterfaceDescriptor *id);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _IOKIT_IOUSBNUB_H */
diff --git a/i386/include/IOKit/usb/IOUSBPipe.h b/i386/include/IOKit/usb/IOUSBPipe.h
deleted file mode 100644
index 3286b92..0000000
--- a/i386/include/IOKit/usb/IOUSBPipe.h
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.2 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.  
- * Please see the License for the specific language governing rights and 
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBPIPE_H
-#define _IOKIT_IOUSBPIPE_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOMemoryDescriptor.h>
-
-#include <IOKit/usb/USB.h>
-#include <IOKit/usb/IOUSBController.h>
-#include <IOKit/usb/IOUSBControllerV2.h>
-
-class IOUSBInterface;
-
-/*!
-    @class IOUSBPipe
-    @abstract The object representing an open pipe for a device.
-*/
-class IOUSBPipe : public OSObject
-{
-    friend class IOUSBInterface;
-    friend class IOUSBDevice;
-	
-    OSDeclareDefaultStructors(IOUSBPipe)
-		
-protected:
-	
-	const IOUSBEndpointDescriptor *	_descriptor;
-    IOUSBController::Endpoint		_endpoint;	// tidied up version of descriptor
-    IOUSBController *				_controller;
-    USBDeviceAddress				_address;
-    UInt8							_status;	// was previously used for status.  Now used to detect whether a property exists or not
-	
-    struct ExpansionData
-    {
-        IOReturn					_correctStatus;		
-		IOUSBDevice *				_device;	// Remember containing device for clearing TTs
-		UInt8						_speed;
-		IOUSBInterface	*			_interface;
-		bool						_crossEndianCompatible;
-		UInt32						_locationID;
-    };
-    ExpansionData * _expansionData;
-    
-    virtual void free();
-    
-    IOReturn ClosePipe(void);
-	
-public:
-		
-		virtual bool InitToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
-									USBDeviceAddress address, IOUSBController * controller);
-	
-    // The following 2 methods are obsolete
-    //
-    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
-                                 USBDeviceAddress address, IOUSBController * controller);
-	
-    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint,
-                                 IOUSBDevice * device, IOUSBController * controller);
-	
-    static IOUSBPipe *ToEndpoint(const IOUSBEndpointDescriptor *endpoint,
-                                 IOUSBDevice * device, IOUSBController * controller, IOUSBInterface *interface);
-	
-    // Controlling pipe state
-    /*!
-        @function GetStatus
-	 This method does NOT work.  Do not call it. See GetPipeStatus for the correct method.
-	 GetStatus will always return 0.
-	 */
-    virtual UInt8 GetStatus(void);
-    /*!
-        @function Abort
-	 This method causes all outstanding I/O on a pipe to complete with return code kIOReturnAborted. It  clears the halted bit but does NOT clear the
-	 toggle bit on the endpoint in the controller.  If you wish to clear the toggle bit, see ClearPipeStall
-	 */
-    virtual IOReturn Abort(void);
-    /*!
-        @function Reset
-	 This method is identical to ClearPipeStall(false). The use of that API is preferred.
-	 */
-    virtual IOReturn Reset(void);
-    /*!
-        @function ClearStall
-	 This method is equivalent to ClearPipeStall(false). This method is available before version 1.9.
-	 */
-    virtual IOReturn ClearStall(void);
-	
-    //
-    // Transferring Data
-    //
-    
-    // deprecated
-    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
-                          IOUSBCompletion *	completion = 0,
-						  IOByteCount *		bytesRead = 0);
-	
-    // deprecated
-    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
-                           IOUSBCompletion *	completion = 0);
-	
-    // Transfer data over Isochronous pipes
-    /*!
-        @function Read
-	 Read from an isochronous endpoint
-	 @param buffer place to put the transferred data
-	 @param frameStart USB frame number of the frame to start transfer
-	 @param numFrames Number of frames to transfer
-	 @param frameList Bytes to transfer and result for each frame
-	 @param completion describes action to take when buffer has been filled
-	 */
-    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
-                          UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList,
-                          IOUSBIsocCompletion *	completion = 0);
-    /*!
-        @function Write
-	 Write to an isochronous endpoint
-	 @param buffer place to get the transferred data
-	 @param frameStart USB frame number of the frame to start transfer
-	 @param numFrames Number of frames to transfer
-	 @param frameList Bytes to transfer and result for each frame
-	 @param completion describes action to take when buffer has been emptied
-	 */
-    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
-                           UInt64 frameStart, UInt32 numFrames, IOUSBIsocFrame *frameList,
-                           IOUSBIsocCompletion * completion = 0);
-	
-    // Do a control request over a Control pipe, using a memory descriptor
-    /*!
-        @function ControlRequest
-	 Make a control request
-	 There are two versions of this method, one uses a simple void *
-	 to point to the data portion of the transfer, the other uses an
-	 IOMemoryDescriptor to point to the data.
-	 @param request parameter block for the control request
-	 @param completion describes action to take when the request has been executed
-	 */
-    virtual IOReturn ControlRequest(IOUSBDevRequestDesc	*request,
-                                    IOUSBCompletion	*completion = 0);
-	
-    // Do a control request over a Control pipe, using a simple buffer
-    virtual IOReturn ControlRequest(IOUSBDevRequest	*request,
-                                    IOUSBCompletion	*completion = 0);
-	
-	/*
-	 *  Accessors
-	 */
-    /*!
-        @function GetEndpoint
-	 returns a pointer to the Endpoint structure for the pipe.
-	 */
-    virtual const IOUSBController::Endpoint *	GetEndpoint();
-    /*!
-        @function GetEndpointDescriptor
-	 returns the endpoint descriptor for the pipe.
-	 */
-    virtual const IOUSBEndpointDescriptor *	GetEndpointDescriptor();
-    /*!
-        @function GetDirection
-	 returns the direction of the pipe:kUSBOut/kUSBIn for a bulk or interrupt pipe,
-	 kUSBAnyDirn for a control pipe.
-	 */
-    virtual UInt8 GetDirection();
-    /*!
-        @function GetType
-	 returns the pipe type: kUSBControl, kUSBBulk or kUSBInterrupt.
-	 */
-    virtual UInt8 GetType();
-    /*!
-        @function GetEndpointNumber
-	 returns the endpoint number in the device that the pipe is connected to.
-	 */
-    virtual UInt8 GetEndpointNumber();
-    virtual USBDeviceAddress GetAddress();
-    virtual UInt16 GetMaxPacketSize();
-    virtual UInt8 GetInterval();
-	
-    // Transfer data over Bulk pipes with timeouts.
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  0);
-	
-    // deprecated
-    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
-						  UInt32		noDataTimeout,
-						  UInt32		completionTimeout,
-                          IOUSBCompletion *	completion = 0,
-						  IOByteCount *		bytesRead = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  1);
-	
-    // deprecated
-    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
-						   UInt32		noDataTimeout,
-						   UInt32		completionTimeout,
-                           IOUSBCompletion *	completion = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  2);
-    // Do a control request over a Control pipe, using a memory descriptor
-    /*!
-        @function ControlRequest
-	 Make a control request. 
-	 There are two versions of this method, one uses a simple void *
-	 to point to the data portion of the transfer, the other uses an
-	 IOMemoryDescriptor to point to the data.
-	 @param request parameter block for the control request
-	 @param noDataTimeout Specifies an amount of time (in ms) after which the command will be aborted
-	 if no data has been transferred on the bus.
-	 @param completionTimeout Specifies an amount of time (in ms) after which the command will be aborted if the entire command has
-	 not been completed.
-	 @param completion describes action to take when the request has been executed
-	 */
-    virtual IOReturn ControlRequest(IOUSBDevRequestDesc	*request,
-									UInt32		noDataTimeout,
-									UInt32		completionTimeout,
-                                    IOUSBCompletion	*completion = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  3);
-    // Do a control request over a Control pipe, using a simple buffer
-    virtual IOReturn ControlRequest(IOUSBDevRequest	*request,
-									UInt32		noDataTimeout,
-									UInt32		completionTimeout,
-                                    IOUSBCompletion	*completion = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  4);
-    /*!
-        @function Read
-	 Read from an interrupt or bulk endpoint
-	 @param buffer place to put the transferred data
-	 @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
-	 the driver software may have to resynchronize the data toggle. See ClearPipeStall.
-	 @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
-	 @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
-	 @param completion describes action to take when buffer has been filled
-	 @param bytesRead returns total bytes read for synchronous reads
-	 */
-    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
-						  UInt32		noDataTimeout,
-						  UInt32		completionTimeout,
-						  IOByteCount		reqCount,
-						  IOUSBCompletion *	completion = 0,
-						  IOByteCount *		bytesRead = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  5);
-    /*!
-        @function Write
-	 Write to an interrupt or bulk endpoint
-	 @param buffer place to get the transferred data
-	 @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
-	 the driver software may have to resynchronize the data toggle. See ClearPipeStall.
-	 @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
-	 @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
-	 @param completion describes action to take when buffer has been emptied
-	 */
-    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
-						   UInt32		noDataTimeout,
-						   UInt32		completionTimeout,
-						   IOByteCount		reqCount,
-                           IOUSBCompletion *	completion = 0);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  6);
-    /*!
-        @function GetPipeStatus
-	 Returns the status of the pipe (kIOUSBPipeStalled of the pipe is stalled, else kIOReturnSuccess)
-	 */
-    virtual IOReturn GetPipeStatus(void);
-    
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  7);
-    /*!
-		@function ClearPipeStall
-	 AVAILABLE ONLY IN VERSION 1.9 AND ABOVE
-	 This method causes all outstanding I/O on a pipe to complete with return code kIOUSBTransactionReturned. It also clears both the halted bit and the
-	 toggle bit on the endpoint in the controller. The driver may need to reset the data toggle within the device to avoid losing any data. If the
-	 device correctly handles the ClearFeature(ENDPOINT_HALT) device request, then this API will handle that by sending the correct request to the
-	 device.
-	 @param withDeviceRequest if true, a ClearFeature(ENDPOINT_HALT) is sent to the appropriate endpoint on the device after the transactions on the 
-	 controllers endpoint are returned and the toggle bit on the controllers endpoint is cleared. if this parameter is false, then this is equivalent
-	 to the pre-1.9 API. This means that the endpoint on the controller is cleared, but no DeviceRequest is sent to the device's endpoint.
-	 */
-    virtual IOReturn ClearPipeStall(bool withDeviceRequest);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  8);
-    /*!
-		@function SetPipePolicy
-	 AVAILABLE ONLY IN VERSION 1.9 AND ABOVE
-	 This method allows a driver to change the maxPacketSize of an Isochronous pipe, or the polling interval for an interrupt pipe. There is a limited
-	 amount of bandwidth on any single bus, and isochronous pipes tend to use much of this bandwidth. The driver may know, however, that there
-	 will never be as much bandwidth used as is specified in the pipe's endpoint descriptor. Therefore, the driver may return some of this 
-	 bandwidth to the system by using this method. Additionally, if on an open of an IOUSBInterface any of the Isochronous pipes is unable to be 
-	 opened because of a lack of bandwidth, the pipe will be created with a bandwidth of zero, and the driver may get some of the limited bandwidth
-	 remaining by using this call.
-	 This method returns kIOReturnBadArgument if the pipe is a bulk on control pipe, or if the maxPacketSize parameter is larger than the amount specified
-	 in the endpoint descriptor. It returns kIOReturnNoBandwidth if the bandwidth requested cannot be allocated. Otherwise it returns kIOReturnSuccess.
-	 @param maxPacketSize specifies the maximum number of bytes to be used in any one millisecond frame by this pipe. The value must be less than or 
-	 equal to the maxPacketSize specified in the endpoint descriptor.
-	 @param maxInterval not currently used. reserved for future expansion
-	 
-	 */
-    virtual IOReturn SetPipePolicy(UInt16 maxPacketSize, UInt8 maxInterval);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  9);
-	
-    // Transfer data over Isochronous pipes and process the frame list at hardware interrupt time
-    /*!
-        @function Read
-	 AVAILABLE ONLY IN VERSION 1.9.2 AND ABOVE
-	 Read from an isochronous endpoint and process the IOUSBLowLatencyIsocFrame fields at 
-	 hardware interrupt time
-	 @param buffer place to put the transferred data
-	 @param frameStart USB frame number of the frame to start transfer
-	 @param numFrames Number of frames to transfer
-	 @param frameList Bytes to transfer, result, and time stamp for each frame
-	 @param completion describes action to take when buffer has been filled
-	 @param updateFrequency describes how often (in milliseconds) should the frame list be processed
-	 */
-    virtual IOReturn Read(IOMemoryDescriptor *	buffer,
-                          UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList,
-                          IOUSBLowLatencyIsocCompletion *	completion = 0, UInt32 updateFrequency = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  10);
-    /*!
-        @function Write
-	 AVAILABLE ONLY IN VERSION 1.9.2 AND ABOVE
-	 Write to an isochronous endpoint
-	 @param buffer place to get the data to transfer
-	 @param frameStart USB frame number of the frame to start transfer
-	 @param numFrames Number of frames to transfer
-	 @param frameList Pointer to list of frames indicating bytes to transfer and result for each frame
-	 @param completion describes action to take when buffer has been emptied
-	 @param updateFrequency describes how often (in milliseconds) should the frame list be processed
-	 */
-    virtual IOReturn Write(IOMemoryDescriptor *	buffer,
-                           UInt64 frameStart, UInt32 numFrames, IOUSBLowLatencyIsocFrame *frameList,
-                           IOUSBLowLatencyIsocCompletion * completion = 0, UInt32 updateFrequency = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  11);
-    /*!
-        @function Read
-     Read from an interrupt or bulk endpoint
-     @param buffer place to put the transferred data
-     @param noDataTimeout number of milliseconds of no bus activity until transaction times out. Note that if a tranasction times out
-     the driver software may have to resynchronize the data toggle. See ClearPipeStall.
-     @param completionTimeout number of milliseconds from the time the transaction is placed on the bus until it times out
-     @param reqCount requested number of bytes to transfer. must be <= buffer->getLength()
-     @param completion describes action to take when buffer has been filled
-     @param bytesRead returns total bytes read for synchronous reads
-     */
-    virtual IOReturn Read(IOMemoryDescriptor *			buffer,
-                          UInt32				noDataTimeout,
-                          UInt32				completionTimeout,
-                          IOByteCount				reqCount,
-                          IOUSBCompletionWithTimeStamp *	completion = 0,
-                          IOByteCount *				bytesRead = 0);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBPipe,  12);
-	virtual bool InitToEndpoint(const IOUSBEndpointDescriptor *endpoint, UInt8 speed,
-								USBDeviceAddress address, IOUSBController * controller, IOUSBDevice * device, IOUSBInterface * interface);
-
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  13);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  14);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  15);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  16);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  17);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  18);
-    OSMetaClassDeclareReservedUnused(IOUSBPipe,  19);
-	
-};
-
-#endif /* _IOKIT_IOUSBPIPE_H */
diff --git a/i386/include/IOKit/usb/IOUSBRootHubDevice.h b/i386/include/IOKit/usb/IOUSBRootHubDevice.h
deleted file mode 100644
index 19a17c4..0000000
--- a/i386/include/IOKit/usb/IOUSBRootHubDevice.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBROOTHUBDEVICE_H
-#define _IOKIT_IOUSBROOTHUBDEVICE_H
-
-#include <IOKit/usb/IOUSBHubDevice.h>
-
-/*!
- @class IOUSBRootHubDevice
- @abstract The object representing the Root Hub simulation.
- */
-class IOUSBRootHubDevice : public IOUSBHubDevice
-{
-    OSDeclareDefaultStructors(IOUSBRootHubDevice)
-
-private:
-    UInt16				configuration;
-	IOCommandGate		*_commandGate;
-
-	// private method which overrides the same method in IOUSBHubDevice
-	virtual bool			InitializeCharacteristics(void);					// used at start
-	
-    struct ExpansionData 
-	{
-		IOService *		_IOResourcesEntry;
-	};
-    ExpansionData *_expansionData;
-
-public:
-	// static methods
-    static IOUSBRootHubDevice	*NewRootHubDevice(void);
-    static IOReturn				GatedDeviceRequest (OSObject *	owner, 
-												void *		arg0, 
-												void *		arg1, 
-												void *		arg2, 
-												void *		arg3 );
-    
-	// IOKit methods
-    virtual bool 	init();
-	virtual bool 	start( IOService * provider );
-    virtual void 	stop( IOService *provider );
-    virtual void	free();
-
-	// IOUSBHubDevice methods
-	virtual bool			IsRootHub(void);
-	virtual UInt32			RequestExtraPower(UInt32 requestedPower);
-	virtual void			ReturnExtraPower(UInt32 returnedPower);
-
-	// 
-	virtual UInt32			RequestSleepPower(UInt32 requestedPower);
-	virtual void			ReturnSleepPower(UInt32 returnedPower);
-	
-	// a non static but non-virtual function
-	IOReturn DeviceRequestWorker(IOUSBDevRequest *request, UInt32 noDataTimeout, UInt32 completionTimeout, IOUSBCompletion *completion);
-    
-	// IOUSBDevice methods overriden here
-    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, IOUSBCompletion *completion = 0);
-    virtual IOReturn DeviceRequest(IOUSBDevRequest *request, UInt32 noDataTimeout, UInt32 completionTimeout, IOUSBCompletion *completion = 0);
-
-    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  0);
-	virtual IOReturn		GetDeviceInformation(UInt32 *info);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  1);
-	virtual void			InitializeExtraPower(UInt32 maxPortCurrent, UInt32 totalExtraCurrent);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  2);
-	virtual void			SetSleepCurrent(UInt32 sleepCurrent);
-	
-    OSMetaClassDeclareReservedUsed(IOUSBRootHubDevice,  3);
-	virtual UInt32			GetSleepCurrent();
-
-    OSMetaClassDeclareReservedUnused(IOUSBRootHubDevice,  4);
-};
-
-#endif /* _IOKIT_IOUSBROOTHUBDEVICE_H */
-
diff --git a/i386/include/IOKit/usb/IOUSBUserClient.h b/i386/include/IOKit/usb/IOUSBUserClient.h
deleted file mode 100644
index 1cd47a8..0000000
--- a/i386/include/IOKit/usb/IOUSBUserClient.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBUSERCLIENT_H
-#define _IOKIT_IOUSBUSERCLIENT_H
-
-// these are the new User Client method names    
-enum {
-    kUSBDeviceUserClientOpen,
-    kUSBDeviceUserClientClose,
-    kUSBDeviceUserClientSetConfig,
-    kUSBDeviceUserClientGetConfig,
-    kUSBDeviceUserClientGetConfigDescriptor,
-    kUSBDeviceUserClientGetFrameNumber,
-    kUSBDeviceUserClientDeviceRequestOut,
-    kUSBDeviceUserClientDeviceRequestIn,
-    kUSBDeviceUserClientCreateInterfaceIterator,
-    kUSBDeviceUserClientResetDevice,
-    kUSBDeviceUserClientSuspend,
-    kUSBDeviceUserClientAbortPipeZero,
-    kUSBDeviceUserClientReEnumerateDevice,
-    kUSBDeviceUserClientGetMicroFrameNumber,
-    kUSBDeviceUserClientGetFrameNumberWithTime,
-    kUSBDeviceUserClientSetAsyncPort,
-	kUSBDeviceUserClientGetDeviceInformation,
-	kUSBDeviceUserClientRequestExtraPower,
-	kUSBDeviceUserClientReturnExtraPower,
-	kUSBDeviceUserClientGetExtraPowerAllocated,
-    kIOUSBLibDeviceUserClientNumCommands
-    };
-
-enum {
-    kUSBInterfaceUserClientOpen,
-    kUSBInterfaceUserClientClose,
-    kUSBInterfaceUserClientGetDevice,
-    kUSBInterfaceUserClientSetAlternateInterface,
-    kUSBInterfaceUserClientGetFrameNumber,
-    kUSBInterfaceUserClientGetPipeProperties,
-    kUSBInterfaceUserClientReadPipe,
-    kUSBInterfaceUserClientWritePipe,
-    kUSBInterfaceUserClientGetPipeStatus,
-    kUSBInterfaceUserClientAbortPipe,
-    kUSBInterfaceUserClientResetPipe,
-    kUSBInterfaceUserClientClearPipeStall,
-    kUSBInterfaceUserClientControlRequestOut,
-    kUSBInterfaceUserClientControlRequestIn,
-    kUSBInterfaceUserClientSetPipePolicy,
-    kUSBInterfaceUserClientGetBandwidthAvailable,
-    kUSBInterfaceUserClientGetEndpointProperties,
-    kUSBInterfaceUserClientLowLatencyPrepareBuffer,
-    kUSBInterfaceUserClientLowLatencyReleaseBuffer,
-    kUSBInterfaceUserClientGetMicroFrameNumber,
-    kUSBInterfaceUserClientGetFrameListTime,
-    kUSBInterfaceUserClientGetFrameNumberWithTime,
-    kUSBInterfaceUserClientSetAsyncPort,
-    kUSBInterfaceUserClientReadIsochPipe,
-    kUSBInterfaceUserClientWriteIsochPipe,
-    kUSBInterfaceUserClientLowLatencyReadIsochPipe,
-    kUSBInterfaceUserClientLowLatencyWriteIsochPipe,
-	kUSBInterfaceUserClientGetConfigDescriptor,
-    kIOUSBLibInterfaceUserClientNumCommands
-    };
-
-
-#if KERNEL
-#include <IOKit/IOService.h>
-#include <IOKit/IOUserClient.h>
-#include <IOKit/usb/USB.h>
-
-//================================================================================================
-//
-//   Structure declarations
-//
-//================================================================================================
-//
-typedef struct IOUSBUserClientAsyncParamBlock IOUSBUserClientAsyncParamBlock;
-
-struct IOUSBUserClientAsyncParamBlock 
-{
-    OSAsyncReference64			fAsyncRef;
-    uint32_t					fAsyncCount;
-    uint32_t					fMax;
-    IOMemoryDescriptor *		fMem;
-    IOUSBDevRequestDesc			req;
-};
-
-typedef struct IOUSBInterfaceUserClientISOAsyncParamBlock IOUSBInterfaceUserClientISOAsyncParamBlock;
-struct IOUSBInterfaceUserClientISOAsyncParamBlock 
-{
-    OSAsyncReference64			fAsyncRef;
-	uint32_t					fAsyncCount;
-    mach_vm_size_t				frameLen;	// In bytes
-    mach_vm_address_t           frameBase;	// In user task
-    IOMemoryDescriptor *        dataMem;
-    IOMemoryDescriptor *        countMem;
-	uint64_t					numFrames;
-    IOUSBIsocFrame              frames[0];  // Must be the last one
-};
-
-
-//================================================================================================
-//
-// This class is used to add an IOProviderMergeProperties dictionary entry to a provider's
-// property list, thus providing a tie between hardware and a CFBundle at hardware
-// load time.  This property usually contains the user client class name and the CFPlugInTypes UUID's
-// but it can contain other properties.
-//
-//================================================================================================
-//
-class IOUSBUserClientInit : public IOService 
-{
-    OSDeclareDefaultStructors(IOUSBUserClientInit);
-
-public:
-    
-    virtual bool		start(IOService *  provider) ;
-    virtual bool 		MergeDictionaryIntoProvider(IOService *  provider, OSDictionary *  mergeDict);
-    virtual bool		MergeDictionaryIntoDictionary(OSDictionary *  sourceDictionary,  OSDictionary *  targetDictionary);
-};
-
-#endif // KERNEL
-
-#endif /* ! _IOKIT_IOUSBUSERCLIENT_H */
-
diff --git a/i386/include/IOKit/usb/IOUSBWorkLoop.h b/i386/include/IOKit/usb/IOUSBWorkLoop.h
deleted file mode 100644
index 7630704..0000000
--- a/i386/include/IOKit/usb/IOUSBWorkLoop.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2001-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOUSBWORKLOOP_H
-#define _IOKIT_IOUSBWORKLOOP_H
-
-#include <IOKit/IOWorkLoop.h>
-
-/*!
- @class IOUSBWorkLoop
- @abstract Subclass of IOWorkloop that allows the USB stack to more finely control sleep and wake.
- */
-class IOUSBWorkLoop : public IOWorkLoop
-{    
-    OSDeclareDefaultStructors(IOUSBWorkLoop)
-    
-protected:
-    void *			fSleepToken;
-#ifndef __OPEN_SOURCE__
-	lck_grp_t *		fLockGroup;
-#endif
-	bool init ( const char * controllerLocation );
-	void free ( void );
-	
-    // Overrides to check for sleeping
-    virtual void closeGate();
-    virtual bool tryCloseGate();
-    
-public:
-    // Create a workloop
-    static IOUSBWorkLoop * workLoop(const char * controllerLocation);
-    
-    // Put workloop to sleep (Must have gate closed, opens gate if successful)
-    virtual IOReturn sleep(void *token);
-    
-    // Wake workloop up (closes gate if successful)
-    virtual IOReturn wake(void *token);
-    
-    void CloseGate(void);
-    void OpenGate(void);
-};
-
-#endif /* ! _IOKIT_IOUSBWORKLOOP_H */
-
diff --git a/i386/include/IOKit/usb/USB.h b/i386/include/IOKit/usb/USB.h
deleted file mode 100644
index 8ba12bb..0000000
--- a/i386/include/IOKit/usb/USB.h
+++ /dev/null
@@ -1,1076 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _USB_H
-#define _USB_H
-
-#if KERNEL
-	#include <libkern/OSByteOrder.h>
-	#include <IOKit/IOMemoryDescriptor.h>
-#else
-	#include <libkern/OSByteOrder.h>
-#endif
-
-#include <IOKit/IOTypes.h>
-
-#if !defined(__USB__)
-#    include <IOKit/usb/USBSpec.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    /*!
-    @header		USB.h
-     @abstract	Public Interfaces to the USB implementation in Mac OS X.
-     @discussion	This header file contains definitions and structures that are used in the different USB API's in Mac OS X, both in the kernel and in the user space.
-     */
-
-    /*!
-    @defined	Endian conversion definitions
-     @discussion The USB API's use a convention of specifying parameters in the host order.  The USB spec specifies that multi-byte items should be
-     formatted in little endian order.  The following macros allow one to translate multi-byte values from Host order to USB order and vice versa.  There are separate macros for
-     in-kernel use and for user space use.
-     */
-#define USBToHostWord OSSwapLittleToHostInt16
-#define HostToUSBWord OSSwapHostToLittleInt16
-#define USBToHostLong OSSwapLittleToHostInt32
-#define HostToUSBLong OSSwapHostToLittleInt32
-
-    /*!
-    @enum Miscellaneous Constants
-    @discussion 
-    */
-    enum {
-    kUSBDeviceIDShift = 7,
-    kUSBMaxDevices = 128,
-    kUSBMaxDevice = kUSBMaxDevices-1,
-    kUSBDeviceIDMask = 0x7f,
-
-    kUSBPipeIDMask = 0xf,
-    kUSBMaxPipes = 32,	// In and Out pipes can have same pipe number.
-
-    kUSBInterfaceIDShift = 8,
-    kUSBMaxInterfaces = 1 << kUSBInterfaceIDShift,
-    kUSBInterfaceIDMask = kUSBMaxInterfaces-1,
-
-    kUSBEndPtShift = 7,
-    kUSBDeviceMask = ((1 << kUSBEndPtShift) -1),
-
-    kUSBNoPipeIdx = -1
-};
-
-/*!
-@enum bRequest Shifts and Masks 
-@discussion These are used to create the macro to encode the bRequest filed of a Device Request
-*/
-enum {
-    kUSBRqDirnShift = 7,
-    kUSBRqDirnMask = 1,
-
-    kUSBRqTypeShift = 5,
-    kUSBRqTypeMask = 3,
-
-    kUSBRqRecipientMask = 0X1F
-};
-
-/*!
-@defined USBmakebmRequestType 
-@discussion Macro to encode the bRequest field of a Device Request.  It is used when constructing an IOUSBDevRequest.
-*/
-#define USBmakebmRequestType(direction, type, recipient)		\
-    ((direction & kUSBRqDirnMask) << kUSBRqDirnShift) |			\
-    ((type & kUSBRqTypeMask) << kUSBRqTypeShift) |			\
-    (recipient & kUSBRqRecipientMask)
-
-/*!
-@enum kUSBMaxIsocFrameReqCount 
-@discussion Maximum size in bytes allowed for one Isochronous frame
-*/
-enum {
-    kUSBMaxFSIsocEndpointReqCount = 1023,	// max size (bytes) of any one Isoc frame for 1 FS endpoint
-	kUSBMaxHSIsocEndpointReqCount = 3072,	// max size (bytes) of any one Isoc frame for 1 HS endpoint
-	kUSBMaxHSIsocFrameCount = 7168			// max size (bytes) of all Isoc transfers in a HS frame
-};
-
-/*!
-@defined EncodeRequest 
-@discussion Macro that encodes the bRequest and bRequestType fields of a IOUSBDevRequest into a single value.  It is useful when one needs
-to know what type of request the IOUSBDevRequest encodes and simplifies comparisons.
-*/
-#define EncodeRequest(request, direction, type, recipient)		\
-    (((UInt16)request << 8) +	    					\
-              ((UInt16)recipient +					\
-                        ((UInt16)type << kUSBRqTypeShift) +		\
-                        ((UInt16)direction << kUSBRqDirnShift)))
-
-
-/*!
-@enum Standard Device Requests
-@discussion Encoding of the standard device requests.
-<tt>
-<pre><b>
-bmRequestType bRequest          wValue        wIndex     wLength Data</b>
-00000000B     CLEAR_FEATURE     Feature       Zero       Zero    None (device)
-00000001B                       Feature       Interface  Zero    None (Interface)
-00000010B                       Feature       Endpoint   Zero    None (Endpoint)
-
-10000000B     GET_CONFIGURATION Zero          Zero       One     Configuration
-10000000B     GET_DESCRIPTOR    Type          LangID     Length  Descriptor
-10000001B     GET_INTERFACE     Zero          Interface  One     Alternate
-
-10000000B     GET_STATUS        Zero          Zero       Two     status (device)
-10000001B                       Zero          Interface  Two     status (Interface)
-10000010B                       Zero          Endpoint   Two     status (Endpoint)
-
-00000000B     SET_ADDRESS       Address       Zero       Zero    None
-00000000B     SET_CONFIGURATION Configuration Zero       Zero    None
-00000000B     SET_DESCRIPTOR    Type          LangID     Length  Descriptor
-
-00000000B     SET_FEATURE       Feature       Zero       Zero    None (device)
-00000001B                       Feature       Interface  Zero    None (Interface)
-00000010B                       Feature       Endpoint   Zero    None (Endpoint)
-
-00000001B     SET_INTERFACE     Alternate     Interface  Zero    None
-10000010B     SYNCH_FRAME       Zero          Endpoint   Two     Frame Number
-</pre>
-</tt>
-*/
-enum {
-    kClearDeviceFeature     = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBDevice),
-    kClearInterfaceFeature  = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBInterface),
-    kClearEndpointFeature   = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBStandard, kUSBEndpoint),
-    kGetConfiguration       = EncodeRequest(kUSBRqGetConfig,     kUSBIn,  kUSBStandard, kUSBDevice),
-    kGetDescriptor          = EncodeRequest(kUSBRqGetDescriptor, kUSBIn,  kUSBStandard, kUSBDevice),
-    kGetInterface           = EncodeRequest(kUSBRqGetInterface,  kUSBIn,  kUSBStandard, kUSBInterface),
-    kGetDeviceStatus        = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBDevice),
-    kGetInterfaceStatus     = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBInterface),
-    kGetEndpointStatus      = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBStandard, kUSBEndpoint),
-    kSetAddress             = EncodeRequest(kUSBRqSetAddress,    kUSBOut, kUSBStandard, kUSBDevice),
-    kSetConfiguration       = EncodeRequest(kUSBRqSetConfig,     kUSBOut, kUSBStandard, kUSBDevice),
-    kSetDescriptor          = EncodeRequest(kUSBRqSetDescriptor, kUSBOut, kUSBStandard, kUSBDevice),
-    kSetDeviceFeature       = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBDevice),
-    kSetInterfaceFeature    = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBInterface),
-    kSetEndpointFeature     = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBStandard, kUSBEndpoint),
-    kSetInterface           = EncodeRequest(kUSBRqSetInterface,  kUSBOut, kUSBStandard, kUSBInterface),
-    kSyncFrame              = EncodeRequest(kUSBRqSyncFrame,     kUSBIn,  kUSBStandard, kUSBEndpoint),
-};
-
-/*!
-@defined kCallInterfaceOpenWithGate
- @discussion If the USB Device has this property, drivers for any of its interfaces will have their handleOpen method called while holding the workloop gate.
- */
-#define kCallInterfaceOpenWithGate	"kCallInterfaceOpenWithGate"
-
-// TYPES
-
-typedef UInt16 USBDeviceAddress;
-
-typedef uint32_t USBPhysicalAddress32;
-
-/*!
-    @typedef IOUSBIsocFrame
-    @discussion Structure used to encode information about each isoc frame.
-    @param frStatus Returns status associated with the frame.
-    @param frReqCount Input specifiying how many bytes to read or write.
-    @param frActCount Actual # of bytes transferred.
-*/
-typedef struct IOUSBIsocFrame {
-    IOReturn                        frStatus;
-    UInt16                          frReqCount;
-    UInt16                          frActCount;
-} IOUSBIsocFrame;
-
-
-/*!
-    @typedef IOUSBLowLatencyIsocFrame
-    @discussion    Structure used to encode information about each isoc frame that is processed
-    at hardware interrupt time (low latency).
-    @param frStatus Returns status associated with the frame.
-    @param frReqCount Input specifiying how many bytes to read or write.
-    @param frActCount Actual # of bytes transferred.
-    @param frTimeStamp Time stamp that indicates time when frame was procesed.
-*/
-struct IOUSBLowLatencyIsocFrame {
-    IOReturn                        frStatus;
-    UInt16                          frReqCount;
-    UInt16                          frActCount;
-    AbsoluteTime		    frTimeStamp;
-};
-typedef struct IOUSBLowLatencyIsocFrame IOUSBLowLatencyIsocFrame;
-
-/*!
-@typedef IOUSBCompletionAction
- @discussion Function called when USB I/O completes.
- @param target The target specified in the IOUSBCompletion struct.
- @param parameter The parameter specified in the IOUSBCompletion struct.
- @param status Completion status.
- @param bufferSizeRemaining Bytes left to be transferred.
- */
-typedef void (*IOUSBCompletionAction)(
-                                      void *			target,
-                                      void *			parameter,
-                                      IOReturn		status,
-                                      UInt32			bufferSizeRemaining);
-
-/*!
-@typedef IOUSBCompletionActionWithTimeStamp
- @discussion Function called when USB I/O completes.
- @param target The target specified in the IOUSBCompletion struct.
- @param parameter The parameter specified in the IOUSBCompletion struct.
- @param status Completion status.
- @param bufferSizeRemaining Bytes left to be transferred.
- @param timeStamp Time at which the transaction was processed.
- */
-typedef void (*IOUSBCompletionActionWithTimeStamp)(
-                                      void *		target,
-                                      void *		parameter,
-                                      IOReturn		status,
-                                      UInt32		bufferSizeRemaining,
-                                      AbsoluteTime	timeStamp);
-
-/*!
-    @typedef IOUSBIsocCompletionAction
-    @discussion Function called when Isochronous USB I/O completes.
-    @param target The target specified in the IOUSBIsocCompletionn struct.
-    @param parameter The parameter specified in the IOUSBIsocCompletion struct.
-    @param status Completion status.
-    @param pFrames Pointer to the frame list containing the status for each frame transferred.
-*/
-typedef void (*IOUSBIsocCompletionAction)(
-                void *			target,
-                void *			parameter,
-                IOReturn		status,
-                IOUSBIsocFrame		*pFrames);
-
-/*!
-    @typedef IOUSBLowLatencyIsocCompletionAction
-    @discussion Function called when Low Latency Isochronous USB I/O completes.
-    @param target The target specified in the IOUSBLowLatencyIsocCompletion struct.
-    @param parameter The parameter specified in the IOUSBLowLatencyIsocCompletion struct.
-    @param status Completion status.
-    @param pFrames Pointer to the low latency frame list containing the status for each frame transferred.
-*/
-typedef void (*IOUSBLowLatencyIsocCompletionAction)(
-                void *				target,
-                void *				parameter,
-                IOReturn			status,
-                IOUSBLowLatencyIsocFrame	*pFrames);
-
-/*!
-@typedef IOUSBCompletion
- @discussion Struct specifying action to perform when a USB I/O completes.
- @param target The target to pass to the action function.
- @param action The function to call.
- @param parameter The parameter to pass to the action function.
- */
-typedef struct IOUSBCompletion {
-    void * 			target;
-    IOUSBCompletionAction	action;
-    void *			parameter;
-} IOUSBCompletion;
-
-/*!
-@typedef IOUSBCompletionWithTimeStamp
- @discussion Struct specifying action to perform when a USB I/O completes.
- @param target The target to pass to the action function.
- @param action The function to call.
- @param parameter The parameter to pass to the action function.
- */
-typedef struct IOUSBCompletionWithTimeStamp {
-    void * 				target;
-    IOUSBCompletionActionWithTimeStamp	action;
-    void *				parameter;
-} IOUSBCompletionWithTimeStamp;
-
-/*!
-    @typedef IOUSBIsocCompletion
-    @discussion Struct specifying action to perform when an Isochronous USB I/O completes.
-    @param target The target to pass to the action function.
-    @param action The function to call.
-    @param parameter The parameter to pass to the action function.
-*/
-typedef struct IOUSBIsocCompletion {
-    void * 			target;
-    IOUSBIsocCompletionAction	action;
-    void *			parameter;
-} IOUSBIsocCompletion;
-
-/*!
-    @typedef IOUSBLowLatencyIsocCompletion
-    @discussion Struct specifying action to perform when an Low Latency Isochronous USB I/O completes.
-    @param target The target to pass to the action function.
-    @param action The function to call.
-    @param parameter The parameter to pass to the action function.
-*/
-typedef struct IOUSBLowLatencyIsocCompletion {
-    void * 				target;
-    IOUSBLowLatencyIsocCompletionAction	action;
-    void *				parameter;
-} IOUSBLowLatencyIsocCompletion;
-
-
-/*!
-@defined IOUSBFamily error codes
-@discussion  Errors specific to the IOUSBFamily.  Note that the iokit_usb_err(x) translates to 0xe0004xxx, where xxx is the value in parenthesis as a hex number.
-*/
-#define	iokit_usb_err(return)       (sys_iokit|sub_iokit_usb|return)
-#define kIOUSBUnknownPipeErr        iokit_usb_err(0x61)			// 0xe0004061  Pipe ref not recognized
-#define kIOUSBTooManyPipesErr       iokit_usb_err(0x60)			// 0xe0004060  Too many pipes
-#define kIOUSBNoAsyncPortErr        iokit_usb_err(0x5f)			// 0xe000405f  no async port
-#define kIOUSBNotEnoughPipesErr     iokit_usb_err(0x5e)			// 0xe000405e  not enough pipes in interface
-#define kIOUSBNotEnoughPowerErr     iokit_usb_err(0x5d)			// 0xe000405d  not enough power for selected configuration
-#define kIOUSBEndpointNotFound      iokit_usb_err(0x57)			// 0xe0004057  Endpoint Not found
-#define kIOUSBConfigNotFound        iokit_usb_err(0x56)			// 0xe0004056  Configuration Not found
-#define kIOUSBTransactionTimeout    iokit_usb_err(0x51)			// 0xe0004051  Transaction timed out
-#define kIOUSBTransactionReturned   iokit_usb_err(0x50)			// 0xe0004050  The transaction has been returned to the caller
-#define kIOUSBPipeStalled           iokit_usb_err(0x4f)			// 0xe000404f  Pipe has stalled, error needs to be cleared
-#define kIOUSBInterfaceNotFound     iokit_usb_err(0x4e)			// 0xe000404e  Interface ref not recognized
-#define kIOUSBLowLatencyBufferNotPreviouslyAllocated        iokit_usb_err(0x4d)			// 0xe000404d  Attempted to use user land low latency isoc calls w/out calling PrepareBuffer (on the data buffer) first 
-#define kIOUSBLowLatencyFrameListNotPreviouslyAllocated     iokit_usb_err(0x4c)			// 0xe000404c  Attempted to use user land low latency isoc calls w/out calling PrepareBuffer (on the frame list) first
-#define kIOUSBHighSpeedSplitError     iokit_usb_err(0x4b)		// 0xe000404b Error to hub on high speed bus trying to do split transaction
-#define kIOUSBSyncRequestOnWLThread	iokit_usb_err(0x4a)			// 0xe000404a  A synchronous USB request was made on the workloop thread (from a callback?).  Only async requests are permitted in that case
-#define kIOUSBDeviceNotHighSpeed	iokit_usb_err(0x49)			// 0xe0004049  The device is not a high speed device, so the EHCI driver returns an error
-#define kIOUSBDevicePortWasNotSuspended iokit_usb_err(0x50)		// 0xe0004050  Port was not suspended
-	
-/*!
-@defined IOUSBFamily hardware error codes
-@discussion These errors are returned by the OHCI controller.  The # in parenthesis (xx) corresponds to the OHCI Completion Code.
-For the following Completion codes, we return a generic IOKit error instead of a USB specific error.  
-<tt>
-<pre>
-Completion Code         Error Returned              Description
-9                       kIOReturnUnderrun           (Data Underrun) EP returned less data than max packet size
-8                       kIOReturnOverrun            (Data Overrun) Packet too large or more data than buffer
-5                       kIOReturnNotResponding      Device Not responding
-4                       kIOUSBPipeStalled           Endpoint returned a STALL PID
-</pre>
-</tt>
-*/
-#define kIOUSBLinkErr           iokit_usb_err(0x10)		// 0xe0004010
-#define kIOUSBNotSent2Err       iokit_usb_err(0x0f)		// 0xe000400f Transaction not sent
-#define kIOUSBNotSent1Err       iokit_usb_err(0x0e)		// 0xe000400e Transaction not sent
-#define kIOUSBBufferUnderrunErr iokit_usb_err(0x0d)		// 0xe000400d Buffer Underrun (Host hardware failure on data out, PCI busy?)
-#define kIOUSBBufferOverrunErr  iokit_usb_err(0x0c)		// 0xe000400c Buffer Overrun (Host hardware failure on data out, PCI busy?)
-#define kIOUSBReserved2Err      iokit_usb_err(0x0b)		// 0xe000400b Reserved
-#define kIOUSBReserved1Err      iokit_usb_err(0x0a)		// 0xe000400a Reserved
-#define kIOUSBWrongPIDErr       iokit_usb_err(0x07)		// 0xe0004007 Pipe stall, Bad or wrong PID
-#define kIOUSBPIDCheckErr       iokit_usb_err(0x06)		// 0xe0004006 Pipe stall, PID CRC error
-#define kIOUSBDataToggleErr     iokit_usb_err(0x03)		// 0xe0004003 Pipe stall, Bad data toggle
-#define kIOUSBBitstufErr        iokit_usb_err(0x02)		// 0xe0004002 Pipe stall, bitstuffing
-#define kIOUSBCRCErr            iokit_usb_err(0x01)		// 0xe0004001 Pipe stall, bad CRC
-
-/*!
-@defined IOUSBFamily message codes
-@discussion  Messages specific to the IOUSBFamily.  Note that the iokit_usb_msg(x) translates to 0xe0004xxx, where xxx is the value in parenthesis as a hex number.
-*/
-#define iokit_usb_msg(message)						(UInt32)(sys_iokit|sub_iokit_usb|message)
-#define kIOUSBMessageHubResetPort					iokit_usb_msg(0x01)		// 0xe0004001  Message sent to a hub to reset a particular port
-#define kIOUSBMessageHubSuspendPort					iokit_usb_msg(0x02)		// 0xe0004002  Message sent to a hub to suspend a particular port
-#define kIOUSBMessageHubResumePort					iokit_usb_msg(0x03)		// 0xe0004003  Message sent to a hub to resume a particular port
-#define kIOUSBMessageHubIsDeviceConnected			iokit_usb_msg(0x04)		// 0xe0004004  Message sent to a hub to inquire whether a particular port has a device connected or not
-#define kIOUSBMessageHubIsPortEnabled				iokit_usb_msg(0x05)		// 0xe0004005  Message sent to a hub to inquire whether a particular port is enabled or not
-#define kIOUSBMessageHubReEnumeratePort				iokit_usb_msg(0x06)		// 0xe0004006  Message sent to a hub to reenumerate the device attached to a particular port
-#define kIOUSBMessagePortHasBeenReset				iokit_usb_msg(0x0a)		// 0xe000400a  Message sent to a device indicating that the port it is attached to has been reset
-#define kIOUSBMessagePortHasBeenResumed				iokit_usb_msg(0x0b)		// 0xe000400b  Message sent to a device indicating that the port it is attached to has been resumed
-#define kIOUSBMessageHubPortClearTT					iokit_usb_msg(0x0c)		// 0xe000400c  Message sent to a hub to clear the transaction translator
-#define kIOUSBMessagePortHasBeenSuspended			iokit_usb_msg(0x0d)		// 0xe000400d  Message sent to a device indicating that the port it is attached to has been suspended
-#define kIOUSBMessageFromThirdParty					iokit_usb_msg(0x0e)		// 0xe000400e  Message sent from a third party.  Uses IOUSBThirdPartyParam to encode the sender's ID
-#define kIOUSBMessagePortWasNotSuspended			iokit_usb_msg(0x0f)		// 0xe000400f  Message indicating that the hub driver received a resume request for a port that was not suspended
-#define kIOUSBMessageExpressCardCantWake			iokit_usb_msg(0x10)		// 0xe0004010  Message from a driver to a bus that an express card will disconnect on sleep and thus shouldn't wake
-#define kIOUSBMessageCompositeDriverReconfigured    iokit_usb_msg(0x11)		// 0xe0004011  Message from the composite driver indicating that it has finished re-configuring the device after a reset
-#define kIOUSBMessageHubSetPortRecoveryTime			iokit_usb_msg(0x12)		// 0xe0004012  Message sent to a hub to set the # of ms required when resuming a particular port
-#define kIOUSBMessageOvercurrentCondition			iokit_usb_msg(0x13)     // 0xe0004013  Message sent to the clients of the device's hub parent, when a device causes an overcurrent condition.  The message argument contains the locationID of the device
-#define kIOUSBMessageNotEnoughPower					iokit_usb_msg(0x14)     // 0xe0004014  Message sent to the clients of the device's hub parent, when a device causes an low power notice to be displayed.  The message argument contains the locationID of the device
-#define kIOUSBMessageController						iokit_usb_msg(0x15)		// 0xe0004015  Generic message sent from controller user client to controllers 
-#define	kIOUSBMessageRootHubWakeEvent				iokit_usb_msg(0x16)		// 0xe0004016  Message from the HC Wakeup code indicating that a Root Hub port has a wake event
-
-// Obsolete
-//
-struct IOUSBMouseData {
-    UInt16 				buttons;
-    SInt16 				XDelta;
-    SInt16 				YDelta;
-};
-typedef struct IOUSBMouseData		IOUSBMouseData;
-typedef IOUSBMouseData *		IOUSBMouseDataPtr;
-
-// Obsolete
-//
-struct IOUSBKeyboardData {
-    UInt16 				keycount;
-    UInt16 				usbkeycode[32];
-};
-typedef struct IOUSBKeyboardData	IOUSBKeyboardData;
-typedef IOUSBKeyboardData *		IOUSBKeyboardDataPtr;
-
-// Obsolete
-//
-union IOUSBHIDData {
-    IOUSBKeyboardData 			kbd;
-    IOUSBMouseData 			mouse;
-};
-typedef union IOUSBHIDData		IOUSBHIDData;
-typedef IOUSBHIDData *			IOUSBHIDDataPtr;
-
-/*!
-    @typedef IOUSBDeviceDescriptor
-    @discussion Descriptor for a USB Device.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-struct IOUSBDeviceDescriptor {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt16 			bcdUSB;
-	UInt8 			bDeviceClass;
-	UInt8 			bDeviceSubClass;
-	UInt8 			bDeviceProtocol;
-	UInt8 			bMaxPacketSize0;
-	UInt16 			idVendor;
-	UInt16 			idProduct;
-	UInt16 			bcdDevice;
-	UInt8 			iManufacturer;
-	UInt8 			iProduct;
-	UInt8 			iSerialNumber;
-	UInt8 			bNumConfigurations;
-};
-typedef struct IOUSBDeviceDescriptor		IOUSBDeviceDescriptor;
-typedef IOUSBDeviceDescriptor *			IOUSBDeviceDescriptorPtr;
-
-/*!
-    @typedef IOUSBDescriptorHeader
-    @discussion Standard header used for all USB descriptors.  Used to read the length of a descriptor so that we can allocate storage for the whole descriptor later on.
-*/
-struct IOUSBDescriptorHeader {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-};
-typedef struct IOUSBDescriptorHeader		IOUSBDescriptorHeader;
-typedef IOUSBDescriptorHeader *			IOUSBDescriptorHeaderPtr;
-
-/*!
-    @typedef IOUSBConfigurationDescriptor
-    @discussion Standard USB Configuration Descriptor.  It is variable length, so this only specifies the known fields.  We use the wTotalLength field to read the whole descriptor.
-    See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-struct IOUSBConfigurationDescriptor {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt16 			wTotalLength;
-	UInt8 			bNumInterfaces;
-	UInt8 			bConfigurationValue;
-	UInt8 			iConfiguration;
-	UInt8 			bmAttributes;
-	UInt8 			MaxPower;
-};
-typedef struct IOUSBConfigurationDescriptor 	IOUSBConfigurationDescriptor;
-typedef IOUSBConfigurationDescriptor *		IOUSBConfigurationDescriptorPtr;
-
-/*!
-    @typedef IOUSBConfigurationDescHeader
-    @discussion Header of a IOUSBConfigurationDescriptor.  Used to get the total length of the descriptor.
-*/
-struct IOUSBConfigurationDescHeader {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt16 			wTotalLength;
-};
-typedef struct IOUSBConfigurationDescHeader 	IOUSBConfigurationDescHeader;
-typedef IOUSBConfigurationDescHeader *		IOUSBConfigurationDescHeaderPtr;
-
-/*!
-    @typedef IOUSBInterfaceDescriptor
-    @discussion Descriptor for a USB Interface.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-struct IOUSBInterfaceDescriptor {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt8 			bInterfaceNumber;
-	UInt8 			bAlternateSetting;
-	UInt8 			bNumEndpoints;
-	UInt8 			bInterfaceClass;
-	UInt8 			bInterfaceSubClass;
-	UInt8 			bInterfaceProtocol;
-	UInt8 			iInterface;
-};
-typedef struct IOUSBInterfaceDescriptor	IOUSBInterfaceDescriptor;
-typedef IOUSBInterfaceDescriptor *	IOUSBInterfaceDescriptorPtr;
-
-/*!
-    @typedef IOUSBEndpointDescriptor
-    @discussion Descriptor for a USB Endpoint.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-struct IOUSBEndpointDescriptor {
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt8 			bEndpointAddress;
-	UInt8 			bmAttributes;
-	UInt16 			wMaxPacketSize;	
-	UInt8 			bInterval;
-};
-typedef struct IOUSBEndpointDescriptor	IOUSBEndpointDescriptor;
-typedef IOUSBEndpointDescriptor *	IOUSBEndpointDescriptorPtr;
-
-enum{addPacketShift = 11};  // Bits for additional packets in maxPacketField. (Table 9-13)
-#define mungeMaxPacketSize(w) ((w>1024)?(((w>>(addPacketShift))+1)*(w&((1<<addPacketShift)-1))):w)
-
-/*!
-    @typedef IOUSBHIDDescriptor
-    @discussion USB HID Descriptor.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.  (This structure
-    should have used the #pragma pack(1) compiler directive to get byte alignment.
-*/
-struct IOUSBHIDDescriptor {
-	UInt8 			descLen;
-	UInt8 			descType;
-	UInt16 			descVersNum;
-	UInt8 			hidCountryCode;
-	UInt8 			hidNumDescriptors;
-	UInt8 			hidDescriptorType;
-	UInt8 			hidDescriptorLengthLo;
-	UInt8 			hidDescriptorLengthHi;
-};
-typedef struct IOUSBHIDDescriptor	IOUSBHIDDescriptor;
-typedef IOUSBHIDDescriptor *IOUSBHIDDescriptorPtr;
-
-/*!
-    @typedef IOUSBHIDReportDesc
-    @discussion USB HID Report Descriptor header.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.  (This structure
-    should have used the #pragma pack(1) compiler directive to get byte alignment.
-*/
-struct IOUSBHIDReportDesc {
-	UInt8 			hidDescriptorType;
-	UInt8 			hidDescriptorLengthLo;	
-	UInt8 			hidDescriptorLengthHi;
-};
-typedef struct IOUSBHIDReportDesc	IOUSBHIDReportDesc;
-typedef IOUSBHIDReportDesc *		IOUSBHIDReportDescPtr;
-
-/*!
-    @typedef IOUSBDeviceQualifierDescriptor
-    @discussion USB Device Qualifier Descriptor.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-#pragma pack(1)
-struct IOUSBDeviceQualifierDescriptor
-{
-	UInt8 			bLength;
-	UInt8 			bDescriptorType;
-	UInt16 			bcdUSB;
-	UInt8 			bDeviceClass;
-	UInt8 			bDeviceSubClass;
-	UInt8 			bDeviceProtocol;
-	UInt8 			bMaxPacketSize0;
-	UInt8 			bNumConfigurations;
-	UInt8 			bReserved;
-};
-typedef struct IOUSBDeviceQualifierDescriptor	IOUSBDeviceQualifierDescriptor;
-typedef IOUSBDeviceQualifierDescriptor *	IOUSBDeviceQualifierDescriptorPtr;
-#pragma options align=reset
-
-/*!
-    @typedef IOUSBDFUDescriptor
-    @discussion USB Device Firmware Update Descriptor.  See the USB Device Firmware Update Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-#pragma pack(1)
-struct IOUSBDFUDescriptor 
-{
-        UInt8 			bLength;
-        UInt8 			bDescriptorType;
-        UInt8 			bmAttributes;
-        UInt16 			wDetachTimeout;
-        UInt16 			wTransferSize;
-};
-typedef struct 	IOUSBDFUDescriptor 		IOUSBDFUDescriptor;
-typedef 		IOUSBDFUDescriptor *	IOUSBDFUDescriptorPtr;
-
-#pragma options align=reset
-
-/*!
-@typedef IOUSBInterfaceAssociationDescriptor
- @discussion USB Inerface Association Descriptor.  ECN to the USB 2.0 Spec.  See the USB Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
- */
-#pragma pack(1)
-struct IOUSBInterfaceAssociationDescriptor
-{
-    UInt8 			bLength;
-    UInt8 			bDescriptorType;
-    UInt8 			bFirstInterface;
-    UInt8 			bInterfaceCount;
-    UInt8 			bFunctionClass;
-    UInt8 			bFunctionSubClass;
-    UInt8 			bFunctionProtocol;
-    UInt8			iFunction;
-};
-typedef struct IOUSBInterfaceAssociationDescriptor	IOUSBInterfaceAssociationDescriptor;
-typedef IOUSBInterfaceAssociationDescriptor *	IOUSBInterfaceAssociationDescriptorPtr;
-#pragma options align=reset
-
-/*!
-    @typedef USBStatus
-    @discussion Type used to get a DeviceStatus as a single quantity.
-*/
-typedef UInt16				USBStatus;
-typedef USBStatus *			USBStatusPtr;
-
-// These constants are obsolete
-//
-enum {
-    kIOUSBAnyClass	= 0xFFFF,
-    kIOUSBAnySubClass	= 0xFFFF,
-    kIOUSBAnyProtocol	= 0xFFFF,
-    kIOUSBAnyVendor	= 0xFFFF,
-    kIOUSBAnyProduct	= 0xFFFF
-};
-
-// This structure are obsolete
-//
-typedef struct IOUSBMatch {
-    UInt16	usbClass;
-    UInt16	usbSubClass;
-    UInt16	usbProtocol;
-    UInt16	usbVendor;
-    UInt16	usbProduct;
-} IOUSBMatch;
-
-/*!
-    @typedef IOUSBFindEndpointRequest
-    @discussion Struct used to find endpoints of an interface
-    type and direction are used to match endpoints,
-    type, direction, maxPacketSize and interval are updated
-    with the properties of the found endpoint.
-    @field type Type of endpoint: kUSBControl, kUSBIsoc, kUSBBulk, kUSBInterrupt, kUSBAnyType.  If kUSBAnyType is specified, this field is treated as a don't care.
-    @field direction Direction of endpoint: kUSBOut, kUSBIn, kUSBAnyDirn.   If kUSBAnyDirn is specified, this field is treated as a don't care.
-    @field maxPacketSize maximum packet size of endpoint.
-    @field interval Polling interval in mSec for endpoint.
-*/
-typedef struct {
-	UInt8 type;	
-	UInt8 direction;
-    UInt16 maxPacketSize;
-    UInt8 interval;
-} IOUSBFindEndpointRequest;
-
-/*!
-    @struct IOUSBDevRequest
-    @discussion Parameter block for control requests, using a simple pointer
-    for the data to be transferred.
-    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
-    @field bRequest Request code
-    @field wValue 16 bit parameter for request, host endianess
-    @field wIndex 16 bit parameter for request, host endianess
-    @field wLength Length of data part of request, 16 bits, host endianess
-    @field pData Pointer to data for request - data returned in bus endianess
-    @field wLenDone Set by standard completion routine to number of data bytes
-	actually transferred
-*/
-typedef struct {
-    UInt8       bmRequestType;
-    UInt8       bRequest;
-    UInt16      wValue;
-    UInt16      wIndex;
-    UInt16      wLength;
-    void *      pData;
-    UInt32      wLenDone;
-} IOUSBDevRequest;
-typedef IOUSBDevRequest * IOUSBDeviceRequestPtr;
-
-/*!
-    @struct IOUSBDevRequestTO
-    @discussion Parameter block for control requests with timeouts, using a simple pointer
-    for the data to be transferred.  Same as a IOUSBDevRequest except for the two extra timeout fields.
-    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
-    @field bRequest Request code
-    @field wValue 16 bit parameter for request, host endianess
-    @field wIndex 16 bit parameter for request, host endianess
-    @field wLength Length of data part of request, 16 bits, host endianess
-    @field pData Pointer to data for request - data returned in bus endianess
-    @field wLenDone Set by standard completion routine to number of data bytes
-	actually transferred
-    @field noDataTimeout Specifies a time value in milliseconds. Once the request is queued on the bus, if no data is transferred in this amount of time, the request will be aborted and returned.
-    @field completionTimeout Specifies a time value in milliseconds. Once the request is queued on the bus, if the entire request is not completed in this amount of time, the request will be aborted and returned 
-*/
-typedef struct {
-    UInt8       bmRequestType;
-    UInt8       bRequest;
-    UInt16      wValue;
-    UInt16      wIndex;
-    UInt16      wLength;
-    void *      pData;
-    UInt32      wLenDone;
-    UInt32      noDataTimeout;
-    UInt32      completionTimeout;
-} IOUSBDevRequestTO;
-
-/*!
-    @enum Default timeout values
-    @discussion default values used for data and completion timeouts.
-*/
-enum
-{
-    kUSBDefaultControlNoDataTimeoutMS = 5000,
-    kUSBDefaultControlCompletionTimeoutMS = 0
-};
-
-// Internal structure to pass parameters between IOUSBLib and UserClient
-//
-typedef struct
-{
-    UInt32      pipeRef;
-    void *      buf;
-    UInt32      size;
-    UInt32      noDataTimeout;
-    UInt32      completionTimeout;
-} IOUSBBulkPipeReq;
-
-
-#if KERNEL
-/*!
-    @struct IOUSBDevRequestDesc
-    @discussion Parameter block for control requests, using a memory descriptor
-    for the data to be transferred.  Only available in the kernel.
-    @field bmRequestType Request type: kUSBStandard, kUSBClass or kUSBVendor
-    @field bRequest Request code
-    @field wValue 16 bit parameter for request, host endianess
-    @field wIndex 16 bit parameter for request, host endianess
-    @field wLength Length of data part of request, 16 bits, host endianess
-    @field pData Pointer to memory descriptor for data for request - data returned in bus endianess
-    @field wLenDone Set by standard completion routine to number of data bytes
-     actually transferred
-*/
-typedef struct {
-    UInt8                   bmRequestType;
-    UInt8                   bRequest;
-    UInt16                  wValue;
-    UInt16                  wIndex;
-    UInt16                  wLength;
-    IOMemoryDescriptor *    pData;
-    UInt32                  wLenDone;
-} IOUSBDevRequestDesc;
-
-
-/*!
-    @enum IOOptionBits
-    @discussion Parameter passed to an IOService::open() call.
-    @constant kIOUSBInterfaceOpenAlt Open the alternate interface specified when creating the interface.
-*/
-enum {
-    kIOUSBInterfaceOpenAlt	= 0x00010000
-};
-
-#endif
-
-// Internal structure to pass parameters between IOUSBLib and UserClient
-//
-// use a structure because there's a limit of 6 total arguments
-// to a user client method.
-typedef struct {
-    UInt8   	bmRequestType;
-    UInt8 	bRequest;
-    UInt16 	wValue;
-    UInt16 	wIndex;
-    UInt16	wLength;
-    void * 	pData;		// data pointer
-    UInt32	wLenDone;	// # bytes transferred
-    UInt8	pipeRef;
-} IOUSBDevReqOOL;
-
-// Internal structure to pass parameters between IOUSBLib and UserClient
-//
-typedef struct {
-    UInt8   	bmRequestType;
-    UInt8 	bRequest;
-    UInt16 	wValue;
-    UInt16 	wIndex;
-    UInt16	wLength;
-    void * 	pData;		// data pointer
-    UInt32	wLenDone;	// # bytes transferred
-    UInt8	pipeRef;
-    UInt32	noDataTimeout;
-    UInt32	completionTimeout;
-} IOUSBDevReqOOLTO;
-
-// Internal structure to pass parameters between IOUSBLib and UserClient
-//
-// Structure to request isochronous transfer
-//
-typedef struct {
-    UInt32 		fPipe;
-    void 		*fBuffer;
-    UInt32 		fBufSize;
-    UInt64 		fStartFrame;
-    UInt32 		fNumFrames;
-    IOUSBIsocFrame 	*fFrameCounts;
-} IOUSBIsocStruct;
-
-// Internal structure to pass parameters between IOUSBLib and UserClient
-//
-// Structure to request low latency isochronous transfer
-//
-struct IOUSBLowLatencyIsocStruct {
-    UInt32 			fPipe;
-    UInt32 			fBufSize;
-    UInt64 			fStartFrame;
-    UInt32 			fNumFrames;
-    UInt32			fUpdateFrequency;
-    UInt32			fDataBufferCookie;
-    UInt32			fDataBufferOffset;
-    UInt32			fFrameListBufferCookie;
-    UInt32			fFrameListBufferOffset;
-};
-
-typedef struct IOUSBLowLatencyIsocStruct IOUSBLowLatencyIsocStruct;
-
-
-/*!
-    @struct IOUSBGetFrameStruct
-    @discussion Structure used from user space to return the frame number and a timestamp on when the frame register was read.
-    @field frame frame number
-    @field timeStamp  AbsoluteTime when the frame was updated
-*/
-typedef struct {
-    UInt64			frame;
-    AbsoluteTime	timeStamp;
-} IOUSBGetFrameStruct;
-
-
-/*!
-    @struct IOUSBFindInterfaceRequest
-    @discussion Structure used with FindNextInterface.
-*/
-typedef struct {
-    UInt16	bInterfaceClass;		// requested class
-    UInt16 	bInterfaceSubClass;		// requested subclass
-    UInt16 	bInterfaceProtocol;		// requested protocol
-    UInt16	bAlternateSetting;		// requested alt setting
-} IOUSBFindInterfaceRequest;
-
-/*!
-    @enum kIOUSBFindInterfaceDontCare
-    @discussion Constant that can be used for the fields of IOUSBFindInterfaceRequest to specify that they should not be matched. 
-*/
-enum {
-        kIOUSBFindInterfaceDontCare		= 0xFFFF
-        };
-
-/*!
-    @enum kIOUSBVendorIDAppleComputer
-    @discussion USB Vendor ID for Apple Computer, Inc. 
-*/
-enum {
-	kIOUSBVendorIDAppleComputer		= 0x05AC
-        };
-
-/*!
-    @enum USBDeviceSpeed
-    @discussion Returns the speed of a particular USB device. 
-    @constant	kUSBDeviceSpeedLow	The device a low speed device.
-    @constant	kUSBDeviceSpeedFull	The device a full speed device.
-    @constant	kUSBDeviceSpeedHigh	The device a high speed device.
-*/
-enum {
-        kUSBDeviceSpeedLow		= 0,
-        kUSBDeviceSpeedFull		= 1,
-        kUSBDeviceSpeedHigh		= 2
-        };
-
-/*!
-    @enum MicrosecondsInFrame
-    @discussion Returns the number of microseconds in a USB frame. 
-    @constant	kUSBFullSpeedMicrosecondsInFrame	The device is attached to a bus running at full speed (1 ms / frame).
-    @constant	kUSBHighSpeedMicrosecondsInFrame	The device is attached to a bus running at high speed (125 microseconds / frame).
-*/
-enum {
-    kUSBFullSpeedMicrosecondsInFrame		= 1000,	
-    kUSBHighSpeedMicrosecondsInFrame		= 125
-};
-
-//  During low latency transfers, the stack will set the frStatus for each frame to this value.  A client can check that to see if the transfer has completed.  We set the frStatus to a 
-//  valid return code when the transfer completes.
-//
-enum {
-        kUSBLowLatencyIsochTransferKey	= 'llit'	// Set frStatus field of first frame in isoch transfer to designate as low latency
-    };
-    
-// This structure is DEPRECATED.  See the LowLatencyUserBufferInfoV2  
-//
-typedef struct LowLatencyUserBufferInfo LowLatencyUserBufferInfo;
-
-struct LowLatencyUserBufferInfo {
-    UInt32				cookie;
-    void *				bufferAddress;
-    IOByteCount			bufferSize;
-    UInt32				bufferType;
-    Boolean				isPrepared;
-    LowLatencyUserBufferInfo *	nextBuffer;
-};
-
-// This structure is DEPRECATED.  See the LowLatencyUserBufferInfoV3  
-
-typedef struct LowLatencyUserBufferInfoV2 LowLatencyUserBufferInfoV2;
-
-struct LowLatencyUserBufferInfoV2 
-{
-	UInt32							cookie;
-	void *							bufferAddress;
-	IOByteCount						bufferSize;
-	UInt32							bufferType;
-	Boolean							isPrepared;
-	void *							mappedUHCIAddress;
-	LowLatencyUserBufferInfoV2 *	nextBuffer;
-};
-
-	
-// This structure is used to pass information for the low latency calls between user space and the kernel.  
-//
-typedef struct LowLatencyUserBufferInfoV3 LowLatencyUserBufferInfoV3;
-
-struct LowLatencyUserBufferInfoV3 
-{
-	uint64_t						cookie;
-	mach_vm_address_t				bufferAddress;
-	mach_vm_size_t					bufferSize;
-	uint64_t						bufferType;
-	uint64_t						isPrepared;
-	mach_vm_address_t				mappedUHCIAddress;
-	LowLatencyUserBufferInfoV3 *	nextBuffer;
-};
-	
-	
-	/*!
-    @enum USBLowLatencyBufferType
-    @discussion Used to specify what kind of buffer to create when calling LowLatencyCreateBuffer(). 
-    @constant	kUSBLowLatencyWriteBuffer	The buffer will be used to write data out to a device.
-    @constant	kUSBLowLatencyReadBuffer	The buffer will be used to read data from a device.
-    @constant	kUSBLowLatencyFrameListBuffer	The buffer will be used for a low latency isoch frame list.
-*/
-typedef enum {
-    kUSBLowLatencyWriteBuffer 		= 0,
-    kUSBLowLatencyReadBuffer		= 1,
-    kUSBLowLatencyFrameListBuffer	= 2
-} USBLowLatencyBufferType;
-
-// USB User Notification Types
-//
-enum {
-    kUSBNoUserNotificationType			= 0,
-    kUSBNotEnoughPowerNotificationType		= 1,
-    kUSBIndividualOverCurrentNotificationType	= 2,
-    kUSBGangOverCurrentNotificationType		= 3
-};
-
-/*!
-    @defined Property Definitions
-    @discussion Useful property names in USB land. 
-*/
-#define kUSBDevicePropertySpeed                 "Device Speed"
-#define kUSBDevicePropertyBusPowerAvailable     "Bus Power Available"
-#define kUSBDevicePropertyAddress               "USB Address"
-#define kUSBDevicePropertyLocationID            "locationID"
-#define kUSBProductIDMask						"idProductMask"
-#define kUSBPreferredConfiguration				"Preferred Configuration"
-#define kUSBSuspendPort							"kSuspendPort"
-#define kUSBExpressCardCantWake					"ExpressCardCantWake"
-#define kUSBControllerNeedsContiguousMemoryForIsoch	"Need contiguous memory for isoch"
-#define kUSBHubDontAllowLowPower				"kUSBHubDontAllowLowPower"
-#define kUSBDeviceResumeRecoveryTime			"kUSBDeviceResumeRecoveryTime"
-#define kUSBOutOfSpecMPSOK						"Out of spec MPS OK"
-#define kConfigurationDescriptorOverride		"ConfigurationDescriptorOverride"
-#define kOverrideIfAtLocationID					"OverrideIfAtLocationID"
-
-/*!
-@enum USBReEnumerateOptions
- @discussion Options used when calling ReEnumerateDevice. 
- @constant	kUSBAddExtraResetTimeBit	Setting this bit will cause the Hub driver to wait 100ms before addressing the device after the reset following the re-enumeration.
- */
-typedef enum {
-    kUSBAddExtraResetTimeBit 		= 31,
-    kUSBAddExtraResetTimeMask		= ( 1 << kUSBAddExtraResetTimeBit)
-} USBReEnumerateOptions;
-
-/*!
- @enum USBDeviceInformationBits
- @discussion 	GetUSBDeviceInformation will return a unit32_t value with bits set indicating that a particular state is present in the USB device.  These bits are described here 
- 
- @constant	kUSBInformationDeviceIsCaptiveBit			The USB device is directly attached to its hub and cannot be removed.
- @constant	kUSBInformationDeviceIsAttachedToRootHubBit	The USB device is directly attached to the root hub
- @constant	kUSBInformationDeviceIsInternalBit			The USB device is internal to the computer (all the hubs it attaches to are captive)
- @constant	kUSBInformationDeviceIsConnectedBit			The USB device is connected to its hub
- @constant	kUSBInformationDeviceIsEnabledBit			The hub port to which the USB device is attached is enabled
- @constant	kUSBInformationDeviceIsSuspendedBit			The hub port to which the USB device is attached is suspended
- @constant	kUSBInformationDeviceIsInResetBit			The hub port to which the USB device is attached is being reset
- @constant	kUSBInformationDeviceOvercurrentBit			The USB device generated an overcurrent
- @constant	kUSBInformationDevicePortIsInTestModeBit	The hub port to which the USB device is attached is in test mode
- @constant  kUSBInformationDeviceIsRootHub				The device is actually the root hub simulation
- @constant  kUSBInformationRootHubisBuiltIn				If this is a root hub simulation and it's built into the machine, this bit is set.  If it's on an expansion card, it will be cleared
- 
- */
-	typedef enum {
-		kUSBInformationDeviceIsCaptiveBit				= 0,
-		kUSBInformationDeviceIsAttachedToRootHubBit		= 1,
-		kUSBInformationDeviceIsInternalBit				= 2,
-		kUSBInformationDeviceIsConnectedBit				= 3,
-		kUSBInformationDeviceIsEnabledBit				= 4,
-		kUSBInformationDeviceIsSuspendedBit				= 5,
-		kUSBInformationDeviceIsInResetBit				= 6,
-		kUSBInformationDeviceOvercurrentBit				= 7,
-		kUSBInformationDevicePortIsInTestModeBit		= 8,
-		kUSBInformationDeviceIsRootHub					= 9,
-		kUSBInformationRootHubisBuiltIn					= 10,
-		kUSBInformationDeviceIsRemote					= 11,
-		kUSBInformationDeviceIsCaptiveMask				= (1 << kUSBInformationDeviceIsCaptiveBit),
-		kUSBInformationDeviceIsAttachedToRootHubMask	= (1 << kUSBInformationDeviceIsAttachedToRootHubBit),
-		kUSBInformationDeviceIsInternalMask				= (1 << kUSBInformationDeviceIsInternalBit),
-		kUSBInformationDeviceIsConnectedMask			= (1 << kUSBInformationDeviceIsConnectedBit),
-		kUSBInformationDeviceIsEnabledMask				= (1 << kUSBInformationDeviceIsEnabledBit),
-		kUSBInformationDeviceIsSuspendedMask			= (1 << kUSBInformationDeviceIsSuspendedBit),
-		kUSBInformationDeviceIsInResetMask				= (1 << kUSBInformationDeviceIsInResetBit),
-		kUSBInformationDeviceOvercurrentMask			= (1 << kUSBInformationDeviceOvercurrentBit),
-		kUSBInformationDevicePortIsInTestModeMask		= (1 << kUSBInformationDevicePortIsInTestModeBit),
-		kUSBInformationDeviceIsRootHubMask				= (1 << kUSBInformationDeviceIsRootHub),
-		kUSBInformationRootHubisBuiltInMask				= (1 << kUSBInformationRootHubisBuiltIn),
-		kUSBInformationDeviceIsRemoteMask				= (1 << kUSBInformationDeviceIsRemote)
-	} USBDeviceInformationBits;
-	
-	/*!
-	 @enum USBPowerRequestTypes
-	 @discussion Used to specify what kind of power will be reserved using the IOUSBDevice RequestExtraPower and ReturnExtraPower APIs. 
-	 @constant	kUSBPowerDuringSleep	The power is to be used during sleep.
-	 @constant	kUSBPowerDuringWake		The power is to be used while the system is awake (i.e not sleeping)
-	 */
-	typedef enum {
-		kUSBPowerDuringSleep 		= 0,
-		kUSBPowerDuringWake			= 1
-	} USBPowerRequestTypes;
-	
-	// Apple specific properties
-#define kAppleCurrentAvailable		"AAPL,current-available"
-#define kAppleCurrentInSleep		"AAPL,current-in-sleep"
-#define kAppleCurrentExtra			"AAPL,current-extra"
-#define kAppleInternalUSBDevice		"AAPL,device-internal"
-#define kUSBBusID					"AAPL,bus-id"
-	
-
-#ifdef __cplusplus
-}       
-#endif
-
-#endif /* _USB_H */
diff --git a/i386/include/IOKit/usb/USBHub.h b/i386/include/IOKit/usb/USBHub.h
deleted file mode 100644
index 4bbda15..0000000
--- a/i386/include/IOKit/usb/USBHub.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _USBHUB_H
-#define _USBHUB_H
-
-#include <IOKit/usb/USB.h>
-#include <IOKit/usb/USBSpec.h>
-
-    /*!
-    @header     USBHub.h
-     @abstract  Constants and definitions used with Hub devices.
-     @discussion    
-     */
-
-    /*!
-    @enum Hub Descriptor Type
-    @discussion
-    */
-enum {
-    kUSBHubDescriptorType       = 0x29
-};
-
-    /*!
-    @enum HubFeatures
-    @discussion Used with SET_FEATURE to set hub and port features
-    */
-enum {
-                            
-    kUSBHubLocalPowerChangeFeature      = 0,    /* Hub features */
-    kUSBHubOverCurrentChangeFeature     = 1,
-
-    kUSBHubPortConnectionFeature        = 0,    /* port features */
-    kUSBHubPortEnableFeature            = 1,
-    kUSBHubPortSuspendFeature           = 2,
-    kUSBHubPortOverCurrentFeature       = 3,
-    kUSBHubPortResetFeature             = 4,
-    kUSBHubPortPowerFeature             = 8,
-    kUSBHubPortLowSpeedFeature          = 9,
-    kUSBHubPortConnectionChangeFeature  = 16,
-    kUSBHubPortEnableChangeFeature      = 17,
-    kUSBHubPortSuspendChangeFeature     = 18,
-    kUSBHubPortOverCurrentChangeFeature = 19,
-    kUSBHubPortResetChangeFeature       = 20,
-    kUSBHubPortTestFeature				= 21,
-	kUSBHubPortIndicatorFeature			= 22
-};
-
-    /*!
-    @enum HubPortStatus
-    @discussion Used to decode the Port Status and Change 
-    */
-enum {
-    kHubPortConnection		= 0x0001,
-    kHubPortEnabled			= 0x0002,
-    kHubPortSuspend			= 0x0004,
-    kHubPortOverCurrent		= 0x0008,
-    kHubPortBeingReset		= 0x0010,
-    kHubPortPower			= 0x0100,
-    kHubPortLowSpeed		= 0x0200,
-    kHubPortHighSpeed		= 0x0400,
-    kHubPortTestMode		= 0x0800,
-    kHubPortIndicator		= 0x1000,
-
-    // these are the bits which cause the hub port state machine to keep moving
-    kHubPortStateChangeMask		= kHubPortConnection | kHubPortEnabled | kHubPortSuspend | kHubPortOverCurrent | kHubPortBeingReset
-};
-
-
-    /*!
-    @enum HubStatus
-    @discussion Used to decode the Hub Status and Change 
-    */
-enum {
-    kHubLocalPowerStatus        = 1,
-    kHubOverCurrentIndicator    = 2,
-    kHubLocalPowerStatusChange  = 1,
-    kHubOverCurrentIndicatorChange  = 2
-};
-
-    /*!
-    @enum HubCharacteristics
-    @discussion 
-    */
-enum {
-    kPerPortSwitchingBit    = (1 << 0),
-    kNoPowerSwitchingBit    = (1 << 1),
-    kCompoundDeviceBit      = (1 << 2),
-    kPerPortOverCurrentBit  = (1 << 3),
-    kNoOverCurrentBit       = (1 << 4),
-	
-	kHubPortIndicatorBit	= 7,
-	kHubPortIndicatorMask	= 0x0080
-};
-
-/*!
-@enum PowerSwitching
- @discussion 
- */
-enum {
-	kHubSupportsGangPower	= 0,
-	kHubSupportsIndividualPortPower = 1,
-	kHubPortSetPowerOff		= 0,
-	kHubPortSetPowerOn		= 1
-};
-
-/*!
-@enum PortIndicatorSelectors
- @discussion 
- */
-enum {
-	kHubPortIndicatorAutomatic	= 0,
-	kHubPortIndicatorAmber,
-	kHubPortIndicatorGreen,
-	kHubPortIndicatorOff
-};
-
-/*!
- @enum Root Hub specific 
- @discussion 
- */
-enum {
-	kPrdRootHubApple			= 0x8005,	// ProductID for classic speed root hubs
-	kPrdRootHubAppleE			= 0x8006,	// ProductID for high speed root hubs
-	kUSBRootHubPollingRate		= 32		// Enpoint polling rate interval for root hubs
-};
-
-/*!
-@enum Hub Device Requests
-@discussion  Encoding of the hub specific standard requests
-<tt>
-<pre><b>
-Request          bmRequestType bRequest       wValue  wIndex wLength Data</b>
-ClearHubFeature  0010 0000B    CLEAR_FEATURE  Feature Zero    Zero   None
-ClearPortFeature 0010 0011B                   Feature Port    Zero   None
-
-GetBusState      1010 0011B    GET_STATE      Zero    Port    One    Port Bus State
-
-GetHubDescriptor 1010 0000B    GET_DESCRIPTOR Type    Zero    Length Descriptor
-
-GetHubStatus     1010 0000B    GET_STATUS     Zero    Zero    Four   Hub Status
-GetPortStatus    1010 0011B                   Zero    Port    Four   Port Status
-
-SetHubDescriptor 0010 0000B    SET_DESCRIPTOR Type    Zero    Length Descriptor
-
-SetHubFeature    0010 0000B    SET_FEATURE    Feature Zero    Zero   None
-SetPortFeature   0010 0011B                   Feature Port    Zero   None
-</pre>
-</tt>
-    */
-enum {
-    kClearHubFeature  = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBClass, kUSBDevice),
-    kClearPortFeature = EncodeRequest(kUSBRqClearFeature,  kUSBOut, kUSBClass, kUSBOther),
-    kGetPortState     = EncodeRequest(kUSBRqGetState,      kUSBIn,  kUSBClass, kUSBOther),
-    kGetHubDescriptor = EncodeRequest(kUSBRqGetDescriptor, kUSBIn,  kUSBClass, kUSBDevice),
-    kGetHubStatus     = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBClass, kUSBDevice),
-    kGetPortStatus    = EncodeRequest(kUSBRqGetStatus,     kUSBIn,  kUSBClass, kUSBOther),
-    kSetHubDescriptor = EncodeRequest(kUSBRqGetDescriptor, kUSBOut, kUSBClass, kUSBDevice),
-    kSetHubFeature    = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBClass, kUSBDevice),
-    kSetPortFeature   = EncodeRequest(kUSBRqSetFeature,    kUSBOut, kUSBClass, kUSBOther)
-};
-
-
-/*!
-    @typedef IOUSBHubDescriptor
-    @discussion USB Hub Descriptor.  See the USB HID Specification at <a href="http://www.usb.org"TARGET="_blank">http://www.usb.org</a>.
-*/
-struct IOUSBHubDescriptor {
-    UInt8   length;
-    UInt8   hubType;
-    UInt8   numPorts;
-    UInt16  characteristics __attribute__((packed));
-    UInt8   powerOnToGood;  /* Port settling time, in 2ms */
-    UInt8   hubCurrent;
-    /* These are received packed, will have to be unpacked */
-    UInt8   removablePortFlags[8];
-    UInt8   pwrCtlPortFlags[8];
-};
-
-typedef struct IOUSBHubDescriptor IOUSBHubDescriptor;
-
-/*!
-    @typedef IOUSBHubStatus
-    @discussion Used to get the port status and change flags using GetPortStatus()
-*/
-struct IOUSBHubStatus {
-    UInt16          statusFlags;
-    UInt16          changeFlags;
-};
-typedef struct IOUSBHubStatus   IOUSBHubStatus;
-typedef IOUSBHubStatus *    IOUSBHubStatusPtr;
-
-typedef struct IOUSBHubStatus   IOUSBHubPortStatus;
-
-
-/*!
-    @typedef IOUSBHubPortReEnumerateParam
-    @discussion Used to specify the port that needs to be reenumerated
-*/
-typedef struct IOUSBHubPortReEnumerateParam IOUSBHubPortReEnumerateParam;
-
-struct IOUSBHubPortReEnumerateParam {
-    UInt32   portNumber;
-    UInt32   options;
-};
-
-typedef struct IOUSBHubPortClearTTParam IOUSBHubPortClearTTParam;
-
-struct IOUSBHubPortClearTTParam {
-    UInt32	 portNumber;
-    UInt32	 options;
-#if 0
-    UInt8 	 deviceAddress;  <<0
-	UInt8	 endpointNum;    <<8
-	UInt8 	 endpointType;	 <<16 // As split transaction. 00 Control, 10 Bulk
-	UInt8 	 IN;		 <<24 // Direction, 1 = IN, 0 = OUT
-#endif
-};
-
-#endif /* _USBHUB_H */
diff --git a/i386/include/IOKit/usb/USBSpec.h b/i386/include/IOKit/usb/USBSpec.h
deleted file mode 100644
index 0665819..0000000
--- a/i386/include/IOKit/usb/USBSpec.h
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-
-/*
- * Constants that both OS9 and OSX want to define, and whose values are
- * specified by the USB Standard.
- * Put in a seperate file so they can be included if the OS9 include file isn't already
- * included.
- */
-#ifndef _USBSPEC_H
-#define _USBSPEC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-    /*!
-    @header     USBSpec.h
-     @abstract  Constants and definitions of parameters that are used in communcating with USB devices and interfaces.
-     @discussion    
-     */
-
-    /*!
-    @enum Endpoint type
-    @discussion Used in IOUSBFindEndpointRequest's type field
-    */
-enum {
-    kUSBControl     = 0,
-    kUSBIsoc        = 1,
-    kUSBBulk        = 2,
-    kUSBInterrupt   = 3,
-    kUSBAnyType     = 0xFF
-};
-
-    /*!
-    @enum Endpoint direction
-    @discussion Used in IOUSBFindEndpointRequest's direction field
-    */
-enum {
-    kUSBOut         = 0,
-    kUSBIn          = 1,
-    kUSBNone        = 2,
-    kUSBAnyDirn     = 3
-};
-
-    /*!
-    @enum Device Request Type
-    @discussion This type is encoded in the bmRequestType field of a Device Request.  It specifies the type of request: standard, class or vendor specific.
-    */
-enum {
-    kUSBStandard    = 0,
-    kUSBClass       = 1,
-    kUSBVendor      = 2
-};
-
-    /*!
-    @enum Device Request Recipient
-    @discussion This recipient is encoded in the bmRequestType field of a Device Request.  It specifies the type of recipient for a request:  the device, the interface, or an endpoint.
-    */
-enum {
-    kUSBDevice      = 0,
-    kUSBInterface   = 1,
-    kUSBEndpoint    = 2,
-    kUSBOther       = 3
-};
-
-    /*!
-    @enum Device Request
-    @discussion Specifies values for the bRequest field of a Device Request.
-    */
-enum {
-    kUSBRqGetStatus     = 0,
-    kUSBRqClearFeature  = 1,
-    kUSBRqGetState      = 2,
-    kUSBRqSetFeature    = 3,
-    kUSBRqReserved2     = 4,
-    kUSBRqSetAddress    = 5,
-    kUSBRqGetDescriptor = 6,
-    kUSBRqSetDescriptor = 7,
-    kUSBRqGetConfig     = 8,
-    kUSBRqSetConfig     = 9,
-    kUSBRqGetInterface  = 10,
-    kUSBRqSetInterface  = 11,
-    kUSBRqSyncFrame     = 12
-};
-
-    /*!
-    @enum USB Descriptors
-    @discussion Specifies values for diffent descriptor types.
-    */
-enum {
-    kUSBAnyDesc             = 0,    // Wildcard for searches
-    kUSBDeviceDesc          = 1,
-    kUSBConfDesc            = 2,
-    kUSBStringDesc          = 3,
-    kUSBInterfaceDesc       = 4,
-    kUSBEndpointDesc        = 5,
-    kUSBDeviceQualifierDesc = 6,
-    kUSBOtherSpeedConfDesc  = 7,
-    kUSBInterfacePowerDesc  = 8,
-    kUSBOnTheGoDesc	    = 9,
-    kUSDebugDesc	    = 10,
-    kUSBInterfaceAssociationDesc 	= 11,
-    kUSBHIDDesc             		= 0x21,
-    kUSBReportDesc          		= 0x22,
-    kUSBPhysicalDesc        		= 0x23,
-    kUSBHUBDesc             		= 0x29
-};
-
-    /*!
-    @enum Feature Selectors
-    @discussion Used with SET/CLEAR_FEATURE requests.
-    */
-enum {
-        kUSBFeatureEndpointStall = 0,
-        kUSBFeatureDeviceRemoteWakeup = 1
-}; 
-
-    /*!
-    @enum USB Power constants
-    @discussion Constants relating to USB Power.
-    */
-enum {
-    kUSB100mAAvailable  = 50,
-    kUSB500mAAvailable  = 250,
-    kUSB100mA           = 50,
-    kUSBAtrBusPowered   = 0x80,
-    kUSBAtrSelfPowered  = 0x40,
-    kUSBAtrRemoteWakeup = 0x20
-};
-
-    /*!
-    @enum USB Release constants
-    @discussion Constants relating to USB releases as found in the bcdUSB field of the Device Descriptor.
-    */
-enum {
-    kUSBRel10       = 0x0100,
-    kUSBRel11       = 0x0110,
-    kUSBRel20       = 0x0200
-};
-
-
-    /*!
-    @enum HID requests
-    @discussion Constants for HID requests.
-    */
-enum {
-    kHIDRqGetReport     = 1,
-    kHIDRqGetIdle       = 2,
-    kHIDRqGetProtocol   = 3,
-    kHIDRqSetReport     = 9,
-    kHIDRqSetIdle       = 10,
-    kHIDRqSetProtocol   = 11
-};
-
-    /*!
-    @enum HID report types
-    @discussion Constants for the three kinds of HID reports.
-    */
-enum {
-    kHIDRtInputReport       = 1,
-    kHIDRtOutputReport      = 2,
-    kHIDRtFeatureReport     = 3
-};
-
-
-    /*!
-    @enum HID Protocol
-    @discussion  Used in the SET_PROTOCOL device request
-    */
-enum {
-    kHIDBootProtocolValue   = 0,
-    kHIDReportProtocolValue = 1
-};
-
-
-
-enum {
-    kUSBCapsLockKey         = 0x39,
-    kUSBNumLockKey          = 0x53,
-    kUSBScrollLockKey       = 0x47
-};
-
-/*!
-@enum Device Class Codes
- @discussion Constants for USB Device classes (bDeviceClass).
- */
-enum {
-    kUSBCompositeClass          	= 0,
-    kUSBCommClass               	= 2,		// Deprecated
-    kUSBCommunicationClass			= 2,	
-    kUSBHubClass                	= 9,
-    kUSBDataClass               	= 10,
-	kUSBPersonalHealthcareClass		= 15,
-    kUSBDiagnosticClass				= 220,
-    kUSBWirelessControllerClass 	= 224,
-    kUSBMiscellaneousClass			= 239,
-    kUSBApplicationSpecificClass 	= 254,
-    kUSBVendorSpecificClass     	= 255
-};
-
-/*!
-@enum Interface Class
- @discussion Constants for Interface classes (bInterfaceClass).
- */
-enum {
-    kUSBAudioClass							= 1,		// Deprecated
-    kUSBAudioInterfaceClass					= 1,
-
-    kUSBCommunicationControlInterfaceClass	= 2,
-    kUSBCommunicationDataInterfaceClass		= 10,
-
-    kUSBHIDClass							= 3,
-    kUSBHIDInterfaceClass					= 3,
-
-    kUSBPhysicalInterfaceClass				= 5,
-
-    kUSBImageInterfaceClass					= 6,
-
-    kUSBPrintingClass						= 7,		// Deprecated
-    kUSBPrintingInterfaceClass				= 7,
-
-    kUSBMassStorageClass					= 8,		// Deprecated
-    kUSBMassStorageInterfaceClass			= 8,
-
-    kUSBChipSmartCardInterfaceClass			= 11,
-    
-    kUSBContentSecurityInterfaceClass 		= 13,
-    
-    kUSBVideoInterfaceClass					= 14,
-	
-	kUSBPersonalHealthcareInterfaceClass	= 15,
-    
-    kUSBDiagnosticDeviceInterfaceClass 		= 220,
-
-    kUSBWirelessControllerInterfaceClass	= 224,
-
-    kUSBApplicationSpecificInterfaceClass	= 254,
-    
-    kUSBVendorSpecificInterfaceClass     	= 255
-};
-
-// Obsolete
-enum {
-        
-    kUSBDisplayClass            = 4,		// Obsolete
-};
-
-/*!
-    @enum Interface SubClass
-    @discussion Constants for USB Interface SubClasses (bInterfaceSubClass).
-*/
-enum {
-    kUSBCompositeSubClass               = 0,
-    
-    kUSBHubSubClass                     = 0,
-
-    // For the kUSBAudioInterfaceClass
-    //
-    kUSBAudioControlSubClass		= 0x01,
-    kUSBAudioStreamingSubClass		= 0x02,
-    kUSBMIDIStreamingSubClass		= 0x03,
-    
-    // For the kUSBApplicationSpecificInterfaceClass
-    //
-    kUSBDFUSubClass                     = 0x01,
-    kUSBIrDABridgeSubClass              = 0x02,
-    kUSBTestMeasurementSubClass		= 0x03,
-
-    // For the kUSBMassStorageInterfaceClass
-    //
-    kUSBMassStorageRBCSubClass          = 0x01,
-    kUSBMassStorageATAPISubClass        = 0x02,
-    kUSBMassStorageQIC157SubClass       = 0x03,
-    kUSBMassStorageUFISubClass          = 0x04,
-    kUSBMassStorageSFF8070iSubClass     = 0x05,
-    kUSBMassStorageSCSISubClass         = 0x06,
-
-    // For the kUSBHIDInterfaceClass
-    //
-    kUSBHIDBootInterfaceSubClass        = 0x01,
-
-    // For the kUSBCommunicationDataInterfaceClass
-    //
-    kUSBCommDirectLineSubClass          = 0x01,
-    kUSBCommAbstractSubClass            = 0x02,
-    kUSBCommTelephoneSubClass           = 0x03,
-    kUSBCommMultiChannelSubClass        = 0x04,
-    kUSBCommCAPISubClass                = 0x05,
-    kUSBCommEthernetNetworkingSubClass  = 0x06,
-    kUSBATMNetworkingSubClass           = 0x07,
-
-    // For the kUSBDiagnosticDeviceInterfaceClass
-    //
-    kUSBReprogrammableDiagnosticSubClass	= 0x01,
-
-    // For the kUSBWirelessControllerInterfaceClass
-    //
-    kUSBRFControllerSubClass		= 0x01,
-
-    // For the kUSBMiscellaneousClass
-    //
-    kUSBCommonClassSubClass		= 0x02,
-
-    // For the kUSBVideoInterfaceClass
-    //
-    kUSBVideoControlSubClass		= 0x01,
-    kUSBVideoStreamingSubClass		= 0x02,
-    kUSBVideoInterfaceCollectionSubClass = 0x03
-    
-};
-
-/*!
-@enum	Interface Protocol
- @discussion Reported in the bInterfaceProtocol field of the Interface Descriptor.
- */
-enum {
-
-    // For kUSBHIDInterfaceClass
-    //
-    kHIDNoInterfaceProtocol		= 0,
-    kHIDKeyboardInterfaceProtocol	= 1,
-    kHIDMouseInterfaceProtocol		= 2,
-    kUSBVendorSpecificProtocol		= 0xff,
-
-    // For kUSBDiagnosticDeviceInterfaceClass
-    //
-    kUSB2ComplianceDeviceProtocol	= 0x01,
-
-    // For kUSBWirelessControllerInterfaceClass
-    //
-    kUSBBluetoothProgrammingInterfaceProtocol	= 0x01,
-
-    // For kUSBMiscellaneousClass
-    //
-    KUSBInterfaceAssociationDescriptorProtocol	= 0x01
-    
-};
-
-
-/*!
-    @enum DFU Class Attributes
-    @discussion 
-*/
-enum {
-    kUSBDFUAttributesMask       = 0x07,
-    kUSBDFUCanDownloadBit       = 0,
-    kUSBDFUCanUploadBit         = 1,
-    kUSBDFUManifestationTolerantBit     = 2
-};
-
-/*!
- @enum Printer Class Requests
- @discussion The bRequest parameter for Printing Class Sepcific Requests
- */
-enum {
-	kUSPrintingClassGetDeviceID		= 0,
-	kUSPrintingClassGePortStatus	= 1,
-	kUSPrintingClassSoftReset		= 2
-};
-
-	/*!
-@enum Endpoint Descriptor bits
- @discussion Bit definitions for endpoint descriptor fields
- */
-enum {
-    kUSBbEndpointAddressMask				= 0x0f,
-    kUSBbEndpointDirectionBit				= 7,
-    kUSBbEndpointDirectionMask				= ( 1 << kUSBbEndpointDirectionBit ),
-    kUSBEndpointDirectionOut				= 0x00,
-    kUSBEndpointDirectionIn				= 0x80,
-    kUSBEndpointbmAttributesTransferTypeMask		= 0x03,
-    kUSBEndpointbmAttributesSynchronizationTypeMask	= 0x0c,
-    kUSBEndpointbmAttributesSynchronizationTypeShift	= 2,
-    kUSBEndpointbmAttributesUsageTypeMask		= 0x30,
-    kUSBEndpointbmAttributesUsageTypeShift		= 4
-};
-
-	/*!
-	 @defineblock USB Descriptor and IORegistry constants
-	 @discussion 	Various constants used to describe the fields in the various USB Device Descriptors and IORegistry names used for some of those fields 
-	 
-	 @define	kUSBDeviceClass				The field in the USB Device Descriptor corresponding to the device class
-	 @define	kUSBDeviceSubClass			The field in the USB Device Descriptor corresponding to the device sub class
-	 @define	kUSBDeviceProtocol			The field in the USB Device Descriptor corresponding to the device protocol
-	 @define	kUSBDeviceMaxPacketSize		The field in the USB Device Descriptor corresponding to the maximum packet size for endpoint 0
-	 @define	kUSBVendorID				The field in the USB Device Descriptor corresponding to the device USB Vendor ID
-	 @define	kUSBVendorName				Deprecated.  Use kUSBVendorID 
-	 @define	kUSBProductID				The field in the USB Device Descriptor corresponding to the device USB Product ID
-	 @define	kUSBProductName				Deprecated.  Use kUSBProductID
-	 @define	kUSBDeviceReleaseNumber		The field in the USB Device Descriptor corresponding to the device release version
-	 @define	kUSBManufacturerStringIndex	The field in the USB Device Descriptor corresponding to the index for the manufacturer's string
-	 @define	kUSBProductStringIndex		The field in the USB Device Descriptor corresponding to the index for the product name's string
-	 @define	kUSBSerialNumberStringIndex	The field in the USB Device Descriptor corresponding to the index for the serial number's string
-	 @define	kUSBDeviceNumConfigs		The field in the USB Configuration Descriptor corresponding to the number of configurations
-	 @define	kUSBInterfaceNumber			The field in the USB Configuration Descriptor corresponding to the number of configurations
-	 @define	kUSBAlternateSetting		The field in the USB Configuration Descriptor corresponding to the number of configurations
-	 @define	kUSBNumEndpoints			The field in the USB Configuration Descriptor corresponding to the number of configurations
-	 @define	kUSBInterfaceClass			The field in the USB Interface Descriptor corresponding to the interface class
-	 @define	kUSBInterfaceSubClass		The field in the USB Interface Descriptor corresponding to the interface sub class
-	 @define	kUSBInterfaceProtocol		The field in the USB Interface Descriptor corresponding to the interface protocol
-	 @define	kUSBInterfaceStringIndex	The field in the USB Interface Descriptor corresponding to the index for the interface name's string
-	 @define	kUSBConfigurationValue		The field in the USB Interface Descriptor corresponding to the configuration
-	 @define	kUSBProductString			IORegistry key for the device's USB Product string
-	 @define	kUSBVendorString			IORegistry key for the device's USB manufacturer string
-	 @define	kUSBSerialNumberString		IORegistry key for the device's USB serial number string
-	 @define	kUSB1284DeviceID			IORegistry key for the 1284 Device ID of a printer
-	 
-	 */
-#define kUSBDeviceClass             "bDeviceClass"
-#define kUSBDeviceSubClass          "bDeviceSubClass"
-#define kUSBDeviceProtocol          "bDeviceProtocol"
-#define kUSBDeviceMaxPacketSize     "bMaxPacketSize0"
-#define kUSBVendorID                "idVendor"          // good name
-#define kUSBVendorName              kUSBVendorID        // bad name - keep for backward compatibility
-#define kUSBProductID               "idProduct"         // good name
-#define kUSBProductName             kUSBProductID       // bad name - keep for backward compatibility
-#define kUSBDeviceReleaseNumber     "bcdDevice"
-#define kUSBManufacturerStringIndex "iManufacturer"
-#define kUSBProductStringIndex      "iProduct"
-#define kUSBSerialNumberStringIndex "iSerialNumber"
-#define kUSBDeviceNumConfigs        "bNumConfigurations"
-#define kUSBInterfaceNumber         "bInterfaceNumber"
-#define kUSBAlternateSetting        "bAlternateSetting"
-#define kUSBNumEndpoints            "bNumEndpoints"
-#define kUSBInterfaceClass          "bInterfaceClass"
-#define kUSBInterfaceSubClass       "bInterfaceSubClass"
-#define kUSBInterfaceProtocol       "bInterfaceProtocol"
-#define kUSBInterfaceStringIndex    "iInterface"
-#define kUSBConfigurationValue      "bConfigurationValue"
-#define kUSBProductString			"USB Product Name"	
-#define kUSBVendorString			"USB Vendor Name"
-#define kUSBSerialNumberString		"USB Serial Number"
-#define kUSB1284DeviceID			"1284 Device ID"
- /*! @/defineblock */
-	
-	/*!
-    @enum Apple USB Vendor ID
-    @discussion Apple's vendor ID, assigned by the USB-IF
-*/
-enum {
-	kAppleVendorID      = 0x05AC
-};
-	
-#ifdef __cplusplus
-}       
-#endif
-
-#endif /* _USBSPEC_H */
diff --git a/i386/include/IOKit/usb/USBTracepoints.h b/i386/include/IOKit/usb/USBTracepoints.h
deleted file mode 100644
index f2fe81e..0000000
--- a/i386/include/IOKit/usb/USBTracepoints.h
+++ /dev/null
@@ -1,662 +0,0 @@
-/*
- * Copyright � 2009 Apple Inc.  All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __IOKIT_IO_USB_FAMILY_TRACEPOINTS__
-#define __IOKIT_IO_USB_FAMILY_TRACEPOINTS__
-
-#include <IOKit/IOTypes.h>
-
-#include <sys/kdebug.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-#define USB_SYSCTL			"debug.USB"
-#define kUSBTypeDebug		'USBD'
-#define DEBUG_UNUSED( X )	( void )( X )
-	
-	extern UInt32 gUSBStackDebugFlags;
-	
-	typedef struct USBSysctlArgs
-		{
-			uint32_t		type;
-			uint32_t		operation;
-			uint32_t		debugFlags;
-		} USBSysctlArgs;
-	
-	enum
-	{
-		kUSBOperationGetFlags 	= 0,
-		kUSBOperationSetFlags	= 1
-	};
-	
-	// the following bits/masks are for use in the usb boot args
-	// e.g. boot-args="usb=0x102" will turn on Trace Points and set the EHCI retry count to 1
-	// the bits can also be set with a sysctl call
-	enum
-	{
-		kUSBEnableDebugLoggingBit		= 0,	// bit 0 currently not used
-		kUSBEnableTracePointsBit		= 1,	// bit 1 used to turn on Trace Points when a USB controller first loads
-		kUSBEnableErrorLogBit			= 2,	// bit 2 (4) turns level 1 log for errors
-		kUSBDebugRetryCountShift		= 8,	// bits 8 and 9 will set the retry count for low level bus transactions
-		kUSBDebugRetryCountReserved		= 9,	// must be 1, 2, or 3 (0 is invalid, 3 is the default)
-		
-		kUSBEnableDebugLoggingMask		= (1 << kUSBEnableDebugLoggingBit),
-		kUSBEnableTracePointsMask		= (1 << kUSBEnableTracePointsBit),
-		kUSBDebugRetryCountMask			= (3 << kUSBDebugRetryCountShift),
-		kUSBEnableErrorLogMask				= (1 << kUSBEnableErrorLogBit)
-	};
-	
-	
-	/* Kernel Tracepoints
-	 *
-	 * Kernel tracepoints are a logging mechanism reduces the size of a log-laden binary.
-	 * Codes are placed into a buffer, from the kernel, and picked up by a userspace
-	 * tool that displays a unique log message for each tracepoint. Additionally, each
-	 * tracepoint may contain up-to four 32-bit (may change with LP64) arguments. 
-	 *
-	 * To add a tracepoint, use the code below as an example:
-	 * USBTrace( kUSBTController, kTPControllerStart, (uintptr_t)myArgValue );
-	 * Next, add the corresponding tracepoint code in the USBTracer tool, using
-	 * the existing examples. Avoid using confidential information in the log strings.
-	 * Some functions have a argument counter, to signify which of the function's tracepoints
-	 * are actually being logged. When adding a tracepoint using an existing code, you
-	 * must verify that you increment this argument counter properly.
-	 *
-	 * The trace codes consist of the following:
-	 *
-	 * ----------------------------------------------------------------------
-	 *| Class (8)      | SubClass (8)   | USBGroup(6) | Code (8)    |Func   |
-	 *| DBG_IOKIT      | DBG_IOUSB      |             |             |Qual(2)|
-	 * ----------------------------------------------------------------------
-	 *
-	 * DBG_IOKIT(05h)  DBG_IOUSB(2Dh)
-	 *
-	 * See <sys/kdebug.h> and IOTimeStamp.h for more details.
-	 */
-	
-	
-	// USB groupings (max of 64)
-	enum
-	{
-		// Family groupings
-		kUSBTController				= 0,
-		kUSBTControllerUserClient	= 1,
-		
-		kUSBTDevice					= 2,
-		kUSBTDeviceUserClient		= 3,
-
-		kUSBTHub					= 4,
-		kUSBTHubPort				= 5,
-		kUSBTHSHubUserClient		= 6,
-		kUSBTHID					= 7,
-		kUSBTPipe					= 8,
-
-		kUSBTInterfaceUserClient	= 9,
-		
-		kUSBTEnumeration				= 10,		// Tracepoints in various components to debug USB enumeration
-
-		
-		// UIM groupings
-		kUSBTUHCI					= 11,
-		kUSBTUHCIUIM				= 12,
-		kUSBTUHCIInterrupts			= 13,
-
-		kUSBTOHCI					= 14,
-		kUSBTOHCIInterrupts			= 15,
-		
-		kUSBTEHCI					= 20,
-		kUSBTEHCIHubInfo			= 22,
-		kUSBTEHCIInterrupts			= 23,
-		
-		// 30-33 reserved
-
-		// 21-25 reserved
-		kUSBTHubPolicyMaker			= 35,
-		kUSBTCompositeDriver		= 36,
-		
-		// Actions
-		kUSBTOutstandingIO			= 42,
-
-		// kUSBAudio
-		kUSBAudio					= 50
-
-		// 61-63 reserved
-	};
-	
-	// USB Controller Tracepoints		0x052D0000 - 0x052D03FF
-	// kUSBTController
-	enum
-	{
-		kTPControllerStart							= 1,
-		kTPControllerControlPacketHandler			= 2,
-		kTPControllerMakeDevice						= 3,
-		kTPControllerMakeHubDevice					= 4,
-		kTPControllerCreateRootHubDevice			= 5,
-		kTPControllerClearTTHandler					= 6,
-		kTPControllerClearTT						= 7,
-		kTPControllerDoCreateEP						= 8,
-		kTPControllerReadV2							= 9,
-		kTPControllerReturnIsochDoneQueue			= 10,
-		kTPControllersetPowerState					= 11,
-		kTPControllerCheckPowerModeBeforeGatedCall	= 12,
-		kTPControllerGatedPowerChange				= 13,
-		kTPControllerCheckForRootHubChanges			= 14,
-		kTPControllerRootHubQueueInterruptRead		= 15,
-		kTPControllerRootHubTimer					= 16,
-		kTPControllerDisjointCompletion				= 17,
-		kTPControllerCheckForDisjointDescriptor		= 18,
-		kTPControllerRead							= 19,
-		kTPControllerV3Start						= 20,
-		kTPAllocatePowerStateArray					= 21,
-		kTPInitForPM								= 22,
-		kTPIsocIOLL									= 23,
-		kTPIsocIO									= 24,
-		kTPControllerWrite							= 25,
-		kTPCompletionCall							= 26,
-		kTPControlTransaction						= 27,
-		kTPInterruptTransaction						= 28,
-		kTPInterruptTransactionData					= 29,
-		kTPBulkTransaction							= 30,
-		kTPBulkTransactionData						= 31,
-		kTPIsocTransaction							= 32,
-		kTPInterruptPacketHandler					= 33,
-		kTPBulkPacketHandler						= 34,
-		kTPDevZeroLock								= 35,
-		kTPControlPacketHandlerData					= 36,
-		kTPDoIOTransferIntrSync						= 37,
-		kTPDoIOTransferBulkSync						= 38,
-		kTPBulkPacketHandlerData					= 39,
-		kTPInterruptPacketHandlerData				= 40
-	};
-	
-	// USB Device Tracepoints			
-	// kUSBTDevice
-	enum
-	{
-		kTPDeviceInit								= 1,
-		kTPDeviceMessage							= 2,
-		kTPDeviceResetDevice						= 3,
-		kTPDeviceGetFullConfigurationDescriptor		= 4,
-		kTPDeviceGetDeviceDescriptor				= 5,
-		kTPDeviceGetConfigDescriptor				= 6,
-		kTPDeviceSetConfiguration					= 7,
-		kTPDeviceSetFeature							= 8,
-		kTPDeviceDeviceRequest						= 9,
-		kTPDeviceGetConfiguration					= 10,
-		kTPDeviceGetDeviceStatus					= 11,
-		kTPDeviceSuspendDevice						= 12,
-		kTPDeviceReEnumerateDevice					= 13,
-		kTPDeviceConfigLock							= 14
-	};
-	
-	// USB Pipe Tracepoints			
-	// kUSBTPipe
-	enum
-	{
-		kTPPipeInitToEndpoint						= 1,
-		kTPBulkPipeRead								= 2,
-		kTPBulkPipeWrite							= 3,
-		kTPIsocPipeRead								= 4,
-		kTPIsocPipeWrite							= 5,
-		kTPIsocPipeReadLL							= 6,
-		kTPIsocPipeWriteLL							= 7,
-		kTPIBulkReadTS								= 8,
-		kTPPipeControlRequest						= 9,
-		kTPPipeControlRequestMemDesc				= 10
-	};
-	
-	
-	// USB kUSBTControllerUserClient Tracepoints			
-	// kUSBTControllerUserClient
-	enum
-	{
-		kTPControllerUCStart					= 1,
-		kTPControllerUCOpen						= 2,
-		kTPControllerUCReadRegister				= 3,
-		kTPControllerUCWriteRegister			= 4
-	};
-	
-	// USB kUSBTDeviceUserClient Tracepoints			
-	// kUSBTDeviceUserClient
-	enum
-	{
-		kTPDeviceUCDeviceRequestIn				= 1,
-		kTPDeviceUCDeviceRequestOut				= 2,
-		kTPDeviceUCChangeOutstandingIO			= 3,
-		kTPDeviceUCGetGatedOutstandingIO		= 4,
-		kTPDeviceUCReqComplete					= 5
-	};
-	
-	// USB InterfaceUserClient Tracepoints			
-	// kUSBTInterfaceUserClient
-	enum
-	{
-		kTPInterfaceUCReadPipe					= 1,
-		kTPInterfaceUCWritePipe					= 2,
-		kTPInterfaceUCControlRequestOut			= 3,
-		kTPInterfaceUCControlRequestIn			= 4,
-		kTPInterfaceUCDoIsochPipeAsync			= 5,
-		kTPInterfaceUCLowLatencyPrepareBuffer	= 6,
-		kTPInterfaceUCChangeOutstandingIO		= 7,
-		kTPInterfaceUCReqComplete				= 8,
-		kTPInterfaceUCIsoReqComplete			= 9,
-		kTPInterfaceUCLLIsoReqComplete			= 10
-	};
-	
-	
-	// USB HSHubUserClient Tracepoints			
-	// kUSBTHSHubUserClient
-	enum
-	{
-		kTPHSHubUCInitWithTask					= 1,
-		kTPHSHubUCStart							= 2,
-		kTPHSHubUCClose							= 3,
-		kTPHSHubUCGetNumberOfPorts				= 4,
-		kTPHSHubUCGetLocationID					= 5,
-		kTPHSHubUCPutPortIntoTestMode			= 6,
-		kTPHSHubUCSupportsIndicators			= 7,
-		kTPHSHubUCSetIndicatorForPort			= 8,
-		kTPHSHubUCGetPortIndicatorControl		= 9,
-		kTPHSHubUCSetIndicatorsToAutomatic		= 10,
-		kTPHSHubUCGetPowerSwitchingMode			= 11,
-		kTPHSHubUCGetPortPower					= 12,
-		kTPHSHubUCSetPortPower					= 13,
-		kTPHSHubUCDisablePwrMgmt				= 14
-	};
-	
-	// USB Hub Tracepoints			
-	// kUSBTHub
-	enum
-	{
-		kTPHubStart								= 1,
-		kTPHubMessage							= 2,
-		kTPHubWillTerminate						= 3,
-		kTPHubPowerStateWillChangeTo			= 4,
-		kTPHubPowerChangeDone					= 5,
-		kTPHubConfigureHub						= 6,
-		kTPHubCheckPowerPowerRequirements		= 7,
-		kTPHubHubPowerChange					= 8,
-		kTPHubAreAllPortsDisconnectedOrSuspended= 9,
-		kTPHubSuspendPorts						= 10,
-		kTPHubSetPortFeature					= 11,
-		kTPHubClearPortFeature					= 12,
-		kTPHubDoPortAction						= 13,
-		kTPHubInterruptReadHandler				= 14,
-		kTPHubResetPortZero						= 15,
-		kTPHubProcessStateChanged				= 16,
-		kTPHubRearmInterruptRead				= 17,
-		kTPHubDoDeviceRequest					= 18,
-		kTPHubWaitForPortResumes				= 19,
-		kTPHubResetMyPort						= 20,
-		kTPHubDecrementOutstandingIO			= 21,
-		kTPHubChangeOutstandingIO				= 22, 
-		kTPHubChangeRaisedPowerState			= 23,
-		kTPHubChangeOutstandingResumes			= 24,
-		kTPHubEnterTestMode						= 25,
-		kTPHubLeaveTestMode						= 26,
-		kTPHubPutPortIntoTestMode				= 27,
-		kTPHubGetPortIndicatorControl			= 28,
-		kTPHubSetIndicatorsToAutomatic			= 29,
-		kTPHubGetPortPower						= 30,
-		kTPHubEnsureUsability					= 31,
-		kTPHubCheckPowerRequirements			= 32,
-		kTPHubWaitForPowerOn					= 33,
-		kTPHubDoPortActionLock					= 34,
-		kTPHubCheckForDeadDevice				= 35
-	};
-	
-	// USB HubPort Tracepoints			
-	// kUSBTHubPort
-	enum
-	{
-		kTPHubPortStop								= 1,
-		kTPHubPortAddDevice							= 2,
-		kTPHubPortSuspendPort						= 3,
-		kTPHubPortFatalError						= 4,
-		kTPHubPortAddDeviceResetChangeHandler		= 5,
-		kTPHubPortHandleResetPortHandler			= 6,
-		kTPHubPortDefaultOverCrntChangeHandler		= 7,
-		kTPHubPortDefaultConnectionChangeHandler	= 8,
-		kTPHubPortReleaseDevZeroLock				= 9,
-		kTPHubPortDetachDevice						= 10,
-		kTPHubPortGetDevZeroDescriptorWithRetries	= 11,
-		kTPHubPortDisplayOverCurrentNotice			= 12,
-		kTPHubPortWakeSuspendCommand				= 13,
-		kTPHubPortWaitForSuspendCommand				= 14,
-		kTPHubPortEnablePowerAfterOvercurrent		= 15
-	};
-	
-	// USB HID Tracepoints			
-	// kUSBTHID
-	enum
-	{
-		kTPHIDStart							= 1,
-		kTPHIDpowerStateWillChangeTo		= 2,
-		kTPHIDsetPowerState					= 3,
-		kTPHIDpowerStateDidChangeTo			= 4,
-		kTPHIDpowerChangeDone				= 5,
-		kTPHIDhandleStart					= 6,
-		kTPHIDClearFeatureEndpointHalt		= 7,
-		kTPHIDHandleReport					= 8,
-		kTPHIDSuspendPort					= 9,
-		kTPHIDAbortAndSuspend				= 10,
-		kTPHIDClaimPendingRead				= 11,
-		kTPHIDChangeOutstandingIO			= 12,
-		kTPHIDRearmInterruptRead			= 13,
-		kTPHIDInitializeUSBHIDPowerManagement = 14,
-		kTPHIDInterruptRead					= 15,
-		kTPHIDInterruptReadError			= 16,
-		kTPHIDCheckForDeadDevice			= 17
-	};
-	
-	// USB Enumeration Tracepoints			
-	// kUSBTEnumeration
-	enum
-	{
-		kTPEnumerationProcessStatusChanged	= 1,
-		kTPEnumerationInitialGetPortStatus	= 2,
-		kTPEnumerationCallAddDevice			= 3,
-		kTPEnumerationAddDevice				= 4,
-		kTPEnumerationResetPort				= 5,
-		kTPEnumerationAddDeviceResetChangeHandler	= 6,
-		kTPEnumerationRegisterService		= 7,
-		kTPEnumerationLowSpeedDevice		= 8,
-		kTPEnumerationFullSpeedDevice		= 9
-		
-	};
-	
-	// USB UHCI Tracepoints			
-	// kUSBTUHCI
-	enum
-	{
-		kTPUHCIMessage						= 1,
-		kTPUHCIGetFrameNumber				= 2,
-		kTPUHCIScavengeIsocTransactions		= 3,
-		kTPUHCIScavengeQueueHeads			= 4,
-		kTPUHCIAllocateQH					= 5,
-		kTPUHCIRootHubStatusChange			= 6,
-		kTPUHCIRHSuspendPort				= 7,
-		kTPUHCIRHHoldPortReset				= 8,
-		kTPUHCIRHResumePortCompletion		= 9,
-		kTPUHCISuspendController			= 10,
-		KTPUHCIResumeController				= 11,
-		KTPUHCIResetControllerState			= 12,
-		KTPUHCIRestartControllerFromReset	= 13,
-		KTPUHCIEnableInterrupts				= 14,
-		KTPUHCIDozeController				= 15,
-		KTPUHCIWakeFromDoze					= 16,
-		KTPUHCIPowerState					= 17,
-	};
-
-	
-	// USB UHCI Tracepoints			
-	// kUSBTUHCIUIM
-	enum
-	{
-		kTPUHCIUIMCreateControlEndpoint		= 1,
-		kTPUHCIUIMCreateBulkEndpoint		= 2,
-		kTPUHCIUIMCreateInterruptEndpoint	= 3,
-		kTPUHCIUIMCreateIsochEndpoint		= 4,
-		kTPUHCIUIMCreateIsochTransfer		= 5,
-		kTPUHCIUIMDeleteEndpoint			= 6,
-		kTPUHCIUIMUnlinkQueueHead			= 7,
-		kTPUHCIUIMCheckForTimeouts			= 8,
-		kTPUHCIUIMReturnOneTransaction		= 9,
-		kTPUHCIUIMAllocateTDChain			= 10,
-		kTPUHCIUIMAddIsochFramesToSchedule	= 11,
-		kTPUHCIUIMAbortIsochEP				= 12,
-		kTPUHCIUIMCreateInterruptTransfer	= 13,
-		kTPUHCIUIMHandleEndpointAbort		= 14
-	};
-	
-	// USB UHCI Interrupt Tracepoints			
-	// kUSBTUHCIInterrupts
-	enum
-	{
-		kTPUHCIInterruptsGetFrameNumberInternal	= 1,
-		kTPUHCIInterruptsFilterInterrupt		= 2,
-		kTPUHCIInterruptsHandleInterrupt		= 3,
-		kTPUHCIUpdateFrameList					= 4
-	};
-	
-	// USB EHCI Tracepoints			
-	// kUSBTEHCI
-	enum
-	{
-		kTPEHCIRootHubResetPort					= 1,
-		kTPEHCIRootHubPortEnable				= 2,
-		kTPEHCIRootHubPortSuspend				= 3,
-		// kTPEHCIRootHubStatusChange			= 4,
-		kTPEHCIRHResumePortCompletion			= 5,
-		kTPEHCIUIMFinalize						= 6,
-		kTPEHCIGetFrameNumber32					= 7, 
-		kTPEHCIGetFrameNumber					= 8,
-		kTPEHCIAllocateQH						= 9,
-		kTPEHCIEnableAsyncSchedule				= 10,
-		kTPEHCIDisableAsyncSchedule				= 11,
-		kTPEHCIEnablePeriodicSchedule			= 12,
-		kTPEHCIDisablePeriodicSchedule			= 13,
-		kTPEHCIMessage							= 14,
-		kTPEHCIMakeEmptyEndPoint				= 15,
-		kTPEHCIAllocateTDs						= 16,
-		kTPEHCIMungeECHIStatus					= 17,
-		kTPEHCIScavengeIsocTransactions			= 18,
-		kTPEHCIScavengeAnEndpointQueue			= 19,
-		kTPEHCIScavengeCompletedTransactions	= 20,
-		kTPEHCICreateBulkEndpoint				= 21,
-		kTPEHCICreateBulkTransfer				= 22,
-
-		kTPEHCICreateInterruptEndpoint			= 24,
-		kTPEHCICreateIsochEndpoint				= 25,
-		kTPEHCIAbortIsochEP						= 26,
-		kTPEHCIHandleEndpointAbort				= 27,
-		kTPEHCICreateInterruptTransfer			= 28,
-		kTPEHCIUnlinkAsyncEndpoint				= 29,
-		kTPEHCIDeleteEndpoint					= 30,
-		kTPEHCICreateHSIsochTransfer			= 31,
-		kTPEHCICreateSplitIsochTransfer			= 32,
-		kTPEHCICreateIsochTransfer				= 33,
-		kTPEHCIAddIsocFramesToSchedule			= 34,
-		kTPEHCIReturnOneTransaction				= 35,
-		kTPEHCICheckEDListForTimeouts			= 36,
-		kTPEHCISuspendUSBBus					= 37,
-		kTPEHCICheckForTimeouts					= 38,
-		kTPEHCIResumeUSBBus						= 39,
-		kTPEHCIRestartUSBBus					= 40,
-		kTPEHCIResetControllerState				= 41,
-		kTPEHCIDozeController					= 42,
-		kTPEHCIWakeControllerFromDoze			= 43,
-		kTPEHCIEnableInterrupts					= 44,
-		kTPEHCIPowerState						= 45,
-		kTPEHCIStopUSBBus						= 46,
-		kTPEHCIRestartControllerFromReset		= 47
-	};
-
-	// USB EHCI Interrupt Tracepoints			
-	// kUSBTEHCIInterrupts
-	enum
-	{
-		kTPEHCIInterruptsPollInterrupts			= 1,
-		kTPEHCIInterruptsPrimaryInterruptFilter	= 2,
-		kTPEHCIUpdateFrameList					= 3,
-	};
-	
-	
-	// USB EHCI Interrupt Tracepoints			
-	// kUSBTEHCIHubInfo
-	enum
-	{
-		kTPEHCIAvailableIsochBandwidth			= 1,
-		kTPEHCIAllocateIsochBandwidth			= 2
-	};
-	
-	// USB OHCI Tracepoints			
-	// kUSBTOHCI
-	enum
-	{
-		kTPOHCIInitialize						= 1,
-		kTPOHCICreateGeneralTransfer			= 2,
-		kTPOHCIAbortEndpoint					= 3,
-		kTPOHCIDeleteEndpoint					= 4,
-		kTPOHCIEndpointStall					= 5,
-		kTPOHCICreateIsochTransfer				= 6,
-		kTPOHCIAllocateTD						= 7,
-		kTPOHCIAllocateITD						= 8,
-		kTPOHCIAllocateED						= 9,
-		kTPOHCIProcessCompletedITD				= 10,
-		kTPOHCIReturnTransactions				= 11,
-		kTPOHCIMessage							= 12,
-		KTPOHCISuspendUSBBus					= 13,
-		KTPOHCIResumeUSBBus						= 14,
-		KTPOHCIResetControllerState				= 15,
-		KTPOHCIRestartControllerFromReset		= 16,
-		KTPOHCIEnableInterrupts					= 17,
-		KTPOHCIDozeController					= 18,
-		KTPOHCIWakeControllerFromDoze			= 19,
-		KTPOHCIPowerState						= 20,
-		kTPOHCIDoneQueueCompletion				= 21
-	};
-		
-	// USB OHCI Interrupt Tracepoints			
-	// kUSBTOHCIInterrupts
-	enum
-	{
-		kTPOHCIInterruptsPollInterrupts			= 1,
-		kTPOHCIInterruptsPrimaryInterruptFilter	= 2,
-		kTPOHCIUpdateFrameList					= 3
-	};
-	
-
-	// USB HubPolicyMaker Tracepoints			
-	// kUSBTHubPolicyMaker
-	enum
-	{
-		kTPSetPowerState						 = 1
-	};
-	
-	// USB CompositeDriver Tracepoints			
-	// kUSBTCompositeDriver
-	enum
-	{
-		kTPCompositeDriverConfigureDevice		 = 1
-	};
-
-	// USB USB OutstandingIO Tracepoints			
-	// kUSBTOutstandingIO
-	enum
-	{
-		kTPDeviceUCDecrement	= 1,
-		kTPDeviceUCIncrement	= 2,
-		kTPInterfaceUCDecrement	= 3,
-		kTPInterfaceUCIncrement	= 4,
-		kTPHubDecrement			= 5,
-		kTPHubIncrement			= 6,
-		kTPHIDDecrement			= 7,
-		kTPHIDIncrement			= 8
-	};
-	
-	// USB Audio driver Tracepoints			
-	// kUSBAudio
-	enum
-	{
-		kTPAudioDriverRead						= 1,
-		kTPAudioDriverCoalesceInputSamples		= 2,
-		kTPAudioDriverCoalesceError				= 3,
-		kTPAudioDriverCoalesce					= 4,
-		kTPAudioDriverReadHandler				= 5,
-		kTPAudioDriverCoalesceError2			= 6,
-		kTPAudioDriverConvertInputSamples		= 7
-	};
-	
-	// Tracepoint macros.
-#define USB_TRACE(USBClass, code, funcQualifier)	( ( ( DBG_IOKIT & 0xFF ) << 24) | ( ( DBG_IOUSB & 0xFF ) << 16 ) | ( ( USBClass & 0x3F ) << 10 ) | ( ( code & 0xFF ) << 2 ) | ( funcQualifier & 0x3 ) )
-
-#define kTPAllUSB								USB_TRACE ( 0, 0, 0 )
-
-#define USB_CONTROLLER_TRACE(code)				USB_TRACE( kUSBTController, code, DBG_FUNC_NONE )
-#define USB_CONTROLLER_UC_TRACE(code)			USB_TRACE( kUSBTControllerUserClient, code, DBG_FUNC_NONE )
-#define USB_DEVICE_TRACE(code)					USB_TRACE( kUSBTDevice, code, DBG_FUNC_NONE )
-#define USB_DEVICE_UC_TRACE(code)				USB_TRACE( kUSBTDeviceUserClient, code, DBG_FUNC_NONE )
-
-#define USB_HUB_TRACE(code)						USB_TRACE( kUSBTHub, code, DBG_FUNC_NONE )
-#define USB_HUB_PORT_TRACE(code)				USB_TRACE( kUSBTHubPort, code, DBG_FUNC_NONE )
-#define USB_HUB_UC_TRACE(code)					USB_TRACE( kUSBTHSHubUserClient, code, DBG_FUNC_NONE )
-#define USB_HID_TRACE(code)						USB_TRACE( kUSBTHID, code, DBG_FUNC_NONE )
-#define USB_PIPE_TRACE(code)					USB_TRACE( kUSBTPipe, code, DBG_FUNC_NONE )
-
-#define USB_INTERFACE_UC_TRACE(code)			USB_TRACE( kUSBTInterfaceUserClient, code, DBG_FUNC_NONE )
-
-#define USB_ENUMERATION_TRACE(code)				USB_TRACE( kUSBTEnumeration, code, DBG_FUNC_NONE )
-
-#define USB_UHCI_TRACE(code)					USB_TRACE( kUSBTUHCI, code, DBG_FUNC_NONE )
-#define USB_UHCI_UIM_TRACE(code)				USB_TRACE( kUSBTUHCIUIM, code, DBG_FUNC_NONE )
-#define USB_UHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTUHCIInterrupts, code, DBG_FUNC_NONE )
-
-#define USB_OHCI_TRACE(code)					USB_TRACE( kUSBTOHCI, code, DBG_FUNC_NONE )
-#define USB_OHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTOHCIInterrupts, code, DBG_FUNC_NONE )
-
-#define USB_EHCI_TRACE(code)					USB_TRACE( kUSBTEHCI, code, DBG_FUNC_NONE )
-#define USB_EHCI_HUBINFO_TRACE(code)			USB_TRACE( kUSBTEHCIHubInfo, code, DBG_FUNC_NONE )
-#define USB_EHCI_INTERRUPTS_TRACE(code)			USB_TRACE( kUSBTEHCIInterrupts, code, DBG_FUNC_NONE )
-
-#define USB_HUB_POLICYMAKER_TRACE(code)			USB_TRACE( kUSBTHubPolicyMaker, code, DBG_FUNC_NONE )
-#define USB_COMPOSITE_DRIVER_TRACE(code)		USB_TRACE( kUSBTCompositeDriver, code, DBG_FUNC_NONE )
-
-#define USB_OUTSTANDING_IO_TRACE(code)			USB_TRACE( kUSBTOutstandingIO, code, DBG_FUNC_NONE )	
-	
-#define USB_AUDIO_DRIVER_TRACE(code)			USB_TRACE( kUSBAudio, code, DBG_FUNC_NONE )	
-
-#ifdef KERNEL
-	
-#include <IOKit/IOTimeStamp.h>
-		
-#define USBTrace(USBClass, code, a, b, c, d) {														\
-			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
-				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_NONE), a, b, c, d );		\
-			}																						\
-		}
-
-#define USBTrace_Start(USBClass, code, a, b, c, d) {												\
-			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
-				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_START), a, b, c, d );		\
-			}																						\
-		}
-
-#define USBTrace_End(USBClass, code, a, b, c, d) {														\
-			if (gUSBStackDebugFlags & kUSBEnableTracePointsMask) {									\
-				IOTimeStampConstant( USB_TRACE(USBClass, code, DBG_FUNC_END), a, b, c, d );			\
-			}																						\
-		}
-
-#endif
-	
-	
-	
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif	/* __IOKIT_IO_USB_FAMILY_TRACEPOINTS__ */
diff --git a/i386/include/libkern/crypto/md5.h b/i386/include/libkern/crypto/md5.h
deleted file mode 100644
index 57e826a..0000000
--- a/i386/include/libkern/crypto/md5.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-/*
- * MD5.H - header file for MD5.C
- */
-
-/*
- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- * rights reserved.
- *
- * License to copy and use this software is granted provided that it
- * is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- * Algorithm" in all material mentioning or referencing this software
- * or this function.
- *
- * License is also granted to make and use derivative works provided
- * that such works are identified as "derived from the RSA Data
- * Security, Inc. MD5 Message-Digest Algorithm" in all material
- * mentioning or referencing the derived work.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-#ifndef _CRYPTO_MD5_H_
-#define	_CRYPTO_MD5_H_
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-#define	MD5_DIGEST_LENGTH	16
-
-/* MD5 context. */
-typedef struct {
-	u_int32_t state[4];	/* state (ABCD) */
-	u_int32_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
-	unsigned char buffer[64];	/* input buffer */
-} MD5_CTX;
-
-extern void MD5Init(MD5_CTX *);
-extern void MD5Update(MD5_CTX *, const void *, unsigned int);
-extern void MD5Final(unsigned char [MD5_DIGEST_LENGTH], MD5_CTX *);
-
-__END_DECLS
-
-#endif /* _CRYPTO_MD5_H_ */
diff --git a/i386/include/libkern/crypto/sha1.h b/i386/include/libkern/crypto/sha1.h
deleted file mode 100644
index 9acc46b..0000000
--- a/i386/include/libkern/crypto/sha1.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _CRYPTO_SHA1_H_
-#define	_CRYPTO_SHA1_H_
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define	SHA_DIGEST_LENGTH	20
-#define	SHA1_RESULTLEN		SHA_DIGEST_LENGTH
-
-typedef struct sha1_ctxt {
-	union {
-		u_int8_t	b8[20];
-		u_int32_t	b32[5];	/* state (ABCDE) */
-	} h;
-	union {
-		u_int8_t	b8[8];
-		u_int32_t	b32[2];
-		u_int64_t	b64[1];	/* # of bits, modulo 2^64 (msb first) */
-	} c;
-	union {
-		u_int8_t	b8[64];
-		u_int32_t	b32[16]; /* input buffer */
-	} m;
-	u_int8_t	count;		/* unused; for compatibility only */
-} SHA1_CTX;
-
-/* For compatibility with the other SHA-1 implementation. */
-#define sha1_init(c)		SHA1Init(c)
-#define sha1_loop(c, b, l)	SHA1Update(c, b, l)
-#define sha1_result(c, b)	SHA1Final(b, c)
-
-extern void SHA1Init(SHA1_CTX *);
-extern void SHA1Update(SHA1_CTX *, const void *, size_t);
-extern void SHA1UpdateUsePhysicalAddress(SHA1_CTX *, const void *, size_t);
-extern void SHA1Final(void *, SHA1_CTX *);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /*_CRYPTO_SHA1_H_*/
diff --git a/i386/include/libkern/ppc/OSByteOrder.h b/i386/include/libkern/ppc/OSByteOrder.h
deleted file mode 100644
index c666685..0000000
--- a/i386/include/libkern/ppc/OSByteOrder.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _OS_OSBYTEORDERPPC_H
-#define _OS_OSBYTEORDERPPC_H
-
-#include <stdint.h>
-
-#if !defined(OS_INLINE)
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#        define OS_INLINE static inline
-# elif defined(__MWERKS__) || defined(__cplusplus)
-#        define OS_INLINE static inline
-# else
-#        define OS_INLINE static __inline__
-# endif
-#endif
-
-/* Functions for byte reversed loads. */
-
-OS_INLINE
-uint16_t
-OSReadSwapInt16(
-    const volatile void * base,
-    uintptr_t             byteOffset
-)
-{
-    uint16_t result;
-    volatile uint16_t *addr = (volatile uint16_t *)((uintptr_t)base + byteOffset);
-
-#if defined(__llvm__)
-    result = *addr;
-    result = ((result << 8) | (result >> 8));
-#else
-    __asm__ ("lhbrx %0, %2, %1"
-             : "=r" (result)
-             : "r"  (base), "bO" (byteOffset), "m" (*addr));
-#endif
-
-    return result;
-}
-
-OS_INLINE
-uint32_t
-OSReadSwapInt32(
-    const volatile void * base,
-    uintptr_t             byteOffset
-)
-{
-    uint32_t result;
-    volatile uint32_t *addr = (volatile uint32_t *)((uintptr_t)base + byteOffset);
-
-#if defined(__llvm__)
-    result = __builtin_bswap32(*addr);
-#else
-    __asm__ ("lwbrx %0, %2, %1"
-             : "=r" (result)
-             : "r"  (base), "bO" (byteOffset), "m" (*addr));
-#endif
-
-    return result;
-}
-
-OS_INLINE
-uint64_t
-OSReadSwapInt64(
-    const volatile void * base,
-    uintptr_t             byteOffset
-)
-{
-    volatile uint64_t *addr = (volatile uint64_t *)((uintptr_t)base + byteOffset);
-    union {
-        uint64_t u64;
-        uint32_t u32[2];
-    } u;
-
-#if defined(__llvm__)
-    u.u64 = __builtin_bswap64(*addr);
-#else
-    __asm__ ("lwbrx %0, %3, %2\n\t"
-             "lwbrx %1, %4, %2"
-             : "=&r" (u.u32[1]), "=r" (u.u32[0])
-             : "r"  (base), "bO" (byteOffset), "b" (byteOffset + 4), "m" (*addr));
-#endif
-
-    return u.u64;
-}
-
-/* Functions for byte reversed stores. */
-
-OS_INLINE
-void
-OSWriteSwapInt16(
-    volatile void * base,
-    uintptr_t       byteOffset,
-    uint16_t        data
-)
-{
-    volatile uint16_t *addr = (volatile uint16_t *)((uintptr_t)base + byteOffset);
-
-#if defined(__llvm__)
-    *addr = ((data >> 8) | (data << 8));
-#else
-    __asm__ ("sthbrx %1, %3, %2"
-             : "=m" (*addr)
-             : "r" (data), "r" (base), "bO" (byteOffset));
-#endif
-}
-
-OS_INLINE
-void
-OSWriteSwapInt32(
-    volatile void * base,
-    uintptr_t       byteOffset,
-    uint32_t        data
-)
-{
-    volatile uint32_t *addr = (volatile uint32_t *)((uintptr_t)base + byteOffset);
-
-#if defined(__llvm__)
-    *addr = __builtin_bswap32(data);
-#else
-    __asm__ ("stwbrx %1, %3, %2"
-             : "=m" (*addr)
-             : "r" (data), "r" (base), "bO" (byteOffset));
-#endif
-}
-
-OS_INLINE
-void
-OSWriteSwapInt64(
-    volatile void * base,
-    uintptr_t       byteOffset,
-    uint64_t        data
-)
-{
-    volatile uint64_t *addr = (volatile uint64_t *)((uintptr_t)base + byteOffset);
-
-#if defined(__llvm__)
-    *addr = __builtin_bswap64(data);
-#else
-    uint32_t hi = (uint32_t)(data >> 32);
-    uint32_t lo = (uint32_t)(data & 0xffffffff);
-
-    __asm__ ("stwbrx %1, %4, %3\n\t"
-             "stwbrx %2, %5, %3"
-             : "=m" (*addr)
-             : "r" (lo), "r" (hi), "r" (base), "bO" (byteOffset), "b" (byteOffset + 4));
-#endif
-}
-
-/* Generic byte swapping functions. */
-
-OS_INLINE
-uint16_t
-_OSSwapInt16(
-    uint16_t data
-)
-{
-    return OSReadSwapInt16(&data, 0);
-}
-
-OS_INLINE
-uint32_t
-_OSSwapInt32(
-    uint32_t data
-)
-{
-    return OSReadSwapInt32(&data, 0);
-}
-
-OS_INLINE
-uint64_t
-_OSSwapInt64(
-    uint64_t data
-)
-{
-    return OSReadSwapInt64(&data, 0);
-}
-
-#endif /* ! _OS_OSBYTEORDERPPC_H */
diff --git a/i386/include/mach-o/i386/swap.h b/i386/include/mach-o/i386/swap.h
deleted file mode 100644
index 09e322f..0000000
--- a/i386/include/mach-o/i386/swap.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#include <architecture/byte_order.h>
-#include <mach/i386/thread_status.h>
-
-extern void swap_i386_thread_state(
-    i386_thread_state_t *cpu,
-    enum NXByteOrder target_byte_order);
-
-/* current i386 thread states */
-#if i386_THREAD_STATE == 1
-extern void swap_i386_float_state(
-    struct i386_float_state *fpu,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_i386_exception_state(
-    i386_exception_state_t *exc,
-    enum NXByteOrder target_byte_order);
-#endif /* i386_THREAD_STATE == 1 */
-
-/* i386 thread states on older releases */
-#if i386_THREAD_STATE == -1
-extern void swap_i386_thread_fpstate(
-    i386_thread_fpstate_t *fpu,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_i386_thread_exceptstate(
-    i386_thread_exceptstate_t *exc,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_i386_thread_cthreadstate(
-    i386_thread_cthreadstate_t *user,
-    enum NXByteOrder target_byte_order);
-#endif /* i386_THREAD_STATE == -1 */
-
-#ifdef x86_THREAD_STATE64
-extern void swap_x86_thread_state64(
-    x86_thread_state64_t *cpu,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_x86_state_hdr(
-    x86_state_hdr_t *hdr,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_x86_float_state64(
-    x86_float_state64_t *fpu,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_x86_exception_state64(
-    x86_exception_state64_t *exc,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_x86_thread_state(
-    x86_thread_state_t *cpu,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_x86_float_state(
-    x86_float_state_t *fpu,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_x86_exception_state(
-    x86_exception_state_t *exc,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_x86_debug_state32(
-    x86_debug_state32_t *debug,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_x86_debug_state64(
-    x86_debug_state64_t *debug,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_x86_debug_state(
-    x86_debug_state_t *debug,
-    enum NXByteOrder target_byte_order);
-#endif /* x86_THREAD_STATE64 */
diff --git a/i386/include/mach-o/x86_64/reloc.h b/i386/include/mach-o/x86_64/reloc.h
deleted file mode 100644
index d3466d8..0000000
--- a/i386/include/mach-o/x86_64/reloc.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Relocations for x86_64 are a bit different than for other architectures in
- * Mach-O: Scattered relocations are not used.  Almost all relocations produced
- * by the compiler are external relocations.  An external relocation has the
- * r_extern bit set to 1 and the r_symbolnum field contains the symbol table
- * index of the target label.
- * 
- * When the assembler is generating relocations, if the target label is a local
- * label (begins with 'L'), then the previous non-local label in the same
- * section is used as the target of the external relocation.  An addend is used
- * with the distance from that non-local label to the target label.  Only when
- * there is no previous non-local label in the section is an internal
- * relocation used.
- * 
- * The addend (i.e. the 4 in _foo+4) is encoded in the instruction (Mach-O does
- * not have RELA relocations).  For PC-relative relocations, the addend is
- * stored directly in the instruction.  This is different from other Mach-O
- * architectures, which encode the addend minus the current section offset.
- * 
- * The relocation types are:
- * 
- * 	X86_64_RELOC_UNSIGNED	// for absolute addresses
- * 	X86_64_RELOC_SIGNED		// for signed 32-bit displacement
- * 	X86_64_RELOC_BRANCH		// a CALL/JMP instruction with 32-bit displacement
- * 	X86_64_RELOC_GOT_LOAD	// a MOVQ load of a GOT entry
- * 	X86_64_RELOC_GOT		// other GOT references
- * 	X86_64_RELOC_SUBTRACTOR	// must be followed by a X86_64_RELOC_UNSIGNED
- * 
- * The following are sample assembly instructions, followed by the relocation
- * and section content they generate in an object file:
- * 
- * 	call _foo
- * 		r_type=X86_64_RELOC_BRANCH, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
- * 		E8 00 00 00 00
- * 
- * 	call _foo+4
- * 		r_type=X86_64_RELOC_BRANCH, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
- * 		E8 04 00 00 00 
- * 
- * 	movq _foo@GOTPCREL(%rip), %rax
- * 		r_type=X86_64_RELOC_GOT_LOAD, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
- * 		48 8B 05 00 00 00 00
- * 	
- * 	pushq _foo@GOTPCREL(%rip)
- * 		r_type=X86_64_RELOC_GOT, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
- * 		FF 35 00 00 00 00
- * 	
- * 	movl _foo(%rip), %eax
- * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
- * 		8B 05 00 00 00 00
- * 
- * 	movl _foo+4(%rip), %eax
- * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
- * 		8B 05 04 00 00 00
- * 
- * 	movb  $0x12, _foo(%rip)
- * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
- * 		C6 05 FF FF FF FF 12
- * 
- * 	movl  $0x12345678, _foo(%rip)
- * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_foo
- * 		C7 05 FC FF FF FF 78 56 34 12
- * 
- * 	.quad _foo
- * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
- * 		00 00 00 00 00 00 00 00
- * 
- * 	.quad _foo+4
- * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
- * 		04 00 00 00 00 00 00 00
- * 
- * 	.quad _foo - _bar
- * 		r_type=X86_64_RELOC_SUBTRACTOR, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_bar
- * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
- * 		00 00 00 00 00 00 00 00
- * 
- * 	.quad _foo - _bar + 4
- * 		r_type=X86_64_RELOC_SUBTRACTOR, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_bar
- * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
- * 		04 00 00 00 00 00 00 00
- * 	
- * 	.long _foo - _bar
- * 		r_type=X86_64_RELOC_SUBTRACTOR, r_length=2, r_extern=1, r_pcrel=0, r_symbolnum=_bar
- * 		r_type=X86_64_RELOC_UNSIGNED, r_length=2, r_extern=1, r_pcrel=0, r_symbolnum=_foo
- * 		00 00 00 00
- * 
- * 	lea L1(%rip), %rax
- * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=1, r_pcrel=1, r_symbolnum=_prev
- * 		48 8d 05 12 00 00 00
- * 		// assumes _prev is the first non-local label 0x12 bytes before L1
- * 
- * 	lea L0(%rip), %rax
- * 		r_type=X86_64_RELOC_SIGNED, r_length=2, r_extern=0, r_pcrel=1, r_symbolnum=3
- * 		48 8d 05 56 00 00 00
- *		// assumes L0 is in third section and there is no previous non-local label.
- *		// The rip-relative-offset of 0x00000056 is L0-address_of_next_instruction.
- *		// address_of_next_instruction is the address of the relocation + 4.
- *
- *     add     $6,L0(%rip)
- *             r_type=X86_64_RELOC_SIGNED_1, r_length=2, r_extern=0, r_pcrel=1, r_symbolnum=3
- *		83 05 18 00 00 00 06
- *		// assumes L0 is in third section and there is no previous non-local label.
- *		// The rip-relative-offset of 0x00000018 is L0-address_of_next_instruction.
- *		// address_of_next_instruction is the address of the relocation + 4 + 1.
- *		// The +1 comes from SIGNED_1.  This is used because the relocation is not
- *		// at the end of the instruction.
- *
- * 	.quad L1
- * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_prev
- * 		12 00 00 00 00 00 00 00
- * 		// assumes _prev is the first non-local label 0x12 bytes before L1
- * 
- * 	.quad L0
- * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=0, r_pcrel=0, r_symbolnum=3
- * 		56 00 00 00 00 00 00 00
- * 		// assumes L0 is in third section, has an address of 0x00000056 in .o
- * 		// file, and there is no previous non-local label
- * 
- * 	.quad _foo - .
- * 		r_type=X86_64_RELOC_SUBTRACTOR, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_prev
- * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
- * 		EE FF FF FF FF FF FF FF
- * 		// assumes _prev is the first non-local label 0x12 bytes before this
- * 		// .quad
- * 
- * 	.quad _foo - L1
- * 		r_type=X86_64_RELOC_SUBTRACTOR, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_prev
- * 		r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_extern=1, r_pcrel=0, r_symbolnum=_foo
- * 		EE FF FF FF FF FF FF FF
- * 		// assumes _prev is the first non-local label 0x12 bytes before L1
- * 
- * 	.quad L1 - _prev
- * 		// No relocations.  This is an assembly time constant.
- * 		12 00 00 00 00 00 00 00
- * 		// assumes _prev is the first non-local label 0x12 bytes before L1
- *
- *
- *
- * In final linked images, there are only two valid relocation kinds:
- *
- *     r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_pcrel=0, r_extern=1, r_symbolnum=sym_index
- *	This tells dyld to add the address of a symbol to a pointer sized (8-byte)
- *  piece of data (i.e on disk the 8-byte piece of data contains the addend). The 
- *  r_symbolnum contains the index into the symbol table of the target symbol.
- *
- *     r_type=X86_64_RELOC_UNSIGNED, r_length=3, r_pcrel=0, r_extern=0, r_symbolnum=0
- * This tells dyld to adjust the pointer sized (8-byte) piece of data by the amount
- * the containing image was loaded from its base address (e.g. slide).
- *
- */ 
-enum reloc_type_x86_64
-{
-	X86_64_RELOC_UNSIGNED,		// for absolute addresses
-	X86_64_RELOC_SIGNED,		// for signed 32-bit displacement
-	X86_64_RELOC_BRANCH,		// a CALL/JMP instruction with 32-bit displacement
-	X86_64_RELOC_GOT_LOAD,		// a MOVQ load of a GOT entry
-	X86_64_RELOC_GOT,			// other GOT references
-	X86_64_RELOC_SUBTRACTOR,	// must be followed by a X86_64_RELOC_UNSIGNED
-	X86_64_RELOC_SIGNED_1,		// for signed 32-bit displacement with a -1 addend
-	X86_64_RELOC_SIGNED_2,		// for signed 32-bit displacement with a -2 addend
-	X86_64_RELOC_SIGNED_4,		// for signed 32-bit displacement with a -4 addend
-	X86_64_RELOC_TLV,		// for thread local variables
-};
diff --git a/i386/include/mach/x86_64/.svn/all-wcprops b/i386/include/mach/x86_64/.svn/all-wcprops
deleted file mode 100644
index c569814..0000000
--- a/i386/include/mach/x86_64/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 58
-/svn/chameleon/!svn/ver/881/trunk/i386/include/mach/x86_64
-END
-thread_act.h
-K 25
-svn:wc:ra_dav:version-url
-V 71
-/svn/chameleon/!svn/ver/881/trunk/i386/include/mach/x86_64/thread_act.h
-END
-task.h
-K 25
-svn:wc:ra_dav:version-url
-V 65
-/svn/chameleon/!svn/ver/881/trunk/i386/include/mach/x86_64/task.h
-END
diff --git a/i386/include/mach/x86_64/.svn/entries b/i386/include/mach/x86_64/.svn/entries
deleted file mode 100644
index 0636f47..0000000
--- a/i386/include/mach/x86_64/.svn/entries
+++ /dev/null
@@ -1,96 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/mach/x86_64
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-thread_act.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-25d845f2e915a195e887ae48026bf854
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-25654
-
-task.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-d87c8dd8a5baf21d6cd2fb7fd2c6775d
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-34704
-
diff --git a/i386/include/mach/x86_64/.svn/text-base/task.h.svn-base b/i386/include/mach/x86_64/.svn/text-base/task.h.svn-base
deleted file mode 100644
index 15c8248..0000000
--- a/i386/include/mach/x86_64/.svn/text-base/task.h.svn-base
+++ /dev/null
@@ -1,1578 +0,0 @@
-#ifndef	_task_user_
-#define	_task_user_
-
-/* Module task */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	task_MSG_COUNT
-#define	task_MSG_COUNT	35
-#endif	/* task_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine task_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_create
-(
-	task_t target_task,
-	ledger_array_t ledgers,
-	mach_msg_type_number_t ledgersCnt,
-	boolean_t inherit_memory,
-	task_t *child_task
-);
-
-/* Routine task_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_terminate
-(
-	task_t target_task
-);
-
-/* Routine task_threads */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_threads
-(
-	task_t target_task,
-	thread_act_array_t *act_list,
-	mach_msg_type_number_t *act_listCnt
-);
-
-/* Routine mach_ports_register */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_ports_register
-(
-	task_t target_task,
-	mach_port_array_t init_port_set,
-	mach_msg_type_number_t init_port_setCnt
-);
-
-/* Routine mach_ports_lookup */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_ports_lookup
-(
-	task_t target_task,
-	mach_port_array_t *init_port_set,
-	mach_msg_type_number_t *init_port_setCnt
-);
-
-/* Routine task_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_info
-(
-	task_name_t target_task,
-	task_flavor_t flavor,
-	task_info_t task_info_out,
-	mach_msg_type_number_t *task_info_outCnt
-);
-
-/* Routine task_set_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_info
-(
-	task_t target_task,
-	task_flavor_t flavor,
-	task_info_t task_info_in,
-	mach_msg_type_number_t task_info_inCnt
-);
-
-/* Routine task_suspend */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_suspend
-(
-	task_t target_task
-);
-
-/* Routine task_resume */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_resume
-(
-	task_t target_task
-);
-
-/* Routine task_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_special_port
-(
-	task_t task,
-	int which_port,
-	mach_port_t *special_port
-);
-
-/* Routine task_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_special_port
-(
-	task_t task,
-	int which_port,
-	mach_port_t special_port
-);
-
-/* Routine thread_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_create
-(
-	task_t parent_task,
-	thread_act_t *child_act
-);
-
-/* Routine thread_create_running */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_create_running
-(
-	task_t parent_task,
-	thread_state_flavor_t flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt,
-	thread_act_t *child_act
-);
-
-/* Routine task_set_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_exception_ports
-(
-	task_t task,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor
-);
-
-/* Routine task_get_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_exception_ports
-(
-	task_t task,
-	exception_mask_t exception_mask,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlers,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine task_swap_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_swap_exception_ports
-(
-	task_t task,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlerss,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine lock_set_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_set_create
-(
-	task_t task,
-	lock_set_t *new_lock_set,
-	int n_ulocks,
-	int policy
-);
-
-/* Routine lock_set_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_set_destroy
-(
-	task_t task,
-	lock_set_t lock_set
-);
-
-/* Routine semaphore_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t semaphore_create
-(
-	task_t task,
-	semaphore_t *semaphore,
-	int policy,
-	int value
-);
-
-/* Routine semaphore_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t semaphore_destroy
-(
-	task_t task,
-	semaphore_t semaphore
-);
-
-/* Routine task_policy_set */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_policy_set
-(
-	task_t task,
-	task_policy_flavor_t flavor,
-	task_policy_t policy_info,
-	mach_msg_type_number_t policy_infoCnt
-);
-
-/* Routine task_policy_get */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_policy_get
-(
-	task_t task,
-	task_policy_flavor_t flavor,
-	task_policy_t policy_info,
-	mach_msg_type_number_t *policy_infoCnt,
-	boolean_t *get_default
-);
-
-/* Routine task_sample */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_sample
-(
-	task_t task,
-	mach_port_t reply
-);
-
-/* Routine task_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_policy
-(
-	task_t task,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	boolean_t set_limit,
-	boolean_t change
-);
-
-/* Routine task_set_emulation */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_emulation
-(
-	task_t target_port,
-	vm_address_t routine_entry_pt,
-	int routine_number
-);
-
-/* Routine task_get_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_emulation_vector
-(
-	task_t task,
-	int *vector_start,
-	emulation_vector_t *emulation_vector,
-	mach_msg_type_number_t *emulation_vectorCnt
-);
-
-/* Routine task_set_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_emulation_vector
-(
-	task_t task,
-	int vector_start,
-	emulation_vector_t emulation_vector,
-	mach_msg_type_number_t emulation_vectorCnt
-);
-
-/* Routine task_set_ras_pc */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_ras_pc
-(
-	task_t target_task,
-	vm_address_t basepc,
-	vm_address_t boundspc
-);
-
-/* Routine task_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_assign
-(
-	task_t task,
-	processor_set_t new_set,
-	boolean_t assign_threads
-);
-
-/* Routine task_assign_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_assign_default
-(
-	task_t task,
-	boolean_t assign_threads
-);
-
-/* Routine task_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_assignment
-(
-	task_t task,
-	processor_set_name_t *assigned_set
-);
-
-/* Routine task_set_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_policy
-(
-	task_t task,
-	processor_set_t pset,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	policy_limit_t limit,
-	mach_msg_type_number_t limitCnt,
-	boolean_t change
-);
-
-/* Routine task_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_state
-(
-	task_t task,
-	thread_state_flavor_t flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-
-/* Routine task_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_state
-(
-	task_t task,
-	thread_state_flavor_t flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__task_subsystem__defined
-#define __Request__task_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t ledgers;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t ledgersCnt;
-		boolean_t inherit_memory;
-	} __Request__task_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_threads_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t init_port_set;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t init_port_setCnt;
-	} __Request__mach_ports_register_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__mach_ports_lookup_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_flavor_t flavor;
-		mach_msg_type_number_t task_info_outCnt;
-	} __Request__task_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_flavor_t flavor;
-		mach_msg_type_number_t task_info_inCnt;
-		integer_t task_info_in[10];
-	} __Request__task_set_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__task_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__task_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__thread_create_running_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__task_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-	} __Request__task_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__task_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int n_ulocks;
-		int policy;
-	} __Request__lock_set_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t lock_set;
-		/* end of the kernel processed data */
-	} __Request__lock_set_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int policy;
-		int value;
-	} __Request__semaphore_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t semaphore;
-		/* end of the kernel processed data */
-	} __Request__semaphore_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-	} __Request__task_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		boolean_t get_default;
-	} __Request__task_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t reply;
-		/* end of the kernel processed data */
-	} __Request__task_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		boolean_t set_limit;
-		boolean_t change;
-	} __Request__task_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t routine_entry_pt;
-		int routine_number;
-	} __Request__task_set_emulation_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_get_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t emulation_vector;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int vector_start;
-		mach_msg_type_number_t emulation_vectorCnt;
-	} __Request__task_set_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t basepc;
-		vm_address_t boundspc;
-	} __Request__task_set_ras_pc_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_set;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		boolean_t assign_threads;
-	} __Request__task_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		boolean_t assign_threads;
-	} __Request__task_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t pset;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		mach_msg_type_number_t limitCnt;
-		integer_t limit[1];
-		boolean_t change;
-	} __Request__task_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t old_stateCnt;
-	} __Request__task_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__task_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__task_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__task_subsystem__defined
-#define __RequestUnion__task_subsystem__defined
-union __RequestUnion__task_subsystem {
-	__Request__task_create_t Request_task_create;
-	__Request__task_terminate_t Request_task_terminate;
-	__Request__task_threads_t Request_task_threads;
-	__Request__mach_ports_register_t Request_mach_ports_register;
-	__Request__mach_ports_lookup_t Request_mach_ports_lookup;
-	__Request__task_info_t Request_task_info;
-	__Request__task_set_info_t Request_task_set_info;
-	__Request__task_suspend_t Request_task_suspend;
-	__Request__task_resume_t Request_task_resume;
-	__Request__task_get_special_port_t Request_task_get_special_port;
-	__Request__task_set_special_port_t Request_task_set_special_port;
-	__Request__thread_create_t Request_thread_create;
-	__Request__thread_create_running_t Request_thread_create_running;
-	__Request__task_set_exception_ports_t Request_task_set_exception_ports;
-	__Request__task_get_exception_ports_t Request_task_get_exception_ports;
-	__Request__task_swap_exception_ports_t Request_task_swap_exception_ports;
-	__Request__lock_set_create_t Request_lock_set_create;
-	__Request__lock_set_destroy_t Request_lock_set_destroy;
-	__Request__semaphore_create_t Request_semaphore_create;
-	__Request__semaphore_destroy_t Request_semaphore_destroy;
-	__Request__task_policy_set_t Request_task_policy_set;
-	__Request__task_policy_get_t Request_task_policy_get;
-	__Request__task_sample_t Request_task_sample;
-	__Request__task_policy_t Request_task_policy;
-	__Request__task_set_emulation_t Request_task_set_emulation;
-	__Request__task_get_emulation_vector_t Request_task_get_emulation_vector;
-	__Request__task_set_emulation_vector_t Request_task_set_emulation_vector;
-	__Request__task_set_ras_pc_t Request_task_set_ras_pc;
-	__Request__task_assign_t Request_task_assign;
-	__Request__task_assign_default_t Request_task_assign_default;
-	__Request__task_get_assignment_t Request_task_get_assignment;
-	__Request__task_set_policy_t Request_task_set_policy;
-	__Request__task_get_state_t Request_task_get_state;
-	__Request__task_set_state_t Request_task_set_state;
-};
-#endif /* !__RequestUnion__task_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__task_subsystem__defined
-#define __Reply__task_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_task;
-		/* end of the kernel processed data */
-	} __Reply__task_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t act_list;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t act_listCnt;
-	} __Reply__task_threads_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_ports_register_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t init_port_set;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t init_port_setCnt;
-	} __Reply__mach_ports_lookup_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t task_info_outCnt;
-		integer_t task_info_out[10];
-	} __Reply__task_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-	} __Reply__task_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_act;
-		/* end of the kernel processed data */
-	} __Reply__thread_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_act;
-		/* end of the kernel processed data */
-	} __Reply__thread_create_running_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlers[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__task_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlerss[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__task_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_lock_set;
-		/* end of the kernel processed data */
-	} __Reply__lock_set_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__lock_set_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t semaphore;
-		/* end of the kernel processed data */
-	} __Reply__semaphore_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__semaphore_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-		boolean_t get_default;
-	} __Reply__task_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_emulation_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t emulation_vector;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int vector_start;
-		mach_msg_type_number_t emulation_vectorCnt;
-	} __Reply__task_get_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_ras_pc_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t assigned_set;
-		/* end of the kernel processed data */
-	} __Reply__task_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Reply__task_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__task_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__task_subsystem__defined
-#define __ReplyUnion__task_subsystem__defined
-union __ReplyUnion__task_subsystem {
-	__Reply__task_create_t Reply_task_create;
-	__Reply__task_terminate_t Reply_task_terminate;
-	__Reply__task_threads_t Reply_task_threads;
-	__Reply__mach_ports_register_t Reply_mach_ports_register;
-	__Reply__mach_ports_lookup_t Reply_mach_ports_lookup;
-	__Reply__task_info_t Reply_task_info;
-	__Reply__task_set_info_t Reply_task_set_info;
-	__Reply__task_suspend_t Reply_task_suspend;
-	__Reply__task_resume_t Reply_task_resume;
-	__Reply__task_get_special_port_t Reply_task_get_special_port;
-	__Reply__task_set_special_port_t Reply_task_set_special_port;
-	__Reply__thread_create_t Reply_thread_create;
-	__Reply__thread_create_running_t Reply_thread_create_running;
-	__Reply__task_set_exception_ports_t Reply_task_set_exception_ports;
-	__Reply__task_get_exception_ports_t Reply_task_get_exception_ports;
-	__Reply__task_swap_exception_ports_t Reply_task_swap_exception_ports;
-	__Reply__lock_set_create_t Reply_lock_set_create;
-	__Reply__lock_set_destroy_t Reply_lock_set_destroy;
-	__Reply__semaphore_create_t Reply_semaphore_create;
-	__Reply__semaphore_destroy_t Reply_semaphore_destroy;
-	__Reply__task_policy_set_t Reply_task_policy_set;
-	__Reply__task_policy_get_t Reply_task_policy_get;
-	__Reply__task_sample_t Reply_task_sample;
-	__Reply__task_policy_t Reply_task_policy;
-	__Reply__task_set_emulation_t Reply_task_set_emulation;
-	__Reply__task_get_emulation_vector_t Reply_task_get_emulation_vector;
-	__Reply__task_set_emulation_vector_t Reply_task_set_emulation_vector;
-	__Reply__task_set_ras_pc_t Reply_task_set_ras_pc;
-	__Reply__task_assign_t Reply_task_assign;
-	__Reply__task_assign_default_t Reply_task_assign_default;
-	__Reply__task_get_assignment_t Reply_task_get_assignment;
-	__Reply__task_set_policy_t Reply_task_set_policy;
-	__Reply__task_get_state_t Reply_task_get_state;
-	__Reply__task_set_state_t Reply_task_set_state;
-};
-#endif /* !__RequestUnion__task_subsystem__defined */
-
-#ifndef subsystem_to_name_map_task
-#define subsystem_to_name_map_task \
-    { "task_create", 3400 },\
-    { "task_terminate", 3401 },\
-    { "task_threads", 3402 },\
-    { "mach_ports_register", 3403 },\
-    { "mach_ports_lookup", 3404 },\
-    { "task_info", 3405 },\
-    { "task_set_info", 3406 },\
-    { "task_suspend", 3407 },\
-    { "task_resume", 3408 },\
-    { "task_get_special_port", 3409 },\
-    { "task_set_special_port", 3410 },\
-    { "thread_create", 3411 },\
-    { "thread_create_running", 3412 },\
-    { "task_set_exception_ports", 3413 },\
-    { "task_get_exception_ports", 3414 },\
-    { "task_swap_exception_ports", 3415 },\
-    { "lock_set_create", 3416 },\
-    { "lock_set_destroy", 3417 },\
-    { "semaphore_create", 3418 },\
-    { "semaphore_destroy", 3419 },\
-    { "task_policy_set", 3420 },\
-    { "task_policy_get", 3421 },\
-    { "task_sample", 3422 },\
-    { "task_policy", 3423 },\
-    { "task_set_emulation", 3424 },\
-    { "task_get_emulation_vector", 3425 },\
-    { "task_set_emulation_vector", 3426 },\
-    { "task_set_ras_pc", 3427 },\
-    { "task_assign", 3429 },\
-    { "task_assign_default", 3430 },\
-    { "task_get_assignment", 3431 },\
-    { "task_set_policy", 3432 },\
-    { "task_get_state", 3433 },\
-    { "task_set_state", 3434 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _task_user_ */
diff --git a/i386/include/mach/x86_64/.svn/text-base/thread_act.h.svn-base b/i386/include/mach/x86_64/.svn/text-base/thread_act.h.svn-base
deleted file mode 100644
index fde4189..0000000
--- a/i386/include/mach/x86_64/.svn/text-base/thread_act.h.svn-base
+++ /dev/null
@@ -1,1155 +0,0 @@
-#ifndef	_thread_act_user_
-#define	_thread_act_user_
-
-/* Module thread_act */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	thread_act_MSG_COUNT
-#define	thread_act_MSG_COUNT	25
-#endif	/* thread_act_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine thread_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_terminate
-(
-	thread_act_t target_act
-);
-
-/* Routine act_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t act_get_state
-(
-	thread_act_t target_act,
-	int flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-
-/* Routine act_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t act_set_state
-(
-	thread_act_t target_act,
-	int flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-
-/* Routine thread_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_state
-(
-	thread_act_t target_act,
-	thread_state_flavor_t flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-
-/* Routine thread_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_state
-(
-	thread_act_t target_act,
-	thread_state_flavor_t flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-
-/* Routine thread_suspend */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_suspend
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_resume */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_resume
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_abort */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_abort
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_abort_safely */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_abort_safely
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_depress_abort */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_depress_abort
-(
-	thread_act_t thread
-);
-
-/* Routine thread_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_special_port
-(
-	thread_act_t thr_act,
-	int which_port,
-	mach_port_t *special_port
-);
-
-/* Routine thread_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_special_port
-(
-	thread_act_t thr_act,
-	int which_port,
-	mach_port_t special_port
-);
-
-/* Routine thread_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_info
-(
-	thread_act_t target_act,
-	thread_flavor_t flavor,
-	thread_info_t thread_info_out,
-	mach_msg_type_number_t *thread_info_outCnt
-);
-
-/* Routine thread_set_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_exception_ports
-(
-	thread_act_t thread,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor
-);
-
-/* Routine thread_get_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_exception_ports
-(
-	thread_act_t thread,
-	exception_mask_t exception_mask,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlers,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine thread_swap_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_swap_exception_ports
-(
-	thread_act_t thread,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlers,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine thread_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_policy
-(
-	thread_act_t thr_act,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	boolean_t set_limit
-);
-
-/* Routine thread_policy_set */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_policy_set
-(
-	thread_act_t thread,
-	thread_policy_flavor_t flavor,
-	thread_policy_t policy_info,
-	mach_msg_type_number_t policy_infoCnt
-);
-
-/* Routine thread_policy_get */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_policy_get
-(
-	thread_act_t thread,
-	thread_policy_flavor_t flavor,
-	thread_policy_t policy_info,
-	mach_msg_type_number_t *policy_infoCnt,
-	boolean_t *get_default
-);
-
-/* Routine thread_sample */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_sample
-(
-	thread_act_t thread,
-	mach_port_t reply
-);
-
-/* Routine etap_trace_thread */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t etap_trace_thread
-(
-	thread_act_t target_act,
-	boolean_t trace_status
-);
-
-/* Routine thread_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_assign
-(
-	thread_act_t thread,
-	processor_set_t new_set
-);
-
-/* Routine thread_assign_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_assign_default
-(
-	thread_act_t thread
-);
-
-/* Routine thread_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_assignment
-(
-	thread_act_t thread,
-	processor_set_name_t *assigned_set
-);
-
-/* Routine thread_set_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_policy
-(
-	thread_act_t thr_act,
-	processor_set_t pset,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	policy_limit_t limit,
-	mach_msg_type_number_t limitCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__thread_act_subsystem__defined
-#define __Request__thread_act_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-	} __Request__act_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__act_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t old_stateCnt;
-	} __Request__thread_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__thread_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_abort_safely_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_depress_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__thread_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__thread_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_flavor_t flavor;
-		mach_msg_type_number_t thread_info_outCnt;
-	} __Request__thread_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__thread_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-	} __Request__thread_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__thread_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		boolean_t set_limit;
-	} __Request__thread_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-	} __Request__thread_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		boolean_t get_default;
-	} __Request__thread_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t reply;
-		/* end of the kernel processed data */
-	} __Request__thread_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		boolean_t trace_status;
-	} __Request__etap_trace_thread_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_set;
-		/* end of the kernel processed data */
-	} __Request__thread_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t pset;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		mach_msg_type_number_t limitCnt;
-		integer_t limit[1];
-	} __Request__thread_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__thread_act_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__thread_act_subsystem__defined
-#define __RequestUnion__thread_act_subsystem__defined
-union __RequestUnion__thread_act_subsystem {
-	__Request__thread_terminate_t Request_thread_terminate;
-	__Request__act_get_state_t Request_act_get_state;
-	__Request__act_set_state_t Request_act_set_state;
-	__Request__thread_get_state_t Request_thread_get_state;
-	__Request__thread_set_state_t Request_thread_set_state;
-	__Request__thread_suspend_t Request_thread_suspend;
-	__Request__thread_resume_t Request_thread_resume;
-	__Request__thread_abort_t Request_thread_abort;
-	__Request__thread_abort_safely_t Request_thread_abort_safely;
-	__Request__thread_depress_abort_t Request_thread_depress_abort;
-	__Request__thread_get_special_port_t Request_thread_get_special_port;
-	__Request__thread_set_special_port_t Request_thread_set_special_port;
-	__Request__thread_info_t Request_thread_info;
-	__Request__thread_set_exception_ports_t Request_thread_set_exception_ports;
-	__Request__thread_get_exception_ports_t Request_thread_get_exception_ports;
-	__Request__thread_swap_exception_ports_t Request_thread_swap_exception_ports;
-	__Request__thread_policy_t Request_thread_policy;
-	__Request__thread_policy_set_t Request_thread_policy_set;
-	__Request__thread_policy_get_t Request_thread_policy_get;
-	__Request__thread_sample_t Request_thread_sample;
-	__Request__etap_trace_thread_t Request_etap_trace_thread;
-	__Request__thread_assign_t Request_thread_assign;
-	__Request__thread_assign_default_t Request_thread_assign_default;
-	__Request__thread_get_assignment_t Request_thread_get_assignment;
-	__Request__thread_set_policy_t Request_thread_set_policy;
-};
-#endif /* !__RequestUnion__thread_act_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__thread_act_subsystem__defined
-#define __Reply__thread_act_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Reply__act_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__act_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Reply__thread_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_abort_safely_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_depress_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-	} __Reply__thread_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t thread_info_outCnt;
-		integer_t thread_info_out[12];
-	} __Reply__thread_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlers[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__thread_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlers[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__thread_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-		boolean_t get_default;
-	} __Reply__thread_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__etap_trace_thread_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t assigned_set;
-		/* end of the kernel processed data */
-	} __Reply__thread_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__thread_act_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__thread_act_subsystem__defined
-#define __ReplyUnion__thread_act_subsystem__defined
-union __ReplyUnion__thread_act_subsystem {
-	__Reply__thread_terminate_t Reply_thread_terminate;
-	__Reply__act_get_state_t Reply_act_get_state;
-	__Reply__act_set_state_t Reply_act_set_state;
-	__Reply__thread_get_state_t Reply_thread_get_state;
-	__Reply__thread_set_state_t Reply_thread_set_state;
-	__Reply__thread_suspend_t Reply_thread_suspend;
-	__Reply__thread_resume_t Reply_thread_resume;
-	__Reply__thread_abort_t Reply_thread_abort;
-	__Reply__thread_abort_safely_t Reply_thread_abort_safely;
-	__Reply__thread_depress_abort_t Reply_thread_depress_abort;
-	__Reply__thread_get_special_port_t Reply_thread_get_special_port;
-	__Reply__thread_set_special_port_t Reply_thread_set_special_port;
-	__Reply__thread_info_t Reply_thread_info;
-	__Reply__thread_set_exception_ports_t Reply_thread_set_exception_ports;
-	__Reply__thread_get_exception_ports_t Reply_thread_get_exception_ports;
-	__Reply__thread_swap_exception_ports_t Reply_thread_swap_exception_ports;
-	__Reply__thread_policy_t Reply_thread_policy;
-	__Reply__thread_policy_set_t Reply_thread_policy_set;
-	__Reply__thread_policy_get_t Reply_thread_policy_get;
-	__Reply__thread_sample_t Reply_thread_sample;
-	__Reply__etap_trace_thread_t Reply_etap_trace_thread;
-	__Reply__thread_assign_t Reply_thread_assign;
-	__Reply__thread_assign_default_t Reply_thread_assign_default;
-	__Reply__thread_get_assignment_t Reply_thread_get_assignment;
-	__Reply__thread_set_policy_t Reply_thread_set_policy;
-};
-#endif /* !__RequestUnion__thread_act_subsystem__defined */
-
-#ifndef subsystem_to_name_map_thread_act
-#define subsystem_to_name_map_thread_act \
-    { "thread_terminate", 3600 },\
-    { "act_get_state", 3601 },\
-    { "act_set_state", 3602 },\
-    { "thread_get_state", 3603 },\
-    { "thread_set_state", 3604 },\
-    { "thread_suspend", 3605 },\
-    { "thread_resume", 3606 },\
-    { "thread_abort", 3607 },\
-    { "thread_abort_safely", 3608 },\
-    { "thread_depress_abort", 3609 },\
-    { "thread_get_special_port", 3610 },\
-    { "thread_set_special_port", 3611 },\
-    { "thread_info", 3612 },\
-    { "thread_set_exception_ports", 3613 },\
-    { "thread_get_exception_ports", 3614 },\
-    { "thread_swap_exception_ports", 3615 },\
-    { "thread_policy", 3616 },\
-    { "thread_policy_set", 3617 },\
-    { "thread_policy_get", 3618 },\
-    { "thread_sample", 3619 },\
-    { "etap_trace_thread", 3620 },\
-    { "thread_assign", 3621 },\
-    { "thread_assign_default", 3622 },\
-    { "thread_get_assignment", 3623 },\
-    { "thread_set_policy", 3624 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _thread_act_user_ */
diff --git a/i386/include/mach/x86_64/task.h b/i386/include/mach/x86_64/task.h
deleted file mode 100644
index 15c8248..0000000
--- a/i386/include/mach/x86_64/task.h
+++ /dev/null
@@ -1,1578 +0,0 @@
-#ifndef	_task_user_
-#define	_task_user_
-
-/* Module task */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	task_MSG_COUNT
-#define	task_MSG_COUNT	35
-#endif	/* task_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine task_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_create
-(
-	task_t target_task,
-	ledger_array_t ledgers,
-	mach_msg_type_number_t ledgersCnt,
-	boolean_t inherit_memory,
-	task_t *child_task
-);
-
-/* Routine task_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_terminate
-(
-	task_t target_task
-);
-
-/* Routine task_threads */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_threads
-(
-	task_t target_task,
-	thread_act_array_t *act_list,
-	mach_msg_type_number_t *act_listCnt
-);
-
-/* Routine mach_ports_register */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_ports_register
-(
-	task_t target_task,
-	mach_port_array_t init_port_set,
-	mach_msg_type_number_t init_port_setCnt
-);
-
-/* Routine mach_ports_lookup */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_ports_lookup
-(
-	task_t target_task,
-	mach_port_array_t *init_port_set,
-	mach_msg_type_number_t *init_port_setCnt
-);
-
-/* Routine task_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_info
-(
-	task_name_t target_task,
-	task_flavor_t flavor,
-	task_info_t task_info_out,
-	mach_msg_type_number_t *task_info_outCnt
-);
-
-/* Routine task_set_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_info
-(
-	task_t target_task,
-	task_flavor_t flavor,
-	task_info_t task_info_in,
-	mach_msg_type_number_t task_info_inCnt
-);
-
-/* Routine task_suspend */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_suspend
-(
-	task_t target_task
-);
-
-/* Routine task_resume */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_resume
-(
-	task_t target_task
-);
-
-/* Routine task_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_special_port
-(
-	task_t task,
-	int which_port,
-	mach_port_t *special_port
-);
-
-/* Routine task_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_special_port
-(
-	task_t task,
-	int which_port,
-	mach_port_t special_port
-);
-
-/* Routine thread_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_create
-(
-	task_t parent_task,
-	thread_act_t *child_act
-);
-
-/* Routine thread_create_running */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_create_running
-(
-	task_t parent_task,
-	thread_state_flavor_t flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt,
-	thread_act_t *child_act
-);
-
-/* Routine task_set_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_exception_ports
-(
-	task_t task,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor
-);
-
-/* Routine task_get_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_exception_ports
-(
-	task_t task,
-	exception_mask_t exception_mask,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlers,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine task_swap_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_swap_exception_ports
-(
-	task_t task,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlerss,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine lock_set_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_set_create
-(
-	task_t task,
-	lock_set_t *new_lock_set,
-	int n_ulocks,
-	int policy
-);
-
-/* Routine lock_set_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_set_destroy
-(
-	task_t task,
-	lock_set_t lock_set
-);
-
-/* Routine semaphore_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t semaphore_create
-(
-	task_t task,
-	semaphore_t *semaphore,
-	int policy,
-	int value
-);
-
-/* Routine semaphore_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t semaphore_destroy
-(
-	task_t task,
-	semaphore_t semaphore
-);
-
-/* Routine task_policy_set */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_policy_set
-(
-	task_t task,
-	task_policy_flavor_t flavor,
-	task_policy_t policy_info,
-	mach_msg_type_number_t policy_infoCnt
-);
-
-/* Routine task_policy_get */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_policy_get
-(
-	task_t task,
-	task_policy_flavor_t flavor,
-	task_policy_t policy_info,
-	mach_msg_type_number_t *policy_infoCnt,
-	boolean_t *get_default
-);
-
-/* Routine task_sample */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_sample
-(
-	task_t task,
-	mach_port_t reply
-);
-
-/* Routine task_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_policy
-(
-	task_t task,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	boolean_t set_limit,
-	boolean_t change
-);
-
-/* Routine task_set_emulation */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_emulation
-(
-	task_t target_port,
-	vm_address_t routine_entry_pt,
-	int routine_number
-);
-
-/* Routine task_get_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_emulation_vector
-(
-	task_t task,
-	int *vector_start,
-	emulation_vector_t *emulation_vector,
-	mach_msg_type_number_t *emulation_vectorCnt
-);
-
-/* Routine task_set_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_emulation_vector
-(
-	task_t task,
-	int vector_start,
-	emulation_vector_t emulation_vector,
-	mach_msg_type_number_t emulation_vectorCnt
-);
-
-/* Routine task_set_ras_pc */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_ras_pc
-(
-	task_t target_task,
-	vm_address_t basepc,
-	vm_address_t boundspc
-);
-
-/* Routine task_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_assign
-(
-	task_t task,
-	processor_set_t new_set,
-	boolean_t assign_threads
-);
-
-/* Routine task_assign_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_assign_default
-(
-	task_t task,
-	boolean_t assign_threads
-);
-
-/* Routine task_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_assignment
-(
-	task_t task,
-	processor_set_name_t *assigned_set
-);
-
-/* Routine task_set_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_policy
-(
-	task_t task,
-	processor_set_t pset,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	policy_limit_t limit,
-	mach_msg_type_number_t limitCnt,
-	boolean_t change
-);
-
-/* Routine task_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_state
-(
-	task_t task,
-	thread_state_flavor_t flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-
-/* Routine task_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_state
-(
-	task_t task,
-	thread_state_flavor_t flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__task_subsystem__defined
-#define __Request__task_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t ledgers;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t ledgersCnt;
-		boolean_t inherit_memory;
-	} __Request__task_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_threads_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t init_port_set;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t init_port_setCnt;
-	} __Request__mach_ports_register_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__mach_ports_lookup_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_flavor_t flavor;
-		mach_msg_type_number_t task_info_outCnt;
-	} __Request__task_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_flavor_t flavor;
-		mach_msg_type_number_t task_info_inCnt;
-		integer_t task_info_in[10];
-	} __Request__task_set_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__task_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__task_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__thread_create_running_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__task_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-	} __Request__task_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__task_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int n_ulocks;
-		int policy;
-	} __Request__lock_set_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t lock_set;
-		/* end of the kernel processed data */
-	} __Request__lock_set_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int policy;
-		int value;
-	} __Request__semaphore_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t semaphore;
-		/* end of the kernel processed data */
-	} __Request__semaphore_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-	} __Request__task_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		boolean_t get_default;
-	} __Request__task_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t reply;
-		/* end of the kernel processed data */
-	} __Request__task_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		boolean_t set_limit;
-		boolean_t change;
-	} __Request__task_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t routine_entry_pt;
-		int routine_number;
-	} __Request__task_set_emulation_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_get_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t emulation_vector;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int vector_start;
-		mach_msg_type_number_t emulation_vectorCnt;
-	} __Request__task_set_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t basepc;
-		vm_address_t boundspc;
-	} __Request__task_set_ras_pc_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_set;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		boolean_t assign_threads;
-	} __Request__task_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		boolean_t assign_threads;
-	} __Request__task_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t pset;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		mach_msg_type_number_t limitCnt;
-		integer_t limit[1];
-		boolean_t change;
-	} __Request__task_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t old_stateCnt;
-	} __Request__task_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__task_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__task_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__task_subsystem__defined
-#define __RequestUnion__task_subsystem__defined
-union __RequestUnion__task_subsystem {
-	__Request__task_create_t Request_task_create;
-	__Request__task_terminate_t Request_task_terminate;
-	__Request__task_threads_t Request_task_threads;
-	__Request__mach_ports_register_t Request_mach_ports_register;
-	__Request__mach_ports_lookup_t Request_mach_ports_lookup;
-	__Request__task_info_t Request_task_info;
-	__Request__task_set_info_t Request_task_set_info;
-	__Request__task_suspend_t Request_task_suspend;
-	__Request__task_resume_t Request_task_resume;
-	__Request__task_get_special_port_t Request_task_get_special_port;
-	__Request__task_set_special_port_t Request_task_set_special_port;
-	__Request__thread_create_t Request_thread_create;
-	__Request__thread_create_running_t Request_thread_create_running;
-	__Request__task_set_exception_ports_t Request_task_set_exception_ports;
-	__Request__task_get_exception_ports_t Request_task_get_exception_ports;
-	__Request__task_swap_exception_ports_t Request_task_swap_exception_ports;
-	__Request__lock_set_create_t Request_lock_set_create;
-	__Request__lock_set_destroy_t Request_lock_set_destroy;
-	__Request__semaphore_create_t Request_semaphore_create;
-	__Request__semaphore_destroy_t Request_semaphore_destroy;
-	__Request__task_policy_set_t Request_task_policy_set;
-	__Request__task_policy_get_t Request_task_policy_get;
-	__Request__task_sample_t Request_task_sample;
-	__Request__task_policy_t Request_task_policy;
-	__Request__task_set_emulation_t Request_task_set_emulation;
-	__Request__task_get_emulation_vector_t Request_task_get_emulation_vector;
-	__Request__task_set_emulation_vector_t Request_task_set_emulation_vector;
-	__Request__task_set_ras_pc_t Request_task_set_ras_pc;
-	__Request__task_assign_t Request_task_assign;
-	__Request__task_assign_default_t Request_task_assign_default;
-	__Request__task_get_assignment_t Request_task_get_assignment;
-	__Request__task_set_policy_t Request_task_set_policy;
-	__Request__task_get_state_t Request_task_get_state;
-	__Request__task_set_state_t Request_task_set_state;
-};
-#endif /* !__RequestUnion__task_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__task_subsystem__defined
-#define __Reply__task_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_task;
-		/* end of the kernel processed data */
-	} __Reply__task_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t act_list;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t act_listCnt;
-	} __Reply__task_threads_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_ports_register_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t init_port_set;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t init_port_setCnt;
-	} __Reply__mach_ports_lookup_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t task_info_outCnt;
-		integer_t task_info_out[10];
-	} __Reply__task_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-	} __Reply__task_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_act;
-		/* end of the kernel processed data */
-	} __Reply__thread_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_act;
-		/* end of the kernel processed data */
-	} __Reply__thread_create_running_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlers[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__task_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlerss[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__task_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_lock_set;
-		/* end of the kernel processed data */
-	} __Reply__lock_set_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__lock_set_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t semaphore;
-		/* end of the kernel processed data */
-	} __Reply__semaphore_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__semaphore_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-		boolean_t get_default;
-	} __Reply__task_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_emulation_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t emulation_vector;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int vector_start;
-		mach_msg_type_number_t emulation_vectorCnt;
-	} __Reply__task_get_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_ras_pc_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t assigned_set;
-		/* end of the kernel processed data */
-	} __Reply__task_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Reply__task_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__task_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__task_subsystem__defined
-#define __ReplyUnion__task_subsystem__defined
-union __ReplyUnion__task_subsystem {
-	__Reply__task_create_t Reply_task_create;
-	__Reply__task_terminate_t Reply_task_terminate;
-	__Reply__task_threads_t Reply_task_threads;
-	__Reply__mach_ports_register_t Reply_mach_ports_register;
-	__Reply__mach_ports_lookup_t Reply_mach_ports_lookup;
-	__Reply__task_info_t Reply_task_info;
-	__Reply__task_set_info_t Reply_task_set_info;
-	__Reply__task_suspend_t Reply_task_suspend;
-	__Reply__task_resume_t Reply_task_resume;
-	__Reply__task_get_special_port_t Reply_task_get_special_port;
-	__Reply__task_set_special_port_t Reply_task_set_special_port;
-	__Reply__thread_create_t Reply_thread_create;
-	__Reply__thread_create_running_t Reply_thread_create_running;
-	__Reply__task_set_exception_ports_t Reply_task_set_exception_ports;
-	__Reply__task_get_exception_ports_t Reply_task_get_exception_ports;
-	__Reply__task_swap_exception_ports_t Reply_task_swap_exception_ports;
-	__Reply__lock_set_create_t Reply_lock_set_create;
-	__Reply__lock_set_destroy_t Reply_lock_set_destroy;
-	__Reply__semaphore_create_t Reply_semaphore_create;
-	__Reply__semaphore_destroy_t Reply_semaphore_destroy;
-	__Reply__task_policy_set_t Reply_task_policy_set;
-	__Reply__task_policy_get_t Reply_task_policy_get;
-	__Reply__task_sample_t Reply_task_sample;
-	__Reply__task_policy_t Reply_task_policy;
-	__Reply__task_set_emulation_t Reply_task_set_emulation;
-	__Reply__task_get_emulation_vector_t Reply_task_get_emulation_vector;
-	__Reply__task_set_emulation_vector_t Reply_task_set_emulation_vector;
-	__Reply__task_set_ras_pc_t Reply_task_set_ras_pc;
-	__Reply__task_assign_t Reply_task_assign;
-	__Reply__task_assign_default_t Reply_task_assign_default;
-	__Reply__task_get_assignment_t Reply_task_get_assignment;
-	__Reply__task_set_policy_t Reply_task_set_policy;
-	__Reply__task_get_state_t Reply_task_get_state;
-	__Reply__task_set_state_t Reply_task_set_state;
-};
-#endif /* !__RequestUnion__task_subsystem__defined */
-
-#ifndef subsystem_to_name_map_task
-#define subsystem_to_name_map_task \
-    { "task_create", 3400 },\
-    { "task_terminate", 3401 },\
-    { "task_threads", 3402 },\
-    { "mach_ports_register", 3403 },\
-    { "mach_ports_lookup", 3404 },\
-    { "task_info", 3405 },\
-    { "task_set_info", 3406 },\
-    { "task_suspend", 3407 },\
-    { "task_resume", 3408 },\
-    { "task_get_special_port", 3409 },\
-    { "task_set_special_port", 3410 },\
-    { "thread_create", 3411 },\
-    { "thread_create_running", 3412 },\
-    { "task_set_exception_ports", 3413 },\
-    { "task_get_exception_ports", 3414 },\
-    { "task_swap_exception_ports", 3415 },\
-    { "lock_set_create", 3416 },\
-    { "lock_set_destroy", 3417 },\
-    { "semaphore_create", 3418 },\
-    { "semaphore_destroy", 3419 },\
-    { "task_policy_set", 3420 },\
-    { "task_policy_get", 3421 },\
-    { "task_sample", 3422 },\
-    { "task_policy", 3423 },\
-    { "task_set_emulation", 3424 },\
-    { "task_get_emulation_vector", 3425 },\
-    { "task_set_emulation_vector", 3426 },\
-    { "task_set_ras_pc", 3427 },\
-    { "task_assign", 3429 },\
-    { "task_assign_default", 3430 },\
-    { "task_get_assignment", 3431 },\
-    { "task_set_policy", 3432 },\
-    { "task_get_state", 3433 },\
-    { "task_set_state", 3434 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _task_user_ */
diff --git a/i386/include/mach/x86_64/thread_act.h b/i386/include/mach/x86_64/thread_act.h
deleted file mode 100644
index fde4189..0000000
--- a/i386/include/mach/x86_64/thread_act.h
+++ /dev/null
@@ -1,1155 +0,0 @@
-#ifndef	_thread_act_user_
-#define	_thread_act_user_
-
-/* Module thread_act */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	thread_act_MSG_COUNT
-#define	thread_act_MSG_COUNT	25
-#endif	/* thread_act_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine thread_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_terminate
-(
-	thread_act_t target_act
-);
-
-/* Routine act_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t act_get_state
-(
-	thread_act_t target_act,
-	int flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-
-/* Routine act_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t act_set_state
-(
-	thread_act_t target_act,
-	int flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-
-/* Routine thread_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_state
-(
-	thread_act_t target_act,
-	thread_state_flavor_t flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-
-/* Routine thread_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_state
-(
-	thread_act_t target_act,
-	thread_state_flavor_t flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-
-/* Routine thread_suspend */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_suspend
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_resume */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_resume
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_abort */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_abort
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_abort_safely */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_abort_safely
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_depress_abort */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_depress_abort
-(
-	thread_act_t thread
-);
-
-/* Routine thread_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_special_port
-(
-	thread_act_t thr_act,
-	int which_port,
-	mach_port_t *special_port
-);
-
-/* Routine thread_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_special_port
-(
-	thread_act_t thr_act,
-	int which_port,
-	mach_port_t special_port
-);
-
-/* Routine thread_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_info
-(
-	thread_act_t target_act,
-	thread_flavor_t flavor,
-	thread_info_t thread_info_out,
-	mach_msg_type_number_t *thread_info_outCnt
-);
-
-/* Routine thread_set_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_exception_ports
-(
-	thread_act_t thread,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor
-);
-
-/* Routine thread_get_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_exception_ports
-(
-	thread_act_t thread,
-	exception_mask_t exception_mask,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlers,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine thread_swap_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_swap_exception_ports
-(
-	thread_act_t thread,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlers,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine thread_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_policy
-(
-	thread_act_t thr_act,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	boolean_t set_limit
-);
-
-/* Routine thread_policy_set */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_policy_set
-(
-	thread_act_t thread,
-	thread_policy_flavor_t flavor,
-	thread_policy_t policy_info,
-	mach_msg_type_number_t policy_infoCnt
-);
-
-/* Routine thread_policy_get */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_policy_get
-(
-	thread_act_t thread,
-	thread_policy_flavor_t flavor,
-	thread_policy_t policy_info,
-	mach_msg_type_number_t *policy_infoCnt,
-	boolean_t *get_default
-);
-
-/* Routine thread_sample */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_sample
-(
-	thread_act_t thread,
-	mach_port_t reply
-);
-
-/* Routine etap_trace_thread */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t etap_trace_thread
-(
-	thread_act_t target_act,
-	boolean_t trace_status
-);
-
-/* Routine thread_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_assign
-(
-	thread_act_t thread,
-	processor_set_t new_set
-);
-
-/* Routine thread_assign_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_assign_default
-(
-	thread_act_t thread
-);
-
-/* Routine thread_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_assignment
-(
-	thread_act_t thread,
-	processor_set_name_t *assigned_set
-);
-
-/* Routine thread_set_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_policy
-(
-	thread_act_t thr_act,
-	processor_set_t pset,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	policy_limit_t limit,
-	mach_msg_type_number_t limitCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__thread_act_subsystem__defined
-#define __Request__thread_act_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-	} __Request__act_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__act_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t old_stateCnt;
-	} __Request__thread_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__thread_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_abort_safely_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_depress_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__thread_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__thread_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_flavor_t flavor;
-		mach_msg_type_number_t thread_info_outCnt;
-	} __Request__thread_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__thread_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-	} __Request__thread_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__thread_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		boolean_t set_limit;
-	} __Request__thread_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-	} __Request__thread_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		boolean_t get_default;
-	} __Request__thread_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t reply;
-		/* end of the kernel processed data */
-	} __Request__thread_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		boolean_t trace_status;
-	} __Request__etap_trace_thread_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_set;
-		/* end of the kernel processed data */
-	} __Request__thread_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t pset;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		mach_msg_type_number_t limitCnt;
-		integer_t limit[1];
-	} __Request__thread_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__thread_act_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__thread_act_subsystem__defined
-#define __RequestUnion__thread_act_subsystem__defined
-union __RequestUnion__thread_act_subsystem {
-	__Request__thread_terminate_t Request_thread_terminate;
-	__Request__act_get_state_t Request_act_get_state;
-	__Request__act_set_state_t Request_act_set_state;
-	__Request__thread_get_state_t Request_thread_get_state;
-	__Request__thread_set_state_t Request_thread_set_state;
-	__Request__thread_suspend_t Request_thread_suspend;
-	__Request__thread_resume_t Request_thread_resume;
-	__Request__thread_abort_t Request_thread_abort;
-	__Request__thread_abort_safely_t Request_thread_abort_safely;
-	__Request__thread_depress_abort_t Request_thread_depress_abort;
-	__Request__thread_get_special_port_t Request_thread_get_special_port;
-	__Request__thread_set_special_port_t Request_thread_set_special_port;
-	__Request__thread_info_t Request_thread_info;
-	__Request__thread_set_exception_ports_t Request_thread_set_exception_ports;
-	__Request__thread_get_exception_ports_t Request_thread_get_exception_ports;
-	__Request__thread_swap_exception_ports_t Request_thread_swap_exception_ports;
-	__Request__thread_policy_t Request_thread_policy;
-	__Request__thread_policy_set_t Request_thread_policy_set;
-	__Request__thread_policy_get_t Request_thread_policy_get;
-	__Request__thread_sample_t Request_thread_sample;
-	__Request__etap_trace_thread_t Request_etap_trace_thread;
-	__Request__thread_assign_t Request_thread_assign;
-	__Request__thread_assign_default_t Request_thread_assign_default;
-	__Request__thread_get_assignment_t Request_thread_get_assignment;
-	__Request__thread_set_policy_t Request_thread_set_policy;
-};
-#endif /* !__RequestUnion__thread_act_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__thread_act_subsystem__defined
-#define __Reply__thread_act_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Reply__act_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__act_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Reply__thread_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_abort_safely_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_depress_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-	} __Reply__thread_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t thread_info_outCnt;
-		integer_t thread_info_out[12];
-	} __Reply__thread_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlers[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__thread_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlers[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__thread_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-		boolean_t get_default;
-	} __Reply__thread_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__etap_trace_thread_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t assigned_set;
-		/* end of the kernel processed data */
-	} __Reply__thread_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__thread_act_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__thread_act_subsystem__defined
-#define __ReplyUnion__thread_act_subsystem__defined
-union __ReplyUnion__thread_act_subsystem {
-	__Reply__thread_terminate_t Reply_thread_terminate;
-	__Reply__act_get_state_t Reply_act_get_state;
-	__Reply__act_set_state_t Reply_act_set_state;
-	__Reply__thread_get_state_t Reply_thread_get_state;
-	__Reply__thread_set_state_t Reply_thread_set_state;
-	__Reply__thread_suspend_t Reply_thread_suspend;
-	__Reply__thread_resume_t Reply_thread_resume;
-	__Reply__thread_abort_t Reply_thread_abort;
-	__Reply__thread_abort_safely_t Reply_thread_abort_safely;
-	__Reply__thread_depress_abort_t Reply_thread_depress_abort;
-	__Reply__thread_get_special_port_t Reply_thread_get_special_port;
-	__Reply__thread_set_special_port_t Reply_thread_set_special_port;
-	__Reply__thread_info_t Reply_thread_info;
-	__Reply__thread_set_exception_ports_t Reply_thread_set_exception_ports;
-	__Reply__thread_get_exception_ports_t Reply_thread_get_exception_ports;
-	__Reply__thread_swap_exception_ports_t Reply_thread_swap_exception_ports;
-	__Reply__thread_policy_t Reply_thread_policy;
-	__Reply__thread_policy_set_t Reply_thread_policy_set;
-	__Reply__thread_policy_get_t Reply_thread_policy_get;
-	__Reply__thread_sample_t Reply_thread_sample;
-	__Reply__etap_trace_thread_t Reply_etap_trace_thread;
-	__Reply__thread_assign_t Reply_thread_assign;
-	__Reply__thread_assign_default_t Reply_thread_assign_default;
-	__Reply__thread_get_assignment_t Reply_thread_get_assignment;
-	__Reply__thread_set_policy_t Reply_thread_set_policy;
-};
-#endif /* !__RequestUnion__thread_act_subsystem__defined */
-
-#ifndef subsystem_to_name_map_thread_act
-#define subsystem_to_name_map_thread_act \
-    { "thread_terminate", 3600 },\
-    { "act_get_state", 3601 },\
-    { "act_set_state", 3602 },\
-    { "thread_get_state", 3603 },\
-    { "thread_set_state", 3604 },\
-    { "thread_suspend", 3605 },\
-    { "thread_resume", 3606 },\
-    { "thread_abort", 3607 },\
-    { "thread_abort_safely", 3608 },\
-    { "thread_depress_abort", 3609 },\
-    { "thread_get_special_port", 3610 },\
-    { "thread_set_special_port", 3611 },\
-    { "thread_info", 3612 },\
-    { "thread_set_exception_ports", 3613 },\
-    { "thread_get_exception_ports", 3614 },\
-    { "thread_swap_exception_ports", 3615 },\
-    { "thread_policy", 3616 },\
-    { "thread_policy_set", 3617 },\
-    { "thread_policy_get", 3618 },\
-    { "thread_sample", 3619 },\
-    { "etap_trace_thread", 3620 },\
-    { "thread_assign", 3621 },\
-    { "thread_assign_default", 3622 },\
-    { "thread_get_assignment", 3623 },\
-    { "thread_set_policy", 3624 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _thread_act_user_ */

From f61eb274020816a4c98369dc412a8655e7582618 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 11 Nov 2012 16:15:16 +0100
Subject: [PATCH 131/623] Eliminate -Wl,-alias,boot2,start requirement

---
 i386/boot2/boot2.s | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/boot2/boot2.s b/i386/boot2/boot2.s
index b9e1519..98de95f 100755
--- a/i386/boot2/boot2.s
+++ b/i386/boot2/boot2.s
@@ -61,7 +61,7 @@
 #
 # Returns:
 #
-LABEL(boot2)                    # Entry point at 0:BOOTER_ADDR (will be called by boot1)
+LABEL(start)                    # Entry point at 0:BOOTER_ADDR (will be called by boot1)
     pushl   %ecx                # Save general purpose registers
     pushl   %ebx
     pushl   %ebp

From 64d5dcf598909111e5fc9a19aeb59b07dde801b8 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 11 Nov 2012 16:19:03 +0100
Subject: [PATCH 132/623] Eliminate -Wl,-alias,boot2,start requirement

---
 i386/boot2/Makefile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index d69d15d..1feed42 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -48,14 +48,18 @@ MAXBOOTSIZE = 131072
 $(MAKEGOAL): $(DIRS_NEEDED) boot
 
 boot: machOconv $(OBJS) $(LIBDEP)
-	@$(CC) -Wl,-preload -Wl,-alias,boot2,start \
-		-nostdlib -arch i386  -Wl,-pie \
+	@$(CC)	-nostdlib -arch i386 \
+		-Wl,-preload \
+		-Wl,-pie \
+		-Wl,-segalign,20 \
 		-Wl,-read_only_relocs,suppress \
 		-lcc_kext \
 		$(filter %.o,$^) $(LIBS) \
 		-o ${SYMROOT}/$@.sys
+
 	@echo "\t[LD] boot.sys"
-	@$(CC) -Wl,-preload -Wl,-alias,boot2,start \
+	@$(CC)	-Wl,static \
+		-Wl,-preload \
 		-nostdlib -arch i386  -Wl,-pie \
 		-Wl,-segalign,20 \
 		-Wl,-segaddr,__INIT,`echo obase=16\; $$((0x${BOOT2ADDR})) | bc` \
@@ -65,8 +69,10 @@ boot: machOconv $(OBJS) $(LIBDEP)
 		-lcc_kext \
 		$(filter %.o,$^) $(LIBS) \
 		-o ${SYMROOT}/$@.sys
+
 	@echo "\t[MACHOCONV] boot"
 	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
+
 	@( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \
 	  if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\
 	  then \

From ebe4f99915fd2d3b278caddb70ac58d4c491d833 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 12 Nov 2012 01:07:23 +0100
Subject: [PATCH 133/623] Simplified calls to segsize

---
 i386/boot2/Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 1feed42..9b02229 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -3,9 +3,11 @@
 #
 # Updates:
 #
-#			- Support for self compiled libcc_kext.a added (PikerAlpha, October 2012).
-#			- Major cleanup (PikerAlpha, October 2012).
-#			- Fixed clang compilation (dgsga, November 2012. Credits to Evan Lojewski for original work).
+#		- Support for self compiled libcc_kext.a added (PikerAlpha, October 2012).
+#		- Major cleanup (PikerAlpha, October 2012).
+#		- Fixed clang compilation (dgsga, November 2012. Credits to Evan Lojewski for original work).
+#		- BOOT2ADDR moved to RevoBoot/i386/util/segsize.c (PikerAlpha, November 2012).
+#		- Simplified calls to RevoBoot/i386/util/segsize (PikerAlpha, November 2012).
 #
 
 
@@ -62,9 +64,9 @@ boot: machOconv $(OBJS) $(LIBDEP)
 		-Wl,-preload \
 		-nostdlib -arch i386  -Wl,-pie \
 		-Wl,-segalign,20 \
-		-Wl,-segaddr,__INIT,`echo obase=16\; $$((0x${BOOT2ADDR})) | bc` \
-		-Wl,-segaddr,__TEXT,`echo obase=16\; $$((0x${BOOT2ADDR})) + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __INIT\` | bc` \
-		-Wl,-segaddr,__DATA,`echo obase=16\; $$((0x${BOOT2ADDR})) + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __INIT\` + \`${SYMROOT}/segsize ${SYMROOT}/$@.sys __TEXT\` | bc` \
+		-Wl,-segaddr,__INIT,`${SYMROOT}/segsize __INIT` \
+		-Wl,-segaddr,__TEXT,`${SYMROOT}/segsize __TEXT` \
+		-Wl,-segaddr,__DATA,`${SYMROOT}/segsize __DATA` \
 		-Wl,-read_only_relocs,suppress \
 		-lcc_kext \
 		$(filter %.o,$^) $(LIBS) \

From b149432dd43bb92bd92111072a5a455e610ec61f Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 12 Nov 2012 01:08:28 +0100
Subject: [PATCH 134/623] Reformat and single pass runs

---
 i386/util/segsize.c | 169 ++++++++++++++++++++++++++++----------------
 1 file changed, 108 insertions(+), 61 deletions(-)

diff --git a/i386/util/segsize.c b/i386/util/segsize.c
index 592878a..2608bfd 100644
--- a/i386/util/segsize.c
+++ b/i386/util/segsize.c
@@ -20,7 +20,16 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ * Updates:
+ *			- Reformated and cleanups (PikerAlpha, November 2012)
+  *			- Single pass runs for all target segment names (PikerAlpha, November 2012)
+ *
+ *
+ * Note:	RevoBoot/i386/boot2/Makefile calls this tool to calculate segment sizes, example:
+ *			-segaddr __INIT 20200 -segaddr __TEXT 20480 -segaddr __DATA 2C6E0
  */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -31,98 +40,136 @@
 #include <libkern/OSByteOrder.h>
 #include <unistd.h>
 
-int	infile;
+int infile;
 
 struct mach_header	mh;
-void *		cmds;
+
+void * cmds;
 
 static bool	swap_ends;
 
-static unsigned long swap(
-						  unsigned long x
-						  )
+//==========================================================================
+
+static unsigned long swap(unsigned long x)
 {
-    if (swap_ends)
+	if (swap_ends)
+	{
 		return OSSwapInt32(x);
-    else
+	}
+	else
+	{
 		return x;
+	}
 }
 
-int
-main(int argc, char *argv[])
+//==========================================================================
+
+int main(int argc, char *argv[])
 {
-    int			nc, ncmds;
-    char *		cp;
-    
-    if (argc == 3) {
-		infile = open(argv[1], O_RDONLY);
-		if (infile < 0)
-			goto usage;
-    }
-    else {
-	usage:
-    	fprintf(stderr, "usage: segsize segment\n");
+	int nc, ncmds;
+	char *cp;
+	long boot2Address = 0x20200L;
+
+	if (argc != 2)
+	{
+		fprintf(stderr, "Usage: ./segsize [__INIT/__TEXT/__DATA]\n");
+		exit(1);
+	}
+	else if (strcmp(argv[1], "__INIT") == 0)
+	{
+		printf("%lX\n", boot2Address);
+		exit(0);
+	}
+
+	infile = open("../../sym/i386/boot.sys", O_RDONLY);
+
+	if (infile < 0)
+	{
+		fprintf(stderr, "Error: boot.sys Not Found\n");
 		exit(1);
-    }
-    
-    nc = read(infile, &mh, sizeof (mh));
-    if (nc < 0) {
+	}
+
+	nc = read(infile, &mh, sizeof (mh));
+
+	if (nc < 0)
+	{
 		perror("read mach header");
 		exit(1);
-    }
-    if (nc < (int)sizeof (mh)) {
+	}
+
+	if (nc < (int)sizeof (mh))
+	{
 		fprintf(stderr, "read mach header: premature EOF %d\n", nc);
 		exit(1);
-    }
-    if (mh.magic == MH_MAGIC)
+	}
+
+	if (mh.magic == MH_MAGIC)
+	{
 		swap_ends = false;
-    else if (mh.magic == MH_CIGAM)
+	}
+	else if (mh.magic == MH_CIGAM)
+	{
 		swap_ends = true;
-    else {
-    	fprintf(stderr, "bad magic number %lx\n", (unsigned long)mh.magic);
+	}
+	else
+	{
+		fprintf(stderr, "bad magic number %lx\n", (unsigned long)mh.magic);
 		exit(1);
-    }
+	}
 	
-    cmds = calloc(swap(mh.sizeofcmds), sizeof (char));
-    if (cmds == 0) {
+	cmds = calloc(swap(mh.sizeofcmds), sizeof (char));
+
+	if (cmds == 0)
+	{
 		fprintf(stderr, "alloc load commands: no memory\n");
 		exit(1);
-    }
-    nc = read(infile, cmds, swap(mh.sizeofcmds));
-    if (nc < 0) {
+	}
+
+	nc = read(infile, cmds, swap(mh.sizeofcmds));
+
+	if (nc < 0)
+	{
 		perror("read load commands");
 		exit(1);
-    }
-    if (nc < (int)swap(mh.sizeofcmds)) {
+	}
+
+	if (nc < (int)swap(mh.sizeofcmds))
+	{
 		fprintf(stderr, "read load commands: premature EOF %d\n", nc);
 		exit(1);
-    }
-	
-    for (	ncmds = swap(mh.ncmds), cp = cmds;
-		 ncmds > 0; ncmds--) {
-//	    bool	isDATA;
-//	    unsigned	vmsize;
-		
-#define lcp	((struct load_command *)cp)    
-		switch(swap(lcp->cmd)) {
-				
+	}
+
+	long text = 0L;
+
+	#define lcp	((struct load_command *)cp)
+	#define scp	((struct segment_command *)cp)
+
+	for (ncmds = swap(mh.ncmds), cp = cmds; ncmds > 0; ncmds--)
+	{
+		switch(swap(lcp->cmd))
+		{
 			case LC_SEGMENT:
-#define scp	((struct segment_command *)cp)
-				if(strcmp(scp->segname, argv[2]) == 0)
+				if (strcmp(scp->segname, "__TEXT") == 0)
+				{
+					text = swap(scp->vmsize);
+				}
+				else if (strcmp(scp->segname, "__INIT") == 0)
 				{
-					printf("%ld\n", swap(scp->vmsize));
-#if 0
-				if (isDATA)
-					vmsize = swap(scp->filesize);
-				else
-					vmsize = swap(scp->vmsize);
-#endif
+					if (strcmp(argv[1], "__TEXT") == 0)
+					{
+						printf("%lX\n", boot2Address + swap(scp->vmsize));
+					}
+					else // __DATA
+					{
+						printf("%lX\n", boot2Address + swap(scp->vmsize) + text);
+					}
 				}
+
 				break;
 		}
-		
+
 		cp += swap(lcp->cmdsize);
-    }
+	}
 	
-    exit(0);
+	exit(0);
 }

From 18e1483b1587ac22c14148ffc3e9aa7e69a3c5f2 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 12 Nov 2012 09:42:52 +0100
Subject: [PATCH 135/623] Reformatted output, include directory dependency
 lifted

---
 i386/boot2/Makefile | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 9b02229..7c16f0e 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -8,6 +8,7 @@
 #		- Fixed clang compilation (dgsga, November 2012. Credits to Evan Lojewski for original work).
 #		- BOOT2ADDR moved to RevoBoot/i386/util/segsize.c (PikerAlpha, November 2012).
 #		- Simplified calls to RevoBoot/i386/util/segsize (PikerAlpha, November 2012).
+#		- Reformatted output, include directory dependency lifted (PikerAlpha, November 2012).
 #
 
 
@@ -19,14 +20,13 @@ CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
 	-DMAKE_TARGET_OS=$(PRODUCT_OS_TARGET) \
     	-DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
 	-fno-stack-protector \
-	-march=pentium4 -msse2 -msoft-float -nostdinc
+	-march=pentium4 -msse2 -msoft-float
 
 LIBSADIR = ../libsa
 LIBSAIODIR = ../libsaio
 UTILDIR = ../util
-SRCROOT = $(abspath $(CURDIR)/../..)
 
-INC = -I. -I.. -I$(SYMROOT) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(UTILDIR) -I${SRCROOT}/i386/include
+INC = -I. -I.. -I$(SYMROOT) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(UTILDIR)
 
 LIBS = -L$(SYMROOT) -lsaio -lsa
 LIBDEP = $(SYMROOT)/libsaio.a $(SYMROOT)/libsa.a
@@ -75,15 +75,17 @@ boot: machOconv $(OBJS) $(LIBDEP)
 	@echo "\t[MACHOCONV] boot"
 	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
 
+	@echo "============================================"
+	@size $(SYMROOT)/boot.sys
+
 	@( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \
-	  if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\
-	  then \
-	   	echo "\t******* boot is $$size bytes *******"; \
-	    echo "Booter executable larger than $(MAXBOOTSIZE) bytes" ;\
-	    rm $(SYMROOT)/boot ;\
-	    exit 1;\
-	  else \
-	  	echo "\t******* boot is $$size bytes *******"; \
-	  fi)
+	if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\
+	then \
+		echo "Boot ($$size) larger than $(MAXBOOTSIZE) bytes" ;\
+		rm $(SYMROOT)/boot ;\
+		exit 1;\
+	else \
+		echo "=========== boot is $$size bytes ============"; \
+	fi)
 
 include ../MakeInc.dir

From ffba95856b033a32eb05519829869af1722b60d5 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 13 Nov 2012 20:42:53 +0100
Subject: [PATCH 136/623] Single pass ld support

---
 i386/util/machOconv.c | 197 ++++++++++++++++++++++++++++--------------
 1 file changed, 130 insertions(+), 67 deletions(-)

diff --git a/i386/util/machOconv.c b/i386/util/machOconv.c
index 540efe3..be83af3 100644
--- a/i386/util/machOconv.c
+++ b/i386/util/machOconv.c
@@ -20,7 +20,11 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ * Updates:
+ *		Reformatted and elimination of -Wl,-segaddr (PikerAlpha, November 2012)
  */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -33,90 +37,131 @@
 
 int	infile, outfile;
 
+void * cmds;
+
 struct mach_header	mh;
-void *		cmds;
 
 static bool	swap_ends;
 
+//==============================================================================
+
 static unsigned long swap(unsigned long x)
 {
-    if (swap_ends)	return OSSwapInt32(x);
-    else			return x;
+	if (swap_ends)
+	{
+		return OSSwapInt32(x);
+	}
+	else
+	{
+		return x;
+	}
 }
 
-int
-main(int argc, char *argv[])
+
+//==============================================================================
+
+int main(int argc, char *argv[])
 {
-    kern_return_t	result;
-    vm_address_t	data;
-    int			nc, ncmds;
-    char *		cp;
-    
-    if (argc == 2)
+	kern_return_t	result;
+	vm_address_t	data;
+	int			nc, ncmds;
+	char *		cp;
+
+	if (argc == 2)
 	{
 		infile = open(argv[1], O_RDONLY);
-		if (infile < 0)		goto usage;
+
+		if (infile < 0)
+		{
+			goto filenotfound;
+		}
+
 		outfile = fileno(stdout);
-    }
-    else if (argc == 3)
+	}
+	else if (argc == 3)
 	{
-    	infile = open(argv[1], O_RDONLY);
-		if (infile < 0)		goto usage;
-		outfile = open(argv[2], O_WRONLY|O_CREAT|O_TRUNC, 0644);
-		if (outfile < 0)	goto usage;
-    }
-    else 
+		infile = open(argv[1], O_RDONLY);
+
+		if (infile < 0)
+		{
+			goto filenotfound;
+		}
+
+		outfile = open(argv[2], O_WRONLY | O_CREAT | O_TRUNC, 0644);
+
+		if (outfile < 0)
+		{
+			goto openerror;
+		}
+	}
+	else
 	{
-	usage:
-    	fprintf(stderr, "usage: machOconv inputfile [outputfile]\n");
+		fprintf(stderr, "Usage: machOconv inputfile [outputfile]\n");
 		exit(1);
-    }
-    
-    nc = read(infile, &mh, sizeof (mh));
-    if (nc < 0)
+
+		filenotfound:
+			fprintf(stderr, "Error: File Not Found\n");
+			exit(1);
+
+		openerror:
+			fprintf(stderr, "Error: Open Failed\n");
+			exit(1);
+	}
+
+	nc = read(infile, &mh, sizeof (mh));
+
+	if (nc < 0)
 	{
 		perror("read mach header");
 		exit(1);
-    }
-	
-    if (nc < (int)sizeof (mh))
+	}
+
+	if (nc < (int)sizeof (mh))
 	{
-		fprintf(stderr, "read mach header: premature EOF %d\n", nc);
+		fprintf(stderr, "Error: read mach header: premature EOF %d\n", nc);
 		exit(1);
-    }
-	
-	
-    if (mh.magic == MH_MAGIC)		swap_ends = false;
-    else if (mh.magic == MH_CIGAM)	swap_ends = true;
-    else
+	}
+
+	if (mh.magic == MH_MAGIC)
+	{
+		swap_ends = false;
+	}
+	else if (mh.magic == MH_CIGAM)
+	{
+		swap_ends = true;
+	}
+	else
 	{
-    	fprintf(stderr, "bad magic number %lx\n", (unsigned long)mh.magic);
+		fprintf(stderr, "Error: bad magic number %lx\n", (unsigned long)mh.magic);
 		exit(1);
-    }
+	}
 	
-    cmds = calloc(swap(mh.sizeofcmds), sizeof (char));
-    if (cmds == 0)
+	cmds = calloc(swap(mh.sizeofcmds), sizeof (char));
+
+	if (cmds == 0)
 	{
-		fprintf(stderr, "alloc load commands: no memory\n");
+		fprintf(stderr, "Error: alloc load commands: no memory\n");
 		exit(1);
-    }
-    nc = read(infile, cmds, swap(mh.sizeofcmds));
-    if (nc < 0) 
+	}
+
+	nc = read(infile, cmds, swap(mh.sizeofcmds));
+
+	if (nc < 0)
 	{
 		perror("read load commands");
 		exit(1);
-    }
-    if (nc < (int)swap(mh.sizeofcmds))
+	}
+
+	if (nc < (int)swap(mh.sizeofcmds))
 	{
-		fprintf(stderr, "read load commands: premature EOF %d\n", nc);
+		fprintf(stderr, "Error: read load commands: premature EOF %d\n", nc);
 		exit(1);
-    }
+	}
 
-	unsigned long vmstart = (unsigned long)-1;
+	long initSegmentSize = 0L;
 
 	// First pass: determine actual load address
-	for (ncmds = swap(mh.ncmds), cp = cmds;
-		 ncmds > 0; ncmds--)
+	for (ncmds = swap(mh.ncmds), cp = cmds; ncmds > 0; ncmds--)
 	{
 #define lcp	((struct load_command *)cp)    
 #define scp	((struct segment_command *)cp)
@@ -124,29 +169,29 @@ main(int argc, char *argv[])
 		switch(swap(lcp->cmd))
 		{
 			case LC_SEGMENT:
-				if(vmstart > swap(scp->vmaddr)) 
+				if (strcmp(scp->segname, "__INIT") == 0)
 				{
-					vmstart = swap(scp->vmaddr);
+					initSegment = swap(scp->vmsize);
 				}
 		}
-		cp += swap(lcp->cmdsize);
 
+		cp += swap(lcp->cmdsize);
 	}
-	
+
 	// Second pass: output to file.
-    for (ncmds = swap(mh.ncmds), cp = cmds;
-		 ncmds > 0; ncmds--)
+	for (ncmds = swap(mh.ncmds), cp = cmds; ncmds > 0; ncmds--)
 	{
 #define lcp	((struct load_command *)cp)    
 #define scp	((struct segment_command *)cp)
 
-	    bool	isDATA;
-	    unsigned	vmsize;
+		bool	isDATA;
+		unsigned	vmsize;
 		
 		switch(swap(lcp->cmd))
 		{
 			case LC_SEGMENT:
 				isDATA = (strcmp(scp->segname, "__DATA") == 0);
+
 				if (isDATA)
 				{
 					vmsize = swap(scp->filesize);
@@ -157,25 +202,43 @@ main(int argc, char *argv[])
 				}
 				
 				result = vm_allocate(mach_task_self(), &data, vmsize, true);
-				if (result != KERN_SUCCESS) {
+
+				if (result != KERN_SUCCESS)
+				{
 					mach_error("vm_allocate segment data", result);
 					exit(1);
 				}
 				
 				lseek(infile, swap(scp->fileoff), L_SET);
 				nc = read(infile, (void *)data, swap(scp->filesize));
-				if (nc < 0) {
+
+				if (nc < 0)
+				{
 					perror("read segment data");
 					exit(1);
 				}
-				if (nc < (int)swap(scp->filesize)) {
+
+				if (nc < (int)swap(scp->filesize))
+				{
 					fprintf(stderr, "read segment data: premature EOF %d\n", nc);
 					exit(1);
 				}
-				
-				lseek(outfile, swap(scp->vmaddr) - vmstart, L_SET);
+
+				if (strcmp(scp->segname, "__INIT") == 0)
+				{
+					// Start of file
+					lseek(outfile, 0, L_SET);
+				}
+				else
+				{
+					// Address + size of __INIT segment
+					lseek(outfile, swap(scp->vmaddr) + initSegmentSize, L_SET);
+				}
+
 				nc = write(outfile, (void *)data, vmsize);
-				if (nc < (int)vmsize) {
+
+				if (nc < (int)vmsize)
+				{
 					perror("write segment data");
 					exit(1);
 				}
@@ -185,7 +248,7 @@ main(int argc, char *argv[])
 		}
 		
 		cp += swap(lcp->cmdsize);
-    }
+	}
 	
-    exit(0);
+	exit(0);
 }

From 6616ef714c8b8677f133b234efc05530ac495dcb Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 13 Nov 2012 20:45:57 +0100
Subject: [PATCH 137/623] Single pass LD support

---
 i386/boot2/Makefile | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 7c16f0e..3149a5a 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -9,6 +9,7 @@
 #		- BOOT2ADDR moved to RevoBoot/i386/util/segsize.c (PikerAlpha, November 2012).
 #		- Simplified calls to RevoBoot/i386/util/segsize (PikerAlpha, November 2012).
 #		- Reformatted output, include directory dependency lifted (PikerAlpha, November 2012).
+#		- Single pass linking and elimination of -Wl,-segaddr (PikerAlpha, November 2012).
 #
 
 
@@ -49,28 +50,16 @@ MAXBOOTSIZE = 131072
 
 $(MAKEGOAL): $(DIRS_NEEDED) boot
 
-boot: machOconv $(OBJS) $(LIBDEP)
-	@$(CC)	-nostdlib -arch i386 \
-		-Wl,-preload \
-		-Wl,-pie \
-		-Wl,-segalign,20 \
-		-Wl,-read_only_relocs,suppress \
-		-lcc_kext \
-		$(filter %.o,$^) $(LIBS) \
-		-o ${SYMROOT}/$@.sys
+boot: $(OBJS)
 
 	@echo "\t[LD] boot.sys"
-	@$(CC)	-Wl,static \
+	@$(CC)	-nostdlib -arch i386 \
 		-Wl,-preload \
-		-nostdlib -arch i386  -Wl,-pie \
+		-Wl,-pie \
 		-Wl,-segalign,20 \
-		-Wl,-segaddr,__INIT,`${SYMROOT}/segsize __INIT` \
-		-Wl,-segaddr,__TEXT,`${SYMROOT}/segsize __TEXT` \
-		-Wl,-segaddr,__DATA,`${SYMROOT}/segsize __DATA` \
 		-Wl,-read_only_relocs,suppress \
 		-lcc_kext \
-		$(filter %.o,$^) $(LIBS) \
-		-o ${SYMROOT}/$@.sys
+		$(filter %.o,$^) $(LIBS) -o ${SYMROOT}/$@.sys
 
 	@echo "\t[MACHOCONV] boot"
 	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot

From 69a233d0fce5c5bcc01455c2356adb1810359773 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 13 Nov 2012 20:47:30 +0100
Subject: [PATCH 138/623] Lastminute fix

---
 i386/util/machOconv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/util/machOconv.c b/i386/util/machOconv.c
index be83af3..bb08044 100644
--- a/i386/util/machOconv.c
+++ b/i386/util/machOconv.c
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
 			case LC_SEGMENT:
 				if (strcmp(scp->segname, "__INIT") == 0)
 				{
-					initSegment = swap(scp->vmsize);
+					initSegmentSize = swap(scp->vmsize);
 				}
 		}
 

From b51ed6eb8867301a16568ce6e7c25001cb3a24fc Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 13 Nov 2012 23:07:19 +0100
Subject: [PATCH 139/623] Back to two pass LD (single pass wasn't working).

---
 i386/boot2/Makefile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 3149a5a..6ed320c 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -9,7 +9,6 @@
 #		- BOOT2ADDR moved to RevoBoot/i386/util/segsize.c (PikerAlpha, November 2012).
 #		- Simplified calls to RevoBoot/i386/util/segsize (PikerAlpha, November 2012).
 #		- Reformatted output, include directory dependency lifted (PikerAlpha, November 2012).
-#		- Single pass linking and elimination of -Wl,-segaddr (PikerAlpha, November 2012).
 #
 
 
@@ -61,6 +60,18 @@ boot: $(OBJS)
 		-lcc_kext \
 		$(filter %.o,$^) $(LIBS) -o ${SYMROOT}/$@.sys
 
+	@echo "\t[LD] boot.sys"
+	@$(CC)	-nostdlib -arch i386 -static -v \
+		-Wl,-preload \
+		-Wl,-pie \
+		-Wl,-segalign,20 \
+		-Wl,-segaddr,__INIT,`$(UTILDIR)/segaddr __INIT` \
+		-Wl,-segaddr,__TEXT,`$(UTILDIR)/segaddr __TEXT` \
+		-Wl,-segaddr,__DATA,`$(UTILDIR)/segaddr __DATA` \
+		-Wl,-read_only_relocs,suppress \
+		-lcc_kext \
+		$(filter %.o,$^) $(LIBS) -o ${SYMROOT}/$@.sys
+
 	@echo "\t[MACHOCONV] boot"
 	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
 

From 4095653aa08d5d443126f924e59a98c26fdd5af5 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 13 Nov 2012 23:10:57 +0100
Subject: [PATCH 140/623] Back to two pass LD (single pass wasn't working).

---
 i386/util/machOconv.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/i386/util/machOconv.c b/i386/util/machOconv.c
index bb08044..f7aede5 100644
--- a/i386/util/machOconv.c
+++ b/i386/util/machOconv.c
@@ -22,7 +22,7 @@
  * @APPLE_LICENSE_HEADER_END@
  *
  * Updates:
- *		Reformatted and elimination of -Wl,-segaddr (PikerAlpha, November 2012)
+ *		Reformatted (PikerAlpha, November 2012)
  */
 
 #include <stdio.h>
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	long initSegmentSize = 0L;
+	unsigned long vmstart = (unsigned long) -1;
 
 	// First pass: determine actual load address
 	for (ncmds = swap(mh.ncmds), cp = cmds; ncmds > 0; ncmds--)
@@ -169,9 +169,9 @@ int main(int argc, char *argv[])
 		switch(swap(lcp->cmd))
 		{
 			case LC_SEGMENT:
-				if (strcmp(scp->segname, "__INIT") == 0)
+				if (vmstart > swap(scp->vmaddr)) 
 				{
-					initSegmentSize = swap(scp->vmsize);
+					vmstart = swap(scp->vmaddr);
 				}
 		}
 
@@ -224,17 +224,7 @@ int main(int argc, char *argv[])
 					exit(1);
 				}
 
-				if (strcmp(scp->segname, "__INIT") == 0)
-				{
-					// Start of file
-					lseek(outfile, 0, L_SET);
-				}
-				else
-				{
-					// Address + size of __INIT segment
-					lseek(outfile, swap(scp->vmaddr) + initSegmentSize, L_SET);
-				}
-
+				lseek(outfile, swap(scp->vmaddr) - vmstart, L_SET);
 				nc = write(outfile, (void *)data, vmsize);
 
 				if (nc < (int)vmsize)

From 538a07426082964a78f16887492bac7644d5d088 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 14 Nov 2012 09:13:20 +0100
Subject: [PATCH 141/623] Cleanup

---
 i386/libsa/Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/i386/libsa/Makefile b/i386/libsa/Makefile
index 9085a72..ce11708 100644
--- a/i386/libsa/Makefile
+++ b/i386/libsa/Makefile
@@ -5,7 +5,8 @@
 #
 #			- Major cleanup (PikerAlpha, October 2012).
 #			- Output added for rm/ar/ranlib actions (PikerAlpha, November 2012).
-#			- Enabled clang compilation (dgsga,PikerAlpha, November 2012. Credits to Evan Lojewski for original work).
+#			- Enabled clang compilation (dgsga, November 2012. Credits to Evan Lojewski for original work).
+#			- Output change and now using libtool instead of ar/ranlib (PikerAlpha, November 2012).
 #
 
 include ../MakePaths.dir
@@ -14,7 +15,7 @@ UTILDIR = ../util
 LIBSAIODIR = ../libsaio
 
 OPTIM = -Os -Oz
-CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
+CFLAGS	= $(RC_CFLAGS) $(OPTIM) -arch i386 -g -Wmost -Werror \
 		-fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \
 		-DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
 		-fno-stack-protector \
@@ -33,11 +34,12 @@ DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 $(MAKEGOAL): $(DIRS_NEEDED) $(LIBS)
 
 $(LIBS): $(SA_OBJS)
-	@echo "\t[RM] $@"
-	@rm -f $(SYMROOT)/$@
-	@echo "\t[AR] $@"
-	@ar qc $(SYMROOT)/$@ $^ &> /dev/null
-	@echo "\t[RANLIB] $@"
-	@ranlib $(SYMROOT)/$@
+	@if [ -f $(SYMROOT)/$@ ]; then \
+		echo "\t[RM] $@"; \
+		rm -f $(SYMROOT)/$@; \
+	fi;
+
+	@echo "\t[LIBTOOL] $@"
+	@libtool -o $(SYMROOT)/$@ $^
 
 include ../MakeInc.dir

From 574861ddbb25c49fbb02ec106f69563a83369bb0 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 14 Nov 2012 09:14:38 +0100
Subject: [PATCH 142/623] Cleanups

---
 i386/libsaio/Makefile | 51 +++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index 7a8b670..8f8b991 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -9,6 +9,7 @@
 #			- STATIC_DATA_FILENAME added (PikerAlpha, October 2012).
 #			- Output added for rm/ar/ranlib actions (PikerAlpha, November 2012).
 #			- Enabled clang compilation (dgsga, PikerAlpha, November 2012. Credits to Evan Lojewski for original work).
+#			- Output change and now using libtool instead of ar/ranlib (PikerAlpha, November 2012).
 #
 
 include ../MakePaths.dir
@@ -19,31 +20,28 @@ LIBSADIR = ../libsa
 OPTIM = -Os -Oz
 DEBUG = -DNOTHING
 
-CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost \
-    -D__ARCHITECTURE__=\"i386\" -DSAIO_INTERNAL_USER \
-    -DRCZ_COMPRESSED_FILE_SUPPORT $(DEBUG) \
-    -DREVOBOOT_VERSION_INFO=\"RevoBoot\ v$(PRODUCT_VERSION_NUMBER)\" \
-    -DMAKE_TARGET_OS=$(PRODUCT_OS_TARGET) \
-    -DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
-    -DSTATIC_DATA_FILENAME=$(MAKE_TARGET_MODEL).bin \
-    -DACPI_DATA_FILE=../../config/$(MAKE_ACPI_DATA_FILE) \
-    -DEFI_DATA_FILE=../config/$(MAKE_EFI_DATA_FILE) \
-    -DSMBIOS_DATA_FILE=../config/$(MAKE_SMBIOS_DATA_FILE) \
-    -fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \
-    -fno-stack-protector \
-    -march=pentium4 -msse2 -msoft-float
+CFLAGS	= $(RC_CFLAGS) $(OPTIM) -arch i386 -g -Wmost \
+		-D__ARCHITECTURE__=\"i386\" -DSAIO_INTERNAL_USER \
+		-DRCZ_COMPRESSED_FILE_SUPPORT $(DEBUG) \
+		-DREVOBOOT_VERSION_INFO=\"RevoBoot\ v$(PRODUCT_VERSION_NUMBER)\" \
+		-DMAKE_TARGET_OS=$(PRODUCT_OS_TARGET) \
+		-DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
+		-DSTATIC_DATA_FILENAME=$(MAKE_TARGET_MODEL).bin \
+		-DACPI_DATA_FILE=../../config/$(MAKE_ACPI_DATA_FILE) \
+		-DEFI_DATA_FILE=../config/$(MAKE_EFI_DATA_FILE) \
+		-DSMBIOS_DATA_FILE=../config/$(MAKE_SMBIOS_DATA_FILE) \
+		-fno-builtin -static $(OMIT_FRAME_POINTER_CFLAG) \
+		-fno-stack-protector \
+		-march=pentium4 -msse2 -msoft-float
 
 INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR)
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-SAIO_OBJS = table.o asm.o bios.o biosfn.o \
-	disk.o sys.o cache.o bootstruct.o \
-	stringTable.o load.o pci.o allocate.o \
-	vbe.o hfs.o hfs_compare.o \
-	xml.o md5c.o device_tree.o \
-	cpu.o platform.o acpi.o \
-	smbios.o efi.o console.o
+SAIO_OBJS = table.o asm.o bios.o biosfn.o disk.o sys.o cache.o bootstruct.o \
+			stringTable.o load.o pci.o allocate.o vbe.o hfs.o hfs_compare.o \
+			xml.o md5c.o device_tree.o cpu.o platform.o acpi.o smbios.o \
+			efi.o console.o
 
 LIBS = libsaio.a
 
@@ -52,11 +50,12 @@ DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 $(MAKEGOAL): $(DIRS_NEEDED) libsaio.h $(LIBS)
 
 $(LIBS): $(SAIO_OBJS)
-	@echo "\t[RM] $@"
-	@rm -f $@
-	@echo "\t[AR] $@"
-	@ar qc $(SYMROOT)/$@ $^ &> /dev/null
-	@echo "\t[RANLIB] $@"
-	@ranlib $(SYMROOT)/$@
+	@if [ -f $(SYMROOT)/$@ ]; then \
+		echo "\t[RM] $@"; \
+		rm -f $(SYMROOT)/$@; \
+	fi;
+
+	@echo "\t[LIBTOOL] $@"
+	@libtool -o $(SYMROOT)/$@ $^
 
 include ../MakeInc.dir

From 07d6dfc4701618a400d55138ab8a664f72c71487 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:17:41 +0100
Subject: [PATCH 143/623] Cleanup and output changes

---
 Makefile | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 2a7a5f8..79682ea 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@
 #			- Copies ACPI/EFI/SMBIOS/data-template.h for new conigurations (PikerAlpha, October 2012).
 #			- Output added for cp/mkdir/rm actions (PikerAlpha, November 2012).
 #			- New build target 'help' added (PikerAlpha, November 2012).
+#			- Cleanups and output changed (PikerAlpha, November 2012).
 #
 
 #
@@ -134,7 +135,7 @@ CONFIG_DIR=$(ARCH_DIR)/config
 SETTINGS_DIR=$(CONFIG_DIR)/SETTINGS
 SETTINGS_FILE=$(SETTINGS_DIR)/$(MAKE_TARGET_MODEL).h
 
-$(MAKEGOAL): $(SYMROOT) $(OBJROOT)
+$(MAKEGOAL):
 	@if [ ! -f $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE) ]; then \
 		echo "\t[CP] $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE)"; \
 		cp -n $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE); \
@@ -160,33 +161,34 @@ $(MAKEGOAL): $(SYMROOT) $(OBJROOT)
 		cp -n $(CONFIG_DIR)/settings-template.h $(SETTINGS_FILE); \
 	fi;
 
-	@if [ -d $(ARCH_DIR) ]; then \
-		echo ================= make MODEL=$(MAKE_TARGET_MODEL) $@ for: RevoBoot/$(ARCH_DIR) =================; \
-		( OBJROOT=$(OBJROOT)/$(ARCH_DIR); \
-		  SYMROOT=$(SYMROOT)/$(ARCH_DIR); \
-              XCFLAGS="$(RC_CFLAGS)"; \
-		  echo "$$OBJROOT $$SYMROOT"; \
-		    cd $(ARCH_DIR); ${MAKE}	\
-			"OBJROOT=$$OBJROOT" \
-		  	"SYMROOT=$$SYMROOT" \
-			"RC_ARCHS=$(ARCH_DIR)" \
-			"TARGET=$(ARCH_DIR)" \
-			"RC_CFLAGS=$$XCFLAGS" $@ \
-		) || exit $$?; \
-	fi;
+	@echo "======================================================";
+	@echo "Running: make MODEL=$(MODEL) $@";
+
+	@(OBJROOT=$(OBJROOT)/$(ARCH_DIR); \
+	SYMROOT=$(SYMROOT)/$(ARCH_DIR); \
+	XCFLAGS="$(RC_CFLAGS)"; \
+	cd $(ARCH_DIR); \
+	${MAKE}	"OBJROOT=$$OBJROOT" "SYMROOT=$$SYMROOT" "RC_ARCHS=$(ARCH_DIR)" \
+	"TARGET=$(ARCH_DIR)" "RC_CFLAGS=$$XCFLAGS" $@ )
 
 clean:
-	@if [ -d "$(OBJROOT)" ];then echo "\t[RMDIR] $(OBJROOT)"; fi
-	@if [ -d "$(SYMROOT)" ];then echo "\t[RMDIR] $(SYMROOT)"; fi
-	rm -rf sym obj dst out.log
+	@if [ -d "$(OBJROOT)" ]; then \
+		echo "\t[RMDIR] $(OBJROOT)" > /dev/null; \
+	fi;
+
+	@if [ -d "$(SYMROOT)" ]; then \
+		echo "\t[RMDIR] $(SYMROOT)" > /dev/null; \
+	fi;
+
+	@rm -rf sym obj dst out.log
 
 help:
 	@echo
-	@echo   'Build targets:'
-	@echo   '		- Build all targets [DEFAULT]'
+	@echo	'Build targets:'
+	@echo	'		- Builds all targets [DEFAULT]'
 	@echo
-	@echo   'Cleaning targets:'
-	@echo   '  clean	- Remove generated files'
+	@echo	'Cleaning targets:'
+	@echo	' clean	- Removes generated files'
 
 $(SYMROOT) $(OBJROOT):
 	@/bin/mkdir -p $@

From 8e2fd093c23fc6cb026ddd00ab90696f272b5917 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:25:51 +0100
Subject: [PATCH 144/623] Cleanup and output changes

---
 i386/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/i386/Makefile b/i386/Makefile
index 57f3137..9b930a8 100644
--- a/i386/Makefile
+++ b/i386/Makefile
@@ -6,6 +6,7 @@
 #			- Major cleanup (PikerAlpha, October 2012).
 #			- Output improvements (PikerAlpha, October 2012).
 #			- PRODUCT_MODEL_TARGET renamed to MAKE_TARGET_MODEL (PikerAlpha, November 2012).
+#			- Cleanup and output changed (PikerAlpha, October 2012).
 #
 
 #
@@ -25,9 +26,9 @@ SUBDIRS = util libsa libsaio boot2
 
 
 $(MAKEGOAL):
-	@for i in ${SUBDIRS}; \
+	@for i in $(SUBDIRS); \
 	do \
-		echo ================= make MODEL=$(MAKE_TARGET_MODEL) $@ for: RevoBoot/i386/$$i =================; \
+		echo ================= RevoBoot/i386/$$i =================; \
 		( cd $$i; ${MAKE} \
 			"OBJROOT=$(OBJROOT)/$$i" \
 		  	"SYMROOT=$(SYMROOT)" \

From 232063bbc03f6172dedcb9c2844dce0b38f67b13 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:27:45 +0100
Subject: [PATCH 145/623] Single pass compilation

---
 i386/MakeInc.dir | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/i386/MakeInc.dir b/i386/MakeInc.dir
index cf4ed0a..bdaf6ca 100755
--- a/i386/MakeInc.dir
+++ b/i386/MakeInc.dir
@@ -4,8 +4,8 @@
 # Updates:
 #
 #		- Major cleanup (PikerAlpha, October 2012).
-#		- Fixed clang compilation (dgsga, November 2012. Credits to Evan Lojewski
-#         for original work).
+#		- Fixed clang compilation (dgsga, November 2012).
+#		- Single pass compilation (PikerAlpha, November 2012).
 #
 
 
@@ -22,33 +22,27 @@ OMIT_FRAME_POINTER_CFLAG=
 
 .c.o .m.o:
 	@echo "\t[CC] $<"
-	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -MM -M -o $(OBJROOT)/$@.Makedep
 	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$@
-    
+
 $(OBJROOT)/%.o: %.c
 	@echo "\t[CC] $<"
-	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -MM -M -o $(OBJROOT)/$@.Makedep
 	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$@
 
 $(OBJROOT)/%.o: %.m
 	@echo "\t[M] $<"
-	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -MM -M -o $(OBJROOT)/$@.Makedep
 	@$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $(OBJROOT)/$@
 
 .s.o:
 	@echo "\t[AS] $<"
-	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -MM -M -o $(OBJROOT)/$@.Makedep
-	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -o $(OBJROOT)/$(@F)
+	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -o $(OBJROOT)/$@
 
 $(OBJROOT)/boot2.o:
 	@echo "\t[AS] boot2.s"
-	@$(CC) -Wa,-n -c $(INC) -arch i386 boot2.s -MM -M -o $(OBJROOT)/$@.Makedep
-	@$(CC) -Wa,-n -c $(INC) -arch i386 boot2.s -o $(OBJROOT)/$(@F)
+	@$(CC) -Wa,-n -c $(INC) -arch i386 boot2.s -o $(OBJROOT)/$@
 	
 $(OBJROOT)/%.o: %.s
 	@echo "\t[AS] $<"
-	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -MM -M -o $(OBJROOT)/$@.Makedep
-	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -o $(OBJROOT)/$(@F)
+	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -o $(OBJROOT)/$@
 
-$(DIRS_NEEDED): # $(INSTALLDIR) $(SRCROOT):
+$(DIRS_NEEDED):
 	@/bin/mkdir -p $@

From 5eebf3ee8ea059102471dbd7ccb795b9e8b9598b Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:31:08 +0100
Subject: [PATCH 146/623] Layout changed

---
 i386/libsaio/allocate.c | 45 ++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/i386/libsaio/allocate.c b/i386/libsaio/allocate.c
index fdd5849..eb84fbc 100755
--- a/i386/libsaio/allocate.c
+++ b/i386/libsaio/allocate.c
@@ -20,6 +20,11 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ *
+ * Updates:
+ *			- Layout change only (PikerAlpha, November 2012)
+ *
  */
 
 #include "sl.h"
@@ -28,8 +33,8 @@
 #include "device_tree.h"
 #include "platform.h"
 
-#define kPageSize     4096
-#define RoundPage(x)  ((((unsigned)(x)) + kPageSize - 1) & ~(kPageSize - 1))
+#define kPageSize		4096
+#define RoundPage(x)	((((unsigned)(x)) + kPageSize - 1) & ~(kPageSize - 1))
 
 
 //==============================================================================
@@ -38,32 +43,30 @@ long AllocateMemoryRange(char * rangeName, long start, long length, long type)
 {
 	char *nameBuf = malloc(strlen(rangeName) + 1);
 
-	if (nameBuf == 0)
+	if (nameBuf)
 	{
-		return -1;
-	}
+		strcpy(nameBuf, rangeName);
 
-	strcpy(nameBuf, rangeName);
-
-	uint32_t *buffer = malloc(2 * sizeof(uint32_t));
-
-	if (buffer == 0)
-	{
-		free(nameBuf);
+		uint32_t *buffer = malloc(2 * sizeof(uint32_t));
 
-		return -1;
-	}
-    
-	buffer[0] = start;
-	buffer[1] = length;
+		if (buffer)
+		{
+			buffer[0] = start;
+			buffer[1] = length;
 
 #if DEBUG
-	printf("AllocateMemoryRange : %s - 0x%lx - 0x%lx\n", nameBuf, length, start);
+			printf("AllocateMemoryRange : %s - 0x%lx - 0x%lx\n", nameBuf, length, start);
 #endif
 
-	DT__AddProperty(gPlatform.EFI.Nodes.MemoryMap, nameBuf, 2 * sizeof(uint32_t), (char *)buffer);
-    
-	return 0;
+			DT__AddProperty(gPlatform.EFI.Nodes.MemoryMap, nameBuf, 2 * sizeof(uint32_t), (char *)buffer);
+
+			return 0;
+		}
+
+		free(nameBuf);
+	}
+
+	return -1;
 }
 
 

From 17ddd47138a36da5fc71eb731dc8f73d295d4ba8 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:34:37 +0100
Subject: [PATCH 147/623] Check return of malloc call

---
 i386/libsaio/efi.c | 88 +++++++++++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 4b35f18..3d88f18 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -34,6 +34,7 @@
  *			- Data selector moved over from RevoBoot/i386/config/data.h (PikerAlpha, October 2012).
  *			- Get static EFI data (optional) from /Extra/EFI/[MacModelNN].bin (PikerAlpha, October 2012).
  *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
+ *			- Check return of malloc call (PikerAlpha, November 2012).
  *
  */
 
@@ -257,64 +258,69 @@ void *convertHexStr2Binary(const char *hexStr, int *outLength)
 	uint8_t binChar;
 	uint8_t *binStr = NULL;
 	int hexStrIdx, binStrIdx, hexNibbleIdx;
-	
+
 	len = strlen(hexStr);
-	
+
 	if (len > 1)
 	{
 		// the resulting binary will be the half size of the input hex string
 		binStr = malloc(len / 2);
-		binStrIdx = 0;
-		hexNibbleIdx = 0;
-		
-		for (hexStrIdx = 0; hexStrIdx < len; hexStrIdx++)
+
+		if (binStr)
 		{
-			hexNibble = hexStr[hexStrIdx];
-			
-			// ignore all chars except valid hex numbers
-			if ((hexNibble >= '0' && hexNibble <= '9') || (hexNibble >= 'A' && hexNibble <= 'F') || (hexNibble >= 'a' && hexNibble <= 'f'))
+			binStrIdx = 0;
+			hexNibbleIdx = 0;
+	
+			for (hexStrIdx = 0; hexStrIdx < len; hexStrIdx++)
 			{
-				hexByte[hexNibbleIdx++] = hexNibble;
-				
-				// found both two nibbles, convert to binary
-				if (hexNibbleIdx == 2)
+				hexNibble = hexStr[hexStrIdx];
+
+				// ignore all chars except valid hex numbers
+				if ((hexNibble >= '0' && hexNibble <= '9') || (hexNibble >= 'A' && hexNibble <= 'F') || (hexNibble >= 'a' && hexNibble <= 'f'))
 				{
-					binChar = 0;
-					
-					for (hexNibbleIdx = 0; hexNibbleIdx < sizeof(hexByte); hexNibbleIdx++)
+					hexByte[hexNibbleIdx++] = hexNibble;
+
+					// found both two nibbles, convert to binary
+					if (hexNibbleIdx == 2)
 					{
-						if (hexNibbleIdx > 0)
+						binChar = 0;
+					
+						for (hexNibbleIdx = 0; hexNibbleIdx < sizeof(hexByte); hexNibbleIdx++)
 						{
-							binChar = binChar << 4;
-						}
+							if (hexNibbleIdx > 0)
+							{
+								binChar = binChar << 4;
+							}
 						
-						if (hexByte[hexNibbleIdx] <= '9')
-						{
-							binChar += hexByte[hexNibbleIdx] - '0';
+							if (hexByte[hexNibbleIdx] <= '9')
+							{
+								binChar += hexByte[hexNibbleIdx] - '0';
+							}
+							else if (hexByte[hexNibbleIdx] <= 'F')
+							{
+								binChar += hexByte[hexNibbleIdx] - ('A' - 10);
+							}
+							else if (hexByte[hexNibbleIdx] <= 'f')
+							{
+								binChar += hexByte[hexNibbleIdx] - ('a' - 10);
+							}
 						}
-						else if (hexByte[hexNibbleIdx] <= 'F')
-						{
-							binChar += hexByte[hexNibbleIdx] - ('A' - 10);
-						}
-						else if (hexByte[hexNibbleIdx] <= 'f')
-						{
-							binChar += hexByte[hexNibbleIdx] - ('a' - 10);
-						}
-					}
 					
-					binStr[binStrIdx++] = binChar;						
-					hexNibbleIdx = 0;
+						binStr[binStrIdx++] = binChar;
+						hexNibbleIdx = 0;
+					}
 				}
 			}
+
+			*outLength = binStrIdx;
+
+			return binStr;
 		}
-		*outLength = binStrIdx;
-		return binStr;
-	}
-	else
-	{
-		*outLength = 0;
-		return NULL;
 	}
+
+	*outLength = 0;
+
+	return NULL;
 }
 //==============================================================================
 

From 48201641d522faa449433ca27b40c61dc2c72ee3 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:39:08 +0100
Subject: [PATCH 148/623] OSBigEndian removed and some minor style nits

---
 i386/libsaio/disk.c | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index 6335e14..a1ed781 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -30,31 +30,27 @@
  */
 
 /*
- *          INTEL CORPORATION PROPRIETARY INFORMATION
+ * INTEL CORPORATION PROPRIETARY INFORMATION
  *
- *  This software is supplied under the terms of a license  agreement or 
- *  nondisclosure agreement with Intel Corporation and may not be copied 
- *  nor disclosed except in accordance with the terms of that agreement.
+ * This software is supplied under the terms of a license  agreement or
+ * nondisclosure agreement with Intel Corporation and may not be copied
+ * nor disclosed except in accordance with the terms of that agreement.
+ *
+ * Copyright 1988, 1989 Intel Corporation
+ *
+ * Copyright 1993 NeXT Computer, Inc. All rights reserved.
+ *
+ * Copyright 2007 VMware Inc.
+ *	"Preboot" ramdisk support added by David Elliott
+ *	GPT support added by David Elliott.  Based on IOGUIDPartitionScheme.cpp.
  *
- *  Copyright 1988, 1989 Intel Corporation
- */
-
-/*
- * Copyright 1993 NeXT Computer, Inc.
- * All rights reserved.
- */
-
-/*  Copyright 2007 VMware Inc.
-    "Preboot" ramdisk support added by David Elliott
-    GPT support added by David Elliott.  Based on IOGUIDPartitionScheme.cpp.
- */
-
-/*
  * Updates:
- *		- Cleanups and refactoring by DHP in 2010 and 2011.
- *		- Renamed LION_RECOVERY_SUPPORT to CORE_STARAGE_SUPPORT (PikerAlpha, November 2012).
- *		- Renamed LION_FILEVAULT_SUPPORT to CORE_STARAGE_SUPPORT (PikerAlpha, November 2012).
- *		- Renamed encryptedBootPartition to coreStoragePartition (PikerAlpha, November 2012).
+ *			- Cleanups and refactoring by DHP in 2010 and 2011.
+ *			- Renamed LION_RECOVERY_SUPPORT to CORE_STARAGE_SUPPORT (PikerAlpha, November 2012).
+ *			- Renamed LION_FILEVAULT_SUPPORT to CORE_STARAGE_SUPPORT (PikerAlpha, November 2012).
+ *			- Renamed encryptedBootPartition to coreStoragePartition (PikerAlpha, November 2012).
+ *			- OSBigEndian removed and some minor style nits (PikerAlpha, November 2012).
+ *
  */
 
 

From 69755028c94b561a0f146d747e1c49939107a052 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:40:26 +0100
Subject: [PATCH 149/623] Overhaul of HPS table data

---
 i386/libsaio/hfs_CaseTables.h | 687 ++++++++++++++++++----------------
 1 file changed, 373 insertions(+), 314 deletions(-)

diff --git a/i386/libsaio/hfs_CaseTables.h b/i386/libsaio/hfs_CaseTables.h
index 105007c..ac12604 100755
--- a/i386/libsaio/hfs_CaseTables.h
+++ b/i386/libsaio/hfs_CaseTables.h
@@ -18,41 +18,43 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ * Updates:
+ *			- Table data updated to match the XNU 2050.18.24 source code (PikerAlpha, November 2012)
+ *			- Latin is now a seperate table, done to make it faster (PikerAlpha, November 2012)
+ *			- Compressed and uncompressed table data is now 100% the same (PikerAlpha, November 2012)
+ *			- UNCOMPRESSED renamed to USE_UNCOMPRESSED_TABLES (PikerAlpha, November 2012)
+ *			- Cleanups and other reformatting to pull it out of the 90's (PikerAlpha, November 2012)
+ *			- Table length errors fixed. Don't use 512/5632 instead of 256/2816 (PikerAlpha, November 2012)
+ *			- Table data verified against HFSPlusX64.efi (PikerAlpha, November 2012)
+ *
  */
-/*
-	File:	CaseTables.h
-*/
 
 
-/*	The lower case table consists of a 256-entry high-byte table followed by some number of
-	256-entry subtables. The high-byte table contains either an offset to the subtable for
-	characters with that high byte or zero, which means that there are no case mappings or
-	ignored characters in that block. Ignored characters are mapped to zero.
+/*
+ * The default setting is 1, but you can change it to 0 to use uncompressed
+ * table data. Making the booter 5152 bytes (data/extra code) bigger.
  */
 
-#if UNCOMPRESSED
-u_int16_t gLowerCaseTable[] = {
+#define USE_COMPRESSED_TABLES	1
 
-	// High-byte indices ( == 0 iff no case mapping and no ignorables )
+/* Do NOT change this one! */
 
-	/* 0 */	0x0100, 0x0200, 0x0000, 0x0300, 0x0400, 0x0500, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* 1 */	0x0600, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* 2 */	0x0700, 0x0800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* 3 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* 4 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* 5 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* 6 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* 7 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* 8 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* 9 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* A */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* B */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* C */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* D */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* E */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	/* F */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0900, 0x0A00,
+#define USE_UNCOMPRESSED_TABLES ! USE_COMPRESSED_TABLES
+
+
+#if USE_UNCOMPRESSED_TABLES
+/*==============================================================================
+ * For better performance, the case folding table for basic latin
+ * is seperate from the others.  This eliminates the extra lookup
+ * to get the offset to this table.
+ *
+ * Note: 0x0000 now maps to 0 so that it will be ignored
+ */
 
-	// Table 1 (for high byte 0x00)
+u_int16_t gLatinCaseFoldTable[] =
+{
+	// gLatinCaseFold in XNU/bsd/hfs/hfscommon/Unicode/UCStringCompareData.h) 512 bytes starting @ 0x4240 in HFSPlusX64.efi
 
 	/* 0 */	0xFFFF, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F,
 	/* 1 */	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F,
@@ -70,8 +72,38 @@ u_int16_t gLowerCaseTable[] = {
 	/* D */	0x00F0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00F8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00FE, 0x00DF,
 	/* E */	0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
 	/* F */	0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF,
+};
+
+
+/*==============================================================================
+ * The lower case table consists of a 256-entry high-byte table followed by some number of
+ * 256-entry subtables. The high-byte table contains either an offset to the subtable for
+ * characters with that high byte or zero, which means that there are no case mappings or
+ * ignored characters in that block. Ignored characters are mapped to zero.
+ */
+
+u_int16_t gLowerCaseTable[] =
+{
+	/* Table 0 high-byte indices ( == 0 iff no case mapping and no ignorables ) 512 bytes starting @ 0x4440 in HFSPlusX64.efi */
+	
+	/* 0 */	0x0000, 0x0100, 0x0000, 0x0200, 0x0300, 0x0400, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* 1 */	0x0500, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* 2 */	0x0600, 0x0700, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* 3 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* 4 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* 5 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* 6 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* 7 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* 8 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* 9 */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* A */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* B */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* C */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* D */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* E */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	/* F */	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0800, 0x0900,
 
-	// Table 2 (for high byte 0x01)
+	// Table 1 (for high byte 0x01) 512 bytes starting @ 0x4640 in HFSPlusX64.efi
 
 	/* 0 */	0x0100, 0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108, 0x0109, 0x010A, 0x010B, 0x010C, 0x010D, 0x010E, 0x010F,
 	/* 1 */	0x0111, 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118, 0x0119, 0x011A, 0x011B, 0x011C, 0x011D, 0x011E, 0x011F,
@@ -90,7 +122,7 @@ u_int16_t gLowerCaseTable[] = {
 	/* E */	0x01E0, 0x01E1, 0x01E2, 0x01E3, 0x01E5, 0x01E5, 0x01E6, 0x01E7, 0x01E8, 0x01E9, 0x01EA, 0x01EB, 0x01EC, 0x01ED, 0x01EE, 0x01EF,
 	/* F */	0x01F0, 0x01F3, 0x01F3, 0x01F3, 0x01F4, 0x01F5, 0x01F6, 0x01F7, 0x01F8, 0x01F9, 0x01FA, 0x01FB, 0x01FC, 0x01FD, 0x01FE, 0x01FF,
 
-	// Table 3 (for high byte 0x03)
+	// Table 2 (for high byte 0x03) 512 bytes starting @ 0x4840 in HFSPlusX64.efi
 
 	/* 0 */	0x0300, 0x0301, 0x0302, 0x0303, 0x0304, 0x0305, 0x0306, 0x0307, 0x0308, 0x0309, 0x030A, 0x030B, 0x030C, 0x030D, 0x030E, 0x030F,
 	/* 1 */	0x0310, 0x0311, 0x0312, 0x0313, 0x0314, 0x0315, 0x0316, 0x0317, 0x0318, 0x0319, 0x031A, 0x031B, 0x031C, 0x031D, 0x031E, 0x031F,
@@ -109,7 +141,7 @@ u_int16_t gLowerCaseTable[] = {
 	/* E */	0x03E0, 0x03E1, 0x03E3, 0x03E3, 0x03E5, 0x03E5, 0x03E7, 0x03E7, 0x03E9, 0x03E9, 0x03EB, 0x03EB, 0x03ED, 0x03ED, 0x03EF, 0x03EF,
 	/* F */	0x03F0, 0x03F1, 0x03F2, 0x03F3, 0x03F4, 0x03F5, 0x03F6, 0x03F7, 0x03F8, 0x03F9, 0x03FA, 0x03FB, 0x03FC, 0x03FD, 0x03FE, 0x03FF,
 
-	// Table 4 (for high byte 0x04)
+	// Table 3 (for high byte 0x04) 512 bytes starting @ 0x4A40 in HFSPlusX64.efi
 
 	/* 0 */	0x0400, 0x0401, 0x0452, 0x0403, 0x0454, 0x0455, 0x0456, 0x0407, 0x0458, 0x0459, 0x045A, 0x045B, 0x040C, 0x040D, 0x040E, 0x045F,
 	/* 1 */	0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0419, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
@@ -128,7 +160,7 @@ u_int16_t gLowerCaseTable[] = {
 	/* E */	0x04E0, 0x04E1, 0x04E2, 0x04E3, 0x04E4, 0x04E5, 0x04E6, 0x04E7, 0x04E8, 0x04E9, 0x04EA, 0x04EB, 0x04EC, 0x04ED, 0x04EE, 0x04EF,
 	/* F */	0x04F0, 0x04F1, 0x04F2, 0x04F3, 0x04F4, 0x04F5, 0x04F6, 0x04F7, 0x04F8, 0x04F9, 0x04FA, 0x04FB, 0x04FC, 0x04FD, 0x04FE, 0x04FF,
 
-	// Table 5 (for high byte 0x05)
+	// Table 4 (for high byte 0x05) 512 bytes starting @ 0x4C40 in HFSPlusX64.efi
 
 	/* 0 */	0x0500, 0x0501, 0x0502, 0x0503, 0x0504, 0x0505, 0x0506, 0x0507, 0x0508, 0x0509, 0x050A, 0x050B, 0x050C, 0x050D, 0x050E, 0x050F,
 	/* 1 */	0x0510, 0x0511, 0x0512, 0x0513, 0x0514, 0x0515, 0x0516, 0x0517, 0x0518, 0x0519, 0x051A, 0x051B, 0x051C, 0x051D, 0x051E, 0x051F,
@@ -147,7 +179,7 @@ u_int16_t gLowerCaseTable[] = {
 	/* E */	0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, 0x05E8, 0x05E9, 0x05EA, 0x05EB, 0x05EC, 0x05ED, 0x05EE, 0x05EF,
 	/* F */	0x05F0, 0x05F1, 0x05F2, 0x05F3, 0x05F4, 0x05F5, 0x05F6, 0x05F7, 0x05F8, 0x05F9, 0x05FA, 0x05FB, 0x05FC, 0x05FD, 0x05FE, 0x05FF,
 
-	// Table 6 (for high byte 0x10)
+	// Table 5 (for high byte 0x10) 512 bytes starting @ 0x4E40 in HFSPlusX64.efi
 
 	/* 0 */	0x1000, 0x1001, 0x1002, 0x1003, 0x1004, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009, 0x100A, 0x100B, 0x100C, 0x100D, 0x100E, 0x100F,
 	/* 1 */	0x1010, 0x1011, 0x1012, 0x1013, 0x1014, 0x1015, 0x1016, 0x1017, 0x1018, 0x1019, 0x101A, 0x101B, 0x101C, 0x101D, 0x101E, 0x101F,
@@ -166,7 +198,7 @@ u_int16_t gLowerCaseTable[] = {
 	/* E */	0x10E0, 0x10E1, 0x10E2, 0x10E3, 0x10E4, 0x10E5, 0x10E6, 0x10E7, 0x10E8, 0x10E9, 0x10EA, 0x10EB, 0x10EC, 0x10ED, 0x10EE, 0x10EF,
 	/* F */	0x10F0, 0x10F1, 0x10F2, 0x10F3, 0x10F4, 0x10F5, 0x10F6, 0x10F7, 0x10F8, 0x10F9, 0x10FA, 0x10FB, 0x10FC, 0x10FD, 0x10FE, 0x10FF,
 
-	// Table 7 (for high byte 0x20)
+	// Table 6 (for high byte 0x20) 512 bytes starting @ 0x5040 in HFSPlusX64.efi
 
 	/* 0 */	0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x200B, 0x0000, 0x0000, 0x0000, 0x0000,
 	/* 1 */	0x2010, 0x2011, 0x2012, 0x2013, 0x2014, 0x2015, 0x2016, 0x2017, 0x2018, 0x2019, 0x201A, 0x201B, 0x201C, 0x201D, 0x201E, 0x201F,
@@ -185,7 +217,7 @@ u_int16_t gLowerCaseTable[] = {
 	/* E */	0x20E0, 0x20E1, 0x20E2, 0x20E3, 0x20E4, 0x20E5, 0x20E6, 0x20E7, 0x20E8, 0x20E9, 0x20EA, 0x20EB, 0x20EC, 0x20ED, 0x20EE, 0x20EF,
 	/* F */	0x20F0, 0x20F1, 0x20F2, 0x20F3, 0x20F4, 0x20F5, 0x20F6, 0x20F7, 0x20F8, 0x20F9, 0x20FA, 0x20FB, 0x20FC, 0x20FD, 0x20FE, 0x20FF,
 
-	// Table 8 (for high byte 0x21)
+	// Table 7 (for high byte 0x21) 512 bytes starting @ 0x5240 in HFSPlusX64.efi
 
 	/* 0 */	0x2100, 0x2101, 0x2102, 0x2103, 0x2104, 0x2105, 0x2106, 0x2107, 0x2108, 0x2109, 0x210A, 0x210B, 0x210C, 0x210D, 0x210E, 0x210F,
 	/* 1 */	0x2110, 0x2111, 0x2112, 0x2113, 0x2114, 0x2115, 0x2116, 0x2117, 0x2118, 0x2119, 0x211A, 0x211B, 0x211C, 0x211D, 0x211E, 0x211F,
@@ -204,7 +236,7 @@ u_int16_t gLowerCaseTable[] = {
 	/* E */	0x21E0, 0x21E1, 0x21E2, 0x21E3, 0x21E4, 0x21E5, 0x21E6, 0x21E7, 0x21E8, 0x21E9, 0x21EA, 0x21EB, 0x21EC, 0x21ED, 0x21EE, 0x21EF,
 	/* F */	0x21F0, 0x21F1, 0x21F2, 0x21F3, 0x21F4, 0x21F5, 0x21F6, 0x21F7, 0x21F8, 0x21F9, 0x21FA, 0x21FB, 0x21FC, 0x21FD, 0x21FE, 0x21FF,
 
-	// Table 9 (for high byte 0xFE)
+	// Table 8 (for high byte 0xFE) 512 bytes starting @ 0x5440 in HFSPlusX64.efi
 
 	/* 0 */	0xFE00, 0xFE01, 0xFE02, 0xFE03, 0xFE04, 0xFE05, 0xFE06, 0xFE07, 0xFE08, 0xFE09, 0xFE0A, 0xFE0B, 0xFE0C, 0xFE0D, 0xFE0E, 0xFE0F,
 	/* 1 */	0xFE10, 0xFE11, 0xFE12, 0xFE13, 0xFE14, 0xFE15, 0xFE16, 0xFE17, 0xFE18, 0xFE19, 0xFE1A, 0xFE1B, 0xFE1C, 0xFE1D, 0xFE1E, 0xFE1F,
@@ -223,7 +255,7 @@ u_int16_t gLowerCaseTable[] = {
 	/* E */	0xFEE0, 0xFEE1, 0xFEE2, 0xFEE3, 0xFEE4, 0xFEE5, 0xFEE6, 0xFEE7, 0xFEE8, 0xFEE9, 0xFEEA, 0xFEEB, 0xFEEC, 0xFEED, 0xFEEE, 0xFEEF,
 	/* F */	0xFEF0, 0xFEF1, 0xFEF2, 0xFEF3, 0xFEF4, 0xFEF5, 0xFEF6, 0xFEF7, 0xFEF8, 0xFEF9, 0xFEFA, 0xFEFB, 0xFEFC, 0xFEFD, 0xFEFE, 0x0000,
 
-	// Table 10 (for high byte 0xFF)
+	// Table 9 (for high byte 0xFF) 512 bytes starting @ 0x5640 in HFSPlusX64.efi
 
 	/* 0 */	0xFF00, 0xFF01, 0xFF02, 0xFF03, 0xFF04, 0xFF05, 0xFF06, 0xFF07, 0xFF08, 0xFF09, 0xFF0A, 0xFF0B, 0xFF0C, 0xFF0D, 0xFF0E, 0xFF0F,
 	/* 1 */	0xFF10, 0xFF11, 0xFF12, 0xFF13, 0xFF14, 0xFF15, 0xFF16, 0xFF17, 0xFF18, 0xFF19, 0xFF1A, 0xFF1B, 0xFF1C, 0xFF1D, 0xFF1E, 0xFF1F,
@@ -245,8 +277,8 @@ u_int16_t gLowerCaseTable[] = {
 
 /* RelString case folding table */
 
-unsigned short gCompareTable[] = {
-
+unsigned short gCompareTable[] =
+{
 	/* 0 */	0x0000, 0x0100, 0x0200, 0x0300, 0x0400, 0x0500, 0x0600, 0x0700, 0x0800, 0x0900, 0x0A00, 0x0B00, 0x0C00, 0x0D00, 0x0E00, 0x0F00, 
 	/* 1 */	0x1000, 0x1100, 0x1200, 0x1300, 0x1400, 0x1500, 0x1600, 0x1700, 0x1800, 0x1900, 0x1A00, 0x1B00, 0x1C00, 0x1D00, 0x1E00, 0x1F00, 
 	/* 2 */	0x2000, 0x2100, 0x2200, 0x2300, 0x2400, 0x2500, 0x2600, 0x2700, 0x2800, 0x2900, 0x2A00, 0x2B00, 0x2C00, 0x2D00, 0x2E00, 0x2F00, 
@@ -261,7 +293,7 @@ unsigned short gCompareTable[] = {
 	/* 7 */	0x5000, 0x5100, 0x5200, 0x5300, 0x5400, 0x5500, 0x5600, 0x5700, 0x5800, 0x5900, 0x5A00, 0x7B00, 0x7C00, 0x7D00, 0x7E00, 0x7F00, 
 
 	// range 0x80 to 0xd8 gets mapped...
-	
+
 	/* 8 */	0x4108, 0x410C, 0x4310, 0x4502, 0x4E0A, 0x4F08, 0x5508, 0x4182, 0x4104, 0x4186, 0x4108, 0x410A, 0x410C, 0x4310, 0x4502, 0x4584,
 	/* 9 */	0x4586, 0x4588, 0x4982, 0x4984, 0x4986, 0x4988, 0x4E0A, 0x4F82, 0x4F84, 0x4F86, 0x4F08, 0x4F0A, 0x5582, 0x5584, 0x5586, 0x5508,
 	/* A */	0xA000, 0xA100, 0xA200, 0xA300, 0xA400, 0xA500, 0xA600, 0x5382, 0xA800, 0xA900, 0xAA00, 0xAB00, 0xAC00, 0xAD00, 0x4114, 0x4F0E,
@@ -271,290 +303,317 @@ unsigned short gCompareTable[] = {
 
 	/* E */	0xE000, 0xE100, 0xE200, 0xE300, 0xE400, 0xE500, 0xE600, 0xE700, 0xE800, 0xE900, 0xEA00, 0xEB00, 0xEC00, 0xED00, 0xEE00, 0xEF00, 
 	/* F */	0xF000, 0xF100, 0xF200, 0xF300, 0xF400, 0xF500, 0xF600, 0xF700, 0xF800, 0xF900, 0xFA00, 0xFB00, 0xFC00, 0xFD00, 0xFE00, 0xFF00, 
-
 };
-#else /* ! UNCOMPRESSED */
+#else
 
-enum {
-    kTypeLiteral = 0,
-    kTypeAscending = 1,
-    kTypeAscending256 = 2
+enum
+{
+	kTypeLiteral		= 0,
+	kTypeAscending		= 1,
+	kTypeAscending256	= 2
 };
 
-struct compressed_block {
-    unsigned char type;
-    unsigned char count;
-    unsigned short data;
+struct CompressedBlock
+{
+	unsigned char type;
+	unsigned char count;
+	unsigned short data;
 };
 
+unsigned short *gLatinCaseFoldTable;
 unsigned short *gLowerCaseTable;
+unsigned short *gCompareTable;
 
-struct compressed_block gLowerCaseTableCompressed[] = {
- {0x0, 0x1, 0x100}, 
- {0x0, 0x1, 0x200}, 
- {0x0, 0x1, 0x0}, 
- {0x0, 0x1, 0x300}, 
- {0x0, 0x1, 0x400}, 
- {0x0, 0x1, 0x500}, 
- {0x0, 0xa, 0x0}, 
- {0x0, 0x1, 0x600}, 
- {0x0, 0xf, 0x0}, 
- {0x0, 0x1, 0x700}, 
- {0x0, 0x1, 0x800}, 
- {0x0, 0xdc, 0x0}, 
- {0x0, 0x1, 0x900}, 
- {0x0, 0x1, 0xa00}, 
- {0x0, 0x1, 0xffff}, 
- {0x1, 0x40, 0x1}, 
- {0x1, 0x1a, 0x61}, 
- {0x1, 0x6b, 0x5b}, 
- {0x0, 0x1, 0xe6}, 
- {0x1, 0x9, 0xc7}, 
- {0x0, 0x1, 0xf0}, 
- {0x1, 0x7, 0xd1}, 
- {0x0, 0x1, 0xf8}, 
- {0x1, 0x5, 0xd9}, 
- {0x0, 0x1, 0xfe}, 
- {0x1, 0x31, 0xdf}, 
- {0x0, 0x2, 0x111}, 
- {0x1, 0x14, 0x112}, 
- {0x0, 0x2, 0x127}, 
- {0x1, 0xa, 0x128}, 
- {0x0, 0x2, 0x133}, 
- {0x1, 0xb, 0x134}, 
- {0x0, 0x2, 0x140}, 
- {0x0, 0x2, 0x142}, 
- {0x1, 0x7, 0x143}, 
- {0x0, 0x2, 0x14b}, 
- {0x1, 0x6, 0x14c}, 
- {0x0, 0x2, 0x153}, 
- {0x1, 0x12, 0x154}, 
- {0x0, 0x2, 0x167}, 
- {0x1, 0x19, 0x168}, 
- {0x0, 0x1, 0x253}, 
- {0x0, 0x2, 0x183}, 
- {0x0, 0x2, 0x185}, 
- {0x0, 0x1, 0x254}, 
- {0x0, 0x2, 0x188}, 
- {0x1, 0x2, 0x256}, 
- {0x0, 0x2, 0x18c}, 
- {0x0, 0x1, 0x18d}, 
- {0x0, 0x1, 0x1dd}, 
- {0x0, 0x1, 0x259}, 
- {0x0, 0x1, 0x25b}, 
- {0x0, 0x2, 0x192}, 
- {0x0, 0x1, 0x260}, 
- {0x0, 0x1, 0x263}, 
- {0x0, 0x1, 0x195}, 
- {0x0, 0x1, 0x269}, 
- {0x0, 0x1, 0x268}, 
- {0x0, 0x2, 0x199}, 
- {0x1, 0x2, 0x19a}, 
- {0x0, 0x1, 0x26f}, 
- {0x0, 0x1, 0x272}, 
- {0x0, 0x1, 0x19e}, 
- {0x0, 0x1, 0x275}, 
- {0x1, 0x2, 0x1a0}, 
- {0x0, 0x2, 0x1a3}, 
- {0x0, 0x2, 0x1a5}, 
- {0x0, 0x1, 0x1a6}, 
- {0x0, 0x2, 0x1a8}, 
- {0x0, 0x1, 0x283}, 
- {0x1, 0x2, 0x1aa}, 
- {0x0, 0x2, 0x1ad}, 
- {0x0, 0x1, 0x288}, 
- {0x1, 0x2, 0x1af}, 
- {0x1, 0x2, 0x28a}, 
- {0x0, 0x2, 0x1b4}, 
- {0x0, 0x2, 0x1b6}, 
- {0x0, 0x1, 0x292}, 
- {0x0, 0x2, 0x1b9}, 
- {0x1, 0x2, 0x1ba}, 
- {0x0, 0x2, 0x1bd}, 
- {0x1, 0x6, 0x1be}, 
- {0x0, 0x3, 0x1c6}, 
- {0x0, 0x3, 0x1c9}, 
- {0x0, 0x3, 0x1cc}, 
- {0x1, 0x17, 0x1cd}, 
- {0x0, 0x2, 0x1e5}, 
- {0x1, 0xb, 0x1e6}, 
- {0x0, 0x3, 0x1f3}, 
- {0x1, 0xc, 0x1f4}, 
- {0x1, 0x91, 0x300}, 
- {0x1, 0x11, 0x3b1}, 
- {0x0, 0x1, 0x3a2}, 
- {0x1, 0x7, 0x3c3}, 
- {0x1, 0x38, 0x3aa}, 
- {0x0, 0x2, 0x3e3}, 
- {0x0, 0x2, 0x3e5}, 
- {0x0, 0x2, 0x3e7}, 
- {0x0, 0x2, 0x3e9}, 
- {0x0, 0x2, 0x3eb}, 
- {0x0, 0x2, 0x3ed}, 
- {0x0, 0x2, 0x3ef}, 
- {0x1, 0x12, 0x3f0}, 
- {0x0, 0x1, 0x452}, 
- {0x0, 0x1, 0x403}, 
- {0x1, 0x3, 0x454}, 
- {0x0, 0x1, 0x407}, 
- {0x1, 0x4, 0x458}, 
- {0x1, 0x3, 0x40c}, 
- {0x0, 0x1, 0x45f}, 
- {0x1, 0x9, 0x430}, 
- {0x0, 0x1, 0x419}, 
- {0x1, 0x16, 0x43a}, 
- {0x1, 0x30, 0x430}, 
- {0x0, 0x2, 0x461}, 
- {0x0, 0x2, 0x463}, 
- {0x0, 0x2, 0x465}, 
- {0x0, 0x2, 0x467}, 
- {0x0, 0x2, 0x469}, 
- {0x0, 0x2, 0x46b}, 
- {0x0, 0x2, 0x46d}, 
- {0x0, 0x2, 0x46f}, 
- {0x0, 0x2, 0x471}, 
- {0x0, 0x2, 0x473}, 
- {0x0, 0x2, 0x475}, 
- {0x1, 0x2, 0x476}, 
- {0x0, 0x2, 0x479}, 
- {0x0, 0x2, 0x47b}, 
- {0x0, 0x2, 0x47d}, 
- {0x0, 0x2, 0x47f}, 
- {0x0, 0x2, 0x481}, 
- {0x1, 0xe, 0x482}, 
- {0x0, 0x2, 0x491}, 
- {0x0, 0x2, 0x493}, 
- {0x0, 0x2, 0x495}, 
- {0x0, 0x2, 0x497}, 
- {0x0, 0x2, 0x499}, 
- {0x0, 0x2, 0x49b}, 
- {0x0, 0x2, 0x49d}, 
- {0x0, 0x2, 0x49f}, 
- {0x0, 0x2, 0x4a1}, 
- {0x0, 0x2, 0x4a3}, 
- {0x0, 0x2, 0x4a5}, 
- {0x0, 0x2, 0x4a7}, 
- {0x0, 0x2, 0x4a9}, 
- {0x0, 0x2, 0x4ab}, 
- {0x0, 0x2, 0x4ad}, 
- {0x0, 0x2, 0x4af}, 
- {0x0, 0x2, 0x4b1}, 
- {0x0, 0x2, 0x4b3}, 
- {0x0, 0x2, 0x4b5}, 
- {0x0, 0x2, 0x4b7}, 
- {0x0, 0x2, 0x4b9}, 
- {0x0, 0x2, 0x4bb}, 
- {0x0, 0x2, 0x4bd}, 
- {0x0, 0x2, 0x4bf}, 
- {0x1, 0x3, 0x4c0}, 
- {0x0, 0x2, 0x4c4}, 
- {0x1, 0x2, 0x4c5}, 
- {0x0, 0x2, 0x4c8}, 
- {0x1, 0x2, 0x4c9}, 
- {0x0, 0x2, 0x4cc}, 
- {0x1, 0x64, 0x4cd}, 
- {0x1, 0x26, 0x561}, 
- {0x1, 0xa9, 0x557}, 
- {0x1, 0xa0, 0x1000}, 
- {0x1, 0x26, 0x10d0}, 
- {0x1, 0x3a, 0x10c6}, 
- {0x1, 0xc, 0x2000}, 
- {0x0, 0x4, 0x0}, 
- {0x1, 0x1a, 0x2010}, 
- {0x0, 0x5, 0x0}, 
- {0x1, 0x3b, 0x202f}, 
- {0x0, 0x6, 0x0}, 
- {0x1, 0xf0, 0x2070}, 
- {0x1, 0x10, 0x2170}, 
- {0x1, 0x90, 0x2170}, 
- {0x1, 0xff, 0xfe00}, 
- {0x0, 0x1, 0x0}, 
- {0x1, 0x21, 0xff00}, 
- {0x1, 0x1a, 0xff41}, 
- {0x1, 0xc5, 0xff3b}, 
+struct CompressedBlock gLatinCaseFoldTableCompressed[] =
+{
+	{ kTypeLiteral,		0x01, 0xffff },
+	{ kTypeAscending,	0x40, 0x0001 },
+	{ kTypeAscending,	0x1a, 0x0061 },
+	{ kTypeAscending,	0x6b, 0x005b },
+	{ kTypeLiteral,		0x01, 0x00e6 },
+	{ kTypeAscending,	0x09, 0x00c7 },
+	{ kTypeLiteral,		0x01, 0x00f0 },
+	{ kTypeAscending,	0x07, 0x00d1 },
+	{ kTypeLiteral,		0x01, 0x00f8 },
+	{ kTypeAscending,	0x05, 0x00d9 },
+	{ kTypeLiteral,		0x01, 0x00fe },
+	{ kTypeAscending,	0x21, 0x00df }
+};
+
+struct CompressedBlock gLowerCaseTableCompressed[] =
+{
+	/* Table 0 */
+	{ kTypeLiteral,		0x01, 0x0000 },
+	{ kTypeLiteral,		0x01, 0x0100 },
+	{ kTypeLiteral,		0x01, 0x0000 },
+	{ kTypeLiteral,		0x01, 0x0200 },
+	{ kTypeLiteral,		0x01, 0x0300 },
+	{ kTypeLiteral,		0x01, 0x0400 },
+	{ kTypeLiteral,		0x0a, 0x0000 },
+	{ kTypeLiteral,		0x01, 0x0500 },
+	{ kTypeLiteral,		0x0f, 0x0000 },
+	{ kTypeLiteral,		0x01, 0x0600 },
+	{ kTypeLiteral,		0x01, 0x0700 },
+	{ kTypeLiteral,		0xdc, 0x0000 },
+	{ kTypeLiteral,		0x01, 0x0800 },
+	{ kTypeLiteral,		0x01, 0x0900 },
+
+	/* Table 1 */
+	{ kTypeAscending,	0x10, 0x0100 },
+	{ kTypeLiteral,		0x01, 0x0111 },
+	{ kTypeAscending,	0x15, 0x0111 },
+	{ kTypeLiteral,		0x01, 0x0127 },
+	{ kTypeAscending,	0x0b, 0x0127 },
+	{ kTypeLiteral,		0x01, 0x0133 },
+	{ kTypeAscending,	0x0c, 0x0133 },
+	{ kTypeLiteral,		0x02, 0x0140 },
+	{ kTypeLiteral,		0x01, 0x0142 },
+	{ kTypeAscending,	0x08, 0x0142 },
+	{ kTypeLiteral,		0x01, 0x014b },
+	{ kTypeAscending,	0x07, 0x014b },
+	{ kTypeLiteral,		0x01, 0x0153 },
+	{ kTypeAscending,	0x13, 0x0153 },
+	{ kTypeLiteral,		0x01, 0x0167 },
+	{ kTypeAscending,	0x1a, 0x0167 },
+	{ kTypeLiteral,		0x01, 0x0253 },
+	{ kTypeLiteral,		0x02, 0x0183 },
+	{ kTypeLiteral,		0x02, 0x0185 },
+	{ kTypeLiteral,		0x01, 0x0254 },
+	{ kTypeLiteral,		0x02, 0x0188 },
+	{ kTypeAscending,	0x02, 0x0256 },
+	{ kTypeLiteral,		0x01, 0x018c },
+	{ kTypeAscending,	0x02, 0x018c },
+	{ kTypeLiteral,		0x01, 0x01dd },
+	{ kTypeLiteral,		0x01, 0x0259 },
+	{ kTypeLiteral,		0x01, 0x025b },
+	{ kTypeLiteral,		0x02, 0x0192 },
+	{ kTypeLiteral,		0x01, 0x0260 },
+	{ kTypeLiteral,		0x01, 0x0263 },
+	{ kTypeLiteral,		0x01, 0x0195 },
+	{ kTypeLiteral,		0x01, 0x0269 },
+	{ kTypeLiteral,		0x01, 0x0268 },
+	{ kTypeLiteral,		0x01, 0x0199 },
+	{ kTypeAscending,	0x03, 0x0199 },
+	{ kTypeLiteral,		0x01, 0x026f },
+	{ kTypeLiteral,		0x01, 0x0272 },
+	{ kTypeLiteral,		0x01, 0x019e },
+	{ kTypeLiteral,		0x01, 0x0275 },
+	{ kTypeAscending,	0x02, 0x01a0 },
+	{ kTypeLiteral,		0x02, 0x01a3 },
+	{ kTypeLiteral,		0x02, 0x01a5 },
+	{ kTypeLiteral,		0x01, 0x01a6 },
+	{ kTypeLiteral,		0x02, 0x01a8 },
+	{ kTypeLiteral,		0x01, 0x0283 },
+	{ kTypeAscending,	0x02, 0x01aa },
+	{ kTypeLiteral,		0x02, 0x01ad },
+	{ kTypeLiteral,		0x01, 0x0288 },
+	{ kTypeAscending,	0x02, 0x01af },
+	{ kTypeAscending,	0x02, 0x028a },
+	{ kTypeLiteral,		0x02, 0x01b4 },
+	{ kTypeLiteral,		0x02, 0x01b6 },
+	{ kTypeLiteral,		0x01, 0x0292 },
+	{ kTypeLiteral,		0x02, 0x01b9 },
+	{ kTypeAscending,	0x02, 0x01ba },
+	{ kTypeLiteral,		0x01, 0x01bd },
+	{ kTypeAscending,	0x07, 0x01bd },
+	{ kTypeLiteral,		0x03, 0x01c6 },
+	{ kTypeLiteral,		0x03, 0x01c9 },
+	{ kTypeLiteral,		0x02, 0x01cc },
+	{ kTypeAscending,	0x18, 0x01cc },
+	{ kTypeLiteral,		0x01, 0x01e5 },
+	{ kTypeAscending,	0x0c, 0x01e5 },
+	{ kTypeLiteral,		0x02, 0x01f3 },
+	{ kTypeAscending,	0x0d, 0x01f3 },
+
+	/* Table 2 */
+	{ kTypeAscending,	0x91, 0x0300 },
+	{ kTypeAscending,	0x11, 0x03b1 },
+	{ kTypeLiteral,		0x01, 0x03a2 },
+	{ kTypeAscending,	0x07, 0x03c3 },
+	{ kTypeAscending,	0x38, 0x03aa },
+	{ kTypeLiteral,		0x02, 0x03e3 },
+	{ kTypeLiteral,		0x02, 0x03e5 },
+	{ kTypeLiteral,		0x02, 0x03e7 },
+	{ kTypeLiteral,		0x02, 0x03e9 },
+	{ kTypeLiteral,		0x02, 0x03eb },
+	{ kTypeLiteral,		0x02, 0x03ed },
+	{ kTypeLiteral,		0x02, 0x03ef },
+	{ kTypeAscending,	0x10, 0x03f0 },
+
+	/* Table 3 */
+	{ kTypeAscending,	0x02, 0x0400 },
+	{ kTypeLiteral,		0x01, 0x0452 },
+	{ kTypeLiteral,		0x01, 0x0403 },
+	{ kTypeAscending,	0x03, 0x0454 },
+	{ kTypeLiteral,		0x01, 0x0407 },
+	{ kTypeAscending,	0x04, 0x0458 },
+	{ kTypeAscending,	0x03, 0x040c },
+	{ kTypeLiteral,		0x01, 0x045f },
+	{ kTypeAscending,	0x09, 0x0430 },
+	{ kTypeLiteral,		0x01, 0x0419 },
+	{ kTypeAscending,	0x16, 0x043a },
+	{ kTypeAscending,	0x30, 0x0430 },
+	{ kTypeLiteral,		0x02, 0x0461 },
+	{ kTypeLiteral,		0x02, 0x0463 },
+	{ kTypeLiteral,		0x02, 0x0465 },
+	{ kTypeLiteral,		0x02, 0x0467 },
+	{ kTypeLiteral,		0x02, 0x0469 },
+	{ kTypeLiteral,		0x02, 0x046b },
+	{ kTypeLiteral,		0x02, 0x046d },
+	{ kTypeLiteral,		0x02, 0x046f },
+	{ kTypeLiteral,		0x02, 0x0471 },
+	{ kTypeLiteral,		0x02, 0x0473 },
+	{ kTypeLiteral,		0x02, 0x0475 },
+	{ kTypeAscending,	0x02, 0x0476 },
+	{ kTypeLiteral,		0x02, 0x0479 },
+	{ kTypeLiteral,		0x02, 0x047b },
+	{ kTypeLiteral,		0x02, 0x047d },
+	{ kTypeLiteral,		0x02, 0x047f },
+	{ kTypeLiteral,		0x02, 0x0481 },
+	{ kTypeAscending,	0x0e, 0x0482 },
+	{ kTypeLiteral,		0x02, 0x0491 },
+	{ kTypeLiteral,		0x02, 0x0493 },
+	{ kTypeLiteral,		0x02, 0x0495 },
+	{ kTypeLiteral,		0x02, 0x0497 },
+	{ kTypeLiteral,		0x02, 0x0499 },
+	{ kTypeLiteral,		0x02, 0x049b },
+	{ kTypeLiteral,		0x02, 0x049d },
+	{ kTypeLiteral,		0x02, 0x049f },
+	{ kTypeLiteral,		0x02, 0x04a1 },
+	{ kTypeLiteral,		0x02, 0x04a3 },
+	{ kTypeLiteral,		0x02, 0x04a5 },
+	{ kTypeLiteral,		0x02, 0x04a7 },
+	{ kTypeLiteral,		0x02, 0x04a9 },
+	{ kTypeLiteral,		0x02, 0x04ab },
+	{ kTypeLiteral,		0x02, 0x04ad },
+	{ kTypeLiteral,		0x02, 0x04af },
+	{ kTypeLiteral,		0x02, 0x04b1 },
+	{ kTypeLiteral,		0x02, 0x04b3 },
+	{ kTypeLiteral,		0x02, 0x04b5 },
+	{ kTypeLiteral,		0x02, 0x04b7 },
+	{ kTypeLiteral,		0x02, 0x04b9 },
+	{ kTypeLiteral,		0x02, 0x04bb },
+	{ kTypeLiteral,		0x02, 0x04bd },
+	{ kTypeLiteral,		0x02, 0x04bf },
+	{ kTypeAscending,	0x03, 0x04c0 },
+	{ kTypeLiteral,		0x02, 0x04c4 },
+	{ kTypeAscending,	0x02, 0x04c5 },
+	{ kTypeLiteral,		0x02, 0x04c8 },
+	{ kTypeAscending,	0x02, 0x04c9 },
+	{ kTypeLiteral,		0x01, 0x04cc },
+	{ kTypeAscending,	0x34, 0x04cc },
+
+	/* Table 4 */	
+	{ kTypeAscending,	0x31, 0x0500 },
+	{ kTypeAscending,	0x26, 0x0561 },
+	{ kTypeAscending,	0xa9, 0x0557 },
+
+	/* Table 5 */
+	{ kTypeAscending,	0xa0, 0x1000 },
+	{ kTypeAscending,	0x26, 0x10d0 },
+	{ kTypeAscending,	0x3a, 0x10c6 },
+
+	/* Table 6 */
+	{ kTypeAscending,	0x0c, 0x2000 },
+	{ kTypeLiteral,		0x04, 0x0000 },
+	{ kTypeAscending,	0x1a, 0x2010 },
+	{ kTypeLiteral,		0x05, 0x0000 },
+	{ kTypeAscending,	0x3b, 0x202f },
+	{ kTypeLiteral,		0x06, 0x0000 },
+	{ kTypeAscending,	0x90, 0x2070 },
+
+	/* Table 7 */
+	{ kTypeLiteral,		0x01, 0x2100 },
+	{ kTypeAscending,	0x5f, 0x2101 },
+	{ kTypeAscending,	0x10, 0x2170 },
+	{ kTypeAscending,	0x90, 0x2170 },
+
+	/* Table 8 */
+	{ kTypeAscending,	0xff, 0xfe00 },
+	{ kTypeLiteral,		0x01, 0x0000 },
+
+	/* Table 9 */
+	{ kTypeAscending,	0x21, 0xff00 },
+	{ kTypeAscending,	0x1a, 0xff41 },
+	{ kTypeAscending,	0xc5, 0xff3b }
 };
-// Please update count if you add/remove entries but also please just let
-// the compiler calculate it so you don't get it wrong.
-//#define kLowerCaseTableNBlocks 182
-#define kLowerCaseTableNBlocks (sizeof(gLowerCaseTableCompressed)/sizeof(*gLowerCaseTableCompressed))
-// WARNING: The expanded size MUST be updated if you change the table and
-// cannot be calculated at compile time.
-#define kLowerCaseTableDataSize 5632 /* size of uncompressed structure in bytes */
 
-unsigned short *gCompareTable;
 
-struct compressed_block gCompareTableCompressed[] = {
- {0x2, 0x60, 0x0}, 
- {0x0, 0x1, 0x4180}, 
- {0x2, 0x1a, 0x4100}, 
- {0x2, 0x5, 0x7b00}, 
- {0x0, 0x1, 0x4108}, 
- {0x0, 0x1, 0x410c}, 
- {0x0, 0x1, 0x4310}, 
- {0x0, 0x1, 0x4502}, 
- {0x0, 0x1, 0x4e0a}, 
- {0x0, 0x1, 0x4f08}, 
- {0x0, 0x1, 0x5508}, 
- {0x0, 0x1, 0x4182}, 
- {0x0, 0x1, 0x4104}, 
- {0x0, 0x1, 0x4186}, 
- {0x0, 0x1, 0x4108}, 
- {0x0, 0x1, 0x410a}, 
- {0x0, 0x1, 0x410c}, 
- {0x0, 0x1, 0x4310}, 
- {0x0, 0x1, 0x4502}, 
- {0x0, 0x1, 0x4584}, 
- {0x0, 0x1, 0x4586}, 
- {0x0, 0x1, 0x4588}, 
- {0x0, 0x1, 0x4982}, 
- {0x0, 0x1, 0x4984}, 
- {0x0, 0x1, 0x4986}, 
- {0x0, 0x1, 0x4988}, 
- {0x0, 0x1, 0x4e0a}, 
- {0x0, 0x1, 0x4f82}, 
- {0x0, 0x1, 0x4f84}, 
- {0x0, 0x1, 0x4f86}, 
- {0x0, 0x1, 0x4f08}, 
- {0x0, 0x1, 0x4f0a}, 
- {0x0, 0x1, 0x5582}, 
- {0x0, 0x1, 0x5584}, 
- {0x0, 0x1, 0x5586}, 
- {0x0, 0x1, 0x5508}, 
- {0x2, 0x7, 0xa000}, 
- {0x0, 0x1, 0x5382}, 
- {0x2, 0x6, 0xa800}, 
- {0x0, 0x1, 0x4114}, 
- {0x0, 0x1, 0x4f0e}, 
- {0x2, 0xb, 0xb000}, 
- {0x0, 0x1, 0x4192}, 
- {0x0, 0x1, 0x4f92}, 
- {0x0, 0x1, 0xbd00}, 
- {0x0, 0x1, 0x4114}, 
- {0x0, 0x1, 0x4f0e}, 
- {0x2, 0x7, 0xc000}, 
- {0x0, 0x1, 0x2206}, 
- {0x0, 0x1, 0x2208}, 
- {0x0, 0x1, 0xc900}, 
- {0x0, 0x1, 0x2000}, 
- {0x0, 0x1, 0x4104}, 
- {0x0, 0x1, 0x410a}, 
- {0x0, 0x1, 0x4f0a}, 
- {0x0, 0x2, 0x4f14}, 
- {0x2, 0x2, 0xd000}, 
- {0x0, 0x1, 0x2202}, 
- {0x0, 0x1, 0x2204}, 
- {0x0, 0x1, 0x2702}, 
- {0x0, 0x1, 0x2704}, 
- {0x2, 0x2, 0xd600}, 
- {0x0, 0x1, 0x5988}, 
- {0x2, 0x27, 0xd900}, 
+struct CompressedBlock gCompareTableCompressed[] =
+{
+	{ kTypeAscending256,	0x60, 0x0000 },
+	{ kTypeLiteral,			0x01, 0x4180 },
+	{ kTypeAscending256,	0x1a, 0x4100 },
+	{ kTypeAscending256,	0x05, 0x7b00 },
+	{ kTypeLiteral,			0x01, 0x4108 },
+	{ kTypeLiteral,			0x01, 0x410c },
+	{ kTypeLiteral,			0x01, 0x4310 },
+	{ kTypeLiteral,			0x01, 0x4502 },
+	{ kTypeLiteral,			0x01, 0x4e0a },
+	{ kTypeLiteral,			0x01, 0x4f08 },
+	{ kTypeLiteral,			0x01, 0x5508 },
+	{ kTypeLiteral,			0x01, 0x4182 },
+	{ kTypeLiteral,			0x01, 0x4104 },
+	{ kTypeLiteral,			0x01, 0x4186 },
+	{ kTypeLiteral,			0x01, 0x4108 },
+	{ kTypeLiteral,			0x01, 0x410a },
+	{ kTypeLiteral,			0x01, 0x410c },
+	{ kTypeLiteral,			0x01, 0x4310 },
+	{ kTypeLiteral,			0x01, 0x4502 },
+	{ kTypeLiteral,			0x01, 0x4584 },
+	{ kTypeLiteral,			0x01, 0x4586 },
+	{ kTypeLiteral,			0x01, 0x4588 },
+	{ kTypeLiteral,			0x01, 0x4982 },
+	{ kTypeLiteral,			0x01, 0x4984 },
+	{ kTypeLiteral,			0x01, 0x4986 },
+	{ kTypeLiteral,			0x01, 0x4988 },
+	{ kTypeLiteral,			0x01, 0x4e0a },
+	{ kTypeLiteral,			0x01, 0x4f82 },
+	{ kTypeLiteral,			0x01, 0x4f84 },
+	{ kTypeLiteral,			0x01, 0x4f86 },
+	{ kTypeLiteral,			0x01, 0x4f08 },
+	{ kTypeLiteral,			0x01, 0x4f0a },
+	{ kTypeLiteral,			0x01, 0x5582 },
+	{ kTypeLiteral,			0x01, 0x5584 },
+	{ kTypeLiteral,			0x01, 0x5586 },
+	{ kTypeLiteral,			0x01, 0x5508 },
+	{ kTypeAscending256,	0x07, 0xa000 },
+	{ kTypeLiteral,			0x01, 0x5382 },
+	{ kTypeAscending256,	0x06, 0xa800 },
+	{ kTypeLiteral,			0x01, 0x4114 },
+	{ kTypeLiteral,			0x01, 0x4f0e },
+	{ kTypeAscending256,	0x0b, 0xb000 },
+	{ kTypeLiteral,			0x01, 0x4192 },
+	{ kTypeLiteral,			0x01, 0x4f92 },
+	{ kTypeLiteral,			0x01, 0xbd00 },
+	{ kTypeLiteral,			0x01, 0x4114 },
+	{ kTypeLiteral,			0x01, 0x4f0e },
+	{ kTypeAscending256,	0x07, 0xc000 },
+	{ kTypeLiteral,			0x01, 0x2206 },
+	{ kTypeLiteral,			0x01, 0x2208 },
+	{ kTypeLiteral,			0x01, 0xc900 },
+	{ kTypeLiteral,			0x01, 0x2000 },
+	{ kTypeLiteral,			0x01, 0x4104 },
+	{ kTypeLiteral,			0x01, 0x410a },
+	{ kTypeLiteral,			0x01, 0x4f0a },
+	{ kTypeLiteral,			0x02, 0x4f14 },
+	{ kTypeAscending256,	0x02, 0xd000 },
+	{ kTypeLiteral,			0x01, 0x2202 },
+	{ kTypeLiteral,			0x01, 0x2204 },
+	{ kTypeLiteral,			0x01, 0x2702 },
+	{ kTypeLiteral,			0x01, 0x2704 },
+	{ kTypeAscending256,	0x02, 0xd600 },
+	{ kTypeLiteral,			0x01, 0x5988 },
+	{ kTypeAscending256,	0x27, 0xd900 },
 };
-// Please update count if you add/remove entries but also please just let
-// the compiler calculate it so you don't get it wrong.
-//#define kCompareTableNBlocks 64
-#define kCompareTableNBlocks (sizeof(gCompareTableCompressed)/sizeof(*gCompareTableCompressed))
-// WARNING: The expanded size MUST be updated if you change the table and
-// cannot be calculated at compile time.
-#define kCompareTableDataSize 512 /* size of uncompressed structure in bytes */
-
-#endif /* UNCOMPRESSED */
+
+
+#define kLatinCaseFoldTableNBlocks	(sizeof(gLatinCaseFoldTableCompressed) / sizeof(*gLatinCaseFoldTableCompressed))
+#define kLowerCaseTableNBlocks		(sizeof(gLowerCaseTableCompressed) / sizeof(*gLowerCaseTableCompressed))
+#define kCompareTableNBlocks		(sizeof(gCompareTableCompressed) / sizeof(*gCompareTableCompressed))
+
+#define kLatinCaseFoldTableDataSize	256
+#define kLowerCaseTableDataSize		2816
+#define	kCompareTableDataSize		256
+
+#endif /* USE_UNCOMPRESSED_TABLES */

From b57fccf2cafefa1d90b1ba23678fe71edec43531 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:43:05 +0100
Subject: [PATCH 150/623] Overhaul of HFS table data

---
 i386/libsaio/hfs_compare.c | 376 ++++++++++++++++++-------------------
 1 file changed, 182 insertions(+), 194 deletions(-)

diff --git a/i386/libsaio/hfs_compare.c b/i386/libsaio/hfs_compare.c
index 8b86b60..6b61cd6 100755
--- a/i386/libsaio/hfs_compare.c
+++ b/i386/libsaio/hfs_compare.c
@@ -7,7 +7,7 @@
  * are subject to the Apple Public Source License Version 2.0 (the
  * "License").  You may not use this file except in compliance with the
  * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * http: *www.apple.com/publicsource and read it before using this file.
  * 
  * This Original Code and all software distributed under the License are
  * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,91 +18,104 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *  HFSCompare.c - Functions for working with and comparing HFS nams.
  *
- *  Copyright (c) 1999-2000 Apple Computer, Inc.
+ * HFSCompare.c - Functions for working with and comparing HFS nams.
+ *
+ * Copyright (c) 1999-2000 Apple Computer, Inc.
+ *
+ * DRI: Josh de Cesare
+ *
+ * Updates:
+ *			- Latin is now a seperate table, done to make it faster (PikerAlpha, November 2012)
+ *			- UNCOMPRESSED renamed to USE_UNCOMPRESSED_TABLES (PikerAlpha, November 2012)
+ *			- Cleanups and other reformatting to pull it out of the 90's (PikerAlpha, November 2012)
  *
- *  DRI: Josh de Cesare
  */
 
 #include <sl.h>
 #include "hfs_CaseTables.h"
 
-#if ! UNCOMPRESSED
+
+#if USE_COMPRESSED_TABLES
 //==============================================================================
 
-static unsigned short * UncompressStructure(struct compressed_block *bp, int count, int size)
+static unsigned short * deCompressStructure(struct CompressedBlock *cb, int count, int size)
 {
 	int i, j;
 
 	unsigned short *out = malloc(size);
-	unsigned short *op = out;
-	unsigned short data;
 
-	for (i = 0; i < count; i++, bp++)
+	if (out)
 	{
-		// If this happens (it shouldn't) please fix size and/or double check that count really is
-		// the number of elements in the array.
-		// This was a very hard bug to find, so please leave this code here.
-		if (out + size <= op + bp->count)
-		{
-			stop("HFS+ Unicode tables are malformed\n");
-		}
-
-		data = bp->data;
+		unsigned short *op = out;
+		unsigned short data;
 
-		for (j = 0; j <bp->count; j++)
+		for (i = 0; i < count; i++, cb++)
 		{
-			*op++ = data;
-
-			if (bp->type == kTypeAscending)
+			/* If this happens (it shouldn't) please fix size and/or double check that count really is
+			 * the number of elements in the array.
+			 * This was a very hard bug to find, so please leave this code here.
+			 */
+#if DEBUG
+			if ((out + size) <= (op + cb->count))
 			{
-				data++;
+				stop("HFS+ Unicode tables are malformed\n");
 			}
-			else if (bp->type == kTypeAscending256)
+#endif
+			data = cb->data;
+		
+			for (j = 0; j < cb->count; j++)
 			{
-				data += 256;
+				*op++ = data;
+			
+				if (cb->type == kTypeAscending) // 1
+				{
+					data++;
+				}
+				else if (cb->type == kTypeAscending256) // 2
+				{
+					data += 256;
+				}
 			}
 		}
+
+		return out;
 	}
 
-	return out;
+	return NULL;
 }
 
 
 //==============================================================================
 
-static void InitCompareTables(void)
+static void deCompressHFSUnicodeTables(void)
 {
 	if (gCompareTable == 0)
 	{
-		gCompareTable = UncompressStructure(gCompareTableCompressed, kCompareTableNBlocks, kCompareTableDataSize);
-		gLowerCaseTable = UncompressStructure(gLowerCaseTableCompressed, kLowerCaseTableNBlocks, kLowerCaseTableDataSize);
+		gLatinCaseFoldTable	= deCompressStructure(gLatinCaseFoldTableCompressed, kLatinCaseFoldTableNBlocks, kLatinCaseFoldTableDataSize);
+		gLowerCaseTable		= deCompressStructure(gLowerCaseTableCompressed, kLowerCaseTableNBlocks, kLowerCaseTableDataSize);
+		gCompareTable		= deCompressStructure(gCompareTableCompressed, kCompareTableNBlocks, kCompareTableDataSize);
+
 	}
 }
-#endif /* ! UNCOMPRESSED */
+#endif /* ! USE_COMPRESSED_TABLES */
 
-//==============================================================================
-//
-//	Routine:	FastRelString
-//
-//	Output:		returns -1 if str1 < str2
-//				returns  1 if str1 > str2
-//				return	 0 if equal
-//
-//==============================================================================
+
+/*==============================================================================
+ *
+ *	Routine:	FastRelString
+ *
+ *	Output:		returns -1 if str1 < str2
+ *				returns  1 if str1 > str2
+ *				return	 0 if equal
+ *
+ */
 
 int32_t	FastRelString(u_int8_t * str1, u_int8_t * str2)
 {
 	int32_t  bestGuess;
 	u_int8_t length, length2;
 
-#if ! UNCOMPRESED
-	InitCompareTables();
-#endif
-
 	length = *(str1++);
 	length2 = *(str2++);
 
@@ -120,6 +133,12 @@ int32_t	FastRelString(u_int8_t * str1, u_int8_t * str2)
 		length = length2;
 	}
 
+#if USE_COMPRESSED_TABLES
+	deCompressHFSUnicodeTables();
+#endif
+
+	// u_int16_t* compareTable = (u_int16_t*) gCompareTable;
+
 	while (length--)
 	{
 		u_int32_t aChar, bChar;
@@ -127,7 +146,7 @@ int32_t	FastRelString(u_int8_t * str1, u_int8_t * str2)
 		aChar = *(str1++);
 		bChar = *(str2++);
 		
-		if (aChar != bChar)	/* If they don't match exacly, do case conversion */
+		if (aChar != bChar)	 /* If they don't match exacly, do case conversion */
 		{
 			u_int16_t aSortWord, bSortWord;
 
@@ -151,77 +170,78 @@ int32_t	FastRelString(u_int8_t * str1, u_int8_t * str2)
 		 */
 	}
 	
-	/* if you got to here, then return bestGuess */
+	/* If you got to here, then return bestGuess */
 	return bestGuess;
 }	
 
 
-//==============================================================================
-//
-//	FastUnicodeCompare - Compare two Unicode strings; produce a relative ordering
-//
-//	    IF				RESULT
-//	--------------------------
-//	str1 < str2		=>	-1
-//	str1 = str2		=>	 0
-//	str1 > str2		=>	+1
-//
-//	The lower case table starts with 256 entries (one for each of the upper bytes
-//	of the original Unicode char).  If that entry is zero, then all characters with
-//	that upper byte are already case folded.  If the entry is non-zero, then it is
-//	the _index_ (not byte offset) of the start of the sub-table for the characters
-//	with that upper byte.  All ignorable characters are folded to the value zero.
-//
-//	In pseudocode:
-//
-//		Let c = source Unicode character
-//		Let table[] = lower case table
-//
-//		lower = table[highbyte(c)]
-//		if (lower == 0)
-//			lower = c
-//		else
-//			lower = table[lower+lowbyte(c)]
-//
-//		if (lower == 0)
-//			ignore this character
-//
-//	To handle ignorable characters, we now need a loop to find the next valid character.
-//	Also, we can't pre-compute the number of characters to compare; the string length might
-//	be larger than the number of non-ignorable characters.  Further, we must be able to handle
-//	ignorable characters at any point in the string, including as the first or last characters.
-//	We use a zero value as a sentinel to detect both end-of-string and ignorable characters.
-//	Since the File Manager doesn't prevent the NUL character (value zero) as part of a filename,
-//	the case mapping table is assumed to map u+0000 to some non-zero value (like 0xFFFF, which is
-//	an invalid Unicode character).
-//
-//	Pseudocode:
-//
-//		while (1) {
-//			c1 = GetNextValidChar(str1)			//	returns zero if at end of string
-//			c2 = GetNextValidChar(str2)
-//
-//			if (c1 != c2) break					//	found a difference
-//
-//			if (c1 == 0)						//	reached end of string on both strings at once?
-//				return 0;						//	yes, so strings are equal
-//		}
-//
-//		// When we get here, c1 != c2.  So, we just need to determine which one is less.
-//		if (c1 < c2)
-//			return -1;
-//		else
-//			return 1;
-//
-
-int32_t FastUnicodeCompare(u_int16_t * str1, register u_int32_t length1,
-                            u_int16_t * str2, register u_int32_t length2, int byte_order)
+/*==============================================================================
+ *
+ *	FastUnicodeCompare - Compare two Unicode strings; produce a relative ordering
+ *
+ *	    IF				RESULT
+ *	--------------------------
+ *	str1 < str2		=>	-1
+ *	str1 = str2		=>	 0
+ *	str1 > str2		=>	+1
+ *
+ *	The lower case table starts with 256 entries (one for each of the upper bytes
+ *	of the original Unicode char).  If that entry is zero, then all characters with
+ *	that upper byte are already case folded.  If the entry is non-zero, then it is
+ *	the _index_ (not byte offset) of the start of the sub-table for the characters
+ *	with that upper byte.  All ignorable characters are folded to the value zero.
+ *
+ *	In pseudocode:
+ *
+ *		Let c = source Unicode character
+ *		Let table[] = lower case table
+ *
+ *		lower = table[highbyte(c)]
+ *		if (lower == 0)
+ *			lower = c
+ *		else
+ *			lower = table[lower+lowbyte(c)]
+ *
+ *		if (lower == 0)
+ *			ignore this character
+ *
+ *	To handle ignorable characters, we now need a loop to find the next valid character.
+ *	Also, we can't pre-compute the number of characters to compare; the string length might
+ *	be larger than the number of non-ignorable characters.  Further, we must be able to handle
+ *	ignorable characters at any point in the string, including as the first or last characters.
+ *	We use a zero value as a sentinel to detect both end-of-string and ignorable characters.
+ *	Since the File Manager doesn't prevent the NUL character (value zero) as part of a filename,
+ *	the case mapping table is assumed to map u+0000 to some non-zero value (like 0xFFFF, which is
+ *	an invalid Unicode character).
+ *
+ *	Pseudocode:
+ *
+ *		while (1) {
+ *			c1 = GetNextValidChar(str1)			 *	returns zero if at end of string
+ *			c2 = GetNextValidChar(str2)
+ *
+ *			if (c1 != c2) break					 *	found a difference
+ *
+ *			if (c1 == 0)						 *	reached end of string on both strings at once?
+ *				return 0;						 *	yes, so strings are equal
+ *		}
+ *
+ *		// When we get here, c1 != c2.  So, we just need to determine which one is less.
+ *		if (c1 < c2)
+ *			return -1;
+ *		else
+ *			return 1;
+ */
+
+int32_t FastUnicodeCompare(u_int16_t * str1, register u_int32_t length1, u_int16_t * str2, register u_int32_t length2)
 {
 	register u_int16_t c1, c2;
 	register u_int16_t temp;
 
-#if ! UNCOMPRESSED
-	InitCompareTables();
+	register UInt16 * lowerCaseTable = (UInt16*) gLowerCaseTable;
+
+#if USE_COMPRESSED_TABLES
+	deCompressHFSUnicodeTables();
 #endif
 
 	while (1)
@@ -233,51 +253,50 @@ int32_t FastUnicodeCompare(u_int16_t * str1, register u_int32_t length1,
 		/* Find next non-ignorable char from str1, or zero if no more */
 		while (length1 && c1 == 0)
 		{
-			if (byte_order == OSBigEndian)
-			{
-				c1 = SWAP_BE16(*(str1++));
-			}
-			else
-			{
-				c1 = SWAP_LE16(*(str1++));
-			}
-
+			c1 = SWAP_BE16(*(str1++));
 			--length1;
 
-			if ((temp = gLowerCaseTable[c1>>8]) != 0)		// is there a subtable for this upper byte?
+			/* Check for basic latin first */
+			if (c1 < 0x0100)
+			{
+				c1 =  SWAP_BE16(gLatinCaseFoldTable[c1]);
+				break;
+			}
+			/* Case fold if neccessary */
+			if ((temp = lowerCaseTable[c1 >> 8]) != 0)		/* Is there a subtable for this upper byte? */
 			{
-				c1 = gLowerCaseTable[temp + (c1 & 0x00FF)];	// yes, so fold the char
+				c1 = lowerCaseTable[temp + (c1 & 0x00FF)];	/* Yes, so fold the char */
 			}
 		}
 
 		/* Find next non-ignorable char from str2, or zero if no more */
 		while (length2 && c2 == 0)
 		{
-			if (byte_order == OSBigEndian)
-			{
-				c2 = SWAP_BE16(*(str2++));
-			}
-			else
+			c2 = SWAP_BE16(*(str2++));
+			--length2;
+
+			/* Check for basic latin first */
+			if (c2 < 0x0100)
 			{
-				c2 = SWAP_LE16(*(str2++));
+				c2 = SWAP_BE16(gLatinCaseFoldTable[c2]);
+				break;
 			}
 
-			--length2;
-
-			if ((temp = gLowerCaseTable[c2>>8]) != 0)		// is there a subtable for this upper byte?
+			/* Case fold if neccessary */
+			if ((temp = lowerCaseTable[c2 >> 8]) != 0)		/* Is there a subtable for this upper byte? */
 			{
-				c2 = gLowerCaseTable[temp + (c2 & 0x00FF)];	// yes, so fold the char
+				c2 = lowerCaseTable[temp + (c2 & 0x00FF)];	/* Yes, so fold the char */
 			}
 		}
 
-		if (c1 != c2)	/* found a difference, so stop looping */
+		if (c1 != c2)	/* Found a difference, so stop looping */
 		{
 			break;
 		}
 		
-		if (c1 == 0)		/* did we reach the end of both strings at the same time? */
+		if (c1 == 0)	/* Did we reach the end of both strings at the same time? */
 		{
-			return 0;	/* yes, so strings are equal */
+			return 0;	/* Yes, so strings are equal */
 		}
 	}
 	
@@ -290,10 +309,10 @@ int32_t FastUnicodeCompare(u_int16_t * str1, register u_int32_t length1,
 }
 
 
-//==============================================================================
-//
-//  BinaryUnicodeCompare - Compare two Unicode strings; produce a relative ordering
-//  Compared using a 16-bit binary comparison (no case folding)
+/*==============================================================================
+ * BinaryUnicodeCompare - Compare two Unicode strings; produce a relative ordering
+ * Compared using a 16-bit binary comparison (no case folding)
+ */
 
 int32_t BinaryUnicodeCompare(u_int16_t * str1, u_int32_t length1, u_int16_t * str2, u_int32_t length2)
 {
@@ -327,7 +346,7 @@ int32_t BinaryUnicodeCompare(u_int16_t * str1, u_int32_t length1, u_int16_t * st
 		}
 
 		if (c1 < c2)
-        {
+		{
 			return (-1);
 		}
 	}
@@ -336,14 +355,14 @@ int32_t BinaryUnicodeCompare(u_int16_t * str1, u_int32_t length1, u_int16_t * st
 }
 
 
-/*
+/*==============================================================================
  * UTF-8 (UCS Transformation Format)
  *
  * The following subset of UTF-8 is used to encode UCS-2 filenames. It
  * requires a maximum of three 3 bytes per UCS-2 character.  Only the
  * shortest encoding required to represent the significant UCS-2 bits
  * is legal.
- * 
+ *
  * UTF-8 Multibyte Codes
  *
  * Bytes   Bits   UCS-2 Min   UCS-2 Max   UTF-8 Byte Sequence (binary)
@@ -355,7 +374,7 @@ int32_t BinaryUnicodeCompare(u_int16_t * str1, u_int32_t length1, u_int16_t * st
  */
 
 
-/*
+/*==============================================================================
  * utf_encodestr - Encodes the UCS-2 (Unicode) string at ucsp into a
  * null terminated UTF-8 string at utf8p.
  *
@@ -363,7 +382,7 @@ int32_t BinaryUnicodeCompare(u_int16_t * str1, u_int32_t length1, u_int16_t * st
  * bufsize is the size of the output buffer in bytes
  */
 
-void utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32_t bufsize, int byte_order)
+void utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32_t bufsize)
 {
 	u_int8_t *bufend;
 	u_int16_t ucs_ch;
@@ -372,14 +391,7 @@ void utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32
 
 	while (ucslen-- > 0)
 	{
-		if (byte_order == OSBigEndian)
-		{
-			ucs_ch = SWAP_BE16(*ucsp++);
-		}
-		else
-		{
-			ucs_ch = SWAP_LE16(*ucsp++);
-		}
+		ucs_ch = SWAP_BE16(*ucsp++);
 
 		if (ucs_ch < 0x0080)
 		{
@@ -390,7 +402,7 @@ void utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32
 
 			if (ucs_ch == '\0')
 			{
-				continue;	/* skip over embedded NULLs */
+				continue;	/* Skip over embedded NULLs */
 			}
 
 			*utf8p++ = ucs_ch;
@@ -403,8 +415,8 @@ void utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32
 				break;
 			}
 
-			*utf8p++ = (ucs_ch >> 6)   | 0xc0;
-			*utf8p++ = (ucs_ch & 0x3f) | 0x80;
+			*utf8p++ = ((ucs_ch >> 6) | 0xc0);
+			*utf8p++ = ((ucs_ch & 0x3f) | 0x80);
 		}
 		else
 		{
@@ -413,9 +425,9 @@ void utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32
 				break;
 			}
 
-			*utf8p++ = (ucs_ch >> 12)         | 0xe0;
-			*utf8p++ = ((ucs_ch >> 6) & 0x3f) | 0x80;
-			*utf8p++ = ((ucs_ch) & 0x3f)      | 0x80;
+			*utf8p++ = ((ucs_ch >> 12) | 0xe0);
+			*utf8p++ = (((ucs_ch >> 6) & 0x3f) | 0x80);
+			*utf8p++ = ((ucs_ch & 0x3f) | 0x80);
 		}
 	}
 
@@ -423,7 +435,7 @@ void utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32
 }
 
 
-/*
+/*==============================================================================
  * utf_decodestr - Decodes the null terminated UTF-8 string at
  * utf8p into a UCS-2 (Unicode) string at ucsp.
  *
@@ -431,7 +443,7 @@ void utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32
  * bufsize is the size of the output buffer in bytes
  */
 
-void utf_decodestr(const u_int8_t * utf8p, u_int16_t * ucsp, u_int16_t * ucslen, u_int32_t bufsize, int byte_order)
+void utf_decodestr(const u_int8_t * utf8p, u_int16_t * ucsp, u_int16_t * ucslen, u_int32_t bufsize)
 {
 	u_int16_t *bufstart;
 	u_int16_t *bufend;
@@ -448,36 +460,27 @@ void utf_decodestr(const u_int8_t * utf8p, u_int16_t * ucsp, u_int16_t * ucslen,
 			break;
 		}
 
-		/* check for ascii */
+		/* Check for ASCII */
 		if (byte < 0x80)
 		{
 			ucs_ch = byte;
-			
-			if (byte_order == OSBigEndian)
-			{
-				*ucsp++ = SWAP_BE16(ucs_ch);
-			}
-			else
-			{
-				*ucsp++ = SWAP_LE16(ucs_ch);
-			}
-
+			*ucsp++ = SWAP_BE16(ucs_ch);
 			continue;
 		}
 
 		switch (byte & 0xf0)
 		{
-			/*  2 byte sequence*/
+			/* 2 byte sequence */
 			case 0xc0:
-			case 0xd0:	/* extract bits 6 - 10 from first byte */
-						ucs_ch = (byte & 0x1F) << 6;
+			case 0xd0:	/* Extract bits 6 - 10 from first byte */
+						ucs_ch = ((byte & 0x1F) << 6);
 						break;
-			/* 3 byte sequence*/
+			/* 3 byte sequence */
 			case 0xe0:
-						/* extract bits 12 - 15 from first byte */
-						ucs_ch = (byte & 0x0F) << 6;
+						/* Extract bits 12 - 15 from first byte */
+						ucs_ch = ((byte & 0x0F) << 6);
 
-						/* extract bits 6 - 11 from second byte */
+						/* Extract bits 6 - 11 from second byte */
 						if (((byte = *utf8p++) & 0xc0) != 0x80)
 						{
 							goto stop;
@@ -490,31 +493,16 @@ void utf_decodestr(const u_int8_t * utf8p, u_int16_t * ucsp, u_int16_t * ucslen,
 						goto stop;
 		}
 
-		/* extract bits 0 - 5 from final byte */
+		/* Extract bits 0 - 5 from final byte */
 		if (((byte = *utf8p++) & 0xc0) != 0x80)
 		{
 			goto stop;
 		}
 
 		ucs_ch += (byte & 0x3F);
-
-		if (byte_order == OSBigEndian)
-		{
-			*ucsp++ = SWAP_BE16(ucs_ch);
-		}
-		else
-		{
-			*ucsp++ = SWAP_LE16(ucs_ch);
-		}
+		*ucsp++ = SWAP_BE16(ucs_ch);
 	}
 
 stop:
-	if (byte_order == OSBigEndian)
-	{
-		*ucslen = SWAP_BE16(ucsp - bufstart);
-	}
-    else
-	{
-		*ucslen = SWAP_LE16(ucsp - bufstart);
-	}
+	*ucslen = SWAP_BE16(ucsp - bufstart);
 }

From bbf0dfbc59fe5e99ac539b72223462859c621709 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:45:22 +0100
Subject: [PATCH 151/623] White space changes

---
 i386/libsaio/load.c | 168 ++++++++++++++++++++++----------------------
 1 file changed, 85 insertions(+), 83 deletions(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 2b89f0e..d727f3c 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -18,11 +18,13 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *  load.c - Functions for decoding a Mach-o Kernel.
  *
- *  Copyright (c) 1998-2003 Apple Computer, Inc.
+ * load.c - Functions for decoding a Mach-o Kernel.
+ *
+ * Copyright (c) 1998-2003 Apple Computer, Inc.
+ *
+ * Updates:
+ *			- White space changes (PikerAlpha, November 2012)
  *
  */
 
@@ -64,7 +66,7 @@ long ThinFatFile(void **binary, unsigned long *length)
 	cpu_type_t fapcputype;
 	uint32_t fapoffset;
 	uint32_t fapsize;	
-  
+
 	if (fhp->magic == FAT_MAGIC)
 	{
 		nfat = fhp->nfat_arch;
@@ -94,7 +96,7 @@ long ThinFatFile(void **binary, unsigned long *length)
 			fapoffset = fap->offset;
 			fapsize = fap->size;
 		}
-    
+
 		if (fapcputype == gArchCPUType)
 		{
 			*binary = (void *) ((unsigned long)*binary + fapoffset);
@@ -102,7 +104,7 @@ long ThinFatFile(void **binary, unsigned long *length)
 			break;
 		}
 	}
-  
+
 	if (length != 0)
 	{
 		*length = size;
@@ -124,7 +126,7 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 	unsigned long  cnt;
 	long  ret = -1;
 	unsigned int entry = 0;
-  
+
 	gBinaryAddress = (unsigned long)binary;
 	mH = (struct mach_header *)(gBinaryAddress);
 
@@ -143,7 +145,7 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 		(gArchCPUType == CPU_TYPE_X86_64 && mH->magic != MH_MAGIC_64))
 	{
 		error("Mach-O file has bad magic number\n");
-		return -1;        
+		return -1;
 	} */
 
 	switch (gArchCPUType)
@@ -181,74 +183,75 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 			return -1;
 	}
 
-    /* cmdstart = (unsigned long)gBinaryAddress + (gArchCPUType == CPU_TYPE_I386) ? sizeof(struct mach_header) : 
+	/* cmdstart = (unsigned long)gBinaryAddress + (gArchCPUType == CPU_TYPE_I386) ? sizeof(struct mach_header) :
 																					sizeof(struct mach_header_64); */
-    cmdBase = cmdstart;
-    ncmds = mH->ncmds;
-  
-    for (cnt = 0; cnt < ncmds; cnt++)
-    {
-        cmd = ((long *)cmdBase)[0];
-        cmdsize = ((long *)cmdBase)[1];
-        unsigned int load_addr;
-        unsigned int load_size;
-        
-        switch (cmd)
-        {
-            case LC_SEGMENT_64:
-            case LC_SEGMENT:
-                
-                ret = DecodeSegment(cmdBase, &load_addr, &load_size);
-                
-                if (ret == 0 && load_size != 0 && load_addr >= KERNEL_ADDR)
-                {
-                    vmaddr = min(vmaddr, load_addr);
-                    vmend = max(vmend, load_addr + load_size);
-                }
-                break;
-
-            case LC_MAIN:	/* Mountain Lion's replacement for LC_UNIXTHREAD */
-            case LC_UNIXTHREAD:
-                ret = DecodeUnixThread(cmdBase, &entry);
-                break;
-                
-            case LC_SYMTAB:
-                break;
-                
-            default:
+	cmdBase = cmdstart;
+	ncmds = mH->ncmds;
+
+	for (cnt = 0; cnt < ncmds; cnt++)
+	{
+		cmd = ((long *)cmdBase)[0];
+		cmdsize = ((long *)cmdBase)[1];
+		unsigned int load_addr;
+		unsigned int load_size;
+
+		switch (cmd)
+		{
+			case LC_SEGMENT_64:
+			case LC_SEGMENT:
+				ret = DecodeSegment(cmdBase, &load_addr, &load_size);
+
+				if (ret == 0 && load_size != 0 && load_addr >= KERNEL_ADDR)
+				{
+					vmaddr = min(vmaddr, load_addr);
+					vmend = max(vmend, load_addr + load_size);
+				}
+				break;
+
+			case LC_MAIN:	/* Mountain Lion's replacement for LC_UNIXTHREAD */
+			case LC_UNIXTHREAD:
+				ret = DecodeUnixThread(cmdBase, &entry);
+				break;
+
+			case LC_SYMTAB:
+				break;
+
+			default:
 #if NOTDEF
-                printf("Ignoring cmd type %d.\n", (unsigned)cmd);
+				printf("Ignoring cmd type %d.\n", (unsigned)cmd);
 #endif
-                break;
-        }
-        
-        if (ret != 0)
-            return -1;
-        
-        cmdBase += cmdsize;
-    }
-    
-    *rentry = (entry_t)( (unsigned long) entry & 0x3fffffff );
-    *rsize = vmend - vmaddr;
-    *raddr = (char *)vmaddr;
-    
-    cmdBase = cmdstart;
-    
-    for (cnt = 0; cnt < ncmds; cnt++)
-    {
-	    cmd = ((long *)cmdBase)[0];
-	    cmdsize = ((long *)cmdBase)[1];
+				break;
+		}
+
+		if (ret != 0)
+		{
+			return -1;
+		}
+
+		cmdBase += cmdsize;
+	}
+
+	*rentry = (entry_t)( (unsigned long) entry & 0x3fffffff );
+	*rsize = vmend - vmaddr;
+	*raddr = (char *)vmaddr;
+
+	cmdBase = cmdstart;
+
+	for (cnt = 0; cnt < ncmds; cnt++)
+	{
+		cmd = ((long *)cmdBase)[0];
+		cmdsize = ((long *)cmdBase)[1];
 		
-	    if (cmd == LC_SYMTAB) 
-        {
+		if (cmd == LC_SYMTAB)
+		{
 			if (DecodeSymbolTable(cmdBase) != 0)
 			{
 				return -1;
 			}
-        }
-        
+		}
+
 		cmdBase += cmdsize;
-    }
+	}
 	
 	return ret;
 }
@@ -263,7 +266,7 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 	char *segname;
 	long   vmsize, filesize;
 	unsigned long vmaddr, fileaddr;
-    
+
 	if (((long *)cmdBase)[0] == LC_SEGMENT_64)
 	{
 		struct segment_command_64 *segCmd = (struct segment_command_64 *)cmdBase;
@@ -284,7 +287,7 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 		filesize = segCmd->filesize;
 		segname = segCmd->segname;
 	}
-    
+
 	// Pre-flight checks.
 	if (vmsize && filesize)
 	{
@@ -322,13 +325,13 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 			// Make boot() skip kernel / MKext(s) loading.
 			gLoadKernelDrivers = false;
 		}
-    
+
 		// Copy from file load area.
 		if (filesize > 0)
 		{
 			bcopy((char *)fileaddr, (char *)vmaddr, vmsize > filesize ? filesize : vmsize);
 		}
-    
+
 		// Zero space at the end of the segment.
 		if (vmsize > filesize)
 		{
@@ -343,7 +346,7 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 		*load_addr = ~0;
 		*load_size = 0;			
 	}
-    
+
 	return 0;
 }
 
@@ -359,7 +362,7 @@ static long DecodeUnixThread(long cmdBase, unsigned int *entry)
 		{
 			i386_thread_state_t *i386ThreadState;
 			i386ThreadState = (i386_thread_state_t *) (cmdBase + sizeof(struct thread_command) + 8);
-  
+
 		#if defined(__DARWIN_UNIX03) && __DARWIN_UNIX03
 			*entry = i386ThreadState->__eip;
 		#else
@@ -398,33 +401,32 @@ static long DecodeSymbolTable(long cmdBase)
 	long gSymbolTableSize;
 	
 	struct symtab_command *symTab, *symTableSave;
-    
+
 	symTab = (struct symtab_command *)cmdBase;
-    
+
 #if DEBUG
-	printf("symoff: %x, nsyms: %x, stroff: %x, strsize: %x\n",
-		   symTab->symoff, symTab->nsyms, symTab->stroff, symTab->strsize);
+	printf("symoff: %x, nsyms: %x, stroff: %x, strsize: %x\n", symTab->symoff, symTab->nsyms, symTab->stroff, symTab->strsize);
 	getchar();
 #endif
-    
+
 	symsSize = symTab->stroff - symTab->symoff;
 	totalSize = symsSize + symTab->strsize;
-    
+
 	gSymbolTableSize = totalSize + sizeof(struct symtab_command);
 	gSymbolTableAddr = AllocateKernelMemory(gSymbolTableSize);
 	// Add the SymTab to the memory-map.
 	AllocateMemoryRange("Kernel-__SYMTAB", gSymbolTableAddr, gSymbolTableSize, -1);
-    
+
 	symTableSave = (struct symtab_command *)gSymbolTableAddr;
 	tmpAddr = gSymbolTableAddr + sizeof(struct symtab_command);
-    
+
 	symTableSave->symoff = tmpAddr;
 	symTableSave->nsyms = symTab->nsyms;
 	symTableSave->stroff = tmpAddr + symsSize;
 	symTableSave->strsize = symTab->strsize;
 	
 	bcopy((char *)(gBinaryAddress + symTab->symoff), (char *)tmpAddr, totalSize);
-    
+
 	return 0;
 }
 

From d9983db8d34f2092a866062a6fbae37143dee724 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:47:52 +0100
Subject: [PATCH 152/623] Cleanups and changes for hfs_compare.c

---
 i386/libsaio/saio_internal.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index 1bc2fa0..518887c 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -23,8 +23,8 @@
  *
  * Updates:
  *
- *      - loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
- *      - Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
+ *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
+ *			- Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
  *
  */
 
@@ -116,9 +116,9 @@ extern int		testFAT32EFIBootSector(int biosdev, unsigned int secno, void * buffe
 
 
 /* hfs_compare.c */
-extern int32_t	FastUnicodeCompare(u_int16_t *uniStr1, u_int32_t len1, u_int16_t *uniStr2, u_int32_t len2, int byte_order);
-extern void		utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32_t bufsize, int byte_order);
-extern void		utf_decodestr(const u_int8_t *utf8p, u_int16_t *ucsp, u_int16_t *ucslen, u_int32_t bufsize, int byte_order);
+extern int32_t	FastUnicodeCompare(u_int16_t *uniStr1, u_int32_t len1, u_int16_t *uniStr2, u_int32_t len2);
+extern void		utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32_t bufsize);
+extern void		utf_decodestr(const u_int8_t *utf8p, u_int16_t *ucsp, u_int16_t *ucslen, u_int32_t bufsize);
 
 
 /* load.c */
@@ -148,7 +148,6 @@ extern int		loadConfigFile(const char *configFile, config_file_t *configBuff);
 extern int		loadSystemConfig(config_file_t *configBuff);
 extern int		loadHelperConfig(config_file_t *configBuff);
 extern int		loadOverrideConfig(config_file_t *configBuff);
-extern char		* newString(const char *oldString);
 extern char		* getNextArg(char ** ptr, char * val);
 extern long		ParseXMLFile(char * buffer, TagPtr * dict);
 
@@ -165,7 +164,7 @@ extern long		GetFileBlock(const char *fileSpec, unsigned long long *firstBlock);
 extern long		GetFSUUID(char *spec, char *uuidStr);
 extern long		CreateUUIDString(uint8_t uubytes[], int nbytes, char *uuidStr);
 extern int		openmem(char *buf, int len);
-extern int		open(const char *str, int how);
+extern int		open(const char *str, int flags);
 extern int		close(int fdesc);
 extern int		file_size(int fdesc);
 extern int		read(int fdesc, char *buf, int count);

From 378c6a6f0951c5fad9104cafa4769847c8829a53 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:51:03 +0100
Subject: [PATCH 153/623] Unused Little Endian macro's removed

---
 i386/libsaio/sl.h | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/i386/libsaio/sl.h b/i386/libsaio/sl.h
index ac5e7d1..2706a24 100755
--- a/i386/libsaio/sl.h
+++ b/i386/libsaio/sl.h
@@ -20,6 +20,11 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ * Updates:
+ *			- White space changes (PikerAlpha, November 2012)
+ *			- Unused Little Endian macro's removed (PikerAlpha, November 2012)
+ *
  */
 
 #ifndef __LIBSAIO_SL_H
@@ -31,35 +36,32 @@
 #include "libsaio.h"
 
 #define SWAP_BE16(x)  OSSwapBigToHostInt16(x)
-#define SWAP_LE16(x)  OSSwapLittleToHostInt16(x)
 #define SWAP_BE32(x)  OSSwapBigToHostInt32(x)
-#define SWAP_LE32(x)  OSSwapLittleToHostInt32(x)
 #define SWAP_BE64(x)  OSSwapBigToHostInt64(x)
-#define SWAP_LE64(x)  OSSwapLittleToHostInt64(x)
 
 // File Permissions and Types
 enum
 {
-	kPermOtherExecute  = 1 << 0,
-	kPermOtherWrite    = 1 << 1,
-	kPermOtherRead     = 1 << 2,
-	kPermGroupExecute  = 1 << 3,
-	kPermGroupWrite    = 1 << 4,
-	kPermGroupRead     = 1 << 5,
-	kPermOwnerExecute  = 1 << 6,
-	kPermOwnerWrite    = 1 << 7,
-	kPermOwnerRead     = 1 << 8,
-	kPermMask          = 0x1FF,
-	kOwnerNotRoot      = 1 << 9,
-	kFileTypeUnknown   = 0x0 << 16,
-	kFileTypeFlat      = 0x1 << 16,
-	kFileTypeDirectory = 0x2 << 16,
-	kFileTypeLink      = 0x3 << 16,
-	kFileTypeMask      = 0x3 << 16
+	kPermOtherExecute	= 1 << 0,
+	kPermOtherWrite		= 1 << 1,
+	kPermOtherRead		= 1 << 2,
+	kPermGroupExecute	= 1 << 3,
+	kPermGroupWrite		= 1 << 4,
+	kPermGroupRead		= 1 << 5,
+	kPermOwnerExecute	= 1 << 6,
+	kPermOwnerWrite		= 1 << 7,
+	kPermOwnerRead		= 1 << 8,
+	kPermMask			= 0x1FF,
+	kOwnerNotRoot		= 1 << 9,
+	kFileTypeUnknown	= 0x0 << 16,
+	kFileTypeFlat		= 0x1 << 16,
+	kFileTypeDirectory	= 0x2 << 16,
+	kFileTypeLink		= 0x3 << 16,
+	kFileTypeMask		= 0x3 << 16
 };
 
-#define Seek(c, p)     diskSeek(c, p);
-#define Read(c, a, l)  diskRead(c, a, l);
+#define Seek(c, p)		diskSeek(c, p);
+#define Read(c, a, l)	diskRead(c, a, l);
 
 extern void * gFSLoadAddress;
 

From 2cd4823ee86086647b2ad161efa94fd59e901ebb Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:54:24 +0100
Subject: [PATCH 154/623] Check malloc returns

---
 i386/libsaio/stringTable.c | 297 ++++++++++++++++++++-----------------
 1 file changed, 159 insertions(+), 138 deletions(-)

diff --git a/i386/libsaio/stringTable.c b/i386/libsaio/stringTable.c
index 73e55e0..d74585e 100755
--- a/i386/libsaio/stringTable.c
+++ b/i386/libsaio/stringTable.c
@@ -22,6 +22,11 @@
  * @APPLE_LICENSE_HEADER_END@
  *
  * Copyright 1993 NeXT, Inc. All rights reserved.
+ *
+ * Updates:
+ *			- White space changes (PikerAlpha, November 2012)
+ *			- Check malloc returns (PikerAlpha, November 2012)
+ *
  */
 
 #include "bootstruct.h"
@@ -29,17 +34,14 @@
 #include "xml.h"
 #include "stdbool.h"
 
-extern char *Language;
-extern char *LoadableFamilies;
-
-int sysConfigValid;
+#define DEBUG_XML_PARSER	0
 
 
 //==============================================================================
 
 static inline int isspace(char c)
 {
-    return (c == ' ' || c == '\t');
+	return (c == ' ' || c == '\t');
 }
 
 
@@ -47,25 +49,29 @@ static inline int isspace(char c)
 
 bool getValueForConfigTableKey(config_file_t *config, const char *key, const char **val, int *size)
 {
-    if (config->dictionary != 0)
-    {
-        // Look up key in XML dictionary
-        TagPtr value;
-        value = XMLGetProperty(config->dictionary, key);
-
-        if (value != 0)
-        {
-            if (value->type != kTagTypeString)
-            {
-                error("Non-string tag '%s' found in config file\n", key);
-                return false;
-            }
-            *val = value->string;
-            *size = strlen(value->string);
-            return true;
-        }
-    }
-    // else {} for legacy plist-style table, which is not implemented!
+	if (config->dictionary != 0)
+	{
+		// Look up key in XML dictionary
+		TagPtr value;
+		value = XMLGetProperty(config->dictionary, key);
+
+		if (value != 0)
+		{
+			if (value->type != kTagTypeString)
+			{
+#if DEBUG_XML_PARSER
+				error("Non-string tag '%s' found in config file\n", key);
+#endif
+				
+				return false;
+			}
+			*val = value->string;
+			*size = strlen(value->string);
+
+			return true;
+		}
+	}
+	// else {} for legacy plist-style table, which is not implemented!
 
 	return false;
 }
@@ -75,26 +81,22 @@ bool getValueForConfigTableKey(config_file_t *config, const char *key, const cha
 
 char * newStringForKey(char *key, config_file_t *config)
 {
-    const char *val;
-    char *newstr;
-    int size;
-    
-    if (getValueForKey(key, &val, &size, config) && size)
-    {
-        newstr = (char *)malloc(size + 1);
-        strlcpy(newstr, val, size + 1);
-        return newstr;
-    }
-
-    return 0;
+	const char *val;
+	int size;
+
+	if (getValueForKey(key, &val, &size, config) && size)
+	{
+		return strdup(val);	// string.c
+	}
+
+	return 0;
 }
 
 
 //==============================================================================
-/* parse a command line
- * in the form: [<argument> ...]  [<option>=<value> ...]
- * both <option> and <value> must be either composed of
- * non-whitespace characters, or enclosed in quotes.
+/* parse command line in the form: [<argument> ...]  [<option>=<value> ...]
+ * both <option> and <value> must be either composed of non-whitespace 
+ * characters, or enclosed in quotes.
  */
 
 static const char *getToken(const char *line, const char **begin, int *len)
@@ -135,7 +137,6 @@ bool getValueForBootKey(const char *line, const char *target, const char **match
 	int key_len, value_len;
 	int targetLength = strlen(target);
 
-    
 	while (*line)
 	{
 		// Check for keyword or argument.
@@ -178,24 +179,24 @@ bool getValueForBootKey(const char *line, const char *target, const char **match
 
 bool getBoolForKey(const char *key, bool *result_val, config_file_t *config)
 {
-    const char *key_val;
-    int size;
-    
-    if (getValueForKey(key, &key_val, &size, config))
-    {
-        if ((size >= 1) && (key_val[0] == 'Y' || key_val[0] == 'y'))
+	const char *key_val;
+	int size;
+
+	if (getValueForKey(key, &key_val, &size, config))
+	{
+		if ((size >= 1) && (key_val[0] == 'Y' || key_val[0] == 'y'))
 		{
-            *result_val = true;
+			*result_val = true;
 		}
-        else
+		else
 		{
-            *result_val = false;
+			*result_val = false;
 		}
 
-        return true; // Key found.
-    }
+		return true; // Key found.
+	}
 
-    return false; // Key not found.
+	return false; // Key not found.
 }
 
 
@@ -203,11 +204,11 @@ bool getBoolForKey(const char *key, bool *result_val, config_file_t *config)
 
 bool getIntForKey(const char *key, int *value, config_file_t *config)
 {
-    const char *val;
-    int size, sum;
-    bool negative = false;
-    
-    if (getValueForKey(key, &val, &size, config))
+	const char *val;
+	int size, sum;
+	bool negative = false;
+
+	if (getValueForKey(key, &val, &size, config))
 	{
 		if (size)
 		{
@@ -239,74 +240,101 @@ bool getIntForKey(const char *key, int *value, config_file_t *config)
 		}
 	}
 
-    return false; // Key not found
+	return false; // Key not found
 }
 
 
 //==============================================================================
 
 bool getValueForKey(const char *key, const char **val, int *size, config_file_t *config)
-{  
-    if (getValueForBootKey(bootArgs->CommandLine, key, val, size))
+{
+	if (getValueForBootKey(bootArgs->CommandLine, key, val, size))
 	{
-        return true;
+		return true;
 	}
 
-    bool ret = getValueForConfigTableKey(config, key, val, size);
+	bool ret = getValueForConfigTableKey(config, key, val, size);
 
-    return ret;
+	return ret;
 }
 
 
-//==============================================================================
-// ParseXMLFile modifies the input buffer and expects one dictionary in the 
-// XML file. Puts the first dictionary it finds in the tag pointer and 
-// returns 0, or -1 if not found (and does not modify the dict pointer).
-// Prints an error message if there is a parsing error.
+/*==============================================================================
+ * ParseXMLFile modifies the input buffer and expects one dictionary in the
+ * XML file. Puts the first dictionary it finds in the tag pointer and returns
+ * the length on success or 0 on error, in which case it will not modify the
+ * dictionary pointer).
+ */
 
-long ParseXMLFile(char * buffer, TagPtr * dict)
+long ParseXMLFile(char * buffer, TagPtr * dictionaryPtr)
 {
-    long	length;
+	long	length = -1;
 	long	pos = 0;
-    TagPtr	tag;
-    char	*configBuffer;
-  
-    configBuffer = malloc(strlen(buffer)+1);
-    strcpy(configBuffer, buffer);
-
-    while (1)
-    {
-        length = XMLParseNextTag(configBuffer + pos, &tag);
-
-        if (length == -1)
-            break;
-    
-        pos += length;
-    
-        if (tag == 0)
-		{
-            continue;
-		}
+	TagPtr	tag;
+	char	*configBuffer = NULL;
 
-        if (tag->type == kTagTypeDict)
+	if (buffer)
+	{
+		configBuffer = malloc(strlen(buffer) + 1);
+	
+		if (configBuffer)
 		{
-            break;
-		}
-    
-        XMLFreeTag(tag);
-    }
+			strcpy(configBuffer, buffer);
 
-    free(configBuffer);
+			while (1)
+			{
+				length = XMLParseNextTag(configBuffer + pos, &tag);
 
-    if (length < 0)
-    {
-        error ("Error parsing plist file\n");
-        return -1;
-    }
+				if (length == -1)
+				{
+					break;
+				}
 
-    *dict = tag;
+				pos += length;
+
+				if (tag == 0)
+				{
+					continue;
+				}
+
+				if (tag->type == kTagTypeDict)
+				{
+					break;
+				}
 
-    return 0;
+				XMLFreeTag(tag);
+			}
+
+			free(configBuffer);
+
+			if (length)
+			{
+				*dictionaryPtr = tag;
+
+				return length;
+			}
+#if DEBUG_XML_PARSER
+			else
+			{
+				error ("ParseXMLFile: Error parsing plist file\n");
+			}
+#endif
+		}
+#if DEBUG_XML_PARSER
+		else
+		{
+			error ("ParseXMLFile: configBuffer == NULL\n");
+		}
+#endif
+	}
+#if DEBUG_XML_PARSER
+	else
+	{
+		error ("ParseXMLFile: buffer == NULL\n");
+	}
+#endif
+
+	return 0;
 }
 
 
@@ -316,20 +344,19 @@ long ParseXMLFile(char * buffer, TagPtr * dict)
 
 int loadSystemConfig(config_file_t *config)
 {
-	char *path = malloc(80); // Long enough for the longest (default) path.
-	static char * dirspec[] = {
-        
+	static char * dirspec[] =
+	{
 #if LION_RECOVERY_SUPPORT
 		"com.apple.recovery.boot",
 #endif
-        
+
 #if LION_INSTALL_SUPPORT
 		".IABootFiles",
 		"OS X Install Data",
 		"Mac OS X Install Data",
 #endif
 		"Library/Preferences/SystemConfiguration" // The default.
-        
+
 #if APPLE_RAID_SUPPORT
 		/*
 		 * This is a temporarily change to test RAID support, but it
@@ -341,40 +368,34 @@ int loadSystemConfig(config_file_t *config)
 		"com.apple.boot.S/Library/Preferences/SystemConfiguration"
 #endif
 	};
-    
-	int i, fd;
-    
-	for (i = 0; i < sizeof(dirspec) / sizeof(dirspec[0]); i++)
+
+	char *path = (char *)malloc(80); // Long enough for the longest (default) path.
+
+	if (path)
 	{
-		sprintf(path, "/%s/%s", dirspec[i], "com.apple.Boot.plist");
-        
-		if ((fd = open(path, 0)) >= 0)
+		int i = 0;
+		int fd = 0;
+		int len = (sizeof(dirspec) / sizeof(dirspec[0]));
+
+		for (; i < len; i++)
 		{
-			// IO_CONFIG_DATA_SIZE is defined as 4096 in bios.h and which should
-			// be sufficient enough for RevoBoot (size was 4K for years already).
-			read(fd, config->plist, IO_CONFIG_DATA_SIZE);
-			close(fd);
-            
-			// Build XML dictionary.
-			ParseXMLFile(config->plist, &config->dictionary);
-            
-			return 0;
-		}
-	}
-    
-	return -1;
-}
+			sprintf(path, "/%s/%s", dirspec[i], "com.apple.Boot.plist");
 
+			if ((fd = open(path, 0)) >= 0)
+			{
+				// IO_CONFIG_DATA_SIZE is defined as 4096 in bios.h and which should
+				// be sufficient enough for RevoBoot (size was 4K for years already).
+				read(fd, config->plist, IO_CONFIG_DATA_SIZE);
+				close(fd);
 
-//==============================================================================
+				// Build XML dictionary.
+				ParseXMLFile(config->plist, &config->dictionary);
 
-char * newString(const char * oldString)
-{
-	if (oldString)
-	{
-		return strcpy(malloc(strlen(oldString) + 1), oldString);
+				free (path);
+				return 0;
+			}
+		}
 	}
 
-	return NULL;
+	return -1;
 }
-

From 3dcdd2980a21abbcbfadc11f402abfe0731fece7 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:57:43 +0100
Subject: [PATCH 155/623] Cleanups, white space and layout changes

---
 i386/libsaio/sys.c | 396 ++++++++++++++++++++++-----------------------
 1 file changed, 197 insertions(+), 199 deletions(-)

diff --git a/i386/libsaio/sys.c b/i386/libsaio/sys.c
index df9e03c..ff60af6 100755
--- a/i386/libsaio/sys.c
+++ b/i386/libsaio/sys.c
@@ -44,18 +44,17 @@
  * where everything is defaulted
  * Add routine, ptol(), to parse partition letters.
  *
- */
- 
-/*
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  *	@(#)sys.c	7.1 (Berkeley) 6/5/86
- */
-
-/*  Copyright 2007 VMware Inc.
-    "Preboot" ramdisk support added by David Elliott
+ *
+ * Copyright 2007 VMware Inc. "Preboot" ramdisk support added by David Elliott
+ *
+ * Updates:
+ *			- Cleanups, white space and layout changes (PikerAlpha, November2012)
+ *
  */
 
 #include <AvailabilityMacros.h>
@@ -73,19 +72,19 @@ UUID_DEFINE( kFSUUIDNamespaceSHA1, 0xB3, 0xE2, 0x0F, 0x39, 0xF2, 0x92, 0x11, 0xD
 
 struct devsw
 {
-    const char *  name;
-    // size increased from char to short to handle non-BIOS internal devices
-    unsigned short biosdev;
-    int type;
+	const char *  name;
+	// size increased from char to short to handle non-BIOS internal devices
+	unsigned short biosdev;
+	int type;
 };
 
 static struct devsw devsw[] =
 {
-    { "sd", 0x80,	kBIOSDevTypeHardDrive },  /* DEV_SD */
-    { "hd", 0x80,	kBIOSDevTypeHardDrive },  /* DEV_HD */
-    { "rd", 0x100,	kBIOSDevTypeHardDrive },
-    { "bt", 0x101,	kBIOSDevTypeHardDrive }, // turbo - type for booter partition
-    { 0, 0 }
+	{ "sd", 0x80,	kBIOSDevTypeHardDrive },  /* DEV_SD */
+	{ "hd", 0x80,	kBIOSDevTypeHardDrive },  /* DEV_HD */
+	{ "rd", 0x100,	kBIOSDevTypeHardDrive },
+	{ "bt", 0x101,	kBIOSDevTypeHardDrive }, // turbo - type for booter partition
+	{ 0, 0 }
 };
 
 /*
@@ -111,36 +110,36 @@ static BVRef newBootVolumeRef( int biosdev, int partno );
 
 //==============================================================================
 // LoadVolumeFile - LOW-LEVEL FILESYSTEM FUNCTION.
-//            Load the specified file from the specified volume
-//            to the load buffer at LOAD_ADDR.
-//            If the file is fat, load only the i386 portion.
+// Load the specified file from the specified volume
+// to the load buffer at LOAD_ADDR.
+// If the file is fat, load only the i386 portion.
 
 long LoadVolumeFile(BVRef bvr, const char *filePath)
 {
-    long fileSize;
+	long fileSize;
 
-    // Read file into load buffer. The data in the load buffer will be
-    // overwritten by the next LoadFile() call.
+	// Read file into load buffer. The data in the load buffer will be
+	// overwritten by the next LoadFile() call.
 
-    gFSLoadAddress = (void *) LOAD_ADDR;
+	gFSLoadAddress = (void *) LOAD_ADDR;
 
-    fileSize = bvr->fs_loadfile(bvr, (char *)filePath);
+	fileSize = bvr->fs_loadfile(bvr, (char *)filePath);
 
-    // Return the size of the file, or -1 if load failed.
+	// Return the size of the file, or -1 if load failed.
 
-    return fileSize;
+	return fileSize;
 }
 
 
 //==============================================================================
 // LoadFile - LOW-LEVEL FILESYSTEM FUNCTION.
-//            Load the specified file to the load buffer at LOAD_ADDR.
-//            If the file is fat, load only the i386 portion.
+// Load the specified file to the load buffer at LOAD_ADDR.
+// If the file is fat, load only the i386 portion.
 
 long LoadFile(const char * fileSpec)
 {
-	const char * filePath;
-	BVRef        bvr;
+	const char *	filePath;
+	BVRef			bvr;
 
 	// Resolve the boot volume from the file spec.
 
@@ -183,7 +182,7 @@ long LoadThinFatFile(const char *fileSpec, void **binary)
 	BVRef		bvr;
 	unsigned long length; // = 0;
 	unsigned long length2; //  = 0;
-  
+
 	// Resolve the boot volume from the file spec.
 
 	if ((bvr = getBootVolumeRef(fileSpec, &filePath)) == NULL)
@@ -192,51 +191,57 @@ long LoadThinFatFile(const char *fileSpec, void **binary)
 	}
 	
 	*binary = (void *)kLoadAddr;
-  
+
 	// Read file into load buffer. The data in the load buffer will be
 	// overwritten by the next LoadFile() call.
 
 	gFSLoadAddress = (void *) LOAD_ADDR;
 
 	readFile = bvr->fs_readfile;
-  
+
 	if (readFile != NULL)
 	{
 		// Read the first 4096 bytes (fat header)
 		length = readFile(bvr, (char *)filePath, *binary, 0, 0x1000);
 
-        if (length > 0)
-        {
-            if (ThinFatFile(binary, &length) == 0)
-            {
+		if (length > 0)
+		{
+			if (ThinFatFile(binary, &length) == 0)
+			{
 				if (length == 0)
+				{
 					return 0;
+				}
 
-                // We found a fat binary; read only the thin part
-                length = readFile(bvr, (char *)filePath, (void *)kLoadAddr, (unsigned long)(*binary) - kLoadAddr, length);
-                *binary = (void *)kLoadAddr;
-            }
-            else
-            {
-                // Not a fat binary; read the rest of the file
-                length2 = readFile(bvr, (char *)filePath, (void *)(kLoadAddr + length), length, 0);
-
-                if (length2 == -1)
-                    return -1;
-
-                length += length2;
-            }
-        }
-    }
-    else
-    {
-        length = bvr->fs_loadfile(bvr, (char *)filePath);
-
-        if (length > 0)
-            ThinFatFile(binary, &length);
-    }
-  
-    return length;
+				// We found a fat binary; read only the thin part
+				length = readFile(bvr, (char *)filePath, (void *)kLoadAddr, (unsigned long)(*binary) - kLoadAddr, length);
+				*binary = (void *)kLoadAddr;
+			}
+			else
+			{
+				// Not a fat binary; read the rest of the file
+				length2 = readFile(bvr, (char *)filePath, (void *)(kLoadAddr + length), length, 0);
+
+				if (length2 == -1)
+				{
+					return -1;
+				}
+
+				length += length2;
+			}
+		}
+	}
+	else
+	{
+		length = bvr->fs_loadfile(bvr, (char *)filePath);
+
+		if (length > 0)
+		{
+			ThinFatFile(binary, &length);
+		}
+	}
+
+	return length;
 }
 
 
@@ -245,30 +250,30 @@ long LoadThinFatFile(const char *fileSpec, void **binary)
 
 long CreateUUIDString(uint8_t uubytes[], int nbytes, char *uuidStr)
 {
-    unsigned  fmtbase, fmtidx, i;
-    uint8_t   uuidfmt[] = { 4, 2, 2, 2, 6 };
-    char     *p = uuidStr;
-    MD5_CTX   md5c;
-    uint8_t   mdresult[16];
+	unsigned	fmtbase, fmtidx, i;
+	uint8_t		uuidfmt[] = { 4, 2, 2, 2, 6 };
+	char		*p = uuidStr;
+	MD5_CTX		md5c;
+	uint8_t		mdresult[16];
 
-    bzero(mdresult, sizeof(mdresult));
+	bzero(mdresult, sizeof(mdresult));
 
-    // just like AppleFileSystemDriver
-    MD5Init(&md5c);
-    MD5Update(&md5c, kFSUUIDNamespaceSHA1, sizeof(kFSUUIDNamespaceSHA1));
-    MD5Update(&md5c, uubytes, nbytes);
-    MD5Final(mdresult, &md5c);
+	// just like AppleFileSystemDriver
+	MD5Init(&md5c);
+	MD5Update(&md5c, kFSUUIDNamespaceSHA1, sizeof(kFSUUIDNamespaceSHA1));
+	MD5Update(&md5c, uubytes, nbytes);
+	MD5Final(mdresult, &md5c);
 
-    // this UUID has been made version 3 style (i.e. via namespace)
-    // see "-uuid-urn-" IETF draft (which otherwise copies byte for byte)
-    mdresult[6] = 0x30 | ( mdresult[6] & 0x0F );
-    mdresult[8] = 0x80 | ( mdresult[8] & 0x3F );
+	// this UUID has been made version 3 style (i.e. via namespace)
+	// see "-uuid-urn-" IETF draft (which otherwise copies byte for byte)
+	mdresult[6] = 0x30 | ( mdresult[6] & 0x0F );
+	mdresult[8] = 0x80 | ( mdresult[8] & 0x3F );
 
 
-    // generate the text: e.g. 5EB1869F-C4FA-3502-BDEB-3B8ED5D87292
+	// generate the text: e.g. 5EB1869F-C4FA-3502-BDEB-3B8ED5D87292
 	i = 0;
 	fmtbase = 0;
-    
+
 	for (fmtidx = 0; fmtidx < sizeof(uuidfmt); fmtidx++)
 	{
 		for (i = 0; i < uuidfmt[fmtidx]; i++)
@@ -276,7 +281,7 @@ long CreateUUIDString(uint8_t uubytes[], int nbytes, char *uuidStr)
 			uint8_t byte = mdresult[fmtbase + i];
 			char nib = byte >> 4;
 			*p = nib + '0';  // 0x4 -> '4'
-            
+
 			if (*p > '9')
 			{
 				*p = (nib - 9 + ('A'-1));  // 0xB -> 'B'
@@ -287,16 +292,16 @@ long CreateUUIDString(uint8_t uubytes[], int nbytes, char *uuidStr)
 			nib = byte & 0xf;
 			*p = nib + '0';  // 0x4 -> '4'
 
-            if (*p > '9')
+			if (*p > '9')
 			{
 				*p = (nib - 9 + ('A'-1));  // 0xB -> 'B'
 			}
 
 			p++;
 		}
- 
+
 		fmtbase += i;
-        
+
 		if (fmtidx < sizeof(uuidfmt) - 1)
 		{
 			*(p++) = '-';
@@ -313,16 +318,16 @@ long CreateUUIDString(uint8_t uubytes[], int nbytes, char *uuidStr)
 
 //==============================================================================
 // GetDirEntry - LOW-LEVEL FILESYSTEM FUNCTION.
-//               Fetch the next directory entry for the given directory.
+// Fetch the next directory entry for the given directory.
 
 long GetDirEntry(const char * dirSpec, long * dirIndex, const char ** dirEntry, long * flags, long * time)
 {
-	const char * dirPath;
-	BVRef        bvr;
+	const char *	dirPath;
+	BVRef			bvr;
 
 	// Resolve the boot volume from the dir spec.
 
-    if ((bvr = getBootVolumeRef(dirSpec, &dirPath)) == NULL)
+	if ((bvr = getBootVolumeRef(dirSpec, &dirPath)) == NULL)
 	{
 		return -1;
 	}
@@ -335,7 +340,7 @@ long GetDirEntry(const char * dirSpec, long * dirIndex, const char ** dirEntry,
 
 //==============================================================================
 // GetFileInfo - LOW-LEVEL FILESYSTEM FUNCTION.
-//               Get attributes for the specified file.
+// Get attributes for the specified file.
 
 static char* gMakeDirSpec;
 
@@ -377,11 +382,11 @@ long GetFileInfo(const char * dirSpec, const char * name, long * flags, long * t
 	{
 		if (strcmp(entryName, name) == 0)
 		{
-			return 0;  // success
+			return 0;	// success
 		}
 	}
 
-	return -1;  // file not found
+	return -1;	// file not found
 }
 
 
@@ -389,8 +394,8 @@ long GetFileInfo(const char * dirSpec, const char * name, long * flags, long * t
 
 long GetFileBlock(const char *fileSpec, unsigned long long *firstBlock)
 {
-	const char * filePath;
-	BVRef        bvr;
+	const char *	filePath;
+	BVRef			bvr;
 
 	// Resolve the boot volume from the file spec.
 
@@ -398,9 +403,9 @@ long GetFileBlock(const char *fileSpec, unsigned long long *firstBlock)
 	{
 		// printf("Boot volume for '%s' is bogus\n", fileSpec);
 		return -1;
-    }
+	}
 
-    return bvr->fs_getfileblock(bvr, (char *)filePath, firstBlock);
+	return bvr->fs_getfileblock(bvr, (char *)filePath, firstBlock);
 }
 
 
@@ -416,7 +421,7 @@ static struct iob * iob_from_fdesc(int fdesc)
 
 	if (fdesc < 0 || fdesc >= NFILES || ((io = &iob[fdesc])->i_flgs & F_ALLOC) == 0)
 	{
-        return NULL;
+		return NULL;
 	}
 
 	return io;
@@ -424,77 +429,71 @@ static struct iob * iob_from_fdesc(int fdesc)
 
 
 //==============================================================================
-// Open the file specified by 'path' for reading.
 
 int open(const char * path, int flags)
 {
-    int          fdesc, i;
-    struct iob * io;
-    const char * filePath;
-    BVRef        bvr;
+	int				fdesc, i;
+	struct iob *	io;
+	const char *	filePath;
+	BVRef			bvr;
 
-    // Locate a free descriptor slot.
+	// Locate a free descriptor slot.
 
 	for (fdesc = 0; fdesc < NFILES; fdesc++)
 	{
 		if (iob[fdesc].i_flgs == 0)
 		{
-			goto gotfile;
-		}
-	}
-
-    stop("Out of file descriptors");
-
-gotfile:
-    io = &iob[fdesc];
-    bzero(io, sizeof(*io));
-
-    // Mark the descriptor as taken.
-
-    io->i_flgs = F_ALLOC;
-
-    // Resolve the boot volume from the file spec.
-
-    if ((bvr = getBootVolumeRef(path, &filePath)) == NULL)
-	{
-		goto error;
-	}
-
-    // Find the next available memory block in the download buffer.
-
-    io->i_buf = (char *) LOAD_ADDR;
+			io = &iob[fdesc];
+			bzero(io, sizeof(*io));
+			
+			// Mark the descriptor as taken.
+			
+			io->i_flgs = F_ALLOC;
+			
+			// Resolve the boot volume from the file spec.
+			
+			if ((bvr = getBootVolumeRef(path, &filePath)) != NULL)
+			{
+				// Find the next available memory block in the download buffer.
+			
+				io->i_buf = (char *) LOAD_ADDR;
+			
+				for (i = 0; i < NFILES; i++)
+				{
+					if ((iob[i].i_flgs != F_ALLOC) || (i == fdesc))
+					{
+						continue;
+					}
+				
+					io->i_buf = max(iob[i].i_filesize + iob[i].i_buf, io->i_buf);
+				}
+			
+				// Load entire file into memory. Unnecessary open() calls must be avoided.
 
-	for (i = 0; i < NFILES; i++)
-    {
-        if ((iob[i].i_flgs != F_ALLOC) || (i == fdesc))
-		{
-			continue;
+				gFSLoadAddress = io->i_buf;
+				io->i_filesize = bvr->fs_loadfile(bvr, (char *)filePath);
+			
+				if (io->i_filesize > 0)
+				{
+					return fdesc;
+				}
+			}
 		}
-
-        io->i_buf = max(iob[i].i_filesize + iob[i].i_buf, io->i_buf);
-    }
-
-    // Load entire file into memory. Unnecessary open() calls must be avoided.
-
-    gFSLoadAddress = io->i_buf;
-    io->i_filesize = bvr->fs_loadfile(bvr, (char *)filePath);
-
-	if (io->i_filesize < 0)
+	}
+#if DEBUG
+	if (fdesc == NFILES)
 	{
-		goto error;
+		stop("Out of file descriptors");
 	}
-
-	return fdesc;
-
-error:
+#endif
 	close(fdesc);
-    
+
 	return -1;
 }
 
 
 //==============================================================================
-// close() - Close a file descriptor.
+// Close given file descriptor.
 
 int close(int fdesc)
 {
@@ -513,7 +512,7 @@ int close(int fdesc)
 
 //==============================================================================
 // lseek() - Reposition the byte offset of the file descriptor from the
-//           beginning of the file. Returns the relocated offset.
+// beginning of the file. Returns the relocated offset.
 
 int b_lseek(int fdesc, int offset, int ptr)
 {
@@ -548,7 +547,7 @@ int tell(int fdesc)
 
 //==============================================================================
 // read() - Read up to 'count' bytes of data from the file descriptor
-//          into the buffer pointed to by buf.
+// into the buffer pointed to by buf.
 
 int read(int fdesc, char * buf, int count)
 {
@@ -603,7 +602,7 @@ struct dirstuff * vol_opendir(BVRef bvr, const char * path)
 
 	if (dirp)
 	{
-		dirp->dir_path = newString(path);
+		dirp->dir_path = strdup(path);
 
 		if (dirp->dir_path)
 		{
@@ -623,9 +622,9 @@ struct dirstuff * vol_opendir(BVRef bvr, const char * path)
 
 struct dirstuff * opendir(const char * path)
 {
-	struct dirstuff * dirp = 0;
-	const char *      dirPath;
-	BVRef             bvr;
+	struct dirstuff *	dirp = 0;
+	const char *		dirPath;
+	BVRef				bvr;
 
 	if ((bvr = getBootVolumeRef(path, &dirPath)))
 	{
@@ -633,8 +632,8 @@ struct dirstuff * opendir(const char * path)
 
 		if (dirp)
 		{
-			dirp->dir_path = newString(dirPath);
-    
+			dirp->dir_path = strdup(dirPath);
+
 			if (dirp->dir_path)
 			{
 				dirp->dir_bvr = bvr;
@@ -644,9 +643,9 @@ struct dirstuff * opendir(const char * path)
 		}
 	}
 
-    closedir(dirp);
+	closedir(dirp);
 
-    return NULL;
+	return NULL;
 }
 
 
@@ -664,7 +663,7 @@ int closedir(struct dirstuff * dirp)
 		free(dirp);
 	}
 
-    return 0;
+	return 0;
 }
 
 
@@ -707,22 +706,21 @@ void scanBootVolumes(int biosdev, int * count)
 }
 
 
-//==============================================================================
-/*!
-    Extracts the volume selector from the pathname, returns the selected
-    BVRef, and sets *outPath to the remainder of the path.
-    If the path did not include a volume selector then the current volume
-    is used.  When called with a volume selector the current volume
-    is changed to the selected volume unless the volume selector is
-    that of a ramdisk. */
+/*==============================================================================
+ * Extracts the volume selector from the pathname, returns the selected BVRef,
+ * and sets *outPath to the remainder of the path. If the path did not include
+ * a volume selector then the current volume is used.  When called with a volume 
+ * selector the current volume is changed to the selected volume unless the 
+ * volume selector is that of a ramdisk.
+ */
 
 BVRef getBootVolumeRef(const char * path, const char ** outPath)
 {
-    const char * cp;
-    BVRef bvr = gPlatform.RootVolume;
-    int biosdev = gPlatform.BIOSDevice;
+	const char * cp;
+	BVRef bvr = gPlatform.RootVolume;
+	int biosdev = gPlatform.BIOSDevice;
 
-    // Search for left parenthesis in the path specification.
+	// Search for left parenthesis in the path specification.
 
 	for (cp = path; *cp; cp++)
 	{
@@ -768,7 +766,7 @@ BVRef getBootVolumeRef(const char * path, const char ** outPath)
 			error("Unknown device '%c%c'\n", xp[0], xp[1]);
 			return NULL;
 		}
-        
+
 		// Extract the optional unit number from the specification.
 		// hd(unit) or hd(unit, part).
 
@@ -780,28 +778,28 @@ BVRef getBootVolumeRef(const char * path, const char ** outPath)
 			unit = i;
 		}
 
-        // Unit is no longer optional and never really was.
-        // If the user failed to specify it then the unit number from the previous kernDev
-        // would have been used which makes little sense anyway.
-        // For example, if the user did fd()/foobar and the current root device was the
-        // second hard disk (i.e. unit 1) then fd() would select the second floppy drive!
-        if (unit == -1)
+		// Unit is no longer optional and never really was.
+		// If the user failed to specify it then the unit number from the previous kernDev
+		// would have been used which makes little sense anyway.
+		// For example, if the user did fd()/foobar and the current root device was the
+		// second hard disk (i.e. unit 1) then fd() would select the second floppy drive!
+		if (unit == -1)
 		{
 			return NULL;
 		}
 
-        // Extract the optional partition number from the specification.
+		// Extract the optional partition number from the specification.
 
 		if (*cp == ',')
 		{
 			part = atoi(++cp);
 		}
 
-        // If part is not specified part will be -1 whereas before it would have been
-        // whatever the last partition was which makes about zero sense if the device
-        // has been switched.
+		// If part is not specified part will be -1 whereas before it would have been
+		// whatever the last partition was which makes about zero sense if the device
+		// has been switched.
 
-        // Skip past the right paren.
+		// Skip past the right paren.
 
 		for ( ; *cp && *cp != RP; cp++) /* LOOP */;
 
@@ -809,7 +807,7 @@ BVRef getBootVolumeRef(const char * path, const char ** outPath)
 		{
 			cp++;
 		}
-        
+
 		biosdev = dp->biosdev + unit;
 
 		// turbo - bt(0,0) hook
@@ -851,7 +849,7 @@ BVRef getBootVolumeRef(const char * path, const char ** outPath)
 				cp++;
 			}
 		}
-        
+
 		// If gPlatform.RootVolume was NULL, then bvr will be NULL as well which
 		// should be caught by the caller.
 	}
@@ -871,31 +869,31 @@ BVRef getBootVolumeRef(const char * path, const char ** outPath)
 
 static BVRef newBootVolumeRef(int biosdev, int partno)
 {
-    BVRef bvr, bvr1, bvrChain;
+	BVRef bvr, bvr1, bvrChain;
 
-    // Fetch the volume list from the device.
+	// Fetch the volume list from the device.
 
-    scanBootVolumes(biosdev, NULL);
-    bvrChain = getBVChainForBIOSDev(biosdev);
+	scanBootVolumes(biosdev, NULL);
+	bvrChain = getBVChainForBIOSDev(biosdev);
 
-    // Look for a perfect match based on device and partition number.
+	// Look for a perfect match based on device and partition number.
 
-    for (bvr1 = NULL, bvr = bvrChain; bvr; bvr = bvr->next)
-    {
-        if ((bvr->flags & kBVFlagNativeBoot) == 0)
+	for (bvr1 = NULL, bvr = bvrChain; bvr; bvr = bvr->next)
+	{
+		if ((bvr->flags & kBVFlagNativeBoot) == 0)
 		{
-            continue;
+			continue;
 		}
-    
-        bvr1 = bvr;
 
-        if (bvr->part_no == partno)
+		bvr1 = bvr;
+
+		if (bvr->part_no == partno)
 		{
-            break;
+			break;
 		}
-    }
+	}
 
-    return bvr ? bvr : bvr1;
+	return bvr ? bvr : bvr1;
 }
 
 

From 2d6c051ad1b9a6f94e31d4686956b643b915ca00 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 13:59:51 +0100
Subject: [PATCH 156/623] Cleanups, white space and layout changes

---
 i386/libsaio/xml.c | 651 +++++++++++++++++++++------------------------
 1 file changed, 304 insertions(+), 347 deletions(-)

diff --git a/i386/libsaio/xml.c b/i386/libsaio/xml.c
index 68fbd2d..a4a0c65 100755
--- a/i386/libsaio/xml.c
+++ b/i386/libsaio/xml.c
@@ -20,13 +20,17 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ * Updates:
+ *			- Cleanups, white space and layout changes (PikerAlpha, November 2012)
+ *
  */
 
 #include "libsaio.h"
 #include "xml.h"
 
 typedef struct Module
-{  
+{
 	struct Module *nextModule;
 	long		willLoad;
 	TagPtr		dict;
@@ -64,19 +68,15 @@ enum
 	kCFBundleType3
 };
 
-
-#define USEMALLOC 1
-#define DOFREE 1
-
 #define kTagsPerBlock (0x1000)
 
 static TagPtr gTagsFree;
 
 typedef struct Symbol
 {
-	long          refCount;
-	struct Symbol *next;
-	char          string[];
+	long			refCount;
+	struct Symbol *	next;
+	char			string[];
 } Symbol, *SymbolPtr;
 
 static SymbolPtr FindSymbol(char * string, SymbolPtr * prevSymbol);
@@ -94,37 +94,31 @@ static long GetNextTag(char *buffer, char **tag, long *start);
 static long FixDataMatchingTag(char *buffer, char *tag);
 static TagPtr NewTag(void);
 static char *NewSymbol(char *string);
-
-#if DOFREE
-	static void FreeSymbol(char *string);
-#endif
+static void FreeSymbol(char *string);
 
 
 //==============================================================================
 
 TagPtr XMLGetProperty(TagPtr dict, const char * key)
 {
-	if (dict->type != kTagTypeDict)
+	if (dict->type == kTagTypeDict)
 	{
-		return 0;
-	}
-
-	TagPtr tag = 0;
-	TagPtr tagList = dict->tag;
+		TagPtr tag = 0;
+		TagPtr tagList = dict->tag;
 
-	while (tagList)
-	{
-		tag = tagList;
-		tagList = tag->tagNext;
-        
-		if ((tag->type != kTagTypeKey) || (tag->string == 0))
+		while (tagList)
 		{
-			continue;
-		}
+			tag = tagList;
+			tagList = tag->tagNext;
 
-		if (!strcmp(tag->string, key))
-		{
-			return tag->tag;
+			if ((tag->type != kTagTypeKey) || (tag->string == 0))
+			{
+				continue;
+			}
+			else if (!strcmp(tag->string, key))
+			{
+				return tag->tag;
+			}
 		}
 	}
 
@@ -138,13 +132,13 @@ TagPtr XMLGetProperty(TagPtr dict, const char * key)
 // Puts the first dictionary it finds in the
 // tag pointer and returns 0, or returns -1 if not found.
 //
-long XMLParseFile( char * buffer, TagPtr * dict )
+long XMLParseFile(char * buffer, TagPtr * dict)
 {
-	TagPtr tag;
+	TagPtr tag = NULL;
 
-	long length, pos = 0;
+	long length, pos = 0L;
 
-	while (1)
+	while (TRUE)
 	{
 		length = XMLParseNextTag(buffer + pos, &tag);
 
@@ -155,7 +149,7 @@ long XMLParseFile( char * buffer, TagPtr * dict )
 
 		pos += length;
 
-		if (tag == 0)
+		if (tag == NULL)
 		{
 			continue;
 		}
@@ -170,12 +164,12 @@ long XMLParseFile( char * buffer, TagPtr * dict )
 
 	if (length < 0)
 	{
-		return -1;
+		return -1L;
 	}
 
 	*dict = tag;
 
-	return 0;
+	return 0L;
 }
 #endif /* UNUSED */
 
@@ -185,73 +179,72 @@ long XMLParseFile( char * buffer, TagPtr * dict )
 long XMLParseNextTag(char * buffer, TagPtr * tag)
 {
 	char * tagName;
+	long pos	= 0L;
+	long length	= GetNextTag(buffer, &tagName, 0);
+	
+	if (length != -1L)
+	{
+		pos = length;
+		
+		if (!strncmp(tagName, kXMLTagPList, 6))
+		{
+			length = 0L;
+		}
+		else if (!strcmp(tagName, kXMLTagDict))
+		{
+			length = ParseTagList(buffer + pos, tag, kTagTypeDict, 0);
+		}
+		else if (!strcmp(tagName, kXMLTagDict "/"))
+		{
+			length = ParseTagList(buffer + pos, tag, kTagTypeDict, 1);
+		}
+		else if (!strcmp(tagName, kXMLTagKey))
+		{
+			length = ParseTagKey(buffer + pos, tag);
+		}
+		else if (!strcmp(tagName, kXMLTagString))
+		{
+			length = ParseTagString(buffer + pos, tag);
+		}
+		else if (!strcmp(tagName, kXMLTagInteger))
+		{
+			length = ParseTagInteger(buffer + pos, tag);
+		}
+		else if (!strcmp(tagName, kXMLTagData))
+		{
+			length = ParseTagData(buffer + pos, tag);
+		}
+		else if (!strcmp(tagName, kXMLTagDate))
+		{
+			length = ParseTagDate(buffer + pos, tag);
+		}
+		else if (!strcmp(tagName, kXMLTagFalse))
+		{
+			length = ParseTagBoolean(buffer + pos, tag, kTagTypeFalse);
+		}
+		else if (!strcmp(tagName, kXMLTagTrue))
+		{
+			length = ParseTagBoolean(buffer + pos, tag, kTagTypeTrue);
+		}
+		else if (!strcmp(tagName, kXMLTagArray))
+		{
+			length = ParseTagList(buffer + pos, tag, kTagTypeArray, 0);
+		}
+		else if (!strcmp(tagName, kXMLTagArray "/"))
+		{
+			length = ParseTagList(buffer + pos, tag, kTagTypeArray, 1);
+		}
+		else
+		{
+			*tag = 0;
+			length = 0L;
+		}
+		
+		if (length == -1)
+		{
+			pos = 0L;
+		}
 
-	long length = GetNextTag(buffer, &tagName, 0);
-
-	if (length == -1)
-	{
-		return -1;
-	}
-
-	long pos = length;
-
-	if (!strncmp(tagName, kXMLTagPList, 6))
-	{
-		length = 0;
-	}
-	else if (!strcmp(tagName, kXMLTagDict))
-	{
-		length = ParseTagList(buffer + pos, tag, kTagTypeDict, 0);
-	}
-	else if (!strcmp(tagName, kXMLTagDict "/"))
-	{
-		length = ParseTagList(buffer + pos, tag, kTagTypeDict, 1);
-	}
-	else if (!strcmp(tagName, kXMLTagKey))
-	{
-		length = ParseTagKey(buffer + pos, tag);
-	}
-	else if (!strcmp(tagName, kXMLTagString))
-	{
-		length = ParseTagString(buffer + pos, tag);
-	}
-	else if (!strcmp(tagName, kXMLTagInteger))
-	{
-		length = ParseTagInteger(buffer + pos, tag);
-	}
-	else if (!strcmp(tagName, kXMLTagData))
-	{
-		length = ParseTagData(buffer + pos, tag);
-	}
-	else if (!strcmp(tagName, kXMLTagDate))
-	{
-		length = ParseTagDate(buffer + pos, tag);
-	}
-	else if (!strcmp(tagName, kXMLTagFalse))
-	{
-		length = ParseTagBoolean(buffer + pos, tag, kTagTypeFalse);
-	}
-	else if (!strcmp(tagName, kXMLTagTrue))
-	{
-		length = ParseTagBoolean(buffer + pos, tag, kTagTypeTrue);
-	}
-	else if (!strcmp(tagName, kXMLTagArray))
-	{
-		length = ParseTagList(buffer + pos, tag, kTagTypeArray, 0);
-	}
-	else if (!strcmp(tagName, kXMLTagArray "/"))
-	{
-		length = ParseTagList(buffer + pos, tag, kTagTypeArray, 1);
-	}
-	else
-	{
-		*tag = 0;
-		length = 0;
-	}
-
-	if (length == -1)
-	{
-		return -1;
 	}
 
 	return pos + length;
@@ -262,7 +255,7 @@ long XMLParseNextTag(char * buffer, TagPtr * tag)
 
 static long ParseTagList(char * buffer, TagPtr * tag, long type, long empty)
 {
-	long length, pos = 0;
+	long length, pos = 0L;
 
 	TagPtr tmpTag, tagList = 0;
 
@@ -292,7 +285,7 @@ static long ParseTagList(char * buffer, TagPtr * tag, long type, long empty)
 		{
 			XMLFreeTag(tagList);
 
-			return -1;
+			return -1L;
 		}
 	}
 
@@ -302,7 +295,7 @@ static long ParseTagList(char * buffer, TagPtr * tag, long type, long empty)
 	{
 		XMLFreeTag(tagList);
 
-		return -1;
+		return -1L;
 	}
 
 	tmpTag->type	= type;
@@ -322,47 +315,45 @@ static long ParseTagKey(char * buffer, TagPtr * tag)
 {
 	long length = FixDataMatchingTag(buffer, kXMLTagKey);
 
-	if (length == -1)
+	if (length != -1L)
 	{
-		return -1;
-	}
+		TagPtr subTag;
 
-	TagPtr subTag; 
+		long length2 = XMLParseNextTag(buffer + length, &subTag);
 
-	long length2 = XMLParseNextTag(buffer + length, &subTag);
-
-	if (length2 == -1)
-	{
-		return -1;
-	}
-
-	TagPtr tmpTag = NewTag();
-
-	if (tmpTag == 0)
-	{
-		XMLFreeTag(subTag);
-
-		return -1;
-	}
-
-	char * string = NewSymbol(buffer);
-
-	if (string == 0)
-	{
-		XMLFreeTag(subTag);
-		XMLFreeTag(tmpTag);
+		if (length2 != -1L)
+		{
+			TagPtr tmpTag = NewTag();
 
-		return -1;
+			if (tmpTag)
+			{
+				char * string = NewSymbol(buffer);
+
+				if (string)
+				{
+					tmpTag->type	= kTagTypeKey;
+					tmpTag->string	= string;
+					tmpTag->tag		= subTag;
+					tmpTag->tagNext	= 0;
+
+					*tag = tmpTag;
+
+					return length + length2;
+				}
+				else
+				{
+					XMLFreeTag(subTag);
+					XMLFreeTag(tmpTag);
+				}
+			}
+			else
+			{
+				XMLFreeTag(subTag);
+			}
+		}
 	}
 
-	tmpTag->type	= kTagTypeKey;
-	tmpTag->string	= string;
-	tmpTag->tag		= subTag;
-	tmpTag->tagNext	= 0;
-
-	*tag = tmpTag;
-
-	return length + length2;
+	return length;	// -1;
 }
 
 
@@ -372,35 +363,31 @@ static long ParseTagString(char * buffer, TagPtr * tag)
 {
 	long length = FixDataMatchingTag(buffer, kXMLTagString);
 
-	if (length == -1)
-	{
-		return -1;
-	}
-
-	TagPtr tmpTag = NewTag();
-
-	if (tmpTag == 0)
+	if (length != -1L)
 	{
-		return -1;
-	}
+		TagPtr tmpTag = NewTag();
 
-    char * string = NewSymbol(buffer);
-
-	if (string == 0)
-	{
-		XMLFreeTag(tmpTag);
+		if (tmpTag)
+		{
+			char * string = NewSymbol(buffer);
 
-		return -1;
+			if (string)
+			{
+				tmpTag->type	= kTagTypeString;
+				tmpTag->string	= string;
+				tmpTag->tag		= 0;
+				tmpTag->tagNext	= 0;
+				
+				*tag = tmpTag;
+			}
+			else
+			{
+				XMLFreeTag(tmpTag);
+			}
+		}
 	}
 
-	tmpTag->type	= kTagTypeString;
-	tmpTag->string	= string;
-	tmpTag->tag		= 0;
-	tmpTag->tagNext	= 0;
-
-	*tag = tmpTag;
-
-	return length;
+	return length;	// -1;
 }
 
 
@@ -410,28 +397,24 @@ static long ParseTagInteger(char * buffer, TagPtr * tag)
 {
 	long length = FixDataMatchingTag(buffer, kXMLTagInteger);
 
-	if (length == -1)
+	if (length != -1L)
 	{
-		return -1;
-	}
-    
-    TagPtr tmpTag = NewTag();
+		TagPtr tmpTag = NewTag();
 
-	if (tmpTag == 0)
-	{
-		return -1;
-	}
+		if (tmpTag)
+		{
+			long integer = 0L;
 
-	long integer = 0;
-    
-	tmpTag->type	= kTagTypeInteger;
-	tmpTag->string	= (char *)integer;
-	tmpTag->tag		= 0;
-	tmpTag->tagNext	= 0;
+			tmpTag->type	= kTagTypeInteger;
+			tmpTag->string	= (char *)integer;
+			tmpTag->tag		= 0;
+			tmpTag->tagNext	= 0;
 
-	*tag = tmpTag;
+			*tag = tmpTag;
+		}
+	}
 
-	return length;
+	return length;	// -1
 }
 
 
@@ -441,26 +424,24 @@ static long ParseTagData(char * buffer, TagPtr * tag)
 {
 	long length = FixDataMatchingTag(buffer, kXMLTagData);
 
-	if (length == -1)
+	if (length != -1L)
 	{
-		return -1;
-	}
+		TagPtr tmpTag = NewTag();
 
-    TagPtr tmpTag = NewTag();
-
-	if (tmpTag == 0)
-	{
-		return -1;
-	}
+		if (tmpTag)
+		{
+			tmpTag->type	= kTagTypeData;
+			tmpTag->string	= 0;
+			tmpTag->tag		= 0;
+			tmpTag->tagNext	= 0;
 
-	tmpTag->type	= kTagTypeData;
-	tmpTag->string	= 0;
-	tmpTag->tag		= 0;
-	tmpTag->tagNext	= 0;
+			*tag = tmpTag;
 
-	*tag = tmpTag;
+			return length;
+		}
+	}
 
-	return length;
+	return length;	// -1
 }
 
 
@@ -470,26 +451,24 @@ static long ParseTagDate(char * buffer, TagPtr * tag)
 {
 	long length = FixDataMatchingTag(buffer, kXMLTagDate);
 
-	if (length == -1)
+	if (length != -1L)
 	{
-		return -1;
-	}
+		TagPtr tmpTag = NewTag();
 
-    TagPtr tmpTag = NewTag();
+		if (tmpTag)
+		{
+			tmpTag->type	= kTagTypeDate;
+			tmpTag->string	= 0;
+			tmpTag->tag		= 0;
+			tmpTag->tagNext	= 0;
 
-	if (tmpTag == 0)
-	{
-		return -1;
+			*tag = tmpTag;
+
+			return length;
+		}
 	}
-    
-	tmpTag->type	= kTagTypeDate;
-	tmpTag->string	= 0;
-	tmpTag->tag		= 0;
-	tmpTag->tagNext	= 0;
 
-	*tag = tmpTag;
-    
-	return length;
+	return -1;
 }
 
 
@@ -499,19 +478,19 @@ static long ParseTagBoolean(char * buffer, TagPtr * tag, long type)
 {
 	TagPtr tmpTag = NewTag();
 
-	if (tmpTag == 0)
+	if (tmpTag)
 	{
-		return -1;
-	}
-    
-	tmpTag->type	= type;
-	tmpTag->string	= 0;
-	tmpTag->tag		= 0;
-	tmpTag->tagNext	= 0;
+		tmpTag->type	= type;
+		tmpTag->string	= 0;
+		tmpTag->tag		= 0;
+		tmpTag->tagNext	= 0;
 
-	*tag = tmpTag;
+		*tag = tmpTag;
 
-	return 0;
+		return 0L;
+	}
+
+	return -1L;
 }
 
 
@@ -519,47 +498,43 @@ static long ParseTagBoolean(char * buffer, TagPtr * tag, long type)
 
 static long GetNextTag(char * buffer, char ** tag, long * start)
 {
-	if (tag == 0)
-	{
-		return -1;
-	}
-
-	// Find the start of the tag.
-	long cnt = 0;
-
-	while ((buffer[cnt] != '\0') && (buffer[cnt] != '<'))
-	{
-		cnt++;
-	}
-
-	if (buffer[cnt] == '\0')
-	{
-		return -1;
-	}
-
-	// Find the end of the tag.
-	long cnt2 = cnt + 1;
-
-	while ((buffer[cnt2] != '\0') && (buffer[cnt2] != '>'))
-	{
-		cnt2++;
-	}
-
-	if (buffer[cnt2] == '\0')
-	{
-		return -1;
-	}
-
-	// Fix the tag data.
-	*tag = buffer + cnt + 1;
-	buffer[cnt2] = '\0';
-
-	if (start)
+	if (tag)
 	{
-		*start = cnt;
+		// Find the start of the tag.
+		long cnt = 0L;
+		
+		while ((buffer[cnt] != '\0') && (buffer[cnt] != '<'))
+		{
+			cnt++;
+		}
+		
+		if (buffer[cnt] != '\0')
+		{
+			// Find the end of the tag.
+			long cnt2 = cnt + 1L;
+			
+			while ((buffer[cnt2] != '\0') && (buffer[cnt2] != '>'))
+			{
+				cnt2++;
+			}
+			
+			if (buffer[cnt2] != '\0')
+			{
+				// Fix the tag data.
+				*tag = buffer + cnt + 1;
+				buffer[cnt2] = '\0';
+				
+				if (start)
+				{
+					*start = cnt;
+				}
+				
+				return cnt2 + 1;
+			}
+		}
 	}
-
-	return cnt2 + 1;
+	
+	return -1L;
 }
 
 
@@ -582,8 +557,7 @@ static long FixDataMatchingTag(char * buffer, char * tag)
 		{
 			return -1;
 		}
-
-		if ((*endTag == '/') && !strcmp(endTag + 1, tag))
+		else if ((*endTag == '/') && !strcmp(endTag + 1, tag))
 		{
 			break;
 		}
@@ -601,34 +575,33 @@ static long FixDataMatchingTag(char * buffer, char * tag)
 
 static TagPtr NewTag(void)
 {
-	long   cnt;
+	long	cnt = 0L;
 
-	TagPtr tag;
+	TagPtr	tag = NULL;
 
-	if (gTagsFree == 0)
+	if (gTagsFree == NULL)
 	{
-#if USEMALLOC
 		tag = (TagPtr)malloc(kTagsPerBlock * sizeof(Tag));
-#else
-		tag = (TagPtr)AllocateBootXMemory(kTagsPerBlock * sizeof(Tag));
-#endif
-		if (tag == 0)
-		{
-			return 0;
-		}
 
-		// Initalize the new tags.
-		for (cnt = 0; cnt < kTagsPerBlock; cnt++)
+		if (tag)
 		{
-			tag[cnt].type		= kTagTypeNone;
-			tag[cnt].string		= 0;
-			tag[cnt].tag		= 0;
-			tag[cnt].tagNext	= tag + cnt + 1;
-		}
+			// Initalize the new tags.
+			for (cnt = 0; cnt < kTagsPerBlock; cnt++)
+			{
+				tag[cnt].type		= kTagTypeNone;
+				tag[cnt].string		= 0;
+				tag[cnt].tag		= 0;
+				tag[cnt].tagNext	= tag + cnt + 1;
+			}
 
-		tag[kTagsPerBlock - 1].tagNext = 0;
+			tag[kTagsPerBlock - 1].tagNext = 0;
 
-		gTagsFree = tag;
+			gTagsFree = tag;
+		}
+		else
+		{
+			return NULL;
+		}
 	}
 
 	tag = gTagsFree;
@@ -642,29 +615,23 @@ static TagPtr NewTag(void)
 
 void XMLFreeTag(TagPtr tag)
 {
-#if DOFREE
-	if (tag == 0)
+	if (tag)
 	{
-		return;
-	}
+		if (tag->string)
+		{
+			FreeSymbol(tag->string);
+		}
 
-	if (tag->string)
-	{
-		FreeSymbol(tag->string);
-	}
+		XMLFreeTag(tag->tag);
+		XMLFreeTag(tag->tagNext);
 
-	XMLFreeTag(tag->tag);
-	XMLFreeTag(tag->tagNext);
-
-	// Clear and free the tag.
-	tag->type		= kTagTypeNone;
-	tag->string		= 0;
-	tag->tag		= 0;
-	tag->tagNext	= gTagsFree;
-	gTagsFree		= tag;
-#else
-	return;
-#endif
+		// Clear and free the tag.
+		tag->type		= kTagTypeNone;
+		tag->string		= 0;
+		tag->tag		= 0;
+		tag->tagNext	= gTagsFree;
+		gTagsFree		= tag;
+	}
 }
 
 
@@ -674,31 +641,28 @@ static char * NewSymbol(char * string)
 {
 	static SymbolPtr lastGuy = 0;
 
-	SymbolPtr symbol;
-
 	// Look for string in the list of symbols.
-	symbol = FindSymbol(string, 0);
+	SymbolPtr symbol = FindSymbol(string, 0);
 
-	// Add the new symbol.
+	// Add new symbol.
 	if (symbol == 0)
 	{
-#if USEMALLOC
 		symbol = (SymbolPtr)malloc(sizeof(Symbol) + 1 + strlen(string));
-#else
-		symbol = (SymbolPtr)AllocateBootXMemory(sizeof(Symbol) + 1 + strlen(string));
-#endif
-		if (symbol == 0)
-		{
-			stop("NULL symbol!");
-		}
 
-		// Set the symbol's data.
-		symbol->refCount = 0;
-		strcpy(symbol->string, string);
+		if (symbol)
+		{
+			// Set the symbol's data.
+			symbol->refCount = 0;
+			strcpy(symbol->string, string);
 
-		// Add the symbol to the list.
-		symbol->next = gSymbolsHead;
-		gSymbolsHead = symbol;
+			// Add the symbol to the list.
+			symbol->next = gSymbolsHead;
+			gSymbolsHead = symbol;
+		}
+		else
+		{
+			stop ("xml.c");
+		}
 	}
 
 	// Update the refCount and return the string.
@@ -706,51 +670,45 @@ static char * NewSymbol(char * string)
 
 	if (lastGuy && lastGuy->next != 0)
 	{
-		stop("last guy not last!");
+		stop ("xml.c");
 	}
 
 	return symbol->string;
 }
 
 
-#if DOFREE
 //==============================================================================
 
 static void FreeSymbol(char * string)
-{ 
+{
 	SymbolPtr symbol, prev;
 	prev = 0;
 
 	// Look for string in the list of symbols.
 	symbol = FindSymbol(string, &prev);
 
-	if (symbol == 0)
+	if (symbol)
 	{
-		return;
-	}
-
-	// Update the refCount.
-	symbol->refCount--;
+		// Update the refCount.
+		symbol->refCount--;
 
-	if (symbol->refCount != 0)
-	{
-		return;
-	}
+		if (symbol->refCount == 0)
+		{
+			// Remove the symbol from the list.
+			if (prev != 0)
+			{
+				prev->next = symbol->next;
+			}
+			else
+			{
+				gSymbolsHead = symbol->next;
+			}
+		}
 
-	// Remove the symbol from the list.
-	if (prev != 0)
-	{
-		prev->next = symbol->next;
-	}
-    else
-	{
-		gSymbolsHead = symbol->next;
+		// Free the symbol's memory.
+		free (symbol);
 	}
-
-	// Free the symbol's memory.
-	free(symbol);
 }
-#endif
 
 
 //==============================================================================
@@ -766,7 +724,7 @@ static SymbolPtr FindSymbol(char * string, SymbolPtr * prevSymbol)
 		{
 			break;
 		}
-    
+
 		prev = symbol;
 		symbol = symbol->next;
 	}
@@ -778,4 +736,3 @@ static SymbolPtr FindSymbol(char * string, SymbolPtr * prevSymbol)
 
 	return symbol;
 }
-

From ff60513fe732496d9ea10588c90b84d941b8b68c Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:01:30 +0100
Subject: [PATCH 157/623] Adding FIXME note

---
 i386/libsaio/smbios/static_data.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/static_data.h b/i386/libsaio/smbios/static_data.h
index 85823ee..27601f1 100755
--- a/i386/libsaio/smbios/static_data.h
+++ b/i386/libsaio/smbios/static_data.h
@@ -17,7 +17,7 @@
 	#include "essentials.h"
 
 	int tableLength = 0;
-	//long fileSize = 0; ***unused variable
+	long fileSize = 0; // FIXME: This variable <i>is used</i> but conditionally!
 
 	#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
 		char dirSpec[32] = "";

From 1950263742d4250e5c668db64dc4fa646c283243 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:03:17 +0100
Subject: [PATCH 158/623] Output improved

---
 i386/util/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i386/util/Makefile b/i386/util/Makefile
index 714a6f4..aaa3484 100644
--- a/i386/util/Makefile
+++ b/i386/util/Makefile
@@ -5,6 +5,7 @@
 #
 #			- Major cleanup (PikerAlpha, October 2012).
 #			- Fixed clang compilation (dgsga, November 2012. Credits to Evan Lojewski for original work).
+#			- Output improved (PikerAlpha, October 2012).
 #
 
 

From a91747be1235a591a2aee34d7bd52458a28cdbeb Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:05:51 +0100
Subject: [PATCH 159/623] Unused sysConfigValid removed and white space fix

---
 i386/boot2/boot.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 2a4b3c4..280bba2 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -50,7 +50,8 @@
  * Updates:
  *		- Refactorized by DHP in 2010 and 2011.
  *		- Optionally include Recovery HD support code (PikerAlpha, November 2012).
- *      - Fixed clang compilation (PikerAlpha, November 2012).
+ *		- Fixed clang compilation (PikerAlpha, November 2012).
+ *		- Unused sysConfigValid removed and white space fix (PikerAlpha, November 2012).
  */
 
 
@@ -386,8 +387,6 @@ void boot(int biosdev)
     while (1)
     {
 		// Initialize globals.
-
-		sysConfigValid = 0;
 		gErrors        = 0;
 
 		int retStatus = -1;

From 8c2706b19df4e07703c4b1f7a8fe536b936266a6 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:07:08 +0100
Subject: [PATCH 160/623] Unused sysConfigValid removed

---
 i386/boot2/boot.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/i386/boot2/boot.h b/i386/boot2/boot.h
index b841f20..e243f8d 100755
--- a/i386/boot2/boot.h
+++ b/i386/boot2/boot.h
@@ -20,9 +20,12 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
- */
-/*
+ *
  * Copyright 1994 NeXT Computer, Inc. All rights reserved.
+ *
+ * Updates:
+ *		- Unused sysConfigValid removed (PikerAlpha, November 2012).
+ *
  */
 
 #ifndef __BOOT2_BOOT_H

From ca541b7bf31570659e2113762989b0d88077af7f Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:10:27 +0100
Subject: [PATCH 161/623] BOOT2ADDR removed, static compilation and some white
 space changes

---
 i386/boot2/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 6ed320c..765fb6e 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -9,6 +9,7 @@
 #		- BOOT2ADDR moved to RevoBoot/i386/util/segsize.c (PikerAlpha, November 2012).
 #		- Simplified calls to RevoBoot/i386/util/segsize (PikerAlpha, November 2012).
 #		- Reformatted output, include directory dependency lifted (PikerAlpha, November 2012).
+#		- BOOT2ADDR removed, static compilation and some white space changes (PikerAlpha, November 2012).
 #
 
 
@@ -26,8 +27,7 @@ LIBSADIR = ../libsa
 LIBSAIODIR = ../libsaio
 UTILDIR = ../util
 
-INC = -I. -I.. -I$(SYMROOT) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(UTILDIR)
-
+INC =	-I. -I.. -I$(SYMROOT) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(UTILDIR)
 LIBS = -L$(SYMROOT) -lsaio -lsa
 LIBDEP = $(SYMROOT)/libsaio.a $(SYMROOT)/libsa.a
 
@@ -40,7 +40,6 @@ VPATH = $(OBJROOT):$(SYMROOT)
 OBJS = boot2.o boot.o bootlogo.o graphics.o drivers.o options.o lzss.o
 
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
-BOOT2ADDR = 20200
 
 #
 # Set maximum size of the booter to 128KB (should be more than sufficient).
@@ -49,10 +48,10 @@ MAXBOOTSIZE = 131072
 
 $(MAKEGOAL): $(DIRS_NEEDED) boot
 
-boot: $(OBJS)
+boot:	$(OBJS)
 
 	@echo "\t[LD] boot.sys"
-	@$(CC)	-nostdlib -arch i386 \
+	@$(CC)	-nostdlib -arch i386 -static \
 		-Wl,-preload \
 		-Wl,-pie \
 		-Wl,-segalign,20 \

From 71f4e5944936bb27813ae0ef4666788fb7e86a8c Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:20:35 +0100
Subject: [PATCH 162/623] OSBigEndian removed and white space changes

---
 i386/libsaio/hfs.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/i386/libsaio/hfs.c b/i386/libsaio/hfs.c
index e19206c..f980a6e 100755
--- a/i386/libsaio/hfs.c
+++ b/i386/libsaio/hfs.c
@@ -18,13 +18,16 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *  hfs.c - File System Module for HFS and HFS+.
  *
- *  Copyright (c) 1999-2002 Apple Computer, Inc.
+ * hfs.c - File System Module for HFS and HFS+.
+ *
+ * Copyright (c) 1999-2002 Apple Computer, Inc.
+ *
+ * DRI: Josh de Cesare
+ *
+ * Updates:
+ *			- OSBigEndian removed and white space changes (PikerAlpha, November 2012)
  *
- *  DRI: Josh de Cesare
  */
 
 #include <sl.h>
@@ -131,7 +134,7 @@ bool HFSProbe (const void *buf)
     mdb = (const HFSMasterDirectoryBlock *)(((const char*)buf)+kMDBBaseOffset);
     header = (const HFSPlusVolumeHeader *)(((const char*)buf)+kMDBBaseOffset);
 	
-    if ( SWAP_BE16(mdb->drSigWord) == kHFSSigWord )
+    if (SWAP_BE16(mdb->drSigWord) == kHFSSigWord)
         return true;
 
     if (SWAP_BE16(header->signature) != kHFSPlusSigWord && SWAP_BE16(header->signature) != kHFSXSigWord)
@@ -257,11 +260,9 @@ long HFSInitPartition(CICell ih)
     extentSize = SWAP_BE64(gHFSPlus->catalogFile.logicalSize);
     extentFile = kHFSCatalogFileID;
 
-    ReadExtent(extent, extentSize, extentFile, 0, 256,
-               gBTreeHeaderBuffer + kBTreeCatalog * 256, 0);
+    ReadExtent(extent, extentSize, extentFile, 0, 256, gBTreeHeaderBuffer + kBTreeCatalog * 256, 0);
 
-    nodeSize = SWAP_BE16(((BTHeaderRec *)(gBTreeHeaderBuffer + kBTreeCatalog * 256 +
-                         sizeof(BTNodeDescriptor)))->nodeSize);
+    nodeSize = SWAP_BE16(((BTHeaderRec *)(gBTreeHeaderBuffer + kBTreeCatalog * 256 + sizeof(BTNodeDescriptor)))->nodeSize);
 
     // If the BTree node size is larger than the block size, reset the cache.
     if (nodeSize > gBlockSize)
@@ -772,7 +773,7 @@ static long GetCatalogEntry(long * dirIndex, char ** name, long * flags, long *
 	{
 		utf_encodestr(((HFSPlusCatalogKey *)testKey)->nodeName.unicode,
                       SWAP_BE16(((HFSPlusCatalogKey *)testKey)->nodeName.length),
-                      (u_int8_t *)gTempStr, 256, OSBigEndian);
+                      (u_int8_t *)gTempStr, 256);
 	}
 	else
 	{
@@ -820,7 +821,7 @@ static long ReadCatalogEntry(char * fileName, long dirID, void * entry, long * d
 			length = 255;
 		}
 
-		utf_decodestr((u_int8_t *)fileName, hfsPlusKey->nodeName.unicode, &(hfsPlusKey->nodeName.length), 512, OSBigEndian);
+		utf_decodestr((u_int8_t *)fileName, hfsPlusKey->nodeName.unicode, &(hfsPlusKey->nodeName.length), 512);
 	}
 	else
 	{
@@ -1301,7 +1302,7 @@ static long CompareHFSPlusCatalogKeys(void * key, void * testKey)
             result = FastUnicodeCompare(&searchKey->nodeName.unicode[0],
                                         SWAP_BE16(searchKey->nodeName.length),
                                         &trialKey->nodeName.unicode[0],
-                                        SWAP_BE16(trialKey->nodeName.length), OSBigEndian);
+                                        SWAP_BE16(trialKey->nodeName.length));
         }
     }
 
@@ -1415,4 +1416,3 @@ static long CompareHFSPlusExtentsKeys(void * key, void * testKey)
 
     return result;
 }
-

From 66f31e453ba24bf1c2b272c61c4ee43e1f6306e1 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:24:27 +0100
Subject: [PATCH 163/623] Check malloc return

---
 i386/libsaio/efi/fake_efi.h | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/efi/fake_efi.h b/i386/libsaio/efi/fake_efi.h
index bfa1bff..94c18a9 100755
--- a/i386/libsaio/efi/fake_efi.h
+++ b/i386/libsaio/efi/fake_efi.h
@@ -27,6 +27,9 @@
  * EFI implementation for Revolution Copyright (c) 2010 by DHP.
  * All rights reserved.
  *
+ * Updates:
+ *		- Check malloc return (PikerAlpha, November 2012).
+ *
  */
 
 #include "bootstruct.h"							// For bootArgs.
@@ -56,12 +59,17 @@ static EFI_UINT32 const FIRMWARE_REVISION = EFI_SYSTEM_TABLE_REVISION;
 
 static inline char * mallocStringForGuid(EFI_GUID const *pGuid)
 {
-    char *string = malloc(37);
-    efi_guid_unparse_upper(pGuid, string);
+	char *string = malloc(37);
 
-    return string;
-}
+	if (string)
+	{
+		efi_guid_unparse_upper(pGuid, string);
 
+		return string;
+	}
+
+	return NULL;
+}
 
 //==============================================================================
 // Function to map a 32-bit address to a 64-bit address, or it simply returns 

From 8dc15e1ec8b4888ec8aa8da3e11ce4639f9d5716 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:27:39 +0100
Subject: [PATCH 164/623] Use size_t instead of int when required

---
 i386/libsa/string.c | 106 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 92 insertions(+), 14 deletions(-)

diff --git a/i386/libsa/string.c b/i386/libsa/string.c
index 2e58d88..0f2c9bc 100755
--- a/i386/libsa/string.c
+++ b/i386/libsa/string.c
@@ -20,8 +20,13 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ * Updates:
+ *			- Layout and white space changes (PikerAlpha, November 2012)
+ *			- Use size_t instead of int when required (PikerAlpha, November 2012)
+ *
  */
-/* string operations */
+
 
 #include "libsa.h"
 
@@ -128,10 +133,15 @@ void bzero(void * dst, size_t len)
 
 //==========================================================================
 
-int strlen(const char * s)
+size_t strlen(const char * s)
 {
 	int n = 0;
-	while (*s++) n++;
+
+	while (*s++)
+	{
+		n++;
+	}
+
 	return(n);
 }
 /*#endif*/
@@ -140,12 +150,16 @@ int strlen(const char * s)
 //==========================================================================
 /* NOTE: Moved from ntfs.c */
 
-int memcmp(const void *p1, const void *p2, int len)
+int memcmp(const void *p1, const void *p2, size_t len)
 {
-    while (len--) {
+    while (len--)
+	{
         if (*(const char*)(p1++) != *(const char*)(p2++))
+		{
             return -1;
+		}
     }
+
     return 0;
 }
 
@@ -154,10 +168,12 @@ int memcmp(const void *p1, const void *p2, int len)
 
 int strcmp(const char * s1, const char * s2)
 {
-	while (*s1 && (*s1 == *s2)) {
+	while (*s1 && (*s1 == *s2))
+	{
 		s1++;
 		s2++;
 	}
+
 	return (*s1 - *s2);
 }
 
@@ -167,9 +183,15 @@ int strcmp(const char * s1, const char * s2)
 int strncmp(const char * s1, const char * s2, size_t len)
 {
 	register int n = len;
+
 	while (--n >= 0 && *s1 == *s2++)
+	{
 		if (*s1++ == '\0')
+		{
 			return(0);
+		}
+	}
+
 	return(n<0 ? 0 : *s1 - *--s2);
 }
 
@@ -179,8 +201,12 @@ int strncmp(const char * s1, const char * s2, size_t len)
 char * strcpy(char * s1, const char * s2)
 {
 	register char *ret = s1;
+
 	while ((*s1++ = *s2++))
+	{
 		continue;
+	}
+
 	return ret;
 }
 
@@ -190,21 +216,33 @@ char * strcpy(char * s1, const char * s2)
 char * strncpy(char * s1, const char * s2, size_t n)
 {
 	register char *ret = s1;
+
 	while (n && (*s1++ = *s2++))
+	{
 		n--;
+	}
+
 	return ret;
 }
 
 
 //==========================================================================
 
-char * strlcpy(char * s1, const char * s2, size_t n)
+size_t strlcpy(char * s1, const char * s2, size_t n)
 {
 	register char *ret = s1;
+
 	while (n && (*s1++ = *s2++))
+	{
 		n--;
-	if (!n) *--s1=0;
-	return ret;
+	}
+
+	if (!n)
+	{
+		*--s1=0;
+	}
+
+	return strlen(ret);
 }
 
 
@@ -216,10 +254,14 @@ char * strstr(const char *in, const char *str)
     size_t len;
 
     c = *str++;
+
     if (!c)
+	{
         return (char *) in;	// Trivial empty string case
+	}
 
     len = strlen(str);
+
     do {
         char sc;
 
@@ -241,10 +283,18 @@ int ptol(const char *str)
 	register int c = *str;
 
 	if (c <= '7' && c >= '0')
+	{
 		c -= '0';
+	}
 	else if (c <= 'h' && c >= 'a')
+	{
 		c -= 'a';
-	else c = 0;
+	}
+	else
+	{
+		c = 0;
+	}
+
 	return c;
 }
 
@@ -254,9 +304,14 @@ int ptol(const char *str)
 int atoi(const char *str)
 {
 	register int sum = 0;
+
 	while (*str == ' ' || *str == '\t')
+	{
 		str++;
-	while (*str >= '0' && *str <= '9') {
+	}
+
+	while (*str >= '0' && *str <= '9')
+	{
 		sum *= 10;
 		sum += *str++ - '0';
 	}
@@ -269,11 +324,19 @@ int atoi(const char *str)
 char *strncat(char *s1, const char *s2, size_t n)
 {
 	register char *ret = s1;
+
 	while (*s1)
+	{
 		s1++;
+	}
+
 	while (n-- && *s2)
+	{
 		*s1++ = *s2++;
+	}
+
 	*s1 = '\0';
+
 	return ret;
 }
 
@@ -288,9 +351,16 @@ char *strcat(char *s1, const char *s2)
 
 //==========================================================================
 
-char *strdup(const char *s1)
+char *strdup(const char *sourceString)
 {
-	return strcpy(malloc(strlen(s1) + 1), s1);
+	char * newString = (char *)malloc(strlen(sourceString) + 1);
+
+	if (newString)
+	{
+		return strcpy(newString, sourceString);
+	}
+
+	return NULL;
 }
 
 
@@ -299,9 +369,15 @@ char *strdup(const char *s1)
 int strncasecmp(const char *s1, const char *s2, size_t len)
 {
 	register int n = len;
+
 	while (--n >= 0 && tolower(*s1) == tolower(*s2++))
+	{
 		if (*s1++ == '\0')
+		{
 			return(0);
+		}
+	}
+
 	return(n<0 ? 0 : tolower(*s1) - tolower(*--s2));
 }
 #endif
@@ -316,8 +392,10 @@ uint8_t checksum8( void * start, unsigned int length )
     uint8_t * cp = (uint8_t *) start;
     unsigned int i;
 
-    for ( i = 0; i < length; i++)
+    for (i = 0; i < length; i++)
+	{
         csum += *cp++;
+	}
 
     return csum;
 }

From 7fcf15e77e2edfac14ce76127a2883b6115d84d6 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:29:09 +0100
Subject: [PATCH 165/623] Use size_t instead of int when required

---
 i386/libsa/libsa.h | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/i386/libsa/libsa.h b/i386/libsa/libsa.h
index 7cba5a5..d2ae491 100755
--- a/i386/libsa/libsa.h
+++ b/i386/libsa/libsa.h
@@ -20,6 +20,10 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ * Updates:
+ *			- Use size_t instead of int when required (PikerAlpha, November 2012)
+ *
  */
 
 #ifndef __BOOT_LIBSA_H
@@ -53,22 +57,27 @@ extern int fastEnableA20(void);
 	extern void   bzero(void * dst, size_t len);
 #endif
 
-extern void * memset(void * dst, int c, size_t n);
-extern void * memcpy(void * dst, const void * src, size_t len);
-extern int    memcmp(const void * p1, const void * p2, int len);
-extern int    strcmp(const char * s1, const char * s2);
-extern int    strncmp(const char * s1, const char * s2, size_t n);
 extern char * strcpy(char * s1, const char * s2);
 extern char * strncpy(char * s1, const char * s2, size_t n);
-extern char * strlcpy(char * s1, const char * s2, size_t n);
+
 extern char * strstr(const char *in, const char *str);
-extern int    atoi(const char * str);
-extern int    ptol(const char * str);
-extern int    strlen(const char * str);
 extern char * strcat(char * s1, const char * s2);
 extern char * strncat(char * s1, const char * s2, size_t n);
 extern char * strdup(const char *s1);
 
+extern void * memset(void * dst, int c, size_t n);
+extern void * memcpy(void * dst, const void * src, size_t len);
+
+extern int		strcmp(const char * s1, const char * s2);
+extern int		strncmp(const char * s1, const char * s2, size_t n);
+extern int		atoi(const char * str);
+extern int		ptol(const char * str);
+
+extern int	memcmp(const void * p1, const void * p2, size_t len);
+
+extern size_t	strlcpy(char * s1, const char * s2, size_t n);
+extern size_t	strlen(const char * str);
+
 #if STRNCASECMP
 	extern int    strncasecmp(const char * s1, const char * s2, size_t n);
 #endif

From 70118487b04263214817b945fb72ca0f69abbb56 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:32:10 +0100
Subject: [PATCH 166/623] White space changes only

---
 i386/boot2/boot.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 280bba2..1ebeb08 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -30,28 +30,25 @@
  */
 
 /*
- *          INTEL CORPORATION PROPRIETARY INFORMATION
+ * INTEL CORPORATION PROPRIETARY INFORMATION
  *
- *  This software is supplied under the terms of a license  agreement or 
- *  nondisclosure agreement with Intel Corporation and may not be copied 
- *  nor disclosed except in accordance with the terms of that agreement.
+ * This software is supplied under the terms of a license  agreement or
+ * nondisclosure agreement with Intel Corporation and may not be copied
+ * nor disclosed except in accordance with the terms of that agreement.
+ *
+ * Copyright 1988, 1989 by Intel Corporation
  *
- *  Copyright 1988, 1989 by Intel Corporation
- */
-
-/*
  * Copyright 1993 NeXT Computer, Inc. All rights reserved.
  *
  * Completely reworked by Sam Streeper (sam_s@NeXT.com)
  * Reworked again by Curtis Galloway (galloway@NeXT.com)
- */
-
-/*
+ *
  * Updates:
- *		- Refactorized by DHP in 2010 and 2011.
- *		- Optionally include Recovery HD support code (PikerAlpha, November 2012).
- *		- Fixed clang compilation (PikerAlpha, November 2012).
- *		- Unused sysConfigValid removed and white space fix (PikerAlpha, November 2012).
+ *			- Refactorized by DHP in 2010 and 2011.
+ *			- Optionally include Recovery HD support code (PikerAlpha, November 2012).
+ *			- Fixed clang compilation (PikerAlpha, November 2012).
+ *			- Unused sysConfigValid removed and white space fix (PikerAlpha, November 2012).
+ *
  */
 
 
@@ -122,7 +119,7 @@ unsigned long Adler32(unsigned char *buf, long len)
 static void zeroBSS()
 {
 	extern int  _DATA_bss__start	__asm("section$start$__DATA$__bss");
-	extern int  _DATA_bss__end	__asm("section$end$__DATA$__bss");
+	extern int  _DATA_bss__end		__asm("section$end$__DATA$__bss");
 	extern int  _DATA_common__start	__asm("section$start$__DATA$__common");
 	extern int  _DATA_common__end	__asm("section$end$__DATA$__common");
     

From fef08f4dd74da5d7ac3433101b1dcfeb278e50fb Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:34:21 +0100
Subject: [PATCH 167/623] Really removing sysConfigValid

---
 i386/boot2/boot.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/i386/boot2/boot.h b/i386/boot2/boot.h
index e243f8d..bb3c6c8 100755
--- a/i386/boot2/boot.h
+++ b/i386/boot2/boot.h
@@ -24,7 +24,7 @@
  * Copyright 1994 NeXT Computer, Inc. All rights reserved.
  *
  * Updates:
- *		- Unused sysConfigValid removed (PikerAlpha, November 2012).
+ *			- Unused sysConfigValid removed (PikerAlpha, November 2012).
  *
  */
 
@@ -105,7 +105,6 @@
 // A global set by boot() to record the device that the booter was loaded from.
 
 extern long gBootMode;
-extern bool sysConfigValid;
 extern char bootPrompt[];
 
 // Kernel Boot Modes

From a86aae1407b999d0e40e11192fb673d093fb3cb7 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 14:40:53 +0100
Subject: [PATCH 168/623] Now using my bash script instead of segsize.c

---
 i386/util/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/i386/util/Makefile b/i386/util/Makefile
index aaa3484..8651f6e 100644
--- a/i386/util/Makefile
+++ b/i386/util/Makefile
@@ -6,9 +6,9 @@
 #			- Major cleanup (PikerAlpha, October 2012).
 #			- Fixed clang compilation (dgsga, November 2012. Credits to Evan Lojewski for original work).
 #			- Output improved (PikerAlpha, October 2012).
+#			- Now using my bash script instead of segsize.c (PikerAlpha, November 2012).
 #
 
-
 include ../MakePaths.dir
 
 VPATH = $(OBJROOT):$(SYMROOT)
@@ -19,10 +19,10 @@ CFLAGS = $(RC_CFLAGS) $(OPTIM) -Wmost -Werror -g
 LDFLAGS =
 DEFINES=
 
-PROGRAMS = machOconv segsize
-OBJS = machOconv.o segsize.o
+PROGRAMS = machOconv
+OBJS = machOconv.o
 
-DIRS_NEEDED = $(OBJROOT) $(SYMROOT) $(LANGDIR)
+DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
 $(MAKEGOAL): $(DIRS_NEEDED) $(PROGRAMS)
 

From f1858c0fee3c8d2fb6c0f16b9db2a0ccbdd71470 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 15:09:54 +0100
Subject: [PATCH 169/623] Unused code removed and whitespace fixes

---
 i386/libsaio/fdisk.h | 94 ++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/i386/libsaio/fdisk.h b/i386/libsaio/fdisk.h
index 9c51847..a6634cd 100755
--- a/i386/libsaio/fdisk.h
+++ b/i386/libsaio/fdisk.h
@@ -28,62 +28,62 @@
  *
  * HISTORY
  *
- * 8 July 1992 David E. Bohman at NeXT
- *    Created.
+ * 8 July 1992 David E. Bohman at NeXT Created.
+ *
+ * Updates:
+ * 		- Spaces replaced with tabs (PikerAlpha, November 2012)
+ *			- Unused 'REAL_disk_blk0' removed (PikerAlpha, November 2012)
+ *
  */
- 
+
+
 #ifndef __LIBSAIO_FDISK_H
 #define __LIBSAIO_FDISK_H
 
-#define DISK_BLK0			0       /* blkno of boot block */
-#define DISK_BLK0SZ			512     /* size of boot block */
-#define DISK_BOOTSZ			446     /* size of boot code in boot block */
-#define DISK_SIGNATURE		0xAA55  /* signature of the boot record */
-#define FDISK_NPART			4       /* number of entries in fdisk table */
-#define FDISK_ACTIVE		0x80    /* indicator of active partition */
-#define FDISK_NEXTNAME		0xA7    /* indicator of NeXT partition */
-#define FDISK_DOS12			0x01    /* 12-bit fat < 10MB dos partition */
-#define FDISK_DOS16S		0x04    /* 16-bit fat < 32MB dos partition */
-#define FDISK_DOSEXT		0x05    /* extended dos partition */
-#define FDISK_DOS16B		0x06    /* 16-bit fat >= 32MB dos partition */
-#define FDISK_NTFS			0x07    /* NTFS partition */
-#define FDISK_SMALLFAT32	0x0b    /* FAT32 partition */
-#define FDISK_FAT32			0x0c    /* FAT32 partition */
+#define DISK_BLK0			0		// Block number of boot block
+#define DISK_BLK0SZ			512		// Size of boot block
+#define DISK_BOOTSZ			446		// Size of boot code in boot block
+#define DISK_SIGNATURE		0xAA55	// signature of the boot record
+#define FDISK_NPART			4		// Number of entries in fdisk table
+#define FDISK_ACTIVE		0x80	// Indicator of active partition
+#define FDISK_NEXTNAME		0xA7	// Indicator of NeXT partition
+#define FDISK_DOS12			0x01	// 12-bit fat < 10MB dos partition
+#define FDISK_DOS16S		0x04	// 16-bit fat < 32MB dos partition
+#define FDISK_DOSEXT		0x05	// Extended DOS partition
+#define FDISK_DOS16B		0x06	// 16-bit fat >= 32MB dos partition
+#define FDISK_NTFS			0x07	// NTFS partition
+#define FDISK_SMALLFAT32	0x0b	// FAT32 partition
+#define FDISK_FAT32			0x0c	// FAT32 partition
 #define FDISK_DOS16SLBA		0x0e
 #define FDISK_LINUX			0x83
-#define FDISK_UFS			0xa8    /* Apple UFS partition */
-#define FDISK_HFS			0xaf    /* Apple HFS partition */
-#define FDISK_BOOTER		0xab    /* Apple booter partition */
+#define FDISK_UFS			0xa8	// Apple UFS partition
+#define FDISK_HFS			0xaf	// Apple HFS partition
+#define FDISK_BOOTER		0xab	// Apple booter partition
 
-/*
- * Format of fdisk partion entry (if present).
- */
-struct fdisk_part {
-    unsigned char    bootid;    /* bootable or not */
-    unsigned char    beghead;   /* begining head, sector, cylinder */
-    unsigned char    begsect;   /* begcyl is a 10-bit number */
-    unsigned char    begcyl;    /* High 2 bits are in begsect */
-    unsigned char    systid;    /* OS type */
-    unsigned char    endhead;   /* ending head, sector, cylinder */
-    unsigned char    endsect;   /* endcyl is a 10-bit number */
-    unsigned char    endcyl;    /* High 2 bits are in endsect */
-    unsigned long    relsect;   /* partion physical offset on disk */
-    unsigned long    numsect;   /* number of sectors in partition */
+// Format of fdisk partion entry (if present).
+
+struct fdisk_part
+{
+	unsigned char	bootid;		// Bootable or not
+	unsigned char	beghead;	// Begining head, sector, cylinder
+	unsigned char	begsect;	// Beginning cylinder is a 10-bit number
+	unsigned char	begcyl;		// High 2 bits are in begsect
+	unsigned char	systid;		// OS type
+	unsigned char	endhead;	// Ending head, sector, cylinder
+	unsigned char	endsect;	// Endcyl is a 10-bit number
+	unsigned char	endcyl;		// High 2 bits are in endsect
+	unsigned long	relsect;	// Partion physical offset on disk
+	unsigned long	numsect;	// Number of sectors in partition
 } __attribute__((packed));
 
-/*
- * Format of boot block.
- */
-struct disk_blk0 {
-    unsigned char    bootcode[DISK_BOOTSZ];
-    unsigned char    parts[FDISK_NPART][sizeof (struct fdisk_part)];
-    unsigned short   signature;
-};
 
-struct REAL_disk_blk0 {
-    unsigned char    bootcode[DISK_BOOTSZ];
-    struct fdisk_part    parts[FDISK_NPART];
-    unsigned short   signature;
-} __attribute__((packed));
+// Format of boot block.
+
+struct disk_blk0
+{
+	unsigned char	bootcode[DISK_BOOTSZ];
+	unsigned char	parts[FDISK_NPART][sizeof (struct fdisk_part)];
+	unsigned short	signature;
+};
 
 #endif /* !__LIBSAIO_FDISK_H */

From 4303a8488cbfcd859d0beb302955af48d78d8052 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 17 Nov 2012 15:44:44 +0100
Subject: [PATCH 170/623] Cleanups and spaces -> tabs

---
 i386/libsaio/hfs.c | 1325 ++++++++++++++++++++++----------------------
 1 file changed, 674 insertions(+), 651 deletions(-)

diff --git a/i386/libsaio/hfs.c b/i386/libsaio/hfs.c
index f980a6e..8a94a5d 100755
--- a/i386/libsaio/hfs.c
+++ b/i386/libsaio/hfs.c
@@ -2,13 +2,13 @@
  * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
+ *
  * The contents of this file constitute Original Code as defined in and
  * are subject to the Apple Public Source License Version 2.0 (the
  * "License").  You may not use this file except in compliance with the
  * License.  Please obtain a copy of the License at
  * http://www.apple.com/publicsource and read it before using this file.
- * 
+ *
  * This Original Code and all software distributed under the License are
  * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -16,7 +16,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
  * License for the specific language governing rights and limitations
  * under the License.
- * 
+ *
  * @APPLE_LICENSE_HEADER_END@
  *
  * hfs.c - File System Module for HFS and HFS+.
@@ -27,6 +27,7 @@
  *
  * Updates:
  *			- OSBigEndian removed and white space changes (PikerAlpha, November 2012)
+ *			- Cleanups and spaces -> tabs (PikerAlpha, November 2012)
  *
  */
 
@@ -42,40 +43,33 @@
 #define kBTreeCatalog (0)
 #define kBTreeExtents (1)
 
+static CICell		gCurrentIH;
+static long long	gAllocationOffset;
+static long			gIsHFSPlus;
+static long			gBlockSize;
+static long			gCaseSensitive;
+static long			gCacheBlockSize;
+static BTHeaderRec	*gBTHeaders[2];
+static long long	gVolID;
+
 #ifdef __i386__
 
-static CICell                  gCurrentIH;
-static long long               gAllocationOffset;
-static long                    gIsHFSPlus;
-static long                    gCaseSensitive;
-static long                    gBlockSize;
-static long                    gCacheBlockSize;
-static char                    *gBTreeHeaderBuffer;
-static BTHeaderRec             *gBTHeaders[2];
-static char                    *gHFSMdbVib;
-static HFSMasterDirectoryBlock *gHFSMDB;
-static char                    *gHFSPlusHeader;
-static HFSPlusVolumeHeader     *gHFSPlus;
-static char                    *gLinkTemp;
-static long long               gVolID;
-static char                    *gTempStr;
+static char						*gBTreeHeaderBuffer;
+static char						*gHFSMdbVib;
+static HFSMasterDirectoryBlock	*gHFSMDB;
+static char						*gHFSPlusHeader;
+static HFSPlusVolumeHeader		*gHFSPlus;
+static char						*gLinkTemp;
+static char						*gTempStr;
 
 #else  /* !__i386__ */
 
-static CICell                  gCurrentIH;
-static long long               gAllocationOffset;
-static long                    gIsHFSPlus;
-static long                    gBlockSize;
-static long                    gCaseSensitive;
-static long                    gCacheBlockSize;
-static char                    gBTreeHeaderBuffer[512];
-static BTHeaderRec             *gBTHeaders[2];
-static char                    gHFSMdbVib[kBlockSize];
-static HFSMasterDirectoryBlock *gHFSMDB =(HFSMasterDirectoryBlock*)gHFSMdbVib;
-static char                    gHFSPlusHeader[kBlockSize];
-static HFSPlusVolumeHeader     *gHFSPlus =(HFSPlusVolumeHeader*)gHFSPlusHeader;
-static char                    gLinkTemp[64];
-static long long               gVolID;
+static char						gBTreeHeaderBuffer[512];
+static char						gHFSMdbVib[kBlockSize];
+static HFSMasterDirectoryBlock	*gHFSMDB =(HFSMasterDirectoryBlock*)gHFSMdbVib;
+static char						gHFSPlusHeader[kBlockSize];
+static HFSPlusVolumeHeader		*gHFSPlus =(HFSPlusVolumeHeader*)gHFSPlusHeader;
+static char						gLinkTemp[64];
 
 #endif /* !__i386__ */
 
@@ -108,10 +102,10 @@ extern long BinaryUnicodeCompare(u_int16_t *uniStr1, u_int32_t len1, u_int16_t *
 
 static void SwapFinderInfo(FndrFileInfo *dst, FndrFileInfo *src)
 {
-    dst->fdType = SWAP_BE32(src->fdType);
-    dst->fdCreator = SWAP_BE32(src->fdCreator);
-    dst->fdFlags = SWAP_BE16(src->fdFlags);
-    // Don't bother with location
+	dst->fdType = SWAP_BE32(src->fdType);
+	dst->fdCreator = SWAP_BE32(src->fdCreator);
+	dst->fdFlags = SWAP_BE16(src->fdFlags);
+	// Don't bother with location
 }
 
 
@@ -119,9 +113,12 @@ static void SwapFinderInfo(FndrFileInfo *dst, FndrFileInfo *src)
 
 void HFSFree(CICell ih)
 {
-    if(gCurrentIH == ih)
-        gCurrentIH = 0;
-    free(ih);
+	if(gCurrentIH == ih)
+	{
+		gCurrentIH = 0;
+	}
+	
+	free(ih);
 }
 
 
@@ -129,18 +126,20 @@ void HFSFree(CICell ih)
 
 bool HFSProbe (const void *buf)
 {
-    const HFSMasterDirectoryBlock *mdb;
-    const HFSPlusVolumeHeader     *header;
-    mdb = (const HFSMasterDirectoryBlock *)(((const char*)buf)+kMDBBaseOffset);
-    header = (const HFSPlusVolumeHeader *)(((const char*)buf)+kMDBBaseOffset);
+	const HFSMasterDirectoryBlock	*mdb	= (const HFSMasterDirectoryBlock *)(((const char*)buf)+kMDBBaseOffset);
+	const HFSPlusVolumeHeader		*header	= (const HFSPlusVolumeHeader *)(((const char*)buf)+kMDBBaseOffset);
 	
-    if (SWAP_BE16(mdb->drSigWord) == kHFSSigWord)
-        return true;
-
-    if (SWAP_BE16(header->signature) != kHFSPlusSigWord && SWAP_BE16(header->signature) != kHFSXSigWord)
-        return false;
-
-    return true;
+	if (SWAP_BE16(mdb->drSigWord) == kHFSSigWord)
+	{
+		return true;
+	}
+	
+	if (SWAP_BE16(header->signature) != kHFSPlusSigWord && SWAP_BE16(header->signature) != kHFSXSigWord)
+	{
+		return false;
+	}
+	
+	return true;
 }
 
 
@@ -148,130 +147,138 @@ bool HFSProbe (const void *buf)
 
 long HFSInitPartition(CICell ih)
 {
-    long extentSize, extentFile, nodeSize;
-    void *extent;
-
-    if (ih == gCurrentIH)
+	long extentSize, extentFile, nodeSize;
+	void *extent;
+	
+	if (ih == gCurrentIH)
 	{
 #ifdef __i386__
-        CacheInit(ih, gCacheBlockSize);
+		CacheInit(ih, gCacheBlockSize);
 #endif
-        return 0;
-    }
-
+		return 0L;
+	}
+	
 #ifdef __i386__
-    if (!gTempStr)
+	if (!gTempStr)
+	{
 		gTempStr = (char *)malloc(4096);
-
-    if (!gLinkTemp)
+	}
+	
+	if (!gLinkTemp)
+	{
 		gLinkTemp = (char *)malloc(64);
-
-    if (!gBTreeHeaderBuffer)
+	}
+	
+	if (!gBTreeHeaderBuffer)
+	{
 		gBTreeHeaderBuffer = (char *)malloc(512);
-
-    if (!gHFSMdbVib)
+	}
+	
+	if (!gHFSMdbVib)
 	{
-        gHFSMdbVib = (char *)malloc(kBlockSize);
-        gHFSMDB = (HFSMasterDirectoryBlock *)gHFSMdbVib;
-    }
-
-    if (!gHFSPlusHeader)
+		gHFSMdbVib = (char *)malloc(kBlockSize);
+		gHFSMDB = (HFSMasterDirectoryBlock *)gHFSMdbVib;
+	}
+	
+	if (!gHFSPlusHeader)
 	{
-        gHFSPlusHeader = (char *)malloc(kBlockSize);
-        gHFSPlus = (HFSPlusVolumeHeader *)gHFSPlusHeader;
-    }
-
-    if (!gTempStr || !gLinkTemp || !gBTreeHeaderBuffer || !gHFSMdbVib || !gHFSPlusHeader) return -1;
+		gHFSPlusHeader = (char *)malloc(kBlockSize);
+		gHFSPlus = (HFSPlusVolumeHeader *)gHFSPlusHeader;
+	}
+	
+	if (!gTempStr || !gLinkTemp || !gBTreeHeaderBuffer || !gHFSMdbVib || !gHFSPlusHeader)
+	{
+		return -1L;
+	}
 #endif /* __i386__ */
-
-    gAllocationOffset = 0;
-    gIsHFSPlus = 0;
-    gCaseSensitive = 0;
-    gBTHeaders[0] = 0;
-    gBTHeaders[1] = 0;
-
-    // Look for the HFS MDB
-    Seek(ih, kMDBBaseOffset);
-    Read(ih, (long)gHFSMdbVib, kBlockSize);
-
-    if (SWAP_BE16(gHFSMDB->drSigWord) == kHFSSigWord)
+	
+	gAllocationOffset = 0;
+	gIsHFSPlus = 0;
+	gCaseSensitive = 0;
+	gBTHeaders[0] = 0;
+	gBTHeaders[1] = 0;
+	
+	// Look for the HFS MDB
+	Seek(ih, kMDBBaseOffset);
+	Read(ih, (long)gHFSMdbVib, kBlockSize);
+	
+	if (SWAP_BE16(gHFSMDB->drSigWord) == kHFSSigWord)
 	{
-        gAllocationOffset = SWAP_BE16(gHFSMDB->drAlBlSt) * kBlockSize;
-
-        // See if it is HFSPlus
-        if (SWAP_BE16(gHFSMDB->drEmbedSigWord) != kHFSPlusSigWord)
+		gAllocationOffset = SWAP_BE16(gHFSMDB->drAlBlSt) * kBlockSize;
+		
+		// See if it is HFSPlus
+		if (SWAP_BE16(gHFSMDB->drEmbedSigWord) != kHFSPlusSigWord)
 		{
-            // Normal HFS;
-            gCacheBlockSize = gBlockSize = SWAP_BE32(gHFSMDB->drAlBlkSiz);
-            CacheInit(ih, gCacheBlockSize);
-            gCurrentIH = ih;
-
-            // grab the 64 bit volume ID
-            bcopy(&gHFSMDB->drFndrInfo[6], &gVolID, 8);
-
-            // Get the Catalog BTree node size.
-            extent     = (HFSExtentDescriptor *)&gHFSMDB->drCTExtRec;
-            extentSize = SWAP_BE32(gHFSMDB->drCTFlSize);
-            extentFile = kHFSCatalogFileID;
-            ReadExtent(extent, extentSize, extentFile, 0, 256, gBTreeHeaderBuffer + kBTreeCatalog * 256, 0);
-
-            nodeSize = SWAP_BE16(((BTHeaderRec *)(gBTreeHeaderBuffer + kBTreeCatalog * 256 + 
-                                 sizeof(BTNodeDescriptor)))->nodeSize);
-
-            // If the BTree node size is larger than the block size, reset the cache.
-            if (nodeSize > gBlockSize)
+			// Normal HFS;
+			gCacheBlockSize = gBlockSize = SWAP_BE32(gHFSMDB->drAlBlkSiz);
+			CacheInit(ih, gCacheBlockSize);
+			gCurrentIH = ih;
+			
+			// grab the 64 bit volume ID
+			bcopy(&gHFSMDB->drFndrInfo[6], &gVolID, 8);
+			
+			// Get the Catalog BTree node size.
+			extent		= (HFSExtentDescriptor *)&gHFSMDB->drCTExtRec;
+			extentSize	= SWAP_BE32(gHFSMDB->drCTFlSize);
+			extentFile	= kHFSCatalogFileID;
+			ReadExtent(extent, extentSize, extentFile, 0, 256, gBTreeHeaderBuffer + kBTreeCatalog * 256, 0);
+			
+			nodeSize = SWAP_BE16(((BTHeaderRec *)(gBTreeHeaderBuffer + kBTreeCatalog * 256 + sizeof(BTNodeDescriptor)))->nodeSize);
+			
+			// If the BTree node size is larger than the block size, reset the cache.
+			if (nodeSize > gBlockSize)
 			{
-                gCacheBlockSize = nodeSize;
-                CacheInit(ih, gCacheBlockSize);
-            }
-
-            return 0;
-        }
-
-        // Calculate the offset to the embeded HFSPlus volume.
-        gAllocationOffset += (long long)SWAP_BE16(gHFSMDB->drEmbedExtent.startBlock) *
-                                        SWAP_BE32(gHFSMDB->drAlBlkSiz);
-    }
-
-    // Look for the HFSPlus Header
-    Seek(ih, gAllocationOffset + kMDBBaseOffset);
-    Read(ih, (long)gHFSPlusHeader, kBlockSize);
-
-    // Not a HFS+ or HFSX volume.
-    if (SWAP_BE16(gHFSPlus->signature) != kHFSPlusSigWord && SWAP_BE16(gHFSPlus->signature) != kHFSXSigWord)
+				gCacheBlockSize = nodeSize;
+				CacheInit(ih, gCacheBlockSize);
+			}
+			
+			return 0L;
+		}
+		
+		// Calculate the offset to the embeded HFSPlus volume.
+		gAllocationOffset += (long long)SWAP_BE16(gHFSMDB->drEmbedExtent.startBlock) * SWAP_BE32(gHFSMDB->drAlBlkSiz);
+	}
+	
+	// Look for the HFSPlus Header
+	Seek(ih, gAllocationOffset + kMDBBaseOffset);
+	Read(ih, (long)gHFSPlusHeader, kBlockSize);
+	
+	// Not a HFS+ or HFSX volume.
+	if (SWAP_BE16(gHFSPlus->signature) != kHFSPlusSigWord && SWAP_BE16(gHFSPlus->signature) != kHFSXSigWord)
 	{
 		verbose("HFS signature was not present.\n");
 		gCurrentIH = 0;
-		return -1;
-    }
-
-    gIsHFSPlus = 1;
-    gCacheBlockSize = gBlockSize = SWAP_BE32(gHFSPlus->blockSize);
-    CacheInit(ih, gCacheBlockSize);
-    gCurrentIH = ih;
-
+		
+		return -1L;
+	}
+	
+	gIsHFSPlus = 1;
+	gCacheBlockSize = gBlockSize = SWAP_BE32(gHFSPlus->blockSize);
+	CacheInit(ih, gCacheBlockSize);
+	gCurrentIH = ih;
+	
 	ih->modTime = SWAP_BE32(gHFSPlus->modifyDate) - 2082844800;
 	
-    // grab the 64 bit volume ID
-    bcopy(&gHFSPlus->finderInfo[24], &gVolID, 8);
-
-    // Get the Catalog BTree node size.
-    extent     = &gHFSPlus->catalogFile.extents;
-    extentSize = SWAP_BE64(gHFSPlus->catalogFile.logicalSize);
-    extentFile = kHFSCatalogFileID;
-
-    ReadExtent(extent, extentSize, extentFile, 0, 256, gBTreeHeaderBuffer + kBTreeCatalog * 256, 0);
-
-    nodeSize = SWAP_BE16(((BTHeaderRec *)(gBTreeHeaderBuffer + kBTreeCatalog * 256 + sizeof(BTNodeDescriptor)))->nodeSize);
-
-    // If the BTree node size is larger than the block size, reset the cache.
-    if (nodeSize > gBlockSize)
+	// grab the 64 bit volume ID
+	bcopy(&gHFSPlus->finderInfo[24], &gVolID, 8);
+	
+	// Get the Catalog BTree node size.
+	extent		= &gHFSPlus->catalogFile.extents;
+	extentSize	= SWAP_BE64(gHFSPlus->catalogFile.logicalSize);
+	extentFile	= kHFSCatalogFileID;
+	
+	ReadExtent(extent, extentSize, extentFile, 0, 256, gBTreeHeaderBuffer + kBTreeCatalog * 256, 0);
+	
+	nodeSize = SWAP_BE16(((BTHeaderRec *)(gBTreeHeaderBuffer + kBTreeCatalog * 256 + sizeof(BTNodeDescriptor)))->nodeSize);
+	
+	// If the BTree node size is larger than the block size, reset the cache.
+	if (nodeSize > gBlockSize)
 	{
-        gCacheBlockSize = nodeSize;
-        CacheInit(ih, gCacheBlockSize);
-    }
-
-    return 0;
+		gCacheBlockSize = nodeSize;
+		CacheInit(ih, gCacheBlockSize);
+	}
+	
+	return 0L;
 }
 
 
@@ -279,7 +286,7 @@ long HFSInitPartition(CICell ih)
 
 long HFSLoadFile(CICell ih, char * filePath)
 {
-    return HFSReadFile(ih, filePath, (void *)gFSLoadAddress, 0, 0);
+	return HFSReadFile(ih, filePath, (void *)gFSLoadAddress, 0, 0);
 }
 
 
@@ -287,81 +294,67 @@ long HFSLoadFile(CICell ih, char * filePath)
 
 long HFSReadFile(CICell ih, char * filePath, void *base, uint64_t offset, uint64_t length)
 {
-    char entry[512];
-    long dirID, result, flags;
-	// bool thinFatReadRequest = (length == 4096 && offset == 0);
-
-    if (HFSInitPartition(ih) == -1)
+	char entry[512];
+	long dirID, result, flags;
+	
+	if (HFSInitPartition(ih) == -1)
 	{
 		return -1;
 	}
-
-    dirID = kHFSRootFolderID;
-    // Skip a lead '\'.  Start in the system folder if there are two.
-    if (filePath[0] == '/')
+	
+	dirID = kHFSRootFolderID;
+	
+	// Skip a lead '\'.  Start in the system folder if there are two.
+	if (filePath[0] == '/')
 	{
-        if (filePath[1] == '/')
+		if (filePath[1] == '/')
 		{
-            if (gIsHFSPlus)
+			if (gIsHFSPlus)
 			{
 				dirID = SWAP_BE32(((long *)gHFSPlus->finderInfo)[5]);
 			}
-            else 
+			else
 			{
 				dirID = SWAP_BE32(gHFSMDB->drFndrInfo[5]);
 			}
-
-            if (dirID == 0)
+			
+			if (dirID == 0)
 			{
-				return -1;
+				return -1L;
 			}
-            filePath++;
-        }
-        filePath++;
-    }
-
-    result = ResolvePathToCatalogEntry(filePath, &flags, entry, dirID, 0);
-
-    if ((result == -1) || ((flags & kFileTypeMask) != kFileTypeFlat))
+			
+			filePath++;
+		}
+		
+		filePath++;
+	}
+	
+	result = ResolvePathToCatalogEntry(filePath, &flags, entry, dirID, 0);
+	
+	if ((result == -1) || ((flags & kFileTypeMask) != kFileTypeFlat))
 	{
-		return -1;
-    }
-
+		return -1L;
+	}
+	
 #if UNUSED
-    // Not yet for Intel. System.config/Default.table will fail this check.
-    // Check file owner and permissions.
-    if (flags & (kOwnerNotRoot | kPermGroupWrite | kPermOtherWrite))
+	// Not yet for Intel. System.config/Default.table will fail this check.
+	// Check file owner and permissions.
+	if (flags & (kOwnerNotRoot | kPermGroupWrite | kPermOtherWrite))
 	{
-		return -1;
+		return -1L;
 	}
 #endif
-
-	/* if (thinFatReadRequest)
-	{
-		length = 0; // Zero will make it load the whole file at once.
-	} */
-
-    if (ReadFile(entry, &length, base, offset) == -1)
-	{
-		return -1;
-    }
-
-	/* if (thinFatReadRequest)
+	
+	if (ReadFile(entry, &length, base, offset) == -1)
 	{
-		unsigned long length2 = 0;
-		printf("thinFatReadRequest()\n");
-		ReadFile(entry, &length2, base + 4096, 0);
-		length += length2;
-		return 0; // Zero prevents ThinFatFile() from calling us again.
-	} */
-
-#if CHAMELEON
-    verbose("Loaded HFS%s file: [%s] %d bytes from %x.\n", (gIsHFSPlus ? "+" : ""), filePath, (uint32_t)length, ih);
-#elif DEBUG
+		return -1L;
+	}
+	
+#if DEBUG
 	printf("Loaded [%s] %d bytes.\n", filePath, (uint32_t)length);
 #endif
 	
-    return length;
+	return length;
 }
 
 
@@ -370,21 +363,21 @@ long HFSReadFile(CICell ih, char * filePath, void *base, uint64_t offset, uint64
 long HFSGetDirEntry(CICell ih, char * dirPath, long * dirIndex, char ** name, long * flags, long * time, FinderInfo * finderInfo, long * infoValid)
 {
 	char entry[512];
-
+	
 	long dirID, dirFlags;
-
+	
 	if (HFSInitPartition(ih) == -1)
 	{
 		return -1;
 	}
-
+	
 	if (*dirIndex == -1)
 	{
 		return -1;
 	}
-
+	
 	dirID = kHFSRootFolderID;
-    
+	
 	// Skip a lead '\'.  Start in the system folder if there are two.
 	if (dirPath[0] == '/')
 	{
@@ -394,49 +387,49 @@ long HFSGetDirEntry(CICell ih, char * dirPath, long * dirIndex, char ** name, lo
 			{
 				dirID = SWAP_BE32(((long *)gHFSPlus->finderInfo)[5]);
 			}
-			else 
+			else
 			{
 				dirID = SWAP_BE32(gHFSMDB->drFndrInfo[5]);
 			}
-
+			
 			if (dirID == 0)
 			{
 				return -1;
 			}
-
+			
 			dirPath++;
 		}
-
+		
 		dirPath++;
 	}
-
+	
 	if (*dirIndex == 0)
 	{
 		ResolvePathToCatalogEntry(dirPath, &dirFlags, entry, dirID, dirIndex);
-
+		
 		if (*dirIndex == 0)
 		{
 			*dirIndex = -1;
 		}
-
+		
 		if ((dirFlags & kFileTypeMask) != kFileTypeUnknown)
 		{
 			return -1;
 		}
 	}
-
+	
 	GetCatalogEntry(dirIndex, name, flags, time, finderInfo, infoValid);
-
+	
 	if (*dirIndex == 0)
 	{
 		*dirIndex = -1;
 	}
-
+	
 	if ((*flags & kFileTypeMask) == kFileTypeUnknown)
 	{
 		return -1;
 	}
-
+	
 	return 0;
 }
 
@@ -450,24 +443,24 @@ void HFSGetDescription(CICell ih, char *str, long strMaxLen)
 	long dirIndex;
 	char *name;
 	long flags, time;
-
+	
 	if (HFSInitPartition(ih) == -1)
 	{
 		return;
 	}
-
+	
 	/* Fill some crucial data structures by side effect. */
 	dirIndex = 0;
 	HFSGetDirEntry(ih, "/", &dirIndex, &name, &flags, &time, 0, 0);
-
+	
 	/* Now we can loook up the volume name node. */
 	nodeSize = SWAP_BE16(gBTHeaders[kBTreeCatalog]->nodeSize);
 	firstLeafNode = SWAP_BE32(gBTHeaders[kBTreeCatalog]->firstLeafNode);
-
+	
 	dirIndex = firstLeafNode * nodeSize;
-
+	
 	GetCatalogEntry(&dirIndex, &name, &flags, &time, 0, 0);
-
+	
 	strncpy(str, name, strMaxLen);
 	str[strMaxLen] = '\0';
 }
@@ -477,62 +470,73 @@ void HFSGetDescription(CICell ih, char *str, long strMaxLen)
 
 long HFSGetFileBlock(CICell ih, char *filePath, unsigned long long *firstBlock)
 {
-    char entry[512];
-    long dirID, result, flags;
-    void               *extents;
-    HFSCatalogFile     *hfsFile     = (void *)entry;
-    HFSPlusCatalogFile *hfsPlusFile = (void *)entry;
-
-    if (HFSInitPartition(ih) == -1) return -1;
-
-    dirID = kHFSRootFolderID;
-    // Skip a lead '\'.  Start in the system folder if there are two.
-    if (filePath[0] == '/')
+	char entry[512];
+	long dirID, result, flags;
+	void *extents;
+	
+	HFSCatalogFile		*hfsFile		= (void *)entry;
+	HFSPlusCatalogFile	*hfsPlusFile	= (void *)entry;
+	
+	if (HFSInitPartition(ih) == -1)
+	{
+		return -1L;
+	}
+	
+	dirID = kHFSRootFolderID;
+	
+	// Skip a lead '\'.  Start in the system folder if there are two.
+	
+	if (filePath[0] == '/')
 	{
-        if (filePath[1] == '/')
+		if (filePath[1] == '/')
 		{
-            if (gIsHFSPlus)
+			if (gIsHFSPlus)
 			{
 				dirID = SWAP_BE32(((long *) gHFSPlus->finderInfo)[5]);
 			}
-            else 
+			else
 			{
 				dirID = SWAP_BE32(gHFSMDB->drFndrInfo[5]);
 			}
-            
+			
 			if (dirID == 0)
 			{
 				return -1;
 			}
-            filePath++;
-        }
-        filePath++;
-    }
-
-    result = ResolvePathToCatalogEntry(filePath, &flags, entry, dirID, 0);
-
-    if ((result == -1) || ((flags & kFileTypeMask) != kFileTypeFlat))
+			
+			filePath++;
+		}
+		
+		filePath++;
+	}
+	
+	result = ResolvePathToCatalogEntry(filePath, &flags, entry, dirID, 0);
+	
+	if ((result == -1) || ((flags & kFileTypeMask) != kFileTypeFlat))
 	{
-        printf("HFS: Resolve path %s failed\n", filePath);
-		return -1;
-    }
-
-    if (gIsHFSPlus)
+		printf("HFS: Resolve path %s failed\n", filePath);
+		
+		return -1L;
+	}
+	
+	if (gIsHFSPlus)
 	{
-        extents = &hfsPlusFile->dataFork.extents;
-    }
+		extents = &hfsPlusFile->dataFork.extents;
+	}
 	else
 	{
-        extents = &hfsFile->dataExtents;
-    }
-
+		extents = &hfsFile->dataExtents;
+	}
+	
 #if DEBUG
-    printf("extent start 0x%x\n", (unsigned long)GetExtentStart(extents, 0));
-    printf("block size 0x%x\n", (unsigned long)gBlockSize);
-    printf("Allocation offset 0x%x\n", (unsigned long)gAllocationOffset);
+	printf("extent start 0x%x\n", (unsigned long)GetExtentStart(extents, 0));
+	printf("block size 0x%x\n", (unsigned long)gBlockSize);
+	printf("Allocation offset 0x%x\n", (unsigned long)gAllocationOffset);
 #endif
-    *firstBlock = ((unsigned long long)GetExtentStart(extents, 0) * (unsigned long long) gBlockSize + gAllocationOffset) / 512ULL;
-    return 0;
+	
+	*firstBlock = ((unsigned long long)GetExtentStart(extents, 0) * (unsigned long long) gBlockSize + gAllocationOffset) / 512ULL;
+	
+	return 0L;
 }
 
 
@@ -540,13 +544,17 @@ long HFSGetFileBlock(CICell ih, char *filePath, unsigned long long *firstBlock)
 
 long HFSGetUUID(CICell ih, char *uuidStr)
 {
-    if (HFSInitPartition(ih) == -1)
+	if (HFSInitPartition(ih) == -1)
+	{
 		return -1;
-
-    if (gVolID == 0LL)
+	}
+	
+	if (gVolID == 0LL)
+	{
 		return -1;
-
-    return CreateUUIDString((uint8_t*)(&gVolID), sizeof(gVolID), uuidStr);
+	}
+	
+	return CreateUUIDString((uint8_t*)(&gVolID), sizeof(gVolID), uuidStr);
 }
 
 
@@ -555,44 +563,42 @@ long HFSGetUUID(CICell ih, char *uuidStr)
 
 static long ReadFile(void * file, uint64_t * length, void * base, uint64_t offset)
 {
-    void				*extents;
-    long				fileID;
-    uint64_t			fileLength;
-    HFSCatalogFile		*hfsFile = file;
-    HFSPlusCatalogFile	*hfsPlusFile = file;
-
-    if (gIsHFSPlus)
-	{
-        fileID  = SWAP_BE32(hfsPlusFile->fileID);
-        fileLength = (uint64_t)SWAP_BE64(hfsPlusFile->dataFork.logicalSize);
-        extents = &hfsPlusFile->dataFork.extents;
-    }
+	void				*extents;
+	long				fileID;
+	
+	uint64_t			fileLength;
+	
+	HFSCatalogFile		*hfsFile = file;
+	HFSPlusCatalogFile	*hfsPlusFile = file;
+	
+	if (gIsHFSPlus)
+	{
+		fileID  = SWAP_BE32(hfsPlusFile->fileID);
+		fileLength = (uint64_t)SWAP_BE64(hfsPlusFile->dataFork.logicalSize);
+		extents = &hfsPlusFile->dataFork.extents;
+	}
 	else
 	{
-        fileID  = SWAP_BE32(hfsFile->fileID);
-        fileLength = SWAP_BE32(hfsFile->dataLogicalSize);
-        extents = &hfsFile->dataExtents;
-    }
-
-    if (offset > fileLength)
+		fileID  = SWAP_BE32(hfsFile->fileID);
+		fileLength = SWAP_BE32(hfsFile->dataLogicalSize);
+		extents = &hfsFile->dataExtents;
+	}
+	
+	if (offset > fileLength)
 	{
-        printf("Offset is too large.\n");
-        return -1;
-    }
-
-    if ((*length == 0) || ((offset + *length) > fileLength))
+		printf("Offset is too large.\n");
+		
+		return -1L;
+	}
+	
+	if ((*length == 0) || ((offset + *length) > fileLength))
 	{
-        *length = fileLength - offset;
-    }
-
-/*    if (*length > kLoadSize) {
-        printf("File is too large.\n");
-        return -1;
-    }*/
-
-    *length = ReadExtent((char *)extents, fileLength, fileID, offset, *length, (char *)base, 0);
-
-    return 0;
+		*length = fileLength - offset;
+	}
+	
+	*length = ReadExtent((char *)extents, fileLength, fileID, offset, *length, (char *)base, 0);
+	
+	return 0L;
 }
 
 
@@ -600,68 +606,83 @@ static long ReadFile(void * file, uint64_t * length, void * base, uint64_t offse
 
 static long GetCatalogEntryInfo(void * entry, long * flags, long * time, FinderInfo * finderInfo, long * infoValid)
 {
-    long tmpTime = 0;
-    long valid = 0;
-
-    // Get information about the file.
-    
-    switch (SWAP_BE16(*(short *)entry))
-    {
-        case kHFSFolderRecord           :
-            *flags = kFileTypeDirectory;
-            tmpTime = SWAP_BE32(((HFSCatalogFolder *)entry)->modifyDate);
-            break;
-
-        case kHFSPlusFolderRecord       :
-            *flags = kFileTypeDirectory |
-                     (SWAP_BE16(((HFSPlusCatalogFolder *)entry)->bsdInfo.fileMode) & kPermMask);
-            if (SWAP_BE32(((HFSPlusCatalogFolder *)entry)->bsdInfo.ownerID) != 0)
-                *flags |= kOwnerNotRoot;
-            tmpTime = SWAP_BE32(((HFSPlusCatalogFolder *)entry)->contentModDate);
-            break;
-
-        case kHFSFileRecord             :
-            *flags = kFileTypeFlat;
-            tmpTime = SWAP_BE32(((HFSCatalogFile *)entry)->modifyDate);
-            if (finderInfo) {
-                SwapFinderInfo((FndrFileInfo *)finderInfo, &((HFSCatalogFile *)entry)->userInfo);
-                valid = 1;
-            }
-            break;
-
-        case kHFSPlusFileRecord         :
-            *flags = kFileTypeFlat |
-                     (SWAP_BE16(((HFSPlusCatalogFile *)entry)->bsdInfo.fileMode) & kPermMask);
-            if (SWAP_BE32(((HFSPlusCatalogFile *)entry)->bsdInfo.ownerID) != 0)
-                *flags |= kOwnerNotRoot;
-            tmpTime = SWAP_BE32(((HFSPlusCatalogFile *)entry)->contentModDate);
-            if (finderInfo) {
-                SwapFinderInfo((FndrFileInfo *)finderInfo, &((HFSPlusCatalogFile *)entry)->userInfo);
-                valid = 1;
-            }
-            break;
-
-        case kHFSFileThreadRecord       :
-        case kHFSPlusFileThreadRecord   :
-        case kHFSFolderThreadRecord     :
-        case kHFSPlusFolderThreadRecord :
-            *flags = kFileTypeUnknown;
-            tmpTime = 0;
-            break;
+	long tmpTime	= 0L;
+	long valid		= 0L;
+	
+	// Get information about the file.
+	
+	switch (SWAP_BE16(*(short *)entry))
+	{
+		case kHFSFolderRecord:
+			*flags = kFileTypeDirectory;
+			tmpTime = SWAP_BE32(((HFSCatalogFolder *)entry)->modifyDate);
+			
+			break;
+			
+		case kHFSPlusFolderRecord:
+			*flags = kFileTypeDirectory | (SWAP_BE16(((HFSPlusCatalogFolder *)entry)->bsdInfo.fileMode) & kPermMask);
+			
+			if (SWAP_BE32(((HFSPlusCatalogFolder *)entry)->bsdInfo.ownerID) != 0)
+			{
+				*flags |= kOwnerNotRoot;
+			}
+			
+			tmpTime = SWAP_BE32(((HFSPlusCatalogFolder *)entry)->contentModDate);
+			
+			break;
+			
+		case kHFSFileRecord:
+			*flags = kFileTypeFlat;
+			tmpTime = SWAP_BE32(((HFSCatalogFile *)entry)->modifyDate);
+			
+			if (finderInfo)
+			{
+				SwapFinderInfo((FndrFileInfo *)finderInfo, &((HFSCatalogFile *)entry)->userInfo);
+				valid = 1;
+			}
+			
+			break;
+			
+		case kHFSPlusFileRecord:
+			*flags = kFileTypeFlat | (SWAP_BE16(((HFSPlusCatalogFile *)entry)->bsdInfo.fileMode) & kPermMask);
+			
+			if (SWAP_BE32(((HFSPlusCatalogFile *)entry)->bsdInfo.ownerID) != 0)
+			{
+				*flags |= kOwnerNotRoot;
+			}
+			
+			tmpTime = SWAP_BE32(((HFSPlusCatalogFile *)entry)->contentModDate);
+			
+			if (finderInfo)
+			{
+				SwapFinderInfo((FndrFileInfo *)finderInfo, &((HFSPlusCatalogFile *)entry)->userInfo);
+				valid = 1;
+			}
+			
+			break;
+			
+		case kHFSFileThreadRecord:
+		case kHFSPlusFileThreadRecord:
+		case kHFSFolderThreadRecord:
+		case kHFSPlusFolderThreadRecord:
+			*flags = kFileTypeUnknown;
+			tmpTime = 0;
+			
+			break;
 	}
-
+	
 	if (time != 0)
 	{
 		// Convert base time from 1904 to 1970.
 		*time = tmpTime - 2082844800;
 	}
-
+	
 	if (infoValid)
 	{
 		*infoValid = valid;
 	}
-
-	return 0;
+	
+	return 0L;
 }
 
 
@@ -672,37 +693,37 @@ static long ResolvePathToCatalogEntry(char * filePath, long * flags, void * entr
 	char *restPath;
 	long result, subFolderID = 0, tmpDirIndex;
 	HFSPlusCatalogFile *hfsPlusFile;
-
+	
 	// Copy the file name to gTempStr
 	long cnt = 0;
-
+	
 	while ((filePath[cnt] != '/') && (filePath[cnt] != '\0'))
 	{
 		cnt++;
 	}
-
+	
 	strlcpy(gTempStr, filePath, cnt+1);
-
+	
 	// Move restPath to the right place.
 	if (filePath[cnt] != '\0')
 	{
 		cnt++;
 	}
-
+	
 	restPath = filePath + cnt;
-
+	
 	// gTempStr is a name in the current Dir.
 	// restPath is the rest of the path if any.
-
+	
 	result = ReadCatalogEntry(gTempStr, dirID, entry, dirIndex);
-
+	
 	if (result == -1)
 	{
 		return -1;
 	}
-
+	
 	GetCatalogEntryInfo(entry, flags, 0, 0, 0);
-
+	
 	if ((*flags & kFileTypeMask) == kFileTypeDirectory)
 	{
 		if (gIsHFSPlus)
@@ -714,16 +735,16 @@ static long ResolvePathToCatalogEntry(char * filePath, long * flags, void * entr
 			subFolderID = SWAP_BE32(((HFSCatalogFolder *)entry)->folderID);
 		}
 	}
-
+	
 	if ((*flags & kFileTypeMask) == kFileTypeDirectory)
 	{
 		result = ResolvePathToCatalogEntry(restPath, flags, entry, subFolderID, dirIndex);
 	}
-
+	
 	if (gIsHFSPlus && ((*flags & kFileTypeMask) == kFileTypeFlat))
 	{
 		hfsPlusFile = (HFSPlusCatalogFile *)entry;
-
+		
 		if ((SWAP_BE32(hfsPlusFile->userInfo.fdType) == kHardLinkFileType) &&
 			(SWAP_BE32(hfsPlusFile->userInfo.fdCreator) == kHFSPlusCreator))
 		{
@@ -731,7 +752,7 @@ static long ResolvePathToCatalogEntry(char * filePath, long * flags, void * entr
 			result = ResolvePathToCatalogEntry(gLinkTemp, flags, entry, kHFSRootFolderID, &tmpDirIndex);
 		}
 	}
-
+	
 	return result;
 }
 
@@ -740,63 +761,63 @@ static long ResolvePathToCatalogEntry(char * filePath, long * flags, void * entr
 
 static long GetCatalogEntry(long * dirIndex, char ** name, long * flags, long * time, FinderInfo * finderInfo, long * infoValid)
 {
-	long              extentSize, nodeSize, curNode, index;
-	void              *extent;
-	char              *nodeBuf, *testKey, *entry;
+	long extentSize, nodeSize, curNode, index;
+	void *extent;
+	char *nodeBuf, *testKey, *entry;
+	
 	BTNodeDescriptor  *node;
-
+	
 	if (gIsHFSPlus)
 	{
-		extent     = &gHFSPlus->catalogFile.extents;
-		extentSize = SWAP_BE64(gHFSPlus->catalogFile.logicalSize);
+		extent		= &gHFSPlus->catalogFile.extents;
+		extentSize	= SWAP_BE64(gHFSPlus->catalogFile.logicalSize);
 	}
 	else
 	{
-		extent     = (HFSExtentDescriptor *)&gHFSMDB->drCTExtRec;
-		extentSize = SWAP_BE32(gHFSMDB->drCTFlSize);
+		extent		= (HFSExtentDescriptor *)&gHFSMDB->drCTExtRec;
+		extentSize	= SWAP_BE32(gHFSMDB->drCTFlSize);
 	}
-
-	nodeSize = SWAP_BE16(gBTHeaders[kBTreeCatalog]->nodeSize);
-	nodeBuf  = (char *)malloc(nodeSize);
-	node     = (BTNodeDescriptor *)nodeBuf;
-
+	
+	nodeSize	= SWAP_BE16(gBTHeaders[kBTreeCatalog]->nodeSize);
+	nodeBuf		= (char *)malloc(nodeSize);
+	node		= (BTNodeDescriptor *)nodeBuf;
+	
 	index   = *dirIndex % nodeSize;
 	curNode = *dirIndex / nodeSize;
-
+	
 	// Read the BTree node and get the record for index.
 	ReadExtent(extent, extentSize, kHFSCatalogFileID, curNode * nodeSize, nodeSize, nodeBuf, 1);
 	GetBTreeRecord(index, nodeBuf, nodeSize, &testKey, &entry);
 	GetCatalogEntryInfo(entry, flags, time, finderInfo, infoValid);
-
+	
 	// Get the file name.
 	if (gIsHFSPlus)
 	{
-		utf_encodestr(((HFSPlusCatalogKey *)testKey)->nodeName.unicode,
-                      SWAP_BE16(((HFSPlusCatalogKey *)testKey)->nodeName.length),
-                      (u_int8_t *)gTempStr, 256);
+		utf_encodestr(((HFSPlusCatalogKey *)testKey)->nodeName.unicode, SWAP_BE16(((HFSPlusCatalogKey *)testKey)->nodeName.length), (u_int8_t *)gTempStr, 256);
 	}
 	else
 	{
-		strncpy(gTempStr, (const char *)&((HFSCatalogKey *)testKey)->nodeName[1], 
+		strncpy(gTempStr, (const char *)&((HFSCatalogKey *)testKey)->nodeName[1],
 				((HFSCatalogKey *)testKey)->nodeName[0]);
-
+		
 		gTempStr[((HFSCatalogKey *)testKey)->nodeName[0]] = '\0';
 	}
-    *name = gTempStr;
-
-    // Update dirIndex.
-    index++;
-
-    if (index == SWAP_BE16(node->numRecords))
+	
+	*name = gTempStr;
+	
+	// Update dirIndex.
+	index++;
+	
+	if (index == SWAP_BE16(node->numRecords))
 	{
 		index = 0;
 		curNode = SWAP_BE32(node->fLink);
-    }
-
+	}
+	
 	*dirIndex = curNode * nodeSize + index;
-
+	
 	free(nodeBuf);
-
+	
 	return 0;
 }
 
@@ -805,38 +826,39 @@ static long GetCatalogEntry(long * dirIndex, char ** name, long * flags, long *
 
 static long ReadCatalogEntry(char * fileName, long dirID, void * entry, long * dirIndex)
 {
-	long              length;
-	char              key[sizeof(HFSPlusCatalogKey)];
-	HFSCatalogKey     *hfsKey     = (HFSCatalogKey *)key;
-	HFSPlusCatalogKey *hfsPlusKey = (HFSPlusCatalogKey *)key;
-  
+	long length = 0L;
+	char key[sizeof(HFSPlusCatalogKey)];
+	
+	HFSCatalogKey		*hfsKey		= (HFSCatalogKey *)key;
+	HFSPlusCatalogKey	*hfsPlusKey	= (HFSPlusCatalogKey *)key;
+	
 	// Make the catalog key.
 	if (gIsHFSPlus)
 	{
 		hfsPlusKey->parentID = SWAP_BE32(dirID);
 		length = strlen(fileName);
-
+		
 		if (length > 255)
 		{
 			length = 255;
 		}
-
+		
 		utf_decodestr((u_int8_t *)fileName, hfsPlusKey->nodeName.unicode, &(hfsPlusKey->nodeName.length), 512);
 	}
 	else
 	{
 		hfsKey->parentID = SWAP_BE32(dirID);
 		length = strlen(fileName);
-
+		
 		if (length > 31)
 		{
 			length = 31;
 		}
-
+		
 		hfsKey->nodeName[0] = length;
 		strncpy((char *)(hfsKey->nodeName + 1), fileName, length);
 	}
-
+	
 	return ReadBTreeEntry(kBTreeCatalog, &key, entry, dirIndex);
 }
 
@@ -845,25 +867,26 @@ static long ReadCatalogEntry(char * fileName, long dirID, void * entry, long * d
 
 static long ReadExtentsEntry(long fileID, long startBlock, void * entry)
 {
-    char             key[sizeof(HFSPlusExtentKey)];
-    HFSExtentKey     *hfsKey     = (HFSExtentKey *)key;
-    HFSPlusExtentKey *hfsPlusKey = (HFSPlusExtentKey *)key;
-
-    // Make the extents key.
-    if (gIsHFSPlus)
+	char key[sizeof(HFSPlusExtentKey)];
+	
+	HFSExtentKey		*hfsKey		= (HFSExtentKey *)key;
+	HFSPlusExtentKey	*hfsPlusKey	= (HFSPlusExtentKey *)key;
+	
+	// Make the extents key.
+	if (gIsHFSPlus)
 	{
-        hfsPlusKey->forkType   = 0;
-        hfsPlusKey->fileID     = SWAP_BE32(fileID);
-        hfsPlusKey->startBlock = SWAP_BE32(startBlock);
-    }
+		hfsPlusKey->forkType	= 0;
+		hfsPlusKey->fileID		= SWAP_BE32(fileID);
+		hfsPlusKey->startBlock	= SWAP_BE32(startBlock);
+	}
 	else
 	{
-        hfsKey->forkType   = 0;
-        hfsKey->fileID     = SWAP_BE32(fileID);
-        hfsKey->startBlock = SWAP_BE16(startBlock);
-    }
-
-    return ReadBTreeEntry(kBTreeExtents, &key, entry, 0);
+		hfsKey->forkType	= 0;
+		hfsKey->fileID		= SWAP_BE32(fileID);
+		hfsKey->startBlock	= SWAP_BE16(startBlock);
+	}
+	
+	return ReadBTreeEntry(kBTreeExtents, &key, entry, 0);
 }
 
 
@@ -871,121 +894,123 @@ static long ReadExtentsEntry(long fileID, long startBlock, void * entry)
 
 static long ReadBTreeEntry(long btree, void * key, char * entry, long * dirIndex)
 {
-    long             extentSize;
-    void             *extent;
-    short            extentFile;
-    char             *nodeBuf;
-    BTNodeDescriptor *node;
-    long             nodeSize, result = 0, entrySize = 0;
-    long             curNode, index = 0, lowerBound, upperBound;
-    char             *testKey, *recordData;
-
-    // Figure out which tree is being looked at.
-    if (btree == kBTreeCatalog)
-	{
-        if (gIsHFSPlus) 
+	
+	void *extent;
+	short extentFile;
+	long nodeSize, result = 0, entrySize = 0;
+	long curNode, index = 0, lowerBound, upperBound;
+	long extentSize;
+	char *testKey, *recordData;
+	char *nodeBuf;
+	
+	BTNodeDescriptor *node;
+	
+	// Figure out which tree is being looked at.
+	if (btree == kBTreeCatalog)
+	{
+		if (gIsHFSPlus)
 		{
-            extent     = &gHFSPlus->catalogFile.extents;
-            extentSize = SWAP_BE64(gHFSPlus->catalogFile.logicalSize);
-        }
+			extent		= &gHFSPlus->catalogFile.extents;
+			extentSize	= SWAP_BE64(gHFSPlus->catalogFile.logicalSize);
+		}
 		else
 		{
-            extent     = (HFSExtentDescriptor *)&gHFSMDB->drCTExtRec;
-            extentSize = SWAP_BE32(gHFSMDB->drCTFlSize);
-        }
-        extentFile = kHFSCatalogFileID;
-    }
+			extent		= (HFSExtentDescriptor *)&gHFSMDB->drCTExtRec;
+			extentSize	= SWAP_BE32(gHFSMDB->drCTFlSize);
+		}
+		extentFile = kHFSCatalogFileID;
+	}
 	else
 	{
-        if (gIsHFSPlus)
+		if (gIsHFSPlus)
 		{
-            extent     = &gHFSPlus->extentsFile.extents;
-            extentSize = SWAP_BE64(gHFSPlus->extentsFile.logicalSize);
-        }
+			extent		= &gHFSPlus->extentsFile.extents;
+			extentSize	= SWAP_BE64(gHFSPlus->extentsFile.logicalSize);
+		}
 		else
 		{
-            extent     = (HFSExtentDescriptor *)&gHFSMDB->drXTExtRec;
-            extentSize = SWAP_BE32(gHFSMDB->drXTFlSize);
-        }
-        extentFile = kHFSExtentsFileID;
-    }
-
-    // Read the BTree Header if needed.
-    if (gBTHeaders[btree] == 0)
+			extent		= (HFSExtentDescriptor *)&gHFSMDB->drXTExtRec;
+			extentSize	= SWAP_BE32(gHFSMDB->drXTFlSize);
+		}
+		
+		extentFile = kHFSExtentsFileID;
+	}
+	
+	// Read the BTree Header if needed.
+	if (gBTHeaders[btree] == 0)
 	{
-        ReadExtent(extent, extentSize, extentFile, 0, 256, gBTreeHeaderBuffer + btree * 256, 0);
-        gBTHeaders[btree] = (BTHeaderRec *)(gBTreeHeaderBuffer + btree * 256 + sizeof(BTNodeDescriptor));
-
-        if ((gIsHFSPlus && btree == kBTreeCatalog) && (gBTHeaders[btree]->keyCompareType == kHFSBinaryCompare))
+		ReadExtent(extent, extentSize, extentFile, 0, 256, gBTreeHeaderBuffer + btree * 256, 0);
+		gBTHeaders[btree] = (BTHeaderRec *)(gBTreeHeaderBuffer + btree * 256 + sizeof(BTNodeDescriptor));
+		
+		if ((gIsHFSPlus && btree == kBTreeCatalog) && (gBTHeaders[btree]->keyCompareType == kHFSBinaryCompare))
 		{
 			gCaseSensitive = 1;
-        }
-    }
-
-    curNode  = SWAP_BE32(gBTHeaders[btree]->rootNode);
-    nodeSize = SWAP_BE16(gBTHeaders[btree]->nodeSize);
-    nodeBuf  = (char *)malloc(nodeSize);
-    node     = (BTNodeDescriptor *)nodeBuf;
-
-    while (1)
-	{
-        // Read the current node.
-        ReadExtent(extent, extentSize, extentFile,
-                   curNode * nodeSize, nodeSize, nodeBuf, 1);
-    
-        // Find the matching key.
-        lowerBound = 0;
-        upperBound = SWAP_BE16(node->numRecords) - 1;
-
-        while (lowerBound <= upperBound)
+		}
+	}
+	
+	curNode		= SWAP_BE32(gBTHeaders[btree]->rootNode);
+	nodeSize	= SWAP_BE16(gBTHeaders[btree]->nodeSize);
+	nodeBuf		= (char *)malloc(nodeSize);
+	node		= (BTNodeDescriptor *)nodeBuf;
+	
+	while (1)
+	{
+		// Read the current node.
+		ReadExtent(extent, extentSize, extentFile, curNode * nodeSize, nodeSize, nodeBuf, 1);
+		
+		// Find the matching key.
+		lowerBound = 0;
+		upperBound = SWAP_BE16(node->numRecords) - 1;
+		
+		while (lowerBound <= upperBound)
 		{
-            index = (lowerBound + upperBound) / 2;
-
-            GetBTreeRecord(index, nodeBuf, nodeSize, &testKey, &recordData);
-
-            if (gIsHFSPlus)
+			index = (lowerBound + upperBound) / 2;
+			
+			GetBTreeRecord(index, nodeBuf, nodeSize, &testKey, &recordData);
+			
+			if (gIsHFSPlus)
 			{
-                if (btree == kBTreeCatalog)
+				if (btree == kBTreeCatalog)
 				{
-                    result = CompareHFSPlusCatalogKeys(key, testKey);
-                }
+					result = CompareHFSPlusCatalogKeys(key, testKey);
+				}
 				else
 				{
-                    result = CompareHFSPlusExtentsKeys(key, testKey);
-                }
-            } 
+					result = CompareHFSPlusExtentsKeys(key, testKey);
+				}
+			}
 			else
 			{
-                if (btree == kBTreeCatalog)
+				if (btree == kBTreeCatalog)
 				{
-                    result = CompareHFSCatalogKeys(key, testKey);
-                }
+					result = CompareHFSCatalogKeys(key, testKey);
+				}
 				else
 				{
-                    result = CompareHFSExtentsKeys(key, testKey);
-                }
-            }
-      
-            if (result < 0)
+					result = CompareHFSExtentsKeys(key, testKey);
+				}
+			}
+			
+			if (result < 0)
 			{
 				upperBound = index - 1;	// search < trial
 			}
-            else if (result > 0) 
+			else if (result > 0)
 			{
 				lowerBound = index + 1;	// search > trial
 			}
-            else 
+			else
 			{
 				break;	// search = trial
 			}
 		}
-    
+		
 		if (result < 0)
 		{
 			index = upperBound;
 			GetBTreeRecord(index, nodeBuf, nodeSize, &testKey, &recordData);
 		}
-    
+		
 		// Found the closest key... Recurse on it if this is an index node.
 		if (node->kind == kBTIndexNode)
 		{
@@ -996,33 +1021,33 @@ static long ReadBTreeEntry(long btree, void * key, char * entry, long * dirIndex
 			break;
 		}
 	}
-
+	
 	// Return error if the file was not found.
 	if (result != 0)
 	{
 		free(nodeBuf);
 		return -1;
 	}
-
+	
 	if (btree == kBTreeCatalog)
 	{
 		switch (SWAP_BE16(*(short *)recordData))
 		{
-			case kHFSFolderRecord           : entrySize = 70;
+			case kHFSFolderRecord			: entrySize = 70;
 				break;
-			case kHFSFileRecord             : entrySize = 102;
+			case kHFSFileRecord				: entrySize = 102;
 				break;
-			case kHFSFolderThreadRecord     : entrySize = 46;
+			case kHFSFolderThreadRecord		: entrySize = 46;
 				break;
-			case kHFSFileThreadRecord       : entrySize = 46;
+			case kHFSFileThreadRecord		: entrySize = 46;
 				break;
-			case kHFSPlusFolderRecord       : entrySize = 88;
+			case kHFSPlusFolderRecord		: entrySize = 88;
 				break;
-			case kHFSPlusFileRecord         : entrySize = 248;
+			case kHFSPlusFileRecord			: entrySize = 248;
 				break;
-			case kHFSPlusFolderThreadRecord : entrySize = 264;
+			case kHFSPlusFolderThreadRecord	: entrySize = 264;
 				break;
-			case kHFSPlusFileThreadRecord   : entrySize = 264;
+			case kHFSPlusFileThreadRecord	: entrySize = 264;
 				break;
 		}
 	}
@@ -1037,25 +1062,25 @@ static long ReadBTreeEntry(long btree, void * key, char * entry, long * dirIndex
 			entrySize = sizeof(HFSExtentRecord);
 		}
 	}
-
+	
 	bcopy(recordData, entry, entrySize);
-
+	
 	// Update dirIndex.
 	if (dirIndex != 0)
 	{
 		index++;
-
+		
 		if (index == SWAP_BE16(node->numRecords))
 		{
 			index = 0;
 			curNode = SWAP_BE32(node->fLink);
 		}
-
+		
 		*dirIndex = curNode * nodeSize + index;
 	}
-
+	
 	free(nodeBuf);
-
+	
 	return 0;
 }
 
@@ -1066,9 +1091,9 @@ static void GetBTreeRecord(long index, char * nodeBuffer, long nodeSize, char **
 {
 	long keySize;
 	long recordOffset = SWAP_BE16(*((short *)(nodeBuffer + (nodeSize - 2 * index - 2))));
-    
+	
 	*key = nodeBuffer + recordOffset;
-
+	
 	if (gIsHFSPlus)
 	{
 		keySize = SWAP_BE16(*(short *)*key);
@@ -1092,30 +1117,30 @@ static long ReadExtent(char * extent, uint64_t extentSize, long extentFile, uint
 	long long nextExtentBlock, currentExtentBlock = 0;
 	long long readOffset;
 	long long extentDensity, sizeofExtent, currentExtentSize;
-	char      *currentExtent, *extentBuffer = 0, *bufferPos = buffer;
-
+	char *currentExtent, *extentBuffer = 0, *bufferPos = buffer;
+	
 	if (offset >= extentSize)
 	{
 		return 0;
 	}
-
+	
 	if (gIsHFSPlus)
 	{
 		extentDensity = kHFSPlusExtentDensity;
 		sizeofExtent  = sizeof(HFSPlusExtentDescriptor);
-	} 
+	}
 	else
 	{
 		extentDensity = kHFSExtentDensity;
 		sizeofExtent  = sizeof(HFSExtentDescriptor);
 	}
-
+	
 	lastOffset = offset + size;
-
+	
 	while (offset < lastOffset)
 	{
 		blockNumber = offset / gBlockSize;
-
+		
 		// Find the extent for the offset.
 		for (; ; nextExtent++)
 		{
@@ -1126,63 +1151,63 @@ static long ReadExtent(char * extent, uint64_t extentSize, long extentFile, uint
 					countedBlocks += GetExtentSize(extent, nextExtent);
 					continue;
 				}
-
+				
 				currentExtent = extent + nextExtent * sizeofExtent;
 				break;
 			}
-
+			
 			if (extentBuffer == 0)
 			{
 				extentBuffer = malloc(sizeofExtent * extentDensity);
-
+				
 				if (extentBuffer == 0)
 				{
 					return -1;
 				}
 			}
-
+			
 			nextExtentBlock = nextExtent / extentDensity;
-
+			
 			if (currentExtentBlock != nextExtentBlock)
 			{
 				ReadExtentsEntry(extentFile, countedBlocks, extentBuffer);
 				currentExtentBlock = nextExtentBlock;
 			}
-
+			
 			currentExtentSize = GetExtentSize(extentBuffer, nextExtent % extentDensity);
-
+			
 			if ((countedBlocks + currentExtentSize - 1) >= blockNumber)
 			{
 				currentExtent = extentBuffer + sizeofExtent * (nextExtent % extentDensity);
 				break;
 			}
-      
+			
 			countedBlocks += currentExtentSize;
 		}
-
+		
 		readOffset = ((blockNumber - countedBlocks) * gBlockSize) + (offset % gBlockSize);
-
+		
 		readSize = GetExtentSize(currentExtent, 0) * gBlockSize - readOffset;
-
+		
 		if (readSize > (size - sizeRead))
 		{
 			readSize = size - sizeRead;
 		}
-
+		
 		readOffset += (long long)GetExtentStart(currentExtent, 0) * gBlockSize;
-
+		
 		CacheRead(gCurrentIH, bufferPos, gAllocationOffset + readOffset, readSize, cache);
-
+		
 		sizeRead += readSize;
 		offset += readSize;
 		bufferPos += readSize;
 	}
-
+	
 	if (extentBuffer)
 	{
 		free(extentBuffer);
 	}
-
+	
 	return sizeRead;
 }
 
@@ -1192,19 +1217,19 @@ static long ReadExtent(char * extent, uint64_t extentSize, long extentFile, uint
 static long GetExtentStart(void * extents, long index)
 {
 	long start;
-
+	
 	HFSExtentDescriptor		*hfsExtents		= extents;
 	HFSPlusExtentDescriptor	*hfsPlusExtents	= extents;
-
+	
 	if (gIsHFSPlus)
 	{
 		start = SWAP_BE32(hfsPlusExtents[index].startBlock);
 	}
-	else 
+	else
 	{
 		start = SWAP_BE16(hfsExtents[index].startBlock);
 	}
-
+	
 	return start;
 }
 
@@ -1213,20 +1238,21 @@ static long GetExtentStart(void * extents, long index)
 
 static long GetExtentSize(void * extents, long index)
 {
-    long size;
-    HFSExtentDescriptor     *hfsExtents     = extents;
-    HFSPlusExtentDescriptor *hfsPlusExtents = extents;
-  
-    if (gIsHFSPlus)
+	long size = 0L;
+	
+	HFSExtentDescriptor		*hfsExtents		= extents;
+	HFSPlusExtentDescriptor	*hfsPlusExtents	= extents;
+	
+	if (gIsHFSPlus)
 	{
 		size = SWAP_BE32(hfsPlusExtents[index].blockCount);
 	}
-    else 
+	else
 	{
 		size = SWAP_BE16(hfsExtents[index].blockCount);
 	}
-
-    return size;
+	
+	return size;
 }
 
 
@@ -1234,30 +1260,31 @@ static long GetExtentSize(void * extents, long index)
 
 static long CompareHFSCatalogKeys(void * key, void * testKey)
 {
-    HFSCatalogKey *searchKey, *trialKey;
-    long result, searchParentID, trialParentID;
-
-    searchKey = key;
-    trialKey  = testKey;
-
-    searchParentID = SWAP_BE32(searchKey->parentID);
-    trialParentID  = SWAP_BE32(trialKey->parentID);
-
-    // parent dirID is unsigned
-    if (searchParentID > trialParentID)
+	HFSCatalogKey *searchKey, *trialKey;
+	long result, searchParentID, trialParentID;
+	
+	searchKey = key;
+	trialKey  = testKey;
+	
+	searchParentID = SWAP_BE32(searchKey->parentID);
+	trialParentID  = SWAP_BE32(trialKey->parentID);
+	
+	// parent dirID is unsigned
+	if (searchParentID > trialParentID)
 	{
 		result = 1;
 	}
-    else if (searchParentID < trialParentID) 
+	else if (searchParentID < trialParentID)
 	{
 		result = -1;
 	}
-    else {
-        // parent dirID's are equal, compare names
-        result = FastRelString(searchKey->nodeName, trialKey->nodeName);
-    }
-
-    return result;
+	else
+	{
+		// parent dirID's are equal, compare names
+		result = FastRelString(searchKey->nodeName, trialKey->nodeName);
+	}
+	
+	return result;
 }
 
 
@@ -1265,48 +1292,44 @@ static long CompareHFSCatalogKeys(void * key, void * testKey)
 
 static long CompareHFSPlusCatalogKeys(void * key, void * testKey)
 {
-    HFSPlusCatalogKey *searchKey, *trialKey;
-    long result, searchParentID, trialParentID;
-  
-    searchKey = key;
-    trialKey  = testKey;
-  
-    searchParentID = SWAP_BE32(searchKey->parentID);
-    trialParentID  = SWAP_BE32(trialKey->parentID);
-
-    // parent dirID is unsigned
-    if (searchParentID > trialParentID)
+	HFSPlusCatalogKey *searchKey, *trialKey;
+	long result, searchParentID, trialParentID;
+	
+	searchKey = key;
+	trialKey  = testKey;
+	
+	searchParentID = SWAP_BE32(searchKey->parentID);
+	trialParentID  = SWAP_BE32(trialKey->parentID);
+	
+	// parent dirID is unsigned
+	if (searchParentID > trialParentID)
 	{
 		result = 1;
 	}
-    else if (searchParentID < trialParentID) 
+	else if (searchParentID < trialParentID)
 	{
 		result = -1;
 	}
-    else
+	else
 	{
-        // parent dirID's are equal, compare names
-        if ((searchKey->nodeName.length == 0) || (trialKey->nodeName.length == 0))
+		// parent dirID's are equal, compare names
+		if ((searchKey->nodeName.length == 0) || (trialKey->nodeName.length == 0))
 		{
-            result = searchKey->nodeName.length - trialKey->nodeName.length;
+			result = searchKey->nodeName.length - trialKey->nodeName.length;
 		}
-        else if (gCaseSensitive)
+		else if (gCaseSensitive)
 		{
-            result = BinaryUnicodeCompare(&searchKey->nodeName.unicode[0],
-                                          SWAP_BE16(searchKey->nodeName.length),
-                                          &trialKey->nodeName.unicode[0],
-                                          SWAP_BE16(trialKey->nodeName.length));
-        }
+			result = BinaryUnicodeCompare(&searchKey->nodeName.unicode[0],SWAP_BE16(searchKey->nodeName.length),
+										  &trialKey->nodeName.unicode[0], SWAP_BE16(trialKey->nodeName.length));
+		}
 		else
 		{
-            result = FastUnicodeCompare(&searchKey->nodeName.unicode[0],
-                                        SWAP_BE16(searchKey->nodeName.length),
-                                        &trialKey->nodeName.unicode[0],
-                                        SWAP_BE16(trialKey->nodeName.length));
-        }
-    }
-
-    return result;
+			result = FastUnicodeCompare(&searchKey->nodeName.unicode[0], SWAP_BE16(searchKey->nodeName.length),
+										&trialKey->nodeName.unicode[0], SWAP_BE16(trialKey->nodeName.length));
+		}
+	}
+	
+	return result;
 }
 
 
@@ -1314,26 +1337,26 @@ static long CompareHFSPlusCatalogKeys(void * key, void * testKey)
 
 static long CompareHFSExtentsKeys(void * key, void * testKey)
 {
-    HFSExtentKey *searchKey, *trialKey;
-    long         result;
-  
-    searchKey = key;
-    trialKey  = testKey;
-  
-    // assume searchKey < trialKey
-    result = -1;            
-
-    if (searchKey->fileID == trialKey->fileID)
-	{
-        // FileNum's are equal; compare fork types
-        if (searchKey->forkType == trialKey->forkType)
+	HFSExtentKey *searchKey, *trialKey;
+	long result;
+	
+	searchKey = key;
+	trialKey  = testKey;
+	
+	// assume searchKey < trialKey
+	result = -1;
+	
+	if (searchKey->fileID == trialKey->fileID)
+	{
+		// FileNum's are equal; compare fork types
+		if (searchKey->forkType == trialKey->forkType)
 		{
-            // Fork types are equal; compare allocation block number
-            if (searchKey->startBlock == trialKey->startBlock)
+			// Fork types are equal; compare allocation block number
+			if (searchKey->startBlock == trialKey->startBlock)
 			{
-                // Everything is equal
-                result = 0;
-            }
+				// Everything is equal
+				result = 0;
+			}
 			else
 			{
 				// Allocation block numbers differ; determine sign
@@ -1342,26 +1365,26 @@ static long CompareHFSExtentsKeys(void * key, void * testKey)
 					result = 1;
 				}
 			}
-        }
+		}
 		else
 		{
 			// Fork types differ; determine sign
-            if (searchKey->forkType > trialKey->forkType)
+			if (searchKey->forkType > trialKey->forkType)
 			{
 				result = 1;
 			}
-        }
-    }
+		}
+	}
 	else
 	{
-        // FileNums differ; determine sign
-        if (SWAP_BE32(searchKey->fileID) > SWAP_BE32(trialKey->fileID))
+		// FileNums differ; determine sign
+		if (SWAP_BE32(searchKey->fileID) > SWAP_BE32(trialKey->fileID))
 		{
-            result = 1;
+			result = 1;
 		}
-    }
-
-    return result;
+	}
+	
+	return result;
 }
 
 
@@ -1370,12 +1393,12 @@ static long CompareHFSExtentsKeys(void * key, void * testKey)
 static long CompareHFSPlusExtentsKeys(void * key, void * testKey)
 {
 	HFSPlusExtentKey *searchKey, *trialKey;
-
+	
 	long result = -1; // assume searchKey < trialKey
-  
-    searchKey = key;
-    trialKey  = testKey;
-  
+	
+	searchKey = key;
+	trialKey  = testKey;
+	
 	if (searchKey->fileID == trialKey->fileID)
 	{
 		// FileNum's are equal; compare fork types
@@ -1386,7 +1409,7 @@ static long CompareHFSPlusExtentsKeys(void * key, void * testKey)
 			{
 				// Everything is equal
 				result = 0;
-            }
+			}
 			else
 			{
 				// Allocation block numbers differ; determine sign
@@ -1394,8 +1417,8 @@ static long CompareHFSPlusExtentsKeys(void * key, void * testKey)
 				{
 					result = 1;
 				}
-            }
-        }
+			}
+		}
 		else
 		{
 			// Fork types differ; determine sign
@@ -1404,15 +1427,15 @@ static long CompareHFSPlusExtentsKeys(void * key, void * testKey)
 				result = 1;
 			}
 		}
-    }
+	}
 	else
 	{
-        // FileNums differ; determine sign
-        if (SWAP_BE32(searchKey->fileID) > SWAP_BE32(trialKey->fileID))
+		// FileNums differ; determine sign
+		if (SWAP_BE32(searchKey->fileID) > SWAP_BE32(trialKey->fileID))
 		{
 			result = 1;
 		}
 	}
-
-    return result;
+	
+	return result;
 }

From b90727911353fa1e54db5a0204ba34a7d0544a3e Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Sat, 17 Nov 2012 18:45:37 +0000
Subject: [PATCH 171/623] Remove unused include directory, add util/segaddr
 script

---
 i386/include/IOKit/IOBSD.h                    |   41 -
 i386/include/IOKit/IOBufferMemoryDescriptor.h |  261 ---
 i386/include/IOKit/IOCatalogue.h              |  272 ---
 i386/include/IOKit/IOCommand.h                |   83 -
 i386/include/IOKit/IOCommandGate.h            |  241 ---
 i386/include/IOKit/IOCommandPool.h            |  230 ---
 i386/include/IOKit/IOConditionLock.h          |   71 -
 i386/include/IOKit/IODMACommand.h             |  557 ------
 i386/include/IOKit/IODMAController.h          |   67 -
 i386/include/IOKit/IODMAEventSource.h         |   84 -
 i386/include/IOKit/IODataQueue.h              |  141 --
 i386/include/IOKit/IODataQueueShared.h        |   92 -
 i386/include/IOKit/IODeviceMemory.h           |   98 -
 i386/include/IOKit/IODeviceTreeSupport.h      |  127 --
 i386/include/IOKit/IOEventSource.h            |  244 ---
 .../IOKit/IOFilterInterruptEventSource.h      |  156 --
 .../IOKit/IOInterleavedMemoryDescriptor.h     |  122 --
 i386/include/IOKit/IOInterruptController.h    |  155 --
 i386/include/IOKit/IOInterruptEventSource.h   |  200 --
 i386/include/IOKit/IOInterrupts.h             |   58 -
 i386/include/IOKit/IOKitDebug.h               |  111 --
 i386/include/IOKit/IOKitKeys.h                |  164 --
 i386/include/IOKit/IOKitServer.h              |  123 --
 i386/include/IOKit/IOLib.h                    |   83 -
 i386/include/IOKit/IOLocks.h                  |  409 ----
 i386/include/IOKit/IOMapper.h                 |  154 --
 i386/include/IOKit/IOMemoryCursor.h           |  462 -----
 i386/include/IOKit/IOMemoryDescriptor.h       |  898 ---------
 i386/include/IOKit/IOMessage.h                |   75 -
 i386/include/IOKit/IOMultiMemoryDescriptor.h  |  110 --
 i386/include/IOKit/IONVRAM.h                  |  167 --
 i386/include/IOKit/IONotifier.h               |   72 -
 i386/include/IOKit/IOPlatformExpert.h         |  318 ----
 i386/include/IOKit/IORangeAllocator.h         |  171 --
 i386/include/IOKit/IORegistryEntry.h          |  947 ---------
 i386/include/IOKit/IOReturn.h                 |  137 --
 i386/include/IOKit/IOService.h                | 1690 -----------------
 i386/include/IOKit/IOServicePM.h              |   42 -
 i386/include/IOKit/IOSharedDataQueue.h        |  129 --
 i386/include/IOKit/IOSharedLock.h             |   86 -
 i386/include/IOKit/IOSubMemoryDescriptor.h    |  109 --
 i386/include/IOKit/IOSyncer.h                 |   64 -
 i386/include/IOKit/IOTimeStamp.h              |  189 --
 i386/include/IOKit/IOTimerEventSource.h       |  230 ---
 i386/include/IOKit/IOTypes.h                  |  238 ---
 i386/include/IOKit/IOUserClient.h             |  333 ----
 i386/include/IOKit/IOWorkLoop.h               |  321 ----
 i386/include/IOKit/OSMessageNotification.h    |  158 --
 i386/include/IOKit/assert.h                   |   54 -
 i386/include/IOKit/system.h                   |   67 -
 i386/include/_structs.h                       |   25 -
 i386/include/_types.h                         |   68 -
 i386/include/architecture/alignment.h         |   47 -
 i386/include/architecture/byte_order.h        |   36 -
 i386/include/architecture/i386/alignment.h    |   69 -
 i386/include/architecture/i386/asm_help.h     |  398 ----
 i386/include/architecture/i386/byte_order.h   |   33 -
 i386/include/architecture/i386/cpu.h          |   74 -
 i386/include/architecture/i386/desc.h         |  150 --
 i386/include/architecture/i386/fenv.h         |  287 ---
 i386/include/architecture/i386/fpu.h          |  170 --
 i386/include/architecture/i386/frame.h        |  129 --
 i386/include/architecture/i386/io.h           |   40 -
 i386/include/architecture/i386/math.h         |  642 -------
 i386/include/architecture/i386/pio.h          |  104 -
 i386/include/architecture/i386/reg_help.h     |  105 -
 i386/include/architecture/i386/sel.h          |   53 -
 i386/include/architecture/i386/table.h        |   98 -
 i386/include/architecture/i386/tss.h          |  120 --
 i386/include/assert.h                         |   92 -
 i386/include/ctype.h                          |  438 -----
 i386/include/device/.svn/all-wcprops          |   17 -
 i386/include/device/.svn/entries              |   96 -
 .../.svn/text-base/device_port.h.svn-base     |   80 -
 .../.svn/text-base/device_types.h.svn-base    |  141 --
 i386/include/device/device_port.h             |   80 -
 i386/include/device/device_types.h            |  141 --
 i386/include/errno.h                          |   24 -
 i386/include/float.h                          |  281 ---
 i386/include/i386/_limits.h                   |   27 -
 i386/include/i386/_param.h                    |   46 -
 i386/include/i386/_structs.h                  |  105 -
 i386/include/i386/_types.h                    |  120 --
 i386/include/i386/eflags.h                    |   94 -
 i386/include/i386/endian.h                    |  102 -
 i386/include/i386/fasttrap_isa.h              |  116 --
 i386/include/i386/limits.h                    |  107 --
 i386/include/i386/param.h                     |  169 --
 i386/include/i386/profile.h                   |   39 -
 i386/include/i386/setjmp.h                    |   80 -
 i386/include/i386/signal.h                    |   62 -
 i386/include/i386/types.h                     |  138 --
 i386/include/i386/user_ldt.h                  |   80 -
 i386/include/i386/vmparam.h                   |   62 -
 i386/include/inttypes.h                       |  321 ----
 i386/include/libkern/OSAtomic.h               |  209 --
 i386/include/libkern/OSByteOrder.h            |  310 ---
 i386/include/libkern/OSCacheControl.h         |   65 -
 i386/include/libkern/OSDebug.h                |   66 -
 i386/include/libkern/OSKextLib.h              |  472 -----
 i386/include/libkern/OSReturn.h               |  198 --
 i386/include/libkern/OSTypes.h                |  131 --
 i386/include/libkern/_OSByteOrder.h           |  133 --
 i386/include/libkern/i386/OSByteOrder.h       |  115 --
 i386/include/libkern/i386/_OSByteOrder.h      |  104 -
 i386/include/libkern/machine/OSByteOrder.h    |  143 --
 i386/include/limits.h                         |  144 --
 i386/include/locale.h                         |   56 -
 i386/include/mach-o/arch.h                    |  105 -
 i386/include/mach-o/compact_unwind_encoding.h |  224 ---
 i386/include/mach-o/dyld.h                    |  253 ---
 i386/include/mach-o/dyld_images.h             |  164 --
 i386/include/mach-o/fat.h                     |   64 -
 i386/include/mach-o/getsect.h                 |  131 --
 i386/include/mach-o/ldsyms.h                  |  133 --
 i386/include/mach-o/loader.h                  | 1402 --------------
 i386/include/mach-o/nlist.h                   |  312 ---
 i386/include/mach-o/ranlib.h                  |   67 -
 i386/include/mach-o/reloc.h                   |  203 --
 i386/include/mach-o/stab.h                    |  122 --
 i386/include/mach-o/swap.h                    |  207 --
 i386/include/mach/audit_triggers.defs         |   49 -
 i386/include/mach/boolean.h                   |   88 -
 i386/include/mach/bootstrap.h                 |   34 -
 i386/include/mach/clock.defs                  |   81 -
 i386/include/mach/clock.h                     |  221 ---
 i386/include/mach/clock_priv.defs             |   69 -
 i386/include/mach/clock_priv.h                |  175 --
 i386/include/mach/clock_reply.defs            |   56 -
 i386/include/mach/clock_reply.h               |  136 --
 i386/include/mach/clock_types.defs            |   73 -
 i386/include/mach/clock_types.h               |  126 --
 i386/include/mach/error.h                     |  114 --
 i386/include/mach/exc.defs                    |  119 --
 i386/include/mach/exc.h                       |  257 ---
 i386/include/mach/exception.h                 |   62 -
 i386/include/mach/exception_types.h           |  181 --
 i386/include/mach/host_info.h                 |  218 ---
 i386/include/mach/host_notify.h               |   37 -
 i386/include/mach/host_notify_reply.defs      |   40 -
 i386/include/mach/host_priv.defs              |  380 ----
 i386/include/mach/host_priv.h                 | 1269 -------------
 i386/include/mach/host_reboot.h               |   39 -
 i386/include/mach/host_security.defs          |  101 -
 i386/include/mach/host_security.h             |  197 --
 i386/include/mach/host_special_ports.h        |  180 --
 i386/include/mach/i386/_structs.h             |  561 ------
 i386/include/mach/i386/asm.h                  |  308 ---
 i386/include/mach/i386/boolean.h              |   74 -
 i386/include/mach/i386/exception.h            |  135 --
 i386/include/mach/i386/fp_reg.h               |  141 --
 i386/include/mach/i386/kern_return.h          |   74 -
 i386/include/mach/i386/machine_types.defs     |  127 --
 i386/include/mach/i386/ndr_def.h              |   45 -
 i386/include/mach/i386/processor_info.h       |   37 -
 i386/include/mach/i386/rpc.h                  |   36 -
 i386/include/mach/i386/sdt_isa.h              |  412 ----
 i386/include/mach/i386/task.h                 | 1578 ---------------
 i386/include/mach/i386/thread_act.h           | 1155 -----------
 i386/include/mach/i386/thread_state.h         |   42 -
 i386/include/mach/i386/thread_status.h        |  297 ---
 i386/include/mach/i386/vm_param.h             |  157 --
 i386/include/mach/i386/vm_types.h             |  140 --
 i386/include/mach/kern_return.h               |  322 ----
 i386/include/mach/kmod.h                      |  180 --
 i386/include/mach/ledger.defs                 |   79 -
 i386/include/mach/ledger.h                    |  259 ---
 i386/include/mach/lock_set.defs               |   79 -
 i386/include/mach/lock_set.h                  |  326 ----
 i386/include/mach/mach.h                      |  133 --
 i386/include/mach/mach_error.h                |   93 -
 i386/include/mach/mach_exc.defs               |  119 --
 i386/include/mach/mach_host.defs              |  257 ---
 i386/include/mach/mach_host.h                 |  873 ---------
 i386/include/mach/mach_init.h                 |  130 --
 i386/include/mach/mach_interface.h            |   54 -
 i386/include/mach/mach_param.h                |   73 -
 i386/include/mach/mach_port.defs              |  492 -----
 i386/include/mach/mach_port.h                 | 1383 --------------
 i386/include/mach/mach_syscalls.h             |   37 -
 i386/include/mach/mach_time.h                 |   56 -
 i386/include/mach/mach_traps.h                |  152 --
 i386/include/mach/mach_types.defs             |  474 -----
 i386/include/mach/mach_types.h                |  230 ---
 i386/include/mach/mach_vm.defs                |  480 -----
 i386/include/mach/mach_vm.h                   | 1032 ----------
 i386/include/mach/machine.h                   |  344 ----
 i386/include/mach/machine/asm.h               |   42 -
 i386/include/mach/machine/boolean.h           |   42 -
 i386/include/mach/machine/exception.h         |   42 -
 i386/include/mach/machine/kern_return.h       |   42 -
 i386/include/mach/machine/machine_types.defs  |   44 -
 i386/include/mach/machine/ndr_def.h           |   42 -
 i386/include/mach/machine/processor_info.h    |   42 -
 i386/include/mach/machine/rpc.h               |   42 -
 i386/include/mach/machine/sdt.h               |   36 -
 i386/include/mach/machine/sdt_isa.h           |   41 -
 i386/include/mach/machine/thread_state.h      |   42 -
 i386/include/mach/machine/thread_status.h     |   42 -
 i386/include/mach/machine/vm_param.h          |   42 -
 i386/include/mach/machine/vm_types.h          |   42 -
 i386/include/mach/memory_object_types.h       |  271 ---
 i386/include/mach/message.h                   |  783 --------
 i386/include/mach/mig.h                       |  174 --
 i386/include/mach/mig_errors.h                |  124 --
 i386/include/mach/ndr.h                       |  207 --
 i386/include/mach/notify.defs                 |  124 --
 i386/include/mach/notify.h                    |  132 --
 i386/include/mach/policy.h                    |  235 ---
 i386/include/mach/port.h                      |  319 ----
 i386/include/mach/port_obj.h                  |  103 -
 i386/include/mach/processor.defs              |  128 --
 i386/include/mach/processor.h                 |  336 ----
 i386/include/mach/processor_info.h            |  153 --
 i386/include/mach/processor_set.defs          |  161 --
 i386/include/mach/processor_set.h             |  516 -----
 i386/include/mach/rpc.h                       |  135 --
 i386/include/mach/sdt.h                       |   32 -
 i386/include/mach/security.defs               |  208 --
 i386/include/mach/semaphore.h                 |   78 -
 i386/include/mach/shared_memory_server.h      |  147 --
 i386/include/mach/shared_region.h             |  134 --
 i386/include/mach/std_types.defs              |  150 --
 i386/include/mach/std_types.h                 |   72 -
 i386/include/mach/sync.h                      |   35 -
 i386/include/mach/sync_policy.h               |   49 -
 i386/include/mach/task.defs                   |  393 ----
 i386/include/mach/task.h                      |   40 -
 i386/include/mach/task_access.defs            |   59 -
 i386/include/mach/task_info.h                 |  244 ---
 i386/include/mach/task_ledger.h               |   51 -
 i386/include/mach/task_policy.h               |  129 --
 i386/include/mach/task_special_ports.h        |  141 --
 i386/include/mach/thread_act.defs             |  323 ----
 i386/include/mach/thread_act.h                |   40 -
 i386/include/mach/thread_info.h               |  154 --
 i386/include/mach/thread_policy.h             |  218 ---
 i386/include/mach/thread_special_ports.h      |   83 -
 i386/include/mach/thread_status.h             |   94 -
 i386/include/mach/thread_switch.h             |   77 -
 i386/include/mach/time_value.h                |   96 -
 i386/include/mach/vm_attributes.h             |   99 -
 i386/include/mach/vm_behavior.h               |   78 -
 i386/include/mach/vm_inherit.h                |   89 -
 i386/include/mach/vm_map.defs                 |  475 -----
 i386/include/mach/vm_map.h                    | 1378 --------------
 i386/include/mach/vm_param.h                  |   73 -
 i386/include/mach/vm_prot.h                   |  141 --
 i386/include/mach/vm_purgable.h               |  134 --
 i386/include/mach/vm_region.h                 |  320 ----
 i386/include/mach/vm_statistics.h             |  335 ----
 i386/include/mach/vm_sync.h                   |   80 -
 i386/include/mach/vm_task.h                   |   34 -
 i386/include/mach/vm_types.h                  |   93 -
 i386/include/machine/_limits.h                |   41 -
 i386/include/machine/_param.h                 |   36 -
 i386/include/machine/_structs.h               |   36 -
 i386/include/machine/_types.h                 |   41 -
 i386/include/machine/byte_order.h             |   37 -
 i386/include/machine/endian.h                 |   44 -
 i386/include/machine/fasttrap_isa.h           |   41 -
 i386/include/machine/limits.h                 |   13 -
 i386/include/machine/param.h                  |   44 -
 i386/include/machine/profile.h                |   46 -
 i386/include/machine/setjmp.h                 |   44 -
 i386/include/machine/signal.h                 |   41 -
 i386/include/machine/types.h                  |   44 -
 i386/include/machine/vmparam.h                |   41 -
 i386/include/math.h                           |   35 -
 i386/include/pexpert/boot.h                   |   33 -
 i386/include/pexpert/i386/boot.h              |  177 --
 i386/include/pexpert/i386/efi.h               |  558 ------
 i386/include/pexpert/i386/protos.h            |   95 -
 i386/include/pexpert/machine/boot.h           |   39 -
 i386/include/pexpert/machine/protos.h         |   39 -
 i386/include/pexpert/pexpert.h                |  306 ---
 i386/include/pexpert/protos.h                 |   32 -
 i386/include/runetype.h                       |  136 --
 i386/include/setjmp.h                         |   28 -
 i386/include/signal.h                         |  187 --
 i386/include/stdarg.h                         |  133 --
 i386/include/stdbool.h                        |   46 -
 i386/include/stddef.h                         |  130 --
 i386/include/stdint.h                         |  253 ---
 i386/include/stdio.h                          |  503 -----
 i386/include/stdlib.h                         |  320 ----
 i386/include/string.h                         |  154 --
 i386/include/sys/_endian.h                    |  139 --
 i386/include/sys/_select.h                    |   52 -
 i386/include/sys/_structs.h                   |  236 ---
 i386/include/sys/_types.h                     |   84 -
 i386/include/sys/appleapiopts.h               |   62 -
 i386/include/sys/buf.h                        |  859 ---------
 i386/include/sys/cdefs.h                      |  583 ------
 i386/include/sys/disk.h                       |  139 --
 i386/include/sys/kernel_types.h               |  143 --
 i386/include/sys/param.h                      |  250 ---
 i386/include/sys/reboot.h                     |  129 --
 i386/include/sys/select.h                     |  157 --
 i386/include/sys/socket.h                     |  629 ------
 i386/include/sys/syscall.h                    |  477 -----
 i386/include/sys/syslimits.h                  |  117 --
 i386/include/sys/time.h                       |  221 ---
 i386/include/sys/types.h                      |  239 ---
 i386/include/sys/unistd.h                     |  181 --
 i386/include/sys/vnode.h                      |  119 --
 i386/include/time.h                           |  213 ---
 i386/include/unistd.h                         |  623 ------
 i386/include/unwind.h                         |  245 ---
 i386/util/segaddr                             |   56 +
 i386/util/segsize.c                           |  175 --
 311 files changed, 56 insertions(+), 60613 deletions(-)
 delete mode 100644 i386/include/IOKit/IOBSD.h
 delete mode 100644 i386/include/IOKit/IOBufferMemoryDescriptor.h
 delete mode 100644 i386/include/IOKit/IOCatalogue.h
 delete mode 100644 i386/include/IOKit/IOCommand.h
 delete mode 100644 i386/include/IOKit/IOCommandGate.h
 delete mode 100644 i386/include/IOKit/IOCommandPool.h
 delete mode 100644 i386/include/IOKit/IOConditionLock.h
 delete mode 100644 i386/include/IOKit/IODMACommand.h
 delete mode 100644 i386/include/IOKit/IODMAController.h
 delete mode 100644 i386/include/IOKit/IODMAEventSource.h
 delete mode 100644 i386/include/IOKit/IODataQueue.h
 delete mode 100644 i386/include/IOKit/IODataQueueShared.h
 delete mode 100644 i386/include/IOKit/IODeviceMemory.h
 delete mode 100644 i386/include/IOKit/IODeviceTreeSupport.h
 delete mode 100644 i386/include/IOKit/IOEventSource.h
 delete mode 100644 i386/include/IOKit/IOFilterInterruptEventSource.h
 delete mode 100644 i386/include/IOKit/IOInterleavedMemoryDescriptor.h
 delete mode 100644 i386/include/IOKit/IOInterruptController.h
 delete mode 100644 i386/include/IOKit/IOInterruptEventSource.h
 delete mode 100644 i386/include/IOKit/IOInterrupts.h
 delete mode 100644 i386/include/IOKit/IOKitDebug.h
 delete mode 100644 i386/include/IOKit/IOKitKeys.h
 delete mode 100644 i386/include/IOKit/IOKitServer.h
 delete mode 100644 i386/include/IOKit/IOLib.h
 delete mode 100644 i386/include/IOKit/IOLocks.h
 delete mode 100644 i386/include/IOKit/IOMapper.h
 delete mode 100644 i386/include/IOKit/IOMemoryCursor.h
 delete mode 100644 i386/include/IOKit/IOMemoryDescriptor.h
 delete mode 100644 i386/include/IOKit/IOMessage.h
 delete mode 100644 i386/include/IOKit/IOMultiMemoryDescriptor.h
 delete mode 100644 i386/include/IOKit/IONVRAM.h
 delete mode 100644 i386/include/IOKit/IONotifier.h
 delete mode 100644 i386/include/IOKit/IOPlatformExpert.h
 delete mode 100644 i386/include/IOKit/IORangeAllocator.h
 delete mode 100644 i386/include/IOKit/IORegistryEntry.h
 delete mode 100644 i386/include/IOKit/IOReturn.h
 delete mode 100644 i386/include/IOKit/IOService.h
 delete mode 100644 i386/include/IOKit/IOServicePM.h
 delete mode 100644 i386/include/IOKit/IOSharedDataQueue.h
 delete mode 100644 i386/include/IOKit/IOSharedLock.h
 delete mode 100644 i386/include/IOKit/IOSubMemoryDescriptor.h
 delete mode 100644 i386/include/IOKit/IOSyncer.h
 delete mode 100644 i386/include/IOKit/IOTimeStamp.h
 delete mode 100644 i386/include/IOKit/IOTimerEventSource.h
 delete mode 100644 i386/include/IOKit/IOTypes.h
 delete mode 100644 i386/include/IOKit/IOUserClient.h
 delete mode 100644 i386/include/IOKit/IOWorkLoop.h
 delete mode 100644 i386/include/IOKit/OSMessageNotification.h
 delete mode 100644 i386/include/IOKit/assert.h
 delete mode 100644 i386/include/IOKit/system.h
 delete mode 100644 i386/include/_structs.h
 delete mode 100644 i386/include/_types.h
 delete mode 100644 i386/include/architecture/alignment.h
 delete mode 100644 i386/include/architecture/byte_order.h
 delete mode 100644 i386/include/architecture/i386/alignment.h
 delete mode 100644 i386/include/architecture/i386/asm_help.h
 delete mode 100644 i386/include/architecture/i386/byte_order.h
 delete mode 100644 i386/include/architecture/i386/cpu.h
 delete mode 100644 i386/include/architecture/i386/desc.h
 delete mode 100644 i386/include/architecture/i386/fenv.h
 delete mode 100644 i386/include/architecture/i386/fpu.h
 delete mode 100644 i386/include/architecture/i386/frame.h
 delete mode 100644 i386/include/architecture/i386/io.h
 delete mode 100644 i386/include/architecture/i386/math.h
 delete mode 100644 i386/include/architecture/i386/pio.h
 delete mode 100644 i386/include/architecture/i386/reg_help.h
 delete mode 100644 i386/include/architecture/i386/sel.h
 delete mode 100644 i386/include/architecture/i386/table.h
 delete mode 100644 i386/include/architecture/i386/tss.h
 delete mode 100644 i386/include/assert.h
 delete mode 100644 i386/include/ctype.h
 delete mode 100644 i386/include/device/.svn/all-wcprops
 delete mode 100644 i386/include/device/.svn/entries
 delete mode 100644 i386/include/device/.svn/text-base/device_port.h.svn-base
 delete mode 100644 i386/include/device/.svn/text-base/device_types.h.svn-base
 delete mode 100644 i386/include/device/device_port.h
 delete mode 100644 i386/include/device/device_types.h
 delete mode 100644 i386/include/errno.h
 delete mode 100644 i386/include/float.h
 delete mode 100644 i386/include/i386/_limits.h
 delete mode 100644 i386/include/i386/_param.h
 delete mode 100644 i386/include/i386/_structs.h
 delete mode 100644 i386/include/i386/_types.h
 delete mode 100644 i386/include/i386/eflags.h
 delete mode 100644 i386/include/i386/endian.h
 delete mode 100644 i386/include/i386/fasttrap_isa.h
 delete mode 100644 i386/include/i386/limits.h
 delete mode 100644 i386/include/i386/param.h
 delete mode 100644 i386/include/i386/profile.h
 delete mode 100644 i386/include/i386/setjmp.h
 delete mode 100644 i386/include/i386/signal.h
 delete mode 100644 i386/include/i386/types.h
 delete mode 100644 i386/include/i386/user_ldt.h
 delete mode 100644 i386/include/i386/vmparam.h
 delete mode 100644 i386/include/inttypes.h
 delete mode 100644 i386/include/libkern/OSAtomic.h
 delete mode 100644 i386/include/libkern/OSByteOrder.h
 delete mode 100644 i386/include/libkern/OSCacheControl.h
 delete mode 100644 i386/include/libkern/OSDebug.h
 delete mode 100644 i386/include/libkern/OSKextLib.h
 delete mode 100644 i386/include/libkern/OSReturn.h
 delete mode 100644 i386/include/libkern/OSTypes.h
 delete mode 100644 i386/include/libkern/_OSByteOrder.h
 delete mode 100644 i386/include/libkern/i386/OSByteOrder.h
 delete mode 100644 i386/include/libkern/i386/_OSByteOrder.h
 delete mode 100644 i386/include/libkern/machine/OSByteOrder.h
 delete mode 100644 i386/include/limits.h
 delete mode 100644 i386/include/locale.h
 delete mode 100644 i386/include/mach-o/arch.h
 delete mode 100644 i386/include/mach-o/compact_unwind_encoding.h
 delete mode 100644 i386/include/mach-o/dyld.h
 delete mode 100644 i386/include/mach-o/dyld_images.h
 delete mode 100644 i386/include/mach-o/fat.h
 delete mode 100644 i386/include/mach-o/getsect.h
 delete mode 100644 i386/include/mach-o/ldsyms.h
 delete mode 100644 i386/include/mach-o/loader.h
 delete mode 100644 i386/include/mach-o/nlist.h
 delete mode 100644 i386/include/mach-o/ranlib.h
 delete mode 100644 i386/include/mach-o/reloc.h
 delete mode 100644 i386/include/mach-o/stab.h
 delete mode 100644 i386/include/mach-o/swap.h
 delete mode 100644 i386/include/mach/audit_triggers.defs
 delete mode 100644 i386/include/mach/boolean.h
 delete mode 100644 i386/include/mach/bootstrap.h
 delete mode 100644 i386/include/mach/clock.defs
 delete mode 100644 i386/include/mach/clock.h
 delete mode 100644 i386/include/mach/clock_priv.defs
 delete mode 100644 i386/include/mach/clock_priv.h
 delete mode 100644 i386/include/mach/clock_reply.defs
 delete mode 100644 i386/include/mach/clock_reply.h
 delete mode 100644 i386/include/mach/clock_types.defs
 delete mode 100644 i386/include/mach/clock_types.h
 delete mode 100644 i386/include/mach/error.h
 delete mode 100644 i386/include/mach/exc.defs
 delete mode 100644 i386/include/mach/exc.h
 delete mode 100644 i386/include/mach/exception.h
 delete mode 100644 i386/include/mach/exception_types.h
 delete mode 100644 i386/include/mach/host_info.h
 delete mode 100644 i386/include/mach/host_notify.h
 delete mode 100644 i386/include/mach/host_notify_reply.defs
 delete mode 100644 i386/include/mach/host_priv.defs
 delete mode 100644 i386/include/mach/host_priv.h
 delete mode 100644 i386/include/mach/host_reboot.h
 delete mode 100644 i386/include/mach/host_security.defs
 delete mode 100644 i386/include/mach/host_security.h
 delete mode 100644 i386/include/mach/host_special_ports.h
 delete mode 100644 i386/include/mach/i386/_structs.h
 delete mode 100644 i386/include/mach/i386/asm.h
 delete mode 100644 i386/include/mach/i386/boolean.h
 delete mode 100644 i386/include/mach/i386/exception.h
 delete mode 100644 i386/include/mach/i386/fp_reg.h
 delete mode 100644 i386/include/mach/i386/kern_return.h
 delete mode 100644 i386/include/mach/i386/machine_types.defs
 delete mode 100644 i386/include/mach/i386/ndr_def.h
 delete mode 100644 i386/include/mach/i386/processor_info.h
 delete mode 100644 i386/include/mach/i386/rpc.h
 delete mode 100644 i386/include/mach/i386/sdt_isa.h
 delete mode 100644 i386/include/mach/i386/task.h
 delete mode 100644 i386/include/mach/i386/thread_act.h
 delete mode 100644 i386/include/mach/i386/thread_state.h
 delete mode 100644 i386/include/mach/i386/thread_status.h
 delete mode 100644 i386/include/mach/i386/vm_param.h
 delete mode 100644 i386/include/mach/i386/vm_types.h
 delete mode 100644 i386/include/mach/kern_return.h
 delete mode 100644 i386/include/mach/kmod.h
 delete mode 100644 i386/include/mach/ledger.defs
 delete mode 100644 i386/include/mach/ledger.h
 delete mode 100644 i386/include/mach/lock_set.defs
 delete mode 100644 i386/include/mach/lock_set.h
 delete mode 100644 i386/include/mach/mach.h
 delete mode 100644 i386/include/mach/mach_error.h
 delete mode 100644 i386/include/mach/mach_exc.defs
 delete mode 100644 i386/include/mach/mach_host.defs
 delete mode 100644 i386/include/mach/mach_host.h
 delete mode 100644 i386/include/mach/mach_init.h
 delete mode 100644 i386/include/mach/mach_interface.h
 delete mode 100644 i386/include/mach/mach_param.h
 delete mode 100644 i386/include/mach/mach_port.defs
 delete mode 100644 i386/include/mach/mach_port.h
 delete mode 100644 i386/include/mach/mach_syscalls.h
 delete mode 100644 i386/include/mach/mach_time.h
 delete mode 100644 i386/include/mach/mach_traps.h
 delete mode 100644 i386/include/mach/mach_types.defs
 delete mode 100644 i386/include/mach/mach_types.h
 delete mode 100644 i386/include/mach/mach_vm.defs
 delete mode 100644 i386/include/mach/mach_vm.h
 delete mode 100644 i386/include/mach/machine.h
 delete mode 100644 i386/include/mach/machine/asm.h
 delete mode 100644 i386/include/mach/machine/boolean.h
 delete mode 100644 i386/include/mach/machine/exception.h
 delete mode 100644 i386/include/mach/machine/kern_return.h
 delete mode 100644 i386/include/mach/machine/machine_types.defs
 delete mode 100644 i386/include/mach/machine/ndr_def.h
 delete mode 100644 i386/include/mach/machine/processor_info.h
 delete mode 100644 i386/include/mach/machine/rpc.h
 delete mode 100644 i386/include/mach/machine/sdt.h
 delete mode 100644 i386/include/mach/machine/sdt_isa.h
 delete mode 100644 i386/include/mach/machine/thread_state.h
 delete mode 100644 i386/include/mach/machine/thread_status.h
 delete mode 100644 i386/include/mach/machine/vm_param.h
 delete mode 100644 i386/include/mach/machine/vm_types.h
 delete mode 100644 i386/include/mach/memory_object_types.h
 delete mode 100644 i386/include/mach/message.h
 delete mode 100644 i386/include/mach/mig.h
 delete mode 100644 i386/include/mach/mig_errors.h
 delete mode 100644 i386/include/mach/ndr.h
 delete mode 100644 i386/include/mach/notify.defs
 delete mode 100644 i386/include/mach/notify.h
 delete mode 100644 i386/include/mach/policy.h
 delete mode 100644 i386/include/mach/port.h
 delete mode 100644 i386/include/mach/port_obj.h
 delete mode 100644 i386/include/mach/processor.defs
 delete mode 100644 i386/include/mach/processor.h
 delete mode 100644 i386/include/mach/processor_info.h
 delete mode 100644 i386/include/mach/processor_set.defs
 delete mode 100644 i386/include/mach/processor_set.h
 delete mode 100644 i386/include/mach/rpc.h
 delete mode 100644 i386/include/mach/sdt.h
 delete mode 100644 i386/include/mach/security.defs
 delete mode 100644 i386/include/mach/semaphore.h
 delete mode 100644 i386/include/mach/shared_memory_server.h
 delete mode 100644 i386/include/mach/shared_region.h
 delete mode 100644 i386/include/mach/std_types.defs
 delete mode 100644 i386/include/mach/std_types.h
 delete mode 100644 i386/include/mach/sync.h
 delete mode 100644 i386/include/mach/sync_policy.h
 delete mode 100644 i386/include/mach/task.defs
 delete mode 100644 i386/include/mach/task.h
 delete mode 100644 i386/include/mach/task_access.defs
 delete mode 100644 i386/include/mach/task_info.h
 delete mode 100644 i386/include/mach/task_ledger.h
 delete mode 100644 i386/include/mach/task_policy.h
 delete mode 100644 i386/include/mach/task_special_ports.h
 delete mode 100644 i386/include/mach/thread_act.defs
 delete mode 100644 i386/include/mach/thread_act.h
 delete mode 100644 i386/include/mach/thread_info.h
 delete mode 100644 i386/include/mach/thread_policy.h
 delete mode 100644 i386/include/mach/thread_special_ports.h
 delete mode 100644 i386/include/mach/thread_status.h
 delete mode 100644 i386/include/mach/thread_switch.h
 delete mode 100644 i386/include/mach/time_value.h
 delete mode 100644 i386/include/mach/vm_attributes.h
 delete mode 100644 i386/include/mach/vm_behavior.h
 delete mode 100644 i386/include/mach/vm_inherit.h
 delete mode 100644 i386/include/mach/vm_map.defs
 delete mode 100644 i386/include/mach/vm_map.h
 delete mode 100644 i386/include/mach/vm_param.h
 delete mode 100644 i386/include/mach/vm_prot.h
 delete mode 100644 i386/include/mach/vm_purgable.h
 delete mode 100644 i386/include/mach/vm_region.h
 delete mode 100644 i386/include/mach/vm_statistics.h
 delete mode 100644 i386/include/mach/vm_sync.h
 delete mode 100644 i386/include/mach/vm_task.h
 delete mode 100644 i386/include/mach/vm_types.h
 delete mode 100644 i386/include/machine/_limits.h
 delete mode 100644 i386/include/machine/_param.h
 delete mode 100644 i386/include/machine/_structs.h
 delete mode 100644 i386/include/machine/_types.h
 delete mode 100644 i386/include/machine/byte_order.h
 delete mode 100644 i386/include/machine/endian.h
 delete mode 100644 i386/include/machine/fasttrap_isa.h
 delete mode 100644 i386/include/machine/limits.h
 delete mode 100644 i386/include/machine/param.h
 delete mode 100644 i386/include/machine/profile.h
 delete mode 100644 i386/include/machine/setjmp.h
 delete mode 100644 i386/include/machine/signal.h
 delete mode 100644 i386/include/machine/types.h
 delete mode 100644 i386/include/machine/vmparam.h
 delete mode 100644 i386/include/math.h
 delete mode 100644 i386/include/pexpert/boot.h
 delete mode 100644 i386/include/pexpert/i386/boot.h
 delete mode 100644 i386/include/pexpert/i386/efi.h
 delete mode 100644 i386/include/pexpert/i386/protos.h
 delete mode 100644 i386/include/pexpert/machine/boot.h
 delete mode 100644 i386/include/pexpert/machine/protos.h
 delete mode 100644 i386/include/pexpert/pexpert.h
 delete mode 100644 i386/include/pexpert/protos.h
 delete mode 100644 i386/include/runetype.h
 delete mode 100644 i386/include/setjmp.h
 delete mode 100644 i386/include/signal.h
 delete mode 100644 i386/include/stdarg.h
 delete mode 100644 i386/include/stdbool.h
 delete mode 100644 i386/include/stddef.h
 delete mode 100644 i386/include/stdint.h
 delete mode 100644 i386/include/stdio.h
 delete mode 100644 i386/include/stdlib.h
 delete mode 100644 i386/include/string.h
 delete mode 100644 i386/include/sys/_endian.h
 delete mode 100644 i386/include/sys/_select.h
 delete mode 100644 i386/include/sys/_structs.h
 delete mode 100644 i386/include/sys/_types.h
 delete mode 100644 i386/include/sys/appleapiopts.h
 delete mode 100644 i386/include/sys/buf.h
 delete mode 100644 i386/include/sys/cdefs.h
 delete mode 100644 i386/include/sys/disk.h
 delete mode 100644 i386/include/sys/kernel_types.h
 delete mode 100644 i386/include/sys/param.h
 delete mode 100644 i386/include/sys/reboot.h
 delete mode 100644 i386/include/sys/select.h
 delete mode 100644 i386/include/sys/socket.h
 delete mode 100644 i386/include/sys/syscall.h
 delete mode 100644 i386/include/sys/syslimits.h
 delete mode 100644 i386/include/sys/time.h
 delete mode 100644 i386/include/sys/types.h
 delete mode 100644 i386/include/sys/unistd.h
 delete mode 100644 i386/include/sys/vnode.h
 delete mode 100644 i386/include/time.h
 delete mode 100644 i386/include/unistd.h
 delete mode 100644 i386/include/unwind.h
 create mode 100755 i386/util/segaddr
 delete mode 100644 i386/util/segsize.c

diff --git a/i386/include/IOKit/IOBSD.h b/i386/include/IOKit/IOBSD.h
deleted file mode 100644
index 8938656..0000000
--- a/i386/include/IOKit/IOBSD.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOBSD_H
-#define _IOBSD_H
-
-/*
- * bsd-related registry properties
- */
-
-#define kIOBSDNameKey  "BSD Name"  // (an OSString)
-#define kIOBSDNamesKey "BSD Names" // (an OSDictionary of OSString's, for links)
-#define kIOBSDMajorKey "BSD Major" // (an OSNumber)
-#define kIOBSDMinorKey "BSD Minor" // (an OSNumber)
-#define kIOBSDUnitKey  "BSD Unit"  // (an OSNumber)
-
-#endif /* !_IOBSD_H */
diff --git a/i386/include/IOKit/IOBufferMemoryDescriptor.h b/i386/include/IOKit/IOBufferMemoryDescriptor.h
deleted file mode 100644
index 0926e5b..0000000
--- a/i386/include/IOKit/IOBufferMemoryDescriptor.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOBUFFERMEMORYDESCRIPTOR_H
-#define _IOBUFFERMEMORYDESCRIPTOR_H
-
-#include <IOKit/IOMemoryDescriptor.h>
-
-enum {
-    kIOMemoryPhysicallyContiguous	= 0x00000010,
-    kIOMemoryPageable	      		= 0x00000020,
-    kIOMemoryPurgeable	      		= 0x00000040,
-    kIOMemorySharingTypeMask		= 0x000f0000,
-    kIOMemoryUnshared			= 0x00000000,
-    kIOMemoryKernelUserShared		= 0x00010000,
-    // shared IOMemoryDescriptor options for IOBufferMemoryDescriptor:
-    kIOBufferDescriptorMemoryFlags	= kIOMemoryDirectionMask 
-					| kIOMemoryThreadSafe
-};
-
-#define _IOBUFFERMEMORYDESCRIPTOR_INTASKWITHOPTIONS_	1
-/*!
-    @class IOBufferMemoryDescriptor
-    @abstract Provides a simple memory descriptor that allocates its own buffer memory.
-*/
-
-class IOBufferMemoryDescriptor : public IOGeneralMemoryDescriptor
-{
-    OSDeclareDefaultStructors(IOBufferMemoryDescriptor);
-
-private:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of this class in the future.
-    */    
-    struct ExpansionData {
-	IOMemoryMap *   map;
-    };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData * reserved;
-
-protected:
-    void *               _buffer;
-    vm_size_t            _capacity;
-    vm_offset_t		 _alignment;
-    IOOptionBits	 _options;
-private:
-    uintptr_t		 _internalReserved;
-    unsigned             _internalFlags;
-
-private:
-#ifndef __LP64__
-    virtual bool initWithOptions(
-                               IOOptionBits options,
-                               vm_size_t    capacity,
-                               vm_offset_t  alignment,
-			       task_t	    inTask) APPLE_KEXT_DEPRECATED; /* use withOptions() instead */
-#endif /* !__LP64__ */
-
-    virtual bool initWithPhysicalMask(
-				task_t		  inTask,
-				IOOptionBits      options,
-				mach_vm_size_t    capacity,
-				mach_vm_address_t alignment,
-				mach_vm_address_t physicalMask);
-
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 0);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 1);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IOBufferMemoryDescriptor, 0);
-    OSMetaClassDeclareReservedUsed(IOBufferMemoryDescriptor, 1);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 2);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 3);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 4);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 5);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 6);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 7);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 8);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 9);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 10);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 11);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 12);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 13);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 14);
-    OSMetaClassDeclareReservedUnused(IOBufferMemoryDescriptor, 15);
-
-protected:
-    virtual void free();
-
-public:
-
-    /*
-     * withOptions:
-     *
-     * Returns a new IOBufferMemoryDescriptor with a buffer large enough to
-     * hold capacity bytes.  The descriptor's length is initially set to the
-     * capacity.
-     */
-#ifndef __LP64__
-    virtual bool initWithOptions(   IOOptionBits options,
-                                    vm_size_t    capacity,
-                                    vm_offset_t  alignment) APPLE_KEXT_DEPRECATED; /* use withOptions() instead */
-#endif /* !__LP64__ */
-
-    static IOBufferMemoryDescriptor * withOptions(  IOOptionBits options,
-                                                    vm_size_t    capacity,
-                                                    vm_offset_t  alignment = 1);
-
-/*! @function inTaskWithOptions
-    @abstract Creates a memory buffer with memory descriptor for that buffer. 
-    @discussion Added in Mac OS X 10.2, this method allocates a memory buffer with a given size and alignment in the task's address space specified, and returns a memory descriptor instance representing the memory. It is recommended that memory allocated for I/O or sharing via mapping be created via IOBufferMemoryDescriptor. Options passed with the request specify the kind of memory to be allocated - pageablity and sharing are specified with option bits. This function may block and so should not be called from interrupt level or while a simple lock is held.
-    @param inTask The task the buffer will be allocated in.
-    @param options Options for the allocation:<br>
-    kIODirectionOut, kIODirectionIn - set the direction of the I/O transfer.<br>
-    kIOMemoryPhysicallyContiguous - pass to request memory be physically contiguous. This option is heavily discouraged. The request may fail if memory is fragmented, may cause large amounts of paging activity, and may take a very long time to execute.<br>
-    kIOMemoryPageable - pass to request memory be non-wired - the default for kernel allocated memory is wired.<br>
-    kIOMemoryPurgeable - pass to request memory that may later have its purgeable state set with IOMemoryDescriptor::setPurgeable. Only supported for kIOMemoryPageable allocations.<br>
-    kIOMemoryKernelUserShared - pass to request memory that will be mapped into both the kernel and client applications.
-    @param capacity The number of bytes to allocate.
-    @param alignment The minimum required alignment of the buffer in bytes - 1 is the default for no required alignment. For example, pass 256 to get memory allocated at an address with bits 0-7 zero.
-    @result Returns an instance of class IOBufferMemoryDescriptor to be released by the caller, which will free the memory desriptor and associated buffer. */
-
-    static IOBufferMemoryDescriptor * inTaskWithOptions(
-					    task_t       inTask,
-                                            IOOptionBits options,
-                                            vm_size_t    capacity,
-                                            vm_offset_t  alignment = 1);
-
-/*! @function inTaskWithPhysicalMask
-    @abstract Creates a memory buffer with memory descriptor for that buffer. 
-    @discussion Added in Mac OS X 10.5, this method allocates a memory buffer with a given size and alignment in the task's address space specified, and returns a memory descriptor instance representing the memory. It is recommended that memory allocated for I/O or sharing via mapping be created via IOBufferMemoryDescriptor. Options passed with the request specify the kind of memory to be allocated - pageablity and sharing are specified with option bits. This function may block and so should not be called from interrupt level or while a simple lock is held.
-    @param inTask The task the buffer will be mapped in. Pass NULL to create memory unmapped in any task (eg. for use as a DMA buffer).
-    @param options Options for the allocation:<br>
-    kIODirectionOut, kIODirectionIn - set the direction of the I/O transfer.<br>
-    kIOMemoryPhysicallyContiguous - pass to request memory be physically contiguous. This option is heavily discouraged. The request may fail if memory is fragmented, may cause large amounts of paging activity, and may take a very long time to execute.<br>
-    kIOMemoryKernelUserShared - pass to request memory that will be mapped into both the kernel and client applications.
-    @param capacity The number of bytes to allocate.
-    @param mask The buffer will be allocated with pages such that physical addresses will only have bits set present in physicalMask. For example, pass 0x00000000FFFFFFFFULL for a buffer to be accessed by hardware that has 32 address bits.
-    @result Returns an instance of class IOBufferMemoryDescriptor to be released by the caller, which will free the memory desriptor and associated buffer. */
-
-    static IOBufferMemoryDescriptor * inTaskWithPhysicalMask(
-					    task_t	      inTask,
-                                            IOOptionBits      options,
-                                            mach_vm_size_t    capacity,
-                                            mach_vm_address_t physicalMask);
-
-    /*
-     * withCapacity:
-     *
-     * Returns a new IOBufferMemoryDescriptor with a buffer large enough to
-     * hold capacity bytes.  The descriptor's length is initially set to the
-     * capacity.
-     */
-    static IOBufferMemoryDescriptor * withCapacity(
-                                     vm_size_t    capacity,
-                                     IODirection  withDirection,
-                                     bool         withContiguousMemory = false);
-#ifndef __LP64__
-    virtual bool initWithBytes(const void * bytes,
-                               vm_size_t    withLength,
-                               IODirection  withDirection,
-                               bool         withContiguousMemory = false) APPLE_KEXT_DEPRECATED; /* use withBytes() instead */
-#endif /* !__LP64__ */
-
-    /*
-     * withBytes:
-     *
-     * Returns a new IOBufferMemoryDescriptor preloaded with bytes (copied).
-     * The descriptor's length and capacity are set to the input buffer's size.
-     */
-    static IOBufferMemoryDescriptor * withBytes(
-                                     const void * bytes,
-                                     vm_size_t    withLength,
-                                     IODirection  withDirection,
-                                     bool         withContiguousMemory = false);
-
-    /*
-     * setLength:
-     *
-     * Change the buffer length of the memory descriptor.  When a new buffer
-     * is created, the initial length of the buffer is set to be the same as
-     * the capacity.  The length can be adjusted via setLength for a shorter
-     * transfer (there is no need to create more buffer descriptors when you
-     * can reuse an existing one, even for different transfer sizes).   Note
-     * that the specified length must not exceed the capacity of the buffer.
-     */
-    virtual void setLength(vm_size_t length);
-
-    /*
-     * setDirection:
-     *
-     * Change the direction of the transfer.  This method allows one to redirect
-     * the descriptor's transfer direction.  This eliminates the need to destroy
-     * and create new buffers when different transfer directions are needed.
-     */
-    virtual void setDirection(IODirection direction);
-
-    /*
-     * getCapacity:
-     *
-     * Get the buffer capacity
-     */
-    virtual vm_size_t getCapacity() const;
-
-    /*
-     * getBytesNoCopy:
-     *
-     * Return the virtual address of the beginning of the buffer
-     */
-    virtual void *getBytesNoCopy();
-
-    /*
-     * getBytesNoCopy:
-     *
-     * Return the virtual address of an offset from the beginning of the buffer
-     */
-    virtual void *getBytesNoCopy(vm_size_t start, vm_size_t withLength);
-
-    /*
-     * appendBytes:
-     *
-     * Add some data to the end of the buffer.  This method automatically
-     * maintains the memory descriptor buffer length.  Note that appendBytes
-     * will not copy past the end of the memory descriptor's current capacity.
-     */
-    virtual bool appendBytes(const void *bytes, vm_size_t withLength);
-
-#ifndef __LP64__
-    virtual void * getVirtualSegment(IOByteCount offset,
-					IOByteCount * length) APPLE_KEXT_DEPRECATED; /* use getBytesNoCopy() instead */
-#endif /* !__LP64__ */
-};
-
-#endif /* !_IOBUFFERMEMORYDESCRIPTOR_H */
diff --git a/i386/include/IOKit/IOCatalogue.h b/i386/include/IOKit/IOCatalogue.h
deleted file mode 100644
index f087396..0000000
--- a/i386/include/IOKit/IOCatalogue.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOCATALOGUE_H
-#define _IOKIT_IOCATALOGUE_H
-
-#include <libkern/c++/OSObject.h>
-#include <libkern/c++/OSCollectionIterator.h>
-#include <libkern/c++/OSArray.h>
-#include <libkern/c++/OSDictionary.h>
-#include <IOKit/IOLocks.h>
-#include <sys/cdefs.h>
-
-#include <IOKit/IOKitServer.h>
-
-class IOService;
-
-/*!
-    @class IOCatalogue
-    @abstract In-kernel database for IOKit driver personalities.
-    @discussion The IOCatalogue is a database which contains all IOKit driver personalities.  IOService uses this resource when matching devices to their associated drivers.
-*/
-class IOCatalogue : public OSObject
-{
-    OSDeclareDefaultStructors(IOCatalogue)
-    
-private:
-    OSCollectionIterator   * kernelTables;
-    OSArray                * array;
-    IOLock *                 lock;
-    SInt32                   generation;
-
-/* This stuff is no longer used at all but was exported in prior
- * releases, so we keep it around for PPC/i386 only.
- */
-#if __ppc__ || __i386__
-    IOLock *                 kld_lock;
-#endif /* __ppc__ || __i386__ */
-
-public:
-    /*!
-        @function initialize
-        @abstract Creates and initializes the database object and poputates it with in-kernel driver personalities.
-    */
-    static void initialize( void );
-    
-    /*!
-        @function init
-        @abstract Initializes the database object.
-        @param initArray  The initial array of driver personalities to populate the database.
-    */
-    bool init( OSArray * initArray );
-    
-    /*!
-        @function free
-        @abstract Cleans up the database and deallocates memory allocated at initialization.  This is never called in normal operation of the system.
-    */
-    void free( void );
-    
-    /*!
-        @function findDrivers
-        @abstract This is the primary entry point for IOService.
-        @param service
-        @param generationCount  Returns a reference to the generation count of the database. The generation count increases only when personalities are added to the database *and* IOService matching has been initiated.
-        @result Returns an ordered set of driver personalities ranked on probe-scores.  The ordered set must be released by the receiver.
-    */
-    OSOrderedSet * findDrivers( IOService * service, SInt32 * generationCount );
-    
-    /*!
-        @function findDrivers
-        @abstract A more general purpose interface which allows one to retreive driver personalities based the intersection of the 'matching' dictionary and the personality's own property list.
-        @param matching  A dictionary containing only keys and values which are to be used for matching. For example, a matching dictionary containing 'IOProviderClass'='IOPCIDevice' will return all personalities with an IOProviderClass key and a value of IOPCIDevice.
-        @param generationCount  Returns a reference to the current generation of the database. The generation count increases only when personalities are added to the database *and* IOService matching has been initiated.
-        @result Returns an ordered set of driver personalities ranked on probe-scores. The ordered set must be released by the receiver.
-    */
-    OSOrderedSet * findDrivers( OSDictionary * matching, SInt32 * generationCount );
-    
-    /*!
-        @function addDrivers
-        @abstract Adds an array of driver personalities to the database.
-        @param array Array of driver personalities to be added to the database.
-        @param doNubMatchng Start matching process after personalities have been added.
-        @result Returns true if driver personality was added to the database successfully. Failure is due to a memory allocation failure.
-    */
-    bool addDrivers( OSArray * array, bool doNubMatching = true );
-    
-    /*!
-        @function removeDrivers
-        @abstract Remove driver personalities from the database based on matching information provided.
-        @param matching  A dictionary whose keys and values are used for matching personalities in the database.  For example, a matching dictionary containing a 'IOProviderClass' key with the value 'IOPCIDevice' will remove all personalities which have the key 'IOProviderClass' equal to 'IOPCIDevice'.
-        @param doNubMatchng Start matching process after personalities have been removed.  Matching criteria is based on IOProviderClass of those personalities which were removed.  This is to allow drivers which haven't been matched to match against NUB's which were blocked by the previous personalities. 
-        @result Returns true if personality was removed successfully. Failure is due to a memory allocation failure.
-    */
-    bool removeDrivers( OSDictionary * matching, bool doNubMatching = true );
-    
-    /*!
-        @function getGenerationCount
-        @abstract Get the current generation count of the database.
-    */
-    SInt32 getGenerationCount( void ) const;
-
-    /*!
-        @function isModuleLoaded
-        @abstract Reports if a kernel module has been loaded.
-        @param moduleName  Name of the module.
-        @result Returns true if the associated kernel module has been loaded into the kernel.
-    */
-    bool isModuleLoaded( OSString * moduleName ) const;
-
-    /*!
-        @function isModuleLoaded
-        @abstract Reports if a kernel module has been loaded.
-        @param moduleName  Name of the module.
-        @result Returns true if the associated kernel module has been loaded into the kernel.
-    */
-    bool isModuleLoaded( const char * moduleName ) const;
-    
-    /*!
-        @function isModuleLoaded
-        @abstract Reports if a kernel module has been loaded for a particular personality.
-        @param driver  A driver personality's property list.
-        @result Returns true if the associated kernel module has been loaded into the kernel for a particular driver personality on which it depends.
-    */
-    bool isModuleLoaded( OSDictionary * driver ) const;
-    
-    /*!
-        @function moduleHasLoaded
-        @abstract Callback function called after a IOKit dependent kernel module is loaded.
-        @param name  Name of the kernel module.
-    */
-    void moduleHasLoaded( OSString * name );
-    
-    /*!
-        @function moduleHasLoaded
-        @abstract Callback function called after a IOKit dependent kernel module is loaded.
-        @param name  Name of the kernel module.
-    */
-    void moduleHasLoaded( const char * name );
-
-    /*!
-        @function terminateDrivers
-        @abstract Terminates all instances of a driver which match the contents of the matching dictionary. Does not unload module.
-        @param matching  A dictionary whose keys and values are used for matching personalities in the database.  For example, a matching dictionary containing a 'IOProviderClass' key with the value 'IOPCIDevice' will cause termination for all instances whose personalities have the key 'IOProviderClass' equal to 'IOPCIDevice'.
-     */
-    IOReturn terminateDrivers( OSDictionary * matching );
-
-    /*!
-        @function terminateDriversForModule
-        @abstract Terminates all instances of a driver which depends on a particular module and unloads the module.
-        @param moduleName Name of the module which is used to determine which driver instances to terminate and unload.
-        @param unload Flag to cause the actual unloading of the module.
-     */
-    IOReturn terminateDriversForModule( OSString * moduleName, bool unload = true);
-
-    /*!
-        @function terminateDriversForModule
-        @abstract Terminates all instances of a driver which depends on a particular module and unloads the module.
-        @param moduleName Name of the module which is used to determine which driver instances to terminate and unload.
-        @param unload Flag to cause the actual unloading of the module.
-     */
-    IOReturn terminateDriversForModule( const char * moduleName, bool unload = true);
-
-    /*!
-        @function startMatching
-        @abstract Starts an IOService matching thread where matching keys and values are provided by the matching dictionary.
-        @param matching  A dictionary whose keys and values are used for matching personalities in the database.  For example, a matching dictionary containing a 'IOProviderClass' key with the value 'IOPCIDevice' will start matching for all personalities which have the key 'IOProviderClass' equal to 'IOPCIDevice'.
-     */
-    bool startMatching( OSDictionary * matching );
-
-    /*!
-        @function reset
-        @abstract Return the Catalogue to its initial state.
-    */
-    void reset(void);
-
-    /*!
-        @function serialize
-        @abstract Serializes the catalog for transport to the user.
-        @param s The serializer object.
-        @result Returns false if unable to serialize database, most likely due to memory shortage.
-     */
-    virtual bool serialize(OSSerialize * s) const;
-
-    bool serializeData(IOOptionBits kind, OSSerialize * s) const;
-
-/* This stuff is no longer used at all we keep it around for PPC/i386
- * binary compatibility only. Symbols are no longer exported.
- */
-#if __ppc__ || __i386__
-    /*!
-        @function recordStartupExtensions
-        @abstract Records extensions made available by the primary booter.
-            <p>
-            This function is for internal use by the kernel startup linker.
-            Kernel extensions should never call it.
-        @result Returns true if startup extensions were successfully recorded,
-            false if not.
-    */
-    virtual bool recordStartupExtensions(void);
-
-    /*!
-        @function addExtensionsFromArchive()
-        @abstract Records an archive of extensions, as from device ROM.
-            <p>
-            This function is currently for internal use.
-            Kernel extensions should never call it.
-        @param mkext An OSData object containing a multikext archive.
-        @result Returns true if mkext was properly unserialized and its
-                contents recorded, false if not.
-    */
-    virtual bool addExtensionsFromArchive(OSData * mkext);
-
-
-    /*!
-        @function removeKernelLinker
-        @abstract Removes from memory all code and data related to
-            boot-time loading of kernel extensions. kextd triggers
-            this when it first starts in order to pass responsibility
-            for loading extensions from the kernel itself to kextd.
-        @result Returns KERN_SUCCESS if the kernel linker is successfully
-            removed or wasn't present, KERN_FAILURE otherwise.
-    */
-    virtual kern_return_t removeKernelLinker(void);
-#endif /* __ppc__ || __i386__ */
-
-private:
-
-    /*!
-        @function unloadModule
-        @abstract Unloads the reqested module if no driver instances are currently depending on it.
-        @param moduleName An OSString containing the name of the module to unload.
-     */
-    IOReturn unloadModule( OSString * moduleName ) const;
-};
-
-extern const OSSymbol * gIOClassKey;
-extern const OSSymbol * gIOProbeScoreKey;
-extern IOCatalogue    * gIOCatalogue;
-
-#endif /* ! _IOKIT_IOCATALOGUE_H */
diff --git a/i386/include/IOKit/IOCommand.h b/i386/include/IOKit/IOCommand.h
deleted file mode 100644
index 136c41b..0000000
--- a/i386/include/IOKit/IOCommand.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-/*
- *
- *	Copyright (c) 2000 Apple Computer, Inc.  All rights reserved.
- *
- *	HISTORY
- *
- *	2001-01-18 gvdl	Made the primary queue pointer public, to be used when
- *			Ownership is clear.
- *	11/13/2000 CJS	Created IOCommand class and implementation
- *
- */
-
-/*!
- * @header IOCommand
- * @abstract
- * This header contains the IOCommand class definition.
- */
-
-#ifndef _IOKIT_IO_COMMAND_H_
-#define _IOKIT_IO_COMMAND_H_
-
-/*
- * Kernel
- */
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-#include <kern/queue.h>
-#include <libkern/c++/OSObject.h>
-
-/*!
- * @class IOCommand
- * @abstract
- * This class is an abstract class which represents an I/O command.
- * @discussion
- * This class is an abstract class which represents an I/O command passed
- * from a device driver to a controller. All controller commands (e.g. IOATACommand)
- * should inherit from this class.
- */
- 
-class IOCommand : public OSObject
-{
-    OSDeclareDefaultStructors(IOCommand)
-    
-public:
-    virtual bool init(void);
-    
-/*! @var fCommandChain
-    This variable is used by the current 'owner' to queue the command.  During the life cycle of a command it moves through a series of queues.  This is the queue pointer for it.  Only valid while 'ownership' is clear.  For instance a IOCommandPool uses this pointer to maintain its list of free commands.  May be manipulated using the kern/queue.h macros */
-    queue_chain_t fCommandChain;	/* used to queue commands */
-};
-
-#endif /* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_COMMAND_H_ */
diff --git a/i386/include/IOKit/IOCommandGate.h b/i386/include/IOKit/IOCommandGate.h
deleted file mode 100644
index 1b17b79..0000000
--- a/i386/include/IOKit/IOCommandGate.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*[
-    1999-8-10	Godfrey van der Linden(gvdl)
-	Created.
-]*/
-/*! @language embedded-c++ */
-
-#ifndef _IOKIT_IOCOMMANDGATE_H
-#define _IOKIT_IOCOMMANDGATE_H
-
-#include <IOKit/IOEventSource.h>
-
-/*!
-    @class IOCommandGate : public IOEventSource
-    @abstract Single-threaded work-loop client request mechanism.
-    @discussion An IOCommandGate instance is an extremely light way mechanism
-that executes an action on the driver's work-loop.  'On the work-loop' is
-actually a lie but the work-loop single threaded semantic is maintained for this
-event source.  Using the work-loop gate rather than execution by the workloop.
-The command gate tests for a potential self dead lock by checking if the
-runCommand request is made from the work-loop's thread, it doesn't check for a
-mutual dead lock though where a pair of work loop's dead lock each other.
-<br><br>
-	The IOCommandGate is a lighter weight version of the IOCommandQueue and
-should be used in preference.  Generally use a command queue whenever you need a
-client to submit a request to a work loop.  A typical command gate action would
-check if the hardware is active, if so it will add the request to a pending
-queue internal to the device or the device's family.  Otherwise if the hardware
-is inactive then this request can be acted upon immediately.
-<br><br>
-    CAUTION: The runAction, runCommand, and attemptCommand functions cannot be called from an interrupt context.
-
-*/
-class IOCommandGate : public IOEventSource
-{
-    OSDeclareDefaultStructors(IOCommandGate)
-
-public:
-/*!
-    @typedef Action
-    @discussion Type and arguments of callout C function that is used when
-a runCommand is executed by a client.  Cast to this type when you want a C++
-member function to be used.  Note the arg1 - arg3 parameters are straight pass
-through from the runCommand to the action callout.
-    @param owner
-	Target of the function, can be used as a refcon.  The owner is set
-during initialisation of the IOCommandGate instance.	 Note if a C++ function
-was specified this parameter is implicitly the first paramter in the target
-member function's parameter list.
-    @param arg0 Argument to action from run operation.
-    @param arg1 Argument to action from run operation.
-    @param arg2 Argument to action from run operation.
-    @param arg3 Argument to action from run operation.
-*/
-    typedef IOReturn (*Action)(OSObject *owner,
-			       void *arg0, void *arg1,
-			       void *arg2, void *arg3);
-
-protected:
-/*!
-    @function checkForWork
-    @abstract Not used, $link IOEventSource::checkForWork(). */
-    virtual bool checkForWork();
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-public:
-/*! @function commandGate
-    @abstract Factory method to create and initialise an IOCommandGate, See $link init.
-    @result Returns a pointer to the new command gate if sucessful, 0 otherwise. */
-    static IOCommandGate *commandGate(OSObject *owner, Action action = 0);
-
-/*! @function init
-    @abstract Class initialiser.
-    @discussion Initialiser for IOCommandGate operates only on newly 'newed'
-objects.  Shouldn't be used to re-init an existing instance.
-    @param owner 	Owner of this, newly created, instance of the IOCommandGate.  This argument will be used as the first parameter in the action callout.
-    @param action
-	Pointer to a C function that is called whenever a client of the
-IOCommandGate calls runCommand.	 NB Can be a C++ member function but caller
-must cast the member function to $link IOCommandGate::Action and they will get a
-compiler warning.  Defaults to zero, see $link IOEventSource::setAction.
-    @result True if inherited classes initialise successfully. */
-    virtual bool init(OSObject *owner, Action action = 0);
-
-    // Superclass overrides
-    virtual void free();
-    virtual void setWorkLoop(IOWorkLoop *inWorkLoop);
-
-/*! @function runCommand
-    @abstract Single thread a command with the target work-loop.
-    @discussion Client function that causes the current action to be called in
-a single threaded manner.  Beware the work-loop's gate is recursive and command
-gates can cause direct or indirect re-entrancy.	 When the executing on a
-client's thread runCommand will sleep until the work-loop's gate opens for
-execution of client actions, the action is single threaded against all other
-work-loop event sources.  If the command is disabled the attempt to run a command will be stalled until enable is called.
-    @param arg0 Parameter for action of command gate, defaults to 0.
-    @param arg1 Parameter for action of command gate, defaults to 0.
-    @param arg2 Parameter for action of command gate, defaults to 0.
-    @param arg3 Parameter for action of command gate, defaults to 0.
-    @result kIOReturnSuccess if successful. kIOReturnAborted if a disabled command gate is free()ed before being reenabled, kIOReturnNoResources if no action available.
-*/
-    virtual IOReturn runCommand(void *arg0 = 0, void *arg1 = 0,
-				void *arg2 = 0, void *arg3 = 0);
-
-/*! @function runAction
-    @abstract Single thread a call to an action with the target work-loop.
-    @discussion Client function that causes the given action to be called in
-a single threaded manner.  Beware the work-loop's gate is recursive and command
-gates can cause direct or indirect re-entrancy.	 When the executing on a
-client's thread runAction will sleep until the work-loop's gate opens for
-execution of client actions, the action is single threaded against all other
-work-loop event sources.  If the command is disabled the attempt to run a command will be stalled until enable is called.
-    @param action Pointer to function to be executed in work-loop context.
-    @param arg0 Parameter for action parameter, defaults to 0.
-    @param arg1 Parameter for action parameter, defaults to 0.
-    @param arg2 Parameter for action parameter, defaults to 0.
-    @param arg3 Parameter for action parameter, defaults to 0.
-    @result kIOReturnSuccess if successful. kIOReturnBadArgument if action is not defined, kIOReturnAborted if a disabled command gate is free()ed before being reenabled.
-*/
-    virtual IOReturn runAction(Action action,
-			       void *arg0 = 0, void *arg1 = 0,
-			       void *arg2 = 0, void *arg3 = 0);
-
-/*! @function attemptCommand
-    @abstract Single thread a command with the target work-loop.
-    @discussion Client function that causes the current action to be called in
-a single threaded manner.  When the executing on a client's thread attemptCommand will fail if the work-loop's gate is closed.
-    @param arg0 Parameter for action of command gate, defaults to 0.
-    @param arg1 Parameter for action of command gate, defaults to 0.
-    @param arg2 Parameter for action of command gate, defaults to 0.
-    @param arg3 Parameter for action of command gate, defaults to 0.
-    @result kIOReturnSuccess if successful. kIOReturnNotPermitted if this event source is currently disabled, kIOReturnNoResources if no action available, kIOReturnCannotLock if lock attempt fails.
-*/
-    virtual IOReturn attemptCommand(void *arg0 = 0, void *arg1 = 0,
-                                    void *arg2 = 0, void *arg3 = 0);
-
-/*! @function attemptAction
-    @abstract Single thread a call to an action with the target work-loop.
-    @discussion Client function that causes the given action to be called in
-a single threaded manner.  Beware the work-loop's gate is recursive and command
-gates can cause direct or indirect re-entrancy.	 When the executing on a
-client's thread attemptCommand will fail if the work-loop's gate is closed.
-    @param action Pointer to function to be executed in work-loop context.
-    @param arg0 Parameter for action parameter, defaults to 0.
-    @param arg1 Parameter for action parameter, defaults to 0.
-    @param arg2 Parameter for action parameter, defaults to 0.
-    @param arg3 Parameter for action parameter, defaults to 0.
-    @result kIOReturnSuccess if successful. kIOReturnBadArgument if action is not defined, kIOReturnNotPermitted if this event source is currently disabled, kIOReturnCannotLock if lock attempt fails.
-
-*/
-    virtual IOReturn attemptAction(Action action,
-                                   void *arg0 = 0, void *arg1 = 0,
-                                   void *arg2 = 0, void *arg3 = 0);
-
-/*! @function commandSleep  
-    @abstract Put a thread that is currently holding the command gate to sleep.
-    @discussion Put a thread to sleep waiting for an event but release the gate first.  If the event occurs then the commandGate is closed before the function returns.
-    @param event Pointer to an address.
-    @param interruptible THREAD_UNINT, THREAD_INTERRUPTIBLE or THREAD_ABORTSAFE.  THREAD_UNINT specifies that the sleep cannot be interrupted by a signal.  THREAD_INTERRUPTIBLE specifies that the sleep may be interrupted by a "kill -9" signal.  THREAD_ABORTSAFE (the default value) specifies that the sleep may be interrupted by any user signal.
-    @result THREAD_AWAKENED - normal wakeup, THREAD_TIMED_OUT - timeout expired, THREAD_INTERRUPTED - interrupted, THREAD_RESTART - restart operation entirely, kIOReturnNotPermitted if the calling thread does not hold the command gate. */
-    virtual IOReturn commandSleep(void *event,
-                                  UInt32 interruptible = THREAD_ABORTSAFE);
-
-/*! @function commandWakeup
-    @abstract Wakeup one or more threads that are asleep on an event.
-    @param event Pointer to an address.
-    @param onlyOneThread true to only wake up at most one thread, false otherwise. */
-    virtual void commandWakeup(void *event, bool oneThread = false);
-
-/*! @function disable
-    @abstract Disable the command gate
-    @discussion When a command gate is disabled all future calls to runAction and runCommand will stall until the gate is enable()d later.  This can be used to block client threads when a system sleep is requested.  The IOWorkLoop thread itself will never stall, even when making runAction/runCommand calls.  This call must be made from a gated context, to clear potential race conditions.  */
-    virtual void disable();
-
-/*! @function enable
-    @abstract Enable command gate, this will unblock any blocked Commands and Actions.
-    @discussion  Enable the command gate.  The attemptAction/attemptCommand calls will now be enabled and can succeeed.  Stalled runCommand/runAction calls will be woken up. */
-    virtual void enable();
-
-/*! @function commandSleep  
-    @abstract Put a thread that is currently holding the command gate to sleep.
-    @discussion Put a thread to sleep waiting for an event but release the gate first.  If the event occurs or timeout occurs then the commandGate is closed before the function returns.
-    @param event Pointer to an address.
-	@param deadline Clock deadline to timeout the sleep.
-    @param interruptible THREAD_UNINT, THREAD_INTERRUPTIBLE or THREAD_ABORTSAFE.  THREAD_UNINT specifies that the sleep cannot be interrupted by a signal.  THREAD_INTERRUPTIBLE specifies that the sleep may be interrupted by a "kill -9" signal.  THREAD_ABORTSAFE specifies that the sleep may be interrupted by any user signal.
-    @result THREAD_AWAKENED - normal wakeup, THREAD_TIMED_OUT - timeout expired, THREAD_INTERRUPTED - interrupted, THREAD_RESTART - restart operation entirely, kIOReturnNotPermitted if the calling thread does not hold the command gate. */
-    virtual IOReturn commandSleep(void *event,
-								  AbsoluteTime deadline,
-                                  UInt32 interruptible);
-
-private:
-#if __LP64__
-    OSMetaClassDeclareReservedUnused(IOCommandGate, 0);
-#else
-    OSMetaClassDeclareReservedUsed(IOCommandGate, 0);
-#endif
-    OSMetaClassDeclareReservedUnused(IOCommandGate, 1);
-    OSMetaClassDeclareReservedUnused(IOCommandGate, 2);
-    OSMetaClassDeclareReservedUnused(IOCommandGate, 3);
-    OSMetaClassDeclareReservedUnused(IOCommandGate, 4);
-    OSMetaClassDeclareReservedUnused(IOCommandGate, 5);
-    OSMetaClassDeclareReservedUnused(IOCommandGate, 6);
-    OSMetaClassDeclareReservedUnused(IOCommandGate, 7);
-};
-
-#endif /* !_IOKIT_IOCOMMANDGATE_H */
diff --git a/i386/include/IOKit/IOCommandPool.h b/i386/include/IOKit/IOCommandPool.h
deleted file mode 100644
index 91069f3..0000000
--- a/i386/include/IOKit/IOCommandPool.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-/*
- *
- *	Copyright (c) 2000 Apple Computer, Inc.  All rights reserved.
- *
- *	HISTORY
- *
- *	2001-01-17	gvdl	Re-implement on IOCommandGate::commandSleep
- *	11/13/2000	CJS	Created IOCommandPool class and implementation
- *
- */
-
-/*!
- * @header IOCommandPool
- * @abstract
- * This header contains the IOCommandPool class definition.
- */
-
-#ifndef _IOKIT_IO_COMMAND_POOL_H_
-#define _IOKIT_IO_COMMAND_POOL_H_
-
-/*
- * Kernel
- */
-
-#if defined(KERNEL) && defined(__cplusplus)
-
-#include <kern/kern_types.h>
-#include <kern/queue.h>
-#include <IOKit/IOCommand.h>
-#include <IOKit/IOCommandGate.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOWorkLoop.h>
-
-/*!
- * @class IOCommandPool
- * @abstract Manipulates a pool of commands which inherit from IOCommand.
- * @discussion
- * The IOCommandPool class is used to manipulate a pool of commands which
- * inherit from IOCommand. It includes a factory method to create a pool
- * of a certain size. Once the factory method is invoked, the semaphore
- * is set to zero. The caller must then put commands in the pool by creating
- * the command (via the controller's factory method or a memory allocation)
- * and calling the returnCommand method with the newly created command as its
- * argument.
- */
-
-class IOCommandPool : public OSObject
-{
-	
-    OSDeclareDefaultStructors(IOCommandPool)
-    
-    
-protected:
-
-    queue_head_t fQueueHead;	/* head of the queue of elements available */
-    UInt32 fSleepers;		/* Count of threads sleeping on this pool */
-    IOCommandGate *fSerializer;	/* command gate used for serializing pool access */
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOEventSource in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-    /*!
-     * @const kIOCommandPoolDefaultSize
-     * @abstract The default size of any command pool.
-     * @discussion
-     * kIOCommandPoolDefaultSize is the default size of any command pool.
-     * The default size was determined to be the smallest size for which
-     * a pool makes sense.
-     */
-
-    static const UInt32 kIOCommandPoolDefaultSize = 2;
-    
-    /*
-     * Free all of this object's outstanding resources.
-     */
-
-    virtual void free(void);
-    
-    
-public:
-
-    /*!
-     * @function initWithWorkLoop
-     * @abstract Primary initializer for an IOCommandPool object.
-     * @discussion Primary initializer for an IOCommandPool.
-     * Should probably use IOCommandPool::withWorkLoop() as it is easier to use.
-     * @param inWorkLoop
-     * The workloop that this command pool should synchronize with.
-     * @result Returns true if command pool was successfully initialized.
-     */
-    virtual bool initWithWorkLoop(IOWorkLoop *workLoop);
-
-    /*!
-     * @function withWorkLoop
-     * @abstract Primary factory method for the IOCommandPool class
-     * @discussion
-     * The withWorkLoop method is what is known as a factory method. It creates
-     * a new instance of an IOCommandPool and returns a pointer to that object.
-     * @param inWorkLoop
-     * The workloop that this command pool should synchronize with.
-     * @result
-     * Returns a pointer to an instance of IOCommandPool if successful,
-     * otherwise NULL.
-     */
-
-    static IOCommandPool *withWorkLoop(IOWorkLoop *inWorkLoop);
-
-    /*!
-     * @function init
-     * @abstract Should never be used, obsolete. See initWithWorkLoop.
-     */
-    virtual bool init(IOService *inOwner,
-                      IOWorkLoop *inWorkLoop,
-                      UInt32 inSize = kIOCommandPoolDefaultSize);
-
-    /*!
-     * @function withWorkLoop
-     * @abstract Should never be used, obsolete. See IOCommandPool::withWorkLoop.
-     */
-    static IOCommandPool *commandPool(IOService *inOwner,
-                                        IOWorkLoop *inWorkLoop,
-                                        UInt32 inSize = kIOCommandPoolDefaultSize);
-    
-    
-    /*!
-     * @function getCommand
-     * @discussion The getCommand method is used to get a pointer to an object of type IOCommand from the pool.
-     * @param blockForCommand
-     * If the caller would like to have its thread slept until a command is
-     * available, it should pass true, else false.
-     * @result
-     * If the caller passes true in blockForCommand, getCommand guarantees that
-     * the result will be a pointer to an IOCommand object from the pool. If
-     * the caller passes false, s/he is responsible for checking whether a non-NULL
-     * pointer was returned.
-     */
-
-    virtual IOCommand *getCommand(bool blockForCommand = true);
-    
-    /*!
-     * @function returnCommand
-     * @discussion
-     * The returnCommand method is used to place an object of type IOCommand
-     * into the pool, whether it be the first time, or the 1000th time.
-     * @param commmand
-     * The command to place in the pool.
-     */
-    
-    virtual void returnCommand(IOCommand *command);
-    
-protected:
-    
-    /*!
-     * @function gatedGetCommand
-     * @discussion
-     * The gatedGetCommand method is used to serialize the extraction of a 
-     * command from the pool behind a command gate, runAction-ed by getCommand.
-     * @param vCommand
-     * A pointer to a pointer to an IOCommand object where the returned
-     * command will be stored.
-     * @param vBlock
-     * A bool that indicates whether to block the request until a command
-     * becomes available.
-     * @result
-     * Returns kIOReturnNoResources if no command is available and the client
-     * doesn't wish to block until one does become available.
-     * kIOReturnSuccess if the vCommand argument is valid.
-     */
-    virtual IOReturn gatedGetCommand(IOCommand **command, bool blockForCommand);
-    
-    /*!
-     * @function gatedReturnCommand
-     * @discussion
-     * The gatedReturnCommand method is used to serialize the return of a 
-     * command to the pool behind a command gate, runAction-ed by returnCommand.
-     * @param vCommand
-     * A pointer to the IOCommand object to be returned to the pool.
-     * @result
-     * Always returns kIOReturnSuccess if the vCommand argument is valid.
-     */
-    virtual IOReturn gatedReturnCommand(IOCommand *command);
-
-private:
-    OSMetaClassDeclareReservedUnused(IOCommandPool, 0);
-    OSMetaClassDeclareReservedUnused(IOCommandPool, 1);
-    OSMetaClassDeclareReservedUnused(IOCommandPool, 2);
-    OSMetaClassDeclareReservedUnused(IOCommandPool, 3);
-    OSMetaClassDeclareReservedUnused(IOCommandPool, 4);
-    OSMetaClassDeclareReservedUnused(IOCommandPool, 5);
-    OSMetaClassDeclareReservedUnused(IOCommandPool, 6);
-    OSMetaClassDeclareReservedUnused(IOCommandPool, 7);
-};
-
-#endif	/* defined(KERNEL) && defined(__cplusplus) */
-
-#endif	/* _IOKIT_IO_COMMAND_POOL_H_ */
diff --git a/i386/include/IOKit/IOConditionLock.h b/i386/include/IOKit/IOConditionLock.h
deleted file mode 100644
index f628fee..0000000
--- a/i386/include/IOKit/IOConditionLock.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1999 Apple Computer, Inc.  All rights reserved.
- * Copyright (c) 1994-1996 NeXT Software, Inc.  All rights reserved. 
- */
-
-#ifndef _IOKIT_IOCONDITIONLOCK_H
-#define _IOKIT_IOCONDITIONLOCK_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOLib.h>
-#include <IOKit/system.h>
-
-#include <IOKit/IOLocks.h>
-
-class IOConditionLock : public OSObject
-{
-    OSDeclareDefaultStructors(IOConditionLock)
-
-private:
-    IOLock *		cond_interlock;		// condition var Simple lock
-    volatile int	condition;
-
-    IOLock *		sleep_interlock;	// sleep lock Simple lock
-    unsigned char	interruptible;
-    volatile bool	want_lock;
-    volatile bool	waiting;
-
-public:
-    static IOConditionLock *withCondition(int condition, bool inIntr = true);
-    virtual bool initWithCondition(int condition, bool inIntr = true);
-    virtual void free();
-
-    virtual bool tryLock();	// acquire lock, no waiting
-    virtual int  lock();	// acquire lock (enter critical section)
-    virtual void unlock();	// release lock (leave critical section)
-
-    virtual bool getInterruptible() const;
-    virtual int  getCondition() const;
-    virtual int  setCondition(int condition);
-
-    virtual int  lockWhen(int condition); // acquire lock when condition
-    virtual void unlockWith(int condition); // set condition & release lock
-};
-
-#endif /* _IOKIT_IOCONDITIONLOCK_H */
diff --git a/i386/include/IOKit/IODMACommand.h b/i386/include/IOKit/IODMACommand.h
deleted file mode 100644
index a2a2852..0000000
--- a/i386/include/IOKit/IODMACommand.h
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IODMACOMMAND_H
-#define _IODMACOMMAND_H
-
-#include <IOKit/IOCommand.h>
-#include <IOKit/IOMemoryDescriptor.h>
-class IOMapper;
-
-/**************************** class IODMACommand ***************************/
-
-/*!
-    @class IODMACommand
-    @abstract A mechanism to convert memory references to I/O bus addresses.
-    @discussion The IODMACommand is supersedes the IOMemoryCursor and greatly enhances the functionality and power of it.  The command can be specified to output 64 bit physical addresses and also allows driver writers bypass mapping hardware or get addresses suitable for non-snooped DMA.
-<br><br>
-    The command is designed to be very easily subclassable.  Most driver writers need to associate some DMA operations with their memory descriptor and usually use a C structure for that purpose.  This structure is often kept in a linked list.  This IODMACommand has built it <kern/queue.h> linkage and can be derived and 'public:' variables added, giving the developer a structure that can associate a memory descriptor with a particular dma command but will also allow the developer to generate that command and keep the state necessary for tracking it.
-<br><br>
-    It is envisaged that a pool of IODMACommands will be created at driver initialisation and each command will be kept in an IOCommandPool while not in use.  However if developers wishes to maintain their own free lists that is certainly possible.  See the <kern/queue.h> and <xnu/iokit/Kernel/IOCommandPool> for sample code on manipulating the command's doubly linked list entries.
-<br><br>
-    The IODMACommand can be used in a 'weak-linked' manner.  To do this you must avoid using any static member functions.  Use the, much slower but safe, weakWithSpecification function.  On success a dma command instance will be returned.  This instance can then be used to clone as many commands as is needed.  Remember deriving from this class can not be done weakly, that is no weak subclassing!
-*/
-
-class IODMACommand : public IOCommand
-{
-    OSDeclareDefaultStructors(IODMACommand);
-
-friend class IODMAEventSource;
-
-public:
-
-/*!
-    @typedef Segment32
-    @discussion A 32 bit I/O bus address/length pair
-*/
-    struct Segment32 {
-	UInt32 fIOVMAddr, fLength;
-    };
-
-/*!
-    @typedef Segment64
-    @discussion A 64 bit I/O bus address/length pair
-*/
-    struct Segment64 {
-	UInt64 fIOVMAddr, fLength;
-    };
-
-/*! @enum MappingOptions
-    @abstract Mapping types to indicate the desired mapper type for translating memory descriptors into I/O DMA Bus addresses.
-    @constant kNonCoherent	Used by drivers for non-coherent transfers, implies unmapped memmory
-    @constant kMapped		Allow a driver to define addressing size
-    @constant kBypassed		Allow drivers to bypass any mapper
-    @constant kMaxMappingOptions	Internal use only
-*/
-    enum MappingOptions {
-	kMapped       = 0x00000000,
-	kBypassed     = 0x00000001,
-	kNonCoherent  = 0x00000002,
-	kTypeMask     = 0x0000000f,
-
-	kNoCacheStore = 0x00000010,	// Memory in descriptor 
-	kOnChip       = 0x00000020,	// Indicates DMA is on South Bridge
-	kIterateOnly  = 0x00000040	// DMACommand will be used as a cursor only
-    };
-
-/*! @enum SynchronizeOptions
-    @abstract Options for the synchronize method.
-    @constant kForceDoubleBuffer Copy the entire prepared range to a new page aligned buffer.
-*/
-    enum SynchronizeOptions {
-	kForceDoubleBuffer = 0x01000000
-    };
-
-/*!
-    @typedef SegmentFunction
-    @discussion Pointer to a C function that translates a 64 segment and outputs a single desired segment to the array at the requested index. There are a group of pre-implemented SegmentFunctions that may be usefull to the developer below.
-    @param segment The 64Bit I/O bus address and length.
-    @param segments Base of the output vector of DMA address length pairs.
-    @param segmentIndex Index to output 'segment' in the 'segments' array.
-    @result Returns true if segment encoding succeeded.  false may be returned if the current segment does not fit in an output segment, i.e. a 38bit address wont fit into a 32 encoding.
-*/
-    typedef bool (*SegmentFunction)(IODMACommand *target,
-	    			    Segment64 segment,
-				    void     *segments,
-				    UInt32    segmentIndex);
-
-    // -------------- Preimplemented output functions ----------------
-
-/*! @function OutputHost32
-    @abstract Output host natural Segment32 output segment function.
-*/
-    static bool OutputHost32(IODMACommand *target,
-	    Segment64 seg, void *segs, UInt32 ind);
-
-/*! @defined kIODMACommandOutputHost32
-    @abstract Output host natural Segment32 output segment function.
- */
-#define kIODMACommandOutputHost32   (IODMACommand::OutputHost32)
-
-/*! @function OutputBig32
-    @abstract Output big-endian Segment32 output segment function.
-*/
-    static bool OutputBig32(IODMACommand *target,
-	    Segment64 seg, void *segs, UInt32 ind);
-
-/*! @defined kIODMACommandOutputBig32
-    @abstract Output big-endian Segment32 output segment function.
- */
-#define kIODMACommandOutputBig32    (IODMACommand::OutputBig32)
-
-/*! @function OutputLittle32
-    @abstract Output little-endian Segment32 output segment function.
-*/
-    static bool OutputLittle32(IODMACommand *target,
-	    Segment64 seg, void *segs, UInt32 ind);
-
-/*! @defined kIODMACommandOutputLittle32
-    @abstract Output little-endian Segment32 output segment function.
-*/
-#define kIODMACommandOutputLittle32 (IODMACommand::OutputLittle32)
-
-/*! @function OutputHost64
-    @abstract Output host natural Segment64 output segment function.
-*/
-    static bool OutputHost64(IODMACommand *target,
-	    Segment64 seg, void *segs, UInt32 ind);
-
-/*! @defined kIODMACommandOutputHost64
-    @abstract Output host natural Segment64 output segment function.
-*/
-#define kIODMACommandOutputHost64   (IODMACommand::OutputHost64)
-
-/*! @function OutputBig64
-    @abstract Output big-endian Segment64 output segment function.
-*/
-    static bool OutputBig64(IODMACommand *target,
-	    Segment64 seg, void *segs, UInt32 ind);
-
-/*! @defined kIODMACommandOutputLittle64
-    @abstract Output little-endian Segment64 output segment function.
-*/
-#define kIODMACommandOutputBig64    (IODMACommand::OutputBig64)
-
-/*! @function OutputLittle64
-    @abstract Output little-endian Segment64 output segment function.
-*/
-    static bool OutputLittle64(IODMACommand *target,
-	    Segment64 seg, void *segs, UInt32 ind);
-
-/*! @defined kIODMACommandOutputBig64
-    @abstract Output big-endian Segment64 output segment function.
-*/
-#define kIODMACommandOutputLittle64 (IODMACommand::OutputLittle64)
-
-/*! @function withSpecification
-    @abstract Creates and initializes an IODMACommand in one operation.
-    @discussion Factory function to create and initialize an IODMACommand in one operation.
-    @param outSegFunc SegmentFunction to call to output one physical segment. A set of nine commonly required segment functions are provided.
-    @param numAddressBits Number of bits that the hardware uses on its internal address bus. Typically 32 but may be more on modern hardware.  A 0 implies no-restriction other than that implied by the output segment function.
-    @param maxSegmentSize Maximum allowable size for one segment.  If 0 is passed the maximum segment size is unlimited.
-    @param mappingOptions is the type of mapping that is required to translate an IOMemoryDescriptor into the desired number of bits.  For instance if your hardware only supports 32 bits but must run on machines with > 4G of RAM some mapping will be required.  Number of bits will be specified in numAddressBits, see below.This parameter can take 3 values:- kNonCoherent - used for non-coherent hardware transfers, Mapped - Validate that all I/O bus generated addresses are within the number of addressing bits specified, Bypassed indicates that bypassed addressing is required, this is used when the hardware transferes are into coherent memory but no mapping is required.  See also prepare() for failure cases.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restriction, in bytes, on I/O bus addresses.  Defaults to single byte alignment.
-    @param mapper For mapping types kMapped & kBypassed mapper is used to define the hardware that will perform the mapping, defaults to the system mapper.
-    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
-*/
-    static IODMACommand *
-	withSpecification(SegmentFunction  outSegFunc,
-			  UInt8            numAddressBits,
-			  UInt64           maxSegmentSize,
-			  MappingOptions   mappingOptions = kMapped,
-			  UInt64           maxTransferSize = 0,
-			  UInt32           alignment = 1,
-			  IOMapper        *mapper = 0,
-			  void            *refCon = 0);
-
-/*! @function weakWithSpecification
-    @abstract Creates and initialises an IODMACommand in one operation if this version of the operating system supports it.
-    @discussion Factory function to create and initialise an IODMACommand in one operation.  The function allows a developer to 'weak' link with IODMACommand.  This function will return kIOReturnUnsupported if the IODMACommand is unavailable.  This function is actually fairly slow so it will be better to call it once then clone the successfully create command using cloneCommand (q.v.).
-    @param newCommand Output reference variable of the newly created IODMACommand.
-    @param outSegFunc SegmentFunction to call to output one physical segment. A set of nine commonly required segment functions are provided.
-    @param numAddressBits Number of bits that the hardware uses on its internal address bus. Typically 32 but may be more on modern hardware.  A 0 implies no-restriction other than that implied by the output segment function.
-    @param maxSegmentSize Maximum allowable size for one segment. Zero is treated as an unlimited segment size.
-    @param mapType is the type of mapping that is required to translate an IOMemoryDescriptor into the desired number of bits.  For instance if your hardware only supports 32 bits but must run on machines with > 4G of RAM some mapping will be required.  Number of bits will be specified in numAddressBits, see below.  This parameter can take 3 values:- kNonCoherent - used for non-coherent hardware transfers, Mapped - Validate that all I/O bus generated addresses are within the number of addressing bits specified, Bypassed indicates that bypassed addressing is required, this is used when the hardware transfers are into coherent memory but no mapping is required.  See also prepare() for failure cases.
-    @param maxTransferSize Maximum size of an entire transfer.  Defaults to 0 indicating no maximum.
-    @param alignment Alignment restriction, in bytes, on I/O bus addresses.  Defaults to single byte alignment.
-    @param mapper For mapping types kMapped & kBypassed mapper is used to define the hardware that will perform the mapping, defaults to the system mapper.
-    @result kIOReturnSuccess if everything is OK, otherwise kIOReturnBadArgument if newCommand is NULL, kIOReturnUnsupported if the kernel doesn't export IODMACommand or IOReturnError if the new command fails to init, q.v. initWithSpecification.
-*/
-    // Note that the function has the attribute always_inline.
-    // The point of this function is to make a call into the kernel
-    // without generating an undefined symbol.  If the client could call
-    // the code as a function then the goal of no undefined symbols
-    // would be lost thus defeating the purpose.
-    static inline IOReturn weakWithSpecification
-	    (IODMACommand   **newCommand,
-	     SegmentFunction outSegFunc,
-	     UInt8           numAddressBits,
-	     UInt64          maxSegmentSize,
-	     MappingOptions  mapType = kMapped,
-	     UInt64          maxTransferSize = 0,
-	     UInt32          alignment = 1,
-	     IOMapper       *mapper = 0,
-	     void           *refCon = 0) __attribute__((always_inline));
-
-/*!
-    @function cloneCommand
-    @abstract Creates a new command based on the specification of the current one.
-    @discussion Factory function to create and initialise an IODMACommand in one operation.  The current command's specification will be duplicated in the new object, but however none of its state will be duplicated.  This means that it is safe to clone a command even if it is currently active and running, however you must be certain that the command to be duplicated does have a valid reference for the duration.
-    @result Returns a new memory cursor if successfully created and initialised, 0 otherwise.
-*/
-    virtual IODMACommand *cloneCommand(void *refCon = 0);
-
-/*! @function initWithSpecification
-    @abstract Primary initializer for the IODMACommand class. 
-    @param outSegFunc SegmentFunction to call to output one physical segment. A set of nine commonly required segment functions are provided.
-    @param numAddressBits Number of bits that the hardware uses on its internal address bus. Typically 32 but may be more on modern hardware.  A 0 implies no-restriction other than that implied by the output segment function.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0 which means any size.
-    @param mappingOptions is the type of mapping that is required to translate an IOMemoryDescriptor into the desired number of bits.  For instance if your hardware only supports 32 bits but must run on machines with > 4G of RAM some mapping will be required.  Number of bits will be specified in numAddressBits, see below.This parameter can take 3 values:- kNonCoherent - used for non-coherent hardware transfers, Mapped - Validate that all I/O bus generated addresses are within the number of addressing bits specified, Bypassed indicates that bypassed addressing is required, this is used when the hardware transferes are into coherent memory but no mapping is required.  See also prepare() for failure cases.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restriction, in bytes, on I/O bus addresses.  Defaults to single byte alignment.
-    @param mapper For mapping types kMapped & kBypassed mapper is used to define the hardware that will perform the mapping, defaults to the system mapper.
-    @result Can fail if the mapping type is not recognised, if one of the 3 mandatory parameters are set to 0, if a 32 bit output function is selected when more than 32 bits of address is required or, if kBypassed is requested on a machine that doesn't support bypassing.  Returns true otherwise.
-*/
-    virtual bool initWithSpecification( SegmentFunction  outSegFunc,
-					UInt8     numAddressBits,
-					UInt64    maxSegmentSize,
-					MappingOptions mappingOptions = kMapped,
-					UInt64    maxTransferSize = 0,
-					UInt32    alignment = 1,
-					IOMapper *mapper = 0,
-					void     *refCon = 0);
-
-/*! @function setMemoryDescriptor
-    @abstract Sets and resets the DMACommand's current memory descriptor
-    @discussion The DMA command will configure itself based on the information that it finds in the memory descriptor.  It looks for things like the direction of the memory descriptor and whether the current memory descriptor is already mapped into some IOMMU.  As a programmer convenience it can also prepare the memory descriptor immediately.  See prepare().  Note the IODMACommand is designed to used multiple times with a succession of memory descriptors, making the pooling of commands possible.  It is an error though to attempt to reset a currently prepared() DMA command.  Warning: This routine may block so never try to autoprepare an IODMACommand while in a gated context, i.e. one of the WorkLoops action call outs.
-    @param mem A pointer to the current I/Os memory descriptor.
-    @param autoPrepare An optional boolean variable that will call the prepare() function automatically after the memory descriptor is processed. Defaults to true.
-    @result Returns kIOReturnSuccess, kIOReturnBusy if currently prepared, kIOReturnNoSpace if the length(mem) >= Maximum Transfer Size or the error codes returned by prepare() (qv).
-*/
-    virtual IOReturn setMemoryDescriptor(const IOMemoryDescriptor *mem,
-				         bool autoPrepare = true);
-
-/*! @function clearMemoryDescriptor
-    @abstract Clears the DMACommand's current memory descriptor
-    @discussion completes and invalidates the cache if the DMA command is currently active, copies all data from bounce buffers if necessary and releases all resources acquired during setMemoryDescriptor.
-    @param autoComplete An optional boolean variable that will call the complete() function automatically before the memory descriptor is processed. Defaults to true.
-*/
-    virtual IOReturn clearMemoryDescriptor(bool autoComplete = true);
-
-/*! @function getMemoryDescriptor
-    @abstract Get the current memory descriptor
-*/
-    virtual const IOMemoryDescriptor *getMemoryDescriptor() const;
-
-/*! @function prepare
-    @abstract Prepare the memory for an I/O transfer.
-    @discussion Allocate the mapping resources neccessary for this transfer, specifying a sub range of the IOMemoryDescriptor that will be the target of the I/O.  The complete() method frees these resources.  Data may be copied to buffers for kIODirectionOut memory descriptors, depending on hardware mapping resource availabilty or alignment restrictions.  It should be noted that the this function may block and should only be called on the clients context, i.e never call this routine while gated; also the call itself is not thread safe though this should be an issue as each IODMACommand is independant.
-    @param offset defines the starting offset in the memory descriptor the DMA command will operate on. genIOVMSegments will produce its results based on the offset and length passed to the prepare method.
-    @param length defines the ending position in the memory descriptor the DMA command will operate on. genIOVMSegments will produce its results based on the offset and length passed to the prepare method.
-    @param flushCache Flush the caches for the memory descriptor and make certain that the memory cycles are complete.  Defaults to true for kNonCoherent and is ignored by the other types.
-    @param synchronize Copy any buffered data back from the target IOMemoryDescriptor.  Defaults to true, if synchronize() is being used to explicitly copy data, passing false may avoid an unneeded copy.
-    @result An IOReturn code. */
-
-    virtual IOReturn prepare(UInt64 offset = 0, UInt64 length = 0, bool flushCache = true, bool synchronize = true);
-
-/*! @function complete
-    @abstract Complete processing of DMA mappings after an I/O transfer is finished.
-    @discussion This method should not be called unless a prepare was previously issued; the prepare() and complete() must occur in pairs, before and after an I/O transfer
-    @param invalidCache Invalidate the caches for the memory descriptor.  Defaults to true for kNonCoherent and is ignored by the other types.
-    @param synchronize Copy any buffered data back to the target IOMemoryDescriptor.  Defaults to true, if synchronize() is being used to explicitly copy data, passing false may avoid an unneeded copy.
-    @result kIOReturnNotReady if not prepared, kIOReturnSuccess otherwise. */
-
-    virtual IOReturn complete(bool invalidateCache = true, bool synchronize = true);
-
-/*! @function synchronize
-    @abstract Bring IOMemoryDescriptor and IODMACommand buffers into sync.
-    @discussion This method should not be called unless a prepare was previously issued. If needed a caller may synchronize any IODMACommand buffers with the original IOMemoryDescriptor buffers.
-    @param options Specifies the direction of the copy:
-	kIODirectionOut copy IOMemoryDesciptor memory to any IODMACommand buffers. By default this action takes place automatically at prepare().
-	kIODirectionIn copy any IODMACommand buffers back to the IOMemoryDescriptor. By default this action takes place automatically at complete().
-        kForceDoubleBuffer copy the entire prepared range to a new page aligned buffer.
-    @result kIOReturnNotReady if not prepared, kIOReturnBadArgument if invalid options are passed, kIOReturnSuccess otherwise. */
-
-    virtual IOReturn synchronize(IOOptionBits options);
-
-/*! @function genIOVMSegments
-    @abstract Generates a physical scatter/gather for the current DMA command
-    @discussion Generates a list of physical segments from the given memory descriptor, relative to the current position of the descriptor.  The constraints that are set during initialisation will be respected. This function maintains the state across multiple calls for efficiency.  However the state is discarded if the new offset is not the expected one.
-    @param offset input/output parameter, defines the starting and ending offset in the memory descriptor, relative to any offset passed to the prepare() method.
-    @param segments Void pointer to base of output physical scatter/gather list.  Always passed directly onto the SegmentFunction.
-    @param numSegments Input/output parameter Number of segments that can fit in the segment array and returns number of segments generated.
-    @result kIOReturnSuccess on success, kIOReturnOverrun if the memory descriptor is exhausted, kIOReturnMessageTooLarge if the output segment function's address bits has insufficient resolution for a segment, kIOReturnNotReady if the DMA command has not be prepared, kIOReturnBadArgument if the DMA command doesn't have a memory descriptor yet or some of the parameters are NULL and kIOReturnNotReady if the DMA command is not prepared.
-*/
-    virtual IOReturn genIOVMSegments(UInt64 *offset,
-				     void   *segments,
-				     UInt32 *numSegments);
-
-private:
-    virtual UInt64 transfer( IOOptionBits transferOp, UInt64 offset, void * buffer, UInt64 length );
-
-public:
-
-/*! @function writeBytes
-    @abstract Copy data to the IODMACommand's buffer from the specified buffer.
-    @discussion This method copies data to the IODMACommand's memory at the given offset, from the caller's buffer. The IODMACommand must be prepared, and the offset is relative to the prepared offset.
-    @param offset A byte offset into the IODMACommand's memory, relative to the prepared offset.
-    @param bytes The caller supplied buffer to copy the data from.
-    @param length The length of the data to copy.
-    @result The number of bytes copied, zero will be returned if the specified offset is beyond the prepared length of the IODMACommand. */
-
-    UInt64 writeBytes(UInt64 offset, const void *bytes, UInt64 length);
-
-/*! @function readBytes
-    @abstract Copy data from the IODMACommand's buffer to the specified buffer.
-    @discussion This method copies data from the IODMACommand's memory at the given offset, to the caller's buffer. The IODMACommand must be prepared, and the offset is relative to the prepared offset.
-    @param offset A byte offset into the IODMACommand's memory, relative to the prepared offset.
-    @param bytes The caller supplied buffer to copy the data to.
-    @param length The length of the data to copy.
-    @result The number of bytes copied, zero will be returned if the specified offset is beyond the prepared length of the IODMACommand. */
-
-    UInt64 readBytes(UInt64 offset, void *bytes, UInt64 length);
-
-/*! @function gen32IOVMSegments
-    @abstract Helper function for a type checked call to genIOVMSegments(qv), for use with an IODMACommand set up with the output function kIODMACommandOutputHost32, kIODMACommandOutputBig32, or kIODMACommandOutputLittle32. If the output function of the IODMACommand is not a 32 bit function, results will be incorrect.
-*/
-    inline IOReturn gen32IOVMSegments(UInt64   *offset,
-				      Segment32 *segments,
-				      UInt32     *numSegments)
-    { return genIOVMSegments(offset, segments, numSegments); };
-
-/*! @function gen64IOVMSegments
-    @abstract Helper function for a type checked call to genIOVMSegments(qv), for use with an IODMACommand set up with the output function kIODMACommandOutputHost64, kIODMACommandOutputBig64, or kIODMACommandOutputLittle64. If the output function of the IODMACommand is not a 64 bit function, results will be incorrect.
-*/
-    inline IOReturn gen64IOVMSegments(UInt64    *offset,
-				      Segment64 *segments,
-				      UInt32    *numSegments)
-    { return genIOVMSegments(offset, segments, numSegments); };
-
-	IOReturn
-	genIOVMSegments(SegmentFunction segmentFunction,
-							UInt64 *offsetP,
-							void   *segmentsP,
-							UInt32 *numSegmentsP);
-	
-    virtual void free();
-
-private:
-    typedef IOReturn (*InternalSegmentFunction)(
-				    void         *reference,
-				    IODMACommand *target,
-				    Segment64     segment,
-				    void         *segments,
-				    UInt32        segmentIndex);
-
-    IOReturn genIOVMSegments(uint32_t op,
-				  InternalSegmentFunction outSegFunc,
-				  void   *reference,
-				  UInt64 *offsetP,
-				  void   *segmentsP,
-				  UInt32 *numSegmentsP);
-
-    static IOReturn clientOutputSegment(
-	    void *reference, IODMACommand *target,
-	    Segment64 segment, void *vSegList, UInt32 outSegIndex);
-	
-    static IOReturn segmentOp(
-			void         *reference,
-			IODMACommand *target,
-			Segment64     segment,
-			void         *segments,
-			UInt32        segmentIndex);
-    IOReturn walkAll(UInt8 op);
-
-public:
-
-/*! @function prepareWithSpecification
-    @abstract Prepare the memory for an I/O transfer with a new specification.
-    @discussion Allocate the mapping resources neccessary for this transfer, specifying a sub range of the IOMemoryDescriptor that will be the target of the I/O.  The complete() method frees these resources.  Data may be copied to buffers for kIODirectionOut memory descriptors, depending on hardware mapping resource availabilty or alignment restrictions.  It should be noted that the this function may block and should only be called on the clients context, i.e never call this routine while gated; also the call itself is not thread safe though this should be an issue as each IODMACommand is independant.
-    @param outSegFunc SegmentFunction to call to output one physical segment. A set of nine commonly required segment functions are provided.
-    @param numAddressBits Number of bits that the hardware uses on its internal address bus. Typically 32 but may be more on modern hardware.  A 0 implies no-restriction other than that implied by the output segment function.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0 which means any size.
-    @param mappingOptions is the type of mapping that is required to translate an IOMemoryDescriptor into the desired number of bits.  For instance if your hardware only supports 32 bits but must run on machines with > 4G of RAM some mapping will be required.  Number of bits will be specified in numAddressBits, see below.This parameter can take 3 values:- kNonCoherent - used for non-coherent hardware transfers, Mapped - Validate that all I/O bus generated addresses are within the number of addressing bits specified, Bypassed indicates that bypassed addressing is required, this is used when the hardware transferes are into coherent memory but no mapping is required.  See also prepare() for failure cases.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restriction, in bytes, on I/O bus addresses.  Defaults to single byte alignment.
-    @param mapper For mapping types kMapped & kBypassed mapper is used to define the hardware that will perform the mapping, defaults to the system mapper.
-    @param offset defines the starting offset in the memory descriptor the DMA command will operate on. genIOVMSegments will produce its results based on the offset and length passed to the prepare method.
-    @param length defines the ending position in the memory descriptor the DMA command will operate on. genIOVMSegments will produce its results based on the offset and length passed to the prepare method.
-    @param flushCache Flush the caches for the memory descriptor and make certain that the memory cycles are complete.  Defaults to true for kNonCoherent and is ignored by the other types.
-    @param synchronize Copy any buffered data back from the target IOMemoryDescriptor.  Defaults to true, if synchronize() is being used to explicitly copy data, passing false may avoid an unneeded copy.
-    @result An IOReturn code. Can fail if the mapping type is not recognised, if one of the 3 mandatory parameters are set to 0, if a 32 bit output function is selected when more than 32 bits of address is required or, if kBypassed is requested on a machine that doesn't support bypassing.
-*/
-
-    virtual IOReturn prepareWithSpecification(SegmentFunction	outSegFunc,
-					      UInt8		numAddressBits,
-					      UInt64		maxSegmentSize,
-					      MappingOptions	mappingOptions = kMapped,
-					      UInt64		maxTransferSize = 0,
-					      UInt32		alignment = 1,
-					      IOMapper		*mapper = 0,
-					      UInt64		offset = 0,
-					      UInt64		length = 0,
-					      bool		flushCache = true,
-					      bool		synchronize = true);
-
-    static IOReturn transferSegment(
-			void         *reference,
-			IODMACommand *target,
-			Segment64     segment,
-			void         *segments,
-			UInt32        segmentIndex);
-
-/*! @function getPreparedOffsetAndLength
-    @abstract Returns the offset and length into the target IOMemoryDescriptor of a prepared IODDMACommand.
-    @discussion If successfully prepared, returns the offset and length into the IOMemoryDescriptor. Will fail for an unprepared IODMACommand.
-    @param offset returns the starting offset in the memory descriptor the DMA command was prepared with. Pass NULL for don't care.
-    @param length returns the length in the memory descriptor the DMA command was prepared with. Pass NULL for don't care.
-    @result An IOReturn code. kIOReturnNotReady if the IODMACommand is not prepared. */
-
-    virtual IOReturn getPreparedOffsetAndLength(UInt64 * offset, UInt64 * length);
-
-	UInt8	 getNumAddressBits(void);
-	UInt32	 getAlignment(void);
-	
-private:
-    OSMetaClassDeclareReservedUsed(IODMACommand,  0);
-    OSMetaClassDeclareReservedUsed(IODMACommand,  1);
-    OSMetaClassDeclareReservedUsed(IODMACommand,  2);
-    OSMetaClassDeclareReservedUnused(IODMACommand,  3);
-    OSMetaClassDeclareReservedUnused(IODMACommand,  4);
-    OSMetaClassDeclareReservedUnused(IODMACommand,  5);
-    OSMetaClassDeclareReservedUnused(IODMACommand,  6);
-    OSMetaClassDeclareReservedUnused(IODMACommand,  7);
-    OSMetaClassDeclareReservedUnused(IODMACommand,  8);
-    OSMetaClassDeclareReservedUnused(IODMACommand,  9);
-    OSMetaClassDeclareReservedUnused(IODMACommand, 10);
-    OSMetaClassDeclareReservedUnused(IODMACommand, 11);
-    OSMetaClassDeclareReservedUnused(IODMACommand, 12);
-    OSMetaClassDeclareReservedUnused(IODMACommand, 13);
-    OSMetaClassDeclareReservedUnused(IODMACommand, 14);
-    OSMetaClassDeclareReservedUnused(IODMACommand, 15);
-
-public:
-/*! @var fRefCon Reference Constant, client defined publicly avialable */
-    void *fRefCon;
-
-protected:
-
-/*! @var fMaxSegmentSize Maximum size of one segment in a scatter/gather list */
-    UInt64  fMaxSegmentSize;
-
-/*! @var fMaxTransferSize
-    Maximum size of a transfer that this memory cursor is allowed to generate */
-    UInt64  fMaxTransferSize;
-
-/*! @var fBypassMask
-    Mask to be ored into the address to bypass the given iommu's mapping. */
-    UInt64  fBypassMask;
-
-/*! @var fMapper
-    Client defined mapper. */
-    IOMapper *fMapper;
-
-/*! @var fMemory
-    memory descriptor for current I/O. */
-    const IOMemoryDescriptor *fMemory;
-
-/*! @var fOutSeg The action method called when an event has been delivered */
-    SegmentFunction fOutSeg;
-
-/*! @var fAlignMask
-    Alignment restriction mask. */
-    UInt32  fAlignMask;
-
-/*! @var fNumAddressBits
-    Number of bits that the hardware can address */
-    UInt32 fNumAddressBits;
-
-/*! @var fNumSegments
-    Number of contiguous segments required for the current memory descriptor and desired mapping */
-    UInt32  fNumSegments;
-
-/*! @var fMappingOptions
-    What type of I/O virtual address mapping is required for this command */
-    MappingOptions  fMappingOptions;
-
-/*! @var fActive
-    fActive indicates that this DMA command is currently prepared and ready to go */
-    UInt32 fActive;
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    struct IODMACommandInternal * reserved;
-};
-
-IOReturn IODMACommand::
-weakWithSpecification(IODMACommand **newCommand,
-		      SegmentFunction  outSegFunc,
-		      UInt8     numAddressBits,
-		      UInt64    maxSegmentSize,
-		      MappingOptions mapType,
-		      UInt64    maxTransferSize,
-		      UInt32    alignment,
-		      IOMapper *mapper,
-		      void     *refCon) 
-{
-    if (!newCommand)
-	return kIOReturnBadArgument;
-
-    IODMACommand *self = (IODMACommand *)
-	OSMetaClass::allocClassWithName("IODMACommand");
-    if (!self)
-	return kIOReturnUnsupported;
-
-    IOReturn ret;
-    bool inited = self->
-	initWithSpecification(outSegFunc,
-			      numAddressBits, maxSegmentSize, mapType,
-			      maxTransferSize, alignment, mapper, refCon);
-    if (inited)
-	ret =  kIOReturnSuccess;
-    else {
-	self->release();
-	self = 0;
-	ret = kIOReturnError;
-    }
-
-    *newCommand = self;
-    return ret;
-};
-#endif /* !_IODMACOMMAND_H */
-
diff --git a/i386/include/IOKit/IODMAController.h b/i386/include/IOKit/IODMAController.h
deleted file mode 100644
index a8c1aed..0000000
--- a/i386/include/IOKit/IODMAController.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IODMACONTROLLER_H
-#define _IOKIT_IODMACONTROLLER_H
-
-#include <IOKit/IODMACommand.h>
-#include <IOKit/IODMAEventSource.h>
-#include <IOKit/IOService.h>
-
-class IODMAEventSource;
-
-class IODMAController : public IOService
-{
-  OSDeclareAbstractStructors(IODMAController);
-  
-  friend class IODMAEventSource;
-  
- private:
-  IOService       *_provider;
-  const OSSymbol  *_dmaControllerName;
-  
- protected:
-  virtual void registerDMAController(IOOptionBits options = 0);  
-  virtual IOReturn initDMAChannel(IOService *provider, IODMAEventSource *dmaES, UInt32 *dmaIndex, UInt32 reqIndex) = 0;
-  virtual IOReturn startDMACommand(UInt32 dmaIndex, IODMACommand *dmaCommand, IODirection direction,
-				   IOByteCount byteCount = 0, IOByteCount byteOffset = 0) = 0;
-  virtual IOReturn stopDMACommand(UInt32 dmaIndex, bool flush = false, uint64_t timeout = UINT64_MAX) = 0;
-  virtual void completeDMACommand(IODMAEventSource *dmaES, IODMACommand *dmaCommand);
-  virtual void notifyDMACommand(IODMAEventSource *dmaES, IODMACommand *dmaCommand, IOReturn status, IOByteCount actualByteCount);
-  virtual IOReturn queryDMACommand(UInt32 dmaIndex, IODMACommand **dmaCommand, IOByteCount *transferCount, bool waitForIdle = false) = 0;
-  virtual IOByteCount getFIFODepth(UInt32 dmaIndex) = 0;
-  
- public:
-  static const OSSymbol *createControllerName(UInt32 phandle);
-  static IODMAController *getController(IOService *provider, UInt32 dmaIndex);
-  
-  virtual bool start(IOService *provider);
-};
-
-
-#endif /* _IOKIT_IODMACONTROLLER_H */
diff --git a/i386/include/IOKit/IODMAEventSource.h b/i386/include/IOKit/IODMAEventSource.h
deleted file mode 100644
index 18a72de..0000000
--- a/i386/include/IOKit/IODMAEventSource.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IODMAEVENTSOURCE_H
-#define _IOKIT_IODMAEVENTSOURCE_H
-
-#include <IOKit/IOService.h>
-#include <IOKit/IODMACommand.h>
-#include <IOKit/IODMAController.h>
-#include <IOKit/IOEventSource.h>
-
-class IODMAController;
-
-class IODMAEventSource : public IOEventSource
-{
-  OSDeclareDefaultStructors(IODMAEventSource);
-  
-  friend class IODMAController;
-  
- public:
-  typedef void (*Action)(OSObject *owner, IODMAEventSource *dmaES, IODMACommand *dmaCommand, IOReturn status, IOByteCount actualByteCount);
-#define IODMAEventAction IODMAEventSource::Action
-  
- protected:
-  virtual void completeDMACommand(IODMACommand *dmaCommand);
-  virtual void notifyDMACommand(IODMACommand *dmaCommand, IOReturn status, IOByteCount actualByteCount);
-  
- public:
-  static IODMAEventSource *dmaEventSource(OSObject *owner,
-					  IOService *provider,
-					  Action completion = 0,
-					  Action notification = 0,
-					  UInt32 dmaIndex = 0);
-  
-  virtual IOReturn startDMACommand(IODMACommand *dmaCommand, IODirection direction, IOByteCount byteCount = 0, IOByteCount byteOffset = 0);
-  virtual IOReturn stopDMACommand(bool flush = false, uint64_t timeout = UINT64_MAX);
-  
-  virtual IOReturn queryDMACommand(IODMACommand **dmaCommand, IOByteCount *transferCount, bool waitForIdle = false);
-  virtual IOByteCount getFIFODepth();
-  
- private:
-  IOService       *dmaProvider;
-  IODMAController *dmaController;
-  UInt32          dmaIndex;
-  queue_head_t    dmaCommandsCompleted;
-  IOSimpleLock	  *dmaCommandsCompletedLock;
-  Action          dmaCompletionAction;
-  Action          dmaNotificationAction;
-  bool            dmaSynchBusy;
-  
-  virtual bool init(OSObject *owner,
-		    IOService *provider,
-		    Action completion = 0,
-		    Action notification = 0,
-		    UInt32 dmaIndex = 0);
-  virtual bool checkForWork(void);
-};
-
-#endif /* _IOKIT_IODMAEVENTSOURCE_H */
diff --git a/i386/include/IOKit/IODataQueue.h b/i386/include/IOKit/IODataQueue.h
deleted file mode 100644
index 458cb47..0000000
--- a/i386/include/IOKit/IODataQueue.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IODATAQUEUE_H
-#define _IOKIT_IODATAQUEUE_H
-
-#include <libkern/c++/OSObject.h>
-#include <libkern/OSTypes.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-typedef struct _IODataQueueMemory IODataQueueMemory;
-class IOMemoryDescriptor;
-
-struct _notifyMsg {
-    mach_msg_header_t h;
-};
-
-/*!
- * @class IODataQueue : public OSObject
- * @abstract A generic queue designed to pass data from the kernel to a user process.
- * @discussion The IODataQueue class is designed to allow kernel code to queue data to a user process.  IODataQueue objects are designed to be used in a single producer / single consumer situation.  As such, there are no locks on the data itself.  Because the kernel enqueue and user-space dequeue methods follow a strict set of guidelines, no locks are necessary to maintain the integrity of the data struct.
- *
- * <br>Each data entry can be variable sized, but the entire size of the queue data region (including overhead for each entry) must be specified up front.
- *
- * <br>In order for the IODataQueue instance to notify the user process that data is available, a notification mach port must be set.  When the queue is empty and a new entry is added, a message is sent to the specified port.
- *
- * <br>User client code exists in the IOKit framework that facilitates the creation of the receive notification port as well as the listen process for new data available notifications.
- *
- * <br>In order to make the data queue memory available to a user process, the method getMemoryDescriptor() must be used to get an IOMemoryDescriptor instance that can be mapped into a user process.  Typically, the clientMemoryForType() method on an IOUserClient instance will be used to request the IOMemoryDescriptor and then return it to be mapped into the user process.
- */
-class IODataQueue : public OSObject
-{
-    OSDeclareDefaultStructors(IODataQueue)
-
-protected:
-    IODataQueueMemory *	dataQueue;
-
-    void *		notifyMsg;
-
-    virtual void free();
-
-    /*!
-     * @function sendDataAvailableNotification
-     * @abstract Sends a dataAvailableNotification message to the specified mach port.
-     * @discussion This method sends a message to the mach port passed to setNotificationPort().  It is used to indicate that data is available in the queue.
-     */
-    virtual void sendDataAvailableNotification();
-
-public:
-    /*!
-     * @function withCapacity
-     * @abstract Static method that creates a new IODataQueue instance with the capacity specified in the size parameter.
-     * @discussion The actual size of the entire data queue memory region (to be shared into a user process) is equal to the capacity plus the IODataQueueMemory overhead.  This overhead value can be determined from the DATA_QUEUE_MEMORY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.  The size of the data queue memory region must include space for the overhead of each IODataQueueEntry.  This entry overhead can be determined from the DATA_QUEUE_ENTRY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.<br>  This method allocates a new IODataQueue instance and then calls initWithCapacity() with the given size parameter.  If the initWithCapacity() fails, the new instance is released and zero is returned.
-     * @param size The size of the data queue memory region.
-     * @result Returns the newly allocated IODataQueue instance.  Zero is returned on failure.
-     */
-    static IODataQueue *withCapacity(UInt32 size);
-
-    /*!
-     * @function withEntries
-     * @abstract Static method that creates a new IODataQueue instance with the specified number of entries of the given size.
-     * @discussion This method will create a new IODataQueue instance with enough capacity for numEntries of entrySize.  It does account for the IODataQueueEntry overhead for each entry.  Note that the numEntries and entrySize are simply used to determine the data region size.  They do not actually restrict the size of number of entries that can be added to the queue.<br>  This method allocates a new IODataQueue instance and then calls initWithEntries() with the given numEntries and entrySize parameters.  If the initWithEntries() fails, the new instance is released and zero is returned.
-     * @param numEntries Number of entries to allocate space for.
-     * @param entrySize Size of each entry.
-     * @result Reeturns the newly allocated IODataQueue instance.  Zero is returned on failure.
-     */
-    static IODataQueue *withEntries(UInt32 numEntries, UInt32 entrySize);
-
-    /*!
-     * @function initWithCapacity
-     * @abstract Initializes an IODataQueue instance with the capacity specified in the size parameter.
-     * @discussion The actual size of the entire data queue memory region (to be shared into a user process) is equal to the capacity plus the IODataQueueMemory overhead.  This overhead value can be determined from the DATA_QUEUE_MEMORY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.  The size of the data queue memory region must include space for the overhead of each IODataQueueEntry.  This entry overhead can be determined from the DATA_QUEUE_ENTRY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.
-     * @param size The size of the data queue memory region.
-     * @result Returns true on success and false on failure.
-     */
-    virtual Boolean initWithCapacity(UInt32 size);
-
-    /*!
-     * @function initWithEntries
-     * @abstract Initializes an IODataQueue instance with the specified number of entries of the given size.
-     * @discussion This method will initialize an IODataQueue instance with enough capacity for numEntries of entrySize.  It does account for the IODataQueueEntry overhead for each entry.  Note that the numEntries and entrySize are simply used to determine the data region size.  They do not actually restrict the size of number of entries that can be added to the queue.<br>  This method allocates a new IODataQueue instance and then calls initWithEntries() with the given numEntries and entrySize parameters.
-     * @param numEntries Number of entries to allocate space for.
-     * @param entrySize Size of each entry.
-     * @result Reeturns true on success and false on failure.
-     */
-    virtual Boolean initWithEntries(UInt32 numEntries, UInt32 entrySize);
-
-    /*!
-     * @function enqueue
-     * @abstract Enqueues a new entry on the queue.
-     * @discussion This method adds a new data entry of dataSize to the queue.  It sets the size parameter of the entry pointed to by the tail value and copies the memory pointed to by the data parameter in place in the queue.  Once that is done, it moves the tail to the next available location.  When attempting to add a new entry towards the end of the queue and there isn't enough space at the end, it wraps back to the beginning.<br>  If the queue is empty when a new entry is added, sendDataAvailableNotification() is called to send a message to the user process that data is now available.
-     * @param data Pointer to the data to be added to the queue.
-     * @param dataSize Size of the data pointed to by data.
-     * @result Returns true on success and false on failure.  Typically failure means that the queue is full.
-     */
-    virtual Boolean enqueue(void *data, UInt32 dataSize);
-
-    /*!
-     * @function setNotificationPort
-     * @abstract Creates a simple mach message targeting the mach port specified in port.
-     * @discussion This message is sent when data is added to an empty queue.  It is to notify a user process that new data has become available.
-     * @param port The mach port to target with the notification message.
-     */
-    virtual void setNotificationPort(mach_port_t port);
-
-    /*!
-     * @function getMemoryDescriptor
-     * @abstract Returns a memory descriptor covering the IODataQueueMemory region.
-     * @discussion The IOMemoryDescriptor instance returned by this method is intended to be mapped into a user process.  This is the memory region that the IODataQueueClient code operates on.
-     * @result Returns a newly allocated IOMemoryDescriptor for the IODataQueueMemory region.  Returns zero on failure.
-     */
-    virtual IOMemoryDescriptor *getMemoryDescriptor();
-};
-
-#endif /* _IOKIT_IODATAQUEUE_H */
diff --git a/i386/include/IOKit/IODataQueueShared.h b/i386/include/IOKit/IODataQueueShared.h
deleted file mode 100644
index 2fa0e9a..0000000
--- a/i386/include/IOKit/IODataQueueShared.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IODATAQUEUESHARED_H
-#define _IOKIT_IODATAQUEUESHARED_H
-
-#include <libkern/OSTypes.h>
-#include <mach/port.h>
-#include <mach/message.h>
-
-/*!
- * @typedef IODataQueueEntry
- * @abstract Represents an entry within the data queue
- * @discussion This is a variable sized struct.  The data field simply represents the start of the data region.  The size of the data region is stored in the size field.  The whole size of the specific entry is the size of a UInt32 plus the size of the data region.  
- * @field size The size of the following data region.
- * @field data Represents the beginning of the data region.  The address of the data field is a pointer to the start of the data region.
- */
-typedef struct _IODataQueueEntry{
-    UInt32  size;
-    UInt8   data[4];
-} IODataQueueEntry;
-
-/*!
- * @typedef IODataQueueMemory
- * @abstract A struct mapping to the header region of a data queue.
- * @discussion This struct is variable sized.  The struct represents the data queue header information plus a pointer to the actual data queue itself.  The size of the struct is the combined size of the header fields (3 * sizeof(UInt32)) plus the actual size of the queue region.  This size is stored in the queueSize field.
- * @field queueSize The size of the queue region pointed to by the queue field.
- * @field head The location of the queue head.  This field is represented as a byte offset from the beginning of the queue memory region.
- * @field tail The location of the queue tail.  This field is represented as a byte offset from the beginning of the queue memory region.
- * @field queue Represents the beginning of the queue memory region.  The size of the region pointed to by queue is stored in the queueSize field.
- */
-typedef struct _IODataQueueMemory {
-    UInt32            queueSize;
-    volatile UInt32   head;
-    volatile UInt32   tail;
-    IODataQueueEntry  queue[1];
-} IODataQueueMemory;
-
-/*!
- * @typedef IODataQueueAppendix
- * @abstract A struct mapping to the appendix region of a data queue.
- * @discussion This struct is variable sized dependent on the version.  The struct represents the data queue appendix information.
- * @field version The version of the queue appendix.
- * @field port The notification port associated with this queue.
- */
-typedef struct _IODataQueueAppendix {
-    UInt32            version;
-    mach_msg_header_t msgh;
-} IODataQueueAppendix;
-
-/*!
- * @defined DATA_QUEUE_ENTRY_HEADER_SIZE Represents the size of the data queue entry header independent of the actual size of the data in the entry.  This is the overhead of each entry in the queue.  The total size of an entry is equal to this value plus the size stored in the entry's size field (in IODataQueueEntry).
- */
-#define DATA_QUEUE_ENTRY_HEADER_SIZE (sizeof(IODataQueueEntry) - 4)
-
-/*!
- * @defined DATA_QUEUE_MEMORY_HEADER_SIZE Represents the size of the data queue memory header independent of the actual size of the queue data itself.  The total size of the queue memory is equal to this value plus the size of the queue appendix and the size of the queue data region which is stored in the queueSize field of IODataQueueMeory.
- */
-#define DATA_QUEUE_MEMORY_HEADER_SIZE (sizeof(IODataQueueMemory) - sizeof(IODataQueueEntry))
-
-/*!
- * @defined DATA_QUEUE_MEMORY_APPENDIX_SIZE Represents the size of the data queue memory appendix independent of the actual size of the queue data itself.  The total size of the queue memory is equal to this value plus the size of queue header and size of the queue data region which is stored in the queueSize field of IODataQueueMeory.
- */
-#define DATA_QUEUE_MEMORY_APPENDIX_SIZE (sizeof(IODataQueueAppendix))
-
-#endif /* _IOKIT_IODATAQUEUESHARED_H */
-
diff --git a/i386/include/IOKit/IODeviceMemory.h b/i386/include/IOKit/IODeviceMemory.h
deleted file mode 100644
index 0665efc..0000000
--- a/i386/include/IOKit/IODeviceMemory.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-#ifndef _IOKIT_IODEVICEMEMORY_H
-#define _IOKIT_IODEVICEMEMORY_H
-
-#include <IOKit/IOMemoryDescriptor.h>
-
-/*! @class IODeviceMemory
-    @abstract An IOMemoryDescriptor used for device physical memory ranges.
-    @discussion The IODeviceMemory class is a simple subclass of IOMemoryDescriptor that uses its methods to describe a single range of physical memory on a device. IODeviceMemory objects are usually looked up with IOService or IOPCIDevice accessors, and are created by memory-mapped bus families. IODeviceMemory implements only some factory methods in addition to the methods of IOMemoryDescriptor. 
-*/
-
-class IODeviceMemory : public IOMemoryDescriptor
-{
-    OSDeclareDefaultStructors(IODeviceMemory)
-
-public:
-
-/*! @struct InitElement
-    @field start First physical address in the range.
-    @field length Length of the range.
-    @field tag 32-bit value not interpreted by IODeviceMemory or IOMemoryDescriptor, for use by the bus family. */
-
-    struct InitElement {
-        IOPhysicalAddress	start;
-        IOPhysicalLength	length;
-        IOOptionBits 		tag;
-    };
-
-/*! @function arrayFromList
-    @abstract Constructs an OSArray of IODeviceMemory instances, each describing one physical range, and a tag value.
-    @discussion This method creates IODeviceMemory instances for each physical range passed in an IODeviceMemory::InitElement array. Each element consists of a physical address, length and tag value for the IODeviceMemory. The instances are returned as a created OSArray.
-    @param list An array of IODeviceMemory::InitElement structures.
-    @param count The number of elements in the list.
-    @result Returns a created OSArray of IODeviceMemory objects, to be released by the caller, or zero on failure. */
-
-    static OSArray *		arrayFromList(
-	InitElement		list[],
-	IOItemCount		count );
-
-/*! @function withRange
-    @abstract Constructs an IODeviceMemory instance, describing one physical range.
-    @discussion This method creates an IODeviceMemory instance for one physical range passed as a physical address and length. It just calls IOMemoryDescriptor::withPhysicalAddress.
-    @param address The physical address of the first byte in the memory.
-    @param withLength The length of memory.
-    @result Returns the created IODeviceMemory on success, to be released by the caller, or zero on failure. */
-
-    static IODeviceMemory *	withRange( 
-	IOPhysicalAddress	start,
-	IOPhysicalLength	length );
-
-/*! @function withSubRange
-    @abstract Constructs an IODeviceMemory instance, describing a subset of an existing IODeviceMemory range.
-    @discussion This method creates an IODeviceMemory instance for a subset of an existing IODeviceMemory range, passed as a physical address offset and length. It just calls IOMemoryDescriptor::withSubRange.
-    @param of The parent IODeviceMemory of which a subrange is to be used for the new descriptor, which will be retained by the subrange IODeviceMemory.
-    @param offset A byte offset into the parent's memory.
-    @param length The length of the subrange.
-    @result Returns the created IODeviceMemory on success, to be released by the caller, or zero on failure. */
-
-    static IODeviceMemory *	withSubRange( 
-	IODeviceMemory *	of,
-	IOPhysicalAddress	offset,
-	IOPhysicalLength	length );
-};
-
-#endif /* ! _IOKIT_IODEVICEMEMORY_H */
diff --git a/i386/include/IOKit/IODeviceTreeSupport.h b/i386/include/IOKit/IODeviceTreeSupport.h
deleted file mode 100644
index 15b5aa4..0000000
--- a/i386/include/IOKit/IODeviceTreeSupport.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-#ifndef _IOKIT_IODEVICETREE_H
-#define _IOKIT_IODEVICETREE_H
-
-#include <IOKit/IORegistryEntry.h>
-#include <libkern/c++/OSData.h>
-
-class IODeviceMemory;
-class IOService;
-
-extern const IORegistryPlane *	gIODTPlane;
-
-extern const OSSymbol *		gIODTPHandleKey;
-
-extern const OSSymbol *		gIODTCompatibleKey;
-extern const OSSymbol * 	gIODTTypeKey;
-extern const OSSymbol * 	gIODTModelKey;
-
-extern const OSSymbol *		gIODTAAPLInterruptsKey;
-extern const OSSymbol *		gIODTDefaultInterruptController;
-extern const OSSymbol *		gIODTNWInterruptMappingKey;
-
-IORegistryEntry * IODeviceTreeAlloc( void * dtTop );
-
-
-bool IODTMatchNubWithKeys( IORegistryEntry * nub,
-                                    const char * keys );
-
-bool IODTCompareNubName( const IORegistryEntry * regEntry,
-			 OSString * name, OSString ** matchingName );
-
-enum {
-    kIODTRecursive	= 0x00000001,
-    kIODTExclusive	= 0x00000002
-};
-
-OSCollectionIterator * IODTFindMatchingEntries( IORegistryEntry * from,
-			IOOptionBits options, const char * keys );
-
-typedef SInt32 (*IODTCompareAddressCellFunc)
-	(UInt32 cellCount, UInt32 left[], UInt32 right[]);
-typedef void (*IODTNVLocationFunc)
-	(IORegistryEntry * entry,
-	UInt8 * busNum, UInt8 * deviceNum, UInt8 * functionNum );
-
-void IODTSetResolving( IORegistryEntry * 	regEntry,
-		IODTCompareAddressCellFunc	compareFunc,
-		IODTNVLocationFunc		locationFunc );
-
-bool IODTResolveAddressCell( IORegistryEntry * regEntry,
-                             UInt32 cellsIn[],
-                             IOPhysicalAddress * phys, IOPhysicalLength * len );
-
-OSArray * IODTResolveAddressing( IORegistryEntry * regEntry,
-			const char * addressPropertyName,
-			IODeviceMemory * parent );
-
-struct IONVRAMDescriptor {
-    unsigned int format:4;
-    unsigned int marker:1;
-    unsigned int bridgeCount:3;
-    unsigned int busNum:2;
-    unsigned int bridgeDevices:6 * 5;
-    unsigned int functionNum:3;
-    unsigned int deviceNum:5;
-} __attribute__((aligned(2), packed));
-
-IOReturn IODTMakeNVDescriptor( IORegistryEntry * regEntry,
-				IONVRAMDescriptor * hdr );
-
-OSData * IODTFindSlotName( IORegistryEntry * regEntry, UInt32 deviceNumber );
-
-const OSSymbol * IODTInterruptControllerName(
-			IORegistryEntry * regEntry );
-
-bool IODTMapInterrupts( IORegistryEntry * regEntry );
-
-enum {
-    kIODTInterruptShared = 0x00000001
-};
-IOReturn IODTGetInterruptOptions( IORegistryEntry * regEntry, int source, IOOptionBits * options );
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-IOReturn IONDRVLibrariesInitialize( IOService * provider );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _IOKIT_IODEVICETREE_H */
-
diff --git a/i386/include/IOKit/IOEventSource.h b/i386/include/IOKit/IOEventSource.h
deleted file mode 100644
index 4afc5aa..0000000
--- a/i386/include/IOKit/IOEventSource.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
-Copyright (c) 1998 Apple Computer, Inc.	 All rights reserved.
-HISTORY
-    1998-7-13	Godfrey van der Linden(gvdl)
-	Created.
-    1998-10-30	Godfrey van der Linden(gvdl)
-	Converted to C++
-*/
-#ifndef _IOKIT_IOEVENTSOURCE_H
-#define _IOKIT_IOEVENTSOURCE_H
-
-#include <sys/cdefs.h>
-
-#include <libkern/c++/OSObject.h>
-
-#include <IOKit/IOLib.h>
-#include <IOKit/system.h>
-#include <IOKit/IOWorkLoop.h>
-
-
-__BEGIN_DECLS
-#include <mach/clock_types.h>
-#include <kern/clock.h>
-__END_DECLS
-
-/*!
-    @class IOEventSource : public OSObject
-    @abstract Abstract class for all work-loop event sources.
-    @discussion The IOEventSource declares the abstract super class that all
-event sources must inherit from if an IOWorkLoop is to receive events from them.
-<br><br>
-	An event source can represent any event that should cause the work-loop of a
-device to wake up and perform work.  Two examples of event sources are the
-IOInterruptEventSource which delivers interrupt notifications and IOCommandGate
-which delivers command requests.
-<br><br>
-	A kernel module can always use the work-loop model for serialising access to
-anything at all.  The IOEventSource is used for communicating events to the
-work-loop, and the chain of event sources should be used to walk the possible
-event sources and demultipex them.  Note a particular instance of an event
-source may only be a member of 1 linked list chain.  If you need to move it
-between chains than make sure it is removed from the original chain before
-attempting to move it.
-<br><br>
-	The IOEventSource makes no attempt to maintain the consitency of it's internal data across multi-threading.  It is assumed that the user of these basic tools will protect the data that these objects represent in some sort of device wide instance lock.	For example the IOWorkLoop maintains the event chain by handing off change request to its own thread and thus single threading access to its state.
-<br><br>
-	All subclasses of the IOEventSource are expected to implement the checkForWork() member function.
-
-<br><br>
-	checkForWork() is the key method in this class.	 It is called by some work-loop when convienient and is expected to evaluate it's internal state and determine if an event has occurred since the last call.  In the case of an event having occurred then the instance defined target(owner)/action will be called.	 The action is stored as an ordinary C function pointer but the first parameter is always the owner.  This means that a C++ member function can be used as an action function though this depends on the ABI.
-<br><br>
-	Although the eventChainNext variable contains a reference to the next event source in the chain this reference is not retained.  The list 'owner' i.e. the client that creates the event, not the work-loop, is expected to retain the source.
-*/
-class IOEventSource : public OSObject
-{
-    OSDeclareAbstractStructors(IOEventSource)
-    friend class IOWorkLoop;
-
-public:
-/*!
-    @typedef Action
-    @discussion Placeholder type for C++ function overloading discrimination.
-As the all event sources require an action and it has to be stored somewhere
-and be of some type, this is that type.
-    @param owner
-	Target of the function, can be used as a refcon.  The owner is set
-during initialisation.	 Note if a C++ function was specified this parameter
-is implicitly the first paramter in the target member function's parameter list.
-*/
-    typedef void (*Action)(OSObject *owner, ...);
-
-/*! @defined IOEventSourceAction
-    @discussion Backward compatibilty define for the old non-class scoped type definition.  See $link IOEventSource::Action */
- #define IOEventSourceAction IOEventSource::Action
-
-protected:
-/*! @var eventChainNext
-	The next event source in the event chain. nil at end of chain. */
-    IOEventSource *eventChainNext;
-
-/*! @var owner The owner object called when an event has been delivered. */
-    OSObject *owner;
-
-/*! @var action
-	The action method called when an event has been delivered */
-    Action action;
-
-/*! @var enabled
-	Is this event source enabled to deliver requests to the work-loop. */
-    bool enabled;
-
-/*! @var workLoop What is the work-loop for this event source. */
-    IOWorkLoop *workLoop;
-
-/*! @var refcon What ever the client wants to do, see $link setRefcon. */
-    void *refcon;
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOEventSource in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-/*! @function init
-    @abstract Primary initialiser for the IOEventSource class.
-    @param owner
-	Owner of this instance of an event source.  Used as the first parameter
-of the action callout.	Owner will generally be an OSObject it doesn't have to
-be as no member functions will be called directly in it.  It can just be a
-refcon for a client routine.
-    @param action
-	Pointer to C call out function.	 Action is a pointer to a C function
-that gets called when this event source has outstanding work.  It will usually
-be called by the checkForWork member function.	The first parameter of the
-action call out will always be the owner, this allows C++ member functions to
-be used as actions.  Defaults to 0.
-    @result true if the inherited classes and this instance initialise
-successfully.
-*/
-    virtual bool init(OSObject *owner, IOEventSource::Action action = 0);
-
-/*! @function checkForWork
-    @abstract Pure Virtual member function used by IOWorkLoop for work
-scheduling.
-    @discussion This function will be called to request a subclass to check
-it's internal state for any work to do and then to call out the owner/action.
-    @result Return true if this function needs to be called again before all its outstanding events have been processed.
-        */
-    virtual bool checkForWork() = 0;
-
-/*! @function setWorkLoop
-    @abstract Set'ter for $link workLoop variable.
-    @param workLoop
-	Target work-loop of this event source instance.	 A subclass of
-IOWorkLoop that at least reacts to signalWorkAvailable() and onThread functions. 
-*/
-    virtual void setWorkLoop(IOWorkLoop *workLoop);
-
-/*! @function setNext
-    @abstract Set'ter for $link eventChainNext variable.
-    @param next
-	Pointer to another IOEventSource instance.
-*/
-    virtual void setNext(IOEventSource *next);
-
-/*! @function getNext
-    @abstract Get'ter for $link eventChainNext variable.
-    @result value of eventChainNext.
-*/
-    virtual IOEventSource *getNext() const;
-
-
-protected:
-    // Methods to access the IOWorkLoop exported fields
-    void signalWorkAvailable();
-    void openGate();
-    void closeGate();
-    bool tryCloseGate();
-    int sleepGate(void *event, UInt32 type);
-	int sleepGate(void *event, AbsoluteTime deadline, UInt32 type);
-    void wakeupGate(void *event, bool oneThread);
-
-public:
-/*! @function setAction
-    @abstract Set'ter for $link action variable.
-    @param action Pointer to a C function of type IOEventSource::Action. */
-    virtual void setAction(IOEventSource::Action action);
-
-/*! @function getAction
-    @abstract Get'ter for $link action variable.
-    @result value of action. */
-    virtual IOEventSource::Action getAction() const;
-
-/*! @function enable
-    @abstract Enable event source.
-    @discussion A subclass implementation is expected to respect the enabled
-state when checkForWork is called.  Calling this function will cause the
-work-loop to be signalled so that a checkForWork is performed. */
-    virtual void enable();
-
-/*! @function disable
-    @abstract Disable event source.
-    @discussion A subclass implementation is expected to respect the enabled
-state when checkForWork is called. */
-    virtual void disable();
-
-/*! @function isEnabled
-    @abstract Get'ter for $link enable variable.
-    @result true if enabled. */
-    virtual bool isEnabled() const;
-
-/*! @function getWorkLoop
-    @abstract Get'ter for $link workLoop variable.
-    @result value of workLoop. */
-    virtual IOWorkLoop *getWorkLoop() const;
-
-/*! @function onThread
-    @abstract Convenience function for workLoop->onThread.
-    @result true if called on the work-loop thread.
-*/
-    virtual bool onThread() const;
-
-private:
-    OSMetaClassDeclareReservedUnused(IOEventSource, 0);
-    OSMetaClassDeclareReservedUnused(IOEventSource, 1);
-    OSMetaClassDeclareReservedUnused(IOEventSource, 2);
-    OSMetaClassDeclareReservedUnused(IOEventSource, 3);
-    OSMetaClassDeclareReservedUnused(IOEventSource, 4);
-    OSMetaClassDeclareReservedUnused(IOEventSource, 5);
-    OSMetaClassDeclareReservedUnused(IOEventSource, 6);
-    OSMetaClassDeclareReservedUnused(IOEventSource, 7);
-};
-
-#endif /* !_IOKIT_IOEVENTSOURCE_H */
diff --git a/i386/include/IOKit/IOFilterInterruptEventSource.h b/i386/include/IOKit/IOFilterInterruptEventSource.h
deleted file mode 100644
index de05c90..0000000
--- a/i386/include/IOKit/IOFilterInterruptEventSource.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
-Copyright (c) 1999 Apple Computer, Inc.	 All rights reserved.
-
-HISTORY
-    1999-4-15	Godfrey van der Linden(gvdl)
-	Created.
-*/
-#ifndef _IOKIT_IOFILTERINTERRUPTEVENTSOURCE_H
-#define _IOKIT_IOFILTERINTERRUPTEVENTSOURCE_H
-
-#include <IOKit/IOInterruptEventSource.h>
-
-class IOService;
-
-/*! @class IOFilterInterruptEventSource : public IOInterruptEventSource
-    @abstract Filtering varient of the $link IOInterruptEventSource.
-    @discussion An interrupt event source that calls the client to determine if a interrupt event needs to be scheduled on the work loop.  A filter interrupt event source call's the client in the primary interrupt context, the client can then interrogate its hardware and determine if the interrupt needs to be processed yet.
-<br><br>
-    As the routine is called in the primary interrupt context great care must be taken in the writing of this routine.  In general none of the generic IOKit environment is safe to call in this context.  We intend this routine to be used by hardware that can interrogate its registers without destroying state.  Primarily this variant of event sources will be used by drivers that share interrupts.  The filter routine will determine if the interrupt is a real interrupt or a ghost and thus optimise the work thread context switch away.
-<br><br>
-If you are implementing 'SoftDMA' (or pseudo-DMA), you may not want the I/O Kit to automatically start your interrupt handler routine on your work loop when your filter routine returns true.  In this case, you may choose to have your filter routine schedule the work on the work loop itself and then return false.  If you do this, the interrupt will not be disabled in hardware and you could receive additional primary interrupts before your work loop–level service routine completes.  Because this scheme has implications for synchronization between your filter routine and your interrupt service routine, you should avoid doing this unless your driver requires SoftDMA.
-<br><br>
-CAUTION:  Called in primary interrupt context, if you need to disable interrupt to guard you registers against an unexpected call then it is better to use a straight IOInterruptEventSource and its secondary interrupt delivery mechanism.
-*/
-class IOFilterInterruptEventSource : public IOInterruptEventSource
-{
-    OSDeclareDefaultStructors(IOFilterInterruptEventSource)
-
-public:
-/*!
-    @typedef Filter
-    @discussion C Function pointer to a routine to call when an interrupt occurs.
-    @param owner Pointer to the owning/client instance.
-    @param sender Where is the interrupt comming from.
-    @result false if this interrupt can be ignored. */
-    typedef bool (*Filter)(OSObject *, IOFilterInterruptEventSource *);
-
-/*! @defined IOFilterInterruptAction
-    @discussion Backward compatibilty define for the old non-class scoped type definition.  See $link IOFilterInterruptSource::Filter */
-#define IOFilterInterruptAction IOFilterInterruptEventSource::Filter
-
-private:
-    // Hide the superclass initializers
-    virtual bool init(OSObject *inOwner,
-		      IOInterruptEventSource::Action inAction = 0,
-		      IOService *inProvider = 0,
-		      int inIntIndex = 0);
-
-    static IOInterruptEventSource *
-	interruptEventSource(OSObject *inOwner,
-			     IOInterruptEventSource::Action inAction = 0,
-			     IOService *inProvider = 0,
-			     int inIntIndex = 0);
-
-protected:
-/*! @var filterAction Filter callout */
-    Filter filterAction;
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-public:
-/*! @function filterInterruptEventSource
-    @abstract Factor method to create and initialise an IOFilterInterruptEventSource.  See $link init.
-    @param owner Owner/client of this event source.
-    @param action 'C' Function to call when something happens.
-    @param filter 'C' Function to call when interrupt occurs.
-    @param provider Service that provides interrupts.
-    @param intIndex Defaults to 0.
-    @result a new event source if succesful, 0 otherwise.  */
-    static IOFilterInterruptEventSource *
-	filterInterruptEventSource(OSObject *owner,
-				   IOInterruptEventSource::Action action,
-				   Filter filter,
-				   IOService *provider,
-				   int intIndex = 0);
-
-/*! @function init
-    @abstract Primary initialiser for the IOFilterInterruptEventSource class.
-    @param owner Owner/client of this event source.
-    @param action 'C' Function to call when something happens.
-    @param filter 'C' Function to call in primary interrupt context.
-    @param provider Service that provides interrupts.
-    @param intIndex Interrupt source within provider.  Defaults to 0.
-    @result true if the inherited classes and this instance initialise
-successfully.  */
-    virtual bool init(OSObject *owner,
-		      IOInterruptEventSource::Action action,
-		      Filter filter,
-		      IOService *provider,
-		      int intIndex = 0);
-
-
-/*! @function signalInterrupt
-    @abstract Cause the work loop to schedule the action.
-    @discussion Cause the work loop to schedule the interrupt action even if the filter routine returns 'false'. Note well the interrupting condition MUST be cleared from the hardware otherwise an infinite process interrupt loop will occur.  Use this function when SoftDMA is desired.  See $link IOFilterInterruptSource::Filter */
-    virtual void signalInterrupt();
-
-/*! @function getFilterAction
-    @abstract Get'ter for filterAction variable.
-    @result value of filterAction. */
-    virtual Filter getFilterAction() const;
-
-/*! @function normalInterruptOccurred
-    @abstract Override $link IOInterruptEventSource::normalInterruptOccured to make a filter callout. */
-    virtual void normalInterruptOccurred(void *self, IOService *prov, int ind);
-
-/*! @function disableInterruptOccurred
-    @abstract Override $link IOInterruptEventSource::disableInterruptOccurred to make a filter callout. */
-    virtual void disableInterruptOccurred(void *self, IOService *prov, int ind);
-
-private:
-    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 0);
-    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 1);
-    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 2);
-    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 3);
-    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 4);
-    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 5);
-    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 6);
-    OSMetaClassDeclareReservedUnused(IOFilterInterruptEventSource, 7);
-};
-
-#endif /* !_IOKIT_IOFILTERINTERRUPTEVENTSOURCE_H */
diff --git a/i386/include/IOKit/IOInterleavedMemoryDescriptor.h b/i386/include/IOKit/IOInterleavedMemoryDescriptor.h
deleted file mode 100644
index e5c2a94..0000000
--- a/i386/include/IOKit/IOInterleavedMemoryDescriptor.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOINTERLEAVEDMEMORYDESCRIPTOR_H
-#define _IOINTERLEAVEDMEMORYDESCRIPTOR_H
-
-#include <IOKit/IOMemoryDescriptor.h>
-
-/*! @class IOInterleavedMemoryDescriptor : public IOMemoryDescriptor
-    @abstract The IOInterleavedMemoryDescriptor object describes a memory area made up of portions of several other IOMemoryDescriptors.
-    @discussion The IOInterleavedMemoryDescriptor object represents interleaved ranges of memory, specified as an ordered list of portions of individual IOMemoryDescriptors.  The portions are chained end-to-end to make up a single contiguous buffer. */
-
-class IOInterleavedMemoryDescriptor : public IOMemoryDescriptor
-{
-    OSDeclareDefaultStructors(IOInterleavedMemoryDescriptor);
-
-protected:
-
-    IOByteCount           _descriptorCapacity;
-    UInt32                _descriptorCount;
-    IOMemoryDescriptor ** _descriptors;
-    IOByteCount         * _descriptorOffsets;
-    IOByteCount         * _descriptorLengths;
-    bool                  _descriptorPrepared;
-
-    virtual void free();
-
-public:
-
-/*! @function withCapacity
-    @abstract Create an IOInterleavedMemoryDescriptor to describe a memory area made up of several other IOMemoryDescriptors.
-    @discussion This method creates and initializes an IOInterleavedMemoryDescriptor for memory consisting of portions of a number of other IOMemoryDescriptors, chained end-to-end (in the order they appear in the array) to represent a single contiguous memory buffer.
-    @param capacity The maximum number of IOMemoryDescriptors that may be subsequently added to this IOInterleavedMemoryDescriptor.
-    @param direction An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
-    @result The created IOInterleavedMemoryDescriptor on success, to be released by the caller, or zero on failure. */
-
-    static IOInterleavedMemoryDescriptor * withCapacity( IOByteCount	       capacity,
-                                                         IODirection           direction);
-
-/*! @function initWithCapacity
-    @abstract Initialize an IOInterleavedMemoryDescriptor to describe a memory area made up of several other IOMemoryDescriptors.
-    @discussion This method initializes an IOInterleavedMemoryDescriptor for memory consisting of portions of a number of other IOMemoryDescriptors, chained end-to-end (in the order they appear in the array) to represent a single contiguous memory buffer.
-    @param capacity The maximum number of IOMemoryDescriptors that may be subsequently added to this IOInterleavedMemoryDescriptor.
-    @param direction An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
-    @result The created IOInterleavedMemoryDescriptor on success, to be released by the caller, or zero on failure. */
-
-    virtual bool initWithCapacity( IOByteCount           capacity,
-                                   IODirection           direction );
-
-/*! @function clearMemoryDescriptors
-    @abstract Clear all of the IOMemoryDescriptors currently contained in and reset the IOInterleavedMemoryDescriptor.
-    @discussion Clears each IOMemoryDescriptor by completing (if needed) and releasing.  The IOInterleavedMemoryDescriptor is then reset and may accept new descriptors up to the capacity specified when it was created.
-    @param direction An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures. */
-
-    virtual void clearMemoryDescriptors( IODirection direction = kIODirectionNone );
-
-/*! @function setMemoryDescriptor
-    @abstract Add a portion of an IOMemoryDescriptor to the IOInterleavedMemoryDescriptor.
-    @discussion This method adds the portion of an IOMemoryDescriptor described by the offset and length parameters to the end of the IOInterleavedMemoryDescriptor.  A single IOMemoryDescriptor may be added as many times as there is room for it.  The offset and length must describe a portion entirely within the IOMemoryDescriptor.
-    @param descriptor An IOMemoryDescriptor to be added to the IOInterleavedMemoryDescriptor.  Its direction must be compatible with that of the IOInterleavedMemoryDescriptor.
-    @param offset The offset into the IOMemoryDescriptor of the portion that will be added to the virtualized buffer.
-    @param length The length of the portion of the IOMemoryDescriptor to be added to the virtualized buffer. 
-    @result Returns true the portion was successfully added. */
-
-    virtual bool setMemoryDescriptor( IOMemoryDescriptor * descriptor,
-                                      IOByteCount offset,
-                                      IOByteCount length );
-
-/*! @function getPhysicalSegment
-    @abstract Break a memory descriptor into its physically contiguous segments.
-    @discussion This method returns the physical address of the byte at the given offset into the memory, and optionally the length of the physically contiguous segment from that offset.
-    @param offset A byte offset into the memory whose physical address to return.
-    @param length If non-zero, getPhysicalSegment will store here the length of the physically contiguous segement at the given offset.
-    @result A physical address, or zero if the offset is beyond the length of the memory. */
-
-    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
-                                         IOByteCount * length,
-                                         IOOptionBits  options = 0 );
-
-/*! @function prepare
-    @abstract Prepare the memory for an I/O transfer.
-    @discussion This involves paging in the memory, if necessary, and wiring it down for the duration of the transfer.  The complete() method completes the processing of the memory after the I/O transfer finishes.  This method need not called for non-pageable memory.
-    @param forDirection The direction of the I/O to be performed, or kIODirectionNone for the direction specified by the memory descriptor.
-    @result An IOReturn code. */
-
-    virtual IOReturn prepare(IODirection forDirection = kIODirectionNone);
-
-/*! @function complete
-    @abstract Complete processing of the memory after an I/O transfer finishes.
-    @discussion This method should not be called unless a prepare was previously issued; the prepare() and complete() must occur in pairs, before and after an I/O transfer involving pageable memory.
-    @param forDirection The direction of the I/O just completed, or kIODirectionNone for the direction specified by the memory descriptor.
-    @result An IOReturn code. */
-
-    virtual IOReturn complete(IODirection forDirection = kIODirectionNone);
-};
-
-#endif /* !_IOINTERLEAVEDMEMORYDESCRIPTOR_H */
diff --git a/i386/include/IOKit/IOInterruptController.h b/i386/include/IOKit/IOInterruptController.h
deleted file mode 100644
index 71f55e5..0000000
--- a/i386/include/IOKit/IOInterruptController.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved.
- *
- *  DRI: Josh de Cesare
- *  
- */
-
-
-#ifndef _IOKIT_IOINTERRUPTCONTROLLER_H
-#define _IOKIT_IOINTERRUPTCONTROLLER_H
-
-#include <IOKit/IOLocks.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOInterrupts.h>
-
-
-class IOSharedInterruptController;
-
-struct IOInterruptVector {
-  volatile char               interruptActive;
-  volatile char               interruptDisabledSoft;
-  volatile char               interruptDisabledHard;
-  volatile char               interruptRegistered;
-  IOLock *                    interruptLock;
-  IOService *                 nub;
-  int                         source;
-  void *                      target;
-  IOInterruptHandler          handler;
-  void *                      refCon;
-  IOSharedInterruptController *sharedController;
-};
-
-typedef struct IOInterruptVector IOInterruptVector;
-
-#if __LP64__
-typedef int32_t IOInterruptVectorNumber;
-#else
-typedef long IOInterruptVectorNumber;
-#endif
-
-class IOInterruptController : public IOService
-{
-  OSDeclareAbstractStructors(IOInterruptController);
-
-protected:
-  IOInterruptVector *vectors;
-  IOSimpleLock      *controllerLock;
-
-  struct ExpansionData { };
-  ExpansionData *reserved;
-
-public:
-  virtual IOReturn registerInterrupt(IOService *nub, int source,
-				     void *target,
-				     IOInterruptHandler handler,
-				     void *refCon);
-  virtual IOReturn unregisterInterrupt(IOService *nub, int source);
-  
-  virtual IOReturn getInterruptType(IOService *nub, int source,
-				    int *interruptType);
-  
-  virtual IOReturn enableInterrupt(IOService *nub, int source);
-  virtual IOReturn disableInterrupt(IOService *nub, int source);
-  virtual IOReturn causeInterrupt(IOService *nub, int source);
-  
-  virtual IOInterruptAction getInterruptHandlerAddress(void);
-  virtual IOReturn handleInterrupt(void *refCon, IOService *nub,
-				   int source);
-  
-  // Methods to be overridden for simplifed interrupt controller subclasses.
-  
-  virtual bool vectorCanBeShared(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
-  virtual void initVector(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
-  virtual int  getVectorType(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
-  virtual void disableVectorHard(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
-  virtual void enableVector(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
-  virtual void causeVector(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
-
-  OSMetaClassDeclareReservedUnused(IOInterruptController, 0);
-  OSMetaClassDeclareReservedUnused(IOInterruptController, 1);
-  OSMetaClassDeclareReservedUnused(IOInterruptController, 2);
-  OSMetaClassDeclareReservedUnused(IOInterruptController, 3);
-  OSMetaClassDeclareReservedUnused(IOInterruptController, 4);
-  OSMetaClassDeclareReservedUnused(IOInterruptController, 5);
-};
-
-
-class IOSharedInterruptController : public IOInterruptController
-{
-  OSDeclareDefaultStructors(IOSharedInterruptController);
-  
-private:
-  IOService         *provider;
-  int               numVectors;
-  int               vectorsRegistered;
-  int               vectorsEnabled;
-  volatile int      controllerDisabled;
-  bool              sourceIsLevel;
-
-  struct ExpansionData { };
-  ExpansionData *reserved;
-
-public:
-  virtual IOReturn initInterruptController(IOInterruptController *parentController, OSData *parentSource);
-  
-  virtual IOReturn registerInterrupt(IOService *nub, int source,
-                                     void *target,
-                                     IOInterruptHandler handler,
-                                     void *refCon);
-  virtual IOReturn unregisterInterrupt(IOService *nub, int source);
-  
-  virtual IOReturn getInterruptType(IOService *nub, int source,
-				    int *interruptType);
-  
-  virtual IOReturn enableInterrupt(IOService *nub, int source);
-  virtual IOReturn disableInterrupt(IOService *nub, int source);
-  
-  virtual IOInterruptAction getInterruptHandlerAddress(void);
-  virtual IOReturn handleInterrupt(void *refCon, IOService *nub, int source);
-
-  OSMetaClassDeclareReservedUnused(IOSharedInterruptController, 0);
-  OSMetaClassDeclareReservedUnused(IOSharedInterruptController, 1);
-  OSMetaClassDeclareReservedUnused(IOSharedInterruptController, 2);
-  OSMetaClassDeclareReservedUnused(IOSharedInterruptController, 3);
-};
-
-
-#endif /* ! _IOKIT_IOINTERRUPTCONTROLLER_H */
diff --git a/i386/include/IOKit/IOInterruptEventSource.h b/i386/include/IOKit/IOInterruptEventSource.h
deleted file mode 100644
index 0be7caf..0000000
--- a/i386/include/IOKit/IOInterruptEventSource.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
-Copyright (c) 1998 Apple Computer, Inc.	 All rights reserved.
-
-HISTORY
-    1998-7-13	Godfrey van der Linden(gvdl)
-	Created.
-    1998-10-30	Godfrey van der Linden(gvdl)
-	Converted to C++
-*/
-
-#ifndef _IOKIT_IOINTERRUPTEVENTSOURCE_H
-#define _IOKIT_IOINTERRUPTEVENTSOURCE_H
-
-#include <IOKit/IOEventSource.h>
-
-class IOService;
-
-/*! @class IOInterruptEventSource : public IOEventSource
-    @abstract Event source for interrupt delivery to work-loop based drivers.
-    @discussion The IOInterruptEventSource is a generic object that delivers calls interrupt routines in it's client in a guaranteed single-threaded manner.  IOInterruptEventSource is part of the IOKit $link IOWorkLoop infrastructure where the semantic that one and only one action method is executing within a work-loops event chain.
-<br><br>
-When the action method is called in the client member function will receive 2 arguments, (IOEventSource *) sender and (int) count, See $link IOInterruptEventSource::Action.	Where sender will be reference to the interrupt that occurred and the count will be computed by the difference between the $link producerCount and $link consumerCount.  This number may not be reliable as no attempt is made to adjust for around the world type problems but is provided for general information and statistic gathering.
-<br><br>
-In general a client will use the factory member function to create and initialise the event source and then add it to their work-loop.  It is the work loop's responsiblity to maintain the new event source in it's event chain.  See $link IOWorkLoop.
-<br><br>
-An interrupt event source attaches itself to the given provider's interrupt source at initialisation time.  At this time it determines if it is connected to a level or edge triggered interrupt.  If the interrupt is an level triggered interrupt the event source automatically disables the interrupt source at primary interrupt time and after it call's the client it automatically reenables the interrupt.  This action is fairly expensive but it is 100% safe and defaults sensibly so that the driver writer does not have to implement type dependant interrupt routines.  So to repeat, the driver writer does not have to be concerned by the actual underlying interrupt mechanism as the event source hides the complexity.
-<br><br>
-Saying this if the hardware is a multi-device card, for instance a 4 port NIC, where all of the devices are sharing one level triggered interrupt AND it is possible to determine each port's interrupt state non-destructively then the $link IOFilterInterruptEventSource would be a better choice.
-<br><br>
-Warning:  All IOInterruptEventSources are created in the disabled state.  If you want to actually schedule interrupt delivery do not forget to enable the source.
-*/
-class IOInterruptEventSource : public IOEventSource
-{
-    OSDeclareDefaultStructors(IOInterruptEventSource)
-
-public:
-/*! @typedef Action
-    @discussion 'C' pointer prototype of functions that are called in a single threaded context when an interrupt occurs.
-    @param owner Pointer to client instance.
-    @param sender Pointer to generation interrupt event source.
-    @param count Number of interrupts seen before delivery. */
-    typedef void (*Action)(OSObject *, IOInterruptEventSource *, int count);
-
-/*! @defined IOInterruptEventAction
-    @discussion Backward compatibilty define for the old non-class scoped type definition.  See $link IOInterruptEventSource::Action */
-#define IOInterruptEventAction IOInterruptEventSource::Action
-
-protected:
-/*! @var provider IOService that provides interrupts for delivery. */
-    IOService *provider;
-
-/*! @var intIndex */
-    int intIndex;
-
-/*! @var producerCount
-    Current count of produced interrupts that have been received. */
-    volatile unsigned int producerCount;
-
-/*! @var consumerCount
-    Current count of produced interrupts that the owner has been informed of. */
-    unsigned int consumerCount;
-
-/*! @var autoDisable Do we need to automatically disable the interrupt source when we take an interrupt, i.e. we are level triggered. */
-    bool autoDisable;
-
-/*! @var explicitDisable Has the user expicitly disabled this event source, if so then do not overide their request when returning from the callout */
-    bool explicitDisable;
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-/*! @function free
-    @abstract Sub-class implementation of free method, disconnects from the interrupt source. */
-    virtual void free();
-
-/*! @function checkForWork
-    @abstract Pure Virtual member function used by IOWorkLoop for issueing a client calls.
-    @discussion This function called when the work-loop is ready to check for any work to do and then to call out the owner/action.
-    @result Return true if this function needs to be called again before all its outstanding events have been processed. */
-    virtual bool checkForWork();
-
-public:
-
-/*! @function interruptEventSource
-    @abstract Factory function for IOInterruptEventSources creation and initialisation.
-    @param owner Owning client of the new event source.
-    @param action 'C' Function to call when something happens.
-    @param provider IOService that represents the interrupt source.  Defaults to 0.  When no provider is defined the event source assumes that the client will in some manner call the interruptOccured method explicitly.  This will start the ball rolling for safe delivery of asynchronous event's into the driver.
-    @param intIndex The index of the interrupt within the provider's interrupt sources.  Defaults to 0, i.e. the first interrupt in the provider.
-    @result A new interrupt event source if successfully created and initialised, 0 otherwise.  */
-    static IOInterruptEventSource *
-	interruptEventSource(OSObject *owner,
-			     Action action,
-			     IOService *provider = 0,
-			     int intIndex = 0);
-
-/*! @function init
-    @abstract Primary initialiser for the IOInterruptEventSource class.
-    @param owner Owning client of the new event source.
-    @param action 'C' Function to call when something happens.
-    @param provider IOService that represents the interrupt source.  Defaults to 0.  When no provider is defined the event source assumes that the client will in some manner call the interruptOccured method explicitly.  This will start the ball rolling for safe delivery of asynchronous event's into the driver.
-    @param intIndex The index of the interrupt within the provider's interrupt sources.  Defaults to 0, i.e. the first interrupt in the provider.
-    @result true if the inherited classes and this instance initialise
-successfully.  */
-    virtual bool init(OSObject *owner,
-                      Action action,
-		      IOService *provider = 0,
-		      int intIndex = 0);
-
-/*! @function enable
-    @abstract Enable event source.
-    @discussion A subclass implementation is expected to respect the enabled
-state when checkForWork is called.  Calling this function will cause the
-work-loop to be signalled so that a checkForWork is performed. */
-    virtual void enable();
-
-/*! @function disable
-    @abstract Disable event source.
-    @discussion A subclass implementation is expected to respect the enabled
-state when checkForWork is called. */
-    virtual void disable();
-
-/*! @function getProvider
-    @abstract Get'ter for $link provider variable.
-    @result value of provider. */
-    virtual const IOService *getProvider() const;
-
-/*! @function getIntIndex
-    @abstract Get'ter for $link intIndex interrupt index variable.
-    @result value of intIndex. */
-    virtual int getIntIndex() const;
-
-/*! @function getAutoDisable
-    @abstract Get'ter for $link autoDisable variable.
-    @result value of autoDisable. */
-    virtual bool getAutoDisable() const;
-
-/*! @function interruptOccurred
-    @abstract Functions that get called by the interrupt controller. See $link IOService::registerInterrupt
-    @param nub Where did the interrupt originate from
-    @param ind What is this interrupts index within 'nub'. */
-    virtual void interruptOccurred(void *, IOService *nub, int ind);
-
-/*! @function normalInterruptOccurred
-    @abstract Functions that get called by the interrupt controller.See $link IOService::registerInterrupt
-    @param nub Where did the interrupt originate from
-    @param ind What is this interrupts index within 'nub'. */
-    virtual void normalInterruptOccurred(void *, IOService *nub, int ind);
-
-/*! @function disableInterruptOccurred
-    @abstract Functions that get called by the interrupt controller.See $link IOService::registerInterrupt
-    @param nub Where did the interrupt originate from
-    @param ind What is this interrupts index within 'nub'. */
-    virtual void disableInterruptOccurred(void *, IOService *nub, int ind);
-
-private:
-    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 0);
-    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 1);
-    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 2);
-    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 3);
-    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 4);
-    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 5);
-    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 6);
-    OSMetaClassDeclareReservedUnused(IOInterruptEventSource, 7);
-};
-
-#endif /* !_IOKIT_IOINTERRUPTEVENTSOURCE_H */
diff --git a/i386/include/IOKit/IOInterrupts.h b/i386/include/IOKit/IOInterrupts.h
deleted file mode 100644
index fa8aa7b..0000000
--- a/i386/include/IOKit/IOInterrupts.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
- *
- *  DRI: Josh de Cesare
- *
- */
-
-
-#ifndef _IOKIT_IOINTERRUPTS_H
-#define _IOKIT_IOINTERRUPTS_H
-
-#define kIOInterruptTypeEdge  (0)
-#define kIOInterruptTypeLevel (1)
-
-#ifdef __cplusplus
-
-class OSData;
-class IOInterruptController;
-
-struct IOInterruptSource {
-  IOInterruptController *interruptController;
-  OSData                *vectorData;
-};
-typedef struct IOInterruptSource IOInterruptSource;
-
-#endif /* __cplusplus */
-
-typedef void (*IOInterruptHandler)(void *target, void *refCon,
-				   void *nub, int source);
-
-#endif /* ! _IOKIT_IOINTERRUPTS_H */
diff --git a/i386/include/IOKit/IOKitDebug.h b/i386/include/IOKit/IOKitDebug.h
deleted file mode 100644
index 499faa3..0000000
--- a/i386/include/IOKit/IOKitDebug.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOKITDEBUG_H
-#define _IOKIT_IOKITDEBUG_H
-
-#include <IOKit/IOTypes.h>
-
-
-#ifdef __cplusplus
-
-#include <libkern/c++/OSObject.h>
-#include <libkern/c++/OSDictionary.h>
-#include <libkern/c++/OSSerialize.h>
-
-class IOKitDiagnostics : public OSObject
-{
-    OSDeclareDefaultStructors(IOKitDiagnostics)
-
-public:
-    static OSObject * diagnostics( void );
-    virtual bool serialize(OSSerialize *s) const;
-private:
-    static void updateOffset( OSDictionary * dict,
-            UInt32 value, const char * name );
-};
-
-#endif /* __cplusplus */
-
-enum {
-    // loggage
-    kIOLogAttach        =         0x00000001ULL,
-    kIOLogProbe         =         0x00000002ULL,
-    kIOLogStart         =         0x00000004ULL,
-    kIOLogRegister      =         0x00000008ULL,
-    kIOLogMatch         =         0x00000010ULL,
-    kIOLogConfig        =         0x00000020ULL,
-    kIOLogYield         =         0x00000040ULL,
-    kIOLogPower         =         0x00000080ULL,
-    kIOLogMapping       =         0x00000100ULL,
-    kIOLogCatalogue     =         0x00000200ULL,
-    kIOLogTracePower    =         0x00000400ULL,
-    kIOLogDebugPower    =         0x00000800ULL,
-    kIOLogServiceTree   =         0x00001000ULL,
-    kIOLogDTree         =         0x00002000ULL,
-    kIOLogMemory        =         0x00004000ULL,
-    kIOLogKextMemory    =         0x00008000ULL,
-    kOSLogRegistryMods  =         0x00010000ULL,  // Log attempts to modify registry collections
-    kIOLogPMRootDomain  =         0x00020000ULL,
-    kOSRegistryModsMode =         0x00040000ULL,  // Change default registry modification handling - panic vs. log
-    kIOTraceIOService   =         0x00080000ULL,
-    kIOLogHibernate     =         0x00100000ULL,
-
-    // debug aids - change behaviour
-    kIONoFreeObjects    =         0x00100000ULL,
-    kIOLogSynchronous   =         0x00200000ULL,  // IOLog completes synchronously
-    kOSTraceObjectAlloc =         0x00400000ULL,
-
-    _kIODebugTopFlag    = 0x8000000000000000ULL   // force enum to be 64 bits
-};
-
-extern SInt64    gIOKitDebug;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct IORegistryPlane;
-extern void    IOPrintPlane( const struct IORegistryPlane * plane );
-#ifndef _OSCPPDEBUG_H
-extern void    OSPrintMemory( void );
-#endif
-#define IOPrintMemory OSPrintMemory
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* ! _IOKIT_IOKITDEBUG_H */
diff --git a/i386/include/IOKit/IOKitKeys.h b/i386/include/IOKit/IOKitKeys.h
deleted file mode 100644
index 62395d5..0000000
--- a/i386/include/IOKit/IOKitKeys.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
- *
- * Common symbol definitions for IOKit. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOKITKEYS_H
-#define _IOKIT_IOKITKEYS_H
-
-// properties found in the registry root
-#define kIOKitBuildVersionKey		"IOKitBuildVersion"
-#define kIOKitDiagnosticsKey		"IOKitDiagnostics"
-	// a dictionary keyed by plane name
-#define kIORegistryPlanesKey		"IORegistryPlanes"
-#define kIOCatalogueKey			"IOCatalogue"
-
-// registry plane names
-#define kIOServicePlane			"IOService"
-#define kIOPowerPlane			"IOPower"
-#define kIODeviceTreePlane		"IODeviceTree"
-#define kIOAudioPlane			"IOAudio"
-#define kIOFireWirePlane		"IOFireWire"
-#define kIOUSBPlane			"IOUSB"
-
-// registry ID number
-#define kIORegistryEntryIDKey		"IORegistryEntryID"
-
-// IOService class name
-#define kIOServiceClass			"IOService"
-
-// IOResources class name
-#define kIOResourcesClass		"IOResources"
-
-// IOService driver probing property names
-#define kIOClassKey			"IOClass"
-#define kIOProbeScoreKey		"IOProbeScore"
-#define kIOKitDebugKey			"IOKitDebug"
-
-// IOService matching property names
-#define kIOProviderClassKey		"IOProviderClass"
-#define kIONameMatchKey			"IONameMatch"
-#define kIOPropertyMatchKey		"IOPropertyMatch"
-#define kIOPathMatchKey			"IOPathMatch"
-#define kIOLocationMatchKey		"IOLocationMatch"
-#define kIOParentMatchKey		"IOParentMatch"
-#define kIOResourceMatchKey		"IOResourceMatch"
-#define kIOMatchedServiceCountKey	"IOMatchedServiceCountMatch"
-
-#define kIONameMatchedKey		"IONameMatched"
-
-#define kIOMatchCategoryKey		"IOMatchCategory"
-#define kIODefaultMatchCategoryKey	"IODefaultMatchCategory"
-
-// IOService default user client class, for loadable user clients
-#define kIOUserClientClassKey		"IOUserClientClass"
-
-// key to find IOMappers
-#define kIOMapperIDKey				"IOMapperID"
-
-#define kIOUserClientCrossEndianKey		"IOUserClientCrossEndian"
-#define kIOUserClientCrossEndianCompatibleKey	"IOUserClientCrossEndianCompatible"
-#define kIOUserClientSharedInstanceKey		"IOUserClientSharedInstance"
-// diagnostic string describing the creating task
-#define kIOUserClientCreatorKey		"IOUserClientCreator"
-
-// IOService notification types
-#define kIOPublishNotification		"IOServicePublish"
-#define kIOFirstPublishNotification	"IOServiceFirstPublish"
-#define kIOMatchedNotification		"IOServiceMatched"
-#define kIOFirstMatchNotification	"IOServiceFirstMatch"
-#define kIOTerminatedNotification	"IOServiceTerminate"
-
-// IOService interest notification types
-#define kIOGeneralInterest		"IOGeneralInterest"
-#define kIOBusyInterest			"IOBusyInterest"
-#define kIOAppPowerStateInterest	"IOAppPowerStateInterest"
-#define kIOPriorityPowerStateInterest	"IOPriorityPowerStateInterest"
-
-#define kIOPlatformDeviceMessageKey     "IOPlatformDeviceMessage"
-
-// IOService interest notification types
-#define kIOCFPlugInTypesKey		"IOCFPlugInTypes"
-
-// properties found in services that implement command pooling
-#define kIOCommandPoolSizeKey	       "IOCommandPoolSize"          // (OSNumber)
-
-// properties found in services that have transfer constraints
-#define kIOMaximumBlockCountReadKey             "IOMaximumBlockCountRead"             // (OSNumber)
-#define kIOMaximumBlockCountWriteKey            "IOMaximumBlockCountWrite"            // (OSNumber)
-#define kIOMaximumByteCountReadKey              "IOMaximumByteCountRead"              // (OSNumber)
-#define kIOMaximumByteCountWriteKey             "IOMaximumByteCountWrite"             // (OSNumber)
-#define kIOMaximumSegmentCountReadKey           "IOMaximumSegmentCountRead"           // (OSNumber)
-#define kIOMaximumSegmentCountWriteKey          "IOMaximumSegmentCountWrite"          // (OSNumber)
-#define kIOMaximumSegmentByteCountReadKey       "IOMaximumSegmentByteCountRead"       // (OSNumber)
-#define kIOMaximumSegmentByteCountWriteKey      "IOMaximumSegmentByteCountWrite"      // (OSNumber)
-#define kIOMinimumSegmentAlignmentByteCountKey  "IOMinimumSegmentAlignmentByteCount"  // (OSNumber)
-#define kIOMaximumSegmentAddressableBitCountKey "IOMaximumSegmentAddressableBitCount" // (OSNumber)
-
-// properties found in services that wish to describe an icon
-//
-// IOIcon = 
-// {
-//     CFBundleIdentifier   = "com.example.driver.example";
-//     IOBundleResourceFile = "example.icns";
-// };
-//
-// where IOBundleResourceFile is the filename of the resource
-
-#define kIOIconKey               "IOIcon"               // (OSDictionary)
-#define kIOBundleResourceFileKey "IOBundleResourceFile" // (OSString)
-
-#define kIOBusBadgeKey           "IOBusBadge"           // (OSDictionary)
-#define kIODeviceIconKey         "IODeviceIcon"         // (OSDictionary)
-
-// property of root that describes the machine's serial number as a string
-#define kIOPlatformSerialNumberKey	"IOPlatformSerialNumber"	// (OSString)
-
-// property of root that describes the machine's UUID as a string
-#define kIOPlatformUUIDKey	"IOPlatformUUID"	// (OSString)
-
-// IODTNVRAM property keys
-#define kIONVRAMDeletePropertyKey	"IONVRAM-DELETE-PROPERTY"
-#define kIODTNVRAMPanicInfoKey		"aapl,panic-info"
-
-// keys for complex boot information
-#define kIOBootDeviceKey          "IOBootDevice"		// dict | array of dicts
-#define kIOBootDevicePathKey      "IOBootDevicePath"	// arch-neutral OSString
-#define kIOBootDeviceSizeKey      "IOBootDeviceSize"	// OSNumber of bytes
-
-// keys for OS Version information
-#define kOSBuildVersionKey		"OS Build Version"
-
-#endif /* ! _IOKIT_IOKITKEYS_H */
diff --git a/i386/include/IOKit/IOKitServer.h b/i386/include/IOKit/IOKitServer.h
deleted file mode 100644
index a68c992..0000000
--- a/i386/include/IOKit/IOKitServer.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-/*
- * Internal definitions used between the iokit user library and
- * server routines.
- */
-
-#ifndef _IOKIT_IOKITSERVER_H
-#define _IOKIT_IOKITSERVER_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOKitKeys.h>
-#include <IOKit/OSMessageNotification.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <mach/kmod.h>
-#ifdef __cplusplus
-}
-#endif
-
-// IOMakeMatching
-/*!
-    @enum IOMakeMatching
-    @constant kIOServiceMatching
-    @constant kIOBSDNameMatching
-    @constant kIOOFPathMatching
-*/
-enum {
-    kIOServiceMatching		= 100,
-    kIOBSDNameMatching		= 101,
-    kIOOFPathMatching		= 102
-};
-
-// IOCatalogueSendData
-/*!
-    @enum IOCatalogueSendData user-client flags.
-    @constant kIOCatalogAddDrivers  Signals a call to the addDrivers function in IOCatalogue.
-    @constant kIOCatalogAddDriversNoMatch  Signals a call to the addDrivers function in IOCatalogue but does not start a matching thread.
-    @constant kIOCatalogRemoveDrivers  Signals a call to the removeDrivers function in IOCatalogue.
-    @constant kIOCatalogRemoveDriversNoMatch  Signals a call to the removedrivers function in IOCatalogue but does not start a matching thread. 
-    @constant kIOCatalogStartMatching  Signals the IOCatalogue to start an IOService matching thread.
-*/
-enum {
-    kIOCatalogAddDrivers	= 1,
-    kIOCatalogAddDriversNoMatch,
-    kIOCatalogRemoveDrivers,
-    kIOCatalogRemoveDriversNoMatch,
-    kIOCatalogStartMatching,
-    kIOCatalogRemoveKernelLinker,
-    kIOCatalogKextdActive,
-    kIOCatalogKextdFinishedLaunching
-};
-
-// IOCatalogueGetData
-/*!
-    @enum IOCatalogueGetData user-client flags
-    @constant kIOCatalogGetContents  Returns a snapshot of the database to the caller.
-*/
-enum {
-    kIOCatalogGetContents	  = 1,
-    kIOCatalogGetModuleDemandList = 2,
-    kIOCatalogGetCacheMissList	  = 3,
-    kIOCatalogGetROMMkextList     = 4
-};
-
-// IOCatalogueReset
-/*!
-    @enum IOCatalogueReset user-client flag
-    @constant kIOCatalogResetDefault  Removes all entries from IOCatalogue except those used for booting the system.
-*/
-enum {
-    kIOCatalogResetDefault	= 1
-};
-
-// IOCatalogueTerminate
-/*!
-    @enum IOCatalogueTerminate user-client flags.
-    @constant kIOCatalogModuleUnload Terminates all services which depend on a particular module and unloads the module.
-    @constant kIOCatalogModuleTerminate Terminates all services which depend on a particular module but does not unload the module.
-    @constant kIOCatalogServiceTerminate Terminates a particular service by name.
-*/
-enum {
-    kIOCatalogModuleUnload      = 1,
-    kIOCatalogModuleTerminate,
-    kIOCatalogServiceTerminate
-};
-
-#endif /* ! _IOKIT_IOKITSERVER_H */
-
diff --git a/i386/include/IOKit/IOLib.h b/i386/include/IOKit/IOLib.h
deleted file mode 100644
index 1eb5562..0000000
--- a/i386/include/IOKit/IOLib.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-#ifndef __IOKIT_IOLIB_H
-#define __IOKIT_IOLIB_H
-
-
-#include <stdarg.h>
-#include <sys/cdefs.h>
-
-#include <sys/appleapiopts.h>
-
-#include <IOKit/system.h>
-
-#include <IOKit/IOReturn.h>
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOLocks.h>
-
-#include <libkern/OSAtomic.h>
-
-__BEGIN_DECLS
-
-#include <kern/thread_call.h>
-#include <kern/clock.h>
-
-/*
- * min/max macros.
- */
-
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#define max(a,b) ((a) > (b) ? (a) : (b))
-
-/*
- * These are opaque to the user.
- */
-typedef thread_t IOThread;
-typedef void (*IOThreadFunc)(void *argument);
-
-
-/*
- * IORound and IOTrunc convenience functions, in the spirit
- * of vm's round_page() and trunc_page().
- */
-#define IORound(value,multiple) \
-        ((((value) + (multiple) - 1) / (multiple)) * (multiple))
-
-#define IOTrunc(value,multiple) \
-        (((value) / (multiple)) * (multiple));
-
-__END_DECLS
-
-#endif /* !__IOKIT_IOLIB_H */
diff --git a/i386/include/IOKit/IOLocks.h b/i386/include/IOKit/IOLocks.h
deleted file mode 100644
index 81701a0..0000000
--- a/i386/include/IOKit/IOLocks.h
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- *
- */
-
-#ifndef __IOKIT_IOLOCKS_H
-#define __IOKIT_IOLOCKS_H
-
-
-#include <sys/appleapiopts.h>
-
-#include <IOKit/system.h>
-
-#include <IOKit/IOReturn.h>
-#include <IOKit/IOTypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <libkern/locks.h>
-#include <machine/machine_routines.h>
-
-/*! @var IOLockGroup
-    Global lock group used by all IOKit locks.  To simplify kext debugging and lock-heat analysis, consider using lck_* locks with a per-driver lock group, as defined in kern/locks.h.
-*/
-extern lck_grp_t	*IOLockGroup;
-
-
-/*
- * Mutex lock operations
- */
-
-#ifdef	IOLOCKS_INLINE
-typedef lck_mtx_t	IOLock;
-#else
-typedef struct _IOLock	IOLock;
-#endif	/* IOLOCKS_INLINE */
-
-
-/*! @function IOLockAlloc
-    @abstract Allocates and initializes a mutex.
-    @discussion Allocates a mutex in general purpose memory, and initializes it. Mutexes are general purpose blocking mutual exclusion locks, supplied by libkern/locks.h. This function may block and so should not be called from interrupt level or while a spin lock is held.  IOLocks use the global IOKit lock group, IOLockGroup.  To simplify kext debugging and lock-heat analysis, consider using lck_* locks with a per-driver lock group, as defined in kern/locks.h.
-    @result Pointer to the allocated lock, or zero on failure. */
-
-IOLock * IOLockAlloc( void );
-
-/*! @function IOLockFree
-    @abstract Frees a mutex.
-    @discussion Frees a lock allocated with IOLockAlloc. Any blocked waiters will not be woken.
-    @param lock Pointer to the allocated lock. */
-
-void	IOLockFree( IOLock * lock);
-
-/*! @function IOLockGetMachLock
-    @abstract Accessor to a Mach mutex.
-    @discussion Accessor to the Mach mutex.
-    @param lock Pointer to the allocated lock. */
-
-lck_mtx_t * IOLockGetMachLock( IOLock * lock);
-
-/*! @function IOLockLock
-    @abstract Lock a mutex.
-    @discussion Lock the mutex. If the lock is held by any thread, block waiting for its unlock. This function may block and so should not be called from interrupt level or while a spin lock is held. Locking the mutex recursively from one thread will result in deadlock. 
-    @param lock Pointer to the allocated lock. */
-
-#ifdef	IOLOCKS_INLINE
-#define IOLockLock(l)	lck_mtx_lock(l)
-#else
-void	IOLockLock( IOLock * lock);
-#endif	/* !IOLOCKS_INLINE */
-
-/*! @function IOLockTryLock
-    @abstract Attempt to lock a mutex.
-    @discussion Lock the mutex if it is currently unlocked, and return true. If the lock is held by any thread, return false.
-    @param lock Pointer to the allocated lock.
-    @result True if the mutex was unlocked and is now locked by the caller, otherwise false. */
-
-#ifdef	IOLOCKS_INLINE
-#define IOLockTryLock(l)	lck_mtx_try_lock(l)
-#else
-boolean_t IOLockTryLock( IOLock * lock);
-#endif	/* !IOLOCKS_INLINE */
-
-/*! @function IOLockUnlock
-    @abstract Unlock a mutex.
-@discussion Unlock the mutex and wake any blocked waiters. Results are undefined if the caller has not locked the mutex. This function may block and so should not be called from interrupt level or while a spin lock is held. 
-    @param lock Pointer to the allocated lock. */
-
-#ifdef	IOLOCKS_INLINE
-#define IOLockUnlock(l)	lck_mtx_unlock(l)
-#else
-#if	defined(__i386__)
-void	IOLockUnlock( IOLock * lock) __DARWIN10_ALIAS(IOLockUnlock);
-#else	/* !__i386__ */
-void	IOLockUnlock( IOLock * lock);
-#endif	/* __i386__ */
-#endif	/* !IOLOCKS_INLINE */
-
-/*! @function IOLockSleep
-    @abstract Sleep with mutex unlock and relock
-@discussion Prepare to sleep,unlock the mutex, and re-acquire it on wakeup. Results are undefined if the caller has not locked the mutex. This function may block and so should not be called from interrupt level or while a spin lock is held. 
-    @param lock Pointer to the locked lock. 
-    @param event The event to sleep on.
-    @param interType How can the sleep be interrupted.
-	@result The wait-result value indicating how the thread was awakened.*/
-int	IOLockSleep( IOLock * lock, void *event, UInt32 interType);
-
-int	IOLockSleepDeadline( IOLock * lock, void *event,
-				AbsoluteTime deadline, UInt32 interType);
-
-void	IOLockWakeup(IOLock * lock, void *event, bool oneThread);
-
-#ifdef __APPLE_API_OBSOLETE
-
-/* The following API is deprecated */
-
-typedef enum {
-    kIOLockStateUnlocked	= 0,
-    kIOLockStateLocked		= 1
-} IOLockState;
-
-void	IOLockInitWithState( IOLock * lock, IOLockState state);
-#define	IOLockInit( l )	IOLockInitWithState( l, kIOLockStateUnlocked);
-
-static __inline__ void IOTakeLock( IOLock * lock) { IOLockLock(lock); 	     }
-static __inline__ boolean_t IOTryLock(  IOLock * lock) { return(IOLockTryLock(lock)); }
-static __inline__ void IOUnlock(   IOLock * lock) { IOLockUnlock(lock);	     }
-
-#endif /* __APPLE_API_OBSOLETE */
-
-/*
- * Recursive lock operations
- */
-
-typedef struct _IORecursiveLock IORecursiveLock;
-
-/*! @function IORecursiveLockAlloc
-    @abstract Allocates and initializes an recursive lock.
-    @discussion Allocates a recursive lock in general purpose memory, and initializes it. Recursive locks function identically to mutexes but allow one thread to lock more than once, with balanced unlocks.  IORecursiveLocks use the global IOKit lock group, IOLockGroup.  To simplify kext debugging and lock-heat analysis, consider using lck_* locks with a per-driver lock group, as defined in kern/locks.h.
-    @result Pointer to the allocated lock, or zero on failure. */
-
-IORecursiveLock * IORecursiveLockAlloc( void );
-
-/*! @function IORecursiveLockFree
-    @abstract Frees a recursive lock.
-    @discussion Frees a lock allocated with IORecursiveLockAlloc. Any blocked waiters will not be woken.
-    @param lock Pointer to the allocated lock. */
-
-void		IORecursiveLockFree( IORecursiveLock * lock);
-
-/*! @function IORecursiveLockGetMachLock
-    @abstract Accessor to a Mach mutex.
-    @discussion Accessor to the Mach mutex.
-    @param lock Pointer to the allocated lock. */
-
-lck_mtx_t * IORecursiveLockGetMachLock( IORecursiveLock * lock);
-
-/*! @function IORecursiveLockLock
-    @abstract Lock a recursive lock.
-    @discussion Lock the recursive lock. If the lock is held by another thread, block waiting for its unlock. This function may block and so should not be called from interrupt level or while a spin lock is held. The lock may be taken recursively by the same thread, with a balanced number of calls to IORecursiveLockUnlock.
-    @param lock Pointer to the allocated lock. */
-
-void		IORecursiveLockLock( IORecursiveLock * lock);
-
-/*! @function IORecursiveLockTryLock
-    @abstract Attempt to lock a recursive lock.
-    @discussion Lock the lock if it is currently unlocked, or held by the calling thread, and return true. If the lock is held by another thread, return false. Successful calls to IORecursiveLockTryLock should be balanced with calls to IORecursiveLockUnlock.
-    @param lock Pointer to the allocated lock.
-    @result True if the lock is now locked by the caller, otherwise false. */
-
-boolean_t	IORecursiveLockTryLock( IORecursiveLock * lock);
-
-/*! @function IORecursiveLockUnlock
-    @abstract Unlock a recursive lock.
-@discussion Undo one call to IORecursiveLockLock, if the lock is now unlocked wake any blocked waiters. Results are undefined if the caller does not balance calls to IORecursiveLockLock with IORecursiveLockUnlock. This function may block and so should not be called from interrupt level or while a spin lock is held.
-    @param lock Pointer to the allocated lock. */
-
-void		IORecursiveLockUnlock( IORecursiveLock * lock);
-
-/*! @function IORecursiveLockHaveLock
-    @abstract Check if a recursive lock is held by the calling thread.
-    @discussion If the lock is held by the calling thread, return true, otherwise the lock is unlocked, or held by another thread and false is returned.
-    @param lock Pointer to the allocated lock.
-    @result True if the calling thread holds the lock otherwise false. */
-
-boolean_t	IORecursiveLockHaveLock( const IORecursiveLock * lock);
-
-extern int	IORecursiveLockSleep( IORecursiveLock *_lock,
-                                      void *event, UInt32 interType);
-extern int	IORecursiveLockSleepDeadline( IORecursiveLock * _lock, void *event,
-											AbsoluteTime deadline, UInt32 interType);
-extern void	IORecursiveLockWakeup( IORecursiveLock *_lock,
-                                       void *event, bool oneThread);
-
-/*
- * Complex (read/write) lock operations
- */
-
-#ifdef	IOLOCKS_INLINE
-typedef lck_rw_t		IORWLock;
-#else
-typedef struct _IORWLock	IORWLock;
-#endif	/* IOLOCKS_INLINE */
-
-/*! @function IORWLockAlloc
-    @abstract Allocates and initializes a read/write lock.
-    @discussion Allocates and initializes a read/write lock in general purpose memory. Read/write locks provide for multiple readers, one exclusive writer, and are supplied by libkern/locks.h. This function may block and so should not be called from interrupt level or while a spin lock is held.  IORWLocks use the global IOKit lock group, IOLockGroup.  To simplify kext debugging and lock-heat analysis, consider using lck_* locks with a per-driver lock group, as defined in kern/locks.h.
-    @result Pointer to the allocated lock, or zero on failure. */
-
-IORWLock * IORWLockAlloc( void );
-
-/*! @function IORWLockFree
-   @abstract Frees a read/write lock.
-   @discussion Frees a lock allocated with IORWLockAlloc. Any blocked waiters will not be woken.
-    @param lock Pointer to the allocated lock. */
-
-void	IORWLockFree( IORWLock * lock);
-
-/*! @function IORWLockGetMachLock
-    @abstract Accessor to a Mach read/write lock.
-    @discussion Accessor to the Mach read/write lock.
-    @param lock Pointer to the allocated lock. */
-
-lck_rw_t * IORWLockGetMachLock( IORWLock * lock);
-
-/*! @function IORWLockRead
-    @abstract Lock a read/write lock for read.
-@discussion Lock the lock for read, allowing multiple readers when there are no writers. If the lock is held for write, block waiting for its unlock. This function may block and so should not be called from interrupt level or while a spin lock is held. Locking the lock recursively from one thread, for read or write, can result in deadlock.
-    @param lock Pointer to the allocated lock. */
-
-#ifdef	IOLOCKS_INLINE
-#define IORWLockRead(l)	lck_rw_lock_shared(l)
-#else
-void	IORWLockRead(IORWLock * lock);
-#endif	/* !IOLOCKS_INLINE */
-
-/*! @function IORWLockWrite
-    @abstract Lock a read/write lock for write.
-    @discussion Lock the lock for write, allowing one writer exlusive access. If the lock is held for read or write, block waiting for its unlock. This function may block and so should not be called from interrupt level or while a spin lock is held. Locking the lock recursively from one thread, for read or write, can result in deadlock.
-    @param lock Pointer to the allocated lock. */
-
-#ifdef	IOLOCKS_INLINE
-#define IORWLockWrite(l)	lck_rw_lock_exclusive(l)
-#else
-void	IORWLockWrite( IORWLock * lock);
-#endif	/* !IOLOCKS_INLINE */
-
-/*! @function IORWLockUnlock
-    @abstract Unlock a read/write lock.
-    @discussion Undo one call to IORWLockRead or IORWLockWrite. Results are undefined if the caller has not locked the lock. This function may block and so should not be called from interrupt level or while a spin lock is held.
-    @param lock Pointer to the allocated lock. */
-
-#ifdef	IOLOCKS_INLINE
-#define IORWLockUnlock(l)	lck_rw_done(l)
-#else
-void	IORWLockUnlock( IORWLock * lock);
-#endif	/* !IOLOCKS_INLINE */
-
-
-#ifdef __APPLE_API_OBSOLETE
-
-/* The following API is deprecated */
-
-static __inline__ void IOReadLock( IORWLock * lock)   { IORWLockRead(lock);   }
-static __inline__ void IOWriteLock(  IORWLock * lock) { IORWLockWrite(lock);  }
-static __inline__ void IORWUnlock(   IORWLock * lock) { IORWLockUnlock(lock); }
-
-#endif /* __APPLE_API_OBSOLETE */
-
-
-/*
- * Simple locks. Cannot block while holding a simple lock.
- */
-
-#ifdef	IOLOCKS_INLINE
-typedef lck_spin_t		IOSimpleLock;
-#else
-typedef struct _IOSimpleLock	IOSimpleLock;
-#endif	/* IOLOCKS_INLINE */
-
-/*! @function IOSimpleLockAlloc
-    @abstract Allocates and initializes a spin lock.
-    @discussion Allocates and initializes a spin lock in general purpose memory. Spin locks provide non-blocking mutual exclusion for synchronization between thread context and interrupt context, or for multiprocessor synchronization, and are supplied by libkern/locks.h. This function may block and so should not be called from interrupt level or while a spin lock is held.  IOSimpleLocks use the global IOKit lock group, IOLockGroup.  To simplify kext debugging and lock-heat analysis, consider using lck_* locks with a per-driver lock group, as defined in kern/locks.h.
-    @result Pointer to the allocated lock, or zero on failure. */
-
-IOSimpleLock * IOSimpleLockAlloc( void );
-
-/*! @function IOSimpleLockFree
-    @abstract Frees a spin lock.
-    @discussion Frees a lock allocated with IOSimpleLockAlloc.
-    @param lock Pointer to the lock. */
-
-void IOSimpleLockFree( IOSimpleLock * lock );
-
-/*! @function IOSimpleLockGetMachLock
-    @abstract Accessor to a Mach spin lock.
-    @discussion Accessor to the Mach spin lock.
-    @param lock Pointer to the allocated lock. */
-
-lck_spin_t * IOSimpleLockGetMachLock( IOSimpleLock * lock);
-
-/*! @function IOSimpleLockInit
-    @abstract Initialize a spin lock.
-    @discussion Initialize an embedded spin lock, to the unlocked state.
-    @param lock Pointer to the lock. */
-
-void IOSimpleLockInit( IOSimpleLock * lock );
-
-/*! @function IOSimpleLockLock
-    @abstract Lock a spin lock.
-@discussion Lock the spin lock. If the lock is held, spin waiting for its unlock. Spin locks disable preemption, cannot be held across any blocking operation, and should be held for very short periods. When used to synchronize between interrupt context and thread context they should be locked with interrupts disabled - IOSimpleLockLockDisableInterrupt() will do both. Locking the lock recursively from one thread will result in deadlock.
-    @param lock Pointer to the lock. */
-
-#ifdef	IOLOCKS_INLINE
-#define IOSimpleLockLock(l)	lck_spin_lock(l)
-#else
-void IOSimpleLockLock( IOSimpleLock * lock );
-#endif	/* !IOLOCKS_INLINE */
-
-
-/*! @function IOSimpleLockTryLock
-    @abstract Attempt to lock a spin lock.
-@discussion Lock the spin lock if it is currently unlocked, and return true. If the lock is held, return false. Successful calls to IOSimpleLockTryLock should be balanced with calls to IOSimpleLockUnlock. 
-    @param lock Pointer to the lock.
-    @result True if the lock was unlocked and is now locked by the caller, otherwise false. */
-
-#ifdef	IOLOCKS_INLINE
-#define IOSimpleLockTryLock(l)	lck_spin_try_lock(l)
-#else
-boolean_t IOSimpleLockTryLock( IOSimpleLock * lock );
-#endif	/* !IOLOCKS_INLINE */
-
-/*! @function IOSimpleLockUnlock
-    @abstract Unlock a spin lock.
-    @discussion Unlock the lock, and restore preemption. Results are undefined if the caller has not locked the lock.
-    @param lock Pointer to the lock. */
-
-#ifdef	IOLOCKS_INLINE
-#define IOSimpleLockUnlock(l)	lck_spin_unlock(l)
-#else
-void IOSimpleLockUnlock( IOSimpleLock * lock );
-#endif	/* !IOLOCKS_INLINE */
-
-#if __LP64__
-typedef boolean_t IOInterruptState;
-#else
-typedef long int IOInterruptState;
-#endif
-
-/*! @function IOSimpleLockLockDisableInterrupt
-    @abstract Lock a spin lock.
-    @discussion Lock the spin lock. If the lock is held, spin waiting for its unlock. Simple locks disable preemption, cannot be held across any blocking operation, and should be held for very short periods. When used to synchronize between interrupt context and thread context they should be locked with interrupts disabled - IOSimpleLockLockDisableInterrupt() will do both. Locking the lock recursively from one thread will result in deadlock.
-    @param lock Pointer to the lock. */
-
-static __inline__
-IOInterruptState IOSimpleLockLockDisableInterrupt( IOSimpleLock * lock )
-{
-    IOInterruptState	state = ml_set_interrupts_enabled( false );
-    IOSimpleLockLock( lock );
-    return( state );
-}
-
-/*! @function IOSimpleLockUnlockEnableInterrupt
-    @abstract Unlock a spin lock, and restore interrupt state.
-    @discussion Unlock the lock, and restore preemption and interrupts to the state as they were when the lock was taken. Results are undefined if the caller has not locked the lock.
-    @param lock Pointer to the lock.
-    @param state The interrupt state returned by IOSimpleLockLockDisableInterrupt() */
-
-static __inline__
-void IOSimpleLockUnlockEnableInterrupt( IOSimpleLock * lock,
-					IOInterruptState state )
-{
-    IOSimpleLockUnlock( lock );
-    ml_set_interrupts_enabled( state );
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* !__IOKIT_IOLOCKS_H */
-
diff --git a/i386/include/IOKit/IOMapper.h b/i386/include/IOKit/IOMapper.h
deleted file mode 100644
index d877974..0000000
--- a/i386/include/IOKit/IOMapper.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 1998-2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef __IOKIT_IOMAPPER_H
-#define __IOKIT_IOMAPPER_H
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-#include <IOKit/IOTypes.h>
-#include <mach/vm_types.h>
-
-// These are C accessors to the system mapper for non-IOKit clients
-ppnum_t IOMapperIOVMAlloc(unsigned pages);
-void IOMapperIOVMFree(ppnum_t addr, unsigned pages);
-
-ppnum_t IOMapperInsertPage(ppnum_t addr, unsigned offset, ppnum_t page);
-void IOMapperInsertPPNPages(ppnum_t addr, unsigned offset,
-                            ppnum_t *pageList, unsigned pageCount);
-void IOMapperInsertUPLPages(ppnum_t addr, unsigned offset,
-                            upl_page_info_t *pageList, unsigned pageCount);
-
-mach_vm_address_t IOMallocPhysical(mach_vm_size_t size, mach_vm_address_t mask);
-
-void IOFreePhysical(mach_vm_address_t address, mach_vm_size_t size);
-
-__END_DECLS
-
-#if __cplusplus
-
-#include <IOKit/IOService.h>
-#include <IOKit/IOMemoryDescriptor.h>
-
-class OSData;
-class IODMACommand;
-
-extern const OSSymbol * gIOMapperIDKey;
-
-class IOMapper : public IOService
-{
-    OSDeclareAbstractStructors(IOMapper);
-
-    // Give the platform expert access to setMapperRequired();
-    friend class IOPlatformExpert;
-
-private:
-    enum SystemMapperState {
-        kNoMapper  = 0,
-        kUnknown   = 1,
-        kHasMapper = 2,	// Any other value is pointer to a live mapper
-        kWaitMask  = 3,
-    };
-protected:
-    void *fTable;
-    ppnum_t fTablePhys;
-    IOItemCount fTableSize;
-    OSData *fTableHandle;
-    bool fIsSystem;
-
-
-    static void setMapperRequired(bool hasMapper);
-    static void waitForSystemMapper();
-
-    virtual bool initHardware(IOService *provider) = 0;
-
-    virtual bool allocTable(IOByteCount size);
-
-public:
-    virtual bool start(IOService *provider);
-    virtual void free();
-
-    // Static routines capable of allocating tables that are physically
-    // contiguous in real memory space.
-    static OSData * NewARTTable(IOByteCount size,
-                                void ** virtAddrP, ppnum_t *physAddrP);
-    static void FreeARTTable(OSData *handle, IOByteCount size);
-
-
-    // To get access to the system mapper IOMapper::gSystem 
-    static IOMapper *gSystem;
-
-    virtual ppnum_t iovmAlloc(IOItemCount pages) = 0;
-    virtual void iovmFree(ppnum_t addr, IOItemCount pages) = 0;
-
-    virtual void iovmInsert(ppnum_t addr, IOItemCount offset, ppnum_t page) = 0;
-    virtual void iovmInsert(ppnum_t addr, IOItemCount offset,
-                            ppnum_t *pageList, IOItemCount pageCount);
-    virtual void iovmInsert(ppnum_t addr, IOItemCount offset,
-                            upl_page_info_t *pageList, IOItemCount pageCount);
-
-    static void checkForSystemMapper()
-        { if ((uintptr_t) gSystem & kWaitMask) waitForSystemMapper(); };
-
-    static IOMapper * copyMapperForDevice(IOService * device);
-
-	
-    // Function will panic if the given address is not found in a valid
-    // iovm mapping.
-    virtual addr64_t mapAddr(IOPhysicalAddress addr) = 0;
-
-    // Get the address mask to or into an address to bypass this mapper
-    virtual bool getBypassMask(addr64_t *maskP) const;
-
-    virtual ppnum_t iovmAllocDMACommand(IODMACommand * command, IOItemCount pageCount);
-    virtual void iovmFreeDMACommand(IODMACommand * command, ppnum_t addr, IOItemCount pageCount);
-    
-    OSMetaClassDeclareReservedUsed(IOMapper, 0);
-    OSMetaClassDeclareReservedUsed(IOMapper, 1);
-    OSMetaClassDeclareReservedUsed(IOMapper, 2);
-
-private:
-    OSMetaClassDeclareReservedUnused(IOMapper, 3);
-    OSMetaClassDeclareReservedUnused(IOMapper, 4);
-    OSMetaClassDeclareReservedUnused(IOMapper, 5);
-    OSMetaClassDeclareReservedUnused(IOMapper, 6);
-    OSMetaClassDeclareReservedUnused(IOMapper, 7);
-    OSMetaClassDeclareReservedUnused(IOMapper, 8);
-    OSMetaClassDeclareReservedUnused(IOMapper, 9);
-    OSMetaClassDeclareReservedUnused(IOMapper, 10);
-    OSMetaClassDeclareReservedUnused(IOMapper, 11);
-    OSMetaClassDeclareReservedUnused(IOMapper, 12);
-    OSMetaClassDeclareReservedUnused(IOMapper, 13);
-    OSMetaClassDeclareReservedUnused(IOMapper, 14);
-    OSMetaClassDeclareReservedUnused(IOMapper, 15);
-};
-
-#endif /* __cplusplus */
-
-#endif /* !__IOKIT_IOMAPPER_H */
diff --git a/i386/include/IOKit/IOMemoryCursor.h b/i386/include/IOKit/IOMemoryCursor.h
deleted file mode 100644
index dfe9eed..0000000
--- a/i386/include/IOKit/IOMemoryCursor.h
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOMEMORYCURSOR_H
-#define _IOMEMORYCURSOR_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOTypes.h>
-
-class IOMemoryDescriptor;
-
-/**************************** class IOMemoryCursor ***************************/
-
-/*!
-    @class IOMemoryCursor
-    @abstract A mechanism to convert memory references to physical addresses.
-    @discussion The IOMemoryCursor declares the super class that all
-specific memory cursors must inherit from, but a memory cursor can be created without a specific format subclass by just providing a segment function to the initializers.  This class does the difficult stuff of dividing a memory descriptor into a physical scatter/gather list appropriate for the target hardware.
-<br><br>
-    A driver is expected to create a memory cursor and configure it to the limitations of its DMA hardware; for instance the memory cursor used by the FireWire SBP-2 protocol has a maximum physical segment size of 2^16 - 1 but the actual transfer size is unlimited.  Thus it would create a cursor with a maxSegmentSize of 65535 and a maxTransfer size of UINT_MAX.   It would also provide a SegmentFunction that can output a pagelist entry.
-<br><br>
-Below is the simplest example of a SegmentFunction:<br>
-void IONaturalMemoryCursor::outputSegment(PhysicalSegment segment,<br>
-					  void *	  outSegments,<br>
-					  UInt32	  outSegmentIndex)<br>
-{<br>
-    ((PhysicalSegment *) outSegments)[outSegmentIndex] = segment;<br>
-}
-
-*/
-class IOMemoryCursor : public OSObject
-{
-    OSDeclareDefaultStructors(IOMemoryCursor)
-
-public:
-/*!
-    @typedef PhysicalSegment
-    @discussion A physical address/length pair.
-*/
-    struct PhysicalSegment
-    {
-	IOPhysicalAddress location;
-	IOPhysicalLength  length;
-    };
-
-/*! @defined IOPhysicalSegment
-    @discussion Backward compatibility define for the old non-class scoped type definition.  See IOMemoryCursor::PhysicalSegment 
-*/
-#define IOPhysicalSegment IOMemoryCursor::PhysicalSegment
-
-/*!
-    @typedef SegmentFunction
-    @discussion Pointer to a C function that outputs a single physical segment to an element in the array as defined by the segments and segmentIndex parameters.
-    @param segment The physical address and length that is next to be output.
-    @param segments Base of the output vector of DMA address length pairs.
-    @param segmentIndex Index to output 'segment' in the 'segments' array.
-*/
-    typedef void (*SegmentFunction)(PhysicalSegment segment,
-				    void *	    segments,
-				    UInt32	    segmentIndex);
-
-/*! @defined OutputSegmentFunc
-    @discussion Backward compatibility define for the old non-class scoped type definition.  See IOMemoryCursor::SegmentFunction */
-#define OutputSegmentFunc IOMemoryCursor::SegmentFunction
-
-protected:
-/*! @var outSeg The action method called when an event has been delivered */
-    SegmentFunction outSeg;
-
-/*! @var maxSegmentSize Maximum size of one segment in a scatter/gather list */
-    IOPhysicalLength  maxSegmentSize;
-
-/*! @var maxTransferSize
-    Maximum size of a transfer that this memory cursor is allowed to generate */
-    IOPhysicalLength  maxTransferSize;
-
-/*! @var alignMask
-    Currently unused.  Reserved for automated aligment restriction code. */
-    IOPhysicalLength  alignMask;
-
-public:
-/*! @function withSpecification
-    @abstract Creates and initializes an IOMemoryCursor in one operation.
-    @discussion Factory function to create and initialize an IOMemoryCursor in one operation.  For more information, see IOMemoryCursor::initWithSpecification.
-    @param outSegFunc SegmentFunction to call to output one physical segment.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
-    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
-*/
-    static IOMemoryCursor *
-	withSpecification(SegmentFunction  outSegFunc,
-			  IOPhysicalLength maxSegmentSize = 0,
-			  IOPhysicalLength maxTransferSize = 0,
-			  IOPhysicalLength alignment = 1);
-
-/*! @function initWithSpecification
-    @abstract Primary initializer for the IOMemoryCursor class.
-    @param outSegFunc SegmentFunction to call to output one physical segment.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
-    @result Returns true if the inherited classes and this instance initialize
-successfully.
-*/
-    virtual bool initWithSpecification(SegmentFunction	outSegFunc,
-				       IOPhysicalLength maxSegmentSize = 0,
-				       IOPhysicalLength maxTransferSize = 0,
-				       IOPhysicalLength alignment = 1);
-
-/*! @function genPhysicalSegments
-    @abstract Generates a physical scatter/gather list given a memory descriptor.
-    @discussion Generates a list of physical segments from the given memory descriptor, relative to the current position of the descriptor.
-    @param descriptor IOMemoryDescriptor that describes the data associated with an I/O request. 
-    @param fromPosition Starting location of the I/O within a memory descriptor. 
-    @param segments Void pointer to base of output physical scatter/gather list.  Always passed directly onto the SegmentFunction without interpretation by the cursor. 
-    @param maxSegments Maximum number of segments that can be written to segments array.
-    @param maxTransferSize Maximum transfer size is limited to that many bytes, otherwise it defaults to the maximum transfer size specified when the memory cursor was initialized.
-    @param transferSize Pointer to an IOByteCount variable that can contain the total size of the transfer being described.  Defaults to 0 indicating that no transfer size need be returned. 
-    @result If the descriptor is exhausted of memory, a zero is returned, otherwise the number of segments that were filled in is returned.
-*/
-    virtual UInt32 genPhysicalSegments(
-				      IOMemoryDescriptor *descriptor,
-				      IOByteCount	  fromPosition,
-				      void *		  segments,
-				      UInt32		  maxSegments,
-				      UInt32		  maxTransferSize = 0,
-				      IOByteCount	 *transferSize = 0);
-};
-
-/************************ class IONaturalMemoryCursor ************************/
-
-
-/*!
-    @class IONaturalMemoryCursor
-    @abstract An IOMemoryCursor subclass that outputs a vector of PhysicalSegments in the natural byte orientation for the CPU.  
-    @discussion The IONaturalMemoryCursor would be used when it is too difficult to safely describe a SegmentFunction that is more appropriate for your hardware.  This cursor just outputs an array of PhysicalSegments.
-*/
-class IONaturalMemoryCursor : public IOMemoryCursor
-{
-    OSDeclareDefaultStructors(IONaturalMemoryCursor)
-
-public:
-/*! @function outputSegment
-    @abstract Outputs the given segment into the output segments array in natural byte order.
-    @param segment The physical address and length that is next to be output.
-    @param segments Base of the output vector of DMA address length pairs.
-    @param segmentIndex Index to output 'segment' in the 'segments' array.
-*/
-    static void outputSegment(PhysicalSegment segment,
-			      void *	      segments,
-			      UInt32	      segmentIndex);
-
-/*! @defined naturalOutputSegment
-    @discussion Backward compatibility define for the old global function definition.  See IONaturalMemoryCursor::outputSegment.
-*/
-#define naturalOutputSegment IONaturalMemoryCursor::outputSegment
-
-/*! @function withSpecification
-    @abstract Creates and initializes an IONaturalMemoryCursor in one operation.
-    @discussion Factory function to create and initialize an IONaturalMemoryCursor in one operation.  For more information, see IONaturalMemoryCursor::initWithSpecification.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
-    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
-*/
-    static IONaturalMemoryCursor * 
-	withSpecification(IOPhysicalLength maxSegmentSize,
-			  IOPhysicalLength maxTransferSize,
-			  IOPhysicalLength alignment = 1);
-
-/*! @function initWithSpecification
-    @abstract Primary initializer for the IONaturalMemoryCursor class.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
-    @result Returns true if the inherited classes and this instance initialize successfully.
-*/
-    virtual bool initWithSpecification(IOPhysicalLength	 maxSegmentSize,
-				       IOPhysicalLength	 maxTransferSize,
-				       IOPhysicalLength	 alignment = 1);
-
-
-/*! @function getPhysicalSegments
-    @abstract Generates a CPU natural physical scatter/gather list given a memory descriptor.
-    @discussion Generates a list of physical segments from the given memory descriptor, relative to the current position of the descriptor.  Wraps IOMemoryCursor::genPhysicalSegments.
-    @param descriptor IOMemoryDescriptor that describes the data associated with an I/O request. 
-    @param fromPosition Starting location of the I/O within a memory descriptor. 
-    @param segments Pointer to an array of IOMemoryCursor::PhysicalSegments for the output physical scatter/gather list.
-    @param maxSegments Maximum number of segments that can be written to segments array.
-    @param inMaxTransferSize Maximum transfer size is limited to that many bytes, otherwise it defaults to the maximum transfer size specified when the memory cursor was initialized.
-    @param transferSize Pointer to an IOByteCount variable that can contain the total size of the transfer being described.  Defaults to 0 indicating that no transfer size need be returned. 
-    @result If the descriptor is exhausted of memory, a zero is returned, otherwise the number of segments that were filled in is returned.
-*/
-    virtual UInt32 getPhysicalSegments(IOMemoryDescriptor *descriptor,
-				       IOByteCount	   fromPosition,
-				       PhysicalSegment	  *segments,
-				       UInt32		   maxSegments,
-				       UInt32		   inMaxTransferSize = 0,
-				       IOByteCount	  *transferSize = 0)
-    {
-	return genPhysicalSegments(descriptor, fromPosition, segments,
-				maxSegments, inMaxTransferSize, transferSize);
-    }
-};
-
-/************************** class IOBigMemoryCursor **************************/
-
-/*!
-    @class IOBigMemoryCursor
-    @abstract An IOMemoryCursor subclass that outputs a vector of PhysicalSegments in the big endian byte order.  
-    @discussion The IOBigMemoryCursor would be used when the DMA hardware requires a big endian address and length pair.  This cursor outputs an array of PhysicalSegments that are encoded in big-endian format.
-*/
-class IOBigMemoryCursor : public IOMemoryCursor
-{
-    OSDeclareDefaultStructors(IOBigMemoryCursor)
-
-public:
-/*! @function outputSegment
-    @abstract Outputs the given segment into the output segments array in big endian byte order.
-    @param segment The physical address and length that is next to be output.
-    @param segments Base of the output vector of DMA address length pairs.
-    @param segmentIndex Index to output 'segment' in the 'segments' array.
-*/
-    static void outputSegment(PhysicalSegment segment,
-			      void *	      segments,
-			      UInt32	      segmentIndex);
-
-/*! @defined bigOutputSegment
-    @discussion Backward compatibility define for the old global function definition.  See IOBigMemoryCursor::outputSegment 
-*/
-#define bigOutputSegment IOBigMemoryCursor::outputSegment
-
-/*! @function withSpecification
-    @abstract Creates and initializes an IOBigMemoryCursor in one operation.
-    @discussion Factory function to create and initialize an IOBigMemoryCursor in one operation.  See also IOBigMemoryCursor::initWithSpecification.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
-    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
-*/
-    static IOBigMemoryCursor *
-	withSpecification(IOPhysicalLength maxSegmentSize,
-			  IOPhysicalLength maxTransferSize,
-			  IOPhysicalLength alignment = 1);
-
-/*! @function initWithSpecification
-    @abstract Primary initializer for the IOBigMemoryCursor class.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
-    @result Returns true if the inherited classes and this instance initialize
-successfully.
-*/
-    virtual bool initWithSpecification(IOPhysicalLength	 maxSegmentSize,
-				       IOPhysicalLength	 maxTransferSize,
-				       IOPhysicalLength	 alignment = 1);
-
-
-/*! @function getPhysicalSegments
-    @abstract Generates a big endian physical scatter/gather list given a memory descriptor.
-    @discussion Generates a list of physical segments from the given memory descriptor, relative to the current position of the descriptor.  Wraps IOMemoryCursor::genPhysicalSegments.
-    @param descriptor IOMemoryDescriptor that describes the data associated with an I/O request. 
-    @param fromPosition Starting location of the I/O within a memory descriptor. 
-    @param segments Pointer to an array of IOMemoryCursor::PhysicalSegments for the output physical scatter/gather list.
-    @param maxSegments Maximum number of segments that can be written to segments array.
-    @param inMaxTransferSize Maximum transfer size is limited to that many bytes, otherwise it defaults to the maximum transfer size specified when the memory cursor was initialized.
-    @param transferSize Pointer to an IOByteCount variable that can contain the total size of the transfer being described.  Defaults to 0 indicating that no transfer size need be returned. 
-    @result If the descriptor is exhausted of memory, a zero is returned, otherwise the number of segments that were filled in is returned.
-*/
-    virtual UInt32 getPhysicalSegments(IOMemoryDescriptor * descriptor,
-				       IOByteCount	    fromPosition,
-				       PhysicalSegment *    segments,
-				       UInt32		    maxSegments,
-				       UInt32		    inMaxTransferSize = 0,
-				       IOByteCount	 *  transferSize = 0)
-    {
-	return genPhysicalSegments(descriptor, fromPosition, segments,
-				maxSegments, inMaxTransferSize, transferSize);
-    }
-};
-
-/************************* class IOLittleMemoryCursor ************************/
-
-/*!
-    @class IOLittleMemoryCursor
-    @abstract An IOMemoryCursor subclass that outputs a vector of PhysicalSegments in the little endian byte order.  
-    @discussion The IOLittleMemoryCursor would be used when the DMA hardware requires a little endian address and length pair.	This cursor outputs an array of PhysicalSegments that are encoded in little endian format.
-*/
-class IOLittleMemoryCursor : public IOMemoryCursor
-{
-    OSDeclareDefaultStructors(IOLittleMemoryCursor)
-
-public:
-/*! @function outputSegment
-    @abstract Outputs the given segment into the output segments array in little endian byte order.
-    @param segment The physical address and length that is next to be output.
-    @param segments Base of the output vector of DMA address length pairs.
-    @param segmentIndex Index to output 'segment' in the 'segments' array.
-*/
-    static void outputSegment(PhysicalSegment segment,
-			      void *	      segments,
-			      UInt32	      segmentIndex);
-
-/*! @defined littleOutputSegment
-    @discussion Backward compatibility define for the old global function definition.  See also IOLittleMemoryCursor::outputSegment. */
-#define littleOutputSegment IOLittleMemoryCursor::outputSegment
-
-/*! @function withSpecification
-    @abstract Creates and initializes an IOLittleMemoryCursor in one operation.
-    @discussion Factory function to create and initialize an IOLittleMemoryCursor in one operation.  See also IOLittleMemoryCursor::initWithSpecification.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
-    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
-*/
-    static IOLittleMemoryCursor *
-	withSpecification(IOPhysicalLength maxSegmentSize,
-			  IOPhysicalLength maxTransferSize,
-			  IOPhysicalLength alignment = 1);
-
-/*! @function initWithSpecification
-    @abstract Primary initializer for the IOLittleMemoryCursor class.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
-    @result Returns true if the inherited classes and this instance initialize successfully.
-*/
-    virtual bool initWithSpecification(IOPhysicalLength	 maxSegmentSize,
-				       IOPhysicalLength	 maxTransferSize,
-				       IOPhysicalLength	 alignment = 1);
-
-
-/*! @function getPhysicalSegments
-    @abstract Generates a little endian physical scatter/gather list given a memory descriptor.
-    @discussion Generates a list of physical segments from the given memory descriptor, relative to the current position of the descriptor.  Wraps IOMemoryCursor::genPhysicalSegments.
-    @param descriptor IOMemoryDescriptor that describes the data associated with an I/O request. 
-    @param fromPosition Starting location of the I/O within a memory descriptor. 
-    @param segments Pointer to an array of IOMemoryCursor::PhysicalSegments for the output physical scatter/gather list.
-    @param maxSegments Maximum number of segments that can be written to segments array.
-    @param inMaxTransferSize Maximum transfer size is limited to that many bytes, otherwise it defaults to the maximum transfer size specified when the memory cursor was initialized.
-    @param transferSize Pointer to an IOByteCount variable that can contain the total size of the transfer being described.  Defaults to 0 indicating that no transfer size need be returned. 
-    @result If the descriptor is exhausted of memory, a zero is returned, otherwise the number of segments that were filled in is returned.
-*/
-    virtual UInt32 getPhysicalSegments(IOMemoryDescriptor * descriptor,
-				       IOByteCount	    fromPosition,
-				       PhysicalSegment *    segments,
-				       UInt32		    maxSegments,
-				       UInt32		    inMaxTransferSize = 0,
-				       IOByteCount	 *  transferSize = 0)
-    {
-	return genPhysicalSegments(descriptor, fromPosition, segments,
-				maxSegments, inMaxTransferSize, transferSize);
-    }
-};
-
-/************************* class IODBDMAMemoryCursor *************************/
-
-#if defined(__ppc__)
-
-struct IODBDMADescriptor;
-
-/*!
-    @class IODBDMAMemoryCursor
-    @abstract An IOMemoryCursor subclass that outputs a vector of DBDMA descriptors where the address and length are filled in.  
-    @discussion The IODBDMAMemoryCursor would be used when the DBDMA hardware is available for the device for that will use an instance of this cursor.
-*/
-class IODBDMAMemoryCursor : public IOMemoryCursor
-{
-    OSDeclareDefaultStructors(IODBDMAMemoryCursor)
-
-public:
-/*! @function outputSegment
-    @abstract Outpust the given segment into the output segments array in address and length fields of an DBDMA descriptor.
-    @param segment The physical address and length that is next to be output.
-    @param segments Base of the output vector of DMA address length pairs.
-    @param segmentIndex Index to output 'segment' in the 'segments' array.
-*/
-    static void outputSegment(PhysicalSegment segment,
-			      void *	      segments,
-			      UInt32	      segmentIndex);
-
-/*! @defined dbdmaOutputSegment
-    @discussion Backward compatibility define for the old global function definition.  See IODBDMAMemoryCursor::outputSegment. */
-#define dbdmaOutputSegment IODBDMAMemoryCursor::outputSegment
-
-/*! @function withSpecification
-    @abstract Creates and initializes an IODBDMAMemoryCursor in one operation.
-    @discussion Factory function to create and initialize an IODBDMAMemoryCursor in one operation.  See also IODBDMAMemoryCursor::initWithSpecification.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
-    @result Returns a new memory cursor if successfully created and initialized, 0 otherwise.
-*/
-    static IODBDMAMemoryCursor * 
-	withSpecification(IOPhysicalLength maxSegmentSize,
-			  IOPhysicalLength maxTransferSize,
-			  IOPhysicalLength alignment = 1);
-
-/*! @function initWithSpecification
-    @abstract Primary initializer for the IODBDMAMemoryCursor class.
-    @param maxSegmentSize Maximum allowable size for one segment.  Defaults to 0.
-    @param maxTransferSize Maximum size of an entire transfer.	Defaults to 0 indicating no maximum.
-    @param alignment Alignment restrictions on output physical addresses.  Not currently implemented.  Defaults to single byte alignment.
-    @result Returns true if the inherited classes and this instance initialize successfully.
-*/
-    virtual bool initWithSpecification(IOPhysicalLength	 maxSegmentSize,
-				       IOPhysicalLength	 maxTransferSize,
-				       IOPhysicalLength	 alignment = 1);
-
-
-/*! @function getPhysicalSegments
-    @abstract Generates a DBDMA physical scatter/gather list given a memory descriptor.
-    @discussion Generates a list of DBDMA descriptors where the address and length fields are filled in appropriately.	But the client is expected to fill in the rest of the DBDMA descriptor as is appropriate for their particular hardware.  Wraps IOMemoryCursor::genPhysicalSegments.
-    @param descriptor IOMemoryDescriptor that describes the data associated with an I/O request. 
-    @param fromPosition Starting location of the I/O within a memory descriptor. 
-    @param segments Pointer to an array of DBDMA descriptors for the output physical scatter/gather list.  Be warned no room is left for a preamble in the output array.  'segments' should point to the first memory description slot in a DBDMA command.
-    @param maxSegments Maximum number of segments that can be written to the DBDMA descriptor table.
-    @param inMaxTransferSize Maximum transfer size is limited to that many bytes, otherwise it defaults to the maximum transfer size specified when the memory cursor was initialized.
-    @param transferSize Pointer to an IOByteCount variable that can contain the total size of the transfer being described.  Defaults to 0 indicating that no transfer size need be returned. 
-    @result If the descriptor is exhausted of memory, a zero is returned, otherwise the number of segments that were filled in is returned.
-*/
-    virtual UInt32 getPhysicalSegments(IOMemoryDescriptor * descriptor,
-				       IOByteCount	    fromPosition,
-				       IODBDMADescriptor *  segments,
-				       UInt32		    maxSegments,
-				       UInt32		    inMaxTransferSize = 0,
-				       IOByteCount	 *  transferSize = 0)
-    {
-	return genPhysicalSegments(descriptor, fromPosition, segments,
-				maxSegments, inMaxTransferSize, transferSize);
-    }
-};
-
-#endif /* defined(__ppc__) */
-
-#endif /* !_IOMEMORYCURSOR_H */
-
diff --git a/i386/include/IOKit/IOMemoryDescriptor.h b/i386/include/IOKit/IOMemoryDescriptor.h
deleted file mode 100644
index d60d864..0000000
--- a/i386/include/IOKit/IOMemoryDescriptor.h
+++ /dev/null
@@ -1,898 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOMEMORYDESCRIPTOR_H
-#define _IOMEMORYDESCRIPTOR_H
-
-#include <sys/cdefs.h>
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOLocks.h>
-#include <libkern/c++/OSContainers.h>
-
-#include <mach/memory_object_types.h>
-
-class IOMemoryMap;
-class IOMapper;
-
-/*
- * Direction of transfer, with respect to the described memory.
- */
-#ifdef __LP64__
-enum
-#else /* !__LP64__ */
-enum IODirection
-#endif /* !__LP64__ */
-{
-    kIODirectionNone  = 0x0,	//                    same as VM_PROT_NONE
-    kIODirectionIn    = 0x1,	// User land 'read',  same as VM_PROT_READ
-    kIODirectionOut   = 0x2,	// User land 'write', same as VM_PROT_WRITE
-    kIODirectionOutIn = kIODirectionOut | kIODirectionIn,
-    kIODirectionInOut = kIODirectionIn  | kIODirectionOut
-};
-#ifdef __LP64__
-typedef IOOptionBits IODirection;
-#endif /* __LP64__ */
-
-/*
- * IOOptionBits used in the withOptions variant
- */
-enum {
-    kIOMemoryDirectionMask	= 0x00000007,
-
-    kIOMemoryTypeVirtual	= 0x00000010,
-    kIOMemoryTypePhysical	= 0x00000020,
-    kIOMemoryTypeUPL		= 0x00000030,
-    kIOMemoryTypePersistentMD	= 0x00000040,	// Persistent Memory Descriptor
-    kIOMemoryTypeUIO		= 0x00000050,
-#ifdef __LP64__
-    kIOMemoryTypeVirtual64	= kIOMemoryTypeVirtual,
-    kIOMemoryTypePhysical64	= kIOMemoryTypePhysical,
-#else /* !__LP64__ */
-    kIOMemoryTypeVirtual64	= 0x00000060,
-    kIOMemoryTypePhysical64	= 0x00000070,
-#endif /* !__LP64__ */
-    kIOMemoryTypeMask		= 0x000000f0,
-
-    kIOMemoryAsReference	= 0x00000100,
-    kIOMemoryBufferPageable	= 0x00000400,
-    kIOMemoryMapperNone		= 0x00000800,
-    kIOMemoryPersistent		= 0x00010000,
-    kIOMemoryThreadSafe		= 0x00100000,	// Shared with Buffer MD
-};
-
-#define kIOMapperSystem	((IOMapper *) 0)
-
-enum 
-{
-    kIOMemoryPurgeableKeepCurrent = 1,
-    kIOMemoryPurgeableNonVolatile = 2,
-    kIOMemoryPurgeableVolatile    = 3,
-    kIOMemoryPurgeableEmpty       = 4
-};
-enum 
-{
-    kIOMemoryIncoherentIOFlush	 = 1,
-    kIOMemoryIncoherentIOStore	 = 2,
-};
-
-#define	IOMEMORYDESCRIPTOR_SUPPORTS_DMACOMMAND	1
-
-enum 
-{
-    kIOPreparationIDUnprepared = 0,
-    kIOPreparationIDUnsupported = 1,
-    kIOPreparationIDAlwaysPrepared = 2,
-};
-
-/*! @class IOMemoryDescriptor : public OSObject
-    @abstract An abstract base class defining common methods for describing physical or virtual memory.
-    @discussion The IOMemoryDescriptor object represents a buffer or range of memory, specified as one or more physical or virtual address ranges. It contains methods to return the memory's physically contiguous segments (fragments), for use with the IOMemoryCursor, and methods to map the memory into any address space with caching and placed mapping options. */
-
-class IOMemoryDescriptor : public OSObject
-{
-    friend class IOMemoryMap;
-
-    OSDeclareDefaultStructors(IOMemoryDescriptor);
-
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of this class in the future.
-    */    
-    struct ExpansionData {
-        void *				devicePager;
-        unsigned int			pagerContig:1;
-        unsigned int			unused:31;
-	IOMemoryDescriptor *		memory;
-    };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData * reserved;
-
-protected:
-    OSSet *		_mappings;
-    IOOptionBits 	_flags;
-    void *		_memEntry;
-
-#ifdef __LP64__
-    uint64_t		__iomd_reserved1;
-    uint64_t		__iomd_reserved2;
-    uint64_t		__iomd_reserved3;
-    uint64_t		__iomd_reserved4;
-#else /* !__LP64__ */
-    IODirection         _direction;        /* use _flags instead */
-#endif /* !__LP64__ */
-    IOByteCount         _length;           /* length of all ranges */
-    IOOptionBits 	_tag;
-
-public:
-typedef IOOptionBits DMACommandOps;
-#ifndef __LP64__
-    virtual IOPhysicalAddress getSourceSegment( IOByteCount offset,
-						IOByteCount * length ) APPLE_KEXT_DEPRECATED;
-#endif /* !__LP64__ */
-
-/*! @function initWithOptions
-    @abstract Master initialiser for all variants of memory descriptors.  For a more complete description see IOMemoryDescriptor::withOptions.
-    @discussion Note this function can be used to re-init a previously created memory descriptor.
-    @result true on success, false on failure. */
-    virtual bool initWithOptions(void *		buffers,
-                                 UInt32		count,
-                                 UInt32		offset,
-                                 task_t		task,
-                                 IOOptionBits	options,
-                                 IOMapper *	mapper = kIOMapperSystem);
-
-#ifndef __LP64__
-    virtual addr64_t getPhysicalSegment64( IOByteCount offset,
-                                            IOByteCount * length ) APPLE_KEXT_DEPRECATED; /* use getPhysicalSegment() and kIOMemoryMapperNone instead */
-#endif /* !__LP64__ */
-
-/*! @function setPurgeable
-    @abstract Control the purgeable status of a memory descriptors memory.
-    @discussion Buffers may be allocated with the ability to have their purgeable status changed - IOBufferMemoryDescriptor with the kIOMemoryPurgeable option, VM_FLAGS_PURGEABLE may be passed to vm_allocate() in user space to allocate such buffers. The purgeable status of such a buffer may be controlled with setPurgeable(). The process of making a purgeable memory descriptor non-volatile and determining its previous state is atomic - if a purgeable memory descriptor is made nonvolatile and the old state is returned as kIOMemoryPurgeableVolatile, then the memory's previous contents are completely intact and will remain so until the memory is made volatile again.  If the old state is returned as kIOMemoryPurgeableEmpty then the memory was reclaimed while it was in a volatile state and its previous contents have been lost.
-    @param newState - the desired new purgeable state of the memory:<br>
-    kIOMemoryPurgeableKeepCurrent - make no changes to the memory's purgeable state.<br>
-    kIOMemoryPurgeableVolatile    - make the memory volatile - the memory may be reclaimed by the VM system without saving its contents to backing store.<br>
-    kIOMemoryPurgeableNonVolatile - make the memory nonvolatile - the memory is treated as with usual allocations and must be saved to backing store if paged.<br>
-    kIOMemoryPurgeableEmpty       - make the memory volatile, and discard any pages allocated to it.
-    @param oldState - if non-NULL, the previous purgeable state of the memory is returned here:<br>
-    kIOMemoryPurgeableNonVolatile - the memory was nonvolatile.<br>
-    kIOMemoryPurgeableVolatile    - the memory was volatile but its content has not been discarded by the VM system.<br>
-    kIOMemoryPurgeableEmpty       - the memory was volatile and has been discarded by the VM system.<br>
-    @result An IOReturn code. */
-
-    virtual IOReturn setPurgeable( IOOptionBits newState,
-                                    IOOptionBits * oldState );
-
-/*! @function performOperation
-    @abstract Perform an operation on the memory descriptor's memory.
-    @discussion This method performs some operation on a range of the memory descriptor's memory. When a memory descriptor's memory is not mapped, it should be more efficient to use this method than mapping the memory to perform the operation virtually.
-    @param options The operation to perform on the memory:<br>
-    kIOMemoryIncoherentIOFlush - pass this option to store to memory and flush any data in the processor cache for the memory range, with synchronization to ensure the data has passed through all levels of processor cache. It may not be supported on all architectures. This type of flush may be used for non-coherent I/O such as AGP - it is NOT required for PCI coherent operations. The memory descriptor must have been previously prepared.<br>
-    kIOMemoryIncoherentIOStore - pass this option to store to memory any data in the processor cache for the memory range, with synchronization to ensure the data has passed through all levels of processor cache. It may not be supported on all architectures. This type of flush may be used for non-coherent I/O such as AGP - it is NOT required for PCI coherent operations. The memory descriptor must have been previously prepared.
-    @param offset A byte offset into the memory descriptor's memory.
-    @param length The length of the data range.
-    @result An IOReturn code. */
-
-    virtual IOReturn performOperation( IOOptionBits options,
-                                        IOByteCount offset, IOByteCount length );
-
-    // Used for dedicated communications for IODMACommand
-    virtual IOReturn dmaCommandOperation(DMACommandOps op, void *vData, UInt dataSize) const;
-
-/*! @function getPhysicalSegment
-    @abstract Break a memory descriptor into its physically contiguous segments.
-    @discussion This method returns the physical address of the byte at the given offset into the memory, and optionally the length of the physically contiguous segment from that offset.
-    @param offset A byte offset into the memory whose physical address to return.
-    @param length If non-zero, getPhysicalSegment will store here the length of the physically contiguous segement at the given offset.
-    @result A physical address, or zero if the offset is beyond the length of the memory. */
-
-#ifdef __LP64__
-    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
-                                         IOByteCount * length,
-                                         IOOptionBits  options = 0 ) = 0;
-#else /* !__LP64__ */
-    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
-                                         IOByteCount * length,
-                                         IOOptionBits  options );
-#endif /* !__LP64__ */
-
-    virtual uint64_t getPreparationID( void );
-	
-private:
-    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 0);
-#ifdef __LP64__
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 1);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 2);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 3);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 4);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 5);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 6);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 7);
-#else /* !__LP64__ */
-    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 1);
-    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 2);
-    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 3);
-    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 4);
-    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 5);
-    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 6);
-    OSMetaClassDeclareReservedUsed(IOMemoryDescriptor, 7);
-#endif /* !__LP64__ */
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 8);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 9);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 10);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 11);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 12);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 13);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 14);
-    OSMetaClassDeclareReservedUnused(IOMemoryDescriptor, 15);
-
-protected:
-    virtual void free();
-public:
-    static void initialize( void );
-
-public:
-/*! @function withAddress
-    @abstract Create an IOMemoryDescriptor to describe one virtual range of the kernel task.
-    @discussion This method creates and initializes an IOMemoryDescriptor for memory consisting of a single virtual memory range mapped into the kernel map.  This memory descriptor needs to be prepared before it can be used to extract data from the memory described.
-    @param address The virtual address of the first byte in the memory.
-    @param withLength The length of memory.
-    @param withDirection An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
-    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
-
-    static IOMemoryDescriptor * withAddress(void *       address,
-                                            IOByteCount  withLength,
-                                            IODirection  withDirection);
-
-#ifndef __LP64__
-    static IOMemoryDescriptor * withAddress(IOVirtualAddress address,
-                                            IOByteCount  withLength,
-                                            IODirection  withDirection,
-                                            task_t       withTask) APPLE_KEXT_DEPRECATED; /* use withAddressRange() and prepare() instead */
-#endif /* !__LP64__ */
-
-/*! @function withPhysicalAddress
-    @abstract Create an IOMemoryDescriptor to describe one physical range.
-    @discussion This method creates and initializes an IOMemoryDescriptor for memory consisting of a single physical memory range.
-    @param address The physical address of the first byte in the memory.
-    @param withLength The length of memory.
-    @param withDirection An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
-    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
-
-    static IOMemoryDescriptor * withPhysicalAddress(
-				IOPhysicalAddress	address,
-				IOByteCount		withLength,
-				IODirection      	withDirection );
-
-#ifndef __LP64__
-     static IOMemoryDescriptor * withRanges(IOVirtualRange * ranges,
-                                            UInt32           withCount,
-                                            IODirection      withDirection,
-                                            task_t           withTask,
-                                            bool             asReference = false) APPLE_KEXT_DEPRECATED; /* use withAddressRanges() instead */
-#endif /* !__LP64__ */
-
-/*! @function withAddressRange
-    @abstract Create an IOMemoryDescriptor to describe one virtual range of the specified map.
-    @discussion This method creates and initializes an IOMemoryDescriptor for memory consisting of a single virtual memory range mapped into the specified map.  This memory descriptor needs to be prepared before it can be used to extract data from the memory described.
-    @param address The virtual address of the first byte in the memory.
-    @param withLength The length of memory.
-    @param options
-        kIOMemoryDirectionMask (options:direction)	This nibble indicates the I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures. 
-    @param task The task the virtual ranges are mapped into. Note that unlike IOMemoryDescriptor::withAddress(), kernel_task memory must be explicitly prepared when passed to this api.
-    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
-
-    static IOMemoryDescriptor * withAddressRange(
-					mach_vm_address_t address,
-					mach_vm_size_t	  length,
-					IOOptionBits      options,
-					task_t            task);
-
-/*! @function withAddressRanges
-    @abstract Create an IOMemoryDescriptor to describe one or more virtual ranges.
-    @discussion This method creates and initializes an IOMemoryDescriptor for memory consisting of an array of virtual memory ranges each mapped into a specified source task.  This memory descriptor needs to be prepared before it can be used to extract data from the memory described.
-    @param ranges An array of IOAddressRange structures which specify the virtual ranges in the specified map which make up the memory to be described. IOAddressRange is the 64bit version of IOVirtualRange.
-    @param rangeCount The member count of the ranges array.
-    @param options
-        kIOMemoryDirectionMask (options:direction)	This nibble indicates the I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures. 
-        kIOMemoryAsReference	For options:type = Virtual or Physical this indicate that the memory descriptor need not copy the ranges array into local memory.  This is an optimisation to try to minimise unnecessary allocations.
-    @param task The task each of the virtual ranges are mapped into. Note that unlike IOMemoryDescriptor::withAddress(), kernel_task memory must be explicitly prepared when passed to this api.
-    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
-
-    static IOMemoryDescriptor * withAddressRanges(
-					IOAddressRange * ranges,
-					UInt32           rangeCount,
-					IOOptionBits     options,
-					task_t           task);
-
-/*! @function withOptions
-    @abstract Master initialiser for all variants of memory descriptors.
-    @discussion This method creates and initializes an IOMemoryDescriptor for memory it has three main variants: Virtual, Physical & mach UPL.  These variants are selected with the options parameter, see below.  This memory descriptor needs to be prepared before it can be used to extract data from the memory described.
-
-
-    @param buffers A pointer to an array of IOAddressRange when options:type is kIOMemoryTypeVirtual64 or kIOMemoryTypePhysical64 or a 64bit kernel. For type UPL it is a upl_t returned by the mach/memory_object_types.h apis, primarily used internally by the UBC. IOVirtualRanges or IOPhysicalRanges are 32 bit only types for use when options:type is kIOMemoryTypeVirtual or kIOMemoryTypePhysical on 32bit kernels.
-
-    @param count options:type = Virtual or Physical count contains a count of the number of entires in the buffers array.  For options:type = UPL this field contains a total length.
-
-    @param offset Only used when options:type = UPL, in which case this field contains an offset for the memory within the buffers upl.
-
-    @param task Only used options:type = Virtual, The task each of the virtual ranges are mapped into.
-
-    @param options
-        kIOMemoryDirectionMask (options:direction)	This nibble indicates the I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures. 
-        kIOMemoryTypeMask (options:type)	kIOMemoryTypeVirtual64, kIOMemoryTypeVirtual, kIOMemoryTypePhysical64, kIOMemoryTypePhysical, kIOMemoryTypeUPL Indicates that what type of memory basic memory descriptor to use.  This sub-field also controls the interpretation of the buffers, count, offset & task parameters.
-        kIOMemoryAsReference	For options:type = Virtual or Physical this indicate that the memory descriptor need not copy the ranges array into local memory.  This is an optimisation to try to minimise unnecessary allocations.
-        kIOMemoryBufferPageable	Only used by the IOBufferMemoryDescriptor as an indication that the kernel virtual memory is in fact pageable and we need to use the kernel pageable submap rather than the default map.
-    
-    @param mapper Which IOMapper should be used to map the in-memory physical addresses into I/O space addresses.  Defaults to 0 which indicates that the system mapper is to be used, if present.  
-
-    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
-
-    static IOMemoryDescriptor *withOptions(void *	buffers,
-                                           UInt32	count,
-                                           UInt32	offset,
-                                           task_t	task,
-                                           IOOptionBits	options,
-                                           IOMapper *	mapper = kIOMapperSystem);
-
-#ifndef __LP64__
-    static IOMemoryDescriptor * withPhysicalRanges(
-                                            IOPhysicalRange *	ranges,
-                                            UInt32		withCount,
-                                            IODirection 	withDirection,
-                                            bool		asReference = false) APPLE_KEXT_DEPRECATED; /* use withOptions() and kIOMemoryTypePhysical instead */
-#endif /* !__LP64__ */
-
-#ifndef __LP64__
-    static IOMemoryDescriptor *	withSubRange(IOMemoryDescriptor *of,
-					     IOByteCount offset,
-					     IOByteCount length,
-					     IODirection withDirection) APPLE_KEXT_DEPRECATED; /* use IOSubMemoryDescriptor::withSubRange() and kIOMemoryThreadSafe instead */
-#endif /* !__LP64__ */
-
-/*! @function withPersistentMemoryDescriptor
-    @abstract Copy constructor that generates a new memory descriptor if the backing memory for the same task's virtual address and length has changed.
-    @discussion If the original memory descriptor's address and length is still backed by the same real memory, i.e. the user hasn't deallocated and the reallocated memory at the same address then the original memory descriptor is returned with a additional reference.  Otherwise we build a totally new memory descriptor with the same characteristics as the previous one but with a new view of the vm.  Note not legal to call this function with anything except an IOGeneralMemoryDescriptor that was created with the kIOMemoryPersistent option.
-    @param originalMD The memory descriptor to be duplicated.
-    @result Either the original memory descriptor with an additional retain or a new memory descriptor, 0 for a bad original memory descriptor or some other resource shortage. */
-    static IOMemoryDescriptor *
-	withPersistentMemoryDescriptor(IOMemoryDescriptor *originalMD);
-
-#ifndef __LP64__
-	// obsolete initializers
-	// - initWithOptions is the designated initializer 
-    virtual bool initWithAddress(void *       address,
-                                 IOByteCount  withLength,
-                                 IODirection  withDirection) APPLE_KEXT_DEPRECATED; /* use initWithOptions() instead */
-    virtual bool initWithAddress(IOVirtualAddress address,
-                                 IOByteCount  withLength,
-                                 IODirection  withDirection,
-                                 task_t       withTask) APPLE_KEXT_DEPRECATED; /* use initWithOptions() instead */
-    virtual bool initWithPhysicalAddress(
-				 IOPhysicalAddress	address,
-				 IOByteCount		withLength,
-				 IODirection      	withDirection ) APPLE_KEXT_DEPRECATED; /* use initWithOptions() instead */
-    virtual bool initWithRanges(IOVirtualRange * ranges,
-                                UInt32           withCount,
-                                IODirection      withDirection,
-                                task_t           withTask,
-                                bool             asReference = false) APPLE_KEXT_DEPRECATED; /* use initWithOptions() instead */
-    virtual bool initWithPhysicalRanges(IOPhysicalRange * ranges,
-                                        UInt32           withCount,
-                                        IODirection      withDirection,
-                                        bool             asReference = false) APPLE_KEXT_DEPRECATED; /* use initWithOptions() instead */
-#endif /* __LP64__ */
-
-/*! @function getDirection
-    @abstract Accessor to get the direction the memory descriptor was created with.
-    @discussion This method returns the direction the memory descriptor was created with.
-    @result The direction. */
-
-    virtual IODirection getDirection() const;
-
-/*! @function getLength
-    @abstract Accessor to get the length of the memory descriptor (over all its ranges).
-    @discussion This method returns the total length of the memory described by the descriptor, ie. the sum of its ranges' lengths.
-    @result The byte count. */
-
-    virtual IOByteCount getLength() const;
-
-/*! @function setTag
-    @abstract Set the tag for the memory descriptor.
-    @discussion This method sets the tag for the memory descriptor. Tag bits are not interpreted by IOMemoryDescriptor.
-    @param tag The tag. */
-
-    virtual void setTag( IOOptionBits tag );
-
-/*! @function getTag
-    @abstract Accessor to the retrieve the tag for the memory descriptor.
-    @discussion This method returns the tag for the memory descriptor. Tag bits are not interpreted by IOMemoryDescriptor.
-    @result The tag. */
-
-    virtual IOOptionBits getTag( void );
-
-/*! @function readBytes
-    @abstract Copy data from the memory descriptor's buffer to the specified buffer.
-    @discussion This method copies data from the memory descriptor's memory at the given offset, to the caller's buffer.  The memory descriptor MUST have the kIODirectionOut direcction bit set  and be prepared.  kIODirectionOut means that this memory descriptor will be output to an external device, so readBytes is used to get memory into a local buffer for a PIO transfer to the device.
-    @param offset A byte offset into the memory descriptor's memory.
-    @param bytes The caller supplied buffer to copy the data to.
-    @param withLength The length of the data to copy.
-    @result The number of bytes copied, zero will be returned if the specified offset is beyond the length of the descriptor. Development/debug kernel builds will assert if the offset is beyond the length of the descriptor. */
-
-    virtual IOByteCount readBytes(IOByteCount offset,
-				void * bytes, IOByteCount withLength);
-
-/*! @function writeBytes
-    @abstract Copy data to the memory descriptor's buffer from the specified buffer.
-    @discussion This method copies data to the memory descriptor's memory at the given offset, from the caller's buffer.  The memory descriptor MUST have the kIODirectionIn direcction bit set  and be prepared.  kIODirectionIn means that this memory descriptor will be input from an external device, so writeBytes is used to write memory into the descriptor for PIO drivers.
-    @param offset A byte offset into the memory descriptor's memory.
-    @param bytes The caller supplied buffer to copy the data from.
-    @param withLength The length of the data to copy.
-    @result The number of bytes copied, zero will be returned if the specified offset is beyond the length of the descriptor. Development/debug kernel builds will assert if the offset is beyond the length of the descriptor. */
-
-    virtual IOByteCount writeBytes(IOByteCount offset,
-				const void * bytes, IOByteCount withLength);
-
-#ifndef __LP64__
-    virtual IOPhysicalAddress getPhysicalSegment(IOByteCount offset,
-						 IOByteCount * length);
-#endif /* !__LP64__ */
-
-/*! @function getPhysicalAddress
-    @abstract Return the physical address of the first byte in the memory.
-    @discussion This method returns the physical address of the  first byte in the memory. It is most useful on memory known to be physically contiguous.
-    @result A physical address. */
-
-    IOPhysicalAddress getPhysicalAddress();
-
-#ifndef __LP64__
-    virtual void * getVirtualSegment(IOByteCount offset,
-					IOByteCount * length) APPLE_KEXT_DEPRECATED; /* use map() and getVirtualAddress() instead */
-#endif /* !__LP64__ */
-
-/*! @function prepare
-    @abstract Prepare the memory for an I/O transfer.
-    @discussion This involves paging in the memory, if necessary, and wiring it down for the duration of the transfer.  The complete() method completes the processing of the memory after the I/O transfer finishes.  Note that the prepare call is not thread safe and it is expected that the client will more easily be able to guarantee single threading a particular memory descriptor.
-    @param forDirection The direction of the I/O just completed, or kIODirectionNone for the direction specified by the memory descriptor.
-    @result An IOReturn code. */
-
-    virtual IOReturn prepare(IODirection forDirection = kIODirectionNone) = 0;
-
-/*! @function complete
-    @abstract Complete processing of the memory after an I/O transfer finishes.
-    @discussion This method should not be called unless a prepare was previously issued; the prepare() and complete() must occur in pairs, before and after an I/O transfer involving pageable memory.  In 10.3 or greater systems the direction argument to complete is not longer respected.  The direction is totally determined at prepare() time.
-    @param forDirection DEPRECATED The direction of the I/O just completed, or kIODirectionNone for the direction specified by the memory descriptor.
-    @result An IOReturn code. */
-
-    virtual IOReturn complete(IODirection forDirection = kIODirectionNone) = 0;
-
-    /*
-     * Mapping functions.
-     */
-
-/*! @function createMappingInTask
-    @abstract Maps a IOMemoryDescriptor into a task.
-    @discussion This is the general purpose method to map all or part of the memory described by a memory descriptor into a task at any available address, or at a fixed address if possible. Caching & read-only options may be set for the mapping. The mapping is represented as a returned reference to a IOMemoryMap object, which may be shared if the mapping is compatible with an existing mapping of the IOMemoryDescriptor. The IOMemoryMap object returned should be released only when the caller has finished accessing the mapping, as freeing the object destroys the mapping. 
-    @param intoTask Sets the target task for the mapping. Pass kernel_task for the kernel address space.
-    @param atAddress If a placed mapping is requested, atAddress specifies its address, and the kIOMapAnywhere should not be set. Otherwise, atAddress is ignored.
-    @param options Mapping options are defined in IOTypes.h,<br>
-	kIOMapAnywhere should be passed if the mapping can be created anywhere. If not set, the atAddress parameter sets the location of the mapping, if it is available in the target map.<br>
-	kIOMapDefaultCache to inhibit the cache in I/O areas, kIOMapCopybackCache in general purpose RAM.<br>
-	kIOMapInhibitCache, kIOMapWriteThruCache, kIOMapCopybackCache to set the appropriate caching.<br>
-	kIOMapReadOnly to allow only read only accesses to the memory - writes will cause and access fault.<br>
-	kIOMapReference will only succeed if the mapping already exists, and the IOMemoryMap object is just an extra reference, ie. no new mapping will be created.<br>
-	kIOMapUnique allows a special kind of mapping to be created that may be used with the IOMemoryMap::redirect() API. These mappings will not be shared as is the default - there will always be a unique mapping created for the caller, not an existing mapping with an extra reference.<br>
-    @param offset Is a beginning offset into the IOMemoryDescriptor's memory where the mapping starts. Zero is the default to map all the memory.
-    @param length Is the length of the mapping requested for a subset of the IOMemoryDescriptor. Zero is the default to map all the memory.
-    @result A reference to an IOMemoryMap object representing the mapping, which can supply the virtual address of the mapping and other information. The mapping may be shared with multiple callers - multiple maps are avoided if a compatible one exists. The IOMemoryMap object returned should be released only when the caller has finished accessing the mapping, as freeing the object destroys the mapping. The IOMemoryMap instance also retains the IOMemoryDescriptor it maps while it exists. */
-
-    IOMemoryMap * 	createMappingInTask(
-	task_t			intoTask,
-	mach_vm_address_t	atAddress,
-	IOOptionBits		options,
-	mach_vm_size_t		offset = 0,
-	mach_vm_size_t		length = 0 );
-
-#ifndef __LP64__
-    virtual IOMemoryMap * 	map(
-	task_t		intoTask,
-	IOVirtualAddress	atAddress,
-	IOOptionBits		options,
-	IOByteCount		offset = 0,
-	IOByteCount		length = 0 ) APPLE_KEXT_DEPRECATED; /* use createMappingInTask() instead */
-#endif /* !__LP64__ */
-
-/*! @function map
-    @abstract Maps a IOMemoryDescriptor into the kernel map.
-    @discussion This is a shortcut method to map all the memory described by a memory descriptor into the kernel map at any available address. See the full version of the createMappingInTask method for further details.
-    @param options Mapping options as in the full version of the createMappingInTask method, with kIOMapAnywhere assumed.
-    @result See the full version of the createMappingInTask method. */
-
-    virtual IOMemoryMap * 	map(
-	IOOptionBits		options = 0 );
-
-/*! @function setMapping
-    @abstract Establishes an already existing mapping.
-    @discussion This method tells the IOMemoryDescriptor about a mapping that exists, but was created elsewhere. It allows later callers of the map method to share this externally created mapping. The IOMemoryMap object returned is created to represent it. This method is not commonly needed.
-    @param task Address space in which the mapping exists.
-    @param mapAddress Virtual address of the mapping.
-    @param options Caching and read-only attributes of the mapping.
-    @result A IOMemoryMap object created to represent the mapping. */
-
-    virtual IOMemoryMap * 	setMapping(
-	task_t		task,
-	IOVirtualAddress	mapAddress,
-	IOOptionBits		options = 0 );
-
-    // Following methods are private implementation
-
-#ifdef __LP64__
-    virtual
-#endif /* __LP64__ */
-    IOReturn redirect( task_t safeTask, bool redirect );
-
-    IOReturn handleFault(
-        void *			pager,
-	vm_map_t		addressMap,
-	mach_vm_address_t	address,
-	mach_vm_size_t		sourceOffset,
-	mach_vm_size_t		length,
-        IOOptionBits		options );
-
-    virtual IOMemoryMap * 	makeMapping(
-	IOMemoryDescriptor *	owner,
-	task_t			intoTask,
-	IOVirtualAddress	atAddress,
-	IOOptionBits		options,
-	IOByteCount		offset,
-	IOByteCount		length );
-
-protected:
-    virtual void 		addMapping(
-	IOMemoryMap *		mapping );
-
-    virtual void 		removeMapping(
-	IOMemoryMap *		mapping );
-
-    virtual IOReturn doMap(
-	vm_map_t		addressMap,
-	IOVirtualAddress *	atAddress,
-	IOOptionBits		options,
-	IOByteCount		sourceOffset = 0,
-	IOByteCount		length = 0 );
-
-    virtual IOReturn doUnmap(
-	vm_map_t		addressMap,
-	IOVirtualAddress	logical,
-	IOByteCount		length );
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*! @class IOMemoryMap : public OSObject
-    @abstract A class defining common methods for describing a memory mapping.
-    @discussion The IOMemoryMap object represents a mapped range of memory, described by a IOMemoryDescriptor. The mapping may be in the kernel or a non-kernel task and has processor cache mode attributes. IOMemoryMap instances are created by IOMemoryDescriptor when it creates mappings in its map method, and returned to the caller. */
-
-class IOMemoryMap : public OSObject
-{
-    OSDeclareDefaultStructors(IOMemoryMap)
-
-protected:
-    virtual void taggedRelease(const void *tag = 0) const;
-    virtual void free();
-
-public:
-/*! @function getVirtualAddress
-    @abstract Accessor to the virtual address of the first byte in the mapping.
-    @discussion This method returns the virtual address of the first byte in the mapping.
-    @result A virtual address. */
-
-    virtual IOVirtualAddress 	getVirtualAddress();
-
-/*! @function getPhysicalSegment
-    @abstract Break a mapping into its physically contiguous segments.
-    @discussion This method returns the physical address of the byte at the given offset into the mapping, and optionally the length of the physically contiguous segment from that offset. It functions similarly to IOMemoryDescriptor::getPhysicalSegment.
-    @param offset A byte offset into the mapping whose physical address to return.
-    @param length If non-zero, getPhysicalSegment will store here the length of the physically contiguous segement at the given offset.
-    @result A physical address, or zero if the offset is beyond the length of the mapping. */
-
-#ifdef __LP64__
-    virtual IOPhysicalAddress 	getPhysicalSegment(IOByteCount offset,
-	       					   IOByteCount * length,
-	       					   IOOptionBits  options = 0);
-#else /* !__LP64__ */
-    virtual IOPhysicalAddress 	getPhysicalSegment(IOByteCount offset,
-	       					   IOByteCount * length);
-#endif /* !__LP64__ */
-
-/*! @function getPhysicalAddress
-    @abstract Return the physical address of the first byte in the mapping.
-    @discussion This method returns the physical address of the  first byte in the mapping. It is most useful on mappings known to be physically contiguous.
-    @result A physical address. */
-
-    IOPhysicalAddress getPhysicalAddress();
-
-/*! @function getLength
-    @abstract Accessor to the length of the mapping.
-    @discussion This method returns the length of the mapping.
-    @result A byte count. */
-
-    virtual IOByteCount 	getLength();
-
-/*! @function getAddressTask
-    @abstract Accessor to the task of the mapping.
-    @discussion This method returns the mach task the mapping exists in.
-    @result A mach task_t. */
-
-    virtual task_t		getAddressTask();
-
-/*! @function getMemoryDescriptor
-    @abstract Accessor to the IOMemoryDescriptor the mapping was created from.
-    @discussion This method returns the IOMemoryDescriptor the mapping was created from.
-    @result An IOMemoryDescriptor reference, which is valid while the IOMemoryMap object is retained. It should not be released by the caller. */
-
-    virtual IOMemoryDescriptor * getMemoryDescriptor();
-
-/*! @function getMapOptions
-    @abstract Accessor to the options the mapping was created with.
-    @discussion This method returns the options to IOMemoryDescriptor::map the mapping was created with.
-    @result Options for the mapping, including cache settings. */
-
-    virtual IOOptionBits 	getMapOptions();
-
-/*! @function unmap
-    @abstract Force the IOMemoryMap to unmap, without destroying the object.
-    @discussion IOMemoryMap instances will unmap themselves upon free, ie. when the last client with a reference calls release. This method forces the IOMemoryMap to destroy the mapping it represents, regardless of the number of clients. It is not generally used.
-    @result An IOReturn code. */
-
-    virtual IOReturn 		unmap();
-
-    virtual void		taskDied();
-
-/*! @function redirect
-    @abstract Replace the memory mapped in a process with new backing memory.
-    @discussion An IOMemoryMap created with the kIOMapUnique option to IOMemoryDescriptor::map() can remapped to a new IOMemoryDescriptor backing object. If the new IOMemoryDescriptor is specified as NULL, client access to the memory map is blocked until a new backing object has been set. By blocking access and copying data, the caller can create atomic copies of the memory while the client is potentially reading or writing the memory. 
-    @param newBackingMemory The IOMemoryDescriptor that represents the physical memory that is to be now mapped in the virtual range the IOMemoryMap represents. If newBackingMemory is NULL, any access to the mapping will hang (in vm_fault()) until access has been restored by a new call to redirect() with non-NULL newBackingMemory argument.
-    @param options Mapping options are defined in IOTypes.h, and are documented in IOMemoryDescriptor::map()
-    @param offset As with IOMemoryDescriptor::map(), a beginning offset into the IOMemoryDescriptor's memory where the mapping starts. Zero is the default.
-    @result An IOReturn code. */
-
-#ifndef __LP64__
-// For 32 bit XNU, there is a 32 bit (IOByteCount) and a 64 bit (mach_vm_size_t) interface;
-// for 64 bit, these fall together on the 64 bit one.
-    virtual IOReturn		redirect(IOMemoryDescriptor * newBackingMemory,
-					 IOOptionBits         options,
-					 IOByteCount          offset = 0);
-#endif
-    virtual IOReturn		redirect(IOMemoryDescriptor * newBackingMemory,
-					 IOOptionBits         options,
-					 mach_vm_size_t       offset = 0);
-
-#ifdef __LP64__
-    inline mach_vm_address_t 	getAddress() __attribute__((always_inline));
-    inline mach_vm_size_t 	getSize() __attribute__((always_inline));
-#else /* !__LP64__ */
-    virtual mach_vm_address_t 	getAddress();
-    virtual mach_vm_size_t 	getSize();
-#endif /* !__LP64__ */
-
-
-    OSMetaClassDeclareReservedUnused(IOMemoryMap, 0);
-    OSMetaClassDeclareReservedUnused(IOMemoryMap, 1);
-    OSMetaClassDeclareReservedUnused(IOMemoryMap, 2);
-    OSMetaClassDeclareReservedUnused(IOMemoryMap, 3);
-    OSMetaClassDeclareReservedUnused(IOMemoryMap, 4);
-    OSMetaClassDeclareReservedUnused(IOMemoryMap, 5);
-    OSMetaClassDeclareReservedUnused(IOMemoryMap, 6);
-    OSMetaClassDeclareReservedUnused(IOMemoryMap, 7);
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#if !defined(__LP64) || defined(_IOMEMORYDESCRIPTOR_INTERNAL_)
-
-// The following classes are private implementation of IOMemoryDescriptor - they
-// should not be referenced directly, just through the public API's in the 
-// IOMemoryDescriptor class. For example, an IOGeneralMemoryDescriptor instance
-// might be created by IOMemoryDescriptor::withAddressRange(), but there should be 
-// no need to reference as anything but a generic IOMemoryDescriptor *.
-
-class IOGeneralMemoryDescriptor : public IOMemoryDescriptor
-{
-    OSDeclareDefaultStructors(IOGeneralMemoryDescriptor);
-
-public:
-    union Ranges {
-        IOVirtualRange   *v;
-        IOAddressRange   *v64;
-        IOPhysicalRange  *p;
-	void 		 *uio;
-    };
-protected:
-    Ranges		_ranges;
-    unsigned		_rangesCount;       /* number of address ranges in list */
-#ifndef __LP64__
-    bool		_rangesIsAllocated; /* is list allocated by us? */
-#endif /* !__LP64__ */
-
-    task_t		_task;               /* task where all ranges are mapped to */
-
-    union {
-        IOVirtualRange	v;
-        IOPhysicalRange	p;
-    }			_singleRange;	   /* storage space for a single range */
-
-    unsigned		_wireCount;        /* number of outstanding wires */
-
-#ifndef __LP64__
-    uintptr_t _cachedVirtualAddress;
-
-    IOPhysicalAddress	_cachedPhysicalAddress;
-#endif /* !__LP64__ */
-
-    bool		_initialized;      /* has superclass been initialized? */
-
-public:
-    virtual void free();
-
-    virtual IOReturn dmaCommandOperation(DMACommandOps op, void *vData, UInt dataSize) const;
-
-    virtual uint64_t getPreparationID( void );
-
-private:
-
-#ifndef __LP64__
-    virtual void setPosition(IOByteCount position);
-    virtual void mapIntoKernel(unsigned rangeIndex);
-    virtual void unmapFromKernel();
-#endif /* !__LP64__ */
-
-    // Internal APIs may be made virtual at some time in the future.
-    IOReturn wireVirtual(IODirection forDirection);
-    void *createNamedEntry();
-
-    // Internal
-    OSData *	    _memoryEntries;
-    unsigned int    _pages;
-    ppnum_t	    _highestPage;
-    uint32_t	    __iomd_reservedA;
-    uint32_t	    __iomd_reservedB;
-
-    IOLock *	    _prepareLock;
-
-public:
-    /*
-     * IOMemoryDescriptor required methods
-     */
-
-    // Master initaliser
-    virtual bool initWithOptions(void *		buffers,
-                                 UInt32		count,
-                                 UInt32		offset,
-                                 task_t		task,
-                                 IOOptionBits	options,
-                                 IOMapper *	mapper = kIOMapperSystem);
-
-#ifndef __LP64__
-    // Secondary initialisers
-    virtual bool initWithAddress(void *		address,
-                                 IOByteCount	withLength,
-                                 IODirection	withDirection) APPLE_KEXT_DEPRECATED;
-
-    virtual bool initWithAddress(IOVirtualAddress address,
-                                 IOByteCount    withLength,
-                                 IODirection	withDirection,
-                                 task_t		withTask) APPLE_KEXT_DEPRECATED;
-
-    virtual bool initWithPhysicalAddress(
-				 IOPhysicalAddress	address,
-				 IOByteCount		withLength,
-				 IODirection      	withDirection ) APPLE_KEXT_DEPRECATED;
-
-    virtual bool initWithRanges(        IOVirtualRange * ranges,
-                                        UInt32           withCount,
-                                        IODirection      withDirection,
-                                        task_t           withTask,
-                                        bool             asReference = false) APPLE_KEXT_DEPRECATED;
-
-    virtual bool initWithPhysicalRanges(IOPhysicalRange * ranges,
-                                        UInt32           withCount,
-                                        IODirection      withDirection,
-                                        bool             asReference = false) APPLE_KEXT_DEPRECATED;
-
-    virtual addr64_t getPhysicalSegment64( IOByteCount offset,
-                                            IOByteCount * length ) APPLE_KEXT_DEPRECATED;
-
-    virtual IOPhysicalAddress getPhysicalSegment(IOByteCount offset,
-						 IOByteCount * length);
-
-    virtual IOPhysicalAddress getSourceSegment(IOByteCount offset,
-                                               IOByteCount * length) APPLE_KEXT_DEPRECATED;
-
-    virtual void * getVirtualSegment(IOByteCount offset,
-					IOByteCount * length) APPLE_KEXT_DEPRECATED;
-#endif /* !__LP64__ */
-
-    virtual IOReturn setPurgeable( IOOptionBits newState,
-                                    IOOptionBits * oldState );
-
-    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
-                                         IOByteCount * length,
-#ifdef __LP64__
-                                         IOOptionBits  options = 0 );
-#else /* !__LP64__ */
-                                         IOOptionBits  options );
-#endif /* !__LP64__ */
-
-    virtual IOReturn prepare(IODirection forDirection = kIODirectionNone);
-
-    virtual IOReturn complete(IODirection forDirection = kIODirectionNone);
-
-    virtual IOReturn doMap(
-	vm_map_t		addressMap,
-	IOVirtualAddress *	atAddress,
-	IOOptionBits		options,
-	IOByteCount		sourceOffset = 0,
-	IOByteCount		length = 0 );
-
-    virtual IOReturn doUnmap(
-	vm_map_t		addressMap,
-	IOVirtualAddress	logical,
-	IOByteCount		length );
-
-    virtual bool serialize(OSSerialize *s) const;
-
-    // Factory method for cloning a persistent IOMD, see IOMemoryDescriptor
-    static IOMemoryDescriptor *
-	withPersistentMemoryDescriptor(IOGeneralMemoryDescriptor *originalMD);
-
-};
-
-#endif /* !defined(__LP64) || defined(_IOMEMORYDESCRIPTOR_INTERNAL_) */
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#ifdef __LP64__
-mach_vm_address_t 	IOMemoryMap::getAddress()
-{
-    return (getVirtualAddress());
-}
-
-mach_vm_size_t 	IOMemoryMap::getSize()
-{
-    return (getLength());
-}
-#else /* !__LP64__ */
-#include <IOKit/IOSubMemoryDescriptor.h>
-#endif /* !__LP64__ */
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-#endif /* !_IOMEMORYDESCRIPTOR_H */
diff --git a/i386/include/IOKit/IOMessage.h b/i386/include/IOKit/IOMessage.h
deleted file mode 100644
index 3ca9e1e..0000000
--- a/i386/include/IOKit/IOMessage.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef __IOKIT_IOMESSAGE_H
-#define __IOKIT_IOMESSAGE_H
-
-#include <IOKit/IOReturn.h>
-#include <IOKit/IOTypes.h>
-
-typedef UInt32 IOMessage;
-
-#define iokit_common_msg(message)          (UInt32)(sys_iokit|sub_iokit_common|message)
-#define iokit_family_msg(sub,message)      (UInt32)(sys_iokit|sub|message)
-
-/*! @defined iokit_vendor_specific_msg
-    @discussion iokit_vendor_specific_msg passes messages in the sub_iokit_vendor_specific
-    subsystem. It can be used to be generate messages that are used for private 
-    communication between vendor specific code with the  IOService::message() etc. APIs.
-*/
-#define iokit_vendor_specific_msg(message) (UInt32)(sys_iokit|sub_iokit_vendor_specific|message)
-
-#define kIOMessageServiceIsTerminated      iokit_common_msg(0x010)
-#define kIOMessageServiceIsSuspended       iokit_common_msg(0x020)
-#define kIOMessageServiceIsResumed         iokit_common_msg(0x030)
-
-#define kIOMessageServiceIsRequestingClose iokit_common_msg(0x100)
-#define kIOMessageServiceIsAttemptingOpen  iokit_common_msg(0x101)
-#define kIOMessageServiceWasClosed         iokit_common_msg(0x110)
-
-#define kIOMessageServiceBusyStateChange   iokit_common_msg(0x120)
-
-#define kIOMessageServicePropertyChange    iokit_common_msg(0x130)
-
-#define kIOMessageCanDevicePowerOff        iokit_common_msg(0x200)
-#define kIOMessageDeviceWillPowerOff       iokit_common_msg(0x210)
-#define kIOMessageDeviceWillNotPowerOff    iokit_common_msg(0x220)
-#define kIOMessageDeviceHasPoweredOn       iokit_common_msg(0x230)
-#define kIOMessageCanSystemPowerOff        iokit_common_msg(0x240)
-#define kIOMessageSystemWillPowerOff       iokit_common_msg(0x250)
-#define kIOMessageSystemWillNotPowerOff    iokit_common_msg(0x260)
-#define kIOMessageCanSystemSleep           iokit_common_msg(0x270)
-#define kIOMessageSystemWillSleep          iokit_common_msg(0x280)
-#define kIOMessageSystemWillNotSleep       iokit_common_msg(0x290)
-#define kIOMessageSystemHasPoweredOn       iokit_common_msg(0x300)
-#define kIOMessageSystemWillRestart        iokit_common_msg(0x310)
-#define kIOMessageSystemWillPowerOn        iokit_common_msg(0x320)
-
-#define kIOMessageCopyClientID		   iokit_common_msg(0x330)
-
-#endif /* ! __IOKIT_IOMESSAGE_H */
diff --git a/i386/include/IOKit/IOMultiMemoryDescriptor.h b/i386/include/IOKit/IOMultiMemoryDescriptor.h
deleted file mode 100644
index 42b19a4..0000000
--- a/i386/include/IOKit/IOMultiMemoryDescriptor.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOMULTIMEMORYDESCRIPTOR_H
-#define _IOMULTIMEMORYDESCRIPTOR_H
-
-#include <IOKit/IOMemoryDescriptor.h>
-
-/*! @class IOMultiMemoryDescriptor : public IOMemoryDescriptor
-    @abstract The IOMultiMemoryDescriptor object describes a memory area made up of several other IOMemoryDescriptors.
-    @discussion The IOMultiMemoryDescriptor object represents multiple ranges of memory, specified as an ordered list of IOMemoryDescriptors.  The descriptors are chained end-to-end to make up a single contiguous buffer. */
-
-class IOMultiMemoryDescriptor : public IOMemoryDescriptor
-{
-    OSDeclareDefaultStructors(IOMultiMemoryDescriptor);
-
-protected:
-
-    IOMemoryDescriptor ** _descriptors;
-    UInt32                _descriptorsCount;
-    bool                  _descriptorsIsAllocated;
-
-    virtual void free();
-
-public:
-
-/*! @function withDescriptors
-    @abstract Create an IOMultiMemoryDescriptor to describe a memory area made up of several other IOMemoryDescriptors.
-    @discussion This method creates and initializes an IOMultiMemoryDescriptor for memory consisting of a number of other IOMemoryDescriptors, chained end-to-end (in the order they appear in the array) to represent a single contiguous memory buffer.  Passing the descriptor array as a reference will avoid an extra allocation.
-    @param descriptors An array of IOMemoryDescriptors which make up the memory to be described.
-    @param withCount The object count for the descriptors array.
-    @param withDirection An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
-    @param asReference If false, the IOMultiMemoryDescriptor object will make a copy of the descriptors array, otherwise, the array will be used in situ, avoiding an extra allocation.
-    @result The created IOMultiMemoryDescriptor on success, to be released by the caller, or zero on failure. */
-
-    static IOMultiMemoryDescriptor * withDescriptors(
-                                  IOMemoryDescriptor ** descriptors,
-                                  UInt32                withCount,
-                                  IODirection           withDirection,
-                                  bool                  asReference = false );
-
-/*! @function withDescriptors
-    @abstract Initialize an IOMultiMemoryDescriptor to describe a memory area made up of several other IOMemoryDescriptors.
-    @discussion This method initializes an IOMultiMemoryDescriptor for memory consisting of a number of other IOMemoryDescriptors, chained end-to-end (in the order they appear in the array) to represent a single contiguous memory buffer.  Passing the descriptor array as a reference will avoid an extra allocation.
-    @param descriptors An array of IOMemoryDescriptors which make up the memory to be described.
-    @param withCount The object count for the descriptors array.
-    @param withDirection An I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures.
-    @param asReference If false, the IOMultiMemoryDescriptor object will make a copy of the descriptors array, otherwise, the array will be used in situ, avoiding an extra allocation.
-    @result The created IOMultiMemoryDescriptor on success, to be released by the caller, or zero on failure. */
-
-    virtual bool initWithDescriptors(
-                                  IOMemoryDescriptor ** descriptors,
-                                  UInt32                withCount,
-                                  IODirection           withDirection,
-                                  bool                  asReference = false );
-
-/*! @function getPhysicalSegment
-    @abstract Break a memory descriptor into its physically contiguous segments.
-    @discussion This method returns the physical address of the byte at the given offset into the memory, and optionally the length of the physically contiguous segment from that offset.
-    @param offset A byte offset into the memory whose physical address to return.
-    @param length If non-zero, getPhysicalSegment will store here the length of the physically contiguous segement at the given offset.
-    @result A physical address, or zero if the offset is beyond the length of the memory. */
-
-    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
-                                         IOByteCount * length,
-                                         IOOptionBits  options = 0 );
-
-/*! @function prepare
-    @abstract Prepare the memory for an I/O transfer.
-    @discussion This involves paging in the memory, if necessary, and wiring it down for the duration of the transfer.  The complete() method completes the processing of the memory after the I/O transfer finishes.  This method needn't called for non-pageable memory.
-    @param forDirection The direction of the I/O just completed, or kIODirectionNone for the direction specified by the memory descriptor.
-    @result An IOReturn code. */
-
-    virtual IOReturn prepare(IODirection forDirection = kIODirectionNone);
-
-/*! @function complete
-    @abstract Complete processing of the memory after an I/O transfer finishes.
-    @discussion This method should not be called unless a prepare was previously issued; the prepare() and complete() must occur in pairs, before and after an I/O transfer involving pageable memory.
-    @param forDirection The direction of the I/O just completed, or kIODirectionNone for the direction specified by the memory descriptor.
-    @result An IOReturn code. */
-
-    virtual IOReturn complete(IODirection forDirection = kIODirectionNone);
-};
-
-#endif /* !_IOMULTIMEMORYDESCRIPTOR_H */
diff --git a/i386/include/IOKit/IONVRAM.h b/i386/include/IOKit/IONVRAM.h
deleted file mode 100644
index a9337bd..0000000
--- a/i386/include/IOKit/IONVRAM.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IONVRAM_H
-#define _IOKIT_IONVRAM_H
-
-#include <IOKit/IOKitKeys.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IODeviceTreeSupport.h>
-#include <IOKit/nvram/IONVRAMController.h>
-
-
-#define kIODTNVRAMOFPartitionName       "common"
-#define kIODTNVRAMXPRAMPartitionName    "APL,MacOS75"
-#define kIODTNVRAMPanicInfoPartitonName "APL,OSXPanic"
-#define kIODTNVRAMFreePartitionName     "wwwwwwwwwwww"
-
-enum {
-  kIODTNVRAMImageSize        = 0x2000,
-  kIODTNVRAMXPRAMSize        = 0x0100,
-  kIODTNVRAMNameRegistrySize = 0x0400
-};
-
-enum {
-  kOFVariableTypeBoolean = 1,
-  kOFVariableTypeNumber,
-  kOFVariableTypeString,
-  kOFVariableTypeData
-};
-
-enum {
-  kOFVariablePermRootOnly = 0,
-  kOFVariablePermUserRead,
-  kOFVariablePermUserWrite,
-  kOFVariablePermKernelOnly
-};
-
-class IODTNVRAM : public IOService
-{
-  OSDeclareDefaultStructors(IODTNVRAM);
-  
-private:
-  IONVRAMController *_nvramController;
-  const OSSymbol    *_registryPropertiesKey;
-  UInt8             *_nvramImage;
-  bool              _nvramImageDirty;
-  UInt32            _ofPartitionOffset;
-  UInt32            _ofPartitionSize;
-  UInt8             *_ofImage;
-  bool              _ofImageDirty;
-  OSDictionary      *_ofDict;
-  OSDictionary      *_nvramPartitionOffsets;
-  OSDictionary      *_nvramPartitionLengths;
-  UInt32            _xpramPartitionOffset;
-  UInt32            _xpramPartitionSize;
-  UInt8             *_xpramImage;
-  UInt32            _nrPartitionOffset;
-  UInt32            _nrPartitionSize;
-  UInt8             *_nrImage;
-  UInt32            _piPartitionOffset;
-  UInt32            _piPartitionSize;
-  UInt8             *_piImage;
-  bool              _systemPaniced;
-  
-  virtual UInt8 calculatePartitionChecksum(UInt8 *partitionHeader);
-  virtual IOReturn initOFVariables(void);
-public:
-  virtual IOReturn syncOFVariables(void);
-private:
-  virtual UInt32 getOFVariableType(const OSSymbol *propSymbol) const;
-  virtual UInt32 getOFVariablePerm(const OSSymbol *propSymbol) const;
-  virtual bool getOWVariableInfo(UInt32 variableNumber, const OSSymbol **propSymbol,
-				 UInt32 *propType, UInt32 *propOffset);
-  virtual bool convertPropToObject(UInt8 *propName, UInt32 propNameLength,
-				   UInt8 *propData, UInt32 propDataLength,
-				   const OSSymbol **propSymbol,
-				   OSObject **propObject);
-  virtual bool convertObjectToProp(UInt8 *buffer, UInt32 *length,
-				   const OSSymbol *propSymbol, OSObject *propObject);
-  virtual UInt16 generateOWChecksum(UInt8 *buffer);
-  virtual bool validateOWChecksum(UInt8 *buffer);
-  virtual void updateOWBootArgs(const OSSymbol *key, OSObject *value);
-  virtual bool searchNVRAMProperty(struct IONVRAMDescriptor *hdr,
-				   UInt32 *where);
-  
-  virtual IOReturn readNVRAMPropertyType0(IORegistryEntry *entry,
-					  const OSSymbol **name,
-					  OSData **value);
-  virtual IOReturn writeNVRAMPropertyType0(IORegistryEntry *entry,
-					   const OSSymbol *name,
-					   OSData * value);
-  
-  virtual OSData *unescapeBytesToData(const UInt8 *bytes, UInt32 length);
-  virtual OSData *escapeDataToData(OSData * value);
-
-  virtual IOReturn readNVRAMPropertyType1(IORegistryEntry *entry,
-					  const OSSymbol **name,
-					  OSData **value);
-  virtual IOReturn writeNVRAMPropertyType1(IORegistryEntry *entry,
-					   const OSSymbol *name,
-					   OSData *value);
-  
-public:
-  virtual bool init(IORegistryEntry *old, const IORegistryPlane *plane);
-  
-  virtual void registerNVRAMController(IONVRAMController *nvram);
-  
-  virtual void sync(void);
-  
-  virtual bool serializeProperties(OSSerialize *s) const;
-  virtual OSObject *getProperty(const OSSymbol *aKey) const;
-  virtual OSObject *getProperty(const char *aKey) const;
-  virtual bool setProperty(const OSSymbol *aKey, OSObject *anObject);
-  virtual void removeProperty(const OSSymbol *aKey);
-  virtual IOReturn setProperties(OSObject *properties);
-  
-  virtual IOReturn readXPRAM(IOByteCount offset, UInt8 *buffer,
-			     IOByteCount length);
-  virtual IOReturn writeXPRAM(IOByteCount offset, UInt8 *buffer,
-			      IOByteCount length);
-  
-  virtual IOReturn readNVRAMProperty(IORegistryEntry *entry,
-				     const OSSymbol **name,
-				     OSData **value);
-  virtual IOReturn writeNVRAMProperty(IORegistryEntry *entry,
-				      const OSSymbol *name,
-				      OSData *value);
-  
-  virtual OSDictionary *getNVRAMPartitions(void);
-  
-  virtual IOReturn readNVRAMPartition(const OSSymbol *partitionID,
-				      IOByteCount offset, UInt8 *buffer,
-				      IOByteCount length);
-  
-  virtual IOReturn writeNVRAMPartition(const OSSymbol *partitionID,
-				       IOByteCount offset, UInt8 *buffer,
-				       IOByteCount length);  
-  
-  virtual IOByteCount savePanicInfo(UInt8 *buffer, IOByteCount length);
-};
-
-#endif /* !_IOKIT_IONVRAM_H */
diff --git a/i386/include/IOKit/IONotifier.h b/i386/include/IOKit/IONotifier.h
deleted file mode 100644
index 8f4378a..0000000
--- a/i386/include/IOKit/IONotifier.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-#ifndef _IOKIT_IONOTIFIER_H
-#define _IOKIT_IONOTIFIER_H
-
-#include <libkern/c++/OSObject.h>
-
-/*! @class IONotifier : public OSObject
-    @abstract An abstract base class defining common methods for controlling a notification request.
-    @discussion IOService notification requests are represented as implementations of the IONotifier object. It defines methods to enable, disable and remove notification requests. These actions are synchronized with invocations of the notification handler, so removing a notification request will guarantee the handler is not being executed. */
-
-class IONotifier : public OSObject
-{
-    OSDeclareAbstractStructors(IONotifier)
-
-public:
-
-/*! @function remove
-    @abstract Removes the notification request and releases it.
-    @discussion Removes the notification request and release it. Since creating an IONotifier instance will leave it with a retain count of one, creating an IONotifier and then removing it will destroy it. This method is synchronous with any handler invocations, so when this method returns its guaranteed the handler will not be in entered. */
-
-    virtual void remove() = 0;
-
-/*! @function disable
-    @abstract Disables the notification request.
-    @discussion Disables the notification request. This method is synchronous with any handler invocations, so when this method returns its guaranteed the handler will not be in entered.
-    @result Returns the previous enable state of the IONotifier. */
-
-    virtual bool disable() = 0;
-    
-/*! @function enable
-    @abstract Sets the enable state of the notification request.
-    @discussion Restores the enable state of the notification request, given the previous state passed in.
-    @param was The enable state of the notifier to restore. */
-
-    virtual void enable( bool was ) = 0;
-
-};
-
-#endif /* ! _IOKIT_IONOTIFIER_H */
diff --git a/i386/include/IOKit/IOPlatformExpert.h b/i386/include/IOKit/IOPlatformExpert.h
deleted file mode 100644
index f75a3e3..0000000
--- a/i386/include/IOKit/IOPlatformExpert.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOPLATFORMEXPERT_H
-#define _IOKIT_IOPLATFORMEXPERT_H
-
-#ifdef __cplusplus
-#include <IOKit/IOLib.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOInterrupts.h>
-#include <IOKit/IOInterruptController.h>
-
-extern "C" {
-#endif
-
-#include <libkern/OSTypes.h>
-
-extern boolean_t PEGetMachineName( char * name, int maxLength );
-extern boolean_t PEGetModelName( char * name, int maxLength );
-extern int PEGetPlatformEpoch( void );
-
-enum {
-  kPEHaltCPU,
-  kPERestartCPU,
-  kPEHangCPU,
-  kPEUPSDelayHaltCPU,
-  kPEPanicRestartCPU,
-  kPEPanicSync
-};
-extern int (*PE_halt_restart)(unsigned int type);
-extern int PEHaltRestart(unsigned int type);
-
-// Save the Panic Info.  Returns the number of bytes saved.
-extern UInt32 PESavePanicInfo(UInt8 *buffer, UInt32 length);
-
-extern long PEGetGMTTimeOfDay( void );
-extern void PESetGMTTimeOfDay( long secs );
-  
-#ifdef __cplusplus
-} /* extern "C" */
-
-#define kIOPlatformMapperPresentKey "IOPlatformMapperPresent"
-
-
-extern OSSymbol *               gPlatformInterruptControllerName;
-
-extern const OSSymbol *		gIOPlatformSleepActionKey;
-extern const OSSymbol *		gIOPlatformWakeActionKey;
-extern const OSSymbol *		gIOPlatformQuiesceActionKey;
-extern const OSSymbol *		gIOPlatformActiveActionKey;
-
-class IORangeAllocator;
-class IONVRAMController;
-class IOPMrootDomain;
-
-class IOPlatformExpert : public IOService
-{
-    OSDeclareDefaultStructors(IOPlatformExpert);
-
-private:
-    long _peBootROMType;
-    long _peChipSetType;
-    long _peMachineType;
-
-protected:
-    IOPMrootDomain * root;
-    int _pePMFeatures;
-    int _pePrivPMFeatures;
-    int _peNumBatteriesSupported;
-    OSArray  * thePowerTree;
-
-    bool       searchingForAdditionalParents;
-    OSNumber * multipleParentKeyValue;
-    int        numInstancesRegistered;
-
-    struct ExpansionData { };
-    ExpansionData *reserved;
-
-    virtual void setBootROMType(long peBootROMType);
-    virtual void setChipSetType(long peChipSetType);
-    virtual void setMachineType(long peMachineType);
-
-    virtual bool CheckSubTree (OSArray * inSubTree, IOService * theNub, IOService * theDevice, OSDictionary * theParent);
-    virtual bool RegisterServiceInTree (IOService * theService, OSDictionary * theTreeNode, OSDictionary * theTreeParentNode, IOService * theProvider);
-
-    virtual void PMInstantiatePowerDomains ( void );
-
-public:
-    virtual bool attach( IOService * provider );
-    virtual bool start( IOService * provider );
-    virtual bool configure( IOService * provider );
-    virtual IOService * createNub( OSDictionary * from );
-
-    virtual bool compareNubName( const IOService * nub, OSString * name,
-				 OSString ** matched = 0 ) const;
-    virtual IOReturn getNubResources( IOService * nub );
-
-    virtual long getBootROMType(void);
-    virtual long getChipSetType(void);
-    virtual long getMachineType(void);
-
-    virtual bool getModelName( char * name, int maxLength );
-    virtual bool getMachineName( char * name, int maxLength );
-
-    virtual int haltRestart(unsigned int type);
-    virtual void sleepKernel(void);
-
-    virtual long getGMTTimeOfDay( void );
-    virtual void setGMTTimeOfDay( long secs );
-
-    virtual IOReturn getConsoleInfo( PE_Video * consoleInfo );
-    virtual IOReturn setConsoleInfo( PE_Video * consoleInfo, unsigned int op );
-
-    virtual void registerNVRAMController( IONVRAMController * nvram );
-
-    virtual IOReturn registerInterruptController(OSSymbol *name, IOInterruptController *interruptController);
-    virtual IOInterruptController *lookUpInterruptController(OSSymbol *name);
-    virtual void setCPUInterruptProperties(IOService *service);
-    virtual bool atInterruptLevel(void);
-
-    virtual IOReturn callPlatformFunction(const OSSymbol *functionName,
-					  bool waitForFunction,
-					  void *param1, void *param2,
-					  void *param3, void *param4);
-
-    virtual IORangeAllocator * getPhysicalRangeAllocator(void);
-
-    virtual bool platformAdjustService(IOService *service);
-
-    virtual void PMRegisterDevice(IOService * theNub, IOService * theDevice);
-    virtual void PMLog ( const char *,unsigned long, unsigned long, unsigned long );
-
-    virtual bool hasPMFeature (unsigned long featureMask);
-    virtual bool hasPrivPMFeature (unsigned long privFeatureMask);
-    virtual int  numBatteriesSupported (void);
-
-    virtual IOByteCount savePanicInfo(UInt8 *buffer, IOByteCount length);
-
-    virtual OSString* createSystemSerialNumberString(OSData* myProperty);
-    
-    OSMetaClassDeclareReservedUsed(IOPlatformExpert,  0);
-    OSMetaClassDeclareReservedUsed(IOPlatformExpert,  1);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  2);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  3);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  4);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  5);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  6);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  7);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  8);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  9);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert, 10);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert, 11);
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-class IODTNVRAM;
-
-class IODTPlatformExpert : public IOPlatformExpert
-{
-    OSDeclareAbstractStructors(IODTPlatformExpert);
-
-private:
-    IODTNVRAM *dtNVRAM;
-
-    struct ExpansionData { };
-    ExpansionData *reserved;
-
-public:
-    virtual IOService * probe(	IOService * 	provider,
-				SInt32 	  *	score );
-    virtual bool configure( IOService * provider );
-
-    virtual void processTopLevel( IORegistryEntry * root );
-    virtual const char * deleteList( void ) = 0;
-    virtual const char * excludeList( void ) = 0;
-    virtual IOService * createNub( IORegistryEntry * from );
-    virtual bool createNubs( IOService * parent, OSIterator * iter );
-
-    virtual bool compareNubName( const IOService * nub, OSString * name,
-				 OSString ** matched = 0 ) const;
-
-    virtual IOReturn getNubResources( IOService * nub );
-
-    virtual bool getModelName( char * name, int maxLength );
-    virtual bool getMachineName( char * name, int maxLength );
-    
-    virtual void registerNVRAMController( IONVRAMController * nvram );
-
-    virtual int haltRestart(unsigned int type);
-
-    /* virtual */ IOReturn readXPRAM(IOByteCount offset, UInt8 * buffer,
-				     IOByteCount length);
-
-    /* virtual */ IOReturn writeXPRAM(IOByteCount offset, UInt8 * buffer,
-				      IOByteCount length);
-
-    virtual IOReturn readNVRAMProperty(
-	IORegistryEntry * entry,
-	const OSSymbol ** name, OSData ** value );
-
-    virtual IOReturn writeNVRAMProperty(
-	IORegistryEntry * entry,
-	const OSSymbol * name, OSData * value );
-
-    // This returns a dictionary describing all the NVRAM partitions.
-    // The keys will be the partitionIDs of the form "0x52,nvram".
-    // The values will be OSNumbers of the partition's byte count.
-    /* virtual */ OSDictionary *getNVRAMPartitions(void);
-
-    /* virtual */ IOReturn readNVRAMPartition(const OSSymbol * partitionID,
-					      IOByteCount offset, UInt8 * buffer,
-					      IOByteCount length);
-
-    /* virtual */ IOReturn writeNVRAMPartition(const OSSymbol * partitionID,
-					       IOByteCount offset, UInt8 * buffer,
-					       IOByteCount length);
-
-    virtual IOByteCount savePanicInfo(UInt8 *buffer, IOByteCount length);
-    virtual OSString* createSystemSerialNumberString(OSData* myProperty);
-
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  0);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  1);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  2);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  3);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  4);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  5);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  6);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  7);
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* generic root nub of service tree */
-
-class IOPlatformExpertDevice : public IOService
-{
-    OSDeclareDefaultStructors(IOPlatformExpertDevice)
-
-private:
-    IOWorkLoop *workLoop;
-
-    struct ExpansionData { };
-    ExpansionData *reserved;
-
-public:
-    virtual bool initWithArgs( void * p1, void * p2,
-					void * p3, void *p4 );
-    virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
-
-    virtual IOWorkLoop *getWorkLoop() const;
-    virtual IOReturn setProperties( OSObject * properties );
-
-    virtual void free();
-
-    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  0);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  1);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  2);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  3);
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/* generic nub for motherboard devices */
-
-class IOPlatformDevice : public IOService
-{
-    OSDeclareDefaultStructors(IOPlatformDevice)
-
-    struct ExpansionData { };
-    ExpansionData *reserved;
-
-public:
-    virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
-    virtual IOService * matchLocation( IOService * client );
-    virtual IOReturn getResources( void );
-
-    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  0);
-    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  1);
-    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  2);
-    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  3);
-};
-
-#endif /* __cplusplus */
-
-#endif /* ! _IOKIT_IOPLATFORMEXPERT_H */
diff --git a/i386/include/IOKit/IORangeAllocator.h b/i386/include/IOKit/IORangeAllocator.h
deleted file mode 100644
index d81bbef..0000000
--- a/i386/include/IOKit/IORangeAllocator.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.
- *
- *
- * HISTORY
- *
- * sdouglas 05 Nov 99 - created.
- */
-
-#ifndef _IOKIT_IORANGEALLOCATOR_H
-#define _IOKIT_IORANGEALLOCATOR_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOTypes.h>
-
-typedef IOByteCount IORangeScalar;
-
-/*! @class IORangeAllocator
-    @abstract A utility class to manage allocations from a range.
-    @discussion The IORangeAllocator class provides functions for allocating ranges, at a fixed or any offset, and freeing them back to a free list. It is useful for describing ranges of memory or address space without requiring storage in the memory - information describing the free elements is kept elsewhere. Ranges are described by a start offset and a size. IORangeAllocator is optionally protected against multithreaded access. 
-*/
-
-class IORangeAllocator : public OSObject {
-
-    OSDeclareDefaultStructors(IORangeAllocator)
-
-protected:
-    UInt32		numElements;
-    UInt32		capacity;
-    UInt32		capacityIncrement;
-    IORangeScalar	defaultAlignmentMask;
-    IOOptionBits	options;
-
-    struct IORangeAllocatorElement * 	elements;
-
-private:
-    virtual bool allocElement( UInt32 index );
-
-    virtual void deallocElement( UInt32 index );
-
-public:
-    enum {
-	kLocking	= 0x00000001
-    };
-
-/*! @function init
-    @abstract Standard initializer for IORangeAllocator.
-    @discussion This method initializes an IORangeAllocator and optionally sets the free list to contain one fragment, from zero to an endOfRange parameter. The capacity in terms of free fragments and locking options are set for the instance.
-    @param endOfRange If the free list is to contain an initial fragment, set endOfRange to the last offset in the range, ie. size - 1, to create a free fragment for the range zero to endOfRange inclusive. If zero is passed, the free list will be initialized empty, and can be populated with calls to the deallocate method.
-    @param defaultAlignment If this parameter is non-zero it specifies a required alignment for all allocations, for example pass 256 to align allocations on 256 byte boundaries. Zero or one specify unaligned allocations.
-    @param capacity Sets the initial size of the free list in number of noncontiguous fragments. This value is also used for the capacityIncrement.
-    @param options Pass kLocking if the instance can be used by multiple threads.
-    @result Returns true if the instance is successfully initialized, false on failure. */
-
-    virtual bool init( IORangeScalar endOfRange,
-			IORangeScalar defaultAlignment,
-			UInt32 capacity,
-			IOOptionBits options );
-
-/*! @function withRange
-    @abstract Standard factory method for IORangeAllocator.
-    @discussion This method allocates and initializes an IORangeAllocator and optionally sets the free list to contain one fragment, from zero to an endOfRange parameter. The capacity in terms of free fragments and locking options are set for the instance.
-    @param endOfRange If the free list is to contain an initial fragment, set endOfRange to the last offset in the range, ie. size - 1, to create a free fragment for the range zero to endOfRange inclusive. If zero is passed the free list will be initialized empty, and can be populated with calls to the deallocate method.
-    @param defaultAlignment If this parameter is non-zero it specifies a required alignment for all allocations, for example pass 256 to align allocations on 256 byte boundaries. Zero or one specify unaligned allocations.
-    @param capacity Sets the initial size of the free list in number of non-contiguous fragments. This value is also used for the capacityIncrement.
-    @param options Pass kLocking if the instance can be used by multiple threads.
-    @result Returns the new IORangeAllocator instance, to be released by the caller, or zero on failure. */
-
-    static IORangeAllocator * withRange( IORangeScalar endOfRange,
-					IORangeScalar defaultAlignment = 0,
-					UInt32 capacity = 0,
-					IOOptionBits options = 0 );
-
-    virtual void free();
-    virtual bool serialize(OSSerialize *s) const;
-
-/*! @function getFragmentCount
-    @abstract Accessor to return the number of free fragments in the range.
-    @discussion This method returns a count of free fragments. Each fragment describes a non-contiguous free range - deallocations will merge contiguous fragments together.
-    @result Returns the count of free fragments. 
-*/
-
-    virtual UInt32 getFragmentCount( void );
-
-/*! @function getFragmentCapacity
-    @abstract Accessor to return the number of free fragments in the range.
-    @discussion This method returns the current capacity of the free fragment list.
-    @result Returns the current capacity of free fragment list. 
-*/
-
-    virtual UInt32 getFragmentCapacity( void );
-
-/*! @function setFragmentCapacityIncrement
-    @abstract Sets the count of fragments the free list will increase by when full.
-    @discussion This method sets the number of extra fragments the free list will expand to when full. It defaults to the initial capacity.
-    @param count The number of fragments to increment the capacity by when the free list is full. 
-*/
-
-    virtual void setFragmentCapacityIncrement( UInt32 count );
-
-/*! @function getFreeCount
-    @abstract Totals the sizes of the free fragments.
-    @discussion This method returns the total of the sizes of the fragments on the free list.
-    @result Returns the total of the free fragments sizes. 
-*/
-
-    virtual IORangeScalar getFreeCount( void );
-
-/*! @function allocate
-    @abstract Allocates from the free list, at any offset.
-    @discussion This method allocates a range from the free list. The alignment will default to the alignment set when the allocator was created or may be set here. 
-    @param size The size of the range requested.
-    @param result The beginning of the range allocated is returned here on success.
-    @param alignment If zero is passed, default to the allocators alignment, otherwise pass an alignment required for the allocation, for example 4096 to page align.
-    @result Returns true if the allocation was successful, else false. 
-*/
-
-    virtual bool allocate( IORangeScalar size,
-				 	    IORangeScalar * result,
-				 	    IORangeScalar alignment = 0 );
-
-/*! @function allocateRange
-    @abstract Allocates from the free list, at a set offset.
-    @discussion This method allocates a range from the free list, given a set offset passed in. 
-    @param start The beginning of the range requested.
-    @param size The size of the range requested.
-    @result Returns true if the allocation was successful, else false.
-*/
-
-    virtual bool allocateRange( IORangeScalar start,
-						    IORangeScalar size );
-
-/*! @function deallocate
-    @abstract Deallocates a range to the free list.
-    @discussion This method deallocates a range to the free list, given a the start offset and length passed in. 
-    @param start The beginning of the range requested.
-    @param size Returns the size of the range requested. 
-*/
-
-    virtual void deallocate( IORangeScalar start,
-			     		 IORangeScalar size );
-};
-
-#endif /* _IOKIT_IORANGEALLOCATOR_H */
diff --git a/i386/include/IOKit/IORegistryEntry.h b/i386/include/IOKit/IORegistryEntry.h
deleted file mode 100644
index bbe4b18..0000000
--- a/i386/include/IOKit/IORegistryEntry.h
+++ /dev/null
@@ -1,947 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-
-#ifndef _IOKIT_IOREGISTRYENTRY_H
-#define _IOKIT_IOREGISTRYENTRY_H
-
-#include <IOKit/IOTypes.h>
-#include <libkern/c++/OSContainers.h>
-
-
-extern const OSSymbol * gIONameKey;
-extern const OSSymbol * gIOLocationKey;
-extern const OSSymbol * gIORegistryEntryIDKey;
-
-class IORegistryEntry;
-class IORegistryPlane;
-class IORegistryIterator;
-
-typedef void (*IORegistryEntryApplierFunction)(IORegistryEntry * entry,
-                                               void * context);
-
-enum {
-    kIORegistryIterateRecursively	= 0x00000001,
-    kIORegistryIterateParents		= 0x00000002
-};
-
-/*! @class IORegistryEntry : public OSObject
-    @abstract The base class for all objects in the registry.
-    @discussion The IORegistryEntry base class provides functions for describing graphs of connected registry entries, each with a dictionary-based property table. Entries may be connected in different planes, with differing topologies. Access to the registry is protected against multiple threads. Inside the kernel planes are specified with plane objects and are published by the creator - IOService exports the gIOServicePlane plane object for example. Non kernel clients specify planes by their name.
-*/
-
-class IORegistryEntry : public OSObject
-{
-    friend class IORegistryIterator;
-
-    OSDeclareDefaultStructors(IORegistryEntry)
-
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of this class in the future.
-    */    
-    struct ExpansionData
-    {
-	uint64_t	fRegistryEntryID;
-    };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData * reserved;
-
-private:
-
-    OSDictionary *	fRegistryTable;
-    OSDictionary *	fPropertyTable;
-
-public:
-    /* methods available in Mac OS X 10.1 or later */
-
-/*! @function copyProperty
-    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy. Available in Mac OS X 10.1 or later.
-    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
-    @param aKey The property's name as a C-string.
-    @param plane The plane to iterate over, eg. gIOServicePlane.
-    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
-    @result The property value found, or zero. A reference on any found property is returned to caller, which should be released. */
-
-    virtual OSObject * copyProperty( const char *           aKey,
-                                     const IORegistryPlane * plane,
-                                     IOOptionBits            options =
-                                        kIORegistryIterateRecursively |
-                                        kIORegistryIterateParents) const;
-
-/*! @function copyProperty
-    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy. Available in Mac OS X 10.1 or later.
-    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
-    @param aKey The property's name as an OSString.
-    @param plane The plane to iterate over, eg. gIOServicePlane.
-    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
-    @result The property value found, or zero. A reference on any found property is returned to caller, which should be released. */
-
-    virtual OSObject * copyProperty( const OSString *        aKey,
-                                     const IORegistryPlane * plane,
-                                     IOOptionBits            options =
-                                        kIORegistryIterateRecursively |
-                                        kIORegistryIterateParents) const;
-
-/*! @function copyProperty
-    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy. Available in Mac OS X 10.1 or later.
-    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
-    @param aKey The property's name as an OSSymbol.
-    @param plane The plane to iterate over, eg. gIOServicePlane.
-    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
-    @result The property value found, or zero. A reference on any found property is returned to caller, which should be released. */
-
-    virtual OSObject * copyProperty( const OSSymbol *        aKey,
-                                     const IORegistryPlane * plane,
-                                     IOOptionBits            options =
-                                        kIORegistryIterateRecursively |
-                                        kIORegistryIterateParents) const;
-
-/*! @function copyParentEntry
-    @abstract Returns an registry entry's first parent entry in a plane. Available in Mac OS X 10.1 or later.
-    @discussion This function will return the parent to which a registry entry was first attached. Since the majority of registry entrys have only one provider, this is a useful simplification.
-    @param plane The plane object.
-    @result Returns the first parent of the registry entry, or zero if the entry is not attached into the registry in that plane. A reference on the entry is returned to caller, which should be released. */
-
-    virtual IORegistryEntry * copyParentEntry( const IORegistryPlane * plane ) const;
-
-/*! @function copyChildEntry
-    @abstract Returns an registry entry's first child entry in a plane. Available in Mac OS X 10.1 or later.
-    @discussion This function will return the child which first attached to a registry entry.
-    @param plane The plane object.
-    @result Returns the first child of the registry entry, or zero if the entry is not attached into the registry in that plane. A reference on the entry is returned to caller, which should be released. */
-
-    virtual IORegistryEntry * copyChildEntry( const IORegistryPlane * plane ) const;
-
-    /* method available in Mac OS X 10.4 or later */
-/*!
-    @typedef Action
-    @discussion Type and arguments of callout C function that is used when
-a runCommand is executed by a client.  Cast to this type when you want a C++
-member function to be used.  Note the arg1 - arg3 parameters are passed straight pass through to the action callout.
-    @param target
-	Target of the function, can be used as a refcon.  Note if a C++ function
-was specified, this parameter is implicitly the first parameter in the target
-member function's parameter list.
-    @param arg0 Argument to action from run operation.
-    @param arg1 Argument to action from run operation.
-    @param arg2 Argument to action from run operation.
-    @param arg3 Argument to action from run operation.
-*/
-    typedef IOReturn (*Action)(OSObject *target,
-			       void *arg0, void *arg1,
-			       void *arg2, void *arg3);
-
-/*! @function runPropertyAction
-    @abstract Single thread a call to an action w.r.t. the property lock
-    @discussion Client function that causes the given action to be called in a manner that syncrhonises with the registry iterators and serialisers.  This functin can be used to synchronously manipulate the property table of this nub
-    @param action Pointer to function to be executed in work-loop context.
-    @param arg0 Parameter for action parameter, defaults to 0.
-    @param arg1 Parameter for action parameter, defaults to 0.
-    @param arg2 Parameter for action parameter, defaults to 0.
-    @param arg3 Parameter for action parameter, defaults to 0.
-    @result Returns the value of the Action callout.
-*/
-    virtual IOReturn runPropertyAction(Action action, OSObject *target,
-			       void *arg0 = 0, void *arg1 = 0,
-			       void *arg2 = 0, void *arg3 = 0);
-
-private:
-#if __LP64__
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 0);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 1);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 2);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 3);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 4);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 5);
-#else
-    OSMetaClassDeclareReservedUsed(IORegistryEntry, 0);
-    OSMetaClassDeclareReservedUsed(IORegistryEntry, 1);
-    OSMetaClassDeclareReservedUsed(IORegistryEntry, 2);
-    OSMetaClassDeclareReservedUsed(IORegistryEntry, 3);
-    OSMetaClassDeclareReservedUsed(IORegistryEntry, 4);
-    OSMetaClassDeclareReservedUsed(IORegistryEntry, 5);
-#endif
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 6);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 7);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 8);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 9);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 10);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 11);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 12);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 13);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 14);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 15);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 16);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 17);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 18);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 19);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 20);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 21);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 22);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 23);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 24);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 25);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 26);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 27);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 28);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 29);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 30);
-    OSMetaClassDeclareReservedUnused(IORegistryEntry, 31);
-
-public:
-
-    /* Registry accessors */
-
-/*! @function getRegistryRoot
-    @abstract Returns a pointer to the root instance of the registry.
-    @discussion This method provides an accessor to the root of the registry for the machine. The root may be passed to a registry iterator when iterating a plane, and contains properties that describe the available planes, and diagnostic information for IOKit. Keys for these properties are in IOKitKeys.h.
-    @result A pointer to the IORegistryEntry root instance. It should not be released by the caller. */
-
-    static IORegistryEntry * getRegistryRoot( void );
-    
-/*! @function getGenerationCount
-    @abstract Returns an generation count for all registry changing operations.
-    @discussion This method provides an accessor to the current generation count (or seed) of the registry which changes when any topology change occurs in the registry - this does not include property table changes. It may be used to invalidate any caching of the results from IORegistryEntry methods.
-    @result An integer generation count. */
-
-    static SInt32 	     getGenerationCount( void );
-
-/*! @function getPlane
-    @abstract Looks up the plane object by a C-string name.
-    @discussion Planes are usually provided as globals by the creator, eg. gIOServicePlane, gIODeviceTreePlane, or gIOAudioPlane, however they may also be looked up by name with this method.
-    @result A pointer to the plane object, or zero if no such plane exists. The returned plane should not be released. */
-
-    static const IORegistryPlane * getPlane( const char * name );
-
-    /* Registry Entry allocation & init */
-
-/*! @function init
-    @abstract Standard init method for all IORegistryEntry subclasses.
-    @discussion A registry entry must be initialized with this method before it can be used. A property dictionary may passed and will be retained by this method for use as the registry entry's property table, or an empty one will be created.
-    @param A dictionary that will become the registry entry's property table (retaining it), or zero which will cause an empty property table to be created.
-    @result true on success, or false on a resource failure. */
-
-    virtual bool init( OSDictionary * dictionary = 0 );
-
-/*! @function free
-    @abstract Standard free method for all IORegistryEntry subclasses.
-    @discussion This method will release any resources of the entry, in particular its property table. Note that the registry entry must always be detached from the registry before free may be called, and subclasses (namely IOService) will have additional protocols for removing registry entries. free should never need be called directly. */
-
-    virtual void free( void );
-
-/*! @function setPropertyTable
-    @abstract Replace a registry entry's property table.
-    @discussion This method will release the current property table of a the entry and replace it with another, retaining the new property table.
-    @param dict The new dictionary to be used as the entry's property table. */
-
-    virtual void setPropertyTable( OSDictionary * dict );
-
-    /* Synchronized property accessors; wrappers to OSDictionary
-     * plus property creation helpers */
-
-/*! @function setProperty
-    @abstract Synchronized method to add a property to a registry entry's property table.
-    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The properties name as an OSSymbol.
-    @param anObject The property value.
-    @result true on success or false on a resource failure. */
-
-    virtual bool setProperty(const OSSymbol * aKey, OSObject * anObject);
-
-/*! @function setProperty
-    @abstract Synchronized method to add a property to a registry entry's property table.
-    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as an OSString.
-    @param anObject The property value.
-    @result true on success or false on a resource failure. */
-
-    virtual bool setProperty(const OSString * aKey, OSObject * anObject);
-
-/*! @function setProperty
-    @abstract Synchronized method to add a property to a registry entry's property table.
-    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as a C-string.
-    @param anObject The property value.
-    @result true on success or false on a resource failure. */
-
-    virtual bool setProperty(const char * aKey, OSObject * anObject);
-
-/*! @function setProperty
-    @abstract Synchronized method to construct and add a OSString property to a registry entry's property table.
-    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table. The property is created as an OSString from the supplied C-string, set in the property table with the given name, and released.
-    @param aKey The property's name as a C-string.
-    @param aString The property value as a C-string.
-    @result true on success or false on a resource failure. */
-
-    virtual bool setProperty(const char * aKey, const char * aString);
-
-/*! @function setProperty
-    @abstract Synchronized method to construct and add an OSBoolean property to a registry entry's property table.
-    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table. The property is created as an OSBoolean from the supplied value, set in the property table with the given name, and released.
-    @param aKey The property's name as a C-string.
-    @param aBoolean The property's boolean value.
-    @result true on success or false on a resource failure. */
-
-    virtual bool setProperty(const char * aKey, bool aBoolean);
-
-/*! @function setProperty
-    @abstract Synchronized method to construct and add an OSNumber property to a registry entry's property table.
-    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table. The property is created as an OSNumber from the supplied value and size, set in the property table with the given name, and released.
-    @param aKey The property's name as a C-string.
-    @param aValue The property's numeric value.
-    @param aNumberOfBits The property's size in bits, for OSNumber.
-    @result true on success or false on a resource failure. */
-
-    virtual bool setProperty( const char *       aKey,
-                              unsigned long long aValue,
-                              unsigned int       aNumberOfBits);
-
-/*! @function setProperty
-    @abstract Synchronized method to construct and add an OSData property to a registry entry's property table.
-    @discussion This method will add or replace a property in a registry entry's property table, using the OSDictionary::setObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table. The property is created as an OSData copied from the supplied data and length, set in the property table with the given name, and released.
-    @param aKey The property's name as a C-string.
-    @param bytes The property's value as a pointer. OSData will copy this data.
-    @param length The property's size in bytes, for OSData.
-    @result true on success or false on a resource failure. */
-
-    virtual bool setProperty( const char *       aKey,
-                              void *      	 bytes,
-                              unsigned int       length);
-
-/*! @function removeProperty
-    @abstract Synchronized method to remove a property from a registry entry's property table.
-    @discussion This method will remove a property from a registry entry's property table, using the OSDictionary::removeObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as an OSSymbol. */
-
-    virtual void removeProperty( const OSSymbol * aKey);
-
-/*! @function removeProperty
-    @abstract Synchronized method to remove a property from a registry entry's property table.
-    @discussion This method will remove a property from a registry entry's property table, using the OSDictionary::removeObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as an OSString. */
-
-    virtual void removeProperty( const OSString * aKey);
-
-/*! @function removeProperty
-    @abstract Synchronized method to remove a property from a registry entry's property table.
-    @discussion This method will remove a property from a registry entry's property table, using the OSDictionary::removeObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as a C-string. */
-
-    virtual void removeProperty( const char * aKey);
-
-/*! @function getProperty
-    @abstract Synchronized method to obtain a property from a registry entry's property table.
-    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as an OSSymbol.
-    @result The property value found, or zero. */
-
-    virtual OSObject * getProperty( const OSSymbol * aKey) const;
-
-/*! @function getProperty
-    @abstract Synchronized method to obtain a property from a registry entry's property table.
-    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as an OSString.
-    @result The property value found, or zero. */
-
-    virtual OSObject * getProperty( const OSString * aKey) const;
-
-/*! @function getProperty
-    @abstract Synchronized method to obtain a property from a registry entry's property table.
-    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as a C-string.
-    @result The property value found, or zero. */
-
-    virtual OSObject * getProperty( const char * aKey) const;
-
-/*! @function getProperty
-    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy.
-    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
-    @param aKey The property's name as an OSSymbol.
-    @param plane The plane to iterate over, eg. gIOServicePlane.
-    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
-    @result The property value found, or zero. */
-
-    virtual OSObject * getProperty( const OSSymbol *        aKey,
-                                    const IORegistryPlane * plane,
-                                    IOOptionBits            options =
-                                        kIORegistryIterateRecursively |
-                                        kIORegistryIterateParents) const;
-
-/*! @function getProperty
-    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy.
-    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
-    @param aKey The property's name as an OSString.
-    @param plane The plane to iterate over, eg. gIOServicePlane.
-    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
-    @result The property value found, or zero. */
-
-    virtual OSObject * getProperty( const OSString *        aKey,
-                                    const IORegistryPlane * plane,
-                                    IOOptionBits            options =
-                                        kIORegistryIterateRecursively |
-                                        kIORegistryIterateParents) const;
-
-/*! @function getProperty
-    @abstract Synchronized method to obtain a property from a registry entry or one of its parents (or children) in the hierarchy.
-    @discussion This method will search for a property, starting first with this registry entry's property table, then iterating recusively through either the parent registry entries or the child registry entries of this entry. Once the first occurrence is found, it will lookup and return the value of the property, using the OSDictionary::getObject semantics. The iteration keeps track of entries that have been recursed into previously to avoid loops. This method is synchronized with other IORegistryEntry accesses to the property table(s).
-    @param aKey The property's name as a C-string.
-    @param plane The plane to iterate over, eg. gIOServicePlane.
-    @param options kIORegistryIterateRecursively may be set to recurse automatically into the registry hierarchy. Without this option, this method degenerates into the standard getProperty() call. kIORegistryIterateParents may be set to iterate the parents of the entry, in place of the children.
-    @result The property value found, or zero. */
-
-    virtual OSObject * getProperty( const char *            aKey,
-                                    const IORegistryPlane * plane,
-                                    IOOptionBits            options =
-                                        kIORegistryIterateRecursively |
-                                        kIORegistryIterateParents) const;
-
-/*! @function copyProperty
-    @abstract Synchronized method to obtain a property from a registry entry's property table.
-    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics, and return a reference to the caller. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as an OSSymbol.
-    @result The property value found, or zero. It should be released by the caller. */
-
-    virtual OSObject * copyProperty( const OSSymbol * aKey) const;
-
-/*! @function copyProperty
-    @abstract Synchronized method to obtain a property from a registry entry's property table.
-    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics, and return a reference to the caller. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as an OSString.
-    @result The property value found, or zero. It should be released by the caller. */
-
-    virtual OSObject * copyProperty( const OSString * aKey) const;
-
-/*! @function copyProperty
-    @abstract Synchronized method to obtain a property from a registry entry's property table.
-    @discussion This method will lookup a property in a registry entry's property table, using the OSDictionary::getObject semantics, and return a reference to the caller. This method is synchronized with other IORegistryEntry accesses to the property table.
-    @param aKey The property's name as a C-string.
-    @result The property value found, or zero. It should be released by the caller. */
-
-    virtual OSObject * copyProperty( const char * aKey) const;
-
-/*! @function dictionaryWithProperties
-    @abstract Synchronized method to obtain copy a registry entry's property table.
-    @discussion This method will copy a registry entry's property table, using the OSDictionary::withDictionary semantics. This method is synchronized with other IORegistryEntry accesses to the property table. Since OSDictionary will only copy property values by reference, synchronization is not guaranteed to any collection values.
-    @result The created dictionary, or zero on a resource value. It should be released by the caller. */
-
-    virtual OSDictionary * dictionaryWithProperties( void ) const;
-
-/*! @function serializeProperties
-    @abstract Synchronized method to serialize a registry entry's property table.
-    @discussion This method will serialize a registry entry's property table, using the OSDictionary::serialize semantics. This method is synchronized with other IORegistryEntry accesses to the property table. Many non-kernel clients of IOKit read information from the registry via properties, and will invoke this method in a registry entry to create a serialization of all the entry's properties, which is then reconstructed in the client's task as a CFDictionary. This method may be intercepted by subclasses to update their properties or implement a different serialization method, though it is usually better to implement such functionality by creating objects in the property table and implementing their serialize methods, avoiding any need to implement serializeProperties.
-    @param serialize The OSSerialize instance representing the serialization request.
-    @result True on success, false otherwise. */
-
-    virtual bool serializeProperties( OSSerialize * serialize ) const;
-
-    /* Unsynchronized(!) property table access */
-
-/*! @function getPropertyTable
-    @abstract Unsynchronized accessor to a registry entry's property table.
-    @discussion This method will return a pointer to the live property table as an OSDictionery. Its use is not recommended in most cases, instead use the synchronized accessors and helper functions of IORegistryEntry to access properties. It can only safely be used by one thread, which usually means it can only be used before a registry entry is entered into the registry.
-    @result A pointer to the property table as an OSDictionary. The pointer is valid while the registry entry is retained, and should not be released by the caller. */
-
-    /* inline */ OSDictionary * getPropertyTable( void ) const;
-            /* { return(fPropertyTable); } */
-
-    /* Set properties from user level, to be overridden if supported */
-
-/*! @function setProperties
-    @abstract Optionally supported external method to set properties in a registry entry.
-    @discussion This method is not implemented by IORegistryEntry, but is available to kernel and non-kernel clients to set properties in a registry entry. IOUserClient provides connection based, more controlled access to this functionality and may be more appropriate for many uses, since there is no differentiation between clients available to this method.
-    @param properties Any OSObject subclass, to be interpreted by the implementing method - for example an OSDictionary, OSData etc. may all be appropriate.
-    @result An IOReturn code to be returned to the caller. */
-
-    virtual IOReturn setProperties( OSObject * properties );
-
-    /* Topology */
-
-/*! @function getParentIterator
-    @abstract Returns an iterator over an registry entry's parent entries in a specified plane.
-    @param plane The plane object.
-    @result Returns an iterator over the parents of the registry entry, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, though they may no longer be attached during the iteration. */
-
-    virtual OSIterator * getParentIterator( const IORegistryPlane * plane )
-									const;
-    virtual void applyToParents( IORegistryEntryApplierFunction applier,
-                                 void * context,
-                                 const IORegistryPlane * plane ) const;
-
-/*! @function getParentEntry
-    @abstract Returns an registry entry's first parent entry in a plane.
-    @discussion This function will return the parent to which a registry entry was first attached. Since the majority of registry entrys have only one provider, this is a useful simplification.
-    @param plane The plane object.
-    @result Returns the first parent of the registry entry, or zero if the entry is not attached into the registry in that plane. The parent is retained while the entry is attached, and should not be released by the caller. */
-
-    virtual IORegistryEntry * getParentEntry( const IORegistryPlane * plane ) const;
-
-/*! @function getChildIterator
-    @abstract Returns an iterator over an registry entry's child entries in a plane.
-    @discussion This method creates an iterator which will return each of a registry entry's child entries in a specified plane.
-    @param plane The plane object.
-    @result Returns an iterator over the children of the entry, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, though they may no longer be attached during the iteration. */
-
-    virtual OSIterator * getChildIterator( const IORegistryPlane * plane )
-									const;
-
-    virtual void applyToChildren( IORegistryEntryApplierFunction applier,
-                                  void * context,
-                                  const IORegistryPlane * plane ) const;
-
-/*! @function getChildEntry
-    @abstract Returns an registry entry's first child entry in a plane.
-    @discussion This function will return the child which first attached to a registry entry.
-    @param plane The plane object.
-    @result Returns the first child of the registry entry, or zero if the entry is not attached into the registry in that plane. The child is retained while the entry is attached, and should not be released by the caller. */
-
-    virtual IORegistryEntry * getChildEntry( const IORegistryPlane * plane ) const;
-
-/*! @function isChild
-    @abstract Determines whether a registry entry is the child of another in a plane.
-    @discussion This method called in the parent entry determines if the specified entry is a child, in a plane. Additionally, it can check if the child is the only child of the parent entry.
-    @param child The possible child registry entry.
-    @param plane The plane object.
-    @param onlyChild If true, check also if the child is the only child.
-    @result If the child argument is not a child of the registry entry, false is returned. If onlyChild is true and the child is not the only child of the entry, false is returned, otherwise true is returned. */
-
-    virtual bool isChild( IORegistryEntry * child,
-                                const IORegistryPlane * plane,
-				bool onlyChild = false ) const;
-
-/*! @function isParent
-    @abstract Determines whether a registry entry is the parent of another in a plane.
-    @discussion This method called in the child entry determines if the specified entry is a parent, in a plane. Additionally, it can check if the parent is the only parent of the child entry.
-    @param parent The possible parent registry entry.
-    @param plane The plane object.
-    @param onlyParent If true, check also if the parent is the only parent.
-    @result If the parent argument is not a parent of the registry entry, false is returned. If onlyParent is true and the parent is not the only parent of the entry, false is returned, otherwise true is returned. */
-
-    virtual bool isParent( IORegistryEntry * parent,
-                                const IORegistryPlane * plane,
-				bool onlyParent = false ) const;
-
-/*! @function inPlane
-    @abstract Determines whether a registry entry is attached in a plane.
-    @discussion This method determines if the entry is attached in a plane to any other entry.  It can also be used to determine if the entry is a member of any plane.
-    @param plane The plane object, 0 indicates any plane.
-    @result If the entry has a parent in the given plane or if plane = 0 then if entry has any parent; return true, otherwise false. */
-
-    virtual bool inPlane( const IORegistryPlane * plane = 0) const;
-
-/*! @function getDepth
-    @abstract Counts the maximum number of entries between an entry and the registry root, in a plane.
-    @discussion This method counts the number of entries between and entry and the registry root, in a plane, for each parent of the entry and returns the maximum value.
-    @param plane The plane object.
-    @result The maximum number of entries between the entry and the root. Zero is returned if the entry is not attached in the plane. */
-
-    virtual unsigned int getDepth( const IORegistryPlane * plane ) const;
-
-    /* Attach / detach */
-
-/*! @function attachToParent
-    @abstract Attaches a entry to a parent entry in a plane.
-    @discussion This is the usual method of entering an entry into the registry. It is a no-op and success if the entry is already attached to the parent. Attaching the  entry into the registry retains both the child and parent while they are attached. This method will call attachToChild in the parent entry if it is not being called from attachToChild.
-    @param parent The registry entry to attach to.
-    @param plane The plane object.
-    @result true on success, or false on a resource failure, or if the parent is the same as the child. */
-
-    virtual bool attachToParent( IORegistryEntry * parent,
-                                const IORegistryPlane * plane );
-
-/*! @function detachFromParent
-    @abstract Detaches an entry from a parent entry in a plane.
-    @discussion This is the usual method of removing an entry from the registry. It is a no-op if the entry is not attached to the parent. Detaching the entry will release both the child and parent. This method will call detachFromChild in the parent entry if it is not being called from detachFromChild.
-    @param parent The registry entry to detach from.
-    @param plane The plane object. */
-
-    virtual void detachFromParent( IORegistryEntry * parent,
-                                const IORegistryPlane * plane );
-
-/*! @function attachToChild
-    @abstract Method called in the parent entry when a child attaches.
-    @discussion This method is called in the parent entry when a child attaches, to make overrides possible. This method will also call attachToParent in the child entry if it is not being called from attachToParent. It is a no-op and success if the entry is already a child. Attaching the  entry into the registry retains both the child and parent while they are attached.
-    @param child The registry entry being attached.
-    @param plane The plane object.
-    @result true on success, or false on a resource failure, or if the parent is the same as the child. */
-
-    virtual bool attachToChild( IORegistryEntry * child,
-                                const IORegistryPlane * plane );
-
-/*! @function detachFromChild
-    @abstract Detaches a child entry from its parent in a plane.
-    @discussion This method is called in the parent entry when a child detaches, to make overrides possible. It is a no-op if the entry is not a child of the parent. Detaching the entry will release both the child and parent. This method will call detachFromParent in the child entry if it is not being called from detachFromParent.
-    @param parent The registry entry to detach.
-    @param plane The plane object. */
-
-    virtual void detachFromChild( IORegistryEntry * child,
-                                const IORegistryPlane * plane );
-
-/*! @function detachAbove
-    @abstract Detaches an entry from all its parent entries in a plane.
-    @discussion This method calls detachFromParent in the entry for each of its parent entries in the plane.
-    @param plane The plane object. */
-
-    virtual void detachAbove( const IORegistryPlane * plane );
-
-/*! @function detachAll
-    @abstract Detaches an entry and all its children recursively in a plane.
-    @discussion This method breaks the registry connections for a subtree. detachAbove is called in the entry, and all child entries and their children in the plane.
-    @param plane The plane object. */
-
-    virtual void detachAll( const IORegistryPlane * plane );
-
-    /* Name, location and path accessors */
-
-/*! @function getName
-    @abstract Returns the name assigned to the registry entry as a C-string.
-    @discussion Entries can be named in a particular plane, or globally. If the entry is named in plane and the plane is specified that name will be returned, otherwise the global name is returned. The global name defaults to the entry's meta class name if it has not been named.
-    @param plane The plane object, or zero for the global name.
-    @result A C-string name, valid while the entry is retained. */
-
-    virtual const char * getName( const IORegistryPlane * plane = 0 ) const;
-
-/*! @function copyName
-    @abstract Returns the name assigned to the registry entry as an OSSymbol.
-    @discussion Entries can be named in a particular plane, or globally. If the entry is named in plane and the plane is specified that name will be returned, otherwise the global name is returned. The global name defaults to the entry's meta class name if it has not been named.
-    @param plane The plane object, or zero for the global name.
-    @result A reference to an OSSymbol for the name, which should be released by the caller. */
-
-    virtual const OSSymbol * copyName(
-				const IORegistryPlane * plane = 0 ) const;
-
-/*! @function compareNames
-    @abstract Compares the name of the entry with one or more names, and optionally returns the matching name.
-    @discussion This method is called during IOService name matching and elsewhere to compare the entry's global name with a list of names, or a single name. A list of names may be passed as any OSCollection of OSStrings, while a single name may be passed an OSString, in the name parameter. compareNames will call the compareName method for each name, for overrides.
-    @param name The name or names to compare with as any OSCollection (eg. OSArray, OSSet, OSDictionary) of OSStrings, or a single name may be passed an OSString.
-    @param matched If the caller wants the successfully matched name returned, pass a non-zero pointer for the matched parameter and an OSString will be returned here. It should be released by the caller.
-    @result True if one of the names compared true with the entry's global name. */
-
-    virtual bool compareNames( OSObject * name, OSString ** matched = 0 ) const;
-
-/*! @function compareName
-    @abstract Compares the name of the entry with one name, and optionally returns the matching name.
-    @discussion This method is called during IOService name matching and elsewhere from the compareNames method. It should be overridden to provide non-standard name matching.
-    @param name The name to compare with as an OSString.
-    @param matched If the caller wants the successfully matched name returned, pass a non-zero pointer for the matched parameter and an OSString will be returned here. It should be released by the caller. Generally, this will be the same as the name parameter, but may not be if wildcards are used.
-    @result True if the name compared true with the entry's global name. */
-
-    virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
-
-/*! @function setName
-    @abstract Sets a name for the registry entry, in a particular plane, or globally.
-    @discussion Entries can be named in a particular plane, or globally. If the plane is specified the name applies only to that plane, otherwise the global name is set. The global name defaults to the entry's meta class name if it has not been named.
-    @param name An OSSymbol which will be retained.
-    @param plane The plane object, or zero to set the global name. */
-
-    virtual void setName( const OSSymbol * name,
-				const IORegistryPlane * plane = 0 );
-
-/*! @function setName
-    @abstract Sets a name for the registry entry, in a particular plane, or globally.
-    @discussion Entries can be named in a particular plane, or globally. If the plane is specified the name applies only to that plane, otherwise the global name is set. The global name defaults to the entry's meta class name if it has not been named.
-    @param name A const C-string name which will be copied.
-    @param plane The plane object, or zero to set the global name. */
-
-    virtual void setName( const char * name,
-				const IORegistryPlane * plane = 0 );
-
-/*! @function getLocation
-    @abstract Returns the location string assigned to the registry entry as a C-string.
-    @discussion Entries can given a location string in a particular plane, or globally. If the entry has had a location set in a plane and the plane is specified that location string will be returned, otherwise the global location string is returned. If no global location string has been set, zero is returned.
-    @param plane The plane object, or zero for the global name.
-    @result A C-string location string, valid while the entry is retained, or zero. */
-
-    virtual const char * getLocation( const IORegistryPlane * plane = 0 ) const;
-
-/*! @function copyLocation
-    @abstract Returns the location string assigned to the registry entry as an OSSymbol.
-    @discussion Entries can given a location string in a particular plane, or globally. If the entry has had a location set in a plane and the plane is specified that location string will be returned, otherwise the global location string is returned. If no global location string has been set, zero is returned.
-    @param plane The plane object, or zero for the global name.
-    @result A reference to an OSSymbol for the location if one exists, which should be released by the caller, or zero. */
-
-    virtual const OSSymbol * copyLocation(
-				const IORegistryPlane * plane = 0 ) const;
-
-/*! @function setLocation
-    @abstract Sets a location string for the registry entry, in a particular plane, or globally.
-    @discussion Entries can be given a location string in a particular plane, or globally. If the plane is specified the location applies only to that plane, otherwise the global location is set. The location string may be used during path lookups of registry entries, to distinguish between sibling entries with the same name. The default IORegistryEntry parsing of location strings expects a list of hex numbers separated by commas, though subclasses of IORegistryEntry might do their own parsing.
-    @param location A C-string location string which will be copied, or an OSSymbol which will be retained.
-    @param plane The plane object, or zero to set the global location string. */
-
-    virtual void setLocation( const OSSymbol * location,
-				const IORegistryPlane * plane = 0 );
-    virtual void setLocation( const char * location,
-				const IORegistryPlane * plane = 0 );
-
-/*! @function getPath
-    @abstract Create a path for a registry entry.
-    @discussion The path for a registry entry is copied to the caller's buffer. The path describes the entry's attachment in a particular plane, which must be specified. The path begins with the plane name followed by a colon, and then followed by '/' separated path components for each of the entries between the root and the registry entry. Each component is constructed with the getPathComponent method called in each entry. An alias may also exist for the entry, which are described as properties in a registry entry found at /aliases in the plane. If a property value interpreted as a path in a call to IORegistryEntry::fromPath yields the entry, then the property name is used as the entry's path.
-    @param path A char buffer allocated by the caller.
-    @param length An in/out parameter - the caller sets the length of the buffer available, and getPath returns the total length of the path copied to the buffer.
-    @param plane The plane object.
-    @result getPath will fail if the entry is not attached in the plane, or if the buffer is not large enough to contain the path. */
-
-    virtual bool getPath( char * path, int * length,
-                            const IORegistryPlane * plane) const;
-
-/*! @function getPathComponent
-    @abstract Create a path component for a registry entry.
-    @discussion Each component of a path created with getPath is created with getPathComponent. The default implementation concatenates the entry's name in the the plane, with the "at" symbol and the location string of the entry in the plane if it has been set.
-    @param path A char buffer allocated by the caller.
-    @param length An in/out parameter - the caller sets the length of the buffer available, and getPathComponent returns the total length of the path component copied to the buffer.
-    @param plane The plane object.
-    @result true if the path fits into the supplied buffer or false on a overflow. */
-
-    virtual bool getPathComponent( char * path, int * length,
-                                    const IORegistryPlane * plane ) const;
-
-/*! @function fromPath
-    @abstract Looks up a registry entry by path.
-    @discussion This function parses paths to lookup registry entries. The path may begin with the <plane name>: created by getPath, or the plane may be set by the caller. If there are characters remaining unparsed after an entry has been looked up, this may be considered an invalid lookup, or those characters may be passed back to the caller and the lookup successful.
-    @param path A C-string path.
-    @param plane The plane to lookup up the path, or zero, in which case the path must begin with the plane name.
-    @param residualPath If the path may contain residual characters after the last path component, the residual will be copied back to the caller's residualPath buffer. If there are residual characters and no residual buffer is specified, fromPath will fail.
-    @param residualLength An in/out parameter - the caller sets the length of the residual buffer available, and fromPath returns the total length of the residual path copied to the buffer. If there is no residualBuffer (residualPath = 0) then residualLength may be zero also.
-    @param fromEntry The lookup will proceed rooted at this entry if non-zero, otherwise it proceeds from the root of the plane.
-    @result A retained registry entry is returned on success, or zero on failure. The caller should release the entry. */
-
-    static IORegistryEntry * fromPath(  const char * path,
-                                        const IORegistryPlane * plane = 0,
-                                        char * residualPath = 0,
-					int * residualLength = 0,
-					IORegistryEntry * fromEntry = 0 );
-
-/*! @function fromPath
-    @abstract Looks up a registry entry by relative path.
-    @discussion This function looks up a entry below the called entry by a relative path. It is just a convenience that calls IORegistryEntry::fromPath with this as the fromEntry parameter.
-    @param path See IORegistryEntry::fromPath.
-    @param plane See IORegistryEntry::fromPath.
-    @param residualPath See IORegistryEntry::fromPath.
-    @param residualLength See IORegistryEntry::fromPath.
-    @result See IORegistryEntry::fromPath. */
-
-    virtual IORegistryEntry * childFromPath( const char * path,
-                                             const IORegistryPlane * plane = 0,
-                                             char * residualPath = 0,
-					     int * residualLength = 0 );
-
-/*! @function dealiasPath
-    @abstract Strips any aliases from the head of path and returns the full path.
-    @discussion If the path specified begins with an alias found in the /aliases entry, the value of the alias is returned, and a pointer into the passed in path after the alias is passed back to the caller. If an alias is not found, zero is returned and the path parameter is unchanged.
-    @param opath An in/out paramter - the caller passes in a pointer to a C-string pointer to a path. If an alias is found, dealiasPath returns a pointer into the path just beyond the end of the alias.
-    @param plane A plane object must be specified.
-    @result A C-string pointer to the value of the alias if one is found, or zero if not. */
-
-    static const char * dealiasPath( const char ** opath,
-                                    const IORegistryPlane * plane );
-
-/*! @function makePlane
-    @abstract Constructs an IORegistryPlane object.
-    @discussion Most planes in IOKit are created by the OS, although other planes may be created.
-    @param name A C-string name for the new plane, to be copied.
-    @result A new instance of an IORegistryPlane, or zero on failure. */
-
-    static const IORegistryPlane * makePlane( const char * name );
-
-/*!    @abstract Returns an ID for the registry entry that is global to all tasks.
-    @discussion The entry ID returned by getRegistryEntryID can be used to identify a registry entry across all tasks. A registry entry may be looked up by its entry ID by creating a matching dictionary with IORegistryEntryIDMatching() in user space, or <code>IOService::registryEntryIDMatching()</code> in the kernel, to be used with the IOKit matching functions. The ID is valid only until the machine reboots.
-    @result An ID for the registry entry, assigned when the entry is first attached in the registry. */
-
-    uint64_t getRegistryEntryID( void );
-
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-    /* * * * * * * * * * * * internals * * * * * * * * * * * */
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-    virtual bool init( IORegistryEntry * from,
-				const IORegistryPlane * inPlane );
-
-private:
-    static IORegistryEntry * initialize( void );
-
-private:
-    inline bool arrayMember( OSArray * set,
-                            const IORegistryEntry * member,
-                            unsigned int * index = 0 ) const;
-
-    bool makeLink( IORegistryEntry * to,
-                    unsigned int relation,
-                    const IORegistryPlane * plane ) const;
-    void breakLink( IORegistryEntry * to,
-                    unsigned int relation,
-                    const IORegistryPlane * plane ) const;
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-	OSArray * getParentSetReference( const IORegistryPlane * plane )
-									const;
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    OSArray * getChildSetReference( const IORegistryPlane * plane )
-									const;
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IORegistryEntry * getChildFromComponent( const char ** path,
-				const IORegistryPlane * plane );
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    const OSSymbol * hasAlias(  const IORegistryPlane * plane,
-                                    char * opath = 0, int * length = 0 ) const;
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    const char * matchPathLocation( const char * cmp,
-				const IORegistryPlane * plane );
-
-};
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*! @class IORegistryIterator : public OSIterator
-    @abstract An iterator over the registry.
-    @discussion An iterator that can traverse the children or parents of a registry entry in a plane, and recurse. Access to the registry is protected against multiple threads, but an IORegistryIterator instance is for use by one thread only. */
-
-class IORegistryIterator : public OSIterator
-{
-    OSDeclareAbstractStructors(IORegistryIterator)
-
-private:
-    struct IORegCursor {
-        IORegCursor  	     *	next;
-        IORegistryEntry      *	current;
-        OSIterator 	     *	iter;
-    };
-    IORegCursor 		start;
-    IORegCursor 	  *	where;
-    IORegistryEntry 	  *	root;
-    OSOrderedSet  	  *	done;
-    const IORegistryPlane *	plane;
-    IOOptionBits		options;
-
-    virtual void free( void );
-
-public:
-/*! @function iterateOver
-    @abstract Create an iterator rooted at a given registry entry.
-    @discussion This method creates an IORegistryIterator that is set up with options to iterate children or parents of a root entry, and to recurse automatically into entries as they are returned, or only when instructed. The iterator object keeps track of entries that have been recursed into previously to avoid loops.
-    @param start The root entry to begin the iteration at.
-    @param plane A plane object must be specified.
-    @param options kIORegistryIterateRecursively may be set to recurse automatically into each entry as it is returned. This option affects the behaviour of the getNextObject method, which is defined in the OSIterator superclass. Other methods will override this behaviour. kIORegistryIterateParents may be set to iterate the parents of each entry, by default the children are iterated.
-    @result A created IORegistryIterator instance, to be released by the caller when it has finished with it. */
-
-    static IORegistryIterator * iterateOver( IORegistryEntry * start,
-                                             const IORegistryPlane * plane,
-					     IOOptionBits options = 0 );
-
-/*! @function iterateOver
-    @abstract Create an iterator rooted at the registry root.
-    @discussion This method creates an IORegistryIterator that is set up with options to iterate children of the registry root entry, and to recurse automatically into entries as they are returned, or only when instructed. The iterator object keeps track of entries that have been recursed into previously to avoid loops.
-    @param plane A plane object must be specified.
-    @param options kIORegistryIterateRecursively may be set to recurse automatically into each entry as it is returned. This option affects the behaviour of the getNextObject method, which is defined in the OSIterator superclass. Other methods will override this behaviour. kIORegistryIterateParents may be set to iterate the parents of each entry, by default the children are iterated.
-    @result A created IORegistryIterator instance, to be released by the caller when it has finished with it. */
-
-    static IORegistryIterator * iterateOver( const IORegistryPlane * plane,
-                                             IOOptionBits options = 0 );
-
-/*! @function getNextObject
-    @abstract Return the next object in the registry iteration.
-    @discussion This method calls either getNextObjectFlat or getNextObjectRecursive depending on the options the iterator was created with. This implements the OSIterator defined getNextObject method. The object returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it.
-    @result The next registry entry in the iteration (the current entry), or zero if the iteration has finished at this level of recursion. The entry returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it. */
-
-    virtual IORegistryEntry * getNextObject( void );
-
-/*! @function getNextObjectFlat
-    @abstract Return the next object in the registry iteration, ignoring the kIORegistryIterateRecursively option.
-    @discussion This method returns the next child, or parent if the kIORegistryIterateParents option was used to create the iterator, of the current root entry. The object returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it.
-    @result The next registry entry in the iteration (the current entry), or zero if the iteration has finished at this level of recursion, or the iteration is invalid (see isValid). The entry returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it. */
-
-    virtual IORegistryEntry * getNextObjectFlat( void );
-
-/*! @function getNextObjectRecursive
-    @abstract Return the next object in the registry iteration, and enter it.
-    @discussion If the iterator has a current entry, and the iterator has not already entered previously, enterEntry is called to recurse into it, ie. make it the new root, and the next child, or parent if the kIORegistryIterateParents option was used to create the iterator, at this new level of recursion is returned. If there is no current entry at this level of recursion, exitEntry is called and the process repeats, until the iteration returns to the entry the iterator was created with and zero is returned. The object returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it.
-    @result The next registry entry in the iteration (the current entry), or zero if its finished, or the iteration is invalid (see isValid). The entry returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it. */
-
-    virtual IORegistryEntry * getNextObjectRecursive( void );
-
-/*! @function getCurrentEntry
-    @abstract Return the current entry in the registry iteration.
-    @discussion This method returns the current entry, last returned by getNextObject et al. The object returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it. If the iteration is no longer valid (see isValid), the current entry is zero.
-    @result The current registry entry in the iteration, or zero if the last iteration returned zero, or the iteration is invalid (see isValid). The entry returned is retained while the iterator is pointing at it (its the current entry), or recursing into it. The caller should not release it. */
-
-    virtual IORegistryEntry * getCurrentEntry( void );
-
-/*! @function enterEntry
-    @abstract Recurse into the current entry in the registry iteration.
-    @discussion This method makes the current entry, ie. the last entry returned by getNextObject et al., the root in a new level of recursion. */
-
-    virtual void enterEntry( void );
-    
-/*! @function enterEntry
-    @abstract Recurse into the current entry in the registry iteration.
-    @discussion This method recurses into an entry as with enterEntry, but also switches from the current plane to a new one set by the caller.
-    @param plane The new plane to switch into. */
-
-    virtual void enterEntry( const IORegistryPlane * plane );
-
-/*! @function exitEntry
-    @abstract Exits a level of recursion, restoring the current entry.
-    @discussion This method undoes an enterEntry, restoring the current entry. If there are no more levels of recursion to exit false is returned, otherwise true is returned.
-    @result true if a level of recursion was undone, false if no recursive levels are left in the iteration. */
-
-    virtual bool exitEntry( void );
-
-/*! @function reset
-    @abstract Exits all levels of recursion, restoring the iterator to its state at creation.
-    @discussion This method exits all levels of recursion, and restores the iterator to its state at creation. */
-
-    virtual void reset( void );
-
-/*! @function isValid
-    @abstract Checks that no registry changes have invalidated the iteration.
-    @discussion If a registry iteration is invalidated by changes to the registry, it will be made invalid, the currentEntry will be considered zero, and further calls to getNextObject et al. will return zero. The iterator should be reset to restart the iteration when this happens.
-    @result false if the iterator has been invalidated by changes to the registry, true otherwise. */
-
-    virtual bool isValid( void );
-
-/*! @function iterateAll
-    @abstract Iterates all entries (with getNextObject) and returns a set of all returned entries.
-    @discussion This method will reset, then iterate all entries in the iteration (with getNextObject) until successful (ie. the iterator is valid at the end of the iteration).
-    @result A set of entries returned by the iteration. The caller should release the set when it has finished with it. Zero is returned on a resource failure. */
-
-    virtual OSOrderedSet * iterateAll( void );
-};
-
-#endif /* _IOKIT_IOREGISTRYENTRY_H */
diff --git a/i386/include/IOKit/IOReturn.h b/i386/include/IOKit/IOReturn.h
deleted file mode 100644
index 38811b6..0000000
--- a/i386/include/IOKit/IOReturn.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 1998-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * HISTORY
- */
- 
-/*
- * Core IOReturn values. Others may be family defined.
- */
-
-#ifndef __IOKIT_IORETURN_H
-#define __IOKIT_IORETURN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <mach/error.h>
-
-typedef	kern_return_t		IOReturn;
-
-#ifndef sys_iokit
-#define sys_iokit                         err_system(0x38)
-#endif /* sys_iokit */
-#define sub_iokit_common                  err_sub(0)
-#define sub_iokit_usb                     err_sub(1)
-#define sub_iokit_firewire                err_sub(2)
-#define sub_iokit_block_storage           err_sub(4)
-#define sub_iokit_graphics                err_sub(5)
-#define sub_iokit_networking		  err_sub(6)
-#define sub_iokit_bluetooth               err_sub(8)
-#define sub_iokit_pmu                     err_sub(9)
-#define sub_iokit_acpi                    err_sub(10)
-#define sub_iokit_smbus                   err_sub(11)
-#define sub_iokit_ahci                    err_sub(12)
-#define sub_iokit_powermanagement         err_sub(13)
-//#define sub_iokit_hidsystem             err_sub(14)
-#define sub_iokit_scsi                    err_sub(16)
-//#define sub_iokit_pccard                err_sub(21)
-
-#define sub_iokit_vendor_specific         err_sub(-2)
-#define sub_iokit_reserved                err_sub(-1)
-
-#define	iokit_common_err(return)          (sys_iokit|sub_iokit_common|return)
-#define	iokit_family_err(sub,return)      (sys_iokit|sub|return)
-#define iokit_vendor_specific_err(return) (sys_iokit|sub_iokit_vendor_specific|return)
-
-#define kIOReturnSuccess         KERN_SUCCESS            // OK
-#define kIOReturnError           iokit_common_err(0x2bc) // general error 	
-#define kIOReturnNoMemory        iokit_common_err(0x2bd) // can't allocate memory 
-#define kIOReturnNoResources     iokit_common_err(0x2be) // resource shortage 
-#define kIOReturnIPCError        iokit_common_err(0x2bf) // error during IPC 
-#define kIOReturnNoDevice        iokit_common_err(0x2c0) // no such device 
-#define kIOReturnNotPrivileged   iokit_common_err(0x2c1) // privilege violation 
-#define kIOReturnBadArgument     iokit_common_err(0x2c2) // invalid argument 
-#define kIOReturnLockedRead      iokit_common_err(0x2c3) // device read locked 
-#define kIOReturnLockedWrite     iokit_common_err(0x2c4) // device write locked 
-#define kIOReturnExclusiveAccess iokit_common_err(0x2c5) // exclusive access and
-                                                         //   device already open 
-#define kIOReturnBadMessageID    iokit_common_err(0x2c6) // sent/received messages
-                                                         //   had different msg_id
-#define kIOReturnUnsupported     iokit_common_err(0x2c7) // unsupported function 
-#define kIOReturnVMError         iokit_common_err(0x2c8) // misc. VM failure 
-#define kIOReturnInternalError   iokit_common_err(0x2c9) // internal error 
-#define kIOReturnIOError         iokit_common_err(0x2ca) // General I/O error 
-//#define kIOReturn???Error      iokit_common_err(0x2cb) // ??? 
-#define kIOReturnCannotLock      iokit_common_err(0x2cc) // can't acquire lock
-#define kIOReturnNotOpen         iokit_common_err(0x2cd) // device not open 
-#define kIOReturnNotReadable     iokit_common_err(0x2ce) // read not supported 
-#define kIOReturnNotWritable     iokit_common_err(0x2cf) // write not supported 
-#define kIOReturnNotAligned      iokit_common_err(0x2d0) // alignment error 
-#define kIOReturnBadMedia        iokit_common_err(0x2d1) // Media Error 
-#define kIOReturnStillOpen       iokit_common_err(0x2d2) // device(s) still open 
-#define kIOReturnRLDError        iokit_common_err(0x2d3) // rld failure 
-#define kIOReturnDMAError        iokit_common_err(0x2d4) // DMA failure 
-#define kIOReturnBusy            iokit_common_err(0x2d5) // Device Busy 
-#define kIOReturnTimeout         iokit_common_err(0x2d6) // I/O Timeout 
-#define kIOReturnOffline         iokit_common_err(0x2d7) // device offline 
-#define kIOReturnNotReady        iokit_common_err(0x2d8) // not ready 
-#define kIOReturnNotAttached     iokit_common_err(0x2d9) // device not attached 
-#define kIOReturnNoChannels      iokit_common_err(0x2da) // no DMA channels left
-#define kIOReturnNoSpace         iokit_common_err(0x2db) // no space for data 
-//#define kIOReturn???Error      iokit_common_err(0x2dc) // ??? 
-#define kIOReturnPortExists      iokit_common_err(0x2dd) // port already exists
-#define kIOReturnCannotWire      iokit_common_err(0x2de) // can't wire down 
-                                                         //   physical memory
-#define kIOReturnNoInterrupt     iokit_common_err(0x2df) // no interrupt attached
-#define kIOReturnNoFrames        iokit_common_err(0x2e0) // no DMA frames enqueued
-#define kIOReturnMessageTooLarge iokit_common_err(0x2e1) // oversized msg received
-                                                         //   on interrupt port
-#define kIOReturnNotPermitted    iokit_common_err(0x2e2) // not permitted
-#define kIOReturnNoPower         iokit_common_err(0x2e3) // no power to device
-#define kIOReturnNoMedia         iokit_common_err(0x2e4) // media not present
-#define kIOReturnUnformattedMedia iokit_common_err(0x2e5)// media not formatted
-#define kIOReturnUnsupportedMode iokit_common_err(0x2e6) // no such mode
-#define kIOReturnUnderrun        iokit_common_err(0x2e7) // data underrun
-#define kIOReturnOverrun         iokit_common_err(0x2e8) // data overrun
-#define kIOReturnDeviceError	 iokit_common_err(0x2e9) // the device is not working properly!
-#define kIOReturnNoCompletion	 iokit_common_err(0x2ea) // a completion routine is required
-#define kIOReturnAborted	 iokit_common_err(0x2eb) // operation aborted
-#define kIOReturnNoBandwidth	 iokit_common_err(0x2ec) // bus bandwidth would be exceeded
-#define kIOReturnNotResponding	 iokit_common_err(0x2ed) // device not responding
-#define kIOReturnIsoTooOld	 iokit_common_err(0x2ee) // isochronous I/O request for distant past!
-#define kIOReturnIsoTooNew	 iokit_common_err(0x2ef) // isochronous I/O request for distant future
-#define kIOReturnNotFound        iokit_common_err(0x2f0) // data was not found
-#define kIOReturnInvalid         iokit_common_err(0x1)   // should never be seen
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ! __IOKIT_IORETURN_H */
diff --git a/i386/include/IOKit/IOService.h b/i386/include/IOKit/IOService.h
deleted file mode 100644
index a965ea1..0000000
--- a/i386/include/IOKit/IOService.h
+++ /dev/null
@@ -1,1690 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998,1999 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-/*!
-	@header
-	This header contains the definition of the IOService class.  IOService is the sole direct subclass of IORegistryEntry and is the base class of almost all I/O Kit family superclasses.  IOService defines methods that support the life cycle of I/O Kit drivers.  For more information on IOService, see {@linkdoc //apple_ref/doc/uid/TP0000011 I/O Kit Fundamentals}.
-
-	@seealso //apple_ref/doc/header/IORegistryEntry.h IORegistryEntry
-*/
-
-#ifndef _IOKIT_IOSERVICE_H
-#define _IOKIT_IOSERVICE_H
-
-#include <IOKit/IORegistryEntry.h>
-#include <IOKit/IOReturn.h>
-#include <IOKit/IODeviceMemory.h>
-#include <IOKit/IONotifier.h>
-#include <IOKit/IOLocks.h>
-
-#include <IOKit/IOKitDebug.h>
-#include <IOKit/IOInterrupts.h>
-
-#include <IOKit/pwr_mgt/IOPMpowerState.h>
-#include <IOKit/IOServicePM.h>
-
-extern "C" {
-#include <kern/thread_call.h>
-}
-
-#ifndef UINT64_MAX
-#define UINT64_MAX        18446744073709551615ULL
-#endif
-
-enum {
-    kIODefaultProbeScore 	= 0
-};
-
-// masks for getState()
-enum {
-    kIOServiceInactiveState	= 0x00000001,
-    kIOServiceRegisteredState	= 0x00000002,
-    kIOServiceMatchedState	= 0x00000004,
-    kIOServiceFirstPublishState	= 0x00000008,
-    kIOServiceFirstMatchState	= 0x00000010
-};
-
-enum {
-    // options for registerService()
-    kIOServiceExclusive		= 0x00000001,
-
-    // options for terminate()
-    kIOServiceRequired		= 0x00000001,
-    kIOServiceTerminate		= 0x00000004,
-
-    // options for registerService() & terminate()
-    kIOServiceSynchronous	= 0x00000002,
-    // options for registerService()
-    kIOServiceAsynchronous	= 0x00000008
-};
-
-// options for open()
-enum {
-    kIOServiceSeize		= 0x00000001,
-    kIOServiceFamilyOpenOptions = 0xffff0000
-};
-
-// options for close()
-enum {
-    kIOServiceFamilyCloseOptions = 0xffff0000
-};
-
-typedef void * IONotificationRef;
-
-extern const IORegistryPlane *	gIOServicePlane;
-extern const IORegistryPlane *  gIOPowerPlane;
-
-extern const OSSymbol *		gIOResourcesKey;
-extern const OSSymbol *		gIOResourceMatchKey;
-extern const OSSymbol *		gIOProviderClassKey;
-extern const OSSymbol * 	gIONameMatchKey;
-extern const OSSymbol *		gIONameMatchedKey;
-extern const OSSymbol *		gIOPropertyMatchKey;
-extern const OSSymbol *		gIOLocationMatchKey;
-extern const OSSymbol *		gIOParentMatchKey;
-extern const OSSymbol *		gIOPathMatchKey;
-extern const OSSymbol *		gIOMatchCategoryKey;
-extern const OSSymbol *		gIODefaultMatchCategoryKey;
-extern const OSSymbol *		gIOMatchedServiceCountKey;
-
-extern const OSSymbol *		gIOUserClientClassKey;
-extern const OSSymbol *		gIOKitDebugKey;
-extern const OSSymbol *		gIOServiceKey;
-
-extern const OSSymbol *		gIOCommandPoolSizeKey;
-
-extern const OSSymbol *		gIOPublishNotification;
-extern const OSSymbol *		gIOFirstPublishNotification;
-extern const OSSymbol *		gIOMatchedNotification;
-extern const OSSymbol *		gIOFirstMatchNotification;
-extern const OSSymbol *		gIOTerminatedNotification;
-
-extern const OSSymbol *		gIOGeneralInterest;
-extern const OSSymbol *		gIOBusyInterest;
-extern const OSSymbol *		gIOOpenInterest;
-extern const OSSymbol *		gIOAppPowerStateInterest;
-extern const OSSymbol *		gIOPriorityPowerStateInterest;
-
-extern const OSSymbol *		gIODeviceMemoryKey;
-extern const OSSymbol *		gIOInterruptControllersKey;
-extern const OSSymbol *		gIOInterruptSpecifiersKey;
-
-extern SInt32 IOServiceOrdering( const OSMetaClassBase * inObj1, const OSMetaClassBase * inObj2, void * ref );
-
-typedef void (*IOInterruptAction)( OSObject * target, void * refCon,
-				   IOService * nub, int source );
-
-/*! @typedef IOServiceNotificationHandler
-    @param target Reference supplied when the notification was registered.
-    @param refCon Reference constant supplied when the notification was registered.
-    @param newService The IOService object the notification is delivering. It is retained for the duration of the handler's invocation and doesn't need to be released by the handler. */
-
-typedef bool (*IOServiceNotificationHandler)( void * target, void * refCon,
-                  IOService * newService );
-
-typedef bool (*IOServiceMatchingNotificationHandler)( void * target, void * refCon,
-                  IOService * newService,
-				  IONotifier * notifier );
-
-/*! @typedef IOServiceInterestHandler
-    @param target Reference supplied when the notification was registered.
-    @param refCon Reference constant supplied when the notification was registered.
-    @param messageType Type of the message - IOKit defined in IOKit/IOMessage.h or family specific.
-    @param provider The IOService object who is delivering the notification. It is retained for the duration of the handler's invocation and doesn't need to be released by the handler.
-    @param messageArgument An argument for message, dependent on its type.
-    @param argSize Non zero if the argument represents a struct of that size, used when delivering messages outside the kernel. */
-
-typedef IOReturn (*IOServiceInterestHandler)( void * target, void * refCon,
-                                              UInt32 messageType, IOService * provider,
-                                              void * messageArgument, vm_size_t argSize );
-
-typedef void (*IOServiceApplierFunction)(IOService * service, void * context);
-typedef void (*OSObjectApplierFunction)(OSObject * object, void * context);
-
-class IOUserClient;
-class IOPlatformExpert;
-
-/*! @class IOService
-    @abstract The base class for most I/O Kit families, devices, and drivers.
-    @discussion The IOService base class defines APIs used to publish services, instantiate other services based on the existance of a providing service (ie. driver stacking), destroy a service and its dependent stack, notify interested parties of service state changes, and general utility functions useful across all families. 
-
-Types of service are specified with a matching dictionary that describes properties of the service. For example, a matching dictionary might describe any IOUSBDevice (or subclass), an IOUSBDevice with a certain class code, or a IOPCIDevice with a set of OpenFirmware matching names or device & vendor IDs. Since the matching dictionary is interpreted by the family which created the service, as well as generically by IOService, the list of properties considered for matching depends on the familiy.
-
-Matching dictionaries are associated with IOService classes by the catalogue, as driver property tables, and also supplied by clients of the notification APIs.
-
-IOService provides matching based on C++ class (via OSMetaClass dynamic casting), registry entry name, a registry path to the service (which includes OpenFirmware paths), a name assigned by BSD, or by its location (its point of attachment).
-
-<br><br>Driver Instantiation by IOService<br><br>
-
-Drivers are subclasses of IOService, and their availability is managed through the catalogue. They are instantiated based on the publication of an IOService they use (for example, an IOPCIDevice or IOUSBDevice), or when they are added to  the catalogue and the IOService(s) they use are already available.
-
-When an IOService (the "provider") is published with the @link registerService registerService@/link method, the matching and probing process begins, which is always single threaded per provider. A list of matching dictionaries from the catalog and installed publish notification requests, that successfully match the IOService, is constructed, with ordering supplied by <code>kIOProbeScoreKey</code> ("IOProbeScore") property in the dictionary, or supplied with the notification. 
-
-Each entry in the list is then processed in order - for notifications, the notification is delivered, for driver property tables a lot more happens.
-
-The driver class is instantiated and <code>init()</code> called with its property table. The new driver instance is then attached to the provider, and has its @link probe probe@/link method called with the provider as an argument. The default <code>probe</code> method does nothing but return success, but a driver may implement this method to interrogate the provider to make sure it can work with it. It may also modify its probe score at this time. After probe, the driver is detached and the next in the list is considered (ie. attached, probed, and detached).
-
-When the probing phase is complete, the list consists of successfully probed drivers, in order of their probe score (after adjustment during the @link probe probe@/link call). The list is then divided into categories based on the <code>kIOMatchCategoryKey</code> property ("IOMatchCategory"); drivers without a match category are all considered in one default category. Match categories allow multiple clients of a provider to be attached and started, though the provider may also enforce open/close semantics to gain active access to it.
-
-For each category, the highest scoring driver in that category is attached to the provider, and its @link start start@/link method called. If <code>start</code> is successful, the rest of the drivers in the same match category are discarded, otherwise the next highest scoring driver is started, and so on.
-
-The driver should only consider itself in action when the start method is called, meaning it has been selected for use on the provider, and consuming that particular match category. It should also be prepared to be allocated, probed and freed even if the probe was successful.
-
-After the drivers have all synchronously been started, the installed "matched" notifications that match the registered IOService are delivered.
-
-<br><br>Properties used by IOService<br><br>
-
-	<code>kIOClassKey, extern const OSSymbol * gIOClassKey, "IOClass"</code>
-<br>
-<br>
-Class of the driver to instantiate on matching providers.
-<br>
-<br>
-	<code>kIOProviderClassKey, extern const OSSymbol * gIOProviderClassKey, "IOProviderClass"</code>
-<br>
-<br>
-Class of the provider(s) to be considered for matching, checked with OSDynamicCast so subclasses will also match.
-<br>
-<br>
-	<code>kIOProbeScoreKey, extern const OSSymbol * gIOProbeScoreKey, "IOProbeScore"</code>
-<br>
-<br>
-The probe score initially used to order multiple matching drivers.
-<br>
-<br>
-	<code>kIOMatchCategoryKey, extern const OSSymbol * gIOMatchCategoryKey, "IOMatchCategory"</code>
-<br>
-<br>
-A string defining the driver category for matching purposes. All drivers with no <code>IOMatchCategory</code> property are considered to be in the same default category. Only one driver in a category can be started on each provider.
-<br>
-<br>
-	<code>kIONameMatchKey, extern const OSSymbol * gIONameMatchKey, "IONameMatch"</code>
-<br>
-A string or collection of strings that match the provider's name. The comparison is implemented with the @link //apple_ref/cpp/instm/IORegistryEntry/compareNames/virtualbool/(OSObject*,OSString**) IORegistryEntry::compareNames@/link method, which supports a single string, or any collection (OSArray, OSSet, OSDictionary etc.) of strings. IOService objects with OpenFirmware device tree properties (eg. IOPCIDevice) will also be matched based on that standard's "compatible", "name", "device_type" properties. The matching name will be left in the driver's property table in the <code>kIONameMatchedKey</code> property.
-<br>
-Examples
-<pre>
-@textblock
-	<key>IONameMatch</key>
-	<string>pci106b,7</string>
-@/textblock
-</pre>
-
-For a list of possible matching names, a serialized array of strings should used, eg.
-<pre>
-@textblock
-	<key>IONameMatch</key>
-	<array>
-		<string>APPL,happy16</string>
-		<string>pci106b,7</string>
-	</array>
-@/textblock
-</pre>
-
-<br>
-	<code>kIONameMatchedKey, extern const OSSymbol * gIONameMatchedKey, "IONameMatched"</code>
-<br>
-The name successfully matched name from the <code>kIONameMatchKey</code> property will be left in the driver's property table as the <code>kIONameMatchedKey</code> property.
-<br>
-<br>
-	<code>kIOPropertyMatchKey, extern const OSSymbol * gIOPropertyMatchKey, "IOPropertyMatch"</code>
-<br>
-A dictionary of properties that each must exist in the matching IOService and compare successfully with the <code>isEqualTo</code> method.
-
-<pre>
-@textblock
-	<key>IOPropertyMatch</key>
-	<dictionary>
-		<key>APPL,happy16</key>
-		<string>APPL,meek8</string>
-	</dictionary>
-@/textblock
-</pre>
-
-<br>
-	<code>kIOUserClientClassKey, extern const OSSymbol * gIOUserClientClassKey, "IOUserClientClass"</code>
-<br>
-The class name that the service will attempt to allocate when a user client connection is requested.  First the device nub is queried, then the nub's provider is queried by default.
-<br>
-<br>
-	<code>kIOKitDebugKey, extern const OSSymbol * gIOKitDebugKey, "IOKitDebug"</code>
-<br>
-Set some debug flags for logging the driver loading process. Flags are defined in <code>IOKit/IOKitDebug.h</code>, but <code>65535</code> works well.*/
-
-class IOService : public IORegistryEntry
-{
-    OSDeclareDefaultStructors(IOService)
-
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of this class in the future.
-    */    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData * reserved;
-
-private:
-    IOService *		__provider;
-    SInt32		__providerGeneration;
-    IOService *		__owner;
-    IOOptionBits	__state[2];
-    uint64_t		__timeBusy;
-    uint64_t		__accumBusy;
-    IOServicePM *	pwrMgt;
-
-protected:
-    // TRUE once PMinit has been called
-    bool			initialized;
-
-public:
-    // DEPRECATED
-    void *          pm_vars;
-
-public:
-    /* methods available in Mac OS X 10.1 or later */
-/*! @function requestTerminate
-    @abstract Passes a termination up the stack.
-    @discussion When an IOService is made inactive the default behavior is to also make any of its clients that have it as their only provider also inactive, in this way recursing the termination up the driver stack. This method allows an IOService object to override this behavior. Returning <code>true</code> from this method when passed a just terminated provider will cause the client to also be terminated.
-    @param provider The terminated provider of this object.
-    @param options Options originally passed to terminate, plus <code>kIOServiceRecursing</code>.
-    @result <code>true</code> if this object should be terminated now that its provider has been. */
-
-    virtual bool requestTerminate( IOService * provider, IOOptionBits options );
-
-/*! @function willTerminate
-    @abstract Passes a termination up the stack.
-    @discussion Notification that a provider has been terminated, sent before recursing up the stack, in root-to-leaf order.
-    @param provider The terminated provider of this object.
-    @param options Options originally passed to terminate.
-    @result <code>true</code>. */
-
-    virtual bool willTerminate( IOService * provider, IOOptionBits options );
-
-/*! @function didTerminate
-    @abstract Passes a termination up the stack.
-    @discussion Notification that a provider has been terminated, sent after recursing up the stack, in leaf-to-root order.
-    @param provider The terminated provider of this object.
-    @param options Options originally passed to terminate.
-    @param defer If there is pending I/O that requires this object to persist, and the provider is not opened by this object set <code>defer</code> to <code>true</code> and call the <code>IOService::didTerminate()</code> implementation when the I/O completes. Otherwise, leave <code>defer</code> set to its default value of <code>false</code>.
-    @result <code>true</code>. */
-
-    virtual bool didTerminate( IOService * provider, IOOptionBits options, bool * defer );
-
-/*! @function nextIdleTimeout
-    @availability Mac OS X v10.4 and later
-    @abstract Allows subclasses to customize idle power management behavior.
-    @discussion Returns the next time that the device should idle into its next lower power state. Subclasses may override for custom idle behavior.
-    
-    A power managed driver might override this method to provide a more sophisticated idle power off algorithm than the one defined by power management.
-    @param currentTime The current time
-    @param lastActivity The time of last activity on this device
-    @param powerState The device's current power state.
-    @result Returns the next time the device should idle off (in seconds, relative to the current time). */
-
-    virtual SInt32 nextIdleTimeout(AbsoluteTime currentTime, 
-        AbsoluteTime lastActivity, unsigned int powerState);
-
-/*! @function systemWillShutdown
-    @availability Mac OS X v10.5 and later
-    @abstract Notifies members of the power plane of system shutdown and restart.
-    @discussion This function is called for all members of the power plane in leaf-to-root order. If a subclass needs to wait for a pending I/O, then the call to <code>systemWillShutdown</code> should be postponed until the I/O completes.
-    
-    Any power managed driver (which has called @link joinPMtree joinPMtree@/link to join the power plane) interested in taking action at system shutdown or restart should override this method.
-    @param specifier <code>kIOMessageSystemWillPowerOff</code> or <code>kIOMessageSystemWillRestart</code>. */
-
-    virtual void systemWillShutdown( IOOptionBits specifier );
-
-/*! @function copyClientWithCategory
-    @availability Mac OS X v10.6 and later
-    @param category An OSSymbol corresponding to an IOMatchCategory matching property.
-	@result Returns a reference to the IOService child with the given category. The result should be released by the caller.
-*/
-
-    virtual IOService * copyClientWithCategory( const OSSymbol * category );
-
-private:
-#if __LP64__
-    OSMetaClassDeclareReservedUnused(IOService, 0);
-    OSMetaClassDeclareReservedUnused(IOService, 1);
-    OSMetaClassDeclareReservedUnused(IOService, 2);
-    OSMetaClassDeclareReservedUnused(IOService, 3);
-    OSMetaClassDeclareReservedUnused(IOService, 4);
-    OSMetaClassDeclareReservedUnused(IOService, 5);
-#else
-    OSMetaClassDeclareReservedUsed(IOService, 0);
-    OSMetaClassDeclareReservedUsed(IOService, 1);
-    OSMetaClassDeclareReservedUsed(IOService, 2);
-    OSMetaClassDeclareReservedUsed(IOService, 3);
-    OSMetaClassDeclareReservedUsed(IOService, 4);
-    OSMetaClassDeclareReservedUsed(IOService, 5);
-#endif
-
-    OSMetaClassDeclareReservedUnused(IOService, 6);
-    OSMetaClassDeclareReservedUnused(IOService, 7);
-    OSMetaClassDeclareReservedUnused(IOService, 8);
-    OSMetaClassDeclareReservedUnused(IOService, 9);
-    OSMetaClassDeclareReservedUnused(IOService, 10);
-    OSMetaClassDeclareReservedUnused(IOService, 11);
-    OSMetaClassDeclareReservedUnused(IOService, 12);
-    OSMetaClassDeclareReservedUnused(IOService, 13);
-    OSMetaClassDeclareReservedUnused(IOService, 14);
-    OSMetaClassDeclareReservedUnused(IOService, 15);
-    OSMetaClassDeclareReservedUnused(IOService, 16);
-    OSMetaClassDeclareReservedUnused(IOService, 17);
-    OSMetaClassDeclareReservedUnused(IOService, 18);
-    OSMetaClassDeclareReservedUnused(IOService, 19);
-    OSMetaClassDeclareReservedUnused(IOService, 20);
-    OSMetaClassDeclareReservedUnused(IOService, 21);
-    OSMetaClassDeclareReservedUnused(IOService, 22);
-    OSMetaClassDeclareReservedUnused(IOService, 23);
-    OSMetaClassDeclareReservedUnused(IOService, 24);
-    OSMetaClassDeclareReservedUnused(IOService, 25);
-    OSMetaClassDeclareReservedUnused(IOService, 26);
-    OSMetaClassDeclareReservedUnused(IOService, 27);
-    OSMetaClassDeclareReservedUnused(IOService, 28);
-    OSMetaClassDeclareReservedUnused(IOService, 29);
-    OSMetaClassDeclareReservedUnused(IOService, 30);
-    OSMetaClassDeclareReservedUnused(IOService, 31);
-    OSMetaClassDeclareReservedUnused(IOService, 32);
-    OSMetaClassDeclareReservedUnused(IOService, 33);
-    OSMetaClassDeclareReservedUnused(IOService, 34);
-    OSMetaClassDeclareReservedUnused(IOService, 35);
-    OSMetaClassDeclareReservedUnused(IOService, 36);
-    OSMetaClassDeclareReservedUnused(IOService, 37);
-    OSMetaClassDeclareReservedUnused(IOService, 38);
-    OSMetaClassDeclareReservedUnused(IOService, 39);
-    OSMetaClassDeclareReservedUnused(IOService, 40);
-    OSMetaClassDeclareReservedUnused(IOService, 41);
-    OSMetaClassDeclareReservedUnused(IOService, 42);
-    OSMetaClassDeclareReservedUnused(IOService, 43);
-    OSMetaClassDeclareReservedUnused(IOService, 44);
-    OSMetaClassDeclareReservedUnused(IOService, 45);
-    OSMetaClassDeclareReservedUnused(IOService, 46);
-    OSMetaClassDeclareReservedUnused(IOService, 47);
-
-#ifdef __ppc__
-    OSMetaClassDeclareReservedUnused(IOService, 48);
-    OSMetaClassDeclareReservedUnused(IOService, 49);
-    OSMetaClassDeclareReservedUnused(IOService, 50);
-    OSMetaClassDeclareReservedUnused(IOService, 51);
-    OSMetaClassDeclareReservedUnused(IOService, 52);
-    OSMetaClassDeclareReservedUnused(IOService, 53);
-    OSMetaClassDeclareReservedUnused(IOService, 54);
-    OSMetaClassDeclareReservedUnused(IOService, 55);
-    OSMetaClassDeclareReservedUnused(IOService, 56);
-    OSMetaClassDeclareReservedUnused(IOService, 57);
-    OSMetaClassDeclareReservedUnused(IOService, 58);
-    OSMetaClassDeclareReservedUnused(IOService, 59);
-    OSMetaClassDeclareReservedUnused(IOService, 60);
-    OSMetaClassDeclareReservedUnused(IOService, 61);
-    OSMetaClassDeclareReservedUnused(IOService, 62);
-    OSMetaClassDeclareReservedUnused(IOService, 63);
-#endif
-
-public:
-/*! @function getState
-    @abstract Accessor for IOService state bits, not normally needed or used outside IOService.
-    @result State bits for the IOService, eg. <code>kIOServiceInactiveState</code>, <code>kIOServiceRegisteredState</code>. */
-
-    virtual IOOptionBits getState( void ) const;
-
-/*! @function isInactive
-    @abstract Checks if the IOService object has been terminated, and is in the process of being destroyed.
-    @discussion When an IOService object is successfully terminated, it is immediately made inactive, which blocks further attach()es, matching or notifications occuring on the object. It remains inactive until the last client closes, and is then finalized and destroyed.
-    @result <code>true</code> if the IOService object has been terminated. */
-
-    bool isInactive( void ) const;
-
-    /* Stack creation */
-
-/*! @function registerService
-    @abstract Starts the registration process for a newly discovered IOService object.
-    @discussion This function allows an IOService subclass to be published and made available to possible clients, by starting the registration process and delivering notifications to registered clients. The object should be completely setup and ready to field requests from clients before <code>registerService</code> is called.
-    @param options The default zero options mask is recommended and should be used in most cases. The registration process is usually asynchronous, with possible driver probing and notification occurring some time later. <code>kIOServiceSynchronous</code> may be passed to carry out the matching and notification process for currently registered clients before returning to the caller. */
-
-    virtual void registerService( IOOptionBits options = 0 );
-
-/*! @function probe
-    @abstract During an IOService object's instantiation, probes a matched service to see if it can be used.
-    @discussion The registration process for an IOService object (the provider) includes instantiating possible driver clients. The <code>probe</code> method is called in the client instance to check the matched service can be used before the driver is considered to be started. Since matching screens many possible providers, in many cases the <code>probe</code> method can be left unimplemented by IOService subclasses. The client is already attached to the provider when <code>probe</code> is called.
-    @param provider The registered IOService object that matches a driver personality's matching dictionary.
-    @param score Pointer to the current driver's probe score, which is used to order multiple matching drivers in the same match category. It defaults to the value of the <code>IOProbeScore</code> property in the drivers property table, or <code>kIODefaultProbeScore</code> if none is specified. The <code>probe</code> method may alter the score to affect start order.
-    @result An IOService instance or zero when the probe is unsuccessful. In almost all cases the value of <code>this</code> is returned on success. If another IOService object is returned, the probed instance is detached and freed, and the returned instance is used in its stead for <code>start</code>. */
-    
-    virtual IOService * probe(	IOService * 	provider,
-				SInt32 	  *	score );
-
-/*! @function start
-    @abstract During an IOService object's instantiation, starts the IOService object that has been selected to run on the provider.
-    @discussion The <code>start</code> method of an IOService instance is called by its provider when it has been selected (due to its probe score and match category) as the winning client. The client is already attached to the provider when <code>start</code> is called.<br>Implementations of <code>start</code> must call <code>start</code> on their superclass at an appropriate point. If an implementation of <code>start</code> has already called <code>super::start</code> but subsequently determines that it will fail, it must call <code>super::stop</code> to balance the prior call to <code>super::start</code> and prevent reference leaks.
-    @result <code>true</code> if the start was successful; <code>false</code> otherwise (which will cause the instance to be detached and usually freed). */
-    
-    virtual bool start( IOService * provider );
-    
-/*! @function stop
-    @abstract During an IOService termination, the stop method is called in its clients before they are detached & it is destroyed.
-    @discussion The termination process for an IOService (the provider) will call stop in each of its clients, after they have closed the provider if they had it open, or immediately on termination. */
-
-    virtual void stop( IOService * provider );
-
-    /* Open / Close */
-
-/*! @function open
-    @abstract Requests active access to a provider.
-    @discussion IOService provides generic open and close semantics to track clients of a provider that have established an active datapath. The use of <code>open</code> and @link close close@/link, and rules regarding ownership are family defined, and defined by the @link handleOpen handleOpen@/link and @link handleClose handleClose@/link methods in the provider. Some families will limit access to a provider based on its open state.
-    @param forClient Designates the client of the provider requesting the open.
-    @param options Options for the open. The provider family may implement options for open; IOService defines only <code>kIOServiceSeize</code> to request the device be withdrawn from its current owner.
-    @result <code>true</code> if the open was successful; <code>false</code> otherwise. */
-
-    virtual bool open( 	 IOService *	   forClient,
-                         IOOptionBits	   options = 0,
-                         void *		   arg = 0 );
-
-/*! @function close
-    @abstract Releases active access to a provider.
-    @discussion IOService provides generic open and close semantics to track clients of a provider that have established an active datapath. The use of @link open open@/link and <code>close</code>, and rules regarding ownership are family defined, and defined by the @link handleOpen handleOpen@/link and @link handleClose handleClose@/link methods in the provider.
-    @param forClient Designates the client of the provider requesting the close.
-    @param options Options available for the close. The provider family may implement options for close; IOService defines none.
-    @param arg Family specific arguments which are ignored by IOService. */
-    
-    virtual void close(  IOService *	   forClient,
-                         IOOptionBits	   options = 0 );
-                         
-/*! @function isOpen
-    @abstract Determines whether a specific, or any, client has an IOService object open.
-    @discussion Returns the open state of an IOService object with respect to the specified client, or when it is open by any client.
-    @param forClient If non-zero, <codeisOpen</code returns the open state for that client. If zero is passed, <codeisOpen</code returns the open state for all clients.
-    @result <codetrue</code if the specific, or any, client has the IOService object open. */
-
-    virtual bool isOpen( const IOService * forClient = 0 ) const;
-
-/*! @function handleOpen
-    @abstract Controls the open / close behavior of an IOService object (overrideable by subclasses).
-    @discussion IOService calls this method in its subclasses in response to the @link open open@/link method, so the subclass may implement the request. The default implementation provides single owner access to an IOService object via <code>open</code>. The object is locked via @link lockForArbitration lockForArbitration@/link before <code>handleOpen</code> is called.
-    @param forClient Designates the client of the provider requesting the open.
-    @param options Options for the open, may be interpreted by the implementor of <code>handleOpen</code>.
-    @result <code>true</code>if the open was successful; <code>false</code> otherwise. */
-
-    virtual bool handleOpen( 	IOService *	  forClient,
-                                IOOptionBits	  options,
-                                void *		  arg );
-                                
-/*! @function handleClose
-    @abstract Controls the open / close behavior of an IOService object (overrideable by subclasses).
-    @discussion IOService calls this method in its subclasses in response to the @link close close@/link method, so the subclass may implement the request. The default implementation provides single owner access to an IOService object via @link open open@/link. The object is locked via @link lockForArbitration lockForArbitration@/link before <code>handleClose</code> is called.
-    @param forClient Designates the client of the provider requesting the close.
-    @param options Options for the close, may be interpreted by the implementor of @link handleOpen handleOpen@/link. */
-
-    virtual void handleClose(   IOService *	  forClient,
-                                IOOptionBits	  options );
-                                
-/*! @function handleIsOpen
-    @abstract Controls the open / close behavior of an IOService object (overrideable by subclasses).
-    @discussion IOService calls this method in its subclasses in response to the @link open open@/link method, so the subclass may implement the request. The default implementation provides single owner access to an IOService object via @link open open@/link. The object is locked via @link lockForArbitration lockForArbitration@/link before <code>handleIsOpen</code> is called.
-    @param forClient If non-zero, <code>isOpen</code> returns the open state for that client. If zero is passed, <code>isOpen</code> returns the open state for all clients.
-    @result <code>true</code> if the specific, or any, client has the IOService object open. */
-
-    virtual bool handleIsOpen(  const IOService * forClient ) const;
-
-    /* Stacking change */
-
-/*! @function terminate
-    @abstract Makes an IOService object inactive and begins its destruction.
-    @discussion Registering an IOService object informs possible clients of its existance and instantiates drivers that may be used with it; <code>terminate</code> involves the opposite process of informing clients that an IOService object is no longer able to be used and will be destroyed. By default, if any client has the service open, <code>terminate</code> fails. If the <code>kIOServiceRequired</code> flag is passed however, <code>terminate</code> will be successful though further progress in the destruction of the IOService object will not proceed until the last client has closed it. The service will be made inactive immediately upon successful termination, and all its clients will be notified via their @link message message@/link method with a message of type <code>kIOMessageServiceIsTerminated</code>. Both these actions take place on the caller's thread. After the IOService object is made inactive, further matching or attach calls will fail on it. Each client has its @link stop stop@/link method called upon their close of an inactive IOService object , or on its termination if they do not have it open. After <code>stop</code>, @link detach detach@/link is called in each client. When all clients have been detached, the @link finalize finalize@/link method is called in the inactive service. The termination process is inherently asynchronous because it will be deferred until all clients have chosen to close.
-    @param options In most cases no options are needed. <code>kIOServiceSynchronous</code> may be passed to cause <code>terminate</code> to not return until the service is finalized. */
-
-    virtual bool terminate( IOOptionBits options = 0 );
-
-/*! @function finalize
-    @abstract Finalizes the destruction of an IOService object.
-    @discussion The <code>finalize</code> method is called in an inactive (ie. terminated) IOService object after the last client has detached. IOService's implementation will call @link stop stop@/link, @link close close@/link, and @link detach detach@/link on each provider. When <code>finalize</code> returns, the object's retain count will have no references generated by IOService's registration process.
-    @param options The options passed to the @link terminate terminate@/link method of the IOService object are passed on to <code>finalize</code>.
-    @result <code>true</code>. */
-    
-    virtual bool finalize( IOOptionBits options );
-
-/*! @function free
-    @abstract Frees data structures that were allocated when power management was initialized on this service. */
-    
-    virtual void free( void );
-
-/*! @function lockForArbitration
-    @abstract Locks an IOService object against changes in state or ownership.
-    @discussion The registration, termination and open / close functions of IOService use <code>lockForArbtration</code> to single-thread access to an IOService object. <code>lockForArbitration</code> grants recursive access to the same thread.
-    @param isSuccessRequired If a request for access to an IOService object should be denied if it is terminated, pass <code>false</code>, otherwise pass <code>true</code>. */
-    
-    virtual bool lockForArbitration( bool isSuccessRequired = true );
-    
-/*! @function unlockForArbitration
-    @abstract Unlocks an IOService obkect after a successful @link lockForArbitration lockForArbitration@/link.
-    @discussion A thread granted exclusive access to an IOService object should release it with <code>unlockForArbitration</code>. */
-    
-    virtual void unlockForArbitration( void );
-
-/*! @function terminateClient
-    @abstract Passes a termination up the stack.
-    @discussion When an IOService object is made inactive the default behavior is to also make any of its clients that have it as their only provider inactive, in this way recursing the termination up the driver stack. This method allows a terminated  IOService object to override this behavior. Note the client may also override this behavior by overriding its @link terminate terminate@/link method.
-    @param client The client of the terminated provider.
-    @param options Options originally passed to @link terminate terminate@/link, plus <code>kIOServiceRecursing</code>.
-    @result result of the terminate request on the client. */
-
-    virtual bool terminateClient( IOService * client, IOOptionBits options );
-
-    /* Busy state indicates discovery, matching or termination is in progress */
-
-/*! @function getBusyState
-    @abstract Returns the <code>busyState</code> of an IOService object.
-    @discussion Many activities in IOService are asynchronous. When registration, matching, or termination is in progress on an IOService object, its <code>busyState</code> is increased by one. Change in <code>busyState</code> to or from zero also changes the IOService object's provider's <code>busyState</code> by one, which means that an IOService object is marked busy when any of the above activities is ocurring on it or any of its clients.
-    @result The <code>busyState</code> value. */
-
-    virtual UInt32 getBusyState( void );
-    
-/*! @function adjustBusy
-    @abstract Adjusts the <code>busyState</code> of an IOService object.
-    @discussion Applies a delta to an IOService object's <code>busyState</code>. A change in the <code>busyState</code> to or from zero will change the IOService object's provider's <code>busyState</code> by one (in the same direction). 
-    @param delta The delta to be applied to the IOService object's <code>busyState</code>. */
-
-    virtual void adjustBusy( SInt32 delta );
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-	IOReturn waitQuiet(mach_timespec_t * timeout)
-	APPLE_KEXT_DEPRECATED;
-
-/*! @function waitQuiet
-    @abstract Waits for an IOService object's <code>busyState</code> to be zero.
-    @discussion Blocks the caller until an IOService object is non busy.
-	@param timeout The maximum time to wait in nanoseconds. Default is to wait forever.
-    @result Returns an error code if Mach synchronization primitives fail, <code>kIOReturnTimeout</code>, or <code>kIOReturnSuccess</code>. */
-    
-    IOReturn waitQuiet(uint64_t timeout = UINT64_MAX);
-
-    /* Matching */
-
-/*! @function matchPropertyTable
-    @abstract Allows a registered IOService object to implement family specific matching.
-    @discussion All matching on an IOService object will call this method to allow a family writer to implement matching in addition to the generic methods provided by IOService. The implementer should examine the matching dictionary passed to see if it contains properties the family understands for matching, and use them to match with the IOService object if so. Note that since matching is also carried out by other parts of the I/O Kit, the matching dictionary may contain properties the family does not understand - these should not be considered matching failures.
-    @param table The dictionary of properties to be matched against.
-    @param score Pointer to the current driver's probe score, which is used to order multiple matching drivers in the same match category. It defaults to the value of the <code>IOProbeScore</code> property in the drivers property table, or <code>kIODefaultProbeScore</code> if none is specified.
-    @result <code>false</code> if the family considers the matching dictionary does not match in properties it understands; <code>true</code> otherwise. */
-
-    virtual bool matchPropertyTable( OSDictionary *	table,
-                                     SInt32       *	score );
-
-    virtual bool matchPropertyTable( OSDictionary * table );
-
-/*! @function matchLocation
-    @abstract Allows a registered IOService object to direct location matching.
-    @discussion By default, a location matching property will be applied to an IOService object's provider. This method allows that behavior to be overridden by families.
-    @param client The IOService object at which matching is taking place.
-    @result Returns the IOService instance to be used for location matching. */
-
-    virtual IOService * matchLocation( IOService * client );
-
-    /* Resource service */
-
-/*! @function publishResource
-    @abstract Uses the resource service to publish a property.
-    @discussion The resource service uses IOService's matching and notification to allow objects to be published and found by any I/O Kit client by a global name. <code>publishResource</code> makes an object available to anyone waiting for it or looking for it in the future.
-    @param key An OSSymbol key that globally identifies the object.
-    @param The object to be published. */
-
-    static void publishResource( const OSSymbol * key, OSObject * value = 0 );
-
-/*! @function publishResource
-    @abstract Uses the resource service to publish a property.
-    @discussion The resource service uses IOService object's matching and notification to allow objects to be published and found by any I/O Kit client by a global name. <code>publishResource</code> makes an object available to anyone waiting for it or looking for it in the future.
-    @param key A C string key that globally identifies the object.
-    @param The object to be published. */
-
-    static void publishResource( const char * key, OSObject * value = 0 );
-    virtual bool addNeededResource( const char * key );
-
-    /* Notifications */
-
-/*! @function addNotification
-    @abstract Deprecated use addMatchingNotification(). Adds a persistant notification handler to be notified of IOService events.
-    @discussion IOService will deliver notifications of changes in state of an IOService object to registered clients. The type of notification is specified by a symbol, for example <code>gIOMatchedNotification</code> or <code>gIOTerminatedNotification</code>, and notifications will only include IOService objects that match the supplied matching dictionary. Notifications are ordered by a priority set with <code>addNotification</code>. When the notification is installed, its handler will be called with each of any currently existing IOService objects that are in the correct state (eg. registered) and match the supplied matching dictionary, avoiding races between finding preexisting and new IOService events. The notification request is identified by an instance of an IONotifier object, through which it can be enabled, disabled, or removed. <code>addNotification</code> consumes a retain count on the matching dictionary when the notification is removed.
-    @param type An OSSymbol identifying the type of notification and IOService state:
-<br>	<code>gIOPublishNotification</code> Delivered when an IOService object is registered.
-<br>	<code>gIOFirstPublishNotification</code> Delivered when an IOService object is registered, but only once per IOService instance. Some IOService objects may be reregistered when their state is changed.
-<br>	<code>gIOMatchedNotification</code> Delivered when an IOService object has been matched with all client drivers, and they have been probed and started.
-<br>	<code>gIOFirstMatchNotification</code> Delivered when an IOService object has been matched with all client drivers, but only once per IOService instance. Some IOService objects may be reregistered when their state is changed.
-<br>	<code>gIOTerminatedNotification</code> Delivered after an IOService object has been terminated, during its finalize stage.
-    @param matching A matching dictionary to restrict notifications to only matching IOService objects. The dictionary will be released when the notification is removed, consuming the passed-in reference.
-    @param handler A C function callback to deliver notifications.
-    @param target An instance reference for the callback's use.
-    @param ref A reference constant for the callback's use.
-    @param priority A constant ordering all notifications of a each type.
-    @result An instance of an IONotifier object that can be used to control or destroy the notification request. */
-
-    static IONotifier * addNotification(
-                            const OSSymbol * type, OSDictionary * matching,
-                            IOServiceNotificationHandler handler,
-                            void * target, void * ref = 0,
-                            SInt32 priority = 0 )
-	APPLE_KEXT_DEPRECATED;
-
-/*! @function addMatchingNotification
-    @abstract Adds a persistant notification handler to be notified of IOService events.
-    @discussion IOService will deliver notifications of changes in state of an IOService object to registered clients. The type of notification is specified by a symbol, for example <code>gIOMatchedNotification</code> or <code>gIOTerminatedNotification</code>, and notifications will only include IOService objects that match the supplied matching dictionary. Notifications are ordered by a priority set with <code>addNotification</code>. When the notification is installed, its handler will be called with each of any currently existing IOService objects that are in the correct state (eg. registered) and match the supplied matching dictionary, avoiding races between finding preexisting and new IOService events. The notification request is identified by an instance of an IONotifier object, through which it can be enabled, disabled, or removed. <code>addMatchingNotification</code> does not consume a reference on the matching dictionary when the notification is removed, unlike addNotification.
-    @param type An OSSymbol identifying the type of notification and IOService state:
-<br>	<code>gIOPublishNotification</code> Delivered when an IOService object is registered.
-<br>	<code>gIOFirstPublishNotification</code> Delivered when an IOService object is registered, but only once per IOService instance. Some IOService objects may be reregistered when their state is changed.
-<br>	<code>gIOMatchedNotification</code> Delivered when an IOService object has been matched with all client drivers, and they have been probed and started.
-<br>	<code>gIOFirstMatchNotification</code> Delivered when an IOService object has been matched with all client drivers, but only once per IOService instance. Some IOService objects may be reregistered when their state is changed.
-<br>	<code>gIOTerminatedNotification</code> Delivered after an IOService object has been terminated, during its finalize stage.
-    @param matching A matching dictionary to restrict notifications to only matching IOService objects. The dictionary is retained while the notification is installed. (Differs from addNotification).
-    @param handler A C function callback to deliver notifications.
-    @param target An instance reference for the callback's use.
-    @param ref A reference constant for the callback's use.
-    @param priority A constant ordering all notifications of a each type.
-    @result An instance of an IONotifier object that can be used to control or destroy the notification request. */
-
-    static IONotifier * addMatchingNotification(
-                            const OSSymbol * type, OSDictionary * matching,
-                            IOServiceMatchingNotificationHandler handler,
-                            void * target, void * ref = 0,
-                            SInt32 priority = 0 );
-
-/*! @function waitForService
-    @abstract Deprecated use waitForMatchingService(). Waits for a matching to service to be published.
-    @discussion Provides a method of waiting for an IOService object matching the supplied matching dictionary to be registered and fully matched. 
-    @param matching The matching dictionary describing the desired IOService object. <code>waitForService</code> consumes one reference of the matching dictionary.
-    @param timeout The maximum time to wait.
-    @result A published IOService object matching the supplied dictionary. */
-
-    static IOService * waitForService( OSDictionary * matching,
-                            mach_timespec_t * timeout = 0);
-
-/*! @function waitForMatchingService
-    @abstract Waits for a matching to service to be published.
-    @discussion Provides a method of waiting for an IOService object matching the supplied matching dictionary to be registered and fully matched. 
-    @param matching The matching dictionary describing the desired IOService object. (Does not consume a reference of the matching dictionary - differs from waitForService() which does consume a reference on the matching dictionary.)
-	@param timeout The maximum time to wait in nanoseconds. Default is to wait forever.
-    @result A published IOService object matching the supplied dictionary. waitForMatchingService returns a reference to the IOService which should be released by the caller. (Differs from waitForService() which does not retain the returned object.) */
-
-    static IOService * waitForMatchingService( OSDictionary * matching,
-                            uint64_t timeout = UINT64_MAX);
-
-/*! @function getMatchingServices
-    @abstract Finds the set of current published IOService objects matching a matching dictionary.
-    @discussion Provides a method of finding the current set of published IOService objects matching the supplied matching dictionary.   
-    @param matching The matching dictionary describing the desired IOService objects.
-    @result An instance of an iterator over a set of IOService objects. To be released by the caller. */
-
-    static OSIterator * getMatchingServices( OSDictionary * matching );
-
-public:
-    /* Helpers to make matching dictionaries for simple cases,
-     * they add keys to an existing dictionary, or create one. */
-
-/*! @function serviceMatching
-    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify an IOService class match.
-    @discussion A very common matching criteria for IOService object is based on its class. <code>serviceMatching</code> creates a matching dictionary that specifies any IOService object of a class, or its subclasses. The class is specified by name, and an existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
-    @param className The class name, as a const C string. Class matching is successful on IOService objects of this class or any subclass.
-    @param table If zero, <code>serviceMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
-    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
-
-    static OSDictionary * serviceMatching( const char * className,
-			OSDictionary * table = 0 );
-
-/*! @function serviceMatching
-    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify an IOService class match.
-    @discussion A very common matching criteria for IOService object is based on its class. <code>serviceMatching</code> creates a matching dictionary that specifies any IOService of a class, or its subclasses. The class is specified by name, and an existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
-    @param className The class name, as an OSString (which includes OSSymbol). Class matching is successful on IOService objects of this class or any subclass.
-    @param table If zero, <code>serviceMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
-    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
-
-    static OSDictionary * serviceMatching( const OSString * className,
-			OSDictionary * table = 0 );
-
-/*! @function nameMatching
-    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify an IOService name match.
-    @discussion A very common matching criteria for IOService object is based on its name. <code>nameMatching</code> creates a matching dictionary that specifies any IOService object which responds successfully to the @link //apple_ref/cpp/instm/IORegistryEntry/compareName/virtualbool/(OSString*,OSString**) IORegistryEntry::compareName@/link method. An existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
-    @param name The service's name, as a const C string. Name matching is successful on IOService objects that respond successfully to the <code>IORegistryEntry::compareName</code> method.
-    @param table If zero, <code>nameMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
-    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
-
-    static OSDictionary * nameMatching( const char * name,
-			OSDictionary * table = 0 );
-
-/*! @function nameMatching
-    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify an IOService name match.
-    @discussion A very common matching criteria for IOService object is based on its name. <code>nameMatching</code> creates a matching dictionary that specifies any IOService object which responds successfully to the @link //apple_ref/cpp/instm/IORegistryEntry/compareName/virtualbool/(OSString*,OSString**) IORegistryEntry::compareName@/link method. An existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
-    @param name The service's name, as an OSString (which includes OSSymbol). Name matching is successful on IOService objects that respond successfully to the <code>IORegistryEntry::compareName</code> method.
-    @param table If zero, <code>nameMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
-    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
-
-    static OSDictionary * nameMatching( const OSString* name,
-			OSDictionary * table = 0 );
-
-/*! @function resourceMatching
-    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify a resource service match.
-    @discussion IOService maintains a resource service IOResources that allows objects to be published and found globally in the I/O Kit based on a name, using the standard IOService matching and notification calls.
-    @param name The resource name, as a const C string. Resource matching is successful when an object by that name has been published with the <code>publishResource</code> method.
-    @param table If zero, <code>resourceMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
-    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
-
-    static OSDictionary * resourceMatching( const char * name,
-			OSDictionary * table = 0 );
-
-/*! @function resourceMatching
-    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify a resource service match.
-    @discussion IOService maintains a resource service IOResources that allows objects to be published and found globally in the I/O Kit based on a name, using the standard IOService matching and notification calls.
-    @param name The resource name, as an OSString (which includes OSSymbol). Resource matching is successful when an object by that name has been published with the <code>publishResource</code> method.
-    @param table If zero, <code>resourceMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
-    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
-
-    static OSDictionary * resourceMatching( const OSString * name,
-			OSDictionary * table = 0 );
-
-
-/*! @function propertyMatching
-    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify an IOService phandle match.
-    @discussion TODO A very common matching criteria for IOService is based on its name. nameMatching will create a matching dictionary that specifies any IOService which respond successfully to the IORegistryEntry method compareName. An existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
-    @param key The service's phandle, as a const UInt32. PHandle matching is successful on IOService objects that respond successfully to the IORegistryEntry method compareName.
-    @param value The service's phandle, as a const UInt32. PHandle matching is successful on IOService's which respond successfully to the IORegistryEntry method compareName.
-    @param table If zero, nameMatching will create a matching dictionary and return a reference to it, otherwise the matching properties are added to the specified dictionary.
-    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
-
-    static OSDictionary * propertyMatching( const OSSymbol * key, const OSObject * value,
-			OSDictionary * table = 0 );
-
-/*! @function registryEntryIDMatching
-    @abstract Creates a matching dictionary, or adds matching properties to an existing dictionary, that specify a IORegistryEntryID match.
-    @discussion <code>registryEntryIDMatching</code> creates a matching dictionary that specifies the IOService object with the assigned registry entry ID (returned by <code>IORegistryEntry::getRegistryEntryID()</code>). An existing dictionary may be passed in, in which case the matching properties will be added to that dictionary rather than creating a new one.
-    @param name The service's ID. Matching is successful on the IOService object that return that ID from the <code>IORegistryEntry::getRegistryEntryID()</code> method.
-    @param table If zero, <code>registryEntryIDMatching</code> creates a matching dictionary and returns a reference to it, otherwise the matching properties are added to the specified dictionary.
-    @result The matching dictionary created, or passed in, is returned on success, or zero on failure. */
-
-    static OSDictionary * registryEntryIDMatching( uint64_t entryID,
-			OSDictionary * table = 0 );
-
-
-/*! @function addLocation
-    @abstract Adds a location matching property to an existing dictionary.
-    @discussion This function creates matching properties that specify the location of a IOService object, as an embedded matching dictionary. This matching will be successful on an IOService object that attached to an IOService object which matches this location matching dictionary.
-    @param table The matching properties are added to the specified dictionary, which must be non-zero.
-    @result The location matching dictionary created is returned on success, or zero on failure. */
-
-    static OSDictionary * addLocation( OSDictionary * table );
-
-    /* Helpers for matching dictionaries. */
-
-/*! @function compareProperty
-    @abstract Compares a property in a matching dictionary with an IOService object's property table.
-    @discussion This is a helper function to aid in implementing @link matchPropertyTable matchPropertyTable@/link. If the property specified by <code>key</code> exists in the matching dictionary, it is compared with a property of the same name in the IOService object's property table. The comparison is performed with the <code>isEqualTo</code> method. If the property does not exist in the matching table, success is returned. If the property exists in the matching dictionary but not the IOService property table, failure is returned.
-    @param matching The matching dictionary, which must be non-zero.
-    @param key The dictionary key specifying the property to be compared, as a C string.
-    @result <code>true</code> if the property does not exist in the matching table. If the property exists in the matching dictionary but not the IOService property table, failure is returned. Otherwise the result of calling the property from the matching dictionary's <code>isEqualTo</code> method with the IOService property as an argument is returned. */
-
-    virtual bool compareProperty(   OSDictionary   * matching,
-                                    const char     * key );
-/*! @function compareProperty
-    @abstract Compares a property in a matching dictionary with an IOService object's property table.
-    @discussion This is a helper function to aid in implementing @link matchPropertyTable matchPropertyTable@/link. If the property specified by <code>key</code> exists in the matching dictionary, it is compared with a property of the same name in the IOService object's property table. The comparison is performed with the <code>isEqualTo</code> method. If the property does not exist in the matching table, success is returned. If the property exists in the matching dictionary but not the IOService property table, failure is returned.
-    @param matching The matching dictionary, which must be non-zero.
-    @param key The dictionary key specifying the property to be compared, as an OSString (which includes OSSymbol).
-    @result <code>true</code> if the property does not exist in the matching table. If the property exists in the matching dictionary but not the IOService property table, failure is returned. Otherwise the result of calling the property from the matching dictionary's <code>isEqualTo</code> method with the IOService property as an argument is returned. */
-
-    virtual bool compareProperty(   OSDictionary   * matching,
-                                    const OSString * key );
-
-/*! @function compareProperties
-    @abstract Compares a set of properties in a matching dictionary with an IOService object's property table.
-    @discussion This is a helper function to aid in implementing @link matchPropertyTable matchPropertyTable@/link. A collection of dictionary keys specifies properties in a matching dictionary to be compared, with <code>compareProperty</code>, with an IOService object's property table, if <code>compareProperty</code> returns <code>true</code> for each key, success is returned; otherwise failure.
-    @param matching The matching dictionary, which must be non-zero.
-    @param keys A collection (eg. OSSet, OSArray, OSDictionary) which should contain OSStrings (or OSSymbols) that specify the property keys to be compared.
-    @result Success if <code>compareProperty</code> returns <code>true</code> for each key in the collection; otherwise failure. */
-
-    virtual bool compareProperties( OSDictionary   * matching,
-                                    OSCollection   * keys );
-
-    /* Client / provider accessors */
-
-/*! @function attach
-    @abstract Attaches an IOService client to a provider in the I/O Registry.
-    @discussion This function called in an IOService client enters the client into the I/O Registry as a child of the provider in the service plane. The provider must be active or the attach will fail. Multiple attach calls to the same provider are no-ops and return success. A client may be attached to multiple providers. Entering an object into the I/O Registry retains both the client and provider until they are detached.
-    @param provider The IOService object which will serve as this object's provider.
-    @result <code>false</code> if the provider is inactive or on a resource failure; otherwise <code>true</code>. */
-
-    virtual bool attach( IOService * provider );
-    
-/*! @function detach
-    @abstract Detaches an IOService client from a provider in the I/O Registry.
-    @discussion This function called in an IOService client removes the client as a child of the provider in the service plane of the I/O Registry. If the provider is not a parent of the client this is a no-op, otherwise the I/O Registry releases both the client and provider.
-    @param provider The IOService object to detach from. */
-
-    virtual void detach( IOService * provider );
-
-/*! @function getProvider
-    @abstract Returns an IOService object's primary provider.
-    @discussion This function called in an IOService client will return the provider to which it was first attached. Because the majority of IOService objects have only one provider, this is a useful simplification and also supports caching of the provider when the I/O Registry is unchanged.
-    @result The first provider of the client, or zero if the IOService object is not attached into the I/O Registry. The provider is retained while the client is attached, and should not be released by the caller. */
-
-    virtual IOService * getProvider( void ) const;
-
-/*! @function getWorkLoop
-    @abstract Returns the current work loop or <code>provider->getWorkLoop</code>.
-    @discussion This function returns a valid work loop that a client can use to add an IOCommandGate to. The intention is that an IOService client has data that needs to be protected but doesn't want to pay the cost of a dedicated thread. This data has to be accessed from a provider's call-out context as well. So to achieve both of these goals the client creates an IOCommandGate to lock access to his data but he registers it with the provider's work loop, i.e. the work loop which will make the completion call-outs. This avoids a potential deadlock because the work loop gate uses a recursive lock, which allows the same lock to be held multiple times by a single thread.
-    @result A work loop, either the current work loop or it walks up the @link getProvider getProvider@/link chain calling <code>getWorkLoop</code>. Eventually it will reach a valid work loop-based driver or the root of the I/O tree, where it will return a system-wide work loop. Returns 0 if it fails to find (or create) a work loop.*/
-
-    virtual IOWorkLoop * getWorkLoop() const;
-
-/*! @function getProviderIterator
-    @abstract Returns an iterator over an IOService object's providers.
-    @discussion For those few IOService objects that obtain service from multiple providers, this method supplies an iterator over a client's providers. 
-    @result An iterator over the providers of the client, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, though they may no longer be attached during the iteration. */
-
-    virtual OSIterator * getProviderIterator( void ) const;
-
-/*! @function getOpenProviderIterator
-    @abstract Returns an iterator over an client's providers that are currently opened by the client.
-    @discussion For those few IOService objects that obtain service from multiple providers, this method supplies an iterator over a client's providers, locking each in turn with @link lockForArbitration lockForArbitration@/link and returning those that have been opened by the client. 
-    @result An iterator over the providers the client has open, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, and the current entry in the iteration is locked with <code>lockForArbitration</code>, protecting it from state changes. */
-
-    virtual OSIterator * getOpenProviderIterator( void ) const;
-
-/*! @function getClient
-    @abstract Returns an IOService object's primary client.
-    @discussion This function called in an IOService provider will return the first client to attach to it. For IOService objects which have only only one client, this may be a useful simplification.
-    @result The first client of the provider, or zero if the IOService object is not attached into the I/O Registry. The client is retained while it is attached, and should not be released by the caller. */
-
-    virtual IOService * getClient( void ) const;
-
-/*! @function getClientIterator
-    @abstract Returns an iterator over an IOService object's clients.
-    @discussion For IOService objects that may have multiple clients, this method supplies an iterator over a provider's clients. 
-    @result An iterator over the clients of the provider, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, though they may no longer be attached during the iteration. */
-
-    virtual OSIterator * getClientIterator( void ) const;
-
-/*! @function getOpenClientIterator
-    @abstract Returns an iterator over a provider's clients that currently have opened the provider.
-    @discussion For IOService objects that may have multiple clients, this method supplies an iterator over a provider's clients, locking each in turn with @link lockForArbitration lockForArbitration@/link and returning those that have opened the provider. 
-    @result An iterator over the clients that have opened the provider, or zero if there is a resource failure. The iterator must be released when the iteration is finished. All objects returned by the iteration are retained while the iterator is valid, and the current entry in the iteration is locked with <code>lockForArbitration</code>, protecting it from state changes. */
-
-    virtual OSIterator * getOpenClientIterator( void ) const;
-
-/*! @function callPlatformFunction
-    @abstract Calls the platform function with the given name.
-    @discussion The platform expert or other drivers may implement various functions to control hardware features.  <code>callPlatformFunction</code> allows any IOService object to access these functions. Normally <code>callPlatformFunction</code> is called on a service's provider. The provider services the request or passes it to its provider. The system's IOPlatformExpert subclass catches functions it knows about and redirects them into other parts of the service plane. If the IOPlatformExpert subclass cannot execute the function, the base class is called. The IOPlatformExpert base class attempts to find a service to execute the function by looking up the function name in an IOResources name space. A service may publish a service using <code>publishResource(functionName, this)</code>. If no service can be found to execute the function an error is returned.
-    @param functionName Name of the function to be called. When <code>functionName</code> is a C string, <code>callPlatformFunction</code> converts the C string to an OSSymbol and calls the OSSymbol version of <code>callPlatformFunction</code>. This process can block and should not be used from an interrupt context.
-    @param waitForFunction If <code>true</code>, <code>callPlatformFunction</code> will not return until the function has been called.
-    @result An IOReturn code; <code>kIOReturnSuccess</code> if the function was successfully executed, <code>kIOReturnUnsupported</code> if a service to execute the function could not be found. Other return codes may be returned by the function.*/
-
-    virtual IOReturn callPlatformFunction( const OSSymbol * functionName,
-					   bool waitForFunction,
-					   void *param1, void *param2,
-					   void *param3, void *param4 );
-
-    virtual IOReturn callPlatformFunction( const char * functionName,
-					   bool waitForFunction,
-					   void *param1, void *param2,
-					   void *param3, void *param4 );
-
-
-    /* Some accessors */
-
-/*! @function getPlatform
-    @abstract Returns a pointer to the platform expert instance for the computer.
-    @discussion This method provides an accessor to the platform expert instance for the computer. 
-    @result A pointer to the IOPlatformExport instance. It should not be released by the caller. */
-
-    static IOPlatformExpert * getPlatform( void );
-
-/*! @function getPMRootDomain
-    @abstract Returns a pointer to the power management root domain instance for the computer.
-    @discussion This method provides an accessor to the power management root domain instance for the computer. 
-    @result A pointer to the power management root domain instance. It should not be released by the caller. */
-
-    static class IOPMrootDomain * getPMRootDomain( void );
-
-/*! @function getServiceRoot
-    @abstract Returns a pointer to the root of the service plane.
-    @discussion This method provides an accessor to the root of the service plane for the computer. 
-    @result A pointer to the IOService instance at the root of the service plane. It should not be released by the caller. */
-
-    static IOService * getServiceRoot( void );
-
-/*! @function getResourceService
-    @abstract Returns a pointer to the IOResources service.
-    @discussion IOService maintains a resource service IOResources that allows objects to be published and found globally in the I/O Kit based on a name, using the standard IOService matching and notification calls.
-    @result A pointer to the IOResources instance. It should not be released by the caller. */
-
-    static IOService * getResourceService( void );
-
-    /* Allocate resources for a matched service */
-
-/*! @function getResources
-    @abstract Allocates any needed resources for a published IOService object before clients attach.
-    @discussion This method is called during the registration process for an IOService object if there are successful driver matches, before any clients attach. It allows for lazy allocation of resources to an IOService object when a matching driver is found.
-    @result An IOReturn code; <code>kIOReturnSuccess</code> is necessary for the IOService object to be successfully used, otherwise the registration process for the object is halted. */
-    
-    virtual IOReturn getResources( void );
-
-    /* Device memory accessors */
-
-/*! @function getDeviceMemoryCount
-    @abstract Returns a count of the physical memory ranges available for a device.
-    @discussion This method returns the count of physical memory ranges, each represented by an IODeviceMemory instance, that have been allocated for a memory mapped device.
-    @result An integer count of the number of ranges available. */
-
-    virtual IOItemCount getDeviceMemoryCount( void );
-
-/*! @function getDeviceMemoryWithIndex
-    @abstract Returns an instance of IODeviceMemory representing one of a device's memory mapped ranges.
-    @discussion This method returns a pointer to an instance of IODeviceMemory for the physical memory range at the given index for a memory mapped device.
-    @param index An index into the array of ranges assigned to the device.
-    @result A pointer to an instance of IODeviceMemory, or zero if the index is beyond the count available. The IODeviceMemory is retained by the provider, so is valid while attached, or while any mappings to it exist. It should not be released by the caller. See also @link mapDeviceMemoryWithIndex mapDeviceMemoryWithIndex@/link, which creates a device memory mapping. */
-
-    virtual IODeviceMemory * getDeviceMemoryWithIndex( unsigned int index );
-
-/*! @function mapDeviceMemoryWithIndex
-    @abstract Maps a physical range of a device.
-    @discussion This method creates a mapping for the IODeviceMemory at the given index, with <code>IODeviceMemory::map(options)</code>. The mapping is represented by the returned instance of IOMemoryMap, which should not be released until the mapping is no longer required.
-    @param index An index into the array of ranges assigned to the device.
-    @result An instance of IOMemoryMap, or zero if the index is beyond the count available. The mapping should be released only when access to it is no longer required. */
-
-    virtual IOMemoryMap * mapDeviceMemoryWithIndex( unsigned int index,
-						IOOptionBits options = 0 );
-
-/*! @function getDeviceMemory
-    @abstract Returns the array of IODeviceMemory objects representing a device's memory mapped ranges.
-    @discussion This method returns an array of IODeviceMemory objects representing the physical memory ranges allocated to a memory mapped device.
-    @result An OSArray of IODeviceMemory objects, or zero if none are available. The array is retained by the provider, so is valid while attached. */
-
-    virtual OSArray * getDeviceMemory( void );
-
-/*! @function setDeviceMemory
-    @abstract Sets the array of IODeviceMemory objects representing a device's memory mapped ranges.
-    @discussion This method sets an array of IODeviceMemory objects representing the physical memory ranges allocated to a memory mapped device.
-    @param array An OSArray of IODeviceMemory objects, or zero if none are available. The array will be retained by the object. */
-
-    virtual void setDeviceMemory( OSArray * array );
-
-    /* Interrupt accessors */
-
-/*! @function registerInterrupt
-    @abstract Registers a C function interrupt handler for a device supplying interrupts.
-    @discussion This method installs a C function interrupt handler to be called at primary interrupt time for a device's interrupt. Only one handler may be installed per interrupt source. IOInterruptEventSource provides a work loop based abstraction for interrupt delivery that may be more appropriate for work loop based drivers.
-    @param source The index of the interrupt source in the device.
-    @param target An object instance to be passed to the interrupt handler.
-    @param handler The C function to be called at primary interrupt time when the interrupt occurs. The handler should process the interrupt by clearing the interrupt, or by disabling the source.
-    @param refCon A reference constant for the handler's use.
-    @result An IOReturn code.<br><code>kIOReturnNoInterrupt</code> is returned if the source is not valid; <code>kIOReturnNoResources</code> is returned if the interrupt already has an installed handler. */
-
-    virtual IOReturn registerInterrupt(int source, OSObject *target,
-				       IOInterruptAction handler,
-				       void *refCon = 0);
-                                       
-/*! @function unregisterInterrupt
-    @abstract Removes a C function interrupt handler for a device supplying hardware interrupts.
-    @discussion This method removes a C function interrupt handler previously installed with @link registerInterrupt registerInterrupt@/link.
-    @param source The index of the interrupt source in the device.
-    @result An IOReturn code (<code>kIOReturnNoInterrupt</code> is returned if the source is not valid). */
-
-    virtual IOReturn unregisterInterrupt(int source);
-
-/*! @function getInterruptType
-    @abstract Returns the type of interrupt used for a device supplying hardware interrupts.
-    @param source The index of the interrupt source in the device.
-    @param interruptType The interrupt type for the interrupt source will be stored here by <code>getInterruptType</code>.<br> <code>kIOInterruptTypeEdge</code> will be returned for edge-trigggered sources.<br><code>kIOInterruptTypeLevel</code> will be returned for level-trigggered sources.
-    @result An IOReturn code (<code>kIOReturnNoInterrupt</code> is returned if the source is not valid). */
-
-    virtual IOReturn getInterruptType(int source, int *interruptType);
-
-/*! @function enableInterrupt
-    @abstract Enables a device interrupt.
-    @discussion It is the caller's responsiblity to keep track of the enable state of the interrupt source.
-    @param source The index of the interrupt source in the device.
-    @result An IOReturn code (<code>kIOReturnNoInterrupt</code> is returned if the source is not valid). */
-
-    virtual IOReturn enableInterrupt(int source);
-
-/*! @function disableInterrupt
-    @abstract Synchronously disables a device interrupt.
-    @discussion If the interrupt routine is running, the call will block until the routine completes. It is the caller's responsiblity to keep track of the enable state of the interrupt source.
-    @param source The index of the interrupt source in the device.
-    @result An IOReturn code (<code>kIOReturnNoInterrupt</code> is returned if the source is not valid). */
-
-    virtual IOReturn disableInterrupt(int source);
-
-/*! @function causeInterrupt
-    @abstract Causes a device interrupt to occur.
-    @discussion Emulates a hardware interrupt, to be called from task level.
-    @param source The index of the interrupt source in the device.
-    @result An IOReturn code (<code>kIOReturnNoInterrupt</code> is returned if the source is not valid). */
-
-    virtual IOReturn causeInterrupt(int source);
-
-/*! @function requestProbe
-    @abstract Requests that hardware be re-scanned for devices.
-    @discussion For bus families that do not usually detect device addition or removal, this method represents an external request (eg. from a utility application) to rescan and publish or remove found devices.
-    @param options Family defined options, not interpreted by IOService.
-    @result An IOReturn code. */
-
-    virtual IOReturn requestProbe( IOOptionBits options );
-
-    /* Generic API for non-data-path upstream calls */
-
-/*! @function message
-    @abstract Receives a generic message delivered from an attached provider.
-    @discussion A provider may deliver messages via the <code>message</code> method to its clients informing them of state changes, such as <code>kIOMessageServiceIsTerminated</code> or <code>kIOMessageServiceIsSuspended</code>. Certain messages are defined by the I/O Kit in <code>IOMessage.h</code> while others may be family dependent. This method is implemented in the client to receive messages.
-    @param type A type defined in <code>IOMessage.h</code> or defined by the provider family.
-    @param provider The provider from which the message originates.
-    @param argument An argument defined by the provider family, not used by IOService.
-    @result An IOReturn code defined by the message type. */
-
-    virtual IOReturn message( UInt32 type, IOService * provider,
-                              void * argument = 0 );
-                                
-/*! @function messageClient
-    @abstract Sends a generic message to an attached client.
-    @discussion A provider may deliver messages via the @link message message@/link method to its clients informing them of state changes, such as <code>kIOMessageServiceIsTerminated</code> or <code>kIOMessageServiceIsSuspended</code>. Certain messages are defined by the I/O Kit in <code>IOMessage.h</code> while others may be family dependent. This method may be called in the provider to send a message to the specified client, which may be useful for overrides.
-    @param messageType A type defined in <code>IOMessage.h</code> or defined by the provider family.
-    @param client A client of the IOService to send the message.
-    @param messageArgument An argument defined by the provider family, not used by IOService.
-    @param argSize Specifies the size of messageArgument, in bytes.  If argSize is non-zero, messageArgument is treated as a pointer to argSize bytes of data.  If argSize is 0 (the default), messageArgument is treated as an ordinal and passed by value.
-    @result The return code from the client message call. */
-    
-    virtual IOReturn messageClient( UInt32 messageType, OSObject * client,
-                                    void * messageArgument = 0, vm_size_t argSize = 0 );
-
-/*! @function messageClients
-    @abstract Sends a generic message to all attached clients.
-    @discussion A provider may deliver messages via the @link message message@/link method to its clients informing them of state changes, such as <code>kIOMessageServiceIsTerminated</code> or <code>kIOMessageServiceIsSuspended</code>. Certain messages are defined by the I/O Kit in <code>IOMessage.h</code> while others may be family dependent. This method may be called in the provider to send a message to all the attached clients, via the @link messageClient messageClient@/link method.
-    @param type A type defined in <code>IOMessage.h</code> or defined by the provider family.
-    @param argument An argument defined by the provider family, not used by IOService.
-    @param argSize Specifies the size of argument, in bytes.  If argSize is non-zero, argument is treated as a pointer to argSize bytes of data.  If argSize is 0 (the default), argument is treated as an ordinal and passed by value.
-    @result Any non-<code>kIOReturnSuccess</code> return codes returned by the clients, or <code>kIOReturnSuccess</code> if all return <code>kIOReturnSuccess</code>. */
-
-    virtual IOReturn messageClients( UInt32 type,
-                                     void * argument = 0, vm_size_t argSize = 0 );
-
-    virtual IONotifier * registerInterest( const OSSymbol * typeOfInterest,
-                                           IOServiceInterestHandler handler,
-                                           void * target, void * ref = 0 );
-
-    virtual void applyToProviders( IOServiceApplierFunction applier,
-                                   void * context );
-
-    virtual void applyToClients( IOServiceApplierFunction applier,
-                                 void * context );
-
-    virtual void applyToInterested( const OSSymbol * typeOfInterest,
-                                    OSObjectApplierFunction applier,
-                                    void * context );
-
-    virtual IOReturn acknowledgeNotification( IONotificationRef notification,
-                                              IOOptionBits response );
-
-    /* User client create */
-
-/*! @function newUserClient
-    @abstract Creates a connection for a non kernel client.
-    @discussion A non kernel client may request a connection be opened via the @link //apple_ref/c/func/IOServiceOpen IOServiceOpen@/link library function, which will call this method in an IOService object. The rules and capabilities of user level clients are family dependent, and use the functions of the IOUserClient class for support. IOService's implementation returns <code>kIOReturnUnsupported</code>, so any family supporting user clients must implement this method.
-    @param owningTask The Mach task of the client thread in the process of opening the user client. Note that in Mac OS X, each process is based on a Mach task and one or more Mach threads. For more information on the composition of a Mach task and its relationship with Mach threads, see {@linkdoc //apple_ref/doc/uid/TP30000905-CH209-TPXREF103 "Tasks and Threads"}.
-    @param securityID A token representing the access level for the task.
-    @param type A constant specifying the type of connection to be created, specified by the caller of @link //apple_ref/c/func/IOServiceOpen IOServiceOpen@/link and interpreted only by the family.
-    @param handler An instance of an IOUserClient object to represent the connection, which will be released when the connection is closed, or zero if the connection was not opened.    
-    @param properties A dictionary of additional properties for the connection.
-    @result A return code to be passed back to the caller of <code>IOServiceOpen</code>. */
-
-    virtual IOReturn newUserClient( task_t owningTask, void * securityID,
-                                    UInt32 type, OSDictionary * properties,
-                                    IOUserClient ** handler );
-
-    virtual IOReturn newUserClient( task_t owningTask, void * securityID,
-                                    UInt32 type, IOUserClient ** handler );
-
-    /* Return code utilities */
-
-/*! @function stringFromReturn
-    @abstract Supplies a programmer-friendly string from an IOReturn code.
-    @discussion Strings are available for the standard return codes in <code>IOReturn.h</code> in IOService, while subclasses may implement this method to interpret family dependent return codes.
-    @param rtn The IOReturn code.
-    @result A pointer to a constant string, or zero if the return code is unknown. */
-    
-    virtual const char * stringFromReturn( IOReturn rtn );
-
-/*! @function errnoFromReturn
-    @abstract Translates an IOReturn code to a BSD <code>errno</code>.
-    @discussion BSD defines its own return codes for its functions in <code>sys/errno.h</code>, and I/O Kit families may need to supply compliant results in BSD shims. Results are available for the standard return codes in <code>IOReturn.h</code> in IOService, while subclasses may implement this method to interpret family dependent return codes.
-    @param rtn The IOReturn code.
-    @result The BSD <code>errno</code> or <code>EIO</code> if unknown. */
-    
-    virtual int errnoFromReturn( IOReturn rtn );
-
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-    /* * * * * * * * * * end of IOService API  * * * * * * * */
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-    /* for IOInterruptController implementors */
-
-    int               _numInterruptSources;
-    IOInterruptSource *_interruptSources;
-
-    /* overrides */
-    virtual bool serializeProperties( OSSerialize * s ) const;
-
-    void   requireMaxBusStall(UInt32 ns);
-    void   requireMaxInterruptDelay(uint32_t ns);
-
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-    /* * * * * * * * * * * * Internals * * * * * * * * * * * */
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-
-private:
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-	bool checkResources( void );
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    bool checkResource( OSObject * matching );
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    void probeCandidates( OSOrderedSet * matches );
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    bool startCandidate( IOService * candidate );
-
-public:
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOService * getClientWithCategory( const OSSymbol * category )
-	APPLE_KEXT_DEPRECATED;
-	// copyClientWithCategory is the public replacement
-
-private:
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    bool passiveMatch( OSDictionary * matching, bool changesOK = false);
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    void startMatching( IOOptionBits options = 0 );
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    void doServiceMatch( IOOptionBits options );
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    void doServiceTerminate( IOOptionBits options );
-
-private:
-    static OSObject * copyExistingServices( OSDictionary * matching,
-		 IOOptionBits inState, IOOptionBits options = 0 );
-
-    static IONotifier * setNotification(
-			const OSSymbol * type, OSDictionary * matching,
-                    	IOServiceMatchingNotificationHandler handler,
-                        void * target, void * ref,
-                        SInt32 priority = 0 );
-
-    static IONotifier * doInstallNotification(
-			const OSSymbol * type, OSDictionary * matching,
-			IOServiceMatchingNotificationHandler handler,
-			void * target, void * ref,
-			SInt32 priority, OSIterator ** existing );
-
-    static bool syncNotificationHandler( void * target, void * ref,
-			IOService * newService, IONotifier * notifier  );
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-	void deliverNotification( const OSSymbol * type,
-                            IOOptionBits orNewState, IOOptionBits andNewState );
-
-    bool invokeNotifer( class _IOServiceNotifier * notify );
-
-	APPLE_KEXT_COMPATIBILITY_VIRTUAL
-	void unregisterAllInterest( void );
-
-	APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOReturn waitForState( UInt32 mask, UInt32 value,
-				 mach_timespec_t * timeout = 0 );
-
-    IOReturn waitForState( UInt32 mask, UInt32 value, uint64_t timeout );
-
-    UInt32 _adjustBusy( SInt32 delta );
-
-    bool terminatePhase1( IOOptionBits options = 0 );
-    void scheduleTerminatePhase2( IOOptionBits options = 0 );
-    void scheduleStop( IOService * provider );
-    void scheduleFinalize( void );
-    static void terminateThread( void * arg, wait_result_t unused );
-    static void terminateWorker( IOOptionBits options );
-    static void actionWillTerminate( IOService * victim, IOOptionBits options, 
-                                        OSArray * doPhase2List );
-    static void actionDidTerminate( IOService * victim, IOOptionBits options );
-    static void actionFinalize( IOService * victim, IOOptionBits options );
-    static void actionStop( IOService * client, IOService * provider );
-
-	APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOReturn resolveInterrupt(IOService *nub, int source);
-	APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOReturn lookupInterrupt(int source, bool resolve, IOInterruptController **interruptController);
-
-
-    /* power management */
-public:
-
-/*! @function PMinit
-    @abstract Initializes power management for a driver.
-    @discussion <code>PMinit</code> allocates and initializes the power management instance variables, and it should be called before accessing those variables or calling the power management methods. This method should be called inside the driver's <code>start</code> routine and must be paired with a call to @link PMstop PMstop@/link.
-    Most calls to <code>PMinit</code> are followed by calls to @link joinPMtree joinPMtree@/link and @link registerPowerDriver registerPowerDriver@/link. */
-
-    virtual void PMinit( void );
-
-/*! @function PMstop
-    @abstract Frees and removes the driver from power management.
-    @discussion The power managment variables don't exist after this call and the power managment methods in the caller shouldn't be called.    
-    Calling <code>PMstop</code> cleans up for the three power management initialization calls: @link PMinit PMinit@/link, @link joinPMtree joinPMtree@/link, and @link registerPowerDriver registerPowerDriver@/link. */
-
-    virtual void PMstop( void );
-
-/*! @function joinPMtree
-    @abstract Joins the driver into the power plane of the I/O Registry.
-    @discussion A driver uses this method to call its nub when initializing (usually in its <code>start</code> routine after calling @link PMinit PMinit@/link), to be attached into the power management hierarchy (i.e., the power plane). A driver usually calls this method on the driver for the device that provides it power (this is frequently the nub).    
-    Before this call returns, the caller will probably be called at @link setPowerParent setPowerParent@/link and @link setAggressiveness setAggressiveness@/link and possibly at @link addPowerChild addPowerChild@/link as it is added to the hierarchy. This method may be overridden by a nub subclass.
-    @param driver The driver to be added to the power plane, usually <code>this</code>. */
-
-    virtual void joinPMtree( IOService * driver );
-
-/*! @function registerPowerDriver
-    @abstract Registers a set of power states that the driver supports.
-    @discussion A driver defines its array of supported power states with power management in its power management initialization (its <code>start</code> routine). If successful, power management will call the driver to instruct it to change its power state through @link setPowerState setPowerState@/link.
-    Most drivers do not need to override <code>registerPowerDriver</code>. A nub may override <code>registerPowerDriver</code> if it needs to arrange its children in the power plane differently than the default placement, but this is uncommon.
-    @param controllingDriver A pointer to the calling driver, usually <code>this</code>.
-    @param powerStates A driver-defined array of power states that the driver and device support. Power states are defined in <code>pwr_mgt/IOPMpowerState.h</code>.
-    @param numberOfStates The number of power states in the array.
-    @result </code>IOPMNoErr</code>. All errors are logged via <code>kprintf</code>. */
-
-    virtual IOReturn registerPowerDriver(
-                        IOService *      controllingDriver,
-                        IOPMPowerState * powerStates,
-                        unsigned long    numberOfStates );
-
-/*! @function registerInterestedDriver
-    @abstract Allows an IOService object to register interest in the changing power state of a power-managed IOService object.
-    @discussion Call <code>registerInterestedDriver</code> on the IOService object you are interested in receiving power state messages from, and pass a pointer to the interested driver (<code>this</code>) as an argument.
-    The interested driver should override @link powerStateWillChangeTo powerStateWillChangeTo@/link and @link powerStateDidChangeTo powerStateDidChangeTo@/link to receive these power change messages.
-    Interested drivers must acknowledge power changes in <code>powerStateWillChangeTo</code> or <code>powerStateDidChangeTo</code>, either via return value or later calls to @link acknowledgePowerChange acknowledgePowerChange@/link.
-    @param theDriver The driver of interest adds this pointer to the list of interested drivers. It informs drivers on this list before and after the power change.
-    @result Flags describing the capability of the device in its current power state. If the current power state is not yet defined, zero is returned (this is the case when the driver is not yet in the power domain hierarchy or hasn't fully registered with power management yet). */
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOPMPowerFlags registerInterestedDriver( IOService * theDriver );
-
-/*! @function deRegisterInterestedDriver
-    @abstract De-registers power state interest from a previous call to <code>registerInterestedDriver</code>.
-    @discussion Most drivers do not need to override <code>deRegisterInterestedDriver</code>.
-    @param theDriver The interested driver previously passed into @link registerInterestedDriver registerInterestedDriver@/link.
-    @result A return code that can be ignored by the caller. */
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOReturn deRegisterInterestedDriver( IOService * theDriver );
-
-/*! @function acknowledgePowerChange
-    @abstract Acknowledges an in-progress power state change.
-    @discussion When power management informs an interested object (via @link powerStateWillChangeTo powerStateWillChangeTo@/link or @link powerStateDidChangeTo powerStateDidChangeTo@/link), the object can return an immediate acknowledgement via a return code, or it may return an indication that it will acknowledge later by calling <code>acknowledgePowerChange</code>.
-    Interested objects are those that have registered as interested drivers, as well as power plane children of the power changing driver. A driver that calls @link registerInterestedDriver registerInterestedDriver@/link must call <code>acknowledgePowerChange</code>, or use an immediate acknowledgement return from <code>powerStateWillChangeTo</code> or <code>powerStateDidChangeTo</code>.
-    @param whichDriver A pointer to the calling driver. The called object tracks all interested parties to ensure that all have acknowledged the power state change.
-    @result <code>IOPMNoErr</code>. */
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOReturn acknowledgePowerChange( IOService * whichDriver );
-
-/*! @function acknowledgeSetPowerState
-    @abstract Acknowledges the belated completion of a driver's <code>setPowerState</code> power state change.
-    @discussion After power management instructs a driver to change its state via @link setPowerState setPowerState@/link, that driver must acknowledge the change when its device has completed its transition. The acknowledgement may be immediate, via a return code from <code>setPowerState</code>, or delayed, via this call to <code>acknowledgeSetPowerState</code>.
-    Any driver that does not return <code>kIOPMAckImplied</code> from its <code>setPowerState</code> implementation must later call <code>acknowledgeSetPowerState</code>.
-    @result <code>IOPMNoErr</code>. */
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOReturn acknowledgeSetPowerState( void );
-
-/*! @function requestPowerDomainState
-    @abstract Tells a driver to adjust its power state.
-    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
-
-    virtual IOReturn requestPowerDomainState(
-                        IOPMPowerFlags desiredState,
-                        IOPowerConnection * whichChild,
-                        unsigned long specificationFlags );
-
-/*! @function makeUsable
-    @abstract Requests that a device become usable.
-    @discussion This method is called when some client of a device (or the device's own driver) is asking for the device to become usable. Power management responds by telling the object upon which this method is called to change to its highest power state.
-    <code>makeUsable</code> is implemented using @link changePowerStateToPriv changePowerStateToPriv@/link. Subsequent requests for lower power, such as from <code>changePowerStateToPriv</code>, will pre-empt this request.
-    @result A return code that can be ignored by the caller. */
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOReturn makeUsable( void );
-
-/*! @function temporaryPowerClampOn
-    @abstract A driver calls this method to hold itself in the highest power state until it has children.
-    @discussion Use <code>temporaryPowerClampOn</code> to hold your driver in its highest power state while waiting for child devices to attach. After children have attached, the clamp is released and the device's power state is controlled by the children's requirements.
-    @result A return code that can be ignored by the caller. */
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOReturn temporaryPowerClampOn( void );
-
-/*! @function changePowerStateTo
-    @abstract Sets a driver's power state.
-    @discussion This function is one of several that are used to set a driver's power state. In most circumstances, however, you should call @link changePowerStateToPriv changePowerStateToPriv@/link instead.
-	Calls to <code>changePowerStateTo</code>, <code>changePowerStateToPriv</code>, and a driver's power children all affect the power state of a driver. For legacy design reasons, they have overlapping functionality. Although you should call <code>changePowerStateToPriv</code> to change your device's power state, you might need to call <code>changePowerStateTo</code> in the following circumstances:
-    <ul><li>If a driver will be using <code>changePowerStateToPriv</code> to change its power state, it should call <code>changePowerStateTo(0)</code> in its <code>start</code> routine to eliminate the influence <code>changePowerStateTo</code> has on power state calculations.
-    <li>Call <code>changePowerStateTo</code> in conjunction with @link setIdleTimerPeriod setIdleTimerPeriod@/link and @link activityTickle activityTickle@/link to idle a driver into a low power state. For a driver with 3 power states, for example, <code>changePowerStateTo(1)</code> sets a minimum level of power state 1, such that the idle timer period may not set your device's power any lower than state 1.</ul>
-    @param ordinal The number of the desired power state in the power state array. 
-    @result A return code that can be ignored by the caller. */
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOReturn changePowerStateTo( unsigned long ordinal );
-
-/*! @function currentCapability
-    @abstract Finds out the capability of a device's current power state.
-    @result A copy of the <code>capabilityFlags</code> field for the current power state in the power state array. */
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    IOPMPowerFlags currentCapability( void );
-
-/*! @function currentPowerConsumption
-    @abstract Finds out the current power consumption of a device.
-    @discussion Most Mac OS X power managed drivers do not report their power consumption via the <code>staticPower</code> field. Thus this call will not accurately reflect power consumption for most drivers.
-    @result A copy of the <code>staticPower</code> field for the current power state in the power state array. */
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    unsigned long currentPowerConsumption( void );
-
-/*! @function activityTickle
-    @abstract Informs power management when a power-managed device is in use, so that power management can track when it is idle and adjust its power state accordingly.
-    @discussion The <code>activityTickle</code> method is provided for objects in the system (or for the driver itself) to tell a driver that its device is being used.
-    The IOService superclass can manage idleness determination with a simple idle timer mechanism and this <code>activityTickle</code> call. To start this up, the driver calls its superclass's <code>setIdleTimerPeriod</code>. This starts a timer for the time interval specified in the call. When the timer expires, the superclass checks to see if there has been any activity since the last timer expiration. (It checks to see if <code>activityTickle</code> has been called). If there has been activity, it restarts the timer, and this process continues. When the timer expires, and there has been no device activity, the superclass lowers the device power state to the next lower state. This can continue until the device is in state zero.
-    After the device has been powered down by at least one power state, a subsequent call to <code>activityTickle</code> causes the device to be switched to a higher state required for the activity.    
-    If the driver is managing the idleness determination totally on its own, the value of the <code>type</code> parameter should be <code>kIOPMSubclassPolicy</code>, and the driver should override the <code>activityTickle</code> method. The superclass IOService implementation of <code>activityTickle</code> does nothing with the <code>kIOPMSubclassPolicy</code> argument.
-    @param type When <code>type</code> is <code>kIOPMSubclassPolicy</code>, <code>activityTickle</code> is not handled in IOService and should be intercepted by the subclass. When <code>type</code> is <code>kIOPMSuperclassPolicy1</code>, an activity flag is set and the device state is checked. If the device has been powered down, it is powered up again.
-    @param stateNumber When <code>type</code> is <code>kIOPMSuperclassPolicy1</code>, <code>stateNumber</code> contains the desired power state ordinal for the activity. If the device is in a lower state, the superclass will switch it to this state. This is for devices that can handle some accesses in lower power states; the device is powered up only as far as it needs to be for the activity.
-    @result When <code>type</code> is <code>kIOPMSuperclassPolicy1</code>, the superclass returns <code>true</code> if the device is currently in the state specified by <code>stateNumber</code>. If the device is in a lower state and must be powered up, the superclass returns <code>false</code>; in this case the superclass will initiate a power change to power the device up. */
-
-    virtual bool activityTickle(
-                        unsigned long type,
-                        unsigned long stateNumber = 0 );
-
-/*! @function setAggressiveness
-    @abstract Broadcasts an aggressiveness factor from the parent of a driver to the driver.
-    @discussion Implement <code>setAggressiveness</code> to receive a notification when an "aggressiveness Aggressiveness factors are a loose set of power management variables that contain values for system sleep timeout, display sleep timeout, whether the system is on battery or AC, and other power management features. There are several aggressiveness factors that can be broadcast and a driver may take action on whichever factors apply to it.
-    A driver that has joined the power plane via @link joinPMtree joinPMtree@/link will receive <code>setAgressiveness</code> calls when aggressiveness factors change.
-    A driver may override this call if it needs to do something with the new factor (such as change its idle timeout). If overridden, the driver must  call its superclass's <code>setAgressiveness</code> method in its own <code>setAgressiveness</code> implementation.
-    Most drivers do not need to implement <code>setAgressiveness</code>.
-    @param type The aggressiveness factor type, such as <code>kPMMinutesToDim</code>, <code>kPMMinutesToSpinDown</code>, <code>kPMMinutesToSleep</code>, and <code>kPMPowerSource</code>. (Aggressiveness factors are defined in <code>pwr_mgt/IOPM.h</code>.)
-    @param newLevel The aggressiveness factor's new value.
-    @result <code>IOPMNoErr</code>. */
-
-    virtual IOReturn setAggressiveness(
-                        unsigned long type,
-                        unsigned long newLevel );
-
-/*! @function getAggressiveness
-    @abstract Returns the current aggressiveness value for the given type.
-    @param type The aggressiveness factor to query.
-    @param currentLevel Upon successful return, contains the value of aggressiveness factor <code>type</code>.
-    @result <code>kIOReturnSuccess</code> upon success; an I/O Kit error code otherwise. */
-
-    virtual IOReturn getAggressiveness(
-                        unsigned long type,
-                        unsigned long * currentLevel );
-
-#ifndef __LP64__
-/*! @function systemWake
-    @abstract Tells every driver in the power plane that the system is waking up.
-    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
-
-    virtual IOReturn systemWake( void )
-    APPLE_KEXT_DEPRECATED;
-
-/*! @function temperatureCriticalForZone
-    @abstract Alerts a driver to a critical temperature in some thermal zone.
-    @discussion This call is unused by power management. It is not intended to be called or overridden. */
-
-    virtual IOReturn temperatureCriticalForZone( IOService * whichZone )
-    APPLE_KEXT_DEPRECATED;
-
-/*! @function youAreRoot
-    @abstract Informs power management which IOService object is the power plane root.
-    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
-
-    virtual IOReturn youAreRoot( void )
-    APPLE_KEXT_DEPRECATED;
-
-/*! @function setPowerParent
-    @abstract This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
-
-    virtual IOReturn setPowerParent(
-                        IOPowerConnection * parent,
-                        bool stateKnown,
-                        IOPMPowerFlags currentState )
-    APPLE_KEXT_DEPRECATED;
-#endif /* !__LP64__ */
-
-/*! @function addPowerChild
-    @abstract Informs a driver that it has a new child.
-    @discussion The Platform Expert uses this method to call a driver and introduce it to a new child. This call is handled internally by power management. It is not intended to be overridden or called by drivers.
-    @param theChild A pointer to the child IOService object. */
-
-    virtual IOReturn addPowerChild( IOService * theChild );
-
-/*! @function removePowerChild
-    @abstract Informs a power managed driver that one of its power plane childen is disappearing.
-    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
-
-    virtual IOReturn removePowerChild( IOPowerConnection * theChild );
-
-#ifndef __LP64__
-/*! @function command_received
-    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
-
-    virtual void command_received( void *, void * , void * , void * );
-#endif
-
-/*! @function start_PM_idle_timer
-    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
-
-    APPLE_KEXT_COMPATIBILITY_VIRTUAL
-    void start_PM_idle_timer( void );
-
-#ifndef __LP64__
-/*! @function PM_idle_timer_expiration
-    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
-
-    virtual void PM_idle_timer_expiration( void )
-    APPLE_KEXT_DEPRECATED;
-
-/*! @function PM_Clamp_Timer_Expired
-    @discussion This call is handled internally by power management. It is not intended to be overridden or called by drivers. */
-
-    virtual void PM_Clamp_Timer_Expired( void )
-    APPLE_KEXT_DEPRECATED;
-#endif
-
-/*! @function setIdleTimerPeriod
-    @abstract Sets or changes the idle timer period.
-    @discussion A driver using the idleness determination provided by IOService calls its superclass with this method to set or change the idle timer period. See @link activityTickle activityTickle@/link for a description of this type of idleness determination.
-    @param period The desired idle timer period in seconds.
-    @result <code>kIOReturnSuccess</code> upon success; an I/O Kit error code otherwise. */
-
-    virtual IOReturn setIdleTimerPeriod( unsigned long );
-
-#ifndef __LP64__
-/*! @function getPMworkloop
-    @abstract Returns a pointer to the system-wide power management work loop.
-    @availability Deprecated in Mac OS X version 10.6.
-    @discussion Most drivers should create their own work loops to synchronize their code; drivers should not run arbitrary code on the power management work loop. */
-
-    virtual IOWorkLoop * getPMworkloop( void )
-    APPLE_KEXT_DEPRECATED;
-#endif
-
-/*! @function getPowerState
-    @abstract Determines a device's power state.
-    @discussion A device's "current power state" is updated at the end of each power state transition (e.g. transition from state 1 to state 0, or state 0 to state 2). This transition includes the time spent powering on or off any power plane children. Thus, if a child calls <code>getPowerState</code> on its power parent during system wake from sleep, the call will return the index to the device's off state rather than its on state.
-    @result The current power state's index into the device's power state array. */
-
-    UInt32 getPowerState( void );
-
-/*! @function setPowerState
-    @abstract Requests a power managed driver to change the power state of its device.
-    @discussion A power managed driver must override <code>setPowerState</code> to take part in system power management. After a driver is registered with power management, the system uses <code>setPowerState</code> to power the device off and on for system sleep and wake.
-    Calls to @link PMinit PMinit@/link and @link registerPowerDriver registerPowerDriver@/link enable power management to change a device's power state using <code>setPowerState</code>. <code>setPowerState</code> is called in a clean and separate thread context.
-    @param powerStateOrdinal The number in the power state array of the state the driver is being instructed to switch to. 
-    @param whatDevice A pointer to the power management object which registered to manage power for this device. In most cases, <code>whatDevice</code> will be equal to your driver's own <code>this</code> pointer.
-    @result The driver must return <code>IOPMAckImplied</code> if it has complied with the request when it returns. Otherwise if it has started the process of changing power state but not finished it, the driver should return a number of microseconds which is an upper limit of the time it will need to finish. Then, when it has completed the power switch, it should call @link acknowledgeSetPowerState acknowledgeSetPowerState@/link. */
-
-    virtual IOReturn setPowerState(
-                        unsigned long powerStateOrdinal,
-                        IOService *   whatDevice );
-
-#ifndef __LP64__
-/*! @function clampPowerOn
-    @abstract Deprecated. Do not use. */
-
-    virtual void clampPowerOn( unsigned long duration );
-#endif
-
-/*! @function maxCapabilityForDomainState
-    @abstract Determines a driver's highest power state possible for a given power domain state.
-    @discussion This happens when the power domain is changing state and power management needs to determine which state the device is capable of in the new domain state.
-    Most drivers do not need to implement this method, and can rely upon the default IOService implementation. The IOService implementation scans the power state array looking for the highest state whose <code>inputPowerRequirement</code> field exactly matches the value of the <code>domainState</code> parameter. If more intelligent determination is required, the driver itself should implement the method and override the superclass's implementation.
-    @param domainState Flags that describe the character of "domain power"; they represent the <code>outputPowerCharacter</code> field of a state in the power domain's power state array.
-    @result A state number. */
-
-    virtual unsigned long maxCapabilityForDomainState( IOPMPowerFlags domainState );
-
-/*! @function initialPowerStateForDomainState
-    @abstract Determines which power state a device is in, given the current power domain state.
-    @discussion Power management calls this method once, when the driver is initializing power management.
-    Most drivers do not need to implement this method, and can rely upon the default IOService implementation. The IOService implementation scans the power state array looking for the highest state whose <code>inputPowerRequirement</code> field exactly matches the value of the <code>domainState</code> parameter. If more intelligent determination is required, the power managed driver should implement the method and override the superclass's implementation.
-    @param domainState Flags that describe the character of "domain power"; they represent the <code>outputPowerCharacter</code> field of a state in the power domain's power state array.
-    @result A state number. */
-
-    virtual unsigned long initialPowerStateForDomainState( IOPMPowerFlags domainState );
-
-/*! @function powerStateForDomainState
-    @abstract Determines what power state the device would be in for a given power domain state.
-    @discussion Power management calls a driver with this method to find out what power state the device would be in for a given power domain state. This happens when the power domain is changing state and power management needs to determine the effect of the change.
-    Most drivers do not need to implement this method, and can rely upon the default IOService implementation. The IOService implementation scans the power state array looking for the highest state whose <code>inputPowerRequirement</code> field exactly matches the value of the <code>domainState</code> parameter. If more intelligent determination is required, the power managed driver should implement the method and override the superclass's implementation.
-    @param domainState Flags that describe the character of "domain power"; they represent the <code>outputPowerCharacter</code> field of a state in the power domain's power state array.
-    @result A state number. */
-
-    virtual unsigned long powerStateForDomainState( IOPMPowerFlags domainState );
-
-/*! @function powerStateWillChangeTo
-    @abstract Informs interested parties that a device is about to change its power state.
-    @discussion Power management informs interested parties that a device is about to change to a different power state. Interested parties are those that have registered for this notification via @link registerInterestedDriver registerInterestedDriver@/link. If you have called <code>registerInterestedDriver</code> on a power managed driver, you must implement <code>powerStateWillChangeTo</code> and @link powerStateDidChangeTo powerStateDidChangeTo@/link to receive the notifications.
-    <code>powerStateWillChangeTo</code> is called in a clean and separate thread context. <code>powerStateWillChangeTo</code> is called before a power state transition takes place; <code>powerStateDidChangeTo</code> is called after the transition has completed.
-    @param capabilities Flags that describe the capability of the device in the new power state (they come from the <code>capabilityFlags</code> field of the new state in the power state array).
-	@param stateNumber The number of the state in the state array that the device is switching to.
-    @param whatDevice A pointer to the driver that is changing. It can be used by a driver that is receiving power state change notifications for multiple devices to distinguish between them.
-    @result The driver returns <code>IOPMAckImplied</code> if it has prepared for the power change when it returns. If it has started preparing but not finished, it should return a number of microseconds which is an upper limit of the time it will need to finish preparing. Then, when it has completed its preparations, it should call @link acknowledgePowerChange acknowledgePowerChange@/link. */
-
-    virtual IOReturn powerStateWillChangeTo(
-                        IOPMPowerFlags  capabilities,
-                        unsigned long   stateNumber,
-                        IOService *     whatDevice );
-
-/*! @function powerStateDidChangeTo
-    @abstract Informs interested parties that a device has changed to a different power state.
-    @discussion Power management informs interested parties that a device has changed to a different power state. Interested parties are those that have registered for this notification via @link registerInterestedDriver registerInterestedDriver@/link. If you have called <code>registerInterestedDriver</code> on a power managed driver, you must implemnt @link powerStateWillChangeTo powerStateWillChangeTo@/link and <code>powerStateDidChangeTo</code> to receive the notifications.
-    <code>powerStateDidChangeTo</code> is called in a clean and separate thread context. <code>powerStateWillChangeTo</code> is called before a power state transition takes place; <code>powerStateDidChangeTo</code> is called after the transition has completed.
-    @param capabilities Flags that describe the capability of the device in the new power state (they come from the <code>capabilityFlags</code> field of the new state in the power state array).
-	@param stateNumber The number of the state in the state array that the device is switching to.
-    @param whatDevice A pointer to the driver that is changing. It can be used by a driver that is receiving power state change notifications for multiple devices to distinguish between them.
-    @result The driver returns <code>IOPMAckImplied</code> if it has prepared for the power change when it returns. If it has started preparing but not finished, it should return a number of microseconds which is an upper limit of the time it will need to finish preparing. Then, when it has completed its preparations, it should call @link acknowledgePowerChange acknowledgePowerChange@/link. */
-
-    virtual IOReturn powerStateDidChangeTo(
-                        IOPMPowerFlags  capabilities,
-                        unsigned long   stateNumber,
-                        IOService *     whatDevice );
-
-#ifndef __LP64__
-/*! @function didYouWakeSystem
-    @abstract Asks a driver if its device is the one that just woke the system from sleep.
-    @availability Deprecated in Mac OS X version 10.6.
-    @discussion Power management calls a power managed driver with this method to ask if its device is the one that just woke the system from sleep. If a device is capable of waking the system from sleep, its driver should implement <code>didYouWakeSystem</code> and return <code>true</code> if its device was responsible for waking the system.
-    @result <code>true</code> if the driver's device woke the system and <code>false</code> otherwise. */
-
-    virtual bool didYouWakeSystem( void )
-    APPLE_KEXT_DEPRECATED;
-
-/*! @function newTemperature
-    @abstract Tells a power managed driver that the temperature in the thermal zone has changed.
-    @discussion This call is unused by power management. It is not intended to be called or overridden. */
-
-    virtual IOReturn newTemperature( long currentTemp, IOService * whichZone )
-    APPLE_KEXT_DEPRECATED;
-#endif
-
-    virtual bool askChangeDown( unsigned long );
-    virtual bool tellChangeDown( unsigned long );
-    virtual void tellNoChangeDown ( unsigned long );
-    virtual void tellChangeUp( unsigned long );
-    virtual IOReturn allowPowerChange( unsigned long refcon );
-    virtual IOReturn cancelPowerChange( unsigned long refcon );
-
-protected:
-/*! @function changePowerStateToPriv 
-    @abstract Tells a driver's superclass to change the power state of its device.
-    @discussion A driver uses this method to tell its superclass to change the power state of the device. This is the recommended way to change the power state of a device.
-    Three things affect driver power state: @link changePowerStateTo changePowerStateTo@/link, <code>changePowerStateToPriv</code>, and the desires of the driver's power plane children. Power management puts the device into the maximum state governed by those three entities.
-    Drivers may eliminate the influence of the <code>changePowerStateTo</code> method on power state one of two ways. See @link powerOverrideOnPriv powerOverrideOnPriv@/link to ignore the method's influence, or call <code>changePowerStateTo(0)</code> in the driver's <code>start</code> routine to remove the <code>changePowerStateTo</code> method's power request.
-    @param ordinal The number of the desired power state in the power state array.
-    @result A return code that can be ignored by the caller. */
-
-    IOReturn changePowerStateToPriv( unsigned long ordinal );
-
-/*! @function powerOverrideOnPriv
-    @abstract Allows a driver to ignore its children's power management requests and only use changePowerStateToPriv to define its own power state.
-    @discussion Power management normally keeps a device at the highest state required by its requests via @link changePowerStateTo changePowerStateTo@/link, @link changePowerStateToPriv changePowerStateToPriv@/link, and its children. However, a driver may ensure a lower power state than otherwise required by itself and its children using <code>powerOverrideOnPriv</code>. When the override is on, power management keeps the device's power state in the state specified by <code>changePowerStateToPriv</code>. Turning on the override will initiate a power change if the driver's <code>changePowerStateToPriv</code> desired power state is different from the maximum of the <code>changePowerStateTo</code> desired power state and the children's desires.
-    @result A return code that can be ignored by the caller. */
-
-    IOReturn powerOverrideOnPriv( void );
-
-/*! @function powerOverrideOffPriv
-    @abstract Allows a driver to disable a power override.
-    @discussion When a driver has enabled an override via @link powerOverrideOnPriv powerOverrideOnPriv@/link, it can disable it again by calling this method in its superclass. Disabling the override reverts to the default algorithm for determining a device's power state. The superclass will now keep the device at the highest state required by <code>changePowerStateTo</code>, <code>changePowerStateToPriv</code>, and its children. Turning off the override will initiate a power change if the driver's desired power state is different from the maximum of the power managed driver's desire and the children's desires.
-    @result A return code that can be ignored by the caller. */
-
-    IOReturn powerOverrideOffPriv( void );
-
-/*! @function powerChangeDone
-    @abstract Tells a driver when a power state change is complete.
-    @discussion Power management uses this method to inform a driver when a power change is completely done, when all interested parties have acknowledged the @link powerStateDidChangeTo powerStateDidChangeTo@/link call. The default implementation of this method is null; the method is meant to be overridden by subclassed power managed drivers. A driver should use this method to find out if a power change it initiated is complete.
-    @param stateNumber The number of the state in the state array that the device has switched from. */
-
-    virtual void powerChangeDone( unsigned long stateNumber );
-};
-
-#endif /* ! _IOKIT_IOSERVICE_H */
diff --git a/i386/include/IOKit/IOServicePM.h b/i386/include/IOKit/IOServicePM.h
deleted file mode 100644
index 9955e03..0000000
--- a/i386/include/IOKit/IOServicePM.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOSERVICEPM_H
-#define _IOKIT_IOSERVICEPM_H
-
-#include <IOKit/pwr_mgt/IOPM.h>
-
-class IOService;
-class IOServicePM;
-class IOPowerConnection;
-class IOWorkLoop;
-class IOCommandGate;
-class IOTimerEventSource;
-class IOPlatformExpert;
-
-#endif /* !_IOKIT_IOSERVICEPM_H */
diff --git a/i386/include/IOKit/IOSharedDataQueue.h b/i386/include/IOKit/IOSharedDataQueue.h
deleted file mode 100644
index fdfa1d6..0000000
--- a/i386/include/IOKit/IOSharedDataQueue.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOKIT_IOSHAREDDATAQUEUE_H
-#define _IOKIT_IOSHAREDDATAQUEUE_H
-
-#ifdef dequeue
-#undef dequeue
-#endif
-
-#include <IOKit/IODataQueue.h>
-
-typedef struct _IODataQueueEntry IODataQueueEntry;
-
-/*!
- * @class IOSharedDataQueue : public IODataQueue
- * @abstract A generic queue designed to pass data both from the kernel to a user process and from a user process to the kernel.
- * @discussion The IOSharedDataQueue class is designed to also allow a user process to queue data to kernel code.  IOSharedDataQueue objects are designed to be used in a single producer / single consumer situation.  As such, there are no locks on the data itself.  Because the kernel enqueue and user-space dequeue methods follow a strict set of guidelines, no locks are necessary to maintain the integrity of the data struct.
- *
- * <br>Each data entry can be variable sized, but the entire size of the queue data region (including overhead for each entry) must be specified up front.
- *
- * <br>In order for the IODataQueue instance to notify the user process that data is available, a notification mach port must be set.  When the queue is empty and a new entry is added, a message is sent to the specified port.
- *
- * <br>In order to make the data queue memory available to a user process, the method getMemoryDescriptor() must be used to get an IOMemoryDescriptor instance that can be mapped into a user process.  Typically, the clientMemoryForType() method on an IOUserClient instance will be used to request the IOMemoryDescriptor and then return it to be mapped into the user process.
- */
-class IOSharedDataQueue : public IODataQueue
-{
-    OSDeclareDefaultStructors(IOSharedDataQueue)
-
-    struct ExpansionData { 
-    };
-    /*! @var reserved
-        Reserved for future use.  (Internal use only)  */
-    ExpansionData * _reserved;
-
-protected:
-    virtual void free();
-
-public:
-    /*!
-     * @function withCapacity
-     * @abstract Static method that creates a new IOSharedDataQueue instance with the capacity specified in the size parameter.
-     * @discussion The actual size of the entire data queue memory region (to be shared into a user process) is equal to the capacity plus the IODataQueueMemory overhead.  This overhead value can be determined from the DATA_QUEUE_MEMORY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.  The size of the data queue memory region must include space for the overhead of each IODataQueueEntry.  This entry overhead can be determined from the DATA_QUEUE_ENTRY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.<br>  This method allocates a new IODataQueue instance and then calls initWithCapacity() with the given size parameter.  If the initWithCapacity() fails, the new instance is released and zero is returned.
-     * @param size The size of the data queue memory region.
-     * @result Returns the newly allocated IOSharedDataQueue instance.  Zero is returned on failure.
-     */
-    static IOSharedDataQueue *withCapacity(UInt32 size);
-
-    /*!
-     * @function withEntries
-     * @abstract Static method that creates a new IOSharedDataQueue instance with the specified number of entries of the given size.
-     * @discussion This method will create a new IOSharedDataQueue instance with enough capacity for numEntries of entrySize.  It does account for the IODataQueueEntry overhead for each entry.  Note that the numEntries and entrySize are simply used to determine the data region size.  They do not actually restrict the size of number of entries that can be added to the queue.<br>  This method allocates a new IODataQueue instance and then calls initWithEntries() with the given numEntries and entrySize parameters.  If the initWithEntries() fails, the new instance is released and zero is returned.
-     * @param numEntries Number of entries to allocate space for.
-     * @param entrySize Size of each entry.
-     * @result Reeturns the newly allocated IOSharedDataQueue instance.  Zero is returned on failure.
-     */
-    static IOSharedDataQueue *withEntries(UInt32 numEntries, UInt32 entrySize);
-
-    /*!
-     * @function initWithCapacity
-     * @abstract Initializes an IOSharedDataQueue instance with the capacity specified in the size parameter.
-     * @discussion The actual size of the entire data queue memory region (to be shared into a user process) is equal to the capacity plus the IODataQueueMemory overhead.  This overhead value can be determined from the DATA_QUEUE_MEMORY_HEADER_SIZE and DATA_QUEUE_MEMORY_APPENDIX_SIZE macro in <IOKit/IODataQueueShared.h>.  The size of the data queue memory region must include space for the overhead of each IODataQueueEntry.  This entry overhead can be determined from the DATA_QUEUE_ENTRY_HEADER_SIZE macro in <IOKit/IODataQueueShared.h>.
-     * @param size The size of the data queue memory region.
-     * @result Returns true on success and false on failure.
-     */
-    virtual Boolean initWithCapacity(UInt32 size);
-
-    /*!
-     * @function getMemoryDescriptor
-     * @abstract Returns a memory descriptor covering the IODataQueueMemory region.
-     * @discussion The IOMemoryDescriptor instance returned by this method is intended to be mapped into a user process.  This is the memory region that the IODataQueueClient code operates on.
-     * @result Returns a newly allocated IOMemoryDescriptor for the IODataQueueMemory region.  Returns zero on failure.
-     */
-    virtual IOMemoryDescriptor *getMemoryDescriptor();
-
-    /*!
-     * @function peek
-     * @abstract Used to peek at the next entry on the queue.
-     * @discussion This function can be used to look at the next entry which allows the entry to be received without having to copy it with dequeue.  In order to do this, call peek to get the entry.  Then call dequeue with a NULL data pointer.  That will cause the head to be moved to the next entry, but no memory to be copied.
-     * @result Returns a pointer to the next IODataQueueEntry if one is available.  0 (NULL) is returned if the queue is empty.
-     */
-    virtual IODataQueueEntry * peek();
-
-    /*!
-     * @function dequeue
-     * @abstract Dequeues the next available entry on the queue and copies it into the given data pointer.
-     * @discussion This function will dequeue the next available entry on the queue.  If a data pointer is provided, it will copy the data into the memory region if there is enough space available as specified in the dataSize parameter.  If no data pointer is provided, it will simply move the head value past the current entry.
-     * @param data A pointer to the data memory region in which to copy the next entry data on the queue.  If this parameter is 0 (NULL), it will simply move to the next entry.
-     * @param dataSize A pointer to the size of the data parameter.  On return, this contains the size of the actual entry data - even if the original size was not large enough.
-     * @result Returns true on success and false on failure.  Typically failure means that the queue is empty.
-     */
-    virtual Boolean dequeue(void *data, UInt32 *dataSize);
-
-    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 0);
-    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 1);
-    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 2);
-    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 3);
-    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 4);
-    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 5);
-    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 6);
-    OSMetaClassDeclareReservedUnused(IOSharedDataQueue, 7);
-};
-
-#endif /* _IOKIT_IOSHAREDDATAQUEUE_H */
diff --git a/i386/include/IOKit/IOSharedLock.h b/i386/include/IOKit/IOSharedLock.h
deleted file mode 100644
index 59b47ec..0000000
--- a/i386/include/IOKit/IOSharedLock.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-/*
- * Multiprocessor locks used within the shared memory area between the
- * kernel and event system.  These must work in both user and kernel mode.
- * 
- * These routines are public, for the purpose of writing frame buffer device
- * drivers which handle their own cursors.  Certain architectures define a
- * generic display class which handles cursor drawing and is subclassed by
- * driver writers.  These drivers need not be concerned with the following
- * types and definitions.
- *
- * The ev_lock(), ev_unlock(), and ev_try_lock() functions are available only
- * to drivers built in or dynamically loaded into the kernel, and to DPS
- * drivers built in or dynamically loaded into the Window Server.  They do not
- * exist in any shared library.
- *
- * --> They're now in IOKit user lib.
- */
-
-#ifndef _IOKIT_IOSHAREDLOCK_H
-#define _IOKIT_IOSHAREDLOCK_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// should be 32 bytes on PPC
-typedef volatile int		IOSharedLockData;
-typedef IOSharedLockData    *   IOSharedLock;
-
-#define IOSpinLockInit(l)	(*(l) = (IOSharedLockData)0)
-
-
-extern void IOSpinUnlock(IOSharedLock l);
-extern boolean_t IOTrySpinLock(IOSharedLock l);
-
-/* exact same stuff & implementation */
-
-typedef IOSharedLockData 	ev_lock_data_t;
-typedef ev_lock_data_t	    *	ev_lock_t;
-
-#define ev_init_lock(l)		(*(l) = (ev_lock_data_t)0)
-// needs isync?
-//#define ev_is_locked(l)	(*(l) != (ev_lock_data_t)0)
-
-
-extern void ev_unlock(ev_lock_t l);
-extern boolean_t ev_try_lock(ev_lock_t l);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* ! _IOKIT_IOSHAREDLOCK_H */
diff --git a/i386/include/IOKit/IOSubMemoryDescriptor.h b/i386/include/IOKit/IOSubMemoryDescriptor.h
deleted file mode 100644
index 0093ea3..0000000
--- a/i386/include/IOKit/IOSubMemoryDescriptor.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _IOSUBMEMORYDESCRIPTOR_H
-#define _IOSUBMEMORYDESCRIPTOR_H
-
-#include <IOKit/IOMemoryDescriptor.h>
-
-/*! @class IOSubMemoryDescriptor : public IOMemoryDescriptor
-    @abstract The IOSubMemoryDescriptor object describes a memory area made up of a portion of another IOMemoryDescriptor.
-    @discussion The IOSubMemoryDescriptor object represents a subrange of memory, specified as a portion of another IOMemoryDescriptor. */
-
-class IOSubMemoryDescriptor : public IOMemoryDescriptor
-{
-    OSDeclareDefaultStructors(IOSubMemoryDescriptor);
-
-protected:
-    IOMemoryDescriptor * _parent;
-    IOByteCount 	 _start;
-
-    virtual void free();
-
-public:
-/*! @function withSubRange
-    @abstract Create an IOMemoryDescriptor to describe a subrange of an existing descriptor.
-    @discussion  This method creates and initializes an IOMemoryDescriptor for memory consisting of a subrange of the specified memory descriptor. The parent memory descriptor is retained by the new descriptor.
-    @param of The parent IOMemoryDescriptor of which a subrange is to be used for the new descriptor, which will be retained by the subrange IOMemoryDescriptor.
-    @param offset A byte offset into the parent memory descriptor's memory.
-    @param length The length of the subrange.
-    @param options
-        kIOMemoryDirectionMask (options:direction)	This nibble indicates the I/O direction to be associated with the descriptor, which may affect the operation of the prepare and complete methods on some architectures. 
-    @result The created IOMemoryDescriptor on success, to be released by the caller, or zero on failure. */
-
-    static IOSubMemoryDescriptor *	withSubRange(IOMemoryDescriptor *of,
-					     IOByteCount offset,
-					     IOByteCount length,
-					     IOOptionBits options);
-
-    /*
-     * Initialize or reinitialize an IOSubMemoryDescriptor to describe
-     * a subrange of an existing descriptor.
-     *
-     * An IOSubMemoryDescriptor can be re-used by calling initSubRange
-     * again on an existing instance -- note that this behavior is not
-     * commonly supported in other IOKit classes, although it is here.
-     */
-    virtual bool initSubRange( IOMemoryDescriptor * parent,
-				IOByteCount offset, IOByteCount length,
-				IODirection withDirection );
-
-    /*
-     * IOMemoryDescriptor required methods
-     */
-
-    virtual addr64_t getPhysicalSegment( IOByteCount   offset,
-                                         IOByteCount * length,
-                                         IOOptionBits  options = 0 );
-
-    virtual IOReturn prepare(IODirection forDirection = kIODirectionNone);
-
-    virtual IOReturn complete(IODirection forDirection = kIODirectionNone);
-
-#ifdef __LP64__
-    virtual
-#endif /* __LP64__ */
-    IOReturn redirect( task_t safeTask, bool redirect );
-
-    virtual IOReturn setPurgeable( IOOptionBits newState,
-                                    IOOptionBits * oldState );
-
-    // support map() on kIOMemoryTypeVirtual without prepare()
-    virtual IOMemoryMap * 	makeMapping(
-	IOMemoryDescriptor *	owner,
-	task_t			intoTask,
-	IOVirtualAddress	atAddress,
-	IOOptionBits		options,
-	IOByteCount		offset,
-	IOByteCount		length );
-
-	virtual uint64_t getPreparationID( void );
-
-};
-
-#endif /* !_IOSUBMEMORYDESCRIPTOR_H */
diff --git a/i386/include/IOKit/IOSyncer.h b/i386/include/IOKit/IOSyncer.h
deleted file mode 100644
index f6dfce3..0000000
--- a/i386/include/IOKit/IOSyncer.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _IOSYNCER_H
-#define _IOSYNCER_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOLocks.h>
-
-class IOSyncer : public OSObject
-{
-    OSDeclareDefaultStructors(IOSyncer)
-
-private:
-    // The spin lock that is used to guard the 'threadMustStop' variable. 
-    IOSimpleLock *guardLock;
-    volatile bool threadMustStop;
-    IOReturn fResult;
-    virtual void free();
-    virtual void privateSignal();
-
-public:
-
-    static IOSyncer * create(bool twoRetains = true)
-	APPLE_KEXT_DEPRECATED;
-
-    virtual bool init(bool twoRetains)
-	APPLE_KEXT_DEPRECATED;
-    virtual void reinit()
-	APPLE_KEXT_DEPRECATED;
-    virtual IOReturn wait(bool autoRelease = true)
-	APPLE_KEXT_DEPRECATED;
-    virtual void signal(IOReturn res = kIOReturnSuccess,
-					bool autoRelease = true)
-	APPLE_KEXT_DEPRECATED;
-};
-
-#endif /* !_IOSYNCER */
-
diff --git a/i386/include/IOKit/IOTimeStamp.h b/i386/include/IOKit/IOTimeStamp.h
deleted file mode 100644
index b1b0905..0000000
--- a/i386/include/IOKit/IOTimeStamp.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef IOKIT_IOTIMESTAMP_H
-#define IOKIT_IOTIMESTAMP_H
-
-#include <sys/kdebug.h>
-
-static inline void
-IOTimeStampStartConstant(unsigned int csc,
-			 uintptr_t a = 0, uintptr_t b = 0,
-			 uintptr_t c = 0, uintptr_t d = 0)
-{
-    KERNEL_DEBUG_CONSTANT(csc | DBG_FUNC_START, a, b, c, d, 0);
-}
-
-static inline void
-IOTimeStampEndConstant(uintptr_t csc,
-		       uintptr_t a = 0, uintptr_t b = 0,
-		       uintptr_t c = 0, uintptr_t d = 0)
-{
-    KERNEL_DEBUG_CONSTANT(csc | DBG_FUNC_END, a, b, c, d, 0);
-}
-
-static inline void
-IOTimeStampConstant(uintptr_t csc,
-		    uintptr_t a = 0, uintptr_t b = 0,
-		    uintptr_t c = 0, uintptr_t d = 0)
-{
-    KERNEL_DEBUG_CONSTANT(csc | DBG_FUNC_NONE, a, b, c, d, 0);
-}
-
-#if KDEBUG
-
-static inline void
-IOTimeStampStart(uintptr_t csc,
-                 uintptr_t a = 0, uintptr_t b = 0,
-                 uintptr_t c = 0, uintptr_t d = 0)
-{
-    KERNEL_DEBUG(csc | DBG_FUNC_START, a, b, c, d, 0);
-}
-
-static inline void
-IOTimeStampEnd(uintptr_t csc,
-               uintptr_t a = 0, uintptr_t b = 0,
-               uintptr_t c = 0, uintptr_t d = 0)
-{
-    KERNEL_DEBUG(csc | DBG_FUNC_END, a, b, c, d, 0);
-}
-
-static inline void
-IOTimeStamp(uintptr_t csc,
-            uintptr_t a = 0, uintptr_t b = 0,
-            uintptr_t c = 0, uintptr_t d = 0)
-{
-    KERNEL_DEBUG(csc | DBG_FUNC_NONE, a, b, c, d, 0);
-}
-
-#endif /* KDEBUG */
-
-#define IODBG_STORAGE(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOSTORAGE, code))
-#define IODBG_NETWORK(code)			(KDBG_CODE(DBG_IOKIT, DBG_IONETWORK, code))
-#define IODBG_KEYBOARD(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOKEYBOARD, code))
-#define IODBG_HID(code)				(KDBG_CODE(DBG_IOKIT, DBG_IOHID, code))
-#define IODBG_AUDIO(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOAUDIO, code))
-#define IODBG_SERIAL(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOSERIAL, code))
-#define IODBG_TTY(code)				(KDBG_CODE(DBG_IOKIT, DBG_IOTTY, code))
-#define IODBG_SAM(code)				(KDBG_CODE(DBG_IOKIT, DBG_IOSAM, code))
-#define IODBG_PARALLELATA(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOPARALLELATA, code))
-#define IODBG_PARALLELSCSI(code)	(KDBG_CODE(DBG_IOKIT, DBG_IOPARALLELSCSI, code))
-#define IODBG_SATA(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOSATA, code))
-#define IODBG_SAS(code)				(KDBG_CODE(DBG_IOKIT, DBG_IOSAS, code))
-#define IODBG_FIBRECHANNEL(code)	(KDBG_CODE(DBG_IOKIT, DBG_IOFIBRECHANNEL, code))
-#define IODBG_USB(code)				(KDBG_CODE(DBG_IOKIT, DBG_IOUSB, code))
-#define IODBG_BLUETOOTH(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOBLUETOOTH, code))
-#define IODBG_FIREWIRE(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOFIREWIRE, code))
-#define IODBG_INFINIBAND(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOINFINIBAND, code))
-
-
-/* Backwards compatibility */
-#define IODBG_DISK(code)			IODBG_STORAGE(code)
-#define IODBG_POINTING(code)		IODBG_HID(code)
-
-
-/* IOKit infrastructure subclasses */
-#define IODBG_WORKLOOP(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOWORKLOOP, code))
-#define IODBG_INTES(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOINTES, code))
-#define IODBG_TIMES(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOCLKES, code))
-#define IODBG_CMDQ(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOCMDQ, code))
-#define IODBG_MCURS(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOMCURS, code))
-#define IODBG_MDESC(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOMDESC, code))
-#define IODBG_POWER(code)			(KDBG_CODE(DBG_IOKIT, DBG_IOPOWER, code))
-#define IODBG_IOSERVICE(code)		(KDBG_CODE(DBG_IOKIT, DBG_IOSERVICE, code))
-
-/* IOKit specific codes - within each subclass */
-
-/* DBG_IOKIT/DBG_IODISK codes */
-
-/* DBG_IOKIT/DBG_IONETWORK codes */
-
-/* DBG_IOKIT/DBG_IOKEYBOARD codes */
-
-/* DBG_IOKIT/DBG_IOHID codes */
-
-/* DBG_IOKIT/DBG_IOAUDIO codes */
-
-/* DBG_IOKIT/DBG_IOSERIAL codes */
-
-/* DBG_IOKIT/DBG_IOTTY codes */
-
-/* DBG_IOKIT/DBG_IOWORKLOOP codes */
-#define IOWL_CLIENT		1	/* 0x05010004 */
-#define IOWL_WORK		2	/* 0x05010008 */
-
-/* DBG_IOKIT/DBG_IOINTES codes */
-#define IOINTES_CLIENT	1	/* 0x05020004 */
-#define IOINTES_LAT		2	/* 0x05020008 */
-#define IOINTES_SEMA	3	/* 0x0502000c */
-#define IOINTES_INTCTXT 4	/* 0x05020010 */
-#define IOINTES_INTFLTR 5	/* 0x05020014 */
-#define IOINTES_ACTION	6	/* 0x05020018 */
-#define IOINTES_FILTER	7	/* 0x0502001c */
-
-/* DBG_IOKIT/DBG_IOTIMES codes */
-#define IOTIMES_CLIENT	1	/* 0x05030004 */
-#define IOTIMES_LAT		2	/* 0x05030008 */
-#define IOTIMES_SEMA	3	/* 0x0503000c */
-#define IOTIMES_ACTION	4	/* 0x05030010 */
-
-/* DBG_IOKIT/DBG_IOCMDQ codes */
-#define IOCMDQ_CLIENT	1	/* 0x05040004 */
-#define IOCMDQ_LAT		2	/* 0x05040008 */
-#define IOCMDQ_SEMA		3	/* 0x0504000c */
-#define IOCMDQ_PSEMA	4	/* 0x05040010 */
-#define IOCMDQ_PLOCK	5	/* 0x05040014 */
-#define IOCMDQ_ACTION	6	/* 0x05040018 */
-
-/* DBG_IOKIT/DBG_IOMCURS codes */
-
-/* DBG_IOKIT/DBG_IOMDESC codes */
-
-/* DBG_IOKIT/DBG_IOPOWER codes */
-// See IOKit/pwr_mgt/IOPMlog.h for the power management codes
-
-/* DBG_IOKIT/DBG_IOSERVICE codes */
-#define IOSERVICE_BUSY		1	/* 0x05080004 */
-#define IOSERVICE_NONBUSY	2	/* 0x05080008 */
-#define IOSERVICE_MODULESTALL	3	/* 0x0508000C */
-#define IOSERVICE_MODULEUNSTALL	4	/* 0x05080010 */
-
-#define IOSERVICE_TERMINATE_PHASE1		5	/* 0x05080014 */
-#define IOSERVICE_TERMINATE_REQUEST_OK		6	/* 0x05080018 */
-#define IOSERVICE_TERMINATE_REQUEST_FAIL	7	/* 0x0508001C */
-#define IOSERVICE_TERMINATE_SCHEDULE_STOP	8	/* 0x05080020 */
-#define IOSERVICE_TERMINATE_SCHEDULE_FINALIZE	9	/* 0x05080024 */
-#define IOSERVICE_TERMINATE_WILL		10	/* 0x05080028 */
-#define IOSERVICE_TERMINATE_DID			11	/* 0x0508002C */
-#define IOSERVICE_TERMINATE_DID_DEFER		12	/* 0x05080030 */
-#define IOSERVICE_TERMINATE_FINALIZE		13	/* 0x05080034 */
-#define IOSERVICE_TERMINATE_STOP		14	/* 0x05080038 */
-#define IOSERVICE_TERMINATE_STOP_NOP		15	/* 0x0508003C */
-#define IOSERVICE_TERMINATE_STOP_DEFER		16	/* 0x05080040 */
-#define IOSERVICE_TERMINATE_DONE		17	/* 0x05080044 */
-
-#endif /* ! IOKIT_IOTIMESTAMP_H */
diff --git a/i386/include/IOKit/IOTimerEventSource.h b/i386/include/IOKit/IOTimerEventSource.h
deleted file mode 100644
index 7cc0d38..0000000
--- a/i386/include/IOKit/IOTimerEventSource.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
- *
- * IOTimerEventSource.h
- *
- * HISTORY
- * 2-Feb-1999		Joe Liu (jliu) created.
- *
- */
-
-#ifndef _IOTIMEREVENTSOURCE
-#define _IOTIMEREVENTSOURCE
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-#include <kern/clock.h>
-__END_DECLS
-
-#include <IOKit/IOEventSource.h>
-#include <IOKit/IOTypes.h>
-
-/*!
-    @class IOTimerEventSource : public IOEventSource
-    @abstract Time based event source mechanism.
-    @discussion An event source that implements a simple timer.	 A timeout handler is called once the timeout period expires.  This timeout handler will be called by the work-loop that this event source is attached to.
-<br><br>
-	Usually a timer event source will be used to implement a timeout.  In general when a driver makes a request it will need to setup a call to keep track of when the I/O doesn't complete.  This class is designed to make that somewhat easier.
-<br><br>
-	Remember the system doesn't guarantee the accuracy of the callout.	It is possible that a higher priority thread is running which will delay the execution of the action routine.  In fact the thread will be made runable at the exact requested time, within the accuracy of the CPU's decrementer based interrupt, but the scheduler will then control execution.
-*/
-class IOTimerEventSource : public IOEventSource
-{
-    OSDeclareDefaultStructors(IOTimerEventSource)
-
-protected:
-/*! @var calloutEntry thread_call entry for preregistered thread callouts */
-    void *calloutEntry;
-
-/*! @var abstime time to wake up next, see enable. */
-    AbsoluteTime abstime;
-
-/*! @struct ExpansionData
-    @discussion This structure is private to the IOTimerEventSource implementation.
-    */    
-    struct ExpansionData
-    {
-        SInt32	     calloutGeneration;
-        IOWorkLoop * workLoop;
-    };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only)  */
-    ExpansionData *reserved;
-
-/*! @function timeout
-    @abstract Function that routes the call from the OS' timeout mechanism into a work-loop context.
-    @discussion timeout will normally not be called nor overridden by a subclass.  If the event source is enabled then close the work-loop's gate and call the action routine.
-    @param self This argument will be cast to an IOTimerEventSource. */
-    static void timeout(void *self);
-
-/*! @function setTimeoutFunc
-    @abstract Set's timeout as the function of calloutEntry.
-    @discussion IOTimerEventSource is based upon the kern/thread_call.h APIs currently.	 This function allocates the calloutEntry member variable by using thread_call_allocate(timeout, this).	 If you need to write your own subclass of IOTimerEventSource you probably should override this method to allocate an entry that points to your own timeout routine. */
-    virtual void setTimeoutFunc();
-
-/*! @function free
-    @abstract Sub-class implementation of free method, frees calloutEntry */
-    virtual void free();
-
-/*! @function checkForWork
-    @abstract Have to implement it is mandatory in $link IOEventSource, but IOTimerEventSources don't actually use this work-loop mechanism. */
-    virtual bool checkForWork();
-
-    virtual void setWorkLoop(IOWorkLoop *workLoop);
-
-public:
-
-/*! @typedef Action
-    @discussion 'C' Function pointer defining the callout routine of this event source.
-    @param owner Owning target object.	Note by a startling coincidence the first parameter in a C callout is currently used to define the target of a C++ member function.
-    @param sender The object that timed out. */
-    typedef void (*Action)(OSObject *owner, IOTimerEventSource *sender);
-
-/*! @function timerEventSource
-    @abstract Allocates and returns an initialized timer instance.
-    @param owner
-    @param action */
-    static IOTimerEventSource *
-	timerEventSource(OSObject *owner, Action action = 0);
-
-/*! @function init
-    @abstract Initializes the timer with an owner, and a handler to call when the timeout expires.
-    @param owner 
-    @param action */
-    virtual bool init(OSObject *owner, Action action = 0);
-
-/*! @function enable
-    @abstract Enables a call to the action.
-    @discussion Allows the action function to be called.  If the timer event source was disabled while a call was outstanding and the call wasn't cancelled then it will be rescheduled.  So a disable/enable pair will disable calls from this event source. */
-    virtual void enable();
-
-/*! @function disable
-    @abstract Disable a timed callout.
-    @discussion When disable returns the action will not be called until the next time enable(qv) is called. */
-    virtual void disable();
-
-
-/*! @function setTimeoutTicks
-    @abstract Setup a callback at after the delay in scheduler ticks.  See wakeAtTime(AbsoluteTime).
-    @param interval Delay from now to wake up, in scheduler ticks, whatever that may be.
-    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
-    virtual IOReturn setTimeoutTicks(UInt32 ticks);
-
-/*! @function setTimeoutMS
-    @abstract Setup a callback at after the delay in milliseconds.  See wakeAtTime(AbsoluteTime).
-    @param interval Delay from now to wake up, time in milliseconds.
-    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
-    virtual IOReturn setTimeoutMS(UInt32 ms);
-
-/*! @function setTimeoutUS
-        @abstract Setup a callback at after the delay in microseconds.	 See wakeAtTime(AbsoluteTime).
-    @param interval Delay from now to wake up, time in microseconds.
-    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
-    virtual IOReturn setTimeoutUS(UInt32 us);
-
-/*! @function setTimeout
-    @abstract Setup a callback at after the delay in some unit.	 See wakeAtTime(AbsoluteTime).
-    @param interval Delay from now to wake up in some defined unit.
-    @param scale_factor Define the unit of interval, default to nanoseconds.
-    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
-    virtual IOReturn setTimeout(UInt32 interval,
-				UInt32 scale_factor = kNanosecondScale);
-
-#if !defined(__LP64__)
-    virtual IOReturn setTimeout(mach_timespec_t interval)
-	APPLE_KEXT_DEPRECATED;
-#endif
-
-/*! @function setTimeout
-    @abstract Setup a callback at after the delay in decrementer ticks.	 See wakeAtTime(AbsoluteTime).
-    @param interval Delay from now to wake up in decrementer ticks.
-    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
-    virtual IOReturn setTimeout(AbsoluteTime interval);
-
-/*! @function wakeAtTimeTicks
-    @abstract Setup a callback at this absolute time.  See wakeAtTime(AbsoluteTime).
-    @param abstime Time to wake up in scheduler quantums, whatever that is?
-    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
-    virtual IOReturn wakeAtTimeTicks(UInt32 ticks);
-
-/*! @function wakeAtTimeMS
-    @abstract Setup a callback at this absolute time.  See wakeAtTime(AbsoluteTime).
-    @param abstime Time to wake up in milliseconds.
-    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
-    virtual IOReturn wakeAtTimeMS(UInt32 ms);
-
-/*! @function wakeAtTimeUS
-    @abstract Setup a callback at this absolute time.  See wakeAtTime(AbsoluteTime).
-    @param abstime Time to wake up in microseconds.
-    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
-    virtual IOReturn wakeAtTimeUS(UInt32 us);
-
-/*! @function wakeAtTime
-    @abstract Setup a callback at this absolute time.  See wakeAtTime(AbsoluteTime).
-    @param abstime Time to wake up in some unit.
-    @param scale_factor Define the unit of abstime, default to nanoseconds.
-    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared. */
-    virtual IOReturn wakeAtTime(UInt32 abstime,
-				UInt32 scale_factor = kNanosecondScale);
-
-#if !defined(__LP64__)
-    virtual IOReturn wakeAtTime(mach_timespec_t abstime)
-	APPLE_KEXT_DEPRECATED;
-#endif
-
-/*! @function wakeAtTime
-    @abstract Setup a callback at this absolute time.
-    @discussion Starts the timer, which will expire at abstime. After it expires, the timer will call the 'action' registered in the init() function. This timer is not periodic, a further call is needed to reset and restart the timer after it expires.  
-    @param abstime Absolute Time when to wake up, counted in 'decrementer' units and starts at zero when system boots.
-    @result kIOReturnSuccess if everything is fine, kIOReturnNoResources if action hasn't been declared by init or IOEventSource::setAction (qqv). */
-    virtual IOReturn wakeAtTime(AbsoluteTime abstime);
-
-/*! @function cancelTimeout
-    @abstract Disable any outstanding calls to this event source.
-    @discussion Clear down any oustanding calls.  By the time this function completes it is guaranteed that the action will not be called again. */
-   virtual void cancelTimeout();
-
-private:
-    static void timeoutAndRelease(void *self, void *wl);
-
-private:
-    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 0);
-    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 1);
-    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 2);
-    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 3);
-    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 4);
-    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 5);
-    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 6);
-    OSMetaClassDeclareReservedUnused(IOTimerEventSource, 7);
-};
-
-#endif /* !_IOTIMEREVENTSOURCE */
diff --git a/i386/include/IOKit/IOTypes.h b/i386/include/IOKit/IOTypes.h
deleted file mode 100644
index 5d20efb..0000000
--- a/i386/include/IOKit/IOTypes.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef	__IOKIT_IOTYPES_H
-#define __IOKIT_IOTYPES_H
-
-#ifndef IOKIT
-#define IOKIT 1
-#endif /* !IOKIT */
-
-#if KERNEL
-#include <IOKit/system.h>
-#else
-#include <mach/message.h>
-#include <mach/vm_types.h>
-#endif
-
-#include <IOKit/IOReturn.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef	NULL
-#if defined (__cplusplus)
-#define	NULL	0
-#else
-#define NULL ((void *)0)
-#endif
-#endif
-	
-/*
- * Simple data types.
- */
-#ifndef __MACTYPES__	/* CF MacTypes.h */
-#ifndef __TYPES__	/* guess... Mac Types.h */
-
-#include <stdbool.h>
-#include <libkern/OSTypes.h>
-
-#endif /* __TYPES__ */
-#endif /* __MACTYPES__ */
-
-#if KERNEL
-#include <libkern/OSBase.h>
-#endif
-
-typedef UInt32		IOOptionBits;
-typedef SInt32		IOFixed;
-typedef UInt32		IOVersion;
-typedef UInt32		IOItemCount;
-typedef UInt32  	IOCacheMode;
-
-typedef UInt32	 	IOByteCount32;
-typedef UInt64	 	IOByteCount64;
-
-typedef UInt32	IOPhysicalAddress32;
-typedef UInt64	IOPhysicalAddress64;
-typedef UInt32	IOPhysicalLength32;
-typedef UInt64	IOPhysicalLength64;
-
-#ifdef __LP64__
-typedef mach_vm_address_t	IOVirtualAddress;
-#else
-typedef vm_address_t		IOVirtualAddress;
-#endif
-
-#if defined(__LP64__) && defined(KERNEL)
-typedef IOByteCount64		IOByteCount;
-#else
-typedef IOByteCount32	 	IOByteCount;
-#endif
-
-typedef IOVirtualAddress    IOLogicalAddress;
-
-#if defined(__LP64__) && defined(KERNEL)
-
-typedef IOPhysicalAddress64	 IOPhysicalAddress;
-typedef IOPhysicalLength64	 IOPhysicalLength;
-#define IOPhysical32( hi, lo )		((UInt64) lo + ((UInt64)(hi) << 32))
-#define IOPhysSize	64
-
-#else
-
-typedef IOPhysicalAddress32	 IOPhysicalAddress;
-typedef IOPhysicalLength32	 IOPhysicalLength;
-#define IOPhysical32( hi, lo )		(lo)
-#define IOPhysSize	32
-
-#endif
-
-
-typedef struct
-{
-    IOPhysicalAddress	address;
-    IOByteCount		length;
-} IOPhysicalRange;
-
-typedef struct 
-{
-    IOVirtualAddress	address;
-    IOByteCount		length;
-} IOVirtualRange;
-
-#ifdef __LP64__
-typedef IOVirtualRange	IOAddressRange;
-#else /* !__LP64__ */
-typedef struct 
-{
-    mach_vm_address_t	address;
-    mach_vm_size_t	length;
-} IOAddressRange;
-#endif /* !__LP64__ */
-
-/*
- * Map between #defined or enum'd constants and text description.
- */
-typedef struct {
-	int value;
-	const char *name;
-} IONamedValue;
-
-
-/*
- * Memory alignment -- specified as a power of two.
- */
-typedef unsigned int	IOAlignment;
-
-#define IO_NULL_VM_TASK		((vm_task_t)0)
-
-
-/*
- * Pull in machine specific stuff.
- */
-
-//#include <IOKit/machine/IOTypes.h>
-
-#ifndef MACH_KERNEL
-
-#ifndef __IOKIT_PORTS_DEFINED__
-#define __IOKIT_PORTS_DEFINED__
-typedef struct OSObject * io_object_t;
-#endif /* __IOKIT_PORTS_DEFINED__ */
-
-#include <device/device_types.h>
-
-typedef io_object_t	io_connect_t;
-typedef io_object_t	io_enumerator_t;
-typedef io_object_t	io_iterator_t;
-typedef io_object_t	io_registry_entry_t;
-typedef io_object_t	io_service_t;
-
-#define	IO_OBJECT_NULL	((io_object_t) 0)
-
-#endif /* MACH_KERNEL */
-
-// IOConnectMapMemory memoryTypes
-enum {
-    kIODefaultMemoryType	= 0
-};
-
-enum {
-    kIODefaultCache		= 0,
-    kIOInhibitCache		= 1,
-    kIOWriteThruCache		= 2,
-    kIOCopybackCache		= 3,
-    kIOWriteCombineCache	= 4
-};
-
-// IOMemory mapping options
-enum {
-    kIOMapAnywhere		= 0x00000001,
-
-    kIOMapCacheMask		= 0x00000700,
-    kIOMapCacheShift		= 8,
-    kIOMapDefaultCache		= kIODefaultCache      << kIOMapCacheShift,
-    kIOMapInhibitCache		= kIOInhibitCache      << kIOMapCacheShift,
-    kIOMapWriteThruCache	= kIOWriteThruCache    << kIOMapCacheShift,
-    kIOMapCopybackCache		= kIOCopybackCache     << kIOMapCacheShift,
-    kIOMapWriteCombineCache	= kIOWriteCombineCache << kIOMapCacheShift,
-
-    kIOMapUserOptionsMask	= 0x00000fff,
-
-    kIOMapReadOnly		= 0x00001000,
-
-    kIOMapStatic		= 0x01000000,
-    kIOMapReference		= 0x02000000,
-    kIOMapUnique		= 0x04000000
-};
-
-/*! @enum Scale Factors
-    @discussion Used when a scale_factor parameter is required to define a unit of time.
-    @constant kNanosecondScale Scale factor for nanosecond based times.
-    @constant kMicrosecondScale Scale factor for microsecond based times.
-    @constant kMillisecondScale Scale factor for millisecond based times.
-    @constant kTickScale Scale factor for the standard (100Hz) tick.
-    @constant kSecondScale Scale factor for second based times. */
-
-enum {
-    kNanosecondScale  = 1,
-    kMicrosecondScale = 1000,
-    kMillisecondScale = 1000 * 1000,
-    kSecondScale      = 1000 * 1000 * 1000,
-    kTickScale        = (kSecondScale / 100)
-};
-
-/* compatibility types */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ! __IOKIT_IOTYPES_H */
diff --git a/i386/include/IOKit/IOUserClient.h b/i386/include/IOKit/IOUserClient.h
deleted file mode 100644
index c1d7fe5..0000000
--- a/i386/include/IOKit/IOUserClient.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-/*
- * Changes to this API are expected.
- */
-
-#ifndef _IOKIT_IOUSERCLIENT_H
-#define _IOKIT_IOUSERCLIENT_H
-
-#include <IOKit/IOTypes.h>
-#include <IOKit/IOService.h>
-#include <IOKit/OSMessageNotification.h>
-
-
-enum {
-    kIOUCTypeMask	= 0x0000000f,
-    kIOUCScalarIScalarO = 0,
-    kIOUCScalarIStructO = 2,
-    kIOUCStructIStructO = 3,
-    kIOUCScalarIStructI = 4,
-
-    kIOUCForegroundOnly = 0x00000010,
-};
-
-/*! @enum
-    @abstract Constant to denote a variable length structure argument to IOUserClient.
-    @constant kIOUCVariableStructureSize Use in the structures IOExternalMethod, IOExternalAsyncMethod, IOExternalMethodDispatch to specify the size of the structure is variable.
-*/
-enum {
-    kIOUCVariableStructureSize = 0xffffffff
-};
-
-
-typedef IOReturn (IOService::*IOMethod)(void * p1, void * p2, void * p3,
-                                        void * p4, void * p5, void * p6 );
-
-typedef IOReturn (IOService::*IOAsyncMethod)(OSAsyncReference asyncRef,
-                                        void * p1, void * p2, void * p3,
-                                        void * p4, void * p5, void * p6 );
-
-typedef IOReturn (IOService::*IOTrap)(void * p1, void * p2, void * p3,
-                                      void * p4, void * p5, void * p6 );
-
-struct IOExternalMethod {
-    IOService *		object;
-    IOMethod		func;
-    IOOptionBits	flags;
-    IOByteCount		count0;
-    IOByteCount		count1;
-};
-
-struct IOExternalAsyncMethod {
-    IOService *		object;
-    IOAsyncMethod	func;
-    IOOptionBits	flags;
-    IOByteCount		count0;
-    IOByteCount		count1;
-};
-
-struct IOExternalTrap {
-    IOService *		object;
-    IOTrap		func;
-};
-
-enum {
-    kIOUserNotifyMaxMessageSize = 64
-};
-
-// keys for clientHasPrivilege
-#define kIOClientPrivilegeAdministrator	"root"
-#define kIOClientPrivilegeLocalUser	"local"
-#define kIOClientPrivilegeForeground	"foreground"
-
-/*! @enum
-    @abstract Constants to specify the maximum number of scalar arguments in the IOExternalMethodArguments structure. These constants are documentary since the scalarInputCount, scalarOutputCount fields reflect the actual number passed.
-    @constant kIOExternalMethodScalarInputCountMax The maximum number of scalars able to passed on input.
-    @constant kIOExternalMethodScalarOutputCountMax The maximum number of scalars able to passed on output.
-*/
-enum {
-    kIOExternalMethodScalarInputCountMax  = 16,
-    kIOExternalMethodScalarOutputCountMax = 16,
-};
-
-
-struct IOExternalMethodArguments
-{
-    uint32_t		version;
-
-    uint32_t		selector;
-
-    mach_port_t           asyncWakePort;
-    io_user_reference_t * asyncReference;
-    uint32_t              asyncReferenceCount;
-
-    const uint64_t *    scalarInput;
-    uint32_t		scalarInputCount;
-
-    const void *	structureInput;
-    uint32_t		structureInputSize;
-
-    IOMemoryDescriptor * structureInputDescriptor;
-   
-    uint64_t *		scalarOutput;
-    uint32_t		scalarOutputCount;
-
-    void *		structureOutput;
-    uint32_t		structureOutputSize;
-
-    IOMemoryDescriptor * structureOutputDescriptor;
-    uint32_t		 structureOutputDescriptorSize;
-
-    uint32_t		__reserved[32];
-};
-
-typedef IOReturn (*IOExternalMethodAction)(OSObject * target, void * reference, 
-					    IOExternalMethodArguments * arguments);
-struct IOExternalMethodDispatch
-{
-    IOExternalMethodAction function;
-    uint32_t		   checkScalarInputCount;
-    uint32_t		   checkStructureInputSize;
-    uint32_t		   checkScalarOutputCount;
-    uint32_t		   checkStructureOutputSize;
-};
-
-enum {
-#define IO_EXTERNAL_METHOD_ARGUMENTS_CURRENT_VERSION	1
-    kIOExternalMethodArgumentsCurrentVersion = IO_EXTERNAL_METHOD_ARGUMENTS_CURRENT_VERSION
-};
-
-
-/*!
-    @class IOUserClient
-    @abstract   Provides a basis for communication between client applications and I/O Kit objects.
-*/
-
-
-class IOUserClient : public IOService
-{
-    OSDeclareAbstractStructors(IOUserClient)
-
-protected:
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of this class in the future.
-*/    
-    struct ExpansionData { };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only) 
-*/
-    ExpansionData * reserved;
-
-private:
-    OSSet * mappings;
-    UInt8   sharedInstance;
-    UInt8   __reservedA[3];
-    void  * __reserved[7];
-
-public:
-   virtual IOReturn externalMethod( uint32_t selector, IOExternalMethodArguments * arguments,
-					IOExternalMethodDispatch * dispatch = 0, OSObject * target = 0, void * reference = 0 );
-
-   virtual IOReturn registerNotificationPort(
-					mach_port_t port, UInt32 type, io_user_reference_t refCon);
-
-private:
-#if __LP64__
-    OSMetaClassDeclareReservedUnused(IOUserClient, 0);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 1);
-#else
-    OSMetaClassDeclareReservedUsed(IOUserClient, 0);
-    OSMetaClassDeclareReservedUsed(IOUserClient, 1);
-#endif
-    OSMetaClassDeclareReservedUnused(IOUserClient, 2);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 3);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 4);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 5);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 6);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 7);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 8);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 9);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 10);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 11);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 12);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 13);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 14);
-    OSMetaClassDeclareReservedUnused(IOUserClient, 15);
-
-
-protected:
-    static IOReturn sendAsyncResult(OSAsyncReference reference,
-                                    IOReturn result, void *args[], UInt32 numArgs);
-    static void setAsyncReference(OSAsyncReference asyncRef,
-                                  mach_port_t wakePort,
-                                  void *callback, void *refcon);
-
-    static IOReturn sendAsyncResult64(OSAsyncReference64 reference,
-                                        IOReturn result, io_user_reference_t args[], UInt32 numArgs);
-    static void setAsyncReference64(OSAsyncReference64 asyncRef,
-					mach_port_t wakePort,
-					mach_vm_address_t callback, io_user_reference_t refcon);
-public:
-
-    static IOReturn clientHasPrivilege( void * securityToken,
-                                        const char * privilegeName );
-
-    /*!
-        @function releaseAsyncReference64
-	@abstract Release the mach_port_t reference held within the OSAsyncReference64 structure.
-	@discussion The OSAsyncReference64 structure passed to async methods holds a reference to the wakeup mach port, which should be released to balance each async method call. Behavior is undefined if these calls are not correctly balanced.
-        @param reference The reference passed to the subclass IOAsyncMethod, or externalMethod() in the IOExternalMethodArguments.asyncReference field.
-        @result A return code.
-    */
-    static IOReturn releaseAsyncReference64(OSAsyncReference64 reference);
-    /*!
-        @function releaseNotificationPort
-	@abstract Release the mach_port_t passed to registerNotificationPort().
-	@discussion The mach_port_t passed to the registerNotificationPort() methods should be released to balance each call to registerNotificationPort(). Behavior is undefined if these calls are not correctly balanced.
-        @param reference The mach_port_t argument previously passed to the subclass implementation of registerNotificationPort().
-        @result A return code.
-    */
-    static IOReturn releaseNotificationPort(mach_port_t port);
-
-    virtual bool init();
-    virtual bool init( OSDictionary * dictionary );
-    // Currently ignores the all args, just passes up to IOService::init()
-    virtual bool initWithTask(
-                    task_t owningTask, void * securityToken, UInt32 type,
-                    OSDictionary * properties);
-
-    virtual bool initWithTask(
-                    task_t owningTask, void * securityToken, UInt32 type);
-
-    virtual void free();
-
-    virtual IOReturn clientClose( void );
-    virtual IOReturn clientDied( void );
-
-    virtual IOService * getService( void );
-
-    virtual IOReturn registerNotificationPort(
-		mach_port_t port, UInt32 type, UInt32 refCon );
-
-    virtual IOReturn getNotificationSemaphore( UInt32 notification_type,
-                                    semaphore_t * semaphore );
-
-    virtual IOReturn connectClient( IOUserClient * client );
-
-    // memory will be released by user client when last map is destroyed
-    virtual IOReturn clientMemoryForType( UInt32 type,
-			        IOOptionBits * options,
-				IOMemoryDescriptor ** memory );
-
-#if !__LP64__
-private:
-	APPLE_KEXT_COMPATIBILITY_VIRTUAL
-	IOMemoryMap * mapClientMemory( IOOptionBits type,
-                                    task_t task,
-                                    IOOptionBits mapFlags = kIOMapAnywhere,
-									IOVirtualAddress atAddress = 0 );
-#endif
-
-public:
-
-    /*!
-        @function removeMappingForDescriptor
-        Remove the first mapping created from the memory descriptor returned by clientMemoryForType() from IOUserClient's list of mappings. If such a mapping exists, it is retained and the reference currently held by IOUserClient is returned to the caller.
-        @param memory The memory descriptor instance previously returned by the implementation of clientMemoryForType().
-        @result A reference to the first IOMemoryMap instance found in the list of mappings created by IOUserClient from that passed memory descriptor is returned, or zero if none exist. The caller should release this reference.
-    */
-    IOMemoryMap * removeMappingForDescriptor(IOMemoryDescriptor * memory);
-
-    /*!
-        @function exportObjectToClient
-        Make an arbitrary OSObject available to the client task.
-        @param task The task.
-        @param obj The object we want to export to the client.
-        @param clientObj Returned value is the client's port name.
-    */
-    virtual IOReturn exportObjectToClient(task_t task,
-				OSObject *obj, io_object_t *clientObj);
-
-    // Old methods for accessing method vector backward compatiblility only
-    virtual IOExternalMethod *
-        getExternalMethodForIndex( UInt32 index )
-	APPLE_KEXT_DEPRECATED;
-    virtual IOExternalAsyncMethod *
-        getExternalAsyncMethodForIndex( UInt32 index )
-	APPLE_KEXT_DEPRECATED;
-
-    // Methods for accessing method vector.
-    virtual IOExternalMethod *
-        getTargetAndMethodForIndex( IOService ** targetP, UInt32 index );
-    virtual IOExternalAsyncMethod *
-        getAsyncTargetAndMethodForIndex( IOService ** targetP, UInt32 index );
-
-    // Methods for accessing trap vector - old and new style
-    virtual IOExternalTrap *
-		getExternalTrapForIndex( UInt32 index )
-	APPLE_KEXT_DEPRECATED;
-
-    virtual IOExternalTrap *
-      getTargetAndTrapForIndex( IOService **targetP, UInt32 index );
-};
-
-#endif /* ! _IOKIT_IOUSERCLIENT_H */
-
diff --git a/i386/include/IOKit/IOWorkLoop.h b/i386/include/IOKit/IOWorkLoop.h
deleted file mode 100644
index 808329a..0000000
--- a/i386/include/IOKit/IOWorkLoop.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (c) 1998-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
-Copyright (c) 1998 Apple Computer, Inc.	 All rights reserved.
-HISTORY
-    1998-7-13	Godfrey van der Linden(gvdl)
-	Created.
-    1998-10-30	Godfrey van der Linden(gvdl)
-	Converted to C++
-*/
-
-#ifndef __IOKIT_IOWORKLOOP_H
-#define __IOKIT_IOWORKLOOP_H
-
-#include <libkern/c++/OSObject.h>
-#include <IOKit/IOReturn.h>
-#include <IOKit/IOLib.h>
-#include <IOKit/IOLocks.h>
-
-#include <IOKit/system.h>
-
-class IOEventSource;
-class IOTimerEventSource;
-class IOCommandGate;
-
-/*! @class IOWorkLoop
-    @discussion An IOWorkLoop is a thread of control that is intended to be used to provide single threaded access to hardware.  This class has no knowledge of the nature and type of the events that it marshals and forwards.  When a device driver successfully starts (see IOService::start), it is expected to create the event sources it will need to receive events.  Then a work loop is initialized and the events are added to the work loop for monitoring.  In general this set up will be automated by the family superclass of the specific device.
-<br><br>
-	The thread main method walks the event source linked list and messages each one requesting a work check.  At this point each event source is expected to notify its registered owner that the event has occurred.  After each event has been walked and each indicates that another loop isn't required (by setting the 'more' flag to false) the thread will go to sleep on a signaling semaphore.
-<br><br>
-	When an event source is registered with a work loop it is informed of the semaphore to use to wake up the loop.
-*/
-class IOWorkLoop : public OSObject
-{
-    OSDeclareDefaultStructors(IOWorkLoop)
-
-public:
-/*!
-    @typedef Action
-    @discussion Type and arguments of callout C function that is used when
-a runCommand is executed by a client.  Cast to this type when you want a C++
-member function to be used.  Note the arg1 - arg3 parameters are straight pass
-through from the runCommand to the action callout.
-    @param target
-	Target of the function, can be used as a refcon.  Note if a C++ function
-was specified, this parameter is implicitly the first parameter in the target
-member function's parameter list.
-    @param arg0 Argument to action from run operation.
-    @param arg1 Argument to action from run operation.
-    @param arg2 Argument to action from run operation.
-    @param arg3 Argument to action from run operation.
-*/
-    typedef IOReturn (*Action)(OSObject *target,
-			       void *arg0, void *arg1,
-			       void *arg2, void *arg3);
-    enum {
-	kPreciousStack = 0x00000001
-    };
-
-private:
-/*! @function threadMainContinuation
-    @abstract Static function that calls the threadMain function. 
-*/
-    static void threadMainContinuation(IOWorkLoop *self);
-
-protected:
-
-/*! @typedef maintCommandEnum
-    @discussion Enumeration of commands that _maintCommand can deal with.  
-    @constant mAddEvent Used to tag a Remove event source command.
-    @constant mRemoveEvent Used to tag a Remove event source command. 
-*/    
-    typedef enum { mAddEvent, mRemoveEvent } maintCommandEnum;
-
-/*! @var gateLock
-    Mutual exclusion lock that is used by close and open Gate functions.  
-    This is a recursive lock, which allows multiple layers of code to share a single IOWorkLoop without deadlock.  This is common in IOKit since threads of execution tend to follow the service plane in the IORegistry, and multiple objects along the call path may acquire the gate for the same (shared) workloop.
-*/
-    IORecursiveLock *gateLock;
-
-/*! @var eventChain 
-    Pointer to first event source in linked list. 
-*/
-    IOEventSource *eventChain;
-
-/*! @var controlG 
-    Internal control gate to maintain event system.  
-*/
-    IOCommandGate *controlG;
-
-/*! @var workToDoLock
-    The spin lock that is used to guard the 'workToDo' variable. 
-*/
-    IOSimpleLock *workToDoLock;
-
-/*! @var workThread 
-    Work loop thread.	
-*/
-    IOThread workThread;
-
-/*! @var workToDo
-    Used to to indicate that an interrupt has fired and needs to be processed.
-*/
-    volatile bool workToDo;
-
-/*! @var loopRestart
-    Set if an event chain has been changed and the system has to be rechecked from start.  (Internal use only)  
-*/
-    bool loopRestart;
-
-/*! @struct ExpansionData
-    @discussion This structure will be used to expand the capablilties of the IOWorkLoop in the future.
-*/    
-    struct ExpansionData {
-	IOOptionBits options;
-    };
-
-/*! @var reserved
-    Reserved for future use.  (Internal use only) 
-*/
-    ExpansionData *reserved;
-
-/*! @function _maintRequest
-    @abstract Synchronous implementation of addEventSource and removeEventSource functions. 
-    @discussion This function implements the commands as defined in the maintCommandEnum.  It can be subclassed but it isn't an external API in the usual sense.  A subclass implementation of _maintRequest would be called synchronously with respect to the work loop and it should be implemented in the usual way that an ioctl would be.
-    @return kIOReturnUnsupported if the command given is not implemented, kIOReturnSuccess otherwise.
-*/
-    virtual IOReturn _maintRequest(void *command, void *data, void *, void *);
-
-/*! @function free
-    @discussion Mandatory free of the object independent of the current retain count.  If the work loop is running, this method will not return until the thread has successfully terminated.  Each event source in the chain will be released and the working semaphore will be destroyed.
-<br><br>
-	If the client has some outstanding requests on an event they will never be informed of completion.  If an external thread is blocked on any of the event sources they will be awakened with a KERN_INTERUPTED status. 
-*/
-    virtual void free();
-
-/*! @function threadMain
-    @discussion Work loop threads main function.  This function consists of 3
-    loops: the outermost loop is the semaphore clear and wait loop, the middle
-    loop terminates when there is no more work, and the inside loop walks the
-    event list calling the checkForWork method in each event source.  If an
-    event source has more work to do, it can set the more flag and the middle
-    loop will repeat.  When no more work is outstanding the outermost will
-    sleep until an event is signalled.
-*/
-    virtual void threadMain();
-
-public:
-
-/*! @function workLoop
-    @abstract Factory member function to construct and intialize a work loop.
-    @result Returns a workLoop instance if constructed successfully, 0 otherwise. 
-*/
-    static IOWorkLoop *workLoop();
-
-/*! @function workLoopWithOptions(IOOptionBits options)
-    @abstract Factory member function to constuct and intialize a work loop.
-    @param options Options - kPreciousStack to avoid stack deallocation on paging path.
-    @result Returns a workLoop instance if constructed successfully, 0 otherwise. 
-*/
-    static IOWorkLoop *workLoopWithOptions(IOOptionBits options);
-
-/*! @function init
-    @discussion Initializes an instance of the workloop.  This method creates and initializes the signaling semaphore, the controller gate lock, and spawns the thread that will continue executing.
-    @result Returns true if initialized successfully, false otherwise. 
-*/
-    virtual bool init();
-
-/*! @function getThread
-    @abstract Gets the workThread.
-    @result Returns workThread.
-*/
-    virtual IOThread getThread() const;
-
-/*! @function onThread
-    @abstract Is the current execution context on the work thread? 
-    @result Returns true if IOThreadSelf() == workThread. 
-*/
-    virtual bool onThread() const;
-
-/*! @function inGate
-    @abstract Is the current execution context holding the work-loop's gate? 
-    @result Returns true if IOThreadSelf() is gate holder.
-*/
-    virtual bool inGate() const;
-    
-/*! @function addEventSource
-    @discussion Add an event source to be monitored by the work loop.  This function does not return until the work loop has acknowledged the arrival of the new event source.  When a new event has been added the threadMain will always restart its loop and check all outstanding events.  The event source is retained by the work loop.
-    @param newEvent Pointer to IOEventSource subclass to add.
-    @result Always returns kIOReturnSuccess. 
-*/
-    virtual IOReturn addEventSource(IOEventSource *newEvent);
-
-/*! @function removeEventSource
-    @discussion Remove an event source from the work loop.  This function does not return until the work loop has acknowledged the removal of the event source.  When an event has been removed the threadMain will always restart its loop and check all outstanding events.  The event source will be released before return.
-    @param toRemove Pointer to IOEventSource subclass to remove.
-    @result Returns kIOReturnSuccess if successful, kIOReturnBadArgument if toRemove couldn't be found. 
-*/
-    virtual IOReturn removeEventSource(IOEventSource *toRemove);
-
-/*! @function enableAllEventSources
-    @abstract Calls enable() in all event sources.
-    @discussion For all event sources in eventChain, call enable() function.  See IOEventSource::enable().
-*/
-    virtual void enableAllEventSources() const;
-
-/*! @function disableAllEventSources
-    @abstract Calls disable() in all event sources.
-    @discussion For all event sources in eventChain, call disable() function.  See IOEventSource::disable().
-*/
-    virtual void disableAllEventSources() const;
-
-/*! @function enableAllInterrupts
-    @abstract Calls enable() in all interrupt event sources.
-    @discussion For all event sources (ES) for which IODynamicCast(IOInterruptEventSource, ES) is valid, in eventChain call enable() function.  See IOEventSource::enable().
-*/
-    virtual void enableAllInterrupts() const;
-
-/*! @function disableAllInterrupts
-    @abstract Calls disable() in all interrupt event sources.
-    @discussion For all event sources (ES) for which IODynamicCast(IOInterruptEventSource, ES) is valid,  in eventChain call disable() function.  See IOEventSource::disable().
-*/
-    virtual void disableAllInterrupts() const;
-
-
-protected:
-    // Internal APIs used by event sources to control the thread
-    friend class IOEventSource;
-    friend class IOTimerEventSource;
-    virtual void signalWorkAvailable();
-    virtual void openGate();
-    virtual void closeGate();
-    virtual bool tryCloseGate();
-    virtual int  sleepGate(void *event, UInt32 interuptibleType);
-    virtual void wakeupGate(void *event, bool oneThread);
-
-public:
-    /* methods available in Mac OS X 10.1 or later */
-
-/*! @function runAction
-    @abstract Single thread a call to an action with the work-loop.
-    @discussion Client function that causes the given action to be called in a single threaded manner.  Beware: the work-loop's gate is recursive and runAction can cause direct or indirect re-entrancy.  When executing on a client's thread, runAction will sleep until the work-loop's gate opens for execution of client actions, the action is single threaded against all other work-loop event sources.
-    @param action Pointer to function to be executed in work-loop context.
-    @param arg0 Parameter for action parameter, defaults to 0.
-    @param arg1 Parameter for action parameter, defaults to 0.
-    @param arg2 Parameter for action parameter, defaults to 0.
-    @param arg3 Parameter for action parameter, defaults to 0.
-    @result Returns the value of the Action callout.
-*/
-    virtual IOReturn runAction(Action action, OSObject *target,
-			       void *arg0 = 0, void *arg1 = 0,
-			       void *arg2 = 0, void *arg3 = 0);
-
-/*! @function runEventSources
-    @discussion Consists of the inner 2 loops of the threadMain function(qv).
-    The outer loop terminates when there is no more work, and the inside loop
-    walks the event list calling the checkForWork method in each event source.
-    If an event source has more work to do, it can set the more flag and the
-    outer loop will repeat.
-<br><br>
-    This function can be used to clear a priority inversion between the normal
-    workloop thread and multimedia's real time threads.  The problem is that
-    the interrupt action routine is often held off by high priority threads.
-    So if they want to get their data now they will have to call us and ask if
-    any data is available.  The multi-media user client will arrange for this
-    function to be called, which causes any pending interrupts to be processed
-    and the completion routines called.  By the time the function returns all
-    outstanding work will have been completed at the real time threads
-    priority.
-
-    @result Return false if the work loop is shutting down, true otherwise.
-*/
-    virtual bool runEventSources();
-
-protected:
-    // Internal APIs used by event sources to control the thread
-    virtual int sleepGate(void *event, AbsoluteTime deadline, UInt32 interuptibleType);
-
-protected:
-#if __LP64__
-    OSMetaClassDeclareReservedUnused(IOWorkLoop, 0);
-    OSMetaClassDeclareReservedUnused(IOWorkLoop, 1);
-    OSMetaClassDeclareReservedUnused(IOWorkLoop, 2);
-#else
-    OSMetaClassDeclareReservedUsed(IOWorkLoop, 0);
-    OSMetaClassDeclareReservedUsed(IOWorkLoop, 1);
-    OSMetaClassDeclareReservedUsed(IOWorkLoop, 2);
-#endif
-    OSMetaClassDeclareReservedUnused(IOWorkLoop, 3);
-    OSMetaClassDeclareReservedUnused(IOWorkLoop, 4);
-    OSMetaClassDeclareReservedUnused(IOWorkLoop, 5);
-    OSMetaClassDeclareReservedUnused(IOWorkLoop, 6);
-    OSMetaClassDeclareReservedUnused(IOWorkLoop, 7);
-};
-
-#endif /* !__IOKIT_IOWORKLOOP_H */
diff --git a/i386/include/IOKit/OSMessageNotification.h b/i386/include/IOKit/OSMessageNotification.h
deleted file mode 100644
index 7d7b5e5..0000000
--- a/i386/include/IOKit/OSMessageNotification.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-#ifndef	__OS_OSMESSAGENOTIFICATION_H
-#define __OS_OSMESSAGENOTIFICATION_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <mach/mach_types.h>
-#include <device/device_types.h>
-#include <IOKit/IOReturn.h>
-
-enum {
-    kFirstIOKitNotificationType 		= 100,
-    kIOServicePublishNotificationType 		= 100,
-    kIOServiceMatchedNotificationType		= 101,
-    kIOServiceTerminatedNotificationType	= 102,
-    kIOAsyncCompletionNotificationType		= 150,
-    kIOServiceMessageNotificationType		= 160,
-    kLastIOKitNotificationType 			= 199
-};
-
-enum {
-    kOSNotificationMessageID		= 53,
-    kOSAsyncCompleteMessageID		= 57,
-    kMaxAsyncArgs			= 16
-};
-
-enum {
-    kIOAsyncReservedIndex 	= 0,
-    kIOAsyncReservedCount,
-
-    kIOAsyncCalloutFuncIndex 	= kIOAsyncReservedCount,
-    kIOAsyncCalloutRefconIndex,
-    kIOAsyncCalloutCount,
-
-    kIOMatchingCalloutFuncIndex	= kIOAsyncReservedCount,
-    kIOMatchingCalloutRefconIndex,
-    kIOMatchingCalloutCount,
-    
-    kIOInterestCalloutFuncIndex	= kIOAsyncReservedCount,
-    kIOInterestCalloutRefconIndex,
-    kIOInterestCalloutServiceIndex,
-    kIOInterestCalloutCount
-};
-
-
-
-// --------------
-enum {
-    kOSAsyncRef64Count	= 8,
-    kOSAsyncRef64Size 	= kOSAsyncRef64Count * ((int) sizeof(io_user_reference_t))
-};
-typedef io_user_reference_t OSAsyncReference64[kOSAsyncRef64Count];
-
-struct OSNotificationHeader64 {
-    mach_msg_size_t	size;		/* content size */
-    natural_t		type;
-    OSAsyncReference64	reference;
-
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-    unsigned char	content[];
-#else
-    unsigned char	content[0];
-#endif
-};
-
-#pragma pack(4)
-struct IOServiceInterestContent64 {
-    natural_t		messageType;
-    io_user_reference_t	messageArgument[1];
-};
-#pragma pack()
-// --------------
-
-#if !KERNEL_USER32
-
-enum {
-    kOSAsyncRefCount	= 8,
-    kOSAsyncRefSize 	= 32
-};
-typedef natural_t OSAsyncReference[kOSAsyncRefCount];
-
-struct OSNotificationHeader {
-    mach_msg_size_t	size;		/* content size */
-    natural_t		type;
-    OSAsyncReference	reference;
-
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-    unsigned char	content[];
-#else
-    unsigned char	content[0];
-#endif
-};
-
-#pragma pack(4)
-struct IOServiceInterestContent {
-    natural_t	messageType;
-    void *	messageArgument[1];
-};
-#pragma pack()
-
-#endif /* KERNEL_USER32  */
-
-struct IOAsyncCompletionContent {
-    IOReturn result;
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-    void * args[] __attribute__ ((packed));
-#else
-    void * args[0] __attribute__ ((packed));
-#endif
-};
-
-#ifndef __cplusplus
-typedef struct OSNotificationHeader OSNotificationHeader;
-typedef struct IOServiceInterestContent IOServiceInterestContent;
-typedef struct IOAsyncCompletionContent IOAsyncCompletionContent;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*  __OS_OSMESSAGENOTIFICATION_H */
-
diff --git a/i386/include/IOKit/assert.h b/i386/include/IOKit/assert.h
deleted file mode 100644
index 4c56050..0000000
--- a/i386/include/IOKit/assert.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef	_IO_ASSERT_H_
-#define	_IO_ASSERT_H_
-#include <sys/cdefs.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if IOASSERT
-#undef MACH_ASSERT
-#define MACH_ASSERT	1
-#endif
-#include <kern/assert.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#if( !defined( OSCompileAssert ) )
-#	define OSCompileAssert( TEST )     \
-	extern int OSCompileAssertFailed[ ( TEST ) ? 1 : -1 ] __unused;
-#endif
-
-#endif	/* _IO_ASSERT_H_ */
-
diff --git a/i386/include/IOKit/system.h b/i386/include/IOKit/system.h
deleted file mode 100644
index 7092d59..0000000
--- a/i386/include/IOKit/system.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1998-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef __IOKIT_SYSTEM_H
-#define __IOKIT_SYSTEM_H
-
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS
-#endif
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-#include <mach/mach_types.h>
-#include <mach/mach_interface.h>
-#include <mach/memory_object_types.h>
-
-#include <stdarg.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <IOKit/assert.h>  /* Must be before other includes of kern/assert.h */
-
-#include <kern/kern_types.h>
-#include <kern/thread.h>
-#include <kern/debug.h>
-#include <kern/task.h>
-#include <kern/sched_prim.h>
-#include <kern/locks.h>
-#include <kern/queue.h>
-#include <kern/ipc_mig.h>
-#include <libkern/libkern.h>
-
-
-#ifndef	_MISC_PROTOS_H_
-extern void	_doprnt( const char *format, va_list *arg,
-			void (*lputc)(char), int radix );
-#endif
-
-__END_DECLS
-
-#endif /* !__IOKIT_SYSTEM_H */
diff --git a/i386/include/_structs.h b/i386/include/_structs.h
deleted file mode 100644
index 44443b2..0000000
--- a/i386/include/_structs.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#include <sys/_structs.h>
-
diff --git a/i386/include/_types.h b/i386/include/_types.h
deleted file mode 100644
index 6340283..0000000
--- a/i386/include/_types.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, 2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __TYPES_H_
-#define __TYPES_H_
-
-#include <sys/_types.h>
-
-#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-#define __strfmonlike(fmtarg, firstvararg) \
-		__attribute__((__format__ (__strfmon__, fmtarg, firstvararg)))
-#define __strftimelike(fmtarg) \
-		__attribute__((__format__ (__strftime__, fmtarg, 0)))
-#else
-#define __strfmonlike(fmtarg, firstvararg)
-#define __strftimelike(fmtarg)
-#endif
-
-typedef	int		__darwin_nl_item;
-typedef	int		__darwin_wctrans_t;
-#ifdef __LP64__
-typedef	__uint32_t	__darwin_wctype_t;
-#else /* !__LP64__ */
-typedef	unsigned long	__darwin_wctype_t;
-#endif /* __LP64__ */
-
-#ifdef __WCHAR_MAX__
-#define __DARWIN_WCHAR_MAX	__WCHAR_MAX__
-#else /* ! __WCHAR_MAX__ */
-#define __DARWIN_WCHAR_MAX	0x7fffffff
-#endif /* __WCHAR_MAX__ */
-
-#if __DARWIN_WCHAR_MAX > 0xffffU
-#define __DARWIN_WCHAR_MIN	(-0x7fffffff - 1)
-#else
-#define __DARWIN_WCHAR_MIN	0
-#endif
-#define	__DARWIN_WEOF 	((__darwin_wint_t)-1)
-
-#ifndef _FORTIFY_SOURCE
-#  if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1050)
-#    define _FORTIFY_SOURCE 0
-#  else
-#    define _FORTIFY_SOURCE 2	/* on by default */
-#  endif
-#endif
-
-#endif /* __TYPES_H_ */
diff --git a/i386/include/architecture/alignment.h b/i386/include/architecture/alignment.h
deleted file mode 100644
index 3a27fc4..0000000
--- a/i386/include/architecture/alignment.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1999, 2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1996 NeXT Software, Inc.
- *
- * Natural alignment of shorts and longs.
- *
- * HISTORY
- *
- * 2 Sept 1992 Brian Raymor at NeXT
- *	Moved over to architecture.
- * 18 August 1992 Jack Greenfield at NeXT
- *	Created.
- */
- 
-
-#if defined (__ppc__)
-#include "architecture/ppc/alignment.h"
-#elif defined (__i386__)
-#include "architecture/i386/alignment.h"
-#elif defined (__arm__)
-#include "architecture/arm/alignment.h"
-#else
-#error architecture not supported
-#endif
-
-
diff --git a/i386/include/architecture/byte_order.h b/i386/include/architecture/byte_order.h
deleted file mode 100644
index 4542986..0000000
--- a/i386/include/architecture/byte_order.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- * Byte ordering conversion.
- *
- */
-
-#ifndef	_ARCHITECTURE_BYTE_ORDER_H_
-#define _ARCHITECTURE_BYTE_ORDER_H_
-
-#include <libkern/OSByteOrder.h>
-
-
-#endif	/* _ARCHITECTURE_BYTE_ORDER_H_ */
diff --git a/i386/include/architecture/i386/alignment.h b/i386/include/architecture/i386/alignment.h
deleted file mode 100644
index 17dd0ef..0000000
--- a/i386/include/architecture/i386/alignment.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- * Natural alignment of shorts and longs (for i386)
- *
- * HISTORY
- *
- * 2 Sept 1992 Brian Raymor at NeXT
- *      Moved over to architecture.
- * 18 August 1992 Jack Greenfield at NeXT
- *	Created.
- */
-
-#ifndef _ARCH_I386_ALIGNMENT_H_
-#define _ARCH_I386_ALIGNMENT_H_
-
-/*
- * NOP
- */
-__inline__ static unsigned short
-get_align_short(void *ivalue)
-{
-    return *((unsigned short *) ivalue);
-}
-
-__inline__ static unsigned short 
-put_align_short(unsigned short ivalue, void *ovalue)
-{
-    return *((unsigned short *) ovalue) = ivalue;
-}
-
-/*
- * NOP
- */
-__inline__ static unsigned long
-get_align_long(void *ivalue)
-{
-    return *((unsigned long *) ivalue);
-}
-
-__inline__ static unsigned long 
-put_align_long(unsigned long ivalue, void *ovalue)
-{
-    return *((unsigned long *) ovalue) = ivalue;
-}
-
-#endif	/* _ARCH_I386_ALIGNMENT_H_ */
diff --git a/i386/include/architecture/i386/asm_help.h b/i386/include/architecture/i386/asm_help.h
deleted file mode 100644
index 0207c1d..0000000
--- a/i386/include/architecture/i386/asm_help.h
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1991 NeXT Computer, Inc.  All rights reserved.
- *
- *	File:	architecture/i386/asm_help.h
- *	Author:	Mike DeMoney, NeXT Computer, Inc.
- *	Modified for i386 by: Bruce Martin, NeXT Computer, Inc.
- *
- *	This header file defines macros useful when writing assembly code
- *	for the Intel i386 family processors.
- *
- * HISTORY
- * 10-Mar-92  Bruce Martin (bmartin@next.com)
- *	Adapted to i386
- * 23-Jan-91  Mike DeMoney (mike@next.com)
- *	Created.
- */
-
-#ifndef	_ARCH_I386_ASM_HELP_H_
-#define	_ARCH_I386_ASM_HELP_H_
-
-#include	<architecture/i386/reg_help.h>
-
-
-#ifdef	__ASSEMBLER__
-
-#define ALIGN						\
-	.align	2, 0x90
-
-#define	ROUND_TO_STACK(len)				\
-	(((len) + STACK_INCR - 1) / STACK_INCR * STACK_INCR)
-
-#ifdef notdef
-#if defined(__i386__)
-#define CALL_MCOUNT						\
-	pushl	%ebp						;\
-	movl	%esp, %ebp					;\
-	.data							;\
-	1: .long 0						;\
-	.text							;\
-	lea 9b,%edx						;\
-	call mcount						;\
-	popl	%ebp						;
-#elif defined(__x86_64__)
-#define CALL_MCOUNT						\
-	pushq	%rbp						;\
-	movq	%rsp, %rbp					;\
-	.data							;\
-	1: .quad 0						;\
-	.text							;\
-	lea 9b,%r13						;\
-	call mcount						;\
-	popq	%rbp					;
-#endif
-#else
-#define CALL_MCOUNT
-#endif
-
-/*
- * Prologue for functions that may call other functions.  Saves
- * registers and sets up a C frame.
- */
-#if defined(__i386__)
-#define NESTED_FUNCTION_PROLOGUE(localvarsize)			\
-	.set	__framesize,ROUND_TO_STACK(localvarsize)	;\
-	.set	__nested_function, 1				;\
-	CALL_MCOUNT						\
-	.if __framesize						;\
-	  pushl	%ebp						;\
-	  movl	%esp, %ebp					;\
-	  subl	$__framesize, %esp				;\
-	.endif							;\
-	pushl	%edi						;\
-	pushl	%esi						;\
-	pushl	%ebx
-#elif defined(__x86_64__)
-#define NESTED_FUNCTION_PROLOGUE(localvarsize)			\
-	.set	__framesize,ROUND_TO_STACK(localvarsize)	;\
-	.set	__nested_function, 1				;\
-	CALL_MCOUNT						\
-	.if __framesize						;\
-	  pushq	%rbp						;\
-	  movq	%rsp, %rbp					;\
-	  subq	$__framesize, %rsp				;\
-	.endif							;
-#endif
-
-/*
- * Prologue for functions that do not call other functions.  Does not
- * save registers (this is the functions responsibility).  Does set
- * up a C frame.
- */
-#if defined(__i386__)
-#define LEAF_FUNCTION_PROLOGUE(localvarsize)			\
-	.set	__framesize,ROUND_TO_STACK(localvarsize)	;\
-	.set	__nested_function, 0				;\
-	CALL_MCOUNT						\
-	.if __framesize						;\
-	  pushl	%ebp						;\
-	  movl	%esp, %ebp					;\
-	  subl	$__framesize, %esp				;\
-	.endif
-#elif defined(__x86_64__)
-#define LEAF_FUNCTION_PROLOGUE(localvarsize)			\
-	.set	__framesize,ROUND_TO_STACK(localvarsize)	;\
-	.set	__nested_function, 0				;\
-	CALL_MCOUNT						\
-	.if __framesize						;\
-	  pushq	%rbp						;\
-	  movq	%rsp, %rbp					;\
-	  subq	$__framesize, %rsp				;\
-	.endif
-#endif
-
-/*
- * Epilogue for any function.
- *
- * We assume that all Leaf functions will be responsible for saving any
- * local registers they clobber.
- */
-#if defined(__i386__)
-#define FUNCTION_EPILOGUE					\
-	.if __nested_function					;\
-	  popl	%ebx						;\
-	  popl	%esi						;\
-	  popl	%edi						;\
-	.endif							;\
-	.if __framesize						;\
-	  movl	%ebp, %esp					;\
-	  popl	%ebp						;\
-	.endif							;\
-	ret
-#elif defined(__x86_64__)
-#define FUNCTION_EPILOGUE					\
-	.if __framesize						;\
-	  movq	%rbp, %rsp					;\
-	  popq	%rbp						;\
-	.endif							;\
-	ret
-#endif
-
-/*
- * Macros for declaring procedures
- *
- * Use of these macros allows ctags to have a predictable way
- * to find various types of declarations.  They also simplify
- * inserting appropriate symbol table information.
- *
- * NOTE: these simple stubs will be replaced with more
- * complicated versions once we know what the linker and gdb
- * will require as far as register use masks and frame declarations.
- * These macros may also be ifdef'ed in the future to contain profiling
- * code.
- *
- */
-
-/*
- * TEXT -- declare start of text segment
- */
-#define	TEXT						\
-	.text
-
-/*
- * DATA -- declare start of data segment
- */
-#define DATA						\
-	.data
-
-/*
- * LEAF -- declare global leaf procedure
- * NOTE: Control SHOULD NOT FLOW into a LEAF!  A LEAF should only
- * be jumped to.  (A leaf may do an align.)  Use a LABEL() if you
- * need control to flow into the label.
- */
-#define	LEAF(name, localvarsize)			\
-	.globl	name					;\
-	ALIGN						;\
-name:							;\
-	LEAF_FUNCTION_PROLOGUE(localvarsize)
-
-/*
- * X_LEAF -- declare alternate global label for leaf
- */
-#define	X_LEAF(name, value)				\
-	.globl	name					;\
-	.set	name,value
-
-/*
- * P_LEAF -- declare private leaf procedure
- */
-#define	P_LEAF(name, localvarsize)			\
-	ALIGN						;\
-name:							;\
-	LEAF_FUNCTION_PROLOGUE(localvarsize)
-
-/*
- * LABEL -- declare a global code label
- * MUST be used (rather than LEAF, NESTED, etc) if control
- * "flows into" the label.
- */
-#define	LABEL(name)					\
-	.globl	name					;\
-name:
-
-/*
- * NESTED -- declare procedure that invokes other procedures
- */
-#define	NESTED(name, localvarsize)			\
-	.globl	name					;\
-	ALIGN						;\
-name:							;\
-	NESTED_FUNCTION_PROLOGUE(localvarsize)
-
-/*
- * X_NESTED -- declare alternate global label for nested proc
- */
-#define	X_NESTED(name, value)				\
-	.globl	name					;\
-	.set	name,value
-
-/*
- * P_NESTED -- declare private nested procedure
- */
-#define	P_NESTED(name, localvarsize)			\
-	ALIGN						;\
-name:							;\
-	NESTED_FUNCTION_PROLOGUE(localvarsize)
-
-/*
- * END -- mark end of procedure
- */
-#define	END(name)					\
-	FUNCTION_EPILOGUE
-
-
-/*
- * Storage definition macros
- * The main purpose of these is to allow an easy handle for ctags
- */
-
-/*
- * IMPORT -- import symbol
- */
-#define	IMPORT(name)					\
-	.reference	name
-
-/*
- * ABS -- declare global absolute symbol
- */
-#define	ABS(name, value)				\
-	.globl	name					;\
-	.set	name,value
-
-/*
- * P_ABS -- declare private absolute symbol
- */
-#define	P_ABS(name, value)				\
-	.set	name,value
-
-/*
- * EXPORT -- declare global label for data
- */
-#define	EXPORT(name)					\
-	.globl	name					;\
-name:
-
-/*
- * BSS -- declare global zero'ed storage
- */
-#define	BSS(name,size)					\
-	.comm	name,size
-
-
-/*
- * P_BSS -- declare private zero'ed storage
- */
-#define	P_BSS(name,size)				\
-	.lcomm	name,size
-
-/*
- * dynamic/PIC macros for routines which reference external symbols
- */
-
-#if defined(__DYNAMIC__)
-#if defined(__i386__)
-#define PICIFY(var)					\
-	call	1f					; \
-1:							; \
-	popl	%edx					; \
-	movl	L ## var ## __non_lazy_ptr-1b(%edx),%edx
-#elif defined(__x86_64__)
-#define PICIFY(var)					\
-	movq	var@GOTPCREL(%rip),%r11
-#endif
-
-#if defined(__i386__)
-#define CALL_EXTERN_AGAIN(func)	\
-	PICIFY(func)		; \
-	call	*%edx
-#elif defined(__x86_64__)
-#define CALL_EXTERN_AGAIN(func)	\
-	call	func
-#endif
-
-#if defined(__i386__)
-#define NON_LAZY_STUB(var)	\
-.section __IMPORT,__pointers,non_lazy_symbol_pointers	; \
-L ## var ## __non_lazy_ptr:	; \
-.indirect_symbol var		; \
-.long 0				; \
-.text
-#elif defined(__x86_64__)
-#define NON_LAZY_STUB(var)	
-#endif
-
-#define CALL_EXTERN(func)	\
-	CALL_EXTERN_AGAIN(func)	; \
-	NON_LAZY_STUB(func)
-
-#if defined(__i386__)
-#define BRANCH_EXTERN(func)	\
-	PICIFY(func)		; \
-	jmp	*%edx		; \
-	NON_LAZY_STUB(func)
-#elif defined(__x86_64__)
-#define BRANCH_EXTERN(func)	\
-	jmp	func
-#endif
-
-#if defined(__i386__)
-#define PUSH_EXTERN(var)	\
-	PICIFY(var)		; \
-	movl	(%edx),%edx	; \
-	pushl	%edx		; \
-	NON_LAZY_STUB(var)
-#endif
-
-#if defined(__i386__)
-#define REG_TO_EXTERN(reg, var)	\
-	PICIFY(var)		; \
-	movl	reg, (%edx)	; \
-	NON_LAZY_STUB(var)
-#elif defined(__x86_64__)
-#define REG_TO_EXTERN(reg, var)	\
-	PICIFY(var)		; \
-	mov		reg, (%r11)
-#endif
-
-#if defined(__i386__)
-#define EXTERN_TO_REG(var, reg)				\
-	call	1f					; \
-1:							; \
-	popl	%edx					; \
-	movl	L ## var ##__non_lazy_ptr-1b(%edx),reg	; \
-	NON_LAZY_STUB(var)
-#elif defined(__x86_64__)
-#define EXTERN_TO_REG(var, reg)				\
-	PICIFY(var)		; \
-	mov    (%r11), reg
-#endif
-
-#else
-#define BRANCH_EXTERN(func)	jmp	func
-#define PUSH_EXTERN(var)	push	var
-#define CALL_EXTERN(func)	call	func
-#define CALL_EXTERN_AGAIN(func)	call	func
-#if defined(__i386__)
-#define REG_TO_EXTERN(reg, var)	mov	reg, var
-#define EXTERN_TO_REG(var, reg)	mov	$ ## var, reg
-#elif defined(__x86_64__)
-#define REG_TO_EXTERN(reg, var)	mov	reg, var ## (%rip)
-#define EXTERN_TO_REG(var, reg)	mov	var ## (%rip), reg
-#endif
-#endif
-
-#endif	/* __ASSEMBLER__ */
-
-#endif	/* _ARCH_I386_ASM_HELP_H_ */
diff --git a/i386/include/architecture/i386/byte_order.h b/i386/include/architecture/i386/byte_order.h
deleted file mode 100644
index 60afd0f..0000000
--- a/i386/include/architecture/i386/byte_order.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 1999-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _ARCH_I386_BYTE_ORDER_H_
-#define _ARCH_I386_BYTE_ORDER_H_
-
-/*
- * Maintain source compatibility
- */
-
-#include <architecture/byte_order.h>
-
-#endif	/* _ARCH_I386_BYTE_ORDER_H_ */
diff --git a/i386/include/architecture/i386/cpu.h b/i386/include/architecture/i386/cpu.h
deleted file mode 100644
index c5fc807..0000000
--- a/i386/include/architecture/i386/cpu.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- * Intel386 Family:	Special processor registers.
- *
- * HISTORY
- *
- * 5 April 1992 ? at NeXT
- *	Created.
- */
-
-#ifndef _ARCH_I386_CPU_H_
-#define _ARCH_I386_CPU_H_
-
-/*
- * Control register 0
- */
- 
-typedef struct _cr0 {
-    unsigned int	pe	:1,
-    			mp	:1,
-			em	:1,
-			ts	:1,
-				:1,
-			ne	:1,
-				:10,
-			wp	:1,
-				:1,
-			am	:1,
-				:10,
-			nw	:1,
-			cd	:1,
-			pg	:1;
-} cr0_t;
-
-/*
- * Debugging register 6
- */
-
-typedef struct _dr6 {
-    unsigned int	b0	:1,
-    			b1	:1,
-			b2	:1,
-			b3	:1,
-				:9,
-			bd	:1,
-			bs	:1,
-			bt	:1,
-				:16;
-} dr6_t;
-
-#endif	/* _ARCH_I386_CPU_H_ */
diff --git a/i386/include/architecture/i386/desc.h b/i386/include/architecture/i386/desc.h
deleted file mode 100644
index 3997a8a..0000000
--- a/i386/include/architecture/i386/desc.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- * Intel386 Family:	Segment descriptors.
- *
- * HISTORY
- *
- * 29 March 1992 ? at NeXT
- *	Created.
- */
-
-#ifndef _ARCH_I386_DESC_H_
-#define _ARCH_I386_DESC_H_
-
-/*
- * Code segment descriptor.
- */
-
-typedef struct code_desc {
-    unsigned short	limit00;
-    unsigned short	base00;
-    unsigned char	base16;
-    unsigned char	type	:5,
-#define DESC_CODE_EXEC	0x18
-#define DESC_CODE_READ	0x1a
-			dpl	:2,
-			present	:1;
-    unsigned char	limit16	:4,
-				:2,
-			opsz	:1,
-#define DESC_CODE_16B	0
-#define DESC_CODE_32B	1
-			granular:1;
-#define DESC_GRAN_BYTE	0
-#define DESC_GRAN_PAGE	1
-    unsigned char	base24;
-} code_desc_t;
- 
-/*
- * Data segment descriptor.
- */
-
-typedef struct data_desc {
-    unsigned short	limit00;
-    unsigned short	base00;
-    unsigned char	base16;
-    unsigned char	type	:5,
-#define DESC_DATA_RONLY	0x10
-#define DESC_DATA_WRITE	0x12
-			dpl	:2,
-			present	:1;
-    unsigned char	limit16	:4,
-				:2,
-			stksz	:1,
-#define DESC_DATA_16B	0
-#define DESC_DATA_32B	1
-			granular:1;
-    unsigned char	base24;
-} data_desc_t;
-
-/*
- * LDT segment descriptor.
- */
-
-typedef struct ldt_desc {
-    unsigned short	limit00;
-    unsigned short	base00;
-    unsigned char	base16;
-    unsigned char	type	:5,
-#define DESC_LDT	0x02
-				:2,
-			present	:1;
-    unsigned char	limit16	:4,
-				:3,
-			granular:1;
-    unsigned char	base24;
-} ldt_desc_t;
-
-#include <architecture/i386/sel.h>
-
-/*
- * Call gate descriptor.
- */
- 
-typedef struct call_gate {
-    unsigned short	offset00;
-    sel_t		seg;
-    unsigned int	argcnt	:5,
-    				:3,
-			type	:5,
-#define DESC_CALL_GATE	0x0c
-			dpl	:2,
-			present	:1,
-			offset16:16;
-} call_gate_t;
-
-/*
- * Trap gate descriptor.
- */
- 
-typedef struct trap_gate {
-    unsigned short	offset00;
-    sel_t		seg;
-    unsigned int		:8,
-    			type	:5,
-#define DESC_TRAP_GATE	0x0f
-			dpl	:2,
-			present	:1,
-			offset16:16;
-} trap_gate_t;
-
-
-/*
- * Interrupt gate descriptor.
- */
- 
-typedef struct intr_gate {
-    unsigned short	offset00;
-    sel_t		seg;
-    unsigned int		:8,
-    			type	:5,
-#define DESC_INTR_GATE	0x0e
-			dpl	:2,
-			present	:1,
-			offset16:16;
-} intr_gate_t;
-
-#endif	/* _ARCH_I386_DESC_H_ */
diff --git a/i386/include/architecture/i386/fenv.h b/i386/include/architecture/i386/fenv.h
deleted file mode 100644
index 9a50747..0000000
--- a/i386/include/architecture/i386/fenv.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-/*******************************************************************************
-*                                                                              *
-*     File:  fenv.h	                                                       *
-*                                                                              *
-*     Contains: typedefs and prototypes for C99 floating point environment.    *
-*                                                                              *
-*******************************************************************************/
-
-#ifndef __FENV__
-#define __FENV__
-
-#if defined( __ppc__ ) || defined( __ppc64__ )
-    #error  Wrong arch. This is Intel only.
-#endif
-   
-#if defined(__GNUC__) && (__GNUC__ >= 4)   
-#pragma GCC fenv
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-    A collection of functions designed to provide access to the floating
-    point environment for numerical programming. It is compliant with
-    the floating-point requirements in C99.
-    
-    Earlier versions of fenv.h were merely "modeled after" C9X. Many of the functions 
-    that formerly returned ints now return void to be standard compliant.
-    
-    Note: There are actually two physical floating point environments on x86. There
-    is the one described by the x87 floating point control and status words, which applies 
-    primarily to calculations done with long double on MacOS X for Intel. There is the 
-    MXCSR which applies primarily to calculations done with scalar float, scalar double 
-    and SSE/SSE2/SSE3. The high level interface, which uses FE_ macros as int arguments 
-    to configure the fexcep_t, returns and works with values that represents the logical 
-    OR of these two sets of flags or masks. That is, if a flag or mask is set in either 
-    environment, it will be set in fexcept_t when the state is read. Likewise, setting 
-    the mask using a fexcep_t will set that mask on both environments. For this reason, 
-    changing the value of the MXCSR state or floating point control/status word state on 
-    your own will make the results of the functions declared in this header undefined. 
-    See below for details about how and when. Exception: you may change the FZ, DAZ, DE 
-    and DM bits in the MXCSR independent of this interface and retain defined behavior, 
-    so long as you do not change the other bits. It is suggested that developers who wish 
-    this level of control access the bits in the fenv_t directly. They are direct copies 
-    of the hardware special purpose registers of similar name. Please consult appropriate 
-    Intel documentation for the processor about the meaning of various bits in each register. 
-        
-    The file <fenv.h> declares many functions in support of numerical
-    programming. Programs that test flags or run under
-    non-default modes must do so under the effect of an enabling
-    "fenv_access" pragma.
-*/
-
-/********************************************************************************
-*                                                                               *
-*    fenv_t         is a type for representing the entire floating-point        *
-*                   environment in a single object.                             *
-*                                                                               *
-*    fexcept_t      is a type for representing the floating-point               *
-*                   exception flag state collectively.                          *
-*                                                                               *
-********************************************************************************/
-typedef struct {
-    unsigned short  __control;      /* A direct copy of the floaing point control word */
-    unsigned short  __status;       /* A direct copy of the floaing point status word */
-    unsigned int    __mxcsr;        /* A direct copy of the MXCSR */
-    char            __reserved[8];  /* Reserved for future expansion. */   
-} fenv_t;
-
-typedef unsigned short fexcept_t;
-
-/*    Definitions of floating-point exception macros                          */
-#define FE_INEXACT          0x0020
-#define FE_UNDERFLOW        0x0010
-#define FE_OVERFLOW         0x0008
-#define FE_DIVBYZERO        0x0004
-#define FE_INVALID          0x0001
-#define FE_ALL_EXCEPT       0x003D
-
-/*    Definitions of rounding direction macros                                */
-#define FE_TONEAREST        0x0000
-#define FE_DOWNWARD         0x0400
-#define FE_UPWARD           0x0800
-#define FE_TOWARDZERO       0x0C00
-
-/* default environment object        */
-extern const fenv_t _FE_DFL_ENV;
-#define FE_DFL_ENV &_FE_DFL_ENV          /* pointer to default environment    */
-
-/*******************************************************************************
-* A environment object that sets to defualt settings and in addition sets the  *
-* FZ and DAZ bits in the MXCSR, which causes flush-to-zero behavior of         *
-* denormals. When using this environment, denormals encountered by XMM based   *
-* calculation (which normally should be all single and double precision scalar *
-* floating point calculations, and all SSE/SSE2/SSE3 computation) will be      *
-* treated as zero. Calculation results that are denormals will also be         *
-* truncated to zero. This calculation mode is not IEEE-754 compliant, but may  *
-* prevent lengthy stalls that occur in code that encounters denormals. It is   *
-* suggested that you do not use this mode unless you have established that     *
-* denormals are causing trouble for your code. Please use wisely.              *
-*                                                                              *
-* CAUTION: The math library currently is not architected to do the right       *
-* thing in the face of DAZ + FZ mode.  For example, ceil( +denormal) returns   *
-* +denormal rather than 1.0 in some versions of MacOS X. In some circumstances *
-* this may lead to unexpected application behavior. Use at your own risk.      *
-*                                                                              *
-* It is not possible to disable denorm stalls on calculation using the x87 FPU.*
-*******************************************************************************/
-extern const fenv_t _FE_DFL_DISABLE_SSE_DENORMS_ENV;
-#define FE_DFL_DISABLE_SSE_DENORMS_ENV  &_FE_DFL_DISABLE_SSE_DENORMS_ENV
-
-/*******************************************************************************
-*     The following functions provide high level access to the exception flags.*  
-*     The "int" input argument can be constructed by bitwise ORs of the        *
-*     exception macros: for example: FE_OVERFLOW | FE_INEXACT.                 *
-*******************************************************************************/
-
-/*******************************************************************************
-*     The function "feclearexcept" clears the supported floating point         *
-*     exceptions represented by its argument.                                  *
-*******************************************************************************/
-
-extern int  feclearexcept(int /*excepts*/);
-
-
-/*******************************************************************************
-*    The function "fegetexceptflag" stores a implementation-defined            *
-*    representation of the states of the floating-point status flags indicated *
-*    by its integer argument excepts in the object pointed to by the argument, * 
-*    flagp.                                                                    *
-*******************************************************************************/
-
-extern int  fegetexceptflag(fexcept_t * /*flagp*/, int /*excepts*/);
-
-
-/*******************************************************************************
-*     The function "feraiseexcept" raises the supported floating-point         *
-*     exceptions represented by its argument. The order in which these         *
-*     floating-point exceptions are raised is unspecified.                     *
-*******************************************************************************/
-
-extern int  feraiseexcept(int /*excepts*/);
-
-
-/*******************************************************************************
-*     The function "fesetexceptflag" sets or clears the floating point status  *
-*     flags indicated by the argument excepts to the states stored in the      *
-*     object pointed to by flagp. The value of the *flagp shall have been set  *
-*     by a previous call to fegetexceptflag whose second argument represented  *
-*     at least those floating-point exceptions represented by the argument     *
-*     excepts. This function does not raise floating-point exceptions; it just *
-*     sets the state of the flags.                                             *
-*******************************************************************************/
-
-extern int  fesetexceptflag(const fexcept_t * /*flagp*/, int /*excepts*/);
-
-
-/*******************************************************************************
-*     The function "fetestexcept" determines which of the specified subset of  *
-*     the floating-point exception flags are currently set.  The excepts       *
-*     argument specifies the floating-point status flags to be queried. This   *
-*     function returns the value of the bitwise OR of the floating-point       *
-*     exception macros corresponding to the currently set floating-point       *
-*     exceptions included in excepts.                                          *
-*                                                                              *
-*     On MacOS X for Intel, the result is the value of union of the            *
-*     corresponding result from the x87 and SSE floating point states.         *
-*******************************************************************************/
-
-extern int  fetestexcept(int /*excepts*/);
-
-
-/*******************************************************************************
-*     The following functions provide control of rounding direction modes.     *
-*******************************************************************************/
-
-/*******************************************************************************
-*     The function "fegetround" returns the value of the rounding direction    *
-*     macro which represents the current rounding direction, or a negative     *
-*     if there is no such rounding direction macro or the current rounding     *
-*     direction is not determinable.                                           *
-*******************************************************************************/
-
-extern int  fegetround(void);
-
-
-/*******************************************************************************
-*     The function "fesetround" establishes the rounding direction represented *
-*     by its argument "round". If the argument is not equal to the value of a  *
-*     rounding direction macro, the rounding direction is not changed.  It     *
-*     returns zero if and only if the argument is equal to a rounding          *
-*     direction macro.                                                         *
-*******************************************************************************/
-
-extern int  fesetround(int /*round*/);
-
-
-/*******************************************************************************
-*    The following functions manage the floating-point environment, exception  *
-*    flags and dynamic modes, as one entity.                                   *
-*******************************************************************************/
-
-/*******************************************************************************
-*    The fegetenv function stores the current floating-point enviornment in    *
-*    the object pointed to by envp.                                            *
-*******************************************************************************/
-extern int  fegetenv(fenv_t * /*envp*/);
-
-/*******************************************************************************
-*    The feholdexcept function saves the current floating-point environment in *
-*    the object pointed to by envp, clears the floating-point status flags,    *
-*    and then installs a non-stop (continue on floating-point exceptions)      *
-*    mode, if available, for all floating-point exceptions. The feholdexcept   *
-*    function returns zero if and only if non-stop floating-point exceptions   *
-*    handling was successfully installed.                                      *
-*******************************************************************************/
-extern int   feholdexcept(fenv_t * /*envp*/);
-
-/*******************************************************************************
-*    The fesetnv function establishes the floating-point environment           *
-*    represented by the object pointed to by envp. The argument envp shall     *
-*    point to an object set by a call to fegetenv or feholdexcept, or equal to *
-*    a floating-point environment macro -- we define only *FE_DFL_ENV and      *
-*    FE_DISABLE_SSE_DENORMS_ENV -- to be C99 standard compliant and portable   *
-*    to other architectures. Note that fesetnv merely installs the state of    *
-*    the floating-point status flags represented through its argument, and     *
-*    does not raise these floating-point exceptions.                           *
-*                                                                              *
-*    On MacOS X for Intel you may test and set the bits in *envp yourself,     *
-*    provided that you conditionalize the code appropriately to preserve       *
-*    portability and you follow the various strictures and suggestions         *
-*    provided by Intel in appropriate processor documentation. Please be aware *
-*    that because there are two hardware locations for setting and reading     *
-*    floating point environment, this function (and others like it) are not    *
-*    atomic -- that is, for a brief period of time during the function call    *
-*    your new environment will have been applied to one but not both of the    *
-*    floating point engines (x87 and SSE). In addition, the behavior of some   *
-*    higher level interfaces (fegetround) is undefined if the x87 and SSE      *
-*    floating point units rounding modes are configured differently.  Please   *
-*    use common sense.                                                         *
-*******************************************************************************/
-extern int  fesetenv(const fenv_t * /*envp*/);
-
-/*******************************************************************************
-*    The feupdateenv function saves the currently raised floating-point        *
-*    exceptions in its automatic storage, installs the floating-point          *
-*    environment represented by the object pointed to by envp, and then raises *
-*    the saved floating-point exceptions. The argument envp shall point to an  *
-*    object set by a call to feholdexcept or fegetenv or equal a               *
-*    floating-point environment macro.                                         *
-*                                                                              *
-*    Please see the description of feholdexcept for additional ways to create  *
-*    a fenv_t object, which are valid only for MacOS X for Intel.              *
-*******************************************************************************/
-extern int  feupdateenv(const fenv_t * /*envp*/);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __FENV__ */
-
diff --git a/i386/include/architecture/i386/fpu.h b/i386/include/architecture/i386/fpu.h
deleted file mode 100644
index 29c260b..0000000
--- a/i386/include/architecture/i386/fpu.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- * Intel386 Family:	Floating Point unit.
- *
- * HISTORY
- *
- * 5 October 1992 ? at NeXT
- *	Added names to previously unamed fields in the mantissa.
- *
- * 5 April 1992 ? at NeXT
- *	Created.
- */
-
-#ifndef _ARCH_I386_FPU_H_
-#define _ARCH_I386_FPU_H_
-
-/*
- * Data register.
- */
-
-typedef struct fp_data_reg {
-    unsigned short		mant;
-    unsigned short		mant1	:16,
-				mant2	:16,
-				mant3	:16;
-    unsigned short		exp	:15,
-			    	sign	:1;
-} fp_data_reg_t;
-
-/*
- * Data register stack.
- */
-
-typedef struct fp_stack {
-    fp_data_reg_t		ST[8];
-} fp_stack_t;
-
-/*
- * Register stack tag word.
- */
-
-typedef struct fp_tag {
-    unsigned short		tag0	:2,
-    				tag1	:2,
-				tag2	:2,
-				tag3	:2,
-    				tag4	:2,
-				tag5	:2,
-				tag6	:2,
-				tag7	:2;
-#define FP_TAG_VALID		0
-#define FP_TAG_ZERO		1
-#define FP_TAG_SPEC		2
-#define FP_TAG_EMPTY		3
-} fp_tag_t;
-
-/*
- * Status word.
- */
-
-typedef struct fp_status {
-    unsigned short		invalid	:1,
-    				denorm	:1,
-				zdiv	:1,
-				ovrfl	:1,
-				undfl	:1,
-				precis	:1,
-				stkflt	:1,
-				errsumm	:1,
-				c0	:1,
-				c1	:1,
-				c2	:1,
-				tos	:3,
-				c3	:1,
-				busy	:1;
-} fp_status_t;
-
-/*
- * Control word.
- */
-
-typedef struct fp_control {
-    unsigned short		invalid	:1,
-    				denorm	:1,
-				zdiv	:1,
-				ovrfl	:1,
-				undfl	:1,
-				precis	:1,
-					:2,
-				pc	:2,
-#define FP_PREC_24B		0
-#define	FP_PREC_53B		2
-#define FP_PREC_64B		3
-				rc	:2,
-#define FP_RND_NEAR		0
-#define FP_RND_DOWN		1
-#define FP_RND_UP		2
-#define FP_CHOP			3
-				/*inf*/	:1,
-					:3;
-} fp_control_t;
-
-#include <architecture/i386/sel.h>
-
-/*
- * Floating point 'environment'
- * used by FSTENV/FLDENV instructions.
- */
-
-typedef struct fp_env {
-    fp_control_t		control;
-    unsigned short			:16;
-    fp_status_t			status;
-    unsigned short			:16;
-    fp_tag_t			tag;
-    unsigned short			:16;
-    unsigned int		ip;
-    sel_t			cs;
-    unsigned short		opcode;
-    unsigned int		dp;
-    sel_t			ds;
-    unsigned short			:16;
-} fp_env_t;
-
-/*
- * Floating point state
- * used by FSAVE/FRSTOR instructions.
- */
- 
-/*
- * To allow the the common idiom of:
- *     #define environ (*_NSGetEnviron())
- * to be used these fields were renamed.  Old code that that does
- * not use this idiom can use the old field names by defining
- * _ARCHITECTURE_I386_FPU_FPSTATE_LEGACY_FIELD_NAMES_ .
- */
-typedef struct fp_state {
-#if _ARCHITECTURE_I386_FPU_FPSTATE_LEGACY_FIELD_NAMES_
-    fp_env_t			environ;
-    fp_stack_t			stack;
-#else
-    fp_env_t			fp_environ;
-    fp_stack_t			fp_stack;
-#endif
-} fp_state_t;
-
-#endif	/* _ARCH_I386_FPU_H_ */
diff --git a/i386/include/architecture/i386/frame.h b/i386/include/architecture/i386/frame.h
deleted file mode 100644
index 112cbcd..0000000
--- a/i386/include/architecture/i386/frame.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- * Intel386 Family:	Processor exception frame.
- *
- * HISTORY
- *
- * 31 August 1992 ? at NeXT
- *	Added v86 mode stuff.
- *
- * 8 June 1992 ? at NeXT
- *	Changed name of write field in err_code_t
- *	which collided with write() in shlib.
- *
- * 30 March 1992 ? at NeXT
- *	Created.
- */
-
-#ifndef _ARCH_I386_FRAME_H_
-#define _ARCH_I386_FRAME_H_
-
-/*
- * Format of the error code
- * generated by the hardware
- * for certain exceptions.
- */
- 
-typedef union err_code {
-    struct err_code_normal {
-	unsigned int	ext	:1,
-			tbl	:2,
-#define ERR_GDT		0
-#define ERR_IDT		1
-#define ERR_LDT		2
-			index	:13,
-				:16;
-    } normal;
-    struct err_code_pgfault {
-	unsigned int	prot	:1,
-			wrtflt	:1,
-			user	:1,
-				:29;
-    } pgfault;
-} err_code_t;
-
-#include <architecture/i386/sel.h>
-
-/*
- * The actual hardware exception frame
- * is variable in size.  An error code is
- * only pushed for certain exceptions.
- * Previous stack information is only
- * pushed for exceptions that cause a
- * change in privilege level.  The dpl
- * field of the saved CS selector can be
- * used to determine whether this is the
- * case.  If the interrupted task was
- * executing in v86 mode, then the data
- * segment registers are also present in
- * the exception frame (in addition to
- * previous stack information).  This
- * case can be determined by examining
- * eflags.
- */
-
-typedef struct except_frame {
-    err_code_t		err;
-    unsigned int	eip;
-    sel_t		cs;
-    unsigned int		:0;
-    unsigned int	eflags;
-    unsigned int	esp;
-    sel_t		ss;
-    unsigned int		:0;
-    unsigned short	v_es;
-    unsigned int		:0;
-    unsigned short	v_ds;
-    unsigned int		:0;
-    unsigned short	v_fs;
-    unsigned int		:0;
-    unsigned short	v_gs;
-    unsigned int		:0;
-} except_frame_t;
-
-/*
- * Values in eflags.
- */
-
-#define EFL_CF		0x00001
-#define EFL_PF		0x00004
-#define EFL_AF		0x00010
-#define EFL_ZF		0x00040
-#define EFL_SF		0x00080
-#define EFL_TF		0x00100
-#define EFL_IF		0x00200
-#define EFL_DF		0x00400
-#define EFL_OF		0x00800
-#define EFL_IOPL	0x03000
-#define EFL_NT		0x04000
-#define EFL_RF		0x10000
-#define EFL_VM		0x20000
-#define EFL_AC		0x40000
-
-#define EFL_CLR		0xfff88028
-#define EFL_SET		0x00000002
-
-#endif	/* _ARCH_I386_FRAME_H_ */
diff --git a/i386/include/architecture/i386/io.h b/i386/include/architecture/i386/io.h
deleted file mode 100644
index 07021a1..0000000
--- a/i386/include/architecture/i386/io.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- * Intel 386 Family: IO space defines.
- *
- * HISTORY
- *
- * 11 August 1992 ? at NeXT
- *	Created.
- */
-
-#ifndef _ARCH_I386_IO_H_
-#define _ARCH_I386_IO_H_
-
-typedef unsigned short		io_addr_t;
-typedef unsigned short		io_len_t;
-
-#endif	/* _ARCH_I386_IO_H_ */
diff --git a/i386/include/architecture/i386/math.h b/i386/include/architecture/i386/math.h
deleted file mode 100644
index 6723ef4..0000000
--- a/i386/include/architecture/i386/math.h
+++ /dev/null
@@ -1,642 +0,0 @@
-/*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-/*******************************************************************************
-*                                                                              *
-*     File:  math.h	                                                       *
-*                                                                              *
-*     Contains: typedefs, prototypes, and macros germane to C99 floating point.*
-*                                                                              *
-*******************************************************************************/
-#ifndef __MATH__
-#define __MATH__
-
-#include "sys/cdefs.h" /* For definition of __DARWIN_UNIX03 et al */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************
-*       Floating point data types                                             *
-******************************************************************************/
-
-/*	Define float_t and double_t per C standard, ISO/IEC 9899:1999 7.12 2,
-	taking advantage of GCC's __FLT_EVAL_METHOD__ (which a compiler may
-	define anytime and GCC does) that shadows FLT_EVAL_METHOD (which a compiler
-	must and may define only in float.h).
-*/
-#if __FLT_EVAL_METHOD__ == 0
-	typedef float float_t;
-	typedef double double_t;
-#elif __FLT_EVAL_METHOD__ == 1
-	typedef double float_t;
-	typedef double double_t;
-#elif __FLT_EVAL_METHOD__ == 2 || __FLT_EVAL_METHOD__ == -1
-	typedef long double float_t;
-	typedef long double double_t;
-#else /* __FLT_EVAL_METHOD__ */
-	#error "Unsupported value of __FLT_EVAL_METHOD__."
-#endif /* __FLT_EVAL_METHOD__ */
-
-
-#if defined(__GNUC__)
-	#define	HUGE_VAL	__builtin_huge_val()
-	#define	HUGE_VALF	__builtin_huge_valf()
-	#define	HUGE_VALL	__builtin_huge_vall()
-    #define NAN         __builtin_nanf("0x7fc00000") /* Constant expression, can be used as initializer. */
-    #define __MATH_H_ALWAYS_INLINE__		__attribute__ ((always_inline))
-#else
-    #define	HUGE_VAL	1e500
-    #define	HUGE_VALF	1e50f
-    #define	HUGE_VALL	1e5000L
-    #define NAN		__nan( )
-    #define __MATH_H_ALWAYS_INLINE__
-#endif
-
-#define INFINITY	HUGE_VALF
-
-
-/******************************************************************************
-*      Taxonomy of floating point data types                                  *
-******************************************************************************/
-
-#define FP_NAN          1
-#define FP_INFINITE     2
-#define FP_ZERO         3
-#define FP_NORMAL       4
-#define FP_SUBNORMAL    5
-#define FP_SUPERNORMAL  6 /* meaningful only on PowerPC */
-
-/* fma() *function call* is more costly than equivalent (in-line) multiply and add operations    */
-/* For single and double precision, the cost isn't too bad, because we can fall back on higher   */
-/* precision hardware, with the necessary range to handle infinite precision products. However,  */
-/* expect the long double fma to be at least an order of magnitude slower than a simple multiply */
-/* and an add.                                                                                   */
-#undef FP_FAST_FMA
-#undef FP_FAST_FMAF
-#undef FP_FAST_FMAL
-
-/* The values returned by `ilogb' for 0 and NaN respectively. */
-#define FP_ILOGB0	(-2147483647 - 1)
-#define FP_ILOGBNAN	(-2147483647 - 1)
-
-/* Bitmasks for the math_errhandling macro.  */
-#define MATH_ERRNO	1	/* errno set by math functions.  */
-#define MATH_ERREXCEPT	2	/* Exceptions raised by math functions.  */
-
-#define math_errhandling (__math_errhandling())
-extern unsigned int __math_errhandling ( void );
-
-/********************************************************************************
-*                                                                               *
-*                              Inquiry macros                                   *
-*                                                                               *
-*   fpclassify      Returns one of the FP_Å values.                             *
-*   isnormal        Non-zero if and only if the argument x is normalized.       *
-*   isfinite        Non-zero if and only if the argument x is finite.           *
-*   isnan           Non-zero if and only if the argument x is a NaN.            *
-*   signbit         Non-zero if and only if the sign of the argument x is       *
-*                   negative.  This includes, NaNs, infinities and zeros.       *
-*                                                                               *
-********************************************************************************/
-
-#define fpclassify(x)	\
-	(	sizeof (x) == sizeof(float )	?	__fpclassifyf((float)(x))	\
-	:	sizeof (x) == sizeof(double)	?	__fpclassifyd((double)(x))	\
-										:	__fpclassify ((long double)(x)))
-
-extern int __fpclassifyf(float      );
-extern int __fpclassifyd(double     );
-extern int __fpclassify (long double);
-
-#if defined( __GNUC__ ) && 0 == __FINITE_MATH_ONLY__ 
-    /*  Yes, that's right. You only get the fast iswhatever() macros if you do NOT turn on -ffast-math.  */
-    /*  These inline functions require the compiler to be compiling to standard in order to work.        */
-    /*  -ffast-math, among other things, implies that NaNs don't happen. The compiler can in that case   */
-    /*  optimize x != x to be false always, wheras it would be true for NaNs. That breaks __inline_isnan() */
-    /*  below.                                                                                           */
-	#define isnormal(x)	\
-		(	sizeof (x) == sizeof(float )	?	__inline_isnormalf((float)(x))	\
-		:	sizeof (x) == sizeof(double)	?	__inline_isnormald((double)(x))	\
-											:	__inline_isnormal ((long double)(x)))
-
-	#define isfinite(x)	\
-		(	sizeof (x) == sizeof(float )	?	__inline_isfinitef((float)(x))	\
-		:	sizeof (x) == sizeof(double)	?	__inline_isfinited((double)(x))	\
-											:	__inline_isfinite ((long double)(x)))
-
-	#define isinf(x)	\
-		(	sizeof (x) == sizeof(float )	?	__inline_isinff((float)(x))	\
-		:	sizeof (x) == sizeof(double)	?	__inline_isinfd((double)(x))	\
-											:	__inline_isinf ((long double)(x)))
-
-	#define isnan(x)	\
-		(	sizeof (x) == sizeof(float )	?	__inline_isnanf((float)(x))	\
-		:	sizeof (x) == sizeof(double)	?	__inline_isnand((double)(x))	\
-											:	__inline_isnan ((long double)(x)))
-
-	#define signbit(x)	\
-		(	sizeof (x) == sizeof(float )	?	__inline_signbitf((float)(x))	\
-		:	sizeof (x) == sizeof(double)	?	__inline_signbitd((double)(x))	\
-											:	__inline_signbit((long double)(x)))
-
-	static __inline__  int __inline_isfinitef	(float      ) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isfinited	(double     ) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isfinite	(long double) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isinff		(float      ) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isinfd		(double     ) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isinf		(long double) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isnanf		(float      ) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isnand		(double     ) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isnan		(long double) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isnormalf    (float      ) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isnormald    (double     ) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_isnormal     (long double) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_signbitf     (float      ) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_signbitd     (double     ) __MATH_H_ALWAYS_INLINE__;
-	static __inline__  int __inline_signbit      (long double) __MATH_H_ALWAYS_INLINE__;
-	
-	static __inline__  int __inline_isinff( float __x ) { return __builtin_fabsf(__x) == __builtin_inff(); }
-	static __inline__  int __inline_isinfd( double __x ) { return __builtin_fabs(__x) == __builtin_inf(); }
-	static __inline__  int __inline_isinf( long double __x ) { return __builtin_fabsl(__x) == __builtin_infl(); }
-	static __inline__  int __inline_isfinitef( float __x ) { return __x == __x && __builtin_fabsf(__x) != __builtin_inff(); }
-	static __inline__  int __inline_isfinited( double __x ) { return __x == __x && __builtin_fabs(__x) != __builtin_inf(); }
-	static __inline__  int __inline_isfinite( long double __x ) { return __x == __x && __builtin_fabsl(__x) != __builtin_infl(); }
-	static __inline__  int __inline_isnanf( float __x ) { return __x != __x; }
-	static __inline__  int __inline_isnand( double __x ) { return __x != __x; }
-	static __inline__  int __inline_isnan( long double __x ) { return __x != __x; }
-	static __inline__  int __inline_signbitf( float __x ) { union{ float __f; unsigned int __u; }__u; __u.__f = __x; return (int)(__u.__u >> 31); }
-	static __inline__  int __inline_signbitd( double __x ) { union{ double __f; unsigned int __u[2]; }__u; __u.__f = __x; return (int)(__u.__u[1] >> 31); }
-	static __inline__  int __inline_signbit( long double __x ){ union{ long double __ld; struct{ unsigned int __m[2]; short __sexp; }__p; }__u; __u.__ld = __x; return (int) (((unsigned short) __u.__p.__sexp) >> 15); } 
-	static __inline__  int __inline_isnormalf( float __x ) { float fabsf = __builtin_fabsf(__x); if( __x != __x ) return 0; return fabsf < __builtin_inff() && fabsf >= __FLT_MIN__; }  
-	static __inline__  int __inline_isnormald( double __x ) { double fabsf = __builtin_fabs(__x); if( __x != __x ) return 0; return fabsf < __builtin_inf() && fabsf >= __DBL_MIN__; }  
-	static __inline__  int __inline_isnormal( long double __x ) { long double fabsf = __builtin_fabsl(__x); if( __x != __x ) return 0; return fabsf < __builtin_infl() && fabsf >= __LDBL_MIN__; }  
-	
-#else
-
-	#define isnormal(x)	\
-		(	sizeof (x) == sizeof(float )	?	__isnormalf((float)(x))	\
-		:	sizeof (x) == sizeof(double)	?	__isnormald((double)(x))	\
-											:	__isnormal ((long double)(x)))
-
-	#define isfinite(x)	\
-		(	sizeof (x) == sizeof(float )	?	__isfinitef((float)(x))	\
-		:	sizeof (x) == sizeof(double)	?	__isfinited((double)(x))	\
-											:	__isfinite ((long double)(x)))
-
-	#define isinf(x)	\
-		(	sizeof (x) == sizeof(float )	?	__isinff((float)(x))	\
-		:	sizeof (x) == sizeof(double)	?	__isinfd((double)(x))	\
-											:	__isinf ((long double)(x)))
-
-	#define isnan(x)	\
-		(	sizeof (x) == sizeof(float )	?	__isnanf((float)(x))	\
-		:	sizeof (x) == sizeof(double)	?	__isnand((double)(x))	\
-											:	__isnan ((long double)(x)))
-
-	#define signbit(x)	\
-		(	sizeof (x) == sizeof(float )	?	__signbitf((float)(x))	\
-		:	sizeof (x) == sizeof(double)	?	__signbitd((double)(x))	\
-											:	__signbitl((long double)(x)))
-
-
-	extern int __isnormalf  (float      );
-	extern int __isnormald  (double     );
-	extern int __isnormal   (long double);
-
-	extern int __isfinitef  (float      );
-	extern int __isfinited  (double     );
-	extern int __isfinite   (long double);
-
-	extern int __isinff     (float      );
-	extern int __isinfd     (double     );
-	extern int __isinf      (long double);
-
-	extern int __isnanf     (float      );
-	extern int __isnand     (double     );
-	extern int __isnan      (long double);
-
-	extern int __signbitf   (float      );
-	extern int __signbitd   (double     );
-	extern int __signbitl   (long double);
-
-#endif
-
-
-
-/********************************************************************************
-*                                                                               *
-*                              Math Functions                                   *
-*                                                                               *
-********************************************************************************/
-
-extern double  acos( double );
-extern float  acosf( float );
-
-extern double  asin( double );
-extern float  asinf( float );
-
-extern double  atan( double );
-extern float  atanf( float );
-
-extern double  atan2( double, double );
-extern float  atan2f( float, float );
-
-extern double  cos( double );
-extern float  cosf( float );
-
-extern double  sin( double );
-extern float  sinf( float );
-
-extern double  tan( double );
-extern float  tanf( float );
-
-extern double  acosh( double );
-extern float  acoshf( float );
-
-extern double  asinh( double );
-extern float  asinhf( float );
-
-extern double  atanh( double );
-extern float  atanhf( float );
-
-extern double  cosh( double );
-extern float  coshf( float );
-
-extern double  sinh( double );
-extern float  sinhf( float );
-
-extern double  tanh( double );
-extern float  tanhf( float );
-
-extern double exp ( double );
-extern float expf ( float );
-
-extern double exp2 ( double ); 
-extern float exp2f ( float );
-
-extern double expm1 ( double ); 
-extern float expm1f ( float );
-
-extern double log ( double );
-extern float logf ( float );
-
-extern double log10 ( double );
-extern float log10f ( float );
-
-extern double log2 ( double );
-extern float log2f ( float );
-
-extern double log1p ( double );
-extern float log1pf ( float );
-
-extern double logb ( double );
-extern float logbf ( float );
-
-extern double modf ( double, double * );
-extern float modff ( float, float * );
-
-extern double ldexp ( double, int );
-extern float ldexpf ( float, int );
-
-extern double frexp ( double, int * );
-extern float frexpf ( float, int * );
-
-extern int ilogb ( double );
-extern int ilogbf ( float );
-
-extern double scalbn ( double, int );
-extern float scalbnf ( float, int );
-
-extern double scalbln ( double, long int );
-extern float scalblnf ( float, long int );
-
-extern double  fabs( double );
-extern float  fabsf( float );
-
-extern double  cbrt( double );
-extern float  cbrtf( float );
-
-extern double hypot ( double, double );
-extern float hypotf ( float, float );
-
-extern double pow ( double, double );
-extern float powf ( float, float );
-
-extern double  sqrt( double );
-extern float  sqrtf( float );
-
-extern double  erf( double );
-extern float  erff( float );
-
-extern double  erfc( double );
-extern float  erfcf( float );
-
-/*	lgamma and lgammaf are not thread-safe.  The thread-safe variants
- *	lgamma_r and lgammaf_r are available on OS X 10.6 and later.
- *
- *	To use the thread-safe variants, you must define the _REENTRANT symbol.
- */
-extern double  lgamma( double );
-extern float  lgammaf( float );
-
-extern double  tgamma( double );
-extern float  tgammaf( float );
-
-extern double ceil ( double );
-extern float ceilf ( float );
-
-extern double floor ( double );
-extern float floorf ( float );
-
-extern double nearbyint ( double );
-extern float nearbyintf ( float );
-
-extern double rint ( double );
-extern float rintf ( float );
-
-extern long int lrint ( double );
-extern long int lrintf ( float );
-
-extern double round ( double );
-extern float roundf ( float );
-
-extern long int lround ( double );
-extern long int lroundf ( float );
-
-#if ( defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ) || ! defined( __STRICT_ANSI__ )  || ! defined( __GNUC__ )
-
-    /* long long is not part of C90. Make sure you are passing -std=c99 or -std=gnu99 or better if you need this. */
-    extern long long int llrint ( double );
-    extern long long int llrintf ( float );
-
-    extern long long int llround ( double );
-    extern long long int llroundf ( float );
-
-#endif /* #if ( defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ) || ! defined( __STRICT_ANSI__ )  || ! defined( __GNUC__ ) */
-
-extern double trunc ( double );
-extern float truncf ( float );
-
-extern double fmod ( double, double );
-extern float fmodf ( float, float );
-
-extern double remainder ( double, double );
-extern float remainderf ( float, float );
-
-extern double remquo ( double, double, int * );
-extern float remquof ( float, float, int * );
-
-extern double copysign ( double, double );
-extern float copysignf ( float, float );
-
-extern double nan( const char * );
-extern float nanf( const char * );
-
-extern double nextafter ( double, double );
-extern float nextafterf ( float, float );
-
-extern double fdim ( double, double );
-extern float fdimf ( float, float );
-
-extern double fmax ( double, double );
-extern float fmaxf ( float, float );
-
-extern double fmin ( double, double );
-extern float fminf ( float, float );
-
-extern double fma ( double, double, double );
-extern float fmaf ( float, float, float );
-
-extern long double acosl(long double);
-extern long double asinl(long double);
-extern long double atanl(long double);
-extern long double atan2l(long double, long double);
-extern long double cosl(long double);
-extern long double sinl(long double);
-extern long double tanl(long double);
-extern long double acoshl(long double);
-extern long double asinhl(long double);
-extern long double atanhl(long double);
-extern long double coshl(long double);
-extern long double sinhl(long double);
-extern long double tanhl(long double);
-extern long double expl(long double);
-extern long double exp2l(long double);
-extern long double expm1l(long double);
-extern long double logl(long double);
-extern long double log10l(long double);
-extern long double log2l(long double);
-extern long double log1pl(long double);
-extern long double logbl(long double);
-extern long double modfl(long double, long double *);
-extern long double ldexpl(long double, int);
-extern long double frexpl(long double, int *);
-extern int ilogbl(long double);
-extern long double scalbnl(long double, int);
-extern long double scalblnl(long double, long int);
-extern long double fabsl(long double);
-extern long double cbrtl(long double);
-extern long double hypotl(long double, long double);
-extern long double powl(long double, long double);
-extern long double sqrtl(long double);
-extern long double erfl(long double);
-extern long double erfcl(long double);
-	
-/*	lgammal is not thread-safe.
- *	The thread-safe variant lgammal_r is available on OS X 10.6 and later.
- *
- *	To use the thread-safe variant, you must define the _REENTRANT symbol.
- */
-extern long double lgammal(long double);
-	
-extern long double tgammal(long double);
-extern long double ceill(long double);
-extern long double floorl(long double);
-extern long double nearbyintl(long double);
-extern long double rintl(long double);
-extern long int lrintl(long double);
-extern long double roundl(long double);
-extern long int lroundl(long double);
-
-#if ( defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ) || ! defined( __STRICT_ANSI__ )  || ! defined( __GNUC__ )
-    /* long long is not part of C90. Make sure you are passing -std=c99 or -std=gnu99 or better if you need this. */
-    extern long long int llrintl(long double);
-    extern long long int llroundl(long double);
-#endif /* #if ( defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L ) || ! defined( __STRICT_ANSI__ )  || ! defined( __GNUC__ ) */
-
-extern long double truncl(long double);
-extern long double fmodl(long double, long double);
-extern long double remainderl(long double, long double);
-extern long double remquol(long double, long double, int *);
-extern long double copysignl(long double, long double);
-extern long double nanl(const char *);
-extern long double nextafterl(long double, long double);
-extern double nexttoward(double, long double);
-extern float nexttowardf(float, long double);
-extern long double nexttowardl(long double, long double);
-extern long double fdiml(long double, long double);
-extern long double fmaxl(long double, long double);
-extern long double fminl(long double, long double);
-extern long double fmal(long double, long double, long double);
-
-#define isgreater(x, y) __builtin_isgreater ((x),(y))
-#define isgreaterequal(x, y) __builtin_isgreaterequal ((x),(y))
-#define isless(x, y) __builtin_isless ((x),(y))
-#define islessequal(x, y) __builtin_islessequal ((x),(y))
-#define islessgreater(x, y) __builtin_islessgreater ((x),(y))
-#define isunordered(x, y) __builtin_isunordered ((x),(y))
-
-extern double  		__inf( void );
-extern float  		__inff( void );
-extern long double  __infl( void );
-extern float  		__nan( void ); /* 10.3 (and later) must retain in ABI for backward compatability */
-
-#if !defined(_ANSI_SOURCE)
-extern double j0 ( double );
-
-extern double j1 ( double );
-
-extern double jn ( int, double );
-
-extern double y0 ( double );
-
-extern double y1 ( double );
-
-extern double yn ( int, double );
-
-extern double scalb ( double, double ); 
-
-
-#define M_E         2.71828182845904523536028747135266250   /* e */
-#define M_LOG2E     1.44269504088896340735992468100189214   /* log 2e */
-#define M_LOG10E    0.434294481903251827651128918916605082  /* log 10e */
-#define M_LN2       0.693147180559945309417232121458176568  /* log e2 */
-#define M_LN10      2.30258509299404568401799145468436421   /* log e10 */
-#define M_PI        3.14159265358979323846264338327950288   /* pi */
-#define M_PI_2      1.57079632679489661923132169163975144   /* pi/2 */
-#define M_PI_4      0.785398163397448309615660845819875721  /* pi/4 */
-#define M_1_PI      0.318309886183790671537767526745028724  /* 1/pi */
-#define M_2_PI      0.636619772367581343075535053490057448  /* 2/pi */
-#define M_2_SQRTPI  1.12837916709551257389615890312154517   /* 2/sqrt(pi) */
-#define M_SQRT2     1.41421356237309504880168872420969808   /* sqrt(2) */
-#define M_SQRT1_2   0.707106781186547524400844362104849039  /* 1/sqrt(2) */
-
-#define	MAXFLOAT	((float)3.40282346638528860e+38)
-extern int signgam;     /* required for unix 2003 */
-
-
-#endif /* !defined(_ANSI_SOURCE) */
-
-#if !defined(__NOEXTENSIONS__) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-#define __WANT_EXTENSIONS__
-#endif
-
-#ifdef __WANT_EXTENSIONS__
-
-#define FP_SNAN		FP_NAN
-#define FP_QNAN		FP_NAN
-
-extern long int rinttol ( double );		/* Legacy API: please use C99 lrint() instead. */
-
-extern long int roundtol ( double );	/* Legacy API: please use C99 lround() instead. */
-
-/*
- * XOPEN/SVID
- */
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-#if (!defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE))
-#if !defined(__cplusplus)
-/* used by matherr below */
-struct exception {
-	int type;
-	char *name;
-	double arg1;
-	double arg2;
-	double retval;
-};
-#endif
-
-#define	HUGE		MAXFLOAT
-
-/* 
- * set X_TLOSS = pi*2**52, which is possibly defined in <values.h>
- * (one may replace the following line by "#include <values.h>")
- */
-
-#define X_TLOSS		1.41484755040568800000e+16 
-
-#define	DOMAIN		1
-#define	SING		2
-#define	OVERFLOW	3
-#define	UNDERFLOW	4
-#define	TLOSS		5
-#define	PLOSS		6
-
-#endif /* (!_XOPEN_SOURCE || _DARWIN_C_SOURCE) */
-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-#if !defined( __STRICT_ANSI__) && !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-extern int finite ( double );			/* Legacy API: please use C99 isfinite() instead. */
-
-extern double gamma ( double );			/* Legacy API: please use C99 tgamma() instead. */
-
-#if (!defined(_XOPEN_SOURCE) || defined(_DARWIN_C_SOURCE))
-
-#if !defined(__cplusplus)
-extern int matherr ( struct exception * );
-#endif
-
-/*
- * IEEE Test Vector
- */
-extern double significand ( double );
-
-/*
- * BSD math library entry points
- */
-extern double drem ( double, double );	/* Legacy API: please use C99 remainder() instead. */
-	
-/*
- * Reentrant version of lgamma; passes signgam back by reference
- * as the second argument; user must allocate space for signgam.
- */
-	
-#ifdef _REENTRANT
-	#include <AvailabilityMacros.h>
-	// Available on OS X 10.6 and later.
-	extern float  lgammaf_r ( float, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER;
-	extern double lgamma_r ( double, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER;
-	extern long double lgammal_r ( long double, int * ) AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER;
-#endif /* _REENTRANT */
-	
-#endif /* (!_XOPEN_SOURCE || _DARWIN_C_SOURCE) */
-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-#endif /* __WANT_EXTENSIONS__ */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MATH__ */
diff --git a/i386/include/architecture/i386/pio.h b/i386/include/architecture/i386/pio.h
deleted file mode 100644
index 338f158..0000000
--- a/i386/include/architecture/i386/pio.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/* 
- */
-#ifndef _ARCH_I386_PIO_H_
-#define _ARCH_I386_PIO_H_
-
-typedef unsigned short i386_ioport_t;
-
-#if defined(__GNUC__)
-static __inline__ unsigned long	inl(
-				i386_ioport_t port)
-{
-	unsigned long datum;
-	__asm__ volatile("inl %w1, %0" : "=a" (datum) : "Nd" (port));
-	return(datum);
-}
-
-static __inline__ unsigned short inw(
-				i386_ioport_t port)
-{
-	unsigned short datum;
-	__asm__ volatile("inw %w1, %w0" : "=a" (datum) : "Nd" (port));
-	return(datum);
-}
-
-static __inline__ unsigned char inb(
-				i386_ioport_t port)
-{
-	unsigned char datum;
-	__asm__ volatile("inb %w1, %b0" : "=a" (datum) : "Nd" (port));
-	return(datum);
-}
-
-static __inline__ void outl(
-				i386_ioport_t port,
-				unsigned long datum)
-{
-	__asm__ volatile("outl %0, %w1" : : "a" (datum), "Nd" (port));
-}
-
-static __inline__ void outw(
-				i386_ioport_t port,
-				unsigned short datum)
-{
-	__asm__ volatile("outw %w0, %w1" : : "a" (datum), "Nd" (port));
-}
-
-static __inline__ void outb(
-				i386_ioport_t port,
-				unsigned char datum)
-{
-	__asm__ volatile("outb %b0, %w1" : : "a" (datum), "Nd" (port));
-}
-#endif /* defined(__GNUC__) */
-#endif /* _ARCH_I386_PIO_H_ */
diff --git a/i386/include/architecture/i386/reg_help.h b/i386/include/architecture/i386/reg_help.h
deleted file mode 100644
index 98c18c5..0000000
--- a/i386/include/architecture/i386/reg_help.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1991 NeXT Computer, Inc.  All rights reserved.
- *
- *	File:	architecture/i386/reg_help.h
- *	Author:	Mike DeMoney, NeXT Computer, Inc.
- *      Modified for i386 by: Bruce Martin, NeXT Computer, Inc.
- *
- *	This header file defines cpp macros useful for defining
- *	machine register and doing machine-level operations.
- *
- * HISTORY
- * 10-Mar-92  Bruce Martin (bmartin@next.com)
- *	Adapted to i386
- * 23-Jan-91  Mike DeMoney (mike@next.com)
- *	Created.
- */
-
-#ifndef	_ARCH_I386_REG_HELP_H_
-#define	_ARCH_I386_REG_HELP_H_
-
-/* Bitfield definition aid */
-#define	BITS_WIDTH(msb, lsb)	((msb)-(lsb)+1)
-#define	BIT_WIDTH(pos)		(1)	/* mostly to record the position */
-
-/* Mask creation */
-#define	MKMASK(width, offset)	(((unsigned)-1)>>(32-(width))<<(offset))
-#define	BITSMASK(msb, lsb)	MKMASK(BITS_WIDTH(msb, lsb), lsb & 0x1f)
-#define	BITMASK(pos)		MKMASK(BIT_WIDTH(pos), pos & 0x1f)
-
-/* Register addresses */
-#if	__ASSEMBLER__
-# define	REG_ADDR(type, addr)	(addr)
-#else	/* __ASSEMBLER__ */
-# define	REG_ADDR(type, addr)	(*(volatile type *)(addr))
-#endif	/* __ASSEMBLER__ */
-
-/* Cast a register to be an unsigned */
-#define	CONTENTS(foo)	(*(unsigned *) &(foo))
-
-/* Stack pointer must always be a multiple of 4 */
-#define	STACK_INCR	4
-#define	ROUND_FRAME(x)	((((unsigned)(x)) + STACK_INCR - 1) & ~(STACK_INCR-1))
-
-/* STRINGIFY -- perform all possible substitutions, then stringify */
-#define	__STR(x)	#x		/* just a helper macro */
-#define	STRINGIFY(x)	__STR(x)
-
-/*
- * REG_PAIR_DEF -- define a register pair
- * Register pairs are appropriately aligned to allow access via
- * ld.d and st.d.
- *
- * Usage:
- *	struct foo {
- *		REG_PAIR_DEF(
- *			bar_t *,	barp,
- *			afu_t,		afu
- *		);
- *	};
- *
- * Access to individual entries of the pair is via the REG_PAIR
- * macro (below).
- */
-#define	REG_PAIR_DEF(type0, name0, type1, name1)		\
-	struct {						\
-		type0	name0 __attribute__(( aligned(8) ));	\
-		type1	name1;					\
-	} name0##_##name1
-
-/*
- * REG_PAIR -- Macro to define names for accessing individual registers
- * of register pairs.
- *
- * Usage:
- *	arg0 is first element of pair
- *	arg1 is second element of pair
- *	arg2 is desired element of pair
- * eg:
- *	#define	foo_barp	REG_PAIR(barp, afu, afu)
- */
-#define	REG_PAIR(name0, name1, the_name)			\
-	name0##_##name1.the_name
-
-#endif	/* _ARCH_I386_REG_HELP_H_ */
diff --git a/i386/include/architecture/i386/sel.h b/i386/include/architecture/i386/sel.h
deleted file mode 100644
index 80cb516..0000000
--- a/i386/include/architecture/i386/sel.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- * Intel386 Family:	Segment selector.
- *
- * HISTORY
- *
- * 29 March 1992 ? at NeXT
- *	Created.
- */
-
-#ifndef	_ARCH_I386_SEL_H_
-#define	_ARCH_I386_SEL_H_
-
-/*
- * Segment selector.
- */
-
-typedef struct sel {
-    unsigned short	rpl	:2,
-#define KERN_PRIV	0
-#define USER_PRIV	3
-			ti	:1,
-#define SEL_GDT		0
-#define SEL_LDT		1
-			index	:13;
-} sel_t;
-
-#define NULL_SEL	((sel_t) { 0, 0, 0 } )
-
-#endif	/* _ARCH_I386_SEL_H_ */
diff --git a/i386/include/architecture/i386/table.h b/i386/include/architecture/i386/table.h
deleted file mode 100644
index 3ce1f81..0000000
--- a/i386/include/architecture/i386/table.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- * Intel386 Family:	Descriptor tables.
- *
- * HISTORY
- *
- * 30 March 1992 ? at NeXT
- *	Created.
- */
-
-#ifndef _ARCH_I386_TABLE_H_
-#define _ARCH_I386_TABLE_H_
-
-#include <architecture/i386/desc.h>
-#include <architecture/i386/tss.h>
-
-/*
- * A totally generic descriptor
- * table entry.
- */
-
-typedef union dt_entry {
-    code_desc_t		code;
-    data_desc_t		data;
-    ldt_desc_t		ldt;
-    tss_desc_t		task_state;
-    call_gate_t		call_gate;
-    trap_gate_t		trap_gate;
-    intr_gate_t		intr_gate;
-    task_gate_t		task_gate;
-} dt_entry_t;
-
-#define DESC_TBL_MAX	8192
-
-/*
- * Global descriptor table.
- */
-
-typedef union gdt_entry {
-    code_desc_t		code;
-    data_desc_t		data;
-    ldt_desc_t		ldt;
-    call_gate_t		call_gate;
-    task_gate_t		task_gate;
-    tss_desc_t		task_state;
-} gdt_entry_t;
-
-typedef gdt_entry_t	gdt_t;
-
-/*
- * Interrupt descriptor table.
- */
-
-typedef union idt_entry {
-    trap_gate_t		trap_gate;
-    intr_gate_t		intr_gate;
-    task_gate_t		task_gate;
-} idt_entry_t;
-
-typedef idt_entry_t	idt_t;
-
-/*
- * Local descriptor table.
- */
-
-typedef union ldt_entry {
-    code_desc_t		code;
-    data_desc_t		data;
-    call_gate_t		call_gate;
-    task_gate_t		task_gate;
-} ldt_entry_t;
-
-typedef ldt_entry_t	ldt_t;
-
-#endif	/* _ARCH_I386_TABLE_H_ */
diff --git a/i386/include/architecture/i386/tss.h b/i386/include/architecture/i386/tss.h
deleted file mode 100644
index 7f060ec..0000000
--- a/i386/include/architecture/i386/tss.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- * Intel386 Family:	Task State Segment.
- *
- * HISTORY
- *
- * 29 March 1992 ? at NeXT
- *	Created.
- */
-
-#ifndef _ARCH_I386_TSS_H_
-#define _ARCH_I386_TSS_H_
-
-#include <architecture/i386/sel.h>
-
-/*
- * Task State segment.
- */
-
-typedef struct tss {
-    sel_t		oldtss;
-    unsigned int		:0;
-    unsigned int	esp0;
-    sel_t		ss0;
-    unsigned int		:0;
-    unsigned int	esp1;
-    sel_t		ss1;
-    unsigned int		:0;
-    unsigned int	esp2;
-    sel_t		ss2;
-    unsigned int		:0;
-    unsigned int	cr3;
-    unsigned int	eip;
-    unsigned int	eflags;
-    unsigned int	eax;
-    unsigned int	ecx;
-    unsigned int	edx;
-    unsigned int	ebx;
-    unsigned int	esp;
-    unsigned int	ebp;
-    unsigned int	esi;
-    unsigned int	edi;
-    sel_t		es;
-    unsigned int		:0;
-    sel_t		cs;
-    unsigned int		:0;
-    sel_t		ss;
-    unsigned int		:0;
-    sel_t		ds;
-    unsigned int		:0;
-    sel_t		fs;
-    unsigned int		:0;
-    sel_t		gs;
-    unsigned int		:0;
-    sel_t		ldt;
-    unsigned int		:0;
-    unsigned int	t	:1,
-    				:15,
-			io_bmap	:16;
-} tss_t;
-
-#define TSS_SIZE(n)	(sizeof (struct tss) + (n))
-
-/*
- * Task State segment descriptor.
- */
-
-typedef struct tss_desc {
-    unsigned short	limit00;
-    unsigned short	base00;
-    unsigned char	base16;
-    unsigned char	type	:5,
-#define DESC_TSS	0x09
-			dpl	:2,
-			present	:1;
-    unsigned char	limit16	:4,
-				:3,
-			granular:1;
-    unsigned char	base24;
-} tss_desc_t;
-
-/*
- * Task gate descriptor.
- */
- 
-typedef struct task_gate {
-    unsigned short		:16;
-    sel_t		tss;
-    unsigned int		:8,
-    			type	:5,
-#define DESC_TASK_GATE	0x05
-			dpl	:2,
-			present	:1,
-				:0;
-} task_gate_t;
-
-#endif	/* _ARCH_I386_TSS_H_ */
diff --git a/i386/include/assert.h b/i386/include/assert.h
deleted file mode 100644
index 1bfea51..0000000
--- a/i386/include/assert.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)assert.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: src/include/assert.h,v 1.4 2002/03/23 17:24:53 imp Exp $
- */
-
-#include <sys/cdefs.h>
-#ifdef __cplusplus
-#include <stdlib.h>
-#endif /* __cplusplus */
-
-/*
- * Unlike other ANSI header files, <assert.h> may usefully be included
- * multiple times, with and without NDEBUG defined.
- */
-
-#undef assert
-#undef __assert
-
-#ifdef NDEBUG
-#define	assert(e)	((void)0)
-#else
-
-#ifndef __GNUC__
-
-__BEGIN_DECLS
-#ifndef __cplusplus
-void abort(void) __dead2;
-#endif /* !__cplusplus */
-int  printf(const char * __restrict, ...);
-__END_DECLS
-
-#define assert(e)  \
-    ((void) ((e) ? 0 : __assert (#e, __FILE__, __LINE__)))
-#define __assert(e, file, line) \
-    ((void)printf ("%s:%u: failed assertion `%s'\n", file, line, e), abort())
-
-#else /* __GNUC__ */
-
-__BEGIN_DECLS
-void __assert_rtn(const char *, const char *, int, const char *) __dead2;
-void __eprintf(const char *, const char *, unsigned, const char *) __dead2;
-__END_DECLS
-
-#define __assert(e, file, line) \
-    __eprintf ("%s:%u: failed assertion `%s'\n", file, line, e)
-
-#if __DARWIN_UNIX03
-#define	assert(e) \
-    (__builtin_expect(!(e), 0) ? __assert_rtn(__func__, __FILE__, __LINE__, #e) : (void)0)
-#else /* !__DARWIN_UNIX03 */
-#define assert(e)  \
-    (__builtin_expect(!(e), 0) ? __assert (#e, __FILE__, __LINE__) : (void)0)
-#endif /* __DARWIN_UNIX03 */
-
-#endif /* __GNUC__ */
-#endif /* NDEBUG */
diff --git a/i386/include/ctype.h b/i386/include/ctype.h
deleted file mode 100644
index 58dca3d..0000000
--- a/i386/include/ctype.h
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
- * Copyright (c) 2000, 2005, 2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ctype.h	8.4 (Berkeley) 1/21/94
- */
-
-//Begin-Libc
-//#include "xlocale_private.h"
-//End-Libc
-#ifndef	_CTYPE_H_
-#define _CTYPE_H_
-
-#include <runetype.h>
-
-#define	_CTYPE_A	0x00000100L		/* Alpha */
-#define	_CTYPE_C	0x00000200L		/* Control */
-#define	_CTYPE_D	0x00000400L		/* Digit */
-#define	_CTYPE_G	0x00000800L		/* Graph */
-#define	_CTYPE_L	0x00001000L		/* Lower */
-#define	_CTYPE_P	0x00002000L		/* Punct */
-#define	_CTYPE_S	0x00004000L		/* Space */
-#define	_CTYPE_U	0x00008000L		/* Upper */
-#define	_CTYPE_X	0x00010000L		/* X digit */
-#define	_CTYPE_B	0x00020000L		/* Blank */
-#define	_CTYPE_R	0x00040000L		/* Print */
-#define	_CTYPE_I	0x00080000L		/* Ideogram */
-#define	_CTYPE_T	0x00100000L		/* Special */
-#define	_CTYPE_Q	0x00200000L		/* Phonogram */
-#define	_CTYPE_SW0	0x20000000L		/* 0 width character */
-#define	_CTYPE_SW1	0x40000000L		/* 1 width character */
-#define	_CTYPE_SW2	0x80000000L		/* 2 width character */
-#define	_CTYPE_SW3	0xc0000000L		/* 3 width character */
-#define	_CTYPE_SWM	0xe0000000L		/* Mask for screen width data */
-#define	_CTYPE_SWS	30			/* Bits to shift to get width */
-
-#ifdef _NONSTD_SOURCE
-/*
- * Backward compatibility
- */
-#define	_A		_CTYPE_A		/* Alpha */
-#define	_C		_CTYPE_C		/* Control */
-#define	_D		_CTYPE_D		/* Digit */
-#define	_G		_CTYPE_G		/* Graph */
-#define	_L		_CTYPE_L		/* Lower */
-#define	_P		_CTYPE_P		/* Punct */
-#define	_S		_CTYPE_S		/* Space */
-#define	_U		_CTYPE_U		/* Upper */
-#define	_X		_CTYPE_X		/* X digit */
-#define	_B		_CTYPE_B		/* Blank */
-#define	_R		_CTYPE_R		/* Print */
-#define	_I		_CTYPE_I		/* Ideogram */
-#define	_T		_CTYPE_T		/* Special */
-#define	_Q		_CTYPE_Q		/* Phonogram */
-#define	_SW0		_CTYPE_SW0		/* 0 width character */
-#define	_SW1		_CTYPE_SW1		/* 1 width character */
-#define	_SW2		_CTYPE_SW2		/* 2 width character */
-#define	_SW3		_CTYPE_SW3		/* 3 width character */
-#endif /* _NONSTD_SOURCE */
-
-/*
- * _EXTERNALIZE_CTYPE_INLINES_ is defined in locale/nomacros.c to tell us
- * to generate code for extern versions of all intermediate inline functions.
- */
-#ifdef _EXTERNALIZE_CTYPE_INLINES_
-#define _USE_CTYPE_INLINE_
-#define __DARWIN_CTYPE_static_inline
-#else /* !_EXTERNALIZE_CTYPE_INLINES_ */
-#define __DARWIN_CTYPE_static_inline		static __inline
-#endif /* !_EXTERNALIZE_CTYPE_INLINES_ */
-
-/*
- * _EXTERNALIZE_CTYPE_INLINES_TOP_ is defined in locale/isctype.c to tell us
- * to generate code for extern versions of all top-level inline functions.
- */
-#ifdef _EXTERNALIZE_CTYPE_INLINES_TOP_
-#define _USE_CTYPE_INLINE_
-#define __DARWIN_CTYPE_TOP_static_inline
-#else /* !_EXTERNALIZE_CTYPE_INLINES_TOP_ */
-#define __DARWIN_CTYPE_TOP_static_inline	static __inline
-#endif /* _EXTERNALIZE_CTYPE_INLINES_TOP_ */
-
-/*
- * Use inline functions if we are allowed to and the compiler supports them.
- */
-#if !defined(_DONT_USE_CTYPE_INLINE_) && \
-    (defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus))
-
-/* See comments in <machine/_type.h> about __darwin_ct_rune_t. */
-__BEGIN_DECLS
-unsigned long		___runetype(__darwin_ct_rune_t);
-__darwin_ct_rune_t	___tolower(__darwin_ct_rune_t);
-__darwin_ct_rune_t	___toupper(__darwin_ct_rune_t);
-__END_DECLS
-
-__DARWIN_CTYPE_TOP_static_inline int
-isascii(int _c)
-{
-	return ((_c & ~0x7F) == 0);
-}
-
-#ifdef USE_ASCII
-__DARWIN_CTYPE_static_inline int     
-__maskrune(__darwin_ct_rune_t _c, unsigned long _f)
-{
-	return _DefaultRuneLocale.__runetype[_c & 0xff] & _f;
-}
-//Begin-Libc
-#elif defined(__LIBC__)
-__DARWIN_CTYPE_static_inline int     
-__maskrune(__darwin_ct_rune_t _c, unsigned long _f)
-{
-	return ((_c < 0 || _c >= _CACHED_RUNES) ? ___runetype(_c) :
-		__current_locale()->__lc_ctype->_CurrentRuneLocale.__runetype[_c]) & _f;
-}
-//End-Libc
-#else /* !USE_ASCII */
-__BEGIN_DECLS
-int             	__maskrune(__darwin_ct_rune_t, unsigned long);   
-__END_DECLS
-#endif /* USE_ASCII */
-
-__DARWIN_CTYPE_static_inline int
-__istype(__darwin_ct_rune_t _c, unsigned long _f)
-{
-#ifdef USE_ASCII
-	return !!(__maskrune(_c, _f));
-#else /* USE_ASCII */
-	return (isascii(_c) ? !!(_DefaultRuneLocale.__runetype[_c] & _f)
-		: !!__maskrune(_c, _f));
-#endif /* USE_ASCII */
-}
-
-__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
-__isctype(__darwin_ct_rune_t _c, unsigned long _f)
-{
-#ifdef USE_ASCII
-	return !!(__maskrune(_c, _f));
-#else /* USE_ASCII */
-	return (_c < 0 || _c >= _CACHED_RUNES) ? 0 :
-		!!(_DefaultRuneLocale.__runetype[_c] & _f);
-#endif /* USE_ASCII */
-}
-
-#ifdef USE_ASCII
-__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
-__toupper(__darwin_ct_rune_t _c)
-{
-	return _DefaultRuneLocale.__mapupper[_c & 0xff];
-}
-
-__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
-__tolower(__darwin_ct_rune_t _c)
-{
-	return _DefaultRuneLocale.__maplower[_c & 0xff];
-}
-//Begin-Libc
-#elif defined(__LIBC__)
-/*
- * We can't do what we do for __toupper_l() (check for ASCII first, then call
- * ___toupper_l() otherwise) because versions of ___toupper() before Tiger
- * assume c >= _CACHED_RUNES.  So we are stuck making __toupper() a routine
- * to hide the extended locale details, outside of Libc.
- */
-__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
-__toupper(__darwin_ct_rune_t _c)
-{
-	return (_c < 0 || _c >= _CACHED_RUNES) ? ___toupper(_c) :
-		__current_locale()->__lc_ctype->_CurrentRuneLocale.__mapupper[_c];
-}
-
-__DARWIN_CTYPE_static_inline __darwin_ct_rune_t
-__tolower(__darwin_ct_rune_t _c)
-{
-	return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) :
-		__current_locale()->__lc_ctype->_CurrentRuneLocale.__maplower[_c];
-}
-//End-Libc
-#else /* !USE_ASCII */
-__BEGIN_DECLS
-__darwin_ct_rune_t	__toupper(__darwin_ct_rune_t);
-__darwin_ct_rune_t	__tolower(__darwin_ct_rune_t);
-__END_DECLS
-#endif /* USE_ASCII */
-
-__DARWIN_CTYPE_static_inline int
-__wcwidth(__darwin_ct_rune_t _c)
-{
-	unsigned int _x;
-
-	if (_c == 0)
-		return (0);
-	_x = (unsigned int)__maskrune(_c, _CTYPE_SWM|_CTYPE_R);
-	if ((_x & _CTYPE_SWM) != 0)
-		return ((_x & _CTYPE_SWM) >> _CTYPE_SWS);
-	return ((_x & _CTYPE_R) != 0 ? 1 : -1);
-}
-
-#ifndef _EXTERNALIZE_CTYPE_INLINES_
-
-#define	_tolower(c)	__tolower(c)
-#define	_toupper(c)	__toupper(c)
-
-__DARWIN_CTYPE_TOP_static_inline int
-isalnum(int _c)
-{
-	return (__istype(_c, _CTYPE_A|_CTYPE_D));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isalpha(int _c)
-{
-	return (__istype(_c, _CTYPE_A));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isblank(int _c)
-{
-	return (__istype(_c, _CTYPE_B));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-iscntrl(int _c)
-{
-	return (__istype(_c, _CTYPE_C));
-}
-
-/* ANSI -- locale independent */
-__DARWIN_CTYPE_TOP_static_inline int
-isdigit(int _c)
-{
-	return (__isctype(_c, _CTYPE_D));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isgraph(int _c)
-{
-	return (__istype(_c, _CTYPE_G));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-islower(int _c)
-{
-	return (__istype(_c, _CTYPE_L));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isprint(int _c)
-{
-	return (__istype(_c, _CTYPE_R));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-ispunct(int _c)
-{
-	return (__istype(_c, _CTYPE_P));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isspace(int _c)
-{
-	return (__istype(_c, _CTYPE_S));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isupper(int _c)
-{
-	return (__istype(_c, _CTYPE_U));
-}
-
-/* ANSI -- locale independent */
-__DARWIN_CTYPE_TOP_static_inline int
-isxdigit(int _c)
-{
-	return (__isctype(_c, _CTYPE_X));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-toascii(int _c)
-{
-	return (_c & 0x7F);
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-tolower(int _c)
-{
-        return (__tolower(_c));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-toupper(int _c)
-{
-        return (__toupper(_c));
-}
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-__DARWIN_CTYPE_TOP_static_inline int
-digittoint(int _c)
-{
-	return (__maskrune(_c, 0x0F));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-ishexnumber(int _c)
-{
-	return (__istype(_c, _CTYPE_X));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isideogram(int _c)
-{
-	return (__istype(_c, _CTYPE_I));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isnumber(int _c)
-{
-	return (__istype(_c, _CTYPE_D));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isphonogram(int _c)
-{
-	return (__istype(_c, _CTYPE_Q));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isrune(int _c)
-{
-	return (__istype(_c, 0xFFFFFFF0L));
-}
-
-__DARWIN_CTYPE_TOP_static_inline int
-isspecial(int _c)
-{
-	return (__istype(_c, _CTYPE_T));
-}
-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#endif /* _EXTERNALIZE_CTYPE_INLINES_ */
-
-#else /* not using inlines */
-
-__BEGIN_DECLS
-int     isalnum(int);
-int     isalpha(int);
-int     isblank(int);
-int     iscntrl(int);
-int     isdigit(int);
-int     isgraph(int);
-int     islower(int);
-int     isprint(int);
-int     ispunct(int);
-int     isspace(int);
-int     isupper(int);
-int     isxdigit(int);
-int     tolower(int);
-int     toupper(int);
-int     isascii(int);
-int     toascii(int);
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-int     _tolower(int);
-int     _toupper(int);
-int     digittoint(int);
-int     ishexnumber(int);
-int     isideogram(int);
-int     isnumber(int);
-int     isphonogram(int);
-int     isrune(int);
-int     isspecial(int);
-#endif
-__END_DECLS
-
-#endif /* using inlines */
-
-#ifdef _USE_EXTENDED_LOCALES_
-#include <xlocale/_ctype.h>
-#endif /* _USE_EXTENDED_LOCALES_ */
-
-#endif /* !_CTYPE_H_ */
diff --git a/i386/include/device/.svn/all-wcprops b/i386/include/device/.svn/all-wcprops
deleted file mode 100644
index 206efb7..0000000
--- a/i386/include/device/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/chameleon/!svn/ver/881/trunk/i386/include/device
-END
-device_port.h
-K 25
-svn:wc:ra_dav:version-url
-V 67
-/svn/chameleon/!svn/ver/881/trunk/i386/include/device/device_port.h
-END
-device_types.h
-K 25
-svn:wc:ra_dav:version-url
-V 68
-/svn/chameleon/!svn/ver/881/trunk/i386/include/device/device_types.h
-END
diff --git a/i386/include/device/.svn/entries b/i386/include/device/.svn/entries
deleted file mode 100644
index b2356fb..0000000
--- a/i386/include/device/.svn/entries
+++ /dev/null
@@ -1,96 +0,0 @@
-10
-
-dir
-2117
-http://forge.voodooprojects.org/svn/chameleon/trunk/i386/include/device
-http://forge.voodooprojects.org/svn/chameleon
-
-
-
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-b5af796a-00a8-11df-919b-ffff7a100b7d
-
-device_port.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-a32061f0b361911908c8f1a738ad6fbd
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2936
-
-device_types.h
-file
-
-
-
-
-2012-10-03T17:50:21.000000Z
-3002c6d1dc242f177c4ae99fb073e186
-2011-05-26T03:34:29.106114Z
-881
-meklort
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-4507
-
diff --git a/i386/include/device/.svn/text-base/device_port.h.svn-base b/i386/include/device/.svn/text-base/device_port.h.svn-base
deleted file mode 100644
index 8948ed5..0000000
--- a/i386/include/device/.svn/text-base/device_port.h.svn-base
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	Author: David B. Golub, Carnegie Mellon University
- *	Date: 	8/89
- */
-
-#ifndef	_DEVICE_DEVICE_PORT_H_
-#define	_DEVICE_DEVICE_PORT_H_
-
-#include <device/device_types.h>
-
-/*
- *	Master privileged I/O object for this host
- */
-extern mach_port_t	master_device_port;
-
-#define DEVICE_PAGER_GUARDED		0x1
-#define DEVICE_PAGER_COHERENT		0x2
-#define DEVICE_PAGER_CACHE_INHIB	0x4
-#define DEVICE_PAGER_WRITE_THROUGH	0x8
-#define DEVICE_PAGER_CONTIGUOUS		0x100
-#define DEVICE_PAGER_NOPHYSCACHE	0x200
-
-#endif	/* _DEVICE_DEVICE_PORT_H_ */
diff --git a/i386/include/device/.svn/text-base/device_types.h.svn-base b/i386/include/device/.svn/text-base/device_types.h.svn-base
deleted file mode 100644
index f71249e..0000000
--- a/i386/include/device/.svn/text-base/device_types.h.svn-base
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	Author: David B. Golub, Carnegie Mellon University
- *	Date: 	3/89
- */
-
-#ifndef	DEVICE_TYPES_H
-#define	DEVICE_TYPES_H
-
-/*
- * Types for device interface.
- */
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/port.h>
-
-/*
- * IO buffer - out-of-line array of characters.
- */
-typedef char *	io_buf_ptr_t;
-
-/*
- * Some types for IOKit.
- */
-
-#ifdef IOKIT
-
-/* must match device_types.defs */
-typedef	char			io_name_t[128];
-typedef	char			io_string_t[512];	
-typedef char 			io_struct_inband_t[4096];
-
-#if KERNEL
-typedef uint64_t		io_user_scalar_t;
-typedef uint64_t		io_user_reference_t;
-typedef int 			io_scalar_inband_t[16];
-// must be the same type as OSAsyncReference
-typedef natural_t		io_async_ref_t[8];
-typedef io_user_scalar_t	io_scalar_inband64_t[16];
-typedef io_user_reference_t	io_async_ref64_t[8];
-#elif __LP64__
-typedef uint64_t		io_user_scalar_t;
-typedef uint64_t		io_user_reference_t;
-typedef io_user_scalar_t	io_scalar_inband_t[16];
-typedef io_user_reference_t	io_async_ref_t[8];
-typedef io_user_scalar_t	io_scalar_inband64_t[16];
-typedef io_user_reference_t	io_async_ref64_t[8];
-#else
-typedef int			io_user_scalar_t;
-typedef natural_t		io_user_reference_t;
-typedef io_user_scalar_t	io_scalar_inband_t[16];
-typedef io_user_reference_t	io_async_ref_t[8];
-typedef uint64_t		io_scalar_inband64_t[16];
-typedef uint64_t		io_async_ref64_t[8];
-#endif // __LP64__
-
-#ifdef MACH_KERNEL
-
-typedef struct IOObject * io_object_t;
-typedef io_object_t io_connect_t;
-
-extern void iokit_remove_reference( io_object_t	obj );
-
-extern io_object_t iokit_lookup_object_port( ipc_port_t port );
-extern io_connect_t iokit_lookup_connect_port( ipc_port_t port );
-
-extern ipc_port_t iokit_make_object_port( io_object_t obj );
-extern ipc_port_t iokit_make_connect_port( io_connect_t obj );
-
-extern boolean_t iokit_notify( mach_msg_header_t *msg );
-
-#else
-
-#ifndef	__IOKIT_PORTS_DEFINED__
-#define __IOKIT_PORTS_DEFINED__
-typedef mach_port_t	io_object_t;
-#endif	/* __IOKIT_PORTS_DEFINED__ */
-
-#endif  /* MACH_KERNEL */
-
-#endif  /* IOKIT */
-
-#endif	/* DEVICE_TYPES_H */
-
diff --git a/i386/include/device/device_port.h b/i386/include/device/device_port.h
deleted file mode 100644
index 8948ed5..0000000
--- a/i386/include/device/device_port.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	Author: David B. Golub, Carnegie Mellon University
- *	Date: 	8/89
- */
-
-#ifndef	_DEVICE_DEVICE_PORT_H_
-#define	_DEVICE_DEVICE_PORT_H_
-
-#include <device/device_types.h>
-
-/*
- *	Master privileged I/O object for this host
- */
-extern mach_port_t	master_device_port;
-
-#define DEVICE_PAGER_GUARDED		0x1
-#define DEVICE_PAGER_COHERENT		0x2
-#define DEVICE_PAGER_CACHE_INHIB	0x4
-#define DEVICE_PAGER_WRITE_THROUGH	0x8
-#define DEVICE_PAGER_CONTIGUOUS		0x100
-#define DEVICE_PAGER_NOPHYSCACHE	0x200
-
-#endif	/* _DEVICE_DEVICE_PORT_H_ */
diff --git a/i386/include/device/device_types.h b/i386/include/device/device_types.h
deleted file mode 100644
index f71249e..0000000
--- a/i386/include/device/device_types.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	Author: David B. Golub, Carnegie Mellon University
- *	Date: 	3/89
- */
-
-#ifndef	DEVICE_TYPES_H
-#define	DEVICE_TYPES_H
-
-/*
- * Types for device interface.
- */
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/port.h>
-
-/*
- * IO buffer - out-of-line array of characters.
- */
-typedef char *	io_buf_ptr_t;
-
-/*
- * Some types for IOKit.
- */
-
-#ifdef IOKIT
-
-/* must match device_types.defs */
-typedef	char			io_name_t[128];
-typedef	char			io_string_t[512];	
-typedef char 			io_struct_inband_t[4096];
-
-#if KERNEL
-typedef uint64_t		io_user_scalar_t;
-typedef uint64_t		io_user_reference_t;
-typedef int 			io_scalar_inband_t[16];
-// must be the same type as OSAsyncReference
-typedef natural_t		io_async_ref_t[8];
-typedef io_user_scalar_t	io_scalar_inband64_t[16];
-typedef io_user_reference_t	io_async_ref64_t[8];
-#elif __LP64__
-typedef uint64_t		io_user_scalar_t;
-typedef uint64_t		io_user_reference_t;
-typedef io_user_scalar_t	io_scalar_inband_t[16];
-typedef io_user_reference_t	io_async_ref_t[8];
-typedef io_user_scalar_t	io_scalar_inband64_t[16];
-typedef io_user_reference_t	io_async_ref64_t[8];
-#else
-typedef int			io_user_scalar_t;
-typedef natural_t		io_user_reference_t;
-typedef io_user_scalar_t	io_scalar_inband_t[16];
-typedef io_user_reference_t	io_async_ref_t[8];
-typedef uint64_t		io_scalar_inband64_t[16];
-typedef uint64_t		io_async_ref64_t[8];
-#endif // __LP64__
-
-#ifdef MACH_KERNEL
-
-typedef struct IOObject * io_object_t;
-typedef io_object_t io_connect_t;
-
-extern void iokit_remove_reference( io_object_t	obj );
-
-extern io_object_t iokit_lookup_object_port( ipc_port_t port );
-extern io_connect_t iokit_lookup_connect_port( ipc_port_t port );
-
-extern ipc_port_t iokit_make_object_port( io_object_t obj );
-extern ipc_port_t iokit_make_connect_port( io_connect_t obj );
-
-extern boolean_t iokit_notify( mach_msg_header_t *msg );
-
-#else
-
-#ifndef	__IOKIT_PORTS_DEFINED__
-#define __IOKIT_PORTS_DEFINED__
-typedef mach_port_t	io_object_t;
-#endif	/* __IOKIT_PORTS_DEFINED__ */
-
-#endif  /* MACH_KERNEL */
-
-#endif  /* IOKIT */
-
-#endif	/* DEVICE_TYPES_H */
-
diff --git a/i386/include/errno.h b/i386/include/errno.h
deleted file mode 100644
index 9879cc4..0000000
--- a/i386/include/errno.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#include <sys/errno.h>
-
diff --git a/i386/include/float.h b/i386/include/float.h
deleted file mode 100644
index 84fd005..0000000
--- a/i386/include/float.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/* This file exists soley to keep Metrowerks' compilers happy.  The version
-   used by GCC can be found in /usr/lib/gcc, although it's
-   not very informative.  */
-
-#ifndef _FLOAT_H_
-
-#if defined(__GNUC__)
-#include_next <float.h>
-
-#elif defined(__MWERKS__)
-#define _FLOAT_H_
-
-/* APPLE LOCAL begin MW compatibility */
-/* Define various characteristics of floating-point types, if needed.  */
-#ifndef __FLT_RADIX__   
-#define __FLT_RADIX__ 2
-#endif
-#ifndef __FLT_MANT_DIG__
-#define __FLT_MANT_DIG__ 24
-#endif
-#ifndef __FLT_DIG__
-#define __FLT_DIG__ 6
-#endif
-#ifndef __FLT_EPSILON__
-#define __FLT_EPSILON__ 1.19209290e-07F
-#endif
-#ifndef __FLT_MIN__
-#define __FLT_MIN__ 1.17549435e-38F
-#endif
-#ifndef __FLT_MAX__
-#define __FLT_MAX__ 3.40282347e+38F
-#endif
-#ifndef __FLT_MIN_EXP__
-#define __FLT_MIN_EXP__ (-125)
-#endif
-#ifndef __FLT_MIN_10_EXP__
-#define __FLT_MIN_10_EXP__ (-37)
-#endif
-#ifndef __FLT_MAX_EXP__
-#define __FLT_MAX_EXP__ 128
-#endif
-#ifndef __FLT_MAX_10_EXP__
-#define __FLT_MAX_10_EXP__ 38
-#endif
-#ifndef __DBL_MANT_DIG__
-#define __DBL_MANT_DIG__ 53
-#endif
-#ifndef __DBL_DIG__
-#define __DBL_DIG__ 15
-#endif
-#ifndef __DBL_EPSILON__
-#define __DBL_EPSILON__ 2.2204460492503131e-16
-#endif
-#ifndef __DBL_MIN__
-#define __DBL_MIN__ 2.2250738585072014e-308
-#endif
-#ifndef __DBL_MAX__
-#define __DBL_MAX__ 1.7976931348623157e+308
-#endif
-#ifndef __DBL_MIN_EXP__
-#define __DBL_MIN_EXP__ (-1021)
-#endif
-#ifndef __DBL_MIN_10_EXP__
-#define __DBL_MIN_10_EXP__ (-307)
-#endif
-#ifndef __DBL_MAX_EXP__
-#define __DBL_MAX_EXP__ 1024
-#endif
-#ifndef __DBL_MAX_10_EXP__
-#define __DBL_MAX_10_EXP__ 308
-#endif
-#ifndef __LDBL_MANT_DIG__
-#define __LDBL_MANT_DIG__ 53
-#endif
-#ifndef __LDBL_DIG__  
-#define __LDBL_DIG__ 15 
-#endif
-#ifndef __LDBL_EPSILON__
-#define __LDBL_EPSILON__ 2.2204460492503131e-16
-#endif
-#ifndef __LDBL_MIN__
-#define __LDBL_MIN__ 2.2250738585072014e-308
-#endif
-#ifndef __LDBL_MAX__
-#define __LDBL_MAX__ 1.7976931348623157e+308
-#endif
-#ifndef __LDBL_MIN_EXP__
-#define __LDBL_MIN_EXP__ (-1021)
-#endif
-#ifndef __LDBL_MIN_10_EXP__
-#define __LDBL_MIN_10_EXP__ (-307)
-#endif
-#ifndef __LDBL_MAX_EXP__
-#define __LDBL_MAX_EXP__ 1024
-#endif
-#ifndef __LDBL_MAX_10_EXP__
-#define __LDBL_MAX_10_EXP__ 308
-#endif
-/* APPLE LOCAl end MW compatibility */
-
-/* Copyright (C) 2002 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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, or (at your option)
-any later version.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you include this header file into source
-   files compiled by GCC, this header file does not by itself cause
-   the resulting executable to be covered by the GNU General Public
-   License.  This exception does not however invalidate any other
-   reasons why the executable file might be covered by the GNU General
-   Public License.  */
-
-/*
- * ISO C Standard:  5.2.4.2.2  Characteristics of floating types <float.h>
- */
-
-
-/* Radix of exponent representation, b. */
-#undef FLT_RADIX
-#define FLT_RADIX	__FLT_RADIX__
-
-/* Number of base-FLT_RADIX digits in the significand, p.  */
-#undef FLT_MANT_DIG
-#undef DBL_MANT_DIG
-#undef LDBL_MANT_DIG
-#define FLT_MANT_DIG	__FLT_MANT_DIG__
-#define DBL_MANT_DIG	__DBL_MANT_DIG__
-#define LDBL_MANT_DIG	__LDBL_MANT_DIG__
-
-/* Number of decimal digits, q, such that any floating-point number with q
-   decimal digits can be rounded into a floating-point number with p radix b
-   digits and back again without change to the q decimal digits,
-
-	p * log10(b)			if b is a power of 10
-	floor((p - 1) * log10(b))	otherwise
-*/
-#undef FLT_DIG
-#undef DBL_DIG
-#undef LDBL_DIG
-#define FLT_DIG		__FLT_DIG__
-#define DBL_DIG		__DBL_DIG__
-#define LDBL_DIG	__LDBL_DIG__
-
-/* Minimum int x such that FLT_RADIX**(x-1) is a normalized float, emin */
-#undef FLT_MIN_EXP
-#undef DBL_MIN_EXP
-#undef LDBL_MIN_EXP
-#define FLT_MIN_EXP	__FLT_MIN_EXP__
-#define DBL_MIN_EXP	__DBL_MIN_EXP__
-#define LDBL_MIN_EXP	__LDBL_MIN_EXP__
-
-/* Minimum negative integer such that 10 raised to that power is in the
-   range of normalized floating-point numbers,
-
-	ceil(log10(b) * (emin - 1))
-*/
-#undef FLT_MIN_10_EXP
-#undef DBL_MIN_10_EXP
-#undef LDBL_MIN_10_EXP
-#define FLT_MIN_10_EXP	__FLT_MIN_10_EXP__
-#define DBL_MIN_10_EXP	__DBL_MIN_10_EXP__
-#define LDBL_MIN_10_EXP	__LDBL_MIN_10_EXP__
-
-/* Maximum int x such that FLT_RADIX**(x-1) is a representable float, emax.  */
-#undef FLT_MAX_EXP
-#undef DBL_MAX_EXP
-#undef LDBL_MAX_EXP
-#define FLT_MAX_EXP	__FLT_MAX_EXP__
-#define DBL_MAX_EXP	__DBL_MAX_EXP__
-#define LDBL_MAX_EXP	__LDBL_MAX_EXP__
-
-/* Maximum integer such that 10 raised to that power is in the range of
-   representable finite floating-point numbers,
-
-	floor(log10((1 - b**-p) * b**emax))
-*/
-#undef FLT_MAX_10_EXP
-#undef DBL_MAX_10_EXP
-#undef LDBL_MAX_10_EXP
-#define FLT_MAX_10_EXP	__FLT_MAX_10_EXP__
-#define DBL_MAX_10_EXP	__DBL_MAX_10_EXP__
-#define LDBL_MAX_10_EXP	__LDBL_MAX_10_EXP__
-
-/* Maximum representable finite floating-point number,
-
-	(1 - b**-p) * b**emax
-*/
-#undef FLT_MAX
-#undef DBL_MAX
-#undef LDBL_MAX
-#define FLT_MAX		__FLT_MAX__
-#define DBL_MAX		__DBL_MAX__
-#define LDBL_MAX	__LDBL_MAX__
-
-/* The difference between 1 and the least value greater than 1 that is
-   representable in the given floating point type, b**1-p.  */
-#undef FLT_EPSILON
-#undef DBL_EPSILON
-#undef LDBL_EPSILON
-#define FLT_EPSILON	__FLT_EPSILON__
-#define DBL_EPSILON	__DBL_EPSILON__
-#define LDBL_EPSILON	__LDBL_EPSILON__
-
-/* Minimum normalized positive floating-point number, b**(emin - 1).  */
-#undef FLT_MIN
-#undef DBL_MIN
-#undef LDBL_MIN
-#define FLT_MIN		__FLT_MIN__
-#define DBL_MIN		__DBL_MIN__
-#define LDBL_MIN	__LDBL_MIN__
-
-/* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown.  */
-/* ??? This is supposed to change with calls to fesetround in <fenv.h>.  */
-#undef FLT_ROUNDS
-#define FLT_ROUNDS 1
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-/* The floating-point expression evaluation method.
-        -1  indeterminate
-         0  evaluate all operations and constants just to the range and
-            precision of the type
-         1  evaluate operations and constants of type float and double
-            to the range and precision of the double type, evaluate
-            long double operations and constants to the range and
-            precision of the long double type
-         2  evaluate all operations and constants to the range and
-            precision of the long double type
-
-   ??? This ought to change with the setting of the fp control word;
-   the value provided by the compiler assumes the widest setting.  */
-#undef FLT_EVAL_METHOD
-#define FLT_EVAL_METHOD	__FLT_EVAL_METHOD__
-
-/* Number of decimal digits, n, such that any floating-point number in the
-   widest supported floating type with pmax radix b digits can be rounded
-   to a floating-point number with n decimal digits and back again without
-   change to the value,
-
-	pmax * log10(b)			if b is a power of 10
-	ceil(1 + pmax * log10(b))	otherwise
-*/
-#undef DECIMAL_DIG
-#define DECIMAL_DIG	__DECIMAL_DIG__
-
-#endif /* C99 */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern int __fegetfltrounds( void ); 
-#ifdef __cplusplus
-}
-#endif
-#undef FLT_ROUNDS
-#define FLT_ROUNDS (__fegetfltrounds ())
-/* End of GNU CC file */
-
-/* APPLE LOCAL begin CW compatibility */
-/* CodeWarrior defines the following on its own.  */
-#undef DECIMAL_DIG
-/* APPLE LOCAL end CW compatibility */
-
-#else
-#error This file is only for Metrowerks compatibilty.
-#endif
-
-#endif /* _FLOAT_H_ */
diff --git a/i386/include/i386/_limits.h b/i386/include/i386/_limits.h
deleted file mode 100644
index 3b9e7a6..0000000
--- a/i386/include/i386/_limits.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef	_I386__LIMITS_H_
-#define	_I386__LIMITS_H_
-
-#define	__DARWIN_CLK_TCK		100	/* ticks per second */
-
-#endif	/* _I386__LIMITS_H_ */
diff --git a/i386/include/i386/_param.h b/i386/include/i386/_param.h
deleted file mode 100644
index 61f0d24..0000000
--- a/i386/include/i386/_param.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2008 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _I386__PARAM_H_
-#define _I386__PARAM_H_
-
-#include <i386/_types.h>
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value for all
- * data types (int, long, ...).   The result is unsigned int and must be
- * cast to any desired pointer type.
- */
-#define	__DARWIN_ALIGNBYTES	(sizeof(__darwin_size_t) - 1)
-#define	__DARWIN_ALIGN(p)	((__darwin_size_t)((char *)(__darwin_size_t)(p) + __DARWIN_ALIGNBYTES) &~ __DARWIN_ALIGNBYTES)
-
-#define      __DARWIN_ALIGNBYTES32     (sizeof(__uint32_t) - 1)
-#define       __DARWIN_ALIGN32(p)       ((__darwin_size_t)((char *)(__darwin_size_t)(p) + __DARWIN_ALIGNBYTES32) &~ __DARWIN_ALIGNBYTES32)
-
-
-#endif /* _I386__PARAM_H_ */
diff --git a/i386/include/i386/_structs.h b/i386/include/i386/_structs.h
deleted file mode 100644
index 9cad355..0000000
--- a/i386/include/i386/_structs.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#include <sys/appleapiopts.h>
-
-#ifdef __need_mcontext_t
-#ifndef __need_struct_mcontext
-#define __need_struct_mcontext
-#endif /* __need_struct_mcontext */
-#endif /* __need_mcontext_t */
-
-#if defined(__need_struct_mcontext)
-#include <mach/i386/_structs.h>
-#endif /* __need_struct_mcontext */
-
-
-#ifdef __need_struct_mcontext
-#undef __need_struct_mcontext
-
-#ifndef _STRUCT_MCONTEXT32
-#if __DARWIN_UNIX03
-#define	_STRUCT_MCONTEXT32	struct __darwin_mcontext32
-_STRUCT_MCONTEXT32
-{
-	_STRUCT_X86_EXCEPTION_STATE32	__es;
-	_STRUCT_X86_THREAD_STATE32	__ss;
-	_STRUCT_X86_FLOAT_STATE32	__fs;
-};
-#else /* !__DARWIN_UNIX03 */
-#define	_STRUCT_MCONTEXT32	struct mcontext32
-_STRUCT_MCONTEXT32
-{
-	_STRUCT_X86_EXCEPTION_STATE32	es;
-	_STRUCT_X86_THREAD_STATE32	ss;
-	_STRUCT_X86_FLOAT_STATE32	fs;
-};
-#endif /* __DARWIN_UNIX03 */
-#endif /* _STRUCT_MCONTEXT32 */
-
-#ifndef _STRUCT_MCONTEXT64
-#if __DARWIN_UNIX03
-#define	_STRUCT_MCONTEXT64	struct __darwin_mcontext64
-_STRUCT_MCONTEXT64
-{
-	_STRUCT_X86_EXCEPTION_STATE64	__es;
-	_STRUCT_X86_THREAD_STATE64	__ss;
-	_STRUCT_X86_FLOAT_STATE64	__fs;
-};
-#else /* !__DARWIN_UNIX03 */
-#define	_STRUCT_MCONTEXT64	struct mcontext64
-_STRUCT_MCONTEXT64
-{
-	_STRUCT_X86_EXCEPTION_STATE64	es;
-	_STRUCT_X86_THREAD_STATE64	ss;
-	_STRUCT_X86_FLOAT_STATE64	fs;
-};
-#endif /* __DARWIN_UNIX03 */
-#endif /* _STRUCT_MCONTEXT64 */
-#endif /* __need_struct_mcontext */
-
-#ifdef __need_mcontext_t
-#undef __need_mcontext_t
-#ifndef _MCONTEXT_T
-#define _MCONTEXT_T
-#if defined(__LP64__)
-typedef _STRUCT_MCONTEXT64	*mcontext_t;
-#define _STRUCT_MCONTEXT _STRUCT_MCONTEXT64
-#else
-typedef _STRUCT_MCONTEXT32	*mcontext_t;
-#define _STRUCT_MCONTEXT	_STRUCT_MCONTEXT32
-#endif
-#endif /* _MCONTEXT_T */
-#endif /* __need_mcontext_t */
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#ifndef I386_MCONTEXT_SIZE
-#define I386_MCONTEXT_SIZE	sizeof(struct mcontext)	
-#endif /* I386_MCONTEXT_SIZE */
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
diff --git a/i386/include/i386/_types.h b/i386/include/i386/_types.h
deleted file mode 100644
index 67741d5..0000000
--- a/i386/include/i386/_types.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef	_BSD_I386__TYPES_H_
-#define	_BSD_I386__TYPES_H_
-
-/*
- * This header file contains integer types.  It's intended to also contain
- * flotaing point and other arithmetic types, as needed, later.
- */
-
-#ifdef __GNUC__
-typedef __signed char		__int8_t;
-#else	/* !__GNUC__ */
-typedef char			__int8_t;
-#endif	/* !__GNUC__ */
-typedef unsigned char		__uint8_t;
-typedef	short			__int16_t;
-typedef	unsigned short		__uint16_t;
-typedef int			__int32_t;
-typedef unsigned int		__uint32_t;
-typedef long long		__int64_t;
-typedef unsigned long long	__uint64_t;
-
-typedef long			__darwin_intptr_t;
-typedef unsigned int		__darwin_natural_t;
-
-/*
- * The rune type below is declared to be an ``int'' instead of the more natural
- * ``unsigned long'' or ``long''.  Two things are happening here.  It is not
- * unsigned so that EOF (-1) can be naturally assigned to it and used.  Also,
- * it looks like 10646 will be a 31 bit standard.  This means that if your
- * ints cannot hold 32 bits, you will be in trouble.  The reason an int was
- * chosen over a long is that the is*() and to*() routines take ints (says
- * ANSI C), but they use __darwin_ct_rune_t instead of int.  By changing it
- * here, you lose a bit of ANSI conformance, but your programs will still
- * work.
- *
- * NOTE: rune_t is not covered by ANSI nor other standards, and should not
- * be instantiated outside of lib/libc/locale.  Use wchar_t.  wchar_t and
- * rune_t must be the same type.  Also wint_t must be no narrower than
- * wchar_t, and should also be able to hold all members of the largest
- * character set plus one extra value (WEOF). wint_t must be at least 16 bits.
- */
-
-typedef int			__darwin_ct_rune_t;	/* ct_rune_t */
-
-/*
- * mbstate_t is an opaque object to keep conversion state, during multibyte
- * stream conversions.  The content must not be referenced by user programs.
- */
-typedef union {
-	char		__mbstate8[128];
-	long long	_mbstateL;			/* for alignment */
-} __mbstate_t;
-
-typedef __mbstate_t		__darwin_mbstate_t;	/* mbstate_t */
-
-#if defined(__GNUC__) && defined(__PTRDIFF_TYPE__)
-typedef __PTRDIFF_TYPE__	__darwin_ptrdiff_t;	/* ptr1 - ptr2 */
-#else
-typedef int			__darwin_ptrdiff_t;	/* ptr1 - ptr2 */
-#endif /* __GNUC__ */
-
-#if defined(__GNUC__) && defined(__SIZE_TYPE__)
-typedef __SIZE_TYPE__		__darwin_size_t;	/* sizeof() */
-#else
-typedef unsigned long		__darwin_size_t;	/* sizeof() */
-#endif
-
-#if (__GNUC__ > 2)
-typedef __builtin_va_list	__darwin_va_list;	/* va_list */
-#else
-typedef void *			__darwin_va_list;	/* va_list */
-#endif
-
-#if defined(__GNUC__) && defined(__WCHAR_TYPE__)
-typedef __WCHAR_TYPE__		__darwin_wchar_t;	/* wchar_t */
-#else
-typedef __darwin_ct_rune_t	__darwin_wchar_t;	/* wchar_t */
-#endif
-
-typedef __darwin_wchar_t	__darwin_rune_t;	/* rune_t */
-
-#if defined(__GNUC__) && defined(__WINT_TYPE__)
-typedef __WINT_TYPE__		__darwin_wint_t;	/* wint_t */
-#else
-typedef __darwin_ct_rune_t	__darwin_wint_t;	/* wint_t */
-#endif
-
-typedef unsigned long		__darwin_clock_t;	/* clock() */
-typedef __uint32_t		__darwin_socklen_t;	/* socklen_t (duh) */
-typedef long			__darwin_ssize_t;	/* byte count or error */
-typedef long			__darwin_time_t;	/* time() */
-
-#endif	/* _BSD_I386__TYPES_H_ */
diff --git a/i386/include/i386/eflags.h b/i386/include/i386/eflags.h
deleted file mode 100644
index 9dc6478..0000000
--- a/i386/include/i386/eflags.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-#ifndef	_I386_EFLAGS_H_
-#define	_I386_EFLAGS_H_
-
-/*
- *	i386 flags register
- */
-
-#ifndef EFL_CF
-#define	EFL_CF		0x00000001		/* carry */
-#define	EFL_PF		0x00000004		/* parity of low 8 bits */
-#define	EFL_AF		0x00000010		/* carry out of bit 3 */
-#define	EFL_ZF		0x00000040		/* zero */
-#define	EFL_SF		0x00000080		/* sign */
-#define	EFL_TF		0x00000100		/* trace trap */
-#define	EFL_IF		0x00000200		/* interrupt enable */
-#define	EFL_DF		0x00000400		/* direction */
-#define	EFL_OF		0x00000800		/* overflow */
-#define	EFL_IOPL	0x00003000		/* IO privilege level: */
-#define	EFL_IOPL_KERNEL	0x00000000			/* kernel */
-#define	EFL_IOPL_USER	0x00003000			/* user */
-#define	EFL_NT		0x00004000		/* nested task */
-#define	EFL_RF		0x00010000		/* resume without tracing */
-#define	EFL_VM		0x00020000		/* virtual 8086 mode */
-#define EFL_AC		0x00040000		/* alignment check */
-#define EFL_VIF		0x00080000		/* virtual interrupt flag */
-#define EFL_VIP		0x00100000		/* virtual interrupt pending */
-#define EFL_ID		0x00200000		/* cpuID instruction */
-#endif
-
-#define EFL_CLR		0xfff88028
-#define EFL_SET		0x00000002
-
-#define	EFL_USER_SET	(EFL_IF)
-#define	EFL_USER_CLEAR	(EFL_IOPL|EFL_NT|EFL_RF)
-
-#endif	/* _I386_EFLAGS_H_ */
diff --git a/i386/include/i386/endian.h b/i386/include/i386/endian.h
deleted file mode 100644
index 9f64aa0..0000000
--- a/i386/include/i386/endian.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright 1995 NeXT Computer, Inc. All rights reserved.
- */
-/*
- * Copyright (c) 1987, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)endian.h	8.1 (Berkeley) 6/11/93
- */
-
-#ifndef _I386__ENDIAN_H_
-#define	_I386__ENDIAN_H_
-
-#include <sys/cdefs.h>
-/*
- * Define _NOQUAD if the compiler does NOT support 64-bit integers.
- */
-/* #define _NOQUAD */
-
-/*
- * Define the order of 32-bit words in 64-bit words.
- */
-#define _QUAD_HIGHWORD 1
-#define _QUAD_LOWWORD 0
-
-/*
- * Definitions for byte order, according to byte significance from low
- * address to high.
- */
-#define	__DARWIN_LITTLE_ENDIAN	1234	/* LSB first: i386, vax */
-#define	__DARWIN_BIG_ENDIAN	4321	/* MSB first: 68000, ibm, net */
-#define	__DARWIN_PDP_ENDIAN	3412	/* LSB first in word, MSW first in long */
-
-#define	__DARWIN_BYTE_ORDER	__DARWIN_LITTLE_ENDIAN
-
-#if	defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-
-#define	LITTLE_ENDIAN	__DARWIN_LITTLE_ENDIAN
-#define	BIG_ENDIAN	__DARWIN_BIG_ENDIAN
-#define	PDP_ENDIAN	__DARWIN_PDP_ENDIAN
-
-#define	BYTE_ORDER	__DARWIN_BYTE_ORDER
-
-#include <sys/_endian.h>
-
-#endif /* defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) */
-#endif /* !_I386__ENDIAN_H_ */
diff --git a/i386/include/i386/fasttrap_isa.h b/i386/include/i386/fasttrap_isa.h
deleted file mode 100644
index d51c7dd..0000000
--- a/i386/include/i386/fasttrap_isa.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef	_FASTTRAP_ISA_H
-#define	_FASTTRAP_ISA_H
-
-/*
- * #pragma ident	"@(#)fasttrap_isa.h	1.6	06/09/19 SMI"
- */
-
-#include <sys/types.h>
-#include <stdint.h>
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#define	FASTTRAP_MAX_INSTR_SIZE		15
-
-#define	FASTTRAP_INSTR			0xcc
-
-#define	FASTTRAP_SUNWDTRACE_SIZE	64
-
-typedef	uint8_t		fasttrap_instr_t;
-
-typedef struct fasttrap_machtp {
-	uint8_t		ftmt_instr[FASTTRAP_MAX_INSTR_SIZE]; /* orig. instr. */
-	uint8_t		ftmt_size;	/* instruction size */
-#if __sol64 || defined(__APPLE__)
-	uint8_t		ftmt_ripmode;	/* %rip-relative handling mode */
-	uint8_t		ftmt_modrm;	/* saved modrm byte */
-#endif
-	uint8_t		ftmt_type;	/* emulation type */
-	uint8_t		ftmt_code;	/* branch condition */
-	uint8_t		ftmt_base;	/* branch base */
-	uint8_t		ftmt_index;	/* branch index */
-	uint8_t		ftmt_scale;	/* branch scale */
-	uint8_t		ftmt_segment;	/* segment for memory accesses */
-	user_addr_t	ftmt_dest;	/* destination of control flow */
-} fasttrap_machtp_t;
-
-#define	ftt_instr	ftt_mtp.ftmt_instr
-#if __sol64 || defined(__APPLE__)
-#define	ftt_ripmode	ftt_mtp.ftmt_ripmode
-#define	ftt_modrm	ftt_mtp.ftmt_modrm
-#endif
-#define	ftt_size	ftt_mtp.ftmt_size
-#define	ftt_type	ftt_mtp.ftmt_type
-#define	ftt_code	ftt_mtp.ftmt_code
-#define	ftt_base	ftt_mtp.ftmt_base
-#define	ftt_index	ftt_mtp.ftmt_index
-#define	ftt_scale	ftt_mtp.ftmt_scale
-#define	ftt_segment	ftt_mtp.ftmt_segment
-#define	ftt_dest	ftt_mtp.ftmt_dest
-
-#define	FASTTRAP_T_COMMON	0x00	/* common case -- no emulation */
-#define	FASTTRAP_T_JCC		0x01	/* near and far conditional jumps */
-#define	FASTTRAP_T_LOOP		0x02	/* loop instructions */
-#define	FASTTRAP_T_JCXZ		0x03	/* jump if %ecx/%rcx is zero */
-#define	FASTTRAP_T_JMP		0x04	/* relative jump */
-#define	FASTTRAP_T_CALL		0x05	/* near call (and link) */
-#define	FASTTRAP_T_RET		0x06	/* ret */
-#define	FASTTRAP_T_RET16	0x07	/* ret <imm16> */
-
-/*
- * For performance rather than correctness.
- */
-#define	FASTTRAP_T_PUSHL_EBP	0x10	/* pushl %ebp (for function entry) */
-#define	FASTTRAP_T_NOP		0x11	/* nop */
-
-#define	FASTTRAP_RIP_1		0x1
-#define	FASTTRAP_RIP_2		0x2
-#define	FASTTRAP_RIP_X		0x4
-
-/*
- * Segment values.
- */
-#define	FASTTRAP_SEG_NONE		0
-#define	FASTTRAP_SEG_CS			1
-#define	FASTTRAP_SEG_DS			2
-#define	FASTTRAP_SEG_ES			3
-#define	FASTTRAP_SEG_FS			4
-#define	FASTTRAP_SEG_GS			5
-#define	FASTTRAP_SEG_SS			6
-
-#define	FASTTRAP_RETURN_AFRAMES		6	
-#define	FASTTRAP_ENTRY_AFRAMES		5
-#define	FASTTRAP_OFFSET_AFRAMES		5
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _FASTTRAP_ISA_H */
diff --git a/i386/include/i386/limits.h b/i386/include/i386/limits.h
deleted file mode 100644
index 9ee7c03..0000000
--- a/i386/include/i386/limits.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- */
-
-#ifndef _I386_LIMITS_H_
-#define _I386_LIMITS_H_
-
-#include <sys/cdefs.h>
-#include <i386/_limits.h>
-
-#define	CHAR_BIT	8		/* number of bits in a char */
-#define	MB_LEN_MAX	6		/* Allow 31 bit UTF2 */
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-#define	CLK_TCK		__DARWIN_CLK_TCK	/* ticks per second */
-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN and LONG_MIN is so the value is not unsigned; 2147483648 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- * These numbers work for pcc as well.  The UINT_MAX and ULONG_MAX values
- * are written as hex so that GCC will be quiet about large integer constants.
- */
-#define	SCHAR_MAX	127		/* min value for a signed char */
-#define	SCHAR_MIN	(-128)		/* max value for a signed char */
-
-#define	UCHAR_MAX	255		/* max value for an unsigned char */
-#define	CHAR_MAX	127		/* max value for a char */
-#define	CHAR_MIN	(-128)		/* min value for a char */
-
-#define	USHRT_MAX	65535		/* max value for an unsigned short */
-#define	SHRT_MAX	32767		/* max value for a short */
-#define	SHRT_MIN	(-32768)	/* min value for a short */
-
-#define	UINT_MAX	0xffffffff	/* max value for an unsigned int */
-#define	INT_MAX		2147483647	/* max value for an int */
-#define	INT_MIN		(-2147483647-1)	/* min value for an int */
-
-#ifdef __LP64__
-#define	ULONG_MAX	0xffffffffffffffffUL	/* max unsigned long */
-#define	LONG_MAX	0x7fffffffffffffffL	/* max signed long */
-#define	LONG_MIN	(-0x7fffffffffffffffL-1) /* min signed long */
-#else /* !__LP64__ */
-#define	ULONG_MAX	0xffffffffUL	/* max unsigned long */
-#define	LONG_MAX	2147483647L	/* max signed long */
-#define	LONG_MIN	(-2147483647L-1) /* min signed long */
-#endif /* __LP64__ */
-
-#define	ULLONG_MAX	0xffffffffffffffffULL	/* max unsigned long long */
-#define	LLONG_MAX	0x7fffffffffffffffLL	/* max signed long long */
-#define	LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min signed long long */
-
-#if !defined(_ANSI_SOURCE)
-#ifdef __LP64__
-#define LONG_BIT	64
-#else /* !__LP64__ */
-#define LONG_BIT	32
-#endif /* __LP64__ */
-#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
-#define WORD_BIT	32
-
-#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || defined(_DARWIN_C_SOURCE)
-#define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
-
-#define	UQUAD_MAX	ULLONG_MAX
-#define	QUAD_MAX	LLONG_MAX
-#define	QUAD_MIN	LLONG_MIN
-
-#endif /* (!_POSIX_C_SOURCE && !_XOPEN_SOURCE) || _DARWIN_C_SOURCE */
-#endif /* !_ANSI_SOURCE */
-
-#endif /* _I386_LIMITS_H_ */
diff --git a/i386/include/i386/param.h b/i386/include/i386/param.h
deleted file mode 100644
index 03a38d2..0000000
--- a/i386/include/i386/param.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)param.h	8.1 (Berkeley) 4/4/95
- */
-
-/*
- * Machine dependent constants for Intel 386.
- */
-
-#ifndef _I386_PARAM_H_
-#define _I386_PARAM_H_
-
-#include <i386/_param.h>
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value for all
- * data types (int, long, ...).   The result is unsigned int and must be
- * cast to any desired pointer type.
- */
-#define	ALIGNBYTES	__DARWIN_ALIGNBYTES
-#define	ALIGN(p)	__DARWIN_ALIGN(p)
-
-#define	NBPG		4096		/* bytes/page */
-#define	PGOFSET		(NBPG-1)	/* byte offset into page */
-#define	PGSHIFT		12		/* LOG2(NBPG) */
-
-#define	DEV_BSIZE	512
-#define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#define BLKDEV_IOSIZE	2048
-#define	MAXPHYS		(128 * 1024)	/* max raw I/O transfer size */
-
-#define	CLSIZE		1
-#define	CLSIZELOG2	0
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than CLBYTES (the software page size), and,
- * on machines that exchange pages of input or output buffers with mbuf
- * clusters (MAPPED_MBUFS), MCLBYTES must also be an integral multiple
- * of the hardware page size.
- */
-#define	MSIZE		256		/* size of an mbuf */
-#define	MCLBYTES	2048		/* large enough for ether MTU */
-#define	MCLSHIFT	11
-#define	MCLOFSET	(MCLBYTES - 1)
-#ifndef NMBCLUSTERS
-#ifdef GATEWAY
-#define	NMBCLUSTERS	((1024 * 1024) / MCLBYTES)	/* cl map size: 1MB */
-#else
-#define	NMBCLUSTERS	((1024 * 512) / MCLBYTES)	/* cl map size: 0.5MB */
-#endif
-#endif
-
-/*
- * Some macros for units conversion
- */
-/* Core clicks (NeXT_page_size bytes) to segments and vice versa */
-#define	ctos(x)	(x)
-#define	stoc(x)	(x)
-
-/* Core clicks (4096 bytes) to disk blocks */
-#define	ctod(x)	((x)<<(PGSHIFT-DEV_BSHIFT))
-#define	dtoc(x)	((x)>>(PGSHIFT-DEV_BSHIFT))
-#define	dtob(x)	((x)<<DEV_BSHIFT)
-
-/* clicks to bytes */
-#define	ctob(x)	((x)<<PGSHIFT)
-
-/* bytes to clicks */
-#define	btoc(x)	(((unsigned)(x)+(NBPG-1))>>PGSHIFT)
-
-#ifdef __APPLE__
-#define  btodb(bytes, devBlockSize)         \
-        ((unsigned)(bytes) / devBlockSize)
-#define  dbtob(db, devBlockSize)            \
-        ((unsigned)(db) * devBlockSize)
-#else
-#define	btodb(bytes)	 		/* calculates (bytes / DEV_BSIZE) */ \
-	((unsigned)(bytes) >> DEV_BSHIFT)
-#define	dbtob(db)			/* calculates (db * DEV_BSIZE) */ \
-	((unsigned)(db) << DEV_BSHIFT)
-#endif
-
-/*
- * Map a ``block device block'' to a file system block.
- * This should be device dependent, and will be if we
- * add an entry to cdevsw/bdevsw for that purpose.
- * For now though just use DEV_BSIZE.
- */
-#define	bdbtofsb(bn)	((bn) / (BLKDEV_IOSIZE/DEV_BSIZE))
-
-/*
- * Macros to decode (and encode) processor status word.
- */
-#define STATUS_WORD(rpl, ipl)	(((ipl) << 8) | (rpl))
-#define	USERMODE(x)		(((x) & 3) == 3)
-#define	BASEPRI(x)		(((x) & (255 << 8)) == 0)
-
-
-#if	defined(KERNEL) || defined(STANDALONE)
-#define	DELAY(n) delay(n)
-
-#else	/* defined(KERNEL) || defined(STANDALONE) */
-#define	DELAY(n)	{ register int N = (n); while (--N > 0); }
-#endif	/* defined(KERNEL) || defined(STANDALONE) */
-
-#endif /* _I386_PARAM_H_ */
diff --git a/i386/include/i386/profile.h b/i386/include/i386/profile.h
deleted file mode 100644
index 26782f8..0000000
--- a/i386/include/i386/profile.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1997, Apple Computer, Inc. All rights reserved.
- *
- */
-
-#ifndef _BSD_I386_PROFILE_H_
-#define _BSD_I386_PROFILE_H_
-
-#include <sys/appleapiopts.h>
-
-
-#endif /* _BSD_I386_PROFILE_H_ */
diff --git a/i386/include/i386/setjmp.h b/i386/include/i386/setjmp.h
deleted file mode 100644
index aff6e3c..0000000
--- a/i386/include/i386/setjmp.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1992 NeXT Computer, Inc.  All rights reserved.
- *
- *	File:	setjmp.h
- *
- *	Declaration of setjmp routines and data structures.
- */
-#ifndef _BSD_I386_SETJMP_H
-#define _BSD_I386_SETJMP_H
-
-#include <sys/cdefs.h>
-
-#if defined(__x86_64__)
-/*
- * _JBLEN is number of ints required to save the following:
- * rflags, rip, rbp, rsp, rbx, r12, r13, r14, r15... these are 8 bytes each
- * mxcsr, fp control word, sigmask... these are 4 bytes each
- * add 16 ints for future expansion needs...
- */
-#define _JBLEN ((9 * 2) + 3 + 16)
-typedef int jmp_buf[_JBLEN];
-typedef int sigjmp_buf[_JBLEN + 1];
-
-#else
-
-/*
- * _JBLEN is number of ints required to save the following:
- * eax, ebx, ecx, edx, edi, esi, ebp, esp, ss, eflags, eip,
- * cs, de, es, fs, gs == 16 ints
- * onstack, mask = 2 ints
- */
-
-#define _JBLEN (18)
-typedef int jmp_buf[_JBLEN];
-typedef int sigjmp_buf[_JBLEN + 1];
-
-#endif
-
-__BEGIN_DECLS
-int	setjmp(jmp_buf);
-void	longjmp(jmp_buf, int);
-
-#ifndef _ANSI_SOURCE
-int	_setjmp(jmp_buf);
-void	_longjmp(jmp_buf, int);
-int	sigsetjmp(sigjmp_buf, int);
-void	siglongjmp(sigjmp_buf, int);
-#endif /* _ANSI_SOURCE  */
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-void	longjmperror(void);
-#endif /* neither ANSI nor POSIX */
-__END_DECLS
-#endif /* !_BSD_I386_SETJMP_H */
diff --git a/i386/include/i386/signal.h b/i386/include/i386/signal.h
deleted file mode 100644
index 8419888..0000000
--- a/i386/include/i386/signal.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992 NeXT Computer, Inc.
- *
- */
-
-#ifndef	_I386_SIGNAL_H_
-#define	_I386_SIGNAL_H_ 1
-
-#include <sys/cdefs.h>
-
-#ifndef _ANSI_SOURCE
-typedef int sig_atomic_t; 
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-
-#include <sys/appleapiopts.h>
-
-#ifdef __APPLE_API_OBSOLETE
-
-/*
- * Information pushed on stack when a signal is delivered.
- * This is used by the kernel to restore state following
- * execution of the signal handler.  It is also made available
- * to the handler to allow it to properly restore state if
- * a non-standard exit is performed.
- */
-#define __need_struct_sigcontext
-#include <i386/_structs.h>
-
-#endif /* __APPLE_API_OBSOLETE */
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#endif /* ! _ANSI_SOURCE */
-
-#endif	/* _I386_SIGNAL_H_ */
-
diff --git a/i386/include/i386/types.h b/i386/include/i386/types.h
deleted file mode 100644
index ef4e660..0000000
--- a/i386/include/i386/types.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright 1995 NeXT Computer, Inc. All rights reserved.
- */
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)types.h	8.3 (Berkeley) 1/5/94
- */
-
-#ifndef	_MACHTYPES_H_
-#define	_MACHTYPES_H_
-
-#include <i386/types.h>
-
-
-#ifndef __ASSEMBLER__
-#include <i386/_types.h>
-#include <sys/cdefs.h>
-/*
- * Basic integral types.  Omit the typedef if
- * not possible for a machine/compiler combination.
- */
-#ifndef _INT8_T
-#define _INT8_T
-typedef	__signed char		int8_t;
-#endif
-typedef	unsigned char		u_int8_t;
-#ifndef _INT16_T
-#define _INT16_T
-typedef	short			int16_t;
-#endif
-typedef	unsigned short		u_int16_t;
-#ifndef _INT32_T
-#define _INT32_T
-typedef	int			int32_t;
-#endif
-typedef	unsigned int		u_int32_t;
-#ifndef _INT64_T
-#define _INT64_T
-typedef	long long		int64_t;
-#endif
-typedef	unsigned long long	u_int64_t;
-
-#if __LP64__
-typedef int64_t			register_t;
-#else
-typedef int32_t			register_t;
-#endif
-
-#ifndef _INTPTR_T
-#define _INTPTR_T
-typedef __darwin_intptr_t	intptr_t;
-#endif
-#ifndef _UINTPTR_T
-#define _UINTPTR_T
-typedef unsigned long		uintptr_t;
-#endif
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-/* These types are used for reserving the largest possible size. */
-typedef u_int64_t		user_addr_t;	
-typedef u_int64_t		user_size_t;	
-typedef int64_t			user_ssize_t;
-typedef int64_t			user_long_t;
-typedef u_int64_t		user_ulong_t;
-typedef int64_t			user_time_t;
-typedef int64_t			user_off_t;
-#define USER_ADDR_NULL	((user_addr_t) 0)
-#define CAST_USER_ADDR_T(a_ptr)   ((user_addr_t)((uintptr_t)(a_ptr)))
-
-
-#endif /* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-/* This defines the size of syscall arguments after copying into the kernel: */
-typedef u_int64_t		syscall_arg_t;
-
-#ifndef __offsetof
-#define __offsetof(type, field) ((size_t)(&((type *)0)->field))
-#endif
-
-#endif /* __ASSEMBLER__ */
-#endif	/* _MACHTYPES_H_ */
diff --git a/i386/include/i386/user_ldt.h b/i386/include/i386/user_ldt.h
deleted file mode 100644
index 3b61e3f..0000000
--- a/i386/include/i386/user_ldt.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon 
- * the rights to redistribute these changes.
- */
-
-/*
- */
-
-#ifndef	_I386_USER_LDT_H_
-#define	_I386_USER_LDT_H_
-
-/*
- * User LDT management.
- *
- * Each task may have its own LDT.
- */
-
-#define	LDT_AUTO_ALLOC	0xffffffff
-
-#include <sys/cdefs.h>
-
-union ldt_entry;
-
-__BEGIN_DECLS
-int i386_get_ldt(int, union ldt_entry *, int);
-int i386_set_ldt(int, const union ldt_entry *, int);
-__END_DECLS
-
-#endif	/* _I386_USER_LDT_H_ */
diff --git a/i386/include/i386/vmparam.h b/i386/include/i386/vmparam.h
deleted file mode 100644
index b6389b4..0000000
--- a/i386/include/i386/vmparam.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef	_BSD_I386_VMPARAM_H_
-#define	_BSD_I386_VMPARAM_H_ 1
-
-#include <sys/resource.h>
-
-/* Rosetta dependency on this address */
-#define	USRSTACK	VM_USRSTACK32
-
-#define	USRSTACK64	VM_USRSTACK64
-
-
-/*
- * Virtual memory related constants, all in bytes
- */
-#ifndef DFLDSIZ
-#define	DFLDSIZ		(RLIM_INFINITY)		/* initial data size limit */
-#endif
-#ifndef MAXDSIZ
-#define	MAXDSIZ		(RLIM_INFINITY)		/* max data size */
-#endif
-#ifndef	DFLSSIZ
-#define	DFLSSIZ		(8*1024*1024)		/* initial stack size limit */
-#endif
-#ifndef	MAXSSIZ
-#define	MAXSSIZ		(64*1024*1024)		/* max stack size */
-#endif
-#ifndef	DFLCSIZ
-#define DFLCSIZ		(0)			/* initial core size limit */
-#endif
-#ifndef	MAXCSIZ
-#define MAXCSIZ		(RLIM_INFINITY)		/* max core size */
-#endif	/* MAXCSIZ */
-
-#endif	/* _BSD_I386_VMPARAM_H_ */
diff --git a/i386/include/inttypes.h b/i386/include/inttypes.h
deleted file mode 100644
index 4f9dd8d..0000000
--- a/i386/include/inttypes.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 2002, 2003, 2004 Apple Computer, Inc.
- * All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-/*
- * <inttypes.h> -- Standard C header, defined in ISO/IEC 9899:1999
- * (aka "C99"), section 7.8.   This defines format string conversion
- * specifiers suitable for use within arguments to fprintf and fscanf
- * and their ilk.
- */
-
-/* "C++ implementations should define these macros only when
- *  __STDC_FORMAT_MACROS is defined before <inttypes.h> is included."
- */
-#if (!defined(__cplusplus) || defined(__STDC_FORMAT_MACROS)) && !defined(__STDC_FORMAT_MACROS_DEFINED)
-#define __STDC_FORMAT_MACROS_DEFINED
-
-#  undef __PRI_8_LENGTH_MODIFIER__
-#  undef __PRI_64_LENGTH_MODIFIER__
-#  undef __SCN_64_LENGTH_MODIFIER__
-
-#  if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 > 1020
-#    define __PRI_8_LENGTH_MODIFIER__ "hh"
-#    define __PRI_64_LENGTH_MODIFIER__ "ll"
-#    define __SCN_64_LENGTH_MODIFIER__ "ll"
-#  else
-/* These could be "hh", "ll", and "ll" respectively, but that doesn't work on
-   10.2, and these do.  Note that there's no way to use scanf to scan a
-   decimal into a 'char' argument on 10.2, so "hh" is used unconditionally
-   and programs that use it won't work on Jaguar.  */
-#    define __PRI_8_LENGTH_MODIFIER__ ""  /* none */
-#    define __PRI_64_LENGTH_MODIFIER__ "q"
-#    define __SCN_64_LENGTH_MODIFIER__ "q"
-#  endif
-#  define __PRI_MAX_LENGTH_MODIFIER__ "j"
-#  define __SCN_MAX_LENGTH_MODIFIER__ "j"
-
-#  define PRId8         __PRI_8_LENGTH_MODIFIER__ "d"
-#  define PRIi8         __PRI_8_LENGTH_MODIFIER__ "i"
-#  define PRIo8         __PRI_8_LENGTH_MODIFIER__ "o"
-#  define PRIu8         __PRI_8_LENGTH_MODIFIER__ "u"
-#  define PRIx8         __PRI_8_LENGTH_MODIFIER__ "x"
-#  define PRIX8         __PRI_8_LENGTH_MODIFIER__ "X"
-
-#  define PRId16        "hd"
-#  define PRIi16        "hi"
-#  define PRIo16        "ho"
-#  define PRIu16        "hu"
-#  define PRIx16        "hx"
-#  define PRIX16        "hX"
-
-#  define PRId32        "d"
-#  define PRIi32        "i"
-#  define PRIo32        "o"
-#  define PRIu32        "u"
-#  define PRIx32        "x"
-#  define PRIX32        "X"
-
-#  define PRId64        __PRI_64_LENGTH_MODIFIER__ "d"
-#  define PRIi64        __PRI_64_LENGTH_MODIFIER__ "i"
-#  define PRIo64        __PRI_64_LENGTH_MODIFIER__ "o"
-#  define PRIu64        __PRI_64_LENGTH_MODIFIER__ "u"
-#  define PRIx64        __PRI_64_LENGTH_MODIFIER__ "x"
-#  define PRIX64        __PRI_64_LENGTH_MODIFIER__ "X"
-
-#  define PRIdLEAST8    PRId8
-#  define PRIiLEAST8    PRIi8
-#  define PRIoLEAST8    PRIo8
-#  define PRIuLEAST8    PRIu8
-#  define PRIxLEAST8    PRIx8
-#  define PRIXLEAST8    PRIX8
-
-#  define PRIdLEAST16   PRId16
-#  define PRIiLEAST16   PRIi16
-#  define PRIoLEAST16   PRIo16
-#  define PRIuLEAST16   PRIu16
-#  define PRIxLEAST16   PRIx16
-#  define PRIXLEAST16   PRIX16
-
-#  define PRIdLEAST32   PRId32
-#  define PRIiLEAST32   PRIi32
-#  define PRIoLEAST32   PRIo32
-#  define PRIuLEAST32   PRIu32
-#  define PRIxLEAST32   PRIx32
-#  define PRIXLEAST32   PRIX32
-
-#  define PRIdLEAST64   PRId64
-#  define PRIiLEAST64   PRIi64
-#  define PRIoLEAST64   PRIo64
-#  define PRIuLEAST64   PRIu64
-#  define PRIxLEAST64   PRIx64
-#  define PRIXLEAST64   PRIX64
-
-#  define PRIdFAST8     PRId8
-#  define PRIiFAST8     PRIi8
-#  define PRIoFAST8     PRIo8
-#  define PRIuFAST8     PRIu8
-#  define PRIxFAST8     PRIx8
-#  define PRIXFAST8     PRIX8
-
-#  define PRIdFAST16    PRId16
-#  define PRIiFAST16    PRIi16
-#  define PRIoFAST16    PRIo16
-#  define PRIuFAST16    PRIu16
-#  define PRIxFAST16    PRIx16
-#  define PRIXFAST16    PRIX16
-
-#  define PRIdFAST32    PRId32
-#  define PRIiFAST32    PRIi32
-#  define PRIoFAST32    PRIo32
-#  define PRIuFAST32    PRIu32
-#  define PRIxFAST32    PRIx32
-#  define PRIXFAST32    PRIX32
-
-#  define PRIdFAST64    PRId64
-#  define PRIiFAST64    PRIi64
-#  define PRIoFAST64    PRIo64
-#  define PRIuFAST64    PRIu64
-#  define PRIxFAST64    PRIx64
-#  define PRIXFAST64    PRIX64
-
-/* int32_t is 'int', but intptr_t is 'long'.  */
-#  define PRIdPTR       "ld"
-#  define PRIiPTR       "li"
-#  define PRIoPTR       "lo"
-#  define PRIuPTR       "lu"
-#  define PRIxPTR       "lx"
-#  define PRIXPTR       "lX"
-
-#  define PRIdMAX        __PRI_MAX_LENGTH_MODIFIER__ "d"
-#  define PRIiMAX        __PRI_MAX_LENGTH_MODIFIER__ "i"
-#  define PRIoMAX        __PRI_MAX_LENGTH_MODIFIER__ "o"
-#  define PRIuMAX        __PRI_MAX_LENGTH_MODIFIER__ "u"
-#  define PRIxMAX        __PRI_MAX_LENGTH_MODIFIER__ "x"
-#  define PRIXMAX        __PRI_MAX_LENGTH_MODIFIER__ "X"
-
-#  if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 > 1020
-#    define SCNd8         __PRI_8_LENGTH_MODIFIER__ "d"
-#    define SCNi8         __PRI_8_LENGTH_MODIFIER__ "i"
-#    define SCNo8         __PRI_8_LENGTH_MODIFIER__ "o"
-#    define SCNu8         __PRI_8_LENGTH_MODIFIER__ "u"
-#    define SCNx8         __PRI_8_LENGTH_MODIFIER__ "x"
-#  else
-#    define SCNd8         "hhd"
-#    define SCNi8         "hhi"
-#    define SCNo8         "hho"
-#    define SCNu8         "hhu"
-#    define SCNx8         "hhx"
-#  endif
-
-#  define SCNd16        "hd"
-#  define SCNi16        "hi"
-#  define SCNo16        "ho"
-#  define SCNu16        "hu"
-#  define SCNx16        "hx"
-
-#  define SCNd32        "d"
-#  define SCNi32        "i"
-#  define SCNo32        "o"
-#  define SCNu32        "u"
-#  define SCNx32        "x"
-
-#  define SCNd64        __SCN_64_LENGTH_MODIFIER__ "d"
-#  define SCNi64        __SCN_64_LENGTH_MODIFIER__ "i"
-#  define SCNo64        __SCN_64_LENGTH_MODIFIER__ "o"
-#  define SCNu64        __SCN_64_LENGTH_MODIFIER__ "u"
-#  define SCNx64        __SCN_64_LENGTH_MODIFIER__ "x"
-
-#  define SCNdLEAST8    SCNd8
-#  define SCNiLEAST8    SCNi8
-#  define SCNoLEAST8    SCNo8
-#  define SCNuLEAST8    SCNu8
-#  define SCNxLEAST8    SCNx8
-
-#  define SCNdLEAST16   SCNd16
-#  define SCNiLEAST16   SCNi16
-#  define SCNoLEAST16   SCNo16
-#  define SCNuLEAST16   SCNu16
-#  define SCNxLEAST16   SCNx16
-
-#  define SCNdLEAST32   SCNd32
-#  define SCNiLEAST32   SCNi32
-#  define SCNoLEAST32   SCNo32
-#  define SCNuLEAST32   SCNu32
-#  define SCNxLEAST32   SCNx32
-
-#  define SCNdLEAST64   SCNd64
-#  define SCNiLEAST64   SCNi64
-#  define SCNoLEAST64   SCNo64
-#  define SCNuLEAST64   SCNu64
-#  define SCNxLEAST64   SCNx64
-
-#  define SCNdFAST8     SCNd8
-#  define SCNiFAST8     SCNi8
-#  define SCNoFAST8     SCNo8
-#  define SCNuFAST8     SCNu8
-#  define SCNxFAST8     SCNx8
-
-#  define SCNdFAST16    SCNd16
-#  define SCNiFAST16    SCNi16
-#  define SCNoFAST16    SCNo16
-#  define SCNuFAST16    SCNu16
-#  define SCNxFAST16    SCNx16
-
-#  define SCNdFAST32    SCNd32
-#  define SCNiFAST32    SCNi32
-#  define SCNoFAST32    SCNo32
-#  define SCNuFAST32    SCNu32
-#  define SCNxFAST32    SCNx32
-
-#  define SCNdFAST64    SCNd64
-#  define SCNiFAST64    SCNi64
-#  define SCNoFAST64    SCNo64
-#  define SCNuFAST64    SCNu64
-#  define SCNxFAST64    SCNx64
-
-#  define SCNdPTR       "ld"
-#  define SCNiPTR       "li"
-#  define SCNoPTR       "lo"
-#  define SCNuPTR       "lu"
-#  define SCNxPTR       "lx"
-
-#  define SCNdMAX       __SCN_MAX_LENGTH_MODIFIER__ "d"
-#  define SCNiMAX       __SCN_MAX_LENGTH_MODIFIER__ "i"
-#  define SCNoMAX       __SCN_MAX_LENGTH_MODIFIER__ "o"
-#  define SCNuMAX       __SCN_MAX_LENGTH_MODIFIER__ "u"
-#  define SCNxMAX       __SCN_MAX_LENGTH_MODIFIER__ "x"
-
-#endif /* if C++, then __STDC_FORMAT_MACROS enables the above macros */
-
-#if !defined(_INTTYPES_H_)
-#define _INTTYPES_H_
-
-#include <sys/cdefs.h>		/* For __BEGIN_DECLS and __END_DECLS */
-#include <_types.h>		/* For __darwin_wchar_t */
-#include <stdint.h>
-
-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
-  /* Translator is not ISO/IEC 9899:1999-compliant. */
-#  if !defined(restrict)
-#    define restrict
-#    define __RESTRICT_KEYWORD_DEFINED__
-#  endif
-#endif
-
-__BEGIN_DECLS
-
-  /* 7.8.2.1 */
-  extern intmax_t imaxabs(intmax_t j);
-
-  /* 7.8.2.2 */
-  typedef struct {
-        intmax_t quot;
-        intmax_t rem;
-  } imaxdiv_t;
-
-  extern imaxdiv_t imaxdiv(intmax_t numer, intmax_t denom);
-
-  /* 7.8.2.3 */
-  extern intmax_t strtoimax(const char * restrict nptr, char ** restrict endptr, int base);
-  extern uintmax_t strtoumax(const char * restrict nptr, char ** restrict endptr, int base);
-
-#ifndef __cplusplus /* wchar_t is a built-in type in C++ */
-#  ifndef	_WCHAR_T
-#    define	_WCHAR_T
-     typedef	__darwin_wchar_t	wchar_t;
-#  endif /* _WCHAR_T */
-#endif /* __cplusplus */
-
-  /* 7.8.2.4 */
-  extern intmax_t wcstoimax(const wchar_t * restrict nptr, wchar_t ** restrict endptr, int base);
-  extern uintmax_t wcstoumax(const wchar_t * restrict nptr, wchar_t ** restrict endptr, int base);
-
-/* Poison the following routines if -fshort-wchar is set */
-#if !defined(__cplusplus) && defined(__WCHAR_MAX__) && __WCHAR_MAX__ <= 0xffffU
-#pragma GCC poison wcstoimax wcstoumax
-#endif
-
-__END_DECLS
-
-#ifdef _USE_EXTENDED_LOCALES_
-#include <xlocale/_inttypes.h>
-#endif /* _USE_EXTENDED_LOCALES_ */
-
-/*
-   No need to #undef the __*_{8,64}_LENGTH_MODIFIER__ macros;
-   in fact, you can't #undef them, because later uses of any of
-   their dependents will *not* then do the intended substitution.
-   Expansion of a #define like this one:
-
-        #define x IDENT y
-
-   uses the cpp value of IDENT at the location where x is *expanded*,
-   not where it is #defined.
-*/
-
-#if defined(__RESTRICT_KEYWORD_DEFINED__)
-#  undef restrict
-#  undef __RESTRICT_KEYWORD_DEFINED__
-#endif
-
-#endif /* !_INTTYPES_H_ */
diff --git a/i386/include/libkern/OSAtomic.h b/i386/include/libkern/OSAtomic.h
deleted file mode 100644
index 9f2dba4..0000000
--- a/i386/include/libkern/OSAtomic.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _OSATOMIC_H_
-#define _OSATOMIC_H_
-
-#include    <stddef.h>
-#include    <sys/cdefs.h>
-#include    <stdint.h>
-#include    <stdbool.h>
-
-/* These are the preferred versions of the atomic and synchronization operations.
- * Their implementation is customized at boot time for the platform, including
- * late-breaking errata fixes as necessary.   They are thread safe.
- *
- * WARNING: all addresses passed to these functions must be "naturally aligned", ie
- * int32_t's must be 32-bit aligned (low 2 bits of address zero), and int64_t's
- * must be 64-bit aligned (low 3 bits of address zero.)
- *
- * Note that some versions of the atomic functions incorporate memory barriers,
- * and some do not.  Barriers strictly order memory access on a weakly-ordered
- * architecture such as PPC.  All loads and stores executed in sequential program
- * order before the barrier will complete before any load or store executed after
- * the barrier.  On a uniprocessor, the barrier operation is typically a nop.
- * On a multiprocessor, the barrier can be quite expensive on some platforms,
- * eg PPC.
- *
- * Most code will want to use the barrier functions to insure that memory shared
- * between threads is properly synchronized.  For example, if you want to initialize
- * a shared data structure and then atomically increment a variable to indicate
- * that the initialization is complete, then you must use OSAtomicIncrement32Barrier()
- * to ensure that the stores to your data structure complete before the atomic add.
- * Likewise, the consumer of that data structure must use OSAtomicDecrement32Barrier(),
- * in order to ensure that their loads of the structure are not executed before
- * the atomic decrement.  On the other hand, if you are simply incrementing a global
- * counter, then it is safe and potentially faster to use OSAtomicIncrement32().
- *
- * If you are unsure which version to use, prefer the barrier variants as they are
- * safer.
- *
- * The spinlock and queue operations always incorporate a barrier.
- */ 
-__BEGIN_DECLS
-
-
-/* Arithmetic functions.  They return the new value.
- */
-int32_t	OSAtomicAdd32( int32_t __theAmount, volatile int32_t *__theValue );
-int32_t	OSAtomicAdd32Barrier( int32_t __theAmount, volatile int32_t *__theValue );
-
-__inline static
-int32_t	OSAtomicIncrement32( volatile int32_t *__theValue )
-            { return OSAtomicAdd32(  1, __theValue); }
-__inline static
-int32_t	OSAtomicIncrement32Barrier( volatile int32_t *__theValue )
-            { return OSAtomicAdd32Barrier(  1, __theValue); }
-
-__inline static
-int32_t	OSAtomicDecrement32( volatile int32_t *__theValue )
-            { return OSAtomicAdd32( -1, __theValue); }
-__inline static
-int32_t	OSAtomicDecrement32Barrier( volatile int32_t *__theValue )
-            { return OSAtomicAdd32Barrier( -1, __theValue); }
-
-#if defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__)
-
-int64_t	OSAtomicAdd64( int64_t __theAmount, volatile int64_t *__theValue );
-int64_t	OSAtomicAdd64Barrier( int64_t __theAmount, volatile int64_t *__theValue );
-
-__inline static
-int64_t	OSAtomicIncrement64( volatile int64_t *__theValue )
-            { return OSAtomicAdd64(  1, __theValue); }
-__inline static
-int64_t	OSAtomicIncrement64Barrier( volatile int64_t *__theValue )
-            { return OSAtomicAdd64Barrier(  1, __theValue); }
-
-__inline static
-int64_t	OSAtomicDecrement64( volatile int64_t *__theValue )
-            { return OSAtomicAdd64( -1, __theValue); }
-__inline static
-int64_t	OSAtomicDecrement64Barrier( volatile int64_t *__theValue )
-            { return OSAtomicAdd64Barrier( -1, __theValue); }
-
-#endif  /* defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__) */
-
-
-/* Boolean functions (and, or, xor.)  These come in four versions for each operation:
- * with and without barriers, and returning the old or new value of the operation.
- * The "Orig" versions return the original value, ie before the operation, the non-Orig
- * versions return the value after the operation.  All are layered on top of
- * compare-and-swap.
- */
-int32_t	OSAtomicOr32( uint32_t __theMask, volatile uint32_t *__theValue );
-int32_t	OSAtomicOr32Barrier( uint32_t __theMask, volatile uint32_t *__theValue );
-int32_t	OSAtomicOr32Orig( uint32_t __theMask, volatile uint32_t *__theValue );
-int32_t	OSAtomicOr32OrigBarrier( uint32_t __theMask, volatile uint32_t *__theValue );
-
-int32_t	OSAtomicAnd32( uint32_t __theMask, volatile uint32_t *__theValue ); 
-int32_t	OSAtomicAnd32Barrier( uint32_t __theMask, volatile uint32_t *__theValue ); 
-int32_t	OSAtomicAnd32Orig( uint32_t __theMask, volatile uint32_t *__theValue ); 
-int32_t	OSAtomicAnd32OrigBarrier( uint32_t __theMask, volatile uint32_t *__theValue ); 
-
-int32_t	OSAtomicXor32( uint32_t __theMask, volatile uint32_t *__theValue );
-int32_t	OSAtomicXor32Barrier( uint32_t __theMask, volatile uint32_t *__theValue );
-int32_t	OSAtomicXor32Orig( uint32_t __theMask, volatile uint32_t *__theValue );
-int32_t	OSAtomicXor32OrigBarrier( uint32_t __theMask, volatile uint32_t *__theValue );
- 
-
-/* Compare and swap.  They return true if the swap occured.  There are several versions,
- * depending on data type and whether or not a barrier is used.
- */
-bool    OSAtomicCompareAndSwap32( int32_t __oldValue, int32_t __newValue, volatile int32_t *__theValue );
-bool    OSAtomicCompareAndSwap32Barrier( int32_t __oldValue, int32_t __newValue, volatile int32_t *__theValue );
-bool	OSAtomicCompareAndSwapPtr( void *__oldValue, void *__newValue, void * volatile *__theValue );
-bool	OSAtomicCompareAndSwapPtrBarrier( void *__oldValue, void *__newValue, void * volatile *__theValue );
-bool	OSAtomicCompareAndSwapInt( int __oldValue, int __newValue, volatile int *__theValue );
-bool	OSAtomicCompareAndSwapIntBarrier( int __oldValue, int __newValue, volatile int *__theValue );
-bool	OSAtomicCompareAndSwapLong( long __oldValue, long __newValue, volatile long *__theValue );
-bool	OSAtomicCompareAndSwapLongBarrier( long __oldValue, long __newValue, volatile long *__theValue );
-
-#if defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__)
-
-bool    OSAtomicCompareAndSwap64( int64_t __oldValue, int64_t __newValue, volatile int64_t *__theValue );
-bool    OSAtomicCompareAndSwap64Barrier( int64_t __oldValue, int64_t __newValue, volatile int64_t *__theValue );
-
-#endif  /* defined(__ppc64__) || defined(__i386__) || defined(__x86_64__) || defined(__arm__) */
-
-
-/* Test and set.  They return the original value of the bit, and operate on bit (0x80>>(n&7))
- * in byte ((char*)theAddress + (n>>3)).
- */
-bool    OSAtomicTestAndSet( uint32_t __n, volatile void *__theAddress );
-bool    OSAtomicTestAndSetBarrier( uint32_t __n, volatile void *__theAddress );
-bool    OSAtomicTestAndClear( uint32_t __n, volatile void *__theAddress );
-bool    OSAtomicTestAndClearBarrier( uint32_t __n, volatile void *__theAddress );
- 
-
-/* Spinlocks.  These use memory barriers as required to synchronize access to shared
- * memory protected by the lock.  The lock operation spins, but employs various strategies
- * to back off if the lock is held, making it immune to most priority-inversion livelocks.
- * The try operation immediately returns false if the lock was held, true if it took the
- * lock.  The convention is that unlocked is zero, locked is nonzero.
- */
-#define	OS_SPINLOCK_INIT    0
-
-typedef int32_t OSSpinLock;
-
-bool    OSSpinLockTry( volatile OSSpinLock *__lock );
-void    OSSpinLockLock( volatile OSSpinLock *__lock );
-void    OSSpinLockUnlock( volatile OSSpinLock *__lock );
-
-
-/* Lockless atomic enqueue and dequeue.  These routines manipulate singly
- * linked LIFO lists.  Ie, a dequeue will return the most recently enqueued
- * element, or NULL if the list is empty.  The "offset" parameter is the offset
- * in bytes of the link field within the data structure being queued.  The
- * link field should be a pointer type.  Memory barriers are incorporated as 
- * needed to permit thread-safe access to the queue element.
- */
-#if defined(__x86_64__)
-
-typedef volatile struct {
-	void	*opaque1;
-	long	 opaque2;
-} OSQueueHead __attribute__ ((aligned (16)));
-
-#else
-
-typedef volatile struct {
-	void	*opaque1;
-	long	 opaque2;
-} OSQueueHead;
-
-#endif
-
-#define	OS_ATOMIC_QUEUE_INIT	{ NULL, 0 }
-
-void  OSAtomicEnqueue( OSQueueHead *__list, void *__new, size_t __offset);
-void* OSAtomicDequeue( OSQueueHead *__list, size_t __offset);
-
-
-/* Memory barrier.  It is both a read and write barrier.
- */
-void    OSMemoryBarrier( void );
-
-
-__END_DECLS
-
-#endif /* _OSATOMIC_H_ */
diff --git a/i386/include/libkern/OSByteOrder.h b/i386/include/libkern/OSByteOrder.h
deleted file mode 100644
index 915a249..0000000
--- a/i386/include/libkern/OSByteOrder.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _OS_OSBYTEORDER_H
-#define _OS_OSBYTEORDER_H
-
-#include <stdint.h>
-#include <libkern/_OSByteOrder.h>
-
-/* Macros for swapping constant values in the preprocessing stage. */
-#define OSSwapConstInt16(x)	__DARWIN_OSSwapConstInt16(x)
-#define OSSwapConstInt32(x)	__DARWIN_OSSwapConstInt32(x)
-#define OSSwapConstInt64(x)	__DARWIN_OSSwapConstInt64(x)
-
-#if defined(__GNUC__)
-
-#if (defined(__ppc__) || defined(__ppc64__))
-#include <libkern/ppc/OSByteOrder.h>
-#elif (defined(__i386__) || defined(__x86_64__))
-#include <libkern/i386/OSByteOrder.h>
-#elif defined(__arm__)
-#include <libkern/arm/OSByteOrder.h>
-#else
-#include <libkern/machine/OSByteOrder.h>
-#endif
-
-#else /* ! __GNUC__ */
-
-#include <libkern/machine/OSByteOrder.h>
-
-#endif /* __GNUC__ */
-
-#define OSSwapInt16(x)	__DARWIN_OSSwapInt16(x)
-#define OSSwapInt32(x)	__DARWIN_OSSwapInt32(x)
-#define OSSwapInt64(x)	__DARWIN_OSSwapInt64(x)
-
-enum {
-    OSUnknownByteOrder,
-    OSLittleEndian,
-    OSBigEndian
-};
-
-OS_INLINE
-int32_t
-OSHostByteOrder(void) {
-#if defined(__LITTLE_ENDIAN__)
-    return OSLittleEndian;
-#elif defined(__BIG_ENDIAN__)
-    return OSBigEndian;
-#else
-    return OSUnknownByteOrder;
-#endif
-}
-
-#define OSReadBigInt(x, y)		OSReadBigInt32(x, y)
-#define OSWriteBigInt(x, y, z)		OSWriteBigInt32(x, y, z)
-#define OSSwapBigToHostInt(x)		OSSwapBigToHostInt32(x)
-#define OSSwapHostToBigInt(x)		OSSwapHostToBigInt32(x)
-#define OSReadLittleInt(x, y)		OSReadLittleInt32(x, y)
-#define OSWriteLittleInt(x, y, z)	OSWriteLittleInt32(x, y, z)
-#define OSSwapHostToLittleInt(x)	OSSwapHostToLittleInt32(x)
-#define OSSwapLittleToHostInt(x)	OSSwapLittleToHostInt32(x)
-
-/* Functions for loading native endian values. */
-
-OS_INLINE
-uint16_t
-_OSReadInt16(
-    const volatile void               * base,
-    uintptr_t                     byteOffset
-)
-{
-    return *(volatile uint16_t *)((uintptr_t)base + byteOffset);
-}
-
-OS_INLINE
-uint32_t
-_OSReadInt32(
-    const volatile void               * base,
-    uintptr_t                     byteOffset
-)
-{
-    return *(volatile uint32_t *)((uintptr_t)base + byteOffset);
-}
-
-OS_INLINE
-uint64_t
-_OSReadInt64(
-    const volatile void               * base,
-    uintptr_t                     byteOffset
-)
-{
-    return *(volatile uint64_t *)((uintptr_t)base + byteOffset);
-}
-
-/* Functions for storing native endian values. */
-
-OS_INLINE
-void
-_OSWriteInt16(
-    volatile void               * base,
-    uintptr_t                     byteOffset,
-    uint16_t                      data
-)
-{
-    *(volatile uint16_t *)((uintptr_t)base + byteOffset) = data;
-}
-
-OS_INLINE
-void
-_OSWriteInt32(
-    volatile void               * base,
-    uintptr_t                     byteOffset,
-    uint32_t                      data
-)
-{
-    *(volatile uint32_t *)((uintptr_t)base + byteOffset) = data;
-}
-
-OS_INLINE
-void
-_OSWriteInt64(
-    volatile void               * base,
-    uintptr_t                     byteOffset,
-    uint64_t                      data
-)
-{
-    *(volatile uint64_t *)((uintptr_t)base + byteOffset) = data;
-}
-
-#if		defined(__BIG_ENDIAN__)
-
-/* Functions for loading big endian to host endianess. */
-
-#define OSReadBigInt16(base, byteOffset) _OSReadInt16(base, byteOffset)
-#define OSReadBigInt32(base, byteOffset) _OSReadInt32(base, byteOffset)
-#define OSReadBigInt64(base, byteOffset) _OSReadInt64(base, byteOffset)
-
-/* Functions for storing host endianess to big endian. */
-
-#define OSWriteBigInt16(base, byteOffset, data) _OSWriteInt16(base, byteOffset, data)
-#define OSWriteBigInt32(base, byteOffset, data) _OSWriteInt32(base, byteOffset, data)
-#define OSWriteBigInt64(base, byteOffset, data) _OSWriteInt64(base, byteOffset, data)
-
-/* Functions for loading little endian to host endianess. */
-
-#define OSReadLittleInt16(base, byteOffset) OSReadSwapInt16(base, byteOffset)
-#define OSReadLittleInt32(base, byteOffset) OSReadSwapInt32(base, byteOffset)
-#define OSReadLittleInt64(base, byteOffset) OSReadSwapInt64(base, byteOffset)
-
-/* Functions for storing host endianess to little endian. */
-
-#define OSWriteLittleInt16(base, byteOffset, data) OSWriteSwapInt16(base, byteOffset, data)
-#define OSWriteLittleInt32(base, byteOffset, data) OSWriteSwapInt32(base, byteOffset, data)
-#define OSWriteLittleInt64(base, byteOffset, data) OSWriteSwapInt64(base, byteOffset, data)
-
-/* Host endianess to big endian byte swapping macros for constants. */
-
-#define OSSwapHostToBigConstInt16(x) ((uint16_t)(x))
-#define OSSwapHostToBigConstInt32(x) ((uint32_t)(x))
-#define OSSwapHostToBigConstInt64(x) ((uint64_t)(x))
-
-/* Generic host endianess to big endian byte swapping functions. */
-
-#define OSSwapHostToBigInt16(x) ((uint16_t)(x))
-#define OSSwapHostToBigInt32(x) ((uint32_t)(x))
-#define OSSwapHostToBigInt64(x) ((uint64_t)(x))
-
-/* Host endianess to little endian byte swapping macros for constants. */
-
-#define OSSwapHostToLittleConstInt16(x) OSSwapConstInt16(x)
-#define OSSwapHostToLittleConstInt32(x) OSSwapConstInt32(x) 
-#define OSSwapHostToLittleConstInt64(x) OSSwapConstInt64(x) 
-
-/* Generic host endianess to little endian byte swapping functions. */
-
-#define OSSwapHostToLittleInt16(x) OSSwapInt16(x)
-#define OSSwapHostToLittleInt32(x) OSSwapInt32(x)
-#define OSSwapHostToLittleInt64(x) OSSwapInt64(x)
-
-/* Big endian to host endianess byte swapping macros for constants. */
-    
-#define OSSwapBigToHostConstInt16(x) ((uint16_t)(x))
-#define OSSwapBigToHostConstInt32(x) ((uint32_t)(x))
-#define OSSwapBigToHostConstInt64(x) ((uint64_t)(x))
-
-/* Generic big endian to host endianess byte swapping functions. */
-
-#define OSSwapBigToHostInt16(x) ((uint16_t)(x))
-#define OSSwapBigToHostInt32(x) ((uint32_t)(x))
-#define OSSwapBigToHostInt64(x) ((uint64_t)(x))
-
-/* Little endian to host endianess byte swapping macros for constants. */
-   
-#define OSSwapLittleToHostConstInt16(x) OSSwapConstInt16(x)
-#define OSSwapLittleToHostConstInt32(x) OSSwapConstInt32(x)
-#define OSSwapLittleToHostConstInt64(x) OSSwapConstInt64(x)
-
-/* Generic little endian to host endianess byte swapping functions. */
-
-#define OSSwapLittleToHostInt16(x) OSSwapInt16(x)
-#define OSSwapLittleToHostInt32(x) OSSwapInt32(x)
-#define OSSwapLittleToHostInt64(x) OSSwapInt64(x)
-
-#elif		defined(__LITTLE_ENDIAN__)
-
-/* Functions for loading big endian to host endianess. */
-
-#define OSReadBigInt16(base, byteOffset) OSReadSwapInt16(base, byteOffset)
-#define OSReadBigInt32(base, byteOffset) OSReadSwapInt32(base, byteOffset)
-#define OSReadBigInt64(base, byteOffset) OSReadSwapInt64(base, byteOffset)
-
-/* Functions for storing host endianess to big endian. */
-
-#define OSWriteBigInt16(base, byteOffset, data) OSWriteSwapInt16(base, byteOffset, data)
-#define OSWriteBigInt32(base, byteOffset, data) OSWriteSwapInt32(base, byteOffset, data)
-#define OSWriteBigInt64(base, byteOffset, data) OSWriteSwapInt64(base, byteOffset, data)
-
-/* Functions for loading little endian to host endianess. */
-
-#define OSReadLittleInt16(base, byteOffset) _OSReadInt16(base, byteOffset)
-#define OSReadLittleInt32(base, byteOffset) _OSReadInt32(base, byteOffset)
-#define OSReadLittleInt64(base, byteOffset) _OSReadInt64(base, byteOffset)
-
-/* Functions for storing host endianess to little endian. */
-
-#define OSWriteLittleInt16(base, byteOffset, data) _OSWriteInt16(base, byteOffset, data)
-#define OSWriteLittleInt32(base, byteOffset, data) _OSWriteInt32(base, byteOffset, data)
-#define OSWriteLittleInt64(base, byteOffset, data) _OSWriteInt64(base, byteOffset, data)
-
-/* Host endianess to big endian byte swapping macros for constants. */
-
-#define OSSwapHostToBigConstInt16(x) OSSwapConstInt16(x)
-#define OSSwapHostToBigConstInt32(x) OSSwapConstInt32(x)
-#define OSSwapHostToBigConstInt64(x) OSSwapConstInt64(x)
-
-/* Generic host endianess to big endian byte swapping functions. */
-
-#define OSSwapHostToBigInt16(x) OSSwapInt16(x)
-#define OSSwapHostToBigInt32(x) OSSwapInt32(x)
-#define OSSwapHostToBigInt64(x) OSSwapInt64(x)
-
-/* Host endianess to little endian byte swapping macros for constants. */
-
-#define OSSwapHostToLittleConstInt16(x) ((uint16_t)(x))
-#define OSSwapHostToLittleConstInt32(x) ((uint32_t)(x))
-#define OSSwapHostToLittleConstInt64(x) ((uint64_t)(x)) 
-
-/* Generic host endianess to little endian byte swapping functions. */
-
-#define OSSwapHostToLittleInt16(x) ((uint16_t)(x))
-#define OSSwapHostToLittleInt32(x) ((uint32_t)(x))
-#define OSSwapHostToLittleInt64(x) ((uint64_t)(x))
-
-/* Big endian to host endianess byte swapping macros for constants. */
-
-#define OSSwapBigToHostConstInt16(x) OSSwapConstInt16(x)
-#define OSSwapBigToHostConstInt32(x) OSSwapConstInt32(x)
-#define OSSwapBigToHostConstInt64(x) OSSwapConstInt64(x)
-
-/* Generic big endian to host endianess byte swapping functions. */
-
-#define OSSwapBigToHostInt16(x) OSSwapInt16(x)
-#define OSSwapBigToHostInt32(x) OSSwapInt32(x)
-#define OSSwapBigToHostInt64(x) OSSwapInt64(x)
-
-/* Little endian to host endianess byte swapping macros for constants. */
-
-#define OSSwapLittleToHostConstInt16(x) ((uint16_t)(x))
-#define OSSwapLittleToHostConstInt32(x) ((uint32_t)(x))
-#define OSSwapLittleToHostConstInt64(x) ((uint64_t)(x))
-
-/* Generic little endian to host endianess byte swapping functions. */
-
-#define OSSwapLittleToHostInt16(x) ((uint16_t)(x))
-#define OSSwapLittleToHostInt32(x) ((uint32_t)(x))
-#define OSSwapLittleToHostInt64(x) ((uint64_t)(x))
-
-#else
-#error Unknown endianess.
-#endif
-
-#endif /* ! _OS_OSBYTEORDER_H */
-
-
diff --git a/i386/include/libkern/OSCacheControl.h b/i386/include/libkern/OSCacheControl.h
deleted file mode 100644
index 771a704..0000000
--- a/i386/include/libkern/OSCacheControl.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _OS_CACHE_CONTROL_H_
-#define _OS_CACHE_CONTROL_H_
-
-#include    <stddef.h>
-#include    <sys/cdefs.h>
-#include    <stdint.h>
-
-__BEGIN_DECLS
-
-
-/* Functions performed by sys_cache_control(): */
-
-/* Prepare memory for execution.  This should be called
- * after writing machine instructions to memory, before
- * executing them.  It syncs the dcache and icache.
- * On IA32 processors this function is a NOP, because
- * no synchronization is required.
- */
-#define	kCacheFunctionPrepareForExecution	1
-
-/* Flush data cache(s).  This ensures that cached data 
- * makes it all the way out to DRAM, and then removes
- * copies of the data from all processor caches.
- * It can be useful when dealing with cache incoherent
- * devices or DMA.
- */
-#define	kCacheFunctionFlushDcache	2
-
-
-/* perform one of the above cache functions: */
-int	sys_cache_control( int function, void *start, size_t len);
- 
-/* equivalent to sys_cache_control(kCacheFunctionPrepareForExecution): */
-void	sys_icache_invalidate( void *start, size_t len);
-
-/* equivalent to sys_cache_control(kCacheFunctionFlushDcache): */
-void	sys_dcache_flush( void *start, size_t len);
-
-
-__END_DECLS
-
-#endif /* _OS_CACHE_CONTROL_H_ */
diff --git a/i386/include/libkern/OSDebug.h b/i386/include/libkern/OSDebug.h
deleted file mode 100644
index eaeefc1..0000000
--- a/i386/include/libkern/OSDebug.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved.
- *
- * HISTORY
- *
- */
-
-#ifndef _OS_OSDEBBUG_H
-#define _OS_OSDEBBUG_H
-
-#include <sys/cdefs.h>
-#include <mach/mach_types.h>
-
-__BEGIN_DECLS
-
-extern int log_leaks;
-
-/* Use kernel_debug() to log a backtrace */ 
-extern void trace_backtrace(unsigned int debugid, unsigned int debugid2, unsigned long size, unsigned long data);
-/* Report a message with a 4 entry backtrace - very slow */
-extern void OSReportWithBacktrace(const char *str, ...);
-extern unsigned OSBacktrace(void **bt, unsigned maxAddrs);
-
-/*! @function OSKernelStackRemaining
-    @abstract Returns bytes available below the current stack frame.
-    @discussion Returns bytes available below the current stack frame. Safe for interrupt or thread context.
-    @result Approximate byte count available. */
-
-vm_offset_t OSKernelStackRemaining( void );
-
-__END_DECLS
-
-#define TRACE_MACHLEAKS(a,b,c,d)	\
-do {					\
-    if (log_leaks)			\
-        trace_backtrace(a,b,c,d);	\
-} while(0)
-
-#endif /* !_OS_OSDEBBUG_H */
diff --git a/i386/include/libkern/OSKextLib.h b/i386/include/libkern/OSKextLib.h
deleted file mode 100644
index dbe2ba2..0000000
--- a/i386/include/libkern/OSKextLib.h
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
- * Copyright (c) 2008 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- *
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _LIBKERN_OSKEXTLIB_H
-#define _LIBKERN_OSKEXTLIB_H
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-#include <stdint.h>
-#include <mach/kmod.h>
-#include <mach/vm_types.h>
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <System/libkern/OSReturn.h>
-
-/*!
- * @header
- *
- * Declares functions, basic return values, and other constants
- * related to kernel extensions (kexts).
- */
-
-#if PRAGMA_MARK
-#pragma mark -
-/********************************************************************/
-#pragma mark OSReturn Values for Kernel Extensions
-/********************************************************************/
-#endif
-/*!
- * @group OSReturn Values for Kernel Extensions
- * Many kext-related functions return these values,
- * as well as those defined under
- * <code>@link //apple_ref/c/tdef/OSReturn OSReturn@/link</code>
- * and other variants of <code>kern_return_t</code>.
- */
-
-
-#define sub_libkern_kext           err_sub(2)
-#define libkern_kext_err(code)     (sys_libkern|sub_libkern_kext|(code))
-
-
-/*!
- * @define   kOSKextReturnInternalError
- * @abstract An internal error in the kext library.
- *           Contrast with <code>@link //apple_ref/c/econst/OSReturnError
- *           OSReturnError@/link</code>.
- */
-#define kOSKextReturnInternalError                   libkern_kext_err(0x1)
-
-/*!
- * @define   kOSKextReturnNoMemory
- * @abstract Memory allocation failed.
- */
-#define kOSKextReturnNoMemory                        libkern_kext_err(0x2)
-
-/*!
- * @define   kOSKextReturnNoResources
- * @abstract Some resource other than memory (such as available load tags)
- *           is exhausted.
- */
-#define kOSKextReturnNoResources                     libkern_kext_err(0x3)
-
-/*!
- * @define   kOSKextReturnNotPrivileged
- * @abstract The caller lacks privileges to perform the requested operation.
- */
-#define kOSKextReturnNotPrivileged                   libkern_kext_err(0x4)
-
-/*!
- * @define   kOSKextReturnInvalidArgument
- * @abstract Invalid argument.
- */
-#define kOSKextReturnInvalidArgument                 libkern_kext_err(0x5)
-
-/*!
- * @define   kOSKextReturnNotFound
- * @abstract Search item not found.
- */
-#define kOSKextReturnNotFound                        libkern_kext_err(0x6)
-
-/*!
- * @define   kOSKextReturnBadData
- * @abstract Malformed data (not used for XML).
- */
-#define kOSKextReturnBadData                         libkern_kext_err(0x7)
-
-/*!
- * @define   kOSKextReturnSerialization
- * @abstract Error converting or (un)serializing URL, string, or XML.
- */
-#define kOSKextReturnSerialization                   libkern_kext_err(0x8)
-
-/*!
- * @define   kOSKextReturnUnsupported
- * @abstract Operation is no longer or not yet supported.
- */
-#define kOSKextReturnUnsupported                     libkern_kext_err(0x9)
-
-/*!
- * @define   kOSKextReturnDisabled
- * @abstract Operation is currently disabled.
- */
-#define kOSKextReturnDisabled                        libkern_kext_err(0xa)
-
-/*!
- * @define   kOSKextReturnNotAKext
- * @abstract Bundle is not a kernel extension.
- */
-#define kOSKextReturnNotAKext                        libkern_kext_err(0xb)
-
-/*!
- * @define   kOSKextReturnValidation
- * @abstract Validation failures encountered; check diagnostics for details.
- */
-#define kOSKextReturnValidation                      libkern_kext_err(0xc)
-
-/*!
- * @define   kOSKextReturnAuthentication
- * @abstract Authetication failures encountered; check diagnostics for details.
- */
-#define kOSKextReturnAuthentication                  libkern_kext_err(0xd)
-
-/*!
- * @define   kOSKextReturnDependencies
- * @abstract Dependency resolution failures encountered; check diagnostics for details.
- */
-#define kOSKextReturnDependencies                    libkern_kext_err(0xe)
-
-/*!
- * @define   kOSKextReturnArchNotFound
- * @abstract Kext does not contain code for the requested architecture.
- */
-#define kOSKextReturnArchNotFound                    libkern_kext_err(0xf)
-
-/*!
- * @define   kOSKextReturnCache
- * @abstract An error occurred processing a system kext cache.
- */
-#define kOSKextReturnCache                           libkern_kext_err(0x10)
-
-/*!
- * @define   kOSKextReturnDeferred
- * @abstract Operation has been posted asynchronously to user space (kernel only).
- */
-#define kOSKextReturnDeferred                        libkern_kext_err(0x11)
-
-/*!
- * @define   kOSKextReturnBootLevel
- * @abstract Kext not loadable or operation not allowed at current boot level.
- */
-#define kOSKextReturnBootLevel                       libkern_kext_err(0x12)
-
-/*!
- * @define   kOSKextReturnNotLoadable
- * @abstract Kext cannot be loaded; check diagnostics for details.
- */
-#define kOSKextReturnNotLoadable                     libkern_kext_err(0x13)
-
-/*!
- * @define   kOSKextReturnLoadedVersionDiffers
- * @abstract A different version (or executable UUID, or executable by checksum)
- *           of the requested kext is already loaded.
- */
-#define kOSKextReturnLoadedVersionDiffers            libkern_kext_err(0x14)
-
-/*!
- * @define   kOSKextReturnDependencyLoadError
- * @abstract A load error occurred on a dependency of the kext being loaded.
- */
-#define kOSKextReturnDependencyLoadError             libkern_kext_err(0x15)
-
-/*!
- * @define   kOSKextReturnLinkError
- * @abstract A link failure occured with this kext or a dependency.
- */
-#define kOSKextReturnLinkError                       libkern_kext_err(0x16)
-
-/*!
- * @define   kOSKextReturnStartStopError
- * @abstract The kext start or stop routine returned an error.
- */
-#define kOSKextReturnStartStopError                  libkern_kext_err(0x17)
-
-/*!
- * @define   kOSKextReturnInUse
- * @abstract The kext is currently in use or has outstanding references,
- *           and cannot be unloaded.
- */
-#define kOSKextReturnInUse                           libkern_kext_err(0x18)
-
-/*!
- * @define   kOSKextReturnTimeout
- * @abstract A kext request has timed out.
- */
-#define kOSKextReturnTimeout                         libkern_kext_err(0x19)
-
-/*!
- * @define   kOSKextReturnStopping
- * @abstract The kext is in the process of stopping; requests cannot be made.
- */
-#define kOSKextReturnStopping                        libkern_kext_err(0x1a)
-
-#if PRAGMA_MARK
-#pragma mark -
-/********************************************************************/
-#pragma mark Kext/OSBundle Property List Keys
-/********************************************************************/
-#endif
-/*!
- * @group Kext Property List Keys
- * These constants cover CFBundle properties defined for kernel extensions.
- * Because they are used in the kernel, if you want to use one with
- * CFBundle APIs you'll need to wrap it in a <code>CFSTR()</code> macro.
- */
-
-
-/*!
- * @define   kOSBundleCompatibleVersionKey
- * @abstract A string giving the backwards-compatible version of a library kext
- *           in extended Mac OS 'vers' format (####.##.##s{1-255} where 's'
- *           is a build stage 'd', 'a', 'b', 'f' or 'fc').
- */
-#define kOSBundleCompatibleVersionKey           "OSBundleCompatibleVersion"
-
-/*!
- * @define   kOSBundleEnableKextLoggingKey
- * @abstract Set to true to have the kernel kext logging spec applied
- *           to the kext.
- *           See <code>@link //apple_ref/c/econst/OSKextLogSpec
- *           OSKextLogSpec@/link</code>.
- */
-#define kOSBundleEnableKextLoggingKey           "OSBundleEnableKextLogging"
-
-/*!
- * @define   kOSBundleIsInterfaceKey
- * @abstract A boolean value indicating whether the kext executable
- *           contains only symbol references.
- */
-#define kOSBundleIsInterfaceKey                 "OSBundleIsInterface"
-
-/*!
- * @define   kOSBundleLibrariesKey
- * @abstract A dictionary listing link dependencies for this kext.
- *           Keys are bundle identifiers, values are version strings.
- */
-#define kOSBundleLibrariesKey                   "OSBundleLibraries"
-
-/*!
- * @define   kOSBundleRequiredKey
- * @abstract A string indicating in which kinds of startup this kext
- *           may need to load during early startup (before
- *           <code>@link //apple_ref/doc/man/8/kextd kextcache(8)@/link</code>).
- * @discussion
- * The value is one of:
- * <ul>
- * <li>@link kOSBundleRequiredRoot "OSBundleRequiredRoot"@/link</li>
- * <li>@link kOSBundleRequiredLocalRoot "OSBundleRequiredLocalRoot"@/link</li>
- * <li>@link kOSBundleRequiredNetworkRoot "OSBundleRequiredNetworkRoot"@/link</li>
- * <li>@link kOSBundleRequiredSafeBoot "OSBundleRequiredSafeBoot"@/link</li>
- * <li>@link kOSBundleRequiredConsole "OSBundleRequiredConsole"@/link</li>
- * </ul>
- *
- * Use this property judiciously.
- * Every kext that declares a value other than "OSBundleRequiredSafeBoot"
- * increases startup time, as the booter must read it into memory,
- * or startup kext caches must include it.
- */
-#define kOSBundleRequiredKey                    "OSBundleRequired"
-
-/*!
- * @define   kOSBundleAllowUserLoadKey
- * @abstract A boolean value indicating whether
- *           <code>@link //apple_ref/doc/man/8/kextd kextcache(8)@/link</code>
- *           will honor a non-root process's request to load a kext.
- * @discussion
- * See <code>@link //apple_ref/doc/compositePage/c/func/KextManagerLoadKextWithURL
- * KextManagerLoadKextWithURL@/link</code>
- * and <code>@link //apple_ref/doc/compositePage/c/func/KextManagerLoadKextWithIdentifier
- * KextManagerLoadKextWithIdentifier@/link</code>.
- */
-#define kOSBundleAllowUserLoadKey               "OSBundleAllowUserLoad"
-
-/*!
- * @define   kOSKernelResourceKey
- * @abstract A boolean value indicating whether the kext represents a built-in
- *           component of the kernel.
- */
-#define kOSKernelResourceKey                    "OSKernelResource"
-
-/*!
- * @define   kIOKitPersonalitiesKey
- * @abstract A dictionary of dictionaries used in matching for I/O Kit drivers.
- */
-#define kIOKitPersonalitiesKey                  "IOKitPersonalities"
-
-/*
- * @define   kIOPersonalityPublisherKey
- * @abstract Used in personalities sent to the I/O Kit,
- *           contains the CFBundleIdentifier of the kext
- *           that the personality originated in.
- */
-#define kIOPersonalityPublisherKey              "IOPersonalityPublisher"
-
-
-#if PRAGMA_MARK
-/********************************************************************/
-#pragma mark Kext/OSBundle Property Deprecated Keys
-/********************************************************************/
-#endif
-/*
- * @define   kOSBundleDebugLevelKey
- * @abstract
- * Deprecated (used on some releases of Mac OS X prior to 10.6 Snow Leopard).
- * Value is an integer from 1-6, corresponding to the verbose levels
- * of kext tools on those releases.
- * On 10.6 Snow Leopard, use <code>@link OSKextEnableKextLogging
- * OSKextEnableKextLogging@/link</code>.
- */
-#define kOSBundleDebugLevelKey                  "OSBundleDebugLevel"
-
-/*!
- * @define   kOSBundleSharedExecutableIdentifierKey
- * @abstract Deprecated (used on some releases of Mac OS X
- *           prior to 10.6 Snow Leopard).
- *           Value is the bundle identifier of the pseudokext
- *           that contains an executable shared by this kext.
- */
-#define kOSBundleSharedExecutableIdentifierKey  "OSBundleSharedExecutableIdentifier"
-
-
-#if PRAGMA_MARK
-/********************************************************************/
-#pragma mark Kext/OSBundle Property List Values
-/********************************************************************/
-#endif
-
-/*!
- * @group Kext Property List Values
- * These constants encompass established values
- * for kernel extension bundle properties.
- */
-
-/*!
-* @define   kOSKextKernelIdentifier
-* @abstract
-* This is the CFBundleIdentifier user for the kernel itself.
-*/
-#define kOSKextKernelIdentifier                 "__kernel__"
-
-/*!
-* @define   kOSBundleRequiredRoot
-* @abstract
-* This <code>@link kOSBundleRequiredKey OSBundleRequired@/link</code>
-* value indicates that the kext may be needed to mount the root filesystem
-* whether starting from a local or a network volume.
-*/
-#define kOSBundleRequiredRoot                   "Root"
-
-/*!
-* @define   kOSBundleRequiredLocalRoot
-* @abstract
-* This <code>@link kOSBundleRequiredKey OSBundleRequired@/link</code>
-* value indicates that the kext may be needed to mount the root filesystem
-* when starting from a local disk.
-*/
-#define kOSBundleRequiredLocalRoot              "Local-Root"
-
-/*!
-* @define   kOSBundleRequiredNetworkRoot
-* @abstract
-* This <code>@link kOSBundleRequiredKey OSBundleRequired@/link</code>
-* value indicates that the kext may be needed to mount the root filesystem
-* when starting over a network connection.
-*/
-#define kOSBundleRequiredNetworkRoot            "Network-Root"
-
-/*!
-* @define   kOSBundleRequiredSafeBoot
-* @abstract
-* This <code>@link kOSBundleRequiredKey OSBundleRequired@/link</code>
-* value indicates that the kext can be loaded during a safe startup.
-* This value does not normally cause the kext to be read by the booter
-* or included in startup kext caches.
-*/
-#define kOSBundleRequiredSafeBoot               "Safe Boot"
-
-/*!
-* @define   kOSBundleRequiredConsole
-* @abstract
-* This <code>@link kOSBundleRequiredKey OSBundleRequired@/link</code>
-* value indicates that the kext may be needed for console access
-* (specifically in a single-user startup when
-* <code>@link //apple_ref/doc/man/8/kextd kextd(8)@/link</code>.
-* does not run)
-* and should be loaded during early startup.
-*/
-#define kOSBundleRequiredConsole                "Console"
-
-
-#if PRAGMA_MARK
-#pragma mark -
-/********************************************************************/
-#pragma mark Kext Information
-/********************************************************************/
-#endif
-/*!
- * @group Kext Information
- * Types, constants, and macros providing a kext with information
- * about itself.
- */
-
-/*!
- * @typedef OSKextLoadTag
- *
- * @abstract
- * A unique identifier assigned to a loaded instanace of a kext.
- *
- * @discussion
- * If a kext is unloaded and later reloaded, the new instance
- * has a different load tag.
- *
- * A kext can get its own load tag in the <code>kmod_info_t</code>
- * structure passed into its module start routine, as the
- * <code>id</code> field (cast to this type).
- * You can use the load tag with the functions
- * <code>@link OSKextRetainKextWithLoadTag
- * OSKextRetainKextWithLoadTag@/link</code> and
- * <code>@link OSKextReleaseKextWithLoadTag
- * OSKextReleaseKextWithLoadTag@/link</code>.
- */
-typedef uint32_t  OSKextLoadTag;
-
-/*!
- * @define kOSKextInvalidLoadTag
- *
- * @abstract
- * A load tag value that will never be used for a loaded kext;
- * indicates kext not found.
- */
-#define  kOSKextInvalidLoadTag  ((OSKextLoadTag)(-1))
-
-
-
-__END_DECLS
-
-#endif /* _LIBKERN_OSKEXTLIB_H */
diff --git a/i386/include/libkern/OSReturn.h b/i386/include/libkern/OSReturn.h
deleted file mode 100644
index b5490c9..0000000
--- a/i386/include/libkern/OSReturn.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
- 
-/*
- * Core OSReturn values.
- */
-
-#ifndef __LIBKERN_OSRETURN_H
-#define __LIBKERN_OSRETURN_H
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-#include <mach/error.h>
-
-
-/*!
- * @header
- *
- * Declares functions, basic return values, and other constants
- * related to kernel extensions (kexts).
- */
-
-#if PRAGMA_MARK
-#pragma mark Core OSReturn Values for Libkern
-#endif
-/*********************************************************************
-* Core OSReturn Values for Libkern
-*********************************************************************/
-/*!
- * @group Core OSReturn Values for Libkern
- * Some kext and I/O Kit functions can return these values,
- * as well as  other values of
- * <code>kern_return_t</code>.
- *
- * Many of these return values represent internal errors
- * in the Libkern C++ run-time typing information system
- * based on @link //apple_ref/doc/class/OSMetaClass OSMetaClass@/link;
- * you are unlikely to ever see them.
- * 
- */
-
-
-/*!
- * @typedef  OSReturn
- * @abstract The return type for many Libkern functions.
- */
-typedef kern_return_t OSReturn;
-
-#ifndef sys_libkern
-#define sys_libkern                   err_system(0x37)
-#endif /* sys_libkern */
-
-#define sub_libkern_common            err_sub(0)
-#define sub_libkern_metaclass         err_sub(1)
-#define sub_libkern_reserved          err_sub(-1)
-
-#define libkern_common_err(return)    (sys_libkern|sub_libkern_common|(return))
-#define libkern_metaclass_err(return) (sys_libkern|sub_libkern_metaclass|(return))
-
-/* See OSKextLib.h for these
- * #define sub_libkern_kext           err_sub(2)
- * #define libkern_kext_err(code)     (sys_libkern|sub_libkern_kext|(code))
- */
-
-/*!
- * @define   kOSReturnSuccess
- * @abstract Operation successful.
- *           Equal to <code>@link //apple_ref/c/econst/KERN_SUCCESS
- *           KERN_SUCCESS@/link</code>.
- */
-#define kOSReturnSuccess              KERN_SUCCESS
-
-/*!
- * @define   kOSReturnError
- * @abstract Unspecified Libkern error.
- *           <b>Not equal</b> to 
- *           <code>@link //apple_ref/c/econst/KERN_FAILURE
- *           KERN_FAILURE@/link</code>.
- */
-#define kOSReturnError                libkern_common_err(1)
-
-/*!
- * @define   kOSMetaClassInternal
- * @abstract Internal OSMetaClass run-time error.
- */
-#define kOSMetaClassInternal          libkern_metaclass_err(1)
-
-/*!
- * @define   kOSMetaClassHasInstances
- * @abstract A kext cannot be unloaded because there are instances
- *           derived from Libkern C++ classes that it defines.
- */
-#define kOSMetaClassHasInstances      libkern_metaclass_err(2)
-
-/*!
- * @define   kOSMetaClassNoInit
- * @abstract Internal error: The Libkern C++ class registration system
- *           was not properly initialized during kext loading.
- */
-#define kOSMetaClassNoInit            libkern_metaclass_err(3)
-// OSMetaClass::preModLoad wasn't called, runtime internal error
-
-/*!
- * @define   kOSMetaClassNoTempData
- * @abstract Internal error: An allocation failure occurred
- *           registering Libkern C++ classes during kext loading.
- */
-#define kOSMetaClassNoTempData        libkern_metaclass_err(4)
-// Allocation failure internal data
-
-/*!
- * @define   kOSMetaClassNoDicts
- * @abstract Internal error: An allocation failure occurred
- *           registering Libkern C++ classes during kext loading.
- */
-#define kOSMetaClassNoDicts           libkern_metaclass_err(5)
-// Allocation failure for Metaclass internal dictionaries
-
-/*!
- * @define   kOSMetaClassNoKModSet
- * @abstract Internal error: An allocation failure occurred
- *           registering Libkern C++ classes during kext loading.
- */
-#define kOSMetaClassNoKModSet         libkern_metaclass_err(6)
-// Allocation failure for internal kmodule set
-
-/*!
- * @define   kOSMetaClassNoInsKModSet
- * @abstract Internal error: An error occurred registering
- *           a specific Libkern C++ class during kext loading.
- */
-#define kOSMetaClassNoInsKModSet      libkern_metaclass_err(7)
-// Can't insert the KMod set into the module dictionary
-
-/*!
- * @define   kOSMetaClassNoSuper
- * @abstract Internal error: No superclass can be found
- *           for a specific Libkern C++ class during kext loading.
- */
-#define kOSMetaClassNoSuper           libkern_metaclass_err(8)
-
-/*!
- * @define   kOSMetaClassInstNoSuper
- * @abstract Internal error: No superclass can be found when constructing
- *           an instance of a Libkern C++ class.
- */
-#define kOSMetaClassInstNoSuper       libkern_metaclass_err(9)
-
-/*!
- * @define   kOSMetaClassDuplicateClass
- * @abstract A duplicate Libkern C++ classname was encountered
- *           during kext loading.
- */
-#define kOSMetaClassDuplicateClass    libkern_metaclass_err(10)
-
-/*!
- * @define   kOSMetaClassNoKext
- * @abstract Internal error: The kext for a Libkern C++ class
- *           can't be found during kext loading.
- */
-#define kOSMetaClassNoKext            libkern_metaclass_err(11)
-
-__END_DECLS
-
-#endif /* ! __LIBKERN_OSRETURN_H */
diff --git a/i386/include/libkern/OSTypes.h b/i386/include/libkern/OSTypes.h
deleted file mode 100644
index 6a03a27..0000000
--- a/i386/include/libkern/OSTypes.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved.
- *
- * HISTORY
- *
- */
-
-#ifndef _OS_OSTYPES_H
-#define _OS_OSTYPES_H
-
-#define OSTYPES_K64_REV		2
-
-typedef unsigned int 	   UInt;
-typedef signed int         SInt;
-
-#ifndef __MACTYPES__	/* CF MacTypes.h */
-#ifndef __TYPES__	/* guess... Mac Types.h */
-
-typedef unsigned char 	   UInt8;
-typedef unsigned short 	   UInt16;
-#if __LP64__
-typedef unsigned int       UInt32;
-#else
-typedef unsigned long      UInt32;
-#endif
-typedef unsigned long long UInt64;
-#if		defined(__BIG_ENDIAN__)
-typedef	struct UnsignedWide {
-			UInt32		hi;
-			UInt32		lo;
-}							UnsignedWide;
-#elif		defined(__LITTLE_ENDIAN__)
-typedef	struct UnsignedWide {
-			UInt32		lo;
-			UInt32		hi;
-}							UnsignedWide;
-#else
-#error Unknown endianess.
-#endif
-
-typedef signed char 	   SInt8;
-typedef signed short 	   SInt16;
-#if __LP64__
-typedef signed int         SInt32;
-#else
-typedef signed long        SInt32;
-#endif
-typedef signed long long   SInt64;
-#if		defined(__BIG_ENDIAN__)
-typedef	struct wide {
-			SInt32		hi;
-			UInt32		lo;
-}							wide;
-#elif		defined(__LITTLE_ENDIAN__)
-typedef	struct wide {
-			UInt32		lo;
-			SInt32		hi;
-}							wide;
-#else
-#error Unknown endianess.
-#endif
-
-typedef SInt32				OSStatus;
-
-#if defined(__LP64__) && defined(KERNEL)
-#ifndef ABSOLUTETIME_SCALAR_TYPE
-#define ABSOLUTETIME_SCALAR_TYPE    1
-#endif
-typedef UInt64		AbsoluteTime;
-#else
-typedef UnsignedWide		AbsoluteTime;
-#endif
-
-typedef UInt32				OptionBits;
-
-#if defined(KERNEL) && defined(__LP64__)
-/*
- * Use intrinsic boolean types for the LP64 kernel, otherwise maintain
- * source and binary backward compatibility.  This attempts to resolve
- * the "(x == true)" vs. "(x)" conditional issue.
- */
-#ifdef __cplusplus
-typedef bool Boolean;
-#else	/* !__cplusplus */
-#if defined(__STDC_VERSION__) && ((__STDC_VERSION__ - 199901L) > 0L)
-/* only use this if we are sure we are using a c99 compiler */
-typedef _Bool Boolean;
-#else	/* !c99 */
-/* Fall back to previous definition unless c99 */
-typedef unsigned char Boolean;
-#endif	/* !c99 */
-#endif	/* !__cplusplus */
-#else	/* !(KERNEL && __LP64__) */
-typedef unsigned char Boolean;
-#endif	/* !(KERNEL && __LP64__) */
-
-#endif /* __TYPES__ */
-#endif /* __MACTYPES__ */
-
-#if !defined(OS_INLINE)
-#	define OS_INLINE static inline
-#endif
-
-#endif /* _OS_OSTYPES_H */
diff --git a/i386/include/libkern/_OSByteOrder.h b/i386/include/libkern/_OSByteOrder.h
deleted file mode 100644
index d8806fc..0000000
--- a/i386/include/libkern/_OSByteOrder.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _OS__OSBYTEORDER_H
-#define _OS__OSBYTEORDER_H
-
-/*
- * This header is normally included from <libkern/OSByteOrder.h>.  However,
- * <sys/_endian.h> also includes this in the case of little-endian
- * architectures, so that we can map OSByteOrder routines to the hton* and ntoh*
- * macros.  This results in the asymmetry below; we only include
- * <libkern/arch/_OSByteOrder.h> for little-endian architectures.
- */
-
-//#include <sys/_types.h>
-
-/* Macros for swapping constant values in the preprocessing stage. */
-#define __DARWIN_OSSwapConstInt16(x) \
-    ((__uint16_t)((((__uint16_t)(x) & 0xff00) >> 8) | \
-                (((__uint16_t)(x) & 0x00ff) << 8)))
-
-#define __DARWIN_OSSwapConstInt32(x) \
-    ((__uint32_t)((((__uint32_t)(x) & 0xff000000) >> 24) | \
-                (((__uint32_t)(x) & 0x00ff0000) >>  8) | \
-                (((__uint32_t)(x) & 0x0000ff00) <<  8) | \
-                (((__uint32_t)(x) & 0x000000ff) << 24)))
-
-#define __DARWIN_OSSwapConstInt64(x) \
-    ((__uint64_t)((((__uint64_t)(x) & 0xff00000000000000ULL) >> 56) | \
-                (((__uint64_t)(x) & 0x00ff000000000000ULL) >> 40) | \
-                (((__uint64_t)(x) & 0x0000ff0000000000ULL) >> 24) | \
-                (((__uint64_t)(x) & 0x000000ff00000000ULL) >>  8) | \
-                (((__uint64_t)(x) & 0x00000000ff000000ULL) <<  8) | \
-                (((__uint64_t)(x) & 0x0000000000ff0000ULL) << 24) | \
-                (((__uint64_t)(x) & 0x000000000000ff00ULL) << 40) | \
-                (((__uint64_t)(x) & 0x00000000000000ffULL) << 56)))
-
-#if defined(__GNUC__)
-
-#if defined(__i386__) || defined(__x86_64__)
-#include <libkern/i386/_OSByteOrder.h>
-#endif
-
-#if defined(__arm__)
-#include <libkern/arm/OSByteOrder.h>
-#endif
-
-
-#define __DARWIN_OSSwapInt16(x) \
-    (__builtin_constant_p(x) ? __DARWIN_OSSwapConstInt16(x) : _OSSwapInt16(x))
-
-#define __DARWIN_OSSwapInt32(x) \
-    (__builtin_constant_p(x) ? __DARWIN_OSSwapConstInt32(x) : _OSSwapInt32(x))
-
-#define __DARWIN_OSSwapInt64(x) \
-    (__builtin_constant_p(x) ? __DARWIN_OSSwapConstInt64(x) : _OSSwapInt64(x))
-
-#else /* ! __GNUC__ */
-
-#if defined(__i386__) || defined(__x86_64__)
-
-#if !defined(__DARWIN_OS_INLINE)
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#        define __DARWIN_OS_INLINE static inline
-# elif defined(__MWERKS__) || defined(__cplusplus)
-#        define __DARWIN_OS_INLINE static inline
-# else
-#        define __DARWIN_OS_INLINE static __inline__
-# endif
-#endif
-
-__DARWIN_OS_INLINE
-uint16_t
-_OSSwapInt16(
-    uint16_t			data
-)
-{
-    return __DARWIN_OSSwapConstInt16(data);
-}
-
-__DARWIN_OS_INLINE
-uint32_t
-_OSSwapInt32(
-    uint32_t			data
-)
-{
-    return __DARWIN_OSSwapConstInt32(data);
-}
-
-__DARWIN_OS_INLINE
-uint64_t
-_OSSwapInt64(
-    uint64_t			data
-)
-{
-    return __DARWIN_OSSwapConstInt64(data);
-}
-#endif
-
-#define __DARWIN_OSSwapInt16(x) _OSSwapInt16(x)
-
-#define __DARWIN_OSSwapInt32(x) _OSSwapInt32(x)
-
-#define __DARWIN_OSSwapInt64(x) _OSSwapInt64(x)
-
-#endif /* __GNUC__ */
-
-#endif /* ! _OS__OSBYTEORDER_H */
diff --git a/i386/include/libkern/i386/OSByteOrder.h b/i386/include/libkern/i386/OSByteOrder.h
deleted file mode 100644
index 7f19736..0000000
--- a/i386/include/libkern/i386/OSByteOrder.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 1999-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _OS_OSBYTEORDERI386_H
-#define _OS_OSBYTEORDERI386_H
-
-#include <stdint.h>
-#include <libkern/i386/_OSByteOrder.h>
-
-#if !defined(OS_INLINE)
-#define OS_INLINE	__DARWIN_OS_INLINE
-#endif
-
-/* Functions for byte reversed loads. */
-
-OS_INLINE
-uint16_t
-OSReadSwapInt16(
-    const volatile void   * base,
-    uintptr_t       byteOffset
-)
-{
-    uint16_t result;
-
-    result = *(volatile uint16_t *)((uintptr_t)base + byteOffset);
-    return _OSSwapInt16(result);
-}
-
-OS_INLINE
-uint32_t
-OSReadSwapInt32(
-    const volatile void   * base,
-    uintptr_t       byteOffset
-)
-{
-    uint32_t result;
-
-    result = *(volatile uint32_t *)((uintptr_t)base + byteOffset);
-    return _OSSwapInt32(result);
-}
-
-OS_INLINE
-uint64_t
-OSReadSwapInt64(
-    const volatile void   * base,
-    uintptr_t       byteOffset
-)
-{
-    uint64_t result;
-
-    result = *(volatile uint64_t *)((uintptr_t)base + byteOffset);
-    return _OSSwapInt64(result);
-}
-
-/* Functions for byte reversed stores. */
-
-OS_INLINE
-void
-OSWriteSwapInt16(
-    volatile void   * base,
-    uintptr_t       byteOffset,
-    uint16_t        data
-)
-{
-    *(volatile uint16_t *)((uintptr_t)base + byteOffset) = _OSSwapInt16(data);
-}
-
-OS_INLINE
-void
-OSWriteSwapInt32(
-    volatile void   * base,
-    uintptr_t       byteOffset,
-    uint32_t        data
-)
-{
-    *(volatile uint32_t *)((uintptr_t)base + byteOffset) = _OSSwapInt32(data);
-}
-
-OS_INLINE
-void
-OSWriteSwapInt64(
-    volatile void    * base,
-    uintptr_t        byteOffset,
-    uint64_t         data
-)
-{
-    *(volatile uint64_t *)((uintptr_t)base + byteOffset) = _OSSwapInt64(data);
-}
-
-#endif /* ! _OS_OSBYTEORDERI386_H */
diff --git a/i386/include/libkern/i386/_OSByteOrder.h b/i386/include/libkern/i386/_OSByteOrder.h
deleted file mode 100644
index 51477bb..0000000
--- a/i386/include/libkern/i386/_OSByteOrder.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _OS__OSBYTEORDERI386_H
-#define _OS__OSBYTEORDERI386_H
-
-#if !defined(__DARWIN_OS_INLINE)
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#        define __DARWIN_OS_INLINE static inline
-# elif defined(__MWERKS__) || defined(__cplusplus)
-#        define __DARWIN_OS_INLINE static inline
-# else
-#        define __DARWIN_OS_INLINE static __inline__
-# endif
-#endif
-
-/* Generic byte swapping functions. */
-
-__DARWIN_OS_INLINE
-__uint16_t
-_OSSwapInt16(
-    __uint16_t        _data
-)
-{
-    return ((_data << 8) | (_data >> 8));
-}
-
-__DARWIN_OS_INLINE
-__uint32_t
-_OSSwapInt32(
-    __uint32_t        _data
-)
-{
-#if defined(__llvm__)
-    return __builtin_bswap32(_data);
-#else
-    __asm__ ("bswap   %0" : "+r" (_data));
-    return _data;
-#endif
-}
-
-#if defined(__llvm__)
-__DARWIN_OS_INLINE
-__uint64_t
-_OSSwapInt64(
-    __uint64_t        _data
-)
-{
-    return __builtin_bswap64(_data);
-}
-
-#elif defined(__i386__)
-__DARWIN_OS_INLINE
-__uint64_t
-_OSSwapInt64(
-    __uint64_t        _data
-)
-{
-    __asm__ ("bswap   %%eax\n\t"
-             "bswap   %%edx\n\t" 
-             "xchgl   %%eax, %%edx"
-             : "+A" (_data));
-    return _data;
-}
-#elif defined(__x86_64__)
-__DARWIN_OS_INLINE
-__uint64_t
-_OSSwapInt64(
-    __uint64_t        _data
-)
-{
-    __asm__ ("bswap   %0" : "+r" (_data));
-    return _data;
-}
-#else
-#error Unknown architecture
-#endif
-
-#endif /* ! _OS__OSBYTEORDERI386_H */
diff --git a/i386/include/libkern/machine/OSByteOrder.h b/i386/include/libkern/machine/OSByteOrder.h
deleted file mode 100644
index 4860215..0000000
--- a/i386/include/libkern/machine/OSByteOrder.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _OS_OSBYTEORDERMACHINE_H
-#define _OS_OSBYTEORDERMACHINE_H
-
-#include <stdint.h>
-
-#if !defined(OS_INLINE)
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#        define OS_INLINE static inline
-# elif defined(__MWERKS__) || defined(__cplusplus)
-#        define OS_INLINE static inline
-# else
-#        define OS_INLINE static __inline__
-# endif
-#endif
-
-/* Generic byte swapping functions. */
-
-OS_INLINE
-uint16_t
-_OSSwapInt16(
-    uint16_t                      data
-)
-{
-    return OSSwapConstInt16(data);
-}
-
-OS_INLINE
-uint32_t
-_OSSwapInt32(
-    uint32_t                      data
-)
-{
-    return OSSwapConstInt32(data);
-}
-
-OS_INLINE
-uint64_t
-_OSSwapInt64(
-    uint64_t                        data
-)
-{
-    return OSSwapConstInt64(data);
-}
-
-/* Functions for byte reversed loads. */
-
-OS_INLINE
-uint16_t
-OSReadSwapInt16(
-    const volatile void               * base,
-    uintptr_t                     byteOffset
-)
-{
-    uint16_t data = *(volatile uint16_t *)((uintptr_t)base + byteOffset);
-    return _OSSwapInt16(data);
-}
-
-OS_INLINE
-uint32_t
-OSReadSwapInt32(
-    const volatile void               * base,
-    uintptr_t                     byteOffset
-)
-{
-    uint32_t data = *(volatile uint32_t *)((uintptr_t)base + byteOffset);
-    return _OSSwapInt32(data);
-}
-
-OS_INLINE
-uint64_t
-OSReadSwapInt64(
-    const volatile void               * base,
-    uintptr_t                     byteOffset
-)
-{
-    uint64_t data = *(volatile uint64_t *)((uintptr_t)base + byteOffset);
-    return _OSSwapInt64(data);
-}
-
-/* Functions for byte reversed stores. */
-
-OS_INLINE
-void
-OSWriteSwapInt16(
-    volatile void               * base,
-    uintptr_t                     byteOffset,
-    uint16_t                      data
-)
-{
-    *(volatile uint16_t *)((uintptr_t)base + byteOffset) = _OSSwapInt16(data);
-}
-
-OS_INLINE
-void
-OSWriteSwapInt32(
-    volatile void               * base,
-    uintptr_t                     byteOffset,
-    uint32_t                      data
-)
-{
-    *(volatile uint32_t *)((uintptr_t)base + byteOffset) = _OSSwapInt32(data);
-}
-
-OS_INLINE
-void
-OSWriteSwapInt64(
-    volatile void               * base,
-    uintptr_t                     byteOffset,
-    uint64_t                      data
-)
-{
-    *(volatile uint64_t *)((uintptr_t)base + byteOffset) = _OSSwapInt64(data);
-}
-
-#endif /* ! _OS_OSBYTEORDERMACHINE_H */
diff --git a/i386/include/limits.h b/i386/include/limits.h
deleted file mode 100644
index a117167..0000000
--- a/i386/include/limits.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*	$NetBSD: limits.h,v 1.8 1996/10/21 05:10:50 jtc Exp $	*/
-
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)limits.h	8.2 (Berkeley) 1/4/94
- */
-
-#ifndef _LIMITS_H_
-#define	_LIMITS_H_
-
-#include <sys/cdefs.h>
-#include <i386/limits.h>
-#include <sys/syslimits.h>
-
-#if !defined(_ANSI_SOURCE)
-#define _POSIX_AIO_LISTIO_MAX   2
-#define _POSIX_AIO_MAX          1
-#define _POSIX_DELAYTIMER_MAX   32
-#define _POSIX_HOST_NAME_MAX    255
-#define _POSIX_LOGIN_NAME_MAX   9
-#define _POSIX_MQ_OPEN_MAX      8
-#define _POSIX_MQ_PRIO_MAX	32
-
-#define	_POSIX_ARG_MAX		4096
-#define	_POSIX_CHILD_MAX	25
-#define	_POSIX_LINK_MAX		8
-#define	_POSIX_MAX_CANON	255
-#define	_POSIX_MAX_INPUT	255
-#define	_POSIX_NAME_MAX		14
-#define	_POSIX_NGROUPS_MAX	8
-#define	_POSIX_OPEN_MAX		20
-#define	_POSIX_PATH_MAX		256
-#define	_POSIX_PIPE_BUF		512
-#define	_POSIX_SSIZE_MAX	32767
-#define	_POSIX_STREAM_MAX	8
-#define	_POSIX_TZNAME_MAX	6
-
-#define _POSIX_RE_DUP_MAX 			255
-#define _POSIX_RTSIG_MAX 			8
-#define _POSIX_SEM_NSEMS_MAX 			256
-#define _POSIX_SEM_VALUE_MAX 			32767
-#define _POSIX_SIGQUEUE_MAX 			32
-#define _POSIX_SS_REPL_MAX 			4
-#define _POSIX_SYMLINK_MAX 			255
-#define _POSIX_SYMLOOP_MAX 			8
-#define _POSIX_THREAD_DESTRUCTOR_ITERATIONS 	4
-#define _POSIX_THREAD_KEYS_MAX 			128
-#define _POSIX_THREAD_THREADS_MAX 		64
-#define _POSIX_TIMER_MAX 			32
-#define _POSIX_TRACE_EVENT_NAME_MAX 		30
-#define _POSIX_TRACE_NAME_MAX 			8
-#define _POSIX_TRACE_SYS_MAX 			8
-#define _POSIX_TRACE_USER_EVENT_MAX 		32
-#define _POSIX_TTY_NAME_MAX 			9
-
-#define	_POSIX2_BC_BASE_MAX		99
-#define	_POSIX2_BC_DIM_MAX		2048
-#define	_POSIX2_BC_SCALE_MAX		99
-#define	_POSIX2_BC_STRING_MAX		1000
-#define _POSIX2_CHARCLASS_NAME_MAX	14
-#define	_POSIX2_COLL_WEIGHTS_MAX	2
-#define	_POSIX2_EQUIV_CLASS_MAX		2
-#define	_POSIX2_EXPR_NEST_MAX		32
-#define	_POSIX2_LINE_MAX		2048
-#define	_POSIX2_RE_DUP_MAX		255
-
-#define PTHREAD_STACK_MIN 		8192
-#define PTHREAD_DESTRUCTOR_ITERATIONS 	4
-#define PTHREAD_KEYS_MAX 		512
-
-#if (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-#define PASS_MAX	128
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
-
-#define NL_ARGMAX	9
-#define NL_LANGMAX	14
-#define NL_MSGMAX	32767
-#define NL_NMAX		1
-#define NL_SETMAX	255
-#define NL_TEXTMAX	2048
-
-#define _XOPEN_IOV_MAX	16
-#define IOV_MAX		1024
-#define _XOPEN_NAME_MAX 255
-#define _XOPEN_PATH_MAX 1024
-
-#endif /* _ANSI_SOURCE */
-
-/* NZERO to be defined here. TBD. See also sys/param.h  */
-
-#endif /* !_LIMITS_H_ */
-
diff --git a/i386/include/locale.h b/i386/include/locale.h
deleted file mode 100644
index ab28ceb..0000000
--- a/i386/include/locale.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)locale.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: /repoman/r/ncvs/src/include/locale.h,v 1.7 2002/10/09 09:19:27 tjr Exp $
- */
-
-#ifndef _LOCALE_H_
-#define _LOCALE_H_
-
-#include <_locale.h>
-
-#define	LC_ALL		0
-#define	LC_COLLATE	1
-#define	LC_CTYPE	2
-#define	LC_MONETARY	3
-#define	LC_NUMERIC	4
-#define	LC_TIME		5
-#define	LC_MESSAGES	6
-
-#define	_LC_LAST	7		/* marks end */
-
-__BEGIN_DECLS
-char		*setlocale(int, const char *);
-__END_DECLS
-
-#endif /* _LOCALE_H_ */
diff --git a/i386/include/mach-o/arch.h b/i386/include/mach-o/arch.h
deleted file mode 100644
index 526c10f..0000000
--- a/i386/include/mach-o/arch.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _MACH_O_ARCH_H_
-#define _MACH_O_ARCH_H_
-/*
- * Copyright (c) 1997 Apple Computer, Inc.
- *
- * Functions that deal with information about architectures.
- *
- */
-
-#include <stdint.h>
-#include <mach/machine.h>
-#include <architecture/byte_order.h>
-
-/* The NXArchInfo structs contain the architectures symbolic name
- * (such as "ppc"), its CPU type and CPU subtype as defined in
- * mach/machine.h, the byte order for the architecture, and a
- * describing string (such as "PowerPC").
- * There will both be entries for specific CPUs (such as ppc604e) as
- * well as generic "family" entries (such as ppc).
- */
-typedef struct {
-    const char *name;
-    cpu_type_t cputype;
-    cpu_subtype_t cpusubtype;
-    enum NXByteOrder byteorder;
-    const char *description;
-} NXArchInfo;
-
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* NXGetAllArchInfos() returns a pointer to an array of all known
- * NXArchInfo structures.  The last NXArchInfo is marked by a NULL name.
- */
-extern const NXArchInfo *NXGetAllArchInfos(void);
-
-/* NXGetLocalArchInfo() returns the NXArchInfo for the local host, or NULL
- * if none is known. 
- */
-extern const NXArchInfo *NXGetLocalArchInfo(void);
-
-/* NXGetArchInfoFromName() and NXGetArchInfoFromCpuType() return the
- * NXArchInfo from the architecture's name or cputype/cpusubtype
- * combination.  A cpusubtype of CPU_SUBTYPE_MULTIPLE can be used
- * to request the most general NXArchInfo known for the given cputype.
- * NULL is returned if no matching NXArchInfo can be found.
- */
-extern const NXArchInfo *NXGetArchInfoFromName(const char *name);
-extern const NXArchInfo *NXGetArchInfoFromCpuType(cpu_type_t cputype,
-						  cpu_subtype_t cpusubtype);
-
-/* NXFindBestFatArch() is passed a cputype and cpusubtype and a set of
- * fat_arch structs and selects the best one that matches (if any) and returns
- * a pointer to that fat_arch struct (or NULL).  The fat_arch structs must be
- * in the host byte order and correct such that the fat_archs really points to
- * enough memory for nfat_arch structs.  It is possible that this routine could
- * fail if new cputypes or cpusubtypes are added and an old version of this
- * routine is used.  But if there is an exact match between the cputype and
- * cpusubtype and one of the fat_arch structs this routine will always succeed.
- */
-extern struct fat_arch *NXFindBestFatArch(cpu_type_t cputype,
-					  cpu_subtype_t cpusubtype,
-					  struct fat_arch *fat_archs,
-					  uint32_t nfat_archs);
-
-/* NXCombineCpuSubtypes() returns the resulting cpusubtype when combining two
- * different cpusubtypes for the specified cputype.  If the two cpusubtypes
- * can't be combined (the specific subtypes are mutually exclusive) -1 is
- * returned indicating it is an error to combine them.  This can also fail and
- * return -1 if new cputypes or cpusubtypes are added and an old version of
- * this routine is used.  But if the cpusubtypes are the same they can always
- * be combined and this routine will return the cpusubtype pass in.
- */
-extern cpu_subtype_t NXCombineCpuSubtypes(cpu_type_t cputype,
-					  cpu_subtype_t cpusubtype1,
-					  cpu_subtype_t cpusubtype2);
-
-#if __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _MACH_O_ARCH_H_ */
diff --git a/i386/include/mach-o/compact_unwind_encoding.h b/i386/include/mach-o/compact_unwind_encoding.h
deleted file mode 100644
index 237b226..0000000
--- a/i386/include/mach-o/compact_unwind_encoding.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* -*- mode: C; c-basic-offset: 4; tab-width: 4 -*-
- *
- * Copyright (c) 2008-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
- 
-
-#ifndef __COMPACT_UNWIND_ENCODING__
-#define __COMPACT_UNWIND_ENCODING__
-
-#include <stdint.h>
-
-
-// 
-// Each final linked mach-o image has an optional __TEXT, __unwind_info section.
-// This section is much smaller and faster to use than the __eh_frame section.
-//
-
-
-
-//
-// Compilers usually emit standard Dwarf FDEs.  The linker recognizes standard FDEs and
-// synthesizes a matching compact_unwind_encoding_t and adds it to the __unwind_info table.
-// It is also possible for the compiler to emit __unwind_info entries for functions that 
-// have different unwind requirements at different ranges in the function.
-//
-typedef uint32_t compact_unwind_encoding_t;
-
-
-
-//
-// The __unwind_info section is laid out for an efficient two level lookup.
-// The header of the section contains a coarse index that maps function address
-// to the page (4096 byte block) containing the unwind info for that function.  
-//
-
-#define UNWIND_SECTION_VERSION 1
-struct unwind_info_section_header
-{
-    uint32_t    version;            // UNWIND_SECTION_VERSION
-    uint32_t    commonEncodingsArraySectionOffset;
-    uint32_t    commonEncodingsArrayCount;
-    uint32_t    personalityArraySectionOffset;
-    uint32_t    personalityArrayCount;
-    uint32_t    indexSectionOffset;
-    uint32_t    indexCount;
-    // compact_unwind_encoding_t[]
-    // uintptr_t personalities[]
-    // unwind_info_section_header_index_entry[]
-    // unwind_info_section_header_lsda_index_entry[]
-};
-
-struct unwind_info_section_header_index_entry 
-{
-    uint32_t        functionOffset;
-    uint32_t        secondLevelPagesSectionOffset;  // section offset to start of regular or compress page
-    uint32_t        lsdaIndexArraySectionOffset;    // section offset to start of lsda_index array for this range
-};
-
-struct unwind_info_section_header_lsda_index_entry 
-{
-    uint32_t        functionOffset;
-    uint32_t        lsdaOffset;
-};
-
-//
-// There are two kinds of second level index pages: regular and compressed.
-// A compressed page can hold up to 1021 entries, but it cannot be used
-// if too many different encoding types are used.  The regular page holds
-// 511 entries.  
-//
-
-struct unwind_info_regular_second_level_entry 
-{
-    uint32_t                    functionOffset;
-    compact_unwind_encoding_t    encoding;
-};
-
-#define UNWIND_SECOND_LEVEL_REGULAR 2
-struct unwind_info_regular_second_level_page_header
-{
-    uint32_t    kind;    // UNWIND_SECOND_LEVEL_REGULAR
-    uint16_t    entryPageOffset;
-    uint16_t    entryCount;
-    // entry array
-};
-
-#define UNWIND_SECOND_LEVEL_COMPRESSED 3
-struct unwind_info_compressed_second_level_page_header
-{
-    uint32_t    kind;    // UNWIND_SECOND_LEVEL_COMPRESSED
-    uint16_t    entryPageOffset;
-    uint16_t    entryCount;
-    uint16_t    encodingsPageOffset;
-    uint16_t    encodingsCount;
-    // 32-bit entry array    
-    // encodings array
-};
-
-#define UNWIND_INFO_COMPRESSED_ENTRY_FUNC_OFFSET(entry)            (entry & 0x00FFFFFF)
-#define UNWIND_INFO_COMPRESSED_ENTRY_ENCODING_INDEX(entry)        ((entry >> 24) & 0xFF)
-
-
-
-// architecture independent bits
-enum {
-    UNWIND_IS_NOT_FUNCTION_START           = 0x80000000,
-    UNWIND_HAS_LSDA                        = 0x40000000,
-    UNWIND_PERSONALITY_MASK                = 0x30000000,
-};
-
-
-// x86_64
-//
-// 1-bit: start
-// 1-bit: has lsda
-// 2-bit: personality index
-//
-// 4-bits: 0=old, 1=rbp based, 2=stack-imm, 3=stack-ind, 4=dwarf
-//  rbp based:
-//        15-bits (5*3-bits per reg) register permutation
-//        8-bits for stack offset
-//  frameless:
-//        8-bits stack size
-//        3-bits stack adjust
-//        3-bits register count
-//        10-bits register permutation
-//
-enum {
-    UNWIND_X86_64_MODE_MASK                         = 0x0F000000,
-    UNWIND_X86_64_MODE_COMPATIBILITY                = 0x00000000,
-    UNWIND_X86_64_MODE_RBP_FRAME                    = 0x01000000,
-    UNWIND_X86_64_MODE_STACK_IMMD                   = 0x02000000,
-    UNWIND_X86_64_MODE_STACK_IND                    = 0x03000000,
-    UNWIND_X86_64_MODE_DWARF                        = 0x04000000,
-    
-    UNWIND_X86_64_RBP_FRAME_REGISTERS               = 0x00007FFF,
-    UNWIND_X86_64_RBP_FRAME_OFFSET                  = 0x00FF0000,
-
-    UNWIND_X86_64_FRAMELESS_STACK_SIZE              = 0x00FF0000,
-    UNWIND_X86_64_FRAMELESS_STACK_ADJUST            = 0x0000E000,
-    UNWIND_X86_64_FRAMELESS_STACK_REG_COUNT         = 0x00001C00,
-    UNWIND_X86_64_FRAMELESS_STACK_REG_PERMUTATION   = 0x000003FF,
-
-    UNWIND_X86_64_DWARF_SECTION_OFFSET              = 0x03FFFFFF,
-};
-
-enum {
-    UNWIND_X86_64_REG_NONE       = 0,
-    UNWIND_X86_64_REG_RBX        = 1,
-    UNWIND_X86_64_REG_R12        = 2,
-    UNWIND_X86_64_REG_R13        = 3,
-    UNWIND_X86_64_REG_R14        = 4,
-    UNWIND_X86_64_REG_R15        = 5,
-    UNWIND_X86_64_REG_RBP        = 6,
-};
-
-
-// x86
-//
-// 1-bit: start
-// 1-bit: has lsda
-// 2-bit: personality index
-//
-// 4-bits: 0=old, 1=ebp based, 2=stack-imm, 3=stack-ind, 4=dwarf
-//  ebp based:
-//        15-bits (5*3-bits per reg) register permutation
-//        8-bits for stack offset
-//  frameless:
-//        8-bits stack size
-//        3-bits stack adjust
-//        3-bits register count
-//        10-bits register permutation
-//
-enum {
-    UNWIND_X86_MODE_MASK                         = 0x0F000000,
-    UNWIND_X86_MODE_COMPATIBILITY                = 0x00000000,
-    UNWIND_X86_MODE_EBP_FRAME                    = 0x01000000,
-    UNWIND_X86_MODE_STACK_IMMD                   = 0x02000000,
-    UNWIND_X86_MODE_STACK_IND                    = 0x03000000,
-    UNWIND_X86_MODE_DWARF                        = 0x04000000,
-    
-    UNWIND_X86_EBP_FRAME_REGISTERS               = 0x00007FFF,
-    UNWIND_X86_EBP_FRAME_OFFSET                  = 0x00FF0000,
-    
-    UNWIND_X86_FRAMELESS_STACK_SIZE              = 0x00FF0000,
-    UNWIND_X86_FRAMELESS_STACK_ADJUST            = 0x0000E000,
-    UNWIND_X86_FRAMELESS_STACK_REG_COUNT         = 0x00001C00,
-    UNWIND_X86_FRAMELESS_STACK_REG_PERMUTATION   = 0x000003FF,
-    
-    UNWIND_X86_DWARF_SECTION_OFFSET              = 0x03FFFFFF,
-};
-
-enum {
-    UNWIND_X86_REG_NONE     = 0,
-    UNWIND_X86_REG_EBX      = 1,
-    UNWIND_X86_REG_ECX      = 2,
-    UNWIND_X86_REG_EDX      = 3,
-    UNWIND_X86_REG_EDI      = 4,
-    UNWIND_X86_REG_ESI      = 5,
-    UNWIND_X86_REG_EBP      = 6,
-};
-
-
-#endif
-
diff --git a/i386/include/mach-o/dyld.h b/i386/include/mach-o/dyld.h
deleted file mode 100644
index 3f579ef..0000000
--- a/i386/include/mach-o/dyld.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _MACH_O_DYLD_H_
-#define _MACH_O_DYLD_H_
-
-
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-
-#include <mach-o/loader.h>
-#include <Availability.h>
-
-#if __cplusplus
-extern "C" {
-#endif 
-
-/*
- * The following functions allow you to iterate through all loaded images.  
- * This is not a thread safe operation.  Another thread can add or remove
- * an image during the iteration.  
- *
- * Many uses of these routines can be replace by a call to dladdr() which 
- * will return the mach_header and name of an image, given an address in 
- * the image. dladdr() is thread safe.
- */
-extern uint32_t                    _dyld_image_count(void)                              __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
-extern const struct mach_header*   _dyld_get_image_header(uint32_t image_index)         __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
-extern intptr_t                    _dyld_get_image_vmaddr_slide(uint32_t image_index)   __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
-extern const char*                 _dyld_get_image_name(uint32_t image_index)           __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
-
-
-/*
- * The following functions allow you to install callbacks which will be called   
- * by dyld whenever an image is loaded or unloaded.  During a call to _dyld_register_func_for_add_image()
- * the callback func is called for every existing image.  Later, it is called as each new image
- * is loaded and bound (but initializers not yet run).  The callback registered with
- * _dyld_register_func_for_remove_image() is called after any terminators in an image are run
- * and before the image is un-memory-mapped.
- */
-extern void _dyld_register_func_for_add_image(void (*func)(const struct mach_header* mh, intptr_t vmaddr_slide))    __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
-extern void _dyld_register_func_for_remove_image(void (*func)(const struct mach_header* mh, intptr_t vmaddr_slide)) __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
-
-
-/*
- * NSVersionOfRunTimeLibrary() returns the current_version number of the currently dylib 
- * specifed by the libraryName.  The libraryName parameter would be "bar" for /path/libbar.3.dylib and
- * "Foo" for /path/Foo.framework/Versions/A/Foo.  It returns -1 if no such library is loaded.
- */
-extern int32_t NSVersionOfRunTimeLibrary(const char* libraryName)            __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
-
-
-/*
- * NSVersionOfRunTimeLibrary() returns the current_version number that the main executable was linked
- * against at build time.  The libraryName parameter would be "bar" for /path/libbar.3.dylib and
- * "Foo" for /path/Foo.framework/Versions/A/Foo.  It returns -1 if the main executable did not link
- * against the specified library.
- */
-extern int32_t NSVersionOfLinkTimeLibrary(const char* libraryName)           __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
-
-
-/*
- * _NSGetExecutablePath() copies the path of the main executable into the buffer. The bufsize parameter
- * should initially be the size of the buffer.  The function returns 0 if the path was successfully copied,
- * and *bufsize is left unchanged. It returns -1 if the buffer is not large enough, and *bufsize is set 
- * to the size required. 
- * 
- * Note that _NSGetExecutablePath will return "a path" to the executable not a "real path" to the executable. 
- * That is the path may be a symbolic link and not the real file. With deep directories the total bufsize 
- * needed could be more than MAXPATHLEN.
- */
-extern int _NSGetExecutablePath(char* buf, uint32_t* bufsize)                 __OSX_AVAILABLE_STARTING(__MAC_10_2, __IPHONE_2_0);
-
-
-
-/*
- * _dyld_moninit() is a private interface between dyld and libSystem.
- */
-extern void _dyld_moninit(void (*monaddition)(char *lowpc, char *highpc))    __OSX_AVAILABLE_STARTING(__MAC_10_1, __IPHONE_2_0);
-
-
-
-
-
-/*
- * The following dyld API's are deprecated as of Mac OS X 10.5.  They are either  
- * no longer necessary or are superceeded by dlopen and friends in <dlfcn.h>.
- * dlopen/dlsym/dlclose have been available since Mac OS X 10.3 and work with 
- * dylibs and bundles.  
- *
- *    NSAddImage                           -> dlopen
- *    NSLookupSymbolInImage                -> dlsym
- *    NSCreateObjectFileImageFromFile      -> dlopen
- *    NSDestroyObjectFileImage             -> dlclose
- *    NSLinkModule                         -> not needed when dlopen used
- *    NSUnLinkModule                       -> not needed when dlclose used
- *    NSLookupSymbolInModule               -> dlsym
- *    _dyld_image_containing_address       -> dladdr
- *    NSLinkEditError                      -> dlerror
- *
- */
-
-#ifndef ENUM_DYLD_BOOL
-#define ENUM_DYLD_BOOL
-  #undef FALSE
-  #undef TRUE
-  enum DYLD_BOOL { FALSE, TRUE };
-#endif /* ENUM_DYLD_BOOL */
-
-
-/* Object file image API */
-typedef enum {
-    NSObjectFileImageFailure, /* for this a message is printed on stderr */
-    NSObjectFileImageSuccess,
-    NSObjectFileImageInappropriateFile,
-    NSObjectFileImageArch,
-    NSObjectFileImageFormat, /* for this a message is printed on stderr */
-    NSObjectFileImageAccess
-} NSObjectFileImageReturnCode;
-
-typedef struct __NSObjectFileImage*  NSObjectFileImage;
-
-/* NSObjectFileImage can only be used with MH_BUNDLE files */
-extern NSObjectFileImageReturnCode NSCreateObjectFileImageFromFile(const char* pathName, NSObjectFileImage *objectFileImage)               __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern NSObjectFileImageReturnCode NSCreateObjectFileImageFromMemory(const void *address, size_t size, NSObjectFileImage *objectFileImage) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern bool                        NSDestroyObjectFileImage(NSObjectFileImage objectFileImage)                                             __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-
-extern uint32_t     NSSymbolDefinitionCountInObjectFileImage(NSObjectFileImage objectFileImage)                   __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern const char*  NSSymbolDefinitionNameInObjectFileImage(NSObjectFileImage objectFileImage, uint32_t ordinal)  __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern uint32_t     NSSymbolReferenceCountInObjectFileImage(NSObjectFileImage objectFileImage)                    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern const char*  NSSymbolReferenceNameInObjectFileImage(NSObjectFileImage objectFileImage, uint32_t ordinal, bool *tentative_definition) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern bool         NSIsSymbolDefinedInObjectFileImage(NSObjectFileImage objectFileImage, const char* symbolName) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
-extern void*        NSGetSectionDataInObjectFileImage(NSObjectFileImage objectFileImage, const char* segmentName, const char* sectionName, size_t *size) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern bool         NSHasModInitObjectFileImage(NSObjectFileImage objectFileImage)                                __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_3,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-
-typedef struct __NSModule* NSModule;
-extern const char*  NSNameOfModule(NSModule m)         __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern const char*  NSLibraryNameForModule(NSModule m) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-
-extern NSModule NSLinkModule(NSObjectFileImage objectFileImage, const char* moduleName, uint32_t options) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-#define NSLINKMODULE_OPTION_NONE                         0x0
-#define NSLINKMODULE_OPTION_BINDNOW                      0x1
-#define NSLINKMODULE_OPTION_PRIVATE                      0x2
-#define NSLINKMODULE_OPTION_RETURN_ON_ERROR              0x4
-#define NSLINKMODULE_OPTION_DONT_CALL_MOD_INIT_ROUTINES  0x8
-#define NSLINKMODULE_OPTION_TRAILING_PHYS_NAME          0x10
-
-extern bool NSUnLinkModule(NSModule module, uint32_t options) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-#define NSUNLINKMODULE_OPTION_NONE                  0x0
-#define NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED    0x1
-#define NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES	0x2
-
-/* symbol API */
-typedef struct __NSSymbol* NSSymbol;
-extern bool     NSIsSymbolNameDefined(const char* symbolName)                                                    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
-extern bool     NSIsSymbolNameDefinedWithHint(const char* symbolName, const char* libraryNameHint)               __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
-extern bool     NSIsSymbolNameDefinedInImage(const struct mach_header* image, const char* symbolName)            __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
-extern NSSymbol NSLookupAndBindSymbol(const char* symbolName)                                                    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
-extern NSSymbol NSLookupAndBindSymbolWithHint(const char* symbolName, const char* libraryNameHint)               __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
-extern NSSymbol NSLookupSymbolInModule(NSModule module, const char* symbolName)                                  __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern NSSymbol NSLookupSymbolInImage(const struct mach_header* image, const char* symbolName, uint32_t options) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND            0x0
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW        0x1
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY      0x2
-#define NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR 0x4
-extern const char*  NSNameOfSymbol(NSSymbol symbol)    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern void *       NSAddressOfSymbol(NSSymbol symbol) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern NSModule     NSModuleForSymbol(NSSymbol symbol) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-
-/* error handling API */
-typedef enum {
-    NSLinkEditFileAccessError,
-    NSLinkEditFileFormatError,
-    NSLinkEditMachResourceError,
-    NSLinkEditUnixResourceError,
-    NSLinkEditOtherError,
-    NSLinkEditWarningError,
-    NSLinkEditMultiplyDefinedError,
-    NSLinkEditUndefinedError
-} NSLinkEditErrors;
-
-/*
- * For the NSLinkEditErrors value NSLinkEditOtherError these are the values
- * passed to the link edit error handler as the errorNumber (what would be an
- * errno value for NSLinkEditUnixResourceError or a kern_return_t value for
- * NSLinkEditMachResourceError).
- */
-typedef enum {
-    NSOtherErrorRelocation, 
-    NSOtherErrorLazyBind,
-    NSOtherErrorIndrLoop,
-    NSOtherErrorLazyInit,
-    NSOtherErrorInvalidArgs
-} NSOtherErrorNumbers;
-
-extern void NSLinkEditError(NSLinkEditErrors *c, int *errorNumber, const char** fileName, const char** errorString) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-
-typedef struct {
-     void     (*undefined)(const char* symbolName);
-     NSModule (*multiple)(NSSymbol s, NSModule oldModule, NSModule newModule); 
-     void     (*linkEdit)(NSLinkEditErrors errorClass, int errorNumber,
-                          const char* fileName, const char* errorString);
-} NSLinkEditErrorHandlers;
-
-extern void NSInstallLinkEditErrorHandlers(const NSLinkEditErrorHandlers *handlers) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-
-extern bool                      NSAddLibrary(const char* pathName)                   __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
-extern bool                      NSAddLibraryWithSearching(const char* pathName)      __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
-extern const struct mach_header* NSAddImage(const char* image_name, uint32_t options) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-#define NSADDIMAGE_OPTION_NONE                  	0x0
-#define NSADDIMAGE_OPTION_RETURN_ON_ERROR       	0x1
-#define NSADDIMAGE_OPTION_WITH_SEARCHING        	0x2
-#define NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED 	0x4
-#define NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME	0x8
-
-extern bool _dyld_present(void)                                                              __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern bool _dyld_launched_prebound(void)                                                    __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern bool _dyld_all_twolevel_modules_prebound(void)                                        __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_3,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern void _dyld_bind_objc_module(const void* objc_module)                                  __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern bool _dyld_bind_fully_image_containing_address(const void* address)                   __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern bool _dyld_image_containing_address(const void* address)                              __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_3,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-extern void _dyld_lookup_and_bind(const char* symbol_name, void **address, NSModule* module) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
-extern void _dyld_lookup_and_bind_with_hint(const char* symbol_name, const char* library_name_hint, void** address, NSModule* module) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_4,__IPHONE_NA,__IPHONE_NA);
-extern void _dyld_lookup_and_bind_fully(const char* symbol_name, void** address, NSModule* module) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_1,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-
-extern const struct mach_header*  _dyld_get_image_header_containing_address(const void* address) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_3,__MAC_10_5,__IPHONE_NA,__IPHONE_NA);
-
-
-#if __cplusplus
-}
-#endif 
-
-#endif /* _MACH_O_DYLD_H_ */
diff --git a/i386/include/mach-o/dyld_images.h b/i386/include/mach-o/dyld_images.h
deleted file mode 100644
index ed710ef..0000000
--- a/i386/include/mach-o/dyld_images.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _DYLD_IMAGES_
-#define _DYLD_IMAGES_
-
-#include <stdbool.h>
-#include <unistd.h>
-#include <mach/mach.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* 
- *	Beginning in Mac OS X 10.4, this is how gdb discovers which mach-o images are loaded in a process.
- *
- *	gdb looks for the symbol "_dyld_all_image_infos" in dyld.  It contains the fields below.  
- *
- *	For a snashot of what images are currently loaded, the infoArray fields contain a pointer
- *	to an array of all images. If infoArray is NULL, it means it is being modified, come back later.
- *
- *	To be notified of changes, gdb sets a break point on the address pointed to by the notificationn
- *	field.  The function it points to is called by dyld with an array of information about what images 
- *	have been added (dyld_image_adding) or are about to be removed (dyld_image_removing). 
- *
- * The notification is called after infoArray is updated.  This means that if gdb attaches to a process
- * and infoArray is NULL, gdb can set a break point on notification and let the proccess continue to
- * run until the break point.  Then gdb can inspect the full infoArray.
- *
- * The dyldVersion field always points to a C string that contains the dyld version.  For instance,
- * in dyld-127.3, dyldVersion would contain a pointer to "127.3".
- *
- * The errorMessage and terminationFlags fields are normally zero.  If dyld terminates a process
- * (for instance because a required dylib or symbol is missing), then the errorMessage field will
- * be set to point to a C string message buffer containing the reason dyld terminate the process.
- * The low bit of the terminationFlags will be set if dyld terminated the process before any user
- * code ran, in which case there is no need for the crash log to contain the backtrace.
- *
- * When dyld terminates a process because some required dylib or symbol cannot be bound, in 
- * addition to the errorMessage field, it now sets the errorKind field and the corresponding
- * fields: errorClientOfDylibPath, errorTargetDylibPath, errorSymbol.
- *
- */
-
-enum dyld_image_mode { dyld_image_adding=0, dyld_image_removing=1 };
-
-struct dyld_image_info {
-	const struct mach_header*	imageLoadAddress;	/* base address image is mapped into */
-	const char*					imageFilePath;		/* path dyld used to load the image */
-	uintptr_t					imageFileModDate;	/* time_t of image file */
-													/* if stat().st_mtime of imageFilePath does not match imageFileModDate, */
-													/* then file has been modified since dyld loaded it */
-};
-
-struct dyld_uuid_info {
-	const struct mach_header*	imageLoadAddress;	/* base address image is mapped into */
-	uuid_t						imageUUID;			/* UUID of image */
-};
-
-typedef void (*dyld_image_notifier)(enum dyld_image_mode mode, uint32_t infoCount, const struct dyld_image_info info[]);
-
-/* for use in dyld_all_image_infos.errorKind field */
-enum {	dyld_error_kind_none=0, 
-		dyld_error_kind_dylib_missing=1, 
-		dyld_error_kind_dylib_wrong_arch=2,
-		dyld_error_kind_dylib_version=3,
-		dyld_error_kind_symbol_missing=4
-	};
-
-
-struct dyld_all_image_infos {
-	uint32_t						version;		/* 1 in Mac OS X 10.4 and 10.5 */
-	uint32_t						infoArrayCount;
-	const struct dyld_image_info*	infoArray;
-	dyld_image_notifier				notification;		
-	bool							processDetachedFromSharedRegion;
-	/* the following fields are only in version 2 (Mac OS X 10.6, iPhoneOS 2.0) and later */
-	bool							libSystemInitialized;
-	const struct mach_header*		dyldImageLoadAddress;
-	/* the following field is only in version 3 (Mac OS X 10.6, iPhoneOS 3.0) and later */
-	void*							jitInfo;
-	/* the following fields are only in version 5 (Mac OS X 10.6, iPhoneOS 3.0) and later */
-	const char*						dyldVersion;
-	const char*						errorMessage;
-	uintptr_t						terminationFlags;
-	/* the following field is only in version 6 (Mac OS X 10.6, iPhoneOS 3.1) and later */
-	void*							coreSymbolicationShmPage;
-	/* the following field is only in version 7 (Mac OS X 10.6, iPhoneOS 3.1) and later */
-	uintptr_t						systemOrderFlag;
-	/* the following field is only in version 8 (Mac OS X 10.7, iPhoneOS 3.1) and later */
-	uintptr_t						uuidArrayCount;
-	const struct dyld_uuid_info*	uuidArray;		/* only images not in dyld shared cache */
-	/* the following field is only in version 9 (Mac OS X 10.7, iOS 4.0) and later */
-	struct dyld_all_image_infos*	dyldAllImageInfosAddress;
-	/* the following field is only in version 10 (Mac OS X 10.7, iOS 4.2) and later */
-	uintptr_t						initialImageCount;
-	/* the following field is only in version 11 (Mac OS X 10.7, iOS 4.2) and later */
-	uintptr_t						errorKind;
-	const char*						errorClientOfDylibPath;
-	const char*						errorTargetDylibPath;
-	const char*						errorSymbol;
-	/* the following field is only in version 12 (Mac OS X 10.7, iOS 4.3) and later */
-	uintptr_t						sharedCacheSlide;
-};
-extern struct dyld_all_image_infos  dyld_all_image_infos;
-
-/*
- * Beginning in Mac OS X 10.6, rather than looking up the symbol "_dyld_all_image_infos"
- * in dyld's symbol table, you can add DYLD_ALL_IMAGE_INFOS_OFFSET_OFFSET to the mach_header
- * for dyld and read the 32-bit unsigned int at that location.  Adding that value to dyld's
- * mach_header address gets you the address of dyld_all_image_infos in dyld.
- */
-#define DYLD_ALL_IMAGE_INFOS_OFFSET_OFFSET 0x1010
-
-
-
-/*
- * Beginning in Mac OS X 10.5, this is how gdb discovers where the shared cache is in a process.
- * Images that are in the shared cache have their segments rearranged, so when using imageFilePath
- * to load the file from disk, you have to know to adjust addresses based on how their segment
- * was rearranged.
- *
- * gdb looks for the symbol "_dyld_shared_region_ranges" in dyld. 
- * 
- * It contains information the count of shared regions used by the process.  The count is
- * the number of start/length pairs.  
- */
-struct dyld_shared_cache_ranges {
-	uintptr_t					sharedRegionsCount;	/* how many ranges follow */
-	struct {
-		uintptr_t	start;
-		uintptr_t	length;
-	}							ranges[4];			/* max regions */
-};
-extern struct dyld_shared_cache_ranges dyld_shared_cache_ranges;
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _DYLD_IMAGES_ */
diff --git a/i386/include/mach-o/fat.h b/i386/include/mach-o/fat.h
deleted file mode 100644
index e2bcf43..0000000
--- a/i386/include/mach-o/fat.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _MACH_O_FAT_H_
-#define _MACH_O_FAT_H_
-/*
- * This header file describes the structures of the file format for "fat"
- * architecture specific file (wrapper design).  At the begining of the file
- * there is one fat_header structure followed by a number of fat_arch
- * structures.  For each architecture in the file, specified by a pair of
- * cputype and cpusubtype, the fat_header describes the file offset, file
- * size and alignment in the file of the architecture specific member.
- * The padded bytes in the file to place each member on it's specific alignment
- * are defined to be read as zeros and can be left as "holes" if the file system
- * can support them as long as they read as zeros.
- *
- * All structures defined here are always written and read to/from disk
- * in big-endian order.
- */
-
-/*
- * <mach/machine.h> is needed here for the cpu_type_t and cpu_subtype_t types
- * and contains the constants for the possible values of these types.
- */
-#include <stdint.h>
-#include <mach/machine.h>
-#include <architecture/byte_order.h>
-
-#define FAT_MAGIC	0xcafebabe
-#define FAT_CIGAM	0xbebafeca	/* NXSwapLong(FAT_MAGIC) */
-
-struct fat_header {
-	uint32_t	magic;		/* FAT_MAGIC */
-	uint32_t	nfat_arch;	/* number of structs that follow */
-};
-
-struct fat_arch {
-	cpu_type_t	cputype;	/* cpu specifier (int) */
-	cpu_subtype_t	cpusubtype;	/* machine specifier (int) */
-	uint32_t	offset;		/* file offset to this object file */
-	uint32_t	size;		/* size of this object file */
-	uint32_t	align;		/* alignment as a power of 2 */
-};
-
-#endif /* _MACH_O_FAT_H_ */
diff --git a/i386/include/mach-o/getsect.h b/i386/include/mach-o/getsect.h
deleted file mode 100644
index cee1f9f..0000000
--- a/i386/include/mach-o/getsect.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _MACH_O_GETSECT_H_
-#define _MACH_O_GETSECT_H_
-
-#include <stdint.h>
-#include <mach-o/loader.h>
-
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * Runtime interfaces for Mach-O programs.  For both 32-bit and 64-bit programs,
- * where the sizes returned will be 32-bit or 64-bit based on the size of
- * 'unsigned long'.
- */
-extern char *getsectdata(
-    const char *segname,
-    const char *sectname,
-    unsigned long *size);
-
-extern char *getsectdatafromFramework(
-    const char *FrameworkName,
-    const char *segname,
-    const char *sectname,
-    unsigned long *size);
-
-extern unsigned long get_end(void);
-extern unsigned long get_etext(void);
-extern unsigned long get_edata(void);
-
-#ifndef __LP64__
-/*
- * Runtime interfaces for 32-bit Mach-O programs.
- */
-extern const struct section *getsectbyname(
-    const char *segname,
-    const char *sectname);
-
-extern uint8_t *getsectiondata(
-    const struct mach_header *mhp,
-    const char *segname,
-    const char *sectname,
-    unsigned long *size);
-
-extern const struct segment_command *getsegbyname(
-    const char *segname);
-
-extern uint8_t *getsegmentdata(
-    const struct mach_header *mhp,
-    const char *segname,
-    unsigned long *size);
-
-#else /* defined(__LP64__) */
-/*
- * Runtime interfaces for 64-bit Mach-O programs.
- */
-extern const struct section_64 *getsectbyname(
-    const char *segname,
-    const char *sectname);
-
-extern uint8_t *getsectiondata(
-    const struct mach_header_64 *mhp,
-    const char *segname,
-    const char *sectname,
-    unsigned long *size);
-
-extern const struct segment_command_64 *getsegbyname(
-    const char *segname);
-
-extern uint8_t *getsegmentdata(
-    const struct mach_header_64 *mhp,
-    const char *segname,
-    unsigned long *size);
-
-#endif /* defined(__LP64__) */
-
-/*
- * Interfaces for tools working with 32-bit Mach-O files.
- */
-extern char *getsectdatafromheader(
-    const struct mach_header *mhp,
-    const char *segname,
-    const char *sectname,
-    uint32_t *size);
-
-extern const struct section *getsectbynamefromheader(
-    const struct mach_header *mhp,
-    const char *segname,
-    const char *sectname);
-
-/*
- * Interfaces for tools working with 64-bit Mach-O files.
- */
-extern char *getsectdatafromheader_64(
-    const struct mach_header_64 *mhp,
-    const char *segname,
-    const char *sectname,
-    uint64_t *size);
-
-extern const struct section_64 *getsectbynamefromheader_64(
-    const struct mach_header_64 *mhp,
-    const char *segname,
-    const char *sectname);
-
-#if __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _MACH_O_GETSECT_H_ */
diff --git a/i386/include/mach-o/ldsyms.h b/i386/include/mach-o/ldsyms.h
deleted file mode 100644
index 3f28b1b..0000000
--- a/i386/include/mach-o/ldsyms.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACHO_LDSYMS_H_
-#define _MACHO_LDSYMS_H_
-
-#include <mach-o/loader.h>
-
-/*
- * This file describes the link editor defined symbols.  The semantics of a
- * link editor symbol is that it is defined by the link editor only if it is
- * referenced and it is an error for the user to define them (see the man page
- * ld(1)).  The standard UNIX link editor symbols: __end, __etext and __edata
- * are not not supported by the Apple Mach-O link editor.  These symbols are
- * really not meaningful in a Mach-O object file and the link editor symbols
- * that are supported (described here) replace them.  In the case of the
- * standard UNIX link editor symbols the program can use the symbol
- * __mh_execute_header and walk the load commands of it's program to determine
- * the ending (or beginning) of any section or segment in the program.  Note
- * that the compiler prepends an underbar to all external symbol names coded
- * in a high level language.  Thus in 'C' names are coded without an underbar
- * and symbol names in the symbol table have an underbar.  There are two cpp
- * macros for each link editor defined name in this file.  The macro with a
- * leading underbar is the symbol name and the one without is the name as
- * coded in 'C'.
- */
-
-/*
- * The value of the link editor defined symbol _MH_EXECUTE_SYM is the address
- * of the mach header in a Mach-O executable file type.  It does not appear in
- * any file type other than a MH_EXECUTE file type.  The type of the symbol is
- * absolute as the header is not part of any section.
- */
-#define _MH_EXECUTE_SYM	"__mh_execute_header"
-#define MH_EXECUTE_SYM	"_mh_execute_header"
-extern const struct
-#ifdef __LP64__
-mach_header_64
-#else
-mach_header
-#endif
-_mh_execute_header;
-
-/*
- * The value of the link editor defined symbol _MH_BUNDLE_SYM is the address
- * of the mach header in a Mach-O bundle file type.  It does not appear in
- * any file type other than a MH_BUNDLE file type.  The type of the symbol is
- * an N_SECT symbol even thought the header is not part of any section.  This
- * symbol is private to the code in the bundle it is a part of.
- */
-#define _MH_BUNDLE_SYM	"__mh_bundle_header"
-#define MH_BUNDLE_SYM	"_mh_bundle_header"
-extern const struct
-#ifdef __LP64__
-mach_header_64
-#else
-mach_header
-#endif
-_mh_bundle_header;
-
-/*
- * The value of the link editor defined symbol _MH_DYLIB_SYM is the address
- * of the mach header in a Mach-O dylib file type.  It does not appear in
- * any file type other than a MH_DYLIB file type.  The type of the symbol is
- * an N_SECT symbol even thought the header is not part of any section.  This
- * symbol is private to the code in the library it is a part of.
- */
-#define _MH_DYLIB_SYM	"__mh_dylib_header"
-#define MH_DYLIB_SYM	"_mh_dylib_header"
-extern const struct
-#ifdef __LP64__
-mach_header_64
-#else
-mach_header
-#endif
-_mh_dylib_header;
-
-/*
- * The value of the link editor defined symbol _MH_DYLINKER_SYM is the address
- * of the mach header in a Mach-O dylinker file type.  It does not appear in
- * any file type other than a MH_DYLINKER file type.  The type of the symbol is
- * an N_SECT symbol even thought the header is not part of any section.  This
- * symbol is private to the code in the dynamic linker it is a part of.
- */
-#define _MH_DYLINKER_SYM	"__mh_dylinker_header"
-#define MH_DYLINKER_SYM		"_mh_dylinker_header"
-extern const struct
-#ifdef __LP64__
-mach_header_64
-#else
-mach_header
-#endif
-_mh_dylinker_header;
-
-/*
- * For the MH_PRELOAD file type the headers are not loaded as part of any
- * segment so the link editor defines symbols defined for the beginning
- * and ending of each segment and each section in each segment.  The names for
- * the symbols for a segment's beginning and end will have the form:
- * __SEGNAME__begin and  __SEGNAME__end where __SEGNAME is the name of the
- * segment.  The names for the symbols for a section's beginning and end will
- * have the form: __SEGNAME__sectname__begin and __SEGNAME__sectname__end
- * where __sectname is the name of the section and __SEGNAME is the segment it
- * is in.
- * 
- * The above symbols' types are those of the section they are referring to.
- * This is true even for symbols who's values are end's of a section and
- * that value is next address after that section and not really in that
- * section.  This results in these symbols having types referring to sections
- * who's values are not in that section.
- */
-
-#endif /* _MACHO_LDSYMS_H_ */
diff --git a/i386/include/mach-o/loader.h b/i386/include/mach-o/loader.h
deleted file mode 100644
index ff18e29..0000000
--- a/i386/include/mach-o/loader.h
+++ /dev/null
@@ -1,1402 +0,0 @@
-/*
- * Copyright (c) 1999-2010 Apple Inc.  All Rights Reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _MACHO_LOADER_H_
-#define _MACHO_LOADER_H_
-
-/*
- * This file describes the format of mach object files.
- */
-#include <stdint.h>
-
-/*
- * <mach/machine.h> is needed here for the cpu_type_t and cpu_subtype_t types
- * and contains the constants for the possible values of these types.
- */
-#include <mach/machine.h>
-
-/*
- * <mach/vm_prot.h> is needed here for the vm_prot_t type and contains the 
- * constants that are or'ed together for the possible values of this type.
- */
-#include <mach/vm_prot.h>
-
-/*
- * <machine/thread_status.h> is expected to define the flavors of the thread
- * states and the structures of those flavors for each machine.
- */
-#include <mach/machine/thread_status.h>
-#include <architecture/byte_order.h>
-
-/*
- * The 32-bit mach header appears at the very beginning of the object file for
- * 32-bit architectures.
- */
-struct mach_header {
-	uint32_t	magic;		/* mach magic number identifier */
-	cpu_type_t	cputype;	/* cpu specifier */
-	cpu_subtype_t	cpusubtype;	/* machine specifier */
-	uint32_t	filetype;	/* type of file */
-	uint32_t	ncmds;		/* number of load commands */
-	uint32_t	sizeofcmds;	/* the size of all the load commands */
-	uint32_t	flags;		/* flags */
-};
-
-/* Constant for the magic field of the mach_header (32-bit architectures) */
-#define	MH_MAGIC	0xfeedface	/* the mach magic number */
-#define MH_CIGAM	0xcefaedfe	/* NXSwapInt(MH_MAGIC) */
-
-/*
- * The 64-bit mach header appears at the very beginning of object files for
- * 64-bit architectures.
- */
-struct mach_header_64 {
-	uint32_t	magic;		/* mach magic number identifier */
-	cpu_type_t	cputype;	/* cpu specifier */
-	cpu_subtype_t	cpusubtype;	/* machine specifier */
-	uint32_t	filetype;	/* type of file */
-	uint32_t	ncmds;		/* number of load commands */
-	uint32_t	sizeofcmds;	/* the size of all the load commands */
-	uint32_t	flags;		/* flags */
-	uint32_t	reserved;	/* reserved */
-};
-
-/* Constant for the magic field of the mach_header_64 (64-bit architectures) */
-#define MH_MAGIC_64 0xfeedfacf /* the 64-bit mach magic number */
-#define MH_CIGAM_64 0xcffaedfe /* NXSwapInt(MH_MAGIC_64) */
-
-/*
- * The layout of the file depends on the filetype.  For all but the MH_OBJECT
- * file type the segments are padded out and aligned on a segment alignment
- * boundary for efficient demand pageing.  The MH_EXECUTE, MH_FVMLIB, MH_DYLIB,
- * MH_DYLINKER and MH_BUNDLE file types also have the headers included as part
- * of their first segment.
- * 
- * The file type MH_OBJECT is a compact format intended as output of the
- * assembler and input (and possibly output) of the link editor (the .o
- * format).  All sections are in one unnamed segment with no segment padding. 
- * This format is used as an executable format when the file is so small the
- * segment padding greatly increases its size.
- *
- * The file type MH_PRELOAD is an executable format intended for things that
- * are not executed under the kernel (proms, stand alones, kernels, etc).  The
- * format can be executed under the kernel but may demand paged it and not
- * preload it before execution.
- *
- * A core file is in MH_CORE format and can be any in an arbritray legal
- * Mach-O file.
- *
- * Constants for the filetype field of the mach_header
- */
-#define	MH_OBJECT	0x1		/* relocatable object file */
-#define	MH_EXECUTE	0x2		/* demand paged executable file */
-#define	MH_FVMLIB	0x3		/* fixed VM shared library file */
-#define	MH_CORE		0x4		/* core file */
-#define	MH_PRELOAD	0x5		/* preloaded executable file */
-#define	MH_DYLIB	0x6		/* dynamically bound shared library */
-#define	MH_DYLINKER	0x7		/* dynamic link editor */
-#define	MH_BUNDLE	0x8		/* dynamically bound bundle file */
-#define	MH_DYLIB_STUB	0x9		/* shared library stub for static */
-					/*  linking only, no section contents */
-#define	MH_DSYM		0xa		/* companion file with only debug */
-					/*  sections */
-#define	MH_KEXT_BUNDLE	0xb		/* x86_64 kexts */
-
-/* Constants for the flags field of the mach_header */
-#define	MH_NOUNDEFS	0x1		/* the object file has no undefined
-					   references */
-#define	MH_INCRLINK	0x2		/* the object file is the output of an
-					   incremental link against a base file
-					   and can't be link edited again */
-#define MH_DYLDLINK	0x4		/* the object file is input for the
-					   dynamic linker and can't be staticly
-					   link edited again */
-#define MH_BINDATLOAD	0x8		/* the object file's undefined
-					   references are bound by the dynamic
-					   linker when loaded. */
-#define MH_PREBOUND	0x10		/* the file has its dynamic undefined
-					   references prebound. */
-#define MH_SPLIT_SEGS	0x20		/* the file has its read-only and
-					   read-write segments split */
-#define MH_LAZY_INIT	0x40		/* the shared library init routine is
-					   to be run lazily via catching memory
-					   faults to its writeable segments
-					   (obsolete) */
-#define MH_TWOLEVEL	0x80		/* the image is using two-level name
-					   space bindings */
-#define MH_FORCE_FLAT	0x100		/* the executable is forcing all images
-					   to use flat name space bindings */
-#define MH_NOMULTIDEFS	0x200		/* this umbrella guarantees no multiple
-					   defintions of symbols in its
-					   sub-images so the two-level namespace
-					   hints can always be used. */
-#define MH_NOFIXPREBINDING 0x400	/* do not have dyld notify the
-					   prebinding agent about this
-					   executable */
-#define MH_PREBINDABLE  0x800           /* the binary is not prebound but can
-					   have its prebinding redone. only used
-                                           when MH_PREBOUND is not set. */
-#define MH_ALLMODSBOUND 0x1000		/* indicates that this binary binds to
-                                           all two-level namespace modules of
-					   its dependent libraries. only used
-					   when MH_PREBINDABLE and MH_TWOLEVEL
-					   are both set. */ 
-#define MH_SUBSECTIONS_VIA_SYMBOLS 0x2000/* safe to divide up the sections into
-					    sub-sections via symbols for dead
-					    code stripping */
-#define MH_CANONICAL    0x4000		/* the binary has been canonicalized
-					   via the unprebind operation */
-#define MH_WEAK_DEFINES	0x8000		/* the final linked image contains
-					   external weak symbols */
-#define MH_BINDS_TO_WEAK 0x10000	/* the final linked image uses
-					   weak symbols */
-
-#define MH_ALLOW_STACK_EXECUTION 0x20000/* When this bit is set, all stacks 
-					   in the task will be given stack
-					   execution privilege.  Only used in
-					   MH_EXECUTE filetypes. */
-#define MH_ROOT_SAFE 0x40000           /* When this bit is set, the binary 
-					  declares it is safe for use in
-					  processes with uid zero */
-                                         
-#define MH_SETUID_SAFE 0x80000         /* When this bit is set, the binary 
-					  declares it is safe for use in
-					  processes when issetugid() is true */
-
-#define MH_NO_REEXPORTED_DYLIBS 0x100000 /* When this bit is set on a dylib, 
-					  the static linker does not need to
-					  examine dependent dylibs to see
-					  if any are re-exported */
-#define	MH_PIE 0x200000			/* When this bit is set, the OS will
-					   load the main executable at a
-					   random address.  Only used in
-					   MH_EXECUTE filetypes. */
-#define	MH_DEAD_STRIPPABLE_DYLIB 0x400000 /* Only for use on dylibs.  When
-					     linking against a dylib that
-					     has this bit set, the static linker
-					     will automatically not create a
-					     LC_LOAD_DYLIB load command to the
-					     dylib if no symbols are being
-					     referenced from the dylib. */
-#define MH_HAS_TLV_DESCRIPTORS 0x800000 /* Contains a section of type 
-					    S_THREAD_LOCAL_VARIABLES */
-
-#define MH_NO_HEAP_EXECUTION 0x1000000	/* When this bit is set, the OS will
-					   run the main executable with
-					   a non-executable heap even on
-					   platforms (e.g. i386) that don't
-					   require it. Only used in MH_EXECUTE
-					   filetypes. */
-
-/*
- * The load commands directly follow the mach_header.  The total size of all
- * of the commands is given by the sizeofcmds field in the mach_header.  All
- * load commands must have as their first two fields cmd and cmdsize.  The cmd
- * field is filled in with a constant for that command type.  Each command type
- * has a structure specifically for it.  The cmdsize field is the size in bytes
- * of the particular load command structure plus anything that follows it that
- * is a part of the load command (i.e. section structures, strings, etc.).  To
- * advance to the next load command the cmdsize can be added to the offset or
- * pointer of the current load command.  The cmdsize for 32-bit architectures
- * MUST be a multiple of 4 bytes and for 64-bit architectures MUST be a multiple
- * of 8 bytes (these are forever the maximum alignment of any load commands).
- * The padded bytes must be zero.  All tables in the object file must also
- * follow these rules so the file can be memory mapped.  Otherwise the pointers
- * to these tables will not work well or at all on some machines.  With all
- * padding zeroed like objects will compare byte for byte.
- */
-struct load_command {
-	uint32_t cmd;		/* type of load command */
-	uint32_t cmdsize;	/* total size of command in bytes */
-};
-
-/*
- * After MacOS X 10.1 when a new load command is added that is required to be
- * understood by the dynamic linker for the image to execute properly the
- * LC_REQ_DYLD bit will be or'ed into the load command constant.  If the dynamic
- * linker sees such a load command it it does not understand will issue a
- * "unknown load command required for execution" error and refuse to use the
- * image.  Other load commands without this bit that are not understood will
- * simply be ignored.
- */
-#define LC_REQ_DYLD 0x80000000
-
-/* Constants for the cmd field of all load commands, the type */
-#define	LC_SEGMENT	0x1	/* segment of this file to be mapped */
-#define	LC_SYMTAB	0x2	/* link-edit stab symbol table info */
-#define	LC_SYMSEG	0x3	/* link-edit gdb symbol table info (obsolete) */
-#define	LC_THREAD	0x4	/* thread */
-#define	LC_UNIXTHREAD	0x5	/* unix thread (includes a stack) */
-#define	LC_LOADFVMLIB	0x6	/* load a specified fixed VM shared library */
-#define	LC_IDFVMLIB	0x7	/* fixed VM shared library identification */
-#define	LC_IDENT	0x8	/* object identification info (obsolete) */
-#define LC_FVMFILE	0x9	/* fixed VM file inclusion (internal use) */
-#define LC_PREPAGE      0xa     /* prepage command (internal use) */
-#define	LC_DYSYMTAB	0xb	/* dynamic link-edit symbol table info */
-#define	LC_LOAD_DYLIB	0xc	/* load a dynamically linked shared library */
-#define	LC_ID_DYLIB	0xd	/* dynamically linked shared lib ident */
-#define LC_LOAD_DYLINKER 0xe	/* load a dynamic linker */
-#define LC_ID_DYLINKER	0xf	/* dynamic linker identification */
-#define	LC_PREBOUND_DYLIB 0x10	/* modules prebound for a dynamically */
-				/*  linked shared library */
-#define	LC_ROUTINES	0x11	/* image routines */
-#define	LC_SUB_FRAMEWORK 0x12	/* sub framework */
-#define	LC_SUB_UMBRELLA 0x13	/* sub umbrella */
-#define	LC_SUB_CLIENT	0x14	/* sub client */
-#define	LC_SUB_LIBRARY  0x15	/* sub library */
-#define	LC_TWOLEVEL_HINTS 0x16	/* two-level namespace lookup hints */
-#define	LC_PREBIND_CKSUM  0x17	/* prebind checksum */
-
-/*
- * load a dynamically linked shared library that is allowed to be missing
- * (all symbols are weak imported).
- */
-#define	LC_LOAD_WEAK_DYLIB (0x18 | LC_REQ_DYLD)
-
-#define	LC_SEGMENT_64	0x19	/* 64-bit segment of this file to be
-				   mapped */
-#define	LC_ROUTINES_64	0x1a	/* 64-bit image routines */
-#define LC_UUID		0x1b	/* the uuid */
-#define LC_RPATH       (0x1c | LC_REQ_DYLD)    /* runpath additions */
-#define LC_CODE_SIGNATURE 0x1d	/* local of code signature */
-#define LC_SEGMENT_SPLIT_INFO 0x1e /* local of info to split segments */
-#define LC_REEXPORT_DYLIB (0x1f | LC_REQ_DYLD) /* load and re-export dylib */
-#define	LC_LAZY_LOAD_DYLIB 0x20	/* delay load of dylib until first use */
-#define	LC_ENCRYPTION_INFO 0x21	/* encrypted segment information */
-#define	LC_DYLD_INFO 	0x22	/* compressed dyld information */
-#define	LC_DYLD_INFO_ONLY (0x22|LC_REQ_DYLD)	/* compressed dyld information only */
-#define	LC_LOAD_UPWARD_DYLIB (0x23 | LC_REQ_DYLD) /* load upward dylib */
-#define LC_VERSION_MIN_MACOSX 0x24   /* build for MacOSX min OS version */
-#define LC_VERSION_MIN_IPHONEOS 0x25 /* build for iPhoneOS min OS version */
-#define LC_FUNCTION_STARTS 0x26 /* compressed table of function start addresses */
-#define LC_DYLD_ENVIRONMENT 0x27 /* string for dyld to treat
-				    like environment variable */
-
-/*
- * A variable length string in a load command is represented by an lc_str
- * union.  The strings are stored just after the load command structure and
- * the offset is from the start of the load command structure.  The size
- * of the string is reflected in the cmdsize field of the load command.
- * Once again any padded bytes to bring the cmdsize field to a multiple
- * of 4 bytes must be zero.
- */
-union lc_str {
-	uint32_t	offset;	/* offset to the string */
-#ifndef __LP64__
-	char		*ptr;	/* pointer to the string */
-#endif 
-};
-
-/*
- * The segment load command indicates that a part of this file is to be
- * mapped into the task's address space.  The size of this segment in memory,
- * vmsize, maybe equal to or larger than the amount to map from this file,
- * filesize.  The file is mapped starting at fileoff to the beginning of
- * the segment in memory, vmaddr.  The rest of the memory of the segment,
- * if any, is allocated zero fill on demand.  The segment's maximum virtual
- * memory protection and initial virtual memory protection are specified
- * by the maxprot and initprot fields.  If the segment has sections then the
- * section structures directly follow the segment command and their size is
- * reflected in cmdsize.
- */
-struct segment_command { /* for 32-bit architectures */
-	uint32_t	cmd;		/* LC_SEGMENT */
-	uint32_t	cmdsize;	/* includes sizeof section structs */
-	char		segname[16];	/* segment name */
-	uint32_t	vmaddr;		/* memory address of this segment */
-	uint32_t	vmsize;		/* memory size of this segment */
-	uint32_t	fileoff;	/* file offset of this segment */
-	uint32_t	filesize;	/* amount to map from the file */
-	vm_prot_t	maxprot;	/* maximum VM protection */
-	vm_prot_t	initprot;	/* initial VM protection */
-	uint32_t	nsects;		/* number of sections in segment */
-	uint32_t	flags;		/* flags */
-};
-
-/*
- * The 64-bit segment load command indicates that a part of this file is to be
- * mapped into a 64-bit task's address space.  If the 64-bit segment has
- * sections then section_64 structures directly follow the 64-bit segment
- * command and their size is reflected in cmdsize.
- */
-struct segment_command_64 { /* for 64-bit architectures */
-	uint32_t	cmd;		/* LC_SEGMENT_64 */
-	uint32_t	cmdsize;	/* includes sizeof section_64 structs */
-	char		segname[16];	/* segment name */
-	uint64_t	vmaddr;		/* memory address of this segment */
-	uint64_t	vmsize;		/* memory size of this segment */
-	uint64_t	fileoff;	/* file offset of this segment */
-	uint64_t	filesize;	/* amount to map from the file */
-	vm_prot_t	maxprot;	/* maximum VM protection */
-	vm_prot_t	initprot;	/* initial VM protection */
-	uint32_t	nsects;		/* number of sections in segment */
-	uint32_t	flags;		/* flags */
-};
-
-/* Constants for the flags field of the segment_command */
-#define	SG_HIGHVM	0x1	/* the file contents for this segment is for
-				   the high part of the VM space, the low part
-				   is zero filled (for stacks in core files) */
-#define	SG_FVMLIB	0x2	/* this segment is the VM that is allocated by
-				   a fixed VM library, for overlap checking in
-				   the link editor */
-#define	SG_NORELOC	0x4	/* this segment has nothing that was relocated
-				   in it and nothing relocated to it, that is
-				   it maybe safely replaced without relocation*/
-#define SG_PROTECTED_VERSION_1	0x8 /* This segment is protected.  If the
-				       segment starts at file offset 0, the
-				       first page of the segment is not
-				       protected.  All other pages of the
-				       segment are protected. */
-
-/*
- * A segment is made up of zero or more sections.  Non-MH_OBJECT files have
- * all of their segments with the proper sections in each, and padded to the
- * specified segment alignment when produced by the link editor.  The first
- * segment of a MH_EXECUTE and MH_FVMLIB format file contains the mach_header
- * and load commands of the object file before its first section.  The zero
- * fill sections are always last in their segment (in all formats).  This
- * allows the zeroed segment padding to be mapped into memory where zero fill
- * sections might be. The gigabyte zero fill sections, those with the section
- * type S_GB_ZEROFILL, can only be in a segment with sections of this type.
- * These segments are then placed after all other segments.
- *
- * The MH_OBJECT format has all of its sections in one segment for
- * compactness.  There is no padding to a specified segment boundary and the
- * mach_header and load commands are not part of the segment.
- *
- * Sections with the same section name, sectname, going into the same segment,
- * segname, are combined by the link editor.  The resulting section is aligned
- * to the maximum alignment of the combined sections and is the new section's
- * alignment.  The combined sections are aligned to their original alignment in
- * the combined section.  Any padded bytes to get the specified alignment are
- * zeroed.
- *
- * The format of the relocation entries referenced by the reloff and nreloc
- * fields of the section structure for mach object files is described in the
- * header file <reloc.h>.
- */
-struct section { /* for 32-bit architectures */
-	char		sectname[16];	/* name of this section */
-	char		segname[16];	/* segment this section goes in */
-	uint32_t	addr;		/* memory address of this section */
-	uint32_t	size;		/* size in bytes of this section */
-	uint32_t	offset;		/* file offset of this section */
-	uint32_t	align;		/* section alignment (power of 2) */
-	uint32_t	reloff;		/* file offset of relocation entries */
-	uint32_t	nreloc;		/* number of relocation entries */
-	uint32_t	flags;		/* flags (section type and attributes)*/
-	uint32_t	reserved1;	/* reserved (for offset or index) */
-	uint32_t	reserved2;	/* reserved (for count or sizeof) */
-};
-
-struct section_64 { /* for 64-bit architectures */
-	char		sectname[16];	/* name of this section */
-	char		segname[16];	/* segment this section goes in */
-	uint64_t	addr;		/* memory address of this section */
-	uint64_t	size;		/* size in bytes of this section */
-	uint32_t	offset;		/* file offset of this section */
-	uint32_t	align;		/* section alignment (power of 2) */
-	uint32_t	reloff;		/* file offset of relocation entries */
-	uint32_t	nreloc;		/* number of relocation entries */
-	uint32_t	flags;		/* flags (section type and attributes)*/
-	uint32_t	reserved1;	/* reserved (for offset or index) */
-	uint32_t	reserved2;	/* reserved (for count or sizeof) */
-	uint32_t	reserved3;	/* reserved */
-};
-
-/*
- * The flags field of a section structure is separated into two parts a section
- * type and section attributes.  The section types are mutually exclusive (it
- * can only have one type) but the section attributes are not (it may have more
- * than one attribute).
- */
-#define SECTION_TYPE		 0x000000ff	/* 256 section types */
-#define SECTION_ATTRIBUTES	 0xffffff00	/*  24 section attributes */
-
-/* Constants for the type of a section */
-#define	S_REGULAR		0x0	/* regular section */
-#define	S_ZEROFILL		0x1	/* zero fill on demand section */
-#define	S_CSTRING_LITERALS	0x2	/* section with only literal C strings*/
-#define	S_4BYTE_LITERALS	0x3	/* section with only 4 byte literals */
-#define	S_8BYTE_LITERALS	0x4	/* section with only 8 byte literals */
-#define	S_LITERAL_POINTERS	0x5	/* section with only pointers to */
-					/*  literals */
-/*
- * For the two types of symbol pointers sections and the symbol stubs section
- * they have indirect symbol table entries.  For each of the entries in the
- * section the indirect symbol table entries, in corresponding order in the
- * indirect symbol table, start at the index stored in the reserved1 field
- * of the section structure.  Since the indirect symbol table entries
- * correspond to the entries in the section the number of indirect symbol table
- * entries is inferred from the size of the section divided by the size of the
- * entries in the section.  For symbol pointers sections the size of the entries
- * in the section is 4 bytes and for symbol stubs sections the byte size of the
- * stubs is stored in the reserved2 field of the section structure.
- */
-#define	S_NON_LAZY_SYMBOL_POINTERS	0x6	/* section with only non-lazy
-						   symbol pointers */
-#define	S_LAZY_SYMBOL_POINTERS		0x7	/* section with only lazy symbol
-						   pointers */
-#define	S_SYMBOL_STUBS			0x8	/* section with only symbol
-						   stubs, byte size of stub in
-						   the reserved2 field */
-#define	S_MOD_INIT_FUNC_POINTERS	0x9	/* section with only function
-						   pointers for initialization*/
-#define	S_MOD_TERM_FUNC_POINTERS	0xa	/* section with only function
-						   pointers for termination */
-#define	S_COALESCED			0xb	/* section contains symbols that
-						   are to be coalesced */
-#define	S_GB_ZEROFILL			0xc	/* zero fill on demand section
-						   (that can be larger than 4
-						   gigabytes) */
-#define	S_INTERPOSING			0xd	/* section with only pairs of
-						   function pointers for
-						   interposing */
-#define	S_16BYTE_LITERALS		0xe	/* section with only 16 byte
-						   literals */
-#define	S_DTRACE_DOF			0xf	/* section contains 
-						   DTrace Object Format */
-#define	S_LAZY_DYLIB_SYMBOL_POINTERS	0x10	/* section with only lazy
-						   symbol pointers to lazy
-						   loaded dylibs */
-/*
- * Section types to support thread local variables
- */
-#define S_THREAD_LOCAL_REGULAR                   0x11  /* template of initial 
-							  values for TLVs */
-#define S_THREAD_LOCAL_ZEROFILL                  0x12  /* template of initial 
-							  values for TLVs */
-#define S_THREAD_LOCAL_VARIABLES                 0x13  /* TLV descriptors */
-#define S_THREAD_LOCAL_VARIABLE_POINTERS         0x14  /* pointers to TLV 
-                                                          descriptors */
-#define S_THREAD_LOCAL_INIT_FUNCTION_POINTERS    0x15  /* functions to call
-							  to initialize TLV
-							  values */
-
-/*
- * Constants for the section attributes part of the flags field of a section
- * structure.
- */
-#define SECTION_ATTRIBUTES_USR	 0xff000000	/* User setable attributes */
-#define S_ATTR_PURE_INSTRUCTIONS 0x80000000	/* section contains only true
-						   machine instructions */
-#define S_ATTR_NO_TOC 		 0x40000000	/* section contains coalesced
-						   symbols that are not to be
-						   in a ranlib table of
-						   contents */
-#define S_ATTR_STRIP_STATIC_SYMS 0x20000000	/* ok to strip static symbols
-						   in this section in files
-						   with the MH_DYLDLINK flag */
-#define S_ATTR_NO_DEAD_STRIP	 0x10000000	/* no dead stripping */
-#define S_ATTR_LIVE_SUPPORT	 0x08000000	/* blocks are live if they
-						   reference live blocks */
-#define S_ATTR_SELF_MODIFYING_CODE 0x04000000	/* Used with i386 code stubs
-						   written on by dyld */
-/*
- * If a segment contains any sections marked with S_ATTR_DEBUG then all
- * sections in that segment must have this attribute.  No section other than
- * a section marked with this attribute may reference the contents of this
- * section.  A section with this attribute may contain no symbols and must have
- * a section type S_REGULAR.  The static linker will not copy section contents
- * from sections with this attribute into its output file.  These sections
- * generally contain DWARF debugging info.
- */ 
-#define	S_ATTR_DEBUG		 0x02000000	/* a debug section */
-#define SECTION_ATTRIBUTES_SYS	 0x00ffff00	/* system setable attributes */
-#define S_ATTR_SOME_INSTRUCTIONS 0x00000400	/* section contains some
-						   machine instructions */
-#define S_ATTR_EXT_RELOC	 0x00000200	/* section has external
-						   relocation entries */
-#define S_ATTR_LOC_RELOC	 0x00000100	/* section has local
-						   relocation entries */
-
-
-/*
- * The names of segments and sections in them are mostly meaningless to the
- * link-editor.  But there are few things to support traditional UNIX
- * executables that require the link-editor and assembler to use some names
- * agreed upon by convention.
- *
- * The initial protection of the "__TEXT" segment has write protection turned
- * off (not writeable).
- *
- * The link-editor will allocate common symbols at the end of the "__common"
- * section in the "__DATA" segment.  It will create the section and segment
- * if needed.
- */
-
-/* The currently known segment names and the section names in those segments */
-
-#define	SEG_PAGEZERO	"__PAGEZERO"	/* the pagezero segment which has no */
-					/* protections and catches NULL */
-					/* references for MH_EXECUTE files */
-
-
-#define	SEG_TEXT	"__TEXT"	/* the tradition UNIX text segment */
-#define	SECT_TEXT	"__text"	/* the real text part of the text */
-					/* section no headers, and no padding */
-#define SECT_FVMLIB_INIT0 "__fvmlib_init0"	/* the fvmlib initialization */
-						/*  section */
-#define SECT_FVMLIB_INIT1 "__fvmlib_init1"	/* the section following the */
-					        /*  fvmlib initialization */
-						/*  section */
-
-#define	SEG_DATA	"__DATA"	/* the tradition UNIX data segment */
-#define	SECT_DATA	"__data"	/* the real initialized data section */
-					/* no padding, no bss overlap */
-#define	SECT_BSS	"__bss"		/* the real uninitialized data section*/
-					/* no padding */
-#define SECT_COMMON	"__common"	/* the section common symbols are */
-					/* allocated in by the link editor */
-
-#define	SEG_OBJC	"__OBJC"	/* objective-C runtime segment */
-#define SECT_OBJC_SYMBOLS "__symbol_table"	/* symbol table */
-#define SECT_OBJC_MODULES "__module_info"	/* module information */
-#define SECT_OBJC_STRINGS "__selector_strs"	/* string table */
-#define SECT_OBJC_REFS "__selector_refs"	/* string table */
-
-#define	SEG_ICON	 "__ICON"	/* the icon segment */
-#define	SECT_ICON_HEADER "__header"	/* the icon headers */
-#define	SECT_ICON_TIFF   "__tiff"	/* the icons in tiff format */
-
-#define	SEG_LINKEDIT	"__LINKEDIT"	/* the segment containing all structs */
-					/* created and maintained by the link */
-					/* editor.  Created with -seglinkedit */
-					/* option to ld(1) for MH_EXECUTE and */
-					/* FVMLIB file types only */
-
-#define SEG_UNIXSTACK	"__UNIXSTACK"	/* the unix stack segment */
-
-#define SEG_IMPORT	"__IMPORT"	/* the segment for the self (dyld) */
-					/* modifing code stubs that has read, */
-					/* write and execute permissions */
-
-/*
- * Fixed virtual memory shared libraries are identified by two things.  The
- * target pathname (the name of the library as found for execution), and the
- * minor version number.  The address of where the headers are loaded is in
- * header_addr. (THIS IS OBSOLETE and no longer supported).
- */
-struct fvmlib {
-	union lc_str	name;		/* library's target pathname */
-	uint32_t	minor_version;	/* library's minor version number */
-	uint32_t	header_addr;	/* library's header address */
-};
-
-/*
- * A fixed virtual shared library (filetype == MH_FVMLIB in the mach header)
- * contains a fvmlib_command (cmd == LC_IDFVMLIB) to identify the library.
- * An object that uses a fixed virtual shared library also contains a
- * fvmlib_command (cmd == LC_LOADFVMLIB) for each library it uses.
- * (THIS IS OBSOLETE and no longer supported).
- */
-struct fvmlib_command {
-	uint32_t	cmd;		/* LC_IDFVMLIB or LC_LOADFVMLIB */
-	uint32_t	cmdsize;	/* includes pathname string */
-	struct fvmlib	fvmlib;		/* the library identification */
-};
-
-/*
- * Dynamicly linked shared libraries are identified by two things.  The
- * pathname (the name of the library as found for execution), and the
- * compatibility version number.  The pathname must match and the compatibility
- * number in the user of the library must be greater than or equal to the
- * library being used.  The time stamp is used to record the time a library was
- * built and copied into user so it can be use to determined if the library used
- * at runtime is exactly the same as used to built the program.
- */
-struct dylib {
-    union lc_str  name;			/* library's path name */
-    uint32_t timestamp;			/* library's build time stamp */
-    uint32_t current_version;		/* library's current version number */
-    uint32_t compatibility_version;	/* library's compatibility vers number*/
-};
-
-/*
- * A dynamically linked shared library (filetype == MH_DYLIB in the mach header)
- * contains a dylib_command (cmd == LC_ID_DYLIB) to identify the library.
- * An object that uses a dynamically linked shared library also contains a
- * dylib_command (cmd == LC_LOAD_DYLIB, LC_LOAD_WEAK_DYLIB, or
- * LC_REEXPORT_DYLIB) for each library it uses.
- */
-struct dylib_command {
-	uint32_t	cmd;		/* LC_ID_DYLIB, LC_LOAD_{,WEAK_}DYLIB,
-					   LC_REEXPORT_DYLIB */
-	uint32_t	cmdsize;	/* includes pathname string */
-	struct dylib	dylib;		/* the library identification */
-};
-
-/*
- * A dynamically linked shared library may be a subframework of an umbrella
- * framework.  If so it will be linked with "-umbrella umbrella_name" where
- * Where "umbrella_name" is the name of the umbrella framework. A subframework
- * can only be linked against by its umbrella framework or other subframeworks
- * that are part of the same umbrella framework.  Otherwise the static link
- * editor produces an error and states to link against the umbrella framework.
- * The name of the umbrella framework for subframeworks is recorded in the
- * following structure.
- */
-struct sub_framework_command {
-	uint32_t	cmd;		/* LC_SUB_FRAMEWORK */
-	uint32_t	cmdsize;	/* includes umbrella string */
-	union lc_str 	umbrella;	/* the umbrella framework name */
-};
-
-/*
- * For dynamically linked shared libraries that are subframework of an umbrella
- * framework they can allow clients other than the umbrella framework or other
- * subframeworks in the same umbrella framework.  To do this the subframework
- * is built with "-allowable_client client_name" and an LC_SUB_CLIENT load
- * command is created for each -allowable_client flag.  The client_name is
- * usually a framework name.  It can also be a name used for bundles clients
- * where the bundle is built with "-client_name client_name".
- */
-struct sub_client_command {
-	uint32_t	cmd;		/* LC_SUB_CLIENT */
-	uint32_t	cmdsize;	/* includes client string */
-	union lc_str 	client;		/* the client name */
-};
-
-/*
- * A dynamically linked shared library may be a sub_umbrella of an umbrella
- * framework.  If so it will be linked with "-sub_umbrella umbrella_name" where
- * Where "umbrella_name" is the name of the sub_umbrella framework.  When
- * staticly linking when -twolevel_namespace is in effect a twolevel namespace 
- * umbrella framework will only cause its subframeworks and those frameworks
- * listed as sub_umbrella frameworks to be implicited linked in.  Any other
- * dependent dynamic libraries will not be linked it when -twolevel_namespace
- * is in effect.  The primary library recorded by the static linker when
- * resolving a symbol in these libraries will be the umbrella framework.
- * Zero or more sub_umbrella frameworks may be use by an umbrella framework.
- * The name of a sub_umbrella framework is recorded in the following structure.
- */
-struct sub_umbrella_command {
-	uint32_t	cmd;		/* LC_SUB_UMBRELLA */
-	uint32_t	cmdsize;	/* includes sub_umbrella string */
-	union lc_str 	sub_umbrella;	/* the sub_umbrella framework name */
-};
-
-/*
- * A dynamically linked shared library may be a sub_library of another shared
- * library.  If so it will be linked with "-sub_library library_name" where
- * Where "library_name" is the name of the sub_library shared library.  When
- * staticly linking when -twolevel_namespace is in effect a twolevel namespace 
- * shared library will only cause its subframeworks and those frameworks
- * listed as sub_umbrella frameworks and libraries listed as sub_libraries to
- * be implicited linked in.  Any other dependent dynamic libraries will not be
- * linked it when -twolevel_namespace is in effect.  The primary library
- * recorded by the static linker when resolving a symbol in these libraries
- * will be the umbrella framework (or dynamic library). Zero or more sub_library
- * shared libraries may be use by an umbrella framework or (or dynamic library).
- * The name of a sub_library framework is recorded in the following structure.
- * For example /usr/lib/libobjc_profile.A.dylib would be recorded as "libobjc".
- */
-struct sub_library_command {
-	uint32_t	cmd;		/* LC_SUB_LIBRARY */
-	uint32_t	cmdsize;	/* includes sub_library string */
-	union lc_str 	sub_library;	/* the sub_library name */
-};
-
-/*
- * A program (filetype == MH_EXECUTE) that is
- * prebound to its dynamic libraries has one of these for each library that
- * the static linker used in prebinding.  It contains a bit vector for the
- * modules in the library.  The bits indicate which modules are bound (1) and
- * which are not (0) from the library.  The bit for module 0 is the low bit
- * of the first byte.  So the bit for the Nth module is:
- * (linked_modules[N/8] >> N%8) & 1
- */
-struct prebound_dylib_command {
-	uint32_t	cmd;		/* LC_PREBOUND_DYLIB */
-	uint32_t	cmdsize;	/* includes strings */
-	union lc_str	name;		/* library's path name */
-	uint32_t	nmodules;	/* number of modules in library */
-	union lc_str	linked_modules;	/* bit vector of linked modules */
-};
-
-/*
- * A program that uses a dynamic linker contains a dylinker_command to identify
- * the name of the dynamic linker (LC_LOAD_DYLINKER).  And a dynamic linker
- * contains a dylinker_command to identify the dynamic linker (LC_ID_DYLINKER).
- * A file can have at most one of these.
- * This struct is also used for the LC_DYLD_ENVIRONMENT load command and
- * contains string for dyld to treat like environment variable.
- */
-struct dylinker_command {
-	uint32_t	cmd;		/* LC_ID_DYLINKER, LC_LOAD_DYLINKER or
-					   LC_DYLD_ENVIRONMENT */
-	uint32_t	cmdsize;	/* includes pathname string */
-	union lc_str    name;		/* dynamic linker's path name */
-};
-
-/*
- * Thread commands contain machine-specific data structures suitable for
- * use in the thread state primitives.  The machine specific data structures
- * follow the struct thread_command as follows.
- * Each flavor of machine specific data structure is preceded by an unsigned
- * long constant for the flavor of that data structure, an uint32_t
- * that is the count of longs of the size of the state data structure and then
- * the state data structure follows.  This triple may be repeated for many
- * flavors.  The constants for the flavors, counts and state data structure
- * definitions are expected to be in the header file <machine/thread_status.h>.
- * These machine specific data structures sizes must be multiples of
- * 4 bytes  The cmdsize reflects the total size of the thread_command
- * and all of the sizes of the constants for the flavors, counts and state
- * data structures.
- *
- * For executable objects that are unix processes there will be one
- * thread_command (cmd == LC_UNIXTHREAD) created for it by the link-editor.
- * This is the same as a LC_THREAD, except that a stack is automatically
- * created (based on the shell's limit for the stack size).  Command arguments
- * and environment variables are copied onto that stack.
- */
-struct thread_command {
-	uint32_t	cmd;		/* LC_THREAD or  LC_UNIXTHREAD */
-	uint32_t	cmdsize;	/* total size of this command */
-	/* uint32_t flavor		   flavor of thread state */
-	/* uint32_t count		   count of longs in thread state */
-	/* struct XXX_thread_state state   thread state for this flavor */
-	/* ... */
-};
-
-/*
- * The routines command contains the address of the dynamic shared library 
- * initialization routine and an index into the module table for the module
- * that defines the routine.  Before any modules are used from the library the
- * dynamic linker fully binds the module that defines the initialization routine
- * and then calls it.  This gets called before any module initialization
- * routines (used for C++ static constructors) in the library.
- */
-struct routines_command { /* for 32-bit architectures */
-	uint32_t	cmd;		/* LC_ROUTINES */
-	uint32_t	cmdsize;	/* total size of this command */
-	uint32_t	init_address;	/* address of initialization routine */
-	uint32_t	init_module;	/* index into the module table that */
-				        /*  the init routine is defined in */
-	uint32_t	reserved1;
-	uint32_t	reserved2;
-	uint32_t	reserved3;
-	uint32_t	reserved4;
-	uint32_t	reserved5;
-	uint32_t	reserved6;
-};
-
-/*
- * The 64-bit routines command.  Same use as above.
- */
-struct routines_command_64 { /* for 64-bit architectures */
-	uint32_t	cmd;		/* LC_ROUTINES_64 */
-	uint32_t	cmdsize;	/* total size of this command */
-	uint64_t	init_address;	/* address of initialization routine */
-	uint64_t	init_module;	/* index into the module table that */
-					/*  the init routine is defined in */
-	uint64_t	reserved1;
-	uint64_t	reserved2;
-	uint64_t	reserved3;
-	uint64_t	reserved4;
-	uint64_t	reserved5;
-	uint64_t	reserved6;
-};
-
-/*
- * The symtab_command contains the offsets and sizes of the link-edit 4.3BSD
- * "stab" style symbol table information as described in the header files
- * <nlist.h> and <stab.h>.
- */
-struct symtab_command {
-	uint32_t	cmd;		/* LC_SYMTAB */
-	uint32_t	cmdsize;	/* sizeof(struct symtab_command) */
-	uint32_t	symoff;		/* symbol table offset */
-	uint32_t	nsyms;		/* number of symbol table entries */
-	uint32_t	stroff;		/* string table offset */
-	uint32_t	strsize;	/* string table size in bytes */
-};
-
-/*
- * This is the second set of the symbolic information which is used to support
- * the data structures for the dynamically link editor.
- *
- * The original set of symbolic information in the symtab_command which contains
- * the symbol and string tables must also be present when this load command is
- * present.  When this load command is present the symbol table is organized
- * into three groups of symbols:
- *	local symbols (static and debugging symbols) - grouped by module
- *	defined external symbols - grouped by module (sorted by name if not lib)
- *	undefined external symbols (sorted by name if MH_BINDATLOAD is not set,
- *	     			    and in order the were seen by the static
- *				    linker if MH_BINDATLOAD is set)
- * In this load command there are offsets and counts to each of the three groups
- * of symbols.
- *
- * This load command contains a the offsets and sizes of the following new
- * symbolic information tables:
- *	table of contents
- *	module table
- *	reference symbol table
- *	indirect symbol table
- * The first three tables above (the table of contents, module table and
- * reference symbol table) are only present if the file is a dynamically linked
- * shared library.  For executable and object modules, which are files
- * containing only one module, the information that would be in these three
- * tables is determined as follows:
- * 	table of contents - the defined external symbols are sorted by name
- *	module table - the file contains only one module so everything in the
- *		       file is part of the module.
- *	reference symbol table - is the defined and undefined external symbols
- *
- * For dynamically linked shared library files this load command also contains
- * offsets and sizes to the pool of relocation entries for all sections
- * separated into two groups:
- *	external relocation entries
- *	local relocation entries
- * For executable and object modules the relocation entries continue to hang
- * off the section structures.
- */
-struct dysymtab_command {
-    uint32_t cmd;	/* LC_DYSYMTAB */
-    uint32_t cmdsize;	/* sizeof(struct dysymtab_command) */
-
-    /*
-     * The symbols indicated by symoff and nsyms of the LC_SYMTAB load command
-     * are grouped into the following three groups:
-     *    local symbols (further grouped by the module they are from)
-     *    defined external symbols (further grouped by the module they are from)
-     *    undefined symbols
-     *
-     * The local symbols are used only for debugging.  The dynamic binding
-     * process may have to use them to indicate to the debugger the local
-     * symbols for a module that is being bound.
-     *
-     * The last two groups are used by the dynamic binding process to do the
-     * binding (indirectly through the module table and the reference symbol
-     * table when this is a dynamically linked shared library file).
-     */
-    uint32_t ilocalsym;	/* index to local symbols */
-    uint32_t nlocalsym;	/* number of local symbols */
-
-    uint32_t iextdefsym;/* index to externally defined symbols */
-    uint32_t nextdefsym;/* number of externally defined symbols */
-
-    uint32_t iundefsym;	/* index to undefined symbols */
-    uint32_t nundefsym;	/* number of undefined symbols */
-
-    /*
-     * For the for the dynamic binding process to find which module a symbol
-     * is defined in the table of contents is used (analogous to the ranlib
-     * structure in an archive) which maps defined external symbols to modules
-     * they are defined in.  This exists only in a dynamically linked shared
-     * library file.  For executable and object modules the defined external
-     * symbols are sorted by name and is use as the table of contents.
-     */
-    uint32_t tocoff;	/* file offset to table of contents */
-    uint32_t ntoc;	/* number of entries in table of contents */
-
-    /*
-     * To support dynamic binding of "modules" (whole object files) the symbol
-     * table must reflect the modules that the file was created from.  This is
-     * done by having a module table that has indexes and counts into the merged
-     * tables for each module.  The module structure that these two entries
-     * refer to is described below.  This exists only in a dynamically linked
-     * shared library file.  For executable and object modules the file only
-     * contains one module so everything in the file belongs to the module.
-     */
-    uint32_t modtaboff;	/* file offset to module table */
-    uint32_t nmodtab;	/* number of module table entries */
-
-    /*
-     * To support dynamic module binding the module structure for each module
-     * indicates the external references (defined and undefined) each module
-     * makes.  For each module there is an offset and a count into the
-     * reference symbol table for the symbols that the module references.
-     * This exists only in a dynamically linked shared library file.  For
-     * executable and object modules the defined external symbols and the
-     * undefined external symbols indicates the external references.
-     */
-    uint32_t extrefsymoff;	/* offset to referenced symbol table */
-    uint32_t nextrefsyms;	/* number of referenced symbol table entries */
-
-    /*
-     * The sections that contain "symbol pointers" and "routine stubs" have
-     * indexes and (implied counts based on the size of the section and fixed
-     * size of the entry) into the "indirect symbol" table for each pointer
-     * and stub.  For every section of these two types the index into the
-     * indirect symbol table is stored in the section header in the field
-     * reserved1.  An indirect symbol table entry is simply a 32bit index into
-     * the symbol table to the symbol that the pointer or stub is referring to.
-     * The indirect symbol table is ordered to match the entries in the section.
-     */
-    uint32_t indirectsymoff; /* file offset to the indirect symbol table */
-    uint32_t nindirectsyms;  /* number of indirect symbol table entries */
-
-    /*
-     * To support relocating an individual module in a library file quickly the
-     * external relocation entries for each module in the library need to be
-     * accessed efficiently.  Since the relocation entries can't be accessed
-     * through the section headers for a library file they are separated into
-     * groups of local and external entries further grouped by module.  In this
-     * case the presents of this load command who's extreloff, nextrel,
-     * locreloff and nlocrel fields are non-zero indicates that the relocation
-     * entries of non-merged sections are not referenced through the section
-     * structures (and the reloff and nreloc fields in the section headers are
-     * set to zero).
-     *
-     * Since the relocation entries are not accessed through the section headers
-     * this requires the r_address field to be something other than a section
-     * offset to identify the item to be relocated.  In this case r_address is
-     * set to the offset from the vmaddr of the first LC_SEGMENT command.
-     * For MH_SPLIT_SEGS images r_address is set to the the offset from the
-     * vmaddr of the first read-write LC_SEGMENT command.
-     *
-     * The relocation entries are grouped by module and the module table
-     * entries have indexes and counts into them for the group of external
-     * relocation entries for that the module.
-     *
-     * For sections that are merged across modules there must not be any
-     * remaining external relocation entries for them (for merged sections
-     * remaining relocation entries must be local).
-     */
-    uint32_t extreloff;	/* offset to external relocation entries */
-    uint32_t nextrel;	/* number of external relocation entries */
-
-    /*
-     * All the local relocation entries are grouped together (they are not
-     * grouped by their module since they are only used if the object is moved
-     * from it staticly link edited address).
-     */
-    uint32_t locreloff;	/* offset to local relocation entries */
-    uint32_t nlocrel;	/* number of local relocation entries */
-
-};	
-
-/*
- * An indirect symbol table entry is simply a 32bit index into the symbol table 
- * to the symbol that the pointer or stub is refering to.  Unless it is for a
- * non-lazy symbol pointer section for a defined symbol which strip(1) as 
- * removed.  In which case it has the value INDIRECT_SYMBOL_LOCAL.  If the
- * symbol was also absolute INDIRECT_SYMBOL_ABS is or'ed with that.
- */
-#define INDIRECT_SYMBOL_LOCAL	0x80000000
-#define INDIRECT_SYMBOL_ABS	0x40000000
-
-
-/* a table of contents entry */
-struct dylib_table_of_contents {
-    uint32_t symbol_index;	/* the defined external symbol
-				   (index into the symbol table) */
-    uint32_t module_index;	/* index into the module table this symbol
-				   is defined in */
-};	
-
-/* a module table entry */
-struct dylib_module {
-    uint32_t module_name;	/* the module name (index into string table) */
-
-    uint32_t iextdefsym;	/* index into externally defined symbols */
-    uint32_t nextdefsym;	/* number of externally defined symbols */
-    uint32_t irefsym;		/* index into reference symbol table */
-    uint32_t nrefsym;		/* number of reference symbol table entries */
-    uint32_t ilocalsym;		/* index into symbols for local symbols */
-    uint32_t nlocalsym;		/* number of local symbols */
-
-    uint32_t iextrel;		/* index into external relocation entries */
-    uint32_t nextrel;		/* number of external relocation entries */
-
-    uint32_t iinit_iterm;	/* low 16 bits are the index into the init
-				   section, high 16 bits are the index into
-			           the term section */
-    uint32_t ninit_nterm;	/* low 16 bits are the number of init section
-				   entries, high 16 bits are the number of
-				   term section entries */
-
-    uint32_t			/* for this module address of the start of */
-	objc_module_info_addr;  /*  the (__OBJC,__module_info) section */
-    uint32_t			/* for this module size of */
-	objc_module_info_size;	/*  the (__OBJC,__module_info) section */
-};	
-
-/* a 64-bit module table entry */
-struct dylib_module_64 {
-    uint32_t module_name;	/* the module name (index into string table) */
-
-    uint32_t iextdefsym;	/* index into externally defined symbols */
-    uint32_t nextdefsym;	/* number of externally defined symbols */
-    uint32_t irefsym;		/* index into reference symbol table */
-    uint32_t nrefsym;		/* number of reference symbol table entries */
-    uint32_t ilocalsym;		/* index into symbols for local symbols */
-    uint32_t nlocalsym;		/* number of local symbols */
-
-    uint32_t iextrel;		/* index into external relocation entries */
-    uint32_t nextrel;		/* number of external relocation entries */
-
-    uint32_t iinit_iterm;	/* low 16 bits are the index into the init
-				   section, high 16 bits are the index into
-				   the term section */
-    uint32_t ninit_nterm;      /* low 16 bits are the number of init section
-				  entries, high 16 bits are the number of
-				  term section entries */
-
-    uint32_t			/* for this module size of */
-        objc_module_info_size;	/*  the (__OBJC,__module_info) section */
-    uint64_t			/* for this module address of the start of */
-        objc_module_info_addr;	/*  the (__OBJC,__module_info) section */
-};
-
-/* 
- * The entries in the reference symbol table are used when loading the module
- * (both by the static and dynamic link editors) and if the module is unloaded
- * or replaced.  Therefore all external symbols (defined and undefined) are
- * listed in the module's reference table.  The flags describe the type of
- * reference that is being made.  The constants for the flags are defined in
- * <mach-o/nlist.h> as they are also used for symbol table entries.
- */
-struct dylib_reference {
-    uint32_t isym:24,		/* index into the symbol table */
-    		  flags:8;	/* flags to indicate the type of reference */
-};
-
-/*
- * The twolevel_hints_command contains the offset and number of hints in the
- * two-level namespace lookup hints table.
- */
-struct twolevel_hints_command {
-    uint32_t cmd;	/* LC_TWOLEVEL_HINTS */
-    uint32_t cmdsize;	/* sizeof(struct twolevel_hints_command) */
-    uint32_t offset;	/* offset to the hint table */
-    uint32_t nhints;	/* number of hints in the hint table */
-};
-
-/*
- * The entries in the two-level namespace lookup hints table are twolevel_hint
- * structs.  These provide hints to the dynamic link editor where to start
- * looking for an undefined symbol in a two-level namespace image.  The
- * isub_image field is an index into the sub-images (sub-frameworks and
- * sub-umbrellas list) that made up the two-level image that the undefined
- * symbol was found in when it was built by the static link editor.  If
- * isub-image is 0 the the symbol is expected to be defined in library and not
- * in the sub-images.  If isub-image is non-zero it is an index into the array
- * of sub-images for the umbrella with the first index in the sub-images being
- * 1. The array of sub-images is the ordered list of sub-images of the umbrella
- * that would be searched for a symbol that has the umbrella recorded as its
- * primary library.  The table of contents index is an index into the
- * library's table of contents.  This is used as the starting point of the
- * binary search or a directed linear search.
- */
-struct twolevel_hint {
-    uint32_t 
-	isub_image:8,	/* index into the sub images */
-	itoc:24;	/* index into the table of contents */
-};
-
-/*
- * The prebind_cksum_command contains the value of the original check sum for
- * prebound files or zero.  When a prebound file is first created or modified
- * for other than updating its prebinding information the value of the check sum
- * is set to zero.  When the file has it prebinding re-done and if the value of
- * the check sum is zero the original check sum is calculated and stored in
- * cksum field of this load command in the output file.  If when the prebinding
- * is re-done and the cksum field is non-zero it is left unchanged from the
- * input file.
- */
-struct prebind_cksum_command {
-    uint32_t cmd;	/* LC_PREBIND_CKSUM */
-    uint32_t cmdsize;	/* sizeof(struct prebind_cksum_command) */
-    uint32_t cksum;	/* the check sum or zero */
-};
-
-/*
- * The uuid load command contains a single 128-bit unique random number that
- * identifies an object produced by the static link editor.
- */
-struct uuid_command {
-    uint32_t	cmd;		/* LC_UUID */
-    uint32_t	cmdsize;	/* sizeof(struct uuid_command) */
-    uint8_t	uuid[16];	/* the 128-bit uuid */
-};
-
-/*
- * The rpath_command contains a path which at runtime should be added to
- * the current run path used to find @rpath prefixed dylibs.
- */
-struct rpath_command {
-    uint32_t	 cmd;		/* LC_RPATH */
-    uint32_t	 cmdsize;	/* includes string */
-    union lc_str path;		/* path to add to run path */
-};
-
-/*
- * The linkedit_data_command contains the offsets and sizes of a blob
- * of data in the __LINKEDIT segment.  
- */
-struct linkedit_data_command {
-    uint32_t	cmd;		/* LC_CODE_SIGNATURE, LC_SEGMENT_SPLIT_INFO,
-                                   or LC_FUNCTION_STARTS */
-    uint32_t	cmdsize;	/* sizeof(struct linkedit_data_command) */
-    uint32_t	dataoff;	/* file offset of data in __LINKEDIT segment */
-    uint32_t	datasize;	/* file size of data in __LINKEDIT segment  */
-};
-
-/*
- * The encryption_info_command contains the file offset and size of an
- * of an encrypted segment.
- */
-struct encryption_info_command {
-   uint32_t	cmd;		/* LC_ENCRYPTION_INFO */
-   uint32_t	cmdsize;	/* sizeof(struct encryption_info_command) */
-   uint32_t	cryptoff;	/* file offset of encrypted range */
-   uint32_t	cryptsize;	/* file size of encrypted range */
-   uint32_t	cryptid;	/* which enryption system,
-				   0 means not-encrypted yet */
-};
-
-/*
- * The version_min_command contains the min OS version on which this 
- * binary was built to run.
- */
-struct version_min_command {
-    uint32_t	cmd;		/* LC_VERSION_MIN_MACOSX or
-				   LC_VERSION_MIN_IPHONEOS  */
-    uint32_t	cmdsize;	/* sizeof(struct min_version_command) */
-    uint32_t	version;	/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
-    uint32_t	reserved;	/* zero */
-};
-
-/*
- * The dyld_info_command contains the file offsets and sizes of 
- * the new compressed form of the information dyld needs to 
- * load the image.  This information is used by dyld on Mac OS X
- * 10.6 and later.  All information pointed to by this command
- * is encoded using byte streams, so no endian swapping is needed
- * to interpret it. 
- */
-struct dyld_info_command {
-   uint32_t   cmd;		/* LC_DYLD_INFO or LC_DYLD_INFO_ONLY */
-   uint32_t   cmdsize;		/* sizeof(struct dyld_info_command) */
-
-    /*
-     * Dyld rebases an image whenever dyld loads it at an address different
-     * from its preferred address.  The rebase information is a stream
-     * of byte sized opcodes whose symbolic names start with REBASE_OPCODE_.
-     * Conceptually the rebase information is a table of tuples:
-     *    <seg-index, seg-offset, type>
-     * The opcodes are a compressed way to encode the table by only
-     * encoding when a column changes.  In addition simple patterns
-     * like "every n'th offset for m times" can be encoded in a few
-     * bytes.
-     */
-    uint32_t   rebase_off;	/* file offset to rebase info  */
-    uint32_t   rebase_size;	/* size of rebase info   */
-    
-    /*
-     * Dyld binds an image during the loading process, if the image
-     * requires any pointers to be initialized to symbols in other images.  
-     * The bind information is a stream of byte sized 
-     * opcodes whose symbolic names start with BIND_OPCODE_.
-     * Conceptually the bind information is a table of tuples:
-     *    <seg-index, seg-offset, type, symbol-library-ordinal, symbol-name, addend>
-     * The opcodes are a compressed way to encode the table by only
-     * encoding when a column changes.  In addition simple patterns
-     * like for runs of pointers initialzed to the same value can be 
-     * encoded in a few bytes.
-     */
-    uint32_t   bind_off;	/* file offset to binding info   */
-    uint32_t   bind_size;	/* size of binding info  */
-        
-    /*
-     * Some C++ programs require dyld to unique symbols so that all
-     * images in the process use the same copy of some code/data.
-     * This step is done after binding. The content of the weak_bind
-     * info is an opcode stream like the bind_info.  But it is sorted
-     * alphabetically by symbol name.  This enable dyld to walk 
-     * all images with weak binding information in order and look
-     * for collisions.  If there are no collisions, dyld does
-     * no updating.  That means that some fixups are also encoded
-     * in the bind_info.  For instance, all calls to "operator new"
-     * are first bound to libstdc++.dylib using the information
-     * in bind_info.  Then if some image overrides operator new
-     * that is detected when the weak_bind information is processed
-     * and the call to operator new is then rebound.
-     */
-    uint32_t   weak_bind_off;	/* file offset to weak binding info   */
-    uint32_t   weak_bind_size;  /* size of weak binding info  */
-    
-    /*
-     * Some uses of external symbols do not need to be bound immediately.
-     * Instead they can be lazily bound on first use.  The lazy_bind
-     * are contains a stream of BIND opcodes to bind all lazy symbols.
-     * Normal use is that dyld ignores the lazy_bind section when
-     * loading an image.  Instead the static linker arranged for the
-     * lazy pointer to initially point to a helper function which 
-     * pushes the offset into the lazy_bind area for the symbol
-     * needing to be bound, then jumps to dyld which simply adds
-     * the offset to lazy_bind_off to get the information on what 
-     * to bind.  
-     */
-    uint32_t   lazy_bind_off;	/* file offset to lazy binding info */
-    uint32_t   lazy_bind_size;  /* size of lazy binding infs */
-    
-    /*
-     * The symbols exported by a dylib are encoded in a trie.  This
-     * is a compact representation that factors out common prefixes.
-     * It also reduces LINKEDIT pages in RAM because it encodes all  
-     * information (name, address, flags) in one small, contiguous range.
-     * The export area is a stream of nodes.  The first node sequentially
-     * is the start node for the trie.  
-     *
-     * Nodes for a symbol start with a uleb128 that is the length of
-     * the exported symbol information for the string so far.
-     * If there is no exported symbol, the node starts with a zero byte. 
-     * If there is exported info, it follows the length.  First is
-     * a uleb128 containing flags.  Normally, it is followed by a
-     * uleb128 encoded offset which is location of the content named
-     * by the symbol from the mach_header for the image.  If the flags
-     * is EXPORT_SYMBOL_FLAGS_REEXPORT, then following the flags is
-     * a uleb128 encoded library ordinal, then a zero terminated
-     * UTF8 string.  If the string is zero length, then the symbol
-     * is re-export from the specified dylib with the same name.
-     *
-     * After the optional exported symbol information is a byte of
-     * how many edges (0-255) that this node has leaving it, 
-     * followed by each edge.
-     * Each edge is a zero terminated UTF8 of the addition chars
-     * in the symbol, followed by a uleb128 offset for the node that
-     * edge points to.
-     *  
-     */
-    uint32_t   export_off;	/* file offset to lazy binding info */
-    uint32_t   export_size;	/* size of lazy binding infs */
-};
-
-/*
- * The following are used to encode rebasing information
- */
-#define REBASE_TYPE_POINTER					1
-#define REBASE_TYPE_TEXT_ABSOLUTE32				2
-#define REBASE_TYPE_TEXT_PCREL32				3
-
-#define REBASE_OPCODE_MASK					0xF0
-#define REBASE_IMMEDIATE_MASK					0x0F
-#define REBASE_OPCODE_DONE					0x00
-#define REBASE_OPCODE_SET_TYPE_IMM				0x10
-#define REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB		0x20
-#define REBASE_OPCODE_ADD_ADDR_ULEB				0x30
-#define REBASE_OPCODE_ADD_ADDR_IMM_SCALED			0x40
-#define REBASE_OPCODE_DO_REBASE_IMM_TIMES			0x50
-#define REBASE_OPCODE_DO_REBASE_ULEB_TIMES			0x60
-#define REBASE_OPCODE_DO_REBASE_ADD_ADDR_ULEB			0x70
-#define REBASE_OPCODE_DO_REBASE_ULEB_TIMES_SKIPPING_ULEB	0x80
-
-
-/*
- * The following are used to encode binding information
- */
-#define BIND_TYPE_POINTER					1
-#define BIND_TYPE_TEXT_ABSOLUTE32				2
-#define BIND_TYPE_TEXT_PCREL32					3
-
-#define BIND_SPECIAL_DYLIB_SELF					 0
-#define BIND_SPECIAL_DYLIB_MAIN_EXECUTABLE			-1
-#define BIND_SPECIAL_DYLIB_FLAT_LOOKUP				-2
-
-#define BIND_SYMBOL_FLAGS_WEAK_IMPORT				0x1
-#define BIND_SYMBOL_FLAGS_NON_WEAK_DEFINITION			0x8
-
-#define BIND_OPCODE_MASK					0xF0
-#define BIND_IMMEDIATE_MASK					0x0F
-#define BIND_OPCODE_DONE					0x00
-#define BIND_OPCODE_SET_DYLIB_ORDINAL_IMM			0x10
-#define BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB			0x20
-#define BIND_OPCODE_SET_DYLIB_SPECIAL_IMM			0x30
-#define BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM		0x40
-#define BIND_OPCODE_SET_TYPE_IMM				0x50
-#define BIND_OPCODE_SET_ADDEND_SLEB				0x60
-#define BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB			0x70
-#define BIND_OPCODE_ADD_ADDR_ULEB				0x80
-#define BIND_OPCODE_DO_BIND					0x90
-#define BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB			0xA0
-#define BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED			0xB0
-#define BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB		0xC0
-
-
-/*
- * The following are used on the flags byte of a terminal node
- * in the export information.
- */
-#define EXPORT_SYMBOL_FLAGS_KIND_MASK				0x03
-#define EXPORT_SYMBOL_FLAGS_KIND_REGULAR			0x00
-#define EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL			0x01
-#define EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION			0x04
-#define EXPORT_SYMBOL_FLAGS_REEXPORT				0x08
-#define EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER			0x10
-
-/*
- * The symseg_command contains the offset and size of the GNU style
- * symbol table information as described in the header file <symseg.h>.
- * The symbol roots of the symbol segments must also be aligned properly
- * in the file.  So the requirement of keeping the offsets aligned to a
- * multiple of a 4 bytes translates to the length field of the symbol
- * roots also being a multiple of a long.  Also the padding must again be
- * zeroed. (THIS IS OBSOLETE and no longer supported).
- */
-struct symseg_command {
-	uint32_t	cmd;		/* LC_SYMSEG */
-	uint32_t	cmdsize;	/* sizeof(struct symseg_command) */
-	uint32_t	offset;		/* symbol segment offset */
-	uint32_t	size;		/* symbol segment size in bytes */
-};
-
-/*
- * The ident_command contains a free format string table following the
- * ident_command structure.  The strings are null terminated and the size of
- * the command is padded out with zero bytes to a multiple of 4 bytes/
- * (THIS IS OBSOLETE and no longer supported).
- */
-struct ident_command {
-	uint32_t cmd;		/* LC_IDENT */
-	uint32_t cmdsize;	/* strings that follow this command */
-};
-
-/*
- * The fvmfile_command contains a reference to a file to be loaded at the
- * specified virtual address.  (Presently, this command is reserved for
- * internal use.  The kernel ignores this command when loading a program into
- * memory).
- */
-struct fvmfile_command {
-	uint32_t cmd;			/* LC_FVMFILE */
-	uint32_t cmdsize;		/* includes pathname string */
-	union lc_str	name;		/* files pathname */
-	uint32_t	header_addr;	/* files virtual address */
-};
-
-/*
- * Sections of type S_THREAD_LOCAL_VARIABLES contain an array 
- * of tlv_descriptor structures.
- */
-struct tlv_descriptor
-{
-	void*		(*thunk)(struct tlv_descriptor*);
-	unsigned long	key;
-	unsigned long	offset;
-};
-
-#endif /* _MACHO_LOADER_H_ */
diff --git a/i386/include/mach-o/nlist.h b/i386/include/mach-o/nlist.h
deleted file mode 100644
index 1c19410..0000000
--- a/i386/include/mach-o/nlist.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _MACHO_NLIST_H_
-#define _MACHO_NLIST_H_
-/*	$NetBSD: nlist.h,v 1.5 1994/10/26 00:56:11 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
- */
-#include <stdint.h>
-
-/*
- * Format of a symbol table entry of a Mach-O file for 32-bit architectures.
- * Modified from the BSD format.  The modifications from the original format
- * were changing n_other (an unused field) to n_sect and the addition of the
- * N_SECT type.  These modifications are required to support symbols in a larger
- * number of sections not just the three sections (text, data and bss) in a BSD
- * file.
- */
-struct nlist {
-	union {
-#ifndef __LP64__
-		char *n_name;	/* for use when in-core */
-#endif
-		int32_t n_strx;	/* index into the string table */
-	} n_un;
-	uint8_t n_type;		/* type flag, see below */
-	uint8_t n_sect;		/* section number or NO_SECT */
-	int16_t n_desc;		/* see <mach-o/stab.h> */
-	uint32_t n_value;	/* value of this symbol (or stab offset) */
-};
-
-/*
- * This is the symbol table entry structure for 64-bit architectures.
- */
-struct nlist_64 {
-    union {
-        uint32_t  n_strx; /* index into the string table */
-    } n_un;
-    uint8_t n_type;        /* type flag, see below */
-    uint8_t n_sect;        /* section number or NO_SECT */
-    uint16_t n_desc;       /* see <mach-o/stab.h> */
-    uint64_t n_value;      /* value of this symbol (or stab offset) */
-};
-
-/*
- * Symbols with a index into the string table of zero (n_un.n_strx == 0) are
- * defined to have a null, "", name.  Therefore all string indexes to non null
- * names must not have a zero string index.  This is bit historical information
- * that has never been well documented.
- */
-
-/*
- * The n_type field really contains four fields:
- *	unsigned char N_STAB:3,
- *		      N_PEXT:1,
- *		      N_TYPE:3,
- *		      N_EXT:1;
- * which are used via the following masks.
- */
-#define	N_STAB	0xe0  /* if any of these bits set, a symbolic debugging entry */
-#define	N_PEXT	0x10  /* private external symbol bit */
-#define	N_TYPE	0x0e  /* mask for the type bits */
-#define	N_EXT	0x01  /* external symbol bit, set for external symbols */
-
-/*
- * Only symbolic debugging entries have some of the N_STAB bits set and if any
- * of these bits are set then it is a symbolic debugging entry (a stab).  In
- * which case then the values of the n_type field (the entire field) are given
- * in <mach-o/stab.h>
- */
-
-/*
- * Values for N_TYPE bits of the n_type field.
- */
-#define	N_UNDF	0x0		/* undefined, n_sect == NO_SECT */
-#define	N_ABS	0x2		/* absolute, n_sect == NO_SECT */
-#define	N_SECT	0xe		/* defined in section number n_sect */
-#define	N_PBUD	0xc		/* prebound undefined (defined in a dylib) */
-#define N_INDR	0xa		/* indirect */
-
-/* 
- * If the type is N_INDR then the symbol is defined to be the same as another
- * symbol.  In this case the n_value field is an index into the string table
- * of the other symbol's name.  When the other symbol is defined then they both
- * take on the defined type and value.
- */
-
-/*
- * If the type is N_SECT then the n_sect field contains an ordinal of the
- * section the symbol is defined in.  The sections are numbered from 1 and 
- * refer to sections in order they appear in the load commands for the file
- * they are in.  This means the same ordinal may very well refer to different
- * sections in different files.
- *
- * The n_value field for all symbol table entries (including N_STAB's) gets
- * updated by the link editor based on the value of it's n_sect field and where
- * the section n_sect references gets relocated.  If the value of the n_sect 
- * field is NO_SECT then it's n_value field is not changed by the link editor.
- */
-#define	NO_SECT		0	/* symbol is not in any section */
-#define MAX_SECT	255	/* 1 thru 255 inclusive */
-
-/*
- * Common symbols are represented by undefined (N_UNDF) external (N_EXT) types
- * who's values (n_value) are non-zero.  In which case the value of the n_value
- * field is the size (in bytes) of the common symbol.  The n_sect field is set
- * to NO_SECT.  The alignment of a common symbol may be set as a power of 2
- * between 2^1 and 2^15 as part of the n_desc field using the macros below. If
- * the alignment is not set (a value of zero) then natural alignment based on
- * the size is used.
- */
-#define GET_COMM_ALIGN(n_desc) (((n_desc) >> 8) & 0x0f)
-#define SET_COMM_ALIGN(n_desc,align) \
-    (n_desc) = (((n_desc) & 0xf0ff) | (((align) & 0x0f) << 8))
-
-/*
- * To support the lazy binding of undefined symbols in the dynamic link-editor,
- * the undefined symbols in the symbol table (the nlist structures) are marked
- * with the indication if the undefined reference is a lazy reference or
- * non-lazy reference.  If both a non-lazy reference and a lazy reference is
- * made to the same symbol the non-lazy reference takes precedence.  A reference
- * is lazy only when all references to that symbol are made through a symbol
- * pointer in a lazy symbol pointer section.
- *
- * The implementation of marking nlist structures in the symbol table for
- * undefined symbols will be to use some of the bits of the n_desc field as a
- * reference type.  The mask REFERENCE_TYPE will be applied to the n_desc field
- * of an nlist structure for an undefined symbol to determine the type of
- * undefined reference (lazy or non-lazy).
- *
- * The constants for the REFERENCE FLAGS are propagated to the reference table
- * in a shared library file.  In that case the constant for a defined symbol,
- * REFERENCE_FLAG_DEFINED, is also used.
- */
-/* Reference type bits of the n_desc field of undefined symbols */
-#define REFERENCE_TYPE				0x7
-/* types of references */
-#define REFERENCE_FLAG_UNDEFINED_NON_LAZY		0
-#define REFERENCE_FLAG_UNDEFINED_LAZY			1
-#define REFERENCE_FLAG_DEFINED				2
-#define REFERENCE_FLAG_PRIVATE_DEFINED			3
-#define REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY	4
-#define REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY		5
-
-/*
- * To simplify stripping of objects that use are used with the dynamic link
- * editor, the static link editor marks the symbols defined an object that are
- * referenced by a dynamicly bound object (dynamic shared libraries, bundles).
- * With this marking strip knows not to strip these symbols.
- */
-#define REFERENCED_DYNAMICALLY	0x0010
-
-/*
- * For images created by the static link editor with the -twolevel_namespace
- * option in effect the flags field of the mach header is marked with
- * MH_TWOLEVEL.  And the binding of the undefined references of the image are
- * determined by the static link editor.  Which library an undefined symbol is
- * bound to is recorded by the static linker in the high 8 bits of the n_desc
- * field using the SET_LIBRARY_ORDINAL macro below.  The ordinal recorded
- * references the libraries listed in the Mach-O's LC_LOAD_DYLIB,
- * LC_LOAD_WEAK_DYLIB, LC_REEXPORT_DYLIB, LC_LOAD_UPWARD_DYLIB, and
- * LC_LAZY_LOAD_DYLIB, etc. load commands in the order they appear in the
- * headers.   The library ordinals start from 1.
- * For a dynamic library that is built as a two-level namespace image the
- * undefined references from module defined in another use the same nlist struct
- * an in that case SELF_LIBRARY_ORDINAL is used as the library ordinal.  For
- * defined symbols in all images they also must have the library ordinal set to
- * SELF_LIBRARY_ORDINAL.  The EXECUTABLE_ORDINAL refers to the executable
- * image for references from plugins that refer to the executable that loads
- * them.
- * 
- * The DYNAMIC_LOOKUP_ORDINAL is for undefined symbols in a two-level namespace
- * image that are looked up by the dynamic linker with flat namespace semantics.
- * This ordinal was added as a feature in Mac OS X 10.3 by reducing the
- * value of MAX_LIBRARY_ORDINAL by one.  So it is legal for existing binaries
- * or binaries built with older tools to have 0xfe (254) dynamic libraries.  In
- * this case the ordinal value 0xfe (254) must be treated as a library ordinal
- * for compatibility. 
- */
-#define GET_LIBRARY_ORDINAL(n_desc) (((n_desc) >> 8) & 0xff)
-#define SET_LIBRARY_ORDINAL(n_desc,ordinal) \
-	(n_desc) = (((n_desc) & 0x00ff) | (((ordinal) & 0xff) << 8))
-#define SELF_LIBRARY_ORDINAL 0x0
-#define MAX_LIBRARY_ORDINAL 0xfd
-#define DYNAMIC_LOOKUP_ORDINAL 0xfe
-#define EXECUTABLE_ORDINAL 0xff
-
-/*
- * The bit 0x0020 of the n_desc field is used for two non-overlapping purposes
- * and has two different symbolic names, N_NO_DEAD_STRIP and N_DESC_DISCARDED.
- */
-
-/*
- * The N_NO_DEAD_STRIP bit of the n_desc field only ever appears in a 
- * relocatable .o file (MH_OBJECT filetype). And is used to indicate to the
- * static link editor it is never to dead strip the symbol.
- */
-#define N_NO_DEAD_STRIP 0x0020 /* symbol is not to be dead stripped */
-
-/*
- * The N_DESC_DISCARDED bit of the n_desc field never appears in linked image.
- * But is used in very rare cases by the dynamic link editor to mark an in
- * memory symbol as discared and longer used for linking.
- */
-#define N_DESC_DISCARDED 0x0020	/* symbol is discarded */
-
-/*
- * The N_WEAK_REF bit of the n_desc field indicates to the dynamic linker that
- * the undefined symbol is allowed to be missing and is to have the address of
- * zero when missing.
- */
-#define N_WEAK_REF	0x0040 /* symbol is weak referenced */
-
-/*
- * The N_WEAK_DEF bit of the n_desc field indicates to the static and dynamic
- * linkers that the symbol definition is weak, allowing a non-weak symbol to
- * also be used which causes the weak definition to be discared.  Currently this
- * is only supported for symbols in coalesed sections.
- */
-#define N_WEAK_DEF	0x0080 /* coalesed symbol is a weak definition */
-
-/*
- * The N_REF_TO_WEAK bit of the n_desc field indicates to the dynamic linker
- * that the undefined symbol should be resolved using flat namespace searching.
- */
-#define	N_REF_TO_WEAK	0x0080 /* reference to a weak symbol */
-
-/*
- * The N_ARM_THUMB_DEF bit of the n_desc field indicates that the symbol is
- * a defintion of a Thumb function.
- */
-#define N_ARM_THUMB_DEF	0x0008 /* symbol is a Thumb function (ARM) */
-
-/*
- * The N_SYMBOL_RESOLVER bit of the n_desc field indicates that the
- * that the function is actually a resolver function and should
- * be called to get the address of the real function to use.
- * This bit is only available in .o files (MH_OBJECT filetype)
- */
-#define N_SYMBOL_RESOLVER  0x0100 
-
-#ifndef __STRICT_BSD__
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-/*
- * The function nlist(3) from the C library.
- */
-extern int nlist (const char *filename, struct nlist *list);
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __STRICT_BSD__ */
-
-#endif /* _MACHO_LIST_H_ */
diff --git a/i386/include/mach-o/ranlib.h b/i386/include/mach-o/ranlib.h
deleted file mode 100644
index 66a1f09..0000000
--- a/i386/include/mach-o/ranlib.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*	ranlib.h	4.1	83/05/03	*/
-#ifndef _MACH_O_RANLIB_H_
-#define _MACH_O_RANLIB_H_
-
-#include <stdint.h>
-#include <sys/types.h>		/* off_t */
-
-/*
- * There are two known orders of table of contents for archives.  The first is
- * the order ranlib(1) originally produced and still produces without any
- * options.  This table of contents has the archive member name "__.SYMDEF"
- * This order has the ranlib structures in the order the objects appear in the
- * archive and the symbol names of those objects in the order of symbol table.
- * The second know order is sorted by symbol name and is produced with the -s
- * option to ranlib(1).  This table of contents has the archive member name
- * "__.SYMDEF SORTED" and many programs (notably the 1.0 version of ld(1) can't
- * tell the difference between names because of the imbedded blank in the name
- * and works with either table of contents).  This second order is used by the
- * post 1.0 link editor to produce faster linking.  The original 1.0 version of
- * ranlib(1) gets confused when it is run on a archive with the second type of
- * table of contents because it and ar(1) which it uses use different ways to
- * determined the member name (ar(1) treats all blanks in the name as
- * significant and ranlib(1) only checks for the first one).
- */
-#define SYMDEF		"__.SYMDEF"
-#define SYMDEF_SORTED	"__.SYMDEF SORTED"
-
-/*
- * Structure of the __.SYMDEF table of contents for an archive.
- * __.SYMDEF begins with a long giving the size in bytes of the ranlib
- * structures which immediately follow, and then continues with a string
- * table consisting of a long giving the number of bytes of strings which
- * follow and then the strings themselves.  The ran_strx fields index the
- * string table whose first byte is numbered 0.
- */
-struct	ranlib {
-    union {
-	uint32_t	ran_strx;	/* string table index of */
-#ifndef __LP64__
-	char		*ran_name;	/* symbol defined by */
-#endif
-    } ran_un;
-    uint32_t		ran_off;	/* library member at this offset */
-};
-#endif /* _MACH_O_RANLIB_H_ */
diff --git a/i386/include/mach-o/reloc.h b/i386/include/mach-o/reloc.h
deleted file mode 100644
index d5741ef..0000000
--- a/i386/include/mach-o/reloc.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*	$NetBSD: exec.h,v 1.6 1994/10/27 04:16:05 cgd Exp $	*/
-
-/*
- * Copyright (c) 1993 Christopher G. Demetriou
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _MACHO_RELOC_H_
-#define _MACHO_RELOC_H_
-#include <stdint.h>
-
-/*
- * Format of a relocation entry of a Mach-O file.  Modified from the 4.3BSD
- * format.  The modifications from the original format were changing the value
- * of the r_symbolnum field for "local" (r_extern == 0) relocation entries.
- * This modification is required to support symbols in an arbitrary number of
- * sections not just the three sections (text, data and bss) in a 4.3BSD file.
- * Also the last 4 bits have had the r_type tag added to them.
- */
-struct relocation_info {
-   int32_t	r_address;	/* offset in the section to what is being
-				   relocated */
-   uint32_t     r_symbolnum:24,	/* symbol index if r_extern == 1 or section
-				   ordinal if r_extern == 0 */
-		r_pcrel:1, 	/* was relocated pc relative already */
-		r_length:2,	/* 0=byte, 1=word, 2=long, 3=quad */
-		r_extern:1,	/* does not include value of sym referenced */
-		r_type:4;	/* if not 0, machine specific relocation type */
-};
-#define	R_ABS	0		/* absolute relocation type for Mach-O files */
-
-/*
- * The r_address is not really the address as it's name indicates but an offset.
- * In 4.3BSD a.out objects this offset is from the start of the "segment" for
- * which relocation entry is for (text or data).  For Mach-O object files it is
- * also an offset but from the start of the "section" for which the relocation
- * entry is for.  See comments in <mach-o/loader.h> about the r_address feild
- * in images for used with the dynamic linker.
- * 
- * In 4.3BSD a.out objects if r_extern is zero then r_symbolnum is an ordinal
- * for the segment the symbol being relocated is in.  These ordinals are the
- * symbol types N_TEXT, N_DATA, N_BSS or N_ABS.  In Mach-O object files these
- * ordinals refer to the sections in the object file in the order their section
- * structures appear in the headers of the object file they are in.  The first
- * section has the ordinal 1, the second 2, and so on.  This means that the
- * same ordinal in two different object files could refer to two different
- * sections.  And further could have still different ordinals when combined
- * by the link-editor.  The value R_ABS is used for relocation entries for
- * absolute symbols which need no further relocation.
- */
-
-/*
- * For RISC machines some of the references are split across two instructions
- * and the instruction does not contain the complete value of the reference.
- * In these cases a second, or paired relocation entry, follows each of these
- * relocation entries, using a PAIR r_type, which contains the other part of the
- * reference not contained in the instruction.  This other part is stored in the
- * pair's r_address field.  The exact number of bits of the other part of the
- * reference store in the r_address field is dependent on the particular
- * relocation type for the particular architecture.
- */
-
-/*
- * To make scattered loading by the link editor work correctly "local"
- * relocation entries can't be used when the item to be relocated is the value
- * of a symbol plus an offset (where the resulting expresion is outside the
- * block the link editor is moving, a blocks are divided at symbol addresses).
- * In this case. where the item is a symbol value plus offset, the link editor
- * needs to know more than just the section the symbol was defined.  What is
- * needed is the actual value of the symbol without the offset so it can do the
- * relocation correctly based on where the value of the symbol got relocated to
- * not the value of the expression (with the offset added to the symbol value).
- * So for the NeXT 2.0 release no "local" relocation entries are ever used when
- * there is a non-zero offset added to a symbol.  The "external" and "local"
- * relocation entries remain unchanged.
- *
- * The implemention is quite messy given the compatibility with the existing
- * relocation entry format.  The ASSUMPTION is that a section will never be
- * bigger than 2**24 - 1 (0x00ffffff or 16,777,215) bytes.  This assumption
- * allows the r_address (which is really an offset) to fit in 24 bits and high
- * bit of the r_address field in the relocation_info structure to indicate
- * it is really a scattered_relocation_info structure.  Since these are only
- * used in places where "local" relocation entries are used and not where
- * "external" relocation entries are used the r_extern field has been removed.
- *
- * For scattered loading to work on a RISC machine where some of the references
- * are split across two instructions the link editor needs to be assured that
- * each reference has a unique 32 bit reference (that more than one reference is
- * NOT sharing the same high 16 bits for example) so it move each referenced
- * item independent of each other.  Some compilers guarantees this but the
- * compilers don't so scattered loading can be done on those that do guarantee
- * this.
- */
-#if defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)
-/*
- * The reason for the ifdef's of __BIG_ENDIAN__ and __LITTLE_ENDIAN__ are that
- * when stattered relocation entries were added the mistake of using a mask
- * against a structure that is made up of bit fields was used.  To make this
- * design work this structure must be laid out in memory the same way so the
- * mask can be applied can check the same bit each time (r_scattered).
- */
-#endif /* defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__) */
-#define R_SCATTERED 0x80000000	/* mask to be applied to the r_address field 
-				   of a relocation_info structure to tell that
-				   is is really a scattered_relocation_info
-				   stucture */
-struct scattered_relocation_info {
-#ifdef __BIG_ENDIAN__
-   uint32_t	r_scattered:1,	/* 1=scattered, 0=non-scattered (see above) */
-		r_pcrel:1, 	/* was relocated pc relative already */
-		r_length:2,	/* 0=byte, 1=word, 2=long, 3=quad */
-		r_type:4,	/* if not 0, machine specific relocation type */
-   		r_address:24;	/* offset in the section to what is being
-				   relocated */
-   int32_t	r_value;	/* the value the item to be relocated is
-				   refering to (without any offset added) */
-#endif /* __BIG_ENDIAN__ */
-#ifdef __LITTLE_ENDIAN__
-   uint32_t
-   		r_address:24,	/* offset in the section to what is being
-				   relocated */
-		r_type:4,	/* if not 0, machine specific relocation type */
-		r_length:2,	/* 0=byte, 1=word, 2=long, 3=quad */
-		r_pcrel:1, 	/* was relocated pc relative already */
-		r_scattered:1;	/* 1=scattered, 0=non-scattered (see above) */
-   int32_t	r_value;	/* the value the item to be relocated is
-				   refering to (without any offset added) */
-#endif /* __LITTLE_ENDIAN__ */
-};
-
-/*
- * Relocation types used in a generic implementation.  Relocation entries for
- * normal things use the generic relocation as discribed above and their r_type
- * is GENERIC_RELOC_VANILLA (a value of zero).
- *
- * Another type of generic relocation, GENERIC_RELOC_SECTDIFF, is to support
- * the difference of two symbols defined in different sections.  That is the
- * expression "symbol1 - symbol2 + constant" is a relocatable expression when
- * both symbols are defined in some section.  For this type of relocation the
- * both relocations entries are scattered relocation entries.  The value of
- * symbol1 is stored in the first relocation entry's r_value field and the
- * value of symbol2 is stored in the pair's r_value field.
- *
- * A special case for a prebound lazy pointer is needed to beable to set the
- * value of the lazy pointer back to its non-prebound state.  This is done
- * using the GENERIC_RELOC_PB_LA_PTR r_type.  This is a scattered relocation
- * entry where the r_value feild is the value of the lazy pointer not prebound.
- */
-enum reloc_type_generic
-{
-    GENERIC_RELOC_VANILLA,	/* generic relocation as discribed above */
-    GENERIC_RELOC_PAIR,		/* Only follows a GENERIC_RELOC_SECTDIFF */
-    GENERIC_RELOC_SECTDIFF,
-    GENERIC_RELOC_PB_LA_PTR,	/* prebound lazy pointer */
-    GENERIC_RELOC_LOCAL_SECTDIFF,
-    GENERIC_RELOC_TLV		/* thread local variables */
-};
-
-#endif /* _MACHO_RELOC_H_ */
diff --git a/i386/include/mach-o/stab.h b/i386/include/mach-o/stab.h
deleted file mode 100644
index e9e15b2..0000000
--- a/i386/include/mach-o/stab.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _MACHO_STAB_H_
-#define _MACHO_STAB_H_
-/*	$NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)stab.h	5.2 (Berkeley) 4/4/91
- */
-
-/*
- * This file gives definitions supplementing <nlist.h> for permanent symbol
- * table entries of Mach-O files.  Modified from the BSD definitions.  The
- * modifications from the original definitions were changing what the values of
- * what was the n_other field (an unused field) which is now the n_sect field.
- * These modifications are required to support symbols in an arbitrary number of
- * sections not just the three sections (text, data and bss) in a BSD file.
- * The values of the defined constants have NOT been changed.
- *
- * These must have one of the N_STAB bits on.  The n_value fields are subject
- * to relocation according to the value of their n_sect field.  So for types
- * that refer to things in sections the n_sect field must be filled in with the
- * proper section ordinal.  For types that are not to have their n_value field 
- * relocatated the n_sect field must be NO_SECT.
- */
-
-/*
- * Symbolic debugger symbols.  The comments give the conventional use for
- * 
- * 	.stabs "n_name", n_type, n_sect, n_desc, n_value
- *
- * where n_type is the defined constant and not listed in the comment.  Other
- * fields not listed are zero. n_sect is the section ordinal the entry is
- * refering to.
- */
-#define	N_GSYM	0x20	/* global symbol: name,,NO_SECT,type,0 */
-#define	N_FNAME	0x22	/* procedure name (f77 kludge): name,,NO_SECT,0,0 */
-#define	N_FUN	0x24	/* procedure: name,,n_sect,linenumber,address */
-#define	N_STSYM	0x26	/* static symbol: name,,n_sect,type,address */
-#define	N_LCSYM	0x28	/* .lcomm symbol: name,,n_sect,type,address */
-#define N_BNSYM 0x2e	/* begin nsect sym: 0,,n_sect,0,address */
-#define N_OPT	0x3c	/* emitted with gcc2_compiled and in gcc source */
-#define	N_RSYM	0x40	/* register sym: name,,NO_SECT,type,register */
-#define	N_SLINE	0x44	/* src line: 0,,n_sect,linenumber,address */
-#define N_ENSYM 0x4e	/* end nsect sym: 0,,n_sect,0,address */
-#define	N_SSYM	0x60	/* structure elt: name,,NO_SECT,type,struct_offset */
-#define	N_SO	0x64	/* source file name: name,,n_sect,0,address */
-#define	N_OSO	0x66	/* object file name: name,,0,0,st_mtime */
-#define	N_LSYM	0x80	/* local sym: name,,NO_SECT,type,offset */
-#define N_BINCL	0x82	/* include file beginning: name,,NO_SECT,0,sum */
-#define	N_SOL	0x84	/* #included file name: name,,n_sect,0,address */
-#define	N_PARAMS  0x86	/* compiler parameters: name,,NO_SECT,0,0 */
-#define	N_VERSION 0x88	/* compiler version: name,,NO_SECT,0,0 */
-#define	N_OLEVEL  0x8A	/* compiler -O level: name,,NO_SECT,0,0 */
-#define	N_PSYM	0xa0	/* parameter: name,,NO_SECT,type,offset */
-#define N_EINCL	0xa2	/* include file end: name,,NO_SECT,0,0 */
-#define	N_ENTRY	0xa4	/* alternate entry: name,,n_sect,linenumber,address */
-#define	N_LBRAC	0xc0	/* left bracket: 0,,NO_SECT,nesting level,address */
-#define N_EXCL	0xc2	/* deleted include file: name,,NO_SECT,0,sum */
-#define	N_RBRAC	0xe0	/* right bracket: 0,,NO_SECT,nesting level,address */
-#define	N_BCOMM	0xe2	/* begin common: name,,NO_SECT,0,0 */
-#define	N_ECOMM	0xe4	/* end common: name,,n_sect,0,0 */
-#define	N_ECOML	0xe8	/* end common (local name): 0,,n_sect,0,address */
-#define	N_LENG	0xfe	/* second stab entry with length information */
-
-/*
- * for the berkeley pascal compiler, pc(1):
- */
-#define	N_PC	0x30	/* global pascal symbol: name,,NO_SECT,subtype,line */
-
-#endif /* _MACHO_STAB_H_ */
diff --git a/i386/include/mach-o/swap.h b/i386/include/mach-o/swap.h
deleted file mode 100644
index ba10994..0000000
--- a/i386/include/mach-o/swap.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _MACH_O_SWAP_H_
-#define _MACH_O_SWAP_H_
-
-#include <stdint.h>
-#include <architecture/byte_order.h>
-#include <mach-o/fat.h>
-#include <mach-o/loader.h>
-#include <mach-o/nlist.h>
-#include <mach-o/reloc.h>
-#include <mach-o/ranlib.h>
-
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-extern void swap_fat_header(
-    struct fat_header *fat_header,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_fat_arch(
-    struct fat_arch *fat_archs,
-    uint32_t nfat_arch,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_mach_header(
-    struct mach_header *mh,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_mach_header_64(
-    struct mach_header_64 *mh,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_load_command(
-    struct load_command *lc,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_segment_command(
-    struct segment_command *sg,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_segment_command_64(
-    struct segment_command_64 *sg,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_section(
-    struct section *s,
-    uint32_t nsects,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_section_64(
-    struct section_64 *s,
-    uint32_t nsects,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_symtab_command(
-    struct symtab_command *st,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_dysymtab_command(
-    struct dysymtab_command *dyst,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_symseg_command(
-    struct symseg_command *ss,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_fvmlib_command(
-    struct fvmlib_command *fl,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_dylib_command(
-    struct dylib_command *dl,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_sub_framework_command(
-    struct sub_framework_command *sub,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_sub_umbrella_command(
-    struct sub_umbrella_command *usub,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_sub_library_command(
-    struct sub_library_command *lsub,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_sub_client_command(
-    struct sub_client_command *csub,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_prebound_dylib_command(
-    struct prebound_dylib_command *pbdylib,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_dylinker_command(
-    struct dylinker_command *dyld,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_fvmfile_command(
-    struct fvmfile_command *ff,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_thread_command(
-    struct thread_command *ut,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_ident_command(
-    struct ident_command *ident,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_routines_command(
-    struct routines_command *r_cmd,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_routines_command_64(
-    struct routines_command_64 *r_cmd,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_twolevel_hints_command(
-    struct twolevel_hints_command *hints_cmd,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_prebind_cksum_command(
-    struct prebind_cksum_command *cksum_cmd,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_uuid_command(
-    struct uuid_command *uuid_cmd,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_twolevel_hint(
-    struct twolevel_hint *hints,
-    uint32_t nhints,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_nlist(
-    struct nlist *symbols,
-    uint32_t nsymbols,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_nlist_64(
-    struct nlist_64 *symbols,
-    uint32_t nsymbols,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_ranlib(
-    struct ranlib *ranlibs,
-    uint32_t nranlibs,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_relocation_info(
-    struct relocation_info *relocs,
-    uint32_t nrelocs,
-    enum NXByteOrder target_byte_order);
-
-extern void swap_indirect_symbols(
-    uint32_t *indirect_symbols,
-    uint32_t nindirect_symbols,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_dylib_reference(
-    struct dylib_reference *refs,  
-    uint32_t nrefs,
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_dylib_module(  
-    struct dylib_module *mods,
-    uint32_t nmods, 
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_dylib_module_64(  
-    struct dylib_module_64 *mods,
-    uint32_t nmods, 
-    enum NXByteOrder target_byte_sex);
-
-extern void swap_dylib_table_of_contents(
-    struct dylib_table_of_contents *tocs,
-    uint32_t ntocs,
-    enum NXByteOrder target_byte_sex);
-
-#if __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _MACH_O_SWAP_H_ */
diff --git a/i386/include/mach/audit_triggers.defs b/i386/include/mach/audit_triggers.defs
deleted file mode 100644
index 1d6e279..0000000
--- a/i386/include/mach/audit_triggers.defs
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2004-2008, Apple Inc.  All rights reserved.
- * 
- * @APPLE_BSD_LICENSE_HEADER_START@
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer. 
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * @APPLE_BSD_LICENSE_HEADER_END@
-*/
-
-/*
- *  Interface definition for the audit logging facility.
- */
-
-subsystem
-#if	KERNEL_USER
-    KernelUser
-#endif	/* KERNEL_USER */
-    audit_triggers 123;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-simpleroutine	audit_triggers(
-		audit_port	: mach_port_t; 
-	in	flags		: int);
-
diff --git a/i386/include/mach/boolean.h b/i386/include/mach/boolean.h
deleted file mode 100644
index 641c396..0000000
--- a/i386/include/mach/boolean.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/boolean.h
- *
- *	Boolean data type.
- *
- */
-
-#ifndef	_MACH_BOOLEAN_H_
-#define	_MACH_BOOLEAN_H_
-
-/*
- *	Pick up "boolean_t" type definition
- */
-
-#ifndef	ASSEMBLER
-#include <mach/machine/boolean.h>
-#endif	/* ASSEMBLER */
-
-/*
- *	Define TRUE and FALSE if not defined.
- */
-
-#ifndef	TRUE
-#define TRUE	1
-#endif	/* TRUE */
-
-#ifndef	FALSE
-#define FALSE	0
-#endif	/* FALSE */
-
-#endif	/* _MACH_BOOLEAN_H_ */
diff --git a/i386/include/mach/bootstrap.h b/i386/include/mach/bootstrap.h
deleted file mode 100644
index 67667c3..0000000
--- a/i386/include/mach/bootstrap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Mach bootstrap interfaces (obsolete: header included only for compatibility)
- */
-#ifndef	_MACH_BOOTSTRAP_H_
-#define _MACH_BOOTSTRAP_H_
-
-#endif /* _MACH_BOOTSTRAP_H_ */
diff --git a/i386/include/mach/clock.defs b/i386/include/mach/clock.defs
deleted file mode 100644
index 440042c..0000000
--- a/i386/include/mach/clock.defs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/*
- * 	File:		mach/clock.defs
- *	Purpose:	Kernel clock subsystem definitions. This
- *			file defines the clock request interface.
- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-		       clock 1000;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-#include <mach/clock_types.defs>
-
-/*
- * References to clock objects are returned by:
- *	host_get_clock_service(host_t,...)
- *	host_get_clock_control(host_priv_t,...) - Priviledged subclass
- */
-
-/*
- *	Get the clock time.
- *	Available to all.
- */
-routine	clock_get_time(
-		clock_serv	: clock_serv_t;
-	out	cur_time	: mach_timespec_t);
-
-/*
- *	Get clock attributes.
- *	Available to all.
- */
-routine	clock_get_attributes(
-		clock_serv	: clock_serv_t;
-	in	flavor		: clock_flavor_t;
-	out	clock_attr	: clock_attr_t, CountInOut);
-
-/*
- *	Setup a clock alarm.
- *	Available to all.
- */
-routine clock_alarm(
-		clock_serv	: clock_serv_t;
-		alarm_type	: alarm_type_t;
-		alarm_time	: mach_timespec_t;
-                alarm_port      : clock_reply_t =
-			MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/clock.h b/i386/include/mach/clock.h
deleted file mode 100644
index 948b489..0000000
--- a/i386/include/mach/clock.h
+++ /dev/null
@@ -1,221 +0,0 @@
-#ifndef	_clock_user_
-#define	_clock_user_
-
-/* Module clock */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	clock_MSG_COUNT
-#define	clock_MSG_COUNT	3
-#endif	/* clock_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine clock_get_time */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t clock_get_time
-(
-	clock_serv_t clock_serv,
-	mach_timespec_t *cur_time
-);
-
-/* Routine clock_get_attributes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t clock_get_attributes
-(
-	clock_serv_t clock_serv,
-	clock_flavor_t flavor,
-	clock_attr_t clock_attr,
-	mach_msg_type_number_t *clock_attrCnt
-);
-
-/* Routine clock_alarm */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t clock_alarm
-(
-	clock_serv_t clock_serv,
-	alarm_type_t alarm_type,
-	mach_timespec_t alarm_time,
-	clock_reply_t alarm_port
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__clock_subsystem__defined
-#define __Request__clock_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__clock_get_time_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		clock_flavor_t flavor;
-		mach_msg_type_number_t clock_attrCnt;
-	} __Request__clock_get_attributes_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t alarm_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		alarm_type_t alarm_type;
-		mach_timespec_t alarm_time;
-	} __Request__clock_alarm_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__clock_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__clock_subsystem__defined
-#define __RequestUnion__clock_subsystem__defined
-union __RequestUnion__clock_subsystem {
-	__Request__clock_get_time_t Request_clock_get_time;
-	__Request__clock_get_attributes_t Request_clock_get_attributes;
-	__Request__clock_alarm_t Request_clock_alarm;
-};
-#endif /* !__RequestUnion__clock_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__clock_subsystem__defined
-#define __Reply__clock_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_timespec_t cur_time;
-	} __Reply__clock_get_time_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t clock_attrCnt;
-		int clock_attr[1];
-	} __Reply__clock_get_attributes_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__clock_alarm_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__clock_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__clock_subsystem__defined
-#define __ReplyUnion__clock_subsystem__defined
-union __ReplyUnion__clock_subsystem {
-	__Reply__clock_get_time_t Reply_clock_get_time;
-	__Reply__clock_get_attributes_t Reply_clock_get_attributes;
-	__Reply__clock_alarm_t Reply_clock_alarm;
-};
-#endif /* !__RequestUnion__clock_subsystem__defined */
-
-#ifndef subsystem_to_name_map_clock
-#define subsystem_to_name_map_clock \
-    { "clock_get_time", 1000 },\
-    { "clock_get_attributes", 1001 },\
-    { "clock_alarm", 1002 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _clock_user_ */
diff --git a/i386/include/mach/clock_priv.defs b/i386/include/mach/clock_priv.defs
deleted file mode 100644
index b3854a4..0000000
--- a/i386/include/mach/clock_priv.defs
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/*
- * 	File:		mach/clock_priv.defs
- *	Purpose:	Kernel clock subsystem definitions. This
- *			file defines the clock request interface.
- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-		       clock_priv 1200;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-#include <mach/clock_types.defs>
-
-/*
- * References to clock_priv objects are returned by:
- *	host_get_clock_control(host_priv_t,...) - Priviledged subclass
- */
-
-/*
- *	Set the clock time.
- *	Privileged.
- */
-routine	clock_set_time(
-		clock_ctrl	: clock_ctrl_t;
-		new_time	: mach_timespec_t);
-
-/*
- *	Set clock attributes.
- *	Privileged.
- */
-routine	clock_set_attributes(
-		clock_ctrl	: clock_ctrl_t;
-	in	flavor		: clock_flavor_t;
-	in	clock_attr	: clock_attr_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/clock_priv.h b/i386/include/mach/clock_priv.h
deleted file mode 100644
index 8a38935..0000000
--- a/i386/include/mach/clock_priv.h
+++ /dev/null
@@ -1,175 +0,0 @@
-#ifndef	_clock_priv_user_
-#define	_clock_priv_user_
-
-/* Module clock_priv */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	clock_priv_MSG_COUNT
-#define	clock_priv_MSG_COUNT	2
-#endif	/* clock_priv_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine clock_set_time */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t clock_set_time
-(
-	clock_ctrl_t clock_ctrl,
-	mach_timespec_t new_time
-);
-
-/* Routine clock_set_attributes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t clock_set_attributes
-(
-	clock_ctrl_t clock_ctrl,
-	clock_flavor_t flavor,
-	clock_attr_t clock_attr,
-	mach_msg_type_number_t clock_attrCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__clock_priv_subsystem__defined
-#define __Request__clock_priv_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_timespec_t new_time;
-	} __Request__clock_set_time_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		clock_flavor_t flavor;
-		mach_msg_type_number_t clock_attrCnt;
-		int clock_attr[1];
-	} __Request__clock_set_attributes_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__clock_priv_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__clock_priv_subsystem__defined
-#define __RequestUnion__clock_priv_subsystem__defined
-union __RequestUnion__clock_priv_subsystem {
-	__Request__clock_set_time_t Request_clock_set_time;
-	__Request__clock_set_attributes_t Request_clock_set_attributes;
-};
-#endif /* !__RequestUnion__clock_priv_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__clock_priv_subsystem__defined
-#define __Reply__clock_priv_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__clock_set_time_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__clock_set_attributes_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__clock_priv_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__clock_priv_subsystem__defined
-#define __ReplyUnion__clock_priv_subsystem__defined
-union __ReplyUnion__clock_priv_subsystem {
-	__Reply__clock_set_time_t Reply_clock_set_time;
-	__Reply__clock_set_attributes_t Reply_clock_set_attributes;
-};
-#endif /* !__RequestUnion__clock_priv_subsystem__defined */
-
-#ifndef subsystem_to_name_map_clock_priv
-#define subsystem_to_name_map_clock_priv \
-    { "clock_set_time", 1200 },\
-    { "clock_set_attributes", 1201 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _clock_priv_user_ */
diff --git a/i386/include/mach/clock_reply.defs b/i386/include/mach/clock_reply.defs
deleted file mode 100644
index 9646f90..0000000
--- a/i386/include/mach/clock_reply.defs
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/*
- *	File:		clock_reply.defs
- *	Purpose:	Kernel clock subsystem definitions. This
- *			file defines the clock reply interface.
- */
-
-subsystem
-#if	KERNEL_USER
-	  KernelUser
-#endif	/* KERNEL_USER */
-		     clock_reply 3125107;  /* Matches up with old value */
-
-#include <mach/std_types.defs>
-#include <mach/clock_types.defs>
-
-
-/*
- *	Reply routine for clock_alarm. 
- */
-simpleroutine clock_alarm_reply(
-                alarm_port      : clock_reply_t;
-		alarm_code	: kern_return_t;
-		alarm_type	: alarm_type_t;
-		alarm_time	: mach_timespec_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/clock_reply.h b/i386/include/mach/clock_reply.h
deleted file mode 100644
index d0cf150..0000000
--- a/i386/include/mach/clock_reply.h
+++ /dev/null
@@ -1,136 +0,0 @@
-#ifndef	_clock_reply_user_
-#define	_clock_reply_user_
-
-/* Module clock_reply */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	clock_reply_MSG_COUNT
-#define	clock_reply_MSG_COUNT	1
-#endif	/* clock_reply_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* SimpleRoutine clock_alarm_reply */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t clock_alarm_reply
-(
-	clock_reply_t alarm_port,
-	mach_msg_type_name_t alarm_portPoly,
-	kern_return_t alarm_code,
-	alarm_type_t alarm_type,
-	mach_timespec_t alarm_time
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__clock_reply_subsystem__defined
-#define __Request__clock_reply_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t alarm_code;
-		alarm_type_t alarm_type;
-		mach_timespec_t alarm_time;
-	} __Request__clock_alarm_reply_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__clock_reply_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__clock_reply_subsystem__defined
-#define __RequestUnion__clock_reply_subsystem__defined
-union __RequestUnion__clock_reply_subsystem {
-	__Request__clock_alarm_reply_t Request_clock_alarm_reply;
-};
-#endif /* !__RequestUnion__clock_reply_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__clock_reply_subsystem__defined
-#define __Reply__clock_reply_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__clock_alarm_reply_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__clock_reply_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__clock_reply_subsystem__defined
-#define __ReplyUnion__clock_reply_subsystem__defined
-union __ReplyUnion__clock_reply_subsystem {
-	__Reply__clock_alarm_reply_t Reply_clock_alarm_reply;
-};
-#endif /* !__RequestUnion__clock_reply_subsystem__defined */
-
-#ifndef subsystem_to_name_map_clock_reply
-#define subsystem_to_name_map_clock_reply \
-    { "clock_alarm_reply", 3125107 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _clock_reply_user_ */
diff --git a/i386/include/mach/clock_types.defs b/i386/include/mach/clock_types.defs
deleted file mode 100644
index 4dbacfc..0000000
--- a/i386/include/mach/clock_types.defs
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/*
- *	File:		clock_types.defs
- *	Purpose:
- *		Clock kernel interface type declarations
- */
-
-#ifndef	_MACH_CLOCK_TYPES_DEFS_
-#define _MACH_CLOCK_TYPES_DEFS_
-
-#include <mach/std_types.defs>
-
-type clock_serv_t = mach_port_t
-		cusertype: clock_serv_t
-#if	KERNEL_SERVER
-		intran: clock_serv_t convert_port_to_clock(mach_port_t)
-		outtran: mach_port_t convert_clock_to_port(clock_serv_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type clock_ctrl_t = mach_port_t
-		cusertype: clock_ctrl_t
-#if	KERNEL_SERVER
-		intran: clock_ctrl_t convert_port_to_clock_ctrl(mach_port_t)
-		outtran: mach_port_t convert_clock_ctrl_to_port(clock_ctrl_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type clock_reply_t = polymorphic|MACH_MSG_TYPE_MAKE_SEND_ONCE;
-
-type clock_flavor_t = int;
-type clock_attr_t = array[*:1] of int;
-type mach_timespec_t	= struct[2] of int;
-type time_t = int;
-type sleep_type_t = int;
-type alarm_type_t = int;
-type clock_res_t = int;
-type clock_id_t = int;
-
-import <mach/mach_types.h>;
-
-#endif	/* _MACH_CLOCK_TYPES_DEFS_ */
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/clock_types.h b/i386/include/mach/clock_types.h
deleted file mode 100644
index 12035da..0000000
--- a/i386/include/mach/clock_types.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/*
- *	File:		clock_types.h
- *	Purpose:	Clock facility header definitions. These
- *				definitons are needed by both kernel and
- *				user-level software.
- */
-
-/*
- *	All interfaces defined here are obsolete.
- */
-
-#ifndef	_MACH_CLOCK_TYPES_H_
-#define	_MACH_CLOCK_TYPES_H_
-
-#include <stdint.h>
-#include <mach/time_value.h>
-
-/*
- * Type definitions.
- */
-typedef	int	alarm_type_t;		/* alarm time type */
-typedef int	sleep_type_t;		/* sleep time type */
-typedef	int	clock_id_t;			/* clock identification type */
-typedef int	clock_flavor_t;		/* clock flavor type */
-typedef int	*clock_attr_t;		/* clock attribute type */
-typedef int	clock_res_t;		/* clock resolution type */
-
-/*
- * Normal time specification used by the kernel clock facility.
- */
-struct mach_timespec {
-	unsigned int	tv_sec;			/* seconds */
-	clock_res_t		tv_nsec;		/* nanoseconds */
-};
-typedef struct mach_timespec	mach_timespec_t;
-
-/*
- * Reserved clock id values for default clocks.
- */
-#define SYSTEM_CLOCK		0
-#define CALENDAR_CLOCK		1
-
-#define REALTIME_CLOCK		0
-
-/*
- * Attribute names.
- */
-#define	CLOCK_GET_TIME_RES	1	/* get_time call resolution */
-/*							2	 * was map_time call resolution */
-#define CLOCK_ALARM_CURRES	3	/* current alarm resolution */
-#define CLOCK_ALARM_MINRES	4	/* minimum alarm resolution */
-#define CLOCK_ALARM_MAXRES	5	/* maximum alarm resolution */
-
-#define NSEC_PER_USEC	1000		/* nanoseconds per microsecond */
-#define USEC_PER_SEC	1000000		/* microseconds per second */
-#define NSEC_PER_SEC	1000000000	/* nanoseconds per second */
-
-#define BAD_MACH_TIMESPEC(t)						\
-	((t)->tv_nsec < 0 || (t)->tv_nsec >= NSEC_PER_SEC)
-
-/* t1 <=> t2, also (t1 - t2) in nsec with max of +- 1 sec */
-#define CMP_MACH_TIMESPEC(t1, t2)					\
-	((t1)->tv_sec > (t2)->tv_sec ? +NSEC_PER_SEC :	\
-	((t1)->tv_sec < (t2)->tv_sec ? -NSEC_PER_SEC :	\
-			(t1)->tv_nsec - (t2)->tv_nsec))
-
-/* t1  += t2 */
-#define ADD_MACH_TIMESPEC(t1, t2)								\
-  do {															\
-	if (((t1)->tv_nsec += (t2)->tv_nsec) >= NSEC_PER_SEC) {		\
-		(t1)->tv_nsec -= NSEC_PER_SEC;							\
-		(t1)->tv_sec  += 1;										\
-	}															\
-	(t1)->tv_sec += (t2)->tv_sec;								\
-  } while (0)
-
-/* t1  -= t2 */
-#define SUB_MACH_TIMESPEC(t1, t2)								\
-  do {															\
-	if (((t1)->tv_nsec -= (t2)->tv_nsec) < 0) {					\
-		(t1)->tv_nsec += NSEC_PER_SEC;							\
-		(t1)->tv_sec  -= 1;										\
-	}															\
-	(t1)->tv_sec -= (t2)->tv_sec;								\
-  } while (0)
-
-/*
- * Alarm parameter defines.
- */
-#define ALRMTYPE			0xff		/* type (8-bit field)	*/
-#define TIME_ABSOLUTE		0x00		/* absolute time */
-#define	TIME_RELATIVE		0x01		/* relative time */
-
-#define BAD_ALRMTYPE(t)		(((t) &~ TIME_RELATIVE) != 0)
-
-#endif /* _MACH_CLOCK_TYPES_H_ */
diff --git a/i386/include/mach/error.h b/i386/include/mach/error.h
deleted file mode 100644
index a32eaee..0000000
--- a/i386/include/mach/error.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- * File:	mach/error.h
- * Purpose:
- *	error module definitions
- *
- */
-
-#ifndef	_MACH_ERROR_H_
-#define	_MACH_ERROR_H_
-
-#include <mach/kern_return.h>
-
-/*
- *	error number layout as follows:
- *
- *	hi		 		       lo
- *	| system(6) | subsystem(12) | code(14) |
- */
-
-
-#define	err_none		(mach_error_t)0
-#define ERR_SUCCESS		(mach_error_t)0
-#define	ERR_ROUTINE_NIL		(mach_error_fn_t)0
-
-
-#define	err_system(x)		(((x)&0x3f)<<26)
-#define err_sub(x)		(((x)&0xfff)<<14)
-
-#define err_get_system(err)	(((err)>>26)&0x3f)
-#define err_get_sub(err)	(((err)>>14)&0xfff)
-#define err_get_code(err)	((err)&0x3fff)
-
-#define system_emask		(err_system(0x3f))
-#define sub_emask		(err_sub(0xfff))
-#define code_emask		(0x3fff)
-
-
-/*	major error systems	*/
-#define	err_kern		err_system(0x0)		/* kernel */
-#define	err_us			err_system(0x1)		/* user space library */
-#define	err_server		err_system(0x2)		/* user space servers */
-#define	err_ipc			err_system(0x3)		/* old ipc errors */
-#define err_mach_ipc		err_system(0x4)		/* mach-ipc errors */
-#define	err_dipc		err_system(0x7)		/* distributed ipc */
-#define err_local		err_system(0x3e)	/* user defined errors */
-#define	err_ipc_compat		err_system(0x3f)	/* (compatibility) mach-ipc errors */
-
-#define	err_max_system		0x3f
-
-
-/*	unix errors get lumped into one subsystem  */
-#define	unix_err(errno)		(err_kern|err_sub(3)|errno)
-
-typedef	kern_return_t	mach_error_t;
-typedef mach_error_t	(* mach_error_fn_t)( void );
-
-#endif	/* _MACH_ERROR_H_ */
diff --git a/i386/include/mach/exc.defs b/i386/include/mach/exc.defs
deleted file mode 100644
index de6aee7..0000000
--- a/i386/include/mach/exc.defs
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- * Abstract:
- *	MiG definitions file for Mach exception interface.
- */
-
-subsystem
-#if	KERNEL_USER
-	  KernelUser
-#endif
-		     exc 2401;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-ServerPrefix catch_;
-
-type exception_data_t		= array[*:2] of integer_t;
-type exception_type_t		= int;
-
-routine		exception_raise(
-#if	KERNEL_USER
-			exception_port	: mach_port_move_send_t;
-			thread		: mach_port_move_send_t;
-			task		: mach_port_move_send_t;
-#else	/* KERNEL_USER */
-			exception_port	: mach_port_t;
-			thread		: mach_port_t;
-			task		: mach_port_t;
-#endif	/* KERNEL_USER */
-			exception	: exception_type_t;
-			code		: exception_data_t
-			);
-
-routine		exception_raise_state(
-#if	KERNEL_USER
-			exception_port	: mach_port_move_send_t;
-#else	/* KERNEL_USER */
-			exception_port	: mach_port_t;
-#endif	/* KERNEL_USER */
-			exception	: exception_type_t;
-			code		: exception_data_t, const;
-		  inout flavor		: int;
-			old_state	: thread_state_t, const;
-		    out new_state	: thread_state_t);
-
-routine		exception_raise_state_identity(
-#if	KERNEL_USER
-			exception_port  : mach_port_move_send_t;
-			thread		: mach_port_move_send_t;
-			task		: mach_port_move_send_t;
-#else	/* KERNEL_USER */
-			exception_port  : mach_port_t;
-			thread          : mach_port_t;
-			task            : mach_port_t;
-#endif	/* KERNEL_USER */
-			exception       : exception_type_t;
-			code            : exception_data_t;
-		  inout flavor          : int;
-			old_state       : thread_state_t;
-		    out new_state       : thread_state_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/exc.h b/i386/include/mach/exc.h
deleted file mode 100644
index 3987a6e..0000000
--- a/i386/include/mach/exc.h
+++ /dev/null
@@ -1,257 +0,0 @@
-#ifndef	_exc_user_
-#define	_exc_user_
-
-/* Module exc */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	exc_MSG_COUNT
-#define	exc_MSG_COUNT	3
-#endif	/* exc_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine exception_raise */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t exception_raise
-(
-	mach_port_t exception_port,
-	mach_port_t thread,
-	mach_port_t task,
-	exception_type_t exception,
-	exception_data_t code,
-	mach_msg_type_number_t codeCnt
-);
-
-/* Routine exception_raise_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t exception_raise_state
-(
-	mach_port_t exception_port,
-	exception_type_t exception,
-	const exception_data_t code,
-	mach_msg_type_number_t codeCnt,
-	int *flavor,
-	const thread_state_t old_state,
-	mach_msg_type_number_t old_stateCnt,
-	thread_state_t new_state,
-	mach_msg_type_number_t *new_stateCnt
-);
-
-/* Routine exception_raise_state_identity */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t exception_raise_state_identity
-(
-	mach_port_t exception_port,
-	mach_port_t thread,
-	mach_port_t task,
-	exception_type_t exception,
-	exception_data_t code,
-	mach_msg_type_number_t codeCnt,
-	int *flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t old_stateCnt,
-	thread_state_t new_state,
-	mach_msg_type_number_t *new_stateCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__exc_subsystem__defined
-#define __Request__exc_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t thread;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code[2];
-	} __Request__exception_raise_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code[2];
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Request__exception_raise_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t thread;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_type_t exception;
-		mach_msg_type_number_t codeCnt;
-		integer_t code[2];
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Request__exception_raise_state_identity_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__exc_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__exc_subsystem__defined
-#define __RequestUnion__exc_subsystem__defined
-union __RequestUnion__exc_subsystem {
-	__Request__exception_raise_t Request_exception_raise;
-	__Request__exception_raise_state_t Request_exception_raise_state;
-	__Request__exception_raise_state_identity_t Request_exception_raise_state_identity;
-};
-#endif /* !__RequestUnion__exc_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__exc_subsystem__defined
-#define __Reply__exc_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__exception_raise_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		int flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Reply__exception_raise_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		int flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Reply__exception_raise_state_identity_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__exc_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__exc_subsystem__defined
-#define __ReplyUnion__exc_subsystem__defined
-union __ReplyUnion__exc_subsystem {
-	__Reply__exception_raise_t Reply_exception_raise;
-	__Reply__exception_raise_state_t Reply_exception_raise_state;
-	__Reply__exception_raise_state_identity_t Reply_exception_raise_state_identity;
-};
-#endif /* !__RequestUnion__exc_subsystem__defined */
-
-#ifndef subsystem_to_name_map_exc
-#define subsystem_to_name_map_exc \
-    { "exception_raise", 2401 },\
-    { "exception_raise_state", 2402 },\
-    { "exception_raise_state_identity", 2403 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _exc_user_ */
diff --git a/i386/include/mach/exception.h b/i386/include/mach/exception.h
deleted file mode 100644
index e7d5d23..0000000
--- a/i386/include/mach/exception.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-#ifndef	_MACH_EXCEPTION_H_
-#define	_MACH_EXCEPTION_H_
-
-#include <mach/exception_types.h>
-
-#endif	/* _MACH_EXCEPTION_H_ */
diff --git a/i386/include/mach/exception_types.h b/i386/include/mach/exception_types.h
deleted file mode 100644
index 642cbe2..0000000
--- a/i386/include/mach/exception_types.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-#ifndef	_MACH_EXCEPTION_TYPES_H_
-#define	_MACH_EXCEPTION_TYPES_H_
-
-#include <mach/machine/exception.h>
-
-/*
- *	Machine-independent exception definitions.
- */
-
-#define EXC_BAD_ACCESS		1	/* Could not access memory */
-		/* Code contains kern_return_t describing error. */
-		/* Subcode contains bad memory address. */
-
-#define EXC_BAD_INSTRUCTION	2	/* Instruction failed */
-		/* Illegal or undefined instruction or operand */
-
-#define EXC_ARITHMETIC		3	/* Arithmetic exception */
-		/* Exact nature of exception is in code field */
-
-#define EXC_EMULATION		4	/* Emulation instruction */
-		/* Emulation support instruction encountered */
-		/* Details in code and subcode fields	*/
-
-#define EXC_SOFTWARE		5	/* Software generated exception */
-		/* Exact exception is in code field. */
-		/* Codes 0 - 0xFFFF reserved to hardware */
-		/* Codes 0x10000 - 0x1FFFF reserved for OS emulation (Unix) */
-
-#define EXC_BREAKPOINT		6	/* Trace, breakpoint, etc. */
-		/* Details in code field. */
-
-#define EXC_SYSCALL		7	/* System calls. */
-
-#define EXC_MACH_SYSCALL	8	/* Mach system calls. */
-
-#define EXC_RPC_ALERT		9	/* RPC alert */
- 
-#define EXC_CRASH		10	/* Abnormal process exit */
-
-/*
- *	Machine-independent exception behaviors
- */
-
-# define EXCEPTION_DEFAULT		1
-/*	Send a catch_exception_raise message including the identity.
- */
-
-# define EXCEPTION_STATE		2
-/*	Send a catch_exception_raise_state message including the
- *	thread state.
- */
-
-# define EXCEPTION_STATE_IDENTITY	3
-/*	Send a catch_exception_raise_state_identity message including
- *	the thread identity and state.
- */
-
-#define MACH_EXCEPTION_CODES		0x80000000
-/*	Send 64-bit code and subcode in the exception header */
-
-/*
- * Masks for exception definitions, above
- * bit zero is unused, therefore 1 word = 31 exception types
- */
-
-#define EXC_MASK_BAD_ACCESS		(1 << EXC_BAD_ACCESS)
-#define EXC_MASK_BAD_INSTRUCTION	(1 << EXC_BAD_INSTRUCTION)
-#define EXC_MASK_ARITHMETIC		(1 << EXC_ARITHMETIC)
-#define EXC_MASK_EMULATION		(1 << EXC_EMULATION)
-#define EXC_MASK_SOFTWARE		(1 << EXC_SOFTWARE)
-#define EXC_MASK_BREAKPOINT		(1 << EXC_BREAKPOINT)
-#define EXC_MASK_SYSCALL		(1 << EXC_SYSCALL)
-#define EXC_MASK_MACH_SYSCALL		(1 << EXC_MACH_SYSCALL)
-#define EXC_MASK_RPC_ALERT		(1 << EXC_RPC_ALERT)
-#define EXC_MASK_CRASH			(1 << EXC_CRASH)
-
-#define EXC_MASK_ALL	(EXC_MASK_BAD_ACCESS |			\
-			 EXC_MASK_BAD_INSTRUCTION |		\
-			 EXC_MASK_ARITHMETIC |			\
-			 EXC_MASK_EMULATION |			\
-			 EXC_MASK_SOFTWARE |			\
-			 EXC_MASK_BREAKPOINT |			\
-			 EXC_MASK_SYSCALL |			\
-			 EXC_MASK_MACH_SYSCALL |		\
-			 EXC_MASK_RPC_ALERT |			\
-			 EXC_MASK_MACHINE)
-
-
-#define FIRST_EXCEPTION		1	/* ZERO is illegal */
-
-/*
- * Machine independent codes for EXC_SOFTWARE
- * Codes 0x10000 - 0x1FFFF reserved for OS emulation (Unix) 
- * 0x10000 - 0x10002 in use for unix signals
- */
-#define	EXC_SOFT_SIGNAL		0x10003	/* Unix signal exceptions */
-
-#ifndef	ASSEMBLER
-
-#include <mach/port.h>
-#include <mach/thread_status.h>
-#include <mach/machine/vm_types.h>
-/*
- * Exported types
- */
-
-typedef int				exception_type_t;
-typedef	integer_t			exception_data_type_t;
-typedef	int64_t				mach_exception_data_type_t;
-typedef int				exception_behavior_t;
-typedef exception_data_type_t		*exception_data_t;
-typedef mach_exception_data_type_t	*mach_exception_data_t;
-typedef	unsigned int			exception_mask_t;
-typedef	exception_mask_t		*exception_mask_array_t;
-typedef exception_behavior_t		*exception_behavior_array_t;
-typedef thread_state_flavor_t		*exception_flavor_array_t;
-typedef mach_port_t			*exception_port_array_t;
-typedef	mach_exception_data_type_t	mach_exception_code_t;
-typedef	mach_exception_data_type_t	mach_exception_subcode_t;
-
-#endif	/* ASSEMBLER */
-
-#endif	/* _MACH_EXCEPTION_TYPES_H_ */
diff --git a/i386/include/mach/host_info.h b/i386/include/mach/host_info.h
deleted file mode 100644
index bc8f803..0000000
--- a/i386/include/mach/host_info.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-/*
- *	File:	mach/host_info.h
- *
- *	Definitions for host_info call.
- */
-
-#ifndef	_MACH_HOST_INFO_H_
-#define	_MACH_HOST_INFO_H_
-
-#include <mach/message.h>
-#include <mach/vm_statistics.h>
-#include <mach/machine.h>
-#include <mach/machine/vm_types.h>
-#include <mach/time_value.h>
-
-#include <sys/cdefs.h>
-
-/*
- *	Generic information structure to allow for expansion.
- */
-typedef integer_t	*host_info_t;		/* varying array of int. */
-typedef integer_t	*host_info64_t;		/* varying array of int. */
-
-#define	HOST_INFO_MAX	(1024)		/* max array size */
-typedef integer_t	host_info_data_t[HOST_INFO_MAX];
-
-#define KERNEL_VERSION_MAX (512)
-typedef char	kernel_version_t[KERNEL_VERSION_MAX];
-
-#define KERNEL_BOOT_INFO_MAX (4096)
-typedef char	kernel_boot_info_t[KERNEL_BOOT_INFO_MAX];
-
-/*
- *	Currently defined information.
- */
-/* host_info() */
-typedef	integer_t	host_flavor_t;
-#define HOST_BASIC_INFO		1	/* basic info */
-#define HOST_SCHED_INFO		3	/* scheduling info */
-#define HOST_RESOURCE_SIZES	4	/* kernel struct sizes */
-#define HOST_PRIORITY_INFO	5	/* priority information */
-#define HOST_SEMAPHORE_TRAPS	7	/* Has semaphore traps */
-#define HOST_MACH_MSG_TRAP	8	/* Has mach_msg_trap */
-
-
-#pragma pack(4)
-
-struct host_basic_info {
-	integer_t		max_cpus;		/* max number of CPUs possible */
-	integer_t		avail_cpus;		/* number of CPUs now available */
-	natural_t		memory_size;		/* size of memory in bytes, capped at 2 GB */
-	cpu_type_t		cpu_type;		/* cpu type */
-	cpu_subtype_t		cpu_subtype;		/* cpu subtype */
-	cpu_threadtype_t	cpu_threadtype;		/* cpu threadtype */
-	integer_t		physical_cpu;		/* number of physical CPUs now available */
-	integer_t		physical_cpu_max;	/* max number of physical CPUs possible */
-	integer_t		logical_cpu;		/* number of logical cpu now available */
-	integer_t		logical_cpu_max;	/* max number of physical CPUs possible */
-	uint64_t		max_mem;		/* actual size of physical memory */
-};
-
-#pragma pack()
-
-typedef	struct host_basic_info	host_basic_info_data_t;
-typedef struct host_basic_info	*host_basic_info_t;
-#define HOST_BASIC_INFO_COUNT ((mach_msg_type_number_t) \
-		(sizeof(host_basic_info_data_t)/sizeof(integer_t)))
-
-struct host_sched_info {
-	integer_t	min_timeout;	/* minimum timeout in milliseconds */
-	integer_t	min_quantum;	/* minimum quantum in milliseconds */
-};
-
-typedef	struct host_sched_info	host_sched_info_data_t;
-typedef struct host_sched_info	*host_sched_info_t;
-#define HOST_SCHED_INFO_COUNT ((mach_msg_type_number_t) \
-		(sizeof(host_sched_info_data_t)/sizeof(integer_t)))
-
-struct kernel_resource_sizes {
-	natural_t	task;
-        natural_t	thread;
-        natural_t	port;
-        natural_t	memory_region;
-        natural_t	memory_object;
-};
-
-typedef struct kernel_resource_sizes	kernel_resource_sizes_data_t;
-typedef struct kernel_resource_sizes	*kernel_resource_sizes_t;
-#define HOST_RESOURCE_SIZES_COUNT ((mach_msg_type_number_t) \
-		(sizeof(kernel_resource_sizes_data_t)/sizeof(integer_t)))
-
-struct host_priority_info {
-    	integer_t	kernel_priority;
-    	integer_t	system_priority;
-    	integer_t	server_priority;
-    	integer_t	user_priority;
-    	integer_t	depress_priority;
-    	integer_t	idle_priority;
-    	integer_t	minimum_priority;
-	integer_t	maximum_priority;
-};
-
-typedef struct host_priority_info	host_priority_info_data_t;
-typedef struct host_priority_info	*host_priority_info_t;
-#define HOST_PRIORITY_INFO_COUNT ((mach_msg_type_number_t) \
-		(sizeof(host_priority_info_data_t)/sizeof(integer_t)))
-
-/* host_statistics() */
-#define	HOST_LOAD_INFO		1	/* System loading stats */
-#define HOST_VM_INFO		2	/* Virtual memory stats */
-#define HOST_CPU_LOAD_INFO	3	/* CPU load stats */
-
-/* host_statistics64() */
-#define HOST_VM_INFO64		4	/* 64-bit virtual memory stats */
-
-
-struct host_load_info {
-	integer_t	avenrun[3];	/* scaled by LOAD_SCALE */
-	integer_t	mach_factor[3];	/* scaled by LOAD_SCALE */
-};
-
-typedef struct host_load_info	host_load_info_data_t;
-typedef struct host_load_info	*host_load_info_t;
-#define	HOST_LOAD_INFO_COUNT ((mach_msg_type_number_t) \
-		(sizeof(host_load_info_data_t)/sizeof(integer_t)))
-
-/* in <mach/vm_statistics.h> */
-/* vm_statistics64 */
-#define	HOST_VM_INFO64_COUNT ((mach_msg_type_number_t) \
-		(sizeof(vm_statistics64_data_t)/sizeof(integer_t)))
-
-/* size of the latest version of the structure */
-#define HOST_VM_INFO64_LATEST_COUNT HOST_VM_INFO64_COUNT
-
-
-/* vm_statistics */
-#define	HOST_VM_INFO_COUNT ((mach_msg_type_number_t) \
-		(sizeof(vm_statistics_data_t)/sizeof(integer_t)))
-
-/* size of the latest version of the structure */
-#define HOST_VM_INFO_LATEST_COUNT HOST_VM_INFO_COUNT
-#define	HOST_VM_INFO_REV2_COUNT HOST_VM_INFO_LATEST_COUNT
-/* previous versions: adjust the size according to what was added each time */
-#define	HOST_VM_INFO_REV1_COUNT /* added "speculative_count" (1 int) */	\
-	((mach_msg_type_number_t) \
-	 (HOST_VM_INFO_REV2_COUNT - 1))
-#define	HOST_VM_INFO_REV0_COUNT /* added "purgable" info (2 ints) */ 	\
-	((mach_msg_type_number_t) \
-	 (HOST_VM_INFO_REV1_COUNT - 2))
-
-struct host_cpu_load_info {		/* number of ticks while running... */
-	natural_t	cpu_ticks[CPU_STATE_MAX]; /* ... in the given mode */
-};
-
-typedef struct host_cpu_load_info	host_cpu_load_info_data_t;
-typedef struct host_cpu_load_info	*host_cpu_load_info_t;
-#define HOST_CPU_LOAD_INFO_COUNT ((mach_msg_type_number_t) \
-		(sizeof (host_cpu_load_info_data_t) / sizeof (integer_t)))
-
-#endif	/* _MACH_HOST_INFO_H_ */
diff --git a/i386/include/mach/host_notify.h b/i386/include/mach/host_notify.h
deleted file mode 100644
index 6c0ca74..0000000
--- a/i386/include/mach/host_notify.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef	_MACH_HOST_NOTIFY_H_
-#define	_MACH_HOST_NOTIFY_H_
-
-#define HOST_NOTIFY_CALENDAR_CHANGE		0
-#define HOST_NOTIFY_TYPE_MAX			0
-
-#define HOST_CALENDAR_CHANGED_REPLYID	950
-
-#endif /* _MACH_HOST_NOTIFY_H_ */
diff --git a/i386/include/mach/host_notify_reply.defs b/i386/include/mach/host_notify_reply.defs
deleted file mode 100644
index 85437f8..0000000
--- a/i386/include/mach/host_notify_reply.defs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-subsystem
-#if	KERNEL_USER
-		KernelUser
-#endif	/* KERN_USER */
-			host_notify_reply 950;
-
-#include <mach/std_types.defs>
-
-simpleroutine host_calendar_changed(
-		notify_port	: mach_port_move_send_once_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/host_priv.defs b/i386/include/mach/host_priv.defs
deleted file mode 100644
index 3be3986..0000000
--- a/i386/include/mach/host_priv.defs
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-/*
- *	Matchmaker definitions file for Mach kernel interface.
- */
-subsystem
-#if	KERNEL_USER
-	  KernelUser
-#endif	/* KERNEL_USER */
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-		       host_priv 400;
-
-#ifdef	KERNEL_USER
-userprefix r_;
-#endif	/* KERNEL_USER */
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-#include <mach/clock_types.defs>
-#include <mach_debug/mach_debug_types.defs>
-
-/*
- *      Get boot configuration information from kernel.
- */
-routine host_get_boot_info(
-		host_priv	: host_priv_t;
-	out	boot_info	: kernel_boot_info_t);
-
-/*
- *	Reboot this host.
- *	Only available to privileged users.
- */
-routine host_reboot(
-		host_priv	: host_priv_t;
-		options		: int);
-
-
-/*
- *	Return privileged statistics from this host.
- */
-routine host_priv_statistics(
-		host_priv	: host_priv_t;
-		flavor		: host_flavor_t;
-	out	host_info_out	: host_info_t, CountInOut);
-
-/*
- *	Sets the default memory manager, the port to which
- *	newly-created temporary memory objects are delivered.
- *	[See (memory_object_default)memory_object_create.]
- *	Also sets the default cluster size used for pagein/pageout
- *	to this port.
- *	The old memory manager port is returned.
- */
-routine host_default_memory_manager(
-		host_priv	: host_priv_t;
-	inout	default_manager	: memory_object_default_t = 
-					MACH_MSG_TYPE_MAKE_SEND;
-		cluster_size	: memory_object_cluster_size_t);
-
-
-/*
- *	Specify that the range of the virtual address space
- *	of the target task must not cause page faults for
- *	the indicated accesses.
- *
- *	[ To unwire the pages, specify VM_PROT_NONE. ]
- */
-routine	vm_wire(
-		host_priv	: host_priv_t;
-		task		: vm_map_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		desired_access	: vm_prot_t);
-
-/*
- *	Specify that the target thread must always be able
- *	to run and to allocate memory.
- */
-routine	thread_wire(
-		host_priv	: host_priv_t;
-		thread		: thread_act_t;
-		wired		: boolean_t);
-
-/*
- *	Allocate zero-filled, wired, contiguous physical memory
- *	in the address space of the target task, either at the
- *	specified address, or wherever space can be found (if
- *	anywhere is TRUE), of the specified size.  The address
- *	at which the allocation actually took place is returned.
- *	All pages will be entered into the task's pmap immediately,
- *	with VM_PROT_ALL.
- *
- *	In addition to all the failure modes of its cousin,
- *	vm_allocate, this call may also fail if insufficient
- *	contiguous memory exists to satisfy the request.
- *
- *	Memory obtained from this call should be freed the
- *	normal way, via vm_deallocate.
- *
- *	N.B.  This is an EXPERIMENTAL interface!
- */
-routine	vm_allocate_cpm(
-		host_priv	: host_priv_t;
-		task		: vm_map_t;
-	inout	address		: vm_address_t;
-		size		: vm_size_t;
-		flags		: int);
-
-/*
- *	Get list of processors on this host.
- */
-routine host_processors(
-		host_priv		: host_priv_t;
-	out	out_processor_list	: processor_array_t);
-
-
-/*
- *	Get control port for a system-wide clock.
- *	Privileged.
- */
-routine host_get_clock_control(
-		host_priv	: host_priv_t;
-		clock_id	: clock_id_t;
-	out	clock_ctrl	: clock_ctrl_t);
-
-
-/*
- * kernel module interface (obsolete as of SnowLeopard)
- * see mach/kmod.h
- */
-/* kmod_ MIG calls now return KERN_NOT_SUPPORTED on PPC/i386/x86_64. */
-routine kmod_create(
-		host_priv	: host_priv_t;
-		info		: vm_address_t;
-	out	module		: kmod_t);
-
-routine kmod_destroy(
-		host_priv	: host_priv_t;
-		module		: kmod_t);
-
-routine	kmod_control(
-		host_priv	: host_priv_t;
-		module		: kmod_t;
-		flavor		: kmod_control_flavor_t;
-	inout	data		: kmod_args_t);
-
-/*
- * 	Get a given special port for a given node.
- * 	Special ports are defined in host_special_ports.h;
- * 	examples include the master device port.
- * 	There are a limited number of slots available for system servers.
- */
-routine host_get_special_port(
-                host_priv       : host_priv_t;
-                node            : int;
-                which           : int;
-        out     port            : mach_port_t);
-
-/*
- * 	Set a given special port for the local node.
- * 	See host_get_special_port.
- */
-routine host_set_special_port(
-                host_priv       : host_priv_t;
-                which           : int;
-                port            : mach_port_t);
-
-/*
- * Set an exception handler for a host on one or more exception types.
- * These handlers are invoked for all threads on the host if there are
- * no task or thread-specific exception handlers or those handlers returned
- * an error.
- */
-routine	host_set_exception_ports(
-		host_priv	: host_priv_t;
-		exception_mask	: exception_mask_t;
-		new_port	: mach_port_t;
-		behavior	: exception_behavior_t;
-		new_flavor	: thread_state_flavor_t);
-
-
-/*
- * Lookup some of the old exception handlers for a host
- */
-routine	host_get_exception_ports(
-		host_priv	: host_priv_t;
-		exception_mask	: exception_mask_t;
-	  out	masks		: exception_mask_array_t;
-	  out	old_handlers	: exception_handler_array_t, SameCount;
-	  out	old_behaviors	: exception_behavior_array_t, SameCount;
-	  out	old_flavors	: exception_flavor_array_t, SameCount);
-
-
-/*
- * Set an exception handler for a host on one or more exception types.
- * At the same time, return the previously defined exception handlers for
- * those types.
- */
-routine	host_swap_exception_ports(
-		host_priv	: host_priv_t;
-		exception_mask	: exception_mask_t;
-		new_port	: mach_port_t;
-		behavior	: exception_behavior_t;
-		new_flavor	: thread_state_flavor_t;
-	  out	masks		: exception_mask_array_t;
-	  out	old_handlerss	: exception_handler_array_t, SameCount;
-	  out	old_behaviors	: exception_behavior_array_t, SameCount;
-	  out	old_flavors	: exception_flavor_array_t, SameCount);
-
-/*
- *	Loads a symbol table for an external file into the kernel debugger.
- *	The symbol table data is an array of characters.  It is assumed that
- *	the caller and the kernel debugger agree on its format.
- *      This call is only supported in MACH_DEBUG and MACH_KDB kernels,
- *      otherwise KERN_FAILURE is returned.
- */
-routine host_load_symbol_table(
-		host		: host_priv_t;
-		task		: task_t;
-		name		: symtab_name_t;
-		symtab		: pointer_t);
-
-/*
- *	Specify that the range of the virtual address space
- *	of the target task must not cause page faults for
- *	the indicated accesses.
- *
- *	[ To unwire the pages, specify VM_PROT_NONE. ]
- */
-routine	mach_vm_wire(
-		host_priv	: host_priv_t;
-		task		: vm_map_t;
-		address		: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		desired_access	: vm_prot_t);
-
-/*
- * JMM - Keep all processor_set related items at the end for easy
- * removal.
- */
-/*
- *	List all processor sets on host.
- */
-routine host_processor_sets(
-		host_priv	: host_priv_t;
-	out	processor_sets	: processor_set_name_array_t);
-
-/*
- *	Get control port for a processor set.
- */
-routine host_processor_set_priv(
-		host_priv	: host_priv_t;
-		set_name	: processor_set_name_t;
-	out	set		: processor_set_t);
-
-/************************** Warning *************************************/
-/*       The following routines are going away in a future release	*/
-/*	use the appropriate variant of host_set_special_port instead	*/
-/************************************************************************/
- 
-/*
- *	Set the dynamic_pager control port. Other entities
- *	can request a send right to this port to talk with
- *	the dynamic_pager utility, setting behavioral parameters
- *	within the dynamic pager and getting low/high backing store
- *	resource notifications.
- */
-routine set_dp_control_port(    
-		host		: host_priv_t;
-	in	control_port	: mach_port_t);
-
-/*
- *	Get the dynamic_pager control port.  This port
- *	allows the holder to talk directly with the dynamic
- *	pager utility.
- */
-routine get_dp_control_port(    
-		host		: host_priv_t;
-	out	contorl_port    :mach_port_t);
-
-/*
- *	Set the UserNotification daemon access port for this host. 
- *	If this value is already set, the kernel will discard its
- *	reference to the previously registered port.
- */
-routine host_set_UNDServer(    
-		host		: host_priv_t;
-	in	server		: UNDServerRef);
-
-/*
- *	Get the UserNotification daemon access port for this host.
- *	This can then be used to communicate with that daemon, which
- *	in turn communicates with the User through whatever means
- *	available (pop-up-menus for GUI systems, text for non-GUI, etc..).
- *
- *	Access to this port is restricted to privileged clients because
- *	it is a special purpose port intended for kernel clients.  User
- *	level clients should go directly to the CFUserNotifcation services.
- */
-routine host_get_UNDServer(    
-		host		: host_priv_t;
-	out	server		: UNDServerRef);
-
-/*
- * Perform an operation with a kernel extension, on the kext loading system,
- * or request information about loaded kexts or the state of the kext loading
- * system.
- * Active operations (load, unload, disable/enable) require host_priv/root access.
- * Info retrieval does not.
- *
- * WARNING: THIS ROUTINE IS PRIVATE TO THE KEXT-MANAGEMENT STACK AND IS
- * SUBJECT TO CHANGE AT ANY TIME.
- */
-routine kext_request(
-        host_priv      : host_priv_t;
-    in  user_log_flags : uint32_t;
-    in  request_data   : pointer_t;
-    out response_data  : pointer_t;
-    out log_data       : pointer_t;
-    out op_result      : kern_return_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/host_priv.h b/i386/include/mach/host_priv.h
deleted file mode 100644
index 7a9df1f..0000000
--- a/i386/include/mach/host_priv.h
+++ /dev/null
@@ -1,1269 +0,0 @@
-#ifndef	_host_priv_user_
-#define	_host_priv_user_
-
-/* Module host_priv */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	host_priv_MSG_COUNT
-#define	host_priv_MSG_COUNT	26
-#endif	/* host_priv_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-#include <mach/mach_types.h>
-#include <mach_debug/mach_debug_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine host_get_boot_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_get_boot_info
-(
-	host_priv_t host_priv,
-	kernel_boot_info_t boot_info
-);
-
-/* Routine host_reboot */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_reboot
-(
-	host_priv_t host_priv,
-	int options
-);
-
-/* Routine host_priv_statistics */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_priv_statistics
-(
-	host_priv_t host_priv,
-	host_flavor_t flavor,
-	host_info_t host_info_out,
-	mach_msg_type_number_t *host_info_outCnt
-);
-
-/* Routine host_default_memory_manager */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_default_memory_manager
-(
-	host_priv_t host_priv,
-	memory_object_default_t *default_manager,
-	memory_object_cluster_size_t cluster_size
-);
-
-/* Routine vm_wire */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_wire
-(
-	host_priv_t host_priv,
-	vm_map_t task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_prot_t desired_access
-);
-
-/* Routine thread_wire */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_wire
-(
-	host_priv_t host_priv,
-	thread_act_t thread,
-	boolean_t wired
-);
-
-/* Routine vm_allocate_cpm */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_allocate_cpm
-(
-	host_priv_t host_priv,
-	vm_map_t task,
-	vm_address_t *address,
-	vm_size_t size,
-	int flags
-);
-
-/* Routine host_processors */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_processors
-(
-	host_priv_t host_priv,
-	processor_array_t *out_processor_list,
-	mach_msg_type_number_t *out_processor_listCnt
-);
-
-/* Routine host_get_clock_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_get_clock_control
-(
-	host_priv_t host_priv,
-	clock_id_t clock_id,
-	clock_ctrl_t *clock_ctrl
-);
-
-/* Routine kmod_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t kmod_create
-(
-	host_priv_t host_priv,
-	vm_address_t info,
-	kmod_t *module
-);
-
-/* Routine kmod_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t kmod_destroy
-(
-	host_priv_t host_priv,
-	kmod_t module
-);
-
-/* Routine kmod_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t kmod_control
-(
-	host_priv_t host_priv,
-	kmod_t module,
-	kmod_control_flavor_t flavor,
-	kmod_args_t *data,
-	mach_msg_type_number_t *dataCnt
-);
-
-/* Routine host_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_get_special_port
-(
-	host_priv_t host_priv,
-	int node,
-	int which,
-	mach_port_t *port
-);
-
-/* Routine host_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_set_special_port
-(
-	host_priv_t host_priv,
-	int which,
-	mach_port_t port
-);
-
-/* Routine host_set_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_set_exception_ports
-(
-	host_priv_t host_priv,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor
-);
-
-/* Routine host_get_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_get_exception_ports
-(
-	host_priv_t host_priv,
-	exception_mask_t exception_mask,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlers,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine host_swap_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_swap_exception_ports
-(
-	host_priv_t host_priv,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlerss,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine host_load_symbol_table */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_load_symbol_table
-(
-	host_priv_t host,
-	task_t task,
-	symtab_name_t name,
-	vm_offset_t symtab,
-	mach_msg_type_number_t symtabCnt
-);
-
-/* Routine mach_vm_wire */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_wire
-(
-	host_priv_t host_priv,
-	vm_map_t task,
-	mach_vm_address_t address,
-	mach_vm_size_t size,
-	vm_prot_t desired_access
-);
-
-/* Routine host_processor_sets */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_processor_sets
-(
-	host_priv_t host_priv,
-	processor_set_name_array_t *processor_sets,
-	mach_msg_type_number_t *processor_setsCnt
-);
-
-/* Routine host_processor_set_priv */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_processor_set_priv
-(
-	host_priv_t host_priv,
-	processor_set_name_t set_name,
-	processor_set_t *set
-);
-
-/* Routine set_dp_control_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t set_dp_control_port
-(
-	host_priv_t host,
-	mach_port_t control_port
-);
-
-/* Routine get_dp_control_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t get_dp_control_port
-(
-	host_priv_t host,
-	mach_port_t *contorl_port
-);
-
-/* Routine host_set_UNDServer */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_set_UNDServer
-(
-	host_priv_t host,
-	UNDServerRef server
-);
-
-/* Routine host_get_UNDServer */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_get_UNDServer
-(
-	host_priv_t host,
-	UNDServerRef *server
-);
-
-/* Routine kext_request */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t kext_request
-(
-	host_priv_t host_priv,
-	uint32_t user_log_flags,
-	vm_offset_t request_data,
-	mach_msg_type_number_t request_dataCnt,
-	vm_offset_t *response_data,
-	mach_msg_type_number_t *response_dataCnt,
-	vm_offset_t *log_data,
-	mach_msg_type_number_t *log_dataCnt,
-	kern_return_t *op_result
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__host_priv_subsystem__defined
-#define __Request__host_priv_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__host_get_boot_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int options;
-	} __Request__host_reboot_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		host_flavor_t flavor;
-		mach_msg_type_number_t host_info_outCnt;
-	} __Request__host_priv_statistics_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t default_manager;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		memory_object_cluster_size_t cluster_size;
-	} __Request__host_default_memory_manager_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		vm_prot_t desired_access;
-	} __Request__vm_wire_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t thread;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		boolean_t wired;
-	} __Request__thread_wire_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		int flags;
-	} __Request__vm_allocate_cpm_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__host_processors_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		clock_id_t clock_id;
-	} __Request__host_get_clock_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t info;
-	} __Request__kmod_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kmod_t module;
-	} __Request__kmod_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t data;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		kmod_t module;
-		kmod_control_flavor_t flavor;
-		mach_msg_type_number_t dataCnt;
-	} __Request__kmod_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int node;
-		int which;
-	} __Request__host_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int which;
-	} __Request__host_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__host_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-	} __Request__host_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__host_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t task;
-		mach_msg_ool_descriptor_t symtab;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t nameOffset; /* MiG doesn't use it */
-		mach_msg_type_number_t nameCnt;
-		char name[32];
-		mach_msg_type_number_t symtabCnt;
-	} __Request__host_load_symbol_table_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		vm_prot_t desired_access;
-	} __Request__mach_vm_wire_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__host_processor_sets_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t set_name;
-		/* end of the kernel processed data */
-	} __Request__host_processor_set_priv_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t control_port;
-		/* end of the kernel processed data */
-	} __Request__set_dp_control_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__get_dp_control_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t server;
-		/* end of the kernel processed data */
-	} __Request__host_set_UNDServer_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__host_get_UNDServer_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t request_data;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		uint32_t user_log_flags;
-		mach_msg_type_number_t request_dataCnt;
-	} __Request__kext_request_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__host_priv_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__host_priv_subsystem__defined
-#define __RequestUnion__host_priv_subsystem__defined
-union __RequestUnion__host_priv_subsystem {
-	__Request__host_get_boot_info_t Request_host_get_boot_info;
-	__Request__host_reboot_t Request_host_reboot;
-	__Request__host_priv_statistics_t Request_host_priv_statistics;
-	__Request__host_default_memory_manager_t Request_host_default_memory_manager;
-	__Request__vm_wire_t Request_vm_wire;
-	__Request__thread_wire_t Request_thread_wire;
-	__Request__vm_allocate_cpm_t Request_vm_allocate_cpm;
-	__Request__host_processors_t Request_host_processors;
-	__Request__host_get_clock_control_t Request_host_get_clock_control;
-	__Request__kmod_create_t Request_kmod_create;
-	__Request__kmod_destroy_t Request_kmod_destroy;
-	__Request__kmod_control_t Request_kmod_control;
-	__Request__host_get_special_port_t Request_host_get_special_port;
-	__Request__host_set_special_port_t Request_host_set_special_port;
-	__Request__host_set_exception_ports_t Request_host_set_exception_ports;
-	__Request__host_get_exception_ports_t Request_host_get_exception_ports;
-	__Request__host_swap_exception_ports_t Request_host_swap_exception_ports;
-	__Request__host_load_symbol_table_t Request_host_load_symbol_table;
-	__Request__mach_vm_wire_t Request_mach_vm_wire;
-	__Request__host_processor_sets_t Request_host_processor_sets;
-	__Request__host_processor_set_priv_t Request_host_processor_set_priv;
-	__Request__set_dp_control_port_t Request_set_dp_control_port;
-	__Request__get_dp_control_port_t Request_get_dp_control_port;
-	__Request__host_set_UNDServer_t Request_host_set_UNDServer;
-	__Request__host_get_UNDServer_t Request_host_get_UNDServer;
-	__Request__kext_request_t Request_kext_request;
-};
-#endif /* !__RequestUnion__host_priv_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__host_priv_subsystem__defined
-#define __Reply__host_priv_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t boot_infoOffset; /* MiG doesn't use it */
-		mach_msg_type_number_t boot_infoCnt;
-		char boot_info[4096];
-	} __Reply__host_get_boot_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__host_reboot_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t host_info_outCnt;
-		integer_t host_info_out[15];
-	} __Reply__host_priv_statistics_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t default_manager;
-		/* end of the kernel processed data */
-	} __Reply__host_default_memory_manager_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__vm_wire_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_wire_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_address_t address;
-	} __Reply__vm_allocate_cpm_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t out_processor_list;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t out_processor_listCnt;
-	} __Reply__host_processors_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t clock_ctrl;
-		/* end of the kernel processed data */
-	} __Reply__host_get_clock_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		kmod_t module;
-	} __Reply__kmod_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__kmod_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t data;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t dataCnt;
-	} __Reply__kmod_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t port;
-		/* end of the kernel processed data */
-	} __Reply__host_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__host_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__host_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlers[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__host_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlerss[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__host_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__host_load_symbol_table_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_vm_wire_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t processor_sets;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t processor_setsCnt;
-	} __Reply__host_processor_sets_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t set;
-		/* end of the kernel processed data */
-	} __Reply__host_processor_set_priv_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__set_dp_control_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t contorl_port;
-		/* end of the kernel processed data */
-	} __Reply__get_dp_control_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__host_set_UNDServer_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t server;
-		/* end of the kernel processed data */
-	} __Reply__host_get_UNDServer_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t response_data;
-		mach_msg_ool_descriptor_t log_data;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t response_dataCnt;
-		mach_msg_type_number_t log_dataCnt;
-		kern_return_t op_result;
-	} __Reply__kext_request_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__host_priv_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__host_priv_subsystem__defined
-#define __ReplyUnion__host_priv_subsystem__defined
-union __ReplyUnion__host_priv_subsystem {
-	__Reply__host_get_boot_info_t Reply_host_get_boot_info;
-	__Reply__host_reboot_t Reply_host_reboot;
-	__Reply__host_priv_statistics_t Reply_host_priv_statistics;
-	__Reply__host_default_memory_manager_t Reply_host_default_memory_manager;
-	__Reply__vm_wire_t Reply_vm_wire;
-	__Reply__thread_wire_t Reply_thread_wire;
-	__Reply__vm_allocate_cpm_t Reply_vm_allocate_cpm;
-	__Reply__host_processors_t Reply_host_processors;
-	__Reply__host_get_clock_control_t Reply_host_get_clock_control;
-	__Reply__kmod_create_t Reply_kmod_create;
-	__Reply__kmod_destroy_t Reply_kmod_destroy;
-	__Reply__kmod_control_t Reply_kmod_control;
-	__Reply__host_get_special_port_t Reply_host_get_special_port;
-	__Reply__host_set_special_port_t Reply_host_set_special_port;
-	__Reply__host_set_exception_ports_t Reply_host_set_exception_ports;
-	__Reply__host_get_exception_ports_t Reply_host_get_exception_ports;
-	__Reply__host_swap_exception_ports_t Reply_host_swap_exception_ports;
-	__Reply__host_load_symbol_table_t Reply_host_load_symbol_table;
-	__Reply__mach_vm_wire_t Reply_mach_vm_wire;
-	__Reply__host_processor_sets_t Reply_host_processor_sets;
-	__Reply__host_processor_set_priv_t Reply_host_processor_set_priv;
-	__Reply__set_dp_control_port_t Reply_set_dp_control_port;
-	__Reply__get_dp_control_port_t Reply_get_dp_control_port;
-	__Reply__host_set_UNDServer_t Reply_host_set_UNDServer;
-	__Reply__host_get_UNDServer_t Reply_host_get_UNDServer;
-	__Reply__kext_request_t Reply_kext_request;
-};
-#endif /* !__RequestUnion__host_priv_subsystem__defined */
-
-#ifndef subsystem_to_name_map_host_priv
-#define subsystem_to_name_map_host_priv \
-    { "host_get_boot_info", 400 },\
-    { "host_reboot", 401 },\
-    { "host_priv_statistics", 402 },\
-    { "host_default_memory_manager", 403 },\
-    { "vm_wire", 404 },\
-    { "thread_wire", 405 },\
-    { "vm_allocate_cpm", 406 },\
-    { "host_processors", 407 },\
-    { "host_get_clock_control", 408 },\
-    { "kmod_create", 409 },\
-    { "kmod_destroy", 410 },\
-    { "kmod_control", 411 },\
-    { "host_get_special_port", 412 },\
-    { "host_set_special_port", 413 },\
-    { "host_set_exception_ports", 414 },\
-    { "host_get_exception_ports", 415 },\
-    { "host_swap_exception_ports", 416 },\
-    { "host_load_symbol_table", 417 },\
-    { "mach_vm_wire", 418 },\
-    { "host_processor_sets", 419 },\
-    { "host_processor_set_priv", 420 },\
-    { "set_dp_control_port", 421 },\
-    { "get_dp_control_port", 422 },\
-    { "host_set_UNDServer", 423 },\
-    { "host_get_UNDServer", 424 },\
-    { "kext_request", 425 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _host_priv_user_ */
diff --git a/i386/include/mach/host_reboot.h b/i386/include/mach/host_reboot.h
deleted file mode 100644
index 65609dd..0000000
--- a/i386/include/mach/host_reboot.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-#ifndef _MACH_HOST_REBOOT_
-#define _MACH_HOST_REBOOT_
-
-#define HOST_REBOOT_HALT        0x0008
-#define HOST_REBOOT_UPSDELAY    0x0100
-#define	HOST_REBOOT_DEBUGGER	0x1000
-
-#endif	/* _MACH_HOST_REBOOT_ */
diff --git a/i386/include/mach/host_security.defs b/i386/include/mach/host_security.defs
deleted file mode 100644
index 4098df4..0000000
--- a/i386/include/mach/host_security.defs
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-/*
- * File:	mach/host_security.defs
- *
- * Abstract:
- *	Mach host security operations support.
- */
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-		      host_security 600;
-
-/*
- *	Basic types
- */
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-
-/*
- *	Create a new task with an explicit security token
- */
-routine host_security_create_task_token(
-		host_security	: host_security_t;
-		parent_task	: task_t;
-		sec_token	: security_token_t;
-		audit_token	: audit_token_t;
-		host		: host_t;
-		ledgers		: ledger_array_t;
-		inherit_memory	: boolean_t;
-	out	child_task	: task_t);
-
-/*
- *	Change a task's security token
- */
-routine host_security_set_task_token(
-		host_security	: host_security_t;
-		target_task	: task_t;
-		sec_token	: security_token_t;
-		audit_token	: audit_token_t;
-		host		: host_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/host_security.h b/i386/include/mach/host_security.h
deleted file mode 100644
index ee4ed9e..0000000
--- a/i386/include/mach/host_security.h
+++ /dev/null
@@ -1,197 +0,0 @@
-#ifndef	_host_security_user_
-#define	_host_security_user_
-
-/* Module host_security */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	host_security_MSG_COUNT
-#define	host_security_MSG_COUNT	2
-#endif	/* host_security_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine host_security_create_task_token */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_security_create_task_token
-(
-	host_security_t host_security,
-	task_t parent_task,
-	security_token_t sec_token,
-	audit_token_t audit_token,
-	host_t host,
-	ledger_array_t ledgers,
-	mach_msg_type_number_t ledgersCnt,
-	boolean_t inherit_memory,
-	task_t *child_task
-);
-
-/* Routine host_security_set_task_token */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_security_set_task_token
-(
-	host_security_t host_security,
-	task_t target_task,
-	security_token_t sec_token,
-	audit_token_t audit_token,
-	host_t host
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__host_security_subsystem__defined
-#define __Request__host_security_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t parent_task;
-		mach_msg_port_descriptor_t host;
-		mach_msg_ool_ports_descriptor_t ledgers;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		security_token_t sec_token;
-		audit_token_t audit_token;
-		mach_msg_type_number_t ledgersCnt;
-		boolean_t inherit_memory;
-	} __Request__host_security_create_task_token_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t target_task;
-		mach_msg_port_descriptor_t host;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		security_token_t sec_token;
-		audit_token_t audit_token;
-	} __Request__host_security_set_task_token_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__host_security_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__host_security_subsystem__defined
-#define __RequestUnion__host_security_subsystem__defined
-union __RequestUnion__host_security_subsystem {
-	__Request__host_security_create_task_token_t Request_host_security_create_task_token;
-	__Request__host_security_set_task_token_t Request_host_security_set_task_token;
-};
-#endif /* !__RequestUnion__host_security_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__host_security_subsystem__defined
-#define __Reply__host_security_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_task;
-		/* end of the kernel processed data */
-	} __Reply__host_security_create_task_token_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__host_security_set_task_token_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__host_security_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__host_security_subsystem__defined
-#define __ReplyUnion__host_security_subsystem__defined
-union __ReplyUnion__host_security_subsystem {
-	__Reply__host_security_create_task_token_t Reply_host_security_create_task_token;
-	__Reply__host_security_set_task_token_t Reply_host_security_set_task_token;
-};
-#endif /* !__RequestUnion__host_security_subsystem__defined */
-
-#ifndef subsystem_to_name_map_host_security
-#define subsystem_to_name_map_host_security \
-    { "host_security_create_task_token", 600 },\
-    { "host_security_set_task_token", 601 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _host_security_user_ */
diff --git a/i386/include/mach/host_special_ports.h b/i386/include/mach/host_special_ports.h
deleted file mode 100644
index 755327c..0000000
--- a/i386/include/mach/host_special_ports.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/host_special_ports.h
- *
- *	Defines codes for access to host-wide special ports.
- */
-
-#ifndef _MACH_HOST_SPECIAL_PORTS_H_
-#define _MACH_HOST_SPECIAL_PORTS_H_
-
-/*
- * Cannot be set or gotten from user space
- */
-#define HOST_SECURITY_PORT               0
-
-/*
- * Always provided by kernel (cannot be set from user-space).
- */
-#define HOST_PORT                        1
-#define HOST_PRIV_PORT                   2
-#define HOST_IO_MASTER_PORT              3
-#define HOST_MAX_SPECIAL_KERNEL_PORT     7 /* room to grow */
-
-/*
- * Not provided by kernel
- */
-#define HOST_DYNAMIC_PAGER_PORT         (1 + HOST_MAX_SPECIAL_KERNEL_PORT)
-#define HOST_AUDIT_CONTROL_PORT         (2 + HOST_MAX_SPECIAL_KERNEL_PORT)
-#define HOST_USER_NOTIFICATION_PORT     (3 + HOST_MAX_SPECIAL_KERNEL_PORT)
-#define HOST_AUTOMOUNTD_PORT            (4 + HOST_MAX_SPECIAL_KERNEL_PORT)
-#define HOST_LOCKD_PORT                 (5 + HOST_MAX_SPECIAL_KERNEL_PORT)
-#define HOST_SEATBELT_PORT              (7 + HOST_MAX_SPECIAL_KERNEL_PORT)
-#define HOST_KEXTD_PORT                 (8 + HOST_MAX_SPECIAL_KERNEL_PORT)
-#define HOST_CHUD_PORT                  (9 + HOST_MAX_SPECIAL_KERNEL_PORT)
-#define HOST_UNFREED_PORT		(10 + HOST_MAX_SPECIAL_KERNEL_PORT)
-#define HOST_AMFID_PORT			(11 + HOST_MAX_SPECIAL_KERNEL_PORT)
-#define HOST_MAX_SPECIAL_PORT           (12 + HOST_MAX_SPECIAL_KERNEL_PORT)
-                                        /* room to grow here as well */
-
-/*
- * Special node identifier to always represent the local node.
- */
-#define HOST_LOCAL_NODE	                 -1
-			
-/*
- * Definitions for ease of use.
- *
- * In the get call, the host parameter can be any host, but will generally
- * be the local node host port. In the set call, the host must the per-node
- * host port for the node being affected.
- */
-#define host_get_host_port(host, port)	\
-	(host_get_special_port((host), 	\
-	HOST_LOCAL_NODE, HOST_PORT, (port)))
-#define host_set_host_port(host, port) (KERN_INVALID_ARGUMENT)
-
-#define host_get_host_priv_port(host, port)	\
-	(host_get_special_port((host), 		\
-	HOST_LOCAL_NODE, HOST_PRIV_PORT, (port)))
-#define host_set_host_priv_port(host, port) (KERN_INVALID_ARGUMENT)
-
-#define host_get_io_master_port(host, port)	\
-	(host_get_special_port((host), 		\
-	HOST_LOCAL_NODE, HOST_IO_MASTER_PORT, (port)))
-#define host_set_io_master_port(host, port) (KERN_INVALID_ARGUMENT)
-
-/*
- * User-settable special ports.
- */
-#define host_get_dynamic_pager_port(host, port)	\
-	(host_get_special_port((host),			\
-	HOST_LOCAL_NODE, HOST_DYNAMIC_PAGER_PORT, (port)))
-#define host_set_dynamic_pager_port(host, port)	\
-	(host_set_special_port((host), HOST_DYNAMIC_PAGER_PORT, (port)))
-
-#define host_get_audit_control_port(host, port)	\
-	(host_get_special_port((host), 		\
-	HOST_LOCAL_NODE, HOST_AUDIT_CONTROL_PORT, (port)))
-#define host_set_audit_control_port(host, port)	\
-	(host_set_special_port((host), HOST_AUDIT_CONTROL_PORT, (port)))
-
-#define host_get_user_notification_port(host, port)	\
-	(host_get_special_port((host), 			\
-	HOST_LOCAL_NODE, HOST_USER_NOTIFICATION_PORT, (port)))
-#define host_set_user_notification_port(host, port)	\
-	(host_set_special_port((host), HOST_USER_NOTIFICATION_PORT, (port)))
-
-#define host_get_automountd_port(host, port)	\
-	(host_get_special_port((host), 		\
-	HOST_LOCAL_NODE, HOST_AUTOMOUNTD_PORT, (port)))
-#define host_set_automountd_port(host, port)	\
-	(host_set_special_port((host), HOST_AUTOMOUNTD_PORT, (port)))
-
-#define host_get_lockd_port(host, port)	\
-	(host_get_special_port((host), 			\
-	HOST_LOCAL_NODE, HOST_LOCKD_PORT, (port)))
-#define host_set_lockd_port(host, port)	\
-	(host_set_special_port((host), HOST_LOCKD_PORT, (port)))
-
-#define host_get_kextd_port(host, port)	\
-	(host_get_special_port((host), 			\
-	HOST_LOCAL_NODE, HOST_KEXTD_PORT, (port)))
-#define host_set_kextd_port(host, port)	\
-	(host_set_special_port((host), HOST_KEXTD_PORT, (port)))
-
-#define host_get_chud_port(host, port)	\
-	(host_get_special_port((host), 			\
-	HOST_LOCAL_NODE, HOST_CHUD_PORT, (port)))
-#define host_set_chud_port(host, port)	\
-	(host_set_special_port((host), HOST_CHUD_PORT, (port)))
-
-#define host_get_unfreed_port(host, port)	\
-	(host_get_special_port((host), 			\
-	HOST_LOCAL_NODE, HOST_UNFREED_PORT, (port)))
-#define host_set_unfreed_port(host, port)	\
-	(host_set_special_port((host), HOST_UNFREED_PORT, (port)))
-
-#define host_get_amfid_port(host, port)	\
-	(host_get_special_port((host), 			\
-	HOST_LOCAL_NODE, HOST_AMFID_PORT, (port)))
-#define host_set_amfid_port(host, port)	\
-	(host_set_special_port((host), HOST_AMFID_PORT, (port)))
-
-#endif	/* _MACH_HOST_SPECIAL_PORTS_H_ */
diff --git a/i386/include/mach/i386/_structs.h b/i386/include/mach/i386/_structs.h
deleted file mode 100644
index 927d12f..0000000
--- a/i386/include/mach/i386/_structs.h
+++ /dev/null
@@ -1,561 +0,0 @@
-/*
- * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-#ifndef	_MACH_I386__STRUCTS_H_
-#define	_MACH_I386__STRUCTS_H_
-
-/*
- * i386 is the structure that is exported to user threads for 
- * use in status/mutate calls.  This structure should never change.
- *
- */
-
-#if __DARWIN_UNIX03
-#define	_STRUCT_X86_THREAD_STATE32	struct __darwin_i386_thread_state
-_STRUCT_X86_THREAD_STATE32
-{
-    unsigned int	__eax;
-    unsigned int	__ebx;
-    unsigned int	__ecx;
-    unsigned int	__edx;
-    unsigned int	__edi;
-    unsigned int	__esi;
-    unsigned int	__ebp;
-    unsigned int	__esp;
-    unsigned int	__ss;
-    unsigned int	__eflags;
-    unsigned int	__eip;
-    unsigned int	__cs;
-    unsigned int	__ds;
-    unsigned int	__es;
-    unsigned int	__fs;
-    unsigned int	__gs;
-};
-#else /* !__DARWIN_UNIX03 */
-#define	_STRUCT_X86_THREAD_STATE32	struct i386_thread_state
-_STRUCT_X86_THREAD_STATE32
-{
-    unsigned int	eax;
-    unsigned int	ebx;
-    unsigned int	ecx;
-    unsigned int	edx;
-    unsigned int	edi;
-    unsigned int	esi;
-    unsigned int	ebp;
-    unsigned int	esp;
-    unsigned int	ss;
-    unsigned int	eflags;
-    unsigned int	eip;
-    unsigned int	cs;
-    unsigned int	ds;
-    unsigned int	es;
-    unsigned int	fs;
-    unsigned int	gs;
-};
-#endif /* !__DARWIN_UNIX03 */
-
-/* This structure should be double-word aligned for performance */
-
-#if __DARWIN_UNIX03
-#define _STRUCT_FP_CONTROL	struct __darwin_fp_control
-_STRUCT_FP_CONTROL
-{
-    unsigned short		__invalid	:1,
-    				__denorm	:1,
-				__zdiv		:1,
-				__ovrfl		:1,
-				__undfl		:1,
-				__precis	:1,
-						:2,
-				__pc		:2,
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define FP_PREC_24B		0
-#define	FP_PREC_53B		2
-#define FP_PREC_64B		3
-#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
-				__rc		:2,
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define FP_RND_NEAR		0
-#define FP_RND_DOWN		1
-#define FP_RND_UP		2
-#define FP_CHOP			3
-#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
-					/*inf*/	:1,
-						:3;
-};
-typedef _STRUCT_FP_CONTROL	__darwin_fp_control_t;
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_FP_CONTROL	struct fp_control
-_STRUCT_FP_CONTROL
-{
-    unsigned short		invalid	:1,
-    				denorm	:1,
-				zdiv	:1,
-				ovrfl	:1,
-				undfl	:1,
-				precis	:1,
-					:2,
-				pc	:2,
-#define FP_PREC_24B		0
-#define	FP_PREC_53B		2
-#define FP_PREC_64B		3
-				rc	:2,
-#define FP_RND_NEAR		0
-#define FP_RND_DOWN		1
-#define FP_RND_UP		2
-#define FP_CHOP			3
-				/*inf*/	:1,
-					:3;
-};
-typedef _STRUCT_FP_CONTROL	fp_control_t;
-#endif /* !__DARWIN_UNIX03 */
-
-/*
- * Status word.
- */
-
-#if __DARWIN_UNIX03
-#define _STRUCT_FP_STATUS	struct __darwin_fp_status
-_STRUCT_FP_STATUS
-{
-    unsigned short		__invalid	:1,
-    				__denorm	:1,
-				__zdiv		:1,
-				__ovrfl		:1,
-				__undfl		:1,
-				__precis	:1,
-				__stkflt	:1,
-				__errsumm	:1,
-				__c0		:1,
-				__c1		:1,
-				__c2		:1,
-				__tos		:3,
-				__c3		:1,
-				__busy		:1;
-};
-typedef _STRUCT_FP_STATUS	__darwin_fp_status_t;
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_FP_STATUS	struct fp_status
-_STRUCT_FP_STATUS
-{
-    unsigned short		invalid	:1,
-    				denorm	:1,
-				zdiv	:1,
-				ovrfl	:1,
-				undfl	:1,
-				precis	:1,
-				stkflt	:1,
-				errsumm	:1,
-				c0	:1,
-				c1	:1,
-				c2	:1,
-				tos	:3,
-				c3	:1,
-				busy	:1;
-};
-typedef _STRUCT_FP_STATUS	fp_status_t;
-#endif /* !__DARWIN_UNIX03 */
-				
-/* defn of 80bit x87 FPU or MMX register  */
-
-#if __DARWIN_UNIX03
-#define _STRUCT_MMST_REG	struct __darwin_mmst_reg
-_STRUCT_MMST_REG
-{
-	char	__mmst_reg[10];
-	char	__mmst_rsrv[6];
-};
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_MMST_REG	struct mmst_reg
-_STRUCT_MMST_REG
-{
-	char	mmst_reg[10];
-	char	mmst_rsrv[6];
-};
-#endif /* !__DARWIN_UNIX03 */
-
-
-/* defn of 128 bit XMM regs */
-
-#if __DARWIN_UNIX03
-#define _STRUCT_XMM_REG		struct __darwin_xmm_reg
-_STRUCT_XMM_REG
-{
-	char		__xmm_reg[16];
-};
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_XMM_REG		struct xmm_reg
-_STRUCT_XMM_REG
-{
-	char		xmm_reg[16];
-};
-#endif /* !__DARWIN_UNIX03 */
-
-/* 
- * Floating point state.
- */
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define FP_STATE_BYTES		512	/* number of chars worth of data from fpu_fcw */
-#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
-
-#if __DARWIN_UNIX03
-#define	_STRUCT_X86_FLOAT_STATE32	struct __darwin_i386_float_state
-_STRUCT_X86_FLOAT_STATE32
-{
-	int 			__fpu_reserved[2];
-	_STRUCT_FP_CONTROL	__fpu_fcw;		/* x87 FPU control word */
-	_STRUCT_FP_STATUS	__fpu_fsw;		/* x87 FPU status word */
-	__uint8_t		__fpu_ftw;		/* x87 FPU tag word */
-	__uint8_t		__fpu_rsrv1;		/* reserved */ 
-	__uint16_t		__fpu_fop;		/* x87 FPU Opcode */
-	__uint32_t		__fpu_ip;		/* x87 FPU Instruction Pointer offset */
-	__uint16_t		__fpu_cs;		/* x87 FPU Instruction Pointer Selector */
-	__uint16_t		__fpu_rsrv2;		/* reserved */
-	__uint32_t		__fpu_dp;		/* x87 FPU Instruction Operand(Data) Pointer offset */
-	__uint16_t		__fpu_ds;		/* x87 FPU Instruction Operand(Data) Pointer Selector */
-	__uint16_t		__fpu_rsrv3;		/* reserved */
-	__uint32_t		__fpu_mxcsr;		/* MXCSR Register state */
-	__uint32_t		__fpu_mxcsrmask;	/* MXCSR mask */
-	_STRUCT_MMST_REG	__fpu_stmm0;		/* ST0/MM0   */
-	_STRUCT_MMST_REG	__fpu_stmm1;		/* ST1/MM1  */
-	_STRUCT_MMST_REG	__fpu_stmm2;		/* ST2/MM2  */
-	_STRUCT_MMST_REG	__fpu_stmm3;		/* ST3/MM3  */
-	_STRUCT_MMST_REG	__fpu_stmm4;		/* ST4/MM4  */
-	_STRUCT_MMST_REG	__fpu_stmm5;		/* ST5/MM5  */
-	_STRUCT_MMST_REG	__fpu_stmm6;		/* ST6/MM6  */
-	_STRUCT_MMST_REG	__fpu_stmm7;		/* ST7/MM7  */
-	_STRUCT_XMM_REG		__fpu_xmm0;		/* XMM 0  */
-	_STRUCT_XMM_REG		__fpu_xmm1;		/* XMM 1  */
-	_STRUCT_XMM_REG		__fpu_xmm2;		/* XMM 2  */
-	_STRUCT_XMM_REG		__fpu_xmm3;		/* XMM 3  */
-	_STRUCT_XMM_REG		__fpu_xmm4;		/* XMM 4  */
-	_STRUCT_XMM_REG		__fpu_xmm5;		/* XMM 5  */
-	_STRUCT_XMM_REG		__fpu_xmm6;		/* XMM 6  */
-	_STRUCT_XMM_REG		__fpu_xmm7;		/* XMM 7  */
-	char			__fpu_rsrv4[14*16];	/* reserved */
-	int 			__fpu_reserved1;
-};
-#else /* !__DARWIN_UNIX03 */
-#define	_STRUCT_X86_FLOAT_STATE32	struct i386_float_state
-_STRUCT_X86_FLOAT_STATE32
-{
-	int 			fpu_reserved[2];
-	_STRUCT_FP_CONTROL	fpu_fcw;		/* x87 FPU control word */
-	_STRUCT_FP_STATUS	fpu_fsw;		/* x87 FPU status word */
-	__uint8_t		fpu_ftw;		/* x87 FPU tag word */
-	__uint8_t		fpu_rsrv1;		/* reserved */ 
-	__uint16_t		fpu_fop;		/* x87 FPU Opcode */
-	__uint32_t		fpu_ip;			/* x87 FPU Instruction Pointer offset */
-	__uint16_t		fpu_cs;			/* x87 FPU Instruction Pointer Selector */
-	__uint16_t		fpu_rsrv2;		/* reserved */
-	__uint32_t		fpu_dp;			/* x87 FPU Instruction Operand(Data) Pointer offset */
-	__uint16_t		fpu_ds;			/* x87 FPU Instruction Operand(Data) Pointer Selector */
-	__uint16_t		fpu_rsrv3;		/* reserved */
-	__uint32_t		fpu_mxcsr;		/* MXCSR Register state */
-	__uint32_t		fpu_mxcsrmask;		/* MXCSR mask */
-	_STRUCT_MMST_REG	fpu_stmm0;		/* ST0/MM0   */
-	_STRUCT_MMST_REG	fpu_stmm1;		/* ST1/MM1  */
-	_STRUCT_MMST_REG	fpu_stmm2;		/* ST2/MM2  */
-	_STRUCT_MMST_REG	fpu_stmm3;		/* ST3/MM3  */
-	_STRUCT_MMST_REG	fpu_stmm4;		/* ST4/MM4  */
-	_STRUCT_MMST_REG	fpu_stmm5;		/* ST5/MM5  */
-	_STRUCT_MMST_REG	fpu_stmm6;		/* ST6/MM6  */
-	_STRUCT_MMST_REG	fpu_stmm7;		/* ST7/MM7  */
-	_STRUCT_XMM_REG		fpu_xmm0;		/* XMM 0  */
-	_STRUCT_XMM_REG		fpu_xmm1;		/* XMM 1  */
-	_STRUCT_XMM_REG		fpu_xmm2;		/* XMM 2  */
-	_STRUCT_XMM_REG		fpu_xmm3;		/* XMM 3  */
-	_STRUCT_XMM_REG		fpu_xmm4;		/* XMM 4  */
-	_STRUCT_XMM_REG		fpu_xmm5;		/* XMM 5  */
-	_STRUCT_XMM_REG		fpu_xmm6;		/* XMM 6  */
-	_STRUCT_XMM_REG		fpu_xmm7;		/* XMM 7  */
-	char			fpu_rsrv4[14*16];	/* reserved */
-	int 			fpu_reserved1;
-};
-#endif /* !__DARWIN_UNIX03 */
-
-#if __DARWIN_UNIX03
-#define _STRUCT_X86_EXCEPTION_STATE32	struct __darwin_i386_exception_state
-_STRUCT_X86_EXCEPTION_STATE32
-{
-    unsigned int	__trapno;
-    unsigned int	__err;
-    unsigned int	__faultvaddr;
-};
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_X86_EXCEPTION_STATE32	struct i386_exception_state
-_STRUCT_X86_EXCEPTION_STATE32
-{
-    unsigned int	trapno;
-    unsigned int	err;
-    unsigned int	faultvaddr;
-};
-#endif /* !__DARWIN_UNIX03 */
-
-#if __DARWIN_UNIX03
-#define _STRUCT_X86_DEBUG_STATE32	struct __darwin_x86_debug_state32
-_STRUCT_X86_DEBUG_STATE32
-{
-	unsigned int	__dr0;
-	unsigned int	__dr1;
-	unsigned int	__dr2;
-	unsigned int	__dr3;
-	unsigned int	__dr4;
-	unsigned int	__dr5;
-	unsigned int	__dr6;
-	unsigned int	__dr7;
-};
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_X86_DEBUG_STATE32	struct x86_debug_state32
-_STRUCT_X86_DEBUG_STATE32
-{
-	unsigned int	dr0;
-	unsigned int	dr1;
-	unsigned int	dr2;
-	unsigned int	dr3;
-	unsigned int	dr4;
-	unsigned int	dr5;
-	unsigned int	dr6;
-	unsigned int	dr7;
-};
-#endif /* !__DARWIN_UNIX03 */
-
-/*
- * 64 bit versions of the above
- */
-
-#if __DARWIN_UNIX03
-#define	_STRUCT_X86_THREAD_STATE64	struct __darwin_x86_thread_state64
-_STRUCT_X86_THREAD_STATE64
-{
-	__uint64_t	__rax;
-	__uint64_t	__rbx;
-	__uint64_t	__rcx;
-	__uint64_t	__rdx;
-	__uint64_t	__rdi;
-	__uint64_t	__rsi;
-	__uint64_t	__rbp;
-	__uint64_t	__rsp;
-	__uint64_t	__r8;
-	__uint64_t	__r9;
-	__uint64_t	__r10;
-	__uint64_t	__r11;
-	__uint64_t	__r12;
-	__uint64_t	__r13;
-	__uint64_t	__r14;
-	__uint64_t	__r15;
-	__uint64_t	__rip;
-	__uint64_t	__rflags;
-	__uint64_t	__cs;
-	__uint64_t	__fs;
-	__uint64_t	__gs;
-};
-#else /* !__DARWIN_UNIX03 */
-#define	_STRUCT_X86_THREAD_STATE64	struct x86_thread_state64
-_STRUCT_X86_THREAD_STATE64
-{
-	__uint64_t	rax;
-	__uint64_t	rbx;
-	__uint64_t	rcx;
-	__uint64_t	rdx;
-	__uint64_t	rdi;
-	__uint64_t	rsi;
-	__uint64_t	rbp;
-	__uint64_t	rsp;
-	__uint64_t	r8;
-	__uint64_t	r9;
-	__uint64_t	r10;
-	__uint64_t	r11;
-	__uint64_t	r12;
-	__uint64_t	r13;
-	__uint64_t	r14;
-	__uint64_t	r15;
-	__uint64_t	rip;
-	__uint64_t	rflags;
-	__uint64_t	cs;
-	__uint64_t	fs;
-	__uint64_t	gs;
-};
-#endif /* !__DARWIN_UNIX03 */
-
-
-#if __DARWIN_UNIX03
-#define	_STRUCT_X86_FLOAT_STATE64	struct __darwin_x86_float_state64
-_STRUCT_X86_FLOAT_STATE64
-{
-	int 			__fpu_reserved[2];
-	_STRUCT_FP_CONTROL	__fpu_fcw;		/* x87 FPU control word */
-	_STRUCT_FP_STATUS	__fpu_fsw;		/* x87 FPU status word */
-	__uint8_t		__fpu_ftw;		/* x87 FPU tag word */
-	__uint8_t		__fpu_rsrv1;		/* reserved */ 
-	__uint16_t		__fpu_fop;		/* x87 FPU Opcode */
-
-	/* x87 FPU Instruction Pointer */
-	__uint32_t		__fpu_ip;		/* offset */
-	__uint16_t		__fpu_cs;		/* Selector */
-
-	__uint16_t		__fpu_rsrv2;		/* reserved */
-
-	/* x87 FPU Instruction Operand(Data) Pointer */
-	__uint32_t		__fpu_dp;		/* offset */
-	__uint16_t		__fpu_ds;		/* Selector */
-
-	__uint16_t		__fpu_rsrv3;		/* reserved */
-	__uint32_t		__fpu_mxcsr;		/* MXCSR Register state */
-	__uint32_t		__fpu_mxcsrmask;	/* MXCSR mask */
-	_STRUCT_MMST_REG	__fpu_stmm0;		/* ST0/MM0   */
-	_STRUCT_MMST_REG	__fpu_stmm1;		/* ST1/MM1  */
-	_STRUCT_MMST_REG	__fpu_stmm2;		/* ST2/MM2  */
-	_STRUCT_MMST_REG	__fpu_stmm3;		/* ST3/MM3  */
-	_STRUCT_MMST_REG	__fpu_stmm4;		/* ST4/MM4  */
-	_STRUCT_MMST_REG	__fpu_stmm5;		/* ST5/MM5  */
-	_STRUCT_MMST_REG	__fpu_stmm6;		/* ST6/MM6  */
-	_STRUCT_MMST_REG	__fpu_stmm7;		/* ST7/MM7  */
-	_STRUCT_XMM_REG		__fpu_xmm0;		/* XMM 0  */
-	_STRUCT_XMM_REG		__fpu_xmm1;		/* XMM 1  */
-	_STRUCT_XMM_REG		__fpu_xmm2;		/* XMM 2  */
-	_STRUCT_XMM_REG		__fpu_xmm3;		/* XMM 3  */
-	_STRUCT_XMM_REG		__fpu_xmm4;		/* XMM 4  */
-	_STRUCT_XMM_REG		__fpu_xmm5;		/* XMM 5  */
-	_STRUCT_XMM_REG		__fpu_xmm6;		/* XMM 6  */
-	_STRUCT_XMM_REG		__fpu_xmm7;		/* XMM 7  */
-	_STRUCT_XMM_REG		__fpu_xmm8;		/* XMM 8  */
-	_STRUCT_XMM_REG		__fpu_xmm9;		/* XMM 9  */
-	_STRUCT_XMM_REG		__fpu_xmm10;		/* XMM 10  */
-	_STRUCT_XMM_REG		__fpu_xmm11;		/* XMM 11 */
-	_STRUCT_XMM_REG		__fpu_xmm12;		/* XMM 12  */
-	_STRUCT_XMM_REG		__fpu_xmm13;		/* XMM 13  */
-	_STRUCT_XMM_REG		__fpu_xmm14;		/* XMM 14  */
-	_STRUCT_XMM_REG		__fpu_xmm15;		/* XMM 15  */
-	char			__fpu_rsrv4[6*16];	/* reserved */
-	int 			__fpu_reserved1;
-};
-#else /* !__DARWIN_UNIX03 */
-#define	_STRUCT_X86_FLOAT_STATE64	struct x86_float_state64
-_STRUCT_X86_FLOAT_STATE64
-{
-	int 			fpu_reserved[2];
-	_STRUCT_FP_CONTROL	fpu_fcw;		/* x87 FPU control word */
-	_STRUCT_FP_STATUS	fpu_fsw;		/* x87 FPU status word */
-	__uint8_t		fpu_ftw;		/* x87 FPU tag word */
-	__uint8_t		fpu_rsrv1;		/* reserved */ 
-	__uint16_t		fpu_fop;		/* x87 FPU Opcode */
-
-	/* x87 FPU Instruction Pointer */
-	__uint32_t		fpu_ip;			/* offset */
-	__uint16_t		fpu_cs;			/* Selector */
-
-	__uint16_t		fpu_rsrv2;		/* reserved */
-
-	/* x87 FPU Instruction Operand(Data) Pointer */
-	__uint32_t		fpu_dp;			/* offset */
-	__uint16_t		fpu_ds;			/* Selector */
-
-	__uint16_t		fpu_rsrv3;		/* reserved */
-	__uint32_t		fpu_mxcsr;		/* MXCSR Register state */
-	__uint32_t		fpu_mxcsrmask;		/* MXCSR mask */
-	_STRUCT_MMST_REG	fpu_stmm0;		/* ST0/MM0   */
-	_STRUCT_MMST_REG	fpu_stmm1;		/* ST1/MM1  */
-	_STRUCT_MMST_REG	fpu_stmm2;		/* ST2/MM2  */
-	_STRUCT_MMST_REG	fpu_stmm3;		/* ST3/MM3  */
-	_STRUCT_MMST_REG	fpu_stmm4;		/* ST4/MM4  */
-	_STRUCT_MMST_REG	fpu_stmm5;		/* ST5/MM5  */
-	_STRUCT_MMST_REG	fpu_stmm6;		/* ST6/MM6  */
-	_STRUCT_MMST_REG	fpu_stmm7;		/* ST7/MM7  */
-	_STRUCT_XMM_REG		fpu_xmm0;		/* XMM 0  */
-	_STRUCT_XMM_REG		fpu_xmm1;		/* XMM 1  */
-	_STRUCT_XMM_REG		fpu_xmm2;		/* XMM 2  */
-	_STRUCT_XMM_REG		fpu_xmm3;		/* XMM 3  */
-	_STRUCT_XMM_REG		fpu_xmm4;		/* XMM 4  */
-	_STRUCT_XMM_REG		fpu_xmm5;		/* XMM 5  */
-	_STRUCT_XMM_REG		fpu_xmm6;		/* XMM 6  */
-	_STRUCT_XMM_REG		fpu_xmm7;		/* XMM 7  */
-	_STRUCT_XMM_REG		fpu_xmm8;		/* XMM 8  */
-	_STRUCT_XMM_REG		fpu_xmm9;		/* XMM 9  */
-	_STRUCT_XMM_REG		fpu_xmm10;		/* XMM 10  */
-	_STRUCT_XMM_REG		fpu_xmm11;		/* XMM 11 */
-	_STRUCT_XMM_REG		fpu_xmm12;		/* XMM 12  */
-	_STRUCT_XMM_REG		fpu_xmm13;		/* XMM 13  */
-	_STRUCT_XMM_REG		fpu_xmm14;		/* XMM 14  */
-	_STRUCT_XMM_REG		fpu_xmm15;		/* XMM 15  */
-	char			fpu_rsrv4[6*16];	/* reserved */
-	int 			fpu_reserved1;
-};
-#endif /* !__DARWIN_UNIX03 */
-
-#if __DARWIN_UNIX03
-#define _STRUCT_X86_EXCEPTION_STATE64	struct __darwin_x86_exception_state64
-_STRUCT_X86_EXCEPTION_STATE64
-{
-    unsigned int	__trapno;
-    unsigned int	__err;
-    __uint64_t		__faultvaddr;
-};
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_X86_EXCEPTION_STATE64	struct x86_exception_state64
-_STRUCT_X86_EXCEPTION_STATE64
-{
-    unsigned int	trapno;
-    unsigned int	err;
-    __uint64_t		faultvaddr;
-};
-#endif /* !__DARWIN_UNIX03 */
-
-#if __DARWIN_UNIX03
-#define _STRUCT_X86_DEBUG_STATE64	struct __darwin_x86_debug_state64
-_STRUCT_X86_DEBUG_STATE64
-{
-	__uint64_t	__dr0;
-	__uint64_t	__dr1;
-	__uint64_t	__dr2;
-	__uint64_t	__dr3;
-	__uint64_t	__dr4;
-	__uint64_t	__dr5;
-	__uint64_t	__dr6;
-	__uint64_t	__dr7;
-};
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_X86_DEBUG_STATE64	struct x86_debug_state64
-_STRUCT_X86_DEBUG_STATE64
-{
-	__uint64_t	dr0;
-	__uint64_t	dr1;
-	__uint64_t	dr2;
-	__uint64_t	dr3;
-	__uint64_t	dr4;
-	__uint64_t	dr5;
-	__uint64_t	dr6;
-	__uint64_t	dr7;
-};
-#endif /* !__DARWIN_UNIX03 */
-
-#endif /* _MACH_I386__STRUCTS_H_ */
diff --git a/i386/include/mach/i386/asm.h b/i386/include/mach/i386/asm.h
deleted file mode 100644
index 02a5620..0000000
--- a/i386/include/mach/i386/asm.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-#ifndef	_I386_ASM_H_
-#define	_I386_ASM_H_
-
-#ifdef _KERNEL
-#include <gprof.h>
-#endif	/* _KERNEL */
-
-#ifdef MACH_KERNEL
-#include <mach_kdb.h>
-#else	/* !MACH_KERNEL */
-#define	MACH_KDB 0
-#endif	/* !MACH_KERNEL */
-
-
-#if	defined(MACH_KERNEL) || defined(_KERNEL)
-#include <gprof.h>
-#endif	/* MACH_KERNEL || _KERNEL */
-
-#if defined(__i386__)
-
-#define S_PC	 (%esp)
-#define S_ARG0	 4(%esp)
-#define S_ARG1	 8(%esp)
-#define S_ARG2	12(%esp)
-#define S_ARG3	16(%esp)
-#define S_ARG4	20(%esp)
-
-#define FRAME	pushl %ebp; movl %esp, %ebp
-#define EMARF	leave
-
-#define B_LINK	 (%ebp)
-#define B_PC	 4(%ebp)
-#define B_ARG0	 8(%ebp)
-#define B_ARG1	12(%ebp)
-#define B_ARG2	16(%ebp)
-#define B_ARG3	20(%ebp)
-
-#elif defined(__x86_64__)
-
-#define S_PC	 (%rsp)
-
-#define FRAME	pushq %rbp; movq %rsp, %rbp
-#define EMARF	leave
-
-#define B_LINK	 (%rbp)
-#define B_PC	 8(%rbp)
-
-#else
-#error unsupported architecture
-#endif
-
-/* There is another definition of ALIGN for .c sources */
-#ifdef ASSEMBLER
-#define ALIGN 4,0x90
-#endif /* ASSEMBLER */
-
-#ifndef FALIGN
-#define FALIGN ALIGN
-#endif
-
-#define LB(x,n) n
-#if	__STDC__
-#ifndef __NO_UNDERSCORES__
-#define	LCL(x)	L ## x
-#define EXT(x) _ ## x
-#define LEXT(x) _ ## x ## :
-#else
-#define	LCL(x)	.L ## x
-#define EXT(x) x
-#define LEXT(x) x ## :
-#endif
-#define LBc(x,n) n ## :
-#define LBb(x,n) n ## b
-#define LBf(x,n) n ## f
-#else /* __STDC__ */
-#ifndef __NO_UNDERSCORES__
-#define LCL(x) L/**/x
-#define EXT(x) _/**/x
-#define LEXT(x) _/**/x/**/:
-#else /* __NO_UNDERSCORES__ */
-#define	LCL(x)	.L/**/x
-#define EXT(x) x
-#define LEXT(x) x/**/:
-#endif /* __NO_UNDERSCORES__ */
-#define LBc(x,n) n/**/:
-#define LBb(x,n) n/**/b
-#define LBf(x,n) n/**/f
-#endif /* __STDC__ */
-
-#define SVC .byte 0x9a; .long 0; .word 0x7
-
-#define RPC_SVC .byte 0x9a; .long 0; .word 0xf
-
-#define String	.asciz
-#define Value	.word
-#define Times(a,b) (a*b)
-#define Divide(a,b) (a/b)
-
-#define INB	inb	%dx, %al
-#define OUTB	outb	%al, %dx
-#define INL	inl	%dx, %eax
-#define OUTL	outl	%eax, %dx
-
-#define data16	.byte 0x66
-#define addr16	.byte 0x67
-
-#if !GPROF
-#define MCOUNT
-
-#elif defined(__SHARED__)
-#define MCOUNT		; .data;\
-			.align ALIGN;\
-			LBc(x, 8) .long 0;\
-			.text;\
-			Gpush;\
-			Gload;\
-			leal Gotoff(LBb(x,8)),%edx;\
-			Egaddr(%eax,_mcount_ptr);\
-			Gpop;\
-			call *(%eax);
-
-#else	/* !GPROF, !__SHARED__ */
-#define MCOUNT		; call mcount;
-#endif /* GPROF */
-
-#ifdef __ELF__
-#define ELF_FUNC(x)	.type x,@function
-#define ELF_DATA(x)	.type x,@object
-#define ELF_SIZE(x,s)	.size x,s
-#else
-#define ELF_FUNC(x)
-#define ELF_DATA(x)
-#define ELF_SIZE(x,s)
-#endif
-
-#define	Entry(x)	.globl EXT(x); ELF_FUNC(EXT(x)); .align FALIGN; LEXT(x)
-#define	ENTRY(x)	Entry(x) MCOUNT
-#define	ENTRY2(x,y)	.globl EXT(x); .globl EXT(y); \
-			ELF_FUNC(EXT(x)); ELF_FUNC(EXT(y)); \
-			.align FALIGN; LEXT(x); LEXT(y) \
-			MCOUNT
-#if __STDC__
-#define	ASENTRY(x) 	.globl x; .align FALIGN; x ## : ELF_FUNC(x) MCOUNT
-#else
-#define	ASENTRY(x) 	.globl x; .align FALIGN; x: ELF_FUNC(x) MCOUNT
-#endif /* __STDC__ */
-
-#define	DATA(x)		.globl EXT(x); ELF_DATA(EXT(x)); .align ALIGN; LEXT(x)
-
-#define End(x)		ELF_SIZE(x,.-x)
-#define END(x)		End(EXT(x))
-#define ENDDATA(x)	END(x)
-#define Enddata(x)	End(x)
-
-/*
- * ELF shared library accessor macros.
- * Gpush saves the %ebx register used for the GOT address
- * Gpop pops %ebx if we need a GOT
- * Gload loads %ebx with the GOT address if shared libraries are used
- * Gcall calls an external function.
- * Gotoff allows you to reference local labels.
- * Gotoff2 allows you to reference local labels with an index reg.
- * Gotoff3 allows you to reference local labels with an index reg & size.
- * Gaddr loads up a register with an address of an external item.
- * Gstack is the number of bytes that Gpush pushes on the stack.
- *
- * Varients of the above with E or L prefixes do EXT(name) or LCL(name)
- * respectively.
- */
-
-#ifndef __SHARED__
-#define Gpush
-#define Gpop
-#define Gload
-#define Gcall(func)		call func
-#define Gotoff(lab)		lab
-#define Gotoff2(l,r)		l(r)
-#define Gotoff3(l,r,s)		l(,r,s)
-#define Gaddr(to,lab)		movl $lab,to
-#define Gcmp(lab,reg)		cmpl $lab,reg
-#define Gmemload(lab,reg)	movl lab,reg
-#define Gmemstore(reg,lab,tmp)	movl reg,lab
-#define Gstack			0
-
-#else
-#ifdef __ELF__			/* ELF shared libraries */
-#define Gpush			pushl %ebx
-#define Gpop			popl %ebx
-#define Gload			call 9f; 9: popl %ebx; addl $_GLOBAL_OFFSET_TABLE_+[.-9b],%ebx
-#define Gcall(func)		call EXT(func)@PLT
-#define Gotoff(lab)		lab@GOTOFF(%ebx)
-#define Gotoff2(l,r)		l@GOTOFF(%ebx,r)
-#define Gotoff3(l,r,s)		l@GOTOFF(%ebx,r,s)
-#define Gaddr(to,lab)		movl lab@GOT(%ebx),to
-#define Gcmp(lab,reg)		cmpl reg,lab@GOT(%ebx)
-#define Gmemload(lab,reg)	movl lab@GOT(%ebx),reg; movl (reg),reg
-#define Gmemstore(reg,lab,tmp)	movl lab@GOT(%ebx),tmp; movl reg,(tmp)
-#define Gstack			4
-
-#else				/* ROSE shared libraries */
-#define Gpush
-#define Gpop
-#define Gload
-#define Gcall(func)		call *9f; .data; .align ALIGN; 9: .long func; .text
-#define Gotoff(lab)		lab
-#define Gotoff2(l,r)		l(r)
-#define Gotoff3(l,r,s)		l(,r,s)
-#define Gaddr(to,lab)		movl 9f,to; .data; .align ALIGN; 9: .long lab; .text
-#define Gcmp(lab,reg)		cmpl reg,9f; .data; .align ALIGN; 9: .long lab; .text
-#define Gmemload(lab,reg)	movl 9f,reg; movl (reg),reg; .data; .align ALIGN; 9: .long lab; .text
-#define Gmemstore(reg,lab,tmp)	movl 9f,tmp; movl reg,(tmp); .data; .align ALIGN; 9: .long lab; .text
-#define Gstack			0
-#endif	/* __ELF__ */
-#endif	/* __SHARED__ */
-
-/* Egotoff is not provided, since external symbols should not use @GOTOFF
-   relocations.  */
-#define Egcall(func)		Gcall(EXT(func))
-#define Egaddr(to,lab)		Gaddr(to,EXT(lab))
-#define Egcmp(lab,reg)		Gcmp(EXT(lab),reg)
-#define Egmemload(lab,reg)	Gmemload(EXT(lab),reg)
-#define Egmemstore(reg,lab,tmp)	Gmemstore(reg,EXT(lab),tmp)
-
-#define Lgotoff(lab)		Gotoff(LCL(lab))
-#define Lgotoff2(l,r)		Gotoff2(LCL(l),r)
-#define Lgotoff3(l,r,s)		Gotoff3(LCL(l),r,s)
-#define Lgcmp(lab,reg)		Gcmp(LCL(lab),reg)
-#define Lgmemload(lab,reg)	movl Lgotoff(lab),reg
-#define Lgmemstore(reg,lab,tmp)	movl reg,Lgotoff(lab)
-
-#ifdef ASSEMBLER
-#if	MACH_KDB
-#include <ddb/stab.h>
-/*
- * This pseudo-assembler line is added so that there will be at least
- *	one N_SO entry in the symbol stable to define the current file name.
- */
-#endif	/* MACH_KDB */
-
-#else /* NOT ASSEMBLER */
-
-/* These defines are here for .c files that wish to reference global symbols
- * within __asm__ statements. 
- */
-#ifndef __NO_UNDERSCORES__
-#define CC_SYM_PREFIX "_"
-#else
-#define CC_SYM_PREFIX ""
-#endif /* __NO_UNDERSCORES__ */
-#endif /* ASSEMBLER */
-
-#endif /* _I386_ASM_H_ */
diff --git a/i386/include/mach/i386/boolean.h b/i386/include/mach/i386/boolean.h
deleted file mode 100644
index 100f7e7..0000000
--- a/i386/include/mach/i386/boolean.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-/*
- *	File:	boolean.h
- *
- *	Boolean type, for I386.
- */
-
-#ifndef	_MACH_I386_BOOLEAN_H_
-#define _MACH_I386_BOOLEAN_H_
-
-#if defined(__x86_64__) && !defined(KERNEL)
-typedef unsigned int	boolean_t;
-#else
-typedef int		boolean_t;
-#endif
-
-#endif	/* _MACH_I386_BOOLEAN_H_ */
diff --git a/i386/include/mach/i386/exception.h b/i386/include/mach/i386/exception.h
deleted file mode 100644
index 77fe4e4..0000000
--- a/i386/include/mach/i386/exception.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-#ifndef	_MACH_I386_EXCEPTION_H_
-#define _MACH_I386_EXCEPTION_H_
-
-/*
- * No machine dependent types for the 80386
- */
-
-#define	EXC_TYPES_COUNT	11	/* incl. illegal exception 0 */
-
-/*
- *	Codes and subcodes for 80386 exceptions.
- */
-
-#define EXCEPTION_CODE_MAX	2	/* currently code and subcode */
-
-/*
- *	EXC_BAD_INSTRUCTION
- */
-
-#define EXC_I386_INVOP			1
-
-/*
- *	EXC_ARITHMETIC
- */
-
-#define EXC_I386_DIV			1
-#define EXC_I386_INTO			2
-#define EXC_I386_NOEXT			3
-#define EXC_I386_EXTOVR			4
-#define EXC_I386_EXTERR			5
-#define EXC_I386_EMERR			6
-#define EXC_I386_BOUND			7
-#define EXC_I386_SSEEXTERR              8
-
-/*
- *	EXC_SOFTWARE
- *	Note: 0x10000-0x10003 in use for unix signal
- */
-
-/*
- *	EXC_BAD_ACCESS
- */
-
-/*
- *	EXC_BREAKPOINT
- */
-
-#define EXC_I386_SGL			1
-#define EXC_I386_BPT			2
-
-#define EXC_I386_DIVERR		0	/* divide by 0 eprror		*/
-#define EXC_I386_SGLSTP		1	/* single step			*/
-#define EXC_I386_NMIFLT		2	/* NMI				*/
-#define EXC_I386_BPTFLT		3	/* breakpoint fault		*/
-#define EXC_I386_INTOFLT	4	/* INTO overflow fault		*/
-#define EXC_I386_BOUNDFLT	5	/* BOUND instruction fault	*/
-#define EXC_I386_INVOPFLT	6	/* invalid opcode fault		*/
-#define EXC_I386_NOEXTFLT	7	/* extension not available fault*/
-#define EXC_I386_DBLFLT		8	/* double fault			*/
-#define EXC_I386_EXTOVRFLT	9	/* extension overrun fault	*/
-#define EXC_I386_INVTSSFLT	10	/* invalid TSS fault		*/
-#define EXC_I386_SEGNPFLT	11	/* segment not present fault	*/
-#define EXC_I386_STKFLT		12	/* stack fault			*/
-#define EXC_I386_GPFLT		13	/* general protection fault	*/
-#define EXC_I386_PGFLT		14	/* page fault			*/
-#define EXC_I386_EXTERRFLT	16	/* extension error fault	*/
-#define	EXC_I386_ALIGNFLT	17	/* Alignment fault */
-#define EXC_I386_ENDPERR	33	/* emulated extension error flt	*/
-#define EXC_I386_ENOEXTFLT	32	/* emulated ext not present	*/
-
-
-/*
- *	machine dependent exception masks
- */
-#define	EXC_MASK_MACHINE	0
-
-#endif	/* _MACH_I386_EXCEPTION_H_ */
diff --git a/i386/include/mach/i386/fp_reg.h b/i386/include/mach/i386/fp_reg.h
deleted file mode 100644
index 47a26a9..0000000
--- a/i386/include/mach/i386/fp_reg.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1992-1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-#ifndef	_I386_FP_SAVE_H_
-#define	_I386_FP_SAVE_H_
-
-
-/* note when allocating this data structure, it must be 16 byte aligned. */
-struct x86_fx_save {
-        unsigned short  fx_control;     /* control */
-        unsigned short  fx_status;      /* status */
-        unsigned char  	fx_tag;         /* register tags */
-        unsigned char	fx_bbz1;	/* better be zero when calling fxrtstor */
-        unsigned short  fx_opcode;
-        unsigned int    fx_eip;         /* eip  instruction */
-        unsigned short  fx_cs;          /* cs instruction */
-        unsigned short  fx_bbz2;	/* better be zero when calling fxrtstor */ 
-        unsigned int    fx_dp;          /* data address */
-        unsigned short  fx_ds;          /* data segment */
-        unsigned short  fx_bbz3;	/* better be zero when calling fxrtstor */
-        unsigned int  	fx_MXCSR;
-        unsigned int  	fx_MXCSR_MASK;
-        unsigned short  fx_reg_word[8][8];      /* STx/MMx registers */
-        unsigned short  fx_XMM_reg[8][16];	/* XMM0-XMM15 on 64 bit processors */
-                                                /* XMM0-XMM7  on 32 bit processors... unused storage reserved */
-        unsigned char 	fx_reserved[16*6];	/* reserved by intel for future expansion */
-};
-
-
-/*
- * Control register
- */
-#define	FPC_IE		0x0001		/* enable invalid operation
-					   exception */
-#define FPC_IM		FPC_IE
-#define	FPC_DE		0x0002		/* enable denormalized operation
-					   exception */
-#define FPC_DM		FPC_DE
-#define	FPC_ZE		0x0004		/* enable zero-divide exception */
-#define FPC_ZM		FPC_ZE
-#define	FPC_OE		0x0008		/* enable overflow exception */
-#define FPC_OM		FPC_OE
-#define	FPC_UE		0x0010		/* enable underflow exception */
-#define	FPC_PE		0x0020		/* enable precision exception */
-#define	FPC_PC		0x0300		/* precision control: */
-#define	FPC_PC_24	0x0000			/* 24 bits */
-#define	FPC_PC_53	0x0200			/* 53 bits */
-#define	FPC_PC_64	0x0300			/* 64 bits */
-#define	FPC_RC		0x0c00		/* rounding control: */
-#define	FPC_RC_RN	0x0000			/* round to nearest or even */
-#define	FPC_RC_RD	0x0400			/* round down */
-#define	FPC_RC_RU	0x0800			/* round up */
-#define	FPC_RC_CHOP	0x0c00			/* chop */
-#define	FPC_IC		0x1000		/* infinity control (obsolete) */
-#define	FPC_IC_PROJ	0x0000			/* projective infinity */
-#define	FPC_IC_AFF	0x1000			/* affine infinity (std) */
-
-/*
- * Status register
- */
-#define	FPS_IE		0x0001		/* invalid operation */
-#define	FPS_DE		0x0002		/* denormalized operand */
-#define	FPS_ZE		0x0004		/* divide by zero */
-#define	FPS_OE		0x0008		/* overflow */
-#define	FPS_UE		0x0010		/* underflow */
-#define	FPS_PE		0x0020		/* precision */
-#define	FPS_SF		0x0040		/* stack flag */
-#define	FPS_ES		0x0080		/* error summary */
-#define	FPS_C0		0x0100		/* condition code bit 0 */
-#define	FPS_C1		0x0200		/* condition code bit 1 */
-#define	FPS_C2		0x0400		/* condition code bit 2 */
-#define	FPS_TOS		0x3800		/* top-of-stack pointer */
-#define	FPS_TOS_SHIFT	11
-#define	FPS_C3		0x4000		/* condition code bit 3 */
-#define	FPS_BUSY	0x8000		/* FPU busy */
-
-/*
- * Kind of floating-point support provided by kernel.
- */
-#define	FP_NO		0		/* no floating point */
-#define	FP_SOFT		1		/* software FP emulator */
-#define	FP_287		2		/* 80287 */
-#define	FP_387		3		/* 80387 or 80486 */
-#define FP_FXSR		4		/* Fast save/restore SIMD Extension */
-
-#endif	/* _I386_FP_SAVE_H_ */
diff --git a/i386/include/mach/i386/kern_return.h b/i386/include/mach/i386/kern_return.h
deleted file mode 100644
index a9df708..0000000
--- a/i386/include/mach/i386/kern_return.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-/*
- *	File:	kern_return.h
- *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
- *	Date:	1985
- *
- *	Machine-dependent kernel return definitions.
- */
-
-#ifndef	_MACH_I386_KERN_RETURN_H_
-#define _MACH_I386_KERN_RETURN_H_
-
-#ifndef	ASSEMBLER
-typedef	int		kern_return_t;
-#endif	/* ASSEMBLER */
-
-#endif	/* _MACH_I386_KERN_RETURN_H_ */
diff --git a/i386/include/mach/i386/machine_types.defs b/i386/include/mach/i386/machine_types.defs
deleted file mode 100644
index 6a35615..0000000
--- a/i386/include/mach/i386/machine_types.defs
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-/*
- *	Header file for basic, machine-dependent data types.  i386 version.
- */
-
-#ifndef	_MACHINE_VM_TYPES_DEFS_
-#define	_MACHINE_VM_TYPES_DEFS_	1
-
-type short = int16_t;
-type int = int32_t;
-type unsigned = uint32_t;
-
-type float = MACH_MSG_TYPE_REAL_32;
-type double = MACH_MSG_TYPE_REAL_64;
-
-
-/* from ISO/IEC 988:1999 spec */
-/* 7.18.1.4 Integer types capable of hgolding object pointers */
-/*
- * The [u]intptr_t types for the native
- * integer type, e.g. 32 or 64 or.. whatever
- * register size the machine has.  They are
- * used for entities that might be either
- * [unsigned] integers or pointers, and for
- * type-casting between the two.
- *
- * For instance, the IPC system represents
- * a port in user space as an integer and
- * in kernel space as a pointer.
- */
-#if defined(__LP64__)
-type uintptr_t = uint64_t;
-type intptr_t = int64_t;
-#else
-type uintptr_t = uint32_t;
-type intptr_t = int32_t;
-#endif
-
-/*
- * These are the legacy Mach types that are
- * the [rough] equivalents of the standards above.
- * They were defined in terms of int, not
- * long int, so they remain separate.
- */
-#if defined(__LP64__)
-type register_t = int64_t;
-#else
-type register_t = int32_t;
-#endif
-type integer_t = int32_t;
-type natural_t = uint32_t;
-
-/*
- * These are the VM types that scale with the address
- * space size of a given process.
- */
-
-#if defined(__LP64__)
-type vm_address_t = uint64_t;
-type vm_offset_t = uint64_t;
-type vm_size_t = uint64_t;
-#else
-type vm_address_t = natural_t;
-type vm_offset_t = natural_t;
-type vm_size_t = natural_t;
-#endif
-
-/*
- * The mach_vm_xxx_t types are sized to hold the
- * maximum pointer, offset, etc... supported on the
- * platform.
- */
-type mach_vm_address_t = uint64_t;
-type mach_vm_offset_t = uint64_t;
-type mach_vm_size_t = uint64_t;
-
-#if	MACH_IPC_COMPAT
-/*
- * For the old IPC interface
- */
-#define	MSG_TYPE_PORT_NAME	natural_t
-
-#endif	/* MACH_IPC_COMPAT */
-
-/*
- * These are types used internal to Mach to implement the
- * legacy 32-bit VM APIs published by the kernel.
- */
-#define	VM32_SUPPORT	1
-
-type vm32_address_t = uint32_t;
-type vm32_offset_t = uint32_t;
-type vm32_size_t = uint32_t;
-
-#endif	/* _MACHINE_VM_TYPES_DEFS_ */
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/i386/ndr_def.h b/i386/include/mach/i386/ndr_def.h
deleted file mode 100644
index 5163f63..0000000
--- a/i386/include/mach/i386/ndr_def.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-/* NDR record for Intel x86s */
-
-#include <mach/ndr.h>
-
-NDR_record_t NDR_record = {
-	0,			/* mig_reserved */
-	0,			/* mig_reserved */
-	0,			/* mig_reserved */
-	NDR_PROTOCOL_2_0,		
-	NDR_INT_LITTLE_ENDIAN,
-	NDR_CHAR_ASCII,
-	NDR_FLOAT_IEEE,
-	0,
-};
diff --git a/i386/include/mach/i386/processor_info.h b/i386/include/mach/i386/processor_info.h
deleted file mode 100644
index 8272c6d..0000000
--- a/i386/include/mach/i386/processor_info.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- *	File:	mach/i386/processor_info.h
- *
- *	Data structure definitions for i386 specific processor control
- */
-
-#ifndef	_MACH_I386_PROCESSOR_INFO_H_
-#define _MACH_I386_PROCESSOR_INFO_H_
-
-#endif	/* _MACH_I386_PROCESSOR_INFO_H_ */
diff --git a/i386/include/mach/i386/rpc.h b/i386/include/mach/i386/rpc.h
deleted file mode 100644
index 55561f9..0000000
--- a/i386/include/mach/i386/rpc.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2002,2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-#ifndef	_MACH_I386_RPC_H_
-#define	_MACH_I386_RPC_H_
-
-#endif	/* _MACH_I386_RPC_H_ */
-
diff --git a/i386/include/mach/i386/sdt_isa.h b/i386/include/mach/i386/sdt_isa.h
deleted file mode 100644
index 7934a2c..0000000
--- a/i386/include/mach/i386/sdt_isa.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _MACH_I386_SDT_ISA_H
-#define	_MACH_I386_SDT_ISA_H
-
-/*
- * Only define when testing.  This makes the calls into actual calls to
- * test functions.
- */
-/* #define DTRACE_CALL_TEST */
-
-#define DTRACE_STRINGIFY(s) #s
-#define DTRACE_TOSTRING(s) DTRACE_STRINGIFY(s)
-#define DTRACE_LABEL(p, n)									\
-	"__dtrace_probe$" DTRACE_TOSTRING(__LINE__) DTRACE_STRINGIFY(_##p##___##n) ":"	"\n\t"
-
-#ifdef DTRACE_CALL_TEST
-
-#define DTRACE_CALL(p,n)	\
-	DTRACE_LABEL(p,n)	\
-	DTRACE_CALL_INSN(p,n)
-
-#else
-
-#define DTRACE_CALL(p,n)	\
-	DTRACE_LABEL(p,n)	\
-	DTRACE_NOPS
-
-#endif
-
-#ifdef __x86_64__
-
-#define DTRACE_NOPS			\
-	"nop"			"\n\t"	\
-	"nop"			"\n\t"	\
-	"nop"			"\n\t"	
-
-#define DTRACE_CALL_INSN(p,n)						\
-	"call _dtracetest" DTRACE_STRINGIFY(_##p##_##n)	"\n\t"
-
-#define ARG1_EXTENT	1
-#define ARGS2_EXTENT	2
-#define ARGS3_EXTENT	3
-#define ARGS4_EXTENT	4
-#define ARGS5_EXTENT	5
-#define ARGS6_EXTENT	6
-#define ARGS7_EXTENT	7
-#define ARGS8_EXTENT	8
-#define ARGS9_EXTENT	10	
-#define ARGS10_EXTENT	10	
-
-#define DTRACE_CALL0ARGS(provider, name)							\
-	asm volatile (										\
-		      DTRACE_CALL(provider, name)						\
-	);
-
-#define DTRACE_CALL1ARG(provider, name)								\
-	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
-		      DTRACE_CALL(provider, name)						\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "rdi"								\
-	);
-
-#define DTRACE_CALL2ARGS(provider, name)							\
-	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
-	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
-		      DTRACE_CALL(provider, name)						\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "rdi", "rsi"							\
-	);
-
-#define DTRACE_CALL3ARGS(provider, name)							\
-	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
-	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
-	              "movq\t0x10(%0),%%rdx"						"\n\t"	\
-		      DTRACE_CALL(provider, name)						\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "rdi", "rsi", "rdx"						\
-	);
-
-#define DTRACE_CALL4ARGS(provider, name)							\
-	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
-	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
-	              "movq\t0x10(%0),%%rdx"						"\n\t"	\
-	              "movq\t0x18(%0),%%rcx"						"\n\t"	\
-		      DTRACE_CALL(provider, name)						\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "rdi", "rsi", "rdx", "rcx"					\
-	);
-
-#define DTRACE_CALL5ARGS(provider, name)							\
-	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
-	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
-	              "movq\t0x10(%0),%%rdx"						"\n\t"	\
-	              "movq\t0x18(%0),%%rcx"						"\n\t"	\
-	              "movq\t0x20(%0),%%r8"						"\n\t"	\
-		      DTRACE_CALL(provider, name)						\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "rdi", "rsi", "rdx", "rcx", "r8"				\
-	);
-
-#define DTRACE_CALL6ARGS(provider, name)							\
-	asm volatile ("movq\t0x0(%0),%%rdi"						"\n\t"	\
-	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
-	              "movq\t0x10(%0),%%rdx"						"\n\t"	\
-	              "movq\t0x18(%0),%%rcx"						"\n\t"	\
-	              "movq\t0x20(%0),%%r8"						"\n\t"	\
-	              "movq\t0x28(%0),%%r9"						"\n\t"	\
-		      DTRACE_CALL(provider, name)						\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "rdi", "rsi", "rdx", "rcx", "r8", "r9"			\
-	);
-
-#define DTRACE_CALL7ARGS(provider, name)							\
-	asm volatile ("subq\t$0x8,%%rsp"						"\n\t"	\
-	              "movq\t0x0(%0),%%rdi"						"\n\t"	\
-	              "movq\t0x8(%0),%%rsi"						"\n\t"	\
-	              "movq\t0x10(%0),%%rdx"						"\n\t"	\
-	              "movq\t0x18(%0),%%rcx"						"\n\t"	\
-	              "movq\t0x20(%0),%%r8"						"\n\t"	\
-	              "movq\t0x28(%0),%%r9"						"\n\t"	\
-	              "movq\t0x30(%0),%%rax"						"\n\t"	\
-	              "movq\t%%rax,0x0(%%rsp)"						"\n\t"	\
-		      DTRACE_CALL(provider, name)						\
-	              "addq\t$0x8,%%rsp"						"\n\t"	\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "rax"			\
-	);
-
-#endif // __x86_64__
-
-#ifdef __i386__
-
-#define DTRACE_NOPS			\
-	"nop"			"\n\t"	\
-	"leal 0(%%esi), %%esi"	"\n\t"	
-
-#define DTRACE_CALL_INSN(p,n)						\
-	"call _dtracetest" DTRACE_STRINGIFY(_##p##_##n)	"\n\t"
-
-#define ARG1_EXTENT	1
-#define ARGS2_EXTENT	2
-#define ARGS3_EXTENT	4
-#define ARGS4_EXTENT	4
-#define ARGS5_EXTENT	8
-#define ARGS6_EXTENT	8
-#define ARGS7_EXTENT	8
-#define ARGS8_EXTENT	8
-#define ARGS9_EXTENT	12	
-#define ARGS10_EXTENT	12	
-
-/*
- * Because this code is used in the kernel, we must not touch any floating point
- * or specialized registers. This leaves the following registers:
- *
- * eax ; volatile, safe to use
- * ebx ; PIC register, gcc error when used
- * ecx ; volatile, safe to use
- * edx ; volatile, safe to use
- * esi ; non-volatile, otherwise safe to use
- * edi ; non-volatile, otherwise safe to use
- *
- * Using any of the non volatile register causes a spill to stack which is almost
- * certainly a net performance loss. Also, note that the array ref (__dtrace_args)
- * consumes one free register. If all three of the volatile regs are used for load/store,
- * the compiler will spill a register to hold the array ref.
- *
- * The end result is that we only pipeline two loads/stores at a time. Blech.
- */
-
-#define DTRACE_CALL0ARGS(provider, name)							\
-	asm volatile (										\
-	              DTRACE_CALL(provider, name)						\
-	              "# eat trailing nl +tabfrom DTRACE_CALL"					\
-	              :										\
-	              :										\
-	);
-
-#define DTRACE_CALL1ARG(provider, name)								\
-	asm volatile ("subl\t$0x10,%%esp"						"\n\t"	\
-	              "movl\t0x0(%0),%%eax"						"\n\t"	\
-	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
-	              DTRACE_CALL(provider, name)						\
-                      "addl\t$0x10,%%esp"							\
-	              :										\
-	              : "r" (__dtrace_args)		       					\
-	              : "memory", "eax"								\
-	);
-
-#define DTRACE_CALL2ARGS(provider, name)							\
-	asm volatile ("subl\t$0x10,%%esp"						"\n\t"	\
-	              "movl\t0x0(%0),%%eax"						"\n\t"	\
-		      "movl\t0x4(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
-	              DTRACE_CALL(provider, name)						\
-                      "addl\t$0x10,%%esp"							\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "eax", "edx"							\
-	);
-
-#define DTRACE_CALL3ARGS(provider, name)							\
-	asm volatile ("subl\t$0x10,%%esp"						"\n\t"	\
-	              "movl\t0x0(%0),%%eax"						"\n\t"	\
-		      "movl\t0x4(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
-	              "movl\t0x8(%0),%%eax"						"\n\t"	\
-	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
-	              DTRACE_CALL(provider, name)						\
-                      "addl\t$0x10,%%esp"							\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "eax", "edx"							\
-	);
-
-#define DTRACE_CALL4ARGS(provider, name)							\
-	asm volatile ("subl\t$0x10,%%esp"						"\n\t"	\
-	              "movl\t0x0(%0),%%eax"						"\n\t"	\
-		      "movl\t0x4(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
-	              "movl\t0x8(%0),%%eax"						"\n\t"	\
-		      "movl\t0xC(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
-	              DTRACE_CALL(provider, name)						\
-                      "addl\t$0x10,%%esp"							\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "eax", "edx"	       						\
-	);
-
-#define DTRACE_CALL5ARGS(provider, name)							\
-	asm volatile ("subl\t$0x20,%%esp"						"\n\t"	\
-	              "movl\t0x0(%0),%%eax"						"\n\t"	\
-		      "movl\t0x4(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
-	              "movl\t0x8(%0),%%eax"						"\n\t"	\
-		      "movl\t0xC(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
-	              "movl\t0x10(%0),%%eax"						"\n\t"	\
-	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
-	              DTRACE_CALL(provider, name)						\
-                      "addl\t$0x20,%%esp"							\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "eax", "edx"	       						\
-	);
-
-#define DTRACE_CALL6ARGS(provider, name)							\
-	asm volatile ("subl\t$0x20,%%esp"						"\n\t"	\
-	              "movl\t0x0(%0),%%eax"						"\n\t"	\
-		      "movl\t0x4(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
-	              "movl\t0x8(%0),%%eax"						"\n\t"	\
-		      "movl\t0xC(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
-	              "movl\t0x10(%0),%%eax"						"\n\t"	\
-		      "movl\t0x14(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x14(%%esp)"						"\n\t"	\
-	              DTRACE_CALL(provider, name)						\
-                      "addl\t$0x20,%%esp"							\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "eax", "edx"	       						\
-	);
-
-#define DTRACE_CALL7ARGS(provider, name)							\
-	asm volatile ("subl\t$0x20,%%esp"						"\n\t"	\
-	              "movl\t0x0(%0),%%eax"						"\n\t"	\
-		      "movl\t0x4(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
-	              "movl\t0x8(%0),%%eax"						"\n\t"	\
-		      "movl\t0xC(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
-	              "movl\t0x10(%0),%%eax"						"\n\t"	\
-		      "movl\t0x14(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x14(%%esp)"						"\n\t"	\
-	              "movl\t0x18(%0),%%eax"						"\n\t"	\
-	              "movl\t%%eax,0x18(%%esp)"						"\n\t"	\
-	              DTRACE_CALL(provider, name)						\
-                      "addl\t$0x20,%%esp"							\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "eax", "edx"	       						\
-	);
-
-#define DTRACE_CALL8ARGS(provider, name)							\
-	asm volatile ("subl\t$0x20,%%esp"						"\n\t"	\
-	              "movl\t0x0(%0),%%eax"						"\n\t"	\
-		      "movl\t0x4(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
-	              "movl\t0x8(%0),%%eax"						"\n\t"	\
-		      "movl\t0xC(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
-	              "movl\t0x10(%0),%%eax"						"\n\t"	\
-		      "movl\t0x14(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x14(%%esp)"						"\n\t"	\
-	              "movl\t0x18(%0),%%eax"						"\n\t"	\
-		      "movl\t0x1C(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x18(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x1C(%%esp)"						"\n\t"	\
-	              DTRACE_CALL(provider, name)						\
-                      "addl\t$0x20,%%esp"							\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "eax", "edx"	       						\
-	);
-
-#define DTRACE_CALL9ARGS(provider, name)							\
-	asm volatile ("subl\t$0x30,%%esp"						"\n\t"	\
-	              "movl\t0x0(%0),%%eax"						"\n\t"	\
-		      "movl\t0x4(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
-	              "movl\t0x8(%0),%%eax"						"\n\t"	\
-		      "movl\t0xC(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
-	              "movl\t0x10(%0),%%eax"						"\n\t"	\
-		      "movl\t0x14(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x14(%%esp)"						"\n\t"	\
-	              "movl\t0x18(%0),%%eax"						"\n\t"	\
-		      "movl\t0x1C(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x18(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x1C(%%esp)"						"\n\t"	\
-	              "movl\t0x20(%0),%%eax"						"\n\t"	\
-	              "movl\t%%eax,0x20(%%esp)"						"\n\t"	\
-	              DTRACE_CALL(provider, name)						\
-                      "addl\t$0x30,%%esp"							\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "eax", "edx"	       						\
-	);
-
-#define DTRACE_CALL10ARGS(provider, name)							\
-	asm volatile ("subl\t$0x30,%%esp"						"\n\t"	\
-	              "movl\t0x0(%0),%%eax"						"\n\t"	\
-		      "movl\t0x4(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x0(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x4(%%esp)"						"\n\t"	\
-	              "movl\t0x8(%0),%%eax"						"\n\t"	\
-		      "movl\t0xC(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x8(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0xC(%%esp)"						"\n\t"	\
-	              "movl\t0x10(%0),%%eax"						"\n\t"	\
-		      "movl\t0x14(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x10(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x14(%%esp)"						"\n\t"	\
-	              "movl\t0x18(%0),%%eax"						"\n\t"	\
-		      "movl\t0x1C(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x18(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x1C(%%esp)"						"\n\t"	\
-	              "movl\t0x20(%0),%%eax"						"\n\t"	\
-		      "movl\t0x24(%0),%%edx"						"\n\t"	\
-	              "movl\t%%eax,0x20(%%esp)"						"\n\t"	\
-	              "movl\t%%edx,0x24(%%esp)"						"\n\t"	\
-	              DTRACE_CALL(provider, name)						\
-                      "addl\t$0x30,%%esp"							\
-	              :										\
-	              : "r" (__dtrace_args)							\
-	              : "memory", "eax", "edx"	       						\
-	);
-
-#endif // __i386__
-
-#endif	/* _MACH_I386_SDT_ISA_H */
diff --git a/i386/include/mach/i386/task.h b/i386/include/mach/i386/task.h
deleted file mode 100644
index 15c8248..0000000
--- a/i386/include/mach/i386/task.h
+++ /dev/null
@@ -1,1578 +0,0 @@
-#ifndef	_task_user_
-#define	_task_user_
-
-/* Module task */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	task_MSG_COUNT
-#define	task_MSG_COUNT	35
-#endif	/* task_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine task_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_create
-(
-	task_t target_task,
-	ledger_array_t ledgers,
-	mach_msg_type_number_t ledgersCnt,
-	boolean_t inherit_memory,
-	task_t *child_task
-);
-
-/* Routine task_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_terminate
-(
-	task_t target_task
-);
-
-/* Routine task_threads */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_threads
-(
-	task_t target_task,
-	thread_act_array_t *act_list,
-	mach_msg_type_number_t *act_listCnt
-);
-
-/* Routine mach_ports_register */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_ports_register
-(
-	task_t target_task,
-	mach_port_array_t init_port_set,
-	mach_msg_type_number_t init_port_setCnt
-);
-
-/* Routine mach_ports_lookup */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_ports_lookup
-(
-	task_t target_task,
-	mach_port_array_t *init_port_set,
-	mach_msg_type_number_t *init_port_setCnt
-);
-
-/* Routine task_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_info
-(
-	task_name_t target_task,
-	task_flavor_t flavor,
-	task_info_t task_info_out,
-	mach_msg_type_number_t *task_info_outCnt
-);
-
-/* Routine task_set_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_info
-(
-	task_t target_task,
-	task_flavor_t flavor,
-	task_info_t task_info_in,
-	mach_msg_type_number_t task_info_inCnt
-);
-
-/* Routine task_suspend */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_suspend
-(
-	task_t target_task
-);
-
-/* Routine task_resume */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_resume
-(
-	task_t target_task
-);
-
-/* Routine task_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_special_port
-(
-	task_t task,
-	int which_port,
-	mach_port_t *special_port
-);
-
-/* Routine task_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_special_port
-(
-	task_t task,
-	int which_port,
-	mach_port_t special_port
-);
-
-/* Routine thread_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_create
-(
-	task_t parent_task,
-	thread_act_t *child_act
-);
-
-/* Routine thread_create_running */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_create_running
-(
-	task_t parent_task,
-	thread_state_flavor_t flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt,
-	thread_act_t *child_act
-);
-
-/* Routine task_set_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_exception_ports
-(
-	task_t task,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor
-);
-
-/* Routine task_get_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_exception_ports
-(
-	task_t task,
-	exception_mask_t exception_mask,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlers,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine task_swap_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_swap_exception_ports
-(
-	task_t task,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlerss,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine lock_set_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_set_create
-(
-	task_t task,
-	lock_set_t *new_lock_set,
-	int n_ulocks,
-	int policy
-);
-
-/* Routine lock_set_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_set_destroy
-(
-	task_t task,
-	lock_set_t lock_set
-);
-
-/* Routine semaphore_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t semaphore_create
-(
-	task_t task,
-	semaphore_t *semaphore,
-	int policy,
-	int value
-);
-
-/* Routine semaphore_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t semaphore_destroy
-(
-	task_t task,
-	semaphore_t semaphore
-);
-
-/* Routine task_policy_set */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_policy_set
-(
-	task_t task,
-	task_policy_flavor_t flavor,
-	task_policy_t policy_info,
-	mach_msg_type_number_t policy_infoCnt
-);
-
-/* Routine task_policy_get */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_policy_get
-(
-	task_t task,
-	task_policy_flavor_t flavor,
-	task_policy_t policy_info,
-	mach_msg_type_number_t *policy_infoCnt,
-	boolean_t *get_default
-);
-
-/* Routine task_sample */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_sample
-(
-	task_t task,
-	mach_port_t reply
-);
-
-/* Routine task_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_policy
-(
-	task_t task,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	boolean_t set_limit,
-	boolean_t change
-);
-
-/* Routine task_set_emulation */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_emulation
-(
-	task_t target_port,
-	vm_address_t routine_entry_pt,
-	int routine_number
-);
-
-/* Routine task_get_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_emulation_vector
-(
-	task_t task,
-	int *vector_start,
-	emulation_vector_t *emulation_vector,
-	mach_msg_type_number_t *emulation_vectorCnt
-);
-
-/* Routine task_set_emulation_vector */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_emulation_vector
-(
-	task_t task,
-	int vector_start,
-	emulation_vector_t emulation_vector,
-	mach_msg_type_number_t emulation_vectorCnt
-);
-
-/* Routine task_set_ras_pc */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_ras_pc
-(
-	task_t target_task,
-	vm_address_t basepc,
-	vm_address_t boundspc
-);
-
-/* Routine task_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_assign
-(
-	task_t task,
-	processor_set_t new_set,
-	boolean_t assign_threads
-);
-
-/* Routine task_assign_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_assign_default
-(
-	task_t task,
-	boolean_t assign_threads
-);
-
-/* Routine task_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_assignment
-(
-	task_t task,
-	processor_set_name_t *assigned_set
-);
-
-/* Routine task_set_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_policy
-(
-	task_t task,
-	processor_set_t pset,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	policy_limit_t limit,
-	mach_msg_type_number_t limitCnt,
-	boolean_t change
-);
-
-/* Routine task_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_get_state
-(
-	task_t task,
-	thread_state_flavor_t flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-
-/* Routine task_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_state
-(
-	task_t task,
-	thread_state_flavor_t flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__task_subsystem__defined
-#define __Request__task_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t ledgers;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t ledgersCnt;
-		boolean_t inherit_memory;
-	} __Request__task_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_threads_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t init_port_set;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t init_port_setCnt;
-	} __Request__mach_ports_register_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__mach_ports_lookup_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_flavor_t flavor;
-		mach_msg_type_number_t task_info_outCnt;
-	} __Request__task_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_flavor_t flavor;
-		mach_msg_type_number_t task_info_inCnt;
-		integer_t task_info_in[10];
-	} __Request__task_set_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__task_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__task_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__thread_create_running_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__task_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-	} __Request__task_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__task_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int n_ulocks;
-		int policy;
-	} __Request__lock_set_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t lock_set;
-		/* end of the kernel processed data */
-	} __Request__lock_set_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int policy;
-		int value;
-	} __Request__semaphore_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t semaphore;
-		/* end of the kernel processed data */
-	} __Request__semaphore_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-	} __Request__task_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		task_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		boolean_t get_default;
-	} __Request__task_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t reply;
-		/* end of the kernel processed data */
-	} __Request__task_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		boolean_t set_limit;
-		boolean_t change;
-	} __Request__task_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t routine_entry_pt;
-		int routine_number;
-	} __Request__task_set_emulation_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_get_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t emulation_vector;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int vector_start;
-		mach_msg_type_number_t emulation_vectorCnt;
-	} __Request__task_set_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t basepc;
-		vm_address_t boundspc;
-	} __Request__task_set_ras_pc_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_set;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		boolean_t assign_threads;
-	} __Request__task_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		boolean_t assign_threads;
-	} __Request__task_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__task_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t pset;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		mach_msg_type_number_t limitCnt;
-		integer_t limit[1];
-		boolean_t change;
-	} __Request__task_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t old_stateCnt;
-	} __Request__task_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__task_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__task_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__task_subsystem__defined
-#define __RequestUnion__task_subsystem__defined
-union __RequestUnion__task_subsystem {
-	__Request__task_create_t Request_task_create;
-	__Request__task_terminate_t Request_task_terminate;
-	__Request__task_threads_t Request_task_threads;
-	__Request__mach_ports_register_t Request_mach_ports_register;
-	__Request__mach_ports_lookup_t Request_mach_ports_lookup;
-	__Request__task_info_t Request_task_info;
-	__Request__task_set_info_t Request_task_set_info;
-	__Request__task_suspend_t Request_task_suspend;
-	__Request__task_resume_t Request_task_resume;
-	__Request__task_get_special_port_t Request_task_get_special_port;
-	__Request__task_set_special_port_t Request_task_set_special_port;
-	__Request__thread_create_t Request_thread_create;
-	__Request__thread_create_running_t Request_thread_create_running;
-	__Request__task_set_exception_ports_t Request_task_set_exception_ports;
-	__Request__task_get_exception_ports_t Request_task_get_exception_ports;
-	__Request__task_swap_exception_ports_t Request_task_swap_exception_ports;
-	__Request__lock_set_create_t Request_lock_set_create;
-	__Request__lock_set_destroy_t Request_lock_set_destroy;
-	__Request__semaphore_create_t Request_semaphore_create;
-	__Request__semaphore_destroy_t Request_semaphore_destroy;
-	__Request__task_policy_set_t Request_task_policy_set;
-	__Request__task_policy_get_t Request_task_policy_get;
-	__Request__task_sample_t Request_task_sample;
-	__Request__task_policy_t Request_task_policy;
-	__Request__task_set_emulation_t Request_task_set_emulation;
-	__Request__task_get_emulation_vector_t Request_task_get_emulation_vector;
-	__Request__task_set_emulation_vector_t Request_task_set_emulation_vector;
-	__Request__task_set_ras_pc_t Request_task_set_ras_pc;
-	__Request__task_assign_t Request_task_assign;
-	__Request__task_assign_default_t Request_task_assign_default;
-	__Request__task_get_assignment_t Request_task_get_assignment;
-	__Request__task_set_policy_t Request_task_set_policy;
-	__Request__task_get_state_t Request_task_get_state;
-	__Request__task_set_state_t Request_task_set_state;
-};
-#endif /* !__RequestUnion__task_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__task_subsystem__defined
-#define __Reply__task_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_task;
-		/* end of the kernel processed data */
-	} __Reply__task_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t act_list;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t act_listCnt;
-	} __Reply__task_threads_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_ports_register_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t init_port_set;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t init_port_setCnt;
-	} __Reply__mach_ports_lookup_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t task_info_outCnt;
-		integer_t task_info_out[10];
-	} __Reply__task_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-	} __Reply__task_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_act;
-		/* end of the kernel processed data */
-	} __Reply__thread_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_act;
-		/* end of the kernel processed data */
-	} __Reply__thread_create_running_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlers[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__task_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlerss[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__task_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_lock_set;
-		/* end of the kernel processed data */
-	} __Reply__lock_set_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__lock_set_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t semaphore;
-		/* end of the kernel processed data */
-	} __Reply__semaphore_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__semaphore_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-		boolean_t get_default;
-	} __Reply__task_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_emulation_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t emulation_vector;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int vector_start;
-		mach_msg_type_number_t emulation_vectorCnt;
-	} __Reply__task_get_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_emulation_vector_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_ras_pc_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t assigned_set;
-		/* end of the kernel processed data */
-	} __Reply__task_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Reply__task_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__task_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__task_subsystem__defined
-#define __ReplyUnion__task_subsystem__defined
-union __ReplyUnion__task_subsystem {
-	__Reply__task_create_t Reply_task_create;
-	__Reply__task_terminate_t Reply_task_terminate;
-	__Reply__task_threads_t Reply_task_threads;
-	__Reply__mach_ports_register_t Reply_mach_ports_register;
-	__Reply__mach_ports_lookup_t Reply_mach_ports_lookup;
-	__Reply__task_info_t Reply_task_info;
-	__Reply__task_set_info_t Reply_task_set_info;
-	__Reply__task_suspend_t Reply_task_suspend;
-	__Reply__task_resume_t Reply_task_resume;
-	__Reply__task_get_special_port_t Reply_task_get_special_port;
-	__Reply__task_set_special_port_t Reply_task_set_special_port;
-	__Reply__thread_create_t Reply_thread_create;
-	__Reply__thread_create_running_t Reply_thread_create_running;
-	__Reply__task_set_exception_ports_t Reply_task_set_exception_ports;
-	__Reply__task_get_exception_ports_t Reply_task_get_exception_ports;
-	__Reply__task_swap_exception_ports_t Reply_task_swap_exception_ports;
-	__Reply__lock_set_create_t Reply_lock_set_create;
-	__Reply__lock_set_destroy_t Reply_lock_set_destroy;
-	__Reply__semaphore_create_t Reply_semaphore_create;
-	__Reply__semaphore_destroy_t Reply_semaphore_destroy;
-	__Reply__task_policy_set_t Reply_task_policy_set;
-	__Reply__task_policy_get_t Reply_task_policy_get;
-	__Reply__task_sample_t Reply_task_sample;
-	__Reply__task_policy_t Reply_task_policy;
-	__Reply__task_set_emulation_t Reply_task_set_emulation;
-	__Reply__task_get_emulation_vector_t Reply_task_get_emulation_vector;
-	__Reply__task_set_emulation_vector_t Reply_task_set_emulation_vector;
-	__Reply__task_set_ras_pc_t Reply_task_set_ras_pc;
-	__Reply__task_assign_t Reply_task_assign;
-	__Reply__task_assign_default_t Reply_task_assign_default;
-	__Reply__task_get_assignment_t Reply_task_get_assignment;
-	__Reply__task_set_policy_t Reply_task_set_policy;
-	__Reply__task_get_state_t Reply_task_get_state;
-	__Reply__task_set_state_t Reply_task_set_state;
-};
-#endif /* !__RequestUnion__task_subsystem__defined */
-
-#ifndef subsystem_to_name_map_task
-#define subsystem_to_name_map_task \
-    { "task_create", 3400 },\
-    { "task_terminate", 3401 },\
-    { "task_threads", 3402 },\
-    { "mach_ports_register", 3403 },\
-    { "mach_ports_lookup", 3404 },\
-    { "task_info", 3405 },\
-    { "task_set_info", 3406 },\
-    { "task_suspend", 3407 },\
-    { "task_resume", 3408 },\
-    { "task_get_special_port", 3409 },\
-    { "task_set_special_port", 3410 },\
-    { "thread_create", 3411 },\
-    { "thread_create_running", 3412 },\
-    { "task_set_exception_ports", 3413 },\
-    { "task_get_exception_ports", 3414 },\
-    { "task_swap_exception_ports", 3415 },\
-    { "lock_set_create", 3416 },\
-    { "lock_set_destroy", 3417 },\
-    { "semaphore_create", 3418 },\
-    { "semaphore_destroy", 3419 },\
-    { "task_policy_set", 3420 },\
-    { "task_policy_get", 3421 },\
-    { "task_sample", 3422 },\
-    { "task_policy", 3423 },\
-    { "task_set_emulation", 3424 },\
-    { "task_get_emulation_vector", 3425 },\
-    { "task_set_emulation_vector", 3426 },\
-    { "task_set_ras_pc", 3427 },\
-    { "task_assign", 3429 },\
-    { "task_assign_default", 3430 },\
-    { "task_get_assignment", 3431 },\
-    { "task_set_policy", 3432 },\
-    { "task_get_state", 3433 },\
-    { "task_set_state", 3434 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _task_user_ */
diff --git a/i386/include/mach/i386/thread_act.h b/i386/include/mach/i386/thread_act.h
deleted file mode 100644
index fde4189..0000000
--- a/i386/include/mach/i386/thread_act.h
+++ /dev/null
@@ -1,1155 +0,0 @@
-#ifndef	_thread_act_user_
-#define	_thread_act_user_
-
-/* Module thread_act */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	thread_act_MSG_COUNT
-#define	thread_act_MSG_COUNT	25
-#endif	/* thread_act_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine thread_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_terminate
-(
-	thread_act_t target_act
-);
-
-/* Routine act_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t act_get_state
-(
-	thread_act_t target_act,
-	int flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-
-/* Routine act_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t act_set_state
-(
-	thread_act_t target_act,
-	int flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-
-/* Routine thread_get_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_state
-(
-	thread_act_t target_act,
-	thread_state_flavor_t flavor,
-	thread_state_t old_state,
-	mach_msg_type_number_t *old_stateCnt
-);
-
-/* Routine thread_set_state */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_state
-(
-	thread_act_t target_act,
-	thread_state_flavor_t flavor,
-	thread_state_t new_state,
-	mach_msg_type_number_t new_stateCnt
-);
-
-/* Routine thread_suspend */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_suspend
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_resume */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_resume
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_abort */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_abort
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_abort_safely */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_abort_safely
-(
-	thread_act_t target_act
-);
-
-/* Routine thread_depress_abort */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_depress_abort
-(
-	thread_act_t thread
-);
-
-/* Routine thread_get_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_special_port
-(
-	thread_act_t thr_act,
-	int which_port,
-	mach_port_t *special_port
-);
-
-/* Routine thread_set_special_port */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_special_port
-(
-	thread_act_t thr_act,
-	int which_port,
-	mach_port_t special_port
-);
-
-/* Routine thread_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_info
-(
-	thread_act_t target_act,
-	thread_flavor_t flavor,
-	thread_info_t thread_info_out,
-	mach_msg_type_number_t *thread_info_outCnt
-);
-
-/* Routine thread_set_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_exception_ports
-(
-	thread_act_t thread,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor
-);
-
-/* Routine thread_get_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_exception_ports
-(
-	thread_act_t thread,
-	exception_mask_t exception_mask,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlers,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine thread_swap_exception_ports */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_swap_exception_ports
-(
-	thread_act_t thread,
-	exception_mask_t exception_mask,
-	mach_port_t new_port,
-	exception_behavior_t behavior,
-	thread_state_flavor_t new_flavor,
-	exception_mask_array_t masks,
-	mach_msg_type_number_t *masksCnt,
-	exception_handler_array_t old_handlers,
-	exception_behavior_array_t old_behaviors,
-	exception_flavor_array_t old_flavors
-);
-
-/* Routine thread_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_policy
-(
-	thread_act_t thr_act,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	boolean_t set_limit
-);
-
-/* Routine thread_policy_set */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_policy_set
-(
-	thread_act_t thread,
-	thread_policy_flavor_t flavor,
-	thread_policy_t policy_info,
-	mach_msg_type_number_t policy_infoCnt
-);
-
-/* Routine thread_policy_get */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_policy_get
-(
-	thread_act_t thread,
-	thread_policy_flavor_t flavor,
-	thread_policy_t policy_info,
-	mach_msg_type_number_t *policy_infoCnt,
-	boolean_t *get_default
-);
-
-/* Routine thread_sample */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_sample
-(
-	thread_act_t thread,
-	mach_port_t reply
-);
-
-/* Routine etap_trace_thread */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t etap_trace_thread
-(
-	thread_act_t target_act,
-	boolean_t trace_status
-);
-
-/* Routine thread_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_assign
-(
-	thread_act_t thread,
-	processor_set_t new_set
-);
-
-/* Routine thread_assign_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_assign_default
-(
-	thread_act_t thread
-);
-
-/* Routine thread_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_get_assignment
-(
-	thread_act_t thread,
-	processor_set_name_t *assigned_set
-);
-
-/* Routine thread_set_policy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t thread_set_policy
-(
-	thread_act_t thr_act,
-	processor_set_t pset,
-	policy_t policy,
-	policy_base_t base,
-	mach_msg_type_number_t baseCnt,
-	policy_limit_t limit,
-	mach_msg_type_number_t limitCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__thread_act_subsystem__defined
-#define __Request__thread_act_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int flavor;
-		mach_msg_type_number_t old_stateCnt;
-	} __Request__act_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__act_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t old_stateCnt;
-	} __Request__thread_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_state_flavor_t flavor;
-		mach_msg_type_number_t new_stateCnt;
-		natural_t new_state[144];
-	} __Request__thread_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_abort_safely_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_depress_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__thread_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		int which_port;
-	} __Request__thread_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_flavor_t flavor;
-		mach_msg_type_number_t thread_info_outCnt;
-	} __Request__thread_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__thread_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-	} __Request__thread_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		exception_mask_t exception_mask;
-		exception_behavior_t behavior;
-		thread_state_flavor_t new_flavor;
-	} __Request__thread_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		boolean_t set_limit;
-	} __Request__thread_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-	} __Request__thread_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		thread_policy_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		boolean_t get_default;
-	} __Request__thread_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t reply;
-		/* end of the kernel processed data */
-	} __Request__thread_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		boolean_t trace_status;
-	} __Request__etap_trace_thread_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_set;
-		/* end of the kernel processed data */
-	} __Request__thread_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__thread_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t pset;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		policy_t policy;
-		mach_msg_type_number_t baseCnt;
-		integer_t base[5];
-		mach_msg_type_number_t limitCnt;
-		integer_t limit[1];
-	} __Request__thread_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__thread_act_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__thread_act_subsystem__defined
-#define __RequestUnion__thread_act_subsystem__defined
-union __RequestUnion__thread_act_subsystem {
-	__Request__thread_terminate_t Request_thread_terminate;
-	__Request__act_get_state_t Request_act_get_state;
-	__Request__act_set_state_t Request_act_set_state;
-	__Request__thread_get_state_t Request_thread_get_state;
-	__Request__thread_set_state_t Request_thread_set_state;
-	__Request__thread_suspend_t Request_thread_suspend;
-	__Request__thread_resume_t Request_thread_resume;
-	__Request__thread_abort_t Request_thread_abort;
-	__Request__thread_abort_safely_t Request_thread_abort_safely;
-	__Request__thread_depress_abort_t Request_thread_depress_abort;
-	__Request__thread_get_special_port_t Request_thread_get_special_port;
-	__Request__thread_set_special_port_t Request_thread_set_special_port;
-	__Request__thread_info_t Request_thread_info;
-	__Request__thread_set_exception_ports_t Request_thread_set_exception_ports;
-	__Request__thread_get_exception_ports_t Request_thread_get_exception_ports;
-	__Request__thread_swap_exception_ports_t Request_thread_swap_exception_ports;
-	__Request__thread_policy_t Request_thread_policy;
-	__Request__thread_policy_set_t Request_thread_policy_set;
-	__Request__thread_policy_get_t Request_thread_policy_get;
-	__Request__thread_sample_t Request_thread_sample;
-	__Request__etap_trace_thread_t Request_etap_trace_thread;
-	__Request__thread_assign_t Request_thread_assign;
-	__Request__thread_assign_default_t Request_thread_assign_default;
-	__Request__thread_get_assignment_t Request_thread_get_assignment;
-	__Request__thread_set_policy_t Request_thread_set_policy;
-};
-#endif /* !__RequestUnion__thread_act_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__thread_act_subsystem__defined
-#define __Reply__thread_act_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Reply__act_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__act_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t old_stateCnt;
-		natural_t old_state[144];
-	} __Reply__thread_get_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_state_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_suspend_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_resume_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_abort_safely_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_depress_abort_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t special_port;
-		/* end of the kernel processed data */
-	} __Reply__thread_get_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_special_port_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t thread_info_outCnt;
-		integer_t thread_info_out[12];
-	} __Reply__thread_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlers[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__thread_get_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t old_handlers[32];
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t masksCnt;
-		exception_mask_t masks[32];
-		exception_behavior_t old_behaviors[32];
-		thread_state_flavor_t old_flavors[32];
-	} __Reply__thread_swap_exception_ports_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_policy_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[16];
-		boolean_t get_default;
-	} __Reply__thread_policy_get_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_sample_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__etap_trace_thread_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_assign_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t assigned_set;
-		/* end of the kernel processed data */
-	} __Reply__thread_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__thread_set_policy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__thread_act_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__thread_act_subsystem__defined
-#define __ReplyUnion__thread_act_subsystem__defined
-union __ReplyUnion__thread_act_subsystem {
-	__Reply__thread_terminate_t Reply_thread_terminate;
-	__Reply__act_get_state_t Reply_act_get_state;
-	__Reply__act_set_state_t Reply_act_set_state;
-	__Reply__thread_get_state_t Reply_thread_get_state;
-	__Reply__thread_set_state_t Reply_thread_set_state;
-	__Reply__thread_suspend_t Reply_thread_suspend;
-	__Reply__thread_resume_t Reply_thread_resume;
-	__Reply__thread_abort_t Reply_thread_abort;
-	__Reply__thread_abort_safely_t Reply_thread_abort_safely;
-	__Reply__thread_depress_abort_t Reply_thread_depress_abort;
-	__Reply__thread_get_special_port_t Reply_thread_get_special_port;
-	__Reply__thread_set_special_port_t Reply_thread_set_special_port;
-	__Reply__thread_info_t Reply_thread_info;
-	__Reply__thread_set_exception_ports_t Reply_thread_set_exception_ports;
-	__Reply__thread_get_exception_ports_t Reply_thread_get_exception_ports;
-	__Reply__thread_swap_exception_ports_t Reply_thread_swap_exception_ports;
-	__Reply__thread_policy_t Reply_thread_policy;
-	__Reply__thread_policy_set_t Reply_thread_policy_set;
-	__Reply__thread_policy_get_t Reply_thread_policy_get;
-	__Reply__thread_sample_t Reply_thread_sample;
-	__Reply__etap_trace_thread_t Reply_etap_trace_thread;
-	__Reply__thread_assign_t Reply_thread_assign;
-	__Reply__thread_assign_default_t Reply_thread_assign_default;
-	__Reply__thread_get_assignment_t Reply_thread_get_assignment;
-	__Reply__thread_set_policy_t Reply_thread_set_policy;
-};
-#endif /* !__RequestUnion__thread_act_subsystem__defined */
-
-#ifndef subsystem_to_name_map_thread_act
-#define subsystem_to_name_map_thread_act \
-    { "thread_terminate", 3600 },\
-    { "act_get_state", 3601 },\
-    { "act_set_state", 3602 },\
-    { "thread_get_state", 3603 },\
-    { "thread_set_state", 3604 },\
-    { "thread_suspend", 3605 },\
-    { "thread_resume", 3606 },\
-    { "thread_abort", 3607 },\
-    { "thread_abort_safely", 3608 },\
-    { "thread_depress_abort", 3609 },\
-    { "thread_get_special_port", 3610 },\
-    { "thread_set_special_port", 3611 },\
-    { "thread_info", 3612 },\
-    { "thread_set_exception_ports", 3613 },\
-    { "thread_get_exception_ports", 3614 },\
-    { "thread_swap_exception_ports", 3615 },\
-    { "thread_policy", 3616 },\
-    { "thread_policy_set", 3617 },\
-    { "thread_policy_get", 3618 },\
-    { "thread_sample", 3619 },\
-    { "etap_trace_thread", 3620 },\
-    { "thread_assign", 3621 },\
-    { "thread_assign_default", 3622 },\
-    { "thread_get_assignment", 3623 },\
-    { "thread_set_policy", 3624 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _thread_act_user_ */
diff --git a/i386/include/mach/i386/thread_state.h b/i386/include/mach/i386/thread_state.h
deleted file mode 100644
index dba05b9..0000000
--- a/i386/include/mach/i386/thread_state.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-#ifndef _MACH_I386_THREAD_STATE_H_
-#define _MACH_I386_THREAD_STATE_H_
-
-/* Size of maximum exported thread state in words */
-#define I386_THREAD_STATE_MAX	(144)    /* Size of biggest state possible */
-
-#if defined (__i386__) || defined(__x86_64__)
-#define THREAD_STATE_MAX	I386_THREAD_STATE_MAX
-#endif
-
-#endif	/* _MACH_I386_THREAD_STATE_H_ */
diff --git a/i386/include/mach/i386/thread_status.h b/i386/include/mach/i386/thread_status.h
deleted file mode 100644
index 65773e3..0000000
--- a/i386/include/mach/i386/thread_status.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	thread_status.h
- *	Author:	Avadis Tevanian, Jr.
- *	Date:	1985
- *
- *	This file contains the structure definitions for the thread
- *	state as applied to I386 processors.
- */
-
-#ifndef	_MACH_I386_THREAD_STATUS_H_
-#define _MACH_I386_THREAD_STATUS_H_
-
-#include <mach/i386/_structs.h>
-#include <mach/message.h>
-#include <mach/i386/fp_reg.h>
-#include <mach/i386/thread_state.h>
-#include <i386/eflags.h>
-
-/*
- * the i386_xxxx form is kept for legacy purposes since these types
- * are externally known... eventually they should be deprecated.
- * our internal implementation has moved to the following naming convention
- *
- *   x86_xxxx32 names are used to deal with 32 bit states
- *   x86_xxxx64 names are used to deal with 64 bit states
- *   x86_xxxx   names are used to deal with either 32 or 64 bit states
- *	via a self-describing mechanism
- */
-
-/*
- * these are the legacy names which should be deprecated in the future
- * they are externally known which is the only reason we don't just get
- * rid of them
- */
-#define i386_THREAD_STATE		1
-#define i386_FLOAT_STATE		2
-#define i386_EXCEPTION_STATE		3
-
-/*
- * THREAD_STATE_FLAVOR_LIST 0
- * 	these are the supported flavors
- */
-#define x86_THREAD_STATE32		1
-#define x86_FLOAT_STATE32		2
-#define x86_EXCEPTION_STATE32		3
-#define x86_THREAD_STATE64		4
-#define x86_FLOAT_STATE64		5
-#define x86_EXCEPTION_STATE64		6
-#define x86_THREAD_STATE		7
-#define x86_FLOAT_STATE			8
-#define x86_EXCEPTION_STATE		9
-#define x86_DEBUG_STATE32		10
-#define x86_DEBUG_STATE64		11
-#define x86_DEBUG_STATE			12
-#define THREAD_STATE_NONE		13
-
-/*
- * Largest state on this machine:
- * (be sure mach/machine/thread_state.h matches!)
- */
-#define THREAD_MACHINE_STATE_MAX	THREAD_STATE_MAX
-
-/*
- * VALID_THREAD_STATE_FLAVOR is a platform specific macro that when passed
- * an exception flavor will return if that is a defined flavor for that
- * platform. The macro must be manually updated to include all of the valid
- * exception flavors as defined above.
- */
-#define VALID_THREAD_STATE_FLAVOR(x)       \
-	 ((x == x86_THREAD_STATE32)	|| \
-	  (x == x86_FLOAT_STATE32)	|| \
-	  (x == x86_EXCEPTION_STATE32)	|| \
-	  (x == x86_DEBUG_STATE32)	|| \
-	  (x == x86_THREAD_STATE64)	|| \
-	  (x == x86_FLOAT_STATE64)	|| \
-	  (x == x86_EXCEPTION_STATE64)	|| \
-	  (x == x86_DEBUG_STATE64)	|| \
-	  (x == x86_THREAD_STATE)	|| \
-	  (x == x86_FLOAT_STATE)	|| \
-	  (x == x86_EXCEPTION_STATE)	|| \
-	  (x == x86_DEBUG_STATE)	|| \
-	  (x == THREAD_STATE_NONE))
-
-struct x86_state_hdr {
-	int	flavor;
-	int	count;
-};
-typedef struct x86_state_hdr x86_state_hdr_t;
-
-/*
- * Default segment register values.
- */
-    
-#define USER_CODE_SELECTOR	0x0017
-#define USER_DATA_SELECTOR	0x001f
-#define KERN_CODE_SELECTOR	0x0008
-#define KERN_DATA_SELECTOR	0x0010
-
-/*
- * to be deprecated in the future
- */
-typedef _STRUCT_X86_THREAD_STATE32 i386_thread_state_t;
-#define i386_THREAD_STATE_COUNT	((mach_msg_type_number_t) \
-    ( sizeof (i386_thread_state_t) / sizeof (int) ))
-
-typedef _STRUCT_X86_THREAD_STATE32 x86_thread_state32_t;
-#define x86_THREAD_STATE32_COUNT	((mach_msg_type_number_t) \
-    ( sizeof (x86_thread_state32_t) / sizeof (int) ))
-
-/*
- * to be deprecated in the future
- */
-typedef _STRUCT_X86_FLOAT_STATE32 i386_float_state_t;
-#define i386_FLOAT_STATE_COUNT ((mach_msg_type_number_t) \
-		(sizeof(i386_float_state_t)/sizeof(unsigned int)))
-
-typedef _STRUCT_X86_FLOAT_STATE32 x86_float_state32_t;
-#define x86_FLOAT_STATE32_COUNT ((mach_msg_type_number_t) \
-		(sizeof(x86_float_state32_t)/sizeof(unsigned int)))
-
-/*
- * to be deprecated in the future
- */
-typedef _STRUCT_X86_EXCEPTION_STATE32 i386_exception_state_t;
-#define i386_EXCEPTION_STATE_COUNT	((mach_msg_type_number_t) \
-    ( sizeof (i386_exception_state_t) / sizeof (int) ))
-
-typedef _STRUCT_X86_EXCEPTION_STATE32 x86_exception_state32_t;
-#define x86_EXCEPTION_STATE32_COUNT	((mach_msg_type_number_t) \
-    ( sizeof (x86_exception_state32_t) / sizeof (int) ))
-
-#define I386_EXCEPTION_STATE_COUNT i386_EXCEPTION_STATE_COUNT
-
-typedef _STRUCT_X86_DEBUG_STATE32 x86_debug_state32_t;
-#define x86_DEBUG_STATE32_COUNT       ((mach_msg_type_number_t) \
-	( sizeof (x86_debug_state32_t) / sizeof (int) ))
-
-#define X86_DEBUG_STATE32_COUNT x86_DEBUG_STATE32_COUNT
-
-typedef _STRUCT_X86_THREAD_STATE64 x86_thread_state64_t;
-#define x86_THREAD_STATE64_COUNT	((mach_msg_type_number_t) \
-    ( sizeof (x86_thread_state64_t) / sizeof (int) ))
-
-typedef _STRUCT_X86_FLOAT_STATE64 x86_float_state64_t;
-#define x86_FLOAT_STATE64_COUNT ((mach_msg_type_number_t) \
-		(sizeof(x86_float_state64_t)/sizeof(unsigned int)))
-		
-typedef _STRUCT_X86_EXCEPTION_STATE64 x86_exception_state64_t;
-#define x86_EXCEPTION_STATE64_COUNT	((mach_msg_type_number_t) \
-    ( sizeof (x86_exception_state64_t) / sizeof (int) ))
-
-#define X86_EXCEPTION_STATE64_COUNT x86_EXCEPTION_STATE64_COUNT
-
-typedef _STRUCT_X86_DEBUG_STATE64 x86_debug_state64_t;
-#define x86_DEBUG_STATE64_COUNT	((mach_msg_type_number_t) \
-    ( sizeof (x86_debug_state64_t) / sizeof (int) ))
-
-#define X86_DEBUG_STATE64_COUNT x86_DEBUG_STATE64_COUNT
-
-/*
- * Combined thread, float and exception states
- */
-struct x86_thread_state {
-	x86_state_hdr_t			tsh;
-	union {
-	    x86_thread_state32_t	ts32;
-	    x86_thread_state64_t	ts64;
-	} uts;
-};
-
-struct x86_float_state {
-	x86_state_hdr_t			fsh;
-	union {
-		x86_float_state32_t	fs32;
-		x86_float_state64_t	fs64;
-	} ufs;
-};
-
-struct x86_exception_state {
-	x86_state_hdr_t			esh;
-	union {
-		x86_exception_state32_t	es32;
-		x86_exception_state64_t	es64;
-	} ues;
-};
-
-struct x86_debug_state {
-	x86_state_hdr_t			dsh;
-	union {
-		x86_debug_state32_t	ds32;
-		x86_debug_state64_t	ds64;
-	} uds;
-};
-
-typedef struct x86_thread_state x86_thread_state_t;
-#define x86_THREAD_STATE_COUNT	((mach_msg_type_number_t) \
-		( sizeof (x86_thread_state_t) / sizeof (int) ))
-
-typedef struct x86_float_state x86_float_state_t;
-#define x86_FLOAT_STATE_COUNT ((mach_msg_type_number_t) \
-		(sizeof(x86_float_state_t)/sizeof(unsigned int)))
-
-typedef struct x86_exception_state x86_exception_state_t;
-#define x86_EXCEPTION_STATE_COUNT ((mach_msg_type_number_t) \
-		(sizeof(x86_exception_state_t)/sizeof(unsigned int)))
-
-typedef struct x86_debug_state x86_debug_state_t;
-#define x86_DEBUG_STATE_COUNT ((mach_msg_type_number_t) \
-		(sizeof(x86_debug_state_t)/sizeof(unsigned int)))
-
-/*
- * Machine-independent way for servers and Mach's exception mechanism to
- * choose the most efficient state flavor for exception RPC's:
- */
-#define MACHINE_THREAD_STATE		x86_THREAD_STATE
-#define MACHINE_THREAD_STATE_COUNT	x86_THREAD_STATE_COUNT
-
-/*
- * when reloading the segment registers on
- * a return out of the kernel, we may take
- * a GeneralProtection or SegmentNotPresent
- * fault if one or more of the segment
- * registers in the saved state was improperly
- * specified via an x86_THREAD_STATE32 call
- * the frame we push on top of the existing
- * save area looks like this... we need to
- * carry this as part of the save area
- * in case we get hit so that we have a big
- * enough stack
- */
-struct x86_seg_load_fault32 {
-	unsigned int    trapno;
-	unsigned int    err;
-	unsigned int    eip;
-	unsigned int    cs;
-	unsigned int    efl;
-};
-
-
-#endif	/* _MACH_I386_THREAD_STATUS_H_ */
diff --git a/i386/include/mach/i386/vm_param.h b/i386/include/mach/i386/vm_param.h
deleted file mode 100644
index edcb834..0000000
--- a/i386/include/mach/i386/vm_param.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-/* 
- * Copyright (c) 1994 The University of Utah and
- * the Computer Systems Laboratory at the University of Utah (CSL).
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software is hereby
- * granted provided that (1) source code retains these copyright, permission,
- * and disclaimer notices, and (2) redistributions including binaries
- * reproduce the notices in supporting documentation, and (3) all advertising
- * materials mentioning features or use of this software display the following
- * acknowledgement: ``This product includes software developed by the
- * Computer Systems Laboratory at the University of Utah.''
- *
- * THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF THIS SOFTWARE IN ITS "AS
- * IS" CONDITION.  THE UNIVERSITY OF UTAH AND CSL DISCLAIM ANY LIABILITY OF
- * ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * CSL requests users of this software to return to csl-dist@cs.utah.edu any
- * improvements that they make and grant CSL redistribution rights.
- *
- */
-
-/*
- *	File:	vm_param.h
- *	Author:	Avadis Tevanian, Jr.
- *	Date:	1985
- *
- *	I386 machine dependent virtual memory parameters.
- *	Most of the declarations are preceeded by I386_ (or i386_)
- *	which is OK because only I386 specific code will be using
- *	them.
- */
-
-#ifndef	_MACH_I386_VM_PARAM_H_
-#define _MACH_I386_VM_PARAM_H_
-
-#define BYTE_SIZE		8		/* byte size in bits */
-
-#define I386_PGBYTES		4096		/* bytes per 80386 page */
-#define I386_PGSHIFT		12		/* bitshift for pages */
-
-#define	PAGE_SIZE		I386_PGBYTES
-#define	PAGE_SHIFT		I386_PGSHIFT
-#define	PAGE_MASK		(PAGE_SIZE - 1)
-
-#define I386_LPGBYTES		2*1024*1024	/* bytes per large page */
-#define I386_LPGSHIFT		21		/* bitshift for large pages */
-#define I386_LPGMASK		(I386_LPGBYTES-1)
-
-/*
- *	Convert bytes to pages and convert pages to bytes.
- *	No rounding is used.
- */
-
-#define i386_btop(x)		((ppnum_t)((x) >> I386_PGSHIFT))
-#define machine_btop(x)		i386_btop(x)
-#define i386_ptob(x)		(((pmap_paddr_t)(x)) << I386_PGSHIFT)
-
-/*
- *	Round off or truncate to the nearest page.  These will work
- *	for either addresses or counts.  (i.e. 1 byte rounds to 1 page
- *	bytes.
- */
-
-#define i386_round_page(x)	((((pmap_paddr_t)(x)) + I386_PGBYTES - 1) & \
-					~(I386_PGBYTES-1))
-#define i386_trunc_page(x)	(((pmap_paddr_t)(x)) & ~(I386_PGBYTES-1))
-
-
-
-#define VM_MIN_ADDRESS64	((user_addr_t) 0x0000000000000000ULL)
-/*
- * default top of user stack... it grows down from here
- */
-#define VM_USRSTACK64		((user_addr_t) 0x00007FFF5FC00000ULL)
-#define VM_DYLD64		((user_addr_t) 0x00007FFF5FC00000ULL)
-#define VM_LIB64_SHR_DATA	((user_addr_t) 0x00007FFF60000000ULL)
-#define VM_LIB64_SHR_TEXT	((user_addr_t) 0x00007FFF80000000ULL)
-/*
- * the end of the usable user address space , for now about 47 bits.
- * the 64 bit commpage is past the end of this
- */
-#define VM_MAX_PAGE_ADDRESS	((user_addr_t) 0x00007FFFFFE00000ULL)
-/*
- * canonical end of user address space for limits checking
- */
-#define VM_MAX_USER_PAGE_ADDRESS ((user_addr_t)0x00007FFFFFFFF000ULL)
-
-
-/* system-wide values */
-#define MACH_VM_MIN_ADDRESS		((mach_vm_offset_t) 0)
-#define MACH_VM_MAX_ADDRESS		((mach_vm_offset_t) VM_MAX_PAGE_ADDRESS)
-
-/* process-relative values (all 32-bit legacy only for now) */
-#define VM_MIN_ADDRESS		((vm_offset_t) 0)
-#define VM_USRSTACK32		((vm_offset_t) 0xC0000000)
-#define VM_MAX_ADDRESS		((vm_offset_t) 0xFFE00000)
-
-
-
-#endif	/* _MACH_I386_VM_PARAM_H_ */
diff --git a/i386/include/mach/i386/vm_types.h b/i386/include/mach/i386/vm_types.h
deleted file mode 100644
index 2c38fa2..0000000
--- a/i386/include/mach/i386/vm_types.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-/*
- *	File:	vm_types.h
- *	Author:	Avadis Tevanian, Jr.
- *	Date: 1985
- *
- *	Header file for VM data types.  I386 version.
- */
-
-#ifndef	_MACH_I386_VM_TYPES_H_
-#define _MACH_I386_VM_TYPES_H_
-
-#ifndef	ASSEMBLER
-
-#include <i386/_types.h>
-#include <mach/i386/vm_param.h>
-#include <stdint.h>
-
-/*
- * natural_t and integer_t are Mach's legacy types for machine-
- * independent integer types (unsigned, and signed, respectively).
- * Their original purpose was to define other types in a machine/
- * compiler independent way.
- *
- * They also had an implicit "same size as pointer" characteristic
- * to them (i.e. Mach's traditional types are very ILP32 or ILP64
- * centric).  We support x86 ABIs that do not follow either of
- * these models (specifically LP64).  Therefore, we had to make a
- * choice between making these types scale with pointers or stay
- * tied to integers.  Because their use is predominantly tied to
- * to the size of an integer, we are keeping that association and
- * breaking free from pointer size guarantees.
- *
- * New use of these types is discouraged.
- */
-typedef __darwin_natural_t	natural_t;
-typedef int			integer_t;
-
-/*
- * A vm_offset_t is a type-neutral pointer,
- * e.g. an offset into a virtual memory space.
- */
-#ifdef __LP64__
-typedef uintptr_t		vm_offset_t;
-#else	/* __LP64__ */
-typedef	natural_t		vm_offset_t;
-#endif	/* __LP64__ */
-
-/*
- * A vm_size_t is the proper type for e.g.
- * expressing the difference between two
- * vm_offset_t entities.
- */
-#ifdef __LP64__
-typedef uintptr_t		vm_size_t;
-#else	/* __LP64__ */
-typedef	natural_t		vm_size_t;
-#endif	/* __LP64__ */
-
-/*
- * This new type is independent of a particular vm map's
- * implementation size - and represents appropriate types
- * for all possible maps.  This is used for interfaces
- * where the size of the map is not known - or we don't
- * want to have to distinguish.
- */
-typedef uint64_t		mach_vm_address_t;
-typedef uint64_t		mach_vm_offset_t;
-typedef uint64_t		mach_vm_size_t;
-
-typedef uint64_t		vm_map_offset_t;
-typedef uint64_t		vm_map_address_t;
-typedef uint64_t		vm_map_size_t;
-
-
-#endif	/* ASSEMBLER */
-
-/*
- * If composing messages by hand (please do not)
- */
-#define	MACH_MSG_TYPE_INTEGER_T	MACH_MSG_TYPE_INTEGER_32
-
-#endif	/* _MACH_I386_VM_TYPES_H_ */
diff --git a/i386/include/mach/kern_return.h b/i386/include/mach/kern_return.h
deleted file mode 100644
index da73236..0000000
--- a/i386/include/mach/kern_return.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	h/kern_return.h
- *	Author:	Avadis Tevanian, Jr.
- *	Date:	1985
- *
- *	Kernel return codes.
- *
- */
-
-#ifndef	_MACH_KERN_RETURN_H_
-#define _MACH_KERN_RETURN_H_
-
-#include <mach/machine/kern_return.h>
-
-#define KERN_SUCCESS			0
-
-#define KERN_INVALID_ADDRESS		1
-		/* Specified address is not currently valid.
-		 */
-
-#define KERN_PROTECTION_FAILURE		2
-		/* Specified memory is valid, but does not permit the
-		 * required forms of access.
-		 */
-
-#define KERN_NO_SPACE			3
-		/* The address range specified is already in use, or
-		 * no address range of the size specified could be
-		 * found.
-		 */
-
-#define KERN_INVALID_ARGUMENT		4
-		/* The function requested was not applicable to this
-		 * type of argument, or an argument is invalid
-		 */
-
-#define KERN_FAILURE			5
-		/* The function could not be performed.  A catch-all.
-		 */
-
-#define KERN_RESOURCE_SHORTAGE		6
-		/* A system resource could not be allocated to fulfill
-		 * this request.  This failure may not be permanent.
-		 */
-
-#define KERN_NOT_RECEIVER		7
-		/* The task in question does not hold receive rights
-		 * for the port argument.
-		 */
-
-#define KERN_NO_ACCESS			8
-		/* Bogus access restriction.
-		 */
-
-#define KERN_MEMORY_FAILURE		9
-		/* During a page fault, the target address refers to a
-		 * memory object that has been destroyed.  This
-		 * failure is permanent.
-		 */
-
-#define KERN_MEMORY_ERROR		10
-		/* During a page fault, the memory object indicated
-		 * that the data could not be returned.  This failure
-		 * may be temporary; future attempts to access this
-		 * same data may succeed, as defined by the memory
-		 * object.
-		 */
-
-#define	KERN_ALREADY_IN_SET		11
-		/* The receive right is already a member of the portset.
-		 */
-
-#define KERN_NOT_IN_SET			12
-		/* The receive right is not a member of a port set.
-		 */
-
-#define KERN_NAME_EXISTS		13
-		/* The name already denotes a right in the task.
-		 */
-
-#define KERN_ABORTED			14
-		/* The operation was aborted.  Ipc code will
-		 * catch this and reflect it as a message error.
-		 */
-
-#define KERN_INVALID_NAME		15
-		/* The name doesn't denote a right in the task.
-		 */
-
-#define	KERN_INVALID_TASK		16
-		/* Target task isn't an active task.
-		 */
-
-#define KERN_INVALID_RIGHT		17
-		/* The name denotes a right, but not an appropriate right.
-		 */
-
-#define KERN_INVALID_VALUE		18
-		/* A blatant range error.
-		 */
-
-#define	KERN_UREFS_OVERFLOW		19
-		/* Operation would overflow limit on user-references.
-		 */
-
-#define	KERN_INVALID_CAPABILITY		20
-		/* The supplied (port) capability is improper.
-		 */
-
-#define KERN_RIGHT_EXISTS		21
-		/* The task already has send or receive rights
-		 * for the port under another name.
-		 */
-
-#define	KERN_INVALID_HOST		22
-		/* Target host isn't actually a host.
-		 */
-
-#define KERN_MEMORY_PRESENT		23
-		/* An attempt was made to supply "precious" data
-		 * for memory that is already present in a
-		 * memory object.
-		 */
-
-#define KERN_MEMORY_DATA_MOVED		24
-		/* A page was requested of a memory manager via
-		 * memory_object_data_request for an object using
-		 * a MEMORY_OBJECT_COPY_CALL strategy, with the
-		 * VM_PROT_WANTS_COPY flag being used to specify
-		 * that the page desired is for a copy of the
-		 * object, and the memory manager has detected
-		 * the page was pushed into a copy of the object
-		 * while the kernel was walking the shadow chain
-		 * from the copy to the object. This error code
-		 * is delivered via memory_object_data_error
-		 * and is handled by the kernel (it forces the
-		 * kernel to restart the fault). It will not be
-		 * seen by users.
-		 */
-
-#define KERN_MEMORY_RESTART_COPY	25
-		/* A strategic copy was attempted of an object
-		 * upon which a quicker copy is now possible.
-		 * The caller should retry the copy using
-		 * vm_object_copy_quickly. This error code
-		 * is seen only by the kernel.
-		 */
-
-#define KERN_INVALID_PROCESSOR_SET	26
-		/* An argument applied to assert processor set privilege
-		 * was not a processor set control port.
-		 */
-
-#define KERN_POLICY_LIMIT		27
-		/* The specified scheduling attributes exceed the thread's
-		 * limits.
-		 */
-
-#define KERN_INVALID_POLICY		28
-		/* The specified scheduling policy is not currently
-		 * enabled for the processor set.
-		 */
-
-#define KERN_INVALID_OBJECT		29
-		/* The external memory manager failed to initialize the
-		 * memory object.
-		 */
-
-#define KERN_ALREADY_WAITING		30
-		/* A thread is attempting to wait for an event for which 
-		 * there is already a waiting thread.
-		 */
-
-#define KERN_DEFAULT_SET		31
-		/* An attempt was made to destroy the default processor
-		 * set.
-		 */
-
-#define KERN_EXCEPTION_PROTECTED	32
-		/* An attempt was made to fetch an exception port that is
-		 * protected, or to abort a thread while processing a
-		 * protected exception.
-		 */
-
-#define KERN_INVALID_LEDGER		33
-		/* A ledger was required but not supplied.
-		 */
-
-#define KERN_INVALID_MEMORY_CONTROL	34
-		/* The port was not a memory cache control port.
-		 */
-
-#define KERN_INVALID_SECURITY		35
-		/* An argument supplied to assert security privilege 	
-		 * was not a host security port.
-		 */
-		
-#define KERN_NOT_DEPRESSED		36
-		/* thread_depress_abort was called on a thread which
-		 * was not currently depressed.
-		 */
-		
-#define KERN_TERMINATED			37
-		/* Object has been terminated and is no longer available
-		 */
-
-#define KERN_LOCK_SET_DESTROYED		38
-		/* Lock set has been destroyed and is no longer available.
-		 */
-
-#define KERN_LOCK_UNSTABLE		39
-		/* The thread holding the lock terminated before releasing
-		 * the lock
-		 */
-
-#define KERN_LOCK_OWNED			40
-		/* The lock is already owned by another thread
-		 */
-
-#define KERN_LOCK_OWNED_SELF		41
-		/* The lock is already owned by the calling thread
-		 */
-
-#define KERN_SEMAPHORE_DESTROYED	42
-		/* Semaphore has been destroyed and is no longer available.
-		 */
-
-#define KERN_RPC_SERVER_TERMINATED	43
-		/* Return from RPC indicating the target server was 
-		 * terminated before it successfully replied 
-		 */
-
-#define KERN_RPC_TERMINATE_ORPHAN	44
-		/* Terminate an orphaned activation.
-		 */
-
-#define KERN_RPC_CONTINUE_ORPHAN	45
-		/* Allow an orphaned activation to continue executing.
-		 */
-
-#define	KERN_NOT_SUPPORTED		46
-		/* Empty thread activation (No thread linked to it)
-		 */
-
-#define	KERN_NODE_DOWN			47
-		/* Remote node down or inaccessible.
-		 */
-
-#define KERN_NOT_WAITING		48
-		/* A signalled thread was not actually waiting. */
-
-#define	KERN_OPERATION_TIMED_OUT        49
-		/* Some thread-oriented operation (semaphore_wait) timed out
-		 */
-
-#define KERN_CODESIGN_ERROR		50
-		/* During a page fault, indicates that the page was rejected
-		 * as a result of a signature check.
-		 */
-
-#define	KERN_RETURN_MAX			0x100
-		/* Maximum return value allowable
-		 */
-
-#endif	/* _MACH_KERN_RETURN_H_ */
diff --git a/i386/include/mach/kmod.h b/i386/include/mach/kmod.h
deleted file mode 100644
index f31821d..0000000
--- a/i386/include/mach/kmod.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
- * support for mandatory and extensible security protections.  This notice
- * is included in support of clause 2.2 (b) of the Apple Public License,
- * Version 2.0.
- */
-
-#ifndef    _MACH_KMOD_H_
-#define    _MACH_KMOD_H_
-
-#include <mach/kern_return.h>
-#include <mach/mach_types.h>
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-#if PRAGMA_MARK
-#pragma mark Basic macros & typedefs
-#endif
-/***********************************************************************
-* Basic macros & typedefs
-***********************************************************************/
-#define KMOD_MAX_NAME    64
-
-#define KMOD_RETURN_SUCCESS    KERN_SUCCESS
-#define KMOD_RETURN_FAILURE    KERN_FAILURE
-
-typedef int kmod_t;
-
-struct  kmod_info;
-typedef kern_return_t kmod_start_func_t(struct kmod_info * ki, void * data);
-typedef kern_return_t kmod_stop_func_t(struct kmod_info * ki, void * data);
-
-#if PRAGMA_MARK
-#pragma mark Structure definitions
-#endif
-/***********************************************************************
-* Structure definitions
-*
-* All structures must be #pragma pack(4).
-***********************************************************************/
-#pragma pack(4)
-
-/* Run-time struct only; never saved to a file */
-typedef struct kmod_reference {
-    struct kmod_reference * next;
-    struct kmod_info      * info;
-} kmod_reference_t;
-
-/***********************************************************************
-* Warning: Any changes to the kmod_info structure affect the
-* KMOD_..._DECL macros below.
-***********************************************************************/
-
-/* The kmod_info_t structure is only safe to use inside the running
- * kernel.  If you need to work with a kmod_info_t structure outside
- * the kernel, please use the compatibility definitions below.
- */
-typedef struct kmod_info {
-    struct kmod_info  * next;
-    int32_t             info_version;           // version of this structure
-    uint32_t            id;
-    char                name[KMOD_MAX_NAME];
-    char                version[KMOD_MAX_NAME];
-    int32_t             reference_count;        // # linkage refs to this 
-    kmod_reference_t  * reference_list;         // who this refs (links on)
-    vm_address_t        address;                // starting address
-    vm_size_t           size;                   // total size
-    vm_size_t           hdr_size;               // unwired hdr size
-    kmod_start_func_t * start;
-    kmod_stop_func_t  * stop;
-} kmod_info_t;
-
-/* A compatibility definition of kmod_info_t for 32-bit kexts.
- */
-typedef struct kmod_info_32_v1 {
-    uint32_t            next_addr;
-    int32_t             info_version;
-    uint32_t            id;
-    uint8_t             name[KMOD_MAX_NAME];
-    uint8_t             version[KMOD_MAX_NAME];
-    int32_t             reference_count;
-    uint32_t            reference_list_addr;
-    uint32_t            address;
-    uint32_t            size;
-    uint32_t            hdr_size;
-    uint32_t            start_addr;
-    uint32_t            stop_addr;
-} kmod_info_32_v1_t;
-
-/* A compatibility definition of kmod_info_t for 64-bit kexts.
- */
-typedef struct kmod_info_64_v1 {
-    uint64_t            next_addr;
-    int32_t             info_version;
-    uint32_t            id;
-    uint8_t             name[KMOD_MAX_NAME];
-    uint8_t             version[KMOD_MAX_NAME];
-    int32_t             reference_count;
-    uint64_t            reference_list_addr;
-    uint64_t            address;
-    uint64_t            size;
-    uint64_t            hdr_size;
-    uint64_t            start_addr;
-    uint64_t            stop_addr;
-} kmod_info_64_v1_t;
-
-#pragma pack()
-
-#if PRAGMA_MARK
-#pragma mark Kmod structure declaration macros
-#endif
-/***********************************************************************
-* Kmod structure declaration macros
-***********************************************************************/
-#define KMOD_INFO_NAME       kmod_info
-#define KMOD_INFO_VERSION    1
-
-#define KMOD_DECL(name, version)                                  \
-    static kmod_start_func_t name ## _module_start;               \
-    static kmod_stop_func_t  name ## _module_stop;                \
-    kmod_info_t KMOD_INFO_NAME = { 0, KMOD_INFO_VERSION, -1U,      \
-                       { #name }, { version }, -1, 0, 0, 0, 0,    \
-                           name ## _module_start,                 \
-                           name ## _module_stop };
-
-#define KMOD_EXPLICIT_DECL(name, version, start, stop)            \
-    kmod_info_t KMOD_INFO_NAME = { 0, KMOD_INFO_VERSION, -1U,      \
-                       { #name }, { version }, -1, 0, 0, 0, 0,    \
-                           start, stop };
-
-#if PRAGMA_MARK
-#pragma mark Kernel private declarations
-#endif
-/***********************************************************************
-* Kernel private declarations.
-***********************************************************************/
-
-
-#if PRAGMA_MARK
-#pragma mark Obsolete kmod stuff
-#endif
-/***********************************************************************
-* These 3 should be dropped but they're referenced by MIG declarations.
-***********************************************************************/
-typedef void * kmod_args_t;
-typedef int kmod_control_flavor_t;
-typedef kmod_info_t * kmod_info_array_t;
-
-__END_DECLS
-
-#endif    /* _MACH_KMOD_H_ */
diff --git a/i386/include/mach/ledger.defs b/i386/include/mach/ledger.defs
deleted file mode 100644
index 76367a9..0000000
--- a/i386/include/mach/ledger.defs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-subsystem
-#if	KERNEL_USER
-	  KernelUser
-#endif	/* KERNEL_USER */
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-		       ledger 5000;
-
-#ifdef	KERNEL_USER
-userprefix r_;
-#endif	/* KERNEL_USER */
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-/*
- *	Create a subordinate ledger
- */
-routine ledger_create(
-		parent_ledger		: ledger_t;
-		ledger_ledger		: ledger_t;
-	out	new_ledger		: ledger_t;
-		transfer		: ledger_item_t);
-
-/*
- *	Destroy a ledger
- */
-routine ledger_terminate(
-		ledger			: ledger_t);
-
-/*
- *	Transfer resources from a parent ledger to a child
- */
-routine ledger_transfer(
-		parent_ledger		: ledger_t;
-		child_ledger		: ledger_t;
-		transfer		: ledger_item_t);
-
-/*
- *	Return the ledger limit and balance
- */
-routine ledger_read(
-		ledger			: ledger_t;
-	out	balance			: ledger_item_t;
-	out	limit			: ledger_item_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/ledger.h b/i386/include/mach/ledger.h
deleted file mode 100644
index f0f050f..0000000
--- a/i386/include/mach/ledger.h
+++ /dev/null
@@ -1,259 +0,0 @@
-#ifndef	_ledger_user_
-#define	_ledger_user_
-
-/* Module ledger */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	ledger_MSG_COUNT
-#define	ledger_MSG_COUNT	4
-#endif	/* ledger_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine ledger_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t ledger_create
-(
-	ledger_t parent_ledger,
-	ledger_t ledger_ledger,
-	ledger_t *new_ledger,
-	ledger_item_t transfer
-);
-
-/* Routine ledger_terminate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t ledger_terminate
-(
-	ledger_t ledger
-);
-
-/* Routine ledger_transfer */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t ledger_transfer
-(
-	ledger_t parent_ledger,
-	ledger_t child_ledger,
-	ledger_item_t transfer
-);
-
-/* Routine ledger_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t ledger_read
-(
-	ledger_t ledger,
-	ledger_item_t *balance,
-	ledger_item_t *limit
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__ledger_subsystem__defined
-#define __Request__ledger_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t ledger_ledger;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		ledger_item_t transfer;
-	} __Request__ledger_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__ledger_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t child_ledger;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		ledger_item_t transfer;
-	} __Request__ledger_transfer_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__ledger_read_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__ledger_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__ledger_subsystem__defined
-#define __RequestUnion__ledger_subsystem__defined
-union __RequestUnion__ledger_subsystem {
-	__Request__ledger_create_t Request_ledger_create;
-	__Request__ledger_terminate_t Request_ledger_terminate;
-	__Request__ledger_transfer_t Request_ledger_transfer;
-	__Request__ledger_read_t Request_ledger_read;
-};
-#endif /* !__RequestUnion__ledger_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__ledger_subsystem__defined
-#define __Reply__ledger_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_ledger;
-		/* end of the kernel processed data */
-	} __Reply__ledger_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__ledger_terminate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__ledger_transfer_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		ledger_item_t balance;
-		ledger_item_t limit;
-	} __Reply__ledger_read_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__ledger_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__ledger_subsystem__defined
-#define __ReplyUnion__ledger_subsystem__defined
-union __ReplyUnion__ledger_subsystem {
-	__Reply__ledger_create_t Reply_ledger_create;
-	__Reply__ledger_terminate_t Reply_ledger_terminate;
-	__Reply__ledger_transfer_t Reply_ledger_transfer;
-	__Reply__ledger_read_t Reply_ledger_read;
-};
-#endif /* !__RequestUnion__ledger_subsystem__defined */
-
-#ifndef subsystem_to_name_map_ledger
-#define subsystem_to_name_map_ledger \
-    { "ledger_create", 5000 },\
-    { "ledger_terminate", 5001 },\
-    { "ledger_transfer", 5002 },\
-    { "ledger_read", 5003 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _ledger_user_ */
diff --git a/i386/include/mach/lock_set.defs b/i386/include/mach/lock_set.defs
deleted file mode 100644
index c7ee584..0000000
--- a/i386/include/mach/lock_set.defs
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- * 
- */
-/*
- *	File: mach/lock_set.defs
- *	Author: Joseph CaraDonna
- *
- *	Exported kernel calls	
- *
- */
-
-subsystem
-#if	KERNEL_SERVER
-	KernelServer
-#endif	/* KERNEL_SERVER */
-			lock_set 617000;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-/*
- * a lock_set_t is created and destroyed through the task object.
- *      lock_set_create(task,&lock_set_t,...);
- *      lock_set_destroy(task,lock_set_t);
- */
-
-routine lock_acquire(
-		lock_set	: lock_set_t;
-		lock_id		: int);
-
-routine lock_release(
-		lock_set	: lock_set_t;
-		lock_id		: int);
-
-routine lock_try(
-		lock_set	: lock_set_t;
-		lock_id		: int);
-
-routine lock_make_stable(
-		lock_set	: lock_set_t;
-		lock_id		: int);
-
-routine lock_handoff(
-		lock_set	: lock_set_t;
-		lock_id		: int);
-
-routine lock_handoff_accept(
-		lock_set	: lock_set_t;
-		lock_id		: int);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/lock_set.h b/i386/include/mach/lock_set.h
deleted file mode 100644
index 07a8d13..0000000
--- a/i386/include/mach/lock_set.h
+++ /dev/null
@@ -1,326 +0,0 @@
-#ifndef	_lock_set_user_
-#define	_lock_set_user_
-
-/* Module lock_set */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	lock_set_MSG_COUNT
-#define	lock_set_MSG_COUNT	6
-#endif	/* lock_set_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine lock_acquire */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_acquire
-(
-	lock_set_t lock_set,
-	int lock_id
-);
-
-/* Routine lock_release */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_release
-(
-	lock_set_t lock_set,
-	int lock_id
-);
-
-/* Routine lock_try */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_try
-(
-	lock_set_t lock_set,
-	int lock_id
-);
-
-/* Routine lock_make_stable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_make_stable
-(
-	lock_set_t lock_set,
-	int lock_id
-);
-
-/* Routine lock_handoff */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_handoff
-(
-	lock_set_t lock_set,
-	int lock_id
-);
-
-/* Routine lock_handoff_accept */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t lock_handoff_accept
-(
-	lock_set_t lock_set,
-	int lock_id
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__lock_set_subsystem__defined
-#define __Request__lock_set_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int lock_id;
-	} __Request__lock_acquire_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int lock_id;
-	} __Request__lock_release_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int lock_id;
-	} __Request__lock_try_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int lock_id;
-	} __Request__lock_make_stable_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int lock_id;
-	} __Request__lock_handoff_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int lock_id;
-	} __Request__lock_handoff_accept_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__lock_set_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__lock_set_subsystem__defined
-#define __RequestUnion__lock_set_subsystem__defined
-union __RequestUnion__lock_set_subsystem {
-	__Request__lock_acquire_t Request_lock_acquire;
-	__Request__lock_release_t Request_lock_release;
-	__Request__lock_try_t Request_lock_try;
-	__Request__lock_make_stable_t Request_lock_make_stable;
-	__Request__lock_handoff_t Request_lock_handoff;
-	__Request__lock_handoff_accept_t Request_lock_handoff_accept;
-};
-#endif /* !__RequestUnion__lock_set_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__lock_set_subsystem__defined
-#define __Reply__lock_set_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__lock_acquire_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__lock_release_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__lock_try_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__lock_make_stable_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__lock_handoff_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__lock_handoff_accept_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__lock_set_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__lock_set_subsystem__defined
-#define __ReplyUnion__lock_set_subsystem__defined
-union __ReplyUnion__lock_set_subsystem {
-	__Reply__lock_acquire_t Reply_lock_acquire;
-	__Reply__lock_release_t Reply_lock_release;
-	__Reply__lock_try_t Reply_lock_try;
-	__Reply__lock_make_stable_t Reply_lock_make_stable;
-	__Reply__lock_handoff_t Reply_lock_handoff;
-	__Reply__lock_handoff_accept_t Reply_lock_handoff_accept;
-};
-#endif /* !__RequestUnion__lock_set_subsystem__defined */
-
-#ifndef subsystem_to_name_map_lock_set
-#define subsystem_to_name_map_lock_set \
-    { "lock_acquire", 617000 },\
-    { "lock_release", 617001 },\
-    { "lock_try", 617002 },\
-    { "lock_make_stable", 617003 },\
-    { "lock_handoff", 617004 },\
-    { "lock_handoff_accept", 617005 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _lock_set_user_ */
diff --git a/i386/include/mach/mach.h b/i386/include/mach/mach.h
deleted file mode 100644
index 0b3b1a0..0000000
--- a/i386/include/mach/mach.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 1999-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-/* 
- *  Includes all the types that a normal user
- *  of Mach programs should need
- */
-
-#ifndef	_MACH_H_
-#define	_MACH_H_
-
-#define __MACH30__
-#define MACH_IPC_FLAVOR UNTYPED
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <mach/mach_interface.h>
-#include <mach/mach_port.h>
-#include <mach/mach_init.h>
-#include <mach/mach_host.h>
-#include <mach/thread_switch.h>
-
-#include <mach/rpc.h>  		/* for compatibility only */
-#include <mach/mig.h>
-
-#include <mach/mig_errors.h>
-#include <mach/mach_error.h>
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-/*
- * Standard prototypes
- */
-extern void			panic_init(mach_port_t);
-extern void			panic(const char *, ...);
-
-extern void			safe_gets(char *,
-					  char *,
-					  int);
-
-extern void			slot_name(cpu_type_t,
-					  cpu_subtype_t,
-					  char **,
-					  char **);
-
-extern void			mig_reply_setup(mach_msg_header_t *,
-						mach_msg_header_t *);
-
-extern void			mach_msg_destroy(mach_msg_header_t *);
-
-extern mach_msg_return_t	mach_msg_receive(mach_msg_header_t *);
-
-extern mach_msg_return_t	mach_msg_send(mach_msg_header_t *);
-
-extern mach_msg_return_t	mach_msg_server_once(boolean_t (*)
-						     (mach_msg_header_t *,
-						      mach_msg_header_t *),
-						     mach_msg_size_t,
-						     mach_port_t,
-						     mach_msg_options_t);
-extern mach_msg_return_t	mach_msg_server(boolean_t (*)
-						(mach_msg_header_t *,
-						 mach_msg_header_t *),
-						mach_msg_size_t,
-						mach_port_t,
-						mach_msg_options_t);
-
-/*
- * Prototypes for compatibility
- */
-extern kern_return_t	clock_get_res(mach_port_t,
-				      clock_res_t *);
-extern kern_return_t	clock_set_res(mach_port_t,
-				      clock_res_t);
-
-extern kern_return_t	clock_sleep(mach_port_t,
-				    int,
-				    mach_timespec_t,
-				    mach_timespec_t *);
-__END_DECLS
-
-#endif	/* _MACH_H_ */
diff --git a/i386/include/mach/mach_error.h b/i386/include/mach/mach_error.h
deleted file mode 100644
index 5840bd5..0000000
--- a/i386/include/mach/mach_error.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-/*
- *	File:	mach_error.h
- *	Author:	Douglas Orr, Carnegie Mellon University
- *	Date:	Mar. 1988
- *
- *	Definitions of routines in mach_error.c
- */
-
-#ifndef	_MACH_ERROR_
-#define	_MACH_ERROR_	1
-
-#include <mach/error.h>
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-char		*mach_error_string(
-/*
- *	Returns a string appropriate to the error argument given
- */
-	mach_error_t error_value
-				);
-
-void		mach_error(
-/*
- *	Prints an appropriate message on the standard error stream
- */
-	const char	*str,
-	mach_error_t	error_value
-				);
-
-char		*mach_error_type(
-/*
- *	Returns a string with the error system, subsystem and code
- */
-	mach_error_t	error_value
-				);
-__END_DECLS
-
-#endif	/* _MACH_ERROR_ */
diff --git a/i386/include/mach/mach_exc.defs b/i386/include/mach/mach_exc.defs
deleted file mode 100644
index 00fae28..0000000
--- a/i386/include/mach/mach_exc.defs
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- * Abstract:
- *	MiG definitions file for Mach exception interface.
- */
-
-subsystem
-#if	KERNEL_USER
-	  KernelUser
-#endif
-		     mach_exc 2405;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-ServerPrefix catch_;
-
-type mach_exception_data_t	= array[*:2] of int64_t;
-type exception_type_t		= int;
-
-routine		mach_exception_raise(
-#if	KERNEL_USER
-			exception_port	: mach_port_move_send_t;
-			thread		: mach_port_move_send_t;
-			task		: mach_port_move_send_t;
-#else	/* KERNEL_USER */
-			exception_port	: mach_port_t;
-			thread		: mach_port_t;
-			task		: mach_port_t;
-#endif	/* KERNEL_USER */
-			exception	: exception_type_t;
-			code		: mach_exception_data_t
-			);
-
-routine		mach_exception_raise_state(
-#if	KERNEL_USER
-			exception_port	: mach_port_move_send_t;
-#else	/* KERNEL_USER */
-			exception_port	: mach_port_t;
-#endif	/* KERNEL_USER */
-			exception	: exception_type_t;
-			code		: mach_exception_data_t, const;
-		  inout flavor		: int;
-			old_state	: thread_state_t, const;
-		    out new_state	: thread_state_t);
-
-routine		mach_exception_raise_state_identity(
-#if	KERNEL_USER
-			exception_port  : mach_port_move_send_t;
-			thread		: mach_port_move_send_t;
-			task		: mach_port_move_send_t;
-#else	/* KERNEL_USER */
-			exception_port  : mach_port_t;
-			thread          : mach_port_t;
-			task            : mach_port_t;
-#endif	/* KERNEL_USER */
-			exception       : exception_type_t;
-			code            : mach_exception_data_t;
-		  inout flavor          : int;
-			old_state       : thread_state_t;
-		    out new_state       : thread_state_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/mach_host.defs b/i386/include/mach/mach_host.defs
deleted file mode 100644
index 90ba9b9..0000000
--- a/i386/include/mach/mach_host.defs
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-/*
- * File:	mach/mach_host.defs
- *
- * Abstract:
- *	Mach host operations support.  Includes processor allocation and
- *	control.  
- */
-
-#ifdef	MACH_KERNEL
-#include <advisory_pageout.h>
-#endif	/* MACH_KERNEL */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-		       mach_host 200;
-
-/*
- *	Basic types
- */
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-#include <mach/clock_types.defs>
-#include <mach_debug/mach_debug_types.defs>
-
-/*
- * References to host objects are returned by:
- *	mach_host_self() - trap
- */
-
-/*
- *	Return information about this host.
- */
-routine host_info(
-		host		: host_t;
-		flavor		: host_flavor_t;
-	out	host_info_out	: host_info_t, CountInOut);
-
-/*
- *	Get string describing current kernel version.
- */
-routine	host_kernel_version(
-		host		: host_t;
-	out	kernel_version	: kernel_version_t);
-
-/*
- *      Get host page size
- *	(compatibility for running old libraries on new kernels -
- *	host_page_size() is now a library routine based on constants)
- */
-routine _host_page_size(
-		host		: host_t;
-	out	out_page_size	: vm_size_t);
-
-/*
- *	Allow pagers to create named entries that point to un-mapped
- *	abstract memory object.  The named entries are generally mappable
- *	and can be subsetted through the mach_make_memory_entry call
- */
-routine mach_memory_object_memory_entry(
-		host		:host_t;
-		internal	:boolean_t;
-		size		:vm_size_t;
-		permission	:vm_prot_t;
-		pager		:memory_object_t;
-	out	entry_handle	:mach_port_move_send_t);
-
-
-/*
- *      Get processor info for all the processors on this host.
- *	The returned data is an OOL array of processor info.
- */
-routine host_processor_info(
-		host			: host_t;
-                flavor          	: processor_flavor_t;
-	out	out_processor_count 	: natural_t;
-        out     out_processor_info  	: processor_info_array_t);
-
-/*
- * 	Return host IO master access port
- */
-routine host_get_io_master(
-                host            : host_t;
-        out     io_master       : io_master_t);
-
-/*
- *	Get service port for a processor set.
- *	Available to all.
- */
-routine host_get_clock_service(
-		host		: host_t;
-		clock_id	: clock_id_t;
-	out	clock_serv	: clock_serv_t);
-
-/*
- * kernel module interface (obsolete as of SnowLeopard)
- * see mach/kmod.h
- */
-/* kmod_ MIG calls now return KERN_NOT_SUPPORTED on PPC/i386/x86_64. */
-routine	kmod_get_info(
-		host		: host_t;
-	out	modules		: kmod_args_t);
-
-/*
- *	Returns information about the memory allocation zones.
- *      Supported in all kernels..
- */
-routine host_zone_info(
-		host		: host_t;
-	out	names		: zone_name_array_t,
-					Dealloc;
-	out	info		: zone_info_array_t,
-					Dealloc);
-
-/*
- *	Returns information about the global VP table.
- *      Only supported in MACH_VM_DEBUG kernels,
- *      otherwise returns KERN_FAILURE.
- */
-routine host_virtual_physical_table_info(
-		host		: host_t;
-	out	info		: hash_info_bucket_array_t,
-					Dealloc);
-
-/*
- *	Returns information about the global reverse hash table.
- *      This call is only valid on MACH_IPC_DEBUG kernels.
- *      Otherwise, KERN_FAILURE is returned.
- */
-routine host_ipc_hash_info(
-		host		: host_t;
-	out	info		: hash_info_bucket_array_t,
-					Dealloc);
-
-skip; /* was enable_bluebox */
-skip; /* was disable_bluebox */
-
-/*
- * JMM - Keep processor_set related items at the end for easy
- * removal.
- */
-/*
- *	Get default processor set for host.
- */
-routine processor_set_default(
-		host		: host_t;
-	out	default_set	: processor_set_name_t);
-
-/*
- *	Create new processor set.  Returns real port for manipulations,
- *	and name port for obtaining information.
- */
-routine processor_set_create(
-		host		: host_t;
-	out	new_set		: processor_set_t;
-	out	new_name	: processor_set_name_t);
-
-/*
- * 	Temporary interfaces for conversion to 64 bit data path 
- */
-
-routine mach_memory_object_memory_entry_64(
-		host		:host_t;
-		internal	:boolean_t;
-		size		:memory_object_size_t;
-		permission	:vm_prot_t;
-		pager		:memory_object_t;
-	out	entry_handle	:mach_port_move_send_t);
-
-/*
- *	Return statistics from this host.
- */
-routine host_statistics(
-		host_priv	: host_t;
-		flavor		: host_flavor_t;
-	out	host_info_out	: host_info_t, CountInOut);
-
-routine host_request_notification(
-		host		: host_t;
-		notify_type	: host_flavor_t;
-		notify_port	: mach_port_make_send_once_t);
-
-routine host_lockgroup_info(
-		host		: host_t;
-	out	lockgroup_info	: lockgroup_info_array_t,
-					Dealloc);
-
-/*
- *	Return 64-bit statistics from this host.
- */
-routine host_statistics64(
-		host_priv	: host_t;
-		flavor		: host_flavor_t;
-	out	host_info64_out	: host_info64_t, CountInOut);
-
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/mach_host.h b/i386/include/mach/mach_host.h
deleted file mode 100644
index 70ab53f..0000000
--- a/i386/include/mach/mach_host.h
+++ /dev/null
@@ -1,873 +0,0 @@
-#ifndef	_mach_host_user_
-#define	_mach_host_user_
-
-/* Module mach_host */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	mach_host_MSG_COUNT
-#define	mach_host_MSG_COUNT	20
-#endif	/* mach_host_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-#include <mach/mach_types.h>
-#include <mach_debug/mach_debug_types.h>
-#include <mach/mach_init.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine host_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_info
-(
-	host_t host,
-	host_flavor_t flavor,
-	host_info_t host_info_out,
-	mach_msg_type_number_t *host_info_outCnt
-);
-
-/* Routine host_kernel_version */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_kernel_version
-(
-	host_t host,
-	kernel_version_t kernel_version
-);
-
-/* Routine _host_page_size */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t _host_page_size
-(
-	host_t host,
-	vm_size_t *out_page_size
-);
-
-/* Routine mach_memory_object_memory_entry */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_memory_object_memory_entry
-(
-	host_t host,
-	boolean_t internal,
-	vm_size_t size,
-	vm_prot_t permission,
-	memory_object_t pager,
-	mach_port_t *entry_handle
-);
-
-/* Routine host_processor_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_processor_info
-(
-	host_t host,
-	processor_flavor_t flavor,
-	natural_t *out_processor_count,
-	processor_info_array_t *out_processor_info,
-	mach_msg_type_number_t *out_processor_infoCnt
-);
-
-/* Routine host_get_io_master */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_get_io_master
-(
-	host_t host,
-	io_master_t *io_master
-);
-
-/* Routine host_get_clock_service */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_get_clock_service
-(
-	host_t host,
-	clock_id_t clock_id,
-	clock_serv_t *clock_serv
-);
-
-/* Routine kmod_get_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t kmod_get_info
-(
-	host_t host,
-	kmod_args_t *modules,
-	mach_msg_type_number_t *modulesCnt
-);
-
-/* Routine host_zone_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_zone_info
-(
-	host_t host,
-	zone_name_array_t *names,
-	mach_msg_type_number_t *namesCnt,
-	zone_info_array_t *info,
-	mach_msg_type_number_t *infoCnt
-);
-
-/* Routine host_virtual_physical_table_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_virtual_physical_table_info
-(
-	host_t host,
-	hash_info_bucket_array_t *info,
-	mach_msg_type_number_t *infoCnt
-);
-
-/* Routine host_ipc_hash_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_ipc_hash_info
-(
-	host_t host,
-	hash_info_bucket_array_t *info,
-	mach_msg_type_number_t *infoCnt
-);
-
-/* Routine processor_set_default */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_default
-(
-	host_t host,
-	processor_set_name_t *default_set
-);
-
-/* Routine processor_set_create */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_create
-(
-	host_t host,
-	processor_set_t *new_set,
-	processor_set_name_t *new_name
-);
-
-/* Routine mach_memory_object_memory_entry_64 */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_memory_object_memory_entry_64
-(
-	host_t host,
-	boolean_t internal,
-	memory_object_size_t size,
-	vm_prot_t permission,
-	memory_object_t pager,
-	mach_port_t *entry_handle
-);
-
-/* Routine host_statistics */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_statistics
-(
-	host_t host_priv,
-	host_flavor_t flavor,
-	host_info_t host_info_out,
-	mach_msg_type_number_t *host_info_outCnt
-);
-
-/* Routine host_request_notification */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_request_notification
-(
-	host_t host,
-	host_flavor_t notify_type,
-	mach_port_t notify_port
-);
-
-/* Routine host_lockgroup_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_lockgroup_info
-(
-	host_t host,
-	lockgroup_info_array_t *lockgroup_info,
-	mach_msg_type_number_t *lockgroup_infoCnt
-);
-
-/* Routine host_statistics64 */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t host_statistics64
-(
-	host_t host_priv,
-	host_flavor_t flavor,
-	host_info64_t host_info64_out,
-	mach_msg_type_number_t *host_info64_outCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__mach_host_subsystem__defined
-#define __Request__mach_host_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		host_flavor_t flavor;
-		mach_msg_type_number_t host_info_outCnt;
-	} __Request__host_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__host_kernel_version_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request___host_page_size_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t pager;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		boolean_t internal;
-		vm_size_t size;
-		vm_prot_t permission;
-	} __Request__mach_memory_object_memory_entry_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		processor_flavor_t flavor;
-	} __Request__host_processor_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__host_get_io_master_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		clock_id_t clock_id;
-	} __Request__host_get_clock_service_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__kmod_get_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__host_zone_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__host_virtual_physical_table_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__host_ipc_hash_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__processor_set_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__processor_set_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t pager;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		boolean_t internal;
-		memory_object_size_t size;
-		vm_prot_t permission;
-	} __Request__mach_memory_object_memory_entry_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		host_flavor_t flavor;
-		mach_msg_type_number_t host_info_outCnt;
-	} __Request__host_statistics_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t notify_port;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		host_flavor_t notify_type;
-	} __Request__host_request_notification_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__host_lockgroup_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		host_flavor_t flavor;
-		mach_msg_type_number_t host_info64_outCnt;
-	} __Request__host_statistics64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__mach_host_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__mach_host_subsystem__defined
-#define __RequestUnion__mach_host_subsystem__defined
-union __RequestUnion__mach_host_subsystem {
-	__Request__host_info_t Request_host_info;
-	__Request__host_kernel_version_t Request_host_kernel_version;
-	__Request___host_page_size_t Request__host_page_size;
-	__Request__mach_memory_object_memory_entry_t Request_mach_memory_object_memory_entry;
-	__Request__host_processor_info_t Request_host_processor_info;
-	__Request__host_get_io_master_t Request_host_get_io_master;
-	__Request__host_get_clock_service_t Request_host_get_clock_service;
-	__Request__kmod_get_info_t Request_kmod_get_info;
-	__Request__host_zone_info_t Request_host_zone_info;
-	__Request__host_virtual_physical_table_info_t Request_host_virtual_physical_table_info;
-	__Request__host_ipc_hash_info_t Request_host_ipc_hash_info;
-	__Request__processor_set_default_t Request_processor_set_default;
-	__Request__processor_set_create_t Request_processor_set_create;
-	__Request__mach_memory_object_memory_entry_64_t Request_mach_memory_object_memory_entry_64;
-	__Request__host_statistics_t Request_host_statistics;
-	__Request__host_request_notification_t Request_host_request_notification;
-	__Request__host_lockgroup_info_t Request_host_lockgroup_info;
-	__Request__host_statistics64_t Request_host_statistics64;
-};
-#endif /* !__RequestUnion__mach_host_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__mach_host_subsystem__defined
-#define __Reply__mach_host_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t host_info_outCnt;
-		integer_t host_info_out[15];
-	} __Reply__host_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t kernel_versionOffset; /* MiG doesn't use it */
-		mach_msg_type_number_t kernel_versionCnt;
-		char kernel_version[512];
-	} __Reply__host_kernel_version_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_size_t out_page_size;
-	} __Reply___host_page_size_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t entry_handle;
-		/* end of the kernel processed data */
-	} __Reply__mach_memory_object_memory_entry_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t out_processor_info;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		natural_t out_processor_count;
-		mach_msg_type_number_t out_processor_infoCnt;
-	} __Reply__host_processor_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t io_master;
-		/* end of the kernel processed data */
-	} __Reply__host_get_io_master_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t clock_serv;
-		/* end of the kernel processed data */
-	} __Reply__host_get_clock_service_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t modules;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t modulesCnt;
-	} __Reply__kmod_get_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t names;
-		mach_msg_ool_descriptor_t info;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t namesCnt;
-		mach_msg_type_number_t infoCnt;
-	} __Reply__host_zone_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t info;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t infoCnt;
-	} __Reply__host_virtual_physical_table_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t info;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t infoCnt;
-	} __Reply__host_ipc_hash_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t default_set;
-		/* end of the kernel processed data */
-	} __Reply__processor_set_default_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_set;
-		mach_msg_port_descriptor_t new_name;
-		/* end of the kernel processed data */
-	} __Reply__processor_set_create_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t entry_handle;
-		/* end of the kernel processed data */
-	} __Reply__mach_memory_object_memory_entry_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t host_info_outCnt;
-		integer_t host_info_out[15];
-	} __Reply__host_statistics_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__host_request_notification_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t lockgroup_info;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t lockgroup_infoCnt;
-	} __Reply__host_lockgroup_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t host_info64_outCnt;
-		integer_t host_info64_out[256];
-	} __Reply__host_statistics64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__mach_host_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__mach_host_subsystem__defined
-#define __ReplyUnion__mach_host_subsystem__defined
-union __ReplyUnion__mach_host_subsystem {
-	__Reply__host_info_t Reply_host_info;
-	__Reply__host_kernel_version_t Reply_host_kernel_version;
-	__Reply___host_page_size_t Reply__host_page_size;
-	__Reply__mach_memory_object_memory_entry_t Reply_mach_memory_object_memory_entry;
-	__Reply__host_processor_info_t Reply_host_processor_info;
-	__Reply__host_get_io_master_t Reply_host_get_io_master;
-	__Reply__host_get_clock_service_t Reply_host_get_clock_service;
-	__Reply__kmod_get_info_t Reply_kmod_get_info;
-	__Reply__host_zone_info_t Reply_host_zone_info;
-	__Reply__host_virtual_physical_table_info_t Reply_host_virtual_physical_table_info;
-	__Reply__host_ipc_hash_info_t Reply_host_ipc_hash_info;
-	__Reply__processor_set_default_t Reply_processor_set_default;
-	__Reply__processor_set_create_t Reply_processor_set_create;
-	__Reply__mach_memory_object_memory_entry_64_t Reply_mach_memory_object_memory_entry_64;
-	__Reply__host_statistics_t Reply_host_statistics;
-	__Reply__host_request_notification_t Reply_host_request_notification;
-	__Reply__host_lockgroup_info_t Reply_host_lockgroup_info;
-	__Reply__host_statistics64_t Reply_host_statistics64;
-};
-#endif /* !__RequestUnion__mach_host_subsystem__defined */
-
-#ifndef subsystem_to_name_map_mach_host
-#define subsystem_to_name_map_mach_host \
-    { "host_info", 200 },\
-    { "host_kernel_version", 201 },\
-    { "_host_page_size", 202 },\
-    { "mach_memory_object_memory_entry", 203 },\
-    { "host_processor_info", 204 },\
-    { "host_get_io_master", 205 },\
-    { "host_get_clock_service", 206 },\
-    { "kmod_get_info", 207 },\
-    { "host_zone_info", 208 },\
-    { "host_virtual_physical_table_info", 209 },\
-    { "host_ipc_hash_info", 210 },\
-    { "processor_set_default", 213 },\
-    { "processor_set_create", 214 },\
-    { "mach_memory_object_memory_entry_64", 215 },\
-    { "host_statistics", 216 },\
-    { "host_request_notification", 217 },\
-    { "host_lockgroup_info", 218 },\
-    { "host_statistics64", 219 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _mach_host_user_ */
diff --git a/i386/include/mach/mach_init.h b/i386/include/mach/mach_init.h
deleted file mode 100644
index 36a47fa..0000000
--- a/i386/include/mach/mach_init.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987,1986 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-/*
- *	Items provided by the Mach environment initialization.
- */
-
-#ifndef	_MACH_INIT_
-#define	_MACH_INIT_	1
-
-#include <mach/mach_types.h>
-#include <stdarg.h>
-
-#include <sys/cdefs.h>
-
-/*
- *	Kernel-related ports; how a task/thread controls itself
- */
-
-__BEGIN_DECLS
-extern mach_port_t mach_task_self(void);
-extern mach_port_t mach_host_self(void);
-extern mach_port_t mach_thread_self(void);
-extern kern_return_t host_page_size(host_t, vm_size_t *);
-
-extern	mach_port_t	mach_task_self_;
-#define	mach_task_self() mach_task_self_
-#define	current_task()	mach_task_self()
-
-__END_DECLS
-#include <mach/mach_traps.h>
-__BEGIN_DECLS
-
-/*
- *	Other important ports in the Mach user environment
- */
-
-extern	mach_port_t	bootstrap_port;
-extern	mach_port_t	name_server_port;
-extern	mach_port_t	environment_port;
-extern	mach_port_t	service_port;
-
-/*
- *	Where these ports occur in the "mach_ports_register"
- *	collection... only servers or the runtime library need know.
- */
-
-#define	NAME_SERVER_SLOT	0
-#define	ENVIRONMENT_SLOT	1
-#define SERVICE_SLOT		2
-
-#define	MACH_PORTS_SLOTS_USED	3
-
-/*
- *	Globally interesting numbers.
- *	These macros assume vm_page_size is a power-of-2.
- */
-
-extern	vm_size_t	vm_page_size;
-extern	vm_size_t	vm_page_mask;
-extern	int		vm_page_shift;
-
-#define trunc_page(x)	((x) & (~(vm_page_size - 1)))
-#define round_page(x)	trunc_page((x) + (vm_page_size - 1))
-
-/*
- *	Page-size rounding macros for the fixed-width VM types.
- */
-#define mach_vm_trunc_page(x) ((mach_vm_offset_t)(x) & ~((signed)PAGE_MASK))
-#define mach_vm_round_page(x) (((mach_vm_offset_t)(x) + PAGE_MASK) & ~((signed)PAGE_MASK))
-
-/*
- *	fprintf_stderr uses vprintf_stderr_func to produce
- *	error messages, this can be overridden by a user
- *	application to point to a user-specified output function
- */
-extern int (*vprintf_stderr_func)(const char *format, va_list ap);
-__END_DECLS
-
-#endif	/* _MACH_INIT_ */
diff --git a/i386/include/mach/mach_interface.h b/i386/include/mach/mach_interface.h
deleted file mode 100644
index af939cb..0000000
--- a/i386/include/mach/mach_interface.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (C) Apple Computer 1998
- * ALL Rights Reserved
- */
-/*
- * This file represents the interfaces that used to come
- * from creating the user headers from the mach.defs file.
- * Because mach.defs was decomposed, this file now just
- * wraps up all the new interface headers generated from
- * each of the new .defs resulting from that decomposition.
- */
-#ifndef	_MACH_INTERFACE_H_
-#define _MACH_INTERFACE_H_
-
-#include <mach/clock_priv.h>
-#include <mach/host_priv.h>
-#include <mach/host_security.h>
-#include <mach/ledger.h>
-#include <mach/lock_set.h>
-#include <mach/processor.h>
-#include <mach/processor_set.h>
-#include <mach/semaphore.h>
-#include <mach/task.h>
-#include <mach/thread_act.h>
-#include <mach/vm_map.h>
-
-#endif /* _MACH_INTERFACE_H_ */
diff --git a/i386/include/mach/mach_param.h b/i386/include/mach/mach_param.h
deleted file mode 100644
index e4ead67..0000000
--- a/i386/include/mach/mach_param.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/mach_param.h
- *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
- *	Date:	1986
- *
- *	Mach system sizing parameters
- */
-
-#ifndef	_MACH_MACH_PARAM_H_
-#define _MACH_MACH_PARAM_H_
-
-/* Number of "registered" ports */
-
-#define TASK_PORT_REGISTER_MAX	3
-
-#endif	/* _MACH_MACH_PARAM_H_ */
diff --git a/i386/include/mach/mach_port.defs b/i386/include/mach/mach_port.defs
deleted file mode 100644
index 5801ee4..0000000
--- a/i386/include/mach/mach_port.defs
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_FREE_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/mach_port.defs
- *	Author:	Rich Draves
- *
- *	Exported kernel calls.
- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-	  mach_port 3200;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-#include <mach_debug/mach_debug_types.defs>
-
-/*
- *	Returns the set of port and port set names
- *	to which the target task has access, along with
- *	the type (set or port) for each name.
- */
-
-routine mach_port_names(
-		task		: ipc_space_t;
-	out	names		: mach_port_name_array_t;
-	out	types		: mach_port_type_array_t);
-
-/*
- *	Returns the type (set or port) for the port name
- *	within the target task.  Also indicates whether
- *	there is a dead-name request for the name.
- */
-
-routine mach_port_type(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out	ptype		: mach_port_type_t);
-
-/*
- *	Changes the name by which a port (or port set) is known to
- *	the target task.  The new name can't be in use.  The
- *	old name becomes available for recycling.
- */
-
-routine mach_port_rename(
-		task		: ipc_space_t;
-		old_name	: mach_port_name_t;
-		new_name	: mach_port_name_t);
-
-/*
- *	Allocates the specified kind of object, with the given name.
- *	The right must be one of
- *		MACH_PORT_RIGHT_RECEIVE
- *		MACH_PORT_RIGHT_PORT_SET
- *		MACH_PORT_RIGHT_DEAD_NAME
- *	New port sets are empty.  New ports don't have any
- *	send/send-once rights or queued messages.  The make-send
- *	count is zero and their queue limit is MACH_PORT_QLIMIT_DEFAULT.
- *	New sets, ports, and dead names have one user reference.
- */
-
-routine mach_port_allocate_name(
-		task		: ipc_space_t;
-		right		: mach_port_right_t;
-		name		: mach_port_name_t);
-
-/*
- *	Allocates the specified kind of object.
- *	The right must be one of
- *		MACH_PORT_RIGHT_RECEIVE
- *		MACH_PORT_RIGHT_PORT_SET
- *		MACH_PORT_RIGHT_DEAD_NAME
- *	Like port_allocate_name, but the kernel picks a name.
- *	It can use any name not associated with a right.
- */
-
-routine mach_port_allocate(
-		task		: ipc_space_t;
-		right		: mach_port_right_t;
-	out	name		: mach_port_name_t);
-
-/*
- *	Destroys all rights associated with the name and makes it
- *	available for recycling immediately.  The name can be a
- *	port (possibly with multiple user refs), a port set, or
- *	a dead name (again, with multiple user refs).
- */
-
-routine mach_port_destroy(
-		task		: ipc_space_t;
-		name		: mach_port_name_t);
-
-/*
- *	Releases one send/send-once/dead-name user ref.
- *	Just like mach_port_mod_refs -1, but deduces the
- *	correct type of right.  This allows a user task
- *	to release a ref for a port without worrying
- *	about whether the port has died or not.
- */
-
-routine mach_port_deallocate(
-		task		: ipc_space_t;
-		name		: mach_port_name_t);
-
-/*
- *	A port set always has one user ref.
- *	A send-once right always has one user ref.
- *	A dead name always has one or more user refs.
- *	A send right always has one or more user refs.
- *	A receive right always has one user ref.
- *	The right must be one of
- *		MACH_PORT_RIGHT_RECEIVE
- *		MACH_PORT_RIGHT_PORT_SET
- *		MACH_PORT_RIGHT_DEAD_NAME
- *		MACH_PORT_RIGHT_SEND
- *		MACH_PORT_RIGHT_SEND_ONCE
- */
-
-routine mach_port_get_refs(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		right		: mach_port_right_t;
-	out	refs		: mach_port_urefs_t);
-
-/*
- *	The delta is a signed change to the task's
- *	user ref count for the right.  Only dead names
- *	and send rights can have a positive delta.
- *	The resulting user ref count can't be negative.
- *	If it is zero, the right is deallocated.
- *	If the name isn't a composite right, it becomes
- *	available for recycling.  The right must be one of
- *		MACH_PORT_RIGHT_RECEIVE
- *		MACH_PORT_RIGHT_PORT_SET
- *		MACH_PORT_RIGHT_DEAD_NAME
- *		MACH_PORT_RIGHT_SEND
- *		MACH_PORT_RIGHT_SEND_ONCE
- */
-
-routine mach_port_mod_refs(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		right		: mach_port_right_t;
-		delta		: mach_port_delta_t);
-
-skip;
-
-/*
- *	Only valid for receive rights.
- *	Sets the make-send count for the port.
- */
-routine mach_port_set_mscount(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		mscount		: mach_port_mscount_t);
-
-/*
- *	Only valid for port sets.  Returns a list of
- *	the members.
- */
-
-routine mach_port_get_set_status(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out	members		: mach_port_name_array_t);
-
-/*
- *	Puts the member port (the task must have receive rights)
- *	into the after port set.  If the port is already a member
- *	of any set(s), it is atomically removed from those sets as
- *	part of this operation.  (If after is MACH_PORT_NULL, the
- *	port is still removed from all current sets).
- */
-
-routine mach_port_move_member(
-		task		: ipc_space_t;
-		member		: mach_port_name_t;
-		after		: mach_port_name_t);
-
-/*
- *	Requests a notification from the kernel.  The request
- *	must supply the send-once right which is used for
- *	the notification.  If a send-once right was previously
- *	registered, it is returned.  The msg_id must be one of
- *		MACH_NOTIFY_PORT_DESTROYED (receive rights)
- *		MACH_NOTIFY_DEAD_NAME (send/receive/send-once rights)
- *		MACH_NOTIFY_NO_SENDERS (receive rights)
- *
- *	The sync value specifies whether a notification should
- *	get sent immediately, if appropriate.  The exact meaning
- *	depends on the notification:
- *		MACH_NOTIFY_PORT_DESTROYED: must be zero.
- *		MACH_NOTIFY_DEAD_NAME: if non-zero, then name can be dead,
- *			and the notification gets sent immediately.
- *			If zero, then name can't be dead.
- *		MACH_NOTIFY_NO_SENDERS: the notification gets sent
- *			immediately if the current mscount is greater
- *			than or equal to the sync value and there are no
- *			extant send rights.
- */
-
-routine mach_port_request_notification(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		msgid		: mach_msg_id_t;
-		sync		: mach_port_mscount_t;
-		notify		: mach_port_send_once_t;
-	out	previous	: mach_port_move_send_once_t);
-
-/*
- *	Inserts the specified rights into the target task,
- *	using the specified name.  If inserting send/receive
- *	rights and the task already has send/receive rights
- *	for the port, then the names must agree.  In any case,
- *	the task gains a user ref for the port.
- */
-
-routine mach_port_insert_right(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		poly		: mach_port_poly_t);
-
-/*
- *	Returns the specified right for the named port
- *	in the target task, extracting that right from
- *	the target task.  The target task loses a user
- *	ref and the name may be available for recycling.
- *	msgt_name must be one of
- *		MACH_MSG_TYPE_MOVE_RECEIVE
- *		MACH_MSG_TYPE_COPY_SEND
- *		MACH_MSG_TYPE_MAKE_SEND
- *		MACH_MSG_TYPE_MOVE_SEND
- *		MACH_MSG_TYPE_MAKE_SEND_ONCE
- *		MACH_MSG_TYPE_MOVE_SEND_ONCE
- */
-
-routine mach_port_extract_right(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		msgt_name	: mach_msg_type_name_t;
-	out	poly		: mach_port_poly_t);
-
-/*
- *	Only valid for receive rights.
- *	Sets the sequence number for the port.
- */
-
-routine mach_port_set_seqno(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		seqno		: mach_port_seqno_t);
-
-/*
- *      Returns information about a port.
- */
-
-routine mach_port_get_attributes(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		flavor		: mach_port_flavor_t;
-	out	port_info_out	: mach_port_info_t, CountInOut);
-
-/*
- *      Set attributes of a port
- */
-
-routine mach_port_set_attributes(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		flavor		: mach_port_flavor_t;
-		port_info	: mach_port_info_t);
-
-
-/*
- *	Allocates the specified kind of object, qos version.
- *	The right must be
- *		MACH_PORT_RIGHT_RECEIVE
- *	Like port_allocate_name, but the kernel picks a name.
- *	It can use any name not associated with a right.
- */
-
-routine mach_port_allocate_qos(
-		task		: ipc_space_t;
-		right		: mach_port_right_t;
-	inout	qos		: mach_port_qos_t;
-	out	name		: mach_port_name_t);
-
-
-/*
- *	Generic interface to allocation various kinds of ports.
- *	Should never be called directly by users (at least not
- *	unless they are exceedingly masochistic).
- */
-
-routine mach_port_allocate_full(
-		task		: ipc_space_t;
-		right		: mach_port_right_t;
-		proto		: mach_port_t;
-	inout	qos		: mach_port_qos_t;
-	inout	name		: mach_port_name_t);
-
-
-/*
- *	Pre-expand task port name space.
- */
-routine task_set_port_space(
-		task		: ipc_space_t;
-		table_entries	: int);
-
-
-/*
- *	Returns the exact number of extant send rights
- *	for the given receive right.
- *      This call is only valid on MACH_IPC_DEBUG kernels.
- *      Otherwise, KERN_FAILURE is returned.
- */
-routine	mach_port_get_srights(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out	srights		: mach_port_rights_t);
-
-
-/*
- *	Returns information about an IPC space.
- *      This call is only valid on MACH_IPC_DEBUG kernels.
- *      Otherwise, KERN_FAILURE is returned.
- */
-routine mach_port_space_info(
-		task		: ipc_space_t;
-	out	space_info	: ipc_info_space_t;
-	out	table_info	: ipc_info_name_array_t;
-	out	tree_info	: ipc_info_tree_name_array_t);
-
-/*
- *	Returns information about the dead-name requests
- *	registered with the named receive right.
- *      This call is only valid on MACH_IPC_DEBUG kernels.
- *      Otherwise, KERN_FAILURE is returned.
- */
-routine mach_port_dnrequest_info(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out	dnr_total	: unsigned;	/* total size of table */
-	out	dnr_used	: unsigned);	/* amount used */
-
-/*
- *	Return the type and address of the kernel object
- *	that the given send/receive right represents.
- *      This call is only valid on MACH_IPC_DEBUG kernels.
- *      Otherwise, KERN_FAILURE is returned.
- *
- *	This interface is DEPRECATED in favor of the new
- *	mach_port_kernel_object64() call (see below).
- */
-routine	mach_port_kernel_object(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out	object_type	: unsigned;
-	out	object_addr	: unsigned);
-
-
-/*
- *	Inserts the specified rights into the portset identified
- *	by the <task, pset> pair.  The results of passing in the
- *	Poly argument via the supplied disposition must yield a
- *	receive right.
- *
- *	If the <task,pset> pair does not represent a valid portset
- *	KERN_INVALID_RIGHT is returned.
- *	
- *	If the passed in name argument does not represent a receive
- *	right, KERN_INVALID_CAPABILITY will be returned.
- *
- *	If the port represented by the receive right is already in
- *	the portset, KERN_ALREADY_IN_SET is returned.
- */
-routine mach_port_insert_member(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		pset		: mach_port_name_t);
-
-/*
- *	Extracts the specified right from the named portset
- *	in the target task.  
- *	the target task.  The target task loses a user
- *	ref and the name may be available for recycling.
- *	msgt_name must be one of
- *		MACH_MSG_TYPE_MOVE_RECEIVE
- *		MACH_MSG_TYPE_COPY_SEND
- *		MACH_MSG_TYPE_MAKE_SEND
- *		MACH_MSG_TYPE_MOVE_SEND
- *		MACH_MSG_TYPE_MAKE_SEND_ONCE
- *		MACH_MSG_TYPE_MOVE_SEND_ONCE
- */
-
-routine mach_port_extract_member(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		pset		: mach_port_name_t);
-
-/*
- * Only valid for receive rights.
- * Gets the context pointer for the port.
- */
-
-routine mach_port_get_context(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out context		: mach_vm_address_t);
-
-/*
- * Only valid for receive rights.
- * Sets the context pointer for the port.
- */
-
-routine mach_port_set_context(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-		context		: mach_vm_address_t);
-
-/*
- *	Return the type and address of the kernel object
- *	that the given send/receive right represents.
- *      This call is only valid on MACH_IPC_DEBUG kernels.
- *      Otherwise, KERN_FAILURE is returned.
- */
-routine	mach_port_kobject(
-		task		: ipc_space_t;
-		name		: mach_port_name_t;
-	out	object_type	: natural_t;
-	out	object_addr	: mach_vm_address_t);
-
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/mach_port.h b/i386/include/mach/mach_port.h
deleted file mode 100644
index c964828..0000000
--- a/i386/include/mach/mach_port.h
+++ /dev/null
@@ -1,1383 +0,0 @@
-#ifndef	_mach_port_user_
-#define	_mach_port_user_
-
-/* Module mach_port */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	mach_port_MSG_COUNT
-#define	mach_port_MSG_COUNT	31
-#endif	/* mach_port_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-#include <mach_debug/mach_debug_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine mach_port_names */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_names
-(
-	ipc_space_t task,
-	mach_port_name_array_t *names,
-	mach_msg_type_number_t *namesCnt,
-	mach_port_type_array_t *types,
-	mach_msg_type_number_t *typesCnt
-);
-
-/* Routine mach_port_type */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_type
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_type_t *ptype
-);
-
-/* Routine mach_port_rename */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_rename
-(
-	ipc_space_t task,
-	mach_port_name_t old_name,
-	mach_port_name_t new_name
-);
-
-/* Routine mach_port_allocate_name */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_allocate_name
-(
-	ipc_space_t task,
-	mach_port_right_t right,
-	mach_port_name_t name
-);
-
-/* Routine mach_port_allocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_allocate
-(
-	ipc_space_t task,
-	mach_port_right_t right,
-	mach_port_name_t *name
-);
-
-/* Routine mach_port_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_destroy
-(
-	ipc_space_t task,
-	mach_port_name_t name
-);
-
-/* Routine mach_port_deallocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_deallocate
-(
-	ipc_space_t task,
-	mach_port_name_t name
-);
-
-/* Routine mach_port_get_refs */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_get_refs
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_right_t right,
-	mach_port_urefs_t *refs
-);
-
-/* Routine mach_port_mod_refs */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_mod_refs
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_right_t right,
-	mach_port_delta_t delta
-);
-
-/* Routine mach_port_set_mscount */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_set_mscount
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_mscount_t mscount
-);
-
-/* Routine mach_port_get_set_status */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_get_set_status
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_name_array_t *members,
-	mach_msg_type_number_t *membersCnt
-);
-
-/* Routine mach_port_move_member */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_move_member
-(
-	ipc_space_t task,
-	mach_port_name_t member,
-	mach_port_name_t after
-);
-
-/* Routine mach_port_request_notification */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_request_notification
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_msg_id_t msgid,
-	mach_port_mscount_t sync,
-	mach_port_t notify,
-	mach_msg_type_name_t notifyPoly,
-	mach_port_t *previous
-);
-
-/* Routine mach_port_insert_right */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_insert_right
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_t poly,
-	mach_msg_type_name_t polyPoly
-);
-
-/* Routine mach_port_extract_right */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_extract_right
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_msg_type_name_t msgt_name,
-	mach_port_t *poly,
-	mach_msg_type_name_t *polyPoly
-);
-
-/* Routine mach_port_set_seqno */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_set_seqno
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_seqno_t seqno
-);
-
-/* Routine mach_port_get_attributes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_get_attributes
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_flavor_t flavor,
-	mach_port_info_t port_info_out,
-	mach_msg_type_number_t *port_info_outCnt
-);
-
-/* Routine mach_port_set_attributes */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_set_attributes
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_flavor_t flavor,
-	mach_port_info_t port_info,
-	mach_msg_type_number_t port_infoCnt
-);
-
-/* Routine mach_port_allocate_qos */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_allocate_qos
-(
-	ipc_space_t task,
-	mach_port_right_t right,
-	mach_port_qos_t *qos,
-	mach_port_name_t *name
-);
-
-/* Routine mach_port_allocate_full */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_allocate_full
-(
-	ipc_space_t task,
-	mach_port_right_t right,
-	mach_port_t proto,
-	mach_port_qos_t *qos,
-	mach_port_name_t *name
-);
-
-/* Routine task_set_port_space */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_set_port_space
-(
-	ipc_space_t task,
-	int table_entries
-);
-
-/* Routine mach_port_get_srights */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_get_srights
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_rights_t *srights
-);
-
-/* Routine mach_port_space_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_space_info
-(
-	ipc_space_t task,
-	ipc_info_space_t *space_info,
-	ipc_info_name_array_t *table_info,
-	mach_msg_type_number_t *table_infoCnt,
-	ipc_info_tree_name_array_t *tree_info,
-	mach_msg_type_number_t *tree_infoCnt
-);
-
-/* Routine mach_port_dnrequest_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_dnrequest_info
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	unsigned *dnr_total,
-	unsigned *dnr_used
-);
-
-/* Routine mach_port_kernel_object */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_kernel_object
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	unsigned *object_type,
-	unsigned *object_addr
-);
-
-/* Routine mach_port_insert_member */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_insert_member
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_name_t pset
-);
-
-/* Routine mach_port_extract_member */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_extract_member
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_port_name_t pset
-);
-
-/* Routine mach_port_get_context */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_get_context
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_vm_address_t *context
-);
-
-/* Routine mach_port_set_context */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_set_context
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	mach_vm_address_t context
-);
-
-/* Routine mach_port_kobject */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_port_kobject
-(
-	ipc_space_t task,
-	mach_port_name_t name,
-	natural_t *object_type,
-	mach_vm_address_t *object_addr
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__mach_port_subsystem__defined
-#define __Request__mach_port_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__mach_port_names_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-	} __Request__mach_port_type_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t old_name;
-		mach_port_name_t new_name;
-	} __Request__mach_port_rename_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_right_t right;
-		mach_port_name_t name;
-	} __Request__mach_port_allocate_name_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_right_t right;
-	} __Request__mach_port_allocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-	} __Request__mach_port_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-	} __Request__mach_port_deallocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_port_right_t right;
-	} __Request__mach_port_get_refs_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_port_right_t right;
-		mach_port_delta_t delta;
-	} __Request__mach_port_mod_refs_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_port_mscount_t mscount;
-	} __Request__mach_port_set_mscount_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-	} __Request__mach_port_get_set_status_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t member;
-		mach_port_name_t after;
-	} __Request__mach_port_move_member_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t notify;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_msg_id_t msgid;
-		mach_port_mscount_t sync;
-	} __Request__mach_port_request_notification_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t poly;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_port_name_t name;
-	} __Request__mach_port_insert_right_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_msg_type_name_t msgt_name;
-	} __Request__mach_port_extract_right_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_port_seqno_t seqno;
-	} __Request__mach_port_set_seqno_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_port_flavor_t flavor;
-		mach_msg_type_number_t port_info_outCnt;
-	} __Request__mach_port_get_attributes_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_port_flavor_t flavor;
-		mach_msg_type_number_t port_infoCnt;
-		integer_t port_info[10];
-	} __Request__mach_port_set_attributes_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_right_t right;
-		mach_port_qos_t qos;
-	} __Request__mach_port_allocate_qos_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t proto;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_port_right_t right;
-		mach_port_qos_t qos;
-		mach_port_name_t name;
-	} __Request__mach_port_allocate_full_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int table_entries;
-	} __Request__task_set_port_space_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-	} __Request__mach_port_get_srights_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__mach_port_space_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-	} __Request__mach_port_dnrequest_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-	} __Request__mach_port_kernel_object_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_port_name_t pset;
-	} __Request__mach_port_insert_member_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_port_name_t pset;
-	} __Request__mach_port_extract_member_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-	} __Request__mach_port_get_context_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-		mach_vm_address_t context;
-	} __Request__mach_port_set_context_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_port_name_t name;
-	} __Request__mach_port_kobject_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__mach_port_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__mach_port_subsystem__defined
-#define __RequestUnion__mach_port_subsystem__defined
-union __RequestUnion__mach_port_subsystem {
-	__Request__mach_port_names_t Request_mach_port_names;
-	__Request__mach_port_type_t Request_mach_port_type;
-	__Request__mach_port_rename_t Request_mach_port_rename;
-	__Request__mach_port_allocate_name_t Request_mach_port_allocate_name;
-	__Request__mach_port_allocate_t Request_mach_port_allocate;
-	__Request__mach_port_destroy_t Request_mach_port_destroy;
-	__Request__mach_port_deallocate_t Request_mach_port_deallocate;
-	__Request__mach_port_get_refs_t Request_mach_port_get_refs;
-	__Request__mach_port_mod_refs_t Request_mach_port_mod_refs;
-	__Request__mach_port_set_mscount_t Request_mach_port_set_mscount;
-	__Request__mach_port_get_set_status_t Request_mach_port_get_set_status;
-	__Request__mach_port_move_member_t Request_mach_port_move_member;
-	__Request__mach_port_request_notification_t Request_mach_port_request_notification;
-	__Request__mach_port_insert_right_t Request_mach_port_insert_right;
-	__Request__mach_port_extract_right_t Request_mach_port_extract_right;
-	__Request__mach_port_set_seqno_t Request_mach_port_set_seqno;
-	__Request__mach_port_get_attributes_t Request_mach_port_get_attributes;
-	__Request__mach_port_set_attributes_t Request_mach_port_set_attributes;
-	__Request__mach_port_allocate_qos_t Request_mach_port_allocate_qos;
-	__Request__mach_port_allocate_full_t Request_mach_port_allocate_full;
-	__Request__task_set_port_space_t Request_task_set_port_space;
-	__Request__mach_port_get_srights_t Request_mach_port_get_srights;
-	__Request__mach_port_space_info_t Request_mach_port_space_info;
-	__Request__mach_port_dnrequest_info_t Request_mach_port_dnrequest_info;
-	__Request__mach_port_kernel_object_t Request_mach_port_kernel_object;
-	__Request__mach_port_insert_member_t Request_mach_port_insert_member;
-	__Request__mach_port_extract_member_t Request_mach_port_extract_member;
-	__Request__mach_port_get_context_t Request_mach_port_get_context;
-	__Request__mach_port_set_context_t Request_mach_port_set_context;
-	__Request__mach_port_kobject_t Request_mach_port_kobject;
-};
-#endif /* !__RequestUnion__mach_port_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__mach_port_subsystem__defined
-#define __Reply__mach_port_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t names;
-		mach_msg_ool_descriptor_t types;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t namesCnt;
-		mach_msg_type_number_t typesCnt;
-	} __Reply__mach_port_names_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_port_type_t ptype;
-	} __Reply__mach_port_type_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_rename_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_allocate_name_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_port_name_t name;
-	} __Reply__mach_port_allocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_deallocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_port_urefs_t refs;
-	} __Reply__mach_port_get_refs_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_mod_refs_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_set_mscount_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t members;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t membersCnt;
-	} __Reply__mach_port_get_set_status_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_move_member_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t previous;
-		/* end of the kernel processed data */
-	} __Reply__mach_port_request_notification_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_insert_right_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t poly;
-		/* end of the kernel processed data */
-	} __Reply__mach_port_extract_right_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_set_seqno_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t port_info_outCnt;
-		integer_t port_info_out[10];
-	} __Reply__mach_port_get_attributes_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_set_attributes_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_port_qos_t qos;
-		mach_port_name_t name;
-	} __Reply__mach_port_allocate_qos_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_port_qos_t qos;
-		mach_port_name_t name;
-	} __Reply__mach_port_allocate_full_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_set_port_space_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_port_rights_t srights;
-	} __Reply__mach_port_get_srights_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t table_info;
-		mach_msg_ool_descriptor_t tree_info;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		ipc_info_space_t space_info;
-		mach_msg_type_number_t table_infoCnt;
-		mach_msg_type_number_t tree_infoCnt;
-	} __Reply__mach_port_space_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		unsigned dnr_total;
-		unsigned dnr_used;
-	} __Reply__mach_port_dnrequest_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		unsigned object_type;
-		unsigned object_addr;
-	} __Reply__mach_port_kernel_object_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_insert_member_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_extract_member_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_vm_address_t context;
-	} __Reply__mach_port_get_context_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_port_set_context_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		natural_t object_type;
-		mach_vm_address_t object_addr;
-	} __Reply__mach_port_kobject_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__mach_port_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__mach_port_subsystem__defined
-#define __ReplyUnion__mach_port_subsystem__defined
-union __ReplyUnion__mach_port_subsystem {
-	__Reply__mach_port_names_t Reply_mach_port_names;
-	__Reply__mach_port_type_t Reply_mach_port_type;
-	__Reply__mach_port_rename_t Reply_mach_port_rename;
-	__Reply__mach_port_allocate_name_t Reply_mach_port_allocate_name;
-	__Reply__mach_port_allocate_t Reply_mach_port_allocate;
-	__Reply__mach_port_destroy_t Reply_mach_port_destroy;
-	__Reply__mach_port_deallocate_t Reply_mach_port_deallocate;
-	__Reply__mach_port_get_refs_t Reply_mach_port_get_refs;
-	__Reply__mach_port_mod_refs_t Reply_mach_port_mod_refs;
-	__Reply__mach_port_set_mscount_t Reply_mach_port_set_mscount;
-	__Reply__mach_port_get_set_status_t Reply_mach_port_get_set_status;
-	__Reply__mach_port_move_member_t Reply_mach_port_move_member;
-	__Reply__mach_port_request_notification_t Reply_mach_port_request_notification;
-	__Reply__mach_port_insert_right_t Reply_mach_port_insert_right;
-	__Reply__mach_port_extract_right_t Reply_mach_port_extract_right;
-	__Reply__mach_port_set_seqno_t Reply_mach_port_set_seqno;
-	__Reply__mach_port_get_attributes_t Reply_mach_port_get_attributes;
-	__Reply__mach_port_set_attributes_t Reply_mach_port_set_attributes;
-	__Reply__mach_port_allocate_qos_t Reply_mach_port_allocate_qos;
-	__Reply__mach_port_allocate_full_t Reply_mach_port_allocate_full;
-	__Reply__task_set_port_space_t Reply_task_set_port_space;
-	__Reply__mach_port_get_srights_t Reply_mach_port_get_srights;
-	__Reply__mach_port_space_info_t Reply_mach_port_space_info;
-	__Reply__mach_port_dnrequest_info_t Reply_mach_port_dnrequest_info;
-	__Reply__mach_port_kernel_object_t Reply_mach_port_kernel_object;
-	__Reply__mach_port_insert_member_t Reply_mach_port_insert_member;
-	__Reply__mach_port_extract_member_t Reply_mach_port_extract_member;
-	__Reply__mach_port_get_context_t Reply_mach_port_get_context;
-	__Reply__mach_port_set_context_t Reply_mach_port_set_context;
-	__Reply__mach_port_kobject_t Reply_mach_port_kobject;
-};
-#endif /* !__RequestUnion__mach_port_subsystem__defined */
-
-#ifndef subsystem_to_name_map_mach_port
-#define subsystem_to_name_map_mach_port \
-    { "mach_port_names", 3200 },\
-    { "mach_port_type", 3201 },\
-    { "mach_port_rename", 3202 },\
-    { "mach_port_allocate_name", 3203 },\
-    { "mach_port_allocate", 3204 },\
-    { "mach_port_destroy", 3205 },\
-    { "mach_port_deallocate", 3206 },\
-    { "mach_port_get_refs", 3207 },\
-    { "mach_port_mod_refs", 3208 },\
-    { "mach_port_set_mscount", 3210 },\
-    { "mach_port_get_set_status", 3211 },\
-    { "mach_port_move_member", 3212 },\
-    { "mach_port_request_notification", 3213 },\
-    { "mach_port_insert_right", 3214 },\
-    { "mach_port_extract_right", 3215 },\
-    { "mach_port_set_seqno", 3216 },\
-    { "mach_port_get_attributes", 3217 },\
-    { "mach_port_set_attributes", 3218 },\
-    { "mach_port_allocate_qos", 3219 },\
-    { "mach_port_allocate_full", 3220 },\
-    { "task_set_port_space", 3221 },\
-    { "mach_port_get_srights", 3222 },\
-    { "mach_port_space_info", 3223 },\
-    { "mach_port_dnrequest_info", 3224 },\
-    { "mach_port_kernel_object", 3225 },\
-    { "mach_port_insert_member", 3226 },\
-    { "mach_port_extract_member", 3227 },\
-    { "mach_port_get_context", 3228 },\
-    { "mach_port_set_context", 3229 },\
-    { "mach_port_kobject", 3230 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _mach_port_user_ */
diff --git a/i386/include/mach/mach_syscalls.h b/i386/include/mach/mach_syscalls.h
deleted file mode 100644
index 0e04e4f..0000000
--- a/i386/include/mach/mach_syscalls.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-#ifndef _MACH_MACH_SYSCALLS_H_
-#define	_MACH_MACH_SYSCALLS_H_
-
-#include <mach/mach_traps.h>
-
-#endif	/* _MACH_MACH_SYSCALLS_H_ */
diff --git a/i386/include/mach/mach_time.h b/i386/include/mach/mach_time.h
deleted file mode 100644
index 6a7ce4f..0000000
--- a/i386/include/mach/mach_time.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2001-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef	_MACH_MACH_TIME_H_
-#define	_MACH_MACH_TIME_H_
-
-#include <mach/mach_types.h>
-
-#include <sys/cdefs.h>
-
-struct mach_timebase_info {
-	uint32_t	numer;
-	uint32_t	denom;
-};
-
-typedef struct mach_timebase_info	*mach_timebase_info_t;
-typedef struct mach_timebase_info	mach_timebase_info_data_t;
-
-__BEGIN_DECLS
-
-kern_return_t		mach_timebase_info(
-						mach_timebase_info_t	info);
-
-kern_return_t		mach_wait_until(
-						uint64_t		deadline);
-
-
-uint64_t			mach_absolute_time(void);
-__END_DECLS
-
-#endif /* _MACH_MACH_TIME_H_ */
diff --git a/i386/include/mach/mach_traps.h b/i386/include/mach/mach_traps.h
deleted file mode 100644
index 50cbd0a..0000000
--- a/i386/include/mach/mach_traps.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	Definitions of general Mach system traps.
- *
- *	These are the definitions as seen from user-space.
- *	The kernel definitions are in <mach/syscall_sw.h>.
- *	Kernel RPC functions are defined in <mach/mach_interface.h>.
- */
-
-#ifndef	_MACH_MACH_TRAPS_H_
-#define _MACH_MACH_TRAPS_H_
-
-#include <stdint.h>
-
-#include <mach/std_types.h>
-#include <mach/mach_types.h>
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/vm_types.h>
-#include <mach/clock_types.h>
-
-#include <machine/endian.h>
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-
-
-extern kern_return_t macx_swapon(
-				uint64_t filename,
-				int flags,
-				int size,
-				int priority);
-
-extern kern_return_t macx_swapoff(
-				uint64_t filename,
-				int flags);
-
-extern kern_return_t macx_triggers(
-				int hi_water,
-				int low_water,
-				int flags,
-				mach_port_t alert_port);
-
-extern kern_return_t macx_backing_store_suspend(
-				boolean_t suspend);
-
-extern kern_return_t macx_backing_store_recovery(
-				int pid);
-
-extern boolean_t swtch_pri(int pri);
-
-extern boolean_t swtch(void);
-
-extern kern_return_t thread_switch(
-				mach_port_name_t thread_name,
-				int option,
-				mach_msg_timeout_t option_time);
-
-extern mach_port_name_t task_self_trap(void);
-
-/*
- *	Obsolete interfaces.
- */
-
-extern kern_return_t task_for_pid(
-				mach_port_name_t target_tport,
-				int pid,
-				mach_port_name_t *t);
-
-extern kern_return_t task_name_for_pid(
-				mach_port_name_t target_tport,
-				int pid,
-				mach_port_name_t *tn);
-
-extern kern_return_t pid_for_task(
-				mach_port_name_t t,
-				int *x);
-
-#if		!defined(__LP64__)
-/* these should go away altogether - so no 64 legacy please */
-
-extern kern_return_t map_fd(
-				int fd,
-				vm_offset_t offset,
-				vm_offset_t *va,
-				boolean_t findspace,
-				vm_size_t size);
-
-#endif	/* !defined(__LP64__) */
-
-
-__END_DECLS
-
-#endif	/* _MACH_MACH_TRAPS_H_ */
diff --git a/i386/include/mach/mach_types.defs b/i386/include/mach/mach_types.defs
deleted file mode 100644
index d325179..0000000
--- a/i386/include/mach/mach_types.defs
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- * NOTICE: This file was modified by McAfee Research in 2004 to introduce
- * support for mandatory and extensible security protections.  This notice
- * is included in support of clause 2.2 (b) of the Apple Public License,
- * Version 2.0.
- */
-/*
- */
-/*
- *	Mach kernel interface type declarations
- */
-
-#ifndef	_MACH_MACH_TYPES_DEFS_
-#define _MACH_MACH_TYPES_DEFS_
-
-
-#include <mach/std_types.defs>
-
-type memory_object_offset_t 	= uint64_t;
-type memory_object_size_t 	= uint64_t;
-type memory_object_cluster_size_t = uint32_t;
-type memory_object_fault_info_t = array[16] of integer_t;
-
-
-type mach_port_status_t = struct[10] of integer_t;	/* obsolete */
-
-		/* mach_port_info_t: can hold either a
-		 * mach_port_status_t (9 ints) or a
-		 * mach_port_limits_t (1 int). If new flavors of
-		 * mach_port_{get,set}_attributes are added, the size of
-		 * this array may have to be increased. (See mach/port.h)
-		 */
-type mach_port_flavor_t 	= int;
-type mach_port_info_t		= array[*:10] of integer_t;
-
-type task_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: task_t convert_port_to_task(mach_port_t)
-		outtran: mach_port_t convert_task_to_port(task_t)
-		destructor: task_deallocate(task_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type task_name_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: task_name_t convert_port_to_task_name(mach_port_t)
-		outtran: mach_port_t convert_task_name_to_port(task_name_t)
-		destructor: task_name_deallocate(task_name_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type thread_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: thread_t convert_port_to_thread(mach_port_t)
-		outtran: mach_port_t convert_thread_to_port(thread_t)
-		destructor: thread_deallocate(thread_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type thread_act_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: thread_act_t convert_port_to_thread(mach_port_t)
-		outtran: mach_port_t convert_thread_to_port(thread_act_t)
-		destructor: thread_deallocate(thread_act_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type thread_act_consume_ref_t = mach_port_move_send_t
-		cusertype: thread_act_t
-#if	KERNEL_SERVER
-		intran: thread_act_t convert_port_to_thread(mach_port_t)
-		destructor: thread_deallocate(thread_act_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-		/* thread_state_t: This inline array can hold
-		 * a machine-dependent amount of data, defined in
-		 * mach/machine/???? (currently THREAD_STATE_MAX,
-		 * in mach/thread_state.h)
-		 */
-#include <mach/machine/thread_state.h>
-type thread_state_flavor_t	= int;
-type thread_state_t		= array[*:THREAD_STATE_MAX] of natural_t;
-
-type task_array_t = ^array[] of task_t;
-type thread_array_t = ^array[] of thread_t;
-type thread_act_array_t = ^array[] of thread_act_t;
-type act_params_t = array[6] of int;
-
-type vm_map_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: vm_map_t convert_port_to_map(mach_port_t)
-		destructor: vm_map_deallocate(vm_map_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type vm_task_entry_t = mach_port_t
-		cusertype: vm_map_t
-#if	KERNEL_SERVER
-		intran: vm_map_t convert_port_entry_to_map(mach_port_t)
-		destructor: vm_map_deallocate(vm_map_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type ipc_space_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: ipc_space_t convert_port_to_space(mach_port_t)
-		destructor: space_deallocate(ipc_space_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type vm_prot_t = int;
-type vm_inherit_t = int;
-type vm_purgable_t = int;
-type xxx_vm_statistics_data_t = struct[13] of integer_t;
-type vm_behavior_t = int;
-type vm_statistics_data_t = struct[15] of integer_t;
-type vm_machine_attribute_t = int;
-type vm_machine_attribute_val_t = int;
-type vm_sync_t = int;
-
-		/* thread_info_t: this inline array can hold any of:
-		 * thread_basic_info_t (10 ints)
-		 * policy_timeshare_info_t (5 ints)
-		 * policy_fifo_info_t (4 ints)
-		 * policy_rr_info_t (5 ints)
-		 * if other thread_info flavors are added, this
-		 * definition may need to be changed. (See
-		 * mach/thread_info.h and mach/policy.h) */
-type thread_flavor_t		= int;
-type thread_info_t		= array[*:12] of integer_t;
-
-type thread_policy_flavor_t	= natural_t;
-type thread_policy_t		= array[*:16] of integer_t;
-
-		/* task_info_t: this inline array can hold any of:
-		 * task_basic_info_32_t (8 ints)
-		 * task_basic_info_64_t (10 ints)
-		 * task_events_info_t (8 ints)
-		 * task_thread_times_info_t (4 ints)
-		 * policy_timeshare_info_t (5 ints)
-		 * policy_fifo_info_t (4 ints)
-		 * policy_rr_info_t (5 ints)
-		 * task security token (2 ints)
-		 * task audit token (8 ints)
-		 * If other task_info flavors are added, this
-		 * definition may need to be changed. (See
-		 * mach/task_info.h and mach/policy.h) */
-type task_flavor_t		= int;
-type task_info_t		= array[*:10] of integer_t;
-
-type task_policy_flavor_t	= natural_t;
-type task_policy_t		= array[*:16] of integer_t;
-
-type mem_entry_name_port_t = mach_port_t
-#if     KERNEL_SERVER
-		intran: mem_entry_name_port_t null_conversion(mach_port_t)
-		outtran: mach_port_t null_conversion(mem_entry_name_port_t)
-#endif  /* KERNEL_SERVER */
-		;
-
-type mem_entry_name_port_move_send_t = mach_port_move_send_t
-	cusertype: mem_entry_name_port_t
-#if     KERNEL_SERVER
-		intran: mem_entry_name_port_t null_conversion(mach_port_t)
-		outtran: mach_port_t null_conversion(mem_entry_name_port_t)
-#endif  /* KERNEL_SERVER */
-		;
-
-type memory_object_default_t = mach_port_t
-		;
- 
-type memory_object_t = mach_port_t
-		;
-
-
-type memory_object_control_t = mach_port_t
-		;
-
-type memory_object_name_t = mach_port_t
-		ctype: mach_port_t
-		;
-
-
-type memory_object_copy_strategy_t = int;
-type memory_object_return_t = int;
-
-type machine_info_data_t = struct[5] of integer_t;
-type machine_slot_data_t = struct[8] of integer_t;
-
-type host_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: host_t convert_port_to_host(mach_port_t)
-		outtran: mach_port_t convert_host_to_port(host_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type host_priv_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: host_priv_t convert_port_to_host_priv(mach_port_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type host_security_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: host_security_t convert_port_to_host_security(mach_port_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-		/* 
-		 * host_info_t: variable-sized inline array that can contain:
-		 * 
-		 * 	host_basic_info_old_t (5 ints)
-		 * 	host_basic_info_t (12 ints)
-		 * 	host_sched_info_t (2 ints)
-		 * 	kernel_resource_sizes_t (5 ints)
-		 * 	host_load_info_t (6 ints)
-		 * 	vm_statistics32_t (15 ints)
-		 * 
-		 * If other host_info flavors are added, this definition may
-		 * need to be changed. (See mach/{host_info,vm_statistics}.h)
-		 */
-type host_flavor_t		= int;
-type host_info_t 		= array[*:15] of integer_t;
-
-
-		/* 
-		 * host_info64_t: variable-sized inline array that can contain:
-		 * 
-		 *	vm_statistics_t (6 ints and 9 longs)
-		 */
-type host_info64_t		= array[*:256] of integer_t;
-
-type processor_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: processor_t convert_port_to_processor(mach_port_t)
-		outtran: mach_port_t convert_processor_to_port(processor_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type processor_array_t 	= ^array[] of processor_t;
-
-		/* processor_info_t: variable-sized inline array that can
-		 * contain:
-		 * processor_basic_info_t:   (5 ints)
-		 * processor_cpu_load_info_t:(4 ints)
-		 * processor_machine_info_t :(12 ints)
-		 * If other processor_info flavors are added, this definition
-		 * may need to be changed. (See mach/processor_info.h) */
-type processor_flavor_t		= int;
-type processor_info_t		= array[*:12] of integer_t;
-type processor_info_array_t	= ^array[] of integer_t;
-
-type processor_set_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: processor_set_t convert_port_to_pset(mach_port_t)
-		outtran: mach_port_t convert_pset_to_port(processor_set_t)
-		destructor: pset_deallocate(processor_set_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type processor_set_array_t = ^array[] of processor_set_t;
-
-type processor_set_name_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: processor_set_name_t convert_port_to_pset_name(mach_port_t)
-		outtran: mach_port_t convert_pset_name_to_port(processor_set_name_t)
-		destructor: pset_deallocate(processor_set_name_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type processor_set_name_array_t = ^array[] of processor_set_name_t;
-
-		/* processor_set_info_t: variable-size inline array
-		 * that can hold:
-		 * processor_set_basic_info (5 ints)
-		 * processor_set_load_info (4 ints)
-		 * policy_timeshare_base_t (1 int)
-		 * policy_fifo_base_t (1 int)
-		 * policy_rr_base_t (1 int)
-		 * policy_timeshare_base_t (1 int)
-		 * policy_fifo_base_t (1 int)
-		 * policy_rr_base_t (1 int)
-		 * policy_t (1 int)
-		 * If other flavors are added, this definition may
-		 * need to be changed. (see mach/processor.h) */
-type processor_set_flavor_t	= int;
-type processor_set_info_t	= array[*:5] of integer_t;	
-
-type bootstrap_t = mach_port_t;
-
-type kernel_version_t           = c_string[*:512];
-type kernel_boot_info_t         = c_string[*:4096];
-
-type time_value_t = struct[2] of integer_t;
-
-type mach_port_qos_t = struct[2] of integer_t;
-
-type emulation_vector_t		= ^array[] of vm_offset_t;
-
-type inline_existence_map_t	= array[*:512] of char;
-
-type policy_t			= int;
-		/* policy_info_t: variable-size inline array. Can hold:
-		 * policy_timeshare_info_t (5 ints)
-		 * policy_fifo_info_t (4 ints)
-		 * policy_rr_info_t (5 ints) */
-type policy_base_t		= array[*:5] of integer_t;
-type policy_info_t		= array[*:2] of integer_t;
-type policy_limit_t		= array[*:1] of integer_t;
-
-type ledger_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: ledger_t convert_port_to_ledger(mach_port_t)
-		outtran: mach_port_t convert_ledger_to_port(ledger_t)
-#endif	/* KERNEL_SERVER */
-                ;
-
-type ledger_array_t	 	= ^array[] of ledger_t;
-type ledger_item_t		= integer_t;
-
-type security_token_t		= struct[2] of uint32_t;
-type audit_token_t		= struct[8] of uint32_t;
-
-type msg_labels_t = mach_port_t;
-
-		/* memory_object_info_t: variable-size inline array:
-		 * memory_object_attr_info_t (5 ints)
-		 * XXX actually it's 6 ints temporarily (object_ready!)
-		 * memory_object_behave_info_t (4 ints)
-		 * memory_object_perf_info_t (2 ints)
-		 * old_memory_object_attr_info_t (3 ints)
-		 * memory_object_norma_info_t (5 ints)
-		 * If other flavors are added, this definition may
-		 * need to be changed. (see mach/memory_object.h) */
-type memory_object_flavor_t	= int;
-type memory_object_info_t	= array[*:6] of int;
-
-		/* vm_region_info_t: variable-size inline array that can hold:
-		 * vm_region_basic_info_t (8 ints)
-		 * If other flavors are added, this definition may
-		 * need to be changed. (see mach/vm_region.h) */
-type vm_region_flavor_t		= int;
-type vm_region_info_t		= array[*:10] of int;
-type vm_region_recurse_info_t	= array[*:19] of int;
-
-type vm_page_info_flavor_t	= int;
-type vm_page_info_t		= array[*:32] of int;
-
-type mach_vm_read_entry_t = array[512] of mach_vm_offset_t;
-type vm_read_entry_t = array[512] of vm_offset_t;
-#if VM32_SUPPORT
-type vm32_read_entry_t = array[512] of vm32_offset_t;
-#endif
-
-type exception_mask_t		= int;
-type exception_behavior_t	= int;
-
-type    exception_handler_t = mach_port_t;
-
-type	exception_handler_array_t	=
-			array[*:32] of exception_handler_t;
-
-type	exception_behavior_array_t	=
-			array[*:32] of exception_behavior_t;
-
-type	exception_flavor_array_t	=
-			array[*:32] of thread_state_flavor_t;
-
-type	exception_mask_array_t	=
-			array[*:32] of exception_mask_t;
-
-type semaphore_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: semaphore_t convert_port_to_semaphore(mach_port_t)
-		outtran: mach_port_t convert_semaphore_to_port(semaphore_t)
-		destructor: semaphore_dereference(semaphore_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type semaphore_consume_ref_t = mach_port_move_send_t
-		cusertype: semaphore_t
-#if	KERNEL_SERVER
-		intran: semaphore_t convert_port_to_semaphore(mach_port_t)
-		outtran: mach_port_t convert_semaphore_to_port(semaphore_t)
-		destructor: semaphore_dereference(semaphore_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-type lock_set_t = mach_port_t
-#if	KERNEL_SERVER
-		intran: lock_set_t convert_port_to_lock_set(mach_port_t)
-		outtran: mach_port_t convert_lock_set_to_port(lock_set_t)
-		destructor: lock_set_dereference(lock_set_t)
-#endif	/* KERNEL_SERVER */
-		;
-
-/* kernel module loader */
-type kmod_t = int;
-type kmod_control_flavor_t = int;
-
-type kmod_args_t = ^array[] of MACH_MSG_TYPE_BYTE
-	ctype: kmod_args_t;
-
-type io_master_t = mach_port_t;
-type UNDServerRef = mach_port_t;
-
-#if KERNEL_SERVER
-
-simport <kern/ipc_mig.h>;	/* pick up kernel-specific MIG things */
-
-#endif /* KERNEL_SERVER */
-
-import <mach/mig.h>;
-import <mach/mach_types.h>;
-
-#endif	/* _MACH_MACH_TYPES_DEFS_ */
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/mach_types.h b/i386/include/mach/mach_types.h
deleted file mode 100644
index 30ebec9..0000000
--- a/i386/include/mach/mach_types.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
- * support for mandatory and extensible security protections.  This notice
- * is included in support of clause 2.2 (b) of the Apple Public License,
- * Version 2.0.
- */
-/*
- *	File:	mach/mach_types.h
- *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
- *	Date:	1986
- *
- *	Mach external interface definitions.
- *
- */
-
-#ifndef	_MACH_MACH_TYPES_H_
-#define _MACH_MACH_TYPES_H_
-
-#include <stdint.h>
-
-#include <sys/cdefs.h>
-
-#include <mach/host_info.h>
-#include <mach/host_notify.h>
-#include <mach/host_special_ports.h>
-#include <mach/machine.h>
-#include <mach/machine/vm_types.h>
-#include <mach/memory_object_types.h>
-#include <mach/message.h>
-#include <mach/exception_types.h>
-#include <mach/port.h>
-#include <mach/processor_info.h>
-#include <mach/task_info.h>
-#include <mach/task_policy.h>
-#include <mach/task_special_ports.h>
-#include <mach/thread_info.h>
-#include <mach/thread_policy.h>
-#include <mach/thread_special_ports.h>
-#include <mach/thread_status.h>
-#include <mach/time_value.h>
-#include <mach/clock_types.h>
-#include <mach/vm_attributes.h>
-#include <mach/vm_inherit.h>
-#include <mach/vm_purgable.h>
-#include <mach/vm_behavior.h>
-#include <mach/vm_prot.h>
-#include <mach/vm_statistics.h>
-#include <mach/vm_sync.h>
-#include <mach/vm_types.h>
-#include <mach/vm_region.h>
-#include <mach/kmod.h>
-
-
-/*
- * If we are not in the kernel, then these will all be represented by
- * ports at user-space.
- */
-typedef mach_port_t		task_t;
-typedef mach_port_t		task_name_t;
-typedef mach_port_t		thread_t;
-typedef	mach_port_t		thread_act_t;
-typedef mach_port_t		ipc_space_t;
-typedef mach_port_t		host_t;
-typedef mach_port_t		host_priv_t;
-typedef mach_port_t		host_security_t;
-typedef mach_port_t		processor_t;
-typedef mach_port_t		processor_set_t;
-typedef mach_port_t		processor_set_control_t;
-typedef mach_port_t		semaphore_t;
-typedef mach_port_t		lock_set_t;
-typedef mach_port_t		ledger_t;
-typedef mach_port_t		alarm_t;
-typedef mach_port_t		clock_serv_t;
-typedef mach_port_t		clock_ctrl_t;
-
-
-/*
- * These aren't really unique types.  They are just called
- * out as unique types at one point in history.  So we list
- * them here for compatibility.
- */
-typedef processor_set_t		processor_set_name_t;
-
-/*
- * These types are just hard-coded as ports
- */
-typedef mach_port_t		clock_reply_t;
-typedef mach_port_t		bootstrap_t;
-typedef	mach_port_t		mem_entry_name_port_t;
-typedef mach_port_t		exception_handler_t;
-typedef exception_handler_t	*exception_handler_array_t;
-typedef mach_port_t		vm_task_entry_t;
-typedef mach_port_t		io_master_t;
-typedef mach_port_t		UNDServerRef;
-
-/*
- * Mig doesn't translate the components of an array.
- * For example, Mig won't use the thread_t translations
- * to translate a thread_array_t argument.  So, these definitions
- * are not completely accurate at the moment for other kernel
- * components.
- */
-typedef task_t			*task_array_t;
-typedef thread_t		*thread_array_t;
-typedef processor_set_t		*processor_set_array_t;
-typedef processor_set_t		*processor_set_name_array_t;
-typedef processor_t		*processor_array_t;
-typedef	thread_act_t		*thread_act_array_t;
-typedef ledger_t		*ledger_array_t;
-
-/*
- * However the real mach_types got declared, we also have to declare
- * types with "port" in the name for compatability with the way OSF
- * had declared the user interfaces at one point.  Someday these should
- * go away.
- */
-typedef task_t			task_port_t;
-typedef	task_array_t		task_port_array_t;
-typedef thread_t		thread_port_t;
-typedef	thread_array_t		thread_port_array_t;
-typedef ipc_space_t		ipc_space_port_t;
-typedef host_t			host_name_t;
-typedef host_t			host_name_port_t;
-typedef processor_set_t		processor_set_port_t;
-typedef processor_set_t		processor_set_name_port_t;
-typedef processor_set_array_t	processor_set_name_port_array_t;
-typedef processor_set_t		processor_set_control_port_t;
-typedef processor_t		processor_port_t;
-typedef processor_array_t	processor_port_array_t;
-typedef thread_act_t		thread_act_port_t;
-typedef	thread_act_array_t	thread_act_port_array_t;
-typedef semaphore_t		semaphore_port_t;
-typedef lock_set_t		lock_set_port_t;
-typedef ledger_t		ledger_port_t;
-typedef ledger_array_t		ledger_port_array_t;
-typedef alarm_t			alarm_port_t;
-typedef clock_serv_t		clock_serv_port_t;
-typedef clock_ctrl_t		clock_ctrl_port_t;
-typedef exception_handler_t	exception_port_t;
-typedef exception_handler_array_t exception_port_arrary_t;
-
-
-#define TASK_NULL		((task_t) 0)
-#define TASK_NAME_NULL		((task_name_t) 0)
-#define THREAD_NULL		((thread_t) 0)
-#define THR_ACT_NULL 		((thread_act_t) 0)
-#define IPC_SPACE_NULL		((ipc_space_t) 0)
-#define HOST_NULL		((host_t) 0)
-#define HOST_PRIV_NULL		((host_priv_t)0)
-#define HOST_SECURITY_NULL	((host_security_t)0)
-#define PROCESSOR_SET_NULL	((processor_set_t) 0)
-#define PROCESSOR_NULL		((processor_t) 0)
-#define SEMAPHORE_NULL		((semaphore_t) 0)
-#define LOCK_SET_NULL		((lock_set_t) 0)
-#define LEDGER_NULL 		((ledger_t) 0)
-#define ALARM_NULL		((alarm_t) 0)
-#define CLOCK_NULL		((clock_t) 0)
-#define UND_SERVER_NULL		((UNDServerRef) 0)
-
-typedef natural_t 		ledger_item_t;
-#define LEDGER_ITEM_INFINITY ((ledger_item_t) (~0))
-
-typedef mach_vm_offset_t	*emulation_vector_t;
-typedef char			*user_subsystem_t;
-
-typedef char			*labelstr_t;
-/*
- *	Backwards compatibility, for those programs written
- *	before mach/{std,mach}_types.{defs,h} were set up.
- */
-#include <mach/std_types.h>
-
-#endif	/* _MACH_MACH_TYPES_H_ */
diff --git a/i386/include/mach/mach_vm.defs b/i386/include/mach/mach_vm.defs
deleted file mode 100644
index 8dbb71f..0000000
--- a/i386/include/mach/mach_vm.defs
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_FREE_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/mach_vm.defs
- *
- *	Exported kernel VM calls (for any task on the platform).
- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-	  mach_vm
-#else
-	  vm_map_lp64_local
-#endif
-	  4800;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-#include <mach_debug/mach_debug_types.defs>
-
-/*
- *	Allocate zero-filled memory in the address space
- *	of the target task, either at the specified address,
- *	or wherever space can be found (controlled by flags),
- *	of the specified size.  The address at which the
- *	allocation actually took place is returned.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_allocate(
-#else
-routine vm_allocate(
-#endif
-		target		: vm_task_entry_t;
-	inout	address		: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		flags		: int);
-
-/*
- *	Deallocate the specified range from the virtual
- *	address space of the target virtual memory map.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_deallocate(
-#else
-routine vm_deallocate(
-#endif
-		target		: vm_task_entry_t;
-		address		: mach_vm_address_t;
-		size		: mach_vm_size_t);
-
-/*
- *	Set the current or maximum protection attribute
- *	for the specified range of the virtual address
- *	space of the target virtual memory map.  The current
- *	protection limits the memory access rights of threads
- *	within the map; the maximum protection limits the accesses
- *	that may be given in the current protection.
- *	Protections are specified as a set of {read, write, execute}
- *	*permissions*.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_protect(
-#else
-routine vm_protect(
-#endif
-		target_task	: vm_task_entry_t;
-		address		: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		set_maximum	: boolean_t;
-		new_protection	: vm_prot_t);
-
-/*
- *	Set the inheritance attribute for the specified range
- *	of the virtual address space of the target address space.
- *	The inheritance value is one of {none, copy, share}, and
- *	specifies how the child address space should acquire
- *	this memory at the time of a task_create call.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_inherit(
-#else
-routine vm_inherit(
-#endif
-		target_task	: vm_task_entry_t;
-		address		: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		new_inheritance	: vm_inherit_t);
-
-/*
- *	Returns the contents of the specified range of the
- *	virtual address space of the target task.  [The
- *	range must be aligned on a virtual page boundary,
- *	and must be a multiple of pages in extent.  The
- *	protection on the specified range must permit reading.]
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_read(
-#else
-routine vm_read(
-#endif
-		target_task	: vm_map_t;
-		address		: mach_vm_address_t;
-		size		: mach_vm_size_t;
-	out	data		: pointer_t);
-
-/* 
- * List corrollary to vm_read, returns mapped contents of specified
- * ranges within target address space.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_read_list(
-#else
-routine vm_read_list(
-#endif
-		target_task 	: vm_map_t;
-	inout	data_list   	: mach_vm_read_entry_t;
-		count		: natural_t);
-
-/*
- *	Writes the contents of the specified range of the
- *	virtual address space of the target task.  [The
- *	range must be aligned on a virtual page boundary,
- *	and must be a multiple of pages in extent.  The
- *	protection on the specified range must permit writing.]
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_write(
-#else
-routine vm_write(
-#endif
-		target_task	: vm_map_t;
-		address		: mach_vm_address_t;
-		data		: pointer_t);
-
-/*
- *	Copy the contents of the source range of the virtual
- *	address space of the target task to the destination
- *	range in that same address space.  [Both of the
- *	ranges must be aligned on a virtual page boundary,
- *	and must be multiples of pages in extent.  The
- *	protection on the source range must permit reading,
- *	and the protection on the destination range must
- *	permit writing.]
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_copy(
-#else
-routine vm_copy(
-#endif
-		target_task	: vm_map_t;
-		source_address	: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		dest_address	: mach_vm_address_t);
-
-/*
- *	Returns the contents of the specified range of the
- *	virtual address space of the target task.  [There
- *	are no alignment restrictions, and the results will
- *      overwrite the area pointed to by data - which must
- *      already exist. The protection on the specified range
- *	must permit reading.]
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_read_overwrite(
-#else
-routine vm_read_overwrite(
-#endif
-		target_task	: vm_map_t;
-		address		: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		data		: mach_vm_address_t;
-	out	outsize		: mach_vm_size_t);
-
-
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_msync(
-#else
-routine vm_msync(
-#endif
-		target_task	: vm_map_t;
-		address		: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		sync_flags	: vm_sync_t );
-
-/*
- *	Set the paging behavior attribute for the specified range
- *	of the virtual address space of the target task.
- *	The behavior value is one of {default, random, forward 
- *	sequential, reverse sequential} and indicates the expected
- *	page reference pattern for the specified range.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_behavior_set(
-#else
-routine vm_behavior_set(
-#endif
-		target_task	: vm_map_t;
-		address		: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		new_behavior	: vm_behavior_t);
-
-
-/*
- *	Map a user-supplie memory object into the virtual address
- *	space of the target task.  If desired (anywhere is TRUE),
- *	the kernel will find a suitable address range of the
- *	specified size; else, the specific address will be allocated.
- *
- *	The beginning address of the range will be aligned on a virtual
- *	page boundary, be at or beyond the address specified, and
- *	meet the mask requirements (bits turned on in the mask must not
- *	be turned on in the result); the size of the range, in bytes,
- *	will be rounded	up to an integral number of virtual pages.
- *
- *	The memory in the resulting range will be associated with the
- *	specified memory object, with the beginning of the memory range
- *	referring to the specified offset into the memory object.
- *
- *	The mapping will take the current and maximum protections and
- *	the inheritance attributes specified; see the vm_protect and
- *	vm_inherit calls for a description of these attributes.
- *
- *	If desired (copy is TRUE), the memory range will be filled
- *	with a copy of the data from the memory object; this copy will
- *	be private to this mapping in this target task.  Otherwise,
- *	the memory in this mapping will be shared with other mappings
- *	of the same memory object at the same offset (in this task or
- *	in other tasks).  [The Mach kernel only enforces shared memory
- *	consistency among mappings on one host with similar page alignments.
- *	The user-defined memory manager for this object is responsible
- *	for further consistency.]
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_map(
-#else
-routine vm_map(
-#endif
-		target_task	: vm_task_entry_t;
-	inout	address		: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		mask		: mach_vm_offset_t;
-		flags		: int;
-		object		: mem_entry_name_port_t;
-		offset		: memory_object_offset_t;
-		copy		: boolean_t;
-		cur_protection	: vm_prot_t;
-		max_protection	: vm_prot_t;
-		inheritance	: vm_inherit_t);
-
-/*
- *	Set/Get special properties of memory associated
- *	to some virtual address range, such as cachability, 
- *	migrability, replicability.  Machine-dependent.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_machine_attribute(
-#else
-routine vm_machine_attribute(
-#endif
-		target_task	: vm_map_t;
-		address		: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		attribute	: vm_machine_attribute_t;
-	inout	value		: vm_machine_attribute_val_t);
-
-/*
- *      Map portion of a task's address space.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_remap(
-#else
-routine vm_remap(
-#endif
-		target_task	: vm_map_t;
-	inout	target_address	: mach_vm_address_t;
-		size		: mach_vm_size_t;
-		mask		: mach_vm_offset_t;
-		anywhere	: boolean_t;
-		src_task	: vm_map_t;
-		src_address	: mach_vm_address_t;
-		copy		: boolean_t;
-	out	cur_protection	: vm_prot_t;
-	out	max_protection	: vm_prot_t;
-		inheritance	: vm_inherit_t);
-
-/*
- *      Give the caller information on the given location in a virtual
- *      address space.  If a page is mapped return ref and dirty info.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_page_query(
-#else
-routine vm_map_page_query(
-#endif
-                target_map      :vm_map_t;
-                offset          :mach_vm_offset_t;
-        out     disposition     :integer_t;
-        out     ref_count       :integer_t);
-
-
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_region_recurse(
-#else
-routine vm_region_recurse_64(
-#endif
-                target_task     : vm_map_t;
-	inout	address		: mach_vm_address_t;
-        out     size            : mach_vm_size_t;
-	inout	nesting_depth	: natural_t;
-	out	info		: vm_region_recurse_info_t,CountInOut);
-
-/*
- *      Returns information about the contents of the virtual
- *      address space of the target task at the specified
- *      address.  The returned protection, inheritance, sharing
- *      and memory object values apply to the entire range described
- *      by the address range returned; the memory object offset
- *      corresponds to the beginning of the address range.
- *      [If the specified address is not allocated, the next
- *      highest address range is described.  If no addresses beyond
- *      the one specified are allocated, the call returns KERN_NO_SPACE.]
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_region(
-#else
-routine vm_region_64(
-#endif
-                target_task     : vm_map_t;
-	inout	address		: mach_vm_address_t;
-        out     size            : mach_vm_size_t;
-		flavor		: vm_region_flavor_t;
-	out	info		: vm_region_info_t, CountInOut;
-        out     object_name     : memory_object_name_t =
-                                        MACH_MSG_TYPE_MOVE_SEND
-                                        ctype: mach_port_t);
-
-/*
- *	Allow application level processes to create named entries which
- *	correspond to mapped portions of their address space.  These named
- *	entries can then be manipulated, shared with other processes in
- *	other address spaces and ultimately mapped in ohter address spaces
- *
- *	THIS INTERFACE IS STILL EVOLVING.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-#if !defined(__LP64__) || KERNEL_SERVER || XNU_KERNEL_PRIVATE || LIBSYSCALL_INTERFACE
-routine _mach_make_memory_entry(
-#else
-routine mach_make_memory_entry(
-#endif
-#else
-routine mach_make_memory_entry_64(
-#endif
-		target_task	:vm_map_t;
-	inout	size		:memory_object_size_t;
-		offset		:memory_object_offset_t;
-		permission	:vm_prot_t;
-	out	object_handle	:mem_entry_name_port_move_send_t;
-		parent_handle	:mem_entry_name_port_t);
-
-/*
- *	Control behavior and investigate state of a "purgable" object in
- *	the virtual address space of the target task.  A purgable object is
- *	created via a call to mach_vm_allocate() with VM_FLAGS_PURGABLE
- *	specified.  See the routine implementation for a complete
- *	definition of the routine.
- */
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_purgable_control(
-#else
-routine vm_purgable_control(
-#endif
-		target_task	: vm_map_t;
-		address		: mach_vm_address_t;
-		control		: vm_purgable_t;
-	inout	state		: int);
-
-
-#if !defined(_MACH_VM_PUBLISH_AS_LOCAL_)
-routine mach_vm_page_info(
-			target_task		: vm_map_t;
-			address			: mach_vm_address_t;
-			flavor			: vm_page_info_flavor_t;
-	out		info			: vm_page_info_t, CountInOut);
-#else
-skip;
-#endif
-
-/****************************** Legacy section ***************************/
-/*  The following definitions are exist to provide compatibility with    */
-/*  the legacy APIs.  They are no different.  We just need to produce    */
-/*  the user-level stub interface for them.                              */
-/****************************** Legacy section ***************************/
-
-
-/*
- * These interfaces just aren't supported in the new (wide) model:
- *
- *	mach_vm_region_info() -
- *	vm_map_pages_info() -
- *		no user-level replacement for these MACH_DEBUG interfaces
- *	vm_map_get_upl() -
- *		no user-level replacement at the moment
- *	vm_region_info() -
- *		use mach_vm_region_info() or vm_region_info_64()
- *	vm_region_recurse() -
- *		use mach_vm_region_recurse() or vm_region_recurse_64()
- */
-
-/*
- * The following legacy interfaces are provides as macro wrappers to the new
- * interfaces.  You should strive to use the new ones instead:
- *
- *	vm_map() -
- *		use mach_vm_map() or vm_map_64()
- *	vm_region() -
- *		use mach_vm_region() or vm_region_64()
- *	mach_make_memory_entry() -
- *		use mach_vm_make_memory_entry() or mach_make_memory_entry_64()
- */
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/mach_vm.h b/i386/include/mach/mach_vm.h
deleted file mode 100644
index f72b17e..0000000
--- a/i386/include/mach/mach_vm.h
+++ /dev/null
@@ -1,1032 +0,0 @@
-#ifndef	_mach_vm_user_
-#define	_mach_vm_user_
-
-/* Module mach_vm */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	mach_vm_MSG_COUNT
-#define	mach_vm_MSG_COUNT	20
-#endif	/* mach_vm_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-#include <mach_debug/mach_debug_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine mach_vm_allocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_allocate
-(
-	vm_map_t target,
-	mach_vm_address_t *address,
-	mach_vm_size_t size,
-	int flags
-);
-
-/* Routine mach_vm_deallocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_deallocate
-(
-	vm_map_t target,
-	mach_vm_address_t address,
-	mach_vm_size_t size
-);
-
-/* Routine mach_vm_protect */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_protect
-(
-	vm_map_t target_task,
-	mach_vm_address_t address,
-	mach_vm_size_t size,
-	boolean_t set_maximum,
-	vm_prot_t new_protection
-);
-
-/* Routine mach_vm_inherit */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_inherit
-(
-	vm_map_t target_task,
-	mach_vm_address_t address,
-	mach_vm_size_t size,
-	vm_inherit_t new_inheritance
-);
-
-/* Routine mach_vm_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_read
-(
-	vm_map_t target_task,
-	mach_vm_address_t address,
-	mach_vm_size_t size,
-	vm_offset_t *data,
-	mach_msg_type_number_t *dataCnt
-);
-
-/* Routine mach_vm_read_list */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_read_list
-(
-	vm_map_t target_task,
-	mach_vm_read_entry_t data_list,
-	natural_t count
-);
-
-/* Routine mach_vm_write */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_write
-(
-	vm_map_t target_task,
-	mach_vm_address_t address,
-	vm_offset_t data,
-	mach_msg_type_number_t dataCnt
-);
-
-/* Routine mach_vm_copy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_copy
-(
-	vm_map_t target_task,
-	mach_vm_address_t source_address,
-	mach_vm_size_t size,
-	mach_vm_address_t dest_address
-);
-
-/* Routine mach_vm_read_overwrite */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_read_overwrite
-(
-	vm_map_t target_task,
-	mach_vm_address_t address,
-	mach_vm_size_t size,
-	mach_vm_address_t data,
-	mach_vm_size_t *outsize
-);
-
-/* Routine mach_vm_msync */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_msync
-(
-	vm_map_t target_task,
-	mach_vm_address_t address,
-	mach_vm_size_t size,
-	vm_sync_t sync_flags
-);
-
-/* Routine mach_vm_behavior_set */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_behavior_set
-(
-	vm_map_t target_task,
-	mach_vm_address_t address,
-	mach_vm_size_t size,
-	vm_behavior_t new_behavior
-);
-
-/* Routine mach_vm_map */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_map
-(
-	vm_map_t target_task,
-	mach_vm_address_t *address,
-	mach_vm_size_t size,
-	mach_vm_offset_t mask,
-	int flags,
-	mem_entry_name_port_t object,
-	memory_object_offset_t offset,
-	boolean_t copy,
-	vm_prot_t cur_protection,
-	vm_prot_t max_protection,
-	vm_inherit_t inheritance
-);
-
-/* Routine mach_vm_machine_attribute */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_machine_attribute
-(
-	vm_map_t target_task,
-	mach_vm_address_t address,
-	mach_vm_size_t size,
-	vm_machine_attribute_t attribute,
-	vm_machine_attribute_val_t *value
-);
-
-/* Routine mach_vm_remap */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_remap
-(
-	vm_map_t target_task,
-	mach_vm_address_t *target_address,
-	mach_vm_size_t size,
-	mach_vm_offset_t mask,
-	boolean_t anywhere,
-	vm_map_t src_task,
-	mach_vm_address_t src_address,
-	boolean_t copy,
-	vm_prot_t *cur_protection,
-	vm_prot_t *max_protection,
-	vm_inherit_t inheritance
-);
-
-/* Routine mach_vm_page_query */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_page_query
-(
-	vm_map_t target_map,
-	mach_vm_offset_t offset,
-	integer_t *disposition,
-	integer_t *ref_count
-);
-
-/* Routine mach_vm_region_recurse */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_region_recurse
-(
-	vm_map_t target_task,
-	mach_vm_address_t *address,
-	mach_vm_size_t *size,
-	natural_t *nesting_depth,
-	vm_region_recurse_info_t info,
-	mach_msg_type_number_t *infoCnt
-);
-
-/* Routine mach_vm_region */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_region
-(
-	vm_map_t target_task,
-	mach_vm_address_t *address,
-	mach_vm_size_t *size,
-	vm_region_flavor_t flavor,
-	vm_region_info_t info,
-	mach_msg_type_number_t *infoCnt,
-	mach_port_t *object_name
-);
-
-/* Routine _mach_make_memory_entry */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t _mach_make_memory_entry
-(
-	vm_map_t target_task,
-	memory_object_size_t *size,
-	memory_object_offset_t offset,
-	vm_prot_t permission,
-	mem_entry_name_port_t *object_handle,
-	mem_entry_name_port_t parent_handle
-);
-
-/* Routine mach_vm_purgable_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_purgable_control
-(
-	vm_map_t target_task,
-	mach_vm_address_t address,
-	vm_purgable_t control,
-	int *state
-);
-
-/* Routine mach_vm_page_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_page_info
-(
-	vm_map_t target_task,
-	mach_vm_address_t address,
-	vm_page_info_flavor_t flavor,
-	vm_page_info_t info,
-	mach_msg_type_number_t *infoCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__mach_vm_subsystem__defined
-#define __Request__mach_vm_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		int flags;
-	} __Request__mach_vm_allocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-	} __Request__mach_vm_deallocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		boolean_t set_maximum;
-		vm_prot_t new_protection;
-	} __Request__mach_vm_protect_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		vm_inherit_t new_inheritance;
-	} __Request__mach_vm_inherit_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-	} __Request__mach_vm_read_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_read_entry_t data_list;
-		natural_t count;
-	} __Request__mach_vm_read_list_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t data;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_msg_type_number_t dataCnt;
-	} __Request__mach_vm_write_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t source_address;
-		mach_vm_size_t size;
-		mach_vm_address_t dest_address;
-	} __Request__mach_vm_copy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		mach_vm_address_t data;
-	} __Request__mach_vm_read_overwrite_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		vm_sync_t sync_flags;
-	} __Request__mach_vm_msync_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		vm_behavior_t new_behavior;
-	} __Request__mach_vm_behavior_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t object;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		mach_vm_offset_t mask;
-		int flags;
-		memory_object_offset_t offset;
-		boolean_t copy;
-		vm_prot_t cur_protection;
-		vm_prot_t max_protection;
-		vm_inherit_t inheritance;
-	} __Request__mach_vm_map_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		vm_machine_attribute_t attribute;
-		vm_machine_attribute_val_t value;
-	} __Request__mach_vm_machine_attribute_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t src_task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_vm_address_t target_address;
-		mach_vm_size_t size;
-		mach_vm_offset_t mask;
-		boolean_t anywhere;
-		mach_vm_address_t src_address;
-		boolean_t copy;
-		vm_inherit_t inheritance;
-	} __Request__mach_vm_remap_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_offset_t offset;
-	} __Request__mach_vm_page_query_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		natural_t nesting_depth;
-		mach_msg_type_number_t infoCnt;
-	} __Request__mach_vm_region_recurse_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		vm_region_flavor_t flavor;
-		mach_msg_type_number_t infoCnt;
-	} __Request__mach_vm_region_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t parent_handle;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		memory_object_size_t size;
-		memory_object_offset_t offset;
-		vm_prot_t permission;
-	} __Request___mach_make_memory_entry_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		vm_purgable_t control;
-		int state;
-	} __Request__mach_vm_purgable_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		vm_page_info_flavor_t flavor;
-		mach_msg_type_number_t infoCnt;
-	} __Request__mach_vm_page_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__mach_vm_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__mach_vm_subsystem__defined
-#define __RequestUnion__mach_vm_subsystem__defined
-union __RequestUnion__mach_vm_subsystem {
-	__Request__mach_vm_allocate_t Request_mach_vm_allocate;
-	__Request__mach_vm_deallocate_t Request_mach_vm_deallocate;
-	__Request__mach_vm_protect_t Request_mach_vm_protect;
-	__Request__mach_vm_inherit_t Request_mach_vm_inherit;
-	__Request__mach_vm_read_t Request_mach_vm_read;
-	__Request__mach_vm_read_list_t Request_mach_vm_read_list;
-	__Request__mach_vm_write_t Request_mach_vm_write;
-	__Request__mach_vm_copy_t Request_mach_vm_copy;
-	__Request__mach_vm_read_overwrite_t Request_mach_vm_read_overwrite;
-	__Request__mach_vm_msync_t Request_mach_vm_msync;
-	__Request__mach_vm_behavior_set_t Request_mach_vm_behavior_set;
-	__Request__mach_vm_map_t Request_mach_vm_map;
-	__Request__mach_vm_machine_attribute_t Request_mach_vm_machine_attribute;
-	__Request__mach_vm_remap_t Request_mach_vm_remap;
-	__Request__mach_vm_page_query_t Request_mach_vm_page_query;
-	__Request__mach_vm_region_recurse_t Request_mach_vm_region_recurse;
-	__Request__mach_vm_region_t Request_mach_vm_region;
-	__Request___mach_make_memory_entry_t Request__mach_make_memory_entry;
-	__Request__mach_vm_purgable_control_t Request_mach_vm_purgable_control;
-	__Request__mach_vm_page_info_t Request_mach_vm_page_info;
-};
-#endif /* !__RequestUnion__mach_vm_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__mach_vm_subsystem__defined
-#define __Reply__mach_vm_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_vm_address_t address;
-	} __Reply__mach_vm_allocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_vm_deallocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_vm_protect_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_vm_inherit_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t data;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t dataCnt;
-	} __Reply__mach_vm_read_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_vm_read_entry_t data_list;
-	} __Reply__mach_vm_read_list_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_vm_write_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_vm_copy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_vm_size_t outsize;
-	} __Reply__mach_vm_read_overwrite_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_vm_msync_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__mach_vm_behavior_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_vm_address_t address;
-	} __Reply__mach_vm_map_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_machine_attribute_val_t value;
-	} __Reply__mach_vm_machine_attribute_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_vm_address_t target_address;
-		vm_prot_t cur_protection;
-		vm_prot_t max_protection;
-	} __Reply__mach_vm_remap_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		integer_t disposition;
-		integer_t ref_count;
-	} __Reply__mach_vm_page_query_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		natural_t nesting_depth;
-		mach_msg_type_number_t infoCnt;
-		int info[19];
-	} __Reply__mach_vm_region_recurse_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t object_name;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_vm_address_t address;
-		mach_vm_size_t size;
-		mach_msg_type_number_t infoCnt;
-		int info[10];
-	} __Reply__mach_vm_region_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t object_handle;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		memory_object_size_t size;
-	} __Reply___mach_make_memory_entry_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		int state;
-	} __Reply__mach_vm_purgable_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t infoCnt;
-		int info[32];
-	} __Reply__mach_vm_page_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__mach_vm_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__mach_vm_subsystem__defined
-#define __ReplyUnion__mach_vm_subsystem__defined
-union __ReplyUnion__mach_vm_subsystem {
-	__Reply__mach_vm_allocate_t Reply_mach_vm_allocate;
-	__Reply__mach_vm_deallocate_t Reply_mach_vm_deallocate;
-	__Reply__mach_vm_protect_t Reply_mach_vm_protect;
-	__Reply__mach_vm_inherit_t Reply_mach_vm_inherit;
-	__Reply__mach_vm_read_t Reply_mach_vm_read;
-	__Reply__mach_vm_read_list_t Reply_mach_vm_read_list;
-	__Reply__mach_vm_write_t Reply_mach_vm_write;
-	__Reply__mach_vm_copy_t Reply_mach_vm_copy;
-	__Reply__mach_vm_read_overwrite_t Reply_mach_vm_read_overwrite;
-	__Reply__mach_vm_msync_t Reply_mach_vm_msync;
-	__Reply__mach_vm_behavior_set_t Reply_mach_vm_behavior_set;
-	__Reply__mach_vm_map_t Reply_mach_vm_map;
-	__Reply__mach_vm_machine_attribute_t Reply_mach_vm_machine_attribute;
-	__Reply__mach_vm_remap_t Reply_mach_vm_remap;
-	__Reply__mach_vm_page_query_t Reply_mach_vm_page_query;
-	__Reply__mach_vm_region_recurse_t Reply_mach_vm_region_recurse;
-	__Reply__mach_vm_region_t Reply_mach_vm_region;
-	__Reply___mach_make_memory_entry_t Reply__mach_make_memory_entry;
-	__Reply__mach_vm_purgable_control_t Reply_mach_vm_purgable_control;
-	__Reply__mach_vm_page_info_t Reply_mach_vm_page_info;
-};
-#endif /* !__RequestUnion__mach_vm_subsystem__defined */
-
-#ifndef subsystem_to_name_map_mach_vm
-#define subsystem_to_name_map_mach_vm \
-    { "mach_vm_allocate", 4800 },\
-    { "mach_vm_deallocate", 4801 },\
-    { "mach_vm_protect", 4802 },\
-    { "mach_vm_inherit", 4803 },\
-    { "mach_vm_read", 4804 },\
-    { "mach_vm_read_list", 4805 },\
-    { "mach_vm_write", 4806 },\
-    { "mach_vm_copy", 4807 },\
-    { "mach_vm_read_overwrite", 4808 },\
-    { "mach_vm_msync", 4809 },\
-    { "mach_vm_behavior_set", 4810 },\
-    { "mach_vm_map", 4811 },\
-    { "mach_vm_machine_attribute", 4812 },\
-    { "mach_vm_remap", 4813 },\
-    { "mach_vm_page_query", 4814 },\
-    { "mach_vm_region_recurse", 4815 },\
-    { "mach_vm_region", 4816 },\
-    { "_mach_make_memory_entry", 4817 },\
-    { "mach_vm_purgable_control", 4818 },\
-    { "mach_vm_page_info", 4819 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _mach_vm_user_ */
diff --git a/i386/include/mach/machine.h b/i386/include/mach/machine.h
deleted file mode 100644
index 431d3c9..0000000
--- a/i386/include/mach/machine.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*	File:	machine.h
- *	Author:	Avadis Tevanian, Jr.
- *	Date:	1986
- *
- *	Machine independent machine abstraction.
- */
-
-#ifndef	_MACH_MACHINE_H_
-#define _MACH_MACHINE_H_
-
-#include <stdint.h>
-#include <mach/machine/vm_types.h>
-#include <mach/boolean.h>
-
-typedef integer_t	cpu_type_t;
-typedef integer_t	cpu_subtype_t;
-typedef integer_t	cpu_threadtype_t;
-
-#define CPU_STATE_MAX		4
-
-#define CPU_STATE_USER		0
-#define CPU_STATE_SYSTEM	1
-#define CPU_STATE_IDLE		2
-#define CPU_STATE_NICE		3
-
-
-
-/*
- * Capability bits used in the definition of cpu_type.
- */
-#define	CPU_ARCH_MASK	0xff000000		/* mask for architecture bits */
-#define CPU_ARCH_ABI64	0x01000000		/* 64 bit ABI */
-
-/*
- *	Machine types known by all.
- */
- 
-#define CPU_TYPE_ANY		((cpu_type_t) -1)
-
-#define CPU_TYPE_VAX		((cpu_type_t) 1)
-/* skip				((cpu_type_t) 2)	*/
-/* skip				((cpu_type_t) 3)	*/
-/* skip				((cpu_type_t) 4)	*/
-/* skip				((cpu_type_t) 5)	*/
-#define	CPU_TYPE_MC680x0	((cpu_type_t) 6)
-#define CPU_TYPE_X86		((cpu_type_t) 7)
-#define CPU_TYPE_I386		CPU_TYPE_X86		/* compatibility */
-#define	CPU_TYPE_X86_64		(CPU_TYPE_X86 | CPU_ARCH_ABI64)
-
-/* skip CPU_TYPE_MIPS		((cpu_type_t) 8)	*/
-/* skip 			((cpu_type_t) 9)	*/
-#define CPU_TYPE_MC98000	((cpu_type_t) 10)
-#define CPU_TYPE_HPPA           ((cpu_type_t) 11)
-#define CPU_TYPE_ARM		((cpu_type_t) 12)
-#define CPU_TYPE_MC88000	((cpu_type_t) 13)
-#define CPU_TYPE_SPARC		((cpu_type_t) 14)
-#define CPU_TYPE_I860		((cpu_type_t) 15)
-/* skip	CPU_TYPE_ALPHA		((cpu_type_t) 16)	*/
-/* skip				((cpu_type_t) 17)	*/
-#define CPU_TYPE_POWERPC		((cpu_type_t) 18)
-#define CPU_TYPE_POWERPC64		(CPU_TYPE_POWERPC | CPU_ARCH_ABI64)
-
-/*
- *	Machine subtypes (these are defined here, instead of in a machine
- *	dependent directory, so that any program can get all definitions
- *	regardless of where is it compiled).
- */
-
-/*
- * Capability bits used in the definition of cpu_subtype.
- */
-#define CPU_SUBTYPE_MASK	0xff000000	/* mask for feature flags */
-#define CPU_SUBTYPE_LIB64	0x80000000	/* 64 bit libraries */
-
-
-/*
- *	Object files that are hand-crafted to run on any
- *	implementation of an architecture are tagged with
- *	CPU_SUBTYPE_MULTIPLE.  This functions essentially the same as
- *	the "ALL" subtype of an architecture except that it allows us
- *	to easily find object files that may need to be modified
- *	whenever a new implementation of an architecture comes out.
- *
- *	It is the responsibility of the implementor to make sure the
- *	software handles unsupported implementations elegantly.
- */
-#define	CPU_SUBTYPE_MULTIPLE		((cpu_subtype_t) -1)
-#define CPU_SUBTYPE_LITTLE_ENDIAN	((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_BIG_ENDIAN		((cpu_subtype_t) 1)
-
-/*
- *     Machine threadtypes.
- *     This is none - not defined - for most machine types/subtypes.
- */
-#define CPU_THREADTYPE_NONE		((cpu_threadtype_t) 0)
-
-/*
- *	VAX subtypes (these do *not* necessary conform to the actual cpu
- *	ID assigned by DEC available via the SID register).
- */
-
-#define	CPU_SUBTYPE_VAX_ALL	((cpu_subtype_t) 0) 
-#define CPU_SUBTYPE_VAX780	((cpu_subtype_t) 1)
-#define CPU_SUBTYPE_VAX785	((cpu_subtype_t) 2)
-#define CPU_SUBTYPE_VAX750	((cpu_subtype_t) 3)
-#define CPU_SUBTYPE_VAX730	((cpu_subtype_t) 4)
-#define CPU_SUBTYPE_UVAXI	((cpu_subtype_t) 5)
-#define CPU_SUBTYPE_UVAXII	((cpu_subtype_t) 6)
-#define CPU_SUBTYPE_VAX8200	((cpu_subtype_t) 7)
-#define CPU_SUBTYPE_VAX8500	((cpu_subtype_t) 8)
-#define CPU_SUBTYPE_VAX8600	((cpu_subtype_t) 9)
-#define CPU_SUBTYPE_VAX8650	((cpu_subtype_t) 10)
-#define CPU_SUBTYPE_VAX8800	((cpu_subtype_t) 11)
-#define CPU_SUBTYPE_UVAXIII	((cpu_subtype_t) 12)
-
-/*
- * 	680x0 subtypes
- *
- * The subtype definitions here are unusual for historical reasons.
- * NeXT used to consider 68030 code as generic 68000 code.  For
- * backwards compatability:
- * 
- *	CPU_SUBTYPE_MC68030 symbol has been preserved for source code
- *	compatability.
- *
- *	CPU_SUBTYPE_MC680x0_ALL has been defined to be the same
- *	subtype as CPU_SUBTYPE_MC68030 for binary comatability.
- *
- *	CPU_SUBTYPE_MC68030_ONLY has been added to allow new object
- *	files to be tagged as containing 68030-specific instructions.
- */
-
-#define	CPU_SUBTYPE_MC680x0_ALL		((cpu_subtype_t) 1)
-#define CPU_SUBTYPE_MC68030		((cpu_subtype_t) 1) /* compat */
-#define CPU_SUBTYPE_MC68040		((cpu_subtype_t) 2) 
-#define	CPU_SUBTYPE_MC68030_ONLY	((cpu_subtype_t) 3)
-
-/*
- *	I386 subtypes
- */
-
-#define CPU_SUBTYPE_INTEL(f, m)	((cpu_subtype_t) (f) + ((m) << 4))
-
-#define	CPU_SUBTYPE_I386_ALL			CPU_SUBTYPE_INTEL(3, 0)
-#define CPU_SUBTYPE_386					CPU_SUBTYPE_INTEL(3, 0)
-#define CPU_SUBTYPE_486					CPU_SUBTYPE_INTEL(4, 0)
-#define CPU_SUBTYPE_486SX				CPU_SUBTYPE_INTEL(4, 8)	// 8 << 4 = 128
-#define CPU_SUBTYPE_586					CPU_SUBTYPE_INTEL(5, 0)
-#define CPU_SUBTYPE_PENT	CPU_SUBTYPE_INTEL(5, 0)
-#define CPU_SUBTYPE_PENTPRO	CPU_SUBTYPE_INTEL(6, 1)
-#define CPU_SUBTYPE_PENTII_M3	CPU_SUBTYPE_INTEL(6, 3)
-#define CPU_SUBTYPE_PENTII_M5	CPU_SUBTYPE_INTEL(6, 5)
-#define CPU_SUBTYPE_CELERON				CPU_SUBTYPE_INTEL(7, 6)
-#define CPU_SUBTYPE_CELERON_MOBILE		CPU_SUBTYPE_INTEL(7, 7)
-#define CPU_SUBTYPE_PENTIUM_3			CPU_SUBTYPE_INTEL(8, 0)
-#define CPU_SUBTYPE_PENTIUM_3_M			CPU_SUBTYPE_INTEL(8, 1)
-#define CPU_SUBTYPE_PENTIUM_3_XEON		CPU_SUBTYPE_INTEL(8, 2)
-#define CPU_SUBTYPE_PENTIUM_M			CPU_SUBTYPE_INTEL(9, 0)
-#define CPU_SUBTYPE_PENTIUM_4			CPU_SUBTYPE_INTEL(10, 0)
-#define CPU_SUBTYPE_PENTIUM_4_M			CPU_SUBTYPE_INTEL(10, 1)
-#define CPU_SUBTYPE_ITANIUM				CPU_SUBTYPE_INTEL(11, 0)
-#define CPU_SUBTYPE_ITANIUM_2			CPU_SUBTYPE_INTEL(11, 1)
-#define CPU_SUBTYPE_XEON				CPU_SUBTYPE_INTEL(12, 0)
-#define CPU_SUBTYPE_XEON_MP				CPU_SUBTYPE_INTEL(12, 1)
-
-#define CPU_SUBTYPE_INTEL_FAMILY(x)	((x) & 15)
-#define CPU_SUBTYPE_INTEL_FAMILY_MAX	15
-
-#define CPU_SUBTYPE_INTEL_MODEL(x)	((x) >> 4)
-#define CPU_SUBTYPE_INTEL_MODEL_ALL	0
-
-/*
- *	X86 subtypes.
- */
-
-#define CPU_SUBTYPE_X86_ALL		((cpu_subtype_t)3)
-#define CPU_SUBTYPE_X86_64_ALL		((cpu_subtype_t)3)
-#define CPU_SUBTYPE_X86_ARCH1		((cpu_subtype_t)4)
-
-
-#define CPU_THREADTYPE_INTEL_HTT	((cpu_threadtype_t) 1)
-
-/*
- *	Mips subtypes.
- */
-
-#define	CPU_SUBTYPE_MIPS_ALL	((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_MIPS_R2300	((cpu_subtype_t) 1)
-#define CPU_SUBTYPE_MIPS_R2600	((cpu_subtype_t) 2)
-#define CPU_SUBTYPE_MIPS_R2800	((cpu_subtype_t) 3)
-#define CPU_SUBTYPE_MIPS_R2000a	((cpu_subtype_t) 4)	/* pmax */
-#define CPU_SUBTYPE_MIPS_R2000	((cpu_subtype_t) 5)
-#define CPU_SUBTYPE_MIPS_R3000a	((cpu_subtype_t) 6)	/* 3max */
-#define CPU_SUBTYPE_MIPS_R3000	((cpu_subtype_t) 7)
-
-/*
- *	MC98000 (PowerPC) subtypes
- */
-#define	CPU_SUBTYPE_MC98000_ALL	((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_MC98601	((cpu_subtype_t) 1)
-
-/*
- *	HPPA subtypes for Hewlett-Packard HP-PA family of
- *	risc processors. Port by NeXT to 700 series. 
- */
-
-#define	CPU_SUBTYPE_HPPA_ALL		((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_HPPA_7100		((cpu_subtype_t) 0) /* compat */
-#define CPU_SUBTYPE_HPPA_7100LC		((cpu_subtype_t) 1)
-
-/*
- *	MC88000 subtypes.
- */
-#define	CPU_SUBTYPE_MC88000_ALL	((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_MC88100	((cpu_subtype_t) 1)
-#define CPU_SUBTYPE_MC88110	((cpu_subtype_t) 2)
-
-/*
- *	SPARC subtypes
- */
-#define	CPU_SUBTYPE_SPARC_ALL		((cpu_subtype_t) 0)
-
-/*
- *	I860 subtypes
- */
-#define CPU_SUBTYPE_I860_ALL	((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_I860_860	((cpu_subtype_t) 1)
-
-/*
- *	PowerPC subtypes
- */
-#define CPU_SUBTYPE_POWERPC_ALL		((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_POWERPC_601		((cpu_subtype_t) 1)
-#define CPU_SUBTYPE_POWERPC_602		((cpu_subtype_t) 2)
-#define CPU_SUBTYPE_POWERPC_603		((cpu_subtype_t) 3)
-#define CPU_SUBTYPE_POWERPC_603e	((cpu_subtype_t) 4)
-#define CPU_SUBTYPE_POWERPC_603ev	((cpu_subtype_t) 5)
-#define CPU_SUBTYPE_POWERPC_604		((cpu_subtype_t) 6)
-#define CPU_SUBTYPE_POWERPC_604e	((cpu_subtype_t) 7)
-#define CPU_SUBTYPE_POWERPC_620		((cpu_subtype_t) 8)
-#define CPU_SUBTYPE_POWERPC_750		((cpu_subtype_t) 9)
-#define CPU_SUBTYPE_POWERPC_7400	((cpu_subtype_t) 10)
-#define CPU_SUBTYPE_POWERPC_7450	((cpu_subtype_t) 11)
-#define CPU_SUBTYPE_POWERPC_970		((cpu_subtype_t) 100)
-
-/*
- *	ARM subtypes
- */
-#define CPU_SUBTYPE_ARM_ALL             ((cpu_subtype_t) 0)
-#define CPU_SUBTYPE_ARM_V4T             ((cpu_subtype_t) 5)
-#define CPU_SUBTYPE_ARM_V6              ((cpu_subtype_t) 6)
-#define CPU_SUBTYPE_ARM_V5TEJ           ((cpu_subtype_t) 7)
-#define CPU_SUBTYPE_ARM_XSCALE		((cpu_subtype_t) 8)
-#define CPU_SUBTYPE_ARM_V7		((cpu_subtype_t) 9)
-
-/*
- *	CPU families (sysctl hw.cpufamily)
- *
- * These are meant to identify the CPU's marketing name - an
- * application can map these to (possibly) localized strings.
- * NB: the encodings of the CPU families are intentionally arbitrary.
- * There is no ordering, and you should never try to deduce whether
- * or not some feature is available based on the family.
- * Use feature flags (eg, hw.optional.altivec) to test for optional
- * functionality.
- */
-#define CPUFAMILY_UNKNOWN   		0
-#define CPUFAMILY_POWERPC_G3		0xcee41549
-#define CPUFAMILY_POWERPC_G4		0x77c184ae
-#define CPUFAMILY_POWERPC_G5		0xed76d8aa
-#define CPUFAMILY_INTEL_6_13		0xaa33392b
-#define CPUFAMILY_INTEL_YONAH		0x73d67300
-#define CPUFAMILY_INTEL_MEROM		0x426f69ef
-#define CPUFAMILY_INTEL_PENRYN		0x78ea4fbc
-#define CPUFAMILY_INTEL_NEHALEM		0x6b5a4cd2
-#define CPUFAMILY_INTEL_WESTMERE	0x573b5eec
-#define CPUFAMILY_ARM_9			0xe73283ae
-#define CPUFAMILY_ARM_11		0x8ff620d8
-#define CPUFAMILY_ARM_XSCALE		0x53b005f5
-#define CPUFAMILY_ARM_13		0x0cc90e64
-
-/* The following synonyms are deprecated: */
-#define CPUFAMILY_INTEL_6_14	CPUFAMILY_INTEL_YONAH
-#define CPUFAMILY_INTEL_6_15	CPUFAMILY_INTEL_MEROM
-#define CPUFAMILY_INTEL_6_23	CPUFAMILY_INTEL_PENRYN
-#define CPUFAMILY_INTEL_6_26	CPUFAMILY_INTEL_NEHALEM
-
-#define CPUFAMILY_INTEL_CORE	CPUFAMILY_INTEL_YONAH
-#define CPUFAMILY_INTEL_CORE2	CPUFAMILY_INTEL_MEROM
-
-
-#endif	/* _MACH_MACHINE_H_ */
diff --git a/i386/include/mach/machine/asm.h b/i386/include/mach/machine/asm.h
deleted file mode 100644
index 59e1da2..0000000
--- a/i386/include/mach/machine/asm.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_ASM_H
-#define _MACH_MACHINE_ASM_H
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/asm.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/asm.h"
-#elif defined (__arm__)
-#include "mach/arm/asm.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_ASM_H */
diff --git a/i386/include/mach/machine/boolean.h b/i386/include/mach/machine/boolean.h
deleted file mode 100644
index 1bec00d..0000000
--- a/i386/include/mach/machine/boolean.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_BOOLEAN_H_
-#define _MACH_MACHINE_BOOLEAN_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/boolean.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/boolean.h"
-#elif defined (__arm__)
-#include "mach/arm/boolean.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_BOOLEAN_H_ */
diff --git a/i386/include/mach/machine/exception.h b/i386/include/mach/machine/exception.h
deleted file mode 100644
index 5ce83f2..0000000
--- a/i386/include/mach/machine/exception.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_EXCEPTION_H_
-#define _MACH_MACHINE_EXCEPTION_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/exception.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/exception.h"
-#elif defined (__arm__)
-#include "mach/arm/exception.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_EXCEPTION_H_ */
diff --git a/i386/include/mach/machine/kern_return.h b/i386/include/mach/machine/kern_return.h
deleted file mode 100644
index df37396..0000000
--- a/i386/include/mach/machine/kern_return.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_KERN_RETURN_H_
-#define _MACH_MACHINE_KERN_RETURN_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/kern_return.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/kern_return.h"
-#elif defined (__arm__)
-#include "mach/arm/kern_return.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_KERN_RETURN_H_ */
diff --git a/i386/include/mach/machine/machine_types.defs b/i386/include/mach/machine/machine_types.defs
deleted file mode 100644
index 418d16b..0000000
--- a/i386/include/mach/machine/machine_types.defs
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_MACHINE_TYPES_DEFS
-#define _MACH_MACHINE_MACHINE_TYPES_DEFS
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/machine_types.defs"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/machine_types.defs"
-#elif defined (__arm__)
-#include "mach/arm/machine_types.defs"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_THREAD_STATUS_H_ */
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/machine/ndr_def.h b/i386/include/mach/machine/ndr_def.h
deleted file mode 100644
index a7b5a9b..0000000
--- a/i386/include/mach/machine/ndr_def.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_NDR_DEF_H
-#define _MACH_MACHINE_NDR_DEF_H
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/ndr_def.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/ndr_def.h"
-#elif defined (__arm__)
-#include "mach/arm/ndr_def.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_NDR_DEF_H */
diff --git a/i386/include/mach/machine/processor_info.h b/i386/include/mach/machine/processor_info.h
deleted file mode 100644
index ca96367..0000000
--- a/i386/include/mach/machine/processor_info.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_PROCESSOR_INFO_H_
-#define _MACH_MACHINE_PROCESSOR_INFO_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/processor_info.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/processor_info.h"
-#elif defined (__arm__)
-#include "mach/arm/processor_info.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_PROCESSOR_INFO_H_ */
diff --git a/i386/include/mach/machine/rpc.h b/i386/include/mach/machine/rpc.h
deleted file mode 100644
index b969bd4..0000000
--- a/i386/include/mach/machine/rpc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_RPC_H_
-#define _MACH_MACHINE_RPC_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/rpc.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/rpc.h"
-#elif defined (__arm__)
-#include "mach/arm/rpc.h"
-#else
-#error architecture not supported
-#endif
-
-#endif	/* _MACH_MACHINE_RPC_H_ */
diff --git a/i386/include/mach/machine/sdt.h b/i386/include/mach/machine/sdt.h
deleted file mode 100644
index e85508f..0000000
--- a/i386/include/mach/machine/sdt.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2007 Apple Inc. All rights reserved.
- */
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _MACH_MACHINE_SYS_SDT_H
-#define	_MACH_MACHINE_SYS_SDT_H
-
-#include <mach/machine/sdt_isa.h>
-
-
-#endif	/* _MACH_MACHINE_SYS_SDT_H */
diff --git a/i386/include/mach/machine/sdt_isa.h b/i386/include/mach/machine/sdt_isa.h
deleted file mode 100644
index a8e1379..0000000
--- a/i386/include/mach/machine/sdt_isa.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _MACH_MACHINE_SDT_ISA_H_
-#define _MACH_MACHINE_SDT_ISA_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include <mach/ppc/sdt_isa.h>
-#elif defined (__i386__) || defined(__x86_64__)
-#include <mach/i386/sdt_isa.h>
-#elif defined (__arm__)
-#include <mach/arm/sdt_isa.h>
-#else
-#error architecture not supported
-#endif
-
-#endif /* _BSD_MACHINE_SDT_ISA_H_ */
diff --git a/i386/include/mach/machine/thread_state.h b/i386/include/mach/machine/thread_state.h
deleted file mode 100644
index 18ffca4..0000000
--- a/i386/include/mach/machine/thread_state.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_THREAD_STATE_H_
-#define _MACH_MACHINE_THREAD_STATE_H_
-
-#if defined (__ppc__) || defined(__ppc64__)
-#include "mach/ppc/thread_state.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/thread_state.h"
-#elif defined (__arm__)
-#include "mach/arm/thread_state.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_THREAD_STATE_H_ */
diff --git a/i386/include/mach/machine/thread_status.h b/i386/include/mach/machine/thread_status.h
deleted file mode 100644
index ad5eff0..0000000
--- a/i386/include/mach/machine/thread_status.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_THREAD_STATUS_H_
-#define _MACH_MACHINE_THREAD_STATUS_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/thread_status.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/thread_status.h"
-#elif defined (__arm__)
-#include "mach/arm/thread_status.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_THREAD_STATUS_H_ */
diff --git a/i386/include/mach/machine/vm_param.h b/i386/include/mach/machine/vm_param.h
deleted file mode 100644
index c71121b..0000000
--- a/i386/include/mach/machine/vm_param.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_VM_PARAM_H_
-#define _MACH_MACHINE_VM_PARAM_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "mach/ppc/vm_param.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/vm_param.h"
-#elif defined (__arm__)
-#include "mach/arm/vm_param.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_VM_PARAM_H_ */
diff --git a/i386/include/mach/machine/vm_types.h b/i386/include/mach/machine/vm_types.h
deleted file mode 100644
index b366092..0000000
--- a/i386/include/mach/machine/vm_types.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_MACHINE_VM_TYPES_H_
-#define _MACH_MACHINE_VM_TYPES_H_
-
-#if defined (__ppc__) || defined(__ppc64__)
-#include "mach/ppc/vm_types.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "mach/i386/vm_types.h"
-#elif defined (__arm__)
-#include "mach/arm/vm_types.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _MACH_MACHINE_VM_TYPES_H_ */
diff --git a/i386/include/mach/memory_object_types.h b/i386/include/mach/memory_object_types.h
deleted file mode 100644
index 5c1f76e..0000000
--- a/i386/include/mach/memory_object_types.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	memory_object.h
- *	Author:	Michael Wayne Young
- *
- *	External memory management interface definition.
- */
-
-#ifndef	_MACH_MEMORY_OBJECT_TYPES_H_
-#define _MACH_MEMORY_OBJECT_TYPES_H_
-
-/*
- *	User-visible types used in the external memory
- *	management interface:
- */
-
-#include <mach/port.h>
-#include <mach/message.h>
-#include <mach/vm_prot.h>
-#include <mach/vm_sync.h>
-#include <mach/vm_types.h>
-#include <mach/machine/vm_types.h>
-
-#include <sys/cdefs.h>
-
-#define VM_64_BIT_DATA_OBJECTS
-
-typedef unsigned long long	memory_object_offset_t;
-typedef unsigned long long	memory_object_size_t;
-typedef natural_t		memory_object_cluster_size_t;
-typedef natural_t *		memory_object_fault_info_t;
-
-typedef unsigned long long 	vm_object_id_t;
-
-
-/*
- * Temporary until real EMMI version gets re-implemented
- */
-
-
-typedef mach_port_t	memory_object_t;
-typedef mach_port_t	memory_object_control_t;
-
-
-typedef memory_object_t *memory_object_array_t;
-					/* A memory object ... */
-					/*  Used by the kernel to retrieve */
-					/*  or store data */
-
-typedef	mach_port_t	memory_object_name_t;
-					/* Used to describe the memory ... */
-					/*  object in vm_regions() calls */
-
-typedef mach_port_t	memory_object_default_t;
-					/* Registered with the host ... */
-					/*  for creating new internal objects */
-
-#define MEMORY_OBJECT_NULL		((memory_object_t) 0)
-#define MEMORY_OBJECT_CONTROL_NULL	((memory_object_control_t) 0)
-#define MEMORY_OBJECT_NAME_NULL		((memory_object_name_t) 0)
-#define MEMORY_OBJECT_DEFAULT_NULL	((memory_object_default_t) 0)
-
-
-typedef	int		memory_object_copy_strategy_t;
-					/* How memory manager handles copy: */
-#define		MEMORY_OBJECT_COPY_NONE		0
-					/* ... No special support */
-#define		MEMORY_OBJECT_COPY_CALL		1
-					/* ... Make call on memory manager */
-#define		MEMORY_OBJECT_COPY_DELAY 	2
-					/* ... Memory manager doesn't
-					 *     change data externally.
-					 */
-#define		MEMORY_OBJECT_COPY_TEMPORARY 	3
-					/* ... Memory manager doesn't
-					 *     change data externally, and
-					 *     doesn't need to see changes.
-					 */
-#define		MEMORY_OBJECT_COPY_SYMMETRIC 	4
-					/* ... Memory manager doesn't
-					 *     change data externally,
-					 *     doesn't need to see changes,
-					 *     and object will not be
-					 *     multiply mapped.
-					 *
-					 *     XXX
-					 *     Not yet safe for non-kernel use.
-					 */
-
-#define		MEMORY_OBJECT_COPY_INVALID	5
-					/* ...	An invalid copy strategy,
-					 *	for external objects which
-					 *	have not been initialized.
-					 *	Allows copy_strategy to be
-					 *	examined without also
-					 *	examining pager_ready and
-					 *	internal.
-					 */
-
-typedef	int		memory_object_return_t;
-					/* Which pages to return to manager
-					   this time (lock_request) */
-#define		MEMORY_OBJECT_RETURN_NONE	0
-					/* ... don't return any. */
-#define		MEMORY_OBJECT_RETURN_DIRTY	1
-					/* ... only dirty pages. */
-#define		MEMORY_OBJECT_RETURN_ALL	2
-					/* ... dirty and precious pages. */
-#define		MEMORY_OBJECT_RETURN_ANYTHING	3
-					/* ... any resident page. */
-
-/* 
- *	Data lock request flags
- */
-
-#define		MEMORY_OBJECT_DATA_FLUSH 	0x1
-#define		MEMORY_OBJECT_DATA_NO_CHANGE	0x2
-#define		MEMORY_OBJECT_DATA_PURGE	0x4
-#define		MEMORY_OBJECT_COPY_SYNC		0x8
-#define		MEMORY_OBJECT_DATA_SYNC		0x10
-#define         MEMORY_OBJECT_IO_SYNC           0x20
-#define		MEMORY_OBJECT_DATA_FLUSH_ALL	0x40
-
-/*
- *	Types for the memory object flavor interfaces
- */
-
-#define MEMORY_OBJECT_INFO_MAX      (1024) 
-typedef int     *memory_object_info_t;      
-typedef int	 memory_object_flavor_t;
-typedef int      memory_object_info_data_t[MEMORY_OBJECT_INFO_MAX];
-
-
-#define MEMORY_OBJECT_PERFORMANCE_INFO	11
-#define MEMORY_OBJECT_ATTRIBUTE_INFO	14
-#define MEMORY_OBJECT_BEHAVIOR_INFO 	15	
-
-
-struct memory_object_perf_info {
-	memory_object_cluster_size_t	cluster_size;
-	boolean_t			may_cache;
-};
-
-struct memory_object_attr_info {
-	memory_object_copy_strategy_t	copy_strategy;
-	memory_object_cluster_size_t	cluster_size;
-	boolean_t			may_cache_object;
-	boolean_t			temporary;
-};
-
-struct memory_object_behave_info {
-	memory_object_copy_strategy_t	copy_strategy;	
-	boolean_t			temporary;
-	boolean_t			invalidate;
-	boolean_t			silent_overwrite;
-	boolean_t			advisory_pageout;
-};
-
-
-typedef struct memory_object_behave_info *memory_object_behave_info_t;
-typedef struct memory_object_behave_info memory_object_behave_info_data_t;
-
-typedef struct memory_object_perf_info 	*memory_object_perf_info_t;
-typedef struct memory_object_perf_info	memory_object_perf_info_data_t;
-
-typedef struct memory_object_attr_info	*memory_object_attr_info_t;
-typedef struct memory_object_attr_info	memory_object_attr_info_data_t;
-
-#define MEMORY_OBJECT_BEHAVE_INFO_COUNT ((mach_msg_type_number_t)	\
-                (sizeof(memory_object_behave_info_data_t)/sizeof(int)))
-#define MEMORY_OBJECT_PERF_INFO_COUNT	((mach_msg_type_number_t)	\
-		(sizeof(memory_object_perf_info_data_t)/sizeof(int)))
-#define MEMORY_OBJECT_ATTR_INFO_COUNT	((mach_msg_type_number_t)	\
-		(sizeof(memory_object_attr_info_data_t)/sizeof(int)))
-
-#define invalid_memory_object_flavor(f)					\
-	(f != MEMORY_OBJECT_ATTRIBUTE_INFO && 				\
-	 f != MEMORY_OBJECT_PERFORMANCE_INFO && 			\
-	 f != OLD_MEMORY_OBJECT_BEHAVIOR_INFO &&			\
-	 f != MEMORY_OBJECT_BEHAVIOR_INFO &&				\
-	 f != OLD_MEMORY_OBJECT_ATTRIBUTE_INFO)
-
-
-/*
- * Used to support options on memory_object_release_name call
- */
-#define MEMORY_OBJECT_TERMINATE_IDLE	0x1
-#define MEMORY_OBJECT_RESPECT_CACHE	0x2
-#define MEMORY_OBJECT_RELEASE_NO_OP	0x4
-
-
-/* named entry processor mapping options */
-/* enumerated */
-#define MAP_MEM_NOOP		0
-#define MAP_MEM_COPYBACK	1
-#define MAP_MEM_IO		2
-#define MAP_MEM_WTHRU		3
-#define MAP_MEM_WCOMB		4	/* Write combining mode */
-					/* aka store gather     */
-
-#define GET_MAP_MEM(flags)	\
-	((((unsigned int)(flags)) >> 24) & 0xFF)
-
-#define SET_MAP_MEM(caching, flags)	\
-	((flags) = ((((unsigned int)(caching)) << 24) \
-			& 0xFF000000) | ((flags) & 0xFFFFFF));
-
-/* leave room for vm_prot bits */
-#define MAP_MEM_ONLY		0x10000	/* change processor caching  */
-#define MAP_MEM_NAMED_CREATE	0x20000 /* create extant object      */
-#define MAP_MEM_PURGABLE	0x40000	/* create a purgable VM object */
-#define MAP_MEM_NAMED_REUSE	0x80000	/* reuse provided entry if identical */
-
-
-#endif	/* _MACH_MEMORY_OBJECT_TYPES_H_ */
diff --git a/i386/include/mach/message.h b/i386/include/mach/message.h
deleted file mode 100644
index 15c9be4..0000000
--- a/i386/include/mach/message.h
+++ /dev/null
@@ -1,783 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- * NOTICE: This file was modified by McAfee Research in 2004 to introduce
- * support for mandatory and extensible security protections.  This notice
- * is included in support of clause 2.2 (b) of the Apple Public License,
- * Version 2.0.
- * Copyright (c) 2005 SPARTA, Inc.
- */
-/*
- */
-/*
- *	File:	mach/message.h
- *
- *	Mach IPC message and primitive function definitions.
- */
-
-#ifndef	_MACH_MESSAGE_H_
-#define _MACH_MESSAGE_H_
-
-#include <stdint.h>
-#include <mach/port.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/machine/vm_types.h>
-
-#include <sys/cdefs.h>
-
-/*
- *  The timeout mechanism uses mach_msg_timeout_t values,
- *  passed by value.  The timeout units are milliseconds.
- *  It is controlled with the MACH_SEND_TIMEOUT
- *  and MACH_RCV_TIMEOUT options.
- */
-
-typedef natural_t mach_msg_timeout_t;
-
-/*
- *  The value to be used when there is no timeout.
- *  (No MACH_SEND_TIMEOUT/MACH_RCV_TIMEOUT option.)
- */
-
-#define MACH_MSG_TIMEOUT_NONE		((mach_msg_timeout_t) 0)
-
-/*
- *  The kernel uses MACH_MSGH_BITS_COMPLEX as a hint.  If it isn't on, it
- *  assumes the body of the message doesn't contain port rights or OOL
- *  data.  The field is set in received messages.  A user task must
- *  use caution in interpreting the body of a message if the bit isn't
- *  on, because the mach_msg_type's in the body might "lie" about the
- *  contents.  If the bit isn't on, but the mach_msg_types
- *  in the body specify rights or OOL data, the behavior is undefined.
- *  (Ie, an error may or may not be produced.)
- *
- *  The value of MACH_MSGH_BITS_REMOTE determines the interpretation
- *  of the msgh_remote_port field.  It is handled like a msgt_name.
- *
- *  The value of MACH_MSGH_BITS_LOCAL determines the interpretation
- *  of the msgh_local_port field.  It is handled like a msgt_name.
- *
- *  MACH_MSGH_BITS() combines two MACH_MSG_TYPE_* values, for the remote
- *  and local fields, into a single value suitable for msgh_bits.
- *
- *  MACH_MSGH_BITS_CIRCULAR should be zero; is is used internally.
- *
- *  The unused bits should be zero and are reserved for the kernel
- *  or for future interface expansion.
- */
-
-#define MACH_MSGH_BITS_ZERO		0x00000000
-#define MACH_MSGH_BITS_REMOTE_MASK	0x000000ff
-#define MACH_MSGH_BITS_LOCAL_MASK	0x0000ff00
-#define MACH_MSGH_BITS_COMPLEX		0x80000000U
-#define MACH_MSGH_BITS_USER             0x8000ffffU
-
-#define	MACH_MSGH_BITS_CIRCULAR		0x40000000	/* internal use only */
-#define	MACH_MSGH_BITS_USED		0xc000ffffU
-
-#define	MACH_MSGH_BITS_PORTS_MASK				\
-		(MACH_MSGH_BITS_REMOTE_MASK|MACH_MSGH_BITS_LOCAL_MASK)
-
-#define MACH_MSGH_BITS(remote, local)				\
-		((remote) | ((local) << 8))
-#define	MACH_MSGH_BITS_REMOTE(bits)				\
-		((bits) & MACH_MSGH_BITS_REMOTE_MASK)
-#define	MACH_MSGH_BITS_LOCAL(bits)				\
-		(((bits) & MACH_MSGH_BITS_LOCAL_MASK) >> 8)
-#define	MACH_MSGH_BITS_PORTS(bits)				\
-		((bits) & MACH_MSGH_BITS_PORTS_MASK)
-#define	MACH_MSGH_BITS_OTHER(bits)				\
-		((bits) &~ MACH_MSGH_BITS_PORTS_MASK)
-
-/*
- *  Every message starts with a message header.
- *  Following the message header, if the message is complex, are a count
- *  of type descriptors and the type descriptors themselves 
- *  (mach_msg_descriptor_t). The size of the message must be specified in 
- *  bytes, and includes the message header, descriptor count, descriptors, 
- *  and inline data.
- *
- *  The msgh_remote_port field specifies the destination of the message.
- *  It must specify a valid send or send-once right for a port.
- *
- *  The msgh_local_port field specifies a "reply port".  Normally,
- *  This field carries a send-once right that the receiver will use
- *  to reply to the message.  It may carry the values MACH_PORT_NULL,
- *  MACH_PORT_DEAD, a send-once right, or a send right.
- *
- *  The msgh_seqno field carries a sequence number associated with the
- *  received-from port.  A port's sequence number is incremented every
- *  time a message is received from it.  In sent messages, the field's
- *  value is ignored.
- *
- *  The msgh_id field is uninterpreted by the message primitives.
- *  It normally carries information specifying the format
- *  or meaning of the message.
- */
-
-typedef unsigned int mach_msg_bits_t;
-typedef	natural_t mach_msg_size_t;
-typedef integer_t mach_msg_id_t;
-
-
-#define MACH_MSG_SIZE_NULL (mach_msg_size_t *) 0
-
-typedef unsigned int mach_msg_type_name_t;
-
-#define MACH_MSG_TYPE_MOVE_RECEIVE	16	/* Must hold receive rights */
-#define MACH_MSG_TYPE_MOVE_SEND		17	/* Must hold send rights */
-#define MACH_MSG_TYPE_MOVE_SEND_ONCE	18	/* Must hold sendonce rights */
-#define MACH_MSG_TYPE_COPY_SEND		19	/* Must hold send rights */
-#define MACH_MSG_TYPE_MAKE_SEND		20	/* Must hold receive rights */
-#define MACH_MSG_TYPE_MAKE_SEND_ONCE	21	/* Must hold receive rights */
-#define MACH_MSG_TYPE_COPY_RECEIVE	22	/* Must hold receive rights */
-
-typedef unsigned int mach_msg_copy_options_t;
-
-#define MACH_MSG_PHYSICAL_COPY		0
-#define MACH_MSG_VIRTUAL_COPY   	1
-#define MACH_MSG_ALLOCATE		2
-#define MACH_MSG_OVERWRITE		3
-#ifdef  MACH_KERNEL
-#define MACH_MSG_KALLOC_COPY_T		4
-#endif  /* MACH_KERNEL */
-
-/*
- * In a complex mach message, the mach_msg_header_t is followed by 
- * a descriptor count, then an array of that number of descriptors 
- * (mach_msg_*_descriptor_t). The type field of mach_msg_type_descriptor_t
- * (which any descriptor can be cast to) indicates the flavor of the
- * descriptor.
- *
- * Note that in LP64, the various types of descriptors are no longer all
- * the same size as mach_msg_descriptor_t, so the array cannot be indexed 
- * as expected.
- */
-
-typedef unsigned int mach_msg_descriptor_type_t;
-
-#define MACH_MSG_PORT_DESCRIPTOR 		0
-#define MACH_MSG_OOL_DESCRIPTOR  		1
-#define MACH_MSG_OOL_PORTS_DESCRIPTOR 		2
-#define MACH_MSG_OOL_VOLATILE_DESCRIPTOR  	3
-
-#pragma pack(4)
-
-typedef struct
-{
-  natural_t			pad1;
-  mach_msg_size_t		pad2;
-  unsigned int			pad3 : 24;
-  mach_msg_descriptor_type_t	type : 8;
-} mach_msg_type_descriptor_t;
-
-typedef struct
-{
-  mach_port_t			name;
-#if !(defined(KERNEL) && defined(__LP64__))
-// Pad to 8 bytes everywhere except the K64 kernel where mach_port_t is 8 bytes
-  mach_msg_size_t		pad1;
-#endif
-  unsigned int			pad2 : 16;
-  mach_msg_type_name_t		disposition : 8;
-  mach_msg_descriptor_type_t	type : 8;
-} mach_msg_port_descriptor_t;
-
-typedef struct
-{
-  uint32_t			address;
-  mach_msg_size_t       	size;
-  boolean_t     		deallocate: 8;
-  mach_msg_copy_options_t       copy: 8;
-  unsigned int     		pad1: 8;
-  mach_msg_descriptor_type_t    type: 8;
-} mach_msg_ool_descriptor32_t;
-
-typedef struct
-{
-  uint64_t			address;
-  boolean_t     		deallocate: 8;
-  mach_msg_copy_options_t       copy: 8;
-  unsigned int     		pad1: 8;
-  mach_msg_descriptor_type_t    type: 8;
-  mach_msg_size_t       	size;
-} mach_msg_ool_descriptor64_t;
-
-typedef struct
-{
-  void*				address;
-#if !defined(__LP64__)
-  mach_msg_size_t       	size;
-#endif
-  boolean_t     		deallocate: 8;
-  mach_msg_copy_options_t       copy: 8;
-  unsigned int     		pad1: 8;
-  mach_msg_descriptor_type_t    type: 8;
-#if defined(__LP64__)
-  mach_msg_size_t       	size;
-#endif
-#if defined(KERNEL) && !defined(__LP64__)
-  uint32_t          pad_end;
-#endif
-} mach_msg_ool_descriptor_t;
-
-typedef struct
-{
-  uint32_t			address;
-  mach_msg_size_t		count;
-  boolean_t     		deallocate: 8;
-  mach_msg_copy_options_t       copy: 8;
-  mach_msg_type_name_t		disposition : 8;
-  mach_msg_descriptor_type_t	type : 8;
-} mach_msg_ool_ports_descriptor32_t;
-
-typedef struct
-{
-  uint64_t			address;
-  boolean_t     		deallocate: 8;
-  mach_msg_copy_options_t       copy: 8;
-  mach_msg_type_name_t		disposition : 8;
-  mach_msg_descriptor_type_t	type : 8;
-  mach_msg_size_t		count;
-} mach_msg_ool_ports_descriptor64_t;
-
-typedef struct
-{
-  void*				address;
-#if !defined(__LP64__)
-  mach_msg_size_t		count;
-#endif
-  boolean_t     		deallocate: 8;
-  mach_msg_copy_options_t       copy: 8;
-  mach_msg_type_name_t		disposition : 8;
-  mach_msg_descriptor_type_t	type : 8;
-#if defined(__LP64__)
-  mach_msg_size_t		count;
-#endif
-#if defined(KERNEL) && !defined(__LP64__)
-  uint32_t          pad_end;
-#endif
-} mach_msg_ool_ports_descriptor_t;
-
-/*
- * LP64support - This union definition is not really
- * appropriate in LP64 mode because not all descriptors
- * are of the same size in that environment.
- */
-#if defined(__LP64__) && defined(KERNEL)
-typedef union
-{
-  mach_msg_port_descriptor_t		port;
-  mach_msg_ool_descriptor32_t		out_of_line;
-  mach_msg_ool_ports_descriptor32_t	ool_ports;
-  mach_msg_type_descriptor_t		type;
-} mach_msg_descriptor_t;
-#else
-typedef union
-{
-  mach_msg_port_descriptor_t		port;
-  mach_msg_ool_descriptor_t		out_of_line;
-  mach_msg_ool_ports_descriptor_t	ool_ports;
-  mach_msg_type_descriptor_t		type;
-} mach_msg_descriptor_t;
-#endif
-
-typedef struct
-{
-        mach_msg_size_t msgh_descriptor_count;
-} mach_msg_body_t;
-
-#define MACH_MSG_BODY_NULL (mach_msg_body_t *) 0
-#define MACH_MSG_DESCRIPTOR_NULL (mach_msg_descriptor_t *) 0
-
-typedef	struct 
-{
-  mach_msg_bits_t	msgh_bits;
-  mach_msg_size_t	msgh_size;
-  mach_port_t		msgh_remote_port;
-  mach_port_t		msgh_local_port;
-  mach_msg_size_t 	msgh_reserved;
-  mach_msg_id_t		msgh_id;
-} mach_msg_header_t;
-
-#define MACH_MSG_NULL (mach_msg_header_t *) 0
-
-typedef struct
-{
-        mach_msg_header_t       header;
-        mach_msg_body_t         body;
-} mach_msg_base_t;
-
-typedef	unsigned int mach_msg_trailer_type_t;
-
-#define	MACH_MSG_TRAILER_FORMAT_0	0
-
-typedef	unsigned int mach_msg_trailer_size_t;
-
-typedef struct 
-{
-  mach_msg_trailer_type_t	msgh_trailer_type;
-  mach_msg_trailer_size_t	msgh_trailer_size;
-} mach_msg_trailer_t;
-
-typedef struct
-{
-  mach_msg_trailer_type_t       msgh_trailer_type;
-  mach_msg_trailer_size_t       msgh_trailer_size;
-  mach_port_seqno_t             msgh_seqno;
-} mach_msg_seqno_trailer_t;
-
-typedef struct
-{
-  unsigned int			val[2];
-} security_token_t;
-
-typedef struct 
-{
-  mach_msg_trailer_type_t	msgh_trailer_type;
-  mach_msg_trailer_size_t	msgh_trailer_size;
-  mach_port_seqno_t		msgh_seqno;
-  security_token_t		msgh_sender;
-} mach_msg_security_trailer_t;
-
-/*
- * The audit token is an opaque token which identifies
- * Mach tasks and senders of Mach messages as subjects
- * to the BSM audit system.  Only the appropriate BSM
- * library routines should be used to interpret the
- * contents of the audit token as the representation
- * of the subject identity within the token may change
- * over time.
- */
-typedef struct
-{
-  unsigned int			val[8];
-} audit_token_t;
-
-typedef struct 
-{
-  mach_msg_trailer_type_t	msgh_trailer_type;
-  mach_msg_trailer_size_t	msgh_trailer_size;
-  mach_port_seqno_t		msgh_seqno;
-  security_token_t		msgh_sender;
-  audit_token_t			msgh_audit;
-} mach_msg_audit_trailer_t;
-
-typedef struct 
-{
-  mach_msg_trailer_type_t	msgh_trailer_type;
-  mach_msg_trailer_size_t	msgh_trailer_size;
-  mach_port_seqno_t		msgh_seqno;
-  security_token_t		msgh_sender;
-  audit_token_t			msgh_audit;
-  mach_vm_address_t		msgh_context;
-} mach_msg_context_trailer_t;
-
-
-typedef struct
-{
-  mach_port_name_t sender;
-} msg_labels_t;
-
-/* 
-   Trailer type to pass MAC policy label info as a mach message trailer.
-   
-*/
-
-typedef struct
-{
-  mach_msg_trailer_type_t       msgh_trailer_type;
-  mach_msg_trailer_size_t       msgh_trailer_size;
-  mach_port_seqno_t             msgh_seqno;
-  security_token_t              msgh_sender;
-  audit_token_t                 msgh_audit;
-  mach_vm_address_t             msgh_context;
-  int				msgh_ad;
-  msg_labels_t                  msgh_labels;
-} mach_msg_mac_trailer_t;
-
-#define MACH_MSG_TRAILER_MINIMUM_SIZE  sizeof(mach_msg_trailer_t)
-
-/*
- * These values can change from release to release - but clearly
- * code cannot request additional trailer elements one was not
- * compiled to understand.  Therefore, it is safe to use this
- * constant when the same module specified the receive options.
- * Otherwise, you run the risk that the options requested by
- * another module may exceed the local modules notion of
- * MAX_TRAILER_SIZE.
- */
-typedef mach_msg_mac_trailer_t mach_msg_max_trailer_t;
-#define MAX_TRAILER_SIZE ((mach_msg_size_t)sizeof(mach_msg_max_trailer_t))
-
-/*
- * Legacy requirements keep us from ever updating these defines (even
- * when the format_0 trailers gain new option data fields in the future).
- * Therefore, they shouldn't be used going forward.  Instead, the sizes
- * should be compared against the specific element size requested using
- * REQUESTED_TRAILER_SIZE.
- */
-typedef mach_msg_security_trailer_t mach_msg_format_0_trailer_t;
-
-/*typedef mach_msg_mac_trailer_t mach_msg_format_0_trailer_t;
-*/
-
-#define MACH_MSG_TRAILER_FORMAT_0_SIZE sizeof(mach_msg_format_0_trailer_t)
-
-#define   KERNEL_SECURITY_TOKEN_VALUE  { {0, 1} }
-extern security_token_t KERNEL_SECURITY_TOKEN;
-
-#define   KERNEL_AUDIT_TOKEN_VALUE  { {0, 0, 0, 0, 0, 0, 0, 0} }
-extern audit_token_t KERNEL_AUDIT_TOKEN;
-
-typedef	integer_t mach_msg_options_t;
-
-typedef struct
-{
-  mach_msg_header_t	header;
-} mach_msg_empty_send_t;
-
-typedef struct
-{
-  mach_msg_header_t	header;
-  mach_msg_trailer_t	trailer;
-} mach_msg_empty_rcv_t;
-
-typedef union
-{
-  mach_msg_empty_send_t	send;
-  mach_msg_empty_rcv_t	rcv;
-} mach_msg_empty_t;
-
-#pragma pack()
-
-/* utility to round the message size - will become machine dependent */
-#define round_msg(x)	(((mach_msg_size_t)(x) + sizeof (natural_t) - 1) & \
-				~(sizeof (natural_t) - 1))
-
-/*
- *  There is no fixed upper bound to the size of Mach messages.
- */
-
-#define	MACH_MSG_SIZE_MAX	((mach_msg_size_t) ~0)
-
-/*
- *  Compatibility definitions, for code written
- *  when there was a msgh_kind instead of msgh_seqno.
- */
-#define MACH_MSGH_KIND_NORMAL		0x00000000
-#define MACH_MSGH_KIND_NOTIFICATION	0x00000001
-#define	msgh_kind			msgh_seqno
-#define mach_msg_kind_t			mach_port_seqno_t
-
-typedef natural_t mach_msg_type_size_t;
-typedef natural_t mach_msg_type_number_t;
-
-/*
- *  Values received/carried in messages.  Tells the receiver what
- *  sort of port right he now has.
- *
- *  MACH_MSG_TYPE_PORT_NAME is used to transfer a port name
- *  which should remain uninterpreted by the kernel.  (Port rights
- *  are not transferred, just the port name.)
- */
-
-#define MACH_MSG_TYPE_PORT_NONE		0
-
-#define MACH_MSG_TYPE_PORT_NAME		15
-#define MACH_MSG_TYPE_PORT_RECEIVE	MACH_MSG_TYPE_MOVE_RECEIVE
-#define MACH_MSG_TYPE_PORT_SEND		MACH_MSG_TYPE_MOVE_SEND
-#define MACH_MSG_TYPE_PORT_SEND_ONCE	MACH_MSG_TYPE_MOVE_SEND_ONCE
-
-#define MACH_MSG_TYPE_LAST		22		/* Last assigned */
-
-/*
- *  A dummy value.  Mostly used to indicate that the actual value
- *  will be filled in later, dynamically.
- */
-
-#define MACH_MSG_TYPE_POLYMORPHIC	((mach_msg_type_name_t) -1)
-
-/*
- *	Is a given item a port type?
- */
-
-#define MACH_MSG_TYPE_PORT_ANY(x)			\
-	(((x) >= MACH_MSG_TYPE_MOVE_RECEIVE) &&		\
-	 ((x) <= MACH_MSG_TYPE_MAKE_SEND_ONCE))
-
-#define	MACH_MSG_TYPE_PORT_ANY_SEND(x)			\
-	(((x) >= MACH_MSG_TYPE_MOVE_SEND) &&		\
-	 ((x) <= MACH_MSG_TYPE_MAKE_SEND_ONCE))
-
-#define	MACH_MSG_TYPE_PORT_ANY_RIGHT(x)			\
-	(((x) >= MACH_MSG_TYPE_MOVE_RECEIVE) &&		\
-	 ((x) <= MACH_MSG_TYPE_MOVE_SEND_ONCE))
-
-typedef integer_t mach_msg_option_t;
-
-#define MACH_MSG_OPTION_NONE	0x00000000
-
-#define	MACH_SEND_MSG		0x00000001
-#define	MACH_RCV_MSG		0x00000002
-#define MACH_RCV_LARGE		0x00000004
-
-#define MACH_SEND_TIMEOUT	0x00000010
-#define MACH_SEND_INTERRUPT	0x00000040	/* libmach implements */
-#define MACH_SEND_CANCEL	0x00000080
-#define MACH_SEND_ALWAYS	0x00010000	/* internal use only */
-#define MACH_SEND_TRAILER	0x00020000	
-
-#define MACH_RCV_TIMEOUT	0x00000100
-#define MACH_RCV_NOTIFY		0x00000200
-#define MACH_RCV_INTERRUPT	0x00000400	/* libmach implements */
-#define MACH_RCV_OVERWRITE	0x00001000
-
-/* 
- * NOTE: a 0x00------ RCV mask implies to ask for
- * a MACH_MSG_TRAILER_FORMAT_0 with 0 Elements, 
- * which is equivalent to a mach_msg_trailer_t.
- *
- * XXXMAC: unlike the rest of the MACH_RCV_* flags, MACH_RCV_TRAILER_LABELS
- * needs its own private bit since we only calculate its fields when absolutely 
- * required.
- */
-#define MACH_RCV_TRAILER_NULL   0
-#define MACH_RCV_TRAILER_SEQNO  1
-#define MACH_RCV_TRAILER_SENDER 2
-#define MACH_RCV_TRAILER_AUDIT  3
-#define MACH_RCV_TRAILER_CTX    4
-#define MACH_RCV_TRAILER_AV     7
-#define MACH_RCV_TRAILER_LABELS 8
-
-#define MACH_RCV_TRAILER_TYPE(x)     (((x) & 0xf) << 28) 
-#define MACH_RCV_TRAILER_ELEMENTS(x) (((x) & 0xf) << 24)  
-#define MACH_RCV_TRAILER_MASK 	     ((0xff << 24))
-
-#define GET_RCV_ELEMENTS(y) (((y) >> 24) & 0xf)
-
-/* 
- * XXXMAC: note that in the case of MACH_RCV_TRAILER_LABELS, 
- * we just fall through to mach_msg_max_trailer_t.
- * This is correct behavior since mach_msg_max_trailer_t is defined as
- * mac_msg_mac_trailer_t which is used for the LABELS trailer.
- * It also makes things work properly if MACH_RCV_TRAILER_LABELS is ORed 
- * with one of the other options.
- */
-#define REQUESTED_TRAILER_SIZE(y) 				\
-	((mach_msg_trailer_size_t)				\
-	 ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_NULL) ?	\
-	  sizeof(mach_msg_trailer_t) :				\
-	  ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_SEQNO) ?	\
-	   sizeof(mach_msg_seqno_trailer_t) :			\
-	  ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_SENDER) ?	\
-	   sizeof(mach_msg_security_trailer_t) :		\
-	   ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_AUDIT) ?	\
-	    sizeof(mach_msg_audit_trailer_t) :      		\
-	    ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_CTX) ?	\
-	     sizeof(mach_msg_context_trailer_t) :      		\
-	     ((GET_RCV_ELEMENTS(y) == MACH_RCV_TRAILER_AV) ?	\
-	      sizeof(mach_msg_mac_trailer_t) :      		\
-	     sizeof(mach_msg_max_trailer_t))))))))
-
-/*
- *  Much code assumes that mach_msg_return_t == kern_return_t.
- *  This definition is useful for descriptive purposes.
- *
- *  See <mach/error.h> for the format of error codes.
- *  IPC errors are system 4.  Send errors are subsystem 0;
- *  receive errors are subsystem 1.  The code field is always non-zero.
- *  The high bits of the code field communicate extra information
- *  for some error codes.  MACH_MSG_MASK masks off these special bits.
- */
-
-typedef kern_return_t mach_msg_return_t;
-
-#define MACH_MSG_SUCCESS		0x00000000
-
-
-#define	MACH_MSG_MASK			0x00003e00
-		/* All special error code bits defined below. */
-#define	MACH_MSG_IPC_SPACE		0x00002000
-		/* No room in IPC name space for another capability name. */
-#define	MACH_MSG_VM_SPACE		0x00001000
-		/* No room in VM address space for out-of-line memory. */
-#define	MACH_MSG_IPC_KERNEL		0x00000800
-		/* Kernel resource shortage handling an IPC capability. */
-#define	MACH_MSG_VM_KERNEL		0x00000400
-		/* Kernel resource shortage handling out-of-line memory. */
-
-#define MACH_SEND_IN_PROGRESS		0x10000001
-		/* Thread is waiting to send.  (Internal use only.) */
-#define MACH_SEND_INVALID_DATA		0x10000002
-		/* Bogus in-line data. */
-#define MACH_SEND_INVALID_DEST		0x10000003
-		/* Bogus destination port. */
-#define MACH_SEND_TIMED_OUT		0x10000004
-		/* Message not sent before timeout expired. */
-#define MACH_SEND_INTERRUPTED		0x10000007
-		/* Software interrupt. */
-#define MACH_SEND_MSG_TOO_SMALL		0x10000008
-		/* Data doesn't contain a complete message. */
-#define MACH_SEND_INVALID_REPLY		0x10000009
-		/* Bogus reply port. */
-#define MACH_SEND_INVALID_RIGHT		0x1000000a
-		/* Bogus port rights in the message body. */
-#define MACH_SEND_INVALID_NOTIFY	0x1000000b
-		/* Bogus notify port argument. */
-#define MACH_SEND_INVALID_MEMORY	0x1000000c
-		/* Invalid out-of-line memory pointer. */
-#define MACH_SEND_NO_BUFFER		0x1000000d
-		/* No message buffer is available. */
-#define MACH_SEND_TOO_LARGE		0x1000000e
-		/* Send is too large for port */
-#define MACH_SEND_INVALID_TYPE		0x1000000f
-		/* Invalid msg-type specification. */
-#define MACH_SEND_INVALID_HEADER	0x10000010
-		/* A field in the header had a bad value. */
-#define MACH_SEND_INVALID_TRAILER	0x10000011
-		/* The trailer to be sent does not match kernel format. */
-#define MACH_SEND_INVALID_RT_OOL_SIZE	0x10000015
-		/* compatibility: no longer a returned error */
-
-#define MACH_RCV_IN_PROGRESS		0x10004001
-		/* Thread is waiting for receive.  (Internal use only.) */
-#define MACH_RCV_INVALID_NAME		0x10004002
-		/* Bogus name for receive port/port-set. */
-#define MACH_RCV_TIMED_OUT		0x10004003
-		/* Didn't get a message within the timeout value. */
-#define MACH_RCV_TOO_LARGE		0x10004004
-		/* Message buffer is not large enough for inline data. */
-#define MACH_RCV_INTERRUPTED		0x10004005
-		/* Software interrupt. */
-#define MACH_RCV_PORT_CHANGED		0x10004006
-		/* compatibility: no longer a returned error */
-#define MACH_RCV_INVALID_NOTIFY		0x10004007
-		/* Bogus notify port argument. */
-#define MACH_RCV_INVALID_DATA		0x10004008
-		/* Bogus message buffer for inline data. */
-#define MACH_RCV_PORT_DIED		0x10004009
-		/* Port/set was sent away/died during receive. */
-#define	MACH_RCV_IN_SET			0x1000400a
-		/* compatibility: no longer a returned error */
-#define	MACH_RCV_HEADER_ERROR		0x1000400b
-		/* Error receiving message header.  See special bits. */
-#define	MACH_RCV_BODY_ERROR		0x1000400c
-		/* Error receiving message body.  See special bits. */
-#define	MACH_RCV_INVALID_TYPE		0x1000400d
-		/* Invalid msg-type specification in scatter list. */
-#define	MACH_RCV_SCATTER_SMALL		0x1000400e
-		/* Out-of-line overwrite region is not large enough */
-#define MACH_RCV_INVALID_TRAILER	0x1000400f
-		/* trailer type or number of trailer elements not supported */
-#define MACH_RCV_IN_PROGRESS_TIMED      0x10004011
-                /* Waiting for receive with timeout. (Internal use only.) */
-
-
-__BEGIN_DECLS
-
-/*
- *	Routine:	mach_msg_overwrite
- *	Purpose:
- *		Send and/or receive a message.  If the message operation
- *		is interrupted, and the user did not request an indication
- *		of that fact, then restart the appropriate parts of the
- *		operation silently (trap version does not restart).
- *
- *		Distinct send and receive buffers may be specified.  If
- *		no separate receive buffer is specified, the msg parameter
- *		will be used for both send and receive operations.
- *
- *		In addition to a distinct receive buffer, that buffer may
- *		already contain scatter control information to direct the
- *		receiving of the message.
- */
-
-extern mach_msg_return_t	mach_msg_overwrite(
-					mach_msg_header_t *msg,
-					mach_msg_option_t option,
-					mach_msg_size_t send_size,
-					mach_msg_size_t rcv_size,
-					mach_port_name_t rcv_name,
-					mach_msg_timeout_t timeout,
-					mach_port_name_t notify,
-					mach_msg_header_t *rcv_msg,
-					mach_msg_size_t rcv_limit);
-
-
-/*
- *	Routine:	mach_msg
- *	Purpose:
- *		Send and/or receive a message.  If the message operation
- *		is interrupted, and the user did not request an indication
- *		of that fact, then restart the appropriate parts of the
- *		operation silently (trap version does not restart).
- */
-extern mach_msg_return_t	mach_msg(
-					mach_msg_header_t *msg,
-					mach_msg_option_t option,
-					mach_msg_size_t send_size,
-					mach_msg_size_t rcv_size,
-					mach_port_name_t rcv_name,
-					mach_msg_timeout_t timeout,
-					mach_port_name_t notify);
-
-
-__END_DECLS
-
-#endif	/* _MACH_MESSAGE_H_ */
-
diff --git a/i386/include/mach/mig.h b/i386/include/mach/mig.h
deleted file mode 100644
index b62dd2c..0000000
--- a/i386/include/mach/mig.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-/*
- * Mach MIG Subsystem Interfaces
- */
-
-#ifndef	_MACH_MIG_H_
-#define _MACH_MIG_H_
-
-#include <stdint.h>
-#include <mach/port.h>
-#include <mach/message.h>
-#include <mach/vm_types.h>
-
-#include <sys/cdefs.h>
-
-#if defined(MACH_KERNEL)
-
-#if defined(BSMALL_LATER)
-/* Really small configurations don't need type checking */
-#define __MigTypeCheck 0
-#else
-/* Turn MIG type checking on by default for kernel */
-#define __MigTypeCheck 1
-#endif
-#define __MigKernelSpecificCode 1
-#define _MIG_KERNEL_SPECIFIC_CODE_ 1
-
-/* Otherwise check legacy setting (temporary) */
-#elif defined(TypeCheck)  
-
-#define __MigTypeCheck TypeCheck
-
-#elif !defined(__MigTypeCheck)
-
-/* otherwise, default MIG type checking on - except in small configurations */
-#if defined(BSMALL)
-#define __MigTypeCheck 0
-#else
-#define __MigTypeCheck 1
-#endif
-
-#endif /* !defined(__MigTypeCheck) */
-
-/*
- * Pack MIG message structs.
- * This is an indicator of the need to view shared structs in a
- * binary-compatible format - and MIG message structs are no different.
- */
-#define __MigPackStructs 1
-
-/*
- * Definition for MIG-generated server stub routines.  These routines
- * unpack the request message, call the server procedure, and pack the
- * reply message.
- */
-typedef void	(*mig_stub_routine_t) (mach_msg_header_t *InHeadP,
-				       mach_msg_header_t *OutHeadP);
-
-typedef mig_stub_routine_t mig_routine_t;
-
-/*
- * Definition for MIG-generated server routine.  This routine takes a
- * message, and returns the appropriate stub function for handling that
- * message.
- */
-typedef mig_routine_t (*mig_server_routine_t) (mach_msg_header_t *InHeadP);
-
-/*
- * Generic definition for implementation routines.  These routines do
- * the real work associated with this request.  This generic type is
- * used for keeping the pointers in the subsystem array.
- */
-typedef kern_return_t   (*mig_impl_routine_t)(void);
-
-typedef mach_msg_type_descriptor_t routine_arg_descriptor;
-typedef mach_msg_type_descriptor_t *routine_arg_descriptor_t;
-typedef mach_msg_type_descriptor_t *mig_routine_arg_descriptor_t;
-
-#define MIG_ROUTINE_ARG_DESCRIPTOR_NULL ((mig_routine_arg_descriptor_t)0)
-
-struct routine_descriptor {
-	mig_impl_routine_t	impl_routine;	/* Server work func pointer   */
-	mig_stub_routine_t	stub_routine;	/* Unmarshalling func pointer */
-	unsigned int		argc;			/* Number of argument words   */
-	unsigned int		descr_count;	/* Number complex descriptors */
-	routine_arg_descriptor_t
-						arg_descr;		/* pointer to descriptor array*/
-	unsigned int		max_reply_msg;	/* Max size for reply msg     */
-};
-typedef struct routine_descriptor *routine_descriptor_t;
-
-typedef struct routine_descriptor mig_routine_descriptor;
-typedef mig_routine_descriptor *mig_routine_descriptor_t;
-
-#define MIG_ROUTINE_DESCRIPTOR_NULL ((mig_routine_descriptor_t)0)
-
-typedef struct mig_subsystem {
-	mig_server_routine_t server;		/* pointer to demux routine	*/
-	mach_msg_id_t		 start;			/* Min routine number	    */
-	mach_msg_id_t		 end;			/* Max routine number + 1   */
-	mach_msg_size_t		 maxsize;		/* Max reply message size   */
-	vm_address_t		 reserved;		/* reserved for MIG use	    */
-	mig_routine_descriptor
-						 routine[1];	/* Routine descriptor array */
-} *mig_subsystem_t;
-
-#define MIG_SUBSYSTEM_NULL		((mig_subsystem_t)0)
-
-typedef struct mig_symtab {
-	char				*ms_routine_name;
-	int					ms_routine_number;
-	void    			(*ms_routine)(void);	/* Since the functions in the
-					 							 * symbol table have unknown
-												 * signatures, this is the best
-					 							 * we can do...
-					 							 */
-} mig_symtab_t;
-
-
-__BEGIN_DECLS
-
-/* Client side reply port allocate */
-extern mach_port_t mig_get_reply_port(void);
-
-/* Client side reply port deallocate */
-extern void mig_dealloc_reply_port(mach_port_t reply_port);
-
-/* Client side reply port "deallocation" */
-extern void mig_put_reply_port(mach_port_t reply_port);
-
-/* Bounded string copy */
-extern int mig_strncpy(char	*dest, const char *src,	int	len);
-
-
-/* Allocate memory for out-of-line mig structures */
-extern void mig_allocate(vm_address_t *, vm_size_t);
-
-/* Deallocate memory used for out-of-line mig structures */
-extern void mig_deallocate(vm_address_t, vm_size_t);
-
-
-__END_DECLS
-
-#endif	/* _MACH_MIG_H_ */
diff --git a/i386/include/mach/mig_errors.h b/i386/include/mach/mig_errors.h
deleted file mode 100644
index f1234bc..0000000
--- a/i386/include/mach/mig_errors.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- * Mach Interface Generator errors
- *
- */
-
-#ifndef	_MACH_MIG_ERRORS_H_
-#define _MACH_MIG_ERRORS_H_
-
-#include <mach/mig.h>
-#include <mach/ndr.h>
-#include <mach/message.h>
-#include <mach/kern_return.h>
-
-#include <sys/cdefs.h>
-
-/*
- *	These error codes should be specified as system 4, subsytem 2.
- *	But alas backwards compatibility makes that impossible.
- *	The problem is old clients of new servers (eg, the kernel)
- *	which get strange large error codes when there is a Mig problem
- *	in the server.  Unfortunately, the IPC system doesn't have
- *	the knowledge to convert the codes in this situation.
- */
-
-#define MIG_TYPE_ERROR		-300	/* client type check failure */
-#define MIG_REPLY_MISMATCH	-301	/* wrong reply message ID */
-#define MIG_REMOTE_ERROR	-302	/* server detected error */
-#define MIG_BAD_ID		-303	/* bad request message ID */
-#define MIG_BAD_ARGUMENTS	-304	/* server type check failure */
-#define MIG_NO_REPLY		-305	/* no reply should be send */
-#define MIG_EXCEPTION		-306	/* server raised exception */
-#define MIG_ARRAY_TOO_LARGE	-307	/* array not large enough */
-#define MIG_SERVER_DIED		-308	/* server died */
-#define MIG_TRAILER_ERROR       -309    /* trailer has an unknown format */
-
-/*
- *	Whenever MIG detects an error, it sends back a generic
- *	mig_reply_error_t format message.  Clients must accept
- *	these in addition to the expected reply message format.
- */
-#pragma pack(4)
-typedef struct {
-	mach_msg_header_t	Head;
-	NDR_record_t		NDR;
-	kern_return_t		RetCode;
-} mig_reply_error_t;
-#pragma pack()
-
-
-__BEGIN_DECLS
-
-#if !defined(__NDR_convert__mig_reply_error_t__defined)
-#define __NDR_convert__mig_reply_error_t__defined
-
-static __inline__ void
-__NDR_convert__mig_reply_error_t(__unused mig_reply_error_t *x)
-{
-#if defined(__NDR_convert__int_rep__kern_return_t__defined)
-	if (x->NDR.int_rep != NDR_record.int_rep)
-		__NDR_convert__int_rep__kern_return_t(&x->RetCode, x->NDR.int_rep);
-#endif /* __NDR_convert__int_rep__kern_return_t__defined */
-}
-#endif /* !defined(__NDR_convert__mig_reply_error_t__defined) */
-
-__END_DECLS
-
-#endif	/* _MACH_MIG_ERRORS_H_ */
diff --git a/i386/include/mach/ndr.h b/i386/include/mach/ndr.h
deleted file mode 100644
index cb64d3f..0000000
--- a/i386/include/mach/ndr.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-#ifndef _MACH_NDR_H_
-#define _MACH_NDR_H_
-
-#include <stdint.h>
-#include <sys/cdefs.h>
-
-typedef struct {
-    unsigned char       mig_vers;
-    unsigned char       if_vers;
-    unsigned char       reserved1;
-    unsigned char       mig_encoding;
-    unsigned char       int_rep;
-    unsigned char       char_rep;
-    unsigned char       float_rep;
-    unsigned char       reserved2;
-} NDR_record_t;
-
-/*
- * MIG supported protocols for Network Data Representation
- */
-#define  NDR_PROTOCOL_2_0      0
-
-/*
- * NDR 2.0 format flag type definition and values.
- */
-#define  NDR_INT_BIG_ENDIAN    0
-#define  NDR_INT_LITTLE_ENDIAN 1
-#define  NDR_FLOAT_IEEE        0
-#define  NDR_FLOAT_VAX         1
-#define  NDR_FLOAT_CRAY        2
-#define  NDR_FLOAT_IBM         3
-#define  NDR_CHAR_ASCII        0
-#define  NDR_CHAR_EBCDIC       1
-
-extern NDR_record_t NDR_record;
-
-#if defined(BSMALL)
-#define __NDR_convert__ 0
-#define __NDR_convert__int_rep__ 0
-#else
-#ifndef __NDR_convert__
-#define __NDR_convert__ 1
-#endif /* __NDR_convert__ */
-
-#ifndef __NDR_convert__int_rep__
-#define __NDR_convert__int_rep__ 1
-#endif /* __NDR_convert__int_rep__ */
-
-#endif /* defined(BSMALL) */
-
-#ifndef __NDR_convert__char_rep__
-#define __NDR_convert__char_rep__ 0
-#endif /* __NDR_convert__char_rep__ */
-
-#ifndef __NDR_convert__float_rep__
-#define __NDR_convert__float_rep__ 0
-#endif /* __NDR_convert__float_rep__ */
-
-#if __NDR_convert__
-
-#define __NDR_convert__NOOP		do ; while (0)
-#define __NDR_convert__UNKNOWN(s)	__NDR_convert__NOOP
-#define __NDR_convert__SINGLE(a, f, r)	do { r((a), (f)); } while (0)
-#define __NDR_convert__ARRAY(a, f, c, r) \
-	do { int __i__, __C__ = (c); \
-	for (__i__ = 0; __i__ < __C__; __i__++) \
-	r(&(a)[__i__], f); } while (0)
-#define __NDR_convert__2DARRAY(a, f, s, c, r) \
-	do { int __i__, __C__ = (c), __S__ = (s); \
-	for (__i__ = 0; __i__ < __C__; __i__++) \
-	r(&(a)[__i__ * __S__], f, __S__); } while (0)
-
-#if __NDR_convert__int_rep__
-
-#include <libkern/OSByteOrder.h>
-
-#define __NDR_READSWAP_assign(a, rs)	do { *(a) = rs(a); } while (0)
-
-#define __NDR_READSWAP__uint16_t(a) 	OSReadSwapInt16((void *)a, 0)
-#define __NDR_READSWAP__int16_t(a)	(int16_t)OSReadSwapInt16((void *)a, 0)
-#define __NDR_READSWAP__uint32_t(a) 	OSReadSwapInt32((void *)a, 0)
-#define __NDR_READSWAP__int32_t(a)	(int32_t)OSReadSwapInt32((void *)a, 0)
-#define __NDR_READSWAP__uint64_t(a)	OSReadSwapInt64((void *)a, 0)
-#define __NDR_READSWAP__int64_t(a)	(int64_t)OSReadSwapInt64((void *)a, 0)
-
-__BEGIN_DECLS
-
-static __inline__ float __NDR_READSWAP__float(float *argp) {
-	union {
-		float sv;
-		uint32_t ull;
-	} result;
-	result.ull = __NDR_READSWAP__uint32_t((uint32_t *)argp);
-	return result.sv;
-}
-
-static __inline__ double __NDR_READSWAP__double(double *argp) {
-	union {
-		double sv;
-		uint64_t ull;
-	} result;
-	result.ull = __NDR_READSWAP__uint64_t((uint64_t *)argp);
-	return result.sv;
-}
-
-__END_DECLS
-
-#define __NDR_convert__int_rep__int16_t__defined
-#define __NDR_convert__int_rep__int16_t(v,f)		\
-	__NDR_READSWAP_assign(v, __NDR_READSWAP__int16_t)
-
-#define __NDR_convert__int_rep__uint16_t__defined
-#define __NDR_convert__int_rep__uint16_t(v,f)		\
-	__NDR_READSWAP_assign(v, __NDR_READSWAP__uint16_t)
-
-#define __NDR_convert__int_rep__int32_t__defined
-#define __NDR_convert__int_rep__int32_t(v,f)		\
-	__NDR_READSWAP_assign(v, __NDR_READSWAP__int32_t)
-
-#define __NDR_convert__int_rep__uint32_t__defined
-#define __NDR_convert__int_rep__uint32_t(v,f)		\
-	__NDR_READSWAP_assign(v, __NDR_READSWAP__uint32_t)
-
-#define __NDR_convert__int_rep__int64_t__defined
-#define __NDR_convert__int_rep__int64_t(v,f)		\
-	__NDR_READSWAP_assign(v, __NDR_READSWAP__int64_t)
-
-#define __NDR_convert__int_rep__uint64_t__defined
-#define __NDR_convert__int_rep__uint64_t(v,f)		\
-	__NDR_READSWAP_assign(v, __NDR_READSWAP__uint64_t)
-
-#define __NDR_convert__int_rep__float__defined
-#define __NDR_convert__int_rep__float(v,f)		\
-	__NDR_READSWAP_assign(v, __NDR_READSWAP__float)
-
-#define __NDR_convert__int_rep__double__defined
-#define __NDR_convert__int_rep__double(v,f)		\
-	__NDR_READSWAP_assign(v, __NDR_READSWAP__double)
-
-#define __NDR_convert__int_rep__boolean_t__defined
-#define __NDR_convert__int_rep__boolean_t(v, f)		\
-	__NDR_convert__int_rep__int32_t(v,f)
-
-#define __NDR_convert__int_rep__kern_return_t__defined
-#define __NDR_convert__int_rep__kern_return_t(v,f)	\
-	__NDR_convert__int_rep__int32_t(v,f)
-
-#define __NDR_convert__int_rep__mach_port_name_t__defined
-#define __NDR_convert__int_rep__mach_port_name_t(v,f)	\
-	__NDR_convert__int_rep__uint32_t(v,f)
-
-#define __NDR_convert__int_rep__mach_msg_type_number_t__defined
-#define __NDR_convert__int_rep__mach_msg_type_number_t(v,f) \
-	__NDR_convert__int_rep__uint32_t(v,f)
-
-#endif /* __NDR_convert__int_rep__ */
-
-#if __NDR_convert__char_rep__
-
-#warning  NDR character representation conversions not implemented yet!
-#define __NDR_convert__char_rep__char(v,f)	__NDR_convert__NOOP
-#define __NDR_convert__char_rep__string(v,f,l)	__NDR_convert__NOOP
-
-#endif /* __NDR_convert__char_rep__ */
-
-#if __NDR_convert__float_rep__
-
-#warning  NDR floating point representation conversions not implemented yet!
-#define __NDR_convert__float_rep__float(v,f)	__NDR_convert__NOOP
-#define __NDR_convert__float_rep__double(v,f)	__NDR_convert__NOOP
-
-#endif /* __NDR_convert__float_rep__ */
-
-#endif /* __NDR_convert__ */
-
-#endif /* _MACH_NDR_H_ */
diff --git a/i386/include/mach/notify.defs b/i386/include/mach/notify.defs
deleted file mode 100644
index 6f7f81d..0000000
--- a/i386/include/mach/notify.defs
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-subsystem 
-#if	KERNEL_USER
-	KernelUser
-#endif
-	notify 64;
-
-#include <mach/std_types.defs>
-
-#if	SEQNOS
-serverprefix do_seqnos_;
-serverdemux seqnos_notify_server;
-#else	/* !SEQNOS */
-serverprefix do_;
-serverdemux notify_server;
-#endif	/* SEQNOS */
-
-/* MACH_NOTIFY_FIRST: 0100 */
-skip;
-
-/* MACH_NOTIFY_PORT_DELETED: 0101 */
-simpleroutine mach_notify_port_deleted(
-		notify	: mach_port_move_send_once_t;
-#if	SEQNOS
-	msgseqno seqno	: mach_port_seqno_t;
-#endif	/* SEQNOS */
-		name	: mach_port_name_t);
-
-skip;	/* was MACH_NOTIFY_MSG_ACCEPTED: 0102 */
-
-skip;	/* was NOTIFY_OWNERSHIP_RIGHTS: 0103 */
-
-skip;	/* was NOTIFY_RECEIVE_RIGHTS: 0104 */
-
-/* MACH_NOTIFY_PORT_DESTROYED: 0105 */
-simpleroutine mach_notify_port_destroyed(
-		notify	: mach_port_move_send_once_t;
-#if	SEQNOS
-	msgseqno seqno	: mach_port_seqno_t;
-#endif	/* SEQNOS */
-		rights	: mach_port_move_receive_t);
-
-/* MACH_NOTIFY_NO_SENDERS: 0106 */
-simpleroutine mach_notify_no_senders(
-		notify	: mach_port_move_send_once_t;
-#if	SEQNOS
-	msgseqno seqno	: mach_port_seqno_t;
-#endif	/* SEQNOS */
-		mscount	: mach_port_mscount_t);
-
-/* MACH_NOTIFY_SEND_ONCE: 0107 */
-simpleroutine mach_notify_send_once(
-		notify	: mach_port_move_send_once_t
-#if	SEQNOS
-;	msgseqno seqno	: mach_port_seqno_t
-#endif	/* SEQNOS */
-		);
-
-/* MACH_NOTIFY_DEAD_NAME: 0110 */
-simpleroutine mach_notify_dead_name(
-		notify	: mach_port_move_send_once_t;
-#if	SEQNOS
-	msgseqno seqno	: mach_port_seqno_t;
-#endif	/* SEQNOS */
-		name	: mach_port_name_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/notify.h b/i386/include/mach/notify.h
deleted file mode 100644
index 768a865..0000000
--- a/i386/include/mach/notify.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/notify.h
- *
- *	Kernel notification message definitions.
- */
-
-#ifndef	_MACH_NOTIFY_H_
-#define _MACH_NOTIFY_H_
-
-#include <mach/port.h>
-#include <mach/message.h>
-#include <mach/ndr.h>
-
-/*
- *  An alternative specification of the notification interface
- *  may be found in mach/notify.defs.
- */
-
-#define MACH_NOTIFY_FIRST		0100
-#define MACH_NOTIFY_PORT_DELETED	(MACH_NOTIFY_FIRST + 001 )
-			/* A send or send-once right was deleted. */
-#define MACH_NOTIFY_PORT_DESTROYED	(MACH_NOTIFY_FIRST + 005)
-			/* A receive right was (would have been) deallocated */
-#define MACH_NOTIFY_NO_SENDERS		(MACH_NOTIFY_FIRST + 006)
-			/* Receive right has no extant send rights */
-#define MACH_NOTIFY_SEND_ONCE		(MACH_NOTIFY_FIRST + 007)
-			/* An extant send-once right died */
-#define MACH_NOTIFY_DEAD_NAME		(MACH_NOTIFY_FIRST + 010)
-			/* Send or send-once right died, leaving a dead-name */
-#define MACH_NOTIFY_LAST		(MACH_NOTIFY_FIRST + 015)
-
-typedef mach_port_t notify_port_t;
-
-/*
- * Hard-coded message structures for receiving Mach port notification
- * messages.  However, they are not actual large enough to receive 
- * the largest trailers current exported by Mach IPC (so they cannot
- * be used for space allocations in situations using these new larger
- * trailers).  Instead, the MIG-generated server routines (and
- * related prototypes should be used).
- */
-typedef struct {
-    mach_msg_header_t	not_header;
-    NDR_record_t	NDR;
-    mach_port_name_t not_port;/* MACH_MSG_TYPE_PORT_NAME */
-    mach_msg_format_0_trailer_t trailer;
-} mach_port_deleted_notification_t;
-
-typedef struct {
-    mach_msg_header_t	not_header;
-    mach_msg_body_t	not_body;
-    mach_msg_port_descriptor_t not_port;/* MACH_MSG_TYPE_PORT_RECEIVE */
-    mach_msg_format_0_trailer_t trailer;
-} mach_port_destroyed_notification_t;
-
-typedef struct {
-    mach_msg_header_t	not_header;
-    NDR_record_t	NDR;
-    mach_msg_type_number_t not_count;
-    mach_msg_format_0_trailer_t trailer;
-} mach_no_senders_notification_t;
-
-typedef struct {
-    mach_msg_header_t	not_header;
-    mach_msg_format_0_trailer_t trailer;
-} mach_send_once_notification_t;
-
-typedef struct {
-    mach_msg_header_t	not_header;
-    NDR_record_t	NDR;
-    mach_port_name_t not_port;/* MACH_MSG_TYPE_PORT_NAME */
-    mach_msg_format_0_trailer_t trailer;
-} mach_dead_name_notification_t;
-
-#endif	/* _MACH_NOTIFY_H_ */
diff --git a/i386/include/mach/policy.h b/i386/include/mach/policy.h
deleted file mode 100644
index b6ec795..0000000
--- a/i386/include/mach/policy.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-#ifndef	_MACH_POLICY_H_
-#define _MACH_POLICY_H_
-
-/*
- *	mach/policy.h
- *
- *	Definitions for scheduing policy.
- */
-
-/*
- *  All interfaces defined here are obsolete.
- */
-
-#include <mach/boolean.h>
-#include <mach/message.h>
-#include <mach/vm_types.h>
-
-/*
- *	Old scheduling control interface
- */
-typedef int 				policy_t;
-typedef integer_t			*policy_info_t;
-typedef integer_t			*policy_base_t;
-typedef integer_t			*policy_limit_t;
-
-/*
- *	Policy definitions.  Policies should be powers of 2,
- *	but cannot be or'd together other than to test for a
- *	policy 'class'.
- */
-#define	POLICY_NULL		0	/* none			*/
-#define	POLICY_TIMESHARE	1	/* timesharing		*/
-#define	POLICY_RR		2	/* fixed round robin	*/
-#define POLICY_FIFO		4	/* fixed fifo		*/
-
-#define __NEW_SCHEDULING_FRAMEWORK__
-
-/*
- *	Check if policy is of 'class' fixed-priority.
- */
-#define	POLICYCLASS_FIXEDPRI	(POLICY_RR | POLICY_FIFO)
-
-/*
- *	Check if policy is valid.
- */
-#define invalid_policy(policy)			\
-	((policy) != POLICY_TIMESHARE &&	\
-	 (policy) != POLICY_RR &&		\
-	 (policy) != POLICY_FIFO)
-
-
-/*
- * 	Types for TIMESHARE policy
- */
-struct policy_timeshare_base {			
-	integer_t		base_priority;
-};
-struct policy_timeshare_limit {
-	integer_t		max_priority;
-};
-struct policy_timeshare_info {
-	integer_t		max_priority;
-	integer_t		base_priority;
-	integer_t		cur_priority;
-	boolean_t		depressed;
-	integer_t		depress_priority;
-};
-
-typedef struct policy_timeshare_base	*policy_timeshare_base_t; 
-typedef struct policy_timeshare_limit	*policy_timeshare_limit_t;
-typedef struct policy_timeshare_info	*policy_timeshare_info_t;
-
-typedef struct policy_timeshare_base	policy_timeshare_base_data_t; 
-typedef struct policy_timeshare_limit	policy_timeshare_limit_data_t;
-typedef struct policy_timeshare_info	policy_timeshare_info_data_t;
-
-
-#define POLICY_TIMESHARE_BASE_COUNT	((mach_msg_type_number_t) \
-	(sizeof(struct policy_timeshare_base)/sizeof(integer_t)))
-#define POLICY_TIMESHARE_LIMIT_COUNT	((mach_msg_type_number_t) \
-	(sizeof(struct policy_timeshare_limit)/sizeof(integer_t)))
-#define POLICY_TIMESHARE_INFO_COUNT	((mach_msg_type_number_t) \
-	(sizeof(struct policy_timeshare_info)/sizeof(integer_t)))
-
-
-/*
- *	Types for the ROUND ROBIN (RR) policy
- */
-struct policy_rr_base {				
-	integer_t		base_priority;
-	integer_t		quantum;
-};
-struct policy_rr_limit {
-	integer_t		max_priority;
-};
-struct policy_rr_info {
-	integer_t		max_priority;
-	integer_t		base_priority;
-	integer_t		quantum;
-	boolean_t		depressed;
-	integer_t		depress_priority;
-};
-
-typedef struct policy_rr_base		*policy_rr_base_t;
-typedef struct policy_rr_limit		*policy_rr_limit_t;
-typedef struct policy_rr_info		*policy_rr_info_t;
-
-typedef struct policy_rr_base		policy_rr_base_data_t;
-typedef struct policy_rr_limit		policy_rr_limit_data_t;
-typedef struct policy_rr_info		policy_rr_info_data_t;
-
-#define POLICY_RR_BASE_COUNT	((mach_msg_type_number_t)	\
-	(sizeof(struct policy_rr_base)/sizeof(integer_t)))
-#define POLICY_RR_LIMIT_COUNT	((mach_msg_type_number_t)	\
-	(sizeof(struct policy_rr_limit)/sizeof(integer_t)))
-#define POLICY_RR_INFO_COUNT	((mach_msg_type_number_t)	\
-	(sizeof(struct policy_rr_info)/sizeof(integer_t)))
-
-
-/*
- * 	Types for the FIRST-IN-FIRST-OUT (FIFO) policy
- */
-struct policy_fifo_base {		
-	integer_t		base_priority;
-};
-struct policy_fifo_limit {
-	integer_t		max_priority;
-};
-struct policy_fifo_info {
-	integer_t		max_priority;
-	integer_t		base_priority;
-	boolean_t		depressed;
-	integer_t		depress_priority;
-};
-
-typedef struct policy_fifo_base		*policy_fifo_base_t;
-typedef struct policy_fifo_limit	*policy_fifo_limit_t;
-typedef struct policy_fifo_info		*policy_fifo_info_t;
-
-typedef struct policy_fifo_base		policy_fifo_base_data_t;
-typedef struct policy_fifo_limit	policy_fifo_limit_data_t;
-typedef struct policy_fifo_info		policy_fifo_info_data_t;
-
-#define POLICY_FIFO_BASE_COUNT	((mach_msg_type_number_t)	\
-	(sizeof(struct policy_fifo_base)/sizeof(integer_t)))
-#define POLICY_FIFO_LIMIT_COUNT	((mach_msg_type_number_t)	\
-	(sizeof(struct policy_fifo_limit)/sizeof(integer_t)))
-#define POLICY_FIFO_INFO_COUNT	((mach_msg_type_number_t)	\
-	(sizeof(struct policy_fifo_info)/sizeof(integer_t)))
-
-/*
- * 	Aggregate policy types
- */
-
-struct policy_bases {
-	policy_timeshare_base_data_t	ts;
-	policy_rr_base_data_t		rr;
-	policy_fifo_base_data_t		fifo;
-};
-
-struct policy_limits {
-	policy_timeshare_limit_data_t	ts;
-	policy_rr_limit_data_t		rr;
-	policy_fifo_limit_data_t	fifo;
-};
-
-struct policy_infos {
-	policy_timeshare_info_data_t	ts;
-	policy_rr_info_data_t		rr;
-	policy_fifo_info_data_t		fifo;
-};
-
-typedef struct policy_bases		policy_base_data_t;
-typedef struct policy_limits		policy_limit_data_t;
-typedef struct policy_infos		policy_info_data_t;
-
-#endif	/* _MACH_POLICY_H_ */
diff --git a/i386/include/mach/port.h b/i386/include/mach/port.h
deleted file mode 100644
index 6550139..0000000
--- a/i386/include/mach/port.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- * NOTICE: This file was modified by McAfee Research in 2004 to introduce
- * support for mandatory and extensible security protections.  This notice
- * is included in support of clause 2.2 (b) of the Apple Public License,
- * Version 2.0.
- */
-/*
- */
-/*
- *	File:	mach/port.h
- *
- *	Definition of a Mach port
- *
- *	Mach ports are the endpoints to Mach-implemented communications
- *	channels (usually uni-directional message queues, but other types
- *	also exist).
- *
- *	Unique collections of these endpoints are maintained for each
- *	Mach task.  Each Mach port in the task's collection is given a 
- *	[task-local] name to identify it - and the the various "rights"
- *	held by the task for that specific endpoint.
- *
- *	This header defines the types used to identify these Mach ports
- *	and the various rights associated with them.  For more info see:
- *
- *	<mach/mach_port.h> - manipulation of port rights in a given space
- *	<mach/message.h> - message queue [and port right passing] mechanism
- *
- */
-
-#ifndef	_MACH_PORT_H_
-#define _MACH_PORT_H_
-
-#include <sys/cdefs.h>
-#include <stdint.h>
-#include <mach/boolean.h>
-#include <mach/machine/vm_types.h>
-
-/*
- *	mach_port_name_t - the local identity for a Mach port
- *
- *	The name is Mach port namespace specific.  It is used to
- *	identify the rights held for that port by the task whose
- *	namespace is implied [or specifically provided].
- *
- *	Use of this type usually implies just a name - no rights.
- *	See mach_port_t for a type that implies a "named right."
- *
- */
- 
-typedef natural_t mach_port_name_t;
-typedef mach_port_name_t *mach_port_name_array_t;
-
-
-/* 
- *	mach_port_t - a named port right
- *
- *	In user-space, "rights" are represented by the name of the
- *	right in the Mach port namespace.  Even so, this type is
- *	presented as a unique one to more clearly denote the presence
- *	of a right coming along with the name. 
- *
- *	Often, various rights for a port held in a single name space
- *	will coalesce and are, therefore, be identified by a single name
- *	[this is the case for send and receive rights].  But not
- *	always [send-once rights currently get a unique name for
- *	each right].      
- *
- */
-
-#ifndef _MACH_PORT_T
-#define _MACH_PORT_T
-typedef mach_port_name_t 		mach_port_t;
-#endif
-
-
-typedef mach_port_t			*mach_port_array_t;
-
-/*
- *  MACH_PORT_NULL is a legal value that can be carried in messages.
- *  It indicates the absence of any port or port rights.  (A port
- *  argument keeps the message from being "simple", even if the
- *  value is MACH_PORT_NULL.)  The value MACH_PORT_DEAD is also a legal
- *  value that can be carried in messages.  It indicates
- *  that a port right was present, but it died.
- */
-
-#define MACH_PORT_NULL		0  /* intentional loose typing */
-#define MACH_PORT_DEAD		((mach_port_name_t) ~0)
-#define MACH_PORT_VALID(name)				\
-		(((name) != MACH_PORT_NULL) && 		\
-		 ((name) != MACH_PORT_DEAD))
-
-
-/*
- *	For kernel-selected [assigned] port names, the name is
- *	comprised of two parts: a generation number and an index.
- *	This approach keeps the exact same name from being generated
- *	and reused too quickly [to catch right/reference counting bugs].
- *	The dividing line between the constituent parts is exposed so
- *	that efficient "mach_port_name_t to data structure pointer"
- *	conversion implementation can be made.  But it is possible
- *	for user-level code to assign their own names to Mach ports.
- *	These are not required to participate in this algorithm.  So
- *	care should be taken before "assuming" this model.
- *
- */
-
-#ifndef	NO_PORT_GEN
-
-#define	MACH_PORT_INDEX(name)		((name) >> 8)
-#define	MACH_PORT_GEN(name)		(((name) & 0xff) << 24)
-#define	MACH_PORT_MAKE(index, gen)	\
-		(((index) << 8) | (gen) >> 24)
-
-#else	/* NO_PORT_GEN */
-
-#define	MACH_PORT_INDEX(name)		(name)
-#define	MACH_PORT_GEN(name)		(0)
-#define	MACH_PORT_MAKE(index, gen)	(index)
-
-#endif	/* NO_PORT_GEN */
-
-
-/*
- *  These are the different rights a task may have for a port.
- *  The MACH_PORT_RIGHT_* definitions are used as arguments
- *  to mach_port_allocate, mach_port_get_refs, etc, to specify
- *  a particular right to act upon.  The mach_port_names and
- *  mach_port_type calls return bitmasks using the MACH_PORT_TYPE_*
- *  definitions.  This is because a single name may denote
- *  multiple rights.
- */
-
-typedef natural_t mach_port_right_t;
-
-#define MACH_PORT_RIGHT_SEND		((mach_port_right_t) 0)
-#define MACH_PORT_RIGHT_RECEIVE		((mach_port_right_t) 1)
-#define MACH_PORT_RIGHT_SEND_ONCE	((mach_port_right_t) 2)
-#define MACH_PORT_RIGHT_PORT_SET	((mach_port_right_t) 3)
-#define MACH_PORT_RIGHT_DEAD_NAME	((mach_port_right_t) 4)
-#define MACH_PORT_RIGHT_LABELH	        ((mach_port_right_t) 5)
-#define MACH_PORT_RIGHT_NUMBER		((mach_port_right_t) 6)
-
-typedef natural_t mach_port_type_t;
-typedef mach_port_type_t *mach_port_type_array_t;
-
-#define MACH_PORT_TYPE(right)						\
-		((mach_port_type_t)(((mach_port_type_t) 1)  		\
-		<< ((right) + ((mach_port_right_t) 16))))	
-#define MACH_PORT_TYPE_NONE	    ((mach_port_type_t) 0L)
-#define MACH_PORT_TYPE_SEND	    MACH_PORT_TYPE(MACH_PORT_RIGHT_SEND)
-#define MACH_PORT_TYPE_RECEIVE	    MACH_PORT_TYPE(MACH_PORT_RIGHT_RECEIVE)
-#define MACH_PORT_TYPE_SEND_ONCE    MACH_PORT_TYPE(MACH_PORT_RIGHT_SEND_ONCE)
-#define MACH_PORT_TYPE_PORT_SET	    MACH_PORT_TYPE(MACH_PORT_RIGHT_PORT_SET)
-#define MACH_PORT_TYPE_DEAD_NAME    MACH_PORT_TYPE(MACH_PORT_RIGHT_DEAD_NAME)
-#define MACH_PORT_TYPE_LABELH       MACH_PORT_TYPE(MACH_PORT_RIGHT_LABELH)
-
-/* Convenient combinations. */
-
-#define MACH_PORT_TYPE_SEND_RECEIVE					\
-		(MACH_PORT_TYPE_SEND|MACH_PORT_TYPE_RECEIVE)
-#define	MACH_PORT_TYPE_SEND_RIGHTS					\
-		(MACH_PORT_TYPE_SEND|MACH_PORT_TYPE_SEND_ONCE)
-#define	MACH_PORT_TYPE_PORT_RIGHTS					\
-		(MACH_PORT_TYPE_SEND_RIGHTS|MACH_PORT_TYPE_RECEIVE)
-#define	MACH_PORT_TYPE_PORT_OR_DEAD					\
-		(MACH_PORT_TYPE_PORT_RIGHTS|MACH_PORT_TYPE_DEAD_NAME)
-#define MACH_PORT_TYPE_ALL_RIGHTS					\
-		(MACH_PORT_TYPE_PORT_OR_DEAD|MACH_PORT_TYPE_PORT_SET)
-
-/* Dummy type bits that mach_port_type/mach_port_names can return. */
-
-#define MACH_PORT_TYPE_DNREQUEST	0x80000000
-
-/* User-references for capabilities. */
-
-typedef natural_t mach_port_urefs_t;
-typedef integer_t mach_port_delta_t;			/* change in urefs */
-
-/* Attributes of ports.  (See mach_port_get_receive_status.) */
-
-typedef natural_t mach_port_seqno_t;		/* sequence number */
-typedef natural_t mach_port_mscount_t;		/* make-send count */
-typedef natural_t mach_port_msgcount_t;		/* number of msgs */
-typedef natural_t mach_port_rights_t;		/* number of rights */
-
-/*
- *	Are there outstanding send rights for a given port?
- */
-#define	MACH_PORT_SRIGHTS_NONE		0		/* no srights */
-#define	MACH_PORT_SRIGHTS_PRESENT	1		/* srights */
-typedef unsigned int mach_port_srights_t;	/* status of send rights */
-
-typedef struct mach_port_status {
-	mach_port_rights_t	mps_pset;	/* count of containing port sets */
-	mach_port_seqno_t	mps_seqno;	/* sequence number */
-	mach_port_mscount_t	mps_mscount;	/* make-send count */
-	mach_port_msgcount_t	mps_qlimit;	/* queue limit */
-	mach_port_msgcount_t	mps_msgcount;	/* number in the queue */
-	mach_port_rights_t	mps_sorights;	/* how many send-once rights */
-	boolean_t		mps_srights;	/* do send rights exist? */
-	boolean_t		mps_pdrequest;	/* port-deleted requested? */
-	boolean_t		mps_nsrequest;	/* no-senders requested? */
-	natural_t		mps_flags;		/* port flags */
-} mach_port_status_t;
-
-/* System-wide values for setting queue limits on a port */
-#define MACH_PORT_QLIMIT_ZERO		((mach_port_msgcount_t) 0)
-#define MACH_PORT_QLIMIT_BASIC		((mach_port_msgcount_t) 5)
-#define MACH_PORT_QLIMIT_SMALL		((mach_port_msgcount_t) 16)
-#define MACH_PORT_QLIMIT_LARGE		((mach_port_msgcount_t) 1024)
-#define MACH_PORT_QLIMIT_KERNEL		((mach_port_msgcount_t) 65536)
-#define MACH_PORT_QLIMIT_MIN		MACH_PORT_QLIMIT_ZERO
-#define MACH_PORT_QLIMIT_DEFAULT	MACH_PORT_QLIMIT_BASIC
-#define MACH_PORT_QLIMIT_MAX		MACH_PORT_QLIMIT_LARGE
-
-typedef struct mach_port_limits {
-	mach_port_msgcount_t	mpl_qlimit;	/* number of msgs */
-} mach_port_limits_t;
-
-typedef integer_t *mach_port_info_t;		/* varying array of natural_t */
-
-/* Flavors for mach_port_get/set_attributes() */
-typedef int	mach_port_flavor_t;
-#define MACH_PORT_LIMITS_INFO		1	/* uses mach_port_status_t */
-#define MACH_PORT_RECEIVE_STATUS	2	/* uses mach_port_limits_t */
-#define MACH_PORT_DNREQUESTS_SIZE	3	/* info is int */
-
-#define MACH_PORT_LIMITS_INFO_COUNT	((natural_t) \
-	(sizeof(mach_port_limits_t)/sizeof(natural_t)))
-#define MACH_PORT_RECEIVE_STATUS_COUNT	((natural_t) \
-	(sizeof(mach_port_status_t)/sizeof(natural_t)))
-#define MACH_PORT_DNREQUESTS_SIZE_COUNT 1
-
-/*
- * Structure used to pass information about port allocation requests.
- * Must be padded to 64-bits total length.
- */
-typedef struct mach_port_qos {
-	unsigned int		name:1;		/* name given */
-	unsigned int 		prealloc:1;	/* prealloced message */
-	boolean_t		pad1:30;
-	natural_t		len;
-} mach_port_qos_t;
-
-#if	!__DARWIN_UNIX03 && !defined(_NO_PORT_T_FROM_MACH)
-/*
- *  Mach 3.0 renamed everything to have mach_ in front of it.
- *  These types and macros are provided for backward compatibility
- *	but are deprecated.
- */
-typedef mach_port_t		port_t;
-typedef mach_port_name_t	port_name_t;
-typedef mach_port_name_t	*port_name_array_t;
-
-#define PORT_NULL		((port_t) 0)
-#define PORT_DEAD		((port_t) ~0)
-#define PORT_VALID(name) \
-		((port_t)(name) != PORT_NULL && (port_t)(name) != PORT_DEAD)
-
-#endif	/* !__DARWIN_UNIX03 && !_NO_PORT_T_FROM_MACH */
-
-#endif	/* _MACH_PORT_H_ */
diff --git a/i386/include/mach/port_obj.h b/i386/include/mach/port_obj.h
deleted file mode 100644
index d2b5f89..0000000
--- a/i386/include/mach/port_obj.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-/*
- * Define a service to map from a kernel-generated port name
- * to server-defined "type" and "value" data to be associated
- * with the port.
- */
-
-#ifndef PORT_OBJ_H
-#define PORT_OBJ_H
-
-#include <mach/port.h>
-
-struct port_obj_tentry {
-	void *pos_value;
-	int pos_type;
-};
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern void port_obj_init(int);
-__END_DECLS
-
-extern struct port_obj_tentry *port_obj_table;
-extern int port_obj_table_size;
-
-#ifndef PORT_OBJ_ASSERT
-
-#define port_set_obj_value_type(pname, value, type)	\
-do {							\
-	int ndx;					\
-							\
-	if (!port_obj_table)				\
-		port_obj_init(port_obj_table_size);	\
-	ndx = MACH_PORT_INDEX(pname);			\
-	port_obj_table[ndx].pos_value = (value);	\
-	port_obj_table[ndx].pos_type = (type);		\
-} while (0)
-
-#define port_get_obj_value(pname)			\
-	(port_obj_table[MACH_PORT_INDEX(pname)].pos_value)
-
-#define port_get_obj_type(pname)			\
-	(port_obj_table[MACH_PORT_INDEX(pname)].pos_type)
-
-#else	/* PORT_OBJ_ASSERT */
-
-#define port_set_obj_value_type(pname, value, type)	\
-do {							\
-	int ndx;					\
-							\
-	if (!port_obj_table)				\
-		port_obj_init(port_obj_table_size);	\
-	ndx = MACH_PORT_INDEX(pname);			\
-	assert(ndx > 0);				\
-	assert(ndx < port_obj_table_size);		\
-	port_obj_table[ndx].pos_value = (value);	\
-	port_obj_table[ndx].pos_type = (type);		\
-} while (0)
-
-#define port_get_obj_value(pname)				\
-	((MACH_PORT_INDEX(pname) < (unsigned)port_obj_table_size) ?	\
-	port_obj_table[MACH_PORT_INDEX(pname)].pos_value :	\
-	(panic("port_get_obj_value: index too big"), (void *)-1))
-
-#define port_get_obj_type(pname)				\
-	((MACH_PORT_INDEX(pname) < (unsigned)port_obj_table_size) ?	\
-	port_obj_table[MACH_PORT_INDEX(pname)].pos_type :	\
-	(panic("port_get_obj_type: index too big"), -1))
-
-#endif	/* PORT_OBJ_ASSERT */
-
-#endif	/* PORT_OBJ_H */
diff --git a/i386/include/mach/processor.defs b/i386/include/mach/processor.defs
deleted file mode 100644
index f590633..0000000
--- a/i386/include/mach/processor.defs
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_FREE_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/mach_port.defs
- *	Author:	Rich Draves
- *
- *	Exported kernel calls.
- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-	  processor 3000;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-/*
- * References to processor objects are returned by:
- *	host_processors(host_priv_t,...);
- *
-/*
- *	Start processor.
- */
-routine	processor_start(
-		processor	: processor_t);
-
-/*
- *	Exit processor -- may not be restartable.
- */
-
-routine	processor_exit(
-		processor	: processor_t);
-
-/*
- *	Return information about this processor.
- */
-routine processor_info(
-		processor	: processor_t;
-		flavor		: processor_flavor_t;
-	out	host		: host_t;
-	out	processor_info_out: processor_info_t, CountInOut);
-
-
-/*
- *	Do something machine-dependent to processor.
- */
-routine processor_control(
-		processor	: processor_t;
-		processor_cmd	: processor_info_t);
-
-/*
- * JMM - Keep processor_set related stuff at the end because
- * they likely will be removed.
- */
-
-/*
- *	Assign processor to processor set.
- */
-routine processor_assign(
-		processor	: processor_t;
-		new_set		: processor_set_t;
-		wait		: boolean_t);
-
-/*
- *	Get current assignment for processor.
- */
-routine processor_get_assignment(
-		processor	: processor_t;
-	out	assigned_set	: processor_set_name_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/processor.h b/i386/include/mach/processor.h
deleted file mode 100644
index e3afbde..0000000
--- a/i386/include/mach/processor.h
+++ /dev/null
@@ -1,336 +0,0 @@
-#ifndef	_processor_user_
-#define	_processor_user_
-
-/* Module processor */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	processor_MSG_COUNT
-#define	processor_MSG_COUNT	6
-#endif	/* processor_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine processor_start */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_start
-(
-	processor_t processor
-);
-
-/* Routine processor_exit */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_exit
-(
-	processor_t processor
-);
-
-/* Routine processor_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_info
-(
-	processor_t processor,
-	processor_flavor_t flavor,
-	host_t *host,
-	processor_info_t processor_info_out,
-	mach_msg_type_number_t *processor_info_outCnt
-);
-
-/* Routine processor_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_control
-(
-	processor_t processor,
-	processor_info_t processor_cmd,
-	mach_msg_type_number_t processor_cmdCnt
-);
-
-/* Routine processor_assign */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_assign
-(
-	processor_t processor,
-	processor_set_t new_set,
-	boolean_t wait
-);
-
-/* Routine processor_get_assignment */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_get_assignment
-(
-	processor_t processor,
-	processor_set_name_t *assigned_set
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__processor_subsystem__defined
-#define __Request__processor_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__processor_start_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__processor_exit_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		processor_flavor_t flavor;
-		mach_msg_type_number_t processor_info_outCnt;
-	} __Request__processor_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		mach_msg_type_number_t processor_cmdCnt;
-		integer_t processor_cmd[12];
-	} __Request__processor_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t new_set;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		boolean_t wait;
-	} __Request__processor_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__processor_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__processor_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__processor_subsystem__defined
-#define __RequestUnion__processor_subsystem__defined
-union __RequestUnion__processor_subsystem {
-	__Request__processor_start_t Request_processor_start;
-	__Request__processor_exit_t Request_processor_exit;
-	__Request__processor_info_t Request_processor_info;
-	__Request__processor_control_t Request_processor_control;
-	__Request__processor_assign_t Request_processor_assign;
-	__Request__processor_get_assignment_t Request_processor_get_assignment;
-};
-#endif /* !__RequestUnion__processor_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__processor_subsystem__defined
-#define __Reply__processor_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__processor_start_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__processor_exit_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t host;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t processor_info_outCnt;
-		integer_t processor_info_out[12];
-	} __Reply__processor_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__processor_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__processor_assign_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t assigned_set;
-		/* end of the kernel processed data */
-	} __Reply__processor_get_assignment_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__processor_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__processor_subsystem__defined
-#define __ReplyUnion__processor_subsystem__defined
-union __ReplyUnion__processor_subsystem {
-	__Reply__processor_start_t Reply_processor_start;
-	__Reply__processor_exit_t Reply_processor_exit;
-	__Reply__processor_info_t Reply_processor_info;
-	__Reply__processor_control_t Reply_processor_control;
-	__Reply__processor_assign_t Reply_processor_assign;
-	__Reply__processor_get_assignment_t Reply_processor_get_assignment;
-};
-#endif /* !__RequestUnion__processor_subsystem__defined */
-
-#ifndef subsystem_to_name_map_processor
-#define subsystem_to_name_map_processor \
-    { "processor_start", 3000 },\
-    { "processor_exit", 3001 },\
-    { "processor_info", 3002 },\
-    { "processor_control", 3003 },\
-    { "processor_assign", 3004 },\
-    { "processor_get_assignment", 3005 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _processor_user_ */
diff --git a/i386/include/mach/processor_info.h b/i386/include/mach/processor_info.h
deleted file mode 100644
index 1607c71..0000000
--- a/i386/include/mach/processor_info.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-/*
- *	File:	mach/processor_info.h
- *	Author:	David L. Black
- *	Date:	1988
- *
- *	Data structure definitions for processor_info, processor_set_info
- */
-
-#ifndef	_MACH_PROCESSOR_INFO_H_
-#define _MACH_PROCESSOR_INFO_H_
-
-#include <mach/message.h>
-#include <mach/machine.h>
-#include <mach/machine/processor_info.h>
-
-/*
- *	Generic information structure to allow for expansion.
- */
-typedef integer_t	*processor_info_t;	/* varying array of int. */
-typedef integer_t	*processor_info_array_t;  /* varying array of int */
-
-#define PROCESSOR_INFO_MAX	(1024)	/* max array size */
-typedef integer_t	processor_info_data_t[PROCESSOR_INFO_MAX];
-
-
-typedef integer_t	*processor_set_info_t;	/* varying array of int. */
-
-#define PROCESSOR_SET_INFO_MAX	(1024)	/* max array size */
-typedef integer_t	processor_set_info_data_t[PROCESSOR_SET_INFO_MAX];
-
-/*
- *	Currently defined information.
- */
-typedef int	processor_flavor_t;
-#define	PROCESSOR_BASIC_INFO	1		/* basic information */
-#define	PROCESSOR_CPU_LOAD_INFO	2	/* cpu load information */
-#define	PROCESSOR_PM_REGS_INFO	0x10000001	/* performance monitor register info */
-#define	PROCESSOR_TEMPERATURE	0x10000002	/* Processor core temperature */
-
-struct processor_basic_info {
-	cpu_type_t	cpu_type;	/* type of cpu */
-	cpu_subtype_t	cpu_subtype;	/* subtype of cpu */
-	boolean_t	running;	/* is processor running */
-	int		slot_num;	/* slot number */
-	boolean_t	is_master;	/* is this the master processor */
-};
-
-typedef	struct processor_basic_info	processor_basic_info_data_t;
-typedef struct processor_basic_info	*processor_basic_info_t;
-#define PROCESSOR_BASIC_INFO_COUNT	((mach_msg_type_number_t) \
-		(sizeof(processor_basic_info_data_t)/sizeof(natural_t)))
-
-struct processor_cpu_load_info {             /* number of ticks while running... */
-        unsigned int	cpu_ticks[CPU_STATE_MAX]; /* ... in the given mode */
-}; 
-
-typedef	struct processor_cpu_load_info	processor_cpu_load_info_data_t;
-typedef struct processor_cpu_load_info	*processor_cpu_load_info_t;
-#define PROCESSOR_CPU_LOAD_INFO_COUNT	((mach_msg_type_number_t) \
-		(sizeof(processor_cpu_load_info_data_t)/sizeof(natural_t)))
-
-/*
- *	Scaling factor for load_average, mach_factor.
- */
-#define	LOAD_SCALE	1000		
-
-typedef	int	processor_set_flavor_t;
-#define	PROCESSOR_SET_BASIC_INFO	5	/* basic information */
-
-struct processor_set_basic_info {
-	int		processor_count;	/* How many processors */
-	int		default_policy;		/* When others not enabled */
-};
-
-typedef	struct processor_set_basic_info	processor_set_basic_info_data_t;
-typedef struct processor_set_basic_info	*processor_set_basic_info_t;
-#define PROCESSOR_SET_BASIC_INFO_COUNT	((mach_msg_type_number_t) \
-		(sizeof(processor_set_basic_info_data_t)/sizeof(natural_t)))
-
-#define PROCESSOR_SET_LOAD_INFO		4	/* scheduling statistics */
-
-struct processor_set_load_info {
-        int             task_count;             /* How many tasks */
-        int             thread_count;           /* How many threads */
-        integer_t       load_average;           /* Scaled */
-        integer_t       mach_factor;            /* Scaled */
-};
-
-typedef struct processor_set_load_info processor_set_load_info_data_t;
-typedef struct processor_set_load_info *processor_set_load_info_t;
-#define PROCESSOR_SET_LOAD_INFO_COUNT	((mach_msg_type_number_t) \
-                (sizeof(processor_set_load_info_data_t)/sizeof(natural_t)))
-
-
-#endif	/* _MACH_PROCESSOR_INFO_H_ */
diff --git a/i386/include/mach/processor_set.defs b/i386/include/mach/processor_set.defs
deleted file mode 100644
index dc0f407..0000000
--- a/i386/include/mach/processor_set.defs
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_FREE_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/mach_port.defs
- *	Author:	Rich Draves
- *
- *	Exported kernel calls.
- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-	  processor_set 4000;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-/*
- *      Return scheduling statistics for a processor set.
- */
-routine processor_set_statistics(
-        	pset                    : processor_set_name_t;
-        	flavor                  : processor_set_flavor_t;
-	out     info_out        	: processor_set_info_t, CountInOut);
-
-
-/*
- *	Destroy processor set.
- */
-routine processor_set_destroy(
-		set		: processor_set_t);
-
-
-/*
- *	Set max priority for processor_set.
- */
-routine processor_set_max_priority(
-		processor_set	: processor_set_t;
-		max_priority	: int;
-		change_threads	: boolean_t);
-
-/*
- *	Enable policy for processor set
- */
-routine processor_set_policy_enable(
-		processor_set	: processor_set_t;
-		policy		: int);
-
-/*
- *	Disable policy for processor set
- */
-routine processor_set_policy_disable(
-		processor_set	: processor_set_t;
-		policy		: int;
-		change_threads	: boolean_t);
-
-/*
- *	List all tasks in processor set.
- */
-routine processor_set_tasks(
-		processor_set	: processor_set_t;
-	out	task_list	: task_array_t);
-
-/*
- *	List all threads in processor set.
- */
-routine processor_set_threads(
-		processor_set	: processor_set_t;
-	out	thread_list	: thread_act_array_t);
-
-/*
- *      Controls the scheduling attributes governing the processor set.
- *      Allows control of enabled policies, and per-policy base and limit
- *      priorities.
- */
-routine processor_set_policy_control(
-	pset			: processor_set_t;
-	flavor			: processor_set_flavor_t;
-	policy_info		: processor_set_info_t;
-	change			: boolean_t);
-
-
-/*
- *	Debug Info
- *      This call is only valid on MACH_DEBUG kernels.
- *      Otherwise, KERN_FAILURE is returned.
- */
-routine processor_set_stack_usage(
-		pset		: processor_set_t;
-	out	ltotal		: unsigned;
-	out	space		: vm_size_t;
-	out	resident	: vm_size_t;
-	out	maxusage	: vm_size_t;
-	out	maxstack	: vm_offset_t);
-
-/*
- *      Get information about processor set.
- */
-routine processor_set_info(
-                set_name        : processor_set_name_t;
-                flavor          : int;
-        out     host            : host_t;
-        out     info_out        : processor_set_info_t, CountInOut);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/processor_set.h b/i386/include/mach/processor_set.h
deleted file mode 100644
index 1aaf327..0000000
--- a/i386/include/mach/processor_set.h
+++ /dev/null
@@ -1,516 +0,0 @@
-#ifndef	_processor_set_user_
-#define	_processor_set_user_
-
-/* Module processor_set */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	processor_set_MSG_COUNT
-#define	processor_set_MSG_COUNT	10
-#endif	/* processor_set_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine processor_set_statistics */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_statistics
-(
-	processor_set_name_t pset,
-	processor_set_flavor_t flavor,
-	processor_set_info_t info_out,
-	mach_msg_type_number_t *info_outCnt
-);
-
-/* Routine processor_set_destroy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_destroy
-(
-	processor_set_t set
-);
-
-/* Routine processor_set_max_priority */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_max_priority
-(
-	processor_set_t processor_set,
-	int max_priority,
-	boolean_t change_threads
-);
-
-/* Routine processor_set_policy_enable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_policy_enable
-(
-	processor_set_t processor_set,
-	int policy
-);
-
-/* Routine processor_set_policy_disable */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_policy_disable
-(
-	processor_set_t processor_set,
-	int policy,
-	boolean_t change_threads
-);
-
-/* Routine processor_set_tasks */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_tasks
-(
-	processor_set_t processor_set,
-	task_array_t *task_list,
-	mach_msg_type_number_t *task_listCnt
-);
-
-/* Routine processor_set_threads */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_threads
-(
-	processor_set_t processor_set,
-	thread_act_array_t *thread_list,
-	mach_msg_type_number_t *thread_listCnt
-);
-
-/* Routine processor_set_policy_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_policy_control
-(
-	processor_set_t pset,
-	processor_set_flavor_t flavor,
-	processor_set_info_t policy_info,
-	mach_msg_type_number_t policy_infoCnt,
-	boolean_t change
-);
-
-/* Routine processor_set_stack_usage */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_stack_usage
-(
-	processor_set_t pset,
-	unsigned *ltotal,
-	vm_size_t *space,
-	vm_size_t *resident,
-	vm_size_t *maxusage,
-	vm_offset_t *maxstack
-);
-
-/* Routine processor_set_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t processor_set_info
-(
-	processor_set_name_t set_name,
-	int flavor,
-	host_t *host,
-	processor_set_info_t info_out,
-	mach_msg_type_number_t *info_outCnt
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__processor_set_subsystem__defined
-#define __Request__processor_set_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		processor_set_flavor_t flavor;
-		mach_msg_type_number_t info_outCnt;
-	} __Request__processor_set_statistics_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__processor_set_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int max_priority;
-		boolean_t change_threads;
-	} __Request__processor_set_max_priority_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int policy;
-	} __Request__processor_set_policy_enable_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int policy;
-		boolean_t change_threads;
-	} __Request__processor_set_policy_disable_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__processor_set_tasks_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__processor_set_threads_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		processor_set_flavor_t flavor;
-		mach_msg_type_number_t policy_infoCnt;
-		integer_t policy_info[5];
-		boolean_t change;
-	} __Request__processor_set_policy_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__processor_set_stack_usage_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		int flavor;
-		mach_msg_type_number_t info_outCnt;
-	} __Request__processor_set_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__processor_set_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__processor_set_subsystem__defined
-#define __RequestUnion__processor_set_subsystem__defined
-union __RequestUnion__processor_set_subsystem {
-	__Request__processor_set_statistics_t Request_processor_set_statistics;
-	__Request__processor_set_destroy_t Request_processor_set_destroy;
-	__Request__processor_set_max_priority_t Request_processor_set_max_priority;
-	__Request__processor_set_policy_enable_t Request_processor_set_policy_enable;
-	__Request__processor_set_policy_disable_t Request_processor_set_policy_disable;
-	__Request__processor_set_tasks_t Request_processor_set_tasks;
-	__Request__processor_set_threads_t Request_processor_set_threads;
-	__Request__processor_set_policy_control_t Request_processor_set_policy_control;
-	__Request__processor_set_stack_usage_t Request_processor_set_stack_usage;
-	__Request__processor_set_info_t Request_processor_set_info;
-};
-#endif /* !__RequestUnion__processor_set_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__processor_set_subsystem__defined
-#define __Reply__processor_set_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		mach_msg_type_number_t info_outCnt;
-		integer_t info_out[5];
-	} __Reply__processor_set_statistics_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__processor_set_destroy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__processor_set_max_priority_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__processor_set_policy_enable_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__processor_set_policy_disable_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t task_list;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t task_listCnt;
-	} __Reply__processor_set_tasks_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_ports_descriptor_t thread_list;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t thread_listCnt;
-	} __Reply__processor_set_threads_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__processor_set_policy_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		unsigned ltotal;
-		vm_size_t space;
-		vm_size_t resident;
-		vm_size_t maxusage;
-		vm_offset_t maxstack;
-	} __Reply__processor_set_stack_usage_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t host;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t info_outCnt;
-		integer_t info_out[5];
-	} __Reply__processor_set_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__processor_set_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__processor_set_subsystem__defined
-#define __ReplyUnion__processor_set_subsystem__defined
-union __ReplyUnion__processor_set_subsystem {
-	__Reply__processor_set_statistics_t Reply_processor_set_statistics;
-	__Reply__processor_set_destroy_t Reply_processor_set_destroy;
-	__Reply__processor_set_max_priority_t Reply_processor_set_max_priority;
-	__Reply__processor_set_policy_enable_t Reply_processor_set_policy_enable;
-	__Reply__processor_set_policy_disable_t Reply_processor_set_policy_disable;
-	__Reply__processor_set_tasks_t Reply_processor_set_tasks;
-	__Reply__processor_set_threads_t Reply_processor_set_threads;
-	__Reply__processor_set_policy_control_t Reply_processor_set_policy_control;
-	__Reply__processor_set_stack_usage_t Reply_processor_set_stack_usage;
-	__Reply__processor_set_info_t Reply_processor_set_info;
-};
-#endif /* !__RequestUnion__processor_set_subsystem__defined */
-
-#ifndef subsystem_to_name_map_processor_set
-#define subsystem_to_name_map_processor_set \
-    { "processor_set_statistics", 4000 },\
-    { "processor_set_destroy", 4001 },\
-    { "processor_set_max_priority", 4002 },\
-    { "processor_set_policy_enable", 4003 },\
-    { "processor_set_policy_disable", 4004 },\
-    { "processor_set_tasks", 4005 },\
-    { "processor_set_threads", 4006 },\
-    { "processor_set_policy_control", 4007 },\
-    { "processor_set_stack_usage", 4008 },\
-    { "processor_set_info", 4009 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _processor_set_user_ */
diff --git a/i386/include/mach/rpc.h b/i386/include/mach/rpc.h
deleted file mode 100644
index 565d7ac..0000000
--- a/i386/include/mach/rpc.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2002,2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-/*
- * Mach RPC Subsystem Interfaces
- */
-
-#ifndef	_MACH_RPC_H_
-#define _MACH_RPC_H_
-
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/vm_types.h>
-
-#include <mach/mig.h>
-#include <mach/mig_errors.h>
-#include <mach/machine/rpc.h>
-#include <mach/thread_status.h>
-
-/*
- * These are the types for RPC-specific variants of the MIG routine
- * descriptor and subsystem data types.
- *
- * THIS IS ONLY FOR COMPATIBILITY.  WE WILL NOT BE IMPLEMENTING THIS.
- */
-
-/*
- * Basic mach rpc types.
- */
-typedef unsigned int    routine_arg_type;
-typedef unsigned int	routine_arg_offset;
-typedef unsigned int	routine_arg_size;
-
-/*
- * Definitions for a signature's argument and routine descriptor's.
- */
-struct rpc_routine_arg_descriptor {
-	routine_arg_type	type;	   /* Port, Array, etc. */
-        routine_arg_size        size;      /* element size in bytes */
-        routine_arg_size        count;     /* number of elements */
-	routine_arg_offset	offset;	   /* Offset in list of routine args */
-};
-typedef struct rpc_routine_arg_descriptor *rpc_routine_arg_descriptor_t;
-
-struct rpc_routine_descriptor {
-	mig_impl_routine_t	impl_routine;	/* Server work func pointer   */
-	mig_stub_routine_t	stub_routine;	/* Unmarshalling func pointer */
-	unsigned int		argc;		/* Number of argument words   */
-	unsigned int		descr_count;	/* Number of complex argument */
-					        /* descriptors                */
-	rpc_routine_arg_descriptor_t
-				arg_descr;	/* Pointer to beginning of    */
-						/* the arg_descr array        */
-	unsigned int		max_reply_msg;	/* Max size for reply msg     */
-};
-typedef struct rpc_routine_descriptor *rpc_routine_descriptor_t;
-
-#define RPC_DESCR_SIZE(x) ((x)->descr_count * \
-				sizeof(struct rpc_routine_arg_descriptor))
-
-struct rpc_signature {
-    struct rpc_routine_descriptor rd;
-    struct rpc_routine_arg_descriptor rad[1];
-};
-
-#define RPC_SIGBUF_SIZE 8
-
-/*
- *	A subsystem describes a set of server routines that can be invoked by
- *	mach_rpc() on the ports that are registered with the subsystem.  For
- *	each routine, the routine number is given, along with the
- *	address of the implementation function in the server and a
- *	description of the arguments of the routine (it's "signature").
- *
- *	This structure definition is only a template for what is really a
- *	variable-length structure (generated by MIG for each subsystem).
- *	The actual structures do not always have one entry in the routine
- *	array, and also have a varying number of entries in the arg_descr
- *	array.  Each routine has an array of zero or more arg descriptors
- *	one for each complex arg.  These arrays are all catenated together
- *	to form the arg_descr field of the subsystem struct.  The
- *	arg_descr field of each routine entry points to a unique sub-sequence
- *	within this catenated array.  The goal is to keep everything
- *	contiguous.
- */
-struct rpc_subsystem {
-	void		*reserved;	/* Reserved for system use */
-
-	mach_msg_id_t	start;		/* Min routine number */
-	mach_msg_id_t	end;		/* Max routine number + 1 */
-	unsigned int	maxsize;	/* Max mach_msg size */
-	vm_address_t	base_addr;	/* Address of this struct in user */
-
-	struct rpc_routine_descriptor	/* Array of routine descriptors */
-			routine[1       /* Actually, (start-end+1) */
-				 ];
-
-	struct rpc_routine_arg_descriptor
-			arg_descriptor[1   /* Actually, the sum of the descr_ */
-					]; /* count fields for all routines   */
-};
-typedef struct rpc_subsystem  *rpc_subsystem_t;
-
-#define RPC_SUBSYSTEM_NULL	((rpc_subsystem_t) 0)
-
-#endif	/* _MACH_RPC_H_ */
diff --git a/i386/include/mach/sdt.h b/i386/include/mach/sdt.h
deleted file mode 100644
index 3268551..0000000
--- a/i386/include/mach/sdt.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _MACH_SDT_H
-#define	_MACH_SDT_H
-
-#include <mach/machine/sdt.h>
-
-#endif	/* _MACH_SDT_H */
diff --git a/i386/include/mach/security.defs b/i386/include/mach/security.defs
deleted file mode 100644
index 734aa90..0000000
--- a/i386/include/mach/security.defs
+++ /dev/null
@@ -1,208 +0,0 @@
-
-/* -*- C++ -*- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	KERNEL_SERVER
-	  security 5200;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-type labelstr_t = c_string[*:512];
-
-/**
-  @brief Retrieve a task label as a label handle
-  @param task Target's task port
-  @param label Returned label handle
-
-  This call retrieves the label handle of the specified task.
-
-  @return Standard MiG return values (0 for success)
-*/
-
-routine mach_get_task_label(task      : ipc_space_t;
-			    out label : mach_port_name_t);
-
-/**
-  @brief Retrieve a task label in textual form
-  @param task Target's task port
-  @param policies Comma-delimited list of policies to query
-  @param label Returned label text
-
-  This call retrieves an externalized task label for the
-  specified task, with respect to the specified policies.
-
-  @return Standard MiG return values (0 for success)
-*/
-
-routine mach_get_task_label_text(task      : ipc_space_t;
-				 policies  : labelstr_t;
-				 out label : labelstr_t);
-
-/**
-  @brief Retrieve a port label as a label handle
-  @param task Issuer's task port
-  @param port Port to query label from
-  @param label Returned label handle
-
-  This call retrieves a new label handle for the specified port.
-  If the port represents a label handle, KERN_INVALID_ARGUMENT is
-  returned.
-
-  @return Standard MiG return values (0 for success)
-*/
-
-routine mach_get_label(task      : ipc_space_t;
-		       port      : mach_port_name_t;
-		       out label : mach_port_name_t);
-
-/**
-  @brief Retrieve a port label in textual form
-  @param task Issuer's task port
-  @param name Port to query label from
-  @param policies Comma-delimited list of policies to query
-  @param label Returned label text
-
-  This call retrieves an externalized port label for the specified port,
-  with respect to the specified policies. If the port represents a label
-  handle, the returned label text refers to the stored label and not the
-  access control label.
-
-  @return Standard MiG return values (0 for success)
-*/
-
-routine mach_get_label_text(task      : ipc_space_t;
-			    name      : mach_port_name_t;
-			    policies  : labelstr_t;
-			    out label : labelstr_t);
-
-/**
-  @brief Relabel a port
-  @param task Task containing specified ports
-  @param name Port to relabel
-  @param label String representation of new label
-
-  This call attempts to relabel the specified port to the
-  label specified. For label handles, it changes the access control
-  label and not the stored label.
-
-  @return Standard MiG return values (0 for success)
-*/
-
-routine mach_set_port_label(task      : ipc_space_t;
-			    name      : mach_port_name_t;
-			    label     : labelstr_t);
-
-/**
-  @brief Generic access control check
-  @param task Any task port
-  @param subj subject label in textual form
-  @param obj object label in textual form
-  @param serv Service or object class name
-  @param perm Permission, or method, within the specified service
-
-  This function provides a general way for a user process to query
-  an arbitrary access control decision from the system's security policies.
-  Currently, there are no standards for the format of the service and
-  permission names. 
-
-  @return Standard MiG return values (0 for success)
-*/
-
-routine mac_check_service(task    : ipc_space_t;
-			  subject : labelstr_t;
-			  object  : labelstr_t;
-			  service : labelstr_t;
-			  perm    : labelstr_t);
-
-/**
-  @brief Generic access control check
-  @param task Task containing specified ports (usually caller's)
-  @param subj subject label in textual form
-  @param obj port containing object label
-  @param serv Service or object class name
-  @param perm Permission, or method, within the specified service
-
-  This function provides a general way for a user process to query
-  an arbitrary access control decision from the system's security policies.
-  Currently, there are no standards for the format of the service and
-  permission names. If the port is a label handle, the stored label is
-  used. Otherwise, its access control label is used.
-
-  @return Standard MiG return values (0 for success)
-*/
-
-routine mac_port_check_service_obj(task    : ipc_space_t;
-				   subject : labelstr_t;
-				   object  : mach_port_name_t;
-				   service : labelstr_t;
-				   perm    : labelstr_t);
-
-/**
-  @brief Generic access control check
-  @param task Task containing specified ports (usually caller's)
-  @param subj port containing subject label
-  @param obj port containing object label
-  @param serv Service or object class name
-  @param perm Permission, or method, within the specified service
-
-  This function provides a general way for a user process to query
-  an arbitrary access control decision from the system's security policies.
-  Currently, there are no standards for the format of the service and
-  permission names. If any ports are label handles, the stored label is
-  used. Otherwise, the access control labels are used.
-
-  @return Standard MiG return values (0 for success)
-*/
-
-routine mac_port_check_access(task    : ipc_space_t;
-			      subject : mach_port_name_t;
-			      object  : mach_port_name_t;
-			      service : labelstr_t;
-			      perm    : labelstr_t);
-
-/**
-  @brief Create a new label handle
-  @param task Task to receive new ports (usually caller's)
-  @param name Returned label handle port
-  @param label String representation of new label
-
-  Creates a new label handle, with the stored label defined by the
-  given text. Any task may create a label handle with any valid label,
-  not necessarily one that it has permission to access. A port right
-  for the new label handle is inserted into the specified task.
-  Posession of label handles should not imply any security properties.
-
-  @return Standard MiG return values (0 for success)
-*/
-
-routine mac_label_new(task     : ipc_space_t;
-		      out name : mach_port_name_t;
-		      label    : labelstr_t);
-
-/**
-  @brief Request a computed label
-  @param task subj,obj,newlabel relative to this task (usually caller's)
-  @param subj port containing subject label
-  @param obj port containing object label
-  @param serv Service or object class name
-  @param newlabel Returned label handle port
-  
-  Ask the loaded policies to compute a label based on the two input labels
-  and the service name. There is currently no standard for the service name,
-  or even what the input labels represent (Subject and parent object are only
-  a suggestion). If any ports are label handles, the stored label is
-  used. Otherwise, the access control labels are used. A new label handle
-  is created to contain the computed label, and is stored into the
-  specified task.
-
-  @return Standard MiG return values (0 for success)
-*/
-
-routine mac_request_label(task         : ipc_space_t;
-			  subject      : mach_port_name_t;
-			  object       : mach_port_name_t;
-			  service      : labelstr_t;
-			  out newlabel : mach_port_name_t);
diff --git a/i386/include/mach/semaphore.h b/i386/include/mach/semaphore.h
deleted file mode 100644
index 660af09..0000000
--- a/i386/include/mach/semaphore.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_SEMAPHORE_H_
-#define _MACH_SEMAPHORE_H_
-
-#include <mach/port.h>
-#include <mach/mach_types.h>
-#include <mach/kern_return.h>
-#include <mach/sync_policy.h>
-
-/*
- *	Forward Declarations
- *
- *	The semaphore creation and deallocation routines are
- *	defined with the Mach task APIs in <mach/task.h>.
- *
- *      kern_return_t	semaphore_create(task_t task,
- *                                       semaphore_t *new_semaphore,
- *					 sync_policy_t policy,
- *					 int value);
- *
- *	kern_return_t	semaphore_destroy(task_t task,
- *					  semaphore_t semaphore);
- */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-extern	kern_return_t	semaphore_signal     	(semaphore_t semaphore);
-extern	kern_return_t	semaphore_signal_all 	(semaphore_t semaphore);
-
-extern	kern_return_t	semaphore_wait       	(semaphore_t semaphore);
-
-
-extern	kern_return_t	semaphore_timedwait    	(semaphore_t semaphore, 
-												 mach_timespec_t wait_time);
-
-extern  kern_return_t	semaphore_timedwait_signal(semaphore_t wait_semaphore,
-												   semaphore_t signal_semaphore,
-												   mach_timespec_t wait_time);
-
-extern  kern_return_t   semaphore_wait_signal   (semaphore_t wait_semaphore,
-                                                 semaphore_t signal_semaphore);
-
-extern	kern_return_t	semaphore_signal_thread	(semaphore_t semaphore,
-                                                 thread_t thread);
-
-
-__END_DECLS
-
-
-#endif	/* _MACH_SEMAPHORE_H_ */
diff --git a/i386/include/mach/shared_memory_server.h b/i386/include/mach/shared_memory_server.h
deleted file mode 100644
index 1ca25f3..0000000
--- a/i386/include/mach/shared_memory_server.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- *
- *	File: mach/shared_memory_server.h
- *
- * 	protos and struct definitions for shared library
- *	server and interface
- */
-
-/*
- * XXX
- * 
- * NOTE: this file is deprecated and will be removed in the near future.
- * Any project that includes this file should be changed to:
- * 1. use <mach/shared_region.h> instead of this file,
- * 2. handle the new shared regions, now available on more platforms
- */
-
-#ifndef _MACH_SHARED_MEMORY_SERVER_H_
-#define _MACH_SHARED_MEMORY_SERVER_H_
-
-#warning "<mach/shared_memory_server.h> is deprecated.  Please use <mach/shared_region.h> instead."
-
-#include <sys/cdefs.h>
-#include <mach/vm_prot.h>
-#include <mach/vm_types.h>
-#include <mach/mach_types.h>
-
-#define VM_PROT_COW  0x8  /* must not interfere with normal prot assignments */
-#define VM_PROT_ZF  0x10  /* must not interfere with normal prot assignments */
-
-#ifdef	__arm__
-#define GLOBAL_SHARED_TEXT_SEGMENT	0x30000000U
-#define GLOBAL_SHARED_DATA_SEGMENT	0x38000000U
-#define GLOBAL_SHARED_SEGMENT_MASK	0xF8000000U
-
-#define	SHARED_TEXT_REGION_SIZE		0x08000000
-#define	SHARED_DATA_REGION_SIZE		0x08000000
-#else
-#define GLOBAL_SHARED_TEXT_SEGMENT	0x90000000U
-#define GLOBAL_SHARED_DATA_SEGMENT	0xA0000000U
-#define GLOBAL_SHARED_SEGMENT_MASK	0xF0000000U
-
-#define	SHARED_TEXT_REGION_SIZE		0x10000000
-#define	SHARED_DATA_REGION_SIZE		0x10000000
-#endif
-
-#if !defined(__LP64__)
-
-#define	SHARED_LIBRARY_SERVER_SUPPORTED
-
-#define	SHARED_ALTERNATE_LOAD_BASE	0x09000000
-
-/* 
- *  Note: the two masks below are useful because the assumption is 
- *  made that these shared regions will always be mapped on natural boundaries 
- *  i.e. if the size is 0x10000000 the object can be mapped at 
- *  0x20000000, or 0x30000000, but not 0x1000000
- */
-#ifdef	__arm__
-#define	SHARED_TEXT_REGION_MASK		0x07FFFFFF
-#define	SHARED_DATA_REGION_MASK		0x07FFFFFF
-#else
-#define	SHARED_TEXT_REGION_MASK		0x0FFFFFFF
-#define	SHARED_DATA_REGION_MASK		0x0FFFFFFF
-#endif
-
-
-/* flags field aliases for copyin_shared_file and load_shared_file */
-
-/* IN */
-#define ALTERNATE_LOAD_SITE 0x1
-#define NEW_LOCAL_SHARED_REGIONS 0x2
-#define	QUERY_IS_SYSTEM_REGION 0x4
-
-/* OUT */
-#define SF_PREV_LOADED    0x1
-#define SYSTEM_REGION_BACKED 0x2
-
-
-struct sf_mapping {
-	vm_offset_t	mapping_offset;
-	vm_size_t	size;
-	vm_offset_t	file_offset;
-	vm_prot_t	protection;  /* read/write/execute/COW/ZF */
-	vm_offset_t	cksum;
-};
-typedef struct sf_mapping sf_mapping_t;
-
-#endif  /* !defined(__LP64__) */
-
-/* 
- * All shared_region_* declarations are a private interface
- * between dyld and the kernel.
- *
- */
-struct shared_file_mapping_np {
-	mach_vm_address_t	sfm_address;
-	mach_vm_size_t		sfm_size;
-	mach_vm_offset_t	sfm_file_offset;
-	vm_prot_t		sfm_max_prot;
-	vm_prot_t		sfm_init_prot;
-};
-
-struct shared_region_range_np {
-	mach_vm_address_t	srr_address;
-	mach_vm_size_t		srr_size;
-};
-
-
-__BEGIN_DECLS
-int	shared_region_map_file_np(int fd,
-				  uint32_t mappingCount,
-				  const struct shared_file_mapping_np *mappings,
-				  int64_t *slide_p);
-int	shared_region_make_private_np(uint32_t rangeCount,
-				      const struct shared_region_range_np *ranges);
-__END_DECLS
-
-
-#endif /* _MACH_SHARED_MEMORY_SERVER_H_ */
diff --git a/i386/include/mach/shared_region.h b/i386/include/mach/shared_region.h
deleted file mode 100644
index 4bea17e..0000000
--- a/i386/include/mach/shared_region.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2007 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- *
- *	File: mach/shared_region.h
- *
- * 	protos and struct definitions for shared region
- */
-
-#ifndef _MACH_SHARED_REGION_H_
-#define _MACH_SHARED_REGION_H_
-
-#include <sys/cdefs.h>
-#include <mach/vm_prot.h>
-#include <mach/vm_types.h>
-#include <mach/mach_types.h>
-
-#define SHARED_REGION_BASE_I386			0x90000000ULL
-#define SHARED_REGION_SIZE_I386			0x20000000ULL
-#define SHARED_REGION_NESTING_BASE_I386		0x90000000ULL
-#define SHARED_REGION_NESTING_SIZE_I386		0x20000000ULL
-#define SHARED_REGION_NESTING_MIN_I386		0x00200000ULL
-#define SHARED_REGION_NESTING_MAX_I386		0xFFE00000ULL
-
-#define SHARED_REGION_BASE_X86_64		0x00007FFF70000000ULL
-#define SHARED_REGION_SIZE_X86_64		0x000000008FE00000ULL
-#define SHARED_REGION_NESTING_BASE_X86_64	0x00007FFF80000000ULL
-#define SHARED_REGION_NESTING_SIZE_X86_64	0x0000000040000000ULL
-#define SHARED_REGION_NESTING_MIN_X86_64	0x0000000000200000ULL
-#define SHARED_REGION_NESTING_MAX_X86_64	0xFFFFFFFFFFE00000ULL
-
-#define SHARED_REGION_BASE_PPC			0x90000000ULL
-#define SHARED_REGION_SIZE_PPC			0x20000000ULL
-#define SHARED_REGION_NESTING_BASE_PPC		0x90000000ULL
-#define SHARED_REGION_NESTING_SIZE_PPC		0x10000000ULL
-#define SHARED_REGION_NESTING_MIN_PPC		0x10000000ULL
-#define SHARED_REGION_NESTING_MAX_PPC		0x10000000ULL
-
-#define SHARED_REGION_BASE_PPC64		0x00007FFF60000000ULL
-#define SHARED_REGION_SIZE_PPC64		0x00000000A0000000ULL
-#define SHARED_REGION_NESTING_BASE_PPC64	0x00007FFF60000000ULL
-#define SHARED_REGION_NESTING_SIZE_PPC64	0x00000000A0000000ULL
-#define SHARED_REGION_NESTING_MIN_PPC64		0x0000000010000000ULL
-#define SHARED_REGION_NESTING_MAX_PPC64		0x0000000010000000ULL
-
-#define SHARED_REGION_BASE_ARM			0x30000000ULL
-#define SHARED_REGION_SIZE_ARM			0x10000000ULL
-#define SHARED_REGION_NESTING_BASE_ARM		0x30000000ULL
-#define SHARED_REGION_NESTING_SIZE_ARM		0x08000000ULL
-#define SHARED_REGION_NESTING_MIN_ARM		?
-#define SHARED_REGION_NESTING_MAX_ARM		?
-
-#if defined(__i386__)
-#define SHARED_REGION_BASE			SHARED_REGION_BASE_I386
-#define SHARED_REGION_SIZE			SHARED_REGION_SIZE_I386
-#define SHARED_REGION_NESTING_BASE		SHARED_REGION_NESTING_BASE_I386
-#define SHARED_REGION_NESTING_SIZE		SHARED_REGION_NESTING_SIZE_I386
-#define SHARED_REGION_NESTING_MIN		SHARED_REGION_NESTING_MIN_I386
-#define SHARED_REGION_NESTING_MAX		SHARED_REGION_NESTING_MAX_I386
-#elif defined(__x86_64__)
-#define SHARED_REGION_BASE			SHARED_REGION_BASE_X86_64
-#define SHARED_REGION_SIZE			SHARED_REGION_SIZE_X86_64
-#define SHARED_REGION_NESTING_BASE		SHARED_REGION_NESTING_BASE_X86_64
-#define SHARED_REGION_NESTING_SIZE		SHARED_REGION_NESTING_SIZE_X86_64
-#define SHARED_REGION_NESTING_MIN		SHARED_REGION_NESTING_MIN_X86_64
-#define SHARED_REGION_NESTING_MAX		SHARED_REGION_NESTING_MAX_X86_64
-#elif defined(__ppc__)
-#define SHARED_REGION_BASE			SHARED_REGION_BASE_PPC
-#define SHARED_REGION_SIZE			SHARED_REGION_SIZE_PPC
-#define SHARED_REGION_NESTING_BASE		SHARED_REGION_NESTING_BASE_PPC
-#define SHARED_REGION_NESTING_SIZE		SHARED_REGION_NESTING_SIZE_PPC
-#define SHARED_REGION_NESTING_MIN		SHARED_REGION_NESTING_MIN_PPC
-#define SHARED_REGION_NESTING_MAX		SHARED_REGION_NESTING_MAX_PPC
-#elif defined(__ppc64__)
-#define SHARED_REGION_BASE			SHARED_REGION_BASE_PPC64
-#define SHARED_REGION_SIZE			SHARED_REGION_SIZE_PPC64
-#define SHARED_REGION_NESTING_BASE		SHARED_REGION_NESTING_BASE_PPC64
-#define SHARED_REGION_NESTING_SIZE		SHARED_REGION_NESTING_SIZE_PPC64
-#define SHARED_REGION_NESTING_MIN		SHARED_REGION_NESTING_MIN_PPC64
-#define SHARED_REGION_NESTING_MAX		SHARED_REGION_NESTING_MAX_PPC64
-#elif defined(__arm__)
-#define SHARED_REGION_BASE			SHARED_REGION_BASE_ARM
-#define SHARED_REGION_SIZE			SHARED_REGION_SIZE_ARM
-#define SHARED_REGION_NESTING_BASE		SHARED_REGION_NESTING_BASE_ARM
-#define SHARED_REGION_NESTING_SIZE		SHARED_REGION_NESTING_SIZE_ARM
-#define SHARED_REGION_NESTING_MIN		SHARED_REGION_NESTING_MIN_ARM
-#define SHARED_REGION_NESTING_MAX		SHARED_REGION_NESTING_MAX_ARM
-#endif
-
-/* 
- * All shared_region_* declarations are a private interface
- * between dyld and the kernel.
- *
- */
-struct shared_file_mapping_np {
-	mach_vm_address_t	sfm_address;
-	mach_vm_size_t		sfm_size;
-	mach_vm_offset_t	sfm_file_offset;
-	vm_prot_t		sfm_max_prot;
-	vm_prot_t		sfm_init_prot;
-};
-#define VM_PROT_COW  0x8  /* must not interfere with normal prot assignments */
-#define VM_PROT_ZF  0x10  /* must not interfere with normal prot assignments */
-
-
-__BEGIN_DECLS
-int	shared_region_check_np(uint64_t	*startaddress);
-int	shared_region_map_np(int fd,
-			     uint32_t mappingCount,
-			     const struct shared_file_mapping_np *mappings);
-__END_DECLS
-
-
-#endif /* _MACH_SHARED_REGION_H_ */
diff --git a/i386/include/mach/std_types.defs b/i386/include/mach/std_types.defs
deleted file mode 100644
index 0b48383..0000000
--- a/i386/include/mach/std_types.defs
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2002,2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	Mach kernel standard interface type declarations
- */
-
-#ifndef	_MACH_STD_TYPES_DEFS_
-#define _MACH_STD_TYPES_DEFS_
-
-/* from ISO/IEC 988:1999 spec */
-/* 7.18.1.1 Exact-width integer types */
-
-type int8_t = MACH_MSG_TYPE_INTEGER_8;
-type uint8_t = MACH_MSG_TYPE_INTEGER_8;
-type int16_t = MACH_MSG_TYPE_INTEGER_16;
-type uint16_t = MACH_MSG_TYPE_INTEGER_16;
-type int32_t = MACH_MSG_TYPE_INTEGER_32;
-type uint32_t = MACH_MSG_TYPE_INTEGER_32;
-type int64_t = MACH_MSG_TYPE_INTEGER_64;
-type uint64_t = MACH_MSG_TYPE_INTEGER_64;
-
-/*
- * Legacy fixed-length Mach types which should
- * be replaced with the Standard types from above.
- */
-type int32 = int32_t;
-type unsigned32 = uint32_t;
-type int64 = int64_t;
-type unsigned64 = uint64_t;
-
-/*
- * Other fixed length Mach types.
- */
-type char = MACH_MSG_TYPE_CHAR;
-type boolean_t = MACH_MSG_TYPE_BOOLEAN;
-
-#include <mach/machine/machine_types.defs>
-
-type kern_return_t = int;
-
-type pointer_t = ^array[] of MACH_MSG_TYPE_BYTE
-	ctype: vm_offset_t;
-
-
-type mach_port_t = MACH_MSG_TYPE_COPY_SEND;
-type mach_port_array_t = array[] of mach_port_t;
-
-type mach_port_name_t = MACH_MSG_TYPE_PORT_NAME;
-type mach_port_name_array_t = array[] of mach_port_name_t;
-
-type mach_port_right_t = natural_t;
-
-type mach_port_type_t = natural_t;
-type mach_port_type_array_t = array[] of mach_port_type_t;
-
-type mach_port_urefs_t = natural_t;
-type mach_port_delta_t = integer_t;
-type mach_port_seqno_t = natural_t;
-type mach_port_mscount_t = unsigned;
-type mach_port_msgcount_t = unsigned;
-type mach_port_rights_t = unsigned;
-type mach_msg_id_t = integer_t;
-type mach_msg_size_t = natural_t;
-type mach_msg_type_name_t = unsigned;
-type mach_msg_options_t = integer_t;
-
-type mach_port_move_receive_t =		MACH_MSG_TYPE_MOVE_RECEIVE
-	ctype: mach_port_t;
-type mach_port_copy_send_t =		MACH_MSG_TYPE_COPY_SEND
-	ctype: mach_port_t;
-type mach_port_make_send_t =		MACH_MSG_TYPE_MAKE_SEND
-	ctype: mach_port_t;
-type mach_port_move_send_t =		MACH_MSG_TYPE_MOVE_SEND
-	ctype: mach_port_t;
-type mach_port_make_send_once_t =	MACH_MSG_TYPE_MAKE_SEND_ONCE
-	ctype: mach_port_t;
-type mach_port_move_send_once_t =	MACH_MSG_TYPE_MOVE_SEND_ONCE
-	ctype: mach_port_t;
-
-type mach_port_receive_t =		MACH_MSG_TYPE_PORT_RECEIVE
-	ctype: mach_port_t;
-type mach_port_send_t =			MACH_MSG_TYPE_PORT_SEND
-	ctype: mach_port_t;
-type mach_port_send_once_t =		MACH_MSG_TYPE_PORT_SEND_ONCE
-	ctype: mach_port_t;
-
-type mach_port_poly_t = polymorphic
-	ctype: mach_port_t;
-
-import <mach/std_types.h>;
-import <mach/mig.h>;
-
-#endif	/* _MACH_STD_TYPES_DEFS_ */
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/std_types.h b/i386/include/mach/std_types.h
deleted file mode 100644
index f5b838a..0000000
--- a/i386/include/mach/std_types.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2002,2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	Mach standard external interface type definitions.
- *
- */
-
-#ifndef	_MACH_STD_TYPES_H_
-#define	_MACH_STD_TYPES_H_
-
-#include <stdint.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/port.h>
-#include <mach/vm_types.h>
-
-#endif	/* _MACH_STD_TYPES_H_ */
diff --git a/i386/include/mach/sync.h b/i386/include/mach/sync.h
deleted file mode 100644
index 0a567c2..0000000
--- a/i386/include/mach/sync.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
-** This file contains compatibilty wrapper header for things that used
-** to be generated from mach/sync.defs.  Now that code is split into two
-** different interface generator files, so include the two resulting
-** headers here.
-*/
-#include <mach/semaphore.h>
-#include <mach/lock_set.h>
diff --git a/i386/include/mach/sync_policy.h b/i386/include/mach/sync_policy.h
deleted file mode 100644
index 1fd8d3f..0000000
--- a/i386/include/mach/sync_policy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-#ifndef	_MACH_SYNC_POLICY_H_
-#define _MACH_SYNC_POLICY_H_
-
-typedef int sync_policy_t;
-
-/*
- *	These options define the wait ordering of the synchronizers
- */
-#define SYNC_POLICY_FIFO		0x0
-#define SYNC_POLICY_FIXED_PRIORITY	0x1
-#define SYNC_POLICY_REVERSED		0x2
-#define SYNC_POLICY_ORDER_MASK		0x3
-#define SYNC_POLICY_LIFO		(SYNC_POLICY_FIFO|SYNC_POLICY_REVERSED)
-
-
-#define SYNC_POLICY_MAX			0x7
-
-#endif 	/* _MACH_SYNC_POLICY_H_ */
diff --git a/i386/include/mach/task.defs b/i386/include/mach/task.defs
deleted file mode 100644
index ceebc95..0000000
--- a/i386/include/mach/task.defs
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_FREE_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/mach_port.defs
- *	Author:	Rich Draves
- *
- *	Exported kernel calls.
- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-	  task 3400;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-/*
- *	Create a new task with an empty set of IPC rights,
- *	and having an address space constructed from the
- *	target task (or empty, if inherit_memory is FALSE).
- */
-routine task_create(
-		target_task	: task_t;
-		ledgers		: ledger_array_t;
-		inherit_memory	: boolean_t;
-	out	child_task	: task_t);
-
-/*
- *	Destroy the target task, causing all of its threads
- *	to be destroyed, all of its IPC rights to be deallocated,
- *	and all of its address space to be deallocated.
- */
-routine task_terminate(
-		target_task	: task_t);
-
-/*
- *	Returns the set of threads belonging to the target task.
- */
-routine task_threads(
-		target_task	: task_t;
-	out	act_list	: thread_act_array_t);
-
-/*
- *	Stash a handful of ports for the target task; child
- *	tasks inherit this stash at task_create time.
- */
-routine	mach_ports_register(
-		target_task	: task_t;
-		init_port_set	: mach_port_array_t =
-					^array[] of mach_port_t);
-
-/*
- *	Retrieve the stashed ports for the target task.
- */
-routine	mach_ports_lookup(
-		target_task	: task_t;
-	out	init_port_set	: mach_port_array_t =
-					^array[] of mach_port_t);
-
-/*
- *      Returns information about the target task.
- */
-routine task_info(
-                target_task     : task_name_t;
-                flavor          : task_flavor_t;
-        out     task_info_out   : task_info_t, CountInOut);
-
-/*
- * Set task information.
- */
-routine	task_set_info(
-		target_task	: task_t;
-		flavor		: task_flavor_t;
-		task_info_in	: task_info_t);
-
-/*
- *	Increment the suspend count for the target task.
- *	No threads within a task may run when the suspend
- *	count for that task is non-zero.
- */
-routine	task_suspend(
-		target_task	: task_t);
-
-
-/*
- *	Decrement the suspend count for the target task,
- *	if the count is currently non-zero.  If the resulting
- *	suspend	count is zero, then threads within the task
- *	that also have non-zero suspend counts may execute.
- */
-routine	task_resume(
-		target_task	: task_t);
-
-/*
- *	Returns the current value of the selected special port
- *	associated with the target task.
- */
-routine task_get_special_port(
-		task		: task_t;
-		which_port	: int;
-	out	special_port	: mach_port_t);
-
-/*
- *	Set one of the special ports associated with the
- *	target task.
- */
-routine task_set_special_port(
-		task		: task_t;
-		which_port	: int;
-		special_port	: mach_port_t);
-
-/*
- *	Create a new thread within the target task, returning
- *	the port representing the first thr_act in that new thread.  The
- *	initial execution state of the thread is undefined.
- */
-routine thread_create(
-		parent_task	: task_t;
-	out	child_act	: thread_act_t);
-
-/*
- *      Create a new thread within the target task, returning
- *      the port representing that new thread.  The new thread 
- *	is not suspended; its initial execution state is given
- *	by flavor and new_state. Returns the port representing 
- *	the new thread.
- */
-routine thread_create_running(
-                parent_task     : task_t;
-                flavor          : thread_state_flavor_t;
-                new_state       : thread_state_t;
-        out     child_act       : thread_act_t);
-
-/*
- * Set an exception handler for a task on one or more exception types.
- * These handlers are invoked for all threads in the task if there are
- * no thread-specific exception handlers or those handlers returned an
- * error.
- */
-routine	task_set_exception_ports(
-		task		: task_t;
-		exception_mask	: exception_mask_t;
-		new_port	: mach_port_t;
-		behavior	: exception_behavior_t;
-		new_flavor	: thread_state_flavor_t);
-
-
-/*
- * Lookup some of the old exception handlers for a task
- */
-routine	task_get_exception_ports(
-		task		: task_t;
-		exception_mask	: exception_mask_t;
-	  out	masks		: exception_mask_array_t;
-	  out	old_handlers	: exception_handler_array_t, SameCount;
-	  out	old_behaviors	: exception_behavior_array_t, SameCount;
-	  out	old_flavors	: exception_flavor_array_t, SameCount);
-
-
-/*
- * Set an exception handler for a thread on one or more exception types.
- * At the same time, return the previously defined exception handlers for
- * those types.
- */
-routine	task_swap_exception_ports(
-		task		: task_t;
-		exception_mask	: exception_mask_t;
-		new_port	: mach_port_t;
-		behavior	: exception_behavior_t;
-		new_flavor	: thread_state_flavor_t;
-	  out	masks		: exception_mask_array_t;
-	  out	old_handlerss	: exception_handler_array_t, SameCount;
-	  out	old_behaviors	: exception_behavior_array_t, SameCount;
-	  out	old_flavors	: exception_flavor_array_t, SameCount);
-
-/*
- * Create and destroy lock_set and semaphore synchronizers on a
- * per-task basis (i.e. the task owns them).
- */
-routine lock_set_create(
-		task		: task_t;
-	out	new_lock_set	: lock_set_t;
-		n_ulocks	: int;
-		policy		: int);
-
-routine lock_set_destroy(
-		task		: task_t;
-		lock_set	: lock_set_t);
-
-routine semaphore_create(
-		task		: task_t;
-	out	semaphore	: semaphore_t;
-		policy		: int;
-		value		: int);
-
-routine semaphore_destroy(
-		task		: task_t;
-		semaphore	: semaphore_consume_ref_t);
-
-/*
- * Set/get policy information for a task.
- * (Approved Mac OS X microkernel interface)
- */
-
-routine task_policy_set(
-	task			: task_t;
-	flavor			: task_policy_flavor_t;
-	policy_info		: task_policy_t);
-
-routine task_policy_get(
-	task			: task_t;
-	flavor			: task_policy_flavor_t;
-out	policy_info		: task_policy_t, CountInOut;
-inout	get_default		: boolean_t);
-
-/*
- *	Removed from the kernel.
- */
-#if KERNEL_SERVER
-skip;
-#else
-routine task_sample(
-		task		: task_t;
-		reply		: mach_port_make_send_t);
-#endif
-
-/*
- * JMM - Everything from here down is likely to go away soon
- */
-/*
- * OBSOLETE interface.
- */
-routine task_policy(
-	task			: task_t;
-	policy			: policy_t;
-	base			: policy_base_t;
-	set_limit		: boolean_t;
-	change			: boolean_t);
-
-
-/*
- *	Establish a user-level handler for the specified
- *	system call.
- */
-routine task_set_emulation(
-		target_port	: task_t;
-		routine_entry_pt: vm_address_t;
-		routine_number  : int);	
-
-/*
- *	Get user-level handler entry points for all
- *	emulated system calls.
- */
-routine task_get_emulation_vector(
-		task		: task_t;
-	out	vector_start	: int;
-	out	emulation_vector: emulation_vector_t);
-
-/*
- *	Establish user-level handlers for the specified
- *	system calls. Non-emulated system calls are specified
- *	with emulation_vector[i] == EML_ROUTINE_NULL.
- */
-routine task_set_emulation_vector(
-		task		: task_t;
-		vector_start	: int;
-		emulation_vector: emulation_vector_t);
-
-
-/*
- *      Establish restart pc for interrupted atomic sequences.
- */
-routine task_set_ras_pc(
-		target_task     : task_t;
-		basepc          : vm_address_t;
-		boundspc        : vm_address_t);
-
-
-skip; /* was kernel_task_create() */
-
-/* 
- * JMM - Want to eliminate processor_set so keep them at the end.
- */
-
-/*
- *	Assign task to processor set.
- */
-routine task_assign(
-		task		: task_t;
-		new_set		: processor_set_t;
-		assign_threads	: boolean_t);
-
-/*
- *	Assign task to default set.
- */
-routine task_assign_default(
-		task		: task_t;
-		assign_threads	: boolean_t);
-
-/*
- *	Get current assignment for task.
- */
-routine task_get_assignment(
-		task		: task_t;
-	out	assigned_set	: processor_set_name_t);
-
-/*
- * OBSOLETE interface.
- */
-routine task_set_policy(
-	task			: task_t;
-	pset			: processor_set_t;
-	policy			: policy_t;
-	base			: policy_base_t;
-	limit			: policy_limit_t;
-	change			: boolean_t);
-
-/*
- * Read the selected state which is to be installed on new 
- * threads in the task as they are created.
- */
-routine task_get_state(
-		task		: task_t;
-		flavor		: thread_state_flavor_t;
-	out	old_state	: thread_state_t, CountInOut);
- 
-/*
- * Set the selected state information to be installed on
- * all subsequently created threads in the task.
- */
-routine	task_set_state(
-		task		: task_t;
-		flavor		: thread_state_flavor_t;
-		new_state	: thread_state_t);
-
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/task.h b/i386/include/mach/task.h
deleted file mode 100644
index 459a330..0000000
--- a/i386/include/mach/task.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#if defined(__i386__)
-#include <mach/i386/task.h>
-#elif defined(__x86_64__)
-#include <mach/x86_64/task.h>
-#elif defined(__ppc__)
-#include <mach/ppc/task.h>
-#elif defined(__ppc64__)
-#include <mach/ppc64/task.h>
-#elif defined(__arm__)
-#include <mach/arm/task.h>
-#else
-#error unknown architecture
-#endif 
diff --git a/i386/include/mach/task_access.defs b/i386/include/mach/task_access.defs
deleted file mode 100644
index 1696fd3..0000000
--- a/i386/include/mach/task_access.defs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-subsystem
-#if	KERNEL_USER
-		KernelUser
-#endif	/* KERN_USER */
-			task_access 27000;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-/*
- *	Verify task_for_pid access for the given pid
- *	Access granted by return value (success/failure)
- */
-routine check_task_access(
-		task_access_port			: mach_port_t;
-		calling_pid				: int32_t;
-		calling_gid				: uint32_t;
-		target_pid				: int32_t;
-		ServerAuditToken	caller_cred 	: audit_token_t);
-
-/*
- *	Search for a code signature for unsigned executables
- */
-routine find_code_signature(
-		task_access_port			: mach_port_t;
-		new_pid					: int32_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/task_info.h b/i386/include/mach/task_info.h
deleted file mode 100644
index cab9c17..0000000
--- a/i386/include/mach/task_info.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- *	Machine-independent task information structures and definitions.
- *
- *	The definitions in this file are exported to the user.  The kernel
- *	will translate its internal data structures to these structures
- *	as appropriate.
- *
- */
-
-#ifndef	_MACH_TASK_INFO_H_
-#define	_MACH_TASK_INFO_H_
-
-#include <mach/message.h>
-#include <mach/machine/vm_types.h>
-#include <mach/time_value.h>
-#include <mach/policy.h>
-
-#include <sys/cdefs.h>
-
-/*
- *	Generic information structure to allow for expansion.
- */
-typedef	natural_t	task_flavor_t;
-typedef	integer_t	*task_info_t;		/* varying array of int */
-
-#define	TASK_INFO_MAX	(1024)		/* maximum array size */
-typedef	integer_t	task_info_data_t[TASK_INFO_MAX];
-
-/*
- *	Currently defined information structures.
- */
-
-#pragma pack(4)
-
-#define TASK_BASIC_INFO_32      4       /* basic information */
-#define TASK_BASIC2_INFO_32      6
-
-struct task_basic_info_32 {
-        integer_t       suspend_count;  /* suspend count for task */
-        natural_t       virtual_size;   /* virtual memory size (bytes) */
-        natural_t       resident_size;  /* resident memory size (bytes) */
-        time_value_t    user_time;      /* total user run time for
-                                           terminated threads */
-        time_value_t    system_time;    /* total system run time for
-                                           terminated threads */
-	policy_t	policy;		/* default policy for new threads */
-};
-typedef struct task_basic_info_32       task_basic_info_32_data_t;
-typedef struct task_basic_info_32       *task_basic_info_32_t;
-#define TASK_BASIC_INFO_32_COUNT   \
-                (sizeof(task_basic_info_32_data_t) / sizeof(natural_t))
-
-
-#define TASK_BASIC_INFO_64      5       /* 64-bit capable basic info */
-
-struct task_basic_info_64 {
-        integer_t       suspend_count;  /* suspend count for task */
-        mach_vm_size_t  virtual_size;   /* virtual memory size (bytes) */
-        mach_vm_size_t  resident_size;  /* resident memory size (bytes) */
-        time_value_t    user_time;      /* total user run time for
-                                           terminated threads */
-        time_value_t    system_time;    /* total system run time for
-                                           terminated threads */
-	policy_t	policy;		/* default policy for new threads */
-};
-typedef struct task_basic_info_64       task_basic_info_64_data_t;
-typedef struct task_basic_info_64       *task_basic_info_64_t;
-#define TASK_BASIC_INFO_64_COUNT   \
-                (sizeof(task_basic_info_64_data_t) / sizeof(natural_t))
-
-
-/* localized structure - cannot be safely passed between tasks of differing sizes */
-
-struct task_basic_info {
-        integer_t       suspend_count;  /* suspend count for task */
-        vm_size_t       virtual_size;   /* virtual memory size (bytes) */
-        vm_size_t       resident_size;  /* resident memory size (bytes) */
-        time_value_t    user_time;      /* total user run time for
-                                           terminated threads */
-        time_value_t    system_time;    /* total system run time for
-                                           terminated threads */
-	policy_t	policy;		/* default policy for new threads */
-};
-
-typedef struct task_basic_info          task_basic_info_data_t;
-typedef struct task_basic_info          *task_basic_info_t;
-#define TASK_BASIC_INFO_COUNT   \
-                (sizeof(task_basic_info_data_t) / sizeof(natural_t))
-#if !defined(__LP64__)
-#define TASK_BASIC_INFO TASK_BASIC_INFO_32
-#else
-#define TASK_BASIC_INFO TASK_BASIC_INFO_64
-#endif
-
-
-
-#define	TASK_EVENTS_INFO	2	/* various event counts */
-
-struct task_events_info {
-	integer_t	faults;		/* number of page faults */
-	integer_t 	pageins;	/* number of actual pageins */
-	integer_t 	cow_faults;	/* number of copy-on-write faults */
-	integer_t 	messages_sent;	/* number of messages sent */
-	integer_t 	messages_received; /* number of messages received */
-        integer_t 	syscalls_mach;  /* number of mach system calls */
-	integer_t 	syscalls_unix;  /* number of unix system calls */
-	integer_t 	csw;            /* number of context switches */
-};
-typedef struct task_events_info		task_events_info_data_t;
-typedef struct task_events_info		*task_events_info_t;
-#define	TASK_EVENTS_INFO_COUNT		((mach_msg_type_number_t) \
-		(sizeof(task_events_info_data_t) / sizeof(natural_t)))
-
-#define	TASK_THREAD_TIMES_INFO	3	/* total times for live threads -
-					   only accurate if suspended */
-
-struct task_thread_times_info {
-	time_value_t	user_time;	/* total user run time for
-					   live threads */
-	time_value_t	system_time;	/* total system run time for
-					   live threads */
-};
-
-typedef struct task_thread_times_info	task_thread_times_info_data_t;
-typedef struct task_thread_times_info	*task_thread_times_info_t;
-#define	TASK_THREAD_TIMES_INFO_COUNT	((mach_msg_type_number_t) \
-		(sizeof(task_thread_times_info_data_t) / sizeof(natural_t)))
-
-#define TASK_ABSOLUTETIME_INFO	1
-
-struct task_absolutetime_info {
-	uint64_t		total_user;		/* total time */
-	uint64_t		total_system;
-	uint64_t		threads_user;	/* existing threads only */
-	uint64_t		threads_system;
-};
-
-typedef struct task_absolutetime_info	task_absolutetime_info_data_t;
-typedef struct task_absolutetime_info	*task_absolutetime_info_t;
-#define TASK_ABSOLUTETIME_INFO_COUNT	((mach_msg_type_number_t) \
-		(sizeof (task_absolutetime_info_data_t) / sizeof (natural_t)))
-
-#define TASK_SECURITY_TOKEN		13
-#define TASK_SECURITY_TOKEN_COUNT	((mach_msg_type_number_t) \
-		(sizeof(security_token_t) / sizeof(natural_t)))
-
-#define TASK_AUDIT_TOKEN		15
-#define TASK_AUDIT_TOKEN_COUNT	\
-		(sizeof(audit_token_t) / sizeof(natural_t))
-
-
-#define TASK_AFFINITY_TAG_INFO		16 	/* This is experimental. */
-
-struct task_affinity_tag_info {
-	integer_t		set_count;
-	integer_t		min;
-	integer_t		max;
-	integer_t		task_count;
-};
-typedef struct task_affinity_tag_info	task_affinity_tag_info_data_t;
-typedef struct task_affinity_tag_info	*task_affinity_tag_info_t;
-#define TASK_AFFINITY_TAG_INFO_COUNT	\
-		(sizeof(task_affinity_tag_info_data_t) / sizeof(natural_t))
-
-#define TASK_DYLD_INFO			17	/* This is experimental. */
-
-struct task_dyld_info {
-	mach_vm_address_t	all_image_info_addr;
-	mach_vm_size_t		all_image_info_size;
-};
-typedef struct task_dyld_info	task_dyld_info_data_t;
-typedef struct task_dyld_info	*task_dyld_info_t;
-#define TASK_DYLD_INFO_COUNT	\
-    		(sizeof(task_dyld_info_data_t) / sizeof(natural_t))
-
-#pragma pack()
-
-
-/*
- * Obsolete interfaces.
- */
-
-#define TASK_SCHED_TIMESHARE_INFO	10
-#define TASK_SCHED_RR_INFO		11
-#define TASK_SCHED_FIFO_INFO		12
-
-#define TASK_SCHED_INFO			14
-
-#endif	/* _MACH_TASK_INFO_H_ */
diff --git a/i386/include/mach/task_ledger.h b/i386/include/mach/task_ledger.h
deleted file mode 100644
index 5d4bc25..0000000
--- a/i386/include/mach/task_ledger.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-
-#ifndef _MACH_TASK_LEDGER_H_
-#define _MACH_TASK_LEDGER_H_
-
-/*
- * Evolving and likely to change.
- */
-
-/*
- * Definitions for task ledger line items
- */
-#define ITEM_THREADS		0	/* number of threads	*/
-#define ITEM_TASKS		1	/* number of tasks	*/
-
-#define ITEM_VM	   		2	/* virtual space (bytes)*/
-
-#define LEDGER_N_ITEMS		3	/* Total line items	*/
-
-#define LEDGER_UNLIMITED	0	/* ignored item.maximum	*/
-
-#endif  /* _MACH_TASK_LEDGER_H_ */
diff --git a/i386/include/mach/task_policy.h b/i386/include/mach/task_policy.h
deleted file mode 100644
index 3a2fb39..0000000
--- a/i386/include/mach/task_policy.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_TASK_POLICY_H_
-#define _MACH_TASK_POLICY_H_
-
-#include <mach/mach_types.h>
-
-/*
- * These are the calls for accessing the policy parameters
- * of a particular task.
- *
- * The extra 'get_default' parameter to the second call is
- * IN/OUT as follows:
- * 1) if asserted on the way in it indicates that the default
- * values should be returned, not the ones currently set, in
- * this case 'get_default' will always be asserted on return;
- * 2) if unasserted on the way in, the current settings are
- * desired and if still unasserted on return, then the info
- * returned reflects the current settings, otherwise if
- * 'get_default' returns asserted, it means that there are no
- * current settings due to other parameters taking precedence,
- * and the default ones are being returned instead.
- */
-
-typedef natural_t	task_policy_flavor_t;
-typedef integer_t	*task_policy_t;
-
-/*
-kern_return_t	task_policy_set(
-					task_t					task,
-					task_policy_flavor_t	flavor,
-					task_policy_t			policy_info,
-					mach_msg_type_number_t	count);
-
-kern_return_t	task_policy_get(
-					task_t					task,
-					task_policy_flavor_t	flavor,
-					task_policy_t			policy_info,
-					mach_msg_type_number_t	*count,
-					boolean_t				*get_default);
-*/
-
-/*
- * Defined flavors.
- */
-/*
- * TASK_CATEGORY_POLICY:
- *
- * This provides information to the kernel about the role
- * of the task in the system.
- *
- * Parameters:
- *
- * role: Enumerated as follows:
- *
- * TASK_UNSPECIFIED is the default, since the role is not
- * inherited from the parent.
- *
- * TASK_FOREGROUND_APPLICATION should be assigned when the
- * task is a normal UI application in the foreground from
- * the HI point of view.
- * **N.B. There may be more than one of these at a given time.
- *
- * TASK_BACKGROUND_APPLICATION should be assigned when the
- * task is a normal UI application in the background from
- * the HI point of view.
- *
- * TASK_CONTROL_APPLICATION should be assigned to the unique
- * UI application which implements the pop-up application dialog.
- * There can only be one task at a time with this designation,
- * which is assigned FCFS.
- *
- * TASK_GRAPHICS_SERVER should be assigned to the graphics
- * management (window) server.  There can only be one task at
- * a time with this designation, which is assigned FCFS.
- */
-
-#define TASK_CATEGORY_POLICY		1
-
-enum task_role {
-	TASK_RENICED = -1,
-	TASK_UNSPECIFIED = 0,
-	TASK_FOREGROUND_APPLICATION,
-	TASK_BACKGROUND_APPLICATION,
-	TASK_CONTROL_APPLICATION,
-	TASK_GRAPHICS_SERVER,
-	TASK_THROTTLE_APPLICATION,
-	TASK_DEFAULT_APPLICATION
-};
-
-typedef enum task_role		task_role_t;
-
-struct task_category_policy {
-	task_role_t		role;
-};
-
-typedef struct task_category_policy		task_category_policy_data_t;
-typedef struct task_category_policy		*task_category_policy_t;
-
-#define TASK_CATEGORY_POLICY_COUNT	((mach_msg_type_number_t) \
-	(sizeof (task_category_policy_data_t) / sizeof (integer_t)))
-
-#endif	/* _MACH_TASK_POLICY_H_ */
diff --git a/i386/include/mach/task_special_ports.h b/i386/include/mach/task_special_ports.h
deleted file mode 100644
index ec980cf..0000000
--- a/i386/include/mach/task_special_ports.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/task_special_ports.h
- *
- *	Defines codes for special_purpose task ports.  These are NOT
- *	port identifiers - they are only used for the task_get_special_port
- *	and task_set_special_port routines.
- *	
- */
-
-#ifndef	_MACH_TASK_SPECIAL_PORTS_H_
-#define _MACH_TASK_SPECIAL_PORTS_H_
-
-typedef	int	task_special_port_t;
-
-#define TASK_KERNEL_PORT	1	/* Represents task to the outside
-					   world.*/
-
-#define TASK_HOST_PORT		2	/* The host (priv) port for task.  */
-
-#define TASK_NAME_PORT		3	/* the name (unpriv) port for task */
-
-#define TASK_BOOTSTRAP_PORT	4	/* Bootstrap environment for task. */
-
-/*
- * Evolving and likely to change.
- */
-
-#define TASK_WIRED_LEDGER_PORT	5	/* Wired resource ledger for task. */
-
-#define TASK_PAGED_LEDGER_PORT	6	/* Paged resource ledger for task. */
-
-#define TASK_SEATBELT_PORT	7	/* Seatbelt compiler/DEM port for task. */
-
-#define TASK_GSSD_PORT		8	/* GSSD port for security context */
-
-#define TASK_ACCESS_PORT	9	/* Permission check for task_for_pid. */
-
-#define task_get_wired_ledger_port(task, port)	\
-		(task_get_special_port((task), TASK_WIRED_LEDGER_PORT, (port)))
-
-#define task_set_wired_ledger_port(task, port)	\
-		(task_set_special_port((task), TASK_WIRED_LEDGER_PORT, (port)))
-
-#define task_get_paged_ledger_port(task, port)	\
-		(task_get_special_port((task), TASK_PAGED_LEDGER_PORT, (port)))
-
-#define task_set_paged_ledger_port(task, port)	\
-		(task_set_special_port((task), TASK_PAGED_LEDGER_PORT, (port)))
-
-/*
- *	Definitions for ease of use
- */
-
-#define task_get_kernel_port(task, port)	\
-		(task_get_special_port((task), TASK_KERNEL_PORT, (port)))
-
-#define task_set_kernel_port(task, port)	\
-		(task_set_special_port((task), TASK_KERNEL_PORT, (port)))
-
-#define task_get_host_port(task, port)		\
-		(task_get_special_port((task), TASK_HOST_PORT, (port)))
-
-#define task_set_host_port(task, port)	\
-		(task_set_special_port((task), TASK_HOST_PORT, (port)))
-
-#define task_get_bootstrap_port(task, port)	\
-		(task_get_special_port((task), TASK_BOOTSTRAP_PORT, (port)))
-
-#define task_set_bootstrap_port(task, port)	\
-		(task_set_special_port((task), TASK_BOOTSTRAP_PORT, (port)))
-
-#define task_get_gssd_port(task, port)	\
-		(task_get_special_port((task), TASK_GSSD_PORT, (port)))
-
-#define task_set_gssd_port(task, port)	\
-		(task_set_special_port((task), TASK_GSSD_PORT, (port)))
-
-#define task_get_task_access_port(task, port)	\
-		(task_get_special_port((task), TASK_ACCESS_PORT, (port)))
-
-#define task_set_task_access_port(task, port)	\
-		(task_set_special_port((task), TASK_ACCESS_PORT, (port)))
-
-#endif	/* _MACH_TASK_SPECIAL_PORTS_H_ */
diff --git a/i386/include/mach/thread_act.defs b/i386/include/mach/thread_act.defs
deleted file mode 100644
index 47a21a9..0000000
--- a/i386/include/mach/thread_act.defs
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_FREE_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/mach_port.defs
- *	Author:	Rich Draves
- *
- *	Exported kernel calls.
- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-	  thread_act 3600;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-
-/*
- *	Destroy the target thread.
- *
- *	JMM - For legacy reasons this consumes a reference to the
- *	target thread.  This will have to change in the future because
- *	we want the interfaces to be able to be defined in more standard
- *	IDLs and transports, and most of them do not support the notion
- *	of reference ownership transfers (just sharing).
- */
-routine thread_terminate(
-		target_act	: thread_act_consume_ref_t); 
-
-
-/*
- *	Return the selected state information for the target
- *	thr_act.  If the thr_act is currently executing, the results
- *	may be stale.  [Flavor THREAD_STATE_FLAVOR_LIST provides a
- *	list of valid flavors for the target thread.]
- */
-routine act_get_state(
-		target_act	: thread_act_t;
-		flavor		: int;
-	out	old_state	: thread_state_t, CountInOut);
-
-/*
- *	Set the selected state information for the target thread.
- *	If the thread is currently executing, the state change
- *	may be ill-defined.
- */
-routine	act_set_state(
-		target_act	: thread_act_t;
-		flavor		: int;
-		new_state	: thread_state_t);
-
-/*
- * Backward compatible old-style thread routines.
- * These have different semantics than the new activation versions.
- *
- *	Return the selected state information for the target
- *	thread.  If the thread is currently executing, the results
- *	may be stale.  [Flavor THREAD_STATE_FLAVOR_LIST provides a
- *	list of valid flavors for the target thr_act.]
- */
-routine thread_get_state(
-		target_act	: thread_act_t;
-		flavor		: thread_state_flavor_t;
-	out	old_state	: thread_state_t, CountInOut);
-
-/*
- *	Set the selected state information for the target thread.
- *	If the thread is currently executing, the state change
- *	may be ill-defined.
- */
-routine	thread_set_state(
-		target_act	: thread_act_t;
-		flavor		: thread_state_flavor_t;
-		new_state	: thread_state_t);
-
-/*
- *	Increment the suspend count for the target thread.
- *	Once this call has completed, the thread will not
- *	execute any further user or meta- instructions.
- *	Once suspended, a thread may not execute again until
- *	its suspend count is zero, and the suspend count
- *	for its task is also zero.
- */
-routine	thread_suspend(
-		target_act	: thread_act_t);
-
-/*
- *	Decrement the suspend count for the target thread,
- *	if that count is not already zero.
- */
-routine	thread_resume(
-		target_act	: thread_act_t);
-
-/*
- *	Cause any user or meta- instructions currently being
- *	executed by the target thread to be aborted.  [Meta-
- *	instructions consist of the basic traps for IPC
- *	(e.g., msg_send, msg_receive) and self-identification
- *	(e.g., task_self, thread_self, thread_reply).  Calls
- *	described by MiG interfaces are not meta-instructions
- *	themselves.]
- */
-routine thread_abort(
-		target_act	: thread_act_t);
-
-/*
- *	Cause any user or meta- instructions currently being
- *	executed by the target thread to be aborted so that
- *	they are transparently restartable.  This call fails
- *	if the abort would result in a non-restartable condition.
- *	Retry is the caller's responsibility.  [Meta-
- *	instructions consist of the basic traps for IPC
- *	(e.g., msg_send, msg_receive) and self-identification
- *	(e.g., task_self, thread_self, thread_reply).  Calls
- *	described by MiG interfaces are not meta-instructions
- *	themselves.]
- */
-routine thread_abort_safely(
-		target_act	: thread_act_t);
-
-
-routine thread_depress_abort(
-		thread		: thread_act_t);
-
-
-/*
- *	Returns the current value of the selected special port
- *	associated with the target thread.
- */
-routine thread_get_special_port(
-		thr_act		: thread_act_t;
-		which_port	: int;
-	out	special_port	: mach_port_t);
-
-/*
- *	Set one of the special ports associated with the
- *	target thread.
- */
-routine thread_set_special_port(
-		thr_act		: thread_act_t;
-		which_port	: int;
-		special_port	: mach_port_t);
-
-/*
- *      Returns information about the target thread.
- */
-routine thread_info(
-                target_act      : thread_act_t;
-                flavor          : thread_flavor_t;
-        out     thread_info_out : thread_info_t, CountInOut);
-
-/*
- * Set an exception handler for a thread on one or more exception types
- */
-routine		thread_set_exception_ports(
-			thread		: thread_act_t;
-			exception_mask	: exception_mask_t;
-			new_port	: mach_port_t;
-			behavior	: exception_behavior_t;
-			new_flavor	: thread_state_flavor_t);
-
-/*
- * Lookup some of the old exception handlers for a thread
- */
-routine		thread_get_exception_ports(
-			thread		: thread_act_t;
-			exception_mask	: exception_mask_t;
-		  out	masks		: exception_mask_array_t;
-		  out	old_handlers	: exception_handler_array_t, SameCount;
-		  out	old_behaviors	: exception_behavior_array_t, SameCount;
-		  out	old_flavors	: exception_flavor_array_t, SameCount);
-
-/*
- * Set an exception handler for a thread on one or more exception types.
- * At the same time, return the previously defined exception handlers for
- * those types.
- */
-routine		thread_swap_exception_ports(
-			thread		: thread_act_t;
-			exception_mask	: exception_mask_t;
-			new_port	: mach_port_t;
-			behavior	: exception_behavior_t;
-			new_flavor	: thread_state_flavor_t;
-		  out	masks		: exception_mask_array_t;
-		  out	old_handlers	: exception_handler_array_t, SameCount;
-		  out	old_behaviors	: exception_behavior_array_t, SameCount;
-		  out	old_flavors	: exception_flavor_array_t, SameCount);
-
-/*
- * OBSOLETE interface.
- */
-routine thread_policy(
-	thr_act			: thread_act_t;
-	policy			: policy_t;
-	base			: policy_base_t;
-	set_limit		: boolean_t);
-
-/*
- * Set/get policy information for a thread.
- * (Approved Mac OS X microkernel interface)
- */
-
-routine thread_policy_set(
-	thread			: thread_act_t;
-	flavor			: thread_policy_flavor_t;
-	policy_info		: thread_policy_t);
-
-routine thread_policy_get(
-	thread			: thread_act_t;
-	flavor			: thread_policy_flavor_t;
-out	policy_info		: thread_policy_t, CountInOut;
-inout	get_default		: boolean_t);
-
-/*
- *	Removed from the kernel.
- */
-#if KERNEL_SERVER
-skip;
-#else
-routine thread_sample(
-		thread		: thread_act_t;
-		reply		: mach_port_make_send_t);
-#endif
-
-/*
- *	ETAP has been removed from the kernel.
- */
-#if KERNEL_SERVER
-skip;
-#else
-routine	etap_trace_thread(
-		target_act	: thread_act_t;
-		trace_status	: boolean_t);
-#endif
-
-/*
- *	Assign thread to processor set.
- */
-routine	thread_assign(
-		thread		: thread_act_t;
-		new_set		: processor_set_t);
-
-/*
- *	Assign thread to default set.
- */
-routine thread_assign_default(
-		thread		: thread_act_t);
-
-/*
- *	Get current assignment for thread.
- */
-routine thread_get_assignment(
-		thread		: thread_act_t;
-	out	assigned_set	: processor_set_name_t);
-
-
-/*
- * OBSOLETE interface.
- */
-routine thread_set_policy(
-	thr_act			: thread_act_t;
-	pset			: processor_set_t;
-	policy			: policy_t;
-	base			: policy_base_t;
-	limit			: policy_limit_t);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/thread_act.h b/i386/include/mach/thread_act.h
deleted file mode 100644
index ac2309b..0000000
--- a/i386/include/mach/thread_act.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#if defined(__i386__)
-#include <mach/i386/thread_act.h>
-#elif defined(__x86_64__)
-#include <mach/x86_64/thread_act.h>
-#elif defined(__ppc__)
-#include <mach/ppc/thread_act.h>
-#elif defined(__ppc64__)
-#include <mach/ppc64/thread_act.h>
-#elif defined(__arm__)
-#include <mach/arm/thread_act.h>
-#else
-#error unknown architecture
-#endif 
diff --git a/i386/include/mach/thread_info.h b/i386/include/mach/thread_info.h
deleted file mode 100644
index 5f51aea..0000000
--- a/i386/include/mach/thread_info.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/thread_info
- *
- *	Thread information structure and definitions.
- *
- *	The defintions in this file are exported to the user.  The kernel
- *	will translate its internal data structures to these structures
- *	as appropriate.
- *
- */
-
-#ifndef	_MACH_THREAD_INFO_H_
-#define _MACH_THREAD_INFO_H_
-
-#include <mach/boolean.h>
-#include <mach/policy.h>
-#include <mach/time_value.h>
-#include <mach/message.h>
-#include <mach/machine/vm_types.h>
-
-/*
- *	Generic information structure to allow for expansion.
- */
-typedef	natural_t	thread_flavor_t;
-typedef	integer_t	*thread_info_t;		/* varying array of int */
-
-#define THREAD_INFO_MAX		(1024)	/* maximum array size */
-typedef	integer_t	thread_info_data_t[THREAD_INFO_MAX];
-
-/*
- *	Currently defined information.
- */
-#define THREAD_BASIC_INFO         	3     /* basic information */
-
-struct thread_basic_info {
-        time_value_t    user_time;      /* user run time */
-        time_value_t    system_time;    /* system run time */
-        integer_t       cpu_usage;      /* scaled cpu usage percentage */
-	policy_t	policy;		/* scheduling policy in effect */
-        integer_t       run_state;      /* run state (see below) */
-        integer_t       flags;          /* various flags (see below) */
-        integer_t       suspend_count;  /* suspend count for thread */
-        integer_t       sleep_time;     /* number of seconds that thread
-                                           has been sleeping */
-};
-
-typedef struct thread_basic_info  thread_basic_info_data_t;
-typedef struct thread_basic_info  *thread_basic_info_t;
-#define THREAD_BASIC_INFO_COUNT   ((mach_msg_type_number_t) \
-                (sizeof(thread_basic_info_data_t) / sizeof(natural_t)))
-
-#define THREAD_IDENTIFIER_INFO		4     /* thread id and other information */
-
-struct thread_identifier_info {
-	uint64_t	thread_id;	/* system-wide unique 64-bit thread id */
-	uint64_t	thread_handle;	/* handle to be used by libproc */
-	uint64_t	dispatch_qaddr;	/* libdispatch queue address */
-};
-
-typedef struct thread_identifier_info  thread_identifier_info_data_t;
-typedef struct thread_identifier_info  *thread_identifier_info_t;
-#define THREAD_IDENTIFIER_INFO_COUNT   ((mach_msg_type_number_t) \
-                (sizeof(thread_identifier_info_data_t) / sizeof(natural_t)))
-
-/*
- *	Scale factor for usage field.
- */
-
-#define TH_USAGE_SCALE	1000
-
-/*
- *	Thread run states (state field).
- */
-
-#define TH_STATE_RUNNING	1	/* thread is running normally */
-#define TH_STATE_STOPPED	2	/* thread is stopped */
-#define TH_STATE_WAITING	3	/* thread is waiting normally */
-#define TH_STATE_UNINTERRUPTIBLE 4	/* thread is in an uninterruptible
-					   wait */
-#define TH_STATE_HALTED		5	/* thread is halted at a
-					   clean point */
-
-/*
- *	Thread flags (flags field).
- */
-#define TH_FLAGS_SWAPPED	0x1	/* thread is swapped out */
-#define TH_FLAGS_IDLE		0x2	/* thread is an idle thread */
-
-/*
- * Obsolete interfaces.
- */
-
-#define THREAD_SCHED_TIMESHARE_INFO	10
-#define THREAD_SCHED_RR_INFO		11
-#define THREAD_SCHED_FIFO_INFO		12
-
-#endif	/* _MACH_THREAD_INFO_H_ */
diff --git a/i386/include/mach/thread_policy.h b/i386/include/mach/thread_policy.h
deleted file mode 100644
index d9530b7..0000000
--- a/i386/include/mach/thread_policy.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _MACH_THREAD_POLICY_H_
-#define _MACH_THREAD_POLICY_H_
-
-#include <mach/mach_types.h>
-
-/*
- * These are the calls for accessing the policy parameters
- * of a particular thread.
- *
- * The extra 'get_default' parameter to the second call is
- * IN/OUT as follows:
- * 1) if asserted on the way in it indicates that the default
- * values should be returned, not the ones currently set, in
- * this case 'get_default' will always be asserted on return;
- * 2) if unasserted on the way in, the current settings are
- * desired and if still unasserted on return, then the info
- * returned reflects the current settings, otherwise if
- * 'get_default' returns asserted, it means that there are no
- * current settings due to other parameters taking precedence,
- * and the default ones are being returned instead.
- */
-
-typedef natural_t	thread_policy_flavor_t;
-typedef integer_t	*thread_policy_t;
-
-/*
-kern_return_t	thread_policy_set(
-					thread_t					thread,
-					thread_policy_flavor_t		flavor,
-					thread_policy_t				policy_info,
-					mach_msg_type_number_t		count);
-
-kern_return_t	thread_policy_get(
-					thread_t					thread,
-					thread_policy_flavor_t		flavor,
-					thread_policy_t				policy_info,
-					mach_msg_type_number_t		*count,
-					boolean_t					*get_default);
-*/
-
-/*
- * Defined flavors.
- */
-/*
- * THREAD_STANDARD_POLICY:
- *
- * This is the standard (fair) scheduling mode, assigned to new
- * threads.  The thread will be given processor time in a manner
- * which apportions approximately equal share to long running
- * computations.
- *
- * Parameters:
- *	[none]
- */
-
-#define THREAD_STANDARD_POLICY			1
-
-struct thread_standard_policy {
-	natural_t		no_data;
-};
-
-typedef struct thread_standard_policy	thread_standard_policy_data_t;
-typedef struct thread_standard_policy	*thread_standard_policy_t;
-
-#define THREAD_STANDARD_POLICY_COUNT	0
-
-/*
- * THREAD_EXTENDED_POLICY:
- *
- * Extended form of THREAD_STANDARD_POLICY, which supplies a
- * hint indicating whether this is a long running computation.
- *
- * Parameters:
- *
- * timeshare: TRUE (the default) results in identical scheduling
- * behavior as THREAD_STANDARD_POLICY.
- */
-
-#define THREAD_EXTENDED_POLICY			1
-
-struct thread_extended_policy {
-	boolean_t		timeshare;
-};
-
-typedef struct thread_extended_policy	thread_extended_policy_data_t;
-typedef struct thread_extended_policy	*thread_extended_policy_t;
-
-#define THREAD_EXTENDED_POLICY_COUNT	((mach_msg_type_number_t) \
-	(sizeof (thread_extended_policy_data_t) / sizeof (integer_t)))
-
-/*
- * THREAD_TIME_CONSTRAINT_POLICY:
- *
- * This scheduling mode is for threads which have real time
- * constraints on their execution.
- *
- * Parameters:
- *
- * period: This is the nominal amount of time between separate
- * processing arrivals, specified in absolute time units.  A
- * value of 0 indicates that there is no inherent periodicity in
- * the computation.
- *
- * computation: This is the nominal amount of computation
- * time needed during a separate processing arrival, specified
- * in absolute time units.
- *
- * constraint: This is the maximum amount of real time that
- * may elapse from the start of a separate processing arrival
- * to the end of computation for logically correct functioning,
- * specified in absolute time units.  Must be (>= computation).
- * Note that latency = (constraint - computation).
- *
- * preemptible: This indicates that the computation may be
- * interrupted, subject to the constraint specified above.
- */
-
-#define THREAD_TIME_CONSTRAINT_POLICY	2
-
-struct thread_time_constraint_policy {
-	uint32_t		period;
-	uint32_t		computation;
-	uint32_t		constraint;
-	boolean_t		preemptible;
-};
-
-typedef struct thread_time_constraint_policy	\
-									thread_time_constraint_policy_data_t;
-typedef struct thread_time_constraint_policy	\
-									*thread_time_constraint_policy_t;
-
-#define THREAD_TIME_CONSTRAINT_POLICY_COUNT	((mach_msg_type_number_t) \
-	(sizeof (thread_time_constraint_policy_data_t) / sizeof (integer_t)))
-
-/*
- * THREAD_PRECEDENCE_POLICY:
- *
- * This may be used to indicate the relative value of the
- * computation compared to the other threads in the task.
- *
- * Parameters:
- *
- * importance: The importance is specified as a signed value.
- */
-
-#define THREAD_PRECEDENCE_POLICY		3
-
-struct thread_precedence_policy {
-	integer_t		importance;
-};
-
-typedef struct thread_precedence_policy		thread_precedence_policy_data_t;
-typedef struct thread_precedence_policy		*thread_precedence_policy_t;
-
-#define THREAD_PRECEDENCE_POLICY_COUNT	((mach_msg_type_number_t) \
-	(sizeof (thread_precedence_policy_data_t) / sizeof (integer_t)))
-
-/*
- * THREAD_AFFINITY_POLICY:
- *
- * This policy is experimental.
- * This may be used to express affinity relationships 
- * between threads in the task. Threads with the same affinity tag will
- * be scheduled to share an L2 cache if possible. That is, affinity tags
- * are a hint to the scheduler for thread placement. 
- *
- * The namespace of affinity tags is generally local to one task. However,
- * a child task created after the assignment of affinity tags by its parent
- * will share that namespace. In particular, a family of forked processes
- * may be created with a shared affinity namespace.
- *
- * Parameters:
- * tag: The affinity set identifier.
- */
-
-#define THREAD_AFFINITY_POLICY		4
-
-struct thread_affinity_policy {
-	integer_t	affinity_tag;
-};
-
-#define THREAD_AFFINITY_TAG_NULL		0
-
-typedef struct thread_affinity_policy		thread_affinity_policy_data_t;
-typedef struct thread_affinity_policy		*thread_affinity_policy_t;
-
-#define THREAD_AFFINITY_POLICY_COUNT	((mach_msg_type_number_t) \
-	(sizeof (thread_affinity_policy_data_t) / sizeof (integer_t)))
-
-#endif	/* _MACH_THREAD_POLICY_H_ */
diff --git a/i386/include/mach/thread_special_ports.h b/i386/include/mach/thread_special_ports.h
deleted file mode 100644
index 1d44c02..0000000
--- a/i386/include/mach/thread_special_ports.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/thread_special_ports.h
- *
- *	Defines codes for special_purpose thread ports.  These are NOT
- *	port identifiers - they are only used for the thread_get_special_port
- *	and thread_set_special_port routines.
- *	
- */
-
-#ifndef	_MACH_THREAD_SPECIAL_PORTS_H_
-#define _MACH_THREAD_SPECIAL_PORTS_H_
-
-#define THREAD_KERNEL_PORT	1	/* Represents the thread to the outside
-					   world.*/
-
-/*
- *	Definitions for ease of use
- */
-
-#define thread_get_kernel_port(thread, port)	\
-		(thread_get_special_port((thread), THREAD_KERNEL_PORT, (port)))
-
-#define thread_set_kernel_port(thread, port)	\
-		(thread_set_special_port((thread), THREAD_KERNEL_PORT, (port)))
-
-#endif	/* _MACH_THREAD_SPECIAL_PORTS_H_ */
diff --git a/i386/include/mach/thread_status.h b/i386/include/mach/thread_status.h
deleted file mode 100644
index aead09b..0000000
--- a/i386/include/mach/thread_status.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/*
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/thread_status.h
- *	Author:	Avadis Tevanian, Jr.
- *
- *	This file contains the structure definitions for the user-visible
- *	thread state.  This thread state is examined with the thread_get_state
- *	kernel call and may be changed with the thread_set_state kernel call.
- *
- */
-
-#ifndef	_MACH_THREAD_STATUS_H_
-#define	_MACH_THREAD_STATUS_H_
-
-/*
- *	The actual structure that comprises the thread state is defined
- *	in the machine dependent module.
- */
-#include <mach/machine/vm_types.h>
-#include <mach/machine/thread_status.h>
-#include <mach/machine/thread_state.h>
-
-/*
- *	Generic definition for machine-dependent thread status.
- */
-
-typedef	natural_t	*thread_state_t;	/* Variable-length array */
-
-/* THREAD_STATE_MAX is now defined in <mach/machine/thread_state.h> */
-typedef	natural_t	thread_state_data_t[THREAD_STATE_MAX];
-
-#define	THREAD_STATE_FLAVOR_LIST	0	/* List of valid flavors */
-#define THREAD_STATE_FLAVOR_LIST_NEW	128
-
-typedef	int			thread_state_flavor_t;
-typedef thread_state_flavor_t	*thread_state_flavor_array_t;
-
-#endif	/* _MACH_THREAD_STATUS_H_ */
diff --git a/i386/include/mach/thread_switch.h b/i386/include/mach/thread_switch.h
deleted file mode 100644
index f555894..0000000
--- a/i386/include/mach/thread_switch.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-
-#ifndef	_MACH_THREAD_SWITCH_H_
-#define	_MACH_THREAD_SWITCH_H_
-
-#include <mach/mach_types.h>
-#include <mach/kern_return.h>
-#include <mach/message.h>
-#include <mach/mach_traps.h>
-
-/*
- *	Constant definitions for thread_switch trap.
- */
-
-#define	SWITCH_OPTION_NONE			0
-#define SWITCH_OPTION_DEPRESS		1
-#define SWITCH_OPTION_WAIT			2
-
-#define valid_switch_option(opt)	(0 <= (opt) && (opt) <= 2)
-
-#endif	/* _MACH_THREAD_SWITCH_H_ */
diff --git a/i386/include/mach/time_value.h b/i386/include/mach/time_value.h
deleted file mode 100644
index e4f912d..0000000
--- a/i386/include/mach/time_value.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-#ifndef	_MACH_TIME_VALUE_H_
-#define	_MACH_TIME_VALUE_H_
-
-#include <mach/machine/vm_types.h>
-
-/*
- *	Time value returned by kernel.
- */
-
-struct time_value {
-	integer_t seconds;
-	integer_t microseconds;
-};
-
-typedef	struct time_value	time_value_t;
-
-/*
- *	Macros to manipulate time values.  Assume that time values
- *	are normalized (microseconds <= 999999).
- */
-#define	TIME_MICROS_MAX	(1000000)
-
-#define	time_value_add_usec(val, micros)	{	\
-	if (((val)->microseconds += (micros))		\
-		>= TIME_MICROS_MAX) {			\
-	    (val)->microseconds -= TIME_MICROS_MAX;	\
-	    (val)->seconds++;				\
-	}						\
-}
-
-#define	time_value_add(result, addend)		{		\
-	(result)->microseconds += (addend)->microseconds;	\
-	(result)->seconds += (addend)->seconds;			\
-	if ((result)->microseconds >= TIME_MICROS_MAX) {	\
-	    (result)->microseconds -= TIME_MICROS_MAX;		\
-	    (result)->seconds++;				\
-	}							\
-}
-
-#endif	/* _MACH_TIME_VALUE_H_ */
diff --git a/i386/include/mach/vm_attributes.h b/i386/include/mach/vm_attributes.h
deleted file mode 100644
index 2be3233..0000000
--- a/i386/include/mach/vm_attributes.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/vm_attributes.h
- *	Author:	Alessandro Forin
- *
- *	Virtual memory attributes definitions.
- *
- *	These definitions are in addition to the machine-independent
- *	ones (e.g. protection), and are only selectively supported
- *	on specific machine architectures.
- *
- */
-
-#ifndef	_MACH_VM_ATTRIBUTES_H_
-#define	_MACH_VM_ATTRIBUTES_H_
-
-/*
- *	Types of machine-dependent attributes
- */
-typedef unsigned int	vm_machine_attribute_t;
-
-#define	MATTR_CACHE		1	/* cachability */
-#define MATTR_MIGRATE		2	/* migrability */
-#define	MATTR_REPLICATE		4	/* replicability */
-
-/*
- *	Values for the above, e.g. operations on attribute
- */
-typedef int		vm_machine_attribute_val_t;
-
-#define MATTR_VAL_OFF		0	/* (generic) turn attribute off */
-#define MATTR_VAL_ON		1	/* (generic) turn attribute on */
-#define MATTR_VAL_GET		2	/* (generic) return current value */
-
-#define MATTR_VAL_CACHE_FLUSH	6	/* flush from all caches */
-#define MATTR_VAL_DCACHE_FLUSH	7	/* flush from data caches */
-#define MATTR_VAL_ICACHE_FLUSH	8	/* flush from instruction caches */
-#define MATTR_VAL_CACHE_SYNC	9	/* sync I+D caches */
-#define MATTR_VAL_CACHE_SYNC	9	/* sync I+D caches */
-
-#define MATTR_VAL_GET_INFO	10	/* get page info (stats) */
-
-#endif	/* _MACH_VM_ATTRIBUTES_H_ */
diff --git a/i386/include/mach/vm_behavior.h b/i386/include/mach/vm_behavior.h
deleted file mode 100644
index ec0ee72..0000000
--- a/i386/include/mach/vm_behavior.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/*
- *	File:	mach/vm_behavior.h
- *
- *	Virtual memory map behavior definitions.
- *
- */
-
-#ifndef	_MACH_VM_BEHAVIOR_H_
-#define _MACH_VM_BEHAVIOR_H_
-
-/*
- *	Types defined:
- *
- *	vm_behavior_t	behavior codes.
- */
-
-typedef int		vm_behavior_t;
-
-/*
- *	Enumeration of valid values for vm_behavior_t.
- *	These describe expected page reference behavior for 
- *	for a given range of virtual memory.  For implementation 
- *	details see vm/vm_fault.c
- */
-
-
-/*
- * The following behaviors affect the memory region's future behavior
- * and are stored in the VM map entry data structure.
- */
-#define VM_BEHAVIOR_DEFAULT	((vm_behavior_t) 0)	/* default */
-#define VM_BEHAVIOR_RANDOM	((vm_behavior_t) 1)	/* random */
-#define VM_BEHAVIOR_SEQUENTIAL	((vm_behavior_t) 2)	/* forward sequential */
-#define VM_BEHAVIOR_RSEQNTL	((vm_behavior_t) 3)	/* reverse sequential */
-
-/*
- * The following "behaviors" affect the memory region only at the time of the
- * call and are not stored in the VM map entry.
- */
-#define VM_BEHAVIOR_WILLNEED	((vm_behavior_t) 4)	/* will need in near future */
-#define VM_BEHAVIOR_DONTNEED	((vm_behavior_t) 5)	/* dont need in near future */
-#define VM_BEHAVIOR_FREE	((vm_behavior_t) 6)	/* free memory without write-back */
-#define VM_BEHAVIOR_ZERO_WIRED_PAGES	((vm_behavior_t) 7)	/* zero out the wired pages of an entry if it is being deleted without unwiring them first */
-#define VM_BEHAVIOR_REUSABLE	((vm_behavior_t) 8)
-#define VM_BEHAVIOR_REUSE	((vm_behavior_t) 9)
-#define VM_BEHAVIOR_CAN_REUSE	((vm_behavior_t) 10)
-
-#endif	/*_MACH_VM_BEHAVIOR_H_*/
diff --git a/i386/include/mach/vm_inherit.h b/i386/include/mach/vm_inherit.h
deleted file mode 100644
index d6440e4..0000000
--- a/i386/include/mach/vm_inherit.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/vm_inherit.h
- *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
- *
- *	Virtual memory map inheritance definitions.
- *
- */
-
-#ifndef	_MACH_VM_INHERIT_H_
-#define	_MACH_VM_INHERIT_H_
-
-/*
- *	Types defined:
- *
- *	vm_inherit_t	inheritance codes.
- */
-
-typedef unsigned int		vm_inherit_t;	/* might want to change this */
-
-/*
- *	Enumeration of valid values for vm_inherit_t.
- */
-
-#define	VM_INHERIT_SHARE	((vm_inherit_t) 0)	/* share with child */
-#define	VM_INHERIT_COPY		((vm_inherit_t) 1)	/* copy into child */
-#define VM_INHERIT_NONE		((vm_inherit_t) 2)	/* absent from child */
-#define	VM_INHERIT_DONATE_COPY	((vm_inherit_t) 3)	/* copy and delete */
-
-#define VM_INHERIT_DEFAULT	VM_INHERIT_COPY
-#define VM_INHERIT_LAST_VALID VM_INHERIT_NONE
-
-#endif	/* _MACH_VM_INHERIT_H_ */
diff --git a/i386/include/mach/vm_map.defs b/i386/include/mach/vm_map.defs
deleted file mode 100644
index 439c014..0000000
--- a/i386/include/mach/vm_map.defs
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_FREE_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/vm_map.defs
- *
- *	Exported (native-sized) kernel VM calls.
- */
-
-subsystem
-#if	KERNEL_SERVER
-	  KernelServer
-#endif	/* KERNEL_SERVER */
-	  vm_map 3800;
-
-#include <mach/std_types.defs>
-#include <mach/mach_types.defs>
-#include <mach_debug/mach_debug_types.defs>
-
-/*
- *      Returns information about the contents of the virtual
- *      address space of the target task at the specified
- *      address.  The returned protection, inheritance, sharing
- *      and memory object values apply to the entire range described
- *      by the address range returned; the memory object offset
- *      corresponds to the beginning of the address range.
- *      [If the specified address is not allocated, the next
- *      highest address range is described.  If no addresses beyond
- *      the one specified are allocated, the call returns KERN_NO_SPACE.]
- */
-routine vm_region(
-                target_task     : vm_map_t;
-	inout	address		: vm_address_t;
-        out     size            : vm_size_t;
-		flavor		: vm_region_flavor_t;
-	out	info		: vm_region_info_t, CountInOut;
-        out     object_name     : memory_object_name_t =
-                                        MACH_MSG_TYPE_MOVE_SEND
-                                        ctype: mach_port_t);
-
-/*
- *	Allocate zero-filled memory in the address space
- *	of the target task, either at the specified address,
- *	or wherever space can be found (if anywhere is TRUE),
- *	of the specified size.  The address at which the
- *	allocation actually took place is returned.
- */
-routine vm_allocate(
-		target_task	: vm_task_entry_t;
-	inout	address		: vm_address_t;
-		size		: vm_size_t;
-		flags		: int);
-
-/*
- *	Deallocate the specified range from the virtual
- *	address space of the target task.
- */
-routine vm_deallocate(
-		target_task	: vm_task_entry_t;
-		address		: vm_address_t;
-		size		: vm_size_t);
-
-/*
- *	Set the current or maximum protection attribute
- *	for the specified range of the virtual address
- *	space of the target task.  The current protection
- *	limits the memory access rights of threads within
- *	the task; the maximum protection limits the accesses
- *	that may be given in the current protection.
- *	Protections are specified as a set of {read, write, execute}
- *	*permissions*.
- */
-routine vm_protect(
-		target_task	: vm_task_entry_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		set_maximum	: boolean_t;
-		new_protection	: vm_prot_t);
-
-/*
- *	Set the inheritance attribute for the specified range
- *	of the virtual address space of the target task.
- *	The inheritance value is one of {none, copy, share}, and
- *	specifies how the child address space should acquire
- *	this memory at the time of a task_create call.
- */
-routine vm_inherit(
-		target_task	: vm_task_entry_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		new_inheritance	: vm_inherit_t);
-
-/*
- *	Returns the contents of the specified range of the
- *	virtual address space of the target task.  [The
- *	range must be aligned on a virtual page boundary,
- *	and must be a multiple of pages in extent.  The
- *	protection on the specified range must permit reading.]
- */
-routine vm_read(
-		target_task	: vm_map_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-	out	data		: pointer_t);
-
-/* 
- * List corrollary to vm_read, returns mapped contents of specified
- * ranges within target address space.
- */
-routine vm_read_list(
-		target_task 	: vm_map_t;
-	inout	data_list   	: vm_read_entry_t;
-		count		: natural_t);
-
-/*
- *	Writes the contents of the specified range of the
- *	virtual address space of the target task.  [The
- *	range must be aligned on a virtual page boundary,
- *	and must be a multiple of pages in extent.  The
- *	protection on the specified range must permit writing.]
- */
-routine vm_write(
-		target_task	: vm_map_t;
-		address		: vm_address_t;
-		data		: pointer_t);
-
-/*
- *	Copy the contents of the source range of the virtual
- *	address space of the target task to the destination
- *	range in that same address space.  [Both of the
- *	ranges must be aligned on a virtual page boundary,
- *	and must be multiples of pages in extent.  The
- *	protection on the source range must permit reading,
- *	and the protection on the destination range must
- *	permit writing.]
- */
-routine vm_copy(
-		target_task	: vm_map_t;
-		source_address	: vm_address_t;
-		size		: vm_size_t;
-		dest_address	: vm_address_t);
-
-/*
- *	Returns the contents of the specified range of the
- *	virtual address space of the target task.  [There
- *	are no alignment restrictions, and the results will
- *      overwrite the area pointed to by data - which must
- *      already exist. The protection on the specified range
- *	must permit reading.]
- */
-routine vm_read_overwrite(
-		target_task	: vm_map_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		data		: vm_address_t;
-	out	outsize		: vm_size_t);
-
-
-routine vm_msync(
-		target_task	: vm_map_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		sync_flags	: vm_sync_t );
-
-/*
- *	Set the paging behavior attribute for the specified range
- *	of the virtual address space of the target task.
- *	The behavior value is one of {default, random, forward 
- *	sequential, reverse sequential} and indicates the expected
- *	page reference pattern for the specified range.
- */
-routine vm_behavior_set(
-		target_task	: vm_map_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		new_behavior	: vm_behavior_t);
-
-
-/*
- *	Map a user-defined memory object into the virtual address
- *	space of the target task.  If desired (anywhere is TRUE),
- *	the kernel will find a suitable address range of the
- *	specified size; else, the specific address will be allocated.
- *
- *	The beginning address of the range will be aligned on a virtual
- *	page boundary, be at or beyond the address specified, and
- *	meet the mask requirements (bits turned on in the mask must not
- *	be turned on in the result); the size of the range, in bytes,
- *	will be rounded	up to an integral number of virtual pages.
- *
- *	The memory in the resulting range will be associated with the
- *	specified memory object, with the beginning of the memory range
- *	referring to the specified offset into the memory object.
- *
- *	The mapping will take the current and maximum protections and
- *	the inheritance attributes specified; see the vm_protect and
- *	vm_inherit calls for a description of these attributes.
- *
- *	If desired (copy is TRUE), the memory range will be filled
- *	with a copy of the data from the memory object; this copy will
- *	be private to this mapping in this target task.  Otherwise,
- *	the memory in this mapping will be shared with other mappings
- *	of the same memory object at the same offset (in this task or
- *	in other tasks).  [The Mach kernel only enforces shared memory
- *	consistency among mappings on one host with similar page alignments.
- *	The user-defined memory manager for this object is responsible
- *	for further consistency.]
- */
-routine vm_map(
-		target_task	: vm_task_entry_t;
-	inout	address		: vm_address_t;
-		size		: vm_size_t;
-		mask		: vm_address_t;
-		flags		: int;
-		object		: mem_entry_name_port_t;
-		offset		: vm_offset_t;
-		copy		: boolean_t;
-		cur_protection	: vm_prot_t;
-		max_protection	: vm_prot_t;
-		inheritance	: vm_inherit_t);
-
-/*
- *	Set/Get special properties of memory associated
- *	to some virtual address range, such as cachability, 
- *	migrability, replicability.  Machine-dependent.
- */
-routine vm_machine_attribute(
-		target_task	: vm_map_t;
-		address		: vm_address_t;
-		size		: vm_size_t;
-		attribute	: vm_machine_attribute_t;
-	inout	value		: vm_machine_attribute_val_t);
-
-/*
- *      Map portion of a task's address space.
- */
-routine vm_remap(
-		target_task	: vm_map_t;
-	inout	target_address	: vm_address_t;
-		size		: vm_size_t;
-		mask		: vm_address_t;
-		anywhere	: boolean_t;
-		src_task	: vm_map_t;
-		src_address	: vm_address_t;
-		copy		: boolean_t;
-	out	cur_protection	: vm_prot_t;
-	out	max_protection	: vm_prot_t;
-		inheritance	: vm_inherit_t);
-
-/*
- *	Require that all future virtual memory allocation
- *	allocates wired memory.  Setting must_wire to FALSE
- *	disables the wired future feature.
- */
-routine task_wire(
-		target_task	: vm_map_t;
-		must_wire	: boolean_t);
-
-	
-/*
- *	Allow application level processes to create named entries which
- *	correspond to mapped portions of their address space.  These named
- *	entries can then be manipulated, shared with other processes in
- *	other address spaces and ultimately mapped in ohter address spaces
- */
-
-routine mach_make_memory_entry(
-		target_task	:vm_map_t;
-	inout	size		:vm_size_t;
-		offset		:vm_offset_t;
-		permission	:vm_prot_t;
-	out	object_handle	:mem_entry_name_port_move_send_t;
-		parent_entry	:mem_entry_name_port_t);
-
-/*
- *      Give the caller information on the given location in a virtual
- *      address space.  If a page is mapped return ref and dirty info.
- */
-routine vm_map_page_query(
-                target_map      :vm_map_t;
-                offset          :vm_offset_t;
-        out     disposition     :integer_t;
-        out     ref_count       :integer_t);
-
-/*
- *	Returns information about a region of memory.
- *	Includes info about the chain of objects rooted at that region.
- *      Only available in MACH_VM_DEBUG compiled kernels,
- *      otherwise returns KERN_FAILURE.
- */
-routine mach_vm_region_info(
-		task		: vm_map_t;
-		address		: vm_address_t;
-	out	region		: vm_info_region_t;
-	out	objects		: vm_info_object_array_t);
-
-routine	vm_mapped_pages_info(
-		task		: vm_map_t;
-	out	pages		: page_address_array_t);
-
-#if 0
-/*
- *    Allow application level processes to create named entries which
- *    are backed by sub-maps which describe regions of address space.
- *    These regions of space can have objects mapped into them and
- *    in turn, can be mapped into target address spaces 
- */
-
-routine	vm_region_object_create(
-		target_task	:vm_map_t;
-	in	size		:vm_size_t;
-	out	region_object	:mach_port_move_send_t);
-#else
-skip; /* was vm_region_object_create */
-#endif
-
-/*
- *	A recursive form of vm_region which probes submaps withint the
- *	address space.
- */
-routine vm_region_recurse(
-                target_task     : vm_map_t;
-	inout	address		: vm_address_t;
-        out     size            : vm_size_t;
-	inout	nesting_depth	: natural_t;
-	out	info		: vm_region_recurse_info_t,CountInOut);
-
-
-/* 
- *	The routines below are temporary, meant for transitional use
- *	as their counterparts are moved from 32 to 64 bit data path
- */
-
-
-routine vm_region_recurse_64(
-                target_task     : vm_map_t;
-	inout	address		: vm_address_t;
-        out     size            : vm_size_t;
-	inout	nesting_depth	: natural_t;
-	out	info		: vm_region_recurse_info_t,CountInOut);
-
-routine mach_vm_region_info_64(
-		task		: vm_map_t;
-		address		: vm_address_t;
-	out	region		: vm_info_region_64_t;
-	out	objects		: vm_info_object_array_t);
-
-routine vm_region_64(
-                target_task     : vm_map_t;
-	inout	address		: vm_address_t;
-        out     size            : vm_size_t;
-		flavor		: vm_region_flavor_t;
-	out	info		: vm_region_info_t, CountInOut;
-        out     object_name     : memory_object_name_t =
-                                        MACH_MSG_TYPE_MOVE_SEND
-                                        ctype: mach_port_t);
-
-routine mach_make_memory_entry_64(
-		target_task	:vm_map_t;
-	inout	size		:memory_object_size_t;
-		offset		:memory_object_offset_t;
-		permission	:vm_prot_t;
-	out	object_handle	:mach_port_move_send_t;
-		parent_entry	:mem_entry_name_port_t);
-
-
-
-routine vm_map_64(
-		target_task	: vm_task_entry_t;
-	inout	address		: vm_address_t;
-		size		: vm_size_t;
-		mask		: vm_address_t;
-		flags		: int;
-		object		: mem_entry_name_port_t;
-		offset		: memory_object_offset_t;
-		copy		: boolean_t;
-		cur_protection	: vm_prot_t;
-		max_protection	: vm_prot_t;
-		inheritance	: vm_inherit_t);
-
-#if 0
-/*
- * The UPL interfaces are not ready for user-level export.
- */
-routine vm_map_get_upl(
-		target_task	: vm_map_t;
-		address		: vm_map_offset_t;
-	inout	size		: vm_size_t;
-	out	upl		: upl_t;
-	out	page_info	: upl_page_info_array_t, CountInOut;
-	inout	flags		: integer_t;
-		force_data_sync	: integer_t);
-
-routine vm_upl_map(
-		target_task	: vm_map_t;
-		upl		: upl_t;
-	inout	address		: vm_address_t);
-
-routine vm_upl_unmap(
-		target_task	: vm_map_t;
-		upl		: upl_t);
-#else
-skip; /* was vm_map_get_upl */
-skip; /* was vm_upl_map */
-skip; /* was vm_upl_unmap */
-#endif		
-
-/*
- *	Control behavior and investigate state of a "purgable" object in
- *	the virtual address space of the target task.  A purgable object is
- *	created via a call to vm_allocate() with VM_FLAGS_PURGABLE
- *	specified.  See the routine implementation for a complete
- *	definition of the routine.
- */
-routine vm_purgable_control(
-		target_task	: vm_map_t;
-		address		: vm_address_t;
-		control		: vm_purgable_t;
-	inout	state		: int);
-
-/* vim: set ft=c : */
diff --git a/i386/include/mach/vm_map.h b/i386/include/mach/vm_map.h
deleted file mode 100644
index 1ed28fb..0000000
--- a/i386/include/mach/vm_map.h
+++ /dev/null
@@ -1,1378 +0,0 @@
-#ifndef	_vm_map_user_
-#define	_vm_map_user_
-
-/* Module vm_map */
-
-#include <string.h>
-#include <mach/ndr.h>
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/notify.h>
-#include <mach/mach_types.h>
-#include <mach/message.h>
-#include <mach/mig_errors.h>
-#include <mach/port.h>
-
-#ifdef AUTOTEST
-#ifndef FUNCTION_PTR_T
-#define FUNCTION_PTR_T
-typedef void (*function_ptr_t)(mach_port_t, char *, mach_msg_type_number_t);
-typedef struct {
-        char            *name;
-        function_ptr_t  function;
-} function_table_entry;
-typedef function_table_entry   *function_table_t;
-#endif /* FUNCTION_PTR_T */
-#endif /* AUTOTEST */
-
-#ifndef	vm_map_MSG_COUNT
-#define	vm_map_MSG_COUNT	31
-#endif	/* vm_map_MSG_COUNT */
-
-#include <mach/std_types.h>
-#include <mach/mig.h>
-#include <mach/mach_types.h>
-#include <mach_debug/mach_debug_types.h>
-
-#ifdef __BeforeMigUserHeader
-__BeforeMigUserHeader
-#endif /* __BeforeMigUserHeader */
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-
-
-/* Routine vm_region */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_region
-(
-	vm_map_t target_task,
-	vm_address_t *address,
-	vm_size_t *size,
-	vm_region_flavor_t flavor,
-	vm_region_info_t info,
-	mach_msg_type_number_t *infoCnt,
-	mach_port_t *object_name
-);
-
-/* Routine vm_allocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_allocate
-(
-	vm_map_t target_task,
-	vm_address_t *address,
-	vm_size_t size,
-	int flags
-);
-
-/* Routine vm_deallocate */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_deallocate
-(
-	vm_map_t target_task,
-	vm_address_t address,
-	vm_size_t size
-);
-
-/* Routine vm_protect */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_protect
-(
-	vm_map_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	boolean_t set_maximum,
-	vm_prot_t new_protection
-);
-
-/* Routine vm_inherit */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_inherit
-(
-	vm_map_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_inherit_t new_inheritance
-);
-
-/* Routine vm_read */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_read
-(
-	vm_map_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_offset_t *data,
-	mach_msg_type_number_t *dataCnt
-);
-
-/* Routine vm_read_list */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_read_list
-(
-	vm_map_t target_task,
-	vm_read_entry_t data_list,
-	natural_t count
-);
-
-/* Routine vm_write */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_write
-(
-	vm_map_t target_task,
-	vm_address_t address,
-	vm_offset_t data,
-	mach_msg_type_number_t dataCnt
-);
-
-/* Routine vm_copy */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_copy
-(
-	vm_map_t target_task,
-	vm_address_t source_address,
-	vm_size_t size,
-	vm_address_t dest_address
-);
-
-/* Routine vm_read_overwrite */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_read_overwrite
-(
-	vm_map_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_address_t data,
-	vm_size_t *outsize
-);
-
-/* Routine vm_msync */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_msync
-(
-	vm_map_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_sync_t sync_flags
-);
-
-/* Routine vm_behavior_set */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_behavior_set
-(
-	vm_map_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_behavior_t new_behavior
-);
-
-/* Routine vm_map */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_map
-(
-	vm_map_t target_task,
-	vm_address_t *address,
-	vm_size_t size,
-	vm_address_t mask,
-	int flags,
-	mem_entry_name_port_t object,
-	vm_offset_t offset,
-	boolean_t copy,
-	vm_prot_t cur_protection,
-	vm_prot_t max_protection,
-	vm_inherit_t inheritance
-);
-
-/* Routine vm_machine_attribute */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_machine_attribute
-(
-	vm_map_t target_task,
-	vm_address_t address,
-	vm_size_t size,
-	vm_machine_attribute_t attribute,
-	vm_machine_attribute_val_t *value
-);
-
-/* Routine vm_remap */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_remap
-(
-	vm_map_t target_task,
-	vm_address_t *target_address,
-	vm_size_t size,
-	vm_address_t mask,
-	boolean_t anywhere,
-	vm_map_t src_task,
-	vm_address_t src_address,
-	boolean_t copy,
-	vm_prot_t *cur_protection,
-	vm_prot_t *max_protection,
-	vm_inherit_t inheritance
-);
-
-/* Routine task_wire */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t task_wire
-(
-	vm_map_t target_task,
-	boolean_t must_wire
-);
-
-/* Routine mach_make_memory_entry */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_make_memory_entry
-(
-	vm_map_t target_task,
-	vm_size_t *size,
-	vm_offset_t offset,
-	vm_prot_t permission,
-	mem_entry_name_port_t *object_handle,
-	mem_entry_name_port_t parent_entry
-);
-
-/* Routine vm_map_page_query */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_map_page_query
-(
-	vm_map_t target_map,
-	vm_offset_t offset,
-	integer_t *disposition,
-	integer_t *ref_count
-);
-
-/* Routine mach_vm_region_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_region_info
-(
-	vm_map_t task,
-	vm_address_t address,
-	vm_info_region_t *region,
-	vm_info_object_array_t *objects,
-	mach_msg_type_number_t *objectsCnt
-);
-
-/* Routine vm_mapped_pages_info */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_mapped_pages_info
-(
-	vm_map_t task,
-	page_address_array_t *pages,
-	mach_msg_type_number_t *pagesCnt
-);
-
-/* Routine vm_region_recurse */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_region_recurse
-(
-	vm_map_t target_task,
-	vm_address_t *address,
-	vm_size_t *size,
-	natural_t *nesting_depth,
-	vm_region_recurse_info_t info,
-	mach_msg_type_number_t *infoCnt
-);
-
-/* Routine vm_region_recurse_64 */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_region_recurse_64
-(
-	vm_map_t target_task,
-	vm_address_t *address,
-	vm_size_t *size,
-	natural_t *nesting_depth,
-	vm_region_recurse_info_t info,
-	mach_msg_type_number_t *infoCnt
-);
-
-/* Routine mach_vm_region_info_64 */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_vm_region_info_64
-(
-	vm_map_t task,
-	vm_address_t address,
-	vm_info_region_64_t *region,
-	vm_info_object_array_t *objects,
-	mach_msg_type_number_t *objectsCnt
-);
-
-/* Routine vm_region_64 */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_region_64
-(
-	vm_map_t target_task,
-	vm_address_t *address,
-	vm_size_t *size,
-	vm_region_flavor_t flavor,
-	vm_region_info_t info,
-	mach_msg_type_number_t *infoCnt,
-	mach_port_t *object_name
-);
-
-/* Routine mach_make_memory_entry_64 */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t mach_make_memory_entry_64
-(
-	vm_map_t target_task,
-	memory_object_size_t *size,
-	memory_object_offset_t offset,
-	vm_prot_t permission,
-	mach_port_t *object_handle,
-	mem_entry_name_port_t parent_entry
-);
-
-/* Routine vm_map_64 */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_map_64
-(
-	vm_map_t target_task,
-	vm_address_t *address,
-	vm_size_t size,
-	vm_address_t mask,
-	int flags,
-	mem_entry_name_port_t object,
-	memory_object_offset_t offset,
-	boolean_t copy,
-	vm_prot_t cur_protection,
-	vm_prot_t max_protection,
-	vm_inherit_t inheritance
-);
-
-/* Routine vm_purgable_control */
-#ifdef	mig_external
-mig_external
-#else
-extern
-#endif	/* mig_external */
-kern_return_t vm_purgable_control
-(
-	vm_map_t target_task,
-	vm_address_t address,
-	vm_purgable_t control,
-	int *state
-);
-
-__END_DECLS
-
-/********************** Caution **************************/
-/* The following data types should be used to calculate  */
-/* maximum message sizes only. The actual message may be */
-/* smaller, and the position of the arguments within the */
-/* message layout may vary from what is presented here.  */
-/* For example, if any of the arguments are variable-    */
-/* sized, and less than the maximum is sent, the data    */
-/* will be packed tight in the actual message to reduce  */
-/* the presence of holes.                                */
-/********************** Caution **************************/
-
-/* typedefs for all requests */
-
-#ifndef __Request__vm_map_subsystem__defined
-#define __Request__vm_map_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_region_flavor_t flavor;
-		mach_msg_type_number_t infoCnt;
-	} __Request__vm_region_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		int flags;
-	} __Request__vm_allocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-	} __Request__vm_deallocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		boolean_t set_maximum;
-		vm_prot_t new_protection;
-	} __Request__vm_protect_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		vm_inherit_t new_inheritance;
-	} __Request__vm_inherit_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-	} __Request__vm_read_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_read_entry_t data_list;
-		natural_t count;
-	} __Request__vm_read_list_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t data;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_address_t address;
-		mach_msg_type_number_t dataCnt;
-	} __Request__vm_write_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t source_address;
-		vm_size_t size;
-		vm_address_t dest_address;
-	} __Request__vm_copy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		vm_address_t data;
-	} __Request__vm_read_overwrite_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		vm_sync_t sync_flags;
-	} __Request__vm_msync_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		vm_behavior_t new_behavior;
-	} __Request__vm_behavior_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t object;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		vm_address_t mask;
-		int flags;
-		vm_offset_t offset;
-		boolean_t copy;
-		vm_prot_t cur_protection;
-		vm_prot_t max_protection;
-		vm_inherit_t inheritance;
-	} __Request__vm_map_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		vm_machine_attribute_t attribute;
-		vm_machine_attribute_val_t value;
-	} __Request__vm_machine_attribute_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t src_task;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_address_t target_address;
-		vm_size_t size;
-		vm_address_t mask;
-		boolean_t anywhere;
-		vm_address_t src_address;
-		boolean_t copy;
-		vm_inherit_t inheritance;
-	} __Request__vm_remap_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		boolean_t must_wire;
-	} __Request__task_wire_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t parent_entry;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_size_t size;
-		vm_offset_t offset;
-		vm_prot_t permission;
-	} __Request__mach_make_memory_entry_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_offset_t offset;
-	} __Request__vm_map_page_query_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-	} __Request__mach_vm_region_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-	} __Request__vm_mapped_pages_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		natural_t nesting_depth;
-		mach_msg_type_number_t infoCnt;
-	} __Request__vm_region_recurse_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		natural_t nesting_depth;
-		mach_msg_type_number_t infoCnt;
-	} __Request__vm_region_recurse_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-	} __Request__mach_vm_region_info_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_region_flavor_t flavor;
-		mach_msg_type_number_t infoCnt;
-	} __Request__vm_region_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t parent_entry;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		memory_object_size_t size;
-		memory_object_offset_t offset;
-		vm_prot_t permission;
-	} __Request__mach_make_memory_entry_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t object;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		vm_address_t mask;
-		int flags;
-		memory_object_offset_t offset;
-		boolean_t copy;
-		vm_prot_t cur_protection;
-		vm_prot_t max_protection;
-		vm_inherit_t inheritance;
-	} __Request__vm_map_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_purgable_t control;
-		int state;
-	} __Request__vm_purgable_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Request__vm_map_subsystem__defined */
-
-/* union of all requests */
-
-#ifndef __RequestUnion__vm_map_subsystem__defined
-#define __RequestUnion__vm_map_subsystem__defined
-union __RequestUnion__vm_map_subsystem {
-	__Request__vm_region_t Request_vm_region;
-	__Request__vm_allocate_t Request_vm_allocate;
-	__Request__vm_deallocate_t Request_vm_deallocate;
-	__Request__vm_protect_t Request_vm_protect;
-	__Request__vm_inherit_t Request_vm_inherit;
-	__Request__vm_read_t Request_vm_read;
-	__Request__vm_read_list_t Request_vm_read_list;
-	__Request__vm_write_t Request_vm_write;
-	__Request__vm_copy_t Request_vm_copy;
-	__Request__vm_read_overwrite_t Request_vm_read_overwrite;
-	__Request__vm_msync_t Request_vm_msync;
-	__Request__vm_behavior_set_t Request_vm_behavior_set;
-	__Request__vm_map_t Request_vm_map;
-	__Request__vm_machine_attribute_t Request_vm_machine_attribute;
-	__Request__vm_remap_t Request_vm_remap;
-	__Request__task_wire_t Request_task_wire;
-	__Request__mach_make_memory_entry_t Request_mach_make_memory_entry;
-	__Request__vm_map_page_query_t Request_vm_map_page_query;
-	__Request__mach_vm_region_info_t Request_mach_vm_region_info;
-	__Request__vm_mapped_pages_info_t Request_vm_mapped_pages_info;
-	__Request__vm_region_recurse_t Request_vm_region_recurse;
-	__Request__vm_region_recurse_64_t Request_vm_region_recurse_64;
-	__Request__mach_vm_region_info_64_t Request_mach_vm_region_info_64;
-	__Request__vm_region_64_t Request_vm_region_64;
-	__Request__mach_make_memory_entry_64_t Request_mach_make_memory_entry_64;
-	__Request__vm_map_64_t Request_vm_map_64;
-	__Request__vm_purgable_control_t Request_vm_purgable_control;
-};
-#endif /* !__RequestUnion__vm_map_subsystem__defined */
-/* typedefs for all replies */
-
-#ifndef __Reply__vm_map_subsystem__defined
-#define __Reply__vm_map_subsystem__defined
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t object_name;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		mach_msg_type_number_t infoCnt;
-		int info[10];
-	} __Reply__vm_region_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_address_t address;
-	} __Reply__vm_allocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__vm_deallocate_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__vm_protect_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__vm_inherit_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t data;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t dataCnt;
-	} __Reply__vm_read_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_read_entry_t data_list;
-	} __Reply__vm_read_list_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__vm_write_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__vm_copy_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_size_t outsize;
-	} __Reply__vm_read_overwrite_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__vm_msync_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__vm_behavior_set_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_address_t address;
-	} __Reply__vm_map_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_machine_attribute_val_t value;
-	} __Reply__vm_machine_attribute_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_address_t target_address;
-		vm_prot_t cur_protection;
-		vm_prot_t max_protection;
-	} __Reply__vm_remap_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-	} __Reply__task_wire_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t object_handle;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_size_t size;
-	} __Reply__mach_make_memory_entry_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		integer_t disposition;
-		integer_t ref_count;
-	} __Reply__vm_map_page_query_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t objects;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_info_region_t region;
-		mach_msg_type_number_t objectsCnt;
-	} __Reply__mach_vm_region_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t pages;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		mach_msg_type_number_t pagesCnt;
-	} __Reply__vm_mapped_pages_info_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_address_t address;
-		vm_size_t size;
-		natural_t nesting_depth;
-		mach_msg_type_number_t infoCnt;
-		int info[19];
-	} __Reply__vm_region_recurse_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_address_t address;
-		vm_size_t size;
-		natural_t nesting_depth;
-		mach_msg_type_number_t infoCnt;
-		int info[19];
-	} __Reply__vm_region_recurse_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_ool_descriptor_t objects;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_info_region_64_t region;
-		mach_msg_type_number_t objectsCnt;
-	} __Reply__mach_vm_region_info_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t object_name;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		vm_address_t address;
-		vm_size_t size;
-		mach_msg_type_number_t infoCnt;
-		int info[10];
-	} __Reply__vm_region_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		/* start of the kernel processed data */
-		mach_msg_body_t msgh_body;
-		mach_msg_port_descriptor_t object_handle;
-		/* end of the kernel processed data */
-		NDR_record_t NDR;
-		memory_object_size_t size;
-	} __Reply__mach_make_memory_entry_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		vm_address_t address;
-	} __Reply__vm_map_64_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-
-#ifdef  __MigPackStructs
-#pragma pack(4)
-#endif
-	typedef struct {
-		mach_msg_header_t Head;
-		NDR_record_t NDR;
-		kern_return_t RetCode;
-		int state;
-	} __Reply__vm_purgable_control_t;
-#ifdef  __MigPackStructs
-#pragma pack()
-#endif
-#endif /* !__Reply__vm_map_subsystem__defined */
-
-/* union of all replies */
-
-#ifndef __ReplyUnion__vm_map_subsystem__defined
-#define __ReplyUnion__vm_map_subsystem__defined
-union __ReplyUnion__vm_map_subsystem {
-	__Reply__vm_region_t Reply_vm_region;
-	__Reply__vm_allocate_t Reply_vm_allocate;
-	__Reply__vm_deallocate_t Reply_vm_deallocate;
-	__Reply__vm_protect_t Reply_vm_protect;
-	__Reply__vm_inherit_t Reply_vm_inherit;
-	__Reply__vm_read_t Reply_vm_read;
-	__Reply__vm_read_list_t Reply_vm_read_list;
-	__Reply__vm_write_t Reply_vm_write;
-	__Reply__vm_copy_t Reply_vm_copy;
-	__Reply__vm_read_overwrite_t Reply_vm_read_overwrite;
-	__Reply__vm_msync_t Reply_vm_msync;
-	__Reply__vm_behavior_set_t Reply_vm_behavior_set;
-	__Reply__vm_map_t Reply_vm_map;
-	__Reply__vm_machine_attribute_t Reply_vm_machine_attribute;
-	__Reply__vm_remap_t Reply_vm_remap;
-	__Reply__task_wire_t Reply_task_wire;
-	__Reply__mach_make_memory_entry_t Reply_mach_make_memory_entry;
-	__Reply__vm_map_page_query_t Reply_vm_map_page_query;
-	__Reply__mach_vm_region_info_t Reply_mach_vm_region_info;
-	__Reply__vm_mapped_pages_info_t Reply_vm_mapped_pages_info;
-	__Reply__vm_region_recurse_t Reply_vm_region_recurse;
-	__Reply__vm_region_recurse_64_t Reply_vm_region_recurse_64;
-	__Reply__mach_vm_region_info_64_t Reply_mach_vm_region_info_64;
-	__Reply__vm_region_64_t Reply_vm_region_64;
-	__Reply__mach_make_memory_entry_64_t Reply_mach_make_memory_entry_64;
-	__Reply__vm_map_64_t Reply_vm_map_64;
-	__Reply__vm_purgable_control_t Reply_vm_purgable_control;
-};
-#endif /* !__RequestUnion__vm_map_subsystem__defined */
-
-#ifndef subsystem_to_name_map_vm_map
-#define subsystem_to_name_map_vm_map \
-    { "vm_region", 3800 },\
-    { "vm_allocate", 3801 },\
-    { "vm_deallocate", 3802 },\
-    { "vm_protect", 3803 },\
-    { "vm_inherit", 3804 },\
-    { "vm_read", 3805 },\
-    { "vm_read_list", 3806 },\
-    { "vm_write", 3807 },\
-    { "vm_copy", 3808 },\
-    { "vm_read_overwrite", 3809 },\
-    { "vm_msync", 3810 },\
-    { "vm_behavior_set", 3811 },\
-    { "vm_map", 3812 },\
-    { "vm_machine_attribute", 3813 },\
-    { "vm_remap", 3814 },\
-    { "task_wire", 3815 },\
-    { "mach_make_memory_entry", 3816 },\
-    { "vm_map_page_query", 3817 },\
-    { "mach_vm_region_info", 3818 },\
-    { "vm_mapped_pages_info", 3819 },\
-    { "vm_region_recurse", 3821 },\
-    { "vm_region_recurse_64", 3822 },\
-    { "mach_vm_region_info_64", 3823 },\
-    { "vm_region_64", 3824 },\
-    { "mach_make_memory_entry_64", 3825 },\
-    { "vm_map_64", 3826 },\
-    { "vm_purgable_control", 3830 }
-#endif
-
-#ifdef __AfterMigUserHeader
-__AfterMigUserHeader
-#endif /* __AfterMigUserHeader */
-
-#endif	 /* _vm_map_user_ */
diff --git a/i386/include/mach/vm_param.h b/i386/include/mach/vm_param.h
deleted file mode 100644
index 9a87873..0000000
--- a/i386/include/mach/vm_param.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/vm_param.h
- *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
- *	Date:	1985
- *
- *	Machine independent virtual memory parameters.
- *
- */
-
-#ifndef	_MACH_VM_PARAM_H_
-#define _MACH_VM_PARAM_H_
-
-#include <mach/machine/vm_param.h>
-
-
-#endif	/* _MACH_VM_PARAM_H_ */
diff --git a/i386/include/mach/vm_prot.h b/i386/include/mach/vm_prot.h
deleted file mode 100644
index 6fe17d4..0000000
--- a/i386/include/mach/vm_prot.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/vm_prot.h
- *	Author:	Avadis Tevanian, Jr., Michael Wayne Young
- *
- *	Virtual memory protection definitions.
- *
- */
-
-#ifndef	_MACH_VM_PROT_H_
-#define	_MACH_VM_PROT_H_
-
-/*
- *	Types defined:
- *
- *	vm_prot_t		VM protection values.
- */
-
-typedef int		vm_prot_t;
-
-/*
- *	Protection values, defined as bits within the vm_prot_t type
- */
-
-#define	VM_PROT_NONE	((vm_prot_t) 0x00)
-
-#define VM_PROT_READ	((vm_prot_t) 0x01)	/* read permission */
-#define VM_PROT_WRITE	((vm_prot_t) 0x02)	/* write permission */
-#define VM_PROT_EXECUTE	((vm_prot_t) 0x04)	/* execute permission */
-
-/*
- *	The default protection for newly-created virtual memory
- */
-
-#define VM_PROT_DEFAULT	(VM_PROT_READ|VM_PROT_WRITE)
-
-/*
- *	The maximum privileges possible, for parameter checking.
- */
-
-#define VM_PROT_ALL	(VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
-
-/*
- *	An invalid protection value.
- *	Used only by memory_object_lock_request to indicate no change
- *	to page locks.  Using -1 here is a bad idea because it
- *	looks like VM_PROT_ALL and then some.
- */
-
-#define VM_PROT_NO_CHANGE	((vm_prot_t) 0x08)
-
-/* 
- *      When a caller finds that he cannot obtain write permission on a
- *      mapped entry, the following flag can be used.  The entry will
- *      be made "needs copy" effectively copying the object (using COW),
- *      and write permission will be added to the maximum protections
- *      for the associated entry. 
- */        
-
-#define VM_PROT_COPY            ((vm_prot_t) 0x10)
-
-
-/*
- *	Another invalid protection value.
- *	Used only by memory_object_data_request upon an object
- *	which has specified a copy_call copy strategy. It is used
- *	when the kernel wants a page belonging to a copy of the
- *	object, and is only asking the object as a result of
- *	following a shadow chain. This solves the race between pages
- *	being pushed up by the memory manager and the kernel
- *	walking down the shadow chain.
- */
-
-#define VM_PROT_WANTS_COPY	((vm_prot_t) 0x10)
-
-
-/*
- *	The caller wants this memory region treated as if it had a valid
- *	code signature.
- */
-
-#define VM_PROT_TRUSTED		((vm_prot_t) 0x20)
-
-
-#endif	/* _MACH_VM_PROT_H_ */
diff --git a/i386/include/mach/vm_purgable.h b/i386/include/mach/vm_purgable.h
deleted file mode 100644
index 2d8ca30..0000000
--- a/i386/include/mach/vm_purgable.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2003-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-/*
- * Virtual memory map purgeable object definitions.
- * Objects that will be needed in the future (forward cached objects) should be queued LIFO. 
- * Objects that have been used and are cached for reuse (backward cached) should be queued FIFO.
- * Every user of purgeable memory is entitled to using the highest volatile group (7).
- * Only if a client wants some of its objects to definitely be purged earlier, it can put those in
- * another group. This could be used to make all FIFO objects (in the lower group) go away before 
- * any LIFO objects (in the higher group) go away.
- * Objects that should not get any chance to stay around can be marked as "obsolete". They will
- * be emptied before any other objects or pages are reclaimed. Obsolete objects are not emptied
- * in any particular order.
- * 'purgeable' is recognized as the correct spelling. For historical reasons, definitions 
- * in this file are spelled 'purgable'.
- */
-
-#ifndef	_MACH_VM_PURGABLE_H_
-#define	_MACH_VM_PURGABLE_H_
-
-/*
- *	Types defined:
- *
- *	vm_purgable_t	purgeable object control codes.
- */
-
-typedef int	vm_purgable_t;
-
-/*
- *	Enumeration of valid values for vm_purgable_t.
- */
-#define VM_PURGABLE_SET_STATE	((vm_purgable_t) 0)	/* set state of purgeable object */
-#define VM_PURGABLE_GET_STATE	((vm_purgable_t) 1)	/* get state of purgeable object */
-#define VM_PURGABLE_PURGE_ALL	((vm_purgable_t) 2)	/* purge all volatile objects now */
-
-#define VM_PURGABLE_DEBUG_SHIFT	12
-#define VM_PURGABLE_DEBUG_MASK	(0x3 << VM_PURGABLE_DEBUG_SHIFT)
-#define VM_PURGABLE_DEBUG_EMPTY	(0x1 << VM_PURGABLE_DEBUG_SHIFT)
-#define VM_PURGABLE_DEBUG_FAULT	(0x2 << VM_PURGABLE_DEBUG_SHIFT)
-
-/*
- * Volatile memory ordering groups (group zero objects are purged before group 1, etc...
- * It is implementation dependent as to whether these groups are global or per-address space.
- * (for the moment, they are global).
- */
-#define VM_VOLATILE_GROUP_SHIFT		8
-#define VM_VOLATILE_GROUP_MASK		(7 << VM_VOLATILE_GROUP_SHIFT)
-#define VM_VOLATILE_GROUP_DEFAULT   VM_VOLATILE_GROUP_7
-
-#define VM_VOLATILE_GROUP_0			(0 << VM_VOLATILE_GROUP_SHIFT)
-#define VM_VOLATILE_GROUP_1			(1 << VM_VOLATILE_GROUP_SHIFT)
-#define VM_VOLATILE_GROUP_2			(2 << VM_VOLATILE_GROUP_SHIFT)
-#define VM_VOLATILE_GROUP_3			(3 << VM_VOLATILE_GROUP_SHIFT)
-#define VM_VOLATILE_GROUP_4			(4 << VM_VOLATILE_GROUP_SHIFT)
-#define VM_VOLATILE_GROUP_5			(5 << VM_VOLATILE_GROUP_SHIFT)
-#define VM_VOLATILE_GROUP_6			(6 << VM_VOLATILE_GROUP_SHIFT)
-#define VM_VOLATILE_GROUP_7			(7 << VM_VOLATILE_GROUP_SHIFT)
-
-/*
- * Purgeable behavior
- * Within the same group, FIFO objects will be emptied before objects that are added later.
- * LIFO objects will be emptied after objects that are added later.
- * - Input only, not returned on state queries.
- */
-#define VM_PURGABLE_BEHAVIOR_SHIFT  6
-#define VM_PURGABLE_BEHAVIOR_MASK   (1 << VM_PURGABLE_BEHAVIOR_SHIFT)
-#define VM_PURGABLE_BEHAVIOR_FIFO   (0 << VM_PURGABLE_BEHAVIOR_SHIFT)
-#define VM_PURGABLE_BEHAVIOR_LIFO   (1 << VM_PURGABLE_BEHAVIOR_SHIFT)
-
-/*
- * Obsolete object.
- * Disregard volatile group, and put object into obsolete queue instead, so it is the next object
- * to be purged.
- * - Input only, not returned on state queries.
- */
-#define VM_PURGABLE_ORDERING_SHIFT		5
-#define VM_PURGABLE_ORDERING_MASK		(1 << VM_PURGABLE_ORDERING_SHIFT)
-#define VM_PURGABLE_ORDERING_OBSOLETE	(1 << VM_PURGABLE_ORDERING_SHIFT)
-#define VM_PURGABLE_ORDERING_NORMAL		(0 << VM_PURGABLE_ORDERING_SHIFT)
-
-
-/*
- * Obsolete parameter - do not use
- */
-#define VM_VOLATILE_ORDER_SHIFT			4
-#define VM_VOLATILE_ORDER_MASK			(1 << VM_VOLATILE_ORDER_SHIFT)
-#define VM_VOLATILE_MAKE_FIRST_IN_GROUP	(1 << VM_VOLATILE_ORDER_SHIFT)
-#define VM_VOLATILE_MAKE_LAST_IN_GROUP	(0 << VM_VOLATILE_ORDER_SHIFT)
-
-/*
- * Valid states of a purgeable object.
- */
-#define VM_PURGABLE_STATE_MIN	0		/* minimum purgeable object state value */
-#define VM_PURGABLE_STATE_MAX	3		/* maximum purgeable object state value */
-#define VM_PURGABLE_STATE_MASK	3		/* mask to separate state from group */
-
-#define VM_PURGABLE_NONVOLATILE	0		/* purgeable object is non-volatile */
-#define VM_PURGABLE_VOLATILE	1		/* purgeable object is volatile */
-#define VM_PURGABLE_EMPTY		2		/* purgeable object is volatile and empty */
-#define VM_PURGABLE_DENY		3		/* (mark) object not purgeable */
-
-#define VM_PURGABLE_ALL_MASKS	(VM_PURGABLE_STATE_MASK | \
-				 VM_VOLATILE_ORDER_MASK | \
-				 VM_PURGABLE_ORDERING_MASK | \
-				 VM_PURGABLE_BEHAVIOR_MASK | \
-				 VM_VOLATILE_GROUP_MASK | \
-				 VM_PURGABLE_DEBUG_MASK)
-#endif	/* _MACH_VM_PURGABLE_H_ */
diff --git a/i386/include/mach/vm_region.h b/i386/include/mach/vm_region.h
deleted file mode 100644
index ceb42b7..0000000
--- a/i386/include/mach/vm_region.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/*
- *	File:	mach/vm_region.h
- *
- *	Define the attributes of a task's memory region
- *
- */
-
-#ifndef	_MACH_VM_REGION_H_
-#define _MACH_VM_REGION_H_
-
-#include <mach/boolean.h>
-#include <mach/vm_prot.h>
-#include <mach/vm_inherit.h>
-#include <mach/vm_behavior.h>
-#include <mach/vm_types.h>
-#include <mach/message.h>
-#include <mach/machine/vm_param.h>
-#include <mach/machine/vm_types.h>
-#include <mach/memory_object_types.h>
-
-#include <sys/cdefs.h>
-
-#pragma pack(4)
-
-// LP64todo: all the current tools are 32bit, obviously never worked for 64b
-// so probably should be a real 32b ID vs. ptr.
-// Current users just check for equality
-typedef uint32_t vm32_object_id_t;
-
-/*
- *	Types defined:
- *
- *	vm_region_info_t	memory region attributes
- */
-
-#define VM_REGION_INFO_MAX      (1024)
-typedef int	*vm_region_info_t;
-typedef int	*vm_region_info_64_t;
-typedef int	*vm_region_recurse_info_t;
-typedef int	*vm_region_recurse_info_64_t;
-typedef int	 vm_region_flavor_t;
-typedef int	 vm_region_info_data_t[VM_REGION_INFO_MAX];
-
-#define VM_REGION_BASIC_INFO_64		9
-struct vm_region_basic_info_64 {
-	vm_prot_t		protection;
-	vm_prot_t		max_protection;
-	vm_inherit_t		inheritance;
-	boolean_t		shared;
-	boolean_t		reserved;
-	memory_object_offset_t	offset;
-	vm_behavior_t		behavior;
-	unsigned short		user_wired_count;
-};
-typedef struct vm_region_basic_info_64		*vm_region_basic_info_64_t;
-typedef struct vm_region_basic_info_64		 vm_region_basic_info_data_64_t;
-
-#define VM_REGION_BASIC_INFO_COUNT_64	((mach_msg_type_number_t) \
-	(sizeof(vm_region_basic_info_data_64_t)/sizeof(int)))
-
-/*
- * Passing VM_REGION_BASIC_INFO to vm_region_64
- * automatically converts it to a VM_REGION_BASIC_INFO_64.
- * Please use that explicitly instead.
- */
-#define VM_REGION_BASIC_INFO		10
-
-/*
- * This is the legacy basic info structure.  It is
- * deprecated because it passes only a 32-bit memory object
- * offset back - too small for many larger objects (e.g. files).
- */
-struct vm_region_basic_info {
-	vm_prot_t		protection;
-	vm_prot_t		max_protection;
-	vm_inherit_t		inheritance;
-	boolean_t		shared;
-	boolean_t		reserved;
-	uint32_t		offset; /* too small for a real offset */
-	vm_behavior_t		behavior;
-	unsigned short		user_wired_count;
-};
-
-typedef struct vm_region_basic_info		*vm_region_basic_info_t;
-typedef struct vm_region_basic_info		 vm_region_basic_info_data_t;
-
-#define VM_REGION_BASIC_INFO_COUNT ((mach_msg_type_number_t) \
-	(sizeof(vm_region_basic_info_data_t)/sizeof(int)))
-
-#define VM_REGION_EXTENDED_INFO	11
-
-#define SM_COW             1
-#define SM_PRIVATE         2
-#define SM_EMPTY           3
-#define SM_SHARED          4
-#define SM_TRUESHARED      5
-#define SM_PRIVATE_ALIASED 6
-#define SM_SHARED_ALIASED  7
-
-/* 
- * For submap info,  the SM flags above are overlayed when a submap
- * is encountered.  The field denotes whether or not machine level mapping
- * information is being shared.  PTE's etc.  When such sharing is taking
- * place the value returned is SM_TRUESHARED otherwise SM_PRIVATE is passed
- * back.
- */
-
-struct vm_region_extended_info {
-	vm_prot_t		protection;
-        unsigned int            user_tag;
-        unsigned int            pages_resident;
-        unsigned int            pages_shared_now_private;
-        unsigned int            pages_swapped_out;
-        unsigned int            pages_dirtied;
-        unsigned int            ref_count;
-        unsigned short          shadow_depth;
-        unsigned char           external_pager;
-        unsigned char           share_mode;
-};
-
-typedef struct vm_region_extended_info		*vm_region_extended_info_t;
-typedef struct vm_region_extended_info		 vm_region_extended_info_data_t;
-
-#define VM_REGION_EXTENDED_INFO_COUNT	((mach_msg_type_number_t) \
-	(sizeof(vm_region_extended_info_data_t)/sizeof(int)))
-
-
-#define VM_REGION_TOP_INFO	12
-
-struct vm_region_top_info {
-        unsigned int            obj_id;
-        unsigned int            ref_count;
-        unsigned int            private_pages_resident;
-        unsigned int            shared_pages_resident;
-        unsigned char           share_mode;
-};
-
-typedef struct vm_region_top_info		*vm_region_top_info_t;
-typedef struct vm_region_top_info		 vm_region_top_info_data_t;
-
-#define VM_REGION_TOP_INFO_COUNT ((mach_msg_type_number_t) \
-	(sizeof(vm_region_top_info_data_t)/sizeof(int)))
-
-
-
-/* 
- * vm_region_submap_info will return information on a submap or object.
- * The user supplies a nesting level on the call.  When a walk of the
- * user's map is done and a submap is encountered, the nesting count is
- * checked. If the nesting count is greater than 1 the submap is entered and
- * the offset relative to the address in the base map is examined.  If the
- * nesting count is zero, the information on the submap is returned.
- * The caller may thus learn about a submap and its contents by judicious
- * choice of the base map address and nesting count.  The nesting count
- * allows penetration of recursively mapped submaps.  If a submap is
- * encountered as a mapped entry of another submap, the caller may bump
- * the nesting count and call vm_region_recurse again on the target address
- * range.  The "is_submap" field tells the caller whether or not a submap
- * has been encountered.
- *
- * Object only fields are filled in through a walking of the object shadow
- * chain (where one is present), and a walking of the resident page queue.
- * 
- */
-
-struct vm_region_submap_info {
-	vm_prot_t		protection;     /* present access protection */
-	vm_prot_t		max_protection; /* max avail through vm_prot */
-	vm_inherit_t		inheritance;/* behavior of map/obj on fork */
-	uint32_t		offset;		/* offset into object/map */
-        unsigned int            user_tag;	/* user tag on map entry */
-        unsigned int            pages_resident;	/* only valid for objects */
-        unsigned int            pages_shared_now_private; /* only for objects */
-        unsigned int            pages_swapped_out; /* only for objects */
-        unsigned int            pages_dirtied;   /* only for objects */
-        unsigned int            ref_count;	 /* obj/map mappers, etc */
-        unsigned short          shadow_depth; 	/* only for obj */
-        unsigned char           external_pager;  /* only for obj */
-        unsigned char           share_mode;	/* see enumeration */
-	boolean_t		is_submap;	/* submap vs obj */
-	vm_behavior_t		behavior;	/* access behavior hint */
-	vm32_object_id_t		object_id;	/* obj/map name, not a handle */
-	unsigned short		user_wired_count; 
-};
-
-typedef struct vm_region_submap_info		*vm_region_submap_info_t;
-typedef struct vm_region_submap_info		 vm_region_submap_info_data_t;
-
-#define VM_REGION_SUBMAP_INFO_COUNT ((mach_msg_type_number_t) \
-	(sizeof(vm_region_submap_info_data_t)/sizeof(int)))
-
-struct vm_region_submap_info_64 {
-	vm_prot_t		protection;     /* present access protection */
-	vm_prot_t		max_protection; /* max avail through vm_prot */
-	vm_inherit_t		inheritance;/* behavior of map/obj on fork */
-	memory_object_offset_t	offset;		/* offset into object/map */
-        unsigned int            user_tag;	/* user tag on map entry */
-        unsigned int            pages_resident;	/* only valid for objects */
-        unsigned int            pages_shared_now_private; /* only for objects */
-        unsigned int            pages_swapped_out; /* only for objects */
-        unsigned int            pages_dirtied;   /* only for objects */
-        unsigned int            ref_count;	 /* obj/map mappers, etc */
-        unsigned short          shadow_depth; 	/* only for obj */
-        unsigned char           external_pager;  /* only for obj */
-        unsigned char           share_mode;	/* see enumeration */
-	boolean_t		is_submap;	/* submap vs obj */
-	vm_behavior_t		behavior;	/* access behavior hint */
-	vm32_object_id_t		object_id;	/* obj/map name, not a handle */
-	unsigned short		user_wired_count; 
-};
-
-typedef struct vm_region_submap_info_64		*vm_region_submap_info_64_t;
-typedef struct vm_region_submap_info_64		 vm_region_submap_info_data_64_t;
-
-#define VM_REGION_SUBMAP_INFO_COUNT_64		((mach_msg_type_number_t) \
-	(sizeof(vm_region_submap_info_data_64_t)/sizeof(int)))
-
-struct vm_region_submap_short_info_64 {
-	vm_prot_t		protection;     /* present access protection */
-	vm_prot_t		max_protection; /* max avail through vm_prot */
-	vm_inherit_t		inheritance;/* behavior of map/obj on fork */
-	memory_object_offset_t	offset;		/* offset into object/map */
-        unsigned int            user_tag;	/* user tag on map entry */
-        unsigned int            ref_count;	 /* obj/map mappers, etc */
-        unsigned short          shadow_depth; 	/* only for obj */
-        unsigned char           external_pager;  /* only for obj */
-        unsigned char           share_mode;	/* see enumeration */
-	boolean_t		is_submap;	/* submap vs obj */
-	vm_behavior_t		behavior;	/* access behavior hint */
-	vm32_object_id_t		object_id;	/* obj/map name, not a handle */
-	unsigned short		user_wired_count; 
-};
-
-typedef struct vm_region_submap_short_info_64	*vm_region_submap_short_info_64_t;
-typedef struct vm_region_submap_short_info_64	 vm_region_submap_short_info_data_64_t;
-
-#define VM_REGION_SUBMAP_SHORT_INFO_COUNT_64	((mach_msg_type_number_t) \
-	(sizeof(vm_region_submap_short_info_data_64_t)/sizeof(int)))
-
-
-struct mach_vm_read_entry {
-	mach_vm_address_t address;
-	mach_vm_size_t size;
-};
-
-struct vm_read_entry {
-	vm_address_t	address;
-	vm_size_t	size;
-};
-
-#if VM32_SUPPORT
-struct vm32_read_entry {
-	vm32_address_t	address;
-	vm32_size_t	size;
-};
-#endif
-
-
-#define VM_MAP_ENTRY_MAX  (256)
-
-typedef struct mach_vm_read_entry	mach_vm_read_entry_t[VM_MAP_ENTRY_MAX];
-typedef struct vm_read_entry		vm_read_entry_t[VM_MAP_ENTRY_MAX];
-#if VM32_SUPPORT
-typedef struct vm32_read_entry		vm32_read_entry_t[VM_MAP_ENTRY_MAX];
-#endif
-
-#pragma pack()
-
-
-#define VM_PAGE_INFO_MAX 
-typedef int *vm_page_info_t;
-typedef int vm_page_info_data_t[VM_PAGE_INFO_MAX];
-typedef int vm_page_info_flavor_t;
-
-#define VM_PAGE_INFO_BASIC		1
-struct vm_page_info_basic {
-	int			disposition;
-	int			ref_count;
-	vm_object_id_t		object_id;
-	memory_object_offset_t	offset;
-	int			depth;
-};
-typedef struct vm_page_info_basic		*vm_page_info_basic_t;
-typedef struct vm_page_info_basic		vm_page_info_basic_data_t;
-
-#define VM_PAGE_INFO_BASIC_COUNT	((mach_msg_type_number_t) \
-	(sizeof(vm_page_info_basic_data_t)/sizeof(int)))
-
-
-#endif	/*_MACH_VM_REGION_H_*/
diff --git a/i386/include/mach/vm_statistics.h b/i386/include/mach/vm_statistics.h
deleted file mode 100644
index 016a1c2..0000000
--- a/i386/include/mach/vm_statistics.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- */
-/*
- *	File:	mach/vm_statistics.h
- *	Author:	Avadis Tevanian, Jr., Michael Wayne Young, David Golub
- *
- *	Virtual memory statistics structure.
- *
- */
-
-#ifndef	_MACH_VM_STATISTICS_H_
-#define	_MACH_VM_STATISTICS_H_
-
-#include <mach/machine/vm_types.h>
-
-
-/*
- * vm_statistics
- *
- * History:
- *	rev0 - 	original structure.
- *	rev1 - 	added purgable info (purgable_count and purges).
- *	rev2 - 	added speculative_count.
- *
- * Note: you cannot add any new fields to this structure. Add them below in
- * 	 vm_statistics64.
- */
-
-struct vm_statistics {
-	natural_t	free_count;		/* # of pages free */
-	natural_t	active_count;		/* # of pages active */
-	natural_t	inactive_count;		/* # of pages inactive */
-	natural_t	wire_count;		/* # of pages wired down */
-	natural_t	zero_fill_count;	/* # of zero fill pages */
-	natural_t	reactivations;		/* # of pages reactivated */
-	natural_t	pageins;		/* # of pageins */
-	natural_t	pageouts;		/* # of pageouts */
-	natural_t	faults;			/* # of faults */
-	natural_t	cow_faults;		/* # of copy-on-writes */
-	natural_t	lookups;		/* object cache lookups */
-	natural_t	hits;			/* object cache hits */
-
-	/* added for rev1 */
-	natural_t	purgeable_count;	/* # of pages purgeable */
-	natural_t	purges;			/* # of pages purged */
-
-	/* added for rev2 */
-	/*
-	 * NB: speculative pages are already accounted for in "free_count",
-	 * so "speculative_count" is the number of "free" pages that are
-	 * used to hold data that was read speculatively from disk but
-	 * haven't actually been used by anyone so far.
-	 */
-	natural_t	speculative_count;	/* # of pages speculative */
-};
-
-/* Used by all architectures */
-typedef struct vm_statistics	*vm_statistics_t;
-typedef struct vm_statistics	vm_statistics_data_t;
-
-#if defined(__ppc__) /* On ppc, vm statistics are still 32-bit */
-
-typedef struct vm_statistics	*vm_statistics64_t;
-typedef struct vm_statistics	vm_statistics64_data_t;
-
-#define VM_STATISTICS_TRUNCATE_TO_32_BIT(value) value
-
-#else /* !(defined(__ppc__))  */
-
-/* 
- * vm_statistics64
- *
- * History:
- *	rev0 - 	original structure.
- *	rev1 - 	added purgable info (purgable_count and purges).
- *	rev2 - 	added speculative_count.
- *	   ----
- *	rev3 - 	changed name to vm_statistics64.
- *		changed some fields in structure to 64-bit on 
- *		arm, i386 and x86_64 architectures.
- *
- */
-
-struct vm_statistics64 {
-	natural_t	free_count;		/* # of pages free */
-	natural_t	active_count;		/* # of pages active */
-	natural_t	inactive_count;		/* # of pages inactive */
-	natural_t	wire_count;		/* # of pages wired down */
-	uint64_t	zero_fill_count;	/* # of zero fill pages */
-	uint64_t	reactivations;		/* # of pages reactivated */
-	uint64_t	pageins;		/* # of pageins */
-	uint64_t	pageouts;		/* # of pageouts */
-	uint64_t	faults;			/* # of faults */
-	uint64_t	cow_faults;		/* # of copy-on-writes */
-	uint64_t	lookups;		/* object cache lookups */
-	uint64_t	hits;			/* object cache hits */
-
-	/* added for rev1 */
-	uint64_t	purges;			/* # of pages purged */
-	natural_t	purgeable_count;	/* # of pages purgeable */
-
-	/* added for rev2 */
-	/*
-	 * NB: speculative pages are already accounted for in "free_count",
-	 * so "speculative_count" is the number of "free" pages that are
-	 * used to hold data that was read speculatively from disk but
-	 * haven't actually been used by anyone so far.
-	 */
-	natural_t	speculative_count;	/* # of pages speculative */
-
-}
-#ifdef __arm__
-__attribute__((aligned(8)))
-#endif
-;
-
-typedef struct vm_statistics64	*vm_statistics64_t;
-typedef struct vm_statistics64	vm_statistics64_data_t;
-
-/* 
- * VM_STATISTICS_TRUNCATE_TO_32_BIT
- *
- * This is used by host_statistics() to truncate and peg the 64-bit in-kernel values from
- * vm_statistics64 to the 32-bit values of the older structure above (vm_statistics).
- */
-#define VM_STATISTICS_TRUNCATE_TO_32_BIT(value) ((uint32_t)(((value) > UINT32_MAX ) ? UINT32_MAX : (value)))
-
-#endif /* !(defined(__ppc__)) */
-
-
-/* included for the vm_map_page_query call */
-
-#define VM_PAGE_QUERY_PAGE_PRESENT      0x1
-#define VM_PAGE_QUERY_PAGE_FICTITIOUS   0x2
-#define VM_PAGE_QUERY_PAGE_REF          0x4
-#define VM_PAGE_QUERY_PAGE_DIRTY        0x8
-#define VM_PAGE_QUERY_PAGE_PAGED_OUT    0x10
-#define VM_PAGE_QUERY_PAGE_COPIED       0x20
-#define VM_PAGE_QUERY_PAGE_SPECULATIVE	0x40
-#define VM_PAGE_QUERY_PAGE_EXTERNAL	0x80
-#define VM_PAGE_QUERY_PAGE_CS_VALIDATED	0x100
-#define VM_PAGE_QUERY_PAGE_CS_TAINTED	0x200
-
-
-/*
- * VM allocation flags:
- * 
- * VM_FLAGS_FIXED
- * 	(really the absence of VM_FLAGS_ANYWHERE)
- *	Allocate new VM region at the specified virtual address, if possible.
- * 
- * VM_FLAGS_ANYWHERE
- *	Allocate new VM region anywhere it would fit in the address space.
- *
- * VM_FLAGS_PURGABLE
- *	Create a purgable VM object for that new VM region.
- *
- * VM_FLAGS_NO_PMAP_CHECK
- *	(for DEBUG kernel config only, ignored for other configs)
- *	Do not check that there is no stale pmap mapping for the new VM region.
- *	This is useful for kernel memory allocations at bootstrap when building
- *	the initial kernel address space while some memory is already in use.
- *
- * VM_FLAGS_OVERWRITE
- *	The new VM region can replace existing VM regions if necessary
- *	(to be used in combination with VM_FLAGS_FIXED).
- *
- * VM_FLAGS_NO_CACHE
- *	Pages brought in to this VM region are placed on the speculative
- *	queue instead of the active queue.  In other words, they are not
- *	cached so that they will be stolen first if memory runs low.
- */
-#define VM_FLAGS_FIXED		0x0000
-#define VM_FLAGS_ANYWHERE	0x0001
-#define VM_FLAGS_PURGABLE	0x0002
-#define VM_FLAGS_NO_CACHE	0x0010
-
-/*
- * VM_FLAGS_SUPERPAGE_MASK
- *	3 bits that specify whether large pages should be used instead of
- *	base pages (!=0), as well as the requested page size.
- */
-#define VM_FLAGS_SUPERPAGE_MASK	0x70000	/* bits 0x10000, 0x20000, 0x40000 */
-#define VM_FLAGS_SUPERPAGE_SHIFT 16
-
-#define SUPERPAGE_NONE			0	/* no superpages, if all bits are 0 */
-#define VM_FLAGS_SUPERPAGE_NONE		(SUPERPAGE_NONE<<VM_FLAGS_SUPERPAGE_SHIFT)
-#if defined(__x86_64__) || !defined(KERNEL)
-#define SUPERPAGE_SIZE_2MB		1
-#define VM_FLAGS_SUPERPAGE_SIZE_2MB	(SUPERPAGE_SIZE_2MB<<VM_FLAGS_SUPERPAGE_SHIFT)
-#endif
-
-#define VM_FLAGS_ALIAS_MASK	0xFF000000
-#define VM_GET_FLAGS_ALIAS(flags, alias)			\
-		(alias) = ((flags) & VM_FLAGS_ALIAS_MASK) >> 24	
-#define VM_SET_FLAGS_ALIAS(flags, alias)			\
-		(flags) = (((flags) & ~VM_FLAGS_ALIAS_MASK) |	\
-		(((alias) & ~VM_FLAGS_ALIAS_MASK) << 24))
-
-/* These are the flags that we accept from user-space */
-#define VM_FLAGS_USER_ALLOCATE	(VM_FLAGS_FIXED |		\
-				 VM_FLAGS_ANYWHERE |		\
-				 VM_FLAGS_PURGABLE |		\
-				 VM_FLAGS_NO_CACHE |		\
-				 VM_FLAGS_SUPERPAGE_MASK |	\
-				 VM_FLAGS_ALIAS_MASK)
-#define VM_FLAGS_USER_MAP	VM_FLAGS_USER_ALLOCATE
-
-#define VM_MEMORY_MALLOC 1
-#define VM_MEMORY_MALLOC_SMALL 2
-#define VM_MEMORY_MALLOC_LARGE 3
-#define VM_MEMORY_MALLOC_HUGE 4
-#define VM_MEMORY_SBRK 5// uninteresting -- no one should call
-#define VM_MEMORY_REALLOC 6
-#define VM_MEMORY_MALLOC_TINY 7
-#define VM_MEMORY_MALLOC_LARGE_REUSABLE 8
-#define VM_MEMORY_MALLOC_LARGE_REUSED 9
-
-#define VM_MEMORY_ANALYSIS_TOOL 10
-
-#define VM_MEMORY_MACH_MSG 20
-#define VM_MEMORY_IOKIT	21
-#define VM_MEMORY_STACK  30
-#define VM_MEMORY_GUARD  31
-#define	VM_MEMORY_SHARED_PMAP 32
-/* memory containing a dylib */
-#define VM_MEMORY_DYLIB	33
-#define VM_MEMORY_OBJC_DISPATCHERS 34
-
-// Placeholders for now -- as we analyze the libraries and find how they
-// use memory, we can make these labels more specific.
-#define VM_MEMORY_APPKIT 40
-#define VM_MEMORY_FOUNDATION 41
-#define VM_MEMORY_COREGRAPHICS 42
-#define VM_MEMORY_CARBON 43
-#define VM_MEMORY_JAVA 44
-#define VM_MEMORY_ATS 50
-#define VM_MEMORY_LAYERKIT 51
-#define VM_MEMORY_CGIMAGE 52
-#define VM_MEMORY_TCMALLOC 53
-
-/* private raster data (i.e. layers, some images, QGL allocator) */
-#define	VM_MEMORY_COREGRAPHICS_DATA	54
-
-/* shared image and font caches */
-#define VM_MEMORY_COREGRAPHICS_SHARED	55
-
-/* Memory used for virtual framebuffers, shadowing buffers, etc... */
-#define	VM_MEMORY_COREGRAPHICS_FRAMEBUFFERS	56
-
-/* Window backing stores, custom shadow data, and compressed backing stores */
-#define VM_MEMORY_COREGRAPHICS_BACKINGSTORES	57
-
-/* catch-all for other uses, such as the read-only shared data page */
-#define VM_MEMORY_COREGRAPHICS_MISC VM_MEMORY_COREGRAPHICS
-
-/* memory allocated by the dynamic loader for itself */
-#define VM_MEMORY_DYLD 60
-/* malloc'd memory created by dyld */
-#define VM_MEMORY_DYLD_MALLOC 61
-
-/* Used for sqlite page cache */
-#define VM_MEMORY_SQLITE 62
-
-/* JavaScriptCore heaps */
-#define VM_MEMORY_JAVASCRIPT_CORE 63
-/* memory allocated for the JIT */
-#define VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR 64
-#define VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE 65
-
-/* memory allocated for GLSL */
-#define VM_MEMORY_GLSL  66
-
-/* Reserve 240-255 for application */
-#define VM_MEMORY_APPLICATION_SPECIFIC_1 240
-#define VM_MEMORY_APPLICATION_SPECIFIC_16 255
-
-#define VM_MAKE_TAG(tag) ((tag) << 24)
-
-#endif	/* _MACH_VM_STATISTICS_H_ */
diff --git a/i386/include/mach/vm_sync.h b/i386/include/mach/vm_sync.h
deleted file mode 100644
index dfb948b..0000000
--- a/i386/include/mach/vm_sync.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- */
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- *	File:	mach/vm_sync.h
- *
- *	Virtual memory synchronisation definitions.
- *
- */
-
-#ifndef _MACH_VM_SYNC_H_
-#define _MACH_VM_SYNC_H_
-
-typedef unsigned		vm_sync_t;
-
-/*
- *	Synchronization flags, defined as bits within the vm_sync_t type
- */
-
-#define	VM_SYNC_ASYNCHRONOUS	((vm_sync_t) 0x01)
-#define	VM_SYNC_SYNCHRONOUS	((vm_sync_t) 0x02)
-#define VM_SYNC_INVALIDATE	((vm_sync_t) 0x04)
-#define VM_SYNC_KILLPAGES       ((vm_sync_t) 0x08)
-#define VM_SYNC_DEACTIVATE      ((vm_sync_t) 0x10)
-#define VM_SYNC_CONTIGUOUS      ((vm_sync_t) 0x20)
-#define VM_SYNC_REUSABLEPAGES	((vm_sync_t) 0x40)
-
-#endif  /* _MACH_VM_SYNC_H_ */
diff --git a/i386/include/mach/vm_task.h b/i386/include/mach/vm_task.h
deleted file mode 100644
index d2401ac..0000000
--- a/i386/include/mach/vm_task.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
-** This file contains compatibilty wrapper header for things that are
-** generated from mach/vm_map.defs into mach/vm_map.h. 
-** 
-** This file will go away eventually - please switch.
-*/
-#include <mach/vm_map.h>
diff --git a/i386/include/mach/vm_types.h b/i386/include/mach/vm_types.h
deleted file mode 100644
index 37f4bd5..0000000
--- a/i386/include/mach/vm_types.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * @OSF_COPYRIGHT@
- * 
- */
-#ifndef	_MACH_VM_TYPES_H_
-#define _MACH_VM_TYPES_H_
-
-#include <mach/port.h>
-#include <mach/machine/vm_types.h>
-
-#include <stdint.h>
-
-typedef vm_offset_t     	pointer_t;
-typedef vm_offset_t     	vm_address_t;
-
-/*
- * We use addr64_t for 64-bit addresses that are used on both
- * 32 and 64-bit machines.  On PPC, they are passed and returned as
- * two adjacent 32-bit GPRs.  We use addr64_t in places where
- * common code must be useable both on 32 and 64-bit machines.
- */
-typedef uint64_t addr64_t;		/* Basic effective address */
-
-/*
- * We use reg64_t for addresses that are 32 bits on a 32-bit
- * machine, and 64 bits on a 64-bit machine, but are always
- * passed and returned in a single GPR on PPC.  This type
- * cannot be used in generic 32-bit c, since on a 64-bit
- * machine the upper half of the register will be ignored
- * by the c compiler in 32-bit mode.  In c, we can only use the
- * type in prototypes of functions that are written in and called
- * from assembly language.  This type is basically a comment.
- */
-typedef	uint32_t	reg64_t;
-
-/*
- * To minimize the use of 64-bit fields, we keep some physical
- * addresses (that are page aligned) as 32-bit page numbers. 
- * This limits the physical address space to 16TB of RAM.
- */
-typedef uint32_t ppnum_t;		/* Physical page number */
-#define PPNUM_MAX UINT32_MAX
-
-
-
-typedef mach_port_t		vm_map_t;
-
-
-#define VM_MAP_NULL		((vm_map_t) 0)
-
-/*
- * Evolving definitions, likely to change.
- */
-
-typedef uint64_t		vm_object_offset_t;
-typedef uint64_t		vm_object_size_t;
-
-
-typedef mach_port_t		upl_t;
-typedef mach_port_t		vm_named_entry_t;
-
-
-#define UPL_NULL		((upl_t) 0)
-#define VM_NAMED_ENTRY_NULL	((vm_named_entry_t) 0)
-
-#endif	/* _MACH_VM_TYPES_H_ */
diff --git a/i386/include/machine/_limits.h b/i386/include/machine/_limits.h
deleted file mode 100644
index 373e726..0000000
--- a/i386/include/machine/_limits.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _BSD_MACHINE__LIMITS_H_
-#define _BSD_MACHINE__LIMITS_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/_limits.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/_limits.h"
-#elif defined (__arm__)
-#include "arm/_limits.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _BSD_MACHINE__LIMITS_H_ */
diff --git a/i386/include/machine/_param.h b/i386/include/machine/_param.h
deleted file mode 100644
index 4171fd0..0000000
--- a/i386/include/machine/_param.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/_param.h"
-#elif defined (__i386__) || defined (__x86_64__)
-#include "i386/_param.h"
-#elif defined (__arm__)
-#include "arm/_param.h"
-#else
-#error architecture not supported
-#endif
diff --git a/i386/include/machine/_structs.h b/i386/include/machine/_structs.h
deleted file mode 100644
index 0e35938..0000000
--- a/i386/include/machine/_structs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/_structs.h"
-#elif defined (__i386__) || defined (__x86_64__)
-#include "i386/_structs.h"
-#elif defined (__arm__)
-#include "arm/_structs.h"
-#else
-#error architecture not supported
-#endif
diff --git a/i386/include/machine/_types.h b/i386/include/machine/_types.h
deleted file mode 100644
index 9f2d6d2..0000000
--- a/i386/include/machine/_types.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2003-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _BSD_MACHINE__TYPES_H_
-#define _BSD_MACHINE__TYPES_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/_types.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/_types.h"
-#elif defined (__arm__)
-#include "arm/_types.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _BSD_MACHINE__TYPES_H_ */
diff --git a/i386/include/machine/byte_order.h b/i386/include/machine/byte_order.h
deleted file mode 100644
index 4008142..0000000
--- a/i386/include/machine/byte_order.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1995 NeXT Computer, Inc.
- */
-
-#ifndef	_BSD_MACHINE_BYTE_ORDER_H_
-#define _BSD_MACHINE_BYTE_ORDER_H_
- 
-#include <architecture/byte_order.h>
-
-#endif	/* _BSD_MACHINE_BYTE_ORDER_H_ */
diff --git a/i386/include/machine/endian.h b/i386/include/machine/endian.h
deleted file mode 100644
index a49d52a..0000000
--- a/i386/include/machine/endian.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright 1995 NeXT Computer, Inc. All rights reserved.
- */
-#ifndef _BSD_MACHINE_ENDIAN_H_
-#define _BSD_MACHINE_ENDIAN_H_
-
-#if defined (__ppc__) || defined(__ppc64__)
-#include "ppc/endian.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/endian.h"
-#elif defined (__arm__)
-#include "arm/endian.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _BSD_MACHINE_ENDIAN_H_ */
diff --git a/i386/include/machine/fasttrap_isa.h b/i386/include/machine/fasttrap_isa.h
deleted file mode 100644
index fa881d3..0000000
--- a/i386/include/machine/fasttrap_isa.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _BSD_MACHINE_FASTTRAP_ISA_H_
-#define _BSD_MACHINE_FASTTRAP_ISA_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/fasttrap_isa.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/fasttrap_isa.h"
-#elif defined (__arm__)
-#include "arm/fasttrap_isa.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _BSD_MACHINE_FASTTRAP_ISA_H_ */
diff --git a/i386/include/machine/limits.h b/i386/include/machine/limits.h
deleted file mode 100644
index d52080f..0000000
--- a/i386/include/machine/limits.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* This is the `system' limits.h, independent of any particular
-   compiler.  GCC provides its own limits.h which can be found in
-   /usr/lib/gcc, although it is not very informative.  
-   This file is public domain.  */
-#if defined (__ppc__) || defined (__ppc64__)
-#include <ppc/limits.h>
-#elif defined (__i386__) || defined(__x86_64__)
-#include <i386/limits.h>
-#elif defined (__arm__)
-#include <arm/limits.h>
-#else
-#error architecture not supported
-#endif
diff --git a/i386/include/machine/param.h b/i386/include/machine/param.h
deleted file mode 100644
index 0b2a2ad..0000000
--- a/i386/include/machine/param.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright 1995 NeXT Computer, Inc. All rights reserved.
- */
-#ifndef _BSD_MACHINE_PARAM_H_
-#define _BSD_MACHINE_PARAM_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/param.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/param.h"
-#elif defined (__arm__)
-#include "arm/param.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _BSD_MACHINE_PARAM_H_ */
diff --git a/i386/include/machine/profile.h b/i386/include/machine/profile.h
deleted file mode 100644
index 45e4de8..0000000
--- a/i386/include/machine/profile.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1997-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * History :
- *	29-Sep-1997  Umesh Vaishampayan
- *		Created.
- */
-#ifndef _BSD_MACHINE_PROFILE_H_
-#define _BSD_MACHINE_PROFILE_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/profile.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/profile.h"
-#elif defined (__arm__)
-#include "arm/profile.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _BSD_MACHINE_PROFILE_H_ */
diff --git a/i386/include/machine/setjmp.h b/i386/include/machine/setjmp.h
deleted file mode 100644
index 9aa71b5..0000000
--- a/i386/include/machine/setjmp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved
- */
-#ifndef	_MACHINE_SETJMP_H_
-#define	_MACHINE_SETJMP_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/setjmp.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/setjmp.h"
-#elif defined (__arm__)
-#include "arm/setjmp.h"
-#else
-#error architecture not supported
-#endif
-
-#endif	/* _MACHINE_SETJMP_H_ */
diff --git a/i386/include/machine/signal.h b/i386/include/machine/signal.h
deleted file mode 100644
index 7457d1c..0000000
--- a/i386/include/machine/signal.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _BSD_MACHINE_SIGNAL_H_
-#define _BSD_MACHINE_SIGNAL_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/signal.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/signal.h"
-#elif defined (__arm__)
-#include "arm/signal.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _BSD_MACHINE_SIGNAL_H_ */
diff --git a/i386/include/machine/types.h b/i386/include/machine/types.h
deleted file mode 100644
index 2bff809..0000000
--- a/i386/include/machine/types.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright 1995 NeXT Computer, Inc. All rights reserved.
- */
-#ifndef _BSD_MACHINE_TYPES_H_
-#define _BSD_MACHINE_TYPES_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/types.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/types.h"
-#elif defined (__arm__)
-#include "arm/types.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _BSD_MACHINE_TYPES_H_ */
diff --git a/i386/include/machine/vmparam.h b/i386/include/machine/vmparam.h
deleted file mode 100644
index d9d0d74..0000000
--- a/i386/include/machine/vmparam.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _BSD_MACHINE_VMPARAM_H_
-#define _BSD_MACHINE_VMPARAM_H_
-
-#if defined (__ppc__) || defined (__ppc64__)
-#include "ppc/vmparam.h"
-#elif defined (__i386__) || defined(__x86_64__)
-#include "i386/vmparam.h"
-#elif defined (__arm__)
-#include "arm/vmparam.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _BSD_MACHINE_VMPARAM_H_ */
diff --git a/i386/include/math.h b/i386/include/math.h
deleted file mode 100644
index 6b2172f..0000000
--- a/i386/include/math.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef __MATH_H__
-#define __MATH_H__
-
-#if (defined(__ppc__) || defined(__ppc64__))
-#include "architecture/ppc/math.h"
-#elif (defined (__i386__) || defined( __x86_64__ ))
-#include "architecture/i386/math.h"
-#elif defined(__arm__)
-#include "architecture/arm/math.h"
-#else
-#error Unknown architecture
-#endif
-
-#endif /* __MATH_H__ */
diff --git a/i386/include/pexpert/boot.h b/i386/include/pexpert/boot.h
deleted file mode 100644
index f26ec4a..0000000
--- a/i386/include/pexpert/boot.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _PEXPERT_BOOT_H_
-#define _PEXPERT_BOOT_H_
-
-#include <pexpert/machine/boot.h>
-
-#endif /* _PEXPERT_BOOT_H_ */
diff --git a/i386/include/pexpert/i386/boot.h b/i386/include/pexpert/i386/boot.h
deleted file mode 100644
index 369c2c4..0000000
--- a/i386/include/pexpert/i386/boot.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _PEXPERT_I386_BOOT_H
-#define _PEXPERT_I386_BOOT_H
-
-#include <stdint.h>
-
-/*
- * What the booter leaves behind for the kernel.
- */
-
-/*
- * Types of boot driver that may be loaded by the booter.
- */
-enum {
-    kBootDriverTypeInvalid = 0,
-    kBootDriverTypeKEXT    = 1,
-    kBootDriverTypeMKEXT   = 2
-};
-
-enum {
-    kEfiReservedMemoryType	= 0,
-    kEfiLoaderCode		= 1,
-    kEfiLoaderData		= 2,
-    kEfiBootServicesCode	= 3,
-    kEfiBootServicesData	= 4,
-    kEfiRuntimeServicesCode	= 5,
-    kEfiRuntimeServicesData	= 6,
-    kEfiConventionalMemory	= 7,
-    kEfiUnusableMemory		= 8,
-    kEfiACPIReclaimMemory	= 9,
-    kEfiACPIMemoryNVS		= 10,
-    kEfiMemoryMappedIO		= 11,
-    kEfiMemoryMappedIOPortSpace = 12,
-    kEfiPalCode			= 13,
-    kEfiMaxMemoryType		= 14
-};
-
-/*
- * Memory range descriptor.
- */
-typedef struct EfiMemoryRange {
-    uint32_t Type;
-    uint32_t Pad;
-    uint64_t PhysicalStart;
-    uint64_t VirtualStart;
-    uint64_t NumberOfPages;
-    uint64_t Attribute;
-} EfiMemoryRange;
-
-#define BOOT_LINE_LENGTH        1024
-#define BOOT_STRING_LEN         BOOT_LINE_LENGTH
-
-/*
- * Video information.. 
- */
-
-struct Boot_Video {
-	uint32_t	v_baseAddr;	/* Base address of video memory */
-	uint32_t	v_display;	/* Display Code (if Applicable */
-	uint32_t	v_rowBytes;	/* Number of bytes per pixel row */
-	uint32_t	v_width;	/* Width */
-	uint32_t	v_height;	/* Height */
-	uint32_t	v_depth;	/* Pixel Depth */
-};
-
-typedef struct Boot_Video	Boot_Video;
-
-/* Values for v_display */
-
-#define GRAPHICS_MODE         1
-#define FB_TEXT_MODE          2
-
-/* Struct describing an image passed in by the booter */
-struct boot_icon_element {
-    unsigned int    width;
-    unsigned int    height;
-    int             y_offset_from_center;
-    unsigned int    data_size;
-    unsigned int    __reserved1[4];
-    unsigned char   data[0];
-};
-typedef struct boot_icon_element boot_icon_element;
-
-/* Boot argument structure - passed into Mach kernel at boot time.
- * "Revision" can be incremented for compatible changes
- */
-#define kBootArgsRevision		0
-#define kBootArgsVersion		2
-
-/* Snapshot constants of previous revisions that are supported */
-#define kBootArgsVersion1		1
-#define kBootArgsVersion2		2
-#define kBootArgsRevision2_0		0
-
-#define kBootArgsEfiMode32              32
-#define kBootArgsEfiMode64              64
-
-/* Bitfields for boot_args->flags */
-#define kBootArgsFlagRebootOnPanic	(1 << 0)
-#define kBootArgsFlagHiDPI		(1 << 1)
-
-typedef struct boot_args {
-    uint16_t    Revision;	/* Revision of boot_args structure */
-    uint16_t    Version;	/* Version of boot_args structure */
-
-    uint8_t     efiMode;    /* 32 = 32-bit, 64 = 64-bit */
-    uint8_t     debugMode;  /* Bit field with behavior changes */
-    uint16_t    flags;
-
-    char        CommandLine[BOOT_LINE_LENGTH];	/* Passed in command line */
-
-    uint32_t    MemoryMap;  /* Physical address of memory map */
-    uint32_t    MemoryMapSize;
-    uint32_t    MemoryMapDescriptorSize;
-    uint32_t    MemoryMapDescriptorVersion;
-
-    Boot_Video	Video;		/* Video Information */
-
-    uint32_t    deviceTreeP;	  /* Physical address of flattened device tree */
-    uint32_t    deviceTreeLength; /* Length of flattened tree */
-
-    uint32_t    kaddr;            /* Physical address of beginning of kernel text */
-    uint32_t    ksize;            /* Size of combined kernel text+data+efi */
-
-    uint32_t    efiRuntimeServicesPageStart; /* physical address of defragmented runtime pages */
-    uint32_t    efiRuntimeServicesPageCount;
-    uint64_t    efiRuntimeServicesVirtualPageStart; /* virtual address of defragmented runtime pages */
-
-    uint32_t    efiSystemTable;   /* physical address of system table in runtime area */
-    uint32_t    kslide;
-
-    uint32_t    performanceDataStart; /* physical address of log */
-    uint32_t    performanceDataSize;
-
-    uint32_t    keyStoreDataStart; /* physical address of key store data */
-    uint32_t    keyStoreDataSize;
-    uint64_t	bootMemStart;
-    uint64_t	bootMemSize;
-    uint64_t    PhysicalMemorySize;
-    uint64_t    FSBFrequency;
-    uint64_t    pciConfigSpaceBaseAddress;
-    uint32_t    pciConfigSpaceStartBusNumber;
-    uint32_t    pciConfigSpaceEndBusNumber;
-    uint32_t    __reserved4[730];
-
-} boot_args;
-
-extern char assert_boot_args_size_is_4096[sizeof(boot_args) == 4096 ? 1 : -1];
-
-#endif /* _PEXPERT_I386_BOOT_H */
-
diff --git a/i386/include/pexpert/i386/efi.h b/i386/include/pexpert/i386/efi.h
deleted file mode 100644
index 5ef5015..0000000
--- a/i386/include/pexpert/i386/efi.h
+++ /dev/null
@@ -1,558 +0,0 @@
-/*
- * Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _PEXPERT_I386_EFI_H
-#define _PEXPERT_I386_EFI_H
-
-#include <stdint.h>
-
-typedef uint8_t   EFI_UINT8;
-typedef uint16_t  EFI_UINT16;
-typedef uint32_t  EFI_UINT32;
-typedef uint64_t  EFI_UINT64;
-
-typedef uint32_t  EFI_UINTN; /* natural size for firmware, not kernel */
-
-typedef int8_t    EFI_INT8;
-typedef int16_t   EFI_INT16;
-typedef int32_t   EFI_INT32;
-typedef int64_t   EFI_INT64;
-
-typedef int8_t    EFI_CHAR8;
-typedef int16_t   EFI_CHAR16;
-typedef int32_t   EFI_CHAR32;
-typedef int64_t   EFI_CHAR64;
-
-typedef uint32_t  EFI_STATUS;
-typedef uint8_t   EFI_BOOLEAN;
-typedef void      VOID;
-
-typedef uint32_t  EFI_PTR32;
-typedef uint32_t  EFI_HANDLE32;
-
-typedef uint64_t  EFI_PTR64;
-typedef uint64_t  EFI_HANDLE64;
-/*
-
-Portions Copyright 2004, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-    http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-*/
-
-
-//
-// Modifiers for EFI Runtime and Boot Services
-//
-#define EFI_RUNTIMESERVICE
-#define EFIAPI
-#define IN
-#define OUT
-#define OPTIONAL
-
-#define EFI_MAX_BIT       0x80000000
-
-//
-// Set the upper bit to indicate EFI Error.
-//
-#define EFIERR(a)                 (EFI_MAX_BIT | (a))
-
-#define EFIWARN(a)                (a)
-#define EFI_ERROR(a)              (((INTN) (a)) < 0)
-
-#define EFI_SUCCESS               0
-#define EFI_LOAD_ERROR            EFIERR (1)
-#define EFI_INVALID_PARAMETER     EFIERR (2)
-#define EFI_UNSUPPORTED           EFIERR (3)
-#define EFI_BAD_BUFFER_SIZE       EFIERR (4)
-#define EFI_BUFFER_TOO_SMALL      EFIERR (5)
-#define EFI_NOT_READY             EFIERR (6)
-#define EFI_DEVICE_ERROR          EFIERR (7)
-#define EFI_WRITE_PROTECTED       EFIERR (8)
-#define EFI_OUT_OF_RESOURCES      EFIERR (9)
-#define EFI_VOLUME_CORRUPTED      EFIERR (10)
-#define EFI_VOLUME_FULL           EFIERR (11)
-#define EFI_NO_MEDIA              EFIERR (12)
-#define EFI_MEDIA_CHANGED         EFIERR (13)
-#define EFI_NOT_FOUND             EFIERR (14)
-#define EFI_ACCESS_DENIED         EFIERR (15)
-#define EFI_NO_RESPONSE           EFIERR (16)
-#define EFI_NO_MAPPING            EFIERR (17)
-#define EFI_TIMEOUT               EFIERR (18)
-#define EFI_NOT_STARTED           EFIERR (19)
-#define EFI_ALREADY_STARTED       EFIERR (20)
-#define EFI_ABORTED               EFIERR (21)
-#define EFI_ICMP_ERROR            EFIERR (22)
-#define EFI_TFTP_ERROR            EFIERR (23)
-#define EFI_PROTOCOL_ERROR        EFIERR (24)
-#define EFI_INCOMPATIBLE_VERSION  EFIERR (25)
-#define EFI_SECURITY_VIOLATION    EFIERR (26)
-#define EFI_CRC_ERROR             EFIERR (27)
-
-#define EFI_WARN_UNKNOWN_GLYPH    EFIWARN (1)
-#define EFI_WARN_DELETE_FAILURE   EFIWARN (2)
-#define EFI_WARN_WRITE_FAILURE    EFIWARN (3)
-#define EFI_WARN_BUFFER_TOO_SMALL EFIWARN (4)
-
-//
-// EFI Specification Revision information
-//
-#define EFI_SPECIFICATION_MAJOR_REVISION  1
-#define EFI_SPECIFICATION_MINOR_REVISION  10
-
-typedef struct {
-  EFI_UINT32  Data1;
-  EFI_UINT16  Data2;
-  EFI_UINT16  Data3;
-  EFI_UINT8   Data4[8];
-} EFI_GUID;
-
-#define APPLE_VENDOR_GUID \
-    {0xAC39C713, 0x7E50, 0x423D, {0x88, 0x9D, 0x27,0x8F, 0xCC, 0x34, 0x22, 0xB6} }
-
-#define EFI_GLOBAL_VARIABLE_GUID \
-    {0x8BE4DF61, 0x93CA, 0x11d2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C} }
-
-typedef union {
-  EFI_GUID  Guid;
-  EFI_UINT8 Raw[16];
-} EFI_GUID_UNION;
-
-//
-// EFI Time Abstraction:
-//  Year:       2000 - 20XX
-//  Month:      1 - 12
-//  Day:        1 - 31
-//  Hour:       0 - 23
-//  Minute:     0 - 59
-//  Second:     0 - 59
-//  Nanosecond: 0 - 999,999,999
-//  TimeZone:   -1440 to 1440 or 2047
-//
-typedef struct {
-  EFI_UINT16  Year;
-  EFI_UINT8   Month;
-  EFI_UINT8   Day;
-  EFI_UINT8   Hour;
-  EFI_UINT8   Minute;
-  EFI_UINT8   Second;
-  EFI_UINT8   Pad1;
-  EFI_UINT32  Nanosecond;
-  EFI_INT16   TimeZone;
-  EFI_UINT8   Daylight;
-  EFI_UINT8   Pad2;
-} EFI_TIME;
-
-//
-// Bit definitions for EFI_TIME.Daylight
-//
-#define EFI_TIME_ADJUST_DAYLIGHT  0x01
-#define EFI_TIME_IN_DAYLIGHT      0x02
-
-//
-// Value definition for EFI_TIME.TimeZone
-//
-#define EFI_UNSPECIFIED_TIMEZONE  0x07FF
-
-typedef enum {
-  EfiReservedMemoryType,
-  EfiLoaderCode,
-  EfiLoaderData,
-  EfiBootServicesCode,
-  EfiBootServicesData,
-  EfiRuntimeServicesCode,
-  EfiRuntimeServicesData,
-  EfiConventionalMemory,
-  EfiUnusableMemory,
-  EfiACPIReclaimMemory,
-  EfiACPIMemoryNVS,
-  EfiMemoryMappedIO,
-  EfiMemoryMappedIOPortSpace,
-  EfiPalCode,
-  EfiMaxMemoryType
-} EFI_MEMORY_TYPE;
-
-typedef struct {
-  EFI_UINT64  Signature;
-  EFI_UINT32  Revision;
-  EFI_UINT32  HeaderSize;
-  EFI_UINT32  CRC32;
-  EFI_UINT32  Reserved;
-} __attribute__((aligned(8))) EFI_TABLE_HEADER;
-
-//
-// possible caching types for the memory range
-//
-#define EFI_MEMORY_UC   0x0000000000000001ULL
-#define EFI_MEMORY_WC   0x0000000000000002ULL
-#define EFI_MEMORY_WT   0x0000000000000004ULL
-#define EFI_MEMORY_WB   0x0000000000000008ULL
-#define EFI_MEMORY_UCE  0x0000000000000010ULL
-
-//
-// physical memory protection on range
-//
-#define EFI_MEMORY_WP 0x0000000000001000ULL
-#define EFI_MEMORY_RP 0x0000000000002000ULL
-#define EFI_MEMORY_XP 0x0000000000004000ULL
-
-//
-// range requires a runtime mapping
-//
-#define EFI_MEMORY_RUNTIME  0x8000000000000000ULL
-#define EFI_MEMORY_KERN_RESERVED (1ULL << 59)
-typedef EFI_UINT64  EFI_PHYSICAL_ADDRESS;
-typedef EFI_UINT64  EFI_VIRTUAL_ADDRESS;
-
-#define EFI_MEMORY_DESCRIPTOR_VERSION 1
-typedef struct {
-  EFI_UINT32            Type;
-  EFI_UINT32            Pad;
-  EFI_PHYSICAL_ADDRESS  PhysicalStart;
-  EFI_VIRTUAL_ADDRESS   VirtualStart;
-  EFI_UINT64            NumberOfPages;
-  EFI_UINT64            Attribute;
-} __attribute__((aligned(8))) EFI_MEMORY_DESCRIPTOR;
-
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_SET_VIRTUAL_ADDRESS_MAP) (
-  IN EFI_UINTN                    MemoryMapSize,
-  IN EFI_UINTN                    DescriptorSize,
-  IN EFI_UINT32                   DescriptorVersion,
-  IN EFI_MEMORY_DESCRIPTOR        * VirtualMap
-  );
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_CONVERT_POINTER) (
-  IN EFI_UINTN                DebugDisposition,
-  IN OUT VOID                 **Address
-  );
-
-//
-// Variable attributes
-//
-#define EFI_VARIABLE_NON_VOLATILE       0x00000001
-#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002
-#define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004
-#define EFI_VARIABLE_READ_ONLY          0x00000008
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_GET_VARIABLE) (
-  IN EFI_CHAR16               * VariableName,
-  IN EFI_GUID                 * VendorGuid,
-  OUT EFI_UINT32              * Attributes OPTIONAL,
-  IN OUT EFI_UINTN            * DataSize,
-  OUT VOID                    * Data
-  );
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_GET_NEXT_VARIABLE_NAME) (
-  IN OUT EFI_UINTN            * VariableNameSize,
-  IN OUT EFI_CHAR16           * VariableName,
-  IN OUT EFI_GUID             * VendorGuid
-  );
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_SET_VARIABLE) (
-  IN EFI_CHAR16               * VariableName,
-  IN EFI_GUID                 * VendorGuid,
-  IN EFI_UINT32               Attributes,
-  IN EFI_UINTN                DataSize,
-  IN VOID                     * Data
-  );
-
-//
-// EFI Time
-//
-typedef struct {
-  EFI_UINT32  Resolution;
-  EFI_UINT32  Accuracy;
-  EFI_BOOLEAN SetsToZero;
-} __attribute__((aligned(4))) EFI_TIME_CAPABILITIES;
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_GET_TIME) (
-  OUT EFI_TIME                * Time,
-  OUT EFI_TIME_CAPABILITIES   * Capabilities OPTIONAL
-  );
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_SET_TIME) (
-  IN EFI_TIME                 * Time
-  );
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_GET_WAKEUP_TIME) (
-  OUT EFI_BOOLEAN             * Enabled,
-  OUT EFI_BOOLEAN             * Pending,
-  OUT EFI_TIME                * Time
-  );
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_SET_WAKEUP_TIME) (
-  IN EFI_BOOLEAN              Enable,
-  IN EFI_TIME                 * Time OPTIONAL
-  );
-
-typedef enum {
-  EfiResetCold,
-  EfiResetWarm,
-  EfiResetShutdown,
-
-#ifdef TIANO_EXTENSION_FLAG
-  EfiResetUpdate
-#endif
-
-} EFI_RESET_TYPE;
-
-typedef
-EFI_RUNTIMESERVICE
-VOID
-(EFIAPI *EFI_RESET_SYSTEM) (
-  IN EFI_RESET_TYPE               ResetType,
-  IN EFI_STATUS                   ResetStatus,
-  IN EFI_UINTN                    DataSize,
-  IN EFI_CHAR16                   * ResetData OPTIONAL
-  );
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_GET_NEXT_HIGH_MONO_COUNT) (
-  OUT EFI_UINT32                  * HighCount
-  );
-
-//
-// Definition of Status Code extended data header
-//
-//  HeaderSize    The size of the architecture. This is specified to enable
-//                the future expansion
-//
-//  Size          The size of the data in bytes. This does not include the size
-//                of the header structure.
-//
-//  Type          A GUID defining the type of the data
-//
-//
-#ifdef TIANO_EXTENSION_FLAG
-
-typedef
-EFI_RUNTIMESERVICE
-EFI_STATUS
-(EFIAPI *EFI_REPORT_STATUS_CODE) (
-  IN EFI_STATUS_CODE_TYPE       Type,
-  IN EFI_STATUS_CODE_VALUE      Value,
-  IN EFI_UINT32                 Instance,
-  IN EFI_GUID                   * CallerId OPTIONAL,
-  IN EFI_STATUS_CODE_DATA       * Data OPTIONAL
-  );
-
-#endif
-//
-// EFI Runtime Services Table
-//
-#define EFI_RUNTIME_SERVICES_SIGNATURE  0x56524553544e5552ULL
-#define EFI_RUNTIME_SERVICES_REVISION   ((EFI_SPECIFICATION_MAJOR_REVISION << 16) | (EFI_SPECIFICATION_MINOR_REVISION))
-
-typedef struct {
-  EFI_TABLE_HEADER              Hdr;
-
-  //
-  // Time services
-  //
-  EFI_PTR32                     GetTime;
-  EFI_PTR32                     SetTime;
-  EFI_PTR32                     GetWakeupTime;
-  EFI_PTR32                     SetWakeupTime;
-
-  //
-  // Virtual memory services
-  //
-  EFI_PTR32                     SetVirtualAddressMap;
-  EFI_PTR32                     ConvertPointer;
-
-  //
-  // Variable services
-  //
-  EFI_PTR32                     GetVariable;
-  EFI_PTR32                     GetNextVariableName;
-  EFI_PTR32                     SetVariable;
-
-  //
-  // Misc
-  //
-  EFI_PTR32                     GetNextHighMonotonicCount;
-  EFI_PTR32                     ResetSystem;
-
-#ifdef TIANO_EXTENSION_FLAG
-  //
-  // ////////////////////////////////////////////////////
-  // Extended EFI Services
-    //////////////////////////////////////////////////////
-  //
-  EFI_PTR32                     ReportStatusCode;
-#endif
-
-} __attribute__((aligned(8))) EFI_RUNTIME_SERVICES_32;
-
-typedef struct {
-  EFI_TABLE_HEADER              Hdr;
-
-  //
-  // Time services
-  //
-  EFI_PTR64                     GetTime;
-  EFI_PTR64                     SetTime;
-  EFI_PTR64                     GetWakeupTime;
-  EFI_PTR64                     SetWakeupTime;
-
-  //
-  // Virtual memory services
-  //
-  EFI_PTR64                     SetVirtualAddressMap;
-  EFI_PTR64                     ConvertPointer;
-
-  //
-  // Variable services
-  //
-  EFI_PTR64                     GetVariable;
-  EFI_PTR64                     GetNextVariableName;
-  EFI_PTR64                     SetVariable;
-
-  //
-  // Misc
-  //
-  EFI_PTR64                     GetNextHighMonotonicCount;
-  EFI_PTR64                     ResetSystem;
-
-#ifdef TIANO_EXTENSION_FLAG
-  //
-  // ////////////////////////////////////////////////////
-  // Extended EFI Services
-    //////////////////////////////////////////////////////
-  //
-  EFI_PTR64                     ReportStatusCode;
-#endif
-
-} __attribute__((aligned(8))) EFI_RUNTIME_SERVICES_64;
-
-//
-// EFI Configuration Table
-//
-typedef struct {
-  EFI_GUID  VendorGuid;
-  EFI_PTR32 VendorTable;
-} EFI_CONFIGURATION_TABLE_32;
-
-typedef struct {
-  EFI_GUID  VendorGuid;
-  EFI_PTR64 VendorTable;
-} __attribute__((aligned(8))) EFI_CONFIGURATION_TABLE_64;
-
-//
-// EFI System Table
-//
-#define EFI_SYSTEM_TABLE_SIGNATURE      0x5453595320494249ULL
-#define EFI_SYSTEM_TABLE_REVISION       ((EFI_SPECIFICATION_MAJOR_REVISION << 16) | (EFI_SPECIFICATION_MINOR_REVISION))
-#define EFI_2_00_SYSTEM_TABLE_REVISION  ((2 << 16) | 00)
-#define EFI_1_02_SYSTEM_TABLE_REVISION  ((1 << 16) | 02)
-#define EFI_1_10_SYSTEM_TABLE_REVISION  ((1 << 16) | 10)
-
-typedef struct EFI_SYSTEM_TABLE_32 {
-  EFI_TABLE_HEADER              Hdr;
-
-  EFI_PTR32                     FirmwareVendor;
-  EFI_UINT32                    FirmwareRevision;
-
-  EFI_HANDLE32                  ConsoleInHandle;
-  EFI_PTR32                     ConIn;
-
-  EFI_HANDLE32                  ConsoleOutHandle;
-  EFI_PTR32                     ConOut;
-
-  EFI_HANDLE32                  StandardErrorHandle;
-  EFI_PTR32                     StdErr;
-
-  EFI_PTR32                     RuntimeServices;
-  EFI_PTR32                     BootServices;
-
-  EFI_UINT32                    NumberOfTableEntries;
-  EFI_PTR32                     ConfigurationTable;
-
-} __attribute__((aligned(8))) EFI_SYSTEM_TABLE_32;
-
-typedef struct EFI_SYSTEM_TABLE_64 {
-  EFI_TABLE_HEADER              Hdr;
-
-  EFI_PTR64                     FirmwareVendor;
-  EFI_UINT32                    FirmwareRevision;
-
-  EFI_UINT32                    __pad;
-
-  EFI_HANDLE64                  ConsoleInHandle;
-  EFI_PTR64                     ConIn;
-
-  EFI_HANDLE64                  ConsoleOutHandle;
-  EFI_PTR64                     ConOut;
-
-  EFI_HANDLE64                  StandardErrorHandle;
-  EFI_PTR64                     StdErr;
-
-  EFI_PTR64                     RuntimeServices;
-  EFI_PTR64                     BootServices;
-
-  EFI_UINT64                    NumberOfTableEntries;
-  EFI_PTR64                     ConfigurationTable;
-
-} __attribute__((aligned(8))) EFI_SYSTEM_TABLE_64;
-
-#endif /* _PEXPERT_I386_EFI_H */
diff --git a/i386/include/pexpert/i386/protos.h b/i386/include/pexpert/i386/protos.h
deleted file mode 100644
index 854f8c4..0000000
--- a/i386/include/pexpert/i386/protos.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _PEXPERT_I386_PROTOS_H
-#define _PEXPERT_I386_PROTOS_H
-
-//------------------------------------------------------------------------
-// x86 IN/OUT I/O inline functions.
-//
-// IN :  inb, inw, inl
-//       IN(port)
-//
-// OUT:  outb, outw, outl
-//       OUT(port, data)
-
-typedef unsigned short   i386_ioport_t;
-
-#define __IN(s, u) \
-static __inline__ unsigned u \
-in##s(i386_ioport_t port) \
-{ \
-    unsigned u data; \
-    asm volatile ( \
-        "in" #s " %1,%0" \
-        : "=a" (data) \
-        : "d" (port)); \
-    return (data); \
-}
-
-#define __OUT(s, u) \
-static __inline__ void \
-out##s(i386_ioport_t port, unsigned u data) \
-{ \
-    asm volatile ( \
-        "out" #s " %1,%0" \
-        : \
-        : "d" (port), "a" (data)); \
-}
-
-__IN(b, char)
-__IN(w, short)
-__IN(l, long)
-
-__OUT(b, char)
-__OUT(w, short)
-__OUT(l, long)
-
-extern void cninit(void);
-extern int  sprintf(char * str, const char * format, ...);
-
-//------------------------------------------------------------------------
-// from osfmk/console/panic_dialog.c
-extern void panic_ui_initialize(const unsigned char * clut);
-
-/* ------------------------------------------------------------------------
- * from osfmk/i386/serial_io.h
- */
-int switch_to_serial_console(void);
-void switch_to_old_console(int);
-boolean_t console_is_serial(void);
-int serial_init(void);
-void serial_putc(char);
-int serial_getc(void);
-
-/* ------------------------------------------------------------------------
- * from osfmk/kern/misc_protos.h
- */
-void cnputc(char);
-int cngetc(void);
-
-#endif /* _PEXPERT_I386_PROTOS_H */
diff --git a/i386/include/pexpert/machine/boot.h b/i386/include/pexpert/machine/boot.h
deleted file mode 100644
index d078b39..0000000
--- a/i386/include/pexpert/machine/boot.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _PEXPERT_MACHINE_BOOT_H
-#define _PEXPERT_MACHINE_BOOT_H
-
-#if defined (__i386__) || defined(__x86_64__)
-#include "pexpert/i386/boot.h"
-#elif defined (__arm__)
-#include "pexpert/arm/boot.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _PEXPERT_MACHINE_BOOT_H */
diff --git a/i386/include/pexpert/machine/protos.h b/i386/include/pexpert/machine/protos.h
deleted file mode 100644
index 441a924..0000000
--- a/i386/include/pexpert/machine/protos.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _PEXPERT_MACHINE_PROTOS_H
-#define _PEXPERT_MACHINE_PROTOS_H
-
-#if defined (__i386__) || defined(__x86_64__)
-#include "pexpert/i386/protos.h"
-#elif defined (__arm__)
-#include "pexpert/arm/protos.h"
-#else
-#error architecture not supported
-#endif
-
-#endif /* _PEXPERT_MACHINE_PROTOS_H */
diff --git a/i386/include/pexpert/pexpert.h b/i386/include/pexpert/pexpert.h
deleted file mode 100644
index d661b10..0000000
--- a/i386/include/pexpert/pexpert.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _PEXPERT_PEXPERT_H_
-#define _PEXPERT_PEXPERT_H_
-
-#include <sys/cdefs.h>
-
-#include <IOKit/IOInterrupts.h>
-#include <kern/kern_types.h>
-
-__BEGIN_DECLS
-#include <mach/boolean.h>
-#include <mach/kern_return.h>
-#include <mach/machine/vm_types.h>
-
-#include <pexpert/boot.h>
-
-typedef void *cpu_id_t;
-
-#if defined(__arm__)
-#endif
-
-void PE_enter_debugger(
-	const char *cause);
-
-void PE_init_platform(
-	boolean_t vm_initialized, 
-	void *args);
-
-#if defined(__arm__)
-uint32_t PE_get_security_epoch(
-	void);
-uint32_t PE_i_can_has_debugger(
-	uint32_t *);
-
-/*
- * If invoked with NULL first argument, return the max buffer size that can
- * be saved in the second argument
- */
-void PE_save_buffer_to_vram(
-	unsigned char *,
-	unsigned int *);
-#endif
-
-void PE_init_kprintf(
-	boolean_t vm_initialized);
-
-extern int32_t gPESerialBaud;
-
-unsigned int PE_init_taproot(vm_offset_t *taddr);
-
-extern void (*PE_kputc)(char c);
-
-void PE_init_printf(
-	boolean_t vm_initialized);
-
-extern void (*PE_putc)(char c);
-
-void PE_init_iokit(
-	void);
-
-struct clock_frequency_info_t {
-  unsigned long bus_clock_rate_hz;
-  unsigned long cpu_clock_rate_hz;
-  unsigned long dec_clock_rate_hz;
-  unsigned long bus_clock_rate_num;
-  unsigned long bus_clock_rate_den;
-  unsigned long bus_to_cpu_rate_num;
-  unsigned long bus_to_cpu_rate_den;
-  unsigned long bus_to_dec_rate_num;
-  unsigned long bus_to_dec_rate_den;
-  unsigned long timebase_frequency_hz;
-  unsigned long timebase_frequency_num;
-  unsigned long timebase_frequency_den;
-  unsigned long long bus_frequency_hz;
-  unsigned long long bus_frequency_min_hz;
-  unsigned long long bus_frequency_max_hz;
-  unsigned long long cpu_frequency_hz;
-  unsigned long long cpu_frequency_min_hz;
-  unsigned long long cpu_frequency_max_hz;
-  unsigned long long prf_frequency_hz;
-  unsigned long long prf_frequency_min_hz;
-  unsigned long long prf_frequency_max_hz;
-  unsigned long long mem_frequency_hz;
-  unsigned long long mem_frequency_min_hz;
-  unsigned long long mem_frequency_max_hz;
-  unsigned long long fix_frequency_hz;
-};
-
-typedef struct clock_frequency_info_t clock_frequency_info_t;
-
-extern clock_frequency_info_t gPEClockFrequencyInfo;
-
-struct timebase_freq_t {
-  unsigned long timebase_num;
-  unsigned long timebase_den;
-};
-
-typedef void (*timebase_callback_func)(struct timebase_freq_t *timebase_freq);
-
-void PE_register_timebase_callback(timebase_callback_func callback);
-
-void PE_call_timebase_callback(void);
-
-void PE_install_interrupt_handler(
-	void *nub, int source,
-        void *target, IOInterruptHandler handler, void *refCon);
-
-#ifndef _FN_KPRINTF
-#define	_FN_KPRINTF
-void kprintf(const char *fmt, ...) __printflike(1,2);
-#endif
-
-
-#if CONFIG_NO_KPRINTF_STRINGS
-#define kprintf(x, ...) do {} while (0)
-#endif
-
-void init_display_putc(unsigned char *baseaddr, int rowbytes, int height);
-void display_putc(char c);
-
-enum {
-    kPEReadTOD,
-    kPEWriteTOD
-};
-extern int (*PE_read_write_time_of_day)(
-	unsigned int options, 
-	long * secs);
-
-enum {
-    kPEWaitForInput 	= 0x00000001,
-    kPERawInput		= 0x00000002
-};
-extern int (*PE_poll_input)(
-	unsigned int options, 
-	char * c);
-
-extern int (*PE_write_IIC)(
-	unsigned char addr, 
-	unsigned char reg,
-	unsigned char data);
-
-/* Private Stuff - eventually put in pexpertprivate.h */
-enum {
-    kDebugTypeNone    = 0,
-    kDebugTypeDisplay = 1,
-    kDebugTypeSerial  = 2 
-};
-
-/*  Scale factor values for PE_Video.v_scale */
-enum {
-   kPEScaleFactorUnknown = 0,
-   kPEScaleFactor1x      = 1,
-   kPEScaleFactor2x      = 2
-};
-
-struct PE_Video {
-        unsigned long   v_baseAddr;     /* Base address of video memory */
-        unsigned long   v_rowBytes;     /* Number of bytes per pixel row */
-        unsigned long   v_width;        /* Width */
-        unsigned long   v_height;       /* Height */
-        unsigned long   v_depth;        /* Pixel Depth */
-        unsigned long   v_display;      /* Text or Graphics */
-	char		v_pixelFormat[64];
-	unsigned long	v_offset;	/* offset into video memory to start at */
-	unsigned long	v_length;	/* length of video memory (0 for v_rowBytes * v_height) */
-	unsigned char	v_rotate;	/* Rotation: 0:normal, 1:right 90, 2:left 180, 3:left 90 */
-	unsigned char	v_scale;	/* Scale Factor for both X & Y */
-	char		reserved1[2];
-#ifdef __LP64__
-	long		reserved2;
-#else
-	long		v_baseAddrHigh;
-#endif
-};
-
-typedef struct PE_Video       PE_Video;
-
-extern void initialize_screen(PE_Video *, unsigned int);
-
-extern void dim_screen(void);
-
-extern int PE_current_console(
-	PE_Video *info);
-
-extern void PE_create_console(
-        void);
-
-extern int PE_initialize_console(
-	PE_Video *newInfo, 
-	int op);
-
-#define kPEGraphicsMode		1
-#define kPETextMode		2
-#define kPETextScreen		3
-#define kPEAcquireScreen	4
-#define kPEReleaseScreen	5
-#define kPEEnableScreen	 	6
-#define kPEDisableScreen	7
-#define kPEBaseAddressChange	8
-
-extern void PE_display_icon( unsigned int flags,
-			     const char * name );
-
-typedef struct PE_state {
-	boolean_t	initialized;
-	PE_Video	video;
-	void		*deviceTreeHead;
-	void		*bootArgs;
-} PE_state_t;
-
-extern PE_state_t PE_state;
-
-extern char * PE_boot_args(
-	void);
-
-#if !defined(__LP64__) && !defined(__arm__)
-extern boolean_t PE_parse_boot_arg(
-	const char	*arg_string,
-	void    	*arg_ptr) __deprecated;
-#endif
-
-extern boolean_t PE_parse_boot_argn(
-	const char	*arg_string,
-	void    	*arg_ptr,
-	int			max_arg);
-
-extern boolean_t PE_get_default(
-	const char	*property_name,
-	void		*property_ptr,
-	unsigned int max_property);
-
-#define PE_default_value(_key, _variable, _default)	\
-	do {															  \
-		if (!PE_get_default((_key), &(_variable), sizeof(_variable))) \
-			_variable = _default;									  \
-	} while(0)
-
-enum {
-    kPEOptionKey	= 0x3a,
-    kPECommandKey	= 0x37,
-    kPEControlKey	= 0x36,
-    kPEShiftKey		= 0x38
-};
-
-extern boolean_t PE_get_hotkey(
-	unsigned char	key);
-
-extern kern_return_t PE_cpu_start(
-	cpu_id_t target,
-	vm_offset_t start_paddr,
-	vm_offset_t arg_paddr);
-
-extern void PE_cpu_halt(
-	cpu_id_t target);
-
-extern void PE_cpu_signal(
-	cpu_id_t source,
-	cpu_id_t target);
-
-extern void PE_cpu_machine_init(
-	cpu_id_t target,
-	boolean_t bootb);
-
-extern void PE_cpu_machine_quiesce(
-	cpu_id_t target);
-
-extern void pe_init_debug(void);
-
-extern boolean_t PE_imgsrc_mount_supported(void);
-
-#if defined(__arm__)
-typedef void (*perfmon_interrupt_handler_func)(cpu_id_t source);
-extern kern_return_t PE_cpu_perfmon_interrupt_install_handler(perfmon_interrupt_handler_func handler);
-extern void PE_cpu_perfmon_interrupt_enable(cpu_id_t target, boolean_t enable);
-#endif
-
-
-__END_DECLS
-
-#endif /* _PEXPERT_PEXPERT_H_ */
diff --git a/i386/include/pexpert/protos.h b/i386/include/pexpert/protos.h
deleted file mode 100644
index 78b7a8b..0000000
--- a/i386/include/pexpert/protos.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-#ifndef _PEXPERT_PROTOS_H_
-#define _PEXPERT_PROTOS_H_
-
-
-#endif /* _PEXPERT_PROTOS_H_ */
diff --git a/i386/include/runetype.h b/i386/include/runetype.h
deleted file mode 100644
index fd16b82..0000000
--- a/i386/include/runetype.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef	_RUNETYPE_H_
-#define	_RUNETYPE_H_
-
-#include <_types.h>
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-
-#ifndef	_SIZE_T
-#define _SIZE_T
-typedef	__darwin_size_t		size_t;
-#endif
-
-#ifndef	_CT_RUNE_T
-#define _CT_RUNE_T
-typedef	__darwin_ct_rune_t	ct_rune_t;
-#endif
-
-#ifndef	_RUNE_T
-#define _RUNE_T
-typedef	__darwin_rune_t		rune_t;
-#endif
-
-#ifndef	__cplusplus
-#ifndef	_WCHAR_T
-#define	_WCHAR_T
-typedef	__darwin_wchar_t	wchar_t;
-#endif	/* _WCHAR_T */
-#endif	/* __cplusplus */
-
-#ifndef	_WINT_T
-#define _WINT_T
-typedef	__darwin_wint_t		wint_t;
-#endif
-
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-#define	_CACHED_RUNES	(1 <<8 )	/* Must be a power of 2 */
-#define	_CRMASK		(~(_CACHED_RUNES - 1))
-
-/*
- * The lower 8 bits of runetype[] contain the digit value of the rune.
- */
-typedef struct {
-	__darwin_rune_t	__min;		/* First rune of the range */
-	__darwin_rune_t	__max;		/* Last rune (inclusive) of the range */
-	__darwin_rune_t	__map;		/* What first maps to in maps */
-	__uint32_t	*__types;	/* Array of types in range */
-} _RuneEntry;
-
-typedef struct {
-	int		__nranges;	/* Number of ranges stored */
-	_RuneEntry	*__ranges;	/* Pointer to the ranges */
-} _RuneRange;
-
-typedef struct {
-	char		__name[14];	/* CHARCLASS_NAME_MAX = 14 */
-	__uint32_t	__mask;		/* charclass mask */
-} _RuneCharClass;
-
-typedef struct {
-	char		__magic[8];	/* Magic saying what version we are */
-	char		__encoding[32];	/* ASCII name of this encoding */
-
-	__darwin_rune_t	(*__sgetrune)(const char *, __darwin_size_t, char const **);
-	int		(*__sputrune)(__darwin_rune_t, char *, __darwin_size_t, char **);
-	__darwin_rune_t	__invalid_rune;
-
-	__uint32_t	__runetype[_CACHED_RUNES];
-	__darwin_rune_t	__maplower[_CACHED_RUNES];
-	__darwin_rune_t	__mapupper[_CACHED_RUNES];
-
-	/*
-	 * The following are to deal with Runes larger than _CACHED_RUNES - 1.
-	 * Their data is actually contiguous with this structure so as to make
-	 * it easier to read/write from/to disk.
-	 */
-	_RuneRange	__runetype_ext;
-	_RuneRange	__maplower_ext;
-	_RuneRange	__mapupper_ext;
-
-	void		*__variable;	/* Data which depends on the encoding */
-	int		__variable_len;	/* how long that data is */
-
-	/*
-	 * extra fields to deal with arbitrary character classes
-	 */
-	int		__ncharclasses;
-	_RuneCharClass	*__charclasses;
-} _RuneLocale;
-
-#define	_RUNE_MAGIC_A	"RuneMagA"	/* Indicates version A of RuneLocale */
-
-__BEGIN_DECLS
-extern _RuneLocale _DefaultRuneLocale;
-extern _RuneLocale *_CurrentRuneLocale;
-__END_DECLS
-
-#endif	/* !_RUNETYPE_H_ */
diff --git a/i386/include/setjmp.h b/i386/include/setjmp.h
deleted file mode 100644
index 4fced23..0000000
--- a/i386/include/setjmp.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-#ifndef _BSD_SETJMP_H
-#define _BSD_SETJMP_H
-
-#include <machine/setjmp.h>
-
-#endif /* _BSD_SETJMP_H */
diff --git a/i386/include/signal.h b/i386/include/signal.h
deleted file mode 100644
index 08ad77e..0000000
--- a/i386/include/signal.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)signal.h	8.3 (Berkeley) 3/30/94
- */
-
-#ifndef _USER_SIGNAL_H
-#define _USER_SIGNAL_H
-
-#include <sys/cdefs.h>
-#include <_types.h>
-#include <sys/signal.h>
-
-#ifndef _PTHREAD_T
-typedef __darwin_pthread_t	pthread_t;
-#define _PTHREAD_T
-#endif
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-extern __const char *__const sys_signame[NSIG];
-extern __const char *__const sys_siglist[NSIG];
-#endif
-
-__BEGIN_DECLS
-int	raise(int);
-__END_DECLS
-
-#ifndef	_ANSI_SOURCE
-__BEGIN_DECLS
-void	(*bsd_signal(int, void (*)(int)))(int);
-//Begin-Libc
-#ifndef LIBC_ALIAS_KILL
-//End-Libc
-int	kill(pid_t, int) __DARWIN_ALIAS(kill);
-//Begin-Libc
-#else /* LIBC_ALIAS_KILL */
-int	kill(pid_t, int) LIBC_ALIAS(kill);
-#endif /* !LIBC_ALIAS_KILL */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_KILLPG
-//End-Libc
-int	killpg(pid_t, int) __DARWIN_ALIAS(killpg);
-//Begin-Libc
-#else /* LIBC_ALIAS_KILLPG */
-int	killpg(pid_t, int) LIBC_ALIAS(killpg);
-#endif /* !LIBC_ALIAS_KILLPG */
-//End-Libc
-int	pthread_kill(pthread_t, int);
-//Begin-Libc
-#ifndef LIBC_ALIAS_PTHREAD_SIGMASK
-//End-Libc
-int	pthread_sigmask(int, const sigset_t *, sigset_t *) __DARWIN_ALIAS(pthread_sigmask);
-//Begin-Libc
-#else /* LIBC_ALIAS_PTHREAD_SIGMASK */
-int	pthread_sigmask(int, const sigset_t *, sigset_t *) LIBC_ALIAS(pthread_sigmask);
-#endif /* !LIBC_ALIAS_PTHREAD_SIGMASK */
-//End-Libc
-int	sigaction(int, const struct sigaction * __restrict,
-	    struct sigaction * __restrict);
-int	sigaddset(sigset_t *, int);
-//Begin-Libc
-#ifndef LIBC_ALIAS_SIGALTSTACK
-//End-Libc
-int	sigaltstack(const stack_t * __restrict, stack_t * __restrict)  __DARWIN_ALIAS(sigaltstack);
-//Begin-Libc
-#else /* LIBC_ALIAS_SIGALTSTACK */
-int	sigaltstack(const stack_t * __restrict, stack_t * __restrict)  LIBC_ALIAS(sigaltstack);
-#endif /* !LIBC_ALIAS_SIGALTSTACK */
-//End-Libc
-int	sigdelset(sigset_t *, int);
-int	sigemptyset(sigset_t *);
-int	sigfillset(sigset_t *);
-int	sighold(int);
-int	sigignore(int);
-int	siginterrupt(int, int);
-int	sigismember(const sigset_t *, int);
-//Begin-Libc
-#ifndef LIBC_ALIAS_SIGPAUSE
-//End-Libc
-int	sigpause(int) __DARWIN_ALIAS_C(sigpause);
-//Begin-Libc
-#else /* LIBC_ALIAS_SIGPAUSE */
-int	sigpause(int) LIBC_ALIAS_C(sigpause);
-#endif /* !LIBC_ALIAS_SIGPAUSE */
-//End-Libc
-int	sigpending(sigset_t *);
-int	sigprocmask(int, const sigset_t * __restrict, sigset_t * __restrict);
-int	sigrelse(int);
-void    (*sigset(int, void (*)(int)))(int); 
-//Begin-Libc
-#ifndef LIBC_ALIAS_SIGSUSPEND
-//End-Libc
-int	sigsuspend(const sigset_t *) __DARWIN_ALIAS_C(sigsuspend);
-//Begin-Libc
-#else /* LIBC_ALIAS_SIGSUSPEND */
-int	sigsuspend(const sigset_t *) LIBC_ALIAS_C(sigsuspend);
-#endif /* !LIBC_ALIAS_SIGSUSPEND */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_SIGWAIT
-//End-Libc
-int	sigwait(const sigset_t * __restrict, int * __restrict) __DARWIN_ALIAS_C(sigwait);
-//Begin-Libc
-#else /* LIBC_ALIAS_SIGWAIT */
-int	sigwait(const sigset_t * __restrict, int * __restrict) LIBC_ALIAS_C(sigwait);
-#endif /* !LIBC_ALIAS_SIGWAIT */
-//End-Libc
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-void	psignal(unsigned int, const char *);
-int	sigblock(int);
-int	sigsetmask(int);
-int	sigvec(int, struct sigvec *, struct sigvec *);
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-__END_DECLS
-
-/* List definitions after function declarations, or Reiser cpp gets upset. */
-#if defined(__i386__) || defined(__x86_64__)
-/* The left shift operator on intel is modulo 32 */
-static __inline int
-__sigbits(int __signo)
-{
-    return __signo > __DARWIN_NSIG ? 0 : (1 << (__signo - 1));
-}
-#else /* !__i386__ && !__x86_64__ */
-#define __sigbits(signo)	(1 << ((signo) - 1))
-#endif /* __i386__ || __x86_64__ */
-
-#define	sigaddset(set, signo)	(*(set) |= __sigbits(signo), 0)
-#define	sigdelset(set, signo)	(*(set) &= ~__sigbits(signo), 0)
-#define	sigismember(set, signo)	((*(set) & __sigbits(signo)) != 0)
-#define	sigemptyset(set)	(*(set) = 0, 0)
-#define	sigfillset(set)		(*(set) = ~(sigset_t)0, 0)
-#endif	/* !_ANSI_SOURCE */
-
-#endif	/* !_USER_SIGNAL_H */
diff --git a/i386/include/stdarg.h b/i386/include/stdarg.h
deleted file mode 100644
index ede00f0..0000000
--- a/i386/include/stdarg.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Copyright (C) 1989, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
- 
- This file is part of GCC.
- 
- GCC 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, or (at your option)
- any later version.
- 
- GCC 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 GCC; see the file COPYING.  If not, write to
- the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you include this header file into source
- files compiled by GCC, this header file does not by itself cause
- the resulting executable to be covered by the GNU General Public
- License.  This exception does not however invalidate any other
- reasons why the executable file might be covered by the GNU General
- Public License.  */
-
-/*
- * ISO C Standard:  7.15  Variable arguments  <stdarg.h>
- */
-
-#ifndef _STDARG_H
-#ifndef _ANSI_STDARG_H_
-#ifndef __need___va_list
-#define _STDARG_H
-#define _ANSI_STDARG_H_
-#endif /* not __need___va_list */
-#undef __need___va_list
-
-/* Define __gnuc_va_list.  */
-
-#ifndef __GNUC_VA_LIST
-#define __GNUC_VA_LIST
-typedef __builtin_va_list __gnuc_va_list;
-#endif
-
-/* Define the standard macros for the user,
- if this invocation was from the user program.  */
-#ifdef _STDARG_H
-
-#define va_start(v,l)	__builtin_va_start(v,l)
-#define va_end(v)	__builtin_va_end(v)
-#define va_arg(v,l)	__builtin_va_arg(v,l)
-#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L
-#define va_copy(d,s)	__builtin_va_copy(d,s)
-#endif
-#define __va_copy(d,s)	__builtin_va_copy(d,s)
-
-/* Define va_list, if desired, from __gnuc_va_list. */
-/* We deliberately do not define va_list when called from
- stdio.h, because ANSI C says that stdio.h is not supposed to define
- va_list.  stdio.h needs to have access to that data type, 
- but must not use that name.  It should use the name __gnuc_va_list,
- which is safe because it is reserved for the implementation.  */
-
-#ifdef _HIDDEN_VA_LIST  /* On OSF1, this means varargs.h is "half-loaded".  */
-#undef _VA_LIST
-#endif
-
-#ifdef _BSD_VA_LIST
-#undef _BSD_VA_LIST
-#endif
-
-#if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST))
-/* SVR4.2 uses _VA_LIST for an internal alias for va_list,
- so we must avoid testing it and setting it here.
- SVR4 uses _VA_LIST as a flag in stdarg.h, but we should
- have no conflict with that.  */
-#ifndef _VA_LIST_
-#define _VA_LIST_
-#ifdef __i860__
-#ifndef _VA_LIST
-#define _VA_LIST va_list
-#endif
-#endif /* __i860__ */
-typedef __gnuc_va_list va_list;
-#ifdef _SCO_DS
-#define __VA_LIST
-#endif
-#endif /* _VA_LIST_ */
-#else /* not __svr4__ || _SCO_DS */
-
-/* The macro _VA_LIST_ is the same thing used by this file in Ultrix.
- But on BSD NET2 we must not test or define or undef it.
- (Note that the comments in NET 2's ansi.h
- are incorrect for _VA_LIST_--see stdio.h!)  */
-#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) || defined(WINNT)
-/* The macro _VA_LIST_DEFINED is used in Windows NT 3.5  */
-#ifndef _VA_LIST_DEFINED
-/* The macro _VA_LIST is used in SCO Unix 3.2.  */
-#ifndef _VA_LIST
-/* The macro _VA_LIST_T_H is used in the Bull dpx2  */
-#ifndef _VA_LIST_T_H
-/* The macro __va_list__ is used by BeOS.  */
-#ifndef __va_list__
-typedef __gnuc_va_list va_list;
-#endif /* not __va_list__ */
-#endif /* not _VA_LIST_T_H */
-#endif /* not _VA_LIST */
-#endif /* not _VA_LIST_DEFINED */
-#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__))
-#define _VA_LIST_
-#endif
-#ifndef _VA_LIST
-#define _VA_LIST
-#endif
-#ifndef _VA_LIST_DEFINED
-#define _VA_LIST_DEFINED
-#endif
-#ifndef _VA_LIST_T_H
-#define _VA_LIST_T_H
-#endif
-#ifndef __va_list__
-#define __va_list__
-#endif
-
-#endif /* not _VA_LIST_, except on certain systems */
-
-#endif /* not __svr4__ */
-
-#endif /* _STDARG_H */
-
-#endif /* not _ANSI_STDARG_H_ */
-#endif /* not _STDARG_H */
diff --git a/i386/include/stdbool.h b/i386/include/stdbool.h
deleted file mode 100644
index 994cee8..0000000
--- a/i386/include/stdbool.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/include/stdbool.h,v 1.6 2002/08/16 07:33:14 alfred Exp $
- */
-
-#ifndef _STDBOOL_H_
-#define	_STDBOOL_H_	
-
-#define	__bool_true_false_are_defined	1
-
-#ifndef __cplusplus
-
-#define	bool	_Bool
-#if __STDC_VERSION__ < 199901L && __GNUC__ < 3
-typedef	int	_Bool;
-#endif
-
-#define	false	(bool)0
-#define	true	(bool)1
-
-#endif /* !__cplusplus */
-
-#endif /* !_STDBOOL_H_ */
diff --git a/i386/include/stddef.h b/i386/include/stddef.h
deleted file mode 100644
index 9fc87ee..0000000
--- a/i386/include/stddef.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*	$OpenBSD: stddef.h,v 1.2 1997/09/21 10:45:52 niklas Exp $	*/
-/*	$NetBSD: stddef.h,v 1.4 1994/10/26 00:56:26 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)stddef.h	5.5 (Berkeley) 4/3/91
- */
-
-#if !defined(__STDDEF_H__)
-
-#if !defined(__need_wchar_t) && !defined(__need_size_t) \
-    && !defined(__need_ptrdiff_t) && !defined(__need_NULL) \
-    && !defined(__need_wint_t)
-#define __STDDEF_H__
-#endif /* none of __need_* defined */
-
-#include <sys/_types.h>
-
-#if defined(__STDDEF_H__) || defined(__need_ptrdiff_t)
-#ifndef _PTRDIFF_T
-#define _PTRDIFF_T
-typedef	__darwin_ptrdiff_t	ptrdiff_t;
-#endif /* _PTRDIFF_T */
-#endif /* __STDDEF_H__ || __need_ptrdiff_t */
-
-#if defined(__STDDEF_H__) || defined(__need_size_t)
-#ifndef	_SIZE_T
-#define	_SIZE_T
-/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
- * _GCC_SIZE_T */
-typedef	__darwin_size_t		size_t;
-#endif /* _SIZE_T */
-#endif /* __STDDEF_H__ || __need_size_t */
-
-#if defined(__STDDEF_H__) || defined(__need_wchar_t)
-#ifndef	__cplusplus
-#ifndef	_WCHAR_T
-#define	_WCHAR_T
-typedef	__darwin_wchar_t	wchar_t;
-#endif	/* _WCHAR_T */
-#endif	/* __cplusplus */
-#endif /* __STDDEF_H__ || __need_wchar_t */
-
-#if (defined(__STDDEF_H__) && !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))) \
-    || defined(__need_wint_t)
-#ifndef	_WINT_T
-#define	_WINT_T
-typedef	__darwin_wint_t		wint_t;
-#endif	/* _WINT_T */
-#endif /* __STDDEF_H__ && !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) || __need_wchar_t */
-
-#if defined(__STDDEF_H__) || defined(__need_NULL)
-#ifndef NULL
-#define NULL __DARWIN_NULL
-#endif /* ! NULL */
-#endif /* __STDDEF_H__ || __need_NULL */
-
-#ifdef __STDDEF_H__
-#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 5 || __GNUC__ > 3)
-#ifndef __offsetof	/* Deprecated: for source compatability only */
-#define __offsetof(type, field) __builtin_offsetof(type, field)
-#endif
-#define offsetof(type, field) __builtin_offsetof(type, field)
-#else /* ! (gcc >= 3.5) */
-#ifndef __offsetof	/* Deprecated: for source compatability only */
-#define __offsetof(type, field) ((size_t)(&((type *)0)->field))
-#endif
-#define offsetof(type, field) ((size_t)(&((type *)0)->field))
-#endif /* (gcc >= 3.5) */
-#endif /* __STDDEF_H__ */
-
-#endif /* __STDDEF_H__ */
-
-#undef __need_ptrdiff_t
-#undef __need_size_t
-#undef __need_wchar_t
-#undef __need_wint_t
-#undef __need_NULL
diff --git a/i386/include/stdint.h b/i386/include/stdint.h
deleted file mode 100644
index 1126b56..0000000
--- a/i386/include/stdint.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 2003, 2004, 2008 Apple Computer, Inc.
- * All rights reserved.
- */
-
-#ifndef _STDINT_H_
-#define _STDINT_H_
-
-#if __LP64__
-#define __WORDSIZE 64
-#else
-#define __WORDSIZE 32
-#endif
-
-/* from ISO/IEC 988:1999 spec */
-
-/* 7.18.1.1 Exact-width integer types */
-#ifndef _INT8_T
-#define _INT8_T
-typedef signed char           int8_t;
-#endif /*_INT8_T */
-
-#ifndef _INT16_T
-#define _INT16_T
-typedef short                int16_t;
-#endif /* _INT16_T */
-
-#ifndef _INT32_T
-#define _INT32_T
-typedef int                  int32_t;
-#endif /* _INT32_T */
-
-#ifndef _INT64_T
-#define _INT64_T
-typedef long long            int64_t;
-#endif /* _INT64_T */
-
-#ifndef _UINT8_T
-#define _UINT8_T
-typedef unsigned char         uint8_t;
-#endif /*_UINT8_T */
-
-#ifndef _UINT16_T
-#define _UINT16_T
-typedef unsigned short       uint16_t;
-#endif /* _UINT16_T */
-
-#ifndef _UINT32_T
-#define _UINT32_T
-typedef unsigned int         uint32_t;
-#endif /* _UINT32_T */
-
-#ifndef _UINT64_T
-#define _UINT64_T
-typedef unsigned long long   uint64_t;
-#endif /* _UINT64_T */
-
-/* 7.18.1.2 Minimum-width integer types */
-typedef int8_t           int_least8_t;
-typedef int16_t         int_least16_t;
-typedef int32_t         int_least32_t;
-typedef int64_t         int_least64_t;
-typedef uint8_t         uint_least8_t;
-typedef uint16_t       uint_least16_t;
-typedef uint32_t       uint_least32_t;
-typedef uint64_t       uint_least64_t;
-
-
-/* 7.18.1.3 Fastest-width integer types */
-typedef int8_t            int_fast8_t;
-typedef int16_t          int_fast16_t;
-typedef int32_t          int_fast32_t;
-typedef int64_t          int_fast64_t;
-typedef uint8_t          uint_fast8_t;
-typedef uint16_t        uint_fast16_t;
-typedef uint32_t        uint_fast32_t;
-typedef uint64_t        uint_fast64_t;
-
-
-/* 7.18.1.4 Integer types capable of holding object pointers */
-
-#ifndef _INTPTR_T
-#define _INTPTR_T
-typedef long   intptr_t;
-#endif /* _INTPTR_T */
-
-#ifndef _UINTPTR_T
-#define _UINTPTR_T
-typedef unsigned long   uintptr_t;
-#endif /* _UINTPTR_T */
-
-
-/* 7.18.1.5 Greatest-width integer types */
-#ifndef _INTMAX_T
-#define _INTMAX_T
-#ifdef __INTMAX_TYPE__
-typedef __INTMAX_TYPE__             intmax_t;
-#else /* __INTMAX_TYPE__ */
-typedef long long                intmax_t;
-#endif /* __INTMAX_TYPE__ */
-#endif /* _INTMAX_T */
-
-#ifndef _UINTMAX_T
-#define _UINTMAX_T
-#ifdef __UINTMAX_TYPE__
-typedef __UINTMAX_TYPE__             uintmax_t;
-#else /* __UINTMAX_TYPE__ */
-typedef unsigned long long      uintmax_t;
-#endif /* __UINTMAX_TYPE__ */
-#endif /* _UINTMAX_T */
-
-/* 7.18.2 Limits of specified-width integer types:
- *   These #defines specify the minimum and maximum limits
- *   of each of the types declared above.
- */
-
-
-/* 7.18.2.1 Limits of exact-width integer types */
-#define INT8_MAX         127
-#define INT16_MAX        32767
-#define INT32_MAX        2147483647
-#define INT64_MAX        9223372036854775807LL
-
-#define INT8_MIN          -128
-#define INT16_MIN         -32768
-   /*
-      Note:  the literal "most negative int" cannot be written in C --
-      the rules in the standard (section 6.4.4.1 in C99) will give it
-      an unsigned type, so INT32_MIN (and the most negative member of
-      any larger signed type) must be written via a constant expression.
-   */
-#define INT32_MIN        (-INT32_MAX-1)
-#define INT64_MIN        (-INT64_MAX-1)
-
-#define UINT8_MAX         255
-#define UINT16_MAX        65535
-#define UINT32_MAX        4294967295U
-#define UINT64_MAX        18446744073709551615ULL
-
-/* 7.18.2.2 Limits of minimum-width integer types */
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST64_MIN   INT64_MIN
-
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MAX   INT64_MAX
-
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-/* 7.18.2.3 Limits of fastest minimum-width integer types */
-#define INT_FAST8_MIN     INT8_MIN
-#define INT_FAST16_MIN    INT16_MIN
-#define INT_FAST32_MIN    INT32_MIN
-#define INT_FAST64_MIN    INT64_MIN
-
-#define INT_FAST8_MAX     INT8_MAX
-#define INT_FAST16_MAX    INT16_MAX
-#define INT_FAST32_MAX    INT32_MAX
-#define INT_FAST64_MAX    INT64_MAX
-
-#define UINT_FAST8_MAX    UINT8_MAX
-#define UINT_FAST16_MAX   UINT16_MAX
-#define UINT_FAST32_MAX   UINT32_MAX
-#define UINT_FAST64_MAX   UINT64_MAX
-
-/* 7.18.2.4 Limits of integer types capable of holding object pointers */
-
-#if __WORDSIZE == 64
-#define INTPTR_MIN	  INT64_MIN
-#define INTPTR_MAX	  INT64_MAX
-#else
-#define INTPTR_MIN        INT32_MIN
-#define INTPTR_MAX        INT32_MAX
-#endif
-
-#if __WORDSIZE == 64
-#define UINTPTR_MAX	  UINT64_MAX
-#else
-#define UINTPTR_MAX       UINT32_MAX
-#endif
-
-/* 7.18.2.5 Limits of greatest-width integer types */
-#define INTMAX_MIN        INT64_MIN
-#define INTMAX_MAX        INT64_MAX
-
-#define UINTMAX_MAX       UINT64_MAX
-
-/* 7.18.3 "Other" */
-#if __WORDSIZE == 64
-#define PTRDIFF_MIN	  INT64_MIN
-#define PTRDIFF_MAX	  INT64_MAX
-#else
-#define PTRDIFF_MIN       INT32_MIN
-#define PTRDIFF_MAX       INT32_MAX
-#endif
-
-/* We have no sig_atomic_t yet, so no SIG_ATOMIC_{MIN,MAX}.
-   Should end up being {-127,127} or {0,255} ... or bigger.
-   My bet would be on one of {U}INT32_{MIN,MAX}. */
-
-#if __WORDSIZE == 64
-#define SIZE_MAX	  UINT64_MAX
-#else
-#define SIZE_MAX          UINT32_MAX
-#endif
-
-#ifndef WCHAR_MAX
-#  ifdef __WCHAR_MAX__
-#    define WCHAR_MAX     __WCHAR_MAX__
-#  else
-#    define WCHAR_MAX     0x7fffffff
-#  endif
-#endif
-
-/* WCHAR_MIN should be 0 if wchar_t is an unsigned type and
-   (-WCHAR_MAX-1) if wchar_t is a signed type.  Unfortunately,
-   it turns out that -fshort-wchar changes the signedness of
-   the type. */
-#ifndef WCHAR_MIN
-#  if WCHAR_MAX == 0xffff
-#    define WCHAR_MIN       0
-#  else
-#    define WCHAR_MIN       (-WCHAR_MAX-1)
-#  endif
-#endif
-
-#define WINT_MIN	  INT32_MIN
-#define WINT_MAX	  INT32_MAX
-
-#define SIG_ATOMIC_MIN	  INT32_MIN
-#define SIG_ATOMIC_MAX	  INT32_MAX
-
-/* 7.18.4 Macros for integer constants */
-#define INT8_C(v)    (v)
-#define INT16_C(v)   (v)
-#define INT32_C(v)   (v)
-#define INT64_C(v)   (v ## LL)
-
-#define UINT8_C(v)   (v ## U)
-#define UINT16_C(v)  (v ## U)
-#define UINT32_C(v)  (v ## U)
-#define UINT64_C(v)  (v ## ULL)
-
-#define INTMAX_C(v)  (v ## LL)
-#define UINTMAX_C(v) (v ## ULL)
-
-#endif /* _STDINT_H_ */
diff --git a/i386/include/stdio.h b/i386/include/stdio.h
deleted file mode 100644
index 455960c..0000000
--- a/i386/include/stdio.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Copyright (c) 2000, 2005, 2007, 2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- */
-
-#ifndef	_STDIO_H_
-#define	_STDIO_H_
-
-#include <_types.h>
-
-#ifndef _VA_LIST
-#define _VA_LIST
-/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
- * __gnuc_va_list and include <stdarg.h> */
-typedef __darwin_va_list	va_list;
-#endif
-
-#ifndef	_OFF_T
-#define	_OFF_T
-typedef	__darwin_off_t		off_t;
-#endif
-
-#ifndef	_SIZE_T
-#define	_SIZE_T
-typedef	__darwin_size_t		size_t;
-#endif
-
-#ifndef NULL
-#define NULL __DARWIN_NULL
-#endif /* ! NULL */
-
-typedef __darwin_off_t		fpos_t;
-
-#define	_FSTDIO			/* Define for new stdio with functions. */
-
-/*
- * NB: to fit things in six character monocase externals, the stdio
- * code uses the prefix `__s' for stdio objects, typically followed
- * by a three-character attempt at a mnemonic.
- */
-
-/* stdio buffers */
-struct __sbuf {
-	unsigned char	*_base;
-	int		_size;
-};
-
-/* hold a buncha junk that would grow the ABI */
-struct __sFILEX;
-
-/*
- * stdio state variables.
- *
- * The following always hold:
- *
- *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
- *		_lbfsize is -_bf._size, else _lbfsize is 0
- *	if _flags&__SRD, _w is 0
- *	if _flags&__SWR, _r is 0
- *
- * This ensures that the getc and putc macros (or inline functions) never
- * try to write or read from a file that is in `read' or `write' mode.
- * (Moreover, they can, and do, automatically switch from read mode to
- * write mode, and back, on "r+" and "w+" files.)
- *
- * _lbfsize is used only to make the inline line-buffered output stream
- * code as compact as possible.
- *
- * _ub, _up, and _ur are used when ungetc() pushes back more characters
- * than fit in the current _bf, or when ungetc() pushes back a character
- * that does not match the previous one in _bf.  When this happens,
- * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
- * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
- *
- * NB: see WARNING above before changing the layout of this structure!
- */
-typedef	struct __sFILE {
-	unsigned char *_p;	/* current position in (some) buffer */
-	int	_r;		/* read space left for getc() */
-	int	_w;		/* write space left for putc() */
-	short	_flags;		/* flags, below; this FILE is free if 0 */
-	short	_file;		/* fileno, if Unix descriptor, else -1 */
-	struct	__sbuf _bf;	/* the buffer (at least 1 byte, if !NULL) */
-	int	_lbfsize;	/* 0 or -_bf._size, for inline putc */
-
-	/* operations */
-	void	*_cookie;	/* cookie passed to io functions */
-	int	(*_close)(void *);
-	int	(*_read) (void *, char *, int);
-	fpos_t	(*_seek) (void *, fpos_t, int);
-	int	(*_write)(void *, const char *, int);
-
-	/* separate buffer for long sequences of ungetc() */
-	struct	__sbuf _ub;	/* ungetc buffer */
-	struct __sFILEX *_extra; /* additions to FILE to not break ABI */
-	int	_ur;		/* saved _r when _r is counting ungetc data */
-
-	/* tricks to meet minimum requirements even when malloc() fails */
-	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
-	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
-
-	/* separate buffer for fgetln() when line crosses buffer boundary */
-	struct	__sbuf _lb;	/* buffer for fgetln() */
-
-	/* Unix stdio files get aligned to block boundaries on fseek() */
-	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
-	fpos_t	_offset;	/* current lseek offset (see WARNING) */
-} FILE;
-
-__BEGIN_DECLS
-#if __DARWIN_UNIX03
-extern FILE *__stdinp;
-extern FILE *__stdoutp;
-extern FILE *__stderrp;
-#else /* !__DARWIN_UNIX03 */
-extern FILE __sF[];
-#endif /* __DARWIN_UNIX03 */
-__END_DECLS
-
-#define	__SLBF	0x0001		/* line buffered */
-#define	__SNBF	0x0002		/* unbuffered */
-#define	__SRD	0x0004		/* OK to read */
-#define	__SWR	0x0008		/* OK to write */
-	/* RD and WR are never simultaneously asserted */
-#define	__SRW	0x0010		/* open for reading & writing */
-#define	__SEOF	0x0020		/* found EOF */
-#define	__SERR	0x0040		/* found error */
-#define	__SMBF	0x0080		/* _buf is from malloc */
-#define	__SAPP	0x0100		/* fdopen()ed in append mode */
-#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
-#define	__SOPT	0x0400		/* do fseek() optimisation */
-#define	__SNPT	0x0800		/* do not do fseek() optimisation */
-#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
-#define	__SMOD	0x2000		/* true => fgetln modified _p text */
-#define __SALC  0x4000		/* allocate string space dynamically */
-#define __SIGN  0x8000		/* ignore this file in _fwalk */
-
-/*
- * The following three definitions are for ANSI C, which took them
- * from System V, which brilliantly took internal interface macros and
- * made them official arguments to setvbuf(), without renaming them.
- * Hence, these ugly _IOxxx names are *supposed* to appear in user code.
- *
- * Although numbered as their counterparts above, the implementation
- * does not rely on this.
- */
-#define	_IOFBF	0		/* setvbuf should set fully buffered */
-#define	_IOLBF	1		/* setvbuf should set line buffered */
-#define	_IONBF	2		/* setvbuf should set unbuffered */
-
-#define	BUFSIZ	1024		/* size of buffer used by setbuf */
-#define	EOF	(-1)
-
-/*
- * FOPEN_MAX is a minimum maximum, and is the number of streams that
- * stdio can provide without attempting to allocate further resources
- * (which could fail).  Do not use this for anything.
- */
-				/* must be == _POSIX_STREAM_MAX <limits.h> */
-#define	FOPEN_MAX	20	/* must be <= OPEN_MAX <sys/syslimits.h> */
-#define	FILENAME_MAX	1024	/* must be <= PATH_MAX <sys/syslimits.h> */
-
-/* System V/ANSI C; this is the wrong way to do this, do *not* use these. */
-#ifndef _ANSI_SOURCE
-#define	P_tmpdir	"/var/tmp/"
-#endif
-#define	L_tmpnam	1024	/* XXX must be == PATH_MAX */
-#define	TMP_MAX		308915776
-
-#ifndef SEEK_SET
-#define	SEEK_SET	0	/* set file offset to offset */
-#endif
-#ifndef SEEK_CUR
-#define	SEEK_CUR	1	/* set file offset to current plus offset */
-#endif
-#ifndef SEEK_END
-#define	SEEK_END	2	/* set file offset to EOF plus offset */
-#endif
-
-#if __DARWIN_UNIX03
-#define	stdin	__stdinp
-#define	stdout	__stdoutp
-#define	stderr	__stderrp
-#else /* !__DARWIN_UNIX03 */
-#define stdin	(&__sF[0])
-#define stdout	(&__sF[1])
-#define stderr	(&__sF[2])
-#endif /* __DARWIN_UNIX03 */
-
-/*
- * Functions defined in ANSI C standard.
- */
-__BEGIN_DECLS
-void	 clearerr(FILE *);
-int	 fclose(FILE *);
-int	 feof(FILE *);
-int	 ferror(FILE *);
-int	 fflush(FILE *);
-int	 fgetc(FILE *);
-int	 fgetpos(FILE * __restrict, fpos_t *);
-char	*fgets(char * __restrict, int, FILE *);
-#if defined(__DARWIN_10_6_AND_LATER) && (defined(_DARWIN_UNLIMITED_STREAMS) || defined(_DARWIN_C_SOURCE))
-FILE	*fopen(const char * __restrict, const char * __restrict) __DARWIN_EXTSN(fopen);
-#else /* < 10.6 || !_DARWIN_UNLIMITED_STREAMS && !_DARWIN_C_SOURCE */
-//Begin-Libc
-#ifndef LIBC_ALIAS_FOPEN
-//End-Libc
-FILE	*fopen(const char * __restrict, const char * __restrict) __DARWIN_10_6_AND_LATER_ALIAS(__DARWIN_ALIAS(fopen));
-//Begin-Libc
-#else /* LIBC_ALIAS_FOPEN */
-FILE	*fopen(const char * __restrict, const char * __restrict) LIBC_ALIAS(fopen);
-#endif /* !LIBC_ALIAS_FOPEN */
-//End-Libc
-#endif /* >= 10.6 &&_(DARWIN_UNLIMITED_STREAMS || _DARWIN_C_SOURCE) */
-int	 fprintf(FILE * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(fprintf);
-int	 fputc(int, FILE *);
-//Begin-Libc
-#ifndef LIBC_ALIAS_FPUTS
-//End-Libc
-int	 fputs(const char * __restrict, FILE * __restrict) __DARWIN_ALIAS(fputs);
-//Begin-Libc
-#else /* LIBC_ALIAS_FPUTS */
-int	 fputs(const char * __restrict, FILE * __restrict) LIBC_ALIAS(fputs);
-#endif /* !LIBC_ALIAS_FPUTS */
-//End-Libc
-size_t	 fread(void * __restrict, size_t, size_t, FILE * __restrict);
-//Begin-Libc
-#ifndef LIBC_ALIAS_FREOPEN
-//End-Libc
-FILE	*freopen(const char * __restrict, const char * __restrict,
-	    FILE * __restrict) __DARWIN_ALIAS(freopen);
-//Begin-Libc
-#else /* LIBC_ALIAS_FREOPEN */
-FILE	*freopen(const char * __restrict, const char * __restrict,
-	    FILE * __restrict) LIBC_ALIAS(freopen);
-#endif /* !LIBC_ALIAS_FREOPEN */
-//End-Libc
-int	 fscanf(FILE * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(fscanf);
-int	 fseek(FILE *, long, int);
-int	 fsetpos(FILE *, const fpos_t *);
-long	 ftell(FILE *);
-//Begin-Libc
-#ifndef LIBC_ALIAS_FWRITE
-//End-Libc
-size_t	 fwrite(const void * __restrict, size_t, size_t, FILE * __restrict) __DARWIN_ALIAS(fwrite);
-//Begin-Libc
-#else /* LIBC_ALIAS_FWRITE */
-size_t	 fwrite(const void * __restrict, size_t, size_t, FILE * __restrict) LIBC_ALIAS(fwrite);
-#endif /* !LIBC_ALIAS_FWRITE */
-//End-Libc
-int	 getc(FILE *);
-int	 getchar(void);
-char	*gets(char *);
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-extern __const int sys_nerr;		/* perror(3) external variables */
-extern __const char *__const sys_errlist[];
-#endif
-void	 perror(const char *);
-int	 printf(const char * __restrict, ...) __DARWIN_LDBL_COMPAT(printf);
-int	 putc(int, FILE *);
-int	 putchar(int);
-int	 puts(const char *);
-int	 remove(const char *);
-int	 rename (const char *, const char *);
-void	 rewind(FILE *);
-int	 scanf(const char * __restrict, ...) __DARWIN_LDBL_COMPAT(scanf);
-void	 setbuf(FILE * __restrict, char * __restrict);
-int	 setvbuf(FILE * __restrict, char * __restrict, int, size_t);
-int	 sprintf(char * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(sprintf);
-int	 sscanf(const char * __restrict, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(sscanf);
-FILE	*tmpfile(void);
-char	*tmpnam(char *);
-int	 ungetc(int, FILE *);
-int	 vfprintf(FILE * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vfprintf);
-int	 vprintf(const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vprintf);
-int	 vsprintf(char * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vsprintf);
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-int	 asprintf(char **, const char *, ...) __DARWIN_LDBL_COMPAT(asprintf);
-int	 vasprintf(char **, const char *, va_list) __DARWIN_LDBL_COMPAT(vasprintf);
-#endif
-__END_DECLS
-
-/*
- * Functions defined in POSIX 1003.1.
- */
-#ifndef _ANSI_SOURCE
-#define	L_ctermid	1024	/* size for ctermid(); PATH_MAX */
-
-__BEGIN_DECLS
-char	*ctermid(char *);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-char	*ctermid_r(char *);
-#endif /* not POSIX */
-#if defined(__DARWIN_10_6_AND_LATER) && (defined(_DARWIN_UNLIMITED_STREAMS) || defined(_DARWIN_C_SOURCE))
-FILE	*fdopen(int, const char *) __DARWIN_EXTSN(fdopen);
-#else /* < 10.6 || !_DARWIN_UNLIMITED_STREAMS && !_DARWIN_C_SOURCE */
-//Begin-Libc
-#ifndef LIBC_ALIAS_FDOPEN
-//End-Libc
-FILE	*fdopen(int, const char *) __DARWIN_10_6_AND_LATER_ALIAS(__DARWIN_ALIAS(fdopen));
-//Begin-Libc
-#else /* LIBC_ALIAS_FDOPEN */
-FILE	*fdopen(int, const char *) LIBC_ALIAS(fdopen);
-#endif /* !LIBC_ALIAS_FDOPEN */
-//End-Libc
-#endif /* >= 10.6 &&_(DARWIN_UNLIMITED_STREAMS || _DARWIN_C_SOURCE) */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-char	*fgetln(FILE *, size_t *);
-#endif /* not POSIX */
-int	 fileno(FILE *);
-void	 flockfile(FILE *);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-__const char
-	*fmtcheck(const char *, const char *);
-int	 fpurge(FILE *);
-#endif /* not POSIX */
-int	 fseeko(FILE *, off_t, int);
-off_t	 ftello(FILE *);
-int	 ftrylockfile(FILE *);
-void	 funlockfile(FILE *);
-int	 getc_unlocked(FILE *);
-int	 getchar_unlocked(void);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-int	 getw(FILE *);
-#endif /* not POSIX */
-int	 pclose(FILE *);
-#if defined(__DARWIN_10_6_AND_LATER) && (defined(_DARWIN_UNLIMITED_STREAMS) || defined(_DARWIN_C_SOURCE))
-FILE	*popen(const char *, const char *) __DARWIN_EXTSN(popen);
-#else /* < 10.6 || !_DARWIN_UNLIMITED_STREAMS && !_DARWIN_C_SOURCE */
-//Begin-Libc
-#ifndef LIBC_ALIAS_POPEN
-//End-Libc
-FILE	*popen(const char *, const char *) __DARWIN_10_6_AND_LATER_ALIAS(__DARWIN_ALIAS(popen));
-//Begin-Libc
-#else /* LIBC_ALIAS_POPEN */
-FILE	*popen(const char *, const char *) LIBC_ALIAS(popen);
-#endif /* !LIBC_ALIAS_POPEN */
-//End-Libc
-#endif /* >= 10.6 &&_(DARWIN_UNLIMITED_STREAMS || _DARWIN_C_SOURCE) */
-int	 putc_unlocked(int, FILE *);
-int	 putchar_unlocked(int);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-int	 putw(int, FILE *);
-void	 setbuffer(FILE *, char *, int);
-int	 setlinebuf(FILE *);
-#endif /* not POSIX */
-int	 snprintf(char * __restrict, size_t, const char * __restrict, ...) __DARWIN_LDBL_COMPAT(snprintf);
-//Begin-Libc
-#ifndef LIBC_ALIAS_TEMPNAM
-//End-Libc
-char	*tempnam(const char *, const char *) __DARWIN_ALIAS(tempnam);
-//Begin-Libc
-#else /* LIBC_ALIAS_TEMPNAM */
-char	*tempnam(const char *, const char *) LIBC_ALIAS(tempnam);
-#endif /* !LIBC_ALIAS_TEMPNAM */
-//End-Libc
-int	 vfscanf(FILE * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vfscanf);
-int	 vscanf(const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vscanf);
-int	 vsnprintf(char * __restrict, size_t, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vsnprintf);
-int	 vsscanf(const char * __restrict, const char * __restrict, va_list) __DARWIN_LDBL_COMPAT(vsscanf);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-FILE	*zopen(const char *, const char *, int);
-#endif /* not POSIX */
-__END_DECLS
-
-/*
- * Stdio function-access interface.
- */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-__BEGIN_DECLS
-FILE	*funopen(const void *,
-		int (*)(void *, char *, int),
-		int (*)(void *, const char *, int),
-		fpos_t (*)(void *, fpos_t, int),
-		int (*)(void *));
-__END_DECLS
-#define	fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
-#define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
-#endif /* not POSIX */
-#endif /* not ANSI */
-
-/*
- * Functions internal to the implementation.
- */
-__BEGIN_DECLS
-int	__srget(FILE *);
-int	__svfscanf(FILE *, const char *, va_list) __DARWIN_LDBL_COMPAT(__svfscanf);
-int	__swbuf(int, FILE *);
-__END_DECLS
-
-/*
- * The __sfoo macros are here so that we can
- * define function versions in the C library.
- */
-#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
-#if defined(__GNUC__) && defined(__STDC__)
-static __inline int __sputc(int _c, FILE *_p) {
-	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
-		return (*_p->_p++ = _c);
-	else
-		return (__swbuf(_c, _p));
-}
-#else
-/*
- * This has been tuned to generate reasonable code on the vax using pcc.
- */
-#define	__sputc(c, p) \
-	(--(p)->_w < 0 ? \
-		(p)->_w >= (p)->_lbfsize ? \
-			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
-				(int)*(p)->_p++ : \
-				__swbuf('\n', p) : \
-			__swbuf((int)(c), p) : \
-		(*(p)->_p = (c), (int)*(p)->_p++))
-#endif
-
-#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
-#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
-#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
-#define	__sfileno(p)	((p)->_file)
-
-#ifndef _ANSI_SOURCE
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	feof_unlocked(p)	__sfeof(p)
-#define	ferror_unlocked(p)	__sferror(p)
-#define	clearerr_unlocked(p)	__sclearerr(p)
-#define	fileno_unlocked(p)	__sfileno(p)
-#endif /* not POSIX */
-
-#ifndef lint
-#define	getc_unlocked(fp)	__sgetc(fp)
-#define putc_unlocked(x, fp)	__sputc(x, fp)
-#endif /* lint */
-
-#define	getchar_unlocked()	getc_unlocked(stdin)
-#define	putchar_unlocked(x)	putc_unlocked(x, stdout)
-#endif /* not ANSI */
-
-#ifdef _USE_EXTENDED_LOCALES_
-#include <xlocale/_stdio.h>
-#endif /* _USE_EXTENDED_LOCALES_ */
-
-#if defined (__GNUC__) && _FORTIFY_SOURCE > 0 && !defined (__cplusplus)
-/* Security checking functions.  */
-#include <secure/_stdio.h>
-#endif
-
-#endif /* _STDIO_H_ */
diff --git a/i386/include/stdlib.h b/i386/include/stdlib.h
deleted file mode 100644
index a177dbb..0000000
--- a/i386/include/stdlib.h
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (c) 2000, 2002 - 2008 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)stdlib.h	8.5 (Berkeley) 5/19/95
- */
-
-#ifndef _STDLIB_H_
-#define _STDLIB_H_
-
-#include <sys/types.h>
-
-#ifndef	_SIZE_T
-#define	_SIZE_T
-/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
- * _GCC_SIZE_T */
-typedef	__darwin_size_t		size_t;
-#endif
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-#ifndef _CT_RUNE_T
-#define _CT_RUNE_T
-typedef	__darwin_ct_rune_t	ct_rune_t;
-#endif
-
-#ifndef _RUNE_T
-#define _RUNE_T
-typedef __darwin_rune_t   	rune_t;
-#endif
-#endif	/* !_ANSI_SOURCE && (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-#ifndef	__cplusplus
-#ifndef	_WCHAR_T
-#define	_WCHAR_T
-typedef	__darwin_wchar_t	wchar_t;
-#endif	/* _WCHAR_T */
-#endif	/* __cplusplus */
-
-typedef struct {
-	int quot;		/* quotient */
-	int rem;		/* remainder */
-} div_t;
-
-typedef struct {
-	long quot;		/* quotient */
-	long rem;		/* remainder */
-} ldiv_t;
-
-#if !__DARWIN_NO_LONG_LONG
-typedef struct {
-	long long quot;
-	long long rem;
-} lldiv_t;
-#endif /* !__DARWIN_NO_LONG_LONG */
-
-#ifndef NULL
-#define NULL __DARWIN_NULL
-#endif /* ! NULL */
-
-#define	EXIT_FAILURE	1
-#define	EXIT_SUCCESS	0
-
-#define	RAND_MAX	0x7fffffff
-
-#ifdef _USE_EXTENDED_LOCALES_
-#include <_xlocale.h>
-#endif /* _USE_EXTENDED_LOCALES_ */
-
-#ifndef MB_CUR_MAX
-#ifdef _USE_EXTENDED_LOCALES_
-#define	MB_CUR_MAX	(___mb_cur_max())
-#ifndef MB_CUR_MAX_L
-#define	MB_CUR_MAX_L(x)	(___mb_cur_max_l(x))
-#endif /* !MB_CUR_MAX_L */
-#else /* !_USE_EXTENDED_LOCALES_ */
-extern int __mb_cur_max;
-#define	MB_CUR_MAX	__mb_cur_max
-#endif /* _USE_EXTENDED_LOCALES_ */
-#endif /* MB_CUR_MAX */
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) \
-    && defined(_USE_EXTENDED_LOCALES_) && !defined(MB_CUR_MAX_L)
-#define	MB_CUR_MAX_L(x)	(___mb_cur_max_l(x))
-#endif
-//Begin-Libc
-/* f must be a literal string */
-#define LIBC_ABORT(f,...)	abort_report_np("%s:%s:%u: " f, __FILE__, __func__, __LINE__, ## __VA_ARGS__)
-//End-Libc
-
-__BEGIN_DECLS
-void	 abort(void) __dead2;
-//Begin-Libc
-__private_extern__
-void	 abort_report_np(const char *, ...) __dead2 __printflike(1, 2);
-//End-Libc
-int	 abs(int) __pure2;
-int	 atexit(void (*)(void));
-double	 atof(const char *);
-int	 atoi(const char *);
-long	 atol(const char *);
-#if !__DARWIN_NO_LONG_LONG
-long long
-	 atoll(const char *);
-#endif /* !__DARWIN_NO_LONG_LONG */
-void	*bsearch(const void *, const void *, size_t,
-	    size_t, int (*)(const void *, const void *));
-void	*calloc(size_t, size_t);
-div_t	 div(int, int) __pure2;
-void	 exit(int) __dead2;
-void	 free(void *);
-char	*getenv(const char *);
-long	 labs(long) __pure2;
-ldiv_t	 ldiv(long, long) __pure2;
-#if !__DARWIN_NO_LONG_LONG
-long long
-	 llabs(long long);
-lldiv_t	 lldiv(long long, long long);
-#endif /* !__DARWIN_NO_LONG_LONG */
-void	*malloc(size_t);
-int	 mblen(const char *, size_t);
-size_t	 mbstowcs(wchar_t * __restrict , const char * __restrict, size_t);
-int	 mbtowc(wchar_t * __restrict, const char * __restrict, size_t);
-int 	 posix_memalign(void **, size_t, size_t);
-void	 qsort(void *, size_t, size_t,
-	    int (*)(const void *, const void *));
-int	 rand(void);
-void	*realloc(void *, size_t);
-void	 srand(unsigned);
-double	 strtod(const char *, char **) __DARWIN_ALIAS(strtod);
-float	 strtof(const char *, char **) __DARWIN_ALIAS(strtof);
-long	 strtol(const char *, char **, int);
-long double
-	 strtold(const char *, char **) __DARWIN_LDBL_COMPAT(strtold);
-#if !__DARWIN_NO_LONG_LONG
-long long 
-	 strtoll(const char *, char **, int);
-#endif /* !__DARWIN_NO_LONG_LONG */
-unsigned long
-	 strtoul(const char *, char **, int);
-#if !__DARWIN_NO_LONG_LONG
-unsigned long long
-	 strtoull(const char *, char **, int);
-#endif /* !__DARWIN_NO_LONG_LONG */
-//Begin-Libc
-#ifndef LIBC_ALIAS_SYSTEM
-//End-Libc
-int	 system(const char *) __DARWIN_ALIAS_C(system);
-//Begin-Libc
-#else /* LIBC_ALIAS_SYSTEM */
-int	 system(const char *) LIBC_ALIAS_C(system);
-#endif /* !LIBC_ALIAS_SYSTEM */
-//End-Libc
-size_t	 wcstombs(char * __restrict, const wchar_t * __restrict, size_t);
-int	 wctomb(char *, wchar_t);
-
-#ifndef _ANSI_SOURCE
-void	_Exit(int) __dead2;
-long	 a64l(const char *);
-double	 drand48(void);
-char	*ecvt(double, int, int *__restrict, int *__restrict); /* LEGACY */
-double	 erand48(unsigned short[3]); 
-char	*fcvt(double, int, int *__restrict, int *__restrict); /* LEGACY */
-char	*gcvt(double, int, char *); /* LEGACY */
-int	 getsubopt(char **, char * const *, char **);
-int	 grantpt(int);
-#if __DARWIN_UNIX03
-char	*initstate(unsigned, char *, size_t); /* no  __DARWIN_ALIAS needed */
-#else /* !__DARWIN_UNIX03 */
-char	*initstate(unsigned long, char *, long);
-#endif /* __DARWIN_UNIX03 */
-long	 jrand48(unsigned short[3]);
-char	*l64a(long);
-void	 lcong48(unsigned short[7]);
-long	 lrand48(void);
-char	*mktemp(char *);
-int	 mkstemp(char *);
-long	 mrand48(void); 
-long	 nrand48(unsigned short[3]);
-int	 posix_openpt(int);
-char	*ptsname(int);
-//Begin-Libc
-#ifndef LIBC_ALIAS_PUTENV
-//End-Libc
-int	 putenv(char *) __DARWIN_ALIAS(putenv);
-//Begin-Libc
-#else /* LIBC_ALIAS_PUTENV */
-int	 putenv(char *) LIBC_ALIAS(putenv);
-#endif /* !LIBC_ALIAS_PUTENV */
-//End-Libc
-long	 random(void);
-int	 rand_r(unsigned *);
-//Begin-Libc
-#ifdef __LIBC__
-#ifndef LIBC_ALIAS_REALPATH
-char	*realpath(const char * __restrict, char * __restrict) __DARWIN_EXTSN(realpath);
-#else /* LIBC_ALIAS_REALPATH */
-#ifdef VARIANT_DARWINEXTSN
-char	*realpath(const char * __restrict, char * __restrict) LIBC_EXTSN(realpath);
-#else /* !VARIANT_DARWINEXTSN */
-char	*realpath(const char * __restrict, char * __restrict) LIBC_ALIAS(realpath);
-#endif /* VARIANT_DARWINEXTSN */
-#endif /* !LIBC_ALIAS_REALPATH */
-#else /* !__LIBC__ */
-//End-Libc
-#if (__DARWIN_UNIX03 && !defined(_POSIX_C_SOURCE)) || defined(_DARWIN_C_SOURCE) || defined(_DARWIN_BETTER_REALPATH)
-char	*realpath(const char * __restrict, char * __restrict) __DARWIN_EXTSN(realpath);
-#else /* (!__DARWIN_UNIX03 || _POSIX_C_SOURCE) && !_DARWIN_C_SOURCE && !_DARWIN_BETTER_REALPATH */
-char	*realpath(const char * __restrict, char * __restrict) __DARWIN_ALIAS(realpath);
-#endif /* (__DARWIN_UNIX03 && _POSIX_C_SOURCE) || _DARWIN_C_SOURCE || _DARWIN_BETTER_REALPATH */
-//Begin-Libc
-#endif /* __LIBC__ */
-//End-Libc
-unsigned short
-	*seed48(unsigned short[3]);
-//Begin-Libc
-#ifndef LIBC_ALIAS_SETENV
-//End-Libc
-int	 setenv(const char *, const char *, int) __DARWIN_ALIAS(setenv);
-//Begin-Libc
-#else /* LIBC_ALIAS_SETENV */
-int	 setenv(const char *, const char *, int) LIBC_ALIAS(setenv);
-#endif /* !LIBC_ALIAS_SETENV */
-//End-Libc
-#if __DARWIN_UNIX03
-//Begin-Libc
-#ifndef LIBC_ALIAS_SETKEY
-//End-Libc
-void	 setkey(const char *) __DARWIN_ALIAS(setkey);
-//Begin-Libc
-#else /* LIBC_ALIAS_SETKEY */
-void	 setkey(const char *) LIBC_ALIAS(setkey);
-#endif /* !LIBC_ALIAS_SETKEY */
-//End-Libc
-#else /* !__DARWIN_UNIX03 */
-int	 setkey(const char *);
-#endif /* __DARWIN_UNIX03 */
-char	*setstate(const char *);
-void	 srand48(long);
-#if __DARWIN_UNIX03
-void	 srandom(unsigned);
-#else /* !__DARWIN_UNIX03 */
-void	 srandom(unsigned long);
-#endif /* __DARWIN_UNIX03 */
-int	 unlockpt(int);
-#if __DARWIN_UNIX03
-//Begin-Libc
-#ifndef LIBC_ALIAS_UNSETENV
-//End-Libc
-int	 unsetenv(const char *) __DARWIN_ALIAS(unsetenv);
-//Begin-Libc
-#else /* LIBC_ALIAS_UNSETENV */
-int	 unsetenv(const char *) LIBC_ALIAS(unsetenv);
-#endif /* !LIBC_ALIAS_UNSETENV */
-//End-Libc
-#else /* !__DARWIN_UNIX03 */
-void	 unsetenv(const char *);
-#endif /* __DARWIN_UNIX03 */
-#endif	/* !_ANSI_SOURCE */
-
-/* Poison the following routines if -fshort-wchar is set */
-#if !defined(__cplusplus) && defined(__WCHAR_MAX__) && __WCHAR_MAX__ <= 0xffffU
-#pragma GCC poison mbstowcs mbtowc wcstombs wctomb
-#endif
-__END_DECLS
-
-#ifdef _USE_EXTENDED_LOCALES_
-#include <xlocale/_stdlib.h>
-#endif /* _USE_EXTENDED_LOCALES_ */
-
-#endif /* _STDLIB_H_ */
diff --git a/i386/include/string.h b/i386/include/string.h
deleted file mode 100644
index 6c16441..0000000
--- a/i386/include/string.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2000, 2007 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)string.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _STRING_H_
-#define	_STRING_H_
-#include <_types.h>
-
-#ifndef	_SIZE_T
-#define	_SIZE_T
-typedef	__darwin_size_t		size_t;
-#endif
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)	/* For swab */
-#ifndef _SSIZE_T
-#define _SSIZE_T
-typedef __darwin_ssize_t	ssize_t;
-#endif
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-#ifndef NULL
-#define NULL __DARWIN_NULL
-#endif /* ! NULL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void	*memchr(const void *, int, size_t);
-int	 memcmp(const void *, const void *, size_t);
-void	*memcpy(void *, const void *, size_t);
-void	*memmove(void *, const void *, size_t);
-void	*memset(void *, int, size_t);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-char	*stpcpy(char *, const char *);
-char	*strcasestr(const char *, const char *);
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-char	*strcat(char *, const char *);
-char	*strchr(const char *, int);
-int	 strcmp(const char *, const char *);
-int	 strcoll(const char *, const char *);
-char	*strcpy(char *, const char *);
-size_t	 strcspn(const char *, const char *);
-//Begin-Libc
-#ifndef LIBC_ALIAS_STRERROR
-//End-Libc
-char	*strerror(int) __DARWIN_ALIAS(strerror);
-//Begin-Libc
-#else /* LIBC_ALIAS_STRERROR */
-char	*strerror(int) LIBC_ALIAS(strerror);
-#endif /* !LIBC_ALIAS_STRERROR */
-//End-Libc
-int	 strerror_r(int, char *, size_t);
-size_t	 strlen(const char *);
-char	*strncat(char *, const char *, size_t);
-int	 strncmp(const char *, const char *, size_t);
-char	*strncpy(char *, const char *, size_t);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-char	*strnstr(const char *, const char *, size_t);
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-char	*strpbrk(const char *, const char *);
-char	*strrchr(const char *, int);
-size_t	 strspn(const char *, const char *);
-char	*strstr(const char *, const char *);
-char	*strtok(char *, const char *);
-size_t	 strxfrm(char *, const char *, size_t);
-
-/* Nonstandard routines */
-#ifndef _ANSI_SOURCE
-void	*memccpy(void *, const void *, int, size_t);
-char	*strtok_r(char *, const char *, char **);
-char	*strdup(const char *);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-int	 bcmp(const void *, const void *, size_t);
-void	 bcopy(const void *, void *, size_t);
-void	 bzero(void *, size_t);
-int	 ffs(int);
-int	 ffsl(long);
-int	 fls(int);
-int	 flsl(long);
-char	*index(const char *, int);
-void     memset_pattern4(void *, const void *, size_t);
-void     memset_pattern8(void *, const void *, size_t);
-void     memset_pattern16(void *, const void *, size_t);
-char	*rindex(const char *, int);
-int	 strcasecmp(const char *, const char *);
-size_t	 strlcat(char *, const char *, size_t);
-size_t	 strlcpy(char *, const char *, size_t);
-void	 strmode(int, char *);
-int	 strncasecmp(const char *, const char *, size_t);
-char	*strsep(char **, const char *);
-char	*strsignal(int sig);
-void	 swab(const void * __restrict, void * __restrict, ssize_t);
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#endif 	/* !_ANSI_SOURCE */
-__END_DECLS
-
-#ifdef _USE_EXTENDED_LOCALES_
-#include <xlocale/_string.h>
-#endif /* _USE_EXTENDED_LOCALES_ */
-
-#endif /* _STRING_H_ */
diff --git a/i386/include/sys/_endian.h b/i386/include/sys/_endian.h
deleted file mode 100644
index 3fb0f06..0000000
--- a/i386/include/sys/_endian.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2004, 2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-/*
- * Copyright (c) 1995 NeXT Computer, Inc. All rights reserved.
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1987, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef _SYS__ENDIAN_H_
-#define	_SYS__ENDIAN_H_
-
-#include <sys/cdefs.h>
-
-/*
- * Macros for network/external number representation conversion.
- */
-
-#if defined(lint)
-
-__BEGIN_DECLS
-__uint16_t	ntohs(__uint16_t);
-__uint16_t	htons(__uint16_t);
-__uint32_t	ntohl(__uint32_t);
-__uint32_t	htonl(__uint32_t);
-__END_DECLS
-
-#elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
-
-#define ntohl(x)        ((__uint32_t)(x))
-#define ntohs(x)        ((__uint16_t)(x))
-#define htonl(x)        ((__uint32_t)(x))
-#define htons(x)        ((__uint16_t)(x))
-
-#if     defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-#define NTOHL(x)        (x)
-#define NTOHS(x)        (x)
-#define HTONL(x)        (x)
-#define HTONS(x)        (x)
-#endif /* defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) */
-
-#else	/* __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN */
-
-#include <libkern/_OSByteOrder.h>
-
-#define ntohs(x)	__DARWIN_OSSwapInt16(x)
-#define htons(x)	__DARWIN_OSSwapInt16(x)
-
-#define ntohl(x)	__DARWIN_OSSwapInt32(x)
-#define htonl(x)	__DARWIN_OSSwapInt32(x)
-
-#if	defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-#define	NTOHL(x)	(x) = ntohl((__uint32_t)x)
-#define	NTOHS(x)	(x) = ntohs((__uint16_t)x)
-#define	HTONL(x)	(x) = htonl((__uint32_t)x)
-#define	HTONS(x)	(x) = htons((__uint16_t)x)
-#endif /* defined(KERNEL) || (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)) */
-#endif /* __DARWIN_BYTE_ORDER */
-#endif /* !_SYS__ENDIAN_H_ */
diff --git a/i386/include/sys/_select.h b/i386/include/sys/_select.h
deleted file mode 100644
index 6f70921..0000000
--- a/i386/include/sys/_select.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2005, 2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-/*
- * This is called from sys/select.h and sys/time.h for the common prototype
- * of select().  Setting _DARWIN_C_SOURCE or _DARWIN_UNLIMITED_SELECT uses
- * the version of select() that does not place a limit on the first argument
- * (nfds).  In the UNIX conformance case, values of nfds greater than
- * FD_SETSIZE will return an error of EINVAL.
- */
-#ifndef _SYS__SELECT_H_
-#define	_SYS__SELECT_H_
-
-int	 select(int, fd_set * __restrict, fd_set * __restrict,
-		fd_set * __restrict, struct timeval * __restrict)
-#if defined(_DARWIN_C_SOURCE) || defined(_DARWIN_UNLIMITED_SELECT)
-		__DARWIN_EXTSN_C(select)
-#else /* !_DARWIN_C_SOURCE && !_DARWIN_UNLIMITED_SELECT */
-#  if defined(__LP64__) && !__DARWIN_NON_CANCELABLE
-		__DARWIN_1050(select)
-#  else /* !__LP64__ || __DARWIN_NON_CANCELABLE */
-		__DARWIN_ALIAS_C(select)
-#  endif /* __LP64__ && !__DARWIN_NON_CANCELABLE */
-#endif /* _DARWIN_C_SOURCE || _DARWIN_UNLIMITED_SELECT */
-		;
-
-#endif /* !_SYS__SELECT_H_ */
diff --git a/i386/include/sys/_structs.h b/i386/include/sys/_structs.h
deleted file mode 100644
index 5c9db95..0000000
--- a/i386/include/sys/_structs.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#include <sys/cdefs.h>
-
-#ifdef __need_ucontext_t
-#ifndef __need_struct_ucontext
-#define __need_struct_ucontext
-#endif /* __need_struct_ucontext */
-#endif /* __need_ucontext_t */
-
-#ifdef __need_ucontext64_t
-#ifndef __need_struct_ucontext64
-#define __need_struct_ucontext64
-#endif /* __need_struct_ucontext64 */
-#endif /* __need_ucontext64_t */
-
-#ifdef __need_struct_ucontext
-#ifndef __need_struct_mcontext
-#define __need_struct_mcontext
-#endif /* __need_struct_mcontext */
-#endif /* __need_struct_ucontext */
-
-#ifdef __need_struct_ucontext64
-#ifndef __need_struct_mcontext64
-#define __need_struct_mcontext64
-#endif /* __need_struct_mcontext64 */
-#endif /* __need_struct_ucontext64 */
-
-#if defined(__need_struct_mcontext) || defined(__need_struct_mcontext64)
-#include <machine/_structs.h>
-#endif /* __need_struct_mcontext || __need_struct_mcontext64 */
-
-#if defined(__need_stack_t) || defined(__need_struct_ucontext) || defined(__need_struct_ucontext64)
-#ifndef __need_struct_sigaltstack
-#define __need_struct_sigaltstack
-#endif /* __need_struct_sigaltstack */
-#endif /* __need_stack_t || __need_struct_ucontext || __need_struct_ucontext64 */
-
-#ifdef __need_struct_sigaltstack
-#undef __need_struct_sigaltstack
-/* Structure used in sigaltstack call. */
-#ifndef _STRUCT_SIGALTSTACK
-#if __DARWIN_UNIX03
-#define _STRUCT_SIGALTSTACK	struct __darwin_sigaltstack
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_SIGALTSTACK	struct sigaltstack
-#endif /* __DARWIN_UNIX03 */
-_STRUCT_SIGALTSTACK
-{
-	void		*ss_sp;		/* signal stack base */
-	__darwin_size_t ss_size;	/* signal stack length */
-	int		ss_flags;	/* SA_DISABLE and/or SA_ONSTACK */
-};
-#endif /* _STRUCT_SIGALTSTACK */
-#endif /* __need_struct_sigaltstack */
-
-#ifdef __need_struct_timespec
-#undef __need_struct_timespec
-#ifndef _STRUCT_TIMESPEC
-#define _STRUCT_TIMESPEC	struct timespec
-_STRUCT_TIMESPEC
-{
-	__darwin_time_t	tv_sec;
-	long		tv_nsec;
-};
-#endif /* _STRUCT_TIMESPEC */
-#endif /* __need_struct_timespec */
-
-#ifdef __need_struct_timeval
-#undef __need_struct_timeval
-#ifndef _STRUCT_TIMEVAL
-#define _STRUCT_TIMEVAL		struct timeval
-_STRUCT_TIMEVAL
-{
-	__darwin_time_t		tv_sec;		/* seconds */
-	__darwin_suseconds_t	tv_usec;	/* and microseconds */
-};
-#endif /* _STRUCT_TIMEVAL */
-#endif /* __need_struct_timeval */
-
-#ifdef __need_struct_timeval32
-#undef __need_struct_timeval32
-#ifndef _STRUCT_TIMEVAL32
-#define _STRUCT_TIMEVAL32	struct timeval32
-_STRUCT_TIMEVAL32
-{
-	__int32_t		tv_sec;		/* seconds */
-	__int32_t		tv_usec;	/* and microseconds */
-};
-#endif /* _STRUCT_TIMEVAL32 */
-#endif /* __need_struct_timeval32 */
-
-#ifdef __need_struct_ucontext
-#undef __need_struct_ucontext
-#ifndef _STRUCT_UCONTEXT
-#if __DARWIN_UNIX03
-#define _STRUCT_UCONTEXT	struct __darwin_ucontext
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_UCONTEXT	struct ucontext
-#endif /* __DARWIN_UNIX03 */
-_STRUCT_UCONTEXT
-{
-	int			uc_onstack;
-	__darwin_sigset_t	uc_sigmask;	/* signal mask used by this context */
-	_STRUCT_SIGALTSTACK 	uc_stack;	/* stack used by this context */
-	_STRUCT_UCONTEXT	*uc_link;	/* pointer to resuming context */
-	__darwin_size_t		uc_mcsize;	/* size of the machine context passed in */
-	_STRUCT_MCONTEXT	*uc_mcontext;	/* pointer to machine specific context */
-#ifdef _XOPEN_SOURCE
-	_STRUCT_MCONTEXT	__mcontext_data;
-#endif /* _XOPEN_SOURCE */
-};
-#endif /* _STRUCT_UCONTEXT */
-#endif /* __need_struct_ucontext */
-
-#ifdef __need_struct_ucontext64
-#undef __need_struct_ucontext64
-#ifndef _STRUCT_UCONTEXT64
-#if __DARWIN_UNIX03
-#define _STRUCT_UCONTEXT64	struct __darwin_ucontext64
-#else /* !__DARWIN_UNIX03 */
-#define _STRUCT_UCONTEXT64	struct ucontext64
-#endif /* __DARWIN_UNIX03 */
-_STRUCT_UCONTEXT64
-{
-	int			uc_onstack;
-	__darwin_sigset_t	uc_sigmask;	/* signal mask used by this context */
-	_STRUCT_SIGALTSTACK 	uc_stack;	/* stack used by this context */
-	_STRUCT_UCONTEXT64	*uc_link;	/* pointer to resuming context */
-	__darwin_size_t		uc_mcsize;	/* size of the machine context passed in */
-	_STRUCT_MCONTEXT64	*uc_mcontext64;	/* pointer to machine specific context */
-};
-#endif /* _STRUCT_UCONTEXT64 */
-#endif /* __need_struct_ucontext64 */
-
-
-#ifdef __need_fd_set
-#undef __need_fd_set
-#ifndef _FD_SET
-#define _FD_SET
-/*
- * Select uses bit masks of file descriptors in longs.  These macros
- * manipulate such bit fields (the filesystem macros use chars).  The
- * extra protection here is to permit application redefinition above
- * the default size.
- */
-#ifdef FD_SETSIZE
-#define	__DARWIN_FD_SETSIZE	FD_SETSIZE
-#else /* !FD_SETSIZE */
-#define	__DARWIN_FD_SETSIZE	1024
-#endif /* FD_SETSIZE */
-#define	__DARWIN_NBBY		8				/* bits in a byte */
-#define __DARWIN_NFDBITS	(sizeof(__int32_t) * __DARWIN_NBBY) /* bits per mask */
-#define	__DARWIN_howmany(x, y)	((((x) % (y)) == 0) ? ((x) / (y)) : (((x) / (y)) + 1)) /* # y's == x bits? */
-
-__BEGIN_DECLS
-typedef	struct fd_set {
-	__int32_t	fds_bits[__DARWIN_howmany(__DARWIN_FD_SETSIZE, __DARWIN_NFDBITS)];
-} fd_set;
-__END_DECLS
-
-/* This inline avoids argument side-effect issues with FD_ISSET() */
-static __inline int
-__darwin_fd_isset(int _n, const struct fd_set *_p)
-{
-	return (_p->fds_bits[_n/__DARWIN_NFDBITS] & (1<<(_n % __DARWIN_NFDBITS)));
-}
-
-#define	__DARWIN_FD_SET(n, p)	do { int __fd = (n); ((p)->fds_bits[__fd/__DARWIN_NFDBITS] |= (1<<(__fd % __DARWIN_NFDBITS))); } while(0)
-#define	__DARWIN_FD_CLR(n, p)	do { int __fd = (n); ((p)->fds_bits[__fd/__DARWIN_NFDBITS] &= ~(1<<(__fd % __DARWIN_NFDBITS))); } while(0)
-#define	__DARWIN_FD_ISSET(n, p)	__darwin_fd_isset((n), (p))
-
-#if __GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3
-/*
- * Use the built-in bzero function instead of the library version so that
- * we do not pollute the namespace or introduce prototype warnings.
- */
-#define	__DARWIN_FD_ZERO(p)	__builtin_bzero(p, sizeof(*(p)))
-#else
-#define	__DARWIN_FD_ZERO(p)	bzero(p, sizeof(*(p)))
-#endif
-
-#define	__DARWIN_FD_COPY(f, t)	bcopy(f, t, sizeof(*(f)))
-#endif /* _FD_SET */
-#endif /* __need_fd_set */
-
-#ifdef __need_stack_t
-#undef __need_stack_t
-#ifndef _STACK_T
-#define _STACK_T
-typedef _STRUCT_SIGALTSTACK	stack_t; /* [???] signal stack */
-#endif /* _STACK_T */
-#endif /* __need_stack_t */
-
-#ifdef __need_ucontext_t
-#undef __need_ucontext_t
-/* user context */
-#ifndef _UCONTEXT_T
-#define _UCONTEXT_T
-typedef _STRUCT_UCONTEXT	ucontext_t;	/* [???] user context */
-#endif /* _UCONTEXT_T */
-#endif /* __need_ucontext_t */
-
-#ifdef __need_ucontext64_t
-#undef __need_ucontext64_t
-#ifndef _UCONTEXT64_T
-#define _UCONTEXT64_T
-typedef _STRUCT_UCONTEXT64	ucontext64_t;	/* [???] user context */
-#endif /* _UCONTEXT64_T */
-#endif /* __need_ucontext64_t */
diff --git a/i386/include/sys/_types.h b/i386/include/sys/_types.h
deleted file mode 100644
index 9047dc2..0000000
--- a/i386/include/sys/_types.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2003-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _SYS__TYPES_H_
-#define _SYS__TYPES_H_
-
-#include <sys/cdefs.h>
-#include <machine/_types.h>
-
-/*
- * Type definitions; takes common type definitions that must be used
- * in multiple header files due to [XSI], removes them from the system
- * space, and puts them in the implementation space.
- */
-
-#ifdef __cplusplus
-#ifdef __GNUG__
-#define __DARWIN_NULL __null
-#else /* ! __GNUG__ */
-#ifdef __LP64__
-#define __DARWIN_NULL (0L)
-#else /* !__LP64__ */
-#define __DARWIN_NULL 0
-#endif /* __LP64__ */
-#endif /* __GNUG__ */
-#else /* ! __cplusplus */
-#define __DARWIN_NULL ((void *)0)
-#endif /* __cplusplus */
-
-typedef	__int64_t	__darwin_blkcnt_t;	/* total blocks */
-typedef	__int32_t	__darwin_blksize_t;	/* preferred block size */
-typedef __int32_t	__darwin_dev_t;		/* dev_t */
-typedef unsigned int	__darwin_fsblkcnt_t;	/* Used by statvfs and fstatvfs */
-typedef unsigned int	__darwin_fsfilcnt_t;	/* Used by statvfs and fstatvfs */
-typedef __uint32_t	__darwin_gid_t;		/* [???] process and group IDs */
-typedef __uint32_t	__darwin_id_t;		/* [XSI] pid_t, uid_t, or gid_t*/
-typedef __uint64_t	__darwin_ino64_t;	/* [???] Used for 64 bit inodes */
-#if __DARWIN_64_BIT_INO_T
-typedef __darwin_ino64_t __darwin_ino_t;	/* [???] Used for inodes */
-#else /* !__DARWIN_64_BIT_INO_T */
-typedef __uint32_t	__darwin_ino_t;		/* [???] Used for inodes */
-#endif /* __DARWIN_64_BIT_INO_T */
-typedef __darwin_natural_t __darwin_mach_port_name_t; /* Used by mach */
-typedef __darwin_mach_port_name_t __darwin_mach_port_t; /* Used by mach */
-typedef __uint16_t	__darwin_mode_t;	/* [???] Some file attributes */
-typedef __int64_t	__darwin_off_t;		/* [???] Used for file sizes */
-#ifndef	_OFF_T
-#define	_OFF_T
-typedef	__darwin_off_t		off_t;
-#endif
-typedef __int32_t	__darwin_pid_t;		/* [???] process and group IDs */
-typedef __uint32_t	__darwin_sigset_t;	/* [???] signal set */
-typedef __int32_t	__darwin_suseconds_t;	/* [???] microseconds */
-typedef __uint32_t	__darwin_uid_t;		/* [???] user IDs */
-typedef __uint32_t	__darwin_useconds_t;	/* [???] microseconds */
-typedef	unsigned char	__darwin_uuid_t[16];
-typedef	char	__darwin_uuid_string_t[37];
-
-#endif	/* _SYS__TYPES_H_ */
diff --git a/i386/include/sys/appleapiopts.h b/i386/include/sys/appleapiopts.h
deleted file mode 100644
index 2055701..0000000
--- a/i386/include/sys/appleapiopts.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef __SYS_APPLEAPIOPTS_H__
-#define __SYS_APPLEAPIOPTS_H__
-
-
-#ifndef __APPLE_API_STANDARD
-#define __APPLE_API_STANDARD
-#endif /* __APPLE_API_STANDARD */
-
-#ifndef __APPLE_API_STABLE
-#define __APPLE_API_STABLE
-#endif /* __APPLE_API_STABLE */
-
-#ifndef __APPLE_API_STRICT_CONFORMANCE
-
-#ifndef __APPLE_API_EVOLVING
-#define __APPLE_API_EVOLVING
-#endif /* __APPLE_API_EVOLVING */
-
-#ifndef __APPLE_API_UNSTABLE
-#define __APPLE_API_UNSTABLE
-#endif /* __APPLE_API_UNSTABLE */
-
-#ifndef __APPLE_API_PRIVATE
-#define __APPLE_API_PRIVATE
-#endif /* __APPLE_API_PRIVATE */
-
-#ifndef __APPLE_API_OBSOLETE
-#define __APPLE_API_OBSOLETE
-#endif /* __APPLE_API_OBSOLETE */
-
-#endif /* __APPLE_API_STRICT_CONFORMANCE */
-
-#endif /* __SYS_APPLEAPIOPTS_H__ */
-
diff --git a/i386/include/sys/buf.h b/i386/include/sys/buf.h
deleted file mode 100644
index 6f0db77..0000000
--- a/i386/include/sys/buf.h
+++ /dev/null
@@ -1,859 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- */
-
-#ifndef _SYS_BUF_H_
-#define	_SYS_BUF_H_
-
-#include <sys/cdefs.h>
-#include <sys/kernel_types.h>
-#include <mach/memory_object_types.h>
-
-
-#define	B_WRITE		0x00000000	/* Write buffer (pseudo flag). */
-#define	B_READ		0x00000001	/* Read buffer. */
-#define	B_ASYNC		0x00000002	/* Start I/O, do not wait. */
-#define	B_NOCACHE	0x00000004	/* Do not cache block after use. */
-#define	B_DELWRI	0x00000008	/* Delay I/O until buffer reused. */
-#define	B_LOCKED	0x00000010	/* Locked in core (not reusable). */
-#define	B_PHYS		0x00000020	/* I/O to user memory. */
-#define B_CLUSTER	0x00000040	/* UPL based I/O generated by cluster layer */
-#define	B_PAGEIO	0x00000080	/* Page in/out */
-#define	B_META		0x00000100	/* buffer contains meta-data. */
-#define	B_RAW		0x00000200	/* Set by physio for raw transfers. */
-#define	B_FUA		0x00000400	/* Write-through disk cache(if supported) */
-#define B_PASSIVE	0x00000800	/* PASSIVE I/Os are ignored by THROTTLE I/O */
-#define	B_IOSTREAMING	0x00001000	/* sequential access pattern detected */
-#define B_THROTTLED_IO	0x00002000	/* low priority I/O */
-/*
- * make sure to check when adding flags that
- * that the new flags don't overlap the definitions
- * in buf_internal.h
- */
-
-__BEGIN_DECLS
-
-/*!
- @function buf_markaged
- @abstract Mark a buffer as "aged," i.e. as a good candidate to be discarded and reused after buf_brelse().
- @param bp Buffer to mark.
- */
-void	buf_markaged(buf_t);
-
-/*!
- @function buf_markinvalid
- @abstract Mark a buffer as not having valid data and being ready for immediate reuse after buf_brelse().
- @param bp Buffer to mark.
- */
-void	buf_markinvalid(buf_t);
-
-/*!
- @function buf_markdelayed
- @abstract Mark a buffer as a delayed write: mark it dirty without actually scheduling I/O.
- @discussion Data will be flushed to disk at some later time, not with brelse(). A sync()/fsync()
- or pressure necessitating reuse of the buffer will cause it to be written back to disk.
- @param bp Buffer to mark.
- */
-void	buf_markdelayed(buf_t);
-
-/*!
- @function buf_markeintr
- @abstract Mark a buffer as having been interrupted during I/O.
- @discussion Waiters for I/O to complete (buf_biowait()) will return with EINTR when woken up.  
- buf_markeintr does not itself do a wakeup.
- @param bp Buffer to mark.
- */
-void	buf_markeintr(buf_t);
-
-/*!
- @function buf_markfua
- @abstract Mark a buffer for write through disk cache, if disk supports it.
- @param bp Buffer to mark.
- */
-void	buf_markfua(buf_t);
-
-/*!
- @function buf_fua
- @abstract Check if a buffer is marked for write through disk caches.
- @param bp Buffer to test.
- @return Nonzero if buffer is marked for write-through, 0 if not.
- */
-int	buf_fua(buf_t);
-
-/*!
- @function buf_valid
- @abstract Check if a buffer contains valid data.
- @param bp Buffer to test.
- @return Nonzero if buffer has valid data, 0 if not.
- */
-int	buf_valid(buf_t);
-
-/*!
- @function buf_fromcache
- @abstract Check if a buffer's data was found in core.
- @discussion Will return truth after a buf_getblk that finds a valid buffer in the cache or the relevant
- data in core (but not in a buffer).
- @param bp Buffer to test.
- @return Nonzero if we got this buffer's data without doing I/O, 0 if not.
- */
-int	buf_fromcache(buf_t);
-
-/*!
- @function buf_upl
- @abstract Get the upl (Universal Page List) associated with a buffer.
- @discussion Buffers allocated with buf_alloc() are not returned with a upl, and
- traditional buffers only have a upl while an I/O is in progress.
- @param bp Buffer whose upl to grab.
- @return Buffer's upl if it has one, else NULL.
- */
-void *	buf_upl(buf_t);
-
-/*!
- @function buf_uploffset
- @abstract Get the offset into a UPL at which this buffer begins.
- @discussion This function should only be called on iobufs, i.e. buffers allocated with buf_alloc().
- @param bp Buffer whose uploffset to grab.
- @return Buffer's uploffset--does not check whether that value makes sense for this buffer.
- */
-uint32_t buf_uploffset(buf_t);
-
-
-
-/*!
- @function buf_proc
- @abstract Get the process associated with this buffer.
- @discussion buf_proc() will generally return NULL; a process is currently only associated with
- a buffer in the event of a physio() call.  
- @param bp Buffer whose associated process to find.
- @return Associated process, possibly NULL.
- */
-proc_t	buf_proc(buf_t);
-
-/*!
- @function buf_dirtyoff
- @abstract Get the starting offset of the dirty region associated with a buffer.
- @discussion The dirty offset is zero unless someone explicitly calls buf_setdirtyoff() (which the kernel does not).
- @param bp Buffer whose dirty offset to get.
- @return Dirty offset (0 if not explicitly changed).
- */
-uint32_t buf_dirtyoff(buf_t);
-
-/*!
- @function buf_dirtyend
- @abstract Get the ending offset of the dirty region associated with a buffer.
- @discussion If the buffer's data was found incore and dirty, the dirty end is the size of the block; otherwise, unless
- someone outside of xnu explicitly changes it by calling buf_setdirtyend(), it will be zero.
- @param bp Buffer whose dirty end to get.
- @return 0 if buffer is found clean; size of buffer if found dirty.  Can be set to any value by callers of buf_setdirtyend().
- */
-uint32_t buf_dirtyend(buf_t);
-
-/*!
- @function buf_setdirtyoff
- @abstract Set the starting offset of the dirty region associated with a buffer.
- @discussion This value is zero unless someone set it explicitly.
- @param bp Buffer whose dirty end to set.
- @return void.
- */
-void	buf_setdirtyoff(buf_t, uint32_t);
-
-/*!
- @function buf_setdirtyend
- @abstract Set the ending offset of the dirty region associated with a buffer.
- @discussion If the buffer's data was found incore and dirty, the dirty end is the size of the block; otherwise, unless
- someone outside of xnu explicitly changes it by calling buf_setdirtyend(), it will be zero.
- @param bp Buffer whose dirty end to set.
- @return void.
- */
-void	buf_setdirtyend(buf_t, uint32_t);
-
-/*!
- @function buf_error
- @abstract Get the error value associated with a buffer.
- @discussion Errors are set with buf_seterror().
- @param bp Buffer whose error value to retrieve.
- @return Error value, directly.
- */
-errno_t	buf_error(buf_t);
-
-/*!
- @function buf_seterror
- @abstract Set an error value on a buffer.
- @param bp Buffer whose error value to set.
- @return void.
- */
-void	buf_seterror(buf_t, errno_t);
-
-/*!
- @function buf_setflags
- @abstract Set flags on a buffer.
- @discussion: buffer_flags |= flags
- @param bp Buffer whose flags to set.
- @param flags Flags to add to buffer's mask. B_LOCKED/B_NOCACHE/B_ASYNC/B_READ/B_WRITE/B_PAGEIO/B_FUA
- @return void.
- */
-void	buf_setflags(buf_t, int32_t);
-
-/*!
- @function buf_clearflags
- @abstract Clear flags on a buffer.
- @discussion: buffer_flags &= ~flags
- @param bp Buffer whose flags to clear.
- @param flags Flags to remove from buffer's mask. B_LOCKED/B_NOCACHE/B_ASYNC/B_READ/B_WRITE/B_PAGEIO/B_FUA
- @return void.
- */
-void	buf_clearflags(buf_t, int32_t);
-
-/*!
- @function buf_flags
- @abstract Get flags set on a buffer.
- @discussion Valid flags are B_LOCKED/B_NOCACHE/B_ASYNC/B_READ/B_WRITE/B_PAGEIO/B_FUA.
- @param bp Buffer whose flags to grab.
- @return flags.
- */
-int32_t	buf_flags(buf_t);
-
-/*!
- @function buf_reset
- @abstract Reset I/O flag state on a buffer.
- @discussion Clears current flags on a buffer (internal and external) and allows some new flags to be set.
- Used perhaps to prepare an iobuf for reuse.
- @param bp Buffer whose flags to grab.  
- @param flags Flags to set on buffer: B_READ, B_WRITE, B_ASYNC, B_NOCACHE.
- @return void.
- */
-void	buf_reset(buf_t, int32_t);
-
-/*!
- @function buf_map
- @abstract Get virtual mappings for buffer data.
- @discussion For buffers created through buf_getblk() (i.e. traditional buffer cache usage), 
- buf_map() just returns the address at which data was mapped by but_getblk().  For a B_CLUSTER buffer, i.e. an iobuf
- whose upl state is managed manually, there are two possibilities.  If the buffer was created
- with an underlying "real" buffer through cluster_bp(), the mapping of the "real" buffer is returned.
- Otherwise, the buffer was created with buf_alloc() and buf_setupl() was subsequently called; buf_map()
- will call ubc_upl_map() to get a mapping for the buffer's upl and return the start of that mapping
- plus the buffer's upl offset (set in buf_setupl()).  In the last case, buf_unmap() must later be called
- to tear down the mapping.  NOTE: buf_map() does not set the buffer data pointer; this must be done with buf_setdataptr().
- @param bp Buffer whose mapping to find or create.
- @param io_addr Destination for mapping address.
- @return 0 for success, ENOMEM if unable to map the buffer.
- */
-errno_t	buf_map(buf_t, caddr_t *);
-
-/*!
- @function buf_unmap
- @abstract Release mappings for buffer data.
- @discussion For buffers created through buf_getblk() (i.e. traditional buffer cache usage), 
- buf_unmap() does nothing; buf_brelse() will take care of unmapping.  For a B_CLUSTER buffer, i.e. an iobuf
- whose upl state is managed manually, there are two possibilities.  If the buffer was created
- with an underlying "real" buffer through cluster_bp(), buf_unmap() does nothing; buf_brelse() on the
- underlying buffer will tear down the mapping. Otherwise, the buffer was created with buf_alloc() and 
- buf_setupl() was subsequently called; buf_map() created the mapping.  In this case, buf_unmap() will
- unmap the buffer.
- @param bp Buffer whose mapping to find or create.
- @param io_addr Destination for mapping address.
- @return 0 for success, EINVAL if unable to unmap buffer.
- */
-errno_t	buf_unmap(buf_t);
-
-/*!
- @function buf_setdrvdata
- @abstract Set driver-specific data on a buffer.
- @param bp Buffer whose driver-data to set.
- @param drvdata Opaque driver data.
- @return void.
- */
-void 	buf_setdrvdata(buf_t, void *);
-
-/*!
- @function buf_setdrvdata
- @abstract Get driver-specific data from a buffer.
- @param bp Buffer whose driver data to get.
- @return Opaque driver data.
- */
-void *	buf_drvdata(buf_t);
-
-/*!
- @function buf_setfsprivate
- @abstract Set filesystem-specific data on a buffer.
- @param bp Buffer whose filesystem data to set.
- @param fsprivate Opaque filesystem data.
- @return void.
- */
-void 	buf_setfsprivate(buf_t, void *);
-
-/*!
- @function buf_fsprivate
- @abstract Get filesystem-specific data from a buffer.
- @param bp Buffer whose filesystem data to get.
- @return Opaque filesystem data.
- */
-void *	buf_fsprivate(buf_t);
-
-/*!
- @function buf_blkno
- @abstract Get physical block number associated with a buffer, in the sense of VNOP_BLOCKMAP.
- @discussion When a buffer's physical block number is the same is its logical block number, then the physical
- block number is considered uninitialized.  A physical block number of -1 indicates that there is no valid
- physical mapping (e.g. the logical block is invalid or corresponds to a sparse region in a file).  Physical
- block number is normally set by the cluster layer or by buf_getblk().
- @param bp Buffer whose physical block number to get.
- @return Block number.
- */
-daddr64_t buf_blkno(buf_t);
-
-/*!
- @function buf_lblkno
- @abstract Get logical block number associated with a buffer.
- @discussion Logical block number is set on traditionally-used buffers by an argument passed to buf_getblk(),
- for example by buf_bread().
- @param bp Buffer whose logical block number to get.
- @return Block number.
- */
-daddr64_t buf_lblkno(buf_t);
-
-/*!
- @function buf_setblkno
- @abstract Set physical block number associated with a buffer.
- @discussion Physical block number is generally set by the cluster layer or by buf_getblk().
- @param bp Buffer whose physical block number to set.
- @param blkno Block number to set.
- @return void.
- */
-void	buf_setblkno(buf_t, daddr64_t);
-
-/*!
- @function buf_setlblkno
- @abstract Set logical block number associated with a buffer.
- @discussion Logical block number is set on traditionally-used buffers by an argument passed to buf_getblk(),
- for example by buf_bread().
- @param bp Buffer whose logical block number to set.
- @param lblkno Block number to set.
- @return void.
- */
-void	buf_setlblkno(buf_t, daddr64_t);
-
-/*!
- @function buf_count
- @abstract Get count of valid bytes in a buffer.  This may be less than the space allocated to the buffer.
- @param bp Buffer whose byte count to get.
- @return Byte count.
- */
-uint32_t buf_count(buf_t);
-
-/*!
- @function buf_size
- @abstract Get size of data region allocated to a buffer.
- @discussion May be larger than amount of valid data in buffer.
- @param bp Buffer whose size to get.
- @return Size.
- */
-uint32_t buf_size(buf_t);
-
-/*!
- @function buf_resid
- @abstract Get a count of bytes which were not consumed by an I/O on a buffer.
- @discussion Set when an I/O operations completes.
- @param bp Buffer whose outstanding count to get.
- @return Count of unwritten/unread bytes.
- */
-uint32_t buf_resid(buf_t);
-
-/*!
- @function buf_setcount
- @abstract Set count of valid bytes in a buffer.  This may be less than the space allocated to the buffer.
- @param bp Buffer whose byte count to set.
- @param bcount Count to set.
- @return void.
- */
-void	buf_setcount(buf_t, uint32_t);
-
-/*!
- @function buf_setsize
- @abstract Set size of data region allocated to a buffer.
- @discussion May be larger than amount of valid data in buffer.  Should be used by 
- code which is manually providing storage for an iobuf, one allocated with buf_alloc().
- @param bp Buffer whose size to set.
- @return void.
- */
-void	buf_setsize(buf_t, uint32_t);
-
-/*!
- @function buf_setresid
- @abstract Set a count of bytes outstanding for I/O in a buffer.
- @discussion Set when an I/O operations completes.  Examples: called by IOStorageFamily when I/O
- completes, often called on an "original" buffer when using a manipulated buffer to perform I/O 
- on behalf of the first.
- @param bp Buffer whose outstanding count to set.
- @return Count of unwritten/unread bytes.
- */
-void	buf_setresid(buf_t, uint32_t);
-
-/*!
- @function buf_setdataptr
- @abstract Set the address at which a buffer's data will be stored.
- @discussion In traditional buffer use, the data pointer will be set automatically. This routine is
- useful with iobufs (allocated with buf_alloc()).
- @param bp Buffer whose data pointer to set.
- @param data Pointer to data region.
- @return void.
- */
-void	buf_setdataptr(buf_t, uintptr_t);
-
-/*!
- @function buf_dataptr
- @abstract Get the address at which a buffer's data is stored; for iobufs, this must
- be set with buf_setdataptr().  See buf_map().
- @param bp Buffer whose data pointer to retrieve.
- @return Data pointer; NULL if unset.
- */
-uintptr_t buf_dataptr(buf_t);
-
-/*!
- @function buf_vnode
- @abstract Get the vnode associated with a buffer.
- @discussion Every buffer is associated with a file.  Because there is an I/O in flight,
- there is an iocount on this vnode; it is returned WITHOUT an extra iocount, and vnode_put()
- need NOT be called.
- @param bp Buffer whose vnode to retrieve.
- @return Buffer's vnode.
- */
-vnode_t	buf_vnode(buf_t);
-
-/*!
- @function buf_setvnode
- @abstract Set the vnode associated with a buffer.
- @discussion This call need not be used on traditional buffers; it is for use with iobufs.
- @param bp Buffer whose vnode to set.
- @param vp The vnode to attach to the buffer.
- @return void.
- */
-void	buf_setvnode(buf_t, vnode_t);
-
-/*!
- @function buf_setdevice
- @abstract Set the device associated with a buffer.
- @discussion A buffer's device is set in buf_strategy() (or in buf_getblk() if the file is a device).  
- It is also set on an iobuf if buf_alloc() is passed a device vnode.
- @param bp Buffer whose device ID to set.
- @param vp Device to set on the buffer.
- @return 0 for success, EINVAL if vp is not a device file.
- */
-errno_t	buf_setdevice(buf_t, vnode_t);
-
-/*!
- @function buf_strategy
- @abstract Pass an I/O request for a buffer down to the device layer.
- @discussion This is one of the most important routines in the buffer cache layer.  For buffers obtained
- through buf_getblk, it handles finding physical block numbers for the I/O (with VNOP_BLKTOOFF and 
- VNOP_BLOCKMAP), packaging the I/O into page-sized chunks, and initiating I/O on the disk by calling 
- the device's strategy routine. If a buffer's UPL has been set manually with buf_setupl(), it assumes 
- that the request is already correctly configured with a block number and a size divisible by page size
- and will just call directly to the device.
- @param devvp Device on which to perform I/O
- @param ap vnop_strategy_args structure (most importantly, a buffer).
- @return 0 for success, or errors from filesystem or device layers.
- */
-errno_t	buf_strategy(vnode_t, void *);
-
-/* 
- * Flags for buf_invalblkno() 
- */
-#define	BUF_WAIT	0x01
-
-/*!
- @function buf_invalblkno
- @abstract Invalidate a filesystem logical block in a file.
- @discussion buf_invalblkno() tries to make the data for a given block in a file
- invalid; if the buffer for that block is found in core and is not busy, we mark it 
- invalid and call buf_brelse() (see "flags" param for what happens if the buffer is busy).
- buf_brelse(), noticing that it is invalid, will 
- will return the buffer to the empty-buffer list and tell the VM subsystem to abandon 
- the relevant pages.  Data will not be written to backing store--it will be cast aside.
- Note that this function will only work if the block in question has been
- obtained with a buf_getblk().  If data has been read into core without using
- traditional buffer cache routines, buf_invalblkno() will not be able to invalidate it--this
- includes the use of iobufs.
- @param bp Buffer whose block to invalidate.
- @param lblkno Logical block number.
- @param flags BUF_WAIT: wait for busy buffers to become unbusy and invalidate them then.  Otherwise,
- just return EBUSY for busy blocks.
- @return 0 for success, EINVAL if vp is not a device file.
- */
-errno_t	buf_invalblkno(vnode_t, daddr64_t, int);
-
-/*!
- @function buf_callback
- @abstract Get the function set to be called when I/O on a buffer completes.
- @discussion A function returned by buf_callback was originally set with buf_setcallback().
- @param bp Buffer whose callback to get.
- @return 0 for success, or errors from filesystem or device layers.
- */
-void * buf_callback(buf_t);
-
-/*!
- @function buf_setcallback
- @abstract Set a function to be called once when I/O on a buffer completes.
- @discussion A one-shot callout set with buf_setcallback() will be called from buf_biodone()
- when I/O completes. It will be passed the "transaction" argument as well as the buffer.
- buf_setcallback() also marks the buffer as B_ASYNC.
- @param bp Buffer whose callback to set.
- @param callback function to use as callback.
- @param transaction Additional argument to callback function.
- @return 0; always succeeds.
- */
-errno_t	buf_setcallback(buf_t, void (*)(buf_t, void *), void *);
-
-/*!
- @function buf_setupl
- @abstract Set the UPL (Universal Page List), and offset therein, on a buffer.
- @discussion buf_setupl() should only be called on buffers allocated with buf_alloc().
- A subsequent call to buf_map() will map the UPL and give back the address at which data
- begins. After buf_setupl() is called, a buffer is marked B_CLUSTER; when this is the case,
- buf_strategy() assumes that a buffer is correctly configured to be passed to the device
- layer without modification. Passing a NULL upl will clear the upl and the B_CLUSTER flag on the
- buffer.
- @param bp Buffer whose upl to set.
- @param upl UPL to set in the buffer.
- @parma offset Offset within upl at which relevant data begin.
- @return 0 for success, EINVAL if the buffer was not allocated with buf_alloc().
- */
-errno_t	buf_setupl(buf_t, upl_t, uint32_t);
-
-/*!
- @function buf_clone
- @abstract Clone a buffer with a restricted range and an optional callback.
- @discussion Generates a buffer which is identical to its "bp" argument except that
- it spans a subset of the data of the original.  The buffer to be cloned should
- have been allocated with buf_alloc().  Checks its arguments to make sure
- that the data subset is coherent. Optionally, adds a callback function and argument to it
- to be called when I/O completes (as with buf_setcallback(), but B_ASYNC is not set).  If the original buffer had
- a upl set through buf_setupl(), this upl is copied to the new buffer; otherwise, the original's
- data pointer is used raw. The buffer must be released with buf_free().
- @param bp Buffer to clone.
- @param io_offset Offset, relative to start of data in original buffer, at which new buffer's data will begin. 
- @param io_size Size of buffer region in new buffer, in the sense of buf_count().
- @param iodone Callback to be called from buf_biodone() when I/O completes, in the sense of buf_setcallback().
- @param arg Argument to pass to iodone() callback.
- @return NULL if io_offset/io_size combination is invalid for the buffer to be cloned; otherwise, the new buffer.
- */
-buf_t	buf_clone(buf_t, int, int, void (*)(buf_t, void *), void *);
-
-/*!
- @function buf_alloc
- @abstract Allocate an uninitialized buffer.
- @discussion A buffer returned by buf_alloc() is marked as busy and as an iobuf; it has no storage set up and must be
- set up using buf_setdataptr() or buf_setupl()/buf_map().
- @param vp vnode to associate with the buffer: optionally NULL.  If vp is a device file, then
- the buffer's associated device will be set. If vp is NULL, it can be set later with buf_setvnode().
- @return New buffer.
- */
-buf_t 	buf_alloc(vnode_t);
-
-/*!
- @function buf_free
- @abstract Free a buffer that was allocated with buf_alloc().
- @discussion The storage (UPL, data pointer) associated with an iobuf must be freed manually.
- @param bp The buffer to free.
- @return void.
- */
-void	buf_free(buf_t);
-
-/*
- * flags for buf_invalidateblks
- */
-#define	BUF_WRITE_DATA	0x0001		/* write data blocks first */
-#define	BUF_SKIP_META	0x0002		/* skip over metadata blocks */
-
-/*!
- @function buf_invalidateblks
- @abstract Invalidate all the blocks associated with a vnode.
- @discussion This function does for all blocks associated with a vnode what buf_invalblkno does for one block.
- Again, it will only be able to invalidate data which were populated with traditional buffer cache routines,
- i.e. by buf_getblk() and callers thereof. Unlike buf_invalblkno(), it can be made to write dirty data to disk
- rather than casting it aside.
- @param bp The buffer whose data to invalidate.
- @param flags BUF_WRITE_DATA: write dirty data to disk with VNOP_BWRITE() before kicking buffer cache entries out.
- BUF_SKIP_META: do not invalidate metadata blocks.
- @param slpflag Flags to pass to "msleep" while waiting to acquire busy buffers. 
- @param slptimeo Timeout in "hz" (1/100 second) to wait for a buffer to become unbusy before waking from sleep
- and re-starting the scan.
- @return 0 for success, error values from msleep().
- */
-int	buf_invalidateblks(vnode_t, int, int, int);
-
-/*
- * flags for buf_flushdirtyblks and buf_iterate
- */
-#define BUF_SKIP_NONLOCKED	0x01
-#define BUF_SKIP_LOCKED		0x02
-#define BUF_SCAN_CLEAN		0x04	/* scan the clean buffers */
-#define BUF_SCAN_DIRTY		0x08	/* scan the dirty buffers */
-#define BUF_NOTIFY_BUSY		0x10	/* notify the caller about the busy pages during the scan */
-
-
-#define	BUF_RETURNED		0
-#define BUF_RETURNED_DONE	1
-#define BUF_CLAIMED		2
-#define	BUF_CLAIMED_DONE	3
-/*!
- @function buf_flushdirtyblks
- @abstract Write dirty file blocks to disk.
- @param vp The vnode whose blocks to flush.
- @param wait Wait for writes to complete before returning.
- @param flags Can pass zero, meaning "flush all dirty buffers."  
- BUF_SKIP_NONLOCKED: Skip buffers which are not busy when we encounter them.
- BUF_SKIP_LOCKED: Skip buffers which are busy when we encounter them.
- @param msg String to pass to msleep().
- @return void.
- */
-void	buf_flushdirtyblks(vnode_t, int, int, const char *);
-
-/*!
- @function buf_iterate
- @abstract Perform some operation on all buffers associated with a vnode.
- @param vp The vnode whose buffers to scan.
- @param callout Function to call on each buffer.  Should return one of:
- BUF_RETURNED: buf_iterate() should call buf_brelse() on the buffer.
- BUF_RETURNED_DONE: buf_iterate() should call buf_brelse() on the buffer and then stop iterating.
- BUF_CLAIMED: buf_iterate() should continue iterating (and not call buf_brelse()).
- BUF_CLAIMED_DONE: buf_iterate() should stop iterating (and not call buf_brelse()).
- @param flag
- BUF_SKIP_NONLOCKED: Skip buffers which are not busy when we encounter them. BUF_SKIP_LOCKED: Skip buffers which are busy when we encounter them.
- BUF_SCAN_CLEAN: Call out on clean buffers.
- BUF_SCAN_DIRTY: Call out on dirty buffers.
- BUF_NOTIFY_BUSY: If a buffer cannot be acquired, pass a NULL buffer to callout; otherwise,
- that buffer will be silently skipped.
- @param arg Argument to pass to callout in addition to buffer.
- @return void.
- */
-void	buf_iterate(vnode_t, int (*)(buf_t, void *), int, void *);
-
-/*!
- @function buf_clear
- @abstract Zero out the storage associated with a buffer. 
- @discussion Calls buf_map() to get the buffer's data address; for a B_CLUSTER
- buffer (one which has had buf_setupl() called on it), it tries to map the buffer's
- UPL into memory; should only be called once during the life cycle of an iobuf (one allocated
- with buf_alloc()).  
- @param bp The buffer to zero out.
- @return void.
- */
-void	buf_clear(buf_t);
-
-/*!
- @function buf_bawrite
- @abstract Start an asychronous write on a buffer.
- @discussion Calls VNOP_BWRITE to start the process of propagating an asynchronous write down to the device layer.
- Callers can wait for writes to complete at their discretion using buf_biowait().  When this function is called,
- data should already have been written to the buffer's data region.
- @param bp The buffer on which to initiate I/O.
- @param throttle If "throttle" is nonzero and more than VNODE_ASYNC_THROTTLE writes are in progress on this file,
- buf_bawrite() will block until the write count drops below VNODE_ASYNC_THROTTLE.  If "throttle" is zero and the write
- count is high, it will fail with EWOULDBLOCK; the caller can decide whether to make a blocking call or pursue
- other opportunities.
- @return EWOULDBLOCK if write count is high and "throttle" is zero; otherwise, errors from VNOP_BWRITE.
- */
-errno_t	buf_bawrite(buf_t);
-
-/*!
- @function buf_bdwrite
- @abstract Mark a buffer for delayed write.
- @discussion Marks a buffer as waiting for delayed write and the current I/O as complete; data will be written to backing store
- before the buffer is reused, but it will not be queued for I/O immediately.  Note that for buffers allocated
- with buf_alloc(), there are no such guarantees; you must take care of your own flushing to disk.  If
- the number of delayed writes pending on the system is greater than an internal limit and the caller has not
- requested otherwise [see return_error] , buf_bdwrite() will unilaterally launch an asynchronous I/O with buf_bawrite() to keep the pile of
- delayed writes from getting too large.
- @param bp The buffer to mark for delayed write.
- @param return_error If the number of pending delayed writes systemwide is larger than an internal limit,
- return EAGAIN rather than doing an asynchronous write.
- @return EAGAIN for return_error != 0 case, 0 for succeess, errors from buf_bawrite.
- */
-errno_t	buf_bdwrite(buf_t);
-
-/*!
- @function buf_bwrite
- @abstract Write a buffer's data to backing store.
- @discussion Once the data in a buffer has been modified, buf_bwrite() starts sending it to disk by calling
- VNOP_STRATEGY.  Unless B_ASYNC has been set on the buffer (by buf_setflags() or otherwise), data will have 
- been written to disk when buf_bwrite() returns.  See Bach (p 56).
- @param bp The buffer to write to disk.
- @return 0 for success; errors from buf_biowait().
- */
-errno_t	buf_bwrite(buf_t);
-
-/*!
- @function buf_biodone
- @abstract Mark an I/O as completed.
- @discussion buf_biodone() should be called by whosoever decides that an I/O on a buffer is complete; for example,
- IOStorageFamily.  It clears the dirty flag on a buffer and signals on the vnode that a write has completed
- with vnode_writedone(). If a callout or filter has been set on the buffer, that function is called.  In the case
- of a callout, that function is expected to take care of cleaning up and freeing the buffer.
- Otherwise, if the buffer is marked B_ASYNC (e.g. it was passed to buf_bawrite()), then buf_biodone()
- considers itself justified in calling buf_brelse() to return it to free lists--no one is waiting for it.  Finally, 
- waiters on the bp (e.g. in buf_biowait()) are woken up.
- @param bp The buffer to mark as done with I/O.
- @return void.
- */
-void	buf_biodone(buf_t);
-
-/*!
- @function buf_biowait
- @abstract Wait for I/O on a buffer to complete.
- @discussion Waits for I/O on a buffer to finish, as marked by a buf_biodone() call.  
- @param bp The buffer to wait on.
- @return 0 for a successful wait; nonzero the buffer has been marked as EINTR or had an error set on it.
- */
-errno_t	buf_biowait(buf_t);
-
-/*!
- @function buf_brelse
- @abstract Release any claim to a buffer, sending it back to free lists.
- @discussion buf_brelse() cleans up buffer state and releases a buffer to the free lists.  If the buffer
- is not marked invalid and its pages are dirty (e.g. a delayed write was made), its data will be commited
- to backing store. If it is marked invalid, its data will be discarded completely.  
- A valid, cacheable buffer will be put on a list and kept in the buffer hash so it
- can be found again; otherwise, it will be dissociated from its vnode and treated as empty.  Which list a valid
- buffer is placed on depends on the use of buf_markaged(), whether it is metadata, and the B_LOCKED flag.  A
- B_LOCKED buffer will not be available for reuse by other files, though its data may be paged out.
- Note that buf_brelse() is intended for use with traditionally allocated buffers.
- @param bp The buffer to release.
- @retrn void.
- */
-void	buf_brelse(buf_t);
-
-/*!
- @function minphys
- @abstract Adjust a buffer's count to be no more than maximum physical I/O transfer size for the host architecture.
- @discussion physio() takes as a parameter a function to bound transfer sizes for each VNOP_STRATEGY() call.  minphys()
- is a default implementation.  It calls buf_setcount() to make the buffer's count the min() of its current count
- and the max I/O size for the host architecture.
- @param bp The buffer whose byte count to modify.
- @return New byte count.
- */
-u_int	minphys(buf_t bp);
-
-/*
- * Flags for operation type in getblk()
- */
-#define	BLK_READ	0x01	/* buffer for read */
-#define	BLK_WRITE	0x02	/* buffer for write */
-#define	BLK_META	0x10	/* buffer for metadata */
-/*
- * modifier for above flags...  if set, getblk will only return
- * a bp that is already valid... i.e. found in the cache
- */
-#define BLK_ONLYVALID	0x80000000
-                                  
-/*!
- @function buf_getblk
- @abstract Traditional buffer cache routine to get a buffer corresponding to a logical block in a file.
- @discussion buf_getblk() gets a buffer, not necessarily containing valid data, representing a block in a file.  
- A metadata buffer will be returned with its own zone-allocated storage, managed by the traditional buffer-cache
- layer, whereas data buffers will be returned hooked into backing by the UBC (which in fact controls the caching of data).
- buf_getblk() first looks for the buffer header in cache; if the buffer is in-core but busy, buf_getblk() will wait for it to become
- unbusy, depending on the slpflag and slptimeo parameters. If the buffer is found unbusy and is a metadata buffer,
- it must already contain valid data and will be returned directly; data buffers will have a UPL configured to
- prepare for interaction with the underlying UBC.  If the buffer is found in core, it will be marked as such
- and buf_fromcache() will return truth. A buffer is allocated and initialized (but not filled with data)
- if none is found in core. buf_bread(), buf_breadn(), buf_meta_bread(), and buf_meta_breadn() all 
- return buffers obtained with buf_getblk().
- @param vp File for which to get block.
- @param blkno Logical block number.
- @param size Size of block.
- @param slpflag Flag to pass to msleep() while waiting for buffer to become unbusy.
- @param slptimeo Time, in milliseconds, to wait for buffer to become unbusy.  0 means to wait indefinitely.
- @param operation BLK_READ: want a read buffer.  BLK_WRITE: want a write buffer.  BLK_META: want a metadata buffer.  BLK_ONLYVALID: 
- only return buffers which are found in core (do not allocate anew), and do not change buffer size.  The last remark means
- that if a given logical block is found in core with a different size than what is requested, the buffer size will not be modified.
- @return Buffer found in core or newly allocated, either containing valid data or ready for I/O.
- */
-buf_t	buf_getblk(vnode_t, daddr64_t, int, int, int, int);
-
-/*!
- @function buf_geteblk
- @abstract Get a metadata buffer which is marked invalid and not associated with any vnode.
- @discussion A buffer is returned with zone-allocated storage of the specified size, marked B_META and invalid. 
- It has no vnode and is not visible in the buffer hash.  
- @param size Size of buffer.
- @return Always returns a new buffer.
- */
-buf_t	buf_geteblk(int);
-
-
-__END_DECLS
-
-
-/* Macros to clear/set/test flags. */
-#define	SET(t, f)	(t) |= (f)
-#define	CLR(t, f)	(t) &= ~(f)
-#define	ISSET(t, f)	((t) & (f))
-
-
-#endif /* !_SYS_BUF_H_ */
diff --git a/i386/include/sys/cdefs.h b/i386/include/sys/cdefs.h
deleted file mode 100644
index 3240187..0000000
--- a/i386/include/sys/cdefs.h
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright 1995 NeXT Computer, Inc. All rights reserved. */
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Berkeley Software Design, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- */
-
-#ifndef	_CDEFS_H_
-#define	_CDEFS_H_
-
-#if defined(__cplusplus)
-#define	__BEGIN_DECLS	extern "C" {
-#define	__END_DECLS	}
-#else
-#define	__BEGIN_DECLS
-#define	__END_DECLS
-#endif
-
-/*
- * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
- * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
- * The __CONCAT macro is a bit tricky -- make sure you don't put spaces
- * in between its arguments.  __CONCAT can also concatenate double-quoted
- * strings produced by the __STRING macro, but this only works with ANSI C.
- */
-#if defined(__STDC__) || defined(__cplusplus)
-#define	__P(protos)	protos		/* full-blown ANSI C */
-#define	__CONCAT(x,y)	x ## y
-#define	__STRING(x)	#x
-
-#define	__const		const		/* define reserved names to standard */
-#define	__signed	signed
-#define	__volatile	volatile
-#if defined(__cplusplus)
-#define	__inline	inline		/* convert to C++ keyword */
-#else
-#ifndef __GNUC__
-#define	__inline			/* delete GCC keyword */
-#endif /* !__GNUC__ */
-#endif /* !__cplusplus */
-
-#else	/* !(__STDC__ || __cplusplus) */
-#define	__P(protos)	()		/* traditional C preprocessor */
-#define	__CONCAT(x,y)	x/**/y
-#define	__STRING(x)	"x"
-
-#ifndef __GNUC__
-#define	__const				/* delete pseudo-ANSI C keywords */
-#define	__inline
-#define	__signed
-#define	__volatile
-#endif	/* !__GNUC__ */
-
-/*
- * In non-ANSI C environments, new programs will want ANSI-only C keywords
- * deleted from the program and old programs will want them left alone.
- * When using a compiler other than gcc, programs using the ANSI C keywords
- * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS.
- * When using "gcc -traditional", we assume that this is the intent; if
- * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone.
- */
-#ifndef	NO_ANSI_KEYWORDS
-#define	const		__const			/* convert ANSI C keywords */
-#define	inline		__inline
-#define	signed		__signed
-#define	volatile	__volatile
-#endif /* !NO_ANSI_KEYWORDS */
-#endif /* !(__STDC__ || __cplusplus) */
-
-/*
- * GCC1 and some versions of GCC2 declare dead (non-returning) and
- * pure (no side effects) functions using "volatile" and "const";
- * unfortunately, these then cause warnings under "-ansi -pedantic".
- * GCC2 uses a new, peculiar __attribute__((attrs)) style.  All of
- * these work for GNU C++ (modulo a slight glitch in the C++ grammar
- * in the distribution version of 2.5.5).
- */
-#if defined(__MWERKS__) && (__MWERKS__ > 0x2400)
-	/* newer Metrowerks compilers support __attribute__() */
-#elif __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 5
-#define	__dead2		__attribute__((__noreturn__))
-#define	__pure2		__attribute__((__const__))
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7
-#define	__unused	/* no attribute */
-#else
-#define	__unused	__attribute__((__unused__))
-#endif
-#else
-#define	__attribute__(x)	/* delete __attribute__ if non-gcc or gcc1 */
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-/* __dead and __pure are depreciated.  Use __dead2 and __pure2 instead */
-#define	__dead		__volatile
-#define	__pure		__const
-#endif
-#endif
-
-/* Delete pseudo-keywords wherever they are not available or needed. */
-#ifndef __dead
-#define	__dead
-#define	__pure
-#endif
-#ifndef __dead2
-#define	__dead2
-#define	__pure2
-#define	__unused
-#endif
-
-/*
- * GCC 2.95 provides `__restrict' as an extension to C90 to support the
- * C99-specific `restrict' type qualifier.  We happen to use `__restrict' as
- * a way to define the `restrict' type qualifier without disturbing older
- * software that is unaware of C99 keywords.
- */
-#if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#if __STDC_VERSION__ < 199901
-#define __restrict
-#else
-#define __restrict	restrict
-#endif
-#endif
-
-/*
- * Compiler-dependent macros to declare that functions take printf-like
- * or scanf-like arguments.  They are null except for versions of gcc
- * that are known to support the features properly.  Functions declared
- * with these attributes will cause compilation warnings if there is a
- * mismatch between the format string and subsequent function parameter
- * types.
- */
-#if __GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7
-#define __printflike(fmtarg, firstvararg) \
-		__attribute__((__format__ (__printf__, fmtarg, firstvararg)))
-#define __scanflike(fmtarg, firstvararg) \
-		__attribute__((__format__ (__scanf__, fmtarg, firstvararg)))
-#else
-#define __printflike(fmtarg, firstvararg)
-#define __scanflike(fmtarg, firstvararg)
-#endif
-
-#define __IDSTRING(name,string) static const char name[] __unused = string
-
-#ifndef __COPYRIGHT
-#define __COPYRIGHT(s) __IDSTRING(copyright,s)
-#endif
-
-#ifndef __RCSID
-#define __RCSID(s) __IDSTRING(rcsid,s)
-#endif
-
-#ifndef __SCCSID
-#define __SCCSID(s) __IDSTRING(sccsid,s)
-#endif
-
-#ifndef __PROJECT_VERSION
-#define __PROJECT_VERSION(s) __IDSTRING(project_version,s)
-#endif
-
-/*
- * COMPILATION ENVIRONMENTS
- *
- * DEFAULT	By default newly complied code will get POSIX APIs plus
- *		Apple API extensions in scope.
- *
- *		Most users will use this compilation environment to avoid
- *		behavioral differences between 32 and 64 bit code.
- *
- * LEGACY	Defining _NONSTD_SOURCE will get pre-POSIX APIs plus Apple
- *		API extensions in scope.
- *
- *		This is generally equivalent to the Tiger release compilation
- *		environment, except that it cannot be applied to 64 bit code;
- *		its use is discouraged.
- *
- *		We expect this environment to be deprecated in the future.
- *
- * STRICT	Defining _POSIX_C_SOURCE or _XOPEN_SOURCE restricts the
- *		available APIs to exactly the set of APIs defined by the
- *		corresponding standard, based on the value defined.
- *
- *		A correct, portable definition for _POSIX_C_SOURCE is 200112L.
- *		A correct, portable definition for _XOPEN_SOURCE is 600L.
- *
- *		Apple API extensions are not visible in this environment,
- *		which can cause Apple specific code to fail to compile,
- *		or behave incorrectly if prototypes are not in scope or
- *		warnings about missing prototypes are not enabled or ignored.
- *
- * In any compilation environment, for correct symbol resolution to occur,
- * function prototypes must be in scope.  It is recommended that all Apple
- * tools users add either the "-Wall" or "-Wimplicit-function-declaration"
- * compiler flags to their projects to be warned when a function is being
- * used without a prototype in scope.
- */
-
-/* These settings are particular to each product. */
-/* Product: MacOSX */
-#define __DARWIN_ONLY_64_BIT_INO_T	0
-/* #undef __DARWIN_ONLY_UNIX_CONFORMANCE (automatically set for 64-bit) */
-#define __DARWIN_ONLY_VERS_1050		0
-
-/*
- * The __DARWIN_ALIAS macros are used to do symbol renaming; they allow
- * legacy code to use the old symbol, thus maintaining binary compatibility
- * while new code can use a standards compliant version of the same function.
- *
- * __DARWIN_ALIAS is used by itself if the function signature has not
- * changed, it is used along with a #ifdef check for __DARWIN_UNIX03
- * if the signature has changed.  Because the __LP64__ environment
- * only supports UNIX03 semantics it causes __DARWIN_UNIX03 to be
- * defined, but causes __DARWIN_ALIAS to do no symbol mangling.
- *
- * As a special case, when XCode is used to target a specific version of the
- * OS, the manifest constant __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
- * will be defined by the compiler, with the digits representing major version
- * time 100 + minor version times 10 (e.g. 10.5 := 1050).  If we are targeting
- * pre-10.5, and it is the default compilation environment, revert the
- * compilation environment to pre-__DARWIN_UNIX03.
- */
-#if !defined(__DARWIN_ONLY_UNIX_CONFORMANCE)
-#  if defined(__LP64__)
-#    define __DARWIN_ONLY_UNIX_CONFORMANCE 1
-#  else /* !__LP64__ */
-#    define __DARWIN_ONLY_UNIX_CONFORMANCE 0
-#  endif /* __LP64__ */
-#endif /* !__DARWIN_ONLY_UNIX_CONFORMANCE */
-
-#if !defined(__DARWIN_UNIX03)
-#  if   __DARWIN_ONLY_UNIX_CONFORMANCE
-#    if defined(_NONSTD_SOURCE)
-#      error "Can't define _NONSTD_SOURCE when only UNIX conformance is available."
-#    endif /* _NONSTD_SOURCE */
-#    define __DARWIN_UNIX03	1
-#  elif defined(_DARWIN_C_SOURCE) || defined(_XOPEN_SOURCE) || defined(_POSIX_C_SOURCE)
-#    if defined(_NONSTD_SOURCE)
-#      error "Can't define both _NONSTD_SOURCE and any of _DARWIN_C_SOURCE, _XOPEN_SOURCE or _POSIX_C_SOURCE."
-#    endif /* _NONSTD_SOURCE */
-#    define __DARWIN_UNIX03	1
-#  elif defined(_NONSTD_SOURCE)
-#    define __DARWIN_UNIX03	0
-#  else /* default */
-#    if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1050)
-#      define __DARWIN_UNIX03	0
-#    else /* __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 */
-#      define __DARWIN_UNIX03	1
-#    endif /* __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1050 */
-#  endif /* _DARWIN_C_SOURCE || _XOPEN_SOURCE || _POSIX_C_SOURCE || __LP64__ */
-#endif /* !__DARWIN_UNIX03 */
-
-#if !defined(__DARWIN_64_BIT_INO_T)
-#  if   defined(_DARWIN_USE_64_BIT_INODE)
-#    if defined(_DARWIN_NO_64_BIT_INODE)
-#      error "Can't define both _DARWIN_USE_64_BIT_INODE and _DARWIN_NO_64_BIT_INODE."
-#    endif /* _DARWIN_NO_64_BIT_INODE */
-#    define __DARWIN_64_BIT_INO_T 1
-#  elif defined(_DARWIN_NO_64_BIT_INODE)
-#    if __DARWIN_ONLY_64_BIT_INO_T
-#      error "Can't define _DARWIN_NO_64_BIT_INODE when only 64-bit inodes are available."
-#    endif /* __DARWIN_ONLY_64_BIT_INO_T */
-#    define __DARWIN_64_BIT_INO_T 0
-#  else /* default */
-#    if __DARWIN_ONLY_64_BIT_INO_T
-#      define __DARWIN_64_BIT_INO_T 1
-#    elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1060) || __DARWIN_UNIX03 == 0
-#      define __DARWIN_64_BIT_INO_T 0
-#    else /* default */
-#      define __DARWIN_64_BIT_INO_T 1
-#    endif /* __DARWIN_ONLY_64_BIT_INO_T */
-#  endif
-#endif /* !__DARWIN_64_BIT_INO_T */
-
-#if !defined(__DARWIN_VERS_1050)
-#  if   __DARWIN_ONLY_VERS_1050
-#    define __DARWIN_VERS_1050 1
-#  elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1050) || __DARWIN_UNIX03 == 0
-#    define __DARWIN_VERS_1050 0
-#  else /* default */
-#    define __DARWIN_VERS_1050 1
-#  endif
-#endif /* !__DARWIN_VERS_1050 */
-
-#if !defined(__DARWIN_NON_CANCELABLE)
-#    define __DARWIN_NON_CANCELABLE 0
-#endif /* !__DARWIN_NON_CANCELABLE */
-
-/*
- * symbol suffixes used for symbol versioning
- */
-#if __DARWIN_UNIX03
-#  if __DARWIN_ONLY_UNIX_CONFORMANCE
-#    define __DARWIN_SUF_UNIX03		/* nothing */
-#  else /* !__DARWIN_ONLY_UNIX_CONFORMANCE */
-#    define __DARWIN_SUF_UNIX03		"$UNIX2003"
-#  endif /* __DARWIN_ONLY_UNIX_CONFORMANCE */
-
-#  if __DARWIN_64_BIT_INO_T
-#    if __DARWIN_ONLY_64_BIT_INO_T
-#      define __DARWIN_SUF_64_BIT_INO_T	/* nothing */
-#    else /* !__DARWIN_ONLY_64_BIT_INO_T */
-#      define __DARWIN_SUF_64_BIT_INO_T	"$INODE64"
-#    endif /* __DARWIN_ONLY_64_BIT_INO_T */
-#  else /* !__DARWIN_64_BIT_INO_T */
-#    define __DARWIN_SUF_64_BIT_INO_T	/* nothing */
-#  endif /* __DARWIN_64_BIT_INO_T */
-
-#  if __DARWIN_VERS_1050
-#    if __DARWIN_ONLY_VERS_1050
-#      define __DARWIN_SUF_1050		/* nothing */
-#    else /* !__DARWIN_ONLY_VERS_1050 */
-#      define __DARWIN_SUF_1050		"$1050"
-#    endif /* __DARWIN_ONLY_VERS_1050 */
-#  else /* !__DARWIN_VERS_1050 */
-#    define __DARWIN_SUF_1050		/* nothing */
-#  endif /* __DARWIN_VERS_1050 */
-
-#  if __DARWIN_NON_CANCELABLE
-#    define __DARWIN_SUF_NON_CANCELABLE	"$NOCANCEL"
-#  else /* !__DARWIN_NON_CANCELABLE */
-#    define __DARWIN_SUF_NON_CANCELABLE	/* nothing */
-#  endif /* __DARWIN_NON_CANCELABLE */
-
-#else /* !__DARWIN_UNIX03 */
-#  define __DARWIN_SUF_UNIX03		/* nothing */
-#  define __DARWIN_SUF_64_BIT_INO_T	/* nothing */
-#  define __DARWIN_SUF_NON_CANCELABLE	/* nothing */
-#  define __DARWIN_SUF_1050		/* nothing */
-#endif /* __DARWIN_UNIX03 */
-
-#define __DARWIN_SUF_EXTSN		"$DARWIN_EXTSN"
-
-/*
- * symbol versioning macros
- */
-#define __DARWIN_ALIAS(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_UNIX03)
-#define __DARWIN_ALIAS_C(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_NON_CANCELABLE __DARWIN_SUF_UNIX03)
-#define __DARWIN_ALIAS_I(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_64_BIT_INO_T __DARWIN_SUF_UNIX03)
-#define __DARWIN_INODE64(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_64_BIT_INO_T)
-
-#define __DARWIN_1050(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_1050)
-#define __DARWIN_1050ALIAS(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_1050 __DARWIN_SUF_UNIX03)
-#define __DARWIN_1050ALIAS_C(sym)	__asm("_" __STRING(sym) __DARWIN_SUF_1050 __DARWIN_SUF_NON_CANCELABLE __DARWIN_SUF_UNIX03)
-#define __DARWIN_1050ALIAS_I(sym)	__asm("_" __STRING(sym) __DARWIN_SUF_1050 __DARWIN_SUF_64_BIT_INO_T __DARWIN_SUF_UNIX03)
-#define __DARWIN_1050INODE64(sym)	__asm("_" __STRING(sym) __DARWIN_SUF_1050 __DARWIN_SUF_64_BIT_INO_T)
-
-#define __DARWIN_EXTSN(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_EXTSN)
-#define __DARWIN_EXTSN_C(sym)		__asm("_" __STRING(sym) __DARWIN_SUF_EXTSN __DARWIN_SUF_NON_CANCELABLE)
-
-/*
- * symbol release macros
- */
-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1060)
-#undef __DARWIN_10_6_AND_LATER
-#define __DARWIN_10_6_AND_LATER_ALIAS(x)	/* nothing */
-#else /* 10.6 and beyond */
-#define __DARWIN_10_6_AND_LATER
-#define __DARWIN_10_6_AND_LATER_ALIAS(x)	x
-#endif
-
-
-/*
- * POSIX.1 requires that the macros we test be defined before any standard
- * header file is included.  This permits us to convert values for feature
- * testing, as necessary, using only _POSIX_C_SOURCE.
- *
- * Here's a quick run-down of the versions:
- *  defined(_POSIX_SOURCE)		1003.1-1988
- *  _POSIX_C_SOURCE == 1L		1003.1-1990
- *  _POSIX_C_SOURCE == 2L		1003.2-1992 C Language Binding Option
- *  _POSIX_C_SOURCE == 199309L		1003.1b-1993
- *  _POSIX_C_SOURCE == 199506L		1003.1c-1995, 1003.1i-1995,
- *					and the omnibus ISO/IEC 9945-1: 1996
- *  _POSIX_C_SOURCE == 200112L		1003.1-2001
- *
- * In addition, the X/Open Portability Guide, which is now the Single UNIX
- * Specification, defines a feature-test macro which indicates the version of
- * that specification, and which subsumes _POSIX_C_SOURCE.
- */
-
-/* Deal with IEEE Std. 1003.1-1990, in which _POSIX_C_SOURCE == 1L. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1L
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		199009L
-#endif
-
-/* Deal with IEEE Std. 1003.2-1992, in which _POSIX_C_SOURCE == 2L. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2L
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		199209L
-#endif
-
-/* Deal with various X/Open Portability Guides and Single UNIX Spec. */
-#ifdef _XOPEN_SOURCE
-#if _XOPEN_SOURCE - 0L >= 600L
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		200112L
-#elif _XOPEN_SOURCE - 0L >= 500L
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		199506L
-#endif
-#endif
-
-/*
- * Deal with all versions of POSIX.  The ordering relative to the tests above is
- * important.
- */
-#if defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE)
-#define _POSIX_C_SOURCE         198808L
-#endif
-
-/*
- * long long is not supported in c89 (__STRICT_ANSI__), but g++ -ansi and
- * c99 still want long longs.  While not perfect, we allow long longs for
- * g++.
- */
-#define	__DARWIN_NO_LONG_LONG	(defined(__STRICT_ANSI__) \
-				&& (__STDC_VERSION__-0 < 199901L) \
-				&& !defined(__GNUG__))
-
-/*
- * Long double compatibility macro allow selecting variant symbols based
- * on the old (compatible) 64-bit long doubles, or the new 128-bit
- * long doubles.  This applies only to ppc; i386 already has long double
- * support, while ppc64 doesn't have any backwards history.
- */
-#if defined(__arm__)
-#  define	__DARWIN_LDBL_COMPAT(x)	/* nothing */
-#  define	__DARWIN_LDBL_COMPAT2(x) /* nothing */
-#  define	__DARWIN_LONG_DOUBLE_IS_DOUBLE	1
-#elif defined(__ppc__)
-#  if defined(__LDBL_MANT_DIG__) && defined(__DBL_MANT_DIG__) && \
-	__LDBL_MANT_DIG__ > __DBL_MANT_DIG__
-#    if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 < 1040
-#      define	__DARWIN_LDBL_COMPAT(x)	__asm("_" __STRING(x) "$LDBLStub")
-#    else
-#      define	__DARWIN_LDBL_COMPAT(x)	__asm("_" __STRING(x) "$LDBL128")
-#    endif
-#    define	__DARWIN_LDBL_COMPAT2(x) __asm("_" __STRING(x) "$LDBL128")
-#    define	__DARWIN_LONG_DOUBLE_IS_DOUBLE	0
-#  else
-#   define	__DARWIN_LDBL_COMPAT(x) /* nothing */
-#   define	__DARWIN_LDBL_COMPAT2(x) /* nothing */
-#   define	__DARWIN_LONG_DOUBLE_IS_DOUBLE	1
-#  endif
-#elif defined(__i386__) || defined(__ppc64__) || defined(__x86_64__)
-#  define	__DARWIN_LDBL_COMPAT(x)	/* nothing */
-#  define	__DARWIN_LDBL_COMPAT2(x) /* nothing */
-#  define	__DARWIN_LONG_DOUBLE_IS_DOUBLE	0
-#else
-#  error Unknown architecture
-#endif
-
-/*
- * Deprecation macro
- */
-#if __GNUC__ >= 3
-#define __deprecated __attribute__((deprecated))
-#else
-#define __deprecated /* nothing */
-#endif
-
-/*****************************************
- *  Public darwin-specific feature macros
- *****************************************/
-
-/*
- * _DARWIN_FEATURE_64_BIT_INODE indicates that the ino_t type is 64-bit, and
- * structures modified for 64-bit inodes (like struct stat) will be used.
- */
-#if __DARWIN_64_BIT_INO_T
-#define _DARWIN_FEATURE_64_BIT_INODE		1
-#endif
-
-/*
- * _DARWIN_FEATURE_LONG_DOUBLE_IS_DOUBLE indicates when the long double type
- * is the same as the double type (ppc and arm only)
- */
-#if __DARWIN_LONG_DOUBLE_IS_DOUBLE
-#define _DARWIN_FEATURE_LONG_DOUBLE_IS_DOUBLE	1
-#endif
-
-/*
- * _DARWIN_FEATURE_64_ONLY_BIT_INODE indicates that the ino_t type may only
- * be 64-bit; there is no support for 32-bit ino_t when this macro is defined
- * (and non-zero).  There is no struct stat64 either, as the regular
- * struct stat will already be the 64-bit version.
- */
-#if __DARWIN_ONLY_64_BIT_INO_T
-#define _DARWIN_FEATURE_ONLY_64_BIT_INODE	1
-#endif
-
-/*
- * _DARWIN_FEATURE_ONLY_VERS_1050 indicates that only those APIs updated
- * in 10.5 exists; no pre-10.5 variants are available.
- */
-#if __DARWIN_ONLY_VERS_1050
-#define _DARWIN_FEATURE_ONLY_VERS_1050		1
-#endif
-
-/*
- * _DARWIN_FEATURE_ONLY_UNIX_CONFORMANCE indicates only UNIX conforming API
- * are available (the legacy BSD APIs are not available)
- */
-#if __DARWIN_ONLY_UNIX_CONFORMANCE
-#define _DARWIN_FEATURE_ONLY_UNIX_CONFORMANCE	1
-#endif
-
-/*
- * _DARWIN_FEATURE_UNIX_CONFORMANCE indicates whether UNIX conformance is on,
- * and specifies the conformance level (3 is SUSv3)
- */
-#if __DARWIN_UNIX03
-#define _DARWIN_FEATURE_UNIX_CONFORMANCE	3
-#endif
-
-/* 
- * This macro casts away the qualifier from the variable
- *
- * Note: use at your own risk, removing qualifiers can result in
- * catastrophic run-time failures.
- */
-#ifndef __CAST_AWAY_QUALIFIER
-#define __CAST_AWAY_QUALIFIER(variable, qualifier, type)  (type) ((char *)0 + ((qualifier char *)(variable) - (qualifier char *)0) ) 
-#endif
-
-#endif /* !_CDEFS_H_ */
diff --git a/i386/include/sys/disk.h b/i386/include/sys/disk.h
deleted file mode 100644
index bd61eb6..0000000
--- a/i386/include/sys/disk.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef	_SYS_DISK_H_
-#define	_SYS_DISK_H_
-
-#include <stdint.h>
-//#include <sys/ioctl.h>
-
-/*
- * Definitions
- *
- * ioctl                                 description
- * ------------------------------------- ---------------------------------------
- * DKIOCEJECT                            eject media
- * DKIOCSYNCHRONIZECACHE                 flush media
- *
- * DKIOCFORMAT                           format media
- * DKIOCGETFORMATCAPACITIES              get media's formattable capacities
- *
- * DKIOCGETBLOCKSIZE                     get media's block size
- * DKIOCGETBLOCKCOUNT                    get media's block count
- * DKIOCGETFIRMWAREPATH                  get media's firmware path
- *
- * DKIOCISFORMATTED                      is media formatted?
- * DKIOCISWRITABLE                       is media writable?
- *
- * DKIOCREQUESTIDLE                      idle media
- * DKIOCDISCARD                          delete unused data
- *
- * DKIOCGETMAXBLOCKCOUNTREAD             get maximum block count for reads
- * DKIOCGETMAXBLOCKCOUNTWRITE            get maximum block count for writes
- * DKIOCGETMAXBYTECOUNTREAD              get maximum byte count for reads
- * DKIOCGETMAXBYTECOUNTWRITE             get maximum byte count for writes
- *
- * DKIOCGETMAXSEGMENTCOUNTREAD           get maximum segment count for reads
- * DKIOCGETMAXSEGMENTCOUNTWRITE          get maximum segment count for writes
- * DKIOCGETMAXSEGMENTBYTECOUNTREAD       get maximum segment byte count for reads
- * DKIOCGETMAXSEGMENTBYTECOUNTWRITE      get maximum segment byte count for writes
- *
- * DKIOCGETMINSEGMENTALIGNMENTBYTECOUNT  get minimum segment alignment in bytes
- * DKIOCGETMAXSEGMENTADDRESSABLEBITCOUNT get maximum segment width in bits
- *
- * DKIOCGETPHYSICALBLOCKSIZE             get device's block size
- * DKIOCGETCOMMANDPOOLSIZE               get device's queue depth
- */
-
-typedef struct
-{
-    uint64_t               offset;
-    uint64_t               length;
-
-    uint8_t                reserved0128[16];       /* reserved, clear to zero */
-} dk_discard_t;
-
-typedef struct
-{
-    char                   path[128];
-} dk_firmware_path_t;
-
-typedef struct
-{
-    uint64_t               blockCount;
-    uint32_t               blockSize;
-
-    uint8_t                reserved0096[4];        /* reserved, clear to zero */
-} dk_format_capacity_t;
-
-typedef struct
-{
-    dk_format_capacity_t * capacities;
-    uint32_t               capacitiesCount;        /* use zero to probe count */
-
-#ifdef __LP64__
-    uint8_t                reserved0096[4];        /* reserved, clear to zero */
-#else /* !__LP64__ */
-    uint8_t                reserved0064[8];        /* reserved, clear to zero */
-#endif /* !__LP64__ */
-} dk_format_capacities_t;
-
-#define DKIOCEJECT                            _IO('d', 21)
-#define DKIOCSYNCHRONIZECACHE                 _IO('d', 22)
-
-#define DKIOCFORMAT                           _IOW('d', 26, dk_format_capacity_t)
-#define DKIOCGETFORMATCAPACITIES              _IOWR('d', 26, dk_format_capacities_t)
-
-#define DKIOCGETBLOCKSIZE                     _IOR('d', 24, uint32_t)
-#define DKIOCGETBLOCKCOUNT                    _IOR('d', 25, uint64_t)
-#define DKIOCGETFIRMWAREPATH                  _IOR('d', 28, dk_firmware_path_t)
-
-#define DKIOCISFORMATTED                      _IOR('d', 23, uint32_t)
-#define DKIOCISWRITABLE                       _IOR('d', 29, uint32_t)
-
-#define DKIOCREQUESTIDLE                      _IO('d', 30)
-#define DKIOCDISCARD                          _IOW('d', 31, dk_discard_t)
-
-#define DKIOCGETMAXBLOCKCOUNTREAD             _IOR('d', 64, uint64_t)
-#define DKIOCGETMAXBLOCKCOUNTWRITE            _IOR('d', 65, uint64_t)
-#define DKIOCGETMAXBYTECOUNTREAD              _IOR('d', 70, uint64_t)
-#define DKIOCGETMAXBYTECOUNTWRITE             _IOR('d', 71, uint64_t)
-
-#define DKIOCGETMAXSEGMENTCOUNTREAD           _IOR('d', 66, uint64_t)
-#define DKIOCGETMAXSEGMENTCOUNTWRITE          _IOR('d', 67, uint64_t)
-#define DKIOCGETMAXSEGMENTBYTECOUNTREAD       _IOR('d', 68, uint64_t)
-#define DKIOCGETMAXSEGMENTBYTECOUNTWRITE      _IOR('d', 69, uint64_t)
-
-#define DKIOCGETMINSEGMENTALIGNMENTBYTECOUNT  _IOR('d', 74, uint64_t)
-#define DKIOCGETMAXSEGMENTADDRESSABLEBITCOUNT _IOR('d', 75, uint64_t)
-
-#define DKIOCGETPHYSICALBLOCKSIZE             _IOR('d', 77, uint32_t)
-#define DKIOCGETCOMMANDPOOLSIZE               _IOR('d', 78, uint32_t)
-
-
-#endif	/* _SYS_DISK_H_ */
diff --git a/i386/include/sys/kernel_types.h b/i386/include/sys/kernel_types.h
deleted file mode 100644
index 7d7d709..0000000
--- a/i386/include/sys/kernel_types.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2004-2010 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-
-#ifndef _KERN_SYS_KERNELTYPES_H_
-#define _KERN_SYS_KERNELTYPES_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <stdint.h>
-
-#ifdef BSD_BUILD
-/* Macros(?) to clear/set/test flags. */
-#define	SET(t, f)	(t) |= (f)
-#define	CLR(t, f)	(t) &= ~(f)
-#define	ISSET(t, f)	((t) & (f))
-#endif
-
-
-typedef int errno_t;
-typedef int64_t daddr64_t;
-
-#ifndef BSD_BUILD
-struct buf;
-typedef struct buf * buf_t;
-
-struct file;
-typedef struct file * file_t;
-
-#ifndef __LP64__
-struct ucred;
-typedef struct ucred * ucred_t;
-#endif
-
-struct mount;
-typedef struct mount * mount_t;
-
-struct vnode;
-typedef struct vnode * vnode_t;
-
-struct proc;
-typedef struct proc * proc_t;
-
-struct uio;
-typedef struct uio * uio_t;
-
-struct vfs_context;
-typedef struct vfs_context * vfs_context_t;
-
-struct vfstable;
-typedef struct vfstable * vfstable_t;
-
-struct __ifnet;
-struct __mbuf;
-struct __pkthdr;
-struct __socket;
-struct __sockopt;
-struct __ifaddr;
-struct __ifmultiaddr;
-struct __ifnet_filter;
-struct __rtentry;
-struct __if_clone;
-
-typedef	struct __ifnet*			ifnet_t;
-typedef	struct __mbuf*			mbuf_t;
-typedef	struct __pkthdr*		pkthdr_t;
-typedef	struct __socket*		socket_t;
-typedef struct __sockopt*		sockopt_t;
-typedef struct __ifaddr*		ifaddr_t;
-typedef struct __ifmultiaddr*	ifmultiaddr_t;
-typedef struct __ifnet_filter*	interface_filter_t;
-typedef struct __rtentry*		route_t;
-typedef struct __if_clone*		if_clone_t;
-
-#else /* BSD_BUILD */
-
-typedef struct buf * buf_t;
-typedef struct file * file_t;
-#ifndef __LP64__
-typedef struct ucred * ucred_t;
-#endif
-typedef struct mount * mount_t;
-typedef struct vnode * vnode_t;
-typedef struct proc * proc_t;
-typedef struct uio * uio_t;
-typedef struct user_iovec * user_iovec_t;
-typedef struct vfs_context * vfs_context_t;
-typedef struct vfstable * vfstable_t;
-
-
-#endif /* !BSD_BUILD */
-
-#ifndef _KAUTH_GUID
-#define _KAUTH_GUID
-/* Apple-style globally unique identifier */
-typedef struct {
-#define KAUTH_GUID_SIZE	16	/* 128-bit identifier */
-	unsigned char g_guid[KAUTH_GUID_SIZE];
-} guid_t;
-#define _GUID_T
-#endif /* _KAUTH_GUID */
-
-#ifndef _KAUTH_ACE
-#define _KAUTH_ACE
-struct kauth_ace;
-typedef struct kauth_ace * kauth_ace_t;
-#endif
-#ifndef _KAUTH_ACL
-#define _KAUTH_ACL
-struct kauth_acl;
-typedef struct kauth_acl * kauth_acl_t;
-#endif
-#ifndef _KAUTH_FILESEC
-#define _KAUTH_FILESEC
-struct kauth_filesec;
-typedef struct kauth_filesec * kauth_filesec_t;
-#endif
-
-#endif /* !_KERN_SYS_KERNELTYPES_H_ */
diff --git a/i386/include/sys/param.h b/i386/include/sys/param.h
deleted file mode 100644
index 395fdf5..0000000
--- a/i386/include/sys/param.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1995, 1997 Apple Computer, Inc. All Rights Reserved */
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)param.h	8.3 (Berkeley) 4/4/95
- */
-
-#ifndef	_SYS_PARAM_H_
-#define _SYS_PARAM_H_
-
-#define	BSD	199506		/* System version (year & month). */
-#define BSD4_3	1
-#define BSD4_4	1
-
-#define NeXTBSD	1995064		/* NeXTBSD version (year, month, release) */
-#define NeXTBSD4_0 0		/* NeXTBSD 4.0 */
-
-#ifndef NULL
-#define	NULL	__DARWIN_NULL
-#endif /* ! NULL */
-
-#ifndef LOCORE
-#include <sys/types.h>
-#endif
-
-/*
- * Machine-independent constants (some used in following include files).
- * Redefined constants are from POSIX 1003.1 limits file.
- *
- * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>)
- * MAXLOGNAME should be >= UT_NAMESIZE (see <utmp.h>)
- */
-#include <sys/syslimits.h>
-
-#define	MAXCOMLEN	16		/* max command name remembered */
-#define	MAXINTERP	64		/* max interpreter file name length */
-#define	MAXLOGNAME	255		/* max login name length */
-#define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
-#define	NCARGS		ARG_MAX		/* max bytes for an exec function */
-#define	NGROUPS		NGROUPS_MAX	/* max number groups */
-#define	NOFILE		256		/* default max open files per process */
-#define	NOGROUP		65535		/* marker for empty group set member */
-#define MAXHOSTNAMELEN	256		/* max hostname size */
-#define MAXDOMNAMELEN	256		/* maximum domain name length */
-
-/* Machine type dependent parameters. */
-#include <i386/param.h>
-
-/* More types and definitions used throughout the kernel. */
-#include <limits.h>
-
-/*
- * Priorities.  Note that with 32 run queues, differences less than 4 are
- * insignificant.
- */
-#define	PSWP	0
-#define	PVM	4
-#define	PINOD	8
-#define	PRIBIO	16
-#define	PVFS	20
-#define	PZERO	22		/* No longer magic, shouldn't be here.  XXX */
-#define	PSOCK	24
-#define	PWAIT	32
-#define	PLOCK	36
-#define	PPAUSE	40
-#define	PUSER	50
-#define	MAXPRI	127		/* Priorities range from 0 through MAXPRI. */
-
-#define	PRIMASK	0x0ff
-#define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
-#define PTTYBLOCK 0x200		/* for tty SIGTTOU and SIGTTIN blocking */
-#define PDROP	0x400		/* OR'd with pri to stop re-aquistion of mutex upon wakeup */
-#define PSPIN	0x800		/* OR'd with pri to require mutex in spin mode upon wakeup */
-
-#define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
-
-#define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
-#define	NODEV	(dev_t)(-1)	/* non-existent device */
-
-/*
- * Clustering of hardware pages on machines with ridiculously small
- * page sizes is done here.  The paging subsystem deals with units of
- * CLSIZE pte's describing NBPG (from machine/param.h) pages each.
- */
-#define	CLBYTES		(CLSIZE*NBPG)
-#define	CLOFSET		(CLSIZE*NBPG-1)	/* for clusters, like PGOFSET */
-#define	claligned(x)	((((int)(x))&CLOFSET)==0)
-#define	CLOFF		CLOFSET
-#define	CLSHIFT		(PGSHIFT+CLSIZELOG2)
-
-#if CLSIZE==1
-#define	clbase(i)	(i)
-#define	clrnd(i)	(i)
-#else
-/* Give the base virtual address (first of CLSIZE). */
-#define	clbase(i)	((i) &~ (CLSIZE-1))
-/* Round a number of clicks up to a whole cluster. */
-#define	clrnd(i)	(((i) + (CLSIZE-1)) &~ (CLSIZE-1))
-#endif
-
-#define	CBLOCK	64		/* Clist block size, must be a power of 2. */
-#define CBQSIZE	(CBLOCK/NBBY)	/* Quote bytes/cblock - can do better. */
-				/* Data chars/clist. */
-#define	CBSIZE	(CBLOCK - sizeof(struct cblock *) - CBQSIZE)
-#define	CROUND	(CBLOCK - 1)	/* Clist rounding. */
-
-/*
- * File system parameters and macros.
- *
- * The file system is made out of blocks of at most MAXPHYS units, with
- * smaller units (fragments) only in the last direct block.  MAXBSIZE
- * primarily determines the size of buffers in the buffer pool.  It may be
- * made larger than MAXPHYS without any effect on existing file systems;
- * however making it smaller may make some file systems unmountable.
- * We set this to track the value of (MAX_UPL_TRANSFER*PAGE_SIZE) from
- * osfmk/mach/memory_object_types.h to bound it at the maximum UPL size.
- */
-#define	MAXBSIZE	(256 * 4096)
-#define MAXPHYSIO	MAXPHYS
-#define MAXFRAG 	8
-
-#define	MAXPHYSIO_WIRED	(16 * 1024 * 1024)
-
-/*
- * MAXPATHLEN defines the longest permissable path length after expanding
- * symbolic links. It is used to allocate a temporary buffer from the buffer
- * pool in which to do the name expansion, hence should be a power of two,
- * and must be less than or equal to MAXBSIZE.  MAXSYMLINKS defines the
- * maximum number of symbolic links that may be expanded in a path name.
- * It should be set high enough to allow all legitimate uses, but halt
- * infinite loops reasonably quickly.
- */
-#define	MAXPATHLEN	PATH_MAX
-#define MAXSYMLINKS	32
-
-/* Bit map related macros. */
-#define	setbit(a,i)	(((char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY))
-#define	clrbit(a,i)	(((char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define	isset(a,i)	(((char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
-#define	isclr(a,i)	((((char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-
-/* Macros for counting and rounding. */
-#ifndef howmany
-#define	howmany(x, y)	((((x) % (y)) == 0) ? ((x) / (y)) : (((x) / (y)) + 1))
-#endif
-#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))
-#define powerof2(x)	((((x)-1)&(x))==0)
-
-/* Macros for min/max. */
-#ifndef MIN
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#endif /* MIN */
-#ifndef MAX
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-#endif	/* MAX */
-
-/*
- * Constants for setting the parameters of the kernel memory allocator.
- *
- * 2 ** MINBUCKET is the smallest unit of memory that will be
- * allocated. It must be at least large enough to hold a pointer.
- *
- * Units of memory less or equal to MAXALLOCSAVE will permanently
- * allocate physical memory; requests for these size pieces of
- * memory are quite fast. Allocations greater than MAXALLOCSAVE must
- * always allocate and free physical memory; requests for these
- * size allocations should be done infrequently as they will be slow.
- *
- * Constraints: CLBYTES <= MAXALLOCSAVE <= 2 ** (MINBUCKET + 14), and
- * MAXALLOCSIZE must be a power of two.
- */
-#define MINBUCKET	4		/* 4 => min allocation of 16 bytes */
-#define MAXALLOCSAVE	(2 * CLBYTES)
-
-/*
- * Scale factor for scaled integers used to count %cpu time and load avgs.
- *
- * The number of CPU `tick's that map to a unique `%age' can be expressed
- * by the formula (1 / (2 ^ (FSHIFT - 11))).  The maximum load average that
- * can be calculated (assuming 32 bits) can be closely approximated using
- * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15).
- *
- * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age',
- * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024.
- */
-#define	FSHIFT	11		/* bits to right of fixed binary point */
-#define FSCALE	(1<<FSHIFT)
-
-#endif	/* _SYS_PARAM_H_ */
diff --git a/i386/include/sys/reboot.h b/i386/include/sys/reboot.h
deleted file mode 100644
index 147a209..0000000
--- a/i386/include/sys/reboot.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
-/*
- * Copyright (c) 1982, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- */
-
-#ifndef	_SYS_REBOOT_H_
-#define _SYS_REBOOT_H_
-
-/*
- * Arguments to reboot system call.
- */
-
-#ifdef __APPLE_API_PRIVATE
-#define RB_AUTOBOOT	0	/* flags for system auto-booting itself */
-
-#define RB_ASKNAME	0x01	/* ask for file name to reboot from */
-#define RB_SINGLE	0x02	/* reboot to single user only */
-#define RB_NOSYNC	0x04	/* dont sync before reboot */
-#define RB_HALT		0x08	/* don't reboot, just halt */
-#define RB_INITNAME	0x10	/* name given for /etc/init */
-#define RB_DFLTROOT	0x20	/* use compiled-in rootdev */
-#define RB_ALTBOOT	0x40	/* use /boot.old vs /boot */
-#define RB_UNIPROC	0x80	/* don't start slaves */
-#define RB_SAFEBOOT	0x100	/* booting safe */
-#define RB_UPSDELAY 0x200   /* Delays restart by 5 minutes */
-#define RB_QUICK	0x400	/* quick and ungraceful reboot with file system caches flushed*/
-#define RB_PANIC	0	/* reboot due to panic */
-#define RB_BOOT		1	/* reboot due to boot() */
-
-#endif /* __APPLE_API_PRIVATE */
-
-#ifdef __APPLE_API_OBSOLETE
-/*
- * Constants for converting boot-style device number to type,
- * adaptor (uba, mba, etc), unit number and partition number.
- * Type (== major device number) is in the low byte
- * for backward compatibility.  Except for that of the "magic
- * number", each mask applies to the shifted value.
- * Format:
- *	 (4) (4) (4) (4)  (8)     (8)
- *	--------------------------------
- *	|MA | AD| CT| UN| PART  | TYPE |
- *	--------------------------------
- */
-#define B_ADAPTORSHIFT	24
-#define B_ADAPTORMASK	0x0f
-#define	B_ADAPTOR(val)		(((val) >> B_ADAPTORSHIFT) & B_ADAPTORMASK)
-#define B_CONTROLLERSHIFT	20
-#define B_CONTROLLERMASK	0xf
-#define	B_CONTROLLER(val)	(((val)>>B_CONTROLLERSHIFT) & B_CONTROLLERMASK)
-#define B_UNITSHIFT	16
-#define B_UNITMASK	0xff
-#define	B_UNIT(val)		(((val) >> B_UNITSHIFT) & B_UNITMASK)
-#define B_PARTITIONSHIFT 8
-#define B_PARTITIONMASK	0xff
-#define	B_PARTITION(val)	(((val) >> B_PARTITIONSHIFT) & B_PARTITIONMASK)
-#define B_TYPESHIFT	0
-#define B_TYPEMASK	0xff
-#define	B_TYPE(val)		(((val) >> B_TYPESHIFT) & B_TYPEMASK)
-#define B_MAGICMASK	0xf0000000
-#define B_DEVMAGIC	0xa0000000
-
-#define MAKEBOOTDEV(type, adaptor, controller, unit, partition) \
-	(((type) << B_TYPESHIFT) | ((adaptor) << B_ADAPTORSHIFT) | \
-	((controller) << B_CONTROLLERSHIFT) | ((unit) << B_UNITSHIFT) | \
-	((partition) << B_PARTITIONSHIFT) | B_DEVMAGIC)
-
-#endif /* __APPLE_API_OBSOLETE */
-
-
-#endif	/* _SYS_REBOOT_H_ */
diff --git a/i386/include/sys/select.h b/i386/include/sys/select.h
deleted file mode 100644
index 49a4572..0000000
--- a/i386/include/sys/select.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)select.h	8.2 (Berkeley) 1/4/94
- */
-
-#ifndef _SYS_SELECT_H_
-#define	_SYS_SELECT_H_
-
-#include <sys/appleapiopts.h>
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/*
- * [XSI] The <sys/select.h> header shall define the fd_set type as a structure.
- * The timespec structure shall be defined as described in <time.h>
- * The <sys/select.h> header shall define the timeval structure.
- */
-#define __need_fd_set
-#define __need_struct_timespec
-#define __need_struct_timeval
-#include <sys/_structs.h>
-
-/*
- * The time_t and suseconds_t types shall be defined as described in
- * <sys/types.h>
- * The sigset_t type shall be defined as described in <signal.h>
- */
-#ifndef	_TIME_T
-#define	_TIME_T
-typedef	__darwin_time_t		time_t;
-#endif
-
-#ifndef _SUSECONDS_T
-#define _SUSECONDS_T
-typedef __darwin_suseconds_t	suseconds_t;
-#endif
-
-#ifndef _SIGSET_T
-#define _SIGSET_T
-typedef __darwin_sigset_t	sigset_t;
-#endif
-
-/*
- * [XSI] FD_CLR, FD_ISSET, FD_SET, FD_ZERO may be declared as a function, or
- *	 defined as a macro, or both
- * [XSI] FD_SETSIZE shall be defined as a macro
- */
-
-/*
- * Select uses bit masks of file descriptors in longs.  These macros
- * manipulate such bit fields (the filesystem macros use chars).  The
- * extra protection here is to permit application redefinition above
- * the default size.
- */
-#ifndef	FD_SETSIZE
-#define	FD_SETSIZE	__DARWIN_FD_SETSIZE
-#endif /* FD_SETSIZE */
-#ifndef FD_SET
-#define	FD_SET(n, p)	__DARWIN_FD_SET(n, p)
-#endif /* FD_SET */
-#ifndef FD_CLR
-#define	FD_CLR(n, p)	__DARWIN_FD_CLR(n, p)
-#endif /* FD_CLR */
-#ifndef FD_ISSET
-#define	FD_ISSET(n, p)	__DARWIN_FD_ISSET(n, p)
-#endif /* FD_ISSET */
-#ifndef FD_ZERO
-#define	FD_ZERO(p)	__DARWIN_FD_ZERO(p)
-#endif /* FD_ZERO */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#ifndef FD_COPY
-#define	FD_COPY(f, t)	__DARWIN_FD_COPY(f, t)
-#endif /* FD_COPY */
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-
-__BEGIN_DECLS
-
-#ifndef  __MWERKS__
-int	 pselect(int, fd_set * __restrict, fd_set * __restrict,
-		fd_set * __restrict, const struct timespec * __restrict,
-		const sigset_t * __restrict)
-#if defined(_DARWIN_C_SOURCE) || defined(_DARWIN_UNLIMITED_SELECT)
-		__DARWIN_EXTSN_C(pselect)
-#else /* !_DARWIN_C_SOURCE && !_DARWIN_UNLIMITED_SELECT */
-#  if defined(__LP64__) && !__DARWIN_NON_CANCELABLE
-		__DARWIN_1050(pselect)
-#  else /* !__LP64__ || __DARWIN_NON_CANCELABLE */
-		__DARWIN_ALIAS_C(pselect)
-#  endif /* __LP64__ && !__DARWIN_NON_CANCELABLE */
-#endif /* _DARWIN_C_SOURCE || _DARWIN_UNLIMITED_SELECT */
-		;
-#endif /* __MWERKS__ */
-
-#include <sys/_select.h>	/* select() prototype */
-
-__END_DECLS
-
-
-#endif /* !_SYS_SELECT_H_ */
diff --git a/i386/include/sys/socket.h b/i386/include/sys/socket.h
deleted file mode 100644
index a19105a..0000000
--- a/i386/include/sys/socket.h
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
- * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1998, 1999 Apple Computer, Inc. All Rights Reserved */
-/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
-/*
- * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD: src/sys/sys/socket.h,v 1.39.2.7 2001/07/03 11:02:01 ume Exp $
- */
-/*
- * NOTICE: This file was modified by SPARTA, Inc. in 2005 to introduce
- * support for mandatory and extensible security protections.  This notice
- * is included in support of clause 2.2 (b) of the Apple Public License,
- * Version 2.0.
- */
-
-#ifndef _SYS_SOCKET_H_
-#define	_SYS_SOCKET_H_
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <machine/_param.h>
-
-/*
- * Definitions related to sockets: types, address families, options.
- */
-
-/*
- * Data types.
- */
-#ifndef _GID_T
-typedef __darwin_gid_t		gid_t;
-#define _GID_T
-#endif
-
-#ifndef _OFF_T
-typedef __darwin_off_t		off_t;
-#define _OFF_T
-#endif
-
-#ifndef _PID_T
-typedef __darwin_pid_t		pid_t;
-#define _PID_T
-#endif
-
-#ifndef _SA_FAMILY_T
-#define _SA_FAMILY_T
-typedef __uint8_t		sa_family_t;
-#endif
-
-#ifndef _SOCKLEN_T
-#define _SOCKLEN_T
-typedef	__darwin_socklen_t	socklen_t;
-#endif
-
-/* XXX Not explicitly defined by POSIX, but function return types are */
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef __darwin_size_t		size_t;
-#endif
- 
-/* XXX Not explicitly defined by POSIX, but function return types are */
-#ifndef	_SSIZE_T
-#define	_SSIZE_T
-typedef	__darwin_ssize_t	ssize_t;
-#endif
-
-/*
- * [XSI] The iovec structure shall be defined as described in <sys/uio.h>.
- */
-#ifndef _STRUCT_IOVEC
-#define	_STRUCT_IOVEC
-struct iovec {
-	void *   iov_base;	/* [XSI] Base address of I/O memory region */
-	size_t	 iov_len;	/* [XSI] Size of region iov_base points to */
-};
-#endif
- 
-/*
- * Types
- */
-#define	SOCK_STREAM	1		/* stream socket */
-#define	SOCK_DGRAM	2		/* datagram socket */
-#define	SOCK_RAW	3		/* raw-protocol interface */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	SOCK_RDM	4		/* reliably-delivered message */
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#define	SOCK_SEQPACKET	5		/* sequenced packet stream */
-
-/*
- * Option flags per-socket.
- */
-#define	SO_DEBUG	0x0001		/* turn on debugging info recording */
-#define	SO_ACCEPTCONN	0x0002		/* socket has had listen() */
-#define	SO_REUSEADDR	0x0004		/* allow local address reuse */
-#define	SO_KEEPALIVE	0x0008		/* keep connections alive */
-#define	SO_DONTROUTE	0x0010		/* just use interface addresses */
-#define	SO_BROADCAST	0x0020		/* permit sending of broadcast msgs */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	SO_USELOOPBACK	0x0040		/* bypass hardware when possible */
-#define SO_LINGER	0x0080          /* linger on close if data present (in ticks) */
-#else
-#define SO_LINGER	0x1080          /* linger on close if data present (in seconds) */
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
-#define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
-#ifndef __APPLE__
-#define	SO_ACCEPTFILTER	0x1000		/* there is an accept filter */
-#else
-#define SO_DONTTRUNC	0x2000		/* APPLE: Retain unread data */
-					/*  (ATOMIC proto) */
-#define SO_WANTMORE		0x4000		/* APPLE: Give hint when more data ready */
-#define SO_WANTOOBFLAG	0x8000		/* APPLE: Want OOB in MSG_FLAG on receive */
-#endif
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-/*
- * Additional options, not kept in so_options.
- */
-#define SO_SNDBUF	0x1001		/* send buffer size */
-#define SO_RCVBUF	0x1002		/* receive buffer size */
-#define SO_SNDLOWAT	0x1003		/* send low-water mark */
-#define SO_RCVLOWAT	0x1004		/* receive low-water mark */
-#define SO_SNDTIMEO	0x1005		/* send timeout */
-#define SO_RCVTIMEO	0x1006		/* receive timeout */
-#define	SO_ERROR	0x1007		/* get error status and clear */
-#define	SO_TYPE		0x1008		/* get socket type */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-/*efine	SO_PRIVSTATE	0x1009		   get/deny privileged state */
-#ifdef __APPLE__
-#define SO_NREAD	0x1020		/* APPLE: get 1st-packet byte count */
-#define SO_NKE		0x1021		/* APPLE: Install socket-level NKE */
-#define SO_NOSIGPIPE	0x1022		/* APPLE: No SIGPIPE on EPIPE */
-#define SO_NOADDRERR	0x1023		/* APPLE: Returns EADDRNOTAVAIL when src is not available anymore */
-#define SO_NWRITE	0x1024		/* APPLE: Get number of bytes currently in send socket buffer */
-#define SO_REUSESHAREUID	0x1025		/* APPLE: Allow reuse of port/socket by different userids */
-#ifdef __APPLE_API_PRIVATE
-#define SO_NOTIFYCONFLICT	0x1026	/* APPLE: send notification if there is a bind on a port which is already in use */
-#define	SO_UPCALLCLOSEWAIT	0x1027	/* APPLE: block on close until an upcall returns */
-#endif
-#define SO_LINGER_SEC	0x1080          /* linger on close if data present (in seconds) */
-#define SO_RESTRICTIONS	0x1081	/* APPLE: deny inbound/outbound/both/flag set */
-#define SO_RESTRICT_DENYIN		0x00000001	/* flag for SO_RESTRICTIONS - deny inbound */
-#define SO_RESTRICT_DENYOUT		0x00000002	/* flag for SO_RESTRICTIONS - deny outbound */
-#define SO_RESTRICT_DENYSET		0x80000000	/* flag for SO_RESTRICTIONS - deny has been set */
-#define SO_RANDOMPORT   0x1082  /* APPLE: request local port randomization */
-#define SO_NP_EXTENSIONS	0x1083	/* To turn off some POSIX behavior */
-#endif
-#define	SO_LABEL	0x1010		/* socket's MAC label */
-#define	SO_PEERLABEL	0x1011		/* socket's peer MAC label */
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-/*
- * Structure used for manipulating linger option.
- */
-struct	linger {
-	int	l_onoff;		/* option on/off */
-	int	l_linger;		/* linger time */
-};
-
-#ifndef __APPLE__
-struct	accept_filter_arg {
-	char	af_name[16];
-	char	af_arg[256-16];
-};
-#endif
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#ifdef __APPLE__
-
-/*
- * Structure to control non-portable Sockets extension to POSIX  
- */
-struct so_np_extensions {
-	u_int32_t	npx_flags;
-	u_int32_t	npx_mask;
-};
-
-#define SONPX_SETOPTSHUT	0x000000001     /* flag for allowing setsockopt after shutdown */
-
-
-
-#endif
-#endif
-
-/*
- * Level number for (get/set)sockopt() to apply to socket itself.
- */
-#define	SOL_SOCKET	0xffff		/* options for socket level */
-
-
-/*
- * Address families.
- */
-#define	AF_UNSPEC	0		/* unspecified */
-#define	AF_UNIX		1		/* local to host (pipes) */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	AF_LOCAL	AF_UNIX		/* backward compatibility */
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	AF_IMPLINK	3		/* arpanet imp addresses */
-#define	AF_PUP		4		/* pup protocols: e.g. BSP */
-#define	AF_CHAOS	5		/* mit CHAOS protocols */
-#define	AF_NS		6		/* XEROX NS protocols */
-#define	AF_ISO		7		/* ISO protocols */
-#define	AF_OSI		AF_ISO
-#define	AF_ECMA		8		/* European computer manufacturers */
-#define	AF_DATAKIT	9		/* datakit protocols */
-#define	AF_CCITT	10		/* CCITT protocols, X.25 etc */
-#define	AF_SNA		11		/* IBM SNA */
-#define AF_DECnet	12		/* DECnet */
-#define AF_DLI		13		/* DEC Direct data link interface */
-#define AF_LAT		14		/* LAT */
-#define	AF_HYLINK	15		/* NSC Hyperchannel */
-#define	AF_APPLETALK	16		/* Apple Talk */
-#define	AF_ROUTE	17		/* Internal Routing Protocol */
-#define	AF_LINK		18		/* Link layer interface */
-#define	pseudo_AF_XTP	19		/* eXpress Transfer Protocol (no AF) */
-#define	AF_COIP		20		/* connection-oriented IP, aka ST II */
-#define	AF_CNT		21		/* Computer Network Technology */
-#define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
-#define	AF_IPX		23		/* Novell Internet Protocol */
-#define	AF_SIP		24		/* Simple Internet Protocol */
-#define pseudo_AF_PIP	25		/* Help Identify PIP packets */
-#ifdef __APPLE__
-/*define pseudo_AF_BLUE	26	   Identify packets for Blue Box - Not used */
-#define AF_NDRV		27		/* Network Driver 'raw' access */
-#endif
-#define	AF_ISDN		28		/* Integrated Services Digital Network*/
-#define	AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
-#define	pseudo_AF_KEY	29		/* Internal key-management function */
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#define	AF_INET6	30		/* IPv6 */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	AF_NATM		31		/* native ATM access */
-#ifdef __APPLE__
-#define AF_SYSTEM	32		/* Kernel event messages */
-#define AF_NETBIOS	33		/* NetBIOS */
-#define AF_PPP		34		/* PPP communication protocol */
-#else
-#define	AF_ATM		30		/* ATM */
-#endif
-#define pseudo_AF_HDRCMPLT 35		/* Used by BPF to not rewrite headers
-					 * in interface output routine
-					 */
-#define AF_RESERVED_36	36		/* Reserved for internal usage */
-
-#ifndef __APPLE__
-#define	AF_NETGRAPH	32		/* Netgraph sockets */
-#endif
-#define AF_IEEE80211    37              /* IEEE 802.11 protocol */
-#define	AF_MAX		38
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-/*
- * [XSI] Structure used by kernel to store most addresses.
- */
-struct sockaddr {
-	__uint8_t	sa_len;		/* total length */
-	sa_family_t	sa_family;	/* [XSI] address family */
-	char		sa_data[14];	/* [XSI] addr value (actually larger) */
-};
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	SOCK_MAXADDRLEN	255		/* longest possible addresses */
-
-/*
- * Structure used by kernel to pass protocol
- * information in raw sockets.
- */
-struct sockproto {
-	__uint16_t	sp_family;		/* address family */
-	__uint16_t	sp_protocol;		/* protocol */
-};
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE)*/
-
-/*
- * RFC 2553: protocol-independent placeholder for socket addresses
- */
-#define	_SS_MAXSIZE	128
-#define	_SS_ALIGNSIZE	(sizeof(__int64_t))
-#define	_SS_PAD1SIZE	\
-		(_SS_ALIGNSIZE - sizeof(__uint8_t) - sizeof(sa_family_t))
-#define	_SS_PAD2SIZE	\
-		(_SS_MAXSIZE - sizeof(__uint8_t) - sizeof(sa_family_t) - \
-				_SS_PAD1SIZE - _SS_ALIGNSIZE)
-
-/*
- * [XSI] sockaddr_storage
- */
-struct sockaddr_storage {
-	__uint8_t	ss_len;		/* address length */
-	sa_family_t	ss_family;	/* [XSI] address family */
-	char			__ss_pad1[_SS_PAD1SIZE];
-	__int64_t	__ss_align;	/* force structure storage alignment */
-	char			__ss_pad2[_SS_PAD2SIZE];
-};
-
-/*
- * Protocol families, same as address families for now.
- */
-#define	PF_UNSPEC	AF_UNSPEC
-#define	PF_LOCAL	AF_LOCAL
-#define	PF_UNIX		PF_LOCAL	/* backward compatibility */
-#define	PF_INET		AF_INET
-#define	PF_IMPLINK	AF_IMPLINK
-#define	PF_PUP		AF_PUP
-#define	PF_CHAOS	AF_CHAOS
-#define	PF_NS		AF_NS
-#define	PF_ISO		AF_ISO
-#define	PF_OSI		AF_ISO
-#define	PF_ECMA		AF_ECMA
-#define	PF_DATAKIT	AF_DATAKIT
-#define	PF_CCITT	AF_CCITT
-#define	PF_SNA		AF_SNA
-#define PF_DECnet	AF_DECnet
-#define PF_DLI		AF_DLI
-#define PF_LAT		AF_LAT
-#define	PF_HYLINK	AF_HYLINK
-#define	PF_APPLETALK	AF_APPLETALK
-#define	PF_ROUTE	AF_ROUTE
-#define	PF_LINK		AF_LINK
-#define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
-#define	PF_COIP		AF_COIP
-#define	PF_CNT		AF_CNT
-#define	PF_SIP		AF_SIP
-#define	PF_IPX		AF_IPX		/* same format as AF_NS */
-#define PF_RTIP		pseudo_AF_RTIP	/* same format as AF_INET */
-#define PF_PIP		pseudo_AF_PIP
-#ifdef __APPLE__
-#define PF_NDRV		AF_NDRV
-#endif
-#define	PF_ISDN		AF_ISDN
-#define	PF_KEY		pseudo_AF_KEY
-#define	PF_INET6	AF_INET6
-#define	PF_NATM		AF_NATM
-#ifdef __APPLE__
-#define PF_SYSTEM	AF_SYSTEM
-#define PF_NETBIOS	AF_NETBIOS
-#define PF_PPP		AF_PPP
-#define PF_RESERVED_36  AF_RESERVED_36
-
-#else
-#define	PF_ATM		AF_ATM
-#define	PF_NETGRAPH	AF_NETGRAPH
-#endif
-
-#define	PF_MAX		AF_MAX
-
-/*
- * These do not have socket-layer support:
- */
-#define	PF_VLAN		((uint32_t)0x766c616e)	/* 'vlan' */
-#define PF_BOND		((uint32_t)0x626f6e64)	/* 'bond' */
-
-/*
- * Definitions for network related sysctl, CTL_NET.
- *
- * Second level is protocol family.
- * Third level is protocol number.
- *
- * Further levels are defined by the individual families below.
- */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define NET_MAXID	AF_MAX
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
-
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-/*
- * PF_ROUTE - Routing table
- *
- * Three additional levels are defined:
- *	Fourth: address family, 0 is wildcard
- *	Fifth: type of info, defined below
- *	Sixth: flag(s) to mask with for NET_RT_FLAGS
- */
-#define NET_RT_DUMP			1		/* dump; may limit to a.f. */
-#define NET_RT_FLAGS		2		/* by flags, e.g. RESOLVING */
-#define NET_RT_IFLIST		3		/* survey interface list */
-#define NET_RT_STAT			4		/* routing statistics */
-#define NET_RT_TRASH		5		/* routes not in table but not freed */
-#define NET_RT_IFLIST2	6		/* interface list with addresses */
-#define NET_RT_DUMP2                     7               /* dump; may limit to a.f. */
-#define	NET_RT_MAXID		8
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
-
-
-/*
- * Maximum queue length specifiable by listen.
- */
-#define	SOMAXCONN	128
-
-/*
- * [XSI] Message header for recvmsg and sendmsg calls.
- * Used value-result for recvmsg, value only for sendmsg.
- */
-struct msghdr {
-	void		*msg_name;	/* [XSI] optional address */
-	socklen_t	msg_namelen;	/* [XSI] size of address */
-	struct		iovec *msg_iov;	/* [XSI] scatter/gather array */
-	int		msg_iovlen;	/* [XSI] # elements in msg_iov */
-	void		*msg_control;	/* [XSI] ancillary data, see below */
-	socklen_t	msg_controllen;	/* [XSI] ancillary data buffer len */
-	int		msg_flags;	/* [XSI] flags on received message */
-};
-
-
-#define	MSG_OOB		0x1		/* process out-of-band data */
-#define	MSG_PEEK	0x2		/* peek at incoming message */
-#define	MSG_DONTROUTE	0x4		/* send without using routing tables */
-#define	MSG_EOR		0x8		/* data completes record */
-#define	MSG_TRUNC	0x10		/* data discarded before delivery */
-#define	MSG_CTRUNC	0x20		/* control data lost before delivery */
-#define	MSG_WAITALL	0x40		/* wait for full request or error */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	MSG_DONTWAIT	0x80		/* this message should be nonblocking */
-#define	MSG_EOF		0x100		/* data completes connection */
-#ifdef __APPLE__
-#define MSG_WAITSTREAM  0x200           /* wait up to full request.. may return partial */
-#define MSG_FLUSH	0x400		/* Start of 'hold' seq; dump so_temp */
-#define MSG_HOLD	0x800		/* Hold frag in so_temp */
-#define MSG_SEND	0x1000		/* Send the packet in so_temp */
-#define MSG_HAVEMORE	0x2000		/* Data ready to be read */
-#define MSG_RCVMORE	0x4000		/* Data remains in current pkt */
-#endif
-#define MSG_NEEDSA	0x10000		/* Fail receive if socket address cannot be allocated */
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-/*
- * Header for ancillary data objects in msg_control buffer.
- * Used for additional information with/about a datagram
- * not expressible by flags.  The format is a sequence
- * of message elements headed by cmsghdr structures.
- */
-struct cmsghdr {
-	socklen_t	cmsg_len;	/* [XSI] data byte count, including hdr */
-	int		cmsg_level;	/* [XSI] originating protocol */
-	int		cmsg_type;	/* [XSI] protocol-specific type */
-/* followed by	unsigned char  cmsg_data[]; */
-};
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#ifndef __APPLE__
-/*
- * While we may have more groups than this, the cmsgcred struct must
- * be able to fit in an mbuf, and NGROUPS_MAX is too large to allow
- * this.
-*/
-#define CMGROUP_MAX 16
-
-/*
- * Credentials structure, used to verify the identity of a peer
- * process that has sent us a message. This is allocated by the
- * peer process but filled in by the kernel. This prevents the
- * peer from lying about its identity. (Note that cmcred_groups[0]
- * is the effective GID.)
- */
-struct cmsgcred {
-	pid_t	cmcred_pid;		/* PID of sending process */
-	uid_t	cmcred_uid;		/* real UID of sending process */
-	uid_t	cmcred_euid;		/* effective UID of sending process */
-	gid_t	cmcred_gid;		/* real GID of sending process */
-	short	cmcred_ngroups;		/* number or groups */
-	gid_t	cmcred_groups[CMGROUP_MAX];	/* groups */
-};
-#endif
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-/* given pointer to struct cmsghdr, return pointer to data */
-#define	CMSG_DATA(cmsg)		((unsigned char *)(cmsg) + \
-				 __DARWIN_ALIGN32(sizeof(struct cmsghdr)))
-
-/*
- * RFC 2292 requires to check msg_controllen, in case that the kernel returns
- * an empty list for some reasons.
- */
-#define CMSG_FIRSTHDR(mhdr) \
-        ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
-         (struct cmsghdr *)(mhdr)->msg_control : \
-         (struct cmsghdr *)0L)
-
-
-/* 
- * Given pointer to struct cmsghdr, return pointer to next cmsghdr
- * RFC 2292 says that CMSG_NXTHDR(mhdr, NULL) is equivalent to CMSG_FIRSTHDR(mhdr)
- */
-#define	CMSG_NXTHDR(mhdr, cmsg)						\
-	((char *)(cmsg) == (char *)0L ? CMSG_FIRSTHDR(mhdr) :		\
-	 ((((unsigned char *)(cmsg) +					\
-	    __DARWIN_ALIGN32((__uint32_t)(cmsg)->cmsg_len) +		\
-	    __DARWIN_ALIGN32(sizeof(struct cmsghdr))) >			\
-	    ((unsigned char *)(mhdr)->msg_control +			\
-	     (mhdr)->msg_controllen)) ?					\
-	  (struct cmsghdr *)0L /* NULL */ :				\
-	  (struct cmsghdr *)((unsigned char *)(cmsg) +			\
-	 		    __DARWIN_ALIGN32((__uint32_t)(cmsg)->cmsg_len))))
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-/* RFC 2292 additions */
-#define	CMSG_SPACE(l)		(__DARWIN_ALIGN32(sizeof(struct cmsghdr)) + __DARWIN_ALIGN32(l))
-#define	CMSG_LEN(l)		(__DARWIN_ALIGN32(sizeof(struct cmsghdr)) + (l))
-
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-/* "Socket"-level control message types: */
-#define	SCM_RIGHTS	0x01		/* access rights (array of int) */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
-#define	SCM_CREDS	0x03		/* process creds (struct cmsgcred) */
-
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-/*
- * howto arguments for shutdown(2), specified by Posix.1g.
- */
-#define	SHUT_RD		0		/* shut down the reading side */
-#define	SHUT_WR		1		/* shut down the writing side */
-#define	SHUT_RDWR	2		/* shut down both sides */
-
-#if !defined(_POSIX_C_SOURCE)
-/*
- * sendfile(2) header/trailer struct
- */
-struct sf_hdtr {
-	struct iovec *headers;	/* pointer to an array of header struct iovec's */
-	int hdr_cnt;		/* number of header iovec's */
-	struct iovec *trailers;	/* pointer to an array of trailer struct iovec's */
-	int trl_cnt;		/* number of trailer iovec's */
-};
-
-
-#endif	/* !_POSIX_C_SOURCE */
-
-__BEGIN_DECLS
-int	accept(int, struct sockaddr * __restrict, socklen_t * __restrict)
-		__DARWIN_ALIAS_C(accept);
-int	bind(int, const struct sockaddr *, socklen_t) __DARWIN_ALIAS(bind);
-int	connect(int, const struct sockaddr *, socklen_t) __DARWIN_ALIAS_C( connect);
-int	getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict)
-		__DARWIN_ALIAS(getpeername);
-int	getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict)
-		__DARWIN_ALIAS(getsockname);
-int	getsockopt(int, int, int, void * __restrict, socklen_t * __restrict);
-int	listen(int, int) __DARWIN_ALIAS(listen);
-ssize_t	recv(int, void *, size_t, int) __DARWIN_ALIAS_C(recv);
-ssize_t	recvfrom(int, void *, size_t, int, struct sockaddr * __restrict,
-		socklen_t * __restrict) __DARWIN_ALIAS_C(recvfrom);
-ssize_t	recvmsg(int, struct msghdr *, int) __DARWIN_ALIAS_C(recvmsg);
-ssize_t	send(int, const void *, size_t, int) __DARWIN_ALIAS_C(send);
-ssize_t	sendmsg(int, const struct msghdr *, int) __DARWIN_ALIAS_C(sendmsg);
-ssize_t	sendto(int, const void *, size_t,
-		int, const struct sockaddr *, socklen_t) __DARWIN_ALIAS_C(sendto);
-int	setsockopt(int, int, int, const void *, socklen_t);
-int	shutdown(int, int);
-int	sockatmark(int);
-int	socket(int, int, int);
-int	socketpair(int, int, int, int *) __DARWIN_ALIAS(socketpair);
-
-#if !defined(_POSIX_C_SOURCE)
-int	sendfile(int, int, off_t, off_t *, struct sf_hdtr *, int);
-#endif	/* !_POSIX_C_SOURCE */
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-void	pfctlinput(int, struct sockaddr *);
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-__END_DECLS
-
-
-
-#endif /* !_SYS_SOCKET_H_ */
diff --git a/i386/include/sys/syscall.h b/i386/include/sys/syscall.h
deleted file mode 100644
index 1f5aeb7..0000000
--- a/i386/include/sys/syscall.h
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Copyright (c) 2004-2008 Apple Inc. All rights reserved.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- * 
- * 
- * System call switch table.
- *
- * DO NOT EDIT-- this file is automatically generated.
- * created from /SourceCache/xnu/xnu-1504.7.4/bsd/kern/syscalls.master
- */
-
-#ifndef _SYS_SYSCALL_H_
-#define	_SYS_SYSCALL_H_
-
-#include <sys/appleapiopts.h>
-#ifdef __APPLE_API_PRIVATE
-#define	SYS_syscall        0
-#define	SYS_exit           1
-#define	SYS_fork           2
-#define	SYS_read           3
-#define	SYS_write          4
-#define	SYS_open           5
-#define	SYS_close          6
-#define	SYS_wait4          7
-			/* 8  old creat */
-#define	SYS_link           9
-#define	SYS_unlink         10
-			/* 11  old execv */
-#define	SYS_chdir          12
-#define	SYS_fchdir         13
-#define	SYS_mknod          14
-#define	SYS_chmod          15
-#define	SYS_chown          16
-			/* 17  old break */
-#define	SYS_getfsstat      18
-			/* 19  old lseek */
-#define	SYS_getpid         20
-			/* 21  old mount */
-			/* 22  old umount */
-#define	SYS_setuid         23
-#define	SYS_getuid         24
-#define	SYS_geteuid        25
-#define	SYS_ptrace         26
-#define	SYS_recvmsg        27
-#define	SYS_sendmsg        28
-#define	SYS_recvfrom       29
-#define	SYS_accept         30
-#define	SYS_getpeername    31
-#define	SYS_getsockname    32
-#define	SYS_access         33
-#define	SYS_chflags        34
-#define	SYS_fchflags       35
-#define	SYS_sync           36
-#define	SYS_kill           37
-			/* 38  old stat */
-#define	SYS_getppid        39
-			/* 40  old lstat */
-#define	SYS_dup            41
-#define	SYS_pipe           42
-#define	SYS_getegid        43
-#define	SYS_profil         44
-			/* 45  old ktrace */
-#define	SYS_sigaction      46
-#define	SYS_getgid         47
-#define	SYS_sigprocmask    48
-#define	SYS_getlogin       49
-#define	SYS_setlogin       50
-#define	SYS_acct           51
-#define	SYS_sigpending     52
-#define	SYS_sigaltstack    53
-#define	SYS_ioctl          54
-#define	SYS_reboot         55
-#define	SYS_revoke         56
-#define	SYS_symlink        57
-#define	SYS_readlink       58
-#define	SYS_execve         59
-#define	SYS_umask          60
-#define	SYS_chroot         61
-			/* 62  old fstat */
-			/* 63  used internally , reserved */
-			/* 64  old getpagesize */
-#define	SYS_msync          65
-#define	SYS_vfork          66
-			/* 67  old vread */
-			/* 68  old vwrite */
-			/* 69  old sbrk */
-			/* 70  old sstk */
-			/* 71  old mmap */
-			/* 72  old vadvise */
-#define	SYS_munmap         73
-#define	SYS_mprotect       74
-#define	SYS_madvise        75
-			/* 76  old vhangup */
-			/* 77  old vlimit */
-#define	SYS_mincore        78
-#define	SYS_getgroups      79
-#define	SYS_setgroups      80
-#define	SYS_getpgrp        81
-#define	SYS_setpgid        82
-#define	SYS_setitimer      83
-			/* 84  old wait */
-#define	SYS_swapon         85
-#define	SYS_getitimer      86
-			/* 87  old gethostname */
-			/* 88  old sethostname */
-#define	SYS_getdtablesize  89
-#define	SYS_dup2           90
-			/* 91  old getdopt */
-#define	SYS_fcntl          92
-#define	SYS_select         93
-			/* 94  old setdopt */
-#define	SYS_fsync          95
-#define	SYS_setpriority    96
-#define	SYS_socket         97
-#define	SYS_connect        98
-			/* 99  old accept */
-#define	SYS_getpriority    100
-			/* 101  old send */
-			/* 102  old recv */
-			/* 103  old sigreturn */
-#define	SYS_bind           104
-#define	SYS_setsockopt     105
-#define	SYS_listen         106
-			/* 107  old vtimes */
-			/* 108  old sigvec */
-			/* 109  old sigblock */
-			/* 110  old sigsetmask */
-#define	SYS_sigsuspend     111
-			/* 112  old sigstack */
-			/* 113  old recvmsg */
-			/* 114  old sendmsg */
-			/* 115  old vtrace */
-#define	SYS_gettimeofday   116
-#define	SYS_getrusage      117
-#define	SYS_getsockopt     118
-			/* 119  old resuba */
-#define	SYS_readv          120
-#define	SYS_writev         121
-#define	SYS_settimeofday   122
-#define	SYS_fchown         123
-#define	SYS_fchmod         124
-			/* 125  old recvfrom */
-#define	SYS_setreuid       126
-#define	SYS_setregid       127
-#define	SYS_rename         128
-			/* 129  old truncate */
-			/* 130  old ftruncate */
-#define	SYS_flock          131
-#define	SYS_mkfifo         132
-#define	SYS_sendto         133
-#define	SYS_shutdown       134
-#define	SYS_socketpair     135
-#define	SYS_mkdir          136
-#define	SYS_rmdir          137
-#define	SYS_utimes         138
-#define	SYS_futimes        139
-#define	SYS_adjtime        140
-			/* 141  old getpeername */
-#define	SYS_gethostuuid    142
-			/* 143  old sethostid */
-			/* 144  old getrlimit */
-			/* 145  old setrlimit */
-			/* 146  old killpg */
-#define	SYS_setsid         147
-			/* 148  old setquota */
-			/* 149  old qquota */
-			/* 150  old getsockname */
-#define	SYS_getpgid        151
-#define	SYS_setprivexec    152
-#define	SYS_pread          153
-#define	SYS_pwrite         154
-#define	SYS_nfssvc         155
-			/* 156  old getdirentries */
-#define	SYS_statfs         157
-#define	SYS_fstatfs        158
-#define	SYS_unmount        159
-			/* 160  old async_daemon */
-#define	SYS_getfh          161
-			/* 162  old getdomainname */
-			/* 163  old setdomainname */
-			/* 164  */
-#define	SYS_quotactl       165
-			/* 166  old exportfs */
-#define	SYS_mount          167
-			/* 168  old ustat */
-#define	SYS_csops          169
-			/* 170  old table */
-			/* 171  old wait3 */
-			/* 172  old rpause */
-#define	SYS_waitid         173
-			/* 174  old getdents */
-			/* 175  old gc_control */
-#define	SYS_add_profil     176
-			/* 177  */
-			/* 178  */
-			/* 179  */
-#define	SYS_kdebug_trace   180
-#define	SYS_setgid         181
-#define	SYS_setegid        182
-#define	SYS_seteuid        183
-#define	SYS_sigreturn      184
-#define	SYS_chud           185
-			/* 186  */
-#define	SYS_fdatasync      187
-#define	SYS_stat           188
-#define	SYS_fstat          189
-#define	SYS_lstat          190
-#define	SYS_pathconf       191
-#define	SYS_fpathconf      192
-			/* 193  */
-#define	SYS_getrlimit      194
-#define	SYS_setrlimit      195
-#define	SYS_getdirentries  196
-#define	SYS_mmap           197
-			/* 198  __syscall */
-#define	SYS_lseek          199
-#define	SYS_truncate       200
-#define	SYS_ftruncate      201
-#define	SYS___sysctl       202
-#define	SYS_mlock          203
-#define	SYS_munlock        204
-#define	SYS_undelete       205
-#define	SYS_ATsocket       206
-#define	SYS_ATgetmsg       207
-#define	SYS_ATputmsg       208
-#define	SYS_ATPsndreq      209
-#define	SYS_ATPsndrsp      210
-#define	SYS_ATPgetreq      211
-#define	SYS_ATPgetrsp      212
-			/* 213  Reserved for AppleTalk */
-			/* 214  */
-			/* 215  */
-#define	SYS_mkcomplex      216
-#define	SYS_statv          217
-#define	SYS_lstatv         218
-#define	SYS_fstatv         219
-#define	SYS_getattrlist    220
-#define	SYS_setattrlist    221
-#define	SYS_getdirentriesattr 222
-#define	SYS_exchangedata   223
-			/* 224  old checkuseraccess / fsgetpath ( which moved to 427 ) */
-#define	SYS_searchfs       225
-#define	SYS_delete         226
-#define	SYS_copyfile       227
-#define	SYS_fgetattrlist   228
-#define	SYS_fsetattrlist   229
-#define	SYS_poll           230
-#define	SYS_watchevent     231
-#define	SYS_waitevent      232
-#define	SYS_modwatch       233
-#define	SYS_getxattr       234
-#define	SYS_fgetxattr      235
-#define	SYS_setxattr       236
-#define	SYS_fsetxattr      237
-#define	SYS_removexattr    238
-#define	SYS_fremovexattr   239
-#define	SYS_listxattr      240
-#define	SYS_flistxattr     241
-#define	SYS_fsctl          242
-#define	SYS_initgroups     243
-#define	SYS_posix_spawn    244
-#define	SYS_ffsctl         245
-			/* 246  */
-#define	SYS_nfsclnt        247
-#define	SYS_fhopen         248
-			/* 249  */
-#define	SYS_minherit       250
-#define	SYS_semsys         251
-#define	SYS_msgsys         252
-#define	SYS_shmsys         253
-#define	SYS_semctl         254
-#define	SYS_semget         255
-#define	SYS_semop          256
-			/* 257  */
-#define	SYS_msgctl         258
-#define	SYS_msgget         259
-#define	SYS_msgsnd         260
-#define	SYS_msgrcv         261
-#define	SYS_shmat          262
-#define	SYS_shmctl         263
-#define	SYS_shmdt          264
-#define	SYS_shmget         265
-#define	SYS_shm_open       266
-#define	SYS_shm_unlink     267
-#define	SYS_sem_open       268
-#define	SYS_sem_close      269
-#define	SYS_sem_unlink     270
-#define	SYS_sem_wait       271
-#define	SYS_sem_trywait    272
-#define	SYS_sem_post       273
-#define	SYS_sem_getvalue   274
-#define	SYS_sem_init       275
-#define	SYS_sem_destroy    276
-#define	SYS_open_extended  277
-#define	SYS_umask_extended 278
-#define	SYS_stat_extended  279
-#define	SYS_lstat_extended 280
-#define	SYS_fstat_extended 281
-#define	SYS_chmod_extended 282
-#define	SYS_fchmod_extended 283
-#define	SYS_access_extended 284
-#define	SYS_settid         285
-#define	SYS_gettid         286
-#define	SYS_setsgroups     287
-#define	SYS_getsgroups     288
-#define	SYS_setwgroups     289
-#define	SYS_getwgroups     290
-#define	SYS_mkfifo_extended 291
-#define	SYS_mkdir_extended 292
-#define	SYS_identitysvc    293
-#define	SYS_shared_region_check_np 294
-#define	SYS_shared_region_map_np 295
-#define	SYS_vm_pressure_monitor 296
-#define	SYS_psynch_rw_longrdlock 297
-#define	SYS_psynch_rw_yieldwrlock 298
-#define	SYS_psynch_rw_downgrade 299
-#define	SYS_psynch_rw_upgrade 300
-#define	SYS_psynch_mutexwait 301
-#define	SYS_psynch_mutexdrop 302
-#define	SYS_psynch_cvbroad 303
-#define	SYS_psynch_cvsignal 304
-#define	SYS_psynch_cvwait  305
-#define	SYS_psynch_rw_rdlock 306
-#define	SYS_psynch_rw_wrlock 307
-#define	SYS_psynch_rw_unlock 308
-#define	SYS_psynch_rw_unlock2 309
-#define	SYS_getsid         310
-#define	SYS_settid_with_pid 311
-			/* 312  old __pthread_cond_timedwait */
-#define	SYS_aio_fsync      313
-#define	SYS_aio_return     314
-#define	SYS_aio_suspend    315
-#define	SYS_aio_cancel     316
-#define	SYS_aio_error      317
-#define	SYS_aio_read       318
-#define	SYS_aio_write      319
-#define	SYS_lio_listio     320
-			/* 321  old __pthread_cond_wait */
-#define	SYS_iopolicysys    322
-			/* 323  */
-#define	SYS_mlockall       324
-#define	SYS_munlockall     325
-			/* 326  */
-#define	SYS_issetugid      327
-#define	SYS___pthread_kill 328
-#define	SYS___pthread_sigmask 329
-#define	SYS___sigwait      330
-#define	SYS___disable_threadsignal 331
-#define	SYS___pthread_markcancel 332
-#define	SYS___pthread_canceled 333
-#define	SYS___semwait_signal 334
-			/* 335  old utrace */
-#define	SYS_proc_info      336
-#define	SYS_sendfile       337
-#define	SYS_stat64         338
-#define	SYS_fstat64        339
-#define	SYS_lstat64        340
-#define	SYS_stat64_extended 341
-#define	SYS_lstat64_extended 342
-#define	SYS_fstat64_extended 343
-#define	SYS_getdirentries64 344
-#define	SYS_statfs64       345
-#define	SYS_fstatfs64      346
-#define	SYS_getfsstat64    347
-#define	SYS___pthread_chdir 348
-#define	SYS___pthread_fchdir 349
-#define	SYS_audit          350
-#define	SYS_auditon        351
-			/* 352  */
-#define	SYS_getauid        353
-#define	SYS_setauid        354
-#define	SYS_getaudit       355
-#define	SYS_setaudit       356
-#define	SYS_getaudit_addr  357
-#define	SYS_setaudit_addr  358
-#define	SYS_auditctl       359
-#define	SYS_bsdthread_create 360
-#define	SYS_bsdthread_terminate 361
-#define	SYS_kqueue         362
-#define	SYS_kevent         363
-#define	SYS_lchown         364
-#define	SYS_stack_snapshot 365
-#define	SYS_bsdthread_register 366
-#define	SYS_workq_open     367
-#define	SYS_workq_kernreturn 368
-#define	SYS_kevent64       369
-#define	SYS___old_semwait_signal 370
-#define	SYS___old_semwait_signal_nocancel 371
-#define	SYS_thread_selfid  372
-			/* 373  */
-			/* 374  */
-			/* 375  */
-			/* 376  */
-			/* 377  */
-			/* 378  */
-			/* 379  */
-#define	SYS___mac_execve   380
-#define	SYS___mac_syscall  381
-#define	SYS___mac_get_file 382
-#define	SYS___mac_set_file 383
-#define	SYS___mac_get_link 384
-#define	SYS___mac_set_link 385
-#define	SYS___mac_get_proc 386
-#define	SYS___mac_set_proc 387
-#define	SYS___mac_get_fd   388
-#define	SYS___mac_set_fd   389
-#define	SYS___mac_get_pid  390
-#define	SYS___mac_get_lcid 391
-#define	SYS___mac_get_lctx 392
-#define	SYS___mac_set_lctx 393
-#define	SYS_setlcid        394
-#define	SYS_getlcid        395
-#define	SYS_read_nocancel  396
-#define	SYS_write_nocancel 397
-#define	SYS_open_nocancel  398
-#define	SYS_close_nocancel 399
-#define	SYS_wait4_nocancel 400
-#define	SYS_recvmsg_nocancel 401
-#define	SYS_sendmsg_nocancel 402
-#define	SYS_recvfrom_nocancel 403
-#define	SYS_accept_nocancel 404
-#define	SYS_msync_nocancel 405
-#define	SYS_fcntl_nocancel 406
-#define	SYS_select_nocancel 407
-#define	SYS_fsync_nocancel 408
-#define	SYS_connect_nocancel 409
-#define	SYS_sigsuspend_nocancel 410
-#define	SYS_readv_nocancel 411
-#define	SYS_writev_nocancel 412
-#define	SYS_sendto_nocancel 413
-#define	SYS_pread_nocancel 414
-#define	SYS_pwrite_nocancel 415
-#define	SYS_waitid_nocancel 416
-#define	SYS_poll_nocancel  417
-#define	SYS_msgsnd_nocancel 418
-#define	SYS_msgrcv_nocancel 419
-#define	SYS_sem_wait_nocancel 420
-#define	SYS_aio_suspend_nocancel 421
-#define	SYS___sigwait_nocancel 422
-#define	SYS___semwait_signal_nocancel 423
-#define	SYS___mac_mount    424
-#define	SYS___mac_get_mount 425
-#define	SYS___mac_getfsstat 426
-#define	SYS_fsgetpath      427
-#define	SYS_audit_session_self 428
-#define	SYS_audit_session_join 429
-#define	SYS_pid_suspend    430
-#define	SYS_pid_resume     431
-#define	SYS_fileport_makeport 432
-#define	SYS_fileport_makefd 433
-#define	SYS_MAXSYSCALL	434
-
-#endif /* __APPLE_API_PRIVATE */
-#endif /* !_SYS_SYSCALL_H_ */
diff --git a/i386/include/sys/syslimits.h b/i386/include/sys/syslimits.h
deleted file mode 100644
index a020b39..0000000
--- a/i386/include/sys/syslimits.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*	$NetBSD: syslimits.h,v 1.15 1997/06/25 00:48:09 lukem Exp $	*/
-
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _SYS_SYSLIMITS_H_
-#define _SYS_SYSLIMITS_H_
-
-#include <sys/cdefs.h>
-
-#if !defined(_ANSI_SOURCE)
-/*
- * Note: CHILD_MAX *must* be less than hard_maxproc, which is set at
- * compile time; you *cannot* set it higher than the hard limit!!
- */
-#define	ARG_MAX		   (256 * 1024)	/* max bytes for an exec function */
-#define	CHILD_MAX		   266	/* max simultaneous processes */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	GID_MAX		   2147483647U	/* max value for a gid_t (2^31-2) */
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
-#define	LINK_MAX		32767	/* max file link count */
-#define	MAX_CANON		 1024	/* max bytes in term canon input line */
-#define	MAX_INPUT		 1024	/* max bytes in terminal input */
-#define	NAME_MAX		  255	/* max bytes in a file name */
-#define	NGROUPS_MAX		   16	/* max supplemental group id's */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	UID_MAX		   2147483647U	/* max value for a uid_t (2^31-2) */
-
-#define	OPEN_MAX		10240	/* max open files per process - todo, make a config option? */
-
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
-#define	PATH_MAX		 1024	/* max bytes in pathname */
-#define	PIPE_BUF		  512	/* max bytes for atomic pipe writes */
-
-#define	BC_BASE_MAX		   99	/* max ibase/obase values in bc(1) */
-#define	BC_DIM_MAX		 2048	/* max array elements in bc(1) */
-#define	BC_SCALE_MAX		   99	/* max scale value in bc(1) */
-#define	BC_STRING_MAX		 1000	/* max const string length in bc(1) */
-#define	CHARCLASS_NAME_MAX	   14	/* max character class name size */
-#define	COLL_WEIGHTS_MAX	    2	/* max weights for order keyword */
-#define	EQUIV_CLASS_MAX		    2
-#define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
-#define	LINE_MAX		 2048	/* max bytes in an input line */
-#define	RE_DUP_MAX		  255	/* max RE's in interval notation */
-
-#if __DARWIN_UNIX03
-#define	NZERO			   20	/* default priority [XSI] */
-					/* = ((PRIO_MAX - PRIO_MIN) / 2) + 1 */
-					/* range: 0 - 39 [(2 * NZERO) - 1] */
-					/* 0 is not actually used */
-#else /* !__DARWIN_UNIX03 */
-#define	NZERO			    0	/* default priority */
-					/* range: -20 - 20 */
-					/* (PRIO_MIN - PRIO_MAX) */
-#endif /* __DARWIN_UNIX03 */
-#endif /* !_ANSI_SOURCE */
-
-#endif /* !_SYS_SYSLIMITS_H_ */
diff --git a/i386/include/sys/time.h b/i386/include/sys/time.h
deleted file mode 100644
index 4b2d999..0000000
--- a/i386/include/sys/time.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)time.h	8.2 (Berkeley) 7/10/94
- */
-
-#ifndef _SYS_TIME_H_
-#define _SYS_TIME_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/*
- * [XSI] The fd_set type shall be defined as described in <sys/select.h>.
- * The timespec structure shall be defined as described in <time.h>
- */
-#define __need_fd_set
-#define __need_struct_timespec
-#define __need_struct_timeval
-#include <sys/_structs.h>
-
-#ifndef	_TIME_T
-#define	_TIME_T
-typedef	__darwin_time_t	time_t;
-#endif
-
-#ifndef _SUSECONDS_T
-#define _SUSECONDS_T
-typedef __darwin_suseconds_t	suseconds_t;
-#endif
-
-/*
- * Structure used as a parameter by getitimer(2) and setitimer(2) system
- * calls.
- */
-struct	itimerval {
-	struct	timeval it_interval;	/* timer interval */
-	struct	timeval it_value;	/* current value */
-};
-
-/*
- * Names of the interval timers, and structure
- * defining a timer setting.
- */
-#define	ITIMER_REAL	0
-#define	ITIMER_VIRTUAL	1
-#define	ITIMER_PROF	2
-
-/*
- * Select uses bit masks of file descriptors in longs.  These macros
- * manipulate such bit fields (the filesystem macros use chars).  The
- * extra protection here is to permit application redefinition above
- * the default size.
- */
-#ifndef	FD_SETSIZE
-#define	FD_SETSIZE	__DARWIN_FD_SETSIZE
-#endif	/* FD_SETSIZE */
-#ifndef FD_SET
-#define	FD_SET(n, p)	__DARWIN_FD_SET(n, p)
-#endif	/* FD_SET */
-#ifndef	FD_CLR
-#define	FD_CLR(n,p)	__DARWIN_FD_CLR(n, p)
-#endif	/* FD_CLR */
-#ifndef FD_ISSET
-#define	FD_ISSET(n, p)	__DARWIN_FD_ISSET(n, p)
-#endif	/* FD_ISSET */
-#ifndef FD_ZERO
-#define	FD_ZERO(p)	__DARWIN_FD_ZERO(p)
-#endif	/* FD_ZERO */
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-
-#ifndef FD_COPY
-#define	FD_COPY(f, t)	__DARWIN_FD_COPY(f, t)
-#endif	/* FD_COPY */
-
-#define	TIMEVAL_TO_TIMESPEC(tv, ts) {					\
-	(ts)->tv_sec = (tv)->tv_sec;					\
-	(ts)->tv_nsec = (tv)->tv_usec * 1000;				\
-}
-#define	TIMESPEC_TO_TIMEVAL(tv, ts) {					\
-	(tv)->tv_sec = (ts)->tv_sec;					\
-	(tv)->tv_usec = (ts)->tv_nsec / 1000;				\
-}
-
-struct timezone {
-	int	tz_minuteswest;	/* minutes west of Greenwich */
-	int	tz_dsttime;	/* type of dst correction */
-};
-#define	DST_NONE	0	/* not on dst */
-#define	DST_USA		1	/* USA style dst */
-#define	DST_AUST	2	/* Australian style dst */
-#define	DST_WET		3	/* Western European dst */
-#define	DST_MET		4	/* Middle European dst */
-#define	DST_EET		5	/* Eastern European dst */
-#define	DST_CAN		6	/* Canada */
-
-/* Operations on timevals. */
-#define	timerclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
-#define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-#define	timercmp(tvp, uvp, cmp)						\
-	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
-	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
-	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#define	timeradd(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec >= 1000000) {			\
-			(vvp)->tv_sec++;				\
-			(vvp)->tv_usec -= 1000000;			\
-		}							\
-	} while (0)
-#define	timersub(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec < 0) {				\
-			(vvp)->tv_sec--;				\
-			(vvp)->tv_usec += 1000000;			\
-		}							\
-	} while (0)
-
-#define timevalcmp(l, r, cmp)   timercmp(l, r, cmp) /* freebsd */
-
-/*
- * Getkerninfo clock information structure
- */
-struct clockinfo {
-	int	hz;		/* clock frequency */
-	int	tick;		/* micro-seconds per hz tick */
-	int	tickadj;	/* clock skew rate for adjtime() */
-	int	stathz;		/* statistics clock frequency */
-	int	profhz;		/* profiling clock frequency */
-};
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#include <time.h>
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-__BEGIN_DECLS
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-int	adjtime(const struct timeval *, struct timeval *);
-int	futimes(int, const struct timeval *);
-int	lutimes(const char *, const struct timeval *);
-int	settimeofday(const struct timeval *, const struct timezone *);
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-int	getitimer(int, struct itimerval *);
-int	gettimeofday(struct timeval * __restrict, void * __restrict);
-
-#include <sys/_select.h>	/* select() prototype */
-
-int	setitimer(int, const struct itimerval * __restrict,
-		struct itimerval * __restrict);
-int	utimes(const char *, const struct timeval *);
-
-__END_DECLS
-
-
-#endif /* !_SYS_TIME_H_ */
diff --git a/i386/include/sys/types.h b/i386/include/sys/types.h
deleted file mode 100644
index 01d4f2b..0000000
--- a/i386/include/sys/types.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
-/*
- * Copyright (c) 1982, 1986, 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)types.h	8.4 (Berkeley) 1/21/94
- */
-
-#ifndef _SYS_TYPES_H_
-#define	_SYS_TYPES_H_
-
-#ifndef __ASSEMBLER__
-#include <sys/cdefs.h>
-
-/* Machine type dependent parameters. */
-#include <machine/types.h>
-#include <sys/_types.h>
-#include <machine/endian.h>
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-typedef	unsigned char		u_char;
-typedef	unsigned short		u_short;
-typedef	unsigned int		u_int;
-#ifndef _U_LONG
-typedef	unsigned long		u_long;
-#define _U_LONG
-#endif
-typedef	unsigned short		ushort;		/* Sys V compatibility */
-typedef	unsigned int		uint;		/* Sys V compatibility */
-#endif
-
-typedef	u_int64_t		u_quad_t;	/* quads */
-typedef	int64_t			quad_t;
-typedef	quad_t *		qaddr_t;
-
-typedef	char *			caddr_t;	/* core address */
-typedef	int32_t			daddr_t;	/* disk address */
-
-typedef	u_int32_t		fixpt_t;	/* fixed point number */
-
-
-#ifndef _IN_ADDR_T
-#define _IN_ADDR_T
-typedef	__uint32_t		in_addr_t;	/* base type for internet address */
-#endif
-
-#ifndef _IN_PORT_T
-#define _IN_PORT_T
-typedef	__uint16_t		in_port_t;
-#endif
-
-
-#ifndef _KEY_T
-#define _KEY_T
-typedef	__int32_t		key_t;		/* IPC key (for Sys V IPC) */
-#endif
-
-#ifndef _NLINK_T
-typedef	__uint16_t		nlink_t;	/* link count */
-#define	_NLINK_T
-#endif
-
-typedef	int32_t			segsz_t;	/* segment size */
-typedef	int32_t			swblk_t;	/* swap offset */
-
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-/* Major, minor numbers, dev_t's. */
-#if defined(__cplusplus)
-/*
- * These lowercase macros tend to match member functions in some C++ code,
- * so for C++, we must use inline functions instead.
- */
-
-static inline __int32_t  major(__uint32_t _x)
-{
-	return (__int32_t)(((__uint32_t)_x >> 24) & 0xff);
-}
-
-static inline __int32_t  minor(__uint32_t _x)
-{
-	return (__int32_t)((_x) & 0xffffff);
-}
-#else	/* !__cplusplus */
-
-#define	major(x)	((int32_t)(((u_int32_t)(x) >> 24) & 0xff))
-#define	minor(x)	((int32_t)((x) & 0xffffff))
-
-#endif	/* !__cplusplus */
-#endif	/* !_POSIX_C_SOURCE */
-
-#ifndef	_CLOCK_T
-#define	_CLOCK_T
-typedef	__darwin_clock_t	clock_t;
-#endif
-
-#ifndef _SIZE_T
-#define _SIZE_T
-/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see
- * _GCC_SIZE_T */
-typedef __darwin_size_t		size_t;
-#endif
-
-#ifndef	_SSIZE_T
-#define	_SSIZE_T
-typedef	__darwin_ssize_t	ssize_t;
-#endif
-
-#ifndef	_TIME_T
-#define	_TIME_T
-typedef	__darwin_time_t		time_t;
-#endif
-
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-/*
- * This code is present here in order to maintain historical backward
- * compatability, and is intended to be removed at some point in the
- * future; please include <sys/select.h> instead.
- */
-#define __need_fd_set
-#include <sys/_structs.h>
-
-#define	NBBY		__DARWIN_NBBY		/* bits in a byte */
-#define NFDBITS		__DARWIN_NFDBITS	/* bits per mask */
-#define	howmany(x, y)	__DARWIN_howmany(x, y)	/* # y's == x bits? */
-typedef __int32_t	fd_mask;
-
-/*
- * Select uses bit masks of file descriptors in longs.  These macros
- * manipulate such bit fields (the filesystem macros use chars).  The
- * extra protection here is to permit application redefinition above
- * the default size.
- */
-#ifndef	FD_SETSIZE
-#define	FD_SETSIZE	__DARWIN_FD_SETSIZE
-#endif /* FD_SETSIZE */
-#ifndef FD_SET
-#define	FD_SET(n, p)	__DARWIN_FD_SET(n, p)
-#endif /* FD_SET */
-#ifndef FD_CLR
-#define	FD_CLR(n, p)	__DARWIN_FD_CLR(n, p)
-#endif /* FD_CLR */
-#ifndef FD_ISSET
-#define	FD_ISSET(n, p)	__DARWIN_FD_ISSET(n, p)
-#endif /* FD_ISSET */
-#ifndef FD_ZERO
-#define	FD_ZERO(p)	__DARWIN_FD_ZERO(p)
-#endif /* FD_ZERO */
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#ifndef FD_COPY
-#define	FD_COPY(f, t)	__DARWIN_FD_COPY(f, t)
-#endif /* FD_COPY */
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-
-#if defined(__STDC__) && defined(KERNEL)
-/*
- * Forward structure declarations for function prototypes.  We include the
- * common structures that cross subsystem boundaries here; others are mostly
- * used in the same place that the structure is defined.
- */
-struct	proc;
-struct	pgrp;
-struct	ucred;
-struct	rusage;
-struct	file;
-struct	buf;
-struct	tty;
-struct	uio;
-#endif
-
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#endif /* __ASSEMBLER__ */
-
-
-
-
-#endif /* !_SYS_TYPES_H_ */
diff --git a/i386/include/sys/unistd.h b/i386/include/sys/unistd.h
deleted file mode 100644
index d80b3bb..0000000
--- a/i386/include/sys/unistd.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
- */
-
-#ifndef _SYS_UNISTD_H_
-#define	_SYS_UNISTD_H_
-
-#include <sys/cdefs.h>
-
-/*
- * Although we have saved user/group IDs, we do not use them in setuid
- * as described in POSIX 1003.1, because the feature does not work for
- * root.  We use the saved IDs in seteuid/setegid, which are not currently
- * part of the POSIX 1003.1 specification.
- */
-#ifdef	_NOT_AVAILABLE
-#define	_POSIX_SAVED_IDS	/* saved set-user-ID and set-group-ID */
-#endif
-
-#define	_POSIX_VERSION		200112L
-#define	_POSIX2_VERSION		200112L
-
-/* execution-time symbolic constants */
-				/* may disable terminal special characters */
-#ifndef _POSIX_VDISABLE
-#define	_POSIX_VDISABLE		((unsigned char)'\377')
-#endif
-
-#define _POSIX_THREAD_KEYS_MAX 128
-
-/* access function */
-#define	F_OK		0	/* test for existence of file */
-#define	X_OK		(1<<0)	/* test for execute or search permission */
-#define	W_OK		(1<<1)	/* test for write permission */
-#define	R_OK		(1<<2)	/* test for read permission */
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-/*
- * Extended access functions.
- * Note that we depend on these matching the definitions in sys/kauth.h,
- * but with the bits shifted left by 8.
- */
-#define _READ_OK	(1<<9)	/* read file data / read directory */
-#define _WRITE_OK	(1<<10)	/* write file data / add file to directory */
-#define _EXECUTE_OK	(1<<11) /* execute file / search in directory*/
-#define _DELETE_OK	(1<<12)	/* delete file / delete directory */
-#define _APPEND_OK	(1<<13)	/* append to file / add subdirectory to directory */
-#define _RMFILE_OK	(1<<14)	/* - / remove file from directory */
-#define _RATTR_OK	(1<<15)	/* read basic attributes */
-#define _WATTR_OK	(1<<16)	/* write basic attributes */
-#define _REXT_OK	(1<<17)	/* read extended attributes */
-#define _WEXT_OK	(1<<18)	/* write extended attributes */
-#define _RPERM_OK	(1<<19)	/* read permissions */
-#define _WPERM_OK	(1<<20)	/* write permissions */
-#define _CHOWN_OK	(1<<21)	/* change ownership */
-
-#define _ACCESS_EXTENDED_MASK (_READ_OK | _WRITE_OK | _EXECUTE_OK | \
-				_DELETE_OK | _APPEND_OK | \
-				_RMFILE_OK | _REXT_OK | \
-				_WEXT_OK | _RATTR_OK | _WATTR_OK | _RPERM_OK | \
-				_WPERM_OK | _CHOWN_OK)
-#endif
-
-/* whence values for lseek(2) */
-#ifndef SEEK_SET
-#define	SEEK_SET	0	/* set file offset to offset */
-#define	SEEK_CUR	1	/* set file offset to current plus offset */
-#define	SEEK_END	2	/* set file offset to EOF plus offset */
-#endif	/* !SEEK_SET */
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-/* whence values for lseek(2); renamed by POSIX 1003.1 */
-#define	L_SET		SEEK_SET
-#define	L_INCR		SEEK_CUR
-#define	L_XTND		SEEK_END
-#endif
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-struct accessx_descriptor {
-	unsigned int ad_name_offset;
-	int ad_flags;
-	int ad_pad[2];
-};
-#define ACCESSX_MAX_DESCRIPTORS	100
-#define ACCESSX_MAX_TABLESIZE	(16 * 1024)
-#endif
-
-/* configurable pathname variables */
-#define	_PC_LINK_MAX		 1
-#define	_PC_MAX_CANON		 2
-#define	_PC_MAX_INPUT		 3
-#define	_PC_NAME_MAX		 4
-#define	_PC_PATH_MAX		 5
-#define	_PC_PIPE_BUF		 6
-#define	_PC_CHOWN_RESTRICTED	 7
-#define	_PC_NO_TRUNC		 8
-#define	_PC_VDISABLE		 9
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	_PC_NAME_CHARS_MAX	 10
-#define	_PC_CASE_SENSITIVE		 11
-#define	_PC_CASE_PRESERVING		 12
-#define _PC_EXTENDED_SECURITY_NP        13
-#define _PC_AUTH_OPAQUE_NP      14
-#endif
-
-#define	_PC_2_SYMLINKS		15	/* Symlink supported in directory */
-#define	_PC_ALLOC_SIZE_MIN	16	/* Minimum storage actually allocated */
-#define	_PC_ASYNC_IO		17	/* Async I/O [AIO] supported? */
-#define	_PC_FILESIZEBITS	18	/* # of bits to represent file size */
-#define	_PC_PRIO_IO		19	/* Priority I/O [PIO] supported? */
-#define	_PC_REC_INCR_XFER_SIZE	20	/* Recommended increment for next two */
-#define	_PC_REC_MAX_XFER_SIZE	21	/* Recommended max file transfer size */
-#define	_PC_REC_MIN_XFER_SIZE	22	/* Recommended min file transfer size */
-#define	_PC_REC_XFER_ALIGN	23	/* Recommended buffer alignment */
-#define	_PC_SYMLINK_MAX		24	/* Max # of bytes in symlink name */
-#define	_PC_SYNC_IO		25	/* Sync I/O [SIO] supported? */
-
-/* configurable system strings */
-#define	_CS_PATH		 1
-
-#endif /* !_SYS_UNISTD_H_ */
diff --git a/i386/include/sys/vnode.h b/i386/include/sys/vnode.h
deleted file mode 100644
index 9e1a0c7..0000000
--- a/i386/include/sys/vnode.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
- *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
- * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)vnode.h	8.17 (Berkeley) 5/20/95
- */
- 
-#ifndef _VNODE_H_
-#define _VNODE_H_
-
-#include <sys/appleapiopts.h>
-#include <sys/cdefs.h>
-
-/*
- * The vnode is the focus of all file activity in UNIX.  There is a
- * unique vnode allocated for each active file, each current directory,
- * each mounted-on file, text file, and the root.
- */
-
-/*
- * Vnode types.  VNON means no type.
- */
-enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD, VSTR,
-			  VCPLX };
-
-/*
- * Vnode tag types.
- * These are for the benefit of external programs only (e.g., pstat)
- * and should NEVER be inspected by the kernel.
- */
-enum vtagtype	{
-	VT_NON, VT_UFS, VT_NFS, VT_MFS, VT_MSDOSFS, VT_LFS, VT_LOFS, VT_FDESC,
-	VT_PORTAL, VT_NULL, VT_UMAP, VT_KERNFS, VT_PROCFS, VT_AFS, VT_ISOFS,
-	VT_UNION, VT_HFS, VT_ZFS, VT_DEVFS, VT_WEBDAV, VT_UDF, VT_AFP,
-	VT_CDDA, VT_CIFS, VT_OTHER};
-
-
-/*
- * flags for VNOP_BLOCKMAP
- */
-#define VNODE_READ	0x01
-#define VNODE_WRITE	0x02
-
-
-
-/* flags for VNOP_ALLOCATE */
-#define	PREALLOCATE		0x00000001	/* preallocate allocation blocks */
-#define	ALLOCATECONTIG	0x00000002	/* allocate contigious space */
-#define	ALLOCATEALL		0x00000004	/* allocate all requested space */
-									/* or no space at all */
-#define	FREEREMAINDER	0x00000008	/* deallocate allocated but */
-									/* unfilled blocks */
-#define	ALLOCATEFROMPEOF	0x00000010	/* allocate from the physical eof */
-#define	ALLOCATEFROMVOL		0x00000020	/* allocate from the volume offset */
-
-/*
- * Token indicating no attribute value yet assigned. some user source uses this
- */
-#define	VNOVAL	(-1)
-
-
-
-#endif /* !_VNODE_H_ */
diff --git a/i386/include/time.h b/i386/include/time.h
deleted file mode 100644
index 2914d40..0000000
--- a/i386/include/time.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)time.h	8.3 (Berkeley) 1/21/94
- */
-
-#ifndef _TIME_H_
-#define	_TIME_H_
-
-#include <_types.h>
-
-#define __need_struct_timespec
-#include <_structs.h>
-
-#ifndef NULL
-#define NULL __DARWIN_NULL
-#endif /* ! NULL */
-
-#ifndef	_CLOCK_T
-#define _CLOCK_T
-typedef	__darwin_clock_t	clock_t;
-#endif
-
-#ifndef	_SIZE_T
-#define	_SIZE_T
-typedef	__darwin_size_t		size_t;
-#endif
-
-#ifndef	_TIME_T
-#define	_TIME_T
-typedef	__darwin_time_t		time_t;
-#endif
-
-struct tm {
-	int	tm_sec;		/* seconds after the minute [0-60] */
-	int	tm_min;		/* minutes after the hour [0-59] */
-	int	tm_hour;	/* hours since midnight [0-23] */
-	int	tm_mday;	/* day of the month [1-31] */
-	int	tm_mon;		/* months since January [0-11] */
-	int	tm_year;	/* years since 1900 */
-	int	tm_wday;	/* days since Sunday [0-6] */
-	int	tm_yday;	/* days since January 1 [0-365] */
-	int	tm_isdst;	/* Daylight Savings Time flag */
-	long	tm_gmtoff;	/* offset from CUT in seconds */
-	char	*tm_zone;	/* timezone abbreviation */
-};
-
-#if __DARWIN_UNIX03
-#define CLOCKS_PER_SEC  1000000	/* [XSI] */
-#else /* !__DARWIN_UNIX03 */
-#include <machine/_limits.h>	/* Include file containing CLK_TCK. */
-
-#define CLOCKS_PER_SEC  (__DARWIN_CLK_TCK)
-#endif /* __DARWIN_UNIX03 */
-
-#ifndef _ANSI_SOURCE
-extern char *tzname[];
-#endif
-
-extern int getdate_err;
-#if __DARWIN_UNIX03
-//Begin-Libc
-#ifndef LIBC_ALIAS_TIMEZONE
-//End-Libc
-extern long timezone __DARWIN_ALIAS(timezone);
-//Begin-Libc
-#else /* LIBC_ALIAS_TIMEZONE */
-extern long timezone LIBC_ALIAS(timezone);
-#endif /* !LIBC_ALIAS_TIMEZONE */
-//End-Libc
-#endif /* __DARWIN_UNIX03 */
-extern int daylight;
-
-__BEGIN_DECLS
-char *asctime(const struct tm *);
-//Begin-Libc
-#ifndef LIBC_ALIAS_CLOCK
-//End-Libc
-clock_t clock(void) __DARWIN_ALIAS(clock);
-//Begin-Libc
-#else /* LIBC_ALIAS_CLOCK */
-clock_t clock(void) LIBC_ALIAS(clock);
-#endif /* !LIBC_ALIAS_CLOCK */
-//End-Libc
-char *ctime(const time_t *);
-double difftime(time_t, time_t);
-struct tm *getdate(const char *);
-struct tm *gmtime(const time_t *);
-struct tm *localtime(const time_t *);
-//Begin-Libc
-#ifndef LIBC_ALIAS_MKTIME
-//End-Libc
-time_t mktime(struct tm *) __DARWIN_ALIAS(mktime);
-//Begin-Libc
-#else /* LIBC_ALIAS_MKTIME */
-time_t mktime(struct tm *) LIBC_ALIAS(mktime);
-#endif /* !LIBC_ALIAS_MKTIME */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_STRFTIME
-//End-Libc
-size_t strftime(char * __restrict, size_t, const char * __restrict, const struct tm * __restrict) __DARWIN_ALIAS(strftime);
-//Begin-Libc
-#else /* LIBC_ALIAS_STRFTIME */
-size_t strftime(char * __restrict, size_t, const char * __restrict, const struct tm * __restrict) LIBC_ALIAS(strftime);
-#endif /* !LIBC_ALIAS_STRFTIME */
-//End-Libc
-//Begin-Libc
-#ifndef LIBC_ALIAS_STRPTIME
-//End-Libc
-char *strptime(const char * __restrict, const char * __restrict, struct tm * __restrict) __DARWIN_ALIAS(strptime);
-//Begin-Libc
-#else /* LIBC_ALIAS_STRPTIME */
-char *strptime(const char * __restrict, const char * __restrict, struct tm * __restrict) LIBC_ALIAS(strptime);
-#endif /* !LIBC_ALIAS_STRPTIME */
-//End-Libc
-time_t time(time_t *);
-
-#ifndef _ANSI_SOURCE
-void tzset(void);
-#endif /* not ANSI */
-
-/* [TSF] Thread safe functions */
-char *asctime_r(const struct tm * __restrict, char * __restrict);
-char *ctime_r(const time_t *, char *);
-struct tm *gmtime_r(const time_t * __restrict, struct tm * __restrict);
-struct tm *localtime_r(const time_t * __restrict, struct tm * __restrict);
-
-#if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
-time_t posix2time(time_t);
-#if !__DARWIN_UNIX03
-char *timezone(int, int);
-#endif /* !__DARWIN_UNIX03 */
-void tzsetwall(void);
-time_t time2posix(time_t);
-time_t timelocal(struct tm * const);
-time_t timegm(struct tm * const);
-#endif /* neither ANSI nor POSIX */
-
-#if !defined(_ANSI_SOURCE)
-//Begin-Libc
-#ifndef LIBC_ALIAS_NANOSLEEP
-//End-Libc
-int nanosleep(const struct timespec *, struct timespec *) __DARWIN_ALIAS_C(nanosleep);
-//Begin-Libc
-#else /* LIBC_ALIAS_NANOSLEEP */
-int nanosleep(const struct timespec *, struct timespec *) LIBC_ALIAS_C(nanosleep);
-#endif /* !LIBC_ALIAS_NANOSLEEP */
-//End-Libc
-#endif
-__END_DECLS
-
-#ifdef _USE_EXTENDED_LOCALES_
-#include <xlocale/_time.h>
-#endif /* _USE_EXTENDED_LOCALES_ */
-
-#endif /* !_TIME_H_ */
diff --git a/i386/include/unistd.h b/i386/include/unistd.h
deleted file mode 100644
index a15eee6..0000000
--- a/i386/include/unistd.h
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
- * Copyright (c) 2000, 2002-2006, 2008, 2009 Apple Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-/*-
- * Copyright (c) 1998-1999 Apple Computer, Inc. All Rights Reserved
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- *
- *  Copyright (c)  1998 Apple Compter, Inc.
- *  All Rights Reserved
- */
-
-/* History:
-        7/14/99 EKN at Apple fixed getdirentriesattr from getdirentryattr
-        3/26/98 CHW at Apple added real interface to searchfs call
-  	3/5/98  CHW at Apple added hfs semantic system calls headers
-*/
-
-#ifndef _UNISTD_H_
-#define	_UNISTD_H_
-
-#include <_types.h>
-#include <sys/unistd.h>
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#ifndef _DEV_T
-#define	_DEV_T
-typedef __darwin_dev_t		dev_t;
-#endif
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
-
-#ifndef _GID_T
-#define	_GID_T
-typedef __darwin_gid_t		gid_t;
-#endif
-
-#ifndef _INTPTR_T
-#define	_INTPTR_T
-typedef __darwin_intptr_t	intptr_t;
-#endif
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#ifndef _MODE_T
-#define	_MODE_T
-typedef __darwin_mode_t		mode_t;
-#endif
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
-
-#ifndef _OFF_T
-#define	_OFF_T
-typedef __darwin_off_t		off_t;
-#endif
-
-#ifndef _PID_T
-#define	_PID_T
-typedef __darwin_pid_t		pid_t;
-#endif
-
-#ifndef _SIZE_T
-#define	_SIZE_T
-/* DO NOT REMOVE THIS COMMENT: fixincludes needs to see:
- * _GCC_SIZE_T */
-typedef __darwin_size_t		size_t;
-#endif
-
-#ifndef	_SSIZE_T
-#define	_SSIZE_T
-typedef	__darwin_ssize_t	ssize_t;
-#endif
-
-#ifndef _UID_T
-#define	_UID_T
-typedef __darwin_uid_t		uid_t;	/* user id 	*/
-#endif
-
-#ifndef _USECONDS_T
-#define	_USECONDS_T
-typedef __darwin_useconds_t	useconds_t;
-#endif
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#ifndef _UUID_T
-#define	_UUID_T
-typedef __darwin_uuid_t		uuid_t;
-#endif /* _UUID_T */
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
-
-#define	 STDIN_FILENO	0	/* standard input file descriptor */
-#define	STDOUT_FILENO	1	/* standard output file descriptor */
-#define	STDERR_FILENO	2	/* standard error file descriptor */
-
-#ifndef NULL
-#define	NULL __DARWIN_NULL
-#endif /* ! NULL */
-
-/* Version test macros */
-/* _POSIX_VERSION and _POSIX2_VERSION from sys/unistd.h */
-#define	_XOPEN_VERSION			600		/* [XSI] */
-#define	_XOPEN_XCU_VERSION		4		/* Older standard */
-
-
-/* Please keep this list in the same order as the applicable standard */
-#define	_POSIX_ADVISORY_INFO		(-1)		/* [ADV] */
-#define	_POSIX_ASYNCHRONOUS_IO		(-1)		/* [AIO] */
-#define	_POSIX_BARRIERS			(-1)		/* [BAR] */
-#define	_POSIX_CHOWN_RESTRICTED		200112L
-#define	_POSIX_CLOCK_SELECTION		(-1)		/* [CS] */
-#define	_POSIX_CPUTIME			(-1)		/* [CPT] */
-#define	_POSIX_FSYNC			200112L		/* [FSC] */
-#define	_POSIX_IPV6			200112L
-#define	_POSIX_JOB_CONTROL		200112L
-#define	_POSIX_MAPPED_FILES		200112L		/* [MF] */
-#define	_POSIX_MEMLOCK			(-1)		/* [ML] */
-#define	_POSIX_MEMLOCK_RANGE		(-1)		/* [MR] */
-#define	_POSIX_MEMORY_PROTECTION	200112L		/* [MPR] */
-#define	_POSIX_MESSAGE_PASSING		(-1)		/* [MSG] */
-#define	_POSIX_MONOTONIC_CLOCK		(-1)		/* [MON] */
-#define	_POSIX_NO_TRUNC			200112L
-#define	_POSIX_PRIORITIZED_IO		(-1)		/* [PIO] */
-#define	_POSIX_PRIORITY_SCHEDULING	(-1)		/* [PS] */
-#define	_POSIX_RAW_SOCKETS		(-1)		/* [RS] */
-#define	_POSIX_READER_WRITER_LOCKS	200112L		/* [THR] */
-#define	_POSIX_REALTIME_SIGNALS		(-1)		/* [RTS] */
-#define	_POSIX_REGEXP			200112L
-#define	_POSIX_SAVED_IDS		200112L		/* XXX required */
-#define	_POSIX_SEMAPHORES		(-1)		/* [SEM] */
-#define	_POSIX_SHARED_MEMORY_OBJECTS	(-1)		/* [SHM] */
-#define	_POSIX_SHELL			200112L
-#define	_POSIX_SPAWN			(-1)		/* [SPN] */
-#define	_POSIX_SPIN_LOCKS		(-1)		/* [SPI] */
-#define	_POSIX_SPORADIC_SERVER		(-1)		/* [SS] */
-#define	_POSIX_SYNCHRONIZED_IO		(-1)		/* [SIO] */
-#define	_POSIX_THREAD_ATTR_STACKADDR	200112L		/* [TSA] */
-#define	_POSIX_THREAD_ATTR_STACKSIZE	200112L		/* [TSS] */
-#define	_POSIX_THREAD_CPUTIME		(-1)		/* [TCT] */
-#define	_POSIX_THREAD_PRIO_INHERIT	(-1)		/* [TPI] */
-#define	_POSIX_THREAD_PRIO_PROTECT	(-1)		/* [TPP] */
-#define	_POSIX_THREAD_PRIORITY_SCHEDULING	(-1)	/* [TPS] */
-#define	_POSIX_THREAD_PROCESS_SHARED	200112L		/* [TSH] */
-#define	_POSIX_THREAD_SAFE_FUNCTIONS	200112L		/* [TSF] */
-#define	_POSIX_THREAD_SPORADIC_SERVER	(-1)		/* [TSP] */
-#define	_POSIX_THREADS			200112L		/* [THR] */
-#define	_POSIX_TIMEOUTS			(-1)		/* [TMO] */
-#define	_POSIX_TIMERS			(-1)		/* [TMR] */
-#define	_POSIX_TRACE			(-1)		/* [TRC] */
-#define	_POSIX_TRACE_EVENT_FILTER	(-1)		/* [TEF] */
-#define	_POSIX_TRACE_INHERIT		(-1)		/* [TRI] */
-#define	_POSIX_TRACE_LOG		(-1)		/* [TRL] */
-#define	_POSIX_TYPED_MEMORY_OBJECTS	(-1)		/* [TYM] */
-#ifndef _POSIX_VDISABLE
-#define	_POSIX_VDISABLE			0xff		/* same as sys/termios.h */
-#endif /* _POSIX_VDISABLE */
-
-#define	_POSIX2_C_BIND			200112L
-#define	_POSIX2_C_DEV			200112L		/* c99 command */
-#define	_POSIX2_CHAR_TERM		200112L
-#define	_POSIX2_FORT_DEV		(-1)		/* fort77 command */
-#define	_POSIX2_FORT_RUN		200112L
-#define	_POSIX2_LOCALEDEF		200112L		/* localedef command */
-#define	_POSIX2_PBS			(-1)
-#define	_POSIX2_PBS_ACCOUNTING		(-1)
-#define	_POSIX2_PBS_CHECKPOINT		(-1)
-#define	_POSIX2_PBS_LOCATE		(-1)
-#define	_POSIX2_PBS_MESSAGE		(-1)
-#define	_POSIX2_PBS_TRACK		(-1)
-#define	_POSIX2_SW_DEV			200112L
-#define	_POSIX2_UPE			200112L	/* XXXX no fc, newgrp, tabs */
-
-#define	_V6_ILP32_OFF32			(-1)
-#define	_V6_ILP32_OFFBIG		(1)
-#define	_V6_LP64_OFF64			(-1)
-#define	_V6_LPBIG_OFFBIG		(-1)
-
-#define	_XBS5_ILP32_OFF32		_V6_ILP32_OFF32		/* legacy */
-#define	_XBS5_ILP32_OFFBIG		_V6_ILP32_OFFBIG	/* legacy */
-#define	_XBS5_LP64_OFF64		_V6_LP64_OFF64		/* legacy */
-#define	_XBS5_LPBIG_OFFBIG		_V6_LPBIG_OFFBIG	/* legacy */
-
-#define	_XOPEN_CRYPT			(1)
-#define	_XOPEN_ENH_I18N			(1)		/* XXX required */
-#define	_XOPEN_LEGACY			(-1)	/* no ftime gcvt, wcswcs */
-#define	_XOPEN_REALTIME			(-1)	/* no q'ed signals, mq_* */
-#define	_XOPEN_REALTIME_THREADS		(-1)	/* no posix_spawn, et. al. */
-#define	_XOPEN_SHM			(1)
-#define	_XOPEN_STREAMS			(-1)
-#define	_XOPEN_UNIX			(1)
-
-
-#define	F_ULOCK         0      /* unlock locked section */
-#define	F_LOCK          1      /* lock a section for exclusive use */
-#define	F_TLOCK         2      /* test and lock a section for exclusive use */
-#define	F_TEST          3      /* test a section for locks by other procs */
-
-/* configurable system variables */
-#define	_SC_ARG_MAX			 1
-#define	_SC_CHILD_MAX			 2
-#define	_SC_CLK_TCK			 3
-#define	_SC_NGROUPS_MAX			 4
-#define	_SC_OPEN_MAX			 5
-#define	_SC_JOB_CONTROL			 6
-#define	_SC_SAVED_IDS			 7
-#define	_SC_VERSION			 8
-#define	_SC_BC_BASE_MAX			 9
-#define	_SC_BC_DIM_MAX			10
-#define	_SC_BC_SCALE_MAX		11
-#define	_SC_BC_STRING_MAX		12
-#define	_SC_COLL_WEIGHTS_MAX		13
-#define	_SC_EXPR_NEST_MAX		14
-#define	_SC_LINE_MAX			15
-#define	_SC_RE_DUP_MAX			16
-#define	_SC_2_VERSION			17
-#define	_SC_2_C_BIND			18
-#define	_SC_2_C_DEV			19
-#define	_SC_2_CHAR_TERM			20
-#define	_SC_2_FORT_DEV			21
-#define	_SC_2_FORT_RUN			22
-#define	_SC_2_LOCALEDEF			23
-#define	_SC_2_SW_DEV			24
-#define	_SC_2_UPE			25
-#define	_SC_STREAM_MAX			26
-#define	_SC_TZNAME_MAX			27
-#define	_SC_ASYNCHRONOUS_IO		28
-#define	_SC_PAGESIZE			29
-#define	_SC_MEMLOCK			30
-#define	_SC_MEMLOCK_RANGE		31
-#define	_SC_MEMORY_PROTECTION		32
-#define	_SC_MESSAGE_PASSING		33
-#define	_SC_PRIORITIZED_IO		34
-#define	_SC_PRIORITY_SCHEDULING		35
-#define	_SC_REALTIME_SIGNALS		36
-#define	_SC_SEMAPHORES			37
-#define	_SC_FSYNC			38
-#define	_SC_SHARED_MEMORY_OBJECTS 	39
-#define	_SC_SYNCHRONIZED_IO		40
-#define	_SC_TIMERS			41
-#define	_SC_AIO_LISTIO_MAX		42
-#define	_SC_AIO_MAX			43
-#define	_SC_AIO_PRIO_DELTA_MAX		44
-#define	_SC_DELAYTIMER_MAX		45
-#define	_SC_MQ_OPEN_MAX			46
-#define	_SC_MAPPED_FILES		47	/* swap _SC_PAGESIZE vs. BSD */
-#define	_SC_RTSIG_MAX			48
-#define	_SC_SEM_NSEMS_MAX		49
-#define	_SC_SEM_VALUE_MAX		50
-#define	_SC_SIGQUEUE_MAX		51
-#define	_SC_TIMER_MAX			52
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#define	_SC_NPROCESSORS_CONF		57
-#define	_SC_NPROCESSORS_ONLN		58
-#endif /* !_POSIX_C_SOURCE || _DARWIN_C_SOURCE */
-#define	_SC_2_PBS			59
-#define	_SC_2_PBS_ACCOUNTING		60
-#define	_SC_2_PBS_CHECKPOINT		61
-#define	_SC_2_PBS_LOCATE		62
-#define	_SC_2_PBS_MESSAGE		63
-#define	_SC_2_PBS_TRACK			64
-#define	_SC_ADVISORY_INFO		65
-#define	_SC_BARRIERS			66
-#define	_SC_CLOCK_SELECTION		67
-#define	_SC_CPUTIME			68
-#define	_SC_FILE_LOCKING		69
-#define	_SC_GETGR_R_SIZE_MAX		70
-#define	_SC_GETPW_R_SIZE_MAX		71
-#define	_SC_HOST_NAME_MAX		72
-#define	_SC_LOGIN_NAME_MAX		73
-#define	_SC_MONOTONIC_CLOCK		74
-#define	_SC_MQ_PRIO_MAX			75
-#define	_SC_READER_WRITER_LOCKS		76
-#define	_SC_REGEXP			77
-#define	_SC_SHELL			78
-#define	_SC_SPAWN			79
-#define	_SC_SPIN_LOCKS			80
-#define	_SC_SPORADIC_SERVER		81
-#define	_SC_THREAD_ATTR_STACKADDR	82
-#define	_SC_THREAD_ATTR_STACKSIZE	83
-#define	_SC_THREAD_CPUTIME		84
-#define	_SC_THREAD_DESTRUCTOR_ITERATIONS 85
-#define	_SC_THREAD_KEYS_MAX		86
-#define	_SC_THREAD_PRIO_INHERIT		87
-#define	_SC_THREAD_PRIO_PROTECT		88
-#define	_SC_THREAD_PRIORITY_SCHEDULING	89
-#define	_SC_THREAD_PROCESS_SHARED	90
-#define	_SC_THREAD_SAFE_FUNCTIONS	91
-#define	_SC_THREAD_SPORADIC_SERVER	92
-#define	_SC_THREAD_STACK_MIN		93
-#define	_SC_THREAD_THREADS_MAX		94
-#define	_SC_TIMEOUTS			95
-#define	_SC_THREADS			96
-#define	_SC_TRACE			97
-#define	_SC_TRACE_EVENT_FILTER		98
-#define	_SC_TRACE_INHERIT		99
-#define	_SC_TRACE_LOG			100
-#define	_SC_TTY_NAME_MAX		101
-#define	_SC_TYPED_MEMORY_OBJECTS	102
-#define	_SC_V6_ILP32_OFF32		103
-#define	_SC_V6_ILP32_OFFBIG		104
-#define	_SC_V6_LP64_OFF64		105
-#define	_SC_V6_LPBIG_OFFBIG		106
-#define	_SC_IPV6			118
-#define	_SC_RAW_SOCKETS			119
-#define	_SC_SYMLOOP_MAX			120
-#define	_SC_ATEXIT_MAX			107
-#define	_SC_IOV_MAX			56
-#define	_SC_PAGE_SIZE			_SC_PAGESIZE
-#define	_SC_XOPEN_CRYPT			108
-#define	_SC_XOPEN_ENH_I18N		109
-#define	_SC_XOPEN_LEGACY		110
-#define	_SC_XOPEN_REALTIME		111
-#define	_SC_XOPEN_REALTIME_THREADS	112
-#define	_SC_XOPEN_SHM			113
-#define	_SC_XOPEN_STREAMS		114
-#define	_SC_XOPEN_UNIX			115
-#define	_SC_XOPEN_VERSION		116
-#define	_SC_XOPEN_XCU_VERSION		121
-#define	_SC_XBS5_ILP32_OFF32		122
-#define	_SC_XBS5_ILP32_OFFBIG		123
-#define	_SC_XBS5_LP64_OFF64		124
-#define	_SC_XBS5_LPBIG_OFFBIG		125
-#define	_SC_SS_REPL_MAX			126
-#define	_SC_TRACE_EVENT_NAME_MAX	127
-#define	_SC_TRACE_NAME_MAX		128
-#define	_SC_TRACE_SYS_MAX		129
-#define	_SC_TRACE_USER_EVENT_MAX	130
-#define	_SC_PASS_MAX			131
-
-#ifndef _CS_PATH	/* XXX temporary #ifdef'ed for <sys/unistd.h> */
-#define	_CS_PATH				1
-#endif
-#define	_CS_POSIX_V6_ILP32_OFF32_CFLAGS		2
-#define	_CS_POSIX_V6_ILP32_OFF32_LDFLAGS	3
-#define	_CS_POSIX_V6_ILP32_OFF32_LIBS		4
-#define	_CS_POSIX_V6_ILP32_OFFBIG_CFLAGS	5
-#define	_CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS	6
-#define	_CS_POSIX_V6_ILP32_OFFBIG_LIBS		7
-#define	_CS_POSIX_V6_LP64_OFF64_CFLAGS		8
-#define	_CS_POSIX_V6_LP64_OFF64_LDFLAGS		9
-#define	_CS_POSIX_V6_LP64_OFF64_LIBS		10
-#define	_CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS	11
-#define	_CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS	12
-#define	_CS_POSIX_V6_LPBIG_OFFBIG_LIBS		13
-#define	_CS_POSIX_V6_WIDTH_RESTRICTED_ENVS	14
-
-/* reserved for compatibility with Issue 5 */
-#define	_CS_XBS5_ILP32_OFF32_CFLAGS		20
-#define	_CS_XBS5_ILP32_OFF32_LDFLAGS		21
-#define	_CS_XBS5_ILP32_OFF32_LIBS		22
-#define	_CS_XBS5_ILP32_OFF32_LINTFLAGS		23
-#define	_CS_XBS5_ILP32_OFFBIG_CFLAGS		24
-#define	_CS_XBS5_ILP32_OFFBIG_LDFLAGS		25
-#define	_CS_XBS5_ILP32_OFFBIG_LIBS		26
-#define	_CS_XBS5_ILP32_OFFBIG_LINTFLAGS		27
-#define	_CS_XBS5_LP64_OFF64_CFLAGS		28
-#define	_CS_XBS5_LP64_OFF64_LDFLAGS		29
-#define	_CS_XBS5_LP64_OFF64_LIBS		30
-#define	_CS_XBS5_LP64_OFF64_LINTFLAGS		31
-#define	_CS_XBS5_LPBIG_OFFBIG_CFLAGS		32
-#define	_CS_XBS5_LPBIG_OFFBIG_LDFLAGS		33
-#define	_CS_XBS5_LPBIG_OFFBIG_LIBS		34
-#define	_CS_XBS5_LPBIG_OFFBIG_LINTFLAGS		35
-
-#define	_CS_DARWIN_USER_DIR			65536
-#define	_CS_DARWIN_USER_TEMP_DIR		65537
-#define	_CS_DARWIN_USER_CACHE_DIR		65538
-
-__BEGIN_DECLS
-
-void	 _exit(int) __dead2;
-int	 access(const char *, int);
-unsigned int
-	 alarm(unsigned int);
-int	 chdir(const char *);
-int	 chown(const char *, uid_t, gid_t);
-int	 close(int) __DARWIN_ALIAS_C(close);
-size_t	 confstr(int, char *, size_t) __DARWIN_ALIAS(confstr);
-char	*crypt(const char *, const char *);
-char	*ctermid(char *);
-int	 dup(int);
-int	 dup2(int, int);
-#if __DARWIN_UNIX03
-void	 encrypt(char *, int) __DARWIN_ALIAS(encrypt);
-#else /* !__DARWIN_UNIX03 */
-int	 encrypt(char *, int);
-#endif /* __DARWIN_UNIX03 */
-int	 execl(const char *, const char *, ...);
-int	 execle(const char *, const char *, ...);
-int	 execlp(const char *, const char *, ...);
-int	 execv(const char *, char * const *);
-int	 execve(const char *, char * const *, char * const *);
-int	 execvp(const char *, char * const *);
-int	 fchown(int, uid_t, gid_t);
-int	 fchdir(int);
-pid_t	 fork(void);
-long	 fpathconf(int, int);
-int	 fsync(int) __DARWIN_ALIAS_C(fsync);
-int	 ftruncate(int, off_t);
-char	*getcwd(char *, size_t);
-gid_t	 getegid(void);
-uid_t	 geteuid(void);
-gid_t	 getgid(void);
-#if defined(_DARWIN_UNLIMITED_GETGROUPS) || defined(_DARWIN_C_SOURCE)
-int	 getgroups(int, gid_t []) __DARWIN_EXTSN(getgroups);
-#else /* !_DARWIN_UNLIMITED_GETGROUPS && !_DARWIN_C_SOURCE */
-int	 getgroups(int, gid_t []);
-#endif /* _DARWIN_UNLIMITED_GETGROUPS || _DARWIN_C_SOURCE */
-long	 gethostid(void);
-int	 gethostname(char *, size_t);
-char	*getlogin(void);
-int	 getlogin_r(char *, size_t);
-int	 getopt(int, char * const [], const char *) __DARWIN_ALIAS(getopt);
-pid_t	 getpgid(pid_t);
-pid_t	 getpgrp(void);
-pid_t	 getpid(void);
-pid_t	 getppid(void);
-pid_t	 getsid(pid_t);
-uid_t	 getuid(void);
-char	*getwd(char *);			/* obsoleted by getcwd() */
-int	 isatty(int);
-int	 lchown(const char *, uid_t, gid_t) __DARWIN_ALIAS(lchown);
-int	 link(const char *, const char *);
-int	 lockf(int, int, off_t) __DARWIN_ALIAS_C(lockf);
-off_t	 lseek(int, off_t, int);
-int	 nice(int) __DARWIN_ALIAS(nice);
-long	 pathconf(const char *, int);
-int	 pause(void) __DARWIN_ALIAS_C(pause);
-int	 pipe(int [2]);
-ssize_t	 pread(int, void *, size_t, off_t) __DARWIN_ALIAS_C(pread);
-ssize_t	 pwrite(int, const void *, size_t, off_t) __DARWIN_ALIAS_C(pwrite);
-ssize_t	 read(int, void *, size_t) __DARWIN_ALIAS_C(read);
-ssize_t  readlink(const char * __restrict, char * __restrict, size_t);
-int	 rmdir(const char *);
-int	 setegid(gid_t);
-int	 seteuid(uid_t);
-int	 setgid(gid_t);
-int	 setpgid(pid_t, pid_t);
-#if __DARWIN_UNIX03
-pid_t	 setpgrp(void) __DARWIN_ALIAS(setpgrp);
-#else /* !__DARWIN_UNIX03 */
-int	 setpgrp(pid_t pid, pid_t pgrp);	/* obsoleted by setpgid() */
-#endif /* __DARWIN_UNIX03 */
-int	 setregid(gid_t, gid_t) __DARWIN_ALIAS(setregid);
-int	 setreuid(uid_t, uid_t) __DARWIN_ALIAS(setreuid);
-pid_t	 setsid(void);
-int	 setuid(uid_t);
-unsigned int
-	 sleep(unsigned int) __DARWIN_ALIAS_C(sleep);
-void     swab(const void * __restrict, void * __restrict, ssize_t);
-int	 symlink(const char *, const char *);
-void	 sync(void);
-long	 sysconf(int);
-pid_t	 tcgetpgrp(int);
-int	 tcsetpgrp(int, pid_t);
-int	 truncate(const char *, off_t);
-char	*ttyname(int);
-#if __DARWIN_UNIX03
-int	 ttyname_r(int, char *, size_t) __DARWIN_ALIAS(ttyname_r);
-#else /* !__DARWIN_UNIX03 */
-char	*ttyname_r(int, char *, size_t);
-#endif /* __DARWIN_UNIX03 */
-useconds_t
-	 ualarm(useconds_t, useconds_t);
-int	 unlink(const char *);
-int	 usleep(useconds_t) __DARWIN_ALIAS_C(usleep);
-pid_t	 vfork(void);
-ssize_t	 write(int, const void *, size_t) __DARWIN_ALIAS_C(write);
-
-extern char *optarg;			/* getopt(3) external variables */
-extern int optind, opterr, optopt;
-
-#if	!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#include <sys/select.h>
-
-void	 _Exit(int) __dead2;
-int	 accessx_np(const struct accessx_descriptor *, size_t, int *, uid_t);
-int	 acct(const char *);
-int	 add_profil(char *, size_t, unsigned long, unsigned int);
-void	*brk(const void *);
-int	 chroot(const char *);
-void	 endusershell(void);
-int	 execvP(const char *, const char *, char * const *);
-char	*fflagstostr(unsigned long);
-int	 getdtablesize(void);
-int	 getdomainname(char *, int);
-int	 getgrouplist(const char *, int, int *, int *);
-int	 gethostuuid(uuid_t, const struct timespec *);
-mode_t	 getmode(const void *, mode_t);
-int	 getpagesize(void) __pure2;
-char	*getpass(const char *);
-int	 getpeereid(int, uid_t *, gid_t *);
-int	 getpgid(pid_t _pid);
-int	 getsgroups_np(int *, uuid_t);
-int	 getsid(pid_t _pid);
-char	*getusershell(void);
-int	 getwgroups_np(int *, uuid_t);
-int	 initgroups(const char *, int);
-int	 iruserok(unsigned long, int, const char *, const char *);
-int	 iruserok_sa(const void *, int, int, const char *, const char *);
-int	 issetugid(void);
-char	*mkdtemp(char *);
-int	 mknod(const char *, mode_t, dev_t);
-int	 mkstemp(char *);
-int	 mkstemps(char *, int);
-char	*mktemp(char *);
-int	 nfssvc(int, void *);
-int	 profil(char *, size_t, unsigned long, unsigned int);
-int	 pthread_setugid_np(uid_t, gid_t);
-int	 pthread_getugid_np( uid_t *, gid_t *);
-int	 rcmd(char **, int, const char *, const char *, const char *, int *);
-int	 rcmd_af(char **, int, const char *, const char *, const char *, int *,
-		int);
-int	 reboot(int);
-int	 revoke(const char *);
-int	 rresvport(int *);
-int	 rresvport_af(int *, int);
-int	 ruserok(const char *, int, const char *, const char *);
-void	*sbrk(int);
-int	 setdomainname(const char *, int);
-int	 setgroups(int, const gid_t *);
-void	 sethostid(long);
-int	 sethostname(const char *, int);
-#if __DARWIN_UNIX03
-void	 setkey(const char *) __DARWIN_ALIAS(setkey);
-#else /* !__DARWIN_UNIX03 */
-int	 setkey(const char *);
-#endif /* __DARWIN_UNIX03 */
-int	 setlogin(const char *);
-void	*setmode(const char *) __DARWIN_ALIAS(setmode);
-int	 setrgid(gid_t);
-int	 setruid(uid_t);
-int	 setsgroups_np(int, const uuid_t);
-void	 setusershell(void);
-int	 setwgroups_np(int, const uuid_t);
-int	 strtofflags(char **, unsigned long *, unsigned long *);
-int	 swapon(const char *);
-int	 syscall(int, ...);
-int	 ttyslot(void);
-int	 undelete(const char *);
-int	 unwhiteout(const char *);
-void	*valloc(size_t);			
-
-extern char *suboptarg;			/* getsubopt(3) external variable */
-int	 getsubopt(char **, char * const *, char **);
-
-/*  HFS & HFS Plus semantics system calls go here */
-#ifdef __LP64__
-int    fgetattrlist(int,void*,void*,size_t,unsigned int);
-int    fsetattrlist(int,void*,void*,size_t,unsigned int);
-int    getattrlist(const char*,void*,void*,size_t,unsigned int) __DARWIN_ALIAS(getattrlist);
-int    setattrlist(const char*,void*,void*,size_t,unsigned int) __DARWIN_ALIAS(setattrlist);
-int exchangedata(const char*,const char*,unsigned int);
-int    getdirentriesattr(int,void*,void*,size_t,unsigned int*,unsigned int*,unsigned int*,unsigned int);
-
-#else /* __LP64__ */
-int	fgetattrlist(int,void*,void*,size_t,unsigned long);
-int	fsetattrlist(int,void*,void*,size_t,unsigned long);
-int	getattrlist(const char*,void*,void*,size_t,unsigned long) __DARWIN_ALIAS(getattrlist);
-int	setattrlist(const char*,void*,void*,size_t,unsigned long) __DARWIN_ALIAS(setattrlist);
-int exchangedata(const char*,const char*,unsigned long);
-int	getdirentriesattr(int,void*,void*,size_t,unsigned long*,unsigned long*,unsigned long*,unsigned long);
-
-#endif /* __LP64__ */
-
-struct fssearchblock;
-struct searchstate;
-
-int	 searchfs(const char *, struct fssearchblock *, unsigned long *, unsigned int, unsigned int, struct searchstate *);
-int	 fsctl(const char *,unsigned long,void*,unsigned int);
-int	 ffsctl(int,unsigned long,void*,unsigned int);
-
-extern int optreset;
-
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-__END_DECLS
-
-#endif /* !_UNISTD_H_ */
diff --git a/i386/include/unwind.h b/i386/include/unwind.h
deleted file mode 100644
index 24cb87e..0000000
--- a/i386/include/unwind.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/* Exception handling and frame unwind runtime interface routines.
-   Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
-
-   This file is part of GCC.
-
-   GCC 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, or (at your option)
-   any later version.
-
-   GCC 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 GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
-
-/* As a special exception, if you include this header file into source
-   files compiled by GCC, this header file does not by itself cause
-   the resulting executable to be covered by the GNU General Public
-   License.  This exception does not however invalidate any other
-   reasons why the executable file might be covered by the GNU General
-   Public License.  */
-
-/* This is derived from the C++ ABI for IA-64.  Where we diverge
-   for cross-architecture compatibility are noted with "@@@".  */
-
-#ifndef _UNWIND_H
-#define _UNWIND_H
-
-#ifndef HIDE_EXPORTS
-#ifdef __GCC__
-#pragma GCC visibility push(default)
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Level 1: Base ABI  */
-
-/* @@@ The IA-64 ABI uses uint64 throughout.  Most places this is
-   inefficient for 32-bit and smaller machines.  */
-typedef unsigned _Unwind_Word __attribute__((__mode__(__word__)));
-typedef signed _Unwind_Sword __attribute__((__mode__(__word__)));
-#if defined(__ia64__) && defined(__hpux__)
-typedef unsigned _Unwind_Ptr __attribute__((__mode__(__word__)));
-#else
-typedef unsigned _Unwind_Ptr __attribute__((__mode__(__pointer__)));
-#endif
-typedef unsigned _Unwind_Internal_Ptr __attribute__((__mode__(__pointer__)));
-
-/* @@@ The IA-64 ABI uses a 64-bit word to identify the producer and
-   consumer of an exception.  We'll go along with this for now even on
-   32-bit machines.  We'll need to provide some other option for
-   16-bit machines and for machines with > 8 bits per byte.  */
-typedef unsigned _Unwind_Exception_Class __attribute__((__mode__(__DI__)));
-
-/* The unwind interface uses reason codes in several contexts to
-   identify the reasons for failures or other actions.  */
-typedef enum
-{
-  _URC_NO_REASON = 0,
-  _URC_FOREIGN_EXCEPTION_CAUGHT = 1,
-  _URC_FATAL_PHASE2_ERROR = 2,
-  _URC_FATAL_PHASE1_ERROR = 3,
-  _URC_NORMAL_STOP = 4,
-  _URC_END_OF_STACK = 5,
-  _URC_HANDLER_FOUND = 6,
-  _URC_INSTALL_CONTEXT = 7,
-  _URC_CONTINUE_UNWIND = 8
-} _Unwind_Reason_Code;
-
-
-/* The unwind interface uses a pointer to an exception header object
-   as its representation of an exception being thrown. In general, the
-   full representation of an exception object is language- and
-   implementation-specific, but it will be prefixed by a header
-   understood by the unwind interface.  */
-
-struct _Unwind_Exception;
-
-typedef void (*_Unwind_Exception_Cleanup_Fn) (_Unwind_Reason_Code,
-					      struct _Unwind_Exception *);
-
-struct _Unwind_Exception
-{
-  _Unwind_Exception_Class exception_class;
-  _Unwind_Exception_Cleanup_Fn exception_cleanup;
-  _Unwind_Word private_1;
-  _Unwind_Word private_2;
-
-  /* @@@ The IA-64 ABI says that this structure must be double-word aligned.
-     Taking that literally does not make much sense generically.  Instead we
-     provide the maximum alignment required by any type for the machine.  */
-} __attribute__((__aligned__));
-
-
-/* The ACTIONS argument to the personality routine is a bitwise OR of one
-   or more of the following constants.  */
-typedef int _Unwind_Action;
-
-#define _UA_SEARCH_PHASE	1
-#define _UA_CLEANUP_PHASE	2
-#define _UA_HANDLER_FRAME	4
-#define _UA_FORCE_UNWIND	8
-#define _UA_END_OF_STACK	16
-
-/* This is an opaque type used to refer to a system-specific data
-   structure used by the system unwinder. This context is created and
-   destroyed by the system, and passed to the personality routine
-   during unwinding.  */
-struct _Unwind_Context;
-
-/* Raise an exception, passing along the given exception object.  */
-extern _Unwind_Reason_Code _Unwind_RaiseException (struct _Unwind_Exception *);
-
-/* Raise an exception for forced unwinding.  */
-
-typedef _Unwind_Reason_Code (*_Unwind_Stop_Fn)
-     (int, _Unwind_Action, _Unwind_Exception_Class,
-      struct _Unwind_Exception *, struct _Unwind_Context *, void *);
-
-extern _Unwind_Reason_Code _Unwind_ForcedUnwind (struct _Unwind_Exception *,
-						 _Unwind_Stop_Fn,
-						 void *);
-
-/* Helper to invoke the exception_cleanup routine.  */
-extern void _Unwind_DeleteException (struct _Unwind_Exception *);
-
-/* Resume propagation of an existing exception.  This is used after
-   e.g. executing cleanup code, and not to implement rethrowing.  */
-extern void _Unwind_Resume (struct _Unwind_Exception *);
-
-/* @@@ Resume propagation of an FORCE_UNWIND exception, or to rethrow
-   a normal exception that was handled.  */
-extern _Unwind_Reason_Code _Unwind_Resume_or_Rethrow (struct _Unwind_Exception *);
-
-/* @@@ Use unwind data to perform a stack backtrace.  The trace callback
-   is called for every stack frame in the call chain, but no cleanup
-   actions are performed.  */
-typedef _Unwind_Reason_Code (*_Unwind_Trace_Fn)
-     (struct _Unwind_Context *, void *);
-
-extern _Unwind_Reason_Code _Unwind_Backtrace (_Unwind_Trace_Fn, void *);
-
-/* These functions are used for communicating information about the unwind
-   context (i.e. the unwind descriptors and the user register state) between
-   the unwind library and the personality routine and landing pad.  Only
-   selected registers maybe manipulated.  */
-
-extern _Unwind_Word _Unwind_GetGR (struct _Unwind_Context *, int);
-extern void _Unwind_SetGR (struct _Unwind_Context *, int, _Unwind_Word);
-
-extern _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *);
-extern _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *);
-extern void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr);
-
-/* @@@ Retrieve the CFA of the given context.  */
-extern _Unwind_Word _Unwind_GetCFA (struct _Unwind_Context *);
-
-extern void *_Unwind_GetLanguageSpecificData (struct _Unwind_Context *);
-
-extern _Unwind_Ptr _Unwind_GetRegionStart (struct _Unwind_Context *);
-
-
-/* The personality routine is the function in the C++ (or other language)
-   runtime library which serves as an interface between the system unwind
-   library and language-specific exception handling semantics.  It is
-   specific to the code fragment described by an unwind info block, and
-   it is always referenced via the pointer in the unwind info block, and
-   hence it has no ABI-specified name.
-
-   Note that this implies that two different C++ implementations can
-   use different names, and have different contents in the language
-   specific data area.  Moreover, that the language specific data
-   area contains no version info because name of the function invoked
-   provides more effective versioning by detecting at link time the
-   lack of code to handle the different data format.  */
-
-typedef _Unwind_Reason_Code (*_Unwind_Personality_Fn)
-     (int, _Unwind_Action, _Unwind_Exception_Class,
-      struct _Unwind_Exception *, struct _Unwind_Context *);
-
-/* @@@ The following alternate entry points are for setjmp/longjmp
-   based unwinding.  */
-
-struct SjLj_Function_Context;
-extern void _Unwind_SjLj_Register (struct SjLj_Function_Context *);
-extern void _Unwind_SjLj_Unregister (struct SjLj_Function_Context *);
-
-extern _Unwind_Reason_Code _Unwind_SjLj_RaiseException
-     (struct _Unwind_Exception *);
-extern _Unwind_Reason_Code _Unwind_SjLj_ForcedUnwind
-     (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *);
-extern void _Unwind_SjLj_Resume (struct _Unwind_Exception *);
-extern _Unwind_Reason_Code _Unwind_SjLj_Resume_or_Rethrow (struct _Unwind_Exception *);
-
-/* @@@ The following provide access to the base addresses for text
-   and data-relative addressing in the LDSA.  In order to stay link
-   compatible with the standard ABI for IA-64, we inline these.  */
-
-#ifdef __ia64__
-#include <stdlib.h>
-
-static inline _Unwind_Ptr
-_Unwind_GetDataRelBase (struct _Unwind_Context *_C)
-{
-  /* The GP is stored in R1.  */
-  return _Unwind_GetGR (_C, 1);
-}
-
-static inline _Unwind_Ptr
-_Unwind_GetTextRelBase (struct _Unwind_Context *_C __attribute__ ((__unused__)))
-{
-  abort ();
-  return 0;
-}
-
-/* @@@ Retrieve the Backing Store Pointer of the given context.  */
-extern _Unwind_Word _Unwind_GetBSP (struct _Unwind_Context *);
-#else
-extern _Unwind_Ptr _Unwind_GetDataRelBase (struct _Unwind_Context *);
-extern _Unwind_Ptr _Unwind_GetTextRelBase (struct _Unwind_Context *);
-#endif
-
-/* @@@ Given an address, return the entry point of the function that
-   contains it.  */
-extern void * _Unwind_FindEnclosingFunction (void *pc);
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifndef HIDE_EXPORTS
-#ifdef __GCC__
-#pragma GCC visibility pop
-#endif
-#endif
-
-#endif /* unwind.h */
diff --git a/i386/util/segaddr b/i386/util/segaddr
new file mode 100755
index 0000000..e436bcc
--- /dev/null
+++ b/i386/util/segaddr
@@ -0,0 +1,56 @@
+#
+# Name   : RevoBoot/i386/util/segaddr
+# Type   : Command line tool (script to replace segsize.c)
+# Author : PikerAlpha@yahoo.com (Copyright (c) 2012)
+# Version: 1.0
+# Release: Initial release on Monday 12 November 2012
+#
+# Updates:
+#
+
+# The following value is decimal for 0x20200 Used to simplify 
+# stripping unwanted data from the output of size -m boot.sys
+BOOT2ADDR=131584
+
+# Run for segment address of __INIT (start of /boot file)
+if [[ $1 =~ "__INIT" ]];
+  then
+    # Decimal values in, Hexadecimal value out
+    echo ibase=10\; obase=16\; $BOOT2ADDR | bc
+  # Check if boot.sys exists
+  else if [ -f ../../sym/i386/boot.sys ];
+    then
+      # Example output of: 'size boot.sys'
+      #
+      #__TEXT __DATA  __OBJC  others  dec     hex
+      #49376  4544    0       640     54560   d520
+
+      # Start by stripping all unwanted stuff (creates a list):
+      SIZE_INFO=`size ../../sym/i386/boot.sys | tr -cs "[:digit:]" " "`
+
+      # Giving us:
+      # 49376 4544 0 640 54560 520
+      #                        ^
+      #                        |
+      # Yes, the missing 'd' here is expected behaviour
+
+      # Now we assign values (49376, 4544 and 640) to our locals
+      TEXT=`echo $SIZE_INFO | awk '{ print $1 }'`
+      INIT=`echo $SIZE_INFO | awk '{ print $4 }'`
+
+      # Run for segment address of __TEXT (right after __INIT segment in /boot file)
+      if [[ $1 =~ "__TEXT" ]];
+        then
+          # Returns 20480 (131584/0x20200 + 640/0x280)
+          # Decimal values in, Hexadecimal value out
+          echo ibase=10\; obase=16\; $BOOT2ADDR + $INIT | bc
+        else 
+          # Run for segment address of __DATA (right after __TEXT segment in /boot file)
+          # Returns 2C560 (131584/0x20200 + 4544/0x11C0 + 640/0x280)
+          # Decimal values in, Hexadecimal value out
+          echo ibase=10\; obase=16\; $BOOT2ADDR + $INIT + $TEXT | bc
+      fi
+    else
+      echo "Error: boot.sys not found!\n"
+    fi
+fi
\ No newline at end of file
diff --git a/i386/util/segsize.c b/i386/util/segsize.c
deleted file mode 100644
index 2608bfd..0000000
--- a/i386/util/segsize.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Portions Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights
- * Reserved.  This file contains Original Code and/or Modifications of
- * Original Code as defined in and that are subject to the Apple Public
- * Source License Version 2.0 (the "License").  You may not use this file
- * except in compliance with the License.  Please obtain a copy of the
- * License at http://www.apple.com/publicsource and read it before using
- * this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- *
- * Updates:
- *			- Reformated and cleanups (PikerAlpha, November 2012)
-  *			- Single pass runs for all target segment names (PikerAlpha, November 2012)
- *
- *
- * Note:	RevoBoot/i386/boot2/Makefile calls this tool to calculate segment sizes, example:
- *			-segaddr __INIT 20200 -segaddr __TEXT 20480 -segaddr __DATA 2C6E0
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <mach/mach.h>
-#include <mach/mach_error.h>
-#include <sys/file.h>
-#include <mach-o/loader.h>
-#include <libkern/OSByteOrder.h>
-#include <unistd.h>
-
-int infile;
-
-struct mach_header	mh;
-
-void * cmds;
-
-static bool	swap_ends;
-
-//==========================================================================
-
-static unsigned long swap(unsigned long x)
-{
-	if (swap_ends)
-	{
-		return OSSwapInt32(x);
-	}
-	else
-	{
-		return x;
-	}
-}
-
-//==========================================================================
-
-int main(int argc, char *argv[])
-{
-	int nc, ncmds;
-	char *cp;
-	long boot2Address = 0x20200L;
-
-	if (argc != 2)
-	{
-		fprintf(stderr, "Usage: ./segsize [__INIT/__TEXT/__DATA]\n");
-		exit(1);
-	}
-	else if (strcmp(argv[1], "__INIT") == 0)
-	{
-		printf("%lX\n", boot2Address);
-		exit(0);
-	}
-
-	infile = open("../../sym/i386/boot.sys", O_RDONLY);
-
-	if (infile < 0)
-	{
-		fprintf(stderr, "Error: boot.sys Not Found\n");
-		exit(1);
-	}
-
-	nc = read(infile, &mh, sizeof (mh));
-
-	if (nc < 0)
-	{
-		perror("read mach header");
-		exit(1);
-	}
-
-	if (nc < (int)sizeof (mh))
-	{
-		fprintf(stderr, "read mach header: premature EOF %d\n", nc);
-		exit(1);
-	}
-
-	if (mh.magic == MH_MAGIC)
-	{
-		swap_ends = false;
-	}
-	else if (mh.magic == MH_CIGAM)
-	{
-		swap_ends = true;
-	}
-	else
-	{
-		fprintf(stderr, "bad magic number %lx\n", (unsigned long)mh.magic);
-		exit(1);
-	}
-	
-	cmds = calloc(swap(mh.sizeofcmds), sizeof (char));
-
-	if (cmds == 0)
-	{
-		fprintf(stderr, "alloc load commands: no memory\n");
-		exit(1);
-	}
-
-	nc = read(infile, cmds, swap(mh.sizeofcmds));
-
-	if (nc < 0)
-	{
-		perror("read load commands");
-		exit(1);
-	}
-
-	if (nc < (int)swap(mh.sizeofcmds))
-	{
-		fprintf(stderr, "read load commands: premature EOF %d\n", nc);
-		exit(1);
-	}
-
-	long text = 0L;
-
-	#define lcp	((struct load_command *)cp)
-	#define scp	((struct segment_command *)cp)
-
-	for (ncmds = swap(mh.ncmds), cp = cmds; ncmds > 0; ncmds--)
-	{
-		switch(swap(lcp->cmd))
-		{
-			case LC_SEGMENT:
-				if (strcmp(scp->segname, "__TEXT") == 0)
-				{
-					text = swap(scp->vmsize);
-				}
-				else if (strcmp(scp->segname, "__INIT") == 0)
-				{
-					if (strcmp(argv[1], "__TEXT") == 0)
-					{
-						printf("%lX\n", boot2Address + swap(scp->vmsize));
-					}
-					else // __DATA
-					{
-						printf("%lX\n", boot2Address + swap(scp->vmsize) + text);
-					}
-				}
-
-				break;
-		}
-
-		cp += swap(lcp->cmdsize);
-	}
-	
-	exit(0);
-}

From af6c27908557d53c8426d4b6d613edd32d728891 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:28:33 +0100
Subject: [PATCH 172/623] Getting ready for NVRAM->efi-boot-device-data reading

---
 i386/libsaio/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index 8f8b991..a89f67f 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -10,7 +10,7 @@
 #			- Output added for rm/ar/ranlib actions (PikerAlpha, November 2012).
 #			- Enabled clang compilation (dgsga, PikerAlpha, November 2012. Credits to Evan Lojewski for original work).
 #			- Output change and now using libtool instead of ar/ranlib (PikerAlpha, November 2012).
-#
+#			- SAIO_OBJS changed / base64.o added (PikerAlpha, November 2012).
 
 include ../MakePaths.dir
 
@@ -38,10 +38,10 @@ INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR)
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-SAIO_OBJS = table.o asm.o bios.o biosfn.o disk.o sys.o cache.o bootstruct.o \
-			stringTable.o load.o pci.o allocate.o vbe.o hfs.o hfs_compare.o \
-			xml.o md5c.o device_tree.o cpu.o platform.o acpi.o smbios.o \
-			efi.o console.o
+SAIO_OBJS =	table.o asm.o bios.o biosfn.o disk.o sys.o cache.o bootstruct.o \
+		base64.o stringTable.o load.o pci.o allocate.o vbe.o hfs.o \
+		hfs_compare.o xml.o md5c.o device_tree.o cpu.o platform.o \
+		acpi.o smbios.o efi.o console.o 
 
 LIBS = libsaio.a
 

From 8d8128d8492ae57df4e5f87af71ffb6ab0080d35 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:32:10 +0100
Subject: [PATCH 173/623] Function getGUIDFromDevicePath() added

---
 i386/libsa/efi_tables.c | 109 +++++++++++++++++++++++++++++-----------
 1 file changed, 80 insertions(+), 29 deletions(-)

diff --git a/i386/libsa/efi_tables.c b/i386/libsa/efi_tables.c
index b6d5113..fc7b132 100755
--- a/i386/libsa/efi_tables.c
+++ b/i386/libsa/efi_tables.c
@@ -51,7 +51,8 @@
  * CRC32 code derived from work by Gary S. Brown.
  */
 
-static uint32_t crc32_tab[] = {
+static uint32_t crc32_tab[] =
+{
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
 	0xe963a535, 0x9e6495a3,	0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
 	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
@@ -97,6 +98,9 @@ static uint32_t crc32_tab[] = {
 	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
 };
 
+
+//==========================================================================
+
 uint32_t crc32(uint32_t crc, const void *buf, size_t size)
 {
 	const uint8_t *p;
@@ -105,7 +109,9 @@ uint32_t crc32(uint32_t crc, const void *buf, size_t size)
 	crc = crc ^ ~0U;
 
 	while (size--)
+	{
 		crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
+	}
 
 	return crc ^ ~0U;
 }
@@ -113,7 +119,10 @@ uint32_t crc32(uint32_t crc, const void *buf, size_t size)
 
 /*==========================================================================
  * Utility function to make a device tree string from an EFI_GUID
- */
+ *
+ * FIXME: Everything below this line should be moved to: guid.c
+ *
+ *========================================================================*/
 
 void efi_guid_unparse_upper(EFI_GUID const *pGuid, char *out)
 {
@@ -127,40 +136,82 @@ void efi_guid_unparse_upper(EFI_GUID const *pGuid, char *out)
         pGuid->Data4[6], pGuid->Data4[7]);
 }
 
+
+//==========================================================================
+ 
 bool efi_guid_is_null(EFI_GUID const *pGuid)
 {
-    if (pGuid->Data1 == 0 && pGuid->Data2 == 0 && pGuid->Data3 == 0)
-    {
-        int i;
-
-        for (i = 0; i < 8; ++i)
-        {
-            if (pGuid->Data4[i] != 0)
-                return false;
-        }
-        return true;
-    }
-
-    return false;
+	if (pGuid->Data1 == 0 && pGuid->Data2 == 0 && pGuid->Data3 == 0)
+	{
+		int i;
+
+		for (i = 0; i < 8; ++i)
+		{
+			if (pGuid->Data4[i] != 0)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	return false;
 }
 
 #define COMPARE_MEMBER_AND_RETURN_IF_NE(a,b,mem) \
-    if( ((a)->mem) < ((b)->mem) ) \
-        return -1; \
-    else if( ((a)->mem) > ((b)->mem) ) \
-        return 1;
+	if( ((a)->mem) < ((b)->mem) ) \
+		return -1; \
+	else if( ((a)->mem) > ((b)->mem) ) \
+		return 1;
+
+//=========================================================================
 
 int efi_guid_compare(EFI_GUID const *pG1, EFI_GUID const *pG2)
 {
-    COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data1);
-    COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data2);
-    COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data3);
-    int i;
-
-    for(i = 0; i < 8; ++i)
-    {
-        COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data4[i]);
-    }
-    return 0;
+	COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data1);
+	COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data2);
+	COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data3);
+
+	int i;
+
+	for(i = 0; i < 8; ++i)
+	{
+		COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data4[i]);
+	}
+
+	return 0;
 }
 
+
+//=========================================================================
+
+char *getGUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
+{
+	if (devicePath != NULL)
+	{
+		while (!IsDevicePathEndType(devicePath) &&
+			   !(DevicePathType(devicePath) == MEDIA_DEVICE_PATH && DevicePathSubType(devicePath) == MEDIA_HARDDRIVE_DP))
+		{
+			devicePath = NextDevicePathNode(devicePath);
+		}
+		
+		if (DevicePathType(devicePath) == MEDIA_DEVICE_PATH && DevicePathSubType(devicePath) == MEDIA_HARDDRIVE_DP)
+		{
+			HARDDRIVE_DEVICE_PATH * HDDevicePath = (HARDDRIVE_DEVICE_PATH *) devicePath;
+			
+			if (HDDevicePath->SignatureType == SIGNATURE_TYPE_GUID) // 0x02
+			{
+				EFI_GUID const * uuid = (EFI_GUID*)HDDevicePath->Signature;
+				
+				char * guid = (char *)malloc(37);
+				
+				efi_guid_unparse_upper(uuid, guid);
+
+				return guid;
+			}
+		}
+	}
+	
+	return NULL;
+}

From 386f6a8eadb54e0106e6b763562bf810a3788c67 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:34:30 +0100
Subject: [PATCH 174/623] New experimental 'Startup Disk' support

---
 i386/boot2/boot.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 1ebeb08..a863d16 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -218,6 +218,46 @@ void boot(int biosdev)
 	initPartitionChain();
 #endif
 
+#define DISK_TARGET_EXPERIMENT 0
+
+#if DISK_TARGET_EXPERIMENT
+	config_file_t	nvramStorage;
+	const char * path = "/Extra/NVRAM/nvramStorage.plist";
+	
+	if (loadConfigFile(path, &nvramStorage) == STATE_SUCCESS)
+	{
+		_BOOT_DEBUG_DUMP("nvramStorage.plist located\n");
+
+		if (getValueForConfigTableKey(&nvramStorage, "efi-boot-device-data", &val, &length))
+		{
+			_BOOT_DEBUG_DUMP("Key 'efi-boot-device-data' located %d\n", length);
+
+			int len = ((length / 4) * 3);
+			unsigned char * decodedData = (unsigned char *)malloc(len);
+			int rc = base64Decode(val, decodedData);
+
+			if (rc && decodedData)
+			{
+				EFI_DEVICE_PATH_PROTOCOL * dp = (EFI_DEVICE_PATH_PROTOCOL *) decodedData;
+
+				// FIXME: This doesn't belong here!
+				extern void *getGUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath);
+
+				void * uuid = getGUIDFromDevicePath(dp);
+
+				_BOOT_DEBUG_DUMP("GUID: %s\n", uuid);
+				_BOOT_DEBUG_SLEEP(1);
+
+				strlcpy(rootUUID, uuid, 37);
+			}
+		}
+	}
+	else
+	{
+		_BOOT_DEBUG_DUMP("Warning: unable to locate nvramStorage.plist\n");
+	}
+#endif // #if DISK_TARGET_EXPERIMENT
+
 	#define loadCABootPlist() loadSystemConfig(&bootInfo->bootConfig)
 
 	// Loading: /Library/Preferences/SystemConfiguration/com.apple.Boot.plist

From 10084cd8f4dd0234e63a0016f5f0755766afd170 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:39:21 +0100
Subject: [PATCH 175/623] EDK2's EfiDevicePath.h stuff

---
 i386/libsaio/efi/essentials.h | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/efi/essentials.h b/i386/libsaio/efi/essentials.h
index 001d181..8c06c48 100755
--- a/i386/libsaio/efi/essentials.h
+++ b/i386/libsaio/efi/essentials.h
@@ -183,6 +183,26 @@ typedef struct
 	// 0x02 - GUID signature.
 	//
 	EFI_UINT8					SignatureType;
-} EFI_BOOT_DEVICE_PATH; // HARDDRIVE_DEVICE_PATH
+} HARDDRIVE_DEVICE_PATH;
+
+
+// Stuff from EDK2's EfiDevicePath.h
+
+#define MEDIA_HARDDRIVE_DP				0x01
+#define MEDIA_DEVICE_PATH				0x04
+
+#define SIGNATURE_TYPE_MBR				0x01
+#define SIGNATURE_TYPE_GUID				0x02
+
+#define END_DEVICE_PATH_TYPE			0x7f
+#define END_ENTIRE_DEVICE_PATH_SUBTYPE	0xff
+#define EFI_DP_TYPE_MASK				0x7f
+
+#define DevicePathType(a)				( ((a)->Type) & EFI_DP_TYPE_MASK )
+#define DevicePathSubType(a)			( (a)->SubType )
+#define IsDevicePathEndType(a)			( DevicePathType(a) == END_DEVICE_PATH_TYPE )
+#define DevicePathNodeLength(a)			( ((a)->Length[0]) | ((a)->Length[1] << 8) )
+#define NextDevicePathNode(a)			( (EFI_DEVICE_PATH_PROTOCOL *) ( ((EFI_INT8 *) (a)) + DevicePathNodeLength(a)))
 
 #endif /* !__LIBSAIO_EFI_ESSENTIALS_H */
+

From b68a1759fb2624485b32941905ba4e313c7facb0 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:41:06 +0100
Subject: [PATCH 176/623] STATE_SUCCESS moved over from boot.h

---
 i386/libsaio/libsaio.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/libsaio.h b/i386/libsaio/libsaio.h
index 6eee4d1..bfe2c0e 100755
--- a/i386/libsaio/libsaio.h
+++ b/i386/libsaio/libsaio.h
@@ -20,12 +20,17 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ * Updates:
+ *  		- STATE_SUCCESS	moved from boot.h (PikerAlpha, November 2012)
+ *
  */
-/* libsaio.h */
 
 #ifndef __LIBSAIO_LIBSAIO_H
 #define __LIBSAIO_LIBSAIO_H
 
+#define STATE_SUCCESS	0
+
 #include "libsa.h"
 #include "memory.h"
 #include "io_inline.h"

From 70a84d6ab2b6bd28fa028b8b7b4e935c0a2a2c57 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:42:17 +0100
Subject: [PATCH 177/623] Moving STATE_SUCCESS to libsaio.h

---
 i386/boot2/boot.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/i386/boot2/boot.h b/i386/boot2/boot.h
index bb3c6c8..6a30a21 100755
--- a/i386/boot2/boot.h
+++ b/i386/boot2/boot.h
@@ -25,6 +25,7 @@
  *
  * Updates:
  *			- Unused sysConfigValid removed (PikerAlpha, November 2012).
+*			- STATE_SUCCESS	moved to libsaio.h (PikerAlpha, November 2012).
  *
  */
 
@@ -33,8 +34,6 @@
 
 #include "platform.h"
 
-#define STATE_SUCCESS	0	// Move this to a more appropriate header file.
-
 #if USE_STATIC_DISPLAY_RESOLUTION
 	#define DEFAULT_SCREEN_WIDTH	STATIC_SCREEN_WIDTH
 	#define DEFAULT_SCREEN_HEIGHT	STATIC_SCREEN_HEIGHT

From 28189344a78a41e0a2e40b40854eaaad07727cce Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:44:09 +0100
Subject: [PATCH 178/623] Base64.c functions added

---
 i386/libsaio/saio_internal.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index 518887c..dd637ee 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -25,6 +25,7 @@
  *
  *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
  *			- Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
+ *  		- decodeQuantum and base64Decode added (PikerAlpha, October 2012).
  *
  */
 
@@ -150,6 +151,8 @@ extern int		loadHelperConfig(config_file_t *configBuff);
 extern int		loadOverrideConfig(config_file_t *configBuff);
 extern char		* getNextArg(char ** ptr, char * val);
 extern long		ParseXMLFile(char * buffer, TagPtr * dict);
+extern void  	decodeQuantum(const char *input, unsigned char *output);
+extern int		base64Decode(const char *input, unsigned char *decodedData);
 
 
 /* sys.c */

From f6b28370a96dce804c52dc2712c9e0193df0f5aa Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:48:04 +0100
Subject: [PATCH 179/623] Updating file for next release

---
 i386/libsaio/stringTable.c | 64 ++++++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/i386/libsaio/stringTable.c b/i386/libsaio/stringTable.c
index d74585e..d069e89 100755
--- a/i386/libsaio/stringTable.c
+++ b/i386/libsaio/stringTable.c
@@ -24,11 +24,13 @@
  * Copyright 1993 NeXT, Inc. All rights reserved.
  *
  * Updates:
- *			- White space changes (PikerAlpha, November 2012)
- *			- Check malloc returns (PikerAlpha, November 2012)
+ *			- White space changes (PikerAlpha, November 2012).
+ *			- Now checking malloc returns (PikerAlpha, November 2012).
+ *			- Cleanups, kTagTypeData support and NVRAMstorage reading changes (PikerAlpha, November 2012).
  *
  */
 
+
 #include "bootstruct.h"
 #include "libsaio.h"
 #include "xml.h"
@@ -52,19 +54,18 @@ bool getValueForConfigTableKey(config_file_t *config, const char *key, const cha
 	if (config->dictionary != 0)
 	{
 		// Look up key in XML dictionary
-		TagPtr value;
-		value = XMLGetProperty(config->dictionary, key);
+		TagPtr value = XMLGetProperty(config->dictionary, key);
 
 		if (value != 0)
 		{
-			if (value->type != kTagTypeString)
+			if ((value->type != kTagTypeString) && (value->type != kTagTypeData))
 			{
 #if DEBUG_XML_PARSER
-				error("Non-string tag '%s' found in config file\n", key);
+				error("Unsupported tag '%s' found in config file\n", key);
 #endif
-				
 				return false;
 			}
+
 			*val = value->string;
 			*size = strlen(value->string);
 
@@ -81,8 +82,8 @@ bool getValueForConfigTableKey(config_file_t *config, const char *key, const cha
 
 char * newStringForKey(char *key, config_file_t *config)
 {
-	const char *val;
 	int size;
+	const char *val;
 
 	if (getValueForKey(key, &val, &size, config) && size)
 	{
@@ -253,9 +254,7 @@ bool getValueForKey(const char *key, const char **val, int *size, config_file_t
 		return true;
 	}
 
-	bool ret = getValueForConfigTableKey(config, key, val, size);
-
-	return ret;
+	return getValueForConfigTableKey(config, key, val, size);
 }
 
 
@@ -338,12 +337,37 @@ long ParseXMLFile(char * buffer, TagPtr * dictionaryPtr)
 }
 
 
+//==============================================================================
+// Returns TRUE on success and FALSE when it is fails to locate / open the file.
+
+bool loadConfigFile(const char * configFile, config_file_t *config)
+{
+	int fd = 0;
+
+	if ((fd = open(configFile, 0)) >= 0)
+	{
+		// IO_CONFIG_DATA_SIZE is defined as 4096 in bios.h and which should
+		// be sufficient enough for RevoBoot (size was 4K for years already).
+		read(fd, config->plist, IO_CONFIG_DATA_SIZE);
+		close(fd);
+	
+		// Build XML dictionary.
+		ParseXMLFile(config->plist, &config->dictionary);
+	
+		return 0;
+	}
+
+	return 1;
+}
+
 
 //==============================================================================
 // Returns 0 on success and -1 when it is fails to locate / open the file.
 
 int loadSystemConfig(config_file_t *config)
 {
+	short retValue = -1;
+
 	static char * dirspec[] =
 	{
 #if LION_RECOVERY_SUPPORT
@@ -374,28 +398,20 @@ int loadSystemConfig(config_file_t *config)
 	if (path)
 	{
 		int i = 0;
-		int fd = 0;
 		int len = (sizeof(dirspec) / sizeof(dirspec[0]));
 
 		for (; i < len; i++)
 		{
 			sprintf(path, "/%s/%s", dirspec[i], "com.apple.Boot.plist");
 
-			if ((fd = open(path, 0)) >= 0)
+			if (loadConfigFile(path, config) == STATE_SUCCESS)
 			{
-				// IO_CONFIG_DATA_SIZE is defined as 4096 in bios.h and which should
-				// be sufficient enough for RevoBoot (size was 4K for years already).
-				read(fd, config->plist, IO_CONFIG_DATA_SIZE);
-				close(fd);
-
-				// Build XML dictionary.
-				ParseXMLFile(config->plist, &config->dictionary);
-
-				free (path);
-				return 0;
+				retValue = 0;
 			}
 		}
+
+		free (path);
 	}
 
-	return -1;
+	return retValue;
 }

From feed6c70b770609b4e1990449d9bbd63d1e37d93 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:53:16 +0100
Subject: [PATCH 180/623] New/improved kXMLTagData support

---
 i386/libsaio/xml.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/xml.c b/i386/libsaio/xml.c
index a4a0c65..56af399 100755
--- a/i386/libsaio/xml.c
+++ b/i386/libsaio/xml.c
@@ -403,7 +403,7 @@ static long ParseTagInteger(char * buffer, TagPtr * tag)
 
 		if (tmpTag)
 		{
-			long integer = 0L;
+			int integer = 0;
 
 			tmpTag->type	= kTagTypeInteger;
 			tmpTag->string	= (char *)integer;
@@ -430,18 +430,18 @@ static long ParseTagData(char * buffer, TagPtr * tag)
 
 		if (tmpTag)
 		{
+			char * string = NewSymbol(buffer);
+
 			tmpTag->type	= kTagTypeData;
-			tmpTag->string	= 0;
-			tmpTag->tag		= 0;
+			tmpTag->string	= string;
+			tmpTag->tag	= 0;
 			tmpTag->tagNext	= 0;
 
 			*tag = tmpTag;
-
-			return length;
 		}
 	}
 
-	return length;	// -1
+	return length;
 }
 
 

From a3ecfa96523f51d865f3c0ba6324284bba74556a Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:55:34 +0100
Subject: [PATCH 181/623] Adding comment

---
 i386/libsaio/xml.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i386/libsaio/xml.c b/i386/libsaio/xml.c
index 56af399..9de00d4 100755
--- a/i386/libsaio/xml.c
+++ b/i386/libsaio/xml.c
@@ -23,6 +23,7 @@
  *
  * Updates:
  *			- Cleanups, white space and layout changes (PikerAlpha, November 2012)
+ *			- New/improved kXMLTagData support (PikerAlpha, November 2012) 
  *
  */
 

From 9aa1c3ae2676b9528fcf44df3ad7580c6dca9ad5 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 13:59:58 +0100
Subject: [PATCH 182/623] Stand alone support for base64.c added

---
 i386/libsaio/efi/essentials.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/efi/essentials.h b/i386/libsaio/efi/essentials.h
index 8c06c48..c4067f9 100755
--- a/i386/libsaio/efi/essentials.h
+++ b/i386/libsaio/efi/essentials.h
@@ -24,13 +24,16 @@
  * EFI implementation for Revolution Copyright (c) 2010 by DHP.
  * All rights reserved.
  *
+ * Updates:
+ *		- Stand alone support for base64.c added (PikerAlpha, November 2012)
  */
 
 #ifndef __LIBSAIO_EFI_ESSENTIALS_H
 #define __LIBSAIO_EFI_ESSENTIALS_H
 
-// #include "../config/settings.h"
-#include "../boot2/debug.h"
+#ifdef REVOBOOT_VERSION_INFO
+	#include "../boot2/debug.h"
+#endif
 
 typedef void      VOID;
 

From 5f449594f8ab127b025d4b5912bc272e0b8dbac3 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 14:04:16 +0100
Subject: [PATCH 183/623] Removed unused functions

---
 i386/libsaio/saio_internal.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index dd637ee..597185c 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -26,6 +26,7 @@
  *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
  *			- Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
  *  		- decodeQuantum and base64Decode added (PikerAlpha, October 2012).
+ *    	- Removed unused functions (PikerAlpha, October 2012).
  *
  */
 
@@ -139,20 +140,18 @@ extern void		enableA20(void);
 
 
 /* stringTable.c */
+extern void  	decodeQuantum(const char *input, unsigned char *output);
+extern int		base64Decode(const char *input, unsigned char *decodedData);
+
 extern bool		getValueForConfigTableKey(config_file_t *config, const char *key, const char **val, int *size);
 extern char		* newStringForKey(char *key, config_file_t *configBuff);
 extern bool		getValueForBootKey(const char *line, const char *match, const char **matchval, int *len);
 extern bool		getValueForKey(const char *key, const char **val, int *size, config_file_t *configBuff);
 extern bool		getBoolForKey(const char *key, bool *val, config_file_t *configBuff);
 extern bool		getIntForKey(const char *key, int *val, config_file_t *configBuff);
-extern int		loadConfigFile(const char *configFile, config_file_t *configBuff);
-extern int		loadSystemConfig(config_file_t *configBuff);
-extern int		loadHelperConfig(config_file_t *configBuff);
-extern int		loadOverrideConfig(config_file_t *configBuff);
+extern bool		loadConfigFile(const char *configFile, config_file_t *configBuff);
 extern char		* getNextArg(char ** ptr, char * val);
 extern long		ParseXMLFile(char * buffer, TagPtr * dict);
-extern void  	decodeQuantum(const char *input, unsigned char *output);
-extern int		base64Decode(const char *input, unsigned char *decodedData);
 
 
 /* sys.c */

From f2ad5a68a2f1c917055991e2af5f756113b46f7d Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 14:08:56 +0100
Subject: [PATCH 184/623] Oops we need loadSystemConfig()

---
 i386/libsaio/saio_internal.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index 597185c..576daf0 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -150,6 +150,7 @@ extern bool		getValueForKey(const char *key, const char **val, int *size, config
 extern bool		getBoolForKey(const char *key, bool *val, config_file_t *configBuff);
 extern bool		getIntForKey(const char *key, int *val, config_file_t *configBuff);
 extern bool		loadConfigFile(const char *configFile, config_file_t *configBuff);
+extern int  	loadSystemConfig(config_file_t *configBuff);
 extern char		* getNextArg(char ** ptr, char * val);
 extern long		ParseXMLFile(char * buffer, TagPtr * dict);
 

From e1a433e3f12c0417ba649019e26925062585b2c2 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 21 Nov 2012 14:09:39 +0100
Subject: [PATCH 185/623] Fixing a compiler error

---
 i386/libsaio/efi/essentials.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/efi/essentials.h b/i386/libsaio/efi/essentials.h
index c4067f9..9ab523c 100755
--- a/i386/libsaio/efi/essentials.h
+++ b/i386/libsaio/efi/essentials.h
@@ -31,7 +31,7 @@
 #ifndef __LIBSAIO_EFI_ESSENTIALS_H
 #define __LIBSAIO_EFI_ESSENTIALS_H
 
-#ifdef REVOBOOT_VERSION_INFO
+#ifdef TARGET_MODEL
 	#include "../boot2/debug.h"
 #endif
 

From e9a1223dc9d7170285dc82ab057cbc6e2a9fb329 Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Wed, 21 Nov 2012 19:27:27 +0000
Subject: [PATCH 186/623] Commit base64.c

---
 i386/libsaio/base64.c | 293 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 293 insertions(+)
 create mode 100755 i386/libsaio/base64.c

diff --git a/i386/libsaio/base64.c b/i386/libsaio/base64.c
new file mode 100755
index 0000000..4b4fbe6
--- /dev/null
+++ b/i386/libsaio/base64.c
@@ -0,0 +1,293 @@
+/*
+ *
+ * Name			: guidTest.c
+ * Version		: 0.3
+ * Type			: Command line test tool
+ * Copyright	: Sam aka RevoGirl (c) 18 March 2011
+ *
+ * Compile with	: cc base64.c -o base64 -Wall -framework IOKit -framework CoreFoundation
+ *
+ * See also		: http://www.projectosx.com/forum/index.php?showtopic=2008&st=120&p=13378&#entry13378
+ *
+ * Updates		- guidTest.c included as RevoBootr/i386/libsaio/base64.c (PikerAlpha, November 2012)
+ *				- DEBUG renamed to DEBUG_BASE64_DECODE (PikerAlpha, November 2012)
+ *				- STAND_ALONE check added (PikerAlpha, November 2012)
+ *				- Workaround for "___bzero" undefined error in RevoBoot (PikerAlpha, November 2012)
+ *				- base64Charset moved to function decodeQuantum (PikerAlpha, November 2012)
+ *
+ */
+
+#ifdef REVOBOOT_VERSION_INFO
+	#define STAND_ALONE	0
+#else
+	#define STAND_ALONE	1
+#endif
+
+#if STAND_ALONE
+	#include <IOKit/IOKitLib.h>
+	#include <CoreFoundation/CoreFoundation.h>
+#else
+	#include "libsaio.h"
+#endif
+
+#define DEBUG_BASE64_DECODE	1
+
+#if DEBUG_BASE64_DECODE
+	int quickLookups = 0;
+#endif
+
+#define PADDINGCHAR		'='
+
+#define TABLELEN        64
+
+
+//==============================================================================
+
+void decodeQuantum(const char *input, unsigned char *output)
+{
+#if DEBUG_BASE64_DECODE
+	bool found = false;
+#endif
+	int j = 0;
+
+	unsigned int x = 0; // We need a 32 bit wide variable for pur bit shifting.
+
+	const char * base64Charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+	for (int i = 0; i < 4; i++)
+	{
+#if DEBUG_BASE64_DECODE
+		found = false;
+#endif
+		if (input[i] == PADDINGCHAR)
+		{
+			x = (x << 6);
+#if DEBUG_BASE64_DECODE
+			found = true;
+#endif
+		}
+		else if (input[(i - 1)] == input[i]) // Same character as last one?
+		{
+#if DEBUG_BASE64_DECODE
+			found = true;
+			quickLookups++;
+#endif
+			x = (x << 6) + j;
+		}
+		else // Dig for target character.
+		{
+			for (j = 0; j < TABLELEN; j++)
+			{
+				if (base64Charset[j] == input[i])
+				{
+					x = (x << 6) + j;
+#if DEBUG_BASE64_DECODE
+					found = true;
+#endif
+					break;
+				}
+			}
+		}
+	}
+#if DEBUG_BASE64_DECODE
+	if (!found)
+	{
+		printf("ERROR\n");
+	}
+#endif
+
+	output[2] = x;
+	output[1] = (x >>= 8);
+	output[0] = (x >>= 8);
+}
+
+
+//==============================================================================
+ 
+int base64Decode(const char *input, unsigned char *decodedData)
+{
+	int i				= 0;
+	int j				= 0;
+	int numQuantums		= 0;
+	int paddingChars	= 0;
+
+	size_t bytes		= 0;
+	size_t length		= 0;
+
+	// These will be initialized later on
+	unsigned char *buffer		= NULL;
+	unsigned char *bufferStart	= NULL;
+	unsigned char *lastQuantum	= NULL;
+
+	while ((input[length] != PADDINGCHAR) && input[length])
+	{
+		length++;
+	}
+
+	// A maximum of two padding characters is allowed.
+	if (input[length] == PADDINGCHAR)
+	{
+		paddingChars++;
+
+		if (input[length + paddingChars] == PADDINGCHAR)
+		{
+			paddingChars++;
+		}
+	}
+
+	numQuantums = ((length + paddingChars) / 4);
+
+#if DEBUG_BASE64_DECODE
+	printf("\nnumQuantums: %d\n\n", numQuantums);
+#endif
+
+	// Is there anything to decode?
+	if (numQuantums)
+	{
+		buffer = malloc(numQuantums * 3);
+		
+		if (buffer)
+		{
+			bufferStart = buffer;
+			lastQuantum = (unsigned char *)malloc(4);
+
+			while (*input)
+			{
+				// Decode all but the last quantum (which may not decode to a multiple of 3 bytes).
+				for (i = 0; i < (numQuantums - 1); i++)
+				{
+					decodeQuantum(input, buffer);
+#if DEBUG_BASE64_DECODE
+					printf("%2ld : %02x %02x %02x\n", (bytes / 3), *buffer++, *buffer++, *buffer++);
+#else
+					buffer += 3;
+#endif
+					input += 4;
+					bytes += 3;
+				}
+
+				// The final decoding phase.
+				decodeQuantum(input, lastQuantum);
+
+				for (j = 0; j < (3 - paddingChars); j++)
+				{
+					buffer[j] = lastQuantum[j];
+					bytes++;
+				}
+
+				input += 4;
+#if DEBUG_BASE64_DECODE
+				printf("%2ld : %02x %02x %02x\n", (bytes / 3), lastQuantum[0], lastQuantum[1], lastQuantum[2]);
+#endif
+				buffer[(numQuantums * 3)] = 0xAA;
+			}
+			
+			free (lastQuantum);
+
+			if ((decodedData = memcpy(decodedData, bufferStart, bytes)) != NULL)
+			{
+#if DEBUG_BASE64_DECODE
+				printf("\nSuccesfully copied %zd bytes\n", bytes);
+#endif
+			}
+		}
+	}
+
+#if DEBUG_BASE64_DECODE
+	printf("\nbuffer: %ld bytes (0 - %d)\n", bytes, (numQuantums - 1));
+#endif
+
+	return bytes;
+}
+
+
+#if STAND_ALONE
+//==============================================================================
+
+#define BUFFFERLEN      128
+
+#include "efi/essentials.h"
+
+
+void *getGUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
+{
+	char * guid = NULL;
+	
+	if (devicePath != NULL)
+	{
+		while (!IsDevicePathEndType(devicePath) &&
+			   !(DevicePathType(devicePath) == MEDIA_DEVICE_PATH && DevicePathSubType(devicePath) == MEDIA_HARDDRIVE_DP))
+		{
+			devicePath = NextDevicePathNode(devicePath);
+		}
+		
+		if (DevicePathType(devicePath) == MEDIA_DEVICE_PATH && DevicePathSubType(devicePath) == MEDIA_HARDDRIVE_DP)
+		{
+			HARDDRIVE_DEVICE_PATH * HDDevicePath = (HARDDRIVE_DEVICE_PATH *) devicePath;
+			
+			if (HDDevicePath->SignatureType == SIGNATURE_TYPE_GUID) // 0x02
+			{
+				EFI_GUID * uuid = (EFI_GUID*)HDDevicePath->Signature;
+				
+				guid = (void *)malloc(37);
+				
+				// Function efi_guid_unparse_upper() in efi/efi_tables.c
+				sprintf(guid, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
+						uuid->Data1,
+						uuid->Data2,
+						uuid->Data3,
+						uuid->Data4[0], uuid->Data4[1],
+						uuid->Data4[2], uuid->Data4[3],
+						uuid->Data4[4], uuid->Data4[5],
+						uuid->Data4[6], uuid->Data4[7]);
+			}
+		}
+	}
+	
+	return guid;
+}
+
+//==============================================================================
+
+int main(void)
+{
+	// Test example: DE91E8DA-30B6-4B11-B8DC-76DC067BB57A (taken from a Macmini)
+
+	const char * input = "AgEMANBBAwoAAAAAAQEGAAIfAxIKAAIAAAAAAAQBKgACAAAAKEAGAAAAAABASyklAAAAANrokd62MBFLuNx23AZ7tXoCAn//BAA=";
+
+	// 02 01 0c 00 d0 41 03 0a 00 00 00 00
+	// 01 01 06 00 02 1f 03 12 0a 00 02 00 00 00 00 00
+	// 04 01 2a 00 02 00 00 00 28 40 06 00 00 00 00 00 40 4b 29 25 00 00 00 00 da e8 91 de b6 30 11 4b b8 dc 76 dc 06 7b b5 7a 02 02
+	// 7f ff 04 00
+
+	int len = ((strlen(input) / 4) * 3);
+
+	unsigned char * decodedData = malloc(len);
+
+	// Fill buffer with 0xdd (making errors visible)
+	for (int i = 0; i <= len; i++)
+	{
+		decodedData[i] = 0xdd;
+	}
+
+	int rc = base64Decode(input, decodedData);
+
+	// This of course should never happen
+	if ((rc == 0) || (decodedData == NULL))
+	{
+		printf("FAIL\n");
+	}
+
+#if DEBUG_BASE64_DECODE
+	printf("\nquickLookups: %d\n\n", quickLookups);
+#endif
+
+	EFI_DEVICE_PATH_PROTOCOL * dp = (EFI_DEVICE_PATH_PROTOCOL *) decodedData;
+
+	void * guid = getGUIDFromDevicePath(dp);
+
+	printf("GUID: %s\n", guid);
+
+	exit(0);
+}
+#endif // #if STAND_ALONE

From 9ea4294e370dde59cc54830358f6b32dc7da908e Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:11:52 +0100
Subject: [PATCH 187/623] Cleanups/adding note

---
 i386/libsaio/xml.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/i386/libsaio/xml.c b/i386/libsaio/xml.c
index 9de00d4..79ae65d 100755
--- a/i386/libsaio/xml.c
+++ b/i386/libsaio/xml.c
@@ -23,7 +23,7 @@
  *
  * Updates:
  *			- Cleanups, white space and layout changes (PikerAlpha, November 2012)
- *			- New/improved kXMLTagData support (PikerAlpha, November 2012) 
+ *			- New/improved kXMLTagData support (PikerAlpha, November 2012)
  *
  */
 
@@ -354,7 +354,7 @@ static long ParseTagKey(char * buffer, TagPtr * tag)
 		}
 	}
 
-	return length;	// -1;
+	return length;
 }
 
 
@@ -388,7 +388,7 @@ static long ParseTagString(char * buffer, TagPtr * tag)
 		}
 	}
 
-	return length;	// -1;
+	return length;
 }
 
 
@@ -415,7 +415,7 @@ static long ParseTagInteger(char * buffer, TagPtr * tag)
 		}
 	}
 
-	return length;	// -1
+	return length;
 }
 
 
@@ -434,8 +434,13 @@ static long ParseTagData(char * buffer, TagPtr * tag)
 			char * string = NewSymbol(buffer);
 
 			tmpTag->type	= kTagTypeData;
+			/*
+			 * We don't strip layout character and/or decode the data at this
+			 * point. We do that later on, and only the data fields that we are
+			 * interested in. Not all of them, because that would slow us down.
+			 */
 			tmpTag->string	= string;
-			tmpTag->tag	= 0;
+			tmpTag->tag		= 0;
 			tmpTag->tagNext	= 0;
 
 			*tag = tmpTag;
@@ -464,12 +469,10 @@ static long ParseTagDate(char * buffer, TagPtr * tag)
 			tmpTag->tagNext	= 0;
 
 			*tag = tmpTag;
-
-			return length;
 		}
 	}
 
-	return -1;
+	return length;
 }
 
 

From 5a591e4b2fd12a60b1e1ffa53ecb3f73f09d05ea Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:14:03 +0100
Subject: [PATCH 188/623] Length and character checking added

---
 i386/libsaio/base64.c | 349 ++++++++++++++++++++++++++----------------
 1 file changed, 215 insertions(+), 134 deletions(-)

diff --git a/i386/libsaio/base64.c b/i386/libsaio/base64.c
index 4b4fbe6..197bc77 100755
--- a/i386/libsaio/base64.c
+++ b/i386/libsaio/base64.c
@@ -1,7 +1,7 @@
 /*
  *
  * Name			: guidTest.c
- * Version		: 0.3
+ * Version		: 0.4
  * Type			: Command line test tool
  * Copyright	: Sam aka RevoGirl (c) 18 March 2011
  *
@@ -14,13 +14,14 @@
  *				- STAND_ALONE check added (PikerAlpha, November 2012)
  *				- Workaround for "___bzero" undefined error in RevoBoot (PikerAlpha, November 2012)
  *				- base64Charset moved to function decodeQuantum (PikerAlpha, November 2012)
+ *				- Length and character checking added (PikerAlpha, November 2012)
  *
  */
 
 #ifdef REVOBOOT_VERSION_INFO
-	#define STAND_ALONE	0
+	#define STAND_ALONE			0
 #else
-	#define STAND_ALONE	1
+	#define STAND_ALONE			1
 #endif
 
 #if STAND_ALONE
@@ -30,46 +31,160 @@
 	#include "libsaio.h"
 #endif
 
-#define DEBUG_BASE64_DECODE	1
+#define DEBUG_BASE64_DECODE		0
+
+#define FULL_BASE64_DATA_CHECK	0
 
 #if DEBUG_BASE64_DECODE
 	int quickLookups = 0;
 #endif
 
-#define PADDINGCHAR		'='
+#define PADDINGCHAR				'=' // 61 - 0x3d
 
-#define TABLELEN        64
+#define TABLELEN				64
 
 
 //==============================================================================
+// Helper function for base64Decode
 
-void decodeQuantum(const char *input, unsigned char *output)
+bool validBase64Length(char * aDataPtr)
 {
+	size_t length = (strlen(aDataPtr) - 1);
+	
+	if (length && (length % 4))
+	{
+		return true;
+	}
+	
+	return false;
+}
+
+
+//==============================================================================
+// Helper function for base64Decode
+
+char *cleanupBase64Data(char *aDataPtr)
+{
+	int index		= 0;
 #if DEBUG_BASE64_DECODE
-	bool found = false;
+	int junkChars	= 0;
 #endif
-	int j = 0;
 
-	unsigned int x = 0; // We need a 32 bit wide variable for pur bit shifting.
+	size_t length = strlen(aDataPtr);
 
-	const char * base64Charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	char *cleanedUpData = malloc(length);
+	bzero(cleanedUpData, length);
 
-	for (int i = 0; i < 4; i++)
+	// Main loop
+	while (*aDataPtr)
+	{
+		/*
+		 * This check acts as a first pass filter. Its purpose is to strip invalid
+		 * characters from the base64 encoded data, but we are mainly using it to
+		 * get rid of the layout enhancement characters (think line feeds and tabs).
+		 */
+		if (*aDataPtr > 42 && *aDataPtr < 123)
+		{
+#if FULL_BASE64_DATA_CHECK
+			/*
+			 * Additional checking is normally not required, but may help people
+			 * getting past messed up plist data fields (think hand editing).
+			 */
+			if (*aDataPtr > 43 && *aDataPtr < 47)		// ,-.
+			{
+				aDataPtr++;
+#if DEBUG_BASE64_DECODE
+				junkChars++;
+#endif
+			}
+			else if (*aDataPtr > 57 && *aDataPtr < 65)	// :'<=>?@
+			{
+				if (*aDataPtr == PADDINGCHAR)
+				{
+					cleanedUpData[index++] = *aDataPtr;
+#if DEBUG_BASE64_DECODE
+					printf("%c", cleanedUpData[length]);
+#endif
+				}
+				else
+				{
+					aDataPtr++;
+#if DEBUG_BASE64_DECODE
+					junkChars++;
+#endif
+				}
+			}
+			else if (*aDataPtr > 90 && *aDataPtr < 97)	// [\]^_`
+			{
+				aDataPtr++;
+#if DEBUG_BASE64_DECODE
+				junkChars++;
+#endif
+			}
+			else
+			{
+#endif
+				cleanedUpData[index++] = *aDataPtr;
+#if DEBUG_BASE64_DECODE
+				printf("%c", cleanedUpData[index]);
+#endif
+#if FULL_BASE64_DATA_CHECK
+			}
+#endif
+		}
+#if DEBUG_BASE64_DECODE
+		else
+		{
+			junkChars++;
+		}
+#endif
+		aDataPtr++;
+	}
+
+	cleanedUpData[index] = 0;
+
+#if DEBUG_BASE64_DECODE
+	printf("\njunkChars : %d\n", junkChars);
+	
+	length = strlen(cleanedUpData);
+
+	for (int i = 0; i < length; i++)
 	{
+		printf("%c", cleanedUpData[i]);
+	}
+#endif
+
+	return cleanedUpData;
+}
+
+
+//==============================================================================
+// Helper function for base64Decode
+
+void decodeQuantum(char *input, unsigned char *output)
+{
+	int j = 0;
 #if DEBUG_BASE64_DECODE
-		found = false;
+	int found = 0;
 #endif
+	
+	unsigned int x = 0; // We need a 32 bit wide variable for our bit shifting.
+	
+	const char * base64Charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	
+	for (int i = 0; i < 4; i++)
+	{
 		if (input[i] == PADDINGCHAR)
 		{
 			x = (x << 6);
 #if DEBUG_BASE64_DECODE
-			found = true;
+			found++;
 #endif
 		}
 		else if (input[(i - 1)] == input[i]) // Same character as last one?
 		{
 #if DEBUG_BASE64_DECODE
-			found = true;
+			found++;
 			quickLookups++;
 #endif
 			x = (x << 6) + j;
@@ -82,7 +197,7 @@ void decodeQuantum(const char *input, unsigned char *output)
 				{
 					x = (x << 6) + j;
 #if DEBUG_BASE64_DECODE
-					found = true;
+					found++;
 #endif
 					break;
 				}
@@ -90,12 +205,12 @@ void decodeQuantum(const char *input, unsigned char *output)
 		}
 	}
 #if DEBUG_BASE64_DECODE
-	if (!found)
+	if (found < 4)
 	{
-		printf("ERROR\n");
+		printf("ERROR ");
 	}
 #endif
-
+	
 	output[2] = x;
 	output[1] = (x >>= 8);
 	output[0] = (x >>= 8);
@@ -103,98 +218,52 @@ void decodeQuantum(const char *input, unsigned char *output)
 
 
 //==============================================================================
- 
-int base64Decode(const char *input, unsigned char *decodedData)
-{
-	int i				= 0;
-	int j				= 0;
-	int numQuantums		= 0;
-	int paddingChars	= 0;
-
-	size_t bytes		= 0;
-	size_t length		= 0;
 
-	// These will be initialized later on
-	unsigned char *buffer		= NULL;
-	unsigned char *bufferStart	= NULL;
-	unsigned char *lastQuantum	= NULL;
-
-	while ((input[length] != PADDINGCHAR) && input[length])
-	{
-		length++;
-	}
+int base64Decode(char *input, unsigned char **decodedData)
+{
+	size_t bytes = 0;
 
-	// A maximum of two padding characters is allowed.
-	if (input[length] == PADDINGCHAR)
+	unsigned char *buffer = NULL;
+	
+	input = cleanupBase64Data(input);
+	
+	if (validBase64Length(input))
 	{
-		paddingChars++;
-
-		if (input[length + paddingChars] == PADDINGCHAR)
+		int numQuantums = (strlen(input) / 4);
+	
+		if (numQuantums)
 		{
-			paddingChars++;
-		}
-	}
-
-	numQuantums = ((length + paddingChars) / 4);
-
 #if DEBUG_BASE64_DECODE
-	printf("\nnumQuantums: %d\n\n", numQuantums);
+			printf("\nnumQuantums : %d\n\n", numQuantums);
 #endif
+			buffer = (unsigned char *)malloc(numQuantums * 3);
 
-	// Is there anything to decode?
-	if (numQuantums)
-	{
-		buffer = malloc(numQuantums * 3);
-		
-		if (buffer)
-		{
-			bufferStart = buffer;
-			lastQuantum = (unsigned char *)malloc(4);
-
-			while (*input)
+			if (buffer)
 			{
-				// Decode all but the last quantum (which may not decode to a multiple of 3 bytes).
-				for (i = 0; i < (numQuantums - 1); i++)
+				*decodedData = buffer;
+
+				while (bytes < (numQuantums / 3))
 				{
-					decodeQuantum(input, buffer);
+					for (int i = 0; i < numQuantums; i++)
+					{
+						decodeQuantum(input, buffer);
 #if DEBUG_BASE64_DECODE
-					printf("%2ld : %02x %02x %02x\n", (bytes / 3), *buffer++, *buffer++, *buffer++);
+						printf("%2ld : %02x %02x %02x\n", (bytes / 3), *buffer++, *buffer++, *buffer++);
 #else
-					buffer += 3;
+						buffer += 3;
 #endif
-					input += 4;
-					bytes += 3;
+						input += 4;
+						bytes += 3;
+					}
 				}
-
-				// The final decoding phase.
-				decodeQuantum(input, lastQuantum);
-
-				for (j = 0; j < (3 - paddingChars); j++)
-				{
-					buffer[j] = lastQuantum[j];
-					bytes++;
-				}
-
-				input += 4;
-#if DEBUG_BASE64_DECODE
-				printf("%2ld : %02x %02x %02x\n", (bytes / 3), lastQuantum[0], lastQuantum[1], lastQuantum[2]);
-#endif
-				buffer[(numQuantums * 3)] = 0xAA;
-			}
-			
-			free (lastQuantum);
-
-			if ((decodedData = memcpy(decodedData, bufferStart, bytes)) != NULL)
-			{
-#if DEBUG_BASE64_DECODE
-				printf("\nSuccesfully copied %zd bytes\n", bytes);
-#endif
 			}
 		}
 	}
-
 #if DEBUG_BASE64_DECODE
-	printf("\nbuffer: %ld bytes (0 - %d)\n", bytes, (numQuantums - 1));
+	else
+	{
+		printf("\nError: Invalid length of base64 data!\n");
+	}
 #endif
 
 	return bytes;
@@ -204,14 +273,11 @@ int base64Decode(const char *input, unsigned char *decodedData)
 #if STAND_ALONE
 //==============================================================================
 
-#define BUFFFERLEN      128
-
 #include "efi/essentials.h"
 
-
-void *getGUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
+void *getUUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
 {
-	char * guid = NULL;
+	char * uuid = NULL;
 	
 	if (devicePath != NULL)
 	{
@@ -227,24 +293,55 @@ void *getGUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
 			
 			if (HDDevicePath->SignatureType == SIGNATURE_TYPE_GUID) // 0x02
 			{
-				EFI_GUID * uuid = (EFI_GUID*)HDDevicePath->Signature;
+				EFI_GUID * guid = (EFI_GUID*)HDDevicePath->Signature;
 				
-				guid = (void *)malloc(37);
+				uuid = (void *)malloc(37);
 				
 				// Function efi_guid_unparse_upper() in efi/efi_tables.c
-				sprintf(guid, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
-						uuid->Data1,
-						uuid->Data2,
-						uuid->Data3,
-						uuid->Data4[0], uuid->Data4[1],
-						uuid->Data4[2], uuid->Data4[3],
-						uuid->Data4[4], uuid->Data4[5],
-						uuid->Data4[6], uuid->Data4[7]);
+				sprintf(uuid, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
+						guid->Data1,
+						guid->Data2,
+						guid->Data3,
+						guid->Data4[0], guid->Data4[1],
+						guid->Data4[2], guid->Data4[3],
+						guid->Data4[4], guid->Data4[5],
+						guid->Data4[6], guid->Data4[7]);
 			}
 		}
 	}
 	
-	return guid;
+	return uuid;
+}
+
+
+//==============================================================================
+// Used in RevoBoot/i386/boot2/boot.c
+
+char * getStartupDiskUUID(char * aDataPtr)
+{
+	char * targetDiskUUID = NULL;
+	
+	unsigned char * decodedData = NULL;
+	
+	int rc = base64Decode(aDataPtr, &decodedData);
+	
+	if ((rc == 75) && (decodedData != NULL))
+	{
+		EFI_DEVICE_PATH_PROTOCOL * dp = (EFI_DEVICE_PATH_PROTOCOL *) decodedData;
+			
+		char * uuid = getUUIDFromDevicePath(dp);
+			
+		if (uuid)
+		{
+			targetDiskUUID = uuid;
+		}
+			
+		dp = NULL;
+	}
+		
+	free(decodedData);
+	
+	return targetDiskUUID;
 }
 
 //==============================================================================
@@ -253,40 +350,24 @@ int main(void)
 {
 	// Test example: DE91E8DA-30B6-4B11-B8DC-76DC067BB57A (taken from a Macmini)
 
-	const char * input = "AgEMANBBAwoAAAAAAQEGAAIfAxIKAAIAAAAAAAQBKgACAAAAKEAGAAAAAABASyklAAAAANrokd62MBFLuNx23AZ7tXoCAn//BAA=";
+	char * input = "	AgEMANBBAwoAAAAAAQEGAAIfA\n\r\t\
+						xIKAAIAAAAAAAQBKgACAAAAKE\n\v\
+						AGAAAAAABASyklAAAAANrokd6\n\
+						2MBFLuNx23AZ7tXoCAn//BAA=";
 
 	// 02 01 0c 00 d0 41 03 0a 00 00 00 00
 	// 01 01 06 00 02 1f 03 12 0a 00 02 00 00 00 00 00
 	// 04 01 2a 00 02 00 00 00 28 40 06 00 00 00 00 00 40 4b 29 25 00 00 00 00 da e8 91 de b6 30 11 4b b8 dc 76 dc 06 7b b5 7a 02 02
 	// 7f ff 04 00
 
-	int len = ((strlen(input) / 4) * 3);
-
-	unsigned char * decodedData = malloc(len);
-
-	// Fill buffer with 0xdd (making errors visible)
-	for (int i = 0; i <= len; i++)
-	{
-		decodedData[i] = 0xdd;
-	}
-
-	int rc = base64Decode(input, decodedData);
+	char * uuid = getStartupDiskUUID(input);
 
-	// This of course should never happen
-	if ((rc == 0) || (decodedData == NULL))
+	if (uuid)
 	{
-		printf("FAIL\n");
-	}
-
 #if DEBUG_BASE64_DECODE
-	printf("\nquickLookups: %d\n\n", quickLookups);
+		printf("\nUUID: %s\n", uuid);
 #endif
-
-	EFI_DEVICE_PATH_PROTOCOL * dp = (EFI_DEVICE_PATH_PROTOCOL *) decodedData;
-
-	void * guid = getGUIDFromDevicePath(dp);
-
-	printf("GUID: %s\n", guid);
+	}
 
 	exit(0);
 }

From 231b51d0c626b3d497d06e600b7dab6d02926555 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:15:42 +0100
Subject: [PATCH 189/623] Cleanups

---
 i386/libsaio/saio_internal.h | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index 576daf0..c5553e6 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -23,10 +23,8 @@
  *
  * Updates:
  *
- *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
+ *    	- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
  *			- Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
- *  		- decodeQuantum and base64Decode added (PikerAlpha, October 2012).
- *    	- Removed unused functions (PikerAlpha, October 2012).
  *
  */
 
@@ -34,6 +32,8 @@
 #define __LIBSAIO_SAIO_INTERNAL_H
 
 #include "saio_types.h"
+#include "efi/essentials.h"
+
 
 /* asm.s */
 extern void		real_to_prot(void);
@@ -117,6 +117,14 @@ extern void		turnOffFloppy(void);
 extern int		testFAT32EFIBootSector(int biosdev, unsigned int secno, void * buffer);
 
 
+/* guid.c */
+extern			void convertEFIGUIDToString(EFI_GUID const *aGuid, char *out);
+extern			bool isEFIGUIDNull(EFI_GUID const *aGuid);
+extern			int compareEFIGUID(EFI_GUID const *pG1, EFI_GUID const *pG2);
+extern			char *getUUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath);
+extern			char * getStartupDiskUUID(char * aDataPtr);
+
+
 /* hfs_compare.c */
 extern int32_t	FastUnicodeCompare(u_int16_t *uniStr1, u_int32_t len1, u_int16_t *uniStr2, u_int32_t len2);
 extern void		utf_encodestr(const u_int16_t * ucsp, int ucslen, u_int8_t * utf8p, u_int32_t bufsize);
@@ -140,8 +148,7 @@ extern void		enableA20(void);
 
 
 /* stringTable.c */
-extern void  	decodeQuantum(const char *input, unsigned char *output);
-extern int		base64Decode(const char *input, unsigned char *decodedData);
+extern int		base64Decode(char *input, unsigned char **decodedData);
 
 extern bool		getValueForConfigTableKey(config_file_t *config, const char *key, const char **val, int *size);
 extern char		* newStringForKey(char *key, config_file_t *configBuff);
@@ -150,7 +157,7 @@ extern bool		getValueForKey(const char *key, const char **val, int *size, config
 extern bool		getBoolForKey(const char *key, bool *val, config_file_t *configBuff);
 extern bool		getIntForKey(const char *key, int *val, config_file_t *configBuff);
 extern bool		loadConfigFile(const char *configFile, config_file_t *configBuff);
-extern int  	loadSystemConfig(config_file_t *configBuff);
+extern int		loadSystemConfig(config_file_t *configBuff);
 extern char		* getNextArg(char ** ptr, char * val);
 extern long		ParseXMLFile(char * buffer, TagPtr * dict);
 

From 52914ccfc99c027607ca537bacde69ded7816d65 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:17:29 +0100
Subject: [PATCH 190/623] Cleanups

---
 i386/boot2/boot.c | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index a863d16..763f3ee 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -218,9 +218,7 @@ void boot(int biosdev)
 	initPartitionChain();
 #endif
 
-#define DISK_TARGET_EXPERIMENT 0
-
-#if DISK_TARGET_EXPERIMENT
+#if DISK_TARGET_SUPPORT
 	config_file_t	nvramStorage;
 	const char * path = "/Extra/NVRAM/nvramStorage.plist";
 	
@@ -232,19 +230,10 @@ void boot(int biosdev)
 		{
 			_BOOT_DEBUG_DUMP("Key 'efi-boot-device-data' located %d\n", length);
 
-			int len = ((length / 4) * 3);
-			unsigned char * decodedData = (unsigned char *)malloc(len);
-			int rc = base64Decode(val, decodedData);
+			char * uuid = getStartupDiskUUID((char *)val);
 
-			if (rc && decodedData)
+			if (uuid)
 			{
-				EFI_DEVICE_PATH_PROTOCOL * dp = (EFI_DEVICE_PATH_PROTOCOL *) decodedData;
-
-				// FIXME: This doesn't belong here!
-				extern void *getGUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath);
-
-				void * uuid = getGUIDFromDevicePath(dp);
-
 				_BOOT_DEBUG_DUMP("GUID: %s\n", uuid);
 				_BOOT_DEBUG_SLEEP(1);
 
@@ -256,7 +245,7 @@ void boot(int biosdev)
 	{
 		_BOOT_DEBUG_DUMP("Warning: unable to locate nvramStorage.plist\n");
 	}
-#endif // #if DISK_TARGET_EXPERIMENT
+#endif // #if DISK_TARGET_SUPPORT
 
 	#define loadCABootPlist() loadSystemConfig(&bootInfo->bootConfig)
 
@@ -297,9 +286,9 @@ void boot(int biosdev)
 				
 				if (gVerboseMode)
 				{
-/*#if DEBUG_BOOT == false
+#if (DEBUG_BOOT == false)
 					setVideoMode(VGA_TEXT_MODE);
-#endif*/
+#endif
 				}
 
 				// Check for -x (safe) and -f (flush cache) flags.
@@ -310,18 +299,13 @@ void boot(int biosdev)
 				}
 
 				// Is 'boot-uuid=<value>' specified as kernel flag?
-				if (getValueForBootKey(kernelFlags, kBootUUIDKey, &val, &length) && length == 36)
+				if (!rootUUID && (getValueForBootKey(kernelFlags, kBootUUIDKey, &val, &length) && length == 36))
 				{
 					_BOOT_DEBUG_DUMP("Target boot-uuid=<%s>\n", val);
 
 					// Yes. Copy its value into rootUUID.
 					strlcpy(rootUUID, val, 37);
 				}
-				/* else
-				{
-					strlcpy(rootUUID, "3453E0E5-017B-38AD-A0AA-D0BBD8565D6", 37);
-					_BOOT_DEBUG_DUMP("Target boot-uuid=<%s>\n", rootUUID);
-				} */
 			}
 		}
 

From e5b03bc9ca29333eb61adfe729b5e1eeaa2c2bdb Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:18:54 +0100
Subject: [PATCH 191/623] Updating version info for RevoBoot v1.5.36

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index ff4e38d..599410a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.35
+1.5.36

From 2fc959cc0ff0ff560b9b8d4cab9e31273fcc6bca Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:20:57 +0100
Subject: [PATCH 192/623] Option DISK_TARGET_SUPPORT added

---
 i386/config/settings-template.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 1136591..1cda489 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Master Chief. All rights reserved.
  *
- * Note: This is an essential part of the build process for RevoBoot v1.5.35 and greater.
+ * Note: This is an essential part of the build process for RevoBoot v1.5.36 and greater.
  *
  * Updates:
  *
@@ -27,6 +27,7 @@
  *			- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA renamed to LOAD_MODEL_SPECIFIC_SMBIOS_DATA (PikerAlpha, October 2012).
  *			- LOAD_MODEL_SPECIFIC_STATIC_DATA added (PikerAlpha, October 2012).
  *			- Option SET_MAX_STRUCTURE_LENGTH added (PikerAlpha, November 2012).
+ *			- Option DISK_TARGET_SUPPORT added (PikerAlpha, November 2012).
  */
 
 
@@ -209,6 +210,8 @@
 #define LION_RECOVERY_SUPPORT				0	// Set to 0 by default. Change this to 1 to make RevoBoot search for the 'Recovery HD'
 												// partition and, when available, boot from it.
 
+#define DISK_TARGET_SUPPORT					1	// Set to 0 by default. Change this to 1 for System Preference/Startup Disk support.
+
 #define DEBUG_BOOT							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
 

From f91061b1eb96bf2f06dd2f2c52a982b41331ba6e Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:22:34 +0100
Subject: [PATCH 193/623] DISK_TARGET_SUPPORT -> 0 (default value)

---
 i386/config/settings-template.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 1cda489..86c7969 100644
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -210,7 +210,7 @@
 #define LION_RECOVERY_SUPPORT				0	// Set to 0 by default. Change this to 1 to make RevoBoot search for the 'Recovery HD'
 												// partition and, when available, boot from it.
 
-#define DISK_TARGET_SUPPORT					1	// Set to 0 by default. Change this to 1 for System Preference/Startup Disk support.
+#define DISK_TARGET_SUPPORT					0	// Set to 0 by default. Change this to 1 for System Preference/Startup Disk support.
 
 #define DEBUG_BOOT							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 

From 50daf06a4467bf41b10fe00a047a7fe9bea94678 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:32:08 +0100
Subject: [PATCH 194/623] Updating file for RevoBoot v1.5.36

---
 i386/libsa/efi_tables.c | 126 +++++++++++++++++++++++-----------------
 1 file changed, 73 insertions(+), 53 deletions(-)

diff --git a/i386/libsa/efi_tables.c b/i386/libsa/efi_tables.c
index fc7b132..6f1569d 100755
--- a/i386/libsa/efi_tables.c
+++ b/i386/libsa/efi_tables.c
@@ -1,15 +1,4 @@
-/*! @file       efi_tables.c
-    Copyright 2007 David F. Elliott.  All rights reserved.
- */
-#include "libsa.h"
-#include "efi_tables.h"
-
-
-/*==========================================================================
- * CRC32 implementation copied from xnu in turn copied from Gary S. Brown.
- */
-
-/*-
+/*
  *  COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or
  *  code or tables extracted from it, as desired without restriction.
  *
@@ -47,11 +36,16 @@
  *      using byte-swap instructions
  *      polynomial $edb88320
  *
+ * Updates:
+ *			- All but crc32 code moved to guid.c (PikerAlpha, November 2012)
+ *			- File renamed from efi_tables.c to crc32.c (PikerAlpha, November 2012)
+ *			- Copyright restored to original developer (PikerAlpha, November 2012)
  *
- * CRC32 code derived from work by Gary S. Brown.
  */
 
-static uint32_t crc32_tab[] =
+#include "libsaio.h"
+
+static uint32_t crc32Table[] =
 {
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
 	0xe963a535, 0x9e6495a3,	0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
@@ -110,7 +104,7 @@ uint32_t crc32(uint32_t crc, const void *buf, size_t size)
 
 	while (size--)
 	{
-		crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
+		crc = crc32Table[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
 	}
 
 	return crc ^ ~0U;
@@ -121,72 +115,73 @@ uint32_t crc32(uint32_t crc, const void *buf, size_t size)
  * Utility function to make a device tree string from an EFI_GUID
  *
  * FIXME: Everything below this line should be moved to: guid.c
- *
- *========================================================================*/
+ */
 
-void efi_guid_unparse_upper(EFI_GUID const *pGuid, char *out)
+
+//==========================================================================
+// Used in RevoBoot/i386/libsaio/disk.c
+
+void convertEFIGUIDToString(EFI_GUID const *aGuid, char *out)
 {
     sprintf(out, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
-        pGuid->Data1, /* - */
-        pGuid->Data2, /* - */
-        pGuid->Data3, /* - */
-        pGuid->Data4[0], pGuid->Data4[1], /* - */
-        pGuid->Data4[2], pGuid->Data4[3],
-        pGuid->Data4[4], pGuid->Data4[5],
-        pGuid->Data4[6], pGuid->Data4[7]);
+			aGuid->Data1, /* - */
+			aGuid->Data2, /* - */
+			aGuid->Data3, /* - */
+			aGuid->Data4[0], aGuid->Data4[1], /* - */
+			aGuid->Data4[2], aGuid->Data4[3],
+			aGuid->Data4[4], aGuid->Data4[5],
+			aGuid->Data4[6], aGuid->Data4[7]);
 }
 
 
 //==========================================================================
- 
-bool efi_guid_is_null(EFI_GUID const *pGuid)
+// Used in RevoBoot/i386/libsaio/disk.c
+
+bool isEFIGUIDNull(EFI_GUID const *aGuid)
 {
-	if (pGuid->Data1 == 0 && pGuid->Data2 == 0 && pGuid->Data3 == 0)
+	if (aGuid->Data1 == 0 && aGuid->Data2 == 0 && aGuid->Data3 == 0)
 	{
-		int i;
-
-		for (i = 0; i < 8; ++i)
+		for (int i = 0; i < 8; ++i)
 		{
-			if (pGuid->Data4[i] != 0)
+			if (aGuid->Data4[i] != 0)
 			{
 				return false;
 			}
 		}
-
+		
 		return true;
 	}
-
+	
 	return false;
 }
 
-#define COMPARE_MEMBER_AND_RETURN_IF_NE(a,b,mem) \
-	if( ((a)->mem) < ((b)->mem) ) \
-		return -1; \
-	else if( ((a)->mem) > ((b)->mem) ) \
-		return 1;
 
 //=========================================================================
+// Used in RevoBoot/i386/libsaio/disk.c
 
-int efi_guid_compare(EFI_GUID const *pG1, EFI_GUID const *pG2)
+int compareEFIGUID(EFI_GUID const *aSourceGuid, EFI_GUID const *aCompareGuid)
 {
-	COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data1);
-	COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data2);
-	COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data3);
-
-	int i;
-
-	for(i = 0; i < 8; ++i)
+	if (aSourceGuid->Data1 == aCompareGuid->Data1) // Comparing two EFI_UINT32's
 	{
-		COMPARE_MEMBER_AND_RETURN_IF_NE(pG1, pG2, Data4[i]);
+		if (aSourceGuid->Data2 == aCompareGuid->Data2) // Comparing two EFI_UINT16's
+		{
+			if (aSourceGuid->Data3 == aCompareGuid->Data3) // Comparing two EFI_UINT16's
+			{
+				// Returns 0 when equal or -1 when not
+				return memcmp((const void *)aSourceGuid->Data4, (const void *)aSourceGuid->Data4, 8);
+			}
+		}
 	}
-
-	return 0;
+	
+	return -1;
 }
 
 
+#if DISK_TARGET_SUPPORT
 //=========================================================================
+// Helper function for getStartupDiskUUID()
 
-char *getGUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
+char * getUUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
 {
 	if (devicePath != NULL)
 	{
@@ -206,8 +201,8 @@ char *getGUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
 				
 				char * guid = (char *)malloc(37);
 				
-				efi_guid_unparse_upper(uuid, guid);
-
+				convertEFIGUIDToString(uuid, guid);
+				
 				return guid;
 			}
 		}
@@ -215,3 +210,28 @@ char *getGUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
 	
 	return NULL;
 }
+
+
+//==============================================================================
+// Used in RevoBoot/i386/boot2/boot.c
+
+char * getStartupDiskUUID(char * aDataPtr)
+{
+	char * targetDiskUUID = NULL;
+	
+	unsigned char * decodedData = NULL;
+	
+	int rc = base64Decode(aDataPtr, &decodedData);
+	
+	if ((rc == 75) && (decodedData != NULL))
+	{
+		EFI_DEVICE_PATH_PROTOCOL * dp = (EFI_DEVICE_PATH_PROTOCOL *) decodedData;
+		
+		targetDiskUUID = getUUIDFromDevicePath(dp);
+		
+		free(decodedData);
+	}
+	
+	return targetDiskUUID;
+}
+#endif // #if DISK_TARGET_SUPPORT

From 3237803ad54ab58e2640ae4571755d104012f0b9 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:33:16 +0100
Subject: [PATCH 195/623] Updating file for RevoBoot v1.6.36

---
 i386/libsaio/disk.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index a1ed781..2a077f8 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -68,8 +68,6 @@
 typedef struct gpt_hdr gpt_hdr;
 typedef struct gpt_ent gpt_ent;
 
-#include "efi_tables.h"
-
 
 #define BPS				512		// sector size of the device.
 #define PROBEFS_SIZE	BPS * 4	// buffer size for filesystem probe.
@@ -500,7 +498,7 @@ static BVRef newGPTBVRef(int biosdev, int partno, unsigned int blkoff, const gpt
 
 static bool isPartitionUsed(gpt_ent * partition)
 {
-	return efi_guid_is_null((EFI_GUID const*)partition->ent_type) ? false : true;
+	return isEFIGUIDNull((EFI_GUID const*)partition->ent_type) ? false : true;
 }
 
 
@@ -574,13 +572,13 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 										int bvrFlags = -1;
 #if DEBUG_DISK
 										char stringuuid[100];
-										efi_guid_unparse_upper((EFI_GUID*)gptMap->ent_type, stringuuid);
+										convertEFIGUIDToString((EFI_GUID*)gptMap->ent_type, stringuuid);
 										printf("Reading GPT partition %d, type %s\n", gptID, stringuuid);
 										sleep(1);
 #endif
 
 #if EFI_SYSTEM_PARTITION_SUPPORT		// First check for the EFI partition.
-										if (efi_guid_compare(&GPT_EFISYS_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
+										if (compareEFIGUID(&GPT_EFISYS_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
 										{
 											_DISK_DEBUG_DUMP("Matched: EFI GUID, probing for HFS format...\n");
 											
@@ -616,7 +614,7 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 #endif
 
 #if CORE_STORAGE_SUPPORT				// Is this a CoreStorage partition?
-										if (efi_guid_compare(&GPT_CORESTORAGE_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
+										if (compareEFIGUID(&GPT_CORESTORAGE_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
 										{
 											_DISK_DEBUG_DUMP("Matched: CoreStorage GUID\n");
 
@@ -629,14 +627,14 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 										// Check for HFS+ partitions.
 										if (
 #endif
-										!gPlatform.BootRecoveryHD && (efi_guid_compare(&GPT_HFS_GUID, (EFI_GUID const *)gptMap->ent_type) == 0))
+										!gPlatform.BootRecoveryHD && (compareEFIGUID(&GPT_HFS_GUID, (EFI_GUID const *)gptMap->ent_type) == 0))
 										{
 											_DISK_DEBUG_DUMP("Matched: HFS+ GUID\n");
 
 											bvrFlags = kBVFlagZero;
 										}
 #if APPLE_RAID_SUPPORT
-										else if (efi_guid_compare(&GPT_RAID_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
+										else if (compareEFIGUID(&GPT_RAID_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
 										{
 											_DISK_DEBUG_DUMP("Skipping: GPT_RAID_GUID\n");
 													 
@@ -645,7 +643,7 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 #endif
 
 #if CORE_STORAGE_SUPPORT || APPLE_RAID_SUPPORT
-										else if (efi_guid_compare(&GPT_BOOT_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
+										else if (compareEFIGUID(&GPT_BOOT_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
 										{
 											_DISK_DEBUG_DUMP("Matched: GPT_BOOT_GUID\n");
 											

From 385bdd41eb1e09d4836575aa978545effdd29656 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:44:21 +0100
Subject: [PATCH 196/623] efi_guid_unparse_upper -> convertEFIGUIDToString

---
 i386/libsaio/efi/fake_efi.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i386/libsaio/efi/fake_efi.h b/i386/libsaio/efi/fake_efi.h
index 94c18a9..63e1381 100755
--- a/i386/libsaio/efi/fake_efi.h
+++ b/i386/libsaio/efi/fake_efi.h
@@ -29,6 +29,7 @@
  *
  * Updates:
  *		- Check malloc return (PikerAlpha, November 2012).
+ *		- Renamed efi_guid_unparse_upper to convertEFIGUIDToString (PikerAlpha, November 2012).
  *
  */
 

From 2bce66782a8e59d72f31ca39786c5b37dd431af3 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:53:33 +0100
Subject: [PATCH 197/623] Take two

---
 i386/libsaio/efi/fake_efi.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/efi/fake_efi.h b/i386/libsaio/efi/fake_efi.h
index 63e1381..f6b86af 100755
--- a/i386/libsaio/efi/fake_efi.h
+++ b/i386/libsaio/efi/fake_efi.h
@@ -64,7 +64,7 @@ static inline char * mallocStringForGuid(EFI_GUID const *pGuid)
 
 	if (string)
 	{
-		efi_guid_unparse_upper(pGuid, string);
+		convertEFIGUIDToString(pGuid, string);
 
 		return string;
 	}

From e300ec7520a96ba088ddce75dc0c200f9b6a0c22 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 24 Nov 2012 14:55:52 +0100
Subject: [PATCH 198/623] Updating file for RevoBoot v1.5.36

---
 i386/libsa/libsa.h | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/i386/libsa/libsa.h b/i386/libsa/libsa.h
index d2ae491..b164c19 100755
--- a/i386/libsa/libsa.h
+++ b/i386/libsa/libsa.h
@@ -42,10 +42,34 @@
 /*
  * boot.c
  */
-
 extern int fastEnableA20(void);
 
 
+/*
+ * crc32.c
+ */
+uint32_t crc32(uint32_t crc, const void *buf, size_t size);
+
+
+/*
+ * getsegbyname.c
+ */
+extern struct segment_command * getsegbynamefromheader(struct mach_header * mhp, char * segname);
+
+
+/*
+ * prf.c
+ */
+extern void prf(const char * fmt, va_list ap, void (*putfn_p)(), void * putfn_arg);
+
+
+/*
+ * printf.c
+ */
+extern int sprintf(char *s, const char * format, ...);
+extern int slvprintf(char * buffer, int len, const char * fmt, va_list arg);
+
+
 /*
  * string.c
  */
@@ -85,6 +109,7 @@ extern size_t	strlen(const char * str);
 extern uint8_t checksum8( void * start, unsigned int length);
 char * removeChar(char *aSourceString, char aTargetChar);
 
+
 /*
  * strtol.c
  */
@@ -92,16 +117,6 @@ extern long strtol(const char * nptr, char ** endptr, int base);
 extern unsigned long strtoul(const char * nptr, char ** endptr, int base);
 extern unsigned long long strtouq(const char *nptr, char ** endptr, int base);
 
-/*
- * prf.c
- */
-extern void prf(const char * fmt, va_list ap, void (*putfn_p)(), void * putfn_arg);
-
-/*
- * printf.c
- */
-extern int sprintf(char *s, const char * format, ...);
-extern int slvprintf(char * buffer, int len, const char * fmt, va_list arg);
 
 /*
  * zalloc.c
@@ -120,9 +135,4 @@ extern int slvprintf(char * buffer, int len, const char * fmt, va_list arg);
 extern void   free(void * start);
 extern void * realloc(void * ptr, size_t size);
 
-/*
- * getsegbyname.c
- */
-extern struct segment_command * getsegbynamefromheader(struct mach_header * mhp, char * segname);
-
 #endif /* !__BOOT_LIBSA_H */

From 18a54907348747e33d0e007894b7d3af50336029 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 27 Nov 2012 15:32:59 +0100
Subject: [PATCH 199/623] RevoBoot v1.5.37

---
 .gitignore                           |   1 +
 CHANGES                              |  30 +++
 VERSION                              |   2 +-
 i386/MakeInc.dir                     |   5 +-
 i386/MakePaths.dir                   |   0
 i386/boot2/boot.c                    |  17 +-
 i386/boot2/boot.h                    |   2 +-
 i386/config/settings-template.h      |   5 +-
 i386/libsa/Makefile                  |   3 +-
 i386/libsa/{efi_tables.c => crc32.c} | 159 ++-------------
 i386/libsa/efi_tables.h              |  16 --
 i386/libsa/string.c                  |   2 +-
 i386/libsa/strtol.c                  | 283 +++++++++++++++++++--------
 i386/libsaio/Makefile                |   8 +-
 i386/libsaio/base64.c                | 114 +++++++----
 i386/libsaio/disk.c                  |   9 +-
 i386/libsaio/efi/essentials.h        |   6 +-
 i386/libsaio/efi/fake_efi.h          |  13 +-
 i386/libsaio/guid.c                  | 151 ++++++++++++++
 i386/libsaio/hfs.c                   |   2 +-
 i386/libsaio/libsaio.h               |   2 +-
 i386/libsaio/saio_internal.h         |  12 +-
 i386/libsaio/vbe.c                   |   1 +
 23 files changed, 528 insertions(+), 315 deletions(-)
 mode change 100755 => 100644 i386/MakeInc.dir
 mode change 100755 => 100644 i386/MakePaths.dir
 mode change 100644 => 100755 i386/config/settings-template.h
 rename i386/libsa/{efi_tables.c => crc32.c} (57%)
 mode change 100755 => 100644
 delete mode 100755 i386/libsa/efi_tables.h
 create mode 100755 i386/libsaio/guid.c

diff --git a/.gitignore b/.gitignore
index 17d5f72..8681039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+.git
 
 out.log
 obj/*
diff --git a/CHANGES b/CHANGES
index c96a333..e423223 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,33 @@
+RevoBoot v1.5.40 (Next Major Release)
+================
+- Improved CPU detection (with new/additional CPU's).
+- Improved P-State generation (less settings).
+
+
+RevoBoot v1.5.37
+================
+- DISK_TARGET_SUPPORT in settings-template.h renamed to STARTUP_DISK_SUPPORT (PikerAlpha, November 2012).
+- Restored copyright of efi_tables.c to original developer (PikerAlpha, November 2012).
+- Renamed RevoBoot/i386/libsa/efi_tables.c to crc32.c (PikerAlpha, November 2012).
+- Moved GUID function from efi_tables.c to RevoBoot/i386/libsaio/guid.c (PikerAlpha, November 2012). 
+- Fixed some minor C99 issues / restoring gcc compatibility (PikerAlpha, November 2012).
+- Cleanups and other minor improvements.
+- VERSION updated to v1.5.37
+
+
+RevoBoot v1.5.36
+================
+- Now reading efi-boot-device-data from /Extra/NVRAM/nvramStorage.plist to select the Startup Disk (PikerAlpha, November 2012).
+- New DISK_TARGET_SUPPORT setting in settings-template.h (PikerAlpha, November 2012).
+- New file RevoBoot/i386/libsaio/base64.c (written by Sam) added (PikerAlpha, November 2012).
+- Support for data fields added (PikerAlpha, November 2012). 
+- Copied macro's from EDK2's EfiDevicePath.h to RevoBoot/i386/libsaio/efi/essentials.h (PikerAlpha, November 2012).
+- Port of EDK2's function (getGUIDFromDevicePath written by Sam) added (PikerAlpha, November 2012).
+- Function loadSystemConfig now calls new function loadConfigFile (PikerAlpha, November 2012).
+- Cleanups and other minor improvements.
+- VERSION updated to v1.5.36
+
+
 RevoBoot v1.5.35
 ================
 - SMBIOS related enhancements for RevoBoot v1.5.35 (PikerAlpha, November 2012).
diff --git a/VERSION b/VERSION
index 599410a..dc848ff 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.36
+1.5.37
diff --git a/i386/MakeInc.dir b/i386/MakeInc.dir
old mode 100755
new mode 100644
index bdaf6ca..6a87e1c
--- a/i386/MakeInc.dir
+++ b/i386/MakeInc.dir
@@ -6,6 +6,7 @@
 #		- Major cleanup (PikerAlpha, October 2012).
 #		- Fixed clang compilation (dgsga, November 2012).
 #		- Single pass compilation (PikerAlpha, November 2012).
+#		- Removed unused CPPFLAGS (PikerAlpha, November 2012).
 #
 
 
@@ -34,7 +35,7 @@ $(OBJROOT)/%.o: %.m
 
 .s.o:
 	@echo "\t[AS] $<"
-	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -o $(OBJROOT)/$@
+	@$(CC) -c $(INC) -arch i386 $< -o $(OBJROOT)/$@
 
 $(OBJROOT)/boot2.o:
 	@echo "\t[AS] boot2.s"
@@ -42,7 +43,7 @@ $(OBJROOT)/boot2.o:
 	
 $(OBJROOT)/%.o: %.s
 	@echo "\t[AS] $<"
-	@$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -o $(OBJROOT)/$@
+	@$(CC) -c $(INC) -arch i386 $< -o $(OBJROOT)/$@
 
 $(DIRS_NEEDED):
 	@/bin/mkdir -p $@
diff --git a/i386/MakePaths.dir b/i386/MakePaths.dir
old mode 100755
new mode 100644
diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 763f3ee..6864f60 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -218,17 +218,22 @@ void boot(int biosdev)
 	initPartitionChain();
 #endif
 
-#if DISK_TARGET_SUPPORT
+#if STARTUP_DISK_SUPPORT
+	/*
+	 * sudo nano /etc/rc.shutdown.local
+	 * #!/bin/sh
+	 * /usr/sbin/nvram -x -p > /Extra/NVRAM/nvramStorage.plist
+	 */
 	config_file_t	nvramStorage;
 	const char * path = "/Extra/NVRAM/nvramStorage.plist";
 	
 	if (loadConfigFile(path, &nvramStorage) == STATE_SUCCESS)
 	{
-		_BOOT_DEBUG_DUMP("nvramStorage.plist located\n");
+		_BOOT_DEBUG_DUMP("nvramStorage.plist found\n");
 
 		if (getValueForConfigTableKey(&nvramStorage, "efi-boot-device-data", &val, &length))
 		{
-			_BOOT_DEBUG_DUMP("Key 'efi-boot-device-data' located %d\n", length);
+			_BOOT_DEBUG_DUMP("Key 'efi-boot-device-data' found %d\n", length);
 
 			char * uuid = getStartupDiskUUID((char *)val);
 
@@ -298,8 +303,8 @@ void boot(int biosdev)
 					gBootMode = kBootModeSafe;
 				}
 
-				// Is 'boot-uuid=<value>' specified as kernel flag?
-				if (!rootUUID && (getValueForBootKey(kernelFlags, kBootUUIDKey, &val, &length) && length == 36))
+				// Is rootUUID still empty and 'boot-uuid=<value>' specified as kernel flag?
+				if (rootUUID[0] == '\0' && (getValueForBootKey(kernelFlags, kBootUUIDKey, &val, &length) && length == 36))
 				{
 					_BOOT_DEBUG_DUMP("Target boot-uuid=<%s>\n", val);
 
@@ -346,7 +351,7 @@ void boot(int biosdev)
 	// Was a target drive (per UUID) specified in com.apple.Boot.plist?
 	if (rootUUID[0] == '\0')
 	{
-		_BOOT_DEBUG_DUMP("No UUID specified in com.apple.Boot.plist\n");
+		_BOOT_DEBUG_DUMP("No NVRAM-Startup Disk / rd=uuid bootuuid= in com.apple.Boot.plist\n");
 
 		// No, so are we booting from a System Volume?
 		if (gPlatform.BootVolume->flags & kBVFlagSystemVolume)
diff --git a/i386/boot2/boot.h b/i386/boot2/boot.h
index 6a30a21..b710e8e 100755
--- a/i386/boot2/boot.h
+++ b/i386/boot2/boot.h
@@ -25,7 +25,7 @@
  *
  * Updates:
  *			- Unused sysConfigValid removed (PikerAlpha, November 2012).
-*			- STATE_SUCCESS	moved to libsaio.h (PikerAlpha, November 2012).
+ *			- STATE_SUCCESS	moved to libsaio.h (PikerAlpha, November 2012).
  *
  */
 
diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
old mode 100644
new mode 100755
index 86c7969..8e4f166
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Master Chief. All rights reserved.
  *
- * Note: This is an essential part of the build process for RevoBoot v1.5.36 and greater.
+ * Note: This is an essential part of the build process for RevoBoot v1.5.35 and greater.
  *
  * Updates:
  *
@@ -28,6 +28,7 @@
  *			- LOAD_MODEL_SPECIFIC_STATIC_DATA added (PikerAlpha, October 2012).
  *			- Option SET_MAX_STRUCTURE_LENGTH added (PikerAlpha, November 2012).
  *			- Option DISK_TARGET_SUPPORT added (PikerAlpha, November 2012).
+ *			- DISK_TARGET_SUPPORT renamed to STARTUP_DISK_SUPPORT (PikerAlpha, November 2012).
  */
 
 
@@ -210,7 +211,7 @@
 #define LION_RECOVERY_SUPPORT				0	// Set to 0 by default. Change this to 1 to make RevoBoot search for the 'Recovery HD'
 												// partition and, when available, boot from it.
 
-#define DISK_TARGET_SUPPORT					0	// Set to 0 by default. Change this to 1 for System Preference/Startup Disk support.
+#define STARTUP_DISK_SUPPORT				0	// Set to 0 by default. Change this to 1 for System Preference/Startup Disk support.
 
 #define DEBUG_BOOT							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
diff --git a/i386/libsa/Makefile b/i386/libsa/Makefile
index ce11708..70a5b85 100644
--- a/i386/libsa/Makefile
+++ b/i386/libsa/Makefile
@@ -7,6 +7,7 @@
 #			- Output added for rm/ar/ranlib actions (PikerAlpha, November 2012).
 #			- Enabled clang compilation (dgsga, November 2012. Credits to Evan Lojewski for original work).
 #			- Output change and now using libtool instead of ar/ranlib (PikerAlpha, November 2012).
+#			- efi_table.c renamed to crc32.c (PikerAlpha, November 2012).
 #
 
 include ../MakePaths.dir
@@ -25,7 +26,7 @@ INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSAIODIR)
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-SA_OBJS = prf.o printf.o zalloc.o string.o strtol.o setjmp.o efi_tables.o
+SA_OBJS = prf.o printf.o zalloc.o string.o strtol.o setjmp.o crc32.o
 
 LIBS = libsa.a
 
diff --git a/i386/libsa/efi_tables.c b/i386/libsa/crc32.c
old mode 100755
new mode 100644
similarity index 57%
rename from i386/libsa/efi_tables.c
rename to i386/libsa/crc32.c
index 6f1569d..c906054
--- a/i386/libsa/efi_tables.c
+++ b/i386/libsa/crc32.c
@@ -43,21 +43,25 @@
  *
  */
 
-#include "libsaio.h"
+
+#include "libsa.h"
+
+//==========================================================================
+// This data block can also be found in boot.efi
 
 static uint32_t crc32Table[] =
 {
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-	0xe963a535, 0x9e6495a3,	0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+	0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
 	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-	0xf3b97148, 0x84be41de,	0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-	0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,	0x14015c4f, 0x63066cd9,
-	0xfa0f3d63, 0x8d080df5,	0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-	0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,	0x35b5a8fa, 0x42b2986c,
-	0xdbbbc9d6, 0xacbcf940,	0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+	0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+	0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+	0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+	0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+	0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
 	0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
 	0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-	0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,	0x76dc4190, 0x01db7106,
+	0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
 	0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
 	0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
 	0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
@@ -95,143 +99,16 @@ static uint32_t crc32Table[] =
 
 //==========================================================================
 
-uint32_t crc32(uint32_t crc, const void *buf, size_t size)
-{
-	const uint8_t *p;
-
-	p = buf;
-	crc = crc ^ ~0U;
-
-	while (size--)
-	{
-		crc = crc32Table[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
-	}
-
-	return crc ^ ~0U;
-}
-
-
-/*==========================================================================
- * Utility function to make a device tree string from an EFI_GUID
- *
- * FIXME: Everything below this line should be moved to: guid.c
- */
-
-
-//==========================================================================
-// Used in RevoBoot/i386/libsaio/disk.c
-
-void convertEFIGUIDToString(EFI_GUID const *aGuid, char *out)
-{
-    sprintf(out, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
-			aGuid->Data1, /* - */
-			aGuid->Data2, /* - */
-			aGuid->Data3, /* - */
-			aGuid->Data4[0], aGuid->Data4[1], /* - */
-			aGuid->Data4[2], aGuid->Data4[3],
-			aGuid->Data4[4], aGuid->Data4[5],
-			aGuid->Data4[6], aGuid->Data4[7]);
-}
-
-
-//==========================================================================
-// Used in RevoBoot/i386/libsaio/disk.c
-
-bool isEFIGUIDNull(EFI_GUID const *aGuid)
+uint32_t crc32(uint32_t aCRC, const void *aBuffer, size_t aSize)
 {
-	if (aGuid->Data1 == 0 && aGuid->Data2 == 0 && aGuid->Data3 == 0)
-	{
-		for (int i = 0; i < 8; ++i)
-		{
-			if (aGuid->Data4[i] != 0)
-			{
-				return false;
-			}
-		}
-		
-		return true;
-	}
-	
-	return false;
-}
+	const uint8_t *p = aBuffer;
 
+	aCRC = aCRC ^ ~0U;
 
-//=========================================================================
-// Used in RevoBoot/i386/libsaio/disk.c
-
-int compareEFIGUID(EFI_GUID const *aSourceGuid, EFI_GUID const *aCompareGuid)
-{
-	if (aSourceGuid->Data1 == aCompareGuid->Data1) // Comparing two EFI_UINT32's
+	while (aSize--)
 	{
-		if (aSourceGuid->Data2 == aCompareGuid->Data2) // Comparing two EFI_UINT16's
-		{
-			if (aSourceGuid->Data3 == aCompareGuid->Data3) // Comparing two EFI_UINT16's
-			{
-				// Returns 0 when equal or -1 when not
-				return memcmp((const void *)aSourceGuid->Data4, (const void *)aSourceGuid->Data4, 8);
-			}
-		}
+		aCRC = crc32Table[(aCRC ^ *p++) & 0xFF] ^ (aCRC >> 8);
 	}
-	
-	return -1;
-}
-
-
-#if DISK_TARGET_SUPPORT
-//=========================================================================
-// Helper function for getStartupDiskUUID()
 
-char * getUUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
-{
-	if (devicePath != NULL)
-	{
-		while (!IsDevicePathEndType(devicePath) &&
-			   !(DevicePathType(devicePath) == MEDIA_DEVICE_PATH && DevicePathSubType(devicePath) == MEDIA_HARDDRIVE_DP))
-		{
-			devicePath = NextDevicePathNode(devicePath);
-		}
-		
-		if (DevicePathType(devicePath) == MEDIA_DEVICE_PATH && DevicePathSubType(devicePath) == MEDIA_HARDDRIVE_DP)
-		{
-			HARDDRIVE_DEVICE_PATH * HDDevicePath = (HARDDRIVE_DEVICE_PATH *) devicePath;
-			
-			if (HDDevicePath->SignatureType == SIGNATURE_TYPE_GUID) // 0x02
-			{
-				EFI_GUID const * uuid = (EFI_GUID*)HDDevicePath->Signature;
-				
-				char * guid = (char *)malloc(37);
-				
-				convertEFIGUIDToString(uuid, guid);
-				
-				return guid;
-			}
-		}
-	}
-	
-	return NULL;
-}
-
-
-//==============================================================================
-// Used in RevoBoot/i386/boot2/boot.c
-
-char * getStartupDiskUUID(char * aDataPtr)
-{
-	char * targetDiskUUID = NULL;
-	
-	unsigned char * decodedData = NULL;
-	
-	int rc = base64Decode(aDataPtr, &decodedData);
-	
-	if ((rc == 75) && (decodedData != NULL))
-	{
-		EFI_DEVICE_PATH_PROTOCOL * dp = (EFI_DEVICE_PATH_PROTOCOL *) decodedData;
-		
-		targetDiskUUID = getUUIDFromDevicePath(dp);
-		
-		free(decodedData);
-	}
-	
-	return targetDiskUUID;
+	return (aCRC ^ ~0U);
 }
-#endif // #if DISK_TARGET_SUPPORT
diff --git a/i386/libsa/efi_tables.h b/i386/libsa/efi_tables.h
deleted file mode 100755
index 7976437..0000000
--- a/i386/libsa/efi_tables.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*! @file       efi_tables.h
-    @abstract   Utility functions for dealing with EFI tables
-    Copyright 2007 David F. Elliott.  All rights reserved.
- */
-#ifndef _LIBSA_EFI_TABLES_H__
-#define _LIBSA_EFI_TABLES_H__
-
-#include "efi/essentials.h"
-
-uint32_t crc32(uint32_t crc, const void *buf, size_t size);
-
-void efi_guid_unparse_upper(EFI_GUID const *pGuid, char *out);
-bool efi_guid_is_null(EFI_GUID const *pGuid);
-int efi_guid_compare(EFI_GUID const *pG1, EFI_GUID const *pG2);
-
-#endif //ndef _LIBSA_EFI_TABLES_H__
diff --git a/i386/libsa/string.c b/i386/libsa/string.c
index 0f2c9bc..fcd2b64 100755
--- a/i386/libsa/string.c
+++ b/i386/libsa/string.c
@@ -386,7 +386,7 @@ int strncasecmp(const char *s1, const char *s2, size_t len)
 //==========================================================================
 /* COPYRIGHT NOTICE: checksum8 from AppleSMBIOS */
 
-uint8_t checksum8( void * start, unsigned int length )
+uint8_t checksum8(void * start, unsigned int length)
 {
     uint8_t   csum = 0;
     uint8_t * cp = (uint8_t *) start;
diff --git a/i386/libsa/strtol.c b/i386/libsa/strtol.c
index 7ea6d3b..f6c724f 100755
--- a/i386/libsa/strtol.c
+++ b/i386/libsa/strtol.c
@@ -65,90 +65,123 @@
  *      Removed dependency on _ctype_ by static versions of isupper()...
  *      Added support for "0b101..." binary constants.
  *      Commented out references to errno.
+ * 
+ * Updates:
+ *			- Layout and other readability improvements (PikerAlpha, November 2012).
+ *			- Commented out references to errno removed (PikerAlpha, November 2012).
+ *			- Unused #include libsa.h removed (PikerAlpha, November 2012).
+ *			- Dependancy on <limits.h> removed (PikerAlpha, November 2012).
+ *
  */
  
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtol.c	5.4 (Berkeley) 2/23/91";
-#endif /* LIBC_SCCS and not lint */
 
-#include "libsa.h"
-#include <limits.h>
+#define	LONG_MAX	2147483647L				/* max signed long */
+#define	LONG_MIN	(-2147483647L-1)		/* min signed long */
+
+#define	ULONG_MAX	0xffffffffUL			/* max unsigned long */
+#define	ULLONG_MAX	0xffffffffffffffffULL	/* max unsigned long long */
+
+#define	LLONG_MAX	0x7fffffffffffffffLL	/* max signed long long */
+
+#define	UQUAD_MAX	ULLONG_MAX
+#define	QUAD_MAX	LLONG_MAX
+
+
+//==========================================================================
 
-static inline int
-isupper(char c)
+static inline int isupper(char c)
 {
-    return (c >= 'A' && c <= 'Z');
+	return (c >= 'A' && c <= 'Z');
 }
 
-static inline int
-islower(char c)
+
+//==========================================================================
+
+static inline int islower(char c)
 {
-    return (c >= 'a' && c <= 'z');
+	return (c >= 'a' && c <= 'z');
 }
 
-static inline int
-isalpha(char c)
+
+//==========================================================================
+
+static inline int isalpha(char c)
 {
-    return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'));
+	return ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'));
 }
 
-static inline int
-isspace(char c)
+
+//==========================================================================
+
+static inline int isspace(char c)
 {
-    return (c == ' ' || c == '\t' || c == '\n' || c == '\12');
+	return (c == ' ' || c == '\t' || c == '\n' || c == '\12');
 }
 
-static inline int
-isdigit(char c)
+
+//==========================================================================
+
+static inline int isdigit(char c)
 {
-    return (c >= '0' && c <= '9');
+	return (c >= '0' && c <= '9');
 }
 
 
-/*
+/*==========================================================================
  * Convert a string to a long integer.
  *
  * Ignores `locale' stuff.  Assumes that the upper and lower case
  * alphabets and digits are each contiguous.
  */
-long
-strtol(nptr, endptr, base)
-	const char *nptr;
-	char **endptr;
-	register int base;
+
+long strtol(const char *nptr, char **endptr, register int base)
 {
 	register const char *s = nptr;
-	register unsigned long acc;
+
 	register int c;
-	register unsigned long cutoff;
 	register int neg = 0, any, cutlim;
 
+	register unsigned long acc;
+	register unsigned long cutoff;
+
 	/*
 	 * Skip white space and pick up leading +/- sign if any.
 	 * If base is 0, allow 0x for hex and 0 for octal, else
 	 * assume decimal; if base is already 16, allow 0x.
 	 */
-	do {
+
+	do
+	{
 		c = *s++;
 	} while (isspace(c));
-	if (c == '-') {
+
+	if (c == '-')
+	{
 		neg = 1;
 		c = *s++;
-	} else if (c == '+')
+	}
+	else if (c == '+')
+	{
 		c = *s++;
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X')) {
+	}
+
+	if ((base == 0 || base == 16) && c == '0' && (*s == 'x' || *s == 'X'))
+	{
 		c = s[1];
 		s += 2;
 		base = 16;
-	} else if ((base == 0 || base == 2) &&
-	    c == '0' && (*s == 'b' || *s == 'B')) {
+	}
+	else if ((base == 0 || base == 2) && c == '0' && (*s == 'b' || *s == 'B'))
+	{
 		c = s[1];
 		s += 2;
 		base = 2;
 	}
+
 	if (base == 0)
+	{
 		base = c == '0' ? 8 : 10;
+	}
 
 	/*
 	 * Compute the cutoff value between legal numbers and illegal
@@ -167,175 +200,269 @@ strtol(nptr, endptr, base)
 	 * Set any if any `digits' consumed; make it negative to indicate
 	 * overflow.
 	 */
+
 	cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX;
 	cutlim = cutoff % (unsigned long)base;
 	cutoff /= (unsigned long)base;
-	for (acc = 0, any = 0;; c = *s++) {
+
+	for (acc = 0, any = 0;; c = *s++)
+	{
 		if (isdigit(c))
+		{
 			c -= '0';
+		}
 		else if (isalpha(c))
+		{
 			c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+		}
 		else
+		{
 			break;
+		}
+
 		if (c >= base)
+		{
 			break;
+		}
+
 		if ((any < 0 || acc > cutoff) || (acc == cutoff && c > cutlim))
+		{
 			any = -1;
-		else {
+		}
+		else
+		{
 			any = 1;
 			acc *= base;
 			acc += c;
 		}
 	}
-	if (any < 0) {
+
+	if (any < 0)
+	{
 		acc = neg ? LONG_MIN : LONG_MAX;
-//		errno = ERANGE;
-	} else if (neg)
+	}
+	else if (neg)
+	{
 		acc = -acc;
+	}
+
 	if (endptr != 0)
+	{
 		*endptr = (char *)(any ? s - 1 : nptr);
+	}
+
 	return (acc);
 }
 
 
-/*
+/*==========================================================================
  * Convert a string to an unsigned long integer.
  *
  * Ignores `locale' stuff.  Assumes that the upper and lower case
  * alphabets and digits are each contiguous.
  */
-unsigned long
-strtoul(nptr, endptr, base)
-	const char *nptr;
-	char **endptr;
-	register int base;
+unsigned long strtoul(const char *nptr, char **endptr, register int base)
 {
 	register const char *s = nptr;
-	register unsigned long acc;
+
 	register int c;
-	register unsigned long cutoff;
 	register int neg = 0, any, cutlim;
 
+	register unsigned long acc;
+	register unsigned long cutoff;
+
 	/*
 	 * See strtol for comments as to the logic used.
 	 */
-	do {
+	do
+	{
 		c = *s++;
 	} while (isspace(c));
-	if (c == '-') {
+
+	if (c == '-')
+	{
 		neg = 1;
 		c = *s++;
-	} else if (c == '+')
+	}
+	else if (c == '+')
+	{
 		c = *s++;
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X')) {
+	}
+
+	if ((base == 0 || base == 16) && c == '0' && (*s == 'x' || *s == 'X'))
+	{
 		c = s[1];
 		s += 2;
 		base = 16;
-	} else if ((base == 0 || base == 2) &&
-	    c == '0' && (*s == 'b' || *s == 'B')) {
+	}
+	else if ((base == 0 || base == 2) && c == '0' && (*s == 'b' || *s == 'B'))
+	{
 		c = s[1];
 		s += 2;
 		base = 2;
 	}
+
 	if (base == 0)
+	{
 		base = c == '0' ? 8 : 10;
+	}
+
 	cutoff = (unsigned long)ULONG_MAX / (unsigned long)base;
 	cutlim = (unsigned long)ULONG_MAX % (unsigned long)base;
-	for (acc = 0, any = 0;; c = *s++) {
+
+	for (acc = 0, any = 0;; c = *s++)
+	{
 		if (isdigit(c))
+		{
 			c -= '0';
+		}
 		else if (isalpha(c))
+		{
 			c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+		}
 		else
+		{
 			break;
+		}
+
 		if (c >= base)
+		{
 			break;
+		}
+
 		if ((any < 0 || acc > cutoff) || (acc == cutoff && c > cutlim))
+		{
 			any = -1;
-		else {
+		}
+		else
+		{
 			any = 1;
 			acc *= base;
 			acc += c;
 		}
 	}
-	if (any < 0) {
+
+	if (any < 0)
+	{
 		acc = ULONG_MAX;
-//		errno = ERANGE;
-	} else if (neg)
+	}
+	else if (neg)
+	{
 		acc = -acc;
+	}
+
 	if (endptr != 0)
+	{
 		*endptr = (char *)(any ? s - 1 : nptr);
+	}
+
 	return (acc);
 }
 
-/*
+
+/*==========================================================================
  * Convert a string to an unsigned quad integer.
  *
  * Ignores `locale' stuff.  Assumes that the upper and lower case
  * alphabets and digits are each contiguous.
  */
-unsigned long long
-strtouq(nptr, endptr, base)
-	const char *nptr;
-	char **endptr;
-	register int base;
+
+unsigned long long strtouq(const char *nptr, char **endptr, register int base)
 {
 	register const char *s = nptr;
-	register unsigned long long acc;
+
 	register int c;
-	register unsigned long long qbase, cutoff;
 	register int neg, any, cutlim;
 
+	register unsigned long long acc;
+	register unsigned long long qbase, cutoff;
+
 	/*
 	 * See strtoq for comments as to the logic used.
 	 */
 	s = nptr;
-	do {
+
+	do
+	{
 		c = *s++;
 	} while (isspace(c));
-	if (c == '-') {
+
+	if (c == '-')
+	{
 		neg = 1;
 		c = *s++;
-	} else { 
+	}
+	else
+	{
 		neg = 0;
+
 		if (c == '+')
+		{
 			c = *s++;
+		}
 	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X')) {
+
+	if ((base == 0 || base == 16) && c == '0' && (*s == 'x' || *s == 'X'))
+	{
 		c = s[1];
 		s += 2;
 		base = 16;
 	}
+
 	if (base == 0)
+	{
 		base = c == '0' ? 8 : 10;
+	}
+
 	qbase = (unsigned)base;
 	cutoff = (unsigned long long)UQUAD_MAX / qbase;
 	cutlim = (unsigned long long)UQUAD_MAX % qbase;
-	for (acc = 0, any = 0;; c = *s++) {
+
+	for (acc = 0, any = 0;; c = *s++)
+	{
 		if (isdigit(c))
+		{
 			c -= '0';
+		}
 		else if (isalpha(c))
+		{
 			c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+		}
 		else
+		{
 			break;
+		}
+
 		if (c >= base)
+		{
 			break;
+		}
+
 		if ((any < 0 || acc > cutoff) || (acc == cutoff && c > cutlim))
+		{
 			any = -1;
-		else {
+		}
+		else
+		{
 			any = 1;
 			acc *= qbase;
 			acc += c;
 		}
 	}
-	if (any < 0) {
+
+	if (any < 0)
+	{
 		acc = UQUAD_MAX;
-//		errno = ERANGE;
-	} else if (neg)
+	}
+	else if (neg)
+	{
 		acc = -acc;
+	}
+
 	if (endptr != 0)
+	{
 		*endptr = (char *)(any ? s - 1 : nptr);
+	}
+
 	return (acc);
 }
diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index a89f67f..49c531e 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -38,10 +38,10 @@ INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR)
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-SAIO_OBJS =	table.o asm.o bios.o biosfn.o disk.o sys.o cache.o bootstruct.o \
-		base64.o stringTable.o load.o pci.o allocate.o vbe.o hfs.o \
-		hfs_compare.o xml.o md5c.o device_tree.o cpu.o platform.o \
-		acpi.o smbios.o efi.o console.o 
+SAIO_OBJS =	table.o asm.o bios.o biosfn.o guid.o disk.o sys.o cache.o \
+		bootstruct.o base64.o stringTable.o load.o pci.o allocate.o \
+		vbe.o hfs.o hfs_compare.o xml.o md5c.o device_tree.o cpu.o \
+		platform.o acpi.o smbios.o efi.o console.o 
 
 LIBS = libsaio.a
 
diff --git a/i386/libsaio/base64.c b/i386/libsaio/base64.c
index 197bc77..ea73c2d 100755
--- a/i386/libsaio/base64.c
+++ b/i386/libsaio/base64.c
@@ -14,14 +14,16 @@
  *				- STAND_ALONE check added (PikerAlpha, November 2012)
  *				- Workaround for "___bzero" undefined error in RevoBoot (PikerAlpha, November 2012)
  *				- base64Charset moved to function decodeQuantum (PikerAlpha, November 2012)
- *				- Length and character checking added (PikerAlpha, November 2012)
+ *				- base64 length check and character checking added (PikerAlpha, November 2012)
  *
  */
 
 #ifdef REVOBOOT_VERSION_INFO
-	#define STAND_ALONE			0
+	#define STAND_ALONE				0
+	#define DEBUG_BASE64_DECODE		0
 #else
-	#define STAND_ALONE			1
+	#define STAND_ALONE				1
+	#define DEBUG_BASE64_DECODE		1
 #endif
 
 #if STAND_ALONE
@@ -31,8 +33,6 @@
 	#include "libsaio.h"
 #endif
 
-#define DEBUG_BASE64_DECODE		0
-
 #define FULL_BASE64_DATA_CHECK	0
 
 #if DEBUG_BASE64_DECODE
@@ -67,6 +67,7 @@ char *cleanupBase64Data(char *aDataPtr)
 {
 	int index		= 0;
 #if DEBUG_BASE64_DECODE
+	int i = 0;
 	int junkChars	= 0;
 #endif
 
@@ -88,7 +89,7 @@ char *cleanupBase64Data(char *aDataPtr)
 #if FULL_BASE64_DATA_CHECK
 			/*
 			 * Additional checking is normally not required, but may help people
-			 * getting past messed up plist data fields (think hand editing).
+			 * getting passed messed up plist data fields (think hand editing).
 			 */
 			if (*aDataPtr > 43 && *aDataPtr < 47)		// ,-.
 			{
@@ -148,7 +149,7 @@ char *cleanupBase64Data(char *aDataPtr)
 	
 	length = strlen(cleanedUpData);
 
-	for (int i = 0; i < length; i++)
+	for (i = 0; i < length; i++)
 	{
 		printf("%c", cleanedUpData[i]);
 	}
@@ -163,16 +164,16 @@ char *cleanupBase64Data(char *aDataPtr)
 
 void decodeQuantum(char *input, unsigned char *output)
 {
+	int i = 0;
 	int j = 0;
 #if DEBUG_BASE64_DECODE
 	int found = 0;
 #endif
-	
-	unsigned int x = 0; // We need a 32 bit wide variable for our bit shifting.
-	
+
+	unsigned int x = 0; // We use a 32 bit wide variable for our bit shifting.
 	const char * base64Charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-	
-	for (int i = 0; i < 4; i++)
+
+	for (i = 0; i < 4; i++)
 	{
 		if (input[i] == PADDINGCHAR)
 		{
@@ -189,7 +190,7 @@ void decodeQuantum(char *input, unsigned char *output)
 #endif
 			x = (x << 6) + j;
 		}
-		else // Dig for target character.
+		else // Dig for next valid target character.
 		{
 			for (j = 0; j < TABLELEN; j++)
 			{
@@ -240,11 +241,13 @@ int base64Decode(char *input, unsigned char **decodedData)
 
 			if (buffer)
 			{
+				int i = 0;
+
 				*decodedData = buffer;
 
 				while (bytes < (numQuantums / 3))
 				{
-					for (int i = 0; i < numQuantums; i++)
+					for (i = 0; i < numQuantums; i++)
 					{
 						decodeQuantum(input, buffer);
 #if DEBUG_BASE64_DECODE
@@ -275,10 +278,43 @@ int base64Decode(char *input, unsigned char **decodedData)
 
 #include "efi/essentials.h"
 
+void convertEFIGUIDToString(EFI_GUID const *aGuid, char **aUUIDString)
+{
+	// Do we need to allocate memory?
+	if (*aUUIDString == NULL)
+	{
+		//          1         2         3
+		// 123456789 123456789 123456789 123456
+		// 00000000-0000-0000-0000-000000000000
+		*aUUIDString = (char *)malloc(36);
+	}
+	
+	if (*aUUIDString)
+	{
+		bzero(*aUUIDString, 36);
+		sprintf(*aUUIDString, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
+				aGuid->Data1, /* - */
+				aGuid->Data2, /* - */
+				aGuid->Data3, /* - */
+				aGuid->Data4[0], aGuid->Data4[1], /* - */
+				aGuid->Data4[2], aGuid->Data4[3],
+				aGuid->Data4[4], aGuid->Data4[5],
+				aGuid->Data4[6], aGuid->Data4[7]);
+	}
+}
+
+
+//==============================================================================
+
+#if USE_DEVICE_PATH
 void *getUUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
+#else
+void *getUUIDFromDevicePath(EFI_GUID *aGUID)
+#endif
 {
 	char * uuid = NULL;
 	
+#if USE_DEVICE_PATH
 	if (devicePath != NULL)
 	{
 		while (!IsDevicePathEndType(devicePath) &&
@@ -293,23 +329,16 @@ void *getUUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
 			
 			if (HDDevicePath->SignatureType == SIGNATURE_TYPE_GUID) // 0x02
 			{
-				EFI_GUID * guid = (EFI_GUID*)HDDevicePath->Signature;
+				EFI_GUID * aGUID = (EFI_GUID*)HDDevicePath->Signature;
 				
-				uuid = (void *)malloc(37);
-				
-				// Function efi_guid_unparse_upper() in efi/efi_tables.c
-				sprintf(uuid, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
-						guid->Data1,
-						guid->Data2,
-						guid->Data3,
-						guid->Data4[0], guid->Data4[1],
-						guid->Data4[2], guid->Data4[3],
-						guid->Data4[4], guid->Data4[5],
-						guid->Data4[6], guid->Data4[7]);
+				convertEFIGUIDToString(aGUID, &uuid);
 			}
 		}
 	}
-	
+#else
+	convertEFIGUIDToString(aGUID, &uuid);
+#endif
+
 	return uuid;
 }
 
@@ -319,29 +348,28 @@ void *getUUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
 
 char * getStartupDiskUUID(char * aDataPtr)
 {
-	char * targetDiskUUID = NULL;
-	
+	char * startupDiskUUID = NULL;
+
 	unsigned char * decodedData = NULL;
-	
+
 	int rc = base64Decode(aDataPtr, &decodedData);
-	
+
 	if ((rc == 75) && (decodedData != NULL))
 	{
+#if USE_DEVICE_PATH
 		EFI_DEVICE_PATH_PROTOCOL * dp = (EFI_DEVICE_PATH_PROTOCOL *) decodedData;
-			
-		char * uuid = getUUIDFromDevicePath(dp);
-			
-		if (uuid)
-		{
-			targetDiskUUID = uuid;
-		}
-			
-		dp = NULL;
+
+		startupDiskUUID = getUUIDFromDevicePath(dp);
+#else
+		EFI_GUID * guid = (EFI_GUID *) (decodedData + 52);
+
+		convertEFIGUIDToString(guid, &startupDiskUUID);
+#endif
 	}
-		
+
 	free(decodedData);
-	
-	return targetDiskUUID;
+
+	return startupDiskUUID;
 }
 
 //==============================================================================
diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index 2a077f8..5567853 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -50,6 +50,7 @@
  *			- Renamed LION_FILEVAULT_SUPPORT to CORE_STARAGE_SUPPORT (PikerAlpha, November 2012).
  *			- Renamed encryptedBootPartition to coreStoragePartition (PikerAlpha, November 2012).
  *			- OSBigEndian removed and some minor style nits (PikerAlpha, November 2012).
+ *			- Unused #include <limits.h> removed (PikerAlpha, November 2012).
  *
  */
 
@@ -58,8 +59,6 @@
 #include "fdisk.h"
 #include "hfs.h"
 
-#include <limits.h>
-
 
 #define DPISTRLEN	32 // Defined in: IOKit/storage/IOApplePartitionScheme.h
 
@@ -571,9 +570,9 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 										BVRef bvr = NULL;
 										int bvrFlags = -1;
 #if DEBUG_DISK
-										char stringuuid[100];
-										convertEFIGUIDToString((EFI_GUID*)gptMap->ent_type, stringuuid);
-										printf("Reading GPT partition %d, type %s\n", gptID, stringuuid);
+										char uuidString = NULL;
+										convertEFIGUIDToString((EFI_GUID*)gptMap->ent_type, &uuidString);
+										printf("Reading GPT partition %d, type %s\n", gptID, uuidString);
 										sleep(1);
 #endif
 
diff --git a/i386/libsaio/efi/essentials.h b/i386/libsaio/efi/essentials.h
index 9ab523c..a2ff079 100755
--- a/i386/libsaio/efi/essentials.h
+++ b/i386/libsaio/efi/essentials.h
@@ -25,16 +25,19 @@
  * All rights reserved.
  *
  * Updates:
- *		- Stand alone support for base64.c added (PikerAlpha, November 2012)
+ *			- Stand alone support for base64.c added (PikerAlpha, November 2012).
+ *
  */
 
 #ifndef __LIBSAIO_EFI_ESSENTIALS_H
 #define __LIBSAIO_EFI_ESSENTIALS_H
 
+
 #ifdef TARGET_MODEL
 	#include "../boot2/debug.h"
 #endif
 
+
 typedef void      VOID;
 
 typedef uint32_t  EFI_STATUS;
@@ -208,4 +211,3 @@ typedef struct
 #define NextDevicePathNode(a)			( (EFI_DEVICE_PATH_PROTOCOL *) ( ((EFI_INT8 *) (a)) + DevicePathNodeLength(a)))
 
 #endif /* !__LIBSAIO_EFI_ESSENTIALS_H */
-
diff --git a/i386/libsaio/efi/fake_efi.h b/i386/libsaio/efi/fake_efi.h
index f6b86af..2f4ea76 100755
--- a/i386/libsaio/efi/fake_efi.h
+++ b/i386/libsaio/efi/fake_efi.h
@@ -29,12 +29,11 @@
  *
  * Updates:
  *		- Check malloc return (PikerAlpha, November 2012).
- *		- Renamed efi_guid_unparse_upper to convertEFIGUIDToString (PikerAlpha, November 2012).
  *
  */
 
-#include "bootstruct.h"							// For bootArgs.
-#include "efi_tables.h"
+#include "bootstruct.h"		// For bootArgs.
+
 
 //------------------------------------------------------------------------------
 
@@ -58,14 +57,14 @@ static EFI_UINT32 const FIRMWARE_REVISION = EFI_SYSTEM_TABLE_REVISION;
 //==============================================================================
 // Utility function to make a device tree string from an EFI_GUID
 
-static inline char * mallocStringForGuid(EFI_GUID const *pGuid)
+static inline char * mallocStringForGuid(EFI_GUID const *aGuid)
 {
-	char *string = malloc(37);
+	char *string = NULL;
+
+	convertEFIGUIDToString(aGuid, &string);
 
 	if (string)
 	{
-		convertEFIGUIDToString(pGuid, string);
-
 		return string;
 	}
 
diff --git a/i386/libsaio/guid.c b/i386/libsaio/guid.c
new file mode 100755
index 0000000..3ac4ed8
--- /dev/null
+++ b/i386/libsaio/guid.c
@@ -0,0 +1,151 @@
+
+
+#include "libsaio.h"
+
+#include "efi/essentials.h"
+#include "efi/efi.h"
+
+
+//==========================================================================
+// Used in RevoBoot/i386/libsaio/disk.c
+
+void convertEFIGUIDToString(EFI_GUID const *aGuid, char **aUUIDString)
+{
+	// Do we need to allocate memory?
+	if (*aUUIDString == NULL)
+	{
+		//          1         2         3
+		// 123456789 123456789 123456789 123456
+		// 00000000-0000-0000-0000-000000000000
+		*aUUIDString = (char *)malloc(36);
+	}
+
+	if (*aUUIDString)
+	{
+		bzero(*aUUIDString, 36);
+		sprintf(*aUUIDString, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
+				aGuid->Data1, /* - */
+				aGuid->Data2, /* - */
+				aGuid->Data3, /* - */
+				aGuid->Data4[0], aGuid->Data4[1], /* - */
+				aGuid->Data4[2], aGuid->Data4[3],
+				aGuid->Data4[4], aGuid->Data4[5],
+				aGuid->Data4[6], aGuid->Data4[7]);
+	}
+}
+
+
+//==========================================================================
+// Used in RevoBoot/i386/libsaio/disk.c
+
+bool isEFIGUIDNull(EFI_GUID const *aGuid)
+{
+	if (aGuid->Data1 == 0 && aGuid->Data2 == 0 && aGuid->Data3 == 0)
+	{
+		int i = 0;
+
+		for (i = 0; i < 8; ++i)
+		{
+			if (aGuid->Data4[i] != 0)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+
+//=========================================================================
+// Used in RevoBoot/i386/libsaio/disk.c
+
+int compareEFIGUID(EFI_GUID const *aSourceGuid, EFI_GUID const *aCompareGuid)
+{
+	if (aSourceGuid->Data1 == aCompareGuid->Data1) // Comparing two EFI_UINT32's
+	{
+		if (aSourceGuid->Data2 == aCompareGuid->Data2) // Comparing two EFI_UINT16's
+		{
+			if (aSourceGuid->Data3 == aCompareGuid->Data3) // Comparing two EFI_UINT16's
+			{
+				// Returns 0 when equal or -1 when not
+				return memcmp((const void *)aSourceGuid->Data4, (const void *)aSourceGuid->Data4, 8);
+			}
+		}
+	}
+
+	return -1;
+}
+
+
+#if STARTUP_DISK_SUPPORT
+//=========================================================================
+// Helper function for getStartupDiskUUID()
+
+#if USE_DEVICE_PATH
+void *getUUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath)
+#else
+void *getUUIDFromDevicePath(EFI_GUID *aGUID)
+#endif
+{
+	char * uuid = NULL;
+
+#if USE_DEVICE_PATH
+	if (devicePath != NULL)
+	{
+		while (!IsDevicePathEndType(devicePath) &&
+			   !(DevicePathType(devicePath) == MEDIA_DEVICE_PATH && DevicePathSubType(devicePath) == MEDIA_HARDDRIVE_DP))
+		{
+			devicePath = NextDevicePathNode(devicePath);
+		}
+		
+		if (DevicePathType(devicePath) == MEDIA_DEVICE_PATH && DevicePathSubType(devicePath) == MEDIA_HARDDRIVE_DP)
+		{
+			HARDDRIVE_DEVICE_PATH * HDDevicePath = (HARDDRIVE_DEVICE_PATH *) devicePath;
+			
+			if (HDDevicePath->SignatureType == SIGNATURE_TYPE_GUID) // 0x02
+			{
+				EFI_GUID const * aGUID = (EFI_GUID*)HDDevicePath->Signature;
+				
+				convertEFIGUIDToString(aGUID, &uuid);
+			}
+		}
+	}
+#else
+	convertEFIGUIDToString(aGUID, &uuid);
+#endif
+
+	return uuid;
+}
+
+
+//==============================================================================
+// Used in RevoBoot/i386/boot2/boot.c
+
+char * getStartupDiskUUID(char * aDataPtr)
+{
+	char * startupDiskUUID = NULL;
+
+	unsigned char * decodedData = NULL;
+
+	int rc = base64Decode(aDataPtr, &decodedData);
+
+	if ((rc == 75) && (decodedData != NULL))
+	{
+#if USE_DEVICE_PATH
+		EFI_DEVICE_PATH_PROTOCOL * dp = (EFI_DEVICE_PATH_PROTOCOL *) decodedData;
+		
+		startupDiskUUID = getUUIDFromDevicePath(dp);
+#else
+		EFI_GUID * uuid = (EFI_GUID *) (decodedData + 52);
+		
+		convertEFIGUIDToString(uuid, &startupDiskUUID);
+#endif
+		free(decodedData);
+	}
+
+	return startupDiskUUID;
+}
+#endif // #if DISK_TARGET_SUPPORT
diff --git a/i386/libsaio/hfs.c b/i386/libsaio/hfs.c
index 8a94a5d..b04f54e 100755
--- a/i386/libsaio/hfs.c
+++ b/i386/libsaio/hfs.c
@@ -113,7 +113,7 @@ static void SwapFinderInfo(FndrFileInfo *dst, FndrFileInfo *src)
 
 void HFSFree(CICell ih)
 {
-	if(gCurrentIH == ih)
+	if (gCurrentIH == ih)
 	{
 		gCurrentIH = 0;
 	}
diff --git a/i386/libsaio/libsaio.h b/i386/libsaio/libsaio.h
index bfe2c0e..ede89d6 100755
--- a/i386/libsaio/libsaio.h
+++ b/i386/libsaio/libsaio.h
@@ -22,7 +22,7 @@
  * @APPLE_LICENSE_HEADER_END@
  *
  * Updates:
- *  		- STATE_SUCCESS	moved from boot.h (PikerAlpha, November 2012)
+ *			- STATE_SUCCESS	moved from boot.h (PikerAlpha, November 2012)
  *
  */
 
diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index c5553e6..8766f89 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -23,7 +23,7 @@
  *
  * Updates:
  *
- *    	- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
+ *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
  *			- Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
  *
  */
@@ -118,10 +118,16 @@ extern int		testFAT32EFIBootSector(int biosdev, unsigned int secno, void * buffe
 
 
 /* guid.c */
-extern			void convertEFIGUIDToString(EFI_GUID const *aGuid, char *out);
+extern			void convertEFIGUIDToString(EFI_GUID const *aGuid, char **aUUIDString);
 extern			bool isEFIGUIDNull(EFI_GUID const *aGuid);
 extern			int compareEFIGUID(EFI_GUID const *pG1, EFI_GUID const *pG2);
-extern			char *getUUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath);
+
+#if USE_DEVICE_PATH
+void *getUUIDFromDevicePath(EFI_DEVICE_PATH_PROTOCOL *devicePath);
+#else
+void *getUUIDFromDevicePath(EFI_GUID *aGUID);
+#endif
+
 extern			char * getStartupDiskUUID(char * aDataPtr);
 
 
diff --git a/i386/libsaio/vbe.c b/i386/libsaio/vbe.c
index f59f419..713e301 100755
--- a/i386/libsaio/vbe.c
+++ b/i386/libsaio/vbe.c
@@ -43,6 +43,7 @@ static inline void outi(int port, int index, int val)
 
 
 //==============================================================================
+
 static inline void outib(int port, int index, int val)
 {
     outb (port, index);

From 050c042077d1eeb9a7c73f12e3de88414ed211a8 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 27 Nov 2012 15:46:37 +0100
Subject: [PATCH 200/623] Last minute change

---
 i386/config/settings-template.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 8e4f166..e2555d9 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Master Chief. All rights reserved.
  *
- * Note: This is an essential part of the build process for RevoBoot v1.5.35 and greater.
+ * Note: This is an essential part of the build process for RevoBoot v1.5.37 and greater.
  *
  * Updates:
  *
@@ -29,6 +29,8 @@
  *			- Option SET_MAX_STRUCTURE_LENGTH added (PikerAlpha, November 2012).
  *			- Option DISK_TARGET_SUPPORT added (PikerAlpha, November 2012).
  *			- DISK_TARGET_SUPPORT renamed to STARTUP_DISK_SUPPORT (PikerAlpha, November 2012).
+ *			- New compiler directive USE_DEVICE_PATH in boot section (PikerAlpha, November 2012).
+ *
  */
 
 
@@ -213,6 +215,13 @@
 
 #define STARTUP_DISK_SUPPORT				0	// Set to 0 by default. Change this to 1 for System Preference/Startup Disk support.
 
+#if STARTUP_DISK_SUPPORT
+	#define USE_DEVICE_PATH					0	// Set to 0 by default. Change this to 1 when the Startup Disk feature fails to work.
+												//
+												// Note:	This experimental switch will be removed in a next update/release. It is here
+												//			only to give us feedback for a future release of RevoBoot.
+#endif
+
 #define DEBUG_BOOT							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
 

From 4f5593bf38753dc43f0278a2d253d604c796629c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:27:34 +0100
Subject: [PATCH 201/623] Print partition GUID instead of type GUID

Documentation added about struct gpt_hdr and struct gpt_ent
---
 i386/libsaio/disk.c | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index 5567853..839c372 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -64,7 +64,39 @@
 
 #include <IOKit/storage/IOGUIDPartitionScheme.h>
 
+/* Partition map from: IOGUIDPartitionScheme.h
+struct gpt_hdr
+{
+    uint8_t  hdr_sig[8];
+    uint32_t hdr_revision;
+    uint32_t hdr_size;
+    uint32_t hdr_crc_self;
+    uint32_t __reserved;
+    uint64_t hdr_lba_self;
+    uint64_t hdr_lba_alt;
+    uint64_t hdr_lba_start;
+    uint64_t hdr_lba_end;
+    uuid_t   hdr_uuid;
+    uint64_t hdr_lba_table;
+    uint32_t hdr_entries;
+    uint32_t hdr_entsz;
+    uint32_t hdr_crc_table;
+    uint32_t padding;
+}; */
+
 typedef struct gpt_hdr gpt_hdr;
+
+/* Partition map entry from: IOGUIDPartitionScheme.h
+struct gpt_ent
+{
+    uuid_t   ent_type;
+    uuid_t   ent_uuid;
+    uint64_t ent_lba_start;
+    uint64_t ent_lba_end;
+    uint64_t ent_attr;
+    uint16_t ent_name[36];
+}; */
+
 typedef struct gpt_ent gpt_ent;
 
 
@@ -560,7 +592,6 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 #if CORE_STORAGE_SUPPORT
 								bool coreStoragePartition = false;
 #endif
-
 								for (; gptID <= gptCount; gptID++)
 								{
 									gptMap = (gpt_ent *) (buffer + ((gptID - 1) * gptSize));
@@ -570,9 +601,9 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 										BVRef bvr = NULL;
 										int bvrFlags = -1;
 #if DEBUG_DISK
-										char uuidString = NULL;
-										convertEFIGUIDToString((EFI_GUID*)gptMap->ent_type, &uuidString);
-										printf("Reading GPT partition %d, type %s\n", gptID, uuidString);
+										char *uuidString = NULL;
+										convertEFIGUIDToString((EFI_GUID*)gptMap->ent_uuid, &uuidString);
+										printf("Partition[%d] UUID: %s\n", gptID, uuidString);
 										sleep(1);
 #endif
 

From 7e63b9c02b72c42350a691ddb1c3d1be2135200e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:30:37 +0100
Subject: [PATCH 202/623] Fix for broken release-date format

release-data should be <"01/24/2012"> and not <30 31 ...>
---
 i386/libsaio/smbios/getters.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/getters.h b/i386/libsaio/smbios/getters.h
index 54aade3..6ec296b 100755
--- a/i386/libsaio/smbios/getters.h
+++ b/i386/libsaio/smbios/getters.h
@@ -182,7 +182,9 @@ static SMBWord getRAMSize(void)
 
 static SMBByte getRAMType(void)
 {
+#if (DEBUG_SMBIOS == 2)
 	_SMBIOS_DEBUG_DUMP("In getRAMType() = %s\n", SMBMemoryDeviceTypes[DYNAMIC_RAM_OVERRIDE_TYPE]);
+#endif
 
 	return DYNAMIC_RAM_OVERRIDE_TYPE;
 }
@@ -309,6 +311,7 @@ static const char * getBIOSDate(void)
 	size_t len = strlen(smbBIOSVersion);
 
 	char biosDate[len];
+	bzero(biosDate, len);
 
 	strncpy(biosDate,		smbBIOSVersion + (len -  8), 2);
 	strncpy(biosDate + 2,	"/", 1);
@@ -316,7 +319,7 @@ static const char * getBIOSDate(void)
 	strncpy(biosDate + 5,	"/20", 3);
 	strncpy(biosDate + 8,	smbBIOSVersion + (len -  10), 2);
 
-	biosDate[10] = 0;
+	// biosDate[10] = 0;
 
 	_SMBIOS_DEBUG_DUMP("biosData = %s\n", biosDate);
 	_SMBIOS_DEBUG_SLEEP(5);

From 6a435b71c04ac536e32d2f0da4571fcedab8b406 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:34:56 +0100
Subject: [PATCH 203/623] Fix struct SMBOemStrings

The next update of RevoBoot will add two SMBIOS table entries so that
AppleSMBIOS.kext can do its job (by adding platform-feature and
apple-rom-info).
---
 i386/libsaio/smbios/smbios.h | 43 +++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/i386/libsaio/smbios/smbios.h b/i386/libsaio/smbios/smbios.h
index 121f433..c146474 100755
--- a/i386/libsaio/smbios/smbios.h
+++ b/i386/libsaio/smbios/smbios.h
@@ -98,6 +98,7 @@ enum {
     kSMBTypePhysicalMemoryArray         = 16,
     kSMBTypeMemoryDevice                = 17,
     kSMBType32BitMemoryErrorInfo        = 18,
+    kSMBTypeMemoryArrayMappedAddress	= 19,
     kSMBType64BitMemoryErrorInfo        = 33,
 
     kSMBTypeEndOfTable                  = 127,
@@ -107,8 +108,9 @@ enum {
     kSMBTypeMemorySPD                   = 130,
     kSMBTypeOemProcessorType            = 131,
     kSMBTypeOemProcessorBusSpeed        = 132,
+	kSMBTypeOemPlatformFeature          = 133,
 
-	// Structures dropped by Revolution.
+	// Structures dropped by RevoBoot.
 	kSMBUnused							= 255
 };
 
@@ -306,13 +308,12 @@ typedef struct SMBSystemSlot
 //
 // OEM Strings - Type 11 (AppleSMBIOS-43)
 //
+// Note: Used to add IODeviceTree:/rom@0/apple-rom-version (Data)
+//
 
 typedef struct SMBOemStrings
 {
-    SMB_STRUCT_HEADER
-    SMBByte     type;
-    SMBByte     length;
-    SMBWord     handle;
+    SMB_STRUCT_HEADER               // Length is a fixed value (5)
     SMBByte     count;
 } __attribute__((packed)) SMBOemStrings;
 
@@ -385,6 +386,26 @@ typedef struct SMBMemoryDevice
     SMBByte    attributes;
 } __attribute__((packed)) SMBMemoryDevice;
 
+///
+/// Memory Array Mapped Address (Type 19).
+///
+/// This structure provides the address mapping for a Physical Memory Array.
+/// One structure is present for each contiguous address range described.
+///
+typedef struct SMBMemoryArrayMappedAddress
+{
+	SMB_STRUCT_HEADER				// Type 19
+	SMBDWord	StartingAddress;
+	SMBDWord	EndingAddress;
+	SMBWord		MemoryArrayHandle;
+	SMBByte		PartitionWidth;
+	//
+	// Added for SMBIOS v2.7
+	//
+	// SMBQWord	ExtendedStartingAddress;
+	// SMBQWord	ExtendedEndingAddress;
+} __attribute__((packed))  SMBMemoryArrayMappedAddress;
+
 //
 // Firmware Volume Description (Apple Specific - Type 128)
 //
@@ -409,7 +430,7 @@ typedef struct FW_REGION_INFO
 
 typedef struct SMBFirmwareVolume
 {
-    SMB_STRUCT_HEADER               // Type 128
+    SMB_STRUCT_HEADER               // Type 0x80/128
     SMBByte           RegionCount;
     SMBByte           Reserved[3];
     SMBDWord          FirmwareFeatures;
@@ -424,7 +445,7 @@ typedef struct SMBFirmwareVolume
 
 typedef struct SMBMemorySPD
 {
-	SMB_STRUCT_HEADER               // Type 130
+	SMB_STRUCT_HEADER               // Type 0x82/130
 	SMBWord           Type17Handle;
 	SMBWord           Offset;
 	SMBWord           Size;
@@ -432,7 +453,7 @@ typedef struct SMBMemorySPD
 } __attribute__((packed)) SMBMemorySPD;
 
 
-#if DEBUG_SMBIOS
+#if (DEBUG_SMBIOS == 4)
 static const char * SMBMemoryDeviceTypes[] =
 {
     "RAM",          /* 00h  Undefined */
@@ -467,7 +488,7 @@ static const int kSMBMemoryDeviceTypeCount = sizeof(SMBMemoryDeviceTypes) / size
 
 
 //
-// OEM Processor Type (Apple Specific - Type 131)
+// OEM Processor Type (Apple Specific - Type 0x83/131)
 //
 
 struct SMBOemProcessorType
@@ -478,7 +499,7 @@ struct SMBOemProcessorType
 
 
 //
-// OEM Processor Bus Speed (Apple Specific - Type 132)
+// OEM Processor Bus Speed (Apple Specific - Type 0x84/132)
 //
 struct SMBOemProcessorBusSpeed
 {
@@ -488,7 +509,7 @@ struct SMBOemProcessorBusSpeed
 
 
 //
-// OEM Platform Feature (Apple Specific - Type 133 / AppleSMBIOS-43)
+// OEM Platform Feature (Apple Specific - Type 0x85/133 / AppleSMBIOS-43)
 //
 struct SMBOemPlatformFeature
 {

From 8ba09a448db6027ab08b1473ca07206c32bdccff Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:35:52 +0100
Subject: [PATCH 204/623] Device path can be an URL

NetBoot preparations
---
 i386/libsaio/efi/essentials.h | 66 ++++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/efi/essentials.h b/i386/libsaio/efi/essentials.h
index a2ff079..e82986f 100755
--- a/i386/libsaio/efi/essentials.h
+++ b/i386/libsaio/efi/essentials.h
@@ -192,7 +192,71 @@ typedef struct
 } HARDDRIVE_DEVICE_PATH;
 
 
-// Stuff from EDK2's EfiDevicePath.h
+/*
+ * Stuff from EDK2's EfiDevicePath.h
+ */
+
+//
+// Networking Definitions
+//
+
+typedef struct
+{
+	EFI_UINT8 Addr[4];
+} EFI_IPv4_ADDRESS;
+
+typedef struct
+{
+	EFI_UINT8 Addr[16];
+} EFI_IPv6_ADDRESS;
+
+typedef struct
+{
+	EFI_UINT8 Addr[32];
+} EFI_MAC_ADDRESS;
+
+typedef struct
+{
+	EFI_DEVICE_PATH_PROTOCOL		Header;
+	EFI_UINT16						HBAPortNumber;
+	EFI_UINT16						PortMultiplierPortNumber;
+	EFI_UINT16						Lun;
+} SATA_DEVICE_PATH;
+
+typedef struct
+{
+	EFI_DEVICE_PATH_PROTOCOL		Header;
+	EFI_MAC_ADDRESS					MacAddress;
+	EFI_UINT8						IfType;
+} MAC_ADDR_DEVICE_PATH;
+
+typedef struct
+{
+	EFI_DEVICE_PATH_PROTOCOL		Header;
+	EFI_IPv4_ADDRESS				LocalIpAddress;
+	EFI_IPv4_ADDRESS				RemoteIpAddress;
+	EFI_UINT16						LocalPort;
+	EFI_UINT16						RemotePort;
+	EFI_UINT16						Protocol;
+	EFI_BOOLEAN						StaticIpAddress;
+} IPv4_DEVICE_PATH;
+
+typedef struct
+{
+	EFI_DEVICE_PATH_PROTOCOL		Header;
+	EFI_IPv6_ADDRESS				LocalIpAddress;
+	EFI_IPv6_ADDRESS				RemoteIpAddress;
+	EFI_UINT16						LocalPort;
+	EFI_UINT16						RemotePort;
+	EFI_UINT16						Protocol;
+	EFI_BOOLEAN						StaticIpAddress;
+} IPv6_DEVICE_PATH;
+
+
+#define MSG_SATA_DP						0x12
+#define MSG_MAC_ADDR_DP					0x0b
+#define MSG_IPv4_DP						0x0c
+#define MSG_IPv6_DP						0x0d
 
 #define MEDIA_HARDDRIVE_DP				0x01
 #define MEDIA_DEVICE_PATH				0x04

From 8c1e4533d5ee059e5d8b26d0b6ede181d46cfe1e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:36:35 +0100
Subject: [PATCH 205/623] NetBoot example added

---
 i386/libsaio/base64.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/base64.c b/i386/libsaio/base64.c
index ea73c2d..2ffd0b6 100755
--- a/i386/libsaio/base64.c
+++ b/i386/libsaio/base64.c
@@ -384,10 +384,20 @@ int main(void)
 						2MBFLuNx23AZ7tXoCAn//BAA=";
 
 	// 02 01 0c 00 d0 41 03 0a 00 00 00 00
-	// 01 01 06 00 02 1f 03 12 0a 00 02 00 00 00 00 00
+	// 01 01 06 00 02 1f
+	// 03 12 0a 00 02 00 00 00 00 00
 	// 04 01 2a 00 02 00 00 00 28 40 06 00 00 00 00 00 40 4b 29 25 00 00 00 00 da e8 91 de b6 30 11 4b b8 dc 76 dc 06 7b b5 7a 02 02
 	// 7f ff 04 00
 
+	// 02 01 0c 00 d0 41 03 0a 00 00 00 00
+	// 01 01 06 00 00 19
+	// 03 0b 25 00 c8 2a 14 01 02 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+	// 03 0c 13 00 00 00 00 00 c0 a8 c0 01 00 00 00 00 00 00 00
+	// 7f ff 04 00
+    //
+	// c8 2a 14 01 02 03	= Mac Address (example)
+	// c0 a8 c0 01			= IP address 192.168.192.1 (example)
+
 	char * uuid = getStartupDiskUUID(input);
 
 	if (uuid)

From ab2b1f26be15bbad248ac95cc31d36786a9cdf70 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:38:27 +0100
Subject: [PATCH 206/623] Cleanup STARTUP_DISK_SUPPORT support

Adding checks, comments and (changed) debug output.
---
 i386/boot2/boot.c | 50 +++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 6864f60..832bb74 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -211,38 +211,42 @@ void boot(int biosdev)
 
 #if (LOAD_MODEL_SPECIFIC_EFI_DATA == 0)
 	/*
-	 * We can only make this call here when static EFI is included from
-	 * RevoBoot/i386/config/EFI/[MacModelNN.h] Not when the data is read
-	 * from: /Extra/ because then: RevoBoot/i386/libsaio/platform.c calls it.
+	 * We can only make this call here when static EFI is included from:
+	 * RevoBoot/i386/config/EFI/[MacModelNN.h] Not when the data is read from:
+	 * /Extra/EFI/ because then RevoBoot/i386/libsaio/platform.c makes the call.
 	 */
 	initPartitionChain();
 #endif
 
 #if STARTUP_DISK_SUPPORT
-	/*
-	 * sudo nano /etc/rc.shutdown.local
-	 * #!/bin/sh
-	 * /usr/sbin/nvram -x -p > /Extra/NVRAM/nvramStorage.plist
-	 */
-	config_file_t	nvramStorage;
-	const char * path = "/Extra/NVRAM/nvramStorage.plist";
-	
-	if (loadConfigFile(path, &nvramStorage) == STATE_SUCCESS)
+	// Booting from a Recovery HD ignores the Startup Disk setting (as it should).
+	if (gPlatform.BootRecoveryHD == false)
 	{
-		_BOOT_DEBUG_DUMP("nvramStorage.plist found\n");
-
-		if (getValueForConfigTableKey(&nvramStorage, "efi-boot-device-data", &val, &length))
+		/*
+		 * sudo nano /etc/rc.shutdown.local
+		 * #!/bin/sh
+		 * /usr/sbin/nvram -x -p > /Extra/NVRAM/nvramStorage.plist
+		 */
+		config_file_t	nvramStorage;
+		const char * path = "/Extra/NVRAM/nvramStorage.plist";
+	
+		if (loadConfigFile(path, &nvramStorage) == STATE_SUCCESS)
 		{
-			_BOOT_DEBUG_DUMP("Key 'efi-boot-device-data' found %d\n", length);
-
-			char * uuid = getStartupDiskUUID((char *)val);
+			_BOOT_DEBUG_DUMP("nvramStorage.plist found\n");
 
-			if (uuid)
+			if (getValueForConfigTableKey(&nvramStorage, "efi-boot-device-data", &val, &length))
 			{
-				_BOOT_DEBUG_DUMP("GUID: %s\n", uuid);
-				_BOOT_DEBUG_SLEEP(1);
+				_BOOT_DEBUG_DUMP("Key 'efi-boot-device-data' found %d\n", length);
+
+				char * uuid = getStartupDiskUUID((char *)val);
 
-				strlcpy(rootUUID, uuid, 37);
+				if (uuid)
+				{
+					_BOOT_DEBUG_DUMP("GUID: %s\n", uuid);
+					_BOOT_DEBUG_SLEEP(1);
+
+					strlcpy(rootUUID, uuid, 37);
+				}
 			}
 		}
 	}
@@ -250,7 +254,7 @@ void boot(int biosdev)
 	{
 		_BOOT_DEBUG_DUMP("Warning: unable to locate nvramStorage.plist\n");
 	}
-#endif // #if DISK_TARGET_SUPPORT
+#endif // #if STARTUP_DISK_SUPPORT
 
 	#define loadCABootPlist() loadSystemConfig(&bootInfo->bootConfig)
 

From e98115f16aa5181de8887fc95921fd0cb87180ab Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:38:45 +0100
Subject: [PATCH 207/623] Follow ACPI specs

---
 i386/libsaio/acpi/patcher.h | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index acc9233..72f9dc0 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -284,10 +284,22 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 #if STATIC_FACS_TABLE_INJECTION
 	// Replace the factory FACS table.
 	_ACPI_DEBUG_DUMP("patchedFADT->FIRMWARE_CTRL: 0x%08x\n", patchedFADT->FIRMWARE_CTRL);
-		
-	patchedFADT->FIRMWARE_CTRL = (uint32_t)customTables[FACS].tableAddress;
-	// Zero out this field conform the ACPI specification.
-	patchedFADT->X_FIRMWARE_CTRL = (uint64_t) 0;
+
+	/*
+	 * factoryFADT->FIRMWARE_CTRL is usually non zero on systems with less than 4GB.
+	 */
+	if (factoryFADT->FIRMWARE_CTRL > 0)
+	{
+		// In which case we must use this value
+		patchedFADT->FIRMWARE_CTRL = (uint32_t) customTables[FACS].tableAddress;
+		// And we must zero out this field (conform the ACPI specification).
+		patchedFADT->X_FIRMWARE_CTRL = (uint64_t) 0;
+	}
+	else
+	{
+		patchedFADT->FIRMWARE_CTRL = (uint32_t) 0;
+		patchedFADT->X_FIRMWARE_CTRL = (uint64_t) customTables[FACS].tableAddress;
+	}
 
 	customTables[FACS].table = NULL;
 #endif	// STATIC_FACS_TABLE_INJECTION

From 61482f57b8d5a79f31f613ab705157b2695c5be6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:39:05 +0100
Subject: [PATCH 208/623] Relaxing debug delays

---
 i386/libsaio/platform.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 5de5caa..fb970fe 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -276,9 +276,10 @@ void initPlatform(int biosDevice)
 	}
 
 	_PLATFORM_DEBUG_DUMP("Static data for %d RAM BANKS used.\n", gPlatform.RAM.SlotCount);
+	_PLATFORM_DEBUG_SLEEP(10);
 #endif
 
-	_PLATFORM_DEBUG_SLEEP(15);
+	_PLATFORM_DEBUG_SLEEP(5);
 
 	initKernelBootConfig();
 

From b5aabb7bdaa82d9334dbc451c15ae70babb1f84f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:46:21 +0100
Subject: [PATCH 209/623] SMBIOS update

We can now use a double -1 value for SMBProperties[x].start and
SMBProperties[x].stop to signal that there isn;'t anything we like to
add/override, but the complete structure from the factory table is
copied.

The memory overrides are expanded. Notably the error handle feature.

We now add a type 11 (kSMBTypeOemPlatformFeature) table so that
AppleSMBIOS.kext can use this data and add IOService:/platform-feature.
---
 i386/libsaio/smbios/dynamic_data.h | 93 +++++++++++++++++++++---------
 1 file changed, 66 insertions(+), 27 deletions(-)

diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 9f9bff6..f23be7d 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -53,6 +53,8 @@
 	#define PROBOARD	0
 #endif
 
+#define IOSERVICE_PLATFORM_FEATURE	0x0000000000000001
+
 //------------------------------------------------------------------------------
 
 struct SMBStructure
@@ -69,24 +71,26 @@ struct SMBStructure
 
 struct SMBStructure requiredStructures[] =
 {
-	{ kSMBTypeBIOSInformation		/*   0 */ ,	 0,					5,					false,	0	},
-	{ kSMBTypeSystemInformation		/*   1 */ ,	 6,					10,					false,	0	},
-	{ kSMBTypeBaseBoard				/*   2 */ ,	(11 + PROBOARD),	(12 + PROBOARD),	false,	0	},
-	{ kSMBUnused					/*   3 */ ,	 0,					0,					false,	0	},
-	{ kSMBTypeProcessorInformation	/*   4 */ ,	(13 + PROBOARD),	(14 + PROBOARD),	true,	0	},
-	{ kSMBUnused					/*   5 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*   6 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*   7 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*   8 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*   9 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*  10 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*  11 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*  12 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*  13 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*  14 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*  15 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused					/*  16 */ ,	 0,					0,					false,	0	},
-	{ kSMBTypeMemoryDevice			/*  17 */ ,	(15 + PROBOARD),	(19 + PROBOARD),	true,	0	}
+	{ kSMBTypeBIOSInformation			/*   0 */ ,	 0,					5,					false,	0	},
+	{ kSMBTypeSystemInformation			/*   1 */ ,	 6,					10,					false,	0	},
+	{ kSMBTypeBaseBoard					/*   2 */ ,	(11 + PROBOARD),	(12 + PROBOARD),	false,	0	},
+	{ kSMBUnused						/*   3 */ ,	 0,					0,					false,	0	},
+	{ kSMBTypeProcessorInformation		/*   4 */ ,	(13 + PROBOARD),	(14 + PROBOARD),	true,	0	},
+	{ kSMBUnused						/*   5 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*   6 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*   7 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*   8 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*   9 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*  10 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*  11 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*  12 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*  13 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*  14 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*  15 */ ,	 0,					0,					false,	0	},
+	{ kSMBUnused						/*  16 */ ,	 0,					0,					false,	0	},
+	{ kSMBTypeMemoryDevice				/*  17 */ ,	(15 + PROBOARD),	(20 + PROBOARD),	true,	0	},
+	{ kSMBUnused						/*  18 */ ,	 0,					0,					false,	0	},
+	{ kSMBTypeMemoryArrayMappedAddress	/*	19 */ ,	 -1,				-1,					false,	0	}
 };
 
 
@@ -158,7 +162,15 @@ struct SMBProperty SMBProperties[] =
 	{ kSMBTypeProcessorInformation,	0x14,	kSMBWord,		.getSMBWord		= getCPUFrequency			},
 	
 	//----------------------------------------------------------------------------------------------------
-	
+
+#if DYNAMIC_RAM_OVERRIDE_ERROR_HANDLE
+	// Handle or instance number associated with any error that was previously detected for the device.
+	// If the system does not provide the error information structure, then this field contains FFFEh;
+	// otherwise this field contains either FFFFh (if no error was detected) or the handle (number) of
+	// the error information structure. See 7.18.4 and 7.34 of the SMBIOS specification.
+	{ kSMBTypeMemoryDevice,			0x06,	kSMBWord,		.plainData		= 0xFFFE					},
+#endif
+
 #if DYNAMIC_RAM_OVERRIDE_SIZE
 	{ kSMBTypeMemoryDevice,			0x0c,	kSMBWord,		.getSMBWord		= getRAMSize				},
 #endif
@@ -280,8 +292,8 @@ void setupSMBIOS(void)
 		newtablesPtr += 8;
 	}
 
-#if (DYNAMIC_RAM_OVERRIDE_SIZE || DYNAMIC_RAM_OVERRIDE_TYPE || DYNAMIC_RAM_OVERRIDE_FREQUENCY)
-	requiredStructures[17].stop = (sizeof(SMBProperties) / sizeof(SMBProperties[0])) -1;
+#if (DYNAMIC_RAM_OVERRIDE_ERROR_HANDLE || DYNAMIC_RAM_OVERRIDE_SIZE || DYNAMIC_RAM_OVERRIDE_TYPE || DYNAMIC_RAM_OVERRIDE_FREQUENCY)
+	requiredStructures[17].stop = PROBOARD + (sizeof(SMBProperties) / sizeof(SMBProperties[0])) -1;
 #endif
 
 	//------------------------------------------------------------------------------
@@ -292,7 +304,7 @@ void setupSMBIOS(void)
 		struct SMBStructHeader * factoryHeader = (struct SMBStructHeader *) structurePtr;
 		SMBByte currentStructureType = factoryHeader->type;
 
-		if ((currentStructureType > 17) || (requiredStructures[currentStructureType].type == kSMBUnused))
+		if ((currentStructureType > 19) || (requiredStructures[currentStructureType].type == kSMBUnused))
 		{
 			// _SMBIOS_DEBUG_DUMP("Dropping SMBIOS structure: %d\n", currentStructureType);
 
@@ -408,13 +420,21 @@ void setupSMBIOS(void)
 		{
 			const char * str = "";
 
-#if (DEBUG_SMBIOS & 2)
 			if (SMBProperties[j].type != currentStructureType)
 			{
-				printf("SMBIOS Patcher Error: Turbo Index [%d != %d] Mismatch!\n", SMBProperties[j].type, currentStructureType);
+#if (DEBUG_SMBIOS & 2)
+				/*
+				 * When SMBProperties[j].start and SMBProperties[j].stop are set to -1
+				 * then there isn't anything to add/replace, but that is not an error.
+				 */
+				if ((SMBProperties[j].start > -1) && (SMBProperties[j].stop > -1))
+				{
+					printf("SMBIOS Patcher Error: Turbo Index [%d != %d] Mismatch!\n", SMBProperties[j].type, currentStructureType);
+				}
+#endif
 				continue;
 			}
-#endif
+
 			switch (SMBProperties[j].valueType)
 			{
 				case kSMBByte:
@@ -450,7 +470,7 @@ void setupSMBIOS(void)
 					{
 						memcpy(newtablesPtr, str, size);
 						newtablesPtr[size]	= 0;
-						newtablesPtr		+= size + 1;
+						newtablesPtr		+= (size + 1);
 						*((uint8_t *)(((char *)newHeader) + SMBProperties[j].offset)) = ++numberOfStrings;
 					}
 					break;
@@ -468,6 +488,25 @@ void setupSMBIOS(void)
 		requiredStructures[currentStructureType].hits++;
 	}
 
+	//------------------------------------------------------------------------------
+	// Add Platform Feature structure (Apple Specific Type 0x85/133).
+	//
+	// Note: AppleSMBIOS.kext will use this data for: IOService:/platform-feature
+
+	newHeader = (struct SMBStructHeader *) newtablesPtr;
+  
+	newHeader->type		= kSMBTypeOemPlatformFeature;
+	newHeader->length	= 0x0C;
+	newHeader->handle	= ++handle;
+  
+	*((uint64_t *)(((char *)newHeader) + 4)) = IOSERVICE_PLATFORM_FEATURE;
+  
+	// Update EPS
+	newEPS->dmi.tableLength += 0x0E; // 0x0C + two (00 00)
+	newEPS->dmi.structureCount++;
+  
+	newtablesPtr += 0x0E;
+
 	//------------------------------------------------------------------------------
 	// Add EndOfTable structure.
 
@@ -475,7 +514,7 @@ void setupSMBIOS(void)
 
 	newHeader->type		= kSMBTypeEndOfTable;
 	newHeader->length	= 4;
-	newHeader->handle	= ++handle;
+	newHeader->handle	= 0xFFFD; // ++handle;
 
 	newtablesPtr += 6;
 

From e128dd28d5442f055a589b99b0d045ff456ba46f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:49:33 +0100
Subject: [PATCH 210/623] Fix CPU detection

This change was documented by Sam, but never made it to her Github repo.
---
 i386/libsaio/cpu/Intel/dynamic_data.h | 53 ++++++++++++++++-----------
 i386/libsaio/cpu/essentials.h         |  4 ++
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index d8c4c8c..45c40f3 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -162,8 +162,9 @@ unsigned long getQPISpeed(uint64_t aFSBFrequency)
 
 void initCPUStruct(void)
 {
-	bool SandyBridge	= false;
-	bool IvyBridge		= false;
+	// bool SandyBridge	= false;
+	// bool IvyBridge	= false;
+	uint8_t		CoreBridgeType = 0;
 
 	uint8_t		maxcoef, maxdiv, currcoef, currdiv;
 
@@ -301,11 +302,11 @@ void initCPUStruct(void)
 
 	//--------------------------------------------------------------------------
 	// Setup features.
-	gPlatform.CPU.Features |= getCachedCPUID(LEAF_1, ecx);
-	gPlatform.CPU.Features |= getCachedCPUID(LEAF_1, edx);
+	// gPlatform.CPU.Features |= getCachedCPUID(LEAF_1, ecx);
+	// gPlatform.CPU.Features |= getCachedCPUID(LEAF_1, edx);
 	// Add extended features.
-	gPlatform.CPU.Features |= getCachedCPUID(LEAF_81, ecx);
-	gPlatform.CPU.Features |= getCachedCPUID(LEAF_81, edx);
+	// gPlatform.CPU.Features |= getCachedCPUID(LEAF_81, ecx);
+	// gPlatform.CPU.Features |= getCachedCPUID(LEAF_81, edx);
 
 	fsbFrequency = 0;
 	cpuFrequency = 0;
@@ -322,24 +323,32 @@ void initCPUStruct(void)
 			
 			switch (gPlatform.CPU.Model)
 			{
-				case CPU_MODEL_SB_CORE:	
-				case CPU_MODEL_SB_JAKETOWN:
-					SandyBridge = true;
-
 				case CPU_MODEL_DALES_32NM:
-				case CPU_MODEL_WESTMERE:
-				case CPU_MODEL_WESTMERE_EX:
+					CoreBridgeType = DALES_BRIDGE;
 					/*
 					 * This should be the same as Nehalem but an A0 silicon bug returns
 					 * invalid data in the top 12 bits. Hence, we use only bits [19..16]
-					 * rather than [31..16] for core count - which actually can't exceed 8. 
-					 */		
+					 * rather than [31..16] for core count - which actually can't exceed 8.
+					 */
+					hiBit = 19;
+					break;
+
+				case CPU_MODEL_SB_CORE:
+				case CPU_MODEL_SB_JAKETOWN:
+					CoreBridgeType = SANDY_BRIDGE;
+					hiBit = 19;
+					break;
+
+				case CPU_MODEL_WESTMERE:
+				case CPU_MODEL_WESTMERE_EX:
 					hiBit = 19;
 					break;
 
 				case CPU_MODEL_IB_CORE:
 				case CPU_MODEL_IB_CORE_EX:
-					IvyBridge = true;
+					CoreBridgeType = IVY_BRIDGE;
+					hiBit = 31;
+					break;
 
 				case CPU_MODEL_NEHALEM:
 				case CPU_MODEL_NEHALEM_EX:
@@ -366,15 +375,15 @@ void initCPUStruct(void)
 				// Get 'cpu-type' for our SMBIOS patcher.
 				if (strstr(gPlatform.CPU.BrandString, "Core(TM) i7"))
 				{
-					gPlatform.CPU.Type = 0x701;		// Core i7
+					gPlatform.CPU.Type = (0x700 + CoreBridgeType);		// Core i7
 				}
 				else if (strstr(gPlatform.CPU.BrandString, "Core(TM) i5"))
 				{
-					gPlatform.CPU.Type = 0x601;		// Core i5
+					gPlatform.CPU.Type = (0x600 + CoreBridgeType);		// Core i5
 				}
 				else if (strstr(gPlatform.CPU.BrandString, "Core(TM) i3"))
 				{
-					gPlatform.CPU.Type = 0x901;		// Core i3
+					gPlatform.CPU.Type = (0x900 + CoreBridgeType);		// Core i3
 				}
 
 				msr = rdmsr64(MSR_PLATFORM_INFO);
@@ -388,9 +397,9 @@ void initCPUStruct(void)
 					requestMaxTurbo(maxBusRatio);
 				}
 
-				if (SandyBridge || IvyBridge)
+				if (CoreBridgeType) // (SandyBridge || IvyBridge)
 				{
-					gPlatform.CPU.Type |= 0x02; // Note: Use 0x01 here for the new Macmini5,1 (to get cpu-type = 0x602).
+					// gPlatform.CPU.Type += CoreBridgeType;
 
 #if AUTOMATIC_SSDT_PR_CREATION || DEBUG_CPU_TDP
 					gPlatform.CPU.TDP = getTDP();
@@ -476,7 +485,7 @@ void initCPUStruct(void)
 		}
 	}
 
-	if (!fsbFrequency && !SandyBridge && !IvyBridge)
+	if (!fsbFrequency && !CoreBridgeType) // !SandyBridge && !IvyBridge)
 	{
 		fsbFrequency = (DEFAULT_FSB * 1000);
 		cpuFrequency = tscFrequency;
@@ -523,7 +532,7 @@ void initCPUStruct(void)
 
 	_CPU_DEBUG_DUMP("CPU: NumCores/NumThreads   : %d/%d\n",				gPlatform.CPU.NumCores, gPlatform.CPU.NumThreads);
 
-	if (SandyBridge)
+	if (CoreBridgeType) // SandyBridge)
 	{
 		_CPU_DEBUG_DUMP("CPU: Min/Max busratio      : %d/%d\n",			gPlatform.CPU.MinBusRatio, gPlatform.CPU.MaxBusRatio);
 	}
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 1a9cd01..f955ad5 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -128,4 +128,8 @@
 #define CPU_MODEL_IB_CORE			0x3A	// Ivy Bridge Core Processors (LGA 1155)
 #define CPU_MODEL_IB_CORE_EX		0x3B	// Ivy Bridge Core Processors (LGA 2011)
 
+#define DALES_BRIDGE  1
+#define SANDY_BRIDGE  2
+#define IVY_BRIDGE    4
+
 #endif /* !__LIBSAIO_CPU_ESSENTIALS_H */

From 164940d1c98c99c6fea915c1f0cfc521118fc1da Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:50:06 +0100
Subject: [PATCH 211/623] Removing unused file.

---
 i386/libsaio/smbios/tools/smbios.h | 472 -----------------------------
 1 file changed, 472 deletions(-)
 delete mode 100644 i386/libsaio/smbios/tools/smbios.h

diff --git a/i386/libsaio/smbios/tools/smbios.h b/i386/libsaio/smbios/tools/smbios.h
deleted file mode 100644
index 2982e02..0000000
--- a/i386/libsaio/smbios/tools/smbios.h
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
- * Copyright (c) 1998-2009 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-// #include <IOKit/IOLib.h>
-
-//
-// Based on System Management BIOS Reference Specification v2.5
-//
-
-typedef bool	SMBBool;
-typedef UInt8	SMBString;
-typedef UInt8	SMBByte;
-typedef UInt16	SMBWord;
-typedef UInt32	SMBDWord;
-typedef UInt64	SMBQWord;
-
-typedef struct DMIEntryPoint
-{
-    SMBByte    anchor[5];
-    SMBByte    checksum;
-    SMBWord    tableLength;
-    SMBDWord   tableAddress;
-    SMBWord    structureCount;
-    SMBByte    bcdRevision;
-} __attribute__((packed)) DMIEntryPoint;
-
-typedef struct SMBEntryPoint
-{
-    SMBByte    anchor[4];
-    SMBByte    checksum;
-    SMBByte    entryPointLength;
-    SMBByte    majorVersion;
-    SMBByte    minorVersion;
-    SMBWord    maxStructureSize;
-    SMBByte    entryPointRevision;
-    SMBByte    formattedArea[5];
-    struct DMIEntryPoint dmi;
-} __attribute__((packed)) SMBEntryPoint;
-
-//
-// Header common to all SMBIOS structures
-//
-
-typedef struct SMBStructHeader
-{
-    SMBByte    type;
-    SMBByte    length;
-    SMBWord    handle;
-} __attribute__((packed)) SMBStructHeader;
-
-#define SMB_STRUCT_HEADER  SMBStructHeader header;
-
-typedef struct SMBAnchor
-{
-	const SMBStructHeader *	header;
-	const UInt8 *			next;
-	const UInt8 *			end;
-} SMBAnchor;
-
-#define SMB_ANCHOR_IS_VALID(x)	\
-	((x) && ((x)->header) && ((x)->next) && ((x)->end))
-
-#define SMB_ANCHOR_RESET(x)		\
-	bzero(x, sizeof(struct SMBAnchor));
-
-//
-// SMBIOS structure types.
-//
-
-enum {
-    kSMBTypeBIOSInformation             =  0,
-    kSMBTypeSystemInformation           =  1,
-    kSMBTypeBaseBoard					=  2,
-    kSMBTypeSystemEnclosure             =  3,
-    kSMBTypeProcessorInformation        =  4,
-    kSMBTypeMemoryModule                =  6,
-    kSMBTypeCacheInformation            =  7,
-    kSMBTypeSystemSlot                  =  9,
-    kSMBTypePhysicalMemoryArray         = 16,
-    kSMBTypeMemoryDevice                = 17,
-    kSMBType32BitMemoryErrorInfo        = 18,
-    kSMBType64BitMemoryErrorInfo        = 33,
-
-    kSMBTypeEndOfTable                  = 127,
-
-    // Apple Specific Structures.
-    kSMBTypeFirmwareVolume              = 128,
-    kSMBTypeMemorySPD                   = 130,
-    kSMBTypeOemProcessorType            = 131,
-    kSMBTypeOemProcessorBusSpeed        = 132,
-
-	// Structures dropped by Revolution.
-	kSMBUnused							= 255
-};
-
-//
-// BIOS Information (Type 0)
-//
-typedef struct SMBBIOSInformation
-{
-    SMB_STRUCT_HEADER               // Type 0
-    SMBString  vendor;              // BIOS vendor name
-    SMBString  version;             // BIOS version
-    SMBWord    startSegment;        // BIOS segment start
-    SMBString  releaseDate;         // BIOS release date
-    SMBByte    romSize;             // (n); 64K * (n+1) bytes
-    SMBQWord   characteristics;     // supported BIOS functions
-} __attribute__((packed)) SMBBIOSInformation;
-
-//
-// System Information (Type 1)
-//
-
-typedef struct SMBSystemInformation
-{
-    // 2.0+ spec (8 bytes)
-    SMB_STRUCT_HEADER               // Type 1
-    SMBString  manufacturer;
-    SMBString  productName;
-    SMBString  version;
-    SMBString  serialNumber;
-    // 2.1+ spec (25 bytes)
-    SMBByte    uuid[16];            // can be all 0 or all 1's
-    SMBByte    wakeupReason;        // reason for system wakeup
-} __attribute__((packed)) SMBSystemInformation;
-
-//
-// Base Board (Type 2)
-//
-
-typedef struct SMBBaseBoard
-{
-    SMB_STRUCT_HEADER               // Type 2
-    SMBString	manufacturer;
-    SMBString	product;
-    SMBString	version;
-    SMBString	serialNumber;
-    SMBString	assetTagNumber;
-    SMBByte		featureFlags;
-    SMBString	locationInChassis;
-    SMBWord		chassisHandle;
-    SMBByte		boardType;
-    SMBByte		numberOfContainedHandles;
-	// 0 - 255 contained handles go here but we do not include
-	// them in our structure. Be careful to use numberOfContainedHandles
-	// times sizeof(SMBWord) when computing the actual record size,
-	// if you need it.
-} __attribute__((packed)) SMBBaseBoard;
-
-// Values for boardType in Type 2 records
-enum
-{
-    kSMBBaseBoardUnknown				= 0x01,
-    kSMBBaseBoardOther					= 0x02,
-    kSMBBaseBoardServerBlade			= 0x03,
-    kSMBBaseBoardConnectivitySwitch		= 0x04,
-    kSMBBaseBoardSystemMgmtModule		= 0x05,
-    kSMBBaseBoardProcessorModule		= 0x06,
-    kSMBBaseBoardIOModule				= 0x07,
-    kSMBBaseBoardMemoryModule			= 0x08,
-    kSMBBaseBoardDaughter				= 0x09,
-    kSMBBaseBoardMotherboard			= 0x0A,
-    kSMBBaseBoardProcessorMemoryModule	= 0x0B,
-    kSMBBaseBoardProcessorIOModule		= 0x0C,
-    kSMBBaseBoardInterconnect			= 0x0D,
-};
-
-
-//
-// System Enclosure (Type 3)
-//
-
-typedef struct SMBSystemEnclosure
-{
-    SMB_STRUCT_HEADER               // Type 3
-    SMBString  manufacturer;
-    SMBByte    type;
-    SMBString  version;
-    SMBString  serialNumber;
-    SMBString  assetTagNumber;
-    SMBByte    bootupState;
-    SMBByte    powerSupplyState;
-    SMBByte    thermalState;
-    SMBByte    securityStatus;
-    SMBDWord   oemDefined;
-} __attribute__((packed)) SMBSystemEnclosure;
-
-//
-// Processor Information (Type 4)
-//
-
-typedef struct SMBProcessorInformation
-{
-	// 2.0+ spec (26 bytes)
-	SMB_STRUCT_HEADER               // Type 4
-	SMBString  socketDesignation;
-	SMBByte    processorType;       // CPU = 3
-	SMBByte    processorFamily;     // processor family enum
-	SMBString  manufacturer;
-	SMBQWord   processorID;         // based on CPUID
-	SMBString  processorVersion;
-	SMBByte    voltage;             // bit7 cleared indicate legacy mode
-	SMBWord    externalClock;       // external clock in MHz
-	SMBWord    maximumClock;        // max internal clock in MHz
-	SMBWord    currentClock;        // current internal clock in MHz
-	SMBByte    status;
-	SMBByte    processorUpgrade;    // processor upgrade enum
-	// 2.1+ spec (32 bytes)
-	SMBWord    L1CacheHandle;
-	SMBWord    L2CacheHandle;
-	SMBWord    L3CacheHandle;
-	// 2.3+ spec (35 bytes)
-	SMBString  serialNumber;
-	SMBString  assetTag;
-	SMBString  partNumber;
-	// 2.5+ spec (40 bytes)
-	SMBByte    coreCount;				// Number of cores detected by the BIOS.
-	SMBByte    coreEnabled;				// Number of cores that are enabled by the BIOS.
-	SMBByte    threadCount;				// Number of threads that are supported by this CPU (not per core).
-	SMBWord    processorFuncSupport;	// Defines which functions the processor supports.
-	/* 2.6+ spec (42 bytes)
-	SMBWord    processorFamily;		*/
-} __attribute__((packed)) SMBProcessorInformation;
-
-#define kSMBProcessorInformationMinSize     26
-
-//
-// Memory Module Information (Type 6)
-// Obsoleted since SMBIOS version 2.1
-//
-
-typedef struct SMBMemoryModule
-{
-    SMB_STRUCT_HEADER               // Type 6
-    SMBString  socketDesignation;
-    SMBByte    bankConnections;
-    SMBByte    currentSpeed;
-    SMBWord    currentMemoryType;
-    SMBByte    installedSize;
-    SMBByte    enabledSize;
-    SMBByte    errorStatus;
-} __attribute__((packed)) SMBMemoryModule;
-
-#define kSMBMemoryModuleSizeNotDeterminable 0x7D
-#define kSMBMemoryModuleSizeNotEnabled      0x7E
-#define kSMBMemoryModuleSizeNotInstalled    0x7F
-
-//
-// Cache Information (Type 7)
-//
-
-typedef struct SMBCacheInformation
-{
-    SMB_STRUCT_HEADER               // Type 7
-    SMBString  socketDesignation;
-    SMBWord    cacheConfiguration;
-    SMBWord    maximumCacheSize;
-    SMBWord    installedSize;
-    SMBWord    supportedSRAMType;
-    SMBWord    currentSRAMType;
-	// 2.1+ spec (12 ??? bytes)
-    SMBByte    cacheSpeed;
-    SMBByte    errorCorrectionType;
-    SMBByte    systemCacheType;
-    SMBByte    associativity;
-} __attribute__((packed)) SMBCacheInformation;
-
-typedef struct SMBSystemSlot
-{
-    // 2.0+ spec (12 bytes)
-    SMB_STRUCT_HEADER               // Type 9
-    SMBString   slotDesignation;
-    SMBByte     slotType;
-    SMBByte     slotDataBusWidth;
-    SMBByte     currentUsage;
-    SMBByte     slotLength;
-    SMBWord     slotID;
-    SMBByte     slotCharacteristics1;
-    // 2.1+ spec (13 bytes)
-    SMBByte     slotCharacteristics2;
-    // 2.6+ spec (17 bytes)
-	SMBWord		segmentGroupNumber;
-	SMBByte		busNumber;
-	SMBByte		deviceFunctionNumber;
-} __attribute__((packed)) SMBSystemSlot;
-
-//
-// Physical Memory Array (Type 16)
-//
-
-typedef struct SMBPhysicalMemoryArray
-{
-    // 2.1+ spec (15 bytes)
-    SMB_STRUCT_HEADER               // Type 16
-    SMBByte    physicalLocation;    // physical location
-    SMBByte    arrayUse;            // the use for the memory array
-    SMBByte    errorCorrection;     // error correction/detection method
-    SMBDWord   maximumCapacity;     // maximum memory capacity in kilobytes
-    SMBWord    errorHandle;         // handle of a previously detected error
-    SMBWord    numMemoryDevices;    // number of memory slots or sockets
-} __attribute__((packed)) SMBPhysicalMemoryArray;
-
-// Memory Array - Use
-enum
-{
-    kSMBMemoryArrayUseOther             = 0x01,
-    kSMBMemoryArrayUseUnknown           = 0x02,
-    kSMBMemoryArrayUseSystemMemory      = 0x03,
-    kSMBMemoryArrayUseVideoMemory       = 0x04,
-    kSMBMemoryArrayUseFlashMemory       = 0x05,
-    kSMBMemoryArrayUseNonVolatileMemory = 0x06,
-    kSMBMemoryArrayUseCacheMemory       = 0x07
-};
-
-// Memory Array - Error Correction Types
-enum
-{
-    kSMBMemoryArrayErrorCorrectionTypeOther         = 0x01,
-    kSMBMemoryArrayErrorCorrectionTypeUnknown       = 0x02,
-    kSMBMemoryArrayErrorCorrectionTypeNone          = 0x03,
-    kSMBMemoryArrayErrorCorrectionTypeParity        = 0x04,
-    kSMBMemoryArrayErrorCorrectionTypeSingleBitECC  = 0x05,
-    kSMBMemoryArrayErrorCorrectionTypeMultiBitECC   = 0x06,
-    kSMBMemoryArrayErrorCorrectionTypeCRC           = 0x07
-};
-
-//
-// Memory Device (Type 17)
-//
-
-typedef struct SMBMemoryDevice
-{
-    // 2.1+ spec (21 bytes)
-    SMB_STRUCT_HEADER               // Type 17
-    SMBWord    arrayHandle;         // handle of the parent memory array
-    SMBWord    errorHandle;         // handle of a previously detected error
-    SMBWord    totalWidth;          // total width in bits; including ECC bits
-    SMBWord    dataWidth;           // data width in bits
-    SMBWord    memorySize;          // bit15 is scale, 0 = MB, 1 = KB
-    SMBByte    formFactor;          // memory device form factor
-    SMBByte    deviceSet;           // parent set of identical memory devices
-    SMBString  deviceLocator;       // labeled socket; e.g. "SIMM 3"
-    SMBString  bankLocator;         // labeled bank; e.g. "Bank 0" or "A"
-    SMBByte    memoryType;          // type of memory
-    SMBWord    memoryTypeDetail;    // additional detail on memory type
-    // 2.3+ spec (27 bytes)
-    SMBWord    memorySpeed;         // speed of device in MHz (0 for unknown)
-    SMBString  manufacturer;
-    SMBString  serialNumber;
-    SMBString  assetTag;
-    SMBString  partNumber;
-    // 2.6+ spec (28 bytes)
-    SMBByte    attributes;
-} __attribute__((packed)) SMBMemoryDevice;
-
-//
-// Firmware Volume Description (Apple Specific - Type 128)
-//
-
-enum
-{
-    FW_REGION_RESERVED   = 0,
-    FW_REGION_RECOVERY   = 1,
-    FW_REGION_MAIN       = 2,
-    FW_REGION_NVRAM      = 3,
-    FW_REGION_CONFIG     = 4,
-    FW_REGION_DIAGVAULT  = 5,
-
-    NUM_FLASHMAP_ENTRIES = 8
-};
-
-typedef struct FW_REGION_INFO
-{
-    SMBDWord   StartAddress;
-    SMBDWord   EndAddress;
-} __attribute__((packed)) FW_REGION_INFO;
-
-typedef struct SMBFirmwareVolume
-{
-    SMB_STRUCT_HEADER               // Type 128
-    SMBByte           RegionCount;
-    SMBByte           Reserved[3];
-    SMBDWord          FirmwareFeatures;
-    SMBDWord          FirmwareFeaturesMask;
-    SMBByte           RegionType[ NUM_FLASHMAP_ENTRIES ];
-    FW_REGION_INFO    FlashMap[   NUM_FLASHMAP_ENTRIES ];
-} __attribute__((packed)) SMBFirmwareVolume;
-
-//
-// Memory SPD Data   (Apple Specific - Type 130)
-//
-
-typedef struct SMBMemorySPD
-{
-	SMB_STRUCT_HEADER               // Type 130
-	SMBWord           Type17Handle;
-	SMBWord           Offset;
-	SMBWord           Size;
-	SMBWord           Data[];
-} __attribute__((packed)) SMBMemorySPD;
-
-static const char * SMBMemoryDeviceTypes[] =
-{
-    "RAM",          /* 00h  Undefined */
-    "RAM",          /* 01h  Other */
-    "RAM",          /* 02h  Unknown */
-    "DRAM",         /* 03h  DRAM */
-    "EDRAM",        /* 04h  EDRAM */
-    "VRAM",         /* 05h  VRAM */
-    "SRAM",         /* 06h  SRAM */
-    "RAM",          /* 07h  RAM */
-    "ROM",          /* 08h  ROM */
-    "FLASH",        /* 09h  FLASH */
-    "EEPROM",       /* 0Ah  EEPROM */
-    "FEPROM",       /* 0Bh  FEPROM */
-    "EPROM",        /* 0Ch  EPROM */
-    "CDRAM",        /* 0Dh  CDRAM */
-    "3DRAM",        /* 0Eh  3DRAM */
-    "SDRAM",        /* 0Fh  SDRAM */
-    "SGRAM",        /* 10h  SGRAM */
-    "RDRAM",        /* 11h  RDRAM */
-    "DDR SDRAM",    /* 12h  DDR */
-    "DDR2 SDRAM",   /* 13h  DDR2 */
-    "DDR2 FB-DIMM", /* 14h  DDR2 FB-DIMM */
-    "RAM",			/* 15h  unused */
-    "RAM",			/* 16h  unused */
-    "RAM",			/* 17h  unused */
-    "DDR3",			/* 18h  DDR3, chosen in [5776134] */
-};
-
-static const int kSMBMemoryDeviceTypeCount = sizeof(SMBMemoryDeviceTypes) / sizeof(SMBMemoryDeviceTypes[0]);
-
-//
-// OEM Processor Type (Apple Specific - Type 131)
-//
-
-struct SMBOemProcessorType
-{
-	SMB_STRUCT_HEADER
-	SMBWord    ProcessorType;
-} __attribute__((packed)) SMBOemProcessorType;
-
-//
-// OEM Processor Bus Speed (Apple Specific - Type 132)
-//
-struct SMBOemProcessorBusSpeed
-{
-	SMB_STRUCT_HEADER
-	SMBWord    ProcessorBusSpeed;   // MT/s unit
-} __attribute__((packed)) SMBOemProcessorBusSpeed;
-
-
-

From 755b8749b5075c117694e690fdef5f6383315767 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 29 Dec 2012 06:59:08 +0100
Subject: [PATCH 212/623] Adding support for table type 11, 19 and 133

The current version of RevoBoot adds type 11 and 19, but type 133 is
not yet implemented. However. We will add support for it in our next
update.
---
 i386/libsaio/smbios/smbios.h               |  1 +
 i386/libsaio/smbios/tools/smbios2struct3.c | 37 ++++++++++++----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/i386/libsaio/smbios/smbios.h b/i386/libsaio/smbios/smbios.h
index c146474..f9b89c0 100755
--- a/i386/libsaio/smbios/smbios.h
+++ b/i386/libsaio/smbios/smbios.h
@@ -95,6 +95,7 @@ enum {
     kSMBTypeMemoryModule                =  6,
     kSMBTypeCacheInformation            =  7,
     kSMBTypeSystemSlot                  =  9,
+    kSMBTypeOemStrings                  = 11,
     kSMBTypePhysicalMemoryArray         = 16,
     kSMBTypeMemoryDevice                = 17,
     kSMBType32BitMemoryErrorInfo        = 18,
diff --git a/i386/libsaio/smbios/tools/smbios2struct3.c b/i386/libsaio/smbios/tools/smbios2struct3.c
index 297be55..3be8a8a 100755
--- a/i386/libsaio/smbios/tools/smbios2struct3.c
+++ b/i386/libsaio/smbios/tools/smbios2struct3.c
@@ -29,7 +29,7 @@
 #include "../smbios.h"
 
 #define DEBUG		0	// Set to 1 for additional (debug) output
-#define VERBOSE		0
+#define VERBOSE		1
 
 #if VERBOSE
 	#define VERBOSE_DUMP(x...) printf(x)
@@ -42,7 +42,7 @@
 
 //==============================================================================
 
-char tableDescriptions[133][36] = 
+char tableDescriptions[134][36] =
 {
 	/*   0 */ "BIOS Information", 
 	/*   1 */ "System Information", 
@@ -102,6 +102,7 @@ char tableDescriptions[133][36] =
 	/* 130 */ "Memory SPD Data",
 	/* 131 */ "OEM Processor Type",
 	/* 132 */ "OEM Processor Bus Speed"
+	/* 133 */ "OEM Platform Feature"
 };
 
 
@@ -351,19 +352,22 @@ int main(int argc, char * argv[])
 				
 				switch (header->type)
 				{
-					case kSMBTypeBIOSInformation:		// Type 0
-					case kSMBTypeSystemInformation:		// Type 1
-					case kSMBTypeBaseBoard:				// Type 2
-					case kSMBTypeProcessorInformation:	// Type 4
-					// case kSMBTypeMemoryModule:		// Type 6
-					// case kSMBTypeSystemSlot:			// Type 9
-					case kSMBTypePhysicalMemoryArray:	// Type 16
-					case kSMBTypeMemoryDevice:			// Type 17
-					case kSMBTypeEndOfTable:			// Type 127
-					case kSMBTypeFirmwareVolume:		// Type 128
-					case kSMBTypeMemorySPD:				// Type 130
-					case kSMBTypeOemProcessorType:		// Type 131
-					case kSMBTypeOemProcessorBusSpeed:	// Type 132
+					case kSMBTypeBIOSInformation:			// Type 0
+					case kSMBTypeSystemInformation:			// Type 1
+					case kSMBTypeBaseBoard:					// Type 2
+					case kSMBTypeProcessorInformation:		// Type 4
+					// case kSMBTypeMemoryModule:			// Type 6
+					// case kSMBTypeSystemSlot:				// Type 9
+					case kSMBTypeOemStrings:				// Type 11
+					case kSMBTypePhysicalMemoryArray:		// Type 16
+					case kSMBTypeMemoryDevice:				// Type 17
+					case kSMBTypeMemoryArrayMappedAddress:	// Type 19
+					case kSMBTypeEndOfTable:				// Type 127
+					case kSMBTypeFirmwareVolume:			// Type 128
+					case kSMBTypeMemorySPD:					// Type 130
+					case kSMBTypeOemProcessorType:			// Type 131
+					case kSMBTypeOemProcessorBusSpeed:		// Type 132
+					case kSMBTypeOemPlatformFeature:		// Type 133
 
 						newStructureCount++;
 						tableStructureStart = tablePtr;
@@ -382,7 +386,8 @@ int main(int argc, char * argv[])
 				tablePtr += header->length;
 				
 				// Skip the unformatted structure area at the end (strings).
-				for (; tableEndPtr > tablePtr + sizeof(SMBStructHeader); tablePtr++)
+				// for (; tableEndPtr > tablePtr + sizeof(SMBStructHeader); tablePtr++)
+				for (; tableEndPtr > tablePtr; tablePtr++)
 				{
 					// Look for a terminating double NULL.
 					if (tablePtr[0] == 0 && tablePtr[1] == 0)

From 6e5b030398bb321ec09d698e504c31d268b760b1 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 4 Jan 2013 12:11:38 +0100
Subject: [PATCH 213/623] Use a 64-bit return value for Mountain Lion

---
 i386/libsaio/efi/fake_efi.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/efi/fake_efi.h b/i386/libsaio/efi/fake_efi.h
index 2f4ea76..45c5686 100755
--- a/i386/libsaio/efi/fake_efi.h
+++ b/i386/libsaio/efi/fake_efi.h
@@ -136,7 +136,11 @@ void setupEFITables(void)
 	static uint8_t const VOIDRET_INSTRUCTIONS[] = { 0xc3 };
 
 	// movl $0x80000003,%eax; ret
-	static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = { 0xb8, 0x03, 0x00, 0x00, 0x80, 0xc3 };
+	// static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = { 0xb8, 0x03, 0x00, 0x00, 0x80, 0xc3 };
+
+	// movabs $0x8000000000000003,%rax
+	// ret
+	static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = { 0x48, 0xb8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc3 };
 
 	// Occupying a single 4 KB memory block (wired page) to prevent multiple smaller allocations.
 	struct EFI_Container

From 95cc2108a9c8acb95c67fcd212ae78d246f429d9 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 4 Jan 2013 12:12:10 +0100
Subject: [PATCH 214/623] Comment only change

---
 i386/libsaio/acpi/essentials.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/essentials.h b/i386/libsaio/acpi/essentials.h
index 0b66f09..255e179 100644
--- a/i386/libsaio/acpi/essentials.h
+++ b/i386/libsaio/acpi/essentials.h
@@ -261,7 +261,7 @@ typedef struct acpi_2_fadt
 {
 	char            Signature[4];					// FADT
 	uint32_t        Length;							// Length varies per revision.
-	uint8_t         Revision;						// 1-4.
+	uint8_t         Revision;						// 1-5.
 	uint8_t         Checksum;
 	char            OEMID[6];
 	char            OEMTableID[8];

From 59ec4fa3cfbee7325bfaf42fa07fda5a7238bada Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 4 Jan 2013 12:12:49 +0100
Subject: [PATCH 215/623] Add Apple TV GUID (for reference only)

---
 i386/libsaio/disk.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index 839c372..c763210 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -146,6 +146,9 @@ static struct disk_blk0 * gBootSector = NULL;
 // Apple_HFS
 EFI_GUID const GPT_HFS_GUID					= { 0x48465300, 0x0000, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
 
+// Apple TV
+EFI_GUID const GPT_HFSX_GUID				= { 0x5265636F, 0x7665, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
+
 #if CORE_STORAGE_SUPPORT || APPLE_RAID_SUPPORT
 	// Apple_Boot (RAID helper partition and the 650 MB 'Recovery HD' partition).
 	EFI_GUID const GPT_BOOT_GUID			= { 0x426F6F74, 0x0000, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };

From 9600237488a8ffbc4743d8546908a7f803ad2520 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 4 Jan 2013 18:41:51 +0100
Subject: [PATCH 216/623] Moving stuff from, fake_efi.h to efi.h

---
 i386/libsaio/efi/efi.h      | 42 +++++++++++++++++++++++++++++++++++--
 i386/libsaio/efi/fake_efi.h | 11 +++-------
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/i386/libsaio/efi/efi.h b/i386/libsaio/efi/efi.h
index 01422c4..a4d1fa9 100755
--- a/i386/libsaio/efi/efi.h
+++ b/i386/libsaio/efi/efi.h
@@ -33,13 +33,51 @@
 // Set up space for up to 5 tables but we currently only add two.
 #define EFI_MAX_CONFIG_TABLES			5
 
-#define EFI_MAX_BIT						0x80000000
+#if EFI_64_BIT
+	// Mountain Lion
+	//
+	// movabs $0x8000000000000003,%rax
+	// ret
+	static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = { 0x48, 0xb8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc3 };
+#else
+	// Lion, Snow Leopard and Leopard
+	//
+	// movl $0x80000003,%eax
+	// ret
+	static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = { 0xb8, 0x03, 0x00, 0x00, 0x80, 0xc3 };
+#endif
+
+///
+/// 32/64-bit native width with the highest bit set.
+///
+#if EFI_64_BIT
+	#define EFI_MAX_BIT					0x8000000000000000ULL
+#else
+	#define EFI_MAX_BIT					0x80000000
+#endif
+
+///
+/// Macro's to encode the status code.
+///
 
 // Set the upper bit to indicate EFI Error.
-#define EFIERR(a)						(EFI_MAX_BIT | (a))
+#define ENCODE_ERROR(_a)				(EFI_MAX_BIT | (_a))
+
+#define EFIERR(_a)						ENCODE_ERROR(_a)
 
+///
+/// The operation completed successfully.
+///
 #define EFI_SUCCESS						0
+
+///
+/// The parameter was incorrect.
+///
 #define EFI_INVALID_PARAMETER			EFIERR (2)
+
+///
+/// The operation is not supported.
+///
 #define EFI_UNSUPPORTED					EFIERR (3)
 
 // EFI Revision info.
diff --git a/i386/libsaio/efi/fake_efi.h b/i386/libsaio/efi/fake_efi.h
index 45c5686..76af6b0 100755
--- a/i386/libsaio/efi/fake_efi.h
+++ b/i386/libsaio/efi/fake_efi.h
@@ -121,6 +121,8 @@ extern EFI_STATUS addConfigurationTable(EFI_GUID const *pGuid, void * table, cha
 		{
 			DT__AddProperty(tableNode, "alias", strlen(tableAlias) + 1, (char *)tableAlias);
 		}
+      
+		gPlatform.EFI.SystemTable->NumberOfTableEntries++;
 	}
 	
 	return EFI_SUCCESS;
@@ -135,13 +137,6 @@ void setupEFITables(void)
 	// return instruction.
 	static uint8_t const VOIDRET_INSTRUCTIONS[] = { 0xc3 };
 
-	// movl $0x80000003,%eax; ret
-	// static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = { 0xb8, 0x03, 0x00, 0x00, 0x80, 0xc3 };
-
-	// movabs $0x8000000000000003,%rax
-	// ret
-	static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = { 0x48, 0xb8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc3 };
-
 	// Occupying a single 4 KB memory block (wired page) to prevent multiple smaller allocations.
 	struct EFI_Container
 	{
@@ -250,7 +245,7 @@ void setupEFITables(void)
      * things like efiRuntimeServices* and what not.
      *
      * In fact, the only code that seems to use that is the hibernate code so it
-     * knows not to save the pages.  It even checks to make sure its nonzero.
+     * knows not to save the pages.  It even checks to make sure that it is non-zero.
      */	
     bootArgs->efiSystemTable = (uint32_t)efiSystemTable;
 

From 5840427472fd7def3ba66711ee96cb53613bee40 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 4 Jan 2013 18:42:35 +0100
Subject: [PATCH 217/623] Adding clean/uninitialized config files

---
 i386/config/ACPI/clean.h   | 97 ++++++++++++++++++++++++++++++++++++++
 i386/config/EFI/clean.h    | 16 +++++++
 i386/config/SMBIOS/clean.h | 31 ++++++++++++
 3 files changed, 144 insertions(+)
 create mode 100755 i386/config/ACPI/clean.h
 create mode 100755 i386/config/EFI/clean.h
 create mode 100755 i386/config/SMBIOS/clean.h

diff --git a/i386/config/ACPI/clean.h b/i386/config/ACPI/clean.h
new file mode 100755
index 0000000..6a80eac
--- /dev/null
+++ b/i386/config/ACPI/clean.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2009 Master Chief. All rights reserved.
+ *
+ * Note: This is an essential part of the build process for Revolution v0.6.43 and greater.
+ *
+ *
+ * Latest cleanups and additional directives added by DHP in 2011
+ */
+
+
+//--------------------------------------------------------- ESSENTIAL ACPI TABLES -------------------------------------------------------------
+
+
+#if STATIC_APIC_TABLE_INJECTION
+	#define STATIC_APIC_TABLE_DATA \
+	/* 0x0000 */	// Insert your APIC table replacement here (optional).
+#endif
+
+
+#if STATIC_ECDT_TABLE_INJECTION
+	#define STATIC_ECDT_TABLE_DATA \
+	/* 0x0000 */	// Insert your ECDT table replacement here (optional).
+#endif
+
+
+#if STATIC_HPET_TABLE_INJECTION
+	#define STATIC_HPET_TABLE_DATA \
+	/* 0x0000 */	// Insert your HPET table replacement here (optional).
+#endif
+
+
+#if STATIC_MCFG_TABLE_INJECTION
+	#define STATIC_MCFG_TABLE_DATA \
+	/* 0x0000 */	// Insert your MCFG table replacement here (optional).
+#endif
+
+
+#if STATIC_SBST_TABLE_INJECTION
+	#define STATIC_SBST_TABLE_DATA \
+	/* 0x0000 */	// Insert your SBST table replacement here (optional).
+#endif
+
+
+#if STATIC_SSDT_TABLE_INJECTION
+	#define STATIC_SSDT_TABLE_DATA \
+	/* 0x0000 */	// Insert your SSDT table replacement here (optional).
+#endif
+
+
+//--------------------------------------------------------- SECONDARY ACPI TABLES -------------------------------------------------------------
+
+
+#if STATIC_DSDT_TABLE_INJECTION
+	#define STATIC_DSDT_TABLE_DATA \
+	/* 0x0000 */	// Insert your DSDT table replacement here (optional).
+#endif
+
+
+#if STATIC_FACS_TABLE_INJECTION
+	#define STATIC_FACS_TABLE_DATA \
+	/* 0x0000 */	// Insert your FACS table replacement here (optional).
+#endif
+
+
+//---------------------------------------------------------- OPTIONAL ACPI TABLES -------------------------------------------------------------
+
+
+#if STATIC_APIC2_TABLE_INJECTION
+	#define STATIC_APIC2_TABLE_DATA \
+	/* 0x0000 */	// Insert a second APIC table (replacement) here (optional).
+#endif
+
+
+#if STATIC_SSDT_GPU_TABLE_INJECTION
+	#define STATIC_SSDT_GPU_TABLE_DATA \
+	/* 0x0000 */	// Insert your SSDT_GPU table replacement here (optional).
+#endif
+
+
+#if STATIC_SSDT_PR_TABLE_INJECTION
+	#define STATIC_SSDT_PR_TABLE_DATA \
+	/* 0x0000 */	// Insert your SSDT_PR table replacement here (optional).
+#endif
+
+
+#if STATIC_SSDT_SATA_TABLE_INJECTION
+	#define STATIC_SSDT_SATA_TABLE_DATA \
+	/* 0x0000 */	// Insert your SSDT_SATA table replacement here (optional).
+#endif
+
+
+#if STATIC_SSDT_USB_TABLE_INJECTION
+	#define STATIC_SSDT_USB_TABLE_DATA \
+	/* 0x0000 */	// Insert your SSDT_USB table replacement here (optional).
+#endif
+
+//================================================================= END ====================================================================
diff --git a/i386/config/EFI/clean.h b/i386/config/EFI/clean.h
new file mode 100755
index 0000000..9807da6
--- /dev/null
+++ b/i386/config/EFI/clean.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2009 Master Chief. All rights reserved.
+ *
+ * Note: This is an essential part of the build process for Revolution v0.6.43 and greater.
+ *
+ *
+ * Latest cleanups and additional directives added by DHP in 2011
+ */
+
+
+//----------------------------------------------------------------- EFI --------------------------------------------------------------------
+
+#define	STATIC_EFI_DEVICE_PROPERTIES \
+/* 0x0000 */	// Insert your EFI device-property data here (optional).
+
+//================================================================= END ====================================================================
diff --git a/i386/config/SMBIOS/clean.h b/i386/config/SMBIOS/clean.h
new file mode 100755
index 0000000..d388f10
--- /dev/null
+++ b/i386/config/SMBIOS/clean.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2009 Master Chief. All rights reserved.
+ *
+ * Note: This is an essential part of the build process for Revolution v0.6.44 and greater.
+ *
+ *
+ * Update:  - Cleanups and additional directives added by DHP in 2011.
+ *			- Tip / Note added by DHP (march 2012).
+ *
+ * Tip:		The idea is to use dynamic SMBIOS generation in RevoBoot only to 
+ *			let it strip your factory table, after which you should do this:
+ *
+ *			1.) Extract the new OS X compatible SMBIOS table with: tools/smbios2struct
+ *			2.) Add the data structure to: RevoBoot/i386/config/SMBIOS/data.h
+ *			3.) Recompile RevoBoot, and be happy with your quicker boot time.
+ *
+ * Note:	Repeat this procedure after adding memory or other SMBIOS relevant 
+ *			hardware changes, like replacing the motherboard and/or processor.
+ *
+ */
+
+//--------------------------------------------------------------- SMBIOS -------------------------------------------------------------------
+
+#define	STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE 0
+
+#define	STATIC_SMBIOS_DMI_STRUCTURE_COUNT 0
+
+#define STATIC_SMBIOS_DATA \
+/* 0x0000 */	// Insert your SMBIOS data here.
+
+//================================================================= END ====================================================================

From d490cce70a09b91f21bf6d7337dff6aefcb47da9 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 4 Jan 2013 18:44:50 +0100
Subject: [PATCH 218/623] No compiled software should ever be comitted

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8681039..9465950 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ i386/config/SMBIOS/*Mac*.h
 
 i386/util/libcc_kext.a
 MODEL
+
+i386/libsaio/smbios/tools/smbios2struct3

From d4d1b190a1f50dfcc03bb6470eb277f385727361 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 10 Jan 2013 14:35:39 +0100
Subject: [PATCH 219/623] Preparations for Sam's incredible iMessage fix!!!

Sam blogged about why iCloud/iMessage didn't work with a self compiled
kernel. She did this, long before anyone even had a clue, after she
figured out that the Apple kernel includes undocumented changes. Not
only that. She also figured out how we can make it work again, and this
is step one of her findings.
---
 i386/config/settings-template.h    |  6 ++--
 i386/libsaio/smbios/dynamic_data.h | 55 ++++++++++++------------------
 2 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index e2555d9..2bac173 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -383,9 +383,9 @@
 
 #define SMB_SYSTEM_SERIAL_NUMBER			"SOMESRLNUMBR" // Example only!
 
-#if (TARGET_MODEL & MACPRO)
-	#define SMB_BOARD_SERIAL_NUMBER			"SOMESRLNUMBR" // Example only!
-#endif
+#define SMB_BOARD_SERIAL_NUMBER				"SOMESRLNUMBR" // Example only!
+												//
+												// Note: Board serial injection is required for iMessage support!
 
 #define SET_MAX_STRUCTURE_LENGTH			0	// Set to 0 by default. Only change this to 1 when boot hangs without it.
 												//
diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index f23be7d..4104937 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -16,6 +16,7 @@
  *			- Removed some unused experimental code snippets (PikerAlpha, November 2012).
  *			- Option SET_MAX_STRUCTURE_LENGTH to verify/fix newEPS->maxStructureSize (PikerAlpha, November 2012).
  *			- Allow DEBUG_SMBIOS = 2 to filter out some of the output (PikerAlpha, November 2012).
+ *			- Pre-compiler directive PROBOARD removed, which is required for iMessage (PikerAlpha, January 2013).
  *
  * Credits:
  *			- Kabyl (see notes in source code)
@@ -41,18 +42,6 @@
 #include "smbios.h"
 #include "model_data.h"
 
-#if (TARGET_MODEL & MACPRO)
-	/*
-	 * Number of additional properties for MacPro models.
-	 */
-	#define PROBOARD	2
-#else
-	/*
-	 * No additional properties for other Mac models.
-	*/
-	#define PROBOARD	0
-#endif
-
 #define IOSERVICE_PLATFORM_FEATURE	0x0000000000000001
 
 //------------------------------------------------------------------------------
@@ -71,26 +60,26 @@ struct SMBStructure
 
 struct SMBStructure requiredStructures[] =
 {
-	{ kSMBTypeBIOSInformation			/*   0 */ ,	 0,					5,					false,	0	},
+	{ kSMBTypeBIOSInformation			/*   0 */ ,  0,					 5,					false,	0	},
 	{ kSMBTypeSystemInformation			/*   1 */ ,	 6,					10,					false,	0	},
-	{ kSMBTypeBaseBoard					/*   2 */ ,	(11 + PROBOARD),	(12 + PROBOARD),	false,	0	},
-	{ kSMBUnused						/*   3 */ ,	 0,					0,					false,	0	},
-	{ kSMBTypeProcessorInformation		/*   4 */ ,	(13 + PROBOARD),	(14 + PROBOARD),	true,	0	},
-	{ kSMBUnused						/*   5 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*   6 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*   7 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*   8 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*   9 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*  10 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*  11 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*  12 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*  13 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*  14 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*  15 */ ,	 0,					0,					false,	0	},
-	{ kSMBUnused						/*  16 */ ,	 0,					0,					false,	0	},
-	{ kSMBTypeMemoryDevice				/*  17 */ ,	(15 + PROBOARD),	(20 + PROBOARD),	true,	0	},
-	{ kSMBUnused						/*  18 */ ,	 0,					0,					false,	0	},
-	{ kSMBTypeMemoryArrayMappedAddress	/*	19 */ ,	 -1,				-1,					false,	0	}
+	{ kSMBTypeBaseBoard					/*   2 */ ,	13,					14,					false,	0	},
+	{ kSMBUnused						/*   3 */ ,	 0,					 0,					false,	0	},
+	{ kSMBTypeProcessorInformation		/*   4 */ ,	15,					16,					true,	0	},
+	{ kSMBUnused						/*   5 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*   6 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*   7 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*   8 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*   9 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*  10 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*  11 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*  12 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*  13 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*  14 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*  15 */ ,	 0,					 0,					false,	0	},
+	{ kSMBUnused						/*  16 */ ,	 0,					 0,					false,	0	},
+	{ kSMBTypeMemoryDevice				/*  17 */ ,	17,					22,					true,	0	},
+	{ kSMBUnused						/*  18 */ ,	 0,					 0,					false,	0	},
+	{ kSMBTypeMemoryArrayMappedAddress	/*	19 */ ,	-1,					-1,					false,	0	}
 };
 
 
@@ -151,10 +140,8 @@ struct SMBProperty SMBProperties[] =
 	{ kSMBTypeBaseBoard,			0x04,	kSMBString,		.plainData		= APPLE_INC					},
 	{ kSMBTypeBaseBoard,			0x05,	kSMBString,		.plainData		= SMB_BOARD_PRODUCT			},
 
-#if (TARGET_MODEL & MACPRO)
     { kSMBTypeBaseBoard,			0x07,	kSMBString,		.plainData		= SMB_BOARD_SERIAL_NUMBER	},
 	{ kSMBTypeBaseBoard,			0x0d,	kSMBByte,		.getSMBByte		= getBoardType				},
-#endif
 
 	//----------------------------------------------------------------------------------------------------
 	
@@ -293,7 +280,7 @@ void setupSMBIOS(void)
 	}
 
 #if (DYNAMIC_RAM_OVERRIDE_ERROR_HANDLE || DYNAMIC_RAM_OVERRIDE_SIZE || DYNAMIC_RAM_OVERRIDE_TYPE || DYNAMIC_RAM_OVERRIDE_FREQUENCY)
-	requiredStructures[17].stop = PROBOARD + (sizeof(SMBProperties) / sizeof(SMBProperties[0])) -1;
+	requiredStructures[17].stop = (sizeof(SMBProperties) / sizeof(SMBProperties[0])) -1;
 #endif
 
 	//------------------------------------------------------------------------------

From 40d8218ebd6df9e99a38faf4f863b1f1517cf69e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 10 Jan 2013 16:57:46 +0100
Subject: [PATCH 220/623] Always inject a board serial/type, which is required
 to fix iMessage breakage

---
 i386/libsaio/efi.c            | 11 ++++++++++-
 i386/libsaio/smbios/getters.h |  9 ++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 3d88f18..4cb15ac 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -35,10 +35,10 @@
  *			- Get static EFI data (optional) from /Extra/EFI/[MacModelNN].bin (PikerAlpha, October 2012).
  *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
  *			- Check return of malloc call (PikerAlpha, November 2012).
+ *			- Sam's workaround for iMessage breakage added (PikerAlpha, January 2013).
  *
  */
 
-
 #include "efi/fake_efi.h"
 
 
@@ -193,6 +193,15 @@ void initEFITree(void)
 
 #endif
 
+	// FIXME: We should either rename this or put the data somewhere else! 
+	Node *optionsNode = DT__AddChild(gPlatform.DT.RootNode, "RevoEFI");
+
+	static EFI_UINT8 const NVRAM_ROM_DATA[] = STATIC_NVRAM_ROM;
+	DT__AddProperty(optionsNode, "NVRAM:ROM", sizeof(NVRAM_ROM_DATA), (EFI_UINT8*) &NVRAM_ROM_DATA);
+	
+	static EFI_UINT8 const NVRAM_MLB_DATA[] = STATIC_NVRAM_MLB;
+	DT__AddProperty(optionsNode, "NVRAM:MLB", sizeof(NVRAM_MLB_DATA), (EFI_UINT8*) &NVRAM_MLB_DATA);
+
 	// DT__AddProperty(chosenNode, "boot-kernelcache-adler32", sizeof(uint64_t), adler32);
 
 	gPlatform.EFI.Nodes.Chosen = chosenNode;
diff --git a/i386/libsaio/smbios/getters.h b/i386/libsaio/smbios/getters.h
index 6ec296b..1ce0b59 100755
--- a/i386/libsaio/smbios/getters.h
+++ b/i386/libsaio/smbios/getters.h
@@ -11,6 +11,7 @@
  *			- Function getOverrideString removed (PikerAlpha, October 2012).
  *			- Function getBIOSDate added (PikerAlpha, October 2012).
  *			- Unused arguments removed (PikerAlpha, October 2012).
+  *			- Pre-compiler directive PROBOARD removed, which is required for iMessage (PikerAlpha, January 2013).
  *
  * Credits:
  *			- macerintel (see note in source code)
@@ -352,9 +353,11 @@ static SMBDWord getBIOSFeaturesEX(void)
 
 //==============================================================================
 
-#if TARGET_MODEL & MACPRO
 static SMBByte getBoardType(void)
 {
-	return 0x0b;	// Some logic here or just return 11/0x0b.
-}
+#if TARGET_MODEL & MACPRO
+	return 0x0b;
+#else
+	return 0x0a;
 #endif
+}

From 1aee5ac4a11da30dfca81a54f9239691e24e0dc4 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 10 Jan 2013 17:10:48 +0100
Subject: [PATCH 221/623] iMessage workaround cleanups

---
 VERSION                         |  2 +-
 i386/config/settings-template.h | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index dc848ff..c7966c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.37
+1.5.38
diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 2bac173..0db58fa 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Master Chief. All rights reserved.
  *
- * Note: This is an essential part of the build process for RevoBoot v1.5.37 and greater.
+ * Note: This is an essential part of the build process for RevoBoot v1.5.38 and greater.
  *
  * Updates:
  *
@@ -30,6 +30,8 @@
  *			- Option DISK_TARGET_SUPPORT added (PikerAlpha, November 2012).
  *			- DISK_TARGET_SUPPORT renamed to STARTUP_DISK_SUPPORT (PikerAlpha, November 2012).
  *			- New compiler directive USE_DEVICE_PATH in boot section (PikerAlpha, November 2012).
+ *			- Always inject SMB_BOARD_SERIAL_NUMBER, required for iMessage (PikerAlpha, January 2013).
+ *			- New compiler directives in EFI section added (PikerAlpha, January 2013).
  *
  */
 
@@ -324,7 +326,13 @@
 
 #define EFI_SYSTEM_SERIAL_NUMBER			{ 'S', 'O', 'M', 'E', 'S', 'R', 'L', 'N', 'U', 'M', 'B', 'R' }
 
-#define STATIC_SYSTEM_ID					{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F } // Example only!
+#define STATIC_SYSTEM_ID					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10 } // Example only!
+
+#define STATIC_NVRAM_ROM					{ 0x00, 0x0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN } // Example only!
+												//
+												// Note: Use your MAC address for the last nibbles!
+
+#define STATIC_NVRAM_MLB					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11 } // Example only!
 
 #define DEBUG_EFI							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 

From 07bd1e216e0b1f83bf2f2184e518658404be8b65 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 10 Jan 2013 17:19:39 +0100
Subject: [PATCH 222/623] Updating release notes for RevoBoot v1.5.38

---
 CHANGES | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGES b/CHANGES
index e423223..5649f0c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,14 @@ RevoBoot v1.5.40 (Next Major Release)
 - Improved P-State generation (less settings).
 
 
+RevoBoot v1.5.38
+================
+- RevoBoot/i386/libsaio/efi.c modified to workaround iMessage login/registration problems (PikerAlpha, January 2013).
+- getBoardType in RevoBoot/i386/libsaio/SMBIOS/getters.h now always returns a board type (PikerAlpha, January 2013).
+- STATIC_NVRAM_ROM/STATIC_NVRAM_MLB added (used in efi.c) to settings-template.h (PikerAlpha, January 2013).
+- VERSION updated to v1.5.38
+
+
 RevoBoot v1.5.37
 ================
 - DISK_TARGET_SUPPORT in settings-template.h renamed to STARTUP_DISK_SUPPORT (PikerAlpha, November 2012).

From 38ce9bd8d287bc459e21b9695e1d8c417e4a6464 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 10 Jan 2013 18:40:16 +0100
Subject: [PATCH 223/623] Adding examples

---
 i386/config/settings-template.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 0db58fa..dd39989 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -328,11 +328,12 @@
 
 #define STATIC_SYSTEM_ID					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10 } // Example only!
 
-#define STATIC_NVRAM_ROM					{ 0x00, 0x0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN } // Example only!
-												//
+#define STATIC_NVRAM_ROM					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN } // Example only!
+												// sudo nvram 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14:ROM=%01%02%03%04%05%06%07%08%09%0A%0B%NN%NN%NN%NN%NN%NN
 												// Note: Use your MAC address for the last nibbles!
 
 #define STATIC_NVRAM_MLB					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11 } // Example only!
+												// sudo nvram 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14:MLB=%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11
 
 #define DEBUG_EFI							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 

From 80fbfbbe1e83dcb0f8621f0fe1bcc3c71b4ccef7 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 10 Jan 2013 18:49:59 +0100
Subject: [PATCH 224/623] Typo

---
 i386/config/settings-template.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index dd39989..377b31f 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -330,7 +330,7 @@
 
 #define STATIC_NVRAM_ROM					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN } // Example only!
 												// sudo nvram 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14:ROM=%01%02%03%04%05%06%07%08%09%0A%0B%NN%NN%NN%NN%NN%NN
-												// Note: Use your MAC address for the last nibbles!
+												// Note: Use your MAC address for the last six bytes!
 
 #define STATIC_NVRAM_MLB					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11 } // Example only!
 												// sudo nvram 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14:MLB=%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F%10%11

From 51a404abbeba6a36ac6569950d0d133183828d88 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 13 Jan 2013 16:11:26 +0100
Subject: [PATCH 225/623] Index error fixed

---
 i386/libsaio/smbios/dynamic_data.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 4104937..6d9a49e 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -17,6 +17,7 @@
  *			- Option SET_MAX_STRUCTURE_LENGTH to verify/fix newEPS->maxStructureSize (PikerAlpha, November 2012).
  *			- Allow DEBUG_SMBIOS = 2 to filter out some of the output (PikerAlpha, November 2012).
  *			- Pre-compiler directive PROBOARD removed, which is required for iMessage (PikerAlpha, January 2013).
+ *			- SMBStructure.start[2] was 13 but should have been 11 (PikerAlpha, January 2013).
  *
  * Credits:
  *			- Kabyl (see notes in source code)
@@ -62,7 +63,7 @@ struct SMBStructure requiredStructures[] =
 {
 	{ kSMBTypeBIOSInformation			/*   0 */ ,  0,					 5,					false,	0	},
 	{ kSMBTypeSystemInformation			/*   1 */ ,	 6,					10,					false,	0	},
-	{ kSMBTypeBaseBoard					/*   2 */ ,	13,					14,					false,	0	},
+	{ kSMBTypeBaseBoard					/*   2 */ ,	11,					14,					false,	0	},
 	{ kSMBUnused						/*   3 */ ,	 0,					 0,					false,	0	},
 	{ kSMBTypeProcessorInformation		/*   4 */ ,	15,					16,					true,	0	},
 	{ kSMBUnused						/*   5 */ ,	 0,					 0,					false,	0	},

From 0b7ef56b561e80a21210777ed77d141b59eb6db7 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 04:14:25 +0100
Subject: [PATCH 226/623] SMBIOS update to make it more Apple like

---
 i386/libsaio/smbios/dynamic_data.h | 43 +++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 6d9a49e..99d7d5d 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -17,7 +17,11 @@
  *			- Option SET_MAX_STRUCTURE_LENGTH to verify/fix newEPS->maxStructureSize (PikerAlpha, November 2012).
  *			- Allow DEBUG_SMBIOS = 2 to filter out some of the output (PikerAlpha, November 2012).
  *			- Pre-compiler directive PROBOARD removed, which is required for iMessage (PikerAlpha, January 2013).
+<<<<<<< HEAD
  *			- SMBStructure.start[2] was 13 but should have been 11 (PikerAlpha, January 2013).
+=======
+ *			- Override factory SystemID when (PikerAlpha, January 2013).
+>>>>>>> Make SMBIOS more Apple like
  *
  * Credits:
  *			- Kabyl (see notes in source code)
@@ -62,10 +66,10 @@ struct SMBStructure
 struct SMBStructure requiredStructures[] =
 {
 	{ kSMBTypeBIOSInformation			/*   0 */ ,  0,					 5,					false,	0	},
-	{ kSMBTypeSystemInformation			/*   1 */ ,	 6,					10,					false,	0	},
-	{ kSMBTypeBaseBoard					/*   2 */ ,	11,					14,					false,	0	},
+	{ kSMBTypeSystemInformation			/*   1 */ ,	 6,					11,					false,	0	},
+	{ kSMBTypeBaseBoard					/*   2 */ ,	12,					18,					false,	0	},
 	{ kSMBUnused						/*   3 */ ,	 0,					 0,					false,	0	},
-	{ kSMBTypeProcessorInformation		/*   4 */ ,	15,					16,					true,	0	},
+	{ kSMBTypeProcessorInformation		/*   4 */ ,	19,					20,					true,	0	},
 	{ kSMBUnused						/*   5 */ ,	 0,					 0,					false,	0	},
 	{ kSMBUnused						/*   6 */ ,	 0,					 0,					false,	0	},
 	{ kSMBUnused						/*   7 */ ,	 0,					 0,					false,	0	},
@@ -78,7 +82,7 @@ struct SMBStructure requiredStructures[] =
 	{ kSMBUnused						/*  14 */ ,	 0,					 0,					false,	0	},
 	{ kSMBUnused						/*  15 */ ,	 0,					 0,					false,	0	},
 	{ kSMBUnused						/*  16 */ ,	 0,					 0,					false,	0	},
-	{ kSMBTypeMemoryDevice				/*  17 */ ,	17,					22,					true,	0	},
+	{ kSMBTypeMemoryDevice				/*  17 */ ,	21,					25,					true,	0	},
 	{ kSMBUnused						/*  18 */ ,	 0,					 0,					false,	0	},
 	{ kSMBTypeMemoryArrayMappedAddress	/*	19 */ ,	-1,					-1,					false,	0	}
 };
@@ -113,7 +117,10 @@ struct SMBProperty
 	const char *plainData;
 };
 
-#define APPLE_INC			"Apple Inc."
+#define APPLE_INC				"Apple Inc."
+#define SMB_SYSTEM_SKU			"System SKU#"
+#define SMB_BOARD_ASSET_TAG		"Base Board Asset Tag#"
+#define SMB_BOARD_LOCATION		"Part Component"
 
 //------------------------------------------------------------------------------
 
@@ -134,14 +141,20 @@ struct SMBProperty SMBProperties[] =
 	{ kSMBTypeSystemInformation,	0x05,	kSMBString,		.plainData		= SMB_PRODUCT_NAME			},
 	{ kSMBTypeSystemInformation,	0x06,	kSMBString,		.plainData		= "1.0"						},
 	{ kSMBTypeSystemInformation,	0x07,	kSMBString,		.plainData		= SMB_SYSTEM_SERIAL_NUMBER	},
+
+	{ kSMBTypeSystemInformation,	0x19,	kSMBString,		.plainData		= SMB_SYSTEM_SKU			},
 	{ kSMBTypeSystemInformation,	0x1a,	kSMBString,		.plainData		= SMB_FAMILY				},
 	
 	//----------------------------------------------------------------------------------------------------
 	
 	{ kSMBTypeBaseBoard,			0x04,	kSMBString,		.plainData		= APPLE_INC					},
 	{ kSMBTypeBaseBoard,			0x05,	kSMBString,		.plainData		= SMB_BOARD_PRODUCT			},
-
+	{ kSMBTypeBaseBoard,			0x06,	kSMBString,		.plainData		= SMB_FAMILY				},
     { kSMBTypeBaseBoard,			0x07,	kSMBString,		.plainData		= SMB_BOARD_SERIAL_NUMBER	},
+	{ kSMBTypeBaseBoard,			0x08,	kSMBString,		.plainData		= SMB_BOARD_ASSET_TAG		},
+
+	{ kSMBTypeBaseBoard,			0x0a,	kSMBString,		.plainData		= SMB_BOARD_LOCATION		},
+
 	{ kSMBTypeBaseBoard,			0x0d,	kSMBByte,		.getSMBByte		= getBoardType				},
 
 	//----------------------------------------------------------------------------------------------------
@@ -318,6 +331,24 @@ void setupSMBIOS(void)
 		// Copy structure data from factory table to new table (not the strings).
 		memcpy(newHeader, factoryHeader, factoryHeader->length);
 
+		if (currentStructureType == kSMBTypeSystemInformation)
+		{
+			// gPlatform.UUID is set to NULL in platform.c so that we can check for NULL to see if we
+			// located the (per spec) required SMBIOS type 1 structure (allocating memory signals OK).
+			gPlatform.UUID = malloc(16);
+
+#ifdef SMB_STATIC_SYSTEM_UUID
+			static unsigned char SMB_SYSTEM_UUID[] = SMB_STATIC_SYSTEM_UUID;
+
+			// Replace factory UUID with the one specified in: RevoBoot/i386/config/SETTINGS/MacModelNN.h
+			memcpy(((SMBSystemInformation *)newHeader)->uuid, SMB_SYSTEM_UUID, 16);
+			memcpy(gPlatform.UUID, SMB_SYSTEM_UUID, 16);
+#else
+			// Get factory UUID from SMBIOS.
+			memcpy(gPlatform.UUID, ((SMBSystemInformation *)factoryHeader)->uuid, 16);
+#endif
+		}
+
 		// Init handle in the new header.
 		newHeader->handle = ++handle;
 

From 32e275f41e2deab585e797ba57f9e998565e3677 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 04:15:34 +0100
Subject: [PATCH 227/623] Fix commit clash

---
 i386/libsaio/smbios/dynamic_data.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 99d7d5d..de02604 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -17,11 +17,8 @@
  *			- Option SET_MAX_STRUCTURE_LENGTH to verify/fix newEPS->maxStructureSize (PikerAlpha, November 2012).
  *			- Allow DEBUG_SMBIOS = 2 to filter out some of the output (PikerAlpha, November 2012).
  *			- Pre-compiler directive PROBOARD removed, which is required for iMessage (PikerAlpha, January 2013).
-<<<<<<< HEAD
  *			- SMBStructure.start[2] was 13 but should have been 11 (PikerAlpha, January 2013).
-=======
  *			- Override factory SystemID when (PikerAlpha, January 2013).
->>>>>>> Make SMBIOS more Apple like
  *
  * Credits:
  *			- Kabyl (see notes in source code)

From 9dc2b0be2a3530313f676881a6caeeff8dda42d2 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 04:22:43 +0100
Subject: [PATCH 228/623] STATIC_SYSTEM_ID renamed to SMB_STATIC_SYSTEM_UUID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 and moved to SMBIOS section
---
 i386/config/settings-template.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 377b31f..891a227 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -32,6 +32,7 @@
  *			- New compiler directive USE_DEVICE_PATH in boot section (PikerAlpha, November 2012).
  *			- Always inject SMB_BOARD_SERIAL_NUMBER, required for iMessage (PikerAlpha, January 2013).
  *			- New compiler directives in EFI section added (PikerAlpha, January 2013).
+ *			- STATIC_SYSTEM_ID renamed to SMB_STATIC_SYSTEM_UUID and moved to SMBIOS section (PikerAlpha, January 2013).
  *
  */
 
@@ -326,8 +327,6 @@
 
 #define EFI_SYSTEM_SERIAL_NUMBER			{ 'S', 'O', 'M', 'E', 'S', 'R', 'L', 'N', 'U', 'M', 'B', 'R' }
 
-#define STATIC_SYSTEM_ID					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10 } // Example only!
-
 #define STATIC_NVRAM_ROM					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN } // Example only!
 												// sudo nvram 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14:ROM=%01%02%03%04%05%06%07%08%09%0A%0B%NN%NN%NN%NN%NN%NN
 												// Note: Use your MAC address for the last six bytes!
@@ -396,6 +395,8 @@
 												//
 												// Note: Board serial injection is required for iMessage support!
 
+#define SMB_STATIC_SYSTEM_UUID				{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10 } // Example only!
+
 #define SET_MAX_STRUCTURE_LENGTH			0	// Set to 0 by default. Only change this to 1 when boot hangs without it.
 												//
 												// Note: Safe to keep at 0 since it is only available since RevoBoot v1.5.35

From 2091ad36b3c00a1655ae69b9d8619381935190fa Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 03:56:18 +0100
Subject: [PATCH 229/623] Removing unused function call

---
 i386/libsaio/efi/fake_efi.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/i386/libsaio/efi/fake_efi.h b/i386/libsaio/efi/fake_efi.h
index 76af6b0..a471d88 100755
--- a/i386/libsaio/efi/fake_efi.h
+++ b/i386/libsaio/efi/fake_efi.h
@@ -39,7 +39,6 @@
 
 extern void setupACPI(void);
 extern void setupSMBIOS(void);
-extern bool setRootUUID(Node *chosenNode, char * rootUUID);
 
 //------------------------------------------------------------------------------
 

From 4d497f7a9d251977bc20e7b3cff22934c012c4ee Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 03:58:23 +0100
Subject: [PATCH 230/623] Adding experimental code for boot-kernelcache-adler32

---
 i386/boot2/boot.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 832bb74..f726d08 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -421,6 +421,8 @@ void boot(int biosdev)
 
 		int retStatus = -1;
 
+		uint32_t adler32 = 0;
+
 		getAndProcessBootArguments(kernelFlags);
 
 		// Initialize bootFile (defaults to: mach_kernel).
@@ -476,6 +478,26 @@ void boot(int biosdev)
 
 			else if (GetFileInfo(NULL, gPlatform.KernelCachePath, &flags, &cachetime) == 0)
 			{
+				static char preLinkedKernelPath[128];
+				static char adler32Key[PLATFORM_NAME_LEN + ROOT_PATH_LEN];
+				
+				// unsigned long adler32 = 0;
+				
+				preLinkedKernelPath[0] = '\0';
+				
+				_BOOT_DEBUG_DUMP("Checking for pre-linked kernel...\n");
+				
+				// Zero out platform info (name and kernel root path).
+				bzero(adler32Key, sizeof(adler32Key));
+				
+				// Construct key for the pre-linked kernel checksum (generated by adler32).
+				sprintf(adler32Key, gPlatform.ModelID);
+				sprintf(adler32Key + PLATFORM_NAME_LEN, "%s", BOOT_DEVICE_PATH);
+				sprintf(adler32Key + (PLATFORM_NAME_LEN + 38), "%s", bootInfo->bootFile);
+				
+				adler32 = Adler32((unsigned char *)adler32Key, sizeof(adler32Key));
+				
+				_BOOT_DEBUG_DUMP("adler32: %08X\n", adler32);
 
 #if ((MAKE_TARGET_OS & LION) == LION) // Also for Mountain Lion, which has bit 2 set like Lion.
 
@@ -495,7 +517,7 @@ void boot(int biosdev)
 		}
 #else // Not for (Mountain) Lion, go easy with the Snow Leopard.
 
-				static char preLinkedKernelPath[128];
+				/* static char preLinkedKernelPath[128];
 				static char adler32Key[PLATFORM_NAME_LEN + ROOT_PATH_LEN];
 
 				unsigned long adler32 = 0;
@@ -514,7 +536,7 @@ void boot(int biosdev)
 				
 				adler32 = Adler32((unsigned char *)adler32Key, sizeof(adler32Key));
 				
-				_BOOT_DEBUG_DUMP("adler32: %08X\n", adler32);
+				_BOOT_DEBUG_DUMP("adler32: %08X\n", adler32); */
 				
 				// Create path to pre-linked kernel.
 				sprintf(preLinkedKernelPath, "%s/%s_%s.%08lX", gPlatform.KernelCachePath, kKernelCache, 
@@ -608,7 +630,7 @@ void boot(int biosdev)
 			
 			_BOOT_DEBUG_DUMP("execKernel-4\n");
 			
-			finalizeEFITree(); // rootUUID);
+			finalizeEFITree(adler32); // rootUUID);
 			
 			_BOOT_DEBUG_DUMP("execKernel-5\n");
 			

From e0bb37e0a23665f714e18af925459adb2577e84b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 03:58:51 +0100
Subject: [PATCH 231/623] Kernel patch for iMessage implented

---
 i386/libsaio/load.c | 81 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 67 insertions(+), 14 deletions(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index d727f3c..266ac22 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -25,6 +25,7 @@
  *
  * Updates:
  *			- White space changes (PikerAlpha, November 2012)
+ *			- Mountain Lion kernel patch for iMessage implemented (PikerAlpha, January 2013)
  *
  */
 
@@ -197,8 +198,8 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 
 		switch (cmd)
 		{
-			case LC_SEGMENT_64:
 			case LC_SEGMENT:
+			case LC_SEGMENT_64:
 				ret = DecodeSegment(cmdBase, &load_addr, &load_size);
 
 				if (ret == 0 && load_size != 0 && load_addr >= KERNEL_ADDR)
@@ -256,6 +257,14 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 	return ret;
 }
 
+#define UINT64_LE_FROM_CHARS(a,b,c,d,e,f,g,h) ( \
+((uint64_t)h << 56)	| ((uint64_t)g << 48) | \
+((uint64_t)f << 40) | ((uint64_t)e << 32) | \
+((uint64_t)d << 24) | ((uint64_t)c << 16) | \
+((uint64_t)b <<  8) | ((uint64_t)a <<  0) )
+
+#define NVRAM_GUID_UINT64 UINT64_LE_FROM_CHARS('4','D','1','E','D','E','0','5')
+#define NVRAM_OPTIONS_UINT64 UINT64_LE_FROM_CHARS('/','o','p','t','i','o','n','s')
 
 //==============================================================================
 // Private function. Called from DecodeMachO()
@@ -272,10 +281,66 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 		struct segment_command_64 *segCmd = (struct segment_command_64 *)cmdBase;
 
 		vmaddr = (segCmd->vmaddr & 0x3fffffff);
-		vmsize = segCmd->vmsize;	  
+		vmsize = segCmd->vmsize;
 		fileaddr = (gBinaryAddress + segCmd->fileoff);
 		filesize = segCmd->filesize;
 		segname = segCmd->segname;
+
+		//
+		// iMessage kernel patch
+		//
+		if (strncmp(segname, "__KLD", 5) == 0)
+		{
+			uint32_t	index = 0;
+			uint32_t	offset = sizeof(struct segment_command_64);
+
+			while(offset < segCmd->cmdsize)
+			{
+				struct section_64 *section = (struct section_64 *)((char *)segCmd + offset);
+				offset += sizeof(struct section_64);
+
+				if (strncmp((char *)section->sectname, "__cstring", 9) == 0)
+				{
+					bool guidReplaced = FALSE;
+					uint64_t sectionStart	= (fileaddr + index);
+					uint64_t sectionEnd		= (fileaddr + filesize);
+
+					unsigned char * baseAddress = (unsigned char *)sectionStart;
+
+					for (; baseAddress <= (unsigned char *)sectionEnd; baseAddress += 1)
+					{
+						// Quick lookup
+						if (*(uint64_t *)baseAddress == NVRAM_GUID_UINT64)
+						{
+							// Full lookup
+							if (strncmp((char *)baseAddress, "4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14", 36) == 0)
+							{
+								// Zero out NVRAM GUID
+								bzero((char *)baseAddress, 36);
+								// Replace inject GUID replacement
+								memcpy((char *)baseAddress, "NVRAM", 5);
+								// Point to the end of the (now former) GUID string
+								baseAddress += 36;
+								// Signal that phase one is done
+								guidReplaced = TRUE;
+							}
+						}
+						// Wait for the GUID to be replaced, then do phase two
+						if (guidReplaced && (*(uint64_t *)baseAddress == NVRAM_OPTIONS_UINT64))
+						{
+							// Replacing /option with /RevoEFI
+							memcpy((unsigned char *)baseAddress, "/RevoEFI", 8);
+							// Where done here. Bail out.
+							break;
+						}
+					}
+				}
+				else
+				{
+					index += section->size;
+				}
+			}
+		}
 	}
 	else
 	{
@@ -291,18 +356,6 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 	// Pre-flight checks.
 	if (vmsize && filesize)
 	{
-#if DEBUG
-		printf("segname: %s, vmaddr: %x, vmsize: %x, fileoff: %x, filesize: %x\n", 
-			   segname, (unsigned)vmaddr, (unsigned)vmsize, (unsigned)fileaddr, (unsigned)filesize);
-
-		if (gArchCPUType == CPU_TYPE_X86_64)
-		{
-			printf("nsects: %d, flags: %x.\n", (unsigned) segCmd->nsects, (unsigned)segCmd->flags);
-		}
-
-		getchar();
-#endif
-		
 		if (! ((vmaddr >= KERNEL_ADDR && (vmaddr + vmsize) <= (KERNEL_ADDR + KERNEL_LEN)) ||
 			   (vmaddr >= HIB_ADDR && (vmaddr + vmsize) <= (HIB_ADDR + HIB_LEN))))
 		{

From 5499383df59d8a57c4da05ba59dd76a27673b0b0 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 04:00:33 +0100
Subject: [PATCH 232/623] New global var added for SMBIOS type 1 uuid

---
 i386/libsaio/platform.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index fb970fe..a80ee3b 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -217,16 +217,18 @@ void initPlatform(int biosDevice)
 
 	_PLATFORM_DEBUG_DUMP("gPlatform.OSVersion: %s\n", gPlatform.OSVersion);
 
+	gPlatform.KernelCachePath		= strdup(kKernelCachePath);	// Used in boot.c and driver.c
+	
+	_PLATFORM_DEBUG_DUMP("Kernel cache path: %s\n", gPlatform.KernelCachePath);
+
 	gPlatform.BIOSDevice			= (biosDevice & kBIOSDevMask);	// Device number masked with 0xFF.
 	gPlatform.BootVolume			= NULL;	// Will be initialized in disk.c
 	gPlatform.BootPartitionChain	= NULL;	// Will be initialized in sys.c
 	gPlatform.RootVolume			= NULL;	// Will be initialized in disk.c (used in sys.c)
 
-	gPlatform.RAM.SlotCount			= 0;	// Will be initialized further down (used in smbios/dynamic_data.h)
+	gPlatform.UUID					= NULL;	// Will be initialized in RevoBoot/i386/libsaio/smbios/[dynamic/static]_data.h
 
-	gPlatform.KernelCachePath		= strdup(kKernelCachePath);	// Used in boot.c and driver.c
-
-	_PLATFORM_DEBUG_DUMP("Kernel cache path: %s\n", gPlatform.KernelCachePath);
+	gPlatform.RAM.SlotCount			= 0;	// Will be initialized further down (used in smbios/dynamic_data.h)
 
 #if USE_STATIC_SMBIOS_DATA
 	// We don't have to do anything when static SMBIOS data is used.

From 08066f866576c4d40ade5af0cd0260b86895b773 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 04:01:13 +0100
Subject: [PATCH 233/623] New global var added for SMBIOS type 1 uuid

---
 i386/libsaio/platform.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index e2dca81..3b1cae2 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -173,7 +173,9 @@ typedef struct _PlatformInfo_t
 	bool				BootRecoveryHD;			//
 	
 	uint32_t			allocatedVRAM;			// Amount of allocated graphics memory (UEFI-BIOS settings).
-	
+
+	uint8_t *			UUID;					// Allocated/set in RevoBoot/i386/libsaio/smbios/[dynamic/static]_data.h
+
 	struct ACPI									// Used in acpi_patcher.h
 	{
 		uint8_t			Type;					// System type. Referring to FACP->PM_Profile.

From 01f39860fa29a224448edef0408600912aa5ffd2 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 04:01:48 +0100
Subject: [PATCH 234/623] Adding two SMBIOS 2.7 items

---
 i386/libsaio/smbios/smbios.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/smbios/smbios.h b/i386/libsaio/smbios/smbios.h
index f9b89c0..f7ddf95 100755
--- a/i386/libsaio/smbios/smbios.h
+++ b/i386/libsaio/smbios/smbios.h
@@ -137,13 +137,16 @@ typedef struct SMBSystemInformation
 {
     // 2.0+ spec (8 bytes)
     SMB_STRUCT_HEADER               // Type 1
-    SMBString  manufacturer;
-    SMBString  productName;
-    SMBString  version;
-    SMBString  serialNumber;
+    SMBString	manufacturer;
+    SMBString	productName;
+    SMBString	version;
+    SMBString	serialNumber;
     // 2.1+ spec (25 bytes)
-    SMBByte    uuid[16];            // can be all 0 or all 1's
-    SMBByte    wakeupReason;        // reason for system wakeup
+    SMBByte		uuid[16];            // can be all 0 or all 1's
+    SMBByte		wakeupReason;        // reason for system wakeup
+    // 2.4+ spec (27 bytes)
+	SMBString	SKUNumber;			// System SKU#
+	SMBString	family;				// Mac, Macmini etc
 } __attribute__((packed)) SMBSystemInformation;
 
 //

From bc2aec2de1cbdcd1561edd7a90d72b7fbeea849f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 04:06:34 +0100
Subject: [PATCH 235/623] Kernel adler32 support

---
 i386/libsaio/saio_internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index 8766f89..660dbcb 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -75,7 +75,7 @@ extern void		sleep(int n);
 /* efi.c */
 extern void		initEFITree(void);
 extern void		updateEFITree(char *rootUUID);
-extern void		finalizeEFITree(void);
+extern void		finalizeEFITree(uint32_t kernelAdler32);
 
 /* bootstruct.c */
 extern void		initKernelBootConfig(void);

From 56a66723402922aaf92140584ee9ad0f9699ebb5 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 18 Jan 2013 04:08:14 +0100
Subject: [PATCH 236/623] Unused code removed and other cleanups

---
 i386/libsaio/efi.c | 228 ++++++++++++---------------------------------
 1 file changed, 60 insertions(+), 168 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 4cb15ac..658bb8c 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -63,6 +63,7 @@ void useStaticEFIProperties(Node * aEFINode)
 #endif */
 
 //==============================================================================
+// Called from RevoBoot/i386/libsaio/platform.c
 
 void initEFITree(void)
 {
@@ -193,17 +194,6 @@ void initEFITree(void)
 
 #endif
 
-	// FIXME: We should either rename this or put the data somewhere else! 
-	Node *optionsNode = DT__AddChild(gPlatform.DT.RootNode, "RevoEFI");
-
-	static EFI_UINT8 const NVRAM_ROM_DATA[] = STATIC_NVRAM_ROM;
-	DT__AddProperty(optionsNode, "NVRAM:ROM", sizeof(NVRAM_ROM_DATA), (EFI_UINT8*) &NVRAM_ROM_DATA);
-	
-	static EFI_UINT8 const NVRAM_MLB_DATA[] = STATIC_NVRAM_MLB;
-	DT__AddProperty(optionsNode, "NVRAM:MLB", sizeof(NVRAM_MLB_DATA), (EFI_UINT8*) &NVRAM_MLB_DATA);
-
-	// DT__AddProperty(chosenNode, "boot-kernelcache-adler32", sizeof(uint64_t), adler32);
-
 	gPlatform.EFI.Nodes.Chosen = chosenNode;
 
 #if INJECT_EFI_DEVICE_PROPERTIES
@@ -256,126 +246,35 @@ void initEFITree(void)
 }
 
 
-#if UNUSED_EFI_CODE
-//==============================================================================
+#ifndef SMB_STATIC_SYSTEM_UUID
+/*==============================================================================
 
-void *convertHexStr2Binary(const char *hexStr, int *outLength)
+static EFI_CHAR8 * getSmbiosUUID()
 {
-	int len;
-	char hexNibble;
-	char hexByte[2] = "";
-	uint8_t binChar;
-	uint8_t *binStr = NULL;
-	int hexStrIdx, binStrIdx, hexNibbleIdx;
+	bool error = TRUE;
 
-	len = strlen(hexStr);
+	UInt8 *p = (UInt8 *)gPlatform.UUID;
 
-	if (len > 1)
+	for (int i = 0; i < 16; i++)
 	{
-		// the resulting binary will be the half size of the input hex string
-		binStr = malloc(len / 2);
-
-		if (binStr)
+		if (p[i] != 0x00 || p[i] != 0xff)
 		{
-			binStrIdx = 0;
-			hexNibbleIdx = 0;
-	
-			for (hexStrIdx = 0; hexStrIdx < len; hexStrIdx++)
-			{
-				hexNibble = hexStr[hexStrIdx];
-
-				// ignore all chars except valid hex numbers
-				if ((hexNibble >= '0' && hexNibble <= '9') || (hexNibble >= 'A' && hexNibble <= 'F') || (hexNibble >= 'a' && hexNibble <= 'f'))
-				{
-					hexByte[hexNibbleIdx++] = hexNibble;
-
-					// found both two nibbles, convert to binary
-					if (hexNibbleIdx == 2)
-					{
-						binChar = 0;
-					
-						for (hexNibbleIdx = 0; hexNibbleIdx < sizeof(hexByte); hexNibbleIdx++)
-						{
-							if (hexNibbleIdx > 0)
-							{
-								binChar = binChar << 4;
-							}
-						
-							if (hexByte[hexNibbleIdx] <= '9')
-							{
-								binChar += hexByte[hexNibbleIdx] - '0';
-							}
-							else if (hexByte[hexNibbleIdx] <= 'F')
-							{
-								binChar += hexByte[hexNibbleIdx] - ('A' - 10);
-							}
-							else if (hexByte[hexNibbleIdx] <= 'f')
-							{
-								binChar += hexByte[hexNibbleIdx] - ('a' - 10);
-							}
-						}
-					
-						binStr[binStrIdx++] = binChar;
-						hexNibbleIdx = 0;
-					}
-				}
-			}
-
-			*outLength = binStrIdx;
-
-			return binStr;
+			error = FALSE;
 		}
 	}
 
-	*outLength = 0;
-
-	return NULL;
-}
-//==============================================================================
-
-
-static EFI_UINT32* getUUIDFromString(const char * givenUUID) // Patch by: rekursor (rewrite by Master Chief).
-{
-	if (givenUUID) // Sanity check.
+	if (error)
 	{
-		static char errStr[] = "getUUIDFromString: Invalid SystemID - ";
-		
-		if (strlen(givenUUID) == 36) // Real UUID's only please.
-		{
-			int size = 0;
-			char szUUID[37]; // 0-35 (36) + 1
-			char *p = szUUID;
-			
-			while (*givenUUID)
-			{
-				if (*givenUUID != '-')
-				{
-					*p++ = *givenUUID++;
-				}
-				else
-				{
-					givenUUID++;
-				}
-			}
-			*p = '\0';
-			void* binaryString = convertHexStr2Binary(szUUID, &size);
-			
-			if (binaryString && size == 16)
-			{
-				return (EFI_UINT32*) binaryString;
-			}
-			
-			verbose("%swrong format maybe?\n", errStr);
-		}
-		else
-		{
-			verbose("%slength should be 36.\n", errStr);
-		}
+		printf("No proper UUID found in the System Information Table\n");
+		return NULL;
 	}
-	return (EFI_UINT32*) 0;
+
+	return (EFI_CHAR8 *)gPlatform.UUID;
 }
+ */
 #endif
 
+
 //==============================================================================
 // Stage two EFI initialization (after getting data from com.apple.Boot.plist).
 
@@ -383,37 +282,14 @@ void updateEFITree(char *rootUUID)
 {
 	_EFI_DEBUG_DUMP("In updateEFITree(%s)\n", rootUUID);
 
-	static EFI_CHAR8 const SYSTEM_ID[] = STATIC_SYSTEM_ID;
-
-	// This is your hardcoded SYSTEM_ID (see: config/settings.h).
-	EFI_UINT32 * targetUUID = (EFI_UINT32 *) &SYSTEM_ID;
-
-#if UNUSED_EFI_CODE
-	// Feature to set your own, uuidgen generated string in com.apple.Boot.plist
-	// Note: Unsupported feature in Revolution (you need to compile it anyway).
-
-	const char* userDefinedUUID = newStringForKey("SystemID", &bootInfo->bootConfig);
-	
-	if (userDefinedUUID)
+	// Only accept a UUID with the correct length.
+	if (strlen(rootUUID) == 36)
 	{
-		targetUUID = getUUIDFromString(userDefinedUUID);
-
-		if (targetUUID)
-		{
-			_EFI_DEBUG_DUMP("Customizing SystemID with: %s\n", userDefinedUUID);
-		}
-
-		free ((void*) userDefinedUUID);
+		_EFI_DEBUG_DUMP("Initializing property boot-uuid (%s)\n", rootUUID);
+		
+		DT__AddProperty(gPlatform.EFI.Nodes.Chosen, "boot-uuid", 37, rootUUID);
 	}
 
-#endif
-
-	DT__AddProperty(gPlatform.EFI.Nodes.Platform, "system-id", 16, targetUUID);
-	// gPlatform.EFI.Nodes.Platform = NULL;
-
-	setRootUUID(gPlatform.EFI.Nodes.Chosen, rootUUID);
-	// gPlatform.EFI.Nodes.Chosen = NULL;
-
 	/* 
 	 * Check the architectures' target (boot) mode against the chosen setting of  
 	 * EFI_64_BIT, which may not fit well and throw the dreadful
@@ -431,25 +307,6 @@ void updateEFITree(char *rootUUID)
 }
 
 
-//==============================================================================
-// Called from initEFITree() and execKernel() in boot.c
-
-bool setRootUUID(Node *chosenNode, char *rootUUID)
-{
-	// Only accept a UUID with the correct length.
-	if (strlen(rootUUID) == 36)
-	{
-		_EFI_DEBUG_DUMP("Initializing property boot-uuid (%s)\n", rootUUID);
-
-		DT__AddProperty(chosenNode, "boot-uuid", 37, rootUUID);
-
-		return 0;
-	}
-
-	return -1;
-}
-
-
 #if INCLUDE_MPS_TABLE
 //==============================================================================
 
@@ -494,13 +351,13 @@ bool initMultiProcessorTableAdress(void)
 //==============================================================================
 // Called from execKernel() in boot.c
 
-void finalizeEFITree(void)
+void finalizeEFITree(EFI_UINT32 kernelAdler32)
 {
-	_EFI_DEBUG_DUMP("Calling setupEFITables(");
+	_EFI_DEBUG_DUMP("done).Calling setupEFITables(");
 
 	setupEFITables();
-
-	_EFI_DEBUG_DUMP("done).\nCalling setupSMBIOS(");
+	
+	DT__AddProperty(gPlatform.EFI.Nodes.Chosen, "boot-kernelcache-adler32", sizeof(EFI_UINT32), (EFI_UINT32*)kernelAdler32);
 
 	setupSMBIOS();
 
@@ -508,6 +365,41 @@ void finalizeEFITree(void)
 
 	addConfigurationTable(&gPlatform.SMBIOS.Guid, &gPlatform.SMBIOS.BaseAddress, NULL);
 
+#ifdef SMB_STATIC_SYSTEM_UUID
+	// Static UUID from: RevoBoot/i386/config/SETTINGS/MacModelNN.h
+	static EFI_CHAR8 const SYSTEM_ID[] = SMB_STATIC_SYSTEM_UUID;
+	
+	DT__AddProperty(gPlatform.EFI.Nodes.Platform, "system-id", 16, (EFI_CHAR8 *) &SYSTEM_ID);
+#else
+	// DT__AddProperty(gPlatform.EFI.Nodes.Platform, "system-id", 16, getSmbiosUUID());
+	DT__AddProperty(gPlatform.EFI.Nodes.Platform, "system-id", 16, (EFI_CHAR8 *)gPlatform.UUID);
+#endif
+	
+	//
+	// Start of experimental code
+	//
+	
+	Node *revoEFINode = DT__AddChild(gPlatform.DT.RootNode, "RevoEFI");
+	
+#ifdef STATIC_NVRAM_ROM
+	static EFI_UINT8 const NVRAM_ROM_DATA[] = STATIC_NVRAM_ROM;
+#else
+#ifdef SMB_STATIC_SYSTEM_UIID
+	static EFI_UINT8 const NVRAM_ROM_DATA[] = SMB_STATIC_SYSTEM_UUID;
+#else
+	static EFI_UINT8 const NVRAM_ROM_DATA[] = gPlatform.UUID;
+#endif
+#endif
+	
+	DT__AddProperty(revoEFINode, "NVRAM:ROM", sizeof(NVRAM_ROM_DATA), (EFI_UINT8 *) &NVRAM_ROM_DATA);
+	
+	static EFI_UINT8 const NVRAM_MLB_DATA[] = STATIC_NVRAM_MLB;
+	DT__AddProperty(revoEFINode, "NVRAM:MLB", sizeof(NVRAM_MLB_DATA), (EFI_UINT8 *) &NVRAM_MLB_DATA);
+
+	//
+	// End of experimental code
+	//
+
 #if INCLUDE_MPS_TABLE
 	// This BIOS includes a MP table?
 	if (initMultiProcessorTableAdress())

From 83430f6de55fa7475241923d0fad73c532c46f0f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 23 Jan 2013 07:37:05 +0100
Subject: [PATCH 237/623] Data for iMac13,2 and MacBookPro9,2 added

Also updated some BIOS versions of other models
---
 i386/libsaio/smbios/model_data.h | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index bd8cc19..66c9bae 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -21,6 +21,7 @@
  *			- SMB_PRODUCT_NAME renamed/moved over from settings.h (PikerAlpha, October 2012).
  *			- EFI_MODEL_NAME renamed/moved over from settings.h (PikerAlpha, October 2012).
  *			- Data for new MacBookPro and Macmini added (PikerAlpha, October 2012).
+ *			- Data for iMac13,2 and MacBookPro9,2 added (PikerAlpha, October 2013).
  *
  * Credits:
  *			- blackosx, DB1, dgsga, FKA, humph, scrax and STLVNUB (testers).
@@ -31,11 +32,15 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"Mac"
 
-	#if (TARGET_MODEL == IMAC_131)
-		// Intel Core i7-3770 @ 3.40 GHz - 4 Cores / 8 Threads.
+	#if (TARGET_MODEL == IMAC_132)
 		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
-		#define SMB_PRODUCT_NAME	"iMac13,1"
+		#define SMB_PRODUCT_NAME	"iMac13,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FC02E91DDD3FA6A4"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '2' }
+	#elif (TARGET_MODEL == IMAC_131)
+		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
+		#define SMB_PRODUCT_NAME	"iMac13,1"
+		#define SMB_BOARD_PRODUCT	"Mac-00BE6ED71E35EB86"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '1' }
 	#elif (TARGET_MODEL == IMAC_122)
 		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
@@ -110,22 +115,28 @@
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '1' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_91)
 		// Intel Core i7-3820QM @ 2.70 GHz - 4 cores / 8 threads.
-		#define SMB_BIOS_VERSION	"MBP91.88Z.00D3.B00.1203211536"
+		#define SMB_BIOS_VERSION	"MBP91.88Z.00D3.B02.1203281326"
 		#define SMB_PRODUCT_NAME	"MacBookPro9,1"
 		#define SMB_BOARD_PRODUCT	"Mac-4B7AC7E43945597E"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '9', ',', '1' }
+	#elif (TARGET_MODEL == MACBOOK_PRO_92)
+		// Intel Core i7-3820QM @ 2.70 GHz - 4 cores / 8 threads.
+		#define SMB_BIOS_VERSION	"MBP91.88Z.00D3.B02.1203281326"
+		#define SMB_PRODUCT_NAME	"MacBookPro9,2"
+		#define SMB_BOARD_PRODUCT	"Mac-6F01561E16C75D06"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '9', ',', '2' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_83)
-		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B24.1110141131"
+		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
 		#define SMB_PRODUCT_NAME	"MacBookPro8,3"
 		#define SMB_BOARD_PRODUCT	"Mac-942459F5819B171B"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '3' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_82)
-		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B24.1110141131"
+		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
 		#define SMB_PRODUCT_NAME	"MacBookPro8,2"
 		#define SMB_BOARD_PRODUCT	"Mac-94245A3940C91C80"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '2' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_81)
-		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B24.1110141131"
+		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
 		#define SMB_PRODUCT_NAME	"MacBookPro8,1"
 		#define SMB_BOARD_PRODUCT	"Mac-94245B3640C91C81"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '1' }

From ae397ab67ef0f422b88a40e5af1550e5bda31db6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 23 Jan 2013 07:38:30 +0100
Subject: [PATCH 238/623] Comment added

---
 i386/libsaio/cpu/Intel/static_data.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/Intel/static_data.h b/i386/libsaio/cpu/Intel/static_data.h
index 483f4e7..69d28db 100644
--- a/i386/libsaio/cpu/Intel/static_data.h
+++ b/i386/libsaio/cpu/Intel/static_data.h
@@ -17,7 +17,8 @@ void initCPUStruct(void)
 {
 	gPlatform.CPU.Vendor		= CPU_VENDOR_ID;			// Used in ACPI/patcher.h
 
-	gPlatform.CPU.Type			= STATIC_CPU_Type;			// Used in SMBIOS/dynamic_data.h, 'About This Mac' and System Profiler.
+	gPlatform.CPU.Type			= STATIC_CPU_Type;			// Used in SMBIOS/dynamic_data.h and ACPI/SSDT_PR
+															// Affects CPU type in 'About This Mac' and System Profiler.
 
 	gPlatform.CPU.NumCores		= STATIC_CPU_NumCores;		// machdep.cpu.cores_per_package - used in: ACPI/ssdt_pm_generator.h
 	gPlatform.CPU.NumThreads	= STATIC_CPU_NumThreads;	// machdep.cpu.logical_per_package - used in: ACPI/ssdt_pm_generator.h

From 13484752024a8e8dbcf3857051dd14ebc26de9b1 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 23 Jan 2013 07:38:41 +0100
Subject: [PATCH 239/623] Whitespace only change

---
 i386/libsaio/cpu/Intel/dynamic_data.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 45c40f3..fc63c5f 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -520,7 +520,7 @@ void initCPUStruct(void)
 
 	_CPU_DEBUG_DUMP("                             123456789 123456789 123456789 123456789 12345678\n");
 	_CPU_DEBUG_DUMP("CPU: Brandstring           : %s\n",				gPlatform.CPU.BrandString);
-	_CPU_DEBUG_DUMP("CPU: Vendor/Model/ExtModel : 0x%x/0x%x/0x%x\n",		gPlatform.CPU.Vendor, gPlatform.CPU.Model, gPlatform.CPU.ExtModel);
+	_CPU_DEBUG_DUMP("CPU: Vendor/Model/ExtModel : 0x%x/0x%x/0x%x\n",	gPlatform.CPU.Vendor, gPlatform.CPU.Model, gPlatform.CPU.ExtModel);
 	_CPU_DEBUG_DUMP("CPU: Stepping / Signature  : 0x%x/0x%x\n",			gPlatform.CPU.Stepping, gPlatform.CPU.Signature);
 	_CPU_DEBUG_DUMP("CPU: Family/ExtFamily      : 0x%x/0x%x\n",			gPlatform.CPU.Family, gPlatform.CPU.ExtFamily);
 	_CPU_DEBUG_DUMP("CPU: Type                  : 0x%x\n",				gPlatform.CPU.Type);

From 1d7b59cfadd30ad15ee33c797b0f74e1038aa738 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 23 Jan 2013 07:39:25 +0100
Subject: [PATCH 240/623] Smaller/faster workaround for iMessage

---
 i386/libsaio/load.c | 64 ++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 266ac22..4d6bd85 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -43,6 +43,10 @@
 	#define LC_MAIN (0x28|LC_REQ_DYLD) /* replacement for LC_UNIXTHREAD */
 #endif
 
+#define NVRAM_GUID_UINT64		0x3530454445314434
+#define OPTIONS_STRING_UINT64	0x736e6f6974706f2f
+
+
 // Load MKext(s) or separate kexts (default behaviour / behavior).
 bool gLoadKernelDrivers = true;
 
@@ -257,14 +261,6 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 	return ret;
 }
 
-#define UINT64_LE_FROM_CHARS(a,b,c,d,e,f,g,h) ( \
-((uint64_t)h << 56)	| ((uint64_t)g << 48) | \
-((uint64_t)f << 40) | ((uint64_t)e << 32) | \
-((uint64_t)d << 24) | ((uint64_t)c << 16) | \
-((uint64_t)b <<  8) | ((uint64_t)a <<  0) )
-
-#define NVRAM_GUID_UINT64 UINT64_LE_FROM_CHARS('4','D','1','E','D','E','0','5')
-#define NVRAM_OPTIONS_UINT64 UINT64_LE_FROM_CHARS('/','o','p','t','i','o','n','s')
 
 //==============================================================================
 // Private function. Called from DecodeMachO()
@@ -286,13 +282,16 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 		filesize = segCmd->filesize;
 		segname = segCmd->segname;
 
+#if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
 		//
-		// iMessage kernel patch
+		// Kernel patch routine for iMessage
 		//
+		// This segment will be replaced by random data (since 18 April 2011) and released
+		// when the kernel is done with it. Meaning that our data is short lived as well.
 		if (strncmp(segname, "__KLD", 5) == 0)
 		{
-			uint32_t	index = 0;
-			uint32_t	offset = sizeof(struct segment_command_64);
+			uint32_t	index	= 0;
+			uint32_t	offset	= sizeof(struct segment_command_64);
 
 			while(offset < segCmd->cmdsize)
 			{
@@ -301,46 +300,47 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 
 				if (strncmp((char *)section->sectname, "__cstring", 9) == 0)
 				{
-					bool guidReplaced = FALSE;
 					uint64_t sectionStart	= (fileaddr + index);
 					uint64_t sectionEnd		= (fileaddr + filesize);
 
 					unsigned char * baseAddress = (unsigned char *)sectionStart;
 
-					for (; baseAddress <= (unsigned char *)sectionEnd; baseAddress += 1)
+					// Search for the NVRAM GUID.
+					for (; baseAddress <= (unsigned char *)sectionEnd; baseAddress++)
 					{
-						// Quick lookup
 						if (*(uint64_t *)baseAddress == NVRAM_GUID_UINT64)
 						{
-							// Full lookup
-							if (strncmp((char *)baseAddress, "4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14", 36) == 0)
+							// Zero out NVRAM GUID
+							bzero((char *)baseAddress, 36);
+							// Replace/inject GUID replacement
+							memcpy((char *)baseAddress, "NVRAM", 5);
+							// Point to the end of the (former) NVRAM GUID string
+							baseAddress += 36;
+
+							// Search for "/options" after the GUID.
+							for (; baseAddress <= (unsigned char *)sectionEnd; baseAddress++)
 							{
-								// Zero out NVRAM GUID
-								bzero((char *)baseAddress, 36);
-								// Replace inject GUID replacement
-								memcpy((char *)baseAddress, "NVRAM", 5);
-								// Point to the end of the (now former) GUID string
-								baseAddress += 36;
-								// Signal that phase one is done
-								guidReplaced = TRUE;
+								if (*(uint64_t *)baseAddress == OPTIONS_STRING_UINT64)
+								{
+									// Rename /option to /RevoEFI (just temporarily)
+									memcpy((unsigned char *)baseAddress, "/RevoEFI", 8);
+									// Prepare to break out early.
+									baseAddress = (unsigned char *)(sectionEnd + 1);
+									// Done.
+									break;
+								}
 							}
 						}
-						// Wait for the GUID to be replaced, then do phase two
-						if (guidReplaced && (*(uint64_t *)baseAddress == NVRAM_OPTIONS_UINT64))
-						{
-							// Replacing /option with /RevoEFI
-							memcpy((unsigned char *)baseAddress, "/RevoEFI", 8);
-							// Where done here. Bail out.
-							break;
-						}
 					}
 				}
 				else
 				{
+					// Skip unwanted sections (which makes us a little faster).
 					index += section->size;
 				}
 			}
 		}
+#endif
 	}
 	else
 	{

From 2175809a2a07850c798242c95444ebd221e205d3 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 23 Jan 2013 07:42:08 +0100
Subject: [PATCH 241/623] Removing unused code

---
 i386/libsaio/efi.c | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 658bb8c..91ea9a2 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -42,26 +42,6 @@
 #include "efi/fake_efi.h"
 
 
-/* #if LOAD_MODEL_SPECIFIC_EFI_DATA
-//==============================================================================
-
-void useStaticEFIProperties(Node * aEFINode)
-{
-	// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
-	#include STRING(EFI_DATA_FILE)
-	
-	static EFI_UINT8 const EFI_DEVICE_PROPERTIES[] =
-	{
-		// Replaced with data from: RevoBoot/i386/config/EFI/[data-template/MacModelNN].h
-		STATIC_EFI_DEVICE_PROPERTIES
-	};
-	
-	DT__AddProperty(aEFINode, "device-properties", sizeof(EFI_DEVICE_PROPERTIES), (EFI_CHAR8*) &EFI_DEVICE_PROPERTIES);
-	
-	// _EFI_DEBUG_DUMP("Using statically linked EFI device-properties\n");
-}
-#endif */
-
 //==============================================================================
 // Called from RevoBoot/i386/libsaio/platform.c
 
@@ -191,7 +171,6 @@ void initEFITree(void)
 	// Adding the options node breaks AppleEFINVRAM (missing hardware UUID).
 	// Node *optionsNode = DT__AddChild(gPlatform.DT.RootNode, "options");
 	// DT__AddProperty(optionsNode, "EFICapsuleResult", 4, "STAR"); // 53 54 41 52
-
 #endif
 
 	gPlatform.EFI.Nodes.Chosen = chosenNode;
@@ -384,11 +363,11 @@ void finalizeEFITree(EFI_UINT32 kernelAdler32)
 #ifdef STATIC_NVRAM_ROM
 	static EFI_UINT8 const NVRAM_ROM_DATA[] = STATIC_NVRAM_ROM;
 #else
-#ifdef SMB_STATIC_SYSTEM_UIID
-	static EFI_UINT8 const NVRAM_ROM_DATA[] = SMB_STATIC_SYSTEM_UUID;
-#else
-	static EFI_UINT8 const NVRAM_ROM_DATA[] = gPlatform.UUID;
-#endif
+	#ifdef SMB_STATIC_SYSTEM_UIID
+		static EFI_UINT8 const NVRAM_ROM_DATA[] = SMB_STATIC_SYSTEM_UUID;
+	#else
+		static EFI_UINT8 const NVRAM_ROM_DATA[] = gPlatform.UUID;
+	#endif
 #endif
 	
 	DT__AddProperty(revoEFINode, "NVRAM:ROM", sizeof(NVRAM_ROM_DATA), (EFI_UINT8 *) &NVRAM_ROM_DATA);

From 4f3eee1608813a59713ad51e30972f6b7b5a47cb Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 23 Jan 2013 07:48:25 +0100
Subject: [PATCH 242/623] Sam's ssdtPRGen.sh

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 357 +++++++++++++++++++++++++++
 1 file changed, 357 insertions(+)
 create mode 100755 i386/libsaio/acpi/Tools/ssdtPRGen.sh

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
new file mode 100755
index 0000000..03577f4
--- /dev/null
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -0,0 +1,357 @@
+#!/bin/sh
+#
+# Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
+#
+# Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
+#
+
+# set -x # Used for tracing errors (can be put anywhere in the script).
+
+#================================= GLOBAL VARS ==================================
+
+ssdtPR=/tmp/ssdt-pr.dsl
+
+ssdtID=ssdt-pr
+
+#
+# Lowest possible idle frequency (800 for mobile processors).
+#
+
+baseFrequency=1500
+
+#CPU='i5-2410M','i5-2510E','i5-2515E','i5-2520M','i5-2537M','i5-2540M','i5-2557M',\
+#'i5-3210M','i5-3317U','i5-3320M','i5-3360M','i5-3427U','i5-3610ME'
+
+#TDP=		35,35,35,35,17,35,17,35,17,35,35,17,25
+
+#CLOCKSPEED=	23,25,25,25,14,26,17,25,17,26,28,18,27
+
+#MAXTURBO=	29,31,31,32,23,33,27,31,26,33,35,28,33
+
+#THREADS=	04,04,04,04,04,04,04,04,04,04,04,04,04
+
+
+#--------------------------------------------------------------------------------
+
+function _printHeader()
+{
+	echo '/*'                                                               >  $ssdtPR
+	echo ' * Intel ACPI Component Architecture'                             >> $ssdtPR
+	echo ' * AML Disassembler version 20120620-64 [Jun 20 2012]'            >> $ssdtPR
+	echo ' * Copyright (c) 2000 - 2012 Intel Corporation'                   >> $ssdtPR
+	echo ' * '                                                              >> $ssdtPR
+	echo ' * Original Table Header:'                                        >> $ssdtPR
+	echo ' *     Signature        "SSDT"'                                   >> $ssdtPR
+	echo ' *     Length           0x0000036A (874)'                         >> $ssdtPR
+	echo ' *     Revision         0x01'                                     >> $ssdtPR
+	echo ' *     Checksum         0x98'                                     >> $ssdtPR
+	echo ' *     OEM ID           "APPLE "'                                 >> $ssdtPR
+	echo ' *     OEM Table ID     "CpuPm"'                                  >> $ssdtPR
+	echo ' *     OEM Revision     0x00001000 (4096)'                        >> $ssdtPR
+	echo ' *     Compiler ID      "INTL"'                                   >> $ssdtPR
+	echo ' *     Compiler Version 0x20120620 (537985814)'                   >> $ssdtPR
+	echo ' */'                                                              >> $ssdtPR
+	echo ''                                                                 >> $ssdtPR
+	echo 'DefinitionBlock ("'$ssdtID'.aml", "SSDT", 1, "APPLE ", "CpuPm", 0x00001000)'>> $ssdtPR
+	echo '{'                                                                >> $ssdtPR
+}
+
+
+#--------------------------------------------------------------------------------
+
+function _printExternals()
+{
+	currentCPU=0;
+
+	while [ $currentCPU -lt $1 ]; do
+		echo '    External (\_PR_.CPU'$currentCPU', DeviceObj)'             >> $ssdtPR
+		let currentCPU+=1
+	done
+
+	echo ''                                                                 >> $ssdtPR
+}
+
+
+#--------------------------------------------------------------------------------
+
+function _printProcessorDefinitions()
+{
+	currentCPU=0;
+
+	while [ $currentCPU -lt $1 ]; do
+		echo '    External (\_PR_.CPU'$currentCPU', DeviceObj)'             >> $ssdtPR
+		let currentCPU+=1
+	done
+
+	echo ''                                                                 >> $ssdtPR
+}
+
+#--------------------------------------------------------------------------------
+
+function _printScopeStart()
+{
+	echo '    Scope (_PR.CPU0)'                                             >> $ssdtPR
+	echo '    {'                                                            >> $ssdtPR
+
+    #
+    # Check number of Turbo states (for IASL optimization).
+    #
+
+    if [ $1 -eq 0 ];
+        then
+            echo '        Name (APSN, Zero)'                                >> $ssdtPR
+        else
+            printf "        Name (APSN, 0x%02X" $1                          >> $ssdtPR
+            echo ')'                                                        >> $ssdtPR
+    fi
+
+   printf "        Name (APSS, Package (0x%02X" $2                          >> $ssdtPR
+
+	echo ')'                                                                >> $ssdtPR
+	echo '        {'                                                        >> $ssdtPR
+}
+
+
+#--------------------------------------------------------------------------------
+
+function _printPackages()
+{
+	let tdp=($1*1000)
+	let maxNonTurboFrequency=$2
+	let frequency=$3
+	let max_ratio=($frequency/100)
+
+	while [ $frequency -gt $baseFrequency ]; do
+		echo ''                                                             >> $ssdtPR
+		echo '            Package (0x06)'                                   >> $ssdtPR
+		echo '            {'                                                >> $ssdtPR
+
+		printf "                0x%04X" $frequency                          >> $ssdtPR
+
+		echo ','                                                            >> $ssdtPR
+
+		let ratio=$frequency/100
+        
+        if [ $frequency -lt $maxNonTurboFrequency ];
+            then
+                power=$(echo "scale=6;m=((1.1-(($max_ratio-$ratio)*0.00625))/1.1);(($ratio/$max_ratio)*(m*m)*$tdp);" | bc | sed -e 's/.[0-9A-F]*$//')
+            else
+                power=$tdp
+        fi
+
+		printf "                0x%08X" $power                              >> $ssdtPR
+
+		echo ','                                                            >> $ssdtPR
+
+		echo '                0x0A,'                                        >> $ssdtPR
+		echo '                0x0A,'                                        >> $ssdtPR
+ 
+		printf "                0x%02X" $ratio                              >> $ssdtPR
+
+		echo '00,'                                                          >> $ssdtPR
+
+		printf "                0x%02X" $ratio                              >> $ssdtPR
+
+		echo '00'                                                           >> $ssdtPR
+
+		let frequency-=100
+
+		if [ $frequency -eq $baseFrequency ];
+			then
+				echo '            }'                                        >> $ssdtPR
+			else
+				echo '            },'                                       >> $ssdtPR
+		fi
+	done
+
+	echo '        })'                                                       >> $ssdtPR
+}
+
+
+#--------------------------------------------------------------------------------
+
+function _printCSTScope()
+{
+	echo ''                                                                 >> $ssdtPR
+	echo '        Method (ACST, 0, NotSerialized)'                          >> $ssdtPR
+	echo '        {'                                                        >> $ssdtPR
+	echo '            Return (Package (0x06)'                               >> $ssdtPR
+	echo '            {'                                                    >> $ssdtPR
+	echo '                One,'                                             >> $ssdtPR
+	echo '                0x04,'                                            >> $ssdtPR
+	echo '                Package (0x04)'                                   >> $ssdtPR
+	echo '                {'                                                >> $ssdtPR
+	echo '                    ResourceTemplate ()'                          >> $ssdtPR
+	echo '                    {'                                            >> $ssdtPR
+	echo '                        Register (FFixedHW,'                      >> $ssdtPR
+	echo '                            0x01,               // Bit Width'		>> $ssdtPR
+	echo '                            0x02,               // Bit Offset'	>> $ssdtPR
+	echo '                            0x0000000000000000, // Address'		>> $ssdtPR
+	echo '                            0x01,               // Access Size'	>> $ssdtPR
+	echo '                            )'                                    >> $ssdtPR
+	echo '                    },'                                           >> $ssdtPR
+	echo ''                                                                 >> $ssdtPR
+	echo '                    One,'                                         >> $ssdtPR
+	echo '                    0x03,'                                        >> $ssdtPR
+	echo '                    0x03E8'                                       >> $ssdtPR
+	echo '                },'                                               >> $ssdtPR
+	echo ''                                                                 >> $ssdtPR
+	echo '                Package (0x04)'                                   >> $ssdtPR
+	echo '                {'                                                >> $ssdtPR
+	echo '                    ResourceTemplate ()'                          >> $ssdtPR
+	echo '                    {'                                            >> $ssdtPR
+	echo '                        Register (FFixedHW,'                      >> $ssdtPR
+	echo '                            0x01,               // Bit Width'		>> $ssdtPR
+	echo '                            0x02,               // Bit Offset'	>> $ssdtPR
+	echo '                            0x0000000000000010, // Address'		>> $ssdtPR
+	echo '                            0x03,               // Access Size'	>> $ssdtPR
+	echo '                            )'                                    >> $ssdtPR
+	echo '                    },'                                           >> $ssdtPR
+	echo ''                                                                 >> $ssdtPR
+	echo '                    0x03,'                                        >> $ssdtPR
+	echo '                    0xCD,'                                        >> $ssdtPR
+	echo '                    0x01F4'                                       >> $ssdtPR
+	echo '                },'                                               >> $ssdtPR
+	echo ''                                                                 >> $ssdtPR
+	echo '                Package (0x04)'                                   >> $ssdtPR
+	echo '                {'                                                >> $ssdtPR
+	echo '                    ResourceTemplate ()'                          >> $ssdtPR
+	echo '                    {'                                            >> $ssdtPR
+	echo '                        Register (FFixedHW,'                      >> $ssdtPR
+	echo '                            0x01,               // Bit Width'		>> $ssdtPR
+	echo '                            0x02,               // Bit Offset'	>> $ssdtPR
+	echo '                            0x0000000000000020, // Address'		>> $ssdtPR
+	echo '                            0x03,               // Access Size'	>> $ssdtPR
+	echo '                            )'                                    >> $ssdtPR
+	echo '                    },'                                           >> $ssdtPR
+	echo ''                                                                 >> $ssdtPR
+	echo '                    0x06,'                                        >> $ssdtPR
+	echo '                    0xF5,'                                        >> $ssdtPR
+	echo '                    0x015E'                                       >> $ssdtPR
+	echo '                },'                                               >> $ssdtPR
+	echo ''                                                                 >> $ssdtPR
+	echo '                Package (0x04)'                                   >> $ssdtPR
+	echo '                {'                                                >> $ssdtPR
+	echo '                    ResourceTemplate ()'                          >> $ssdtPR
+	echo '                    {'                                            >> $ssdtPR
+	echo '                        Register (FFixedHW,'                      >> $ssdtPR
+	echo '                            0x01,               // Bit Width'		>> $ssdtPR
+	echo '                            0x02,               // Bit Offset'	>> $ssdtPR
+	echo '                            0x0000000000000030, // Address'		>> $ssdtPR
+	echo '                            0x03,               // Access Size'	>> $ssdtPR
+	echo '                            )'                                    >> $ssdtPR
+	echo '                    },'                                           >> $ssdtPR
+	echo ''                                                                 >> $ssdtPR
+	echo '                    0x07,'                                        >> $ssdtPR
+	echo '                    0xF5,'                                        >> $ssdtPR
+	echo '                    0xC8'                                         >> $ssdtPR
+	echo '                }'                                                >> $ssdtPR
+	echo '            })'                                                   >> $ssdtPR
+	echo '        }'                                                        >> $ssdtPR
+	echo '    }'                                                            >> $ssdtPR
+}
+
+
+#--------------------------------------------------------------------------------
+
+function _printCPUScopes()
+{
+	currentCPU=1;
+
+	while [ $currentCPU -lt $1 ]; do
+		echo ''                                                             >> $ssdtPR
+		echo '    Scope (\_PR.CPU'$currentCPU')'                            >> $ssdtPR
+		echo '    {'                                                        >> $ssdtPR
+		echo '        Method (APSS, 0, NotSerialized)'                      >> $ssdtPR
+		echo '        {'                                                    >> $ssdtPR
+		echo '            Return (\_PR.CPU0.APSS)'                          >> $ssdtPR
+		echo '        }'                                                    >> $ssdtPR
+		echo '    }'                                                        >> $ssdtPR
+		let currentCPU+=1
+	done
+
+	echo '}'                                                                >> $ssdtPR
+}
+
+
+#--------------------------------------------------------------------------------
+#
+# Only administrators (root) are allowed to run this script.
+#
+#--------------------------------------------------------------------------------
+
+function _isRoot()
+{
+  if [ $(id -u) != 0 ]; then
+      echo "This script must be run as root" 1>&2
+      exit 1
+  fi
+
+  echo 1
+}
+
+
+#--------------------------------------------------------------------------------
+
+function main()
+{
+    #
+    # Command line arguments.
+    #
+
+    let tdp=$1
+    let maxTurboFrequency=$2
+
+    #
+    # Do not change anything below this line!
+    #
+
+	#let logicalCPUs=$(echo `sysctl hw.logicalcpu` | sed -e 's/^hw.logicalcpu: //')
+    let logicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
+
+	let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
+    let frequency=($frequency / 1000000)
+
+    #
+    # Get number of Turbo states.
+    #
+
+    let turboStates=$(echo "(($maxTurboFrequency - $frequency) / 100)" | bc)
+
+    #
+    # Check number of Turbo states.
+    #
+
+    if [ $turboStates -lt 0 ];
+        then
+            let turboStates=0
+    fi
+
+    let packageLength=$(echo "(($maxTurboFrequency - $baseFrequency) / 100)" | bc)
+
+    _printHeader
+	_printExternals $logicalCPUs
+	_printScopeStart $turboStates $packageLength
+	_printPackages $tdp $frequency $maxTurboFrequency
+	_printCSTScope
+	_printCPUScopes $logicalCPUs
+}
+
+
+#==================================== START =====================================
+ 
+#
+# Check number of arguments.
+#
+
+if [ $# -eq 2 ];
+    then
+        main $1 $2
+    else
+        echo "Usage: $0 TDP MaxTurboFrequency"
+        exit 1
+fi
+
+#================================================================================
+
+exit 0

From 2f7e79b8cb6bce37617046585c5caf2c194002bc Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 23 Jan 2013 07:51:35 +0100
Subject: [PATCH 243/623] Adding Ivybridge support

Filename fixed thanks to Dave,
Namescape error fixed thanks to toleda
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 164 +++++++++++++++++++--------
 1 file changed, 117 insertions(+), 47 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 03577f4..2c886af 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,6 +3,12 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
+# Version 1.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+#
+# Updates:
+#			- Added support for Ivybridge (Pike, January, 2013)
+#			- Filename error fixed (Pike, January, 2013)
+#			- Namespace error fixed in _printScopeStart (Pike, January, 2013)
 #
 
 # set -x # Used for tracing errors (can be put anywhere in the script).
@@ -11,26 +17,14 @@
 
 ssdtPR=/tmp/ssdt-pr.dsl
 
-ssdtID=ssdt-pr
+ssdtID=ssdt_pr
 
 #
-# Lowest possible idle frequency (800 for mobile processors).
+# Lowest possible idle frequency minus 100.
 #
 
 baseFrequency=1500
 
-#CPU='i5-2410M','i5-2510E','i5-2515E','i5-2520M','i5-2537M','i5-2540M','i5-2557M',\
-#'i5-3210M','i5-3317U','i5-3320M','i5-3360M','i5-3427U','i5-3610ME'
-
-#TDP=		35,35,35,35,17,35,17,35,17,35,35,17,25
-
-#CLOCKSPEED=	23,25,25,25,14,26,17,25,17,26,28,18,27
-
-#MAXTURBO=	29,31,31,32,23,33,27,31,26,33,35,28,33
-
-#THREADS=	04,04,04,04,04,04,04,04,04,04,04,04,04
-
-
 #--------------------------------------------------------------------------------
 
 function _printHeader()
@@ -90,22 +84,38 @@ function _printProcessorDefinitions()
 
 function _printScopeStart()
 {
-	echo '    Scope (_PR.CPU0)'                                             >> $ssdtPR
+	echo '    Scope (\_PR.CPU0)'                                            >> $ssdtPR
 	echo '    {'                                                            >> $ssdtPR
 
-    #
-    # Check number of Turbo states (for IASL optimization).
-    #
+	let packageLength=$2
 
-    if [ $1 -eq 0 ];
-        then
-            echo '        Name (APSN, Zero)'                                >> $ssdtPR
-        else
-            printf "        Name (APSN, 0x%02X" $1                          >> $ssdtPR
-            echo ')'                                                        >> $ssdtPR
-    fi
+	#
+	# Do we need to create additional (Low Frequency) P-States for Ivybridge?
+	#
 
-   printf "        Name (APSS, Package (0x%02X" $2                          >> $ssdtPR
+	if [ $3 -eq 1 ];
+		then
+			let lowestFrequency=($baseFrequency+100)
+			let lowFrequencyPStates=($lowestFrequency/100)-8
+			let packageLength=($2+$lowFrequencyPStates)
+
+			printf "        Name (APLF, 0x%02x" $lowFrequencyPStates        >> $ssdtPR
+			echo ')'                                                        >> $ssdtPR
+	fi
+
+	#
+	# Check number of Turbo states (for IASL optimization).
+	#
+
+	if [ $1 -eq 0 ];
+		then
+			echo '        Name (APSN, Zero)'                                >> $ssdtPR
+		else
+			printf "        Name (APSN, 0x%02X" $1                          >> $ssdtPR
+			echo ')'                                                        >> $ssdtPR
+	fi
+
+	printf "        Name (APSS, Package (0x%02X" $packageLength             >> $ssdtPR
 
 	echo ')'                                                                >> $ssdtPR
 	echo '        {'                                                        >> $ssdtPR
@@ -119,10 +129,21 @@ function _printPackages()
 	let tdp=($1*1000)
 	let maxNonTurboFrequency=$2
 	let frequency=$3
+	let min_ratio=($baseFrequency/100)
 	let max_ratio=($frequency/100)
+	let lowFrequencyPStates=$4
+	let lowestFrequency=$baseFrequency
 
-	while [ $frequency -gt $baseFrequency ]; do
-		echo ''                                                             >> $ssdtPR
+	#
+	# Do we need to create additional (Low Frequency) P-States for Ivybridge?
+	#
+
+	if [ $lowFrequencyPStates -eq 1 ]
+		then
+			let lowestFrequency=(800-100)
+	fi
+
+	while [ $frequency -gt $lowestFrequency ]; do
 		echo '            Package (0x06)'                                   >> $ssdtPR
 		echo '            {'                                                >> $ssdtPR
 
@@ -131,17 +152,21 @@ function _printPackages()
 		echo ','                                                            >> $ssdtPR
 
 		let ratio=$frequency/100
-        
-        if [ $frequency -lt $maxNonTurboFrequency ];
-            then
-                power=$(echo "scale=6;m=((1.1-(($max_ratio-$ratio)*0.00625))/1.1);(($ratio/$max_ratio)*(m*m)*$tdp);" | bc | sed -e 's/.[0-9A-F]*$//')
-            else
-                power=$tdp
-        fi
-
-		printf "                0x%08X" $power                              >> $ssdtPR
 
-		echo ','                                                            >> $ssdtPR
+		if [ $ratio -gt $min_ratio ]
+			then
+				if [ $frequency -lt $maxNonTurboFrequency ];
+					then
+						power=$(echo "scale=6;m=((1.1-(($max_ratio-$ratio)*0.00625))/1.1);(($ratio/$max_ratio)*(m*m)*$tdp);" | bc | sed -e 's/.[0-9A-F]*$//')
+					else
+						power=$tdp
+				fi
+
+				printf "                0x%08X" $power                      >> $ssdtPR
+				echo ','                                                    >> $ssdtPR
+			else
+				echo '                Zero,'                                 >> $ssdtPR
+		fi
 
 		echo '                0x0A,'                                        >> $ssdtPR
 		echo '                0x0A,'                                        >> $ssdtPR
@@ -156,18 +181,48 @@ function _printPackages()
 
 		let frequency-=100
 
-		if [ $frequency -eq $baseFrequency ];
+		if [ $frequency -eq $lowestFrequency ];
 			then
 				echo '            }'                                        >> $ssdtPR
 			else
 				echo '            },'                                       >> $ssdtPR
-		fi
+				echo ''                                                     >> $ssdtPR
+			fi
 	done
 
-	echo '        })'                                                       >> $ssdtPR
+		echo '        })'                                                   >> $ssdtPR
 }
 
 
+#--------------------------------------------------------------------------------
+
+function _printIvybridgeMethods()
+{
+	echo ''                                                                 >> $ssdtPR
+	echo '        Method (MCDP, 2, NotSerialized)'                          >> $ssdtPR
+	echo '        {'                                                        >> $ssdtPR
+	echo '            If (LEqual (Arg0, Zero))'                             >> $ssdtPR
+	echo '            {'                                                    >> $ssdtPR
+	echo '                Store (Buffer (One)'                              >> $ssdtPR
+	echo '                {'                                                >> $ssdtPR
+	echo '                    0x03'                                         >> $ssdtPR
+	echo '                }, Arg1)'                                         >> $ssdtPR
+	echo '            }'                                                    >> $ssdtPR
+	echo '        }'                                                        >> $ssdtPR
+	echo ''                                                                 >> $ssdtPR
+	echo '        Method (_DSM, 4, NotSerialized)'                          >> $ssdtPR
+	echo '        {'                                                        >> $ssdtPR
+	echo '            Store (Package (0x02)'                                >> $ssdtPR
+	echo '            {'                                                    >> $ssdtPR
+	echo '                "plugin-type",'                                   >> $ssdtPR
+	echo '                One'                                              >> $ssdtPR
+	echo '            }, Local0)'                                           >> $ssdtPR
+	echo '            MCDP (Arg2, RefOf (Local0))'                          >> $ssdtPR
+	echo '            Return (Local0)'                                      >> $ssdtPR
+	echo '        }'                                                        >> $ssdtPR
+	echo '    }'                                                            >> $ssdtPR
+}
+
 #--------------------------------------------------------------------------------
 
 function _printCSTScope()
@@ -248,7 +303,15 @@ function _printCSTScope()
 	echo '                }'                                                >> $ssdtPR
 	echo '            })'                                                   >> $ssdtPR
 	echo '        }'                                                        >> $ssdtPR
-	echo '    }'                                                            >> $ssdtPR
+
+	#
+	# We don't want a closing bracket here when we add methods for Ivybridge.
+	#
+
+	if [ $lowFrequencyPStates -eq 0 ]
+		then
+			echo '    }'                                                    >> $ssdtPR
+	fi
 }
 
 
@@ -301,6 +364,7 @@ function main()
 
     let tdp=$1
     let maxTurboFrequency=$2
+	# let lowFrequencyPStates=$3
 
     #
     # Do not change anything below this line!
@@ -331,9 +395,15 @@ function main()
 
     _printHeader
 	_printExternals $logicalCPUs
-	_printScopeStart $turboStates $packageLength
-	_printPackages $tdp $frequency $maxTurboFrequency
+	_printScopeStart $turboStates $packageLength $3
+	_printPackages $tdp $frequency $maxTurboFrequency $3
 	_printCSTScope
+
+	if [ $3 -eq 1 ]
+		then
+			_printIvybridgeMethods
+	fi
+
 	_printCPUScopes $logicalCPUs
 }
 
@@ -344,11 +414,11 @@ function main()
 # Check number of arguments.
 #
 
-if [ $# -eq 2 ];
+if [ $# -eq 3 ];
     then
-        main $1 $2
+        main $1 $2 $3
     else
-        echo "Usage: $0 TDP MaxTurboFrequency"
+        echo "Usage: $0 TDP MaxTurboFrequency (0 for SandyBridge / 1 for IvyBridge)"
         exit 1
 fi
 

From a032e0bb2155aa2c69961993aab01a954dd4b869 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 23 Jan 2013 07:57:36 +0100
Subject: [PATCH 244/623] Version number updated

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 2c886af..d918cb1 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 1.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 1.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)

From d01f6eca064e587b5373311136db5c8e01f7199f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 23 Jan 2013 09:32:46 +0100
Subject: [PATCH 245/623] Model and board-id validation checks added

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 154 ++++++++++++++++++++++++++-
 1 file changed, 150 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index d918cb1..9fbd8ca 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,12 +3,13 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 1.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 1.2 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)
 #			- Filename error fixed (Pike, January, 2013)
 #			- Namespace error fixed in _printScopeStart (Pike, January, 2013)
+#			- Model and board-id checks added (Pike, January, 2013)
 #
 
 # set -x # Used for tracing errors (can be put anywhere in the script).
@@ -336,6 +337,123 @@ function _printCPUScopes()
 	echo '}'                                                                >> $ssdtPR
 }
 
+#--------------------------------------------------------------------------------
+
+function _getModelName()
+{
+	echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *"*=*<*>*//g' -e 's/compatible*//'`
+}
+
+#--------------------------------------------------------------------------------
+
+function _getBoardID()
+{
+	echo `ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *"*=*<*>*//g' -e 's/board-id*//'`
+}
+
+#--------------------------------------------------------------------------------
+
+function _getSandyMacModelByBoardID()
+{
+	local boardID=$(_getBoardID)
+	local macModelIdentifier=""
+
+	case $boardID in
+		Mac-942B59F58194171B)
+			local macModelIdentifier="iMac12,1"
+			;;
+
+		Mac-942B5BF58194151B)
+			local macModelIdentifier="iMac12,2"
+			;;
+
+		Mac-8ED6AF5B48C039E1)
+			local macModelIdentifier="Macmini5,1"
+			;;
+
+		Mac-4BC72D62AD45599E)
+			local macModelIdentifier="Macmini5,2"
+			;;
+
+		Mac-7BA5B2794B2CDB12)
+			local macModelIdentifier="Macmini5,3"
+			;;
+
+		Mac-94245B3640C91C81)
+			local macModelIdentifier="MacBookPro8,1"
+			;;
+
+		Mac-94245A3940C91C80)
+			local macModelIdentifier="MacBookPro8,2"
+			;;
+
+		Mac-942459F5819B171B)
+			local macModelIdentifier="MacBookPro8,3"
+			;;
+
+		Mac-C08A6BB70A942AC2)
+			local macModelIdentifier="MacBookAir4,1"
+			;;
+
+		Mac-742912EFDBEE19B3)
+			local macModelIdentifier="MacBookAir4,2"
+			;;
+	esac
+
+	echo $macModelIdentifier
+}
+
+#--------------------------------------------------------------------------------
+
+function _getIvyMacModelByBoardID()
+{
+  local boardID=$(_getBoardID)
+  local macModelIdentifier=""
+
+  case $boardID in
+	Mac-00BE6ED71E35EB86)
+		local macModelIdentifier="iMac13,1"
+		;;
+
+	Mac-FC02E91DDD3FA6A4)
+		local macModelIdentifier="iMac13,2"
+		;;
+
+	Mac-031AEE4D24BFF0B15819B171B)
+		local macModelIdentifier="Macmini6,1"
+		;;
+
+	Mac-F65AE981FFA204ED)
+		local macModelIdentifier="Macmini6,2"
+		;;
+
+	Mac-4B7AC7E43945597E)
+		local macModelIdentifier="MacBookPro9,1"
+		;;
+
+	Mac-6F01561E16C75D06)
+		local macModelIdentifier="MacBookPro9,2"
+		;;
+
+	Mac-C3EC7CD22292981F)
+		local macModelIdentifier="MacBookPro10,1"
+		;;
+
+	Mac-AFD8A9D944EA4843)
+		local macModelIdentifier="MacBookPro10,2"
+		;;
+
+	Mac-66F35F19FE2A0D05)
+		local macModelIdentifier="MacBookAir5,1"
+		;;
+
+	Mac-2E6FAB96566FE58C)
+		local macModelIdentifier="MacBookAir5,2"
+		;;
+  esac
+
+  echo $macModelIdentifier
+}
 
 #--------------------------------------------------------------------------------
 #
@@ -399,12 +517,40 @@ function main()
 	_printPackages $tdp $frequency $maxTurboFrequency $3
 	_printCSTScope
 
+	local modelID=$(_getModelName)
+	local usedBoardID=$(_getBoardID)
+
 	if [ $3 -eq 1 ]
 		then
-			_printIvybridgeMethods
+			local targetModelID=$(_getIvyMacModelByBoardID)
+
+			_printIvybridgeMethods $usedBoardID $targetModelID
+			_printCPUScopes $logicalCPUs
+
+			if [ "$targetModelID" == "" ]
+				then
+					echo "Warning: Used board-id [$usedBoardID] is not supported by Ivybridge PM"
+				else
+					if [ "$targetModelID" != "$modelID" ]
+						then
+							echo "Error: board-id [$usedBoardID] and model [$modelID] mismatch"
+					fi
+			fi
+		else
+			local targetModelID=$(_getSandyMacModelByBoardID)
+
+			_printCPUScopes $logicalCPUs
+
+			if [ "$targetModelID" == "" ]
+				then
+					echo "Warning: Used board-id [$usedBoardID] is not supported by Sandybridge PM"
+				else
+					if [ "$targetModelID" != "$modelID" ]
+						then
+							echo "Error: board-id [$usedBoardID] and model [$modelID] mismatch"
+					fi
+			fi
 	fi
-
-	_printCPUScopes $logicalCPUs
 }
 
 

From 844a1d32fe80d2e4f15002c1ddfa4fd0a758f3bf Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 24 Jan 2013 02:37:35 +0100
Subject: [PATCH 246/623] Compiler error fixed (use of undeclared identifier)

Thanks to Dave for reporting this.
---
 i386/libsaio/cpu.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/i386/libsaio/cpu.c b/i386/libsaio/cpu.c
index a4e3dad..f81cd76 100644
--- a/i386/libsaio/cpu.c
+++ b/i386/libsaio/cpu.c
@@ -1,12 +1,14 @@
 /*
  * Copyright (c) 2009 by Master Chief.
  *
- * Refactoring for Revolution done by DHP in 2010/2011.
- * Expanded (requestMaxTurbo added) by DHP in May 2011.
- * Simplified by DHP in Juni 2011 (thanks to MC and flAked for the idea).
- * Code copied from Intel/dynamic_data.h  by DHP in juni 2011.
- * New compiler directive (BOOT_TURBO_RATIO) added by Jeroen (June 2011).
- * Function checkFlexRatioMSR added by DHP (August 2011).
+ * Updates:
+ *			- Refactoring for Revolution done by DHP in 2010/2011.
+ *			- Expanded (requestMaxTurbo added) by DHP in May 2011.
+ *			- Simplified by DHP in Juni 2011 (thanks to MC and flAked for the idea).
+ *			- Code copied from Intel/dynamic_data.h  by DHP in juni 2011.
+ *			- New compiler directive (BOOT_TURBO_RATIO) added by Jeroen (June 2011).
+ *			- Function checkFlexRatioMSR added by DHP (August 2011).
+ *			- Fixed error: use of undeclared identifier 'NUMBER_OF_TURBO_STATES' (Pike, January 2013).
  */
 
 
@@ -90,10 +92,11 @@ void initTurboRatios()
 	// We need to have something to work with so check for it, and the 
 	// way we do that (trying to be smart) supports any number of cores.
 
+	uint8_t	numberOfCores = gPlatform.CPU.NumCores;
+
 	if (gPlatform.CPU.CoreTurboRatio[0] != 0)
 	{
 		uint8_t i, duplicatedRatios = 0;
-		uint8_t	numberOfCores = gPlatform.CPU.NumCores;
 
 		// Simple check to see if all ratios are the same.
 		for (i = 0; i < numberOfCores; i++)
@@ -107,15 +110,20 @@ void initTurboRatios()
 			duplicatedRatios++;
 		}
 
+#ifdef NUMBER_OF_TURBO_STATES
+		uint8_t numberOfTurboStates = NUMBER_OF_TURBO_STATES;
+#else
+		uint8_t numberOfTurboStates = numberOfCores;
+#endif
 		// Should we add only one turbo P-State?
 		if (duplicatedRatios == 0)
 		{
-			gPlatform.CPU.NumberOfTurboRatios = NUMBER_OF_TURBO_STATES;	// Default for AICPUPM.
+			gPlatform.CPU.NumberOfTurboRatios = numberOfTurboStates;	// Default for AICPUPM.
 		}
 		else // Meaning that we found duplicated ratios.
 		{
 			// Do we need to inject one Turbo P-State only?
-			if (duplicatedRatios == NUMBER_OF_TURBO_STATES)
+			if (duplicatedRatios == numberOfTurboStates)
 			{
 				// Yes. Wipe the rest (keeping the one with the highest multiplier).
 				for (i = 1; i < numberOfCores; i++)		// i set to 1 to preserve the first one.
@@ -133,7 +141,7 @@ void initTurboRatios()
 		}
 
 		// Jeroen: Used in ACPI/ssdt_pr_generator.h / for DEBUG_CPU_TURBO_RATIOS.
-		gPlatform.CPU.NumberOfTurboRatios = (NUMBER_OF_TURBO_STATES - duplicatedRatios);
+		gPlatform.CPU.NumberOfTurboRatios = (numberOfTurboStates - duplicatedRatios);
 		
 		/* if (duplicatedRatios == 4)
 		{

From 3c03978f98391c288117ccfbe7dc5373713b9ef2 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 24 Jan 2013 03:33:32 +0100
Subject: [PATCH 247/623] SMBIOS cpu-type check added

The additional check, along with the first two in version 1.2, should
help people detect possible configuration errors.
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 35 +++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 9fbd8ca..c8c4dfc 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,13 +3,14 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 1.2 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 1.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)
 #			- Filename error fixed (Pike, January, 2013)
 #			- Namespace error fixed in _printScopeStart (Pike, January, 2013)
 #			- Model and board-id checks added (Pike, January, 2013)
+#			- SMBIOS cpu-type check added (Pike, January, 2013)
 #
 
 # set -x # Used for tracing errors (can be put anywhere in the script).
@@ -341,6 +342,9 @@ function _printCPUScopes()
 
 function _getModelName()
 {
+	#
+	# Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
+	#
 	echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *"*=*<*>*//g' -e 's/compatible*//'`
 }
 
@@ -348,11 +352,28 @@ function _getModelName()
 
 function _getBoardID()
 {
+	#
+	# Grab 'board-id' property from ioreg (stripped with sed / RegEX magic).
+	#
 	echo `ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *"*=*<*>*//g' -e 's/board-id*//'`
 }
 
 #--------------------------------------------------------------------------------
 
+function _getCPUtype()
+{
+	#
+	# Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
+	#
+	local grepStr=`ioreg -p IODeviceTree -n CPU0@0 -k cpu-type | grep cpu-type | sed -e 's/.*[<]//' -e 's/0\{0\}>$//'`
+	#
+	# Swap bytes with help of ${str:pos:num}
+	#
+	echo ${grepStr:2:2}${grepStr:0:2}
+}
+
+#--------------------------------------------------------------------------------
+
 function _getSandyMacModelByBoardID()
 {
 	local boardID=$(_getBoardID)
@@ -522,6 +543,7 @@ function main()
 
 	if [ $3 -eq 1 ]
 		then
+			local typeCPU=$(_getCPUtype)
 			local targetModelID=$(_getIvyMacModelByBoardID)
 
 			_printIvybridgeMethods $usedBoardID $targetModelID
@@ -536,6 +558,11 @@ function main()
 							echo "Error: board-id [$usedBoardID] and model [$modelID] mismatch"
 					fi
 			fi
+
+			if [ "${typeCPU}:2:2" != "04" ]
+				then
+					echo "Warning: cpu-type may be set improperly (0x$typeCPU instead of 0x${typeCPU:0:2}04)"
+			fi
 		else
 			local targetModelID=$(_getSandyMacModelByBoardID)
 
@@ -550,6 +577,12 @@ function main()
 							echo "Error: board-id [$usedBoardID] and model [$modelID] mismatch"
 					fi
 			fi
+
+			if [ "${typeCPU}:2:2" != "02" ]
+				then
+					echo "Warning: cpu-type may be set improperly (0x$typeCPU instead of 0x${typeCPU:0:2}02)"
+			fi
+
 	fi
 }
 

From cf15460ebcc55ee74d7596103d2001b9955abd5e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 24 Jan 2013 03:50:09 +0100
Subject: [PATCH 248/623] Done testing

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index c8c4dfc..377a772 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -540,10 +540,10 @@ function main()
 
 	local modelID=$(_getModelName)
 	local usedBoardID=$(_getBoardID)
+	local typeCPU=$(_getCPUtype)
 
 	if [ $3 -eq 1 ]
 		then
-			local typeCPU=$(_getCPUtype)
 			local targetModelID=$(_getIvyMacModelByBoardID)
 
 			_printIvybridgeMethods $usedBoardID $targetModelID
@@ -559,7 +559,7 @@ function main()
 					fi
 			fi
 
-			if [ "${typeCPU}:2:2" != "04" ]
+			if [ "${typeCPU:2:2}" != "04" ]
 				then
 					echo "Warning: cpu-type may be set improperly (0x$typeCPU instead of 0x${typeCPU:0:2}04)"
 			fi
@@ -578,7 +578,7 @@ function main()
 					fi
 			fi
 
-			if [ "${typeCPU}:2:2" != "02" ]
+			if [ "${typeCPU:2:2}" != "02" ]
 				then
 					echo "Warning: cpu-type may be set improperly (0x$typeCPU instead of 0x${typeCPU:0:2}02)"
 			fi

From 7d61dbc92fa047f3f6090261bccb41318c011f98 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 24 Jan 2013 08:33:12 +0100
Subject: [PATCH 249/623] Namespace path typo fixed

---
 i386/libsaio/acpi/ssdt_pr_generator.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/ssdt_pr_generator.h b/i386/libsaio/acpi/ssdt_pr_generator.h
index 6bd183d..2969249 100644
--- a/i386/libsaio/acpi/ssdt_pr_generator.h
+++ b/i386/libsaio/acpi/ssdt_pr_generator.h
@@ -116,8 +116,8 @@ void generateSSDT_PR(void)
 
 	uint8_t SCOPE_PR_CPU0[] =						// Scope (\_PR.CPU0) { }
 	{
-		/* 0000 */	0x10, 0xFF, 0xFF, 0x2E, 0x5F, 0x50, 0x52, 0x5F, 
-		/* 0008 */	_CPU_LABEL_REPLACEMENT
+		/* 0000 */	0x10, 0xFF, 0xFF, 0x5C, 0x2E, 0x5F, 0x50, 0x52,
+		/* 0008 */	0x5F, _CPU_LABEL_REPLACEMENT
 	};
 
 	uint8_t NAME_APSN[] =							// Name (APSN, 0xFF)

From 3420e6fd7a5acf2c3865aa914b142029a8fc9826 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 24 Jan 2013 08:46:12 +0100
Subject: [PATCH 250/623] Copy/paste error fixed

Thanks to nanomac for spotting the error.
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 377a772..94d8fee 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 1.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 1.4 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)
@@ -11,6 +11,7 @@
 #			- Namespace error fixed in _printScopeStart (Pike, January, 2013)
 #			- Model and board-id checks added (Pike, January, 2013)
 #			- SMBIOS cpu-type check added (Pike, January, 2013)
+#			- Copy/paste error fixed (Pike, January, 2013)
 #
 
 # set -x # Used for tracing errors (can be put anywhere in the script).
@@ -440,7 +441,7 @@ function _getIvyMacModelByBoardID()
 		local macModelIdentifier="iMac13,2"
 		;;
 
-	Mac-031AEE4D24BFF0B15819B171B)
+	Mac-031AEE4D24BFF0B1)
 		local macModelIdentifier="Macmini6,1"
 		;;
 

From 4efe9d0c21195dd2eb15141fd7374c9fba424790 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 25 Jan 2013 00:07:05 +0100
Subject: [PATCH 251/623] Method ACST added to CPU scopes for IB CPUPM

Thanks to Christian Jesberger for providing debug data
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 94d8fee..052ce27 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 1.4 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 1.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)
@@ -12,6 +12,7 @@
 #			- Model and board-id checks added (Pike, January, 2013)
 #			- SMBIOS cpu-type check added (Pike, January, 2013)
 #			- Copy/paste error fixed (Pike, January, 2013)
+#			- Method ACST added to CPU scopes for IB CPUPM (Pike, January, 2013)
 #
 
 # set -x # Used for tracing errors (can be put anywhere in the script).
@@ -332,6 +333,20 @@ function _printCPUScopes()
 		echo '        {'                                                    >> $ssdtPR
 		echo '            Return (\_PR.CPU0.APSS)'                          >> $ssdtPR
 		echo '        }'                                                    >> $ssdtPR
+		echo ''                                                             >> $ssdtPR
+
+		#
+		# IB CPUPM tries to parse/execute Method ACST (see debug data) and thus we add
+		# this method, conditionally, since SB CPUPM doesn't seem to care about it.
+		#
+		if [ $lowFrequencyPStates -eq 1 ]
+			then
+				echo '        Method (ACST, 0, NotSerialized)'              >> $ssdtPR
+				echo '        {'                                            >> $ssdtPR
+				echo '            Return (\_PR.CPU0.ACST)'                  >> $ssdtPR
+				echo '        }'                                            >> $ssdtPR
+		fi
+
 		echo '    }'                                                        >> $ssdtPR
 		let currentCPU+=1
 	done

From b50b68261c02226e529dcef5ccc81b2440dd232e Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Sat, 26 Jan 2013 16:11:57 +0000
Subject: [PATCH 252/623] Updated ssdt_pr script for ease of use and to make it
 compliant with latest iasl

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 052ce27..ef7cf6a 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -19,9 +19,9 @@
 
 #================================= GLOBAL VARS ==================================
 
-ssdtPR=/tmp/ssdt-pr.dsl
+ssdtPR=~/Desktop/SSDT_PR.dsl
 
-ssdtID=ssdt_pr
+ssdtID=SSDT_PR
 
 #
 # Lowest possible idle frequency minus 100.
@@ -343,7 +343,7 @@ function _printCPUScopes()
 			then
 				echo '        Method (ACST, 0, NotSerialized)'              >> $ssdtPR
 				echo '        {'                                            >> $ssdtPR
-				echo '            Return (\_PR.CPU0.ACST)'                  >> $ssdtPR
+				echo '            Return (\_PR.CPU0.ACST ())'               >> $ssdtPR
 				echo '        }'                                            >> $ssdtPR
 		fi
 

From adf74b3d651b3769fa0010c75d9f8a9d399a88f4 Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Sat, 26 Jan 2013 18:50:43 +0000
Subject: [PATCH 253/623] Tweak for default IMAC build

---
 i386/libsaio/platform.h          | 12 ++++++-----
 i386/libsaio/smbios/model_data.h | 34 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 3b1cae2..9a797f7 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -54,12 +54,14 @@
 // Additional model selectors to select a specific target model.
 //------------------------------------------------------------------------------
 
-#define IMAC_131				IMAC | (3 << 15)
-#define IMAC_111				IMAC | (2 << 15)
-#define IMAC_122				IMAC | (1 << 15)
-#define IMAC_121				IMAC					// Defaults to iMac12,1
 
-#define MACBOOK_41				MACBOOK					// Defaults to MacBook,1
+#define IMAC_131				(IMAC | (4 << 15))
+#define IMAC_122				(IMAC | (3 << 15))
+#define IMAC_121				(IMAC | (2 << 15))
+#define IMAC_111				(IMAC | (1 << 15))       
+#define IMAC_132				IMAC                    // Defaults to iMac13,2
+
+#define MACBOOK_41				MACBOOK					// Defaults to MacBook4,1
 
 #define MACBOOK_AIR_42			MACBOOK_AIR | (1 << 15)
 #define MACBOOK_AIR_41			MACBOOK_AIR				// Defaults to MacBookAir4,1
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 66c9bae..f39d953 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -30,14 +30,9 @@
 
 #if TARGET_MODEL & IMAC															// 1
 // -------------------------------------------------------------------------------------
-	#define SMB_FAMILY	"Mac"
+	#define SMB_FAMILY	"iMac"
 
-	#if (TARGET_MODEL == IMAC_132)
-		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
-		#define SMB_PRODUCT_NAME	"iMac13,2"
-		#define SMB_BOARD_PRODUCT	"Mac-FC02E91DDD3FA6A4"
-		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '2' }
-	#elif (TARGET_MODEL == IMAC_131)
+	#if (TARGET_MODEL == IMAC_131)
 		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
 		#define SMB_PRODUCT_NAME	"iMac13,1"
 		#define SMB_BOARD_PRODUCT	"Mac-00BE6ED71E35EB86"
@@ -47,16 +42,21 @@
 		#define SMB_PRODUCT_NAME	"iMac12,2"
 		#define SMB_BOARD_PRODUCT	"Mac-942B5BF58194151B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '2' }
-	#elif (TARGET_MODEL == IMAC_111)
-		#define SMB_BIOS_VERSION	"IM111.88Z.0034.B00.0910301727"
-		#define SMB_PRODUCT_NAME	"iMac11,1"
-		#define SMB_BOARD_PRODUCT	"Mac-F2268DAE"
-		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '1', ',', '1' }
-	#else // Defaults to iMac12,1
-		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
-		#define SMB_PRODUCT_NAME	"iMac12,1"
-		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
-		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
+    #elif (TARGET_MODEL == IMAC_121)
+        #define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
+        #define SMB_PRODUCT_NAME	"iMac12,1"
+        #define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
+        #define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
+     #elif (TARGET_MODEL == IMAC_111)
+        #define SMB_BIOS_VERSION	"IM111.88Z.0034.B00.0910301727"
+        #define SMB_PRODUCT_NAME	"iMac11,1"
+        #define SMB_BOARD_PRODUCT	"Mac-F2268DAE"
+        #define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '1', ',', '1' }
+	#else // Defaults to iMac13,2
+        #define SMB_BIOS_VERSION	"IM131.88Z.010A.B05.1211151146"
+        #define SMB_PRODUCT_NAME	"iMac13,2"
+        #define SMB_BOARD_PRODUCT	"Mac-FC02E91DDD3FA6A4"
+        #define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '2' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From 7c3aa2bd66c43787fe447f2055021d3ff2598f74 Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Sat, 2 Feb 2013 14:09:21 +0000
Subject: [PATCH 254/623] Silence compilation warning on Xcode 4.6

---
 i386/libsaio/sys.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/sys.c b/i386/libsaio/sys.c
index ff60af6..624ee9c 100755
--- a/i386/libsaio/sys.c
+++ b/i386/libsaio/sys.c
@@ -842,7 +842,8 @@ BVRef getBootVolumeRef(const char * path, const char ** outPath)
 	{
 		// Bad device specifier, skip past the right paren.
 
-		for (cp++; *cp && *cp != RP; cp++) /* LOOP */;
+		for (cp++; *cp && *cp != RP; cp++) /* LOOP */
+        ;
 		{
 			if (*cp == RP)
 			{

From f61de6e37a630bfc377e5b66b979b17cbad3b387 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 3 Feb 2013 12:20:20 +0100
Subject: [PATCH 255/623] Updating script with (almost) forgotten changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Note: This Update was done remove/via Github web interface and may not be properly formatted (no idea how this works). 
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 756 ++++++++++++++++++---------
 1 file changed, 521 insertions(+), 235 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index ef7cf6a..faf8369 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 1.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 2.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)
@@ -13,21 +13,59 @@
 #			- SMBIOS cpu-type check added (Pike, January, 2013)
 #			- Copy/paste error fixed (Pike, January, 2013)
 #			- Method ACST added to CPU scopes for IB CPUPM (Pike, January, 2013)
+#			- Method ACST corrected for latest version of iasl (Dave, January, 2013)
+#			- Changed path/filename to ~/Desktop/SSDT_PR.dsl (Dave, January, 2013)
+#			- P-States are now one-liners instead of blocks (Pike, January, 2013)
+#			- Support for flexible ProcessorNames added (Pike, Februari, 2013)
+#			- Better feedback and Debug() injection added (Pike, Februari, 2013)
+#			- Automatic processor type detection (Pike, Februari, 2013)
+#			- TDP and processor type are now optional arguments (Pike, Februari, 2013)
+#			- system-type check (used by X86PlatformPlugin) added (Pike, Februari, 2013)
+#			- ACST injection for all logical processors (Pike, Februari, 2013)
+#
+# Contributors:
+#			- Thanks to Dave and Toleda for their help (bug fixes and other improvements).
 #
 
-# set -x # Used for tracing errors (can be put anywhere in the script).
+# set -x # Used for tracing errors (can be used anywhere in the script).
 
 #================================= GLOBAL VARS ==================================
 
-ssdtPR=~/Desktop/SSDT_PR.dsl
+scriptVersion=2.0
+
+#
+# Path and filename setup.
+#
 
+path=~/Desktop
 ssdtID=SSDT_PR
+ssdtPR=${path}/${ssdtID}.dsl
+
+#
+# Lowest possible idle frequency (user configurable).
+#
+
+baseFrequency=1600
+
+#
+# Here are the other global variables defined.
+#
+
+systemType=0
+
+gACST_CPU0=13
+gACST_CPU1=7
+
+macModelIdentifier=""
 
 #
-# Lowest possible idle frequency minus 100.
+# Change this label to "P00" when your tables use P000 instead oc CPU0.
 #
 
-baseFrequency=1500
+gProcLabel="CPU"
+
+IVY_BRIDGE=4
+SANDY_BRIDGE=2
 
 #--------------------------------------------------------------------------------
 
@@ -62,7 +100,7 @@ function _printExternals()
 	currentCPU=0;
 
 	while [ $currentCPU -lt $1 ]; do
-		echo '    External (\_PR_.CPU'$currentCPU', DeviceObj)'             >> $ssdtPR
+		echo '    External (\_PR_.'$gProcLabel$currentCPU', DeviceObj)'     >> $ssdtPR
 		let currentCPU+=1
 	done
 
@@ -70,6 +108,21 @@ function _printExternals()
 }
 
 
+#--------------------------------------------------------------------------------
+
+function _printDebugInfo()
+{
+	echo '    Store ("ssdtPRGen.sh version '$scriptVersion'", Debug)'       >> $ssdtPR
+	echo '    Store ("baseFrequency    : '$baseFrequency'", Debug)'         >> $ssdtPR
+	echo '    Store ("frequency        : '$frequency'", Debug)'             >> $ssdtPR
+	echo '    Store ("logicalCPUs      : '$logicalCPUs'", Debug)'           >> $ssdtPR
+	echo '    Store ("tdp              : '$tdp'", Debug)'                   >> $ssdtPR
+	echo '    Store ("packageLength    : '$packageLength'", Debug)'         >> $ssdtPR
+	echo '    Store ("turboStates      : '$turboStates'", Debug)'           >> $ssdtPR
+	echo '    Store ("maxTurboFrequency: '$maxTurboFrequency'", Debug)'     >> $ssdtPR
+	echo ''                                                                 >> $ssdtPR
+}
+
 #--------------------------------------------------------------------------------
 
 function _printProcessorDefinitions()
@@ -77,7 +130,7 @@ function _printProcessorDefinitions()
 	currentCPU=0;
 
 	while [ $currentCPU -lt $1 ]; do
-		echo '    External (\_PR_.CPU'$currentCPU', DeviceObj)'             >> $ssdtPR
+		echo '    External (\_PR_.'$gProcLabel$currentCPU', DeviceObj)'     >> $ssdtPR
 		let currentCPU+=1
 	done
 
@@ -88,18 +141,18 @@ function _printProcessorDefinitions()
 
 function _printScopeStart()
 {
-	echo '    Scope (\_PR.CPU0)'                                            >> $ssdtPR
+	echo '    Scope (\_PR.'$gProcLabel'0)'                                  >> $ssdtPR
 	echo '    {'                                                            >> $ssdtPR
 
 	let packageLength=$2
 
 	#
-	# Do we need to create additional (Low Frequency) P-States for Ivybridge?
+	# Do we need to create additional (Low Frequency) P-States?
 	#
 
-	if [ $3 -eq 1 ];
+	if [ $bridgeType -eq $IVY_BRIDGE ];
 		then
-			let lowestFrequency=($baseFrequency+100)
+			let lowestFrequency=$baseFrequency
 			let lowFrequencyPStates=($lowestFrequency/100)-8
 			let packageLength=($2+$lowFrequencyPStates)
 
@@ -130,66 +183,51 @@ function _printScopeStart()
 
 function _printPackages()
 {
-	let tdp=($1*1000)
-	let maxNonTurboFrequency=$2
-	let frequency=$3
+	local frequency=$3
+	local maxNonTurboFrequency=$2
+	local lowestFrequency=$baseFrequency
+
+	let maxTDP=($1*1000)
 	let min_ratio=($baseFrequency/100)
 	let max_ratio=($frequency/100)
-	let lowFrequencyPStates=$4
-	let lowestFrequency=$baseFrequency
 
 	#
 	# Do we need to create additional (Low Frequency) P-States for Ivybridge?
 	#
 
-	if [ $lowFrequencyPStates -eq 1 ]
+	if [ $bridgeType -eq $IVY_BRIDGE ]
 		then
-			let lowestFrequency=(800-100)
+			let lowestFrequency=800
 	fi
 
-	while [ $frequency -gt $lowestFrequency ]; do
-		echo '            Package (0x06)'                                   >> $ssdtPR
-		echo '            {'                                                >> $ssdtPR
-
-		printf "                0x%04X" $frequency                          >> $ssdtPR
-
-		echo ','                                                            >> $ssdtPR
+	while [ $frequency -ge $lowestFrequency ];
+		do
+		printf "            Package (0x06) { 0x%04X, " $frequency           >> $ssdtPR
 
 		let ratio=$frequency/100
 
-		if [ $ratio -gt $min_ratio ]
+		if [ $ratio -ge $min_ratio ]
 			then
 				if [ $frequency -lt $maxNonTurboFrequency ];
 					then
-						power=$(echo "scale=6;m=((1.1-(($max_ratio-$ratio)*0.00625))/1.1);(($ratio/$max_ratio)*(m*m)*$tdp);" | bc | sed -e 's/.[0-9A-F]*$//')
+						power=$(echo "scale=6;m=((1.1-(($max_ratio-$ratio)*0.00625))/1.1);(($ratio/$max_ratio)*(m*m)*$maxTDP);" | bc | sed -e 's/.[0-9A-F]*$//')
 					else
-						power=$tdp
+						power=$maxTDP
 				fi
 
-				printf "                0x%08X" $power                      >> $ssdtPR
-				echo ','                                                    >> $ssdtPR
+				printf "0x%08X, " $power                                    >> $ssdtPR
 			else
-				echo '                Zero,'                                 >> $ssdtPR
+				printf '      Zero, '                                       >> $ssdtPR
 		fi
 
-		echo '                0x0A,'                                        >> $ssdtPR
-		echo '                0x0A,'                                        >> $ssdtPR
- 
-		printf "                0x%02X" $ratio                              >> $ssdtPR
-
-		echo '00,'                                                          >> $ssdtPR
-
-		printf "                0x%02X" $ratio                              >> $ssdtPR
-
-		echo '00'                                                           >> $ssdtPR
+		printf "0x0A, 0x0A, 0x%02X00, 0x%02X00 }" $ratio $ratio             >> $ssdtPR
 
 		let frequency-=100
 
-		if [ $frequency -eq $lowestFrequency ];
+		if [ $frequency -ge $lowestFrequency ];
 			then
-				echo '            }'                                        >> $ssdtPR
+				echo ','                                                    >> $ssdtPR
 			else
-				echo '            },'                                       >> $ssdtPR
 				echo ''                                                     >> $ssdtPR
 			fi
 	done
@@ -231,90 +269,188 @@ function _printIvybridgeMethods()
 
 function _printCSTScope()
 {
-	echo ''                                                                 >> $ssdtPR
-	echo '        Method (ACST, 0, NotSerialized)'                          >> $ssdtPR
-	echo '        {'                                                        >> $ssdtPR
-	echo '            Return (Package (0x06)'                               >> $ssdtPR
-	echo '            {'                                                    >> $ssdtPR
-	echo '                One,'                                             >> $ssdtPR
-	echo '                0x04,'                                            >> $ssdtPR
-	echo '                Package (0x04)'                                   >> $ssdtPR
-	echo '                {'                                                >> $ssdtPR
-	echo '                    ResourceTemplate ()'                          >> $ssdtPR
-	echo '                    {'                                            >> $ssdtPR
-	echo '                        Register (FFixedHW,'                      >> $ssdtPR
-	echo '                            0x01,               // Bit Width'		>> $ssdtPR
-	echo '                            0x02,               // Bit Offset'	>> $ssdtPR
-	echo '                            0x0000000000000000, // Address'		>> $ssdtPR
-	echo '                            0x01,               // Access Size'	>> $ssdtPR
-	echo '                            )'                                    >> $ssdtPR
-	echo '                    },'                                           >> $ssdtPR
-	echo ''                                                                 >> $ssdtPR
-	echo '                    One,'                                         >> $ssdtPR
-	echo '                    0x03,'                                        >> $ssdtPR
-	echo '                    0x03E8'                                       >> $ssdtPR
-	echo '                },'                                               >> $ssdtPR
-	echo ''                                                                 >> $ssdtPR
-	echo '                Package (0x04)'                                   >> $ssdtPR
-	echo '                {'                                                >> $ssdtPR
-	echo '                    ResourceTemplate ()'                          >> $ssdtPR
-	echo '                    {'                                            >> $ssdtPR
-	echo '                        Register (FFixedHW,'                      >> $ssdtPR
-	echo '                            0x01,               // Bit Width'		>> $ssdtPR
-	echo '                            0x02,               // Bit Offset'	>> $ssdtPR
-	echo '                            0x0000000000000010, // Address'		>> $ssdtPR
-	echo '                            0x03,               // Access Size'	>> $ssdtPR
-	echo '                            )'                                    >> $ssdtPR
-	echo '                    },'                                           >> $ssdtPR
-	echo ''                                                                 >> $ssdtPR
-	echo '                    0x03,'                                        >> $ssdtPR
-	echo '                    0xCD,'                                        >> $ssdtPR
-	echo '                    0x01F4'                                       >> $ssdtPR
-	echo '                },'                                               >> $ssdtPR
-	echo ''                                                                 >> $ssdtPR
-	echo '                Package (0x04)'                                   >> $ssdtPR
-	echo '                {'                                                >> $ssdtPR
-	echo '                    ResourceTemplate ()'                          >> $ssdtPR
-	echo '                    {'                                            >> $ssdtPR
-	echo '                        Register (FFixedHW,'                      >> $ssdtPR
-	echo '                            0x01,               // Bit Width'		>> $ssdtPR
-	echo '                            0x02,               // Bit Offset'	>> $ssdtPR
-	echo '                            0x0000000000000020, // Address'		>> $ssdtPR
-	echo '                            0x03,               // Access Size'	>> $ssdtPR
-	echo '                            )'                                    >> $ssdtPR
-	echo '                    },'                                           >> $ssdtPR
-	echo ''                                                                 >> $ssdtPR
-	echo '                    0x06,'                                        >> $ssdtPR
-	echo '                    0xF5,'                                        >> $ssdtPR
-	echo '                    0x015E'                                       >> $ssdtPR
-	echo '                },'                                               >> $ssdtPR
-	echo ''                                                                 >> $ssdtPR
-	echo '                Package (0x04)'                                   >> $ssdtPR
-	echo '                {'                                                >> $ssdtPR
-	echo '                    ResourceTemplate ()'                          >> $ssdtPR
-	echo '                    {'                                            >> $ssdtPR
-	echo '                        Register (FFixedHW,'                      >> $ssdtPR
-	echo '                            0x01,               // Bit Width'		>> $ssdtPR
-	echo '                            0x02,               // Bit Offset'	>> $ssdtPR
-	echo '                            0x0000000000000030, // Address'		>> $ssdtPR
-	echo '                            0x03,               // Access Size'	>> $ssdtPR
-	echo '                            )'                                    >> $ssdtPR
-	echo '                    },'                                           >> $ssdtPR
-	echo ''                                                                 >> $ssdtPR
-	echo '                    0x07,'                                        >> $ssdtPR
-	echo '                    0xF5,'                                        >> $ssdtPR
-	echo '                    0xC8'                                         >> $ssdtPR
-	echo '                }'                                                >> $ssdtPR
-	echo '            })'                                                   >> $ssdtPR
-	echo '        }'                                                        >> $ssdtPR
+	let C1=0
+	let C2=0
+	let C3=0
+	let C6=0
+	let C7=0
+	local pkgLength=2
+	local numberOfCStates=0
+
+	echo ''                                                                     >> $ssdtPR
+	echo '        Method (ACST, 0, NotSerialized)'                              >> $ssdtPR
+	echo '        {'                                                            >> $ssdtPR
 
 	#
-	# We don't want a closing bracket here when we add methods for Ivybridge.
+	# Are we injecting C-States for CPU1?
 	#
+	if [ $1 -eq 1 ];
+		then
+			# Yes (also used by CPU2, CPU3 and greater).
+			let targetCStates=$gACST_CPU1
+			latency_C1=0x03E8
+			latency_C2=0x94
+			latency_C3=0xA9
+			echo '            Store ("CPU1 C-States    : '$gACST_CPU1'", Debug)'>> $ssdtPR
+
+		else
+			# No (only used by CPU0).
+			let targetCStates=$gACST_CPU0
+			latency_C1=Zero
+			latency_C3=0xCD
+			latency_C6=0xF5
+			latency_C7=0xF5
+			echo '            Store ("CPU0 C-States    : '$gACST_CPU0'", Debug)'>> $ssdtPR
+	fi
+
+	#
+	# Checks to determine which C-State(s) we should inject.
+	#
+	if (($targetCStates & 1)); then
+		let C1=1
+		let numberOfCStates+=1
+		let pkgLength+=1
+	fi
 
-	if [ $lowFrequencyPStates -eq 0 ]
+	if (($targetCStates & 2)); then
+		let C2=1
+		let numberOfCStates+=1
+		let pkgLength+=1
+	fi
+
+	if (($targetCStates & 4)); then
+		let C3=1
+		let numberOfCStates+=1
+		let pkgLength+=1
+	fi
+
+	if (($targetCStates & 8)); then
+		let C6=1
+		let numberOfCStates+=1
+		let pkgLength+=1
+	fi
+
+	if (($targetCStates & 16)); then
+		let C7=1
+		let numberOfCStates+=1
+		let pkgLength+=1
+	fi
+
+	echo ''                                                                     >> $ssdtPR
+	printf "            Return (Package (0x%02x)\n" $pkgLength                  >> $ssdtPR
+	echo '            {'                                                        >> $ssdtPR
+	echo '                One,'                                                 >> $ssdtPR
+	printf "                0x%02x,\n" $numberOfCStates                         >> $ssdtPR
+
+	echo '                Package (0x04)'                                       >> $ssdtPR
+	echo '                {'                                                    >> $ssdtPR
+	echo '                    ResourceTemplate ()'                              >> $ssdtPR
+	echo '                    {'                                                >> $ssdtPR
+	echo '                        Register (FFixedHW,'                          >> $ssdtPR
+	echo '                            0x01,               // Bit Width'         >> $ssdtPR
+	echo '                            0x02,               // Bit Offset'        >> $ssdtPR
+	echo '                            0x0000000000000000, // Address'           >> $ssdtPR
+	echo '                            0x01,               // Access Size'       >> $ssdtPR
+	echo '                            )'                                        >> $ssdtPR
+	echo '                    },'                                               >> $ssdtPR
+	echo '                    One,'                                             >> $ssdtPR
+	echo '                    '$latency_C1','                                   >> $ssdtPR
+	echo '                    0x03E8'                                           >> $ssdtPR
+
+	if [ $C2 -eq 1 ]; then
+		echo '                },'                                               >> $ssdtPR
+		echo ''                                                                 >> $ssdtPR
+		echo '                Package (0x04)'                                   >> $ssdtPR
+		echo '                {'                                                >> $ssdtPR
+		echo '                    ResourceTemplate ()'                          >> $ssdtPR
+		echo '                    {'                                            >> $ssdtPR
+		echo '                        Register (FFixedHW,'                      >> $ssdtPR
+		echo '                            0x01,               // Bit Width'     >> $ssdtPR
+		echo '                            0x02,               // Bit Offset'    >> $ssdtPR
+		echo '                            0x0000000000000010, // Address'       >> $ssdtPR
+		echo '                            0x03,               // Access Size'   >> $ssdtPR
+		echo '                            )'                                    >> $ssdtPR
+		echo '                    },'                                           >> $ssdtPR
+		echo '                    0x02,'                                        >> $ssdtPR
+		echo '                    '$latency_C2','                               >> $ssdtPR
+		echo '                    0x01F4'                                       >> $ssdtPR
+	fi
+
+	if (($C3)); then
+		echo '                },'                                               >> $ssdtPR
+		echo ''                                                                 >> $ssdtPR
+		echo '                Package (0x04)'                                   >> $ssdtPR
+		echo '                {'                                                >> $ssdtPR
+		echo '                    ResourceTemplate ()'                          >> $ssdtPR
+		echo '                    {'                                            >> $ssdtPR
+		echo '                        Register (FFixedHW,'                      >> $ssdtPR
+		echo '                            0x01,               // Bit Width'     >> $ssdtPR
+		echo '                            0x02,               // Bit Offset'    >> $ssdtPR
+		echo '                            0x0000000000000010, // Address'       >> $ssdtPR
+		echo '                            0x03,               // Access Size'   >> $ssdtPR
+		echo '                            )'                                    >> $ssdtPR
+		echo '                    },'                                           >> $ssdtPR
+		echo '                    0x03,'                                        >> $ssdtPR
+		echo '                    '$latency_C3','                               >> $ssdtPR
+		echo '                    0x01F4'                                       >> $ssdtPR
+	fi
+
+	if [ $C6 -eq 1 ]; then
+		echo '                },'                                               >> $ssdtPR
+		echo ''                                                                 >> $ssdtPR
+		echo '                Package (0x04)'                                   >> $ssdtPR
+		echo '                {'                                                >> $ssdtPR
+		echo '                    ResourceTemplate ()'                          >> $ssdtPR
+		echo '                    {'                                            >> $ssdtPR
+		echo '                        Register (FFixedHW,'                      >> $ssdtPR
+		echo '                            0x01,               // Bit Width'     >> $ssdtPR
+		echo '                            0x02,               // Bit Offset'    >> $ssdtPR
+		echo '                            0x0000000000000020, // Address'       >> $ssdtPR
+		echo '                            0x03,               // Access Size'   >> $ssdtPR
+		echo '                            )'                                    >> $ssdtPR
+		echo '                    },'                                           >> $ssdtPR
+		echo '                    0x06,'                                        >> $ssdtPR
+		echo '                    '$latency_C6','                               >> $ssdtPR
+		echo '                    0x015E'                                       >> $ssdtPR
+	fi
+
+	if [ $C7 -eq 1 ]; then
+		echo '                },'                                               >> $ssdtPR
+		echo ''                                                                 >> $ssdtPR
+		echo '                Package (0x04)'                                   >> $ssdtPR
+		echo '                {'                                                >> $ssdtPR
+		echo '                    ResourceTemplate ()'                          >> $ssdtPR
+		echo '                    {'                                            >> $ssdtPR
+		echo '                        Register (FFixedHW,'                      >> $ssdtPR
+		echo '                            0x01,               // Bit Width'     >> $ssdtPR
+		echo '                            0x02,               // Bit Offset'    >> $ssdtPR
+		echo '                            0x0000000000000030, // Address'       >> $ssdtPR
+		echo '                            0x03,               // Access Size'   >> $ssdtPR
+		echo '                            )'                                    >> $ssdtPR
+		echo '                    },'                                           >> $ssdtPR
+		echo '                    0x07,'                                        >> $ssdtPR
+		echo '                    '$latency_C7','                               >> $ssdtPR
+		echo '                    0xC8'                                         >> $ssdtPR
+	fi
+
+	echo '                }'                                                    >> $ssdtPR
+	echo '            })'                                                       >> $ssdtPR
+	echo '        }'                                                            >> $ssdtPR
+
+	if [ $1 -eq 1 ];
 		then
-			echo '    }'                                                    >> $ssdtPR
+			gACST_CPU1=$numberOfCStates
+		else
+			gACST_CPU0=$numberOfCStates
+	fi
+
+	#
+	# We don't want a closing bracket here when we add methods for Ivy Bridge.
+	#
+
+	if [ $bridgeType -eq $SANDY_BRIDGE ]
+		then
+			echo '    }'                                                        >> $ssdtPR
 	fi
 }
 
@@ -327,24 +463,22 @@ function _printCPUScopes()
 
 	while [ $currentCPU -lt $1 ]; do
 		echo ''                                                             >> $ssdtPR
-		echo '    Scope (\_PR.CPU'$currentCPU')'                            >> $ssdtPR
+		echo '    Scope (\_PR.'$gProcLabel$currentCPU')'                    >> $ssdtPR
 		echo '    {'                                                        >> $ssdtPR
-		echo '        Method (APSS, 0, NotSerialized)'                      >> $ssdtPR
-		echo '        {'                                                    >> $ssdtPR
-		echo '            Return (\_PR.CPU0.APSS)'                          >> $ssdtPR
-		echo '        }'                                                    >> $ssdtPR
-		echo ''                                                             >> $ssdtPR
+		echo '        Method (APSS, 0, NotSerialized) { Return (\_PR.'$gProcLabel'0.APSS) }' >> $ssdtPR
 
 		#
 		# IB CPUPM tries to parse/execute Method ACST (see debug data) and thus we add
 		# this method, conditionally, since SB CPUPM doesn't seem to care about it.
 		#
-		if [ $lowFrequencyPStates -eq 1 ]
+		if [ $bridgeType -eq $IVY_BRIDGE ]
 			then
-				echo '        Method (ACST, 0, NotSerialized)'              >> $ssdtPR
-				echo '        {'                                            >> $ssdtPR
-				echo '            Return (\_PR.CPU0.ACST ())'               >> $ssdtPR
-				echo '        }'                                            >> $ssdtPR
+				if [ $currentCPU -eq 1 ];
+					then
+						_printCSTScope 1
+					else
+						echo '        Method (ACST, 0, NotSerialized) { Return (\_PR.'$gProcLabel'1.ACST ()) }' >> $ssdtPR
+				fi
 		fi
 
 		echo '    }'                                                        >> $ssdtPR
@@ -361,7 +495,7 @@ function _getModelName()
 	#
 	# Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
 	#
-	echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *"*=*<*>*//g' -e 's/compatible*//'`
+	echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *["=<>]//g' -e 's/compatible//'`
 }
 
 #--------------------------------------------------------------------------------
@@ -371,7 +505,7 @@ function _getBoardID()
 	#
 	# Grab 'board-id' property from ioreg (stripped with sed / RegEX magic).
 	#
-	echo `ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *"*=*<*>*//g' -e 's/board-id*//'`
+	boardID=`ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *["=<>]//g' -e 's/board-id//'`
 }
 
 #--------------------------------------------------------------------------------
@@ -381,7 +515,7 @@ function _getCPUtype()
 	#
 	# Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
 	#
-	local grepStr=`ioreg -p IODeviceTree -n CPU0@0 -k cpu-type | grep cpu-type | sed -e 's/.*[<]//' -e 's/0\{0\}>$//'`
+	local grepStr=`ioreg -p IODeviceTree -n CPU0@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g'`
 	#
 	# Swap bytes with help of ${str:pos:num}
 	#
@@ -390,106 +524,203 @@ function _getCPUtype()
 
 #--------------------------------------------------------------------------------
 
-function _getSandyMacModelByBoardID()
+function _getCPUModel()
 {
-	local boardID=$(_getBoardID)
-	local macModelIdentifier=""
+	#
+	# Returns the hexadecimal value of machdep.cpu.model
+	#
+	echo 0x$(echo "obase=16; `sysctl machdep.cpu.model | sed -e 's/^machdep.cpu.model: //'`" | bc)
+}
 
+#--------------------------------------------------------------------------------
+
+function _getSystemType()
+{
+	#
+	# Grab 'system-type' property from ioreg (stripped with sed / RegEX magic).
+	#
+	echo `ioreg -p IODeviceTree -d 2 -k system-type | grep system-type | sed -e 's/ *[-="<0a-z>]//g'`
+}
+
+#--------------------------------------------------------------------------------
+
+function _checkSMCKeys()
+{
+	#
+	# TODO: Check SMC keys to see if they are there and properly initialized!
+	#
+	# Note: Do <i>not</i> dump SMC keys with HWSensors/iStat or other SMC plug-ins installed!
+	#
+	local filename="/System/Library/Extensions/FakeSMC.kext/Contents/Info.plist"
+	local data=`grep -so '<key>[a-zA-Z]*</key>' $filename | sed -e 's/<key>//' -e 's/<\/key>//g'`
+
+	local status=`echo $data | grep -oe 'DPLM'`
+
+	if [ $status == 'XPLM' ]; then
+		# DPLM  [{lim]  (bytes 00 00 00 00 00)
+		echo "SMC key 'DPLM' found (OK)"
+	fi
+set -x
+	local status=`echo $data | grep -oe 'MSAL'`
+
+	if [ $status == 'MSAL' ]; then
+		# MSAL  [hex_]  (bytes 4b)
+		echo "SMC key 'MSAL' found (OK)"
+	fi
+}
+
+#--------------------------------------------------------------------------------
+
+function _initSandyBridgeSetup()
+{
 	case $boardID in
 		Mac-942B59F58194171B)
-			local macModelIdentifier="iMac12,1"
+			systemType=1
+			macModelIdentifier="iMac12,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-942B5BF58194151B)
-			local macModelIdentifier="iMac12,2"
+			systemType=1
+			macModelIdentifier="iMac12,2"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-8ED6AF5B48C039E1)
-			local macModelIdentifier="Macmini5,1"
+			systemType=1
+			macModelIdentifier="Macmini5,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-4BC72D62AD45599E)
-			local macModelIdentifier="Macmini5,2"
+			systemType=1
+			macModelIdentifier="Macmini5,2"
+			gACST_CPU0=13   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-7BA5B2794B2CDB12)
-			local macModelIdentifier="Macmini5,3"
+			systemType=1
+			macModelIdentifier="Macmini5,3"
+			gACST_CPU0=13   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-94245B3640C91C81)
-			local macModelIdentifier="MacBookPro8,1"
+			systemType=2
+			macModelIdentifier="MacBookPro8,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-94245A3940C91C80)
-			local macModelIdentifier="MacBookPro8,2"
+			systemType=2
+			macModelIdentifier="MacBookPro8,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-942459F5819B171B)
-			local macModelIdentifier="MacBookPro8,3"
+			systemType=2
+			macModelIdentifier="MacBookPro8,3"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-C08A6BB70A942AC2)
-			local macModelIdentifier="MacBookAir4,1"
+			systemType=2
+			macModelIdentifier="MacBookAir4,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-742912EFDBEE19B3)
-			local macModelIdentifier="MacBookAir4,2"
+			systemType=2
+			macModelIdentifier="MacBookAir4,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
 			;;
 	esac
-
-	echo $macModelIdentifier
 }
 
 #--------------------------------------------------------------------------------
 
-function _getIvyMacModelByBoardID()
+function _initIvyBridgeSetup()
 {
-  local boardID=$(_getBoardID)
-  local macModelIdentifier=""
-
-  case $boardID in
-	Mac-00BE6ED71E35EB86)
-		local macModelIdentifier="iMac13,1"
-		;;
-
-	Mac-FC02E91DDD3FA6A4)
-		local macModelIdentifier="iMac13,2"
-		;;
+	case $boardID in
+		Mac-00BE6ED71E35EB86)
+			systemType=1
+			macModelIdentifier="iMac13,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
 
-	Mac-031AEE4D24BFF0B1)
-		local macModelIdentifier="Macmini6,1"
-		;;
+		Mac-FC02E91DDD3FA6A4)
+			systemType=1
+			macModelIdentifier="iMac13,2"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
 
-	Mac-F65AE981FFA204ED)
-		local macModelIdentifier="Macmini6,2"
-		;;
+		Mac-031AEE4D24BFF0B1)
+			systemType=1
+			macModelIdentifier="Macmini6,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
 
-	Mac-4B7AC7E43945597E)
-		local macModelIdentifier="MacBookPro9,1"
-		;;
+		Mac-F65AE981FFA204ED)
+			systemType=1
+			macModelIdentifier="Macmini6,2"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
 
-	Mac-6F01561E16C75D06)
-		local macModelIdentifier="MacBookPro9,2"
-		;;
+		Mac-4B7AC7E43945597E)
+			systemType=2
+			macModelIdentifier="MacBookPro9,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
 
-	Mac-C3EC7CD22292981F)
-		local macModelIdentifier="MacBookPro10,1"
-		;;
+		Mac-6F01561E16C75D06)
+			systemType=2
+			macModelIdentifier="MacBookPro9,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
 
-	Mac-AFD8A9D944EA4843)
-		local macModelIdentifier="MacBookPro10,2"
-		;;
+		Mac-C3EC7CD22292981F)
+			systemType=2
+			macModelIdentifier="MacBookPro10,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
 
-	Mac-66F35F19FE2A0D05)
-		local macModelIdentifier="MacBookAir5,1"
-		;;
+		Mac-AFD8A9D944EA4843)
+			systemType=2
+			macModelIdentifier="MacBookPro10,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
 
-	Mac-2E6FAB96566FE58C)
-		local macModelIdentifier="MacBookAir5,2"
-		;;
-  esac
+		Mac-66F35F19FE2A0D05)
+			systemType=2
+			macModelIdentifier="MacBookAir5,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
 
-  echo $macModelIdentifier
+		Mac-2E6FAB96566FE58C)
+			systemType=2
+			macModelIdentifier="MacBookAir5,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+	esac
 }
 
 #--------------------------------------------------------------------------------
@@ -513,25 +744,78 @@ function _isRoot()
 
 function main()
 {
+	echo ''
+
+	#
+	# Get CPU type and model.
+	#
+
+	local model=$(_getCPUModel)
+
+	case $model in
+		0x2A)
+			echo "Sandy Bridge Core processor detected"
+			let tdp=95
+			let bridgeType=2
+			;;
+
+		0x2D)
+			echo "Sandy Bridge Core processor detected"
+			let tdp=95
+			let bridgeType=2
+			;;
+
+		0x3A)
+			echo "Ivy Bridge Core processor detected"
+			let tdp=77
+			let bridgeType=4
+			;;
+
+		0x3B)
+			echo "Ivy Bridge Core processor detected"
+			let tdp=77
+			let bridgeType=4
+			;;
+	esac
+
     #
     # Command line arguments.
     #
 
-    let tdp=$1
-    let maxTurboFrequency=$2
-	# let lowFrequencyPStates=$3
+	let maxTurboFrequency=$1
+
+	if [ $# -eq 2 ];
+		then
+			let tdp=$2
+			echo "Max TDP override, now using: $tdp Watt"
+		else
+			echo "Using the default max TDP of: $tdp Watt"
+	fi
+
+	if [ $# -eq 3 ];
+		then
+			if [ $3 -eq 0 ];
+				then
+					let bridgeType=2
+					echo "CPU type override, now using: Sandy Bridge"
+				else
+					let bridgeType=4
+					echo "CPU type override, now using: Ivy Bridge"
+			fi
+	fi
 
     #
     # Do not change anything below this line!
     #
 
 	#let logicalCPUs=$(echo `sysctl hw.logicalcpu` | sed -e 's/^hw.logicalcpu: //')
-    let logicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
-
+    local logicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
 	let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
     let frequency=($frequency / 1000000)
 
-    #
+	echo "$logicalCPUs logical CPU's detected with a Core Frequency of $frequency MHz"
+
+	#
     # Get number of Turbo states.
     #
 
@@ -546,59 +830,60 @@ function main()
             let turboStates=0
     fi
 
-    let packageLength=$(echo "(($maxTurboFrequency - $baseFrequency) / 100)" | bc)
+	echo "Number of Turbo States: $turboStates ($frequency-$maxTurboFrequency MHz)"
+
+    local packageLength=$(echo "((($maxTurboFrequency - $baseFrequency)+100) / 100)" | bc)
+
+	echo "Number of P-States: $packageLength ($baseFrequency-$maxTurboFrequency)"
 
     _printHeader
 	_printExternals $logicalCPUs
-	_printScopeStart $turboStates $packageLength $3
-	_printPackages $tdp $frequency $maxTurboFrequency $3
-	_printCSTScope
+	_printDebugInfo $logicalCPUs $tdp $packageLength $turboStates $maxTurboFrequency
+	_printScopeStart $turboStates $packageLength
+	_printPackages $tdp $frequency $maxTurboFrequency
+
+	_getBoardID
 
 	local modelID=$(_getModelName)
-	local usedBoardID=$(_getBoardID)
 	local typeCPU=$(_getCPUtype)
+	local currentSystemType=$(_getSystemType)
 
-	if [ $3 -eq 1 ]
+	if [ $bridgeType -eq $IVY_BRIDGE ];
 		then
-			local targetModelID=$(_getIvyMacModelByBoardID)
+			local cpuTypeString="04"
+			local bridgeTypeString="Ivy Bridge"
 
-			_printIvybridgeMethods $usedBoardID $targetModelID
+			_initIvyBridgeSetup
+			_printCSTScope 0
+			_printIvybridgeMethods
 			_printCPUScopes $logicalCPUs
-
-			if [ "$targetModelID" == "" ]
-				then
-					echo "Warning: Used board-id [$usedBoardID] is not supported by Ivybridge PM"
-				else
-					if [ "$targetModelID" != "$modelID" ]
-						then
-							echo "Error: board-id [$usedBoardID] and model [$modelID] mismatch"
-					fi
-			fi
-
-			if [ "${typeCPU:2:2}" != "04" ]
-				then
-					echo "Warning: cpu-type may be set improperly (0x$typeCPU instead of 0x${typeCPU:0:2}04)"
-			fi
 		else
-			local targetModelID=$(_getSandyMacModelByBoardID)
+			local cpuTypeString="02"
+			local bridgeTypeString="Sandy Bridge"
 
+			_initSandyBridgeSetup
+			_printCSTScope 0
 			_printCPUScopes $logicalCPUs
+	fi
 
-			if [ "$targetModelID" == "" ]
-				then
-					echo "Warning: Used board-id [$usedBoardID] is not supported by Sandybridge PM"
-				else
-					if [ "$targetModelID" != "$modelID" ]
-						then
-							echo "Error: board-id [$usedBoardID] and model [$modelID] mismatch"
-					fi
-			fi
+	printf "Number of C-States for "$gProcLabel"0: $gACST_CPU0\n"
+	printf "Number of C-States for "$gProcLabel"1: $gACST_CPU1\n"
 
-			if [ "${typeCPU:2:2}" != "02" ]
-				then
-					echo "Warning: cpu-type may be set improperly (0x$typeCPU instead of 0x${typeCPU:0:2}02)"
+	if [ ${typeCPU:2:2} -ne $cpuTypeString ]; then
+		echo "Warning: cpu-type may be set improperly (0x$typeCPU instead of 0x${typeCPU:0:2}$cpuTypeString)"
+	fi
+
+	if [ $systemType -eq 0 ];
+		then
+			echo "Warning: Used board-id [$boardID] is not supported by $bridgeTypeString PM"
+		else
+			if [ "$macModelIdentifier" != "$modelID" ]; then
+				echo "Error: board-id [$boardID] and model [$modelID] mismatch"
 			fi
 
+			if [ $currentSystemType -ne $systemType ]; then
+				echo "Warning: system-type may be set improperly ($currentSystemType instead of $systemType)"
+		fi
 	fi
 }
 
@@ -609,11 +894,12 @@ function main()
 # Check number of arguments.
 #
 
-if [ $# -eq 3 ];
+if [ $# -gt 0 ];
     then
         main $1 $2 $3
+        open $ssdtPR
     else
-        echo "Usage: $0 TDP MaxTurboFrequency (0 for SandyBridge / 1 for IvyBridge)"
+        echo "Usage: $0 MaxTurboFrequency [TDP (Watts) CPU (0=SandyBridge, 1=IvyBridge)]"
         exit 1
 fi
 

From 875e1434cfaef13d97e9f0dc427f3c19bc12f717 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 3 Feb 2013 12:23:53 +0100
Subject: [PATCH 256/623] Typos

Another bloody expensive 3G update from Spain
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index faf8369..6c55d5f 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -24,7 +24,7 @@
 #			- ACST injection for all logical processors (Pike, Februari, 2013)
 #
 # Contributors:
-#			- Thanks to Dave and Toleda for their help (bug fixes and other improvements).
+#			- Thanks to Dave and toleda for their help (bug fixes and other improvements).
 #
 
 # set -x # Used for tracing errors (can be used anywhere in the script).
@@ -59,7 +59,7 @@ gACST_CPU1=7
 macModelIdentifier=""
 
 #
-# Change this label to "P00" when your tables use P000 instead oc CPU0.
+# Change this label to "P00" when your tables use P00n instead of CPUn.
 #
 
 gProcLabel="CPU"

From 6d70ccceba75048f153b823e134875f5db1e006d Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 6 Feb 2013 08:36:18 +0100
Subject: [PATCH 257/623] ACST hintcode error fixed

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 350 ++++++++++++++-------------
 1 file changed, 181 insertions(+), 169 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 6c55d5f..89c2b54 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 2.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 2.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)
@@ -22,6 +22,7 @@
 #			- TDP and processor type are now optional arguments (Pike, Februari, 2013)
 #			- system-type check (used by X86PlatformPlugin) added (Pike, Februari, 2013)
 #			- ACST injection for all logical processors (Pike, Februari, 2013)
+#			- ACST hintcode error fixed (Pike, Februari, 2013)
 #
 # Contributors:
 #			- Thanks to Dave and toleda for their help (bug fixes and other improvements).
@@ -269,192 +270,203 @@ function _printIvybridgeMethods()
 
 function _printCSTScope()
 {
-	let C1=0
-	let C2=0
-	let C3=0
-	let C6=0
-	let C7=0
-	local pkgLength=2
-	local numberOfCStates=0
-
-	echo ''                                                                     >> $ssdtPR
-	echo '        Method (ACST, 0, NotSerialized)'                              >> $ssdtPR
-	echo '        {'                                                            >> $ssdtPR
+    let C1=0
+    let C2=0
+    let C3=0
+    let C6=0
+    let C7=0
+    local pkgLength=2
+    local numberOfCStates=0
+
+    echo ''                                                                         >> $ssdtPR
+    echo '        Method (ACST, 0, NotSerialized)'                                  >> $ssdtPR
+    echo '        {'                                                                >> $ssdtPR
 
-	#
-	# Are we injecting C-States for CPU1?
-	#
-	if [ $1 -eq 1 ];
-		then
-			# Yes (also used by CPU2, CPU3 and greater).
-			let targetCStates=$gACST_CPU1
-			latency_C1=0x03E8
-			latency_C2=0x94
-			latency_C3=0xA9
-			echo '            Store ("CPU1 C-States    : '$gACST_CPU1'", Debug)'>> $ssdtPR
-
-		else
+    #
+    # Are we injecting C-States for CPU1?
+    #
+    if [ $1 -eq 1 ];
+        then
+            # Yes (also used by CPU2, CPU3 and greater).
+            let targetCStates=$gACST_CPU1
+            latency_C1=0x03E8
+            latency_C2=0x94
+            latency_C3=0xA9
+            echo '            Store ("CPU1 C-States    : '$gACST_CPU1'", Debug)'    >> $ssdtPR
+
+        else
 			# No (only used by CPU0).
-			let targetCStates=$gACST_CPU0
-			latency_C1=Zero
-			latency_C3=0xCD
-			latency_C6=0xF5
-			latency_C7=0xF5
-			echo '            Store ("CPU0 C-States    : '$gACST_CPU0'", Debug)'>> $ssdtPR
-	fi
+            let targetCStates=$gACST_CPU0
+            latency_C1=Zero
+            latency_C3=0xCD
+            latency_C6=0xF5
+            latency_C7=0xF5
+            echo '            Store ("CPU0 C-States    : '$gACST_CPU0'", Debug)'    >> $ssdtPR
+    fi
 
-	#
-	# Checks to determine which C-State(s) we should inject.
-	#
-	if (($targetCStates & 1)); then
-		let C1=1
-		let numberOfCStates+=1
-		let pkgLength+=1
-	fi
+    #
+    # Checks to determine which C-State(s) we should inject.
+    #
+    if (($targetCStates & 1)); then
+        let C1=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
 
-	if (($targetCStates & 2)); then
-		let C2=1
-		let numberOfCStates+=1
-		let pkgLength+=1
-	fi
+    if (($targetCStates & 2)); then
+        let C2=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
 
-	if (($targetCStates & 4)); then
-		let C3=1
-		let numberOfCStates+=1
-		let pkgLength+=1
-	fi
+    if (($targetCStates & 4)); then
+        let C3=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
 
-	if (($targetCStates & 8)); then
-		let C6=1
-		let numberOfCStates+=1
-		let pkgLength+=1
-	fi
+    if (($targetCStates & 8)); then
+        let C6=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
 
-	if (($targetCStates & 16)); then
-		let C7=1
-		let numberOfCStates+=1
-		let pkgLength+=1
-	fi
+    if (($targetCStates & 16)); then
+        let C7=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
 
-	echo ''                                                                     >> $ssdtPR
-	printf "            Return (Package (0x%02x)\n" $pkgLength                  >> $ssdtPR
-	echo '            {'                                                        >> $ssdtPR
-	echo '                One,'                                                 >> $ssdtPR
-	printf "                0x%02x,\n" $numberOfCStates                         >> $ssdtPR
-
-	echo '                Package (0x04)'                                       >> $ssdtPR
-	echo '                {'                                                    >> $ssdtPR
-	echo '                    ResourceTemplate ()'                              >> $ssdtPR
-	echo '                    {'                                                >> $ssdtPR
-	echo '                        Register (FFixedHW,'                          >> $ssdtPR
-	echo '                            0x01,               // Bit Width'         >> $ssdtPR
-	echo '                            0x02,               // Bit Offset'        >> $ssdtPR
-	echo '                            0x0000000000000000, // Address'           >> $ssdtPR
-	echo '                            0x01,               // Access Size'       >> $ssdtPR
-	echo '                            )'                                        >> $ssdtPR
-	echo '                    },'                                               >> $ssdtPR
-	echo '                    One,'                                             >> $ssdtPR
-	echo '                    '$latency_C1','                                   >> $ssdtPR
-	echo '                    0x03E8'                                           >> $ssdtPR
-
-	if [ $C2 -eq 1 ]; then
-		echo '                },'                                               >> $ssdtPR
-		echo ''                                                                 >> $ssdtPR
-		echo '                Package (0x04)'                                   >> $ssdtPR
-		echo '                {'                                                >> $ssdtPR
-		echo '                    ResourceTemplate ()'                          >> $ssdtPR
-		echo '                    {'                                            >> $ssdtPR
-		echo '                        Register (FFixedHW,'                      >> $ssdtPR
-		echo '                            0x01,               // Bit Width'     >> $ssdtPR
-		echo '                            0x02,               // Bit Offset'    >> $ssdtPR
-		echo '                            0x0000000000000010, // Address'       >> $ssdtPR
-		echo '                            0x03,               // Access Size'   >> $ssdtPR
-		echo '                            )'                                    >> $ssdtPR
-		echo '                    },'                                           >> $ssdtPR
-		echo '                    0x02,'                                        >> $ssdtPR
-		echo '                    '$latency_C2','                               >> $ssdtPR
-		echo '                    0x01F4'                                       >> $ssdtPR
-	fi
+    let hintCode=0x00
+
+    echo ''                                                                         >> $ssdtPR
+  printf "            Return (Package (0x%02x)\n" $pkgLength                        >> $ssdtPR
+    echo '            {'                                                            >> $ssdtPR
+    echo '                One,'                                                     >> $ssdtPR
+  printf "                0x%02x,\n" $numberOfCStates                               >> $ssdtPR
+    echo '                Package (0x04)'                                           >> $ssdtPR
+    echo '                {'                                                        >> $ssdtPR
+    echo '                    ResourceTemplate ()'                                  >> $ssdtPR
+    echo '                    {'                                                    >> $ssdtPR
+    echo '                        Register (FFixedHW,'                              >> $ssdtPR
+    echo '                            0x01,               // Bit Width'             >> $ssdtPR
+    echo '                            0x02,               // Bit Offset'            >> $ssdtPR
+  printf "                            0x%016x, // Address\n" $hintCode              >> $ssdtPR
+    echo '                            0x01,               // Access Size'           >> $ssdtPR
+    echo '                            )'                                            >> $ssdtPR
+    echo '                    },'                                                   >> $ssdtPR
+    echo '                    One,'                                                 >> $ssdtPR
+    echo '                    '$latency_C1','                                       >> $ssdtPR
+    echo '                    0x03E8'                                               >> $ssdtPR
+
+    if (($C2)); then
+        let hintCode+=0x10
+        echo '                },'                                                   >> $ssdtPR
+        echo ''                                                                     >> $ssdtPR
+        echo '                Package (0x04)'                                       >> $ssdtPR
+        echo '                {'                                                    >> $ssdtPR
+        echo '                    ResourceTemplate ()'                              >> $ssdtPR
+        echo '                    {'                                                >> $ssdtPR
+        echo '                        Register (FFixedHW,'                          >> $ssdtPR
+        echo '                            0x01,               // Bit Width'         >> $ssdtPR
+        echo '                            0x02,               // Bit Offset'        >> $ssdtPR
+      printf "                            0x%016x, // Address\n" $hintCode          >> $ssdtPR
+        echo '                            0x03,               // Access Size'       >> $ssdtPR
+        echo '                            )'                                        >> $ssdtPR
+        echo '                    },'                                               >> $ssdtPR
+        echo '                    0x02,'                                            >> $ssdtPR
+        echo '                    '$latency_C2','                                   >> $ssdtPR
+        echo '                    0x01F4'                                           >> $ssdtPR
+    fi
 
-	if (($C3)); then
-		echo '                },'                                               >> $ssdtPR
-		echo ''                                                                 >> $ssdtPR
-		echo '                Package (0x04)'                                   >> $ssdtPR
-		echo '                {'                                                >> $ssdtPR
-		echo '                    ResourceTemplate ()'                          >> $ssdtPR
-		echo '                    {'                                            >> $ssdtPR
-		echo '                        Register (FFixedHW,'                      >> $ssdtPR
-		echo '                            0x01,               // Bit Width'     >> $ssdtPR
-		echo '                            0x02,               // Bit Offset'    >> $ssdtPR
-		echo '                            0x0000000000000010, // Address'       >> $ssdtPR
-		echo '                            0x03,               // Access Size'   >> $ssdtPR
-		echo '                            )'                                    >> $ssdtPR
-		echo '                    },'                                           >> $ssdtPR
-		echo '                    0x03,'                                        >> $ssdtPR
-		echo '                    '$latency_C3','                               >> $ssdtPR
-		echo '                    0x01F4'                                       >> $ssdtPR
-	fi
+    if (($C3)); then
+        let hintCode+=0x10
+        echo '                },'                                                   >> $ssdtPR
+        echo ''                                                                     >> $ssdtPR
+        echo '                Package (0x04)'                                       >> $ssdtPR
+        echo '                {'                                                    >> $ssdtPR
+        echo '                    ResourceTemplate ()'                              >> $ssdtPR
+        echo '                    {'                                                >> $ssdtPR
+        echo '                        Register (FFixedHW,'                          >> $ssdtPR
+        echo '                            0x01,               // Bit Width'         >> $ssdtPR
+        echo '                            0x02,               // Bit Offset'        >> $ssdtPR
+      printf "                            0x%016x, // Address\n" $hintCode          >> $ssdtPR
+        echo '                            0x03,               // Access Size'       >> $ssdtPR
+        echo '                            )'                                        >> $ssdtPR
+        echo '                    },'                                               >> $ssdtPR
+        echo '                    0x03,'                                            >> $ssdtPR
+        echo '                    '$latency_C3','                                   >> $ssdtPR
+        echo '                    0x01F4'                                           >> $ssdtPR
+    fi
 
-	if [ $C6 -eq 1 ]; then
-		echo '                },'                                               >> $ssdtPR
-		echo ''                                                                 >> $ssdtPR
-		echo '                Package (0x04)'                                   >> $ssdtPR
-		echo '                {'                                                >> $ssdtPR
-		echo '                    ResourceTemplate ()'                          >> $ssdtPR
-		echo '                    {'                                            >> $ssdtPR
-		echo '                        Register (FFixedHW,'                      >> $ssdtPR
-		echo '                            0x01,               // Bit Width'     >> $ssdtPR
-		echo '                            0x02,               // Bit Offset'    >> $ssdtPR
-		echo '                            0x0000000000000020, // Address'       >> $ssdtPR
-		echo '                            0x03,               // Access Size'   >> $ssdtPR
-		echo '                            )'                                    >> $ssdtPR
-		echo '                    },'                                           >> $ssdtPR
-		echo '                    0x06,'                                        >> $ssdtPR
-		echo '                    '$latency_C6','                               >> $ssdtPR
-		echo '                    0x015E'                                       >> $ssdtPR
-	fi
+    if (($C6)); then
+        let hintCode+=0x10
+        echo '                },'                                                   >> $ssdtPR
+        echo ''                                                                     >> $ssdtPR
+        echo '                Package (0x04)'                                       >> $ssdtPR
+        echo '                {'                                                    >> $ssdtPR
+        echo '                    ResourceTemplate ()'                              >> $ssdtPR
+        echo '                    {'                                                >> $ssdtPR
+        echo '                        Register (FFixedHW,'                          >> $ssdtPR
+        echo '                            0x01,               // Bit Width'         >> $ssdtPR
+        echo '                            0x02,               // Bit Offset'        >> $ssdtPR
+      printf "                            0x%016x, // Address\n" $hintCode          >> $ssdtPR
+        echo '                            0x03,               // Access Size'       >> $ssdtPR
+        echo '                            )'                                        >> $ssdtPR
+        echo '                    },'                                               >> $ssdtPR
+        echo '                    0x06,'                                            >> $ssdtPR
+        echo '                    '$latency_C6','                                   >> $ssdtPR
+        echo '                    0x015E'                                           >> $ssdtPR
+    fi
 
-	if [ $C7 -eq 1 ]; then
-		echo '                },'                                               >> $ssdtPR
-		echo ''                                                                 >> $ssdtPR
-		echo '                Package (0x04)'                                   >> $ssdtPR
-		echo '                {'                                                >> $ssdtPR
-		echo '                    ResourceTemplate ()'                          >> $ssdtPR
-		echo '                    {'                                            >> $ssdtPR
-		echo '                        Register (FFixedHW,'                      >> $ssdtPR
-		echo '                            0x01,               // Bit Width'     >> $ssdtPR
-		echo '                            0x02,               // Bit Offset'    >> $ssdtPR
-		echo '                            0x0000000000000030, // Address'       >> $ssdtPR
-		echo '                            0x03,               // Access Size'   >> $ssdtPR
-		echo '                            )'                                    >> $ssdtPR
-		echo '                    },'                                           >> $ssdtPR
-		echo '                    0x07,'                                        >> $ssdtPR
-		echo '                    '$latency_C7','                               >> $ssdtPR
-		echo '                    0xC8'                                         >> $ssdtPR
-	fi
+	if (($C7)); then
+        #
+        # If $hintCode is already 0x30 then use 0x31 otherwise 0x30
+        #
+        if [ $hintCode -eq 48 ];
+            then
+                let hintCode+=0x01
+            else
+                let hintCode+=0x10
+        fi
+        echo '                },'                                                   >> $ssdtPR
+        echo ''                                                                     >> $ssdtPR
+        echo '                Package (0x04)'                                       >> $ssdtPR
+        echo '                {'                                                    >> $ssdtPR
+        echo '                    ResourceTemplate ()'                              >> $ssdtPR
+        echo '                    {'                                                >> $ssdtPR
+        echo '                        Register (FFixedHW,'                          >> $ssdtPR
+        echo '                            0x01,               // Bit Width'         >> $ssdtPR
+        echo '                            0x02,               // Bit Offset'        >> $ssdtPR
+      printf "                            0x%016x, // Address\n" $hintCode          >> $ssdtPR
+        echo '                            0x03,               // Access Size'       >> $ssdtPR
+        echo '                            )'                                        >> $ssdtPR
+        echo '                    },'                                               >> $ssdtPR
+        echo '                    0x07,'                                            >> $ssdtPR
+        echo '                    '$latency_C7','                                   >> $ssdtPR
+        echo '                    0xC8'                                             >> $ssdtPR
+    fi
 
-	echo '                }'                                                    >> $ssdtPR
-	echo '            })'                                                       >> $ssdtPR
-	echo '        }'                                                            >> $ssdtPR
+    echo '                }'                                                        >> $ssdtPR
+    echo '            })'                                                           >> $ssdtPR
+    echo '        }'                                                                >> $ssdtPR
 
-	if [ $1 -eq 1 ];
-		then
-			gACST_CPU1=$numberOfCStates
-		else
+    if [ $1 -eq 1 ];
+        then
+            gACST_CPU1=$numberOfCStates
+        else
 			gACST_CPU0=$numberOfCStates
-	fi
+    fi
 
-	#
-	# We don't want a closing bracket here when we add methods for Ivy Bridge.
-	#
+    #
+    # We don't want a closing bracket here when we add methods for Ivy Bridge.
+    #
 
-	if [ $bridgeType -eq $SANDY_BRIDGE ]
-		then
-			echo '    }'                                                        >> $ssdtPR
-	fi
+    if [ $bridgeType -eq $SANDY_BRIDGE ]; then
+        echo '    }'                                                                >> $ssdtPR
+    fi
 }
 
-
 #--------------------------------------------------------------------------------
 
 function _printCPUScopes()

From 0188f448da4d5b17a1f5ba1355850be9c1bff412 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 6 Feb 2013 14:16:23 +0100
Subject: [PATCH 258/623] Introducing a stand-alone version of method _DSM

Thanks to the old man aka Master Chief
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 45 +++++++++++++---------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 89c2b54..ecfacfc 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 2.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 2.2 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)
@@ -23,6 +23,7 @@
 #			- system-type check (used by X86PlatformPlugin) added (Pike, Februari, 2013)
 #			- ACST injection for all logical processors (Pike, Februari, 2013)
 #			- ACST hintcode error fixed (Pike, Februari, 2013)
+#			- Introducing a stand-alone version of method _DSM (Pike, Februari, 2013)
 #
 # Contributors:
 #			- Thanks to Dave and toleda for their help (bug fixes and other improvements).
@@ -241,29 +242,25 @@ function _printPackages()
 
 function _printIvybridgeMethods()
 {
-	echo ''                                                                 >> $ssdtPR
-	echo '        Method (MCDP, 2, NotSerialized)'                          >> $ssdtPR
-	echo '        {'                                                        >> $ssdtPR
-	echo '            If (LEqual (Arg0, Zero))'                             >> $ssdtPR
-	echo '            {'                                                    >> $ssdtPR
-	echo '                Store (Buffer (One)'                              >> $ssdtPR
-	echo '                {'                                                >> $ssdtPR
-	echo '                    0x03'                                         >> $ssdtPR
-	echo '                }, Arg1)'                                         >> $ssdtPR
-	echo '            }'                                                    >> $ssdtPR
-	echo '        }'                                                        >> $ssdtPR
-	echo ''                                                                 >> $ssdtPR
-	echo '        Method (_DSM, 4, NotSerialized)'                          >> $ssdtPR
-	echo '        {'                                                        >> $ssdtPR
-	echo '            Store (Package (0x02)'                                >> $ssdtPR
-	echo '            {'                                                    >> $ssdtPR
-	echo '                "plugin-type",'                                   >> $ssdtPR
-	echo '                One'                                              >> $ssdtPR
-	echo '            }, Local0)'                                           >> $ssdtPR
-	echo '            MCDP (Arg2, RefOf (Local0))'                          >> $ssdtPR
-	echo '            Return (Local0)'                                      >> $ssdtPR
-	echo '        }'                                                        >> $ssdtPR
-	echo '    }'                                                            >> $ssdtPR
+    // New stand-alone version of Method _DSM - Copyright (c) 2009 by Master Chief
+    echo ''                                                                 >> $ssdtPR
+    echo '        Method (_DSM, 4, NotSerialized)'                          >> $ssdtPR
+    echo '        {'                                                        >> $ssdtPR
+    echo '            If (LEqual (Arg2, Zero))'                             >> $ssdtPR
+    echo '            {'                                                    >> $ssdtPR
+    echo '                Return (Buffer (One)'                             >> $ssdtPR
+    echo '                {'                                                >> $ssdtPR
+    echo '                    0x03'                                         >> $ssdtPR
+    echo '                })'                                               >> $ssdtPR
+    echo '            }'                                                    >> $ssdtPR
+    echo ''                                                                 >> $ssdtPR
+    echo '            Return (Package (0x02)'                               >> $ssdtPR
+    echo '            {'                                                    >> $ssdtPR
+    echo '                "plugin-type",'                                   >> $ssdtPR
+    echo '                One'                                              >> $ssdtPR
+    echo '            })'                                                   >> $ssdtPR
+    echo '        }'                                                        >> $ssdtPR
+    echo '    }'                                                            >> $ssdtPR
 }
 
 #--------------------------------------------------------------------------------

From e9d0d0ee5a2f0854cdd1b4405cf850d24db88059 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 6 Feb 2013 14:24:27 +0100
Subject: [PATCH 259/623] Test version for Jeroen

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 417 +++++++++++++++++++--------
 1 file changed, 295 insertions(+), 122 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index ecfacfc..4c5d377 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 2.2 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 2.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)
@@ -33,7 +33,8 @@
 
 #================================= GLOBAL VARS ==================================
 
-scriptVersion=2.0
+scriptVersion=2.3
+
 
 #
 # Path and filename setup.
@@ -55,7 +56,7 @@ baseFrequency=1600
 
 systemType=0
 
-gACST_CPU0=13
+gACST_CPU0=29
 gACST_CPU1=7
 
 macModelIdentifier=""
@@ -69,6 +70,108 @@ gProcLabel="CPU"
 IVY_BRIDGE=4
 SANDY_BRIDGE=2
 
+typeCPU=0
+processorData="Unknown CPU"
+processorNumber=""
+
+#
+# Processor Number, Max TDP, Clock Speed, Max Turbo Frequency, Number of Cores, Number of Threads
+#
+
+desktopIvyBridgeCPUList=(
+# i7-3700 Desktop Processor Series
+i7-3770T,45,2500,3700,4,8
+i7-3770S,65,3100,3900,4,8
+i7-3770K,77,3500,3900,4,8
+i7-3770,77,3400,3900,4,8
+# i5-3500 Desktop Processor Series
+i5-3570T,45,2300,3300,4,4
+i5-3570K,77,3400,3800,4,4
+i5-3570S,65,3100,3800,4,4
+i5-3570,77,3400,3800,4,4
+i5-3550S,65,3000,3700,4,4
+i5-3550,77,3300,3700,4,4
+# i5-3400 Desktop Processor Series
+i5-3475S,65,2900,3600,4,4
+i5-3470S,65,2900,3600,4,4
+i5-3470,77,3200,3600,4,4
+i5-3470T,35,2900,3600,2,4
+i5-3450S,65,2800,3500,4,4
+i5-3450,77,3100,3500,4,4
+# i5-3300 Desktop Processor Series
+i5-3350P,69,3100,3300,4,4
+i5-3330S,65,2700,3200,4,4
+i5-3330,77,3000,3200,4,4
+# i3-3200 Desktop Processor Series
+i3-3240,55,3400,0,2,4
+i3-3240T,35,2900,0,2,4
+i3-3225,55,3300,0,2,4
+i3-3220,55,3300,0,2,4
+i3-3220T,35,2800,0,2,4
+i3-3210,55,3200,0,2,4
+)
+
+#
+# Processor Number, Max TDP, Clock Speed, Max Turbo Frequency, Number of Cores, Number of Threads
+#
+
+mobileIvyBridgeCPUList=(
+# i7-3800 Mobile Processor Series
+i7-3840QM,45,2800,3800,4,8
+i7-3820QM,45,2700,3700,4,8
+# i7-3700 Mobile Processor Series
+i7-3740QM,45,2700,3700,4,8
+i7-3720QE,45,2600,3600,4,8
+# i7-3600 Mobile Processor Series
+i7-3689Y,13,1500,2600,2,4
+i7-3687U,17,2100,3300,2,4
+i7-3667U,17,2000,3200,2,4
+i7-3635QM,45,2400,3400,4,8
+i7-3620QM,35,2200,3200,4,8
+i7-3632QM,35,2200,3200,4,8
+i7-3630QM,45,2400,3400,4,8
+i7-3615QM,45,2300,3300,4,8
+i7-3615QE,45,2300,3300,4,8
+i7-3612QM,35,2100,3100,4,8
+i7-3612QE,35,2100,3100,4,8
+i7-3610QM,45,2300,3300,4,8
+i7-3610QE,45,2300,3300,4,8
+# i7-3500 Mobile Processor Series
+i7-3555LE,25,2500,3200,2,4
+i7-3540M,35,3000,3700,2,4
+i7-3537U,17,2000,3100,2,4
+i7-3520M,35,2900,3600,2,4
+i7-3517UE,17,1700,2800,2,4
+i7-3517U,17,1900,3000,2,4
+# i5-3600 Mobile Processor Series
+i5-3610ME,35,2700,3300,2,4
+# i5-3400 Mobile Processor Series
+i5-3439Y,13,1500,2300,2,4
+i5-3437U,17,1900,2900,2,4
+i5-3427U,17,1800,2800,2,4
+# i5-3300 Mobile Processor Series
+i5-3380M,35,2900,3600,2,4
+i5-3360M,35,2800,3500,2,4
+i5-3340M,35,2700,3400,2,4
+i5-3339Y,13,1500,2000,2,4
+i5-3337U,17,1800,2700,2,4
+i5-3320M,35,2600,3300,2,4
+i5-3317U,17,1700,2600,2,4
+# i5-3200 Mobile Processor Series
+i5-3230M,35,2600,3200,2,4
+i5-3210M,35,2500,3100,2,4
+# i3-3200 Mobile Processor Series
+i3-3239Y,13,1400,0,2,4
+i3-3227U,17,1900,0,2,4
+i3-3217UE,17,1600,0,2,4
+i3-3217U,17,1800,0,2,4
+# i3-3100 Mobile Processor Series
+i3-3130M,35,2600,0,2,4
+i3-3120ME,35,2400,0,2,4
+i3-3120M,35,2500,0,2,4
+i3-3110M,35,2400,0,2,4
+)
+
 #--------------------------------------------------------------------------------
 
 function _printHeader()
@@ -501,54 +604,126 @@ function _printCPUScopes()
 
 function _getModelName()
 {
-	#
-	# Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
-	#
-	echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *["=<>]//g' -e 's/compatible//'`
+    #
+    # Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
+    #
+    echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *["=<>]//g' -e 's/compatible//'`
 }
 
 #--------------------------------------------------------------------------------
 
 function _getBoardID()
 {
-	#
-	# Grab 'board-id' property from ioreg (stripped with sed / RegEX magic).
-	#
-	boardID=`ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *["=<>]//g' -e 's/board-id//'`
+    #
+    # Grab 'board-id' property from ioreg (stripped with sed / RegEX magic).
+    #
+    boardID=`ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *["=<>]//g' -e 's/board-id//'`
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUtype()
 {
-	#
-	# Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
-	#
-	local grepStr=`ioreg -p IODeviceTree -n CPU0@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g'`
-	#
-	# Swap bytes with help of ${str:pos:num}
-	#
-	echo ${grepStr:2:2}${grepStr:0:2}
+    #
+    # Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
+    #
+    local grepStr=`ioreg -p IODeviceTree -n CPU0@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g'`
+    #
+    # Swap bytes with help of ${str:pos:num}
+    #
+    echo ${grepStr:2:2}${grepStr:0:2}
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUModel()
 {
-	#
-	# Returns the hexadecimal value of machdep.cpu.model
-	#
-	echo 0x$(echo "obase=16; `sysctl machdep.cpu.model | sed -e 's/^machdep.cpu.model: //'`" | bc)
+    #
+    # Returns the hexadecimal value of machdep.cpu.model
+    #
+    echo 0x$(echo "obase=16; `sysctl machdep.cpu.model | sed -e 's/^machdep.cpu.model: //'`" | bc)
 }
 
 #--------------------------------------------------------------------------------
 
 function _getSystemType()
 {
-	#
-	# Grab 'system-type' property from ioreg (stripped with sed / RegEX magic).
-	#
-	echo `ioreg -p IODeviceTree -d 2 -k system-type | grep system-type | sed -e 's/ *[-="<0a-z>]//g'`
+    #
+    # Grab 'system-type' property from ioreg (stripped with sed / RegEX magic).
+    #
+    echo `ioreg -p IODeviceTree -d 2 -k system-type | grep system-type | sed -e 's/ *[-="<0a-z>]//g'`
+}
+
+#--------------------------------------------------------------------------------
+
+function _getCPUNumberFromBrandString
+{
+    #
+    # Get CPU brandstring
+    #
+    local brandString=$(echo `sysctl machdep.cpu.brand_string` | sed -e 's/machdep.cpu.brand_string: //')
+    #
+    # Save default (0) delimiter
+    #
+    local ifs=$IFS
+    #
+    # Change delimiter to a space character
+    #
+    IFS=" "
+    #
+    # Split brandstring into array (data)
+    #
+    local data=($brandString)
+    # echo "${data[0]}" # Intel(R)
+    # echo "${data[1]}" # Core(TM)
+    # echo "${data[2]}" # i5-2500K
+    # echo "${data[3]}" # CPU
+    # echo "${data[4]}" # @
+    # echo "${data[5]}" # 3.30GHz
+    #
+    # Restore the default delimiter
+    #
+    IFS=$ifs
+
+    processorNumber="${data[2]}"
+    # processorNumber="i7-3740QM"
+}
+
+#--------------------------------------------------------------------------------
+
+function _getCPUDataByProcessorNumber
+{
+    local ifs=$IFS
+
+    for cpuData in "${desktopIvyBridgeCPUList[@]}";
+    do
+        IFS=","
+        data=($cpuData)
+
+        if [ ${data[0]} == $processorNumber ]; then
+            processorData="$cpuData"
+            typeCPU=1
+            return # break
+        fi
+    done
+
+    if [ $processorData == "Unknown CPU" ]; then
+        IFS=$ifs
+
+        for cpuData in ${mobileIvyBridgeCPUList[@]};
+        do
+            IFS=","
+            data=($cpuData)
+
+            if [ ${data[0]} == $processorNumber ]; then
+                processorData="$cpuData"
+                typeCPU=2
+                return # break
+            fi
+        done
+    fi
+
+    IFS=$ifs
 }
 
 #--------------------------------------------------------------------------------
@@ -753,76 +928,75 @@ function _isRoot()
 
 function main()
 {
-	echo ''
+    echo ''
 
-	#
-	# Get CPU type and model.
-	#
+    #
+    # Get installed CPU model, set bridge type and default TDP.
+    #
+    local model=$(_getCPUModel)
 
-	local model=$(_getCPUModel)
+    _getCPUNumberFromBrandString
 
-	case $model in
-		0x2A)
-			echo "Sandy Bridge Core processor detected"
-			let tdp=95
-			let bridgeType=2
-			;;
+    if (($model==0x12A || $model==0x12D));
+        then
+            let tdp=95
+            let bridgeType=2
+            local bridgeTypeString="Sandy Bridge"
+        else
+			let tdp=77
+            let bridgeType=4
+            local bridgeTypeString="Ivy Bridge"
 
-		0x2D)
-			echo "Sandy Bridge Core processor detected"
-			let tdp=95
-			let bridgeType=2
-			;;
+            if (($model==0x2A || $model==0x3B)); then
+                _getCPUDataByProcessorNumber
+            fi
+    fi
 
-		0x3A)
-			echo "Ivy Bridge Core processor detected"
-			let tdp=77
-			let bridgeType=4
-			;;
+    echo "$bridgeTypeString Core $processorNumber processor detected"
 
-		0x3B)
-			echo "Ivy Bridge Core processor detected"
-			let tdp=77
-			let bridgeType=4
-			;;
-	esac
+    if (($typeCPU)); then
+        local ifs=$IFS
+        IFS=","
+		local cpuData=($processorData)
+	    let tdp=${cpuData[1]}
+        IFS=$ifs
+    fi
 
     #
-    # Command line arguments.
+    # Command line (override) arguments.
     #
 
-	let maxTurboFrequency=$1
+    let maxTurboFrequency=$1
 
-	if [ $# -eq 2 ];
-		then
-			let tdp=$2
-			echo "Max TDP override, now using: $tdp Watt"
-		else
-			echo "Using the default max TDP of: $tdp Watt"
-	fi
+    if [ $# -ge 2 ];
+        then
+            let tdp=$2
+            echo "Max TDP override, now using: $tdp Watt"
+        else
+            echo "Using the default max TDP of: $tdp Watt"
+    fi
 
-	if [ $# -eq 3 ];
-		then
-			if [ $3 -eq 0 ];
-				then
-					let bridgeType=2
-					echo "CPU type override, now using: Sandy Bridge"
-				else
-					let bridgeType=4
-					echo "CPU type override, now using: Ivy Bridge"
-			fi
-	fi
+    if [ $# -eq 3 ]; then
+        if [ $3 -eq 0 ];
+            then
+                let bridgeType=2
+                echo "CPU type override, now using: Sandy Bridge"
+            else
+                let bridgeType=4
+                echo "CPU type override, now using: Ivy Bridge"
+         fi
+    fi
 
     #
     # Do not change anything below this line!
     #
 
-	#let logicalCPUs=$(echo `sysctl hw.logicalcpu` | sed -e 's/^hw.logicalcpu: //')
+    #let logicalCPUs=$(echo `sysctl hw.logicalcpu` | sed -e 's/^hw.logicalcpu: //')
     local logicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
-	let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
+    let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
     let frequency=($frequency / 1000000)
 
-	echo "$logicalCPUs logical CPU's detected with a Core Frequency of $frequency MHz"
+    echo "$logicalCPUs logical CPU's detected with a Core Frequency of $frequency MHz"
 
 	#
     # Get number of Turbo states.
@@ -834,68 +1008,66 @@ function main()
     # Check number of Turbo states.
     #
 
-    if [ $turboStates -lt 0 ];
-        then
-            let turboStates=0
+    if [ $turboStates -lt 0 ]; then
+        let turboStates=0
     fi
 
-	echo "Number of Turbo States: $turboStates ($frequency-$maxTurboFrequency MHz)"
+    echo "Number of Turbo States: $turboStates ($frequency-$maxTurboFrequency MHz)"
 
     local packageLength=$(echo "((($maxTurboFrequency - $baseFrequency)+100) / 100)" | bc)
 
-	echo "Number of P-States: $packageLength ($baseFrequency-$maxTurboFrequency)"
+    echo "Number of P-States: $packageLength ($baseFrequency-$maxTurboFrequency)"
 
     _printHeader
-	_printExternals $logicalCPUs
-	_printDebugInfo $logicalCPUs $tdp $packageLength $turboStates $maxTurboFrequency
-	_printScopeStart $turboStates $packageLength
-	_printPackages $tdp $frequency $maxTurboFrequency
+    _printExternals $logicalCPUs
+    _printDebugInfo $logicalCPUs $tdp $packageLength $turboStates $maxTurboFrequency
+    _printScopeStart $turboStates $packageLength
+    _printPackages $tdp $frequency $maxTurboFrequency
 
-	_getBoardID
+    _getBoardID
 
-	local modelID=$(_getModelName)
-	local typeCPU=$(_getCPUtype)
-	local currentSystemType=$(_getSystemType)
+    local modelID=$(_getModelName)
+    local typeCPU=$(_getCPUtype)
+    local currentSystemType=$(_getSystemType)
 
-	if [ $bridgeType -eq $IVY_BRIDGE ];
-		then
-			local cpuTypeString="04"
-			local bridgeTypeString="Ivy Bridge"
+    if [ $bridgeType -eq $IVY_BRIDGE ];
+        then
+            local cpuTypeString="04"
 
-			_initIvyBridgeSetup
-			_printCSTScope 0
-			_printIvybridgeMethods
-			_printCPUScopes $logicalCPUs
-		else
-			local cpuTypeString="02"
-			local bridgeTypeString="Sandy Bridge"
+            _initIvyBridgeSetup
 
-			_initSandyBridgeSetup
-			_printCSTScope 0
-			_printCPUScopes $logicalCPUs
-	fi
+            _printCSTScope 0
+            _printIvybridgeMethods
+            _printCPUScopes $logicalCPUs
+        else
+            local cpuTypeString="04"
 
-	printf "Number of C-States for "$gProcLabel"0: $gACST_CPU0\n"
-	printf "Number of C-States for "$gProcLabel"1: $gACST_CPU1\n"
+            _initSandyBridgeSetup
 
-	if [ ${typeCPU:2:2} -ne $cpuTypeString ]; then
-		echo "Warning: cpu-type may be set improperly (0x$typeCPU instead of 0x${typeCPU:0:2}$cpuTypeString)"
-	fi
+            _printCSTScope 0
+            _printCPUScopes $logicalCPUs
+    fi
 
-	if [ $systemType -eq 0 ];
-		then
-			echo "Warning: Used board-id [$boardID] is not supported by $bridgeTypeString PM"
-		else
-			if [ "$macModelIdentifier" != "$modelID" ]; then
-				echo "Error: board-id [$boardID] and model [$modelID] mismatch"
-			fi
+    printf "Number of C-States for "$gProcLabel"0: $gACST_CPU0\n"
+    printf "Number of C-States for "$gProcLabel"1: $gACST_CPU1\n"
 
-			if [ $currentSystemType -ne $systemType ]; then
-				echo "Warning: system-type may be set improperly ($currentSystemType instead of $systemType)"
-		fi
-	fi
-}
+    if [ ${typeCPU:2:2} -ne $cpuTypeString ]; then
+        echo "Warning: cpu-type may be set improperly (0x$typeCPU instead of 0x${typeCPU:0:2}$cpuTypeString)"
+    fi
+
+    if [ $systemType -eq 0 ];
+        then
+            echo "Warning: board-id [$boardID] is not supported by $bridgeTypeString PM"
+        else
+            if [ "$macModelIdentifier" != "$modelID" ]; then
+                echo "Error: board-id [$boardID] and model [$modelID] mismatch"
+            fi
 
+            if [ $currentSystemType -ne $systemType ]; then
+                echo "Warning: system-type may be set improperly ($currentSystemType instead of $systemType)"
+            fi
+    fi
+}
 
 #==================================== START =====================================
  
@@ -906,6 +1078,7 @@ function main()
 if [ $# -gt 0 ];
     then
         main $1 $2 $3
+        iasl $ssdtPR
         open $ssdtPR
     else
         echo "Usage: $0 MaxTurboFrequency [TDP (Watts) CPU (0=SandyBridge, 1=IvyBridge)]"

From 88d9fd6d4d5957091b4e36bc06df18a7af11cec1 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 6 Feb 2013 15:40:40 +0100
Subject: [PATCH 260/623] Jeroen done testing

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 4c5d377..51b4f81 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -937,17 +937,17 @@ function main()
 
     _getCPUNumberFromBrandString
 
-    if (($model==0x12A || $model==0x12D));
+    if (($model==0x2A || $model==0x2D));
         then
             let tdp=95
             let bridgeType=2
             local bridgeTypeString="Sandy Bridge"
         else
-			let tdp=77
+            let tdp=77
             let bridgeType=4
             local bridgeTypeString="Ivy Bridge"
 
-            if (($model==0x2A || $model==0x3B)); then
+            if (($model==0x3A || $model==0x3B)); then
                 _getCPUDataByProcessorNumber
             fi
     fi

From 4d028377a14bf260fd59fbf536c149a9000eb8d3 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 6 Feb 2013 18:09:45 +0100
Subject: [PATCH 261/623] i7-3720QE -> i7-3720QM
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to rachaf for catching this bug
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 51b4f81..a0038e5 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -121,7 +121,7 @@ i7-3840QM,45,2800,3800,4,8
 i7-3820QM,45,2700,3700,4,8
 # i7-3700 Mobile Processor Series
 i7-3740QM,45,2700,3700,4,8
-i7-3720QE,45,2600,3600,4,8
+i7-3720QM,45,2600,3600,4,8
 # i7-3600 Mobile Processor Series
 i7-3689Y,13,1500,2600,2,4
 i7-3687U,17,2100,3300,2,4

From 435d5375162cf9e2aad8066bdfa05b89b567c790 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 6 Feb 2013 19:28:12 +0100
Subject: [PATCH 262/623] Fix incorrect turbo range / syntax error

Thanks to philip_petev for catching a syntax error
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index a0038e5..11b380b 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 2.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 2.4 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)
@@ -24,6 +24,7 @@
 #			- ACST injection for all logical processors (Pike, Februari, 2013)
 #			- ACST hintcode error fixed (Pike, Februari, 2013)
 #			- Introducing a stand-alone version of method _DSM (Pike, Februari, 2013)
+#			- Fix incorrect turbo range (Pike, Februari, 2013)
 #
 # Contributors:
 #			- Thanks to Dave and toleda for their help (bug fixes and other improvements).
@@ -33,7 +34,7 @@
 
 #================================= GLOBAL VARS ==================================
 
-scriptVersion=2.3
+scriptVersion=2.4
 
 
 #
@@ -345,7 +346,9 @@ function _printPackages()
 
 function _printIvybridgeMethods()
 {
-    // New stand-alone version of Method _DSM - Copyright (c) 2009 by Master Chief
+    #
+    # New stand-alone version of Method _DSM - Copyright (c) 2009 by Master Chief
+    #
     echo ''                                                                 >> $ssdtPR
     echo '        Method (_DSM, 4, NotSerialized)'                          >> $ssdtPR
     echo '        {'                                                        >> $ssdtPR
@@ -1012,7 +1015,8 @@ function main()
         let turboStates=0
     fi
 
-    echo "Number of Turbo States: $turboStates ($frequency-$maxTurboFrequency MHz)"
+    let minTurboFrequency=($frequency+100)
+    echo "Number of Turbo States: $turboStates ($minTurboFrequency-$maxTurboFrequency MHz)"
 
     local packageLength=$(echo "((($maxTurboFrequency - $baseFrequency)+100) / 100)" | bc)
 

From 743f9c396af220921cc0f452888d1d2eed7efaf3 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Thu, 7 Feb 2013 23:32:44 +0100
Subject: [PATCH 263/623] Restore IFS before return

Thanks to oswaldini for catching this bug
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 11b380b..60916e5 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 2.4 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 2.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January, 2013)
@@ -25,6 +25,7 @@
 #			- ACST hintcode error fixed (Pike, Februari, 2013)
 #			- Introducing a stand-alone version of method _DSM (Pike, Februari, 2013)
 #			- Fix incorrect turbo range (Pike, Februari, 2013)
+#			- Restore IFS before return (Pike, Februari, 2013)
 #
 # Contributors:
 #			- Thanks to Dave and toleda for their help (bug fixes and other improvements).
@@ -34,7 +35,7 @@
 
 #================================= GLOBAL VARS ==================================
 
-scriptVersion=2.4
+scriptVersion=2.5
 
 
 #
@@ -706,7 +707,8 @@ function _getCPUDataByProcessorNumber
         if [ ${data[0]} == $processorNumber ]; then
             processorData="$cpuData"
             typeCPU=1
-            return # break
+            IFS=$ifs
+            return
         fi
     done
 
@@ -721,12 +723,11 @@ function _getCPUDataByProcessorNumber
             if [ ${data[0]} == $processorNumber ]; then
                 processorData="$cpuData"
                 typeCPU=2
-                return # break
+                IFS=$ifs
+                return
             fi
         done
     fi
-
-    IFS=$ifs
 }
 
 #--------------------------------------------------------------------------------

From 6e7570cdc9d137fcdb329f57d595da7916a553c4 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 10 Feb 2013 12:23:58 +0100
Subject: [PATCH 264/623] Updating script to version 3.0

Many thanks to Jeroen and all other people that use/test/report bugs!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 1217 +++++++++++++++-----------
 1 file changed, 707 insertions(+), 510 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 60916e5..3d35470 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,200 +3,261 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 2.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 3.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
-#			- Added support for Ivybridge (Pike, January, 2013)
-#			- Filename error fixed (Pike, January, 2013)
-#			- Namespace error fixed in _printScopeStart (Pike, January, 2013)
-#			- Model and board-id checks added (Pike, January, 2013)
-#			- SMBIOS cpu-type check added (Pike, January, 2013)
-#			- Copy/paste error fixed (Pike, January, 2013)
-#			- Method ACST added to CPU scopes for IB CPUPM (Pike, January, 2013)
-#			- Method ACST corrected for latest version of iasl (Dave, January, 2013)
-#			- Changed path/filename to ~/Desktop/SSDT_PR.dsl (Dave, January, 2013)
-#			- P-States are now one-liners instead of blocks (Pike, January, 2013)
-#			- Support for flexible ProcessorNames added (Pike, Februari, 2013)
-#			- Better feedback and Debug() injection added (Pike, Februari, 2013)
-#			- Automatic processor type detection (Pike, Februari, 2013)
-#			- TDP and processor type are now optional arguments (Pike, Februari, 2013)
-#			- system-type check (used by X86PlatformPlugin) added (Pike, Februari, 2013)
-#			- ACST injection for all logical processors (Pike, Februari, 2013)
-#			- ACST hintcode error fixed (Pike, Februari, 2013)
-#			- Introducing a stand-alone version of method _DSM (Pike, Februari, 2013)
-#			- Fix incorrect turbo range (Pike, Februari, 2013)
-#			- Restore IFS before return (Pike, Februari, 2013)
+#			- Added support for Ivybridge (Pike, January 2013)
+#			- Filename error fixed (Pike, January 2013)
+#			- Namespace error fixed in _printScopeStart (Pike, January 2013)
+#			- Model and board-id checks added (Pike, January 2013)
+#			- SMBIOS cpu-type check added (Pike, January 2013)
+#			- Copy/paste error fixed (Pike, January 2013)
+#			- Method ACST added to CPU scopes for IB CPUPM (Pike, January 2013)
+#			- Method ACST corrected for latest version of iasl (Dave, January 2013)
+#			- Changed path/filename to ~/Desktop/SSDT_PR.dsl (Dave, January 2013)
+#			- P-States are now one-liners instead of blocks (Pike, January 2013)
+#			- Support for flexible ProcessorNames added (Pike, Februari 2013)
+#			- Better feedback and Debug() injection added (Pike, Februari 2013)
+#			- Automatic processor type detection (Pike, Februari 2013)
+#			- TDP and processor type are now optional arguments (Pike, Februari 2013)
+#			- system-type check (used by X86PlatformPlugin) added (Pike, Februari 2013)
+#			- ACST injection for all logical processors (Pike, Februari 2013)
+#			- Introducing a stand-alone version of method _DSM (Pike, Februari 2013)
+#			- Fix incorrect turbo range (Pike, Februari 2013)
+#			- Restore IFS before return (Pike, Februari 2013)
+#			- Better/more complete feedback added (Jeroen, Februari 2013)
+#			- Processor data for desktop/mobile and server CPU's added (Jeroen, Februari 2013)
+#			- Improved power calculation, matching Apple's new algorithm (Pike, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave and toleda for their help (bug fixes and other improvements).
+#			- Many thanks to Jeroen for the CPU data, cleanups and renaming stuff.
 #
 
 # set -x # Used for tracing errors (can be used anywhere in the script).
 
 #================================= GLOBAL VARS ==================================
 
-scriptVersion=2.5
+#
+# Change this to 1 to inject debug data.
+#
+gDebug=0
 
+#
+# A value of 1 will make this script call iasl (compiles SSDT_PR.dsl)
+#
+gCallIasl=1
 
 #
-# Path and filename setup.
+# A value of 1 will make this script open SSDT_PR.dsl in the editor of your choice. 
 #
+gCallOpen=1
 
-path=~/Desktop
-ssdtID=SSDT_PR
-ssdtPR=${path}/${ssdtID}.dsl
+#
+# Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
+#
+gIvyWorkAround=1
 
 #
-# Lowest possible idle frequency (user configurable).
+# Lowest possible idle frequency (user configurable). Also known as Low Frequency Mode.
 #
 
-baseFrequency=1600
+gBaseFrequency=1600
 
 #
-# Here are the other global variables defined.
+# Change this label to "P00" when your DSDT uses 'P00n' instead of 'CPUn'.
 #
 
-systemType=0
+gProcLabel="CPU"
 
-gACST_CPU0=29
-gACST_CPU1=7
+#
+# Global variables.
+#
 
-macModelIdentifier=""
+gScriptVersion=3.0
 
 #
-# Change this label to "P00" when your tables use P00n instead of CPUn.
+# Path and filename setup.
 #
 
-gProcLabel="CPU"
+gPath=~/Desktop
+gSsdtID=SSDT_PR
+gSsdtPR=${gPath}/${gSsdtID}.dsl
+
+gDesktopCPU=1
+gMobileCPU=2
+gServerCPU=3
+
+let gSystemType=0
+
+gACST_CPU0=13
+gACST_CPU1=7
+
+gMacModelIdentifier=""
 
 IVY_BRIDGE=4
 SANDY_BRIDGE=2
 
-typeCPU=0
-processorData="Unknown CPU"
-processorNumber=""
+gTypeCPU=0
+gProcessorData="Unknown CPU"
+gProcessorNumber=""
+
+#
+# Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
+#
+
+gServerIvyBridgeCPUList=(
+# E3-1200 Xeon Processor Series
+E3-1290v2,87,0,3700,4100,4,8
+E3-1290,95,0,3600,4000,4,8
+E3-1285v2,65,0,3600,4000,
+E3-1285Lv2,0,0,3200,3900,
+E3-1280v2,69,0,3600,4000,4,8
+E3-1280,95,0,3500,3900,4,8
+E3-1275v2,77,0,3500,3900,4,8
+E3-1275,95,0,3400,3800,4,8
+E3-1270v2,69,0,3500,3900,4,8
+E3-1270,80,0,3400,3800,4,8
+E3-1265Lv2,45,0,2500,3500,4,8
+E3-1260L,45,0,2400,3300,4,8
+E3-1245v2,77,0,3400,3800,4,8
+E3-1245,95,0,3300,3700,4,8
+E3-1240v2,69,0,3400,3800,4,8
+E3-1240,80,0,3300,3700,4,8
+E3-1235,95,0,3200,3600,4,8
+E3-1230v2,69,0,3300,3700,4,8
+E3-1230,80,0,3200,3600,4,8
+E3-1225v2,77,0,3200,3600,4,4
+E3-1225,95,0,3100,3400,4,4
+E3-1220v2,69,0,3100,3500,4,4
+E3-1220Lv2,80,0,3100,3400,4,4
+E3-1220L,20,0,2200,3400,2,4
+E3-1220Lv2,17,0,2300,3500,2,4
+)
 
 #
-# Processor Number, Max TDP, Clock Speed, Max Turbo Frequency, Number of Cores, Number of Threads
+# Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
 #
 
-desktopIvyBridgeCPUList=(
+gDesktopIvyBridgeCPUList=(
 # i7-3700 Desktop Processor Series
-i7-3770T,45,2500,3700,4,8
-i7-3770S,65,3100,3900,4,8
-i7-3770K,77,3500,3900,4,8
-i7-3770,77,3400,3900,4,8
+i7-3770T,45,1600,2500,3700,4,8
+i7-3770S,65,1600,3100,3900,4,8
+i7-3770K,77,1600,3500,3900,4,8
+i7-3770,77,1600,3400,3900,4,8
 # i5-3500 Desktop Processor Series
-i5-3570T,45,2300,3300,4,4
-i5-3570K,77,3400,3800,4,4
-i5-3570S,65,3100,3800,4,4
-i5-3570,77,3400,3800,4,4
-i5-3550S,65,3000,3700,4,4
-i5-3550,77,3300,3700,4,4
+i5-3570T,45,1600,2300,3300,4,4
+i5-3570K,77,1600,3400,3800,4,4
+i5-3570S,65,1600,3100,3800,4,4
+i5-3570,77,1600,3400,3800,4,4
+i5-3550S,65,1600,3000,3700,4,4
+i5-3550,77,1600,3300,3700,4,4
 # i5-3400 Desktop Processor Series
-i5-3475S,65,2900,3600,4,4
-i5-3470S,65,2900,3600,4,4
-i5-3470,77,3200,3600,4,4
-i5-3470T,35,2900,3600,2,4
-i5-3450S,65,2800,3500,4,4
-i5-3450,77,3100,3500,4,4
+i5-3475S,65,1600,2900,3600,4,4
+i5-3470S,65,1600,2900,3600,4,4
+i5-3470,77,1600,3200,3600,4,4
+i5-3470T,35,1600,2900,3600,2,4
+i5-3450S,65,1600,2800,3500,4,4
+i5-3450,77,1600,3100,3500,4,4
 # i5-3300 Desktop Processor Series
-i5-3350P,69,3100,3300,4,4
-i5-3330S,65,2700,3200,4,4
-i5-3330,77,3000,3200,4,4
+i5-3350P,69,1600,3100,3300,4,4
+i5-3330S,65,1600,2700,3200,4,4
+i5-3333S,65,1600,2700,3200,4,4
+i5-3330S,65,1600,3700,3200,4,4
+i5-3330,77,1600,3000,3200,4,4
 # i3-3200 Desktop Processor Series
-i3-3240,55,3400,0,2,4
-i3-3240T,35,2900,0,2,4
-i3-3225,55,3300,0,2,4
-i3-3220,55,3300,0,2,4
-i3-3220T,35,2800,0,2,4
-i3-3210,55,3200,0,2,4
+i3-3240,55,1600,3400,0,2,4
+i3-3240T,35,1600,2900,0,2,4
+i3-3225,55,1600,3300,0,2,4
+i3-3220,55,1600,3300,0,2,4
+i3-3220T,35,1600,2800,0,2,4
+i3-3210,55,1600,3200,0,2,4
 )
 
 #
-# Processor Number, Max TDP, Clock Speed, Max Turbo Frequency, Number of Cores, Number of Threads
+# Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
 #
 
-mobileIvyBridgeCPUList=(
+gMobileIvyBridgeCPUList=(
 # i7-3800 Mobile Processor Series
-i7-3840QM,45,2800,3800,4,8
-i7-3820QM,45,2700,3700,4,8
+i7-3840QM,45,1200,2800,3800,4,8
+i7-3820QM,45,1200,2700,3700,4,8
 # i7-3700 Mobile Processor Series
-i7-3740QM,45,2700,3700,4,8
-i7-3720QM,45,2600,3600,4,8
+i7-3740QM,45,1200,2700,3700,4,8
+i7-3720QM,45,1200,2600,3600,4,8
 # i7-3600 Mobile Processor Series
-i7-3689Y,13,1500,2600,2,4
-i7-3687U,17,2100,3300,2,4
-i7-3667U,17,2000,3200,2,4
-i7-3635QM,45,2400,3400,4,8
-i7-3620QM,35,2200,3200,4,8
-i7-3632QM,35,2200,3200,4,8
-i7-3630QM,45,2400,3400,4,8
-i7-3615QM,45,2300,3300,4,8
-i7-3615QE,45,2300,3300,4,8
-i7-3612QM,35,2100,3100,4,8
-i7-3612QE,35,2100,3100,4,8
-i7-3610QM,45,2300,3300,4,8
-i7-3610QE,45,2300,3300,4,8
+i7-3689Y,13,0,1500,2600,2,4
+i7-3687U,17,800,2100,3300,2,4
+i7-3667U,17,800,2000,3200,2,4
+i7-3635QM,45,0,2400,3400,4,8
+i7-3620QM,35,0,2200,3200,4,8
+i7-3632QM,35,0,2200,3200,4,8
+i7-3630QM,45,0,2400,3400,4,8
+i7-3615QM,45,0,2300,3300,4,8
+i7-3615QE,45,0,2300,3300,4,8
+i7-3612QM,35,0,2100,3100,4,8
+i7-3612QE,35,0,2100,3100,4,8
+i7-3610QM,45,0,2300,3300,4,8
+i7-3610QE,45,0,2300,3300,4,8
 # i7-3500 Mobile Processor Series
-i7-3555LE,25,2500,3200,2,4
-i7-3540M,35,3000,3700,2,4
-i7-3537U,17,2000,3100,2,4
-i7-3520M,35,2900,3600,2,4
-i7-3517UE,17,1700,2800,2,4
-i7-3517U,17,1900,3000,2,4
+i7-3555LE,25,0,2500,3200,2,4
+i7-3540M,35,1200,3000,3700,2,4
+i7-3537U,17,800,2000,3100,2,4
+i7-3520M,35,1200,2900,3600,2,4
+i7-3517UE,17,0,1700,2800,2,4
+i7-3517U,17,0,1900,3000,2,4
 # i5-3600 Mobile Processor Series
-i5-3610ME,35,2700,3300,2,4
+i5-3610ME,35,0,2700,3300,2,4
 # i5-3400 Mobile Processor Series
-i5-3439Y,13,1500,2300,2,4
-i5-3437U,17,1900,2900,2,4
-i5-3427U,17,1800,2800,2,4
+i5-3439Y,13,0,1500,2300,2,4
+i5-3437U,17,800,1900,2900,2,4
+i5-3427U,17,800,1800,2800,2,4
 # i5-3300 Mobile Processor Series
-i5-3380M,35,2900,3600,2,4
-i5-3360M,35,2800,3500,2,4
-i5-3340M,35,2700,3400,2,4
-i5-3339Y,13,1500,2000,2,4
-i5-3337U,17,1800,2700,2,4
-i5-3320M,35,2600,3300,2,4
+i5-3380M,35,1200,2900,3600,2,4
+i5-3360M,35,1200,2800,3500,2,4
+i5-3340M,35,1200,2700,3400,2,4
+i5-3339Y,13,0,1500,2000,2,4
+i5-3337U,17,0,1800,2700,2,4
+i5-3320M,35,1200,2600,3300,2,4
 i5-3317U,17,1700,2600,2,4
 # i5-3200 Mobile Processor Series
-i5-3230M,35,2600,3200,2,4
-i5-3210M,35,2500,3100,2,4
+i5-3230M,35,1200,2600,3200,2,4
+i5-3210M,35,1200,2500,3100,2,4
 # i3-3200 Mobile Processor Series
-i3-3239Y,13,1400,0,2,4
-i3-3227U,17,1900,0,2,4
-i3-3217UE,17,1600,0,2,4
-i3-3217U,17,1800,0,2,4
+i3-3239Y,13,0,1400,0,2,4
+i3-3227U,17,800,1900,0,2,4
+i3-3217UE,17,0,1600,0,2,4
+i3-3217U,17,0,1800,0,2,4
 # i3-3100 Mobile Processor Series
-i3-3130M,35,2600,0,2,4
-i3-3120ME,35,2400,0,2,4
-i3-3120M,35,2500,0,2,4
-i3-3110M,35,2400,0,2,4
+i3-3130M,35,1200,2600,0,2,4
+i3-3120ME,35,0,2400,0,2,4
+i3-3120M,35,0,2500,0,2,4
+i3-3110M,35,0,2400,0,2,4
 )
 
 #--------------------------------------------------------------------------------
 
 function _printHeader()
 {
-	echo '/*'                                                               >  $ssdtPR
-	echo ' * Intel ACPI Component Architecture'                             >> $ssdtPR
-	echo ' * AML Disassembler version 20120620-64 [Jun 20 2012]'            >> $ssdtPR
-	echo ' * Copyright (c) 2000 - 2012 Intel Corporation'                   >> $ssdtPR
-	echo ' * '                                                              >> $ssdtPR
-	echo ' * Original Table Header:'                                        >> $ssdtPR
-	echo ' *     Signature        "SSDT"'                                   >> $ssdtPR
-	echo ' *     Length           0x0000036A (874)'                         >> $ssdtPR
-	echo ' *     Revision         0x01'                                     >> $ssdtPR
-	echo ' *     Checksum         0x98'                                     >> $ssdtPR
-	echo ' *     OEM ID           "APPLE "'                                 >> $ssdtPR
-	echo ' *     OEM Table ID     "CpuPm"'                                  >> $ssdtPR
-	echo ' *     OEM Revision     0x00001000 (4096)'                        >> $ssdtPR
-	echo ' *     Compiler ID      "INTL"'                                   >> $ssdtPR
-	echo ' *     Compiler Version 0x20120620 (537985814)'                   >> $ssdtPR
-	echo ' */'                                                              >> $ssdtPR
-	echo ''                                                                 >> $ssdtPR
-	echo 'DefinitionBlock ("'$ssdtID'.aml", "SSDT", 1, "APPLE ", "CpuPm", 0x00001000)'>> $ssdtPR
-	echo '{'                                                                >> $ssdtPR
+    echo '/*'                                                                           >  $gSsdtPR
+    echo ' * Intel ACPI Component Architecture'                                         >> $gSsdtPR
+    echo ' * AML Disassembler version 20130210-00 [Feb 10 2013]'                        >> $gSsdtPR
+    echo ' * Copyright (c) 2000 - 2013 Intel Corporation'                               >> $gSsdtPR
+    echo ' * '                                                                          >> $gSsdtPR
+    echo ' * Original Table Header:'                                                    >> $gSsdtPR
+    echo ' *     Signature        "SSDT"'                                               >> $gSsdtPR
+    echo ' *     Length           0x0000036A (874)'                                     >> $gSsdtPR
+    echo ' *     Revision         0x01'                                                 >> $gSsdtPR
+    echo ' *     Checksum         0x00'                                                 >> $gSsdtPR
+    echo ' *     OEM ID           "APPLE "'                                             >> $gSsdtPR
+    echo ' *     OEM Table ID     "CpuPm"'                                              >> $gSsdtPR
+    echo ' *     OEM Revision     0x00003000 (4096)'                                    >> $gSsdtPR
+    echo ' *     Compiler ID      "INTL"'                                               >> $gSsdtPR
+    echo ' *     Compiler Version 0x20130210 (538116624)'                               >> $gSsdtPR
+    echo ' */'                                                                          >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
+    echo 'DefinitionBlock ("'$gSsdtID'.aml", "SSDT", 1, "APPLE ", "CpuPm", 0x00003000)' >> $gSsdtPR
+    echo '{'                                                                            >> $gSsdtPR
 }
 
 
@@ -204,14 +265,14 @@ function _printHeader()
 
 function _printExternals()
 {
-	currentCPU=0;
+    currentCPU=0;
 
-	while [ $currentCPU -lt $1 ]; do
-		echo '    External (\_PR_.'$gProcLabel$currentCPU', DeviceObj)'     >> $ssdtPR
-		let currentCPU+=1
-	done
+    while [ $currentCPU -lt $1 ]; do
+        echo '    External (\_PR_.'$gProcLabel$currentCPU', DeviceObj)'                 >> $gSsdtPR
+        let currentCPU+=1
+    done
 
-	echo ''                                                                 >> $ssdtPR
+    echo ''                                                                             >> $gSsdtPR
 }
 
 
@@ -219,70 +280,96 @@ function _printExternals()
 
 function _printDebugInfo()
 {
-	echo '    Store ("ssdtPRGen.sh version '$scriptVersion'", Debug)'       >> $ssdtPR
-	echo '    Store ("baseFrequency    : '$baseFrequency'", Debug)'         >> $ssdtPR
-	echo '    Store ("frequency        : '$frequency'", Debug)'             >> $ssdtPR
-	echo '    Store ("logicalCPUs      : '$logicalCPUs'", Debug)'           >> $ssdtPR
-	echo '    Store ("tdp              : '$tdp'", Debug)'                   >> $ssdtPR
-	echo '    Store ("packageLength    : '$packageLength'", Debug)'         >> $ssdtPR
-	echo '    Store ("turboStates      : '$turboStates'", Debug)'           >> $ssdtPR
-	echo '    Store ("maxTurboFrequency: '$maxTurboFrequency'", Debug)'     >> $ssdtPR
-	echo ''                                                                 >> $ssdtPR
+    if ((gDebug)); then
+        echo '    Store ("ssdtPRGen.sh v'$gScriptVersion'", Debug)'                     >> $gSsdtPR
+        echo '    Store ("baseFrequency    : '$gBaseFrequency'", Debug)'                >> $gSsdtPR
+        echo '    Store ("frequency        : '$frequency'", Debug)'                     >> $gSsdtPR
+        echo '    Store ("logicalCPUs      : '$logicalCPUs'", Debug)'                   >> $gSsdtPR
+        echo '    Store ("tdp              : '$gTdp'", Debug)'                          >> $gSsdtPR
+        echo '    Store ("packageLength    : '$packageLength'", Debug)'                 >> $gSsdtPR
+        echo '    Store ("turboStates      : '$turboStates'", Debug)'                   >> $gSsdtPR
+        echo '    Store ("maxTurboFrequency: '$maxTurboFrequency'", Debug)'             >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+    fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _printProcessorDefinitions()
 {
-	currentCPU=0;
+    let currentCPU=0;
 
-	while [ $currentCPU -lt $1 ]; do
-		echo '    External (\_PR_.'$gProcLabel$currentCPU', DeviceObj)'     >> $ssdtPR
-		let currentCPU+=1
-	done
+    while [ $currentCPU -lt $1 ]; do
+        echo '    External (\_PR_.'$gProcLabel$currentCPU', DeviceObj)'                 >> $gSsdtPR
+        let currentCPU+=1
+    done
 
-	echo ''                                                                 >> $ssdtPR
+    echo ''                                                                             >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
 function _printScopeStart()
 {
-	echo '    Scope (\_PR.'$gProcLabel'0)'                                  >> $ssdtPR
-	echo '    {'                                                            >> $ssdtPR
+    let turboStates=$1
+    let packageLength=$2
 
-	let packageLength=$2
+    # TODO: Remove this when CPUPM for IB works properly!
+    let useWorkArounds=0
 
-	#
-	# Do we need to create additional (Low Frequency) P-States?
-	#
+    echo '    Scope (\_PR.'$gProcLabel'0)'                                              >> $gSsdtPR
+    echo '    {'                                                                        >> $gSsdtPR
 
-	if [ $bridgeType -eq $IVY_BRIDGE ];
-		then
-			let lowestFrequency=$baseFrequency
-			let lowFrequencyPStates=($lowestFrequency/100)-8
-			let packageLength=($2+$lowFrequencyPStates)
+    #
+    # Do we need to create additional (Low Frequency) P-States?
+    #
 
-			printf "        Name (APLF, 0x%02x" $lowFrequencyPStates        >> $ssdtPR
-			echo ')'                                                        >> $ssdtPR
-	fi
+    if [ $gBridgeType -eq $IVY_BRIDGE ];
+        then
+            let lowFrequencyPStates=($gBaseFrequency/100)-8
+            let packageLength=($2+$lowFrequencyPStates)
 
-	#
-	# Check number of Turbo states (for IASL optimization).
-	#
+            printf "        Name (APLF, 0x%02x" $lowFrequencyPStates                    >> $gSsdtPR
+            echo ')'                                                                    >> $gSsdtPR
 
-	if [ $1 -eq 0 ];
-		then
-			echo '        Name (APSN, Zero)'                                >> $ssdtPR
-		else
-			printf "        Name (APSN, 0x%02X" $1                          >> $ssdtPR
-			echo ')'                                                        >> $ssdtPR
-	fi
+            # TODO: Remove this when CPUPM for IB works properly!
+            if ((gIvyWorkAround)); then
+                let useWorkArounds=1
+            fi
+    fi
 
-	printf "        Name (APSS, Package (0x%02X" $packageLength             >> $ssdtPR
+    #
+    # Check number of Turbo states (for IASL optimization).
+    #
 
-	echo ')'                                                                >> $ssdtPR
-	echo '        {'                                                        >> $ssdtPR
+    if [ $turboStates -eq 0 ];
+        then
+            echo '        Name (APSN, Zero)'                                            >> $gSsdtPR
+        else
+          # TODO: Remove this when CPUPM for IB works properly!
+          if ((useWorkArounds)); then
+              let turboStates+=1
+          fi
+
+          printf "        Name (APSN, 0x%02X)\n" $turboStates                           >> $gSsdtPR
+    fi
+
+    # TODO: Remove this when CPUPM for IB works properly!
+    if ((useWorkArounds)); then
+        let packageLength+=1
+    fi
+
+  printf "        Name (APSS, Package (0x%02X)\n" $packageLength                        >> $gSsdtPR
+    echo '        {'                                                                    >> $gSsdtPR
+
+    # TODO: Remove this when CPUPM for IB works properly!
+    if ((useWorkArounds)); then
+        let extraF=($maxTurboFrequency+1)
+        let maxTDP=($gTdp*1000)
+        let extraR=($maxTurboFrequency/100)+1
+        echo '            /* Workaround for Ivy Bridge PM bug */'                       >> $gSsdtPR
+      printf "            Package (0x06) { 0x%04X, 0x%06X, 0x0A, 0x0A, 0x%02X00, 0x%02X00 },\n" $extraF $maxTDP $extraR $extraR >> $gSsdtPR
+    fi
 }
 
 
@@ -290,89 +377,105 @@ function _printScopeStart()
 
 function _printPackages()
 {
-	local frequency=$3
-	local maxNonTurboFrequency=$2
-	local lowestFrequency=$baseFrequency
+    let maxTDP=($1*1000)
+    local maxNonTurboFrequency=$2
+    local frequency=$3
 
-	let maxTDP=($1*1000)
-	let min_ratio=($baseFrequency/100)
-	let max_ratio=($frequency/100)
+    let minRatio=($gBaseFrequency/100)
+    let p1Ratio=($maxNonTurboFrequency/100)
+    let ratio=($frequency/100)
+    let powerRatio=($p1Ratio-1)
 
-	#
-	# Do we need to create additional (Low Frequency) P-States for Ivybridge?
-	#
+    #
+    # Do we need to create additional (Low Frequency) P-States for Ivy bridge?
+    #
+    if [ $gBridgeType -eq $IVY_BRIDGE ]; then
+        let minRatio=8
+    fi
 
-	if [ $bridgeType -eq $IVY_BRIDGE ]
-		then
-			let lowestFrequency=800
-	fi
+    echo '            /* High Frequency Modes (turbo) */'                               >> $gSsdtPR
 
-	while [ $frequency -ge $lowestFrequency ];
-		do
-		printf "            Package (0x06) { 0x%04X, " $frequency           >> $ssdtPR
+    while [ $ratio -ge $minRatio ];
+        do
+            if [ $frequency -eq $gBaseFrequency ];
+                then
+                    echo '            /* Low Frequency Mode */'                         >> $gSsdtPR
+            fi
 
-		let ratio=$frequency/100
+            if [ $frequency -eq $maxNonTurboFrequency ];
+                then
+                    echo '            /* High Frequency Modes (non-turbo) */'           >> $gSsdtPR
+            fi
 
-		if [ $ratio -ge $min_ratio ]
-			then
-				if [ $frequency -lt $maxNonTurboFrequency ];
-					then
-						power=$(echo "scale=6;m=((1.1-(($max_ratio-$ratio)*0.00625))/1.1);(($ratio/$max_ratio)*(m*m)*$maxTDP);" | bc | sed -e 's/.[0-9A-F]*$//')
-					else
-						power=$maxTDP
-				fi
+            printf "            Package (0x06) { 0x%04X, " $frequency                   >> $gSsdtPR
 
-				printf "0x%08X, " $power                                    >> $ssdtPR
-			else
-				printf '      Zero, '                                       >> $ssdtPR
-		fi
+            if [ $frequency -lt $maxNonTurboFrequency ];
+                then
+                    power=$(echo "scale=6;m=((1.1-(($p1Ratio-$powerRatio)*0.00625))/1.1);(($powerRatio/$p1Ratio)*(m*m)*$maxTDP);" | bc | sed -e 's/.[0-9A-F]*$//')
+                    let powerRatio-=1
+                else
+                    power=$maxTDP
+            fi
 
-		printf "0x0A, 0x0A, 0x%02X00, 0x%02X00 }" $ratio $ratio             >> $ssdtPR
+            if [ $frequency -ge $gBaseFrequency ];
+                then
+                    printf "0x%06X, " $power                                            >> $gSsdtPR
+                else
+                    printf '    Zero, '                                                 >> $gSsdtPR
+            fi
 
-		let frequency-=100
+            printf "0x0A, 0x0A, 0x%02X00, 0x%02X00 }" $ratio $ratio                     >> $gSsdtPR
 
-		if [ $frequency -ge $lowestFrequency ];
-			then
-				echo ','                                                    >> $ssdtPR
-			else
-				echo ''                                                     >> $ssdtPR
-			fi
-	done
+            let ratio-=1
+            let frequency-=100
 
-		echo '        })'                                                   >> $ssdtPR
+            if [ $ratio -ge $minRatio ];
+                then
+                    echo ','                                                            >> $gSsdtPR
+                else
+                    echo ''                                                             >> $gSsdtPR
+            fi
+
+        done
+
+    echo '        })'                                                                   >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
 }
 
 
 #--------------------------------------------------------------------------------
 
-function _printIvybridgeMethods()
+function _printMethodDSM()
 {
     #
     # New stand-alone version of Method _DSM - Copyright (c) 2009 by Master Chief
     #
-    echo ''                                                                 >> $ssdtPR
-    echo '        Method (_DSM, 4, NotSerialized)'                          >> $ssdtPR
-    echo '        {'                                                        >> $ssdtPR
-    echo '            If (LEqual (Arg2, Zero))'                             >> $ssdtPR
-    echo '            {'                                                    >> $ssdtPR
-    echo '                Return (Buffer (One)'                             >> $ssdtPR
-    echo '                {'                                                >> $ssdtPR
-    echo '                    0x03'                                         >> $ssdtPR
-    echo '                })'                                               >> $ssdtPR
-    echo '            }'                                                    >> $ssdtPR
-    echo ''                                                                 >> $ssdtPR
-    echo '            Return (Package (0x02)'                               >> $ssdtPR
-    echo '            {'                                                    >> $ssdtPR
-    echo '                "plugin-type",'                                   >> $ssdtPR
-    echo '                One'                                              >> $ssdtPR
-    echo '            })'                                                   >> $ssdtPR
-    echo '        }'                                                        >> $ssdtPR
-    echo '    }'                                                            >> $ssdtPR
+    echo ''                                                                             >> $gSsdtPR
+    echo '        Method (_DSM, 4, NotSerialized)'                                      >> $gSsdtPR
+    echo '        {'                                                                    >> $gSsdtPR
+    echo '            If (LEqual (Arg2, Zero))'                                         >> $gSsdtPR
+    echo '            {'                                                                >> $gSsdtPR
+    echo '                Return (Buffer (One)'                                         >> $gSsdtPR
+    echo '                {'                                                            >> $gSsdtPR
+    echo '                    0x03'                                                     >> $gSsdtPR
+    echo '                })'                                                           >> $gSsdtPR
+    echo '            }'                                                                >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
+    #
+    # This property is required to get X86Platform[Plugin/Shim].kext loaded.
+    #
+    echo '            Return (Package (0x02)'                                           >> $gSsdtPR
+    echo '            {'                                                                >> $gSsdtPR
+    echo '                "plugin-type",'                                               >> $gSsdtPR
+    echo '                One'                                                          >> $gSsdtPR
+    echo '            })'                                                               >> $gSsdtPR
+    echo '        }'                                                                    >> $gSsdtPR
+    echo '    }'                                                                        >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
-function _printCSTScope()
+function _printScopeACST()
 {
     let C1=0
     let C2=0
@@ -382,9 +485,9 @@ function _printCSTScope()
     local pkgLength=2
     local numberOfCStates=0
 
-    echo ''                                                                         >> $ssdtPR
-    echo '        Method (ACST, 0, NotSerialized)'                                  >> $ssdtPR
-    echo '        {'                                                                >> $ssdtPR
+#   echo ''                                                                             >> $gSsdtPR
+    echo '        Method (ACST, 0, NotSerialized)'                                      >> $gSsdtPR
+    echo '        {'                                                                    >> $gSsdtPR
 
     #
     # Are we injecting C-States for CPU1?
@@ -396,16 +499,31 @@ function _printCSTScope()
             latency_C1=0x03E8
             latency_C2=0x94
             latency_C3=0xA9
-            echo '            Store ("CPU1 C-States    : '$gACST_CPU1'", Debug)'    >> $ssdtPR
 
+            if ((gDebug)); then
+                echo '            Store ("CPU1 C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
+                echo ''                                                                 >> $gSsdtPR
+            fi
         else
-			# No (only used by CPU0).
+            #
+            # C-States override for Mobile processors (CPU0 only)
+            #
+            if (($gTypeCPU == $gMobileCPU));
+                then
+                    echo 'Adjusting C-States for detected (mobile) processor'
+                    gACST_CPU0=29
+            fi
+
             let targetCStates=$gACST_CPU0
             latency_C1=Zero
             latency_C3=0xCD
             latency_C6=0xF5
             latency_C7=0xF5
-            echo '            Store ("CPU0 C-States    : '$gACST_CPU0'", Debug)'    >> $ssdtPR
+
+            if ((gDebug)); then
+                echo '            Store ("CPU0 C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
+                echo ''                                                                 >> $gSsdtPR
+            fi
     fi
 
     #
@@ -443,84 +561,84 @@ function _printCSTScope()
 
     let hintCode=0x00
 
-    echo ''                                                                         >> $ssdtPR
-  printf "            Return (Package (0x%02x)\n" $pkgLength                        >> $ssdtPR
-    echo '            {'                                                            >> $ssdtPR
-    echo '                One,'                                                     >> $ssdtPR
-  printf "                0x%02x,\n" $numberOfCStates                               >> $ssdtPR
-    echo '                Package (0x04)'                                           >> $ssdtPR
-    echo '                {'                                                        >> $ssdtPR
-    echo '                    ResourceTemplate ()'                                  >> $ssdtPR
-    echo '                    {'                                                    >> $ssdtPR
-    echo '                        Register (FFixedHW,'                              >> $ssdtPR
-    echo '                            0x01,               // Bit Width'             >> $ssdtPR
-    echo '                            0x02,               // Bit Offset'            >> $ssdtPR
-  printf "                            0x%016x, // Address\n" $hintCode              >> $ssdtPR
-    echo '                            0x01,               // Access Size'           >> $ssdtPR
-    echo '                            )'                                            >> $ssdtPR
-    echo '                    },'                                                   >> $ssdtPR
-    echo '                    One,'                                                 >> $ssdtPR
-    echo '                    '$latency_C1','                                       >> $ssdtPR
-    echo '                    0x03E8'                                               >> $ssdtPR
+    echo '            /* Low Power Modes for '$gProcLabel$1' */'                        >> $gSsdtPR
+  printf "            Return (Package (0x%02x)\n" $pkgLength                            >> $gSsdtPR
+    echo '            {'                                                                >> $gSsdtPR
+    echo '                One,'                                                         >> $gSsdtPR
+  printf "                0x%02x,\n" $numberOfCStates                                   >> $gSsdtPR
+    echo '                Package (0x04)'                                               >> $gSsdtPR
+    echo '                {'                                                            >> $gSsdtPR
+    echo '                    ResourceTemplate ()'                                      >> $gSsdtPR
+    echo '                    {'                                                        >> $gSsdtPR
+    echo '                        Register (FFixedHW,'                                  >> $gSsdtPR
+    echo '                            0x01,               // Bit Width'                 >> $gSsdtPR
+    echo '                            0x02,               // Bit Offset'                >> $gSsdtPR
+  printf "                            0x%016x, // Address\n" $hintCode                  >> $gSsdtPR
+    echo '                            0x01,               // Access Size'               >> $gSsdtPR
+    echo '                            )'                                                >> $gSsdtPR
+    echo '                    },'                                                       >> $gSsdtPR
+    echo '                    One,'                                                     >> $gSsdtPR
+    echo '                    '$latency_C1','                                           >> $gSsdtPR
+    echo '                    0x03E8'                                                   >> $gSsdtPR
 
     if (($C2)); then
         let hintCode+=0x10
-        echo '                },'                                                   >> $ssdtPR
-        echo ''                                                                     >> $ssdtPR
-        echo '                Package (0x04)'                                       >> $ssdtPR
-        echo '                {'                                                    >> $ssdtPR
-        echo '                    ResourceTemplate ()'                              >> $ssdtPR
-        echo '                    {'                                                >> $ssdtPR
-        echo '                        Register (FFixedHW,'                          >> $ssdtPR
-        echo '                            0x01,               // Bit Width'         >> $ssdtPR
-        echo '                            0x02,               // Bit Offset'        >> $ssdtPR
-      printf "                            0x%016x, // Address\n" $hintCode          >> $ssdtPR
-        echo '                            0x03,               // Access Size'       >> $ssdtPR
-        echo '                            )'                                        >> $ssdtPR
-        echo '                    },'                                               >> $ssdtPR
-        echo '                    0x02,'                                            >> $ssdtPR
-        echo '                    '$latency_C2','                                   >> $ssdtPR
-        echo '                    0x01F4'                                           >> $ssdtPR
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x02,'                                                >> $gSsdtPR
+        echo '                    '$latency_C2','                                       >> $gSsdtPR
+        echo '                    0x01F4'                                               >> $gSsdtPR
     fi
 
     if (($C3)); then
         let hintCode+=0x10
-        echo '                },'                                                   >> $ssdtPR
-        echo ''                                                                     >> $ssdtPR
-        echo '                Package (0x04)'                                       >> $ssdtPR
-        echo '                {'                                                    >> $ssdtPR
-        echo '                    ResourceTemplate ()'                              >> $ssdtPR
-        echo '                    {'                                                >> $ssdtPR
-        echo '                        Register (FFixedHW,'                          >> $ssdtPR
-        echo '                            0x01,               // Bit Width'         >> $ssdtPR
-        echo '                            0x02,               // Bit Offset'        >> $ssdtPR
-      printf "                            0x%016x, // Address\n" $hintCode          >> $ssdtPR
-        echo '                            0x03,               // Access Size'       >> $ssdtPR
-        echo '                            )'                                        >> $ssdtPR
-        echo '                    },'                                               >> $ssdtPR
-        echo '                    0x03,'                                            >> $ssdtPR
-        echo '                    '$latency_C3','                                   >> $ssdtPR
-        echo '                    0x01F4'                                           >> $ssdtPR
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x03,'                                                >> $gSsdtPR
+        echo '                    '$latency_C3','                                       >> $gSsdtPR
+        echo '                    0x01F4'                                               >> $gSsdtPR
     fi
 
     if (($C6)); then
         let hintCode+=0x10
-        echo '                },'                                                   >> $ssdtPR
-        echo ''                                                                     >> $ssdtPR
-        echo '                Package (0x04)'                                       >> $ssdtPR
-        echo '                {'                                                    >> $ssdtPR
-        echo '                    ResourceTemplate ()'                              >> $ssdtPR
-        echo '                    {'                                                >> $ssdtPR
-        echo '                        Register (FFixedHW,'                          >> $ssdtPR
-        echo '                            0x01,               // Bit Width'         >> $ssdtPR
-        echo '                            0x02,               // Bit Offset'        >> $ssdtPR
-      printf "                            0x%016x, // Address\n" $hintCode          >> $ssdtPR
-        echo '                            0x03,               // Access Size'       >> $ssdtPR
-        echo '                            )'                                        >> $ssdtPR
-        echo '                    },'                                               >> $ssdtPR
-        echo '                    0x06,'                                            >> $ssdtPR
-        echo '                    '$latency_C6','                                   >> $ssdtPR
-        echo '                    0x015E'                                           >> $ssdtPR
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x06,'                                                >> $gSsdtPR
+        echo '                    '$latency_C6','                                       >> $gSsdtPR
+        echo '                    0x015E'                                               >> $gSsdtPR
     fi
 
 	if (($C7)); then
@@ -533,75 +651,69 @@ function _printCSTScope()
             else
                 let hintCode+=0x10
         fi
-        echo '                },'                                                   >> $ssdtPR
-        echo ''                                                                     >> $ssdtPR
-        echo '                Package (0x04)'                                       >> $ssdtPR
-        echo '                {'                                                    >> $ssdtPR
-        echo '                    ResourceTemplate ()'                              >> $ssdtPR
-        echo '                    {'                                                >> $ssdtPR
-        echo '                        Register (FFixedHW,'                          >> $ssdtPR
-        echo '                            0x01,               // Bit Width'         >> $ssdtPR
-        echo '                            0x02,               // Bit Offset'        >> $ssdtPR
-      printf "                            0x%016x, // Address\n" $hintCode          >> $ssdtPR
-        echo '                            0x03,               // Access Size'       >> $ssdtPR
-        echo '                            )'                                        >> $ssdtPR
-        echo '                    },'                                               >> $ssdtPR
-        echo '                    0x07,'                                            >> $ssdtPR
-        echo '                    '$latency_C7','                                   >> $ssdtPR
-        echo '                    0xC8'                                             >> $ssdtPR
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x07,'                                                >> $gSsdtPR
+        echo '                    '$latency_C7','                                       >> $gSsdtPR
+        echo '                    0xC8'                                                 >> $gSsdtPR
     fi
 
-    echo '                }'                                                        >> $ssdtPR
-    echo '            })'                                                           >> $ssdtPR
-    echo '        }'                                                                >> $ssdtPR
-
-    if [ $1 -eq 1 ];
-        then
-            gACST_CPU1=$numberOfCStates
-        else
-			gACST_CPU0=$numberOfCStates
-    fi
+    echo '                }'                                                            >> $gSsdtPR
+    echo '            })'                                                               >> $gSsdtPR
+    echo '        }'                                                                    >> $gSsdtPR
 
     #
-    # We don't want a closing bracket here when we add methods for Ivy Bridge.
+    # We don't need a closing bracket here when we add method _DSM for Ivy Bridge.
     #
 
-    if [ $bridgeType -eq $SANDY_BRIDGE ]; then
-        echo '    }'                                                                >> $ssdtPR
-    fi
+    if [ $gBridgeType -eq $SANDY_BRIDGE ]; then
+        echo '    }'                                                                    >> $gSsdtPR
+	fi
 }
 
+
 #--------------------------------------------------------------------------------
 
-function _printCPUScopes()
+function _printScopeCPUn()
 {
-	currentCPU=1;
+	let currentCPU=1;
 
 	while [ $currentCPU -lt $1 ]; do
-		echo ''                                                             >> $ssdtPR
-		echo '    Scope (\_PR.'$gProcLabel$currentCPU')'                    >> $ssdtPR
-		echo '    {'                                                        >> $ssdtPR
-		echo '        Method (APSS, 0, NotSerialized) { Return (\_PR.'$gProcLabel'0.APSS) }' >> $ssdtPR
+		echo ''                                                                         >> $gSsdtPR
+		echo '    Scope (\_PR.'$gProcLabel$currentCPU')'                                >> $gSsdtPR
+		echo '    {'                                                                    >> $gSsdtPR
+		echo '        Method (APSS, 0, NotSerialized) { Return (\_PR.'$gProcLabel'0.APSS) }' >> $gSsdtPR
 
 		#
-		# IB CPUPM tries to parse/execute Method ACST (see debug data) and thus we add
+		# IB CPUPM tries to parse/execute CPUn.ACST (see debug data) and thus we add
 		# this method, conditionally, since SB CPUPM doesn't seem to care about it.
 		#
-		if [ $bridgeType -eq $IVY_BRIDGE ]
+		if [ $gBridgeType -eq $IVY_BRIDGE ]
 			then
 				if [ $currentCPU -eq 1 ];
 					then
-						_printCSTScope 1
+						_printScopeACST 1
 					else
-						echo '        Method (ACST, 0, NotSerialized) { Return (\_PR.'$gProcLabel'1.ACST ()) }' >> $ssdtPR
+						echo '        Method (ACST, 0, NotSerialized) { Return (\_PR.'$gProcLabel'1.ACST ()) }' >> $gSsdtPR
 				fi
 		fi
 
-		echo '    }'                                                        >> $ssdtPR
+		echo '    }'                                                                    >> $gSsdtPR
 		let currentCPU+=1
 	done
 
-	echo '}'                                                                >> $ssdtPR
+	echo '}'                                                                            >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
@@ -655,6 +767,8 @@ function _getSystemType()
     #
     # Grab 'system-type' property from ioreg (stripped with sed / RegEX magic).
     #
+    # Note: This property is checked (cmpb $0x02) in X86PlatformPlugin::configResourceCallback
+    #
     echo `ioreg -p IODeviceTree -d 2 -k system-type | grep system-type | sed -e 's/ *[-="<0a-z>]//g'`
 }
 
@@ -678,55 +792,102 @@ function _getCPUNumberFromBrandString
     # Split brandstring into array (data)
     #
     local data=($brandString)
+    #
+    # Example from a MacBookPro10,2
+    #
     # echo "${data[0]}" # Intel(R)
     # echo "${data[1]}" # Core(TM)
-    # echo "${data[2]}" # i5-2500K
+    # echo "${data[2]}" # i5-3210M
     # echo "${data[3]}" # CPU
     # echo "${data[4]}" # @
-    # echo "${data[5]}" # 3.30GHz
+    # echo "${data[5]}" # 2.50GHz
     #
     # Restore the default delimiter
     #
     IFS=$ifs
 
-    processorNumber="${data[2]}"
-    # processorNumber="i7-3740QM"
+    gProcessorNumber="${data[2]}"
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUDataByProcessorNumber
 {
-    local ifs=$IFS
-
-    for cpuData in "${desktopIvyBridgeCPUList[@]}";
-    do
-        IFS=","
-        data=($cpuData)
-
-        if [ ${data[0]} == $processorNumber ]; then
-            processorData="$cpuData"
-            typeCPU=1
-            IFS=$ifs
-            return
-        fi
-    done
-
-    if [ $processorData == "Unknown CPU" ]; then
-        IFS=$ifs
+    #
+    # Local function definition
+    #
+    function __searchList()
+    {
+        local ifs=$IFS
+        local targetCPUList=("${!1}")
 
-        for cpuData in ${mobileIvyBridgeCPUList[@]};
+        for cpuData in ${targetCPUList[@]}
         do
             IFS=","
             data=($cpuData)
 
-            if [ ${data[0]} == $processorNumber ]; then
-                processorData="$cpuData"
-                typeCPU=2
+            if [[ ${data[0]} == $gProcessorNumber ]]; then
+                gProcessorData="$cpuData"
+                let gTypeCPU=$2
                 IFS=$ifs
                 return
             fi
         done
+
+        IFS=$ifs
+    }
+
+    #
+    # Local function callers (passing array and cpu type)
+    #
+    __searchList gDesktopIvyBridgeCPUList[@] $gDesktopCPU
+
+    if (!(($gTypeCPU))); then
+        __searchList gMobileIvyBridgeCPUList[@] $gMobileCPU
+    fi
+
+    if (!(($gTypeCPU))); then
+        __searchList gServerIvyBridgeCPUList[@] $gServerCPU
+    fi
+}
+
+#--------------------------------------------------------------------------------
+
+function _showLowPowerStates()
+{
+    #
+    # Local function definition
+    #
+    function __print()
+    {
+        local mask=1
+        local cStates=$1
+
+        printf "Injected C-States for ${gProcLabel}${2} ("
+
+        for state in C1 C2 C3 C6 C7
+        do
+            if (($cStates & $mask)); then
+               if (($mask > 1)); then
+                   printf ","
+               fi
+
+               printf "$state"
+            fi
+
+            let mask=$(($mask << 1))
+        done
+
+        echo ')'
+    }
+
+    #
+    # Local function callers
+    #
+    __print $gACST_CPU0 0
+
+    if ((gBridgeType == $IVY_BRIDGE)); then
+        __print $gACST_CPU1 1
     fi
 }
 
@@ -734,27 +895,28 @@ function _getCPUDataByProcessorNumber
 
 function _checkSMCKeys()
 {
-	#
-	# TODO: Check SMC keys to see if they are there and properly initialized!
-	#
-	# Note: Do <i>not</i> dump SMC keys with HWSensors/iStat or other SMC plug-ins installed!
-	#
-	local filename="/System/Library/Extensions/FakeSMC.kext/Contents/Info.plist"
-	local data=`grep -so '<key>[a-zA-Z]*</key>' $filename | sed -e 's/<key>//' -e 's/<\/key>//g'`
+    #
+    # TODO: Check SMC keys to see if they are there and properly initialized!
+    #
+    # Note: Do <i>not</i> dump SMC keys with HWSensors/iStat or other SMC plug-ins installed!
+    #
+    local filename="/System/Library/Extensions/FakeSMC.kext/Contents/Info.plist"
+    local data=`grep -so '<key>[a-zA-Z]*</key>' $filename | sed -e 's/<key>//' -e 's/<\/key>//g'`
 
-	local status=`echo $data | grep -oe 'DPLM'`
+    local status=`echo $data | grep -oe 'DPLM'`
 
-	if [ $status == 'XPLM' ]; then
-		# DPLM  [{lim]  (bytes 00 00 00 00 00)
-		echo "SMC key 'DPLM' found (OK)"
-	fi
+    if [ $status == 'DPLM' ]; then
+        # DPLM  [{lim]  (bytes 00 00 00 00 00)
+        # CPU, Idle, IGPU, EGPU and Memory P-State limits
+        echo "SMC key 'DPLM' found (OK)"
+    fi
 set -x
-	local status=`echo $data | grep -oe 'MSAL'`
+    local status=`echo $data | grep -oe 'MSAL'`
 
-	if [ $status == 'MSAL' ]; then
-		# MSAL  [hex_]  (bytes 4b)
-		echo "SMC key 'MSAL' found (OK)"
-	fi
+    if [ $status == 'MSAL' ]; then
+        # MSAL  [hex_]  (bytes 4b)
+        echo "SMC key 'MSAL' found (OK)"
+    fi
 }
 
 #--------------------------------------------------------------------------------
@@ -763,71 +925,71 @@ function _initSandyBridgeSetup()
 {
 	case $boardID in
 		Mac-942B59F58194171B)
-			systemType=1
-			macModelIdentifier="iMac12,1"
+			gSystemType=1
+			gMacModelIdentifier="iMac12,1"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-942B5BF58194151B)
-			systemType=1
-			macModelIdentifier="iMac12,2"
+			gSystemType=1
+			gMacModelIdentifier="iMac12,2"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-8ED6AF5B48C039E1)
-			systemType=1
-			macModelIdentifier="Macmini5,1"
+			gSystemType=1
+			gMacModelIdentifier="Macmini5,1"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-4BC72D62AD45599E)
-			systemType=1
-			macModelIdentifier="Macmini5,2"
+			gSystemType=1
+			gMacModelIdentifier="Macmini5,2"
 			gACST_CPU0=13   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-7BA5B2794B2CDB12)
-			systemType=1
-			macModelIdentifier="Macmini5,3"
+			gSystemType=1
+			gMacModelIdentifier="Macmini5,3"
 			gACST_CPU0=13   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-94245B3640C91C81)
-			systemType=2
-			macModelIdentifier="MacBookPro8,1"
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro8,1"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-94245A3940C91C80)
-			systemType=2
-			macModelIdentifier="MacBookPro8,2"
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro8,2"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-942459F5819B171B)
-			systemType=2
-			macModelIdentifier="MacBookPro8,3"
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro8,3"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-C08A6BB70A942AC2)
-			systemType=2
-			macModelIdentifier="MacBookAir4,1"
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir4,1"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-742912EFDBEE19B3)
-			systemType=2
-			macModelIdentifier="MacBookAir4,2"
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir4,2"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
@@ -840,71 +1002,71 @@ function _initIvyBridgeSetup()
 {
 	case $boardID in
 		Mac-00BE6ED71E35EB86)
-			systemType=1
-			macModelIdentifier="iMac13,1"
+			gSystemType=1
+			gMacModelIdentifier="iMac13,1"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-FC02E91DDD3FA6A4)
-			systemType=1
-			macModelIdentifier="iMac13,2"
+			gSystemType=1
+			gMacModelIdentifier="iMac13,2"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-031AEE4D24BFF0B1)
-			systemType=1
-			macModelIdentifier="Macmini6,1"
+			gSystemType=1
+			gMacModelIdentifier="Macmini6,1"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-F65AE981FFA204ED)
-			systemType=1
-			macModelIdentifier="Macmini6,2"
+			gSystemType=1
+			gMacModelIdentifier="Macmini6,2"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-4B7AC7E43945597E)
-			systemType=2
-			macModelIdentifier="MacBookPro9,1"
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro9,1"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-6F01561E16C75D06)
-			systemType=2
-			macModelIdentifier="MacBookPro9,2"
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro9,2"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-C3EC7CD22292981F)
-			systemType=2
-			macModelIdentifier="MacBookPro10,1"
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro10,1"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-AFD8A9D944EA4843)
-			systemType=2
-			macModelIdentifier="MacBookPro10,2"
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro10,2"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-66F35F19FE2A0D05)
-			systemType=2
-			macModelIdentifier="MacBookAir5,1"
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir5,1"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
 		Mac-2E6FAB96566FE58C)
-			systemType=2
-			macModelIdentifier="MacBookAir5,2"
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir5,2"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
@@ -919,36 +1081,44 @@ function _initIvyBridgeSetup()
 
 function _isRoot()
 {
-  if [ $(id -u) != 0 ]; then
-      echo "This script must be run as root" 1>&2
-      exit 1
-  fi
+    if [ $(id -u) != 0 ]; then
+        echo "This script must be run as root" 1>&2
+        exit 1
+    fi
 
-  echo 1
+    echo 1
 }
 
-
 #--------------------------------------------------------------------------------
 
 function main()
 {
-    echo ''
+    printf "\nsdtPRGen.sh v$gScriptVersion Copyright (c) 2013 by Pike R. Alpha\n"
+    echo   '-----------------------------------------------------'
 
-    #
-    # Get installed CPU model, set bridge type and default TDP.
-    #
-    local model=$(_getCPUModel)
+    let modelSpecified=0
 
-    _getCPUNumberFromBrandString
+    if (((${1:0:1} == "i") || (${1:0:1} == "E")));
+        then
+            let model=0x3A
+            let modelSpecified=1
+            gProcessorNumber=$1
+        else
+            #
+            # Get installed CPU model, set bridge type and default TDP.
+            #
+            local model=$(_getCPUModel)
+            _getCPUNumberFromBrandString
+    fi
 
     if (($model==0x2A || $model==0x2D));
         then
-            let tdp=95
-            let bridgeType=2
+            let gTdp=95
+            let gBridgeType=2
             local bridgeTypeString="Sandy Bridge"
         else
-            let tdp=77
-            let bridgeType=4
+			let gTdp=77
+            let gBridgeType=4
             local bridgeTypeString="Ivy Bridge"
 
             if (($model==0x3A || $model==0x3B)); then
@@ -956,49 +1126,70 @@ function main()
             fi
     fi
 
-    echo "$bridgeTypeString Core $processorNumber processor detected"
-
-    if (($typeCPU)); then
-        local ifs=$IFS
-        IFS=","
-		local cpuData=($processorData)
-	    let tdp=${cpuData[1]}
-        IFS=$ifs
-    fi
+    echo "$bridgeTypeString Core $gProcessorNumber processor installed"
 
     #
-    # Command line (override) arguments.
+    # gTypeCPU is greater than 0 when the processor is found in one of the CPU lists
     #
-
-    let maxTurboFrequency=$1
-
-    if [ $# -ge 2 ];
+    if (($gTypeCPU));
         then
-            let tdp=$2
-            echo "Max TDP override, now using: $tdp Watt"
+            local ifs=$IFS
+            IFS=","
+    		local cpuData=($gProcessorData)
+	        let gTdp=${cpuData[1]}
+		    let lfm=${cpuData[2]}
+		    let frequency=${cpuData[3]}
+            let maxTurboFrequency=${cpuData[4]}
+            let logicalCPUs=${cpuData[6]}
+            IFS=$ifs
+
+            echo 'Using a maximum TDP of '$gTdp' Watt, as specified by Intel'
+
+            #
+            # Check Low Frequency Mode (may be 0 aka still unknown)
+            #
+            if (($lfm == 0)); then
+                echo 'Warning: Low Frequency Mode is 0 (unknown)'
+
+                if (($gTypeCPU == gMobileCPU));
+                    then
+                        echo 'Now using 1200 MHz for Mobile processor'
+                        let gBaseFrequency=1200
+                    else
+                        echo 'Now using 1600 MHz for Server/Desktop processor'
+                        let gBaseFrequency=1600
+                fi
+            fi
         else
-            echo "Using the default max TDP of: $tdp Watt"
+            let logicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
+            let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
+            let frequency=($frequency / 1000000)
     fi
 
-    if [ $# -eq 3 ]; then
-        if [ $3 -eq 0 ];
-            then
-                let bridgeType=2
-                echo "CPU type override, now using: Sandy Bridge"
-            else
-                let bridgeType=4
-                echo "CPU type override, now using: Ivy Bridge"
-         fi
-    fi
+    if (!(($modelSpecified))); then
+        #
+        # Command line arguments (used as override values).
+        #
+        if [ $# -ge 1 ]; then
+            let maxTurboFrequency=$1
+        fi
 
-    #
-    # Do not change anything below this line!
-    #
+        if [ $# -ge 2 ]; then
+            let gTdp=$2
+            echo "Max TDP override, now using: $gTdp Watt"
+        fi
 
-    #let logicalCPUs=$(echo `sysctl hw.logicalcpu` | sed -e 's/^hw.logicalcpu: //')
-    local logicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
-    let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
-    let frequency=($frequency / 1000000)
+        if [ $# -eq 3 ]; then
+            if [ $3 -eq 0 ];
+                then
+                    let gBridgeType=2
+                    echo "CPU type override, now using: Sandy Bridge"
+                else
+                    let gBridgeType=4
+                    echo "CPU type override, now using: Ivy Bridge"
+             fi
+        fi
+    fi
 
     echo "$logicalCPUs logical CPU's detected with a Core Frequency of $frequency MHz"
 
@@ -1016,75 +1207,81 @@ function main()
         let turboStates=0
     fi
 
-    let minTurboFrequency=($frequency+100)
+	let minTurboFrequency=($frequency+100)
     echo "Number of Turbo States: $turboStates ($minTurboFrequency-$maxTurboFrequency MHz)"
 
-    local packageLength=$(echo "((($maxTurboFrequency - $baseFrequency)+100) / 100)" | bc)
+    local packageLength=$(echo "((($maxTurboFrequency - $gBaseFrequency)+100) / 100)" | bc)
 
-    echo "Number of P-States: $packageLength ($baseFrequency-$maxTurboFrequency)"
+    echo "Number of P-States: $packageLength ($gBaseFrequency-$maxTurboFrequency MHz)"
 
     _printHeader
     _printExternals $logicalCPUs
-    _printDebugInfo $logicalCPUs $tdp $packageLength $turboStates $maxTurboFrequency
+    _printDebugInfo $logicalCPUs $gTdp $packageLength $turboStates $maxTurboFrequency
     _printScopeStart $turboStates $packageLength
-    _printPackages $tdp $frequency $maxTurboFrequency
+    _printPackages $gTdp $frequency $maxTurboFrequency
 
     _getBoardID
 
     local modelID=$(_getModelName)
-    local typeCPU=$(_getCPUtype)
+
+    local cpu_type=$(_getCPUtype)
     local currentSystemType=$(_getSystemType)
 
-    if [ $bridgeType -eq $IVY_BRIDGE ];
+    if [ $gBridgeType -eq $IVY_BRIDGE ];
         then
-            local cpuTypeString="04"
+            local cpuTypeString="07"
 
             _initIvyBridgeSetup
 
-            _printCSTScope 0
-            _printIvybridgeMethods
-            _printCPUScopes $logicalCPUs
+            _printScopeACST 0
+            _printMethodDSM
+            _printScopeCPUn $logicalCPUs
         else
-            local cpuTypeString="04"
+            local cpuTypeString="06"
 
             _initSandyBridgeSetup
 
-            _printCSTScope 0
-            _printCPUScopes $logicalCPUs
+            _printScopeACST 0
+            _printScopeCPUn $logicalCPUs
     fi
 
-    printf "Number of C-States for "$gProcLabel"0: $gACST_CPU0\n"
-    printf "Number of C-States for "$gProcLabel"1: $gACST_CPU1\n"
+    _showLowPowerStates
 
-    if [ ${typeCPU:2:2} -ne $cpuTypeString ]; then
-        echo "Warning: cpu-type may be set improperly (0x$typeCPU instead of 0x${typeCPU:0:2}$cpuTypeString)"
+    if [ ${cpu_type:2:2} -ne $cpuTypeString ]; then
+        echo "Warning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
     fi
 
-    if [ $systemType -eq 0 ];
+    if [ $gSystemType -eq 0 ];
         then
-            echo "Warning: board-id [$boardID] is not supported by $bridgeTypeString PM"
+            echo "Warning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
         else
-            if [ "$macModelIdentifier" != "$modelID" ]; then
+            if [ "$gMacModelIdentifier" != "$modelID" ]; then
                 echo "Error: board-id [$boardID] and model [$modelID] mismatch"
             fi
 
-            if [ $currentSystemType -ne $systemType ]; then
-                echo "Warning: system-type may be set improperly ($currentSystemType instead of $systemType)"
+            if [ $currentSystemType -ne $gSystemType ]; then
+                echo "Warning: 'system-type' may be set improperly ($currentSystemType instead of $gSystemType)"
             fi
     fi
 }
 
 #==================================== START =====================================
- 
+
 #
 # Check number of arguments.
 #
 
-if [ $# -gt 0 ];
+if [ $# -ge 0 ];
     then
         main $1 $2 $3
-        iasl $ssdtPR
-        open $ssdtPR
+
+        if ((gCallIasl)); then
+            iasl $gSsdtPR
+        fi
+
+        if ((gCallOpen)); then
+            open $gSsdtPR
+        fi
     else
         echo "Usage: $0 MaxTurboFrequency [TDP (Watts) CPU (0=SandyBridge, 1=IvyBridge)]"
         exit 1

From 912079e5ad6c53da50d28d6381fe74a37ff2cfa5 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 10 Feb 2013 13:44:53 +0100
Subject: [PATCH 265/623] Helping Jeroen to get things sorted

Thanks to Francis for pointing out the E2 differences.
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 73 ++++++++++++++--------------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 3d35470..88507fb 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 3.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 3.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -74,7 +74,7 @@ gProcLabel="CPU"
 # Global variables.
 #
 
-gScriptVersion=3.0
+gScriptVersion=3.1
 
 #
 # Path and filename setup.
@@ -106,38 +106,38 @@ gProcessorNumber=""
 # Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
 #
 
-gServerIvyBridgeCPUList=(
+gServerSandyBridgeCPUList=(
 # E3-1200 Xeon Processor Series
-E3-1290v2,87,0,3700,4100,4,8
 E3-1290,95,0,3600,4000,4,8
-E3-1285v2,65,0,3600,4000,
-E3-1285Lv2,0,0,3200,3900,
-E3-1280v2,69,0,3600,4000,4,8
 E3-1280,95,0,3500,3900,4,8
-E3-1275v2,77,0,3500,3900,4,8
 E3-1275,95,0,3400,3800,4,8
-E3-1270v2,69,0,3500,3900,4,8
 E3-1270,80,0,3400,3800,4,8
-E3-1265Lv2,45,0,2500,3500,4,8
 E3-1260L,45,0,2400,3300,4,8
-E3-1245v2,77,0,3400,3800,4,8
 E3-1245,95,0,3300,3700,4,8
-E3-1240v2,69,0,3400,3800,4,8
 E3-1240,80,0,3300,3700,4,8
 E3-1235,95,0,3200,3600,4,8
-E3-1230v2,69,0,3300,3700,4,8
 E3-1230,80,0,3200,3600,4,8
-E3-1225v2,77,0,3200,3600,4,4
 E3-1225,95,0,3100,3400,4,4
-E3-1220v2,69,0,3100,3500,4,4
-E3-1220Lv2,80,0,3100,3400,4,4
 E3-1220L,20,0,2200,3400,2,4
-E3-1220Lv2,17,0,2300,3500,2,4
+E3-1220,80,0,3100,3400,4,4
 )
 
-#
-# Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
-#
+gServerIvyBridgeCPUList=(
+# E3-1200 Xeon Processor Series
+E3-1290 V2,87,0,3700,4100,4,8
+E3-1285 V2,65,0,3600,4000,
+E3-1285L V2,0,0,3200,3900,
+E3-1280 V2,69,0,3600,4000,4,8
+E3-1275 V2,77,0,3500,3900,4,8
+E3-1270 V2,69,0,3500,3900,4,8
+E3-1265L V2,45,0,2500,3500,4,8
+E3-1245 V2,77,0,3400,3800,4,8
+E3-1240 V2,69,0,3400,3800,4,8
+E3-1230 V2,69,0,3300,3700,4,8
+E3-1225 V2,77,0,3200,3600,4,4
+E3-1220 V2,69,0,3100,3500,4,4
+E3-1220L V2,17,0,2300,3500,2,4
+)
 
 gDesktopIvyBridgeCPUList=(
 # i7-3700 Desktop Processor Series
@@ -174,10 +174,6 @@ i3-3220T,35,1600,2800,0,2,4
 i3-3210,55,1600,3200,0,2,4
 )
 
-#
-# Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
-#
-
 gMobileIvyBridgeCPUList=(
 # i7-3800 Mobile Processor Series
 i7-3840QM,45,1200,2800,3800,4,8
@@ -801,6 +797,11 @@ function _getCPUNumberFromBrandString
     # echo "${data[3]}" # CPU
     # echo "${data[4]}" # @
     # echo "${data[5]}" # 2.50GHz
+
+    if ((${#data[@]} == 7)); then
+       echo "TODO: Jeroen, look at what Francis said about V2 and fix this a.s.a.p!"
+    fi
+
     #
     # Restore the default delimiter
     #
@@ -1096,19 +1097,19 @@ function main()
     printf "\nsdtPRGen.sh v$gScriptVersion Copyright (c) 2013 by Pike R. Alpha\n"
     echo   '-----------------------------------------------------'
 
+    #
+    # Get installed CPU model, set bridge type and default TDP.
+    #
     let modelSpecified=0
+    local model=$(_getCPUModel)
+    _getCPUNumberFromBrandString
 
-    if (((${1:0:1} == "i") || (${1:0:1} == "E")));
-        then
+    if [[ $# -eq 1 ]]; then
+        if (((${1:0:1} == "i") || (${1:0:1} == "E"))); then
             let model=0x3A
             let modelSpecified=1
             gProcessorNumber=$1
-        else
-            #
-            # Get installed CPU model, set bridge type and default TDP.
-            #
-            local model=$(_getCPUModel)
-            _getCPUNumberFromBrandString
+        fi
     fi
 
     if (($model==0x2A || $model==0x2D));
@@ -1135,10 +1136,10 @@ function main()
         then
             local ifs=$IFS
             IFS=","
-    		local cpuData=($gProcessorData)
-	        let gTdp=${cpuData[1]}
-		    let lfm=${cpuData[2]}
-		    let frequency=${cpuData[3]}
+            local cpuData=($gProcessorData)
+            let gTdp=${cpuData[1]}
+            let lfm=${cpuData[2]}
+            let frequency=${cpuData[3]}
             let maxTurboFrequency=${cpuData[4]}
             let logicalCPUs=${cpuData[6]}
             IFS=$ifs

From 4b9cad2052b9b53d0b96b48209a5a6049e43a3b0 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 10 Feb 2013 13:47:21 +0100
Subject: [PATCH 266/623] Adding example for Jeroen

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 88507fb..ef43f2d 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -798,6 +798,15 @@ function _getCPUNumberFromBrandString
     # echo "${data[4]}" # @
     # echo "${data[5]}" # 2.50GHz
 
+    # or:
+    # echo "${data[0]}" # Intel(R)
+    # echo "${data[1]}" # Core(TM)
+    # echo "${data[2]}" # CPU
+    # echo "${data[3]}" # E3-12XX
+    # echo "${data[4]}" # V2
+    # echo "${data[5]}" # @
+    # echo "${data[6]}" # 3.30GHz
+
     if ((${#data[@]} == 7)); then
        echo "TODO: Jeroen, look at what Francis said about V2 and fix this a.s.a.p!"
     fi

From ed89e041fa192778eeb3b6c0b141ad6dd5dd2a53 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 10 Feb 2013 19:28:32 +0100
Subject: [PATCH 267/623] Bug fixes

Thanks to Francis for his help with Xeon processor support!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 136 ++++++++++++++++++---------
 1 file changed, 93 insertions(+), 43 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index ef43f2d..7353fe7 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 3.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 3.2 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -46,7 +46,7 @@ gDebug=0
 #
 # A value of 1 will make this script call iasl (compiles SSDT_PR.dsl)
 #
-gCallIasl=1
+gCallIasl=0
 
 #
 # A value of 1 will make this script open SSDT_PR.dsl in the editor of your choice. 
@@ -74,7 +74,7 @@ gProcLabel="CPU"
 # Global variables.
 #
 
-gScriptVersion=3.1
+gScriptVersion=3.2
 
 #
 # Path and filename setup.
@@ -106,7 +106,7 @@ gProcessorNumber=""
 # Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
 #
 
-gServerSandyBridgeCPUList=(
+gSandyBridgeCPUList=(
 # E3-1200 Xeon Processor Series
 E3-1290,95,0,3600,4000,4,8
 E3-1280,95,0,3500,3900,4,8
@@ -122,21 +122,25 @@ E3-1220L,20,0,2200,3400,2,4
 E3-1220,80,0,3100,3400,4,4
 )
 
+#
+# Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
+#
+
 gServerIvyBridgeCPUList=(
 # E3-1200 Xeon Processor Series
-E3-1290 V2,87,0,3700,4100,4,8
-E3-1285 V2,65,0,3600,4000,
-E3-1285L V2,0,0,3200,3900,
-E3-1280 V2,69,0,3600,4000,4,8
-E3-1275 V2,77,0,3500,3900,4,8
-E3-1270 V2,69,0,3500,3900,4,8
-E3-1265L V2,45,0,2500,3500,4,8
-E3-1245 V2,77,0,3400,3800,4,8
-E3-1240 V2,69,0,3400,3800,4,8
-E3-1230 V2,69,0,3300,3700,4,8
-E3-1225 V2,77,0,3200,3600,4,4
-E3-1220 V2,69,0,3100,3500,4,4
-E3-1220L V2,17,0,2300,3500,2,4
+'E3-1290 V2',87,0,3700,4100,4,8
+'E3-1285 V2',65,0,3600,4000,
+'E3-1285L V2',0,0,3200,3900,
+'E3-1280 V2',69,0,3600,4000,4,8
+'E3-1275 V2',77,0,3500,3900,4,8
+'E3-1270 V2',69,0,3500,3900,4,8
+'E3-1265L V2',45,0,2500,3500,4,8
+'E3-1245 V2',77,0,3400,3800,4,8
+'E3-1240 V2',69,0,3400,3800,4,8
+'E3-1230 V2',69,0,3300,3700,4,8
+'E3-1225 V2',77,0,3200,3600,4,4
+'E3-1220 V2',69,0,3100,3500,4,4
+'E3-1220L V2',17,0,2300,3500,2,4
 )
 
 gDesktopIvyBridgeCPUList=(
@@ -770,6 +774,19 @@ function _getSystemType()
 
 #--------------------------------------------------------------------------------
 
+function _findIasl()
+{
+    if ((gCallIasl)); then
+        iasl=`find /Applications -name iasl -print -quit`
+
+        if [ $iasl == "" ]; then
+            gCallIasl=0
+        fi
+    fi
+}
+
+#--------------------------------------------------------------------------------
+
 function _getCPUNumberFromBrandString
 {
     #
@@ -788,6 +805,8 @@ function _getCPUNumberFromBrandString
     # Split brandstring into array (data)
     #
     local data=($brandString)
+#   local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "V2" "@" "2.5GHz")
+#   local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "@" "2.5GHz")
     #
     # Example from a MacBookPro10,2
     #
@@ -797,26 +816,36 @@ function _getCPUNumberFromBrandString
     # echo "${data[3]}" # CPU
     # echo "${data[4]}" # @
     # echo "${data[5]}" # 2.50GHz
-
-    # or:
+    #
+    # or: "Intel(R) Xeon(R) CPU E3-1230 V2 @ 3.30GHz"
+    #
     # echo "${data[0]}" # Intel(R)
-    # echo "${data[1]}" # Core(TM)
+    # echo "${data[1]}" # Xeon(R)
     # echo "${data[2]}" # CPU
     # echo "${data[3]}" # E3-12XX
     # echo "${data[4]}" # V2
     # echo "${data[5]}" # @
     # echo "${data[6]}" # 3.30GHz
 
-    if ((${#data[@]} == 7)); then
-       echo "TODO: Jeroen, look at what Francis said about V2 and fix this a.s.a.p!"
-    fi
-
     #
     # Restore the default delimiter
     #
     IFS=$ifs
 
-    gProcessorNumber="${data[2]}"
+    let length=${#data[@]}
+
+    if ((length > 6)); then
+        echo 'Warning: Unexpected brandstring > "'${data[@]}'"'
+    fi
+
+    if [[ ${data[1]} == "Xeon(R)" && ${data[4]} == "V2" ]];
+        then
+            gProcessorNumber="${data[3]} ${data[4]}"
+        else
+            gProcessorNumber="${data[2]}"
+    fi
+
+#   echo $gProcessorNumber
 }
 
 #--------------------------------------------------------------------------------
@@ -831,7 +860,7 @@ function _getCPUDataByProcessorNumber
         local ifs=$IFS
         local targetCPUList=("${!1}")
 
-        for cpuData in ${targetCPUList[@]}
+        for cpuData in "${targetCPUList[@]}"
         do
             IFS=","
             data=($cpuData)
@@ -857,8 +886,10 @@ function _getCPUDataByProcessorNumber
     fi
 
     if (!(($gTypeCPU))); then
-        __searchList gServerIvyBridgeCPUList[@] $gServerCPU
+        __searchList "gServerIvyBridgeCPUList[@]" $gServerCPU
     fi
+
+#   echo "gTypeCPU is $gTypeCPU"
 }
 
 #--------------------------------------------------------------------------------
@@ -1106,18 +1137,28 @@ function main()
     printf "\nsdtPRGen.sh v$gScriptVersion Copyright (c) 2013 by Pike R. Alpha\n"
     echo   '-----------------------------------------------------'
 
+    let modelSpecified=0
+    let maxTurboFrequency=0
+
     #
     # Get installed CPU model, set bridge type and default TDP.
     #
-    let modelSpecified=0
     local model=$(_getCPUModel)
+
     _getCPUNumberFromBrandString
 
     if [[ $# -eq 1 ]]; then
-        if (((${1:0:1} == "i") || (${1:0:1} == "E"))); then
-            let model=0x3A
-            let modelSpecified=1
-            gProcessorNumber=$1
+        if [[ $1 == "" ]];
+            then
+                if [[ $gProcessorNumber != 0 ]]; then
+                    let model=0x3A
+                fi
+            else
+                if (( ("${1:0:4}" == "i3-3") || (${1:0:4} == "i5-3") || (${1:0:4} == "i7-3") || (${1:0:1} == "E") )); then
+                    let model=0x3A
+                    let modelSpecified=1
+                    gProcessorNumber=$1
+                fi
         fi
     fi
 
@@ -1127,7 +1168,7 @@ function main()
             let gBridgeType=2
             local bridgeTypeString="Sandy Bridge"
         else
-			let gTdp=77
+            let gTdp=77
             let gBridgeType=4
             local bridgeTypeString="Ivy Bridge"
 
@@ -1145,10 +1186,10 @@ function main()
         then
             local ifs=$IFS
             IFS=","
-            local cpuData=($gProcessorData)
-            let gTdp=${cpuData[1]}
-            let lfm=${cpuData[2]}
-            let frequency=${cpuData[3]}
+    		local cpuData=($gProcessorData)
+	        let gTdp=${cpuData[1]}
+		    let lfm=${cpuData[2]}
+		    let frequency=${cpuData[3]}
             let maxTurboFrequency=${cpuData[4]}
             let logicalCPUs=${cpuData[6]}
             IFS=$ifs
@@ -1180,7 +1221,7 @@ function main()
         #
         # Command line arguments (used as override values).
         #
-        if [ $# -ge 1 ]; then
+        if [[ $# -ge 1 && $1 != "" ]]; then
             let maxTurboFrequency=$1
         fi
 
@@ -1203,21 +1244,28 @@ function main()
 
     echo "$logicalCPUs logical CPU's detected with a Core Frequency of $frequency MHz"
 
+    #
+	# Check maxTurboFrequency
+	#
+    if [ $maxTurboFrequency == 0 ]; then
+        printf "\nError: Unknown processor number... exiting\n"
+          echo "Try: $0 MaxTurboFrequency [TDP (Watts) CPU (0=SandyBridge, 1=IvyBridge)]"
+        exit 1
+    fi
+
 	#
     # Get number of Turbo states.
     #
-
     let turboStates=$(echo "(($maxTurboFrequency - $frequency) / 100)" | bc)
 
     #
     # Check number of Turbo states.
     #
-
     if [ $turboStates -lt 0 ]; then
         let turboStates=0
     fi
 
-	let minTurboFrequency=($frequency+100)
+    let minTurboFrequency=($frequency+100)
     echo "Number of Turbo States: $turboStates ($minTurboFrequency-$maxTurboFrequency MHz)"
 
     local packageLength=$(echo "((($maxTurboFrequency - $gBaseFrequency)+100) / 100)" | bc)
@@ -1283,10 +1331,12 @@ function main()
 
 if [ $# -ge 0 ];
     then
-        main $1 $2 $3
+        main "$1" $2 $3
+
+        _findIasl
 
         if ((gCallIasl)); then
-            iasl $gSsdtPR
+            $iasl $gSsdtPR
         fi
 
         if ((gCallOpen)); then

From fcff422eedcc765eb41e9233a2aeb03af392c16b Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 11 Feb 2013 12:30:58 +0100
Subject: [PATCH 268/623] Updating script to v3.3

C3 power/latency for iMac13,N fixed
IASL failed to launch when path included spaces
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 52 +++++++++++++++++++---------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 7353fe7..cc9c82c 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 3.2 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 3.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -28,9 +28,11 @@
 #			- Better/more complete feedback added (Jeroen, Februari 2013)
 #			- Processor data for desktop/mobile and server CPU's added (Jeroen, Februari 2013)
 #			- Improved power calculation, matching Apple's new algorithm (Pike, Februari 2013)
+#			- Fix iMac13,N latency and power values for C3 (Jeroen/Pike, Februari 2013)
+#			- IASL failed to launch when path included spaces (Pike, Februari 2013)
 #
 # Contributors:
-#			- Thanks to Dave and toleda for their help (bug fixes and other improvements).
+#			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
 #			- Many thanks to Jeroen for the CPU data, cleanups and renaming stuff.
 #
 
@@ -39,19 +41,19 @@
 #================================= GLOBAL VARS ==================================
 
 #
-# Change this to 1 to inject debug data.
+# Change this to 0 to stop it from injecting debug data.
 #
-gDebug=0
+gDebug=1
 
 #
 # A value of 1 will make this script call iasl (compiles SSDT_PR.dsl)
 #
-gCallIasl=0
+gCallIasl=1
 
 #
 # A value of 1 will make this script open SSDT_PR.dsl in the editor of your choice. 
 #
-gCallOpen=1
+gCallOpen=0
 
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
@@ -74,7 +76,7 @@ gProcLabel="CPU"
 # Global variables.
 #
 
-gScriptVersion=3.2
+gScriptVersion=3.3
 
 #
 # Path and filename setup.
@@ -498,7 +500,7 @@ function _printScopeACST()
             let targetCStates=$gACST_CPU1
             latency_C1=0x03E8
             latency_C2=0x94
-            latency_C3=0xA9
+            latency_C3=0xC6
 
             if ((gDebug)); then
                 echo '            Store ("CPU1 C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
@@ -603,6 +605,21 @@ function _printScopeACST()
 
     if (($C3)); then
         let hintCode+=0x10
+        local power_C3=0x01F4
+        #
+        # Is this for CPU1?
+        #
+        if (($1)); then
+            if [[ ${modelID:0:7} == "iMac13," ]];
+                then
+                    local power_C3=0x15E
+                    latency_C3=0xA9
+                else
+                    local power_C3=0xC8
+                    let hintCode+=0x10
+            fi
+        fi
+
         echo '                },'                                                       >> $gSsdtPR
         echo ''                                                                         >> $gSsdtPR
         echo '                Package (0x04)'                                           >> $gSsdtPR
@@ -618,7 +635,7 @@ function _printScopeACST()
         echo '                    },'                                                   >> $gSsdtPR
         echo '                    0x03,'                                                >> $gSsdtPR
         echo '                    '$latency_C3','                                       >> $gSsdtPR
-        echo '                    0x01F4'                                               >> $gSsdtPR
+        echo '                    '$power_C3                                            >> $gSsdtPR
     fi
 
     if (($C6)); then
@@ -724,6 +741,7 @@ function _getModelName()
     # Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
     #
     echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *["=<>]//g' -e 's/compatible//'`
+#   echo "iMac13,2"
 }
 
 #--------------------------------------------------------------------------------
@@ -779,7 +797,7 @@ function _findIasl()
     if ((gCallIasl)); then
         iasl=`find /Applications -name iasl -print -quit`
 
-        if [ $iasl == "" ]; then
+        if [ "$iasl" == "" ]; then
             gCallIasl=0
         fi
     fi
@@ -1186,10 +1204,10 @@ function main()
         then
             local ifs=$IFS
             IFS=","
-    		local cpuData=($gProcessorData)
-	        let gTdp=${cpuData[1]}
-		    let lfm=${cpuData[2]}
-		    let frequency=${cpuData[3]}
+            local cpuData=($gProcessorData)
+            let gTdp=${cpuData[1]}
+            let lfm=${cpuData[2]}
+            let frequency=${cpuData[3]}
             let maxTurboFrequency=${cpuData[4]}
             let logicalCPUs=${cpuData[6]}
             IFS=$ifs
@@ -1245,8 +1263,8 @@ function main()
     echo "$logicalCPUs logical CPU's detected with a Core Frequency of $frequency MHz"
 
     #
-	# Check maxTurboFrequency
-	#
+    # Check maxTurboFrequency
+    #
     if [ $maxTurboFrequency == 0 ]; then
         printf "\nError: Unknown processor number... exiting\n"
           echo "Try: $0 MaxTurboFrequency [TDP (Watts) CPU (0=SandyBridge, 1=IvyBridge)]"
@@ -1336,7 +1354,7 @@ if [ $# -ge 0 ];
         _findIasl
 
         if ((gCallIasl)); then
-            $iasl $gSsdtPR
+            "$iasl" $gSsdtPR
         fi
 
         if ((gCallOpen)); then

From 6baa930ffae21213ac5199e9fbae5b67ab19e7c3 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 12 Feb 2013 07:12:08 +0100
Subject: [PATCH 269/623] Updating script to v3.4

Typo in cpu-type check fixed
Error in CPU data (i5-3317U) fixed
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index cc9c82c..3553cd3 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 3.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 3.4 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -30,6 +30,8 @@
 #			- Improved power calculation, matching Apple's new algorithm (Pike, Februari 2013)
 #			- Fix iMac13,N latency and power values for C3 (Jeroen/Pike, Februari 2013)
 #			- IASL failed to launch when path included spaces (Pike, Februari 2013)
+#			- Typo in cpu-type check fixed (Jeroen, Februari 2013)
+#			- Error in CPU data (i5-3317U) fixed (Pike, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -76,7 +78,7 @@ gProcLabel="CPU"
 # Global variables.
 #
 
-gScriptVersion=3.3
+gScriptVersion=3.4
 
 #
 # Path and filename setup.
@@ -221,7 +223,7 @@ i5-3340M,35,1200,2700,3400,2,4
 i5-3339Y,13,0,1500,2000,2,4
 i5-3337U,17,0,1800,2700,2,4
 i5-3320M,35,1200,2600,3300,2,4
-i5-3317U,17,1700,2600,2,4
+i5-3317U,17,0,1700,2600,2,4
 # i5-3200 Mobile Processor Series
 i5-3230M,35,1200,2600,3200,2,4
 i5-3210M,35,1200,2500,3100,2,4
@@ -1323,7 +1325,7 @@ function main()
 
     _showLowPowerStates
 
-    if [ ${cpu_type:2:2} -ne $cpuTypeString ]; then
+    if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
         echo "Warning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
     fi
 

From 2d58473da08a81dd80f140903117720b81e22d0d Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 12 Feb 2013 10:10:07 +0100
Subject: [PATCH 270/623] Updating script to v3.4

New setting to copy the compiled AML file after IASL is done
New setting to set the destination path/filename
Additional checking to trap cpu data/turbo mode errors
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 131 ++++++++++++++++++++-------
 1 file changed, 97 insertions(+), 34 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 3553cd3..7e74cbc 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 3.4 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 3.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -32,6 +32,9 @@
 #			- IASL failed to launch when path included spaces (Pike, Februari 2013)
 #			- Typo in cpu-type check fixed (Jeroen, Februari 2013)
 #			- Error in CPU data (i5-3317U) fixed (Pike, Februari 2013)
+#			- Setting added for the target path/filename (Jeroen, Februari 2013)
+#			- Initial implementation of auto-copy (Jeroen, Februari 2013)
+#			- Additional checks added for cpu data/turbo modes (Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -43,13 +46,32 @@
 #================================= GLOBAL VARS ==================================
 
 #
-# Change this to 0 to stop it from injecting debug data.
+# Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
 #
-gDebug=1
+gIvyWorkAround=1
+
+#
+# Change this to 1 when you want SSDT.aml to get copied to the target location.
+#
+gAutoCopy=0
+
+#
+# This is the target location that SSDT.aml will be copied to.
+#
+# Note: Do no change this - will be updated automatically for Clover/RevoBoot!
+#
+gDestinationPath="/Extra/"
+
+#
+# This is the filename used for the copy process
+#
+gDestinationFile="SSDT.aml"
 
 #
 # A value of 1 will make this script call iasl (compiles SSDT_PR.dsl)
 #
+# Note: Will be set to 0 when we failed to locate a copy of iasl!
+#
 gCallIasl=1
 
 #
@@ -58,34 +80,32 @@ gCallIasl=1
 gCallOpen=0
 
 #
-# Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
+# Change this to 0 to stop it from injecting debug data.
 #
-gIvyWorkAround=1
+gDebug=1
 
 #
 # Lowest possible idle frequency (user configurable). Also known as Low Frequency Mode.
 #
-
 gBaseFrequency=1600
 
 #
 # Change this label to "P00" when your DSDT uses 'P00n' instead of 'CPUn'.
 #
-
 gProcLabel="CPU"
 
 #
-# Global variables.
+# Other global variables.
 #
 
-gScriptVersion=3.4
+gScriptVersion=3.5
 
 #
 # Path and filename setup.
 #
 
 gPath=~/Desktop
-gSsdtID=SSDT_PR
+gSsdtID=SSDT
 gSsdtPR=${gPath}/${gSsdtID}.dsl
 
 gDesktopCPU=1
@@ -348,7 +368,13 @@ function _printScopeStart()
 
     if [ $turboStates -eq 0 ];
         then
-            echo '        Name (APSN, Zero)'                                            >> $gSsdtPR
+            # TODO: Remove this when CPUPM for IB works properly!
+            if (($useWorkArounds));
+                then
+                    echo '        Name (APSN, One)'                                     >> $gSsdtPR
+                else
+                    echo '        Name (APSN, Zero)'                                    >> $gSsdtPR
+            fi
         else
           # TODO: Remove this when CPUPM for IB works properly!
           if ((useWorkArounds)); then
@@ -359,7 +385,7 @@ function _printScopeStart()
     fi
 
     # TODO: Remove this when CPUPM for IB works properly!
-    if ((useWorkArounds)); then
+    if (($useWorkArounds)); then
         let packageLength+=1
     fi
 
@@ -367,7 +393,7 @@ function _printScopeStart()
     echo '        {'                                                                    >> $gSsdtPR
 
     # TODO: Remove this when CPUPM for IB works properly!
-    if ((useWorkArounds)); then
+    if (($useWorkArounds)); then
         let extraF=($maxTurboFrequency+1)
         let maxTDP=($gTdp*1000)
         let extraR=($maxTurboFrequency/100)+1
@@ -397,7 +423,9 @@ function _printPackages()
         let minRatio=8
     fi
 
-    echo '            /* High Frequency Modes (turbo) */'                               >> $gSsdtPR
+    if (($turboStates)); then
+        echo '            /* High Frequency Modes (turbo) */'                           >> $gSsdtPR
+    fi
 
     while [ $ratio -ge $minRatio ];
         do
@@ -807,6 +835,25 @@ function _findIasl()
 
 #--------------------------------------------------------------------------------
 
+function _setDestinationPath
+{
+    #
+    # Checking for RevoBoot
+    #
+    if [ -d /EFI/ACPI ]; then
+        gDestinationPath="/Extra/ACPI/"
+    fi
+
+    #
+    # Checking for Clover
+    #
+    if [ -d /EFI/ACPI/patched ]; then
+        gDestinationPath="/EFI/ACPI/patched/"
+    fi
+}
+
+#--------------------------------------------------------------------------------
+
 function _getCPUNumberFromBrandString
 {
     #
@@ -1211,6 +1258,11 @@ function main()
             let lfm=${cpuData[2]}
             let frequency=${cpuData[3]}
             let maxTurboFrequency=${cpuData[4]}
+
+            if [ $maxTurboFrequency == 0 ]; then
+                let maxTurboFrequency=$frequency
+			fi
+
             let logicalCPUs=${cpuData[6]}
             IFS=$ifs
 
@@ -1269,7 +1321,7 @@ function main()
     #
     if [ $maxTurboFrequency == 0 ]; then
         printf "\nError: Unknown processor number... exiting\n"
-          echo "Try: $0 MaxTurboFrequency [TDP (Watts) CPU (0=SandyBridge, 1=IvyBridge)]"
+        echo "Try: $0 MaxTurboFrequency [TDP (Watts) CPU (0=SandyBridge, 1=IvyBridge)]"
         exit 1
     fi
 
@@ -1285,8 +1337,17 @@ function main()
         let turboStates=0
     fi
 
-    let minTurboFrequency=($frequency+100)
-    echo "Number of Turbo States: $turboStates ($minTurboFrequency-$maxTurboFrequency MHz)"
+    #
+    # Report number of Turbo States
+    #
+    if [ $turboStates -gt 0 ];
+        then
+            let minTurboFrequency=($frequency+100)
+            echo "Number of Turbo States: $turboStates ($minTurboFrequency-$maxTurboFrequency MHz)"
+
+        else
+            echo "Number of Turbo States: 0"
+    fi
 
     local packageLength=$(echo "((($maxTurboFrequency - $gBaseFrequency)+100) / 100)" | bc)
 
@@ -1345,28 +1406,30 @@ function main()
 
 #==================================== START =====================================
 
-#
-# Check number of arguments.
-#
+main "$1" $2 $3
 
-if [ $# -ge 0 ];
-    then
-        main "$1" $2 $3
+_findIasl
 
-        _findIasl
+if ((gCallIasl)); then
+    #
+    # Compile SSDT.dsl
+    #
+    "$iasl" $gSsdtPR
 
-        if ((gCallIasl)); then
-            "$iasl" $gSsdtPR
-        fi
+    #
+    # Copy SSDT_PR.aml to target location
+    #
+    if (($gAutoCopy)); then
+        _setDestinationPath
+        cp $gSsdtPR ${gDestinationPath}${gDestinationFile}
+    fi
 
-        if ((gCallOpen)); then
-            open $gSsdtPR
-        fi
-    else
-        echo "Usage: $0 MaxTurboFrequency [TDP (Watts) CPU (0=SandyBridge, 1=IvyBridge)]"
-        exit 1
 fi
 
-#================================================================================
+if ((gCallOpen)); then
+    open $gSsdtPR
+fi
 
 exit 0
+
+#================================================================================

From 5fdb3edd30f63c654b194325aa52cd316a1aaa38 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 12 Feb 2013 10:13:27 +0100
Subject: [PATCH 271/623] Updating script to v3.5

Oops typo
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 7e74cbc..d5df128 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -1261,7 +1261,7 @@ function main()
 
             if [ $maxTurboFrequency == 0 ]; then
                 let maxTurboFrequency=$frequency
-			fi
+            fi
 
             let logicalCPUs=${cpuData[6]}
             IFS=$ifs

From 78d124cf77b5702ed44934db041ce092cb8fbd3b Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 12 Feb 2013 17:23:49 +0100
Subject: [PATCH 272/623] Updating script to v3.6

Undo filename change done by Jeroen in version 3.5
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index d5df128..bc02112 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 3.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 3.6 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -35,6 +35,7 @@
 #			- Setting added for the target path/filename (Jeroen, Februari 2013)
 #			- Initial implementation of auto-copy (Jeroen, Februari 2013)
 #			- Additional checks added for cpu data/turbo modes (Jeroen, Februari 2013)
+#			- Undo filename change done by Jeroen (Pike, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -98,14 +99,14 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=3.5
+gScriptVersion=3.6
 
 #
 # Path and filename setup.
 #
 
 gPath=~/Desktop
-gSsdtID=SSDT
+gSsdtID=SSDT_PR
 gSsdtPR=${gPath}/${gSsdtID}.dsl
 
 gDesktopCPU=1

From 894da5e6b1ab2696501b3877ad9964fb9689bd75 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Thu, 14 Feb 2013 11:30:03 +0100
Subject: [PATCH 273/623] Updating script to v3.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Improved search algorithm for iasl.
We now also copy iasl to a location that we check.
This reduces the time it takes to locate the file.
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 41 ++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index bc02112..b8b09b0 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 3.6 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 3.7 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -36,6 +36,7 @@
 #			- Initial implementation of auto-copy (Jeroen, Februari 2013)
 #			- Additional checks added for cpu data/turbo modes (Jeroen, Februari 2013)
 #			- Undo filename change done by Jeroen (Pike, Februari 2013)
+#			- Improved/faster search algorithm to locate iasl (Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -99,7 +100,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=3.6
+gScriptVersion=3.7
 
 #
 # Path and filename setup.
@@ -826,10 +827,40 @@ function _getSystemType()
 function _findIasl()
 {
     if ((gCallIasl)); then
-        iasl=`find /Applications -name iasl -print -quit`
+        #
+        # First we do a quick lookup of iasl (should be there after the first run)
+        #
+        if [ -f == /usr/local/bin/iasl ];
+            then
+                iasl=/usr/local/bin/iasl
+            else
+                #
+                # Search for 'iasl5' (used by MaciASL) in the /Applications folder
+                #
+                iasl=`find /Applications -name iasl5 -print -quit`
 
-        if [ "$iasl" == "" ]; then
-            gCallIasl=0
+                if [ "$iasl" == "" ];
+                    then
+                        #
+                        # Not found. Now search for 'iasl' in the /Applications folder
+                        #
+                        iasl=`find /Applications -name iasl -print -quit`
+
+                        if [ "$iasl" == "" ]; then
+                            #
+                            # No IASL found. Disable compiler feature
+                            #
+                            gCallIasl=0
+                        fi
+                fi
+
+                if ((gCallIasl)); then
+                    #
+                    # File found. Copy it to our target location
+                    #
+                    cp "$iasl" /usr/local/bin/iasl
+                    iasl=/usr/local/bin/iasl
+                fi
         fi
     fi
 }

From e1945417f4b2e2f98732a8776d8086d4ea0aeffc Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Thu, 14 Feb 2013 17:38:51 +0100
Subject: [PATCH 274/623] Updating script to v3.8

Bug fix (==) automatic revision update and better feedback for iasl search
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 65 +++++++++++++---------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index b8b09b0..4a59597 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 3.7 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 3.8 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -37,6 +37,7 @@
 #			- Additional checks added for cpu data/turbo modes (Jeroen, Februari 2013)
 #			- Undo filename change done by Jeroen (Pike, Februari 2013)
 #			- Improved/faster search algorithm to locate iasl (Jeroen, Februari 2013)
+#			- Bug fix, automatic revision update and better feedback (Pike, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -100,7 +101,9 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=3.7
+gScriptVersion=3.8
+
+gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
 #
 # Path and filename setup.
@@ -265,25 +268,25 @@ i3-3110M,35,0,2400,0,2,4
 
 function _printHeader()
 {
-    echo '/*'                                                                           >  $gSsdtPR
-    echo ' * Intel ACPI Component Architecture'                                         >> $gSsdtPR
-    echo ' * AML Disassembler version 20130210-00 [Feb 10 2013]'                        >> $gSsdtPR
-    echo ' * Copyright (c) 2000 - 2013 Intel Corporation'                               >> $gSsdtPR
-    echo ' * '                                                                          >> $gSsdtPR
-    echo ' * Original Table Header:'                                                    >> $gSsdtPR
-    echo ' *     Signature        "SSDT"'                                               >> $gSsdtPR
-    echo ' *     Length           0x0000036A (874)'                                     >> $gSsdtPR
-    echo ' *     Revision         0x01'                                                 >> $gSsdtPR
-    echo ' *     Checksum         0x00'                                                 >> $gSsdtPR
-    echo ' *     OEM ID           "APPLE "'                                             >> $gSsdtPR
-    echo ' *     OEM Table ID     "CpuPm"'                                              >> $gSsdtPR
-    echo ' *     OEM Revision     0x00003000 (4096)'                                    >> $gSsdtPR
-    echo ' *     Compiler ID      "INTL"'                                               >> $gSsdtPR
-    echo ' *     Compiler Version 0x20130210 (538116624)'                               >> $gSsdtPR
-    echo ' */'                                                                          >> $gSsdtPR
-    echo ''                                                                             >> $gSsdtPR
-    echo 'DefinitionBlock ("'$gSsdtID'.aml", "SSDT", 1, "APPLE ", "CpuPm", 0x00003000)' >> $gSsdtPR
-    echo '{'                                                                            >> $gSsdtPR
+    echo '/*'                                                                             >  $gSsdtPR
+    echo ' * Intel ACPI Component Architecture'                                           >> $gSsdtPR
+    echo ' * AML Disassembler version 20130210-00 [Feb 10 2013]'                          >> $gSsdtPR
+    echo ' * Copyright (c) 2000 - 2013 Intel Corporation'                                 >> $gSsdtPR
+    echo ' * '                                                                            >> $gSsdtPR
+    echo ' * Original Table Header:'                                                      >> $gSsdtPR
+    echo ' *     Signature        "SSDT"'                                                 >> $gSsdtPR
+    echo ' *     Length           0x0000036A (874)'                                       >> $gSsdtPR
+    echo ' *     Revision         0x01'                                                   >> $gSsdtPR
+    echo ' *     Checksum         0x00'                                                   >> $gSsdtPR
+    echo ' *     OEM ID           "APPLE "'                                               >> $gSsdtPR
+    echo ' *     OEM Table ID     "CpuPm"'                                                >> $gSsdtPR
+  printf ' *     OEM Revision     '$gRevision' (%d)\n' $gRevision                         >> $gSsdtPR
+    echo ' *     Compiler ID      "INTL"'                                                 >> $gSsdtPR
+    echo ' *     Compiler Version 0x20130210 (538116624)'                                 >> $gSsdtPR
+    echo ' */'                                                                            >> $gSsdtPR
+    echo ''                                                                               >> $gSsdtPR
+    echo 'DefinitionBlock ("'$gSsdtID'.aml", "SSDT", 1, "APPLE ", "CpuPm", '$gRevision')' >> $gSsdtPR
+    echo '{'                                                                              >> $gSsdtPR
 }
 
 
@@ -830,35 +833,29 @@ function _findIasl()
         #
         # First we do a quick lookup of iasl (should be there after the first run)
         #
-        if [ -f == /usr/local/bin/iasl ];
+        if [ -f /usr/local/bin/iasl ];
             then
                 iasl=/usr/local/bin/iasl
             else
-                #
-                # Search for 'iasl5' (used by MaciASL) in the /Applications folder
-                #
+                # Note: iasl5 is the name used by MaciASL
+                printf '\nSearching for iasl5 in the /Applications folder... '
                 iasl=`find /Applications -name iasl5 -print -quit`
 
                 if [ "$iasl" == "" ];
                     then
-                        #
-                        # Not found. Now search for 'iasl' in the /Applications folder
-                        #
+                        printf 'Not found.\nSearching for iasl in the /Applications folder... '
                         iasl=`find /Applications -name iasl -print -quit`
 
                         if [ "$iasl" == "" ]; then
-                            #
-                            # No IASL found. Disable compiler feature
-                            #
+                            printf 'Not found. Disabling compiler feature'
                             gCallIasl=0
                         fi
                 fi
 
                 if ((gCallIasl)); then
-                    #
-                    # File found. Copy it to our target location
-                    #
+                    printf 'IASL found. Copying file... '
                     cp "$iasl" /usr/local/bin/iasl
+                    printf 'Done.'
                     iasl=/usr/local/bin/iasl
                 fi
         fi

From 602e6ab9dafe5c720f17f301215902838ca95e9b Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Thu, 14 Feb 2013 22:26:53 +0100
Subject: [PATCH 275/623] Updating script to 3.9

Auto copy is now on by default
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 4a59597..fc67ed1 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 3.8 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 3.9 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -38,6 +38,7 @@
 #			- Undo filename change done by Jeroen (Pike, Februari 2013)
 #			- Improved/faster search algorithm to locate iasl (Jeroen, Februari 2013)
 #			- Bug fix, automatic revision update and better feedback (Pike, Februari 2013)
+#			- Turned auto copy on (Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -54,9 +55,9 @@
 gIvyWorkAround=1
 
 #
-# Change this to 1 when you want SSDT.aml to get copied to the target location.
+# Asks for your confirmation to copy SSDT_PR.aml to /Extra/SSDT.aml (example)
 #
-gAutoCopy=0
+gAutoCopy=1
 
 #
 # This is the target location that SSDT.aml will be copied to.
@@ -101,7 +102,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=3.8
+gScriptVersion=3.9
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1446,11 +1447,16 @@ if ((gCallIasl)); then
     "$iasl" $gSsdtPR
 
     #
-    # Copy SSDT_PR.aml to target location
+    # Copy SSDT_PR.aml to /Extra/SSDT.aml (example)
     #
     if (($gAutoCopy)); then
-        _setDestinationPath
-        cp $gSsdtPR ${gDestinationPath}${gDestinationFile}
+        if [ -f ${gPath}/${gSsdtID}.aml ]; then
+            read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
+            case "$choice" in
+                y|Y ) _setDestinationPath
+                      cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile};;
+            esac
+        fi
     fi
 
 fi
@@ -1460,5 +1466,4 @@ if ((gCallOpen)); then
 fi
 
 exit 0
-
 #================================================================================

From 68d722ed2abc467d8df2b9839e92db10e0398e6c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 07:39:42 +0100
Subject: [PATCH 276/623] Jeroen testing with Pike's account

---
 i386/libsaio/cpu.c                    |  2 +-
 i386/libsaio/cpu/Intel/dynamic_data.h | 22 ++++++++++++++--------
 i386/libsaio/cpu/essentials.h         |  2 +-
 i386/libsaio/platform.h               |  9 +++++++++
 i386/libsaio/smbios/model_data.h      | 26 ++++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/i386/libsaio/cpu.c b/i386/libsaio/cpu.c
index f81cd76..5cdeefb 100644
--- a/i386/libsaio/cpu.c
+++ b/i386/libsaio/cpu.c
@@ -25,7 +25,7 @@
 uint8_t getTDP(void)
 {
 	uint8_t		powerUnit = bitfield32(rdmsr64(MSR_RAPL_POWER_UNIT), 3, 0);
-	uint32_t	powerLimit = bitfield32(rdmsr64(MSR_PKG_RAPL_POWER_LIMIT), 14, 0);
+	uint32_t	powerLimit = bitfield32(rdmsr64(MSR_PKG_POWER_LIMIT), 14, 0);
 
 	uint8_t		tdp = (powerLimit / (1 << powerUnit));
 
diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index fc63c5f..8223f6a 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -187,12 +187,11 @@ void initCPUStruct(void)
 
 	printf("C-State limit   : %d\n", (msr & 7));
 
-	printf("C1-State enabled: %s\n", ((getCachedCPUID(LEAF_5, edx) >>  4) & 0xf) ? "true" : "false"); // C1
-	printf("C3-State enabled: %s\n", ((getCachedCPUID(LEAF_5, edx) >>  8) & 0xf) ? "true" : "false"); // C3
-	printf("C6-State enabled: %s\n", ((getCachedCPUID(LEAF_5, edx) >> 12) & 0xf) ? "true" : "false"); // C6
-	printf("C7-State enabled: %s\n", ((getCachedCPUID(LEAF_5, edx) >> 16) & 0xf) ? "true" : "false"); // C7
-
-	printf("MWAIT supported : %s\n", (getCachedCPUID(LEAF_5, ecx) & 1) ? "true" : "false");
+	printf("Number of C0 sub C-states supported using MWAIT: %d\n", ( getCachedCPUID(LEAF_5, edx)        & 0xf));
+	printf("Number of C1 sub C-states supported using MWAIT: %d\n", ((getCachedCPUID(LEAF_5, edx) >>  4) & 0xf));
+	printf("Number of C2 sub C-states supported using MWAIT: %d\n", ((getCachedCPUID(LEAF_5, edx) >>  8) & 0xf));
+	printf("Number of C3 sub C-states supported using MWAIT: %d\n", ((getCachedCPUID(LEAF_5, edx) >> 12) & 0xf));
+	printf("Number of C4 sub C-states supported using MWAIT: %d\n", ((getCachedCPUID(LEAF_5, edx) >> 16) & 0xf));
 
 	_CPU_DEBUG_SLEEP(5);
 #endif
@@ -406,11 +405,18 @@ void initCPUStruct(void)
 #endif
 					qpiSpeed = 0; // No QPI but DMI for Sandy Bridge processors.
 					
+					// Disable C1/C3 state auto demotion i.e. it won't change C3/C6/C7 requests to C1/C3.
+					wrmsr64(MSR_PKG_CST_CONFIG_CONTROL, 0x18000003ULL);
+
 					// Disable EIST Hardware coordination (letting AICPUPM.kext handle it).
 					msr = rdmsr64(MSR_MISC_PWR_MGMT);
-					wrmsr64(MSR_MISC_PWR_MGMT, msr | 1);
+					wrmsr64(MSR_MISC_PWR_MGMT, (msr | 1));
+
+					// Disable I/O MWAIT Redirection.
+					// msr = rdmsr64(MSR_PKG_CST_CONFIG_CONTROL);
+					// wrmsr64(MSR_MISC_PWR_MGMT, (msr & 0xFFFEFBFF));
 
-					checkFlexRatioMSR(); 
+					checkFlexRatioMSR();
 				}
 #endif // #if INTEL_CORE_TECHNOLOGY
 				fsbFrequency = ((tscFrequency / maxBusRatio) - OC_BUSRATIO_CORRECTION);
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index f955ad5..7ad17c1 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -73,7 +73,7 @@
 // Sandy Bridge & JakeTown specific 'Running Average Power Limit' MSR's.
 #define MSR_RAPL_POWER_UNIT			0x606
 
-#define MSR_PKG_RAPL_POWER_LIMIT	0x610
+#define MSR_PKG_POWER_LIMIT			0x610
 #define MSR_PKG_ENERGY_STATUS		0x611
 #define MSR_PKG_PERF_STATUS			0x613
 #define MSR_PKG_POWER_INFO			0x614
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 9a797f7..2845d91 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -54,12 +54,21 @@
 // Additional model selectors to select a specific target model.
 //------------------------------------------------------------------------------
 
+<<<<<<< HEAD
 
 #define IMAC_131				(IMAC | (4 << 15))
 #define IMAC_122				(IMAC | (3 << 15))
 #define IMAC_121				(IMAC | (2 << 15))
 #define IMAC_111				(IMAC | (1 << 15))       
 #define IMAC_132				IMAC                    // Defaults to iMac13,2
+=======
+#define IMAC_111				IMAC | (1 << 15)
+#define IMAC_121				IMAC | (2 << 15)
+#define IMAC_122				IMAC | (3 << 15)
+#define IMAC_131				IMAC | (4 << 15)
+#define IMAC_132				IMAC | (5 << 15)
+// #define IMAC_132				IMAC					// Defaults to iMac13,2
+>>>>>>> Jeroen testing with Pike's account
 
 #define MACBOOK_41				MACBOOK					// Defaults to MacBook4,1
 
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index f39d953..7336411 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -32,16 +32,30 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"iMac"
 
+<<<<<<< HEAD
 	#if (TARGET_MODEL == IMAC_131)
 		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
 		#define SMB_PRODUCT_NAME	"iMac13,1"
 		#define SMB_BOARD_PRODUCT	"Mac-00BE6ED71E35EB86"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '1' }
+=======
+	#if (TARGET_MODEL == IMAC_111)
+		#define SMB_BIOS_VERSION	"IM111.88Z.0034.B00.0910301727"
+		#define SMB_PRODUCT_NAME	"iMac11,1"
+		#define SMB_BOARD_PRODUCT	"Mac-F2268DAE"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '1', ',', '1' }
+	#elif // Defaults to iMac12,1
+		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
+		#define SMB_PRODUCT_NAME	"iMac12,1"
+		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
+>>>>>>> Jeroen testing with Pike's account
 	#elif (TARGET_MODEL == IMAC_122)
 		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
 		#define SMB_PRODUCT_NAME	"iMac12,2"
 		#define SMB_BOARD_PRODUCT	"Mac-942B5BF58194151B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '2' }
+<<<<<<< HEAD
     #elif (TARGET_MODEL == IMAC_121)
         #define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
         #define SMB_PRODUCT_NAME	"iMac12,1"
@@ -57,6 +71,18 @@
         #define SMB_PRODUCT_NAME	"iMac13,2"
         #define SMB_BOARD_PRODUCT	"Mac-FC02E91DDD3FA6A4"
         #define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '2' }
+=======
+	#elif (TARGET_MODEL == IMAC_131)
+		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
+		#define SMB_PRODUCT_NAME	"iMac13,1"
+		#define SMB_BOARD_PRODUCT	"Mac-00BE6ED71E35EB86"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '1' }
+	#else // Defaults to iMac13,2
+		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
+		#define SMB_PRODUCT_NAME	"iMac13,2"
+		#define SMB_BOARD_PRODUCT	"Mac-FC02E91DDD3FA6A4"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '2' }
+>>>>>>> Jeroen testing with Pike's account
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From 5840a21cb64fd7aa8f8181d2fb047a69385c7725 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 07:42:55 +0100
Subject: [PATCH 277/623] Jeroen fixing his commit errors with Pike's account

---
 i386/libsaio/platform.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 2845d91..16225f1 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -54,21 +54,11 @@
 // Additional model selectors to select a specific target model.
 //------------------------------------------------------------------------------
 
-<<<<<<< HEAD
-
 #define IMAC_131				(IMAC | (4 << 15))
 #define IMAC_122				(IMAC | (3 << 15))
 #define IMAC_121				(IMAC | (2 << 15))
 #define IMAC_111				(IMAC | (1 << 15))       
 #define IMAC_132				IMAC                    // Defaults to iMac13,2
-=======
-#define IMAC_111				IMAC | (1 << 15)
-#define IMAC_121				IMAC | (2 << 15)
-#define IMAC_122				IMAC | (3 << 15)
-#define IMAC_131				IMAC | (4 << 15)
-#define IMAC_132				IMAC | (5 << 15)
-// #define IMAC_132				IMAC					// Defaults to iMac13,2
->>>>>>> Jeroen testing with Pike's account
 
 #define MACBOOK_41				MACBOOK					// Defaults to MacBook4,1
 

From 183eb85261b1870ae366d204b297a84715694d13 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 07:49:16 +0100
Subject: [PATCH 278/623] Jeroen fixing his commit errors with Pike's account

---
 i386/libsaio/smbios/model_data.h | 41 ++++++++------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 7336411..ab5cb4c 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -32,13 +32,6 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"iMac"
 
-<<<<<<< HEAD
-	#if (TARGET_MODEL == IMAC_131)
-		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
-		#define SMB_PRODUCT_NAME	"iMac13,1"
-		#define SMB_BOARD_PRODUCT	"Mac-00BE6ED71E35EB86"
-		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '1' }
-=======
 	#if (TARGET_MODEL == IMAC_111)
 		#define SMB_BIOS_VERSION	"IM111.88Z.0034.B00.0910301727"
 		#define SMB_PRODUCT_NAME	"iMac11,1"
@@ -49,40 +42,26 @@
 		#define SMB_PRODUCT_NAME	"iMac12,1"
 		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
->>>>>>> Jeroen testing with Pike's account
 	#elif (TARGET_MODEL == IMAC_122)
 		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
 		#define SMB_PRODUCT_NAME	"iMac12,2"
 		#define SMB_BOARD_PRODUCT	"Mac-942B5BF58194151B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '2' }
-<<<<<<< HEAD
-    #elif (TARGET_MODEL == IMAC_121)
-        #define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
-        #define SMB_PRODUCT_NAME	"iMac12,1"
-        #define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
-        #define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
-     #elif (TARGET_MODEL == IMAC_111)
-        #define SMB_BIOS_VERSION	"IM111.88Z.0034.B00.0910301727"
-        #define SMB_PRODUCT_NAME	"iMac11,1"
-        #define SMB_BOARD_PRODUCT	"Mac-F2268DAE"
-        #define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '1', ',', '1' }
-	#else // Defaults to iMac13,2
-        #define SMB_BIOS_VERSION	"IM131.88Z.010A.B05.1211151146"
-        #define SMB_PRODUCT_NAME	"iMac13,2"
-        #define SMB_BOARD_PRODUCT	"Mac-FC02E91DDD3FA6A4"
-        #define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '2' }
-=======
-	#elif (TARGET_MODEL == IMAC_131)
-		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
-		#define SMB_PRODUCT_NAME	"iMac13,1"
-		#define SMB_BOARD_PRODUCT	"Mac-00BE6ED71E35EB86"
-		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '1' }
+	#elif (TARGET_MODEL == IMAC_121)
+		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
+		#define SMB_PRODUCT_NAME	"iMac12,1"
+		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
+	#elif (TARGET_MODEL == IMAC_111)
+		#define SMB_BIOS_VERSION	"IM111.88Z.0034.B00.0910301727"
+		#define SMB_PRODUCT_NAME	"iMac11,1"
+		#define SMB_BOARD_PRODUCT	"Mac-F2268DAE"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '1', ',', '1' }
 	#else // Defaults to iMac13,2
 		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
 		#define SMB_PRODUCT_NAME	"iMac13,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FC02E91DDD3FA6A4"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '2' }
->>>>>>> Jeroen testing with Pike's account
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From 709b112891d4205122ead4677afca877a2bcf019 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 07:54:35 +0100
Subject: [PATCH 279/623] Fixing path typo

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index fc67ed1..a233384 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -870,7 +870,7 @@ function _setDestinationPath
     #
     # Checking for RevoBoot
     #
-    if [ -d /EFI/ACPI ]; then
+    if [ -d /Extra/ACPI ]; then
         gDestinationPath="/Extra/ACPI/"
     fi
 

From 4de4cf9b5c6daf9bd4d6fa0c6118b83f9577c67f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 07:55:11 +0100
Subject: [PATCH 280/623] Adding iasl for curl updates

---
 i386/libsaio/acpi/Tools/iasl | Bin 0 -> 1159340 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 i386/libsaio/acpi/Tools/iasl

diff --git a/i386/libsaio/acpi/Tools/iasl b/i386/libsaio/acpi/Tools/iasl
new file mode 100755
index 0000000000000000000000000000000000000000..36fd8a9596948803e75deccc2e352aa48f9afe8c
GIT binary patch
literal 1159340
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%0D|(-cXl*D&k}9Nt)>FT2_BD?HS87zrYcB
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%0D&d}wW6%QW6a1y<nS*Yz9190
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

literal 0
HcmV?d00001


From 6971545990da611f141ec0a0c63f40facab18a61 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 09:18:23 +0100
Subject: [PATCH 281/623] Updating script to v4.0

Sandy Bridge CPU's added
Download IASL if we can't find it in /usr/local/bin/
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 46 +++++++++++-----------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index a233384..e13523e 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 3.9 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 4.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -39,6 +39,7 @@
 #			- Improved/faster search algorithm to locate iasl (Jeroen, Februari 2013)
 #			- Bug fix, automatic revision update and better feedback (Pike, Februari 2013)
 #			- Turned auto copy on (Jeroen, Februari 2013)
+#			- IASL search in ~/ssdtPRGen.app added (Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -102,7 +103,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=3.9
+gScriptVersion=4.0
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -137,6 +138,9 @@ gProcessorNumber=""
 #
 
 gSandyBridgeCPUList=(
+i5-2500K,95,1600,3300,3700,4,4
+i7-2600K,95,1600,3400,3800,4,8
+i7-2700K,95,1600,3500,3900,4,8
 # E3-1200 Xeon Processor Series
 E3-1290,95,0,3600,4000,4,8
 E3-1280,95,0,3500,3900,4,8
@@ -834,32 +838,15 @@ function _findIasl()
         #
         # First we do a quick lookup of iasl (should be there after the first run)
         #
-        if [ -f /usr/local/bin/iasl ];
-            then
-                iasl=/usr/local/bin/iasl
-            else
-                # Note: iasl5 is the name used by MaciASL
-                printf '\nSearching for iasl5 in the /Applications folder... '
-                iasl=`find /Applications -name iasl5 -print -quit`
-
-                if [ "$iasl" == "" ];
-                    then
-                        printf 'Not found.\nSearching for iasl in the /Applications folder... '
-                        iasl=`find /Applications -name iasl -print -quit`
-
-                        if [ "$iasl" == "" ]; then
-                            printf 'Not found. Disabling compiler feature'
-                            gCallIasl=0
-                        fi
-                fi
-
-                if ((gCallIasl)); then
-                    printf 'IASL found. Copying file... '
-                    cp "$iasl" /usr/local/bin/iasl
-                    printf 'Done.'
-                    iasl=/usr/local/bin/iasl
-                fi
+        if [ ! -f /usr/local/bin/iasl ]; then
+            echo -e
+            echo 'IASL not found. Downloading iasl...'
+            curl -o /usr/local/bin/iasl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl
+            chmod +x /usr/local/bin/iasl
+            echo 'Done.'
         fi
+
+        iasl=/usr/local/bin/iasl
     fi
 }
 
@@ -986,7 +973,9 @@ function _getCPUDataByProcessorNumber
         __searchList "gServerIvyBridgeCPUList[@]" $gServerCPU
     fi
 
-#   echo "gTypeCPU is $gTypeCPU"
+    if (!(($gTypeCPU))); then
+        __searchList "gSandyBridgeCPUList[@]" $gServerCPU
+    fi
 }
 
 #--------------------------------------------------------------------------------
@@ -1451,6 +1440,7 @@ if ((gCallIasl)); then
     #
     if (($gAutoCopy)); then
         if [ -f ${gPath}/${gSsdtID}.aml ]; then
+            echo -e
             read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
             case "$choice" in
                 y|Y ) _setDestinationPath

From bfe18b986d573272b08e1b0bbdae7ed699982a10 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 09:22:10 +0100
Subject: [PATCH 282/623] Fix typo

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index e13523e..d14b14c 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -39,7 +39,7 @@
 #			- Improved/faster search algorithm to locate iasl (Jeroen, Februari 2013)
 #			- Bug fix, automatic revision update and better feedback (Pike, Februari 2013)
 #			- Turned auto copy on (Jeroen, Februari 2013)
-#			- IASL search in ~/ssdtPRGen.app added (Jeroen, Februari 2013)
+#			- Download IASL if it isn't there where we expect it (Pike, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).

From 1514baead693e55056d26271810b93971f39d82f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 17:48:11 +0100
Subject: [PATCH 283/623] Taking care of permissions errors in
 ssdtPRGen.command

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index d14b14c..51a5369 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -841,8 +841,8 @@ function _findIasl()
         if [ ! -f /usr/local/bin/iasl ]; then
             echo -e
             echo 'IASL not found. Downloading iasl...'
-            curl -o /usr/local/bin/iasl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl
-            chmod +x /usr/local/bin/iasl
+            sudo curl -o /usr/local/bin/iasl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl
+            sudo chmod +x /usr/local/bin/iasl
             echo 'Done.'
         fi
 
@@ -1444,7 +1444,7 @@ if ((gCallIasl)); then
             read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
             case "$choice" in
                 y|Y ) _setDestinationPath
-                      cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile};;
+                      sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile};;
             esac
         fi
     fi

From 073b68721010cc5dc0debefd94f56abac04a98e5 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 17:48:48 +0100
Subject: [PATCH 284/623] Initial installation script for ssdtPRGen.app

---
 i386/libsaio/acpi/Tools/install.sh | 40 ++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100755 i386/libsaio/acpi/Tools/install.sh

diff --git a/i386/libsaio/acpi/Tools/install.sh b/i386/libsaio/acpi/Tools/install.sh
new file mode 100755
index 0000000..f4a9f3e
--- /dev/null
+++ b/i386/libsaio/acpi/Tools/install.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Installation script for ssdtPRGen.command
+#
+# Version 0.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+#
+# Updates:
+#			-
+#
+# Contributors:
+#
+
+#--------------------------------------------------------------------------------
+
+if [ -f ~/ssdtPRGen.command ];
+    then
+        open ~/ssdtPRGen.command
+    else
+        #
+        # Download script
+        #
+        curl -o ~/ssdtPRGen.command https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+
+        #
+        # Add execute rights
+        #
+        chmod +x ~/ssdtPRGen.command
+
+        #
+        # Maintain backward compatibility with older versions
+        #
+        ln -sf ~/ssdtPRGen.command ~/ssdtPRGen.sh
+
+        #
+        # Put a symbolic link to the script on the Desktop
+        #
+        ln -sf ~/ssdtPRGen.command ~/Desktop/ssdtPRGen.command
+fi
+
+exit 0

From fc4706a7fb646e6cebe9e284fff90742d1355d60 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 17:56:41 +0100
Subject: [PATCH 285/623] ssdtPRGen.app

---
 .../ssdtPRGen.app/Contents/MacOS/ssdtPRGen     | Bin 0 -> 9176 bytes
 "i386/libsaio/acpi/Tools/ssdtPRGen.app/Icon\r" |   0
 i386/libsaio/acpi/Tools/ssdtPRGen.zip          | Bin 0 -> 716637 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 i386/libsaio/acpi/Tools/ssdtPRGen.app/Contents/MacOS/ssdtPRGen
 create mode 100644 "i386/libsaio/acpi/Tools/ssdtPRGen.app/Icon\r"
 create mode 100644 i386/libsaio/acpi/Tools/ssdtPRGen.zip

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.app/Contents/MacOS/ssdtPRGen b/i386/libsaio/acpi/Tools/ssdtPRGen.app/Contents/MacOS/ssdtPRGen
new file mode 100755
index 0000000000000000000000000000000000000000..499c981cb16684e6c2196bfc0b913141c43b6130
GIT binary patch
literal 9176
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

literal 0
HcmV?d00001

diff --git "a/i386/libsaio/acpi/Tools/ssdtPRGen.app/Icon\r" "b/i386/libsaio/acpi/Tools/ssdtPRGen.app/Icon\r"
new file mode 100644
index 0000000..e69de29
diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.zip b/i386/libsaio/acpi/Tools/ssdtPRGen.zip
new file mode 100644
index 0000000000000000000000000000000000000000..83f943913d2d212a84954615d49bc59670e455b6
GIT binary patch
literal 716637
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

literal 0
HcmV?d00001


From 51eddd62af5e3f15bc7a06470b44b8f46ce92dc4 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 15 Feb 2013 18:38:49 +0100
Subject: [PATCH 286/623] no zip

---
 i386/libsaio/acpi/Tools/ssdtPRGen.zip | Bin 716637 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 i386/libsaio/acpi/Tools/ssdtPRGen.zip

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.zip b/i386/libsaio/acpi/Tools/ssdtPRGen.zip
deleted file mode 100644
index 83f943913d2d212a84954615d49bc59670e455b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 716637
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


From 7d85aa7c4e1eda7039a5f204569eac199b32b7c5 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 16 Feb 2013 02:42:08 +0100
Subject: [PATCH 287/623] Updating script to v4.1

Better feedback for Pike
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 51a5369..13a33ff 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 4.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 4.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -40,6 +40,7 @@
 #			- Bug fix, automatic revision update and better feedback (Pike, Februari 2013)
 #			- Turned auto copy on (Jeroen, Februari 2013)
 #			- Download IASL if it isn't there where we expect it (Pike, Februari 2013)
+#			- A sweet dreams update for Pike who wants better feedback (Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -103,7 +104,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=4.0
+gScriptVersion=4.1
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1221,7 +1222,7 @@ function _isRoot()
 function main()
 {
     printf "\nsdtPRGen.sh v$gScriptVersion Copyright (c) 2013 by Pike R. Alpha\n"
-    echo   '-----------------------------------------------------'
+    echo   '----------------------------------------------------------------'
 
     let modelSpecified=0
     let maxTurboFrequency=0
@@ -1263,7 +1264,14 @@ function main()
             fi
     fi
 
-    echo "$bridgeTypeString Core $gProcessorNumber processor installed"
+    _getBoardID
+
+    local modelID=$(_getModelName)
+    local cpu_type=$(_getCPUtype)
+    local currentSystemType=$(_getSystemType)
+
+    echo "Generating SSDT.dsl for a $modelID [$boardID]"
+    echo "$bridgeTypeString Core $gProcessorNumber processor [0x$cpu_type] setup"
 
     #
     # gTypeCPU is greater than 0 when the processor is found in one of the CPU lists
@@ -1333,7 +1341,7 @@ function main()
         fi
     fi
 
-    echo "$logicalCPUs logical CPU's detected with a Core Frequency of $frequency MHz"
+    echo "Number logical CPU's: $logicalCPUs (Core Frequency: $frequency MHz)"
 
     #
     # Check maxTurboFrequency
@@ -1378,13 +1386,6 @@ function main()
     _printScopeStart $turboStates $packageLength
     _printPackages $gTdp $frequency $maxTurboFrequency
 
-    _getBoardID
-
-    local modelID=$(_getModelName)
-
-    local cpu_type=$(_getCPUtype)
-    local currentSystemType=$(_getSystemType)
-
     if [ $gBridgeType -eq $IVY_BRIDGE ];
         then
             local cpuTypeString="07"

From 7f0d3b9f4de8476547208752d6b9310d78d4883a Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 16 Feb 2013 03:17:27 +0100
Subject: [PATCH 288/623] No more IB specific warnings for SB setups

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 51 +++++++++++++++-------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 13a33ff..81acc82 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -116,9 +116,10 @@ gPath=~/Desktop
 gSsdtID=SSDT_PR
 gSsdtPR=${gPath}/${gSsdtID}.dsl
 
-gDesktopCPU=1
-gMobileCPU=2
-gServerCPU=3
+gSandyCPU=1
+gDesktopCPU=2
+gMobileCPU=3
+gServerCPU=4
 
 let gSystemType=0
 
@@ -975,7 +976,7 @@ function _getCPUDataByProcessorNumber
     fi
 
     if (!(($gTypeCPU))); then
-        __searchList "gSandyBridgeCPUList[@]" $gServerCPU
+        __searchList "gSandyBridgeCPUList[@]" $gSandyCPU
     fi
 }
 
@@ -1234,19 +1235,15 @@ function main()
 
     _getCPUNumberFromBrandString
 
-    if [[ $# -eq 1 ]]; then
-        if [[ $1 == "" ]];
-            then
-                if [[ $gProcessorNumber != 0 ]]; then
-                    let model=0x3A
-                fi
-            else
+    if [[ $# -eq 1 ]];
+        then
+            if [[ $1 != "" ]]; then
                 if (( ("${1:0:4}" == "i3-3") || (${1:0:4} == "i5-3") || (${1:0:4} == "i7-3") || (${1:0:1} == "E") )); then
                     let model=0x3A
                     let modelSpecified=1
                     gProcessorNumber=$1
                 fi
-        fi
+            fi
     fi
 
     if (($model==0x2A || $model==0x2D));
@@ -1254,6 +1251,8 @@ function main()
             let gTdp=95
             let gBridgeType=2
             local bridgeTypeString="Sandy Bridge"
+
+            _getCPUDataByProcessorNumber
         else
             let gTdp=77
             let gBridgeType=4
@@ -1406,20 +1405,26 @@ function main()
 
     _showLowPowerStates
 
-    if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
-        echo "Warning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
-    fi
-
-    if [ $gSystemType -eq 0 ];
+    #
+    # Some IB CPUPM specific configuration checks
+    #
+    if [ $gBridgeType -eq $IVY_BRIDGE ];
         then
-            echo "Warning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
-        else
-            if [ "$gMacModelIdentifier" != "$modelID" ]; then
-                echo "Error: board-id [$boardID] and model [$modelID] mismatch"
+            if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
+                echo "Warning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
             fi
 
-            if [ $currentSystemType -ne $gSystemType ]; then
-                echo "Warning: 'system-type' may be set improperly ($currentSystemType instead of $gSystemType)"
+            if [ $gSystemType -eq 0 ];
+                then
+                    echo "Warning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
+                else
+                    if [ "$gMacModelIdentifier" != "$modelID" ]; then
+                        echo "Error: board-id [$boardID] and model [$modelID] mismatch"
+                    fi
+
+                    if [ $currentSystemType -ne $gSystemType ]; then
+                        echo "Warning: 'system-type' may be set improperly ($currentSystemType instead of $gSystemType)"
+                    fi
             fi
     fi
 }

From b1a3f2b13d7bafda1c189336648c073f51f830e9 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 17 Feb 2013 16:48:14 +0100
Subject: [PATCH 289/623] AppleVTD wants DMAR

---
 i386/libsaio/acpi/essentials.h  | 16 ++++++++++------
 i386/libsaio/acpi/static_data.h |  6 ++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/acpi/essentials.h b/i386/libsaio/acpi/essentials.h
index 255e179..a68a031 100644
--- a/i386/libsaio/acpi/essentials.h
+++ b/i386/libsaio/acpi/essentials.h
@@ -64,6 +64,7 @@ static ACPITable customTables[] =
 #if LOAD_MODEL_SPECIFIC_ACPI_DATA
 	// Essential tables.
 	{ "APIC",		APIC_Table,			sizeof(APIC_Table),			false,	0,	""	},
+	{ "DMAR",		DMAR_Table,			sizeof(DMAR_Table),			false,	0,	""	},
 	{ "ECDT",		ECDT_Table,			sizeof(ECDT_Table),			false,	0,	""	},
 	{ "HPET",		HPET_Table,			sizeof(HPET_Table),			false,	0,	""	},
 	{ "MCFG",		MCFG_Table,			sizeof(MCFG_Table),			false,	0,	""	},
@@ -84,6 +85,7 @@ static ACPITable customTables[] =
 #else
 	// Essential tables.
 	{ "APIC",		APIC_Table,			sizeof(APIC_Table),			false,	0	},
+	{ "DMAR",		DMAR_Table,			sizeof(DMAR_Table),			false,	0	},
 	{ "ECDT",		ECDT_Table,			sizeof(ECDT_Table),			false,	0	},
 	{ "HPET",		HPET_Table,			sizeof(HPET_Table),			false,	0	},
 	{ "MCFG",		MCFG_Table,			sizeof(MCFG_Table),			false,	0	},
@@ -112,6 +114,7 @@ typedef enum
 
 	// Essential tables.
 	APIC,
+	DMAR,
     ECDT,
 	HPET,
 	MCFG,
@@ -143,19 +146,19 @@ typedef enum
 
 
 // ACPI table signatures in little endian format.
-#define RSDP_TABLE_SIGNATURE 0x50445352
-#define RSDT_TABLE_SIGNATURE 0x54445352
-#define XSDT_TABLE_SIGNATURE 0x54445358
 #define APIC_TABLE_SIGNATURE 0x43495041
-#define ECDT_TABLE_SIGNATURE 0x54444345
+#define DMAR_TABLE_SIGNATURE 0x52414d44
 #define DSDT_TABLE_SIGNATURE 0x54445344
+#define ECDT_TABLE_SIGNATURE 0x54444345
 #define FACP_TABLE_SIGNATURE 0x50434146
 #define FACS_TABLE_SIGNATURE 0x53434146
 #define HPET_TABLE_SIGNATURE 0x54455048
-#define SBST_TABLE_SIGNATURE 0x54534253
 #define MCFG_TABLE_SIGNATURE 0x4746434d
+#define RSDP_TABLE_SIGNATURE 0x50445352
+#define RSDT_TABLE_SIGNATURE 0x54445352
+#define SBST_TABLE_SIGNATURE 0x54534253
 #define SSDT_TABLE_SIGNATURE 0x54445353
-
+#define XSDT_TABLE_SIGNATURE 0x54445358
 
 typedef struct acpi_2_tables
 {
@@ -169,6 +172,7 @@ typedef struct acpi_2_tables
 static ACPITables essentialTables[] =
 {
 	{ APIC, APIC_TABLE_SIGNATURE,	replaceTable,		kReplaceTable | kAddTable	},
+	{ DMAR, DMAR_TABLE_SIGNATURE,	NULL,				kReplaceTable | kAddTable	},
 	{ NONE,	FACP_TABLE_SIGNATURE,	patchFACPTable,		kPatchTable					},
 	{ HPET, HPET_TABLE_SIGNATURE,	replaceTable,		kReplaceTable				},
 	{ MCFG, MCFG_TABLE_SIGNATURE,	NULL,				kReplaceTable				},
diff --git a/i386/libsaio/acpi/static_data.h b/i386/libsaio/acpi/static_data.h
index e9bb4e7..8aa3ce0 100755
--- a/i386/libsaio/acpi/static_data.h
+++ b/i386/libsaio/acpi/static_data.h
@@ -21,6 +21,12 @@ static uint32_t APIC_Table[] =
 #endif
 };
 
+static uint32_t DMAR_Table[] =
+{
+#if STATIC_DMAR_TABLE_INJECTION
+	STATIC_DMAR_TABLE_DATA
+#endif
+};
 
 static uint32_t ECDT_Table[] =
 {

From 87b774518fe16476fce90a839c727f45ea6eabb6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 17 Feb 2013 16:53:00 +0100
Subject: [PATCH 290/623] Fix for compiler error

no member named 'fileName' in 'struct static_acpi_2_table' with
DEBUG_ACPI set to 1
---
 i386/libsaio/acpi/patcher.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 72f9dc0..52e1503 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -263,7 +263,7 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 	{
 #if STATIC_DSDT_TABLE_INJECTION
 		_ACPI_DEBUG_DUMP("static DSDT data");
-#else	// STATIC_DSDT_TABLE_INJECTION
+#elif LOAD_MODEL_SPECIFIC_ACPI_DATA
 		_ACPI_DEBUG_DUMP("%s", customTables[DSDT].fileName);
 #endif	// STATIC_DSDT_TABLE_INJECTION
 		_ACPI_DEBUG_DUMP(" @ 0x%x\n", customTables[DSDT].tableAddress);

From e5b02da6f312611f53277a456b72e99ea9544775 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 17 Feb 2013 16:53:16 +0100
Subject: [PATCH 291/623] Experiment

---
 i386/libsaio/cpu/Intel/dynamic_data.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 8223f6a..65a493c 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -406,7 +406,7 @@ void initCPUStruct(void)
 					qpiSpeed = 0; // No QPI but DMI for Sandy Bridge processors.
 					
 					// Disable C1/C3 state auto demotion i.e. it won't change C3/C6/C7 requests to C1/C3.
-					wrmsr64(MSR_PKG_CST_CONFIG_CONTROL, 0x18000003ULL);
+					wrmsr64(MSR_PKG_CST_CONFIG_CONTROL, 0x1E000003ULL);
 
 					// Disable EIST Hardware coordination (letting AICPUPM.kext handle it).
 					msr = rdmsr64(MSR_MISC_PWR_MGMT);

From 59efc98b52a6a3412565825236dc3fae5d15996f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 18 Feb 2013 05:14:27 +0100
Subject: [PATCH 292/623] First set of Haswell processors added

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 81acc82..32aacd2 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -41,6 +41,7 @@
 #			- Turned auto copy on (Jeroen, Februari 2013)
 #			- Download IASL if it isn't there where we expect it (Pike, Februari 2013)
 #			- A sweet dreams update for Pike who wants better feedback (Jeroen, Februari 2013)
+#			- First set of Haswell processors added (Pike/Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -120,6 +121,7 @@ gSandyCPU=1
 gDesktopCPU=2
 gMobileCPU=3
 gServerCPU=4
+gHaswellCPU=5
 
 let gSystemType=0
 
@@ -271,6 +273,29 @@ i3-3120M,35,0,2500,0,2,4
 i3-3110M,35,0,2400,0,2,4
 )
 
+#
+# New Haswell processors with HD-4600 graphics
+#
+
+gDesktopHaswellCPUList=(
+# Socket 1150 (Standard Power)
+i7-4770K,84,00,3500,3900,4,8
+i7-4770,84,0,3400,3900,4,8
+i5-4670K,84,0,3400,3800,4,4
+i5-4670,84,0,3400,3800,4,4
+i5-4570,84,0,3200,3600,4,4
+i5-4430,84,0,3000,3200,4,4
+# Socket 1150 (Low Power)
+i7-4770S,65,0,3100,3900,4,8
+i7-4770T,45,0,2500,3700,4,8
+i7-4765T,35,0,2000,3000,4,8
+i5-4670S,65,0,3100,3800,4,4
+i5-4670T,45,0,2300,3300,4,4
+i5-4570S,65,0,2900,3600,4,4
+i5-4570T,35,0,2900,3600,2,4
+i5-4430S,65,0,2700,3200,4,4
+)
+
 #--------------------------------------------------------------------------------
 
 function _printHeader()
@@ -978,6 +1003,10 @@ function _getCPUDataByProcessorNumber
     if (!(($gTypeCPU))); then
         __searchList "gSandyBridgeCPUList[@]" $gSandyCPU
     fi
+
+    if (!(($gTypeCPU))); then
+        __searchList "gDesktopHaswellCPUList[@]" $gHaswellCPU
+    fi
 }
 
 #--------------------------------------------------------------------------------

From 71687183ffa571f8e956fdece6dbbcaaaa0fcd5b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 18 Feb 2013 16:33:59 +0100
Subject: [PATCH 293/623] Updating script to v4.2

More rigid testing for user errors
Getting ready for new Haswell setups
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 257 ++++++++++++++++-----------
 1 file changed, 156 insertions(+), 101 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 32aacd2..c3316d9 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 4.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 4.2 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -42,6 +42,8 @@
 #			- Download IASL if it isn't there where we expect it (Pike, Februari 2013)
 #			- A sweet dreams update for Pike who wants better feedback (Jeroen, Februari 2013)
 #			- First set of Haswell processors added (Pike/Jeroen, Februari 2013)
+#			- More rigid testing for user errors (Pike/Jeroen, Februari 2013)
+#			- Getting ready for new Haswell setups (Pike/Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -55,12 +57,12 @@
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
 #
-gIvyWorkAround=1
+let gIvyWorkAround=1
 
 #
 # Asks for your confirmation to copy SSDT_PR.aml to /Extra/SSDT.aml (example)
 #
-gAutoCopy=1
+let gAutoCopy=1
 
 #
 # This is the target location that SSDT.aml will be copied to.
@@ -79,22 +81,22 @@ gDestinationFile="SSDT.aml"
 #
 # Note: Will be set to 0 when we failed to locate a copy of iasl!
 #
-gCallIasl=1
+let gCallIasl=1
 
 #
 # A value of 1 will make this script open SSDT_PR.dsl in the editor of your choice. 
 #
-gCallOpen=0
+let gCallOpen=0
 
 #
 # Change this to 0 to stop it from injecting debug data.
 #
-gDebug=1
+let gDebug=1
 
 #
 # Lowest possible idle frequency (user configurable). Also known as Low Frequency Mode.
 #
-gBaseFrequency=1600
+let gBaseFrequency=1600
 
 #
 # Change this label to "P00" when your DSDT uses 'P00n' instead of 'CPUn'.
@@ -105,7 +107,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=4.1
+gScriptVersion=4.2
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -120,23 +122,34 @@ gSsdtPR=${gPath}/${gSsdtID}.dsl
 gSandyCPU=1
 gDesktopCPU=2
 gMobileCPU=3
-gServerCPU=4
-gHaswellCPU=5
+let gServerCPU=4
+let gHaswellCPU=5
 
 let gSystemType=0
 
-gACST_CPU0=13
-gACST_CPU1=7
+let gACST_CPU0=13
+let gACST_CPU1=7
 
 gMacModelIdentifier=""
 
-IVY_BRIDGE=4
-SANDY_BRIDGE=2
+let HASWELL=8
+let IVY_BRIDGE=4
+let SANDY_BRIDGE=2
 
-gTypeCPU=0
+let gTypeCPU=0
 gProcessorData="Unknown CPU"
 gProcessorNumber=""
 
+#
+# Maximum Turbo Clock Speed (user configurable)
+#
+let gMaxOCFrequency=5000
+
+let MAX_TURBO_FREQUENCY_ERROR=2
+let MAX_TDP_ERROR=3
+let TARGET_CPU_ERROR=4
+let PROCESSOR_NUMBER_ERROR=5
+
 #
 # Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
 #
@@ -771,33 +784,32 @@ function _printScopeACST()
 
 function _printScopeCPUn()
 {
-	let currentCPU=1;
-
-	while [ $currentCPU -lt $1 ]; do
-		echo ''                                                                         >> $gSsdtPR
-		echo '    Scope (\_PR.'$gProcLabel$currentCPU')'                                >> $gSsdtPR
-		echo '    {'                                                                    >> $gSsdtPR
-		echo '        Method (APSS, 0, NotSerialized) { Return (\_PR.'$gProcLabel'0.APSS) }' >> $gSsdtPR
-
-		#
-		# IB CPUPM tries to parse/execute CPUn.ACST (see debug data) and thus we add
-		# this method, conditionally, since SB CPUPM doesn't seem to care about it.
-		#
-		if [ $gBridgeType -eq $IVY_BRIDGE ]
-			then
-				if [ $currentCPU -eq 1 ];
-					then
-						_printScopeACST 1
-					else
-						echo '        Method (ACST, 0, NotSerialized) { Return (\_PR.'$gProcLabel'1.ACST ()) }' >> $gSsdtPR
-				fi
-		fi
-
-		echo '    }'                                                                    >> $gSsdtPR
-		let currentCPU+=1
-	done
-
-	echo '}'                                                                            >> $gSsdtPR
+    let currentCPU=1;
+
+    while [ $currentCPU -lt $1 ]; do
+        echo ''                                                                         >> $gSsdtPR
+        echo '    Scope (\_PR.'$gProcLabel$currentCPU')'                                >> $gSsdtPR
+        echo '    {'                                                                    >> $gSsdtPR
+        echo '        Method (APSS, 0, NotSerialized) { Return (\_PR.'$gProcLabel'0.APSS) }' >> $gSsdtPR
+
+        #
+        # IB CPUPM tries to parse/execute CPUn.ACST (see debug data) and thus we add
+        # this method, conditionally, since SB CPUPM doesn't seem to care about it.
+        #
+        if [ $gBridgeType -ge $IVY_BRIDGE ]; then
+            if [ $currentCPU -eq 1 ];
+                then
+                    _printScopeACST 1
+                else
+                    echo '        Method (ACST, 0, NotSerialized) { Return (\_PR.'$gProcLabel'1.ACST ()) }' >> $gSsdtPR
+            fi
+        fi
+
+        echo '    }'                                                                    >> $gSsdtPR
+        let currentCPU+=1
+    done
+
+    echo '}'                                                                            >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
@@ -1044,7 +1056,7 @@ function _showLowPowerStates()
     #
     __print $gACST_CPU0 0
 
-    if ((gBridgeType == $IVY_BRIDGE)); then
+    if [ $gBridgeType -ge $IVY_BRIDGE ]; then
         __print $gACST_CPU1 1
     fi
 }
@@ -1231,20 +1243,26 @@ function _initIvyBridgeSetup()
 	esac
 }
 
-#--------------------------------------------------------------------------------
-#
-# Only administrators (root) are allowed to run this script.
-#
 #--------------------------------------------------------------------------------
 
-function _isRoot()
+function _exitWithError()
 {
-    if [ $(id -u) != 0 ]; then
-        echo "This script must be run as root" 1>&2
-        exit 1
-    fi
-
-    echo 1
+    case "$1" in
+        2) echo -e "\nError: 'MaxTurboFrequency' must be in the range of $frequency-gMaxOCFrequency... exiting\n" 1>&2
+           exit 2
+           ;;
+        3) echo -e "\nError: 'TDP' must be in the range of 10-150 Watts... exiting\n" 1>&2
+           exit 3
+           ;;
+        4) echo -e "\nError: 'BridgeType' must be 0, 1 or 2... exiting\n" 1>&2
+           exit 4
+           ;;
+        5) echo -e "\nError: Unknown processor number... exiting\n" 1>&2
+           exit 5
+           ;;
+        *) exit 1
+           ;;
+    esac
 }
 
 #--------------------------------------------------------------------------------
@@ -1264,32 +1282,45 @@ function main()
 
     _getCPUNumberFromBrandString
 
-    if [[ $# -eq 1 ]];
-        then
-            if [[ $1 != "" ]]; then
-                if (( ("${1:0:4}" == "i3-3") || (${1:0:4} == "i5-3") || (${1:0:4} == "i7-3") || (${1:0:1} == "E") )); then
-                    let model=0x3A
-                    let modelSpecified=1
-                    gProcessorNumber=$1
-                fi
+    if [[ $# -eq 1 ]]; then
+        if [[ $1 != "" ]]; then
+            # Ivy Bridge checks
+            if [[ ${1:0:4} == "i3-3" || ${1:0:4} == "i5-3" || ${1:0:4} == "i7-3" || ${1:2:2} == "E3" ]]; then
+                let model=0x3A
+                let modelSpecified=1
+                gProcessorNumber=$1
             fi
+            # Haswell checks
+            if [[ ${1:0:4} == "i3-4" || ${1:0:4} == "i5-4" || ${1:0:4} == "i7-4" || ${1:2:2} == "E4" ]]; then
+                let model=0x4A
+                let modelSpecified=1
+                gProcessorNumber=$1
+            fi
+        fi
     fi
 
-    if (($model==0x2A || $model==0x2D));
-        then
-            let gTdp=95
-            let gBridgeType=2
-            local bridgeTypeString="Sandy Bridge"
+    if (($model==0x2A || $model==0x2D)); then
+        let gTdp=95
+        let gBridgeType=2
+        local bridgeTypeString="Sandy Bridge"
 
-            _getCPUDataByProcessorNumber
-        else
-            let gTdp=77
-            let gBridgeType=4
-            local bridgeTypeString="Ivy Bridge"
+        _getCPUDataByProcessorNumber
+    fi
 
-            if (($model==0x3A || $model==0x3B)); then
-                _getCPUDataByProcessorNumber
-            fi
+    if (($model==0x3A || $model==0x3B)); then
+        let gTdp=77
+        let gBridgeType=4
+        local bridgeTypeString="Ivy Bridge"
+
+        _getCPUDataByProcessorNumber
+    fi
+
+    if (($model==0x4A || $model==0x4B)); then
+        let gTdp=84
+        let gBridgeType=8
+        local bridgeTypeString="Haswell"
+
+        _getCPUDataByProcessorNumber
     fi
 
     _getBoardID
@@ -1321,7 +1352,7 @@ function main()
             let logicalCPUs=${cpuData[6]}
             IFS=$ifs
 
-            echo 'Using a maximum TDP of '$gTdp' Watt, as specified by Intel'
+            echo 'With a maximum TDP of '$gTdp' Watt, as specified by Intel'
 
             #
             # Check Low Frequency Mode (may be 0 aka still unknown)
@@ -1334,7 +1365,7 @@ function main()
                         echo 'Now using 1200 MHz for Mobile processor'
                         let gBaseFrequency=1200
                     else
-                        echo 'Now using 1600 MHz for Server/Desktop processor'
+                        echo 'Now using 1600 MHz for Server/Desktop processors'
                         let gBaseFrequency=1600
                 fi
             fi
@@ -1346,26 +1377,50 @@ function main()
 
     if (!(($modelSpecified))); then
         #
-        # Command line arguments (used as override values).
+        # One arguments given (should be a number)
         #
-        if [[ $# -ge 1 && $1 != "" ]]; then
-            let maxTurboFrequency=$1
+        if [[ $# -ge 1 && "$1" =~ ^[0-9]+$ ]];
+            then
+                if [[ $1 -lt $frequency || $1 -gt $gMaxOCFrequency ]];
+                    then
+                        _exitWithError $MAX_TURBO_FREQUENCY_ERROR
+                    else
+                        let maxTurboFrequency=$1
+                fi
+            else
+                _exitWithError $MAX_TURBO_FREQUENCY_ERROR
         fi
 
-        if [ $# -ge 2 ]; then
-            let gTdp=$2
-            echo "Max TDP override, now using: $gTdp Watt"
+        if [[ $# -ge 2 && "$2" =~ ^[0-9]+$ ]];
+            then
+                if [[ $2 -lt 10 || -gt 150 ]];
+                    then
+                        _exitWithError $MAX_TDP_ERROR
+                    else
+                        let gTdp=$2
+                        echo "Override value: Max TDP, now using: $gTdp Watt!"
+                fi
+            else
+                _exitWithError $MAX_TDP_ERROR
         fi
 
-        if [ $# -eq 3 ]; then
-            if [ $3 -eq 0 ];
-                then
-                    let gBridgeType=2
-                    echo "CPU type override, now using: Sandy Bridge"
-                else
-                    let gBridgeType=4
-                    echo "CPU type override, now using: Ivy Bridge"
-             fi
+        if [[ $# -eq 3 && "$3" =~ ^[0-9]+$ ]];
+            then
+                case "$3" in
+                    0) let gBridgeType=2
+                       echo "Override value: CPU type, now using: Sandy Bridge!"
+                       ;;
+                    1) let gBridgeType=4
+                       echo "Override value: CPU type, now using: Ivy Bridge!"
+                       ;;
+                    2) let gBridgeType=8
+                       echo "Override value: CPU type, now using: Haswell!"
+                       ;;
+                    *) _exitWithError $TARGET_CPU_ERROR
+                       ;;
+                esac
+            else
+                _exitWithError $TARGET_CPU_ERROR
         fi
     fi
 
@@ -1375,9 +1430,7 @@ function main()
     # Check maxTurboFrequency
     #
     if [ $maxTurboFrequency == 0 ]; then
-        printf "\nError: Unknown processor number... exiting\n"
-        echo "Try: $0 MaxTurboFrequency [TDP (Watts) CPU (0=SandyBridge, 1=IvyBridge)]"
-        exit 1
+        _exitWithError $PROCESSOR_NUMBER_ERROR
     fi
 
 	#
@@ -1414,21 +1467,21 @@ function main()
     _printScopeStart $turboStates $packageLength
     _printPackages $gTdp $frequency $maxTurboFrequency
 
-    if [ $gBridgeType -eq $IVY_BRIDGE ];
+    if [ $gBridgeType -eq $SANDY_BRIDGE ];
         then
-            local cpuTypeString="07"
+            local cpuTypeString="06"
 
-            _initIvyBridgeSetup
+            _initSandyBridgeSetup
 
             _printScopeACST 0
-            _printMethodDSM
             _printScopeCPUn $logicalCPUs
         else
-            local cpuTypeString="06"
+            local cpuTypeString="07"
 
-            _initSandyBridgeSetup
+            _initIvyBridgeSetup
 
             _printScopeACST 0
+            _printMethodDSM
             _printScopeCPUn $logicalCPUs
     fi
 
@@ -1460,6 +1513,8 @@ function main()
 
 #==================================== START =====================================
 
+clear
+
 main "$1" $2 $3
 
 _findIasl

From c03ce1647d89adfcb77923c6987b41aa849253df Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 18 Feb 2013 17:33:00 +0100
Subject: [PATCH 294/623] Updating script to v4.3

Typo and ssdtPRGen.command breakage fixed
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 89 +++++++++++++++-------------
 1 file changed, 48 insertions(+), 41 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index c3316d9..63490c5 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 4.2 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 4.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -44,6 +44,7 @@
 #			- First set of Haswell processors added (Pike/Jeroen, Februari 2013)
 #			- More rigid testing for user errors (Pike/Jeroen, Februari 2013)
 #			- Getting ready for new Haswell setups (Pike/Jeroen, Februari 2013)
+#			- Typo and ssdtPRGen.command breakage fixed (Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -107,7 +108,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=4.2
+gScriptVersion=4.3
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1248,7 +1249,7 @@ function _initIvyBridgeSetup()
 function _exitWithError()
 {
     case "$1" in
-        2) echo -e "\nError: 'MaxTurboFrequency' must be in the range of $frequency-gMaxOCFrequency... exiting\n" 1>&2
+        2) echo -e "\nError: 'MaxTurboFrequency' must be in the range of $frequency-$gMaxOCFrequency... exiting\n" 1>&2
            exit 2
            ;;
         3) echo -e "\nError: 'TDP' must be in the range of 10-150 Watts... exiting\n" 1>&2
@@ -1379,48 +1380,54 @@ function main()
         #
         # One arguments given (should be a number)
         #
-        if [[ $# -ge 1 && "$1" =~ ^[0-9]+$ ]];
-            then
-                if [[ $1 -lt $frequency || $1 -gt $gMaxOCFrequency ]];
-                    then
-                        _exitWithError $MAX_TURBO_FREQUENCY_ERROR
-                    else
-                        let maxTurboFrequency=$1
-                fi
-            else
-                _exitWithError $MAX_TURBO_FREQUENCY_ERROR
+        if [[ $# -ge 1 && $1 != "" ]]; then
+		    if [[ "$1" =~ ^[0-9]+$ ]];
+                then
+                    if [[ $1 -lt $frequency || $1 -gt $gMaxOCFrequency ]];
+                        then
+                            _exitWithError $MAX_TURBO_FREQUENCY_ERROR
+                        else
+                            let maxTurboFrequency=$1
+                    fi
+                else
+                    _exitWithError $MAX_TURBO_FREQUENCY_ERROR
+            fi
         fi
 
-        if [[ $# -ge 2 && "$2" =~ ^[0-9]+$ ]];
-            then
-                if [[ $2 -lt 10 || -gt 150 ]];
-                    then
-                        _exitWithError $MAX_TDP_ERROR
-                    else
-                        let gTdp=$2
-                        echo "Override value: Max TDP, now using: $gTdp Watt!"
-                fi
-            else
-                _exitWithError $MAX_TDP_ERROR
+        if [ $# -ge 2 ]; then
+            if [[ "$2" =~ ^[0-9]+$ ]];
+                then
+                    if [[ $2 -lt 10 || -gt 150 ]];
+                        then
+                            _exitWithError $MAX_TDP_ERROR
+                        else
+                            let gTdp=$2
+                            echo "Override value: Max TDP, now using: $gTdp Watt!"
+                    fi
+                else
+                    _exitWithError $MAX_TDP_ERROR
+            fi
         fi
 
-        if [[ $# -eq 3 && "$3" =~ ^[0-9]+$ ]];
-            then
-                case "$3" in
-                    0) let gBridgeType=2
-                       echo "Override value: CPU type, now using: Sandy Bridge!"
-                       ;;
-                    1) let gBridgeType=4
-                       echo "Override value: CPU type, now using: Ivy Bridge!"
-                       ;;
-                    2) let gBridgeType=8
-                       echo "Override value: CPU type, now using: Haswell!"
-                       ;;
-                    *) _exitWithError $TARGET_CPU_ERROR
-                       ;;
-                esac
-            else
-                _exitWithError $TARGET_CPU_ERROR
+        if [ $# -eq 3 ]; then
+            if [[ "$3" =~ ^[0-9]+$ ]];
+                then
+                    case "$3" in
+                        0) let gBridgeType=2
+                           echo "Override value: CPU type, now using: Sandy Bridge!"
+                           ;;
+                        1) let gBridgeType=4
+                           echo "Override value: CPU type, now using: Ivy Bridge!"
+                           ;;
+                        2) let gBridgeType=8
+                           echo "Override value: CPU type, now using: Haswell!"
+                           ;;
+                        *) _exitWithError $TARGET_CPU_ERROR
+                           ;;
+                    esac
+                else
+                    _exitWithError $TARGET_CPU_ERROR
+            fi
         fi
     fi
 

From a691efbb9814837be0d635c4f83744760f2ffbde Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 19 Feb 2013 13:22:49 +0100
Subject: [PATCH 295/623] Fixing a few silly typos

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 63490c5..c6b3f1d 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -874,13 +874,12 @@ function _getSystemType()
 
 function _findIasl()
 {
-    if ((gCallIasl)); then
+    if (($gCallIasl)); then
         #
         # First we do a quick lookup of iasl (should be there after the first run)
         #
         if [ ! -f /usr/local/bin/iasl ]; then
-            echo -e
-            echo 'IASL not found. Downloading iasl...'
+            echo -e "\nIASL not found. Downloading iasl..."
             sudo curl -o /usr/local/bin/iasl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl
             sudo chmod +x /usr/local/bin/iasl
             echo 'Done.'
@@ -1330,7 +1329,7 @@ function main()
     local cpu_type=$(_getCPUtype)
     local currentSystemType=$(_getSystemType)
 
-    echo "Generating SSDT.dsl for a $modelID [$boardID]"
+    echo "Generating ${gSsdtID}.dsl for a $modelID [$boardID]"
     echo "$bridgeTypeString Core $gProcessorNumber processor [0x$cpu_type] setup"
 
     #
@@ -1526,7 +1525,7 @@ main "$1" $2 $3
 
 _findIasl
 
-if ((gCallIasl)); then
+if (($gCallIasl)); then
     #
     # Compile SSDT.dsl
     #
@@ -1541,7 +1540,8 @@ if ((gCallIasl)); then
             read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
             case "$choice" in
                 y|Y ) _setDestinationPath
-                      sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile};;
+                      sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile}
+                      ;;
             esac
         fi
     fi

From 6083f258ada2348cb8ceef17ee7094f1a88ff939 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 19 Feb 2013 19:24:49 +0100
Subject: [PATCH 296/623] Updating script to v4.5

Target folder check added for _findIASL
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index c6b3f1d..c24d167 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 4.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 4.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -45,6 +45,7 @@
 #			- More rigid testing for user errors (Pike/Jeroen, Februari 2013)
 #			- Getting ready for new Haswell setups (Pike/Jeroen, Februari 2013)
 #			- Typo and ssdtPRGen.command breakage fixed (Jeroen, Februari 2013)
+#			- Target folder check added for _findIASL (Pike, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -108,7 +109,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=4.3
+gScriptVersion=4.5
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -876,10 +877,19 @@ function _findIasl()
 {
     if (($gCallIasl)); then
         #
-        # First we do a quick lookup of iasl (should be there after the first run)
+        # Then we do a quick lookup of iasl (should also be there after the first run)
         #
         if [ ! -f /usr/local/bin/iasl ]; then
-            echo -e "\nIASL not found. Downloading iasl..."
+            printf "\nIASL not found. "
+            #
+            # First we check the target directory (should be there after the first run)
+            #
+            if [ ! -d /usr/local/bin ]; then
+                printf "Creating target directory... "
+                sudo mkdir /usr/local/bin/
+            fi
+
+            printf "Downloading iasl...\n"
             sudo curl -o /usr/local/bin/iasl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl
             sudo chmod +x /usr/local/bin/iasl
             echo 'Done.'

From 9352ed71a5f3ed5f786938bddee78abd22f30cc7 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 21 Feb 2013 07:39:40 +0100
Subject: [PATCH 297/623] Updating script to 4.6

Set $baseFreqyency to $lfm when the latter isn't zero
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 32 +++++++++++++++++-----------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index c24d167..5fbb4c8 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 4.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 4.6 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -46,6 +46,7 @@
 #			- Getting ready for new Haswell setups (Pike/Jeroen, Februari 2013)
 #			- Typo and ssdtPRGen.command breakage fixed (Jeroen, Februari 2013)
 #			- Target folder check added for _findIASL (Pike, Februari 2013)
+#			- Set $baseFreqyency to $lfm when the latter isn't zero (Pike, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -109,7 +110,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=4.5
+gScriptVersion=4.6
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -884,6 +885,7 @@ function _findIasl()
             #
             # First we check the target directory (should be there after the first run)
             #
+            # XXX: Jeroen, try curl --create-dirs without the mkdir here ;)
             if [ ! -d /usr/local/bin ]; then
                 printf "Creating target directory... "
                 sudo mkdir /usr/local/bin/
@@ -891,6 +893,7 @@ function _findIasl()
 
             printf "Downloading iasl...\n"
             sudo curl -o /usr/local/bin/iasl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl
+#           sudo curl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl -o /usr/local/bin/iasl --create-dirs
             sudo chmod +x /usr/local/bin/iasl
             echo 'Done.'
         fi
@@ -1367,17 +1370,20 @@ function main()
             #
             # Check Low Frequency Mode (may be 0 aka still unknown)
             #
-            if (($lfm == 0)); then
-                echo 'Warning: Low Frequency Mode is 0 (unknown)'
-
-                if (($gTypeCPU == gMobileCPU));
-                    then
-                        echo 'Now using 1200 MHz for Mobile processor'
-                        let gBaseFrequency=1200
-                    else
-                        echo 'Now using 1600 MHz for Server/Desktop processors'
-                        let gBaseFrequency=1600
-                fi
+            if (($lfm > 0));
+                then
+                    let gBaseFrequency=$lfm
+                else
+                    echo 'Warning: Low Frequency Mode is 0 (unknown)'
+
+                    if (($gTypeCPU == gMobileCPU));
+                        then
+                            echo 'Now using 1200 MHz for Mobile processor'
+                            let gBaseFrequency=1200
+                        else
+                            echo 'Now using 1600 MHz for Server/Desktop processors'
+                            let gBaseFrequency=1600
+                    fi
             fi
         else
             let logicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')

From 285d26d28f10794e257d18ab1fede4036bcbb45a Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 21 Feb 2013 10:39:16 +0100
Subject: [PATCH 298/623] Updating script to v4.7

Check PlatformSupport.plist for supported model/board-id added
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 43 ++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 5fbb4c8..e0de8cb 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 4.6 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 4.7 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -47,6 +47,7 @@
 #			- Typo and ssdtPRGen.command breakage fixed (Jeroen, Februari 2013)
 #			- Target folder check added for _findIASL (Pike, Februari 2013)
 #			- Set $baseFreqyency to $lfm when the latter isn't zero (Pike, Februari 2013)
+#			- Check PlatformSupport.plist for supported model/board-id added (Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -110,7 +111,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=4.6
+gScriptVersion=4.7
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1076,6 +1077,43 @@ function _showLowPowerStates()
 
 #--------------------------------------------------------------------------------
 
+function _checkPlatformSupport()
+{
+    #
+    # Local function definition
+    #
+    function __searchList()
+    {
+        local data=`awk '/<key>'${1}'<\/key>.*/,/<\/array>/' /System/Library/CoreServices/PlatformSupport.plist`
+        local targetList=(`echo $data | egrep -o '(<string>.*</string>)' | sed -e 's/<\/*string>//g'`)
+
+        for item in "${targetList[@]}"
+        do
+
+            if [ "$item" == "$2" ]; then
+                return 1
+            fi
+        done
+
+        return 0
+    }
+
+    __searchList 'SupportedModelProperties' $1
+
+    if (($? == 0)); then
+        echo 'Warning: Model identifier ['$1'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
+    fi
+
+    __searchList 'SupportedBoardIds' $2
+
+    if (($? == 0)); then
+        echo 'Warning: boardID ['$2'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
+
+    fi
+}
+
+#--------------------------------------------------------------------------------
+
 function _checkSMCKeys()
 {
     #
@@ -1508,6 +1546,7 @@ function main()
     fi
 
     _showLowPowerStates
+    _checkPlatformSupport $modelID $boardID
 
     #
     # Some IB CPUPM specific configuration checks

From 9bf4c34a04d63139277f2a87f438dd493622c32c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 23 Feb 2013 07:14:53 +0100
Subject: [PATCH 299/623] Updating script to v4.9

New/expanded Sandy Bridge CPU lists, thanks to Francis
More preparations for the official Haswell launch
Fix for home directory with space characters
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 209 ++++++++++++++++++++-------
 1 file changed, 157 insertions(+), 52 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index e0de8cb..f768fee 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 4.7 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 4.9 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -48,6 +48,9 @@
 #			- Target folder check added for _findIASL (Pike, Februari 2013)
 #			- Set $baseFreqyency to $lfm when the latter isn't zero (Pike, Februari 2013)
 #			- Check PlatformSupport.plist for supported model/board-id added (Jeroen, Februari 2013)
+#			- New/expanded Sandy Bridge CPU lists, thanks to Francis (Jeroen, Februari 2013)
+#			- More preparations for the official Haswell launch (Pike, Februari 2013)
+#			- Fix for home directory with space characters (Pike, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -111,7 +114,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=4.7
+gScriptVersion=4.9
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -120,14 +123,12 @@ gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 #
 
 gPath=~/Desktop
-gSsdtID=SSDT_PR
-gSsdtPR=${gPath}/${gSsdtID}.dsl
+gSsdtID="SSDT_PR"
+gSsdtPR="${gPath}/${gSsdtID}.dsl"
 
-gSandyCPU=1
-gDesktopCPU=2
-gMobileCPU=3
-let gServerCPU=4
-let gHaswellCPU=5
+let gDesktopCPU=1
+let gMobileCPU=2
+let gServerCPU=3
 
 let gSystemType=0
 
@@ -158,10 +159,7 @@ let PROCESSOR_NUMBER_ERROR=5
 # Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
 #
 
-gSandyBridgeCPUList=(
-i5-2500K,95,1600,3300,3700,4,4
-i7-2600K,95,1600,3400,3800,4,8
-i7-2700K,95,1600,3500,3900,4,8
+gServerSandyBridgeCPUList=(
 # E3-1200 Xeon Processor Series
 E3-1290,95,0,3600,4000,4,8
 E3-1280,95,0,3500,3900,4,8
@@ -177,6 +175,96 @@ E3-1220L,20,0,2200,3400,2,4
 E3-1220,80,0,3100,3400,4,4
 )
 
+gDesktopSandyBridgeCPUList=(
+# i7 Desktop series
+i7-2600S,65,1600,2800,3800,4,8
+i7-2600,95,1600,3400,3800,4,8
+i7-2600K,95,1600,3400,3800,4,8
+i7-2700K,95,1600,3500,3900,4,8
+i7-3930K,130,1600,3200,3800,6,12
+i7-3820,130,1600,3600,3800,4,8
+# i5 Desktop Series
+i5-2300,95,1600,2800,3100,4,4
+i5-2310,95,1600,2900,3200,4,4
+i5-2320,95,1600,3000,3300,4,4
+i5-2380P,95,1600,3100,3400,4,4
+i5-2390T,35,1600,2700,3500,2,4
+i5-2400S,65,1600,2500,3300,4,4
+i5-2405S,65,1600,2500,3300,4,4
+i5-2400,95,1600,3100,3400,4,4
+i5-2450P,95,1600,3200,3500,4,4
+i5-2500T,45,1600,2300,3300,4,4
+i5-2500S,65,1600,2700,3700,4,4
+i5-2500,95,1600,3300,3700,4,4
+i5-2500K,95,1600,3300,3700,4,4
+i5-2550K,95,1600,3400,3800,4,4
+# i3 1200 Desktop Series
+i3-2130,65,1600,3400,0,2,4
+i3-2125,65,1600,3300,0,2,4
+i3-2120T,35,1600,2600,0,2,4
+i3-2120,65,1600,3300,0,2,4
+i3-2115C,25,1600,2000,0,2,4
+i3-2105,65,1600,3100,0,2,4
+i3-2102,65,1600,3100,0,2,4
+i3-2100T,35,1600,2500,0,2,4
+i3-2100,65,1600,3100,0,2,4
+)
+
+gMobileSandyBridgeCPUList=(
+# i7 Mobile Extreme Series
+i7-2960XM,55,0,2700,3700,4,8
+i7-2920XM,55,0,2500,3500,4,8
+# i7 Mobile Series
+i7-2860QM,45,0,2500,3600,4,8
+i7-2820QM,45,0,2300,3400,4,8
+i7-2760QM,45,0,2400,3500,4,8
+i7-2720QM,45,0,2200,3300,4,8
+i7-2715QE,45,0,2100,3000,4,8
+i7-2710QE,45,0,2100,3000,4,8
+i7-2677M,17,0,1800,2900,2,4
+i7-2675QM,45,0,2200,3100,4,8
+i7-2670QM,45,0,2200,3100,4,8
+i7-2675M,17,0,1600,2700,2,4
+i7-2655LE,25,0,2200,2900,2,4
+i7-2649M,25,0,2300,3200,2,4
+i7-26740M,32,0,2800,3500,2,4
+i7-2637M,17,0,1700,2800,2,4
+i7-2635QM,45,0,2000,2900,4,8
+i7-2630QM,45,0,2000,2900,4,8
+i7-2629M,25,0,2100,3000,2,4
+i7-2620M,35,0,2700,3400,2,4
+i7-2617M,17,0,1500,2600,2,4
+i7-2610UE,17,0,1500,2400,2,4
+# i5 Mobile Series
+i5-2467M,17,0,1600,2300,2,4
+i5-2450M,35,0,2300,3100,2,4
+i5-2435M,35,0,2400,3000,2,4
+i5-2430M,35,0,2400,3000,2,4
+i5-2410M,35,0,2300,2900,2,4
+i5-2557M,17,0,1700,2700,2,4
+i5-2540M,35,0,2600,3300,2,4
+i5-2537M,17,0,1400,2300,2,4
+i5-2520M,35,0,2500,3200,2,4
+i5-2515E,35,0,2500,3100,2,4
+i5-2510E,35,0,2500,3100,2,4
+# i3 2300 Mobile Series
+i3-2377M,17,0,1500,0,2,4
+i3-2370M,35,0,2400,0,2,4
+i3-2367M,17,0,1400,0,2,4
+i3-2365M,17,0,1400,0,2,4
+i3-2357M,17,0,1300,0,2,4
+i3-2350M,35,0,2300,0,2,4
+i3-2348M,35,0,2300,0,2,4
+i3-2340UE,17,0,1300,0,2,4
+i3-2330M,35,0,2200,0,2,4
+i3-2330E,35,0,2200,0,2,4
+i3-2328M,35,0,2200,0,2,4
+i3-2312M,35,0,2100,0,2,4
+i3-2310M,35,0,2100,0,2,4
+i3-2310E,35,0,2100,0,2,4
+)
+
+
 #
 # Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
 #
@@ -199,6 +287,9 @@ gServerIvyBridgeCPUList=(
 )
 
 gDesktopIvyBridgeCPUList=(
+# i7 Desktop Extreme Series
+i7-3970X,150,1600,3500,4000,6,12
+i7-3960X,130,1600,3300,3900,6,12
 # i7-3700 Desktop Processor Series
 i7-3770T,45,1600,2500,3700,4,8
 i7-3770S,65,1600,3100,3900,4,8
@@ -291,8 +382,10 @@ i3-3110M,35,0,2400,0,2,4
 )
 
 #
-# New Haswell processors with HD-4600 graphics
+# New Haswell processors (with HD-4600 graphics)
 #
+gServerHaswellCPUList=(
+)
 
 gDesktopHaswellCPUList=(
 # Socket 1150 (Standard Power)
@@ -313,6 +406,9 @@ i5-4570T,35,0,2900,3600,2,4
 i5-4430S,65,0,2700,3200,4,4
 )
 
+gMobileHaswellCPUList=(
+)
+
 #--------------------------------------------------------------------------------
 
 function _printHeader()
@@ -594,10 +690,9 @@ function _printScopeACST()
             #
             # C-States override for Mobile processors (CPU0 only)
             #
-            if (($gTypeCPU == $gMobileCPU));
-                then
-                    echo 'Adjusting C-States for detected (mobile) processor'
-                    gACST_CPU0=29
+            if (($gTypeCPU == $gMobileCPU)); then
+                echo 'Adjusting C-States for detected (mobile) processor'
+                gACST_CPU0=29
             fi
 
             let targetCStates=$gACST_CPU0
@@ -995,43 +1090,50 @@ function _getCPUDataByProcessorNumber
     function __searchList()
     {
         local ifs=$IFS
-        local targetCPUList=("${!1}")
-
-        for cpuData in "${targetCPUList[@]}"
+        let targetType=0
+
+        case $1 in
+            2) local cpuSpecLists=("gDesktopSandyBridgeCPUList[@]" "gMobileSandyBridgeCPUList[@]" "gServerSandyBridgeCPUList[@]")
+               ;;
+            4) local cpuSpecLists=("gDesktopIvyBridgeCPUList[@]" "gMobileIvyBridgeCPUList[@]" "gServerIvyBridgeCPUList[@]")
+               ;;
+            8) local cpuSpecLists=("gDesktopHaswellCPUList[@]" "gMobileHaswellCPUList[@]" "gHaswellCPUList[@]")
+               ;;
+        esac
+
+        for cpuList in ${cpuSpecLists[@]}
         do
-            IFS=","
-            data=($cpuData)
-
-            if [[ ${data[0]} == $gProcessorNumber ]]; then
-                gProcessorData="$cpuData"
-                let gTypeCPU=$2
-                IFS=$ifs
-                return
-            fi
+            let targetType+=1
+            local targetCPUList=("${!cpuList}")
+
+            for cpuData in "${targetCPUList[@]}"
+            do
+                IFS=","
+                data=($cpuData)
+
+                if [[ ${data[0]} == $gProcessorNumber ]]; then
+                    gProcessorData="$cpuData"
+                    let gTypeCPU=$targetType
+                    IFS=$ifs
+                    return
+                fi
+            done
         done
 
         IFS=$ifs
     }
 
     #
-    # Local function callers (passing array and cpu type)
+    # Local function callers
     #
-    __searchList gDesktopIvyBridgeCPUList[@] $gDesktopCPU
-
-    if (!(($gTypeCPU))); then
-        __searchList gMobileIvyBridgeCPUList[@] $gMobileCPU
-    fi
-
-    if (!(($gTypeCPU))); then
-        __searchList "gServerIvyBridgeCPUList[@]" $gServerCPU
-    fi
+    __searchList $SANDY_BRIDGE
 
     if (!(($gTypeCPU))); then
-        __searchList "gSandyBridgeCPUList[@]" $gSandyCPU
+        __searchList $IVY_BRIDGE
     fi
 
     if (!(($gTypeCPU))); then
-        __searchList "gDesktopHaswellCPUList[@]" $gHaswellCPU
+        __searchList $HASWELL
     fi
 }
 
@@ -1335,6 +1437,12 @@ function main()
 
     if [[ $# -eq 1 ]]; then
         if [[ $1 != "" ]]; then
+            # Sandy Bridge checks
+            if [[ ${1:0:4} == "i3-2" || ${1:0:4} == "i5-2" || ${1:0:4} == "i7-2" || ${1:2:2} == "E2" ]]; then
+                let model=0x2A
+                let modelSpecified=1
+                gProcessorNumber=$1
+            fi
             # Ivy Bridge checks
             if [[ ${1:0:4} == "i3-3" || ${1:0:4} == "i5-3" || ${1:0:4} == "i7-3" || ${1:2:2} == "E3" ]]; then
                 let model=0x3A
@@ -1434,16 +1542,13 @@ function main()
         # One arguments given (should be a number)
         #
         if [[ $# -ge 1 && $1 != "" ]]; then
-		    if [[ "$1" =~ ^[0-9]+$ ]];
-                then
-                    if [[ $1 -lt $frequency || $1 -gt $gMaxOCFrequency ]];
-                        then
-                            _exitWithError $MAX_TURBO_FREQUENCY_ERROR
-                        else
-                            let maxTurboFrequency=$1
-                    fi
-                else
-                    _exitWithError $MAX_TURBO_FREQUENCY_ERROR
+		    if [[ "$1" =~ ^[0-9]+$ ]]; then
+                if [[ $1 -lt $frequency || $1 -gt $gMaxOCFrequency ]];
+                    then
+                        _exitWithError $MAX_TURBO_FREQUENCY_ERROR
+                    else
+                        let maxTurboFrequency=$1
+                fi
             fi
         fi
 

From 2f7c9caaa404c281063c2a0a6a75d3e1406be511 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 24 Feb 2013 12:08:48 +0100
Subject: [PATCH 300/623] Updating script to v5.0

Sandy Bridge CPU lists rearranged/extended, thanks to 'stinga11'
Now supporting up to 16 logical cores
Improved argument checks, now supporting a fourth argument
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 263 ++++++++++++++++-----------
 1 file changed, 160 insertions(+), 103 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index f768fee..6d565d7 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 4.9 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 5.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -51,10 +51,35 @@
 #			- New/expanded Sandy Bridge CPU lists, thanks to Francis (Jeroen, Februari 2013)
 #			- More preparations for the official Haswell launch (Pike, Februari 2013)
 #			- Fix for home directory with space characters (Pike, Februari 2013)
+#			- Sandy Bridge CPU lists rearranged/extended, thanks to 'stinga11' (Jeroen, Februari 2013)
+#			- Now supporting up to 16 logical cores (Jeroen, Februari 2013)
+#			- Improved argument checking, now supporting a fourth argument (Jeroen/Pike, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
-#			- Many thanks to Jeroen for the CPU data, cleanups and renaming stuff.
+#			- Thanks to 'stinga11' for Sandy Bridge (E5) data and processor list errors.
+#			- Many thanks to Jeroen for the CPU data, cleanups, renaming stuff and other improvements.
+#
+# Usage (v1.0 - v4.9):
+#
+#           - ./ssdtPRGen.sh [max turbo frequency] [TDP] [CPU type]
+#
+#           - ./ssdtPRGen.sh
+#           - ./ssdtPRGen.sh 3600
+#           - ./ssdtPRGen.sh 3600 70
+#           - ./ssdtPRGen.sh 3600 70 1
+#
+# Usage (v5.0 and greater):
+#
+#           - ./ssdtPRGen.sh [processor number] [max turbo frequency] [TDP] [CPU type]
+#
+#           - ./ssdtPRGen.sh E5-1650
+#
+#           - ./ssdtPRGen.sh 'E3-1220 V2'
+#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600
+#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70
+#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70 1
+#
 #
 
 # set -x # Used for tracing errors (can be used anywhere in the script).
@@ -114,7 +139,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=4.9
+gScriptVersion=5.0
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -160,6 +185,10 @@ let PROCESSOR_NUMBER_ERROR=5
 #
 
 gServerSandyBridgeCPUList=(
+# E5-1600 Xeon Processor Series
+E5-1660,130,0,3300,3900,6,12
+E5-1650,130,0,3200,3800,6,12
+E5-1620,130,0,3600,3800,4,8
 # E3-1200 Xeon Processor Series
 E3-1290,95,0,3600,4000,4,8
 E3-1280,95,0,3500,3900,4,8
@@ -176,13 +205,16 @@ E3-1220,80,0,3100,3400,4,4
 )
 
 gDesktopSandyBridgeCPUList=(
+# i7 Desktop Extreme Series
+i7-3970X,150,0,3500,4000,6,12
+i7-3960X,130,0,3300,3900,6,12
+i7-3930X,130,0,3200,3800,6,12
+i7-3820,130,0,3600,3800,4,8
 # i7 Desktop series
 i7-2600S,65,1600,2800,3800,4,8
 i7-2600,95,1600,3400,3800,4,8
 i7-2600K,95,1600,3400,3800,4,8
 i7-2700K,95,1600,3500,3900,4,8
-i7-3930K,130,1600,3200,3800,6,12
-i7-3820,130,1600,3600,3800,4,8
 # i5 Desktop Series
 i5-2300,95,1600,2800,3100,4,4
 i5-2310,95,1600,2900,3200,4,4
@@ -287,9 +319,6 @@ gServerIvyBridgeCPUList=(
 )
 
 gDesktopIvyBridgeCPUList=(
-# i7 Desktop Extreme Series
-i7-3970X,150,1600,3500,4000,6,12
-i7-3960X,130,1600,3300,3900,6,12
 # i7-3700 Desktop Processor Series
 i7-3770T,45,1600,2500,3700,4,8
 i7-3770S,65,1600,3100,3900,4,8
@@ -442,7 +471,7 @@ function _printExternals()
     currentCPU=0;
 
     while [ $currentCPU -lt $1 ]; do
-        echo '    External (\_PR_.'$gProcLabel$currentCPU', DeviceObj)'                 >> $gSsdtPR
+        printf "    External (\_PR_.$gProcLabel%X, DeviceObj)\n" $currentCPU            >> $gSsdtPR
         let currentCPU+=1
     done
 
@@ -471,14 +500,15 @@ function _printDebugInfo()
 
 function _printProcessorDefinitions()
 {
+echo "IN"
     let currentCPU=0;
 
     while [ $currentCPU -lt $1 ]; do
-        echo '    External (\_PR_.'$gProcLabel$currentCPU', DeviceObj)'                 >> $gSsdtPR
+         printf "    External (\_PR_.$gProcLabel$currentCPU%x, DeviceObj)\n" $currentCPU >> $gSsdtPR
         let currentCPU+=1
     done
 
-    echo ''                                                                             >> $gSsdtPR
+    echo ''                                                                              >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
@@ -886,9 +916,9 @@ function _printScopeCPUn()
     let currentCPU=1;
 
     while [ $currentCPU -lt $1 ]; do
-        echo ''                                                                         >> $gSsdtPR
-        echo '    Scope (\_PR.'$gProcLabel$currentCPU')'                                >> $gSsdtPR
-        echo '    {'                                                                    >> $gSsdtPR
+        echo ''                                                                              >> $gSsdtPR
+      printf "    Scope (\_PR.$gProcLabel%X)" $currentCPU                                    >> $gSsdtPR
+        echo '    {'                                                                         >> $gSsdtPR
         echo '        Method (APSS, 0, NotSerialized) { Return (\_PR.'$gProcLabel'0.APSS) }' >> $gSsdtPR
 
         #
@@ -904,11 +934,11 @@ function _printScopeCPUn()
             fi
         fi
 
-        echo '    }'                                                                    >> $gSsdtPR
+        echo '    }'                                                                         >> $gSsdtPR
         let currentCPU+=1
     done
 
-    echo '}'                                                                            >> $gSsdtPR
+    echo '}'                                                                                 >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
@@ -1114,6 +1144,7 @@ function _getCPUDataByProcessorNumber
                 if [[ ${data[0]} == $gProcessorNumber ]]; then
                     gProcessorData="$cpuData"
                     let gTypeCPU=$targetType
+                    let gBridgeType=$1
                     IFS=$ifs
                     return
                 fi
@@ -1425,63 +1456,79 @@ function main()
     printf "\nsdtPRGen.sh v$gScriptVersion Copyright (c) 2013 by Pike R. Alpha\n"
     echo   '----------------------------------------------------------------'
 
+    let assumedTDP=0
     let modelSpecified=0
     let maxTurboFrequency=0
 
-    #
-    # Get installed CPU model, set bridge type and default TDP.
-    #
-    local model=$(_getCPUModel)
-
     _getCPUNumberFromBrandString
 
-    if [[ $# -eq 1 ]]; then
-        if [[ $1 != "" ]]; then
-            # Sandy Bridge checks
-            if [[ ${1:0:4} == "i3-2" || ${1:0:4} == "i5-2" || ${1:0:4} == "i7-2" || ${1:2:2} == "E2" ]]; then
-                let model=0x2A
-                let modelSpecified=1
-                gProcessorNumber=$1
-            fi
-            # Ivy Bridge checks
-            if [[ ${1:0:4} == "i3-3" || ${1:0:4} == "i5-3" || ${1:0:4} == "i7-3" || ${1:2:2} == "E3" ]]; then
-                let model=0x3A
-                let modelSpecified=1
-                gProcessorNumber=$1
-            fi
-            # Haswell checks
-            if [[ ${1:0:4} == "i3-4" || ${1:0:4} == "i5-4" || ${1:0:4} == "i7-4" || ${1:2:2} == "E4" ]]; then
-                let model=0x4A
-                let modelSpecified=1
-                gProcessorNumber=$1
-            fi
+    if [[ "$1" != "" ]]; then
+        # Sandy Bridge checks
+        if [[ ${1:0:4} == "i3-2" || ${1:0:4} == "i5-2" || ${1:0:4} == "i7-2" ]]; then
+            let modelSpecified=1
+            gProcessorNumber=$1
+        fi
+        # Ivy Bridge checks
+        if [[ ${1:0:4} == "i3-3" || ${1:0:4} == "i5-3" || ${1:0:4} == "i7-3" ]]; then
+            let modelSpecified=1
+            gProcessorNumber=$1
+        fi
+        # Haswell checks
+        if [[ ${1:0:4} == "i3-4" || ${1:0:4} == "i5-4" || ${1:0:4} == "i7-4" ]]; then
+            let modelSpecified=1
+            gProcessorNumber=$1
+        fi
+        # Xeon check
+        if [[ ${1:0:1} == "E" ]]; then
+            let modelSpecified=1
+            gProcessorNumber=$1
         fi
     fi
 
-    if (($model==0x2A || $model==0x2D)); then
-        let gTdp=95
-        let gBridgeType=2
-        local bridgeTypeString="Sandy Bridge"
+    _getCPUDataByProcessorNumber
 
-        _getCPUDataByProcessorNumber
+    if [[ $modelSpecified -eq 1 && $gTypeCPU -eq 0 ]]; then
+       _exitWithError $PROCESSOR_NUMBER_ERROR
     fi
 
-    if (($model==0x3A || $model==0x3B)); then
-        let gTdp=77
-        let gBridgeType=4
-        local bridgeTypeString="Ivy Bridge"
+    if [[ $gBridgeType -eq 0 ]]; then
+        local model=$(_getCPUModel)
 
-        _getCPUDataByProcessorNumber
-    fi
+        if (($model==0x2A)); then
+            let gTdp=95
+            let gBridgeType=2
+        fi
+
+        if (($model==0x2D)); then
+            let assumedTDP=1
+            let gTdp=130
+            let gBridgeType=2
+        fi
 
-    if (($model==0x4A || $model==0x4B)); then
-        let gTdp=84
-        let gBridgeType=8
-        local bridgeTypeString="Haswell"
+        if (($model==0x3A || $model==0x3B)); then
+            let assumedTDP=1
+            let gTdp=77
+            let gBridgeType=4
+        fi
 
-        _getCPUDataByProcessorNumber
+        if (($model==0x4A || $model==0x4B)); then
+            let assumedTDP=1
+            let gTdp=84
+            let gBridgeType=8
+        fi
     fi
 
+    case $gBridgeType in
+        2) local bridgeTypeString="Sandy Bridge"
+           ;;
+        4) local bridgeTypeString="Ivy Bridge"
+           ;;
+        8) local bridgeTypeString="Haswell"
+           ;;
+	    *) local bridgeTypeString="Unknown"
+           ;;
+    esac
+
     _getBoardID
 
     local modelID=$(_getModelName)
@@ -1535,57 +1582,60 @@ function main()
             let logicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
             let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
             let frequency=($frequency / 1000000)
-    fi
 
-    if (!(($modelSpecified))); then
-        #
-        # One arguments given (should be a number)
-        #
-        if [[ $# -ge 1 && $1 != "" ]]; then
-		    if [[ "$1" =~ ^[0-9]+$ ]]; then
-                if [[ $1 -lt $frequency || $1 -gt $gMaxOCFrequency ]];
-                    then
-                        _exitWithError $MAX_TURBO_FREQUENCY_ERROR
-                    else
-                        let maxTurboFrequency=$1
-                fi
+            if [[ $assumedTDP -eq 1 ]]; then
+                echo 'With a maximum TDP of '$gTdp' Watt - assumed, may require override value!'
             fi
-        fi
+    fi
 
-        if [ $# -ge 2 ]; then
-            if [[ "$2" =~ ^[0-9]+$ ]];
+    #
+    # Script argument checks
+    #
+
+    if [[ $# -ge 2 ]]; then
+        if [[ "$2" =~ ^[0-9]+$ ]]; then
+            if [[ $2 -lt $frequency || $2 -gt $gMaxOCFrequency ]];
                 then
-                    if [[ $2 -lt 10 || -gt 150 ]];
-                        then
-                            _exitWithError $MAX_TDP_ERROR
-                        else
-                            let gTdp=$2
-                            echo "Override value: Max TDP, now using: $gTdp Watt!"
-                    fi
+                    _exitWithError $MAX_TURBO_FREQUENCY_ERROR
                 else
-                    _exitWithError $MAX_TDP_ERROR
+                    let maxTurboFrequency=$2
             fi
         fi
+    fi
 
-        if [ $# -eq 3 ]; then
-            if [[ "$3" =~ ^[0-9]+$ ]];
-                then
-                    case "$3" in
-                        0) let gBridgeType=2
-                           echo "Override value: CPU type, now using: Sandy Bridge!"
-                           ;;
-                        1) let gBridgeType=4
-                           echo "Override value: CPU type, now using: Ivy Bridge!"
-                           ;;
-                        2) let gBridgeType=8
-                           echo "Override value: CPU type, now using: Haswell!"
-                           ;;
-                        *) _exitWithError $TARGET_CPU_ERROR
-                           ;;
-                    esac
-                else
-                    _exitWithError $TARGET_CPU_ERROR
-            fi
+    if [ $# -ge 3 ]; then
+        if [[ "$3" =~ ^[0-9]+$ ]];
+            then
+                if [[ $3 -lt 10 || $3 -gt 150 ]];
+                    then
+                        _exitWithError $MAX_TDP_ERROR
+                    else
+                        let gTdp=$3
+                        echo "Override value: Max TDP, now using: $gTdp Watt!"
+                fi
+            else
+                _exitWithError $MAX_TDP_ERROR
+        fi
+    fi
+
+    if [ $# -eq 4 ]; then
+        if [[ "$4" =~ ^[0-9]+$ ]];
+            then
+                case "$4" in
+                    0) let gBridgeType=2
+                       echo "Override value: CPU type, now using: Sandy Bridge!"
+                       ;;
+                    1) let gBridgeType=4
+                       echo "Override value: CPU type, now using: Ivy Bridge!"
+                       ;;
+                    2) let gBridgeType=8
+                       echo "Override value: CPU type, now using: Haswell!"
+                       ;;
+                    *) _exitWithError $TARGET_CPU_ERROR
+                       ;;
+                esac
+            else
+                _exitWithError $TARGET_CPU_ERROR
         fi
     fi
 
@@ -1594,8 +1644,8 @@ function main()
     #
     # Check maxTurboFrequency
     #
-    if [ $maxTurboFrequency == 0 ]; then
-        _exitWithError $PROCESSOR_NUMBER_ERROR
+    if [ $maxTurboFrequency -eq 0 ]; then
+        _exitWithError $MAX_TURBO_FREQUENCY_ERROR
     fi
 
 	#
@@ -1681,7 +1731,14 @@ function main()
 
 clear
 
-main "$1" $2 $3
+if [ $# -ge 1 ]; then
+    if [[ "$1" =~ ^[0-9]+$ ]];
+        then
+            main "" $1 $2 $3
+        else
+            main "$1" $2 $3 $4
+    fi
+fi
 
 _findIasl
 

From a189afa9b1150eaa3fc22ba64f098429970163df Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 24 Feb 2013 14:44:04 +0100
Subject: [PATCH 301/623] Updating script to v5.1

Suppress override output when possible
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 6d565d7..a5b7587 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 5.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 5.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -54,6 +54,7 @@
 #			- Sandy Bridge CPU lists rearranged/extended, thanks to 'stinga11' (Jeroen, Februari 2013)
 #			- Now supporting up to 16 logical cores (Jeroen, Februari 2013)
 #			- Improved argument checking, now supporting a fourth argument (Jeroen/Pike, Februari 2013)
+#			- Suppress override output when possible (Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -139,7 +140,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=5.0
+gScriptVersion=5.1
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1598,7 +1599,10 @@ function main()
                 then
                     _exitWithError $MAX_TURBO_FREQUENCY_ERROR
                 else
-                    let maxTurboFrequency=$2
+                    if [[ $2 -gt $maxTurboFrequency ]]; then
+                        echo "Override value: Max Turbo Frequency, now using: $2 MHz!"
+                        let maxTurboFrequency=$2
+                    fi
             fi
         fi
     fi
@@ -1610,8 +1614,10 @@ function main()
                     then
                         _exitWithError $MAX_TDP_ERROR
                     else
-                        let gTdp=$3
-                        echo "Override value: Max TDP, now using: $gTdp Watt!"
+                        if [[ $gTdp != $3 ]]; then
+                            let gTdp=$3
+                            echo "Override value: Max TDP, now using: $gTdp Watt!"
+                        fi
                 fi
             else
                 _exitWithError $MAX_TDP_ERROR
@@ -1621,19 +1627,25 @@ function main()
     if [ $# -eq 4 ]; then
         if [[ "$4" =~ ^[0-9]+$ ]];
             then
+                local detectedBridgeType=$gBridgeType
+
                 case "$4" in
                     0) let gBridgeType=2
-                       echo "Override value: CPU type, now using: Sandy Bridge!"
+                       local cpuTypeString="Override value: CPU type, now using: Sandy Bridge!"
                        ;;
                     1) let gBridgeType=4
-                       echo "Override value: CPU type, now using: Ivy Bridge!"
+                       local cpuTypeString="Override value: CPU type, now using: Ivy Bridge!"
                        ;;
                     2) let gBridgeType=8
-                       echo "Override value: CPU type, now using: Haswell!"
+                       local cpuTypeString="Override value: CPU type, now using: Haswell!"
                        ;;
                     *) _exitWithError $TARGET_CPU_ERROR
                        ;;
                 esac
+
+                if [[ $detectedBridgeType -ne $((2 << $4)) ]]; then
+                    echo $cpuTypeString
+                fi
             else
                 _exitWithError $TARGET_CPU_ERROR
         fi

From 29ae31d0a2be563143333c3117de7e12f9ae5073 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 25 Feb 2013 15:59:08 +0100
Subject: [PATCH 302/623] Hide PMinfo tool (not ready for public use)

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9465950..3180408 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@ i386/config/SMBIOS/default.h
 i386/config/SMBIOS/*Mac*.h
 
 i386/util/libcc_kext.a
+
 MODEL
 
+i386/libsaio/cpu/tools/PMinfo
 i386/libsaio/smbios/tools/smbios2struct3

From e97caab4868f09b6ddd0140294cc0fce205d04c2 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 25 Feb 2013 15:59:27 +0100
Subject: [PATCH 303/623] Oops Jeroen

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index a5b7587..c5aaf78 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -1743,13 +1743,16 @@ function main()
 
 clear
 
-if [ $# -ge 1 ]; then
-    if [[ "$1" =~ ^[0-9]+$ ]];
-        then
-            main "" $1 $2 $3
-        else
-            main "$1" $2 $3 $4
-    fi
+if [ $# -eq 0 ];
+    then
+        main "" $1 $2 $3
+    else
+        if [[ "$1" =~ ^[0-9]+$ ]];
+            then
+                main "" $1 $2 $3
+            else
+                main "$1" $2 $3 $4
+        fi
 fi
 
 _findIasl

From cfb04beaac133d71b8175b17e2cc7ac0b883a2c3 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 25 Feb 2013 15:59:51 +0100
Subject: [PATCH 304/623] Getting ready for PMinfo release

---
 i386/libsaio/cpu/essentials.h | 37 ++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 7ad17c1..9b7313e 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -50,14 +50,23 @@
 // Copied from xnu/osfmk/proc_reg.h
 #define MSR_IA32_PLATFORM_ID		0x17
 #define	MSR_CORE_THREAD_COUNT		0x35
-#define	MSR_PLATFORM_INFO			0xCE
+
+#ifndef MSR_PLATFORM_INFO
+	#define MSR_PLATFORM_INFO		0xCE
+#endif
+
 #define MSR_PKG_CST_CONFIG_CONTROL	0xE2	// MSR_PKG_CST_CONFIG_CONTROL
 #define MSR_PMG_IO_CAPTURE_BASE		0xE4
+#define IA32_MPERF					0xE7
+#define IA32_APERF					0xE8
 
 #define	MSR_IA32_PERF_STATUS		0x0198	// MSR_IA32_PERF_STS in XNU
 #define	MSR_IA32_PERF_CONTROL		0x0199	// IA32_PERF_CTL
 
-#define MSR_FLEX_RATIO				0x0194
+#ifndef MSR_FLEX_RATIO
+	#define MSR_FLEX_RATIO			0x0194
+#endif
+
 #define IA32_CLOCK_MODULATION		0x019A
 #define IA32_THERM_STATUS			0x019C
 
@@ -69,6 +78,14 @@
 #define IA32_ENERGY_PERF_BIAS		0x01B0
 #define IA32_PLATFORM_DCA_CAP		0x01F8
 
+#define MSR_PKG_C2_RESIDENCY		0x60D
+#define MSR_PKG_C3_RESIDENCY		0x3F8
+#define MSR_PKG_C6_RESIDENCY		0x3F9
+#define MSR_PKG_C7_RESIDENCY		0x3FA
+
+#define MSR_CORE_C3_RESIDENCY		0x3FC
+#define MSR_CORE_C6_RESIDENCY		0x3FD
+#define MSR_CORE_C7_RESIDENCY		0x3FE
 
 // Sandy Bridge & JakeTown specific 'Running Average Power Limit' MSR's.
 #define MSR_RAPL_POWER_UNIT			0x606
@@ -89,13 +106,19 @@
 #define MSR_PP1_ENERGY_STATUS		0x641
 #define MSR_PP1_POLICY				0x642
 
+// Ivy Bridge Specific MSR's
+#define MSR_CONFIG_TDP_NOMINAL		0x648
+#define MSR_CONFIG_TDP_LEVEL1		0x649
+#define MSR_CONFIG_TDP_LEVEL2		0x64A
+#define MSR_CONFIG_TDP_CONTROL		0x64B
+#define MSR_TURBO_ACTIVATION_RATIO	0x64C
+
 // JakeTown only Memory MSR's.
 #define MSR_DRAM_POWER_LIMIT		0x618
 #define MSR_DRAM_ENERGY_STATUS		0x619
 #define MSR_DRAM_PERF_STATUS		0x61B
 #define MSR_DRAM_POWER_INFO			0x61C
 
-
 // CPUID leaf index values (pointing to the right spot in CPUID/LEAF array).
 
 #define LEAF_0				0			// DHP: Formerly known as CPUID_n
@@ -110,7 +133,6 @@
 
 #define MAX_CPUID_LEAVES	9			// DHP: Formerly known as MAX_CPUID
 
-
 /* Copied from: xnu/osfmk/i386/cpuid.h */
 #define CPU_MODEL_YONAH  			0x0E
 #define CPU_MODEL_MEROM				0x0F
@@ -128,8 +150,9 @@
 #define CPU_MODEL_IB_CORE			0x3A	// Ivy Bridge Core Processors (LGA 1155)
 #define CPU_MODEL_IB_CORE_EX		0x3B	// Ivy Bridge Core Processors (LGA 2011)
 
-#define DALES_BRIDGE  1
-#define SANDY_BRIDGE  2
-#define IVY_BRIDGE    4
+#define DALES_BRIDGE	1
+#define SANDY_BRIDGE	2
+#define IVY_BRIDGE		4
+#define HASWELL			8
 
 #endif /* !__LIBSAIO_CPU_ESSENTIALS_H */

From ed783d2f2183cdb5efb79be725a8397cf7d9c579 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 28 Feb 2013 10:39:29 +0100
Subject: [PATCH 305/623] Updating script to v5.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Get processor label from ioreg – updates $gProcLabel
Thanks to alexlov for reporting this bug!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 24 +++++++++++++++++-------
 i386/libsaio/cpu/essentials.h        |  1 +
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index c5aaf78..2a8e7db 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 5.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 5.2 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -55,6 +55,7 @@
 #			- Now supporting up to 16 logical cores (Jeroen, Februari 2013)
 #			- Improved argument checking, now supporting a fourth argument (Jeroen/Pike, Februari 2013)
 #			- Suppress override output when possible (Jeroen, Februari 2013)
+#			- Get processor label from ioreg (Jeroen/Pike, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -132,7 +133,7 @@ let gDebug=1
 let gBaseFrequency=1600
 
 #
-# Change this label to "P00" when your DSDT uses 'P00n' instead of 'CPUn'.
+# This is the default processor label (verified by _setProcessorLabel).
 #
 gProcLabel="CPU"
 
@@ -140,7 +141,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=5.1
+gScriptVersion=5.2
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -501,7 +502,6 @@ function _printDebugInfo()
 
 function _printProcessorDefinitions()
 {
-echo "IN"
     let currentCPU=0;
 
     while [ $currentCPU -lt $1 ]; do
@@ -960,18 +960,28 @@ function _getBoardID()
     #
     # Grab 'board-id' property from ioreg (stripped with sed / RegEX magic).
     #
-    boardID=`ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *["=<>]//g' -e 's/board-id//'`
+    boardID=$(ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *["=<>]//g' -e 's/board-id//')
+}
+
+#--------------------------------------------------------------------------------
+
+function _setProcessorLabel()
+{
+    local data=$(ioreg -p IODeviceTree -c IOACPIPlatformDevice -k cpu-type | egrep name  | sed -e 's/ *[-|="<a-z>]//g')
+    let gProcLabel=${cpuLabel[0]}
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUtype()
 {
+    _setProcessorLabel
+
     #
     # Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
     #
-    local grepStr=`ioreg -p IODeviceTree -n CPU0@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g'`
-    #
+    local grepStr=$(ioreg -p IODeviceTree -n "$gProcLabel"0@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g')
+
     # Swap bytes with help of ${str:pos:num}
     #
     echo ${grepStr:2:2}${grepStr:0:2}
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 9b7313e..04feeec 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -77,6 +77,7 @@
 
 #define IA32_ENERGY_PERF_BIAS		0x01B0
 #define IA32_PLATFORM_DCA_CAP		0x01F8
+#define MSR_POWER_CTL				0x01FC
 
 #define MSR_PKG_C2_RESIDENCY		0x60D
 #define MSR_PKG_C3_RESIDENCY		0x3F8

From 1dbf4b97e43bc26e931deb8122941da1da490a54 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 1 Mar 2013 16:31:23 +0100
Subject: [PATCH 306/623] Bug fix for processor labels with double/triple
 digits

This is part one (too busy with something else)
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 2a8e7db..8f1957b 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -968,7 +968,14 @@ function _getBoardID()
 function _setProcessorLabel()
 {
     local data=$(ioreg -p IODeviceTree -c IOACPIPlatformDevice -k cpu-type | egrep name  | sed -e 's/ *[-|="<a-z>]//g')
-    let gProcLabel=${cpuLabel[0]}
+    local cpuLabels=($data)
+
+    if [[ ${#cpuLabels[@]} -gt 0 ]];
+        then
+            gFirstProcessorLabel=${cpuLabels[0]}
+        else
+            _exitWithError 6
+    fi
 }
 
 #--------------------------------------------------------------------------------
@@ -980,7 +987,7 @@ function _getCPUtype()
     #
     # Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
     #
-    local grepStr=$(ioreg -p IODeviceTree -n "$gProcLabel"0@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g')
+    local grepStr=$(ioreg -p IODeviceTree -n "$gFirstProcessorLabel"@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g')
 
     # Swap bytes with help of ${str:pos:num}
     #
@@ -1455,6 +1462,9 @@ function _exitWithError()
         5) echo -e "\nError: Unknown processor number... exiting\n" 1>&2
            exit 5
            ;;
+        6) echo -e "\nError: Processor label not found... exiting\n" 1>&2
+           exit 6
+           ;;
         *) exit 1
            ;;
     esac

From 111a82b3ad9caf2f3e55ab11553759edb3721ba9 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 1 Mar 2013 16:36:02 +0100
Subject: [PATCH 307/623] Initial commit for
 AppleIntelCPUPowerManagementInfo.kext

AppleIntelCPUPowerManagementInfo.kext is the successor of MSRdumper.kext
Soon to be expanded with C-State and Graphics PM info (secret code
update)
---
 .gitignore                                    |   8 +-
 .../project.pbxproj                           | 303 ++++++++++++++++++
 .../AppleIntelCPUPowerManagementInfo.cpp      | 193 +++++++++++
 .../AppleIntelCPUPowerManagementInfo.h        |  52 +++
 ...nfo-AppleIntelCPUPowerManagementInfo.plist |  55 ++++
 .../InfoPlist.strings                         |   2 +
 6 files changed, 612 insertions(+), 1 deletion(-)
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj/project.pbxproj
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/InfoPlist.strings

diff --git a/.gitignore b/.gitignore
index 3180408..5a21fba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,11 @@ i386/util/libcc_kext.a
 
 MODEL
 
-i386/libsaio/cpu/tools/PMinfo
+xcuserdata
+project.xcworkspace
+
+i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/secretCode.h
+i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj/xcuserdata
+i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj/project.xcworkspace
+
 i386/libsaio/smbios/tools/smbios2struct3
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj/project.pbxproj b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..64dbaed
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj/project.pbxproj
@@ -0,0 +1,303 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		5600B62D138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5600B62C138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.h */; };
+		5600B62F138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5600B62E138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		5600B620138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.kext */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppleIntelCPUPowerManagementInfo.kext; sourceTree = BUILT_PRODUCTS_DIR; };
+		5600B624138A9BC80001A2BC /* Kernel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kernel.framework; path = System/Library/Frameworks/Kernel.framework; sourceTree = SDKROOT; };
+		5600B627138A9BC80001A2BC /* Info-AppleIntelCPUPowerManagementInfo.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-AppleIntelCPUPowerManagementInfo.plist"; sourceTree = "<group>"; };
+		5600B62B138A9BC80001A2BC /* InfoPlist.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = InfoPlist.strings; sourceTree = "<group>"; };
+		5600B62C138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppleIntelCPUPowerManagementInfo.h; sourceTree = "<group>"; };
+		5600B62E138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AppleIntelCPUPowerManagementInfo.cpp; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		5600B61B138A9BC80001A2BC /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		5600B613138A9BC80001A2BC = {
+			isa = PBXGroup;
+			children = (
+				5600B625138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo */,
+				5600B621138A9BC80001A2BC /* Products */,
+				5600B624138A9BC80001A2BC /* Kernel.framework */,
+			);
+			sourceTree = "<group>";
+		};
+		5600B621138A9BC80001A2BC /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				5600B620138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.kext */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		5600B625138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo */ = {
+			isa = PBXGroup;
+			children = (
+				9015B9A516DCCD8700FCE81D /* Headers */,
+				9015B9A416DCCD7800FCE81D /* Source */,
+				5600B626138A9BC80001A2BC /* Resources */,
+			);
+			name = AppleIntelCPUPowerManagementInfo;
+			path = AppleIntelCPUPowerManagementInfo;
+			sourceTree = "<group>";
+		};
+		5600B626138A9BC80001A2BC /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				5600B627138A9BC80001A2BC /* Info-AppleIntelCPUPowerManagementInfo.plist */,
+				5600B62B138A9BC80001A2BC /* InfoPlist.strings */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		9015B9A416DCCD7800FCE81D /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				5600B62E138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.cpp */,
+			);
+			name = Source;
+			sourceTree = "<group>";
+		};
+		9015B9A516DCCD8700FCE81D /* Headers */ = {
+			isa = PBXGroup;
+			children = (
+				5600B62C138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.h */,
+			);
+			name = Headers;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		5600B61C138A9BC80001A2BC /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5600B62D138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		5600B61F138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 5600B632138A9BC80001A2BC /* Build configuration list for PBXNativeTarget "AppleIntelCPUPowerManagementInfo" */;
+			buildPhases = (
+				5600B61A138A9BC80001A2BC /* Sources */,
+				5600B61B138A9BC80001A2BC /* Frameworks */,
+				5600B61C138A9BC80001A2BC /* Headers */,
+				5600B61D138A9BC80001A2BC /* Resources */,
+				5600B61E138A9BC80001A2BC /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = AppleIntelCPUPowerManagementInfo;
+			productName = AppleIntelCPUPowerManagementInfo;
+			productReference = 5600B620138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.kext */;
+			productType = "com.apple.product-type.kernel-extension";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		5600B615138A9BC80001A2BC /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0460;
+			};
+			buildConfigurationList = 5600B618138A9BC80001A2BC /* Build configuration list for PBXProject "AppleIntelCPUPowerManagementInfo" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 5600B613138A9BC80001A2BC;
+			productRefGroup = 5600B621138A9BC80001A2BC /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				5600B61F138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		5600B61D138A9BC80001A2BC /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXRezBuildPhase section */
+		5600B61E138A9BC80001A2BC /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXRezBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		5600B61A138A9BC80001A2BC /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5600B62F138A9BC80001A2BC /* AppleIntelCPUPowerManagementInfo.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		5600B630138A9BC80001A2BC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALTERNATE_GROUP = wheel;
+				ALTERNATE_OWNER = root;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = NO;
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
+				GCC_OPTIMIZATION_LEVEL = s;
+				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_GROUP = wheel;
+				INSTALL_OWNER = root;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
+			};
+			name = Debug;
+		};
+		5600B631138A9BC80001A2BC /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALTERNATE_GROUP = wheel;
+				ALTERNATE_OWNER = root;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = NO;
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INSTALL_GROUP = wheel;
+				INSTALL_OWNER = root;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
+			};
+			name = Release;
+		};
+		5600B633138A9BC80001A2BC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALTERNATE_GROUP = wheel;
+				ALTERNATE_OWNER = root;
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 1.0.0d1;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = "";
+				INFOPLIST_FILE = "AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist";
+				MODULE_NAME = com.apple.kext.AppleIntelCPUPowerManagementInfo;
+				MODULE_VERSION = 1.0.0d1;
+				PRODUCT_NAME = AppleIntelCPUPowerManagementInfo;
+				VALID_ARCHS = x86_64;
+				VERSION_INFO_BUILDER = root;
+				WRAPPER_EXTENSION = kext;
+			};
+			name = Debug;
+		};
+		5600B634138A9BC80001A2BC /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALTERNATE_GROUP = wheel;
+				ALTERNATE_OWNER = root;
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = YES;
+				CURRENT_PROJECT_VERSION = 1.0.0d1;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = "";
+				INFOPLIST_FILE = "AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist";
+				MODULE_NAME = com.apple.kext.AppleIntelCPUPowerManagementInfo;
+				MODULE_VERSION = 1.0.0d1;
+				PRODUCT_NAME = AppleIntelCPUPowerManagementInfo;
+				VALID_ARCHS = x86_64;
+				VERSION_INFO_BUILDER = root;
+				WRAPPER_EXTENSION = kext;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		5600B618138A9BC80001A2BC /* Build configuration list for PBXProject "AppleIntelCPUPowerManagementInfo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5600B630138A9BC80001A2BC /* Debug */,
+				5600B631138A9BC80001A2BC /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		5600B632138A9BC80001A2BC /* Build configuration list for PBXNativeTarget "AppleIntelCPUPowerManagementInfo" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5600B633138A9BC80001A2BC /* Debug */,
+				5600B634138A9BC80001A2BC /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 5600B615138A9BC80001A2BC /* Project object */;
+}
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
new file mode 100644
index 0000000..72aedc8
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2012-2013 Pike R. Alpha. All rights reserved.
+ *
+ * Original idea and initial development of MSRDumper.kext (c) 2011 by RevoGirl.
+ *
+ * Thanks to George for his help and continuation of Sam's work, but it is
+ * time for us to push the envelope and add some really interesting stuff.
+ *
+ */
+
+#include "AppleIntelCPUPowerManagementInfo.h"
+
+//==============================================================================
+
+void AppleIntelCPUPowerManagementInfo::reportMSRs(uint8_t aModel)
+{
+	IOLog("MSR_CORE_THREAD_COUNT......(0x35)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_THREAD_COUNT));
+
+	IOLog("MSR_PLATFORM_INFO..........(0xCE)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PLATFORM_INFO));
+
+	IOLog("MSR_PMG_CST_CONFIG_CONTROL.(0xE2)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PMG_CST_CONFIG_CONTROL));
+	IOLog("MSR_PMG_IO_CAPTURE_BASE....(0xE4)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PMG_IO_CAPTURE_BASE));
+	IOLog("IA32_MPERF.................(0xE7)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MPERF));
+	IOLog("IA32_APERF.................(0xE8)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_APERF));
+
+	IOLog("MSR_IA32_PERF_STATUS.......(0x198) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_STATUS));
+	IOLog("MSR_IA32_PERF_CONTROL......(0x199) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_CONTROL));
+	IOLog("IA32_CLOCK_MODULATION......(0x19A) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_CLOCK_MODULATION));
+	IOLog("IA32_THERM_STATUS..........(0x19C) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_THERM_STATUS));
+
+	IOLog("IA32_MISC_ENABLES..........(0x1A0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MISC_ENABLES));
+	IOLog("MSR_MISC_PWR_MGMT..........(0x1AA) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_MISC_PWR_MGMT));
+	IOLog("MSR_TURBO_RATIO_LIMIT......(0x1AD) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_RATIO_LIMIT));
+
+	IOLog("IA32_ENERGY_PERF_BIAS......(0x1B0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_ENERGY_PERF_BIAS));
+
+	IOLog("MSR_POWER_CTL..............(0x1FC) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_POWER_CTL));
+
+	IOLog("rdmsr64....................(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(0x602));
+	IOLog("MSR_RAPL_POWER_UNIT........(0x606) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_RAPL_POWER_UNIT));
+	IOLog("MSR_PKG_POWER_LIMIT........(0x610) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_POWER_LIMIT));
+	IOLog("MSR_PKG_ENERGY_STATUS......(0x611) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_ENERGY_STATUS));
+
+	IOLog("MSR_PP0_POWER_LIMIT........(0x638) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POWER_LIMIT));
+	IOLog("MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
+	IOLog("MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
+
+	if ((aModel == CPU_MODEL_SB_CORE) || aModel == (CPU_MODEL_IB_CORE))
+	{
+		IOLog("MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
+		IOLog("MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
+		IOLog("MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY));
+	}
+
+	if ((aModel == CPU_MODEL_IB_CORE) || (aModel == CPU_MODEL_IB_CORE_EX))
+	{
+		IOLog("MSR_CONFIG_TDP_NOMINAL.....(0x648) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_NOMINAL));
+		IOLog("MSR_CONFIG_TDP_LEVEL1......(0x649) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL1));
+		IOLog("MSR_CONFIG_TDP_LEVEL2......(0x64a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL2));
+		IOLog("MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
+		IOLog("MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
+	}
+}
+
+//==============================================================================
+
+IOReturn AppleIntelCPUPowerManagementInfo::getMultiplier(void)
+{
+	timerEventSource->setTimeoutTicks(gInterval);
+	gCoreMultipliers |= (1ULL << (rdmsr64(MSR_IA32_PERF_STS) >> 8));
+
+	if (!loopLock)
+	{
+		loopLock = true;
+
+		if (gCoreMultipliers != gTriggeredPStates)
+		{
+			gTriggeredPStates = gCoreMultipliers;
+			IOLog("AICPUPMI: P-States [ ");
+
+			for (int currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
+			{
+				UInt64 value = (1ULL << currentBit);
+				
+				if ((gTriggeredPStates & value) == value)
+				{
+					IOLog("%d ", currentBit);
+				}
+			}
+
+			IOLog("]\n");
+		}
+
+		loopLock = false;
+
+		return kIOReturnSuccess;
+	}
+
+	return kIOReturnTimeout;
+}
+
+//==============================================================================
+
+bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
+{
+	if (IOService::start(provider))
+	{
+		timerEventSource = IOTimerEventSource::timerEventSource(this, OSMemberFunctionCast(IOTimerEventSource::Action, this, &AppleIntelCPUPowerManagementInfo::getMultiplier));
+		workLoop = getWorkLoop();
+
+		if (timerEventSource && workLoop && (kIOReturnSuccess == workLoop->addEventSource(timerEventSource)))
+		{
+			this->registerService(0);
+
+			uint32_t cpuid_reg[4];
+			do_cpuid(0x00000001, cpuid_reg);
+
+			uint8_t cpuModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
+			reportMSRs(cpuModel);
+
+			UInt64 msr = rdmsr64(MSR_PLATFORM_INFO);
+			gMinRatio = (UInt8)((msr >> 40) & 0xff);
+			IOLog("Low Frequency Mode : %d00 MHz\n", gMinRatio);
+ 
+			gClockRatio = (UInt8)((msr >> 8) & 0xff);
+			IOLog("Clock Speed        : %d00 MHz\n", gClockRatio);
+
+			if (turboEnabled)
+			{
+				msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
+				gMaxRatio = (UInt8)(msr & 0xff);
+				IOLog("Max Turbo Frequency: %d00 MHz\n", gMaxRatio);
+			}
+			else
+			{
+				gMaxRatio = gClockRatio;
+				IOLog("Max Frequency      : %d00 MHz\n", gMaxRatio);
+			}
+
+			timerEventSource->enable();
+			timerEventSource->setTimeoutMS(500);
+
+			return true;
+		}
+	}
+
+	return false;
+}
+
+//==============================================================================
+
+void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
+{
+	if (timerEventSource)
+	{
+		timerEventSource->disable();
+		timerEventSource->cancelTimeout();
+
+		if (workLoop)
+		{
+			workLoop->removeEventSource(timerEventSource);
+			workLoop->release();
+			workLoop = NULL;
+		}
+
+		timerEventSource->release();
+		timerEventSource = NULL;
+	}
+
+	super::stop(provider);
+}
+
+//==============================================================================
+
+void AppleIntelCPUPowerManagementInfo::free()
+{
+	if (timerEventSource)
+	{
+		timerEventSource->cancelTimeout();
+		
+		if (workLoop)
+		{
+			workLoop->removeEventSource(timerEventSource);
+			workLoop->release();
+			workLoop = NULL;
+		}
+		
+		timerEventSource->release();
+		timerEventSource = NULL;
+	}
+
+	super::free();
+}
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
new file mode 100644
index 0000000..f580639
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2012-2013 Pike R. Alpha. All rights reserved.
+ *
+ * Original idea and initial development of MSRDumper.kext (c) 2011 by RevoGirl.
+ *
+ * Thanks to George for his help and continuation of Sam's work, but it is
+ * time for us to push the envelope and add some really interesting stuff.
+ *
+ */
+
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOTimerEventSource.h>
+
+#include <i386/cpuid.h>
+#include <i386/proc_reg.h>
+
+#include "../../../essentials.h"
+
+#define super IOService
+
+class AppleIntelCPUPowerManagementInfo : public IOService
+{
+    OSDeclareDefaultStructors (AppleIntelCPUPowerManagementInfo);
+
+private:
+    IOWorkLoop			*workLoop;
+    IOTimerEventSource	*timerEventSource;
+
+	virtual IOReturn getMultiplier(void);
+
+	void reportMSRs(uint8_t aModel);
+
+	bool loopLock = false;
+
+	UInt16	gInterval	= 50;
+	UInt8	gMinRatio	= 0;
+	UInt8	gClockRatio	= 0;
+	UInt8	gMaxRatio	= 0;
+
+	UInt64	gCoreMultipliers;
+	UInt64	gTriggeredPStates;
+
+public:
+    virtual bool start(IOService * provider);
+    virtual void stop(IOService * provider);
+    virtual void free(void);
+};
+
+OSDefineMetaClassAndStructors(AppleIntelCPUPowerManagementInfo, IOService)
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
new file mode 100644
index 0000000..dfdd07c
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.apple.driver.${PRODUCT_NAME:identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>KEXT</string>
+	<key>CFBundleShortVersionString</key>
+	<string>4.0.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>OSBundleRequired</key>
+	<string>Root</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>IOKitPersonalities</key>
+	<dict>
+		<key>AppleIntelCPUPowerManagementInfo</key>
+		<dict>
+			<key>CFBundleIdentifier</key>
+			<string>com.apple.driver.${PRODUCT_NAME:identifier}</string>
+			<key>IOClass</key>
+			<string>${PRODUCT_NAME:identifier}</string>
+			<key>IOMatchCategory</key>
+			<string>${PRODUCT_NAME:identifier}</string>
+			<key>IOProviderClass</key>
+			<string>IOResources</string>
+			<key>IOResourceMatch</key>
+			<string>IOKit</string>
+		</dict>
+	</dict>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>com.apple.kpi.bsd</key>
+		<string>10.4</string>
+		<key>com.apple.kpi.iokit</key>
+		<string>10.4</string>
+		<key>com.apple.kpi.libkern</key>
+		<string>10.4</string>
+		<key>com.apple.kpi.mach</key>
+		<string>10.4</string>
+		<key>com.apple.kpi.unsupported</key>
+		<string>10.4</string>
+	</dict>
+</dict>
+</plist>
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/InfoPlist.strings b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/InfoPlist.strings
new file mode 100644
index 0000000..19f3055
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+NSHumanReadableCopyright = "Copyright © 2012-2013 Pike R. Alpha. All rights reserved";
\ No newline at end of file

From 9b4a2323e57d0cdf37db7f7ac3c236303db45920 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 1 Mar 2013 16:57:00 +0100
Subject: [PATCH 308/623] Oops

Fixing my copy/paste error
---
 .../AppleIntelCPUPowerManagementInfo.cpp                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 72aedc8..cc76bb3 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -125,7 +125,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 			gClockRatio = (UInt8)((msr >> 8) & 0xff);
 			IOLog("Clock Speed        : %d00 MHz\n", gClockRatio);
 
-			if (turboEnabled)
+			if (!((rdmsr64(IA32_MISC_ENABLES) >> 32) & 0x40))	// Turbo Mode Enabled?
 			{
 				msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
 				gMaxRatio = (UInt8)(msr & 0xff);

From d328a4fdbdbfc142fcdff008d8e148e169160417 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 1 Mar 2013 20:06:39 +0100
Subject: [PATCH 309/623] Fix Haswell and IB Xeon CPU detection

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 8f1957b..7399ff2 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -1526,13 +1526,13 @@ function main()
             let gBridgeType=2
         fi
 
-        if (($model==0x3A || $model==0x3B)); then
+        if (($model==0x3A || $model==0x3B || $model==0x3E)); then
             let assumedTDP=1
             let gTdp=77
             let gBridgeType=4
         fi
 
-        if (($model==0x4A || $model==0x4B)); then
+        if (($model==0x3C || $model==0x3F || $model==0x45)); then
             let assumedTDP=1
             let gTdp=84
             let gBridgeType=8

From ec0c40313be9290231bc5eb58f398f3fb03f7761 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 1 Mar 2013 20:07:35 +0100
Subject: [PATCH 310/623] Fix Haswell and IB Xeon CPU detection

---
 i386/libsaio/cpu/essentials.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 04feeec..aed1072 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -150,6 +150,11 @@
 #define CPU_MODEL_WESTMERE_EX		0x2F
 #define CPU_MODEL_IB_CORE			0x3A	// Ivy Bridge Core Processors (LGA 1155)
 #define CPU_MODEL_IB_CORE_EX		0x3B	// Ivy Bridge Core Processors (LGA 2011)
+#define CPU_MODEL_IB_CORE_XEON		0x3E
+
+#define CPU_MODEL_HASWELL_CORE_EX	0x3C
+#define CPU_MODEL_HASWELL_CORE_EX	0x3F
+#define CPU_MODEL_HASWELL_CORE_EX	0x45
 
 #define DALES_BRIDGE	1
 #define SANDY_BRIDGE	2

From 28aefa16e152a6cee726aa5fb11d0e1c875cbb48 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 1 Mar 2013 20:08:34 +0100
Subject: [PATCH 311/623] Demo code for Jeroen/Dave

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 163 ++++++++++--------
 .../AppleIntelCPUPowerManagementInfo.h        |  34 ++--
 2 files changed, 115 insertions(+), 82 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index cc76bb3..98942b8 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -10,6 +10,7 @@
 
 #include "AppleIntelCPUPowerManagementInfo.h"
 
+
 //==============================================================================
 
 void AppleIntelCPUPowerManagementInfo::reportMSRs(uint8_t aModel)
@@ -60,43 +61,79 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(uint8_t aModel)
 		IOLog("MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
 		IOLog("MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
 	}
+	
+	IOLog("MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
+	IOLog("MSR_PKG_C3_RESIDENCY.......(0x3f8) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C3_RESIDENCY));
+	IOLog("MSR_PKG_C6_RESIDENCY.......(0x3f9) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C6_RESIDENCY));
+	IOLog("MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+}
+
+//==============================================================================
+
+inline void getCStates(void *arg)
+{
+	UInt8 logicalCoreNumber = cpu_number();
+
+	IOLog("MSR_CORE[%d]_C3_RESIDENCY......(0x3fc) : 0x%llX\n", logicalCoreNumber, (unsigned long long)rdmsr64(MSR_CORE_C3_RESIDENCY));
+	IOLog("MSR_CORE[%d]_C6_RESIDENCY......(0x3fd) : 0x%llX\n", logicalCoreNumber, (unsigned long long)rdmsr64(MSR_CORE_C6_RESIDENCY));
+	IOLog("MSR_CORE[%d]_C7_RESIDENCY......(0x3fe) : 0x%llX\n", logicalCoreNumber, (unsigned long long)rdmsr64(MSR_CORE_C7_RESIDENCY));
 }
 
 //==============================================================================
 
-IOReturn AppleIntelCPUPowerManagementInfo::getMultiplier(void)
+IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 {
-	timerEventSource->setTimeoutTicks(gInterval);
 	gCoreMultipliers |= (1ULL << (rdmsr64(MSR_IA32_PERF_STS) >> 8));
 
-	if (!loopLock)
+	timerEventSource->setTimeoutTicks(Interval);
+
+	if (loopLock)
 	{
-		loopLock = true;
+		return kIOReturnTimeout;
+	}
+	
+	loopLock = true;
 
-		if (gCoreMultipliers != gTriggeredPStates)
-		{
-			gTriggeredPStates = gCoreMultipliers;
-			IOLog("AICPUPMI: P-States [ ");
+	UInt32 magic = 0;
+	IOSimpleLockLock(simpleLock);
+	mp_rendezvous_no_intrs(getCStates, (void *)&magic);
+	IOSimpleLockUnlock(simpleLock);
 
-			for (int currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
+	if (gCoreMultipliers != gTriggeredPStates)
+	{
+		gTriggeredPStates = gCoreMultipliers;
+		IOLog("AICPUPMI: P-States [ ");
+		
+		for (int currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
+		{
+			UInt64 value = (1ULL << currentBit);
+			
+			if ((gTriggeredPStates & value) == value)
 			{
-				UInt64 value = (1ULL << currentBit);
-				
-				if ((gTriggeredPStates & value) == value)
-				{
-					IOLog("%d ", currentBit);
-				}
+				IOLog("%d ", currentBit);
 			}
-
-			IOLog("]\n");
 		}
+		
+		IOLog("]\n");
+	}
 
-		loopLock = false;
+	loopLock = false;
 
-		return kIOReturnSuccess;
-	}
+	return kIOReturnSuccess;
+}
 
-	return kIOReturnTimeout;
+//==============================================================================
+
+IOService* AppleIntelCPUPowerManagementInfo::probe(IOService *provider, SInt32 *score)
+{
+	IOService *ret = super::probe(provider, score);
+	
+	if (ret != this)
+	{
+		return 0;
+	}
+	
+	return ret;
 }
 
 //==============================================================================
@@ -105,42 +142,46 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 {
 	if (IOService::start(provider))
 	{
-		timerEventSource = IOTimerEventSource::timerEventSource(this, OSMemberFunctionCast(IOTimerEventSource::Action, this, &AppleIntelCPUPowerManagementInfo::getMultiplier));
-		workLoop = getWorkLoop();
+		simpleLock = IOSimpleLockAlloc();
 
-		if (timerEventSource && workLoop && (kIOReturnSuccess == workLoop->addEventSource(timerEventSource)))
+		if (simpleLock)
 		{
-			this->registerService(0);
+			timerEventSource = IOTimerEventSource::timerEventSource(this, OSMemberFunctionCast(IOTimerEventSource::Action, this, &AppleIntelCPUPowerManagementInfo::loopTimerEvent));
+			workLoop = getWorkLoop();
+
+			if (timerEventSource && workLoop && (kIOReturnSuccess == workLoop->addEventSource(timerEventSource)))
+			{
+				this->registerService(0);
 
-			uint32_t cpuid_reg[4];
-			do_cpuid(0x00000001, cpuid_reg);
+				uint32_t cpuid_reg[4];
+				do_cpuid(0x00000001, cpuid_reg);
 
-			uint8_t cpuModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
-			reportMSRs(cpuModel);
+				uint8_t cpuModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
+				reportMSRs(cpuModel);
 
-			UInt64 msr = rdmsr64(MSR_PLATFORM_INFO);
-			gMinRatio = (UInt8)((msr >> 40) & 0xff);
-			IOLog("Low Frequency Mode : %d00 MHz\n", gMinRatio);
+				UInt64 msr = rdmsr64(MSR_PLATFORM_INFO);
+				gMinRatio = (UInt8)((msr >> 40) & 0xff);
+				IOLog("Low Frequency Mode : %d00 MHz\n", gMinRatio);
  
-			gClockRatio = (UInt8)((msr >> 8) & 0xff);
-			IOLog("Clock Speed        : %d00 MHz\n", gClockRatio);
+				gClockRatio = (UInt8)((msr >> 8) & 0xff);
+				IOLog("Clock Speed        : %d00 MHz\n", gClockRatio);
 
-			if (!((rdmsr64(IA32_MISC_ENABLES) >> 32) & 0x40))	// Turbo Mode Enabled?
-			{
-				msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
-				gMaxRatio = (UInt8)(msr & 0xff);
-				IOLog("Max Turbo Frequency: %d00 MHz\n", gMaxRatio);
-			}
-			else
-			{
-				gMaxRatio = gClockRatio;
-				IOLog("Max Frequency      : %d00 MHz\n", gMaxRatio);
-			}
+				if (!((rdmsr64(IA32_MISC_ENABLES) >> 32) & 0x40))	// Turbo Mode Enabled?
+				{
+					msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
+					gMaxRatio = (UInt8)(msr & 0xff);
+					IOLog("Max Turbo Frequency: %d00 MHz\n", gMaxRatio);
+				}
+				else
+				{
+					gMaxRatio = gClockRatio;
+					IOLog("Max Frequency      : %d00 MHz\n", gMaxRatio);
+				}
 
-			timerEventSource->enable();
-			timerEventSource->setTimeoutMS(500);
+				timerEventSource->setTimeoutMS(1000);
 
-			return true;
+				return true;
+			}
 		}
 	}
 
@@ -151,16 +192,17 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 
 void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
 {
-	if (timerEventSource)
+	if (simpleLock)
 	{
-		timerEventSource->disable();
-		timerEventSource->cancelTimeout();
+		IOSimpleLockFree(simpleLock);
+	}
 
+	if (timerEventSource)
+	{
 		if (workLoop)
 		{
+			timerEventSource->cancelTimeout();
 			workLoop->removeEventSource(timerEventSource);
-			workLoop->release();
-			workLoop = NULL;
 		}
 
 		timerEventSource->release();
@@ -174,20 +216,5 @@ void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
 
 void AppleIntelCPUPowerManagementInfo::free()
 {
-	if (timerEventSource)
-	{
-		timerEventSource->cancelTimeout();
-		
-		if (workLoop)
-		{
-			workLoop->removeEventSource(timerEventSource);
-			workLoop->release();
-			workLoop = NULL;
-		}
-		
-		timerEventSource->release();
-		timerEventSource = NULL;
-	}
-
 	super::free();
 }
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index f580639..3f1f385 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -21,32 +21,38 @@
 
 #define super IOService
 
+extern "C" void mp_rendezvous_no_intrs(void (*action_func)(void *), void * arg);
+extern "C" int cpu_number(void);
+
 class AppleIntelCPUPowerManagementInfo : public IOService
 {
-    OSDeclareDefaultStructors (AppleIntelCPUPowerManagementInfo);
+	OSDeclareDefaultStructors (AppleIntelCPUPowerManagementInfo);
 
 private:
-    IOWorkLoop			*workLoop;
-    IOTimerEventSource	*timerEventSource;
+	IOSimpleLock		*simpleLock;
+	IOWorkLoop			*workLoop;
+	IOTimerEventSource	*timerEventSource;
 
-	virtual IOReturn getMultiplier(void);
+	virtual IOReturn loopTimerEvent(void);
 
 	void reportMSRs(uint8_t aModel);
 
 	bool loopLock = false;
 
-	UInt16	gInterval	= 50;
-	UInt8	gMinRatio	= 0;
-	UInt8	gClockRatio	= 0;
-	UInt8	gMaxRatio	= 0;
-
-	UInt64	gCoreMultipliers;
-	UInt64	gTriggeredPStates;
+	UInt16 Interval	= 50;
 
 public:
-    virtual bool start(IOService * provider);
-    virtual void stop(IOService * provider);
-    virtual void free(void);
+	virtual IOService *	probe(IOService * provider, SInt32 * score);
+	virtual bool start(IOService * provider);
+	virtual void stop(IOService * provider);
+	virtual void free(void);
 };
 
 OSDefineMetaClassAndStructors(AppleIntelCPUPowerManagementInfo, IOService)
+
+UInt64	gCoreMultipliers;
+UInt64	gTriggeredPStates;
+
+UInt8	gMinRatio	= 0;
+UInt8	gClockRatio	= 0;
+UInt8	gMaxRatio	= 0;

From 1dd067cf7eed213fcbfde14b1cf5d5dc5104bfef Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 2 Mar 2013 01:01:15 +0100
Subject: [PATCH 312/623] Create /usr/local/bin and set ownership when required

Thanks to Apple_Tree for reporting this bug!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 7399ff2..05bf5ff 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -1032,7 +1032,8 @@ function _findIasl()
             # XXX: Jeroen, try curl --create-dirs without the mkdir here ;)
             if [ ! -d /usr/local/bin ]; then
                 printf "Creating target directory... "
-                sudo mkdir /usr/local/bin/
+                sudo mkdir -p /usr/local/bin/
+                sudo chown -R root:wheel /usr/local/bin/
             fi
 
             printf "Downloading iasl...\n"

From b33d42b44218aa6deecf3f64c88878328dbdd334 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 2 Mar 2013 01:14:01 +0100
Subject: [PATCH 313/623] Fix Haswell definitions

---
 i386/libsaio/cpu/essentials.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index aed1072..73c44be 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -152,8 +152,8 @@
 #define CPU_MODEL_IB_CORE_EX		0x3B	// Ivy Bridge Core Processors (LGA 2011)
 #define CPU_MODEL_IB_CORE_XEON		0x3E
 
-#define CPU_MODEL_HASWELL_CORE_EX	0x3C
-#define CPU_MODEL_HASWELL_CORE_EX	0x3F
+#define CPU_MODEL_HASWELL			0x3C
+#define CPU_MODEL_HASWELL_CORE		0x3F
 #define CPU_MODEL_HASWELL_CORE_EX	0x45
 
 #define DALES_BRIDGE	1

From c8fd7014f5535573a3966ea81961c317ce46f417 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 2 Mar 2013 01:14:39 +0100
Subject: [PATCH 314/623] Use a global instead of a function argument

---
 .../AppleIntelCPUPowerManagementInfo.h                          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 3f1f385..00b532d 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -56,3 +56,5 @@ UInt64	gTriggeredPStates;
 UInt8	gMinRatio	= 0;
 UInt8	gClockRatio	= 0;
 UInt8	gMaxRatio	= 0;
+
+UInt8	gCPUModel	= 0x2A;
\ No newline at end of file

From 41df1f0eea2d339a04ffaf5f737aea46560383b9 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 2 Mar 2013 01:19:31 +0100
Subject: [PATCH 315/623] Use a global instead of a function argument

MSR 0x60d, 0x3fa and 0x3fe are (mobile?) Sandy Bridge only.
---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 98942b8..ebc1c75 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -13,7 +13,7 @@
 
 //==============================================================================
 
-void AppleIntelCPUPowerManagementInfo::reportMSRs(uint8_t aModel)
+void AppleIntelCPUPowerManagementInfo::reportMSRs(void)
 {
 	IOLog("MSR_CORE_THREAD_COUNT......(0x35)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_THREAD_COUNT));
 
@@ -46,14 +46,14 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(uint8_t aModel)
 	IOLog("MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
 	IOLog("MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
 
-	if ((aModel == CPU_MODEL_SB_CORE) || aModel == (CPU_MODEL_IB_CORE))
+	if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_IB_CORE))
 	{
 		IOLog("MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
 		IOLog("MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
 		IOLog("MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY));
 	}
 
-	if ((aModel == CPU_MODEL_IB_CORE) || (aModel == CPU_MODEL_IB_CORE_EX))
+	if ((gCPUModel != CPU_MODEL_SB_CORE) && (gCPUModel != CPU_MODEL_SB_JAKETOWN))
 	{
 		IOLog("MSR_CONFIG_TDP_NOMINAL.....(0x648) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_NOMINAL));
 		IOLog("MSR_CONFIG_TDP_LEVEL1......(0x649) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL1));
@@ -61,11 +61,19 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(uint8_t aModel)
 		IOLog("MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
 		IOLog("MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
 	}
-	
-	IOLog("MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
+
+	if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN))
+	{
+		IOLog("MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
+	}
+
 	IOLog("MSR_PKG_C3_RESIDENCY.......(0x3f8) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C3_RESIDENCY));
 	IOLog("MSR_PKG_C6_RESIDENCY.......(0x3f9) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C6_RESIDENCY));
-	IOLog("MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+
+	if ((gCPUModel != CPU_MODEL_IB_CORE) && (gCPUModel != CPU_MODEL_IB_CORE_EX))
+	{
+		IOLog("MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+	}
 }
 
 //==============================================================================
@@ -76,7 +84,11 @@ inline void getCStates(void *arg)
 
 	IOLog("MSR_CORE[%d]_C3_RESIDENCY......(0x3fc) : 0x%llX\n", logicalCoreNumber, (unsigned long long)rdmsr64(MSR_CORE_C3_RESIDENCY));
 	IOLog("MSR_CORE[%d]_C6_RESIDENCY......(0x3fd) : 0x%llX\n", logicalCoreNumber, (unsigned long long)rdmsr64(MSR_CORE_C6_RESIDENCY));
-	IOLog("MSR_CORE[%d]_C7_RESIDENCY......(0x3fe) : 0x%llX\n", logicalCoreNumber, (unsigned long long)rdmsr64(MSR_CORE_C7_RESIDENCY));
+
+	if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN))
+	{
+		IOLog("MSR_CORE[%d]_C7_RESIDENCY......(0x3fe) : 0x%llX\n", logicalCoreNumber, (unsigned long long)rdmsr64(MSR_CORE_C7_RESIDENCY));
+	}
 }
 
 //==============================================================================
@@ -156,8 +168,8 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				uint32_t cpuid_reg[4];
 				do_cpuid(0x00000001, cpuid_reg);
 
-				uint8_t cpuModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
-				reportMSRs(cpuModel);
+				gCPUModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
+				reportMSRs();
 
 				UInt64 msr = rdmsr64(MSR_PLATFORM_INFO);
 				gMinRatio = (UInt8)((msr >> 40) & 0xff);

From 70f7739ebaaca0ffaa9708ab00ec57d9f88c3af9 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 2 Mar 2013 01:19:37 +0100
Subject: [PATCH 316/623] Use a global instead of a function argument

---
 .../AppleIntelCPUPowerManagementInfo.h                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 00b532d..0616e9e 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -35,7 +35,7 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 
 	virtual IOReturn loopTimerEvent(void);
 
-	void reportMSRs(uint8_t aModel);
+	void reportMSRs(void);
 
 	bool loopLock = false;
 

From 2204aa034f900d1c6fc5c7faa4210d1426e668ad Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 2 Mar 2013 01:35:54 +0100
Subject: [PATCH 317/623] Updating script to v5.3

Create /usr/local/bin when missing (Jeroen, Februari 2013)
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 05bf5ff..7353186 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 5.2 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 5.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -56,6 +56,7 @@
 #			- Improved argument checking, now supporting a fourth argument (Jeroen/Pike, Februari 2013)
 #			- Suppress override output when possible (Jeroen, Februari 2013)
 #			- Get processor label from ioreg (Jeroen/Pike, Februari 2013)
+#			- Create /usr/local/bin when missing (Jeroen, Februari 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -141,7 +142,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=5.2
+gScriptVersion=5.3
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 

From 5ad03b3cb880cc0b7d07007f407cc1443956b080 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 2 Mar 2013 01:40:00 +0100
Subject: [PATCH 318/623] Adding E5-2687W CPU data

Thanks to 'stinga11' for the data!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 7353186..476204c 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -188,6 +188,8 @@ let PROCESSOR_NUMBER_ERROR=5
 #
 
 gServerSandyBridgeCPUList=(
+# E5-2600 Xeon Processor Series
+E5-2687W,150,0,3100,3800,8,16
 # E5-1600 Xeon Processor Series
 E5-1660,130,0,3300,3900,6,12
 E5-1650,130,0,3200,3800,6,12

From 7e67bf9445a7703d10a94dcc22835fb878b52e54 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 3 Mar 2013 19:47:24 +0100
Subject: [PATCH 319/623] Updating script to v5.5

Changed warnings to make them pop out in the on-screen log
Now using the ACPI processor names of the running system
Now supporting up to 256/0xff logical processors
Command line argument for processor labels added
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 166 +++++++++++++++++++--------
 1 file changed, 115 insertions(+), 51 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 476204c..7e20dec 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 5.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 5.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -57,6 +57,10 @@
 #			- Suppress override output when possible (Jeroen, Februari 2013)
 #			- Get processor label from ioreg (Jeroen/Pike, Februari 2013)
 #			- Create /usr/local/bin when missing (Jeroen, Februari 2013)
+#			- Changed warnings to make them pop out in the on-screen log (Pike, March 2013)
+#			- Now using the ACPI processor names of the running system (Pike, March 2013)
+#			- Now supporting up to 256/0xff logical processors (Pike, March 2013)
+#			- Command line argument for processor labels added (Pike, March 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -83,6 +87,17 @@
 #           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70
 #           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70 1
 #
+# Usage (v5.5 and greater):
+#
+#           - ./ssdtPRGen.sh [processor number] [max turbo frequency] [TDP] [CPU type] [ACPI Processor Name]
+#
+#           - ./ssdtPRGen.sh E5-1650
+#
+#           - ./ssdtPRGen.sh 'E3-1220 V2'
+#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600
+#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70
+#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70 1
+#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70 1 CPU
 #
 
 # set -x # Used for tracing errors (can be used anywhere in the script).
@@ -142,7 +157,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=5.3
+gScriptVersion=5.5
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -182,6 +197,8 @@ let MAX_TURBO_FREQUENCY_ERROR=2
 let MAX_TDP_ERROR=3
 let TARGET_CPU_ERROR=4
 let PROCESSOR_NUMBER_ERROR=5
+let PROCESSOR_LABEL_LENGTH_ERROR=6
+let PROCESSOR_NAMES_ERROR=7
 
 #
 # Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
@@ -468,31 +485,29 @@ function _printHeader()
     echo '{'                                                                              >> $gSsdtPR
 }
 
-
 #--------------------------------------------------------------------------------
 
 function _printExternals()
 {
-    currentCPU=0;
+    let currentCPU=0;
 
-    while [ $currentCPU -lt $1 ]; do
-        printf "    External (\_PR_.$gProcLabel%X, DeviceObj)\n" $currentCPU            >> $gSsdtPR
+    while [ $currentCPU -lt $gLogicalCPUs ]; do
+        echo "    External (\_PR_.${gProcessorNames[$currentCPU]}, DeviceObj)"          >> $gSsdtPR
         let currentCPU+=1
     done
 
     echo ''                                                                             >> $gSsdtPR
 }
 
-
 #--------------------------------------------------------------------------------
 
 function _printDebugInfo()
 {
     if ((gDebug)); then
-        echo '    Store ("ssdtPRGen.sh v'$gScriptVersion'", Debug)'                     >> $gSsdtPR
+        echo '    Store ("ssdtPRGen version: '$gScriptVersion'", Debug)'                     >> $gSsdtPR
         echo '    Store ("baseFrequency    : '$gBaseFrequency'", Debug)'                >> $gSsdtPR
         echo '    Store ("frequency        : '$frequency'", Debug)'                     >> $gSsdtPR
-        echo '    Store ("logicalCPUs      : '$logicalCPUs'", Debug)'                   >> $gSsdtPR
+        echo '    Store ("logicalCPUs      : '$gLogicalCPUs'", Debug)'                  >> $gSsdtPR
         echo '    Store ("tdp              : '$gTdp'", Debug)'                          >> $gSsdtPR
         echo '    Store ("packageLength    : '$packageLength'", Debug)'                 >> $gSsdtPR
         echo '    Store ("turboStates      : '$turboStates'", Debug)'                   >> $gSsdtPR
@@ -508,11 +523,11 @@ function _printProcessorDefinitions()
     let currentCPU=0;
 
     while [ $currentCPU -lt $1 ]; do
-         printf "    External (\_PR_.$gProcLabel$currentCPU%x, DeviceObj)\n" $currentCPU >> $gSsdtPR
+        echo "    External (\_PR_.${gProcessorNames[$currentCPU]}, DeviceObj)"          >> $gSsdtPR
         let currentCPU+=1
     done
 
-    echo ''                                                                              >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
@@ -525,7 +540,7 @@ function _printScopeStart()
     # TODO: Remove this when CPUPM for IB works properly!
     let useWorkArounds=0
 
-    echo '    Scope (\_PR.'$gProcLabel'0)'                                              >> $gSsdtPR
+    echo '    Scope (\_PR.'${gProcessorNames[0]}')'                                     >> $gSsdtPR
     echo '    {'                                                                        >> $gSsdtPR
 
     #
@@ -717,7 +732,7 @@ function _printScopeACST()
             latency_C3=0xC6
 
             if ((gDebug)); then
-                echo '            Store ("CPU1 C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
+                echo '            Store ("'${gProcessorNames[1]}' C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
                 echo ''                                                                 >> $gSsdtPR
             fi
         else
@@ -736,7 +751,7 @@ function _printScopeACST()
             latency_C7=0xF5
 
             if ((gDebug)); then
-                echo '            Store ("CPU0 C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
+                echo '            Store ("'${gProcessorNames[0]}' C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
                 echo ''                                                                 >> $gSsdtPR
             fi
     fi
@@ -776,7 +791,7 @@ function _printScopeACST()
 
     let hintCode=0x00
 
-    echo '            /* Low Power Modes for '$gProcLabel$1' */'                        >> $gSsdtPR
+    echo "            /* Low Power Modes for ${gProcessorNames[$1]} */"                 >> $gSsdtPR
   printf "            Return (Package (0x%02x)\n" $pkgLength                            >> $gSsdtPR
     echo '            {'                                                                >> $gSsdtPR
     echo '                One,'                                                         >> $gSsdtPR
@@ -919,11 +934,11 @@ function _printScopeCPUn()
 {
     let currentCPU=1;
 
-    while [ $currentCPU -lt $1 ]; do
-        echo ''                                                                              >> $gSsdtPR
-      printf "    Scope (\_PR.$gProcLabel%X)" $currentCPU                                    >> $gSsdtPR
-        echo '    {'                                                                         >> $gSsdtPR
-        echo '        Method (APSS, 0, NotSerialized) { Return (\_PR.'$gProcLabel'0.APSS) }' >> $gSsdtPR
+    while [ $currentCPU -lt $gLogicalCPUs ]; do
+        echo ''                                                                                     >> $gSsdtPR
+        echo "    Scope (\_PR.${gProcessorNames[$currentCPU]})"                                     >> $gSsdtPR
+        echo '    {'                                                                                >> $gSsdtPR
+        echo "        Method (APSS, 0, NotSerialized) { Return (\_PR.${gProcessorNames[0]}.APSS) }" >> $gSsdtPR
 
         #
         # IB CPUPM tries to parse/execute CPUn.ACST (see debug data) and thus we add
@@ -934,15 +949,15 @@ function _printScopeCPUn()
                 then
                     _printScopeACST 1
                 else
-                    echo '        Method (ACST, 0, NotSerialized) { Return (\_PR.'$gProcLabel'1.ACST ()) }' >> $gSsdtPR
+                    echo "        Method (ACST, 0, NotSerialized) { Return (\_PR.${gProcessorNames[1]}.ACST ()) }" >> $gSsdtPR
             fi
         fi
 
-        echo '    }'                                                                         >> $gSsdtPR
+        echo '    }'                                                                                >> $gSsdtPR
         let currentCPU+=1
     done
 
-    echo '}'                                                                                 >> $gSsdtPR
+    echo '}'                                                                                        >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
@@ -968,29 +983,58 @@ function _getBoardID()
 
 #--------------------------------------------------------------------------------
 
-function _setProcessorLabel()
+function _getProcessorNames()
 {
-    local data=$(ioreg -p IODeviceTree -c IOACPIPlatformDevice -k cpu-type | egrep name  | sed -e 's/ *[-|="<a-z>]//g')
-    local cpuLabels=($data)
+    local acpiNames=$(ioreg -p IODeviceTree -c IOACPIPlatformDevice -k cpu-type | egrep name  | sed -e 's/ *[-|="<a-z>]//g')
+    gProcessorNames=($acpiNames)
+
+    if [[ ${#gProcessorNames[@]} -lt 2 ]]; then
+        _exitWithError $PROCESSOR_NAMES_ERROR
+    fi
+}
+
+#--------------------------------------------------------------------------------
 
-    if [[ ${#cpuLabels[@]} -gt 0 ]];
+function _updateProcessorNames()
+{
+    if [[ $gLogicalCPUs -le 0x0f ]];
         then
-            gFirstProcessorLabel=${cpuLabels[0]}
+             local label=${gProcLabel:0:3}
         else
-            _exitWithError 6
+             local label=${gProcLabel:0:2}
     fi
+
+    if [[ $1 -gt ${#gProcessorNames[@]} ]]; then
+        echo -e "\nWarning: Target CPU has $gLogicalCPUs logical cores, the running system only ${#gProcessorNames[@]}"
+        echo    "         Now using '$label' to extent the current range to $gLogicalCPUs..."
+        echo -e "         You may want to check/verify the generated DSDT_PR.dsl\n"
+    fi
+
+    let currentCPU=0
+
+    while [ $currentCPU -lt $1 ];
+    do
+        if [[ $1 -gt 0x0f && $currentCPU -le 0x0f ]];
+            then
+                local filler='0'
+            else
+                local filler=''
+        fi
+
+        gProcessorNames[$currentCPU]=${label}${filler}$(echo "obase=16; ${currentCPU}" | bc)
+
+        let currentCPU+=1
+    done
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUtype()
 {
-    _setProcessorLabel
-
     #
     # Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
     #
-    local grepStr=$(ioreg -p IODeviceTree -n "$gFirstProcessorLabel"@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g')
+    local grepStr=$(ioreg -p IODeviceTree -n "${gProcessorNames[0]}"@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g')
 
     # Swap bytes with help of ${str:pos:num}
     #
@@ -1202,7 +1246,7 @@ function _showLowPowerStates()
         local mask=1
         local cStates=$1
 
-        printf "Injected C-States for ${gProcLabel}${2} ("
+        printf "Injected C-States for ${gProcessorNames[$2]} ("
 
         for state in C1 C2 C3 C6 C7
         do
@@ -1466,9 +1510,12 @@ function _exitWithError()
         5) echo -e "\nError: Unknown processor number... exiting\n" 1>&2
            exit 5
            ;;
-        6) echo -e "\nError: Processor label not found... exiting\n" 1>&2
+        6) echo -e "\nError: Processor label length is less than 3... exiting\n" 1>&2
            exit 6
            ;;
+        7) echo -e "\nError: Processor label not found... exiting\n" 1>&2
+           exit 7
+           ;;
         *) exit 1
            ;;
     esac
@@ -1555,6 +1602,7 @@ function main()
     esac
 
     _getBoardID
+    _getProcessorNames
 
     local modelID=$(_getModelName)
     local cpu_type=$(_getCPUtype)
@@ -1580,7 +1628,8 @@ function main()
                 let maxTurboFrequency=$frequency
             fi
 
-            let logicalCPUs=${cpuData[6]}
+            let gLogicalCPUs=${cpuData[6]}
+
             IFS=$ifs
 
             echo 'With a maximum TDP of '$gTdp' Watt, as specified by Intel'
@@ -1592,19 +1641,19 @@ function main()
                 then
                     let gBaseFrequency=$lfm
                 else
-                    echo 'Warning: Low Frequency Mode is 0 (unknown)'
+                    echo -e "\nWarning: Low Frequency Mode is 0 (unknown)"
 
                     if (($gTypeCPU == gMobileCPU));
                         then
-                            echo 'Now using 1200 MHz for Mobile processor'
+                            echo -e "         Now using 1200 MHz for Mobile processor\n"
                             let gBaseFrequency=1200
                         else
-                            echo 'Now using 1600 MHz for Server/Desktop processors'
+                            echo -e "         Now using 1600 MHz for Server/Desktop processors\n"
                             let gBaseFrequency=1600
                     fi
             fi
         else
-            let logicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
+            let gLogicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
             let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
             let frequency=($frequency / 1000000)
 
@@ -1648,7 +1697,7 @@ function main()
         fi
     fi
 
-    if [ $# -eq 4 ]; then
+    if [ $# -ge 4 ]; then
         if [[ "$4" =~ ^[0-9]+$ ]];
             then
                 local detectedBridgeType=$gBridgeType
@@ -1675,7 +1724,22 @@ function main()
         fi
     fi
 
-    echo "Number logical CPU's: $logicalCPUs (Core Frequency: $frequency MHz)"
+    if [ $# -eq 5 ]; then
+        if [ ${#5} -eq 3 ];
+            then
+                gProcLabel=$(echo "$5" | tr '[:lower:]' '[:upper:]')
+                echo "Override value: Now using '$gProcLabel' for ACPI processor names!"
+                _updateProcessorNames ${#gProcessorNames[@]}
+            else
+                _exitWithError $PROCESSOR_LABEL_LENGTH_ERROR
+        fi
+    fi
+
+    echo "Number logical CPU's: $gLogicalCPUs (Core Frequency: $frequency MHz)"
+
+    if [ $gLogicalCPUs -gt ${#gProcessorNames[@]} ]; then
+        _updateProcessorNames $gLogicalCPUs
+    fi
 
     #
     # Check maxTurboFrequency
@@ -1713,8 +1777,8 @@ function main()
     echo "Number of P-States: $packageLength ($gBaseFrequency-$maxTurboFrequency MHz)"
 
     _printHeader
-    _printExternals $logicalCPUs
-    _printDebugInfo $logicalCPUs $gTdp $packageLength $turboStates $maxTurboFrequency
+    _printExternals
+    _printDebugInfo
     _printScopeStart $turboStates $packageLength
     _printPackages $gTdp $frequency $maxTurboFrequency
 
@@ -1725,7 +1789,7 @@ function main()
             _initSandyBridgeSetup
 
             _printScopeACST 0
-            _printScopeCPUn $logicalCPUs
+            _printScopeCPUn
         else
             local cpuTypeString="07"
 
@@ -1733,7 +1797,7 @@ function main()
 
             _printScopeACST 0
             _printMethodDSM
-            _printScopeCPUn $logicalCPUs
+            _printScopeCPUn
     fi
 
     _showLowPowerStates
@@ -1745,19 +1809,19 @@ function main()
     if [ $gBridgeType -eq $IVY_BRIDGE ];
         then
             if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
-                echo "Warning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
+                echo -e "\nWarning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
             fi
 
             if [ $gSystemType -eq 0 ];
                 then
-                    echo "Warning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
+                    echo -e "\nWarning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
                 else
                     if [ "$gMacModelIdentifier" != "$modelID" ]; then
                         echo "Error: board-id [$boardID] and model [$modelID] mismatch"
                     fi
 
                     if [ $currentSystemType -ne $gSystemType ]; then
-                        echo "Warning: 'system-type' may be set improperly ($currentSystemType instead of $gSystemType)"
+                        echo -e "\nWarning: 'system-type' may be set improperly ($currentSystemType instead of $gSystemType)"
                     fi
             fi
     fi
@@ -1769,13 +1833,13 @@ clear
 
 if [ $# -eq 0 ];
     then
-        main "" $1 $2 $3
+        main "" $1 $2 $3 $4
     else
         if [[ "$1" =~ ^[0-9]+$ ]];
             then
-                main "" $1 $2 $3
+                main "" $1 $2 $3 $4
             else
-                main "$1" $2 $3 $4
+                main "$1" $2 $3 $4 $5
         fi
 fi
 

From 5ecb9927bba686033016925ddbbba765157be539 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 3 Mar 2013 19:48:23 +0100
Subject: [PATCH 320/623] Limiting output

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 26 ++++++++++++-------
 .../AppleIntelCPUPowerManagementInfo.h        | 18 +++++++------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index ebc1c75..a5c5d32 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -82,12 +82,17 @@ inline void getCStates(void *arg)
 {
 	UInt8 logicalCoreNumber = cpu_number();
 
-	IOLog("MSR_CORE[%d]_C3_RESIDENCY......(0x3fc) : 0x%llX\n", logicalCoreNumber, (unsigned long long)rdmsr64(MSR_CORE_C3_RESIDENCY));
-	IOLog("MSR_CORE[%d]_C6_RESIDENCY......(0x3fd) : 0x%llX\n", logicalCoreNumber, (unsigned long long)rdmsr64(MSR_CORE_C6_RESIDENCY));
-
-	if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN))
+	if ((gCoreStates & logicalCoreNumber) == 0)
 	{
-		IOLog("MSR_CORE[%d]_C7_RESIDENCY......(0x3fe) : 0x%llX\n", logicalCoreNumber, (unsigned long long)rdmsr64(MSR_CORE_C7_RESIDENCY));
+		gCoreStates |= (1ULL << logicalCoreNumber);
+		IOLog("Core (logical): %d\n", logicalCoreNumber);
+		IOLog("MSR_CORE_C3_RESIDENCY......(0x3fc) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_C3_RESIDENCY));
+		IOLog("MSR_CORE_C6_RESIDENCY......(0x3fd) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_C6_RESIDENCY));
+
+		if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN))
+		{
+			IOLog("MSR_CORE_C7_RESIDENCY......(0x3fe) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_C7_RESIDENCY));
+		}
 	}
 }
 
@@ -106,10 +111,13 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 	
 	loopLock = true;
 
-	UInt32 magic = 0;
-	IOSimpleLockLock(simpleLock);
-	mp_rendezvous_no_intrs(getCStates, (void *)&magic);
-	IOSimpleLockUnlock(simpleLock);
+	if (dumpCStates)
+	{
+		UInt32 magic = 0;
+		IOSimpleLockLock(simpleLock);
+		mp_rendezvous_no_intrs(getCStates, (void *)&magic);
+		IOSimpleLockUnlock(simpleLock);
+	}
 
 	if (gCoreMultipliers != gTriggeredPStates)
 	{
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 0616e9e..8bc1e39 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -38,23 +38,25 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 	void reportMSRs(void);
 
 	bool loopLock = false;
+	bool dumpCStates = false;
 
 	UInt16 Interval	= 50;
 
+	UInt64	gCoreMultipliers	= 0ULL;
+	UInt64	gTriggeredPStates	= 0ULL;
+
 public:
 	virtual IOService *	probe(IOService * provider, SInt32 * score);
 	virtual bool start(IOService * provider);
 	virtual void stop(IOService * provider);
 	virtual void free(void);
+
+	UInt8	gMinRatio	= 0;
+	UInt8	gClockRatio	= 0;
+	UInt8	gMaxRatio	= 0;
 };
 
 OSDefineMetaClassAndStructors(AppleIntelCPUPowerManagementInfo, IOService)
 
-UInt64	gCoreMultipliers;
-UInt64	gTriggeredPStates;
-
-UInt8	gMinRatio	= 0;
-UInt8	gClockRatio	= 0;
-UInt8	gMaxRatio	= 0;
-
-UInt8	gCPUModel	= 0x2A;
\ No newline at end of file
+UInt8	gCPUModel	= 0x2A;
+UInt8	gCoreStates	= 0ULL;

From 4bd0259d54b62b78f8056aa0160c30276db8c4f4 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 5 Mar 2013 13:46:04 +0100
Subject: [PATCH 321/623] Updating script to v5.6

Whitespace change
Bug fix, overriding the cpu type displayed the wrong PM name
Thanks to 'alexlov' for eporting this bug!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 7e20dec..13ebef6 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 5.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 5.6 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -61,6 +61,7 @@
 #			- Now using the ACPI processor names of the running system (Pike, March 2013)
 #			- Now supporting up to 256/0xff logical processors (Pike, March 2013)
 #			- Command line argument for processor labels added (Pike, March 2013)
+#			- Bug fix, overriding the cpu type displayed the wrong name (Jeroen, March 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -157,7 +158,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=5.5
+gScriptVersion=5.6
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -504,7 +505,7 @@ function _printExternals()
 function _printDebugInfo()
 {
     if ((gDebug)); then
-        echo '    Store ("ssdtPRGen version: '$gScriptVersion'", Debug)'                     >> $gSsdtPR
+        echo '    Store ("ssdtPRGen version: '$gScriptVersion'", Debug)'                >> $gSsdtPR
         echo '    Store ("baseFrequency    : '$gBaseFrequency'", Debug)'                >> $gSsdtPR
         echo '    Store ("frequency        : '$frequency'", Debug)'                     >> $gSsdtPR
         echo '    Store ("logicalCPUs      : '$gLogicalCPUs'", Debug)'                  >> $gSsdtPR
@@ -1704,20 +1705,20 @@ function main()
 
                 case "$4" in
                     0) let gBridgeType=2
-                       local cpuTypeString="Override value: CPU type, now using: Sandy Bridge!"
+                       local bridgeTypeString='Sandy Bridge'
                        ;;
                     1) let gBridgeType=4
-                       local cpuTypeString="Override value: CPU type, now using: Ivy Bridge!"
+                       local bridgeTypeString='Ivy Bridge'
                        ;;
                     2) let gBridgeType=8
-                       local cpuTypeString="Override value: CPU type, now using: Haswell!"
+                       local bridgeTypeString='Haswell'
                        ;;
                     *) _exitWithError $TARGET_CPU_ERROR
                        ;;
                 esac
 
                 if [[ $detectedBridgeType -ne $((2 << $4)) ]]; then
-                    echo $cpuTypeString
+                    echo "Override value: CPU type, now using: $bridgeTypeString"
                 fi
             else
                 _exitWithError $TARGET_CPU_ERROR

From 6e3f17534704249f5f974fc7620ab1c3fe01bfe4 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 5 Mar 2013 13:56:47 +0100
Subject: [PATCH 322/623] Adding some of our experimental code (from secret.h)

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 51 ++++++++++++++++++-
 .../AppleIntelCPUPowerManagementInfo.h        |  5 ++
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index a5c5d32..81a4309 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -122,7 +122,7 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 	if (gCoreMultipliers != gTriggeredPStates)
 	{
 		gTriggeredPStates = gCoreMultipliers;
-		IOLog("AICPUPMI: P-States [ ");
+		IOLog("AICPUPMI: CPU P-States [ ");
 		
 		for (int currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
 		{
@@ -134,7 +134,7 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 			}
 		}
 		
-		IOLog("]\n");
+		IOLog("] GPU P-State [ %d ]\n", (UInt8)gMchbar[1]);
 	}
 
 	loopLock = false;
@@ -198,6 +198,41 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 					IOLog("Max Frequency      : %d00 MHz\n", gMaxRatio);
 				}
 
+				/*
+				 * TODO: Pike, add check a to see if there is a GPU and if it is is enabled!
+				 */
+				IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
+				memDescriptor = IOMemoryDescriptor::withPhysicalAddress(address, 0x53, kIODirectionIn);
+				
+				if (memDescriptor != NULL)
+				{
+					if ((result = memDescriptor->prepare()) == kIOReturnSuccess)
+					{
+						memoryMap = memDescriptor->map();
+						
+						if (memoryMap != NULL)
+						{
+							gMchbar = (UInt8 *)memoryMap->getVirtualAddress();
+							IOLog("Graphics Core Ratios:\n");
+							IOLog("Current Ratio       : 0x%02x\n", (UInt8)gMchbar[1]);
+							IOLog("Max Non-Turbo Ratio : 0x%02x\n", (UInt8)gMchbar[0x51]);
+							IOLog("Max Turbo Ratio     : 0x%02x\n", (UInt8)gMchbar[0x50]);
+						}
+						else
+						{
+							IOLog("Error: memoryMap == NULL\n");
+						}
+					}
+					else
+					{
+						IOLog("Error: memDescriptor->prepare() failed!\n");
+					}
+				}
+				else
+				{
+					IOLog("Error: memDescriptor == NULL\n");
+				}
+
 				timerEventSource->setTimeoutMS(1000);
 
 				return true;
@@ -236,5 +271,17 @@ void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
 
 void AppleIntelCPUPowerManagementInfo::free()
 {
+	if (memoryMap)
+	{
+		memoryMap->release();
+		memoryMap = NULL;
+	}
+
+	if (memDescriptor)
+	{
+		memDescriptor->release();
+		memDescriptor = NULL;
+	}
+
 	super::free();
 }
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 8bc1e39..d6c04f3 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -32,6 +32,10 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 	IOSimpleLock		*simpleLock;
 	IOWorkLoop			*workLoop;
 	IOTimerEventSource	*timerEventSource;
+	IOMemoryDescriptor	*memDescriptor;
+	IOMemoryMap			*memoryMap;
+
+	IOReturn result		= kIOReturnSuccess;
 
 	virtual IOReturn loopTimerEvent(void);
 
@@ -60,3 +64,4 @@ OSDefineMetaClassAndStructors(AppleIntelCPUPowerManagementInfo, IOService)
 
 UInt8	gCPUModel	= 0x2A;
 UInt8	gCoreStates	= 0ULL;
+UInt8	* gMchbar	= NULL;

From 7ec9b591a877bdf2ef12145d3fbb29937beaaefb Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Fri, 8 Mar 2013 13:09:42 +0100
Subject: [PATCH 323/623] Fix broken model selection

---
 i386/libsaio/platform.h | 56 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 16225f1..de058dd 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -54,34 +54,34 @@
 // Additional model selectors to select a specific target model.
 //------------------------------------------------------------------------------
 
-#define IMAC_131				(IMAC | (4 << 15))
-#define IMAC_122				(IMAC | (3 << 15))
-#define IMAC_121				(IMAC | (2 << 15))
-#define IMAC_111				(IMAC | (1 << 15))       
-#define IMAC_132				IMAC                    // Defaults to iMac13,2
-
-#define MACBOOK_41				MACBOOK					// Defaults to MacBook4,1
-
-#define MACBOOK_AIR_42			MACBOOK_AIR | (1 << 15)
-#define MACBOOK_AIR_41			MACBOOK_AIR				// Defaults to MacBookAir4,1
-
-#define MACBOOK_PRO_102			MACBOOK_PRO | (6 << 15)
-#define MACBOOK_PRO_101			MACBOOK_PRO | (5 << 15)
-#define MACBOOK_PRO_91			MACBOOK_PRO | (4 << 15)
-#define MACBOOK_PRO_83			MACBOOK_PRO | (3 << 15)
-#define MACBOOK_PRO_82			MACBOOK_PRO | (2 << 15)
-#define MACBOOK_PRO_81			MACBOOK_PRO | (1 << 15)
-#define MACBOOK_PRO_61			MACBOOK_PRO				// Defaults to MacBookPro8,1
-
-#define MACMINI_62				(MACMINI | (4 << 15))
-#define MACMINI_61				(MACMINI | (3 << 15))
-#define MACMINI_53				(MACMINI | (2 << 15))
-#define MACMINI_52				(MACMINI | (1 << 15))
-#define MACMINI_51				MACMINI					// Defaults to Macmini5,1
-
-#define MACPRO_51				MACPRO | (2 << 15)
-#define MACPRO_41				MACPRO | (1 << 15)
-#define MACPRO_31				MACPRO					// Defaults to MacPro3,1
+#define IMAC_131			(IMAC | (4 << 15))
+#define IMAC_122			(IMAC | (3 << 15))
+#define IMAC_121			(IMAC | (2 << 15))
+#define IMAC_111			(IMAC | (1 << 15))       
+#define IMAC_132			 IMAC                    		// Defaults to iMac13,2
+
+#define MACBOOK_41			MACBOOK					// Defaults to MacBook4,1
+
+#define MACBOOK_AIR_42			(MACBOOK_AIR | (1 << 15))
+#define MACBOOK_AIR_41			 MACBOOK_AIR				// Defaults to MacBookAir4,1
+
+#define MACBOOK_PRO_102			(MACBOOK_PRO | (6 << 15))
+#define MACBOOK_PRO_101			(MACBOOK_PRO | (5 << 15))
+#define MACBOOK_PRO_91			(MACBOOK_PRO | (4 << 15))
+#define MACBOOK_PRO_83			(MACBOOK_PRO | (3 << 15))
+#define MACBOOK_PRO_82			(MACBOOK_PRO | (2 << 15))
+#define MACBOOK_PRO_81			(MACBOOK_PRO | (1 << 15))
+#define MACBOOK_PRO_61			 MACBOOK_PRO				// Defaults to MacBookPro8,1
+
+#define MACMINI_62			(MACMINI | (4 << 15))
+#define MACMINI_61			(MACMINI | (3 << 15))
+#define MACMINI_53			(MACMINI | (2 << 15))
+#define MACMINI_52			(MACMINI | (1 << 15))
+#define MACMINI_51			 MACMINI				// Defaults to Macmini5,1
+
+#define MACPRO_51			(MACPRO | (2 << 15))
+#define MACPRO_41			(MACPRO | (1 << 15))
+#define MACPRO_31			 MACPRO					// Defaults to MacPro3,1
 
 //------------------------------------------------------------------------------
 

From 49652c4385a98c2169ef3de0924c1d5df5bc8463 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 10 Mar 2013 14:02:22 +0100
Subject: [PATCH 324/623] For for broken kernelcache (pre-linked kernel)

Thanks to Jeroen for testing this!
---
 i386/libsaio/xml.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/xml.c b/i386/libsaio/xml.c
index 79ae65d..72a32f0 100755
--- a/i386/libsaio/xml.c
+++ b/i386/libsaio/xml.c
@@ -707,10 +707,10 @@ static void FreeSymbol(char * string)
 			{
 				gSymbolsHead = symbol->next;
 			}
-		}
 
-		// Free the symbol's memory.
-		free (symbol);
+			// Free the symbol's memory.
+			free (symbol);
+		}
 	}
 }
 

From ffce8605dc09f5bf9c4042c1d3ee5575743706f8 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 19 Mar 2013 05:24:35 +0100
Subject: [PATCH 325/623] Adding link to Pike's blog

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index b0266b4..f46e642 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 About this project:
 -------------------
-This Open Source hobby project is maintained by Pike and dgsga. Two long time supporters of the RevoBoot project.
+This Open Source hobby project is maintained by Pike (http://pikeralpha.wordpress.com) and dgsga. Two long time supporters of the RevoBoot project.
 
 Note that we do not tolerate/share any (links to) copyrighted material. We only use purchased software and we won't share any of it. Just get your copy of OS X in the Apple store. Should be affordable for everyone.
 

From 604d77ca5999a32eec9a83dd1325a56ccc60e871 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 17 Mar 2013 18:33:07 +0100
Subject: [PATCH 326/623] STATE_SUCCESS > EFI_SUCCESS

---
 i386/boot2/boot.c      |  6 +++---
 i386/boot2/drivers.c   | 12 ++++++------
 i386/boot2/graphics.c  | 28 +++++++++++++--------------
 i386/libsaio/efi/efi.h | 43 ++++++++++--------------------------------
 i386/libsaio/libsaio.h |  2 --
 i386/libsaio/sys.c     |  2 +-
 i386/libsaio/vbe.h     |  5 -----
 7 files changed, 33 insertions(+), 65 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index f726d08..a10333a 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -230,7 +230,7 @@ void boot(int biosdev)
 		config_file_t	nvramStorage;
 		const char * path = "/Extra/NVRAM/nvramStorage.plist";
 	
-		if (loadConfigFile(path, &nvramStorage) == STATE_SUCCESS)
+		if (loadConfigFile(path, &nvramStorage) == EFI_SUCCESS)
 		{
 			_BOOT_DEBUG_DUMP("nvramStorage.plist found\n");
 
@@ -260,7 +260,7 @@ void boot(int biosdev)
 
 	// Loading: /Library/Preferences/SystemConfiguration/com.apple.Boot.plist
 	// TODO: Check if everything works <i>without</i> having this plist.
-	if (loadCABootPlist() == STATE_SUCCESS)
+	if (loadCABootPlist() == EFI_SUCCESS)
 	{
 		_BOOT_DEBUG_DUMP("com.apple.Boot.plist located.\n");
 
@@ -363,7 +363,7 @@ void boot(int biosdev)
 			_BOOT_DEBUG_DUMP("Booting from a System Volume, getting UUID.\n");
 
 			// Yes, then let's get the UUID.
-			if (HFSGetUUID(gPlatform.BootVolume, rootUUID) == STATE_SUCCESS)
+			if (HFSGetUUID(gPlatform.BootVolume, rootUUID) == EFI_SUCCESS)
 			{
 				_BOOT_DEBUG_DUMP("Success [%s]\n", rootUUID);
 			}
diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index 620e9a3..cb5a24a 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -168,7 +168,7 @@ static long initDriverSupport(void)
 
 long loadDrivers(char * dirSpec)
 {
-	if (initDriverSupport() != STATE_SUCCESS)
+	if (initDriverSupport() != EFI_SUCCESS)
 	{
 		return -1;
 	}
@@ -180,7 +180,7 @@ long loadDrivers(char * dirSpec)
 
 	if (shouldLoadMKext) // Skipped in "Safe Boot" mode.
 	{
-		if (loadMultiKext(gPlatform.KernelCachePath) == STATE_SUCCESS)
+		if (loadMultiKext(gPlatform.KernelCachePath) == EFI_SUCCESS)
 		{
 			gKextLoadStatus |= 1;
 			
@@ -201,7 +201,7 @@ long loadDrivers(char * dirSpec)
 		{
 			_DRIVERS_DEBUG_DUMP("\nCalling loadKexts(\"/System/Library/Extensions\");\n");
 
-			if (loadKexts("/System/Library/Extensions", 0) == STATE_SUCCESS)
+			if (loadKexts("/System/Library/Extensions", 0) == EFI_SUCCESS)
 			{
 				_DRIVERS_DEBUG_DUMP("loadKexts(1) OK.\n");
 			}
@@ -215,7 +215,7 @@ long loadDrivers(char * dirSpec)
 
 	_DRIVERS_DEBUG_SLEEP(15);
 
-	return STATE_SUCCESS;
+	return EFI_SUCCESS;
 }
 
 
@@ -243,7 +243,7 @@ static int loadMultiKext(char * path)
 	long ret = GetFileInfo(path, fileName, &flags, &time);
 	
 	// Pre-flight checks; Does the file exists, and is it something we can use?
-	if ((ret == STATE_SUCCESS) && ((flags & kFileTypeMask) == kFileTypeFlat))
+	if ((ret == EFI_SUCCESS) && ((flags & kFileTypeMask) == kFileTypeFlat))
 	{
 		unsigned long    driversAddr, driversLength;
 		char             segName[32];
@@ -305,7 +305,7 @@ static int loadMultiKext(char * path)
 
 		_DRIVERS_DEBUG_DUMP("loadMultiKext(Success : 0) @ 0x%08x\n", driversAddr);
 
-		return STATE_SUCCESS;
+		return EFI_SUCCESS;
 	}
 
 	_DRIVERS_DEBUG_DUMP("loadMultiKext(File Not Found Error: -1)\n");
diff --git a/i386/boot2/graphics.c b/i386/boot2/graphics.c
index d07f353..c42c451 100755
--- a/i386/boot2/graphics.c
+++ b/i386/boot2/graphics.c
@@ -28,10 +28,8 @@
 
 #include "boot.h"
 #include "vbe.h"
-
 #include "bootstruct.h"
 
-
 //==============================================================================
 
 bool inGraphicsMode(void)
@@ -65,7 +63,7 @@ static unsigned short getVESAModeWithProperties(unsigned short width, unsigned s
 	strcpy((char*)&vbeInfo, "VBE2");
 	status = getVBEInfo(&vbeInfo);
 
-	if (status != STATE_SUCCESS)
+	if (status != EFI_SUCCESS)
 	{
 		return modeEndOfList;
 	}
@@ -86,7 +84,7 @@ static unsigned short getVESAModeWithProperties(unsigned short width, unsigned s
 		bzero(&modeInfo, sizeof(modeInfo));
 		status = getVBEModeInfo(*modePtr, &modeInfo);
 
-		if (status != STATE_SUCCESS)
+		if (status != EFI_SUCCESS)
 		{
 			continue;
 		}
@@ -187,7 +185,7 @@ static int setVESATextMode(unsigned short cols, unsigned short rows, unsigned ch
 	getc();
 #endif
 
-	if ((mode == modeEndOfList) || (setVBEMode(mode, NULL) != STATE_SUCCESS))
+	if ((mode == modeEndOfList) || (setVBEMode(mode, NULL) != EFI_SUCCESS))
 	{
 		video_mode(2);  // VGA BIOS, 80x25 text mode.
 		minfo.XResolution = 80;
@@ -203,20 +201,20 @@ static int setVESATextMode(unsigned short cols, unsigned short rows, unsigned ch
 	bootArgs->Video.v_baseAddr = 0xb8000;
 	bootArgs->Video.v_rowBytes = 0x8000;
 
-	return STATE_SUCCESS;  // always return success
+	return EFI_SUCCESS;  // always return success
 }
 
 
 //==============================================================================
 
-static int setVESAGraphicsMode(unsigned short width, unsigned short height, unsigned char  bitsPerPixel, unsigned short refreshRate)
+long setVESAGraphicsMode(unsigned short width, unsigned short height, unsigned char  bitsPerPixel, unsigned short refreshRate)
 {
 	VBEModeInfoBlock	minfo;
 
-	unsigned short		mode = 280; // Default to 1024 * 768 * 32 (1920 * 1200 * 32 would be 330)
-	unsigned short		vesaVersion;
+	unsigned short	mode = 280; // Default to 1024 * 768 * 32 (1920 * 1200 * 32 would be 330)
+	unsigned short	vesaVersion;
 
-	int					status = STATE_FUNCTION_NOT_SUPPORTED;
+	long status = (long)EFI_UNSUPPORTED;
 
 	do
 	{
@@ -236,7 +234,7 @@ static int setVESAGraphicsMode(unsigned short width, unsigned short height, unsi
 
 		status = setVBEMode(mode | kLinearFrameBufferBit, NULL);
 
-		if (status != STATE_SUCCESS)
+		if (status != EFI_SUCCESS)
 		{
 			break;
 		}
@@ -305,7 +303,7 @@ static int getNumberArrayFromProperty(const char *  propKey, unsigned long numbe
 
 //==============================================================================
 
-int initGraphicsMode()
+long initGraphicsMode()
 {
 	unsigned long params[4];
 
@@ -341,19 +339,19 @@ int initGraphicsMode()
 
 void setVideoMode(int mode)
 {
-	int status = STATE_SUCCESS;
+	long status = EFI_SUCCESS;
 
 	unsigned long params[4];
 
 	if (mode == GRAPHICS_MODE)
 	{
-		if ((status = initGraphicsMode()) == STATE_SUCCESS)
+		if ((status = initGraphicsMode()) == EFI_SUCCESS)
 		{
 			bootArgs->Video.v_display = (gVerboseMode) ? FB_TEXT_MODE : GRAPHICS_MODE;
 		}
 	}
 
-	if (mode == VGA_TEXT_MODE || status != STATE_SUCCESS)
+	if (mode == VGA_TEXT_MODE || status != EFI_SUCCESS)
 	{
 		params[0] = 80;  // Default text mode is 80x25.
 		params[1] = 25;
diff --git a/i386/libsaio/efi/efi.h b/i386/libsaio/efi/efi.h
index a4d1fa9..f5f834c 100755
--- a/i386/libsaio/efi/efi.h
+++ b/i386/libsaio/efi/efi.h
@@ -29,6 +29,16 @@
 #ifndef _LIBSAIO_EFI_EFI_H
 #define _LIBSAIO_EFI_EFI_H
 
+///
+/// 32/64-bit native width with the highest bit set.
+///
+#if EFI_64_BIT
+	#define EFI_MAX_BIT					0x8000000000000000ULL
+#else
+	#define EFI_MAX_BIT					0x80000000
+#endif
+
+#include "EfiError.h"
 
 // Set up space for up to 5 tables but we currently only add two.
 #define EFI_MAX_CONFIG_TABLES			5
@@ -47,39 +57,6 @@
 	static uint8_t const UNSUPPORTEDRET_INSTRUCTIONS[] = { 0xb8, 0x03, 0x00, 0x00, 0x80, 0xc3 };
 #endif
 
-///
-/// 32/64-bit native width with the highest bit set.
-///
-#if EFI_64_BIT
-	#define EFI_MAX_BIT					0x8000000000000000ULL
-#else
-	#define EFI_MAX_BIT					0x80000000
-#endif
-
-///
-/// Macro's to encode the status code.
-///
-
-// Set the upper bit to indicate EFI Error.
-#define ENCODE_ERROR(_a)				(EFI_MAX_BIT | (_a))
-
-#define EFIERR(_a)						ENCODE_ERROR(_a)
-
-///
-/// The operation completed successfully.
-///
-#define EFI_SUCCESS						0
-
-///
-/// The parameter was incorrect.
-///
-#define EFI_INVALID_PARAMETER			EFIERR (2)
-
-///
-/// The operation is not supported.
-///
-#define EFI_UNSUPPORTED					EFIERR (3)
-
 // EFI Revision info.
 //
 #if EFI_64_BIT
diff --git a/i386/libsaio/libsaio.h b/i386/libsaio/libsaio.h
index ede89d6..f669a27 100755
--- a/i386/libsaio/libsaio.h
+++ b/i386/libsaio/libsaio.h
@@ -29,8 +29,6 @@
 #ifndef __LIBSAIO_LIBSAIO_H
 #define __LIBSAIO_LIBSAIO_H
 
-#define STATE_SUCCESS	0
-
 #include "libsa.h"
 #include "memory.h"
 #include "io_inline.h"
diff --git a/i386/libsaio/sys.c b/i386/libsaio/sys.c
index 624ee9c..d1bd2bf 100755
--- a/i386/libsaio/sys.c
+++ b/i386/libsaio/sys.c
@@ -936,7 +936,7 @@ BVRef getTargetRootVolume(char *rootUUID)
 					if ((bvr->biosdev == hdIndex) && (bvr->flags & kBVFlagSystemVolume))
 					{
 						if ((bvr->flags & kBVFlagSystemVolume) &&
-							(bvr->fs_getuuid(bvr, rootUUID) == 0)) // STATE_SUCCESS))
+							(bvr->fs_getuuid(bvr, rootUUID) == EFI_SUCCESS))
 						{
 							return bvr;
 						}
diff --git a/i386/libsaio/vbe.h b/i386/libsaio/vbe.h
index cdf6464..e825bae 100755
--- a/i386/libsaio/vbe.h
+++ b/i386/libsaio/vbe.h
@@ -90,11 +90,6 @@ enum {
     errFuncInvalid      = 3
 }; */
 
-#define STATE_SUCCESS                 0 // graphics.c
-// #define STATE_FUNCTION_FAILED         1
-#define STATE_FUNCTION_NOT_SUPPORTED  2 // graphics.c
-// #define STATE_FUNCTION_INVALID        3
-
 /*
  * Per-controller info, returned in function 4f00.
  */

From 53b7c727cb43ed8b0aeaeec99007173bc2ebbb01 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 17 Mar 2013 18:33:27 +0100
Subject: [PATCH 327/623] STATE_SUCCESS > EFI_SUCCESS

---
 i386/libsaio/efi/EfiError.h | 70 +++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 i386/libsaio/efi/EfiError.h

diff --git a/i386/libsaio/efi/EfiError.h b/i386/libsaio/efi/EfiError.h
new file mode 100644
index 0000000..5e15e1a
--- /dev/null
+++ b/i386/libsaio/efi/EfiError.h
@@ -0,0 +1,70 @@
+/*++
+
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
+This program and the accompanying materials                          
+are licensed and made available under the terms and conditions of the BSD License         
+which accompanies this distribution.  The full text of the license may be found at        
+http://opensource.org/licenses/bsd-license.php                                            
+                                                                                          
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+
+Module Name:
+
+  EfiError.h
+
+Abstract:
+
+  EFI error levels and their associated defines
+
+--*/
+
+#ifndef _EFI_ERROR_H_
+#define _EFI_ERROR_H_
+
+//
+// Set the upper bit to indicate EFI Error.
+//
+#define EFIERR(a)                 (EFI_MAX_BIT | (a))
+
+#define EFIWARN(a)                (a)
+#define EFI_ERROR(a)              (((INTN) (a)) < 0)
+
+#define EFI_SUCCESS               0
+#define EFI_LOAD_ERROR            EFIERR (1)
+#define EFI_INVALID_PARAMETER     EFIERR (2)
+#define EFI_UNSUPPORTED           EFIERR (3)
+#define EFI_BAD_BUFFER_SIZE       EFIERR (4)
+#define EFI_BUFFER_TOO_SMALL      EFIERR (5)
+#define EFI_NOT_READY             EFIERR (6)
+#define EFI_DEVICE_ERROR          EFIERR (7)
+#define EFI_WRITE_PROTECTED       EFIERR (8)
+#define EFI_OUT_OF_RESOURCES      EFIERR (9)
+#define EFI_VOLUME_CORRUPTED      EFIERR (10)
+#define EFI_VOLUME_FULL           EFIERR (11)
+#define EFI_NO_MEDIA              EFIERR (12)
+#define EFI_MEDIA_CHANGED         EFIERR (13)
+#define EFI_NOT_FOUND             EFIERR (14)
+#define EFI_ACCESS_DENIED         EFIERR (15)
+#define EFI_NO_RESPONSE           EFIERR (16)
+#define EFI_NO_MAPPING            EFIERR (17)
+#define EFI_TIMEOUT               EFIERR (18)
+#define EFI_NOT_STARTED           EFIERR (19)
+#define EFI_ALREADY_STARTED       EFIERR (20)
+#define EFI_ABORTED               EFIERR (21)
+#define EFI_ICMP_ERROR            EFIERR (22)
+#define EFI_TFTP_ERROR            EFIERR (23)
+#define EFI_PROTOCOL_ERROR        EFIERR (24)
+#define EFI_INCOMPATIBLE_VERSION  EFIERR (25)
+#define EFI_SECURITY_VIOLATION    EFIERR (26)
+#define EFI_CRC_ERROR             EFIERR (27)
+#define EFI_END_OF_MEDIA          EFIERR (28)
+#define EFI_END_OF_FILE           EFIERR (31)
+#define EFI_INVALID_LANGUAGE      EFIERR (32)
+
+#define EFI_WARN_UNKNOWN_GLYPH    EFIWARN (1)
+#define EFI_WARN_DELETE_FAILURE   EFIWARN (2)
+#define EFI_WARN_WRITE_FAILURE    EFIWARN (3)
+#define EFI_WARN_BUFFER_TOO_SMALL EFIWARN (4)
+
+#endif

From e9cb1fa8c5b3fca1ac2df7be93f06c3728377ebd Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 17 Mar 2013 18:34:19 +0100
Subject: [PATCH 328/623] Reordering model identifier data

---
 i386/libsaio/platform.h | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index de058dd..c8e87a1 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -54,6 +54,7 @@
 // Additional model selectors to select a specific target model.
 //------------------------------------------------------------------------------
 
+<<<<<<< HEAD
 #define IMAC_131			(IMAC | (4 << 15))
 #define IMAC_122			(IMAC | (3 << 15))
 #define IMAC_121			(IMAC | (2 << 15))
@@ -61,10 +62,20 @@
 #define IMAC_132			 IMAC                    		// Defaults to iMac13,2
 
 #define MACBOOK_41			MACBOOK					// Defaults to MacBook4,1
+=======
+#define IMAC_111				(IMAC | (1 << 15))
+#define IMAC_121				(IMAC | (2 << 15))
+#define IMAC_122				(IMAC | (3 << 15))
+#define IMAC_131				(IMAC | (4 << 15))
+#define IMAC_132				 IMAC						// Defaults to iMac13,2
+
+#define MACBOOK_41				 MACBOOK					// Defaults to MacBook4,1
+>>>>>>> Reordering model identifier data
 
 #define MACBOOK_AIR_42			(MACBOOK_AIR | (1 << 15))
 #define MACBOOK_AIR_41			 MACBOOK_AIR				// Defaults to MacBookAir4,1
 
+<<<<<<< HEAD
 #define MACBOOK_PRO_102			(MACBOOK_PRO | (6 << 15))
 #define MACBOOK_PRO_101			(MACBOOK_PRO | (5 << 15))
 #define MACBOOK_PRO_91			(MACBOOK_PRO | (4 << 15))
@@ -82,6 +93,27 @@
 #define MACPRO_51			(MACPRO | (2 << 15))
 #define MACPRO_41			(MACPRO | (1 << 15))
 #define MACPRO_31			 MACPRO					// Defaults to MacPro3,1
+=======
+#define MACBOOK_PRO_61			(MACBOOK_PRO | (1 << 15))
+#define MACBOOK_PRO_81			(MACBOOK_PRO | (2 << 15))
+#define MACBOOK_PRO_82			(MACBOOK_PRO | (3 << 15))
+#define MACBOOK_PRO_83			(MACBOOK_PRO | (4 << 15))
+#define MACBOOK_PRO_91			(MACBOOK_PRO | (5 << 15))
+#define MACBOOK_PRO_92			(MACBOOK_PRO | (6 << 15))
+#define MACBOOK_PRO_101			(MACBOOK_PRO | (7 << 15))
+#define MACBOOK_PRO_102			 MACBOOK_PRO				// Defaults to MacBookPro10,2
+
+#define MACMINI_41				(MACMINI | (1 << 15))
+#define MACMINI_51				(MACMINI | (2 << 15))
+#define MACMINI_52				(MACMINI | (3 << 15))
+#define MACMINI_53				(MACMINI | (4 << 15))
+#define MACMINI_61				(MACMINI | (5 << 15))
+#define MACMINI_62				 MACMINI					// Defaults to Macmini5,1
+
+#define MACPRO_31				(MACPRO | (1 << 15))
+#define MACPRO_41				(MACPRO | (2 << 15))
+#define MACPRO_51				 MACPRO						// Defaults to MacPro5,1
+>>>>>>> Reordering model identifier data
 
 //------------------------------------------------------------------------------
 

From 9f10384db292541f6f20423bc77d7657cd9fa8ab Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 17 Mar 2013 18:35:29 +0100
Subject: [PATCH 329/623] Reordering model identifier data

Early 2013 MacBook Pro update
---
 i386/libsaio/smbios/model_data.h | 170 ++++++++++++++++---------------
 1 file changed, 87 insertions(+), 83 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index ab5cb4c..8e9ca4c 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -37,7 +37,7 @@
 		#define SMB_PRODUCT_NAME	"iMac11,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F2268DAE"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '1', ',', '1' }
-	#elif // Defaults to iMac12,1
+	#elif (TARGET_MODEL == IMAC_121)
 		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
 		#define SMB_PRODUCT_NAME	"iMac12,1"
 		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
@@ -47,16 +47,11 @@
 		#define SMB_PRODUCT_NAME	"iMac12,2"
 		#define SMB_BOARD_PRODUCT	"Mac-942B5BF58194151B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '2' }
-	#elif (TARGET_MODEL == IMAC_121)
-		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
-		#define SMB_PRODUCT_NAME	"iMac12,1"
-		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
-		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
-	#elif (TARGET_MODEL == IMAC_111)
-		#define SMB_BIOS_VERSION	"IM111.88Z.0034.B00.0910301727"
-		#define SMB_PRODUCT_NAME	"iMac11,1"
-		#define SMB_BOARD_PRODUCT	"Mac-F2268DAE"
-		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '1', ',', '1' }
+	#elif (TARGET_MODEL == IMAC_131)
+		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
+		#define SMB_PRODUCT_NAME	"iMac13,1"
+		#define SMB_BOARD_PRODUCT	"Mac-00BE6ED71E35EB86"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '1' }
 	#else // Defaults to iMac13,2
 		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
 		#define SMB_PRODUCT_NAME	"iMac13,2"
@@ -83,20 +78,20 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"MacBookAir"
 
-	#if (TARGET_MODEL == MACBOOK_AIR_42)
-		// Intel Core i5-2557M @ 1.7GHz (2 cores - 4 threads)
-		// Intel Core i7-2677M @ 1.8GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA41.88Z.0077.B08.1109011050"
-		#define SMB_PRODUCT_NAME	"MacBookAir4,2"
-		#define SMB_BOARD_PRODUCT	"Mac-742912EFDBEE19B3"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '4', ',', '2' }
-	#else // Defaults to MacBookAir4,1
+	#if (TARGET_MODEL == MACBOOK_AIR_41)
 		// Intel Core i5-2467M @ 1.6GHz (2 cores - 4 threads)
 		// Intel Core i7-2677M @ 1.8GHz (2 cores - 4 threads)
 		#define SMB_BIOS_VERSION	"MBA41.88Z.0077.B08.1109011050"
 		#define SMB_PRODUCT_NAME	"MacBookAir4,1"
 		#define SMB_BOARD_PRODUCT	"Mac-C08A6BB70A942AC2"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '4', ',', '1' }
+	#else // Defaults to MacBookAir4,2
+		// Intel Core i5-2557M @ 1.7GHz (2 cores - 4 threads)
+		// Intel Core i7-2677M @ 1.8GHz (2 cores - 4 threads)
+		#define SMB_BIOS_VERSION	"MBA41.88Z.0077.B08.1109011050"
+		#define SMB_PRODUCT_NAME	"MacBookAir4,2"
+		#define SMB_BOARD_PRODUCT	"Mac-742912EFDBEE19B3"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '4', ',', '2' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -106,18 +101,26 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"MacBookPro"
 
-	#if (TARGET_MODEL == MACBOOK_PRO_102)
-		// Intel Core i7-3520QM @ 2.90 GHz - 2 cores / 4 threads.
-		#define SMB_BIOS_VERSION	"MBP102.88Z.00FE.B00.1207181057"
-		#define SMB_PRODUCT_NAME	"MacBookPro10,2"
-		#define SMB_BOARD_PRODUCT	"Mac-AFD8A9D944EA4843"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '2' }
-	#elif (TARGET_MODEL == MACBOOK_PRO_101)
-		// Intel Core i7-3720QM @ 2.60 GHz - 4 cores / 8 threads.
-		#define SMB_BIOS_VERSION	"MBP101.88Z.00EE.B00.1205101839"
-		#define SMB_PRODUCT_NAME	"MacBookPro10,1"
-		#define SMB_BOARD_PRODUCT	"Mac-C3EC7CD22292981F"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '1' }
+	#if(TARGET_MODEL == MACBOOK_PRO_61)
+		#define SMB_BIOS_VERSION	"MBP61.88Z.0057.B0C.1007261552"
+		#define SMB_PRODUCT_NAME	"MacBookPro6,1"
+		#define SMB_BOARD_PRODUCT	"Mac-F22589C8"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '6', ',', '1' }
+	#elif (TARGET_MODEL == MACBOOK_PRO_81)
+		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
+		#define SMB_PRODUCT_NAME	"MacBookPro8,1"
+		#define SMB_BOARD_PRODUCT	"Mac-94245B3640C91C81"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '1' }
+	#elif (TARGET_MODEL == MACBOOK_PRO_82)
+		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
+		#define SMB_PRODUCT_NAME	"MacBookPro8,2"
+		#define SMB_BOARD_PRODUCT	"Mac-94245A3940C91C80"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '2' }
+	#elif (TARGET_MODEL == MACBOOK_PRO_83)
+		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
+		#define SMB_PRODUCT_NAME	"MacBookPro8,3"
+		#define SMB_BOARD_PRODUCT	"Mac-942459F5819B171B"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '3' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_91)
 		// Intel Core i7-3820QM @ 2.70 GHz - 4 cores / 8 threads.
 		#define SMB_BIOS_VERSION	"MBP91.88Z.00D3.B02.1203281326"
@@ -130,26 +133,21 @@
 		#define SMB_PRODUCT_NAME	"MacBookPro9,2"
 		#define SMB_BOARD_PRODUCT	"Mac-6F01561E16C75D06"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '9', ',', '2' }
-	#elif (TARGET_MODEL == MACBOOK_PRO_83)
-		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
-		#define SMB_PRODUCT_NAME	"MacBookPro8,3"
-		#define SMB_BOARD_PRODUCT	"Mac-942459F5819B171B"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '3' }
-	#elif (TARGET_MODEL == MACBOOK_PRO_82)
-		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
-		#define SMB_PRODUCT_NAME	"MacBookPro8,2"
-		#define SMB_BOARD_PRODUCT	"Mac-94245A3940C91C80"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '2' }
-	#elif (TARGET_MODEL == MACBOOK_PRO_81)
-		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
-		#define SMB_PRODUCT_NAME	"MacBookPro8,1"
-		#define SMB_BOARD_PRODUCT	"Mac-94245B3640C91C81"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '1' }
-	#else (TARGET_MODEL == MACBOOK_PRO_61)
-		#define SMB_BIOS_VERSION	"MBP61.88Z.0057.B0C.1007261552"
-		#define SMB_PRODUCT_NAME	"MacBookPro6,1"
-		#define SMB_BOARD_PRODUCT	"Mac-F22589C8"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '6', ',', '1' }
+	#elif (TARGET_MODEL == MACBOOK_PRO_101)
+		// Intel Core i7-3635QM @ 2.40 GHz - 4 cores / 8 threads.
+		// Intel Core i7-3740QM @ 2.70 GHz - 4 cores / 8 threads.
+		// Intel Core i7-3840QM @ 2.80 GHz - 4 cores / 8 threads.
+		#define SMB_BIOS_VERSION	"MBP101.88Z.00EE.B03.1212211437"
+		#define SMB_PRODUCT_NAME	"MacBookPro10,1"
+		#define SMB_BOARD_PRODUCT	"Mac-C3EC7CD22292981F"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '1' }
+	#else // Defaults to MacBookPro10,2
+		// Intel Core i5-3230QM @ 2.60 GHz - 2 cores / 4 threads.
+		// Intel Core i7-3540QM @ 3.00 GHz - 2 cores / 4 threads.
+		#define SMB_BIOS_VERSION	"MBP102.88Z.0106.B03.1211161133"
+		#define SMB_PRODUCT_NAME	"MacBookPro10,2"
+		#define SMB_BOARD_PRODUCT	"Mac-AFD8A9D944EA4843"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '2' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -159,36 +157,42 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"Macmini"
 
-	#if (TARGET_MODEL == MACMINI_62)
-		// Intel Core i7-3615QM @ 2.30 GHz (4 cores - 8 threads)
-		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B00.1208091121"
-		#define SMB_PRODUCT_NAME	"Macmini6,2"
-		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '2' }
-	#elif (TARGET_MODEL == MACMINI_61)
-		// Intel Core i5-3210M @ 2.50 GH (2 cores - 4 theeads)
-		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B00.1208091121"
-		#define SMB_PRODUCT_NAME	"Macmini6,1"
-		#define SMB_BOARD_PRODUCT	"Mac-031AEE4D24BFF0B1"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '1' }
-	#elif (TARGET_MODEL == MACMINI_53)
-		// Intel Core i7-2635QM @ 2.0GHz (4 cores - 8 threads)
+	#if (TARGET_MODEL == MACMINI_41)
+		// Intel Core P8800 @ 2.4/2.66 GHz (2 cores - 2 threads)
+		#define SMB_BIOS_VERSION	"MM41.88Z.0042.B03.1111072100"
+		#define SMB_PRODUCT_NAME	"Macmini4,1"
+		#define SMB_BOARD_PRODUCT	"Mac-F2208EC8"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '4', ',', '1' }
+	#elif (TARGET_MODEL == MACMINI_51)
+		// Intel Core i5-2415M @ 2.3 GHz (2 cores - 4 threads)
 		#define SMB_BIOS_VERSION	"MM51.88Z.0077.B10.1201241549"
-		#define SMB_PRODUCT_NAME	"Macmini5,3"
-		#define SMB_BOARD_PRODUCT	"Mac-7BA5B2794B2CDB12"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '5', ',', '3' }
+		#define SMB_PRODUCT_NAME	"Macmini5,1"
+		#define SMB_BOARD_PRODUCT	"Mac-8ED6AF5B48C039E1"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '5', ',', '1' }
 	#elif (TARGET_MODEL == MACMINI_52)
 		// Intel Core i5-2520M @ 2.5GHz (2 cores - 4 threads)
 		#define SMB_BIOS_VERSION	"MM51.88Z.0077.B10.1201241549"
 		#define SMB_PRODUCT_NAME	"Macmini5,2"
 		#define SMB_BOARD_PRODUCT	"Mac-4BC72D62AD45599E"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '5', ',', '2' }
-	#else // Defaults to Macmini5,1
-		// Intel Core i5-2415M @ 2.3 GHz (2 cores - 4 theeads)
+	#elif (TARGET_MODEL == MACMINI_53)
+		// Intel Core i7-2635QM @ 2.0GHz (4 cores - 8 threads)
 		#define SMB_BIOS_VERSION	"MM51.88Z.0077.B10.1201241549"
-		#define SMB_PRODUCT_NAME	"Macmini5,1"
-		#define SMB_BOARD_PRODUCT	"Mac-8ED6AF5B48C039E1"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '5', ',', '1' }
+		#define SMB_PRODUCT_NAME	"Macmini5,3"
+		#define SMB_BOARD_PRODUCT	"Mac-7BA5B2794B2CDB12"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '5', ',', '3' }
+	#elif (TARGET_MODEL == MACMINI_61)
+		// Intel Core i5-3210M @ 2.50 GH (2 cores - 4 theeads)
+		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B00.1208091121"
+		#define SMB_PRODUCT_NAME	"Macmini6,1"
+		#define SMB_BOARD_PRODUCT	"Mac-031AEE4D24BFF0B1"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '1' }
+	#else // Defaults to Macmini6,2
+		// Intel Core i7-3615QM @ 2.30 GHz (4 cores - 8 threads)
+		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B00.1208091121"
+		#define SMB_PRODUCT_NAME	"Macmini6,2"
+		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '2' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -198,21 +202,21 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"MacPro"
 
-	#if (TARGET_MODEL == MACPRO_51)
-		#define SMB_BIOS_VERSION	"MP51.88Z.007F.B03.1010071432"
-		#define SMB_PRODUCT_NAME	"MacPro5,1"
-		#define SMB_BOARD_PRODUCT	"Mac-F221BEC8"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '5', ',', '1' }
+	#if (TARGET_MODEL == MACPRO_31)
+		#define SMB_BIOS_VERSION	"MP31.88Z.006C.B05.0802291410"
+		#define SMB_PRODUCT_NAME	"MacPro3,1"
+		#define SMB_BOARD_PRODUCT	"Mac-F4208DC8"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '3', ',', '1' }
 	#elif (TARGET_MODEL == MACPRO_41)
 		#define SMB_BIOS_VERSION	"MP41.88Z.0081.B04.0903051113"
 		#define SMB_PRODUCT_NAME	"MacPro4,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F221BEC8"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '4', ',', '1' }
-	#else // Defaults to MacPro3,1
-		#define SMB_BIOS_VERSION	"MP31.88Z.006C.B05.0802291410"
-		#define SMB_PRODUCT_NAME	"MacPro3,1"
-		#define SMB_BOARD_PRODUCT	"Mac-F4208DC8"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '3', ',', '1' }
+	#else // Defaults to MacPro5,1
+		#define SMB_BIOS_VERSION	"MP51.88Z.007F.B03.1010071432"
+		#define SMB_PRODUCT_NAME	"MacPro5,1"
+		#define SMB_BOARD_PRODUCT	"Mac-F221BEC8"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '5', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From 3cb214ad67310b96e29152354e9dc11576915815 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 17 Mar 2013 18:35:50 +0100
Subject: [PATCH 330/623] STATE_SUCCESS > EFI_SUCCESS

---
 i386/libsaio/saio_internal.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index 660dbcb..ad0c33e 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -72,21 +72,25 @@ extern unsigned long getExtendedMemorySize();
 extern unsigned long getConventionalMemorySize();
 extern void		sleep(int n);
 
+
 /* efi.c */
 extern void		initEFITree(void);
 extern void		updateEFITree(char *rootUUID);
 extern void		finalizeEFITree(uint32_t kernelAdler32);
 
+
 /* bootstruct.c */
 extern void		initKernelBootConfig(void);
 extern void		finalizeKernelBootConfig(void);
 extern void		moveKernelBootArgs(void);
 
+
 /* cache.c */
 extern void		CacheReset();
 extern void		CacheInit(CICell ih, long blockSize);
 extern long		CacheRead(CICell ih, char *buffer, long long offset, long length, long cache);
 
+
 /* console.c */
 extern bool		gVerboseMode;
 extern bool		gErrors;
@@ -162,8 +166,8 @@ extern bool		getValueForBootKey(const char *line, const char *match, const char
 extern bool		getValueForKey(const char *key, const char **val, int *size, config_file_t *configBuff);
 extern bool		getBoolForKey(const char *key, bool *val, config_file_t *configBuff);
 extern bool		getIntForKey(const char *key, int *val, config_file_t *configBuff);
-extern bool		loadConfigFile(const char *configFile, config_file_t *configBuff);
-extern int		loadSystemConfig(config_file_t *configBuff);
+extern long		loadConfigFile(const char *configFile, config_file_t *configBuff);
+extern long		loadSystemConfig(config_file_t *configBuff);
 extern char		* getNextArg(char ** ptr, char * val);
 extern long		ParseXMLFile(char * buffer, TagPtr * dict);
 

From e7f5d7fd8402145c4644d76c3809fd30b8e27531 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 19 Mar 2013 17:02:33 +0100
Subject: [PATCH 331/623] STATE_SUCCESS -> EFI_SUCCESS

---
 i386/libsaio/stringTable.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/i386/libsaio/stringTable.c b/i386/libsaio/stringTable.c
index d069e89..fa87d5e 100755
--- a/i386/libsaio/stringTable.c
+++ b/i386/libsaio/stringTable.c
@@ -333,14 +333,13 @@ long ParseXMLFile(char * buffer, TagPtr * dictionaryPtr)
 	}
 #endif
 
-	return 0;
+	return (long)(EFI_INVALID_PARAMETER | EFI_OUT_OF_RESOURCES);
 }
 
 
 //==============================================================================
-// Returns TRUE on success and FALSE when it is fails to locate / open the file.
 
-bool loadConfigFile(const char * configFile, config_file_t *config)
+long loadConfigFile(const char * configFile, config_file_t *config)
 {
 	int fd = 0;
 
@@ -352,21 +351,21 @@ bool loadConfigFile(const char * configFile, config_file_t *config)
 		close(fd);
 	
 		// Build XML dictionary.
-		ParseXMLFile(config->plist, &config->dictionary);
-	
-		return 0;
+		if (ParseXMLFile(config->plist, &config->dictionary) > 0)
+		{
+			return EFI_SUCCESS;
+		}
 	}
 
-	return 1;
+	return (long)(EFI_INVALID_PARAMETER | EFI_NOT_FOUND);
 }
 
 
 //==============================================================================
-// Returns 0 on success and -1 when it is fails to locate / open the file.
 
-int loadSystemConfig(config_file_t *config)
+long loadSystemConfig(config_file_t *config)
 {
-	short retValue = -1;
+	long retValue = (long) EFI_OUT_OF_RESOURCES;
 
 	static char * dirspec[] =
 	{
@@ -403,11 +402,7 @@ int loadSystemConfig(config_file_t *config)
 		for (; i < len; i++)
 		{
 			sprintf(path, "/%s/%s", dirspec[i], "com.apple.Boot.plist");
-
-			if (loadConfigFile(path, config) == STATE_SUCCESS)
-			{
-				retValue = 0;
-			}
+			retValue = loadConfigFile(path, config);
 		}
 
 		free (path);

From c2390f42fda1b048b12ecb61f0b4dc8e8b018b5f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 19 Mar 2013 17:12:03 +0100
Subject: [PATCH 332/623] Flexible CPU scope

Boards that are not backward compatible with the ACPI 1.0 specification
use _SB.CPUn/P00n instead of _PR.CPUn/P00n
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 49 +++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 13ebef6..d03da14 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 5.6 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 5.7 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -62,6 +62,7 @@
 #			- Now supporting up to 256/0xff logical processors (Pike, March 2013)
 #			- Command line argument for processor labels added (Pike, March 2013)
 #			- Bug fix, overriding the cpu type displayed the wrong name (Jeroen, March 2013)
+#			- Automatic detection of CPU scopes added (Pike, March 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -158,7 +159,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=5.6
+gScriptVersion=5.7
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -493,7 +494,7 @@ function _printExternals()
     let currentCPU=0;
 
     while [ $currentCPU -lt $gLogicalCPUs ]; do
-        echo "    External (\_PR_.${gProcessorNames[$currentCPU]}, DeviceObj)"          >> $gSsdtPR
+        echo '    External ('${gScope}'.'${gProcessorNames[$currentCPU]}', DeviceObj)'  >> $gSsdtPR
         let currentCPU+=1
     done
 
@@ -524,7 +525,7 @@ function _printProcessorDefinitions()
     let currentCPU=0;
 
     while [ $currentCPU -lt $1 ]; do
-        echo "    External (\_PR_.${gProcessorNames[$currentCPU]}, DeviceObj)"          >> $gSsdtPR
+        echo '    External ('${gScope}'.'${gProcessorNames[$currentCPU]}', DeviceObj)'  >> $gSsdtPR
         let currentCPU+=1
     done
 
@@ -541,7 +542,7 @@ function _printScopeStart()
     # TODO: Remove this when CPUPM for IB works properly!
     let useWorkArounds=0
 
-    echo '    Scope (\_PR.'${gProcessorNames[0]}')'                                     >> $gSsdtPR
+    echo '    Scope ('${gScope}'.'${gProcessorNames[0]}')'                              >> $gSsdtPR
     echo '    {'                                                                        >> $gSsdtPR
 
     #
@@ -936,10 +937,10 @@ function _printScopeCPUn()
     let currentCPU=1;
 
     while [ $currentCPU -lt $gLogicalCPUs ]; do
-        echo ''                                                                                     >> $gSsdtPR
-        echo "    Scope (\_PR.${gProcessorNames[$currentCPU]})"                                     >> $gSsdtPR
-        echo '    {'                                                                                >> $gSsdtPR
-        echo "        Method (APSS, 0, NotSerialized) { Return (\_PR.${gProcessorNames[0]}.APSS) }" >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '    Scope ('${gScope}'.'${gProcessorNames[$currentCPU]}')'                >> $gSsdtPR
+        echo '    {'                                                                    >> $gSsdtPR
+        echo '        Method (APSS, 0, NotSerialized) { Return ('${gScope}'.'${gProcessorNames[0]}'.APSS) }' >> $gSsdtPR
 
         #
         # IB CPUPM tries to parse/execute CPUn.ACST (see debug data) and thus we add
@@ -950,15 +951,15 @@ function _printScopeCPUn()
                 then
                     _printScopeACST 1
                 else
-                    echo "        Method (ACST, 0, NotSerialized) { Return (\_PR.${gProcessorNames[1]}.ACST ()) }" >> $gSsdtPR
+                    echo '        Method (ACST, 0, NotSerialized) { Return ('${gScope}'.'${gProcessorNames[1]}'.ACST ()) }' >> $gSsdtPR
             fi
         fi
 
-        echo '    }'                                                                                >> $gSsdtPR
+        echo '    }'                                                                    >> $gSsdtPR
         let currentCPU+=1
     done
 
-    echo '}'                                                                                        >> $gSsdtPR
+    echo '}'                                                                            >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
@@ -1030,6 +1031,29 @@ function _updateProcessorNames()
 
 #--------------------------------------------------------------------------------
 
+function _getScope()
+{
+    let procNameFound=0
+    local names=($(ioreg -p IOACPIPlane -d 3 | sed -e 's/<.*>//g' -e 's/.*o //g'))
+
+    for name in ${names[@]}
+    do
+        if [[ $name == "_SB" && $procNameFound -eq 0 ]]; then
+#           echo 'Using: Scope (\_SB.'${gProcessorNames[0]}') etc.'
+            gScope="\_SB"
+            return
+        fi
+
+        if [[ "${name:0:3}" == ${gProcessorNames[0]:0:3} ]]; then
+#           echo 'Using: Scope (\_PR.'${gProcessorNames[0]}') etc.'
+            gScope="\_PR"
+            let procNameFound=1
+        fi
+    done
+}
+
+#--------------------------------------------------------------------------------
+
 function _getCPUtype()
 {
     #
@@ -1604,6 +1628,7 @@ function main()
 
     _getBoardID
     _getProcessorNames
+    _getScope
 
     local modelID=$(_getModelName)
     local cpu_type=$(_getCPUtype)

From 8fd3a91d194f1e26a7b3ff854fe70bc688bc7875 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 19 Mar 2013 17:22:43 +0100
Subject: [PATCH 333/623] Whitespace changes only

---
 i386/libsaio/xml.c | 49 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/i386/libsaio/xml.c b/i386/libsaio/xml.c
index 72a32f0..a373393 100755
--- a/i386/libsaio/xml.c
+++ b/i386/libsaio/xml.c
@@ -2,15 +2,15 @@
  * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
+ *
  * Portions Copyright (c) 2003 Apple Computer, Inc.  All Rights
- * Reserved.  
+ * Reserved.
  * The contents of this file constitute Original Code as defined in and
  * are subject to the Apple Public Source License Version 2.0 (the
  * "License").  You may not use this file except in compliance with the
  * License.  Please obtain a copy of the License at
  * http://www.apple.com/publicsource and read it before using this file.
- * 
+ *
  * This Original Code and all software distributed under the License are
  * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -18,7 +18,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
  * License for the specific language governing rights and limitations
  * under the License.
- * 
+ *
  * @APPLE_LICENSE_HEADER_END@
  *
  * Updates:
@@ -106,12 +106,12 @@ TagPtr XMLGetProperty(TagPtr dict, const char * key)
 	{
 		TagPtr tag = 0;
 		TagPtr tagList = dict->tag;
-
+		
 		while (tagList)
 		{
 			tag = tagList;
 			tagList = tag->tagNext;
-
+			
 			if ((tag->type != kTagTypeKey) || (tag->string == 0))
 			{
 				continue;
@@ -122,7 +122,7 @@ TagPtr XMLGetProperty(TagPtr dict, const char * key)
 			}
 		}
 	}
-
+	
 	return 0;
 }
 
@@ -142,7 +142,7 @@ long XMLParseFile(char * buffer, TagPtr * dict)
 	while (TRUE)
 	{
 		length = XMLParseNextTag(buffer + pos, &tag);
-
+		
 		if (length == -1)
 		{
 			break;
@@ -159,7 +159,7 @@ long XMLParseFile(char * buffer, TagPtr * dict)
 		{
 			break;
 		}
-
+		
 		XMLFreeTag(tag);
 	}
 
@@ -169,7 +169,7 @@ long XMLParseFile(char * buffer, TagPtr * dict)
 	}
 
 	*dict = tag;
-
+	
 	return 0L;
 }
 #endif /* UNUSED */
@@ -182,11 +182,11 @@ long XMLParseNextTag(char * buffer, TagPtr * tag)
 	char * tagName;
 	long pos	= 0L;
 	long length	= GetNextTag(buffer, &tagName, 0);
-	
+
 	if (length != -1L)
 	{
 		pos = length;
-		
+
 		if (!strncmp(tagName, kXMLTagPList, 6))
 		{
 			length = 0L;
@@ -240,12 +240,11 @@ long XMLParseNextTag(char * buffer, TagPtr * tag)
 			*tag = 0;
 			length = 0L;
 		}
-		
+
 		if (length == -1)
 		{
 			pos = 0L;
 		}
-
 	}
 
 	return pos + length;
@@ -285,7 +284,7 @@ static long ParseTagList(char * buffer, TagPtr * tag, long type, long empty)
 		if (length == -1)
 		{
 			XMLFreeTag(tagList);
-
+			
 			return -1L;
 		}
 	}
@@ -378,7 +377,7 @@ static long ParseTagString(char * buffer, TagPtr * tag)
 				tmpTag->string	= string;
 				tmpTag->tag		= 0;
 				tmpTag->tagNext	= 0;
-				
+
 				*tag = tmpTag;
 			}
 			else
@@ -506,38 +505,38 @@ static long GetNextTag(char * buffer, char ** tag, long * start)
 	{
 		// Find the start of the tag.
 		long cnt = 0L;
-		
+
 		while ((buffer[cnt] != '\0') && (buffer[cnt] != '<'))
 		{
 			cnt++;
 		}
-		
+
 		if (buffer[cnt] != '\0')
 		{
 			// Find the end of the tag.
 			long cnt2 = cnt + 1L;
-			
+
 			while ((buffer[cnt2] != '\0') && (buffer[cnt2] != '>'))
 			{
 				cnt2++;
 			}
-			
+
 			if (buffer[cnt2] != '\0')
 			{
 				// Fix the tag data.
 				*tag = buffer + cnt + 1;
 				buffer[cnt2] = '\0';
-				
+
 				if (start)
 				{
 					*start = cnt;
 				}
-				
+
 				return cnt2 + 1;
 			}
 		}
 	}
-	
+
 	return -1L;
 }
 
@@ -658,7 +657,7 @@ static char * NewSymbol(char * string)
 			// Set the symbol's data.
 			symbol->refCount = 0;
 			strcpy(symbol->string, string);
-
+			
 			// Add the symbol to the list.
 			symbol->next = gSymbolsHead;
 			gSymbolsHead = symbol;
@@ -739,4 +738,4 @@ static SymbolPtr FindSymbol(char * string, SymbolPtr * prevSymbol)
 	}
 
 	return symbol;
-}
+}
\ No newline at end of file

From 1b6902a1d19f445bd8c1075182ea2e501c658779 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 19 Mar 2013 17:30:19 +0100
Subject: [PATCH 334/623] Resolving commit conflicts

---
 i386/libsaio/platform.h | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index c8e87a1..28c582d 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -54,15 +54,6 @@
 // Additional model selectors to select a specific target model.
 //------------------------------------------------------------------------------
 
-<<<<<<< HEAD
-#define IMAC_131			(IMAC | (4 << 15))
-#define IMAC_122			(IMAC | (3 << 15))
-#define IMAC_121			(IMAC | (2 << 15))
-#define IMAC_111			(IMAC | (1 << 15))       
-#define IMAC_132			 IMAC                    		// Defaults to iMac13,2
-
-#define MACBOOK_41			MACBOOK					// Defaults to MacBook4,1
-=======
 #define IMAC_111				(IMAC | (1 << 15))
 #define IMAC_121				(IMAC | (2 << 15))
 #define IMAC_122				(IMAC | (3 << 15))
@@ -70,30 +61,10 @@
 #define IMAC_132				 IMAC						// Defaults to iMac13,2
 
 #define MACBOOK_41				 MACBOOK					// Defaults to MacBook4,1
->>>>>>> Reordering model identifier data
-
-#define MACBOOK_AIR_42			(MACBOOK_AIR | (1 << 15))
-#define MACBOOK_AIR_41			 MACBOOK_AIR				// Defaults to MacBookAir4,1
-
-<<<<<<< HEAD
-#define MACBOOK_PRO_102			(MACBOOK_PRO | (6 << 15))
-#define MACBOOK_PRO_101			(MACBOOK_PRO | (5 << 15))
-#define MACBOOK_PRO_91			(MACBOOK_PRO | (4 << 15))
-#define MACBOOK_PRO_83			(MACBOOK_PRO | (3 << 15))
-#define MACBOOK_PRO_82			(MACBOOK_PRO | (2 << 15))
-#define MACBOOK_PRO_81			(MACBOOK_PRO | (1 << 15))
-#define MACBOOK_PRO_61			 MACBOOK_PRO				// Defaults to MacBookPro8,1
-
-#define MACMINI_62			(MACMINI | (4 << 15))
-#define MACMINI_61			(MACMINI | (3 << 15))
-#define MACMINI_53			(MACMINI | (2 << 15))
-#define MACMINI_52			(MACMINI | (1 << 15))
-#define MACMINI_51			 MACMINI				// Defaults to Macmini5,1
-
-#define MACPRO_51			(MACPRO | (2 << 15))
-#define MACPRO_41			(MACPRO | (1 << 15))
-#define MACPRO_31			 MACPRO					// Defaults to MacPro3,1
-=======
+
+#define MACBOOK_AIR_41			(MACBOOK_AIR | (1 << 15))
+#define MACBOOK_AIR_42			 MACBOOK_AIR				// Defaults to MacBookAir4,1
+
 #define MACBOOK_PRO_61			(MACBOOK_PRO | (1 << 15))
 #define MACBOOK_PRO_81			(MACBOOK_PRO | (2 << 15))
 #define MACBOOK_PRO_82			(MACBOOK_PRO | (3 << 15))
@@ -113,7 +84,6 @@
 #define MACPRO_31				(MACPRO | (1 << 15))
 #define MACPRO_41				(MACPRO | (2 << 15))
 #define MACPRO_51				 MACPRO						// Defaults to MacPro5,1
->>>>>>> Reordering model identifier data
 
 //------------------------------------------------------------------------------
 

From 26472251fd7f81e2f6ef2f7bef6b14301e6af9f5 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 22 Mar 2013 23:33:59 +0100
Subject: [PATCH 335/623] Factory DSDT with 32MB IGPU memory selected

---
 .../acpi/examples/P8Z68-V PRO/dsdt.dsl        | 12962 ++++++++++++++++
 1 file changed, 12962 insertions(+)
 create mode 100644 i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl
new file mode 100644
index 0000000..1ad45bd
--- /dev/null
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
@@ -0,0 +1,12962 @@
+/*
+ * Intel ACPI Component Architecture
+ * AML Disassembler version 20110316-64 [Mar 16 2011]
+ * Copyright (c) 2000 - 2011 Intel Corporation
+ * 
+ * Disassembly of dsdt-factory-32mb-igpu.aml, Wed Mar 20 12:38:18 2013
+ *
+ * Original Table Header:
+ *     Signature        "DSDT"
+ *     Length           0x0000BAFE (47870)
+ *     Revision         0x02
+ *     Checksum         0x72
+ *     OEM ID           "ALASKA"
+ *     OEM Table ID     "A M I"
+ *     OEM Revision     0x00000015 (21)
+ *     Compiler ID      "INTL"
+ *     Compiler Version 0x20051117 (537202967)
+ */
+
+DefinitionBlock ("dsdt-factory-32mb-igpu.aml", "DSDT", 2, "ALASKA", "A M I", 0x00000015)
+{
+    External (TNOT, MethodObj)    // 0 Arguments
+    External (PDC7)
+    External (PDC6)
+    External (PDC5)
+    External (PDC4)
+    External (PDC3)
+    External (PDC2)
+    External (PDC1)
+    External (PDC0)
+    External (CFGD)
+    External (HNOT, MethodObj)    // 1 Arguments
+    External (SNXD)
+    External (HWID, IntObj)
+    External (IDAB, MethodObj)    // 0 Arguments
+    External (HDOS, MethodObj)    // 0 Arguments
+    External (ECST, MethodObj)    // 1 Arguments
+    External (\_PR_.APSV)
+    External (\_PR_.AAC0)
+    External (\_PR_.ACRT)
+    External (\_PR_.CPU0._PPC)
+    External (\_SB_.PCI0.IEIT.EITV, MethodObj)    // 0 Arguments
+
+    Name (SP1O, 0x2E)
+    Name (IO1B, Zero)
+    Name (IO1L, Zero)
+    Name (IO2B, Zero)
+    Name (IO2L, Zero)
+    Name (IO3B, 0x0290)
+    Name (IO3L, 0x10)
+    Name (IOES, Zero)
+    Name (WKTP, Zero)
+    Name (SPIO, 0x2E)
+    Name (IOHW, 0x0290)
+    Name (IOSB, Zero)
+    Name (IOSL, 0x10)
+    Name (IOHB, 0x0290)
+    Name (IOHL, 0x10)
+    Name (SMBS, 0x0580)
+    Name (SMBL, 0x20)
+    Name (PMBS, 0x0400)
+    Name (PMLN, 0x80)
+    Name (GPBS, 0x0500)
+    Name (GPLN, 0x80)
+    Name (SMIP, 0xB2)
+    Name (APCB, 0xFEC00000)
+    Name (APCL, 0x1000)
+    Name (SMCR, 0x0430)
+    Name (HPTB, 0xFED00000)
+    Name (HPTC, 0xFED1F404)
+    Name (FLSZ, 0x00800000)
+    Name (SRCB, 0xFED1C000)
+    Name (RCLN, 0x4000)
+    Name (TCBR, 0xFED08000)
+    Name (TCLT, 0x1000)
+    Name (PEBS, 0xF8000000)
+    Name (PELN, 0x04000000)
+    Name (LAPB, 0xFEE00000)
+    Name (EGPB, 0xFED19000)
+    Name (MCHB, 0xFED10000)
+    Name (VTBS, 0xFED90000)
+    Name (VTLN, 0x4000)
+    Name (ACPH, 0xDE)
+    Name (ASSB, Zero)
+    Name (AOTB, Zero)
+    Name (AAXB, Zero)
+    Name (PEHP, One)
+    Name (SHPC, Zero)
+    Name (PEPM, One)
+    Name (PEER, One)
+    Name (PECS, One)
+    Name (ITKE, Zero)
+    Name (MBEC, 0xFFFF)
+    Name (AMWV, 0x09)
+    Name (FMBL, One)
+    Name (FDTP, 0x02)
+    Name (FUPS, 0x03)
+    Name (FUWS, 0x04)
+    Name (BSH, Zero)
+    Name (BEL, One)
+    Name (BEH, 0x02)
+    Name (BRH, 0x03)
+    Name (BTF, 0x04)
+    Name (BHC, 0x05)
+    Name (BYB, 0x06)
+    Name (BPH, 0x07)
+    Name (BSHS, 0x08)
+    Name (BELC, 0x09)
+    Name (BRHP, 0x0A)
+    Name (BTFC, 0x0B)
+    Name (BEHP, 0x0C)
+    Name (BPHS, 0x0D)
+    Name (BELP, 0x0E)
+    Name (BTL, 0x10)
+    Name (BTFP, 0x11)
+    Name (BSR, 0x14)
+    Name (BOF, 0x20)
+    Name (BEF, 0x21)
+    Name (BLLE, 0x22)
+    Name (BLLC, 0x23)
+    Name (BLCA, 0x24)
+    Name (BLLS, 0x25)
+    Name (BLLP, 0x26)
+    Name (BLLD, 0x27)
+    Name (BHBE, 0x30)
+    Name (BHBC, 0x31)
+    Name (BHBN, 0x32)
+    Name (BHBM, 0x33)
+    Name (TRTP, One)
+    Name (WDTE, One)
+    Name (TRTD, 0x02)
+    Name (TRTI, 0x03)
+    Name (GCDD, One)
+    Name (DSTA, 0x0A)
+    Name (DSLO, 0x0C)
+    Name (DSLC, 0x0E)
+    Name (PITS, 0x10)
+    Name (SBCS, 0x12)
+    Name (SALS, 0x13)
+    Name (LSSS, 0x2A)
+    Name (SOOT, 0x35)
+    Name (PDBR, 0x4D)
+    Name (SS1, One)
+    Name (SS2, Zero)
+    Name (SS3, One)
+    Name (SS4, One)
+    Name (IOST, 0x0000)
+    Name (TOPM, 0x00000000)
+    Name (ROMS, 0xFFE00000)
+    Name (VGAF, One)
+    OperationRegion (GNVS, SystemMemory, 0xDCBB2E18, 0x01CB)
+    Field (GNVS, AnyAcc, Lock, Preserve)
+    {
+        OSYS,   16, 
+        SMIF,   8, 
+        PRM0,   8, 
+        PRM1,   8, 
+        SCIF,   8, 
+        PRM2,   8, 
+        PRM3,   8, 
+        LCKF,   8, 
+        PRM4,   8, 
+        PRM5,   8, 
+        P80D,   32, 
+        LIDS,   8, 
+        PWRS,   8, 
+        DBGS,   8, 
+        THOF,   8, 
+        ACT1,   8, 
+        ACTT,   8, 
+        PSVT,   8, 
+        TC1V,   8, 
+        TC2V,   8, 
+        TSPV,   8, 
+        CRTT,   8, 
+        DTSE,   8, 
+        DTS1,   8, 
+        DTS2,   8, 
+        DTSF,   8, 
+                Offset (0x25), 
+        REVN,   8, 
+        RES3,   8, 
+                Offset (0x28), 
+        APIC,   8, 
+        TCNT,   8, 
+        PCP0,   8, 
+        PCP1,   8, 
+        PPCM,   8, 
+        PPMF,   32, 
+        C67L,   8, 
+        NATP,   8, 
+        CMAP,   8, 
+        CMBP,   8, 
+        LPTP,   8, 
+        FDCP,   8, 
+        CMCP,   8, 
+        CIRP,   8, 
+        SMSC,   8, 
+        W381,   8, 
+        SMC1,   8, 
+        IGDS,   8, 
+        TLST,   8, 
+        CADL,   8, 
+        PADL,   8, 
+        CSTE,   16, 
+        NSTE,   16, 
+        SSTE,   16, 
+        NDID,   8, 
+        DID1,   32, 
+        DID2,   32, 
+        DID3,   32, 
+        DID4,   32, 
+        DID5,   32, 
+        KSV0,   32, 
+        KSV1,   8, 
+                Offset (0x67), 
+        BLCS,   8, 
+        BRTL,   8, 
+        ALSE,   8, 
+        ALAF,   8, 
+        LLOW,   8, 
+        LHIH,   8, 
+                Offset (0x6E), 
+        EMAE,   8, 
+        EMAP,   16, 
+        EMAL,   16, 
+                Offset (0x74), 
+        MEFE,   8, 
+        DSTS,   8, 
+                Offset (0x78), 
+        TPMP,   8, 
+        TPME,   8, 
+        MORD,   8, 
+        TCGP,   8, 
+        PPRP,   32, 
+        PPRQ,   8, 
+        LPPR,   8, 
+        GTF0,   56, 
+        GTF2,   56, 
+        IDEM,   8, 
+        GTF1,   56, 
+        BID,    8, 
+        PLID,   8, 
+                Offset (0xAA), 
+        ASLB,   32, 
+        IBTT,   8, 
+        IPAT,   8, 
+        ITVF,   8, 
+        ITVM,   8, 
+        IPSC,   8, 
+        IBLC,   8, 
+        IBIA,   8, 
+        ISSC,   8, 
+        I409,   8, 
+        I509,   8, 
+        I609,   8, 
+        I709,   8, 
+        IPCF,   8, 
+        IDMS,   8, 
+        IF1E,   8, 
+        HVCO,   8, 
+        NXD1,   32, 
+        NXD2,   32, 
+        NXD3,   32, 
+        NXD4,   32, 
+        NXD5,   32, 
+        NXD6,   32, 
+        NXD7,   32, 
+        NXD8,   32, 
+        GSMI,   8, 
+        PAVP,   8, 
+                Offset (0xE1), 
+        OSCC,   8, 
+        NEXP,   8, 
+        SBV1,   8, 
+        SBV2,   8, 
+                Offset (0xEB), 
+        DSEN,   8, 
+        ECON,   8, 
+        GPIC,   8, 
+        CTYP,   8, 
+        L01C,   8, 
+        VFN0,   8, 
+        VFN1,   8, 
+        VFN2,   8, 
+        VFN3,   8, 
+        VFN4,   8, 
+                Offset (0x100), 
+        NVGA,   32, 
+        NVHA,   32, 
+        AMDA,   32, 
+        DID6,   32, 
+        DID7,   32, 
+        DID8,   32, 
+        EBAS,   32, 
+        CPSP,   32, 
+        EECP,   32, 
+        EVCP,   32, 
+        XBAS,   32, 
+        OBS1,   32, 
+        OBS2,   32, 
+        OBS3,   32, 
+        OBS4,   32, 
+        OBS5,   32, 
+        OBS6,   32, 
+        OBS7,   32, 
+        OBS8,   32, 
+                Offset (0x157), 
+        ATMC,   8, 
+        PTMC,   8, 
+        ATRA,   8, 
+        PTRA,   8, 
+        PNHM,   32, 
+        TBAB,   32, 
+        TBAH,   32, 
+        RTIP,   8, 
+        TSOD,   8, 
+        ATPC,   8, 
+        PTPC,   8, 
+        PFLV,   8, 
+        BREV,   8, 
+        SGMD,   8, 
+        SGFL,   8, 
+        PWOK,   8, 
+        HLRS,   8, 
+        DSEL,   8, 
+        ESEL,   8, 
+        PSEL,   8, 
+        PWEN,   8, 
+        PRST,   8, 
+        MXD1,   32, 
+        MXD2,   32, 
+        MXD3,   32, 
+        MXD4,   32, 
+        MXD5,   32, 
+        MXD6,   32, 
+        MXD7,   32, 
+        MXD8,   32, 
+        GBAS,   16, 
+        SGGP,   8, 
+        PXFX,   8, 
+        PXDY,   8, 
+        PXFD,   8, 
+                Offset (0x19D), 
+        ALFP,   8, 
+        IMON,   8, 
+        PDTS,   8, 
+        PKGA,   8, 
+        PAMT,   8, 
+        AC0F,   8, 
+        AC1F,   8, 
+        DTS3,   8, 
+        DTS4,   8, 
+                Offset (0x1B2), 
+        XHCI,   8, 
+        XHPM,   8, 
+                Offset (0x1B7), 
+        XTUB,   32, 
+        XTUS,   32, 
+        XMPB,   32, 
+                Offset (0x1C4), 
+        LPMV,   8, 
+        AOAC,   8, 
+        SLDR,   32, 
+        E4GM,   8
+    }
+
+    Scope (_SB)
+    {
+        Name (PR00, Package (0x24)
+        {
+            Package (0x04)
+            {
+                0x001FFFFF, 
+                Zero, 
+                LNKF, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001FFFFF, 
+                One, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001FFFFF, 
+                0x02, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001FFFFF, 
+                0x03, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0014FFFF, 
+                Zero, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001DFFFF, 
+                One, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001DFFFF, 
+                0x02, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001DFFFF, 
+                0x03, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001DFFFF, 
+                Zero, 
+                LNKH, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001AFFFF, 
+                Zero, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001AFFFF, 
+                One, 
+                LNKF, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001AFFFF, 
+                0x02, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001AFFFF, 
+                0x03, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001BFFFF, 
+                Zero, 
+                LNKG, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0016FFFF, 
+                Zero, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0016FFFF, 
+                One, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0016FFFF, 
+                0x02, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0016FFFF, 
+                0x03, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001CFFFF, 
+                Zero, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001CFFFF, 
+                One, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001CFFFF, 
+                0x02, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x001CFFFF, 
+                0x03, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                Zero, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                One, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                0x02, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                0x03, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0006FFFF, 
+                Zero, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0006FFFF, 
+                One, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0006FFFF, 
+                0x02, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0006FFFF, 
+                0x03, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0004FFFF, 
+                Zero, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0004FFFF, 
+                One, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0004FFFF, 
+                0x02, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0004FFFF, 
+                0x03, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                Zero, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0019FFFF, 
+                Zero, 
+                LNKE, 
+                Zero
+            }
+        })
+        Name (AR00, Package (0x24)
+        {
+            Package (0x04)
+            {
+                0x001FFFFF, 
+                Zero, 
+                Zero, 
+                0x15
+            }, 
+
+            Package (0x04)
+            {
+                0x001FFFFF, 
+                One, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x001FFFFF, 
+                0x02, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x001FFFFF, 
+                0x03, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x0014FFFF, 
+                Zero, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x001DFFFF, 
+                One, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x001DFFFF, 
+                0x02, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x001DFFFF, 
+                0x03, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x001DFFFF, 
+                Zero, 
+                Zero, 
+                0x17
+            }, 
+
+            Package (0x04)
+            {
+                0x001AFFFF, 
+                Zero, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x001AFFFF, 
+                One, 
+                Zero, 
+                0x15
+            }, 
+
+            Package (0x04)
+            {
+                0x001AFFFF, 
+                0x02, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x001AFFFF, 
+                0x03, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x001BFFFF, 
+                Zero, 
+                Zero, 
+                0x16
+            }, 
+
+            Package (0x04)
+            {
+                0x0016FFFF, 
+                Zero, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x0016FFFF, 
+                One, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x0016FFFF, 
+                0x02, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x0016FFFF, 
+                0x03, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0x001CFFFF, 
+                Zero, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x001CFFFF, 
+                One, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0x001CFFFF, 
+                0x02, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x001CFFFF, 
+                0x03, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                Zero, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                One, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                0x02, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                0x03, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x0006FFFF, 
+                Zero, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x0006FFFF, 
+                One, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x0006FFFF, 
+                0x02, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0x0006FFFF, 
+                0x03, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x0004FFFF, 
+                Zero, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x0004FFFF, 
+                One, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0x0004FFFF, 
+                0x02, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x0004FFFF, 
+                0x03, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                Zero, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x0019FFFF, 
+                Zero, 
+                Zero, 
+                0x14
+            }
+        })
+        Name (PR04, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKD, 
+                Zero
+            }
+        })
+        Name (AR04, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x13
+            }
+        })
+        Name (PR05, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKA, 
+                Zero
+            }
+        })
+        Name (AR05, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x10
+            }
+        })
+        Name (PR06, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKB, 
+                Zero
+            }
+        })
+        Name (AR06, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x11
+            }
+        })
+        Name (PR07, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKC, 
+                Zero
+            }
+        })
+        Name (AR07, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x12
+            }
+        })
+        Name (PR08, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKD, 
+                Zero
+            }
+        })
+        Name (AR08, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x13
+            }
+        })
+        Name (PR09, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKA, 
+                Zero
+            }
+        })
+        Name (AR09, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x10
+            }
+        })
+        Name (PR0E, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKB, 
+                Zero
+            }
+        })
+        Name (AR0E, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x11
+            }
+        })
+        Name (PR0F, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKC, 
+                Zero
+            }
+        })
+        Name (AR0F, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x12
+            }
+        })
+        Name (PR01, Package (0x08)
+        {
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                Zero, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                One, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                0x02, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                0x03, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0003FFFF, 
+                Zero, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0003FFFF, 
+                One, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0003FFFF, 
+                0x02, 
+                LNKF, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0003FFFF, 
+                0x03, 
+                LNKG, 
+                Zero
+            }
+        })
+        Name (AR01, Package (0x08)
+        {
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                Zero, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                One, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                0x02, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                0x03, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x0003FFFF, 
+                Zero, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x0003FFFF, 
+                One, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x0003FFFF, 
+                0x02, 
+                Zero, 
+                0x15
+            }, 
+
+            Package (0x04)
+            {
+                0x0003FFFF, 
+                0x03, 
+                Zero, 
+                0x16
+            }
+        })
+        Name (PR02, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKD, 
+                Zero
+            }
+        })
+        Name (AR02, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x13
+            }
+        })
+        Name (PR0A, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKA, 
+                Zero
+            }
+        })
+        Name (AR0A, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x10
+            }
+        })
+        Name (PR0B, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKB, 
+                Zero
+            }
+        })
+        Name (AR0B, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x11
+            }
+        })
+        Name (PR0C, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKC, 
+                Zero
+            }
+        })
+        Name (AR0C, Package (0x04)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x12
+            }
+        })
+        Name (PR31, Package (0x0C)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                Zero, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                One, 
+                LNKA, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                0x02, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                0x03, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                Zero, 
+                LNKB, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                One, 
+                LNKC, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                0x02, 
+                LNKD, 
+                Zero
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                0x03, 
+                LNKA, 
+                Zero
+            }
+        })
+        Name (AR31, Package (0x0C)
+        {
+            Package (0x04)
+            {
+                0xFFFF, 
+                Zero, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                One, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x02, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0xFFFF, 
+                0x03, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                Zero, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                One, 
+                Zero, 
+                0x10
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                0x02, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0x0001FFFF, 
+                0x03, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                Zero, 
+                Zero, 
+                0x11
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                One, 
+                Zero, 
+                0x12
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                0x02, 
+                Zero, 
+                0x13
+            }, 
+
+            Package (0x04)
+            {
+                0x0002FFFF, 
+                0x03, 
+                Zero, 
+                0x10
+            }
+        })
+        Name (PRSA, ResourceTemplate ()
+        {
+            IRQ (Level, ActiveLow, Shared, )
+                {3,4,5,6,10,11,12,14,15}
+        })
+        Alias (PRSA, PRSB)
+        Alias (PRSA, PRSC)
+        Alias (PRSA, PRSD)
+        Alias (PRSA, PRSE)
+        Alias (PRSA, PRSF)
+        Alias (PRSA, PRSG)
+        Alias (PRSA, PRSH)
+        Device (PCI0)
+        {
+            Name (_HID, EisaId ("PNP0A08"))
+            Name (_CID, EisaId ("PNP0A03"))
+            Name (_ADR, Zero)
+            Method (^BN00, 0, NotSerialized)
+            {
+                Return (Zero)
+            }
+
+            Method (_BBN, 0, NotSerialized)
+            {
+                Return (BN00 ())
+            }
+
+            Name (_UID, Zero)
+            Method (_PRT, 0, NotSerialized)
+            {
+                If (PICM)
+                {
+                    Return (AR00 ())
+                }
+
+                Return (PR00 ())
+            }
+
+            OperationRegion (HBUS, PCI_Config, Zero, 0x0100)
+            Field (HBUS, DWordAcc, NoLock, Preserve)
+            {
+                        Offset (0x40), 
+                EPEN,   1, 
+                    ,   11, 
+                EPBR,   20, 
+                        Offset (0x48), 
+                MHEN,   1, 
+                    ,   14, 
+                MHBR,   17, 
+                        Offset (0x50), 
+                GCLK,   1, 
+                        Offset (0x54), 
+                D0EN,   1, 
+                        Offset (0x60), 
+                PXEN,   1, 
+                PXSZ,   2, 
+                    ,   23, 
+                PXBR,   6, 
+                        Offset (0x68), 
+                DIEN,   1, 
+                    ,   11, 
+                DIBR,   20, 
+                        Offset (0x70), 
+                    ,   20, 
+                MEBR,   12, 
+                        Offset (0x80), 
+                    ,   4, 
+                PM0H,   2, 
+                        Offset (0x81), 
+                PM1L,   2, 
+                    ,   2, 
+                PM1H,   2, 
+                        Offset (0x82), 
+                PM2L,   2, 
+                    ,   2, 
+                PM2H,   2, 
+                        Offset (0x83), 
+                PM3L,   2, 
+                    ,   2, 
+                PM3H,   2, 
+                        Offset (0x84), 
+                PM4L,   2, 
+                    ,   2, 
+                PM4H,   2, 
+                        Offset (0x85), 
+                PM5L,   2, 
+                    ,   2, 
+                PM5H,   2, 
+                        Offset (0x86), 
+                PM6L,   2, 
+                    ,   2, 
+                PM6H,   2, 
+                        Offset (0x87), 
+                        Offset (0xA8), 
+                    ,   20, 
+                TUUD,   19, 
+                        Offset (0xBC), 
+                    ,   20, 
+                TLUD,   12, 
+                        Offset (0xC8), 
+                    ,   7, 
+                HTSE,   1
+            }
+
+            OperationRegion (MCHT, SystemMemory, 0xFED10000, 0x1100)
+            Field (MCHT, ByteAcc, NoLock, Preserve)
+            {
+            }
+
+            Name (BUF0, ResourceTemplate ()
+            {
+                WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
+                    0x0000,             // Granularity
+                    0x0000,             // Range Minimum
+                    0x00FF,             // Range Maximum
+                    0x0000,             // Translation Offset
+                    0x0100,             // Length
+                    ,, )
+                DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
+                    0x00000000,         // Granularity
+                    0x00000000,         // Range Minimum
+                    0x00000CF7,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00000CF8,         // Length
+                    ,, , TypeStatic)
+                IO (Decode16,
+                    0x0CF8,             // Range Minimum
+                    0x0CF8,             // Range Maximum
+                    0x01,               // Alignment
+                    0x08,               // Length
+                    )
+                DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
+                    0x00000000,         // Granularity
+                    0x00000D00,         // Range Minimum
+                    0x0000FFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x0000F300,         // Length
+                    ,, , TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000A0000,         // Range Minimum
+                    0x000BFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00020000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000C0000,         // Range Minimum
+                    0x000C3FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000C4000,         // Range Minimum
+                    0x000C7FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000C8000,         // Range Minimum
+                    0x000CBFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000CC000,         // Range Minimum
+                    0x000CFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000D0000,         // Range Minimum
+                    0x000D3FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000D4000,         // Range Minimum
+                    0x000D7FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000D8000,         // Range Minimum
+                    0x000DBFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000DC000,         // Range Minimum
+                    0x000DFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000E0000,         // Range Minimum
+                    0x000E3FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000E4000,         // Range Minimum
+                    0x000E7FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000E8000,         // Range Minimum
+                    0x000EBFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000EC000,         // Range Minimum
+                    0x000EFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000F0000,         // Range Minimum
+                    0x000FFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00010000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x00000000,         // Range Minimum
+                    0xFEAFFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0xFEB00000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x0000000000000000, // Granularity
+                    0x0000000000010000, // Range Minimum
+                    0x000000000001FFFF, // Range Maximum
+                    0x0000000000000000, // Translation Offset
+                    0x0000000000010000, // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+            })
+            Method (_CRS, 0, Serialized)
+            {
+                CreateWordField (BUF0, 0x0A, PBMX)
+                Store (Subtract (ShiftRight (PELN, 0x14), 0x02), PBMX)
+                CreateWordField (BUF0, 0x0E, PBLN)
+                Store (Subtract (ShiftRight (PELN, 0x14), One), PBLN)
+                If (PM1L)
+                {
+                    CreateDWordField (BUF0, 0x7C, C0LN)
+                    Store (Zero, C0LN)
+                }
+
+                If (LEqual (PM1L, One))
+                {
+                    CreateBitField (BUF0, 0x0358, C0RW)
+                    Store (Zero, C0RW)
+                }
+
+                If (PM1H)
+                {
+                    CreateDWordField (BUF0, 0x96, C4LN)
+                    Store (Zero, C4LN)
+                }
+
+                If (LEqual (PM1H, One))
+                {
+                    CreateBitField (BUF0, 0x0428, C4RW)
+                    Store (Zero, C4RW)
+                }
+
+                If (PM2L)
+                {
+                    CreateDWordField (BUF0, 0xB0, C8LN)
+                    Store (Zero, C8LN)
+                }
+
+                If (LEqual (PM2L, One))
+                {
+                    CreateBitField (BUF0, 0x04F8, C8RW)
+                    Store (Zero, C8RW)
+                }
+
+                If (PM2H)
+                {
+                    CreateDWordField (BUF0, 0xCA, CCLN)
+                    Store (Zero, CCLN)
+                }
+
+                If (LEqual (PM2H, One))
+                {
+                    CreateBitField (BUF0, 0x05C8, CCRW)
+                    Store (Zero, CCRW)
+                }
+
+                If (PM3L)
+                {
+                    CreateDWordField (BUF0, 0xE4, D0LN)
+                    Store (Zero, D0LN)
+                }
+
+                If (LEqual (PM3L, One))
+                {
+                    CreateBitField (BUF0, 0x0698, D0RW)
+                    Store (Zero, D0RW)
+                }
+
+                If (PM3H)
+                {
+                    CreateDWordField (BUF0, 0xFE, D4LN)
+                    Store (Zero, D4LN)
+                }
+
+                If (LEqual (PM3H, One))
+                {
+                    CreateBitField (BUF0, 0x0768, D4RW)
+                    Store (Zero, D4RW)
+                }
+
+                If (PM4L)
+                {
+                    CreateDWordField (BUF0, 0x0118, D8LN)
+                    Store (Zero, D8LN)
+                }
+
+                If (LEqual (PM4L, One))
+                {
+                    CreateBitField (BUF0, 0x0838, D8RW)
+                    Store (Zero, D8RW)
+                }
+
+                If (PM4H)
+                {
+                    CreateDWordField (BUF0, 0x0132, DCLN)
+                    Store (Zero, DCLN)
+                }
+
+                If (LEqual (PM4H, One))
+                {
+                    CreateBitField (BUF0, 0x0908, DCRW)
+                    Store (Zero, DCRW)
+                }
+
+                If (PM5L)
+                {
+                    CreateDWordField (BUF0, 0x014C, E0LN)
+                    Store (Zero, E0LN)
+                }
+
+                If (LEqual (PM5L, One))
+                {
+                    CreateBitField (BUF0, 0x09D8, E0RW)
+                    Store (Zero, E0RW)
+                }
+
+                If (PM5H)
+                {
+                    CreateDWordField (BUF0, 0x0166, E4LN)
+                    Store (Zero, E4LN)
+                }
+
+                If (LEqual (PM5H, One))
+                {
+                    CreateBitField (BUF0, 0x0AA8, E4RW)
+                    Store (Zero, E4RW)
+                }
+
+                If (PM6L)
+                {
+                    CreateDWordField (BUF0, 0x0180, E8LN)
+                    Store (Zero, E8LN)
+                }
+
+                If (LEqual (PM6L, One))
+                {
+                    CreateBitField (BUF0, 0x0B78, E8RW)
+                    Store (Zero, E8RW)
+                }
+
+                If (PM6H)
+                {
+                    CreateDWordField (BUF0, 0x019A, ECLN)
+                    Store (Zero, ECLN)
+                }
+
+                If (LEqual (PM6H, One))
+                {
+                    CreateBitField (BUF0, 0x0C48, ECRW)
+                    Store (Zero, ECRW)
+                }
+
+                If (PM0H)
+                {
+                    CreateDWordField (BUF0, 0x01B4, F0LN)
+                    Store (Zero, F0LN)
+                }
+
+                If (LEqual (PM0H, One))
+                {
+                    CreateBitField (BUF0, 0x0D18, F0RW)
+                    Store (Zero, F0RW)
+                }
+
+                CreateDWordField (BUF0, 0x01C2, M1MN)
+                CreateDWordField (BUF0, 0x01C6, M1MX)
+                CreateDWordField (BUF0, 0x01CE, M1LN)
+                ShiftLeft (TLUD, 0x14, M1MN)
+                Add (Subtract (M1MX, M1MN), One, M1LN)
+                If (LLessEqual (OSYS, 0x07D3))
+                {
+                    CreateDWordField (BUF0, 0x01F8, MSLN)
+                    Store (Zero, MSLN)
+                }
+                Else
+                {
+                    If (E4GM)
+                    {
+                        CreateQWordField (BUF0, 0x01F8, M2LN)
+                        CreateQWordField (BUF0, 0x01E0, M2MN)
+                        CreateQWordField (BUF0, 0x01E8, M2MX)
+                        If (LGreaterEqual (TUUD, 0x1000))
+                        {
+                            ShiftLeft (TUUD, 0x14, M2MN)
+                            Store (Subtract (0x0000001000000000, ShiftLeft (TUUD, 0x14)), M2LN)
+                        }
+                        Else
+                        {
+                            Store (0x0000000100000000, M2MN)
+                            Store (0x0000000F00000000, M2LN)
+                        }
+
+                        Subtract (Add (M2MN, M2LN), One, M2MX)
+                    }
+                    Else
+                    {
+                        CreateDWordField (BUF0, 0x01F8, M4LN)
+                        Store (Zero, M4LN)
+                    }
+                }
+
+                Return (BUF0)
+            }
+
+            Name (GUID, Buffer (0x10)
+            {
+                /* 0000 */    0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40, 
+                /* 0008 */    0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66
+            })
+            Name (SUPP, Zero)
+            Name (CTRL, Zero)
+            Name (XCNT, Zero)
+            Method (_OSC, 4, Serialized)
+            {
+                Store (Arg3, Local0)
+                CreateDWordField (Local0, Zero, CDW1)
+                CreateDWordField (Local0, 0x04, CDW2)
+                CreateDWordField (Local0, 0x08, CDW3)
+                If (^XHC.CUID (Arg0))
+                {
+                    Return (^XHC.POSC (Arg1, Arg2, Arg3))
+                }
+                Else
+                {
+                    If (_OSI ("Windows 2012"))
+                    {
+                        If (LEqual (XCNT, Zero))
+                        {
+                            ^XHC.XSEL ()
+                            Increment (XCNT)
+                        }
+                    }
+                }
+
+                If (LAnd (LEqual (Arg0, GUID), NEXP))
+                {
+                    Store (CDW2, SUPP)
+                    Store (CDW3, CTRL)
+                    If (Not (And (CDW1, One)))
+                    {
+                        If (And (CTRL, One))
+                        {
+                            NHPG ()
+                        }
+
+                        If (And (CTRL, 0x04))
+                        {
+                            NPME ()
+                        }
+                    }
+
+                    If (LNotEqual (Arg1, One))
+                    {
+                        Or (CDW1, 0x08, CDW1)
+                    }
+
+                    If (LNotEqual (CDW3, CTRL))
+                    {
+                        Or (CDW1, 0x10, CDW1)
+                    }
+
+                    Store (CTRL, CDW3)
+                    Store (CTRL, OSCC)
+                    Return (Local0)
+                }
+                Else
+                {
+                    Or (CDW1, 0x04, CDW1)
+                    Return (Local0)
+                }
+            }
+
+            Scope (\_SB.PCI0)
+            {
+                Method (AR00, 0, NotSerialized)
+                {
+                    Return (^^AR00)
+                }
+
+                Method (PR00, 0, NotSerialized)
+                {
+                    Return (^^PR00)
+                }
+
+                Method (AR01, 0, NotSerialized)
+                {
+                    Return (^^AR01)
+                }
+
+                Method (PR01, 0, NotSerialized)
+                {
+                    Return (^^PR01)
+                }
+
+                Method (AR02, 0, NotSerialized)
+                {
+                    Return (^^AR02)
+                }
+
+                Method (PR02, 0, NotSerialized)
+                {
+                    Return (^^PR02)
+                }
+
+                Method (AR04, 0, NotSerialized)
+                {
+                    Return (^^AR04)
+                }
+
+                Method (PR04, 0, NotSerialized)
+                {
+                    Return (^^PR04)
+                }
+
+                Method (AR05, 0, NotSerialized)
+                {
+                    Return (^^AR05)
+                }
+
+                Method (PR05, 0, NotSerialized)
+                {
+                    Return (^^PR05)
+                }
+
+                Method (AR06, 0, NotSerialized)
+                {
+                    Return (^^AR06)
+                }
+
+                Method (PR06, 0, NotSerialized)
+                {
+                    Return (^^PR06)
+                }
+
+                Method (AR07, 0, NotSerialized)
+                {
+                    Return (^^AR07)
+                }
+
+                Method (PR07, 0, NotSerialized)
+                {
+                    Return (^^PR07)
+                }
+
+                Method (AR08, 0, NotSerialized)
+                {
+                    Return (^^AR08)
+                }
+
+                Method (PR08, 0, NotSerialized)
+                {
+                    Return (^^PR08)
+                }
+
+                Method (AR09, 0, NotSerialized)
+                {
+                    Return (^^AR09)
+                }
+
+                Method (PR09, 0, NotSerialized)
+                {
+                    Return (^^PR09)
+                }
+
+                Method (AR0E, 0, NotSerialized)
+                {
+                    Return (^^AR0E)
+                }
+
+                Method (PR0E, 0, NotSerialized)
+                {
+                    Return (^^PR0E)
+                }
+
+                Method (AR0F, 0, NotSerialized)
+                {
+                    Return (^^AR0F)
+                }
+
+                Method (PR0F, 0, NotSerialized)
+                {
+                    Return (^^PR0F)
+                }
+
+                Method (AR0A, 0, NotSerialized)
+                {
+                    Return (^^AR0A)
+                }
+
+                Method (PR0A, 0, NotSerialized)
+                {
+                    Return (^^PR0A)
+                }
+
+                Method (AR0B, 0, NotSerialized)
+                {
+                    Return (^^AR0B)
+                }
+
+                Method (PR0B, 0, NotSerialized)
+                {
+                    Return (^^PR0B)
+                }
+
+                Method (AR0C, 0, NotSerialized)
+                {
+                    Return (^^AR0C)
+                }
+
+                Method (PR0C, 0, NotSerialized)
+                {
+                    Return (^^PR0C)
+                }
+            }
+
+            Device (TPMX)
+            {
+                Name (_HID, EisaId ("PNP0C01"))
+                Name (_UID, One)
+                Name (CRS, ResourceTemplate ()
+                {
+                    Memory32Fixed (ReadOnly,
+                        0xFED40000,         // Address Base
+                        0x00005000,         // Address Length
+                        )
+                })
+                Method (_CRS, 0, NotSerialized)
+                {
+                    If (TPMF)
+                    {
+                        Return (Zero)
+                    }
+
+                    Return (CRS)
+                }
+            }
+
+            Device (LPCB)
+            {
+                Name (_ADR, 0x001F0000)
+                Scope (\_SB)
+                {
+                    OperationRegion (PCI0.LPCB.LPC1, PCI_Config, 0x40, 0xC0)
+                    Field (PCI0.LPCB.LPC1, AnyAcc, NoLock, Preserve)
+                    {
+                                Offset (0x20), 
+                        PARC,   8, 
+                        PBRC,   8, 
+                        PCRC,   8, 
+                        PDRC,   8, 
+                                Offset (0x28), 
+                        PERC,   8, 
+                        PFRC,   8, 
+                        PGRC,   8, 
+                        PHRC,   8, 
+                                Offset (0x6C), 
+                                Offset (0x6D), 
+                                Offset (0x6E), 
+                        XUSB,   1
+                    }
+
+                    Device (LNKA)
+                    {
+                        Name (_HID, EisaId ("PNP0C0F"))
+                        Name (_UID, One)
+                        Method (_DIS, 0, Serialized)
+                        {
+                            Or (PARC, 0x80, PARC)
+                        }
+
+                        Method (_PRS, 0, Serialized)
+                        {
+                            Return (PRSA)
+                        }
+
+                        Method (_CRS, 0, Serialized)
+                        {
+                            Name (RTLA, ResourceTemplate ()
+                            {
+                                IRQ (Level, ActiveLow, Shared, )
+                                    {}
+                            })
+                            CreateWordField (RTLA, One, IRQ0)
+                            Store (Zero, IRQ0)
+                            ShiftLeft (One, And (PARC, 0x0F), IRQ0)
+                            Return (RTLA)
+                        }
+
+                        Method (_SRS, 1, Serialized)
+                        {
+                            CreateWordField (Arg0, One, IRQ0)
+                            FindSetRightBit (IRQ0, Local0)
+                            Decrement (Local0)
+                            Store (Local0, PARC)
+                        }
+
+                        Method (_STA, 0, Serialized)
+                        {
+                            If (And (PARC, 0x80))
+                            {
+                                Return (0x09)
+                            }
+                            Else
+                            {
+                                Return (0x0B)
+                            }
+                        }
+                    }
+
+                    Device (LNKB)
+                    {
+                        Name (_HID, EisaId ("PNP0C0F"))
+                        Name (_UID, 0x02)
+                        Method (_DIS, 0, Serialized)
+                        {
+                            Or (PBRC, 0x80, PBRC)
+                        }
+
+                        Method (_PRS, 0, Serialized)
+                        {
+                            Return (PRSB)
+                        }
+
+                        Method (_CRS, 0, Serialized)
+                        {
+                            Name (RTLB, ResourceTemplate ()
+                            {
+                                IRQ (Level, ActiveLow, Shared, )
+                                    {}
+                            })
+                            CreateWordField (RTLB, One, IRQ0)
+                            Store (Zero, IRQ0)
+                            ShiftLeft (One, And (PBRC, 0x0F), IRQ0)
+                            Return (RTLB)
+                        }
+
+                        Method (_SRS, 1, Serialized)
+                        {
+                            CreateWordField (Arg0, One, IRQ0)
+                            FindSetRightBit (IRQ0, Local0)
+                            Decrement (Local0)
+                            Store (Local0, PBRC)
+                        }
+
+                        Method (_STA, 0, Serialized)
+                        {
+                            If (And (PBRC, 0x80))
+                            {
+                                Return (0x09)
+                            }
+                            Else
+                            {
+                                Return (0x0B)
+                            }
+                        }
+                    }
+
+                    Device (LNKC)
+                    {
+                        Name (_HID, EisaId ("PNP0C0F"))
+                        Name (_UID, 0x03)
+                        Method (_DIS, 0, Serialized)
+                        {
+                            Or (PCRC, 0x80, PCRC)
+                        }
+
+                        Method (_PRS, 0, Serialized)
+                        {
+                            Return (PRSC)
+                        }
+
+                        Method (_CRS, 0, Serialized)
+                        {
+                            Name (RTLC, ResourceTemplate ()
+                            {
+                                IRQ (Level, ActiveLow, Shared, )
+                                    {}
+                            })
+                            CreateWordField (RTLC, One, IRQ0)
+                            Store (Zero, IRQ0)
+                            ShiftLeft (One, And (PCRC, 0x0F), IRQ0)
+                            Return (RTLC)
+                        }
+
+                        Method (_SRS, 1, Serialized)
+                        {
+                            CreateWordField (Arg0, One, IRQ0)
+                            FindSetRightBit (IRQ0, Local0)
+                            Decrement (Local0)
+                            Store (Local0, PCRC)
+                        }
+
+                        Method (_STA, 0, Serialized)
+                        {
+                            If (And (PCRC, 0x80))
+                            {
+                                Return (0x09)
+                            }
+                            Else
+                            {
+                                Return (0x0B)
+                            }
+                        }
+                    }
+
+                    Device (LNKD)
+                    {
+                        Name (_HID, EisaId ("PNP0C0F"))
+                        Name (_UID, 0x04)
+                        Method (_DIS, 0, Serialized)
+                        {
+                            Or (PDRC, 0x80, PDRC)
+                        }
+
+                        Method (_PRS, 0, Serialized)
+                        {
+                            Return (PRSD)
+                        }
+
+                        Method (_CRS, 0, Serialized)
+                        {
+                            Name (RTLD, ResourceTemplate ()
+                            {
+                                IRQ (Level, ActiveLow, Shared, )
+                                    {}
+                            })
+                            CreateWordField (RTLD, One, IRQ0)
+                            Store (Zero, IRQ0)
+                            ShiftLeft (One, And (PDRC, 0x0F), IRQ0)
+                            Return (RTLD)
+                        }
+
+                        Method (_SRS, 1, Serialized)
+                        {
+                            CreateWordField (Arg0, One, IRQ0)
+                            FindSetRightBit (IRQ0, Local0)
+                            Decrement (Local0)
+                            Store (Local0, PDRC)
+                        }
+
+                        Method (_STA, 0, Serialized)
+                        {
+                            If (And (PDRC, 0x80))
+                            {
+                                Return (0x09)
+                            }
+                            Else
+                            {
+                                Return (0x0B)
+                            }
+                        }
+                    }
+
+                    Device (LNKE)
+                    {
+                        Name (_HID, EisaId ("PNP0C0F"))
+                        Name (_UID, 0x05)
+                        Method (_DIS, 0, Serialized)
+                        {
+                            Or (PERC, 0x80, PERC)
+                        }
+
+                        Method (_PRS, 0, Serialized)
+                        {
+                            Return (PRSE)
+                        }
+
+                        Method (_CRS, 0, Serialized)
+                        {
+                            Name (RTLE, ResourceTemplate ()
+                            {
+                                IRQ (Level, ActiveLow, Shared, )
+                                    {}
+                            })
+                            CreateWordField (RTLE, One, IRQ0)
+                            Store (Zero, IRQ0)
+                            ShiftLeft (One, And (PERC, 0x0F), IRQ0)
+                            Return (RTLE)
+                        }
+
+                        Method (_SRS, 1, Serialized)
+                        {
+                            CreateWordField (Arg0, One, IRQ0)
+                            FindSetRightBit (IRQ0, Local0)
+                            Decrement (Local0)
+                            Store (Local0, PERC)
+                        }
+
+                        Method (_STA, 0, Serialized)
+                        {
+                            If (And (PERC, 0x80))
+                            {
+                                Return (0x09)
+                            }
+                            Else
+                            {
+                                Return (0x0B)
+                            }
+                        }
+                    }
+
+                    Device (LNKF)
+                    {
+                        Name (_HID, EisaId ("PNP0C0F"))
+                        Name (_UID, 0x06)
+                        Method (_DIS, 0, Serialized)
+                        {
+                            Or (PFRC, 0x80, PFRC)
+                        }
+
+                        Method (_PRS, 0, Serialized)
+                        {
+                            Return (PRSF)
+                        }
+
+                        Method (_CRS, 0, Serialized)
+                        {
+                            Name (RTLF, ResourceTemplate ()
+                            {
+                                IRQ (Level, ActiveLow, Shared, )
+                                    {}
+                            })
+                            CreateWordField (RTLF, One, IRQ0)
+                            Store (Zero, IRQ0)
+                            ShiftLeft (One, And (PFRC, 0x0F), IRQ0)
+                            Return (RTLF)
+                        }
+
+                        Method (_SRS, 1, Serialized)
+                        {
+                            CreateWordField (Arg0, One, IRQ0)
+                            FindSetRightBit (IRQ0, Local0)
+                            Decrement (Local0)
+                            Store (Local0, PFRC)
+                        }
+
+                        Method (_STA, 0, Serialized)
+                        {
+                            If (And (PFRC, 0x80))
+                            {
+                                Return (0x09)
+                            }
+                            Else
+                            {
+                                Return (0x0B)
+                            }
+                        }
+                    }
+
+                    Device (LNKG)
+                    {
+                        Name (_HID, EisaId ("PNP0C0F"))
+                        Name (_UID, 0x07)
+                        Method (_DIS, 0, Serialized)
+                        {
+                            Or (PGRC, 0x80, PGRC)
+                        }
+
+                        Method (_PRS, 0, Serialized)
+                        {
+                            Return (PRSG)
+                        }
+
+                        Method (_CRS, 0, Serialized)
+                        {
+                            Name (RTLG, ResourceTemplate ()
+                            {
+                                IRQ (Level, ActiveLow, Shared, )
+                                    {}
+                            })
+                            CreateWordField (RTLG, One, IRQ0)
+                            Store (Zero, IRQ0)
+                            ShiftLeft (One, And (PGRC, 0x0F), IRQ0)
+                            Return (RTLG)
+                        }
+
+                        Method (_SRS, 1, Serialized)
+                        {
+                            CreateWordField (Arg0, One, IRQ0)
+                            FindSetRightBit (IRQ0, Local0)
+                            Decrement (Local0)
+                            Store (Local0, PGRC)
+                        }
+
+                        Method (_STA, 0, Serialized)
+                        {
+                            If (And (PGRC, 0x80))
+                            {
+                                Return (0x09)
+                            }
+                            Else
+                            {
+                                Return (0x0B)
+                            }
+                        }
+                    }
+
+                    Device (LNKH)
+                    {
+                        Name (_HID, EisaId ("PNP0C0F"))
+                        Name (_UID, 0x08)
+                        Method (_DIS, 0, Serialized)
+                        {
+                            Or (PHRC, 0x80, PHRC)
+                        }
+
+                        Method (_PRS, 0, Serialized)
+                        {
+                            Return (PRSH)
+                        }
+
+                        Method (_CRS, 0, Serialized)
+                        {
+                            Name (RTLH, ResourceTemplate ()
+                            {
+                                IRQ (Level, ActiveLow, Shared, )
+                                    {}
+                            })
+                            CreateWordField (RTLH, One, IRQ0)
+                            Store (Zero, IRQ0)
+                            ShiftLeft (One, And (PHRC, 0x0F), IRQ0)
+                            Return (RTLH)
+                        }
+
+                        Method (_SRS, 1, Serialized)
+                        {
+                            CreateWordField (Arg0, One, IRQ0)
+                            FindSetRightBit (IRQ0, Local0)
+                            Decrement (Local0)
+                            Store (Local0, PHRC)
+                        }
+
+                        Method (_STA, 0, Serialized)
+                        {
+                            If (And (PHRC, 0x80))
+                            {
+                                Return (0x09)
+                            }
+                            Else
+                            {
+                                Return (0x0B)
+                            }
+                        }
+                    }
+                }
+
+                OperationRegion (LPC0, PCI_Config, 0x40, 0xC0)
+                Field (LPC0, AnyAcc, NoLock, Preserve)
+                {
+                            Offset (0x40), 
+                    IOD0,   8, 
+                    IOD1,   8, 
+                            Offset (0xB0), 
+                    RAEN,   1, 
+                        ,   13, 
+                    RCBA,   18
+                }
+
+                Device (DMAC)
+                {
+                    Name (_HID, EisaId ("PNP0200"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0000,             // Range Minimum
+                            0x0000,             // Range Maximum
+                            0x01,               // Alignment
+                            0x20,               // Length
+                            )
+                        IO (Decode16,
+                            0x0081,             // Range Minimum
+                            0x0081,             // Range Maximum
+                            0x01,               // Alignment
+                            0x11,               // Length
+                            )
+                        IO (Decode16,
+                            0x0093,             // Range Minimum
+                            0x0093,             // Range Maximum
+                            0x01,               // Alignment
+                            0x0D,               // Length
+                            )
+                        IO (Decode16,
+                            0x00C0,             // Range Minimum
+                            0x00C0,             // Range Maximum
+                            0x01,               // Alignment
+                            0x20,               // Length
+                            )
+                        DMA (Compatibility, NotBusMaster, Transfer8_16, )
+                            {4}
+                    })
+                }
+
+                Device (FWHD)
+                {
+                    Name (_HID, EisaId ("INT0800"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        Memory32Fixed (ReadOnly,
+                            0xFF000000,         // Address Base
+                            0x01000000,         // Address Length
+                            )
+                    })
+                }
+
+                Device (HPET)
+                {
+                    Name (_HID, EisaId ("PNP0103"))
+                    Name (_UID, Zero)
+                    Name (BUF0, ResourceTemplate ()
+                    {
+                        Memory32Fixed (ReadWrite,
+                            0xFED00000,         // Address Base
+                            0x00000400,         // Address Length
+                            )
+                    })
+                    Method (_STA, 0, NotSerialized)
+                    {
+                        If (LGreaterEqual (OSYS, 0x07D1))
+                        {
+                            If (HPAE)
+                            {
+                                Return (0x0F)
+                            }
+                        }
+                        Else
+                        {
+                            If (HPAE)
+                            {
+                                Return (0x0B)
+                            }
+                        }
+
+                        Return (Zero)
+                    }
+
+                    Method (_CRS, 0, Serialized)
+                    {
+                        If (HPAE)
+                        {
+                            CreateDWordField (BUF0, 0x04, HPT0)
+                            If (LEqual (HPAS, One))
+                            {
+                                Store (0xFED01000, HPT0)
+                            }
+
+                            If (LEqual (HPAS, 0x02))
+                            {
+                                Store (0xFED02000, HPT0)
+                            }
+
+                            If (LEqual (HPAS, 0x03))
+                            {
+                                Store (0xFED03000, HPT0)
+                            }
+                        }
+
+                        Return (BUF0)
+                    }
+                }
+
+                Device (IPIC)
+                {
+                    Name (_HID, EisaId ("PNP0000"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0020,             // Range Minimum
+                            0x0020,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0024,             // Range Minimum
+                            0x0024,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0028,             // Range Minimum
+                            0x0028,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x002C,             // Range Minimum
+                            0x002C,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0030,             // Range Minimum
+                            0x0030,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0034,             // Range Minimum
+                            0x0034,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0038,             // Range Minimum
+                            0x0038,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x003C,             // Range Minimum
+                            0x003C,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00A0,             // Range Minimum
+                            0x00A0,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00A4,             // Range Minimum
+                            0x00A4,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00A8,             // Range Minimum
+                            0x00A8,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00AC,             // Range Minimum
+                            0x00AC,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00B0,             // Range Minimum
+                            0x00B0,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00B4,             // Range Minimum
+                            0x00B4,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00B8,             // Range Minimum
+                            0x00B8,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00BC,             // Range Minimum
+                            0x00BC,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x04D0,             // Range Minimum
+                            0x04D0,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IRQNoFlags ()
+                            {2}
+                    })
+                }
+
+                Device (LDRC)
+                {
+                    Name (_HID, EisaId ("PNP0C02"))
+                    Name (_UID, 0x02)
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x002E,             // Range Minimum
+                            0x002E,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x004E,             // Range Minimum
+                            0x004E,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0061,             // Range Minimum
+                            0x0061,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0063,             // Range Minimum
+                            0x0063,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0065,             // Range Minimum
+                            0x0065,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0067,             // Range Minimum
+                            0x0067,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0070,             // Range Minimum
+                            0x0070,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0080,             // Range Minimum
+                            0x0080,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0092,             // Range Minimum
+                            0x0092,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x00B2,             // Range Minimum
+                            0x00B2,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0680,             // Range Minimum
+                            0x0680,             // Range Maximum
+                            0x01,               // Alignment
+                            0x20,               // Length
+                            )
+                        IO (Decode16,
+                            0x0200,             // Range Minimum
+                            0x0200,             // Range Maximum
+                            0x01,               // Alignment
+                            0x10,               // Length
+                            )
+                        IO (Decode16,
+                            0xFFFF,             // Range Minimum
+                            0xFFFF,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0xFFFF,             // Range Minimum
+                            0xFFFF,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0400,             // Range Minimum
+                            0x0400,             // Range Maximum
+                            0x01,               // Alignment
+                            0x54,               // Length
+                            )
+                        IO (Decode16,
+                            0x0458,             // Range Minimum
+                            0x0458,             // Range Maximum
+                            0x01,               // Alignment
+                            0x28,               // Length
+                            )
+                        IO (Decode16,
+                            0x0500,             // Range Minimum
+                            0x0500,             // Range Maximum
+                            0x01,               // Alignment
+                            0x80,               // Length
+                            )
+                        IO (Decode16,
+                            0x164E,             // Range Minimum
+                            0x164E,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                    })
+                }
+
+                Device (RTC)
+                {
+                    Name (_HID, EisaId ("PNP0B00"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0070,             // Range Minimum
+                            0x0070,             // Range Maximum
+                            0x01,               // Alignment
+                            0x08,               // Length
+                            )
+                        IRQNoFlags ()
+                            {8}
+                    })
+                }
+
+                Device (TIMR)
+                {
+                    Name (_HID, EisaId ("PNP0100"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0040,             // Range Minimum
+                            0x0040,             // Range Maximum
+                            0x01,               // Alignment
+                            0x04,               // Length
+                            )
+                        IO (Decode16,
+                            0x0050,             // Range Minimum
+                            0x0050,             // Range Maximum
+                            0x10,               // Alignment
+                            0x04,               // Length
+                            )
+                        IRQNoFlags ()
+                            {0}
+                    })
+                }
+
+                Device (CWDT)
+                {
+                    Name (_HID, EisaId ("INT3F0D"))
+                    Name (_CID, EisaId ("PNP0C02"))
+                    Name (BUF0, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0454,             // Range Minimum
+                            0x0454,             // Range Maximum
+                            0x04,               // Alignment
+                            0x04,               // Length
+                            )
+                    })
+                    Method (_STA, 0, Serialized)
+                    {
+                        If (LEqual (WDTE, One))
+                        {
+                            Return (0x0F)
+                        }
+                        Else
+                        {
+                            Return (Zero)
+                        }
+                    }
+
+                    Method (_CRS, 0, Serialized)
+                    {
+                        Return (BUF0)
+                    }
+                }
+
+                Device (EC0)
+                {
+                    Name (_HID, EisaId ("PNP0C09"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0062,             // Range Minimum
+                            0x0062,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0066,             // Range Minimum
+                            0x0066,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                    })
+                    CreateWordField (_CRS, 0x02, DPRT)
+                    CreateWordField (_CRS, 0x0A, CPRT)
+                    Name (_GPE, 0x18)
+                    Name (REGC, Zero)
+                    Method (_Q80, 0, NotSerialized)
+                    {
+                        \AMW0.AMWN (0x05)
+                    }
+
+                    Method (_Q81, 0, NotSerialized)
+                    {
+                        \AMW0.AMWN (0x00010005)
+                    }
+
+                    Method (_Q82, 0, NotSerialized)
+                    {
+                        \AMW0.AMWN (0x00020005)
+                    }
+
+                    Method (_Q83, 0, NotSerialized)
+                    {
+                        \AMW0.AMWN (0x00030005)
+                    }
+                }
+
+                Device (SIO1)
+                {
+                    Name (_HID, EisaId ("PNP0C02"))
+                    Name (_UID, 0x0111)
+                    Name (CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0000,             // Range Minimum
+                            0x0000,             // Range Maximum
+                            0x00,               // Alignment
+                            0x00,               // Length
+                            )
+                        IO (Decode16,
+                            0x0000,             // Range Minimum
+                            0x0000,             // Range Maximum
+                            0x00,               // Alignment
+                            0x00,               // Length
+                            )
+                        IO (Decode16,
+                            0x0000,             // Range Minimum
+                            0x0000,             // Range Maximum
+                            0x00,               // Alignment
+                            0x00,               // Length
+                            )
+                        IO (Decode16,
+                            0x0000,             // Range Minimum
+                            0x0000,             // Range Maximum
+                            0x00,               // Alignment
+                            0x00,               // Length
+                            )
+                    })
+                    Method (_CRS, 0, NotSerialized)
+                    {
+                        If (LAnd (LLess (SP1O, 0x03F0), LGreater (SP1O, 0xF0)))
+                        {
+                            CreateWordField (CRS, 0x02, GPI0)
+                            CreateWordField (CRS, 0x04, GPI1)
+                            CreateByteField (CRS, 0x07, GPIL)
+                            Store (SP1O, GPI0)
+                            Store (SP1O, GPI1)
+                            Store (0x02, GPIL)
+                        }
+
+                        If (IO1B)
+                        {
+                            CreateWordField (CRS, 0x0A, GP10)
+                            CreateWordField (CRS, 0x0C, GP11)
+                            CreateByteField (CRS, 0x0F, GPL1)
+                            Store (IO1B, GP10)
+                            Store (IO1B, GP11)
+                            Store (IO1L, GPL1)
+                        }
+
+                        If (IO3B)
+                        {
+                            CreateWordField (CRS, 0x12, GP20)
+                            CreateWordField (CRS, 0x14, GP21)
+                            CreateByteField (CRS, 0x17, GPL2)
+                            Store (IO3B, GP20)
+                            Store (IO3B, GP21)
+                            Store (IO3L, GPL2)
+                        }
+
+                        If (IO2B)
+                        {
+                            CreateWordField (CRS, 0x1A, GP30)
+                            CreateWordField (CRS, 0x1C, GP31)
+                            CreateByteField (CRS, 0x1F, GPL3)
+                            Store (IO2B, GP30)
+                            Store (IO2B, GP31)
+                            Store (IO2L, GPL3)
+                        }
+
+                        Return (CRS)
+                    }
+
+                    Name (DCAT, Package (0x15)
+                    {
+                        0x02, 
+                        0x03, 
+                        One, 
+                        Zero, 
+                        0xFF, 
+                        0xFF, 
+                        0xFF, 
+                        0xFF, 
+                        0xFF, 
+                        0xFF, 
+                        0x05, 
+                        0xFF, 
+                        0xFF, 
+                        0xFF, 
+                        0x05, 
+                        0xFF, 
+                        0xFF, 
+                        0xFF, 
+                        0x06, 
+                        0xFF, 
+                        0xFF
+                    })
+                    Mutex (MUT0, 0x00)
+                    Method (ENFG, 1, NotSerialized)
+                    {
+                        Acquire (MUT0, 0x0FFF)
+                        Store (0x87, INDX)
+                        Store (0x87, INDX)
+                        Store (Arg0, LDN)
+                    }
+
+                    Method (EXFG, 0, NotSerialized)
+                    {
+                        Store (0xAA, INDX)
+                        Release (MUT0)
+                    }
+
+                    Method (LPTM, 1, NotSerialized)
+                    {
+                        ENFG (CGLD (Arg0))
+                        And (OPT0, 0x02, Local0)
+                        EXFG ()
+                        Return (Local0)
+                    }
+
+                    Method (UHID, 1, NotSerialized)
+                    {
+                        ENFG (CGLD (Arg0))
+                        And (OPT0, 0x38, Local0)
+                        EXFG ()
+                        If (Local0)
+                        {
+                            Return (0x1005D041)
+                        }
+                        Else
+                        {
+                            Return (0x0105D041)
+                        }
+                    }
+
+                    OperationRegion (IOID, SystemIO, SP1O, 0x02)
+                    Field (IOID, ByteAcc, NoLock, Preserve)
+                    {
+                        INDX,   8, 
+                        DATA,   8
+                    }
+
+                    IndexField (INDX, DATA, ByteAcc, NoLock, Preserve)
+                    {
+                                Offset (0x07), 
+                        LDN,    8, 
+                                Offset (0x21), 
+                        SCF1,   8, 
+                        SCF2,   8, 
+                        SCF3,   8, 
+                        SCF4,   8, 
+                        SCF5,   8, 
+                        SCF6,   8, 
+                                Offset (0x29), 
+                        CKCF,   8, 
+                                Offset (0x30), 
+                        ACTR,   8, 
+                                Offset (0x60), 
+                        IOAH,   8, 
+                        IOAL,   8, 
+                        IOH2,   8, 
+                        IOL2,   8, 
+                                Offset (0x70), 
+                        INTR,   8, 
+                                Offset (0x74), 
+                        DMCH,   8, 
+                                Offset (0xE0), 
+                        RGE0,   8, 
+                        RGE1,   8, 
+                        RGE2,   8, 
+                        RGE3,   8, 
+                        RGE4,   8, 
+                        RGE5,   8, 
+                        RGE6,   8, 
+                        RGE7,   8, 
+                        RGE8,   8, 
+                        RGE9,   8, 
+                                Offset (0xF0), 
+                        OPT0,   8, 
+                        OPT1,   8, 
+                        OPT2,   8, 
+                        OPT3,   8, 
+                        OPT4,   8, 
+                        OPT5,   8, 
+                        OPT6,   8, 
+                        OPT7,   8, 
+                        OPT8,   8, 
+                        OPT9,   8
+                    }
+
+                    Method (CGLD, 1, NotSerialized)
+                    {
+                        Return (DerefOf (Index (DCAT, Arg0)))
+                    }
+
+                    Method (DSTA, 1, NotSerialized)
+                    {
+                        ENFG (CGLD (Arg0))
+                        Store (ACTR, Local0)
+                        EXFG ()
+                        If (LEqual (Local0, 0xFF))
+                        {
+                            Return (Zero)
+                        }
+
+                        And (Local0, One, Local0)
+                        If (LGreaterEqual (Arg0, 0x10))
+                        {
+                            Or (IOES, ShiftLeft (Local0, And (Arg0, 0x0F)), IOES)
+                        }
+                        Else
+                        {
+                            Or (IOST, ShiftLeft (Local0, Arg0), IOST)
+                        }
+
+                        If (Local0)
+                        {
+                            Return (0x0F)
+                        }
+                        Else
+                        {
+                            If (LGreaterEqual (Arg0, 0x10))
+                            {
+                                Store (IOES, Local0)
+                            }
+                            Else
+                            {
+                                Store (IOST, Local0)
+                            }
+
+                            And (Arg0, 0x0F, Local1)
+                            If (And (ShiftLeft (One, Local1), Local0))
+                            {
+                                Return (0x0D)
+                            }
+                            Else
+                            {
+                                Return (Zero)
+                            }
+                        }
+                    }
+
+                    Method (DCNT, 2, NotSerialized)
+                    {
+                        ENFG (CGLD (Arg0))
+                        If (LAnd (LLess (DMCH, 0x04), LNotEqual (And (DMCH, 0x03, 
+                            Local1), Zero)))
+                        {
+                            RDMA (Arg0, Arg1, Increment (Local1))
+                        }
+
+                        Store (Arg1, ACTR)
+                        ShiftLeft (IOAH, 0x08, Local1)
+                        Or (IOAL, Local1, Local1)
+                        RRIO (Arg0, Arg1, Local1, 0x08)
+                        EXFG ()
+                    }
+
+                    Name (CRS1, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0000,             // Range Minimum
+                            0x0000,             // Range Maximum
+                            0x01,               // Alignment
+                            0x00,               // Length
+                            )
+                        IRQNoFlags ()
+                            {}
+                        DMA (Compatibility, NotBusMaster, Transfer8, )
+                            {}
+                    })
+                    CreateWordField (CRS1, 0x09, IRQM)
+                    CreateByteField (CRS1, 0x0C, DMAM)
+                    CreateWordField (CRS1, 0x02, IO11)
+                    CreateWordField (CRS1, 0x04, IO12)
+                    CreateByteField (CRS1, 0x07, LEN1)
+                    Name (CRS2, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0000,             // Range Minimum
+                            0x0000,             // Range Maximum
+                            0x01,               // Alignment
+                            0x00,               // Length
+                            )
+                        IO (Decode16,
+                            0x0000,             // Range Minimum
+                            0x0000,             // Range Maximum
+                            0x01,               // Alignment
+                            0x00,               // Length
+                            )
+                        IRQNoFlags ()
+                            {}
+                        DMA (Compatibility, NotBusMaster, Transfer8, )
+                            {2}
+                    })
+                    CreateWordField (CRS2, 0x11, IRQE)
+                    CreateByteField (CRS2, 0x14, DMAE)
+                    CreateWordField (CRS2, 0x02, IO21)
+                    CreateWordField (CRS2, 0x04, IO22)
+                    CreateByteField (CRS2, 0x07, LEN2)
+                    CreateWordField (CRS2, 0x0A, IO31)
+                    CreateWordField (CRS2, 0x0C, IO32)
+                    CreateByteField (CRS2, 0x0F, LEN3)
+                    Name (CRS4, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0000,             // Range Minimum
+                            0x0000,             // Range Maximum
+                            0x01,               // Alignment
+                            0x00,               // Length
+                            )
+                        IRQ (Edge, ActiveLow, Shared, )
+                            {}
+                    })
+                    CreateWordField (CRS4, 0x09, IRQL)
+                    CreateWordField (CRS4, 0x02, IOHL)
+                    CreateWordField (CRS4, 0x04, IORL)
+                    CreateByteField (CRS4, 0x06, ALMN)
+                    CreateByteField (CRS4, 0x07, LENG)
+                    Method (DCRS, 2, NotSerialized)
+                    {
+                        ENFG (CGLD (Arg0))
+                        ShiftLeft (IOAH, 0x08, IO11)
+                        Or (IOAL, IO11, IO11)
+                        Store (IO11, IO12)
+                        Store (0x08, LEN1)
+                        If (INTR)
+                        {
+                            ShiftLeft (One, INTR, IRQM)
+                        }
+                        Else
+                        {
+                            Store (Zero, IRQM)
+                        }
+
+                        If (LOr (LGreater (DMCH, 0x03), LEqual (Arg1, Zero)))
+                        {
+                            Store (Zero, DMAM)
+                        }
+                        Else
+                        {
+                            And (DMCH, 0x03, Local1)
+                            ShiftLeft (One, Local1, DMAM)
+                        }
+
+                        EXFG ()
+                        Return (CRS1)
+                    }
+
+                    Method (DCR2, 2, NotSerialized)
+                    {
+                        ENFG (CGLD (Arg0))
+                        ShiftLeft (IOAH, 0x08, IO21)
+                        Or (IOAL, IO21, IO21)
+                        Store (IO21, IO22)
+                        Store (0x08, LEN2)
+                        ShiftLeft (IOH2, 0x08, IO31)
+                        Or (IOL2, IO31, IO31)
+                        Store (IO21, IO32)
+                        Store (0x08, LEN3)
+                        If (INTR)
+                        {
+                            ShiftLeft (One, INTR, IRQE)
+                        }
+                        Else
+                        {
+                            Store (Zero, IRQE)
+                        }
+
+                        If (LOr (LGreater (DMCH, 0x03), LEqual (Arg1, Zero)))
+                        {
+                            Store (Zero, DMAE)
+                        }
+                        Else
+                        {
+                            And (DMCH, 0x03, Local1)
+                            ShiftLeft (One, Local1, DMAE)
+                        }
+
+                        EXFG ()
+                        Return (CRS2)
+                    }
+
+                    Method (DCR4, 2, NotSerialized)
+                    {
+                        ENFG (CGLD (Arg0))
+                        ShiftLeft (IOAH, 0x08, IOHL)
+                        Or (IOAL, IOHL, IOHL)
+                        Store (IOHL, IORL)
+                        Store (0x08, LENG)
+                        If (INTR)
+                        {
+                            And (INTR, 0x0F, INTR)
+                            ShiftLeft (One, INTR, IRQL)
+                        }
+                        Else
+                        {
+                            Store (Zero, IRQL)
+                        }
+
+                        EXFG ()
+                        Return (CRS4)
+                    }
+
+                    Method (DSRS, 2, NotSerialized)
+                    {
+                        If (LEqual (Arg1, 0x02))
+                        {
+                            If (LPTM (CGLD (Arg1)))
+                            {
+                                DSR2 (Arg0, Arg1)
+                            }
+                        }
+                        Else
+                        {
+                            CreateWordField (Arg0, 0x09, IRQM)
+                            CreateByteField (Arg0, 0x0C, DMAM)
+                            CreateWordField (Arg0, 0x02, IO11)
+                            ENFG (CGLD (Arg1))
+                            ShiftLeft (IOAH, 0x08, Local1)
+                            Or (IOAL, Local1, Local1)
+                            RRIO (Arg1, Zero, Local1, 0x08)
+                            RRIO (Arg1, One, IO11, 0x08)
+                            And (IO11, 0xFF, IOAL)
+                            ShiftRight (IO11, 0x08, IOAH)
+                            If (IRQM)
+                            {
+                                FindSetRightBit (IRQM, Local0)
+                                Subtract (Local0, One, INTR)
+                            }
+                            Else
+                            {
+                                Store (Zero, INTR)
+                            }
+
+                            If (DMAM)
+                            {
+                                FindSetRightBit (DMAM, Local0)
+                                Subtract (Local0, One, DMCH)
+                            }
+                            Else
+                            {
+                                Store (0x04, DMCH)
+                            }
+
+                            EXFG ()
+                            DCNT (Arg1, One)
+                            Store (Arg1, Local2)
+                            If (LGreater (Local2, Zero))
+                            {
+                                Subtract (Local2, One, Local2)
+                            }
+                        }
+                    }
+
+                    Method (DSR2, 2, NotSerialized)
+                    {
+                        CreateWordField (Arg0, 0x11, IRQT)
+                        CreateByteField (Arg0, 0x14, DMAT)
+                        CreateWordField (Arg0, 0x02, IOT1)
+                        CreateWordField (Arg0, 0x0A, IOT2)
+                        ENFG (CGLD (Arg1))
+                        And (IOT1, 0xFF, IOAL)
+                        ShiftRight (IOT1, 0x08, IOAH)
+                        And (IOT2, 0xFF, IOL2)
+                        ShiftRight (IOT2, 0x08, IOH2)
+                        If (IRQT)
+                        {
+                            FindSetRightBit (IRQT, Local0)
+                            Subtract (Local0, One, INTR)
+                        }
+                        Else
+                        {
+                            Store (Zero, INTR)
+                        }
+
+                        If (DMAT)
+                        {
+                            FindSetRightBit (DMAT, Local0)
+                            Subtract (Local0, One, DMCH)
+                        }
+                        Else
+                        {
+                            Store (0x04, DMCH)
+                        }
+
+                        EXFG ()
+                        DCNT (Arg1, One)
+                        Store (Arg1, Local2)
+                        If (LGreater (Local2, Zero))
+                        {
+                            Subtract (Local2, One, Local2)
+                        }
+                    }
+
+                    Method (DSR4, 2, NotSerialized)
+                    {
+                        CreateWordField (Arg0, 0x02, IOHL)
+                        CreateWordField (Arg0, 0x09, IRQL)
+                        ENFG (CGLD (Arg1))
+                        And (IOHL, 0xFF, IOAL)
+                        ShiftRight (IOHL, 0x08, IOAH)
+                        If (IRQL)
+                        {
+                            FindSetRightBit (IRQL, Local0)
+                            Subtract (Local0, One, INTR)
+                        }
+                        Else
+                        {
+                            Store (Zero, INTR)
+                        }
+
+                        EXFG ()
+                        DCNT (Arg1, One)
+                        Store (Arg1, Local2)
+                        If (LGreater (Local2, Zero))
+                        {
+                            Subtract (Local2, One, Local2)
+                        }
+                    }
+                }
+
+                Name (PMFG, Zero)
+                Method (SIOS, 1, NotSerialized)
+                {
+                    Store ("SIOS", Debug)
+                    If (LEqual (One, Arg0))
+                    {
+                        ^SIO1.ENFG (0x0A)
+                        And (^SIO1.RGE0, 0x9F, ^SIO1.RGE0)
+                        If (KBFG)
+                        {
+                            Or (^SIO1.OPT6, 0x10, ^SIO1.OPT6)
+                        }
+                        Else
+                        {
+                            And (^SIO1.OPT6, 0xEF, ^SIO1.OPT6)
+                        }
+
+                        If (MSFG)
+                        {
+                            Or (^SIO1.OPT6, 0x20, ^SIO1.OPT6)
+                        }
+                        Else
+                        {
+                            And (^SIO1.OPT6, 0xDF, ^SIO1.OPT6)
+                        }
+
+                        Store (0xFF, ^SIO1.OPT3)
+                        Store (0xFF, ^SIO1.OPT4)
+                        Or (One, ^SIO1.OPT2, ^SIO1.OPT2)
+                        ^SIO1.EXFG ()
+                        Return (Zero)
+                    }
+
+                    If (LNotEqual (0x05, Arg0))
+                    {
+                        ^SIO1.ENFG (0x0A)
+                        Store (0xFF, ^SIO1.OPT3)
+                        Store (0xFF, ^SIO1.OPT4)
+                        Store (^SIO1.RGE3, Local0)
+                        If (KBFG)
+                        {
+                            Or (^SIO1.RGE0, 0x41, ^SIO1.RGE0)
+                        }
+                        Else
+                        {
+                            And (^SIO1.RGE0, 0xBF, ^SIO1.RGE0)
+                        }
+
+                        If (MSFG)
+                        {
+                            Or (^SIO1.RGE0, 0x22, ^SIO1.RGE0)
+                            And (^SIO1.RGE0, 0xFD, ^SIO1.RGE0)
+                            Or (^SIO1.RGE6, 0x80, ^SIO1.RGE6)
+                        }
+                        Else
+                        {
+                            And (^SIO1.RGE0, 0xDF, ^SIO1.RGE0)
+                        }
+
+                        And (0xFE, ^SIO1.OPT2, ^SIO1.OPT2)
+                        ^SIO1.EXFG ()
+                    }
+                }
+
+                Method (SIOW, 1, NotSerialized)
+                {
+                    Store ("SIOW", Debug)
+                    ^SIO1.ENFG (0x0A)
+                    Store (^SIO1.OPT3, PMFG)
+                    Store (0xFF, ^SIO1.OPT3)
+                    And (^SIO1.OPT0, 0xE7, ^SIO1.OPT0)
+                    And (0xFE, ^SIO1.OPT2, ^SIO1.OPT2)
+                    ^SIO1.EXFG ()
+                }
+
+                OperationRegion (RX80, PCI_Config, Zero, 0xFF)
+                Field (RX80, ByteAcc, NoLock, Preserve)
+                {
+                            Offset (0x80), 
+                    LPCD,   16, 
+                    LPCE,   16
+                }
+
+                Name (DBPT, Package (0x04)
+                {
+                    Package (0x08)
+                    {
+                        0x03F8, 
+                        0x02F8, 
+                        0x0220, 
+                        0x0228, 
+                        0x0238, 
+                        0x02E8, 
+                        0x0338, 
+                        0x03E8
+                    }, 
+
+                    Package (0x08)
+                    {
+                        0x03F8, 
+                        0x02F8, 
+                        0x0220, 
+                        0x0228, 
+                        0x0238, 
+                        0x02E8, 
+                        0x0338, 
+                        0x03E8
+                    }, 
+
+                    Package (0x03)
+                    {
+                        0x0378, 
+                        0x0278, 
+                        0x03BC
+                    }, 
+
+                    Package (0x02)
+                    {
+                        0x03F0, 
+                        0x0370
+                    }
+                })
+                Name (DDLT, Package (0x04)
+                {
+                    Package (0x02)
+                    {
+                        Zero, 
+                        0xFFF8
+                    }, 
+
+                    Package (0x02)
+                    {
+                        0x04, 
+                        0xFF8F
+                    }, 
+
+                    Package (0x02)
+                    {
+                        0x08, 
+                        0xFCFF
+                    }, 
+
+                    Package (0x02)
+                    {
+                        0x0C, 
+                        0xEFFF
+                    }
+                })
+                Method (RRIO, 4, NotSerialized)
+                {
+                    If (LAnd (LLessEqual (Arg0, 0x03), LGreaterEqual (Arg0, Zero)))
+                    {
+                        Store (Match (DerefOf (Index (DBPT, Arg0)), MEQ, Arg2, MTR, 
+                            Zero, Zero), Local0)
+                        If (LNotEqual (Local0, Ones))
+                        {
+                            Store (DerefOf (Index (DerefOf (Index (DDLT, Arg0)), Zero)), 
+                                Local1)
+                            Store (DerefOf (Index (DerefOf (Index (DDLT, Arg0)), One)), 
+                                Local2)
+                            ShiftLeft (Local0, Local1, Local0)
+                            And (LPCD, Local2, LPCD)
+                            Or (LPCD, Local0, LPCD)
+                            WX82 (Arg0, Arg1)
+                        }
+                    }
+
+                    If (LEqual (Arg0, 0x08))
+                    {
+                        If (LEqual (Arg2, 0x0200))
+                        {
+                            WX82 (0x08, Arg0)
+                        }
+                        Else
+                        {
+                            If (LEqual (Arg2, 0x0208))
+                            {
+                                WX82 (0x09, Arg0)
+                            }
+                        }
+                    }
+
+                    If (LAnd (LLessEqual (Arg0, 0x0D), LGreaterEqual (Arg0, 0x0A)))
+                    {
+                        WX82 (Arg0, Arg1)
+                    }
+                }
+
+                Method (WX82, 2, NotSerialized)
+                {
+                    ShiftLeft (One, Arg0, Local0)
+                    If (Arg1)
+                    {
+                        Or (LPCE, Local0, LPCE)
+                    }
+                    Else
+                    {
+                        Not (Local0, Local0)
+                        And (LPCE, Local0, LPCE)
+                    }
+                }
+
+                Method (RDMA, 3, NotSerialized)
+                {
+                }
+
+                Device (RMSC)
+                {
+                    Name (_HID, EisaId ("PNP0C02"))
+                    Name (_UID, 0x10)
+                    Name (CRS1, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0010,             // Range Minimum
+                            0x0010,             // Range Maximum
+                            0x00,               // Alignment
+                            0x10,               // Length
+                            )
+                        IO (Decode16,
+                            0x0022,             // Range Minimum
+                            0x0022,             // Range Maximum
+                            0x00,               // Alignment
+                            0x1E,               // Length
+                            )
+                        IO (Decode16,
+                            0x0044,             // Range Minimum
+                            0x0044,             // Range Maximum
+                            0x00,               // Alignment
+                            0x1C,               // Length
+                            )
+                        IO (Decode16,
+                            0x0062,             // Range Minimum
+                            0x0062,             // Range Maximum
+                            0x00,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0065,             // Range Minimum
+                            0x0065,             // Range Maximum
+                            0x00,               // Alignment
+                            0x0B,               // Length
+                            )
+                        IO (Decode16,
+                            0x0072,             // Range Minimum
+                            0x0072,             // Range Maximum
+                            0x00,               // Alignment
+                            0x0E,               // Length
+                            )
+                        IO (Decode16,
+                            0x0080,             // Range Minimum
+                            0x0080,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0084,             // Range Minimum
+                            0x0084,             // Range Maximum
+                            0x00,               // Alignment
+                            0x03,               // Length
+                            )
+                        IO (Decode16,
+                            0x0088,             // Range Minimum
+                            0x0088,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x008C,             // Range Minimum
+                            0x008C,             // Range Maximum
+                            0x00,               // Alignment
+                            0x03,               // Length
+                            )
+                        IO (Decode16,
+                            0x0090,             // Range Minimum
+                            0x0090,             // Range Maximum
+                            0x00,               // Alignment
+                            0x10,               // Length
+                            )
+                        IO (Decode16,
+                            0x00A2,             // Range Minimum
+                            0x00A2,             // Range Maximum
+                            0x00,               // Alignment
+                            0x1E,               // Length
+                            )
+                        IO (Decode16,
+                            0x00E0,             // Range Minimum
+                            0x00E0,             // Range Maximum
+                            0x00,               // Alignment
+                            0x10,               // Length
+                            )
+                        IO (Decode16,
+                            0x04D0,             // Range Minimum
+                            0x04D0,             // Range Maximum
+                            0x00,               // Alignment
+                            0x02,               // Length
+                            )
+                    })
+                    Name (CRS2, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0010,             // Range Minimum
+                            0x0010,             // Range Maximum
+                            0x00,               // Alignment
+                            0x10,               // Length
+                            )
+                        IO (Decode16,
+                            0x0022,             // Range Minimum
+                            0x0022,             // Range Maximum
+                            0x00,               // Alignment
+                            0x1E,               // Length
+                            )
+                        IO (Decode16,
+                            0x0044,             // Range Minimum
+                            0x0044,             // Range Maximum
+                            0x00,               // Alignment
+                            0x1C,               // Length
+                            )
+                        IO (Decode16,
+                            0x0072,             // Range Minimum
+                            0x0072,             // Range Maximum
+                            0x00,               // Alignment
+                            0x0E,               // Length
+                            )
+                        IO (Decode16,
+                            0x0080,             // Range Minimum
+                            0x0080,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0084,             // Range Minimum
+                            0x0084,             // Range Maximum
+                            0x00,               // Alignment
+                            0x03,               // Length
+                            )
+                        IO (Decode16,
+                            0x0088,             // Range Minimum
+                            0x0088,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x008C,             // Range Minimum
+                            0x008C,             // Range Maximum
+                            0x00,               // Alignment
+                            0x03,               // Length
+                            )
+                        IO (Decode16,
+                            0x0090,             // Range Minimum
+                            0x0090,             // Range Maximum
+                            0x00,               // Alignment
+                            0x10,               // Length
+                            )
+                        IO (Decode16,
+                            0x00A2,             // Range Minimum
+                            0x00A2,             // Range Maximum
+                            0x00,               // Alignment
+                            0x1E,               // Length
+                            )
+                        IO (Decode16,
+                            0x00E0,             // Range Minimum
+                            0x00E0,             // Range Maximum
+                            0x00,               // Alignment
+                            0x10,               // Length
+                            )
+                        IO (Decode16,
+                            0x04D0,             // Range Minimum
+                            0x04D0,             // Range Maximum
+                            0x00,               // Alignment
+                            0x02,               // Length
+                            )
+                    })
+                    Method (_CRS, 0, NotSerialized)
+                    {
+                        If (And (MBEC, 0xFFFF))
+                        {
+                            Return (CRS1)
+                        }
+                        Else
+                        {
+                            Return (CRS2)
+                        }
+                    }
+                }
+
+                Device (COPR)
+                {
+                    Name (_HID, EisaId ("PNP0C04"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x00F0,             // Range Minimum
+                            0x00F0,             // Range Maximum
+                            0x00,               // Alignment
+                            0x10,               // Length
+                            )
+                        IRQNoFlags ()
+                            {13}
+                    })
+                }
+
+                Device (PS2K)
+                {
+                    Name (_HID, EisaId ("PNP0303"))
+                    Name (_CID, EisaId ("PNP030B"))
+                    Method (_STA, 0, NotSerialized)
+                    {
+                        If (And (IOST, 0x0400))
+                        {
+                            Return (0x0F)
+                        }
+                        Else
+                        {
+                            Return (Zero)
+                        }
+                    }
+
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0060,             // Range Minimum
+                            0x0060,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0064,             // Range Minimum
+                            0x0064,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                        IRQNoFlags ()
+                            {1}
+                    })
+                    Name (_PRS, ResourceTemplate ()
+                    {
+                        StartDependentFn (0x00, 0x00)
+                        {
+                            FixedIO (
+                                0x0060,             // Address
+                                0x01,               // Length
+                                )
+                            FixedIO (
+                                0x0064,             // Address
+                                0x01,               // Length
+                                )
+                            IRQNoFlags ()
+                                {1}
+                        }
+                        EndDependentFn ()
+                    })
+                    Method (_PSW, 1, NotSerialized)
+                    {
+                        Store (Arg0, KBFG)
+                    }
+                }
+
+                Scope (\)
+                {
+                    Name (KBFG, One)
+                }
+
+                Method (PS2K._PRW, 0, NotSerialized)
+                {
+                    Return (GPRW (0x1D, 0x04))
+                }
+
+                Device (PS2M)
+                {
+                    Name (_HID, EisaId ("PNP0F03"))
+                    Name (_CID, EisaId ("PNP0F13"))
+                    Method (_STA, 0, NotSerialized)
+                    {
+                        If (And (IOST, 0x4000))
+                        {
+                            Return (0x0F)
+                        }
+                        Else
+                        {
+                            Return (Zero)
+                        }
+                    }
+
+                    Name (CRS1, ResourceTemplate ()
+                    {
+                        IRQNoFlags ()
+                            {12}
+                    })
+                    Name (CRS2, ResourceTemplate ()
+                    {
+                        IO (Decode16,
+                            0x0060,             // Range Minimum
+                            0x0060,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0064,             // Range Minimum
+                            0x0064,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                        IRQNoFlags ()
+                            {12}
+                    })
+                    Method (_CRS, 0, NotSerialized)
+                    {
+                        If (And (IOST, 0x0400))
+                        {
+                            Return (CRS1)
+                        }
+                        Else
+                        {
+                            Return (CRS2)
+                        }
+                    }
+
+                    Name (_PRS, ResourceTemplate ()
+                    {
+                        StartDependentFn (0x00, 0x00)
+                        {
+                            IRQNoFlags ()
+                                {12}
+                        }
+                        EndDependentFn ()
+                    })
+                    Method (_PSW, 1, NotSerialized)
+                    {
+                        Store (Arg0, MSFG)
+                    }
+                }
+
+                Scope (\)
+                {
+                    Name (MSFG, One)
+                }
+
+                Method (PS2M._PRW, 0, NotSerialized)
+                {
+                    Return (GPRW (0x1D, 0x04))
+                }
+
+                Scope (^^PCI0)
+                {
+                    Name (SLIC, Buffer (0x9E)
+                    {
+                        "374937846529Genuine NVIDIA Certified SLI Ready Motherboard for ASUS P8Z68-V PRO    56e7-Copyright 2010 NVIDIA Corporation All Rights Reserved-458103946203(R)"
+                    })
+                    Device (WMI1)
+                    {
+                        Name (_HID, "pnp0c14")
+                        Name (_UID, "MXM2")
+                        Name (_WDG, Buffer (0x14)
+                        {
+                            /* 0000 */    0x3C, 0x5C, 0xCB, 0xF6, 0xAE, 0x9C, 0xBD, 0x4E, 
+                            /* 0008 */    0xB5, 0x77, 0x93, 0x1E, 0xA3, 0x2A, 0x2C, 0xC0, 
+                            /* 0010 */    0x4D, 0x58, 0x01, 0x02
+                        })
+                        Method (WMMX, 3, NotSerialized)
+                        {
+                            CreateDWordField (Arg2, Zero, FUNC)
+                            If (LEqual (FUNC, 0x41494C53))
+                            {
+                                Return (SLIC)
+                            }
+
+                            Return (Zero)
+                        }
+                    }
+                }
+
+                Scope (\_SB)
+                {
+                    Name (LUCD, Buffer (0x7D)
+                    {
+                        /* 0000 */    0x4C, 0x75, 0x63, 0x69, 0x64, 0x4C, 0x6F, 0x67, 
+                        /* 0008 */    0x69, 0x78, 0x00, 0x68, 0x00, 0x01, 0x00, 0x01, 
+                        /* 0010 */    0x00, 0x00, 0x00, 0x1A, 0x8D, 0x65, 0x61, 0x30, 
+                        /* 0018 */    0x62, 0x64, 0x64, 0x30, 0x63, 0x34, 0x30, 0x66, 
+                        /* 0020 */    0x35, 0x32, 0x33, 0x36, 0x66, 0x66, 0x65, 0x65, 
+                        /* 0028 */    0x31, 0x30, 0x66, 0x63, 0x35, 0x37, 0x32, 0x34, 
+                        /* 0030 */    0x65, 0x38, 0x31, 0x36, 0x36, 0x37, 0x38, 0x65, 
+                        /* 0038 */    0x64, 0x35, 0x39, 0x34, 0x65, 0x64, 0x65, 0x65, 
+                        /* 0040 */    0x65, 0x37, 0x61, 0x35, 0x32, 0x38, 0x64, 0x32, 
+                        /* 0048 */    0x64, 0x31, 0x65, 0x36, 0x36, 0x32, 0x37, 0x61, 
+                        /* 0050 */    0x65, 0x65, 0x64, 0x32, 0x63, 0x30, 0x30, 0x30, 
+                        /* 0058 */    0x30, 0x32, 0x35, 0x36, 0x39, 0x63, 0x65, 0x64, 
+                        /* 0060 */    0x31, 0x36, 0x35, 0x31, 0x36, 0x33, 0x65, 0x35, 
+                        /* 0068 */    0x31, 0x65, 0x30, 0x36, 0x65, 0x30, 0x31, 0x64, 
+                        /* 0070 */    0x63, 0x34, 0x34, 0x63, 0x33, 0x35, 0x66, 0x65, 
+                        /* 0078 */    0x61, 0x33, 0x65, 0x61, 0x66
+                    })
+                }
+            }
+
+            Device (P0P1)
+            {
+                Name (_ADR, 0x001E0000)
+                Method (_PRW, 0, NotSerialized)
+                {
+                    Return (GPRW (0x0B, 0x04))
+                }
+
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR01 ())
+                    }
+
+                    Return (PR01 ())
+                }
+            }
+
+            Device (USB1)
+            {
+                Name (_ADR, 0x001D0001)
+            }
+
+            Device (USB2)
+            {
+                Name (_ADR, 0x001D0002)
+            }
+
+            Device (USB3)
+            {
+                Name (_ADR, 0x001D0003)
+            }
+
+            Device (USB4)
+            {
+                Name (_ADR, 0x001D0004)
+            }
+
+            Device (USB5)
+            {
+                Name (_ADR, 0x001A0001)
+            }
+
+            Device (USB6)
+            {
+                Name (_ADR, 0x001A0002)
+            }
+
+            Device (USB7)
+            {
+                Name (_ADR, 0x001A0003)
+            }
+
+            Device (RP01)
+            {
+                Name (_ADR, 0x001C0000)
+                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
+                Field (PXCS, AnyAcc, NoLock, Preserve)
+                {
+                            Offset (0x10), 
+                    L0SE,   1, 
+                            Offset (0x11), 
+                            Offset (0x12), 
+                        ,   13, 
+                    LASX,   1, 
+                            Offset (0x1A), 
+                    ABPX,   1, 
+                        ,   2, 
+                    PDCX,   1, 
+                        ,   2, 
+                    PDSX,   1, 
+                            Offset (0x1B), 
+                            Offset (0x20), 
+                            Offset (0x22), 
+                    PSPX,   1, 
+                            Offset (0x98), 
+                        ,   30, 
+                    HPEX,   1, 
+                    PMEX,   1
+                }
+
+                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
+                {
+                            Offset (0x9C), 
+                        ,   30, 
+                    HPSX,   1, 
+                    PMSX,   1
+                }
+
+                Device (PXSX)
+                {
+                    Name (_ADR, Zero)
+                    Name (_PRW, Package (0x02)
+                    {
+                        0x09, 
+                        0x04
+                    })
+                }
+
+                Method (HPME, 0, Serialized)
+                {
+                    If (PMSX)
+                    {
+                        Store (0xC8, Local0)
+                        While (Local0)
+                        {
+                            Store (One, PMSX)
+                            If (PMSX)
+                            {
+                                Decrement (Local0)
+                            }
+                            Else
+                            {
+                                Store (Zero, Local0)
+                            }
+                        }
+
+                        Notify (PXSX, 0x02)
+                    }
+                }
+
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR04 ())
+                    }
+
+                    Return (PR04 ())
+                }
+            }
+
+            Device (RP02)
+            {
+                Name (_ADR, 0x001C0001)
+                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
+                Field (PXCS, AnyAcc, NoLock, Preserve)
+                {
+                            Offset (0x10), 
+                    L0SE,   1, 
+                            Offset (0x11), 
+                            Offset (0x12), 
+                        ,   13, 
+                    LASX,   1, 
+                            Offset (0x1A), 
+                    ABPX,   1, 
+                        ,   2, 
+                    PDCX,   1, 
+                        ,   2, 
+                    PDSX,   1, 
+                            Offset (0x1B), 
+                            Offset (0x20), 
+                            Offset (0x22), 
+                    PSPX,   1, 
+                            Offset (0x98), 
+                        ,   30, 
+                    HPEX,   1, 
+                    PMEX,   1
+                }
+
+                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
+                {
+                            Offset (0x9C), 
+                        ,   30, 
+                    HPSX,   1, 
+                    PMSX,   1
+                }
+
+                Device (PXSX)
+                {
+                    Name (_ADR, Zero)
+                    Name (_PRW, Package (0x02)
+                    {
+                        0x09, 
+                        0x04
+                    })
+                }
+
+                Method (HPME, 0, Serialized)
+                {
+                    If (PMSX)
+                    {
+                        Store (0xC8, Local0)
+                        While (Local0)
+                        {
+                            Store (One, PMSX)
+                            If (PMSX)
+                            {
+                                Decrement (Local0)
+                            }
+                            Else
+                            {
+                                Store (Zero, Local0)
+                            }
+                        }
+
+                        Notify (PXSX, 0x02)
+                    }
+                }
+
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR05 ())
+                    }
+
+                    Return (PR05 ())
+                }
+            }
+
+            Device (RP03)
+            {
+                Name (_ADR, 0x001C0002)
+                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
+                Field (PXCS, AnyAcc, NoLock, Preserve)
+                {
+                            Offset (0x10), 
+                    L0SE,   1, 
+                            Offset (0x11), 
+                            Offset (0x12), 
+                        ,   13, 
+                    LASX,   1, 
+                            Offset (0x1A), 
+                    ABPX,   1, 
+                        ,   2, 
+                    PDCX,   1, 
+                        ,   2, 
+                    PDSX,   1, 
+                            Offset (0x1B), 
+                            Offset (0x20), 
+                            Offset (0x22), 
+                    PSPX,   1, 
+                            Offset (0x98), 
+                        ,   30, 
+                    HPEX,   1, 
+                    PMEX,   1
+                }
+
+                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
+                {
+                            Offset (0x9C), 
+                        ,   30, 
+                    HPSX,   1, 
+                    PMSX,   1
+                }
+
+                Device (PXSX)
+                {
+                    Name (_ADR, Zero)
+                    Name (_PRW, Package (0x02)
+                    {
+                        0x09, 
+                        0x04
+                    })
+                }
+
+                Method (HPME, 0, Serialized)
+                {
+                    If (PMSX)
+                    {
+                        Store (0xC8, Local0)
+                        While (Local0)
+                        {
+                            Store (One, PMSX)
+                            If (PMSX)
+                            {
+                                Decrement (Local0)
+                            }
+                            Else
+                            {
+                                Store (Zero, Local0)
+                            }
+                        }
+
+                        Notify (PXSX, 0x02)
+                    }
+                }
+
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR06 ())
+                    }
+
+                    Return (PR06 ())
+                }
+            }
+
+            Device (RP04)
+            {
+                Name (_ADR, 0x001C0003)
+                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
+                Field (PXCS, AnyAcc, NoLock, Preserve)
+                {
+                            Offset (0x10), 
+                    L0SE,   1, 
+                            Offset (0x11), 
+                            Offset (0x12), 
+                        ,   13, 
+                    LASX,   1, 
+                            Offset (0x1A), 
+                    ABPX,   1, 
+                        ,   2, 
+                    PDCX,   1, 
+                        ,   2, 
+                    PDSX,   1, 
+                            Offset (0x1B), 
+                            Offset (0x20), 
+                            Offset (0x22), 
+                    PSPX,   1, 
+                            Offset (0x98), 
+                        ,   30, 
+                    HPEX,   1, 
+                    PMEX,   1
+                }
+
+                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
+                {
+                            Offset (0x9C), 
+                        ,   30, 
+                    HPSX,   1, 
+                    PMSX,   1
+                }
+
+                Device (PXSX)
+                {
+                    Name (_ADR, Zero)
+                    Name (_PRW, Package (0x02)
+                    {
+                        0x09, 
+                        0x04
+                    })
+                }
+
+                Method (HPME, 0, Serialized)
+                {
+                    If (PMSX)
+                    {
+                        Store (0xC8, Local0)
+                        While (Local0)
+                        {
+                            Store (One, PMSX)
+                            If (PMSX)
+                            {
+                                Decrement (Local0)
+                            }
+                            Else
+                            {
+                                Store (Zero, Local0)
+                            }
+                        }
+
+                        Notify (PXSX, 0x02)
+                    }
+                }
+
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR07 ())
+                    }
+
+                    Return (PR07 ())
+                }
+
+                Device (JMB0)
+                {
+                    Name (_ADR, Zero)
+                    OperationRegion (CF40, PCI_Config, 0x40, 0x04)
+                    Field (CF40, ByteAcc, NoLock, Preserve)
+                    {
+                        CHE0,   1, 
+                        MULT,   1, 
+                            ,   1, 
+                        CAB0,   1, 
+                        CHE1,   1, 
+                                Offset (0x01), 
+                        AHEN,   1, 
+                            ,   3, 
+                        PRT0,   1, 
+                        AHM0,   1, 
+                        PRT1,   1, 
+                        AHM1,   1, 
+                        CF42,   6, 
+                        SWAP,   1, 
+                        PATA,   1, 
+                            ,   6, 
+                        WTEN,   1, 
+                                Offset (0x04)
+                    }
+
+                    Name (PIOT, Package (0x05)
+                    {
+                        0x0258, 
+                        0x0186, 
+                        0x014A, 
+                        0xB4, 
+                        0x78
+                    })
+                    Name (UDMA, Package (0x07)
+                    {
+                        0x78, 
+                        0x50, 
+                        0x3C, 
+                        0x28, 
+                        0x1E, 
+                        0x14, 
+                        0x0F
+                    })
+                    Name (MDMA, Package (0x03)
+                    {
+                        0x01E0, 
+                        0x96, 
+                        0x78
+                    })
+                    Name (IDEB, Buffer (0x14) {})
+                    CreateDWordField (IDEB, Zero, GTM0)
+                    CreateDWordField (IDEB, 0x04, GTM1)
+                    CreateDWordField (IDEB, 0x08, GTM2)
+                    CreateDWordField (IDEB, 0x0C, GTM3)
+                    CreateDWordField (IDEB, 0x10, GTM4)
+                    Name (PIO0, 0x04)
+                    Name (DMA0, 0x06)
+                    Name (MDA0, 0x02)
+                    Name (PIO1, 0x04)
+                    Name (DMA1, 0x06)
+                    Name (MDA1, 0x02)
+                    Name (PIO2, 0x04)
+                    Name (DMA2, 0x06)
+                    Name (MDA2, 0x02)
+                    Name (PIO3, 0x04)
+                    Name (DMA3, 0x06)
+                    Name (MDA3, 0x02)
+                    Name (FLGP, 0x1F)
+                    Name (FLGS, 0x1F)
+                    Device (IDE0)
+                    {
+                        Name (_ADR, Zero)
+                        Method (_GTM, 0, NotSerialized)
+                        {
+                            Store (DerefOf (Index (PIOT, PIO0)), Local0)
+                            Store (DerefOf (Index (PIOT, PIO1)), Local2)
+                            Store (0x1A, Local4)
+                            If (LAnd (FLGP, One))
+                            {
+                                If (LNot (MULT))
+                                {
+                                    If (LAnd (CAB0, SWAP))
+                                    {
+                                        Store (0x02, DMA0)
+                                    }
+                                }
+
+                                Store (DerefOf (Index (UDMA, DMA0)), Local1)
+                                Or (Local4, One, Local4)
+                            }
+                            Else
+                            {
+                                Store (DerefOf (Index (MDMA, MDA0)), Local1)
+                            }
+
+                            If (LAnd (FLGP, 0x04))
+                            {
+                                If (LAnd (CAB0, SWAP))
+                                {
+                                    Store (0x02, DMA1)
+                                }
+
+                                Store (DerefOf (Index (UDMA, DMA1)), Local3)
+                                Or (Local4, 0x04, Local4)
+                            }
+                            Else
+                            {
+                                Store (DerefOf (Index (MDMA, MDA1)), Local3)
+                            }
+
+                            Store (Local0, GTM0)
+                            Store (Local1, GTM1)
+                            Store (Local2, GTM2)
+                            Store (Local3, GTM3)
+                            Store (Local4, GTM4)
+                            Return (IDEB)
+                        }
+
+                        Method (_STM, 3, NotSerialized)
+                        {
+                            Store (Arg0, IDEB)
+                            Store (GTM0, Local0)
+                            Store (GTM1, Local1)
+                            Store (GTM2, Local2)
+                            Store (GTM3, Local3)
+                            Store (GTM4, Local4)
+                            Store (Local4, FLGP)
+                            If (LAnd (LNotEqual (Local0, 0xFFFFFFFF), LNotEqual (Local0, Zero)))
+                            {
+                                Store (Match (PIOT, MEQ, Local0, MTR, Zero, Zero), PIO0)
+                            }
+
+                            If (LAnd (LNotEqual (Local1, 0xFFFFFFFF), LNotEqual (Local1, Zero)))
+                            {
+                                If (LAnd (FLGP, One))
+                                {
+                                    Store (Match (UDMA, MEQ, Local1, MTR, Zero, Zero), DMA0)
+                                }
+                                Else
+                                {
+                                    Store (Match (MDMA, MEQ, Local1, MTR, Zero, Zero), MDA0)
+                                }
+                            }
+
+                            If (LAnd (LNotEqual (Local2, 0xFFFFFFFF), LNotEqual (Local2, Zero)))
+                            {
+                                Store (Match (PIOT, MEQ, Local2, MTR, Zero, Zero), PIO1)
+                            }
+
+                            If (LAnd (LNotEqual (Local3, 0xFFFFFFFF), LNotEqual (Local3, Zero)))
+                            {
+                                If (LAnd (FLGP, 0x04))
+                                {
+                                    Store (Match (UDMA, MEQ, Local3, MTR, Zero, Zero), DMA1)
+                                }
+                                Else
+                                {
+                                    Store (Match (MDMA, MEQ, Local3, MTR, Zero, Zero), MDA1)
+                                }
+                            }
+                        }
+
+                        Device (DRV0)
+                        {
+                            Name (_ADR, Zero)
+                            Method (_GTF, 0, NotSerialized)
+                            {
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
+                                    }, Local0)
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
+                                    }, Local1)
+                                CreateByteField (Local0, One, PIOM)
+                                CreateByteField (Local1, One, DMAM)
+                                Store (PIO0, PIOM)
+                                Or (PIOM, 0x08, PIOM)
+                                If (LAnd (FLGP, One))
+                                {
+                                    Store (DMA0, DMAM)
+                                    Or (DMAM, 0x40, DMAM)
+                                }
+                                Else
+                                {
+                                    Store (MDA0, DMAM)
+                                    Or (DMAM, 0x20, DMAM)
+                                }
+
+                                Concatenate (Local0, Local1, Local2)
+                                Return (Local2)
+                            }
+                        }
+
+                        Device (DRV1)
+                        {
+                            Name (_ADR, One)
+                            Method (_GTF, 0, NotSerialized)
+                            {
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
+                                    }, Local0)
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
+                                    }, Local1)
+                                CreateByteField (Local0, One, PIOM)
+                                CreateByteField (Local1, One, DMAM)
+                                Store (PIO1, PIOM)
+                                Or (PIOM, 0x08, PIOM)
+                                If (LAnd (FLGP, 0x04))
+                                {
+                                    Store (DMA1, DMAM)
+                                    Or (DMAM, 0x40, DMAM)
+                                }
+                                Else
+                                {
+                                    Store (MDA1, DMAM)
+                                    Or (DMAM, 0x20, DMAM)
+                                }
+
+                                Concatenate (Local0, Local1, Local2)
+                                Return (Local2)
+                            }
+                        }
+                    }
+
+                    Device (IDE1)
+                    {
+                        Name (_ADR, One)
+                        Method (_GTM, 0, NotSerialized)
+                        {
+                            Store (DerefOf (Index (PIOT, PIO2)), Local0)
+                            Store (DerefOf (Index (PIOT, PIO3)), Local2)
+                            Store (0x1A, Local4)
+                            If (LAnd (FLGS, One))
+                            {
+                                If (LNot (MULT))
+                                {
+                                    If (LAnd (CAB0, LNot (SWAP)))
+                                    {
+                                        Store (0x02, DMA2)
+                                    }
+                                }
+
+                                Store (DerefOf (Index (UDMA, DMA2)), Local1)
+                                Or (Local4, One, Local4)
+                            }
+                            Else
+                            {
+                                Store (DerefOf (Index (MDMA, MDA2)), Local1)
+                            }
+
+                            If (LAnd (FLGS, 0x04))
+                            {
+                                If (LAnd (CAB0, LNot (SWAP)))
+                                {
+                                    Store (0x02, DMA3)
+                                }
+
+                                Store (DerefOf (Index (UDMA, DMA3)), Local3)
+                                Or (Local4, 0x04, Local4)
+                            }
+                            Else
+                            {
+                                Store (DerefOf (Index (MDMA, MDA3)), Local3)
+                            }
+
+                            Store (Local0, GTM0)
+                            Store (Local1, GTM1)
+                            Store (Local2, GTM2)
+                            Store (Local3, GTM3)
+                            Store (Local4, GTM4)
+                            Return (IDEB)
+                        }
+
+                        Method (_STM, 3, NotSerialized)
+                        {
+                            Store (Arg0, IDEB)
+                            Store (GTM0, Local0)
+                            Store (GTM1, Local1)
+                            Store (GTM2, Local2)
+                            Store (GTM3, Local3)
+                            Store (GTM4, Local4)
+                            Store (Local4, FLGS)
+                            If (LAnd (LNotEqual (Local0, 0xFFFFFFFF), LNotEqual (Local0, Zero)))
+                            {
+                                Store (Match (PIOT, MEQ, Local0, MTR, Zero, Zero), PIO2)
+                            }
+
+                            If (LAnd (LNotEqual (Local1, 0xFFFFFFFF), LNotEqual (Local1, Zero)))
+                            {
+                                If (LAnd (FLGS, One))
+                                {
+                                    Store (Match (UDMA, MEQ, Local1, MTR, Zero, Zero), DMA2)
+                                }
+                                Else
+                                {
+                                    Store (Match (MDMA, MEQ, Local1, MTR, Zero, Zero), MDA2)
+                                }
+                            }
+
+                            If (LAnd (LNotEqual (Local2, 0xFFFFFFFF), LNotEqual (Local2, Zero)))
+                            {
+                                Store (Match (PIOT, MEQ, Local2, MTR, Zero, Zero), PIO3)
+                            }
+
+                            If (LAnd (LNotEqual (Local3, 0xFFFFFFFF), LNotEqual (Local3, Zero)))
+                            {
+                                If (LAnd (FLGS, 0x04))
+                                {
+                                    Store (Match (UDMA, MEQ, Local3, MTR, Zero, Zero), DMA3)
+                                }
+                                Else
+                                {
+                                    Store (Match (MDMA, MEQ, Local3, MTR, Zero, Zero), MDA3)
+                                }
+                            }
+                        }
+
+                        Device (DRV0)
+                        {
+                            Name (_ADR, Zero)
+                            Method (_GTF, 0, NotSerialized)
+                            {
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
+                                    }, Local0)
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
+                                    }, Local1)
+                                CreateByteField (Local0, One, PIOM)
+                                CreateByteField (Local1, One, DMAM)
+                                Store (PIO2, PIOM)
+                                Or (PIOM, 0x08, PIOM)
+                                If (LAnd (FLGS, One))
+                                {
+                                    Store (DMA2, DMAM)
+                                    Or (DMAM, 0x40, DMAM)
+                                }
+                                Else
+                                {
+                                    Store (MDA2, DMAM)
+                                    Or (DMAM, 0x20, DMAM)
+                                }
+
+                                Concatenate (Local0, Local1, Local2)
+                                Return (Local2)
+                            }
+                        }
+
+                        Device (DRV1)
+                        {
+                            Name (_ADR, One)
+                            Method (_GTF, 0, NotSerialized)
+                            {
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
+                                    }, Local0)
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
+                                    }, Local1)
+                                CreateByteField (Local0, One, PIOM)
+                                CreateByteField (Local1, One, DMAM)
+                                Store (PIO3, PIOM)
+                                Or (PIOM, 0x08, PIOM)
+                                If (LAnd (FLGS, 0x04))
+                                {
+                                    Store (DMA3, DMAM)
+                                    Or (DMAM, 0x40, DMAM)
+                                }
+                                Else
+                                {
+                                    Store (MDA3, DMAM)
+                                    Or (DMAM, 0x20, DMAM)
+                                }
+
+                                Concatenate (Local0, Local1, Local2)
+                                Return (Local2)
+                            }
+                        }
+                    }
+                }
+
+                Device (JMB1)
+                {
+                    Name (_ADR, One)
+                    OperationRegion (CF40, PCI_Config, 0x40, 0x04)
+                    Field (CF40, ByteAcc, NoLock, Preserve)
+                    {
+                        CHE0,   1, 
+                        MULT,   1, 
+                            ,   1, 
+                        CAB0,   1, 
+                        CHE1,   1, 
+                                Offset (0x01), 
+                        AHEN,   1, 
+                            ,   3, 
+                        PRT0,   1, 
+                        AHM0,   1, 
+                        PRT1,   1, 
+                        AHM1,   1, 
+                        CF42,   6, 
+                        SWAP,   1, 
+                        PATA,   1, 
+                            ,   6, 
+                        WTEN,   1, 
+                                Offset (0x04)
+                    }
+
+                    Name (PIOT, Package (0x05)
+                    {
+                        0x0258, 
+                        0x0186, 
+                        0x014A, 
+                        0xB4, 
+                        0x78
+                    })
+                    Name (UDMA, Package (0x07)
+                    {
+                        0x78, 
+                        0x50, 
+                        0x3C, 
+                        0x28, 
+                        0x1E, 
+                        0x14, 
+                        0x0F
+                    })
+                    Name (MDMA, Package (0x03)
+                    {
+                        0x01E0, 
+                        0x96, 
+                        0x78
+                    })
+                    Name (IDEB, Buffer (0x14) {})
+                    CreateDWordField (IDEB, Zero, GTM0)
+                    CreateDWordField (IDEB, 0x04, GTM1)
+                    CreateDWordField (IDEB, 0x08, GTM2)
+                    CreateDWordField (IDEB, 0x0C, GTM3)
+                    CreateDWordField (IDEB, 0x10, GTM4)
+                    Name (PIO0, 0x04)
+                    Name (DMA0, 0x06)
+                    Name (MDA0, 0x02)
+                    Name (PIO1, 0x04)
+                    Name (DMA1, 0x06)
+                    Name (MDA1, 0x02)
+                    Name (PIO2, 0x04)
+                    Name (DMA2, 0x06)
+                    Name (MDA2, 0x02)
+                    Name (PIO3, 0x04)
+                    Name (DMA3, 0x06)
+                    Name (MDA3, 0x02)
+                    Name (FLGP, 0x1F)
+                    Name (FLGS, 0x1F)
+                    Device (IDE0)
+                    {
+                        Name (_ADR, Zero)
+                        Method (_GTM, 0, NotSerialized)
+                        {
+                            Store (DerefOf (Index (PIOT, PIO0)), Local0)
+                            Store (DerefOf (Index (PIOT, PIO1)), Local2)
+                            Store (0x1A, Local4)
+                            If (LAnd (FLGP, One))
+                            {
+                                If (LAnd (CAB0, SWAP))
+                                {
+                                    Store (0x02, DMA0)
+                                }
+
+                                Store (DerefOf (Index (UDMA, DMA0)), Local1)
+                                Or (Local4, One, Local4)
+                            }
+                            Else
+                            {
+                                Store (DerefOf (Index (MDMA, MDA0)), Local1)
+                            }
+
+                            If (LAnd (FLGP, 0x04))
+                            {
+                                If (LAnd (CAB0, SWAP))
+                                {
+                                    Store (0x02, DMA1)
+                                }
+
+                                Store (DerefOf (Index (UDMA, DMA1)), Local3)
+                                Or (Local4, 0x04, Local4)
+                            }
+                            Else
+                            {
+                                Store (DerefOf (Index (MDMA, MDA1)), Local3)
+                            }
+
+                            Store (Local0, GTM0)
+                            Store (Local1, GTM1)
+                            Store (Local2, GTM2)
+                            Store (Local3, GTM3)
+                            Store (Local4, GTM4)
+                            Return (IDEB)
+                        }
+
+                        Method (_STM, 3, NotSerialized)
+                        {
+                            Store (Arg0, IDEB)
+                            Store (GTM0, Local0)
+                            Store (GTM1, Local1)
+                            Store (GTM2, Local2)
+                            Store (GTM3, Local3)
+                            Store (GTM4, Local4)
+                            Store (Local4, FLGP)
+                            If (LAnd (LNotEqual (Local0, 0xFFFFFFFF), LNotEqual (Local0, Zero)))
+                            {
+                                Store (Match (PIOT, MEQ, Local0, MTR, Zero, Zero), PIO0)
+                            }
+
+                            If (LAnd (LNotEqual (Local1, 0xFFFFFFFF), LNotEqual (Local1, Zero)))
+                            {
+                                If (LAnd (FLGP, One))
+                                {
+                                    Store (Match (UDMA, MEQ, Local1, MTR, Zero, Zero), DMA0)
+                                }
+                                Else
+                                {
+                                    Store (Match (MDMA, MEQ, Local1, MTR, Zero, Zero), MDA0)
+                                }
+                            }
+
+                            If (LAnd (LNotEqual (Local2, 0xFFFFFFFF), LNotEqual (Local2, Zero)))
+                            {
+                                Store (Match (PIOT, MEQ, Local2, MTR, Zero, Zero), PIO1)
+                            }
+
+                            If (LAnd (LNotEqual (Local3, 0xFFFFFFFF), LNotEqual (Local3, Zero)))
+                            {
+                                If (LAnd (FLGP, 0x04))
+                                {
+                                    Store (Match (UDMA, MEQ, Local3, MTR, Zero, Zero), DMA1)
+                                }
+                                Else
+                                {
+                                    Store (Match (MDMA, MEQ, Local3, MTR, Zero, Zero), MDA1)
+                                }
+                            }
+                        }
+
+                        Device (DRV0)
+                        {
+                            Name (_ADR, Zero)
+                            Method (_GTF, 0, NotSerialized)
+                            {
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
+                                    }, Local0)
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
+                                    }, Local1)
+                                CreateByteField (Local0, One, PIOM)
+                                CreateByteField (Local1, One, DMAM)
+                                Store (PIO0, PIOM)
+                                Or (PIOM, 0x08, PIOM)
+                                If (LAnd (FLGP, One))
+                                {
+                                    Store (DMA0, DMAM)
+                                    Or (DMAM, 0x40, DMAM)
+                                }
+                                Else
+                                {
+                                    Store (MDA0, DMAM)
+                                    Or (DMAM, 0x20, DMAM)
+                                }
+
+                                Concatenate (Local0, Local1, Local2)
+                                Return (Local2)
+                            }
+                        }
+
+                        Device (DRV1)
+                        {
+                            Name (_ADR, One)
+                            Method (_GTF, 0, NotSerialized)
+                            {
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
+                                    }, Local0)
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
+                                    }, Local1)
+                                CreateByteField (Local0, One, PIOM)
+                                CreateByteField (Local1, One, DMAM)
+                                Store (PIO1, PIOM)
+                                Or (PIOM, 0x08, PIOM)
+                                If (LAnd (FLGP, 0x04))
+                                {
+                                    Store (DMA1, DMAM)
+                                    Or (DMAM, 0x40, DMAM)
+                                }
+                                Else
+                                {
+                                    Store (MDA1, DMAM)
+                                    Or (DMAM, 0x20, DMAM)
+                                }
+
+                                Concatenate (Local0, Local1, Local2)
+                                Return (Local2)
+                            }
+                        }
+                    }
+
+                    Device (IDE1)
+                    {
+                        Name (_ADR, One)
+                        Method (_GTM, 0, NotSerialized)
+                        {
+                            Store (DerefOf (Index (PIOT, PIO2)), Local0)
+                            Store (DerefOf (Index (PIOT, PIO3)), Local2)
+                            Store (0x1A, Local4)
+                            If (LAnd (FLGS, One))
+                            {
+                                If (LAnd (CAB0, LNot (SWAP)))
+                                {
+                                    Store (0x02, DMA2)
+                                }
+
+                                Store (DerefOf (Index (UDMA, DMA2)), Local1)
+                                Or (Local4, One, Local4)
+                            }
+                            Else
+                            {
+                                Store (DerefOf (Index (MDMA, MDA2)), Local1)
+                            }
+
+                            If (LAnd (FLGS, 0x04))
+                            {
+                                If (LAnd (CAB0, LNot (SWAP)))
+                                {
+                                    Store (0x02, DMA3)
+                                }
+
+                                Store (DerefOf (Index (UDMA, DMA3)), Local3)
+                                Or (Local4, 0x04, Local4)
+                            }
+                            Else
+                            {
+                                Store (DerefOf (Index (MDMA, MDA3)), Local3)
+                            }
+
+                            Store (Local0, GTM0)
+                            Store (Local1, GTM1)
+                            Store (Local2, GTM2)
+                            Store (Local3, GTM3)
+                            Store (Local4, GTM4)
+                            Return (IDEB)
+                        }
+
+                        Method (_STM, 3, NotSerialized)
+                        {
+                            Store (Arg0, IDEB)
+                            Store (GTM0, Local0)
+                            Store (GTM1, Local1)
+                            Store (GTM2, Local2)
+                            Store (GTM3, Local3)
+                            Store (GTM4, Local4)
+                            Store (Local4, FLGS)
+                            If (LAnd (LNotEqual (Local0, 0xFFFFFFFF), LNotEqual (Local0, Zero)))
+                            {
+                                Store (Match (PIOT, MEQ, Local0, MTR, Zero, Zero), PIO2)
+                            }
+
+                            If (LAnd (LNotEqual (Local1, 0xFFFFFFFF), LNotEqual (Local1, Zero)))
+                            {
+                                If (LAnd (FLGS, One))
+                                {
+                                    Store (Match (UDMA, MEQ, Local1, MTR, Zero, Zero), DMA2)
+                                }
+                                Else
+                                {
+                                    Store (Match (MDMA, MEQ, Local1, MTR, Zero, Zero), MDA2)
+                                }
+                            }
+
+                            If (LAnd (LNotEqual (Local2, 0xFFFFFFFF), LNotEqual (Local2, Zero)))
+                            {
+                                Store (Match (PIOT, MEQ, Local2, MTR, Zero, Zero), PIO3)
+                            }
+
+                            If (LAnd (LNotEqual (Local3, 0xFFFFFFFF), LNotEqual (Local3, Zero)))
+                            {
+                                If (LAnd (FLGS, 0x04))
+                                {
+                                    Store (Match (UDMA, MEQ, Local3, MTR, Zero, Zero), DMA3)
+                                }
+                                Else
+                                {
+                                    Store (Match (MDMA, MEQ, Local3, MTR, Zero, Zero), MDA3)
+                                }
+                            }
+                        }
+
+                        Device (DRV0)
+                        {
+                            Name (_ADR, Zero)
+                            Method (_GTF, 0, NotSerialized)
+                            {
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
+                                    }, Local0)
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
+                                    }, Local1)
+                                CreateByteField (Local0, One, PIOM)
+                                CreateByteField (Local1, One, DMAM)
+                                Store (PIO2, PIOM)
+                                Or (PIOM, 0x08, PIOM)
+                                If (LAnd (FLGS, One))
+                                {
+                                    Store (DMA2, DMAM)
+                                    Or (DMAM, 0x40, DMAM)
+                                }
+                                Else
+                                {
+                                    Store (MDA2, DMAM)
+                                    Or (DMAM, 0x20, DMAM)
+                                }
+
+                                Concatenate (Local0, Local1, Local2)
+                                Return (Local2)
+                            }
+                        }
+
+                        Device (DRV1)
+                        {
+                            Name (_ADR, One)
+                            Method (_GTF, 0, NotSerialized)
+                            {
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
+                                    }, Local0)
+                                Store (Buffer (0x07)
+                                    {
+                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
+                                    }, Local1)
+                                CreateByteField (Local0, One, PIOM)
+                                CreateByteField (Local1, One, DMAM)
+                                Store (PIO3, PIOM)
+                                Or (PIOM, 0x08, PIOM)
+                                If (LAnd (FLGS, 0x04))
+                                {
+                                    Store (DMA3, DMAM)
+                                    Or (DMAM, 0x40, DMAM)
+                                }
+                                Else
+                                {
+                                    Store (MDA3, DMAM)
+                                    Or (DMAM, 0x20, DMAM)
+                                }
+
+                                Concatenate (Local0, Local1, Local2)
+                                Return (Local2)
+                            }
+                        }
+                    }
+                }
+            }
+
+            Device (RP05)
+            {
+                Name (_ADR, 0x001C0004)
+                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
+                Field (PXCS, AnyAcc, NoLock, Preserve)
+                {
+                            Offset (0x10), 
+                    L0SE,   1, 
+                            Offset (0x11), 
+                            Offset (0x12), 
+                        ,   13, 
+                    LASX,   1, 
+                            Offset (0x1A), 
+                    ABPX,   1, 
+                        ,   2, 
+                    PDCX,   1, 
+                        ,   2, 
+                    PDSX,   1, 
+                            Offset (0x1B), 
+                            Offset (0x20), 
+                            Offset (0x22), 
+                    PSPX,   1, 
+                            Offset (0x98), 
+                        ,   30, 
+                    HPEX,   1, 
+                    PMEX,   1
+                }
+
+                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
+                {
+                            Offset (0x9C), 
+                        ,   30, 
+                    HPSX,   1, 
+                    PMSX,   1
+                }
+
+                Device (PXSX)
+                {
+                    Name (_ADR, Zero)
+                    Name (_PRW, Package (0x02)
+                    {
+                        0x09, 
+                        0x04
+                    })
+                }
+
+                Method (HPME, 0, Serialized)
+                {
+                    If (PMSX)
+                    {
+                        Store (0xC8, Local0)
+                        While (Local0)
+                        {
+                            Store (One, PMSX)
+                            If (PMSX)
+                            {
+                                Decrement (Local0)
+                            }
+                            Else
+                            {
+                                Store (Zero, Local0)
+                            }
+                        }
+
+                        Notify (PXSX, 0x02)
+                    }
+                }
+
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR08 ())
+                    }
+
+                    Return (PR08 ())
+                }
+            }
+
+            Device (RP06)
+            {
+                Name (_ADR, 0x001C0005)
+                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
+                Field (PXCS, AnyAcc, NoLock, Preserve)
+                {
+                            Offset (0x10), 
+                    L0SE,   1, 
+                            Offset (0x11), 
+                            Offset (0x12), 
+                        ,   13, 
+                    LASX,   1, 
+                            Offset (0x1A), 
+                    ABPX,   1, 
+                        ,   2, 
+                    PDCX,   1, 
+                        ,   2, 
+                    PDSX,   1, 
+                            Offset (0x1B), 
+                            Offset (0x20), 
+                            Offset (0x22), 
+                    PSPX,   1, 
+                            Offset (0x98), 
+                        ,   30, 
+                    HPEX,   1, 
+                    PMEX,   1
+                }
+
+                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
+                {
+                            Offset (0x9C), 
+                        ,   30, 
+                    HPSX,   1, 
+                    PMSX,   1
+                }
+
+                Device (PXSX)
+                {
+                    Name (_ADR, Zero)
+                    Name (_PRW, Package (0x02)
+                    {
+                        0x09, 
+                        0x04
+                    })
+                }
+
+                Method (HPME, 0, Serialized)
+                {
+                    If (PMSX)
+                    {
+                        Store (0xC8, Local0)
+                        While (Local0)
+                        {
+                            Store (One, PMSX)
+                            If (PMSX)
+                            {
+                                Decrement (Local0)
+                            }
+                            Else
+                            {
+                                Store (Zero, Local0)
+                            }
+                        }
+
+                        Notify (PXSX, 0x02)
+                    }
+                }
+
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR09 ())
+                    }
+
+                    Return (PR09 ())
+                }
+            }
+
+            Device (RP08)
+            {
+                Name (_ADR, 0x001C0007)
+                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
+                Field (PXCS, AnyAcc, NoLock, Preserve)
+                {
+                            Offset (0x10), 
+                    L0SE,   1, 
+                            Offset (0x11), 
+                            Offset (0x12), 
+                        ,   13, 
+                    LASX,   1, 
+                            Offset (0x1A), 
+                    ABPX,   1, 
+                        ,   2, 
+                    PDCX,   1, 
+                        ,   2, 
+                    PDSX,   1, 
+                            Offset (0x1B), 
+                            Offset (0x20), 
+                            Offset (0x22), 
+                    PSPX,   1, 
+                            Offset (0x98), 
+                        ,   30, 
+                    HPEX,   1, 
+                    PMEX,   1
+                }
+
+                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
+                {
+                            Offset (0x9C), 
+                        ,   30, 
+                    HPSX,   1, 
+                    PMSX,   1
+                }
+
+                Device (PXSX)
+                {
+                    Name (_ADR, Zero)
+                    Name (_PRW, Package (0x02)
+                    {
+                        0x09, 
+                        0x04
+                    })
+                }
+
+                Method (HPME, 0, Serialized)
+                {
+                    If (PMSX)
+                    {
+                        Store (0xC8, Local0)
+                        While (Local0)
+                        {
+                            Store (One, PMSX)
+                            If (PMSX)
+                            {
+                                Decrement (Local0)
+                            }
+                            Else
+                            {
+                                Store (Zero, Local0)
+                            }
+                        }
+
+                        Notify (PXSX, 0x02)
+                    }
+                }
+
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR0F ())
+                    }
+
+                    Return (PR0F ())
+                }
+            }
+
+            Device (PEG0)
+            {
+                Name (_ADR, 0x00010000)
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR02 ())
+                    }
+
+                    Return (PR02 ())
+                }
+
+                Device (PEGP)
+                {
+                    Name (_ADR, 0xFFFF)
+                }
+            }
+
+            Device (PEG1)
+            {
+                Name (_ADR, 0x00010001)
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR0A ())
+                    }
+
+                    Return (PR0A ())
+                }
+            }
+
+            Device (PEG2)
+            {
+                Name (_ADR, 0x00010002)
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR0B ())
+                    }
+
+                    Return (PR0B ())
+                }
+            }
+
+            Device (PEG3)
+            {
+                Name (_ADR, 0x00060000)
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR0C ())
+                    }
+
+                    Return (PR0C ())
+                }
+            }
+
+            Device (B0D4)
+            {
+                Name (_ADR, 0x00040000)
+            }
+
+            Device (EUSB)
+            {
+                Name (_ADR, 0x001D0000)
+                Name (_S4D, 0x02)
+                Name (_S3D, 0x02)
+                Name (_S2D, 0x02)
+                Name (_S1D, 0x02)
+                Device (HUBN)
+                {
+                    Name (_ADR, Zero)
+                    Device (PR10)
+                    {
+                        Name (_ADR, One)
+                        Name (_UPC, Package (0x04)
+                        {
+                            0xFF, 
+                            Zero, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Buffer (0x10)
+                        {
+                            /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                            /* 0008 */    0x30, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                        })
+                        Device (PR30)
+                        {
+                            Name (_ADR, One)
+                            Name (_UPC, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Buffer (0x10)
+                            {
+                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0xE1, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                            })
+                        }
+
+                        Device (PR31)
+                        {
+                            Name (_ADR, 0x02)
+                            Name (_UPC, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Buffer (0x10)
+                            {
+                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                            })
+                        }
+
+                        Device (PR32)
+                        {
+                            Name (_ADR, 0x03)
+                            Name (_UPC, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Buffer (0x10)
+                            {
+                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                            })
+                        }
+
+                        Device (PR33)
+                        {
+                            Name (_ADR, 0x04)
+                            Name (_UPC, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Buffer (0x10)
+                            {
+                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0xE1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                            })
+                        }
+
+                        Device (PR34)
+                        {
+                            Name (_ADR, 0x05)
+                            Name (_UPC, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Buffer (0x10)
+                            {
+                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                            })
+                        }
+
+                        Device (PR35)
+                        {
+                            Name (_ADR, 0x06)
+                            Name (_UPC, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Buffer (0x10)
+                            {
+                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                            })
+                        }
+
+                        Device (PR36)
+                        {
+                            Name (_ADR, 0x07)
+                            Name (_UPC, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Buffer (0x10)
+                            {
+                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0xB0, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                            })
+                        }
+
+                        Device (PR37)
+                        {
+                            Name (_ADR, 0x08)
+                            Name (_UPC, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Buffer (0x10)
+                            {
+                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                            })
+                        }
+                    }
+                }
+            }
+
+            Device (RP07)
+            {
+                Name (_ADR, 0x001C0006)
+                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
+                Field (PXCS, AnyAcc, NoLock, Preserve)
+                {
+                            Offset (0x10), 
+                    L0SE,   1, 
+                            Offset (0x11), 
+                            Offset (0x12), 
+                        ,   13, 
+                    LASX,   1, 
+                            Offset (0x1A), 
+                    ABPX,   1, 
+                        ,   2, 
+                    PDCX,   1, 
+                        ,   2, 
+                    PDSX,   1, 
+                            Offset (0x1B), 
+                            Offset (0x20), 
+                            Offset (0x22), 
+                    PSPX,   1, 
+                            Offset (0x98), 
+                        ,   30, 
+                    HPEX,   1, 
+                    PMEX,   1
+                }
+
+                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
+                {
+                            Offset (0x9C), 
+                        ,   30, 
+                    HPSX,   1, 
+                    PMSX,   1
+                }
+
+                Method (HPME, 0, Serialized)
+                {
+                    If (PMSX)
+                    {
+                        Store (0xC8, Local0)
+                        While (Local0)
+                        {
+                            Store (One, PMSX)
+                            If (PMSX)
+                            {
+                                Decrement (Local0)
+                            }
+                            Else
+                            {
+                                Store (Zero, Local0)
+                            }
+                        }
+
+                        Notify (PXSX, 0x02)
+                    }
+                }
+
+                Method (_PRT, 0, NotSerialized)
+                {
+                    If (PICM)
+                    {
+                        Return (AR0E ())
+                    }
+
+                    Return (PR0E ())
+                }
+
+                Device (PXSX)
+                {
+                    Name (_ADR, Zero)
+                    Method (_PRW, 0, NotSerialized)
+                    {
+                        Return (GPRW (0x0B, 0x04))
+                    }
+
+                    Method (_PRT, 0, NotSerialized)
+                    {
+                        If (PICM)
+                        {
+                            Return (AR31)
+                        }
+
+                        Return (PR31)
+                    }
+                }
+            }
+        }
+
+        Scope (\_GPE)
+        {
+            Method (_L1D, 0, NotSerialized)
+            {
+                \_SB.PCI0.LPCB.SIOH ()
+                Notify (\_SB.PWRB, 0x02)
+            }
+
+            Method (_L0B, 0, NotSerialized)
+            {
+                Notify (\_SB.PCI0.P0P1, 0x02)
+                Notify (\_SB.PCI0.RP07.PXSX, 0x02)
+                Notify (\_SB.PWRB, 0x02)
+            }
+        }
+
+        Device (PWRB)
+        {
+            Name (_HID, EisaId ("PNP0C0C"))
+            Name (_UID, 0xAA)
+            Name (_STA, 0x0B)
+            Method (_PRW, 0, NotSerialized)
+            {
+                Return (GPRW (0x1D, 0x04))
+            }
+        }
+    }
+
+    Scope (\)
+    {
+        OperationRegion (IO_T, SystemIO, 0x0200, 0x10)
+        Field (IO_T, ByteAcc, NoLock, Preserve)
+        {
+            TRPI,   16, 
+                    Offset (0x04), 
+                    Offset (0x06), 
+                    Offset (0x08), 
+            TRP0,   8, 
+                    Offset (0x0A), 
+                    Offset (0x0B), 
+                    Offset (0x0C), 
+                    Offset (0x0D), 
+                    Offset (0x0E), 
+                    Offset (0x0F), 
+                    Offset (0x10)
+        }
+
+        OperationRegion (IO_D, SystemIO, 0x0810, 0x04)
+        Field (IO_D, ByteAcc, NoLock, Preserve)
+        {
+            TRPD,   8
+        }
+
+        OperationRegion (IO_H, SystemIO, 0x1000, 0x04)
+        Field (IO_H, ByteAcc, NoLock, Preserve)
+        {
+            TRPH,   8
+        }
+
+        OperationRegion (PMIO, SystemIO, PMBS, 0x80)
+        Field (PMIO, ByteAcc, NoLock, Preserve)
+        {
+                    Offset (0x28), 
+                    Offset (0x2A), 
+                ,   3, 
+            GPE3,   1, 
+                    Offset (0x3C), 
+                ,   1, 
+            UPRW,   1, 
+                    Offset (0x42), 
+                ,   1, 
+            GPEC,   1
+        }
+
+        Field (PMIO, ByteAcc, NoLock, WriteAsZeros)
+        {
+                    Offset (0x20), 
+                    Offset (0x22), 
+                ,   3, 
+            GPS3,   1, 
+                    Offset (0x64), 
+                ,   9, 
+            SCIS,   1, 
+                    Offset (0x66)
+        }
+
+        OperationRegion (GPIO, SystemIO, GPBS, 0x64)
+        Field (GPIO, ByteAcc, NoLock, Preserve)
+        {
+            GU00,   8, 
+            GU01,   8, 
+            GU02,   8, 
+            GU03,   8, 
+            GIO0,   8, 
+            GIO1,   8, 
+            GIO2,   8, 
+            GIO3,   8, 
+                    Offset (0x0C), 
+            GL00,   8, 
+            GL01,   8, 
+            GL02,   8, 
+            GP24,   1, 
+                ,   2, 
+            GP27,   1, 
+            GP28,   1, 
+                    Offset (0x10), 
+                    Offset (0x18), 
+            GB00,   8, 
+            GB01,   8, 
+            GB02,   8, 
+            GB03,   8, 
+                    Offset (0x2C), 
+            GIV0,   8, 
+            GIV1,   8, 
+            GIV2,   8, 
+            GIV3,   8, 
+            GU04,   8, 
+            GU05,   8, 
+            GU06,   8, 
+            GU07,   8, 
+            GIO4,   8, 
+            GIO5,   8, 
+            GIO6,   8, 
+            GIO7,   8, 
+            GL04,   8, 
+            GL05,   8, 
+            GL06,   8, 
+            GL07,   8, 
+                    Offset (0x40), 
+            GU08,   8, 
+            GU09,   8, 
+            GU0A,   8, 
+            GU0B,   8, 
+            GIO8,   8, 
+            GIO9,   8, 
+            GIOA,   8, 
+            GIOB,   8, 
+            GL08,   8, 
+            GL09,   8, 
+            GL0A,   8, 
+            GL0B,   8
+        }
+
+        OperationRegion (RCRB, SystemMemory, SRCB, 0x4000)
+        Field (RCRB, DWordAcc, Lock, Preserve)
+        {
+                    Offset (0x1000), 
+                    Offset (0x3000), 
+                    Offset (0x3404), 
+            HPAS,   2, 
+                ,   5, 
+            HPAE,   1, 
+                    Offset (0x3418), 
+                ,   1, 
+                ,   1, 
+            SATD,   1, 
+            SMBD,   1, 
+            HDAD,   1, 
+                    Offset (0x341A), 
+            RP1D,   1, 
+            RP2D,   1, 
+            RP3D,   1, 
+            RP4D,   1, 
+            RP5D,   1, 
+            RP6D,   1, 
+            RP7D,   1, 
+            RP8D,   1, 
+                    Offset (0x359C), 
+            UP0D,   1, 
+            UP1D,   1, 
+            UP2D,   1, 
+            UP3D,   1, 
+            UP4D,   1, 
+            UP5D,   1, 
+            UP6D,   1, 
+            UP7D,   1, 
+            UP8D,   1, 
+            UP9D,   1, 
+            UPAD,   1, 
+            UPBD,   1, 
+            UPCD,   1, 
+            UPDD,   1, 
+                ,   1, 
+                    Offset (0x359E)
+        }
+    }
+
+    Scope (_SB.PCI0)
+    {
+        Device (GLAN)
+        {
+            Name (_ADR, 0x00190000)
+            Method (_PRW, 0, NotSerialized)
+            {
+                Return (GPRW (0x0D, 0x04))
+            }
+        }
+
+        Device (EHC1)
+        {
+            Name (_ADR, 0x001D0000)
+            OperationRegion (PWKE, PCI_Config, 0x62, 0x04)
+            Field (PWKE, DWordAcc, NoLock, Preserve)
+            {
+                    ,   1, 
+                PWUC,   8
+            }
+
+            Method (_PSW, 1, NotSerialized)
+            {
+                If (Arg0)
+                {
+                    Store (Ones, PWUC)
+                }
+                Else
+                {
+                    Store (Zero, PWUC)
+                }
+            }
+
+            Method (_S3D, 0, NotSerialized)
+            {
+                Return (0x02)
+            }
+
+            Method (_S4D, 0, NotSerialized)
+            {
+                Return (0x02)
+            }
+
+            Device (HUBN)
+            {
+                Name (_ADR, Zero)
+                Device (PR01)
+                {
+                    Name (_ADR, One)
+                    Method (_UPC, 0, Serialized)
+                    {
+                        Name (UPCA, Package (0x04)
+                        {
+                            0xFF, 
+                            Zero, 
+                            Zero, 
+                            Zero
+                        })
+                        Return (UPCA)
+                    }
+
+                    Method (_PLD, 0, Serialized)
+                    {
+                        Name (PLDP, Package (0x01)
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0x30, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                            }
+                        })
+                        Return (PLDP)
+                    }
+
+                    Device (PR11)
+                    {
+                        Name (_ADR, One)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xE1, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+                    }
+
+                    Device (PR12)
+                    {
+                        Name (_ADR, 0x02)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+                    }
+
+                    Device (PR13)
+                    {
+                        Name (_ADR, 0x03)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+                    }
+
+                    Device (PR14)
+                    {
+                        Name (_ADR, 0x04)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xE1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+
+                        Alias (SBV1, SDGV)
+                        Method (_DSM, 4, Serialized)
+                        {
+                            If (LEqual (Arg0, Buffer (0x10)
+                                    {
+                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
+                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
+                                    }))
+                            {
+                                Name (_T_0, Zero)
+                                Store (ToInteger (Arg2), _T_0)
+                                If (LEqual (_T_0, Zero))
+                                {
+                                    If (LEqual (Arg1, One))
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x07
+                                        })
+                                    }
+                                    Else
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x00
+                                        })
+                                    }
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, One))
+                                    {
+                                        If (LEqual (SDGV, 0xFF))
+                                        {
+                                            Return (Zero)
+                                        }
+                                        Else
+                                        {
+                                            Return (One)
+                                        }
+                                    }
+                                    Else
+                                    {
+                                        If (LEqual (_T_0, 0x02))
+                                        {
+                                            Return (SDGV)
+                                        }
+                                    }
+                                }
+                            }
+
+                            Return (Zero)
+                        }
+                    }
+
+                    Device (PR15)
+                    {
+                        Name (_ADR, 0x05)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+
+                        Alias (SBV2, SDGV)
+                        Method (_DSM, 4, Serialized)
+                        {
+                            If (LEqual (Arg0, Buffer (0x10)
+                                    {
+                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
+                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
+                                    }))
+                            {
+                                Name (_T_0, Zero)
+                                Store (ToInteger (Arg2), _T_0)
+                                If (LEqual (_T_0, Zero))
+                                {
+                                    If (LEqual (Arg1, One))
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x07
+                                        })
+                                    }
+                                    Else
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x00
+                                        })
+                                    }
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, One))
+                                    {
+                                        If (LEqual (SDGV, 0xFF))
+                                        {
+                                            Return (Zero)
+                                        }
+                                        Else
+                                        {
+                                            Return (One)
+                                        }
+                                    }
+                                    Else
+                                    {
+                                        If (LEqual (_T_0, 0x02))
+                                        {
+                                            Return (SDGV)
+                                        }
+                                    }
+                                }
+                            }
+
+                            Return (Zero)
+                        }
+                    }
+
+                    Device (PR16)
+                    {
+                        Name (_ADR, 0x06)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+
+                        Alias (SBV1, SDGV)
+                        Method (_DSM, 4, Serialized)
+                        {
+                            If (LEqual (Arg0, Buffer (0x10)
+                                    {
+                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
+                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
+                                    }))
+                            {
+                                Name (_T_0, Zero)
+                                Store (ToInteger (Arg2), _T_0)
+                                If (LEqual (_T_0, Zero))
+                                {
+                                    If (LEqual (Arg1, One))
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x07
+                                        })
+                                    }
+                                    Else
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x00
+                                        })
+                                    }
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, One))
+                                    {
+                                        If (LEqual (SDGV, 0xFF))
+                                        {
+                                            Return (Zero)
+                                        }
+                                        Else
+                                        {
+                                            Return (One)
+                                        }
+                                    }
+                                    Else
+                                    {
+                                        If (LEqual (_T_0, 0x02))
+                                        {
+                                            Return (SDGV)
+                                        }
+                                    }
+                                }
+                            }
+
+                            Return (Zero)
+                        }
+                    }
+
+                    Device (PR17)
+                    {
+                        Name (_ADR, 0x07)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+
+                        Alias (SBV2, SDGV)
+                        Method (_DSM, 4, Serialized)
+                        {
+                            If (LEqual (Arg0, Buffer (0x10)
+                                    {
+                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
+                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
+                                    }))
+                            {
+                                Name (_T_0, Zero)
+                                Store (ToInteger (Arg2), _T_0)
+                                If (LEqual (_T_0, Zero))
+                                {
+                                    If (LEqual (Arg1, One))
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x07
+                                        })
+                                    }
+                                    Else
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x00
+                                        })
+                                    }
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, One))
+                                    {
+                                        If (LEqual (SDGV, 0xFF))
+                                        {
+                                            Return (Zero)
+                                        }
+                                        Else
+                                        {
+                                            Return (One)
+                                        }
+                                    }
+                                    Else
+                                    {
+                                        If (LEqual (_T_0, 0x02))
+                                        {
+                                            Return (SDGV)
+                                        }
+                                    }
+                                }
+                            }
+
+                            Return (Zero)
+                        }
+                    }
+
+                    Device (PR18)
+                    {
+                        Name (_ADR, 0x08)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+                    }
+                }
+            }
+
+            Method (_PRW, 0, NotSerialized)
+            {
+                Return (GPRW (0x0D, 0x04))
+            }
+        }
+
+        Device (EHC2)
+        {
+            Name (_ADR, 0x001A0000)
+            OperationRegion (PWKE, PCI_Config, 0x62, 0x04)
+            Field (PWKE, DWordAcc, NoLock, Preserve)
+            {
+                    ,   1, 
+                PWUC,   6
+            }
+
+            Method (_PSW, 1, NotSerialized)
+            {
+                If (Arg0)
+                {
+                    Store (Ones, PWUC)
+                }
+                Else
+                {
+                    Store (Zero, PWUC)
+                }
+            }
+
+            Method (_S3D, 0, NotSerialized)
+            {
+                Return (0x02)
+            }
+
+            Method (_S4D, 0, NotSerialized)
+            {
+                Return (0x02)
+            }
+
+            Device (HUBN)
+            {
+                Name (_ADR, Zero)
+                Device (PR01)
+                {
+                    Name (_ADR, One)
+                    Method (_UPC, 0, Serialized)
+                    {
+                        Name (UPCA, Package (0x04)
+                        {
+                            0xFF, 
+                            Zero, 
+                            Zero, 
+                            Zero
+                        })
+                        Return (UPCA)
+                    }
+
+                    Method (_PLD, 0, Serialized)
+                    {
+                        Name (PLDP, Package (0x01)
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0x30, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                            }
+                        })
+                        Return (PLDP)
+                    }
+
+                    Device (PR11)
+                    {
+                        Name (_ADR, One)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xE1, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+                    }
+
+                    Device (PR12)
+                    {
+                        Name (_ADR, 0x02)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+
+                        Alias (SBV1, SDGV)
+                        Method (_DSM, 4, Serialized)
+                        {
+                            If (LEqual (Arg0, Buffer (0x10)
+                                    {
+                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
+                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
+                                    }))
+                            {
+                                Name (_T_0, Zero)
+                                Store (ToInteger (Arg2), _T_0)
+                                If (LEqual (_T_0, Zero))
+                                {
+                                    If (LEqual (Arg1, One))
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x07
+                                        })
+                                    }
+                                    Else
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x00
+                                        })
+                                    }
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, One))
+                                    {
+                                        If (LEqual (SDGV, 0xFF))
+                                        {
+                                            Return (Zero)
+                                        }
+                                        Else
+                                        {
+                                            Return (One)
+                                        }
+                                    }
+                                    Else
+                                    {
+                                        If (LEqual (_T_0, 0x02))
+                                        {
+                                            Return (SDGV)
+                                        }
+                                    }
+                                }
+                            }
+
+                            Return (Zero)
+                        }
+                    }
+
+                    Device (PR13)
+                    {
+                        Name (_ADR, 0x03)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+
+                        Alias (SBV2, SDGV)
+                        Method (_DSM, 4, Serialized)
+                        {
+                            If (LEqual (Arg0, Buffer (0x10)
+                                    {
+                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
+                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
+                                    }))
+                            {
+                                Name (_T_0, Zero)
+                                Store (ToInteger (Arg2), _T_0)
+                                If (LEqual (_T_0, Zero))
+                                {
+                                    If (LEqual (Arg1, One))
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x07
+                                        })
+                                    }
+                                    Else
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x00
+                                        })
+                                    }
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, One))
+                                    {
+                                        If (LEqual (SDGV, 0xFF))
+                                        {
+                                            Return (Zero)
+                                        }
+                                        Else
+                                        {
+                                            Return (One)
+                                        }
+                                    }
+                                    Else
+                                    {
+                                        If (LEqual (_T_0, 0x02))
+                                        {
+                                            Return (SDGV)
+                                        }
+                                    }
+                                }
+                            }
+
+                            Return (Zero)
+                        }
+                    }
+
+                    Device (PR14)
+                    {
+                        Name (_ADR, 0x04)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xE1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+                    }
+
+                    Device (PR15)
+                    {
+                        Name (_ADR, 0x05)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+                    }
+
+                    Device (PR16)
+                    {
+                        Name (_ADR, 0x06)
+                        Method (_UPC, 0, Serialized)
+                        {
+                            Name (UPCP, Package (0x04)
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Return (UPCP)
+                        }
+
+                        Method (_PLD, 0, Serialized)
+                        {
+                            Name (PLDP, Package (0x01)
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                }
+                            })
+                            Return (PLDP)
+                        }
+                    }
+                }
+            }
+
+            Method (_PRW, 0, NotSerialized)
+            {
+                Return (GPRW (0x0D, 0x04))
+            }
+        }
+
+        Device (XHC)
+        {
+            Name (_ADR, 0x00140000)
+            OperationRegion (XPRT, PCI_Config, 0xD0, 0x10)
+            Field (XPRT, DWordAcc, NoLock, Preserve)
+            {
+                PR2,    32, 
+                PR2M,   32, 
+                PR3,    32, 
+                PR3M,   32
+            }
+
+            Method (CUID, 1, Serialized)
+            {
+                If (LEqual (Arg0, Buffer (0x10)
+                        {
+                            /* 0000 */    0xA9, 0x12, 0x95, 0x7C, 0x05, 0x17, 0xB4, 0x4C, 
+                            /* 0008 */    0xAF, 0x7D, 0x50, 0x6A, 0x24, 0x23, 0xAB, 0x71
+                        }))
+                {
+                    Return (One)
+                }
+
+                Return (Zero)
+            }
+
+            Method (POSC, 3, Serialized)
+            {
+                CreateDWordField (Arg2, Zero, CDW1)
+                If (LNotEqual (Arg1, One))
+                {
+                    Or (CDW1, 0x08, CDW1)
+                }
+
+                If (LEqual (XHCI, Zero))
+                {
+                    Or (CDW1, 0x02, CDW1)
+                }
+
+                If (LNot (And (CDW1, One)))
+                {
+                    XSEL ()
+                }
+
+                Return (Arg2)
+            }
+
+            Method (XSEL, 0, Serialized)
+            {
+                If (LOr (LEqual (XHCI, 0x02), LEqual (XHCI, 0x03)))
+                {
+                    Store (Zero, Local0)
+                    And (PR3, 0xFFFFFFF0, Local0)
+                    Or (Local0, XHPM, Local0)
+                    And (Local0, PR3M, PR3)
+                    Store (Zero, Local0)
+                    And (PR2, 0xFFFFFFF0, Local0)
+                    Or (Local0, XHPM, Local0)
+                    And (Local0, PR2M, PR2)
+                    Store (One, XUSB)
+                }
+            }
+
+            Method (_S3D, 0, NotSerialized)
+            {
+                Return (0x02)
+            }
+
+            Method (_S4D, 0, NotSerialized)
+            {
+                Return (0x02)
+            }
+
+            Device (RHUB)
+            {
+                Name (_ADR, Zero)
+                Device (HSP1)
+                {
+                    Name (_ADR, One)
+                    Method (_UPC, 0, Serialized)
+                    {
+                        Name (UPCP, Package (0x04)
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        If (LNot (And (PR2, One)))
+                        {
+                            Store (Zero, Index (UPCP, Zero))
+                        }
+
+                        Return (UPCP)
+                    }
+
+                    Method (_PLD, 0, Serialized)
+                    {
+                        Name (PLDP, Package (0x01)
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0x69, 0x0C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
+                            }
+                        })
+                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
+                        If (LNot (And (PR2, One)))
+                        {
+                            And (VIS, Zero, VIS)
+                        }
+
+                        Return (PLDP)
+                    }
+                }
+
+                Device (HSP2)
+                {
+                    Name (_ADR, 0x02)
+                    Method (_UPC, 0, Serialized)
+                    {
+                        Name (UPCP, Package (0x04)
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        If (LNot (And (PR2, 0x02)))
+                        {
+                            Store (Zero, Index (UPCP, Zero))
+                        }
+
+                        Return (UPCP)
+                    }
+
+                    Method (_PLD, 0, Serialized)
+                    {
+                        Name (PLDP, Package (0x01)
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0x69, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
+                            }
+                        })
+                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
+                        If (LNot (And (PR2, 0x02)))
+                        {
+                            And (VIS, Zero, VIS)
+                        }
+
+                        Return (PLDP)
+                    }
+                }
+
+                Device (HSP3)
+                {
+                    Name (_ADR, 0x03)
+                    Method (_UPC, 0, Serialized)
+                    {
+                        Name (UPCP, Package (0x04)
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        If (LNot (And (PR2, 0x04)))
+                        {
+                            Store (Zero, Index (UPCP, Zero))
+                        }
+
+                        Return (UPCP)
+                    }
+
+                    Method (_PLD, 0, Serialized)
+                    {
+                        Name (PLDP, Package (0x01)
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0x69, 0x0C, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00
+                            }
+                        })
+                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
+                        If (LNot (And (PR2, 0x04)))
+                        {
+                            And (VIS, Zero, VIS)
+                        }
+
+                        Return (PLDP)
+                    }
+                }
+
+                Device (HSP4)
+                {
+                    Name (_ADR, 0x04)
+                    Method (_UPC, 0, Serialized)
+                    {
+                        Name (UPCP, Package (0x04)
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        If (LNot (And (PR2, 0x08)))
+                        {
+                            Store (Zero, Index (UPCP, Zero))
+                        }
+
+                        Return (UPCP)
+                    }
+
+                    Method (_PLD, 0, Serialized)
+                    {
+                        Name (PLDP, Package (0x01)
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0x69, 0x0C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+                            }
+                        })
+                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
+                        If (LNot (And (PR2, 0x08)))
+                        {
+                            And (VIS, Zero, VIS)
+                        }
+
+                        Return (PLDP)
+                    }
+                }
+
+                Device (SSP1)
+                {
+                    Name (_ADR, 0x05)
+                    Method (_UPC, 0, Serialized)
+                    {
+                        Name (UPCP, Package (0x04)
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        If (LNot (And (PR3, One)))
+                        {
+                            Store (Zero, Index (UPCP, Zero))
+                        }
+
+                        Return (UPCP)
+                    }
+
+                    Method (_PLD, 0, Serialized)
+                    {
+                        Name (PLDP, Package (0x01)
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0x69, 0x0C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
+                            }
+                        })
+                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
+                        If (LNot (And (PR3, One)))
+                        {
+                            And (VIS, Zero, VIS)
+                        }
+
+                        Return (PLDP)
+                    }
+                }
+
+                Device (SSP2)
+                {
+                    Name (_ADR, 0x06)
+                    Method (_UPC, 0, Serialized)
+                    {
+                        Name (UPCP, Package (0x04)
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        If (LNot (And (PR3, 0x02)))
+                        {
+                            Store (Zero, Index (UPCP, Zero))
+                        }
+
+                        Return (UPCP)
+                    }
+
+                    Method (_PLD, 0, Serialized)
+                    {
+                        Name (PLDP, Package (0x01)
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0x69, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
+                            }
+                        })
+                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
+                        If (LNot (And (PR3, 0x02)))
+                        {
+                            And (VIS, Zero, VIS)
+                        }
+
+                        Return (PLDP)
+                    }
+                }
+
+                Device (SSP3)
+                {
+                    Name (_ADR, 0x07)
+                    Method (_UPC, 0, Serialized)
+                    {
+                        Name (UPCP, Package (0x04)
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        If (LNot (And (PR3, 0x04)))
+                        {
+                            Store (Zero, Index (UPCP, Zero))
+                        }
+
+                        Return (UPCP)
+                    }
+
+                    Method (_PLD, 0, Serialized)
+                    {
+                        Name (PLDP, Package (0x01)
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0x69, 0x0C, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00
+                            }
+                        })
+                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
+                        If (LNot (And (PR3, 0x04)))
+                        {
+                            And (VIS, Zero, VIS)
+                        }
+
+                        Return (PLDP)
+                    }
+                }
+
+                Device (SSP4)
+                {
+                    Name (_ADR, 0x08)
+                    Method (_UPC, 0, Serialized)
+                    {
+                        Name (UPCP, Package (0x04)
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        If (LNot (And (PR3, 0x08)))
+                        {
+                            Store (Zero, Index (UPCP, Zero))
+                        }
+
+                        Return (UPCP)
+                    }
+
+                    Method (_PLD, 0, Serialized)
+                    {
+                        Name (PLDP, Package (0x01)
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                                /* 0008 */    0x69, 0x0C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+                            }
+                        })
+                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
+                        If (LNot (And (PR3, 0x08)))
+                        {
+                            And (VIS, Zero, VIS)
+                        }
+
+                        Return (PLDP)
+                    }
+                }
+            }
+
+            Method (_PRW, 0, NotSerialized)
+            {
+                Return (GPRW (0x0D, 0x04))
+            }
+        }
+
+        Device (HDEF)
+        {
+            Name (_ADR, 0x001B0000)
+            OperationRegion (HDAR, PCI_Config, 0x4C, 0x10)
+            Field (HDAR, WordAcc, NoLock, Preserve)
+            {
+                DCKA,   1, 
+                        Offset (0x01), 
+                DCKM,   1, 
+                    ,   6, 
+                DCKS,   1, 
+                        Offset (0x08), 
+                    ,   15, 
+                PMES,   1
+            }
+
+            Method (_PRW, 0, NotSerialized)
+            {
+                Return (GPRW (0x0D, 0x04))
+            }
+        }
+
+        Device (SAT0)
+        {
+            Name (_ADR, 0x001F0002)
+        }
+
+        Device (SAT1)
+        {
+            Name (_ADR, 0x001F0005)
+        }
+
+        Device (SBUS)
+        {
+            Name (_ADR, 0x001F0003)
+            OperationRegion (SMBP, PCI_Config, 0x40, 0xC0)
+            Field (SMBP, DWordAcc, NoLock, Preserve)
+            {
+                    ,   2, 
+                I2CE,   1
+            }
+
+            OperationRegion (SMPB, PCI_Config, 0x20, 0x04)
+            Field (SMPB, DWordAcc, NoLock, Preserve)
+            {
+                    ,   5, 
+                SBAR,   11
+            }
+
+            OperationRegion (SMBI, SystemIO, ShiftLeft (SBAR, 0x05), 0x10)
+            Field (SMBI, ByteAcc, NoLock, Preserve)
+            {
+                HSTS,   8, 
+                        Offset (0x02), 
+                HCON,   8, 
+                HCOM,   8, 
+                TXSA,   8, 
+                DAT0,   8, 
+                DAT1,   8, 
+                HBDR,   8, 
+                PECR,   8, 
+                RXSA,   8, 
+                SDAT,   16
+            }
+
+            Method (SSXB, 2, Serialized)
+            {
+                If (STRT ())
+                {
+                    Return (Zero)
+                }
+
+                Store (Zero, I2CE)
+                Store (0xBF, HSTS)
+                Store (Arg0, TXSA)
+                Store (Arg1, HCOM)
+                Store (0x48, HCON)
+                If (COMP ())
+                {
+                    Or (HSTS, 0xFF, HSTS)
+                    Return (One)
+                }
+
+                Return (Zero)
+            }
+
+            Method (SRXB, 1, Serialized)
+            {
+                If (STRT ())
+                {
+                    Return (0xFFFF)
+                }
+
+                Store (Zero, I2CE)
+                Store (0xBF, HSTS)
+                Store (Or (Arg0, One), TXSA)
+                Store (0x44, HCON)
+                If (COMP ())
+                {
+                    Or (HSTS, 0xFF, HSTS)
+                    Return (DAT0)
+                }
+
+                Return (0xFFFF)
+            }
+
+            Method (SWRB, 3, Serialized)
+            {
+                If (STRT ())
+                {
+                    Return (Zero)
+                }
+
+                Store (Zero, I2CE)
+                Store (0xBF, HSTS)
+                Store (Arg0, TXSA)
+                Store (Arg1, HCOM)
+                Store (Arg2, DAT0)
+                Store (0x48, HCON)
+                If (COMP ())
+                {
+                    Or (HSTS, 0xFF, HSTS)
+                    Return (One)
+                }
+
+                Return (Zero)
+            }
+
+            Method (SRDB, 2, Serialized)
+            {
+                If (STRT ())
+                {
+                    Return (0xFFFF)
+                }
+
+                Store (Zero, I2CE)
+                Store (0xBF, HSTS)
+                Store (Or (Arg0, One), TXSA)
+                Store (Arg1, HCOM)
+                Store (0x48, HCON)
+                If (COMP ())
+                {
+                    Or (HSTS, 0xFF, HSTS)
+                    Return (DAT0)
+                }
+
+                Return (0xFFFF)
+            }
+
+            Method (SWRW, 3, Serialized)
+            {
+                If (STRT ())
+                {
+                    Return (Zero)
+                }
+
+                Store (Zero, I2CE)
+                Store (0xBF, HSTS)
+                Store (Arg0, TXSA)
+                Store (Arg1, HCOM)
+                And (Arg2, 0xFF, DAT1)
+                And (ShiftRight (Arg2, 0x08), 0xFF, DAT0)
+                Store (0x4C, HCON)
+                If (COMP ())
+                {
+                    Or (HSTS, 0xFF, HSTS)
+                    Return (One)
+                }
+
+                Return (Zero)
+            }
+
+            Method (SRDW, 2, Serialized)
+            {
+                If (STRT ())
+                {
+                    Return (0xFFFF)
+                }
+
+                Store (Zero, I2CE)
+                Store (0xBF, HSTS)
+                Store (Or (Arg0, One), TXSA)
+                Store (Arg1, HCOM)
+                Store (0x4C, HCON)
+                If (COMP ())
+                {
+                    Or (HSTS, 0xFF, HSTS)
+                    Return (Or (ShiftLeft (DAT0, 0x08), DAT1))
+                }
+
+                Return (0xFFFFFFFF)
+            }
+
+            Method (SBLW, 4, Serialized)
+            {
+                If (STRT ())
+                {
+                    Return (Zero)
+                }
+
+                Store (Arg3, I2CE)
+                Store (0xBF, HSTS)
+                Store (Arg0, TXSA)
+                Store (Arg1, HCOM)
+                Store (SizeOf (Arg2), DAT0)
+                Store (Zero, Local1)
+                Store (DerefOf (Index (Arg2, Zero)), HBDR)
+                Store (0x54, HCON)
+                While (LGreater (SizeOf (Arg2), Local1))
+                {
+                    Store (0x0FA0, Local0)
+                    While (LAnd (LNot (And (HSTS, 0x80)), Local0))
+                    {
+                        Decrement (Local0)
+                        Stall (0x32)
+                    }
+
+                    If (LNot (Local0))
+                    {
+                        KILL ()
+                        Return (Zero)
+                    }
+
+                    Store (0x80, HSTS)
+                    Increment (Local1)
+                    If (LGreater (SizeOf (Arg2), Local1))
+                    {
+                        Store (DerefOf (Index (Arg2, Local1)), HBDR)
+                    }
+                }
+
+                If (COMP ())
+                {
+                    Or (HSTS, 0xFF, HSTS)
+                    Return (One)
+                }
+
+                Return (Zero)
+            }
+
+            Method (SBLR, 3, Serialized)
+            {
+                Name (TBUF, Buffer (0x0100) {})
+                If (STRT ())
+                {
+                    Return (Zero)
+                }
+
+                Store (Arg2, I2CE)
+                Store (0xBF, HSTS)
+                Store (Or (Arg0, One), TXSA)
+                Store (Arg1, HCOM)
+                Store (0x54, HCON)
+                Store (0x0FA0, Local0)
+                While (LAnd (LNot (And (HSTS, 0x80)), Local0))
+                {
+                    Decrement (Local0)
+                    Stall (0x32)
+                }
+
+                If (LNot (Local0))
+                {
+                    KILL ()
+                    Return (Zero)
+                }
+
+                Store (DAT0, Index (TBUF, Zero))
+                Store (0x80, HSTS)
+                Store (One, Local1)
+                While (LLess (Local1, DerefOf (Index (TBUF, Zero))))
+                {
+                    Store (0x0FA0, Local0)
+                    While (LAnd (LNot (And (HSTS, 0x80)), Local0))
+                    {
+                        Decrement (Local0)
+                        Stall (0x32)
+                    }
+
+                    If (LNot (Local0))
+                    {
+                        KILL ()
+                        Return (Zero)
+                    }
+
+                    Store (HBDR, Index (TBUF, Local1))
+                    Store (0x80, HSTS)
+                    Increment (Local1)
+                }
+
+                If (COMP ())
+                {
+                    Or (HSTS, 0xFF, HSTS)
+                    Return (TBUF)
+                }
+
+                Return (Zero)
+            }
+
+            Method (STRT, 0, Serialized)
+            {
+                Store (0xC8, Local0)
+                While (Local0)
+                {
+                    If (And (HSTS, 0x40))
+                    {
+                        Decrement (Local0)
+                        Sleep (One)
+                        If (LEqual (Local0, Zero))
+                        {
+                            Return (One)
+                        }
+                    }
+                    Else
+                    {
+                        Store (Zero, Local0)
+                    }
+                }
+
+                Store (0x0FA0, Local0)
+                While (Local0)
+                {
+                    If (And (HSTS, One))
+                    {
+                        Decrement (Local0)
+                        Stall (0x32)
+                        If (LEqual (Local0, Zero))
+                        {
+                            KILL ()
+                        }
+                    }
+                    Else
+                    {
+                        Return (Zero)
+                    }
+                }
+
+                Return (One)
+            }
+
+            Method (COMP, 0, Serialized)
+            {
+                Store (0x0FA0, Local0)
+                While (Local0)
+                {
+                    If (And (HSTS, 0x02))
+                    {
+                        Return (One)
+                    }
+                    Else
+                    {
+                        Decrement (Local0)
+                        Stall (0x32)
+                        If (LEqual (Local0, Zero))
+                        {
+                            KILL ()
+                        }
+                    }
+                }
+
+                Return (Zero)
+            }
+
+            Method (KILL, 0, Serialized)
+            {
+                Or (HCON, 0x02, HCON)
+                Or (HSTS, 0xFF, HSTS)
+            }
+        }
+    }
+
+    Scope (_SB.PCI0.LPCB)
+    {
+        OperationRegion (CPSB, SystemMemory, 0xDCBC5F98, 0x10)
+        Field (CPSB, AnyAcc, NoLock, Preserve)
+        {
+            RTCX,   1, 
+            SBB0,   7, 
+            SBB1,   8, 
+            SBB2,   8, 
+            SBB3,   8, 
+            SBB4,   8, 
+            SBB5,   8, 
+            SBB6,   8, 
+            SBB7,   8, 
+            SBB8,   8, 
+            SBB9,   8, 
+            SBBA,   8, 
+            SBBB,   8, 
+            SBBC,   8, 
+            SBBD,   8, 
+            SBBE,   8, 
+            SBBF,   8
+        }
+
+        Method (SPTS, 1, NotSerialized)
+        {
+            Store (One, SLPX)
+            Store (One, SLPE)
+        }
+
+        Method (SWAK, 1, NotSerialized)
+        {
+            Store (Zero, SLPE)
+            If (RTCX) {}
+            Else
+            {
+                Notify (PWRB, 0x02)
+            }
+        }
+
+        OperationRegion (SMIE, SystemIO, PMBS, 0x04)
+        Field (SMIE, ByteAcc, NoLock, Preserve)
+        {
+                ,   10, 
+            RTCS,   1, 
+                ,   3, 
+            PEXS,   1, 
+            WAKS,   1, 
+                    Offset (0x03), 
+            PWBT,   1, 
+                    Offset (0x04)
+        }
+
+        OperationRegion (SLPR, SystemIO, SMCR, 0x08)
+        Field (SLPR, ByteAcc, NoLock, Preserve)
+        {
+                ,   4, 
+            SLPE,   1, 
+                ,   31, 
+            SLPX,   1, 
+                    Offset (0x08)
+        }
+    }
+
+    Scope (_SB.PCI0.RP01)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.RP02)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.RP03)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.RP04)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.RP05)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.RP06)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.RP07)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.RP08)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    OperationRegion (_SB.PCI0.LPCB.LPCR, PCI_Config, 0x80, 0x04)
+    Field (\_SB.PCI0.LPCB.LPCR, ByteAcc, NoLock, Preserve)
+    {
+        CADR,   3, 
+            ,   1, 
+        CBDR,   3, 
+                Offset (0x01), 
+        LTDR,   2, 
+            ,   2, 
+        FDDR,   1, 
+                Offset (0x02), 
+        CALE,   1, 
+        CBLE,   1, 
+        LTLE,   1, 
+        FDLE,   1, 
+                Offset (0x03), 
+        GLLE,   1, 
+        GHLE,   1, 
+        KCLE,   1, 
+        MCLE,   1, 
+        C1LE,   1, 
+        C2LE,   1, 
+                Offset (0x04)
+    }
+
+    Method (UXDV, 1, NotSerialized)
+    {
+        Store (0xFF, Local0)
+        Name (_T_0, Zero)
+        Store (Add (Arg0, Zero), _T_0)
+        If (LEqual (_T_0, 0x03F8))
+        {
+            Store (Zero, Local0)
+        }
+        Else
+        {
+            If (LEqual (_T_0, 0x02F8))
+            {
+                Store (One, Local0)
+            }
+            Else
+            {
+                If (LEqual (_T_0, 0x0220))
+                {
+                    Store (0x02, Local0)
+                }
+                Else
+                {
+                    If (LEqual (_T_0, 0x0228))
+                    {
+                        Store (0x03, Local0)
+                    }
+                    Else
+                    {
+                        If (LEqual (_T_0, 0x0238))
+                        {
+                            Store (0x04, Local0)
+                        }
+                        Else
+                        {
+                            If (LEqual (_T_0, 0x02E8))
+                            {
+                                Store (0x05, Local0)
+                            }
+                            Else
+                            {
+                                If (LEqual (_T_0, 0x0338))
+                                {
+                                    Store (0x06, Local0)
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, 0x03E8))
+                                    {
+                                        Store (0x07, Local0)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Return (Local0)
+    }
+
+    Method (RRIO, 4, NotSerialized)
+    {
+        Name (_T_0, Zero)
+        Store (Add (Arg0, Zero), _T_0)
+        If (LEqual (_T_0, Zero))
+        {
+            Store (Zero, CALE)
+            Store (UXDV (Arg2), Local0)
+            If (LNotEqual (Local0, 0xFF))
+            {
+                Store (Local0, CADR)
+            }
+
+            If (Arg1)
+            {
+                Store (One, CALE)
+            }
+        }
+        Else
+        {
+            If (LEqual (_T_0, One))
+            {
+                Store (Zero, CBLE)
+                Store (UXDV (Arg2), Local0)
+                If (LNotEqual (Local0, 0xFF))
+                {
+                    Store (Local0, CBDR)
+                }
+
+                If (Arg1)
+                {
+                    Store (One, CBLE)
+                }
+            }
+            Else
+            {
+                If (LEqual (_T_0, 0x02))
+                {
+                    Store (Zero, LTLE)
+                    If (LEqual (Arg2, 0x0378))
+                    {
+                        Store (Zero, LTDR)
+                    }
+
+                    If (LEqual (Arg2, 0x0278))
+                    {
+                        Store (One, LTDR)
+                    }
+
+                    If (LEqual (Arg2, 0x03BC))
+                    {
+                        Store (0x02, LTDR)
+                    }
+
+                    If (Arg1)
+                    {
+                        Store (One, LTLE)
+                    }
+                }
+                Else
+                {
+                    If (LEqual (_T_0, 0x03))
+                    {
+                        Store (Zero, FDLE)
+                        If (LEqual (Arg2, 0x03F0))
+                        {
+                            Store (Zero, FDDR)
+                        }
+
+                        If (LEqual (Arg2, 0x0370))
+                        {
+                            Store (One, FDDR)
+                        }
+
+                        If (Arg1)
+                        {
+                            Store (One, FDLE)
+                        }
+                    }
+                    Else
+                    {
+                        If (LEqual (_T_0, 0x08))
+                        {
+                            If (LEqual (Arg2, 0x0200))
+                            {
+                                If (Arg1)
+                                {
+                                    Store (One, GLLE)
+                                }
+                                Else
+                                {
+                                    Store (Zero, GLLE)
+                                }
+                            }
+
+                            If (LEqual (Arg2, 0x0208))
+                            {
+                                If (Arg1)
+                                {
+                                    Store (One, GHLE)
+                                }
+                                Else
+                                {
+                                    Store (Zero, GHLE)
+                                }
+                            }
+                        }
+                        Else
+                        {
+                            If (LEqual (_T_0, 0x09))
+                            {
+                                If (LEqual (Arg2, 0x0200))
+                                {
+                                    If (Arg1)
+                                    {
+                                        Store (One, GLLE)
+                                    }
+                                    Else
+                                    {
+                                        Store (Zero, GLLE)
+                                    }
+                                }
+
+                                If (LEqual (Arg2, 0x0208))
+                                {
+                                    If (Arg1)
+                                    {
+                                        Store (One, GHLE)
+                                    }
+                                    Else
+                                    {
+                                        Store (Zero, GHLE)
+                                    }
+                                }
+                            }
+                            Else
+                            {
+                                If (LEqual (_T_0, 0x0A))
+                                {
+                                    If (LOr (LEqual (Arg2, 0x60), LEqual (Arg2, 0x64)))
+                                    {
+                                        If (Arg1)
+                                        {
+                                            Store (One, KCLE)
+                                        }
+                                        Else
+                                        {
+                                            Store (Zero, KCLE)
+                                        }
+                                    }
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, 0x0B))
+                                    {
+                                        If (LOr (LEqual (Arg2, 0x62), LEqual (Arg2, 0x66)))
+                                        {
+                                            If (Arg1)
+                                            {
+                                                Store (One, MCLE)
+                                            }
+                                            Else
+                                            {
+                                                Store (Zero, MCLE)
+                                            }
+                                        }
+                                    }
+                                    Else
+                                    {
+                                        If (LEqual (_T_0, 0x0C))
+                                        {
+                                            If (LEqual (Arg2, 0x2E))
+                                            {
+                                                If (Arg1)
+                                                {
+                                                    Store (One, C1LE)
+                                                }
+                                                Else
+                                                {
+                                                    Store (Zero, C1LE)
+                                                }
+                                            }
+
+                                            If (LEqual (Arg2, 0x4E))
+                                            {
+                                                If (Arg1)
+                                                {
+                                                    Store (One, C2LE)
+                                                }
+                                                Else
+                                                {
+                                                    Store (Zero, C2LE)
+                                                }
+                                            }
+                                        }
+                                        Else
+                                        {
+                                            If (LEqual (_T_0, 0x0D))
+                                            {
+                                                If (LEqual (Arg2, 0x2E))
+                                                {
+                                                    If (Arg1)
+                                                    {
+                                                        Store (One, C1LE)
+                                                    }
+                                                    Else
+                                                    {
+                                                        Store (Zero, C1LE)
+                                                    }
+                                                }
+
+                                                If (LEqual (Arg2, 0x4E))
+                                                {
+                                                    If (Arg1)
+                                                    {
+                                                        Store (One, C2LE)
+                                                    }
+                                                    Else
+                                                    {
+                                                        Store (Zero, C2LE)
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Method (RDMA, 3, NotSerialized)
+    {
+    }
+
+    Scope (_SB.PCI0)
+    {
+        Method (NPTS, 1, NotSerialized)
+        {
+        }
+
+        Method (NWAK, 1, NotSerialized)
+        {
+        }
+    }
+
+    Scope (_SB.PCI0.PEG0)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.PEG0.PEGP)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.PEG1)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.PEG2)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0.PEG3)
+    {
+        Method (_PRW, 0, NotSerialized)
+        {
+            Return (GPRW (0x09, 0x04))
+        }
+    }
+
+    Scope (_SB.PCI0)
+    {
+        Device (GFX0)
+        {
+            Name (_ADR, 0x00020000)
+            Method (PCPC, 0, NotSerialized)
+            {
+                If (ECON)
+                {
+                    Store (0x02, ^^LPCB.H_EC.SLPC)
+                }
+
+                ECST (0x6F)
+            }
+
+            Method (PAPR, 0, NotSerialized)
+            {
+                If (ECON)
+                {
+                    Return (Divide (^^LPCB.H_EC.MCAP, 0x64, ))
+                }
+                Else
+                {
+                    Return (Zero)
+                }
+            }
+
+            Method (_DOS, 1, NotSerialized)
+            {
+                Store (And (Arg0, 0x07), DSEN)
+                If (LEqual (And (Arg0, 0x03), Zero))
+                {
+                    If (CondRefOf (HDOS))
+                    {
+                        HDOS ()
+                    }
+                }
+            }
+
+            Method (_DOD, 0, NotSerialized)
+            {
+                If (CondRefOf (IDAB))
+                {
+                    IDAB ()
+                }
+                Else
+                {
+                    Store (Zero, NDID)
+                    If (LNotEqual (DIDL, Zero))
+                    {
+                        Store (SDDL (DIDL), DID1)
+                    }
+
+                    If (LNotEqual (DDL2, Zero))
+                    {
+                        Store (SDDL (DDL2), DID2)
+                    }
+
+                    If (LNotEqual (DDL3, Zero))
+                    {
+                        Store (SDDL (DDL3), DID3)
+                    }
+
+                    If (LNotEqual (DDL4, Zero))
+                    {
+                        Store (SDDL (DDL4), DID4)
+                    }
+
+                    If (LNotEqual (DDL5, Zero))
+                    {
+                        Store (SDDL (DDL5), DID5)
+                    }
+
+                    If (LNotEqual (DDL6, Zero))
+                    {
+                        Store (SDDL (DDL6), DID6)
+                    }
+
+                    If (LNotEqual (DDL7, Zero))
+                    {
+                        Store (SDDL (DDL7), DID7)
+                    }
+
+                    If (LNotEqual (DDL8, Zero))
+                    {
+                        Store (SDDL (DDL8), DID8)
+                    }
+                }
+
+                If (LEqual (NDID, One))
+                {
+                    Name (TMP1, Package (0x01)
+                    {
+                        0xFFFFFFFF
+                    })
+                    Store (Or (0x00010000, DID1), Index (TMP1, Zero))
+                    Return (TMP1)
+                }
+
+                If (LEqual (NDID, 0x02))
+                {
+                    Name (TMP2, Package (0x02)
+                    {
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF
+                    })
+                    Store (Or (0x00010000, DID1), Index (TMP2, Zero))
+                    Store (Or (0x00010000, DID2), Index (TMP2, One))
+                    Return (TMP2)
+                }
+
+                If (LEqual (NDID, 0x03))
+                {
+                    Name (TMP3, Package (0x03)
+                    {
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF
+                    })
+                    Store (Or (0x00010000, DID1), Index (TMP3, Zero))
+                    Store (Or (0x00010000, DID2), Index (TMP3, One))
+                    Store (Or (0x00010000, DID3), Index (TMP3, 0x02))
+                    Return (TMP3)
+                }
+
+                If (LEqual (NDID, 0x04))
+                {
+                    Name (TMP4, Package (0x04)
+                    {
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF
+                    })
+                    Store (Or (0x00010000, DID1), Index (TMP4, Zero))
+                    Store (Or (0x00010000, DID2), Index (TMP4, One))
+                    Store (Or (0x00010000, DID3), Index (TMP4, 0x02))
+                    Store (Or (0x00010000, DID4), Index (TMP4, 0x03))
+                    Return (TMP4)
+                }
+
+                If (LEqual (NDID, 0x05))
+                {
+                    Name (TMP5, Package (0x05)
+                    {
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF
+                    })
+                    Store (Or (0x00010000, DID1), Index (TMP5, Zero))
+                    Store (Or (0x00010000, DID2), Index (TMP5, One))
+                    Store (Or (0x00010000, DID3), Index (TMP5, 0x02))
+                    Store (Or (0x00010000, DID4), Index (TMP5, 0x03))
+                    Store (Or (0x00010000, DID5), Index (TMP5, 0x04))
+                    Return (TMP5)
+                }
+
+                If (LEqual (NDID, 0x06))
+                {
+                    Name (TMP6, Package (0x06)
+                    {
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF
+                    })
+                    Store (Or (0x00010000, DID1), Index (TMP6, Zero))
+                    Store (Or (0x00010000, DID2), Index (TMP6, One))
+                    Store (Or (0x00010000, DID3), Index (TMP6, 0x02))
+                    Store (Or (0x00010000, DID4), Index (TMP6, 0x03))
+                    Store (Or (0x00010000, DID5), Index (TMP6, 0x04))
+                    Store (Or (0x00010000, DID6), Index (TMP6, 0x05))
+                    Return (TMP6)
+                }
+
+                If (LEqual (NDID, 0x07))
+                {
+                    Name (TMP7, Package (0x07)
+                    {
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF
+                    })
+                    Store (Or (0x00010000, DID1), Index (TMP7, Zero))
+                    Store (Or (0x00010000, DID2), Index (TMP7, One))
+                    Store (Or (0x00010000, DID3), Index (TMP7, 0x02))
+                    Store (Or (0x00010000, DID4), Index (TMP7, 0x03))
+                    Store (Or (0x00010000, DID5), Index (TMP7, 0x04))
+                    Store (Or (0x00010000, DID6), Index (TMP7, 0x05))
+                    Store (Or (0x00010000, DID7), Index (TMP7, 0x06))
+                    Return (TMP7)
+                }
+
+                If (LEqual (NDID, 0x08))
+                {
+                    Name (TMP8, Package (0x08)
+                    {
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF, 
+                        0xFFFFFFFF
+                    })
+                    Store (Or (0x00010000, DID1), Index (TMP8, Zero))
+                    Store (Or (0x00010000, DID2), Index (TMP8, One))
+                    Store (Or (0x00010000, DID3), Index (TMP8, 0x02))
+                    Store (Or (0x00010000, DID4), Index (TMP8, 0x03))
+                    Store (Or (0x00010000, DID5), Index (TMP8, 0x04))
+                    Store (Or (0x00010000, DID6), Index (TMP8, 0x05))
+                    Store (Or (0x00010000, DID7), Index (TMP8, 0x06))
+                    Store (Or (0x00010000, DID8), Index (TMP8, 0x07))
+                    Return (TMP8)
+                }
+
+                If (LEqual (NDID, 0x09))
+                {
+                    If (CondRefOf (HWID))
+                    {
+                        Return (HWID)
+                    }
+                }
+
+                Return (Package (0x01)
+                {
+                    0x0400
+                })
+            }
+
+            Device (DD01)
+            {
+                Method (_ADR, 0, Serialized)
+                {
+                    If (LEqual (DID1, Zero))
+                    {
+                        Return (One)
+                    }
+                    Else
+                    {
+                        Return (And (0xFFFF, DID1))
+                    }
+                }
+
+                Method (_DCS, 0, NotSerialized)
+                {
+                    Return (CDDS (DID1))
+                }
+
+                Method (_DGS, 0, NotSerialized)
+                {
+                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
+                        )))
+                    {
+                        Return (NXD1)
+                    }
+
+                    Return (NDDS (DID1))
+                }
+
+                Method (_DSS, 1, NotSerialized)
+                {
+                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
+                    {
+                        Store (NSTE, CSTE)
+                    }
+                }
+            }
+
+            Device (DD02)
+            {
+                Method (_ADR, 0, Serialized)
+                {
+                    If (LEqual (DID2, Zero))
+                    {
+                        Return (0x02)
+                    }
+                    Else
+                    {
+                        Return (And (0xFFFF, DID2))
+                    }
+                }
+
+                Method (_DCS, 0, NotSerialized)
+                {
+                    If (LEqual (LIDS, Zero))
+                    {
+                        Return (Zero)
+                    }
+
+                    Return (CDDS (DID2))
+                }
+
+                Method (_DGS, 0, NotSerialized)
+                {
+                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
+                        )))
+                    {
+                        Return (NXD2)
+                    }
+
+                    Return (NDDS (DID2))
+                }
+
+                Method (_DSS, 1, NotSerialized)
+                {
+                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
+                    {
+                        Store (NSTE, CSTE)
+                    }
+                }
+
+                Method (_BCL, 0, NotSerialized)
+                {
+                    Return (Package (0x17)
+                    {
+                        0x50, 
+                        0x32, 
+                        Zero, 
+                        0x05, 
+                        0x0A, 
+                        0x0F, 
+                        0x14, 
+                        0x19, 
+                        0x1E, 
+                        0x23, 
+                        0x28, 
+                        0x2D, 
+                        0x32, 
+                        0x37, 
+                        0x3C, 
+                        0x41, 
+                        0x46, 
+                        0x4B, 
+                        0x50, 
+                        0x55, 
+                        0x5A, 
+                        0x5F, 
+                        0x64
+                    })
+                }
+
+                Method (_BCM, 1, NotSerialized)
+                {
+                    If (LAnd (LGreaterEqual (Arg0, Zero), LLessEqual (Arg0, 0x64)))
+                    {
+                        AINT (One, Arg0)
+                        Store (Arg0, BRTL)
+                    }
+                }
+
+                Method (_BQC, 0, NotSerialized)
+                {
+                    Return (BRTL)
+                }
+            }
+
+            Device (DD03)
+            {
+                Method (_ADR, 0, Serialized)
+                {
+                    If (LEqual (DID3, Zero))
+                    {
+                        Return (0x03)
+                    }
+                    Else
+                    {
+                        Return (And (0xFFFF, DID3))
+                    }
+                }
+
+                Method (_DCS, 0, NotSerialized)
+                {
+                    If (LEqual (DID3, Zero))
+                    {
+                        Return (0x0B)
+                    }
+                    Else
+                    {
+                        Return (CDDS (DID3))
+                    }
+                }
+
+                Method (_DGS, 0, NotSerialized)
+                {
+                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
+                        )))
+                    {
+                        Return (NXD3)
+                    }
+
+                    Return (NDDS (DID3))
+                }
+
+                Method (_DSS, 1, NotSerialized)
+                {
+                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
+                    {
+                        Store (NSTE, CSTE)
+                    }
+                }
+            }
+
+            Device (DD04)
+            {
+                Method (_ADR, 0, Serialized)
+                {
+                    If (LEqual (DID4, Zero))
+                    {
+                        Return (0x04)
+                    }
+                    Else
+                    {
+                        Return (And (0xFFFF, DID4))
+                    }
+                }
+
+                Method (_DCS, 0, NotSerialized)
+                {
+                    If (LEqual (DID4, Zero))
+                    {
+                        Return (0x0B)
+                    }
+                    Else
+                    {
+                        Return (CDDS (DID4))
+                    }
+                }
+
+                Method (_DGS, 0, NotSerialized)
+                {
+                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
+                        )))
+                    {
+                        Return (NXD4)
+                    }
+
+                    Return (NDDS (DID4))
+                }
+
+                Method (_DSS, 1, NotSerialized)
+                {
+                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
+                    {
+                        Store (NSTE, CSTE)
+                    }
+                }
+            }
+
+            Device (DD05)
+            {
+                Method (_ADR, 0, Serialized)
+                {
+                    If (LEqual (DID5, Zero))
+                    {
+                        Return (0x05)
+                    }
+                    Else
+                    {
+                        Return (And (0xFFFF, DID5))
+                    }
+                }
+
+                Method (_DCS, 0, NotSerialized)
+                {
+                    If (LEqual (DID5, Zero))
+                    {
+                        Return (0x0B)
+                    }
+                    Else
+                    {
+                        Return (CDDS (DID5))
+                    }
+                }
+
+                Method (_DGS, 0, NotSerialized)
+                {
+                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
+                        )))
+                    {
+                        Return (NXD5)
+                    }
+
+                    Return (NDDS (DID5))
+                }
+
+                Method (_DSS, 1, NotSerialized)
+                {
+                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
+                    {
+                        Store (NSTE, CSTE)
+                    }
+                }
+            }
+
+            Device (DD06)
+            {
+                Method (_ADR, 0, Serialized)
+                {
+                    If (LEqual (DID6, Zero))
+                    {
+                        Return (0x06)
+                    }
+                    Else
+                    {
+                        Return (And (0xFFFF, DID6))
+                    }
+                }
+
+                Method (_DCS, 0, NotSerialized)
+                {
+                    If (LEqual (DID6, Zero))
+                    {
+                        Return (0x0B)
+                    }
+                    Else
+                    {
+                        Return (CDDS (DID6))
+                    }
+                }
+
+                Method (_DGS, 0, NotSerialized)
+                {
+                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
+                        )))
+                    {
+                        Return (NXD6)
+                    }
+
+                    Return (NDDS (DID6))
+                }
+
+                Method (_DSS, 1, NotSerialized)
+                {
+                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
+                    {
+                        Store (NSTE, CSTE)
+                    }
+                }
+            }
+
+            Device (DD07)
+            {
+                Method (_ADR, 0, Serialized)
+                {
+                    If (LEqual (DID7, Zero))
+                    {
+                        Return (0x07)
+                    }
+                    Else
+                    {
+                        Return (And (0xFFFF, DID7))
+                    }
+                }
+
+                Method (_DCS, 0, NotSerialized)
+                {
+                    If (LEqual (DID7, Zero))
+                    {
+                        Return (0x0B)
+                    }
+                    Else
+                    {
+                        Return (CDDS (DID7))
+                    }
+                }
+
+                Method (_DGS, 0, NotSerialized)
+                {
+                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
+                        )))
+                    {
+                        Return (NXD7)
+                    }
+
+                    Return (NDDS (DID7))
+                }
+
+                Method (_DSS, 1, NotSerialized)
+                {
+                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
+                    {
+                        Store (NSTE, CSTE)
+                    }
+                }
+            }
+
+            Device (DD08)
+            {
+                Method (_ADR, 0, Serialized)
+                {
+                    If (LEqual (DID8, Zero))
+                    {
+                        Return (0x08)
+                    }
+                    Else
+                    {
+                        Return (And (0xFFFF, DID8))
+                    }
+                }
+
+                Method (_DCS, 0, NotSerialized)
+                {
+                    If (LEqual (DID8, Zero))
+                    {
+                        Return (0x0B)
+                    }
+                    Else
+                    {
+                        Return (CDDS (DID8))
+                    }
+                }
+
+                Method (_DGS, 0, NotSerialized)
+                {
+                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
+                        )))
+                    {
+                        Return (NXD8)
+                    }
+
+                    Return (NDDS (DID8))
+                }
+
+                Method (_DSS, 1, NotSerialized)
+                {
+                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
+                    {
+                        Store (NSTE, CSTE)
+                    }
+                }
+            }
+
+            Method (SDDL, 1, NotSerialized)
+            {
+                Increment (NDID)
+                Store (And (Arg0, 0x0F0F), Local0)
+                Or (0x80000000, Local0, Local1)
+                If (LEqual (DIDL, Local0))
+                {
+                    Return (Local1)
+                }
+
+                If (LEqual (DDL2, Local0))
+                {
+                    Return (Local1)
+                }
+
+                If (LEqual (DDL3, Local0))
+                {
+                    Return (Local1)
+                }
+
+                If (LEqual (DDL4, Local0))
+                {
+                    Return (Local1)
+                }
+
+                If (LEqual (DDL5, Local0))
+                {
+                    Return (Local1)
+                }
+
+                If (LEqual (DDL6, Local0))
+                {
+                    Return (Local1)
+                }
+
+                If (LEqual (DDL7, Local0))
+                {
+                    Return (Local1)
+                }
+
+                If (LEqual (DDL8, Local0))
+                {
+                    Return (Local1)
+                }
+
+                Return (Zero)
+            }
+
+            Method (CDDS, 1, NotSerialized)
+            {
+                Store (And (Arg0, 0x0F0F), Local0)
+                If (LEqual (Zero, Local0))
+                {
+                    Return (0x1D)
+                }
+
+                If (LEqual (CADL, Local0))
+                {
+                    Return (0x1F)
+                }
+
+                If (LEqual (CAL2, Local0))
+                {
+                    Return (0x1F)
+                }
+
+                If (LEqual (CAL3, Local0))
+                {
+                    Return (0x1F)
+                }
+
+                If (LEqual (CAL4, Local0))
+                {
+                    Return (0x1F)
+                }
+
+                If (LEqual (CAL5, Local0))
+                {
+                    Return (0x1F)
+                }
+
+                If (LEqual (CAL6, Local0))
+                {
+                    Return (0x1F)
+                }
+
+                If (LEqual (CAL7, Local0))
+                {
+                    Return (0x1F)
+                }
+
+                If (LEqual (CAL8, Local0))
+                {
+                    Return (0x1F)
+                }
+
+                Return (0x1D)
+            }
+
+            Method (NDDS, 1, NotSerialized)
+            {
+                Store (And (Arg0, 0x0F0F), Local0)
+                If (LEqual (Zero, Local0))
+                {
+                    Return (Zero)
+                }
+
+                If (LEqual (NADL, Local0))
+                {
+                    Return (One)
+                }
+
+                If (LEqual (NDL2, Local0))
+                {
+                    Return (One)
+                }
+
+                If (LEqual (NDL3, Local0))
+                {
+                    Return (One)
+                }
+
+                If (LEqual (NDL4, Local0))
+                {
+                    Return (One)
+                }
+
+                If (LEqual (NDL5, Local0))
+                {
+                    Return (One)
+                }
+
+                If (LEqual (NDL6, Local0))
+                {
+                    Return (One)
+                }
+
+                If (LEqual (NDL7, Local0))
+                {
+                    Return (One)
+                }
+
+                If (LEqual (NDL8, Local0))
+                {
+                    Return (One)
+                }
+
+                Return (Zero)
+            }
+
+            Scope (^^PCI0)
+            {
+                OperationRegion (MCHP, PCI_Config, 0x40, 0xC0)
+                Field (MCHP, AnyAcc, NoLock, Preserve)
+                {
+                            Offset (0x60), 
+                    TASM,   10, 
+                            Offset (0x62)
+                }
+            }
+
+            OperationRegion (IGDP, PCI_Config, 0x40, 0xC0)
+            Field (IGDP, AnyAcc, NoLock, Preserve)
+            {
+                        Offset (0x12), 
+                    ,   1, 
+                GIVD,   1, 
+                    ,   2, 
+                GUMA,   3, 
+                        Offset (0x14), 
+                    ,   4, 
+                GMFN,   1, 
+                        Offset (0x18), 
+                        Offset (0xA4), 
+                ASLE,   8, 
+                        Offset (0xA8), 
+                GSSE,   1, 
+                GSSB,   14, 
+                GSES,   1, 
+                        Offset (0xB0), 
+                    ,   12, 
+                CDVL,   1, 
+                        Offset (0xB2), 
+                        Offset (0xB5), 
+                LBPC,   8, 
+                        Offset (0xBC), 
+                ASLS,   32
+            }
+
+            OperationRegion (IGDM, SystemMemory, ASLB, 0x2000)
+            Field (IGDM, AnyAcc, NoLock, Preserve)
+            {
+                SIGN,   128, 
+                SIZE,   32, 
+                OVER,   32, 
+                SVER,   256, 
+                VVER,   128, 
+                GVER,   128, 
+                MBOX,   32, 
+                DMOD,   32, 
+                        Offset (0x100), 
+                DRDY,   32, 
+                CSTS,   32, 
+                CEVT,   32, 
+                        Offset (0x120), 
+                DIDL,   32, 
+                DDL2,   32, 
+                DDL3,   32, 
+                DDL4,   32, 
+                DDL5,   32, 
+                DDL6,   32, 
+                DDL7,   32, 
+                DDL8,   32, 
+                CPDL,   32, 
+                CPL2,   32, 
+                CPL3,   32, 
+                CPL4,   32, 
+                CPL5,   32, 
+                CPL6,   32, 
+                CPL7,   32, 
+                CPL8,   32, 
+                CADL,   32, 
+                CAL2,   32, 
+                CAL3,   32, 
+                CAL4,   32, 
+                CAL5,   32, 
+                CAL6,   32, 
+                CAL7,   32, 
+                CAL8,   32, 
+                NADL,   32, 
+                NDL2,   32, 
+                NDL3,   32, 
+                NDL4,   32, 
+                NDL5,   32, 
+                NDL6,   32, 
+                NDL7,   32, 
+                NDL8,   32, 
+                ASLP,   32, 
+                TIDX,   32, 
+                CHPD,   32, 
+                CLID,   32, 
+                CDCK,   32, 
+                SXSW,   32, 
+                EVTS,   32, 
+                CNOT,   32, 
+                NRDY,   32, 
+                        Offset (0x200), 
+                SCIE,   1, 
+                GEFC,   4, 
+                GXFC,   3, 
+                GESF,   8, 
+                        Offset (0x204), 
+                PARM,   32, 
+                DSLP,   32, 
+                        Offset (0x300), 
+                ARDY,   32, 
+                ASLC,   32, 
+                TCHE,   32, 
+                ALSI,   32, 
+                BCLP,   32, 
+                PFIT,   32, 
+                CBLV,   32, 
+                BCLM,   320, 
+                CPFM,   32, 
+                EPFM,   32, 
+                PLUT,   592, 
+                PFMB,   32, 
+                CCDV,   32, 
+                PCFT,   32, 
+                        Offset (0x400), 
+                GVD1,   49152, 
+                PHED,   32, 
+                BDDC,   2048
+            }
+
+            Name (DBTB, Package (0x15)
+            {
+                Zero, 
+                0x07, 
+                0x38, 
+                0x01C0, 
+                0x0E00, 
+                0x3F, 
+                0x01C7, 
+                0x0E07, 
+                0x01F8, 
+                0x0E38, 
+                0x0FC0, 
+                Zero, 
+                Zero, 
+                Zero, 
+                Zero, 
+                Zero, 
+                0x7000, 
+                0x7007, 
+                0x7038, 
+                0x71C0, 
+                0x7E00
+            })
+            Name (CDCT, Package (0x05)
+            {
+                Package (0x02)
+                {
+                    0xE4, 
+                    0x0140
+                }, 
+
+                Package (0x02)
+                {
+                    0xDE, 
+                    0x014D
+                }, 
+
+                Package (0x02)
+                {
+                    0xDE, 
+                    0x014D
+                }, 
+
+                Package (0x02)
+                {
+                    Zero, 
+                    Zero
+                }, 
+
+                Package (0x02)
+                {
+                    0xDE, 
+                    0x014D
+                }
+            })
+            Name (SUCC, One)
+            Name (NVLD, 0x02)
+            Name (CRIT, 0x04)
+            Name (NCRT, 0x06)
+            Method (GSCI, 0, Serialized)
+            {
+                Method (GBDA, 0, Serialized)
+                {
+                    If (LEqual (GESF, Zero))
+                    {
+                        Store (0x0679, PARM)
+                        Store (Zero, GESF)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, One))
+                    {
+                        Store (0x0240, PARM)
+                        Store (Zero, GESF)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x04))
+                    {
+                        And (PARM, 0xEFFF0000, PARM)
+                        And (PARM, ShiftLeft (DerefOf (Index (DBTB, IBTT)), 0x10), 
+                            PARM)
+                        Or (IBTT, PARM, PARM)
+                        Store (Zero, GESF)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x05))
+                    {
+                        Store (IPSC, PARM)
+                        Or (PARM, ShiftLeft (IPAT, 0x08), PARM)
+                        Add (PARM, 0x0100, PARM)
+                        Or (PARM, ShiftLeft (LIDS, 0x10), PARM)
+                        Add (PARM, 0x00010000, PARM)
+                        Or (PARM, ShiftLeft (IBIA, 0x14), PARM)
+                        Store (Zero, GESF)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x06))
+                    {
+                        Store (ITVF, PARM)
+                        Or (PARM, ShiftLeft (ITVM, 0x04), PARM)
+                        Store (Zero, GESF)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x07))
+                    {
+                        Store (GIVD, PARM)
+                        XOr (PARM, One, PARM)
+                        Or (PARM, ShiftLeft (GMFN, One), PARM)
+                        Or (PARM, 0x1800, PARM)
+                        Or (PARM, ShiftLeft (IDMS, 0x11), PARM)
+                        Or (ShiftLeft (DerefOf (Index (DerefOf (Index (CDCT, HVCO)), CDVL
+                            )), 0x15), PARM, PARM)
+                        Store (One, GESF)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x0A))
+                    {
+                        Store (Zero, PARM)
+                        If (ISSC)
+                        {
+                            Or (PARM, 0x03, PARM)
+                        }
+
+                        Store (Zero, GESF)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x0B))
+                    {
+                        Store (KSV0, PARM)
+                        Store (KSV1, GESF)
+                        Return (SUCC)
+                    }
+
+                    Store (Zero, GESF)
+                    Return (CRIT)
+                }
+
+                Method (SBCB, 0, Serialized)
+                {
+                    If (LEqual (GESF, Zero))
+                    {
+                        Store (Zero, PARM)
+                        Store (0x000F87FD, PARM)
+                        Store (Zero, GESF)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, One))
+                    {
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x03))
+                    {
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x04))
+                    {
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x05))
+                    {
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x06))
+                    {
+                        Store (And (PARM, 0x0F), ITVF)
+                        Store (ShiftRight (And (PARM, 0xF0), 0x04), ITVM)
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x07))
+                    {
+                        If (LEqual (PARM, Zero))
+                        {
+                            Store (CLID, Local0)
+                            If (And (0x80000000, Local0))
+                            {
+                                And (CLID, 0x0F, CLID)
+                                GLID (CLID)
+                            }
+                        }
+
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x08))
+                    {
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x09))
+                    {
+                        And (PARM, 0xFF, IBTT)
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x0A))
+                    {
+                        And (PARM, 0xFF, IPSC)
+                        If (And (ShiftRight (PARM, 0x08), 0xFF))
+                        {
+                            And (ShiftRight (PARM, 0x08), 0xFF, IPAT)
+                            Decrement (IPAT)
+                        }
+
+                        And (ShiftRight (PARM, 0x14), 0x07, IBIA)
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x0B))
+                    {
+                        And (ShiftRight (PARM, One), One, IF1E)
+                        If (And (PARM, 0x0001E000))
+                        {
+                            And (ShiftRight (PARM, 0x0D), 0x0F, IDMS)
+                        }
+                        Else
+                        {
+                            And (ShiftRight (PARM, 0x11), 0x0F, IDMS)
+                        }
+
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x10))
+                    {
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x11))
+                    {
+                        Store (ShiftLeft (LIDS, 0x08), PARM)
+                        Add (PARM, 0x0100, PARM)
+                        Store (Zero, GESF)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x12))
+                    {
+                        If (And (PARM, One))
+                        {
+                            If (LEqual (ShiftRight (PARM, One), One))
+                            {
+                                Store (One, ISSC)
+                            }
+                            Else
+                            {
+                                Store (Zero, GESF)
+                                Return (CRIT)
+                            }
+                        }
+                        Else
+                        {
+                            Store (Zero, ISSC)
+                        }
+
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x13))
+                    {
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    If (LEqual (GESF, 0x14))
+                    {
+                        And (PARM, 0x0F, PAVP)
+                        Store (Zero, GESF)
+                        Store (Zero, PARM)
+                        Return (SUCC)
+                    }
+
+                    Store (Zero, GESF)
+                    Return (SUCC)
+                }
+
+                If (LEqual (GEFC, 0x04))
+                {
+                    Store (GBDA (), GXFC)
+                }
+
+                If (LEqual (GEFC, 0x06))
+                {
+                    Store (SBCB (), GXFC)
+                }
+
+                Store (Zero, GEFC)
+                Store (One, SCIS)
+                Store (Zero, GSSE)
+                Store (Zero, SCIE)
+                Return (Zero)
+            }
+
+            Method (PDRD, 0, NotSerialized)
+            {
+                If (LNot (DRDY))
+                {
+                    Sleep (ASLP)
+                }
+
+                Return (LNot (DRDY))
+            }
+
+            Method (PSTS, 0, NotSerialized)
+            {
+                If (LGreater (CSTS, 0x02))
+                {
+                    Sleep (ASLP)
+                }
+
+                Return (LEqual (CSTS, 0x03))
+            }
+
+            Method (GNOT, 2, NotSerialized)
+            {
+                If (PDRD ())
+                {
+                    Return (One)
+                }
+
+                Store (Arg0, CEVT)
+                Store (0x03, CSTS)
+                If (LAnd (LEqual (CHPD, Zero), LEqual (Arg1, Zero)))
+                {
+                    If (LOr (LGreater (OSYS, 0x07D0), LLess (OSYS, 0x07D6)))
+                    {
+                        Notify (PCI0, Arg1)
+                    }
+                    Else
+                    {
+                        Notify (GFX0, Arg1)
+                    }
+                }
+
+                If (CondRefOf (HNOT))
+                {
+                    HNOT (Arg0)
+                }
+                Else
+                {
+                    Notify (GFX0, 0x80)
+                }
+
+                Return (Zero)
+            }
+
+            Method (GHDS, 1, NotSerialized)
+            {
+                Store (Arg0, TIDX)
+                Return (GNOT (One, Zero))
+            }
+
+            Method (GLID, 1, NotSerialized)
+            {
+                If (LEqual (Arg0, One))
+                {
+                    Store (0x03, CLID)
+                }
+                Else
+                {
+                    Store (Arg0, CLID)
+                }
+
+                Return (GNOT (0x02, Zero))
+            }
+
+            Method (GDCK, 1, NotSerialized)
+            {
+                Store (Arg0, CDCK)
+                Return (GNOT (0x04, Zero))
+            }
+
+            Method (PARD, 0, NotSerialized)
+            {
+                If (LNot (ARDY))
+                {
+                    Sleep (ASLP)
+                }
+
+                Return (LNot (ARDY))
+            }
+
+            Method (AINT, 2, NotSerialized)
+            {
+                If (LNot (And (TCHE, ShiftLeft (One, Arg0))))
+                {
+                    Return (One)
+                }
+
+                If (PARD ())
+                {
+                    Return (One)
+                }
+
+                If (LEqual (Arg0, 0x02))
+                {
+                    If (CPFM)
+                    {
+                        And (CPFM, 0x0F, Local0)
+                        And (EPFM, 0x0F, Local1)
+                        If (LEqual (Local0, One))
+                        {
+                            If (And (Local1, 0x06))
+                            {
+                                Store (0x06, PFIT)
+                            }
+                            Else
+                            {
+                                If (And (Local1, 0x08))
+                                {
+                                    Store (0x08, PFIT)
+                                }
+                                Else
+                                {
+                                    Store (One, PFIT)
+                                }
+                            }
+                        }
+
+                        If (LEqual (Local0, 0x06))
+                        {
+                            If (And (Local1, 0x08))
+                            {
+                                Store (0x08, PFIT)
+                            }
+                            Else
+                            {
+                                If (And (Local1, One))
+                                {
+                                    Store (One, PFIT)
+                                }
+                                Else
+                                {
+                                    Store (0x06, PFIT)
+                                }
+                            }
+                        }
+
+                        If (LEqual (Local0, 0x08))
+                        {
+                            If (And (Local1, One))
+                            {
+                                Store (One, PFIT)
+                            }
+                            Else
+                            {
+                                If (And (Local1, 0x06))
+                                {
+                                    Store (0x06, PFIT)
+                                }
+                                Else
+                                {
+                                    Store (0x08, PFIT)
+                                }
+                            }
+                        }
+                    }
+                    Else
+                    {
+                        XOr (PFIT, 0x07, PFIT)
+                    }
+
+                    Or (PFIT, 0x80000000, PFIT)
+                    Store (0x04, ASLC)
+                }
+                Else
+                {
+                    If (LEqual (Arg0, One))
+                    {
+                        Store (Divide (Multiply (Arg1, 0xFF), 0x64, ), BCLP)
+                        Or (BCLP, 0x80000000, BCLP)
+                        Store (0x02, ASLC)
+                    }
+                    Else
+                    {
+                        If (LEqual (Arg0, Zero))
+                        {
+                            Store (Arg1, ALSI)
+                            Store (One, ASLC)
+                        }
+                        Else
+                        {
+                            Return (One)
+                        }
+                    }
+                }
+
+                Store (One, ASLE)
+                Return (Zero)
+            }
+
+            Method (SCIP, 0, NotSerialized)
+            {
+                If (LNotEqual (OVER, Zero))
+                {
+                    Return (LNot (GSMI))
+                }
+
+                Return (Zero)
+            }
+
+            Device (^^MEM2)
+            {
+                Name (_HID, EisaId ("PNP0C01"))
+                Name (_UID, 0x02)
+                Name (CRS1, ResourceTemplate ()
+                {
+                    Memory32Fixed (ReadWrite,
+                        0x20000000,         // Address Base
+                        0x00200000,         // Address Length
+                        )
+                    Memory32Fixed (ReadWrite,
+                        0x40000000,         // Address Base
+                        0x00200000,         // Address Length
+                        )
+                })
+                Name (CRS2, ResourceTemplate ()
+                {
+                    Memory32Fixed (ReadWrite,
+                        0x20000000,         // Address Base
+                        0x00200000,         // Address Length
+                        )
+                    Memory32Fixed (ReadWrite,
+                        0x40004000,         // Address Base
+                        0x00001000,         // Address Length
+                        )
+                })
+                Method (_STA, 0, NotSerialized)
+                {
+                    If (IGDS)
+                    {
+                        Return (0x0F)
+                    }
+
+                    Return (Zero)
+                }
+
+                Method (_CRS, 0, NotSerialized)
+                {
+                    If (LOr (LEqual (And (PNHM, 0x0FFF0FF0), 0x000206A0), LEqual (And (
+                        PNHM, 0x0FFF0FFF), 0x000306A0)))
+                    {
+                        Return (CRS1)
+                    }
+
+                    Return (CRS2)
+                }
+            }
+        }
+    }
+
+    Scope (_PR)
+    {
+        Processor (CPU0, 0x01, 0x00000410, 0x06) {}
+        Processor (CPU1, 0x02, 0x00000410, 0x06) {}
+        Processor (CPU2, 0x03, 0x00000410, 0x06) {}
+        Processor (CPU3, 0x04, 0x00000410, 0x06) {}
+        Processor (CPU4, 0x05, 0x00000410, 0x06) {}
+        Processor (CPU5, 0x06, 0x00000410, 0x06) {}
+        Processor (CPU6, 0x07, 0x00000410, 0x06) {}
+        Processor (CPU7, 0x08, 0x00000410, 0x06) {}
+    }
+
+    Mutex (MUTX, 0x00)
+    OperationRegion (DEB0, SystemIO, 0x80, One)
+    Field (DEB0, ByteAcc, NoLock, Preserve)
+    {
+        DBG8,   8
+    }
+
+    OperationRegion (DEB1, SystemIO, 0x90, 0x02)
+    Field (DEB1, WordAcc, NoLock, Preserve)
+    {
+        DBG9,   16
+    }
+
+    OperationRegion (PRT0, SystemIO, 0x80, 0x04)
+    Field (PRT0, DWordAcc, Lock, Preserve)
+    {
+        P80H,   32
+    }
+
+    Method (P8XH, 2, Serialized)
+    {
+        If (LEqual (Arg0, Zero))
+        {
+            Store (Or (And (P80D, 0xFFFFFF00), Arg1), P80D)
+        }
+
+        If (LEqual (Arg0, One))
+        {
+            Store (Or (And (P80D, 0xFFFF00FF), ShiftLeft (Arg1, 0x08)
+                ), P80D)
+        }
+
+        If (LEqual (Arg0, 0x02))
+        {
+            Store (Or (And (P80D, 0xFF00FFFF), ShiftLeft (Arg1, 0x10)
+                ), P80D)
+        }
+
+        If (LEqual (Arg0, 0x03))
+        {
+            Store (Or (And (P80D, 0x00FFFFFF), ShiftLeft (Arg1, 0x18)
+                ), P80D)
+        }
+
+        Store (P80D, P80H)
+    }
+
+    OperationRegion (SPRT, SystemIO, 0xB2, 0x02)
+    Field (SPRT, ByteAcc, Lock, Preserve)
+    {
+        SSMP,   8
+    }
+
+    Method (_PIC, 1, NotSerialized)
+    {
+        Store (Arg0, GPIC)
+        Store (Arg0, PICM)
+    }
+
+    Method (_PTS, 1, NotSerialized)
+    {
+        Store (Zero, P80D)
+        P8XH (Zero, Arg0)
+        PTS (Arg0)
+        If (LEqual (Arg0, 0x03))
+        {
+            If (LAnd (DTSE, LGreater (TCNT, One)))
+            {
+                TRAP (TRTD, 0x1E)
+            }
+        }
+
+        If (LOr (LOr (LEqual (Arg0, 0x03), LEqual (Arg0, 0x04)), LEqual (
+            Arg0, 0x05)))
+        {
+            If (LEqual (PFLV, FDTP))
+            {
+                Store (One, GP27)
+            }
+        }
+    }
+
+    Method (_WAK, 1, Serialized)
+    {
+        ShiftLeft (Arg0, 0x04, DBG8)
+        WAK (Arg0)
+        If (NEXP)
+        {
+            If (And (OSCC, 0x02))
+            {
+                \_SB.PCI0.NHPG ()
+            }
+
+            If (And (OSCC, 0x04))
+            {
+                \_SB.PCI0.NPME ()
+            }
+        }
+
+        If (LEqual (Arg0, 0x03))
+        {
+            If (LEqual (Zero, ACTT))
+            {
+                If (LEqual (ECON, One))
+                {
+                    Store (Zero, \_SB.PCI0.LPCB.H_EC.CFAN)
+                }
+            }
+        }
+
+        If (LOr (LEqual (Arg0, 0x03), LEqual (Arg0, 0x04)))
+        {
+            If (LAnd (DTSE, LGreater (TCNT, One)))
+            {
+                TRAP (TRTD, 0x14)
+            }
+
+            If (LEqual (OSYS, 0x07D2))
+            {
+                If (And (CFGD, One))
+                {
+                    If (LGreater (\_PR.CPU0._PPC, Zero))
+                    {
+                        Subtract (\_PR.CPU0._PPC, One, \_PR.CPU0._PPC)
+                        PNOT ()
+                        Add (\_PR.CPU0._PPC, One, \_PR.CPU0._PPC)
+                        PNOT ()
+                    }
+                    Else
+                    {
+                        Add (\_PR.CPU0._PPC, One, \_PR.CPU0._PPC)
+                        PNOT ()
+                        Subtract (\_PR.CPU0._PPC, One, \_PR.CPU0._PPC)
+                        PNOT ()
+                    }
+                }
+            }
+
+            If (LEqual (ECON, One))
+            {
+                If (LNotEqual (LIDS, \_SB.PCI0.LPCB.H_EC.LSTE))
+                {
+                    Store (\_SB.PCI0.LPCB.H_EC.LSTE, LIDS)
+                    If (IGDS)
+                    {
+                        If (\_SB.PCI0.GFX0.GLID (LIDS))
+                        {
+                            Or (0x80000000, \_SB.PCI0.GFX0.CLID, \_SB.PCI0.GFX0.CLID)
+                        }
+                    }
+
+                    Notify (\_SB.LID0, 0x80)
+                }
+
+                If (LNotEqual (\_SB.PCI0.LPCB.H_EC.DOCK, DSTS))
+                {
+                    Store (\_SB.PCI0.LPCB.H_EC.DOCK, DSTS)
+                    If (LAnd (\_SB.PCI0.HDEF.DCKS, One))
+                    {
+                        Store (DSTS, \_SB.PCI0.HDEF.DCKA)
+                    }
+
+                    If (LEqual (DSTS, One))
+                    {
+                        If (LEqual (Arg0, 0x03))
+                        {
+                            Sleep (0x03E8)
+                            Store (PDBR, SSMP)
+                            Sleep (0x03E8)
+                        }
+
+                        Notify (\_SB.PCI0.DOCK, Zero)
+                    }
+                    Else
+                    {
+                        Notify (\_SB.PCI0.DOCK, One)
+                    }
+                }
+
+                If (LEqual (BNUM, Zero))
+                {
+                    If (LNotEqual (\_SB.PCI0.LPCB.H_EC.VPWR, PWRS))
+                    {
+                        Store (\_SB.PCI0.LPCB.H_EC.VPWR, PWRS)
+                        PNOT ()
+                    }
+                }
+                Else
+                {
+                    If (LNotEqual (\_SB.PCI0.LPCB.H_EC.RPWR, PWRS))
+                    {
+                        Store (\_SB.PCI0.LPCB.H_EC.RPWR, PWRS)
+                        PNOT ()
+                    }
+                }
+            }
+
+            If (LEqual (RP1D, Zero))
+            {
+                Notify (\_SB.PCI0.RP01, Zero)
+            }
+
+            If (LEqual (RP2D, Zero))
+            {
+                Notify (\_SB.PCI0.RP02, Zero)
+            }
+
+            If (LEqual (RP3D, Zero))
+            {
+                Notify (\_SB.PCI0.RP03, Zero)
+            }
+
+            If (LEqual (RP4D, Zero))
+            {
+                Notify (\_SB.PCI0.RP04, Zero)
+            }
+
+            If (LEqual (RP5D, Zero))
+            {
+                Notify (\_SB.PCI0.RP05, Zero)
+            }
+
+            If (LEqual (RP6D, Zero))
+            {
+                Notify (\_SB.PCI0.RP06, Zero)
+            }
+
+            If (LEqual (RP7D, Zero))
+            {
+                If (LEqual (DSTS, Zero))
+                {
+                    Notify (\_SB.PCI0.RP07, Zero)
+                }
+            }
+
+            If (LEqual (RP8D, Zero))
+            {
+                If (LEqual (DSTS, Zero))
+                {
+                    Notify (\_SB.PCI0.RP08, Zero)
+                }
+            }
+        }
+
+        Return (Package (0x02)
+        {
+            Zero, 
+            Zero
+        })
+    }
+
+    Method (GETB, 3, Serialized)
+    {
+        Multiply (Arg0, 0x08, Local0)
+        Multiply (Arg1, 0x08, Local1)
+        CreateField (Arg2, Local0, Local1, TBF3)
+        Return (TBF3)
+    }
+
+    Method (PNOT, 0, Serialized)
+    {
+        If (LGreater (TCNT, One))
+        {
+            If (And (PDC0, 0x08))
+            {
+                Notify (\_PR.CPU0, 0x80)
+                If (And (PDC0, 0x10))
+                {
+                    Sleep (0x64)
+                    Notify (\_PR.CPU0, 0x81)
+                }
+            }
+
+            If (And (PDC1, 0x08))
+            {
+                Notify (\_PR.CPU1, 0x80)
+                If (And (PDC1, 0x10))
+                {
+                    Sleep (0x64)
+                    Notify (\_PR.CPU1, 0x81)
+                }
+            }
+
+            If (And (PDC2, 0x08))
+            {
+                Notify (\_PR.CPU2, 0x80)
+                If (And (PDC2, 0x10))
+                {
+                    Sleep (0x64)
+                    Notify (\_PR.CPU2, 0x81)
+                }
+            }
+
+            If (And (PDC3, 0x08))
+            {
+                Notify (\_PR.CPU3, 0x80)
+                If (And (PDC3, 0x10))
+                {
+                    Sleep (0x64)
+                    Notify (\_PR.CPU3, 0x81)
+                }
+            }
+
+            If (And (PDC4, 0x08))
+            {
+                Notify (\_PR.CPU4, 0x80)
+                If (And (PDC4, 0x10))
+                {
+                    Sleep (0x64)
+                    Notify (\_PR.CPU4, 0x81)
+                }
+            }
+
+            If (And (PDC5, 0x08))
+            {
+                Notify (\_PR.CPU5, 0x80)
+                If (And (PDC5, 0x10))
+                {
+                    Sleep (0x64)
+                    Notify (\_PR.CPU5, 0x81)
+                }
+            }
+
+            If (And (PDC6, 0x08))
+            {
+                Notify (\_PR.CPU6, 0x80)
+                If (And (PDC6, 0x10))
+                {
+                    Sleep (0x64)
+                    Notify (\_PR.CPU6, 0x81)
+                }
+            }
+
+            If (And (PDC7, 0x08))
+            {
+                Notify (\_PR.CPU7, 0x80)
+                If (And (PDC7, 0x10))
+                {
+                    Sleep (0x64)
+                    Notify (\_PR.CPU7, 0x81)
+                }
+            }
+        }
+        Else
+        {
+            Notify (\_PR.CPU0, 0x80)
+            Sleep (0x64)
+            Notify (\_PR.CPU0, 0x81)
+        }
+
+        If (LEqual (ECON, One))
+        {
+            Store (\_SB.PCI0.LPCB.H_EC.B1CC, B1SC)
+            Store (\_SB.PCI0.LPCB.H_EC.B1ST, B1SS)
+            Store (\_SB.PCI0.LPCB.H_EC.B2CC, B2SC)
+            Store (\_SB.PCI0.LPCB.H_EC.B2ST, B2SS)
+            If (LGreaterEqual (OSYS, 0x07D6))
+            {
+                Notify (\_SB.PCI0.LPCB.H_EC.BAT0, 0x81)
+                Notify (\_SB.PCI0.LPCB.H_EC.BAT1, 0x81)
+                Notify (\_SB.PCI0.LPCB.H_EC.BAT2, 0x81)
+            }
+            Else
+            {
+                Notify (\_SB.PCI0.LPCB.H_EC.BAT0, 0x80)
+                Notify (\_SB.PCI0.LPCB.H_EC.BAT1, 0x80)
+                Notify (\_SB.PCI0.LPCB.H_EC.BAT2, 0x80)
+            }
+        }
+    }
+
+    Method (TRAP, 2, Serialized)
+    {
+        Store (Arg1, SMIF)
+        If (LEqual (Arg0, TRTP))
+        {
+            Store (Zero, TRP0)
+        }
+
+        If (LEqual (Arg0, TRTD))
+        {
+            Store (Arg1, DTSF)
+            Store (Zero, TRPD)
+            Return (DTSF)
+        }
+
+        If (LEqual (Arg0, TRTI))
+        {
+            Store (Zero, TRPH)
+        }
+
+        Return (SMIF)
+    }
+
+    Scope (_SB.PCI0)
+    {
+        Method (_INI, 0, NotSerialized)
+        {
+            Store (0x07D0, OSYS)
+            If (CondRefOf (_OSI, Local0))
+            {
+                If (_OSI ("Windows 2001"))
+                {
+                    Store (0x07D1, OSYS)
+                }
+
+                If (_OSI ("Windows 2001 SP1"))
+                {
+                    Store (0x07D1, OSYS)
+                }
+
+                If (_OSI ("Windows 2001 SP2"))
+                {
+                    Store (0x07D2, OSYS)
+                }
+
+                If (_OSI ("Windows 2001.1"))
+                {
+                    Store (0x07D3, OSYS)
+                }
+
+                If (_OSI ("Windows 2006"))
+                {
+                    Store (0x07D6, OSYS)
+                }
+
+                If (_OSI ("Windows 2009"))
+                {
+                    Store (0x07D9, OSYS)
+                }
+            }
+        }
+
+        Method (NHPG, 0, Serialized)
+        {
+            Store (Zero, ^RP01.HPEX)
+            Store (Zero, ^RP02.HPEX)
+            Store (Zero, ^RP03.HPEX)
+            Store (Zero, ^RP04.HPEX)
+            Store (One, ^RP01.HPSX)
+            Store (One, ^RP02.HPSX)
+            Store (One, ^RP03.HPSX)
+            Store (One, ^RP04.HPSX)
+        }
+
+        Method (NPME, 0, Serialized)
+        {
+            Store (Zero, ^RP01.PMEX)
+            Store (Zero, ^RP02.PMEX)
+            Store (Zero, ^RP03.PMEX)
+            Store (Zero, ^RP04.PMEX)
+            Store (Zero, ^RP05.PMEX)
+            Store (Zero, ^RP06.PMEX)
+            Store (Zero, ^RP07.PMEX)
+            Store (Zero, ^RP08.PMEX)
+            Store (One, ^RP01.PMSX)
+            Store (One, ^RP02.PMSX)
+            Store (One, ^RP03.PMSX)
+            Store (One, ^RP04.PMSX)
+            Store (One, ^RP05.PMSX)
+            Store (One, ^RP06.PMSX)
+            Store (One, ^RP07.PMSX)
+            Store (One, ^RP08.PMSX)
+        }
+    }
+
+    Scope (\)
+    {
+        Name (PICM, Zero)
+        Name (PRWP, Package (0x02)
+        {
+            Zero, 
+            Zero
+        })
+        Method (GPRW, 2, NotSerialized)
+        {
+            Store (Arg0, Index (PRWP, Zero))
+            Store (ShiftLeft (SS1, One), Local0)
+            Or (Local0, ShiftLeft (SS2, 0x02), Local0)
+            Or (Local0, ShiftLeft (SS3, 0x03), Local0)
+            Or (Local0, ShiftLeft (SS4, 0x04), Local0)
+            If (And (ShiftLeft (One, Arg1), Local0))
+            {
+                Store (Arg1, Index (PRWP, One))
+            }
+            Else
+            {
+                ShiftRight (Local0, One, Local0)
+                FindSetLeftBit (Local0, Index (PRWP, One))
+            }
+
+            Return (PRWP)
+        }
+    }
+
+    Scope (_SB.PCI0)
+    {
+        Device (PDRC)
+        {
+            Name (_HID, EisaId ("PNP0C02"))
+            Name (_UID, One)
+            Name (BUF0, ResourceTemplate ()
+            {
+                Memory32Fixed (ReadWrite,
+                    0x00000000,         // Address Base
+                    0x00004000,         // Address Length
+                    )
+                Memory32Fixed (ReadWrite,
+                    0x00000000,         // Address Base
+                    0x00008000,         // Address Length
+                    )
+                Memory32Fixed (ReadWrite,
+                    0x00000000,         // Address Base
+                    0x00001000,         // Address Length
+                    )
+                Memory32Fixed (ReadWrite,
+                    0x00000000,         // Address Base
+                    0x00001000,         // Address Length
+                    )
+                Memory32Fixed (ReadWrite,
+                    0x00000000,         // Address Base
+                    0x00000000,         // Address Length
+                    )
+                Memory32Fixed (ReadWrite,
+                    0xFED20000,         // Address Base
+                    0x00020000,         // Address Length
+                    )
+                Memory32Fixed (ReadOnly,
+                    0xFED90000,         // Address Base
+                    0x00004000,         // Address Length
+                    )
+                Memory32Fixed (ReadWrite,
+                    0xFED45000,         // Address Base
+                    0x0004B000,         // Address Length
+                    )
+                Memory32Fixed (ReadOnly,
+                    0xFF000000,         // Address Base
+                    0x01000000,         // Address Length
+                    )
+                Memory32Fixed (ReadOnly,
+                    0xFEE00000,         // Address Base
+                    0x00100000,         // Address Length
+                    )
+                Memory32Fixed (ReadWrite,
+                    0x00000000,         // Address Base
+                    0x00001000,         // Address Length
+                    )
+            })
+            Method (_CRS, 0, Serialized)
+            {
+                CreateDWordField (BUF0, 0x04, RBR0)
+                ShiftLeft (^^LPCB.RCBA, 0x0E, RBR0)
+                CreateDWordField (BUF0, 0x7C, TBR0)
+                Store (TBAB, TBR0)
+                CreateDWordField (BUF0, 0x80, TBLN)
+                If (LEqual (TBAB, Zero))
+                {
+                    Store (Zero, TBLN)
+                }
+
+                CreateDWordField (BUF0, 0x10, MBR0)
+                ShiftLeft (MHBR, 0x0F, MBR0)
+                CreateDWordField (BUF0, 0x1C, DBR0)
+                ShiftLeft (DIBR, 0x0C, DBR0)
+                CreateDWordField (BUF0, 0x28, EBR0)
+                ShiftLeft (EPBR, 0x0C, EBR0)
+                CreateDWordField (BUF0, 0x34, XBR0)
+                ShiftLeft (PXBR, 0x1A, XBR0)
+                CreateDWordField (BUF0, 0x38, XSZ0)
+                ShiftRight (0x10000000, PXSZ, XSZ0)
+                Return (BUF0)
+            }
+        }
+    }
+
+    Method (BRTN, 1, Serialized)
+    {
+        If (LEqual (And (DID1, 0x0F00), 0x0400))
+        {
+            Notify (\_SB.PCI0.GFX0.DD01, Arg0)
+        }
+
+        If (LEqual (And (DID2, 0x0F00), 0x0400))
+        {
+            Notify (\_SB.PCI0.GFX0.DD02, Arg0)
+        }
+
+        If (LEqual (And (DID3, 0x0F00), 0x0400))
+        {
+            Notify (\_SB.PCI0.GFX0.DD03, Arg0)
+        }
+
+        If (LEqual (And (DID4, 0x0F00), 0x0400))
+        {
+            Notify (\_SB.PCI0.GFX0.DD04, Arg0)
+        }
+
+        If (LEqual (And (DID5, 0x0F00), 0x0400))
+        {
+            Notify (\_SB.PCI0.GFX0.DD05, Arg0)
+        }
+
+        If (LEqual (And (DID6, 0x0F00), 0x0400))
+        {
+            Notify (\_SB.PCI0.GFX0.DD06, Arg0)
+        }
+
+        If (LEqual (And (DID7, 0x0F00), 0x0400))
+        {
+            Notify (\_SB.PCI0.GFX0.DD07, Arg0)
+        }
+
+        If (LEqual (And (DID8, 0x0F00), 0x0400))
+        {
+            Notify (\_SB.PCI0.GFX0.DD08, Arg0)
+        }
+    }
+
+    Scope (_GPE)
+    {
+        Method (_L09, 0, NotSerialized)
+        {
+            If (LEqual (RP1D, Zero))
+            {
+                \_SB.PCI0.RP01.HPME ()
+                Notify (\_SB.PCI0.RP01, 0x02)
+            }
+
+            If (LEqual (RP2D, Zero))
+            {
+                \_SB.PCI0.RP02.HPME ()
+                Notify (\_SB.PCI0.RP02, 0x02)
+            }
+
+            If (LEqual (RP3D, Zero))
+            {
+                \_SB.PCI0.RP03.HPME ()
+                Notify (\_SB.PCI0.RP03, 0x02)
+            }
+
+            If (LEqual (RP4D, Zero))
+            {
+                \_SB.PCI0.RP04.HPME ()
+                Notify (\_SB.PCI0.RP04, 0x02)
+            }
+
+            If (LEqual (RP5D, Zero))
+            {
+                \_SB.PCI0.RP05.HPME ()
+                Notify (\_SB.PCI0.RP05, 0x02)
+            }
+
+            If (LEqual (RP6D, Zero))
+            {
+                \_SB.PCI0.RP06.HPME ()
+                Notify (\_SB.PCI0.RP06, 0x02)
+            }
+
+            If (LEqual (RP7D, Zero))
+            {
+                \_SB.PCI0.RP07.HPME ()
+                Notify (\_SB.PCI0.RP07, 0x02)
+            }
+
+            If (LEqual (RP8D, Zero))
+            {
+                \_SB.PCI0.RP08.HPME ()
+                Notify (\_SB.PCI0.RP08, 0x02)
+            }
+
+            Notify (\_SB.PCI0.PEG0, 0x02)
+            Notify (\_SB.PCI0.PEG0.PEGP, 0x02)
+            Notify (\_SB.PCI0.PEG1, 0x02)
+            Notify (\_SB.PCI0.PEG2, 0x02)
+            Notify (\_SB.PCI0.PEG3, 0x02)
+        }
+
+        Method (_L0D, 0, NotSerialized)
+        {
+            Notify (\_SB.PCI0.EHC1, 0x02)
+            Notify (\_SB.PCI0.EHC2, 0x02)
+            Notify (\_SB.PCI0.HDEF, 0x02)
+            Notify (\_SB.PCI0.GLAN, 0x02)
+        }
+
+        Method (_L01, 0, NotSerialized)
+        {
+            Add (L01C, One, L01C)
+            P8XH (Zero, One)
+            P8XH (One, L01C)
+            If (LAnd (LEqual (RP1D, Zero), \_SB.PCI0.RP01.HPSX))
+            {
+                Sleep (0x64)
+                If (\_SB.PCI0.RP01.PDCX)
+                {
+                    Store (One, \_SB.PCI0.RP01.PDCX)
+                    Store (One, \_SB.PCI0.RP01.HPSX)
+                    If (LNot (\_SB.PCI0.RP01.PDSX))
+                    {
+                        Store (Zero, \_SB.PCI0.RP01.L0SE)
+                    }
+
+                    Notify (\_SB.PCI0.RP01, Zero)
+                }
+                Else
+                {
+                    Store (One, \_SB.PCI0.RP01.HPSX)
+                }
+            }
+
+            If (LAnd (LEqual (RP2D, Zero), \_SB.PCI0.RP02.HPSX))
+            {
+                Sleep (0x64)
+                If (\_SB.PCI0.RP02.PDCX)
+                {
+                    Store (One, \_SB.PCI0.RP02.PDCX)
+                    Store (One, \_SB.PCI0.RP02.HPSX)
+                    If (LNot (\_SB.PCI0.RP02.PDSX))
+                    {
+                        Store (Zero, \_SB.PCI0.RP02.L0SE)
+                    }
+
+                    Notify (\_SB.PCI0.RP02, Zero)
+                }
+                Else
+                {
+                    Store (One, \_SB.PCI0.RP02.HPSX)
+                }
+            }
+
+            If (LAnd (LEqual (RP3D, Zero), \_SB.PCI0.RP03.HPSX))
+            {
+                Sleep (0x64)
+                If (\_SB.PCI0.RP03.PDCX)
+                {
+                    Store (One, \_SB.PCI0.RP03.PDCX)
+                    Store (One, \_SB.PCI0.RP03.HPSX)
+                    If (LNot (\_SB.PCI0.RP03.PDSX))
+                    {
+                        Store (Zero, \_SB.PCI0.RP03.L0SE)
+                    }
+
+                    Notify (\_SB.PCI0.RP03, Zero)
+                }
+                Else
+                {
+                    Store (One, \_SB.PCI0.RP03.HPSX)
+                }
+            }
+
+            If (LAnd (LEqual (RP4D, Zero), \_SB.PCI0.RP04.HPSX))
+            {
+                Sleep (0x64)
+                If (\_SB.PCI0.RP04.PDCX)
+                {
+                    Store (One, \_SB.PCI0.RP04.PDCX)
+                    Store (One, \_SB.PCI0.RP04.HPSX)
+                    If (LNot (\_SB.PCI0.RP04.PDSX))
+                    {
+                        Store (Zero, \_SB.PCI0.RP04.L0SE)
+                    }
+
+                    Notify (\_SB.PCI0.RP04, Zero)
+                }
+                Else
+                {
+                    Store (One, \_SB.PCI0.RP04.HPSX)
+                }
+            }
+
+            If (LAnd (LEqual (RP5D, Zero), \_SB.PCI0.RP05.HPSX))
+            {
+                Sleep (0x64)
+                If (\_SB.PCI0.RP05.PDCX)
+                {
+                    Store (One, \_SB.PCI0.RP05.PDCX)
+                    Store (One, \_SB.PCI0.RP05.HPSX)
+                    If (LNot (\_SB.PCI0.RP05.PDSX))
+                    {
+                        Store (Zero, \_SB.PCI0.RP05.L0SE)
+                    }
+
+                    Notify (\_SB.PCI0.RP05, Zero)
+                }
+                Else
+                {
+                    Store (One, \_SB.PCI0.RP05.HPSX)
+                }
+            }
+
+            If (LAnd (LEqual (RP6D, Zero), \_SB.PCI0.RP06.HPSX))
+            {
+                Sleep (0x64)
+                If (\_SB.PCI0.RP06.PDCX)
+                {
+                    Store (One, \_SB.PCI0.RP06.PDCX)
+                    Store (One, \_SB.PCI0.RP06.HPSX)
+                    If (LNot (\_SB.PCI0.RP06.PDSX))
+                    {
+                        Store (Zero, \_SB.PCI0.RP06.L0SE)
+                    }
+
+                    Notify (\_SB.PCI0.RP06, Zero)
+                }
+                Else
+                {
+                    Store (One, \_SB.PCI0.RP06.HPSX)
+                }
+            }
+
+            If (LAnd (LEqual (RP7D, Zero), \_SB.PCI0.RP07.HPSX))
+            {
+                Sleep (0x64)
+                If (\_SB.PCI0.RP07.PDCX)
+                {
+                    Store (One, \_SB.PCI0.RP07.PDCX)
+                    Store (One, \_SB.PCI0.RP07.HPSX)
+                    If (LNot (\_SB.PCI0.RP07.PDSX))
+                    {
+                        Store (Zero, \_SB.PCI0.RP07.L0SE)
+                    }
+
+                    If (ECON)
+                    {
+                        If (LEqual (\_SB.PCI0.LPCB.H_EC.DOCK, Zero))
+                        {
+                            Notify (\_SB.PCI0.RP07, Zero)
+                        }
+                    }
+                }
+                Else
+                {
+                    Store (One, \_SB.PCI0.RP07.HPSX)
+                }
+            }
+
+            If (LAnd (LEqual (RP8D, Zero), \_SB.PCI0.RP08.HPSX))
+            {
+                Sleep (0x64)
+                If (\_SB.PCI0.RP08.PDCX)
+                {
+                    Store (One, \_SB.PCI0.RP08.PDCX)
+                    Store (One, \_SB.PCI0.RP08.HPSX)
+                    If (LNot (\_SB.PCI0.RP08.PDSX))
+                    {
+                        Store (Zero, \_SB.PCI0.RP08.L0SE)
+                    }
+
+                    If (ECON)
+                    {
+                        If (LEqual (\_SB.PCI0.LPCB.H_EC.DOCK, Zero))
+                        {
+                            Notify (\_SB.PCI0.RP08, Zero)
+                        }
+                    }
+                }
+                Else
+                {
+                    Store (One, \_SB.PCI0.RP08.HPSX)
+                }
+            }
+        }
+
+        Method (_L02, 0, NotSerialized)
+        {
+            Store (Zero, GPEC)
+            If (CondRefOf (\_SB.PCI0.IEIT.EITV))
+            {
+                \_SB.PCI0.IEIT.EITV ()
+            }
+
+            Notify (\_TZ.TZ00, 0x80)
+            Notify (\_TZ.TZ01, 0x80)
+            If (CondRefOf (TNOT))
+            {
+                TNOT ()
+            }
+        }
+
+        Method (_L06, 0, NotSerialized)
+        {
+            If (LAnd (\_SB.PCI0.GFX0.GSSE, LNot (GSMI)))
+            {
+                \_SB.PCI0.GFX0.GSCI ()
+            }
+        }
+
+        Method (_L07, 0, NotSerialized)
+        {
+            Store (0x20, \_SB.PCI0.SBUS.HSTS)
+        }
+    }
+
+    Scope (_TZ)
+    {
+        Name (ETMD, One)
+        Name (THLD, 0x78)
+        PowerResource (FN00, 0x00, 0x0000)
+        {
+            Method (_STA, 0, Serialized)
+            {
+                Return (VFN0)
+            }
+
+            Method (_ON, 0, Serialized)
+            {
+                Store (One, VFN0)
+                If (LAnd (ECON, ETMD))
+                {
+                    Store (AC0F, \_SB.PCI0.LPCB.H_EC.PENV)
+                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                }
+            }
+
+            Method (_OFF, 0, Serialized)
+            {
+                Store (Zero, VFN0)
+                If (LAnd (ECON, ETMD))
+                {
+                    If (LEqual (VFN1, Zero))
+                    {
+                        Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
+                    }
+                    Else
+                    {
+                        Store (AC1F, \_SB.PCI0.LPCB.H_EC.PENV)
+                    }
+
+                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                }
+            }
+        }
+
+        Device (FAN0)
+        {
+            Name (_HID, EisaId ("PNP0C0B"))
+            Name (_UID, Zero)
+            Name (_PR0, Package (0x01)
+            {
+                FN00
+            })
+        }
+
+        PowerResource (FN01, 0x00, 0x0000)
+        {
+            Method (_STA, 0, Serialized)
+            {
+                Return (VFN1)
+            }
+
+            Method (_ON, 0, Serialized)
+            {
+                Store (One, VFN1)
+                If (LAnd (ECON, ETMD))
+                {
+                    Store (AC1F, \_SB.PCI0.LPCB.H_EC.PENV)
+                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                }
+            }
+
+            Method (_OFF, 0, Serialized)
+            {
+                Store (Zero, VFN1)
+                If (LAnd (ECON, ETMD))
+                {
+                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
+                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                }
+            }
+        }
+
+        Device (FAN1)
+        {
+            Name (_HID, EisaId ("PNP0C0B"))
+            Name (_UID, One)
+            Name (_PR0, Package (0x01)
+            {
+                FN01
+            })
+        }
+
+        PowerResource (FN02, 0x00, 0x0000)
+        {
+            Method (_STA, 0, Serialized)
+            {
+                Return (VFN2)
+            }
+
+            Method (_ON, 0, Serialized)
+            {
+                Store (One, VFN2)
+                If (LAnd (ECON, ETMD))
+                {
+                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
+                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                }
+            }
+
+            Method (_OFF, 0, Serialized)
+            {
+                Store (Zero, VFN2)
+                If (LAnd (ECON, ETMD))
+                {
+                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
+                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                }
+            }
+        }
+
+        Device (FAN2)
+        {
+            Name (_HID, EisaId ("PNP0C0B"))
+            Name (_UID, 0x02)
+            Name (_PR0, Package (0x01)
+            {
+                FN02
+            })
+        }
+
+        PowerResource (FN03, 0x00, 0x0000)
+        {
+            Method (_STA, 0, Serialized)
+            {
+                Return (VFN3)
+            }
+
+            Method (_ON, 0, Serialized)
+            {
+                Store (One, VFN3)
+                If (LAnd (ECON, ETMD))
+                {
+                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
+                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                }
+            }
+
+            Method (_OFF, 0, Serialized)
+            {
+                Store (Zero, VFN3)
+                If (LAnd (ECON, ETMD))
+                {
+                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
+                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                }
+            }
+        }
+
+        Device (FAN3)
+        {
+            Name (_HID, EisaId ("PNP0C0B"))
+            Name (_UID, 0x03)
+            Name (_PR0, Package (0x01)
+            {
+                FN03
+            })
+        }
+
+        PowerResource (FN04, 0x00, 0x0000)
+        {
+            Method (_STA, 0, Serialized)
+            {
+                Return (VFN4)
+            }
+
+            Method (_ON, 0, Serialized)
+            {
+                Store (One, VFN4)
+                If (LAnd (ECON, ETMD))
+                {
+                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
+                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                }
+            }
+
+            Method (_OFF, 0, Serialized)
+            {
+                Store (Zero, VFN4)
+                If (LAnd (ECON, ETMD))
+                {
+                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
+                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                }
+            }
+        }
+
+        Device (FAN4)
+        {
+            Name (_HID, EisaId ("PNP0C0B"))
+            Name (_UID, 0x04)
+            Name (_PR0, Package (0x01)
+            {
+                FN04
+            })
+        }
+
+        ThermalZone (TZ00)
+        {
+            Name (PTMP, 0x0BB8)
+            Method (_SCP, 1, Serialized)
+            {
+                Store (Arg0, CTYP)
+            }
+
+            Method (_CRT, 0, Serialized)
+            {
+                If (CondRefOf (\_PR.ACRT))
+                {
+                    If (LNotEqual (\_PR.ACRT, Zero))
+                    {
+                        Return (Add (0x0AAC, Multiply (\_PR.ACRT, 0x0A)))
+                    }
+                }
+
+                Return (Add (0x0AAC, Multiply (CRTT, 0x0A)))
+            }
+
+            Method (_AC0, 0, Serialized)
+            {
+                If (CondRefOf (\_PR.AAC0))
+                {
+                    If (LNotEqual (\_PR.AAC0, Zero))
+                    {
+                        Return (Add (0x0AAC, Multiply (\_PR.AAC0, 0x0A)))
+                    }
+                }
+
+                Return (Add (0x0AAC, Multiply (ACTT, 0x0A)))
+            }
+
+            Method (_AC1, 0, Serialized)
+            {
+                Return (Add (0x0AAC, Multiply (ACT1, 0x0A)))
+            }
+
+            Method (_AC2, 0, Serialized)
+            {
+                Return (0x0AAC)
+            }
+
+            Method (_AC3, 0, Serialized)
+            {
+                Return (0x0AAC)
+            }
+
+            Method (_AC4, 0, Serialized)
+            {
+                Return (0x0AAC)
+            }
+
+            Name (_AL0, Package (0x01)
+            {
+                FAN0
+            })
+            Name (_AL1, Package (0x01)
+            {
+                FAN1
+            })
+            Name (_AL2, Package (0x01)
+            {
+                FAN2
+            })
+            Name (_AL3, Package (0x01)
+            {
+                FAN3
+            })
+            Name (_AL4, Package (0x01)
+            {
+                FAN4
+            })
+            Method (_TMP, 0, Serialized)
+            {
+                If (LNot (ETMD))
+                {
+                    Return (0x0BB8)
+                }
+
+                If (LEqual (DTSE, 0x03))
+                {
+                    Return (Add (0x0B10, Multiply (CRTT, 0x0A)))
+                }
+
+                If (LEqual (DTSE, One))
+                {
+                    If (LEqual (PKGA, One))
+                    {
+                        Store (PDTS, Local0)
+                        Return (Add (0x0AAC, Multiply (Local0, 0x0A)))
+                    }
+
+                    Store (DTS1, Local0)
+                    If (LGreater (DTS2, Local0))
+                    {
+                        Store (DTS2, Local0)
+                    }
+
+                    If (LGreater (DTS3, Local0))
+                    {
+                        Store (DTS3, Local0)
+                    }
+
+                    If (LGreater (DTS4, Local0))
+                    {
+                        Store (DTS4, Local0)
+                    }
+
+                    Return (Add (0x0AAC, Multiply (Local0, 0x0A)))
+                }
+
+                If (ECON)
+                {
+                    Store (\_SB.PCI0.LPCB.H_EC.PLMX, Local0)
+                    Add (0x0AAC, Multiply (Local0, 0x0A), Local0)
+                    Store (Local0, PTMP)
+                    Return (Local0)
+                }
+
+                Return (0x0BC2)
+            }
+        }
+
+        ThermalZone (TZ01)
+        {
+            Name (PTMP, 0x0BB8)
+            Method (_SCP, 1, Serialized)
+            {
+                Store (Arg0, CTYP)
+            }
+
+            Method (_CRT, 0, Serialized)
+            {
+                If (CondRefOf (\_PR.ACRT))
+                {
+                    If (LNotEqual (\_PR.ACRT, Zero))
+                    {
+                        Return (Add (0x0AAC, Multiply (\_PR.ACRT, 0x0A)))
+                    }
+                }
+
+                Return (Add (0x0AAC, Multiply (CRTT, 0x0A)))
+            }
+
+            Method (_TMP, 0, Serialized)
+            {
+                If (LNot (ETMD))
+                {
+                    Return (0x0BCC)
+                }
+
+                If (LEqual (DTSE, 0x03))
+                {
+                    Return (Add (0x0B10, Multiply (CRTT, 0x0A)))
+                }
+
+                If (LEqual (DTSE, One))
+                {
+                    If (LEqual (PKGA, One))
+                    {
+                        Store (PDTS, Local0)
+                        Return (Add (0x0AAC, Multiply (Local0, 0x0A)))
+                    }
+
+                    Store (DTS1, Local0)
+                    If (LGreater (DTS2, Local0))
+                    {
+                        Store (DTS2, Local0)
+                    }
+
+                    If (LGreater (DTS3, Local0))
+                    {
+                        Store (DTS3, Local0)
+                    }
+
+                    If (LGreater (DTS4, Local0))
+                    {
+                        Store (DTS4, Local0)
+                    }
+
+                    Return (Add (0x0AAC, Multiply (Local0, 0x0A)))
+                }
+
+                If (ECON)
+                {
+                    Store (\_SB.PCI0.LPCB.H_EC.PECH, Local0)
+                    Multiply (Local0, 0x0A, Local0)
+                    Store (\_SB.PCI0.LPCB.H_EC.PECL, Local1)
+                    ShiftRight (Local1, 0x02, Local1)
+                    Store (Divide (Multiply (Local1, 0x0A), 0x40, ), Local1)
+                    Add (Local0, Local1, Local0)
+                    Add (0x0AAC, Local0, Local0)
+                    Store (Local0, PTMP)
+                    Return (Local0)
+                }
+
+                Return (0x0BD6)
+            }
+
+            Method (_PSL, 0, Serialized)
+            {
+                If (LEqual (TCNT, 0x08))
+                {
+                    Return (Package (0x08)
+                    {
+                        \_PR.CPU0, 
+                        \_PR.CPU1, 
+                        \_PR.CPU2, 
+                        \_PR.CPU3, 
+                        \_PR.CPU4, 
+                        \_PR.CPU5, 
+                        \_PR.CPU6, 
+                        \_PR.CPU7
+                    })
+                }
+
+                If (LEqual (TCNT, 0x04))
+                {
+                    Return (Package (0x04)
+                    {
+                        \_PR.CPU0, 
+                        \_PR.CPU1, 
+                        \_PR.CPU2, 
+                        \_PR.CPU3
+                    })
+                }
+
+                If (LEqual (TCNT, 0x02))
+                {
+                    Return (Package (0x02)
+                    {
+                        \_PR.CPU0, 
+                        \_PR.CPU1
+                    })
+                }
+
+                Return (Package (0x01)
+                {
+                    \_PR.CPU0
+                })
+            }
+
+            Method (_PSV, 0, Serialized)
+            {
+                If (CondRefOf (\_PR.APSV))
+                {
+                    If (LNotEqual (\_PR.APSV, Zero))
+                    {
+                        Return (Add (0x0AAC, Multiply (\_PR.APSV, 0x0A)))
+                    }
+                }
+
+                Return (Add (0x0AAC, Multiply (PSVT, 0x0A)))
+            }
+
+            Method (_TC1, 0, Serialized)
+            {
+                Return (TC1V)
+            }
+
+            Method (_TC2, 0, Serialized)
+            {
+                Return (TC2V)
+            }
+
+            Method (_TSP, 0, Serialized)
+            {
+                Return (TSPV)
+            }
+        }
+    }
+
+    Scope (_SB.PCI0.LPCB)
+    {
+        Method (SIOH, 0, NotSerialized)
+        {
+            If (And (PMFG, 0x10))
+            {
+                Notify (PS2K, 0x02)
+            }
+
+            If (And (PMFG, 0x20))
+            {
+                Notify (PS2M, 0x02)
+            }
+        }
+    }
+
+    Name (TPMF, Zero)
+    Scope (\)
+    {
+        Device (AMW0)
+        {
+            Name (_HID, EisaId ("PNP0C14"))
+            Name (_UID, "ASUSWMI")
+            Name (_WDG, Buffer (0x50)
+            {
+                /* 0000 */    0xD0, 0x5E, 0x84, 0x97, 0x6D, 0x4E, 0xDE, 0x11, 
+                /* 0008 */    0x8A, 0x39, 0x08, 0x00, 0x20, 0x0C, 0x9A, 0x66, 
+                /* 0010 */    0x42, 0x43, 0x01, 0x02, 0xA0, 0x47, 0x67, 0x46, 
+                /* 0018 */    0xEC, 0x70, 0xDE, 0x11, 0x8A, 0x39, 0x08, 0x00, 
+                /* 0020 */    0x20, 0x0C, 0x9A, 0x66, 0x42, 0x44, 0x01, 0x02, 
+                /* 0028 */    0x72, 0x0F, 0xBC, 0xAB, 0xA1, 0x8E, 0xD1, 0x11, 
+                /* 0030 */    0x00, 0xA0, 0xC9, 0x06, 0x29, 0x10, 0x00, 0x00, 
+                /* 0038 */    0xD2, 0x00, 0x01, 0x08, 0x21, 0x12, 0x90, 0x05, 
+                /* 0040 */    0x66, 0xD5, 0xD1, 0x11, 0xB2, 0xF0, 0x00, 0xA0, 
+                /* 0048 */    0xC9, 0x06, 0x29, 0x10, 0x4D, 0x4F, 0x01, 0x00
+            })
+            Name (CCAC, Zero)
+            Name (ECD2, Zero)
+            Name (EID2, Zero)
+            Method (WED2, 1, NotSerialized)
+            {
+                Store (Arg0, ECD2)
+            }
+
+            Method (WMBC, 3, NotSerialized)
+            {
+                Store (One, Local0)
+                Name (_T_0, Zero)
+                Store (Arg1, _T_0)
+                If (LEqual (_T_0, 0x43455053))
+                {
+                    Return (SPEC (Arg2))
+                }
+                Else
+                {
+                    If (LEqual (_T_0, 0x50564544))
+                    {
+                        Return (DEVP (Arg2))
+                    }
+                    Else
+                    {
+                        If (LEqual (_T_0, 0x50534453))
+                        {
+                            Return (SDSP (Arg2))
+                        }
+                        Else
+                        {
+                            If (LEqual (_T_0, 0x50534447))
+                            {
+                                Return (GDSP (Arg2))
+                            }
+                            Else
+                            {
+                                If (LEqual (_T_0, 0x53564544))
+                                {
+                                    Return (DEVS (Arg2))
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, 0x53544344))
+                                    {
+                                        Return (DSTS (Arg2))
+                                    }
+                                    Else
+                                    {
+                                        If (LEqual (_T_0, 0x44495047))
+                                        {
+                                            Return (GPID ())
+                                        }
+                                        Else
+                                        {
+                                            If (LEqual (_T_0, 0x5446424B))
+                                            {
+                                                Return (KBFT (Arg2))
+                                            }
+                                            Else
+                                            {
+                                                If (LEqual (_T_0, 0x59454B48))
+                                                {
+                                                    Return (HKEY ())
+                                                }
+                                                Else
+                                                {
+                                                    Return (Zero)
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Return (Local0)
+            }
+
+            Method (RSMB, 1, Serialized)
+            {
+                Return (Zero)
+            }
+
+            Method (WSMB, 1, Serialized)
+            {
+                Return (Zero)
+            }
+
+            Method (RSMW, 1, Serialized)
+            {
+                Return (Zero)
+            }
+
+            Method (WSMW, 1, Serialized)
+            {
+                Return (Zero)
+            }
+
+            Method (RSMK, 1, Serialized)
+            {
+                Return (Zero)
+            }
+
+            Method (WSMK, 1, Serialized)
+            {
+                Return (Zero)
+            }
+
+            Method (WMBD, 3, NotSerialized)
+            {
+                Store (One, Local0)
+                Name (_T_0, Zero)
+                Store (Arg1, _T_0)
+                If (LEqual (_T_0, 0x424D5352))
+                {
+                    Return (RSMB (Arg2))
+                }
+                Else
+                {
+                    If (LEqual (_T_0, 0x424D5357))
+                    {
+                        Return (WSMB (Arg2))
+                    }
+                    Else
+                    {
+                        If (LEqual (_T_0, 0x574D5352))
+                        {
+                            Return (RSMW (Arg2))
+                        }
+                        Else
+                        {
+                            If (LEqual (_T_0, 0x574D5357))
+                            {
+                                Return (WSMW (Arg2))
+                            }
+                            Else
+                            {
+                                If (LEqual (_T_0, 0x4B4D5352))
+                                {
+                                    Return (RSMK (Arg2))
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, 0x4B4D5357))
+                                    {
+                                        Return (WSMK (Arg2))
+                                    }
+                                    Else
+                                    {
+                                        Return (Zero)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Return (Local0)
+            }
+
+            Method (_WED, 1, NotSerialized)
+            {
+                If (LEqual (Arg0, 0xD2))
+                {
+                    Return (EID2)
+                }
+
+                Return (Zero)
+            }
+
+            Method (AMWR, 1, Serialized)
+            {
+                Store (Zero, Local1)
+                If (ECD2)
+                {
+                    Store (Arg0, EID2)
+                    Notify (AMW0, 0xD2)
+                    Store (One, Local1)
+                }
+                Else
+                {
+                }
+
+                Return (Local1)
+            }
+
+            Method (AMWN, 1, Serialized)
+            {
+                Store (AMWR (Arg0), Local0)
+                Return (Local0)
+            }
+
+            Name (WQMO, Buffer (0x09A6)
+            {
+                /* 0000 */    0x46, 0x4F, 0x4D, 0x42, 0x01, 0x00, 0x00, 0x00, 
+                /* 0008 */    0x96, 0x09, 0x00, 0x00, 0x42, 0x38, 0x00, 0x00, 
+                /* 0010 */    0x44, 0x53, 0x00, 0x01, 0x1A, 0x7D, 0xDA, 0x54, 
+                /* 0018 */    0xA8, 0xD1, 0x9A, 0x00, 0x01, 0x06, 0x18, 0x42, 
+                /* 0020 */    0x10, 0x07, 0x10, 0x4A, 0x29, 0x86, 0x42, 0x04, 
+                /* 0028 */    0x0A, 0x0D, 0xA1, 0x38, 0x0A, 0x60, 0x30, 0x12, 
+                /* 0030 */    0x20, 0x24, 0x07, 0x42, 0x2E, 0x98, 0x98, 0x00, 
+                /* 0038 */    0x11, 0x10, 0xF2, 0x2A, 0xC0, 0xA6, 0x00, 0x93, 
+                /* 0040 */    0x20, 0xEA, 0xDF, 0x1F, 0xA2, 0x24, 0x38, 0x94, 
+                /* 0048 */    0x10, 0x08, 0x49, 0x14, 0x60, 0x5E, 0x80, 0x6E, 
+                /* 0050 */    0x01, 0x86, 0x05, 0xD8, 0x16, 0x60, 0x5A, 0x80, 
+                /* 0058 */    0x63, 0x48, 0x2A, 0x0D, 0x9C, 0x12, 0x58, 0x0A, 
+                /* 0060 */    0x84, 0x84, 0x0A, 0x50, 0x2E, 0xC0, 0xB7, 0x00, 
+                /* 0068 */    0xED, 0x88, 0x92, 0x2C, 0xC0, 0x32, 0x8C, 0x08, 
+                /* 0070 */    0x3C, 0x8A, 0xC8, 0x46, 0xE3, 0x04, 0x65, 0x43, 
+                /* 0078 */    0xA3, 0x64, 0x40, 0xC8, 0xB3, 0x00, 0xEB, 0xC0, 
+                /* 0080 */    0x84, 0xC0, 0xEE, 0x05, 0x98, 0x13, 0xE0, 0x4D, 
+                /* 0088 */    0x80, 0xB8, 0x61, 0x68, 0x85, 0x07, 0x10, 0xAA, 
+                /* 0090 */    0x30, 0x01, 0xB6, 0x60, 0x84, 0x52, 0x1B, 0x8C, 
+                /* 0098 */    0x50, 0x1A, 0x43, 0xD0, 0x30, 0x8C, 0x12, 0xF1, 
+                /* 00A0 */    0x90, 0x3A, 0x83, 0x15, 0x4A, 0xC4, 0x30, 0x21, 
+                /* 00A8 */    0x22, 0x54, 0x86, 0x41, 0x86, 0x15, 0x2A, 0x5A, 
+                /* 00B0 */    0xDC, 0x08, 0xED, 0x0F, 0x82, 0x44, 0x5B, 0xB1, 
+                /* 00B8 */    0x86, 0xEA, 0x48, 0xA3, 0x41, 0x0D, 0x2F, 0xC1, 
+                /* 00C0 */    0xE1, 0x7A, 0xA8, 0xE7, 0xD8, 0xB9, 0x00, 0xE9, 
+                /* 00C8 */    0xC0, 0x02, 0x09, 0x7E, 0x16, 0x75, 0x8E, 0x93, 
+                /* 00D0 */    0x80, 0x24, 0x30, 0xD6, 0xF1, 0xB3, 0x81, 0xE3, 
+                /* 00D8 */    0x5D, 0x03, 0x6A, 0xC6, 0xC7, 0xCB, 0x04, 0xC1, 
+                /* 00E0 */    0xA1, 0x86, 0xE8, 0x81, 0x86, 0x3B, 0x81, 0x43, 
+                /* 00E8 */    0x64, 0x80, 0x9E, 0xD3, 0xD1, 0x60, 0x0E, 0x00, 
+                /* 00F0 */    0x76, 0x38, 0x19, 0xDD, 0x03, 0x4A, 0x15, 0x60, 
+                /* 00F8 */    0x76, 0xCC, 0xB2, 0x08, 0xA4, 0xF1, 0x18, 0xFA, 
+                /* 0100 */    0x74, 0xCF, 0xE7, 0x84, 0x13, 0x58, 0xFE, 0x20, 
+                /* 0108 */    0x50, 0x23, 0x33, 0xB4, 0x0D, 0x4E, 0x4B, 0x98, 
+                /* 0110 */    0x21, 0x0F, 0xFF, 0xB0, 0x98, 0x58, 0x08, 0x7D, 
+                /* 0118 */    0x10, 0x3C, 0x1E, 0x78, 0xFF, 0xFF, 0xF1, 0x80, 
+                /* 0120 */    0x47, 0xF1, 0x99, 0x40, 0x08, 0xAF, 0x04, 0xB1, 
+                /* 0128 */    0x3D, 0xA0, 0xE7, 0x04, 0x03, 0x63, 0x07, 0x64, 
+                /* 0130 */    0xBF, 0x02, 0x10, 0x82, 0x97, 0x39, 0x22, 0x39, 
+                /* 0138 */    0x45, 0xD0, 0x98, 0x8C, 0xD1, 0x2A, 0x84, 0x86, 
+                /* 0140 */    0x10, 0xDA, 0x10, 0x67, 0x17, 0xFF, 0xE0, 0x0D, 
+                /* 0148 */    0x73, 0xEE, 0x26, 0x28, 0x72, 0x04, 0xA8, 0xCF, 
+                /* 0150 */    0x84, 0x47, 0xC0, 0x8F, 0x01, 0xD1, 0x43, 0x9F, 
+                /* 0158 */    0x4D, 0xF4, 0xE3, 0x89, 0x72, 0x12, 0x07, 0xE4, 
+                /* 0160 */    0x33, 0x83, 0x11, 0x82, 0x97, 0x7B, 0x48, 0x20, 
+                /* 0168 */    0x9A, 0xE7, 0xA0, 0x13, 0xC3, 0x39, 0x1D, 0x02, 
+                /* 0170 */    0x53, 0xA3, 0x05, 0xA2, 0x09, 0x10, 0x45, 0x59, 
+                /* 0178 */    0xAA, 0x6C, 0x2C, 0xD5, 0x83, 0xA0, 0x82, 0x80, 
+                /* 0180 */    0x34, 0x77, 0x43, 0x9C, 0xB4, 0x91, 0x03, 0xC7, 
+                /* 0188 */    0xA8, 0x7E, 0xD8, 0x54, 0x04, 0x9C, 0x0E, 0x1B, 
+                /* 0190 */    0x1E, 0xB7, 0xE3, 0x93, 0x28, 0xFA, 0x80, 0x28, 
+                /* 0198 */    0x9C, 0xC3, 0x9E, 0x39, 0x28, 0x88, 0x01, 0x9D, 
+                /* 01A0 */    0x04, 0x42, 0x4E, 0x8E, 0x02, 0xA8, 0xBD, 0x68, 
+                /* 01A8 */    0x58, 0x1A, 0xD7, 0xA9, 0xBD, 0x09, 0x78, 0x5A, 
+                /* 01B0 */    0x8F, 0x05, 0x87, 0x71, 0x5C, 0x67, 0x6D, 0xD1, 
+                /* 01B8 */    0x37, 0x06, 0x3A, 0x1F, 0xDF, 0x05, 0xB8, 0x06, 
+                /* 01C0 */    0x08, 0xCD, 0xC8, 0xF0, 0x56, 0x03, 0x48, 0xC1, 
+                /* 01C8 */    0xF8, 0x49, 0xE0, 0x11, 0xC0, 0x04, 0xD6, 0x75, 
+                /* 01D0 */    0x20, 0x80, 0x7E, 0xD9, 0xF0, 0xF0, 0x7D, 0xC2, 
+                /* 01D8 */    0x78, 0xBC, 0x48, 0x50, 0xDF, 0x7D, 0x00, 0x14, 
+                /* 01E0 */    0x40, 0x3E, 0x00, 0x58, 0xE9, 0x1D, 0x80, 0x8E, 
+                /* 01E8 */    0x21, 0x44, 0x98, 0x68, 0x46, 0xE7, 0x12, 0x56, 
+                /* 01F0 */    0xAA, 0xFF, 0xFF, 0x68, 0xF9, 0x41, 0xC5, 0xA3, 
+                /* 01F8 */    0x35, 0x88, 0x47, 0xEB, 0x40, 0xA3, 0x45, 0x1F, 
+                /* 0200 */    0x33, 0xAC, 0x70, 0x54, 0xF2, 0x39, 0x01, 0x0D, 
+                /* 0208 */    0x17, 0x06, 0x41, 0xE1, 0x07, 0x0E, 0x68, 0x80, 
+                /* 0210 */    0xA7, 0xF7, 0x66, 0xE0, 0x99, 0x18, 0xCE, 0xF3, 
+                /* 0218 */    0xE5, 0x70, 0x9E, 0x2F, 0x1F, 0x8E, 0x0F, 0x14, 
+                /* 0220 */    0xF0, 0x07, 0x8C, 0x25, 0x28, 0x70, 0xC2, 0x20, 
+                /* 0228 */    0x87, 0xC7, 0x08, 0x1E, 0x2C, 0x95, 0x35, 0x2E, 
+                /* 0230 */    0xD4, 0xFD, 0xC0, 0x27, 0x1A, 0x86, 0x7D, 0xA8, 
+                /* 0238 */    0x47, 0xF3, 0x96, 0x70, 0x86, 0x6F, 0x13, 0x07, 
+                /* 0240 */    0xF5, 0xEE, 0x61, 0xA7, 0x42, 0x2D, 0x3A, 0x84, 
+                /* 0248 */    0xF5, 0x48, 0x39, 0xAC, 0xD1, 0xC2, 0x1E, 0xF0, 
+                /* 0250 */    0x73, 0x87, 0xEF, 0x19, 0xFC, 0x4A, 0xE3, 0x63, 
+                /* 0258 */    0x08, 0x5D, 0x85, 0x4E, 0x15, 0x5C, 0x14, 0x84, 
+                /* 0260 */    0xE2, 0xAD, 0x45, 0xC3, 0x3F, 0x0B, 0x8F, 0xEB, 
+                /* 0268 */    0x15, 0xC3, 0x57, 0x80, 0x87, 0x13, 0x9F, 0x01, 
+                /* 0270 */    0xE2, 0x07, 0x3A, 0x82, 0x17, 0x11, 0x9F, 0x7D, 
+                /* 0278 */    0x7C, 0x79, 0xF1, 0x21, 0x83, 0x9D, 0x2C, 0x78, 
+                /* 0280 */    0x08, 0x0A, 0xC5, 0x38, 0x1C, 0xA0, 0x84, 0xC3, 
+                /* 0288 */    0x08, 0xCE, 0x20, 0x1E, 0x9E, 0x83, 0x1C, 0x0E, 
+                /* 0290 */    0xD0, 0xE7, 0x20, 0x0F, 0x84, 0x0D, 0xC2, 0x20, 
+                /* 0298 */    0xE7, 0xF1, 0xF2, 0xC3, 0x2E, 0x16, 0xF8, 0xFF, 
+                /* 02A0 */    0xFF, 0xC5, 0x02, 0x78, 0xA5, 0x19, 0x14, 0x5A, 
+                /* 02A8 */    0xCF, 0xA0, 0x20, 0x60, 0x3C, 0x3F, 0x78, 0xBC, 
+                /* 02B0 */    0x9E, 0xAD, 0xA7, 0x05, 0xDE, 0x11, 0xFB, 0xFC, 
+                /* 02B8 */    0x01, 0x9C, 0xC3, 0x1F, 0x5E, 0x50, 0x71, 0x87, 
+                /* 02C0 */    0x44, 0x41, 0x7C, 0x36, 0x70, 0x94, 0xF1, 0xA2, 
+                /* 02C8 */    0x67, 0xE2, 0xC3, 0x90, 0x8F, 0x0B, 0x4F, 0x37, 
+                /* 02D0 */    0x98, 0xC3, 0x07, 0xB8, 0x47, 0xE2, 0xC3, 0x07, 
+                /* 02D8 */    0xF0, 0xF8, 0xFF, 0x1F, 0x3E, 0x80, 0x9F, 0x44, 
+                /* 02E0 */    0x8B, 0x5A, 0x85, 0x1E, 0x3E, 0xC0, 0x15, 0xE4, 
+                /* 02E8 */    0x84, 0x84, 0x96, 0x73, 0xF8, 0x40, 0x4E, 0x24, 
+                /* 02F0 */    0x4C, 0x74, 0x9F, 0x91, 0x5E, 0x3C, 0x2C, 0xE1, 
+                /* 02F8 */    0xE0, 0x81, 0x0A, 0x4F, 0xA2, 0xF8, 0xA7, 0x02, 
+                /* 0300 */    0x54, 0xE0, 0x53, 0x01, 0x05, 0x31, 0xA0, 0x0F, 
+                /* 0308 */    0x15, 0x70, 0x66, 0xF0, 0xEC, 0x85, 0x99, 0x07, 
+                /* 0310 */    0x8C, 0x33, 0x12, 0x60, 0xEB, 0x50, 0x01, 0xDE, 
+                /* 0318 */    0xFF, 0xFF, 0xA1, 0x02, 0x38, 0x1C, 0x90, 0x00, 
+                /* 0320 */    0x59, 0x12, 0x2F, 0x48, 0x0F, 0x15, 0xE0, 0x3A, 
+                /* 0328 */    0x70, 0xFA, 0x50, 0xC1, 0x0F, 0x9A, 0x16, 0x05, 
+                /* 0330 */    0xA4, 0x23, 0x9E, 0x0F, 0x15, 0x30, 0x2E, 0x42, 
+                /* 0338 */    0x86, 0x7F, 0xAD, 0x3B, 0x96, 0xE7, 0x30, 0x72, 
+                /* 0340 */    0xAE, 0x40, 0xC7, 0x3E, 0x18, 0xA0, 0x82, 0x8E, 
+                /* 0348 */    0x9E, 0x82, 0x18, 0xD0, 0x29, 0x0E, 0x06, 0x68, 
+                /* 0350 */    0x1D, 0xE7, 0x0A, 0xD4, 0x31, 0x0E, 0xF8, 0xFD, 
+                /* 0358 */    0xFF, 0xCF, 0x14, 0xC0, 0x49, 0xC4, 0xD1, 0x0A, 
+                /* 0360 */    0x35, 0x5C, 0x8F, 0xD5, 0x20, 0x1E, 0xAB, 0x8F, 
+                /* 0368 */    0xA1, 0x1E, 0x2B, 0xEE, 0x1B, 0xE0, 0x23, 0x00, 
+                /* 0370 */    0xFE, 0xE8, 0x84, 0x03, 0x7B, 0xAE, 0x00, 0x4C, 
+                /* 0378 */    0x7B, 0x3C, 0x57, 0x80, 0x4E, 0xDA, 0xD9, 0x07, 
+                /* 0380 */    0x1D, 0x70, 0xAD, 0x3A, 0x89, 0xE1, 0xCF, 0x71, 
+                /* 0388 */    0x8C, 0x60, 0xA8, 0xC3, 0x1B, 0x85, 0x70, 0x1C, 
+                /* 0390 */    0x0A, 0x85, 0x39, 0x19, 0xD0, 0xFF, 0xFF, 0x11, 
+                /* 0398 */    0x96, 0xC0, 0x51, 0x10, 0x0F, 0xCD, 0x61, 0xCE, 
+                /* 03A0 */    0x70, 0xA0, 0x39, 0x16, 0xC0, 0xBB, 0x55, 0xB0, 
+                /* 03A8 */    0x63, 0x01, 0x6C, 0x02, 0x1F, 0x0B, 0xC0, 0x17, 
+                /* 03B0 */    0x67, 0x58, 0xE8, 0xD1, 0xFA, 0xFE, 0x87, 0xBB, 
+                /* 03B8 */    0x3F, 0x44, 0x79, 0x29, 0xF6, 0x21, 0x07, 0xEE, 
+                /* 03C0 */    0xB8, 0xC0, 0x71, 0x7A, 0x00, 0x5C, 0x1D, 0xC4, 
+                /* 03C8 */    0xE4, 0xF4, 0xF4, 0x00, 0xAE, 0x24, 0xA7, 0x07, 
+                /* 03D0 */    0xD4, 0x80, 0xFD, 0xFF, 0xD7, 0x03, 0xA4, 0x73, 
+                /* 03D8 */    0x02, 0xF6, 0xA2, 0xCD, 0x20, 0x4E, 0xF4, 0x79, 
+                /* 03E0 */    0xC4, 0x0A, 0x8E, 0x38, 0xA8, 0xEC, 0x24, 0x4A, 
+                /* 03E8 */    0x7E, 0xC4, 0x41, 0x65, 0x1D, 0x3B, 0x05, 0x31, 
+                /* 03F0 */    0xA0, 0x4F, 0x94, 0x80, 0x8F, 0x3B, 0x0E, 0xB0, 
+                /* 03F8 */    0xD8, 0xA8, 0x27, 0xCB, 0x23, 0x4F, 0x96, 0x82, 
+                /* 0400 */    0x78, 0xB2, 0xBE, 0x54, 0x00, 0x87, 0x1B, 0x0E, 
+                /* 0408 */    0xB0, 0xFF, 0xFF, 0x5F, 0x2A, 0x80, 0x92, 0x43, 
+                /* 0410 */    0xA9, 0x97, 0x0A, 0x90, 0xC9, 0xBB, 0xE1, 0xA0, 
+                /* 0418 */    0x43, 0xAE, 0x55, 0xF7, 0x3A, 0x76, 0x6C, 0xF5, 
+                /* 0420 */    0xB8, 0x7D, 0x93, 0xC6, 0x04, 0xBB, 0xE1, 0xA0, 
+                /* 0428 */    0x22, 0x51, 0x28, 0xD0, 0xB9, 0x00, 0x15, 0x01, 
+                /* 0430 */    0x8E, 0x82, 0x78, 0x68, 0x3E, 0x17, 0x58, 0xC9, 
+                /* 0438 */    0xB9, 0x00, 0xED, 0xFD, 0x42, 0x41, 0x06, 0xE7, 
+                /* 0440 */    0x7B, 0x81, 0x61, 0x8A, 0x1F, 0x8A, 0xEE, 0x3D, 
+                /* 0448 */    0x3E, 0x17, 0x80, 0xFB, 0x8A, 0x03, 0x2E, 0x63, 
+                /* 0450 */    0x02, 0xB4, 0x41, 0x92, 0x7B, 0xB8, 0xC7, 0x85, 
+                /* 0458 */    0x1B, 0x87, 0x47, 0x75, 0x4C, 0x31, 0x9F, 0xE3, 
+                /* 0460 */    0x82, 0x3C, 0xC7, 0x79, 0x5E, 0xB8, 0xF3, 0x03, 
+                /* 0468 */    0x70, 0xFB, 0xFF, 0x0F, 0x0C, 0xD6, 0x85, 0x0B, 
+                /* 0470 */    0x88, 0x0B, 0x35, 0x29, 0xF1, 0xFC, 0x00, 0xAE, 
+                /* 0478 */    0x5B, 0xB7, 0xEF, 0x85, 0x38, 0x29, 0x77, 0x57, 
+                /* 0480 */    0x14, 0xC6, 0x2B, 0x49, 0x0C, 0xDF, 0x53, 0x8D, 
+                /* 0488 */    0x6D, 0x98, 0x03, 0x38, 0x15, 0xE3, 0x24, 0x18, 
+                /* 0490 */    0xFC, 0xEC, 0x40, 0xC7, 0xE5, 0xC8, 0x24, 0xBA, 
+                /* 0498 */    0xED, 0xFB, 0x08, 0xC1, 0x63, 0x8E, 0x9E, 0x82, 
+                /* 04A0 */    0x18, 0xD0, 0x19, 0x4E, 0x2A, 0x68, 0x15, 0x20, 
+                /* 04A8 */    0x9A, 0x02, 0xE6, 0xE6, 0x0A, 0xF8, 0xFB, 0xFF, 
+                /* 04B0 */    0xDF, 0x5C, 0x01, 0x56, 0xB8, 0x54, 0xA8, 0x51, 
+                /* 04B8 */    0xEA, 0x91, 0x02, 0x5C, 0x77, 0x40, 0xDF, 0xC2, 
+                /* 04C0 */    0x70, 0x92, 0x80, 0x74, 0x65, 0x3D, 0x8D, 0x07, 
+                /* 04C8 */    0x00, 0x5F, 0x29, 0x60, 0x5C, 0x3C, 0xD9, 0x11, 
+                /* 04D0 */    0x87, 0xDF, 0xAE, 0x7D, 0x2C, 0x00, 0xE6, 0xFF, 
+                /* 04D8 */    0xFF, 0x2B, 0x21, 0x58, 0x8F, 0x05, 0xC0, 0x5B, 
+                /* 04E0 */    0xA4, 0x4B, 0x8B, 0x66, 0x8F, 0x05, 0xE0, 0x12, 
+                /* 04E8 */    0xBF, 0x0A, 0x7A, 0x50, 0xB1, 0x5C, 0x18, 0x94, 
+                /* 04F0 */    0x84, 0xB1, 0x43, 0x19, 0xCD, 0xC1, 0x1C, 0x43, 
+                /* 04F8 */    0x70, 0x76, 0x86, 0x31, 0x1C, 0x1F, 0xA8, 0xA7, 
+                /* 0500 */    0xFE, 0x58, 0x7B, 0x1A, 0xAF, 0x68, 0xBE, 0xE2, 
+                /* 0508 */    0xF9, 0x3E, 0x4A, 0x87, 0x88, 0xBA, 0xEA, 0x79, 
+                /* 0510 */    0xAC, 0x6F, 0x05, 0xA7, 0xF6, 0xAC, 0xE7, 0x6B, 
+                /* 0518 */    0x8B, 0x61, 0x12, 0x78, 0x88, 0x0C, 0x8D, 0x13, 
+                /* 0520 */    0xBC, 0x23, 0x19, 0x9A, 0xCB, 0x80, 0xD0, 0x5D, 
+                /* 0528 */    0xE9, 0x35, 0xC0, 0x73, 0x33, 0x41, 0xF7, 0x43, 
+                /* 0530 */    0x97, 0x42, 0x04, 0x9D, 0x00, 0xDE, 0x09, 0x6A, 
+                /* 0538 */    0x14, 0xE0, 0xED, 0x2A, 0x20, 0x5B, 0x02, 0xC4, 
+                /* 0540 */    0x8D, 0x5E, 0x58, 0x6F, 0x45, 0x51, 0x42, 0x44, 
+                /* 0548 */    0x08, 0x1A, 0xC5, 0x78, 0x11, 0x42, 0x85, 0x88, 
+                /* 0550 */    0x12, 0xB5, 0x39, 0x10, 0x5D, 0x8E, 0xA2, 0x06, 
+                /* 0558 */    0x89, 0x16, 0xCC, 0x08, 0xCC, 0xFE, 0x20, 0x88, 
+                /* 0560 */    0xF4, 0x67, 0x80, 0x2E, 0x33, 0xBE, 0x0C, 0x7B, 
+                /* 0568 */    0x34, 0xFC, 0x2C, 0xC5, 0x87, 0x7A, 0x8E, 0x8F, 
+                /* 0570 */    0x8A, 0xEC, 0xFF, 0x0F, 0xF2, 0x5A, 0x68, 0x9D, 
+                /* 0578 */    0xE3, 0x24, 0x87, 0x1C, 0x83, 0xEB, 0x0C, 0x01, 
+                /* 0580 */    0xCD, 0x35, 0xA0, 0x8E, 0xFD, 0x1E, 0xAF, 0xBF, 
+                /* 0588 */    0x1A, 0x86, 0xE3, 0x43, 0xF4, 0xA1, 0xC2, 0x13, 
+                /* 0590 */    0x38, 0x44, 0x06, 0xE8, 0x43, 0x04, 0xFC, 0xF1, 
+                /* 0598 */    0x18, 0xFA, 0x29, 0xC2, 0x13, 0x7E, 0xA1, 0x25, 
+                /* 05A0 */    0x83, 0x40, 0x9D, 0x34, 0xF8, 0x48, 0x5F, 0xB8, 
+                /* 05A8 */    0xD9, 0xED, 0xC3, 0x04, 0x16, 0x7B, 0x76, 0xA0, 
+                /* 05B0 */    0xE3, 0x01, 0xBF, 0xE2, 0x33, 0x81, 0xAE, 0x71, 
+                /* 05B8 */    0xC6, 0xF6, 0xC9, 0xC8, 0x11, 0x0E, 0x22, 0x50, 
+                /* 05C0 */    0x40, 0x9F, 0x4D, 0xF8, 0xCD, 0x83, 0x1D, 0x2D, 
+                /* 05C8 */    0xB8, 0xA8, 0xA3, 0x05, 0xEA, 0xB4, 0xE0, 0x83, 
+                /* 05D0 */    0x02, 0x43, 0x7C, 0xF8, 0x34, 0xC4, 0x93, 0x05, 
+                /* 05D8 */    0x3B, 0xEA, 0x80, 0x53, 0xDE, 0x21, 0x04, 0x14, 
+                /* 05E0 */    0x20, 0x3E, 0x59, 0xB0, 0x79, 0x61, 0x08, 0x2C, 
+                /* 05E8 */    0x12, 0x1E, 0x75, 0xE8, 0x30, 0x3C, 0x3F, 0x25, 
+                /* 05F0 */    0x3C, 0x8E, 0x30, 0xEC, 0x37, 0x12, 0x4F, 0xE1, 
+                /* 05F8 */    0x70, 0x7C, 0xA4, 0x30, 0x42, 0xF0, 0x72, 0x4F, 
+                /* 0600 */    0x16, 0xE4, 0x62, 0x73, 0x74, 0xFF, 0xFF, 0x27, 
+                /* 0608 */    0x18, 0xCC, 0x50, 0x3D, 0x04, 0x7E, 0x5E, 0xF0, 
+                /* 0610 */    0x10, 0xF8, 0x00, 0x5A, 0x9D, 0x1D, 0x39, 0x9F, 
+                /* 0618 */    0x9C, 0x13, 0x6E, 0xBC, 0x7C, 0x4C, 0xD8, 0x01, 
+                /* 0620 */    0xF0, 0xE0, 0x4B, 0xF2, 0x59, 0x84, 0xC6, 0x58, 
+                /* 0628 */    0xBE, 0x8F, 0x23, 0x80, 0x9C, 0x49, 0x3C, 0x81, 
+                /* 0630 */    0x44, 0x78, 0x19, 0x09, 0x12, 0xE2, 0x58, 0x5E, 
+                /* 0638 */    0x43, 0x0C, 0x12, 0xE3, 0xED, 0xC8, 0xC7, 0x11, 
+                /* 0640 */    0x0E, 0xF3, 0x4C, 0x62, 0xB8, 0x87, 0x83, 0x57, 
+                /* 0648 */    0x91, 0x17, 0x12, 0xC3, 0x3C, 0x8A, 0xF8, 0x7C, 
+                /* 0650 */    0x10, 0xC3, 0x98, 0xA1, 0xA2, 0x9D, 0x80, 0x8F, 
+                /* 0658 */    0x23, 0xEC, 0x58, 0xE9, 0xA1, 0xFA, 0x38, 0x02, 
+                /* 0660 */    0x58, 0xFA, 0xFF, 0x1F, 0x47, 0x80, 0xF9, 0x11, 
+                /* 0668 */    0x01, 0x77, 0xDA, 0x80, 0x7B, 0x9F, 0x08, 0xF1, 
+                /* 0670 */    0xA4, 0xF1, 0x92, 0xF0, 0xAC, 0x01, 0x5C, 0x84, 
+                /* 0678 */    0x6A, 0x39, 0xF7, 0xB0, 0x34, 0x8F, 0x01, 0x1D, 
+                /* 0680 */    0xCF, 0x38, 0x87, 0x35, 0x01, 0x69, 0x98, 0xFC, 
+                /* 0688 */    0xCA, 0xED, 0x73, 0xC1, 0xD9, 0x3D, 0x72, 0x1B, 
+                /* 0690 */    0x26, 0xC8, 0x13, 0xC1, 0x6B, 0x94, 0xC1, 0x05, 
+                /* 0698 */    0xA9, 0xF3, 0x23, 0x4F, 0x4F, 0x21, 0xDD, 0x27, 
+                /* 06A0 */    0x5A, 0x94, 0xD2, 0x63, 0x1A, 0x05, 0xF1, 0x19, 
+                /* 06A8 */    0xC1, 0x21, 0xCE, 0x31, 0xE8, 0xE1, 0x7B, 0x0E, 
+                /* 06B0 */    0x67, 0x74, 0x20, 0xEF, 0x01, 0xEC, 0xFE, 0x08, 
+                /* 06B8 */    0x3C, 0x4F, 0x3A, 0x78, 0x74, 0xDF, 0x14, 0xCE, 
+                /* 06C0 */    0xF3, 0x4C, 0xFF, 0xFF, 0x47, 0x04, 0xDE, 0x99, 
+                /* 06C8 */    0xFA, 0x82, 0x09, 0x9C, 0x43, 0xDC, 0x05, 0x50, 
+                /* 06D0 */    0xB2, 0xEF, 0x02, 0x14, 0xC4, 0x13, 0xF3, 0xD5, 
+                /* 06D8 */    0x0F, 0x0E, 0xFE, 0xAB, 0x1F, 0x30, 0xB9, 0x2C, 
+                /* 06E0 */    0xF8, 0x9A, 0x04, 0xBE, 0x53, 0x3F, 0xFE, 0xC2, 
+                /* 06E8 */    0xE0, 0xDB, 0xC0, 0xC3, 0x13, 0x1B, 0x14, 0xF8, 
+                /* 06F0 */    0xA1, 0x7C, 0x3D, 0x04, 0xFF, 0xFF, 0xFF, 0x7A, 
+                /* 06F8 */    0x08, 0x3C, 0x95, 0x3A, 0xB5, 0xA9, 0xF0, 0x7A, 
+                /* 0700 */    0x08, 0xAE, 0x28, 0xD7, 0x12, 0xD4, 0xAD, 0xC9, 
+                /* 0708 */    0x82, 0x80, 0x74, 0x3F, 0x7F, 0xBE, 0x31, 0xA6, 
+                /* 0710 */    0xCF, 0x25, 0xF0, 0xEE, 0xA0, 0x5A, 0x95, 0xEE, 
+                /* 0718 */    0x25, 0x3C, 0x38, 0x85, 0xA2, 0x1F, 0x1E, 0x50, 
+                /* 0720 */    0x61, 0x0F, 0x0F, 0x14, 0xC4, 0x17, 0x23, 0xDF, 
+                /* 0728 */    0x4B, 0x00, 0x0E, 0xFC, 0xFF, 0x47, 0xC4, 0x6F, 
+                /* 0730 */    0xDA, 0x70, 0x8E, 0x16, 0x98, 0x19, 0x81, 0xF5, 
+                /* 0738 */    0x44, 0xE0, 0x9B, 0x36, 0xE0, 0xE8, 0xE4, 0x02, 
+                /* 0740 */    0x5C, 0x4E, 0x25, 0x80, 0x2B, 0xAF, 0xA7, 0x12, 
+                /* 0748 */    0xFD, 0xFF, 0x4F, 0x25, 0xE0, 0xBA, 0x7B, 0x81, 
+                /* 0750 */    0xE9, 0x6A, 0x72, 0x26, 0xD1, 0x82, 0xFB, 0xEE, 
+                /* 0758 */    0x05, 0xF0, 0xF3, 0xFF, 0x7F, 0xF7, 0x02, 0x88, 
+                /* 0760 */    0xE9, 0xF5, 0xEE, 0x05, 0xBC, 0xCE, 0x25, 0x98, 
+                /* 0768 */    0xBB, 0x97, 0xFF, 0xFF, 0x77, 0x2F, 0x80, 0xFF, 
+                /* 0770 */    0xFF, 0xFF, 0xBB, 0x17, 0x40, 0x96, 0x53, 0x09, 
+                /* 0778 */    0xC8, 0xB2, 0x9D, 0x4A, 0xD0, 0x0A, 0xCF, 0xD1, 
+                /* 0780 */    0x50, 0x27, 0x70, 0x28, 0x4F, 0x18, 0xAF, 0xEA, 
+                /* 0788 */    0x09, 0xAC, 0xE7, 0xF2, 0x85, 0x52, 0x02, 0xA3, 
+                /* 0790 */    0xCB, 0x17, 0xB0, 0xFB, 0xFF, 0x5F, 0xBE, 0x00, 
+                /* 0798 */    0x3E, 0x04, 0xBA, 0x0B, 0xA0, 0x22, 0xDC, 0x05, 
+                /* 07A0 */    0x28, 0x88, 0x2F, 0x5F, 0x80, 0x97, 0x50, 0x10, 
+                /* 07A8 */    0x32, 0x72, 0x93, 0xA0, 0x97, 0x2F, 0x38, 0x17, 
+                /* 07B0 */    0x07, 0xDF, 0x8F, 0x3C, 0x28, 0x78, 0xFF, 0xFF, 
+                /* 07B8 */    0x41, 0xC1, 0x19, 0xCC, 0x79, 0x17, 0x7B, 0x52, 
+                /* 07C0 */    0xA4, 0xD7, 0x13, 0xB8, 0x77, 0x0E, 0x8F, 0x0D, 
+                /* 07C8 */    0x1C, 0xE2, 0xAE, 0x60, 0xC0, 0xDE, 0xE5, 0xED, 
+                /* 07D0 */    0x04, 0x5C, 0xDA, 0xD6, 0xAE, 0xDB, 0x09, 0x2E, 
+                /* 07D8 */    0xE1, 0x71, 0x1A, 0xF2, 0xF1, 0x04, 0x93, 0xE7, 
+                /* 07E0 */    0x76, 0x82, 0x4A, 0x02, 0xA3, 0x2C, 0x24, 0x3A, 
+                /* 07E8 */    0x42, 0x70, 0xF5, 0x37, 0x31, 0x0A, 0x62, 0x0B, 
+                /* 07F0 */    0xB7, 0x13, 0x40, 0xC7, 0xFF, 0xFF, 0x76, 0x02, 
+                /* 07F8 */    0xFC, 0xC7, 0x0C, 0x67, 0x44, 0xEF, 0x15, 0x86, 
+                /* 0800 */    0xF4, 0x19, 0x0C, 0x98, 0x06, 0x3A, 0x82, 0xA0, 
+                /* 0808 */    0x2F, 0x69, 0xD8, 0x04, 0x37, 0x10, 0x3A, 0x23, 
+                /* 0810 */    0x78, 0x17, 0x10, 0xB8, 0x13, 0x83, 0x75, 0x00, 
+                /* 0818 */    0x01, 0xDF, 0x59, 0x0D, 0x78, 0xFD, 0xFF, 0xCF, 
+                /* 0820 */    0x6A, 0xC0, 0xF4, 0x00, 0xE0, 0xB3, 0x1A, 0xA0, 
+                /* 0828 */    0xEA, 0xF6, 0x02, 0x32, 0x85, 0x36, 0x7D, 0x6A, 
+                /* 0830 */    0x34, 0x6A, 0xD5, 0xA0, 0x4C, 0x8D, 0x32, 0x0D, 
+                /* 0838 */    0x6A, 0xF5, 0xA9, 0xD4, 0x98, 0x31, 0xBB, 0x60, 
+                /* 0840 */    0x8A, 0x71, 0x7B, 0xA2, 0x22, 0x96, 0x23, 0x10, 
+                /* 0848 */    0xEB, 0xA6, 0x90, 0x91, 0xCB, 0x86, 0x41, 0x04, 
+                /* 0850 */    0x64, 0xD9, 0x8B, 0x16, 0x10, 0x01, 0x11, 0x90, 
+                /* 0858 */    0x85, 0xBC, 0x1B, 0x04, 0x64, 0x55, 0x20, 0x02, 
+                /* 0860 */    0x72, 0x2A, 0x20, 0x1A, 0x11, 0x88, 0xC6, 0xF1, 
+                /* 0868 */    0x00, 0xC4, 0xC2, 0x81, 0x08, 0xC8, 0xEA, 0x4C, 
+                /* 0870 */    0x00, 0x31, 0xA9, 0x20, 0xBA, 0x43, 0x90, 0xCF, 
+                /* 0878 */    0x85, 0x80, 0x2C, 0x12, 0x44, 0x40, 0xCE, 0xB8, 
+                /* 0880 */    0x3E, 0x01, 0x39, 0x30, 0x88, 0x80, 0x1C, 0xF2, 
+                /* 0888 */    0x1B, 0x22, 0x20, 0x47, 0x06, 0x11, 0x90, 0x05, 
+                /* 0890 */    0xEB, 0x00, 0xF2, 0xFF, 0x9F, 0xA0, 0x7C, 0x10, 
+                /* 0898 */    0x01, 0x39, 0x3E, 0x10, 0x15, 0xE3, 0xE3, 0xAE, 
+                /* 08A0 */    0x45, 0x1F, 0x03, 0x02, 0x72, 0x2E, 0x10, 0x01, 
+                /* 08A8 */    0x39, 0x07, 0x8D, 0x80, 0x9C, 0x8A, 0x42, 0x40, 
+                /* 08B0 */    0x56, 0xF5, 0x76, 0x10, 0x90, 0x35, 0x82, 0x08, 
+                /* 08B8 */    0xC8, 0x29, 0x81, 0x68, 0x66, 0x20, 0x2A, 0xD8, 
+                /* 08C0 */    0x0A, 0x10, 0x53, 0x0F, 0x22, 0x20, 0x2B, 0xD5, 
+                /* 08C8 */    0x02, 0xC4, 0x74, 0x83, 0x08, 0xC8, 0xA9, 0xBD, 
+                /* 08D0 */    0x00, 0x31, 0x0D, 0xEF, 0x00, 0x01, 0x59, 0xEB, 
+                /* 08D8 */    0xD3, 0x43, 0x20, 0x4E, 0x0A, 0x42, 0xB5, 0xBA, 
+                /* 08E0 */    0x01, 0x61, 0x39, 0xED, 0x80, 0x30, 0x95, 0x7A, 
+                /* 08E8 */    0x40, 0x58, 0x1E, 0x3F, 0x43, 0xA6, 0x20, 0x02, 
+                /* 08F0 */    0xB2, 0xA2, 0x97, 0x88, 0x80, 0x2C, 0x0F, 0x44, 
+                /* 08F8 */    0x40, 0x96, 0x62, 0x08, 0x88, 0x09, 0x03, 0x11, 
+                /* 0900 */    0x90, 0x23, 0x01, 0xD1, 0x80, 0x40, 0x54, 0x9E, 
+                /* 0908 */    0x23, 0x20, 0xA6, 0x15, 0x44, 0x40, 0x0E, 0x08, 
+                /* 0910 */    0x44, 0xD3, 0x02, 0x51, 0x8D, 0xBF, 0x25, 0x01, 
+                /* 0918 */    0x59, 0x30, 0x88, 0x80, 0x2C, 0xCE, 0xD2, 0x51, 
+                /* 0920 */    0x80, 0x82, 0x08, 0xC8, 0x31, 0x35, 0x0D, 0x95, 
+                /* 0928 */    0x82, 0x08, 0xC8, 0x42, 0x3D, 0x01, 0x31, 0xD5, 
+                /* 0930 */    0x20, 0x02, 0xB2, 0x42, 0x51, 0x40, 0x4C, 0x2F, 
+                /* 0938 */    0x88, 0x06, 0x49, 0x80, 0x68, 0x6E, 0x20, 0xAA, 
+                /* 0940 */    0x5A, 0x15, 0x10, 0x8B, 0x00, 0x22, 0x20, 0xE7, 
+                /* 0948 */    0x06, 0xA2, 0x22, 0x5C, 0x01, 0x31, 0xE9, 0x20, 
+                /* 0950 */    0x02, 0x72, 0x0E, 0x20, 0xAA, 0xF9, 0x49, 0x21, 
+                /* 0958 */    0x20, 0x27, 0x00, 0x11, 0x90, 0xF3, 0xDB, 0x3A, 
+                /* 0960 */    0x1A, 0xD0, 0x87, 0x8E, 0x80, 0x9C, 0x00, 0x44, 
+                /* 0968 */    0x40, 0x8E, 0x03, 0x44, 0xA5, 0xFB, 0x02, 0x62, 
+                /* 0970 */    0x41, 0x40, 0x04, 0x64, 0x41, 0xAF, 0x11, 0x0D, 
+                /* 0978 */    0x9C, 0x80, 0x08, 0xC8, 0xD1, 0x8C, 0x01, 0xB1, 
+                /* 0980 */    0x9C, 0x20, 0x02, 0xFA, 0xFF, 0x1F, 0xA8, 0xBE, 
+                /* 0988 */    0x22, 0x02, 0xB2, 0x52, 0x10, 0x0D, 0x9A, 0x00, 
+                /* 0990 */    0xD1, 0xB4, 0x40, 0x54, 0xF1, 0x9B, 0xE4, 0xD1, 
+                /* 0998 */    0x81, 0x81, 0xE8, 0x88, 0x40, 0xA4, 0x1D, 0x11, 
+                /* 09A0 */    0x28, 0x88, 0x80, 0xFC, 0xFF, 0x07
+            })
+            Method (SPEC, 1, Serialized)
+            {
+                Return (AMWV)
+            }
+
+            Method (DEVP, 1, Serialized)
+            {
+                CreateDWordField (Arg0, Zero, DVID)
+                CreateDWordField (Arg0, 0x04, PARA)
+                If (LEqual (PARA, One))
+                {
+                    Name (_T_0, Zero)
+                    Store (DVID, _T_0)
+                    If (LEqual (_T_0, 0x00010011))
+                    {
+                        Or (\_SB.DSAF, One, \_SB.DSAF)
+                    }
+                    Else
+                    {
+                        If (LEqual (_T_0, 0x00010013))
+                        {
+                            Or (\_SB.DSAF, 0x02, \_SB.DSAF)
+                        }
+                        Else
+                        {
+                            If (LEqual (_T_0, 0x00010023))
+                            {
+                                Or (\_SB.DSAF, 0x04, \_SB.DSAF)
+                            }
+                            Else
+                            {
+                                If (LEqual (_T_0, 0x00060013))
+                                {
+                                    Or (\_SB.DSAF, 0x08, \_SB.DSAF)
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_0, 0x00060015))
+                                    {
+                                        Or (\_SB.DSAF, 0x10, \_SB.DSAF)
+                                    }
+                                    Else
+                                    {
+                                        If (LEqual (_T_0, 0x00010015))
+                                        {
+                                            Or (\_SB.DSAF, 0x20, \_SB.DSAF)
+                                        }
+                                        Else
+                                        {
+                                            If (LEqual (_T_0, 0x00090011))
+                                            {
+                                                Or (\_SB.DSAF, 0x40, \_SB.DSAF)
+                                            }
+                                            Else
+                                            {
+                                                If (LEqual (_T_0, 0x00070011))
+                                                {
+                                                    Or (\_SB.DSAF, 0x80, \_SB.DSAF)
+                                                }
+                                                Else
+                                                {
+                                                    If (LEqual (_T_0, 0x00080013))
+                                                    {
+                                                        Or (\_SB.DSAF, 0x0100, \_SB.DSAF)
+                                                    }
+                                                    Else
+                                                    {
+                                                        If (LEqual (_T_0, 0x00010019))
+                                                        {
+                                                            Or (\_SB.DSAF, 0x0200, \_SB.DSAF)
+                                                        }
+                                                        Else
+                                                        {
+                                                            If (LEqual (_T_0, 0x00010017))
+                                                            {
+                                                                Or (\_SB.DSAF, 0x0400, \_SB.DSAF)
+                                                            }
+                                                            Else
+                                                            {
+                                                                If (LEqual (_T_0, 0x00050011))
+                                                                {
+                                                                    Or (\_SB.DSAF, 0x0800, \_SB.DSAF)
+                                                                }
+                                                                Else
+                                                                {
+                                                                    If (LEqual (_T_0, 0x00050012))
+                                                                    {
+                                                                        Or (\_SB.DSAF, 0x1000, \_SB.DSAF)
+                                                                    }
+                                                                    Else
+                                                                    {
+                                                                        If (LEqual (_T_0, 0x00060017))
+                                                                        {
+                                                                            Or (\_SB.DSAF, 0x2000, \_SB.DSAF)
+                                                                        }
+                                                                        Else
+                                                                        {
+                                                                            If (LEqual (_T_0, 0x00080021))
+                                                                            {
+                                                                                Or (\_SB.DSAF, 0x4000, \_SB.DSAF)
+                                                                            }
+                                                                            Else
+                                                                            {
+                                                                                If (LEqual (_T_0, 0x00100011))
+                                                                                {
+                                                                                    Or (\_SB.DSAF, 0x8000, \_SB.DSAF)
+                                                                                }
+                                                                                Else
+                                                                                {
+                                                                                    If (LEqual (_T_0, 0x00050001))
+                                                                                    {
+                                                                                        Or (\_SB.DSAF, 0x00010000, \_SB.DSAF)
+                                                                                    }
+                                                                                    Else
+                                                                                    {
+                                                                                        If (LEqual (_T_0, 0x00120000))
+                                                                                        {
+                                                                                            Or (\_SB.DSAF, 0x00020000, \_SB.DSAF)
+                                                                                        }
+                                                                                        Else
+                                                                                        {
+                                                                                            If (LEqual (_T_0, 0x00120021))
+                                                                                            {
+                                                                                                Or (\_SB.DSAF, 0x00040000, \_SB.DSAF)
+                                                                                            }
+                                                                                            Else
+                                                                                            {
+                                                                                                If (LEqual (_T_0, 0x00120011))
+                                                                                                {
+                                                                                                    Or (\_SB.DSAF, 0x00080000, \_SB.DSAF)
+                                                                                                }
+                                                                                                Else
+                                                                                                {
+                                                                                                    Return (Zero)
+                                                                                                }
+                                                                                            }
+                                                                                        }
+                                                                                    }
+                                                                                }
+                                                                            }
+                                                                        }
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                Else
+                {
+                    If (LEqual (PARA, Zero))
+                    {
+                        Name (_T_1, Zero)
+                        Store (DVID, _T_1)
+                        If (LEqual (_T_1, 0x00010011))
+                        {
+                            And (\_SB.DSAF, 0xFFFFFFFFFFFFFFFE, \_SB.DSAF)
+                        }
+                        Else
+                        {
+                            If (LEqual (_T_1, 0x00010013))
+                            {
+                                And (\_SB.DSAF, 0xFFFFFFFFFFFFFFFD, \_SB.DSAF)
+                            }
+                            Else
+                            {
+                                If (LEqual (_T_1, 0x00010023))
+                                {
+                                    And (\_SB.DSAF, 0xFFFFFFFFFFFFFFFB, \_SB.DSAF)
+                                }
+                                Else
+                                {
+                                    If (LEqual (_T_1, 0x00060013))
+                                    {
+                                        And (\_SB.DSAF, 0xFFFFFFFFFFFFFFF7, \_SB.DSAF)
+                                    }
+                                    Else
+                                    {
+                                        If (LEqual (_T_1, 0x00060015))
+                                        {
+                                            And (\_SB.DSAF, 0xFFFFFFFFFFFFFFEF, \_SB.DSAF)
+                                        }
+                                        Else
+                                        {
+                                            If (LEqual (_T_1, 0x00010015))
+                                            {
+                                                And (\_SB.DSAF, 0xFFFFFFFFFFFFFFDF, \_SB.DSAF)
+                                            }
+                                            Else
+                                            {
+                                                If (LEqual (_T_1, 0x00090011))
+                                                {
+                                                    And (\_SB.DSAF, 0xFFFFFFFFFFFFFFBF, \_SB.DSAF)
+                                                }
+                                                Else
+                                                {
+                                                    If (LEqual (_T_1, 0x00070011))
+                                                    {
+                                                        And (\_SB.DSAF, 0xFFFFFFFFFFFFFF7F, \_SB.DSAF)
+                                                    }
+                                                    Else
+                                                    {
+                                                        If (LEqual (_T_1, 0x00080013))
+                                                        {
+                                                            And (\_SB.DSAF, 0xFFFFFFFFFFFFFEFF, \_SB.DSAF)
+                                                        }
+                                                        Else
+                                                        {
+                                                            If (LEqual (_T_1, 0x00010019))
+                                                            {
+                                                                And (\_SB.DSAF, 0xFFFFFFFFFFFFFDFF, \_SB.DSAF)
+                                                            }
+                                                            Else
+                                                            {
+                                                                If (LEqual (_T_1, 0x00010017))
+                                                                {
+                                                                    And (\_SB.DSAF, 0xFFFFFFFFFFFFFBFF, \_SB.DSAF)
+                                                                }
+                                                                Else
+                                                                {
+                                                                    If (LEqual (_T_1, 0x00050011))
+                                                                    {
+                                                                        And (\_SB.DSAF, 0xFFFFFFFFFFFFF7FF, \_SB.DSAF)
+                                                                    }
+                                                                    Else
+                                                                    {
+                                                                        If (LEqual (_T_1, 0x00050012))
+                                                                        {
+                                                                            And (\_SB.DSAF, 0xFFFFFFFFFFFFEFFF, \_SB.DSAF)
+                                                                        }
+                                                                        Else
+                                                                        {
+                                                                            If (LEqual (_T_1, 0x00060017))
+                                                                            {
+                                                                                And (\_SB.DSAF, 0xFFFFFFFFFFFFDFFF, \_SB.DSAF)
+                                                                            }
+                                                                            Else
+                                                                            {
+                                                                                If (LEqual (_T_1, 0x00080021))
+                                                                                {
+                                                                                    And (\_SB.DSAF, 0xFFFFFFFFFFFFBFFF, \_SB.DSAF)
+                                                                                }
+                                                                                Else
+                                                                                {
+                                                                                    If (LEqual (_T_1, 0x00100011))
+                                                                                    {
+                                                                                        And (\_SB.DSAF, 0xFFFFFFFFFFFF7FFF, \_SB.DSAF)
+                                                                                    }
+                                                                                    Else
+                                                                                    {
+                                                                                        If (LEqual (_T_1, 0x00050001))
+                                                                                        {
+                                                                                            And (\_SB.DSAF, 0xFFFFFFFFFFFEFFFF, \_SB.DSAF)
+                                                                                        }
+                                                                                        Else
+                                                                                        {
+                                                                                            If (LEqual (_T_1, 0x00120000))
+                                                                                            {
+                                                                                                And (\_SB.DSAF, 0xFFFFFFFFFFFDFFFF, \_SB.DSAF)
+                                                                                            }
+                                                                                            Else
+                                                                                            {
+                                                                                                If (LEqual (_T_1, 0x00120021))
+                                                                                                {
+                                                                                                    And (\_SB.DSAF, 0xFFFFFFFFFFFBFFFF, \_SB.DSAF)
+                                                                                                }
+                                                                                                Else
+                                                                                                {
+                                                                                                    If (LEqual (_T_1, 0x00120011))
+                                                                                                    {
+                                                                                                        And (\_SB.DSAF, 0xFFFFFFFFFFF7FFFF, \_SB.DSAF)
+                                                                                                    }
+                                                                                                    Else
+                                                                                                    {
+                                                                                                        Return (Zero)
+                                                                                                    }
+                                                                                                }
+                                                                                            }
+                                                                                        }
+                                                                                    }
+                                                                                }
+                                                                            }
+                                                                        }
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Return (One)
+            }
+
+            Method (SDSP, 1, Serialized)
+            {
+                CreateDWordField (Arg0, Zero, ACTN)
+                Return (Zero)
+            }
+
+            Method (GDSP, 1, Serialized)
+            {
+                CreateDWordField (Arg0, Zero, ACTN)
+                Return (Zero)
+            }
+
+            Method (DEVS, 1, Serialized)
+            {
+                CreateDWordField (Arg0, Zero, DVID)
+                CreateDWordField (Arg0, 0x04, CPAR)
+                Name (_T_0, Zero)
+                Store (DVID, _T_0)
+                If (LEqual (_T_0, Zero))
+                {
+                    Return (Zero)
+                }
+                Else
+                {
+                    Return (Zero)
+                }
+            }
+
+            Method (DSTS, 1, Serialized)
+            {
+                CreateDWordField (Arg0, Zero, DVID)
+                Name (_T_0, Zero)
+                Store (DVID, _T_0)
+                If (LEqual (_T_0, 0xA0000000))
+                {
+                    Store (One, Local0)
+                }
+                Else
+                {
+                    If (LEqual (_T_0, Zero))
+                    {
+                        Return (Zero)
+                    }
+                    Else
+                    {
+                        Store (Zero, Local0)
+                    }
+                }
+
+                And (Local0, 0x0007FFFF, Local0)
+                Return (Local0)
+            }
+
+            Method (GPID, 0, Serialized)
+            {
+                Return (Zero)
+            }
+
+            Method (KBFT, 1, Serialized)
+            {
+                Return (Zero)
+            }
+
+            Method (HKEY, 0, Serialized)
+            {
+                Return (Zero)
+            }
+
+            Method (CFVS, 1, Serialized)
+            {
+            }
+
+            Method (CFVG, 0, Serialized)
+            {
+            }
+        }
+    }
+
+    Scope (_SB)
+    {
+        Name (RAMB, 0xDCB94018)
+        OperationRegion (\RAMW, SystemMemory, RAMB, 0x00010000)
+        Field (RAMW, ByteAcc, NoLock, Preserve)
+        {
+            DSAF,   256, 
+            PAR0,   32, 
+            PAR1,   32, 
+            PAR2,   32, 
+            PINX,   32, 
+            PADD,   2048
+        }
+
+        Mutex (MPAR, 0x00)
+        Name (ARBF, Buffer (0x10) {})
+        CreateDWordField (ARBF, Zero, REAX)
+        CreateDWordField (ARBF, 0x04, REBX)
+        CreateDWordField (ARBF, 0x08, RECX)
+        CreateDWordField (ARBF, 0x0C, REDX)
+        OperationRegion (IOB2, SystemIO, SMIP, 0x02)
+        Field (IOB2, ByteAcc, NoLock, Preserve)
+        {
+            SMIC,   8, 
+            SMIS,   8
+        }
+
+        Method (ISMI, 1, Serialized)
+        {
+            Store (Arg0, SMIC)
+        }
+
+        Method (GMSR, 1, Serialized)
+        {
+            If (LEqual (Acquire (MPAR, 0xFFFF), Zero))
+            {
+                Store (0x80000000, PINX)
+                Store (Arg0, PAR0)
+                ISMI (0x90)
+                Store (Arg0, RECX)
+                Store (PAR1, REAX)
+                Store (PAR2, REDX)
+                Release (MPAR)
+                Return (ARBF)
+            }
+
+            Return (Ones)
+        }
+
+        Method (SMSR, 1, Serialized)
+        {
+            If (LEqual (Acquire (MPAR, 0xFFFF), Zero))
+            {
+                CreateDWordField (Arg0, Zero, AEAX)
+                CreateDWordField (Arg0, 0x04, AEBX)
+                CreateDWordField (Arg0, 0x08, AECX)
+                CreateDWordField (Arg0, 0x0C, AEDX)
+                Store (0x80000001, PINX)
+                Store (AECX, PAR0)
+                Store (AEAX, PAR1)
+                Store (AEDX, PAR2)
+                ISMI (0x90)
+                Release (MPAR)
+            }
+
+            Return (Ones)
+        }
+
+        Method (PRID, 1, Serialized)
+        {
+            If (LEqual (Acquire (MPAR, 0xFFFF), Zero))
+            {
+                Store (0x80000002, PINX)
+                Store (Arg0, PAR0)
+                ISMI (0x90)
+                Store (PAR1, REAX)
+                Store (PAR2, REDX)
+                Release (MPAR)
+                Return (ARBF)
+            }
+
+            Return (Ones)
+        }
+
+        Method (GPRE, 1, Serialized)
+        {
+            Store (Arg0, PAR0)
+            Store (0x80000005, PINX)
+            ISMI (0x90)
+            Return (PAR0)
+        }
+
+        Method (GNVS, 1, Serialized)
+        {
+            Store (Arg0, PAR0)
+            Store (0x80000003, PINX)
+            ISMI (0x90)
+            Return (PAR1)
+        }
+
+        Method (SNVS, 2, Serialized)
+        {
+            Store (Arg0, PAR0)
+            Store (Arg1, PAR1)
+            Store (0x80000004, PINX)
+            ISMI (0x90)
+        }
+
+        Method (SARM, 1, Serialized)
+        {
+            If (LAnd (LGreater (Arg0, 0x03), LLess (Arg0, 0x06)))
+            {
+                ISMI (0x92)
+            }
+        }
+
+        Method (GAMM, 0, Serialized)
+        {
+            ISMI (0x91)
+        }
+
+        Method (SAMM, 0, Serialized)
+        {
+            ISMI (0x92)
+        }
+    }
+
+    Scope (_SB.PCI0.LPCB)
+    {
+        Method (S1RS, 1, NotSerialized)
+        {
+            Store (Zero, PLED)
+        }
+
+        OperationRegion (GPBX, SystemIO, GPBS, GPLN)
+        Field (GPBX, ByteAcc, NoLock, Preserve)
+        {
+                    Offset (0x18), 
+                ,   27, 
+            PLED,   1
+        }
+    }
+
+    Scope (_SB.PCI0.LPCB)
+    {
+        Device (H_EC)
+        {
+            Name (_HID, EisaId ("PNP0C09"))
+            Name (_UID, One)
+            Method (_STA, 0, NotSerialized)
+            {
+                Store (0x03, ^^^GFX0.CLID)
+                Return (Zero)
+            }
+
+            Name (B1CC, Zero)
+            Name (B1ST, Zero)
+            Name (B2CC, Zero)
+            Name (B2ST, Zero)
+            Name (CFAN, Zero)
+            Name (CMDR, Zero)
+            Name (DOCK, Zero)
+            Name (EJET, Zero)
+            Name (MCAP, Zero)
+            Name (PLMX, Zero)
+            Name (PECH, Zero)
+            Name (PECL, Zero)
+            Name (PENV, Zero)
+            Name (PINV, Zero)
+            Name (PPSH, Zero)
+            Name (PPSL, Zero)
+            Name (PSTP, Zero)
+            Name (RPWR, Zero)
+            Name (LSTE, Zero)
+            Name (SLPC, Zero)
+            Name (VPWR, Zero)
+            Method (ECMD, 1, Serialized)
+            {
+                If (ECON)
+                {
+                    While (CMDR)
+                    {
+                        Stall (0x14)
+                    }
+
+                    Store (Arg0, CMDR)
+                }
+            }
+
+            Device (BAT0)
+            {
+                Name (_HID, EisaId ("PNP0C0A"))
+                Name (_UID, Zero)
+                Method (_STA, 0, NotSerialized)
+                {
+                    Return (Zero)
+                }
+            }
+
+            Scope (\)
+            {
+                Field (GNVS, AnyAcc, Lock, Preserve)
+                {
+                            Offset (0x1E), 
+                    BNUM,   8, 
+                            Offset (0x20), 
+                    B1SC,   8, 
+                            Offset (0x23), 
+                    B1SS,   8
+                }
+            }
+
+            Device (BAT1)
+            {
+                Name (_HID, EisaId ("PNP0C0A"))
+                Name (_UID, One)
+                Method (_STA, 0, NotSerialized)
+                {
+                    Return (Zero)
+                }
+            }
+
+            Scope (\)
+            {
+                Field (GNVS, AnyAcc, Lock, Preserve)
+                {
+                            Offset (0x21), 
+                    B2SC,   8, 
+                            Offset (0x24), 
+                    B2SS,   8
+                }
+            }
+
+            Device (BAT2)
+            {
+                Name (_HID, EisaId ("PNP0C0A"))
+                Name (_UID, 0x02)
+                Method (_STA, 0, NotSerialized)
+                {
+                    Return (Zero)
+                }
+            }
+        }
+    }
+
+    Device (_SB.PCI0.DOCK)
+    {
+        Name (_HID, "ABCDEFGH")
+        Name (_CID, EisaId ("PNP0C15"))
+        Name (_UID, 0x02)
+        Method (_STA, 0, NotSerialized)
+        {
+            Return (Zero)
+        }
+    }
+
+    Scope (_SB)
+    {
+        Device (LID0)
+        {
+            Name (_HID, EisaId ("PNP0C0D"))
+            Method (_STA, 0, NotSerialized)
+            {
+                Return (Zero)
+            }
+        }
+    }
+
+    Name (_S0, Package (0x04)
+    {
+        Zero, 
+        Zero, 
+        Zero, 
+        Zero
+    })
+    If (SS1)
+    {
+        Name (_S1, Package (0x04)
+        {
+            One, 
+            Zero, 
+            Zero, 
+            Zero
+        })
+    }
+
+    If (SS3)
+    {
+        Name (_S3, Package (0x04)
+        {
+            0x05, 
+            Zero, 
+            Zero, 
+            Zero
+        })
+    }
+
+    If (SS4)
+    {
+        Name (_S4, Package (0x04)
+        {
+            0x06, 
+            Zero, 
+            Zero, 
+            Zero
+        })
+    }
+
+    Name (_S5, Package (0x04)
+    {
+        0x07, 
+        Zero, 
+        Zero, 
+        Zero
+    })
+    Method (PTS, 1, NotSerialized)
+    {
+        If (Arg0)
+        {
+            \_SB.PCI0.LPCB.SPTS (Arg0)
+            \_SB.PCI0.NPTS (Arg0)
+            \_SB.SARM (Arg0)
+            \_SB.PCI0.LPCB.SIOS (Arg0)
+        }
+    }
+
+    Method (WAK, 1, NotSerialized)
+    {
+        \_SB.PCI0.LPCB.SWAK (Arg0)
+        \_SB.PCI0.NWAK (Arg0)
+        \_SB.PCI0.LPCB.S1RS (Arg0)
+        \_SB.PCI0.LPCB.SIOW (Arg0)
+    }
+}
+

From 2b45d5803d68b82462fd5418566a6cc1c96690cc Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 22 Mar 2013 23:36:16 +0100
Subject: [PATCH 336/623] Factory DSDT with 64MB IGPU memory selected

---
 i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl
index 1ad45bd..29bf61a 100644
--- a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
@@ -3,13 +3,13 @@
  * AML Disassembler version 20110316-64 [Mar 16 2011]
  * Copyright (c) 2000 - 2011 Intel Corporation
  * 
- * Disassembly of dsdt-factory-32mb-igpu.aml, Wed Mar 20 12:38:18 2013
+ * Disassembly of dsdt-factory-64mb-igpu.aml, Wed Mar 20 12:29:46 2013
  *
  * Original Table Header:
  *     Signature        "DSDT"
  *     Length           0x0000BAFE (47870)
  *     Revision         0x02
- *     Checksum         0x72
+ *     Checksum         0x78
  *     OEM ID           "ALASKA"
  *     OEM Table ID     "A M I"
  *     OEM Revision     0x00000015 (21)
@@ -17,7 +17,7 @@
  *     Compiler Version 0x20051117 (537202967)
  */
 
-DefinitionBlock ("dsdt-factory-32mb-igpu.aml", "DSDT", 2, "ALASKA", "A M I", 0x00000015)
+DefinitionBlock ("dsdt-factory-64mb-igpu.aml", "DSDT", 2, "ALASKA", "A M I", 0x00000015)
 {
     External (TNOT, MethodObj)    // 0 Arguments
     External (PDC7)
@@ -148,7 +148,7 @@ DefinitionBlock ("dsdt-factory-32mb-igpu.aml", "DSDT", 2, "ALASKA", "A M I", 0x0
     Name (TOPM, 0x00000000)
     Name (ROMS, 0xFFE00000)
     Name (VGAF, One)
-    OperationRegion (GNVS, SystemMemory, 0xDCBB2E18, 0x01CB)
+    OperationRegion (GNVS, SystemMemory, 0xDABB2E18, 0x01CB)
     Field (GNVS, AnyAcc, Lock, Preserve)
     {
         OSYS,   16, 
@@ -8308,7 +8308,7 @@ DefinitionBlock ("dsdt-factory-32mb-igpu.aml", "DSDT", 2, "ALASKA", "A M I", 0x0
 
     Scope (_SB.PCI0.LPCB)
     {
-        OperationRegion (CPSB, SystemMemory, 0xDCBC5F98, 0x10)
+        OperationRegion (CPSB, SystemMemory, 0xDABC5F98, 0x10)
         Field (CPSB, AnyAcc, NoLock, Preserve)
         {
             RTCX,   1, 
@@ -12627,7 +12627,7 @@ DefinitionBlock ("dsdt-factory-32mb-igpu.aml", "DSDT", 2, "ALASKA", "A M I", 0x0
 
     Scope (_SB)
     {
-        Name (RAMB, 0xDCB94018)
+        Name (RAMB, 0xDAB94018)
         OperationRegion (\RAMW, SystemMemory, RAMB, 0x00010000)
         Field (RAMW, ByteAcc, NoLock, Preserve)
         {

From 0ae44573ffb436408e8e7db5a30fb5b6b011ace3 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 22 Mar 2013 23:43:25 +0100
Subject: [PATCH 337/623] And now with all cruft removed,

down from 47870 bytes to 6765 bytes (dsdt.aml)
down from 429475 bytes to 48,215 bytes (dsdt.dsl)
down from 12962 lines to 1240 lines
---
 .../acpi/examples/P8Z68-V PRO/dsdt.dsl        | 13664 ++--------------
 1 file changed, 970 insertions(+), 12694 deletions(-)

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl
index 29bf61a..9a0bd03 100644
--- a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
@@ -3,12960 +3,1236 @@
  * AML Disassembler version 20110316-64 [Mar 16 2011]
  * Copyright (c) 2000 - 2011 Intel Corporation
  * 
- * Disassembly of dsdt-factory-64mb-igpu.aml, Wed Mar 20 12:29:46 2013
- *
  * Original Table Header:
  *     Signature        "DSDT"
- *     Length           0x0000BAFE (47870)
+ *     Length           0x00001EE2 (7906)
  *     Revision         0x02
- *     Checksum         0x78
- *     OEM ID           "ALASKA"
- *     OEM Table ID     "A M I"
- *     OEM Revision     0x00000015 (21)
+ *     Checksum         0x7F
+ *     OEM ID           "APPLE"
+ *     OEM Table ID     "Macmini"
+ *     OEM Revision     0x00050001 (327681)
  *     Compiler ID      "INTL"
- *     Compiler Version 0x20051117 (537202967)
+ *     Compiler Version 0x20110316 (537985814)
  */
 
-DefinitionBlock ("dsdt-factory-64mb-igpu.aml", "DSDT", 2, "ALASKA", "A M I", 0x00000015)
+DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
 {
-    External (TNOT, MethodObj)    // 0 Arguments
-    External (PDC7)
-    External (PDC6)
-    External (PDC5)
-    External (PDC4)
-    External (PDC3)
-    External (PDC2)
-    External (PDC1)
-    External (PDC0)
-    External (CFGD)
-    External (HNOT, MethodObj)    // 1 Arguments
-    External (SNXD)
-    External (HWID, IntObj)
-    External (IDAB, MethodObj)    // 0 Arguments
-    External (HDOS, MethodObj)    // 0 Arguments
-    External (ECST, MethodObj)    // 1 Arguments
-    External (\_PR_.APSV)
-    External (\_PR_.AAC0)
-    External (\_PR_.ACRT)
-    External (\_PR_.CPU0._PPC)
-    External (\_SB_.PCI0.IEIT.EITV, MethodObj)    // 0 Arguments
-
-    Name (SP1O, 0x2E)
-    Name (IO1B, Zero)
-    Name (IO1L, Zero)
-    Name (IO2B, Zero)
-    Name (IO2L, Zero)
-    Name (IO3B, 0x0290)
-    Name (IO3L, 0x10)
-    Name (IOES, Zero)
-    Name (WKTP, Zero)
-    Name (SPIO, 0x2E)
-    Name (IOHW, 0x0290)
-    Name (IOSB, Zero)
-    Name (IOSL, 0x10)
-    Name (IOHB, 0x0290)
-    Name (IOHL, 0x10)
-    Name (SMBS, 0x0580)
-    Name (SMBL, 0x20)
-    Name (PMBS, 0x0400)
-    Name (PMLN, 0x80)
-    Name (GPBS, 0x0500)
-    Name (GPLN, 0x80)
-    Name (SMIP, 0xB2)
-    Name (APCB, 0xFEC00000)
-    Name (APCL, 0x1000)
-    Name (SMCR, 0x0430)
     Name (HPTB, 0xFED00000)
-    Name (HPTC, 0xFED1F404)
-    Name (FLSZ, 0x00800000)
     Name (SRCB, 0xFED1C000)
-    Name (RCLN, 0x4000)
-    Name (TCBR, 0xFED08000)
-    Name (TCLT, 0x1000)
+    Name (HPTC, 0xFED1F404)
+    Name (MCHB, 0xFED10000)
+    Name (EGPB, 0xFED19000)
     Name (PEBS, 0xF8000000)
     Name (PELN, 0x04000000)
-    Name (LAPB, 0xFEE00000)
-    Name (EGPB, 0xFED19000)
-    Name (MCHB, 0xFED10000)
     Name (VTBS, 0xFED90000)
     Name (VTLN, 0x4000)
-    Name (ACPH, 0xDE)
-    Name (ASSB, Zero)
-    Name (AOTB, Zero)
-    Name (AAXB, Zero)
-    Name (PEHP, One)
-    Name (SHPC, Zero)
-    Name (PEPM, One)
-    Name (PEER, One)
-    Name (PECS, One)
-    Name (ITKE, Zero)
-    Name (MBEC, 0xFFFF)
-    Name (AMWV, 0x09)
-    Name (FMBL, One)
-    Name (FDTP, 0x02)
-    Name (FUPS, 0x03)
-    Name (FUWS, 0x04)
-    Name (BSH, Zero)
-    Name (BEL, One)
-    Name (BEH, 0x02)
-    Name (BRH, 0x03)
-    Name (BTF, 0x04)
-    Name (BHC, 0x05)
-    Name (BYB, 0x06)
-    Name (BPH, 0x07)
-    Name (BSHS, 0x08)
-    Name (BELC, 0x09)
-    Name (BRHP, 0x0A)
-    Name (BTFC, 0x0B)
-    Name (BEHP, 0x0C)
-    Name (BPHS, 0x0D)
-    Name (BELP, 0x0E)
-    Name (BTL, 0x10)
-    Name (BTFP, 0x11)
-    Name (BSR, 0x14)
-    Name (BOF, 0x20)
-    Name (BEF, 0x21)
-    Name (BLLE, 0x22)
-    Name (BLLC, 0x23)
-    Name (BLCA, 0x24)
-    Name (BLLS, 0x25)
-    Name (BLLP, 0x26)
-    Name (BLLD, 0x27)
-    Name (BHBE, 0x30)
-    Name (BHBC, 0x31)
-    Name (BHBN, 0x32)
-    Name (BHBM, 0x33)
-    Name (TRTP, One)
-    Name (WDTE, One)
-    Name (TRTD, 0x02)
-    Name (TRTI, 0x03)
-    Name (GCDD, One)
-    Name (DSTA, 0x0A)
-    Name (DSLO, 0x0C)
-    Name (DSLC, 0x0E)
-    Name (PITS, 0x10)
-    Name (SBCS, 0x12)
-    Name (SALS, 0x13)
-    Name (LSSS, 0x2A)
-    Name (SOOT, 0x35)
-    Name (PDBR, 0x4D)
-    Name (SS1, One)
-    Name (SS2, Zero)
-    Name (SS3, One)
-    Name (SS4, One)
-    Name (IOST, 0x0000)
-    Name (TOPM, 0x00000000)
-    Name (ROMS, 0xFFE00000)
-    Name (VGAF, One)
-    OperationRegion (GNVS, SystemMemory, 0xDABB2E18, 0x01CB)
+    Name (LAPB, 0xFEE00000)
+    Name (APCB, 0xFEC00000)
+    Name (TCBR, 0xFED08000)
+    Name (PMBS, 0x0400)
+    Name (SMCR, 0x0430)
+    Name (GPBS, 0x0500)
+    Name (RCLN, 0x4000)
+    Name (TCLT, 0x1000)
+    Name (OPRE, 0xDCBB2E18)
+
+    OperationRegion (GNVS, SystemMemory, OPRE, 0x01CB)
     Field (GNVS, AnyAcc, Lock, Preserve)
     {
-        OSYS,   16, 
-        SMIF,   8, 
-        PRM0,   8, 
-        PRM1,   8, 
-        SCIF,   8, 
-        PRM2,   8, 
-        PRM3,   8, 
-        LCKF,   8, 
-        PRM4,   8, 
-        PRM5,   8, 
-        P80D,   32, 
-        LIDS,   8, 
-        PWRS,   8, 
-        DBGS,   8, 
-        THOF,   8, 
-        ACT1,   8, 
-        ACTT,   8, 
-        PSVT,   8, 
-        TC1V,   8, 
-        TC2V,   8, 
-        TSPV,   8, 
-        CRTT,   8, 
-        DTSE,   8, 
-        DTS1,   8, 
-        DTS2,   8, 
-        DTSF,   8, 
-                Offset (0x25), 
-        REVN,   8, 
-        RES3,   8, 
-                Offset (0x28), 
-        APIC,   8, 
-        TCNT,   8, 
-        PCP0,   8, 
-        PCP1,   8, 
-        PPCM,   8, 
-        PPMF,   32, 
-        C67L,   8, 
-        NATP,   8, 
-        CMAP,   8, 
-        CMBP,   8, 
-        LPTP,   8, 
-        FDCP,   8, 
-        CMCP,   8, 
-        CIRP,   8, 
-        SMSC,   8, 
-        W381,   8, 
-        SMC1,   8, 
-        IGDS,   8, 
-        TLST,   8, 
-        CADL,   8, 
-        PADL,   8, 
-        CSTE,   16, 
-        NSTE,   16, 
-        SSTE,   16, 
-        NDID,   8, 
-        DID1,   32, 
-        DID2,   32, 
-        DID3,   32, 
-        DID4,   32, 
-        DID5,   32, 
-        KSV0,   32, 
-        KSV1,   8, 
-                Offset (0x67), 
-        BLCS,   8, 
-        BRTL,   8, 
-        ALSE,   8, 
-        ALAF,   8, 
-        LLOW,   8, 
-        LHIH,   8, 
-                Offset (0x6E), 
-        EMAE,   8, 
-        EMAP,   16, 
-        EMAL,   16, 
-                Offset (0x74), 
-        MEFE,   8, 
-        DSTS,   8, 
-                Offset (0x78), 
-        TPMP,   8, 
-        TPME,   8, 
-        MORD,   8, 
-        TCGP,   8, 
-        PPRP,   32, 
-        PPRQ,   8, 
-        LPPR,   8, 
-        GTF0,   56, 
-        GTF2,   56, 
-        IDEM,   8, 
-        GTF1,   56, 
-        BID,    8, 
-        PLID,   8, 
+                Offset (0x0B), 
+        P80D,   32,
+                Offset (0x3C), 
+        IGDS,   8,
                 Offset (0xAA), 
         ASLB,   32, 
-        IBTT,   8, 
-        IPAT,   8, 
-        ITVF,   8, 
-        ITVM,   8, 
-        IPSC,   8, 
-        IBLC,   8, 
-        IBIA,   8, 
-        ISSC,   8, 
-        I409,   8, 
-        I509,   8, 
-        I609,   8, 
-        I709,   8, 
-        IPCF,   8, 
-        IDMS,   8, 
-        IF1E,   8, 
-        HVCO,   8, 
-        NXD1,   32, 
-        NXD2,   32, 
-        NXD3,   32, 
-        NXD4,   32, 
-        NXD5,   32, 
-        NXD6,   32, 
-        NXD7,   32, 
-        NXD8,   32, 
-        GSMI,   8, 
-        PAVP,   8, 
-                Offset (0xE1), 
-        OSCC,   8, 
-        NEXP,   8, 
-        SBV1,   8, 
-        SBV2,   8, 
-                Offset (0xEB), 
-        DSEN,   8, 
-        ECON,   8, 
-        GPIC,   8, 
-        CTYP,   8, 
-        L01C,   8, 
-        VFN0,   8, 
-        VFN1,   8, 
-        VFN2,   8, 
-        VFN3,   8, 
-        VFN4,   8, 
-                Offset (0x100), 
-        NVGA,   32, 
-        NVHA,   32, 
-        AMDA,   32, 
-        DID6,   32, 
-        DID7,   32, 
-        DID8,   32, 
-        EBAS,   32, 
-        CPSP,   32, 
-        EECP,   32, 
-        EVCP,   32, 
-        XBAS,   32, 
-        OBS1,   32, 
-        OBS2,   32, 
-        OBS3,   32, 
-        OBS4,   32, 
-        OBS5,   32, 
-        OBS6,   32, 
-        OBS7,   32, 
-        OBS8,   32, 
-                Offset (0x157), 
-        ATMC,   8, 
-        PTMC,   8, 
-        ATRA,   8, 
-        PTRA,   8, 
-        PNHM,   32, 
+                Offset (0xEF), 
+        L01C,   8,
+                Offset (0x15F), 
         TBAB,   32, 
-        TBAH,   32, 
-        RTIP,   8, 
-        TSOD,   8, 
-        ATPC,   8, 
-        PTPC,   8, 
-        PFLV,   8, 
-        BREV,   8, 
-        SGMD,   8, 
-        SGFL,   8, 
-        PWOK,   8, 
-        HLRS,   8, 
-        DSEL,   8, 
-        ESEL,   8, 
-        PSEL,   8, 
-        PWEN,   8, 
-        PRST,   8, 
-        MXD1,   32, 
-        MXD2,   32, 
-        MXD3,   32, 
-        MXD4,   32, 
-        MXD5,   32, 
-        MXD6,   32, 
-        MXD7,   32, 
-        MXD8,   32, 
-        GBAS,   16, 
-        SGGP,   8, 
-        PXFX,   8, 
-        PXDY,   8, 
-        PXFD,   8, 
-                Offset (0x19D), 
-        ALFP,   8, 
-        IMON,   8, 
-        PDTS,   8, 
-        PKGA,   8, 
-        PAMT,   8, 
-        AC0F,   8, 
-        AC1F,   8, 
-        DTS3,   8, 
-        DTS4,   8, 
-                Offset (0x1B2), 
-        XHCI,   8, 
-        XHPM,   8, 
-                Offset (0x1B7), 
-        XTUB,   32, 
-        XTUS,   32, 
-        XMPB,   32, 
-                Offset (0x1C4), 
-        LPMV,   8, 
-        AOAC,   8, 
-        SLDR,   32, 
-        E4GM,   8
     }
 
-    Scope (_SB)
+    OperationRegion (PMIO, SystemIO, PMBS, 0x43)
+    Field (PMIO, ByteAcc, NoLock, Preserve)
     {
-        Name (PR00, Package (0x24)
-        {
-            Package (0x04)
-            {
-                0x001FFFFF, 
-                Zero, 
-                LNKF, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001FFFFF, 
-                One, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001FFFFF, 
-                0x02, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001FFFFF, 
-                0x03, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0014FFFF, 
-                Zero, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001DFFFF, 
-                One, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001DFFFF, 
-                0x02, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001DFFFF, 
-                0x03, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001DFFFF, 
-                Zero, 
-                LNKH, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001AFFFF, 
-                Zero, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001AFFFF, 
-                One, 
-                LNKF, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001AFFFF, 
-                0x02, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001AFFFF, 
-                0x03, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001BFFFF, 
-                Zero, 
-                LNKG, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0016FFFF, 
-                Zero, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0016FFFF, 
-                One, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0016FFFF, 
-                0x02, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0016FFFF, 
-                0x03, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001CFFFF, 
-                Zero, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001CFFFF, 
-                One, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001CFFFF, 
-                0x02, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x001CFFFF, 
-                0x03, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                Zero, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                One, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                0x02, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                0x03, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0006FFFF, 
-                Zero, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0006FFFF, 
-                One, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0006FFFF, 
-                0x02, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0006FFFF, 
-                0x03, 
-                LNKC, 
-                Zero
-            }, 
+                Offset (0x42), 
+            ,   1, 
+        GPEC,   1
+    }
 
-            Package (0x04)
-            {
-                0x0004FFFF, 
-                Zero, 
-                LNKA, 
-                Zero
-            }, 
+    OperationRegion (GPIO, SystemIO, GPBS, 0x10)
+    Field (GPIO, ByteAcc, NoLock, Preserve)
+    {
+                Offset (0x0F), 
+        GP24,   1, 
+            ,   2, 
+        GP27,   1
+    }
 
-            Package (0x04)
-            {
-                0x0004FFFF, 
-                One, 
-                LNKB, 
-                Zero
-            }, 
+    OperationRegion (DEB0, SystemIO, 0x80, One)
+    Field (DEB0, ByteAcc, NoLock, Preserve)
+    {
+        DBG8,   8
+    }
 
-            Package (0x04)
-            {
-                0x0004FFFF, 
-                0x02, 
-                LNKC, 
-                Zero
-            }, 
+    OperationRegion (PRT0, SystemIO, 0x80, 0x04)
+    Field (PRT0, DWordAcc, Lock, Preserve)
+    {
+        P80H,   32
+    }
 
-            Package (0x04)
-            {
-                0x0004FFFF, 
-                0x03, 
-                LNKD, 
-                Zero
-            }, 
+    Method (_PIC, 1, NotSerialized)
+    {
+    }
 
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                Zero, 
-                LNKA, 
-                Zero
-            }, 
+    Scope (_PR)
+    {
+        Processor (CPU0, 0x01, 0x00000410, 0x06) {}
+        Processor (CPU1, 0x02, 0x00000410, 0x06) {}
+        Processor (CPU2, 0x03, 0x00000410, 0x06) {}
+        Processor (CPU3, 0x04, 0x00000410, 0x06) {}
+    }
 
-            Package (0x04)
-            {
-                0x0019FFFF, 
-                Zero, 
-                LNKE, 
-                Zero
-            }
-        })
-        Name (AR00, Package (0x24)
+    Scope (_SB)
+    {
+        OperationRegion (IOB2, SystemIO, 0xB2, One)
+        Field (IOB2, ByteAcc, NoLock, Preserve)
         {
-            Package (0x04)
-            {
-                0x001FFFFF, 
-                Zero, 
-                Zero, 
-                0x15
-            }, 
-
-            Package (0x04)
-            {
-                0x001FFFFF, 
-                One, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x001FFFFF, 
-                0x02, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x001FFFFF, 
-                0x03, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x0014FFFF, 
-                Zero, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x001DFFFF, 
-                One, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x001DFFFF, 
-                0x02, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x001DFFFF, 
-                0x03, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x001DFFFF, 
-                Zero, 
-                Zero, 
-                0x17
-            }, 
-
-            Package (0x04)
-            {
-                0x001AFFFF, 
-                Zero, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x001AFFFF, 
-                One, 
-                Zero, 
-                0x15
-            }, 
-
-            Package (0x04)
-            {
-                0x001AFFFF, 
-                0x02, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x001AFFFF, 
-                0x03, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x001BFFFF, 
-                Zero, 
-                Zero, 
-                0x16
-            }, 
-
-            Package (0x04)
-            {
-                0x0016FFFF, 
-                Zero, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x0016FFFF, 
-                One, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x0016FFFF, 
-                0x02, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x0016FFFF, 
-                0x03, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0x001CFFFF, 
-                Zero, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x001CFFFF, 
-                One, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0x001CFFFF, 
-                0x02, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x001CFFFF, 
-                0x03, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                Zero, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                One, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                0x02, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                0x03, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x0006FFFF, 
-                Zero, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x0006FFFF, 
-                One, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x0006FFFF, 
-                0x02, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0x0006FFFF, 
-                0x03, 
-                Zero, 
-                0x12
-            }, 
+            SMIC,   8
+        }
 
-            Package (0x04)
+        Device (PCI0)
+        {
+            Name (_ADR, Zero)
+            Name (_UID, Zero)
+            Name (_BBN, Zero)
+            Name (_CID, EisaId ("PNP0A03"))
+            Name (_HID, EisaId ("PNP0A08"))
+            Name (_PRT, Package (0x24)
+            {
+                Package (0x04) { 0x001FFFFF, Zero, Zero, 0x15 },
+                Package (0x04) { 0x001FFFFF,  One, Zero, 0x13 },
+                Package (0x04) { 0x001FFFFF, 0x02, Zero, 0x12 },
+                Package (0x04) { 0x001FFFFF, 0x03, Zero, 0x10 },
+                Package (0x04) { 0x0014FFFF, Zero, Zero, 0x10 },
+                Package (0x04) { 0x001DFFFF,  One, Zero, 0x13 },
+                Package (0x04) { 0x001DFFFF, 0x02, Zero, 0x10 },
+                Package (0x04) { 0x001DFFFF, 0x03, Zero, 0x12 },
+                Package (0x04) { 0x001DFFFF, Zero, Zero, 0x17 },
+                Package (0x04) { 0x001AFFFF, Zero, Zero, 0x10 },
+                Package (0x04) { 0x001AFFFF,  One, Zero, 0x15 },
+                Package (0x04) { 0x001AFFFF, 0x02, Zero, 0x12 },
+                Package (0x04) { 0x001AFFFF, 0x03, Zero, 0x13 },
+                Package (0x04) { 0x001BFFFF, Zero, Zero, 0x16 },
+                Package (0x04) { 0x0016FFFF, Zero, Zero, 0x10 },
+                Package (0x04) { 0x0016FFFF,  One, Zero, 0x13 },
+                Package (0x04) { 0x0016FFFF, 0x02, Zero, 0x12 },
+                Package (0x04) { 0x0016FFFF, 0x03, Zero, 0x11 },
+                Package (0x04) { 0x001CFFFF, Zero, Zero, 0x10 },
+                Package (0x04) { 0x001CFFFF,  One, Zero, 0x11 },
+                Package (0x04) { 0x001CFFFF, 0x02, Zero, 0x12 },
+                Package (0x04) { 0x001CFFFF, 0x03, Zero, 0x13 },
+                Package (0x04) { 0x0001FFFF, Zero, Zero, 0x10 },
+                Package (0x04) { 0x0001FFFF,  One, Zero, 0x11 },
+                Package (0x04) { 0x0001FFFF, 0x02, Zero, 0x12 },
+                Package (0x04) { 0x0001FFFF, 0x03, Zero, 0x13 },
+                Package (0x04) { 0x0006FFFF, Zero, Zero, 0x13 },
+                Package (0x04) { 0x0006FFFF,  One, Zero, 0x10 },
+                Package (0x04) { 0x0006FFFF, 0x02, Zero, 0x11 },
+                Package (0x04) { 0x0006FFFF, 0x03, Zero, 0x12 },
+                Package (0x04) { 0x0004FFFF, Zero, Zero, 0x10 },
+                Package (0x04) { 0x0004FFFF, One,  Zero, 0x11 },
+                Package (0x04) { 0x0004FFFF, 0x02, Zero, 0x12 },
+                Package (0x04) { 0x0004FFFF, 0x03, Zero, 0x13 },
+                Package (0x04) { 0x0002FFFF, Zero, Zero, 0x10 },
+                Package (0x04) { 0x0019FFFF, Zero, Zero, 0x14 }
+            })
+            OperationRegion (HBUS, PCI_Config, Zero, 0x0100)
+            Field (HBUS, DWordAcc, NoLock, Preserve)
             {
-                0x0004FFFF, 
-                Zero, 
-                Zero, 
-                0x10
-            }, 
+                        Offset (0x40), 
+                EPEN,   1, 
+                    ,   11, 
+                EPBR,   20, 
+                        Offset (0x48), 
+                MHEN,   1, 
+                    ,   14, 
+                MHBR,   17, 
+                        Offset (0x50), 
+                GCLK,   1, 
+                        Offset (0x54), 
+                D0EN,   1, 
+                        Offset (0x60), 
+                PXEN,   1, 
+                PXSZ,   2, 
+                    ,   23, 
+                PXBR,   6, 
+                        Offset (0x68), 
+                DIEN,   1, 
+                    ,   11, 
+                DIBR,   20, 
+                        Offset (0x70), 
+                    ,   20, 
+                MEBR,   12, 
+                        Offset (0x80), 
+                    ,   4, 
+                PM0H,   2, 
+                        Offset (0x81), 
+                PM1L,   2, 
+                    ,   2, 
+                PM1H,   2, 
+                        Offset (0x82), 
+                PM2L,   2, 
+                    ,   2, 
+                PM2H,   2, 
+                        Offset (0x83), 
+                PM3L,   2, 
+                    ,   2, 
+                PM3H,   2, 
+                        Offset (0x84), 
+                PM4L,   2, 
+                    ,   2, 
+                PM4H,   2, 
+                        Offset (0x85), 
+                PM5L,   2, 
+                    ,   2, 
+                PM5H,   2, 
+                        Offset (0x86), 
+                PM6L,   2, 
+                    ,   2, 
+                PM6H,   2, 
+                        Offset (0x87), 
+                        Offset (0xA8), 
+                    ,   20, 
+                TUUD,   19, 
+                        Offset (0xBC), 
+                    ,   20, 
+                TLUD,   12, 
+                        Offset (0xC8), 
+                    ,   7, 
+                HTSE,   1
+            }
 
-            Package (0x04)
+            OperationRegion (MCHT, SystemMemory, 0xFED10000, 0x1100)
+            Field (MCHT, ByteAcc, NoLock, Preserve)
             {
-                0x0004FFFF, 
-                One, 
-                Zero, 
-                0x11
-            }, 
+            }
 
-            Package (0x04)
+            Name (BUF0, ResourceTemplate ()
             {
-                0x0004FFFF, 
-                0x02, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x0004FFFF, 
-                0x03, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                Zero, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x0019FFFF, 
-                Zero, 
-                Zero, 
-                0x14
-            }
-        })
-        Name (PR04, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKD, 
-                Zero
-            }
-        })
-        Name (AR04, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x13
-            }
-        })
-        Name (PR05, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKA, 
-                Zero
-            }
-        })
-        Name (AR05, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x10
-            }
-        })
-        Name (PR06, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKB, 
-                Zero
-            }
-        })
-        Name (AR06, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x11
-            }
-        })
-        Name (PR07, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKC, 
-                Zero
-            }
-        })
-        Name (AR07, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x12
-            }
-        })
-        Name (PR08, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKD, 
-                Zero
-            }
-        })
-        Name (AR08, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x13
-            }
-        })
-        Name (PR09, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKA, 
-                Zero
-            }
-        })
-        Name (AR09, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x10
-            }
-        })
-        Name (PR0E, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKB, 
-                Zero
-            }
-        })
-        Name (AR0E, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x11
-            }
-        })
-        Name (PR0F, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKC, 
-                Zero
-            }
-        })
-        Name (AR0F, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x12
-            }
-        })
-        Name (PR01, Package (0x08)
-        {
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                Zero, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                One, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                0x02, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                0x03, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0003FFFF, 
-                Zero, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0003FFFF, 
-                One, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0003FFFF, 
-                0x02, 
-                LNKF, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0003FFFF, 
-                0x03, 
-                LNKG, 
-                Zero
-            }
-        })
-        Name (AR01, Package (0x08)
-        {
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                Zero, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                One, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                0x02, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                0x03, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x0003FFFF, 
-                Zero, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x0003FFFF, 
-                One, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x0003FFFF, 
-                0x02, 
-                Zero, 
-                0x15
-            }, 
-
-            Package (0x04)
-            {
-                0x0003FFFF, 
-                0x03, 
-                Zero, 
-                0x16
-            }
-        })
-        Name (PR02, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKD, 
-                Zero
-            }
-        })
-        Name (AR02, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x13
-            }
-        })
-        Name (PR0A, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKA, 
-                Zero
-            }
-        })
-        Name (AR0A, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x10
-            }
-        })
-        Name (PR0B, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKB, 
-                Zero
-            }
-        })
-        Name (AR0B, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x11
-            }
-        })
-        Name (PR0C, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKC, 
-                Zero
-            }
-        })
-        Name (AR0C, Package (0x04)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x12
-            }
-        })
-        Name (PR31, Package (0x0C)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                Zero, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                One, 
-                LNKA, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                0x02, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                0x03, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                Zero, 
-                LNKB, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                One, 
-                LNKC, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                0x02, 
-                LNKD, 
-                Zero
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                0x03, 
-                LNKA, 
-                Zero
-            }
-        })
-        Name (AR31, Package (0x0C)
-        {
-            Package (0x04)
-            {
-                0xFFFF, 
-                Zero, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                One, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x02, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0xFFFF, 
-                0x03, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                Zero, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                One, 
-                Zero, 
-                0x10
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                0x02, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0x0001FFFF, 
-                0x03, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                Zero, 
-                Zero, 
-                0x11
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                One, 
-                Zero, 
-                0x12
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                0x02, 
-                Zero, 
-                0x13
-            }, 
-
-            Package (0x04)
-            {
-                0x0002FFFF, 
-                0x03, 
-                Zero, 
-                0x10
-            }
-        })
-        Name (PRSA, ResourceTemplate ()
-        {
-            IRQ (Level, ActiveLow, Shared, )
-                {3,4,5,6,10,11,12,14,15}
-        })
-        Alias (PRSA, PRSB)
-        Alias (PRSA, PRSC)
-        Alias (PRSA, PRSD)
-        Alias (PRSA, PRSE)
-        Alias (PRSA, PRSF)
-        Alias (PRSA, PRSG)
-        Alias (PRSA, PRSH)
-        Device (PCI0)
-        {
-            Name (_HID, EisaId ("PNP0A08"))
-            Name (_CID, EisaId ("PNP0A03"))
-            Name (_ADR, Zero)
-            Method (^BN00, 0, NotSerialized)
-            {
-                Return (Zero)
-            }
-
-            Method (_BBN, 0, NotSerialized)
-            {
-                Return (BN00 ())
-            }
-
-            Name (_UID, Zero)
-            Method (_PRT, 0, NotSerialized)
-            {
-                If (PICM)
-                {
-                    Return (AR00 ())
-                }
-
-                Return (PR00 ())
-            }
-
-            OperationRegion (HBUS, PCI_Config, Zero, 0x0100)
-            Field (HBUS, DWordAcc, NoLock, Preserve)
-            {
-                        Offset (0x40), 
-                EPEN,   1, 
-                    ,   11, 
-                EPBR,   20, 
-                        Offset (0x48), 
-                MHEN,   1, 
-                    ,   14, 
-                MHBR,   17, 
-                        Offset (0x50), 
-                GCLK,   1, 
-                        Offset (0x54), 
-                D0EN,   1, 
-                        Offset (0x60), 
-                PXEN,   1, 
-                PXSZ,   2, 
-                    ,   23, 
-                PXBR,   6, 
-                        Offset (0x68), 
-                DIEN,   1, 
-                    ,   11, 
-                DIBR,   20, 
-                        Offset (0x70), 
-                    ,   20, 
-                MEBR,   12, 
-                        Offset (0x80), 
-                    ,   4, 
-                PM0H,   2, 
-                        Offset (0x81), 
-                PM1L,   2, 
-                    ,   2, 
-                PM1H,   2, 
-                        Offset (0x82), 
-                PM2L,   2, 
-                    ,   2, 
-                PM2H,   2, 
-                        Offset (0x83), 
-                PM3L,   2, 
-                    ,   2, 
-                PM3H,   2, 
-                        Offset (0x84), 
-                PM4L,   2, 
-                    ,   2, 
-                PM4H,   2, 
-                        Offset (0x85), 
-                PM5L,   2, 
-                    ,   2, 
-                PM5H,   2, 
-                        Offset (0x86), 
-                PM6L,   2, 
-                    ,   2, 
-                PM6H,   2, 
-                        Offset (0x87), 
-                        Offset (0xA8), 
-                    ,   20, 
-                TUUD,   19, 
-                        Offset (0xBC), 
-                    ,   20, 
-                TLUD,   12, 
-                        Offset (0xC8), 
-                    ,   7, 
-                HTSE,   1
-            }
-
-            OperationRegion (MCHT, SystemMemory, 0xFED10000, 0x1100)
-            Field (MCHT, ByteAcc, NoLock, Preserve)
-            {
-            }
-
-            Name (BUF0, ResourceTemplate ()
-            {
-                WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
-                    0x0000,             // Granularity
-                    0x0000,             // Range Minimum
-                    0x00FF,             // Range Maximum
-                    0x0000,             // Translation Offset
-                    0x0100,             // Length
-                    ,, )
-                DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
-                    0x00000000,         // Granularity
-                    0x00000000,         // Range Minimum
-                    0x00000CF7,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00000CF8,         // Length
-                    ,, , TypeStatic)
-                IO (Decode16,
-                    0x0CF8,             // Range Minimum
-                    0x0CF8,             // Range Maximum
-                    0x01,               // Alignment
-                    0x08,               // Length
-                    )
-                DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
-                    0x00000000,         // Granularity
-                    0x00000D00,         // Range Minimum
-                    0x0000FFFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x0000F300,         // Length
-                    ,, , TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000A0000,         // Range Minimum
-                    0x000BFFFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00020000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000C0000,         // Range Minimum
-                    0x000C3FFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000C4000,         // Range Minimum
-                    0x000C7FFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000C8000,         // Range Minimum
-                    0x000CBFFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000CC000,         // Range Minimum
-                    0x000CFFFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000D0000,         // Range Minimum
-                    0x000D3FFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000D4000,         // Range Minimum
-                    0x000D7FFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000D8000,         // Range Minimum
-                    0x000DBFFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000DC000,         // Range Minimum
-                    0x000DFFFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000E0000,         // Range Minimum
-                    0x000E3FFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000E4000,         // Range Minimum
-                    0x000E7FFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000E8000,         // Range Minimum
-                    0x000EBFFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000EC000,         // Range Minimum
-                    0x000EFFFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00004000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x000F0000,         // Range Minimum
-                    0x000FFFFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0x00010000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x00000000,         // Granularity
-                    0x00000000,         // Range Minimum
-                    0xFEAFFFFF,         // Range Maximum
-                    0x00000000,         // Translation Offset
-                    0xFEB00000,         // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-                QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
-                    0x0000000000000000, // Granularity
-                    0x0000000000010000, // Range Minimum
-                    0x000000000001FFFF, // Range Maximum
-                    0x0000000000000000, // Translation Offset
-                    0x0000000000010000, // Length
-                    ,, , AddressRangeMemory, TypeStatic)
-            })
-            Method (_CRS, 0, Serialized)
-            {
-                CreateWordField (BUF0, 0x0A, PBMX)
-                Store (Subtract (ShiftRight (PELN, 0x14), 0x02), PBMX)
-                CreateWordField (BUF0, 0x0E, PBLN)
-                Store (Subtract (ShiftRight (PELN, 0x14), One), PBLN)
-                If (PM1L)
-                {
-                    CreateDWordField (BUF0, 0x7C, C0LN)
-                    Store (Zero, C0LN)
-                }
-
-                If (LEqual (PM1L, One))
-                {
-                    CreateBitField (BUF0, 0x0358, C0RW)
-                    Store (Zero, C0RW)
-                }
-
-                If (PM1H)
-                {
-                    CreateDWordField (BUF0, 0x96, C4LN)
-                    Store (Zero, C4LN)
-                }
-
-                If (LEqual (PM1H, One))
-                {
-                    CreateBitField (BUF0, 0x0428, C4RW)
-                    Store (Zero, C4RW)
-                }
-
-                If (PM2L)
-                {
-                    CreateDWordField (BUF0, 0xB0, C8LN)
-                    Store (Zero, C8LN)
-                }
-
-                If (LEqual (PM2L, One))
-                {
-                    CreateBitField (BUF0, 0x04F8, C8RW)
-                    Store (Zero, C8RW)
-                }
-
-                If (PM2H)
-                {
-                    CreateDWordField (BUF0, 0xCA, CCLN)
-                    Store (Zero, CCLN)
-                }
-
-                If (LEqual (PM2H, One))
-                {
-                    CreateBitField (BUF0, 0x05C8, CCRW)
-                    Store (Zero, CCRW)
-                }
-
-                If (PM3L)
-                {
-                    CreateDWordField (BUF0, 0xE4, D0LN)
-                    Store (Zero, D0LN)
-                }
-
-                If (LEqual (PM3L, One))
-                {
-                    CreateBitField (BUF0, 0x0698, D0RW)
-                    Store (Zero, D0RW)
-                }
-
-                If (PM3H)
-                {
-                    CreateDWordField (BUF0, 0xFE, D4LN)
-                    Store (Zero, D4LN)
-                }
-
-                If (LEqual (PM3H, One))
-                {
-                    CreateBitField (BUF0, 0x0768, D4RW)
-                    Store (Zero, D4RW)
-                }
-
-                If (PM4L)
-                {
-                    CreateDWordField (BUF0, 0x0118, D8LN)
-                    Store (Zero, D8LN)
-                }
-
-                If (LEqual (PM4L, One))
-                {
-                    CreateBitField (BUF0, 0x0838, D8RW)
-                    Store (Zero, D8RW)
-                }
-
-                If (PM4H)
-                {
-                    CreateDWordField (BUF0, 0x0132, DCLN)
-                    Store (Zero, DCLN)
-                }
-
-                If (LEqual (PM4H, One))
-                {
-                    CreateBitField (BUF0, 0x0908, DCRW)
-                    Store (Zero, DCRW)
-                }
-
-                If (PM5L)
-                {
-                    CreateDWordField (BUF0, 0x014C, E0LN)
-                    Store (Zero, E0LN)
-                }
-
-                If (LEqual (PM5L, One))
-                {
-                    CreateBitField (BUF0, 0x09D8, E0RW)
-                    Store (Zero, E0RW)
-                }
-
-                If (PM5H)
-                {
-                    CreateDWordField (BUF0, 0x0166, E4LN)
-                    Store (Zero, E4LN)
-                }
-
-                If (LEqual (PM5H, One))
-                {
-                    CreateBitField (BUF0, 0x0AA8, E4RW)
-                    Store (Zero, E4RW)
-                }
-
-                If (PM6L)
-                {
-                    CreateDWordField (BUF0, 0x0180, E8LN)
-                    Store (Zero, E8LN)
-                }
-
-                If (LEqual (PM6L, One))
-                {
-                    CreateBitField (BUF0, 0x0B78, E8RW)
-                    Store (Zero, E8RW)
-                }
-
-                If (PM6H)
-                {
-                    CreateDWordField (BUF0, 0x019A, ECLN)
-                    Store (Zero, ECLN)
-                }
-
-                If (LEqual (PM6H, One))
-                {
-                    CreateBitField (BUF0, 0x0C48, ECRW)
-                    Store (Zero, ECRW)
-                }
-
-                If (PM0H)
-                {
-                    CreateDWordField (BUF0, 0x01B4, F0LN)
-                    Store (Zero, F0LN)
-                }
-
-                If (LEqual (PM0H, One))
-                {
-                    CreateBitField (BUF0, 0x0D18, F0RW)
-                    Store (Zero, F0RW)
-                }
-
-                CreateDWordField (BUF0, 0x01C2, M1MN)
-                CreateDWordField (BUF0, 0x01C6, M1MX)
-                CreateDWordField (BUF0, 0x01CE, M1LN)
-                ShiftLeft (TLUD, 0x14, M1MN)
-                Add (Subtract (M1MX, M1MN), One, M1LN)
-                If (LLessEqual (OSYS, 0x07D3))
-                {
-                    CreateDWordField (BUF0, 0x01F8, MSLN)
-                    Store (Zero, MSLN)
-                }
-                Else
-                {
-                    If (E4GM)
-                    {
-                        CreateQWordField (BUF0, 0x01F8, M2LN)
-                        CreateQWordField (BUF0, 0x01E0, M2MN)
-                        CreateQWordField (BUF0, 0x01E8, M2MX)
-                        If (LGreaterEqual (TUUD, 0x1000))
-                        {
-                            ShiftLeft (TUUD, 0x14, M2MN)
-                            Store (Subtract (0x0000001000000000, ShiftLeft (TUUD, 0x14)), M2LN)
-                        }
-                        Else
-                        {
-                            Store (0x0000000100000000, M2MN)
-                            Store (0x0000000F00000000, M2LN)
-                        }
-
-                        Subtract (Add (M2MN, M2LN), One, M2MX)
-                    }
-                    Else
-                    {
-                        CreateDWordField (BUF0, 0x01F8, M4LN)
-                        Store (Zero, M4LN)
-                    }
-                }
-
-                Return (BUF0)
-            }
-
-            Name (GUID, Buffer (0x10)
-            {
-                /* 0000 */    0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40, 
-                /* 0008 */    0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66
-            })
-            Name (SUPP, Zero)
-            Name (CTRL, Zero)
-            Name (XCNT, Zero)
-            Method (_OSC, 4, Serialized)
-            {
-                Store (Arg3, Local0)
-                CreateDWordField (Local0, Zero, CDW1)
-                CreateDWordField (Local0, 0x04, CDW2)
-                CreateDWordField (Local0, 0x08, CDW3)
-                If (^XHC.CUID (Arg0))
-                {
-                    Return (^XHC.POSC (Arg1, Arg2, Arg3))
-                }
-                Else
-                {
-                    If (_OSI ("Windows 2012"))
-                    {
-                        If (LEqual (XCNT, Zero))
-                        {
-                            ^XHC.XSEL ()
-                            Increment (XCNT)
-                        }
-                    }
-                }
-
-                If (LAnd (LEqual (Arg0, GUID), NEXP))
-                {
-                    Store (CDW2, SUPP)
-                    Store (CDW3, CTRL)
-                    If (Not (And (CDW1, One)))
-                    {
-                        If (And (CTRL, One))
-                        {
-                            NHPG ()
-                        }
-
-                        If (And (CTRL, 0x04))
-                        {
-                            NPME ()
-                        }
-                    }
-
-                    If (LNotEqual (Arg1, One))
-                    {
-                        Or (CDW1, 0x08, CDW1)
-                    }
-
-                    If (LNotEqual (CDW3, CTRL))
-                    {
-                        Or (CDW1, 0x10, CDW1)
-                    }
-
-                    Store (CTRL, CDW3)
-                    Store (CTRL, OSCC)
-                    Return (Local0)
-                }
-                Else
-                {
-                    Or (CDW1, 0x04, CDW1)
-                    Return (Local0)
-                }
-            }
-
-            Scope (\_SB.PCI0)
-            {
-                Method (AR00, 0, NotSerialized)
-                {
-                    Return (^^AR00)
-                }
-
-                Method (PR00, 0, NotSerialized)
-                {
-                    Return (^^PR00)
-                }
-
-                Method (AR01, 0, NotSerialized)
-                {
-                    Return (^^AR01)
-                }
-
-                Method (PR01, 0, NotSerialized)
-                {
-                    Return (^^PR01)
-                }
-
-                Method (AR02, 0, NotSerialized)
-                {
-                    Return (^^AR02)
-                }
-
-                Method (PR02, 0, NotSerialized)
-                {
-                    Return (^^PR02)
-                }
-
-                Method (AR04, 0, NotSerialized)
-                {
-                    Return (^^AR04)
-                }
-
-                Method (PR04, 0, NotSerialized)
-                {
-                    Return (^^PR04)
-                }
-
-                Method (AR05, 0, NotSerialized)
-                {
-                    Return (^^AR05)
-                }
-
-                Method (PR05, 0, NotSerialized)
-                {
-                    Return (^^PR05)
-                }
-
-                Method (AR06, 0, NotSerialized)
-                {
-                    Return (^^AR06)
-                }
-
-                Method (PR06, 0, NotSerialized)
-                {
-                    Return (^^PR06)
-                }
-
-                Method (AR07, 0, NotSerialized)
-                {
-                    Return (^^AR07)
-                }
-
-                Method (PR07, 0, NotSerialized)
-                {
-                    Return (^^PR07)
-                }
-
-                Method (AR08, 0, NotSerialized)
-                {
-                    Return (^^AR08)
-                }
-
-                Method (PR08, 0, NotSerialized)
-                {
-                    Return (^^PR08)
-                }
-
-                Method (AR09, 0, NotSerialized)
-                {
-                    Return (^^AR09)
-                }
-
-                Method (PR09, 0, NotSerialized)
-                {
-                    Return (^^PR09)
-                }
-
-                Method (AR0E, 0, NotSerialized)
-                {
-                    Return (^^AR0E)
-                }
-
-                Method (PR0E, 0, NotSerialized)
-                {
-                    Return (^^PR0E)
-                }
-
-                Method (AR0F, 0, NotSerialized)
-                {
-                    Return (^^AR0F)
-                }
-
-                Method (PR0F, 0, NotSerialized)
-                {
-                    Return (^^PR0F)
-                }
-
-                Method (AR0A, 0, NotSerialized)
-                {
-                    Return (^^AR0A)
-                }
-
-                Method (PR0A, 0, NotSerialized)
-                {
-                    Return (^^PR0A)
-                }
-
-                Method (AR0B, 0, NotSerialized)
-                {
-                    Return (^^AR0B)
-                }
-
-                Method (PR0B, 0, NotSerialized)
-                {
-                    Return (^^PR0B)
-                }
-
-                Method (AR0C, 0, NotSerialized)
-                {
-                    Return (^^AR0C)
-                }
-
-                Method (PR0C, 0, NotSerialized)
-                {
-                    Return (^^PR0C)
-                }
-            }
-
-            Device (TPMX)
-            {
-                Name (_HID, EisaId ("PNP0C01"))
-                Name (_UID, One)
-                Name (CRS, ResourceTemplate ()
-                {
-                    Memory32Fixed (ReadOnly,
-                        0xFED40000,         // Address Base
-                        0x00005000,         // Address Length
-                        )
-                })
-                Method (_CRS, 0, NotSerialized)
-                {
-                    If (TPMF)
-                    {
-                        Return (Zero)
-                    }
-
-                    Return (CRS)
-                }
-            }
-
-            Device (LPCB)
-            {
-                Name (_ADR, 0x001F0000)
-                Scope (\_SB)
-                {
-                    OperationRegion (PCI0.LPCB.LPC1, PCI_Config, 0x40, 0xC0)
-                    Field (PCI0.LPCB.LPC1, AnyAcc, NoLock, Preserve)
-                    {
-                                Offset (0x20), 
-                        PARC,   8, 
-                        PBRC,   8, 
-                        PCRC,   8, 
-                        PDRC,   8, 
-                                Offset (0x28), 
-                        PERC,   8, 
-                        PFRC,   8, 
-                        PGRC,   8, 
-                        PHRC,   8, 
-                                Offset (0x6C), 
-                                Offset (0x6D), 
-                                Offset (0x6E), 
-                        XUSB,   1
-                    }
-
-                    Device (LNKA)
-                    {
-                        Name (_HID, EisaId ("PNP0C0F"))
-                        Name (_UID, One)
-                        Method (_DIS, 0, Serialized)
-                        {
-                            Or (PARC, 0x80, PARC)
-                        }
-
-                        Method (_PRS, 0, Serialized)
-                        {
-                            Return (PRSA)
-                        }
-
-                        Method (_CRS, 0, Serialized)
-                        {
-                            Name (RTLA, ResourceTemplate ()
-                            {
-                                IRQ (Level, ActiveLow, Shared, )
-                                    {}
-                            })
-                            CreateWordField (RTLA, One, IRQ0)
-                            Store (Zero, IRQ0)
-                            ShiftLeft (One, And (PARC, 0x0F), IRQ0)
-                            Return (RTLA)
-                        }
-
-                        Method (_SRS, 1, Serialized)
-                        {
-                            CreateWordField (Arg0, One, IRQ0)
-                            FindSetRightBit (IRQ0, Local0)
-                            Decrement (Local0)
-                            Store (Local0, PARC)
-                        }
-
-                        Method (_STA, 0, Serialized)
-                        {
-                            If (And (PARC, 0x80))
-                            {
-                                Return (0x09)
-                            }
-                            Else
-                            {
-                                Return (0x0B)
-                            }
-                        }
-                    }
-
-                    Device (LNKB)
-                    {
-                        Name (_HID, EisaId ("PNP0C0F"))
-                        Name (_UID, 0x02)
-                        Method (_DIS, 0, Serialized)
-                        {
-                            Or (PBRC, 0x80, PBRC)
-                        }
-
-                        Method (_PRS, 0, Serialized)
-                        {
-                            Return (PRSB)
-                        }
-
-                        Method (_CRS, 0, Serialized)
-                        {
-                            Name (RTLB, ResourceTemplate ()
-                            {
-                                IRQ (Level, ActiveLow, Shared, )
-                                    {}
-                            })
-                            CreateWordField (RTLB, One, IRQ0)
-                            Store (Zero, IRQ0)
-                            ShiftLeft (One, And (PBRC, 0x0F), IRQ0)
-                            Return (RTLB)
-                        }
-
-                        Method (_SRS, 1, Serialized)
-                        {
-                            CreateWordField (Arg0, One, IRQ0)
-                            FindSetRightBit (IRQ0, Local0)
-                            Decrement (Local0)
-                            Store (Local0, PBRC)
-                        }
-
-                        Method (_STA, 0, Serialized)
-                        {
-                            If (And (PBRC, 0x80))
-                            {
-                                Return (0x09)
-                            }
-                            Else
-                            {
-                                Return (0x0B)
-                            }
-                        }
-                    }
-
-                    Device (LNKC)
-                    {
-                        Name (_HID, EisaId ("PNP0C0F"))
-                        Name (_UID, 0x03)
-                        Method (_DIS, 0, Serialized)
-                        {
-                            Or (PCRC, 0x80, PCRC)
-                        }
-
-                        Method (_PRS, 0, Serialized)
-                        {
-                            Return (PRSC)
-                        }
-
-                        Method (_CRS, 0, Serialized)
-                        {
-                            Name (RTLC, ResourceTemplate ()
-                            {
-                                IRQ (Level, ActiveLow, Shared, )
-                                    {}
-                            })
-                            CreateWordField (RTLC, One, IRQ0)
-                            Store (Zero, IRQ0)
-                            ShiftLeft (One, And (PCRC, 0x0F), IRQ0)
-                            Return (RTLC)
-                        }
-
-                        Method (_SRS, 1, Serialized)
-                        {
-                            CreateWordField (Arg0, One, IRQ0)
-                            FindSetRightBit (IRQ0, Local0)
-                            Decrement (Local0)
-                            Store (Local0, PCRC)
-                        }
-
-                        Method (_STA, 0, Serialized)
-                        {
-                            If (And (PCRC, 0x80))
-                            {
-                                Return (0x09)
-                            }
-                            Else
-                            {
-                                Return (0x0B)
-                            }
-                        }
-                    }
-
-                    Device (LNKD)
-                    {
-                        Name (_HID, EisaId ("PNP0C0F"))
-                        Name (_UID, 0x04)
-                        Method (_DIS, 0, Serialized)
-                        {
-                            Or (PDRC, 0x80, PDRC)
-                        }
-
-                        Method (_PRS, 0, Serialized)
-                        {
-                            Return (PRSD)
-                        }
-
-                        Method (_CRS, 0, Serialized)
-                        {
-                            Name (RTLD, ResourceTemplate ()
-                            {
-                                IRQ (Level, ActiveLow, Shared, )
-                                    {}
-                            })
-                            CreateWordField (RTLD, One, IRQ0)
-                            Store (Zero, IRQ0)
-                            ShiftLeft (One, And (PDRC, 0x0F), IRQ0)
-                            Return (RTLD)
-                        }
-
-                        Method (_SRS, 1, Serialized)
-                        {
-                            CreateWordField (Arg0, One, IRQ0)
-                            FindSetRightBit (IRQ0, Local0)
-                            Decrement (Local0)
-                            Store (Local0, PDRC)
-                        }
-
-                        Method (_STA, 0, Serialized)
-                        {
-                            If (And (PDRC, 0x80))
-                            {
-                                Return (0x09)
-                            }
-                            Else
-                            {
-                                Return (0x0B)
-                            }
-                        }
-                    }
-
-                    Device (LNKE)
-                    {
-                        Name (_HID, EisaId ("PNP0C0F"))
-                        Name (_UID, 0x05)
-                        Method (_DIS, 0, Serialized)
-                        {
-                            Or (PERC, 0x80, PERC)
-                        }
-
-                        Method (_PRS, 0, Serialized)
-                        {
-                            Return (PRSE)
-                        }
-
-                        Method (_CRS, 0, Serialized)
-                        {
-                            Name (RTLE, ResourceTemplate ()
-                            {
-                                IRQ (Level, ActiveLow, Shared, )
-                                    {}
-                            })
-                            CreateWordField (RTLE, One, IRQ0)
-                            Store (Zero, IRQ0)
-                            ShiftLeft (One, And (PERC, 0x0F), IRQ0)
-                            Return (RTLE)
-                        }
-
-                        Method (_SRS, 1, Serialized)
-                        {
-                            CreateWordField (Arg0, One, IRQ0)
-                            FindSetRightBit (IRQ0, Local0)
-                            Decrement (Local0)
-                            Store (Local0, PERC)
-                        }
-
-                        Method (_STA, 0, Serialized)
-                        {
-                            If (And (PERC, 0x80))
-                            {
-                                Return (0x09)
-                            }
-                            Else
-                            {
-                                Return (0x0B)
-                            }
-                        }
-                    }
-
-                    Device (LNKF)
-                    {
-                        Name (_HID, EisaId ("PNP0C0F"))
-                        Name (_UID, 0x06)
-                        Method (_DIS, 0, Serialized)
-                        {
-                            Or (PFRC, 0x80, PFRC)
-                        }
-
-                        Method (_PRS, 0, Serialized)
-                        {
-                            Return (PRSF)
-                        }
-
-                        Method (_CRS, 0, Serialized)
-                        {
-                            Name (RTLF, ResourceTemplate ()
-                            {
-                                IRQ (Level, ActiveLow, Shared, )
-                                    {}
-                            })
-                            CreateWordField (RTLF, One, IRQ0)
-                            Store (Zero, IRQ0)
-                            ShiftLeft (One, And (PFRC, 0x0F), IRQ0)
-                            Return (RTLF)
-                        }
-
-                        Method (_SRS, 1, Serialized)
-                        {
-                            CreateWordField (Arg0, One, IRQ0)
-                            FindSetRightBit (IRQ0, Local0)
-                            Decrement (Local0)
-                            Store (Local0, PFRC)
-                        }
-
-                        Method (_STA, 0, Serialized)
-                        {
-                            If (And (PFRC, 0x80))
-                            {
-                                Return (0x09)
-                            }
-                            Else
-                            {
-                                Return (0x0B)
-                            }
-                        }
-                    }
-
-                    Device (LNKG)
-                    {
-                        Name (_HID, EisaId ("PNP0C0F"))
-                        Name (_UID, 0x07)
-                        Method (_DIS, 0, Serialized)
-                        {
-                            Or (PGRC, 0x80, PGRC)
-                        }
-
-                        Method (_PRS, 0, Serialized)
-                        {
-                            Return (PRSG)
-                        }
-
-                        Method (_CRS, 0, Serialized)
-                        {
-                            Name (RTLG, ResourceTemplate ()
-                            {
-                                IRQ (Level, ActiveLow, Shared, )
-                                    {}
-                            })
-                            CreateWordField (RTLG, One, IRQ0)
-                            Store (Zero, IRQ0)
-                            ShiftLeft (One, And (PGRC, 0x0F), IRQ0)
-                            Return (RTLG)
-                        }
-
-                        Method (_SRS, 1, Serialized)
-                        {
-                            CreateWordField (Arg0, One, IRQ0)
-                            FindSetRightBit (IRQ0, Local0)
-                            Decrement (Local0)
-                            Store (Local0, PGRC)
-                        }
-
-                        Method (_STA, 0, Serialized)
-                        {
-                            If (And (PGRC, 0x80))
-                            {
-                                Return (0x09)
-                            }
-                            Else
-                            {
-                                Return (0x0B)
-                            }
-                        }
-                    }
-
-                    Device (LNKH)
-                    {
-                        Name (_HID, EisaId ("PNP0C0F"))
-                        Name (_UID, 0x08)
-                        Method (_DIS, 0, Serialized)
-                        {
-                            Or (PHRC, 0x80, PHRC)
-                        }
-
-                        Method (_PRS, 0, Serialized)
-                        {
-                            Return (PRSH)
-                        }
-
-                        Method (_CRS, 0, Serialized)
-                        {
-                            Name (RTLH, ResourceTemplate ()
-                            {
-                                IRQ (Level, ActiveLow, Shared, )
-                                    {}
-                            })
-                            CreateWordField (RTLH, One, IRQ0)
-                            Store (Zero, IRQ0)
-                            ShiftLeft (One, And (PHRC, 0x0F), IRQ0)
-                            Return (RTLH)
-                        }
-
-                        Method (_SRS, 1, Serialized)
-                        {
-                            CreateWordField (Arg0, One, IRQ0)
-                            FindSetRightBit (IRQ0, Local0)
-                            Decrement (Local0)
-                            Store (Local0, PHRC)
-                        }
-
-                        Method (_STA, 0, Serialized)
-                        {
-                            If (And (PHRC, 0x80))
-                            {
-                                Return (0x09)
-                            }
-                            Else
-                            {
-                                Return (0x0B)
-                            }
-                        }
-                    }
-                }
-
-                OperationRegion (LPC0, PCI_Config, 0x40, 0xC0)
-                Field (LPC0, AnyAcc, NoLock, Preserve)
-                {
-                            Offset (0x40), 
-                    IOD0,   8, 
-                    IOD1,   8, 
-                            Offset (0xB0), 
-                    RAEN,   1, 
-                        ,   13, 
-                    RCBA,   18
-                }
-
-                Device (DMAC)
-                {
-                    Name (_HID, EisaId ("PNP0200"))
-                    Name (_CRS, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0000,             // Range Minimum
-                            0x0000,             // Range Maximum
-                            0x01,               // Alignment
-                            0x20,               // Length
-                            )
-                        IO (Decode16,
-                            0x0081,             // Range Minimum
-                            0x0081,             // Range Maximum
-                            0x01,               // Alignment
-                            0x11,               // Length
-                            )
-                        IO (Decode16,
-                            0x0093,             // Range Minimum
-                            0x0093,             // Range Maximum
-                            0x01,               // Alignment
-                            0x0D,               // Length
-                            )
-                        IO (Decode16,
-                            0x00C0,             // Range Minimum
-                            0x00C0,             // Range Maximum
-                            0x01,               // Alignment
-                            0x20,               // Length
-                            )
-                        DMA (Compatibility, NotBusMaster, Transfer8_16, )
-                            {4}
-                    })
-                }
-
-                Device (FWHD)
-                {
-                    Name (_HID, EisaId ("INT0800"))
-                    Name (_CRS, ResourceTemplate ()
-                    {
-                        Memory32Fixed (ReadOnly,
-                            0xFF000000,         // Address Base
-                            0x01000000,         // Address Length
-                            )
-                    })
-                }
-
-                Device (HPET)
-                {
-                    Name (_HID, EisaId ("PNP0103"))
-                    Name (_UID, Zero)
-                    Name (BUF0, ResourceTemplate ()
-                    {
-                        Memory32Fixed (ReadWrite,
-                            0xFED00000,         // Address Base
-                            0x00000400,         // Address Length
-                            )
-                    })
-                    Method (_STA, 0, NotSerialized)
-                    {
-                        If (LGreaterEqual (OSYS, 0x07D1))
-                        {
-                            If (HPAE)
-                            {
-                                Return (0x0F)
-                            }
-                        }
-                        Else
-                        {
-                            If (HPAE)
-                            {
-                                Return (0x0B)
-                            }
-                        }
-
-                        Return (Zero)
-                    }
-
-                    Method (_CRS, 0, Serialized)
-                    {
-                        If (HPAE)
-                        {
-                            CreateDWordField (BUF0, 0x04, HPT0)
-                            If (LEqual (HPAS, One))
-                            {
-                                Store (0xFED01000, HPT0)
-                            }
-
-                            If (LEqual (HPAS, 0x02))
-                            {
-                                Store (0xFED02000, HPT0)
-                            }
-
-                            If (LEqual (HPAS, 0x03))
-                            {
-                                Store (0xFED03000, HPT0)
-                            }
-                        }
-
-                        Return (BUF0)
-                    }
-                }
-
-                Device (IPIC)
-                {
-                    Name (_HID, EisaId ("PNP0000"))
-                    Name (_CRS, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0020,             // Range Minimum
-                            0x0020,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x0024,             // Range Minimum
-                            0x0024,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x0028,             // Range Minimum
-                            0x0028,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x002C,             // Range Minimum
-                            0x002C,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x0030,             // Range Minimum
-                            0x0030,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x0034,             // Range Minimum
-                            0x0034,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x0038,             // Range Minimum
-                            0x0038,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x003C,             // Range Minimum
-                            0x003C,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x00A0,             // Range Minimum
-                            0x00A0,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x00A4,             // Range Minimum
-                            0x00A4,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x00A8,             // Range Minimum
-                            0x00A8,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x00AC,             // Range Minimum
-                            0x00AC,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x00B0,             // Range Minimum
-                            0x00B0,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x00B4,             // Range Minimum
-                            0x00B4,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x00B8,             // Range Minimum
-                            0x00B8,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x00BC,             // Range Minimum
-                            0x00BC,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x04D0,             // Range Minimum
-                            0x04D0,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IRQNoFlags ()
-                            {2}
-                    })
-                }
-
-                Device (LDRC)
-                {
-                    Name (_HID, EisaId ("PNP0C02"))
-                    Name (_UID, 0x02)
-                    Name (_CRS, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x002E,             // Range Minimum
-                            0x002E,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x004E,             // Range Minimum
-                            0x004E,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x0061,             // Range Minimum
-                            0x0061,             // Range Maximum
-                            0x01,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0063,             // Range Minimum
-                            0x0063,             // Range Maximum
-                            0x01,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0065,             // Range Minimum
-                            0x0065,             // Range Maximum
-                            0x01,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0067,             // Range Minimum
-                            0x0067,             // Range Maximum
-                            0x01,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0070,             // Range Minimum
-                            0x0070,             // Range Maximum
-                            0x01,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0080,             // Range Minimum
-                            0x0080,             // Range Maximum
-                            0x01,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0092,             // Range Minimum
-                            0x0092,             // Range Maximum
-                            0x01,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x00B2,             // Range Minimum
-                            0x00B2,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x0680,             // Range Minimum
-                            0x0680,             // Range Maximum
-                            0x01,               // Alignment
-                            0x20,               // Length
-                            )
-                        IO (Decode16,
-                            0x0200,             // Range Minimum
-                            0x0200,             // Range Maximum
-                            0x01,               // Alignment
-                            0x10,               // Length
-                            )
-                        IO (Decode16,
-                            0xFFFF,             // Range Minimum
-                            0xFFFF,             // Range Maximum
-                            0x01,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0xFFFF,             // Range Minimum
-                            0xFFFF,             // Range Maximum
-                            0x01,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0400,             // Range Minimum
-                            0x0400,             // Range Maximum
-                            0x01,               // Alignment
-                            0x54,               // Length
-                            )
-                        IO (Decode16,
-                            0x0458,             // Range Minimum
-                            0x0458,             // Range Maximum
-                            0x01,               // Alignment
-                            0x28,               // Length
-                            )
-                        IO (Decode16,
-                            0x0500,             // Range Minimum
-                            0x0500,             // Range Maximum
-                            0x01,               // Alignment
-                            0x80,               // Length
-                            )
-                        IO (Decode16,
-                            0x164E,             // Range Minimum
-                            0x164E,             // Range Maximum
-                            0x01,               // Alignment
-                            0x02,               // Length
-                            )
-                    })
-                }
-
-                Device (RTC)
-                {
-                    Name (_HID, EisaId ("PNP0B00"))
-                    Name (_CRS, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0070,             // Range Minimum
-                            0x0070,             // Range Maximum
-                            0x01,               // Alignment
-                            0x08,               // Length
-                            )
-                        IRQNoFlags ()
-                            {8}
-                    })
-                }
-
-                Device (TIMR)
-                {
-                    Name (_HID, EisaId ("PNP0100"))
-                    Name (_CRS, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0040,             // Range Minimum
-                            0x0040,             // Range Maximum
-                            0x01,               // Alignment
-                            0x04,               // Length
-                            )
-                        IO (Decode16,
-                            0x0050,             // Range Minimum
-                            0x0050,             // Range Maximum
-                            0x10,               // Alignment
-                            0x04,               // Length
-                            )
-                        IRQNoFlags ()
-                            {0}
-                    })
-                }
-
-                Device (CWDT)
-                {
-                    Name (_HID, EisaId ("INT3F0D"))
-                    Name (_CID, EisaId ("PNP0C02"))
-                    Name (BUF0, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0454,             // Range Minimum
-                            0x0454,             // Range Maximum
-                            0x04,               // Alignment
-                            0x04,               // Length
-                            )
-                    })
-                    Method (_STA, 0, Serialized)
-                    {
-                        If (LEqual (WDTE, One))
-                        {
-                            Return (0x0F)
-                        }
-                        Else
-                        {
-                            Return (Zero)
-                        }
-                    }
-
-                    Method (_CRS, 0, Serialized)
-                    {
-                        Return (BUF0)
-                    }
-                }
-
-                Device (EC0)
-                {
-                    Name (_HID, EisaId ("PNP0C09"))
-                    Name (_CRS, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0062,             // Range Minimum
-                            0x0062,             // Range Maximum
-                            0x00,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0066,             // Range Minimum
-                            0x0066,             // Range Maximum
-                            0x00,               // Alignment
-                            0x01,               // Length
-                            )
-                    })
-                    CreateWordField (_CRS, 0x02, DPRT)
-                    CreateWordField (_CRS, 0x0A, CPRT)
-                    Name (_GPE, 0x18)
-                    Name (REGC, Zero)
-                    Method (_Q80, 0, NotSerialized)
-                    {
-                        \AMW0.AMWN (0x05)
-                    }
-
-                    Method (_Q81, 0, NotSerialized)
-                    {
-                        \AMW0.AMWN (0x00010005)
-                    }
-
-                    Method (_Q82, 0, NotSerialized)
-                    {
-                        \AMW0.AMWN (0x00020005)
-                    }
-
-                    Method (_Q83, 0, NotSerialized)
-                    {
-                        \AMW0.AMWN (0x00030005)
-                    }
-                }
-
-                Device (SIO1)
-                {
-                    Name (_HID, EisaId ("PNP0C02"))
-                    Name (_UID, 0x0111)
-                    Name (CRS, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0000,             // Range Minimum
-                            0x0000,             // Range Maximum
-                            0x00,               // Alignment
-                            0x00,               // Length
-                            )
-                        IO (Decode16,
-                            0x0000,             // Range Minimum
-                            0x0000,             // Range Maximum
-                            0x00,               // Alignment
-                            0x00,               // Length
-                            )
-                        IO (Decode16,
-                            0x0000,             // Range Minimum
-                            0x0000,             // Range Maximum
-                            0x00,               // Alignment
-                            0x00,               // Length
-                            )
-                        IO (Decode16,
-                            0x0000,             // Range Minimum
-                            0x0000,             // Range Maximum
-                            0x00,               // Alignment
-                            0x00,               // Length
-                            )
-                    })
-                    Method (_CRS, 0, NotSerialized)
-                    {
-                        If (LAnd (LLess (SP1O, 0x03F0), LGreater (SP1O, 0xF0)))
-                        {
-                            CreateWordField (CRS, 0x02, GPI0)
-                            CreateWordField (CRS, 0x04, GPI1)
-                            CreateByteField (CRS, 0x07, GPIL)
-                            Store (SP1O, GPI0)
-                            Store (SP1O, GPI1)
-                            Store (0x02, GPIL)
-                        }
-
-                        If (IO1B)
-                        {
-                            CreateWordField (CRS, 0x0A, GP10)
-                            CreateWordField (CRS, 0x0C, GP11)
-                            CreateByteField (CRS, 0x0F, GPL1)
-                            Store (IO1B, GP10)
-                            Store (IO1B, GP11)
-                            Store (IO1L, GPL1)
-                        }
-
-                        If (IO3B)
-                        {
-                            CreateWordField (CRS, 0x12, GP20)
-                            CreateWordField (CRS, 0x14, GP21)
-                            CreateByteField (CRS, 0x17, GPL2)
-                            Store (IO3B, GP20)
-                            Store (IO3B, GP21)
-                            Store (IO3L, GPL2)
-                        }
-
-                        If (IO2B)
-                        {
-                            CreateWordField (CRS, 0x1A, GP30)
-                            CreateWordField (CRS, 0x1C, GP31)
-                            CreateByteField (CRS, 0x1F, GPL3)
-                            Store (IO2B, GP30)
-                            Store (IO2B, GP31)
-                            Store (IO2L, GPL3)
-                        }
-
-                        Return (CRS)
-                    }
-
-                    Name (DCAT, Package (0x15)
-                    {
-                        0x02, 
-                        0x03, 
-                        One, 
-                        Zero, 
-                        0xFF, 
-                        0xFF, 
-                        0xFF, 
-                        0xFF, 
-                        0xFF, 
-                        0xFF, 
-                        0x05, 
-                        0xFF, 
-                        0xFF, 
-                        0xFF, 
-                        0x05, 
-                        0xFF, 
-                        0xFF, 
-                        0xFF, 
-                        0x06, 
-                        0xFF, 
-                        0xFF
-                    })
-                    Mutex (MUT0, 0x00)
-                    Method (ENFG, 1, NotSerialized)
-                    {
-                        Acquire (MUT0, 0x0FFF)
-                        Store (0x87, INDX)
-                        Store (0x87, INDX)
-                        Store (Arg0, LDN)
-                    }
-
-                    Method (EXFG, 0, NotSerialized)
-                    {
-                        Store (0xAA, INDX)
-                        Release (MUT0)
-                    }
-
-                    Method (LPTM, 1, NotSerialized)
-                    {
-                        ENFG (CGLD (Arg0))
-                        And (OPT0, 0x02, Local0)
-                        EXFG ()
-                        Return (Local0)
-                    }
-
-                    Method (UHID, 1, NotSerialized)
-                    {
-                        ENFG (CGLD (Arg0))
-                        And (OPT0, 0x38, Local0)
-                        EXFG ()
-                        If (Local0)
-                        {
-                            Return (0x1005D041)
-                        }
-                        Else
-                        {
-                            Return (0x0105D041)
-                        }
-                    }
-
-                    OperationRegion (IOID, SystemIO, SP1O, 0x02)
-                    Field (IOID, ByteAcc, NoLock, Preserve)
-                    {
-                        INDX,   8, 
-                        DATA,   8
-                    }
-
-                    IndexField (INDX, DATA, ByteAcc, NoLock, Preserve)
-                    {
-                                Offset (0x07), 
-                        LDN,    8, 
-                                Offset (0x21), 
-                        SCF1,   8, 
-                        SCF2,   8, 
-                        SCF3,   8, 
-                        SCF4,   8, 
-                        SCF5,   8, 
-                        SCF6,   8, 
-                                Offset (0x29), 
-                        CKCF,   8, 
-                                Offset (0x30), 
-                        ACTR,   8, 
-                                Offset (0x60), 
-                        IOAH,   8, 
-                        IOAL,   8, 
-                        IOH2,   8, 
-                        IOL2,   8, 
-                                Offset (0x70), 
-                        INTR,   8, 
-                                Offset (0x74), 
-                        DMCH,   8, 
-                                Offset (0xE0), 
-                        RGE0,   8, 
-                        RGE1,   8, 
-                        RGE2,   8, 
-                        RGE3,   8, 
-                        RGE4,   8, 
-                        RGE5,   8, 
-                        RGE6,   8, 
-                        RGE7,   8, 
-                        RGE8,   8, 
-                        RGE9,   8, 
-                                Offset (0xF0), 
-                        OPT0,   8, 
-                        OPT1,   8, 
-                        OPT2,   8, 
-                        OPT3,   8, 
-                        OPT4,   8, 
-                        OPT5,   8, 
-                        OPT6,   8, 
-                        OPT7,   8, 
-                        OPT8,   8, 
-                        OPT9,   8
-                    }
-
-                    Method (CGLD, 1, NotSerialized)
-                    {
-                        Return (DerefOf (Index (DCAT, Arg0)))
-                    }
-
-                    Method (DSTA, 1, NotSerialized)
-                    {
-                        ENFG (CGLD (Arg0))
-                        Store (ACTR, Local0)
-                        EXFG ()
-                        If (LEqual (Local0, 0xFF))
-                        {
-                            Return (Zero)
-                        }
-
-                        And (Local0, One, Local0)
-                        If (LGreaterEqual (Arg0, 0x10))
-                        {
-                            Or (IOES, ShiftLeft (Local0, And (Arg0, 0x0F)), IOES)
-                        }
-                        Else
-                        {
-                            Or (IOST, ShiftLeft (Local0, Arg0), IOST)
-                        }
-
-                        If (Local0)
-                        {
-                            Return (0x0F)
-                        }
-                        Else
-                        {
-                            If (LGreaterEqual (Arg0, 0x10))
-                            {
-                                Store (IOES, Local0)
-                            }
-                            Else
-                            {
-                                Store (IOST, Local0)
-                            }
-
-                            And (Arg0, 0x0F, Local1)
-                            If (And (ShiftLeft (One, Local1), Local0))
-                            {
-                                Return (0x0D)
-                            }
-                            Else
-                            {
-                                Return (Zero)
-                            }
-                        }
-                    }
-
-                    Method (DCNT, 2, NotSerialized)
-                    {
-                        ENFG (CGLD (Arg0))
-                        If (LAnd (LLess (DMCH, 0x04), LNotEqual (And (DMCH, 0x03, 
-                            Local1), Zero)))
-                        {
-                            RDMA (Arg0, Arg1, Increment (Local1))
-                        }
-
-                        Store (Arg1, ACTR)
-                        ShiftLeft (IOAH, 0x08, Local1)
-                        Or (IOAL, Local1, Local1)
-                        RRIO (Arg0, Arg1, Local1, 0x08)
-                        EXFG ()
-                    }
-
-                    Name (CRS1, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0000,             // Range Minimum
-                            0x0000,             // Range Maximum
-                            0x01,               // Alignment
-                            0x00,               // Length
-                            )
-                        IRQNoFlags ()
-                            {}
-                        DMA (Compatibility, NotBusMaster, Transfer8, )
-                            {}
-                    })
-                    CreateWordField (CRS1, 0x09, IRQM)
-                    CreateByteField (CRS1, 0x0C, DMAM)
-                    CreateWordField (CRS1, 0x02, IO11)
-                    CreateWordField (CRS1, 0x04, IO12)
-                    CreateByteField (CRS1, 0x07, LEN1)
-                    Name (CRS2, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0000,             // Range Minimum
-                            0x0000,             // Range Maximum
-                            0x01,               // Alignment
-                            0x00,               // Length
-                            )
-                        IO (Decode16,
-                            0x0000,             // Range Minimum
-                            0x0000,             // Range Maximum
-                            0x01,               // Alignment
-                            0x00,               // Length
-                            )
-                        IRQNoFlags ()
-                            {}
-                        DMA (Compatibility, NotBusMaster, Transfer8, )
-                            {2}
-                    })
-                    CreateWordField (CRS2, 0x11, IRQE)
-                    CreateByteField (CRS2, 0x14, DMAE)
-                    CreateWordField (CRS2, 0x02, IO21)
-                    CreateWordField (CRS2, 0x04, IO22)
-                    CreateByteField (CRS2, 0x07, LEN2)
-                    CreateWordField (CRS2, 0x0A, IO31)
-                    CreateWordField (CRS2, 0x0C, IO32)
-                    CreateByteField (CRS2, 0x0F, LEN3)
-                    Name (CRS4, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0000,             // Range Minimum
-                            0x0000,             // Range Maximum
-                            0x01,               // Alignment
-                            0x00,               // Length
-                            )
-                        IRQ (Edge, ActiveLow, Shared, )
-                            {}
-                    })
-                    CreateWordField (CRS4, 0x09, IRQL)
-                    CreateWordField (CRS4, 0x02, IOHL)
-                    CreateWordField (CRS4, 0x04, IORL)
-                    CreateByteField (CRS4, 0x06, ALMN)
-                    CreateByteField (CRS4, 0x07, LENG)
-                    Method (DCRS, 2, NotSerialized)
-                    {
-                        ENFG (CGLD (Arg0))
-                        ShiftLeft (IOAH, 0x08, IO11)
-                        Or (IOAL, IO11, IO11)
-                        Store (IO11, IO12)
-                        Store (0x08, LEN1)
-                        If (INTR)
-                        {
-                            ShiftLeft (One, INTR, IRQM)
-                        }
-                        Else
-                        {
-                            Store (Zero, IRQM)
-                        }
-
-                        If (LOr (LGreater (DMCH, 0x03), LEqual (Arg1, Zero)))
-                        {
-                            Store (Zero, DMAM)
-                        }
-                        Else
-                        {
-                            And (DMCH, 0x03, Local1)
-                            ShiftLeft (One, Local1, DMAM)
-                        }
-
-                        EXFG ()
-                        Return (CRS1)
-                    }
-
-                    Method (DCR2, 2, NotSerialized)
-                    {
-                        ENFG (CGLD (Arg0))
-                        ShiftLeft (IOAH, 0x08, IO21)
-                        Or (IOAL, IO21, IO21)
-                        Store (IO21, IO22)
-                        Store (0x08, LEN2)
-                        ShiftLeft (IOH2, 0x08, IO31)
-                        Or (IOL2, IO31, IO31)
-                        Store (IO21, IO32)
-                        Store (0x08, LEN3)
-                        If (INTR)
-                        {
-                            ShiftLeft (One, INTR, IRQE)
-                        }
-                        Else
-                        {
-                            Store (Zero, IRQE)
-                        }
-
-                        If (LOr (LGreater (DMCH, 0x03), LEqual (Arg1, Zero)))
-                        {
-                            Store (Zero, DMAE)
-                        }
-                        Else
-                        {
-                            And (DMCH, 0x03, Local1)
-                            ShiftLeft (One, Local1, DMAE)
-                        }
-
-                        EXFG ()
-                        Return (CRS2)
-                    }
-
-                    Method (DCR4, 2, NotSerialized)
-                    {
-                        ENFG (CGLD (Arg0))
-                        ShiftLeft (IOAH, 0x08, IOHL)
-                        Or (IOAL, IOHL, IOHL)
-                        Store (IOHL, IORL)
-                        Store (0x08, LENG)
-                        If (INTR)
-                        {
-                            And (INTR, 0x0F, INTR)
-                            ShiftLeft (One, INTR, IRQL)
-                        }
-                        Else
-                        {
-                            Store (Zero, IRQL)
-                        }
-
-                        EXFG ()
-                        Return (CRS4)
-                    }
-
-                    Method (DSRS, 2, NotSerialized)
-                    {
-                        If (LEqual (Arg1, 0x02))
-                        {
-                            If (LPTM (CGLD (Arg1)))
-                            {
-                                DSR2 (Arg0, Arg1)
-                            }
-                        }
-                        Else
-                        {
-                            CreateWordField (Arg0, 0x09, IRQM)
-                            CreateByteField (Arg0, 0x0C, DMAM)
-                            CreateWordField (Arg0, 0x02, IO11)
-                            ENFG (CGLD (Arg1))
-                            ShiftLeft (IOAH, 0x08, Local1)
-                            Or (IOAL, Local1, Local1)
-                            RRIO (Arg1, Zero, Local1, 0x08)
-                            RRIO (Arg1, One, IO11, 0x08)
-                            And (IO11, 0xFF, IOAL)
-                            ShiftRight (IO11, 0x08, IOAH)
-                            If (IRQM)
-                            {
-                                FindSetRightBit (IRQM, Local0)
-                                Subtract (Local0, One, INTR)
-                            }
-                            Else
-                            {
-                                Store (Zero, INTR)
-                            }
-
-                            If (DMAM)
-                            {
-                                FindSetRightBit (DMAM, Local0)
-                                Subtract (Local0, One, DMCH)
-                            }
-                            Else
-                            {
-                                Store (0x04, DMCH)
-                            }
-
-                            EXFG ()
-                            DCNT (Arg1, One)
-                            Store (Arg1, Local2)
-                            If (LGreater (Local2, Zero))
-                            {
-                                Subtract (Local2, One, Local2)
-                            }
-                        }
-                    }
-
-                    Method (DSR2, 2, NotSerialized)
-                    {
-                        CreateWordField (Arg0, 0x11, IRQT)
-                        CreateByteField (Arg0, 0x14, DMAT)
-                        CreateWordField (Arg0, 0x02, IOT1)
-                        CreateWordField (Arg0, 0x0A, IOT2)
-                        ENFG (CGLD (Arg1))
-                        And (IOT1, 0xFF, IOAL)
-                        ShiftRight (IOT1, 0x08, IOAH)
-                        And (IOT2, 0xFF, IOL2)
-                        ShiftRight (IOT2, 0x08, IOH2)
-                        If (IRQT)
-                        {
-                            FindSetRightBit (IRQT, Local0)
-                            Subtract (Local0, One, INTR)
-                        }
-                        Else
-                        {
-                            Store (Zero, INTR)
-                        }
-
-                        If (DMAT)
-                        {
-                            FindSetRightBit (DMAT, Local0)
-                            Subtract (Local0, One, DMCH)
-                        }
-                        Else
-                        {
-                            Store (0x04, DMCH)
-                        }
-
-                        EXFG ()
-                        DCNT (Arg1, One)
-                        Store (Arg1, Local2)
-                        If (LGreater (Local2, Zero))
-                        {
-                            Subtract (Local2, One, Local2)
-                        }
-                    }
-
-                    Method (DSR4, 2, NotSerialized)
-                    {
-                        CreateWordField (Arg0, 0x02, IOHL)
-                        CreateWordField (Arg0, 0x09, IRQL)
-                        ENFG (CGLD (Arg1))
-                        And (IOHL, 0xFF, IOAL)
-                        ShiftRight (IOHL, 0x08, IOAH)
-                        If (IRQL)
-                        {
-                            FindSetRightBit (IRQL, Local0)
-                            Subtract (Local0, One, INTR)
-                        }
-                        Else
-                        {
-                            Store (Zero, INTR)
-                        }
-
-                        EXFG ()
-                        DCNT (Arg1, One)
-                        Store (Arg1, Local2)
-                        If (LGreater (Local2, Zero))
-                        {
-                            Subtract (Local2, One, Local2)
-                        }
-                    }
-                }
-
-                Name (PMFG, Zero)
-                Method (SIOS, 1, NotSerialized)
-                {
-                    Store ("SIOS", Debug)
-                    If (LEqual (One, Arg0))
-                    {
-                        ^SIO1.ENFG (0x0A)
-                        And (^SIO1.RGE0, 0x9F, ^SIO1.RGE0)
-                        If (KBFG)
-                        {
-                            Or (^SIO1.OPT6, 0x10, ^SIO1.OPT6)
-                        }
-                        Else
-                        {
-                            And (^SIO1.OPT6, 0xEF, ^SIO1.OPT6)
-                        }
-
-                        If (MSFG)
-                        {
-                            Or (^SIO1.OPT6, 0x20, ^SIO1.OPT6)
-                        }
-                        Else
-                        {
-                            And (^SIO1.OPT6, 0xDF, ^SIO1.OPT6)
-                        }
-
-                        Store (0xFF, ^SIO1.OPT3)
-                        Store (0xFF, ^SIO1.OPT4)
-                        Or (One, ^SIO1.OPT2, ^SIO1.OPT2)
-                        ^SIO1.EXFG ()
-                        Return (Zero)
-                    }
-
-                    If (LNotEqual (0x05, Arg0))
-                    {
-                        ^SIO1.ENFG (0x0A)
-                        Store (0xFF, ^SIO1.OPT3)
-                        Store (0xFF, ^SIO1.OPT4)
-                        Store (^SIO1.RGE3, Local0)
-                        If (KBFG)
-                        {
-                            Or (^SIO1.RGE0, 0x41, ^SIO1.RGE0)
-                        }
-                        Else
-                        {
-                            And (^SIO1.RGE0, 0xBF, ^SIO1.RGE0)
-                        }
-
-                        If (MSFG)
-                        {
-                            Or (^SIO1.RGE0, 0x22, ^SIO1.RGE0)
-                            And (^SIO1.RGE0, 0xFD, ^SIO1.RGE0)
-                            Or (^SIO1.RGE6, 0x80, ^SIO1.RGE6)
-                        }
-                        Else
-                        {
-                            And (^SIO1.RGE0, 0xDF, ^SIO1.RGE0)
-                        }
-
-                        And (0xFE, ^SIO1.OPT2, ^SIO1.OPT2)
-                        ^SIO1.EXFG ()
-                    }
-                }
-
-                Method (SIOW, 1, NotSerialized)
-                {
-                    Store ("SIOW", Debug)
-                    ^SIO1.ENFG (0x0A)
-                    Store (^SIO1.OPT3, PMFG)
-                    Store (0xFF, ^SIO1.OPT3)
-                    And (^SIO1.OPT0, 0xE7, ^SIO1.OPT0)
-                    And (0xFE, ^SIO1.OPT2, ^SIO1.OPT2)
-                    ^SIO1.EXFG ()
-                }
-
-                OperationRegion (RX80, PCI_Config, Zero, 0xFF)
-                Field (RX80, ByteAcc, NoLock, Preserve)
-                {
-                            Offset (0x80), 
-                    LPCD,   16, 
-                    LPCE,   16
-                }
-
-                Name (DBPT, Package (0x04)
-                {
-                    Package (0x08)
-                    {
-                        0x03F8, 
-                        0x02F8, 
-                        0x0220, 
-                        0x0228, 
-                        0x0238, 
-                        0x02E8, 
-                        0x0338, 
-                        0x03E8
-                    }, 
-
-                    Package (0x08)
-                    {
-                        0x03F8, 
-                        0x02F8, 
-                        0x0220, 
-                        0x0228, 
-                        0x0238, 
-                        0x02E8, 
-                        0x0338, 
-                        0x03E8
-                    }, 
-
-                    Package (0x03)
-                    {
-                        0x0378, 
-                        0x0278, 
-                        0x03BC
-                    }, 
-
-                    Package (0x02)
-                    {
-                        0x03F0, 
-                        0x0370
-                    }
-                })
-                Name (DDLT, Package (0x04)
-                {
-                    Package (0x02)
-                    {
-                        Zero, 
-                        0xFFF8
-                    }, 
-
-                    Package (0x02)
-                    {
-                        0x04, 
-                        0xFF8F
-                    }, 
-
-                    Package (0x02)
-                    {
-                        0x08, 
-                        0xFCFF
-                    }, 
-
-                    Package (0x02)
-                    {
-                        0x0C, 
-                        0xEFFF
-                    }
-                })
-                Method (RRIO, 4, NotSerialized)
-                {
-                    If (LAnd (LLessEqual (Arg0, 0x03), LGreaterEqual (Arg0, Zero)))
-                    {
-                        Store (Match (DerefOf (Index (DBPT, Arg0)), MEQ, Arg2, MTR, 
-                            Zero, Zero), Local0)
-                        If (LNotEqual (Local0, Ones))
-                        {
-                            Store (DerefOf (Index (DerefOf (Index (DDLT, Arg0)), Zero)), 
-                                Local1)
-                            Store (DerefOf (Index (DerefOf (Index (DDLT, Arg0)), One)), 
-                                Local2)
-                            ShiftLeft (Local0, Local1, Local0)
-                            And (LPCD, Local2, LPCD)
-                            Or (LPCD, Local0, LPCD)
-                            WX82 (Arg0, Arg1)
-                        }
-                    }
-
-                    If (LEqual (Arg0, 0x08))
-                    {
-                        If (LEqual (Arg2, 0x0200))
-                        {
-                            WX82 (0x08, Arg0)
-                        }
-                        Else
-                        {
-                            If (LEqual (Arg2, 0x0208))
-                            {
-                                WX82 (0x09, Arg0)
-                            }
-                        }
-                    }
-
-                    If (LAnd (LLessEqual (Arg0, 0x0D), LGreaterEqual (Arg0, 0x0A)))
-                    {
-                        WX82 (Arg0, Arg1)
-                    }
-                }
-
-                Method (WX82, 2, NotSerialized)
-                {
-                    ShiftLeft (One, Arg0, Local0)
-                    If (Arg1)
-                    {
-                        Or (LPCE, Local0, LPCE)
-                    }
-                    Else
-                    {
-                        Not (Local0, Local0)
-                        And (LPCE, Local0, LPCE)
-                    }
-                }
-
-                Method (RDMA, 3, NotSerialized)
-                {
-                }
-
-                Device (RMSC)
-                {
-                    Name (_HID, EisaId ("PNP0C02"))
-                    Name (_UID, 0x10)
-                    Name (CRS1, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0010,             // Range Minimum
-                            0x0010,             // Range Maximum
-                            0x00,               // Alignment
-                            0x10,               // Length
-                            )
-                        IO (Decode16,
-                            0x0022,             // Range Minimum
-                            0x0022,             // Range Maximum
-                            0x00,               // Alignment
-                            0x1E,               // Length
-                            )
-                        IO (Decode16,
-                            0x0044,             // Range Minimum
-                            0x0044,             // Range Maximum
-                            0x00,               // Alignment
-                            0x1C,               // Length
-                            )
-                        IO (Decode16,
-                            0x0062,             // Range Minimum
-                            0x0062,             // Range Maximum
-                            0x00,               // Alignment
-                            0x02,               // Length
-                            )
-                        IO (Decode16,
-                            0x0065,             // Range Minimum
-                            0x0065,             // Range Maximum
-                            0x00,               // Alignment
-                            0x0B,               // Length
-                            )
-                        IO (Decode16,
-                            0x0072,             // Range Minimum
-                            0x0072,             // Range Maximum
-                            0x00,               // Alignment
-                            0x0E,               // Length
-                            )
-                        IO (Decode16,
-                            0x0080,             // Range Minimum
-                            0x0080,             // Range Maximum
-                            0x00,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0084,             // Range Minimum
-                            0x0084,             // Range Maximum
-                            0x00,               // Alignment
-                            0x03,               // Length
-                            )
-                        IO (Decode16,
-                            0x0088,             // Range Minimum
-                            0x0088,             // Range Maximum
-                            0x00,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x008C,             // Range Minimum
-                            0x008C,             // Range Maximum
-                            0x00,               // Alignment
-                            0x03,               // Length
-                            )
-                        IO (Decode16,
-                            0x0090,             // Range Minimum
-                            0x0090,             // Range Maximum
-                            0x00,               // Alignment
-                            0x10,               // Length
-                            )
-                        IO (Decode16,
-                            0x00A2,             // Range Minimum
-                            0x00A2,             // Range Maximum
-                            0x00,               // Alignment
-                            0x1E,               // Length
-                            )
-                        IO (Decode16,
-                            0x00E0,             // Range Minimum
-                            0x00E0,             // Range Maximum
-                            0x00,               // Alignment
-                            0x10,               // Length
-                            )
-                        IO (Decode16,
-                            0x04D0,             // Range Minimum
-                            0x04D0,             // Range Maximum
-                            0x00,               // Alignment
-                            0x02,               // Length
-                            )
-                    })
-                    Name (CRS2, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0010,             // Range Minimum
-                            0x0010,             // Range Maximum
-                            0x00,               // Alignment
-                            0x10,               // Length
-                            )
-                        IO (Decode16,
-                            0x0022,             // Range Minimum
-                            0x0022,             // Range Maximum
-                            0x00,               // Alignment
-                            0x1E,               // Length
-                            )
-                        IO (Decode16,
-                            0x0044,             // Range Minimum
-                            0x0044,             // Range Maximum
-                            0x00,               // Alignment
-                            0x1C,               // Length
-                            )
-                        IO (Decode16,
-                            0x0072,             // Range Minimum
-                            0x0072,             // Range Maximum
-                            0x00,               // Alignment
-                            0x0E,               // Length
-                            )
-                        IO (Decode16,
-                            0x0080,             // Range Minimum
-                            0x0080,             // Range Maximum
-                            0x00,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0084,             // Range Minimum
-                            0x0084,             // Range Maximum
-                            0x00,               // Alignment
-                            0x03,               // Length
-                            )
-                        IO (Decode16,
-                            0x0088,             // Range Minimum
-                            0x0088,             // Range Maximum
-                            0x00,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x008C,             // Range Minimum
-                            0x008C,             // Range Maximum
-                            0x00,               // Alignment
-                            0x03,               // Length
-                            )
-                        IO (Decode16,
-                            0x0090,             // Range Minimum
-                            0x0090,             // Range Maximum
-                            0x00,               // Alignment
-                            0x10,               // Length
-                            )
-                        IO (Decode16,
-                            0x00A2,             // Range Minimum
-                            0x00A2,             // Range Maximum
-                            0x00,               // Alignment
-                            0x1E,               // Length
-                            )
-                        IO (Decode16,
-                            0x00E0,             // Range Minimum
-                            0x00E0,             // Range Maximum
-                            0x00,               // Alignment
-                            0x10,               // Length
-                            )
-                        IO (Decode16,
-                            0x04D0,             // Range Minimum
-                            0x04D0,             // Range Maximum
-                            0x00,               // Alignment
-                            0x02,               // Length
-                            )
-                    })
-                    Method (_CRS, 0, NotSerialized)
-                    {
-                        If (And (MBEC, 0xFFFF))
-                        {
-                            Return (CRS1)
-                        }
-                        Else
-                        {
-                            Return (CRS2)
-                        }
-                    }
-                }
-
-                Device (COPR)
-                {
-                    Name (_HID, EisaId ("PNP0C04"))
-                    Name (_CRS, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x00F0,             // Range Minimum
-                            0x00F0,             // Range Maximum
-                            0x00,               // Alignment
-                            0x10,               // Length
-                            )
-                        IRQNoFlags ()
-                            {13}
-                    })
-                }
-
-                Device (PS2K)
-                {
-                    Name (_HID, EisaId ("PNP0303"))
-                    Name (_CID, EisaId ("PNP030B"))
-                    Method (_STA, 0, NotSerialized)
-                    {
-                        If (And (IOST, 0x0400))
-                        {
-                            Return (0x0F)
-                        }
-                        Else
-                        {
-                            Return (Zero)
-                        }
-                    }
-
-                    Name (_CRS, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0060,             // Range Minimum
-                            0x0060,             // Range Maximum
-                            0x00,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0064,             // Range Minimum
-                            0x0064,             // Range Maximum
-                            0x00,               // Alignment
-                            0x01,               // Length
-                            )
-                        IRQNoFlags ()
-                            {1}
-                    })
-                    Name (_PRS, ResourceTemplate ()
-                    {
-                        StartDependentFn (0x00, 0x00)
-                        {
-                            FixedIO (
-                                0x0060,             // Address
-                                0x01,               // Length
-                                )
-                            FixedIO (
-                                0x0064,             // Address
-                                0x01,               // Length
-                                )
-                            IRQNoFlags ()
-                                {1}
-                        }
-                        EndDependentFn ()
-                    })
-                    Method (_PSW, 1, NotSerialized)
-                    {
-                        Store (Arg0, KBFG)
-                    }
-                }
-
-                Scope (\)
-                {
-                    Name (KBFG, One)
-                }
-
-                Method (PS2K._PRW, 0, NotSerialized)
-                {
-                    Return (GPRW (0x1D, 0x04))
-                }
-
-                Device (PS2M)
-                {
-                    Name (_HID, EisaId ("PNP0F03"))
-                    Name (_CID, EisaId ("PNP0F13"))
-                    Method (_STA, 0, NotSerialized)
-                    {
-                        If (And (IOST, 0x4000))
-                        {
-                            Return (0x0F)
-                        }
-                        Else
-                        {
-                            Return (Zero)
-                        }
-                    }
-
-                    Name (CRS1, ResourceTemplate ()
-                    {
-                        IRQNoFlags ()
-                            {12}
-                    })
-                    Name (CRS2, ResourceTemplate ()
-                    {
-                        IO (Decode16,
-                            0x0060,             // Range Minimum
-                            0x0060,             // Range Maximum
-                            0x00,               // Alignment
-                            0x01,               // Length
-                            )
-                        IO (Decode16,
-                            0x0064,             // Range Minimum
-                            0x0064,             // Range Maximum
-                            0x00,               // Alignment
-                            0x01,               // Length
-                            )
-                        IRQNoFlags ()
-                            {12}
-                    })
-                    Method (_CRS, 0, NotSerialized)
-                    {
-                        If (And (IOST, 0x0400))
-                        {
-                            Return (CRS1)
-                        }
-                        Else
-                        {
-                            Return (CRS2)
-                        }
-                    }
-
-                    Name (_PRS, ResourceTemplate ()
-                    {
-                        StartDependentFn (0x00, 0x00)
-                        {
-                            IRQNoFlags ()
-                                {12}
-                        }
-                        EndDependentFn ()
-                    })
-                    Method (_PSW, 1, NotSerialized)
-                    {
-                        Store (Arg0, MSFG)
-                    }
-                }
-
-                Scope (\)
-                {
-                    Name (MSFG, One)
-                }
-
-                Method (PS2M._PRW, 0, NotSerialized)
-                {
-                    Return (GPRW (0x1D, 0x04))
-                }
-
-                Scope (^^PCI0)
-                {
-                    Name (SLIC, Buffer (0x9E)
-                    {
-                        "374937846529Genuine NVIDIA Certified SLI Ready Motherboard for ASUS P8Z68-V PRO    56e7-Copyright 2010 NVIDIA Corporation All Rights Reserved-458103946203(R)"
-                    })
-                    Device (WMI1)
-                    {
-                        Name (_HID, "pnp0c14")
-                        Name (_UID, "MXM2")
-                        Name (_WDG, Buffer (0x14)
-                        {
-                            /* 0000 */    0x3C, 0x5C, 0xCB, 0xF6, 0xAE, 0x9C, 0xBD, 0x4E, 
-                            /* 0008 */    0xB5, 0x77, 0x93, 0x1E, 0xA3, 0x2A, 0x2C, 0xC0, 
-                            /* 0010 */    0x4D, 0x58, 0x01, 0x02
-                        })
-                        Method (WMMX, 3, NotSerialized)
-                        {
-                            CreateDWordField (Arg2, Zero, FUNC)
-                            If (LEqual (FUNC, 0x41494C53))
-                            {
-                                Return (SLIC)
-                            }
-
-                            Return (Zero)
-                        }
-                    }
-                }
-
-                Scope (\_SB)
-                {
-                    Name (LUCD, Buffer (0x7D)
-                    {
-                        /* 0000 */    0x4C, 0x75, 0x63, 0x69, 0x64, 0x4C, 0x6F, 0x67, 
-                        /* 0008 */    0x69, 0x78, 0x00, 0x68, 0x00, 0x01, 0x00, 0x01, 
-                        /* 0010 */    0x00, 0x00, 0x00, 0x1A, 0x8D, 0x65, 0x61, 0x30, 
-                        /* 0018 */    0x62, 0x64, 0x64, 0x30, 0x63, 0x34, 0x30, 0x66, 
-                        /* 0020 */    0x35, 0x32, 0x33, 0x36, 0x66, 0x66, 0x65, 0x65, 
-                        /* 0028 */    0x31, 0x30, 0x66, 0x63, 0x35, 0x37, 0x32, 0x34, 
-                        /* 0030 */    0x65, 0x38, 0x31, 0x36, 0x36, 0x37, 0x38, 0x65, 
-                        /* 0038 */    0x64, 0x35, 0x39, 0x34, 0x65, 0x64, 0x65, 0x65, 
-                        /* 0040 */    0x65, 0x37, 0x61, 0x35, 0x32, 0x38, 0x64, 0x32, 
-                        /* 0048 */    0x64, 0x31, 0x65, 0x36, 0x36, 0x32, 0x37, 0x61, 
-                        /* 0050 */    0x65, 0x65, 0x64, 0x32, 0x63, 0x30, 0x30, 0x30, 
-                        /* 0058 */    0x30, 0x32, 0x35, 0x36, 0x39, 0x63, 0x65, 0x64, 
-                        /* 0060 */    0x31, 0x36, 0x35, 0x31, 0x36, 0x33, 0x65, 0x35, 
-                        /* 0068 */    0x31, 0x65, 0x30, 0x36, 0x65, 0x30, 0x31, 0x64, 
-                        /* 0070 */    0x63, 0x34, 0x34, 0x63, 0x33, 0x35, 0x66, 0x65, 
-                        /* 0078 */    0x61, 0x33, 0x65, 0x61, 0x66
-                    })
-                }
-            }
-
-            Device (P0P1)
-            {
-                Name (_ADR, 0x001E0000)
-                Method (_PRW, 0, NotSerialized)
-                {
-                    Return (GPRW (0x0B, 0x04))
-                }
-
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR01 ())
-                    }
-
-                    Return (PR01 ())
-                }
-            }
-
-            Device (USB1)
-            {
-                Name (_ADR, 0x001D0001)
-            }
-
-            Device (USB2)
-            {
-                Name (_ADR, 0x001D0002)
-            }
-
-            Device (USB3)
-            {
-                Name (_ADR, 0x001D0003)
-            }
-
-            Device (USB4)
-            {
-                Name (_ADR, 0x001D0004)
-            }
-
-            Device (USB5)
-            {
-                Name (_ADR, 0x001A0001)
-            }
-
-            Device (USB6)
-            {
-                Name (_ADR, 0x001A0002)
-            }
-
-            Device (USB7)
-            {
-                Name (_ADR, 0x001A0003)
-            }
-
-            Device (RP01)
-            {
-                Name (_ADR, 0x001C0000)
-                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
-                Field (PXCS, AnyAcc, NoLock, Preserve)
-                {
-                            Offset (0x10), 
-                    L0SE,   1, 
-                            Offset (0x11), 
-                            Offset (0x12), 
-                        ,   13, 
-                    LASX,   1, 
-                            Offset (0x1A), 
-                    ABPX,   1, 
-                        ,   2, 
-                    PDCX,   1, 
-                        ,   2, 
-                    PDSX,   1, 
-                            Offset (0x1B), 
-                            Offset (0x20), 
-                            Offset (0x22), 
-                    PSPX,   1, 
-                            Offset (0x98), 
-                        ,   30, 
-                    HPEX,   1, 
-                    PMEX,   1
-                }
-
-                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
-                {
-                            Offset (0x9C), 
-                        ,   30, 
-                    HPSX,   1, 
-                    PMSX,   1
-                }
-
-                Device (PXSX)
-                {
-                    Name (_ADR, Zero)
-                    Name (_PRW, Package (0x02)
-                    {
-                        0x09, 
-                        0x04
-                    })
-                }
-
-                Method (HPME, 0, Serialized)
-                {
-                    If (PMSX)
-                    {
-                        Store (0xC8, Local0)
-                        While (Local0)
-                        {
-                            Store (One, PMSX)
-                            If (PMSX)
-                            {
-                                Decrement (Local0)
-                            }
-                            Else
-                            {
-                                Store (Zero, Local0)
-                            }
-                        }
-
-                        Notify (PXSX, 0x02)
-                    }
-                }
-
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR04 ())
-                    }
-
-                    Return (PR04 ())
-                }
-            }
-
-            Device (RP02)
-            {
-                Name (_ADR, 0x001C0001)
-                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
-                Field (PXCS, AnyAcc, NoLock, Preserve)
-                {
-                            Offset (0x10), 
-                    L0SE,   1, 
-                            Offset (0x11), 
-                            Offset (0x12), 
-                        ,   13, 
-                    LASX,   1, 
-                            Offset (0x1A), 
-                    ABPX,   1, 
-                        ,   2, 
-                    PDCX,   1, 
-                        ,   2, 
-                    PDSX,   1, 
-                            Offset (0x1B), 
-                            Offset (0x20), 
-                            Offset (0x22), 
-                    PSPX,   1, 
-                            Offset (0x98), 
-                        ,   30, 
-                    HPEX,   1, 
-                    PMEX,   1
-                }
-
-                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
-                {
-                            Offset (0x9C), 
-                        ,   30, 
-                    HPSX,   1, 
-                    PMSX,   1
-                }
-
-                Device (PXSX)
-                {
-                    Name (_ADR, Zero)
-                    Name (_PRW, Package (0x02)
-                    {
-                        0x09, 
-                        0x04
-                    })
-                }
-
-                Method (HPME, 0, Serialized)
-                {
-                    If (PMSX)
-                    {
-                        Store (0xC8, Local0)
-                        While (Local0)
-                        {
-                            Store (One, PMSX)
-                            If (PMSX)
-                            {
-                                Decrement (Local0)
-                            }
-                            Else
-                            {
-                                Store (Zero, Local0)
-                            }
-                        }
-
-                        Notify (PXSX, 0x02)
-                    }
-                }
-
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR05 ())
-                    }
-
-                    Return (PR05 ())
-                }
-            }
-
-            Device (RP03)
-            {
-                Name (_ADR, 0x001C0002)
-                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
-                Field (PXCS, AnyAcc, NoLock, Preserve)
-                {
-                            Offset (0x10), 
-                    L0SE,   1, 
-                            Offset (0x11), 
-                            Offset (0x12), 
-                        ,   13, 
-                    LASX,   1, 
-                            Offset (0x1A), 
-                    ABPX,   1, 
-                        ,   2, 
-                    PDCX,   1, 
-                        ,   2, 
-                    PDSX,   1, 
-                            Offset (0x1B), 
-                            Offset (0x20), 
-                            Offset (0x22), 
-                    PSPX,   1, 
-                            Offset (0x98), 
-                        ,   30, 
-                    HPEX,   1, 
-                    PMEX,   1
-                }
-
-                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
-                {
-                            Offset (0x9C), 
-                        ,   30, 
-                    HPSX,   1, 
-                    PMSX,   1
-                }
-
-                Device (PXSX)
-                {
-                    Name (_ADR, Zero)
-                    Name (_PRW, Package (0x02)
-                    {
-                        0x09, 
-                        0x04
-                    })
-                }
-
-                Method (HPME, 0, Serialized)
-                {
-                    If (PMSX)
-                    {
-                        Store (0xC8, Local0)
-                        While (Local0)
-                        {
-                            Store (One, PMSX)
-                            If (PMSX)
-                            {
-                                Decrement (Local0)
-                            }
-                            Else
-                            {
-                                Store (Zero, Local0)
-                            }
-                        }
-
-                        Notify (PXSX, 0x02)
-                    }
-                }
-
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR06 ())
-                    }
-
-                    Return (PR06 ())
-                }
-            }
-
-            Device (RP04)
-            {
-                Name (_ADR, 0x001C0003)
-                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
-                Field (PXCS, AnyAcc, NoLock, Preserve)
-                {
-                            Offset (0x10), 
-                    L0SE,   1, 
-                            Offset (0x11), 
-                            Offset (0x12), 
-                        ,   13, 
-                    LASX,   1, 
-                            Offset (0x1A), 
-                    ABPX,   1, 
-                        ,   2, 
-                    PDCX,   1, 
-                        ,   2, 
-                    PDSX,   1, 
-                            Offset (0x1B), 
-                            Offset (0x20), 
-                            Offset (0x22), 
-                    PSPX,   1, 
-                            Offset (0x98), 
-                        ,   30, 
-                    HPEX,   1, 
-                    PMEX,   1
-                }
-
-                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
-                {
-                            Offset (0x9C), 
-                        ,   30, 
-                    HPSX,   1, 
-                    PMSX,   1
-                }
-
-                Device (PXSX)
-                {
-                    Name (_ADR, Zero)
-                    Name (_PRW, Package (0x02)
-                    {
-                        0x09, 
-                        0x04
-                    })
-                }
-
-                Method (HPME, 0, Serialized)
-                {
-                    If (PMSX)
-                    {
-                        Store (0xC8, Local0)
-                        While (Local0)
-                        {
-                            Store (One, PMSX)
-                            If (PMSX)
-                            {
-                                Decrement (Local0)
-                            }
-                            Else
-                            {
-                                Store (Zero, Local0)
-                            }
-                        }
-
-                        Notify (PXSX, 0x02)
-                    }
-                }
-
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR07 ())
-                    }
-
-                    Return (PR07 ())
-                }
-
-                Device (JMB0)
-                {
-                    Name (_ADR, Zero)
-                    OperationRegion (CF40, PCI_Config, 0x40, 0x04)
-                    Field (CF40, ByteAcc, NoLock, Preserve)
-                    {
-                        CHE0,   1, 
-                        MULT,   1, 
-                            ,   1, 
-                        CAB0,   1, 
-                        CHE1,   1, 
-                                Offset (0x01), 
-                        AHEN,   1, 
-                            ,   3, 
-                        PRT0,   1, 
-                        AHM0,   1, 
-                        PRT1,   1, 
-                        AHM1,   1, 
-                        CF42,   6, 
-                        SWAP,   1, 
-                        PATA,   1, 
-                            ,   6, 
-                        WTEN,   1, 
-                                Offset (0x04)
-                    }
-
-                    Name (PIOT, Package (0x05)
-                    {
-                        0x0258, 
-                        0x0186, 
-                        0x014A, 
-                        0xB4, 
-                        0x78
-                    })
-                    Name (UDMA, Package (0x07)
-                    {
-                        0x78, 
-                        0x50, 
-                        0x3C, 
-                        0x28, 
-                        0x1E, 
-                        0x14, 
-                        0x0F
-                    })
-                    Name (MDMA, Package (0x03)
-                    {
-                        0x01E0, 
-                        0x96, 
-                        0x78
-                    })
-                    Name (IDEB, Buffer (0x14) {})
-                    CreateDWordField (IDEB, Zero, GTM0)
-                    CreateDWordField (IDEB, 0x04, GTM1)
-                    CreateDWordField (IDEB, 0x08, GTM2)
-                    CreateDWordField (IDEB, 0x0C, GTM3)
-                    CreateDWordField (IDEB, 0x10, GTM4)
-                    Name (PIO0, 0x04)
-                    Name (DMA0, 0x06)
-                    Name (MDA0, 0x02)
-                    Name (PIO1, 0x04)
-                    Name (DMA1, 0x06)
-                    Name (MDA1, 0x02)
-                    Name (PIO2, 0x04)
-                    Name (DMA2, 0x06)
-                    Name (MDA2, 0x02)
-                    Name (PIO3, 0x04)
-                    Name (DMA3, 0x06)
-                    Name (MDA3, 0x02)
-                    Name (FLGP, 0x1F)
-                    Name (FLGS, 0x1F)
-                    Device (IDE0)
-                    {
-                        Name (_ADR, Zero)
-                        Method (_GTM, 0, NotSerialized)
-                        {
-                            Store (DerefOf (Index (PIOT, PIO0)), Local0)
-                            Store (DerefOf (Index (PIOT, PIO1)), Local2)
-                            Store (0x1A, Local4)
-                            If (LAnd (FLGP, One))
-                            {
-                                If (LNot (MULT))
-                                {
-                                    If (LAnd (CAB0, SWAP))
-                                    {
-                                        Store (0x02, DMA0)
-                                    }
-                                }
-
-                                Store (DerefOf (Index (UDMA, DMA0)), Local1)
-                                Or (Local4, One, Local4)
-                            }
-                            Else
-                            {
-                                Store (DerefOf (Index (MDMA, MDA0)), Local1)
-                            }
-
-                            If (LAnd (FLGP, 0x04))
-                            {
-                                If (LAnd (CAB0, SWAP))
-                                {
-                                    Store (0x02, DMA1)
-                                }
-
-                                Store (DerefOf (Index (UDMA, DMA1)), Local3)
-                                Or (Local4, 0x04, Local4)
-                            }
-                            Else
-                            {
-                                Store (DerefOf (Index (MDMA, MDA1)), Local3)
-                            }
-
-                            Store (Local0, GTM0)
-                            Store (Local1, GTM1)
-                            Store (Local2, GTM2)
-                            Store (Local3, GTM3)
-                            Store (Local4, GTM4)
-                            Return (IDEB)
-                        }
-
-                        Method (_STM, 3, NotSerialized)
-                        {
-                            Store (Arg0, IDEB)
-                            Store (GTM0, Local0)
-                            Store (GTM1, Local1)
-                            Store (GTM2, Local2)
-                            Store (GTM3, Local3)
-                            Store (GTM4, Local4)
-                            Store (Local4, FLGP)
-                            If (LAnd (LNotEqual (Local0, 0xFFFFFFFF), LNotEqual (Local0, Zero)))
-                            {
-                                Store (Match (PIOT, MEQ, Local0, MTR, Zero, Zero), PIO0)
-                            }
-
-                            If (LAnd (LNotEqual (Local1, 0xFFFFFFFF), LNotEqual (Local1, Zero)))
-                            {
-                                If (LAnd (FLGP, One))
-                                {
-                                    Store (Match (UDMA, MEQ, Local1, MTR, Zero, Zero), DMA0)
-                                }
-                                Else
-                                {
-                                    Store (Match (MDMA, MEQ, Local1, MTR, Zero, Zero), MDA0)
-                                }
-                            }
-
-                            If (LAnd (LNotEqual (Local2, 0xFFFFFFFF), LNotEqual (Local2, Zero)))
-                            {
-                                Store (Match (PIOT, MEQ, Local2, MTR, Zero, Zero), PIO1)
-                            }
-
-                            If (LAnd (LNotEqual (Local3, 0xFFFFFFFF), LNotEqual (Local3, Zero)))
-                            {
-                                If (LAnd (FLGP, 0x04))
-                                {
-                                    Store (Match (UDMA, MEQ, Local3, MTR, Zero, Zero), DMA1)
-                                }
-                                Else
-                                {
-                                    Store (Match (MDMA, MEQ, Local3, MTR, Zero, Zero), MDA1)
-                                }
-                            }
-                        }
-
-                        Device (DRV0)
-                        {
-                            Name (_ADR, Zero)
-                            Method (_GTF, 0, NotSerialized)
-                            {
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
-                                    }, Local0)
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
-                                    }, Local1)
-                                CreateByteField (Local0, One, PIOM)
-                                CreateByteField (Local1, One, DMAM)
-                                Store (PIO0, PIOM)
-                                Or (PIOM, 0x08, PIOM)
-                                If (LAnd (FLGP, One))
-                                {
-                                    Store (DMA0, DMAM)
-                                    Or (DMAM, 0x40, DMAM)
-                                }
-                                Else
-                                {
-                                    Store (MDA0, DMAM)
-                                    Or (DMAM, 0x20, DMAM)
-                                }
-
-                                Concatenate (Local0, Local1, Local2)
-                                Return (Local2)
-                            }
-                        }
-
-                        Device (DRV1)
-                        {
-                            Name (_ADR, One)
-                            Method (_GTF, 0, NotSerialized)
-                            {
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
-                                    }, Local0)
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
-                                    }, Local1)
-                                CreateByteField (Local0, One, PIOM)
-                                CreateByteField (Local1, One, DMAM)
-                                Store (PIO1, PIOM)
-                                Or (PIOM, 0x08, PIOM)
-                                If (LAnd (FLGP, 0x04))
-                                {
-                                    Store (DMA1, DMAM)
-                                    Or (DMAM, 0x40, DMAM)
-                                }
-                                Else
-                                {
-                                    Store (MDA1, DMAM)
-                                    Or (DMAM, 0x20, DMAM)
-                                }
-
-                                Concatenate (Local0, Local1, Local2)
-                                Return (Local2)
-                            }
-                        }
-                    }
-
-                    Device (IDE1)
-                    {
-                        Name (_ADR, One)
-                        Method (_GTM, 0, NotSerialized)
-                        {
-                            Store (DerefOf (Index (PIOT, PIO2)), Local0)
-                            Store (DerefOf (Index (PIOT, PIO3)), Local2)
-                            Store (0x1A, Local4)
-                            If (LAnd (FLGS, One))
-                            {
-                                If (LNot (MULT))
-                                {
-                                    If (LAnd (CAB0, LNot (SWAP)))
-                                    {
-                                        Store (0x02, DMA2)
-                                    }
-                                }
-
-                                Store (DerefOf (Index (UDMA, DMA2)), Local1)
-                                Or (Local4, One, Local4)
-                            }
-                            Else
-                            {
-                                Store (DerefOf (Index (MDMA, MDA2)), Local1)
-                            }
-
-                            If (LAnd (FLGS, 0x04))
-                            {
-                                If (LAnd (CAB0, LNot (SWAP)))
-                                {
-                                    Store (0x02, DMA3)
-                                }
-
-                                Store (DerefOf (Index (UDMA, DMA3)), Local3)
-                                Or (Local4, 0x04, Local4)
-                            }
-                            Else
-                            {
-                                Store (DerefOf (Index (MDMA, MDA3)), Local3)
-                            }
-
-                            Store (Local0, GTM0)
-                            Store (Local1, GTM1)
-                            Store (Local2, GTM2)
-                            Store (Local3, GTM3)
-                            Store (Local4, GTM4)
-                            Return (IDEB)
-                        }
-
-                        Method (_STM, 3, NotSerialized)
-                        {
-                            Store (Arg0, IDEB)
-                            Store (GTM0, Local0)
-                            Store (GTM1, Local1)
-                            Store (GTM2, Local2)
-                            Store (GTM3, Local3)
-                            Store (GTM4, Local4)
-                            Store (Local4, FLGS)
-                            If (LAnd (LNotEqual (Local0, 0xFFFFFFFF), LNotEqual (Local0, Zero)))
-                            {
-                                Store (Match (PIOT, MEQ, Local0, MTR, Zero, Zero), PIO2)
-                            }
-
-                            If (LAnd (LNotEqual (Local1, 0xFFFFFFFF), LNotEqual (Local1, Zero)))
-                            {
-                                If (LAnd (FLGS, One))
-                                {
-                                    Store (Match (UDMA, MEQ, Local1, MTR, Zero, Zero), DMA2)
-                                }
-                                Else
-                                {
-                                    Store (Match (MDMA, MEQ, Local1, MTR, Zero, Zero), MDA2)
-                                }
-                            }
-
-                            If (LAnd (LNotEqual (Local2, 0xFFFFFFFF), LNotEqual (Local2, Zero)))
-                            {
-                                Store (Match (PIOT, MEQ, Local2, MTR, Zero, Zero), PIO3)
-                            }
-
-                            If (LAnd (LNotEqual (Local3, 0xFFFFFFFF), LNotEqual (Local3, Zero)))
-                            {
-                                If (LAnd (FLGS, 0x04))
-                                {
-                                    Store (Match (UDMA, MEQ, Local3, MTR, Zero, Zero), DMA3)
-                                }
-                                Else
-                                {
-                                    Store (Match (MDMA, MEQ, Local3, MTR, Zero, Zero), MDA3)
-                                }
-                            }
-                        }
-
-                        Device (DRV0)
-                        {
-                            Name (_ADR, Zero)
-                            Method (_GTF, 0, NotSerialized)
-                            {
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
-                                    }, Local0)
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
-                                    }, Local1)
-                                CreateByteField (Local0, One, PIOM)
-                                CreateByteField (Local1, One, DMAM)
-                                Store (PIO2, PIOM)
-                                Or (PIOM, 0x08, PIOM)
-                                If (LAnd (FLGS, One))
-                                {
-                                    Store (DMA2, DMAM)
-                                    Or (DMAM, 0x40, DMAM)
-                                }
-                                Else
-                                {
-                                    Store (MDA2, DMAM)
-                                    Or (DMAM, 0x20, DMAM)
-                                }
-
-                                Concatenate (Local0, Local1, Local2)
-                                Return (Local2)
-                            }
-                        }
-
-                        Device (DRV1)
-                        {
-                            Name (_ADR, One)
-                            Method (_GTF, 0, NotSerialized)
-                            {
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
-                                    }, Local0)
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
-                                    }, Local1)
-                                CreateByteField (Local0, One, PIOM)
-                                CreateByteField (Local1, One, DMAM)
-                                Store (PIO3, PIOM)
-                                Or (PIOM, 0x08, PIOM)
-                                If (LAnd (FLGS, 0x04))
-                                {
-                                    Store (DMA3, DMAM)
-                                    Or (DMAM, 0x40, DMAM)
-                                }
-                                Else
-                                {
-                                    Store (MDA3, DMAM)
-                                    Or (DMAM, 0x20, DMAM)
-                                }
-
-                                Concatenate (Local0, Local1, Local2)
-                                Return (Local2)
-                            }
-                        }
-                    }
-                }
-
-                Device (JMB1)
-                {
-                    Name (_ADR, One)
-                    OperationRegion (CF40, PCI_Config, 0x40, 0x04)
-                    Field (CF40, ByteAcc, NoLock, Preserve)
-                    {
-                        CHE0,   1, 
-                        MULT,   1, 
-                            ,   1, 
-                        CAB0,   1, 
-                        CHE1,   1, 
-                                Offset (0x01), 
-                        AHEN,   1, 
-                            ,   3, 
-                        PRT0,   1, 
-                        AHM0,   1, 
-                        PRT1,   1, 
-                        AHM1,   1, 
-                        CF42,   6, 
-                        SWAP,   1, 
-                        PATA,   1, 
-                            ,   6, 
-                        WTEN,   1, 
-                                Offset (0x04)
-                    }
-
-                    Name (PIOT, Package (0x05)
-                    {
-                        0x0258, 
-                        0x0186, 
-                        0x014A, 
-                        0xB4, 
-                        0x78
-                    })
-                    Name (UDMA, Package (0x07)
-                    {
-                        0x78, 
-                        0x50, 
-                        0x3C, 
-                        0x28, 
-                        0x1E, 
-                        0x14, 
-                        0x0F
-                    })
-                    Name (MDMA, Package (0x03)
-                    {
-                        0x01E0, 
-                        0x96, 
-                        0x78
-                    })
-                    Name (IDEB, Buffer (0x14) {})
-                    CreateDWordField (IDEB, Zero, GTM0)
-                    CreateDWordField (IDEB, 0x04, GTM1)
-                    CreateDWordField (IDEB, 0x08, GTM2)
-                    CreateDWordField (IDEB, 0x0C, GTM3)
-                    CreateDWordField (IDEB, 0x10, GTM4)
-                    Name (PIO0, 0x04)
-                    Name (DMA0, 0x06)
-                    Name (MDA0, 0x02)
-                    Name (PIO1, 0x04)
-                    Name (DMA1, 0x06)
-                    Name (MDA1, 0x02)
-                    Name (PIO2, 0x04)
-                    Name (DMA2, 0x06)
-                    Name (MDA2, 0x02)
-                    Name (PIO3, 0x04)
-                    Name (DMA3, 0x06)
-                    Name (MDA3, 0x02)
-                    Name (FLGP, 0x1F)
-                    Name (FLGS, 0x1F)
-                    Device (IDE0)
-                    {
-                        Name (_ADR, Zero)
-                        Method (_GTM, 0, NotSerialized)
-                        {
-                            Store (DerefOf (Index (PIOT, PIO0)), Local0)
-                            Store (DerefOf (Index (PIOT, PIO1)), Local2)
-                            Store (0x1A, Local4)
-                            If (LAnd (FLGP, One))
-                            {
-                                If (LAnd (CAB0, SWAP))
-                                {
-                                    Store (0x02, DMA0)
-                                }
-
-                                Store (DerefOf (Index (UDMA, DMA0)), Local1)
-                                Or (Local4, One, Local4)
-                            }
-                            Else
-                            {
-                                Store (DerefOf (Index (MDMA, MDA0)), Local1)
-                            }
-
-                            If (LAnd (FLGP, 0x04))
-                            {
-                                If (LAnd (CAB0, SWAP))
-                                {
-                                    Store (0x02, DMA1)
-                                }
-
-                                Store (DerefOf (Index (UDMA, DMA1)), Local3)
-                                Or (Local4, 0x04, Local4)
-                            }
-                            Else
-                            {
-                                Store (DerefOf (Index (MDMA, MDA1)), Local3)
-                            }
-
-                            Store (Local0, GTM0)
-                            Store (Local1, GTM1)
-                            Store (Local2, GTM2)
-                            Store (Local3, GTM3)
-                            Store (Local4, GTM4)
-                            Return (IDEB)
-                        }
-
-                        Method (_STM, 3, NotSerialized)
-                        {
-                            Store (Arg0, IDEB)
-                            Store (GTM0, Local0)
-                            Store (GTM1, Local1)
-                            Store (GTM2, Local2)
-                            Store (GTM3, Local3)
-                            Store (GTM4, Local4)
-                            Store (Local4, FLGP)
-                            If (LAnd (LNotEqual (Local0, 0xFFFFFFFF), LNotEqual (Local0, Zero)))
-                            {
-                                Store (Match (PIOT, MEQ, Local0, MTR, Zero, Zero), PIO0)
-                            }
-
-                            If (LAnd (LNotEqual (Local1, 0xFFFFFFFF), LNotEqual (Local1, Zero)))
-                            {
-                                If (LAnd (FLGP, One))
-                                {
-                                    Store (Match (UDMA, MEQ, Local1, MTR, Zero, Zero), DMA0)
-                                }
-                                Else
-                                {
-                                    Store (Match (MDMA, MEQ, Local1, MTR, Zero, Zero), MDA0)
-                                }
-                            }
-
-                            If (LAnd (LNotEqual (Local2, 0xFFFFFFFF), LNotEqual (Local2, Zero)))
-                            {
-                                Store (Match (PIOT, MEQ, Local2, MTR, Zero, Zero), PIO1)
-                            }
-
-                            If (LAnd (LNotEqual (Local3, 0xFFFFFFFF), LNotEqual (Local3, Zero)))
-                            {
-                                If (LAnd (FLGP, 0x04))
-                                {
-                                    Store (Match (UDMA, MEQ, Local3, MTR, Zero, Zero), DMA1)
-                                }
-                                Else
-                                {
-                                    Store (Match (MDMA, MEQ, Local3, MTR, Zero, Zero), MDA1)
-                                }
-                            }
-                        }
-
-                        Device (DRV0)
-                        {
-                            Name (_ADR, Zero)
-                            Method (_GTF, 0, NotSerialized)
-                            {
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
-                                    }, Local0)
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
-                                    }, Local1)
-                                CreateByteField (Local0, One, PIOM)
-                                CreateByteField (Local1, One, DMAM)
-                                Store (PIO0, PIOM)
-                                Or (PIOM, 0x08, PIOM)
-                                If (LAnd (FLGP, One))
-                                {
-                                    Store (DMA0, DMAM)
-                                    Or (DMAM, 0x40, DMAM)
-                                }
-                                Else
-                                {
-                                    Store (MDA0, DMAM)
-                                    Or (DMAM, 0x20, DMAM)
-                                }
-
-                                Concatenate (Local0, Local1, Local2)
-                                Return (Local2)
-                            }
-                        }
-
-                        Device (DRV1)
-                        {
-                            Name (_ADR, One)
-                            Method (_GTF, 0, NotSerialized)
-                            {
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
-                                    }, Local0)
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
-                                    }, Local1)
-                                CreateByteField (Local0, One, PIOM)
-                                CreateByteField (Local1, One, DMAM)
-                                Store (PIO1, PIOM)
-                                Or (PIOM, 0x08, PIOM)
-                                If (LAnd (FLGP, 0x04))
-                                {
-                                    Store (DMA1, DMAM)
-                                    Or (DMAM, 0x40, DMAM)
-                                }
-                                Else
-                                {
-                                    Store (MDA1, DMAM)
-                                    Or (DMAM, 0x20, DMAM)
-                                }
-
-                                Concatenate (Local0, Local1, Local2)
-                                Return (Local2)
-                            }
-                        }
-                    }
-
-                    Device (IDE1)
-                    {
-                        Name (_ADR, One)
-                        Method (_GTM, 0, NotSerialized)
-                        {
-                            Store (DerefOf (Index (PIOT, PIO2)), Local0)
-                            Store (DerefOf (Index (PIOT, PIO3)), Local2)
-                            Store (0x1A, Local4)
-                            If (LAnd (FLGS, One))
-                            {
-                                If (LAnd (CAB0, LNot (SWAP)))
-                                {
-                                    Store (0x02, DMA2)
-                                }
-
-                                Store (DerefOf (Index (UDMA, DMA2)), Local1)
-                                Or (Local4, One, Local4)
-                            }
-                            Else
-                            {
-                                Store (DerefOf (Index (MDMA, MDA2)), Local1)
-                            }
-
-                            If (LAnd (FLGS, 0x04))
-                            {
-                                If (LAnd (CAB0, LNot (SWAP)))
-                                {
-                                    Store (0x02, DMA3)
-                                }
-
-                                Store (DerefOf (Index (UDMA, DMA3)), Local3)
-                                Or (Local4, 0x04, Local4)
-                            }
-                            Else
-                            {
-                                Store (DerefOf (Index (MDMA, MDA3)), Local3)
-                            }
-
-                            Store (Local0, GTM0)
-                            Store (Local1, GTM1)
-                            Store (Local2, GTM2)
-                            Store (Local3, GTM3)
-                            Store (Local4, GTM4)
-                            Return (IDEB)
-                        }
-
-                        Method (_STM, 3, NotSerialized)
-                        {
-                            Store (Arg0, IDEB)
-                            Store (GTM0, Local0)
-                            Store (GTM1, Local1)
-                            Store (GTM2, Local2)
-                            Store (GTM3, Local3)
-                            Store (GTM4, Local4)
-                            Store (Local4, FLGS)
-                            If (LAnd (LNotEqual (Local0, 0xFFFFFFFF), LNotEqual (Local0, Zero)))
-                            {
-                                Store (Match (PIOT, MEQ, Local0, MTR, Zero, Zero), PIO2)
-                            }
-
-                            If (LAnd (LNotEqual (Local1, 0xFFFFFFFF), LNotEqual (Local1, Zero)))
-                            {
-                                If (LAnd (FLGS, One))
-                                {
-                                    Store (Match (UDMA, MEQ, Local1, MTR, Zero, Zero), DMA2)
-                                }
-                                Else
-                                {
-                                    Store (Match (MDMA, MEQ, Local1, MTR, Zero, Zero), MDA2)
-                                }
-                            }
-
-                            If (LAnd (LNotEqual (Local2, 0xFFFFFFFF), LNotEqual (Local2, Zero)))
-                            {
-                                Store (Match (PIOT, MEQ, Local2, MTR, Zero, Zero), PIO3)
-                            }
-
-                            If (LAnd (LNotEqual (Local3, 0xFFFFFFFF), LNotEqual (Local3, Zero)))
-                            {
-                                If (LAnd (FLGS, 0x04))
-                                {
-                                    Store (Match (UDMA, MEQ, Local3, MTR, Zero, Zero), DMA3)
-                                }
-                                Else
-                                {
-                                    Store (Match (MDMA, MEQ, Local3, MTR, Zero, Zero), MDA3)
-                                }
-                            }
-                        }
-
-                        Device (DRV0)
-                        {
-                            Name (_ADR, Zero)
-                            Method (_GTF, 0, NotSerialized)
-                            {
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
-                                    }, Local0)
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xEF
-                                    }, Local1)
-                                CreateByteField (Local0, One, PIOM)
-                                CreateByteField (Local1, One, DMAM)
-                                Store (PIO2, PIOM)
-                                Or (PIOM, 0x08, PIOM)
-                                If (LAnd (FLGS, One))
-                                {
-                                    Store (DMA2, DMAM)
-                                    Or (DMAM, 0x40, DMAM)
-                                }
-                                Else
-                                {
-                                    Store (MDA2, DMAM)
-                                    Or (DMAM, 0x20, DMAM)
-                                }
-
-                                Concatenate (Local0, Local1, Local2)
-                                Return (Local2)
-                            }
-                        }
-
-                        Device (DRV1)
-                        {
-                            Name (_ADR, One)
-                            Method (_GTF, 0, NotSerialized)
-                            {
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
-                                    }, Local0)
-                                Store (Buffer (0x07)
-                                    {
-                                        0x03, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xEF
-                                    }, Local1)
-                                CreateByteField (Local0, One, PIOM)
-                                CreateByteField (Local1, One, DMAM)
-                                Store (PIO3, PIOM)
-                                Or (PIOM, 0x08, PIOM)
-                                If (LAnd (FLGS, 0x04))
-                                {
-                                    Store (DMA3, DMAM)
-                                    Or (DMAM, 0x40, DMAM)
-                                }
-                                Else
-                                {
-                                    Store (MDA3, DMAM)
-                                    Or (DMAM, 0x20, DMAM)
-                                }
-
-                                Concatenate (Local0, Local1, Local2)
-                                Return (Local2)
-                            }
-                        }
-                    }
-                }
-            }
-
-            Device (RP05)
-            {
-                Name (_ADR, 0x001C0004)
-                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
-                Field (PXCS, AnyAcc, NoLock, Preserve)
-                {
-                            Offset (0x10), 
-                    L0SE,   1, 
-                            Offset (0x11), 
-                            Offset (0x12), 
-                        ,   13, 
-                    LASX,   1, 
-                            Offset (0x1A), 
-                    ABPX,   1, 
-                        ,   2, 
-                    PDCX,   1, 
-                        ,   2, 
-                    PDSX,   1, 
-                            Offset (0x1B), 
-                            Offset (0x20), 
-                            Offset (0x22), 
-                    PSPX,   1, 
-                            Offset (0x98), 
-                        ,   30, 
-                    HPEX,   1, 
-                    PMEX,   1
-                }
-
-                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
-                {
-                            Offset (0x9C), 
-                        ,   30, 
-                    HPSX,   1, 
-                    PMSX,   1
-                }
-
-                Device (PXSX)
-                {
-                    Name (_ADR, Zero)
-                    Name (_PRW, Package (0x02)
-                    {
-                        0x09, 
-                        0x04
-                    })
-                }
-
-                Method (HPME, 0, Serialized)
-                {
-                    If (PMSX)
-                    {
-                        Store (0xC8, Local0)
-                        While (Local0)
-                        {
-                            Store (One, PMSX)
-                            If (PMSX)
-                            {
-                                Decrement (Local0)
-                            }
-                            Else
-                            {
-                                Store (Zero, Local0)
-                            }
-                        }
-
-                        Notify (PXSX, 0x02)
-                    }
-                }
-
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR08 ())
-                    }
-
-                    Return (PR08 ())
-                }
-            }
-
-            Device (RP06)
-            {
-                Name (_ADR, 0x001C0005)
-                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
-                Field (PXCS, AnyAcc, NoLock, Preserve)
-                {
-                            Offset (0x10), 
-                    L0SE,   1, 
-                            Offset (0x11), 
-                            Offset (0x12), 
-                        ,   13, 
-                    LASX,   1, 
-                            Offset (0x1A), 
-                    ABPX,   1, 
-                        ,   2, 
-                    PDCX,   1, 
-                        ,   2, 
-                    PDSX,   1, 
-                            Offset (0x1B), 
-                            Offset (0x20), 
-                            Offset (0x22), 
-                    PSPX,   1, 
-                            Offset (0x98), 
-                        ,   30, 
-                    HPEX,   1, 
-                    PMEX,   1
-                }
-
-                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
-                {
-                            Offset (0x9C), 
-                        ,   30, 
-                    HPSX,   1, 
-                    PMSX,   1
-                }
-
-                Device (PXSX)
-                {
-                    Name (_ADR, Zero)
-                    Name (_PRW, Package (0x02)
-                    {
-                        0x09, 
-                        0x04
-                    })
-                }
-
-                Method (HPME, 0, Serialized)
-                {
-                    If (PMSX)
-                    {
-                        Store (0xC8, Local0)
-                        While (Local0)
-                        {
-                            Store (One, PMSX)
-                            If (PMSX)
-                            {
-                                Decrement (Local0)
-                            }
-                            Else
-                            {
-                                Store (Zero, Local0)
-                            }
-                        }
-
-                        Notify (PXSX, 0x02)
-                    }
-                }
-
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR09 ())
-                    }
-
-                    Return (PR09 ())
-                }
-            }
-
-            Device (RP08)
-            {
-                Name (_ADR, 0x001C0007)
-                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
-                Field (PXCS, AnyAcc, NoLock, Preserve)
-                {
-                            Offset (0x10), 
-                    L0SE,   1, 
-                            Offset (0x11), 
-                            Offset (0x12), 
-                        ,   13, 
-                    LASX,   1, 
-                            Offset (0x1A), 
-                    ABPX,   1, 
-                        ,   2, 
-                    PDCX,   1, 
-                        ,   2, 
-                    PDSX,   1, 
-                            Offset (0x1B), 
-                            Offset (0x20), 
-                            Offset (0x22), 
-                    PSPX,   1, 
-                            Offset (0x98), 
-                        ,   30, 
-                    HPEX,   1, 
-                    PMEX,   1
-                }
-
-                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
-                {
-                            Offset (0x9C), 
-                        ,   30, 
-                    HPSX,   1, 
-                    PMSX,   1
-                }
-
-                Device (PXSX)
-                {
-                    Name (_ADR, Zero)
-                    Name (_PRW, Package (0x02)
-                    {
-                        0x09, 
-                        0x04
-                    })
-                }
-
-                Method (HPME, 0, Serialized)
-                {
-                    If (PMSX)
-                    {
-                        Store (0xC8, Local0)
-                        While (Local0)
-                        {
-                            Store (One, PMSX)
-                            If (PMSX)
-                            {
-                                Decrement (Local0)
-                            }
-                            Else
-                            {
-                                Store (Zero, Local0)
-                            }
-                        }
-
-                        Notify (PXSX, 0x02)
-                    }
-                }
-
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR0F ())
-                    }
-
-                    Return (PR0F ())
-                }
-            }
-
-            Device (PEG0)
-            {
-                Name (_ADR, 0x00010000)
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR02 ())
-                    }
-
-                    Return (PR02 ())
-                }
-
-                Device (PEGP)
-                {
-                    Name (_ADR, 0xFFFF)
-                }
-            }
-
-            Device (PEG1)
-            {
-                Name (_ADR, 0x00010001)
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR0A ())
-                    }
-
-                    Return (PR0A ())
-                }
-            }
-
-            Device (PEG2)
-            {
-                Name (_ADR, 0x00010002)
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR0B ())
-                    }
-
-                    Return (PR0B ())
-                }
-            }
-
-            Device (PEG3)
-            {
-                Name (_ADR, 0x00060000)
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR0C ())
-                    }
-
-                    Return (PR0C ())
-                }
-            }
-
-            Device (B0D4)
-            {
-                Name (_ADR, 0x00040000)
-            }
-
-            Device (EUSB)
-            {
-                Name (_ADR, 0x001D0000)
-                Name (_S4D, 0x02)
-                Name (_S3D, 0x02)
-                Name (_S2D, 0x02)
-                Name (_S1D, 0x02)
-                Device (HUBN)
-                {
-                    Name (_ADR, Zero)
-                    Device (PR10)
-                    {
-                        Name (_ADR, One)
-                        Name (_UPC, Package (0x04)
-                        {
-                            0xFF, 
-                            Zero, 
-                            Zero, 
-                            Zero
-                        })
-                        Name (_PLD, Buffer (0x10)
-                        {
-                            /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                            /* 0008 */    0x30, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                        })
-                        Device (PR30)
-                        {
-                            Name (_ADR, One)
-                            Name (_UPC, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Name (_PLD, Buffer (0x10)
-                            {
-                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0xE1, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                            })
-                        }
-
-                        Device (PR31)
-                        {
-                            Name (_ADR, 0x02)
-                            Name (_UPC, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Name (_PLD, Buffer (0x10)
-                            {
-                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                            })
-                        }
-
-                        Device (PR32)
-                        {
-                            Name (_ADR, 0x03)
-                            Name (_UPC, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Name (_PLD, Buffer (0x10)
-                            {
-                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                            })
-                        }
-
-                        Device (PR33)
-                        {
-                            Name (_ADR, 0x04)
-                            Name (_UPC, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Name (_PLD, Buffer (0x10)
-                            {
-                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0xE1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                            })
-                        }
-
-                        Device (PR34)
-                        {
-                            Name (_ADR, 0x05)
-                            Name (_UPC, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Name (_PLD, Buffer (0x10)
-                            {
-                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                            })
-                        }
-
-                        Device (PR35)
-                        {
-                            Name (_ADR, 0x06)
-                            Name (_UPC, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Name (_PLD, Buffer (0x10)
-                            {
-                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                            })
-                        }
-
-                        Device (PR36)
-                        {
-                            Name (_ADR, 0x07)
-                            Name (_UPC, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Name (_PLD, Buffer (0x10)
-                            {
-                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0xB0, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                            })
-                        }
-
-                        Device (PR37)
-                        {
-                            Name (_ADR, 0x08)
-                            Name (_UPC, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Name (_PLD, Buffer (0x10)
-                            {
-                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                            })
-                        }
-                    }
-                }
-            }
-
-            Device (RP07)
-            {
-                Name (_ADR, 0x001C0006)
-                OperationRegion (PXCS, PCI_Config, 0x40, 0xC0)
-                Field (PXCS, AnyAcc, NoLock, Preserve)
-                {
-                            Offset (0x10), 
-                    L0SE,   1, 
-                            Offset (0x11), 
-                            Offset (0x12), 
-                        ,   13, 
-                    LASX,   1, 
-                            Offset (0x1A), 
-                    ABPX,   1, 
-                        ,   2, 
-                    PDCX,   1, 
-                        ,   2, 
-                    PDSX,   1, 
-                            Offset (0x1B), 
-                            Offset (0x20), 
-                            Offset (0x22), 
-                    PSPX,   1, 
-                            Offset (0x98), 
-                        ,   30, 
-                    HPEX,   1, 
-                    PMEX,   1
-                }
-
-                Field (PXCS, AnyAcc, NoLock, WriteAsZeros)
-                {
-                            Offset (0x9C), 
-                        ,   30, 
-                    HPSX,   1, 
-                    PMSX,   1
-                }
-
-                Method (HPME, 0, Serialized)
-                {
-                    If (PMSX)
-                    {
-                        Store (0xC8, Local0)
-                        While (Local0)
-                        {
-                            Store (One, PMSX)
-                            If (PMSX)
-                            {
-                                Decrement (Local0)
-                            }
-                            Else
-                            {
-                                Store (Zero, Local0)
-                            }
-                        }
-
-                        Notify (PXSX, 0x02)
-                    }
-                }
-
-                Method (_PRT, 0, NotSerialized)
-                {
-                    If (PICM)
-                    {
-                        Return (AR0E ())
-                    }
-
-                    Return (PR0E ())
-                }
-
-                Device (PXSX)
-                {
-                    Name (_ADR, Zero)
-                    Method (_PRW, 0, NotSerialized)
-                    {
-                        Return (GPRW (0x0B, 0x04))
-                    }
-
-                    Method (_PRT, 0, NotSerialized)
-                    {
-                        If (PICM)
-                        {
-                            Return (AR31)
-                        }
-
-                        Return (PR31)
-                    }
-                }
-            }
-        }
-
-        Scope (\_GPE)
-        {
-            Method (_L1D, 0, NotSerialized)
-            {
-                \_SB.PCI0.LPCB.SIOH ()
-                Notify (\_SB.PWRB, 0x02)
-            }
-
-            Method (_L0B, 0, NotSerialized)
-            {
-                Notify (\_SB.PCI0.P0P1, 0x02)
-                Notify (\_SB.PCI0.RP07.PXSX, 0x02)
-                Notify (\_SB.PWRB, 0x02)
-            }
-        }
-
-        Device (PWRB)
-        {
-            Name (_HID, EisaId ("PNP0C0C"))
-            Name (_UID, 0xAA)
-            Name (_STA, 0x0B)
-            Method (_PRW, 0, NotSerialized)
-            {
-                Return (GPRW (0x1D, 0x04))
-            }
-        }
-    }
-
-    Scope (\)
-    {
-        OperationRegion (IO_T, SystemIO, 0x0200, 0x10)
-        Field (IO_T, ByteAcc, NoLock, Preserve)
-        {
-            TRPI,   16, 
-                    Offset (0x04), 
-                    Offset (0x06), 
-                    Offset (0x08), 
-            TRP0,   8, 
-                    Offset (0x0A), 
-                    Offset (0x0B), 
-                    Offset (0x0C), 
-                    Offset (0x0D), 
-                    Offset (0x0E), 
-                    Offset (0x0F), 
-                    Offset (0x10)
-        }
-
-        OperationRegion (IO_D, SystemIO, 0x0810, 0x04)
-        Field (IO_D, ByteAcc, NoLock, Preserve)
-        {
-            TRPD,   8
-        }
-
-        OperationRegion (IO_H, SystemIO, 0x1000, 0x04)
-        Field (IO_H, ByteAcc, NoLock, Preserve)
-        {
-            TRPH,   8
-        }
-
-        OperationRegion (PMIO, SystemIO, PMBS, 0x80)
-        Field (PMIO, ByteAcc, NoLock, Preserve)
-        {
-                    Offset (0x28), 
-                    Offset (0x2A), 
-                ,   3, 
-            GPE3,   1, 
-                    Offset (0x3C), 
-                ,   1, 
-            UPRW,   1, 
-                    Offset (0x42), 
-                ,   1, 
-            GPEC,   1
-        }
-
-        Field (PMIO, ByteAcc, NoLock, WriteAsZeros)
-        {
-                    Offset (0x20), 
-                    Offset (0x22), 
-                ,   3, 
-            GPS3,   1, 
-                    Offset (0x64), 
-                ,   9, 
-            SCIS,   1, 
-                    Offset (0x66)
-        }
-
-        OperationRegion (GPIO, SystemIO, GPBS, 0x64)
-        Field (GPIO, ByteAcc, NoLock, Preserve)
-        {
-            GU00,   8, 
-            GU01,   8, 
-            GU02,   8, 
-            GU03,   8, 
-            GIO0,   8, 
-            GIO1,   8, 
-            GIO2,   8, 
-            GIO3,   8, 
-                    Offset (0x0C), 
-            GL00,   8, 
-            GL01,   8, 
-            GL02,   8, 
-            GP24,   1, 
-                ,   2, 
-            GP27,   1, 
-            GP28,   1, 
-                    Offset (0x10), 
-                    Offset (0x18), 
-            GB00,   8, 
-            GB01,   8, 
-            GB02,   8, 
-            GB03,   8, 
-                    Offset (0x2C), 
-            GIV0,   8, 
-            GIV1,   8, 
-            GIV2,   8, 
-            GIV3,   8, 
-            GU04,   8, 
-            GU05,   8, 
-            GU06,   8, 
-            GU07,   8, 
-            GIO4,   8, 
-            GIO5,   8, 
-            GIO6,   8, 
-            GIO7,   8, 
-            GL04,   8, 
-            GL05,   8, 
-            GL06,   8, 
-            GL07,   8, 
-                    Offset (0x40), 
-            GU08,   8, 
-            GU09,   8, 
-            GU0A,   8, 
-            GU0B,   8, 
-            GIO8,   8, 
-            GIO9,   8, 
-            GIOA,   8, 
-            GIOB,   8, 
-            GL08,   8, 
-            GL09,   8, 
-            GL0A,   8, 
-            GL0B,   8
-        }
-
-        OperationRegion (RCRB, SystemMemory, SRCB, 0x4000)
-        Field (RCRB, DWordAcc, Lock, Preserve)
-        {
-                    Offset (0x1000), 
-                    Offset (0x3000), 
-                    Offset (0x3404), 
-            HPAS,   2, 
-                ,   5, 
-            HPAE,   1, 
-                    Offset (0x3418), 
-                ,   1, 
-                ,   1, 
-            SATD,   1, 
-            SMBD,   1, 
-            HDAD,   1, 
-                    Offset (0x341A), 
-            RP1D,   1, 
-            RP2D,   1, 
-            RP3D,   1, 
-            RP4D,   1, 
-            RP5D,   1, 
-            RP6D,   1, 
-            RP7D,   1, 
-            RP8D,   1, 
-                    Offset (0x359C), 
-            UP0D,   1, 
-            UP1D,   1, 
-            UP2D,   1, 
-            UP3D,   1, 
-            UP4D,   1, 
-            UP5D,   1, 
-            UP6D,   1, 
-            UP7D,   1, 
-            UP8D,   1, 
-            UP9D,   1, 
-            UPAD,   1, 
-            UPBD,   1, 
-            UPCD,   1, 
-            UPDD,   1, 
-                ,   1, 
-                    Offset (0x359E)
-        }
-    }
-
-    Scope (_SB.PCI0)
-    {
-        Device (GLAN)
-        {
-            Name (_ADR, 0x00190000)
-            Method (_PRW, 0, NotSerialized)
-            {
-                Return (GPRW (0x0D, 0x04))
-            }
-        }
-
-        Device (EHC1)
-        {
-            Name (_ADR, 0x001D0000)
-            OperationRegion (PWKE, PCI_Config, 0x62, 0x04)
-            Field (PWKE, DWordAcc, NoLock, Preserve)
-            {
-                    ,   1, 
-                PWUC,   8
-            }
-
-            Method (_PSW, 1, NotSerialized)
-            {
-                If (Arg0)
-                {
-                    Store (Ones, PWUC)
-                }
-                Else
-                {
-                    Store (Zero, PWUC)
-                }
-            }
-
-            Method (_S3D, 0, NotSerialized)
-            {
-                Return (0x02)
-            }
-
-            Method (_S4D, 0, NotSerialized)
-            {
-                Return (0x02)
-            }
-
-            Device (HUBN)
-            {
-                Name (_ADR, Zero)
-                Device (PR01)
-                {
-                    Name (_ADR, One)
-                    Method (_UPC, 0, Serialized)
-                    {
-                        Name (UPCA, Package (0x04)
-                        {
-                            0xFF, 
-                            Zero, 
-                            Zero, 
-                            Zero
-                        })
-                        Return (UPCA)
-                    }
-
-                    Method (_PLD, 0, Serialized)
-                    {
-                        Name (PLDP, Package (0x01)
-                        {
-                            Buffer (0x10)
-                            {
-                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0x30, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                            }
-                        })
-                        Return (PLDP)
-                    }
-
-                    Device (PR11)
-                    {
-                        Name (_ADR, One)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xE1, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-                    }
-
-                    Device (PR12)
-                    {
-                        Name (_ADR, 0x02)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-                    }
-
-                    Device (PR13)
-                    {
-                        Name (_ADR, 0x03)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-                    }
-
-                    Device (PR14)
-                    {
-                        Name (_ADR, 0x04)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xE1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-
-                        Alias (SBV1, SDGV)
-                        Method (_DSM, 4, Serialized)
-                        {
-                            If (LEqual (Arg0, Buffer (0x10)
-                                    {
-                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
-                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
-                                    }))
-                            {
-                                Name (_T_0, Zero)
-                                Store (ToInteger (Arg2), _T_0)
-                                If (LEqual (_T_0, Zero))
-                                {
-                                    If (LEqual (Arg1, One))
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x07
-                                        })
-                                    }
-                                    Else
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x00
-                                        })
-                                    }
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, One))
-                                    {
-                                        If (LEqual (SDGV, 0xFF))
-                                        {
-                                            Return (Zero)
-                                        }
-                                        Else
-                                        {
-                                            Return (One)
-                                        }
-                                    }
-                                    Else
-                                    {
-                                        If (LEqual (_T_0, 0x02))
-                                        {
-                                            Return (SDGV)
-                                        }
-                                    }
-                                }
-                            }
-
-                            Return (Zero)
-                        }
-                    }
-
-                    Device (PR15)
-                    {
-                        Name (_ADR, 0x05)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-
-                        Alias (SBV2, SDGV)
-                        Method (_DSM, 4, Serialized)
-                        {
-                            If (LEqual (Arg0, Buffer (0x10)
-                                    {
-                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
-                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
-                                    }))
-                            {
-                                Name (_T_0, Zero)
-                                Store (ToInteger (Arg2), _T_0)
-                                If (LEqual (_T_0, Zero))
-                                {
-                                    If (LEqual (Arg1, One))
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x07
-                                        })
-                                    }
-                                    Else
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x00
-                                        })
-                                    }
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, One))
-                                    {
-                                        If (LEqual (SDGV, 0xFF))
-                                        {
-                                            Return (Zero)
-                                        }
-                                        Else
-                                        {
-                                            Return (One)
-                                        }
-                                    }
-                                    Else
-                                    {
-                                        If (LEqual (_T_0, 0x02))
-                                        {
-                                            Return (SDGV)
-                                        }
-                                    }
-                                }
-                            }
-
-                            Return (Zero)
-                        }
-                    }
-
-                    Device (PR16)
-                    {
-                        Name (_ADR, 0x06)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-
-                        Alias (SBV1, SDGV)
-                        Method (_DSM, 4, Serialized)
-                        {
-                            If (LEqual (Arg0, Buffer (0x10)
-                                    {
-                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
-                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
-                                    }))
-                            {
-                                Name (_T_0, Zero)
-                                Store (ToInteger (Arg2), _T_0)
-                                If (LEqual (_T_0, Zero))
-                                {
-                                    If (LEqual (Arg1, One))
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x07
-                                        })
-                                    }
-                                    Else
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x00
-                                        })
-                                    }
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, One))
-                                    {
-                                        If (LEqual (SDGV, 0xFF))
-                                        {
-                                            Return (Zero)
-                                        }
-                                        Else
-                                        {
-                                            Return (One)
-                                        }
-                                    }
-                                    Else
-                                    {
-                                        If (LEqual (_T_0, 0x02))
-                                        {
-                                            Return (SDGV)
-                                        }
-                                    }
-                                }
-                            }
-
-                            Return (Zero)
-                        }
-                    }
-
-                    Device (PR17)
-                    {
-                        Name (_ADR, 0x07)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-
-                        Alias (SBV2, SDGV)
-                        Method (_DSM, 4, Serialized)
-                        {
-                            If (LEqual (Arg0, Buffer (0x10)
-                                    {
-                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
-                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
-                                    }))
-                            {
-                                Name (_T_0, Zero)
-                                Store (ToInteger (Arg2), _T_0)
-                                If (LEqual (_T_0, Zero))
-                                {
-                                    If (LEqual (Arg1, One))
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x07
-                                        })
-                                    }
-                                    Else
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x00
-                                        })
-                                    }
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, One))
-                                    {
-                                        If (LEqual (SDGV, 0xFF))
-                                        {
-                                            Return (Zero)
-                                        }
-                                        Else
-                                        {
-                                            Return (One)
-                                        }
-                                    }
-                                    Else
-                                    {
-                                        If (LEqual (_T_0, 0x02))
-                                        {
-                                            Return (SDGV)
-                                        }
-                                    }
-                                }
-                            }
-
-                            Return (Zero)
-                        }
-                    }
-
-                    Device (PR18)
-                    {
-                        Name (_ADR, 0x08)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-                    }
-                }
-            }
-
-            Method (_PRW, 0, NotSerialized)
-            {
-                Return (GPRW (0x0D, 0x04))
-            }
-        }
-
-        Device (EHC2)
-        {
-            Name (_ADR, 0x001A0000)
-            OperationRegion (PWKE, PCI_Config, 0x62, 0x04)
-            Field (PWKE, DWordAcc, NoLock, Preserve)
-            {
-                    ,   1, 
-                PWUC,   6
-            }
-
-            Method (_PSW, 1, NotSerialized)
-            {
-                If (Arg0)
-                {
-                    Store (Ones, PWUC)
-                }
-                Else
-                {
-                    Store (Zero, PWUC)
-                }
-            }
-
-            Method (_S3D, 0, NotSerialized)
-            {
-                Return (0x02)
-            }
-
-            Method (_S4D, 0, NotSerialized)
-            {
-                Return (0x02)
-            }
-
-            Device (HUBN)
-            {
-                Name (_ADR, Zero)
-                Device (PR01)
-                {
-                    Name (_ADR, One)
-                    Method (_UPC, 0, Serialized)
-                    {
-                        Name (UPCA, Package (0x04)
-                        {
-                            0xFF, 
-                            Zero, 
-                            Zero, 
-                            Zero
-                        })
-                        Return (UPCA)
-                    }
-
-                    Method (_PLD, 0, Serialized)
-                    {
-                        Name (PLDP, Package (0x01)
-                        {
-                            Buffer (0x10)
-                            {
-                                /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0x30, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                            }
-                        })
-                        Return (PLDP)
-                    }
-
-                    Device (PR11)
-                    {
-                        Name (_ADR, One)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xE1, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-                    }
-
-                    Device (PR12)
-                    {
-                        Name (_ADR, 0x02)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-
-                        Alias (SBV1, SDGV)
-                        Method (_DSM, 4, Serialized)
-                        {
-                            If (LEqual (Arg0, Buffer (0x10)
-                                    {
-                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
-                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
-                                    }))
-                            {
-                                Name (_T_0, Zero)
-                                Store (ToInteger (Arg2), _T_0)
-                                If (LEqual (_T_0, Zero))
-                                {
-                                    If (LEqual (Arg1, One))
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x07
-                                        })
-                                    }
-                                    Else
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x00
-                                        })
-                                    }
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, One))
-                                    {
-                                        If (LEqual (SDGV, 0xFF))
-                                        {
-                                            Return (Zero)
-                                        }
-                                        Else
-                                        {
-                                            Return (One)
-                                        }
-                                    }
-                                    Else
-                                    {
-                                        If (LEqual (_T_0, 0x02))
-                                        {
-                                            Return (SDGV)
-                                        }
-                                    }
-                                }
-                            }
-
-                            Return (Zero)
-                        }
-                    }
-
-                    Device (PR13)
-                    {
-                        Name (_ADR, 0x03)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-
-                        Alias (SBV2, SDGV)
-                        Method (_DSM, 4, Serialized)
-                        {
-                            If (LEqual (Arg0, Buffer (0x10)
-                                    {
-                                        /* 0000 */    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B, 
-                                        /* 0008 */    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
-                                    }))
-                            {
-                                Name (_T_0, Zero)
-                                Store (ToInteger (Arg2), _T_0)
-                                If (LEqual (_T_0, Zero))
-                                {
-                                    If (LEqual (Arg1, One))
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x07
-                                        })
-                                    }
-                                    Else
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x00
-                                        })
-                                    }
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, One))
-                                    {
-                                        If (LEqual (SDGV, 0xFF))
-                                        {
-                                            Return (Zero)
-                                        }
-                                        Else
-                                        {
-                                            Return (One)
-                                        }
-                                    }
-                                    Else
-                                    {
-                                        If (LEqual (_T_0, 0x02))
-                                        {
-                                            Return (SDGV)
-                                        }
-                                    }
-                                }
-                            }
-
-                            Return (Zero)
-                        }
-                    }
-
-                    Device (PR14)
-                    {
-                        Name (_ADR, 0x04)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xE1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-                    }
-
-                    Device (PR15)
-                    {
-                        Name (_ADR, 0x05)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-                    }
-
-                    Device (PR16)
-                    {
-                        Name (_ADR, 0x06)
-                        Method (_UPC, 0, Serialized)
-                        {
-                            Name (UPCP, Package (0x04)
-                            {
-                                0xFF, 
-                                0xFF, 
-                                Zero, 
-                                Zero
-                            })
-                            Return (UPCP)
-                        }
-
-                        Method (_PLD, 0, Serialized)
-                        {
-                            Name (PLDP, Package (0x01)
-                            {
-                                Buffer (0x10)
-                                {
-                                    /* 0000 */    0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                    /* 0008 */    0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                                }
-                            })
-                            Return (PLDP)
-                        }
-                    }
-                }
-            }
-
-            Method (_PRW, 0, NotSerialized)
-            {
-                Return (GPRW (0x0D, 0x04))
-            }
-        }
-
-        Device (XHC)
-        {
-            Name (_ADR, 0x00140000)
-            OperationRegion (XPRT, PCI_Config, 0xD0, 0x10)
-            Field (XPRT, DWordAcc, NoLock, Preserve)
-            {
-                PR2,    32, 
-                PR2M,   32, 
-                PR3,    32, 
-                PR3M,   32
-            }
-
-            Method (CUID, 1, Serialized)
-            {
-                If (LEqual (Arg0, Buffer (0x10)
-                        {
-                            /* 0000 */    0xA9, 0x12, 0x95, 0x7C, 0x05, 0x17, 0xB4, 0x4C, 
-                            /* 0008 */    0xAF, 0x7D, 0x50, 0x6A, 0x24, 0x23, 0xAB, 0x71
-                        }))
-                {
-                    Return (One)
-                }
-
-                Return (Zero)
-            }
-
-            Method (POSC, 3, Serialized)
-            {
-                CreateDWordField (Arg2, Zero, CDW1)
-                If (LNotEqual (Arg1, One))
-                {
-                    Or (CDW1, 0x08, CDW1)
-                }
-
-                If (LEqual (XHCI, Zero))
-                {
-                    Or (CDW1, 0x02, CDW1)
-                }
-
-                If (LNot (And (CDW1, One)))
-                {
-                    XSEL ()
-                }
-
-                Return (Arg2)
-            }
-
-            Method (XSEL, 0, Serialized)
-            {
-                If (LOr (LEqual (XHCI, 0x02), LEqual (XHCI, 0x03)))
-                {
-                    Store (Zero, Local0)
-                    And (PR3, 0xFFFFFFF0, Local0)
-                    Or (Local0, XHPM, Local0)
-                    And (Local0, PR3M, PR3)
-                    Store (Zero, Local0)
-                    And (PR2, 0xFFFFFFF0, Local0)
-                    Or (Local0, XHPM, Local0)
-                    And (Local0, PR2M, PR2)
-                    Store (One, XUSB)
-                }
-            }
-
-            Method (_S3D, 0, NotSerialized)
-            {
-                Return (0x02)
-            }
-
-            Method (_S4D, 0, NotSerialized)
-            {
-                Return (0x02)
-            }
-
-            Device (RHUB)
-            {
-                Name (_ADR, Zero)
-                Device (HSP1)
-                {
-                    Name (_ADR, One)
-                    Method (_UPC, 0, Serialized)
-                    {
-                        Name (UPCP, Package (0x04)
-                        {
-                            0xFF, 
-                            0x03, 
-                            Zero, 
-                            Zero
-                        })
-                        If (LNot (And (PR2, One)))
-                        {
-                            Store (Zero, Index (UPCP, Zero))
-                        }
-
-                        Return (UPCP)
-                    }
-
-                    Method (_PLD, 0, Serialized)
-                    {
-                        Name (PLDP, Package (0x01)
-                        {
-                            Buffer (0x10)
-                            {
-                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0x69, 0x0C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
-                            }
-                        })
-                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
-                        If (LNot (And (PR2, One)))
-                        {
-                            And (VIS, Zero, VIS)
-                        }
-
-                        Return (PLDP)
-                    }
-                }
-
-                Device (HSP2)
-                {
-                    Name (_ADR, 0x02)
-                    Method (_UPC, 0, Serialized)
-                    {
-                        Name (UPCP, Package (0x04)
-                        {
-                            0xFF, 
-                            0x03, 
-                            Zero, 
-                            Zero
-                        })
-                        If (LNot (And (PR2, 0x02)))
-                        {
-                            Store (Zero, Index (UPCP, Zero))
-                        }
-
-                        Return (UPCP)
-                    }
-
-                    Method (_PLD, 0, Serialized)
-                    {
-                        Name (PLDP, Package (0x01)
-                        {
-                            Buffer (0x10)
-                            {
-                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0x69, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
-                            }
-                        })
-                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
-                        If (LNot (And (PR2, 0x02)))
-                        {
-                            And (VIS, Zero, VIS)
-                        }
-
-                        Return (PLDP)
-                    }
-                }
-
-                Device (HSP3)
-                {
-                    Name (_ADR, 0x03)
-                    Method (_UPC, 0, Serialized)
-                    {
-                        Name (UPCP, Package (0x04)
-                        {
-                            0xFF, 
-                            0x03, 
-                            Zero, 
-                            Zero
-                        })
-                        If (LNot (And (PR2, 0x04)))
-                        {
-                            Store (Zero, Index (UPCP, Zero))
-                        }
-
-                        Return (UPCP)
-                    }
-
-                    Method (_PLD, 0, Serialized)
-                    {
-                        Name (PLDP, Package (0x01)
-                        {
-                            Buffer (0x10)
-                            {
-                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0x69, 0x0C, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00
-                            }
-                        })
-                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
-                        If (LNot (And (PR2, 0x04)))
-                        {
-                            And (VIS, Zero, VIS)
-                        }
-
-                        Return (PLDP)
-                    }
-                }
-
-                Device (HSP4)
-                {
-                    Name (_ADR, 0x04)
-                    Method (_UPC, 0, Serialized)
-                    {
-                        Name (UPCP, Package (0x04)
-                        {
-                            0xFF, 
-                            0x03, 
-                            Zero, 
-                            Zero
-                        })
-                        If (LNot (And (PR2, 0x08)))
-                        {
-                            Store (Zero, Index (UPCP, Zero))
-                        }
-
-                        Return (UPCP)
-                    }
-
-                    Method (_PLD, 0, Serialized)
-                    {
-                        Name (PLDP, Package (0x01)
-                        {
-                            Buffer (0x10)
-                            {
-                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0x69, 0x0C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
-                            }
-                        })
-                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
-                        If (LNot (And (PR2, 0x08)))
-                        {
-                            And (VIS, Zero, VIS)
-                        }
-
-                        Return (PLDP)
-                    }
-                }
-
-                Device (SSP1)
-                {
-                    Name (_ADR, 0x05)
-                    Method (_UPC, 0, Serialized)
-                    {
-                        Name (UPCP, Package (0x04)
-                        {
-                            0xFF, 
-                            0x03, 
-                            Zero, 
-                            Zero
-                        })
-                        If (LNot (And (PR3, One)))
-                        {
-                            Store (Zero, Index (UPCP, Zero))
-                        }
-
-                        Return (UPCP)
-                    }
-
-                    Method (_PLD, 0, Serialized)
-                    {
-                        Name (PLDP, Package (0x01)
-                        {
-                            Buffer (0x10)
-                            {
-                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0x69, 0x0C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
-                            }
-                        })
-                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
-                        If (LNot (And (PR3, One)))
-                        {
-                            And (VIS, Zero, VIS)
-                        }
-
-                        Return (PLDP)
-                    }
-                }
-
-                Device (SSP2)
-                {
-                    Name (_ADR, 0x06)
-                    Method (_UPC, 0, Serialized)
-                    {
-                        Name (UPCP, Package (0x04)
-                        {
-                            0xFF, 
-                            0x03, 
-                            Zero, 
-                            Zero
-                        })
-                        If (LNot (And (PR3, 0x02)))
-                        {
-                            Store (Zero, Index (UPCP, Zero))
-                        }
-
-                        Return (UPCP)
-                    }
-
-                    Method (_PLD, 0, Serialized)
-                    {
-                        Name (PLDP, Package (0x01)
-                        {
-                            Buffer (0x10)
-                            {
-                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0x69, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
-                            }
-                        })
-                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
-                        If (LNot (And (PR3, 0x02)))
-                        {
-                            And (VIS, Zero, VIS)
-                        }
-
-                        Return (PLDP)
-                    }
-                }
-
-                Device (SSP3)
-                {
-                    Name (_ADR, 0x07)
-                    Method (_UPC, 0, Serialized)
-                    {
-                        Name (UPCP, Package (0x04)
-                        {
-                            0xFF, 
-                            0x03, 
-                            Zero, 
-                            Zero
-                        })
-                        If (LNot (And (PR3, 0x04)))
-                        {
-                            Store (Zero, Index (UPCP, Zero))
-                        }
-
-                        Return (UPCP)
-                    }
-
-                    Method (_PLD, 0, Serialized)
-                    {
-                        Name (PLDP, Package (0x01)
-                        {
-                            Buffer (0x10)
-                            {
-                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0x69, 0x0C, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00
-                            }
-                        })
-                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
-                        If (LNot (And (PR3, 0x04)))
-                        {
-                            And (VIS, Zero, VIS)
-                        }
-
-                        Return (PLDP)
-                    }
-                }
-
-                Device (SSP4)
-                {
-                    Name (_ADR, 0x08)
-                    Method (_UPC, 0, Serialized)
-                    {
-                        Name (UPCP, Package (0x04)
-                        {
-                            0xFF, 
-                            0x03, 
-                            Zero, 
-                            Zero
-                        })
-                        If (LNot (And (PR3, 0x08)))
-                        {
-                            Store (Zero, Index (UPCP, Zero))
-                        }
-
-                        Return (UPCP)
-                    }
-
-                    Method (_PLD, 0, Serialized)
-                    {
-                        Name (PLDP, Package (0x01)
-                        {
-                            Buffer (0x10)
-                            {
-                                /* 0000 */    0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 
-                                /* 0008 */    0x69, 0x0C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
-                            }
-                        })
-                        CreateBitField (DerefOf (Index (PLDP, Zero)), 0x40, VIS)
-                        If (LNot (And (PR3, 0x08)))
-                        {
-                            And (VIS, Zero, VIS)
-                        }
-
-                        Return (PLDP)
-                    }
-                }
-            }
-
-            Method (_PRW, 0, NotSerialized)
-            {
-                Return (GPRW (0x0D, 0x04))
-            }
-        }
-
-        Device (HDEF)
-        {
-            Name (_ADR, 0x001B0000)
-            OperationRegion (HDAR, PCI_Config, 0x4C, 0x10)
-            Field (HDAR, WordAcc, NoLock, Preserve)
-            {
-                DCKA,   1, 
-                        Offset (0x01), 
-                DCKM,   1, 
-                    ,   6, 
-                DCKS,   1, 
-                        Offset (0x08), 
-                    ,   15, 
-                PMES,   1
-            }
-
-            Method (_PRW, 0, NotSerialized)
-            {
-                Return (GPRW (0x0D, 0x04))
-            }
-        }
-
-        Device (SAT0)
-        {
-            Name (_ADR, 0x001F0002)
-        }
-
-        Device (SAT1)
-        {
-            Name (_ADR, 0x001F0005)
-        }
-
-        Device (SBUS)
-        {
-            Name (_ADR, 0x001F0003)
-            OperationRegion (SMBP, PCI_Config, 0x40, 0xC0)
-            Field (SMBP, DWordAcc, NoLock, Preserve)
-            {
-                    ,   2, 
-                I2CE,   1
-            }
-
-            OperationRegion (SMPB, PCI_Config, 0x20, 0x04)
-            Field (SMPB, DWordAcc, NoLock, Preserve)
-            {
-                    ,   5, 
-                SBAR,   11
-            }
-
-            OperationRegion (SMBI, SystemIO, ShiftLeft (SBAR, 0x05), 0x10)
-            Field (SMBI, ByteAcc, NoLock, Preserve)
-            {
-                HSTS,   8, 
-                        Offset (0x02), 
-                HCON,   8, 
-                HCOM,   8, 
-                TXSA,   8, 
-                DAT0,   8, 
-                DAT1,   8, 
-                HBDR,   8, 
-                PECR,   8, 
-                RXSA,   8, 
-                SDAT,   16
-            }
-
-            Method (SSXB, 2, Serialized)
-            {
-                If (STRT ())
-                {
-                    Return (Zero)
-                }
-
-                Store (Zero, I2CE)
-                Store (0xBF, HSTS)
-                Store (Arg0, TXSA)
-                Store (Arg1, HCOM)
-                Store (0x48, HCON)
-                If (COMP ())
-                {
-                    Or (HSTS, 0xFF, HSTS)
-                    Return (One)
-                }
-
-                Return (Zero)
-            }
-
-            Method (SRXB, 1, Serialized)
-            {
-                If (STRT ())
-                {
-                    Return (0xFFFF)
-                }
-
-                Store (Zero, I2CE)
-                Store (0xBF, HSTS)
-                Store (Or (Arg0, One), TXSA)
-                Store (0x44, HCON)
-                If (COMP ())
-                {
-                    Or (HSTS, 0xFF, HSTS)
-                    Return (DAT0)
-                }
-
-                Return (0xFFFF)
-            }
-
-            Method (SWRB, 3, Serialized)
-            {
-                If (STRT ())
-                {
-                    Return (Zero)
-                }
-
-                Store (Zero, I2CE)
-                Store (0xBF, HSTS)
-                Store (Arg0, TXSA)
-                Store (Arg1, HCOM)
-                Store (Arg2, DAT0)
-                Store (0x48, HCON)
-                If (COMP ())
-                {
-                    Or (HSTS, 0xFF, HSTS)
-                    Return (One)
-                }
-
-                Return (Zero)
-            }
-
-            Method (SRDB, 2, Serialized)
-            {
-                If (STRT ())
-                {
-                    Return (0xFFFF)
-                }
-
-                Store (Zero, I2CE)
-                Store (0xBF, HSTS)
-                Store (Or (Arg0, One), TXSA)
-                Store (Arg1, HCOM)
-                Store (0x48, HCON)
-                If (COMP ())
-                {
-                    Or (HSTS, 0xFF, HSTS)
-                    Return (DAT0)
-                }
-
-                Return (0xFFFF)
-            }
-
-            Method (SWRW, 3, Serialized)
-            {
-                If (STRT ())
-                {
-                    Return (Zero)
-                }
-
-                Store (Zero, I2CE)
-                Store (0xBF, HSTS)
-                Store (Arg0, TXSA)
-                Store (Arg1, HCOM)
-                And (Arg2, 0xFF, DAT1)
-                And (ShiftRight (Arg2, 0x08), 0xFF, DAT0)
-                Store (0x4C, HCON)
-                If (COMP ())
-                {
-                    Or (HSTS, 0xFF, HSTS)
-                    Return (One)
-                }
-
-                Return (Zero)
-            }
-
-            Method (SRDW, 2, Serialized)
-            {
-                If (STRT ())
-                {
-                    Return (0xFFFF)
-                }
-
-                Store (Zero, I2CE)
-                Store (0xBF, HSTS)
-                Store (Or (Arg0, One), TXSA)
-                Store (Arg1, HCOM)
-                Store (0x4C, HCON)
-                If (COMP ())
-                {
-                    Or (HSTS, 0xFF, HSTS)
-                    Return (Or (ShiftLeft (DAT0, 0x08), DAT1))
-                }
-
-                Return (0xFFFFFFFF)
-            }
-
-            Method (SBLW, 4, Serialized)
-            {
-                If (STRT ())
-                {
-                    Return (Zero)
-                }
-
-                Store (Arg3, I2CE)
-                Store (0xBF, HSTS)
-                Store (Arg0, TXSA)
-                Store (Arg1, HCOM)
-                Store (SizeOf (Arg2), DAT0)
-                Store (Zero, Local1)
-                Store (DerefOf (Index (Arg2, Zero)), HBDR)
-                Store (0x54, HCON)
-                While (LGreater (SizeOf (Arg2), Local1))
-                {
-                    Store (0x0FA0, Local0)
-                    While (LAnd (LNot (And (HSTS, 0x80)), Local0))
-                    {
-                        Decrement (Local0)
-                        Stall (0x32)
-                    }
-
-                    If (LNot (Local0))
-                    {
-                        KILL ()
-                        Return (Zero)
-                    }
-
-                    Store (0x80, HSTS)
-                    Increment (Local1)
-                    If (LGreater (SizeOf (Arg2), Local1))
-                    {
-                        Store (DerefOf (Index (Arg2, Local1)), HBDR)
-                    }
-                }
-
-                If (COMP ())
-                {
-                    Or (HSTS, 0xFF, HSTS)
-                    Return (One)
-                }
-
-                Return (Zero)
-            }
-
-            Method (SBLR, 3, Serialized)
-            {
-                Name (TBUF, Buffer (0x0100) {})
-                If (STRT ())
-                {
-                    Return (Zero)
-                }
-
-                Store (Arg2, I2CE)
-                Store (0xBF, HSTS)
-                Store (Or (Arg0, One), TXSA)
-                Store (Arg1, HCOM)
-                Store (0x54, HCON)
-                Store (0x0FA0, Local0)
-                While (LAnd (LNot (And (HSTS, 0x80)), Local0))
-                {
-                    Decrement (Local0)
-                    Stall (0x32)
-                }
-
-                If (LNot (Local0))
-                {
-                    KILL ()
-                    Return (Zero)
-                }
-
-                Store (DAT0, Index (TBUF, Zero))
-                Store (0x80, HSTS)
-                Store (One, Local1)
-                While (LLess (Local1, DerefOf (Index (TBUF, Zero))))
-                {
-                    Store (0x0FA0, Local0)
-                    While (LAnd (LNot (And (HSTS, 0x80)), Local0))
-                    {
-                        Decrement (Local0)
-                        Stall (0x32)
-                    }
-
-                    If (LNot (Local0))
-                    {
-                        KILL ()
-                        Return (Zero)
-                    }
-
-                    Store (HBDR, Index (TBUF, Local1))
-                    Store (0x80, HSTS)
-                    Increment (Local1)
-                }
-
-                If (COMP ())
-                {
-                    Or (HSTS, 0xFF, HSTS)
-                    Return (TBUF)
-                }
-
-                Return (Zero)
-            }
-
-            Method (STRT, 0, Serialized)
-            {
-                Store (0xC8, Local0)
-                While (Local0)
-                {
-                    If (And (HSTS, 0x40))
-                    {
-                        Decrement (Local0)
-                        Sleep (One)
-                        If (LEqual (Local0, Zero))
-                        {
-                            Return (One)
-                        }
-                    }
-                    Else
-                    {
-                        Store (Zero, Local0)
-                    }
-                }
-
-                Store (0x0FA0, Local0)
-                While (Local0)
-                {
-                    If (And (HSTS, One))
-                    {
-                        Decrement (Local0)
-                        Stall (0x32)
-                        If (LEqual (Local0, Zero))
-                        {
-                            KILL ()
-                        }
-                    }
-                    Else
-                    {
-                        Return (Zero)
-                    }
-                }
-
-                Return (One)
-            }
-
-            Method (COMP, 0, Serialized)
-            {
-                Store (0x0FA0, Local0)
-                While (Local0)
-                {
-                    If (And (HSTS, 0x02))
-                    {
-                        Return (One)
-                    }
-                    Else
-                    {
-                        Decrement (Local0)
-                        Stall (0x32)
-                        If (LEqual (Local0, Zero))
-                        {
-                            KILL ()
-                        }
-                    }
-                }
-
-                Return (Zero)
-            }
-
-            Method (KILL, 0, Serialized)
-            {
-                Or (HCON, 0x02, HCON)
-                Or (HSTS, 0xFF, HSTS)
-            }
-        }
-    }
-
-    Scope (_SB.PCI0.LPCB)
-    {
-        OperationRegion (CPSB, SystemMemory, 0xDABC5F98, 0x10)
-        Field (CPSB, AnyAcc, NoLock, Preserve)
-        {
-            RTCX,   1, 
-            SBB0,   7, 
-            SBB1,   8, 
-            SBB2,   8, 
-            SBB3,   8, 
-            SBB4,   8, 
-            SBB5,   8, 
-            SBB6,   8, 
-            SBB7,   8, 
-            SBB8,   8, 
-            SBB9,   8, 
-            SBBA,   8, 
-            SBBB,   8, 
-            SBBC,   8, 
-            SBBD,   8, 
-            SBBE,   8, 
-            SBBF,   8
-        }
-
-        Method (SPTS, 1, NotSerialized)
-        {
-            Store (One, SLPX)
-            Store (One, SLPE)
-        }
-
-        Method (SWAK, 1, NotSerialized)
-        {
-            Store (Zero, SLPE)
-            If (RTCX) {}
-            Else
-            {
-                Notify (PWRB, 0x02)
-            }
-        }
-
-        OperationRegion (SMIE, SystemIO, PMBS, 0x04)
-        Field (SMIE, ByteAcc, NoLock, Preserve)
-        {
-                ,   10, 
-            RTCS,   1, 
-                ,   3, 
-            PEXS,   1, 
-            WAKS,   1, 
-                    Offset (0x03), 
-            PWBT,   1, 
-                    Offset (0x04)
-        }
-
-        OperationRegion (SLPR, SystemIO, SMCR, 0x08)
-        Field (SLPR, ByteAcc, NoLock, Preserve)
-        {
-                ,   4, 
-            SLPE,   1, 
-                ,   31, 
-            SLPX,   1, 
-                    Offset (0x08)
-        }
-    }
-
-    Scope (_SB.PCI0.RP01)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.RP02)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.RP03)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.RP04)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.RP05)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.RP06)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.RP07)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.RP08)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    OperationRegion (_SB.PCI0.LPCB.LPCR, PCI_Config, 0x80, 0x04)
-    Field (\_SB.PCI0.LPCB.LPCR, ByteAcc, NoLock, Preserve)
-    {
-        CADR,   3, 
-            ,   1, 
-        CBDR,   3, 
-                Offset (0x01), 
-        LTDR,   2, 
-            ,   2, 
-        FDDR,   1, 
-                Offset (0x02), 
-        CALE,   1, 
-        CBLE,   1, 
-        LTLE,   1, 
-        FDLE,   1, 
-                Offset (0x03), 
-        GLLE,   1, 
-        GHLE,   1, 
-        KCLE,   1, 
-        MCLE,   1, 
-        C1LE,   1, 
-        C2LE,   1, 
-                Offset (0x04)
-    }
-
-    Method (UXDV, 1, NotSerialized)
-    {
-        Store (0xFF, Local0)
-        Name (_T_0, Zero)
-        Store (Add (Arg0, Zero), _T_0)
-        If (LEqual (_T_0, 0x03F8))
-        {
-            Store (Zero, Local0)
-        }
-        Else
-        {
-            If (LEqual (_T_0, 0x02F8))
-            {
-                Store (One, Local0)
-            }
-            Else
-            {
-                If (LEqual (_T_0, 0x0220))
-                {
-                    Store (0x02, Local0)
-                }
-                Else
-                {
-                    If (LEqual (_T_0, 0x0228))
-                    {
-                        Store (0x03, Local0)
-                    }
-                    Else
-                    {
-                        If (LEqual (_T_0, 0x0238))
-                        {
-                            Store (0x04, Local0)
-                        }
-                        Else
-                        {
-                            If (LEqual (_T_0, 0x02E8))
-                            {
-                                Store (0x05, Local0)
-                            }
-                            Else
-                            {
-                                If (LEqual (_T_0, 0x0338))
-                                {
-                                    Store (0x06, Local0)
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, 0x03E8))
-                                    {
-                                        Store (0x07, Local0)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Return (Local0)
-    }
-
-    Method (RRIO, 4, NotSerialized)
-    {
-        Name (_T_0, Zero)
-        Store (Add (Arg0, Zero), _T_0)
-        If (LEqual (_T_0, Zero))
-        {
-            Store (Zero, CALE)
-            Store (UXDV (Arg2), Local0)
-            If (LNotEqual (Local0, 0xFF))
-            {
-                Store (Local0, CADR)
-            }
-
-            If (Arg1)
-            {
-                Store (One, CALE)
-            }
-        }
-        Else
-        {
-            If (LEqual (_T_0, One))
-            {
-                Store (Zero, CBLE)
-                Store (UXDV (Arg2), Local0)
-                If (LNotEqual (Local0, 0xFF))
-                {
-                    Store (Local0, CBDR)
-                }
-
-                If (Arg1)
-                {
-                    Store (One, CBLE)
-                }
-            }
-            Else
-            {
-                If (LEqual (_T_0, 0x02))
-                {
-                    Store (Zero, LTLE)
-                    If (LEqual (Arg2, 0x0378))
-                    {
-                        Store (Zero, LTDR)
-                    }
-
-                    If (LEqual (Arg2, 0x0278))
-                    {
-                        Store (One, LTDR)
-                    }
-
-                    If (LEqual (Arg2, 0x03BC))
-                    {
-                        Store (0x02, LTDR)
-                    }
-
-                    If (Arg1)
-                    {
-                        Store (One, LTLE)
-                    }
-                }
-                Else
-                {
-                    If (LEqual (_T_0, 0x03))
-                    {
-                        Store (Zero, FDLE)
-                        If (LEqual (Arg2, 0x03F0))
-                        {
-                            Store (Zero, FDDR)
-                        }
-
-                        If (LEqual (Arg2, 0x0370))
-                        {
-                            Store (One, FDDR)
-                        }
-
-                        If (Arg1)
-                        {
-                            Store (One, FDLE)
-                        }
-                    }
-                    Else
-                    {
-                        If (LEqual (_T_0, 0x08))
-                        {
-                            If (LEqual (Arg2, 0x0200))
-                            {
-                                If (Arg1)
-                                {
-                                    Store (One, GLLE)
-                                }
-                                Else
-                                {
-                                    Store (Zero, GLLE)
-                                }
-                            }
-
-                            If (LEqual (Arg2, 0x0208))
-                            {
-                                If (Arg1)
-                                {
-                                    Store (One, GHLE)
-                                }
-                                Else
-                                {
-                                    Store (Zero, GHLE)
-                                }
-                            }
-                        }
-                        Else
-                        {
-                            If (LEqual (_T_0, 0x09))
-                            {
-                                If (LEqual (Arg2, 0x0200))
-                                {
-                                    If (Arg1)
-                                    {
-                                        Store (One, GLLE)
-                                    }
-                                    Else
-                                    {
-                                        Store (Zero, GLLE)
-                                    }
-                                }
-
-                                If (LEqual (Arg2, 0x0208))
-                                {
-                                    If (Arg1)
-                                    {
-                                        Store (One, GHLE)
-                                    }
-                                    Else
-                                    {
-                                        Store (Zero, GHLE)
-                                    }
-                                }
-                            }
-                            Else
-                            {
-                                If (LEqual (_T_0, 0x0A))
-                                {
-                                    If (LOr (LEqual (Arg2, 0x60), LEqual (Arg2, 0x64)))
-                                    {
-                                        If (Arg1)
-                                        {
-                                            Store (One, KCLE)
-                                        }
-                                        Else
-                                        {
-                                            Store (Zero, KCLE)
-                                        }
-                                    }
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, 0x0B))
-                                    {
-                                        If (LOr (LEqual (Arg2, 0x62), LEqual (Arg2, 0x66)))
-                                        {
-                                            If (Arg1)
-                                            {
-                                                Store (One, MCLE)
-                                            }
-                                            Else
-                                            {
-                                                Store (Zero, MCLE)
-                                            }
-                                        }
-                                    }
-                                    Else
-                                    {
-                                        If (LEqual (_T_0, 0x0C))
-                                        {
-                                            If (LEqual (Arg2, 0x2E))
-                                            {
-                                                If (Arg1)
-                                                {
-                                                    Store (One, C1LE)
-                                                }
-                                                Else
-                                                {
-                                                    Store (Zero, C1LE)
-                                                }
-                                            }
-
-                                            If (LEqual (Arg2, 0x4E))
-                                            {
-                                                If (Arg1)
-                                                {
-                                                    Store (One, C2LE)
-                                                }
-                                                Else
-                                                {
-                                                    Store (Zero, C2LE)
-                                                }
-                                            }
-                                        }
-                                        Else
-                                        {
-                                            If (LEqual (_T_0, 0x0D))
-                                            {
-                                                If (LEqual (Arg2, 0x2E))
-                                                {
-                                                    If (Arg1)
-                                                    {
-                                                        Store (One, C1LE)
-                                                    }
-                                                    Else
-                                                    {
-                                                        Store (Zero, C1LE)
-                                                    }
-                                                }
-
-                                                If (LEqual (Arg2, 0x4E))
-                                                {
-                                                    If (Arg1)
-                                                    {
-                                                        Store (One, C2LE)
-                                                    }
-                                                    Else
-                                                    {
-                                                        Store (Zero, C2LE)
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Method (RDMA, 3, NotSerialized)
-    {
-    }
-
-    Scope (_SB.PCI0)
-    {
-        Method (NPTS, 1, NotSerialized)
-        {
-        }
-
-        Method (NWAK, 1, NotSerialized)
-        {
-        }
-    }
-
-    Scope (_SB.PCI0.PEG0)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.PEG0.PEGP)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.PEG1)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.PEG2)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0.PEG3)
-    {
-        Method (_PRW, 0, NotSerialized)
-        {
-            Return (GPRW (0x09, 0x04))
-        }
-    }
-
-    Scope (_SB.PCI0)
-    {
-        Device (GFX0)
-        {
-            Name (_ADR, 0x00020000)
-            Method (PCPC, 0, NotSerialized)
-            {
-                If (ECON)
-                {
-                    Store (0x02, ^^LPCB.H_EC.SLPC)
-                }
-
-                ECST (0x6F)
-            }
-
-            Method (PAPR, 0, NotSerialized)
-            {
-                If (ECON)
-                {
-                    Return (Divide (^^LPCB.H_EC.MCAP, 0x64, ))
-                }
-                Else
-                {
-                    Return (Zero)
-                }
-            }
-
-            Method (_DOS, 1, NotSerialized)
-            {
-                Store (And (Arg0, 0x07), DSEN)
-                If (LEqual (And (Arg0, 0x03), Zero))
-                {
-                    If (CondRefOf (HDOS))
-                    {
-                        HDOS ()
-                    }
-                }
-            }
-
-            Method (_DOD, 0, NotSerialized)
-            {
-                If (CondRefOf (IDAB))
-                {
-                    IDAB ()
-                }
-                Else
-                {
-                    Store (Zero, NDID)
-                    If (LNotEqual (DIDL, Zero))
-                    {
-                        Store (SDDL (DIDL), DID1)
-                    }
-
-                    If (LNotEqual (DDL2, Zero))
-                    {
-                        Store (SDDL (DDL2), DID2)
-                    }
-
-                    If (LNotEqual (DDL3, Zero))
-                    {
-                        Store (SDDL (DDL3), DID3)
-                    }
-
-                    If (LNotEqual (DDL4, Zero))
-                    {
-                        Store (SDDL (DDL4), DID4)
-                    }
-
-                    If (LNotEqual (DDL5, Zero))
-                    {
-                        Store (SDDL (DDL5), DID5)
-                    }
-
-                    If (LNotEqual (DDL6, Zero))
-                    {
-                        Store (SDDL (DDL6), DID6)
-                    }
-
-                    If (LNotEqual (DDL7, Zero))
-                    {
-                        Store (SDDL (DDL7), DID7)
-                    }
-
-                    If (LNotEqual (DDL8, Zero))
-                    {
-                        Store (SDDL (DDL8), DID8)
-                    }
-                }
-
-                If (LEqual (NDID, One))
-                {
-                    Name (TMP1, Package (0x01)
-                    {
-                        0xFFFFFFFF
-                    })
-                    Store (Or (0x00010000, DID1), Index (TMP1, Zero))
-                    Return (TMP1)
-                }
-
-                If (LEqual (NDID, 0x02))
-                {
-                    Name (TMP2, Package (0x02)
-                    {
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF
-                    })
-                    Store (Or (0x00010000, DID1), Index (TMP2, Zero))
-                    Store (Or (0x00010000, DID2), Index (TMP2, One))
-                    Return (TMP2)
-                }
-
-                If (LEqual (NDID, 0x03))
-                {
-                    Name (TMP3, Package (0x03)
-                    {
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF
-                    })
-                    Store (Or (0x00010000, DID1), Index (TMP3, Zero))
-                    Store (Or (0x00010000, DID2), Index (TMP3, One))
-                    Store (Or (0x00010000, DID3), Index (TMP3, 0x02))
-                    Return (TMP3)
-                }
-
-                If (LEqual (NDID, 0x04))
-                {
-                    Name (TMP4, Package (0x04)
-                    {
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF
-                    })
-                    Store (Or (0x00010000, DID1), Index (TMP4, Zero))
-                    Store (Or (0x00010000, DID2), Index (TMP4, One))
-                    Store (Or (0x00010000, DID3), Index (TMP4, 0x02))
-                    Store (Or (0x00010000, DID4), Index (TMP4, 0x03))
-                    Return (TMP4)
-                }
-
-                If (LEqual (NDID, 0x05))
-                {
-                    Name (TMP5, Package (0x05)
-                    {
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF
-                    })
-                    Store (Or (0x00010000, DID1), Index (TMP5, Zero))
-                    Store (Or (0x00010000, DID2), Index (TMP5, One))
-                    Store (Or (0x00010000, DID3), Index (TMP5, 0x02))
-                    Store (Or (0x00010000, DID4), Index (TMP5, 0x03))
-                    Store (Or (0x00010000, DID5), Index (TMP5, 0x04))
-                    Return (TMP5)
-                }
-
-                If (LEqual (NDID, 0x06))
-                {
-                    Name (TMP6, Package (0x06)
-                    {
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF
-                    })
-                    Store (Or (0x00010000, DID1), Index (TMP6, Zero))
-                    Store (Or (0x00010000, DID2), Index (TMP6, One))
-                    Store (Or (0x00010000, DID3), Index (TMP6, 0x02))
-                    Store (Or (0x00010000, DID4), Index (TMP6, 0x03))
-                    Store (Or (0x00010000, DID5), Index (TMP6, 0x04))
-                    Store (Or (0x00010000, DID6), Index (TMP6, 0x05))
-                    Return (TMP6)
-                }
-
-                If (LEqual (NDID, 0x07))
-                {
-                    Name (TMP7, Package (0x07)
-                    {
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF
-                    })
-                    Store (Or (0x00010000, DID1), Index (TMP7, Zero))
-                    Store (Or (0x00010000, DID2), Index (TMP7, One))
-                    Store (Or (0x00010000, DID3), Index (TMP7, 0x02))
-                    Store (Or (0x00010000, DID4), Index (TMP7, 0x03))
-                    Store (Or (0x00010000, DID5), Index (TMP7, 0x04))
-                    Store (Or (0x00010000, DID6), Index (TMP7, 0x05))
-                    Store (Or (0x00010000, DID7), Index (TMP7, 0x06))
-                    Return (TMP7)
-                }
-
-                If (LEqual (NDID, 0x08))
-                {
-                    Name (TMP8, Package (0x08)
-                    {
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF, 
-                        0xFFFFFFFF
-                    })
-                    Store (Or (0x00010000, DID1), Index (TMP8, Zero))
-                    Store (Or (0x00010000, DID2), Index (TMP8, One))
-                    Store (Or (0x00010000, DID3), Index (TMP8, 0x02))
-                    Store (Or (0x00010000, DID4), Index (TMP8, 0x03))
-                    Store (Or (0x00010000, DID5), Index (TMP8, 0x04))
-                    Store (Or (0x00010000, DID6), Index (TMP8, 0x05))
-                    Store (Or (0x00010000, DID7), Index (TMP8, 0x06))
-                    Store (Or (0x00010000, DID8), Index (TMP8, 0x07))
-                    Return (TMP8)
-                }
-
-                If (LEqual (NDID, 0x09))
-                {
-                    If (CondRefOf (HWID))
-                    {
-                        Return (HWID)
-                    }
-                }
-
-                Return (Package (0x01)
-                {
-                    0x0400
-                })
-            }
-
-            Device (DD01)
-            {
-                Method (_ADR, 0, Serialized)
-                {
-                    If (LEqual (DID1, Zero))
-                    {
-                        Return (One)
-                    }
-                    Else
-                    {
-                        Return (And (0xFFFF, DID1))
-                    }
-                }
-
-                Method (_DCS, 0, NotSerialized)
-                {
-                    Return (CDDS (DID1))
-                }
-
-                Method (_DGS, 0, NotSerialized)
-                {
-                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
-                        )))
-                    {
-                        Return (NXD1)
-                    }
-
-                    Return (NDDS (DID1))
-                }
-
-                Method (_DSS, 1, NotSerialized)
-                {
-                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
-                    {
-                        Store (NSTE, CSTE)
-                    }
-                }
-            }
-
-            Device (DD02)
-            {
-                Method (_ADR, 0, Serialized)
-                {
-                    If (LEqual (DID2, Zero))
-                    {
-                        Return (0x02)
-                    }
-                    Else
-                    {
-                        Return (And (0xFFFF, DID2))
-                    }
-                }
-
-                Method (_DCS, 0, NotSerialized)
-                {
-                    If (LEqual (LIDS, Zero))
-                    {
-                        Return (Zero)
-                    }
-
-                    Return (CDDS (DID2))
-                }
-
-                Method (_DGS, 0, NotSerialized)
-                {
-                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
-                        )))
-                    {
-                        Return (NXD2)
-                    }
-
-                    Return (NDDS (DID2))
-                }
-
-                Method (_DSS, 1, NotSerialized)
-                {
-                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
-                    {
-                        Store (NSTE, CSTE)
-                    }
-                }
-
-                Method (_BCL, 0, NotSerialized)
-                {
-                    Return (Package (0x17)
-                    {
-                        0x50, 
-                        0x32, 
-                        Zero, 
-                        0x05, 
-                        0x0A, 
-                        0x0F, 
-                        0x14, 
-                        0x19, 
-                        0x1E, 
-                        0x23, 
-                        0x28, 
-                        0x2D, 
-                        0x32, 
-                        0x37, 
-                        0x3C, 
-                        0x41, 
-                        0x46, 
-                        0x4B, 
-                        0x50, 
-                        0x55, 
-                        0x5A, 
-                        0x5F, 
-                        0x64
-                    })
-                }
-
-                Method (_BCM, 1, NotSerialized)
-                {
-                    If (LAnd (LGreaterEqual (Arg0, Zero), LLessEqual (Arg0, 0x64)))
-                    {
-                        AINT (One, Arg0)
-                        Store (Arg0, BRTL)
-                    }
-                }
-
-                Method (_BQC, 0, NotSerialized)
-                {
-                    Return (BRTL)
-                }
-            }
-
-            Device (DD03)
-            {
-                Method (_ADR, 0, Serialized)
-                {
-                    If (LEqual (DID3, Zero))
-                    {
-                        Return (0x03)
-                    }
-                    Else
-                    {
-                        Return (And (0xFFFF, DID3))
-                    }
-                }
-
-                Method (_DCS, 0, NotSerialized)
-                {
-                    If (LEqual (DID3, Zero))
-                    {
-                        Return (0x0B)
-                    }
-                    Else
-                    {
-                        Return (CDDS (DID3))
-                    }
-                }
-
-                Method (_DGS, 0, NotSerialized)
-                {
-                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
-                        )))
-                    {
-                        Return (NXD3)
-                    }
-
-                    Return (NDDS (DID3))
-                }
-
-                Method (_DSS, 1, NotSerialized)
-                {
-                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
-                    {
-                        Store (NSTE, CSTE)
-                    }
-                }
-            }
-
-            Device (DD04)
-            {
-                Method (_ADR, 0, Serialized)
-                {
-                    If (LEqual (DID4, Zero))
-                    {
-                        Return (0x04)
-                    }
-                    Else
-                    {
-                        Return (And (0xFFFF, DID4))
-                    }
-                }
-
-                Method (_DCS, 0, NotSerialized)
-                {
-                    If (LEqual (DID4, Zero))
-                    {
-                        Return (0x0B)
-                    }
-                    Else
-                    {
-                        Return (CDDS (DID4))
-                    }
-                }
-
-                Method (_DGS, 0, NotSerialized)
-                {
-                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
-                        )))
-                    {
-                        Return (NXD4)
-                    }
-
-                    Return (NDDS (DID4))
-                }
-
-                Method (_DSS, 1, NotSerialized)
-                {
-                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
-                    {
-                        Store (NSTE, CSTE)
-                    }
-                }
-            }
-
-            Device (DD05)
-            {
-                Method (_ADR, 0, Serialized)
-                {
-                    If (LEqual (DID5, Zero))
-                    {
-                        Return (0x05)
-                    }
-                    Else
-                    {
-                        Return (And (0xFFFF, DID5))
-                    }
-                }
-
-                Method (_DCS, 0, NotSerialized)
-                {
-                    If (LEqual (DID5, Zero))
-                    {
-                        Return (0x0B)
-                    }
-                    Else
-                    {
-                        Return (CDDS (DID5))
-                    }
-                }
-
-                Method (_DGS, 0, NotSerialized)
-                {
-                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
-                        )))
-                    {
-                        Return (NXD5)
-                    }
-
-                    Return (NDDS (DID5))
-                }
-
-                Method (_DSS, 1, NotSerialized)
-                {
-                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
-                    {
-                        Store (NSTE, CSTE)
-                    }
-                }
-            }
-
-            Device (DD06)
-            {
-                Method (_ADR, 0, Serialized)
-                {
-                    If (LEqual (DID6, Zero))
-                    {
-                        Return (0x06)
-                    }
-                    Else
-                    {
-                        Return (And (0xFFFF, DID6))
-                    }
-                }
-
-                Method (_DCS, 0, NotSerialized)
-                {
-                    If (LEqual (DID6, Zero))
-                    {
-                        Return (0x0B)
-                    }
-                    Else
-                    {
-                        Return (CDDS (DID6))
-                    }
-                }
-
-                Method (_DGS, 0, NotSerialized)
-                {
-                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
-                        )))
-                    {
-                        Return (NXD6)
-                    }
-
-                    Return (NDDS (DID6))
-                }
-
-                Method (_DSS, 1, NotSerialized)
-                {
-                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
-                    {
-                        Store (NSTE, CSTE)
-                    }
-                }
-            }
-
-            Device (DD07)
-            {
-                Method (_ADR, 0, Serialized)
-                {
-                    If (LEqual (DID7, Zero))
-                    {
-                        Return (0x07)
-                    }
-                    Else
-                    {
-                        Return (And (0xFFFF, DID7))
-                    }
-                }
-
-                Method (_DCS, 0, NotSerialized)
-                {
-                    If (LEqual (DID7, Zero))
-                    {
-                        Return (0x0B)
-                    }
-                    Else
-                    {
-                        Return (CDDS (DID7))
-                    }
-                }
-
-                Method (_DGS, 0, NotSerialized)
-                {
-                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
-                        )))
-                    {
-                        Return (NXD7)
-                    }
-
-                    Return (NDDS (DID7))
-                }
-
-                Method (_DSS, 1, NotSerialized)
-                {
-                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
-                    {
-                        Store (NSTE, CSTE)
-                    }
-                }
-            }
-
-            Device (DD08)
-            {
-                Method (_ADR, 0, Serialized)
-                {
-                    If (LEqual (DID8, Zero))
-                    {
-                        Return (0x08)
-                    }
-                    Else
-                    {
-                        Return (And (0xFFFF, DID8))
-                    }
-                }
-
-                Method (_DCS, 0, NotSerialized)
-                {
-                    If (LEqual (DID8, Zero))
-                    {
-                        Return (0x0B)
-                    }
-                    Else
-                    {
-                        Return (CDDS (DID8))
-                    }
-                }
-
-                Method (_DGS, 0, NotSerialized)
-                {
-                    If (LAnd (LEqual (And (SGMD, 0x7F), One), CondRefOf (SNXD
-                        )))
-                    {
-                        Return (NXD8)
-                    }
-
-                    Return (NDDS (DID8))
-                }
-
-                Method (_DSS, 1, NotSerialized)
-                {
-                    If (LEqual (And (Arg0, 0xC0000000), 0xC0000000))
-                    {
-                        Store (NSTE, CSTE)
-                    }
-                }
-            }
-
-            Method (SDDL, 1, NotSerialized)
-            {
-                Increment (NDID)
-                Store (And (Arg0, 0x0F0F), Local0)
-                Or (0x80000000, Local0, Local1)
-                If (LEqual (DIDL, Local0))
-                {
-                    Return (Local1)
-                }
-
-                If (LEqual (DDL2, Local0))
-                {
-                    Return (Local1)
-                }
-
-                If (LEqual (DDL3, Local0))
-                {
-                    Return (Local1)
-                }
-
-                If (LEqual (DDL4, Local0))
-                {
-                    Return (Local1)
-                }
-
-                If (LEqual (DDL5, Local0))
-                {
-                    Return (Local1)
-                }
-
-                If (LEqual (DDL6, Local0))
-                {
-                    Return (Local1)
-                }
-
-                If (LEqual (DDL7, Local0))
-                {
-                    Return (Local1)
-                }
-
-                If (LEqual (DDL8, Local0))
-                {
-                    Return (Local1)
-                }
-
-                Return (Zero)
-            }
-
-            Method (CDDS, 1, NotSerialized)
-            {
-                Store (And (Arg0, 0x0F0F), Local0)
-                If (LEqual (Zero, Local0))
-                {
-                    Return (0x1D)
-                }
-
-                If (LEqual (CADL, Local0))
-                {
-                    Return (0x1F)
-                }
-
-                If (LEqual (CAL2, Local0))
-                {
-                    Return (0x1F)
-                }
-
-                If (LEqual (CAL3, Local0))
-                {
-                    Return (0x1F)
-                }
-
-                If (LEqual (CAL4, Local0))
-                {
-                    Return (0x1F)
-                }
-
-                If (LEqual (CAL5, Local0))
-                {
-                    Return (0x1F)
-                }
-
-                If (LEqual (CAL6, Local0))
-                {
-                    Return (0x1F)
-                }
-
-                If (LEqual (CAL7, Local0))
-                {
-                    Return (0x1F)
-                }
-
-                If (LEqual (CAL8, Local0))
-                {
-                    Return (0x1F)
-                }
-
-                Return (0x1D)
-            }
-
-            Method (NDDS, 1, NotSerialized)
-            {
-                Store (And (Arg0, 0x0F0F), Local0)
-                If (LEqual (Zero, Local0))
-                {
-                    Return (Zero)
-                }
-
-                If (LEqual (NADL, Local0))
-                {
-                    Return (One)
-                }
-
-                If (LEqual (NDL2, Local0))
-                {
-                    Return (One)
-                }
-
-                If (LEqual (NDL3, Local0))
-                {
-                    Return (One)
-                }
-
-                If (LEqual (NDL4, Local0))
-                {
-                    Return (One)
-                }
-
-                If (LEqual (NDL5, Local0))
-                {
-                    Return (One)
-                }
-
-                If (LEqual (NDL6, Local0))
-                {
-                    Return (One)
-                }
-
-                If (LEqual (NDL7, Local0))
-                {
-                    Return (One)
-                }
-
-                If (LEqual (NDL8, Local0))
-                {
-                    Return (One)
-                }
-
-                Return (Zero)
-            }
-
-            Scope (^^PCI0)
-            {
-                OperationRegion (MCHP, PCI_Config, 0x40, 0xC0)
-                Field (MCHP, AnyAcc, NoLock, Preserve)
-                {
-                            Offset (0x60), 
-                    TASM,   10, 
-                            Offset (0x62)
-                }
-            }
-
-            OperationRegion (IGDP, PCI_Config, 0x40, 0xC0)
-            Field (IGDP, AnyAcc, NoLock, Preserve)
-            {
-                        Offset (0x12), 
-                    ,   1, 
-                GIVD,   1, 
-                    ,   2, 
-                GUMA,   3, 
-                        Offset (0x14), 
-                    ,   4, 
-                GMFN,   1, 
-                        Offset (0x18), 
-                        Offset (0xA4), 
-                ASLE,   8, 
-                        Offset (0xA8), 
-                GSSE,   1, 
-                GSSB,   14, 
-                GSES,   1, 
-                        Offset (0xB0), 
-                    ,   12, 
-                CDVL,   1, 
-                        Offset (0xB2), 
-                        Offset (0xB5), 
-                LBPC,   8, 
-                        Offset (0xBC), 
-                ASLS,   32
-            }
-
-            OperationRegion (IGDM, SystemMemory, ASLB, 0x2000)
-            Field (IGDM, AnyAcc, NoLock, Preserve)
-            {
-                SIGN,   128, 
-                SIZE,   32, 
-                OVER,   32, 
-                SVER,   256, 
-                VVER,   128, 
-                GVER,   128, 
-                MBOX,   32, 
-                DMOD,   32, 
-                        Offset (0x100), 
-                DRDY,   32, 
-                CSTS,   32, 
-                CEVT,   32, 
-                        Offset (0x120), 
-                DIDL,   32, 
-                DDL2,   32, 
-                DDL3,   32, 
-                DDL4,   32, 
-                DDL5,   32, 
-                DDL6,   32, 
-                DDL7,   32, 
-                DDL8,   32, 
-                CPDL,   32, 
-                CPL2,   32, 
-                CPL3,   32, 
-                CPL4,   32, 
-                CPL5,   32, 
-                CPL6,   32, 
-                CPL7,   32, 
-                CPL8,   32, 
-                CADL,   32, 
-                CAL2,   32, 
-                CAL3,   32, 
-                CAL4,   32, 
-                CAL5,   32, 
-                CAL6,   32, 
-                CAL7,   32, 
-                CAL8,   32, 
-                NADL,   32, 
-                NDL2,   32, 
-                NDL3,   32, 
-                NDL4,   32, 
-                NDL5,   32, 
-                NDL6,   32, 
-                NDL7,   32, 
-                NDL8,   32, 
-                ASLP,   32, 
-                TIDX,   32, 
-                CHPD,   32, 
-                CLID,   32, 
-                CDCK,   32, 
-                SXSW,   32, 
-                EVTS,   32, 
-                CNOT,   32, 
-                NRDY,   32, 
-                        Offset (0x200), 
-                SCIE,   1, 
-                GEFC,   4, 
-                GXFC,   3, 
-                GESF,   8, 
-                        Offset (0x204), 
-                PARM,   32, 
-                DSLP,   32, 
-                        Offset (0x300), 
-                ARDY,   32, 
-                ASLC,   32, 
-                TCHE,   32, 
-                ALSI,   32, 
-                BCLP,   32, 
-                PFIT,   32, 
-                CBLV,   32, 
-                BCLM,   320, 
-                CPFM,   32, 
-                EPFM,   32, 
-                PLUT,   592, 
-                PFMB,   32, 
-                CCDV,   32, 
-                PCFT,   32, 
-                        Offset (0x400), 
-                GVD1,   49152, 
-                PHED,   32, 
-                BDDC,   2048
-            }
-
-            Name (DBTB, Package (0x15)
-            {
-                Zero, 
-                0x07, 
-                0x38, 
-                0x01C0, 
-                0x0E00, 
-                0x3F, 
-                0x01C7, 
-                0x0E07, 
-                0x01F8, 
-                0x0E38, 
-                0x0FC0, 
-                Zero, 
-                Zero, 
-                Zero, 
-                Zero, 
-                Zero, 
-                0x7000, 
-                0x7007, 
-                0x7038, 
-                0x71C0, 
-                0x7E00
-            })
-            Name (CDCT, Package (0x05)
-            {
-                Package (0x02)
-                {
-                    0xE4, 
-                    0x0140
-                }, 
-
-                Package (0x02)
-                {
-                    0xDE, 
-                    0x014D
-                }, 
-
-                Package (0x02)
-                {
-                    0xDE, 
-                    0x014D
-                }, 
-
-                Package (0x02)
-                {
-                    Zero, 
-                    Zero
-                }, 
-
-                Package (0x02)
-                {
-                    0xDE, 
-                    0x014D
-                }
-            })
-            Name (SUCC, One)
-            Name (NVLD, 0x02)
-            Name (CRIT, 0x04)
-            Name (NCRT, 0x06)
-            Method (GSCI, 0, Serialized)
-            {
-                Method (GBDA, 0, Serialized)
-                {
-                    If (LEqual (GESF, Zero))
-                    {
-                        Store (0x0679, PARM)
-                        Store (Zero, GESF)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, One))
-                    {
-                        Store (0x0240, PARM)
-                        Store (Zero, GESF)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x04))
-                    {
-                        And (PARM, 0xEFFF0000, PARM)
-                        And (PARM, ShiftLeft (DerefOf (Index (DBTB, IBTT)), 0x10), 
-                            PARM)
-                        Or (IBTT, PARM, PARM)
-                        Store (Zero, GESF)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x05))
-                    {
-                        Store (IPSC, PARM)
-                        Or (PARM, ShiftLeft (IPAT, 0x08), PARM)
-                        Add (PARM, 0x0100, PARM)
-                        Or (PARM, ShiftLeft (LIDS, 0x10), PARM)
-                        Add (PARM, 0x00010000, PARM)
-                        Or (PARM, ShiftLeft (IBIA, 0x14), PARM)
-                        Store (Zero, GESF)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x06))
-                    {
-                        Store (ITVF, PARM)
-                        Or (PARM, ShiftLeft (ITVM, 0x04), PARM)
-                        Store (Zero, GESF)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x07))
-                    {
-                        Store (GIVD, PARM)
-                        XOr (PARM, One, PARM)
-                        Or (PARM, ShiftLeft (GMFN, One), PARM)
-                        Or (PARM, 0x1800, PARM)
-                        Or (PARM, ShiftLeft (IDMS, 0x11), PARM)
-                        Or (ShiftLeft (DerefOf (Index (DerefOf (Index (CDCT, HVCO)), CDVL
-                            )), 0x15), PARM, PARM)
-                        Store (One, GESF)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x0A))
-                    {
-                        Store (Zero, PARM)
-                        If (ISSC)
-                        {
-                            Or (PARM, 0x03, PARM)
-                        }
-
-                        Store (Zero, GESF)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x0B))
-                    {
-                        Store (KSV0, PARM)
-                        Store (KSV1, GESF)
-                        Return (SUCC)
-                    }
-
-                    Store (Zero, GESF)
-                    Return (CRIT)
-                }
-
-                Method (SBCB, 0, Serialized)
-                {
-                    If (LEqual (GESF, Zero))
-                    {
-                        Store (Zero, PARM)
-                        Store (0x000F87FD, PARM)
-                        Store (Zero, GESF)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, One))
-                    {
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x03))
-                    {
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x04))
-                    {
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x05))
-                    {
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x06))
-                    {
-                        Store (And (PARM, 0x0F), ITVF)
-                        Store (ShiftRight (And (PARM, 0xF0), 0x04), ITVM)
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x07))
-                    {
-                        If (LEqual (PARM, Zero))
-                        {
-                            Store (CLID, Local0)
-                            If (And (0x80000000, Local0))
-                            {
-                                And (CLID, 0x0F, CLID)
-                                GLID (CLID)
-                            }
-                        }
-
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x08))
-                    {
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x09))
-                    {
-                        And (PARM, 0xFF, IBTT)
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x0A))
-                    {
-                        And (PARM, 0xFF, IPSC)
-                        If (And (ShiftRight (PARM, 0x08), 0xFF))
-                        {
-                            And (ShiftRight (PARM, 0x08), 0xFF, IPAT)
-                            Decrement (IPAT)
-                        }
-
-                        And (ShiftRight (PARM, 0x14), 0x07, IBIA)
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x0B))
-                    {
-                        And (ShiftRight (PARM, One), One, IF1E)
-                        If (And (PARM, 0x0001E000))
-                        {
-                            And (ShiftRight (PARM, 0x0D), 0x0F, IDMS)
-                        }
-                        Else
-                        {
-                            And (ShiftRight (PARM, 0x11), 0x0F, IDMS)
-                        }
-
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x10))
-                    {
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x11))
-                    {
-                        Store (ShiftLeft (LIDS, 0x08), PARM)
-                        Add (PARM, 0x0100, PARM)
-                        Store (Zero, GESF)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x12))
-                    {
-                        If (And (PARM, One))
-                        {
-                            If (LEqual (ShiftRight (PARM, One), One))
-                            {
-                                Store (One, ISSC)
-                            }
-                            Else
-                            {
-                                Store (Zero, GESF)
-                                Return (CRIT)
-                            }
-                        }
-                        Else
-                        {
-                            Store (Zero, ISSC)
-                        }
-
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x13))
-                    {
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    If (LEqual (GESF, 0x14))
-                    {
-                        And (PARM, 0x0F, PAVP)
-                        Store (Zero, GESF)
-                        Store (Zero, PARM)
-                        Return (SUCC)
-                    }
-
-                    Store (Zero, GESF)
-                    Return (SUCC)
-                }
-
-                If (LEqual (GEFC, 0x04))
-                {
-                    Store (GBDA (), GXFC)
-                }
-
-                If (LEqual (GEFC, 0x06))
-                {
-                    Store (SBCB (), GXFC)
-                }
-
-                Store (Zero, GEFC)
-                Store (One, SCIS)
-                Store (Zero, GSSE)
-                Store (Zero, SCIE)
-                Return (Zero)
-            }
-
-            Method (PDRD, 0, NotSerialized)
-            {
-                If (LNot (DRDY))
-                {
-                    Sleep (ASLP)
-                }
-
-                Return (LNot (DRDY))
-            }
-
-            Method (PSTS, 0, NotSerialized)
-            {
-                If (LGreater (CSTS, 0x02))
-                {
-                    Sleep (ASLP)
-                }
-
-                Return (LEqual (CSTS, 0x03))
-            }
-
-            Method (GNOT, 2, NotSerialized)
-            {
-                If (PDRD ())
-                {
-                    Return (One)
-                }
-
-                Store (Arg0, CEVT)
-                Store (0x03, CSTS)
-                If (LAnd (LEqual (CHPD, Zero), LEqual (Arg1, Zero)))
-                {
-                    If (LOr (LGreater (OSYS, 0x07D0), LLess (OSYS, 0x07D6)))
-                    {
-                        Notify (PCI0, Arg1)
-                    }
-                    Else
-                    {
-                        Notify (GFX0, Arg1)
-                    }
-                }
-
-                If (CondRefOf (HNOT))
-                {
-                    HNOT (Arg0)
-                }
-                Else
-                {
-                    Notify (GFX0, 0x80)
-                }
-
-                Return (Zero)
-            }
-
-            Method (GHDS, 1, NotSerialized)
-            {
-                Store (Arg0, TIDX)
-                Return (GNOT (One, Zero))
-            }
-
-            Method (GLID, 1, NotSerialized)
-            {
-                If (LEqual (Arg0, One))
-                {
-                    Store (0x03, CLID)
-                }
-                Else
-                {
-                    Store (Arg0, CLID)
-                }
-
-                Return (GNOT (0x02, Zero))
-            }
-
-            Method (GDCK, 1, NotSerialized)
-            {
-                Store (Arg0, CDCK)
-                Return (GNOT (0x04, Zero))
-            }
-
-            Method (PARD, 0, NotSerialized)
-            {
-                If (LNot (ARDY))
-                {
-                    Sleep (ASLP)
-                }
-
-                Return (LNot (ARDY))
-            }
-
-            Method (AINT, 2, NotSerialized)
-            {
-                If (LNot (And (TCHE, ShiftLeft (One, Arg0))))
-                {
-                    Return (One)
-                }
-
-                If (PARD ())
-                {
-                    Return (One)
-                }
-
-                If (LEqual (Arg0, 0x02))
-                {
-                    If (CPFM)
-                    {
-                        And (CPFM, 0x0F, Local0)
-                        And (EPFM, 0x0F, Local1)
-                        If (LEqual (Local0, One))
-                        {
-                            If (And (Local1, 0x06))
-                            {
-                                Store (0x06, PFIT)
-                            }
-                            Else
-                            {
-                                If (And (Local1, 0x08))
-                                {
-                                    Store (0x08, PFIT)
-                                }
-                                Else
-                                {
-                                    Store (One, PFIT)
-                                }
-                            }
-                        }
-
-                        If (LEqual (Local0, 0x06))
-                        {
-                            If (And (Local1, 0x08))
-                            {
-                                Store (0x08, PFIT)
-                            }
-                            Else
-                            {
-                                If (And (Local1, One))
-                                {
-                                    Store (One, PFIT)
-                                }
-                                Else
-                                {
-                                    Store (0x06, PFIT)
-                                }
-                            }
-                        }
-
-                        If (LEqual (Local0, 0x08))
-                        {
-                            If (And (Local1, One))
-                            {
-                                Store (One, PFIT)
-                            }
-                            Else
-                            {
-                                If (And (Local1, 0x06))
-                                {
-                                    Store (0x06, PFIT)
-                                }
-                                Else
-                                {
-                                    Store (0x08, PFIT)
-                                }
-                            }
-                        }
-                    }
-                    Else
-                    {
-                        XOr (PFIT, 0x07, PFIT)
-                    }
-
-                    Or (PFIT, 0x80000000, PFIT)
-                    Store (0x04, ASLC)
-                }
-                Else
-                {
-                    If (LEqual (Arg0, One))
-                    {
-                        Store (Divide (Multiply (Arg1, 0xFF), 0x64, ), BCLP)
-                        Or (BCLP, 0x80000000, BCLP)
-                        Store (0x02, ASLC)
-                    }
-                    Else
-                    {
-                        If (LEqual (Arg0, Zero))
-                        {
-                            Store (Arg1, ALSI)
-                            Store (One, ASLC)
-                        }
-                        Else
-                        {
-                            Return (One)
-                        }
-                    }
-                }
-
-                Store (One, ASLE)
-                Return (Zero)
-            }
-
-            Method (SCIP, 0, NotSerialized)
-            {
-                If (LNotEqual (OVER, Zero))
-                {
-                    Return (LNot (GSMI))
-                }
-
-                Return (Zero)
-            }
-
-            Device (^^MEM2)
-            {
-                Name (_HID, EisaId ("PNP0C01"))
-                Name (_UID, 0x02)
-                Name (CRS1, ResourceTemplate ()
-                {
-                    Memory32Fixed (ReadWrite,
-                        0x20000000,         // Address Base
-                        0x00200000,         // Address Length
-                        )
-                    Memory32Fixed (ReadWrite,
-                        0x40000000,         // Address Base
-                        0x00200000,         // Address Length
-                        )
-                })
-                Name (CRS2, ResourceTemplate ()
-                {
-                    Memory32Fixed (ReadWrite,
-                        0x20000000,         // Address Base
-                        0x00200000,         // Address Length
-                        )
-                    Memory32Fixed (ReadWrite,
-                        0x40004000,         // Address Base
-                        0x00001000,         // Address Length
-                        )
-                })
-                Method (_STA, 0, NotSerialized)
-                {
-                    If (IGDS)
-                    {
-                        Return (0x0F)
-                    }
-
-                    Return (Zero)
-                }
-
-                Method (_CRS, 0, NotSerialized)
-                {
-                    If (LOr (LEqual (And (PNHM, 0x0FFF0FF0), 0x000206A0), LEqual (And (
-                        PNHM, 0x0FFF0FFF), 0x000306A0)))
-                    {
-                        Return (CRS1)
-                    }
-
-                    Return (CRS2)
-                }
-            }
-        }
-    }
-
-    Scope (_PR)
-    {
-        Processor (CPU0, 0x01, 0x00000410, 0x06) {}
-        Processor (CPU1, 0x02, 0x00000410, 0x06) {}
-        Processor (CPU2, 0x03, 0x00000410, 0x06) {}
-        Processor (CPU3, 0x04, 0x00000410, 0x06) {}
-        Processor (CPU4, 0x05, 0x00000410, 0x06) {}
-        Processor (CPU5, 0x06, 0x00000410, 0x06) {}
-        Processor (CPU6, 0x07, 0x00000410, 0x06) {}
-        Processor (CPU7, 0x08, 0x00000410, 0x06) {}
-    }
-
-    Mutex (MUTX, 0x00)
-    OperationRegion (DEB0, SystemIO, 0x80, One)
-    Field (DEB0, ByteAcc, NoLock, Preserve)
-    {
-        DBG8,   8
-    }
-
-    OperationRegion (DEB1, SystemIO, 0x90, 0x02)
-    Field (DEB1, WordAcc, NoLock, Preserve)
-    {
-        DBG9,   16
-    }
-
-    OperationRegion (PRT0, SystemIO, 0x80, 0x04)
-    Field (PRT0, DWordAcc, Lock, Preserve)
-    {
-        P80H,   32
-    }
-
-    Method (P8XH, 2, Serialized)
-    {
-        If (LEqual (Arg0, Zero))
-        {
-            Store (Or (And (P80D, 0xFFFFFF00), Arg1), P80D)
-        }
-
-        If (LEqual (Arg0, One))
-        {
-            Store (Or (And (P80D, 0xFFFF00FF), ShiftLeft (Arg1, 0x08)
-                ), P80D)
-        }
-
-        If (LEqual (Arg0, 0x02))
-        {
-            Store (Or (And (P80D, 0xFF00FFFF), ShiftLeft (Arg1, 0x10)
-                ), P80D)
-        }
-
-        If (LEqual (Arg0, 0x03))
-        {
-            Store (Or (And (P80D, 0x00FFFFFF), ShiftLeft (Arg1, 0x18)
-                ), P80D)
-        }
-
-        Store (P80D, P80H)
-    }
-
-    OperationRegion (SPRT, SystemIO, 0xB2, 0x02)
-    Field (SPRT, ByteAcc, Lock, Preserve)
-    {
-        SSMP,   8
-    }
-
-    Method (_PIC, 1, NotSerialized)
-    {
-        Store (Arg0, GPIC)
-        Store (Arg0, PICM)
-    }
-
-    Method (_PTS, 1, NotSerialized)
-    {
-        Store (Zero, P80D)
-        P8XH (Zero, Arg0)
-        PTS (Arg0)
-        If (LEqual (Arg0, 0x03))
-        {
-            If (LAnd (DTSE, LGreater (TCNT, One)))
-            {
-                TRAP (TRTD, 0x1E)
-            }
-        }
-
-        If (LOr (LOr (LEqual (Arg0, 0x03), LEqual (Arg0, 0x04)), LEqual (
-            Arg0, 0x05)))
-        {
-            If (LEqual (PFLV, FDTP))
-            {
-                Store (One, GP27)
-            }
-        }
-    }
-
-    Method (_WAK, 1, Serialized)
-    {
-        ShiftLeft (Arg0, 0x04, DBG8)
-        WAK (Arg0)
-        If (NEXP)
-        {
-            If (And (OSCC, 0x02))
-            {
-                \_SB.PCI0.NHPG ()
-            }
-
-            If (And (OSCC, 0x04))
-            {
-                \_SB.PCI0.NPME ()
-            }
-        }
-
-        If (LEqual (Arg0, 0x03))
-        {
-            If (LEqual (Zero, ACTT))
-            {
-                If (LEqual (ECON, One))
-                {
-                    Store (Zero, \_SB.PCI0.LPCB.H_EC.CFAN)
-                }
-            }
-        }
-
-        If (LOr (LEqual (Arg0, 0x03), LEqual (Arg0, 0x04)))
-        {
-            If (LAnd (DTSE, LGreater (TCNT, One)))
-            {
-                TRAP (TRTD, 0x14)
-            }
-
-            If (LEqual (OSYS, 0x07D2))
-            {
-                If (And (CFGD, One))
-                {
-                    If (LGreater (\_PR.CPU0._PPC, Zero))
-                    {
-                        Subtract (\_PR.CPU0._PPC, One, \_PR.CPU0._PPC)
-                        PNOT ()
-                        Add (\_PR.CPU0._PPC, One, \_PR.CPU0._PPC)
-                        PNOT ()
-                    }
-                    Else
-                    {
-                        Add (\_PR.CPU0._PPC, One, \_PR.CPU0._PPC)
-                        PNOT ()
-                        Subtract (\_PR.CPU0._PPC, One, \_PR.CPU0._PPC)
-                        PNOT ()
-                    }
-                }
-            }
-
-            If (LEqual (ECON, One))
-            {
-                If (LNotEqual (LIDS, \_SB.PCI0.LPCB.H_EC.LSTE))
-                {
-                    Store (\_SB.PCI0.LPCB.H_EC.LSTE, LIDS)
-                    If (IGDS)
-                    {
-                        If (\_SB.PCI0.GFX0.GLID (LIDS))
-                        {
-                            Or (0x80000000, \_SB.PCI0.GFX0.CLID, \_SB.PCI0.GFX0.CLID)
-                        }
-                    }
-
-                    Notify (\_SB.LID0, 0x80)
-                }
-
-                If (LNotEqual (\_SB.PCI0.LPCB.H_EC.DOCK, DSTS))
-                {
-                    Store (\_SB.PCI0.LPCB.H_EC.DOCK, DSTS)
-                    If (LAnd (\_SB.PCI0.HDEF.DCKS, One))
-                    {
-                        Store (DSTS, \_SB.PCI0.HDEF.DCKA)
-                    }
-
-                    If (LEqual (DSTS, One))
-                    {
-                        If (LEqual (Arg0, 0x03))
-                        {
-                            Sleep (0x03E8)
-                            Store (PDBR, SSMP)
-                            Sleep (0x03E8)
-                        }
-
-                        Notify (\_SB.PCI0.DOCK, Zero)
-                    }
-                    Else
-                    {
-                        Notify (\_SB.PCI0.DOCK, One)
-                    }
-                }
-
-                If (LEqual (BNUM, Zero))
-                {
-                    If (LNotEqual (\_SB.PCI0.LPCB.H_EC.VPWR, PWRS))
-                    {
-                        Store (\_SB.PCI0.LPCB.H_EC.VPWR, PWRS)
-                        PNOT ()
-                    }
-                }
-                Else
-                {
-                    If (LNotEqual (\_SB.PCI0.LPCB.H_EC.RPWR, PWRS))
-                    {
-                        Store (\_SB.PCI0.LPCB.H_EC.RPWR, PWRS)
-                        PNOT ()
-                    }
-                }
-            }
-
-            If (LEqual (RP1D, Zero))
-            {
-                Notify (\_SB.PCI0.RP01, Zero)
-            }
-
-            If (LEqual (RP2D, Zero))
-            {
-                Notify (\_SB.PCI0.RP02, Zero)
-            }
-
-            If (LEqual (RP3D, Zero))
-            {
-                Notify (\_SB.PCI0.RP03, Zero)
-            }
-
-            If (LEqual (RP4D, Zero))
-            {
-                Notify (\_SB.PCI0.RP04, Zero)
-            }
-
-            If (LEqual (RP5D, Zero))
-            {
-                Notify (\_SB.PCI0.RP05, Zero)
-            }
-
-            If (LEqual (RP6D, Zero))
-            {
-                Notify (\_SB.PCI0.RP06, Zero)
-            }
-
-            If (LEqual (RP7D, Zero))
-            {
-                If (LEqual (DSTS, Zero))
-                {
-                    Notify (\_SB.PCI0.RP07, Zero)
-                }
-            }
-
-            If (LEqual (RP8D, Zero))
-            {
-                If (LEqual (DSTS, Zero))
-                {
-                    Notify (\_SB.PCI0.RP08, Zero)
-                }
-            }
-        }
-
-        Return (Package (0x02)
-        {
-            Zero, 
-            Zero
-        })
-    }
-
-    Method (GETB, 3, Serialized)
-    {
-        Multiply (Arg0, 0x08, Local0)
-        Multiply (Arg1, 0x08, Local1)
-        CreateField (Arg2, Local0, Local1, TBF3)
-        Return (TBF3)
-    }
-
-    Method (PNOT, 0, Serialized)
-    {
-        If (LGreater (TCNT, One))
-        {
-            If (And (PDC0, 0x08))
-            {
-                Notify (\_PR.CPU0, 0x80)
-                If (And (PDC0, 0x10))
-                {
-                    Sleep (0x64)
-                    Notify (\_PR.CPU0, 0x81)
-                }
-            }
-
-            If (And (PDC1, 0x08))
-            {
-                Notify (\_PR.CPU1, 0x80)
-                If (And (PDC1, 0x10))
-                {
-                    Sleep (0x64)
-                    Notify (\_PR.CPU1, 0x81)
-                }
-            }
-
-            If (And (PDC2, 0x08))
-            {
-                Notify (\_PR.CPU2, 0x80)
-                If (And (PDC2, 0x10))
-                {
-                    Sleep (0x64)
-                    Notify (\_PR.CPU2, 0x81)
-                }
-            }
-
-            If (And (PDC3, 0x08))
-            {
-                Notify (\_PR.CPU3, 0x80)
-                If (And (PDC3, 0x10))
-                {
-                    Sleep (0x64)
-                    Notify (\_PR.CPU3, 0x81)
-                }
-            }
-
-            If (And (PDC4, 0x08))
-            {
-                Notify (\_PR.CPU4, 0x80)
-                If (And (PDC4, 0x10))
-                {
-                    Sleep (0x64)
-                    Notify (\_PR.CPU4, 0x81)
-                }
-            }
-
-            If (And (PDC5, 0x08))
-            {
-                Notify (\_PR.CPU5, 0x80)
-                If (And (PDC5, 0x10))
-                {
-                    Sleep (0x64)
-                    Notify (\_PR.CPU5, 0x81)
-                }
-            }
-
-            If (And (PDC6, 0x08))
-            {
-                Notify (\_PR.CPU6, 0x80)
-                If (And (PDC6, 0x10))
-                {
-                    Sleep (0x64)
-                    Notify (\_PR.CPU6, 0x81)
-                }
-            }
-
-            If (And (PDC7, 0x08))
-            {
-                Notify (\_PR.CPU7, 0x80)
-                If (And (PDC7, 0x10))
-                {
-                    Sleep (0x64)
-                    Notify (\_PR.CPU7, 0x81)
-                }
-            }
-        }
-        Else
-        {
-            Notify (\_PR.CPU0, 0x80)
-            Sleep (0x64)
-            Notify (\_PR.CPU0, 0x81)
-        }
-
-        If (LEqual (ECON, One))
-        {
-            Store (\_SB.PCI0.LPCB.H_EC.B1CC, B1SC)
-            Store (\_SB.PCI0.LPCB.H_EC.B1ST, B1SS)
-            Store (\_SB.PCI0.LPCB.H_EC.B2CC, B2SC)
-            Store (\_SB.PCI0.LPCB.H_EC.B2ST, B2SS)
-            If (LGreaterEqual (OSYS, 0x07D6))
-            {
-                Notify (\_SB.PCI0.LPCB.H_EC.BAT0, 0x81)
-                Notify (\_SB.PCI0.LPCB.H_EC.BAT1, 0x81)
-                Notify (\_SB.PCI0.LPCB.H_EC.BAT2, 0x81)
-            }
-            Else
-            {
-                Notify (\_SB.PCI0.LPCB.H_EC.BAT0, 0x80)
-                Notify (\_SB.PCI0.LPCB.H_EC.BAT1, 0x80)
-                Notify (\_SB.PCI0.LPCB.H_EC.BAT2, 0x80)
-            }
-        }
-    }
-
-    Method (TRAP, 2, Serialized)
-    {
-        Store (Arg1, SMIF)
-        If (LEqual (Arg0, TRTP))
-        {
-            Store (Zero, TRP0)
-        }
-
-        If (LEqual (Arg0, TRTD))
-        {
-            Store (Arg1, DTSF)
-            Store (Zero, TRPD)
-            Return (DTSF)
-        }
-
-        If (LEqual (Arg0, TRTI))
-        {
-            Store (Zero, TRPH)
-        }
-
-        Return (SMIF)
-    }
-
-    Scope (_SB.PCI0)
-    {
-        Method (_INI, 0, NotSerialized)
-        {
-            Store (0x07D0, OSYS)
-            If (CondRefOf (_OSI, Local0))
-            {
-                If (_OSI ("Windows 2001"))
-                {
-                    Store (0x07D1, OSYS)
-                }
-
-                If (_OSI ("Windows 2001 SP1"))
-                {
-                    Store (0x07D1, OSYS)
-                }
-
-                If (_OSI ("Windows 2001 SP2"))
-                {
-                    Store (0x07D2, OSYS)
-                }
-
-                If (_OSI ("Windows 2001.1"))
-                {
-                    Store (0x07D3, OSYS)
-                }
-
-                If (_OSI ("Windows 2006"))
-                {
-                    Store (0x07D6, OSYS)
-                }
-
-                If (_OSI ("Windows 2009"))
-                {
-                    Store (0x07D9, OSYS)
-                }
-            }
-        }
-
-        Method (NHPG, 0, Serialized)
-        {
-            Store (Zero, ^RP01.HPEX)
-            Store (Zero, ^RP02.HPEX)
-            Store (Zero, ^RP03.HPEX)
-            Store (Zero, ^RP04.HPEX)
-            Store (One, ^RP01.HPSX)
-            Store (One, ^RP02.HPSX)
-            Store (One, ^RP03.HPSX)
-            Store (One, ^RP04.HPSX)
-        }
-
-        Method (NPME, 0, Serialized)
-        {
-            Store (Zero, ^RP01.PMEX)
-            Store (Zero, ^RP02.PMEX)
-            Store (Zero, ^RP03.PMEX)
-            Store (Zero, ^RP04.PMEX)
-            Store (Zero, ^RP05.PMEX)
-            Store (Zero, ^RP06.PMEX)
-            Store (Zero, ^RP07.PMEX)
-            Store (Zero, ^RP08.PMEX)
-            Store (One, ^RP01.PMSX)
-            Store (One, ^RP02.PMSX)
-            Store (One, ^RP03.PMSX)
-            Store (One, ^RP04.PMSX)
-            Store (One, ^RP05.PMSX)
-            Store (One, ^RP06.PMSX)
-            Store (One, ^RP07.PMSX)
-            Store (One, ^RP08.PMSX)
-        }
-    }
-
-    Scope (\)
-    {
-        Name (PICM, Zero)
-        Name (PRWP, Package (0x02)
-        {
-            Zero, 
-            Zero
-        })
-        Method (GPRW, 2, NotSerialized)
-        {
-            Store (Arg0, Index (PRWP, Zero))
-            Store (ShiftLeft (SS1, One), Local0)
-            Or (Local0, ShiftLeft (SS2, 0x02), Local0)
-            Or (Local0, ShiftLeft (SS3, 0x03), Local0)
-            Or (Local0, ShiftLeft (SS4, 0x04), Local0)
-            If (And (ShiftLeft (One, Arg1), Local0))
-            {
-                Store (Arg1, Index (PRWP, One))
-            }
-            Else
-            {
-                ShiftRight (Local0, One, Local0)
-                FindSetLeftBit (Local0, Index (PRWP, One))
-            }
-
-            Return (PRWP)
-        }
-    }
-
-    Scope (_SB.PCI0)
-    {
-        Device (PDRC)
-        {
-            Name (_HID, EisaId ("PNP0C02"))
-            Name (_UID, One)
-            Name (BUF0, ResourceTemplate ()
-            {
-                Memory32Fixed (ReadWrite,
-                    0x00000000,         // Address Base
-                    0x00004000,         // Address Length
-                    )
-                Memory32Fixed (ReadWrite,
-                    0x00000000,         // Address Base
-                    0x00008000,         // Address Length
-                    )
-                Memory32Fixed (ReadWrite,
-                    0x00000000,         // Address Base
-                    0x00001000,         // Address Length
-                    )
-                Memory32Fixed (ReadWrite,
-                    0x00000000,         // Address Base
-                    0x00001000,         // Address Length
-                    )
-                Memory32Fixed (ReadWrite,
-                    0x00000000,         // Address Base
-                    0x00000000,         // Address Length
-                    )
-                Memory32Fixed (ReadWrite,
-                    0xFED20000,         // Address Base
-                    0x00020000,         // Address Length
-                    )
-                Memory32Fixed (ReadOnly,
-                    0xFED90000,         // Address Base
-                    0x00004000,         // Address Length
-                    )
-                Memory32Fixed (ReadWrite,
-                    0xFED45000,         // Address Base
-                    0x0004B000,         // Address Length
-                    )
-                Memory32Fixed (ReadOnly,
-                    0xFF000000,         // Address Base
-                    0x01000000,         // Address Length
-                    )
-                Memory32Fixed (ReadOnly,
-                    0xFEE00000,         // Address Base
-                    0x00100000,         // Address Length
-                    )
-                Memory32Fixed (ReadWrite,
-                    0x00000000,         // Address Base
-                    0x00001000,         // Address Length
-                    )
-            })
-            Method (_CRS, 0, Serialized)
-            {
-                CreateDWordField (BUF0, 0x04, RBR0)
-                ShiftLeft (^^LPCB.RCBA, 0x0E, RBR0)
-                CreateDWordField (BUF0, 0x7C, TBR0)
-                Store (TBAB, TBR0)
-                CreateDWordField (BUF0, 0x80, TBLN)
-                If (LEqual (TBAB, Zero))
-                {
-                    Store (Zero, TBLN)
-                }
-
-                CreateDWordField (BUF0, 0x10, MBR0)
-                ShiftLeft (MHBR, 0x0F, MBR0)
-                CreateDWordField (BUF0, 0x1C, DBR0)
-                ShiftLeft (DIBR, 0x0C, DBR0)
-                CreateDWordField (BUF0, 0x28, EBR0)
-                ShiftLeft (EPBR, 0x0C, EBR0)
-                CreateDWordField (BUF0, 0x34, XBR0)
-                ShiftLeft (PXBR, 0x1A, XBR0)
-                CreateDWordField (BUF0, 0x38, XSZ0)
-                ShiftRight (0x10000000, PXSZ, XSZ0)
-                Return (BUF0)
-            }
-        }
-    }
-
-    Method (BRTN, 1, Serialized)
-    {
-        If (LEqual (And (DID1, 0x0F00), 0x0400))
-        {
-            Notify (\_SB.PCI0.GFX0.DD01, Arg0)
-        }
-
-        If (LEqual (And (DID2, 0x0F00), 0x0400))
-        {
-            Notify (\_SB.PCI0.GFX0.DD02, Arg0)
-        }
-
-        If (LEqual (And (DID3, 0x0F00), 0x0400))
-        {
-            Notify (\_SB.PCI0.GFX0.DD03, Arg0)
-        }
-
-        If (LEqual (And (DID4, 0x0F00), 0x0400))
-        {
-            Notify (\_SB.PCI0.GFX0.DD04, Arg0)
-        }
-
-        If (LEqual (And (DID5, 0x0F00), 0x0400))
-        {
-            Notify (\_SB.PCI0.GFX0.DD05, Arg0)
-        }
-
-        If (LEqual (And (DID6, 0x0F00), 0x0400))
-        {
-            Notify (\_SB.PCI0.GFX0.DD06, Arg0)
-        }
-
-        If (LEqual (And (DID7, 0x0F00), 0x0400))
-        {
-            Notify (\_SB.PCI0.GFX0.DD07, Arg0)
-        }
-
-        If (LEqual (And (DID8, 0x0F00), 0x0400))
-        {
-            Notify (\_SB.PCI0.GFX0.DD08, Arg0)
-        }
-    }
-
-    Scope (_GPE)
-    {
-        Method (_L09, 0, NotSerialized)
-        {
-            If (LEqual (RP1D, Zero))
-            {
-                \_SB.PCI0.RP01.HPME ()
-                Notify (\_SB.PCI0.RP01, 0x02)
-            }
-
-            If (LEqual (RP2D, Zero))
-            {
-                \_SB.PCI0.RP02.HPME ()
-                Notify (\_SB.PCI0.RP02, 0x02)
-            }
-
-            If (LEqual (RP3D, Zero))
-            {
-                \_SB.PCI0.RP03.HPME ()
-                Notify (\_SB.PCI0.RP03, 0x02)
-            }
-
-            If (LEqual (RP4D, Zero))
-            {
-                \_SB.PCI0.RP04.HPME ()
-                Notify (\_SB.PCI0.RP04, 0x02)
-            }
-
-            If (LEqual (RP5D, Zero))
-            {
-                \_SB.PCI0.RP05.HPME ()
-                Notify (\_SB.PCI0.RP05, 0x02)
-            }
-
-            If (LEqual (RP6D, Zero))
-            {
-                \_SB.PCI0.RP06.HPME ()
-                Notify (\_SB.PCI0.RP06, 0x02)
-            }
-
-            If (LEqual (RP7D, Zero))
-            {
-                \_SB.PCI0.RP07.HPME ()
-                Notify (\_SB.PCI0.RP07, 0x02)
-            }
-
-            If (LEqual (RP8D, Zero))
-            {
-                \_SB.PCI0.RP08.HPME ()
-                Notify (\_SB.PCI0.RP08, 0x02)
-            }
-
-            Notify (\_SB.PCI0.PEG0, 0x02)
-            Notify (\_SB.PCI0.PEG0.PEGP, 0x02)
-            Notify (\_SB.PCI0.PEG1, 0x02)
-            Notify (\_SB.PCI0.PEG2, 0x02)
-            Notify (\_SB.PCI0.PEG3, 0x02)
-        }
-
-        Method (_L0D, 0, NotSerialized)
-        {
-            Notify (\_SB.PCI0.EHC1, 0x02)
-            Notify (\_SB.PCI0.EHC2, 0x02)
-            Notify (\_SB.PCI0.HDEF, 0x02)
-            Notify (\_SB.PCI0.GLAN, 0x02)
-        }
-
-        Method (_L01, 0, NotSerialized)
-        {
-            Add (L01C, One, L01C)
-            P8XH (Zero, One)
-            P8XH (One, L01C)
-            If (LAnd (LEqual (RP1D, Zero), \_SB.PCI0.RP01.HPSX))
-            {
-                Sleep (0x64)
-                If (\_SB.PCI0.RP01.PDCX)
-                {
-                    Store (One, \_SB.PCI0.RP01.PDCX)
-                    Store (One, \_SB.PCI0.RP01.HPSX)
-                    If (LNot (\_SB.PCI0.RP01.PDSX))
-                    {
-                        Store (Zero, \_SB.PCI0.RP01.L0SE)
-                    }
-
-                    Notify (\_SB.PCI0.RP01, Zero)
-                }
-                Else
-                {
-                    Store (One, \_SB.PCI0.RP01.HPSX)
-                }
-            }
-
-            If (LAnd (LEqual (RP2D, Zero), \_SB.PCI0.RP02.HPSX))
-            {
-                Sleep (0x64)
-                If (\_SB.PCI0.RP02.PDCX)
-                {
-                    Store (One, \_SB.PCI0.RP02.PDCX)
-                    Store (One, \_SB.PCI0.RP02.HPSX)
-                    If (LNot (\_SB.PCI0.RP02.PDSX))
-                    {
-                        Store (Zero, \_SB.PCI0.RP02.L0SE)
-                    }
-
-                    Notify (\_SB.PCI0.RP02, Zero)
-                }
-                Else
-                {
-                    Store (One, \_SB.PCI0.RP02.HPSX)
-                }
-            }
-
-            If (LAnd (LEqual (RP3D, Zero), \_SB.PCI0.RP03.HPSX))
-            {
-                Sleep (0x64)
-                If (\_SB.PCI0.RP03.PDCX)
-                {
-                    Store (One, \_SB.PCI0.RP03.PDCX)
-                    Store (One, \_SB.PCI0.RP03.HPSX)
-                    If (LNot (\_SB.PCI0.RP03.PDSX))
-                    {
-                        Store (Zero, \_SB.PCI0.RP03.L0SE)
-                    }
-
-                    Notify (\_SB.PCI0.RP03, Zero)
-                }
-                Else
-                {
-                    Store (One, \_SB.PCI0.RP03.HPSX)
-                }
-            }
-
-            If (LAnd (LEqual (RP4D, Zero), \_SB.PCI0.RP04.HPSX))
-            {
-                Sleep (0x64)
-                If (\_SB.PCI0.RP04.PDCX)
-                {
-                    Store (One, \_SB.PCI0.RP04.PDCX)
-                    Store (One, \_SB.PCI0.RP04.HPSX)
-                    If (LNot (\_SB.PCI0.RP04.PDSX))
-                    {
-                        Store (Zero, \_SB.PCI0.RP04.L0SE)
-                    }
-
-                    Notify (\_SB.PCI0.RP04, Zero)
-                }
-                Else
-                {
-                    Store (One, \_SB.PCI0.RP04.HPSX)
-                }
-            }
-
-            If (LAnd (LEqual (RP5D, Zero), \_SB.PCI0.RP05.HPSX))
-            {
-                Sleep (0x64)
-                If (\_SB.PCI0.RP05.PDCX)
-                {
-                    Store (One, \_SB.PCI0.RP05.PDCX)
-                    Store (One, \_SB.PCI0.RP05.HPSX)
-                    If (LNot (\_SB.PCI0.RP05.PDSX))
-                    {
-                        Store (Zero, \_SB.PCI0.RP05.L0SE)
-                    }
-
-                    Notify (\_SB.PCI0.RP05, Zero)
-                }
-                Else
-                {
-                    Store (One, \_SB.PCI0.RP05.HPSX)
-                }
-            }
-
-            If (LAnd (LEqual (RP6D, Zero), \_SB.PCI0.RP06.HPSX))
-            {
-                Sleep (0x64)
-                If (\_SB.PCI0.RP06.PDCX)
-                {
-                    Store (One, \_SB.PCI0.RP06.PDCX)
-                    Store (One, \_SB.PCI0.RP06.HPSX)
-                    If (LNot (\_SB.PCI0.RP06.PDSX))
-                    {
-                        Store (Zero, \_SB.PCI0.RP06.L0SE)
-                    }
-
-                    Notify (\_SB.PCI0.RP06, Zero)
-                }
-                Else
-                {
-                    Store (One, \_SB.PCI0.RP06.HPSX)
-                }
-            }
-
-            If (LAnd (LEqual (RP7D, Zero), \_SB.PCI0.RP07.HPSX))
-            {
-                Sleep (0x64)
-                If (\_SB.PCI0.RP07.PDCX)
-                {
-                    Store (One, \_SB.PCI0.RP07.PDCX)
-                    Store (One, \_SB.PCI0.RP07.HPSX)
-                    If (LNot (\_SB.PCI0.RP07.PDSX))
-                    {
-                        Store (Zero, \_SB.PCI0.RP07.L0SE)
-                    }
-
-                    If (ECON)
-                    {
-                        If (LEqual (\_SB.PCI0.LPCB.H_EC.DOCK, Zero))
-                        {
-                            Notify (\_SB.PCI0.RP07, Zero)
-                        }
-                    }
-                }
-                Else
-                {
-                    Store (One, \_SB.PCI0.RP07.HPSX)
-                }
-            }
-
-            If (LAnd (LEqual (RP8D, Zero), \_SB.PCI0.RP08.HPSX))
-            {
-                Sleep (0x64)
-                If (\_SB.PCI0.RP08.PDCX)
-                {
-                    Store (One, \_SB.PCI0.RP08.PDCX)
-                    Store (One, \_SB.PCI0.RP08.HPSX)
-                    If (LNot (\_SB.PCI0.RP08.PDSX))
-                    {
-                        Store (Zero, \_SB.PCI0.RP08.L0SE)
-                    }
-
-                    If (ECON)
-                    {
-                        If (LEqual (\_SB.PCI0.LPCB.H_EC.DOCK, Zero))
-                        {
-                            Notify (\_SB.PCI0.RP08, Zero)
-                        }
-                    }
-                }
-                Else
-                {
-                    Store (One, \_SB.PCI0.RP08.HPSX)
-                }
-            }
-        }
-
-        Method (_L02, 0, NotSerialized)
-        {
-            Store (Zero, GPEC)
-            If (CondRefOf (\_SB.PCI0.IEIT.EITV))
-            {
-                \_SB.PCI0.IEIT.EITV ()
-            }
-
-            Notify (\_TZ.TZ00, 0x80)
-            Notify (\_TZ.TZ01, 0x80)
-            If (CondRefOf (TNOT))
-            {
-                TNOT ()
-            }
-        }
-
-        Method (_L06, 0, NotSerialized)
-        {
-            If (LAnd (\_SB.PCI0.GFX0.GSSE, LNot (GSMI)))
-            {
-                \_SB.PCI0.GFX0.GSCI ()
-            }
-        }
-
-        Method (_L07, 0, NotSerialized)
-        {
-            Store (0x20, \_SB.PCI0.SBUS.HSTS)
-        }
-    }
-
-    Scope (_TZ)
-    {
-        Name (ETMD, One)
-        Name (THLD, 0x78)
-        PowerResource (FN00, 0x00, 0x0000)
-        {
-            Method (_STA, 0, Serialized)
-            {
-                Return (VFN0)
-            }
-
-            Method (_ON, 0, Serialized)
-            {
-                Store (One, VFN0)
-                If (LAnd (ECON, ETMD))
-                {
-                    Store (AC0F, \_SB.PCI0.LPCB.H_EC.PENV)
-                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
-                }
-            }
-
-            Method (_OFF, 0, Serialized)
-            {
-                Store (Zero, VFN0)
-                If (LAnd (ECON, ETMD))
-                {
-                    If (LEqual (VFN1, Zero))
-                    {
-                        Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
-                    }
-                    Else
-                    {
-                        Store (AC1F, \_SB.PCI0.LPCB.H_EC.PENV)
-                    }
-
-                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
-                }
-            }
-        }
-
-        Device (FAN0)
-        {
-            Name (_HID, EisaId ("PNP0C0B"))
-            Name (_UID, Zero)
-            Name (_PR0, Package (0x01)
-            {
-                FN00
-            })
-        }
-
-        PowerResource (FN01, 0x00, 0x0000)
-        {
-            Method (_STA, 0, Serialized)
-            {
-                Return (VFN1)
-            }
-
-            Method (_ON, 0, Serialized)
-            {
-                Store (One, VFN1)
-                If (LAnd (ECON, ETMD))
-                {
-                    Store (AC1F, \_SB.PCI0.LPCB.H_EC.PENV)
-                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
-                }
-            }
-
-            Method (_OFF, 0, Serialized)
-            {
-                Store (Zero, VFN1)
-                If (LAnd (ECON, ETMD))
-                {
-                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
-                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
-                }
-            }
-        }
-
-        Device (FAN1)
-        {
-            Name (_HID, EisaId ("PNP0C0B"))
-            Name (_UID, One)
-            Name (_PR0, Package (0x01)
-            {
-                FN01
-            })
-        }
-
-        PowerResource (FN02, 0x00, 0x0000)
-        {
-            Method (_STA, 0, Serialized)
-            {
-                Return (VFN2)
-            }
-
-            Method (_ON, 0, Serialized)
-            {
-                Store (One, VFN2)
-                If (LAnd (ECON, ETMD))
-                {
-                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
-                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
-                }
-            }
-
-            Method (_OFF, 0, Serialized)
-            {
-                Store (Zero, VFN2)
-                If (LAnd (ECON, ETMD))
-                {
-                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
-                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
-                }
-            }
-        }
-
-        Device (FAN2)
-        {
-            Name (_HID, EisaId ("PNP0C0B"))
-            Name (_UID, 0x02)
-            Name (_PR0, Package (0x01)
-            {
-                FN02
+                WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
+                    0x0000,             // Granularity
+                    0x0000,             // Range Minimum
+                    0x00FF,             // Range Maximum
+                    0x0000,             // Translation Offset
+                    0x0100,             // Length
+                    ,, _Y00)
+                DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
+                    0x00000000,         // Granularity
+                    0x00000000,         // Range Minimum
+                    0x00000CF7,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00000CF8,         // Length
+                    ,, , TypeStatic)
+                IO (Decode16,
+                    0x0CF8,             // Range Minimum
+                    0x0CF8,             // Range Maximum
+                    0x01,               // Alignment
+                    0x08,               // Length
+                    )
+                DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
+                    0x00000000,         // Granularity
+                    0x00000D00,         // Range Minimum
+                    0x0000FFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x0000F300,         // Length
+                    ,, , TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000A0000,         // Range Minimum
+                    0x000BFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00020000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000C0000,         // Range Minimum
+                    0x000C3FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y01, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000C4000,         // Range Minimum
+                    0x000C7FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y02, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000C8000,         // Range Minimum
+                    0x000CBFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y03, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000CC000,         // Range Minimum
+                    0x000CFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y04, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000D0000,         // Range Minimum
+                    0x000D3FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y05, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000D4000,         // Range Minimum
+                    0x000D7FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y06, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000D8000,         // Range Minimum
+                    0x000DBFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y07, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000DC000,         // Range Minimum
+                    0x000DFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y08, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000E0000,         // Range Minimum
+                    0x000E3FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y09, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000E4000,         // Range Minimum
+                    0x000E7FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y0A, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000E8000,         // Range Minimum
+                    0x000EBFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y0B, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000EC000,         // Range Minimum
+                    0x000EFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y0C, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000F0000,         // Range Minimum
+                    0x000FFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00010000,         // Length
+                    ,, _Y0D, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x00000000,         // Range Minimum
+                    0xFEAFFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0xFEB00000,         // Length
+                    ,, _Y0E, AddressRangeMemory, TypeStatic)
+                QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x0000000000000000, // Granularity
+                    0x0000000000010000, // Range Minimum
+                    0x000000000001FFFF, // Range Maximum
+                    0x0000000000000000, // Translation Offset
+                    0x0000000000010000, // Length
+                    ,, _Y0F, AddressRangeMemory, TypeStatic)
             })
-        }
-
-        PowerResource (FN03, 0x00, 0x0000)
-        {
-            Method (_STA, 0, Serialized)
-            {
-                Return (VFN3)
-            }
-
-            Method (_ON, 0, Serialized)
-            {
-                Store (One, VFN3)
-                If (LAnd (ECON, ETMD))
-                {
-                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
-                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
-                }
-            }
-
-            Method (_OFF, 0, Serialized)
+            Method (_CRS, 0, Serialized)
             {
-                Store (Zero, VFN3)
-                If (LAnd (ECON, ETMD))
+                CreateWordField (BUF0, ^_Y00._MAX, PBMX)
+                Store (Subtract (ShiftRight (PELN, 0x14), 0x02), PBMX)
+                CreateWordField (BUF0, ^_Y00._LEN, PBLN)
+                Store (Subtract (ShiftRight (PELN, 0x14), One), PBLN)
+                If (PM1L)
                 {
-                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
-                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                    CreateDWordField (BUF0, ^_Y01._LEN, C0LN)
+                    Store (Zero, C0LN)
                 }
-            }
-        }
-
-        Device (FAN3)
-        {
-            Name (_HID, EisaId ("PNP0C0B"))
-            Name (_UID, 0x03)
-            Name (_PR0, Package (0x01)
-            {
-                FN03
-            })
-        }
-
-        PowerResource (FN04, 0x00, 0x0000)
-        {
-            Method (_STA, 0, Serialized)
-            {
-                Return (VFN4)
-            }
 
-            Method (_ON, 0, Serialized)
-            {
-                Store (One, VFN4)
-                If (LAnd (ECON, ETMD))
+                If (LEqual (PM1L, One))
                 {
-                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
-                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                    CreateBitField (BUF0, ^_Y01._RW, C0RW)
+                    Store (Zero, C0RW)
                 }
-            }
 
-            Method (_OFF, 0, Serialized)
-            {
-                Store (Zero, VFN4)
-                If (LAnd (ECON, ETMD))
+                If (PM1H)
                 {
-                    Store (Zero, \_SB.PCI0.LPCB.H_EC.PENV)
-                    \_SB.PCI0.LPCB.H_EC.ECMD (0x1A)
+                    CreateDWordField (BUF0, ^_Y02._LEN, C4LN)
+                    Store (Zero, C4LN)
                 }
-            }
-        }
 
-        Device (FAN4)
-        {
-            Name (_HID, EisaId ("PNP0C0B"))
-            Name (_UID, 0x04)
-            Name (_PR0, Package (0x01)
-            {
-                FN04
-            })
-        }
-
-        ThermalZone (TZ00)
-        {
-            Name (PTMP, 0x0BB8)
-            Method (_SCP, 1, Serialized)
-            {
-                Store (Arg0, CTYP)
-            }
-
-            Method (_CRT, 0, Serialized)
-            {
-                If (CondRefOf (\_PR.ACRT))
+                If (LEqual (PM1H, One))
                 {
-                    If (LNotEqual (\_PR.ACRT, Zero))
-                    {
-                        Return (Add (0x0AAC, Multiply (\_PR.ACRT, 0x0A)))
-                    }
+                    CreateBitField (BUF0, ^_Y02._RW, C4RW)
+                    Store (Zero, C4RW)
                 }
 
-                Return (Add (0x0AAC, Multiply (CRTT, 0x0A)))
-            }
-
-            Method (_AC0, 0, Serialized)
-            {
-                If (CondRefOf (\_PR.AAC0))
+                If (PM2L)
                 {
-                    If (LNotEqual (\_PR.AAC0, Zero))
-                    {
-                        Return (Add (0x0AAC, Multiply (\_PR.AAC0, 0x0A)))
-                    }
+                    CreateDWordField (BUF0, ^_Y03._LEN, C8LN)
+                    Store (Zero, C8LN)
                 }
 
-                Return (Add (0x0AAC, Multiply (ACTT, 0x0A)))
-            }
-
-            Method (_AC1, 0, Serialized)
-            {
-                Return (Add (0x0AAC, Multiply (ACT1, 0x0A)))
-            }
-
-            Method (_AC2, 0, Serialized)
-            {
-                Return (0x0AAC)
-            }
-
-            Method (_AC3, 0, Serialized)
-            {
-                Return (0x0AAC)
-            }
-
-            Method (_AC4, 0, Serialized)
-            {
-                Return (0x0AAC)
-            }
-
-            Name (_AL0, Package (0x01)
-            {
-                FAN0
-            })
-            Name (_AL1, Package (0x01)
-            {
-                FAN1
-            })
-            Name (_AL2, Package (0x01)
-            {
-                FAN2
-            })
-            Name (_AL3, Package (0x01)
-            {
-                FAN3
-            })
-            Name (_AL4, Package (0x01)
-            {
-                FAN4
-            })
-            Method (_TMP, 0, Serialized)
-            {
-                If (LNot (ETMD))
+                If (LEqual (PM2L, One))
                 {
-                    Return (0x0BB8)
+                    CreateBitField (BUF0, ^_Y03._RW, C8RW)
+                    Store (Zero, C8RW)
                 }
 
-                If (LEqual (DTSE, 0x03))
+                If (PM2H)
                 {
-                    Return (Add (0x0B10, Multiply (CRTT, 0x0A)))
+                    CreateDWordField (BUF0, ^_Y04._LEN, CCLN)
+                    Store (Zero, CCLN)
                 }
 
-                If (LEqual (DTSE, One))
+                If (LEqual (PM2H, One))
                 {
-                    If (LEqual (PKGA, One))
-                    {
-                        Store (PDTS, Local0)
-                        Return (Add (0x0AAC, Multiply (Local0, 0x0A)))
-                    }
-
-                    Store (DTS1, Local0)
-                    If (LGreater (DTS2, Local0))
-                    {
-                        Store (DTS2, Local0)
-                    }
-
-                    If (LGreater (DTS3, Local0))
-                    {
-                        Store (DTS3, Local0)
-                    }
-
-                    If (LGreater (DTS4, Local0))
-                    {
-                        Store (DTS4, Local0)
-                    }
-
-                    Return (Add (0x0AAC, Multiply (Local0, 0x0A)))
+                    CreateBitField (BUF0, ^_Y04._RW, CCRW)
+                    Store (Zero, CCRW)
                 }
 
-                If (ECON)
+                If (PM3L)
                 {
-                    Store (\_SB.PCI0.LPCB.H_EC.PLMX, Local0)
-                    Add (0x0AAC, Multiply (Local0, 0x0A), Local0)
-                    Store (Local0, PTMP)
-                    Return (Local0)
+                    CreateDWordField (BUF0, ^_Y05._LEN, D0LN)
+                    Store (Zero, D0LN)
                 }
 
-                Return (0x0BC2)
-            }
-        }
-
-        ThermalZone (TZ01)
-        {
-            Name (PTMP, 0x0BB8)
-            Method (_SCP, 1, Serialized)
-            {
-                Store (Arg0, CTYP)
-            }
-
-            Method (_CRT, 0, Serialized)
-            {
-                If (CondRefOf (\_PR.ACRT))
+                If (LEqual (PM3L, One))
                 {
-                    If (LNotEqual (\_PR.ACRT, Zero))
-                    {
-                        Return (Add (0x0AAC, Multiply (\_PR.ACRT, 0x0A)))
-                    }
+                    CreateBitField (BUF0, ^_Y05._RW, D0RW)
+                    Store (Zero, D0RW)
                 }
 
-                Return (Add (0x0AAC, Multiply (CRTT, 0x0A)))
-            }
-
-            Method (_TMP, 0, Serialized)
-            {
-                If (LNot (ETMD))
+                If (PM3H)
                 {
-                    Return (0x0BCC)
+                    CreateDWordField (BUF0, ^_Y06._LEN, D4LN)
+                    Store (Zero, D4LN)
                 }
 
-                If (LEqual (DTSE, 0x03))
+                If (LEqual (PM3H, One))
                 {
-                    Return (Add (0x0B10, Multiply (CRTT, 0x0A)))
+                    CreateBitField (BUF0, ^_Y06._RW, D4RW)
+                    Store (Zero, D4RW)
                 }
 
-                If (LEqual (DTSE, One))
+                If (PM4L)
                 {
-                    If (LEqual (PKGA, One))
-                    {
-                        Store (PDTS, Local0)
-                        Return (Add (0x0AAC, Multiply (Local0, 0x0A)))
-                    }
+                    CreateDWordField (BUF0, ^_Y07._LEN, D8LN)
+                    Store (Zero, D8LN)
+                }
 
-                    Store (DTS1, Local0)
-                    If (LGreater (DTS2, Local0))
-                    {
-                        Store (DTS2, Local0)
-                    }
+                If (LEqual (PM4L, One))
+                {
+                    CreateBitField (BUF0, ^_Y07._RW, D8RW)
+                    Store (Zero, D8RW)
+                }
 
-                    If (LGreater (DTS3, Local0))
-                    {
-                        Store (DTS3, Local0)
-                    }
+                If (PM4H)
+                {
+                    CreateDWordField (BUF0, ^_Y08._LEN, DCLN)
+                    Store (Zero, DCLN)
+                }
 
-                    If (LGreater (DTS4, Local0))
-                    {
-                        Store (DTS4, Local0)
-                    }
+                If (LEqual (PM4H, One))
+                {
+                    CreateBitField (BUF0, ^_Y08._RW, DCRW)
+                    Store (Zero, DCRW)
+                }
 
-                    Return (Add (0x0AAC, Multiply (Local0, 0x0A)))
+                If (PM5L)
+                {
+                    CreateDWordField (BUF0, ^_Y09._LEN, E0LN)
+                    Store (Zero, E0LN)
                 }
 
-                If (ECON)
+                If (LEqual (PM5L, One))
                 {
-                    Store (\_SB.PCI0.LPCB.H_EC.PECH, Local0)
-                    Multiply (Local0, 0x0A, Local0)
-                    Store (\_SB.PCI0.LPCB.H_EC.PECL, Local1)
-                    ShiftRight (Local1, 0x02, Local1)
-                    Store (Divide (Multiply (Local1, 0x0A), 0x40, ), Local1)
-                    Add (Local0, Local1, Local0)
-                    Add (0x0AAC, Local0, Local0)
-                    Store (Local0, PTMP)
-                    Return (Local0)
+                    CreateBitField (BUF0, ^_Y09._RW, E0RW)
+                    Store (Zero, E0RW)
                 }
 
-                Return (0x0BD6)
-            }
+                If (PM5H)
+                {
+                    CreateDWordField (BUF0, ^_Y0A._LEN, E4LN)
+                    Store (Zero, E4LN)
+                }
 
-            Method (_PSL, 0, Serialized)
-            {
-                If (LEqual (TCNT, 0x08))
+                If (LEqual (PM5H, One))
                 {
-                    Return (Package (0x08)
-                    {
-                        \_PR.CPU0, 
-                        \_PR.CPU1, 
-                        \_PR.CPU2, 
-                        \_PR.CPU3, 
-                        \_PR.CPU4, 
-                        \_PR.CPU5, 
-                        \_PR.CPU6, 
-                        \_PR.CPU7
-                    })
+                    CreateBitField (BUF0, ^_Y0A._RW, E4RW)
+                    Store (Zero, E4RW)
                 }
 
-                If (LEqual (TCNT, 0x04))
+                If (PM6L)
                 {
-                    Return (Package (0x04)
-                    {
-                        \_PR.CPU0, 
-                        \_PR.CPU1, 
-                        \_PR.CPU2, 
-                        \_PR.CPU3
-                    })
+                    CreateDWordField (BUF0, ^_Y0B._LEN, E8LN)
+                    Store (Zero, E8LN)
                 }
 
-                If (LEqual (TCNT, 0x02))
+                If (LEqual (PM6L, One))
                 {
-                    Return (Package (0x02)
-                    {
-                        \_PR.CPU0, 
-                        \_PR.CPU1
-                    })
+                    CreateBitField (BUF0, ^_Y0B._RW, E8RW)
+                    Store (Zero, E8RW)
                 }
 
-                Return (Package (0x01)
+                If (PM6H)
                 {
-                    \_PR.CPU0
-                })
-            }
+                    CreateDWordField (BUF0, ^_Y0C._LEN, ECLN)
+                    Store (Zero, ECLN)
+                }
 
-            Method (_PSV, 0, Serialized)
-            {
-                If (CondRefOf (\_PR.APSV))
+                If (LEqual (PM6H, One))
                 {
-                    If (LNotEqual (\_PR.APSV, Zero))
-                    {
-                        Return (Add (0x0AAC, Multiply (\_PR.APSV, 0x0A)))
-                    }
+                    CreateBitField (BUF0, ^_Y0C._RW, ECRW)
+                    Store (Zero, ECRW)
                 }
 
-                Return (Add (0x0AAC, Multiply (PSVT, 0x0A)))
-            }
+                If (PM0H)
+                {
+                    CreateDWordField (BUF0, ^_Y0D._LEN, F0LN)
+                    Store (Zero, F0LN)
+                }
 
-            Method (_TC1, 0, Serialized)
-            {
-                Return (TC1V)
-            }
+                If (LEqual (PM0H, One))
+                {
+                    CreateBitField (BUF0, ^_Y0D._RW, F0RW)
+                    Store (Zero, F0RW)
+                }
 
-            Method (_TC2, 0, Serialized)
-            {
-                Return (TC2V)
-            }
+                CreateDWordField (BUF0, ^_Y0E._MIN, M1MN)
+                CreateDWordField (BUF0, ^_Y0E._MAX, M1MX)
+                CreateDWordField (BUF0, ^_Y0E._LEN, M1LN)
+                ShiftLeft (TLUD, 0x14, M1MN)
+                Add (Subtract (M1MX, M1MN), One, M1LN)
+                CreateDWordField (BUF0, ^_Y0F._LEN, MSLN)
+                Store (Zero, MSLN)
 
-            Method (_TSP, 0, Serialized)
-            {
-                Return (TSPV)
+                Return (BUF0)
             }
-        }
-    }
 
-    Scope (_SB.PCI0.LPCB)
-    {
-        Method (SIOH, 0, NotSerialized)
-        {
-            If (And (PMFG, 0x10))
+            Device (PEG0)
             {
-                Notify (PS2K, 0x02)
+                Name (_ADR, 0x00010000)
+                Name (_PRW, Package (0x02) { 0x0D, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x10 }, 
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x11 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x12 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x13 }
+                })
+                Device (PEGP)
+                {
+                    Name (_ADR, 0xFFFF)
+                }
             }
 
-            If (And (PMFG, 0x20))
+            Device (PEG1)
             {
-                Notify (PS2M, 0x02)
+                Name (_ADR, 0x00010001)
+                Name (_PRW, Package (0x02) { 0x0D, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x11 }, 
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x12 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x13 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x10 }
+                })
             }
-        }
-    }
 
-    Name (TPMF, Zero)
-    Scope (\)
-    {
-        Device (AMW0)
-        {
-            Name (_HID, EisaId ("PNP0C14"))
-            Name (_UID, "ASUSWMI")
-            Name (_WDG, Buffer (0x50)
-            {
-                /* 0000 */    0xD0, 0x5E, 0x84, 0x97, 0x6D, 0x4E, 0xDE, 0x11, 
-                /* 0008 */    0x8A, 0x39, 0x08, 0x00, 0x20, 0x0C, 0x9A, 0x66, 
-                /* 0010 */    0x42, 0x43, 0x01, 0x02, 0xA0, 0x47, 0x67, 0x46, 
-                /* 0018 */    0xEC, 0x70, 0xDE, 0x11, 0x8A, 0x39, 0x08, 0x00, 
-                /* 0020 */    0x20, 0x0C, 0x9A, 0x66, 0x42, 0x44, 0x01, 0x02, 
-                /* 0028 */    0x72, 0x0F, 0xBC, 0xAB, 0xA1, 0x8E, 0xD1, 0x11, 
-                /* 0030 */    0x00, 0xA0, 0xC9, 0x06, 0x29, 0x10, 0x00, 0x00, 
-                /* 0038 */    0xD2, 0x00, 0x01, 0x08, 0x21, 0x12, 0x90, 0x05, 
-                /* 0040 */    0x66, 0xD5, 0xD1, 0x11, 0xB2, 0xF0, 0x00, 0xA0, 
-                /* 0048 */    0xC9, 0x06, 0x29, 0x10, 0x4D, 0x4F, 0x01, 0x00
-            })
-            Name (CCAC, Zero)
-            Name (ECD2, Zero)
-            Name (EID2, Zero)
-            Method (WED2, 1, NotSerialized)
+            Device (PEG2)
             {
-                Store (Arg0, ECD2)
+                Name (_ADR, 0x00010002)
+                Name (_PRW, Package (0x02) { 0x0D, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x12 },
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x13 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x10 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x11 }
+                })
             }
 
-            Method (WMBC, 3, NotSerialized)
+            Device (IGPU)
             {
-                Store (One, Local0)
-                Name (_T_0, Zero)
-                Store (Arg1, _T_0)
-                If (LEqual (_T_0, 0x43455053))
+                Name (_ADR, 0x00020000)
+                Device (^^MEM2)
                 {
-                    Return (SPEC (Arg2))
-                }
-                Else
-                {
-                    If (LEqual (_T_0, 0x50564544))
+                    Name (_HID, EisaId ("PNP0C01"))
+                    Name (_UID, 0x02)
+                    Name (_CRS, ResourceTemplate ()
                     {
-                        Return (DEVP (Arg2))
-                    }
-                    Else
+                        Memory32Fixed (ReadWrite, 0x20000000, 0x00200000, )
+                        Memory32Fixed (ReadWrite, 0x40000000, 0x00200000, )
+                    })
+                    Method (_STA, 0, NotSerialized)
                     {
-                        If (LEqual (_T_0, 0x50534453))
-                        {
-                            Return (SDSP (Arg2))
-                        }
-                        Else
+                        If (IGDS) // Uncore enabled?
                         {
-                            If (LEqual (_T_0, 0x50534447))
-                            {
-                                Return (GDSP (Arg2))
-                            }
-                            Else
-                            {
-                                If (LEqual (_T_0, 0x53564544))
-                                {
-                                    Return (DEVS (Arg2))
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, 0x53544344))
-                                    {
-                                        Return (DSTS (Arg2))
-                                    }
-                                    Else
-                                    {
-                                        If (LEqual (_T_0, 0x44495047))
-                                        {
-                                            Return (GPID ())
-                                        }
-                                        Else
-                                        {
-                                            If (LEqual (_T_0, 0x5446424B))
-                                            {
-                                                Return (KBFT (Arg2))
-                                            }
-                                            Else
-                                            {
-                                                If (LEqual (_T_0, 0x59454B48))
-                                                {
-                                                    Return (HKEY ())
-                                                }
-                                                Else
-                                                {
-                                                    Return (Zero)
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
+                            Return (0x0F)
                         }
+
+                        Return (Zero)
                     }
                 }
+            }
+
+            Device (PEG3)
+            {
+                Name (_ADR, 0x00060000)
+                Name (_PRW, Package (0x02) { 0x0D, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x13 },
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x10 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x11 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x12 }
+                })
+            }
 
-                Return (Local0)
+            Device (GIGE)
+            {
+                Name (_ADR, 0x00190000)
+                Name (_PRW, Package (0x02) { 0x0D, 0x04 })
             }
 
-            Method (RSMB, 1, Serialized)
+            Device (RP01)
             {
-                Return (Zero)
+                Name (_ADR, 0x001C0000)
+                Name (_PRW, Package (0x02) { 0x09, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x10 }, 
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x11 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x12 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x13 }
+                })
             }
 
-            Method (WSMB, 1, Serialized)
+            Device (RP02)
             {
-                Return (Zero)
+                Name (_ADR, 0x001C0001)
+                Name (_PRW, Package (0x02) { 0x09, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x11 }, 
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x12 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x13 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x10 }
+                })
             }
 
-            Method (RSMW, 1, Serialized)
+            Device (RP03)
             {
-                Return (Zero)
+                Name (_ADR, 0x001C0002)
+                Name (_PRW, Package (0x02) { 0x09, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x12 }, 
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x13 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x10 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x11 }
+                })
             }
 
-            Method (WSMW, 1, Serialized)
+            Device (RP04)
             {
-                Return (Zero)
+                Name (_ADR, 0x001C0003)
+                Name (_PRW, Package (0x02) { 0x09, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x13 }, 
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x10 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x11 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x12 }
+                })
             }
 
-            Method (RSMK, 1, Serialized)
+            Device (RP05)
             {
-                Return (Zero)
+                Name (_ADR, 0x001C0004)
+                Name (_PRW, Package (0x02) { 0x09, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x10 },
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x11 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x12 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x13}
+				})
             }
 
-            Method (WSMK, 1, Serialized)
+            Device (RP06)
             {
-                Return (Zero)
+                Name (_ADR, 0x001C0005)
+                Name (_PRW, Package (0x02) { 0x09, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x11 },
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x12 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x13 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x10 }
+                })
             }
 
-            Method (WMBD, 3, NotSerialized)
+            Device (EHC2)
             {
-                Store (One, Local0)
-                Name (_T_0, Zero)
-                Store (Arg1, _T_0)
-                If (LEqual (_T_0, 0x424D5352))
+                Name (_ADR, 0x001A0000)
+                Name (_S3D, 0x02)
+				Name (_S4D, 0x02)
+
+                OperationRegion (PWKE, PCI_Config, 0x62, One)	// PWAKE_CAP—Port Wake Capability Register (datasheet 324645-006, page 652)
+                Field (PWKE, ByteAcc, NoLock, Preserve)
                 {
-                    Return (RSMB (Arg2))
+                     PWI,   1,									// Port Wake Implemented
+                    PWUC,   7									// Port Wake Up Capability Mask
                 }
-                Else
+
+                Method (_PSW, 1, NotSerialized)
                 {
-                    If (LEqual (_T_0, 0x424D5357))
-                    {
-                        Return (WSMB (Arg2))
-                    }
-                    Else
+                    Multiply (0x7E, Arg0, PWUC)					// Set bit 0-8 based on Arg0 (0 disable- or 1 enable wake capabilities).
+                }
+
+                Device (HUBN)
+                {
+                    Name (_ADR, Zero)
+                    Device (PR01)
                     {
-                        If (LEqual (_T_0, 0x574D5352))
+                        Name (_ADR, One)
+                        Name (_UPC, Package (0x04) { 0xFF, Zero, Zero, Zero })
+                        Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0x30, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero })
+                        Device (PR11)
+                        {
+                            Name (_ADR, One)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero })
+                        }
+
+                        Device (PR12)
+                        {
+                            Name (_ADR, 0x02)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero })
+                        }
+
+                        Device (PR13)
+                        {
+                            Name (_ADR, 0x03)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero })
+                        }
+
+                        Device (PR14)
+                        {
+                            Name (_ADR, 0x04)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                        }
+
+                        Device (PR15)
                         {
-                            Return (RSMW (Arg2))
+                            Name (_ADR, 0x05)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
                         }
-                        Else
+
+                        Device (PR16)
                         {
-                            If (LEqual (_T_0, 0x574D5357))
-                            {
-                                Return (WSMW (Arg2))
-                            }
-                            Else
-                            {
-                                If (LEqual (_T_0, 0x4B4D5352))
-                                {
-                                    Return (RSMK (Arg2))
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, 0x4B4D5357))
-                                    {
-                                        Return (WSMK (Arg2))
-                                    }
-                                    Else
-                                    {
-                                        Return (Zero)
-                                    }
-                                }
-                            }
+                            Name (_ADR, 0x06)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
                         }
                     }
                 }
 
-                Return (Local0)
+                Name (_PRW, Package (0x02) { 0x0D, 0x04 })
             }
 
-            Method (_WED, 1, NotSerialized)
+            Device (HDEF)
             {
-                If (LEqual (Arg0, 0xD2))
-                {
-                    Return (EID2)
-                }
-
-                Return (Zero)
+                Name (_ADR, 0x001B0000)
+                Name (_PRW, Package (0x02) { 0x0D, 0x04 })
             }
 
-            Method (AMWR, 1, Serialized)
+            Device (RP07)
             {
-                Store (Zero, Local1)
-                If (ECD2)
-                {
-                    Store (Arg0, EID2)
-                    Notify (AMW0, 0xD2)
-                    Store (One, Local1)
-                }
-                Else
+                Name (_ADR, 0x001C0006)
+                Name (_PRT, Package (0x04)
                 {
-                }
-
-                Return (Local1)
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x12 },
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x13 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x10 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x11 }
+                })
             }
 
-            Method (AMWN, 1, Serialized)
+            Device (RP08)
             {
-                Store (AMWR (Arg0), Local0)
-                Return (Local0)
+                Name (_ADR, 0x001C0007)
+                Name (_PRW, Package (0x02) { 0x09, 0x04 })
+                Name (_PRT, Package (0x04)
+                {
+                    Package (0x04) { 0xFFFF, Zero, Zero, 0x13 }, 
+                    Package (0x04) { 0xFFFF,  One, Zero, 0x10 },
+                    Package (0x04) { 0xFFFF, 0x02, Zero, 0x11 },
+                    Package (0x04) { 0xFFFF, 0x03, Zero, 0x12 }
+                })
             }
 
-            Name (WQMO, Buffer (0x09A6)
+            Device (EHC1)
             {
-                /* 0000 */    0x46, 0x4F, 0x4D, 0x42, 0x01, 0x00, 0x00, 0x00, 
-                /* 0008 */    0x96, 0x09, 0x00, 0x00, 0x42, 0x38, 0x00, 0x00, 
-                /* 0010 */    0x44, 0x53, 0x00, 0x01, 0x1A, 0x7D, 0xDA, 0x54, 
-                /* 0018 */    0xA8, 0xD1, 0x9A, 0x00, 0x01, 0x06, 0x18, 0x42, 
-                /* 0020 */    0x10, 0x07, 0x10, 0x4A, 0x29, 0x86, 0x42, 0x04, 
-                /* 0028 */    0x0A, 0x0D, 0xA1, 0x38, 0x0A, 0x60, 0x30, 0x12, 
-                /* 0030 */    0x20, 0x24, 0x07, 0x42, 0x2E, 0x98, 0x98, 0x00, 
-                /* 0038 */    0x11, 0x10, 0xF2, 0x2A, 0xC0, 0xA6, 0x00, 0x93, 
-                /* 0040 */    0x20, 0xEA, 0xDF, 0x1F, 0xA2, 0x24, 0x38, 0x94, 
-                /* 0048 */    0x10, 0x08, 0x49, 0x14, 0x60, 0x5E, 0x80, 0x6E, 
-                /* 0050 */    0x01, 0x86, 0x05, 0xD8, 0x16, 0x60, 0x5A, 0x80, 
-                /* 0058 */    0x63, 0x48, 0x2A, 0x0D, 0x9C, 0x12, 0x58, 0x0A, 
-                /* 0060 */    0x84, 0x84, 0x0A, 0x50, 0x2E, 0xC0, 0xB7, 0x00, 
-                /* 0068 */    0xED, 0x88, 0x92, 0x2C, 0xC0, 0x32, 0x8C, 0x08, 
-                /* 0070 */    0x3C, 0x8A, 0xC8, 0x46, 0xE3, 0x04, 0x65, 0x43, 
-                /* 0078 */    0xA3, 0x64, 0x40, 0xC8, 0xB3, 0x00, 0xEB, 0xC0, 
-                /* 0080 */    0x84, 0xC0, 0xEE, 0x05, 0x98, 0x13, 0xE0, 0x4D, 
-                /* 0088 */    0x80, 0xB8, 0x61, 0x68, 0x85, 0x07, 0x10, 0xAA, 
-                /* 0090 */    0x30, 0x01, 0xB6, 0x60, 0x84, 0x52, 0x1B, 0x8C, 
-                /* 0098 */    0x50, 0x1A, 0x43, 0xD0, 0x30, 0x8C, 0x12, 0xF1, 
-                /* 00A0 */    0x90, 0x3A, 0x83, 0x15, 0x4A, 0xC4, 0x30, 0x21, 
-                /* 00A8 */    0x22, 0x54, 0x86, 0x41, 0x86, 0x15, 0x2A, 0x5A, 
-                /* 00B0 */    0xDC, 0x08, 0xED, 0x0F, 0x82, 0x44, 0x5B, 0xB1, 
-                /* 00B8 */    0x86, 0xEA, 0x48, 0xA3, 0x41, 0x0D, 0x2F, 0xC1, 
-                /* 00C0 */    0xE1, 0x7A, 0xA8, 0xE7, 0xD8, 0xB9, 0x00, 0xE9, 
-                /* 00C8 */    0xC0, 0x02, 0x09, 0x7E, 0x16, 0x75, 0x8E, 0x93, 
-                /* 00D0 */    0x80, 0x24, 0x30, 0xD6, 0xF1, 0xB3, 0x81, 0xE3, 
-                /* 00D8 */    0x5D, 0x03, 0x6A, 0xC6, 0xC7, 0xCB, 0x04, 0xC1, 
-                /* 00E0 */    0xA1, 0x86, 0xE8, 0x81, 0x86, 0x3B, 0x81, 0x43, 
-                /* 00E8 */    0x64, 0x80, 0x9E, 0xD3, 0xD1, 0x60, 0x0E, 0x00, 
-                /* 00F0 */    0x76, 0x38, 0x19, 0xDD, 0x03, 0x4A, 0x15, 0x60, 
-                /* 00F8 */    0x76, 0xCC, 0xB2, 0x08, 0xA4, 0xF1, 0x18, 0xFA, 
-                /* 0100 */    0x74, 0xCF, 0xE7, 0x84, 0x13, 0x58, 0xFE, 0x20, 
-                /* 0108 */    0x50, 0x23, 0x33, 0xB4, 0x0D, 0x4E, 0x4B, 0x98, 
-                /* 0110 */    0x21, 0x0F, 0xFF, 0xB0, 0x98, 0x58, 0x08, 0x7D, 
-                /* 0118 */    0x10, 0x3C, 0x1E, 0x78, 0xFF, 0xFF, 0xF1, 0x80, 
-                /* 0120 */    0x47, 0xF1, 0x99, 0x40, 0x08, 0xAF, 0x04, 0xB1, 
-                /* 0128 */    0x3D, 0xA0, 0xE7, 0x04, 0x03, 0x63, 0x07, 0x64, 
-                /* 0130 */    0xBF, 0x02, 0x10, 0x82, 0x97, 0x39, 0x22, 0x39, 
-                /* 0138 */    0x45, 0xD0, 0x98, 0x8C, 0xD1, 0x2A, 0x84, 0x86, 
-                /* 0140 */    0x10, 0xDA, 0x10, 0x67, 0x17, 0xFF, 0xE0, 0x0D, 
-                /* 0148 */    0x73, 0xEE, 0x26, 0x28, 0x72, 0x04, 0xA8, 0xCF, 
-                /* 0150 */    0x84, 0x47, 0xC0, 0x8F, 0x01, 0xD1, 0x43, 0x9F, 
-                /* 0158 */    0x4D, 0xF4, 0xE3, 0x89, 0x72, 0x12, 0x07, 0xE4, 
-                /* 0160 */    0x33, 0x83, 0x11, 0x82, 0x97, 0x7B, 0x48, 0x20, 
-                /* 0168 */    0x9A, 0xE7, 0xA0, 0x13, 0xC3, 0x39, 0x1D, 0x02, 
-                /* 0170 */    0x53, 0xA3, 0x05, 0xA2, 0x09, 0x10, 0x45, 0x59, 
-                /* 0178 */    0xAA, 0x6C, 0x2C, 0xD5, 0x83, 0xA0, 0x82, 0x80, 
-                /* 0180 */    0x34, 0x77, 0x43, 0x9C, 0xB4, 0x91, 0x03, 0xC7, 
-                /* 0188 */    0xA8, 0x7E, 0xD8, 0x54, 0x04, 0x9C, 0x0E, 0x1B, 
-                /* 0190 */    0x1E, 0xB7, 0xE3, 0x93, 0x28, 0xFA, 0x80, 0x28, 
-                /* 0198 */    0x9C, 0xC3, 0x9E, 0x39, 0x28, 0x88, 0x01, 0x9D, 
-                /* 01A0 */    0x04, 0x42, 0x4E, 0x8E, 0x02, 0xA8, 0xBD, 0x68, 
-                /* 01A8 */    0x58, 0x1A, 0xD7, 0xA9, 0xBD, 0x09, 0x78, 0x5A, 
-                /* 01B0 */    0x8F, 0x05, 0x87, 0x71, 0x5C, 0x67, 0x6D, 0xD1, 
-                /* 01B8 */    0x37, 0x06, 0x3A, 0x1F, 0xDF, 0x05, 0xB8, 0x06, 
-                /* 01C0 */    0x08, 0xCD, 0xC8, 0xF0, 0x56, 0x03, 0x48, 0xC1, 
-                /* 01C8 */    0xF8, 0x49, 0xE0, 0x11, 0xC0, 0x04, 0xD6, 0x75, 
-                /* 01D0 */    0x20, 0x80, 0x7E, 0xD9, 0xF0, 0xF0, 0x7D, 0xC2, 
-                /* 01D8 */    0x78, 0xBC, 0x48, 0x50, 0xDF, 0x7D, 0x00, 0x14, 
-                /* 01E0 */    0x40, 0x3E, 0x00, 0x58, 0xE9, 0x1D, 0x80, 0x8E, 
-                /* 01E8 */    0x21, 0x44, 0x98, 0x68, 0x46, 0xE7, 0x12, 0x56, 
-                /* 01F0 */    0xAA, 0xFF, 0xFF, 0x68, 0xF9, 0x41, 0xC5, 0xA3, 
-                /* 01F8 */    0x35, 0x88, 0x47, 0xEB, 0x40, 0xA3, 0x45, 0x1F, 
-                /* 0200 */    0x33, 0xAC, 0x70, 0x54, 0xF2, 0x39, 0x01, 0x0D, 
-                /* 0208 */    0x17, 0x06, 0x41, 0xE1, 0x07, 0x0E, 0x68, 0x80, 
-                /* 0210 */    0xA7, 0xF7, 0x66, 0xE0, 0x99, 0x18, 0xCE, 0xF3, 
-                /* 0218 */    0xE5, 0x70, 0x9E, 0x2F, 0x1F, 0x8E, 0x0F, 0x14, 
-                /* 0220 */    0xF0, 0x07, 0x8C, 0x25, 0x28, 0x70, 0xC2, 0x20, 
-                /* 0228 */    0x87, 0xC7, 0x08, 0x1E, 0x2C, 0x95, 0x35, 0x2E, 
-                /* 0230 */    0xD4, 0xFD, 0xC0, 0x27, 0x1A, 0x86, 0x7D, 0xA8, 
-                /* 0238 */    0x47, 0xF3, 0x96, 0x70, 0x86, 0x6F, 0x13, 0x07, 
-                /* 0240 */    0xF5, 0xEE, 0x61, 0xA7, 0x42, 0x2D, 0x3A, 0x84, 
-                /* 0248 */    0xF5, 0x48, 0x39, 0xAC, 0xD1, 0xC2, 0x1E, 0xF0, 
-                /* 0250 */    0x73, 0x87, 0xEF, 0x19, 0xFC, 0x4A, 0xE3, 0x63, 
-                /* 0258 */    0x08, 0x5D, 0x85, 0x4E, 0x15, 0x5C, 0x14, 0x84, 
-                /* 0260 */    0xE2, 0xAD, 0x45, 0xC3, 0x3F, 0x0B, 0x8F, 0xEB, 
-                /* 0268 */    0x15, 0xC3, 0x57, 0x80, 0x87, 0x13, 0x9F, 0x01, 
-                /* 0270 */    0xE2, 0x07, 0x3A, 0x82, 0x17, 0x11, 0x9F, 0x7D, 
-                /* 0278 */    0x7C, 0x79, 0xF1, 0x21, 0x83, 0x9D, 0x2C, 0x78, 
-                /* 0280 */    0x08, 0x0A, 0xC5, 0x38, 0x1C, 0xA0, 0x84, 0xC3, 
-                /* 0288 */    0x08, 0xCE, 0x20, 0x1E, 0x9E, 0x83, 0x1C, 0x0E, 
-                /* 0290 */    0xD0, 0xE7, 0x20, 0x0F, 0x84, 0x0D, 0xC2, 0x20, 
-                /* 0298 */    0xE7, 0xF1, 0xF2, 0xC3, 0x2E, 0x16, 0xF8, 0xFF, 
-                /* 02A0 */    0xFF, 0xC5, 0x02, 0x78, 0xA5, 0x19, 0x14, 0x5A, 
-                /* 02A8 */    0xCF, 0xA0, 0x20, 0x60, 0x3C, 0x3F, 0x78, 0xBC, 
-                /* 02B0 */    0x9E, 0xAD, 0xA7, 0x05, 0xDE, 0x11, 0xFB, 0xFC, 
-                /* 02B8 */    0x01, 0x9C, 0xC3, 0x1F, 0x5E, 0x50, 0x71, 0x87, 
-                /* 02C0 */    0x44, 0x41, 0x7C, 0x36, 0x70, 0x94, 0xF1, 0xA2, 
-                /* 02C8 */    0x67, 0xE2, 0xC3, 0x90, 0x8F, 0x0B, 0x4F, 0x37, 
-                /* 02D0 */    0x98, 0xC3, 0x07, 0xB8, 0x47, 0xE2, 0xC3, 0x07, 
-                /* 02D8 */    0xF0, 0xF8, 0xFF, 0x1F, 0x3E, 0x80, 0x9F, 0x44, 
-                /* 02E0 */    0x8B, 0x5A, 0x85, 0x1E, 0x3E, 0xC0, 0x15, 0xE4, 
-                /* 02E8 */    0x84, 0x84, 0x96, 0x73, 0xF8, 0x40, 0x4E, 0x24, 
-                /* 02F0 */    0x4C, 0x74, 0x9F, 0x91, 0x5E, 0x3C, 0x2C, 0xE1, 
-                /* 02F8 */    0xE0, 0x81, 0x0A, 0x4F, 0xA2, 0xF8, 0xA7, 0x02, 
-                /* 0300 */    0x54, 0xE0, 0x53, 0x01, 0x05, 0x31, 0xA0, 0x0F, 
-                /* 0308 */    0x15, 0x70, 0x66, 0xF0, 0xEC, 0x85, 0x99, 0x07, 
-                /* 0310 */    0x8C, 0x33, 0x12, 0x60, 0xEB, 0x50, 0x01, 0xDE, 
-                /* 0318 */    0xFF, 0xFF, 0xA1, 0x02, 0x38, 0x1C, 0x90, 0x00, 
-                /* 0320 */    0x59, 0x12, 0x2F, 0x48, 0x0F, 0x15, 0xE0, 0x3A, 
-                /* 0328 */    0x70, 0xFA, 0x50, 0xC1, 0x0F, 0x9A, 0x16, 0x05, 
-                /* 0330 */    0xA4, 0x23, 0x9E, 0x0F, 0x15, 0x30, 0x2E, 0x42, 
-                /* 0338 */    0x86, 0x7F, 0xAD, 0x3B, 0x96, 0xE7, 0x30, 0x72, 
-                /* 0340 */    0xAE, 0x40, 0xC7, 0x3E, 0x18, 0xA0, 0x82, 0x8E, 
-                /* 0348 */    0x9E, 0x82, 0x18, 0xD0, 0x29, 0x0E, 0x06, 0x68, 
-                /* 0350 */    0x1D, 0xE7, 0x0A, 0xD4, 0x31, 0x0E, 0xF8, 0xFD, 
-                /* 0358 */    0xFF, 0xCF, 0x14, 0xC0, 0x49, 0xC4, 0xD1, 0x0A, 
-                /* 0360 */    0x35, 0x5C, 0x8F, 0xD5, 0x20, 0x1E, 0xAB, 0x8F, 
-                /* 0368 */    0xA1, 0x1E, 0x2B, 0xEE, 0x1B, 0xE0, 0x23, 0x00, 
-                /* 0370 */    0xFE, 0xE8, 0x84, 0x03, 0x7B, 0xAE, 0x00, 0x4C, 
-                /* 0378 */    0x7B, 0x3C, 0x57, 0x80, 0x4E, 0xDA, 0xD9, 0x07, 
-                /* 0380 */    0x1D, 0x70, 0xAD, 0x3A, 0x89, 0xE1, 0xCF, 0x71, 
-                /* 0388 */    0x8C, 0x60, 0xA8, 0xC3, 0x1B, 0x85, 0x70, 0x1C, 
-                /* 0390 */    0x0A, 0x85, 0x39, 0x19, 0xD0, 0xFF, 0xFF, 0x11, 
-                /* 0398 */    0x96, 0xC0, 0x51, 0x10, 0x0F, 0xCD, 0x61, 0xCE, 
-                /* 03A0 */    0x70, 0xA0, 0x39, 0x16, 0xC0, 0xBB, 0x55, 0xB0, 
-                /* 03A8 */    0x63, 0x01, 0x6C, 0x02, 0x1F, 0x0B, 0xC0, 0x17, 
-                /* 03B0 */    0x67, 0x58, 0xE8, 0xD1, 0xFA, 0xFE, 0x87, 0xBB, 
-                /* 03B8 */    0x3F, 0x44, 0x79, 0x29, 0xF6, 0x21, 0x07, 0xEE, 
-                /* 03C0 */    0xB8, 0xC0, 0x71, 0x7A, 0x00, 0x5C, 0x1D, 0xC4, 
-                /* 03C8 */    0xE4, 0xF4, 0xF4, 0x00, 0xAE, 0x24, 0xA7, 0x07, 
-                /* 03D0 */    0xD4, 0x80, 0xFD, 0xFF, 0xD7, 0x03, 0xA4, 0x73, 
-                /* 03D8 */    0x02, 0xF6, 0xA2, 0xCD, 0x20, 0x4E, 0xF4, 0x79, 
-                /* 03E0 */    0xC4, 0x0A, 0x8E, 0x38, 0xA8, 0xEC, 0x24, 0x4A, 
-                /* 03E8 */    0x7E, 0xC4, 0x41, 0x65, 0x1D, 0x3B, 0x05, 0x31, 
-                /* 03F0 */    0xA0, 0x4F, 0x94, 0x80, 0x8F, 0x3B, 0x0E, 0xB0, 
-                /* 03F8 */    0xD8, 0xA8, 0x27, 0xCB, 0x23, 0x4F, 0x96, 0x82, 
-                /* 0400 */    0x78, 0xB2, 0xBE, 0x54, 0x00, 0x87, 0x1B, 0x0E, 
-                /* 0408 */    0xB0, 0xFF, 0xFF, 0x5F, 0x2A, 0x80, 0x92, 0x43, 
-                /* 0410 */    0xA9, 0x97, 0x0A, 0x90, 0xC9, 0xBB, 0xE1, 0xA0, 
-                /* 0418 */    0x43, 0xAE, 0x55, 0xF7, 0x3A, 0x76, 0x6C, 0xF5, 
-                /* 0420 */    0xB8, 0x7D, 0x93, 0xC6, 0x04, 0xBB, 0xE1, 0xA0, 
-                /* 0428 */    0x22, 0x51, 0x28, 0xD0, 0xB9, 0x00, 0x15, 0x01, 
-                /* 0430 */    0x8E, 0x82, 0x78, 0x68, 0x3E, 0x17, 0x58, 0xC9, 
-                /* 0438 */    0xB9, 0x00, 0xED, 0xFD, 0x42, 0x41, 0x06, 0xE7, 
-                /* 0440 */    0x7B, 0x81, 0x61, 0x8A, 0x1F, 0x8A, 0xEE, 0x3D, 
-                /* 0448 */    0x3E, 0x17, 0x80, 0xFB, 0x8A, 0x03, 0x2E, 0x63, 
-                /* 0450 */    0x02, 0xB4, 0x41, 0x92, 0x7B, 0xB8, 0xC7, 0x85, 
-                /* 0458 */    0x1B, 0x87, 0x47, 0x75, 0x4C, 0x31, 0x9F, 0xE3, 
-                /* 0460 */    0x82, 0x3C, 0xC7, 0x79, 0x5E, 0xB8, 0xF3, 0x03, 
-                /* 0468 */    0x70, 0xFB, 0xFF, 0x0F, 0x0C, 0xD6, 0x85, 0x0B, 
-                /* 0470 */    0x88, 0x0B, 0x35, 0x29, 0xF1, 0xFC, 0x00, 0xAE, 
-                /* 0478 */    0x5B, 0xB7, 0xEF, 0x85, 0x38, 0x29, 0x77, 0x57, 
-                /* 0480 */    0x14, 0xC6, 0x2B, 0x49, 0x0C, 0xDF, 0x53, 0x8D, 
-                /* 0488 */    0x6D, 0x98, 0x03, 0x38, 0x15, 0xE3, 0x24, 0x18, 
-                /* 0490 */    0xFC, 0xEC, 0x40, 0xC7, 0xE5, 0xC8, 0x24, 0xBA, 
-                /* 0498 */    0xED, 0xFB, 0x08, 0xC1, 0x63, 0x8E, 0x9E, 0x82, 
-                /* 04A0 */    0x18, 0xD0, 0x19, 0x4E, 0x2A, 0x68, 0x15, 0x20, 
-                /* 04A8 */    0x9A, 0x02, 0xE6, 0xE6, 0x0A, 0xF8, 0xFB, 0xFF, 
-                /* 04B0 */    0xDF, 0x5C, 0x01, 0x56, 0xB8, 0x54, 0xA8, 0x51, 
-                /* 04B8 */    0xEA, 0x91, 0x02, 0x5C, 0x77, 0x40, 0xDF, 0xC2, 
-                /* 04C0 */    0x70, 0x92, 0x80, 0x74, 0x65, 0x3D, 0x8D, 0x07, 
-                /* 04C8 */    0x00, 0x5F, 0x29, 0x60, 0x5C, 0x3C, 0xD9, 0x11, 
-                /* 04D0 */    0x87, 0xDF, 0xAE, 0x7D, 0x2C, 0x00, 0xE6, 0xFF, 
-                /* 04D8 */    0xFF, 0x2B, 0x21, 0x58, 0x8F, 0x05, 0xC0, 0x5B, 
-                /* 04E0 */    0xA4, 0x4B, 0x8B, 0x66, 0x8F, 0x05, 0xE0, 0x12, 
-                /* 04E8 */    0xBF, 0x0A, 0x7A, 0x50, 0xB1, 0x5C, 0x18, 0x94, 
-                /* 04F0 */    0x84, 0xB1, 0x43, 0x19, 0xCD, 0xC1, 0x1C, 0x43, 
-                /* 04F8 */    0x70, 0x76, 0x86, 0x31, 0x1C, 0x1F, 0xA8, 0xA7, 
-                /* 0500 */    0xFE, 0x58, 0x7B, 0x1A, 0xAF, 0x68, 0xBE, 0xE2, 
-                /* 0508 */    0xF9, 0x3E, 0x4A, 0x87, 0x88, 0xBA, 0xEA, 0x79, 
-                /* 0510 */    0xAC, 0x6F, 0x05, 0xA7, 0xF6, 0xAC, 0xE7, 0x6B, 
-                /* 0518 */    0x8B, 0x61, 0x12, 0x78, 0x88, 0x0C, 0x8D, 0x13, 
-                /* 0520 */    0xBC, 0x23, 0x19, 0x9A, 0xCB, 0x80, 0xD0, 0x5D, 
-                /* 0528 */    0xE9, 0x35, 0xC0, 0x73, 0x33, 0x41, 0xF7, 0x43, 
-                /* 0530 */    0x97, 0x42, 0x04, 0x9D, 0x00, 0xDE, 0x09, 0x6A, 
-                /* 0538 */    0x14, 0xE0, 0xED, 0x2A, 0x20, 0x5B, 0x02, 0xC4, 
-                /* 0540 */    0x8D, 0x5E, 0x58, 0x6F, 0x45, 0x51, 0x42, 0x44, 
-                /* 0548 */    0x08, 0x1A, 0xC5, 0x78, 0x11, 0x42, 0x85, 0x88, 
-                /* 0550 */    0x12, 0xB5, 0x39, 0x10, 0x5D, 0x8E, 0xA2, 0x06, 
-                /* 0558 */    0x89, 0x16, 0xCC, 0x08, 0xCC, 0xFE, 0x20, 0x88, 
-                /* 0560 */    0xF4, 0x67, 0x80, 0x2E, 0x33, 0xBE, 0x0C, 0x7B, 
-                /* 0568 */    0x34, 0xFC, 0x2C, 0xC5, 0x87, 0x7A, 0x8E, 0x8F, 
-                /* 0570 */    0x8A, 0xEC, 0xFF, 0x0F, 0xF2, 0x5A, 0x68, 0x9D, 
-                /* 0578 */    0xE3, 0x24, 0x87, 0x1C, 0x83, 0xEB, 0x0C, 0x01, 
-                /* 0580 */    0xCD, 0x35, 0xA0, 0x8E, 0xFD, 0x1E, 0xAF, 0xBF, 
-                /* 0588 */    0x1A, 0x86, 0xE3, 0x43, 0xF4, 0xA1, 0xC2, 0x13, 
-                /* 0590 */    0x38, 0x44, 0x06, 0xE8, 0x43, 0x04, 0xFC, 0xF1, 
-                /* 0598 */    0x18, 0xFA, 0x29, 0xC2, 0x13, 0x7E, 0xA1, 0x25, 
-                /* 05A0 */    0x83, 0x40, 0x9D, 0x34, 0xF8, 0x48, 0x5F, 0xB8, 
-                /* 05A8 */    0xD9, 0xED, 0xC3, 0x04, 0x16, 0x7B, 0x76, 0xA0, 
-                /* 05B0 */    0xE3, 0x01, 0xBF, 0xE2, 0x33, 0x81, 0xAE, 0x71, 
-                /* 05B8 */    0xC6, 0xF6, 0xC9, 0xC8, 0x11, 0x0E, 0x22, 0x50, 
-                /* 05C0 */    0x40, 0x9F, 0x4D, 0xF8, 0xCD, 0x83, 0x1D, 0x2D, 
-                /* 05C8 */    0xB8, 0xA8, 0xA3, 0x05, 0xEA, 0xB4, 0xE0, 0x83, 
-                /* 05D0 */    0x02, 0x43, 0x7C, 0xF8, 0x34, 0xC4, 0x93, 0x05, 
-                /* 05D8 */    0x3B, 0xEA, 0x80, 0x53, 0xDE, 0x21, 0x04, 0x14, 
-                /* 05E0 */    0x20, 0x3E, 0x59, 0xB0, 0x79, 0x61, 0x08, 0x2C, 
-                /* 05E8 */    0x12, 0x1E, 0x75, 0xE8, 0x30, 0x3C, 0x3F, 0x25, 
-                /* 05F0 */    0x3C, 0x8E, 0x30, 0xEC, 0x37, 0x12, 0x4F, 0xE1, 
-                /* 05F8 */    0x70, 0x7C, 0xA4, 0x30, 0x42, 0xF0, 0x72, 0x4F, 
-                /* 0600 */    0x16, 0xE4, 0x62, 0x73, 0x74, 0xFF, 0xFF, 0x27, 
-                /* 0608 */    0x18, 0xCC, 0x50, 0x3D, 0x04, 0x7E, 0x5E, 0xF0, 
-                /* 0610 */    0x10, 0xF8, 0x00, 0x5A, 0x9D, 0x1D, 0x39, 0x9F, 
-                /* 0618 */    0x9C, 0x13, 0x6E, 0xBC, 0x7C, 0x4C, 0xD8, 0x01, 
-                /* 0620 */    0xF0, 0xE0, 0x4B, 0xF2, 0x59, 0x84, 0xC6, 0x58, 
-                /* 0628 */    0xBE, 0x8F, 0x23, 0x80, 0x9C, 0x49, 0x3C, 0x81, 
-                /* 0630 */    0x44, 0x78, 0x19, 0x09, 0x12, 0xE2, 0x58, 0x5E, 
-                /* 0638 */    0x43, 0x0C, 0x12, 0xE3, 0xED, 0xC8, 0xC7, 0x11, 
-                /* 0640 */    0x0E, 0xF3, 0x4C, 0x62, 0xB8, 0x87, 0x83, 0x57, 
-                /* 0648 */    0x91, 0x17, 0x12, 0xC3, 0x3C, 0x8A, 0xF8, 0x7C, 
-                /* 0650 */    0x10, 0xC3, 0x98, 0xA1, 0xA2, 0x9D, 0x80, 0x8F, 
-                /* 0658 */    0x23, 0xEC, 0x58, 0xE9, 0xA1, 0xFA, 0x38, 0x02, 
-                /* 0660 */    0x58, 0xFA, 0xFF, 0x1F, 0x47, 0x80, 0xF9, 0x11, 
-                /* 0668 */    0x01, 0x77, 0xDA, 0x80, 0x7B, 0x9F, 0x08, 0xF1, 
-                /* 0670 */    0xA4, 0xF1, 0x92, 0xF0, 0xAC, 0x01, 0x5C, 0x84, 
-                /* 0678 */    0x6A, 0x39, 0xF7, 0xB0, 0x34, 0x8F, 0x01, 0x1D, 
-                /* 0680 */    0xCF, 0x38, 0x87, 0x35, 0x01, 0x69, 0x98, 0xFC, 
-                /* 0688 */    0xCA, 0xED, 0x73, 0xC1, 0xD9, 0x3D, 0x72, 0x1B, 
-                /* 0690 */    0x26, 0xC8, 0x13, 0xC1, 0x6B, 0x94, 0xC1, 0x05, 
-                /* 0698 */    0xA9, 0xF3, 0x23, 0x4F, 0x4F, 0x21, 0xDD, 0x27, 
-                /* 06A0 */    0x5A, 0x94, 0xD2, 0x63, 0x1A, 0x05, 0xF1, 0x19, 
-                /* 06A8 */    0xC1, 0x21, 0xCE, 0x31, 0xE8, 0xE1, 0x7B, 0x0E, 
-                /* 06B0 */    0x67, 0x74, 0x20, 0xEF, 0x01, 0xEC, 0xFE, 0x08, 
-                /* 06B8 */    0x3C, 0x4F, 0x3A, 0x78, 0x74, 0xDF, 0x14, 0xCE, 
-                /* 06C0 */    0xF3, 0x4C, 0xFF, 0xFF, 0x47, 0x04, 0xDE, 0x99, 
-                /* 06C8 */    0xFA, 0x82, 0x09, 0x9C, 0x43, 0xDC, 0x05, 0x50, 
-                /* 06D0 */    0xB2, 0xEF, 0x02, 0x14, 0xC4, 0x13, 0xF3, 0xD5, 
-                /* 06D8 */    0x0F, 0x0E, 0xFE, 0xAB, 0x1F, 0x30, 0xB9, 0x2C, 
-                /* 06E0 */    0xF8, 0x9A, 0x04, 0xBE, 0x53, 0x3F, 0xFE, 0xC2, 
-                /* 06E8 */    0xE0, 0xDB, 0xC0, 0xC3, 0x13, 0x1B, 0x14, 0xF8, 
-                /* 06F0 */    0xA1, 0x7C, 0x3D, 0x04, 0xFF, 0xFF, 0xFF, 0x7A, 
-                /* 06F8 */    0x08, 0x3C, 0x95, 0x3A, 0xB5, 0xA9, 0xF0, 0x7A, 
-                /* 0700 */    0x08, 0xAE, 0x28, 0xD7, 0x12, 0xD4, 0xAD, 0xC9, 
-                /* 0708 */    0x82, 0x80, 0x74, 0x3F, 0x7F, 0xBE, 0x31, 0xA6, 
-                /* 0710 */    0xCF, 0x25, 0xF0, 0xEE, 0xA0, 0x5A, 0x95, 0xEE, 
-                /* 0718 */    0x25, 0x3C, 0x38, 0x85, 0xA2, 0x1F, 0x1E, 0x50, 
-                /* 0720 */    0x61, 0x0F, 0x0F, 0x14, 0xC4, 0x17, 0x23, 0xDF, 
-                /* 0728 */    0x4B, 0x00, 0x0E, 0xFC, 0xFF, 0x47, 0xC4, 0x6F, 
-                /* 0730 */    0xDA, 0x70, 0x8E, 0x16, 0x98, 0x19, 0x81, 0xF5, 
-                /* 0738 */    0x44, 0xE0, 0x9B, 0x36, 0xE0, 0xE8, 0xE4, 0x02, 
-                /* 0740 */    0x5C, 0x4E, 0x25, 0x80, 0x2B, 0xAF, 0xA7, 0x12, 
-                /* 0748 */    0xFD, 0xFF, 0x4F, 0x25, 0xE0, 0xBA, 0x7B, 0x81, 
-                /* 0750 */    0xE9, 0x6A, 0x72, 0x26, 0xD1, 0x82, 0xFB, 0xEE, 
-                /* 0758 */    0x05, 0xF0, 0xF3, 0xFF, 0x7F, 0xF7, 0x02, 0x88, 
-                /* 0760 */    0xE9, 0xF5, 0xEE, 0x05, 0xBC, 0xCE, 0x25, 0x98, 
-                /* 0768 */    0xBB, 0x97, 0xFF, 0xFF, 0x77, 0x2F, 0x80, 0xFF, 
-                /* 0770 */    0xFF, 0xFF, 0xBB, 0x17, 0x40, 0x96, 0x53, 0x09, 
-                /* 0778 */    0xC8, 0xB2, 0x9D, 0x4A, 0xD0, 0x0A, 0xCF, 0xD1, 
-                /* 0780 */    0x50, 0x27, 0x70, 0x28, 0x4F, 0x18, 0xAF, 0xEA, 
-                /* 0788 */    0x09, 0xAC, 0xE7, 0xF2, 0x85, 0x52, 0x02, 0xA3, 
-                /* 0790 */    0xCB, 0x17, 0xB0, 0xFB, 0xFF, 0x5F, 0xBE, 0x00, 
-                /* 0798 */    0x3E, 0x04, 0xBA, 0x0B, 0xA0, 0x22, 0xDC, 0x05, 
-                /* 07A0 */    0x28, 0x88, 0x2F, 0x5F, 0x80, 0x97, 0x50, 0x10, 
-                /* 07A8 */    0x32, 0x72, 0x93, 0xA0, 0x97, 0x2F, 0x38, 0x17, 
-                /* 07B0 */    0x07, 0xDF, 0x8F, 0x3C, 0x28, 0x78, 0xFF, 0xFF, 
-                /* 07B8 */    0x41, 0xC1, 0x19, 0xCC, 0x79, 0x17, 0x7B, 0x52, 
-                /* 07C0 */    0xA4, 0xD7, 0x13, 0xB8, 0x77, 0x0E, 0x8F, 0x0D, 
-                /* 07C8 */    0x1C, 0xE2, 0xAE, 0x60, 0xC0, 0xDE, 0xE5, 0xED, 
-                /* 07D0 */    0x04, 0x5C, 0xDA, 0xD6, 0xAE, 0xDB, 0x09, 0x2E, 
-                /* 07D8 */    0xE1, 0x71, 0x1A, 0xF2, 0xF1, 0x04, 0x93, 0xE7, 
-                /* 07E0 */    0x76, 0x82, 0x4A, 0x02, 0xA3, 0x2C, 0x24, 0x3A, 
-                /* 07E8 */    0x42, 0x70, 0xF5, 0x37, 0x31, 0x0A, 0x62, 0x0B, 
-                /* 07F0 */    0xB7, 0x13, 0x40, 0xC7, 0xFF, 0xFF, 0x76, 0x02, 
-                /* 07F8 */    0xFC, 0xC7, 0x0C, 0x67, 0x44, 0xEF, 0x15, 0x86, 
-                /* 0800 */    0xF4, 0x19, 0x0C, 0x98, 0x06, 0x3A, 0x82, 0xA0, 
-                /* 0808 */    0x2F, 0x69, 0xD8, 0x04, 0x37, 0x10, 0x3A, 0x23, 
-                /* 0810 */    0x78, 0x17, 0x10, 0xB8, 0x13, 0x83, 0x75, 0x00, 
-                /* 0818 */    0x01, 0xDF, 0x59, 0x0D, 0x78, 0xFD, 0xFF, 0xCF, 
-                /* 0820 */    0x6A, 0xC0, 0xF4, 0x00, 0xE0, 0xB3, 0x1A, 0xA0, 
-                /* 0828 */    0xEA, 0xF6, 0x02, 0x32, 0x85, 0x36, 0x7D, 0x6A, 
-                /* 0830 */    0x34, 0x6A, 0xD5, 0xA0, 0x4C, 0x8D, 0x32, 0x0D, 
-                /* 0838 */    0x6A, 0xF5, 0xA9, 0xD4, 0x98, 0x31, 0xBB, 0x60, 
-                /* 0840 */    0x8A, 0x71, 0x7B, 0xA2, 0x22, 0x96, 0x23, 0x10, 
-                /* 0848 */    0xEB, 0xA6, 0x90, 0x91, 0xCB, 0x86, 0x41, 0x04, 
-                /* 0850 */    0x64, 0xD9, 0x8B, 0x16, 0x10, 0x01, 0x11, 0x90, 
-                /* 0858 */    0x85, 0xBC, 0x1B, 0x04, 0x64, 0x55, 0x20, 0x02, 
-                /* 0860 */    0x72, 0x2A, 0x20, 0x1A, 0x11, 0x88, 0xC6, 0xF1, 
-                /* 0868 */    0x00, 0xC4, 0xC2, 0x81, 0x08, 0xC8, 0xEA, 0x4C, 
-                /* 0870 */    0x00, 0x31, 0xA9, 0x20, 0xBA, 0x43, 0x90, 0xCF, 
-                /* 0878 */    0x85, 0x80, 0x2C, 0x12, 0x44, 0x40, 0xCE, 0xB8, 
-                /* 0880 */    0x3E, 0x01, 0x39, 0x30, 0x88, 0x80, 0x1C, 0xF2, 
-                /* 0888 */    0x1B, 0x22, 0x20, 0x47, 0x06, 0x11, 0x90, 0x05, 
-                /* 0890 */    0xEB, 0x00, 0xF2, 0xFF, 0x9F, 0xA0, 0x7C, 0x10, 
-                /* 0898 */    0x01, 0x39, 0x3E, 0x10, 0x15, 0xE3, 0xE3, 0xAE, 
-                /* 08A0 */    0x45, 0x1F, 0x03, 0x02, 0x72, 0x2E, 0x10, 0x01, 
-                /* 08A8 */    0x39, 0x07, 0x8D, 0x80, 0x9C, 0x8A, 0x42, 0x40, 
-                /* 08B0 */    0x56, 0xF5, 0x76, 0x10, 0x90, 0x35, 0x82, 0x08, 
-                /* 08B8 */    0xC8, 0x29, 0x81, 0x68, 0x66, 0x20, 0x2A, 0xD8, 
-                /* 08C0 */    0x0A, 0x10, 0x53, 0x0F, 0x22, 0x20, 0x2B, 0xD5, 
-                /* 08C8 */    0x02, 0xC4, 0x74, 0x83, 0x08, 0xC8, 0xA9, 0xBD, 
-                /* 08D0 */    0x00, 0x31, 0x0D, 0xEF, 0x00, 0x01, 0x59, 0xEB, 
-                /* 08D8 */    0xD3, 0x43, 0x20, 0x4E, 0x0A, 0x42, 0xB5, 0xBA, 
-                /* 08E0 */    0x01, 0x61, 0x39, 0xED, 0x80, 0x30, 0x95, 0x7A, 
-                /* 08E8 */    0x40, 0x58, 0x1E, 0x3F, 0x43, 0xA6, 0x20, 0x02, 
-                /* 08F0 */    0xB2, 0xA2, 0x97, 0x88, 0x80, 0x2C, 0x0F, 0x44, 
-                /* 08F8 */    0x40, 0x96, 0x62, 0x08, 0x88, 0x09, 0x03, 0x11, 
-                /* 0900 */    0x90, 0x23, 0x01, 0xD1, 0x80, 0x40, 0x54, 0x9E, 
-                /* 0908 */    0x23, 0x20, 0xA6, 0x15, 0x44, 0x40, 0x0E, 0x08, 
-                /* 0910 */    0x44, 0xD3, 0x02, 0x51, 0x8D, 0xBF, 0x25, 0x01, 
-                /* 0918 */    0x59, 0x30, 0x88, 0x80, 0x2C, 0xCE, 0xD2, 0x51, 
-                /* 0920 */    0x80, 0x82, 0x08, 0xC8, 0x31, 0x35, 0x0D, 0x95, 
-                /* 0928 */    0x82, 0x08, 0xC8, 0x42, 0x3D, 0x01, 0x31, 0xD5, 
-                /* 0930 */    0x20, 0x02, 0xB2, 0x42, 0x51, 0x40, 0x4C, 0x2F, 
-                /* 0938 */    0x88, 0x06, 0x49, 0x80, 0x68, 0x6E, 0x20, 0xAA, 
-                /* 0940 */    0x5A, 0x15, 0x10, 0x8B, 0x00, 0x22, 0x20, 0xE7, 
-                /* 0948 */    0x06, 0xA2, 0x22, 0x5C, 0x01, 0x31, 0xE9, 0x20, 
-                /* 0950 */    0x02, 0x72, 0x0E, 0x20, 0xAA, 0xF9, 0x49, 0x21, 
-                /* 0958 */    0x20, 0x27, 0x00, 0x11, 0x90, 0xF3, 0xDB, 0x3A, 
-                /* 0960 */    0x1A, 0xD0, 0x87, 0x8E, 0x80, 0x9C, 0x00, 0x44, 
-                /* 0968 */    0x40, 0x8E, 0x03, 0x44, 0xA5, 0xFB, 0x02, 0x62, 
-                /* 0970 */    0x41, 0x40, 0x04, 0x64, 0x41, 0xAF, 0x11, 0x0D, 
-                /* 0978 */    0x9C, 0x80, 0x08, 0xC8, 0xD1, 0x8C, 0x01, 0xB1, 
-                /* 0980 */    0x9C, 0x20, 0x02, 0xFA, 0xFF, 0x1F, 0xA8, 0xBE, 
-                /* 0988 */    0x22, 0x02, 0xB2, 0x52, 0x10, 0x0D, 0x9A, 0x00, 
-                /* 0990 */    0xD1, 0xB4, 0x40, 0x54, 0xF1, 0x9B, 0xE4, 0xD1, 
-                /* 0998 */    0x81, 0x81, 0xE8, 0x88, 0x40, 0xA4, 0x1D, 0x11, 
-                /* 09A0 */    0x28, 0x88, 0x80, 0xFC, 0xFF, 0x07
-            })
-            Method (SPEC, 1, Serialized)
-            {
-                Return (AMWV)
-            }
+                Name (_ADR, 0x001D0000)
+                Name (_S4D, 0x02)
+                Name (_S3D, 0x02)
 
-            Method (DEVP, 1, Serialized)
-            {
-                CreateDWordField (Arg0, Zero, DVID)
-                CreateDWordField (Arg0, 0x04, PARA)
-                If (LEqual (PARA, One))
+                Device (HUBN)
                 {
-                    Name (_T_0, Zero)
-                    Store (DVID, _T_0)
-                    If (LEqual (_T_0, 0x00010011))
-                    {
-                        Or (\_SB.DSAF, One, \_SB.DSAF)
-                    }
-                    Else
+                    Name (_ADR, Zero)
+                    Device (PR01)
                     {
-                        If (LEqual (_T_0, 0x00010013))
+                        Name (_ADR, One)
+                        Name (_UPC, Package (0x04) { 0xFF, Zero, Zero, Zero })
+                        Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0x30, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero })
+                        Device (PR11)
                         {
-                            Or (\_SB.DSAF, 0x02, \_SB.DSAF)
+                            Name (_ADR, One)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero })
                         }
-                        Else
+
+                        Device (PR12)
                         {
-                            If (LEqual (_T_0, 0x00010023))
-                            {
-                                Or (\_SB.DSAF, 0x04, \_SB.DSAF)
-                            }
-                            Else
-                            {
-                                If (LEqual (_T_0, 0x00060013))
-                                {
-                                    Or (\_SB.DSAF, 0x08, \_SB.DSAF)
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_0, 0x00060015))
-                                    {
-                                        Or (\_SB.DSAF, 0x10, \_SB.DSAF)
-                                    }
-                                    Else
-                                    {
-                                        If (LEqual (_T_0, 0x00010015))
-                                        {
-                                            Or (\_SB.DSAF, 0x20, \_SB.DSAF)
-                                        }
-                                        Else
-                                        {
-                                            If (LEqual (_T_0, 0x00090011))
-                                            {
-                                                Or (\_SB.DSAF, 0x40, \_SB.DSAF)
-                                            }
-                                            Else
-                                            {
-                                                If (LEqual (_T_0, 0x00070011))
-                                                {
-                                                    Or (\_SB.DSAF, 0x80, \_SB.DSAF)
-                                                }
-                                                Else
-                                                {
-                                                    If (LEqual (_T_0, 0x00080013))
-                                                    {
-                                                        Or (\_SB.DSAF, 0x0100, \_SB.DSAF)
-                                                    }
-                                                    Else
-                                                    {
-                                                        If (LEqual (_T_0, 0x00010019))
-                                                        {
-                                                            Or (\_SB.DSAF, 0x0200, \_SB.DSAF)
-                                                        }
-                                                        Else
-                                                        {
-                                                            If (LEqual (_T_0, 0x00010017))
-                                                            {
-                                                                Or (\_SB.DSAF, 0x0400, \_SB.DSAF)
-                                                            }
-                                                            Else
-                                                            {
-                                                                If (LEqual (_T_0, 0x00050011))
-                                                                {
-                                                                    Or (\_SB.DSAF, 0x0800, \_SB.DSAF)
-                                                                }
-                                                                Else
-                                                                {
-                                                                    If (LEqual (_T_0, 0x00050012))
-                                                                    {
-                                                                        Or (\_SB.DSAF, 0x1000, \_SB.DSAF)
-                                                                    }
-                                                                    Else
-                                                                    {
-                                                                        If (LEqual (_T_0, 0x00060017))
-                                                                        {
-                                                                            Or (\_SB.DSAF, 0x2000, \_SB.DSAF)
-                                                                        }
-                                                                        Else
-                                                                        {
-                                                                            If (LEqual (_T_0, 0x00080021))
-                                                                            {
-                                                                                Or (\_SB.DSAF, 0x4000, \_SB.DSAF)
-                                                                            }
-                                                                            Else
-                                                                            {
-                                                                                If (LEqual (_T_0, 0x00100011))
-                                                                                {
-                                                                                    Or (\_SB.DSAF, 0x8000, \_SB.DSAF)
-                                                                                }
-                                                                                Else
-                                                                                {
-                                                                                    If (LEqual (_T_0, 0x00050001))
-                                                                                    {
-                                                                                        Or (\_SB.DSAF, 0x00010000, \_SB.DSAF)
-                                                                                    }
-                                                                                    Else
-                                                                                    {
-                                                                                        If (LEqual (_T_0, 0x00120000))
-                                                                                        {
-                                                                                            Or (\_SB.DSAF, 0x00020000, \_SB.DSAF)
-                                                                                        }
-                                                                                        Else
-                                                                                        {
-                                                                                            If (LEqual (_T_0, 0x00120021))
-                                                                                            {
-                                                                                                Or (\_SB.DSAF, 0x00040000, \_SB.DSAF)
-                                                                                            }
-                                                                                            Else
-                                                                                            {
-                                                                                                If (LEqual (_T_0, 0x00120011))
-                                                                                                {
-                                                                                                    Or (\_SB.DSAF, 0x00080000, \_SB.DSAF)
-                                                                                                }
-                                                                                                Else
-                                                                                                {
-                                                                                                    Return (Zero)
-                                                                                                }
-                                                                                            }
-                                                                                        }
-                                                                                    }
-                                                                                }
-                                                                            }
-                                                                        }
-                                                                    }
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
+                            Name (_ADR, 0x02)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero })
                         }
-                    }
-                }
-                Else
-                {
-                    If (LEqual (PARA, Zero))
-                    {
-                        Name (_T_1, Zero)
-                        Store (DVID, _T_1)
-                        If (LEqual (_T_1, 0x00010011))
+
+                        Device (PR13)
+                        {
+                            Name (_ADR, 0x03)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero })
+                        }
+
+                        Device (PR14)
+                        {
+                            Name (_ADR, 0x04)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                        }
+
+                        Device (PR15)
+                        {
+                            Name (_ADR, 0x05)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                        }
+
+                        Device (PR16)
                         {
-                            And (\_SB.DSAF, 0xFFFFFFFFFFFFFFFE, \_SB.DSAF)
+                            Name (_ADR, 0x06)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                        }
+
+                        Device (PR17)
+                        {
+                            Name (_ADR, 0x07)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
                         }
-                        Else
+
+                        Device (PR18)
                         {
-                            If (LEqual (_T_1, 0x00010013))
-                            {
-                                And (\_SB.DSAF, 0xFFFFFFFFFFFFFFFD, \_SB.DSAF)
-                            }
-                            Else
-                            {
-                                If (LEqual (_T_1, 0x00010023))
-                                {
-                                    And (\_SB.DSAF, 0xFFFFFFFFFFFFFFFB, \_SB.DSAF)
-                                }
-                                Else
-                                {
-                                    If (LEqual (_T_1, 0x00060013))
-                                    {
-                                        And (\_SB.DSAF, 0xFFFFFFFFFFFFFFF7, \_SB.DSAF)
-                                    }
-                                    Else
-                                    {
-                                        If (LEqual (_T_1, 0x00060015))
-                                        {
-                                            And (\_SB.DSAF, 0xFFFFFFFFFFFFFFEF, \_SB.DSAF)
-                                        }
-                                        Else
-                                        {
-                                            If (LEqual (_T_1, 0x00010015))
-                                            {
-                                                And (\_SB.DSAF, 0xFFFFFFFFFFFFFFDF, \_SB.DSAF)
-                                            }
-                                            Else
-                                            {
-                                                If (LEqual (_T_1, 0x00090011))
-                                                {
-                                                    And (\_SB.DSAF, 0xFFFFFFFFFFFFFFBF, \_SB.DSAF)
-                                                }
-                                                Else
-                                                {
-                                                    If (LEqual (_T_1, 0x00070011))
-                                                    {
-                                                        And (\_SB.DSAF, 0xFFFFFFFFFFFFFF7F, \_SB.DSAF)
-                                                    }
-                                                    Else
-                                                    {
-                                                        If (LEqual (_T_1, 0x00080013))
-                                                        {
-                                                            And (\_SB.DSAF, 0xFFFFFFFFFFFFFEFF, \_SB.DSAF)
-                                                        }
-                                                        Else
-                                                        {
-                                                            If (LEqual (_T_1, 0x00010019))
-                                                            {
-                                                                And (\_SB.DSAF, 0xFFFFFFFFFFFFFDFF, \_SB.DSAF)
-                                                            }
-                                                            Else
-                                                            {
-                                                                If (LEqual (_T_1, 0x00010017))
-                                                                {
-                                                                    And (\_SB.DSAF, 0xFFFFFFFFFFFFFBFF, \_SB.DSAF)
-                                                                }
-                                                                Else
-                                                                {
-                                                                    If (LEqual (_T_1, 0x00050011))
-                                                                    {
-                                                                        And (\_SB.DSAF, 0xFFFFFFFFFFFFF7FF, \_SB.DSAF)
-                                                                    }
-                                                                    Else
-                                                                    {
-                                                                        If (LEqual (_T_1, 0x00050012))
-                                                                        {
-                                                                            And (\_SB.DSAF, 0xFFFFFFFFFFFFEFFF, \_SB.DSAF)
-                                                                        }
-                                                                        Else
-                                                                        {
-                                                                            If (LEqual (_T_1, 0x00060017))
-                                                                            {
-                                                                                And (\_SB.DSAF, 0xFFFFFFFFFFFFDFFF, \_SB.DSAF)
-                                                                            }
-                                                                            Else
-                                                                            {
-                                                                                If (LEqual (_T_1, 0x00080021))
-                                                                                {
-                                                                                    And (\_SB.DSAF, 0xFFFFFFFFFFFFBFFF, \_SB.DSAF)
-                                                                                }
-                                                                                Else
-                                                                                {
-                                                                                    If (LEqual (_T_1, 0x00100011))
-                                                                                    {
-                                                                                        And (\_SB.DSAF, 0xFFFFFFFFFFFF7FFF, \_SB.DSAF)
-                                                                                    }
-                                                                                    Else
-                                                                                    {
-                                                                                        If (LEqual (_T_1, 0x00050001))
-                                                                                        {
-                                                                                            And (\_SB.DSAF, 0xFFFFFFFFFFFEFFFF, \_SB.DSAF)
-                                                                                        }
-                                                                                        Else
-                                                                                        {
-                                                                                            If (LEqual (_T_1, 0x00120000))
-                                                                                            {
-                                                                                                And (\_SB.DSAF, 0xFFFFFFFFFFFDFFFF, \_SB.DSAF)
-                                                                                            }
-                                                                                            Else
-                                                                                            {
-                                                                                                If (LEqual (_T_1, 0x00120021))
-                                                                                                {
-                                                                                                    And (\_SB.DSAF, 0xFFFFFFFFFFFBFFFF, \_SB.DSAF)
-                                                                                                }
-                                                                                                Else
-                                                                                                {
-                                                                                                    If (LEqual (_T_1, 0x00120011))
-                                                                                                    {
-                                                                                                        And (\_SB.DSAF, 0xFFFFFFFFFFF7FFFF, \_SB.DSAF)
-                                                                                                    }
-                                                                                                    Else
-                                                                                                    {
-                                                                                                        Return (Zero)
-                                                                                                    }
-                                                                                                }
-                                                                                            }
-                                                                                        }
-                                                                                    }
-                                                                                }
-                                                                            }
-                                                                        }
-                                                                    }
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
+                            Name (_ADR, 0x08)
+                            Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
+                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
                         }
                     }
                 }
-
-                Return (One)
             }
 
-            Method (SDSP, 1, Serialized)
+            Device (P0P1)
             {
-                CreateDWordField (Arg0, Zero, ACTN)
-                Return (Zero)
+                Name (_ADR, 0x001E0000)
+                Name (_PRW, Package (0x02) { 0x0B, 0x04 })
+                Name (_PRT, Package (0x08)
+                {
+                    Package (0x04) { 0x0002FFFF, Zero, Zero, 0x12 }, 
+                    Package (0x04) { 0x0002FFFF,  One, Zero, 0x13 },
+                    Package (0x04) { 0x0002FFFF, 0x02, Zero, 0x11 },
+                    Package (0x04) { 0x0002FFFF, 0x03, Zero, 0x10 },
+                    Package (0x04) { 0x0003FFFF, Zero, Zero, 0x13 },
+                    Package (0x04) { 0x0003FFFF,  One, Zero, 0x12 },
+                    Package (0x04) { 0x0003FFFF, 0x02, Zero, 0x15 },
+                    Package (0x04) { 0x0003FFFF, 0x03, Zero, 0x16 }
+                })
             }
 
-            Method (GDSP, 1, Serialized)
+            Device (LPCB)
             {
-                CreateDWordField (Arg0, Zero, ACTN)
-                Return (Zero)
-            }
+                Name (_ADR, 0x001F0000)
+                OperationRegion (LPC1, PCI_Config, 0xAE, One)
+                Field (LPC1, AnyAcc, NoLock, Preserve)
+                {
+                    XUSB,   1
+                }
 
-            Method (DEVS, 1, Serialized)
-            {
-                CreateDWordField (Arg0, Zero, DVID)
-                CreateDWordField (Arg0, 0x04, CPAR)
-                Name (_T_0, Zero)
-                Store (DVID, _T_0)
-                If (LEqual (_T_0, Zero))
+                OperationRegion (LPC0, PCI_Config, 0xF0, 0xC0)
+                Field (LPC0, AnyAcc, NoLock, Preserve)
                 {
-                    Return (Zero)
+                    RAEN,   1, 
+                        ,   13, 
+                    RCBA,   18
                 }
-                Else
+
+                OperationRegion (SMIE, SystemIO, PMBS, 0x02)	// PM1_STS—Power Management 1 Status Register ().
+                Field (SMIE, ByteAcc, NoLock, Preserve)
                 {
-                    Return (Zero)
+                        ,   10, 
+                    RTCS,   1									// Bit 10 - RTC Status (see page 520).
                 }
-            }
 
-            Method (DSTS, 1, Serialized)
-            {
-                CreateDWordField (Arg0, Zero, DVID)
-                Name (_T_0, Zero)
-                Store (DVID, _T_0)
-                If (LEqual (_T_0, 0xA0000000))
+                OperationRegion (SLPR, SystemIO, SMCR, 0x08)
+                Field (SLPR, ByteAcc, NoLock, Preserve)
                 {
-                    Store (One, Local0)
+                        ,   4, 
+                    SLPE,   1, 
+                        ,   31, 
+                    SLPX,   1
                 }
-                Else
+
+                OperationRegion (GPBX, SystemIO, GPBS, 0x1C)
+                Field (GPBX, ByteAcc, NoLock, Preserve)
                 {
-                    If (LEqual (_T_0, Zero))
-                    {
-                        Return (Zero)
+                            Offset (0x18), 
+                        ,   27, 
+                    PLED,   1
+                }
+
+                Method (SWAK, 1, NotSerialized)
+                {
+                    Store (Zero, SLPE)
+                    If (LNot (RTCS))
+					{
+                        Notify (PWRB, 0x02)
                     }
-                    Else
+                }
+
+                Device (FWHD)
+                {
+                    Name (_HID, EisaId ("INT0800"))
+                    Name (_CRS, ResourceTemplate ()
                     {
-                        Store (Zero, Local0)
-                    }
+                        Memory32Fixed (ReadOnly, 0xFF000000, 0x01000000, )
+                    })
                 }
 
-                And (Local0, 0x0007FFFF, Local0)
-                Return (Local0)
-            }
+                Device (HPET)
+                {
+                    Name (_HID, EisaId ("PNP0103"))
+                    Name (_UID, Zero)
+                    Name (_STA, 0x0F)
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        Memory32Fixed (ReadWrite, 0xFED00000, 0x00000400, )
+                    })
+                }
 
-            Method (GPID, 0, Serialized)
-            {
-                Return (Zero)
-            }
+                Device (IPIC)
+                {
+                    Name (_HID, EisaId ("PNP0000"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16, 0x0020, 0x0020, 0x01, 0x02, )
+                        IO (Decode16, 0x0024, 0x0024, 0x01, 0x02, )
+                        IO (Decode16, 0x0028, 0x0028, 0x01, 0x02, )
+                        IO (Decode16, 0x002C, 0x002C, 0x01, 0x02, )
+                        IO (Decode16, 0x0030, 0x0030, 0x01, 0x02, )
+                        IO (Decode16, 0x0034, 0x0034, 0x01, 0x02, )
+                        IO (Decode16, 0x0038, 0x0038, 0x01, 0x02, )
+                        IO (Decode16, 0x003C, 0x003C, 0x01, 0x02, )
+                        IO (Decode16, 0x00A0, 0x00A0, 0x01, 0x02, )
+                        IO (Decode16, 0x00A4, 0x00A4, 0x01, 0x02, )
+                        IO (Decode16, 0x00A8, 0x00A8, 0x01, 0x02, )
+                        IO (Decode16, 0x00AC, 0x00AC, 0x01, 0x02, )
+                        IO (Decode16, 0x00B0, 0x00B0, 0x01, 0x02, )
+                        IO (Decode16, 0x00B4, 0x00B4, 0x01, 0x02, )
+                        IO (Decode16, 0x00B8, 0x00B8, 0x01, 0x02, )
+                        IO (Decode16, 0x00BC, 0x00BC, 0x01, 0x02, )
+                        IO (Decode16, 0x04D0, 0x04D0, 0x01, 0x02, )
+                        IRQNoFlags () {2}
+                    })
+                }
 
-            Method (KBFT, 1, Serialized)
-            {
-                Return (Zero)
-            }
+                Device (LDRC)
+                {
+                    Name (_HID, EisaId ("PNP0C02"))
+                    Name (_UID, 0x02)
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16, 0x002E, 0x002E, 0x01, 0x02, )
+                        IO (Decode16, 0x004E, 0x004E, 0x01, 0x02, )
+                        IO (Decode16, 0x0061, 0x0061, 0x01, 0x01, )
+                        IO (Decode16, 0x0063, 0x0063, 0x01, 0x01, )
+                        IO (Decode16, 0x0065, 0x0065, 0x01, 0x01, )
+                        IO (Decode16, 0x0067, 0x0067, 0x01, 0x01, )
+                        IO (Decode16, 0x0070, 0x0070, 0x01, 0x01, )
+                        IO (Decode16, 0x0080, 0x0080, 0x01, 0x01, )
+                        IO (Decode16, 0x0092, 0x0092, 0x01, 0x01, )
+                        IO (Decode16, 0x00B2, 0x00B2, 0x01, 0x02, )
+                        IO (Decode16, 0x0680, 0x0680, 0x01, 0x20, )
+                        IO (Decode16, 0x0200, 0x0200, 0x01, 0x10, )
+                        IO (Decode16, 0xFFFF, 0xFFFF, 0x01, 0x01, )
+                        IO (Decode16, 0xFFFF, 0xFFFF, 0x01, 0x01, )
+                        IO (Decode16, 0x0400, 0x0400, 0x01, 0x54, )
+                        IO (Decode16, 0x0458, 0x0458, 0x01, 0x28, )
+                        IO (Decode16, 0x0500, 0x0500, 0x01, 0x80, )
+                        IO (Decode16, 0x164E, 0x164E, 0x01, 0x02, )
+                    })
+                }
 
-            Method (HKEY, 0, Serialized)
-            {
-                Return (Zero)
-            }
+                Device (PDRC)
+                {
+                    Name (_HID, EisaId ("PNP0C02"))
+                    Name (_UID, One)
+                    Name (BUF0, ResourceTemplate ()
+                    {
+                        Memory32Fixed (ReadWrite, 0x00000000, 0x00004000, _Y10)
+                        Memory32Fixed (ReadWrite, 0x00000000, 0x00001000, _Y11)
+                        Memory32Fixed (ReadWrite, 0x00000000, 0x00008000, _Y12)
+                        Memory32Fixed (ReadWrite, 0x00000000, 0x00001000, _Y13)
+                        Memory32Fixed (ReadWrite, 0x00000000, 0x00001000, _Y14)
+                        Memory32Fixed (ReadWrite, 0x00000000, 0x00000000, _Y15)
 
-            Method (CFVS, 1, Serialized)
-            {
-            }
+                        Memory32Fixed (ReadWrite, 0xFED20000, 0x00020000, )
+                        Memory32Fixed (ReadOnly,  0xFED90000, 0x00004000, )
+                        Memory32Fixed (ReadWrite, 0xFED45000, 0x0004B000, )
+                        Memory32Fixed (ReadOnly,  0xFF000000, 0x01000000, )
+                        Memory32Fixed (ReadOnly,  0xFEE00000, 0x00100000, )
 
-            Method (CFVG, 0, Serialized)
-            {
-            }
-        }
-    }
+                    })
+                    Method (_CRS, 0, Serialized)
+                    {
+                        CreateDWordField (BUF0, ^_Y10._BAS, RBR0)
+                        ShiftLeft (RCBA, 0x0E, RBR0)
+                        CreateDWordField (BUF0, ^_Y11._BAS, TBR0)
+                        Store (TBAB, TBR0)
+                        CreateDWordField (BUF0, ^_Y11._LEN, TBLN)
+                        If (LEqual (TBAB, Zero))
+                        {
+                            Store (Zero, TBLN)
+                        }
+
+                        CreateDWordField (BUF0, ^_Y12._BAS, MBR0)
+                        ShiftLeft (MHBR, 0x0F, MBR0)
+                        CreateDWordField (BUF0, ^_Y13._BAS, DBR0)
+                        ShiftLeft (DIBR, 0x0C, DBR0)
+                        CreateDWordField (BUF0, ^_Y14._BAS, EBR0)
+                        ShiftLeft (EPBR, 0x0C, EBR0)
+                        CreateDWordField (BUF0, ^_Y15._BAS, XBR0)
+                        ShiftLeft (PXBR, 0x1A, XBR0)
+                        CreateDWordField (BUF0, ^_Y15._LEN, XSZ0)
+                        ShiftRight (0x10000000, PXSZ, XSZ0)
+                        Return (BUF0)
+                    }
+                }
 
-    Scope (_SB)
-    {
-        Name (RAMB, 0xDAB94018)
-        OperationRegion (\RAMW, SystemMemory, RAMB, 0x00010000)
-        Field (RAMW, ByteAcc, NoLock, Preserve)
-        {
-            DSAF,   256, 
-            PAR0,   32, 
-            PAR1,   32, 
-            PAR2,   32, 
-            PINX,   32, 
-            PADD,   2048
-        }
+                Device (RTC)
+                {
+                    Name (_HID, EisaId ("PNP0B00"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16, 0x0070, 0x0070, 0x01, 0x08, )
+                        IRQNoFlags () {8}
+                    })
+                }
 
-        Mutex (MPAR, 0x00)
-        Name (ARBF, Buffer (0x10) {})
-        CreateDWordField (ARBF, Zero, REAX)
-        CreateDWordField (ARBF, 0x04, REBX)
-        CreateDWordField (ARBF, 0x08, RECX)
-        CreateDWordField (ARBF, 0x0C, REDX)
-        OperationRegion (IOB2, SystemIO, SMIP, 0x02)
-        Field (IOB2, ByteAcc, NoLock, Preserve)
-        {
-            SMIC,   8, 
-            SMIS,   8
-        }
+                Device (TIMR)
+                {
+                    Name (_HID, EisaId ("PNP0100"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16, 0x0040, 0x0040, 0x01, 0x04, )
+                        IO (Decode16, 0x0050, 0x0050, 0x10, 0x04, )
+                        IRQNoFlags () {0}
+                    })
+                }
 
-        Method (ISMI, 1, Serialized)
-        {
-            Store (Arg0, SMIC)
-        }
+                Device (EC)
+                {
+                    Name (_HID, EisaId ("PNP0C09"))
+                    Name (_GPE, 0x18)
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16, 0x0062, 0x0062, 0x00, 0x01, )
+                        IO (Decode16, 0x0066, 0x0066, 0x00, 0x01, )
+                    })
+                }
 
-        Method (GMSR, 1, Serialized)
-        {
-            If (LEqual (Acquire (MPAR, 0xFFFF), Zero))
-            {
-                Store (0x80000000, PINX)
-                Store (Arg0, PAR0)
-                ISMI (0x90)
-                Store (Arg0, RECX)
-                Store (PAR1, REAX)
-                Store (PAR2, REDX)
-                Release (MPAR)
-                Return (ARBF)
+                Device (MATH)
+                {
+                    Name (_HID, EisaId ("PNP0C04"))
+                    Name (_CRS, ResourceTemplate ()
+                    {
+                        IO (Decode16, 0x00F0, 0x00F0, 0x00, 0x10, )
+                        IRQNoFlags () {13}
+                    })
+                }
             }
 
-            Return (Ones)
-        }
-
-        Method (SMSR, 1, Serialized)
-        {
-            If (LEqual (Acquire (MPAR, 0xFFFF), Zero))
+            Device (SATA)
             {
-                CreateDWordField (Arg0, Zero, AEAX)
-                CreateDWordField (Arg0, 0x04, AEBX)
-                CreateDWordField (Arg0, 0x08, AECX)
-                CreateDWordField (Arg0, 0x0C, AEDX)
-                Store (0x80000001, PINX)
-                Store (AECX, PAR0)
-                Store (AEAX, PAR1)
-                Store (AEDX, PAR2)
-                ISMI (0x90)
-                Release (MPAR)
+                Name (_ADR, 0x001F0002)
             }
 
-            Return (Ones)
-        }
-
-        Method (PRID, 1, Serialized)
-        {
-            If (LEqual (Acquire (MPAR, 0xFFFF), Zero))
+            Device (SBUS)
             {
-                Store (0x80000002, PINX)
-                Store (Arg0, PAR0)
-                ISMI (0x90)
-                Store (PAR1, REAX)
-                Store (PAR2, REDX)
-                Release (MPAR)
-                Return (ARBF)
+                Name (_ADR, 0x001F0003)
+                Device (BUS0)
+                {
+                    Name (_CID, "smbus")
+                    Name (_ADR, Zero)
+                    Device (DVL0)
+                    {
+                        Name (_ADR, 0x57)
+                        Name (_CID, "diagsvault")
+                    }
+                }
             }
+        }
 
-            Return (Ones)
+        Device (PWRB)
+        {
+            Name (_HID, EisaId ("PNP0C0C"))
+            Name (_UID, 0xAA)
+            Name (_STA, 0x0B)
+            Name (_PRW, Package (0x02) { 0x1D, 0x04 })
         }
+    }
 
-        Method (GPRE, 1, Serialized)
+    Scope (_GPE)
+    {
+        Method (_L01, 0, NotSerialized)
         {
-            Store (Arg0, PAR0)
-            Store (0x80000005, PINX)
-            ISMI (0x90)
-            Return (PAR0)
+            Add (L01C, One, L01C)
+            P8XH (Zero, One)
+            P8XH (One, L01C)
         }
 
-        Method (GNVS, 1, Serialized)
+        Method (_L02, 0, NotSerialized)
         {
-            Store (Arg0, PAR0)
-            Store (0x80000003, PINX)
-            ISMI (0x90)
-            Return (PAR1)
+            Store (Zero, GPEC)
         }
 
-        Method (SNVS, 2, Serialized)
+        Method (_L09, 0, NotSerialized)
         {
-            Store (Arg0, PAR0)
-            Store (Arg1, PAR1)
-            Store (0x80000004, PINX)
-            ISMI (0x90)
+            Notify (\_SB.PCI0.PEG0, 0x02)
+            Notify (\_SB.PCI0.PEG0.PEGP, 0x02)
+            Notify (\_SB.PCI0.PEG1, 0x02)
+            Notify (\_SB.PCI0.PEG2, 0x02)
+            Notify (\_SB.PCI0.PEG3, 0x02)
         }
 
-        Method (SARM, 1, Serialized)
+        Method (_L0B, 0, NotSerialized)
         {
-            If (LAnd (LGreater (Arg0, 0x03), LLess (Arg0, 0x06)))
-            {
-                ISMI (0x92)
-            }
+            Notify (\_SB.PCI0.P0P1, 0x02)
+            Notify (\_SB.PWRB, 0x02)
         }
 
-        Method (GAMM, 0, Serialized)
+        Method (_L0D, 0, NotSerialized)
         {
-            ISMI (0x91)
+            Notify (\_SB.PCI0.EHC1, 0x02)
+            Notify (\_SB.PCI0.EHC2, 0x02)
+            Notify (\_SB.PCI0.HDEF, 0x02)
+            Notify (\_SB.PCI0.GIGE, 0x02)
         }
 
-        Method (SAMM, 0, Serialized)
+        Method (_L1D, 0, NotSerialized)
         {
-            ISMI (0x92)
+            Notify (\_SB.PWRB, 0x02)
         }
     }
 
-    Scope (_SB.PCI0.LPCB)
+    Name (_S0, Package (0x03) { Zero, Zero, Zero })
+    Name (_S3, Package (0x03) { 0x05, 0x05, Zero })
+    Name (_S4, Package (0x03) { 0x06, 0x06, Zero })
+    Name (_S5, Package (0x03) { 0x07, 0x07, Zero })
+
+    Method (P8XH, 2, Serialized)
     {
-        Method (S1RS, 1, NotSerialized)
+        If (LEqual (Arg0, Zero))
         {
-            Store (Zero, PLED)
+            Store (Or (And (P80D, 0xFFFFFF00), Arg1), P80D)
         }
 
-        OperationRegion (GPBX, SystemIO, GPBS, GPLN)
-        Field (GPBX, ByteAcc, NoLock, Preserve)
+        If (LEqual (Arg0, One))
         {
-                    Offset (0x18), 
-                ,   27, 
-            PLED,   1
+            Store (Or (And (P80D, 0xFFFF00FF), ShiftLeft (Arg1, 0x08)
+                ), P80D)
         }
-    }
 
-    Scope (_SB.PCI0.LPCB)
-    {
-        Device (H_EC)
+        If (LEqual (Arg0, 0x02))
         {
-            Name (_HID, EisaId ("PNP0C09"))
-            Name (_UID, One)
-            Method (_STA, 0, NotSerialized)
-            {
-                Store (0x03, ^^^GFX0.CLID)
-                Return (Zero)
-            }
-
-            Name (B1CC, Zero)
-            Name (B1ST, Zero)
-            Name (B2CC, Zero)
-            Name (B2ST, Zero)
-            Name (CFAN, Zero)
-            Name (CMDR, Zero)
-            Name (DOCK, Zero)
-            Name (EJET, Zero)
-            Name (MCAP, Zero)
-            Name (PLMX, Zero)
-            Name (PECH, Zero)
-            Name (PECL, Zero)
-            Name (PENV, Zero)
-            Name (PINV, Zero)
-            Name (PPSH, Zero)
-            Name (PPSL, Zero)
-            Name (PSTP, Zero)
-            Name (RPWR, Zero)
-            Name (LSTE, Zero)
-            Name (SLPC, Zero)
-            Name (VPWR, Zero)
-            Method (ECMD, 1, Serialized)
-            {
-                If (ECON)
-                {
-                    While (CMDR)
-                    {
-                        Stall (0x14)
-                    }
-
-                    Store (Arg0, CMDR)
-                }
-            }
-
-            Device (BAT0)
-            {
-                Name (_HID, EisaId ("PNP0C0A"))
-                Name (_UID, Zero)
-                Method (_STA, 0, NotSerialized)
-                {
-                    Return (Zero)
-                }
-            }
-
-            Scope (\)
-            {
-                Field (GNVS, AnyAcc, Lock, Preserve)
-                {
-                            Offset (0x1E), 
-                    BNUM,   8, 
-                            Offset (0x20), 
-                    B1SC,   8, 
-                            Offset (0x23), 
-                    B1SS,   8
-                }
-            }
-
-            Device (BAT1)
-            {
-                Name (_HID, EisaId ("PNP0C0A"))
-                Name (_UID, One)
-                Method (_STA, 0, NotSerialized)
-                {
-                    Return (Zero)
-                }
-            }
-
-            Scope (\)
-            {
-                Field (GNVS, AnyAcc, Lock, Preserve)
-                {
-                            Offset (0x21), 
-                    B2SC,   8, 
-                            Offset (0x24), 
-                    B2SS,   8
-                }
-            }
-
-            Device (BAT2)
-            {
-                Name (_HID, EisaId ("PNP0C0A"))
-                Name (_UID, 0x02)
-                Method (_STA, 0, NotSerialized)
-                {
-                    Return (Zero)
-                }
-            }
+            Store (Or (And (P80D, 0xFF00FFFF), ShiftLeft (Arg1, 0x10)
+                ), P80D)
         }
-    }
 
-    Device (_SB.PCI0.DOCK)
-    {
-        Name (_HID, "ABCDEFGH")
-        Name (_CID, EisaId ("PNP0C15"))
-        Name (_UID, 0x02)
-        Method (_STA, 0, NotSerialized)
+        If (LEqual (Arg0, 0x03))
         {
-            Return (Zero)
+            Store (Or (And (P80D, 0x00FFFFFF), ShiftLeft (Arg1, 0x18)
+                ), P80D)
         }
+
+        Store (P80D, P80H)
     }
 
-    Scope (_SB)
+    Method (_PTS, 1, NotSerialized)
     {
-        Device (LID0)
+        Store (Zero, P80D)
+        P8XH (Zero, Arg0)
+        If (Arg0)
         {
-            Name (_HID, EisaId ("PNP0C0D"))
-            Method (_STA, 0, NotSerialized)
+            Store (One, \_SB.PCI0.LPCB.SLPX)
+            Store (One, \_SB.PCI0.LPCB.SLPE)
+            If (LAnd (LGreater (Arg0, 0x03), LLess (Arg0, 0x06)))
             {
-                Return (Zero)
+                Store (Arg0, \_SB.SMIC)
+                Store (One, GP27)
             }
         }
     }
 
-    Name (_S0, Package (0x04)
-    {
-        Zero, 
-        Zero, 
-        Zero, 
-        Zero
-    })
-    If (SS1)
-    {
-        Name (_S1, Package (0x04)
-        {
-            One, 
-            Zero, 
-            Zero, 
-            Zero
-        })
-    }
-
-    If (SS3)
-    {
-        Name (_S3, Package (0x04)
-        {
-            0x05, 
-            Zero, 
-            Zero, 
-            Zero
-        })
-    }
-
-    If (SS4)
+    Method (_WAK, 1, Serialized)
     {
-        Name (_S4, Package (0x04)
+        ShiftLeft (Arg0, 0x04, DBG8)
+        \_SB.PCI0.LPCB.SWAK (Arg0)
+        Store (Zero, \_SB.PCI0.LPCB.PLED)
+        Return (Package (0x02)
         {
-            0x06, 
-            Zero, 
             Zero, 
             Zero
         })
     }
-
-    Name (_S5, Package (0x04)
-    {
-        0x07, 
-        Zero, 
-        Zero, 
-        Zero
-    })
-    Method (PTS, 1, NotSerialized)
-    {
-        If (Arg0)
-        {
-            \_SB.PCI0.LPCB.SPTS (Arg0)
-            \_SB.PCI0.NPTS (Arg0)
-            \_SB.SARM (Arg0)
-            \_SB.PCI0.LPCB.SIOS (Arg0)
-        }
-    }
-
-    Method (WAK, 1, NotSerialized)
-    {
-        \_SB.PCI0.LPCB.SWAK (Arg0)
-        \_SB.PCI0.NWAK (Arg0)
-        \_SB.PCI0.LPCB.S1RS (Arg0)
-        \_SB.PCI0.LPCB.SIOW (Arg0)
-    }
 }
-

From 486c8dc209ae75c13c44257594620f23cb829b9c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 23 Mar 2013 17:41:05 +0100
Subject: [PATCH 338/623] Show warnings for Sandy Bridge systems

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index d03da14..4e4fad0 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 5.7 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 5.8 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -63,6 +63,7 @@
 #			- Command line argument for processor labels added (Pike, March 2013)
 #			- Bug fix, overriding the cpu type displayed the wrong name (Jeroen, March 2013)
 #			- Automatic detection of CPU scopes added (Pike, March 2013)
+#			- Show warnings for Sandy Bridge systems as well (Jeroen, March 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -159,7 +160,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=5.7
+gScriptVersion=5.8
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1832,7 +1833,7 @@ function main()
     #
     # Some IB CPUPM specific configuration checks
     #
-    if [ $gBridgeType -eq $IVY_BRIDGE ];
+    if [ $gBridgeType -ne $HASWELL ];
         then
             if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
                 echo -e "\nWarning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"

From c0c8313897bab4b9fbe869307dc5649dd3c16b99 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 23 Mar 2013 18:55:27 +0100
Subject: [PATCH 339/623] Example SSDT

---
 .../acpi/examples/P8Z68-V PRO/ssdt.dsl        | 313 ++++++++++++++++++
 1 file changed, 313 insertions(+)
 create mode 100644 i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl
new file mode 100644
index 0000000..f2f4ab4
--- /dev/null
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl	
@@ -0,0 +1,313 @@
+/*
+ * Intel ACPI Component Architecture
+ * AML Disassembler version 20110316-64 [Mar 16 2011]
+ * Copyright (c) 2000 - 2011 Intel Corporation
+ * 
+ * Disassembly of /ssdt.aml, Mon Jan 21 08:31:48 2013
+ *
+ * Original Table Header:
+ *     Signature        "SSDT"
+ *     Length           0x0000031A (794)
+ *     Revision         0x01
+ *     Checksum         0x77
+ *     OEM ID           "APPLE "
+ *     OEM Table ID     "general"
+ *     OEM Revision     0x00001000 (4096)
+ *     Compiler ID      "INTL"
+ *     Compiler Version 0x20110316 (537985814)
+ */
+
+DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
+{
+    External (HPTC, IntObj)
+    External (SBV1, IntObj)
+    External (SBV2, IntObj)
+
+    External (\_SB_.PCI0, DeviceObj)
+    External (\_SB_.PCI0.RP02, DeviceObj)
+    External (\_SB_.PCI0.RP04, DeviceObj)
+    External (\_SB_.PCI0.RP05, DeviceObj)
+    External (\_SB_.PCI0.RP07, DeviceObj)
+
+    External (\_SB_.PCI0.EHC1, DeviceObj)
+    External (\_SB_.PCI0.EHC1.HUBN, DeviceObj)
+    External (\_SB_.PCI0.EHC1.HUBN.PR01, DeviceObj)
+    External (\_SB_.PCI0.EHC1.HUBN.PR01.PR14, DeviceObj)
+    External (\_SB_.PCI0.EHC1.HUBN.PR01.PR15, DeviceObj)
+    External (\_SB_.PCI0.EHC1.HUBN.PR01.PR16, DeviceObj)
+    External (\_SB_.PCI0.EHC1.HUBN.PR01.PR17, DeviceObj)
+
+    External (\_SB_.PCI0.EHC2, DeviceObj)
+    External (\_SB_.PCI0.EHC2.HUBN, DeviceObj)
+    External (\_SB_.PCI0.EHC2.HUBN.PR01, DeviceObj)
+    External (\_SB_.PCI0.EHC2.HUBN.PR01.PR12, DeviceObj)
+    External (\_SB_.PCI0.EHC2.HUBN.PR01.PR13, DeviceObj)
+
+    External (\_SB_.PCI0.LPCB, DeviceObj)
+    External (\_SB_.PCI0.LPCB.HPET, DeviceObj)
+
+    Scope (\)
+    {
+        Scope (_SB)
+        {
+            Scope (PCI0)
+            {
+                Scope (EHC2)
+                {
+                    Name (AAPL, Package (0x0B)
+                    {
+                        "AAPL,current-available",
+                        0x0834,
+                        "AAPL,current-extra",
+                        0x0898,
+                        "AAPL,current-extra-in-sleep",
+                        0x0640,
+                        "AAPL,max-port-current-in-sleep",
+                        0x0834,
+                        "AAPL,device-internal",
+                        0x02,
+                        Buffer (One) { 0x00 }
+                    })
+
+                    Method (_DSM, 4, NotSerialized)
+                    {
+                        If (LEqual (Arg2, Zero))
+                        {
+                            Return (Buffer (One) { 0x03 })
+                        }
+
+                        Return (RefOf (AAPL))
+                    }
+
+                    Scope (HUBN)
+                    {
+                        Scope (PR01)
+                        {
+                            Scope (PR12)
+                            {
+                                Alias (SBV1, SDGV)
+
+                                Method (_DSM, 4, Serialized)
+                                {
+                                    Name (T_0, Zero)
+                                    Store (ToInteger (Arg2), T_0)
+
+                                    If (LEqual (T_0, Zero))
+                                    {
+                                        Return (Buffer (One)
+                                        {
+                                            0x07
+                                        })
+                                    }
+                                    ElseIf (LEqual (T_0, One))
+                                    {
+                                        If (LNotEqual (SDGV, 0xFF))
+                                        {
+                                            Return (One)
+                                        }
+                                    }
+                                    ElseIf (LEqual (T_0, 0x02))
+                                    {
+                                        Return (SDGV)
+                                    }
+
+                                    Return (Zero)
+                                }
+                            }
+
+                            Scope (PR13)
+                            {
+                                Alias (SBV2, SDGV)
+
+                                Method (_DSM, 4, Serialized)
+                                {
+                                    Return (^^PR12._DSM (Arg0, Arg1, Arg2, Arg3))
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Scope (RP02)
+                {
+                    Device (XHC1)
+                    {
+                        Name (_ADR, Zero)
+                    }
+                }
+
+                Scope (RP04)
+                {
+                    Device (JMB0)
+                    {
+                        Name (_ADR, Zero)
+                        OperationRegion (CF40, PCI_Config, 0x40, 0x04)
+                        Field (CF40, ByteAcc, NoLock, Preserve)
+                        {
+                            CHE0,   1,
+                            MULT,   1,
+                                ,   1,
+                            CAB0,   1,
+                            CHE1,   1,
+                                    Offset (0x01),
+                            AHEN,   1,
+                                ,   3,
+                            PRT0,   1,
+                            AHM0,   1,
+                            PRT1,   1,
+                            AHM1,   1,
+                            CF42,   6,
+                            SWAP,   1,
+                            PATA,   1,
+                                ,   6,
+                            WTEN,   1,
+                                    Offset (0x04)
+                        }
+                    }
+
+                    Device (JMB1)
+                    {
+                        Name (_ADR, One)
+                        OperationRegion (CF40, PCI_Config, 0x40, 0x04)
+                        Field (CF40, ByteAcc, NoLock, Preserve)
+                        {
+                            CHE0,   1,
+                            MULT,   1,
+                                ,   1,
+                            CAB0,   1,
+                            CHE1,   1,
+                                    Offset (0x01),
+                            AHEN,   1,
+                                ,   3,
+                            PRT0,   1,
+                            AHM0,   1,
+                            PRT1,   1,
+                            AHM1,   1,
+                            CF42,   6,
+                            SWAP,   1,
+                            PATA,   1,
+                                ,   6,
+                            WTEN,   1,
+                                    Offset (0x04)
+                        }
+                    }
+                }
+
+                Scope (RP05)
+                {
+                    Device (XHC2)
+                    {
+                        Name (_ADR, Zero)
+                    }
+                }
+
+                Scope (RP07)
+                {
+                    Device (FWBR)
+                    {
+                        Name (_ADR, Zero)
+                        Name (_PRW, Package (0x02) { 0x0B, 0x04 })
+                        Name (_PRT, Package (0x0C)
+                        {
+                            Package (0x04) { 0xFFFF,     Zero, Zero, 0x12 },
+                            Package (0x04) { 0xFFFF,      One, Zero, 0x13 },
+                            Package (0x04) { 0xFFFF,     0x02, Zero, 0x10 },
+                            Package (0x04) { 0xFFFF,     0x03, Zero, 0x11 },
+                            Package (0x04) { 0x0001FFFF, Zero, Zero, 0x13 },
+                            Package (0x04) { 0x0001FFFF,  One, Zero, 0x10 },
+                            Package (0x04) { 0x0001FFFF, 0x02, Zero, 0x11 },
+                            Package (0x04) { 0x0001FFFF, 0x03, Zero, 0x12 },
+                            Package (0x04) { 0x0002FFFF, Zero, Zero, 0x11 },
+                            Package (0x04) { 0x0002FFFF,  One, Zero, 0x12 },
+                            Package (0x04) { 0x0002FFFF, 0x02, Zero, 0x13 },
+                            Package (0x04) { 0x0002FFFF, 0x03, Zero, 0x10 }
+                        })
+
+                        Device (FRWR)
+                        {
+                            Name (_ADR, 0x00020000)
+                        }
+                    }
+                }
+
+                Scope (EHC1)
+                {
+                    Method (_DSM, 4, NotSerialized)
+                    {
+                        If (LEqual (Arg2, Zero))
+                        {
+                           Return (Buffer (One) { 0x03 })
+                        }
+
+                        Return (RefOf (^^EHC2.AAPL))
+                    }
+
+                    Scope (HUBN)
+                    {
+                        Scope (PR01)
+                        {
+                            Scope (PR14)
+                            {
+                                Alias (SBV1, SDGV)
+
+                                Method (_DSM, 4, Serialized)
+                                {
+                                    Return (\_SB.PCI0.EHC2.HUBN.PR01.PR12._DSM (Arg0, Arg1, Arg2, Arg3))
+                                }
+                            }
+
+                            Scope (PR15)
+                            {
+                                Alias (SBV2, SDGV)
+
+                                Method (_DSM, 4, Serialized)
+                                {
+                                    Return (\_SB.PCI0.EHC2.HUBN.PR01.PR12._DSM (Arg0, Arg1, Arg2, Arg3))
+                                }
+                            }
+
+                            Scope (PR16)
+                            {
+                                Alias (SBV1, SDGV)
+
+                                Method (_DSM, 4, Serialized)
+                                {
+                                    Return (\_SB.PCI0.EHC2.HUBN.PR01.PR12._DSM (Arg0, Arg1, Arg2, Arg3))
+                                }
+                            }
+
+                            Scope (PR17)
+                            {
+                                Alias (SBV2, SDGV)
+
+                                Method (_DSM, 4, Serialized)
+                                {
+                                    Return (\_SB.PCI0.EHC2.HUBN.PR01.PR12._DSM (Arg0, Arg1, Arg2, Arg3))
+                                }
+                            }
+                        }
+                    }
+                }
+
+                Scope (LPCB)
+                {
+                    Scope (HPET)
+                    {
+                        OperationRegion (RCRB, SystemMemory, HPTC, One)
+                        Field (RCRB, ByteAcc, Lock, Preserve)
+                        {
+                                ,   7,
+                            HPAE,   1
+                        }
+
+                        Method (_INI, 0, NotSerialized)
+                        {
+                            Store (One, HPAE)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+

From a667d99bd97438332fad5b3f25e383dc59eca330 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 23 Mar 2013 19:51:31 +0100
Subject: [PATCH 340/623] Oops

---
 i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl
index 9a0bd03..5b5f4fd 100644
--- a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
@@ -44,7 +44,10 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
                 Offset (0x3C), 
         IGDS,   8,
                 Offset (0xAA), 
-        ASLB,   32, 
+        ASLB,   32,
+                Offset (0xE3), 
+        SBV1,   8, 
+        SBV2,   8,
                 Offset (0xEF), 
         L01C,   8,
                 Offset (0x15F), 

From dd7a2bc9fc1c16f99b086623b5b7f70667e0311c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 25 Mar 2013 08:20:02 +0100
Subject: [PATCH 341/623] Scope changes

iasl -e /Extra/ACPI/dsdt.aml ssdt.dsl
---
 .../acpi/examples/P8Z68-V PRO/ssdt.dsl        | 502 ++++++++----------
 1 file changed, 232 insertions(+), 270 deletions(-)

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl
index f2f4ab4..04ad8b8 100644
--- a/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl	
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl	
@@ -1,312 +1,274 @@
 /*
  * Intel ACPI Component Architecture
- * AML Disassembler version 20110316-64 [Mar 16 2011]
- * Copyright (c) 2000 - 2011 Intel Corporation
+ * AML Disassembler version 20130214-64 [Mar 24 2013]
+ * Copyright (c) 2000 - 2013 Intel Corporation
  * 
- * Disassembly of /ssdt.aml, Mon Jan 21 08:31:48 2013
+ * Disassembly of ssdt.aml, Mon Mar 25 08:07:55 2013
  *
  * Original Table Header:
  *     Signature        "SSDT"
- *     Length           0x0000031A (794)
+ *     Length           0x000004FF (1279)
  *     Revision         0x01
- *     Checksum         0x77
+ *     Checksum         0x72
  *     OEM ID           "APPLE "
  *     OEM Table ID     "general"
  *     OEM Revision     0x00001000 (4096)
  *     Compiler ID      "INTL"
- *     Compiler Version 0x20110316 (537985814)
+ *     Compiler Version 0x20130214 (538116628)
  */
-
 DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
 {
+    External (_SB_.PCI0, DeviceObj)
+    External (_SB_.PCI0.EHC1, DeviceObj)
+    External (_SB_.PCI0.EHC1.HUBN.PR01.PR14, DeviceObj)
+    External (_SB_.PCI0.EHC1.HUBN.PR01.PR15, DeviceObj)
+    External (_SB_.PCI0.EHC1.HUBN.PR01.PR16, DeviceObj)
+    External (_SB_.PCI0.EHC1.HUBN.PR01.PR17, DeviceObj)
+    External (_SB_.PCI0.EHC2, DeviceObj)
+    External (_SB_.PCI0.EHC2.HUBN.PR01.PR12, DeviceObj)
+    External (_SB_.PCI0.EHC2.HUBN.PR01.PR13, DeviceObj)
+    External (_SB_.PCI0.LPCB.HPET, DeviceObj)
+    External (_SB_.PCI0.RP02, DeviceObj)
+    External (_SB_.PCI0.RP04, DeviceObj)
+    External (_SB_.PCI0.RP05, DeviceObj)
+    External (_SB_.PCI0.RP07, DeviceObj)
     External (HPTC, IntObj)
-    External (SBV1, IntObj)
-    External (SBV2, IntObj)
-
-    External (\_SB_.PCI0, DeviceObj)
-    External (\_SB_.PCI0.RP02, DeviceObj)
-    External (\_SB_.PCI0.RP04, DeviceObj)
-    External (\_SB_.PCI0.RP05, DeviceObj)
-    External (\_SB_.PCI0.RP07, DeviceObj)
-
-    External (\_SB_.PCI0.EHC1, DeviceObj)
-    External (\_SB_.PCI0.EHC1.HUBN, DeviceObj)
-    External (\_SB_.PCI0.EHC1.HUBN.PR01, DeviceObj)
-    External (\_SB_.PCI0.EHC1.HUBN.PR01.PR14, DeviceObj)
-    External (\_SB_.PCI0.EHC1.HUBN.PR01.PR15, DeviceObj)
-    External (\_SB_.PCI0.EHC1.HUBN.PR01.PR16, DeviceObj)
-    External (\_SB_.PCI0.EHC1.HUBN.PR01.PR17, DeviceObj)
-
-    External (\_SB_.PCI0.EHC2, DeviceObj)
-    External (\_SB_.PCI0.EHC2.HUBN, DeviceObj)
-    External (\_SB_.PCI0.EHC2.HUBN.PR01, DeviceObj)
-    External (\_SB_.PCI0.EHC2.HUBN.PR01.PR12, DeviceObj)
-    External (\_SB_.PCI0.EHC2.HUBN.PR01.PR13, DeviceObj)
+    External (SBV1, FieldUnitObj)
+    External (SBV2, FieldUnitObj)
 
-    External (\_SB_.PCI0.LPCB, DeviceObj)
-    External (\_SB_.PCI0.LPCB.HPET, DeviceObj)
-
-    Scope (\)
+    Scope (\_SB.PCI0)
     {
-        Scope (_SB)
+        Method (EHCN, 2, NotSerialized)
         {
-            Scope (PCI0)
+            Name (T_0, Zero)
+            Store (ToInteger (Arg1), T_0)
+
+            If (LEqual (T_0, Zero))
             {
-                Scope (EHC2)
+                Return (Buffer (One)
                 {
-                    Name (AAPL, Package (0x0B)
-                    {
-                        "AAPL,current-available",
-                        0x0834,
-                        "AAPL,current-extra",
-                        0x0898,
-                        "AAPL,current-extra-in-sleep",
-                        0x0640,
-                        "AAPL,max-port-current-in-sleep",
-                        0x0834,
-                        "AAPL,device-internal",
-                        0x02,
-                        Buffer (One) { 0x00 }
-                    })
-
-                    Method (_DSM, 4, NotSerialized)
-                    {
-                        If (LEqual (Arg2, Zero))
-                        {
-                            Return (Buffer (One) { 0x03 })
-                        }
-
-                        Return (RefOf (AAPL))
-                    }
-
-                    Scope (HUBN)
-                    {
-                        Scope (PR01)
-                        {
-                            Scope (PR12)
-                            {
-                                Alias (SBV1, SDGV)
-
-                                Method (_DSM, 4, Serialized)
-                                {
-                                    Name (T_0, Zero)
-                                    Store (ToInteger (Arg2), T_0)
-
-                                    If (LEqual (T_0, Zero))
-                                    {
-                                        Return (Buffer (One)
-                                        {
-                                            0x07
-                                        })
-                                    }
-                                    ElseIf (LEqual (T_0, One))
-                                    {
-                                        If (LNotEqual (SDGV, 0xFF))
-                                        {
-                                            Return (One)
-                                        }
-                                    }
-                                    ElseIf (LEqual (T_0, 0x02))
-                                    {
-                                        Return (SDGV)
-                                    }
-
-                                    Return (Zero)
-                                }
-                            }
-
-                            Scope (PR13)
-                            {
-                                Alias (SBV2, SDGV)
-
-                                Method (_DSM, 4, Serialized)
-                                {
-                                    Return (^^PR12._DSM (Arg0, Arg1, Arg2, Arg3))
-                                }
-                            }
-                        }
-                    }
-                }
-
-                Scope (RP02)
+                    0x07
+                })
+            }
+            ElseIf (LEqual (T_0, One))
+            {
+                If (LNotEqual (Arg0, 0xFF))
                 {
-                    Device (XHC1)
-                    {
-                        Name (_ADR, Zero)
-                    }
+                    Return (One)
                 }
+            }
+            ElseIf (LEqual (T_0, 0x02))
+            {
+                Return (Arg0)
+            }
 
-                Scope (RP04)
-                {
-                    Device (JMB0)
-                    {
-                        Name (_ADR, Zero)
-                        OperationRegion (CF40, PCI_Config, 0x40, 0x04)
-                        Field (CF40, ByteAcc, NoLock, Preserve)
-                        {
-                            CHE0,   1,
-                            MULT,   1,
-                                ,   1,
-                            CAB0,   1,
-                            CHE1,   1,
-                                    Offset (0x01),
-                            AHEN,   1,
-                                ,   3,
-                            PRT0,   1,
-                            AHM0,   1,
-                            PRT1,   1,
-                            AHM1,   1,
-                            CF42,   6,
-                            SWAP,   1,
-                            PATA,   1,
-                                ,   6,
-                            WTEN,   1,
-                                    Offset (0x04)
-                        }
-                    }
+            Return (Zero)
+        }
+    }
 
-                    Device (JMB1)
-                    {
-                        Name (_ADR, One)
-                        OperationRegion (CF40, PCI_Config, 0x40, 0x04)
-                        Field (CF40, ByteAcc, NoLock, Preserve)
-                        {
-                            CHE0,   1,
-                            MULT,   1,
-                                ,   1,
-                            CAB0,   1,
-                            CHE1,   1,
-                                    Offset (0x01),
-                            AHEN,   1,
-                                ,   3,
-                            PRT0,   1,
-                            AHM0,   1,
-                            PRT1,   1,
-                            AHM1,   1,
-                            CF42,   6,
-                            SWAP,   1,
-                            PATA,   1,
-                                ,   6,
-                            WTEN,   1,
-                                    Offset (0x04)
-                        }
-                    }
-                }
+    Scope (\_SB.PCI0.EHC2)
+    {
+        Name (AAPL, Package (0x0B)
+        {
+            "AAPL,current-available", 
+            0x0834, 
+            "AAPL,current-extra", 
+            0x0898, 
+            "AAPL,current-extra-in-sleep", 
+            0x0640, 
+            "AAPL,max-port-current-in-sleep", 
+            0x0834, 
+            "AAPL,device-internal", 
+            0x02, 
+            Buffer (One) { 0x00 }
+        })
+
+        Method (_DSM, 4, NotSerialized)
+        {
+            If (LEqual (Arg2, Zero))
+            {
+                Return (Buffer (One) { 0x03 })
+            }
 
-                Scope (RP05)
-                {
-                    Device (XHC2)
-                    {
-                        Name (_ADR, Zero)
-                    }
-                }
+            Return (RefOf (AAPL))
+        }
+    }
 
-                Scope (RP07)
-                {
-                    Device (FWBR)
-                    {
-                        Name (_ADR, Zero)
-                        Name (_PRW, Package (0x02) { 0x0B, 0x04 })
-                        Name (_PRT, Package (0x0C)
-                        {
-                            Package (0x04) { 0xFFFF,     Zero, Zero, 0x12 },
-                            Package (0x04) { 0xFFFF,      One, Zero, 0x13 },
-                            Package (0x04) { 0xFFFF,     0x02, Zero, 0x10 },
-                            Package (0x04) { 0xFFFF,     0x03, Zero, 0x11 },
-                            Package (0x04) { 0x0001FFFF, Zero, Zero, 0x13 },
-                            Package (0x04) { 0x0001FFFF,  One, Zero, 0x10 },
-                            Package (0x04) { 0x0001FFFF, 0x02, Zero, 0x11 },
-                            Package (0x04) { 0x0001FFFF, 0x03, Zero, 0x12 },
-                            Package (0x04) { 0x0002FFFF, Zero, Zero, 0x11 },
-                            Package (0x04) { 0x0002FFFF,  One, Zero, 0x12 },
-                            Package (0x04) { 0x0002FFFF, 0x02, Zero, 0x13 },
-                            Package (0x04) { 0x0002FFFF, 0x03, Zero, 0x10 }
-                        })
+    Scope (\_SB.PCI0.EHC2.HUBN.PR01.PR12)
+    {
+        Method (_DSM, 4, Serialized)
+        {
+            Return (\_SB.PCI0.EHCN (SBV1, Arg2))
+        }
+    }
 
-                        Device (FRWR)
-                        {
-                            Name (_ADR, 0x00020000)
-                        }
-                    }
-                }
+    Scope (\_SB.PCI0.EHC2.HUBN.PR01.PR13)
+    {
+        Method (_DSM, 4, Serialized)
+        {
+            Return (\_SB.PCI0.EHCN (SBV2, Arg2))
+        }
+    }
 
-                Scope (EHC1)
-                {
-                    Method (_DSM, 4, NotSerialized)
-                    {
-                        If (LEqual (Arg2, Zero))
-                        {
-                           Return (Buffer (One) { 0x03 })
-                        }
+    Scope (\_SB.PCI0.RP02)
+    {
+        Device (XHC1)
+        {
+            Name (_ADR, Zero)
+        }
+    }
 
-                        Return (RefOf (^^EHC2.AAPL))
-                    }
+    Scope (\_SB.PCI0.RP04)
+    {
+        Device (JMB0)
+        {
+            Name (_ADR, Zero)
+            OperationRegion (CF40, PCI_Config, 0x40, 0x04)
+            Field (CF40, ByteAcc, NoLock, Preserve)
+            {
+                CHE0,   1, 
+                MULT,   1, 
+                    ,   1, 
+                CAB0,   1, 
+                CHE1,   1, 
+                Offset (0x01), 
+                AHEN,   1, 
+                    ,   3, 
+                PRT0,   1, 
+                AHM0,   1, 
+                PRT1,   1, 
+                AHM1,   1, 
+                CF42,   6, 
+                SWAP,   1, 
+                PATA,   1, 
+                    ,   6, 
+                WTEN,   1, 
+                Offset (0x04)
+            }
+        }
 
-                    Scope (HUBN)
-                    {
-                        Scope (PR01)
-                        {
-                            Scope (PR14)
-                            {
-                                Alias (SBV1, SDGV)
+        Device (JMB1)
+        {
+            Name (_ADR, One)
+            OperationRegion (CF40, PCI_Config, 0x40, 0x04)
+            Field (CF40, ByteAcc, NoLock, Preserve)
+            {
+                CHE0,   1, 
+                MULT,   1, 
+                    ,   1, 
+                CAB0,   1, 
+                CHE1,   1, 
+                Offset (0x01), 
+                AHEN,   1, 
+                    ,   3, 
+                PRT0,   1, 
+                AHM0,   1, 
+                PRT1,   1, 
+                AHM1,   1, 
+                CF42,   6, 
+                SWAP,   1, 
+                PATA,   1, 
+                    ,   6, 
+                WTEN,   1, 
+                Offset (0x04)
+            }
+        }
+    }
 
-                                Method (_DSM, 4, Serialized)
-                                {
-                                    Return (\_SB.PCI0.EHC2.HUBN.PR01.PR12._DSM (Arg0, Arg1, Arg2, Arg3))
-                                }
-                            }
+    Scope (\_SB.PCI0.RP05)
+    {
+        Device (XHC2)
+        {
+            Name (_ADR, Zero)
+        }
+    }
 
-                            Scope (PR15)
-                            {
-                                Alias (SBV2, SDGV)
+    Scope (\_SB.PCI0.RP07)
+    {
+        Device (FWBR)
+        {
+            Name (_ADR, Zero)
+            Name (_PRW, Package (0x02) { 0x0B, 0x04 })
+            Name (_PRT, Package (0x0C)
+            {
+                Package (0x04) { 0xFFFF,     Zero, Zero, 0x12 },
+                Package (0x04) { 0xFFFF,      One, Zero, 0x13 },
+                Package (0x04) { 0xFFFF,     0x02, Zero, 0x10 },
+                Package (0x04) { 0xFFFF,     0x03, Zero, 0x11 },
+                Package (0x04) { 0x0001FFFF, Zero, Zero, 0x13 },
+                Package (0x04) { 0x0001FFFF,  One, Zero, 0x10 },
+                Package (0x04) { 0x0001FFFF, 0x02, Zero, 0x11 },
+                Package (0x04) { 0x0001FFFF, 0x03, Zero, 0x12 },
+                Package (0x04) { 0x0002FFFF, Zero, Zero, 0x11 },
+                Package (0x04) { 0x0002FFFF,  One, Zero, 0x12 },
+                Package (0x04) { 0x0002FFFF, 0x02, Zero, 0x13 },
+                Package (0x04) { 0x0002FFFF, 0x03, Zero, 0x10 }
+            })
+
+            Device (FRWR)
+            {
+                Name (_ADR, 0x00020000)
+            }
+        }
+    }
 
-                                Method (_DSM, 4, Serialized)
-                                {
-                                    Return (\_SB.PCI0.EHC2.HUBN.PR01.PR12._DSM (Arg0, Arg1, Arg2, Arg3))
-                                }
-                            }
+    Scope (\_SB.PCI0.EHC1)
+    {
+        Method (_DSM, 4, NotSerialized)
+        {
+            If (LEqual (Arg2, Zero))
+            {
+                Return (Buffer (One) { 0x03 })
+            }
+
+            Return (RefOf (\_SB.PCI0.EHC2.AAPL))
+        }
+    }
 
-                            Scope (PR16)
-                            {
-                                Alias (SBV1, SDGV)
+    Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR14)
+    {
+        Method (_DSM, 4, Serialized)
+        {
+            Return (\_SB.PCI0.EHCN (SBV1, Arg2))
+        }
+    }
 
-                                Method (_DSM, 4, Serialized)
-                                {
-                                    Return (\_SB.PCI0.EHC2.HUBN.PR01.PR12._DSM (Arg0, Arg1, Arg2, Arg3))
-                                }
-                            }
+    Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR15)
+    {
+        Method (_DSM, 4, Serialized)
+        {
+            Return (\_SB.PCI0.EHCN (SBV2, Arg2))
+        }
+    }
 
-                            Scope (PR17)
-                            {
-                                Alias (SBV2, SDGV)
+    Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR16)
+    {
+        Method (_DSM, 4, Serialized)
+        {
+            Return (\_SB.PCI0.EHCN (SBV1, Arg2))
+        }
+    }
 
-                                Method (_DSM, 4, Serialized)
-                                {
-                                    Return (\_SB.PCI0.EHC2.HUBN.PR01.PR12._DSM (Arg0, Arg1, Arg2, Arg3))
-                                }
-                            }
-                        }
-                    }
-                }
+    Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR17)
+    {
+        Method (_DSM, 4, Serialized)
+        {
+            Return (\_SB.PCI0.EHCN (SBV2, Arg2))
+        }
+    }
 
-                Scope (LPCB)
-                {
-                    Scope (HPET)
-                    {
-                        OperationRegion (RCRB, SystemMemory, HPTC, One)
-                        Field (RCRB, ByteAcc, Lock, Preserve)
-                        {
-                                ,   7,
-                            HPAE,   1
-                        }
+    Scope (\_SB.PCI0.LPCB.HPET)
+    {
+        OperationRegion (RCRB, SystemMemory, HPTC, One)
+        Field (RCRB, ByteAcc, Lock, Preserve)
+        {
+                ,   7, 
+            HPAE,   1
+        }
 
-                        Method (_INI, 0, NotSerialized)
-                        {
-                            Store (One, HPAE)
-                        }
-                    }
-                }
-            }
+        Method (_INI, 0, NotSerialized)
+        {
+            Store (One, HPAE)
         }
     }
 }

From f80f94bfa303dfa21547765cfbc4b9e57a073274 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 26 Mar 2013 23:07:01 +0100
Subject: [PATCH 342/623] Before code removal

Having \_SB.PCI0.EHCn.HUBN.PR01.PRnn._DSM in your ACPI tables on OS X
is pointless because the UUID doesn't match!
---
 .../acpi/examples/P8Z68-V PRO/ssdt.dsl        | 96 ++++++++++++++++++-
 1 file changed, 91 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl
index 04ad8b8..62b2990 100644
--- a/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl	
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl	
@@ -38,6 +38,7 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
 
     Scope (\_SB.PCI0)
     {
+        /* Example code (soon to be removed) */
         Method (EHCN, 2, NotSerialized)
         {
             Name (T_0, Zero)
@@ -85,15 +86,38 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
 
         Method (_DSM, 4, NotSerialized)
         {
-            If (LEqual (Arg2, Zero))
-            {
-                Return (Buffer (One) { 0x03 })
+            /* Arg0 = 0xC6, 0xB7, 0xB5, 0xA0, 0x18, 0x13, 0x1C, 0x44, 0xB0, 0xC9, 0xFE, 0x69, 0x5E, 0xAF, 0x94, 0x9b
+
+            If (LEqual (Arg0, Buffer (0x10)
+                {
+                / * 0000 * /    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B,
+                / * 0008 * /    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
+                }))
+            { */
+                If (LEqual (Arg2, Zero))
+                {
+                    Return (Buffer (One) { 0x03 })
+                }
+
+                Return (RefOf (AAPL))
+            /* }
+			Else
+			{
+                If (LEqual (Arg2, Zero))
+                {
+                    Return (Buffer (One) { 0x03 })
+                }
+
+				Name (UUID, Zero)
+                ToBuffer (Arg0, UUID)
+                Return ( Package (0x02) { "UUID", UUID })
             }
 
-            Return (RefOf (AAPL))
+            Return (Zero)  */
         }
     }
 
+    /* Example code (soon to be removed) */
     Scope (\_SB.PCI0.EHC2.HUBN.PR01.PR12)
     {
         Method (_DSM, 4, Serialized)
@@ -102,6 +126,7 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
         }
     }
 
+    /* Example code (soon to be removed) */
     Scope (\_SB.PCI0.EHC2.HUBN.PR01.PR13)
     {
         Method (_DSM, 4, Serialized)
@@ -115,6 +140,34 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
         Device (XHC1)
         {
             Name (_ADR, Zero)
+            Name (_PRW, Package(0x02) { 0x0D, 0x04 })
+            Name (_S4D, 0x03)
+            Name (_S3D, 0x03)
+            Name (MBSD, One)
+            Name (XHCN, One)
+
+            /*  Experimental code
+            Method (_DSM, 4, Serialized)
+            {
+                If (LEqual (Arg2, Zero))
+                {
+                    Return (Buffer (One) { 0x03 })
+                }
+
+                Return (Package (0x0A)
+                {
+                    "name",
+                    "pci8086,1e31",
+                    "device-id",
+                    Buffer(0x04) { 0x31, 0x1e, 0x00, 0x00 },
+                    "vendor-id",
+                    Buffer(0x04) { 0x86, 0x80, 0x00, 0x00 },
+                    "subsystem-id",
+                    Buffer(0x04) { 0x72, 0x70, 0x00, 0x00 },
+                    "subsystem-vendor-id",
+                    Buffer(0x04) { 0x86, 0x80, 0x00, 0x00 }
+                })
+            } */
         }
     }
 
@@ -177,9 +230,37 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
 
     Scope (\_SB.PCI0.RP05)
     {
-        Device (XHC2)
+        Device (XHC1)
         {
             Name (_ADR, Zero)
+            Name (_PRW, Package (0x02) { 0x0D, 0x04 })
+            Name (_S4D, 0x03)
+            Name (_S3D, 0x03)
+            Name (MBSD, One)
+            Name (XHCN, One)
+
+            /* Experimental code
+			Method (_DSM, 4, Serialized)
+            {
+                If (LEqual (Arg2, Zero))
+                {
+                    Return (Buffer (One) { 0x03 })
+                }
+
+                Return (Package (0x0A)
+                {
+                    "name",
+                    "pci8086,1e31",
+                    "device-id",
+                    Buffer(0x04) { 0x31, 0x1e, 0x00, 0x00 },
+                    "vendor-id",
+                    Buffer(0x04) { 0x86, 0x80, 0x00, 0x00 },
+                    "subsystem-id",
+                    Buffer(0x04) { 0x72, 0x70, 0x00, 0x00 },
+                    "subsystem-vendor-id",
+                    Buffer(0x04) { 0x86, 0x80, 0x00, 0x00 }
+                })
+            } */
         }
     }
 
@@ -225,6 +306,7 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
         }
     }
 
+    /* Example code (soon to be removed) */
     Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR14)
     {
         Method (_DSM, 4, Serialized)
@@ -233,6 +315,7 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
         }
     }
 
+    /* Example code (soon to be removed) */
     Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR15)
     {
         Method (_DSM, 4, Serialized)
@@ -241,6 +324,7 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
         }
     }
 
+    /* Example code (soon to be removed) */
     Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR16)
     {
         Method (_DSM, 4, Serialized)
@@ -249,6 +333,7 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
         }
     }
 
+    /* Example code (soon to be removed) */
     Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR17)
     {
         Method (_DSM, 4, Serialized)
@@ -257,6 +342,7 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
         }
     }
 
+    /* Optional code to activate the HPET */
     Scope (\_SB.PCI0.LPCB.HPET)
     {
         OperationRegion (RCRB, SystemMemory, HPTC, One)

From fef620851e388efb0c382ab05a8fab477363c6b0 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 26 Mar 2013 23:12:47 +0100
Subject: [PATCH 343/623] Code removal

---
 .../acpi/examples/P8Z68-V PRO/dsdt.dsl        |   5 +-
 .../acpi/examples/P8Z68-V PRO/ssdt.dsl        | 170 +-----------------
 2 files changed, 5 insertions(+), 170 deletions(-)

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl
index 5b5f4fd..9b2c048 100644
--- a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
@@ -36,7 +36,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
     Name (TCLT, 0x1000)
     Name (OPRE, 0xDCBB2E18)
 
-    OperationRegion (GNVS, SystemMemory, OPRE, 0x01CB)
+    OperationRegion (GNVS, SystemMemory, OPRE, 0x0164)
     Field (GNVS, AnyAcc, Lock, Preserve)
     {
                 Offset (0x0B), 
@@ -45,9 +45,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
         IGDS,   8,
                 Offset (0xAA), 
         ASLB,   32,
-                Offset (0xE3), 
-        SBV1,   8, 
-        SBV2,   8,
                 Offset (0xEF), 
         L01C,   8,
                 Offset (0x15F), 
diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl
index 62b2990..3a92b59 100644
--- a/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl	
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/ssdt.dsl	
@@ -18,54 +18,14 @@
  */
 DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
 {
-    External (_SB_.PCI0, DeviceObj)
     External (_SB_.PCI0.EHC1, DeviceObj)
-    External (_SB_.PCI0.EHC1.HUBN.PR01.PR14, DeviceObj)
-    External (_SB_.PCI0.EHC1.HUBN.PR01.PR15, DeviceObj)
-    External (_SB_.PCI0.EHC1.HUBN.PR01.PR16, DeviceObj)
-    External (_SB_.PCI0.EHC1.HUBN.PR01.PR17, DeviceObj)
     External (_SB_.PCI0.EHC2, DeviceObj)
-    External (_SB_.PCI0.EHC2.HUBN.PR01.PR12, DeviceObj)
-    External (_SB_.PCI0.EHC2.HUBN.PR01.PR13, DeviceObj)
     External (_SB_.PCI0.LPCB.HPET, DeviceObj)
     External (_SB_.PCI0.RP02, DeviceObj)
     External (_SB_.PCI0.RP04, DeviceObj)
     External (_SB_.PCI0.RP05, DeviceObj)
     External (_SB_.PCI0.RP07, DeviceObj)
     External (HPTC, IntObj)
-    External (SBV1, FieldUnitObj)
-    External (SBV2, FieldUnitObj)
-
-    Scope (\_SB.PCI0)
-    {
-        /* Example code (soon to be removed) */
-        Method (EHCN, 2, NotSerialized)
-        {
-            Name (T_0, Zero)
-            Store (ToInteger (Arg1), T_0)
-
-            If (LEqual (T_0, Zero))
-            {
-                Return (Buffer (One)
-                {
-                    0x07
-                })
-            }
-            ElseIf (LEqual (T_0, One))
-            {
-                If (LNotEqual (Arg0, 0xFF))
-                {
-                    Return (One)
-                }
-            }
-            ElseIf (LEqual (T_0, 0x02))
-            {
-                Return (Arg0)
-            }
-
-            Return (Zero)
-        }
-    }
 
     Scope (\_SB.PCI0.EHC2)
     {
@@ -86,52 +46,12 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
 
         Method (_DSM, 4, NotSerialized)
         {
-            /* Arg0 = 0xC6, 0xB7, 0xB5, 0xA0, 0x18, 0x13, 0x1C, 0x44, 0xB0, 0xC9, 0xFE, 0x69, 0x5E, 0xAF, 0x94, 0x9b
-
-            If (LEqual (Arg0, Buffer (0x10)
-                {
-                / * 0000 * /    0x8F, 0x70, 0xFC, 0xA5, 0x75, 0x87, 0xA6, 0x4B,
-                / * 0008 * /    0xBD, 0x0C, 0xBA, 0x90, 0xA1, 0xEC, 0x72, 0xF8
-                }))
-            { */
-                If (LEqual (Arg2, Zero))
-                {
-                    Return (Buffer (One) { 0x03 })
-                }
-
-                Return (RefOf (AAPL))
-            /* }
-			Else
-			{
-                If (LEqual (Arg2, Zero))
-                {
-                    Return (Buffer (One) { 0x03 })
-                }
-
-				Name (UUID, Zero)
-                ToBuffer (Arg0, UUID)
-                Return ( Package (0x02) { "UUID", UUID })
+            If (LEqual (Arg2, Zero))
+            {
+                Return (Buffer (One) { 0x03 })
             }
 
-            Return (Zero)  */
-        }
-    }
-
-    /* Example code (soon to be removed) */
-    Scope (\_SB.PCI0.EHC2.HUBN.PR01.PR12)
-    {
-        Method (_DSM, 4, Serialized)
-        {
-            Return (\_SB.PCI0.EHCN (SBV1, Arg2))
-        }
-    }
-
-    /* Example code (soon to be removed) */
-    Scope (\_SB.PCI0.EHC2.HUBN.PR01.PR13)
-    {
-        Method (_DSM, 4, Serialized)
-        {
-            Return (\_SB.PCI0.EHCN (SBV2, Arg2))
+            Return (RefOf (AAPL))
         }
     }
 
@@ -145,29 +65,6 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
             Name (_S3D, 0x03)
             Name (MBSD, One)
             Name (XHCN, One)
-
-            /*  Experimental code
-            Method (_DSM, 4, Serialized)
-            {
-                If (LEqual (Arg2, Zero))
-                {
-                    Return (Buffer (One) { 0x03 })
-                }
-
-                Return (Package (0x0A)
-                {
-                    "name",
-                    "pci8086,1e31",
-                    "device-id",
-                    Buffer(0x04) { 0x31, 0x1e, 0x00, 0x00 },
-                    "vendor-id",
-                    Buffer(0x04) { 0x86, 0x80, 0x00, 0x00 },
-                    "subsystem-id",
-                    Buffer(0x04) { 0x72, 0x70, 0x00, 0x00 },
-                    "subsystem-vendor-id",
-                    Buffer(0x04) { 0x86, 0x80, 0x00, 0x00 }
-                })
-            } */
         }
     }
 
@@ -238,29 +135,6 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
             Name (_S3D, 0x03)
             Name (MBSD, One)
             Name (XHCN, One)
-
-            /* Experimental code
-			Method (_DSM, 4, Serialized)
-            {
-                If (LEqual (Arg2, Zero))
-                {
-                    Return (Buffer (One) { 0x03 })
-                }
-
-                Return (Package (0x0A)
-                {
-                    "name",
-                    "pci8086,1e31",
-                    "device-id",
-                    Buffer(0x04) { 0x31, 0x1e, 0x00, 0x00 },
-                    "vendor-id",
-                    Buffer(0x04) { 0x86, 0x80, 0x00, 0x00 },
-                    "subsystem-id",
-                    Buffer(0x04) { 0x72, 0x70, 0x00, 0x00 },
-                    "subsystem-vendor-id",
-                    Buffer(0x04) { 0x86, 0x80, 0x00, 0x00 }
-                })
-            } */
         }
     }
 
@@ -306,42 +180,6 @@ DefinitionBlock ("ssdt.aml", "SSDT", 1, "APPLE ", "general", 0x00001000)
         }
     }
 
-    /* Example code (soon to be removed) */
-    Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR14)
-    {
-        Method (_DSM, 4, Serialized)
-        {
-            Return (\_SB.PCI0.EHCN (SBV1, Arg2))
-        }
-    }
-
-    /* Example code (soon to be removed) */
-    Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR15)
-    {
-        Method (_DSM, 4, Serialized)
-        {
-            Return (\_SB.PCI0.EHCN (SBV2, Arg2))
-        }
-    }
-
-    /* Example code (soon to be removed) */
-    Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR16)
-    {
-        Method (_DSM, 4, Serialized)
-        {
-            Return (\_SB.PCI0.EHCN (SBV1, Arg2))
-        }
-    }
-
-    /* Example code (soon to be removed) */
-    Scope (\_SB.PCI0.EHC1.HUBN.PR01.PR17)
-    {
-        Method (_DSM, 4, Serialized)
-        {
-            Return (\_SB.PCI0.EHCN (SBV2, Arg2))
-        }
-    }
-
     /* Optional code to activate the HPET */
     Scope (\_SB.PCI0.LPCB.HPET)
     {

From 1db06cedcb52e02c27fe6ad94e0a5104a0c5f453 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 26 Mar 2013 23:31:55 +0100
Subject: [PATCH 344/623] Fixing compiler errors and warning

---
 .../acpi/examples/P8Z68-V PRO/dsdt.dsl        | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl
index 9b2c048..4ce894f 100644
--- a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
@@ -36,7 +36,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
     Name (TCLT, 0x1000)
     Name (OPRE, 0xDCBB2E18)
 
-    OperationRegion (GNVS, SystemMemory, OPRE, 0x0164)
+    OperationRegion (GNVS, SystemMemory, OPRE, 0x0163)
     Field (GNVS, AnyAcc, Lock, Preserve)
     {
                 Offset (0x0B), 
@@ -45,7 +45,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
         IGDS,   8,
                 Offset (0xAA), 
         ASLB,   32,
-                Offset (0xEF), 
+                Offset (0xEF),
         L01C,   8,
                 Offset (0x15F), 
         TBAB,   32, 
@@ -526,7 +526,7 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
                 CreateDWordField (BUF0, ^_Y0E._LEN, M1LN)
                 ShiftLeft (TLUD, 0x14, M1MN)
                 Add (Subtract (M1MX, M1MN), One, M1LN)
-                CreateDWordField (BUF0, ^_Y0F._LEN, MSLN)
+                CreateQWordField (BUF0, ^_Y0F._LEN, MSLN)
                 Store (Zero, MSLN)
 
                 Return (BUF0)
@@ -721,47 +721,47 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
                     {
                         Name (_ADR, One)
                         Name (_UPC, Package (0x04) { 0xFF, Zero, Zero, Zero })
-                        Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0x30, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero })
+                        Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0x30, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero }})
                         Device (PR11)
                         {
                             Name (_ADR, One)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR12)
                         {
                             Name (_ADR, 0x02)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR13)
                         {
                             Name (_ADR, 0x03)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR14)
                         {
                             Name (_ADR, 0x04)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR15)
                         {
                             Name (_ADR, 0x05)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR16)
                         {
                             Name (_ADR, 0x06)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
                     }
                 }
@@ -813,61 +813,61 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
                     {
                         Name (_ADR, One)
                         Name (_UPC, Package (0x04) { 0xFF, Zero, Zero, Zero })
-                        Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0x30, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero })
+                        Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0x30, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero }})
                         Device (PR11)
                         {
                             Name (_ADR, One)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1C, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR12)
                         {
                             Name (_ADR, 0x02)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR13)
                         {
                             Name (_ADR, 0x03)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1D, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR14)
                         {
                             Name (_ADR, 0x04)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xE1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR15)
                         {
                             Name (_ADR, 0x05)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR16)
                         {
                             Name (_ADR, 0x06)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR17)
                         {
                             Name (_ADR, 0x07)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
 
                         Device (PR18)
                         {
                             Name (_ADR, 0x08)
                             Name (_UPC, Package (0x04) { 0xFF, 0xFF, Zero, Zero })
-                            Name (_PLD, Package (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero })
+                            Name (_PLD, Package (One) { Buffer (0x10) { 0x81, Zero, Zero, Zero, Zero, Zero, Zero, Zero, 0xB1, 0x1E, Zero, Zero, Zero, Zero, Zero, Zero }})
                         }
                     }
                 }

From aa297168775314fb981285672141af78ba6ebc1b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 27 Mar 2013 07:14:06 +0100
Subject: [PATCH 345/623] Adding a device name

---
 i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl
index 4ce894f..e5096f0 100644
--- a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
@@ -532,6 +532,11 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
                 Return (BUF0)
             }
 
+            Device (MCHC)
+            {
+                Name (_ADR, Zero)
+            }
+
             Device (PEG0)
             {
                 Name (_ADR, 0x00010000)

From 61fb8036482d2eaf143dacec276a5cd1b86fb6a3 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 28 Mar 2013 06:57:07 +0100
Subject: [PATCH 346/623] GPU stats are now optional

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 19 +++++++++++++++----
 .../AppleIntelCPUPowerManagementInfo.h        | 11 ++++++++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 81a4309..4df6928 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -133,8 +133,11 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 				IOLog("%d ", currentBit);
 			}
 		}
-		
+#if REPORT_GPU_STATS
 		IOLog("] GPU P-State [ %d ]\n", (UInt8)gMchbar[1]);
+#else
+		IOLog("]\n");
+#endif
 	}
 
 	loopLock = false;
@@ -173,13 +176,18 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 			{
 				this->registerService(0);
 
+				UInt64  msr = rdmsr64(MSR_IA32_PERF_STS);
+				gCoreMultipliers |= (1ULL << (msr >> 8));
+
 				uint32_t cpuid_reg[4];
 				do_cpuid(0x00000001, cpuid_reg);
 
 				gCPUModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
-				reportMSRs();
 
-				UInt64 msr = rdmsr64(MSR_PLATFORM_INFO);
+#if REPORT_MSRS
+				reportMSRs();
+#endif
+				msr = rdmsr64(MSR_PLATFORM_INFO);
 				gMinRatio = (UInt8)((msr >> 40) & 0xff);
 				IOLog("Low Frequency Mode : %d00 MHz\n", gMinRatio);
  
@@ -198,6 +206,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 					IOLog("Max Frequency      : %d00 MHz\n", gMaxRatio);
 				}
 
+#if REPORT_GPU_STATS
 				/*
 				 * TODO: Pike, add check a to see if there is a GPU and if it is is enabled!
 				 */
@@ -232,7 +241,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				{
 					IOLog("Error: memDescriptor == NULL\n");
 				}
-
+#endif
 				timerEventSource->setTimeoutMS(1000);
 
 				return true;
@@ -271,6 +280,7 @@ void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
 
 void AppleIntelCPUPowerManagementInfo::free()
 {
+#if REPORT_GPU_STATS
 	if (memoryMap)
 	{
 		memoryMap->release();
@@ -282,6 +292,7 @@ void AppleIntelCPUPowerManagementInfo::free()
 		memDescriptor->release();
 		memDescriptor = NULL;
 	}
+#endif
 
 	super::free();
 }
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index d6c04f3..6e6f939 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -21,6 +21,9 @@
 
 #define super IOService
 
+#define REPORT_MSRS			0
+#define REPORT_GPU_STATS	0
+
 extern "C" void mp_rendezvous_no_intrs(void (*action_func)(void *), void * arg);
 extern "C" int cpu_number(void);
 
@@ -32,8 +35,11 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 	IOSimpleLock		*simpleLock;
 	IOWorkLoop			*workLoop;
 	IOTimerEventSource	*timerEventSource;
+
+#if REPORT_GPU_STATS
 	IOMemoryDescriptor	*memDescriptor;
 	IOMemoryMap			*memoryMap;
+#endif
 
 	IOReturn result		= kIOReturnSuccess;
 
@@ -64,4 +70,7 @@ OSDefineMetaClassAndStructors(AppleIntelCPUPowerManagementInfo, IOService)
 
 UInt8	gCPUModel	= 0x2A;
 UInt8	gCoreStates	= 0ULL;
-UInt8	* gMchbar	= NULL;
+
+#if REPORT_GPU_STATS
+	UInt8	* gMchbar	= NULL;
+#endif

From 3974b1200559303453e14e05795d105ee81251b0 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 29 Mar 2013 03:39:41 +0100
Subject: [PATCH 347/623] Typo

Thanks to Justin Evans for the tip!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 4e4fad0..227c25b 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -233,7 +233,7 @@ gDesktopSandyBridgeCPUList=(
 # i7 Desktop Extreme Series
 i7-3970X,150,0,3500,4000,6,12
 i7-3960X,130,0,3300,3900,6,12
-i7-3930X,130,0,3200,3800,6,12
+i7-3930K,130,0,3200,3800,6,12
 i7-3820,130,0,3600,3800,4,8
 # i7 Desktop series
 i7-2600S,65,1600,2800,3800,4,8

From 9344a37014c57218a6952c430dc5033bccefc9af Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 30 Mar 2013 09:11:33 +0100
Subject: [PATCH 348/623] Typo in board-id for iMac's fixed

Thanks to 4D3K for the tip!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 227c25b..ac4ad53 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -1370,14 +1370,14 @@ set -x
 function _initSandyBridgeSetup()
 {
 	case $boardID in
-		Mac-942B59F58194171B)
+		Mac-942B59F58194151B)
 			gSystemType=1
 			gMacModelIdentifier="iMac12,1"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
-		Mac-942B5BF58194151B)
+		Mac-942B5BF58194171B)
 			gSystemType=1
 			gMacModelIdentifier="iMac12,2"
 			gACST_CPU0=13   # C1, C3 and C6

From cd83c021f8c9725163c5e469e095a2f3000391da Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 30 Mar 2013 09:14:38 +0100
Subject: [PATCH 349/623] Fixed a typo in board-id's for iMac's

Thanks to 4D3K for the tip!
---
 i386/libsaio/smbios/model_data.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 8e9ca4c..4d5ac74 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -40,12 +40,12 @@
 	#elif (TARGET_MODEL == IMAC_121)
 		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
 		#define SMB_PRODUCT_NAME	"iMac12,1"
-		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
+		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194151B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
 	#elif (TARGET_MODEL == IMAC_122)
 		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
 		#define SMB_PRODUCT_NAME	"iMac12,2"
-		#define SMB_BOARD_PRODUCT	"Mac-942B5BF58194151B"
+		#define SMB_BOARD_PRODUCT	"Mac-942B5BF58194171B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '2' }
 	#elif (TARGET_MODEL == IMAC_131)
 		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"

From 035bf0a0bb7bdecb8f4fb5cff96ded08bc73589c Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Sat, 30 Mar 2013 13:49:18 +0000
Subject: [PATCH 350/623] Added second DSDT example

---
 i386/libsaio/acpi/Tools/ssdtPRGen copy.sh     | 1436 +++++++
 .../acpi/examples/MAXIMUS V GENE/DSDT.dsl     | 3483 +++++++++++++++++
 ...owerManagementInfo-all-target-headers.hmap |  Bin 0 -> 981 bytes
 ...PUPowerManagementInfo-generated-files.hmap |  Bin 0 -> 450 bytes
 ...owerManagementInfo-own-target-headers.hmap |  Bin 0 -> 981 bytes
 ...PUPowerManagementInfo-project-headers.hmap |  Bin 0 -> 913 bytes
 .../AppleIntelCPUPowerManagementInfo.dep      |    5 +
 .../AppleIntelCPUPowerManagementInfo.hmap     |  Bin 0 -> 2078 bytes
 .../AppleIntelCPUPowerManagementInfo_info.c   |    9 +
 ...leIntelCPUPowerManagementInfo.LinkFileList |    1 +
 .../x86_64/AppleIntelCPUPowerManagementInfo.d |  178 +
 .../AppleIntelCPUPowerManagementInfo.dia      |  Bin 0 -> 220 bytes
 .../x86_64/AppleIntelCPUPowerManagementInfo.o |  Bin 0 -> 131408 bytes
 .../AppleIntelCPUPowerManagementInfo_info.d   |   63 +
 .../AppleIntelCPUPowerManagementInfo_info.dia |  Bin 0 -> 220 bytes
 .../AppleIntelCPUPowerManagementInfo_info.o   |  Bin 0 -> 5076 bytes
 .../build-state.dat                           |  996 +++++
 ...-9E9E-41C9-966B-1B327D5EC5DC.xcactivitylog |  Bin 0 -> 2039 bytes
 .../Logs/Build/Cache.db                       |  Bin 0 -> 950 bytes
 ...-DF4F-4F8E-9FCF-211E10D22EAE.xcactivitylog |  Bin 0 -> 1970 bytes
 .../Logs/Issues/Cache.db                      |  Bin 0 -> 707 bytes
 .../info.plist                                |    8 +
 22 files changed, 6179 insertions(+)
 create mode 100755 i386/libsaio/acpi/Tools/ssdtPRGen copy.sh
 create mode 100644 i386/libsaio/acpi/examples/MAXIMUS V GENE/DSDT.dsl
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-all-target-headers.hmap
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-generated-files.hmap
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-own-target-headers.hmap
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-project-headers.hmap
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo.dep
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo.hmap
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.LinkFileList
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.d
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.dia
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.d
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.dia
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/build-state.dat
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Build/AC062B99-9E9E-41C9-966B-1B327D5EC5DC.xcactivitylog
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Build/Cache.db
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Issues/8BE2DAD6-DF4F-4F8E-9FCF-211E10D22EAE.xcactivitylog
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Issues/Cache.db
 create mode 100644 i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/info.plist

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen copy.sh b/i386/libsaio/acpi/Tools/ssdtPRGen copy.sh
new file mode 100755
index 0000000..28ae711
--- /dev/null
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen copy.sh	
@@ -0,0 +1,1436 @@
+#!/bin/bash
+#
+# Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
+#
+# Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
+# Version 3.6 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+#
+# Updates:
+#			- Added support for Ivybridge (Pike, January 2013)
+#			- Filename error fixed (Pike, January 2013)
+#			- Namespace error fixed in _printScopeStart (Pike, January 2013)
+#			- Model and board-id checks added (Pike, January 2013)
+#			- SMBIOS cpu-type check added (Pike, January 2013)
+#			- Copy/paste error fixed (Pike, January 2013)
+#			- Method ACST added to CPU scopes for IB CPUPM (Pike, January 2013)
+#			- Method ACST corrected for latest version of iasl (Dave, January 2013)
+#			- Changed path/filename to ~/Desktop/SSDT_PR.dsl (Dave, January 2013)
+#			- P-States are now one-liners instead of blocks (Pike, January 2013)
+#			- Support for flexible ProcessorNames added (Pike, Februari 2013)
+#			- Better feedback and Debug() injection added (Pike, Februari 2013)
+#			- Automatic processor type detection (Pike, Februari 2013)
+#			- TDP and processor type are now optional arguments (Pike, Februari 2013)
+#			- system-type check (used by X86PlatformPlugin) added (Pike, Februari 2013)
+#			- ACST injection for all logical processors (Pike, Februari 2013)
+#			- Introducing a stand-alone version of method _DSM (Pike, Februari 2013)
+#			- Fix incorrect turbo range (Pike, Februari 2013)
+#			- Restore IFS before return (Pike, Februari 2013)
+#			- Better/more complete feedback added (Jeroen, Februari 2013)
+#			- Processor data for desktop/mobile and server CPU's added (Jeroen, Februari 2013)
+#			- Improved power calculation, matching Apple's new algorithm (Pike, Februari 2013)
+#			- Fix iMac13,N latency and power values for C3 (Jeroen/Pike, Februari 2013)
+#			- IASL failed to launch when path included spaces (Pike, Februari 2013)
+#			- Typo in cpu-type check fixed (Jeroen, Februari 2013)
+#			- Error in CPU data (i5-3317U) fixed (Pike, Februari 2013)
+#			- Setting added for the target path/filename (Jeroen, Februari 2013)
+#			- Initial implementation of auto-copy (Jeroen, Februari 2013)
+#			- Additional checks added for cpu data/turbo modes (Jeroen, Februari 2013)
+#			- Undo filename change done by Jeroen (Pike, Februari 2013)
+#
+# Contributors:
+#			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
+#			- Many thanks to Jeroen for the CPU data, cleanups and renaming stuff.
+#
+
+# set -x # Used for tracing errors (can be used anywhere in the script).
+
+#================================= GLOBAL VARS ==================================
+
+#
+# Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
+#
+gIvyWorkAround=1
+
+#
+# Change this to 1 when you want SSDT.aml to get copied to the target location.
+#
+gAutoCopy=0
+
+#
+# This is the target location that SSDT.aml will be copied to.
+#
+# Note: Do no change this - will be updated automatically for Clover/RevoBoot!
+#
+gDestinationPath="/Extra/"
+
+#
+# This is the filename used for the copy process
+#
+gDestinationFile="SSDT.aml"
+
+#
+# A value of 1 will make this script call iasl (compiles SSDT_PR.dsl)
+#
+# Note: Will be set to 0 when we failed to locate a copy of iasl!
+#
+gCallIasl=1
+
+#
+# A value of 1 will make this script open SSDT_PR.dsl in the editor of your choice. 
+#
+gCallOpen=0
+
+#
+# Change this to 0 to stop it from injecting debug data.
+#
+gDebug=1
+
+#
+# Lowest possible idle frequency (user configurable). Also known as Low Frequency Mode.
+#
+gBaseFrequency=1600
+
+#
+# Change this label to "P00" when your DSDT uses 'P00n' instead of 'CPUn'.
+#
+gProcLabel="CPU"
+
+#
+# Other global variables.
+#
+
+gScriptVersion=3.6
+
+#
+# Path and filename setup.
+#
+
+gPath=~/Desktop
+gSsdtID=SSDT_PR
+gSsdtPR=${gPath}/${gSsdtID}.dsl
+
+gDesktopCPU=1
+gMobileCPU=2
+gServerCPU=3
+
+let gSystemType=0
+
+gACST_CPU0=13
+gACST_CPU1=7
+
+gMacModelIdentifier=""
+
+IVY_BRIDGE=4
+SANDY_BRIDGE=2
+
+gTypeCPU=0
+gProcessorData="Unknown CPU"
+gProcessorNumber=""
+
+#
+# Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
+#
+
+gSandyBridgeCPUList=(
+# E3-1200 Xeon Processor Series
+E3-1290,95,0,3600,4000,4,8
+E3-1280,95,0,3500,3900,4,8
+E3-1275,95,0,3400,3800,4,8
+E3-1270,80,0,3400,3800,4,8
+E3-1260L,45,0,2400,3300,4,8
+E3-1245,95,0,3300,3700,4,8
+E3-1240,80,0,3300,3700,4,8
+E3-1235,95,0,3200,3600,4,8
+E3-1230,80,0,3200,3600,4,8
+E3-1225,95,0,3100,3400,4,4
+E3-1220L,20,0,2200,3400,2,4
+E3-1220,80,0,3100,3400,4,4
+)
+
+#
+# Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
+#
+
+gServerIvyBridgeCPUList=(
+# E3-1200 Xeon Processor Series
+'E3-1290 V2',87,0,3700,4100,4,8
+'E3-1285 V2',65,0,3600,4000,
+'E3-1285L V2',0,0,3200,3900,
+'E3-1280 V2',69,0,3600,4000,4,8
+'E3-1275 V2',77,0,3500,3900,4,8
+'E3-1270 V2',69,0,3500,3900,4,8
+'E3-1265L V2',45,0,2500,3500,4,8
+'E3-1245 V2',77,0,3400,3800,4,8
+'E3-1240 V2',69,0,3400,3800,4,8
+'E3-1230 V2',69,0,3300,3700,4,8
+'E3-1225 V2',77,0,3200,3600,4,4
+'E3-1220 V2',69,0,3100,3500,4,4
+'E3-1220L V2',17,0,2300,3500,2,4
+)
+
+gDesktopIvyBridgeCPUList=(
+# i7-3700 Desktop Processor Series
+i7-3770T,45,1600,2500,3700,4,8
+i7-3770S,65,1600,3100,3900,4,8
+i7-3770K,77,1600,3500,4600,4,8
+i7-3770,77,1600,3400,3900,4,8
+# i5-3500 Desktop Processor Series
+i5-3570T,45,1600,2300,3300,4,4
+i5-3570K,77,1600,3400,3800,4,4
+i5-3570S,65,1600,3100,3800,4,4
+i5-3570,77,1600,3400,3800,4,4
+i5-3550S,65,1600,3000,3700,4,4
+i5-3550,77,1600,3300,3700,4,4
+# i5-3400 Desktop Processor Series
+i5-3475S,65,1600,2900,3600,4,4
+i5-3470S,65,1600,2900,3600,4,4
+i5-3470,77,1600,3200,3600,4,4
+i5-3470T,35,1600,2900,3600,2,4
+i5-3450S,65,1600,2800,3500,4,4
+i5-3450,77,1600,3100,3500,4,4
+# i5-3300 Desktop Processor Series
+i5-3350P,69,1600,3100,3300,4,4
+i5-3330S,65,1600,2700,3200,4,4
+i5-3333S,65,1600,2700,3200,4,4
+i5-3330S,65,1600,3700,3200,4,4
+i5-3330,77,1600,3000,3200,4,4
+# i3-3200 Desktop Processor Series
+i3-3240,55,1600,3400,0,2,4
+i3-3240T,35,1600,2900,0,2,4
+i3-3225,55,1600,3300,0,2,4
+i3-3220,55,1600,3300,0,2,4
+i3-3220T,35,1600,2800,0,2,4
+i3-3210,55,1600,3200,0,2,4
+)
+
+gMobileIvyBridgeCPUList=(
+# i7-3800 Mobile Processor Series
+i7-3840QM,45,1200,2800,3800,4,8
+i7-3820QM,45,1200,2700,3700,4,8
+# i7-3700 Mobile Processor Series
+i7-3740QM,45,1200,2700,3700,4,8
+i7-3720QM,45,1200,2600,3600,4,8
+# i7-3600 Mobile Processor Series
+i7-3689Y,13,0,1500,2600,2,4
+i7-3687U,17,800,2100,3300,2,4
+i7-3667U,17,800,2000,3200,2,4
+i7-3635QM,45,0,2400,3400,4,8
+i7-3620QM,35,0,2200,3200,4,8
+i7-3632QM,35,0,2200,3200,4,8
+i7-3630QM,45,0,2400,3400,4,8
+i7-3615QM,45,0,2300,3300,4,8
+i7-3615QE,45,0,2300,3300,4,8
+i7-3612QM,35,0,2100,3100,4,8
+i7-3612QE,35,0,2100,3100,4,8
+i7-3610QM,45,0,2300,3300,4,8
+i7-3610QE,45,0,2300,3300,4,8
+# i7-3500 Mobile Processor Series
+i7-3555LE,25,0,2500,3200,2,4
+i7-3540M,35,1200,3000,3700,2,4
+i7-3537U,17,800,2000,3100,2,4
+i7-3520M,35,1200,2900,3600,2,4
+i7-3517UE,17,0,1700,2800,2,4
+i7-3517U,17,0,1900,3000,2,4
+# i5-3600 Mobile Processor Series
+i5-3610ME,35,0,2700,3300,2,4
+# i5-3400 Mobile Processor Series
+i5-3439Y,13,0,1500,2300,2,4
+i5-3437U,17,800,1900,2900,2,4
+i5-3427U,17,800,1800,2800,2,4
+# i5-3300 Mobile Processor Series
+i5-3380M,35,1200,2900,3600,2,4
+i5-3360M,35,1200,2800,3500,2,4
+i5-3340M,35,1200,2700,3400,2,4
+i5-3339Y,13,0,1500,2000,2,4
+i5-3337U,17,0,1800,2700,2,4
+i5-3320M,35,1200,2600,3300,2,4
+i5-3317U,17,0,1700,2600,2,4
+# i5-3200 Mobile Processor Series
+i5-3230M,35,1200,2600,3200,2,4
+i5-3210M,35,1200,2500,3100,2,4
+# i3-3200 Mobile Processor Series
+i3-3239Y,13,0,1400,0,2,4
+i3-3227U,17,800,1900,0,2,4
+i3-3217UE,17,0,1600,0,2,4
+i3-3217U,17,0,1800,0,2,4
+# i3-3100 Mobile Processor Series
+i3-3130M,35,1200,2600,0,2,4
+i3-3120ME,35,0,2400,0,2,4
+i3-3120M,35,0,2500,0,2,4
+i3-3110M,35,0,2400,0,2,4
+)
+
+#--------------------------------------------------------------------------------
+
+function _printHeader()
+{
+    echo '/*'                                                                           >  $gSsdtPR
+    echo ' * Intel ACPI Component Architecture'                                         >> $gSsdtPR
+    echo ' * AML Disassembler version 20130210-00 [Feb 10 2013]'                        >> $gSsdtPR
+    echo ' * Copyright (c) 2000 - 2013 Intel Corporation'                               >> $gSsdtPR
+    echo ' * '                                                                          >> $gSsdtPR
+    echo ' * Original Table Header:'                                                    >> $gSsdtPR
+    echo ' *     Signature        "SSDT"'                                               >> $gSsdtPR
+    echo ' *     Length           0x0000036A (874)'                                     >> $gSsdtPR
+    echo ' *     Revision         0x01'                                                 >> $gSsdtPR
+    echo ' *     Checksum         0x00'                                                 >> $gSsdtPR
+    echo ' *     OEM ID           "APPLE "'                                             >> $gSsdtPR
+    echo ' *     OEM Table ID     "CpuPm"'                                              >> $gSsdtPR
+    echo ' *     OEM Revision     0x00003000 (4096)'                                    >> $gSsdtPR
+    echo ' *     Compiler ID      "INTL"'                                               >> $gSsdtPR
+    echo ' *     Compiler Version 0x20130210 (538116624)'                               >> $gSsdtPR
+    echo ' */'                                                                          >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
+    echo 'DefinitionBlock ("'$gSsdtID'.aml", "SSDT", 1, "APPLE ", "CpuPm", 0x00003000)' >> $gSsdtPR
+    echo '{'                                                                            >> $gSsdtPR
+}
+
+
+#--------------------------------------------------------------------------------
+
+function _printExternals()
+{
+    currentCPU=0;
+
+    while [ $currentCPU -lt $1 ]; do
+        echo '    External (\_PR_.'$gProcLabel$currentCPU', DeviceObj)'                 >> $gSsdtPR
+        let currentCPU+=1
+    done
+
+    echo ''                                                                             >> $gSsdtPR
+}
+
+
+#--------------------------------------------------------------------------------
+
+function _printDebugInfo()
+{
+    if ((gDebug)); then
+        echo '    Store ("ssdtPRGen.sh v'$gScriptVersion'", Debug)'                     >> $gSsdtPR
+        echo '    Store ("baseFrequency    : '$gBaseFrequency'", Debug)'                >> $gSsdtPR
+        echo '    Store ("frequency        : '$frequency'", Debug)'                     >> $gSsdtPR
+        echo '    Store ("logicalCPUs      : '$logicalCPUs'", Debug)'                   >> $gSsdtPR
+        echo '    Store ("tdp              : '$gTdp'", Debug)'                          >> $gSsdtPR
+        echo '    Store ("packageLength    : '$packageLength'", Debug)'                 >> $gSsdtPR
+        echo '    Store ("turboStates      : '$turboStates'", Debug)'                   >> $gSsdtPR
+        echo '    Store ("maxTurboFrequency: '$maxTurboFrequency'", Debug)'             >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+    fi
+}
+
+#--------------------------------------------------------------------------------
+
+function _printProcessorDefinitions()
+{
+    let currentCPU=0;
+
+    while [ $currentCPU -lt $1 ]; do
+        echo '    External (\_PR_.'$gProcLabel$currentCPU', DeviceObj)'                 >> $gSsdtPR
+        let currentCPU+=1
+    done
+
+    echo ''                                                                             >> $gSsdtPR
+}
+
+#--------------------------------------------------------------------------------
+
+function _printScopeStart()
+{
+    let turboStates=$1
+    let packageLength=$2
+
+    # TODO: Remove this when CPUPM for IB works properly!
+    let useWorkArounds=0
+
+    echo '    Scope (\_PR.'$gProcLabel'0)'                                              >> $gSsdtPR
+    echo '    {'                                                                        >> $gSsdtPR
+
+    #
+    # Do we need to create additional (Low Frequency) P-States?
+    #
+
+    if [ $gBridgeType -eq $IVY_BRIDGE ];
+        then
+            let lowFrequencyPStates=($gBaseFrequency/100)-8
+            let packageLength=($2+$lowFrequencyPStates)
+
+            printf "        Name (APLF, 0x%02x" $lowFrequencyPStates                    >> $gSsdtPR
+            echo ')'                                                                    >> $gSsdtPR
+
+            # TODO: Remove this when CPUPM for IB works properly!
+            if ((gIvyWorkAround)); then
+                let useWorkArounds=1
+            fi
+    fi
+
+    #
+    # Check number of Turbo states (for IASL optimization).
+    #
+
+    if [ $turboStates -eq 0 ];
+        then
+            # TODO: Remove this when CPUPM for IB works properly!
+            if (($useWorkArounds));
+                then
+                    echo '        Name (APSN, One)'                                     >> $gSsdtPR
+                else
+                    echo '        Name (APSN, Zero)'                                    >> $gSsdtPR
+            fi
+        else
+          # TODO: Remove this when CPUPM for IB works properly!
+          if ((useWorkArounds)); then
+              let turboStates+=1
+          fi
+
+          printf "        Name (APSN, 0x%02X)\n" $turboStates                           >> $gSsdtPR
+    fi
+
+    # TODO: Remove this when CPUPM for IB works properly!
+    if (($useWorkArounds)); then
+        let packageLength+=1
+    fi
+
+  printf "        Name (APSS, Package (0x%02X)\n" $packageLength                        >> $gSsdtPR
+    echo '        {'                                                                    >> $gSsdtPR
+
+    # TODO: Remove this when CPUPM for IB works properly!
+    if (($useWorkArounds)); then
+        let extraF=($maxTurboFrequency+1)
+        let maxTDP=($gTdp*1000)
+        let extraR=($maxTurboFrequency/100)+1
+        echo '            /* Workaround for Ivy Bridge PM bug */'                       >> $gSsdtPR
+      printf "            Package (0x06) { 0x%04X, 0x%06X, 0x0A, 0x0A, 0x%02X00, 0x%02X00 },\n" $extraF $maxTDP $extraR $extraR >> $gSsdtPR
+    fi
+}
+
+
+#--------------------------------------------------------------------------------
+
+function _printPackages()
+{
+    let maxTDP=($1*1000)
+    local maxNonTurboFrequency=$2
+    local frequency=$3
+
+    let minRatio=($gBaseFrequency/100)
+    let p1Ratio=($maxNonTurboFrequency/100)
+    let ratio=($frequency/100)
+    let powerRatio=($p1Ratio-1)
+
+    #
+    # Do we need to create additional (Low Frequency) P-States for Ivy bridge?
+    #
+    if [ $gBridgeType -eq $IVY_BRIDGE ]; then
+        let minRatio=8
+    fi
+
+    if (($turboStates)); then
+        echo '            /* High Frequency Modes (turbo) */'                           >> $gSsdtPR
+    fi
+
+    while [ $ratio -ge $minRatio ];
+        do
+            if [ $frequency -eq $gBaseFrequency ];
+                then
+                    echo '            /* Low Frequency Mode */'                         >> $gSsdtPR
+            fi
+
+            if [ $frequency -eq $maxNonTurboFrequency ];
+                then
+                    echo '            /* High Frequency Modes (non-turbo) */'           >> $gSsdtPR
+            fi
+
+            printf "            Package (0x06) { 0x%04X, " $frequency                   >> $gSsdtPR
+
+            if [ $frequency -lt $maxNonTurboFrequency ];
+                then
+                    power=$(echo "scale=6;m=((1.1-(($p1Ratio-$powerRatio)*0.00625))/1.1);(($powerRatio/$p1Ratio)*(m*m)*$maxTDP);" | bc | sed -e 's/.[0-9A-F]*$//')
+                    let powerRatio-=1
+                else
+                    power=$maxTDP
+            fi
+
+            if [ $frequency -ge $gBaseFrequency ];
+                then
+                    printf "0x%06X, " $power                                            >> $gSsdtPR
+                else
+                    printf '    Zero, '                                                 >> $gSsdtPR
+            fi
+
+            printf "0x0A, 0x0A, 0x%02X00, 0x%02X00 }" $ratio $ratio                     >> $gSsdtPR
+
+            let ratio-=1
+            let frequency-=100
+
+            if [ $ratio -ge $minRatio ];
+                then
+                    echo ','                                                            >> $gSsdtPR
+                else
+                    echo ''                                                             >> $gSsdtPR
+            fi
+
+        done
+
+    echo '        })'                                                                   >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
+}
+
+
+#--------------------------------------------------------------------------------
+
+function _printMethodDSM()
+{
+    #
+    # New stand-alone version of Method _DSM - Copyright (c) 2009 by Master Chief
+    #
+    echo ''                                                                             >> $gSsdtPR
+    echo '        Method (_DSM, 4, NotSerialized)'                                      >> $gSsdtPR
+    echo '        {'                                                                    >> $gSsdtPR
+    echo '            If (LEqual (Arg2, Zero))'                                         >> $gSsdtPR
+    echo '            {'                                                                >> $gSsdtPR
+    echo '                Return (Buffer (One)'                                         >> $gSsdtPR
+    echo '                {'                                                            >> $gSsdtPR
+    echo '                    0x03'                                                     >> $gSsdtPR
+    echo '                })'                                                           >> $gSsdtPR
+    echo '            }'                                                                >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
+    #
+    # This property is required to get X86Platform[Plugin/Shim].kext loaded.
+    #
+    echo '            Return (Package (0x02)'                                           >> $gSsdtPR
+    echo '            {'                                                                >> $gSsdtPR
+    echo '                "plugin-type",'                                               >> $gSsdtPR
+    echo '                One'                                                          >> $gSsdtPR
+    echo '            })'                                                               >> $gSsdtPR
+    echo '        }'                                                                    >> $gSsdtPR
+    echo '    }'                                                                        >> $gSsdtPR
+}
+
+#--------------------------------------------------------------------------------
+
+function _printScopeACST()
+{
+    let C1=0
+    let C2=0
+    let C3=0
+    let C6=0
+    let C7=0
+    local pkgLength=2
+    local numberOfCStates=0
+
+#   echo ''                                                                             >> $gSsdtPR
+    echo '        Method (ACST, 0, NotSerialized)'                                      >> $gSsdtPR
+    echo '        {'                                                                    >> $gSsdtPR
+
+    #
+    # Are we injecting C-States for CPU1?
+    #
+    if [ $1 -eq 1 ];
+        then
+            # Yes (also used by CPU2, CPU3 and greater).
+            let targetCStates=$gACST_CPU1
+            latency_C1=0x03E8
+            latency_C2=0x94
+            latency_C3=0xC6
+
+            if ((gDebug)); then
+                echo '            Store ("CPU1 C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
+                echo ''                                                                 >> $gSsdtPR
+            fi
+        else
+            #
+            # C-States override for Mobile processors (CPU0 only)
+            #
+            if (($gTypeCPU == $gMobileCPU));
+                then
+                    echo 'Adjusting C-States for detected (mobile) processor'
+                    gACST_CPU0=29
+            fi
+
+            let targetCStates=$gACST_CPU0
+            latency_C1=Zero
+            latency_C3=0xCD
+            latency_C6=0xF5
+            latency_C7=0xF5
+
+            if ((gDebug)); then
+                echo '            Store ("CPU0 C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
+                echo ''                                                                 >> $gSsdtPR
+            fi
+    fi
+
+    #
+    # Checks to determine which C-State(s) we should inject.
+    #
+    if (($targetCStates & 1)); then
+        let C1=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
+
+    if (($targetCStates & 2)); then
+        let C2=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
+
+    if (($targetCStates & 4)); then
+        let C3=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
+
+    if (($targetCStates & 8)); then
+        let C6=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
+
+    if (($targetCStates & 16)); then
+        let C7=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
+
+    let hintCode=0x00
+
+    echo '            /* Low Power Modes for '$gProcLabel$1' */'                        >> $gSsdtPR
+  printf "            Return (Package (0x%02x)\n" $pkgLength                            >> $gSsdtPR
+    echo '            {'                                                                >> $gSsdtPR
+    echo '                One,'                                                         >> $gSsdtPR
+  printf "                0x%02x,\n" $numberOfCStates                                   >> $gSsdtPR
+    echo '                Package (0x04)'                                               >> $gSsdtPR
+    echo '                {'                                                            >> $gSsdtPR
+    echo '                    ResourceTemplate ()'                                      >> $gSsdtPR
+    echo '                    {'                                                        >> $gSsdtPR
+    echo '                        Register (FFixedHW,'                                  >> $gSsdtPR
+    echo '                            0x01,               // Bit Width'                 >> $gSsdtPR
+    echo '                            0x02,               // Bit Offset'                >> $gSsdtPR
+  printf "                            0x%016x, // Address\n" $hintCode                  >> $gSsdtPR
+    echo '                            0x01,               // Access Size'               >> $gSsdtPR
+    echo '                            )'                                                >> $gSsdtPR
+    echo '                    },'                                                       >> $gSsdtPR
+    echo '                    One,'                                                     >> $gSsdtPR
+    echo '                    '$latency_C1','                                           >> $gSsdtPR
+    echo '                    0x03E8'                                                   >> $gSsdtPR
+
+    if (($C2)); then
+        let hintCode+=0x10
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x02,'                                                >> $gSsdtPR
+        echo '                    '$latency_C2','                                       >> $gSsdtPR
+        echo '                    0x01F4'                                               >> $gSsdtPR
+    fi
+
+    if (($C3)); then
+        let hintCode+=0x10
+        local power_C3=0x01F4
+        #
+        # Is this for CPU1?
+        #
+        if (($1)); then
+            if [[ ${modelID:0:7} == "iMac13," ]];
+                then
+                    local power_C3=0x15E
+                    latency_C3=0xA9
+                else
+                    local power_C3=0xC8
+                    let hintCode+=0x10
+            fi
+        fi
+
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x03,'                                                >> $gSsdtPR
+        echo '                    '$latency_C3','                                       >> $gSsdtPR
+        echo '                    '$power_C3                                            >> $gSsdtPR
+    fi
+
+    if (($C6)); then
+        let hintCode+=0x10
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x06,'                                                >> $gSsdtPR
+        echo '                    '$latency_C6','                                       >> $gSsdtPR
+        echo '                    0x015E'                                               >> $gSsdtPR
+    fi
+
+	if (($C7)); then
+        #
+        # If $hintCode is already 0x30 then use 0x31 otherwise 0x30
+        #
+        if [ $hintCode -eq 48 ];
+            then
+                let hintCode+=0x01
+            else
+                let hintCode+=0x10
+        fi
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x07,'                                                >> $gSsdtPR
+        echo '                    '$latency_C7','                                       >> $gSsdtPR
+        echo '                    0xC8'                                                 >> $gSsdtPR
+    fi
+
+    echo '                }'                                                            >> $gSsdtPR
+    echo '            })'                                                               >> $gSsdtPR
+    echo '        }'                                                                    >> $gSsdtPR
+
+    #
+    # We don't need a closing bracket here when we add method _DSM for Ivy Bridge.
+    #
+
+    if [ $gBridgeType -eq $SANDY_BRIDGE ]; then
+        echo '    }'                                                                    >> $gSsdtPR
+	fi
+}
+
+
+#--------------------------------------------------------------------------------
+
+function _printScopeCPUn()
+{
+	let currentCPU=1;
+
+	while [ $currentCPU -lt $1 ]; do
+		echo ''                                                                         >> $gSsdtPR
+		echo '    Scope (\_PR.'$gProcLabel$currentCPU')'                                >> $gSsdtPR
+		echo '    {'                                                                    >> $gSsdtPR
+		echo '        Method (APSS, 0, NotSerialized) { Return (\_PR.'$gProcLabel'0.APSS) }' >> $gSsdtPR
+
+		#
+		# IB CPUPM tries to parse/execute CPUn.ACST (see debug data) and thus we add
+		# this method, conditionally, since SB CPUPM doesn't seem to care about it.
+		#
+		if [ $gBridgeType -eq $IVY_BRIDGE ]
+			then
+				if [ $currentCPU -eq 1 ];
+					then
+						_printScopeACST 1
+					else
+						echo '        Method (ACST, 0, NotSerialized) { Return (\_PR.'$gProcLabel'1.ACST ()) }' >> $gSsdtPR
+				fi
+		fi
+
+		echo '    }'                                                                    >> $gSsdtPR
+		let currentCPU+=1
+	done
+
+	echo '}'                                                                            >> $gSsdtPR
+}
+
+#--------------------------------------------------------------------------------
+
+function _getModelName()
+{
+    #
+    # Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
+    #
+    echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *["=<>]//g' -e 's/compatible//'`
+#   echo "iMac13,2"
+}
+
+#--------------------------------------------------------------------------------
+
+function _getBoardID()
+{
+    #
+    # Grab 'board-id' property from ioreg (stripped with sed / RegEX magic).
+    #
+    boardID=`ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *["=<>]//g' -e 's/board-id//'`
+}
+
+#--------------------------------------------------------------------------------
+
+function _getCPUtype()
+{
+    #
+    # Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
+    #
+    local grepStr=`ioreg -p IODeviceTree -n CPU0@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g'`
+    #
+    # Swap bytes with help of ${str:pos:num}
+    #
+    echo ${grepStr:2:2}${grepStr:0:2}
+}
+
+#--------------------------------------------------------------------------------
+
+function _getCPUModel()
+{
+    #
+    # Returns the hexadecimal value of machdep.cpu.model
+    #
+    echo 0x$(echo "obase=16; `sysctl machdep.cpu.model | sed -e 's/^machdep.cpu.model: //'`" | bc)
+}
+
+#--------------------------------------------------------------------------------
+
+function _getSystemType()
+{
+    #
+    # Grab 'system-type' property from ioreg (stripped with sed / RegEX magic).
+    #
+    # Note: This property is checked (cmpb $0x02) in X86PlatformPlugin::configResourceCallback
+    #
+    echo `ioreg -p IODeviceTree -d 2 -k system-type | grep system-type | sed -e 's/ *[-="<0a-z>]//g'`
+}
+
+#--------------------------------------------------------------------------------
+
+function _findIasl()
+{
+    if ((gCallIasl)); then
+        iasl=`find /Applications -name iasl -print -quit`
+
+        if [ "$iasl" == "" ]; then
+            gCallIasl=0
+        fi
+    fi
+}
+
+#--------------------------------------------------------------------------------
+
+function _setDestinationPath
+{
+    #
+    # Checking for RevoBoot
+    #
+    if [ -d /EFI/ACPI ]; then
+        gDestinationPath="/Extra/ACPI/"
+    fi
+
+    #
+    # Checking for Clover
+    #
+    if [ -d /EFI/ACPI/patched ]; then
+        gDestinationPath="/EFI/ACPI/patched/"
+    fi
+}
+
+#--------------------------------------------------------------------------------
+
+function _getCPUNumberFromBrandString
+{
+    #
+    # Get CPU brandstring
+    #
+    local brandString=$(echo `sysctl machdep.cpu.brand_string` | sed -e 's/machdep.cpu.brand_string: //')
+    #
+    # Save default (0) delimiter
+    #
+    local ifs=$IFS
+    #
+    # Change delimiter to a space character
+    #
+    IFS=" "
+    #
+    # Split brandstring into array (data)
+    #
+    local data=($brandString)
+#   local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "V2" "@" "2.5GHz")
+#   local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "@" "2.5GHz")
+    #
+    # Example from a MacBookPro10,2
+    #
+    # echo "${data[0]}" # Intel(R)
+    # echo "${data[1]}" # Core(TM)
+    # echo "${data[2]}" # i5-3210M
+    # echo "${data[3]}" # CPU
+    # echo "${data[4]}" # @
+    # echo "${data[5]}" # 2.50GHz
+    #
+    # or: "Intel(R) Xeon(R) CPU E3-1230 V2 @ 3.30GHz"
+    #
+    # echo "${data[0]}" # Intel(R)
+    # echo "${data[1]}" # Xeon(R)
+    # echo "${data[2]}" # CPU
+    # echo "${data[3]}" # E3-12XX
+    # echo "${data[4]}" # V2
+    # echo "${data[5]}" # @
+    # echo "${data[6]}" # 3.30GHz
+
+    #
+    # Restore the default delimiter
+    #
+    IFS=$ifs
+
+    let length=${#data[@]}
+
+    if ((length > 6)); then
+        echo 'Warning: Unexpected brandstring > "'${data[@]}'"'
+    fi
+
+    if [[ ${data[1]} == "Xeon(R)" && ${data[4]} == "V2" ]];
+        then
+            gProcessorNumber="${data[3]} ${data[4]}"
+        else
+            gProcessorNumber="${data[2]}"
+    fi
+
+#   echo $gProcessorNumber
+}
+
+#--------------------------------------------------------------------------------
+
+function _getCPUDataByProcessorNumber
+{
+    #
+    # Local function definition
+    #
+    function __searchList()
+    {
+        local ifs=$IFS
+        local targetCPUList=("${!1}")
+
+        for cpuData in "${targetCPUList[@]}"
+        do
+            IFS=","
+            data=($cpuData)
+
+            if [[ ${data[0]} == $gProcessorNumber ]]; then
+                gProcessorData="$cpuData"
+                let gTypeCPU=$2
+                IFS=$ifs
+                return
+            fi
+        done
+
+        IFS=$ifs
+    }
+
+    #
+    # Local function callers (passing array and cpu type)
+    #
+    __searchList gDesktopIvyBridgeCPUList[@] $gDesktopCPU
+
+    if (!(($gTypeCPU))); then
+        __searchList gMobileIvyBridgeCPUList[@] $gMobileCPU
+    fi
+
+    if (!(($gTypeCPU))); then
+        __searchList "gServerIvyBridgeCPUList[@]" $gServerCPU
+    fi
+
+#   echo "gTypeCPU is $gTypeCPU"
+}
+
+#--------------------------------------------------------------------------------
+
+function _showLowPowerStates()
+{
+    #
+    # Local function definition
+    #
+    function __print()
+    {
+        local mask=1
+        local cStates=$1
+
+        printf "Injected C-States for ${gProcLabel}${2} ("
+
+        for state in C1 C2 C3 C6 C7
+        do
+            if (($cStates & $mask)); then
+               if (($mask > 1)); then
+                   printf ","
+               fi
+
+               printf "$state"
+            fi
+
+            let mask=$(($mask << 1))
+        done
+
+        echo ')'
+    }
+
+    #
+    # Local function callers
+    #
+    __print $gACST_CPU0 0
+
+    if ((gBridgeType == $IVY_BRIDGE)); then
+        __print $gACST_CPU1 1
+    fi
+}
+
+#--------------------------------------------------------------------------------
+
+function _checkSMCKeys()
+{
+    #
+    # TODO: Check SMC keys to see if they are there and properly initialized!
+    #
+    # Note: Do <i>not</i> dump SMC keys with HWSensors/iStat or other SMC plug-ins installed!
+    #
+    local filename="/System/Library/Extensions/FakeSMC.kext/Contents/Info.plist"
+    local data=`grep -so '<key>[a-zA-Z]*</key>' $filename | sed -e 's/<key>//' -e 's/<\/key>//g'`
+
+    local status=`echo $data | grep -oe 'DPLM'`
+
+    if [ $status == 'DPLM' ]; then
+        # DPLM  [{lim]  (bytes 00 00 00 00 00)
+        # CPU, Idle, IGPU, EGPU and Memory P-State limits
+        echo "SMC key 'DPLM' found (OK)"
+    fi
+set -x
+    local status=`echo $data | grep -oe 'MSAL'`
+
+    if [ $status == 'MSAL' ]; then
+        # MSAL  [hex_]  (bytes 4b)
+        echo "SMC key 'MSAL' found (OK)"
+    fi
+}
+
+#--------------------------------------------------------------------------------
+
+function _initSandyBridgeSetup()
+{
+	case $boardID in
+		Mac-942B59F58194171B)
+			gSystemType=1
+			gMacModelIdentifier="iMac12,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-942B5BF58194151B)
+			gSystemType=1
+			gMacModelIdentifier="iMac12,2"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-8ED6AF5B48C039E1)
+			gSystemType=1
+			gMacModelIdentifier="Macmini5,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-4BC72D62AD45599E)
+			gSystemType=1
+			gMacModelIdentifier="Macmini5,2"
+			gACST_CPU0=13   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-7BA5B2794B2CDB12)
+			gSystemType=1
+			gMacModelIdentifier="Macmini5,3"
+			gACST_CPU0=13   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-94245B3640C91C81)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro8,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-94245A3940C91C80)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro8,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-942459F5819B171B)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro8,3"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-C08A6BB70A942AC2)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir4,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-742912EFDBEE19B3)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir4,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+	esac
+}
+
+#--------------------------------------------------------------------------------
+
+function _initIvyBridgeSetup()
+{
+	case $boardID in
+		Mac-00BE6ED71E35EB86)
+			gSystemType=1
+			gMacModelIdentifier="iMac13,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-FC02E91DDD3FA6A4)
+			gSystemType=1
+			gMacModelIdentifier="iMac13,2"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-031AEE4D24BFF0B1)
+			gSystemType=1
+			gMacModelIdentifier="Macmini6,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-F65AE981FFA204ED)
+			gSystemType=1
+			gMacModelIdentifier="Macmini6,2"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-4B7AC7E43945597E)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro9,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-6F01561E16C75D06)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro9,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-C3EC7CD22292981F)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro10,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-AFD8A9D944EA4843)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro10,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-66F35F19FE2A0D05)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir5,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-2E6FAB96566FE58C)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir5,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+	esac
+}
+
+#--------------------------------------------------------------------------------
+#
+# Only administrators (root) are allowed to run this script.
+#
+#--------------------------------------------------------------------------------
+
+function _isRoot()
+{
+    if [ $(id -u) != 0 ]; then
+        echo "This script must be run as root" 1>&2
+        exit 1
+    fi
+
+    echo 1
+}
+
+#--------------------------------------------------------------------------------
+
+function main()
+{
+    printf "\nsdtPRGen.sh v$gScriptVersion Copyright (c) 2013 by Pike R. Alpha\n"
+    echo   '-----------------------------------------------------'
+
+    let modelSpecified=0
+    let maxTurboFrequency=0
+
+    #
+    # Get installed CPU model, set bridge type and default TDP.
+    #
+    local model=$(_getCPUModel)
+
+    _getCPUNumberFromBrandString
+
+    if [[ $# -eq 1 ]]; then
+        if [[ $1 == "" ]];
+            then
+                if [[ $gProcessorNumber != 0 ]]; then
+                    let model=0x3A
+                fi
+            else
+                if (( ("${1:0:4}" == "i3-3") || (${1:0:4} == "i5-3") || (${1:0:4} == "i7-3") || (${1:0:1} == "E") )); then
+                    let model=0x3A
+                    let modelSpecified=1
+                    gProcessorNumber=$1
+                fi
+        fi
+    fi
+
+    if (($model==0x2A || $model==0x2D));
+        then
+            let gTdp=95
+            let gBridgeType=2
+            local bridgeTypeString="Sandy Bridge"
+        else
+            let gTdp=77
+            let gBridgeType=4
+            local bridgeTypeString="Ivy Bridge"
+
+            if (($model==0x3A || $model==0x3B)); then
+                _getCPUDataByProcessorNumber
+            fi
+    fi
+
+    echo "$bridgeTypeString Core $gProcessorNumber processor installed"
+
+    #
+    # gTypeCPU is greater than 0 when the processor is found in one of the CPU lists
+    #
+    if (($gTypeCPU));
+        then
+            local ifs=$IFS
+            IFS=","
+            local cpuData=($gProcessorData)
+            let gTdp=${cpuData[1]}
+            let lfm=${cpuData[2]}
+            let frequency=${cpuData[3]}
+            let maxTurboFrequency=${cpuData[4]}
+
+            if [ $maxTurboFrequency == 0 ]; then
+                let maxTurboFrequency=$frequency
+            fi
+
+            let logicalCPUs=${cpuData[6]}
+            IFS=$ifs
+
+            echo 'Using a maximum TDP of '$gTdp' Watt, as specified by Intel'
+
+            #
+            # Check Low Frequency Mode (may be 0 aka still unknown)
+            #
+            if (($lfm == 0)); then
+                echo 'Warning: Low Frequency Mode is 0 (unknown)'
+
+                if (($gTypeCPU == gMobileCPU));
+                    then
+                        echo 'Now using 1200 MHz for Mobile processor'
+                        let gBaseFrequency=1200
+                    else
+                        echo 'Now using 1600 MHz for Server/Desktop processor'
+                        let gBaseFrequency=1600
+                fi
+            fi
+        else
+            let logicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
+            let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
+            let frequency=($frequency / 1000000)
+    fi
+
+    if (!(($modelSpecified))); then
+        #
+        # Command line arguments (used as override values).
+        #
+        if [[ $# -ge 1 && $1 != "" ]]; then
+            let maxTurboFrequency=$1
+        fi
+
+        if [ $# -ge 2 ]; then
+            let gTdp=$2
+            echo "Max TDP override, now using: $gTdp Watt"
+        fi
+
+        if [ $# -eq 3 ]; then
+            if [ $3 -eq 0 ];
+                then
+                    let gBridgeType=2
+                    echo "CPU type override, now using: Sandy Bridge"
+                else
+                    let gBridgeType=4
+                    echo "CPU type override, now using: Ivy Bridge"
+             fi
+        fi
+    fi
+
+    echo "$logicalCPUs logical CPU's detected with a Core Frequency of $frequency MHz"
+
+    #
+    # Check maxTurboFrequency
+    #
+    if [ $maxTurboFrequency == 0 ]; then
+        printf "\nError: Unknown processor number... exiting\n"
+        echo "Try: $0 MaxTurboFrequency [TDP (Watts) CPU (0=SandyBridge, 1=IvyBridge)]"
+        exit 1
+    fi
+
+	#
+    # Get number of Turbo states.
+    #
+    let turboStates=$(echo "(($maxTurboFrequency - $frequency) / 100)" | bc)
+
+    #
+    # Check number of Turbo states.
+    #
+    if [ $turboStates -lt 0 ]; then
+        let turboStates=0
+    fi
+
+    #
+    # Report number of Turbo States
+    #
+    if [ $turboStates -gt 0 ];
+        then
+            let minTurboFrequency=($frequency+100)
+            echo "Number of Turbo States: $turboStates ($minTurboFrequency-$maxTurboFrequency MHz)"
+
+        else
+            echo "Number of Turbo States: 0"
+    fi
+
+    local packageLength=$(echo "((($maxTurboFrequency - $gBaseFrequency)+100) / 100)" | bc)
+
+    echo "Number of P-States: $packageLength ($gBaseFrequency-$maxTurboFrequency MHz)"
+
+    _printHeader
+    _printExternals $logicalCPUs
+    _printDebugInfo $logicalCPUs $gTdp $packageLength $turboStates $maxTurboFrequency
+    _printScopeStart $turboStates $packageLength
+    _printPackages $gTdp $frequency $maxTurboFrequency
+
+    _getBoardID
+
+    local modelID=$(_getModelName)
+
+    local cpu_type=$(_getCPUtype)
+    local currentSystemType=$(_getSystemType)
+
+    if [ $gBridgeType -eq $IVY_BRIDGE ];
+        then
+            local cpuTypeString="07"
+
+            _initIvyBridgeSetup
+
+            _printScopeACST 0
+            _printMethodDSM
+            _printScopeCPUn $logicalCPUs
+        else
+            local cpuTypeString="06"
+
+            _initSandyBridgeSetup
+
+            _printScopeACST 0
+            _printScopeCPUn $logicalCPUs
+    fi
+
+    _showLowPowerStates
+
+    if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
+        echo "Warning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
+    fi
+
+    if [ $gSystemType -eq 0 ];
+        then
+            echo "Warning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
+        else
+            if [ "$gMacModelIdentifier" != "$modelID" ]; then
+                echo "Error: board-id [$boardID] and model [$modelID] mismatch"
+            fi
+
+            if [ $currentSystemType -ne $gSystemType ]; then
+                echo "Warning: 'system-type' may be set improperly ($currentSystemType instead of $gSystemType)"
+            fi
+    fi
+}
+
+#==================================== START =====================================
+
+main "$1" $2 $3
+
+_findIasl
+
+if ((gCallIasl)); then
+    #
+    # Compile SSDT.dsl
+    #
+    "$iasl" $gSsdtPR
+
+    #
+    # Copy SSDT_PR.aml to target location
+    #
+    if (($gAutoCopy)); then
+        _setDestinationPath
+        cp $gSsdtPR ${gDestinationPath}${gDestinationFile}
+    fi
+
+fi
+
+if ((gCallOpen)); then
+    open $gSsdtPR
+fi
+
+exit 0
+
+#================================================================================
diff --git a/i386/libsaio/acpi/examples/MAXIMUS V GENE/DSDT.dsl b/i386/libsaio/acpi/examples/MAXIMUS V GENE/DSDT.dsl
new file mode 100644
index 0000000..0649962
--- /dev/null
+++ b/i386/libsaio/acpi/examples/MAXIMUS V GENE/DSDT.dsl	
@@ -0,0 +1,3483 @@
+DefinitionBlock ("DSDT.aml", "DSDT", 3, "APPLE ", "iMac", 0x00310001)
+{
+    Scope (_PR)
+    {
+        Processor (CPU0, 0x01, 0x00000410, 0x06) {}
+        Processor (CPU1, 0x02, 0x00000410, 0x06) {}
+        Processor (CPU2, 0x03, 0x00000410, 0x06) {}
+        Processor (CPU3, 0x04, 0x00000410, 0x06) {}
+        Processor (CPU4, 0x05, 0x00000410, 0x06) {}
+        Processor (CPU5, 0x06, 0x00000410, 0x06) {}
+        Processor (CPU6, 0x07, 0x00000410, 0x06) {}
+        Processor (CPU7, 0x08, 0x00000410, 0x06) {}
+    }
+    
+    OperationRegion (GNVS, SystemMemory, 0xC8B89E18, 0x01D1)
+    Field (GNVS, AnyAcc, Lock, Preserve)
+    {
+        Offset (0x02), 
+        SMIF,   8, 
+        Offset (0x0B), 
+        P80D,   32, 
+        Offset (0x1A), 
+        DTSE,   8, 
+        Offset (0x1D), 
+        DTSF,   8, 
+        Offset (0x29), 
+        TCNT,   8, 
+        Offset (0x3C), 
+        IGDS,   8, 
+        Offset (0x75), 
+        DSTS,   8, 
+        Offset (0xEF), 
+        L01C,   8, 
+        Offset (0x15F), 
+        TBAB,   32, 
+        Offset (0x16B), 
+        PFLV,   8, 
+        Offset (0x172), 
+        ESEL,   8, 
+        Offset (0x1B2), 
+        XHCI,   8, 
+        XHPM,   8, 
+        Offset (0x1C8), 
+        AOAC,   8, 
+        Offset (0x1CD), 
+        ECTM,   32
+    }
+
+    OperationRegion (DEB0, SystemIO, 0x80, One)
+    Field (DEB0, ByteAcc, NoLock, Preserve)
+    {
+        DBG8,   8
+    }
+
+    OperationRegion (DEB1, SystemIO, 0x90, 0x02)
+    Field (DEB1, WordAcc, NoLock, Preserve)
+    {
+        DBG9,   16
+    }
+
+    OperationRegion (PRT0, SystemIO, 0x80, 0x04)
+    Field (PRT0, DWordAcc, Lock, Preserve)
+    {
+        P80H,   32
+    }
+    
+    Method (DTGP, 2, NotSerialized)
+    {
+        If (LEqual (Arg0, Zero))
+        {
+            Store (Buffer (One)
+                {
+                     0x03
+                }, Arg1)
+        }
+    }
+
+    Method (P8XH, 2, Serialized)
+    {
+        If (LEqual (Arg0, Zero))
+        {
+            Store (Or (And (P80D, 0xFFFFFF00), Arg1), P80D)
+        }
+
+        If (LEqual (Arg0, One))
+        {
+            Store (Or (And (P80D, 0xFFFF00FF), ShiftLeft (Arg1, 0x08)
+                ), P80D)
+        }
+
+        If (LEqual (Arg0, 0x02))
+        {
+            Store (Or (And (P80D, 0xFF00FFFF), ShiftLeft (Arg1, 0x10)
+                ), P80D)
+        }
+
+        If (LEqual (Arg0, 0x03))
+        {
+            Store (Or (And (P80D, 0x00FFFFFF), ShiftLeft (Arg1, 0x18)
+                ), P80D)
+        }
+
+        Store (P80D, P80H)
+    }
+
+    OperationRegion (SPRT, SystemIO, 0xB2, 0x02)
+    Field (SPRT, ByteAcc, Lock, Preserve)
+    {
+        SSMP,   8
+    }
+
+    Method (_PIC, 1, NotSerialized)  // _PIC: Interrupt Model
+    {
+    }
+
+    OperationRegion (IO_T, SystemIO, 0x1000, 0x10)
+    Field (IO_T, ByteAcc, NoLock, Preserve)
+    {
+        Offset (0x08), 
+        TRP0,   8
+    }
+
+    OperationRegion (IO_D, SystemIO, 0x0810, 0x04)
+    Field (IO_D, ByteAcc, NoLock, Preserve)
+    {
+        TRPD,   8
+    }
+
+    OperationRegion (IO_H, SystemIO, 0x1000, 0x04)
+    Field (IO_H, ByteAcc, NoLock, Preserve)
+    {
+        TRPH,   8
+    }
+
+    OperationRegion (PMIO, SystemIO, 0x0400, 0x80)
+    Field (PMIO, ByteAcc, NoLock, Preserve)
+    {
+        Offset (0x42), 
+            ,   1, 
+        GPEC,   1
+    }
+
+    OperationRegion (GPIO, SystemIO, 0x0500, 0x64)
+    Field (GPIO, ByteAcc, NoLock, Preserve)
+    {
+        Offset (0x0F), 
+            ,   1, 
+            ,   2, 
+        GP27,   1
+    }
+
+    OperationRegion (RCRB, SystemMemory, 0xFED1C000, 0x4000)
+    Field (RCRB, DWordAcc, Lock, Preserve)
+    {
+        Offset (0x341A), 
+        RP1D,   1, 
+        RP2D,   1, 
+        RP3D,   1, 
+        RP4D,   1, 
+        RP5D,   1, 
+        RP6D,   1, 
+        RP7D,   1, 
+        RP8D,   1
+    }
+
+    Scope (_SB)
+    {
+        Name (PW94, Package (0x02)
+        {
+            0x09, 
+            0x04
+        })
+        Name (PWD4, Package (0x02)
+        {
+            0x0D, 
+            0x04
+        })
+        Device (PCI0)
+        {
+            Name (_HID, EisaId ("PNP0A08"))  // _HID: Hardware ID
+            Name (_CID, EisaId ("PNP0A03"))  // _CID: Compatible ID
+            Name (_ADR, Zero)  // _ADR: Address
+            Name (_BBN, Zero)  // _BBN: BIOS Bus Number
+            Name (_UID, Zero)  // _UID: Unique ID
+            Name (_PRT, Package (0x24)  // _PRT: PCI Routing Table
+            {
+                Package (0x04)
+                {
+                    0x001FFFFF, 
+                    Zero, 
+                    Zero, 
+                    0x15
+                }, 
+
+                Package (0x04)
+                {
+                    0x001FFFFF, 
+                    One, 
+                    Zero, 
+                    0x13
+                }, 
+
+                Package (0x04)
+                {
+                    0x001FFFFF, 
+                    0x02, 
+                    Zero, 
+                    0x12
+                }, 
+
+                Package (0x04)
+                {
+                    0x001FFFFF, 
+                    0x03, 
+                    Zero, 
+                    0x10
+                }, 
+
+                Package (0x04)
+                {
+                    0x0014FFFF, 
+                    Zero, 
+                    Zero, 
+                    0x10
+                }, 
+
+                Package (0x04)
+                {
+                    0x001DFFFF, 
+                    Zero, 
+                    Zero, 
+                    0x17
+                }, 
+
+                Package (0x04)
+                {
+                    0x001DFFFF, 
+                    One, 
+                    Zero, 
+                    0x13
+                }, 
+
+                Package (0x04)
+                {
+                    0x001DFFFF, 
+                    0x02, 
+                    Zero, 
+                    0x10
+                }, 
+
+                Package (0x04)
+                {
+                    0x001DFFFF, 
+                    0x03, 
+                    Zero, 
+                    0x12
+                }, 
+
+                Package (0x04)
+                {
+                    0x001AFFFF, 
+                    Zero, 
+                    Zero, 
+                    0x10
+                }, 
+
+                Package (0x04)
+                {
+                    0x001AFFFF, 
+                    One, 
+                    Zero, 
+                    0x15
+                }, 
+
+                Package (0x04)
+                {
+                    0x001AFFFF, 
+                    0x02, 
+                    Zero, 
+                    0x12
+                }, 
+
+                Package (0x04)
+                {
+                    0x001AFFFF, 
+                    0x03, 
+                    Zero, 
+                    0x13
+                }, 
+
+                Package (0x04)
+                {
+                    0x001BFFFF, 
+                    Zero, 
+                    Zero, 
+                    0x16
+                }, 
+
+                Package (0x04)
+                {
+                    0x0019FFFF, 
+                    Zero, 
+                    Zero, 
+                    0x14
+                }, 
+
+                Package (0x04)
+                {
+                    0x0016FFFF, 
+                    Zero, 
+                    Zero, 
+                    0x10
+                }, 
+
+                Package (0x04)
+                {
+                    0x0016FFFF, 
+                    One, 
+                    Zero, 
+                    0x13
+                }, 
+
+                Package (0x04)
+                {
+                    0x0016FFFF, 
+                    0x02, 
+                    Zero, 
+                    0x12
+                }, 
+
+                Package (0x04)
+                {
+                    0x0016FFFF, 
+                    0x03, 
+                    Zero, 
+                    0x11
+                }, 
+
+                Package (0x04)
+                {
+                    0x001CFFFF, 
+                    Zero, 
+                    Zero, 
+                    0x10
+                }, 
+
+                Package (0x04)
+                {
+                    0x001CFFFF, 
+                    One, 
+                    Zero, 
+                    0x11
+                }, 
+
+                Package (0x04)
+                {
+                    0x001CFFFF, 
+                    0x02, 
+                    Zero, 
+                    0x12
+                }, 
+
+                Package (0x04)
+                {
+                    0x001CFFFF, 
+                    0x03, 
+                    Zero, 
+                    0x13
+                }, 
+
+                Package (0x04)
+                {
+                    0x0001FFFF, 
+                    Zero, 
+                    Zero, 
+                    0x10
+                }, 
+
+                Package (0x04)
+                {
+                    0x0001FFFF, 
+                    One, 
+                    Zero, 
+                    0x11
+                }, 
+
+                Package (0x04)
+                {
+                    0x0001FFFF, 
+                    0x02, 
+                    Zero, 
+                    0x12
+                }, 
+
+                Package (0x04)
+                {
+                    0x0001FFFF, 
+                    0x03, 
+                    Zero, 
+                    0x13
+                }, 
+
+                Package (0x04)
+                {
+                    0x0006FFFF, 
+                    Zero, 
+                    Zero, 
+                    0x13
+                }, 
+
+                Package (0x04)
+                {
+                    0x0006FFFF, 
+                    One, 
+                    Zero, 
+                    0x10
+                }, 
+
+                Package (0x04)
+                {
+                    0x0006FFFF, 
+                    0x02, 
+                    Zero, 
+                    0x11
+                }, 
+
+                Package (0x04)
+                {
+                    0x0006FFFF, 
+                    0x03, 
+                    Zero, 
+                    0x12
+                }, 
+
+                Package (0x04)
+                {
+                    0x0004FFFF, 
+                    Zero, 
+                    Zero, 
+                    0x10
+                }, 
+
+                Package (0x04)
+                {
+                    0x0004FFFF, 
+                    One, 
+                    Zero, 
+                    0x11
+                }, 
+
+                Package (0x04)
+                {
+                    0x0004FFFF, 
+                    0x02, 
+                    Zero, 
+                    0x12
+                }, 
+
+                Package (0x04)
+                {
+                    0x0004FFFF, 
+                    0x03, 
+                    Zero, 
+                    0x13
+                }, 
+
+                Package (0x04)
+                {
+                    0x0002FFFF, 
+                    Zero, 
+                    Zero, 
+                    0x10
+                }
+            })
+            OperationRegion (HBUS, PCI_Config, Zero, 0x0100)
+            Field (HBUS, DWordAcc, NoLock, Preserve)
+            {
+                Offset (0x40), 
+                    ,   1, 
+                    ,   11, 
+                EPBR,   20, 
+                Offset (0x48), 
+                    ,   1, 
+                    ,   14, 
+                MHBR,   17, 
+                Offset (0x60), 
+                    ,   1, 
+                PXSZ,   2, 
+                    ,   23, 
+                PXBR,   6, 
+                Offset (0x68), 
+                    ,   1, 
+                    ,   11, 
+                DIBR,   20, 
+                Offset (0x70), 
+                    ,   20, 
+                MEBR,   12, 
+                Offset (0x80), 
+                    ,   4, 
+                PM0H,   2, 
+                Offset (0x81), 
+                PM1L,   2, 
+                    ,   2, 
+                PM1H,   2, 
+                Offset (0x82), 
+                PM2L,   2, 
+                    ,   2, 
+                PM2H,   2, 
+                Offset (0x83), 
+                PM3L,   2, 
+                    ,   2, 
+                PM3H,   2, 
+                Offset (0x84), 
+                PM4L,   2, 
+                    ,   2, 
+                PM4H,   2, 
+                Offset (0x85), 
+                PM5L,   2, 
+                    ,   2, 
+                PM5H,   2, 
+                Offset (0x86), 
+                PM6L,   2, 
+                    ,   2, 
+                PM6H,   2, 
+                Offset (0xA8), 
+                    ,   20, 
+                TUUD,   19, 
+                Offset (0xBC), 
+                    ,   20, 
+                TLUD,   12
+            }
+
+            Name (BUF0, ResourceTemplate ()
+            {
+                WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
+                    0x0000,             // Granularity
+                    0x0000,             // Range Minimum
+                    0x00FF,             // Range Maximum
+                    0x0000,             // Translation Offset
+                    0x0100,             // Length
+                    ,, _Y00)
+                DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
+                    0x00000000,         // Granularity
+                    0x00000000,         // Range Minimum
+                    0x00000CF7,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00000CF8,         // Length
+                    ,, , TypeStatic)
+                IO (Decode16,
+                    0x0CF8,             // Range Minimum
+                    0x0CF8,             // Range Maximum
+                    0x01,               // Alignment
+                    0x08,               // Length
+                    )
+                DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
+                    0x00000000,         // Granularity
+                    0x00000D00,         // Range Minimum
+                    0x0000FFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x0000F300,         // Length
+                    ,, , TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000A0000,         // Range Minimum
+                    0x000BFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00020000,         // Length
+                    ,, , AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000C0000,         // Range Minimum
+                    0x000C3FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y01, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000C4000,         // Range Minimum
+                    0x000C7FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y02, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000C8000,         // Range Minimum
+                    0x000CBFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y03, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000CC000,         // Range Minimum
+                    0x000CFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y04, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000D0000,         // Range Minimum
+                    0x000D3FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y05, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000D4000,         // Range Minimum
+                    0x000D7FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y06, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000D8000,         // Range Minimum
+                    0x000DBFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y07, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000DC000,         // Range Minimum
+                    0x000DFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y08, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000E0000,         // Range Minimum
+                    0x000E3FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y09, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000E4000,         // Range Minimum
+                    0x000E7FFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y0A, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000E8000,         // Range Minimum
+                    0x000EBFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y0B, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000EC000,         // Range Minimum
+                    0x000EFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00004000,         // Length
+                    ,, _Y0C, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0x000F0000,         // Range Minimum
+                    0x000FFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00010000,         // Length
+                    ,, _Y0D, AddressRangeMemory, TypeStatic)
+                DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x00000000,         // Granularity
+                    0xFEAFFFFE,         // Range Minimum
+                    0xFEAFFFFF,         // Range Maximum
+                    0x00000000,         // Translation Offset
+                    0x00000002,         // Length
+                    ,, _Y0E, AddressRangeMemory, TypeStatic)
+                QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                    0x0000000000000000, // Granularity
+                    0x0000000000010000, // Range Minimum
+                    0x000000000001FFFF, // Range Maximum
+                    0x0000000000000000, // Translation Offset
+                    0x0000000000010000, // Length
+                    ,, _Y0F, AddressRangeMemory, TypeStatic)
+            })
+            Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
+            {
+                CreateWordField (BUF0, \_SB.PCI0._Y00._MAX, PBMX)  // _MAX: Maximum Base Address
+                Store (0x3E, PBMX)
+                CreateWordField (BUF0, \_SB.PCI0._Y00._LEN, PBLN)  // _LEN: Length
+                Store (0x3F, PBLN)
+                If (PM1L)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y01._LEN, C0LN)  // _LEN: Length
+                    Store (Zero, C0LN)
+                }
+
+                If (LEqual (PM1L, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y01._RW, C0RW)  // _RW_: Read-Write Status
+                    Store (Zero, C0RW)
+                }
+
+                If (PM1H)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y02._LEN, C4LN)  // _LEN: Length
+                    Store (Zero, C4LN)
+                }
+
+                If (LEqual (PM1H, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y02._RW, C4RW)  // _RW_: Read-Write Status
+                    Store (Zero, C4RW)
+                }
+
+                If (PM2L)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y03._LEN, C8LN)  // _LEN: Length
+                    Store (Zero, C8LN)
+                }
+
+                If (LEqual (PM2L, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y03._RW, C8RW)  // _RW_: Read-Write Status
+                    Store (Zero, C8RW)
+                }
+
+                If (PM2H)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y04._LEN, CCLN)  // _LEN: Length
+                    Store (Zero, CCLN)
+                }
+
+                If (LEqual (PM2H, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y04._RW, CCRW)  // _RW_: Read-Write Status
+                    Store (Zero, CCRW)
+                }
+
+                If (PM3L)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y05._LEN, D0LN)  // _LEN: Length
+                    Store (Zero, D0LN)
+                }
+
+                If (LEqual (PM3L, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y05._RW, D0RW)  // _RW_: Read-Write Status
+                    Store (Zero, D0RW)
+                }
+
+                If (PM3H)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y06._LEN, D4LN)  // _LEN: Length
+                    Store (Zero, D4LN)
+                }
+
+                If (LEqual (PM3H, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y06._RW, D4RW)  // _RW_: Read-Write Status
+                    Store (Zero, D4RW)
+                }
+
+                If (PM4L)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y07._LEN, D8LN)  // _LEN: Length
+                    Store (Zero, D8LN)
+                }
+
+                If (LEqual (PM4L, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y07._RW, D8RW)  // _RW_: Read-Write Status
+                    Store (Zero, D8RW)
+                }
+
+                If (PM4H)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y08._LEN, DCLN)  // _LEN: Length
+                    Store (Zero, DCLN)
+                }
+
+                If (LEqual (PM4H, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y08._RW, DCRW)  // _RW_: Read-Write Status
+                    Store (Zero, DCRW)
+                }
+
+                If (PM5L)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y09._LEN, E0LN)  // _LEN: Length
+                    Store (Zero, E0LN)
+                }
+
+                If (LEqual (PM5L, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y09._RW, E0RW)  // _RW_: Read-Write Status
+                    Store (Zero, E0RW)
+                }
+
+                If (PM5H)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y0A._LEN, E4LN)  // _LEN: Length
+                    Store (Zero, E4LN)
+                }
+
+                If (LEqual (PM5H, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y0A._RW, E4RW)  // _RW_: Read-Write Status
+                    Store (Zero, E4RW)
+                }
+
+                If (PM6L)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y0B._LEN, E8LN)  // _LEN: Length
+                    Store (Zero, E8LN)
+                }
+
+                If (LEqual (PM6L, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y0B._RW, E8RW)  // _RW_: Read-Write Status
+                    Store (Zero, E8RW)
+                }
+
+                If (PM6H)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y0C._LEN, ECLN)  // _LEN: Length
+                    Store (Zero, ECLN)
+                }
+
+                If (LEqual (PM6H, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y0C._RW, ECRW)  // _RW_: Read-Write Status
+                    Store (Zero, ECRW)
+                }
+
+                If (PM0H)
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0._Y0D._LEN, F0LN)  // _LEN: Length
+                    Store (Zero, F0LN)
+                }
+
+                If (LEqual (PM0H, One))
+                {
+                    CreateBitField (BUF0, \_SB.PCI0._Y0D._RW, F0RW)  // _RW_: Read-Write Status
+                    Store (Zero, F0RW)
+                }
+
+                CreateDWordField (BUF0, \_SB.PCI0._Y0E._MIN, M1MN)  // _MIN: Minimum Base Address
+                CreateDWordField (BUF0, \_SB.PCI0._Y0E._MAX, M1MX)  // _MAX: Maximum Base Address
+                CreateDWordField (BUF0, \_SB.PCI0._Y0E._LEN, M1LN)  // _LEN: Length
+                ShiftLeft (TLUD, 0x14, M1MN)
+                Add (Subtract (M1MX, M1MN), One, M1LN)
+                CreateQWordField (BUF0, \_SB.PCI0._Y0F._LEN, MSLN)  // _LEN: Length
+                Store (Zero, MSLN)
+                Return (BUF0)
+            }
+
+            Name (GUID, Buffer (0x10)
+            {
+                /* 0000 */   0x5B, 0x4D, 0xDB, 0x33, 0xF7, 0x1F, 0x1C, 0x40,
+                /* 0008 */   0x96, 0x57, 0x74, 0x41, 0xC0, 0x3D, 0xD7, 0x66
+            })
+            Name (PA0H, Zero)
+            Name (PA1H, Zero)
+            Name (PA2H, Zero)
+            Name (PA3H, Zero)
+            Name (PA4H, Zero)
+            Name (PA5H, Zero)
+            Name (PA6H, Zero)
+            Method (NPTS, 1, NotSerialized)
+            {
+                Store (PM0H, PA0H)
+                Store (PM1H, PA1H)
+                Store (PM2H, PA2H)
+                Store (PM3H, PA3H)
+                Store (PM4H, PA4H)
+                Store (PM5H, PA5H)
+                Store (PM6H, PA6H)
+            }
+
+            Method (NWAK, 1, NotSerialized)
+            {
+                Store (PA0H, PM0H)
+                Store (PA1H, PM1H)
+                Store (PA2H, PM2H)
+                Store (PA3H, PM3H)
+                Store (PA4H, PM4H)
+                Store (PA5H, PM5H)
+                Store (PA6H, PM6H)
+            }
+
+            Device (MCHC)
+            {
+                Name (_ADR, Zero)  // _ADR: Address
+            }
+
+            Device (PDRC)
+            {
+                Name (_HID, EisaId ("PNP0C02"))  // _HID: Hardware ID
+                Name (_UID, One)  // _UID: Unique ID
+                Name (BUF0, ResourceTemplate ()
+                {
+                    Memory32Fixed (ReadWrite,
+                        0x00000000,         // Address Base
+                        0x00004000,         // Address Length
+                        _Y10)
+                    Memory32Fixed (ReadWrite,
+                        0x00000000,         // Address Base
+                        0x00008000,         // Address Length
+                        _Y12)
+                    Memory32Fixed (ReadWrite,
+                        0x00000000,         // Address Base
+                        0x00001000,         // Address Length
+                        _Y13)
+                    Memory32Fixed (ReadWrite,
+                        0x00000000,         // Address Base
+                        0x00001000,         // Address Length
+                        _Y14)
+                    Memory32Fixed (ReadWrite,
+                        0x00000000,         // Address Base
+                        0x00000000,         // Address Length
+                        _Y15)
+                    Memory32Fixed (ReadWrite,
+                        0xFED20000,         // Address Base
+                        0x00020000,         // Address Length
+                        )
+                    Memory32Fixed (ReadOnly,
+                        0xFED90000,         // Address Base
+                        0x00004000,         // Address Length
+                        )
+                    Memory32Fixed (ReadWrite,
+                        0xFED45000,         // Address Base
+                        0x0004B000,         // Address Length
+                        )
+                    Memory32Fixed (ReadOnly,
+                        0xFF000000,         // Address Base
+                        0x01000000,         // Address Length
+                        )
+                    Memory32Fixed (ReadOnly,
+                        0xFEE00000,         // Address Base
+                        0x00100000,         // Address Length
+                        )
+                    Memory32Fixed (ReadWrite,
+                        0x00000000,         // Address Base
+                        0x00001000,         // Address Length
+                        _Y11)
+                })
+                Method (_CRS, 0, Serialized)  // _CRS: Current Resource Settings
+                {
+                    CreateDWordField (BUF0, \_SB.PCI0.PDRC._Y10._BAS, RBR0)  // _BAS: Base Address
+                    ShiftLeft (^^LPCB.RCBA, 0x0E, RBR0)
+                    CreateDWordField (BUF0, \_SB.PCI0.PDRC._Y11._BAS, TBR0)  // _BAS: Base Address
+                    Store (TBAB, TBR0)
+                    CreateDWordField (BUF0, \_SB.PCI0.PDRC._Y11._LEN, TBLN)  // _LEN: Length
+                    If (LEqual (TBAB, Zero))
+                    {
+                        Store (Zero, TBLN)
+                    }
+
+                    CreateDWordField (BUF0, \_SB.PCI0.PDRC._Y12._BAS, MBR0)  // _BAS: Base Address
+                    ShiftLeft (MHBR, 0x0F, MBR0)
+                    CreateDWordField (BUF0, \_SB.PCI0.PDRC._Y13._BAS, DBR0)  // _BAS: Base Address
+                    ShiftLeft (DIBR, 0x0C, DBR0)
+                    CreateDWordField (BUF0, \_SB.PCI0.PDRC._Y14._BAS, EBR0)  // _BAS: Base Address
+                    ShiftLeft (EPBR, 0x0C, EBR0)
+                    CreateDWordField (BUF0, \_SB.PCI0.PDRC._Y15._BAS, XBR0)  // _BAS: Base Address
+                    ShiftLeft (PXBR, 0x1A, XBR0)
+                    CreateDWordField (BUF0, \_SB.PCI0.PDRC._Y15._LEN, XSZ0)  // _LEN: Length
+                    ShiftRight (0x10000000, PXSZ, XSZ0)
+                    Return (BUF0)
+                }
+            }
+
+            Device (GIGE)
+            {
+                Name (_ADR, 0x00190000)  // _ADR: Address
+                Alias (PWD4, _PRW)
+            }
+
+            Device (EHC1)
+            {
+                Name (_ADR, 0x001D0000)  // _ADR: Address
+                Name (_S3D, 0x03)  // _S3D: S3 Device State
+                Name (_S4D, 0x03)  // _S4D: S4 Device State
+                Name (AAPL, Package (0x0B)
+                {
+                    "AAPL,current-available", 
+                    0x0834, 
+                    "AAPL,current-extra", 
+                    0x0898, 
+                    "AAPL,current-extra-in-sleep", 
+                    0x0640, 
+                    "AAPL,max-port-current-in-sleep", 
+                    0x0834, 
+                    "AAPL,device-internal", 
+                    0x02, 
+                    Buffer (One)
+                    {
+                         0x00
+                    }
+                })
+                OperationRegion (PWKE, PCI_Config, 0x62, 0x04)
+                Field (PWKE, DWordAcc, NoLock, Preserve)
+                {
+                        ,   1, 
+                    PWUC,   8
+                }
+
+                Method (_PSW, 1, NotSerialized)  // _PSW: Power State Wake
+                {
+                    If (Arg0)
+                    {
+                        Store (Ones, PWUC)
+                    }
+                    Else
+                    {
+                        Store (Zero, PWUC)
+                    }
+                }
+
+                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
+                {
+                    If (LEqual (Arg2, Zero))
+                    {
+                        Return (Buffer (One)
+                        {
+                             0x03
+                        })
+                    }
+
+                    Return (RefOf (AAPL))
+                }
+
+                Device (RHUB)
+                {
+                    Name (_ADR, Zero)  // _ADR: Address
+                    Device (PRT1)
+                    {
+                        Name (_ADR, One)  // _ADR: Address
+                        Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                        {
+                            0xFF, 
+                            Zero, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                /* 0008 */   0x30, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                /*           Revision : 01     */
+                                /*        IgnoreColor : 01     */
+                                /*              Color : 000000 */
+                                /*              Width : 0000   */
+                                /*             Height : 0000   */
+                                /*        UserVisible : 00     */
+                                /*               Dock : 00     */
+                                /*                Lid : 00     */
+                                /*              Panel : 06     */
+                                /*   VerticalPosition : 00     */
+                                /* HorizontalPosition : 00     */
+                                /*              Shape : 07     */
+                                /*   GroupOrientation : 00     */
+                                /*         GroupToken : 00     */
+                                /*      GroupPosition : 00     */
+                                /*                Bay : 00     */
+                                /*          Ejectable : 00     */
+                                /*  OspmEjectRequired : 00     */
+                                /*      CabinetNumber : 00     */
+                                /*     CardCageNumber : 00     */
+                                /*          Reference : 00     */
+                                /*           Rotation : 00     */
+                                /*              Order : 00     */
+                                /*     VerticalOffset : 0000   */
+                                /*   HorizontalOffset : 0000   */
+                            }
+                        })
+                        Device (PRT1)
+                        {
+                            Name (_ADR, One)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xE1, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 04     */
+                                    /*   VerticalPosition : 03     */
+                                    /* HorizontalPosition : 00     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT2)
+                        {
+                            Name (_ADR, 0x02)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 04     */
+                                    /*   VerticalPosition : 03     */
+                                    /* HorizontalPosition : 01     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT3)
+                        {
+                            Name (_ADR, 0x03)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 04     */
+                                    /*   VerticalPosition : 03     */
+                                    /* HorizontalPosition : 01     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT4)
+                        {
+                            Name (_ADR, 0x04)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xE1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 04     */
+                                    /*   VerticalPosition : 03     */
+                                    /* HorizontalPosition : 02     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT5)
+                        {
+                            Name (_ADR, 0x05)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 06     */
+                                    /*   VerticalPosition : 02     */
+                                    /* HorizontalPosition : 02     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT6)
+                        {
+                            Name (_ADR, 0x06)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 06     */
+                                    /*   VerticalPosition : 02     */
+                                    /* HorizontalPosition : 02     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT7)
+                        {
+                            Name (_ADR, 0x07)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 06     */
+                                    /*   VerticalPosition : 02     */
+                                    /* HorizontalPosition : 02     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT8)
+                        {
+                            Name (_ADR, 0x08)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 06     */
+                                    /*   VerticalPosition : 02     */
+                                    /* HorizontalPosition : 02     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+                    }
+                }
+
+                Alias (PWD4, _PRW)
+            }
+
+            Device (EHC2)
+            {
+                Name (_ADR, 0x001A0000)  // _ADR: Address
+                Name (_S3D, 0x03)  // _S3D: S3 Device State
+                Name (_S4D, 0x03)  // _S4D: S4 Device State
+                OperationRegion (PWKE, PCI_Config, 0x62, 0x04)
+                Field (PWKE, DWordAcc, NoLock, Preserve)
+                {
+                        ,   1, 
+                    PWUC,   6
+                }
+
+                Method (_PSW, 1, NotSerialized)  // _PSW: Power State Wake
+                {
+                    If (Arg0)
+                    {
+                        Store (Ones, PWUC)
+                    }
+                    Else
+                    {
+                        Store (Zero, PWUC)
+                    }
+                }
+
+                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
+                {
+                    If (LEqual (Arg2, Zero))
+                    {
+                        Return (Buffer (One)
+                        {
+                             0x03
+                        })
+                    }
+
+                    Return (RefOf (^^EHC1.AAPL))
+                }
+
+                Device (RHUB)
+                {
+                    Name (_ADR, Zero)  // _ADR: Address
+                    Device (PRT1)
+                    {
+                        Name (_ADR, One)  // _ADR: Address
+                        Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                        {
+                            0xFF, 
+                            Zero, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                /* 0008 */   0x30, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                /*           Revision : 01     */
+                                /*        IgnoreColor : 01     */
+                                /*              Color : 000000 */
+                                /*              Width : 0000   */
+                                /*             Height : 0000   */
+                                /*        UserVisible : 00     */
+                                /*               Dock : 00     */
+                                /*                Lid : 00     */
+                                /*              Panel : 06     */
+                                /*   VerticalPosition : 00     */
+                                /* HorizontalPosition : 00     */
+                                /*              Shape : 07     */
+                                /*   GroupOrientation : 00     */
+                                /*         GroupToken : 00     */
+                                /*      GroupPosition : 00     */
+                                /*                Bay : 00     */
+                                /*          Ejectable : 00     */
+                                /*  OspmEjectRequired : 00     */
+                                /*      CabinetNumber : 00     */
+                                /*     CardCageNumber : 00     */
+                                /*          Reference : 00     */
+                                /*           Rotation : 00     */
+                                /*              Order : 00     */
+                                /*     VerticalOffset : 0000   */
+                                /*   HorizontalOffset : 0000   */
+                            }
+                        })
+                        Device (PRT1)
+                        {
+                            Name (_ADR, One)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xE1, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 04     */
+                                    /*   VerticalPosition : 03     */
+                                    /* HorizontalPosition : 00     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT2)
+                        {
+                            Name (_ADR, 0x02)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 04     */
+                                    /*   VerticalPosition : 03     */
+                                    /* HorizontalPosition : 01     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT3)
+                        {
+                            Name (_ADR, 0x03)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xE1, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 04     */
+                                    /*   VerticalPosition : 03     */
+                                    /* HorizontalPosition : 01     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT4)
+                        {
+                            Name (_ADR, 0x04)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xE1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 04     */
+                                    /*   VerticalPosition : 03     */
+                                    /* HorizontalPosition : 02     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT5)
+                        {
+                            Name (_ADR, 0x05)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 06     */
+                                    /*   VerticalPosition : 02     */
+                                    /* HorizontalPosition : 02     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+
+                        Device (PRT6)
+                        {
+                            Name (_ADR, 0x06)  // _ADR: Address
+                            Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                            {
+                                0xFF, 
+                                0xFF, 
+                                Zero, 
+                                Zero
+                            })
+                            Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                            {
+                                Buffer (0x10)
+                                {
+                                    /* 0000 */   0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                    /* 0008 */   0xB1, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                                    /*           Revision : 01     */
+                                    /*        IgnoreColor : 01     */
+                                    /*              Color : 000000 */
+                                    /*              Width : 0000   */
+                                    /*             Height : 0000   */
+                                    /*        UserVisible : 01     */
+                                    /*               Dock : 00     */
+                                    /*                Lid : 00     */
+                                    /*              Panel : 06     */
+                                    /*   VerticalPosition : 02     */
+                                    /* HorizontalPosition : 02     */
+                                    /*              Shape : 07     */
+                                    /*   GroupOrientation : 00     */
+                                    /*         GroupToken : 00     */
+                                    /*      GroupPosition : 00     */
+                                    /*                Bay : 00     */
+                                    /*          Ejectable : 00     */
+                                    /*  OspmEjectRequired : 00     */
+                                    /*      CabinetNumber : 00     */
+                                    /*     CardCageNumber : 00     */
+                                    /*          Reference : 00     */
+                                    /*           Rotation : 00     */
+                                    /*              Order : 00     */
+                                    /*     VerticalOffset : 0000   */
+                                    /*   HorizontalOffset : 0000   */
+                                }
+                            })
+                        }
+                    }
+                }
+
+                Alias (PWD4, _PRW)
+            }
+
+            Device (XHC1)
+            {
+                Name (_ADR, 0x00140000)  // _ADR: Address
+                OperationRegion (XPRT, PCI_Config, 0x74, 0x6C)
+                Field (XPRT, DWordAcc, NoLock, Preserve)
+                {
+                    Offset (0x01), 
+                    PMEE,   1, 
+                        ,   6, 
+                    PMES,   1, 
+                    Offset (0x5C), 
+                    PR2,    32, 
+                    PR2M,   32, 
+                    PR3,    32, 
+                    PR3M,   32
+                }
+
+                Name (_S3D, 0x03)  // _S3D: S3 Device State
+                Name (_S4D, 0x03)  // _S4D: S4 Device State
+                Name (XRST, Zero)
+                Method (CUID, 1, Serialized)
+                {
+                    If (LEqual (Arg0, Buffer (0x10)
+                            {
+                                /* 0000 */   0xA9, 0x12, 0x95, 0x7C, 0x05, 0x17, 0xB4, 0x4C,
+                                /* 0008 */   0xAF, 0x7D, 0x50, 0x6A, 0x24, 0x23, 0xAB, 0x71
+                            }))
+                    {
+                        Return (One)
+                    }
+
+                    Return (Zero)
+                }
+
+                Method (POSC, 3, Serialized)
+                {
+                    CreateDWordField (Arg2, Zero, CDW1)
+                    CreateDWordField (Arg2, 0x08, CDW3)
+                    If (LNotEqual (Arg1, One))
+                    {
+                        Or (CDW1, 0x08, CDW1)
+                    }
+
+                    If (LEqual (XHCI, Zero))
+                    {
+                        Or (CDW1, 0x02, CDW1)
+                    }
+
+                    If (LNot (And (CDW1, One)))
+                    {
+                        If (And (CDW3, One))
+                        {
+                            ESEL ()
+                        }
+                        Else
+                        {
+                            XSEL ()
+                        }
+                    }
+
+                    Return (Arg2)
+                }
+
+                Method (XSEL, 0, Serialized)
+                {
+                    If (LOr (LEqual (XHCI, 0x02), LEqual (XHCI, 0x03)))
+                    {
+                        Store (One, ^^LPCB.XUSB)
+                        Store (One, XRST)
+                        Store (Zero, Local0)
+                        And (PR3, 0xFFFFFFF0, Local0)
+                        Or (Local0, XHPM, Local0)
+                        And (Local0, PR3M, PR3)
+                        Store (Zero, Local0)
+                        And (PR2, 0xFFFFFFF0, Local0)
+                        Or (Local0, XHPM, Local0)
+                        And (Local0, PR2M, PR2)
+                    }
+                }
+
+                Method (ESEL, 0, Serialized)
+                {
+                    If (LOr (LEqual (XHCI, 0x02), LEqual (XHCI, 0x03)))
+                    {
+                        And (PR3, 0xFFFFFFF0, PR3)
+                        And (PR2, 0xFFFFFFF0, PR2)
+                        Store (Zero, ^^LPCB.XUSB)
+                        Store (Zero, XRST)
+                    }
+                }
+
+                Method (XWAK, 0, Serialized)
+                {
+                    If (LOr (LEqual (^^LPCB.XUSB, One), LEqual (XRST, One)))
+                    {
+                        XSEL ()
+                    }
+                }
+
+                Device (RHUB)
+                {
+                    Name (_ADR, Zero)  // _ADR: Address
+                    Device (HSP1)
+                    {
+                        Name (_ADR, One)  // _ADR: Address
+                        Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */   0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                /* 0008 */   0x69, 0x0C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
+                                /*           Revision : 01     */
+                                /*        IgnoreColor : 00     */
+                                /*              Color : 0072C6 */
+                                /*              Width : 0000   */
+                                /*             Height : 0000   */
+                                /*        UserVisible : 01     */
+                                /*               Dock : 00     */
+                                /*                Lid : 00     */
+                                /*              Panel : 05     */
+                                /*   VerticalPosition : 01     */
+                                /* HorizontalPosition : 00     */
+                                /*              Shape : 03     */
+                                /*   GroupOrientation : 00     */
+                                /*         GroupToken : 00     */
+                                /*      GroupPosition : 01     */
+                                /*                Bay : 00     */
+                                /*          Ejectable : 00     */
+                                /*  OspmEjectRequired : 00     */
+                                /*      CabinetNumber : 00     */
+                                /*     CardCageNumber : 00     */
+                                /*          Reference : 00     */
+                                /*           Rotation : 00     */
+                                /*              Order : 00     */
+                                /*     VerticalOffset : 0000   */
+                                /*   HorizontalOffset : 0000   */
+                            }
+                        })
+                    }
+
+                    Device (HSP2)
+                    {
+                        Name (_ADR, 0x02)  // _ADR: Address
+                        Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */   0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                /* 0008 */   0x69, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
+                                /*           Revision : 01     */
+                                /*        IgnoreColor : 00     */
+                                /*              Color : 0072C6 */
+                                /*              Width : 0000   */
+                                /*             Height : 0000   */
+                                /*        UserVisible : 01     */
+                                /*               Dock : 00     */
+                                /*                Lid : 00     */
+                                /*              Panel : 05     */
+                                /*   VerticalPosition : 01     */
+                                /* HorizontalPosition : 00     */
+                                /*              Shape : 03     */
+                                /*   GroupOrientation : 00     */
+                                /*         GroupToken : 00     */
+                                /*      GroupPosition : 02     */
+                                /*                Bay : 00     */
+                                /*          Ejectable : 00     */
+                                /*  OspmEjectRequired : 00     */
+                                /*      CabinetNumber : 00     */
+                                /*     CardCageNumber : 00     */
+                                /*          Reference : 00     */
+                                /*           Rotation : 00     */
+                                /*              Order : 00     */
+                                /*     VerticalOffset : 0000   */
+                                /*   HorizontalOffset : 0000   */
+                            }
+                        })
+                    }
+
+                    Device (HSP3)
+                    {
+                        Name (_ADR, 0x03)  // _ADR: Address
+                        Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */   0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                /* 0008 */   0x69, 0x0C, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00
+                                /*           Revision : 01     */
+                                /*        IgnoreColor : 00     */
+                                /*              Color : 0072C6 */
+                                /*              Width : 0000   */
+                                /*             Height : 0000   */
+                                /*        UserVisible : 01     */
+                                /*               Dock : 00     */
+                                /*                Lid : 00     */
+                                /*              Panel : 05     */
+                                /*   VerticalPosition : 01     */
+                                /* HorizontalPosition : 00     */
+                                /*              Shape : 03     */
+                                /*   GroupOrientation : 00     */
+                                /*         GroupToken : 00     */
+                                /*      GroupPosition : 03     */
+                                /*                Bay : 00     */
+                                /*          Ejectable : 00     */
+                                /*  OspmEjectRequired : 00     */
+                                /*      CabinetNumber : 00     */
+                                /*     CardCageNumber : 00     */
+                                /*          Reference : 00     */
+                                /*           Rotation : 00     */
+                                /*              Order : 00     */
+                                /*     VerticalOffset : 0000   */
+                                /*   HorizontalOffset : 0000   */
+                            }
+                        })
+                    }
+
+                    Device (HSP4)
+                    {
+                        Name (_ADR, 0x04)  // _ADR: Address
+                        Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */   0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                /* 0008 */   0x69, 0x0C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+                                /*           Revision : 01     */
+                                /*        IgnoreColor : 00     */
+                                /*              Color : 0072C6 */
+                                /*              Width : 0000   */
+                                /*             Height : 0000   */
+                                /*        UserVisible : 01     */
+                                /*               Dock : 00     */
+                                /*                Lid : 00     */
+                                /*              Panel : 05     */
+                                /*   VerticalPosition : 01     */
+                                /* HorizontalPosition : 00     */
+                                /*              Shape : 03     */
+                                /*   GroupOrientation : 00     */
+                                /*         GroupToken : 00     */
+                                /*      GroupPosition : 04     */
+                                /*                Bay : 00     */
+                                /*          Ejectable : 00     */
+                                /*  OspmEjectRequired : 00     */
+                                /*      CabinetNumber : 00     */
+                                /*     CardCageNumber : 00     */
+                                /*          Reference : 00     */
+                                /*           Rotation : 00     */
+                                /*              Order : 00     */
+                                /*     VerticalOffset : 0000   */
+                                /*   HorizontalOffset : 0000   */
+                            }
+                        })
+                    }
+
+                    Device (SSP1)
+                    {
+                        Name (_ADR, 0x05)  // _ADR: Address
+                        Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */   0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                /* 0008 */   0x69, 0x0C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
+                                /*           Revision : 01     */
+                                /*        IgnoreColor : 00     */
+                                /*              Color : 0072C6 */
+                                /*              Width : 0000   */
+                                /*             Height : 0000   */
+                                /*        UserVisible : 01     */
+                                /*               Dock : 00     */
+                                /*                Lid : 00     */
+                                /*              Panel : 05     */
+                                /*   VerticalPosition : 01     */
+                                /* HorizontalPosition : 00     */
+                                /*              Shape : 03     */
+                                /*   GroupOrientation : 00     */
+                                /*         GroupToken : 00     */
+                                /*      GroupPosition : 01     */
+                                /*                Bay : 00     */
+                                /*          Ejectable : 00     */
+                                /*  OspmEjectRequired : 00     */
+                                /*      CabinetNumber : 00     */
+                                /*     CardCageNumber : 00     */
+                                /*          Reference : 00     */
+                                /*           Rotation : 00     */
+                                /*              Order : 00     */
+                                /*     VerticalOffset : 0000   */
+                                /*   HorizontalOffset : 0000   */
+                            }
+                        })
+                    }
+
+                    Device (SSP2)
+                    {
+                        Name (_ADR, 0x06)  // _ADR: Address
+                        Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */   0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                /* 0008 */   0x69, 0x0C, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00
+                                /*           Revision : 01     */
+                                /*        IgnoreColor : 00     */
+                                /*              Color : 0072C6 */
+                                /*              Width : 0000   */
+                                /*             Height : 0000   */
+                                /*        UserVisible : 01     */
+                                /*               Dock : 00     */
+                                /*                Lid : 00     */
+                                /*              Panel : 05     */
+                                /*   VerticalPosition : 01     */
+                                /* HorizontalPosition : 00     */
+                                /*              Shape : 03     */
+                                /*   GroupOrientation : 00     */
+                                /*         GroupToken : 00     */
+                                /*      GroupPosition : 02     */
+                                /*                Bay : 00     */
+                                /*          Ejectable : 00     */
+                                /*  OspmEjectRequired : 00     */
+                                /*      CabinetNumber : 00     */
+                                /*     CardCageNumber : 00     */
+                                /*          Reference : 00     */
+                                /*           Rotation : 00     */
+                                /*              Order : 00     */
+                                /*     VerticalOffset : 0000   */
+                                /*   HorizontalOffset : 0000   */
+                            }
+                        })
+                    }
+
+                    Device (SSP3)
+                    {
+                        Name (_ADR, 0x07)  // _ADR: Address
+                        Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */   0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                /* 0008 */   0x69, 0x0C, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00
+                                /*           Revision : 01     */
+                                /*        IgnoreColor : 00     */
+                                /*              Color : 0072C6 */
+                                /*              Width : 0000   */
+                                /*             Height : 0000   */
+                                /*        UserVisible : 01     */
+                                /*               Dock : 00     */
+                                /*                Lid : 00     */
+                                /*              Panel : 05     */
+                                /*   VerticalPosition : 01     */
+                                /* HorizontalPosition : 00     */
+                                /*              Shape : 03     */
+                                /*   GroupOrientation : 00     */
+                                /*         GroupToken : 00     */
+                                /*      GroupPosition : 03     */
+                                /*                Bay : 00     */
+                                /*          Ejectable : 00     */
+                                /*  OspmEjectRequired : 00     */
+                                /*      CabinetNumber : 00     */
+                                /*     CardCageNumber : 00     */
+                                /*          Reference : 00     */
+                                /*           Rotation : 00     */
+                                /*              Order : 00     */
+                                /*     VerticalOffset : 0000   */
+                                /*   HorizontalOffset : 0000   */
+                            }
+                        })
+                    }
+
+                    Device (SSP4)
+                    {
+                        Name (_ADR, 0x08)  // _ADR: Address
+                        Name (_UPC, Package (0x04)  // _UPC: USB Port Capabilities
+                        {
+                            0xFF, 
+                            0x03, 
+                            Zero, 
+                            Zero
+                        })
+                        Name (_PLD, Package (0x01)  // _PLD: Physical Location of Device
+                        {
+                            Buffer (0x10)
+                            {
+                                /* 0000 */   0x01, 0xC6, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                /* 0008 */   0x69, 0x0C, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
+                                /*           Revision : 01     */
+                                /*        IgnoreColor : 00     */
+                                /*              Color : 0072C6 */
+                                /*              Width : 0000   */
+                                /*             Height : 0000   */
+                                /*        UserVisible : 01     */
+                                /*               Dock : 00     */
+                                /*                Lid : 00     */
+                                /*              Panel : 05     */
+                                /*   VerticalPosition : 01     */
+                                /* HorizontalPosition : 00     */
+                                /*              Shape : 03     */
+                                /*   GroupOrientation : 00     */
+                                /*         GroupToken : 00     */
+                                /*      GroupPosition : 04     */
+                                /*                Bay : 00     */
+                                /*          Ejectable : 00     */
+                                /*  OspmEjectRequired : 00     */
+                                /*      CabinetNumber : 00     */
+                                /*     CardCageNumber : 00     */
+                                /*          Reference : 00     */
+                                /*           Rotation : 00     */
+                                /*              Order : 00     */
+                                /*     VerticalOffset : 0000   */
+                                /*   HorizontalOffset : 0000   */
+                            }
+                        })
+                    }
+                }
+
+                Alias (PWD4, _PRW)
+            }
+
+            Device (HDEF)
+            {
+                Name (_ADR, 0x001B0000)  // _ADR: Address
+                OperationRegion (HDAR, PCI_Config, Zero, 0x60)
+                Field (HDAR, WordAcc, NoLock, Preserve)
+                {
+                    VID0,   16, 
+                    DID0,   16, 
+                    Offset (0x4C), 
+                    DCKA,   1, 
+                    Offset (0x4D), 
+                    DCKM,   1, 
+                        ,   6, 
+                    DCKS,   1, 
+                    Offset (0x54), 
+                        ,   15, 
+                    PMES,   1
+                }
+
+                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
+                {
+                    If (LEqual (Arg0, Buffer (0x10)
+                            {
+                                /* 0000 */   0xC6, 0xB7, 0xB5, 0xA0, 0x18, 0x13, 0x1C, 0x44,
+                                /* 0008 */   0xB0, 0xC9, 0xFE, 0x69, 0x5E, 0xAF, 0x94, 0x9B
+                            }))
+                    {
+                        If (LNotEqual (And (VID0, 0xFFFF), 0xFFFF))
+                        {
+                            Store (Package (0x02)
+                                {
+                                    "hda-gfx", 
+                                    Buffer (0x0A)
+                                    {
+                                        "onboard-1"
+                                    }
+                                }, Local0)
+                            DTGP (Arg2, RefOf (Local0))
+                            Return (Local0)
+                        }
+                    }
+
+                    Return (Zero)
+                }
+
+                Alias (PWD4, _PRW)
+            }
+
+            Device (SATA)
+            {
+                Name (_ADR, 0x001F0002)  // _ADR: Address
+            }
+
+            Device (SBUS)
+            {
+                Name (_ADR, 0x001F0003)  // _ADR: Address
+                Device (BUS0)
+                {
+                    Name (_CID, "smbus")  // _CID: Compatible ID
+                    Name (_ADR, Zero)  // _ADR: Address
+                    Device (DVL0)
+                    {
+                        Name (_ADR, 0x57)  // _ADR: Address
+                        Name (_CID, "diagsvault")  // _CID: Compatible ID
+                    }
+                }
+            }
+
+            Device (IGPU)
+            {
+                Name (_ADR, 0x00020000)  // _ADR: Address
+                Device (^^MEM2)
+                {
+                    Name (_HID, EisaId ("PNP0C01"))  // _HID: Hardware ID
+                    Name (_UID, 0x02)  // _UID: Unique ID
+                    Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+                    {
+                        Memory32Fixed (ReadWrite,
+                            0x20000000,         // Address Base
+                            0x00200000,         // Address Length
+                            )
+                        Memory32Fixed (ReadWrite,
+                            0x40000000,         // Address Base
+                            0x00200000,         // Address Length
+                            )
+                    })
+                    Method (_STA, 0, NotSerialized)  // _STA: Status
+                    {
+                        If (IGDS)
+                        {
+                            Return (0x0F)
+                        }
+
+                        Return (Zero)
+                    }
+                }
+
+                OperationRegion (GFXH, PCI_Config, Zero, 0x40)
+                Field (GFXH, ByteAcc, NoLock, Preserve)
+                {
+                    VID0,   16, 
+                    DID0,   16
+                }
+
+                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
+                {
+                    If (LEqual (Arg0, Buffer (0x10)
+                            {
+                                /* 0000 */   0xC6, 0xB7, 0xB5, 0xA0, 0x18, 0x13, 0x1C, 0x44,
+                                /* 0008 */   0xB0, 0xC9, 0xFE, 0x69, 0x5E, 0xAF, 0x94, 0x9B
+                            }))
+                    {
+                        If (LNotEqual (And (VID0, 0xFFFF), 0xFFFF))
+                        {
+                            Store (Package (0x02)
+                                {
+                                    "hda-gfx", 
+                                    Buffer (0x0A)
+                                    {
+                                        "onboard-1"
+                                    }
+                                }, Local0)
+                            DTGP (Arg2, RefOf (Local0))
+                            Return (Local0)
+                        }
+                    }
+
+                    Return (Zero)
+                }
+            }
+
+            Device (LPCB)
+            {
+                Name (_ADR, 0x001F0000)  // _ADR: Address
+                OperationRegion (LPC0, PCI_Config, 0x40, 0xC0)
+                Field (LPC0, AnyAcc, NoLock, Preserve)
+                {
+                    Offset (0x40), 
+                    IOD0,   8, 
+                    IOD1,   8, 
+                    Offset (0xB0), 
+                    RAEN,   1, 
+                        ,   13, 
+                    RCBA,   18
+                }
+
+                OperationRegion (LPC1, PCI_Config, 0x40, 0xC0)
+                Field (LPC1, AnyAcc, NoLock, Preserve)
+                {
+                    Offset (0x6E), 
+                    XUSB,   1
+                }
+
+                OperationRegion (CPSB, SystemMemory, 0xDDA55E18, 0x10)
+                Field (CPSB, AnyAcc, NoLock, Preserve)
+                {
+                    RTCX,   1
+                }
+
+                Method (SPTS, 1, NotSerialized)
+                {
+                    Store (One, SLPX)
+                    Store (One, SLPE)
+                }
+
+                Method (SWAK, 1, NotSerialized)
+                {
+                    Store (Zero, SLPE)
+                    If (RTCX) {}
+                    Else
+                    {
+                        Notify (PWRB, 0x02)
+                    }
+                }
+
+                OperationRegion (SMIE, SystemIO, 0x0400, 0x04)
+                Field (SMIE, ByteAcc, NoLock, Preserve)
+                {
+                        ,   10, 
+                    RTCS,   1, 
+                        ,   3, 
+                    PEXS,   1, 
+                    WAKS,   1, 
+                    Offset (0x03), 
+                    PWBT,   1, 
+                    Offset (0x04)
+                }
+
+                OperationRegion (SLPR, SystemIO, 0x0430, 0x08)
+                Field (SLPR, ByteAcc, NoLock, Preserve)
+                {
+                        ,   4, 
+                    SLPE,   1, 
+                        ,   31, 
+                    SLPX,   1, 
+                    Offset (0x08)
+                }
+
+                Method (S1RS, 1, NotSerialized)
+                {
+                    Store (Zero, PLED)
+                    If (LEqual (Arg0, One))
+                    {
+                        ECWB (0xFF, 0x02)
+                        ECWB (0x62, 0x06)
+                        ECWB (0xFF, Zero)
+                    }
+                }
+
+                OperationRegion (GPBX, SystemIO, 0x0500, 0x80)
+                Field (GPBX, ByteAcc, NoLock, Preserve)
+                {
+                    Offset (0x18), 
+                        ,   27, 
+                    PLED,   1
+                }
+
+                Mutex (MUEC, 0x00)
+                OperationRegion (DLYP, SystemIO, 0xE1, One)
+                Field (DLYP, ByteAcc, NoLock, Preserve)
+                {
+                    DELY,   8
+                }
+
+                OperationRegion (KBCP, SystemIO, Zero, 0xFF)
+                Field (KBCP, ByteAcc, Lock, Preserve)
+                {
+                    Offset (0x62), 
+                    EC62,   8, 
+                    Offset (0x66), 
+                    EC66,   8
+                }
+
+                Field (KBCP, ByteAcc, Lock, Preserve)
+                {
+                    Offset (0x66), 
+                    ECOF,   1, 
+                    ECIE,   1, 
+                    Offset (0x67)
+                }
+
+                OperationRegion (ECOR, EmbeddedControl, Zero, 0x0100)
+                Field (ECOR, ByteAcc, Lock, Preserve)
+                {
+                    Offset (0x4A), 
+                    TWKT,   8, 
+                    Offset (0xFF), 
+                    BNKD,   8
+                }
+
+                Method (IBFX, 0, Serialized)
+                {
+                    Store (0x1000, Local0)
+                    While (LAnd (Decrement (Local0), ECIE))
+                    {
+                        Store (Zero, DELY)
+                    }
+                }
+
+                Method (ECWB, 2, Serialized)
+                {
+                    If (LNot (Acquire (MUEC, 0xFFFF)))
+                    {
+                        IBFX ()
+                        Store (0x81, EC66)
+                        IBFX ()
+                        Store (Arg0, EC62)
+                        IBFX ()
+                        Store (Arg1, EC62)
+                        IBFX ()
+                        Release (MUEC)
+                    }
+                }
+
+                Device (DMAC)
+                {
+                    Name (_HID, EisaId ("PNP0200"))  // _HID: Hardware ID
+                    Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+                    {
+                        IO (Decode16,
+                            0x0000,             // Range Minimum
+                            0x0000,             // Range Maximum
+                            0x01,               // Alignment
+                            0x20,               // Length
+                            )
+                        IO (Decode16,
+                            0x0081,             // Range Minimum
+                            0x0081,             // Range Maximum
+                            0x01,               // Alignment
+                            0x11,               // Length
+                            )
+                        IO (Decode16,
+                            0x0093,             // Range Minimum
+                            0x0093,             // Range Maximum
+                            0x01,               // Alignment
+                            0x0D,               // Length
+                            )
+                        IO (Decode16,
+                            0x00C0,             // Range Minimum
+                            0x00C0,             // Range Maximum
+                            0x01,               // Alignment
+                            0x20,               // Length
+                            )
+                        DMA (Compatibility, NotBusMaster, Transfer8_16, )
+                            {4}
+                    })
+                }
+
+                Device (FWHD)
+                {
+                    Name (_HID, EisaId ("INT0800"))  // _HID: Hardware ID
+                    Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+                    {
+                        Memory32Fixed (ReadOnly,
+                            0xFF000000,         // Address Base
+                            0x01000000,         // Address Length
+                            )
+                    })
+                }
+
+                Device (HPET)
+                {
+                    Name (_HID, EisaId ("PNP0103"))  // _HID: Hardware ID
+                    Name (_CID, EisaId ("PNP0C01"))  // _CID: Compatible ID
+                    Name (_STA, 0x0F)  // _STA: Status
+                    Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+                    {
+                        IRQNoFlags ()
+                            {0}
+                        IRQNoFlags ()
+                            {8}
+                        Memory32Fixed (ReadWrite,
+                            0xFED00000,         // Address Base
+                            0x00000400,         // Address Length
+                            )
+                    })
+                }
+
+                Device (IPIC)
+                {
+                    Name (_HID, EisaId ("PNP0000"))  // _HID: Hardware ID
+                    Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+                    {
+                        IO (Decode16,
+                            0x0020,             // Range Minimum
+                            0x0020,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0024,             // Range Minimum
+                            0x0024,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0028,             // Range Minimum
+                            0x0028,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x002C,             // Range Minimum
+                            0x002C,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0030,             // Range Minimum
+                            0x0030,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0034,             // Range Minimum
+                            0x0034,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0038,             // Range Minimum
+                            0x0038,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x003C,             // Range Minimum
+                            0x003C,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00A0,             // Range Minimum
+                            0x00A0,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00A4,             // Range Minimum
+                            0x00A4,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00A8,             // Range Minimum
+                            0x00A8,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00AC,             // Range Minimum
+                            0x00AC,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00B0,             // Range Minimum
+                            0x00B0,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00B4,             // Range Minimum
+                            0x00B4,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00B8,             // Range Minimum
+                            0x00B8,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x00BC,             // Range Minimum
+                            0x00BC,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x04D0,             // Range Minimum
+                            0x04D0,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IRQNoFlags ()
+                            {2}
+                    })
+                }
+
+                Device (LDRC)
+                {
+                    Name (_HID, EisaId ("PNP0C02"))  // _HID: Hardware ID
+                    Name (_UID, 0x02)  // _UID: Unique ID
+                    Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+                    {
+                        IO (Decode16,
+                            0x002E,             // Range Minimum
+                            0x002E,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x004E,             // Range Minimum
+                            0x004E,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0061,             // Range Minimum
+                            0x0061,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0063,             // Range Minimum
+                            0x0063,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0065,             // Range Minimum
+                            0x0065,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0067,             // Range Minimum
+                            0x0067,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0070,             // Range Minimum
+                            0x0070,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0080,             // Range Minimum
+                            0x0080,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0092,             // Range Minimum
+                            0x0092,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x00B2,             // Range Minimum
+                            0x00B2,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                        IO (Decode16,
+                            0x0680,             // Range Minimum
+                            0x0680,             // Range Maximum
+                            0x01,               // Alignment
+                            0x20,               // Length
+                            )
+                        IO (Decode16,
+                            0x1000,             // Range Minimum
+                            0x1000,             // Range Maximum
+                            0x01,               // Alignment
+                            0x10,               // Length
+                            )
+                        IO (Decode16,
+                            0xFFFF,             // Range Minimum
+                            0xFFFF,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0xFFFF,             // Range Minimum
+                            0xFFFF,             // Range Maximum
+                            0x01,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0400,             // Range Minimum
+                            0x0400,             // Range Maximum
+                            0x01,               // Alignment
+                            0x54,               // Length
+                            )
+                        IO (Decode16,
+                            0x0458,             // Range Minimum
+                            0x0458,             // Range Maximum
+                            0x01,               // Alignment
+                            0x28,               // Length
+                            )
+                        IO (Decode16,
+                            0x0500,             // Range Minimum
+                            0x0500,             // Range Maximum
+                            0x01,               // Alignment
+                            0x80,               // Length
+                            )
+                        IO (Decode16,
+                            0x164E,             // Range Minimum
+                            0x164E,             // Range Maximum
+                            0x01,               // Alignment
+                            0x02,               // Length
+                            )
+                    })
+                }
+
+                Device (RTC)
+                {
+                    Name (_HID, EisaId ("PNP0B00"))  // _HID: Hardware ID
+                    Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+                    {
+                        IO (Decode16,
+                            0x0070,             // Range Minimum
+                            0x0070,             // Range Maximum
+                            0x01,               // Alignment
+                            0x08,               // Length
+                            )
+                    })
+                }
+
+                Device (TIMR)
+                {
+                    Name (_HID, EisaId ("PNP0100"))  // _HID: Hardware ID
+                    Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+                    {
+                        IO (Decode16,
+                            0x0040,             // Range Minimum
+                            0x0040,             // Range Maximum
+                            0x01,               // Alignment
+                            0x04,               // Length
+                            )
+                        IO (Decode16,
+                            0x0050,             // Range Minimum
+                            0x0050,             // Range Maximum
+                            0x10,               // Alignment
+                            0x04,               // Length
+                            )
+                    })
+                }
+
+                Device (EC)
+                {
+                    Name (_HID, EisaId ("PNP0C09"))  // _HID: Hardware ID
+                    Name (_UID, Zero)  // _UID: Unique ID
+                    Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+                    {
+                        IO (Decode16,
+                            0x0062,             // Range Minimum
+                            0x0062,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                        IO (Decode16,
+                            0x0066,             // Range Minimum
+                            0x0066,             // Range Maximum
+                            0x00,               // Alignment
+                            0x01,               // Length
+                            )
+                    })
+                    Name (_GPE, 0x18)  // _GPE: General Purpose Events
+                }
+
+                Device (MATH)
+                {
+                    Name (_HID, EisaId ("PNP0C04"))  // _HID: Hardware ID
+                    Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
+                    {
+                        IO (Decode16,
+                            0x00F0,             // Range Minimum
+                            0x00F0,             // Range Maximum
+                            0x00,               // Alignment
+                            0x10,               // Length
+                            )
+                        IRQNoFlags ()
+                            {13}
+                    })
+                }
+            }
+
+            Device (P0P1)
+            {
+                Name (_ADR, 0x001E0000)  // _ADR: Address
+                Name (_PRW, Package (0x02)  // _PRW: Power Resources for Wake
+                {
+                    0x0B, 
+                    0x04
+                })
+                Name (_PRT, Package (0x10)  // _PRT: PCI Routing Table
+                {
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        Zero, 
+                        Zero, 
+                        0x15
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        One, 
+                        Zero, 
+                        0x16
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        0x02, 
+                        Zero, 
+                        0x17
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        0x03, 
+                        Zero, 
+                        0x14
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0001FFFF, 
+                        Zero, 
+                        Zero, 
+                        0x16
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0001FFFF, 
+                        One, 
+                        Zero, 
+                        0x15
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0001FFFF, 
+                        0x02, 
+                        Zero, 
+                        0x14
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0001FFFF, 
+                        0x03, 
+                        Zero, 
+                        0x17
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0002FFFF, 
+                        Zero, 
+                        Zero, 
+                        0x12
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0002FFFF, 
+                        One, 
+                        Zero, 
+                        0x13
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0002FFFF, 
+                        0x02, 
+                        Zero, 
+                        0x11
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0002FFFF, 
+                        0x03, 
+                        Zero, 
+                        0x10
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0003FFFF, 
+                        Zero, 
+                        Zero, 
+                        0x13
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0003FFFF, 
+                        One, 
+                        Zero, 
+                        0x12
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0003FFFF, 
+                        0x02, 
+                        Zero, 
+                        0x15
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0x0003FFFF, 
+                        0x03, 
+                        Zero, 
+                        0x16
+                    }
+                })
+            }
+
+            Device (RP01)
+            {
+                Name (_ADR, 0x001C0000)  // _ADR: Address
+                Device (ARPT)
+                {
+                    Name (_ADR, Zero)  // _ADR: Address
+                    Name (_PRW, Package (0x02)  // _PRW: Power Resources for Wake
+                    {
+                        0x09, 
+                        0x04
+                    })
+                }
+
+                Name (_PRT, Package (0x04)  // _PRT: PCI Routing Table
+                {
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        Zero, 
+                        Zero, 
+                        0x10
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        One, 
+                        Zero, 
+                        0x11
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        0x02, 
+                        Zero, 
+                        0x12
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        0x03, 
+                        Zero, 
+                        0x13
+                    }
+                })
+                Alias (PW94, _PRW)
+            }
+
+            Device (RP08)
+            {
+                Name (_ADR, 0x001C0007)  // _ADR: Address
+                Name (_PRT, Package (0x04)  // _PRT: PCI Routing Table
+                {
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        Zero, 
+                        Zero, 
+                        0x13
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        One, 
+                        Zero, 
+                        0x10
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        0x02, 
+                        Zero, 
+                        0x11
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        0x03, 
+                        Zero, 
+                        0x12
+                    }
+                })
+                Alias (PW94, _PRW)
+            }
+
+            Device (PEG0)
+            {
+                Name (_ADR, 0x00010000)  // _ADR: Address
+                Name (_PRT, Package (0x04)  // _PRT: PCI Routing Table
+                {
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        Zero, 
+                        Zero, 
+                        0x10
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        One, 
+                        Zero, 
+                        0x11
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        0x02, 
+                        Zero, 
+                        0x12
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        0x03, 
+                        Zero, 
+                        0x13
+                    }
+                })
+                Alias (PW94, _PRW)
+                Device (GFX0)
+                {
+                    Name (_ADR, Zero)  // _ADR: Address
+                    OperationRegion (DGFX, PCI_Config, Zero, 0xF0)
+                    Field (DGFX, DWordAcc, Lock, Preserve)
+                    {
+                        Offset (0x0B), 
+                        LNKV,   8
+                    }
+
+                    OperationRegion (PEGH, PCI_Config, Zero, 0x40)
+                    Field (PEGH, ByteAcc, NoLock, Preserve)
+                    {
+                        VID0,   16, 
+                        DID0,   16
+                    }
+
+                    Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
+                    {
+                        If (LEqual (Arg0, Buffer (0x10)
+                                {
+                                    /* 0000 */   0xC6, 0xB7, 0xB5, 0xA0, 0x18, 0x13, 0x1C, 0x44,
+                                    /* 0008 */   0xB0, 0xC9, 0xFE, 0x69, 0x5E, 0xAF, 0x94, 0x9B
+                                }))
+                        {
+                            If (LNotEqual (And (VID0, 0xFFFF), 0xFFFF))
+                            {
+                                Store (Package (0x02)
+                                    {
+                                        "hda-gfx", 
+                                        Buffer (0x0A)
+                                        {
+                                            "onboard-2"
+                                        }
+                                    }, Local0)
+                                DTGP (Arg2, RefOf (Local0))
+                                Return (Local0)
+                            }
+                        }
+
+                        Return (0x80000002)
+                    }
+
+                    Alias (PW94, _PRW)
+                }
+
+                Device (HDAU)
+                {
+                    Name (_ADR, One)  // _ADR: Address
+                    OperationRegion (HDAH, PCI_Config, Zero, 0x40)
+                    Field (HDAH, ByteAcc, NoLock, Preserve)
+                    {
+                        VID0,   16, 
+                        DID0,   16
+                    }
+
+                    Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
+                    {
+                        If (LEqual (Arg0, Buffer (0x10)
+                                {
+                                    /* 0000 */   0xC6, 0xB7, 0xB5, 0xA0, 0x18, 0x13, 0x1C, 0x44,
+                                    /* 0008 */   0xB0, 0xC9, 0xFE, 0x69, 0x5E, 0xAF, 0x94, 0x9B
+                                }))
+                        {
+                            If (LNotEqual (And (VID0, 0xFFFF), 0xFFFF))
+                            {
+                                Store (Package (0x02)
+                                    {
+                                        "hda-gfx", 
+                                        Buffer (0x0A)
+                                        {
+                                            "onboard-2"
+                                        }
+                                    }, Local0)
+                                DTGP (Arg2, RefOf (Local0))
+                                Return (Local0)
+                            }
+                        }
+
+                        Return (0x80000002)
+                    }
+
+                    Alias (PW94, _PRW)
+                }
+            }
+
+            Device (PEG1)
+            {
+                Name (_ADR, 0x00010001)  // _ADR: Address
+                Name (_PRT, Package (0x04)  // _PRT: PCI Routing Table
+                {
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        Zero, 
+                        Zero, 
+                        0x11
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        One, 
+                        Zero, 
+                        0x12
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        0x02, 
+                        Zero, 
+                        0x13
+                    }, 
+
+                    Package (0x04)
+                    {
+                        0xFFFF, 
+                        0x03, 
+                        Zero, 
+                        0x10
+                    }
+                })
+                Alias (PW94, _PRW)
+            }
+        }
+
+        Device (PWRB)
+        {
+            Name (_HID, EisaId ("PNP0C0C"))  // _HID: Hardware ID
+            Name (_UID, 0xAA)  // _UID: Unique ID
+            Name (_STA, 0x0B)  // _STA: Status
+            Alias (PWD4, _PRW)
+        }
+
+        Device (SLPB)
+        {
+            Name (_HID, EisaId ("PNP0C0E"))  // _HID: Hardware ID
+            Name (_STA, 0x0B)  // _STA: Status
+        }
+    }
+    
+    Scope (_GPE)
+    {
+        Method (_L01, 0, NotSerialized)  // _Lxx: Level-Triggered GPE
+        {
+            Add (L01C, One, L01C)
+            P8XH (Zero, One)
+            P8XH (One, L01C)
+        }
+
+        Method (_L02, 0, NotSerialized)  // _Lxx: Level-Triggered GPE
+        {
+            Store (Zero, GPEC)
+        }
+
+        Method (_L09, 0, NotSerialized)  // _Lxx: Level-Triggered GPE
+        {
+            Notify (\_SB.PCI0.RP01, 0x02)
+            Notify (\_SB.PCI0.RP08, 0x02)
+            Notify (\_SB.PCI0.PEG0, 0x02)
+            Notify (\_SB.PCI0.PEG0.GFX0, 0x02)
+            Notify (\_SB.PCI0.PEG1, 0x02)
+        }
+
+        Method (_L0B, 0, NotSerialized)  // _Lxx: Level-Triggered GPE
+        {
+            Notify (\_SB.PCI0.P0P1, 0x02)
+        }
+
+        Method (_L0D, 0, NotSerialized)  // _Lxx: Level-Triggered GPE
+        {
+            Notify (\_SB.PCI0.EHC1, 0x02)
+            Notify (\_SB.PCI0.EHC2, 0x02)
+            Notify (\_SB.PCI0.HDEF, 0x02)
+            Notify (\_SB.PCI0.GIGE, 0x02)
+            Notify (\_SB.PCI0.XHC1, 0x02)
+            If (LAnd (\_SB.PCI0.XHC1.PMES, \_SB.PCI0.XHC1.PMES))
+            {
+                Store (One, \_SB.PCI0.XHC1.PMES)
+            }
+        }
+    }
+    
+    Method (TRAP, 2, Serialized)
+    {
+        Store (Arg1, SMIF)
+        If (LEqual (Arg0, One))
+        {
+            Store (Zero, TRP0)
+        }
+
+        If (LEqual (Arg0, 0x02))
+        {
+            Store (Arg1, DTSF)
+            Store (Zero, TRPD)
+            Return (DTSF)
+        }
+
+        If (LEqual (Arg0, 0x03))
+        {
+            Store (Zero, TRPH)
+        }
+
+        Return (SMIF)
+    }
+
+    Method (PTS, 1, NotSerialized)
+    {
+        If (Arg0)
+        {
+            \_SB.PCI0.LPCB.SPTS (Arg0)
+            \_SB.PCI0.NPTS (Arg0)
+        }
+    }
+
+    Method (WAK, 1, NotSerialized)
+    {
+        \_SB.PCI0.LPCB.SWAK (Arg0)
+        \_SB.PCI0.NWAK (Arg0)
+        \_SB.PCI0.LPCB.S1RS (Arg0)
+    }
+
+    Method (_PTS, 1, NotSerialized)  // _PTS: Prepare To Sleep
+    {
+        Store (Zero, P80D)
+        P8XH (Zero, Arg0)
+        PTS (Arg0)
+        If (And (AOAC, One)) {}
+        If (LEqual (Arg0, 0x03))
+        {
+            If (LAnd (DTSE, LGreater (TCNT, One)))
+            {
+                TRAP (0x02, 0x1E)
+            }
+        }
+
+        If (LOr (LOr (LEqual (Arg0, 0x03), LEqual (Arg0, 0x04)), LEqual (
+            Arg0, 0x05)))
+        {
+            If (LEqual (PFLV, 0x02))
+            {
+                Store (One, GP27)
+            }
+        }
+    }
+
+    Method (_WAK, 1, Serialized)  // _WAK: Wake
+    {
+        ShiftLeft (Arg0, 0x04, DBG8)
+        WAK (Arg0)
+        If (LEqual (AOAC, 0x11))
+        {
+            If (CondRefOf (ECTM))
+            {
+                Store (Zero, ECTM)
+            }
+        }
+
+        If (LOr (LEqual (Arg0, 0x03), LEqual (Arg0, 0x04)))
+        {
+            If (LAnd (DTSE, LGreater (TCNT, One)))
+            {
+                TRAP (0x02, 0x14)
+            }
+
+            If (LEqual (RP1D, Zero))
+            {
+                Notify (\_SB.PCI0.RP01, Zero)
+            }
+
+            If (LEqual (RP8D, Zero))
+            {
+                If (LEqual (DSTS, Zero))
+                {
+                    Notify (\_SB.PCI0.RP08, Zero)
+                }
+            }
+        }
+
+        If (LOr (LEqual (Arg0, 0x03), LEqual (Arg0, 0x04)))
+        {
+            \_SB.PCI0.XHC1.XWAK ()
+        }
+
+        Return (Package (0x02)
+        {
+            Zero, 
+            Zero
+        })
+    }
+
+    Name (_S0, Package (0x03)  // _S0_: S0 System State
+    {
+        Zero, 
+        Zero, 
+        Zero
+    })
+    Name (_S3, Package (0x03)  // _S3_: S3 System State
+    {
+        0x05, 
+        0x05, 
+        Zero
+    })
+    Name (_S4, Package (0x03)  // _S4_: S4 System State
+    {
+        0x06, 
+        0x06, 
+        Zero
+    })
+    Name (_S5, Package (0x03)  // _S5_: S5 System State
+    {
+        0x07, 
+        0x07, 
+        Zero
+    })
+}
+
diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-all-target-headers.hmap b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-all-target-headers.hmap
new file mode 100644
index 0000000000000000000000000000000000000000..2616108fb2a1aa8a14a9ae184fe51e8478918fe4
GIT binary patch
literal 981
zcmXR&%*|kAU|^77W?%r(4nSN6#G_y|1cpiofYPli5YM8fgB=SBa#B6>N>X#2140Ax
z%TtSd6Y~<&Q*%@EN<8z@^7RQR(92-Z4=qkDD%MX)EKAi7N-fKG%Fi#+&os6$)6dCF
eDo)JI*H11e)i24<&neaq@XaK~RDA{_>;(WO(MZey

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-generated-files.hmap b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-generated-files.hmap
new file mode 100644
index 0000000000000000000000000000000000000000..94e5e7e08429f23699b86c96e002d49bad7b06f8
GIT binary patch
literal 450
zcmb_Yy$ZrG5Kf(Z6_?&1h^w_rheA<0OWK?@kmf>us!uPbMP1|I!FLD8eLtMx<1J&1
zJt9^S>xgH>yxY8I9Dk`SiheZ@#we_`M|Eu4hVE!<uK9o?YG3IqU1V%|&!BZ^9SA-l
zoN%Io$b;POcc5hFxFqOJ08gYGH1$k^60Mw2l-zSj*+3Db5-<m`BMQkqx+E#@7E*~_
V7=AxqLY*ntK3cG3u++ilK`#Jyexm>Y

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-own-target-headers.hmap b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-own-target-headers.hmap
new file mode 100644
index 0000000000000000000000000000000000000000..9be379b0320f12ed5f81bc154ad3386cd2f1beb3
GIT binary patch
literal 981
zcmXR&%*|kAU|^77W?*0f(hfje2E?O)ybzcL)aDArAbJ$gCj>z0m+E2eSWu9Y>X}!P
zn&TW08jxR}TI8FUmzbWKo0?bRnU|KYPe_4Y27`WRacWVqeoA6ls(w&vS-w+#eu;jj
kv4xp_PG(YZVrIU6azUwnNq&A#v3`JWCNZY!GZ0}f0NTJxMgRZ+

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-project-headers.hmap b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-project-headers.hmap
new file mode 100644
index 0000000000000000000000000000000000000000..06a2f13f361cc070b52655206a11850704e87c83
GIT binary patch
literal 913
zcmXR&%*|kAU|^77W?%r(4nSN6#G`<`5CDat3J`<nQ80u<z_FkpC)G2rBsIr5AT%Jq
zJhjL-F)uMaH8(Y{#4|4~UoV3}KeRZts8~NGu`E?TD77r#DL=nNKhxO4Og|?xsW>q+
aUq88^RKFxYKc`qfz&8`9NuQ9Z`V0Vq!7g<G

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo.dep b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo.dep
new file mode 100644
index 0000000..2448927
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo.dep
@@ -0,0 +1,5 @@
+ffffffffffffffffffffffffffffffff 0a61d4086202b8aa99802dd5a07619a2 ffffffffffffffffffffffffffffffff 0 /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext
+ffffffffffffffffffffffffffffffff 4b0a69eb869f94de6761d3cbb0fc8dca ffffffffffffffffffffffffffffffff 0 /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/MacOS/AppleIntelCPUPowerManagementInfo
+00000000000ac43a000000000000e9a6 314954ecc1dd4fb7a62e8166e69d217a ffffffffffffffffffffffffffffffff 0 /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o
+00000000501047ea000000000001a941 f53fdd286d6471c23068262ffb3e025c ffffffffffffffffffffffffffffffff 0 /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o
+00000000000000000000000000000000 9a5b9dc0f3dffe1c13b61e6a2886150c ffffffffffffffffffffffffffffffff 0 /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/Info.plist
diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo.hmap b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo.hmap
new file mode 100644
index 0000000000000000000000000000000000000000..8394b61f2c2fbde0a796b58c3f20c139dd58a0ab
GIT binary patch
literal 2078
zcmeHH!3x4K4DCSt27kfJauCF;x{HD^l%1v9qAPUEXuEm!3;ap{L(BxhTSWvx7D!V{
z9(j2Qtz}sRLWt2&hylkl`;EP~&lI?_m>2dg_SP%#szAUyG3JMUHC|Qu&Apq!zszFI
z&3ygOnb)<(Rpn4G<0PgNnvJaF5lgJxsyfhK@eyVM5{t${E?a~xwzME}peC~^Xq8&2
z2(r2XN2D#pn+^mK8r5PRNhiTq1{RIdIdnu!iMf&vtrrxg4^V_@b9_JfL25^h$+(2@
X67wZI1@h(j2^OD->@Dl<Ff7C!9s9^i

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c
new file mode 100644
index 0000000..d3c9c40
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c
@@ -0,0 +1,9 @@
+#include <mach/mach_types.h>
+ 
+extern kern_return_t _start(kmod_info_t *ki, void *data);
+extern kern_return_t _stop(kmod_info_t *ki, void *data);
+ 
+__attribute__((visibility("default"))) KMOD_EXPLICIT_DECL(com.apple.kext.AppleIntelCPUPowerManagementInfo, "1.0.0d1", _start, _stop)
+__private_extern__ kmod_start_func_t *_realmain = 0;
+__private_extern__ kmod_stop_func_t *_antimain = 0;
+__private_extern__ int _kext_apple_cc = __APPLE_CC__ ;
diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.LinkFileList b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.LinkFileList
new file mode 100644
index 0000000..569a184
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.LinkFileList
@@ -0,0 +1 @@
+/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o
diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.d b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.d
new file mode 100644
index 0000000..74eeadd
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.d
@@ -0,0 +1,178 @@
+dependencies: \
+  /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp \
+  /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOLib.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/stdarg.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/cdefs.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/appleapiopts.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/system.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/message.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/port.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/boolean.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/boolean.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/boolean.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/vm_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/vm_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/vm_param.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/kern_return.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/kern_return.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/kern_return.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_statistics.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/time_value.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_notify.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_special_ports.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/memory_object_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_prot.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_sync.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/exception_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/exception.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/exception.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_status.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/thread_status.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/thread_status.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/_structs.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/fp_reg.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/thread_state.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/eflags.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/thread_state.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/processor_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/processor_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/processor_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/policy.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/Availability.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/AvailabilityInternal.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task_policy.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task_special_ports.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_policy.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_special_ports.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/clock_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_attributes.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_inherit.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_purgable.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_behavior.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_region.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/vm_param.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/kmod.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_param.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/std_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_interface.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/clock.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/string.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/endian.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/endian.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/_endian.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/_OSByteOrder.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/i386/_OSByteOrder.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/_structs.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/ndr.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/OSByteOrder.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/i386/OSByteOrder.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/notify.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mig_errors.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mig.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/clock_priv.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/clock_reply_server.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/exc_server.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_priv.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/mach_debug_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/ipc_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/vm_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/zone_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/page_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/hash_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/lockgroup_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_security.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/lock_set.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_exc_server.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_host.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_port.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/notify_server.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/processor.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/processor_set.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/semaphore.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/sync_policy.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_act.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_map.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/assert.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/assert.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/macro_help.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/kern_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/thread.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/debug.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/task.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/sched_prim.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/clock.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_time.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/locks.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/locks.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/locks.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/queue.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/ipc_mig.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/libkern.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOReturn.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/error.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOTypes.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/stdbool.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/OSTypes.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/OSBase.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/device/device_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOLocks.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/locks.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/machine_routines.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/machine_routines.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/pexpert/pexpert.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOInterrupts.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/pexpert/boot.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/pexpert/machine/boot.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/pexpert/i386/boot.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/OSAtomic.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/thread_call.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOService.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IORegistryEntry.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSContainers.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSObject.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSMetaClass.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/OSReturn.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/TargetConditionals.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSBoolean.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSString.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSSymbol.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSData.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSNumber.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSArray.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSCollection.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSSet.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSOrderedSet.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSCollectionIterator.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSIterator.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSDictionary.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSSerialize.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSUnserialize.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IODeviceMemory.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOMemoryDescriptor.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IONotifier.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOKitDebug.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/pwr_mgt/IOPMpowerState.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/pwr_mgt/IOPM.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOMessage.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOServicePM.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOWorkLoop.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOTimerEventSource.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOEventSource.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/cpuid.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/proc_reg.h \
+  /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/../../../essentials.h
diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.dia b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.dia
new file mode 100644
index 0000000000000000000000000000000000000000..bb0ec51b2047b4a032afb5d9dd79a4d1afd74885
GIT binary patch
literal 220
zcmZ?qbaZFrVPG&|U|`^8N@2Rl_0)m?;RZ&|oP{z^66G#El)aPa*x<n<pdrR`lBG%H
zlA_GHL}#T5PF5|4EtfP|&p2$I<Ixs5p}lZIYe7MKu|_+uhauNP2mW;ed~XBzq=g__
z4vO3WYfPHqWVONBa)*<}7H7*G1HNDn_8Je?st5s<Al8%)Aq^I;MyDwnjgGEj96U`S
zFB>!(ofZgaxNwRvwK^zHa+q>pfe|m5cVIyjKUCNYr~;_Zkx>!o4<?{LfD{-20RLJ+
AR{#J2

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o
new file mode 100644
index 0000000000000000000000000000000000000000..d0871ee510e513438d47939f1bf10bf33d7374e9
GIT binary patch
literal 131408
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
OI}%V~Q;ncPq5ls>Y%}Ko

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.d b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.d
new file mode 100644
index 0000000..27e90c5
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.d
@@ -0,0 +1,63 @@
+dependencies: \
+  /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/cdefs.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/message.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/port.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/boolean.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/boolean.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/boolean.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/vm_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/vm_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/vm_param.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/kern_return.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/kern_return.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/kern_return.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/appleapiopts.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_statistics.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/time_value.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_notify.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_special_ports.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/memory_object_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_prot.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_sync.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/exception_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/exception.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/exception.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_status.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/thread_status.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/thread_status.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/_structs.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/fp_reg.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/thread_state.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/eflags.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/thread_state.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/processor_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/processor_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/processor_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/policy.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/Availability.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/AvailabilityInternal.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task_policy.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task_special_ports.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_info.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_policy.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_special_ports.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/clock_types.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_attributes.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_inherit.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_purgable.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_behavior.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_region.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/vm_param.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/kmod.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_param.h \
+  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/std_types.h
diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.dia b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.dia
new file mode 100644
index 0000000000000000000000000000000000000000..bb0ec51b2047b4a032afb5d9dd79a4d1afd74885
GIT binary patch
literal 220
zcmZ?qbaZFrVPG&|U|`^8N@2Rl_0)m?;RZ&|oP{z^66G#El)aPa*x<n<pdrR`lBG%H
zlA_GHL}#T5PF5|4EtfP|&p2$I<Ixs5p}lZIYe7MKu|_+uhauNP2mW;ed~XBzq=g__
z4vO3WYfPHqWVONBa)*<}7H7*G1HNDn_8Je?st5s<Al8%)Aq^I;MyDwnjgGEj96U`S
zFB>!(ofZgaxNwRvwK^zHa+q>pfe|m5cVIyjKUCNYr~;_Zkx>!o4<?{LfD{-20RLJ+
AR{#J2

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o
new file mode 100644
index 0000000000000000000000000000000000000000..c55ec6cbfd9b20144f2fab92c178c9a06d194598
GIT binary patch
literal 5076
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
E02x?UMF0Q*

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/build-state.dat b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/build-state.dat
new file mode 100644
index 0000000..1490c37
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/build-state.dat
@@ -0,0 +1,996 @@
+TAppleIntelCPUPowerManagementInfo
+v5
+r1
+cCheck dependencies
+cProcessInfoPlistFile /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/Info.plist AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
+cCompileC DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler
+cCompileC DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler
+cLd /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/MacOS/AppleIntelCPUPowerManagementInfo normal x86_64
+cTouch /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk
+c00000000510D0CDA00000000000000AA
+t1359809754
+s170
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/Availability.h
+c00000000501047EA0000000000001B50
+t1343244266
+s6992
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/AvailabilityInternal.h
+c00000000501047EA000000000001E923
+t1343244266
+s125219
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IODeviceMemory.h
+c00000000501047EA0000000000001287
+t1343244266
+s4743
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOEventSource.h
+c00000000501047EA0000000000002991
+t1343244266
+s10641
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOInterrupts.h
+c00000000501047EA00000000000007AA
+t1343244266
+s1962
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOKitDebug.h
+c00000000501047EA00000000000012D3
+t1343244266
+s4819
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOLib.h
+c00000000501047EA0000000000004C71
+t1343244266
+s19569
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOLocks.h
+c00000000501047EA00000000000045C6
+t1343244266
+s17862
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOMemoryDescriptor.h
+c00000000505CB8B3000000000000BF23
+t1348253875
+s48931
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOMessage.h
+c00000000501047EA000000000000250D
+t1343244266
+s9485
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IONotifier.h
+c00000000501047EA0000000000000CC1
+t1343244266
+s3265
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IORegistryEntry.h
+c00000000501047EA0000000000010602
+t1343244266
+s67074
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOReturn.h
+c00000000501047EA0000000000001D9C
+t1343244266
+s7580
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOService.h
+c00000000501047EA000000000001F776
+t1343244266
+s128886
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOServicePM.h
+c00000000501047EA0000000000000652
+t1343244266
+s1618
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOTimerEventSource.h
+c00000000501047EA0000000000002A4C
+t1343244266
+s10828
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOTypes.h
+c00000000501047EA0000000000001759
+t1343244266
+s5977
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOWorkLoop.h
+c00000000501047EA0000000000003B4C
+t1343244266
+s15180
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/assert.h
+c00000000501047EA00000000000006CC
+t1343244266
+s1740
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/pwr_mgt/IOPM.h
+c00000000505CB8B30000000000008B53
+t1348253875
+s35667
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/pwr_mgt/IOPMpowerState.h
+c00000000501047EA0000000000000EB0
+t1343244266
+s3760
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/IOKit/system.h
+c00000000501047EA000000000000085B
+t1343244266
+s2139
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/TargetConditionals.h
+c00000000501047EC00000000000031E9
+t1343244268
+s12777
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/device/device_types.h
+c00000000501047EA0000000000000F5E
+t1343244266
+s3934
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/_types.h
+c00000000501047EA0000000000001197
+t1343244266
+s4503
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/cpuid.h
+c00000000501047EA00000000000034DA
+t1343244266
+s13530
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/eflags.h
+c00000000501047EA0000000000000E1E
+t1343244266
+s3614
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/endian.h
+c00000000501047EA0000000000001031
+t1343244266
+s4145
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/locks.h
+c00000000501047EA0000000000000666
+t1343244266
+s1638
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/machine_routines.h
+c00000000501047EA00000000000008A0
+t1343244266
+s2208
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/proc_reg.h
+c00000000501047EA00000000000046F7
+t1343244266
+s18167
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/i386/types.h
+c00000000501047EA00000000000018BD
+t1343244266
+s6333
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/assert.h
+c00000000501047EA0000000000000C13
+t1343244266
+s3091
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/clock.h
+c00000000501047EA0000000000000C0C
+t1343244266
+s3084
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/debug.h
+c00000000501047EA000000000000104A
+t1343244266
+s4170
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/ipc_mig.h
+c00000000501047EA00000000000008AA
+t1343244266
+s2218
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/kern_types.h
+c00000000501047EA00000000000009EA
+t1343244266
+s2538
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/locks.h
+c00000000501047EA0000000000001B86
+t1343244266
+s7046
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/macro_help.h
+c00000000501047EA0000000000000B23
+t1343244266
+s2851
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/queue.h
+c00000000501047EA0000000000003B1C
+t1343244266
+s15132
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/sched_prim.h
+c00000000501047EA000000000000109A
+t1343244266
+s4250
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/task.h
+c00000000501047EA0000000000001007
+t1343244266
+s4103
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/thread.h
+c00000000501047EA00000000000013A4
+t1343244266
+s5028
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/kern/thread_call.h
+c00000000501047EA0000000000002522
+t1343244266
+s9506
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/OSAtomic.h
+c00000000501047EA000000000000662A
+t1343244266
+s26154
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/OSBase.h
+c00000000501047EA000000000000063D
+t1343244266
+s1597
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/OSByteOrder.h
+c00000000501047EA0000000000002938
+t1343244266
+s10552
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/OSReturn.h
+c00000000501047EA000000000000189B
+t1343244266
+s6299
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/OSTypes.h
+c00000000501047EA0000000000000E59
+t1343244266
+s3673
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/_OSByteOrder.h
+c00000000501047EA00000000000010FF
+t1343244266
+s4351
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSArray.h
+c00000000501047EA0000000000005BEE
+t1343244266
+s23534
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSBoolean.h
+c00000000501047EA0000000000001E3A
+t1343244266
+s7738
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSCollection.h
+c00000000501047EA0000000000003885
+t1343244266
+s14469
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSCollectionIterator.h
+c00000000501047EA000000000000191A
+t1343244266
+s6426
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSContainers.h
+c00000000501047EA000000000000079F
+t1343244266
+s1951
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSData.h
+c00000000501047EA00000000000058EA
+t1343244266
+s22762
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSDictionary.h
+c00000000501047EA000000000000791E
+t1343244266
+s31006
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSIterator.h
+c00000000501047EA00000000000010F2
+t1343244266
+s4338
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSMetaClass.h
+c00000000501047EA0000000000010F15
+t1343244266
+s69397
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSNumber.h
+c00000000501047EA0000000000003218
+t1343244266
+s12824
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSObject.h
+c00000000501047EA0000000000003950
+t1343244266
+s14672
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSOrderedSet.h
+c00000000501047EA0000000000006595
+t1343244266
+s26005
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSSerialize.h
+c00000000501047EA0000000000002633
+t1343244266
+s9779
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSSet.h
+c00000000501047EA00000000000063F0
+t1343244266
+s25584
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSString.h
+c00000000501047EA000000000000345F
+t1343244266
+s13407
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSSymbol.h
+c00000000501047EA0000000000002F5E
+t1343244266
+s12126
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/c++/OSUnserialize.h
+c00000000501047EA0000000000000A1E
+t1343244266
+s2590
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/i386/OSByteOrder.h
+c00000000501047EA0000000000000B8D
+t1343244266
+s2957
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/i386/_OSByteOrder.h
+c00000000501047EA0000000000000AA7
+t1343244266
+s2727
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/libkern.h
+c00000000501047EA0000000000001C53
+t1343244266
+s7251
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/libkern/locks.h
+c00000000501047EA00000000000005D7
+t1343244266
+s1495
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/boolean.h
+c00000000501047EA0000000000000B08
+t1343244266
+s2824
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/clock.h
+c00000000501047EA000000000000147C
+t1343244266
+s5244
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/clock_priv.h
+c00000000501047EA0000000000001110
+t1343244266
+s4368
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/clock_reply_server.h
+c00000000501047EA0000000000000E53
+t1343244266
+s3667
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/clock_types.h
+c00000000501047EA0000000000001019
+t1343244266
+s4121
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/error.h
+c00000000501047EA0000000000000F22
+t1343244266
+s3874
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/exc_server.h
+c00000000501047EA00000000000019A7
+t1343244266
+s6567
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/exception_types.h
+c00000000501047EA0000000000001913
+t1343244266
+s6419
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_info.h
+c00000000501047EA0000000000001FD7
+t1343244266
+s8151
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_notify.h
+c00000000501047EA0000000000000608
+t1343244266
+s1544
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_priv.h
+c00000000501047EA0000000000006CFA
+t1343244266
+s27898
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_security.h
+c00000000501047EA000000000000152D
+t1343244266
+s5421
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/host_special_ports.h
+c00000000501047EA0000000000001C61
+t1343244266
+s7265
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/_structs.h
+c00000000501047EA00000000000062D1
+t1343244266
+s25297
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/boolean.h
+c00000000501047EA0000000000000A1C
+t1343244266
+s2588
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/exception.h
+c00000000501047EA00000000000010EE
+t1343244266
+s4334
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/fp_reg.h
+c00000000501047EA00000000000011B3
+t1343244266
+s4531
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/kern_return.h
+c00000000501047EA0000000000000AAC
+t1343244266
+s2732
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/processor_info.h
+c00000000501047EA000000000000061C
+t1343244266
+s1564
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/thread_state.h
+c00000000501047EA00000000000006AC
+t1343244266
+s1708
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/thread_status.h
+c00000000501047EA0000000000002745
+t1343244266
+s10053
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/vm_param.h
+c00000000501047EA0000000000001727
+t1343244266
+s5927
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/i386/vm_types.h
+c00000000501047EA0000000000001266
+t1343244266
+s4710
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/kern_return.h
+c00000000501047EA00000000000023B2
+t1343244266
+s9138
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/kmod.h
+c00000000501047EA0000000000001A2E
+t1343244266
+s6702
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/lock_set.h
+c00000000501047EA0000000000001B1A
+t1343244266
+s6938
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_exc_server.h
+c00000000501047EA0000000000001ABE
+t1343244266
+s6846
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_host.h
+c00000000501047EA0000000000005294
+t1343244266
+s21140
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_interface.h
+c00000000501047EA0000000000000782
+t1343244266
+s1922
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_port.h
+c00000000501047EA00000000000077E0
+t1343244266
+s30688
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_time.h
+c00000000501047EA00000000000006C3
+t1343244266
+s1731
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mach_types.h
+c00000000501047EA0000000000002059
+t1343244266
+s8281
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine.h
+c00000000501047EA0000000000003085
+t1343244266
+s12421
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/boolean.h
+c00000000501047EA000000000000064E
+t1343244266
+s1614
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/exception.h
+c00000000501047EA0000000000000658
+t1343244266
+s1624
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/kern_return.h
+c00000000501047EA0000000000000662
+t1343244266
+s1634
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/processor_info.h
+c00000000501047EA0000000000000671
+t1343244266
+s1649
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/thread_state.h
+c00000000501047EA0000000000000667
+t1343244266
+s1639
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/thread_status.h
+c00000000501047EA000000000000066C
+t1343244266
+s1644
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/vm_param.h
+c00000000501047EA0000000000000653
+t1343244266
+s1619
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/machine/vm_types.h
+c00000000501047EA0000000000000653
+t1343244266
+s1619
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/memory_object_types.h
+c00000000501047EA0000000000003997
+t1343244266
+s14743
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/message.h
+c00000000501047EA0000000000006311
+t1343244266
+s25361
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mig.h
+c00000000501047EA000000000000150D
+t1343244266
+s5389
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/mig_errors.h
+c00000000501047EA0000000000001192
+t1343244266
+s4498
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/ndr.h
+c00000000501047EA00000000000019EC
+t1343244266
+s6636
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/notify.h
+c00000000501047EA00000000000013EC
+t1343244266
+s5100
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/notify_server.h
+c00000000501047EA0000000000001AB5
+t1343244266
+s6837
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/policy.h
+c00000000501047EA0000000000001BCF
+t1343244266
+s7119
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/port.h
+c00000000501047EA0000000000003264
+t1343244266
+s12900
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/processor.h
+c00000000501047EA0000000000001E9E
+t1343244266
+s7838
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/processor_info.h
+c00000000501047EA00000000000016A8
+t1343244266
+s5800
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/processor_set.h
+c00000000501047EA0000000000003005
+t1343244266
+s12293
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/semaphore.h
+c00000000501047EA00000000000009EC
+t1343244266
+s2540
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/std_types.h
+c00000000501047EA0000000000000A85
+t1343244266
+s2693
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/sync_policy.h
+c00000000501047EA0000000000000704
+t1343244266
+s1796
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task.h
+c00000000501047EA0000000000008BC5
+t1343244266
+s35781
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task_info.h
+c00000000501047EA00000000000033B3
+t1343244266
+s13235
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task_policy.h
+c00000000501047EA00000000000010C1
+t1343244266
+s4289
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/task_special_ports.h
+c00000000501047EA0000000000001072
+t1343244266
+s4210
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_act.h
+c00000000501047EA0000000000006436
+t1343244266
+s25654
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_info.h
+c00000000501047EA0000000000001566
+t1343244266
+s5478
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_policy.h
+c00000000501047EA0000000000001CDD
+t1343244266
+s7389
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_special_ports.h
+c00000000501047EA0000000000000C35
+t1343244266
+s3125
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/thread_status.h
+c00000000501047EA0000000000000DA4
+t1343244266
+s3492
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/time_value.h
+c00000000501047EA0000000000000D00
+t1343244266
+s3328
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_attributes.h
+c00000000501047EA0000000000000E52
+t1343244266
+s3666
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_behavior.h
+c00000000501047EA0000000000000B62
+t1343244266
+s2914
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_inherit.h
+c00000000501047EA0000000000000C84
+t1343244266
+s3204
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_map.h
+c00000000501047EA000000000000721E
+t1343244266
+s29214
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_param.h
+c00000000501047EA0000000000002223
+t1343244266
+s8739
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_prot.h
+c00000000501047EA0000000000001211
+t1343244266
+s4625
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_purgable.h
+c00000000501047EA00000000000016F0
+t1343244266
+s5872
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_region.h
+c00000000501047EA0000000000002DFD
+t1343244266
+s11773
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_statistics.h
+c00000000501047EA0000000000003238
+t1343244266
+s12856
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_sync.h
+c00000000501047EA0000000000000BD5
+t1343244266
+s3029
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach/vm_types.h
+c00000000501047EA0000000000000C02
+t1343244266
+s3074
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/hash_info.h
+c00000000501047EA0000000000000AE6
+t1343244266
+s2790
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/ipc_info.h
+c00000000501047EA0000000000000F87
+t1343244266
+s3975
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/lockgroup_info.h
+c00000000501047EA00000000000009BB
+t1343244266
+s2491
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/mach_debug_types.h
+c00000000501047EA0000000000000B14
+t1343244266
+s2836
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/page_info.h
+c00000000501047EA0000000000000A18
+t1343244266
+s2584
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/vm_info.h
+c00000000501047EA00000000000016C7
+t1343244266
+s5831
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/mach_debug/zone_info.h
+c00000000501047EA00000000000013E9
+t1343244266
+s5097
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/_types.h
+c00000000501047EA000000000000063B
+t1343244266
+s1595
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/endian.h
+c00000000501047EA000000000000067D
+t1343244266
+s1661
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/locks.h
+c00000000501047EA000000000000062B
+t1343244266
+s1579
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/machine_routines.h
+c00000000501047EA000000000000065E
+t1343244266
+s1630
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/machine/types.h
+c00000000501047EA0000000000000678
+t1343244266
+s1656
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/pexpert/boot.h
+c00000000501047EA00000000000005AA
+t1343244266
+s1450
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/pexpert/i386/boot.h
+c00000000501047EA0000000000001628
+t1343244266
+s5672
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/pexpert/machine/boot.h
+c00000000501047EA000000000000064A
+t1343244266
+s1610
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/pexpert/pexpert.h
+c00000000501047EA0000000000001ECE
+t1343244266
+s7886
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/stdarg.h
+c00000000501047EA00000000000007CD
+t1343244266
+s1997
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/stdbool.h
+c00000000501047EA00000000000006D8
+t1343244266
+s1752
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/stdint.h
+c00000000501047EA0000000000001A29
+t1343244266
+s6697
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/string.h
+c00000000501047EA0000000000000C73
+t1343244266
+s3187
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/_endian.h
+c00000000501047EA000000000000165C
+t1343244266
+s5724
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/_structs.h
+c00000000501047EA0000000000002AAE
+t1343244266
+s10926
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/_types.h
+c00000000501047EA00000000000018AC
+t1343244266
+s6316
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/appleapiopts.h
+c00000000501047EA0000000000000816
+t1343244266
+s2070
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/cdefs.h
+c00000000501047EA0000000000004975
+t1343244266
+s18805
+
+N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers/sys/types.h
+c00000000501047EA0000000000002905
+t1343244266
+s10501
+
+N/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/../../../essentials.h
+c000000005131D4050000000000001533
+t1362220037
+s5427
+
+N/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+c00000000513B103900000000000025A0
+t1362825273
+s9632
+i"AppleIntelCPUPowerManagementInfo.h"
+
+N/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+c00000000513B1039000000000000066C
+t1362825273
+s1644
+
+N/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c
+c00000000513B10A400000000000001B9
+t1362825380
+s441
+
+N/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.LinkFileList
+c00000000513B10A40000000000000101
+t1362825380
+s257
+
+N/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o
+t2
+s0
+
+N/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o
+t2
+s0
+
+N/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext
+t2
+s0
+
+N/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/Info.plist
+t2
+s0
+
+N/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/MacOS/AppleIntelCPUPowerManagementInfo
+t2
+s0
+
+NAppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
+c000000005131D4050000000000000652
+t1362220037
+s1618
+
+CBuild AST from /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+r0
+
+CCheck dependencies
+r0
+lSLF05#21%IDEActivityLogSection1@2#32"com.apple.dt.IDE.BuildLogSection18"Check dependencies5fb53e2448ebb641^56d8402448ebb641^---0#1#0#--18"Check dependencies36"4BBBCCFD-71FD-4E14-BB47-E3A68AE10C87-
+
+CCompileC DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler
+s384518180.271168
+e384518180.386185
+r1
+xCompileC
+xDerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o
+x/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+xnormal
+xx86_64
+xc++
+xcom.apple.compilers.llvm.clang.1_0.compiler
+lSLF05#21%IDEActivityLogSection1@2#32"com.apple.dt.IDE.BuildLogSection128"Compile /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cppa393452448ebb641^a0dc622448ebb641^---0#0#0#-19%DVTDocumentLocation2@136"file://localhost/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp0000000000000000^4669"CompileC DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler
    cd /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo
    setenv LANG en_US.US-ASCII
    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c++ -arch x86_64 -fmessage-length=0 -nostdinc -fno-builtin -Wno-trigraphs -fno-exceptions -fno-rtti -msoft-float -Os -fno-common -mkernel -Wno-missing-field-initializers -Wno-missing-prototypes -Wreturn-type -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wformat -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-empty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wenum-conversion -Wshorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -DDEBUG -DKERNEL -DKERNEL_PRIVATE -DDRIVER_PRIVATE -DAPPLE -DNeXT -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -fapple-kext -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -mmacosx-version-min=10.8 -g -Wno-sign-conversion -iquote /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-generated-files.hmap -I/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-own-target-headers.hmap -I/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-all-target-headers.hmap -iquote /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-project-headers.hmap -I/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/System/Library/Frameworks/Kernel.framework/PrivateHeaders -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers -I/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/x86_64 -I/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources -F/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug -MMD -MT dependencies -MF /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.d --serialize-diagnostics /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.dia -c /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp -o /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.o
36"F635FAD4-0E31-4C90-B178-F5F53333FC8B-
+
+CCompileC DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler
+s384518180.271157
+e384518180.291712
+r1
+xCompileC
+xDerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o
+x/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c
+xnormal
+xx86_64
+xc
+xcom.apple.compilers.llvm.clang.1_0.compiler
+lSLF05#21%IDEActivityLogSection1@2#32"com.apple.dt.IDE.BuildLogSection262"Compile /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c5f7c452448ebb641^43ac4a2448ebb641^---0#0#0#-19%DVTDocumentLocation2@270"file://localhost/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c0000000000000000^4815"CompileC DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c normal x86_64 c com.apple.compilers.llvm.clang.1_0.compiler
    cd /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo
    setenv LANG en_US.US-ASCII
    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c -arch x86_64 -fmessage-length=0 -nostdinc -fno-builtin -Wno-trigraphs -msoft-float -Os -fno-common -mkernel -Wno-missing-field-initializers -Wno-missing-prototypes -Wreturn-type -Wformat -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-empty-body -Wuninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wconstant-conversion -Wint-conversion -Wenum-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -DDEBUG -DKERNEL -DKERNEL_PRIVATE -DDRIVER_PRIVATE -DAPPLE -DNeXT -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -mmacosx-version-min=10.8 -g -Wno-sign-conversion -iquote /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-generated-files.hmap -I/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-own-target-headers.hmap -I/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-all-target-headers.hmap -iquote /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/AppleIntelCPUPowerManagementInfo-project-headers.hmap -I/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/System/Library/Frameworks/Kernel.framework/PrivateHeaders -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Kernel.framework/Headers -I/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/x86_64 -I/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources -F/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug -MMD -MT dependencies -MF /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.d --serialize-diagnostics /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.dia -c /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/DerivedSources/AppleIntelCPUPowerManagementInfo_info.c -o /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o
36"8C3C8E36-9716-4A76-A07E-9F25E38F513C-
+
+CLd /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/MacOS/AppleIntelCPUPowerManagementInfo normal x86_64
+s384518180.392332
+e384518180.403175
+r1
+xLd
+x/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/MacOS/AppleIntelCPUPowerManagementInfo
+xnormal
+xx86_64
+lSLF05#21%IDEActivityLogSection1@2#32"com.apple.dt.IDE.BuildLogSection207"Link /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/MacOS/AppleIntelCPUPowerManagementInfo187a642448ebb641^3736672448ebb641^---0#0#0#--1551"Ld DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/MacOS/AppleIntelCPUPowerManagementInfo normal x86_64
    cd /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo
    setenv MACOSX_DEPLOYMENT_TARGET 10.8
    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -arch x86_64 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -L/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug -F/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug -filelist /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo.LinkFileList -mmacosx-version-min=10.8 -Xlinker -kext -nostdlib -lkmodc++ /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Intermediates/AppleIntelCPUPowerManagementInfo.build/Debug/AppleIntelCPUPowerManagementInfo.build/Objects-normal/x86_64/AppleIntelCPUPowerManagementInfo_info.o -lkmod -lcc_kext -o /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/MacOS/AppleIntelCPUPowerManagementInfo
36"2202B136-B2BE-467F-B634-E73E67DD3F6B-
+
+CProcessInfoPlistFile /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/Info.plist AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
+s384518180.257482
+e384518180.259892
+r1
+xProcessInfoPlistFile
+x/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/Info.plist
+xAppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
+lSLF05#21%IDEActivityLogSection1@2#32"com.apple.dt.IDE.BuildLogSection84"Process AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plistc3f4412448ebb641^0588422448ebb641^---0#0#0#-19%DVTDocumentLocation2@143"file://localhost/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist0000000000000000^602"ProcessInfoPlistFile DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/Info.plist AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
    cd /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo
    builtin-infoPlistUtility AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist -expandbuildsettings -platform macosx -o /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext/Contents/Info.plist
36"BCBA7FDC-11DE-4A8B-A76F-66D11EE98742-
+
+CTouch /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext
+s384518180.411069
+e384518180.415237
+r1
+xTouch
+x/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext
+lSLF05#21%IDEActivityLogSection1@2#32"com.apple.dt.IDE.BuildLogSection160"Touch /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext5b43692448ebb641^c74c6a2448ebb641^---0#0#0#--345"Touch DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext
    cd /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo
    /usr/bin/touch -c /Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Build/Products/Debug/AppleIntelCPUPowerManagementInfo.kext
36"1020B3C7-5E5E-40D6-B89C-B816F744FFDC-
+
diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Build/AC062B99-9E9E-41C9-966B-1B327D5EC5DC.xcactivitylog b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Build/AC062B99-9E9E-41C9-966B-1B327D5EC5DC.xcactivitylog
new file mode 100644
index 0000000000000000000000000000000000000000..07a4dab99e208bcf21389452bd9b17d06b86a2fc
GIT binary patch
literal 2039
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
V?orffN@+&3{{#F_obBT|001fe;@JQI

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Build/Cache.db b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Build/Cache.db
new file mode 100644
index 0000000000000000000000000000000000000000..2375615689dec9baac0dda6ae1210f59551c2003
GIT binary patch
literal 950
zcmchT&1(}u7{+%dt*!QJO{>=LG)Wt4owDEAs1#;rHyW(cHjP+4gf$t{h0X4|nN$j1
z{R6y-UPQs01yOqNs$M*bP()8&^&oh&C~mj3=&fFSFYm)MFVDkot_QBuVuJ7vzyz9i
z{YI<G^U*5$Vbf-pY1ndn?|nz-uCDI=*%MVhtIMh>Nkth6nk66wn>xalgpr075lci+
zCCP}+^15IZMO{Ryffc0WbqQffm60MS#3F`a<#lBvO)@pTC`yRnf{GMFE}{Zfib$6U
zQ4FHw1x=35FcCD#C=^h^Dp*JnNu)H*K%yZ_c~iBBYLd0xdwP2N`Um*E$-%*)eN}#l
zIZaw-cF1Ubj@JCJ?s$!D+Yf?2?5lOZX*=HhazHE0VJ=;0IStQd?T}XaWZkc|o77_)
z&t(?IF$0TEV{w`;Q8%h!?N$b_e(rht<8C<?D;E}qs(kKB&9BqRl4;=@bCw*oJnc8k
z?WRei?YQ;Gs`6v8OyMAKX~|>MB{P*7{}v4|+MeB@8|5YMhF>}BIquYKdF{aP!9$0S
z96feCH8PUUY(xD&)-UIK(MJ%mMgogJ|B02j)b@7DYHhKOj-_(BbSAFse@&jpVt`-2
zx8vX2N*X_znwUtRiUYD|#xHG(;K7p}C(V}mPOh8l<C5GcH_27F+uURBE%$-@2D(5J
z41+YtgA$kn*T5aH0$zYs@CJMW-@z}~0sCPFs&ERPgE!%Q_z*sV&)`e=3Vwy_iH<~H
SLQCjeJP>T|sNt_koc;|81tX~d

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Issues/8BE2DAD6-DF4F-4F8E-9FCF-211E10D22EAE.xcactivitylog b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Issues/8BE2DAD6-DF4F-4F8E-9FCF-211E10D22EAE.xcactivitylog
new file mode 100644
index 0000000000000000000000000000000000000000..b0088af8a174dea1247116986e752ed727284163
GIT binary patch
literal 1970
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
E04Su=lK=n!

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Issues/Cache.db b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/Logs/Issues/Cache.db
new file mode 100644
index 0000000000000000000000000000000000000000..538b23a57b2d12e48dfaf318a10b318c96ac9ea5
GIT binary patch
literal 707
zcmchTPixdb7{+I!)vmS8w8sBdiWWR&NwV9TfG%V=2`*G@-L6<KA)8E-kx3>@W_P=O
z1Ho_Lw@~mKcvuj`KOlJW;6=Q76FiviuEm=-=kmNf^W%M=_wD7B6hhNJK<U`=E33Pd
z#f6VhDIVi#ARb^|5SIB!&N(hHAK-g5+A5*<b0<!o^U=E5bPdOLHdV)~durV?UDfhh
zo@(g2t80#7xVBqjx>?gr*VNROTPrcMW~kPN=BTbyZ#qtMbE9=r`!ruUwQzcINk+>n
zXOy!(QUpnHM+98p=spe^k4P3D*(}fhvL8h(4M?^-%5hf^LGfNe;w%t-j(xNev9O=w
zOdNi91fR5#6A~v|cz|g+LiCI4_N(uA)*COAX+dBA@{#p0WD%~m9oG&884xilcXy5^
zRm*HK7S)`ys2>Vdl<jApkJM(L&}eOntl4=^aXS;3wzj+5Y>4^YAPZuAn5v!aGaudl
z7orBe(J;+p8q#4h>_waw34eSrI7rEpuzM>bw6W9qbHwu(mM>mXE>Ct@8dt1IAuqle
z|L<TsE}E-=c_0G?+yEA601Tdi=imhxgOA`d_zHf)1*pJPxCfuYF?<W(!7uO|{2^VF
UdQv3qgUOTNRKeAm&P0lT15d`|*8l(j

literal 0
HcmV?d00001

diff --git a/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/info.plist b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/info.plist
new file mode 100644
index 0000000..cfcf71f
--- /dev/null
+++ b/i386/libsaio/cpu/tools/PMinfo/DerivedData/AppleIntelCPUPowerManagementInfo/info.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>WorkspacePath</key>
+	<string>/Users/dave/RevoBoot/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj</string>
+</dict>
+</plist>

From 9bce98433d703157b3dab60250f2857dd216f480 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 31 Mar 2013 10:12:11 +0200
Subject: [PATCH 351/623] Fixed index

/Extra/ACPI/SSDT_USB.aml wouldn't load.
---
 i386/libsaio/acpi/patcher.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 52e1503..479f0e5 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -503,7 +503,7 @@ void setupACPI(void)
 		int newTableEntries = 0;
 
 		// Now wade through the custom table entries to see if they have been assigned already.
-		for (cti = 0; cti < 13; cti++)
+		for (cti = 0; cti < 14; cti++)
 		{
 			// We need an address so check it.
 			if (customTables[cti].table)

From 4894d44e5f50f058482bd3735cceb2645babc51c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 31 Mar 2013 10:13:56 +0200
Subject: [PATCH 352/623] Changed output to make it show the current
 multiplier.

---
 .../AppleIntelCPUPowerManagementInfo.cpp             | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 4df6928..26715a0 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -100,7 +100,8 @@ inline void getCStates(void *arg)
 
 IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 {
-	gCoreMultipliers |= (1ULL << (rdmsr64(MSR_IA32_PERF_STS) >> 8));
+	UInt8 currentMultiplier = (rdmsr64(MSR_IA32_PERF_STS) >> 8);
+	gCoreMultipliers |= (1ULL << currentMultiplier);
 
 	timerEventSource->setTimeoutTicks(Interval);
 
@@ -130,7 +131,14 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 			
 			if ((gTriggeredPStates & value) == value)
 			{
-				IOLog("%d ", currentBit);
+				if (currentBit == currentMultiplier)
+				{
+					IOLog("(%d) ", currentBit);
+				}
+				else
+				{
+					IOLog("%d ", currentBit);
+				}
 			}
 		}
 #if REPORT_GPU_STATS

From 2fe741746ee41f782cb3bb6606449d2ebee761ca Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 31 Mar 2013 10:16:32 +0200
Subject: [PATCH 353/623] Changed a compiler directive (we need the MSR
 values).

---
 .../AppleIntelCPUPowerManagementInfo.h                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 6e6f939..ebd5a79 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -21,7 +21,7 @@
 
 #define super IOService
 
-#define REPORT_MSRS			0
+#define REPORT_MSRS			1
 #define REPORT_GPU_STATS	0
 
 extern "C" void mp_rendezvous_no_intrs(void (*action_func)(void *), void * arg);

From 2855c4362c159f0a1eb437dae5f213ad81c18f65 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 1 Apr 2013 16:22:27 +0200
Subject: [PATCH 354/623] Typo

---
 .../AppleIntelCPUPowerManagementInfo.cpp                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 26715a0..8c4d3fa 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -216,7 +216,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 
 #if REPORT_GPU_STATS
 				/*
-				 * TODO: Pike, add check a to see if there is a GPU and if it is is enabled!
+				 * TODO: Pike, add check a to see if there is a GPU and if it is enabled!
 				 */
 				IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
 				memDescriptor = IOMemoryDescriptor::withPhysicalAddress(address, 0x53, kIODirectionIn);

From ff3afdcf1750daa1f24d355ca55a0c63757cb22e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 1 Apr 2013 16:23:15 +0200
Subject: [PATCH 355/623] Typo in SMB_BOARD_PRODUCT for iMac12,n fixed

Thanks to 4D3K for the tip.
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 4 ++--
 i386/libsaio/smbios/model_data.h     | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index ac4ad53..346a10e 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -1370,14 +1370,14 @@ set -x
 function _initSandyBridgeSetup()
 {
 	case $boardID in
-		Mac-942B59F58194151B)
+		Mac-942B5BF58194151B)
 			gSystemType=1
 			gMacModelIdentifier="iMac12,1"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
 			;;
 
-		Mac-942B5BF58194171B)
+		Mac-942B59F58194171B)
 			gSystemType=1
 			gMacModelIdentifier="iMac12,2"
 			gACST_CPU0=13   # C1, C3 and C6
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 4d5ac74..ea84e8f 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -22,9 +22,11 @@
  *			- EFI_MODEL_NAME renamed/moved over from settings.h (PikerAlpha, October 2012).
  *			- Data for new MacBookPro and Macmini added (PikerAlpha, October 2012).
  *			- Data for iMac13,2 and MacBookPro9,2 added (PikerAlpha, October 2013).
+ *			- Typo in SMB_BOARD_PRODUCT for iMac12,n fixed (PikerAlpha, April 2013).
  *
  * Credits:
  *			- blackosx, DB1, dgsga, FKA, humph, scrax and STLVNUB (testers).
+ *			- 4D3K for iMac12,n SMB_BOARD_PRODUCT typos.
  */
 
 
@@ -40,12 +42,12 @@
 	#elif (TARGET_MODEL == IMAC_121)
 		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
 		#define SMB_PRODUCT_NAME	"iMac12,1"
-		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194151B"
+		#define SMB_BOARD_PRODUCT	"Mac-942B5BF58194151B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
 	#elif (TARGET_MODEL == IMAC_122)
 		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
 		#define SMB_PRODUCT_NAME	"iMac12,2"
-		#define SMB_BOARD_PRODUCT	"Mac-942B5BF58194171B"
+		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '2' }
 	#elif (TARGET_MODEL == IMAC_131)
 		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"

From 56cfdcf79afb9a4643ac13877ecafa68b5b93bad Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 03:58:32 +0200
Subject: [PATCH 356/623] Whitespace changes only by Jeroen

---
 i386/libsa/memory.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/i386/libsa/memory.h b/i386/libsa/memory.h
index 13365e6..f561709 100755
--- a/i386/libsa/memory.h
+++ b/i386/libsa/memory.h
@@ -86,13 +86,14 @@
 #define HIB_LEN				0x00060000L							// Size: 384 KB.
 
 //							0x000A0000L
-#define VIDEO_ADDR			(HIB_ADDR + HIB_LEN)					// Unusable space.
+#define VIDEO_ADDR			(HIB_ADDR + HIB_LEN)				// Unusable space.
 #define VIDEO_LEN			0x00060000L							// Size: 384 KB.
 
 //							0x00100000L
-#define KERNEL_ADDR			(VIDEO_ADDR + VIDEO_LEN)				// Kernel and MKexts/drivers.
+#define KERNEL_ADDR			(VIDEO_ADDR + VIDEO_LEN)			// Kernel and MKexts/drivers.
 #define KERNEL_LEN			0x04000000L							// Size: 64 MB (128 MB for Chameleon).
-
+																//
+																// Note: Can cause a stop("Kernel overflows available space")
 // Based on KERNEL_LEN		0x04100000L
 #define ZALLOC_ADDR			(KERNEL_ADDR + KERNEL_LEN)			// Zalloc area.
 #define ZALLOC_LEN			0x10000000L							// Size: 256 MB.
@@ -106,7 +107,7 @@
 #define PREBOOT_DATA		(LOAD_ADDR + LOAD_LEN)				// Room for a 195 MB RAM disk image (with 512 MB System Memory).
 
 
-#define TFTP_ADDR			LOAD_ADDR							// TFTP download buffer (not used in Revolution).
+#define TFTP_ADDR			LOAD_ADDR							// TFTP download buffer (not used in RevoBoot).
 #define TFTP_LEN			LOAD_LEN
 
 
@@ -120,17 +121,17 @@
 #define vtop(vaddr)			((vaddr) + MEMBASE)
 
 // Extract segment/offset from a linear address.
-#define OFFSET16(addr)    ((addr) - BASE_ADDR)
-#define OFFSET(addr)      ((addr) & 0xFFFF)
-#define SEGMENT(addr)     (((addr) & 0xF0000) >> 4)
+#define OFFSET16(addr)		((addr) - BASE_ADDR)
+#define OFFSET(addr)		((addr) & 0xFFFF)
+#define SEGMENT(addr)		(((addr) & 0xF0000) >> 4)
 
 /*
  * Extract segment/offset in normalized form so that the resulting far pointer
  * will point to something that is very unlikely to straddle a segment.
  * This is sometimes known as a "huge" pointer.
  */
-#define NORMALIZED_OFFSET(addr)      ((addr) & 0x000F)
-#define NORMALIZED_SEGMENT(addr)     (((addr) & 0xFFFF0) >> 4)
+#define NORMALIZED_OFFSET(addr)		((addr) & 0x000F)
+#define NORMALIZED_SEGMENT(addr)	(((addr) & 0xFFFF0) >> 4)
 
 // We need a minimum of 32MB of system memory.
 #define MIN_SYS_MEM_KB  (32 * 1024)

From a627a73e16bd49de4aa7cfba48c91c4544fec5dd Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 03:59:03 +0200
Subject: [PATCH 357/623] Renamed loadSystemConfig to loadCABootPlist

---
 i386/libsaio/bios.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/bios.h b/i386/libsaio/bios.h
index 7391450..ff49ad5 100755
--- a/i386/libsaio/bios.h
+++ b/i386/libsaio/bios.h
@@ -90,7 +90,7 @@ typedef struct
 #define BASE_HD_DRIVE				0x80
 
 /* 
- * Used in saio_types.h and in StringTable.c (function loadSystemConfig).
+ * Used in saio_types.h and in StringTable.c (function loadCABootPlist).
  */
 
 #define IO_CONFIG_DATA_SIZE			4096

From 7caf607b191c22258fa51b1365d903458c3a12e1 Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 03:59:23 +0200
Subject: [PATCH 358/623] Renamed loadSystemConfig to loadCABootPlist

---
 i386/libsaio/saio_internal.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index ad0c33e..ecdb389 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -25,6 +25,7 @@
  *
  *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
  *			- Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
+ *			- Stripped (unnecessary) argument from loadSystemConfig (PikerAlpha, April 2013).
  *
  */
 
@@ -167,7 +168,7 @@ extern bool		getValueForKey(const char *key, const char **val, int *size, config
 extern bool		getBoolForKey(const char *key, bool *val, config_file_t *configBuff);
 extern bool		getIntForKey(const char *key, int *val, config_file_t *configBuff);
 extern long		loadConfigFile(const char *configFile, config_file_t *configBuff);
-extern long		loadSystemConfig(config_file_t *configBuff);
+extern long		loadCABootPlist(void);
 extern char		* getNextArg(char ** ptr, char * val);
 extern long		ParseXMLFile(char * buffer, TagPtr * dict);
 

From 1eda1c9f3f76284705fcccf0b325be0a52663ee8 Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 03:59:36 +0200
Subject: [PATCH 359/623] Adding new flag

---
 i386/libsaio/saio_types.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/saio_types.h b/i386/libsaio/saio_types.h
index 0d2ba5b..90e67c3 100755
--- a/i386/libsaio/saio_types.h
+++ b/i386/libsaio/saio_types.h
@@ -211,7 +211,8 @@ enum
 	kBVFlagBootable			= 0x08,
 	kBVFlagEFISystem		= 0x10,
 	kBVFlagBooter			= 0x20,
-	kBVFlagSystemVolume		= 0x40
+	kBVFlagSystemVolume		= 0x40,
+	kBVFlagInstallVolume    = 0x80
 };
 
 enum

From 09c3f51e58ae9ab704137348ead89cb9c8aee3a8 Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 04:08:23 +0200
Subject: [PATCH 360/623] Get BVRef only once

---
 i386/libsaio/sys.c | 45 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/i386/libsaio/sys.c b/i386/libsaio/sys.c
index d1bd2bf..66595a2 100755
--- a/i386/libsaio/sys.c
+++ b/i386/libsaio/sys.c
@@ -437,25 +437,21 @@ int open(const char * path, int flags)
 	const char *	filePath;
 	BVRef			bvr;
 
-	// Locate a free descriptor slot.
-
-	for (fdesc = 0; fdesc < NFILES; fdesc++)
+	// Resolve the boot volume (once per call) from the file spec.
+	if ((bvr = getBootVolumeRef(path, &filePath)) != NULL)
 	{
-		if (iob[fdesc].i_flgs == 0)
+		// Locate a free descriptor slot.
+		for (fdesc = 0; fdesc < NFILES; fdesc++)
 		{
-			io = &iob[fdesc];
-			bzero(io, sizeof(*io));
-			
-			// Mark the descriptor as taken.
-			
-			io->i_flgs = F_ALLOC;
-			
-			// Resolve the boot volume from the file spec.
-			
-			if ((bvr = getBootVolumeRef(path, &filePath)) != NULL)
+			if (iob[fdesc].i_flgs == 0)
 			{
-				// Find the next available memory block in the download buffer.
+				io = &iob[fdesc];
+				bzero(io, sizeof(*io));
 			
+				// Mark the descriptor as taken.
+				io->i_flgs = F_ALLOC;
+
+				// Find the next available memory block in the download buffer.
 				io->i_buf = (char *) LOAD_ADDR;
 			
 				for (i = 0; i < NFILES; i++)
@@ -469,7 +465,6 @@ int open(const char * path, int flags)
 				}
 			
 				// Load entire file into memory. Unnecessary open() calls must be avoided.
-
 				gFSLoadAddress = io->i_buf;
 				io->i_filesize = bvr->fs_loadfile(bvr, (char *)filePath);
 			
@@ -478,15 +473,16 @@ int open(const char * path, int flags)
 					return fdesc;
 				}
 			}
+
+			close(fdesc);
 		}
-	}
 #if DEBUG
-	if (fdesc == NFILES)
-	{
-		stop("Out of file descriptors");
-	}
+		if (fdesc == NFILES)
+		{
+			stop("Out of file descriptors");
+		}
 #endif
-	close(fdesc);
+	}
 
 	return -1;
 }
@@ -933,10 +929,9 @@ BVRef getTargetRootVolume(char *rootUUID)
 				// Traverse back from the last to the first partition in the chain.
 				for (bvr = chain; bvr; bvr = bvr->next)
 				{
-					if ((bvr->biosdev == hdIndex) && (bvr->flags & kBVFlagSystemVolume))
+					if ((bvr->biosdev == hdIndex)) && ((bvr->flags & kBVFlagSystemVolume) || (bvr->flags & kBVFlagInstallVolume))
 					{
-						if ((bvr->flags & kBVFlagSystemVolume) &&
-							(bvr->fs_getuuid(bvr, rootUUID) == EFI_SUCCESS))
+						if ((bvr->flags & kBVFlagSystemVolume) && (bvr->fs_getuuid(bvr, rootUUID) == EFI_SUCCESS))
 						{
 							return bvr;
 						}

From b3e469d41a75cdf83ae3218729944922bb592b0f Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 04:10:57 +0200
Subject: [PATCH 361/623] Renamed stuff and additional check added

- Renamed loadSystemConfig  to loadCABootPlist
- Renamed LION_INSTALL_SUPPORT to INSTALL_ESD_SUPPORT
---
 i386/libsaio/stringTable.c | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/stringTable.c b/i386/libsaio/stringTable.c
index fa87d5e..a6072d8 100755
--- a/i386/libsaio/stringTable.c
+++ b/i386/libsaio/stringTable.c
@@ -27,6 +27,8 @@
  *			- White space changes (PikerAlpha, November 2012).
  *			- Now checking malloc returns (PikerAlpha, November 2012).
  *			- Cleanups, kTagTypeData support and NVRAMstorage reading changes (PikerAlpha, November 2012).
+ *			- Renamed LION_INSTALL_SUPPORT to INSTALL_ESD_SUPPORT (PikerAlpha, April 2013).
+ *			- Stripped (unnecessary) argument from loadSystemConfig (PikerAlpha, April 2013).
  *
  */
 
@@ -363,7 +365,7 @@ long loadConfigFile(const char * configFile, config_file_t *config)
 
 //==============================================================================
 
-long loadSystemConfig(config_file_t *config)
+long loadCABootPlist(void)
 {
 	long retValue = (long) EFI_OUT_OF_RESOURCES;
 
@@ -373,7 +375,7 @@ long loadSystemConfig(config_file_t *config)
 		"com.apple.recovery.boot",
 #endif
 
-#if LION_INSTALL_SUPPORT
+#if INSTALL_ESD_SUPPORT
 		".IABootFiles",
 		"OS X Install Data",
 		"Mac OS X Install Data",
@@ -398,11 +400,31 @@ long loadSystemConfig(config_file_t *config)
 	{
 		int i = 0;
 		int len = (sizeof(dirspec) / sizeof(dirspec[0]));
-
+#if INSTALL_ESD_SUPPORT
+		int start = 0;
+		int end = 3;
+	#if LION_RECOVERY_SUPPORT
+		start++;
+		end++;
+	#endif
+#endif
 		for (; i < len; i++)
 		{
+			bzero(path, 80);
 			sprintf(path, "/%s/%s", dirspec[i], "com.apple.Boot.plist");
-			retValue = loadConfigFile(path, config);
+			retValue = loadConfigFile(path, &bootInfo->bootConfig);
+			
+			if (retValue == EFI_SUCCESS)
+			{
+#if INSTALL_ESD_SUPPORT
+				if (i > start && i < end)
+				{
+					// Installation data directory located
+					gPlatform.BootVolume->flags = kBVFlagInstallVolume;
+				}
+#endif
+				break;
+			}
 		}
 
 		free (path);

From 714aad5cdc99c570310ff989f6a94c9929d3c26a Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 04:12:26 +0200
Subject: [PATCH 362/623] Changed debug text 'B/RootVolume' to
 'Boot/RootVolume'

---
 i386/libsaio/disk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index c763210..944e7f3 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -708,7 +708,7 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 													// Initialize with the first bootable volume.
 													gPlatform.BootVolume = gPlatform.RootVolume = bvr;
 
-													_DISK_DEBUG_DUMP("Init B/RootVolume - partition: %d, flags: %d, gptID: %d\n", bvr->part_no, bvr->flags, gptID);
+													_DISK_DEBUG_DUMP("Init Boot/RootVolume - partition: %d, flags: %d, gptID: %d\n", bvr->part_no, bvr->flags, gptID);
 												}
 
 												// Bail out after finding the first System Volume.

From 9435fd6cf7e2670df171806626944af695db5cff Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 04:14:56 +0200
Subject: [PATCH 363/623] Fixed boot from InstallESD/BaseSystem.dmg

- whitespace changes.
- moved some code.
- additional check added.
---
 i386/boot2/boot.c | 97 +++++++++++++++++++++++++++--------------------
 1 file changed, 55 insertions(+), 42 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index a10333a..8518d4e 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -48,6 +48,8 @@
  *			- Optionally include Recovery HD support code (PikerAlpha, November 2012).
  *			- Fixed clang compilation (PikerAlpha, November 2012).
  *			- Unused sysConfigValid removed and white space fix (PikerAlpha, November 2012).
+ *			- Fixed boot failure for InstallESD/BaseSystem.dmg/patched kernelcache (PikerAlpha, April 2013).
+ *			- Renamed LION_INSTALL_SUPPORT to INSTALL_ESD_SUPPORT (PikerAlpha, April 2013).
  *
  */
 
@@ -88,7 +90,7 @@ unsigned long Adler32(unsigned char *buf, long len)
 		k = len < NMAX ? len : NMAX;
 		len -= k;
 
-        while (k >= 16)
+		while (k >= 16)
 		{
 			DO16(buf);
 			buf += 16;
@@ -122,7 +124,7 @@ static void zeroBSS()
 	extern int  _DATA_bss__end		__asm("section$end$__DATA$__bss");
 	extern int  _DATA_common__start	__asm("section$start$__DATA$__common");
 	extern int  _DATA_common__end	__asm("section$end$__DATA$__common");
-    
+
 	bzero(&_DATA_bss__start, (&_DATA_bss__end - &_DATA_bss__start));
 	bzero(&_DATA_common__start, (&_DATA_common__end - &_DATA_common__start));
 }
@@ -135,13 +137,13 @@ static void zeroBSS()
 #if SAFE_MALLOC
 static void mallocError(char *addr, size_t size, const char *file, int line)
 {
-    stop("\nMemory allocation error! Addr=0x%x, Size=0x%x, File=%s, Line=%d\n", (unsigned)addr, (unsigned)size, file, line);
+	stop("\nMemory allocation error! Addr=0x%x, Size=0x%x, File=%s, Line=%d\n", (unsigned)addr, (unsigned)size, file, line);
 }
 #else
 static void mallocError(char *addr, size_t size)
 {
-    printf("\nMemory allocation error (0x%x, 0x%x)\n", (unsigned)addr, (unsigned)size);
-    asm volatile ("hlt");
+	printf("\nMemory allocation error (0x%x, 0x%x)\n", (unsigned)addr, (unsigned)size);
+	asm volatile ("hlt");
 }
 #endif
 
@@ -151,11 +153,11 @@ static void mallocError(char *addr, size_t size)
 
 void boot(int biosdev)
 {
-    zeroBSS();
-    mallocInit(0, 0, 0, mallocError);
+	zeroBSS();
+	mallocInit(0, 0, 0, mallocError);
 
 #if MUST_ENABLE_A20
-    // Enable A20 gate before accessing memory above 1 MB.
+	// Enable A20 gate before accessing memory above 1 MB.
 	if (fastEnableA20() != 0)
 	{
 		enableA20(); // Fast enable failed. Try legacy method.
@@ -256,10 +258,6 @@ void boot(int biosdev)
 	}
 #endif // #if STARTUP_DISK_SUPPORT
 
-	#define loadCABootPlist() loadSystemConfig(&bootInfo->bootConfig)
-
-	// Loading: /Library/Preferences/SystemConfiguration/com.apple.Boot.plist
-	// TODO: Check if everything works <i>without</i> having this plist.
 	if (loadCABootPlist() == EFI_SUCCESS)
 	{
 		_BOOT_DEBUG_DUMP("com.apple.Boot.plist located.\n");
@@ -315,32 +313,22 @@ void boot(int biosdev)
 					// Yes. Copy its value into rootUUID.
 					strlcpy(rootUUID, val, 37);
 				}
-			}
-		}
-
-#if PRE_LINKED_KERNEL_SUPPORT
-		/* Look for 'Kernel Cache' key. */
-		if (getValueForKey(kKernelCacheKey, &val, &length, &bootInfo->bootConfig))
-		{
-			_BOOT_DEBUG_DUMP("Kernel Cache set to: %s\n", val);
-
-			// Key found. Check if the given filepath/name exists.
-			if (length && GetFileInfo(NULL, val, &flags, &cachetime) == 0)
-			{
-				// File located. Init kernelCacheFile so that we can use it as boot file.
-				gPlatform.KernelCachePath = strdup(val);
-
-				// Set flag to inform the load process to skip parts of the code.
-				gPlatform.KernelCacheSpecified = true;
+#if INSTALL_ESD_SUPPORT
+				if (getValueForBootKey(kernelFlags, "container-dmg", &val, &length) &&
+					getValueForBootKey(kernelFlags, "root-dmg", &val, &length))
+				{
+					_BOOT_DEBUG_DUMP("Target container-dmg/root-dmg=%s\n", val);
 
-				_BOOT_DEBUG_DUMP("kernelcache file found.\n");
+					gPlatform.BootVolume->flags |= kBVFlagInstallVolume;
+				}
+				else
+				{
+					gPlatform.BootVolume->flags = ~kBVFlagInstallVolume;
+				}
+#endif
 			}
-
-			_BOOT_DEBUG_ELSE_DUMP("Error: kernelcache file not found.\n");
 		}
 
-		// _BOOT_DEBUG_ELSE_DUMP("No 'Kernel Cache' key given.\n");
-#endif
 		/* Enable touching of a single BIOS device by setting 'Scan Single Drive' to yes.
 		if (getBoolForKey(kScanSingleDriveKey, &gScanSingleDrive, &bootInfo->bootConfig) && gScanSingleDrive)
 		{
@@ -351,7 +339,7 @@ void boot(int biosdev)
 	{
 		_BOOT_DEBUG_DUMP("No com.apple.Boot.plist found.\n");
 	}
-	
+
 	// Was a target drive (per UUID) specified in com.apple.Boot.plist?
 	if (rootUUID[0] == '\0')
 	{
@@ -368,7 +356,16 @@ void boot(int biosdev)
 				_BOOT_DEBUG_DUMP("Success [%s]\n", rootUUID);
 			}
 		}
-		else // Booting from USB-stick or SDboot media.
+		else if (gPlatform.BootVolume->flags & kBVFlagInstallVolume)
+		{
+			_BOOT_DEBUG_DUMP("Booting from a disk image in the installation directory\n");
+
+			if (HFSGetUUID(gPlatform.BootVolume, rootUUID) == EFI_SUCCESS)
+			{
+				_BOOT_DEBUG_DUMP("Success [%s]\n", rootUUID);
+			}
+		}
+		else // Booting from USB-stick or SDboot media
 		{
 			_BOOT_DEBUG_DUMP("Booting from a Non System Volume, getting UUID.\n");
 
@@ -403,23 +400,39 @@ void boot(int biosdev)
 	 * non-default system setting and thus is this the place to update our EFI tree.
 	 */
 
-    updateEFITree(rootUUID);
+	updateEFITree(rootUUID);
 
 	if (haveCABootPlist) // Check boolean before doing more time consuming tasks.
 	{
+#if PRE_LINKED_KERNEL_SUPPORT
+		if (getValueForKey(kKernelCacheKey, &val, &length, &bootInfo->bootConfig))
+		{
+			if (length && GetFileInfo(NULL, val, &flags, &cachetime) == 0)
+			{
+				_BOOT_DEBUG_DUMP("Kernel Cache set to: %s\n", val);
+
+				// File located. Init kernelCacheFile so that we can use it as boot file.
+				gPlatform.KernelCachePath = strdup(val);
+				
+				// Set flag to inform the load process to skip parts of the code.
+				gPlatform.KernelCacheSpecified = true;
+			}
+		}
+		// _BOOT_DEBUG_ELSE_DUMP("No 'Kernel Cache' key given.\n");
+#endif
 		if (getBoolForKey(kQuietBootKey, &quietBootMode, &bootInfo->bootConfig) && !quietBootMode)
 		{
 			gBootMode = kBootModeNormal; // Reversed from: gBootMode |= kBootModeQuiet;
 		}
 	}
 
-    // Parse args, load and start kernel.
-    while (1)
-    {
+	// Parse args, load and start kernel.
+	while (1)
+	{
 		// Initialize globals.
-		gErrors        = 0;
+		gErrors			= 0;
 
-		int retStatus = -1;
+		int retStatus	= -1;
 
 		uint32_t adler32 = 0;
 

From c56996fbb23227edf7eeaeec4d7575b4ede9a098 Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 04:18:48 +0200
Subject: [PATCH 364/623] Proposed change by Jeroen

---
 i386/libsaio/acpi/ssdt_pr_generator.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/ssdt_pr_generator.h b/i386/libsaio/acpi/ssdt_pr_generator.h
index 2969249..417ad3e 100644
--- a/i386/libsaio/acpi/ssdt_pr_generator.h
+++ b/i386/libsaio/acpi/ssdt_pr_generator.h
@@ -94,9 +94,12 @@ void generateSSDT_PR(void)
 #endif
 
 #if AUTOMATIC_PROCESSOR_BLOCK_CREATION
-	uint8_t SCOPE_PR[] =							// Scope (\_PR) { }
+	uint8_t SCOPE_PR[] =							// Scope (\_PR_) { }
 	{
 		/* 0000 */	0x10, 0xFF, 0xFF, 0x5C, 0x5F, 0x50, 0x52, 0x5F
+
+		/* 0000 * /	0x10, 0xFF, 0xFF, 0x5C, 0x2E, 0x5F, 0x50, 0x52
+		/ *0008 * /	0x5F */
 	};
 
 	uint8_t PROCESSOR_DEF_BLOCK[] =

From 3907967cf8056b42b4910c7a662abec7bb5228bc Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 15:10:00 +0200
Subject: [PATCH 365/623] restoring v5.8

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 i386/libsaio/acpi/Tools/ssdtPRGen.sh

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
old mode 100755
new mode 100644

From 760dbd917d15224fcbd55e1351d7b3837dd5427d Mon Sep 17 00:00:00 2001
From: Chief <Chief@www.vumc.nl>
Date: Sun, 7 Apr 2013 15:25:54 +0200
Subject: [PATCH 366/623] New Haswell processors added

cleanups and other minor stuff done
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 346a10e..39d8e32 100644
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -64,6 +64,7 @@
 #			- Bug fix, overriding the cpu type displayed the wrong name (Jeroen, March 2013)
 #			- Automatic detection of CPU scopes added (Pike, March 2013)
 #			- Show warnings for Sandy Bridge systems as well (Jeroen, March 2013)
+#			- New Intel Haswell processors added (Jeroen, April 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -127,7 +128,7 @@ gDestinationPath="/Extra/"
 #
 # This is the filename used for the copy process
 #
-gDestinationFile="SSDT.aml"
+gDestinationFile="ssdt.aml"
 
 #
 # A value of 1 will make this script call iasl (compiles SSDT_PR.dsl)
@@ -169,7 +170,7 @@ gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 #
 
 gPath=~/Desktop
-gSsdtID="SSDT_PR"
+gSsdtID="ssdt_pr"
 gSsdtPR="${gPath}/${gSsdtID}.dsl"
 
 let gDesktopCPU=1
@@ -442,6 +443,10 @@ gServerHaswellCPUList=(
 )
 
 gDesktopHaswellCPUList=(
+# Socket 2011 (Premium Power)
+i7-4960K,130,0,3600,4000,6,12
+i7-4930K,130,0,3400,3900,6,12
+i5-4820K,130,0,3700,3900,4,8
 # Socket 1150 (Standard Power)
 i7-4770K,84,00,3500,3900,4,8
 i7-4770,84,0,3400,3900,4,8
@@ -461,6 +466,9 @@ i5-4430S,65,0,2700,3200,4,4
 )
 
 gMobileHaswellCPUList=(
+i7-4930MX,57,0,3000,3900,4,8
+i7-4900MQ,47,0,2800,3800,4,8
+i7-4800MQ,47,0,2700,3700,4,8
 )
 
 #--------------------------------------------------------------------------------
@@ -599,7 +607,7 @@ function _printScopeStart()
         let extraF=($maxTurboFrequency+1)
         let maxTDP=($gTdp*1000)
         let extraR=($maxTurboFrequency/100)+1
-        echo '            /* Workaround for Ivy Bridge PM bug */'                       >> $gSsdtPR
+        echo "            /* Workaround for the Ivy Bridge PM 'bug' */"                 >> $gSsdtPR
       printf "            Package (0x06) { 0x%04X, 0x%06X, 0x0A, 0x0A, 0x%02X00, 0x%02X00 },\n" $extraF $maxTDP $extraR $extraR >> $gSsdtPR
     fi
 }
@@ -971,7 +979,6 @@ function _getModelName()
     # Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
     #
     echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *["=<>]//g' -e 's/compatible//'`
-#   echo "iMac13,2"
 }
 
 #--------------------------------------------------------------------------------
@@ -1010,7 +1017,7 @@ function _updateProcessorNames()
     if [[ $1 -gt ${#gProcessorNames[@]} ]]; then
         echo -e "\nWarning: Target CPU has $gLogicalCPUs logical cores, the running system only ${#gProcessorNames[@]}"
         echo    "         Now using '$label' to extent the current range to $gLogicalCPUs..."
-        echo -e "         You may want to check/verify the generated DSDT_PR.dsl\n"
+        echo -e "         You may want to check/verify the generated $gSsdtID.dsl\n"
     fi
 
     let currentCPU=0
@@ -1032,7 +1039,7 @@ function _updateProcessorNames()
 
 #--------------------------------------------------------------------------------
 
-function _getScope()
+function _getProcessorScope()
 {
     let procNameFound=0
     local names=($(ioreg -p IOACPIPlane -d 3 | sed -e 's/<.*>//g' -e 's/.*o //g'))
@@ -1629,7 +1636,9 @@ function main()
 
     _getBoardID
     _getProcessorNames
-    _getScope
+    #
+    # _getProcessorScope (work in progress)
+    #
 
     local modelID=$(_getModelName)
     local cpu_type=$(_getCPUtype)

From 8f830ec610005a7de65ecac9d3d068b65efbc8f8 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 7 Apr 2013 16:49:58 +0200
Subject: [PATCH 367/623] Updating settings template

---
 i386/config/settings-template.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 891a227..f6333dd 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -33,6 +33,7 @@
  *			- Always inject SMB_BOARD_SERIAL_NUMBER, required for iMessage (PikerAlpha, January 2013).
  *			- New compiler directives in EFI section added (PikerAlpha, January 2013).
  *			- STATIC_SYSTEM_ID renamed to SMB_STATIC_SYSTEM_UUID and moved to SMBIOS section (PikerAlpha, January 2013).
+ *			- Renamed LION_INSTALL_SUPPORT to INSTALL_ESD_SUPPORT (PikerAlpha, April 2013).
  *
  */
 
@@ -355,7 +356,7 @@
 
 //------------------------------------------------------------ STRINGTABLE.H ----------------------------------------------------------------
 
-#define LION_INSTALL_SUPPORT				0	// Set to 0 by default. Setting this to 1 will make RevoBoot search in specific directories
+#define INSTALL_ESD_SUPPORT					0	// Set to 0 by default. Setting this to 1 will make RevoBoot search in specific directories
 												// for com.apple.Boot.plist – required for Mac like Lion OS X installations.
 												
 //-------------------------------------------------------------- SMBIOS.C ------------------------------------------------------------------

From 1f46fdb57216e5b445c19d388c4120b2fce25990 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 7 Apr 2013 18:20:36 +0200
Subject: [PATCH 368/623] Updating settings template

---
 i386/config/settings-template.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index f6333dd..683aa7f 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009 Master Chief. All rights reserved.
  *
- * Note: This is an essential part of the build process for RevoBoot v1.5.38 and greater.
+ * Note: This is an essential part of the build process for RevoBoot v1.5.39 and greater.
  *
  * Updates:
  *

From ef1886cbc8d12d805c58d3b3f6da7bbf156a7699 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 7 Apr 2013 18:30:47 +0200
Subject: [PATCH 369/623] Updating version number

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 39d8e32..d6e2639 100644
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 5.8 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 5.9 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -131,14 +131,14 @@ gDestinationPath="/Extra/"
 gDestinationFile="ssdt.aml"
 
 #
-# A value of 1 will make this script call iasl (compiles SSDT_PR.dsl)
+# A value of 1 will make this script call iasl (compiles ssdt_pr.dsl)
 #
 # Note: Will be set to 0 when we failed to locate a copy of iasl!
 #
 let gCallIasl=1
 
 #
-# A value of 1 will make this script open SSDT_PR.dsl in the editor of your choice. 
+# A value of 1 will make this script open ssdt_pr.dsl in the editor of your choice.
 #
 let gCallOpen=0
 
@@ -161,7 +161,7 @@ gProcLabel="CPU"
 # Other global variables.
 #
 
-gScriptVersion=5.8
+gScriptVersion=5.9
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1883,12 +1883,12 @@ _findIasl
 
 if (($gCallIasl)); then
     #
-    # Compile SSDT.dsl
+    # Compile ssdt.dsl
     #
     "$iasl" $gSsdtPR
 
     #
-    # Copy SSDT_PR.aml to /Extra/SSDT.aml (example)
+    # Copy ssdt_pr.aml to /Extra/ssdt.aml (example)
     #
     if (($gAutoCopy)); then
         if [ -f ${gPath}/${gSsdtID}.aml ]; then

From 6480a76bad71e729e57c33ccc2ebd2f89d67d3ce Mon Sep 17 00:00:00 2001
From: Dave Griffin <davegriffin@stainedglass1.plus.com>
Date: Sun, 7 Apr 2013 19:22:52 +0100
Subject: [PATCH 370/623] Fixed a typo to silence compilation error

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 0
 i386/libsaio/sys.c                   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 i386/libsaio/acpi/Tools/ssdtPRGen.sh

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
old mode 100644
new mode 100755
diff --git a/i386/libsaio/sys.c b/i386/libsaio/sys.c
index 66595a2..ab5fcd2 100755
--- a/i386/libsaio/sys.c
+++ b/i386/libsaio/sys.c
@@ -929,7 +929,7 @@ BVRef getTargetRootVolume(char *rootUUID)
 				// Traverse back from the last to the first partition in the chain.
 				for (bvr = chain; bvr; bvr = bvr->next)
 				{
-					if ((bvr->biosdev == hdIndex)) && ((bvr->flags & kBVFlagSystemVolume) || (bvr->flags & kBVFlagInstallVolume))
+					if ((bvr->biosdev == hdIndex) && ((bvr->flags & kBVFlagSystemVolume) || (bvr->flags & kBVFlagInstallVolume)))
 					{
 						if ((bvr->flags & kBVFlagSystemVolume) && (bvr->fs_getuuid(bvr, rootUUID) == EFI_SUCCESS))
 						{

From 63de26fc99359e41850f67d32dfa2aaa151cd334 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 8 Apr 2013 03:49:54 +0200
Subject: [PATCH 371/623] Setting LFM for i5-2450M

Confirmed by Zoltan
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index d6e2639..3be17d9 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -295,7 +295,7 @@ i7-2617M,17,0,1500,2600,2,4
 i7-2610UE,17,0,1500,2400,2,4
 # i5 Mobile Series
 i5-2467M,17,0,1600,2300,2,4
-i5-2450M,35,0,2300,3100,2,4
+i5-2450M,35,800,2300,3100,2,4
 i5-2435M,35,0,2400,3000,2,4
 i5-2430M,35,0,2400,3000,2,4
 i5-2410M,35,0,2300,2900,2,4

From 7e17a9ff968511f9503d0fdd6b82850994b0cf69 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 8 Apr 2013 06:19:34 +0200
Subject: [PATCH 372/623] Improved Processor declaration detection

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 48 +++++++++++++++-------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 3be17d9..5944aee 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 5.9 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 6.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -65,6 +65,7 @@
 #			- Automatic detection of CPU scopes added (Pike, March 2013)
 #			- Show warnings for Sandy Bridge systems as well (Jeroen, March 2013)
 #			- New Intel Haswell processors added (Jeroen, April 2013)
+#			- Improved Processor declaration detection (Jeroen/Pike, April 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -114,12 +115,12 @@
 let gIvyWorkAround=1
 
 #
-# Asks for your confirmation to copy SSDT_PR.aml to /Extra/SSDT.aml (example)
+# Asks for your confirmation to copy ssdt_pr.aml to /Extra/ssdt.aml (example)
 #
 let gAutoCopy=1
 
 #
-# This is the target location that SSDT.aml will be copied to.
+# This is the target location that ssdt.aml will be copied to.
 #
 # Note: Do no change this - will be updated automatically for Clover/RevoBoot!
 #
@@ -157,11 +158,16 @@ let gBaseFrequency=1600
 #
 gProcLabel="CPU"
 
+#
+# This is the default (ACPI 1.0 compliant) processor scope (verified by _getProcessorScope).
+#
+gScope="\_PR_"
+
 #
 # Other global variables.
 #
 
-gScriptVersion=5.9
+gScriptVersion=6.0
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -203,6 +209,7 @@ let TARGET_CPU_ERROR=4
 let PROCESSOR_NUMBER_ERROR=5
 let PROCESSOR_LABEL_LENGTH_ERROR=6
 let PROCESSOR_NAMES_ERROR=7
+let PROCESSOR_DECLARATION_ERROR=8
 
 #
 # Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
@@ -1041,23 +1048,17 @@ function _updateProcessorNames()
 
 function _getProcessorScope()
 {
-    let procNameFound=0
-    local names=($(ioreg -p IOACPIPlane -d 3 | sed -e 's/<.*>//g' -e 's/.*o //g'))
-
-    for name in ${names[@]}
-    do
-        if [[ $name == "_SB" && $procNameFound -eq 0 ]]; then
-#           echo 'Using: Scope (\_SB.'${gProcessorNames[0]}') etc.'
-            gScope="\_SB"
-            return
-        fi
+    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 | egrep -o 'DSDT"=<[0-9a-f]+5b830b') ]]; then
+        printf 'Processor Declaration(s) Found in DSDT'
+    fi
 
-        if [[ "${name:0:3}" == ${gProcessorNames[0]:0:3} ]]; then
-#           echo 'Using: Scope (\_PR.'${gProcessorNames[0]}') etc.'
-            gScope="\_PR"
-            let procNameFound=1
-        fi
-    done
+    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 | egrep -o 'DSDT"=<[0-9a-f]+5f50525f') ]];
+        then
+            gScope="\_PR_"
+            echo ' (ACPI 1.0 compliant)'
+        else
+            gScope="\_SB_"
+    fi
 }
 
 #--------------------------------------------------------------------------------
@@ -1549,6 +1550,9 @@ function _exitWithError()
         7) echo -e "\nError: Processor label not found... exiting\n" 1>&2
            exit 7
            ;;
+        8) echo -e "\nError: Processor Declaration not found... exiting\n" 1>&2
+           exit 8
+           ;;
         *) exit 1
            ;;
     esac
@@ -1636,9 +1640,7 @@ function main()
 
     _getBoardID
     _getProcessorNames
-    #
-    # _getProcessorScope (work in progress)
-    #
+    _getProcessorScope
 
     local modelID=$(_getModelName)
     local cpu_type=$(_getCPUtype)

From 9bdf5baf3f4bfd332fd2e375d025f0d18f56f61a Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 8 Apr 2013 08:04:17 +0200
Subject: [PATCH 373/623] grep -e 'AICPUPMI:' should show more/everything

---
 .../AppleIntelCPUPowerManagementInfo.cpp       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 8c4d3fa..4eef367 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -197,21 +197,21 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 #endif
 				msr = rdmsr64(MSR_PLATFORM_INFO);
 				gMinRatio = (UInt8)((msr >> 40) & 0xff);
-				IOLog("Low Frequency Mode : %d00 MHz\n", gMinRatio);
+				IOLog("AICPUPMI: Low Frequency Mode : %d00 MHz\n", gMinRatio);
  
 				gClockRatio = (UInt8)((msr >> 8) & 0xff);
-				IOLog("Clock Speed        : %d00 MHz\n", gClockRatio);
+				IOLog("AICPUPMI: Clock Speed        : %d00 MHz\n", gClockRatio);
 
 				if (!((rdmsr64(IA32_MISC_ENABLES) >> 32) & 0x40))	// Turbo Mode Enabled?
 				{
 					msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
 					gMaxRatio = (UInt8)(msr & 0xff);
-					IOLog("Max Turbo Frequency: %d00 MHz\n", gMaxRatio);
+					IOLog("AICPUPMI: Max Turbo Frequency: %d00 MHz\n", gMaxRatio);
 				}
 				else
 				{
 					gMaxRatio = gClockRatio;
-					IOLog("Max Frequency      : %d00 MHz\n", gMaxRatio);
+					IOLog("AICPUPMI: Max Frequency      : %d00 MHz\n", gMaxRatio);
 				}
 
 #if REPORT_GPU_STATS
@@ -230,14 +230,14 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 						if (memoryMap != NULL)
 						{
 							gMchbar = (UInt8 *)memoryMap->getVirtualAddress();
-							IOLog("Graphics Core Ratios:\n");
-							IOLog("Current Ratio       : 0x%02x\n", (UInt8)gMchbar[1]);
-							IOLog("Max Non-Turbo Ratio : 0x%02x\n", (UInt8)gMchbar[0x51]);
-							IOLog("Max Turbo Ratio     : 0x%02x\n", (UInt8)gMchbar[0x50]);
+							IOLog("AICPUPMI: Graphics Core Ratios:\n");
+							IOLog("AICPUPMI: Current Ratio       : 0x%02x\n", (UInt8)gMchbar[1]);
+							IOLog("AICPUPMI: Max Non-Turbo Ratio : 0x%02x\n", (UInt8)gMchbar[0x51]);
+							IOLog("AICPUPMI: Max Turbo Ratio     : 0x%02x\n", (UInt8)gMchbar[0x50]);
 						}
 						else
 						{
-							IOLog("Error: memoryMap == NULL\n");
+							IOLog("AICPUPMI: Error: memoryMap == NULL\n");
 						}
 					}
 					else

From 1370d390954d951e8a5f14324124f5c0a43a41b5 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 8 Apr 2013 08:05:12 +0200
Subject: [PATCH 374/623] Updating version info for RevoBoot v1.5.39

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index c7966c0..9caff18 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.38
+1.5.39

From 182160b195066a68ea813f925ef13a3d781a2d1d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 8 Apr 2013 08:05:44 +0200
Subject: [PATCH 375/623] Updating release notes for RevoBoot v1.5.39

---
 CHANGES | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGES b/CHANGES
index 5649f0c..30fe0dc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,18 @@ RevoBoot v1.5.40 (Next Major Release)
 - Improved P-State generation (less settings).
 
 
+RevoBoot v1.5.39
+================
+- Fixed boot failure for InstallESD/BaseSystem.dmg/patched kernelcache (Piker, April 2013).
+- LION_INSTALL_SUPPORT renamed to INSTALL_ESD_SUPPORT (Piker, April 2013).
+- Stripped (unnecessary) argument from loadSystemConfig (Pike, April 2013).
+- Renamed function loadSystemConfig to loadCABootPlist (Pike, April 2013).
+- Simplified search for and read of com.apple.Boot.plist (Pike, April 2013).
+- Board ID's for iMac12,n fixed (Jeroen, April 2013).
+- Settings template updated (Pike, April 2013).
+- VERSION updated to v1.5.39
+
+
 RevoBoot v1.5.38
 ================
 - RevoBoot/i386/libsaio/efi.c modified to workaround iMessage login/registration problems (PikerAlpha, January 2013).

From cf90aed1243d95e09f42cfa8113d9a57de2e3e5b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 8 Apr 2013 18:37:45 +0200
Subject: [PATCH 376/623] Adding a lost comma

---
 i386/libsaio/smbios/tools/smbios2struct3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/tools/smbios2struct3.c b/i386/libsaio/smbios/tools/smbios2struct3.c
index 3be8a8a..bafa881 100755
--- a/i386/libsaio/smbios/tools/smbios2struct3.c
+++ b/i386/libsaio/smbios/tools/smbios2struct3.c
@@ -101,7 +101,7 @@ char tableDescriptions[134][36] =
 	/* 129 */ "",
 	/* 130 */ "Memory SPD Data",
 	/* 131 */ "OEM Processor Type",
-	/* 132 */ "OEM Processor Bus Speed"
+	/* 132 */ "OEM Processor Bus Speed",
 	/* 133 */ "OEM Platform Feature"
 };
 

From c43273406d8b63ec04d37e19f00fc3912014dc11 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 8 Apr 2013 19:39:41 +0200
Subject: [PATCH 377/623] EDID resolution readout fixed

---
 i386/boot2/graphics.c | 27 +++++++++++++--------------
 i386/libsaio/vbe.c    | 12 +++++++-----
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/i386/boot2/graphics.c b/i386/boot2/graphics.c
index c42c451..bcc89bf 100755
--- a/i386/boot2/graphics.c
+++ b/i386/boot2/graphics.c
@@ -307,30 +307,29 @@ long initGraphicsMode()
 {
 	unsigned long params[4];
 
-	int count = getNumberArrayFromProperty(kGraphicsModeKey, params, 4);
-
-#if DEBUG
-	printf("\nwidth: %d  height: %d  depth: %d\n", params[0], params[1], params[2]);
-#endif
+	params[2] = 32; // Default depth
+	params[3] = 0;
 
 	//  Do we have a "Graphics Mode" property in com.apple.Boot.plist?
-	if (count < 3)
+	if (getNumberArrayFromProperty(kGraphicsModeKey, params, 4) < 3)
 	{
 #if USE_STATIC_DISPLAY_RESOLUTION
 		params[0] = DEFAULT_SCREEN_WIDTH;
 		params[1] = DEFAULT_SCREEN_HEIGHT;
 #else
-		unsigned long resolutionCombo = getResolutionFromEDID();
-		printf("EDID width :%l\n", resolutionCombo);
-		/* params[0] = */ printf("EDID width :%l\n", (resolutionCombo << 16));
-		/* params[1] = */ printf("EDID height:%l\n", (resolutionCombo & 0xFFF));
-		// sleep(15);
+		UInt32 resolutionCombo = getResolutionFromEDID();
+	#if DEBUG_BOOT_GRAPHICS
+		printf("EDID resolution (0x%04x)\n", resolutionCombo);
+	#endif
+		params[0] = (resolutionCombo >> 16);
+		params[1] = (resolutionCombo & 0xFFFF);
+	#if DEBUG_BOOT_GRAPHICS
+		printf("Width: %d, Height: %d, Depth: %d\n", params[0], params[1], params[2]);
+		sleep(10);
+	#endif
 #endif
 	}
 
-	params[2] = 32; // Don't bother. Use the de facto standard.
-	params[3] = 0;
-
 	return setVESAGraphicsMode(params[0], params[1], params[2], 0);
 }
 
diff --git a/i386/libsaio/vbe.c b/i386/libsaio/vbe.c
index 713e301..0334610 100755
--- a/i386/libsaio/vbe.c
+++ b/i386/libsaio/vbe.c
@@ -134,7 +134,7 @@ int setVBEPalette(void *palette)
 }
 
 
-#if USE_STATIC_DISPLAY_RESOLUTION == 0
+#if (USE_STATIC_DISPLAY_RESOLUTION == 0)
 //==============================================================================
 // Called from initGraphicsMode() in graphics.c
 
@@ -149,18 +149,20 @@ unsigned long getResolutionFromEDID(void)
 		bb.intno	= 0x10;
 		bb.eax.rr	= 0x4F15;
 		bb.ebx.r.l	= 0x01;
-		bb.edx.rr	= ++targetBlock;
+		bb.edx.rr	= targetBlock++;
 		bb.es		= SEG((void *)data);
 		bb.edi.rr	= OFF((void *)data);
 		bios(&bb);
 
 		// BIOS / display supports Display Data Channel (EDID) reading?
-		if (bb.eax.r.l == 0 && bb.eax.r.h == 79)
+		if ( ((bb.eax.rr & 0xff00) == 0) && ((bb.eax.rr & 0xff) == 0x4f) )
 		{
 			// Yes, supported. Check EDID header against known headers.
 			if (memcmp(data, header, sizeof(header)) != 0)
 			{
+#if DEBUG_BOOT_GRAPHICS
 				printf("targetBlock: %d\n", targetBlock);
+#endif
 				continue;
 			}
 
@@ -181,14 +183,14 @@ unsigned long getResolutionFromEDID(void)
 				}
 			}
 
-			sleep(5);
+			sleep(1);
 #endif
 			if (data[126] == 0)
 			{
 				targetBlock = 0;
 			}
 
-			return ( ( (data[56] | ((data[58] & 0xF0) << 4)) << 16) | (data[59] | ((data[61] & 0xF0) << 4)) );
+			return (((data[56] | ((data[58] & 0xF0) << 4)) << 16) | (data[59] | ((data[61] & 0xF0) << 4)));
 		}
 		else
 		{

From f06449a3ed749fc2479443de778b22c5fde6c1af Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 9 Apr 2013 20:24:03 +0200
Subject: [PATCH 378/623] Cleanup, removed unused function

---
 i386/libsaio/efi.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 91ea9a2..5cb4669 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -225,35 +225,6 @@ void initEFITree(void)
 }
 
 
-#ifndef SMB_STATIC_SYSTEM_UUID
-/*==============================================================================
-
-static EFI_CHAR8 * getSmbiosUUID()
-{
-	bool error = TRUE;
-
-	UInt8 *p = (UInt8 *)gPlatform.UUID;
-
-	for (int i = 0; i < 16; i++)
-	{
-		if (p[i] != 0x00 || p[i] != 0xff)
-		{
-			error = FALSE;
-		}
-	}
-
-	if (error)
-	{
-		printf("No proper UUID found in the System Information Table\n");
-		return NULL;
-	}
-
-	return (EFI_CHAR8 *)gPlatform.UUID;
-}
- */
-#endif
-
-
 //==============================================================================
 // Stage two EFI initialization (after getting data from com.apple.Boot.plist).
 
@@ -350,7 +321,7 @@ void finalizeEFITree(EFI_UINT32 kernelAdler32)
 	
 	DT__AddProperty(gPlatform.EFI.Nodes.Platform, "system-id", 16, (EFI_CHAR8 *) &SYSTEM_ID);
 #else
-	// DT__AddProperty(gPlatform.EFI.Nodes.Platform, "system-id", 16, getSmbiosUUID());
+	// gPlatform.UUID is set in: RevoBoot/i386/libsaio/SMBIOS/[dynamic/static]_data.h
 	DT__AddProperty(gPlatform.EFI.Nodes.Platform, "system-id", 16, (EFI_CHAR8 *)gPlatform.UUID);
 #endif
 	

From fafe72628dae0e28b57e34947bfc91b2a4d87be2 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 9 Apr 2013 20:25:39 +0200
Subject: [PATCH 379/623] Cleanups and iMessage fix for static SMBIOS data

---
 i386/libsaio/smbios/static_data.h | 96 ++++++++++++++++---------------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/i386/libsaio/smbios/static_data.h b/i386/libsaio/smbios/static_data.h
index 27601f1..4f39f51 100755
--- a/i386/libsaio/smbios/static_data.h
+++ b/i386/libsaio/smbios/static_data.h
@@ -6,6 +6,8 @@
  *			- New path for static EFI data (PikerAlpha, October 2012).
  *			- Optionally check /Extra/SMBIOS/[MacModelNN.bin] for static SMBIOS data (PikerAlpha, October 2012).
  *			- Get maxStructureSize/structureCount from factory EPS (PikerAlpha, October 2012).
+ *			- Cleanups/simplification of code (Pike, April 2013).
+ *			- iMessage fix for static SMBIOS data / init gPlatform.UUID from static data (Pike, April 2013).
  *
  * Credits:
  *			- blackosx, DB1, dgsga, FKA, humph, scrax and STLVNUB (testers).
@@ -14,65 +16,69 @@
 #ifndef __LIBSAIO_SMBIOS_STATIC_DATA_H
 #define __LIBSAIO_SMBIOS_STATIC_DATA_H
 
-	#include "essentials.h"
+#include "essentials.h"
 
-	int tableLength = 0;
-	long fileSize = 0; // FIXME: This variable <i>is used</i> but conditionally!
+int offset		= 0;
+int tableLength	= 0;
 
-	#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
-		char dirSpec[32] = "";
-		void * staticSMBIOSData = (void *)kLoadAddr;
+long fileSize	= 0L;
 
-		sprintf(dirSpec, "/Extra/SMBIOS/%s.bin", COMMA_STRIPPED_MODEL_ID);
+void * staticSMBIOSData = (void *)kLoadAddr;
 
-		_SMBIOS_DEBUG_DUMP("Loading: %s", dirSpec);
+#if LOAD_MODEL_SPECIFIC_SMBIOS_DATA
+	char dirSpec[32] = "";
 
-		fileSize = loadBinaryData(dirSpec, &staticSMBIOSData);
+	sprintf(dirSpec, "/Extra/SMBIOS/%s.bin", COMMA_STRIPPED_MODEL_ID);
+	_SMBIOS_DEBUG_DUMP("Loading: %s", dirSpec);
+	fileSize = loadBinaryData(dirSpec, &staticSMBIOSData);
 
-		if (fileSize > 0)
-		{
-			memcpy((kernelMemory + sizeof(* newEPS)), staticSMBIOSData, fileSize);
-
-			// factoryEPS = (struct SMBEntryPoint *) baseAddress;
-		
-			tableLength = fileSize;
-
-			_SMBIOS_DEBUG_DUMP("\n");
-		}
-		else // File not found. Use static data defined in RevoBoot/i386/config/SMBIOS/
-		{
-			// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
-			#include STRING(SMBIOS_DATA_FILE)
-		
-			static uint32_t SMBIOS_Table[] =
-			{
-				// Replaced with data from: RevoBoot/i386/config/SMBIOS/[data-template/MacModelNN].h
-				STATIC_SMBIOS_DATA
-			};
-
-			tableLength = sizeof(SMBIOS_Table);
-
-			_SMBIOS_DEBUG_DUMP("Error: File not found!\nNow trying statically linked SMBIOS data: %d bytes\n", tableLength);
+	if (fileSize > 0)
+	{
+		tableLength = fileSize;
+		_SMBIOS_DEBUG_DUMP("\n");
+	}
+	else // File not found. Use static data defined in: RevoBoot/i386/config/SMBIOS/MacModelNN.h
+	{
+		_SMBIOS_DEBUG_DUMP("Error: File not found!\n");
+	}
+#endif /* LOAD_MODEL_SPECIFIC_SMBIOS_DATA */
 
-			// Copy the static SMBIOS data into the newly allocated memory page. Right after the new EPS.
-			memcpy((kernelMemory + sizeof(* newEPS)), SMBIOS_Table, tableLength);
-		}
-	#else
+	if (fileSize == 0)
+	{
 		// The STRING (macro) is defined in RevoBoot/i386/config/settings.h
 		#include STRING(SMBIOS_DATA_FILE)
 		
 		static uint32_t SMBIOS_Table[] =
 		{
-			// Replaced with data from: RevoBoot/i386/config/SMBIOS/[data-template/MacModelNN].h
+			// Replaced with data from: RevoBoot/i386/config/SMBIOS/MacModelNN.h
 			STATIC_SMBIOS_DATA
 		};
-		
-		_SMBIOS_DEBUG_DUMP("Using statically linked SMBIOS data\n");
-		
+
 		tableLength = sizeof(SMBIOS_Table);
-		
-		// Copy the static SMBIOS data into the newly allocated memory page. Right after the new EPS.
-		memcpy((kernelMemory + sizeof(* newEPS)), SMBIOS_Table, tableLength);
-	#endif /* LOAD_MODEL_SPECIFIC_SMBIOS_DATA */
+		staticSMBIOSData = SMBIOS_Table;
+		_SMBIOS_DEBUG_DUMP("Using statically linked SMBIOS data: %d bytes\n", tableLength);
+	}
+
+	if (*(uint32_t *) staticSMBIOSData == 0x44495555) // "UUID" in little endian.
+	{
+		offset = 20; // "UUID" + 16 bytes data
+	}
+
+	// Copy the static SMBIOS data into the newly allocated memory page. Right after the new EPS.
+	memcpy((kernelMemory + sizeof(* newEPS)), staticSMBIOSData + offset, (tableLength - offset));
+
+#ifdef SMB_STATIC_SYSTEM_UUID
+	// This enables you to override the factory UUID from the settings file.
+	static unsigned char SMB_SYSTEM_UUID[] = SMB_STATIC_SYSTEM_UUID;
+
+	// Replace factory UUID with the one specified in: RevoBoot/i386/config/SETTINGS/MacModelNN.h
+	memcpy(gPlatform.UUID, SMB_SYSTEM_UUID, 16);
+#else
+	if (offset)
+	{
+		// Get UUID from (dynamically loaded) SMBIOS data (/Extra/SMBIOS/MacModelNN.bin)
+		memcpy(gPlatform.UUID, staticSMBIOSData + 4, 16);
+	}
+#endif
 
 #endif /* !__LIBSAIO_SMBIOS_STATIC_DATA_H */

From e63d088db219135dea19a44d44d7dc1a6fb5e368 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 9 Apr 2013 20:27:28 +0200
Subject: [PATCH 380/623] Ignore executable

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5a21fba..a787c99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj/xcuserd
 i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj/project.xcworkspace
 
 i386/libsaio/smbios/tools/smbios2struct3
+i386/libsaio/smbios/tools/smbios2struct4
+

From eb086c16b72e567491335650304a22262396c7d3 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 9 Apr 2013 21:11:25 +0200
Subject: [PATCH 381/623] Cleanups and iMessage fix for static SMBIOS data

---
 i386/libsaio/smbios/tools/smbios2struct3.c | 35 +++++++++++++++-------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/i386/libsaio/smbios/tools/smbios2struct3.c b/i386/libsaio/smbios/tools/smbios2struct3.c
index bafa881..1605831 100755
--- a/i386/libsaio/smbios/tools/smbios2struct3.c
+++ b/i386/libsaio/smbios/tools/smbios2struct3.c
@@ -1,9 +1,9 @@
 /*
  *
  * Name			: smbios2struct4
- * Version		: 1.1.1
+ * Version		: 1.1.2
  * Type			: Command line tool
- * Copyright	: Sam aka RevoGirl (c) 2011
+ * Copyright	: Sam aka RevoGirl (c) 2011 / Pike R. Alpha (c) 2012, 2013
  * Description	: SMBIOS extractor / converter (resulting in a smaller and more Apple like table).
  *
  * Usage		: sudo ./smbios2struct4											(output to terminal window)
@@ -15,6 +15,7 @@
  * Updates		: Interim solution for writing stripped SMBIOS table data to MacModelNN.bin (PikerAlpha, November 2012)
  *				: Check root priveledges for writing to: /Extra/SMBIOS/MacModelNN.bin (PikerAlpha, November 2012)
  *				: Now also saves /EFI-device-properties (PikerAlpha, November 2012)
+ *				: Cleanups and iMessage fix for static SMBIOS data (Pike, April 2013)
  *
  */
 
@@ -160,7 +161,7 @@ int main(int argc, char * argv[])
 #if DEBUG
 		printf("UID: %u EUID: %u\n", real_uid, euid);
 #endif
-		// Under sudo, getuid and geteuid return 0.
+		// Under sudo, getuid and geteuid returns 0.
 		if (real_uid != 0 || euid != 0)
 		{
 			printf("Error: Not root. Use sudo ./smbios2struct4 [filename without extension]\n");
@@ -322,21 +323,20 @@ int main(int argc, char * argv[])
 			UInt16 numBytes = (int) CFDataGetLength(dataRef);
 			printf("\nNumber of bytes: %d (Original SMBIOS table)\n", numBytes);
 #endif
-
+			SMBWord newHandle = 0;
 			SMBStructHeader * header;
+			SMBSystemInformation * systemInfo;
+
 			const UInt8 * tablePtr = (const UInt8 *) tableData;
 			const UInt8 * tableEndPtr  = tablePtr + tableLength;
 			const UInt8 * tableStructureStart = 0;
 			const UInt8 * droppedTableStructureStart = 0;
-			const UInt8 * tableBuffer = malloc(tableLength);
+			const UInt8 * tableBuffer = malloc(tableLength + 20);
 
-			// int index				= 0;
 			int maxStructureSize	= 0;
 			int newStructureCount	= 0;
 			int structureLength		= 0;
 
-			SMBWord newHandle = 0;
-
 			bzero((void *)tableBuffer, sizeof(tableBuffer));
 
 			while (structureCount-- && (tableEndPtr > tablePtr + sizeof(SMBStructHeader)))
@@ -349,11 +349,26 @@ int main(int argc, char * argv[])
 				{
 					break;
 				}
-				
+
 				switch (header->type)
 				{
-					case kSMBTypeBIOSInformation:			// Type 0
 					case kSMBTypeSystemInformation:			// Type 1
+
+						bcopy((void *)tableBuffer, (void *)tableBuffer + 20, (tableLength - 20));
+
+						static SMBByte const data[] = {
+							0x55, 0x55, 0x49, 0x44, 0x00, 0x00, 0x00, 0x00,
+							0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+							0x00, 0x00, 0x00, 0x00
+						};
+
+						bcopy(data, (void *)tableBuffer, 20);
+
+						systemInfo = (SMBSystemInformation *) tablePtr;
+						bcopy((SMBByte *)systemInfo->uuid, (void *)tableBuffer + 4, 16);
+						newTableLength += 20;
+
+					case kSMBTypeBIOSInformation:			// Type 0
 					case kSMBTypeBaseBoard:					// Type 2
 					case kSMBTypeProcessorInformation:		// Type 4
 					// case kSMBTypeMemoryModule:			// Type 6

From 87e45a22f369d029555b73e76cd76835f29bd146 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 10 Apr 2013 11:57:35 +0200
Subject: [PATCH 382/623] Comment change only

---
 i386/libsaio/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu.c b/i386/libsaio/cpu.c
index 5cdeefb..7452c72 100644
--- a/i386/libsaio/cpu.c
+++ b/i386/libsaio/cpu.c
@@ -195,7 +195,7 @@ void checkFlexRatioMSR(void)
 	// The processor’s maximum non-turbo core frequency is configured during power-on reset 
 	// by using its manufacturing default value. This value is the highest non-turbo core 
 	// multiplier at which the processor can operate. If lower maximum speeds are desired, 
-	// the appropriate ratio can be configured using the FLEX_RATIO MSR. 
+	// then the appropriate ratio can be configured using the FLEX_RATIO MSR. 
 	
 	uint64_t msr = rdmsr64(MSR_FLEX_RATIO);
 	

From 5fa9087ad4ca4db0200f64df4280d7f4f98882ed Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 10 Apr 2013 11:57:48 +0200
Subject: [PATCH 383/623] Adding missing MSR's

---
 i386/libsaio/cpu/essentials.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 73c44be..cd4bd33 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -88,6 +88,9 @@
 #define MSR_CORE_C6_RESIDENCY		0x3FD
 #define MSR_CORE_C7_RESIDENCY		0x3FE
 
+#define MSR_PP0_CURRENT_CONFIG		0x601
+#define MSR_PP1_CURRENT_CONFIG		0x602
+
 // Sandy Bridge & JakeTown specific 'Running Average Power Limit' MSR's.
 #define MSR_RAPL_POWER_UNIT			0x606
 

From 686f47efb03f725488e2a52c59ec2d5644ea5c0c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 10 Apr 2013 11:59:03 +0200
Subject: [PATCH 384/623] Output change (MSR added)

---
 .../AppleIntelCPUPowerManagementInfo.cpp                       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 4eef367..eaa7455 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -37,17 +37,18 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(void)
 
 	IOLog("MSR_POWER_CTL..............(0x1FC) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_POWER_CTL));
 
-	IOLog("rdmsr64....................(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(0x602));
 	IOLog("MSR_RAPL_POWER_UNIT........(0x606) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_RAPL_POWER_UNIT));
 	IOLog("MSR_PKG_POWER_LIMIT........(0x610) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_POWER_LIMIT));
 	IOLog("MSR_PKG_ENERGY_STATUS......(0x611) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_ENERGY_STATUS));
 
+	IOLog("MSR_PP0_CURRENT_CONFIG.....(0x601) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_CURRENT_CONFIG));
 	IOLog("MSR_PP0_POWER_LIMIT........(0x638) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POWER_LIMIT));
 	IOLog("MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
 	IOLog("MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
 
 	if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_IB_CORE))
 	{
+		IOLog("MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
 		IOLog("MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
 		IOLog("MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
 		IOLog("MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY));

From 5a53f5834f80e1878c4e4db6c61a8dee98fb4c1a Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 12 Apr 2013 12:13:26 +0200
Subject: [PATCH 385/623] Some additional Haswell bits and pieces

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh  | 27 +++++++++++++++++--
 i386/libsaio/cpu/Intel/dynamic_data.h |  8 +++++-
 i386/libsaio/cpu/essentials.h         | 38 +++++++++++++++++++++------
 3 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 5944aee..2cd130e 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -726,6 +726,18 @@ function _printMethodDSM()
 
 function _printScopeACST()
 {
+#
+# Intel values for Sandy / Ivy Bridge processors
+#
+# C-state : Power   : SB Latency : IB Latency
+#---------:---------:------------:------------
+#   C1    :  0x3e8  :    0x01    :    0x03
+#   C3    :  0x1f4  :    0x50    :    0xcd
+#   C6    :  0x15e  :    0x68    :    0xf5
+#   C7    :  0xc8   :    0x6d    :    0xf5
+#
+# Note: C-state latency in uS and C-state power in mW.
+
     let C1=0
     let C2=0
     let C3=0
@@ -1281,7 +1293,10 @@ function _showLowPowerStates()
         local cStates=$1
 
         printf "Injected C-States for ${gProcessorNames[$2]} ("
-
+        #
+        # Haswell    : C0, C1, C1E, C2E, C3, C4, C6 and C7
+        # Haswell-ULT: C0, C1, C1E, C2E, C3, C4, C6, C7, C8, C9 and C10
+        #
         for state in C1 C2 C3 C6 C7
         do
             if (($cStates & $mask)); then
@@ -1620,11 +1635,19 @@ function main()
             let gBridgeType=4
         fi
 
-        if (($model==0x3C || $model==0x3F || $model==0x45)); then
+        # Haswell
+        if (($model==0x30)); then
             let assumedTDP=1
             let gTdp=84
             let gBridgeType=8
         fi
+
+        # Haswell ULT
+        if (($model==0x40)); then
+            let assumedTDP=1
+            let gTdp=15
+            let gBridgeType=8
+        fi
     fi
 
     case $gBridgeType in
diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 65a493c..c794c44 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -349,6 +349,12 @@ void initCPUStruct(void)
 					hiBit = 31;
 					break;
 
+				case CPU_MODEL_HASWELL:
+				case CPU_MODEL_HASWELL_ULT:
+					CoreBridgeType = HASWELL;
+					hiBit = 31;
+					break;
+
 				case CPU_MODEL_NEHALEM:
 				case CPU_MODEL_NEHALEM_EX:
 				case CPU_MODEL_FIELDS:
@@ -396,7 +402,7 @@ void initCPUStruct(void)
 					requestMaxTurbo(maxBusRatio);
 				}
 
-				if (CoreBridgeType) // (SandyBridge || IvyBridge)
+				if (CoreBridgeType) // (SandyBridge || IvyBridge || Haswell)
 				{
 					// gPlatform.CPU.Type += CoreBridgeType;
 
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index cd4bd33..7aa67ba 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -24,9 +24,12 @@
  * limitations under the License.
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
- */
-/*
+ *
  * @OSF_COPYRIGHT@
+ *
+ * Updates:
+ *
+ *			- New Haswell (ULT) specific MSR's added (Pike, April 2013).
  */
 
 #ifndef __LIBSAIO_CPU_ESSENTIALS_H
@@ -99,6 +102,28 @@
 #define MSR_PKG_PERF_STATUS			0x613
 #define MSR_PKG_POWER_INFO			0x614
 
+// JakeTown only Memory MSR's.
+#define MSR_DRAM_POWER_LIMIT		0x618
+#define MSR_DRAM_ENERGY_STATUS		0x619
+#define MSR_DRAM_PERF_STATUS		0x61B
+#define MSR_DRAM_POWER_INFO			0x61C
+
+// Haswell-ULT Package residency
+#define MSR_PKG_C8_RESIDENCY		0x630
+#define MSR_PKG_C9_RESIDENCY		0x631
+#define MSR_PKG_C10_RESIDENCY		0x632
+
+// Haswell-ULT C state latency control.
+#define MSR_PKG_C8_LATENCY			0x633
+#define MSR_PKG_C9_LATENCY			0x634
+#define MSR_PKG_C10_LATENCY			0x635
+
+// Haswell-ULT VR configurations.
+#define VR_MISC_CONFIG2				0x636
+
+// Haswell-ULT Alternate BCLK in deep Package C states.
+#define MSR_COUNTER_24_MHZ			0x637
+
 // Sandy Bridge IA (Core) domain MSR's.
 #define MSR_PP0_POWER_LIMIT			0x638
 #define MSR_PP0_ENERGY_STATUS		0x639
@@ -117,12 +142,6 @@
 #define MSR_CONFIG_TDP_CONTROL		0x64B
 #define MSR_TURBO_ACTIVATION_RATIO	0x64C
 
-// JakeTown only Memory MSR's.
-#define MSR_DRAM_POWER_LIMIT		0x618
-#define MSR_DRAM_ENERGY_STATUS		0x619
-#define MSR_DRAM_PERF_STATUS		0x61B
-#define MSR_DRAM_POWER_INFO			0x61C
-
 // CPUID leaf index values (pointing to the right spot in CPUID/LEAF array).
 
 #define LEAF_0				0			// DHP: Formerly known as CPUID_n
@@ -155,6 +174,9 @@
 #define CPU_MODEL_IB_CORE_EX		0x3B	// Ivy Bridge Core Processors (LGA 2011)
 #define CPU_MODEL_IB_CORE_XEON		0x3E
 
+#define CPU_MODEL_HASWELL			0x30
+#define CPU_MODEL_HASWELL_ULT		0x40
+
 #define CPU_MODEL_HASWELL			0x3C
 #define CPU_MODEL_HASWELL_CORE		0x3F
 #define CPU_MODEL_HASWELL_CORE_EX	0x45

From 63b822c9e27d102a75c359b46b414eebefd3f3f7 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 13 Apr 2013 19:16:59 +0200
Subject: [PATCH 386/623] Fixing a duplicated value

---
 i386/libsaio/cpu/essentials.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 7aa67ba..37fb355 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -177,9 +177,9 @@
 #define CPU_MODEL_HASWELL			0x30
 #define CPU_MODEL_HASWELL_ULT		0x40
 
-#define CPU_MODEL_HASWELL			0x3C
-#define CPU_MODEL_HASWELL_CORE		0x3F
-#define CPU_MODEL_HASWELL_CORE_EX	0x45
+// #define CPU_MODEL_HASWELL			0x3C
+// #define CPU_MODEL_HASWELL_CORE		0x3F
+// #define CPU_MODEL_HASWELL_CORE_EX	0x45
 
 #define DALES_BRIDGE	1
 #define SANDY_BRIDGE	2

From c39385d48e99b5042b757b98fc82c81b6a35ff25 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 13 Apr 2013 19:17:26 +0200
Subject: [PATCH 387/623] Hiding a backup directory

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index a787c99..b1b2a88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,8 @@ i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/secretCode.h
 i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj/xcuserdata
 i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo.xcodeproj/project.xcworkspace
 
+i386/libsaio/cpu/tools/PMinfoBackup
+
 i386/libsaio/smbios/tools/smbios2struct3
 i386/libsaio/smbios/tools/smbios2struct4
 

From 721c931265b72e4b9d81503cf618ad80fcd859ac Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 13 Apr 2013 19:18:44 +0200
Subject: [PATCH 388/623] Adding IGPU P-States

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 119 ++++++++++++------
 .../AppleIntelCPUPowerManagementInfo.h        |  64 +++++++++-
 2 files changed, 144 insertions(+), 39 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index eaa7455..f701306 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -104,6 +104,16 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 	UInt8 currentMultiplier = (rdmsr64(MSR_IA32_PERF_STS) >> 8);
 	gCoreMultipliers |= (1ULL << currentMultiplier);
 
+#if REPORT_GPU_STATS
+	UInt8 currentIgpuMultiplier = 0;
+
+	if (igpuEnabled)
+	{
+		currentIgpuMultiplier = (UInt8)gMchbar[1];
+		gIGPUMultipliers |= (1ULL << currentIgpuMultiplier);
+	}
+#endif
+
 	timerEventSource->setTimeoutTicks(Interval);
 
 	if (loopLock)
@@ -121,14 +131,21 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 		IOSimpleLockUnlock(simpleLock);
 	}
 
+#if REPORT_GPU_STATS
+	if ((gCoreMultipliers != gTriggeredPStates) || (gIGPUMultipliers != gTriggeredIGPUPStates))
+#else
 	if (gCoreMultipliers != gTriggeredPStates)
+#endif
 	{
+		int currentBit = 0;
+		UInt64 value = 0ULL;
+
 		gTriggeredPStates = gCoreMultipliers;
 		IOLog("AICPUPMI: CPU P-States [ ");
-		
-		for (int currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
+
+		for (currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
 		{
-			UInt64 value = (1ULL << currentBit);
+			value = (1ULL << currentBit);
 			
 			if ((gTriggeredPStates & value) == value)
 			{
@@ -142,11 +159,32 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 				}
 			}
 		}
+
 #if REPORT_GPU_STATS
-		IOLog("] GPU P-State [ %d ]\n", (UInt8)gMchbar[1]);
-#else
-		IOLog("]\n");
+		if (igpuEnabled)
+		{
+			gTriggeredIGPUPStates = gIGPUMultipliers;
+			IOLog("] GPU P-States [ ");
+			
+			for (currentBit = 17; currentBit <= 27; currentBit++)
+			{
+				value = (1ULL << currentBit);
+				
+				if ((gTriggeredIGPUPStates & value) == value)
+				{
+					if (currentBit == currentIgpuMultiplier)
+					{
+						IOLog("(%d) ", currentBit);
+					}
+					else
+					{
+						IOLog("%d ", currentBit);
+					}
+				}
+			}
+		}
 #endif
+		IOLog("]\n");
 	}
 
 	loopLock = false;
@@ -216,40 +254,46 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				}
 
 #if REPORT_GPU_STATS
-				/*
-				 * TODO: Pike, add check a to see if there is a GPU and if it is enabled!
-				 */
-				IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
-				memDescriptor = IOMemoryDescriptor::withPhysicalAddress(address, 0x53, kIODirectionIn);
-				
-				if (memDescriptor != NULL)
+				if ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK))
 				{
-					if ((result = memDescriptor->prepare()) == kIOReturnSuccess)
+					IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
+					memDescriptor = IOMemoryDescriptor::withPhysicalAddress(address, 0x53, kIODirectionInOut);
+				
+					if (memDescriptor != NULL)
 					{
-						memoryMap = memDescriptor->map();
-						
-						if (memoryMap != NULL)
+						if ((result = memDescriptor->prepare()) == kIOReturnSuccess)
 						{
-							gMchbar = (UInt8 *)memoryMap->getVirtualAddress();
-							IOLog("AICPUPMI: Graphics Core Ratios:\n");
-							IOLog("AICPUPMI: Current Ratio       : 0x%02x\n", (UInt8)gMchbar[1]);
-							IOLog("AICPUPMI: Max Non-Turbo Ratio : 0x%02x\n", (UInt8)gMchbar[0x51]);
-							IOLog("AICPUPMI: Max Turbo Ratio     : 0x%02x\n", (UInt8)gMchbar[0x50]);
+							memoryMap = memDescriptor->map();
+						
+							if (memoryMap != NULL)
+							{
+								igpuEnabled = true; // IGPU Enabled and Visible
+								gMchbar = (UInt8 *)memoryMap->getVirtualAddress();
+
+								IOLog("AICPUPMI: IGPU Current Freq..: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x01]));
+								IOLog("AICPUPMI: IGPU Max Frequency.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x51]));
+								IOLog("AICPUPMI: IGPU Max Turbo Freq: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x50]));
+								//
+								// Example-1: 17 (multiplier) * 50 (frequency in MHz) =  850 MHz
+								// Example-2: 22 (multiplier) * 50 (frequency in MHz) = 1100 MHz
+								// 6 P-States: 850, 900, 950, 1000, 1050 and 1100 MHz
+								//
+							}
+							else
+							{
+								IOLog("AICPUPMI: Error: memoryMap == NULL\n");
+							}
 						}
 						else
 						{
-							IOLog("AICPUPMI: Error: memoryMap == NULL\n");
+							IOLog("AICPUPMI: Error: memDescriptor->prepare() failed!\n");
 						}
 					}
 					else
 					{
-						IOLog("Error: memDescriptor->prepare() failed!\n");
+						IOLog("AICPUPMI: Error: memDescriptor == NULL\n");
 					}
 				}
-				else
-				{
-					IOLog("Error: memDescriptor == NULL\n");
-				}
 #endif
 				timerEventSource->setTimeoutMS(1000);
 
@@ -290,16 +334,19 @@ void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
 void AppleIntelCPUPowerManagementInfo::free()
 {
 #if REPORT_GPU_STATS
-	if (memoryMap)
+	if (igpuEnabled)
 	{
-		memoryMap->release();
-		memoryMap = NULL;
-	}
+		if (memoryMap)
+		{
+			memoryMap->release();
+			memoryMap = NULL;
+		}
 
-	if (memDescriptor)
-	{
-		memDescriptor->release();
-		memDescriptor = NULL;
+		if (memDescriptor)
+		{
+			memDescriptor->release();
+			memDescriptor = NULL;
+		}
 	}
 #endif
 
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index ebd5a79..f161451 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -22,7 +22,61 @@
 #define super IOService
 
 #define REPORT_MSRS			1
-#define REPORT_GPU_STATS	0
+#define REPORT_GPU_STATS	1
+
+#define NB_BUS	0x00
+#define NB_DEV	0x00
+#define NB_FUN	0x00
+
+#define DEVEN	(0x54)
+#define DEVEN_D2EN_MASK	(0x10)
+
+#define NB_PCICFG_SPACE_INDEX_REG	0xcf8
+#define NB_PCICFG_SPACE_DATA_REG	0xcfc
+
+#define BIT31						0x80000000
+
+#define PCIEX_BASE_ADDRESS			0xF8000000
+#define NB_MCH_BASE_ADDRESS			0xFED10000	// (G)MCH Memory Mapped Register Range Base Address (D0:F0:Rx48).
+
+#define READ_PCI8(Bx, Dx, Fx, Rx)	ReadPci8(Bx, Dx, Fx, Rx)
+#define READ_PCI8_NB(Rx)			READ_PCI8(NB_BUS, NB_DEV, NB_FUN, Rx)
+#define MMIO_READ8(Address)			(*(volatile UInt8  *)(Address))
+
+#define IGPU_RATIO_TO_FREQUENCY(ratio)	((ratio * 100) / 2)
+
+#define NB_PCI_CFG_ADDRESS(bus, dev, func, reg) \
+	(UInt64) ((((UInt8)(bus) << 24) + ((UInt8)(dev) << 16) + \
+	((UInt8)(func) << 8) + ((UInt8)(reg))) & 0xffffffff)
+
+#define NB_PCIE_CFG_ADDRESS(bus, dev, func, reg) \
+	((UInt32)(PCIEX_BASE_ADDRESS + ((UInt8)(bus) << 20) + \
+	((UInt8)(dev) << 15) + ((UInt8)(func) << 12) + (reg)))
+
+static __inline__ unsigned char inb(UInt16 port)
+{
+	UInt8 value;
+	__asm__ volatile("inb %w1, %b0" : "=a" (value) : "Nd" (port));
+	return (value);
+}
+
+static __inline__ void outl(UInt16 port, UInt32 value)
+{
+	__asm__ volatile("outl %0, %w1" : : "a" (value), "Nd" (port));
+}
+
+UInt8 ReadPci8(UInt8 Bus, UInt8 Dev, UInt8 Fun, UInt16 Reg)
+{
+	if (Reg >= 0x100)
+	{
+		return MMIO_READ8(NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
+	}
+	else
+	{
+		outl(NB_PCICFG_SPACE_INDEX_REG, BIT31 | (Bus << 16) | (Dev << 11) | (Fun << 8) | (Reg & 0xfc));
+		return inb(NB_PCICFG_SPACE_DATA_REG | (UInt8)(Reg & 3));
+    }
+}
 
 extern "C" void mp_rendezvous_no_intrs(void (*action_func)(void *), void * arg);
 extern "C" int cpu_number(void);
@@ -49,11 +103,15 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 
 	bool loopLock = false;
 	bool dumpCStates = false;
+	bool igpuEnabled = false;
 
 	UInt16 Interval	= 50;
 
-	UInt64	gCoreMultipliers	= 0ULL;
-	UInt64	gTriggeredPStates	= 0ULL;
+	UInt64	gCoreMultipliers		= 0ULL;
+	UInt64	gTriggeredPStates		= 0ULL;
+
+	UInt64	gIGPUMultipliers		= 0ULL;
+	UInt64	gTriggeredIGPUPStates	= 0ULL;
 
 public:
 	virtual IOService *	probe(IOService * provider, SInt32 * score);

From 8d0ee17fb43145c60417f87fe4e016f8ac3a2341 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 17 Apr 2013 07:07:54 +0200
Subject: [PATCH 389/623] Removing all DEBUG port related code

---
 .../acpi/examples/P8Z68-V PRO/dsdt.dsl        | 49 +------------------
 1 file changed, 1 insertion(+), 48 deletions(-)

diff --git a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl
index e5096f0..19edd67 100644
--- a/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
+++ b/i386/libsaio/acpi/examples/P8Z68-V PRO/dsdt.dsl	
@@ -39,8 +39,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
     OperationRegion (GNVS, SystemMemory, OPRE, 0x0163)
     Field (GNVS, AnyAcc, Lock, Preserve)
     {
-                Offset (0x0B), 
-        P80D,   32,
                 Offset (0x3C), 
         IGDS,   8,
                 Offset (0xAA), 
@@ -68,23 +66,11 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
         GP27,   1
     }
 
-    OperationRegion (DEB0, SystemIO, 0x80, One)
-    Field (DEB0, ByteAcc, NoLock, Preserve)
-    {
-        DBG8,   8
-    }
-
-    OperationRegion (PRT0, SystemIO, 0x80, 0x04)
-    Field (PRT0, DWordAcc, Lock, Preserve)
-    {
-        P80H,   32
-    }
-
     Method (_PIC, 1, NotSerialized)
     {
     }
 
-    Scope (_PR)
+    Scope (\_PR)
     {
         Processor (CPU0, 0x01, 0x00000410, 0x06) {}
         Processor (CPU1, 0x02, 0x00000410, 0x06) {}
@@ -1142,8 +1128,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
         Method (_L01, 0, NotSerialized)
         {
             Add (L01C, One, L01C)
-            P8XH (Zero, One)
-            P8XH (One, L01C)
         }
 
         Method (_L02, 0, NotSerialized)
@@ -1185,38 +1169,8 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
     Name (_S4, Package (0x03) { 0x06, 0x06, Zero })
     Name (_S5, Package (0x03) { 0x07, 0x07, Zero })
 
-    Method (P8XH, 2, Serialized)
-    {
-        If (LEqual (Arg0, Zero))
-        {
-            Store (Or (And (P80D, 0xFFFFFF00), Arg1), P80D)
-        }
-
-        If (LEqual (Arg0, One))
-        {
-            Store (Or (And (P80D, 0xFFFF00FF), ShiftLeft (Arg1, 0x08)
-                ), P80D)
-        }
-
-        If (LEqual (Arg0, 0x02))
-        {
-            Store (Or (And (P80D, 0xFF00FFFF), ShiftLeft (Arg1, 0x10)
-                ), P80D)
-        }
-
-        If (LEqual (Arg0, 0x03))
-        {
-            Store (Or (And (P80D, 0x00FFFFFF), ShiftLeft (Arg1, 0x18)
-                ), P80D)
-        }
-
-        Store (P80D, P80H)
-    }
-
     Method (_PTS, 1, NotSerialized)
     {
-        Store (Zero, P80D)
-        P8XH (Zero, Arg0)
         If (Arg0)
         {
             Store (One, \_SB.PCI0.LPCB.SLPX)
@@ -1231,7 +1185,6 @@ DefinitionBlock ("dsdt.aml", "DSDT", 2, "APPLE", "Macmini", 0x00050001)
 
     Method (_WAK, 1, Serialized)
     {
-        ShiftLeft (Arg0, 0x04, DBG8)
         \_SB.PCI0.LPCB.SWAK (Arg0)
         Store (Zero, \_SB.PCI0.LPCB.PLED)
         Return (Package (0x02)

From a3df7a08766170d9218df713cd4caf9dd99e0bf7 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 17 Apr 2013 16:51:57 +0200
Subject: [PATCH 390/623] New path for Clover revision 1277

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 2cd130e..959de69 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 6.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 6.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -66,6 +66,7 @@
 #			- Show warnings for Sandy Bridge systems as well (Jeroen, March 2013)
 #			- New Intel Haswell processors added (Jeroen, April 2013)
 #			- Improved Processor declaration detection (Jeroen/Pike, April 2013)
+#			- New path for Clover revision 1277 (Jeroen, April 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -167,7 +168,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=6.0
+gScriptVersion=6.1
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1152,7 +1153,14 @@ function _setDestinationPath
     fi
 
     #
-    # Checking for Clover
+    # Checking for Clover rev 1277 (projectosx.com/forum/index.php?showtopic=2656&p=29129&#entry29129)
+    #
+    if [ -d /EFI/Clover/ACPI/patched ]; then
+        gDestinationPath="/EFI/Clover/ACPI/patched/"
+    fi
+
+    #
+    # Checking for Clover (older versions)
     #
     if [ -d /EFI/ACPI/patched ]; then
         gDestinationPath="/EFI/ACPI/patched/"
@@ -1917,11 +1925,11 @@ if (($gCallIasl)); then
     #
     if (($gAutoCopy)); then
         if [ -f ${gPath}/${gSsdtID}.aml ]; then
+            _setDestinationPath
             echo -e
             read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
             case "$choice" in
-                y|Y ) _setDestinationPath
-                      sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile}
+                y|Y ) sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile}
                       ;;
             esac
         fi

From a40a6637e4adf8ff25890db2cd535c59235fa72c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 26 May 2013 13:20:47 +0200
Subject: [PATCH 391/623] Securing version 6.4

Jeroen accedentally rm'ed my local RevoBoot directory while I was
working in it.  We lost all Haswell updates (:
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 254 +++++++++++++++++----------
 1 file changed, 165 insertions(+), 89 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 959de69..daf0c00 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 6.1 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 6.4 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -67,11 +67,17 @@
 #			- New Intel Haswell processors added (Jeroen, April 2013)
 #			- Improved Processor declaration detection (Jeroen/Pike, April 2013)
 #			- New path for Clover revision 1277 (Jeroen, April 2013)
+#			- Haswell's minimum core frequency is 800 MHz (Jeroen, April 2013)
+#			- CPU signature output added (Jeroen/Pike, April 2013)
+#			- Updating to v6.4 after Jeroen's accidental RM of my local RevoBoot directory (Pike, May 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
 #			- Thanks to 'stinga11' for Sandy Bridge (E5) data and processor list errors.
 #			- Many thanks to Jeroen for the CPU data, cleanups, renaming stuff and other improvements.
+#			- Thanks to 'philip_petev' for his help with Snow Leopard/egrep incompatibility.
+#			- Thanks to 'RehabMan' for his help with Snow Leopard/egrep incompatibility.
+#			- Thanks to 'BigDonkey' for his help with LFM (800 MHz) for Sandy Bridge mobility models.
 #
 # Usage (v1.0 - v4.9):
 #
@@ -130,7 +136,7 @@ gDestinationPath="/Extra/"
 #
 # This is the filename used for the copy process
 #
-gDestinationFile="ssdt.aml"
+gDestinationFile="ssdt_pr.aml"
 
 #
 # A value of 1 will make this script call iasl (compiles ssdt_pr.dsl)
@@ -168,7 +174,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=6.1
+gScriptVersion=6.5
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -198,11 +204,13 @@ let SANDY_BRIDGE=2
 let gTypeCPU=0
 gProcessorData="Unknown CPU"
 gProcessorNumber=""
+gBusFrequency=100
+gUnmountEFIPartition=false
 
 #
 # Maximum Turbo Clock Speed (user configurable)
 #
-let gMaxOCFrequency=5000
+let gMaxOCFrequency=6300
 
 let MAX_TURBO_FREQUENCY_ERROR=2
 let MAX_TDP_ERROR=3
@@ -239,6 +247,7 @@ E3-1220,80,0,3100,3400,4,4
 )
 
 gDesktopSandyBridgeCPUList=(
+i7-35355,120,1600,2666,2666,4,4
 # i7 Desktop Extreme Series
 i7-3970X,150,0,3500,4000,6,12
 i7-3960X,130,0,3300,3900,6,12
@@ -278,56 +287,56 @@ i3-2100,65,1600,3100,0,2,4
 
 gMobileSandyBridgeCPUList=(
 # i7 Mobile Extreme Series
-i7-2960XM,55,0,2700,3700,4,8
-i7-2920XM,55,0,2500,3500,4,8
+i7-2960XM,55,800,2700,3700,4,8
+i7-2920XM,55,800,2500,3500,4,8
 # i7 Mobile Series
-i7-2860QM,45,0,2500,3600,4,8
-i7-2820QM,45,0,2300,3400,4,8
-i7-2760QM,45,0,2400,3500,4,8
-i7-2720QM,45,0,2200,3300,4,8
-i7-2715QE,45,0,2100,3000,4,8
-i7-2710QE,45,0,2100,3000,4,8
-i7-2677M,17,0,1800,2900,2,4
-i7-2675QM,45,0,2200,3100,4,8
-i7-2670QM,45,0,2200,3100,4,8
-i7-2675M,17,0,1600,2700,2,4
-i7-2655LE,25,0,2200,2900,2,4
-i7-2649M,25,0,2300,3200,2,4
-i7-26740M,32,0,2800,3500,2,4
-i7-2637M,17,0,1700,2800,2,4
-i7-2635QM,45,0,2000,2900,4,8
-i7-2630QM,45,0,2000,2900,4,8
-i7-2629M,25,0,2100,3000,2,4
-i7-2620M,35,0,2700,3400,2,4
-i7-2617M,17,0,1500,2600,2,4
-i7-2610UE,17,0,1500,2400,2,4
+i7-2860QM,45,800,2500,3600,4,8
+i7-2820QM,45,800,2300,3400,4,8
+i7-2760QM,45,800,2400,3500,4,8
+i7-2720QM,45,800,2200,3300,4,8
+i7-2715QE,45,800,2100,3000,4,8
+i7-2710QE,45,800,2100,3000,4,8
+i7-2677M,17,800,1800,2900,2,4
+i7-2675QM,45,800,2200,3100,4,8
+i7-2670QM,45,800,2200,3100,4,8
+i7-2675M,17,800,1600,2700,2,4
+i7-2655LE,25,800,2200,2900,2,4
+i7-2649M,25,800,2300,3200,2,4
+i7-26740M,32,800,2800,3500,2,4
+i7-2637M,17,800,1700,2800,2,4
+i7-2635QM,45,800,2000,2900,4,8
+i7-2630QM,45,800,2000,2900,4,8
+i7-2629M,25,800,2100,3000,2,4
+i7-2620M,35,800,2700,3400,2,4
+i7-2617M,17,800,1500,2600,2,4
+i7-2610UE,17,800,1500,2400,2,4
 # i5 Mobile Series
-i5-2467M,17,0,1600,2300,2,4
+i5-2467M,17,800,1600,2300,2,4
 i5-2450M,35,800,2300,3100,2,4
-i5-2435M,35,0,2400,3000,2,4
-i5-2430M,35,0,2400,3000,2,4
-i5-2410M,35,0,2300,2900,2,4
-i5-2557M,17,0,1700,2700,2,4
-i5-2540M,35,0,2600,3300,2,4
-i5-2537M,17,0,1400,2300,2,4
-i5-2520M,35,0,2500,3200,2,4
-i5-2515E,35,0,2500,3100,2,4
-i5-2510E,35,0,2500,3100,2,4
+i5-2435M,35,800,2400,3000,2,4
+i5-2430M,35,800,2400,3000,2,4
+i5-2410M,35,800,2300,2900,2,4
+i5-2557M,17,800,1700,2700,2,4
+i5-2540M,35,800,2600,3300,2,4
+i5-2537M,17,800,1400,2300,2,4
+i5-2520M,35,800,2500,3200,2,4
+i5-2515E,35,800,2500,3100,2,4
+i5-2510E,35,800,2500,3100,2,4
 # i3 2300 Mobile Series
-i3-2377M,17,0,1500,0,2,4
-i3-2370M,35,0,2400,0,2,4
-i3-2367M,17,0,1400,0,2,4
-i3-2365M,17,0,1400,0,2,4
-i3-2357M,17,0,1300,0,2,4
-i3-2350M,35,0,2300,0,2,4
-i3-2348M,35,0,2300,0,2,4
-i3-2340UE,17,0,1300,0,2,4
-i3-2330M,35,0,2200,0,2,4
-i3-2330E,35,0,2200,0,2,4
-i3-2328M,35,0,2200,0,2,4
-i3-2312M,35,0,2100,0,2,4
-i3-2310M,35,0,2100,0,2,4
-i3-2310E,35,0,2100,0,2,4
+i3-2377M,17,800,1500,0,2,4
+i3-2370M,35,800,2400,0,2,4
+i3-2367M,17,800,1400,0,2,4
+i3-2365M,17,800,1400,0,2,4
+i3-2357M,17,800,1300,0,2,4
+i3-2350M,35,800,2300,0,2,4
+i3-2348M,35,800,2300,0,2,4
+i3-2340UE,17,800,1300,0,2,4
+i3-2330M,35,800,2200,0,2,4
+i3-2330E,35,800,2200,0,2,4
+i3-2328M,35,800,2200,0,2,4
+i3-2312M,35,800,2100,0,2,4
+i3-2310M,35,800,2100,0,2,4
+i3-2310E,35,800,2100,0,2,4
 )
 
 
@@ -452,31 +461,31 @@ gServerHaswellCPUList=(
 
 gDesktopHaswellCPUList=(
 # Socket 2011 (Premium Power)
-i7-4960K,130,0,3600,4000,6,12
-i7-4930K,130,0,3400,3900,6,12
-i5-4820K,130,0,3700,3900,4,8
+i7-4960K,130,800,3600,4000,6,12
+i7-4930K,130,800,3400,3900,6,12
+i5-4820K,130,800,3700,3900,4,8
 # Socket 1150 (Standard Power)
-i7-4770K,84,00,3500,3900,4,8
-i7-4770,84,0,3400,3900,4,8
-i5-4670K,84,0,3400,3800,4,4
-i5-4670,84,0,3400,3800,4,4
-i5-4570,84,0,3200,3600,4,4
-i5-4430,84,0,3000,3200,4,4
+i7-4770K,84,800,3500,3900,4,8
+i7-4770,84,800,3400,3900,4,8
+i5-4670K,84,800,3400,3800,4,4
+i5-4670,84,800,3400,3800,4,4
+i5-4570,84,800,3200,3600,4,4
+i5-4430,84,800,3000,3200,4,4
 # Socket 1150 (Low Power)
-i7-4770S,65,0,3100,3900,4,8
-i7-4770T,45,0,2500,3700,4,8
-i7-4765T,35,0,2000,3000,4,8
-i5-4670S,65,0,3100,3800,4,4
-i5-4670T,45,0,2300,3300,4,4
-i5-4570S,65,0,2900,3600,4,4
-i5-4570T,35,0,2900,3600,2,4
-i5-4430S,65,0,2700,3200,4,4
+i7-4770S,65,800,3100,3900,4,8
+i7-4770T,45,800,2500,3700,4,8
+i7-4765T,35,800,2000,3000,4,8
+i5-4670S,65,800,3100,3800,4,4
+i5-4670T,45,800,2300,3300,4,4
+i5-4570S,65,800,2900,3600,4,4
+i5-4570T,35,800,2900,3600,2,4
+i5-4430S,65,800,2700,3200,4,4
 )
 
 gMobileHaswellCPUList=(
-i7-4930MX,57,0,3000,3900,4,8
-i7-4900MQ,47,0,2800,3800,4,8
-i7-4800MQ,47,0,2700,3700,4,8
+i7-4930MX,57,800,3000,3900,4,8
+i7-4900MQ,47,800,2800,3800,4,8
+i7-4800MQ,47,800,2700,3700,4,8
 )
 
 #--------------------------------------------------------------------------------
@@ -526,6 +535,7 @@ function _printDebugInfo()
         echo '    Store ("ssdtPRGen version: '$gScriptVersion'", Debug)'                >> $gSsdtPR
         echo '    Store ("baseFrequency    : '$gBaseFrequency'", Debug)'                >> $gSsdtPR
         echo '    Store ("frequency        : '$frequency'", Debug)'                     >> $gSsdtPR
+        echo '    Store ("busFrequency     : '$gBusFrequency'", Debug)'                 >> $gSsdtPR
         echo '    Store ("logicalCPUs      : '$gLogicalCPUs'", Debug)'                  >> $gSsdtPR
         echo '    Store ("tdp              : '$gTdp'", Debug)'                          >> $gSsdtPR
         echo '    Store ("packageLength    : '$packageLength'", Debug)'                 >> $gSsdtPR
@@ -629,9 +639,9 @@ function _printPackages()
     local maxNonTurboFrequency=$2
     local frequency=$3
 
-    let minRatio=($gBaseFrequency/100)
-    let p1Ratio=($maxNonTurboFrequency/100)
-    let ratio=($frequency/100)
+    let minRatio=($gBaseFrequency/$gBusFrequency)
+    let p1Ratio=($maxNonTurboFrequency/$gBusFrequency)
+    let ratio=($frequency/$gBusFrequency)
     let powerRatio=($p1Ratio-1)
 
     #
@@ -677,7 +687,7 @@ function _printPackages()
             printf "0x0A, 0x0A, 0x%02X00, 0x%02X00 }" $ratio $ratio                     >> $gSsdtPR
 
             let ratio-=1
-            let frequency-=100
+            let frequency-=$gBusFrequency
 
             if [ $ratio -ge $minRatio ];
                 then
@@ -1061,11 +1071,14 @@ function _updateProcessorNames()
 
 function _getProcessorScope()
 {
-    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 | egrep -o 'DSDT"=<[0-9a-f]+5b830b') ]]; then
+    #
+    # We run egrep twice here for Snow Leopard compatibility, otherwise it fails.
+    #
+    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5b830b') ]]; then
         printf 'Processor Declaration(s) Found in DSDT'
     fi
 
-    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 | egrep -o 'DSDT"=<[0-9a-f]+5f50525f') ]];
+    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5f50525f') ]];
         then
             gScope="\_PR_"
             echo ' (ACPI 1.0 compliant)'
@@ -1100,6 +1113,16 @@ function _getCPUModel()
 
 #--------------------------------------------------------------------------------
 
+function _getCPUSignature()
+{
+    #
+    # Returns the hexadecimal value of machdep.cpu.signature
+    #
+    echo 0x$(echo "obase=16; `sysctl machdep.cpu.signature | sed -e 's/^machdep.cpu.signature: //'`" | bc)
+}
+
+#--------------------------------------------------------------------------------
+
 function _getSystemType()
 {
     #
@@ -1150,13 +1173,50 @@ function _setDestinationPath
     #
     if [ -d /Extra/ACPI ]; then
         gDestinationPath="/Extra/ACPI/"
+        echo 'ACPI target directory changed to: $gDestinationPath'
+        return
     fi
 
     #
-    # Checking for Clover rev 1277 (projectosx.com/forum/index.php?showtopic=2656&p=29129&#entry29129)
+    # Checking for Clover rev 1277 and greater (projectosx.com/forum/index.php?showtopic=2656&p=29129&#entry29129)
     #
-    if [ -d /EFI/Clover/ACPI/patched ]; then
-        gDestinationPath="/EFI/Clover/ACPI/patched/"
+    if [ -d /EFI/Clover/ACPI/patched ];
+        then
+            gDestinationPath="/EFI/Clover/ACPI/patched/"
+            echo 'ACPI target directory changed to: $gDestinationPath'
+            return
+        else
+            if [ -d /Volumes/EFI ];
+                then
+                    if [ -d /Volumes/EFI/Clover/ACPI/patched ]; then
+                        gDestinationPath="/Volumes/EFI/Clover/ACPI/patched/"
+                        echo 'ACPI target directory changed to: $gDestinationPath'
+                        return
+                    fi
+                else
+                    #
+                    # http://www.tonymacx86.com/ssdt/86906-ssdt-generation-script-ivybridge-pm-40.html#post604496
+                    #
+                    if [ -f /Library/Logs/CloverEFI/boot.log ];
+                        then
+                            echo 'Clover boot.log found'
+                            return
+                        else
+                            echo 'Warning: Failed to locate the Clover boot.log'
+                            echo 'Creating temporarily mount point: /Volumes/EFI'
+                            sudo mkdir /Volumes/EFI
+                            echo 'Mounting EFI partition...'
+                            sudo mount_hfs /dev/disk0s1 /Volumes/EFI
+
+                            if [ -d /Volumes/EFI/Clover/ACPI/patched ]; then
+                                gUnmountEFIPartition=true;
+                                gDestinationPath="/Volumes/EFI/Clover/ACPI/patched/"
+                                echo 'ACPI target directory changed to: $gDestinationPath'
+                                return
+                            fi
+                    fi
+
+            fi
     fi
 
     #
@@ -1164,6 +1224,8 @@ function _setDestinationPath
     #
     if [ -d /EFI/ACPI/patched ]; then
         gDestinationPath="/EFI/ACPI/patched/"
+        echo 'ACPI target directory changed to: $gDestinationPath'
+        return
     fi
 }
 
@@ -1354,17 +1416,22 @@ function _checkPlatformSupport()
         return 0
     }
 
-    __searchList 'SupportedModelProperties' $1
-
-    if (($? == 0)); then
-        echo 'Warning: Model identifier ['$1'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
-    fi
+    #
+    # This check is required for Snow Leopard compatibility!
+    #
+    if [ -f /System/Library/CoreServices/PlatformSupport.plist ];
+        then
+            __searchList 'SupportedModelProperties' $1
 
-    __searchList 'SupportedBoardIds' $2
+            if (($? == 0)); then
+                echo 'Warning: Model identifier ['$1'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
+            fi
 
-    if (($? == 0)); then
-        echo 'Warning: boardID ['$2'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
+            __searchList 'SupportedBoardIds' $2
 
+            if (($? == 0)); then
+                echo 'Warning: boardID ['$2'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
+            fi
     fi
 }
 
@@ -1644,10 +1711,11 @@ function main()
         fi
 
         # Haswell
-        if (($model==0x30)); then
+        if (($model==0x3C)); then
             let assumedTDP=1
             let gTdp=84
             let gBridgeType=8
+            let gMaxOCFrequency=8000
         fi
 
         # Haswell ULT
@@ -1676,9 +1744,10 @@ function main()
     local modelID=$(_getModelName)
     local cpu_type=$(_getCPUtype)
     local currentSystemType=$(_getSystemType)
+    local cpuSignature=$(_getCPUSignature)
 
     echo "Generating ${gSsdtID}.dsl for a $modelID [$boardID]"
-    echo "$bridgeTypeString Core $gProcessorNumber processor [0x$cpu_type] setup"
+    echo "$bridgeTypeString Core $gProcessorNumber processor [$cpuSignature] setup [0x$cpu_type]"
 
     #
     # gTypeCPU is greater than 0 when the processor is found in one of the CPU lists
@@ -1930,6 +1999,13 @@ if (($gCallIasl)); then
             read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
             case "$choice" in
                 y|Y ) sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile}
+
+                      if (($gUnmountEFIPartition)); then
+                          echo 'Unmounting EFI partition...'
+                          # sudo unmount -f /Volumes/EFI
+                          echo 'Removing temporarily mount point...'
+                          # sudo rm -rf /Volumes/EFI
+                      fi
                       ;;
             esac
         fi

From f66f9f99318db1b585054cb4a7303c03538e49e6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 26 May 2013 14:23:54 +0200
Subject: [PATCH 392/623] Updating script to version 6.5

Some bugs fixes and EFI partition checking for Clover compatibility
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 138 +++++++++++++++++++++------
 1 file changed, 111 insertions(+), 27 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index daf0c00..cfd13c8 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 6.4 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 6.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -70,6 +70,7 @@
 #			- Haswell's minimum core frequency is 800 MHz (Jeroen, April 2013)
 #			- CPU signature output added (Jeroen/Pike, April 2013)
 #			- Updating to v6.4 after Jeroen's accidental RM of my local RevoBoot directory (Pike, May 2013)
+#			- Updating to v6.5 with bugs fixes and EFI partition checking for Clover compatibility (Pike, May 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -78,6 +79,7 @@
 #			- Thanks to 'philip_petev' for his help with Snow Leopard/egrep incompatibility.
 #			- Thanks to 'RehabMan' for his help with Snow Leopard/egrep incompatibility.
 #			- Thanks to 'BigDonkey' for his help with LFM (800 MHz) for Sandy Bridge mobility models.
+#			- Thanks to 'xpamamadeus' for the Clover boot.log tip.
 #
 # Usage (v1.0 - v4.9):
 #
@@ -205,7 +207,7 @@ let gTypeCPU=0
 gProcessorData="Unknown CPU"
 gProcessorNumber=""
 gBusFrequency=100
-gUnmountEFIPartition=false
+let gUnmountEFIPartition=0
 
 #
 # Maximum Turbo Clock Speed (user configurable)
@@ -1173,7 +1175,7 @@ function _setDestinationPath
     #
     if [ -d /Extra/ACPI ]; then
         gDestinationPath="/Extra/ACPI/"
-        echo 'ACPI target directory changed to: $gDestinationPath'
+        echo -e '\nACPI target directory changed to: '$gDestinationPath
         return
     fi
 
@@ -1183,14 +1185,14 @@ function _setDestinationPath
     if [ -d /EFI/Clover/ACPI/patched ];
         then
             gDestinationPath="/EFI/Clover/ACPI/patched/"
-            echo 'ACPI target directory changed to: $gDestinationPath'
+            echo -e '\nACPI target directory changed to: $gDestinationPath'
             return
         else
             if [ -d /Volumes/EFI ];
                 then
                     if [ -d /Volumes/EFI/Clover/ACPI/patched ]; then
                         gDestinationPath="/Volumes/EFI/Clover/ACPI/patched/"
-                        echo 'ACPI target directory changed to: $gDestinationPath'
+                        echo -e '\nACPI target directory changed to: $gDestinationPath'
                         return
                     fi
                 else
@@ -1202,14 +1204,17 @@ function _setDestinationPath
                             echo 'Clover boot.log found'
                             return
                         else
-                            echo 'Warning: Failed to locate the Clover boot.log'
+                            echo -e '\nWarning: Failed to locate the Clover boot.log'
                             echo 'Creating temporarily mount point: /Volumes/EFI'
                             sudo mkdir /Volumes/EFI
-                            echo 'Mounting EFI partition...'
+                            printf 'Mounting EFI partition...\n'
+                            #
+                            # TODO: Get target disk from diskutil list
+                            #
                             sudo mount_hfs /dev/disk0s1 /Volumes/EFI
+                            let gUnmountEFIPartition=1
 
-                            if [ -d /Volumes/EFI/Clover/ACPI/patched ]; then
-                                gUnmountEFIPartition=true;
+                            if [ -f /Volumes/EFI/Clover/ACPI/patched ]; then
                                 gDestinationPath="/Volumes/EFI/Clover/ACPI/patched/"
                                 echo 'ACPI target directory changed to: $gDestinationPath'
                                 return
@@ -1367,7 +1372,7 @@ function _showLowPowerStates()
         # Haswell    : C0, C1, C1E, C2E, C3, C4, C6 and C7
         # Haswell-ULT: C0, C1, C1E, C2E, C3, C4, C6, C7, C8, C9 and C10
         #
-        for state in C1 C2 C3 C6 C7
+        for state in C1 C2 C3 C6 C7 C8 C9 C10
         do
             if (($cStates & $mask)); then
                if (($mask > 1)); then
@@ -1432,6 +1437,8 @@ function _checkPlatformSupport()
             if (($? == 0)); then
                 echo 'Warning: boardID ['$2'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
             fi
+        else
+            echo 'Warning: /S*/L*/C*/PlatformSupport.plist not found (normal for Snow Leopard)!'
     fi
 }
 
@@ -1550,70 +1557,147 @@ function _initIvyBridgeSetup()
 			gMacModelIdentifier="iMac13,1"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
-			;;
+		;;
 
 		Mac-FC02E91DDD3FA6A4)
 			gSystemType=1
 			gMacModelIdentifier="iMac13,2"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
-			;;
+		;;
 
 		Mac-031AEE4D24BFF0B1)
 			gSystemType=1
 			gMacModelIdentifier="Macmini6,1"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
-			;;
+		;;
 
 		Mac-F65AE981FFA204ED)
 			gSystemType=1
 			gMacModelIdentifier="Macmini6,2"
 			gACST_CPU0=13   # C1, C3 and C6
 			gACST_CPU1=7    # C1, C2 and C3
-			;;
+		;;
 
 		Mac-4B7AC7E43945597E)
 			gSystemType=2
 			gMacModelIdentifier="MacBookPro9,1"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
-			;;
+		;;
 
 		Mac-6F01561E16C75D06)
 			gSystemType=2
 			gMacModelIdentifier="MacBookPro9,2"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
-			;;
+		;;
 
 		Mac-C3EC7CD22292981F)
 			gSystemType=2
 			gMacModelIdentifier="MacBookPro10,1"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
-			;;
+		;;
 
 		Mac-AFD8A9D944EA4843)
 			gSystemType=2
 			gMacModelIdentifier="MacBookPro10,2"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
-			;;
+		;;
 
 		Mac-66F35F19FE2A0D05)
 			gSystemType=2
 			gMacModelIdentifier="MacBookAir5,1"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
-			;;
+		;;
 
 		Mac-2E6FAB96566FE58C)
 			gSystemType=2
 			gMacModelIdentifier="MacBookAir5,2"
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
-			;;
+		;;
+	esac
+}
+
+#--------------------------------------------------------------------------------
+
+function _initHaswellSetup()
+{
+	case $boardID in
+		Mac-)
+			gSystemType=1
+			gMacModelIdentifier="iMac14,1"
+			gACST_CPU0=13   # C1, C2, C3, C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-)
+			gSystemType=1
+			gMacModelIdentifier="iMac14,2"
+			gACST_CPU0=13   # C1, C2, C3, C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-)
+			gSystemType=1
+			gMacModelIdentifier="Macmini7,1"
+			gACST_CPU0=13   # C1, C2, C3, C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-)
+			gSystemType=1
+			gMacModelIdentifier="Macmini7,2"
+			gACST_CPU0=13   # C1, C2, C3, C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro11,1"
+			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+			gACST_CPU1=31   # C1, C2, C3, C6 and C7
+		;;
+
+		Mac-)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro11,2"
+			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+			gACST_CPU1=31   # C1, C2, C3, C6 and C7
+		;;
+
+		Mac-)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro12,1"
+			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+			gACST_CPU1=31   # C1, C2, C3, C6 and C7
+		;;
+
+		Mac-)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro12,2"
+			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+			gACST_CPU1=31   # C1, C2, C3, C6 and C7
+		;;
+
+		Mac-)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir6,1"
+			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+			gACST_CPU1=31   # C1, C2, C3, C6 and C7
+		;;
+
+		Mac-)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir6,2"
+			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+			gACST_CPU1=31   # C1, C2, C3, C6 and C7
+		;;
 	esac
 }
 
@@ -1999,15 +2083,15 @@ if (($gCallIasl)); then
             read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
             case "$choice" in
                 y|Y ) sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile}
-
-                      if (($gUnmountEFIPartition)); then
-                          echo 'Unmounting EFI partition...'
-                          # sudo unmount -f /Volumes/EFI
-                          echo 'Removing temporarily mount point...'
-                          # sudo rm -rf /Volumes/EFI
-                      fi
                       ;;
             esac
+
+            if (($gUnmountEFIPartition)); then
+                echo -e '\nUnmounting EFI partition...'
+                sudo umount -f /Volumes/EFI
+                echo 'Removing temporarily mount point...'
+                sudo rm -r /Volumes/EFI
+            fi
         fi
     fi
 

From 06a8ee111f95365c5fa513897dde66c265a67589 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 11 Jun 2013 09:17:50 +0200
Subject: [PATCH 393/623] Haswell cleanups

---
 i386/libsaio/cpu/essentials.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 37fb355..ff093e6 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -174,12 +174,8 @@
 #define CPU_MODEL_IB_CORE_EX		0x3B	// Ivy Bridge Core Processors (LGA 2011)
 #define CPU_MODEL_IB_CORE_XEON		0x3E
 
-#define CPU_MODEL_HASWELL			0x30
-#define CPU_MODEL_HASWELL_ULT		0x40
-
-// #define CPU_MODEL_HASWELL			0x3C
-// #define CPU_MODEL_HASWELL_CORE		0x3F
-// #define CPU_MODEL_HASWELL_CORE_EX	0x45
+#define CPU_MODEL_HASWELL			0x3C
+#define CPU_MODEL_HASWELL_ULT		0x45
 
 #define DALES_BRIDGE	1
 #define SANDY_BRIDGE	2

From bd70688c330b72096f61e5d13de41f331e825903 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 11 Jun 2013 09:18:30 +0200
Subject: [PATCH 394/623] Adding MacBookAir6,2 data

---
 i386/libsaio/platform.h          | 3 ++-
 i386/libsaio/smbios/model_data.h | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 28c582d..5d4bb59 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -63,7 +63,8 @@
 #define MACBOOK_41				 MACBOOK					// Defaults to MacBook4,1
 
 #define MACBOOK_AIR_41			(MACBOOK_AIR | (1 << 15))
-#define MACBOOK_AIR_42			 MACBOOK_AIR				// Defaults to MacBookAir4,1
+#define MACBOOK_AIR_42			(MACBOOK_AIR | (2 << 15))
+#define MACBOOK_AIR_62			 MACBOOK_AIR				// Defaults to MacBookAir6,2
 
 #define MACBOOK_PRO_61			(MACBOOK_PRO | (1 << 15))
 #define MACBOOK_PRO_81			(MACBOOK_PRO | (2 << 15))
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index ea84e8f..42f82bc 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -87,13 +87,20 @@
 		#define SMB_PRODUCT_NAME	"MacBookAir4,1"
 		#define SMB_BOARD_PRODUCT	"Mac-C08A6BB70A942AC2"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '4', ',', '1' }
-	#else // Defaults to MacBookAir4,2
+	#elif (TARGET_MODEL == MACBOOK_AIR_42)
 		// Intel Core i5-2557M @ 1.7GHz (2 cores - 4 threads)
 		// Intel Core i7-2677M @ 1.8GHz (2 cores - 4 threads)
 		#define SMB_BIOS_VERSION	"MBA41.88Z.0077.B08.1109011050"
 		#define SMB_PRODUCT_NAME	"MacBookAir4,2"
 		#define SMB_BOARD_PRODUCT	"Mac-742912EFDBEE19B3"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '4', ',', '2' }
+	#else // Defaults to MacBookAir6,2
+		// Intel Core i5-4250U @ 1.30 GHz (2 cores - 4 threads)
+		// Intel Core i7-4650U @ 1.70 GHz (2 cores - 4 threads)
+		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B00.1305241529"
+		#define SMB_PRODUCT_NAME	"MacBookAir6,2"
+		#define SMB_BOARD_PRODUCT	"Mac-7DF21CB3ED6977E5"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '6', ',', '2' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From 8967a2f0a086aa0e6511a189e97ffe22761ed5f3 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 11 Jun 2013 17:52:08 +0200
Subject: [PATCH 395/623] Adding MacBookAir6,1 data

---
 i386/libsaio/platform.h          | 1 +
 i386/libsaio/smbios/model_data.h | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 5d4bb59..829c24d 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -64,6 +64,7 @@
 
 #define MACBOOK_AIR_41			(MACBOOK_AIR | (1 << 15))
 #define MACBOOK_AIR_42			(MACBOOK_AIR | (2 << 15))
+#define MACBOOK_AIR_61			(MACBOOK_AIR | (3 << 15))
 #define MACBOOK_AIR_62			 MACBOOK_AIR				// Defaults to MacBookAir6,2
 
 #define MACBOOK_PRO_61			(MACBOOK_PRO | (1 << 15))
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 42f82bc..341a9af 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -94,6 +94,13 @@
 		#define SMB_PRODUCT_NAME	"MacBookAir4,2"
 		#define SMB_BOARD_PRODUCT	"Mac-742912EFDBEE19B3"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '4', ',', '2' }
+	#elif (TARGET_MODEL == MACBOOK_AIR_61)
+		// Intel Core i5-4250U @ 1.30 GHz (2 cores - 4 threads)
+		// Intel Core i7-4650U @ 1.70 GHz (2 cores - 4 threads)
+		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B00.1305241529"
+		#define SMB_PRODUCT_NAME	"MacBookAir6,1"
+		#define SMB_BOARD_PRODUCT	"Mac-35C1E88140C3E6CF"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '6', ',', '1' }
 	#else // Defaults to MacBookAir6,2
 		// Intel Core i5-4250U @ 1.30 GHz (2 cores - 4 threads)
 		// Intel Core i7-4650U @ 1.70 GHz (2 cores - 4 threads)

From 3c3dcfecea11165e8b5164721d943fbf7ef4b39f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 11 Jun 2013 17:53:44 +0200
Subject: [PATCH 396/623] Updating script to version 6.6

- Output of Clover ACPI directory detection fixed.
- More Haswell CPUs added.
- board-id's for new MacBook Air's added.
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 66 +++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 12 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index cfd13c8..21c63c4 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 6.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 6.6 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -71,6 +71,9 @@
 #			- CPU signature output added (Jeroen/Pike, April 2013)
 #			- Updating to v6.4 after Jeroen's accidental RM of my local RevoBoot directory (Pike, May 2013)
 #			- Updating to v6.5 with bugs fixes and EFI partition checking for Clover compatibility (Pike, May 2013)
+#			- Output of Clover ACPI directory detection fixed (Pike, June 2013)
+#			- Haswell CPUs added (Jeroen, June 2013)
+#			- board-id's for new MacBookAir6,[1/2] added (Pike, June 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -176,7 +179,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=6.5
+gScriptVersion=6.6
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -459,6 +462,20 @@ i3-3110M,35,0,2400,0,2,4
 # New Haswell processors (with HD-4600 graphics)
 #
 gServerHaswellCPUList=(
+# E3-1200 V3 Xeon Processor Series
+'E3-1285L V3',65,800,3100,3900,4,8
+'E3-1285 V3',84,800,3600,4000,4,8
+'E3-1280 V3',82,800,3600,4000,4,8
+'E3-1275 V3',84,800,3500,3900,4,8
+'E3-1270 V3',80,800,3500,3900,4,8
+'E3-1268L V3',45,800,2300,3300,4,8
+'E3-1265L V3',45,800,2500,3700,4,8
+'E3-1245 V3',84,800,3400,3800,4,8
+'E3-1240 V3',80,800,3400,3800,4,8
+'E3-1230L V3',25,800,1800,2800,4,8
+'E3-1230 V3',80,800,3300,3700,4,8
+'E3-1225 V3',80,800,3200,3600,4,4
+'E3-1220 V3',80,800,3100,3500,4,4
 )
 
 gDesktopHaswellCPUList=(
@@ -482,12 +499,30 @@ i5-4670T,45,800,2300,3300,4,4
 i5-4570S,65,800,2900,3600,4,4
 i5-4570T,35,800,2900,3600,2,4
 i5-4430S,65,800,2700,3200,4,4
+# BGA
+i7-4770R,65,800,3200,3900,4,8
+# Haswell ULT
+i5-4288U,28,800,2600,3100,2,4
+i5-4258U,28,800,2400,2900,2,4
+i5-4250U,15,800,1300,2600,2,4
+i5-4200Y,12,800,1400,1900,2,4
+i5-4200U,15,800,1600,2600,2,4
 )
 
 gMobileHaswellCPUList=(
+i7-4950HQ,47,800,2400,3600,4,8
+i7-4850HQ,47,800,2300,3500,4,8
+i7-4750HQ,47,800,2000,3200,4,8
+# Extreme Edition Series - socket FCPGA946
 i7-4930MX,57,800,3000,3900,4,8
+# Socket FCPGA946
 i7-4900MQ,47,800,2800,3800,4,8
 i7-4800MQ,47,800,2700,3700,4,8
+i7-4702MQ,37,800,2200,3200,4,8
+i7-4700MQ,47,800,2400,3600,4,8
+# Socket FCBGA1364
+i7-4700HQ,47,800,2400,3600,4,8
+i7-4702HQ,37,800,2200,3200,4,8
 )
 
 #--------------------------------------------------------------------------------
@@ -1191,8 +1226,8 @@ function _setDestinationPath
             if [ -d /Volumes/EFI ];
                 then
                     if [ -d /Volumes/EFI/Clover/ACPI/patched ]; then
-                        gDestinationPath="/Volumes/EFI/Clover/ACPI/patched/"
-                        echo -e '\nACPI target directory changed to: $gDestinationPath'
+                        gDestinationPath="/Volumes/EFI/CLOVER/ACPI/patched/"
+                        echo -e '\nACPI target directory changed to: '$gDestinationPath
                         return
                     fi
                 else
@@ -1212,12 +1247,19 @@ function _setDestinationPath
                             # TODO: Get target disk from diskutil list
                             #
                             sudo mount_hfs /dev/disk0s1 /Volumes/EFI
-                            let gUnmountEFIPartition=1
 
-                            if [ -f /Volumes/EFI/Clover/ACPI/patched ]; then
-                                gDestinationPath="/Volumes/EFI/Clover/ACPI/patched/"
-                                echo 'ACPI target directory changed to: $gDestinationPath'
-                                return
+                            if [ -f /Volumes/EFI/Clover/ACPI/patched ];
+                                then
+                                    let gUnmountEFIPartition=1
+                                    gDestinationPath="/Volumes/EFI/CLOVER/ACPI/patched/"
+                                    echo 'ACPI target directory changed to: '$gDestinationPath
+                                    return
+                                else
+                                    echo -e '\nUnmounting EFI partition...'
+                                    sudo umount -f /Volumes/EFI
+                                    echo 'Removing temporarily mount point...'
+#                                   sudo rm -r /Volumes/EFI
+                                    return
                             fi
                     fi
 
@@ -1229,7 +1271,7 @@ function _setDestinationPath
     #
     if [ -d /EFI/ACPI/patched ]; then
         gDestinationPath="/EFI/ACPI/patched/"
-        echo 'ACPI target directory changed to: $gDestinationPath'
+        echo 'ACPI target directory changed to: '$gDestinationPath
         return
     fi
 }
@@ -1685,14 +1727,14 @@ function _initHaswellSetup()
 			gACST_CPU1=31   # C1, C2, C3, C6 and C7
 		;;
 
-		Mac-)
+		Mac-35C1E88140C3E6CF)
 			gSystemType=2
 			gMacModelIdentifier="MacBookAir6,1"
 			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
 			gACST_CPU1=31   # C1, C2, C3, C6 and C7
 		;;
 
-		Mac-)
+		Mac-7DF21CB3ED6977E5)
 			gSystemType=2
 			gMacModelIdentifier="MacBookAir6,2"
 			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10

From 90ce11f9f04843c622a5f54c875a3861511f5219 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 12 Jun 2013 00:36:55 +0200
Subject: [PATCH 397/623] Preliminary support for OS X 10.9 aka Mavericks

---
 CHANGES                   | 8 +++++++-
 Makefile                  | 7 +++++--
 VERSION                   | 2 +-
 i386/boot2/boot.c         | 4 ++--
 i386/libsaio/asm.s        | 4 ++--
 i386/libsaio/bootstruct.c | 6 +++---
 i386/libsaio/bootstruct.h | 6 +++---
 i386/libsaio/efi.c        | 2 +-
 i386/libsaio/platform.c   | 4 +++-
 9 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index 30fe0dc..ed274d1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,15 @@
-RevoBoot v1.5.40 (Next Major Release)
+RevoBoot v1.5.50 (Next Major Release)
 ================
 - Improved CPU detection (with new/additional CPU's).
 - Improved P-State generation (less settings).
 
 
+RevoBoot v1.5.40
+================
+- Support for OS X 10.9 aka Mavericks added (Piker, June 2013).
+- VERSION updated to v1.5.40
+
+
 RevoBoot v1.5.39
 ================
 - Fixed boot failure for InstallESD/BaseSystem.dmg/patched kernelcache (Piker, April 2013).
diff --git a/Makefile b/Makefile
index 79682ea..6a01726 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,10 @@ else
 		MAKE_TARGET_OS = 6;
 		MAKEGOAL = mountain-lion
 	else
-		ifeq ($(MAKECMDGOALS), lion)
+		ifeq ($(MAKECMDGOALS), mavericks)
+			MAKE_TARGET_OS = 12;
+			MAKEGOAL = mavericks
+		else ifeq ($(MAKECMDGOALS), lion)
 			MAKE_TARGET_OS = 2;
 			MAKEGOAL = lion
 		else ifeq ($(MAKECMDGOALS), legacy)
@@ -73,7 +76,7 @@ else
 endif
 
 #
-# Export our make goal i.e. mountain-lion, lion or legacy (snow-leopard or leopard).
+# Export our make goal i.e. mavericks, mountain-lion, lion or legacy (snow-leopard or leopard).
 #
 
 export MAKEGOAL
diff --git a/VERSION b/VERSION
index 9caff18..adecc24 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.39
+1.5.40
diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 8518d4e..2582af7 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -512,7 +512,7 @@ void boot(int biosdev)
 				
 				_BOOT_DEBUG_DUMP("adler32: %08X\n", adler32);
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Also for Mountain Lion, which has bit 2 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 2 set like Lion.
 
 				_BOOT_DEBUG_DUMP("Checking for kernelcache...\n");
 
@@ -528,7 +528,7 @@ void boot(int biosdev)
 
 			_BOOT_DEBUG_ELSE_DUMP("Failed to locate the kernelcache (directory)!\n");
 		}
-#else // Not for (Mountain) Lion, go easy with the Snow Leopard.
+#else // Not for Mavericks/Mountain Lion/Lion, go easy with the Snow Leopard.
 
 				/* static char preLinkedKernelPath[128];
 				static char adler32Key[PLATFORM_NAME_LEN + ROOT_PATH_LEN];
diff --git a/i386/libsaio/asm.s b/i386/libsaio/asm.s
index 768ba43..a6312cf 100755
--- a/i386/libsaio/asm.s
+++ b/i386/libsaio/asm.s
@@ -334,7 +334,7 @@ LABEL(_halt)
     call    _bgetc
     jmp     _halt
 
-#if ((MAKE_TARGET_OS & LION) == LION)
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks, Mountain Lion and Lion
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // disableIRQs()
 //
@@ -365,7 +365,7 @@ LABEL(_disableIRQs)
 // Passes boot arguments in %eax.
 //
 LABEL(_startMachKernel)
-#if ((MAKE_TARGET_OS & LION) == LION)
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks, Mountain Lion and Lion
 	call    _disableIRQs	// Taking care of a ACPI bug.
 #endif
 	push    %ebp
diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index 664d33d..c50f689 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -87,7 +87,7 @@ void initKernelBootConfig(void)
 	// EFI selection is based on the CPU type.
 	bootArgs->efiMode = (gPlatform.ArchCPUType == CPU_TYPE_X86_64) ? kBootArgsEfiMode64 : kBootArgsEfiMode32;
 
-#if ((MAKE_TARGET_OS & LION) == LION)
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 2 set like Lion.
 	// Lion's new debug output (replacing a couple of former boot arguments).
 	bootArgs->debugMode = EFI_DEBUG_MODE;					// Defined in config/settings.h
 #endif
@@ -171,7 +171,7 @@ void finalizeKernelBootConfig(void)
     bootArgs->deviceTreeP = (uint32_t)addr;
     bootArgs->deviceTreeLength = size;
 	
-#if ((MAKE_TARGET_OS & LION) == LION)
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 2 set like Lion.
 	// Adding a 16 KB log space.
 	bootArgs->performanceDataSize	= 0;
 	bootArgs->performanceDataStart	= 0;
@@ -184,7 +184,7 @@ void finalizeKernelBootConfig(void)
 	bootArgs->bootMemStart	= 0;
 #endif
 
-#if ((MAKE_TARGET_OS & LION) == LION)
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 2 set like Lion.
 	bootArgs->FSBFrequency	= gPlatform.CPU.FSBFrequency;
 #endif
 }
diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index 282a674..0074c42 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -144,7 +144,7 @@ typedef struct boot_args_new
     uint16_t    Revision;							// Revision of boot_args structure.
     uint16_t    Version;							// Version of boot_args structure.
 
-#if ((MAKE_TARGET_OS & LION) == LION)
+#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 2 set like Lion.
     uint8_t     efiMode;							// 32 = 32-bit, 64 = 64-bit.
 
     uint8_t     debugMode;							// Bit field with behavior changes.
@@ -175,13 +175,13 @@ typedef struct boot_args_new
     uint32_t    efiRuntimeServicesPageStart;		// Physical address of defragmented runtime pages.
     uint32_t    efiRuntimeServicesPageCount;
 
-#if ((MAKE_TARGET_OS & LION) == LION)
+#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 2 set like Lion.
     uint64_t    efiRuntimeServicesVirtualPageStart;	// Virtual address of defragmented runtime pages.
 #endif
 
     uint32_t    efiSystemTable;						// Physical address of system table in runtime area.
 
-#if ((MAKE_TARGET_OS & LION) == LION)
+#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 2 set like Lion.
     uint32_t    __reserved2;
 
     uint32_t    performanceDataStart;				// Physical address of log.
diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 5cb4669..b6bb845 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -157,7 +157,7 @@ void initEFITree(void)
 
 	DT__AddProperty(chosenNode, "machine-signature", sizeof(MACHINE_SIGNATURE), (EFI_UINT8*) &MACHINE_SIGNATURE);
 
-#if ((MAKE_TARGET_OS & LION) == LION)
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 2 set like Lion.
 
 	// Used by boot.efi - cosmetic only node/properties on hacks.
 	Node * kernelCompatNode = DT__AddChild(efiNode, "kernel-compatibility");
diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index a80ee3b..974bbba 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -198,7 +198,9 @@ void initPlatform(int biosDevice)
 		gPlatform.CPU.Mobile		= true;	// Will be initialized in cpu/cpu_dynamic.h (used in smbios/dynamic_data.h)
 	}
 
-#if (MAKE_TARGET_OS == LION)
+#if (MAKE_TARGET_OS == MAVERICKS)
+	gPlatform.OSVersion				= strdup("10.9");
+#elif (MAKE_TARGET_OS == LION)
 	gPlatform.OSVersion				= strdup("10.7");
 #elif (MAKE_TARGET_OS == MOUNTAIN_LION)
 	gPlatform.OSVersion				= strdup("10.8");

From 3d83fa1b7f48ba16f61dabb2c07091e3f065c090 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 12 Jun 2013 02:17:22 +0200
Subject: [PATCH 398/623] Fixing comments

---
 i386/boot2/boot.c         | 2 +-
 i386/libsaio/bootstruct.c | 6 +++---
 i386/libsaio/bootstruct.h | 6 +++---
 i386/libsaio/efi.c        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 2582af7..5d62fe2 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -512,7 +512,7 @@ void boot(int biosdev)
 				
 				_BOOT_DEBUG_DUMP("adler32: %08X\n", adler32);
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 2 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 1 set like Lion.
 
 				_BOOT_DEBUG_DUMP("Checking for kernelcache...\n");
 
diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index c50f689..171fa06 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -87,7 +87,7 @@ void initKernelBootConfig(void)
 	// EFI selection is based on the CPU type.
 	bootArgs->efiMode = (gPlatform.ArchCPUType == CPU_TYPE_X86_64) ? kBootArgsEfiMode64 : kBootArgsEfiMode32;
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 2 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 1 set like Lion.
 	// Lion's new debug output (replacing a couple of former boot arguments).
 	bootArgs->debugMode = EFI_DEBUG_MODE;					// Defined in config/settings.h
 #endif
@@ -171,7 +171,7 @@ void finalizeKernelBootConfig(void)
     bootArgs->deviceTreeP = (uint32_t)addr;
     bootArgs->deviceTreeLength = size;
 	
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 2 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 1 set like Lion.
 	// Adding a 16 KB log space.
 	bootArgs->performanceDataSize	= 0;
 	bootArgs->performanceDataStart	= 0;
@@ -184,7 +184,7 @@ void finalizeKernelBootConfig(void)
 	bootArgs->bootMemStart	= 0;
 #endif
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 2 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 1 set like Lion.
 	bootArgs->FSBFrequency	= gPlatform.CPU.FSBFrequency;
 #endif
 }
diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index 0074c42..77e42cb 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -144,7 +144,7 @@ typedef struct boot_args_new
     uint16_t    Revision;							// Revision of boot_args structure.
     uint16_t    Version;							// Version of boot_args structure.
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 2 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 1 set like Lion.
     uint8_t     efiMode;							// 32 = 32-bit, 64 = 64-bit.
 
     uint8_t     debugMode;							// Bit field with behavior changes.
@@ -175,13 +175,13 @@ typedef struct boot_args_new
     uint32_t    efiRuntimeServicesPageStart;		// Physical address of defragmented runtime pages.
     uint32_t    efiRuntimeServicesPageCount;
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 2 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 1 set like Lion.
     uint64_t    efiRuntimeServicesVirtualPageStart;	// Virtual address of defragmented runtime pages.
 #endif
 
     uint32_t    efiSystemTable;						// Physical address of system table in runtime area.
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 2 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 1 set like Lion.
     uint32_t    __reserved2;
 
     uint32_t    performanceDataStart;				// Physical address of log.
diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index b6bb845..d8ff442 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -157,7 +157,7 @@ void initEFITree(void)
 
 	DT__AddProperty(chosenNode, "machine-signature", sizeof(MACHINE_SIGNATURE), (EFI_UINT8*) &MACHINE_SIGNATURE);
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 2 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 1 set like Lion.
 
 	// Used by boot.efi - cosmetic only node/properties on hacks.
 	Node * kernelCompatNode = DT__AddChild(efiNode, "kernel-compatibility");

From 732ffe2cfb69d86021503d6ed80ede87908f2629 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 12 Jun 2013 02:18:58 +0200
Subject: [PATCH 399/623] Using bit-1 here instead of bit-2

- thanks to a silly comment error
---
 Makefile                | 2 +-
 i386/libsaio/platform.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6a01726..5db3dc2 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ else
 		MAKEGOAL = mountain-lion
 	else
 		ifeq ($(MAKECMDGOALS), mavericks)
-			MAKE_TARGET_OS = 12;
+			MAKE_TARGET_OS = 10;
 			MAKEGOAL = mavericks
 		else ifeq ($(MAKECMDGOALS), lion)
 			MAKE_TARGET_OS = 2;
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 829c24d..569bf7d 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -22,6 +22,7 @@
 #define	SNOW_LEOPARD			1	// Snow Leopard.
 #define LION					2	// Lion (the default).
 #define MOUNTAIN_LION			6	// Mountain Lion (includes Lion changes).
+#define MAVERICKS				10	// Mavericks (includes Lion changes).
 
 //------------------------------------------------------------------------------
 

From e1f4f69d5da17ece128656628aaa7d8f07503c0c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 12 Jun 2013 02:19:59 +0200
Subject: [PATCH 400/623] Expanding memory for Mavericks

- do we really need this?
---
 i386/libsa/memory.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsa/memory.h b/i386/libsa/memory.h
index f561709..a769f12 100755
--- a/i386/libsa/memory.h
+++ b/i386/libsa/memory.h
@@ -91,7 +91,7 @@
 
 //							0x00100000L
 #define KERNEL_ADDR			(VIDEO_ADDR + VIDEO_LEN)			// Kernel and MKexts/drivers.
-#define KERNEL_LEN			0x04000000L							// Size: 64 MB (128 MB for Chameleon).
+#define KERNEL_LEN			0x06000000L							// Size: 96 MB (128 MB for Chameleon).
 																//
 																// Note: Can cause a stop("Kernel overflows available space")
 // Based on KERNEL_LEN		0x04100000L

From 8e1702cc402604cba0b15ad8f202ee8ab932f36b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 13 Jun 2013 16:24:38 +0200
Subject: [PATCH 401/623] Mavericks specific kext loading

- signed kexts only
---
 i386/boot2/drivers.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index cb5a24a..cd90650 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -95,7 +95,7 @@ enum
 // Private functions.
 static unsigned long localAdler32(unsigned char * buffer, long length);
 
-#if (MAKE_TARGET_OS == 1) // Snow Leopard only!
+#if (MAKE_TARGET_OS == SNOW_LEOPARD)
 	static int loadMultiKext(char *fileSpec);
 #endif
 
@@ -173,7 +173,7 @@ long loadDrivers(char * dirSpec)
 		return -1;
 	}
 
-#if (MAKE_TARGET_OS == 1) // Snow Leopard only!
+#if (MAKE_TARGET_OS == SNOW_LEOPARD)
 	bool shouldLoadMKext = ((gBootMode & kBootModeSafe) == 0);
 
 	_DRIVERS_DEBUG_DUMP("shouldLoadMKext: %s\n", shouldLoadMKext ? "true" : "false");
@@ -200,12 +200,18 @@ long loadDrivers(char * dirSpec)
 		if ((gKextLoadStatus & 1) == 0)
 		{
 			_DRIVERS_DEBUG_DUMP("\nCalling loadKexts(\"/System/Library/Extensions\");\n");
-
+			// System kexts
 			if (loadKexts("/System/Library/Extensions", 0) == EFI_SUCCESS)
 			{
 				_DRIVERS_DEBUG_DUMP("loadKexts(1) OK.\n");
 			}
-
+#if (MAKE_TARGET_OS == MAVERICKS)
+			// Signed kexts for Mavericks only!
+			if (loadKexts("/Library/Extensions", 0) == EFI_SUCCESS)
+			{
+				_DRIVERS_DEBUG_DUMP("loadKexts(2) OK.\n");
+			}
+#endif
 			_DRIVERS_DEBUG_DUMP("\n");
 		}
 	}
@@ -219,7 +225,7 @@ long loadDrivers(char * dirSpec)
 }
 
 
-#if (MAKE_TARGET_OS == 1) // Snow Leopard only!
+#if (MAKE_TARGET_OS == SNOW_LEOPARD)
 //==============================================================================
 // Returns 0 on success, -1 when not found, -2 on load failures and -3 on 
 // verification (signatures, length, adler32) errors.

From 85bb35b30f63f843150bd023ec2797b18806228b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 19 Jun 2013 19:06:45 +0200
Subject: [PATCH 402/623] Adding some of the new 2013 models

---
 i386/libsaio/smbios/model_data.h | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 341a9af..c2f33d2 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -157,13 +157,19 @@
 		#define SMB_PRODUCT_NAME	"MacBookPro10,1"
 		#define SMB_BOARD_PRODUCT	"Mac-C3EC7CD22292981F"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '1' }
-	#else // Defaults to MacBookPro10,2
+	#elif (TARGET_MODEL == MACBOOK_PRO_102)
 		// Intel Core i5-3230QM @ 2.60 GHz - 2 cores / 4 threads.
 		// Intel Core i7-3540QM @ 3.00 GHz - 2 cores / 4 threads.
 		#define SMB_BIOS_VERSION	"MBP102.88Z.0106.B03.1211161133"
 		#define SMB_PRODUCT_NAME	"MacBookPro10,2"
 		#define SMB_BOARD_PRODUCT	"Mac-AFD8A9D944EA4843"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '2' }
+	#else // Defaults to MacBookPro11,1
+		// Intel Core i5-4258U @ 2.90 GHz - 2 cores / 4 threads.
+		#define SMB_BIOS_VERSION	"MBP111.88Z.0098.B00.1306051054"
+		#define SMB_PRODUCT_NAME	"MacBookPro11,1"
+		#define SMB_BOARD_PRODUCT	"Mac-189A3D4F975D5FFC"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -203,12 +209,17 @@
 		#define SMB_PRODUCT_NAME	"Macmini6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-031AEE4D24BFF0B1"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '1' }
-	#else // Defaults to Macmini6,2
+	#elif (TARGET_MODEL == MACMINI_62) // Defaults to Macmini6,2
 		// Intel Core i7-3615QM @ 2.30 GHz (4 cores - 8 threads)
 		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B00.1208091121"
 		#define SMB_PRODUCT_NAME	"Macmini6,2"
 		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '2' }
+	#else // Defaults to Macmini7,1
+		#define SMB_BIOS_VERSION	"MM71.88Z.0106.B00.1307301121"
+		#define SMB_PRODUCT_NAME	"Macmini7,1"
+		#define SMB_BOARD_PRODUCT	"Mac-031B6874CF7F642A"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '7', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -228,11 +239,16 @@
 		#define SMB_PRODUCT_NAME	"MacPro4,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F221BEC8"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '4', ',', '1' }
-	#else // Defaults to MacPro5,1
+	#elif (TARGET_MODEL == MACPRO_51)
 		#define SMB_BIOS_VERSION	"MP51.88Z.007F.B03.1010071432"
 		#define SMB_PRODUCT_NAME	"MacPro5,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F221BEC8"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '5', ',', '1' }
+	#else // Defaults to MacPro6,1
+		#define SMB_BIOS_VERSION	"MP61.88Z.007F.B03.1010071432" // TODO: Verify this!
+		#define SMB_PRODUCT_NAME	"MacPro6,1"
+		#define SMB_BOARD_PRODUCT	"Mac-F60DEB81FF30ACF6"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '6', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From 5a1308fa3cb8dea2e81be3c7d59b87ae35882cf2 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 19 Jun 2013 19:07:05 +0200
Subject: [PATCH 403/623] Updating SMBIOS to v2.6

---
 i386/libsaio/smbios.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios.c b/i386/libsaio/smbios.c
index deb8ae0..ea22a46 100755
--- a/i386/libsaio/smbios.c
+++ b/i386/libsaio/smbios.c
@@ -38,7 +38,7 @@ void setupSMBIOS(void)
     newEPS->checksum			= 0;
     newEPS->entryPointLength	= 0x1f;		// sizeof(* newEPS)
     newEPS->majorVersion		= 2;
-    newEPS->minorVersion		= 4;
+    newEPS->minorVersion		= 6;
 	newEPS->maxStructureSize	= STATIC_SMBIOS_SM_MAX_STRUCTURE_SIZE;	// Defined in RevoBoot/i386/config/SMBIOS/data-template.h
     newEPS->entryPointRevision	= 0;
     

From 6598d1c4d002b42d44a81e13e432fab99a2c45d0 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 19 Jun 2013 19:15:45 +0200
Subject: [PATCH 404/623] Getting ready for new 2013 models

---
 i386/libsaio/platform.h | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 569bf7d..216997c 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -59,13 +59,17 @@
 #define IMAC_121				(IMAC | (2 << 15))
 #define IMAC_122				(IMAC | (3 << 15))
 #define IMAC_131				(IMAC | (4 << 15))
-#define IMAC_132				 IMAC						// Defaults to iMac13,2
+#define IMAC_132				(IMAC | (5 << 15))
+#define IMAC_142				(IMAC | (6 << 15))
+#define IMAC_141				 IMAC						// Defaults to iMac14,1
 
 #define MACBOOK_41				 MACBOOK					// Defaults to MacBook4,1
 
 #define MACBOOK_AIR_41			(MACBOOK_AIR | (1 << 15))
 #define MACBOOK_AIR_42			(MACBOOK_AIR | (2 << 15))
-#define MACBOOK_AIR_61			(MACBOOK_AIR | (3 << 15))
+#define MACBOOK_AIR_51			(MACBOOK_AIR | (3 << 15))
+#define MACBOOK_AIR_52			(MACBOOK_AIR | (4 << 15))
+#define MACBOOK_AIR_61			(MACBOOK_AIR | (5 << 15))
 #define MACBOOK_AIR_62			 MACBOOK_AIR				// Defaults to MacBookAir6,2
 
 #define MACBOOK_PRO_61			(MACBOOK_PRO | (1 << 15))
@@ -75,18 +79,23 @@
 #define MACBOOK_PRO_91			(MACBOOK_PRO | (5 << 15))
 #define MACBOOK_PRO_92			(MACBOOK_PRO | (6 << 15))
 #define MACBOOK_PRO_101			(MACBOOK_PRO | (7 << 15))
-#define MACBOOK_PRO_102			 MACBOOK_PRO				// Defaults to MacBookPro10,2
+#define MACBOOK_PRO_102			(MACBOOK_PRO | (8 << 15))
+#define MACBOOK_PRO_112			(MACBOOK_PRO | (9 << 15))
+#define MACBOOK_PRO_111			 MACBOOK_PRO				// Defaults to MacBookPro11,1
 
 #define MACMINI_41				(MACMINI | (1 << 15))
 #define MACMINI_51				(MACMINI | (2 << 15))
 #define MACMINI_52				(MACMINI | (3 << 15))
 #define MACMINI_53				(MACMINI | (4 << 15))
 #define MACMINI_61				(MACMINI | (5 << 15))
-#define MACMINI_62				 MACMINI					// Defaults to Macmini5,1
+#define MACMINI_62				(MACMINI | (6 << 15))
+#define MACMINI_72				(MACMINI | (7 << 15))
+#define MACMINI_71				 MACMINI					// Defaults to Macmini7,1
 
 #define MACPRO_31				(MACPRO | (1 << 15))
 #define MACPRO_41				(MACPRO | (2 << 15))
-#define MACPRO_51				 MACPRO						// Defaults to MacPro5,1
+#define MACPRO_51				(MACPRO | (3 << 15))
+#define MACPRO_61				 MACPRO						// Defaults to MacPro6,1
 
 //------------------------------------------------------------------------------
 

From 267d4d8645b612e735d474334460aea93b0be484 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 19 Jun 2013 19:16:24 +0200
Subject: [PATCH 405/623] Haswell i3 processor data

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 21c63c4..001d32d 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -507,6 +507,11 @@ i5-4258U,28,800,2400,2900,2,4
 i5-4250U,15,800,1300,2600,2,4
 i5-4200Y,12,800,1400,1900,2,4
 i5-4200U,15,800,1600,2600,2,4
+i3-4130T,35,800,2900,2900,2,4
+i3-4330T,35,800,3000,3000,2,4
+i3-4130,54,800,3400,3400,2,4
+i3-4330,54,800,3500,3500,2,4
+i3-4340,54,800,3600,3600,2,4
 )
 
 gMobileHaswellCPUList=(

From 5040e0a49e189e0994885bc3f92a23a18a19ed87 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 20 Jun 2013 22:36:33 +0200
Subject: [PATCH 406/623] Added more Haswell processors data

- thanks to Jeroen for doing the hard work!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 001d32d..c2b5ee2 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -501,12 +501,14 @@ i5-4570T,35,800,2900,3600,2,4
 i5-4430S,65,800,2700,3200,4,4
 # BGA
 i7-4770R,65,800,3200,3900,4,8
+i5-4670R,65,800,3000,3700,4,4
 # Haswell ULT
 i5-4288U,28,800,2600,3100,2,4
 i5-4258U,28,800,2400,2900,2,4
 i5-4250U,15,800,1300,2600,2,4
 i5-4200Y,12,800,1400,1900,2,4
 i5-4200U,15,800,1600,2600,2,4
+#
 i3-4130T,35,800,2900,2900,2,4
 i3-4330T,35,800,3000,3000,2,4
 i3-4130,54,800,3400,3400,2,4
@@ -528,6 +530,18 @@ i7-4700MQ,47,800,2400,3600,4,8
 # Socket FCBGA1364
 i7-4700HQ,47,800,2400,3600,4,8
 i7-4702HQ,37,800,2200,3200,4,8
+# Socket FCBGA1168
+i5-4350U,15,800,1400,2900,2,4
+i5-4288U,28,800,2600,3100,2,4
+i5-4258U,28,800,2400,2900,2,4
+i5-4250U,15,800,1300,2600,2,4
+i5-4200U,15,800,1600,2600,2,4
+i5-4200Y,12,800,1400,1900,2,4
+# Socket FCBGA1168
+i3-4158U,28,800,2000,2000,2,4
+i3-4100U,15,800,1800,1800,2,4
+i3-4010U,15,800,1700,1700,2,4
+i3-4010Y,12,800,1300,1300,2,4
 )
 
 #--------------------------------------------------------------------------------

From b2af69f76f422311b324810ca438db8ff1228052 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 20 Jun 2013 22:36:51 +0200
Subject: [PATCH 407/623] SMBIOS version update

---
 i386/libsaio/smbios/model_data.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index c2f33d2..7673c84 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -245,7 +245,7 @@
 		#define SMB_BOARD_PRODUCT	"Mac-F221BEC8"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '5', ',', '1' }
 	#else // Defaults to MacPro6,1
-		#define SMB_BIOS_VERSION	"MP61.88Z.007F.B03.1010071432" // TODO: Verify this!
+		#define SMB_BIOS_VERSION	"MP61.88Z.0099.B00.1306121724" // TODO: Verify this!
 		#define SMB_PRODUCT_NAME	"MacPro6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F60DEB81FF30ACF6"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '6', ',', '1' }

From 46ccaeece23d3bd23c86b633f196bcc6acbbe131 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 10 Sep 2013 16:30:38 +0200
Subject: [PATCH 408/623] RIP Jeroen

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index c2b5ee2..5b7f9c0 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -78,7 +78,7 @@
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
 #			- Thanks to 'stinga11' for Sandy Bridge (E5) data and processor list errors.
-#			- Many thanks to Jeroen for the CPU data, cleanups, renaming stuff and other improvements.
+#			- Many thanks to Jeroen († 2013) for the CPU data, cleanups, renaming stuff and other improvements.
 #			- Thanks to 'philip_petev' for his help with Snow Leopard/egrep incompatibility.
 #			- Thanks to 'RehabMan' for his help with Snow Leopard/egrep incompatibility.
 #			- Thanks to 'BigDonkey' for his help with LFM (800 MHz) for Sandy Bridge mobility models.

From 5944bb7d30a534532cdb6aa599bc74b407fb9b13 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Thu, 24 Oct 2013 06:24:51 +0200
Subject: [PATCH 409/623] Updating script to version 6.7

New board-id's added:

iMac14,[1/2/3]
MacBookPro11,[1/2/3]
MacPro6,1
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 45 +++++++++++++---------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 5b7f9c0..9b3b542 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -2,8 +2,8 @@
 #
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
-# Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 6.6 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 0.9 - Copyright (c) 2012 by † RevoGirl
+# Version 6.7 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -74,6 +74,8 @@
 #			- Output of Clover ACPI directory detection fixed (Pike, June 2013)
 #			- Haswell CPUs added (Jeroen, June 2013)
 #			- board-id's for new MacBookAir6,[1/2] added (Pike, June 2013)
+#			- board-id's for new MacBookPro11,[1/2/3] added (Pike, October 2013)
+#			- Cleanups and board-id for new MacPro6,1 added (Pike, October 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -179,7 +181,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=6.6
+gScriptVersion=6.7
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1690,58 +1692,44 @@ function _initIvyBridgeSetup()
 function _initHaswellSetup()
 {
 	case $boardID in
-		Mac-)
+		Mac-031B6874CF7F642A)
 			gSystemType=1
 			gMacModelIdentifier="iMac14,1"
 			gACST_CPU0=13   # C1, C2, C3, C6
 			gACST_CPU1=7    # C1, C2 and C3
 		;;
 
-		Mac-)
+		Mac-27ADBB7B4CEE8E61)
 			gSystemType=1
 			gMacModelIdentifier="iMac14,2"
 			gACST_CPU0=13   # C1, C2, C3, C6
 			gACST_CPU1=7    # C1, C2 and C3
 		;;
 
-		Mac-)
+		Mac-77EB7D7DAF985)
 			gSystemType=1
-			gMacModelIdentifier="Macmini7,1"
+			gMacModelIdentifier="iMac14,3"
 			gACST_CPU0=13   # C1, C2, C3, C6
 			gACST_CPU1=7    # C1, C2 and C3
 		;;
 
-		Mac-)
-			gSystemType=1
-			gMacModelIdentifier="Macmini7,2"
-			gACST_CPU0=13   # C1, C2, C3, C6
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-)
+		Mac-189A3D4F975D5FFC)
 			gSystemType=2
 			gMacModelIdentifier="MacBookPro11,1"
 			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
 			gACST_CPU1=31   # C1, C2, C3, C6 and C7
 		;;
 
-		Mac-)
+		Mac-3CBD00234E554E41)
 			gSystemType=2
 			gMacModelIdentifier="MacBookPro11,2"
 			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
 			gACST_CPU1=31   # C1, C2, C3, C6 and C7
 		;;
 
-		Mac-)
+		Mac-2BD1B31983FE1663)
 			gSystemType=2
-			gMacModelIdentifier="MacBookPro12,1"
-			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-			gACST_CPU1=31   # C1, C2, C3, C6 and C7
-		;;
-
-		Mac-)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro12,2"
+			gMacModelIdentifier="MacBookPro11,3"
 			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
 			gACST_CPU1=31   # C1, C2, C3, C6 and C7
 		;;
@@ -1759,6 +1747,13 @@ function _initHaswellSetup()
 			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
 			gACST_CPU1=31   # C1, C2, C3, C6 and C7
 		;;
+
+		Mac-F60DEB81FF30ACF6)
+			gSystemType=1
+			gMacModelIdentifier="MacPro6,1"
+			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+			gACST_CPU1=31   # C1, C2, C3, C6 and C7
+		;;
 	esac
 }
 

From 75af7bf960fbde73173c9407942ba9435e42d5fa Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Thu, 24 Oct 2013 06:30:32 +0200
Subject: [PATCH 410/623] Typo

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 9b3b542..8deba8c 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -74,6 +74,7 @@
 #			- Output of Clover ACPI directory detection fixed (Pike, June 2013)
 #			- Haswell CPUs added (Jeroen, June 2013)
 #			- board-id's for new MacBookAir6,[1/2] added (Pike, June 2013)
+#			- board-id's for new iMac14,[1/2/3] added (Pike, October 2013)
 #			- board-id's for new MacBookPro11,[1/2/3] added (Pike, October 2013)
 #			- Cleanups and board-id for new MacPro6,1 added (Pike, October 2013)
 #
@@ -1706,7 +1707,7 @@ function _initHaswellSetup()
 			gACST_CPU1=7    # C1, C2 and C3
 		;;
 
-		Mac-77EB7D7DAF985)
+		Mac-77EB7D7DAF985301)
 			gSystemType=1
 			gMacModelIdentifier="iMac14,3"
 			gACST_CPU0=13   # C1, C2, C3, C6

From 6746e33a2326e4bc8d5763be420bf44dfd9ac580 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Wed, 20 Nov 2013 03:04:25 +0100
Subject: [PATCH 411/623] Updating script to version 6.8

Frequency error in i7-4700MQ data fixed, thanks to RehabMan
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 8deba8c..7e9536f 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by † RevoGirl
-# Version 6.7 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 6.8 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -77,6 +77,7 @@
 #			- board-id's for new iMac14,[1/2/3] added (Pike, October 2013)
 #			- board-id's for new MacBookPro11,[1/2/3] added (Pike, October 2013)
 #			- Cleanups and board-id for new MacPro6,1 added (Pike, October 2013)
+#			- Frequency error in i7-4700MQ data fixed, thanks to RehabMan (Pike, November 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -182,7 +183,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=6.7
+gScriptVersion=6.8
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -529,7 +530,7 @@ i7-4930MX,57,800,3000,3900,4,8
 i7-4900MQ,47,800,2800,3800,4,8
 i7-4800MQ,47,800,2700,3700,4,8
 i7-4702MQ,37,800,2200,3200,4,8
-i7-4700MQ,47,800,2400,3600,4,8
+i7-4700MQ,47,800,2400,3400,4,8
 # Socket FCBGA1364
 i7-4700HQ,47,800,2400,3600,4,8
 i7-4702HQ,37,800,2200,3200,4,8

From eaa9bc2037da8a8bfeaf676339b65a1bbefb03a5 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Fri, 20 Dec 2013 03:17:35 +0100
Subject: [PATCH 412/623] Update README

---
 README | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README b/README
index f46e642..251f26a 100644
--- a/README
+++ b/README
@@ -1,16 +1,16 @@
 About this project:
 -------------------
-This Open Source hobby project is maintained by Pike (http://pikeralpha.wordpress.com) and dgsga. Two long time supporters of the RevoBoot project.
+This Open Source hobby project is maintained by Pike (http://pikeralpha.wordpress.com). A long time supporter of the RevoBoot project.
 
 Note that we do not tolerate/share any (links to) copyrighted material. We only use purchased software and we won't share any of it. Just get your copy of OS X in the Apple store. Should be affordable for everyone.
 
 Mountain Lion Server:
 ---------------------
-RevoBoot has been confirmed to work with the Server app for Mountain Lion (12C60).
+RevoBoot has been confirmed to work with the Server app for Mountain Lion and Mavaricks.
 
 Fusion Drive Support:
 ---------------------
-Apple's new Fusion Drive* is a software implementation to speedup the boot and load process for frequently used applications, without limiting the storage capacity in a bad way. See also: http://support.apple.com/kb/HT5446
+Apple's Fusion Drive* is a software implementation to speedup the boot and load process for frequently used applications, without limiting the storage capacity in a bad way. See also: http://support.apple.com/kb/HT5446
 
 The new Mac's that come with a Fusion Drive boot from the third (Recovery HD like) partition on the SSD. This partition is 134.2 MB in size and is called "Boot OS X".
 The Recovery HD partition can be found as third partition on the HDD. Setting up a Fusion Drive on a Mac need to be done with Internet Recovery.
@@ -20,17 +20,17 @@ RevoBoot detects CoreStorage partitions and will boot from the boot helper parti
 NetBoot/NetInstall:
 -------------------
 People who have Mountain Lion Server setup and like to install their hack from it... sorry that won't work. The source 
-code snippets for it have been stripped out (by Master Chief in 2009) but we will fix this in a next update of RevoBoot. 
+code snippets for it have been stripped out (by Master Chief in 2009) but we might fix this in future update of RevoBoot. 
 
 Xcode Support for Mountain Lion:
 --------------------------------
-RevoBoot can be built on Snow Leopard, Lion and Mountain Lion. The latter requires Xcode 4.5.1 (and greater) and the latest 'command line tools' need to be installed. See change log for instructions.
+RevoBoot can be built on Snow Leopard, Lion, Mountain Lion (requires Xcode 4.5.1 or greater) and Mavericks, and the latest 'command line tools' need to be installed. See change log for instructions.
 
 Configuration:
 --------------
 Please note that RevoBoot must be configured for your hardware so start reading our WiKi. See also:
 
-https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder
+https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder – sorry folks, no longer available!
 
 We also have a configuration README available at:
 
@@ -38,6 +38,6 @@ https://github.com/RevoGirl/RevoBoot/blob/master/i386/config/README
 
 There's also RevoBuilder (a great tool for first starters) over at:
 
-https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder
+https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder – sorry folks, no longer available!
 
 Note: RevoBuilder is most likeky broken for RevoBoot v.1.5.00 and greater!

From 76eb63dbc2f4e51dacd24b02932b19e1b3a6076e Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sun, 22 Dec 2013 21:04:04 +0100
Subject: [PATCH 413/623] Updating script to version 6.8

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 7e9536f..ab92cb0 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by † RevoGirl
-# Version 6.8 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 6.9 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -78,6 +78,7 @@
 #			- board-id's for new MacBookPro11,[1/2/3] added (Pike, October 2013)
 #			- Cleanups and board-id for new MacPro6,1 added (Pike, October 2013)
 #			- Frequency error in i7-4700MQ data fixed, thanks to RehabMan (Pike, November 2013)
+#			- Intel i5-4200M added (Pike, December 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -183,7 +184,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=6.8
+gScriptVersion=6.9
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -531,6 +532,7 @@ i7-4900MQ,47,800,2800,3800,4,8
 i7-4800MQ,47,800,2700,3700,4,8
 i7-4702MQ,37,800,2200,3200,4,8
 i7-4700MQ,47,800,2400,3400,4,8
+i5-4200M,37,800,2500,3100,2,4
 # Socket FCBGA1364
 i7-4700HQ,47,800,2400,3600,4,8
 i7-4702HQ,37,800,2200,3200,4,8

From 950366e77dc1431663507c7059651d012828cb44 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Tue, 24 Dec 2013 15:30:22 +0100
Subject: [PATCH 414/623] Updating script to version 7.0

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index ab92cb0..241d11d 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by † RevoGirl
-# Version 6.9 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 7.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -79,6 +79,7 @@
 #			- Cleanups and board-id for new MacPro6,1 added (Pike, October 2013)
 #			- Frequency error in i7-4700MQ data fixed, thanks to RehabMan (Pike, November 2013)
 #			- Intel i5-4200M added (Pike, December 2013)
+#			- LFM fixed in the Intel i7-3930K data (Pike, December 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -88,6 +89,7 @@
 #			- Thanks to 'RehabMan' for his help with Snow Leopard/egrep incompatibility.
 #			- Thanks to 'BigDonkey' for his help with LFM (800 MHz) for Sandy Bridge mobility models.
 #			- Thanks to 'xpamamadeus' for the Clover boot.log tip.
+#			- Thanks to 'rileyfreeman' for the Intel i7-3930K LFM value.
 #
 # Usage (v1.0 - v4.9):
 #
@@ -184,7 +186,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=6.9
+gScriptVersion=7.0
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -261,7 +263,7 @@ i7-35355,120,1600,2666,2666,4,4
 # i7 Desktop Extreme Series
 i7-3970X,150,0,3500,4000,6,12
 i7-3960X,130,0,3300,3900,6,12
-i7-3930K,130,0,3200,3800,6,12
+i7-3930K,130,1200,3200,3800,6,12
 i7-3820,130,0,3600,3800,4,8
 # i7 Desktop series
 i7-2600S,65,1600,2800,3800,4,8

From 23c6887480da15eec29d3fdad9afe4cf03ff34b6 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Sat, 28 Dec 2013 17:42:27 +0100
Subject: [PATCH 415/623] Data for Intel i7-4558U added

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 241d11d..b117772 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -539,6 +539,7 @@ i5-4200M,37,800,2500,3100,2,4
 i7-4700HQ,47,800,2400,3600,4,8
 i7-4702HQ,37,800,2200,3200,4,8
 # Socket FCBGA1168
+i7-4558U,28,800,2800,3300,2,4
 i5-4350U,15,800,1400,2900,2,4
 i5-4288U,28,800,2600,3100,2,4
 i5-4258U,28,800,2400,2900,2,4

From 078ca0a16896ae5a824bb19e4a39e1f9b497b95c Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 30 Dec 2013 10:29:56 +0100
Subject: [PATCH 416/623] C-State code changes

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 392 +++++-------------
 1 file changed, 95 insertions(+), 297 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index f701306..a0c43b9 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -8,347 +8,145 @@
  *
  */
 
-#include "AppleIntelCPUPowerManagementInfo.h"
+#include <IOKit/IOLib.h>
+#include <IOKit/IOService.h>
+#include <IOKit/IOWorkLoop.h>
+#include <IOKit/IOMemoryDescriptor.h>
+#include <IOKit/IOTimerEventSource.h>
 
+#include <i386/cpuid.h>
+#include <i386/proc_reg.h>
 
-//==============================================================================
+#include "../../../essentials.h"
 
-void AppleIntelCPUPowerManagementInfo::reportMSRs(void)
-{
-	IOLog("MSR_CORE_THREAD_COUNT......(0x35)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_THREAD_COUNT));
-
-	IOLog("MSR_PLATFORM_INFO..........(0xCE)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PLATFORM_INFO));
+#define super IOService
 
-	IOLog("MSR_PMG_CST_CONFIG_CONTROL.(0xE2)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PMG_CST_CONFIG_CONTROL));
-	IOLog("MSR_PMG_IO_CAPTURE_BASE....(0xE4)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PMG_IO_CAPTURE_BASE));
-	IOLog("IA32_MPERF.................(0xE7)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MPERF));
-	IOLog("IA32_APERF.................(0xE8)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_APERF));
+#define REPORT_MSRS			1
+#define REPORT_GPU_STATS	1
+#define REPORT_C_STATES		1
 
-	IOLog("MSR_IA32_PERF_STATUS.......(0x198) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_STATUS));
-	IOLog("MSR_IA32_PERF_CONTROL......(0x199) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_CONTROL));
-	IOLog("IA32_CLOCK_MODULATION......(0x19A) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_CLOCK_MODULATION));
-	IOLog("IA32_THERM_STATUS..........(0x19C) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_THERM_STATUS));
+#define NB_BUS	0x00
+#define NB_DEV	0x00
+#define NB_FUN	0x00
 
-	IOLog("IA32_MISC_ENABLES..........(0x1A0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MISC_ENABLES));
-	IOLog("MSR_MISC_PWR_MGMT..........(0x1AA) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_MISC_PWR_MGMT));
-	IOLog("MSR_TURBO_RATIO_LIMIT......(0x1AD) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_RATIO_LIMIT));
+#define DEVEN	(0x54)
+#define DEVEN_D2EN_MASK	(0x10)
 
-	IOLog("IA32_ENERGY_PERF_BIAS......(0x1B0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_ENERGY_PERF_BIAS));
+#define NB_PCICFG_SPACE_INDEX_REG	0xcf8
+#define NB_PCICFG_SPACE_DATA_REG	0xcfc
 
-	IOLog("MSR_POWER_CTL..............(0x1FC) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_POWER_CTL));
+#define BIT31						0x80000000
 
-	IOLog("MSR_RAPL_POWER_UNIT........(0x606) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_RAPL_POWER_UNIT));
-	IOLog("MSR_PKG_POWER_LIMIT........(0x610) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_POWER_LIMIT));
-	IOLog("MSR_PKG_ENERGY_STATUS......(0x611) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_ENERGY_STATUS));
+#define PCIEX_BASE_ADDRESS			0xF8000000
+#define NB_MCH_BASE_ADDRESS			0xFED10000	// (G)MCH Memory Mapped Register Range Base Address (D0:F0:Rx48).
 
-	IOLog("MSR_PP0_CURRENT_CONFIG.....(0x601) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_CURRENT_CONFIG));
-	IOLog("MSR_PP0_POWER_LIMIT........(0x638) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POWER_LIMIT));
-	IOLog("MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
-	IOLog("MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
+#define READ_PCI8(Bx, Dx, Fx, Rx)	ReadPci8(Bx, Dx, Fx, Rx)
+#define READ_PCI8_NB(Rx)			READ_PCI8(NB_BUS, NB_DEV, NB_FUN, Rx)
+#define MMIO_READ8(Address)			(*(volatile UInt8  *)(Address))
 
-	if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_IB_CORE))
-	{
-		IOLog("MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
-		IOLog("MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
-		IOLog("MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
-		IOLog("MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY));
-	}
+#define IGPU_RATIO_TO_FREQUENCY(ratio)	((ratio * 100) / 2)
 
-	if ((gCPUModel != CPU_MODEL_SB_CORE) && (gCPUModel != CPU_MODEL_SB_JAKETOWN))
-	{
-		IOLog("MSR_CONFIG_TDP_NOMINAL.....(0x648) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_NOMINAL));
-		IOLog("MSR_CONFIG_TDP_LEVEL1......(0x649) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL1));
-		IOLog("MSR_CONFIG_TDP_LEVEL2......(0x64a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL2));
-		IOLog("MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
-		IOLog("MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
-	}
+#define NB_PCI_CFG_ADDRESS(bus, dev, func, reg) \
+	(UInt64) ((((UInt8)(bus) << 24) + ((UInt8)(dev) << 16) + \
+	((UInt8)(func) << 8) + ((UInt8)(reg))) & 0xffffffff)
 
-	if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN))
-	{
-		IOLog("MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
-	}
+#define NB_PCIE_CFG_ADDRESS(bus, dev, func, reg) \
+	((UInt32)(PCIEX_BASE_ADDRESS + ((UInt8)(bus) << 20) + \
+	((UInt8)(dev) << 15) + ((UInt8)(func) << 12) + (reg)))
 
-	IOLog("MSR_PKG_C3_RESIDENCY.......(0x3f8) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C3_RESIDENCY));
-	IOLog("MSR_PKG_C6_RESIDENCY.......(0x3f9) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C6_RESIDENCY));
-
-	if ((gCPUModel != CPU_MODEL_IB_CORE) && (gCPUModel != CPU_MODEL_IB_CORE_EX))
-	{
-		IOLog("MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
-	}
+static __inline__ unsigned char inb(UInt16 port)
+{
+	UInt8 value;
+	__asm__ volatile("inb %w1, %b0" : "=a" (value) : "Nd" (port));
+	return (value);
 }
 
-//==============================================================================
-
-inline void getCStates(void *arg)
+static __inline__ void outl(UInt16 port, UInt32 value)
 {
-	UInt8 logicalCoreNumber = cpu_number();
-
-	if ((gCoreStates & logicalCoreNumber) == 0)
-	{
-		gCoreStates |= (1ULL << logicalCoreNumber);
-		IOLog("Core (logical): %d\n", logicalCoreNumber);
-		IOLog("MSR_CORE_C3_RESIDENCY......(0x3fc) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_C3_RESIDENCY));
-		IOLog("MSR_CORE_C6_RESIDENCY......(0x3fd) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_C6_RESIDENCY));
-
-		if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN))
-		{
-			IOLog("MSR_CORE_C7_RESIDENCY......(0x3fe) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_C7_RESIDENCY));
-		}
-	}
+	__asm__ volatile("outl %0, %w1" : : "a" (value), "Nd" (port));
 }
 
-//==============================================================================
-
-IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
+UInt8 ReadPci8(UInt8 Bus, UInt8 Dev, UInt8 Fun, UInt16 Reg)
 {
-	UInt8 currentMultiplier = (rdmsr64(MSR_IA32_PERF_STS) >> 8);
-	gCoreMultipliers |= (1ULL << currentMultiplier);
-
-#if REPORT_GPU_STATS
-	UInt8 currentIgpuMultiplier = 0;
-
-	if (igpuEnabled)
+	if (Reg >= 0x100)
 	{
-		currentIgpuMultiplier = (UInt8)gMchbar[1];
-		gIGPUMultipliers |= (1ULL << currentIgpuMultiplier);
+		// return MMIO_READ8(NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
+		return MMIO_READ8((UInt64)NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
 	}
-#endif
+	else
+	{
+		outl(NB_PCICFG_SPACE_INDEX_REG, BIT31 | (Bus << 16) | (Dev << 11) | (Fun << 8) | (Reg & 0xfc));
+		return inb(NB_PCICFG_SPACE_DATA_REG | (UInt8)(Reg & 3));
+    }
+}
 
-	timerEventSource->setTimeoutTicks(Interval);
+extern "C" void mp_rendezvous_no_intrs(void (*action_func)(void *), void * arg);
+extern "C" int cpu_number(void);
 
-	if (loopLock)
-	{
-		return kIOReturnTimeout;
-	}
-	
-	loopLock = true;
+class AppleIntelCPUPowerManagementInfo : public IOService
+{
+	OSDeclareDefaultStructors (AppleIntelCPUPowerManagementInfo);
 
-	if (dumpCStates)
-	{
-		UInt32 magic = 0;
-		IOSimpleLockLock(simpleLock);
-		mp_rendezvous_no_intrs(getCStates, (void *)&magic);
-		IOSimpleLockUnlock(simpleLock);
-	}
+private:
+	IOSimpleLock		*simpleLock;
+	IOWorkLoop			*workLoop;
+	IOTimerEventSource	*timerEventSource;
 
 #if REPORT_GPU_STATS
-	if ((gCoreMultipliers != gTriggeredPStates) || (gIGPUMultipliers != gTriggeredIGPUPStates))
-#else
-	if (gCoreMultipliers != gTriggeredPStates)
+	IOMemoryDescriptor	*memDescriptor;
+	IOMemoryMap			*memoryMap;
 #endif
-	{
-		int currentBit = 0;
-		UInt64 value = 0ULL;
-
-		gTriggeredPStates = gCoreMultipliers;
-		IOLog("AICPUPMI: CPU P-States [ ");
-
-		for (currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
-		{
-			value = (1ULL << currentBit);
-			
-			if ((gTriggeredPStates & value) == value)
-			{
-				if (currentBit == currentMultiplier)
-				{
-					IOLog("(%d) ", currentBit);
-				}
-				else
-				{
-					IOLog("%d ", currentBit);
-				}
-			}
-		}
 
-#if REPORT_GPU_STATS
-		if (igpuEnabled)
-		{
-			gTriggeredIGPUPStates = gIGPUMultipliers;
-			IOLog("] GPU P-States [ ");
-			
-			for (currentBit = 17; currentBit <= 27; currentBit++)
-			{
-				value = (1ULL << currentBit);
-				
-				if ((gTriggeredIGPUPStates & value) == value)
-				{
-					if (currentBit == currentIgpuMultiplier)
-					{
-						IOLog("(%d) ", currentBit);
-					}
-					else
-					{
-						IOLog("%d ", currentBit);
-					}
-				}
-			}
-		}
-#endif
-		IOLog("]\n");
-	}
+	IOReturn result		= kIOReturnSuccess;
 
-	loopLock = false;
+	virtual IOReturn loopTimerEvent(void);
 
-	return kIOReturnSuccess;
-}
+	void reportMSRs(void);
 
-//==============================================================================
+	bool loopLock = false;
+	bool dumpCStates = true;
+	bool igpuEnabled = true;
 
-IOService* AppleIntelCPUPowerManagementInfo::probe(IOService *provider, SInt32 *score)
-{
-	IOService *ret = super::probe(provider, score);
-	
-	if (ret != this)
-	{
-		return 0;
-	}
-	
-	return ret;
-}
+	UInt16 Interval	= 50;
 
-//==============================================================================
+	UInt64	gCoreMultipliers		= 0ULL;
+	UInt64	gTriggeredPStates		= 0ULL;
 
-bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
-{
-	if (IOService::start(provider))
-	{
-		simpleLock = IOSimpleLockAlloc();
+	UInt64	gIGPUMultipliers		= 0ULL;
+	UInt64	gTriggeredIGPUPStates	= 0ULL;
 
-		if (simpleLock)
-		{
-			timerEventSource = IOTimerEventSource::timerEventSource(this, OSMemberFunctionCast(IOTimerEventSource::Action, this, &AppleIntelCPUPowerManagementInfo::loopTimerEvent));
-			workLoop = getWorkLoop();
+public:
+	virtual IOService *	probe(IOService * provider, SInt32 * score);
+	virtual bool start(IOService * provider);
+	virtual void stop(IOService * provider);
+	virtual void free(void);
 
-			if (timerEventSource && workLoop && (kIOReturnSuccess == workLoop->addEventSource(timerEventSource)))
-			{
-				this->registerService(0);
+	UInt8	gMinRatio	= 0;
+	UInt8	gClockRatio	= 0;
+	UInt8	gMaxRatio	= 0;
+};
 
-				UInt64  msr = rdmsr64(MSR_IA32_PERF_STS);
-				gCoreMultipliers |= (1ULL << (msr >> 8));
+OSDefineMetaClassAndStructors(AppleIntelCPUPowerManagementInfo, IOService)
 
-				uint32_t cpuid_reg[4];
-				do_cpuid(0x00000001, cpuid_reg);
+UInt8	gCPUModel	= 0x2A;
+UInt8	gCoreStates	= 0ULL;
 
-				gCPUModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
+#if REPORT_C_STATES
+bool	gCheckC3	= true;
+bool	gCheckC6	= true;
+bool	gCheckC7	= false;
 
-#if REPORT_MSRS
-				reportMSRs();
-#endif
-				msr = rdmsr64(MSR_PLATFORM_INFO);
-				gMinRatio = (UInt8)((msr >> 40) & 0xff);
-				IOLog("AICPUPMI: Low Frequency Mode : %d00 MHz\n", gMinRatio);
- 
-				gClockRatio = (UInt8)((msr >> 8) & 0xff);
-				IOLog("AICPUPMI: Clock Speed        : %d00 MHz\n", gClockRatio);
-
-				if (!((rdmsr64(IA32_MISC_ENABLES) >> 32) & 0x40))	// Turbo Mode Enabled?
-				{
-					msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
-					gMaxRatio = (UInt8)(msr & 0xff);
-					IOLog("AICPUPMI: Max Turbo Frequency: %d00 MHz\n", gMaxRatio);
-				}
-				else
-				{
-					gMaxRatio = gClockRatio;
-					IOLog("AICPUPMI: Max Frequency      : %d00 MHz\n", gMaxRatio);
-				}
+UInt32	gC3Cores	= 0;
+UInt32	gC6Cores	= 0;
+UInt32	gC7Cores	= 0;
 
-#if REPORT_GPU_STATS
-				if ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK))
-				{
-					IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
-					memDescriptor = IOMemoryDescriptor::withPhysicalAddress(address, 0x53, kIODirectionInOut);
-				
-					if (memDescriptor != NULL)
-					{
-						if ((result = memDescriptor->prepare()) == kIOReturnSuccess)
-						{
-							memoryMap = memDescriptor->map();
-						
-							if (memoryMap != NULL)
-							{
-								igpuEnabled = true; // IGPU Enabled and Visible
-								gMchbar = (UInt8 *)memoryMap->getVirtualAddress();
-
-								IOLog("AICPUPMI: IGPU Current Freq..: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x01]));
-								IOLog("AICPUPMI: IGPU Max Frequency.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x51]));
-								IOLog("AICPUPMI: IGPU Max Turbo Freq: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x50]));
-								//
-								// Example-1: 17 (multiplier) * 50 (frequency in MHz) =  850 MHz
-								// Example-2: 22 (multiplier) * 50 (frequency in MHz) = 1100 MHz
-								// 6 P-States: 850, 900, 950, 1000, 1050 and 1100 MHz
-								//
-							}
-							else
-							{
-								IOLog("AICPUPMI: Error: memoryMap == NULL\n");
-							}
-						}
-						else
-						{
-							IOLog("AICPUPMI: Error: memDescriptor->prepare() failed!\n");
-						}
-					}
-					else
-					{
-						IOLog("AICPUPMI: Error: memDescriptor == NULL\n");
-					}
-				}
+UInt32	gTriggeredC3Cores	= 0;
+UInt32	gTriggeredC6Cores	= 0;
+UInt32	gTriggeredC7Cores	= 0;
 #endif
-				timerEventSource->setTimeoutMS(1000);
-
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
 
-//==============================================================================
+UInt64	gCoreMultipliers = 0ULL;
 
-void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
-{
-	if (simpleLock)
-	{
-		IOSimpleLockFree(simpleLock);
-	}
-
-	if (timerEventSource)
-	{
-		if (workLoop)
-		{
-			timerEventSource->cancelTimeout();
-			workLoop->removeEventSource(timerEventSource);
-		}
-
-		timerEventSource->release();
-		timerEventSource = NULL;
-	}
-
-	super::stop(provider);
-}
-
-//==============================================================================
-
-void AppleIntelCPUPowerManagementInfo::free()
-{
 #if REPORT_GPU_STATS
-	if (igpuEnabled)
-	{
-		if (memoryMap)
-		{
-			memoryMap->release();
-			memoryMap = NULL;
-		}
-
-		if (memDescriptor)
-		{
-			memDescriptor->release();
-			memDescriptor = NULL;
-		}
-	}
+	UInt8	* gMchbar	= NULL;
 #endif
-
-	super::free();
-}

From b135b1f4b48444891f9e6b5dc9e1429d6b011ab1 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 30 Dec 2013 10:31:05 +0100
Subject: [PATCH 417/623] C-State code changes

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 505 ++++++++++++++----
 1 file changed, 406 insertions(+), 99 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index a0c43b9..24bd2fd 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -8,145 +8,452 @@
  *
  */
 
-#include <IOKit/IOLib.h>
-#include <IOKit/IOService.h>
-#include <IOKit/IOWorkLoop.h>
-#include <IOKit/IOMemoryDescriptor.h>
-#include <IOKit/IOTimerEventSource.h>
+#include "AppleIntelCPUPowerManagementInfo.h"
 
-#include <i386/cpuid.h>
-#include <i386/proc_reg.h>
 
-#include "../../../essentials.h"
+//==============================================================================
 
-#define super IOService
+void AppleIntelCPUPowerManagementInfo::reportMSRs(void)
+{
+	IOLog("AICPUPMI: MSR_CORE_THREAD_COUNT......(0x35)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_THREAD_COUNT));
+
+	IOLog("AICPUPMI: MSR_PLATFORM_INFO..........(0xCE)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PLATFORM_INFO));
+
+	IOLog("AICPUPMI: MSR_PMG_CST_CONFIG_CONTROL.(0xE2)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_CST_CONFIG_CONTROL));
+	IOLog("AICPUPMI: MSR_PMG_IO_CAPTURE_BASE....(0xE4)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PMG_IO_CAPTURE_BASE));
+	IOLog("AICPUPMI: IA32_MPERF.................(0xE7)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MPERF));
+	IOLog("AICPUPMI: IA32_APERF.................(0xE8)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_APERF));
+
+	IOLog("AICPUPMI: MSR_FLEX_RATIO.............(0x194) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_FLEX_RATIO));
+	IOLog("AICPUPMI: MSR_IA32_PERF_STATUS.......(0x198) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_STATUS));
+	IOLog("AICPUPMI: MSR_IA32_PERF_CONTROL......(0x199) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_CONTROL));
+	IOLog("AICPUPMI: IA32_CLOCK_MODULATION......(0x19A) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_CLOCK_MODULATION));
+	IOLog("AICPUPMI: IA32_THERM_STATUS..........(0x19C) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_THERM_STATUS));
+
+	IOLog("AICPUPMI: IA32_MISC_ENABLES..........(0x1A0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MISC_ENABLES));
+	IOLog("AICPUPMI: MSR_MISC_PWR_MGMT..........(0x1AA) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_MISC_PWR_MGMT));
+	IOLog("AICPUPMI: MSR_TURBO_RATIO_LIMIT......(0x1AD) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_RATIO_LIMIT));
+
+	IOLog("AICPUPMI: IA32_ENERGY_PERF_BIAS......(0x1B0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_ENERGY_PERF_BIAS));
+
+	IOLog("AICPUPMI: MSR_POWER_CTL..............(0x1FC) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_POWER_CTL));
+
+	IOLog("AICPUPMI: MSR_RAPL_POWER_UNIT........(0x606) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_RAPL_POWER_UNIT));
+	IOLog("AICPUPMI: MSR_PKG_POWER_LIMIT........(0x610) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_POWER_LIMIT));
+	IOLog("AICPUPMI: MSR_PKG_ENERGY_STATUS......(0x611) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_ENERGY_STATUS));
+
+	IOLog("AICPUPMI: MSR_PKGC3_IRTL.............(0x60a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC3_IRTL));
+	IOLog("AICPUPMI: MSR_PKGC6_IRTL.............(0x60b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC6_IRTL));
+	IOLog("AICPUPMI: MSR_PKGC7_IRTL.............(0x60c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC7_IRTL));
+
+	IOLog("AICPUPMI: MSR_PP0_CURRENT_CONFIG.....(0x601) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_CURRENT_CONFIG));
+	IOLog("AICPUPMI: MSR_PP0_POWER_LIMIT........(0x638) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POWER_LIMIT));
+	IOLog("AICPUPMI: MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
+	IOLog("AICPUPMI: MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
+
+	/* IOLog("AICPUPMI: MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
+	IOLog("AICPUPMI: MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
+	IOLog("AICPUPMI: MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
+	IOLog("AICPUPMI: MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY)); */
+
+	IOLog("AICPUPMI: MSR_CONFIG_TDP_NOMINAL.....(0x648) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_NOMINAL));
+	IOLog("AICPUPMI: MSR_CONFIG_TDP_LEVEL1......(0x649) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL1));
+	IOLog("AICPUPMI: MSR_CONFIG_TDP_LEVEL2......(0x64a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL2));
+	IOLog("AICPUPMI: MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
+	IOLog("AICPUPMI: MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
+
+	IOLog("AICPUPMI: MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
+	IOLog("AICPUPMI: MSR_PKG_C3_RESIDENCY.......(0x3f8) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C3_RESIDENCY));
+	IOLog("AICPUPMI: MSR_PKG_C6_RESIDENCY.......(0x3f9) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C6_RESIDENCY));
+	IOLog("AICPUPMI: MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+	
+	if (gCPUModel == CPU_MODEL_HASWELL_ULT)
+	{
+		IOLog("AICPUPMI: MSR_PKG_C8_RESIDENCY.......(0x630) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C9_RESIDENCY.......(0x631) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C10_RESIDENCY......(0x632) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		
+		IOLog("AICPUPMI: MSR_PKG_C8_LATENCY.........(0x633) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C9_LATENCY.........(0x634) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C10_LATENCY........(0x635) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+	}
+}
 
-#define REPORT_MSRS			1
-#define REPORT_GPU_STATS	1
-#define REPORT_C_STATES		1
+//==============================================================================
 
-#define NB_BUS	0x00
-#define NB_DEV	0x00
-#define NB_FUN	0x00
+inline void getCStates(void *magic)
+{
+	UInt32 logicalCoreNumber = cpu_number();
 
-#define DEVEN	(0x54)
-#define DEVEN_D2EN_MASK	(0x10)
+	if (gCheckC3 && rdmsr64(MSR_CORE_C3_RESIDENCY) > 0)
+	{
+		gC3Cores |= (1 << logicalCoreNumber);
+	}
 
-#define NB_PCICFG_SPACE_INDEX_REG	0xcf8
-#define NB_PCICFG_SPACE_DATA_REG	0xcfc
+	if (gCheckC6 && rdmsr64(MSR_CORE_C6_RESIDENCY) > 0)
+	{
+		gC6Cores |= (1 << logicalCoreNumber);
+	}
 
-#define BIT31						0x80000000
+	if (gCheckC7 && rdmsr64(MSR_CORE_C7_RESIDENCY) > 0)
+	{
+		gC7Cores |= (1 << logicalCoreNumber);
+	}
+}
 
-#define PCIEX_BASE_ADDRESS			0xF8000000
-#define NB_MCH_BASE_ADDRESS			0xFED10000	// (G)MCH Memory Mapped Register Range Base Address (D0:F0:Rx48).
+//==============================================================================
 
-#define READ_PCI8(Bx, Dx, Fx, Rx)	ReadPci8(Bx, Dx, Fx, Rx)
-#define READ_PCI8_NB(Rx)			READ_PCI8(NB_BUS, NB_DEV, NB_FUN, Rx)
-#define MMIO_READ8(Address)			(*(volatile UInt8  *)(Address))
+IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
+{
+	UInt8 currentMultiplier = (rdmsr64(MSR_IA32_PERF_STS) >> 8);
+	gCoreMultipliers |= (1ULL << currentMultiplier);
 
-#define IGPU_RATIO_TO_FREQUENCY(ratio)	((ratio * 100) / 2)
+#if REPORT_GPU_STATS
+	UInt8 currentIgpuMultiplier = 0;
 
-#define NB_PCI_CFG_ADDRESS(bus, dev, func, reg) \
-	(UInt64) ((((UInt8)(bus) << 24) + ((UInt8)(dev) << 16) + \
-	((UInt8)(func) << 8) + ((UInt8)(reg))) & 0xffffffff)
+	if (igpuEnabled)
+	{
+		currentIgpuMultiplier = (UInt8)gMchbar[1];
+		gIGPUMultipliers |= (1ULL << currentIgpuMultiplier);
+	}
+#endif
 
-#define NB_PCIE_CFG_ADDRESS(bus, dev, func, reg) \
-	((UInt32)(PCIEX_BASE_ADDRESS + ((UInt8)(bus) << 20) + \
-	((UInt8)(dev) << 15) + ((UInt8)(func) << 12) + (reg)))
+	timerEventSource->setTimeoutTicks(Interval);
 
-static __inline__ unsigned char inb(UInt16 port)
-{
-	UInt8 value;
-	__asm__ volatile("inb %w1, %b0" : "=a" (value) : "Nd" (port));
-	return (value);
-}
+	if (loopLock)
+	{
+		return kIOReturnTimeout;
+	}
+	
+	loopLock = true;
 
-static __inline__ void outl(UInt16 port, UInt32 value)
-{
-	__asm__ volatile("outl %0, %w1" : : "a" (value), "Nd" (port));
-}
+#if REPORT_C_STATES
+	if (dumpCStates)
+	{
+		UInt32 magic = 0;
+		// IOSimpleLockLock(simpleLock);
+		mp_rendezvous_no_intrs(getCStates, &magic);
+		IOSleep(1);
+		// IOSimpleLockUnlock(simpleLock);
+	}
+#endif
 
-UInt8 ReadPci8(UInt8 Bus, UInt8 Dev, UInt8 Fun, UInt16 Reg)
-{
-	if (Reg >= 0x100)
+	int currentBit = 0;
+	UInt64 value = 0ULL;
+
+#if REPORT_GPU_STATS
+	if ((gCoreMultipliers != gTriggeredPStates) || (gIGPUMultipliers != gTriggeredIGPUPStates))
+#else
+	if (gCoreMultipliers != gTriggeredPStates)
+#endif
 	{
-		// return MMIO_READ8(NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
-		return MMIO_READ8((UInt64)NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
+		// int currentBit = 0;
+		// UInt64 value = 0ULL;
+
+		gTriggeredPStates = gCoreMultipliers;
+		IOLog("AICPUPMI: CPU P-States [ ");
+
+		for (currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
+		{
+			value = (1ULL << currentBit);
+			
+			if ((gTriggeredPStates & value) == value)
+			{
+				if (currentBit == currentMultiplier)
+				{
+					IOLog("(%d) ", currentBit);
+				}
+				else
+				{
+					IOLog("%d ", currentBit);
+				}
+			}
+		}
+
+#if REPORT_GPU_STATS
+		if (igpuEnabled)
+		{
+			gTriggeredIGPUPStates = gIGPUMultipliers;
+			IOLog("] iGPU P-States [ ");
+			
+			for (currentBit = 1; currentBit <= 32; currentBit++)
+			{
+				value = (1ULL << currentBit);
+				
+				if ((gTriggeredIGPUPStates & value) == value)
+				{
+					if (currentBit == currentIgpuMultiplier)
+					{
+						IOLog("(%d) ", currentBit);
+					}
+					else
+					{
+						IOLog("%d ", currentBit);
+					}
+				}
+			}
+		}
+#endif
+		IOLog("]\n");
 	}
-	else
+
+#if REPORT_C_STATES
+	if (gTriggeredC3Cores != gC3Cores)
 	{
-		outl(NB_PCICFG_SPACE_INDEX_REG, BIT31 | (Bus << 16) | (Dev << 11) | (Fun << 8) | (Reg & 0xfc));
-		return inb(NB_PCICFG_SPACE_DATA_REG | (UInt8)(Reg & 3));
-    }
+		gTriggeredC3Cores = gC3Cores;
+		IOLog("AICPUPMI: CPU C3-Cores [ ");
+	
+		for (currentBit = 0; currentBit <= 16; currentBit++)
+		{
+			value = (1ULL << currentBit);
+		
+			if ((gTriggeredC3Cores & value) == value)
+			{
+				IOLog("%d ", currentBit);
+			}
+		}
+
+		IOLog("]\n");
+	}
+
+	if (gTriggeredC6Cores != gC6Cores)
+	{
+		gTriggeredC6Cores = gC6Cores;
+		IOLog("AICPUPMI: CPU C6-Cores [ ");
+	
+		for (currentBit = 0; currentBit <= 16; currentBit++)
+		{
+			value = (1ULL << currentBit);
+		
+			if ((gTriggeredC6Cores & value) == value)
+			{
+				IOLog("%d ", currentBit);
+			}
+		}
+	
+		IOLog("]\n");
+	}
+
+	if (gTriggeredC7Cores != gC7Cores)
+	{
+		gTriggeredC7Cores = gC7Cores;
+		IOLog("AICPUPMI: CPU C7-Cores [ ");
+	
+		for (currentBit = 0; currentBit <= 16; currentBit++)
+		{
+			value = (1ULL << currentBit);
+		
+			if ((gTriggeredC7Cores & value) == value)
+			{
+				IOLog("%d ", currentBit);
+			}
+		}
+	
+		IOLog("]\n");
+	}
+#endif
+
+	loopLock = false;
+
+	return kIOReturnSuccess;
 }
 
-extern "C" void mp_rendezvous_no_intrs(void (*action_func)(void *), void * arg);
-extern "C" int cpu_number(void);
+//==============================================================================
 
-class AppleIntelCPUPowerManagementInfo : public IOService
+IOService* AppleIntelCPUPowerManagementInfo::probe(IOService *provider, SInt32 *score)
 {
-	OSDeclareDefaultStructors (AppleIntelCPUPowerManagementInfo);
+	IOService *ret = super::probe(provider, score);
+	
+	if (ret != this)
+	{
+		return 0;
+	}
+	
+	return ret;
+}
 
-private:
-	IOSimpleLock		*simpleLock;
-	IOWorkLoop			*workLoop;
-	IOTimerEventSource	*timerEventSource;
+//==============================================================================
 
-#if REPORT_GPU_STATS
-	IOMemoryDescriptor	*memDescriptor;
-	IOMemoryMap			*memoryMap;
-#endif
+bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
+{
+	if (IOService::start(provider))
+	{
+		simpleLock = IOSimpleLockAlloc();
 
-	IOReturn result		= kIOReturnSuccess;
+		if (simpleLock)
+		{
+			timerEventSource = IOTimerEventSource::timerEventSource(this, OSMemberFunctionCast(IOTimerEventSource::Action, this, &AppleIntelCPUPowerManagementInfo::loopTimerEvent));
+			workLoop = getWorkLoop();
 
-	virtual IOReturn loopTimerEvent(void);
+			if (timerEventSource && workLoop && (kIOReturnSuccess == workLoop->addEventSource(timerEventSource)))
+			{
+				this->registerService(0);
 
-	void reportMSRs(void);
+				UInt64  msr = rdmsr64(MSR_IA32_PERF_STS);
+				gCoreMultipliers |= (1ULL << (msr >> 8));
 
-	bool loopLock = false;
-	bool dumpCStates = true;
-	bool igpuEnabled = true;
+				// wrmsr64(IA32_ENERGY_PERF_BIAS, 15);
+				// wrmsr64(MSR_IA32_PERF_CONTROL, 0x2000);
+				
+				uint32_t cpuid_reg[4];
+				do_cpuid(0x00000001, cpuid_reg);
 
-	UInt16 Interval	= 50;
+				gCPUModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
 
-	UInt64	gCoreMultipliers		= 0ULL;
-	UInt64	gTriggeredPStates		= 0ULL;
+				// MWAIT information
+				do_cpuid(0x00000005, cpuid_reg);
+				uint32_t supportedMwaitCStates = bitfield32(cpuid_reg[edx], 31,  0);
+				
+				IOLog("AICPUPMI: MWAIT C-States     : %d\n", supportedMwaitCStates);
 
-	UInt64	gIGPUMultipliers		= 0ULL;
-	UInt64	gTriggeredIGPUPStates	= 0ULL;
+#if REPORT_MSRS
+				reportMSRs();
+#endif
+				msr = rdmsr64(MSR_PLATFORM_INFO);
+				gMinRatio = (UInt8)((msr >> 40) & 0xff);
+				IOLog("AICPUPMI: Low Frequency Mode : %d00 MHz\n", gMinRatio);
+ 
+				gClockRatio = (UInt8)((msr >> 8) & 0xff);
+				IOLog("AICPUPMI: Clock Speed        : %d00 MHz\n", gClockRatio);
+
+				if (!((rdmsr64(IA32_MISC_ENABLES) >> 32) & 0x40))	// Turbo Mode Enabled?
+				{
+					msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
+					gMaxRatio = (UInt8)(msr & 0xff);
+					IOLog("AICPUPMI: Max Turbo Frequency: %d00 MHz\n", gMaxRatio);
+				}
+				else
+				{
+					gMaxRatio = gClockRatio;
+					IOLog("AICPUPMI: Max Frequency      : %d00 MHz\n", gMaxRatio);
+				}
 
-public:
-	virtual IOService *	probe(IOService * provider, SInt32 * score);
-	virtual bool start(IOService * provider);
-	virtual void stop(IOService * provider);
-	virtual void free(void);
+#if REPORT_GPU_STATS
+				if ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK))
+				{
+					IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
+					memDescriptor = IOMemoryDescriptor::withPhysicalAddress(address, 0x53, kIODirectionInOut);
+				
+					if (memDescriptor != NULL)
+					{
+						if ((result = memDescriptor->prepare()) == kIOReturnSuccess)
+						{
+							memoryMap = memDescriptor->map();
+						
+							if (memoryMap != NULL)
+							{
+								igpuEnabled = true; // IGPU Enabled and Visible
+								gMchbar = (UInt8 *)memoryMap->getVirtualAddress();
+
+								// Preventing a stupid (UEFI) BIOS limit.
+								if (gMchbar[0x4C] < gMchbar[0x50])
+								{
+									gMchbar[0x4C] = gMchbar[0x50];
+								}
+
+								//
+								// Examples:
+								//			17 (multiplier) * 50 (frequency in MHz) =  850 MHz
+								//			22 (multiplier) * 50 (frequency in MHz) = 1100 MHz
+								//			6 P-States: 850, 900, 950, 1000, 1050 and 1100 MHz
+								//
+								//
+								// Current RP-State, when the graphics engine is in RC6, this reflects the last used ratio.
+								IOLog("AICPUPMI: IGPU Current Frequency..: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x01])); // RP_STATE_RATIO (CURRENT_FREQUENCY)
+								// Maximum RPN base frequency capability for the Integrated GFX Engine (GT).
+								IOLog("AICPUPMI: IGPU Min Frequency......: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x52])); // RPN_CAP (MIN_FREQUENCY)
+								// Maximum RP1 base frequency capability for the Integrated GFX Engine (GT).
+								IOLog("AICPUPMI: IGPU Max Non-Turbo Freq.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x51])); // RP1_CAP (MAX_NON_TURBO)
+								// Maximum RP0 base frequency capability for the Integrated GFX Engine (GT).
+								IOLog("AICPUPMI: IGPU Max Turbo Frequency: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x50])); // RP0_CAP (MAX_TURBO))
+
+								// Maximum base frequency limit for the Integrated GFX Engine (GT) allowed during run-time.
+								if (gMchbar[0x4C] == 255)
+								{
+									IOLog("AICPUPMI: IGPU Maximum limit......: No Limit\n"); // RPSTT_LIM
+								}
+								else
+								{
+									IOLog("AICPUPMI: IGPU Maximum limit......: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x4C])); // RPSTT_LIM
+								}
+							}
+							else
+							{
+								IOLog("AICPUPMI: Error: memoryMap == NULL\n");
+							}
+						}
+						else
+						{
+							IOLog("AICPUPMI: Error: memDescriptor->prepare() failed!\n");
+						}
+					}
+					else
+					{
+						IOLog("AICPUPMI: Error: memDescriptor == NULL\n");
+					}
+				}
+#endif
+				
+#if REPORT_C_STATES
+				if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN) || (gCPUModel == CPU_MODEL_HASWELL))
+				{
+					gCheckC7 = true;
+				}
+#endif
+				timerEventSource->setTimeoutMS(1000);
 
-	UInt8	gMinRatio	= 0;
-	UInt8	gClockRatio	= 0;
-	UInt8	gMaxRatio	= 0;
-};
+				return true;
+			}
+		}
+	}
 
-OSDefineMetaClassAndStructors(AppleIntelCPUPowerManagementInfo, IOService)
+	return false;
+}
 
-UInt8	gCPUModel	= 0x2A;
-UInt8	gCoreStates	= 0ULL;
+//==============================================================================
 
-#if REPORT_C_STATES
-bool	gCheckC3	= true;
-bool	gCheckC6	= true;
-bool	gCheckC7	= false;
+void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
+{
+	if (simpleLock)
+	{
+		IOSimpleLockFree(simpleLock);
+	}
 
-UInt32	gC3Cores	= 0;
-UInt32	gC6Cores	= 0;
-UInt32	gC7Cores	= 0;
+	if (timerEventSource)
+	{
+		if (workLoop)
+		{
+			timerEventSource->cancelTimeout();
+			workLoop->removeEventSource(timerEventSource);
+		}
+
+		timerEventSource->release();
+		timerEventSource = NULL;
+	}
 
-UInt32	gTriggeredC3Cores	= 0;
-UInt32	gTriggeredC6Cores	= 0;
-UInt32	gTriggeredC7Cores	= 0;
-#endif
+	super::stop(provider);
+}
 
-UInt64	gCoreMultipliers = 0ULL;
+//==============================================================================
 
+void AppleIntelCPUPowerManagementInfo::free()
+{
 #if REPORT_GPU_STATS
-	UInt8	* gMchbar	= NULL;
+	if (igpuEnabled)
+	{
+		if (memoryMap)
+		{
+			memoryMap->release();
+			memoryMap = NULL;
+		}
+
+		if (memDescriptor)
+		{
+			memDescriptor->release();
+			memDescriptor = NULL;
+		}
+	}
 #endif
+
+	super::free();
+}

From b63d26dc0461c15e6e71e06ff69472a0fbc9ee43 Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 30 Dec 2013 10:37:07 +0100
Subject: [PATCH 418/623] Updating file for
 AppleIntelCPUPowerManagementInfo.kext

---
 i386/libsaio/cpu/essentials.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index ff093e6..e99d40b 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -82,6 +82,10 @@
 #define IA32_PLATFORM_DCA_CAP		0x01F8
 #define MSR_POWER_CTL				0x01FC
 
+#define MSR_PKGC3_IRTL				0x60A
+#define MSR_PKGC6_IRTL				0x60B
+#define MSR_PKGC7_IRTL				0x60C
+
 #define MSR_PKG_C2_RESIDENCY		0x60D
 #define MSR_PKG_C3_RESIDENCY		0x3F8
 #define MSR_PKG_C6_RESIDENCY		0x3F9

From adf1580ba2280519b6bdd2c37d73c0d1c84541ff Mon Sep 17 00:00:00 2001
From: Pike <PikerAlpha@yahoo.com>
Date: Mon, 30 Dec 2013 10:40:08 +0100
Subject: [PATCH 419/623] .

---
 .../AppleIntelCPUPowerManagementInfo.h        | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index f161451..a0c43b9 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -23,6 +23,7 @@
 
 #define REPORT_MSRS			1
 #define REPORT_GPU_STATS	1
+#define REPORT_C_STATES		1
 
 #define NB_BUS	0x00
 #define NB_DEV	0x00
@@ -69,7 +70,8 @@ UInt8 ReadPci8(UInt8 Bus, UInt8 Dev, UInt8 Fun, UInt16 Reg)
 {
 	if (Reg >= 0x100)
 	{
-		return MMIO_READ8(NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
+		// return MMIO_READ8(NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
+		return MMIO_READ8((UInt64)NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
 	}
 	else
 	{
@@ -102,8 +104,8 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 	void reportMSRs(void);
 
 	bool loopLock = false;
-	bool dumpCStates = false;
-	bool igpuEnabled = false;
+	bool dumpCStates = true;
+	bool igpuEnabled = true;
 
 	UInt16 Interval	= 50;
 
@@ -129,6 +131,22 @@ OSDefineMetaClassAndStructors(AppleIntelCPUPowerManagementInfo, IOService)
 UInt8	gCPUModel	= 0x2A;
 UInt8	gCoreStates	= 0ULL;
 
+#if REPORT_C_STATES
+bool	gCheckC3	= true;
+bool	gCheckC6	= true;
+bool	gCheckC7	= false;
+
+UInt32	gC3Cores	= 0;
+UInt32	gC6Cores	= 0;
+UInt32	gC7Cores	= 0;
+
+UInt32	gTriggeredC3Cores	= 0;
+UInt32	gTriggeredC6Cores	= 0;
+UInt32	gTriggeredC7Cores	= 0;
+#endif
+
+UInt64	gCoreMultipliers = 0ULL;
+
 #if REPORT_GPU_STATS
 	UInt8	* gMchbar	= NULL;
 #endif

From 1b31162757e067d8b27c4a5093625f3c4e2b7b04 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 30 Dec 2013 11:13:05 +0100
Subject: [PATCH 420/623] Uodating files

Comitting files from Vector One.
---
 i386/boot2/boot.c                             | 10 ++-
 i386/boot2/drivers.c                          | 16 ++--
 i386/config/settings-template.h               |  2 +-
 i386/libsaio/acpi.c                           |  2 +-
 i386/libsaio/acpi/Tools/ssdtPRGen.sh          | 61 ++++++++++-----
 i386/libsaio/acpi/patcher.h                   |  1 +
 i386/libsaio/cpu/Intel/dynamic_data.h         |  8 +-
 i386/libsaio/cpu/essentials.h                 |  6 ++
 .../AppleIntelCPUPowerManagementInfo.cpp      | 75 ++++++++++++-------
 i386/libsaio/efi.c                            |  5 ++
 i386/libsaio/platform.h                       |  4 +-
 i386/libsaio/smbios/dynamic_data.h            |  6 +-
 i386/libsaio/smbios/model_data.h              | 41 +++++++---
 13 files changed, 161 insertions(+), 76 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 5d62fe2..179a387 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -59,6 +59,8 @@
 #include "sl.h"
 #include "libsa.h"
 
+#include "cpu/proc_reg.h"
+
 // DHP: Dump all global junk a.s.a.p.
 
 long gBootMode = kBootModeQuiet; // no longer defaults to 0 aka kBootModeNormal
@@ -314,6 +316,12 @@ void boot(int biosdev)
 					strlcpy(rootUUID, val, 37);
 				}
 #if INSTALL_ESD_SUPPORT
+				/*
+				 * boot-arg scheme:
+				 *
+				 * container-dmg: optional DMG that contains the root-dmg.
+				 * root-dmg: the DMG that will be the root filesystem.
+				 */
 				if (getValueForBootKey(kernelFlags, "container-dmg", &val, &length) &&
 					getValueForBootKey(kernelFlags, "root-dmg", &val, &length))
 				{
@@ -661,7 +669,7 @@ void boot(int biosdev)
 			finalizeKernelBootConfig();
 			
 			_BOOT_DEBUG_DUMP("execKernel-7 / gVerboseMode is %s\n", gVerboseMode ? "true" : "false");
-			
+
 			// Did we switch to graphics mode yet (think verbose mode)?
 			if (gVerboseMode || bootArgs->Video.v_display == VGA_TEXT_MODE)
 			{
diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index cd90650..75860b8 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -199,19 +199,21 @@ long loadDrivers(char * dirSpec)
 
 		if ((gKextLoadStatus & 1) == 0)
 		{
-			_DRIVERS_DEBUG_DUMP("\nCalling loadKexts(\"/System/Library/Extensions\");\n");
-			// System kexts
-			if (loadKexts("/System/Library/Extensions", 0) == EFI_SUCCESS)
+#if (MAKE_TARGET_OS == MAVERICKS)
+			_DRIVERS_DEBUG_DUMP("\nCalling loadKexts(\"/Library/Extensions\");\n");
+
+			// For Mavericks we first load the signed kexts.
+			if (loadKexts("/Library/Extensions", 0) == EFI_SUCCESS)
 			{
 				_DRIVERS_DEBUG_DUMP("loadKexts(1) OK.\n");
 			}
-#if (MAKE_TARGET_OS == MAVERICKS)
-			// Signed kexts for Mavericks only!
-			if (loadKexts("/Library/Extensions", 0) == EFI_SUCCESS)
+#endif
+			_DRIVERS_DEBUG_DUMP("\nCalling loadKexts(\"/System/Library/Extensions\");\n");
+			// System kexts
+			if (loadKexts("/System/Library/Extensions", 0) == EFI_SUCCESS)
 			{
 				_DRIVERS_DEBUG_DUMP("loadKexts(2) OK.\n");
 			}
-#endif
 			_DRIVERS_DEBUG_DUMP("\n");
 		}
 	}
diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 683aa7f..f59030a 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -208,7 +208,7 @@
 //--------------------------------------------------------------- BOOT.C -------------------------------------------------------------------
 
 
-#define PRE_LINKED_KERNEL_SUPPORT			1	// Set to 1 by default. Change this to 0 to disable the use of pre-linked kernels.
+#define PRE_LINKED_KERNEL_SUPPORT			0	// Set to 1 by default. Change this to 0 to disable the use of pre-linked kernels.
 
 #define MUST_ENABLE_A20						0	// Set to 0 by default. Change this to 1 when your hardware requires it.
 
diff --git a/i386/libsaio/acpi.c b/i386/libsaio/acpi.c
index baaa8fd..c57ec93 100755
--- a/i386/libsaio/acpi.c
+++ b/i386/libsaio/acpi.c
@@ -78,7 +78,7 @@ void updateACPITableData(struct acpi_2_rsdp * rsdp, struct acpi_2_xsdt * xsdt, i
 	//------------------------- Used in acpi/patcher.h -------------------------
 	#define _ACPI_SET(target, str, len) strncpy(target, str, len)
 	#define _ACPI_SET_APPLE_OEMID(target) _ACPI_SET((target)->OEMID, "Apple ", 6)
-	#define _ACPI_SET_APPLE_OEMTargetID(target) _ACPI_SET((target)->OEMTableID, "Apple00", 8)
+	#define _ACPI_SET_APPLE_OEMTargetID(target) _ACPI_SET((target)->OEMTableID, gPlatform.CommaLessModelID, 8)
 	//--------------------------------------------------------------------------
 #else
 	//--------------------------- Void replacements ----------------------------
diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index c2b5ee2..ec3069e 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
-# Version 6.6 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 7.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -74,6 +74,12 @@
 #			- Output of Clover ACPI directory detection fixed (Pike, June 2013)
 #			- Haswell CPUs added (Jeroen, June 2013)
 #			- board-id's for new MacBookAir6,[1/2] added (Pike, June 2013)
+#			- board-id's for new iMac14,[1/2/3] added (Pike, October 2013)
+#			- board-id's for new MacBookPro11,[1/2/3] added (Pike, October 2013)
+#			- Cleanups and board-id for new MacPro6,1 added (Pike, October 2013)
+#			– Frequency error in i7-4700MQ data fixed, thanks to RehabMan (Pike, November 2013)
+#			- Intel i5-4200M added (Pike, December 2013)
+#			- LFM fixed in the Intel i7-3930K data (Pike, December 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -83,6 +89,7 @@
 #			- Thanks to 'RehabMan' for his help with Snow Leopard/egrep incompatibility.
 #			- Thanks to 'BigDonkey' for his help with LFM (800 MHz) for Sandy Bridge mobility models.
 #			- Thanks to 'xpamamadeus' for the Clover boot.log tip.
+#			- Thanks to 'rileyfreeman' for the Intel i7-3930K LFM value.
 #
 # Usage (v1.0 - v4.9):
 #
@@ -179,7 +186,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=6.6
+gScriptVersion=7.0
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -256,7 +263,7 @@ i7-35355,120,1600,2666,2666,4,4
 # i7 Desktop Extreme Series
 i7-3970X,150,0,3500,4000,6,12
 i7-3960X,130,0,3300,3900,6,12
-i7-3930K,130,0,3200,3800,6,12
+i7-3930K,130,1200,3200,3800,6,12
 i7-3820,130,0,3600,3800,4,8
 # i7 Desktop series
 i7-2600S,65,1600,2800,3800,4,8
@@ -531,6 +538,7 @@ i7-4700MQ,47,800,2400,3600,4,8
 i7-4700HQ,47,800,2400,3600,4,8
 i7-4702HQ,37,800,2200,3200,4,8
 # Socket FCBGA1168
+i7-4558U,28,800,2800,3300,2,4
 i5-4350U,15,800,1400,2900,2,4
 i5-4288U,28,800,2600,3100,2,4
 i5-4258U,28,800,2400,2900,2,4
@@ -632,7 +640,7 @@ function _printScopeStart()
     # Do we need to create additional (Low Frequency) P-States?
     #
 
-    if [ $gBridgeType -eq $IVY_BRIDGE ];
+    if [ $gBridgeType -ne $SANDY_BRIDGE ];
         then
             let lowFrequencyPStates=($gBaseFrequency/100)-8
             let packageLength=($2+$lowFrequencyPStates)
@@ -641,7 +649,7 @@ function _printScopeStart()
             echo ')'                                                                    >> $gSsdtPR
 
             # TODO: Remove this when CPUPM for IB works properly!
-            if ((gIvyWorkAround)); then
+            if [[ gIvyWorkAround && $gBridgeType -eq $IVY_BRIDGE ]]; then
                 let useWorkArounds=1
             fi
     fi
@@ -822,6 +830,7 @@ function _printScopeACST()
     #
     if [ $1 -eq 1 ];
         then
+            echo "1: $1"
             # Yes (also used by CPU2, CPU3 and greater).
             let targetCStates=$gACST_CPU1
             latency_C1=0x03E8
@@ -838,10 +847,10 @@ function _printScopeACST()
             #
             if (($gTypeCPU == $gMobileCPU)); then
                 echo 'Adjusting C-States for detected (mobile) processor'
-                gACST_CPU0=29
+                let gACST_CPU0=29
             fi
-
-            let targetCStates=$gACST_CPU0
+            echo "gACST_CPU0: $gACST_CPU0"
+            let targetCStates=253 # $gACST_CPU0
             latency_C1=Zero
             latency_C3=0xCD
             latency_C6=0xF5
@@ -853,34 +862,41 @@ function _printScopeACST()
             fi
     fi
 
+    echo "targetCStates: $targetCStates"
+
     #
     # Checks to determine which C-State(s) we should inject.
     #
     if (($targetCStates & 1)); then
+        echo "Adding C1"
         let C1=1
         let numberOfCStates+=1
         let pkgLength+=1
     fi
 
     if (($targetCStates & 2)); then
+        echo "Adding C2"
         let C2=1
         let numberOfCStates+=1
         let pkgLength+=1
     fi
 
     if (($targetCStates & 4)); then
+        echo "Adding C3"
         let C3=1
         let numberOfCStates+=1
         let pkgLength+=1
     fi
 
     if (($targetCStates & 8)); then
+        echo "Adding C6"
         let C6=1
         let numberOfCStates+=1
         let pkgLength+=1
     fi
 
-    if (($targetCStates & 16)); then
+    if ((($targetCStates & 16) == 16)); then
+        echo "Adding C7"
         let C7=1
         let numberOfCStates+=1
         let pkgLength+=1
@@ -1134,6 +1150,7 @@ function _getProcessorScope()
         printf 'Processor Declaration(s) Found in DSDT'
     fi
 
+    # Search for "_PR_"
     if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5f50525f') ]];
         then
             gScope="\_PR_"
@@ -1754,6 +1771,7 @@ function _initHaswellSetup()
 		;;
 
 		Mac-7DF21CB3ED6977E5)
+            echo "YES"
 			gSystemType=2
 			gMacModelIdentifier="MacBookAir6,2"
 			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
@@ -1864,7 +1882,7 @@ function main()
         fi
 
         # Haswell ULT
-        if (($model==0x40)); then
+        if (($model==0x45)); then
             let assumedTDP=1
             let gTdp=15
             let gBridgeType=8
@@ -2065,23 +2083,28 @@ function main()
     _printScopeStart $turboStates $packageLength
     _printPackages $gTdp $frequency $maxTurboFrequency
 
-    if [ $gBridgeType -eq $SANDY_BRIDGE ];
-        then
+    case "$gBridgeType" in
+        $SANDY_BRIDGE)
             local cpuTypeString="06"
-
             _initSandyBridgeSetup
-
             _printScopeACST 0
             _printScopeCPUn
-        else
+            ;;
+        $IVY_BRIDGE)
             local cpuTypeString="07"
-
             _initIvyBridgeSetup
-
             _printScopeACST 0
             _printMethodDSM
             _printScopeCPUn
-    fi
+            ;;
+        $HASWELL)
+            local cpuTypeString="08"
+            _initHaswellSetup
+            _printScopeACST 0
+            _printMethodDSM
+            _printScopeCPUn
+           ;;
+    esac
 
     _showLowPowerStates
     _checkPlatformSupport $modelID $boardID
@@ -2132,7 +2155,7 @@ if (($gCallIasl)); then
     #
     # Compile ssdt.dsl
     #
-    "$iasl" $gSsdtPR
+    sudo "$iasl" $gSsdtPR
 
     #
     # Copy ssdt_pr.aml to /Extra/ssdt.aml (example)
diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 479f0e5..4fe1470 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -87,6 +87,7 @@ void loadACPITables(void)
 #endif // LOAD_DSDT_TABLE_FROM_EXTRA_ACPI
 
 #if LOAD_SSDT_TABLE_FROM_EXTRA_ACPI
+	// loadACPITable(APIC); Table load example!
 	loadACPITable(SSDT);
 	loadACPITable(SSDT_PR);	// Overrides STATIC_SSDT_PR_TABLE_DATA / AUTOMATIC_SSDT_PR_CREATION when found!
 	loadACPITable(SSDT_USB);
diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index c794c44..a7bb118 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -384,7 +384,7 @@ void initCPUStruct(void)
 				}
 				else if (strstr(gPlatform.CPU.BrandString, "Core(TM) i5"))
 				{
-					gPlatform.CPU.Type = (0x600 + CoreBridgeType);		// Core i5
+					gPlatform.CPU.Type = (0x600 + 5); // CoreBridgeType);		// Core i5
 				}
 				else if (strstr(gPlatform.CPU.BrandString, "Core(TM) i3"))
 				{
@@ -412,11 +412,11 @@ void initCPUStruct(void)
 					qpiSpeed = 0; // No QPI but DMI for Sandy Bridge processors.
 					
 					// Disable C1/C3 state auto demotion i.e. it won't change C3/C6/C7 requests to C1/C3.
-					wrmsr64(MSR_PKG_CST_CONFIG_CONTROL, 0x1E000003ULL);
+					// wrmsr64(MSR_PKG_CST_CONFIG_CONTROL, 0x1E000003ULL);
 
 					// Disable EIST Hardware coordination (letting AICPUPM.kext handle it).
-					msr = rdmsr64(MSR_MISC_PWR_MGMT);
-					wrmsr64(MSR_MISC_PWR_MGMT, (msr | 1));
+					// msr = rdmsr64(MSR_MISC_PWR_MGMT);
+					// wrmsr64(MSR_MISC_PWR_MGMT, (msr | 1));
 
 					// Disable I/O MWAIT Redirection.
 					// msr = rdmsr64(MSR_PKG_CST_CONFIG_CONTROL);
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index ff093e6..6ef5ada 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -82,6 +82,10 @@
 #define IA32_PLATFORM_DCA_CAP		0x01F8
 #define MSR_POWER_CTL				0x01FC
 
+#define MSR_PKGC3_IRTL				0x60A
+#define MSR_PKGC6_IRTL				0x60B
+#define MSR_PKGC7_IRTL				0x60C
+
 #define MSR_PKG_C2_RESIDENCY		0x60D
 #define MSR_PKG_C3_RESIDENCY		0x3F8
 #define MSR_PKG_C6_RESIDENCY		0x3F9
@@ -175,7 +179,9 @@
 #define CPU_MODEL_IB_CORE_XEON		0x3E
 
 #define CPU_MODEL_HASWELL			0x3C
+#define CPU_MODEL_HASWELL_SVR		0x3F
 #define CPU_MODEL_HASWELL_ULT		0x45
+#define CPU_MODEL_CRYSTALWELL		0x46
 
 #define DALES_BRIDGE	1
 #define SANDY_BRIDGE	2
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index f701306..ec76af1 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -24,6 +24,7 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(void)
 	IOLog("IA32_MPERF.................(0xE7)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MPERF));
 	IOLog("IA32_APERF.................(0xE8)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_APERF));
 
+	IOLog("MSR_FLEX_RATIO.............(0x194) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_FLEX_RATIO));
 	IOLog("MSR_IA32_PERF_STATUS.......(0x198) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_STATUS));
 	IOLog("MSR_IA32_PERF_CONTROL......(0x199) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_CONTROL));
 	IOLog("IA32_CLOCK_MODULATION......(0x19A) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_CLOCK_MODULATION));
@@ -41,39 +42,40 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(void)
 	IOLog("MSR_PKG_POWER_LIMIT........(0x610) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_POWER_LIMIT));
 	IOLog("MSR_PKG_ENERGY_STATUS......(0x611) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_ENERGY_STATUS));
 
+	IOLog("MSR_PKGC3_IRTL.............(0x60a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC3_IRTL));
+	IOLog("MSR_PKGC6_IRTL.............(0x60b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC6_IRTL));
+	IOLog("MSR_PKGC7_IRTL.............(0x60c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC7_IRTL));
+
 	IOLog("MSR_PP0_CURRENT_CONFIG.....(0x601) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_CURRENT_CONFIG));
 	IOLog("MSR_PP0_POWER_LIMIT........(0x638) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POWER_LIMIT));
 	IOLog("MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
 	IOLog("MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
 
-	if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_IB_CORE))
-	{
-		IOLog("MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
-		IOLog("MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
-		IOLog("MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
-		IOLog("MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY));
-	}
+	/* IOLog("MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
+	IOLog("MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
+	IOLog("MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
+	IOLog("MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY)); */
 
-	if ((gCPUModel != CPU_MODEL_SB_CORE) && (gCPUModel != CPU_MODEL_SB_JAKETOWN))
-	{
-		IOLog("MSR_CONFIG_TDP_NOMINAL.....(0x648) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_NOMINAL));
-		IOLog("MSR_CONFIG_TDP_LEVEL1......(0x649) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL1));
-		IOLog("MSR_CONFIG_TDP_LEVEL2......(0x64a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL2));
-		IOLog("MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
-		IOLog("MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
-	}
-
-	if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN))
-	{
-		IOLog("MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
-	}
+	IOLog("MSR_CONFIG_TDP_NOMINAL.....(0x648) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_NOMINAL));
+	IOLog("MSR_CONFIG_TDP_LEVEL1......(0x649) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL1));
+	IOLog("MSR_CONFIG_TDP_LEVEL2......(0x64a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL2));
+	IOLog("MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
+	IOLog("MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
 
+	IOLog("MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
 	IOLog("MSR_PKG_C3_RESIDENCY.......(0x3f8) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C3_RESIDENCY));
 	IOLog("MSR_PKG_C6_RESIDENCY.......(0x3f9) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C6_RESIDENCY));
-
-	if ((gCPUModel != CPU_MODEL_IB_CORE) && (gCPUModel != CPU_MODEL_IB_CORE_EX))
+	IOLog("MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+	
+	if (gCPUModel == CPU_MODEL_HASWELL_ULT)
 	{
-		IOLog("MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("MSR_PKG_C8_RESIDENCY.......(0x630) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("MSR_PKG_C9_RESIDENCY.......(0x631) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("MSR_PKG_C10_RESIDENCY......(0x632) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		
+		IOLog("MSR_PKG_C8_LATENCY.........(0x633) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("MSR_PKG_C9_LATENCY.........(0x634) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("MSR_PKG_C10_LATENCY........(0x635) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
 	}
 }
 
@@ -164,9 +166,9 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 		if (igpuEnabled)
 		{
 			gTriggeredIGPUPStates = gIGPUMultipliers;
-			IOLog("] GPU P-States [ ");
+			IOLog("] iGPU P-States [ ");
 			
-			for (currentBit = 17; currentBit <= 27; currentBit++)
+			for (currentBit = 1; currentBit <= 32; currentBit++)
 			{
 				value = (1ULL << currentBit);
 				
@@ -226,11 +228,19 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				UInt64  msr = rdmsr64(MSR_IA32_PERF_STS);
 				gCoreMultipliers |= (1ULL << (msr >> 8));
 
+				wrmsr64(IA32_ENERGY_PERF_BIAS, 15);
+				
 				uint32_t cpuid_reg[4];
 				do_cpuid(0x00000001, cpuid_reg);
 
 				gCPUModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
 
+				// MWAIT information
+				do_cpuid(0x00000005, cpuid_reg);
+				uint32_t supportedMwaitCStates = bitfield32(cpuid_reg[edx], 31,  0);
+
+				IOLog("AICPUPMI: MWAIT C-States     : %d\n", supportedMwaitCStates);
+
 #if REPORT_MSRS
 				reportMSRs();
 #endif
@@ -269,10 +279,17 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 							{
 								igpuEnabled = true; // IGPU Enabled and Visible
 								gMchbar = (UInt8 *)memoryMap->getVirtualAddress();
-
-								IOLog("AICPUPMI: IGPU Current Freq..: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x01]));
-								IOLog("AICPUPMI: IGPU Max Frequency.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x51]));
-								IOLog("AICPUPMI: IGPU Max Turbo Freq: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x50]));
+								
+								// Current RP-state, when the graphics engine is in RC6, this reflects the last used ratio.
+								IOLog("AICPUPMI: IGPU Current Freq..: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x01])); // RP_STATE_RAT IO
+								// Maximum RPN base frequency capability for the Integrated GFX Engine (GT).
+								IOLog("AICPUPMI: IGPU Max Frequency.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x52])); // RPN_CAP
+								// Maximum RP1 base frequency capability for the Integrated GFX Engine (GT).
+								IOLog("AICPUPMI: IGPU Max Frequency.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x51])); // RP1_CAP
+								// Maximum RP0 base frequency capability for the Integrated GFX Engine (GT).
+								IOLog("AICPUPMI: IGPU Max Turbo Freq: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x50])); // RP0_CAP
+								// Maximum base frequency limit for the Integrated GFX Engine (GT) allowed during run-time.
+								IOLog("AICPUPMI: IGPU Maximum limit.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x4C])); // RPSTT_LIM
 								//
 								// Example-1: 17 (multiplier) * 50 (frequency in MHz) =  850 MHz
 								// Example-2: 22 (multiplier) * 50 (frequency in MHz) = 1100 MHz
diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index d8ff442..32f873e 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -91,6 +91,11 @@ void initEFITree(void)
 
 	// The use of sizeof() here is mandatory (to prevent breakage).
 	DT__AddProperty(platformNode, "Model", sizeof(MODEL_NAME), (EFI_CHAR16*) MODEL_NAME);
+
+	// Satisfying X86PlatformPlugin.kext
+	static EFI_UINT8 const STARTUP_POWER_EVENTS[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+	DT__AddProperty(platformNode, "StartupPowerEvents", sizeof(STARTUP_POWER_EVENTS), (EFI_UINT8*) &STARTUP_POWER_EVENTS);
+
 	DT__AddProperty(platformNode, "SystemSerialNumber", sizeof(SYSTEM_SERIAL_NUMBER), (EFI_CHAR16*) SYSTEM_SERIAL_NUMBER);
 
 	if (gPlatform.CPU.FSBFrequency)
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 216997c..d982352 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -80,8 +80,8 @@
 #define MACBOOK_PRO_92			(MACBOOK_PRO | (6 << 15))
 #define MACBOOK_PRO_101			(MACBOOK_PRO | (7 << 15))
 #define MACBOOK_PRO_102			(MACBOOK_PRO | (8 << 15))
-#define MACBOOK_PRO_112			(MACBOOK_PRO | (9 << 15))
-#define MACBOOK_PRO_111			 MACBOOK_PRO				// Defaults to MacBookPro11,1
+#define MACBOOK_PRO_111			(MACBOOK_PRO | (9 << 15))
+#define MACBOOK_PRO_112			 MACBOOK_PRO				// Defaults to MacBookPro11,2
 
 #define MACMINI_41				(MACMINI | (1 << 15))
 #define MACMINI_51				(MACMINI | (2 << 15))
diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index de02604..991c529 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -222,8 +222,8 @@ void setupSMBIOS(void)
 	newEPS->anchor[3]			= 0x5f;							// _
 	newEPS->checksum			= 0;							// Updated at the end of this run.
 	newEPS->entryPointLength	= 0x1f;							// sizeof(* newEPS)
-	newEPS->majorVersion		= 2;							// SMBIOS version 2.4
-	newEPS->minorVersion		= 4;
+	newEPS->majorVersion		= 2;							// SMBIOS version 2.7
+	newEPS->minorVersion		= 7;
 	newEPS->maxStructureSize	= factoryEPS->maxStructureSize;	// Optionally checked and updated later on.
 	newEPS->entryPointRevision	= 0;
 
@@ -242,7 +242,7 @@ void setupSMBIOS(void)
 	newEPS->dmi.tableLength		= 0;							// Updated at the end of this run.
 	newEPS->dmi.tableAddress	= (uint32_t) (kernelMemory + sizeof(struct SMBEntryPoint));
 	newEPS->dmi.structureCount	= 0;							// Updated during this run.
-	newEPS->dmi.bcdRevision		= 0x24;							// SMBIOS version 2.4
+	newEPS->dmi.bcdRevision		= 0x27;							// SMBIOS version 2.7
 
 	char * stringsPtr			= NULL;
 	char * newtablesPtr			= (char *)newEPS->dmi.tableAddress;
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 7673c84..3b5c4d5 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -54,11 +54,26 @@
 		#define SMB_PRODUCT_NAME	"iMac13,1"
 		#define SMB_BOARD_PRODUCT	"Mac-00BE6ED71E35EB86"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '1' }
-	#else // Defaults to iMac13,2
+	#elif (TARGET_MODEL == IMAC_132)
 		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
 		#define SMB_PRODUCT_NAME	"iMac13,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FC02E91DDD3FA6A4"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '2' }
+	#elif (TARGET_MODEL == IMAC_141)
+		#define SMB_BIOS_VERSION	"IM141.88Z.0118.B00.1309031248"
+		#define SMB_PRODUCT_NAME	"iMac14,1"
+		#define SMB_BOARD_PRODUCT	"Mac-031B6874CF7F642A"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '1' }
+	#elif (TARGET_MODEL == IMAC_141)
+		#define SMB_BIOS_VERSION	"IM141.88Z.0118.B00.1309031249"
+		#define SMB_PRODUCT_NAME	"iMac14,2"
+		#define SMB_BOARD_PRODUCT	"Mac-27ADBB7B4CEE8E61"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '2' }
+	#else // Defaults to iMac 14,3
+        #define SMB_BIOS_VERSION	"IM143.88Z.0118.B00.1309031249"
+        #define SMB_PRODUCT_NAME	"iMac14,3"
+        #define SMB_BOARD_PRODUCT	"Mac-77EB7D7DAF985301"
+        #define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '3' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -97,14 +112,14 @@
 	#elif (TARGET_MODEL == MACBOOK_AIR_61)
 		// Intel Core i5-4250U @ 1.30 GHz (2 cores - 4 threads)
 		// Intel Core i7-4650U @ 1.70 GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B00.1305241529"
+		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B04.1309271229"
 		#define SMB_PRODUCT_NAME	"MacBookAir6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-35C1E88140C3E6CF"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '6', ',', '1' }
 	#else // Defaults to MacBookAir6,2
 		// Intel Core i5-4250U @ 1.30 GHz (2 cores - 4 threads)
 		// Intel Core i7-4650U @ 1.70 GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B00.1305241529"
+		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B04.1309271229"
 		#define SMB_PRODUCT_NAME	"MacBookAir6,2"
 		#define SMB_BOARD_PRODUCT	"Mac-7DF21CB3ED6977E5"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '6', ',', '2' }
@@ -164,17 +179,25 @@
 		#define SMB_PRODUCT_NAME	"MacBookPro10,2"
 		#define SMB_BOARD_PRODUCT	"Mac-AFD8A9D944EA4843"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '2' }
-	#else // Defaults to MacBookPro11,1
+	#elif (TARGET_MODEL == MACBOOK_PRO_111)
 		// Intel Core i5-4258U @ 2.90 GHz - 2 cores / 4 threads.
-		#define SMB_BIOS_VERSION	"MBP111.88Z.0098.B00.1306051054"
+		#define SMB_BIOS_VERSION	"MBP111.88Z.0138.B03.1310291227"
 		#define SMB_PRODUCT_NAME	"MacBookPro11,1"
 		#define SMB_BOARD_PRODUCT	"Mac-189A3D4F975D5FFC"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '1' }
+	#else // Defaults to MacBookPro11,2 (with NVIDIA graphics)
+		// Intel Core i5-4258U @ 2.90 GHz - 2 cores / 4 threads.
+		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B03.1310291227"
+		#define SMB_PRODUCT_NAME	"MacBookPro11,2"
+		#define SMB_BOARD_PRODUCT	"Mac-3CBD00234E554E41"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '2' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
 
 
+
+
 #if TARGET_MODEL & MACMINI														// 16
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"Macmini"
@@ -205,13 +228,13 @@
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '5', ',', '3' }
 	#elif (TARGET_MODEL == MACMINI_61)
 		// Intel Core i5-3210M @ 2.50 GH (2 cores - 4 theeads)
-		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B00.1208091121"
+		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B03.1211161202"
 		#define SMB_PRODUCT_NAME	"Macmini6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-031AEE4D24BFF0B1"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '1' }
 	#elif (TARGET_MODEL == MACMINI_62) // Defaults to Macmini6,2
 		// Intel Core i7-3615QM @ 2.30 GHz (4 cores - 8 threads)
-		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B00.1208091121"
+		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B03.1211161202"
 		#define SMB_PRODUCT_NAME	"Macmini6,2"
 		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '2' }
@@ -245,10 +268,10 @@
 		#define SMB_BOARD_PRODUCT	"Mac-F221BEC8"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '5', ',', '1' }
 	#else // Defaults to MacPro6,1
-		#define SMB_BIOS_VERSION	"MP61.88Z.0099.B00.1306121724" // TODO: Verify this!
+		#define SMB_BIOS_VERSION	"MP61.88Z.0116.B04.1312061508"
 		#define SMB_PRODUCT_NAME	"MacPro6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F60DEB81FF30ACF6"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '6', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
-#endif
+#endif
\ No newline at end of file

From 4e26eef310ec998d7f15f459f8eceba658867f0d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 30 Dec 2013 11:21:23 +0100
Subject: [PATCH 421/623] Updating script to v7.0 (from Vector One)

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2801 +++++++++++++-------------
 1 file changed, 1390 insertions(+), 1411 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index ec3069e..61af213 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -2,7 +2,7 @@
 #
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
-# Version 0.9 - Copyright (c) 2012 by RevoGirl <RevoGirl@rocketmail.com>
+# Version 0.9 - Copyright (c) 2012 by † RevoGirl
 # Version 7.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
@@ -77,14 +77,14 @@
 #			- board-id's for new iMac14,[1/2/3] added (Pike, October 2013)
 #			- board-id's for new MacBookPro11,[1/2/3] added (Pike, October 2013)
 #			- Cleanups and board-id for new MacPro6,1 added (Pike, October 2013)
-#			– Frequency error in i7-4700MQ data fixed, thanks to RehabMan (Pike, November 2013)
+#			- Frequency error in i7-4700MQ data fixed, thanks to RehabMan (Pike, November 2013)
 #			- Intel i5-4200M added (Pike, December 2013)
 #			- LFM fixed in the Intel i7-3930K data (Pike, December 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
 #			- Thanks to 'stinga11' for Sandy Bridge (E5) data and processor list errors.
-#			- Many thanks to Jeroen for the CPU data, cleanups, renaming stuff and other improvements.
+#			- Many thanks to Jeroen († 2013) for the CPU data, cleanups, renaming stuff and other improvements.
 #			- Thanks to 'philip_petev' for his help with Snow Leopard/egrep incompatibility.
 #			- Thanks to 'RehabMan' for his help with Snow Leopard/egrep incompatibility.
 #			- Thanks to 'BigDonkey' for his help with LFM (800 MHz) for Sandy Bridge mobility models.
@@ -533,7 +533,8 @@ i7-4930MX,57,800,3000,3900,4,8
 i7-4900MQ,47,800,2800,3800,4,8
 i7-4800MQ,47,800,2700,3700,4,8
 i7-4702MQ,37,800,2200,3200,4,8
-i7-4700MQ,47,800,2400,3600,4,8
+i7-4700MQ,47,800,2400,3400,4,8
+i5-4200M,37,800,2500,3100,2,4
 # Socket FCBGA1364
 i7-4700HQ,47,800,2400,3600,4,8
 i7-4702HQ,37,800,2200,3200,4,8
@@ -556,142 +557,142 @@ i3-4010Y,12,800,1300,1300,2,4
 
 function _printHeader()
 {
-    echo '/*'                                                                             >  $gSsdtPR
-    echo ' * Intel ACPI Component Architecture'                                           >> $gSsdtPR
-    echo ' * AML Disassembler version 20130210-00 [Feb 10 2013]'                          >> $gSsdtPR
-    echo ' * Copyright (c) 2000 - 2013 Intel Corporation'                                 >> $gSsdtPR
-    echo ' * '                                                                            >> $gSsdtPR
-    echo ' * Original Table Header:'                                                      >> $gSsdtPR
-    echo ' *     Signature        "SSDT"'                                                 >> $gSsdtPR
-    echo ' *     Length           0x0000036A (874)'                                       >> $gSsdtPR
-    echo ' *     Revision         0x01'                                                   >> $gSsdtPR
-    echo ' *     Checksum         0x00'                                                   >> $gSsdtPR
-    echo ' *     OEM ID           "APPLE "'                                               >> $gSsdtPR
-    echo ' *     OEM Table ID     "CpuPm"'                                                >> $gSsdtPR
-  printf ' *     OEM Revision     '$gRevision' (%d)\n' $gRevision                         >> $gSsdtPR
-    echo ' *     Compiler ID      "INTL"'                                                 >> $gSsdtPR
-    echo ' *     Compiler Version 0x20130210 (538116624)'                                 >> $gSsdtPR
-    echo ' */'                                                                            >> $gSsdtPR
-    echo ''                                                                               >> $gSsdtPR
-    echo 'DefinitionBlock ("'$gSsdtID'.aml", "SSDT", 1, "APPLE ", "CpuPm", '$gRevision')' >> $gSsdtPR
-    echo '{'                                                                              >> $gSsdtPR
+echo '/*'                                                                             >  $gSsdtPR
+echo ' * Intel ACPI Component Architecture'                                           >> $gSsdtPR
+echo ' * AML Disassembler version 20130210-00 [Feb 10 2013]'                          >> $gSsdtPR
+echo ' * Copyright (c) 2000 - 2013 Intel Corporation'                                 >> $gSsdtPR
+echo ' * '                                                                            >> $gSsdtPR
+echo ' * Original Table Header:'                                                      >> $gSsdtPR
+echo ' *     Signature        "SSDT"'                                                 >> $gSsdtPR
+echo ' *     Length           0x0000036A (874)'                                       >> $gSsdtPR
+echo ' *     Revision         0x01'                                                   >> $gSsdtPR
+echo ' *     Checksum         0x00'                                                   >> $gSsdtPR
+echo ' *     OEM ID           "APPLE "'                                               >> $gSsdtPR
+echo ' *     OEM Table ID     "CpuPm"'                                                >> $gSsdtPR
+printf ' *     OEM Revision     '$gRevision' (%d)\n' $gRevision                         >> $gSsdtPR
+echo ' *     Compiler ID      "INTL"'                                                 >> $gSsdtPR
+echo ' *     Compiler Version 0x20130210 (538116624)'                                 >> $gSsdtPR
+echo ' */'                                                                            >> $gSsdtPR
+echo ''                                                                               >> $gSsdtPR
+echo 'DefinitionBlock ("'$gSsdtID'.aml", "SSDT", 1, "APPLE ", "CpuPm", '$gRevision')' >> $gSsdtPR
+echo '{'                                                                              >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
 function _printExternals()
 {
-    let currentCPU=0;
+let currentCPU=0;
 
-    while [ $currentCPU -lt $gLogicalCPUs ]; do
-        echo '    External ('${gScope}'.'${gProcessorNames[$currentCPU]}', DeviceObj)'  >> $gSsdtPR
-        let currentCPU+=1
-    done
+while [ $currentCPU -lt $gLogicalCPUs ]; do
+echo '    External ('${gScope}'.'${gProcessorNames[$currentCPU]}', DeviceObj)'  >> $gSsdtPR
+let currentCPU+=1
+done
 
-    echo ''                                                                             >> $gSsdtPR
+echo ''                                                                             >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
 function _printDebugInfo()
 {
-    if ((gDebug)); then
-        echo '    Store ("ssdtPRGen version: '$gScriptVersion'", Debug)'                >> $gSsdtPR
-        echo '    Store ("baseFrequency    : '$gBaseFrequency'", Debug)'                >> $gSsdtPR
-        echo '    Store ("frequency        : '$frequency'", Debug)'                     >> $gSsdtPR
-        echo '    Store ("busFrequency     : '$gBusFrequency'", Debug)'                 >> $gSsdtPR
-        echo '    Store ("logicalCPUs      : '$gLogicalCPUs'", Debug)'                  >> $gSsdtPR
-        echo '    Store ("tdp              : '$gTdp'", Debug)'                          >> $gSsdtPR
-        echo '    Store ("packageLength    : '$packageLength'", Debug)'                 >> $gSsdtPR
-        echo '    Store ("turboStates      : '$turboStates'", Debug)'                   >> $gSsdtPR
-        echo '    Store ("maxTurboFrequency: '$maxTurboFrequency'", Debug)'             >> $gSsdtPR
-        echo ''                                                                         >> $gSsdtPR
-    fi
+if ((gDebug)); then
+echo '    Store ("ssdtPRGen version: '$gScriptVersion'", Debug)'                >> $gSsdtPR
+echo '    Store ("baseFrequency    : '$gBaseFrequency'", Debug)'                >> $gSsdtPR
+echo '    Store ("frequency        : '$frequency'", Debug)'                     >> $gSsdtPR
+echo '    Store ("busFrequency     : '$gBusFrequency'", Debug)'                 >> $gSsdtPR
+echo '    Store ("logicalCPUs      : '$gLogicalCPUs'", Debug)'                  >> $gSsdtPR
+echo '    Store ("tdp              : '$gTdp'", Debug)'                          >> $gSsdtPR
+echo '    Store ("packageLength    : '$packageLength'", Debug)'                 >> $gSsdtPR
+echo '    Store ("turboStates      : '$turboStates'", Debug)'                   >> $gSsdtPR
+echo '    Store ("maxTurboFrequency: '$maxTurboFrequency'", Debug)'             >> $gSsdtPR
+echo ''                                                                         >> $gSsdtPR
+fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _printProcessorDefinitions()
 {
-    let currentCPU=0;
+let currentCPU=0;
 
-    while [ $currentCPU -lt $1 ]; do
-        echo '    External ('${gScope}'.'${gProcessorNames[$currentCPU]}', DeviceObj)'  >> $gSsdtPR
-        let currentCPU+=1
-    done
+while [ $currentCPU -lt $1 ]; do
+echo '    External ('${gScope}'.'${gProcessorNames[$currentCPU]}', DeviceObj)'  >> $gSsdtPR
+let currentCPU+=1
+done
 
-    echo ''                                                                             >> $gSsdtPR
+echo ''                                                                             >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
 function _printScopeStart()
 {
-    let turboStates=$1
-    let packageLength=$2
-
-    # TODO: Remove this when CPUPM for IB works properly!
-    let useWorkArounds=0
-
-    echo '    Scope ('${gScope}'.'${gProcessorNames[0]}')'                              >> $gSsdtPR
-    echo '    {'                                                                        >> $gSsdtPR
-
-    #
-    # Do we need to create additional (Low Frequency) P-States?
-    #
-
-    if [ $gBridgeType -ne $SANDY_BRIDGE ];
-        then
-            let lowFrequencyPStates=($gBaseFrequency/100)-8
-            let packageLength=($2+$lowFrequencyPStates)
-
-            printf "        Name (APLF, 0x%02x" $lowFrequencyPStates                    >> $gSsdtPR
-            echo ')'                                                                    >> $gSsdtPR
-
-            # TODO: Remove this when CPUPM for IB works properly!
-            if [[ gIvyWorkAround && $gBridgeType -eq $IVY_BRIDGE ]]; then
-                let useWorkArounds=1
-            fi
-    fi
-
-    #
-    # Check number of Turbo states (for IASL optimization).
-    #
-
-    if [ $turboStates -eq 0 ];
-        then
-            # TODO: Remove this when CPUPM for IB works properly!
-            if (($useWorkArounds));
-                then
-                    echo '        Name (APSN, One)'                                     >> $gSsdtPR
-                else
-                    echo '        Name (APSN, Zero)'                                    >> $gSsdtPR
-            fi
-        else
-          # TODO: Remove this when CPUPM for IB works properly!
-          if ((useWorkArounds)); then
-              let turboStates+=1
-          fi
-
-          printf "        Name (APSN, 0x%02X)\n" $turboStates                           >> $gSsdtPR
-    fi
-
-    # TODO: Remove this when CPUPM for IB works properly!
-    if (($useWorkArounds)); then
-        let packageLength+=1
-    fi
-
-  printf "        Name (APSS, Package (0x%02X)\n" $packageLength                        >> $gSsdtPR
-    echo '        {'                                                                    >> $gSsdtPR
-
-    # TODO: Remove this when CPUPM for IB works properly!
-    if (($useWorkArounds)); then
-        let extraF=($maxTurboFrequency+1)
-        let maxTDP=($gTdp*1000)
-        let extraR=($maxTurboFrequency/100)+1
-        echo "            /* Workaround for the Ivy Bridge PM 'bug' */"                 >> $gSsdtPR
-      printf "            Package (0x06) { 0x%04X, 0x%06X, 0x0A, 0x0A, 0x%02X00, 0x%02X00 },\n" $extraF $maxTDP $extraR $extraR >> $gSsdtPR
-    fi
+let turboStates=$1
+let packageLength=$2
+
+# TODO: Remove this when CPUPM for IB works properly!
+let useWorkArounds=0
+
+echo '    Scope ('${gScope}'.'${gProcessorNames[0]}')'                              >> $gSsdtPR
+echo '    {'                                                                        >> $gSsdtPR
+
+#
+# Do we need to create additional (Low Frequency) P-States?
+#
+
+if [ $gBridgeType -eq $IVY_BRIDGE ];
+then
+let lowFrequencyPStates=($gBaseFrequency/100)-8
+let packageLength=($2+$lowFrequencyPStates)
+
+printf "        Name (APLF, 0x%02x" $lowFrequencyPStates                    >> $gSsdtPR
+echo ')'                                                                    >> $gSsdtPR
+
+# TODO: Remove this when CPUPM for IB works properly!
+if ((gIvyWorkAround)); then
+let useWorkArounds=1
+fi
+fi
+
+#
+# Check number of Turbo states (for IASL optimization).
+#
+
+if [ $turboStates -eq 0 ];
+then
+# TODO: Remove this when CPUPM for IB works properly!
+if (($useWorkArounds));
+then
+echo '        Name (APSN, One)'                                     >> $gSsdtPR
+else
+echo '        Name (APSN, Zero)'                                    >> $gSsdtPR
+fi
+else
+# TODO: Remove this when CPUPM for IB works properly!
+if ((useWorkArounds)); then
+let turboStates+=1
+fi
+
+printf "        Name (APSN, 0x%02X)\n" $turboStates                           >> $gSsdtPR
+fi
+
+# TODO: Remove this when CPUPM for IB works properly!
+if (($useWorkArounds)); then
+let packageLength+=1
+fi
+
+printf "        Name (APSS, Package (0x%02X)\n" $packageLength                        >> $gSsdtPR
+echo '        {'                                                                    >> $gSsdtPR
+
+# TODO: Remove this when CPUPM for IB works properly!
+if (($useWorkArounds)); then
+let extraF=($maxTurboFrequency+1)
+let maxTDP=($gTdp*1000)
+let extraR=($maxTurboFrequency/100)+1
+echo "            /* Workaround for the Ivy Bridge PM 'bug' */"                 >> $gSsdtPR
+printf "            Package (0x06) { 0x%04X, 0x%06X, 0x0A, 0x0A, 0x%02X00, 0x%02X00 },\n" $extraF $maxTDP $extraR $extraR >> $gSsdtPR
+fi
 }
 
 
@@ -699,71 +700,71 @@ function _printScopeStart()
 
 function _printPackages()
 {
-    let maxTDP=($1*1000)
-    local maxNonTurboFrequency=$2
-    local frequency=$3
-
-    let minRatio=($gBaseFrequency/$gBusFrequency)
-    let p1Ratio=($maxNonTurboFrequency/$gBusFrequency)
-    let ratio=($frequency/$gBusFrequency)
-    let powerRatio=($p1Ratio-1)
-
-    #
-    # Do we need to create additional (Low Frequency) P-States for Ivy bridge?
-    #
-    if [ $gBridgeType -eq $IVY_BRIDGE ]; then
-        let minRatio=8
-    fi
-
-    if (($turboStates)); then
-        echo '            /* High Frequency Modes (turbo) */'                           >> $gSsdtPR
-    fi
-
-    while [ $ratio -ge $minRatio ];
-        do
-            if [ $frequency -eq $gBaseFrequency ];
-                then
-                    echo '            /* Low Frequency Mode */'                         >> $gSsdtPR
-            fi
-
-            if [ $frequency -eq $maxNonTurboFrequency ];
-                then
-                    echo '            /* High Frequency Modes (non-turbo) */'           >> $gSsdtPR
-            fi
-
-            printf "            Package (0x06) { 0x%04X, " $frequency                   >> $gSsdtPR
-
-            if [ $frequency -lt $maxNonTurboFrequency ];
-                then
-                    power=$(echo "scale=6;m=((1.1-(($p1Ratio-$powerRatio)*0.00625))/1.1);(($powerRatio/$p1Ratio)*(m*m)*$maxTDP);" | bc | sed -e 's/.[0-9A-F]*$//')
-                    let powerRatio-=1
-                else
-                    power=$maxTDP
-            fi
-
-            if [ $frequency -ge $gBaseFrequency ];
-                then
-                    printf "0x%06X, " $power                                            >> $gSsdtPR
-                else
-                    printf '    Zero, '                                                 >> $gSsdtPR
-            fi
-
-            printf "0x0A, 0x0A, 0x%02X00, 0x%02X00 }" $ratio $ratio                     >> $gSsdtPR
-
-            let ratio-=1
-            let frequency-=$gBusFrequency
-
-            if [ $ratio -ge $minRatio ];
-                then
-                    echo ','                                                            >> $gSsdtPR
-                else
-                    echo ''                                                             >> $gSsdtPR
-            fi
-
-        done
-
-    echo '        })'                                                                   >> $gSsdtPR
-    echo ''                                                                             >> $gSsdtPR
+let maxTDP=($1*1000)
+local maxNonTurboFrequency=$2
+local frequency=$3
+
+let minRatio=($gBaseFrequency/$gBusFrequency)
+let p1Ratio=($maxNonTurboFrequency/$gBusFrequency)
+let ratio=($frequency/$gBusFrequency)
+let powerRatio=($p1Ratio-1)
+
+#
+# Do we need to create additional (Low Frequency) P-States for Ivy bridge?
+#
+if [ $gBridgeType -eq $IVY_BRIDGE ]; then
+let minRatio=8
+fi
+
+if (($turboStates)); then
+echo '            /* High Frequency Modes (turbo) */'                           >> $gSsdtPR
+fi
+
+while [ $ratio -ge $minRatio ];
+do
+if [ $frequency -eq $gBaseFrequency ];
+then
+echo '            /* Low Frequency Mode */'                         >> $gSsdtPR
+fi
+
+if [ $frequency -eq $maxNonTurboFrequency ];
+then
+echo '            /* High Frequency Modes (non-turbo) */'           >> $gSsdtPR
+fi
+
+printf "            Package (0x06) { 0x%04X, " $frequency                   >> $gSsdtPR
+
+if [ $frequency -lt $maxNonTurboFrequency ];
+then
+power=$(echo "scale=6;m=((1.1-(($p1Ratio-$powerRatio)*0.00625))/1.1);(($powerRatio/$p1Ratio)*(m*m)*$maxTDP);" | bc | sed -e 's/.[0-9A-F]*$//')
+let powerRatio-=1
+else
+power=$maxTDP
+fi
+
+if [ $frequency -ge $gBaseFrequency ];
+then
+printf "0x%06X, " $power                                            >> $gSsdtPR
+else
+printf '    Zero, '                                                 >> $gSsdtPR
+fi
+
+printf "0x0A, 0x0A, 0x%02X00, 0x%02X00 }" $ratio $ratio                     >> $gSsdtPR
+
+let ratio-=1
+let frequency-=$gBusFrequency
+
+if [ $ratio -ge $minRatio ];
+then
+echo ','                                                            >> $gSsdtPR
+else
+echo ''                                                             >> $gSsdtPR
+fi
+
+done
+
+echo '        })'                                                                   >> $gSsdtPR
+echo ''                                                                             >> $gSsdtPR
 }
 
 
@@ -771,30 +772,30 @@ function _printPackages()
 
 function _printMethodDSM()
 {
-    #
-    # New stand-alone version of Method _DSM - Copyright (c) 2009 by Master Chief
-    #
-    echo ''                                                                             >> $gSsdtPR
-    echo '        Method (_DSM, 4, NotSerialized)'                                      >> $gSsdtPR
-    echo '        {'                                                                    >> $gSsdtPR
-    echo '            If (LEqual (Arg2, Zero))'                                         >> $gSsdtPR
-    echo '            {'                                                                >> $gSsdtPR
-    echo '                Return (Buffer (One)'                                         >> $gSsdtPR
-    echo '                {'                                                            >> $gSsdtPR
-    echo '                    0x03'                                                     >> $gSsdtPR
-    echo '                })'                                                           >> $gSsdtPR
-    echo '            }'                                                                >> $gSsdtPR
-    echo ''                                                                             >> $gSsdtPR
-    #
-    # This property is required to get X86Platform[Plugin/Shim].kext loaded.
-    #
-    echo '            Return (Package (0x02)'                                           >> $gSsdtPR
-    echo '            {'                                                                >> $gSsdtPR
-    echo '                "plugin-type",'                                               >> $gSsdtPR
-    echo '                One'                                                          >> $gSsdtPR
-    echo '            })'                                                               >> $gSsdtPR
-    echo '        }'                                                                    >> $gSsdtPR
-    echo '    }'                                                                        >> $gSsdtPR
+#
+# New stand-alone version of Method _DSM - Copyright (c) 2009 by Master Chief
+#
+echo ''                                                                             >> $gSsdtPR
+echo '        Method (_DSM, 4, NotSerialized)'                                      >> $gSsdtPR
+echo '        {'                                                                    >> $gSsdtPR
+echo '            If (LEqual (Arg2, Zero))'                                         >> $gSsdtPR
+echo '            {'                                                                >> $gSsdtPR
+echo '                Return (Buffer (One)'                                         >> $gSsdtPR
+echo '                {'                                                            >> $gSsdtPR
+echo '                    0x03'                                                     >> $gSsdtPR
+echo '                })'                                                           >> $gSsdtPR
+echo '            }'                                                                >> $gSsdtPR
+echo ''                                                                             >> $gSsdtPR
+#
+# This property is required to get X86Platform[Plugin/Shim].kext loaded.
+#
+echo '            Return (Package (0x02)'                                           >> $gSsdtPR
+echo '            {'                                                                >> $gSsdtPR
+echo '                "plugin-type",'                                               >> $gSsdtPR
+echo '                One'                                                          >> $gSsdtPR
+echo '            })'                                                               >> $gSsdtPR
+echo '        }'                                                                    >> $gSsdtPR
+echo '    }'                                                                        >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
@@ -813,231 +814,223 @@ function _printScopeACST()
 #
 # Note: C-state latency in uS and C-state power in mW.
 
-    let C1=0
-    let C2=0
-    let C3=0
-    let C6=0
-    let C7=0
-    local pkgLength=2
-    local numberOfCStates=0
+let C1=0
+let C2=0
+let C3=0
+let C6=0
+let C7=0
+local pkgLength=2
+local numberOfCStates=0
 
 #   echo ''                                                                             >> $gSsdtPR
-    echo '        Method (ACST, 0, NotSerialized)'                                      >> $gSsdtPR
-    echo '        {'                                                                    >> $gSsdtPR
-
-    #
-    # Are we injecting C-States for CPU1?
-    #
-    if [ $1 -eq 1 ];
-        then
-            echo "1: $1"
-            # Yes (also used by CPU2, CPU3 and greater).
-            let targetCStates=$gACST_CPU1
-            latency_C1=0x03E8
-            latency_C2=0x94
-            latency_C3=0xC6
-
-            if ((gDebug)); then
-                echo '            Store ("'${gProcessorNames[1]}' C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
-                echo ''                                                                 >> $gSsdtPR
-            fi
-        else
-            #
-            # C-States override for Mobile processors (CPU0 only)
-            #
-            if (($gTypeCPU == $gMobileCPU)); then
-                echo 'Adjusting C-States for detected (mobile) processor'
-                let gACST_CPU0=29
-            fi
-            echo "gACST_CPU0: $gACST_CPU0"
-            let targetCStates=253 # $gACST_CPU0
-            latency_C1=Zero
-            latency_C3=0xCD
-            latency_C6=0xF5
-            latency_C7=0xF5
-
-            if ((gDebug)); then
-                echo '            Store ("'${gProcessorNames[0]}' C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
-                echo ''                                                                 >> $gSsdtPR
-            fi
-    fi
-
-    echo "targetCStates: $targetCStates"
-
-    #
-    # Checks to determine which C-State(s) we should inject.
-    #
-    if (($targetCStates & 1)); then
-        echo "Adding C1"
-        let C1=1
-        let numberOfCStates+=1
-        let pkgLength+=1
-    fi
-
-    if (($targetCStates & 2)); then
-        echo "Adding C2"
-        let C2=1
-        let numberOfCStates+=1
-        let pkgLength+=1
-    fi
-
-    if (($targetCStates & 4)); then
-        echo "Adding C3"
-        let C3=1
-        let numberOfCStates+=1
-        let pkgLength+=1
-    fi
-
-    if (($targetCStates & 8)); then
-        echo "Adding C6"
-        let C6=1
-        let numberOfCStates+=1
-        let pkgLength+=1
-    fi
-
-    if ((($targetCStates & 16) == 16)); then
-        echo "Adding C7"
-        let C7=1
-        let numberOfCStates+=1
-        let pkgLength+=1
-    fi
-
-    let hintCode=0x00
-
-    echo "            /* Low Power Modes for ${gProcessorNames[$1]} */"                 >> $gSsdtPR
-  printf "            Return (Package (0x%02x)\n" $pkgLength                            >> $gSsdtPR
-    echo '            {'                                                                >> $gSsdtPR
-    echo '                One,'                                                         >> $gSsdtPR
-  printf "                0x%02x,\n" $numberOfCStates                                   >> $gSsdtPR
-    echo '                Package (0x04)'                                               >> $gSsdtPR
-    echo '                {'                                                            >> $gSsdtPR
-    echo '                    ResourceTemplate ()'                                      >> $gSsdtPR
-    echo '                    {'                                                        >> $gSsdtPR
-    echo '                        Register (FFixedHW,'                                  >> $gSsdtPR
-    echo '                            0x01,               // Bit Width'                 >> $gSsdtPR
-    echo '                            0x02,               // Bit Offset'                >> $gSsdtPR
-  printf "                            0x%016x, // Address\n" $hintCode                  >> $gSsdtPR
-    echo '                            0x01,               // Access Size'               >> $gSsdtPR
-    echo '                            )'                                                >> $gSsdtPR
-    echo '                    },'                                                       >> $gSsdtPR
-    echo '                    One,'                                                     >> $gSsdtPR
-    echo '                    '$latency_C1','                                           >> $gSsdtPR
-    echo '                    0x03E8'                                                   >> $gSsdtPR
-
-    if (($C2)); then
-        let hintCode+=0x10
-        echo '                },'                                                       >> $gSsdtPR
-        echo ''                                                                         >> $gSsdtPR
-        echo '                Package (0x04)'                                           >> $gSsdtPR
-        echo '                {'                                                        >> $gSsdtPR
-        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
-        echo '                    {'                                                    >> $gSsdtPR
-        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
-        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
-        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
-      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
-        echo '                            0x03,               // Access Size'           >> $gSsdtPR
-        echo '                            )'                                            >> $gSsdtPR
-        echo '                    },'                                                   >> $gSsdtPR
-        echo '                    0x02,'                                                >> $gSsdtPR
-        echo '                    '$latency_C2','                                       >> $gSsdtPR
-        echo '                    0x01F4'                                               >> $gSsdtPR
-    fi
-
-    if (($C3)); then
-        let hintCode+=0x10
-        local power_C3=0x01F4
-        #
-        # Is this for CPU1?
-        #
-        if (($1)); then
-            if [[ ${modelID:0:7} == "iMac13," ]];
-                then
-                    local power_C3=0x15E
-                    latency_C3=0xA9
-                else
-                    local power_C3=0xC8
-                    let hintCode+=0x10
-            fi
-        fi
-
-        echo '                },'                                                       >> $gSsdtPR
-        echo ''                                                                         >> $gSsdtPR
-        echo '                Package (0x04)'                                           >> $gSsdtPR
-        echo '                {'                                                        >> $gSsdtPR
-        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
-        echo '                    {'                                                    >> $gSsdtPR
-        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
-        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
-        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
-      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
-        echo '                            0x03,               // Access Size'           >> $gSsdtPR
-        echo '                            )'                                            >> $gSsdtPR
-        echo '                    },'                                                   >> $gSsdtPR
-        echo '                    0x03,'                                                >> $gSsdtPR
-        echo '                    '$latency_C3','                                       >> $gSsdtPR
-        echo '                    '$power_C3                                            >> $gSsdtPR
-    fi
-
-    if (($C6)); then
-        let hintCode+=0x10
-        echo '                },'                                                       >> $gSsdtPR
-        echo ''                                                                         >> $gSsdtPR
-        echo '                Package (0x04)'                                           >> $gSsdtPR
-        echo '                {'                                                        >> $gSsdtPR
-        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
-        echo '                    {'                                                    >> $gSsdtPR
-        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
-        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
-        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
-      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
-        echo '                            0x03,               // Access Size'           >> $gSsdtPR
-        echo '                            )'                                            >> $gSsdtPR
-        echo '                    },'                                                   >> $gSsdtPR
-        echo '                    0x06,'                                                >> $gSsdtPR
-        echo '                    '$latency_C6','                                       >> $gSsdtPR
-        echo '                    0x015E'                                               >> $gSsdtPR
-    fi
-
-	if (($C7)); then
-        #
-        # If $hintCode is already 0x30 then use 0x31 otherwise 0x30
-        #
-        if [ $hintCode -eq 48 ];
-            then
-                let hintCode+=0x01
-            else
-                let hintCode+=0x10
-        fi
-        echo '                },'                                                       >> $gSsdtPR
-        echo ''                                                                         >> $gSsdtPR
-        echo '                Package (0x04)'                                           >> $gSsdtPR
-        echo '                {'                                                        >> $gSsdtPR
-        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
-        echo '                    {'                                                    >> $gSsdtPR
-        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
-        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
-        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
-      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
-        echo '                            0x03,               // Access Size'           >> $gSsdtPR
-        echo '                            )'                                            >> $gSsdtPR
-        echo '                    },'                                                   >> $gSsdtPR
-        echo '                    0x07,'                                                >> $gSsdtPR
-        echo '                    '$latency_C7','                                       >> $gSsdtPR
-        echo '                    0xC8'                                                 >> $gSsdtPR
-    fi
-
-    echo '                }'                                                            >> $gSsdtPR
-    echo '            })'                                                               >> $gSsdtPR
-    echo '        }'                                                                    >> $gSsdtPR
-
-    #
-    # We don't need a closing bracket here when we add method _DSM for Ivy Bridge.
-    #
-
-    if [ $gBridgeType -eq $SANDY_BRIDGE ]; then
-        echo '    }'                                                                    >> $gSsdtPR
-	fi
+echo '        Method (ACST, 0, NotSerialized)'                                      >> $gSsdtPR
+echo '        {'                                                                    >> $gSsdtPR
+
+#
+# Are we injecting C-States for CPU1?
+#
+if [ $1 -eq 1 ];
+then
+# Yes (also used by CPU2, CPU3 and greater).
+let targetCStates=$gACST_CPU1
+latency_C1=0x03E8
+latency_C2=0x94
+latency_C3=0xC6
+
+if ((gDebug)); then
+echo '            Store ("'${gProcessorNames[1]}' C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
+echo ''                                                                 >> $gSsdtPR
+fi
+else
+#
+# C-States override for Mobile processors (CPU0 only)
+#
+if (($gTypeCPU == $gMobileCPU)); then
+echo 'Adjusting C-States for detected (mobile) processor'
+gACST_CPU0=29
+fi
+
+let targetCStates=$gACST_CPU0
+latency_C1=Zero
+latency_C3=0xCD
+latency_C6=0xF5
+latency_C7=0xF5
+
+if ((gDebug)); then
+echo '            Store ("'${gProcessorNames[0]}' C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
+echo ''                                                                 >> $gSsdtPR
+fi
+fi
+
+#
+# Checks to determine which C-State(s) we should inject.
+#
+if (($targetCStates & 1)); then
+let C1=1
+let numberOfCStates+=1
+let pkgLength+=1
+fi
+
+if (($targetCStates & 2)); then
+let C2=1
+let numberOfCStates+=1
+let pkgLength+=1
+fi
+
+if (($targetCStates & 4)); then
+let C3=1
+let numberOfCStates+=1
+let pkgLength+=1
+fi
+
+if (($targetCStates & 8)); then
+let C6=1
+let numberOfCStates+=1
+let pkgLength+=1
+fi
+
+if (($targetCStates & 16)); then
+let C7=1
+let numberOfCStates+=1
+let pkgLength+=1
+fi
+
+let hintCode=0x00
+
+echo "            /* Low Power Modes for ${gProcessorNames[$1]} */"                 >> $gSsdtPR
+printf "            Return (Package (0x%02x)\n" $pkgLength                            >> $gSsdtPR
+echo '            {'                                                                >> $gSsdtPR
+echo '                One,'                                                         >> $gSsdtPR
+printf "                0x%02x,\n" $numberOfCStates                                   >> $gSsdtPR
+echo '                Package (0x04)'                                               >> $gSsdtPR
+echo '                {'                                                            >> $gSsdtPR
+echo '                    ResourceTemplate ()'                                      >> $gSsdtPR
+echo '                    {'                                                        >> $gSsdtPR
+echo '                        Register (FFixedHW,'                                  >> $gSsdtPR
+echo '                            0x01,               // Bit Width'                 >> $gSsdtPR
+echo '                            0x02,               // Bit Offset'                >> $gSsdtPR
+printf "                            0x%016x, // Address\n" $hintCode                  >> $gSsdtPR
+echo '                            0x01,               // Access Size'               >> $gSsdtPR
+echo '                            )'                                                >> $gSsdtPR
+echo '                    },'                                                       >> $gSsdtPR
+echo '                    One,'                                                     >> $gSsdtPR
+echo '                    '$latency_C1','                                           >> $gSsdtPR
+echo '                    0x03E8'                                                   >> $gSsdtPR
+
+if (($C2)); then
+let hintCode+=0x10
+echo '                },'                                                       >> $gSsdtPR
+echo ''                                                                         >> $gSsdtPR
+echo '                Package (0x04)'                                           >> $gSsdtPR
+echo '                {'                                                        >> $gSsdtPR
+echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+echo '                    {'                                                    >> $gSsdtPR
+echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+echo '                            0x03,               // Access Size'           >> $gSsdtPR
+echo '                            )'                                            >> $gSsdtPR
+echo '                    },'                                                   >> $gSsdtPR
+echo '                    0x02,'                                                >> $gSsdtPR
+echo '                    '$latency_C2','                                       >> $gSsdtPR
+echo '                    0x01F4'                                               >> $gSsdtPR
+fi
+
+if (($C3)); then
+let hintCode+=0x10
+local power_C3=0x01F4
+#
+# Is this for CPU1?
+#
+if (($1)); then
+if [[ ${modelID:0:7} == "iMac13," ]];
+then
+local power_C3=0x15E
+latency_C3=0xA9
+else
+local power_C3=0xC8
+let hintCode+=0x10
+fi
+fi
+
+echo '                },'                                                       >> $gSsdtPR
+echo ''                                                                         >> $gSsdtPR
+echo '                Package (0x04)'                                           >> $gSsdtPR
+echo '                {'                                                        >> $gSsdtPR
+echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+echo '                    {'                                                    >> $gSsdtPR
+echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+echo '                            0x03,               // Access Size'           >> $gSsdtPR
+echo '                            )'                                            >> $gSsdtPR
+echo '                    },'                                                   >> $gSsdtPR
+echo '                    0x03,'                                                >> $gSsdtPR
+echo '                    '$latency_C3','                                       >> $gSsdtPR
+echo '                    '$power_C3                                            >> $gSsdtPR
+fi
+
+if (($C6)); then
+let hintCode+=0x10
+echo '                },'                                                       >> $gSsdtPR
+echo ''                                                                         >> $gSsdtPR
+echo '                Package (0x04)'                                           >> $gSsdtPR
+echo '                {'                                                        >> $gSsdtPR
+echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+echo '                    {'                                                    >> $gSsdtPR
+echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+echo '                            0x03,               // Access Size'           >> $gSsdtPR
+echo '                            )'                                            >> $gSsdtPR
+echo '                    },'                                                   >> $gSsdtPR
+echo '                    0x06,'                                                >> $gSsdtPR
+echo '                    '$latency_C6','                                       >> $gSsdtPR
+echo '                    0x015E'                                               >> $gSsdtPR
+fi
+
+if (($C7)); then
+#
+# If $hintCode is already 0x30 then use 0x31 otherwise 0x30
+#
+if [ $hintCode -eq 48 ];
+then
+let hintCode+=0x01
+else
+let hintCode+=0x10
+fi
+echo '                },'                                                       >> $gSsdtPR
+echo ''                                                                         >> $gSsdtPR
+echo '                Package (0x04)'                                           >> $gSsdtPR
+echo '                {'                                                        >> $gSsdtPR
+echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+echo '                    {'                                                    >> $gSsdtPR
+echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+echo '                            0x03,               // Access Size'           >> $gSsdtPR
+echo '                            )'                                            >> $gSsdtPR
+echo '                    },'                                                   >> $gSsdtPR
+echo '                    0x07,'                                                >> $gSsdtPR
+echo '                    '$latency_C7','                                       >> $gSsdtPR
+echo '                    0xC8'                                                 >> $gSsdtPR
+fi
+
+echo '                }'                                                            >> $gSsdtPR
+echo '            })'                                                               >> $gSsdtPR
+echo '        }'                                                                    >> $gSsdtPR
+
+#
+# We don't need a closing bracket here when we add method _DSM for Ivy Bridge.
+#
+
+if [ $gBridgeType -eq $SANDY_BRIDGE ]; then
+echo '    }'                                                                    >> $gSsdtPR
+fi
 }
 
 
@@ -1045,332 +1038,331 @@ function _printScopeACST()
 
 function _printScopeCPUn()
 {
-    let currentCPU=1;
-
-    while [ $currentCPU -lt $gLogicalCPUs ]; do
-        echo ''                                                                         >> $gSsdtPR
-        echo '    Scope ('${gScope}'.'${gProcessorNames[$currentCPU]}')'                >> $gSsdtPR
-        echo '    {'                                                                    >> $gSsdtPR
-        echo '        Method (APSS, 0, NotSerialized) { Return ('${gScope}'.'${gProcessorNames[0]}'.APSS) }' >> $gSsdtPR
-
-        #
-        # IB CPUPM tries to parse/execute CPUn.ACST (see debug data) and thus we add
-        # this method, conditionally, since SB CPUPM doesn't seem to care about it.
-        #
-        if [ $gBridgeType -ge $IVY_BRIDGE ]; then
-            if [ $currentCPU -eq 1 ];
-                then
-                    _printScopeACST 1
-                else
-                    echo '        Method (ACST, 0, NotSerialized) { Return ('${gScope}'.'${gProcessorNames[1]}'.ACST ()) }' >> $gSsdtPR
-            fi
-        fi
-
-        echo '    }'                                                                    >> $gSsdtPR
-        let currentCPU+=1
-    done
-
-    echo '}'                                                                            >> $gSsdtPR
+let currentCPU=1;
+
+while [ $currentCPU -lt $gLogicalCPUs ]; do
+echo ''                                                                         >> $gSsdtPR
+echo '    Scope ('${gScope}'.'${gProcessorNames[$currentCPU]}')'                >> $gSsdtPR
+echo '    {'                                                                    >> $gSsdtPR
+echo '        Method (APSS, 0, NotSerialized) { Return ('${gScope}'.'${gProcessorNames[0]}'.APSS) }' >> $gSsdtPR
+
+#
+# IB CPUPM tries to parse/execute CPUn.ACST (see debug data) and thus we add
+# this method, conditionally, since SB CPUPM doesn't seem to care about it.
+#
+if [ $gBridgeType -ge $IVY_BRIDGE ]; then
+if [ $currentCPU -eq 1 ];
+then
+_printScopeACST 1
+else
+echo '        Method (ACST, 0, NotSerialized) { Return ('${gScope}'.'${gProcessorNames[1]}'.ACST ()) }' >> $gSsdtPR
+fi
+fi
+
+echo '    }'                                                                    >> $gSsdtPR
+let currentCPU+=1
+done
+
+echo '}'                                                                            >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
 function _getModelName()
 {
-    #
-    # Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
-    #
-    echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *["=<>]//g' -e 's/compatible//'`
+#
+# Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
+#
+echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *["=<>]//g' -e 's/compatible//'`
 }
 
 #--------------------------------------------------------------------------------
 
 function _getBoardID()
 {
-    #
-    # Grab 'board-id' property from ioreg (stripped with sed / RegEX magic).
-    #
-    boardID=$(ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *["=<>]//g' -e 's/board-id//')
+#
+# Grab 'board-id' property from ioreg (stripped with sed / RegEX magic).
+#
+boardID=$(ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *["=<>]//g' -e 's/board-id//')
 }
 
 #--------------------------------------------------------------------------------
 
 function _getProcessorNames()
 {
-    local acpiNames=$(ioreg -p IODeviceTree -c IOACPIPlatformDevice -k cpu-type | egrep name  | sed -e 's/ *[-|="<a-z>]//g')
-    gProcessorNames=($acpiNames)
+local acpiNames=$(ioreg -p IODeviceTree -c IOACPIPlatformDevice -k cpu-type | egrep name  | sed -e 's/ *[-|="<a-z>]//g')
+gProcessorNames=($acpiNames)
 
-    if [[ ${#gProcessorNames[@]} -lt 2 ]]; then
-        _exitWithError $PROCESSOR_NAMES_ERROR
-    fi
+if [[ ${#gProcessorNames[@]} -lt 2 ]]; then
+_exitWithError $PROCESSOR_NAMES_ERROR
+fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _updateProcessorNames()
 {
-    if [[ $gLogicalCPUs -le 0x0f ]];
-        then
-             local label=${gProcLabel:0:3}
-        else
-             local label=${gProcLabel:0:2}
-    fi
-
-    if [[ $1 -gt ${#gProcessorNames[@]} ]]; then
-        echo -e "\nWarning: Target CPU has $gLogicalCPUs logical cores, the running system only ${#gProcessorNames[@]}"
-        echo    "         Now using '$label' to extent the current range to $gLogicalCPUs..."
-        echo -e "         You may want to check/verify the generated $gSsdtID.dsl\n"
-    fi
-
-    let currentCPU=0
-
-    while [ $currentCPU -lt $1 ];
-    do
-        if [[ $1 -gt 0x0f && $currentCPU -le 0x0f ]];
-            then
-                local filler='0'
-            else
-                local filler=''
-        fi
-
-        gProcessorNames[$currentCPU]=${label}${filler}$(echo "obase=16; ${currentCPU}" | bc)
-
-        let currentCPU+=1
-    done
+if [[ $gLogicalCPUs -le 0x0f ]];
+then
+local label=${gProcLabel:0:3}
+else
+local label=${gProcLabel:0:2}
+fi
+
+if [[ $1 -gt ${#gProcessorNames[@]} ]]; then
+echo -e "\nWarning: Target CPU has $gLogicalCPUs logical cores, the running system only ${#gProcessorNames[@]}"
+echo    "         Now using '$label' to extent the current range to $gLogicalCPUs..."
+echo -e "         You may want to check/verify the generated $gSsdtID.dsl\n"
+fi
+
+let currentCPU=0
+
+while [ $currentCPU -lt $1 ];
+do
+if [[ $1 -gt 0x0f && $currentCPU -le 0x0f ]];
+then
+local filler='0'
+else
+local filler=''
+fi
+
+gProcessorNames[$currentCPU]=${label}${filler}$(echo "obase=16; ${currentCPU}" | bc)
+
+let currentCPU+=1
+done
 }
 
 #--------------------------------------------------------------------------------
 
 function _getProcessorScope()
 {
-    #
-    # We run egrep twice here for Snow Leopard compatibility, otherwise it fails.
-    #
-    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5b830b') ]]; then
-        printf 'Processor Declaration(s) Found in DSDT'
-    fi
-
-    # Search for "_PR_"
-    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5f50525f') ]];
-        then
-            gScope="\_PR_"
-            echo ' (ACPI 1.0 compliant)'
-        else
-            gScope="\_SB_"
-    fi
+#
+# We run egrep twice here for Snow Leopard compatibility, otherwise it fails.
+#
+if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5b830b') ]]; then
+printf 'Processor Declaration(s) Found in DSDT'
+fi
+
+if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5f50525f') ]];
+then
+gScope="\_PR_"
+echo ' (ACPI 1.0 compliant)'
+else
+gScope="\_SB_"
+fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUtype()
 {
-    #
-    # Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
-    #
-    local grepStr=$(ioreg -p IODeviceTree -n "${gProcessorNames[0]}"@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g')
-
-    # Swap bytes with help of ${str:pos:num}
-    #
-    echo ${grepStr:2:2}${grepStr:0:2}
+#
+# Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
+#
+local grepStr=$(ioreg -p IODeviceTree -n "${gProcessorNames[0]}"@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g')
+
+# Swap bytes with help of ${str:pos:num}
+#
+echo ${grepStr:2:2}${grepStr:0:2}
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUModel()
 {
-    #
-    # Returns the hexadecimal value of machdep.cpu.model
-    #
-    echo 0x$(echo "obase=16; `sysctl machdep.cpu.model | sed -e 's/^machdep.cpu.model: //'`" | bc)
+#
+# Returns the hexadecimal value of machdep.cpu.model
+#
+echo 0x$(echo "obase=16; `sysctl machdep.cpu.model | sed -e 's/^machdep.cpu.model: //'`" | bc)
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUSignature()
 {
-    #
-    # Returns the hexadecimal value of machdep.cpu.signature
-    #
-    echo 0x$(echo "obase=16; `sysctl machdep.cpu.signature | sed -e 's/^machdep.cpu.signature: //'`" | bc)
+#
+# Returns the hexadecimal value of machdep.cpu.signature
+#
+echo 0x$(echo "obase=16; `sysctl machdep.cpu.signature | sed -e 's/^machdep.cpu.signature: //'`" | bc)
 }
 
 #--------------------------------------------------------------------------------
 
 function _getSystemType()
 {
-    #
-    # Grab 'system-type' property from ioreg (stripped with sed / RegEX magic).
-    #
-    # Note: This property is checked (cmpb $0x02) in X86PlatformPlugin::configResourceCallback
-    #
-    echo `ioreg -p IODeviceTree -d 2 -k system-type | grep system-type | sed -e 's/ *[-="<0a-z>]//g'`
+#
+# Grab 'system-type' property from ioreg (stripped with sed / RegEX magic).
+#
+# Note: This property is checked (cmpb $0x02) in X86PlatformPlugin::configResourceCallback
+#
+echo `ioreg -p IODeviceTree -d 2 -k system-type | grep system-type | sed -e 's/ *[-="<0a-z>]//g'`
 }
 
 #--------------------------------------------------------------------------------
 
 function _findIasl()
 {
-    if (($gCallIasl)); then
-        #
-        # Then we do a quick lookup of iasl (should also be there after the first run)
-        #
-        if [ ! -f /usr/local/bin/iasl ]; then
-            printf "\nIASL not found. "
-            #
-            # First we check the target directory (should be there after the first run)
-            #
-            # XXX: Jeroen, try curl --create-dirs without the mkdir here ;)
-            if [ ! -d /usr/local/bin ]; then
-                printf "Creating target directory... "
-                sudo mkdir -p /usr/local/bin/
-                sudo chown -R root:wheel /usr/local/bin/
-            fi
-
-            printf "Downloading iasl...\n"
-            sudo curl -o /usr/local/bin/iasl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl
+if (($gCallIasl)); then
+#
+# Then we do a quick lookup of iasl (should also be there after the first run)
+#
+if [ ! -f /usr/local/bin/iasl ]; then
+printf "\nIASL not found. "
+#
+# First we check the target directory (should be there after the first run)
+#
+# XXX: Jeroen, try curl --create-dirs without the mkdir here ;)
+if [ ! -d /usr/local/bin ]; then
+printf "Creating target directory... "
+sudo mkdir -p /usr/local/bin/
+sudo chown -R root:wheel /usr/local/bin/
+fi
+
+printf "Downloading iasl...\n"
+sudo curl -o /usr/local/bin/iasl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl
 #           sudo curl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl -o /usr/local/bin/iasl --create-dirs
-            sudo chmod +x /usr/local/bin/iasl
-            echo 'Done.'
-        fi
+sudo chmod +x /usr/local/bin/iasl
+echo 'Done.'
+fi
 
-        iasl=/usr/local/bin/iasl
-    fi
+iasl=/usr/local/bin/iasl
+fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _setDestinationPath
 {
-    #
-    # Checking for RevoBoot
-    #
-    if [ -d /Extra/ACPI ]; then
-        gDestinationPath="/Extra/ACPI/"
-        echo -e '\nACPI target directory changed to: '$gDestinationPath
-        return
-    fi
-
-    #
-    # Checking for Clover rev 1277 and greater (projectosx.com/forum/index.php?showtopic=2656&p=29129&#entry29129)
-    #
-    if [ -d /EFI/Clover/ACPI/patched ];
-        then
-            gDestinationPath="/EFI/Clover/ACPI/patched/"
-            echo -e '\nACPI target directory changed to: $gDestinationPath'
-            return
-        else
-            if [ -d /Volumes/EFI ];
-                then
-                    if [ -d /Volumes/EFI/Clover/ACPI/patched ]; then
-                        gDestinationPath="/Volumes/EFI/CLOVER/ACPI/patched/"
-                        echo -e '\nACPI target directory changed to: '$gDestinationPath
-                        return
-                    fi
-                else
-                    #
-                    # http://www.tonymacx86.com/ssdt/86906-ssdt-generation-script-ivybridge-pm-40.html#post604496
-                    #
-                    if [ -f /Library/Logs/CloverEFI/boot.log ];
-                        then
-                            echo 'Clover boot.log found'
-                            return
-                        else
-                            echo -e '\nWarning: Failed to locate the Clover boot.log'
-                            echo 'Creating temporarily mount point: /Volumes/EFI'
-                            sudo mkdir /Volumes/EFI
-                            printf 'Mounting EFI partition...\n'
-                            #
-                            # TODO: Get target disk from diskutil list
-                            #
-                            sudo mount_hfs /dev/disk0s1 /Volumes/EFI
-
-                            if [ -f /Volumes/EFI/Clover/ACPI/patched ];
-                                then
-                                    let gUnmountEFIPartition=1
-                                    gDestinationPath="/Volumes/EFI/CLOVER/ACPI/patched/"
-                                    echo 'ACPI target directory changed to: '$gDestinationPath
-                                    return
-                                else
-                                    echo -e '\nUnmounting EFI partition...'
-                                    sudo umount -f /Volumes/EFI
-                                    echo 'Removing temporarily mount point...'
+#
+# Checking for RevoBoot
+#
+if [ -d /Extra/ACPI ]; then
+gDestinationPath="/Extra/ACPI/"
+echo -e '\nACPI target directory changed to: '$gDestinationPath
+return
+fi
+
+#
+# Checking for Clover rev 1277 and greater (projectosx.com/forum/index.php?showtopic=2656&p=29129&#entry29129)
+#
+if [ -d /EFI/Clover/ACPI/patched ];
+then
+gDestinationPath="/EFI/Clover/ACPI/patched/"
+echo -e '\nACPI target directory changed to: $gDestinationPath'
+return
+else
+if [ -d /Volumes/EFI ];
+then
+if [ -d /Volumes/EFI/Clover/ACPI/patched ]; then
+gDestinationPath="/Volumes/EFI/CLOVER/ACPI/patched/"
+echo -e '\nACPI target directory changed to: '$gDestinationPath
+return
+fi
+else
+#
+# http://www.tonymacx86.com/ssdt/86906-ssdt-generation-script-ivybridge-pm-40.html#post604496
+#
+if [ -f /Library/Logs/CloverEFI/boot.log ];
+then
+echo 'Clover boot.log found'
+return
+else
+echo -e '\nWarning: Failed to locate the Clover boot.log'
+echo 'Creating temporarily mount point: /Volumes/EFI'
+sudo mkdir /Volumes/EFI
+printf 'Mounting EFI partition...\n'
+#
+# TODO: Get target disk from diskutil list
+#
+sudo mount_hfs /dev/disk0s1 /Volumes/EFI
+
+if [ -f /Volumes/EFI/Clover/ACPI/patched ];
+then
+let gUnmountEFIPartition=1
+gDestinationPath="/Volumes/EFI/CLOVER/ACPI/patched/"
+echo 'ACPI target directory changed to: '$gDestinationPath
+return
+else
+echo -e '\nUnmounting EFI partition...'
+sudo umount -f /Volumes/EFI
+echo 'Removing temporarily mount point...'
 #                                   sudo rm -r /Volumes/EFI
-                                    return
-                            fi
-                    fi
-
-            fi
-    fi
-
-    #
-    # Checking for Clover (older versions)
-    #
-    if [ -d /EFI/ACPI/patched ]; then
-        gDestinationPath="/EFI/ACPI/patched/"
-        echo 'ACPI target directory changed to: '$gDestinationPath
-        return
-    fi
+return
+fi
+fi
+
+fi
+fi
+
+#
+# Checking for Clover (older versions)
+#
+if [ -d /EFI/ACPI/patched ]; then
+gDestinationPath="/EFI/ACPI/patched/"
+echo 'ACPI target directory changed to: '$gDestinationPath
+return
+fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUNumberFromBrandString
 {
-    #
-    # Get CPU brandstring
-    #
-    local brandString=$(echo `sysctl machdep.cpu.brand_string` | sed -e 's/machdep.cpu.brand_string: //')
-    #
-    # Save default (0) delimiter
-    #
-    local ifs=$IFS
-    #
-    # Change delimiter to a space character
-    #
-    IFS=" "
-    #
-    # Split brandstring into array (data)
-    #
-    local data=($brandString)
+#
+# Get CPU brandstring
+#
+local brandString=$(echo `sysctl machdep.cpu.brand_string` | sed -e 's/machdep.cpu.brand_string: //')
+#
+# Save default (0) delimiter
+#
+local ifs=$IFS
+#
+# Change delimiter to a space character
+#
+IFS=" "
+#
+# Split brandstring into array (data)
+#
+local data=($brandString)
 #   local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "V2" "@" "2.5GHz")
 #   local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "@" "2.5GHz")
-    #
-    # Example from a MacBookPro10,2
-    #
-    # echo "${data[0]}" # Intel(R)
-    # echo "${data[1]}" # Core(TM)
-    # echo "${data[2]}" # i5-3210M
-    # echo "${data[3]}" # CPU
-    # echo "${data[4]}" # @
-    # echo "${data[5]}" # 2.50GHz
-    #
-    # or: "Intel(R) Xeon(R) CPU E3-1230 V2 @ 3.30GHz"
-    #
-    # echo "${data[0]}" # Intel(R)
-    # echo "${data[1]}" # Xeon(R)
-    # echo "${data[2]}" # CPU
-    # echo "${data[3]}" # E3-12XX
-    # echo "${data[4]}" # V2
-    # echo "${data[5]}" # @
-    # echo "${data[6]}" # 3.30GHz
-
-    #
-    # Restore the default delimiter
-    #
-    IFS=$ifs
-
-    let length=${#data[@]}
-
-    if ((length > 6)); then
-        echo 'Warning: Unexpected brandstring > "'${data[@]}'"'
-    fi
-
-    if [[ ${data[1]} == "Xeon(R)" && ${data[4]} == "V2" ]];
-        then
-            gProcessorNumber="${data[3]} ${data[4]}"
-        else
-            gProcessorNumber="${data[2]}"
-    fi
+#
+# Example from a MacBookPro10,2
+#
+# echo "${data[0]}" # Intel(R)
+# echo "${data[1]}" # Core(TM)
+# echo "${data[2]}" # i5-3210M
+# echo "${data[3]}" # CPU
+# echo "${data[4]}" # @
+# echo "${data[5]}" # 2.50GHz
+#
+# or: "Intel(R) Xeon(R) CPU E3-1230 V2 @ 3.30GHz"
+#
+# echo "${data[0]}" # Intel(R)
+# echo "${data[1]}" # Xeon(R)
+# echo "${data[2]}" # CPU
+# echo "${data[3]}" # E3-12XX
+# echo "${data[4]}" # V2
+# echo "${data[5]}" # @
+# echo "${data[6]}" # 3.30GHz
+
+#
+# Restore the default delimiter
+#
+IFS=$ifs
+
+let length=${#data[@]}
+
+if ((length > 6)); then
+echo 'Warning: Unexpected brandstring > "'${data[@]}'"'
+fi
+
+if [[ ${data[1]} == "Xeon(R)" && ${data[4]} == "V2" ]];
+then
+gProcessorNumber="${data[3]} ${data[4]}"
+else
+gProcessorNumber="${data[2]}"
+fi
 
 #   echo $gProcessorNumber
 }
@@ -1379,758 +1371,745 @@ function _getCPUNumberFromBrandString
 
 function _getCPUDataByProcessorNumber
 {
-    #
-    # Local function definition
-    #
-    function __searchList()
-    {
-        local ifs=$IFS
-        let targetType=0
-
-        case $1 in
-            2) local cpuSpecLists=("gDesktopSandyBridgeCPUList[@]" "gMobileSandyBridgeCPUList[@]" "gServerSandyBridgeCPUList[@]")
-               ;;
-            4) local cpuSpecLists=("gDesktopIvyBridgeCPUList[@]" "gMobileIvyBridgeCPUList[@]" "gServerIvyBridgeCPUList[@]")
-               ;;
-            8) local cpuSpecLists=("gDesktopHaswellCPUList[@]" "gMobileHaswellCPUList[@]" "gHaswellCPUList[@]")
-               ;;
-        esac
-
-        for cpuList in ${cpuSpecLists[@]}
-        do
-            let targetType+=1
-            local targetCPUList=("${!cpuList}")
-
-            for cpuData in "${targetCPUList[@]}"
-            do
-                IFS=","
-                data=($cpuData)
-
-                if [[ ${data[0]} == $gProcessorNumber ]]; then
-                    gProcessorData="$cpuData"
-                    let gTypeCPU=$targetType
-                    let gBridgeType=$1
-                    IFS=$ifs
-                    return
-                fi
-            done
-        done
-
-        IFS=$ifs
-    }
-
-    #
-    # Local function callers
-    #
-    __searchList $SANDY_BRIDGE
-
-    if (!(($gTypeCPU))); then
-        __searchList $IVY_BRIDGE
-    fi
-
-    if (!(($gTypeCPU))); then
-        __searchList $HASWELL
-    fi
+#
+# Local function definition
+#
+function __searchList()
+{
+local ifs=$IFS
+let targetType=0
+
+case $1 in
+2) local cpuSpecLists=("gDesktopSandyBridgeCPUList[@]" "gMobileSandyBridgeCPUList[@]" "gServerSandyBridgeCPUList[@]")
+;;
+4) local cpuSpecLists=("gDesktopIvyBridgeCPUList[@]" "gMobileIvyBridgeCPUList[@]" "gServerIvyBridgeCPUList[@]")
+;;
+8) local cpuSpecLists=("gDesktopHaswellCPUList[@]" "gMobileHaswellCPUList[@]" "gHaswellCPUList[@]")
+;;
+esac
+
+for cpuList in ${cpuSpecLists[@]}
+do
+let targetType+=1
+local targetCPUList=("${!cpuList}")
+
+for cpuData in "${targetCPUList[@]}"
+do
+IFS=","
+data=($cpuData)
+
+if [[ ${data[0]} == $gProcessorNumber ]]; then
+gProcessorData="$cpuData"
+let gTypeCPU=$targetType
+let gBridgeType=$1
+IFS=$ifs
+return
+fi
+done
+done
+
+IFS=$ifs
+}
+
+#
+# Local function callers
+#
+__searchList $SANDY_BRIDGE
+
+if (!(($gTypeCPU))); then
+__searchList $IVY_BRIDGE
+fi
+
+if (!(($gTypeCPU))); then
+__searchList $HASWELL
+fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _showLowPowerStates()
 {
-    #
-    # Local function definition
-    #
-    function __print()
-    {
-        local mask=1
-        local cStates=$1
-
-        printf "Injected C-States for ${gProcessorNames[$2]} ("
-        #
-        # Haswell    : C0, C1, C1E, C2E, C3, C4, C6 and C7
-        # Haswell-ULT: C0, C1, C1E, C2E, C3, C4, C6, C7, C8, C9 and C10
-        #
-        for state in C1 C2 C3 C6 C7 C8 C9 C10
-        do
-            if (($cStates & $mask)); then
-               if (($mask > 1)); then
-                   printf ","
-               fi
-
-               printf "$state"
-            fi
-
-            let mask=$(($mask << 1))
-        done
-
-        echo ')'
-    }
-
-    #
-    # Local function callers
-    #
-    __print $gACST_CPU0 0
-
-    if [ $gBridgeType -ge $IVY_BRIDGE ]; then
-        __print $gACST_CPU1 1
-    fi
+#
+# Local function definition
+#
+function __print()
+{
+local mask=1
+local cStates=$1
+
+printf "Injected C-States for ${gProcessorNames[$2]} ("
+#
+# Haswell    : C0, C1, C1E, C2E, C3, C4, C6 and C7
+# Haswell-ULT: C0, C1, C1E, C2E, C3, C4, C6, C7, C8, C9 and C10
+#
+for state in C1 C2 C3 C6 C7 C8 C9 C10
+do
+if (($cStates & $mask)); then
+if (($mask > 1)); then
+printf ","
+fi
+
+printf "$state"
+fi
+
+let mask=$(($mask << 1))
+done
+
+echo ')'
+}
+
+#
+# Local function callers
+#
+__print $gACST_CPU0 0
+
+if [ $gBridgeType -ge $IVY_BRIDGE ]; then
+__print $gACST_CPU1 1
+fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _checkPlatformSupport()
 {
-    #
-    # Local function definition
-    #
-    function __searchList()
-    {
-        local data=`awk '/<key>'${1}'<\/key>.*/,/<\/array>/' /System/Library/CoreServices/PlatformSupport.plist`
-        local targetList=(`echo $data | egrep -o '(<string>.*</string>)' | sed -e 's/<\/*string>//g'`)
-
-        for item in "${targetList[@]}"
-        do
-
-            if [ "$item" == "$2" ]; then
-                return 1
-            fi
-        done
-
-        return 0
-    }
-
-    #
-    # This check is required for Snow Leopard compatibility!
-    #
-    if [ -f /System/Library/CoreServices/PlatformSupport.plist ];
-        then
-            __searchList 'SupportedModelProperties' $1
-
-            if (($? == 0)); then
-                echo 'Warning: Model identifier ['$1'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
-            fi
-
-            __searchList 'SupportedBoardIds' $2
-
-            if (($? == 0)); then
-                echo 'Warning: boardID ['$2'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
-            fi
-        else
-            echo 'Warning: /S*/L*/C*/PlatformSupport.plist not found (normal for Snow Leopard)!'
-    fi
+#
+# Local function definition
+#
+function __searchList()
+{
+local data=`awk '/<key>'${1}'<\/key>.*/,/<\/array>/' /System/Library/CoreServices/PlatformSupport.plist`
+local targetList=(`echo $data | egrep -o '(<string>.*</string>)' | sed -e 's/<\/*string>//g'`)
+
+for item in "${targetList[@]}"
+do
+
+if [ "$item" == "$2" ]; then
+return 1
+fi
+done
+
+return 0
+}
+
+#
+# This check is required for Snow Leopard compatibility!
+#
+if [ -f /System/Library/CoreServices/PlatformSupport.plist ];
+then
+__searchList 'SupportedModelProperties' $1
+
+if (($? == 0)); then
+echo 'Warning: Model identifier ['$1'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
+fi
+
+__searchList 'SupportedBoardIds' $2
+
+if (($? == 0)); then
+echo 'Warning: boardID ['$2'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
+fi
+else
+echo 'Warning: /S*/L*/C*/PlatformSupport.plist not found (normal for Snow Leopard)!'
+fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _checkSMCKeys()
 {
-    #
-    # TODO: Check SMC keys to see if they are there and properly initialized!
-    #
-    # Note: Do <i>not</i> dump SMC keys with HWSensors/iStat or other SMC plug-ins installed!
-    #
-    local filename="/System/Library/Extensions/FakeSMC.kext/Contents/Info.plist"
-    local data=`grep -so '<key>[a-zA-Z]*</key>' $filename | sed -e 's/<key>//' -e 's/<\/key>//g'`
-
-    local status=`echo $data | grep -oe 'DPLM'`
-
-    if [ $status == 'DPLM' ]; then
-        # DPLM  [{lim]  (bytes 00 00 00 00 00)
-        # CPU, Idle, IGPU, EGPU and Memory P-State limits
-        echo "SMC key 'DPLM' found (OK)"
-    fi
+#
+# TODO: Check SMC keys to see if they are there and properly initialized!
+#
+# Note: Do <i>not</i> dump SMC keys with HWSensors/iStat or other SMC plug-ins installed!
+#
+local filename="/System/Library/Extensions/FakeSMC.kext/Contents/Info.plist"
+local data=`grep -so '<key>[a-zA-Z]*</key>' $filename | sed -e 's/<key>//' -e 's/<\/key>//g'`
+
+local status=`echo $data | grep -oe 'DPLM'`
+
+if [ $status == 'DPLM' ]; then
+# DPLM  [{lim]  (bytes 00 00 00 00 00)
+# CPU, Idle, IGPU, EGPU and Memory P-State limits
+echo "SMC key 'DPLM' found (OK)"
+fi
 set -x
-    local status=`echo $data | grep -oe 'MSAL'`
+local status=`echo $data | grep -oe 'MSAL'`
 
-    if [ $status == 'MSAL' ]; then
-        # MSAL  [hex_]  (bytes 4b)
-        echo "SMC key 'MSAL' found (OK)"
-    fi
+if [ $status == 'MSAL' ]; then
+# MSAL  [hex_]  (bytes 4b)
+echo "SMC key 'MSAL' found (OK)"
+fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _initSandyBridgeSetup()
 {
-	case $boardID in
-		Mac-942B5BF58194151B)
-			gSystemType=1
-			gMacModelIdentifier="iMac12,1"
-			gACST_CPU0=13   # C1, C3 and C6
-			gACST_CPU1=7    # C1, C2 and C3
-			;;
-
-		Mac-942B59F58194171B)
-			gSystemType=1
-			gMacModelIdentifier="iMac12,2"
-			gACST_CPU0=13   # C1, C3 and C6
-			gACST_CPU1=7    # C1, C2 and C3
-			;;
-
-		Mac-8ED6AF5B48C039E1)
-			gSystemType=1
-			gMacModelIdentifier="Macmini5,1"
-			gACST_CPU0=13   # C1, C3 and C6
-			gACST_CPU1=7    # C1, C2 and C3
-			;;
-
-		Mac-4BC72D62AD45599E)
-			gSystemType=1
-			gMacModelIdentifier="Macmini5,2"
-			gACST_CPU0=13   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-			;;
-
-		Mac-7BA5B2794B2CDB12)
-			gSystemType=1
-			gMacModelIdentifier="Macmini5,3"
-			gACST_CPU0=13   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-			;;
-
-		Mac-94245B3640C91C81)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro8,1"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-			;;
-
-		Mac-94245A3940C91C80)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro8,2"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-			;;
-
-		Mac-942459F5819B171B)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro8,3"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-			;;
-
-		Mac-C08A6BB70A942AC2)
-			gSystemType=2
-			gMacModelIdentifier="MacBookAir4,1"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-			;;
-
-		Mac-742912EFDBEE19B3)
-			gSystemType=2
-			gMacModelIdentifier="MacBookAir4,2"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-			;;
-	esac
+case $boardID in
+Mac-942B5BF58194151B)
+gSystemType=1
+gMacModelIdentifier="iMac12,1"
+gACST_CPU0=13   # C1, C3 and C6
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-942B59F58194171B)
+gSystemType=1
+gMacModelIdentifier="iMac12,2"
+gACST_CPU0=13   # C1, C3 and C6
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-8ED6AF5B48C039E1)
+gSystemType=1
+gMacModelIdentifier="Macmini5,1"
+gACST_CPU0=13   # C1, C3 and C6
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-4BC72D62AD45599E)
+gSystemType=1
+gMacModelIdentifier="Macmini5,2"
+gACST_CPU0=13   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-7BA5B2794B2CDB12)
+gSystemType=1
+gMacModelIdentifier="Macmini5,3"
+gACST_CPU0=13   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-94245B3640C91C81)
+gSystemType=2
+gMacModelIdentifier="MacBookPro8,1"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-94245A3940C91C80)
+gSystemType=2
+gMacModelIdentifier="MacBookPro8,2"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-942459F5819B171B)
+gSystemType=2
+gMacModelIdentifier="MacBookPro8,3"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-C08A6BB70A942AC2)
+gSystemType=2
+gMacModelIdentifier="MacBookAir4,1"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-742912EFDBEE19B3)
+gSystemType=2
+gMacModelIdentifier="MacBookAir4,2"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+esac
 }
 
 #--------------------------------------------------------------------------------
 
 function _initIvyBridgeSetup()
 {
-	case $boardID in
-		Mac-00BE6ED71E35EB86)
-			gSystemType=1
-			gMacModelIdentifier="iMac13,1"
-			gACST_CPU0=13   # C1, C3 and C6
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-FC02E91DDD3FA6A4)
-			gSystemType=1
-			gMacModelIdentifier="iMac13,2"
-			gACST_CPU0=13   # C1, C3 and C6
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-031AEE4D24BFF0B1)
-			gSystemType=1
-			gMacModelIdentifier="Macmini6,1"
-			gACST_CPU0=13   # C1, C3 and C6
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-F65AE981FFA204ED)
-			gSystemType=1
-			gMacModelIdentifier="Macmini6,2"
-			gACST_CPU0=13   # C1, C3 and C6
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-4B7AC7E43945597E)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro9,1"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-6F01561E16C75D06)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro9,2"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-C3EC7CD22292981F)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro10,1"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-AFD8A9D944EA4843)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro10,2"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-66F35F19FE2A0D05)
-			gSystemType=2
-			gMacModelIdentifier="MacBookAir5,1"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-2E6FAB96566FE58C)
-			gSystemType=2
-			gMacModelIdentifier="MacBookAir5,2"
-			gACST_CPU0=29   # C1, C3, C6 and C7
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-	esac
+case $boardID in
+Mac-00BE6ED71E35EB86)
+gSystemType=1
+gMacModelIdentifier="iMac13,1"
+gACST_CPU0=13   # C1, C3 and C6
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-FC02E91DDD3FA6A4)
+gSystemType=1
+gMacModelIdentifier="iMac13,2"
+gACST_CPU0=13   # C1, C3 and C6
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-031AEE4D24BFF0B1)
+gSystemType=1
+gMacModelIdentifier="Macmini6,1"
+gACST_CPU0=13   # C1, C3 and C6
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-F65AE981FFA204ED)
+gSystemType=1
+gMacModelIdentifier="Macmini6,2"
+gACST_CPU0=13   # C1, C3 and C6
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-4B7AC7E43945597E)
+gSystemType=2
+gMacModelIdentifier="MacBookPro9,1"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-6F01561E16C75D06)
+gSystemType=2
+gMacModelIdentifier="MacBookPro9,2"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-C3EC7CD22292981F)
+gSystemType=2
+gMacModelIdentifier="MacBookPro10,1"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-AFD8A9D944EA4843)
+gSystemType=2
+gMacModelIdentifier="MacBookPro10,2"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-66F35F19FE2A0D05)
+gSystemType=2
+gMacModelIdentifier="MacBookAir5,1"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-2E6FAB96566FE58C)
+gSystemType=2
+gMacModelIdentifier="MacBookAir5,2"
+gACST_CPU0=29   # C1, C3, C6 and C7
+gACST_CPU1=7    # C1, C2 and C3
+;;
+esac
 }
 
 #--------------------------------------------------------------------------------
 
 function _initHaswellSetup()
 {
-	case $boardID in
-		Mac-)
-			gSystemType=1
-			gMacModelIdentifier="iMac14,1"
-			gACST_CPU0=13   # C1, C2, C3, C6
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-)
-			gSystemType=1
-			gMacModelIdentifier="iMac14,2"
-			gACST_CPU0=13   # C1, C2, C3, C6
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-)
-			gSystemType=1
-			gMacModelIdentifier="Macmini7,1"
-			gACST_CPU0=13   # C1, C2, C3, C6
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-)
-			gSystemType=1
-			gMacModelIdentifier="Macmini7,2"
-			gACST_CPU0=13   # C1, C2, C3, C6
-			gACST_CPU1=7    # C1, C2 and C3
-		;;
-
-		Mac-)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro11,1"
-			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-			gACST_CPU1=31   # C1, C2, C3, C6 and C7
-		;;
-
-		Mac-)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro11,2"
-			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-			gACST_CPU1=31   # C1, C2, C3, C6 and C7
-		;;
-
-		Mac-)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro12,1"
-			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-			gACST_CPU1=31   # C1, C2, C3, C6 and C7
-		;;
-
-		Mac-)
-			gSystemType=2
-			gMacModelIdentifier="MacBookPro12,2"
-			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-			gACST_CPU1=31   # C1, C2, C3, C6 and C7
-		;;
-
-		Mac-35C1E88140C3E6CF)
-			gSystemType=2
-			gMacModelIdentifier="MacBookAir6,1"
-			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-			gACST_CPU1=31   # C1, C2, C3, C6 and C7
-		;;
-
-		Mac-7DF21CB3ED6977E5)
-            echo "YES"
-			gSystemType=2
-			gMacModelIdentifier="MacBookAir6,2"
-			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-			gACST_CPU1=31   # C1, C2, C3, C6 and C7
-		;;
-	esac
+case $boardID in
+Mac-031B6874CF7F642A)
+gSystemType=1
+gMacModelIdentifier="iMac14,1"
+gACST_CPU0=13   # C1, C2, C3, C6
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-27ADBB7B4CEE8E61)
+gSystemType=1
+gMacModelIdentifier="iMac14,2"
+gACST_CPU0=13   # C1, C2, C3, C6
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-77EB7D7DAF985301)
+gSystemType=1
+gMacModelIdentifier="iMac14,3"
+gACST_CPU0=13   # C1, C2, C3, C6
+gACST_CPU1=7    # C1, C2 and C3
+;;
+
+Mac-189A3D4F975D5FFC)
+gSystemType=2
+gMacModelIdentifier="MacBookPro11,1"
+gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+gACST_CPU1=31   # C1, C2, C3, C6 and C7
+;;
+
+Mac-3CBD00234E554E41)
+gSystemType=2
+gMacModelIdentifier="MacBookPro11,2"
+gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+gACST_CPU1=31   # C1, C2, C3, C6 and C7
+;;
+
+Mac-2BD1B31983FE1663)
+gSystemType=2
+gMacModelIdentifier="MacBookPro11,3"
+gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+gACST_CPU1=31   # C1, C2, C3, C6 and C7
+;;
+
+Mac-35C1E88140C3E6CF)
+gSystemType=2
+gMacModelIdentifier="MacBookAir6,1"
+gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+gACST_CPU1=31   # C1, C2, C3, C6 and C7
+;;
+
+Mac-7DF21CB3ED6977E5)
+gSystemType=2
+gMacModelIdentifier="MacBookAir6,2"
+gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+gACST_CPU1=31   # C1, C2, C3, C6 and C7
+;;
+
+Mac-F60DEB81FF30ACF6)
+gSystemType=1
+gMacModelIdentifier="MacPro6,1"
+gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+gACST_CPU1=31   # C1, C2, C3, C6 and C7
+;;
+esac
 }
 
 #--------------------------------------------------------------------------------
 
 function _exitWithError()
 {
-    case "$1" in
-        2) echo -e "\nError: 'MaxTurboFrequency' must be in the range of $frequency-$gMaxOCFrequency... exiting\n" 1>&2
-           exit 2
-           ;;
-        3) echo -e "\nError: 'TDP' must be in the range of 10-150 Watts... exiting\n" 1>&2
-           exit 3
-           ;;
-        4) echo -e "\nError: 'BridgeType' must be 0, 1 or 2... exiting\n" 1>&2
-           exit 4
-           ;;
-        5) echo -e "\nError: Unknown processor number... exiting\n" 1>&2
-           exit 5
-           ;;
-        6) echo -e "\nError: Processor label length is less than 3... exiting\n" 1>&2
-           exit 6
-           ;;
-        7) echo -e "\nError: Processor label not found... exiting\n" 1>&2
-           exit 7
-           ;;
-        8) echo -e "\nError: Processor Declaration not found... exiting\n" 1>&2
-           exit 8
-           ;;
-        *) exit 1
-           ;;
-    esac
+case "$1" in
+2) echo -e "\nError: 'MaxTurboFrequency' must be in the range of $frequency-$gMaxOCFrequency... exiting\n" 1>&2
+exit 2
+;;
+3) echo -e "\nError: 'TDP' must be in the range of 10-150 Watts... exiting\n" 1>&2
+exit 3
+;;
+4) echo -e "\nError: 'BridgeType' must be 0, 1 or 2... exiting\n" 1>&2
+exit 4
+;;
+5) echo -e "\nError: Unknown processor number... exiting\n" 1>&2
+exit 5
+;;
+6) echo -e "\nError: Processor label length is less than 3... exiting\n" 1>&2
+exit 6
+;;
+7) echo -e "\nError: Processor label not found... exiting\n" 1>&2
+exit 7
+;;
+8) echo -e "\nError: Processor Declaration not found... exiting\n" 1>&2
+exit 8
+;;
+*) exit 1
+;;
+esac
 }
 
 #--------------------------------------------------------------------------------
 
 function main()
 {
-    printf "\nsdtPRGen.sh v$gScriptVersion Copyright (c) 2013 by Pike R. Alpha\n"
-    echo   '----------------------------------------------------------------'
-
-    let assumedTDP=0
-    let modelSpecified=0
-    let maxTurboFrequency=0
-
-    _getCPUNumberFromBrandString
-
-    if [[ "$1" != "" ]]; then
-        # Sandy Bridge checks
-        if [[ ${1:0:4} == "i3-2" || ${1:0:4} == "i5-2" || ${1:0:4} == "i7-2" ]]; then
-            let modelSpecified=1
-            gProcessorNumber=$1
-        fi
-        # Ivy Bridge checks
-        if [[ ${1:0:4} == "i3-3" || ${1:0:4} == "i5-3" || ${1:0:4} == "i7-3" ]]; then
-            let modelSpecified=1
-            gProcessorNumber=$1
-        fi
-        # Haswell checks
-        if [[ ${1:0:4} == "i3-4" || ${1:0:4} == "i5-4" || ${1:0:4} == "i7-4" ]]; then
-            let modelSpecified=1
-            gProcessorNumber=$1
-        fi
-        # Xeon check
-        if [[ ${1:0:1} == "E" ]]; then
-            let modelSpecified=1
-            gProcessorNumber=$1
-        fi
-    fi
-
-    _getCPUDataByProcessorNumber
-
-    if [[ $modelSpecified -eq 1 && $gTypeCPU -eq 0 ]]; then
-       _exitWithError $PROCESSOR_NUMBER_ERROR
-    fi
-
-    if [[ $gBridgeType -eq 0 ]]; then
-        local model=$(_getCPUModel)
-
-        if (($model==0x2A)); then
-            let gTdp=95
-            let gBridgeType=2
-        fi
-
-        if (($model==0x2D)); then
-            let assumedTDP=1
-            let gTdp=130
-            let gBridgeType=2
-        fi
-
-        if (($model==0x3A || $model==0x3B || $model==0x3E)); then
-            let assumedTDP=1
-            let gTdp=77
-            let gBridgeType=4
-        fi
-
-        # Haswell
-        if (($model==0x3C)); then
-            let assumedTDP=1
-            let gTdp=84
-            let gBridgeType=8
-            let gMaxOCFrequency=8000
-        fi
-
-        # Haswell ULT
-        if (($model==0x45)); then
-            let assumedTDP=1
-            let gTdp=15
-            let gBridgeType=8
-        fi
-    fi
-
-    case $gBridgeType in
-        2) local bridgeTypeString="Sandy Bridge"
-           ;;
-        4) local bridgeTypeString="Ivy Bridge"
-           ;;
-        8) local bridgeTypeString="Haswell"
-           ;;
-	    *) local bridgeTypeString="Unknown"
-           ;;
-    esac
-
-    _getBoardID
-    _getProcessorNames
-    _getProcessorScope
-
-    local modelID=$(_getModelName)
-    local cpu_type=$(_getCPUtype)
-    local currentSystemType=$(_getSystemType)
-    local cpuSignature=$(_getCPUSignature)
-
-    echo "Generating ${gSsdtID}.dsl for a $modelID [$boardID]"
-    echo "$bridgeTypeString Core $gProcessorNumber processor [$cpuSignature] setup [0x$cpu_type]"
-
-    #
-    # gTypeCPU is greater than 0 when the processor is found in one of the CPU lists
-    #
-    if (($gTypeCPU));
-        then
-            local ifs=$IFS
-            IFS=","
-            local cpuData=($gProcessorData)
-            let gTdp=${cpuData[1]}
-            let lfm=${cpuData[2]}
-            let frequency=${cpuData[3]}
-            let maxTurboFrequency=${cpuData[4]}
-
-            if [ $maxTurboFrequency == 0 ]; then
-                let maxTurboFrequency=$frequency
-            fi
-
-            let gLogicalCPUs=${cpuData[6]}
-
-            IFS=$ifs
-
-            echo 'With a maximum TDP of '$gTdp' Watt, as specified by Intel'
-
-            #
-            # Check Low Frequency Mode (may be 0 aka still unknown)
-            #
-            if (($lfm > 0));
-                then
-                    let gBaseFrequency=$lfm
-                else
-                    echo -e "\nWarning: Low Frequency Mode is 0 (unknown)"
-
-                    if (($gTypeCPU == gMobileCPU));
-                        then
-                            echo -e "         Now using 1200 MHz for Mobile processor\n"
-                            let gBaseFrequency=1200
-                        else
-                            echo -e "         Now using 1600 MHz for Server/Desktop processors\n"
-                            let gBaseFrequency=1600
-                    fi
-            fi
-        else
-            let gLogicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
-            let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
-            let frequency=($frequency / 1000000)
-
-            if [[ $assumedTDP -eq 1 ]]; then
-                echo 'With a maximum TDP of '$gTdp' Watt - assumed, may require override value!'
-            fi
-    fi
-
-    #
-    # Script argument checks
-    #
-
-    if [[ $# -ge 2 ]]; then
-        if [[ "$2" =~ ^[0-9]+$ ]]; then
-            if [[ $2 -lt $frequency || $2 -gt $gMaxOCFrequency ]];
-                then
-                    _exitWithError $MAX_TURBO_FREQUENCY_ERROR
-                else
-                    if [[ $2 -gt $maxTurboFrequency ]]; then
-                        echo "Override value: Max Turbo Frequency, now using: $2 MHz!"
-                        let maxTurboFrequency=$2
-                    fi
-            fi
-        fi
-    fi
-
-    if [ $# -ge 3 ]; then
-        if [[ "$3" =~ ^[0-9]+$ ]];
-            then
-                if [[ $3 -lt 10 || $3 -gt 150 ]];
-                    then
-                        _exitWithError $MAX_TDP_ERROR
-                    else
-                        if [[ $gTdp != $3 ]]; then
-                            let gTdp=$3
-                            echo "Override value: Max TDP, now using: $gTdp Watt!"
-                        fi
-                fi
-            else
-                _exitWithError $MAX_TDP_ERROR
-        fi
-    fi
-
-    if [ $# -ge 4 ]; then
-        if [[ "$4" =~ ^[0-9]+$ ]];
-            then
-                local detectedBridgeType=$gBridgeType
-
-                case "$4" in
-                    0) let gBridgeType=2
-                       local bridgeTypeString='Sandy Bridge'
-                       ;;
-                    1) let gBridgeType=4
-                       local bridgeTypeString='Ivy Bridge'
-                       ;;
-                    2) let gBridgeType=8
-                       local bridgeTypeString='Haswell'
-                       ;;
-                    *) _exitWithError $TARGET_CPU_ERROR
-                       ;;
-                esac
-
-                if [[ $detectedBridgeType -ne $((2 << $4)) ]]; then
-                    echo "Override value: CPU type, now using: $bridgeTypeString"
-                fi
-            else
-                _exitWithError $TARGET_CPU_ERROR
-        fi
-    fi
-
-    if [ $# -eq 5 ]; then
-        if [ ${#5} -eq 3 ];
-            then
-                gProcLabel=$(echo "$5" | tr '[:lower:]' '[:upper:]')
-                echo "Override value: Now using '$gProcLabel' for ACPI processor names!"
-                _updateProcessorNames ${#gProcessorNames[@]}
-            else
-                _exitWithError $PROCESSOR_LABEL_LENGTH_ERROR
-        fi
-    fi
-
-    echo "Number logical CPU's: $gLogicalCPUs (Core Frequency: $frequency MHz)"
-
-    if [ $gLogicalCPUs -gt ${#gProcessorNames[@]} ]; then
-        _updateProcessorNames $gLogicalCPUs
-    fi
-
-    #
-    # Check maxTurboFrequency
-    #
-    if [ $maxTurboFrequency -eq 0 ]; then
-        _exitWithError $MAX_TURBO_FREQUENCY_ERROR
-    fi
-
-	#
-    # Get number of Turbo states.
-    #
-    let turboStates=$(echo "(($maxTurboFrequency - $frequency) / 100)" | bc)
-
-    #
-    # Check number of Turbo states.
-    #
-    if [ $turboStates -lt 0 ]; then
-        let turboStates=0
-    fi
-
-    #
-    # Report number of Turbo States
-    #
-    if [ $turboStates -gt 0 ];
-        then
-            let minTurboFrequency=($frequency+100)
-            echo "Number of Turbo States: $turboStates ($minTurboFrequency-$maxTurboFrequency MHz)"
-
-        else
-            echo "Number of Turbo States: 0"
-    fi
-
-    local packageLength=$(echo "((($maxTurboFrequency - $gBaseFrequency)+100) / 100)" | bc)
-
-    echo "Number of P-States: $packageLength ($gBaseFrequency-$maxTurboFrequency MHz)"
-
-    _printHeader
-    _printExternals
-    _printDebugInfo
-    _printScopeStart $turboStates $packageLength
-    _printPackages $gTdp $frequency $maxTurboFrequency
-
-    case "$gBridgeType" in
-        $SANDY_BRIDGE)
-            local cpuTypeString="06"
-            _initSandyBridgeSetup
-            _printScopeACST 0
-            _printScopeCPUn
-            ;;
-        $IVY_BRIDGE)
-            local cpuTypeString="07"
-            _initIvyBridgeSetup
-            _printScopeACST 0
-            _printMethodDSM
-            _printScopeCPUn
-            ;;
-        $HASWELL)
-            local cpuTypeString="08"
-            _initHaswellSetup
-            _printScopeACST 0
-            _printMethodDSM
-            _printScopeCPUn
-           ;;
-    esac
-
-    _showLowPowerStates
-    _checkPlatformSupport $modelID $boardID
-
-    #
-    # Some IB CPUPM specific configuration checks
-    #
-    if [ $gBridgeType -ne $HASWELL ];
-        then
-            if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
-                echo -e "\nWarning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
-            fi
-
-            if [ $gSystemType -eq 0 ];
-                then
-                    echo -e "\nWarning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
-                else
-                    if [ "$gMacModelIdentifier" != "$modelID" ]; then
-                        echo "Error: board-id [$boardID] and model [$modelID] mismatch"
-                    fi
-
-                    if [ $currentSystemType -ne $gSystemType ]; then
-                        echo -e "\nWarning: 'system-type' may be set improperly ($currentSystemType instead of $gSystemType)"
-                    fi
-            fi
-    fi
+printf "\nsdtPRGen.sh v$gScriptVersion Copyright (c) 2013 by Pike R. Alpha\n"
+echo   '----------------------------------------------------------------'
+
+let assumedTDP=0
+let modelSpecified=0
+let maxTurboFrequency=0
+
+_getCPUNumberFromBrandString
+
+if [[ "$1" != "" ]]; then
+# Sandy Bridge checks
+if [[ ${1:0:4} == "i3-2" || ${1:0:4} == "i5-2" || ${1:0:4} == "i7-2" ]]; then
+let modelSpecified=1
+gProcessorNumber=$1
+fi
+# Ivy Bridge checks
+if [[ ${1:0:4} == "i3-3" || ${1:0:4} == "i5-3" || ${1:0:4} == "i7-3" ]]; then
+let modelSpecified=1
+gProcessorNumber=$1
+fi
+# Haswell checks
+if [[ ${1:0:4} == "i3-4" || ${1:0:4} == "i5-4" || ${1:0:4} == "i7-4" ]]; then
+let modelSpecified=1
+gProcessorNumber=$1
+fi
+# Xeon check
+if [[ ${1:0:1} == "E" ]]; then
+let modelSpecified=1
+gProcessorNumber=$1
+fi
+fi
+
+_getCPUDataByProcessorNumber
+
+if [[ $modelSpecified -eq 1 && $gTypeCPU -eq 0 ]]; then
+_exitWithError $PROCESSOR_NUMBER_ERROR
+fi
+
+if [[ $gBridgeType -eq 0 ]]; then
+local model=$(_getCPUModel)
+
+if (($model==0x2A)); then
+let gTdp=95
+let gBridgeType=2
+fi
+
+if (($model==0x2D)); then
+let assumedTDP=1
+let gTdp=130
+let gBridgeType=2
+fi
+
+if (($model==0x3A || $model==0x3B || $model==0x3E)); then
+let assumedTDP=1
+let gTdp=77
+let gBridgeType=4
+fi
+
+# Haswell
+if (($model==0x3C)); then
+let assumedTDP=1
+let gTdp=84
+let gBridgeType=8
+let gMaxOCFrequency=8000
+fi
+
+# Haswell ULT
+if (($model==0x40)); then
+let assumedTDP=1
+let gTdp=15
+let gBridgeType=8
+fi
+fi
+
+case $gBridgeType in
+2) local bridgeTypeString="Sandy Bridge"
+;;
+4) local bridgeTypeString="Ivy Bridge"
+;;
+8) local bridgeTypeString="Haswell"
+;;
+*) local bridgeTypeString="Unknown"
+;;
+esac
+
+_getBoardID
+_getProcessorNames
+_getProcessorScope
+
+local modelID=$(_getModelName)
+local cpu_type=$(_getCPUtype)
+local currentSystemType=$(_getSystemType)
+local cpuSignature=$(_getCPUSignature)
+
+echo "Generating ${gSsdtID}.dsl for a $modelID [$boardID]"
+echo "$bridgeTypeString Core $gProcessorNumber processor [$cpuSignature] setup [0x$cpu_type]"
+
+#
+# gTypeCPU is greater than 0 when the processor is found in one of the CPU lists
+#
+if (($gTypeCPU));
+then
+local ifs=$IFS
+IFS=","
+local cpuData=($gProcessorData)
+let gTdp=${cpuData[1]}
+let lfm=${cpuData[2]}
+let frequency=${cpuData[3]}
+let maxTurboFrequency=${cpuData[4]}
+
+if [ $maxTurboFrequency == 0 ]; then
+let maxTurboFrequency=$frequency
+fi
+
+let gLogicalCPUs=${cpuData[6]}
+
+IFS=$ifs
+
+echo 'With a maximum TDP of '$gTdp' Watt, as specified by Intel'
+
+#
+# Check Low Frequency Mode (may be 0 aka still unknown)
+#
+if (($lfm > 0));
+then
+let gBaseFrequency=$lfm
+else
+echo -e "\nWarning: Low Frequency Mode is 0 (unknown)"
+
+if (($gTypeCPU == gMobileCPU));
+then
+echo -e "         Now using 1200 MHz for Mobile processor\n"
+let gBaseFrequency=1200
+else
+echo -e "         Now using 1600 MHz for Server/Desktop processors\n"
+let gBaseFrequency=1600
+fi
+fi
+else
+let gLogicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
+let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
+let frequency=($frequency / 1000000)
+
+if [[ $assumedTDP -eq 1 ]]; then
+echo 'With a maximum TDP of '$gTdp' Watt - assumed, may require override value!'
+fi
+fi
+
+#
+# Script argument checks
+#
+
+if [[ $# -ge 2 ]]; then
+if [[ "$2" =~ ^[0-9]+$ ]]; then
+if [[ $2 -lt $frequency || $2 -gt $gMaxOCFrequency ]];
+then
+_exitWithError $MAX_TURBO_FREQUENCY_ERROR
+else
+if [[ $2 -gt $maxTurboFrequency ]]; then
+echo "Override value: Max Turbo Frequency, now using: $2 MHz!"
+let maxTurboFrequency=$2
+fi
+fi
+fi
+fi
+
+if [ $# -ge 3 ]; then
+if [[ "$3" =~ ^[0-9]+$ ]];
+then
+if [[ $3 -lt 10 || $3 -gt 150 ]];
+then
+_exitWithError $MAX_TDP_ERROR
+else
+if [[ $gTdp != $3 ]]; then
+let gTdp=$3
+echo "Override value: Max TDP, now using: $gTdp Watt!"
+fi
+fi
+else
+_exitWithError $MAX_TDP_ERROR
+fi
+fi
+
+if [ $# -ge 4 ]; then
+if [[ "$4" =~ ^[0-9]+$ ]];
+then
+local detectedBridgeType=$gBridgeType
+
+case "$4" in
+0) let gBridgeType=2
+local bridgeTypeString='Sandy Bridge'
+;;
+1) let gBridgeType=4
+local bridgeTypeString='Ivy Bridge'
+;;
+2) let gBridgeType=8
+local bridgeTypeString='Haswell'
+;;
+*) _exitWithError $TARGET_CPU_ERROR
+;;
+esac
+
+if [[ $detectedBridgeType -ne $((2 << $4)) ]]; then
+echo "Override value: CPU type, now using: $bridgeTypeString"
+fi
+else
+_exitWithError $TARGET_CPU_ERROR
+fi
+fi
+
+if [ $# -eq 5 ]; then
+if [ ${#5} -eq 3 ];
+then
+gProcLabel=$(echo "$5" | tr '[:lower:]' '[:upper:]')
+echo "Override value: Now using '$gProcLabel' for ACPI processor names!"
+_updateProcessorNames ${#gProcessorNames[@]}
+else
+_exitWithError $PROCESSOR_LABEL_LENGTH_ERROR
+fi
+fi
+
+echo "Number logical CPU's: $gLogicalCPUs (Core Frequency: $frequency MHz)"
+
+if [ $gLogicalCPUs -gt ${#gProcessorNames[@]} ]; then
+_updateProcessorNames $gLogicalCPUs
+fi
+
+#
+# Check maxTurboFrequency
+#
+if [ $maxTurboFrequency -eq 0 ]; then
+_exitWithError $MAX_TURBO_FREQUENCY_ERROR
+fi
+
+#
+# Get number of Turbo states.
+#
+let turboStates=$(echo "(($maxTurboFrequency - $frequency) / 100)" | bc)
+
+#
+# Check number of Turbo states.
+#
+if [ $turboStates -lt 0 ]; then
+let turboStates=0
+fi
+
+#
+# Report number of Turbo States
+#
+if [ $turboStates -gt 0 ];
+then
+let minTurboFrequency=($frequency+100)
+echo "Number of Turbo States: $turboStates ($minTurboFrequency-$maxTurboFrequency MHz)"
+
+else
+echo "Number of Turbo States: 0"
+fi
+
+local packageLength=$(echo "((($maxTurboFrequency - $gBaseFrequency)+100) / 100)" | bc)
+
+echo "Number of P-States: $packageLength ($gBaseFrequency-$maxTurboFrequency MHz)"
+
+_printHeader
+_printExternals
+_printDebugInfo
+_printScopeStart $turboStates $packageLength
+_printPackages $gTdp $frequency $maxTurboFrequency
+
+if [ $gBridgeType -eq $SANDY_BRIDGE ];
+then
+local cpuTypeString="06"
+
+_initSandyBridgeSetup
+
+_printScopeACST 0
+_printScopeCPUn
+else
+local cpuTypeString="07"
+
+_initIvyBridgeSetup
+
+_printScopeACST 0
+_printMethodDSM
+_printScopeCPUn
+fi
+
+_showLowPowerStates
+_checkPlatformSupport $modelID $boardID
+
+#
+# Some IB CPUPM specific configuration checks
+#
+if [ $gBridgeType -ne $HASWELL ];
+then
+if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
+echo -e "\nWarning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
+fi
+
+if [ $gSystemType -eq 0 ];
+then
+echo -e "\nWarning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
+else
+if [ "$gMacModelIdentifier" != "$modelID" ]; then
+echo "Error: board-id [$boardID] and model [$modelID] mismatch"
+fi
+
+if [ $currentSystemType -ne $gSystemType ]; then
+echo -e "\nWarning: 'system-type' may be set improperly ($currentSystemType instead of $gSystemType)"
+fi
+fi
+fi
 }
 
 #==================================== START =====================================
@@ -2138,52 +2117,52 @@ function main()
 clear
 
 if [ $# -eq 0 ];
-    then
-        main "" $1 $2 $3 $4
-    else
-        if [[ "$1" =~ ^[0-9]+$ ]];
-            then
-                main "" $1 $2 $3 $4
-            else
-                main "$1" $2 $3 $4 $5
-        fi
+then
+main "" $1 $2 $3 $4
+else
+if [[ "$1" =~ ^[0-9]+$ ]];
+then
+main "" $1 $2 $3 $4
+else
+main "$1" $2 $3 $4 $5
+fi
 fi
 
 _findIasl
 
 if (($gCallIasl)); then
-    #
-    # Compile ssdt.dsl
-    #
-    sudo "$iasl" $gSsdtPR
-
-    #
-    # Copy ssdt_pr.aml to /Extra/ssdt.aml (example)
-    #
-    if (($gAutoCopy)); then
-        if [ -f ${gPath}/${gSsdtID}.aml ]; then
-            _setDestinationPath
-            echo -e
-            read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
-            case "$choice" in
-                y|Y ) sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile}
-                      ;;
-            esac
-
-            if (($gUnmountEFIPartition)); then
-                echo -e '\nUnmounting EFI partition...'
-                sudo umount -f /Volumes/EFI
-                echo 'Removing temporarily mount point...'
-                sudo rm -r /Volumes/EFI
-            fi
-        fi
-    fi
+#
+# Compile ssdt.dsl
+#
+"$iasl" $gSsdtPR
+
+#
+# Copy ssdt_pr.aml to /Extra/ssdt.aml (example)
+#
+if (($gAutoCopy)); then
+if [ -f ${gPath}/${gSsdtID}.aml ]; then
+_setDestinationPath
+echo -e
+read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
+case "$choice" in
+y|Y ) sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile}
+;;
+esac
+
+if (($gUnmountEFIPartition)); then
+echo -e '\nUnmounting EFI partition...'
+sudo umount -f /Volumes/EFI
+echo 'Removing temporarily mount point...'
+sudo rm -r /Volumes/EFI
+fi
+fi
+fi
 
 fi
 
 if ((gCallOpen)); then
-    open $gSsdtPR
+open $gSsdtPR
 fi
 
 exit 0
-#================================================================================
+#================================================================================
\ No newline at end of file

From c6240cec71ef03f29c830d32335683a4c321427e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 30 Dec 2013 11:23:17 +0100
Subject: [PATCH 422/623] Updating files from Vector One

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 380 +++++++++++-------
 .../AppleIntelCPUPowerManagementInfo.h        |  58 ++-
 2 files changed, 272 insertions(+), 166 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index ec76af1..9c62709 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -15,87 +15,89 @@
 
 void AppleIntelCPUPowerManagementInfo::reportMSRs(void)
 {
-	IOLog("MSR_CORE_THREAD_COUNT......(0x35)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_THREAD_COUNT));
-
-	IOLog("MSR_PLATFORM_INFO..........(0xCE)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PLATFORM_INFO));
-
-	IOLog("MSR_PMG_CST_CONFIG_CONTROL.(0xE2)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PMG_CST_CONFIG_CONTROL));
-	IOLog("MSR_PMG_IO_CAPTURE_BASE....(0xE4)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PMG_IO_CAPTURE_BASE));
-	IOLog("IA32_MPERF.................(0xE7)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MPERF));
-	IOLog("IA32_APERF.................(0xE8)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_APERF));
-
-	IOLog("MSR_FLEX_RATIO.............(0x194) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_FLEX_RATIO));
-	IOLog("MSR_IA32_PERF_STATUS.......(0x198) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_STATUS));
-	IOLog("MSR_IA32_PERF_CONTROL......(0x199) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_CONTROL));
-	IOLog("IA32_CLOCK_MODULATION......(0x19A) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_CLOCK_MODULATION));
-	IOLog("IA32_THERM_STATUS..........(0x19C) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_THERM_STATUS));
-
-	IOLog("IA32_MISC_ENABLES..........(0x1A0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MISC_ENABLES));
-	IOLog("MSR_MISC_PWR_MGMT..........(0x1AA) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_MISC_PWR_MGMT));
-	IOLog("MSR_TURBO_RATIO_LIMIT......(0x1AD) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_RATIO_LIMIT));
-
-	IOLog("IA32_ENERGY_PERF_BIAS......(0x1B0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_ENERGY_PERF_BIAS));
-
-	IOLog("MSR_POWER_CTL..............(0x1FC) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_POWER_CTL));
-
-	IOLog("MSR_RAPL_POWER_UNIT........(0x606) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_RAPL_POWER_UNIT));
-	IOLog("MSR_PKG_POWER_LIMIT........(0x610) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_POWER_LIMIT));
-	IOLog("MSR_PKG_ENERGY_STATUS......(0x611) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_ENERGY_STATUS));
-
-	IOLog("MSR_PKGC3_IRTL.............(0x60a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC3_IRTL));
-	IOLog("MSR_PKGC6_IRTL.............(0x60b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC6_IRTL));
-	IOLog("MSR_PKGC7_IRTL.............(0x60c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC7_IRTL));
-
-	IOLog("MSR_PP0_CURRENT_CONFIG.....(0x601) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_CURRENT_CONFIG));
-	IOLog("MSR_PP0_POWER_LIMIT........(0x638) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POWER_LIMIT));
-	IOLog("MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
-	IOLog("MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
-
-	/* IOLog("MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
-	IOLog("MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
-	IOLog("MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
-	IOLog("MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY)); */
-
-	IOLog("MSR_CONFIG_TDP_NOMINAL.....(0x648) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_NOMINAL));
-	IOLog("MSR_CONFIG_TDP_LEVEL1......(0x649) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL1));
-	IOLog("MSR_CONFIG_TDP_LEVEL2......(0x64a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL2));
-	IOLog("MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
-	IOLog("MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
-
-	IOLog("MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
-	IOLog("MSR_PKG_C3_RESIDENCY.......(0x3f8) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C3_RESIDENCY));
-	IOLog("MSR_PKG_C6_RESIDENCY.......(0x3f9) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C6_RESIDENCY));
-	IOLog("MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+	IOLog("AICPUPMI: MSR_CORE_THREAD_COUNT......(0x35)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_THREAD_COUNT));
+	
+	IOLog("AICPUPMI: MSR_PLATFORM_INFO..........(0xCE)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PLATFORM_INFO));
+	
+	IOLog("AICPUPMI: MSR_PMG_CST_CONFIG_CONTROL.(0xE2)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_CST_CONFIG_CONTROL));
+	IOLog("AICPUPMI: MSR_PMG_IO_CAPTURE_BASE....(0xE4)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PMG_IO_CAPTURE_BASE));
+	IOLog("AICPUPMI: IA32_MPERF.................(0xE7)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MPERF));
+	IOLog("AICPUPMI: IA32_APERF.................(0xE8)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_APERF));
+	
+	IOLog("AICPUPMI: MSR_FLEX_RATIO.............(0x194) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_FLEX_RATIO));
+	IOLog("AICPUPMI: MSR_IA32_PERF_STATUS.......(0x198) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_STATUS));
+	IOLog("AICPUPMI: MSR_IA32_PERF_CONTROL......(0x199) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_CONTROL));
+	IOLog("AICPUPMI: IA32_CLOCK_MODULATION......(0x19A) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_CLOCK_MODULATION));
+	IOLog("AICPUPMI: IA32_THERM_STATUS..........(0x19C) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_THERM_STATUS));
+	
+	IOLog("AICPUPMI: IA32_MISC_ENABLES..........(0x1A0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MISC_ENABLES));
+	IOLog("AICPUPMI: MSR_MISC_PWR_MGMT..........(0x1AA) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_MISC_PWR_MGMT));
+	IOLog("AICPUPMI: MSR_TURBO_RATIO_LIMIT......(0x1AD) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_RATIO_LIMIT));
+	
+	IOLog("AICPUPMI: IA32_ENERGY_PERF_BIAS......(0x1B0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_ENERGY_PERF_BIAS));
+	
+	IOLog("AICPUPMI: MSR_POWER_CTL..............(0x1FC) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_POWER_CTL));
+	
+	IOLog("AICPUPMI: MSR_RAPL_POWER_UNIT........(0x606) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_RAPL_POWER_UNIT));
+	IOLog("AICPUPMI: MSR_PKG_POWER_LIMIT........(0x610) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_POWER_LIMIT));
+	IOLog("AICPUPMI: MSR_PKG_ENERGY_STATUS......(0x611) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_ENERGY_STATUS));
+	
+	IOLog("AICPUPMI: MSR_PKGC3_IRTL.............(0x60a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC3_IRTL));
+	IOLog("AICPUPMI: MSR_PKGC6_IRTL.............(0x60b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC6_IRTL));
+	IOLog("AICPUPMI: MSR_PKGC7_IRTL.............(0x60c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC7_IRTL));
+	
+	IOLog("AICPUPMI: MSR_PP0_CURRENT_CONFIG.....(0x601) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_CURRENT_CONFIG));
+	IOLog("AICPUPMI: MSR_PP0_POWER_LIMIT........(0x638) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POWER_LIMIT));
+	IOLog("AICPUPMI: MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
+	IOLog("AICPUPMI: MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
+	
+	/* IOLog("AICPUPMI: MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
+	 IOLog("AICPUPMI: MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
+	 IOLog("AICPUPMI: MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
+	 IOLog("AICPUPMI: MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY)); */
+	
+	IOLog("AICPUPMI: MSR_CONFIG_TDP_NOMINAL.....(0x648) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_NOMINAL));
+	IOLog("AICPUPMI: MSR_CONFIG_TDP_LEVEL1......(0x649) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL1));
+	IOLog("AICPUPMI: MSR_CONFIG_TDP_LEVEL2......(0x64a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL2));
+	IOLog("AICPUPMI: MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
+	IOLog("AICPUPMI: MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
+	
+	IOLog("AICPUPMI: MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
+	IOLog("AICPUPMI: MSR_PKG_C3_RESIDENCY.......(0x3f8) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C3_RESIDENCY));
+	IOLog("AICPUPMI: MSR_PKG_C6_RESIDENCY.......(0x3f9) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C6_RESIDENCY));
+	IOLog("AICPUPMI: MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
 	
 	if (gCPUModel == CPU_MODEL_HASWELL_ULT)
 	{
-		IOLog("MSR_PKG_C8_RESIDENCY.......(0x630) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
-		IOLog("MSR_PKG_C9_RESIDENCY.......(0x631) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
-		IOLog("MSR_PKG_C10_RESIDENCY......(0x632) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C8_RESIDENCY.......(0x630) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C9_RESIDENCY.......(0x631) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C10_RESIDENCY......(0x632) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
 		
-		IOLog("MSR_PKG_C8_LATENCY.........(0x633) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
-		IOLog("MSR_PKG_C9_LATENCY.........(0x634) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
-		IOLog("MSR_PKG_C10_LATENCY........(0x635) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C8_LATENCY.........(0x633) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C9_LATENCY.........(0x634) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C10_LATENCY........(0x635) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
 	}
 }
 
 //==============================================================================
 
-inline void getCStates(void *arg)
+inline void getCStates(void *magic)
 {
-	UInt8 logicalCoreNumber = cpu_number();
-
-	if ((gCoreStates & logicalCoreNumber) == 0)
+	UInt32 logicalCoreNumber = cpu_number();
+	
+	if (gCheckC3 && rdmsr64(MSR_CORE_C3_RESIDENCY) > 0)
 	{
-		gCoreStates |= (1ULL << logicalCoreNumber);
-		IOLog("Core (logical): %d\n", logicalCoreNumber);
-		IOLog("MSR_CORE_C3_RESIDENCY......(0x3fc) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_C3_RESIDENCY));
-		IOLog("MSR_CORE_C6_RESIDENCY......(0x3fd) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_C6_RESIDENCY));
-
-		if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN))
-		{
-			IOLog("MSR_CORE_C7_RESIDENCY......(0x3fe) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_C7_RESIDENCY));
-		}
+		gC3Cores |= (1 << logicalCoreNumber);
+	}
+	
+	if (gCheckC6 && rdmsr64(MSR_CORE_C6_RESIDENCY) > 0)
+	{
+		gC6Cores |= (1 << logicalCoreNumber);
+	}
+	
+	if (gCheckC7 && rdmsr64(MSR_CORE_C7_RESIDENCY) > 0)
+	{
+		gC7Cores |= (1 << logicalCoreNumber);
 	}
 }
 
@@ -105,76 +107,59 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 {
 	UInt8 currentMultiplier = (rdmsr64(MSR_IA32_PERF_STS) >> 8);
 	gCoreMultipliers |= (1ULL << currentMultiplier);
-
+	
 #if REPORT_GPU_STATS
 	UInt8 currentIgpuMultiplier = 0;
-
+	
 	if (igpuEnabled)
 	{
 		currentIgpuMultiplier = (UInt8)gMchbar[1];
 		gIGPUMultipliers |= (1ULL << currentIgpuMultiplier);
 	}
 #endif
-
+	
 	timerEventSource->setTimeoutTicks(Interval);
-
+	
 	if (loopLock)
 	{
 		return kIOReturnTimeout;
 	}
 	
 	loopLock = true;
-
+	
+#if REPORT_C_STATES
 	if (dumpCStates)
 	{
 		UInt32 magic = 0;
-		IOSimpleLockLock(simpleLock);
-		mp_rendezvous_no_intrs(getCStates, (void *)&magic);
-		IOSimpleLockUnlock(simpleLock);
+		// IOSimpleLockLock(simpleLock);
+		mp_rendezvous_no_intrs(getCStates, &magic);
+		IOSleep(1);
+		// IOSimpleLockUnlock(simpleLock);
 	}
-
+#endif
+	
+	int currentBit = 0;
+	UInt64 value = 0ULL;
+	
 #if REPORT_GPU_STATS
 	if ((gCoreMultipliers != gTriggeredPStates) || (gIGPUMultipliers != gTriggeredIGPUPStates))
 #else
-	if (gCoreMultipliers != gTriggeredPStates)
+		if (gCoreMultipliers != gTriggeredPStates)
 #endif
-	{
-		int currentBit = 0;
-		UInt64 value = 0ULL;
-
-		gTriggeredPStates = gCoreMultipliers;
-		IOLog("AICPUPMI: CPU P-States [ ");
-
-		for (currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
 		{
-			value = (1ULL << currentBit);
+			// int currentBit = 0;
+			// UInt64 value = 0ULL;
 			
-			if ((gTriggeredPStates & value) == value)
-			{
-				if (currentBit == currentMultiplier)
-				{
-					IOLog("(%d) ", currentBit);
-				}
-				else
-				{
-					IOLog("%d ", currentBit);
-				}
-			}
-		}
-
-#if REPORT_GPU_STATS
-		if (igpuEnabled)
-		{
-			gTriggeredIGPUPStates = gIGPUMultipliers;
-			IOLog("] iGPU P-States [ ");
+			gTriggeredPStates = gCoreMultipliers;
+			IOLog("AICPUPMI: CPU P-States [ ");
 			
-			for (currentBit = 1; currentBit <= 32; currentBit++)
+			for (currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
 			{
 				value = (1ULL << currentBit);
 				
-				if ((gTriggeredIGPUPStates & value) == value)
+				if ((gTriggeredPStates & value) == value)
 				{
-					if (currentBit == currentIgpuMultiplier)
+					if (currentBit == currentMultiplier)
 					{
 						IOLog("(%d) ", currentBit);
 					}
@@ -184,13 +169,92 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 					}
 				}
 			}
-		}
+			
+#if REPORT_GPU_STATS
+			if (igpuEnabled)
+			{
+				gTriggeredIGPUPStates = gIGPUMultipliers;
+				IOLog("] iGPU P-States [ ");
+				
+				for (currentBit = 1; currentBit <= 32; currentBit++)
+				{
+					value = (1ULL << currentBit);
+					
+					if ((gTriggeredIGPUPStates & value) == value)
+					{
+						if (currentBit == currentIgpuMultiplier)
+						{
+							IOLog("(%d) ", currentBit);
+						}
+						else
+						{
+							IOLog("%d ", currentBit);
+						}
+					}
+				}
+			}
 #endif
+			IOLog("]\n");
+		}
+	
+#if REPORT_C_STATES
+	if (gTriggeredC3Cores != gC3Cores)
+	{
+		gTriggeredC3Cores = gC3Cores;
+		IOLog("AICPUPMI: CPU C3-Cores [ ");
+		
+		for (currentBit = 0; currentBit <= 16; currentBit++)
+		{
+			value = (1ULL << currentBit);
+			
+			if ((gTriggeredC3Cores & value) == value)
+			{
+				IOLog("%d ", currentBit);
+			}
+		}
+		
 		IOLog("]\n");
 	}
-
+	
+	if (gTriggeredC6Cores != gC6Cores)
+	{
+		gTriggeredC6Cores = gC6Cores;
+		IOLog("AICPUPMI: CPU C6-Cores [ ");
+		
+		for (currentBit = 0; currentBit <= 16; currentBit++)
+		{
+			value = (1ULL << currentBit);
+			
+			if ((gTriggeredC6Cores & value) == value)
+			{
+				IOLog("%d ", currentBit);
+			}
+		}
+		
+		IOLog("]\n");
+	}
+	
+	if (gTriggeredC7Cores != gC7Cores)
+	{
+		gTriggeredC7Cores = gC7Cores;
+		IOLog("AICPUPMI: CPU C7-Cores [ ");
+		
+		for (currentBit = 0; currentBit <= 16; currentBit++)
+		{
+			value = (1ULL << currentBit);
+			
+			if ((gTriggeredC7Cores & value) == value)
+			{
+				IOLog("%d ", currentBit);
+			}
+		}
+		
+		IOLog("]\n");
+	}
+#endif
+	
 	loopLock = false;
-
+	
 	return kIOReturnSuccess;
 }
 
@@ -215,42 +279,43 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 	if (IOService::start(provider))
 	{
 		simpleLock = IOSimpleLockAlloc();
-
+		
 		if (simpleLock)
 		{
 			timerEventSource = IOTimerEventSource::timerEventSource(this, OSMemberFunctionCast(IOTimerEventSource::Action, this, &AppleIntelCPUPowerManagementInfo::loopTimerEvent));
 			workLoop = getWorkLoop();
-
+			
 			if (timerEventSource && workLoop && (kIOReturnSuccess == workLoop->addEventSource(timerEventSource)))
 			{
 				this->registerService(0);
-
+				
 				UInt64  msr = rdmsr64(MSR_IA32_PERF_STS);
 				gCoreMultipliers |= (1ULL << (msr >> 8));
-
-				wrmsr64(IA32_ENERGY_PERF_BIAS, 15);
+				
+				// wrmsr64(IA32_ENERGY_PERF_BIAS, 15);
+				// wrmsr64(MSR_IA32_PERF_CONTROL, 0x2000);
 				
 				uint32_t cpuid_reg[4];
 				do_cpuid(0x00000001, cpuid_reg);
-
+				
 				gCPUModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
-
+				
 				// MWAIT information
 				do_cpuid(0x00000005, cpuid_reg);
 				uint32_t supportedMwaitCStates = bitfield32(cpuid_reg[edx], 31,  0);
-
+				
 				IOLog("AICPUPMI: MWAIT C-States     : %d\n", supportedMwaitCStates);
-
+				
 #if REPORT_MSRS
 				reportMSRs();
 #endif
 				msr = rdmsr64(MSR_PLATFORM_INFO);
 				gMinRatio = (UInt8)((msr >> 40) & 0xff);
 				IOLog("AICPUPMI: Low Frequency Mode : %d00 MHz\n", gMinRatio);
- 
+				
 				gClockRatio = (UInt8)((msr >> 8) & 0xff);
 				IOLog("AICPUPMI: Clock Speed        : %d00 MHz\n", gClockRatio);
-
+				
 				if (!((rdmsr64(IA32_MISC_ENABLES) >> 32) & 0x40))	// Turbo Mode Enabled?
 				{
 					msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
@@ -262,39 +327,55 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 					gMaxRatio = gClockRatio;
 					IOLog("AICPUPMI: Max Frequency      : %d00 MHz\n", gMaxRatio);
 				}
-
+				
 #if REPORT_GPU_STATS
 				if ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK))
 				{
 					IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
 					memDescriptor = IOMemoryDescriptor::withPhysicalAddress(address, 0x53, kIODirectionInOut);
-				
+					
 					if (memDescriptor != NULL)
 					{
 						if ((result = memDescriptor->prepare()) == kIOReturnSuccess)
 						{
 							memoryMap = memDescriptor->map();
-						
+							
 							if (memoryMap != NULL)
 							{
 								igpuEnabled = true; // IGPU Enabled and Visible
 								gMchbar = (UInt8 *)memoryMap->getVirtualAddress();
 								
-								// Current RP-state, when the graphics engine is in RC6, this reflects the last used ratio.
-								IOLog("AICPUPMI: IGPU Current Freq..: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x01])); // RP_STATE_RAT IO
+								// Preventing a stupid (UEFI) BIOS limit.
+								if (gMchbar[0x4C] < gMchbar[0x50])
+								{
+									gMchbar[0x4C] = gMchbar[0x50];
+								}
+								
+								//
+								// Examples:
+								//			17 (multiplier) * 50 (frequency in MHz) =  850 MHz
+								//			22 (multiplier) * 50 (frequency in MHz) = 1100 MHz
+								//			6 P-States: 850, 900, 950, 1000, 1050 and 1100 MHz
+								//
+								//
+								// Current RP-State, when the graphics engine is in RC6, this reflects the last used ratio.
+								IOLog("AICPUPMI: IGPU Current Frequency..: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x01])); // RP_STATE_RATIO (CURRENT_FREQUENCY)
 								// Maximum RPN base frequency capability for the Integrated GFX Engine (GT).
-								IOLog("AICPUPMI: IGPU Max Frequency.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x52])); // RPN_CAP
+								IOLog("AICPUPMI: IGPU Min Frequency......: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x52])); // RPN_CAP (MIN_FREQUENCY)
 								// Maximum RP1 base frequency capability for the Integrated GFX Engine (GT).
-								IOLog("AICPUPMI: IGPU Max Frequency.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x51])); // RP1_CAP
+								IOLog("AICPUPMI: IGPU Max Non-Turbo Freq.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x51])); // RP1_CAP (MAX_NON_TURBO)
 								// Maximum RP0 base frequency capability for the Integrated GFX Engine (GT).
-								IOLog("AICPUPMI: IGPU Max Turbo Freq: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x50])); // RP0_CAP
+								IOLog("AICPUPMI: IGPU Max Turbo Frequency: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x50])); // RP0_CAP (MAX_TURBO))
+								
 								// Maximum base frequency limit for the Integrated GFX Engine (GT) allowed during run-time.
-								IOLog("AICPUPMI: IGPU Maximum limit.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x4C])); // RPSTT_LIM
-								//
-								// Example-1: 17 (multiplier) * 50 (frequency in MHz) =  850 MHz
-								// Example-2: 22 (multiplier) * 50 (frequency in MHz) = 1100 MHz
-								// 6 P-States: 850, 900, 950, 1000, 1050 and 1100 MHz
-								//
+								if (gMchbar[0x4C] == 255)
+								{
+									IOLog("AICPUPMI: IGPU Maximum limit......: No Limit\n"); // RPSTT_LIM
+								}
+								else
+								{
+									IOLog("AICPUPMI: IGPU Maximum limit......: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x4C])); // RPSTT_LIM
+								}
 							}
 							else
 							{
@@ -312,13 +393,20 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 					}
 				}
 #endif
+				
+#if REPORT_C_STATES
+				if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN) || (gCPUModel == CPU_MODEL_HASWELL))
+				{
+					gCheckC7 = true;
+				}
+#endif
 				timerEventSource->setTimeoutMS(1000);
-
+				
 				return true;
 			}
 		}
 	}
-
+	
 	return false;
 }
 
@@ -330,7 +418,7 @@ void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
 	{
 		IOSimpleLockFree(simpleLock);
 	}
-
+	
 	if (timerEventSource)
 	{
 		if (workLoop)
@@ -338,11 +426,11 @@ void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
 			timerEventSource->cancelTimeout();
 			workLoop->removeEventSource(timerEventSource);
 		}
-
+		
 		timerEventSource->release();
 		timerEventSource = NULL;
 	}
-
+	
 	super::stop(provider);
 }
 
@@ -358,7 +446,7 @@ void AppleIntelCPUPowerManagementInfo::free()
 			memoryMap->release();
 			memoryMap = NULL;
 		}
-
+		
 		if (memDescriptor)
 		{
 			memDescriptor->release();
@@ -366,6 +454,6 @@ void AppleIntelCPUPowerManagementInfo::free()
 		}
 	}
 #endif
-
+	
 	super::free();
-}
+}
\ No newline at end of file
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index f161451..034489e 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -23,6 +23,7 @@
 
 #define REPORT_MSRS			1
 #define REPORT_GPU_STATS	1
+#define REPORT_C_STATES		1
 
 #define NB_BUS	0x00
 #define NB_DEV	0x00
@@ -46,12 +47,12 @@
 #define IGPU_RATIO_TO_FREQUENCY(ratio)	((ratio * 100) / 2)
 
 #define NB_PCI_CFG_ADDRESS(bus, dev, func, reg) \
-	(UInt64) ((((UInt8)(bus) << 24) + ((UInt8)(dev) << 16) + \
-	((UInt8)(func) << 8) + ((UInt8)(reg))) & 0xffffffff)
+(UInt64) ((((UInt8)(bus) << 24) + ((UInt8)(dev) << 16) + \
+((UInt8)(func) << 8) + ((UInt8)(reg))) & 0xffffffff)
 
 #define NB_PCIE_CFG_ADDRESS(bus, dev, func, reg) \
-	((UInt32)(PCIEX_BASE_ADDRESS + ((UInt8)(bus) << 20) + \
-	((UInt8)(dev) << 15) + ((UInt8)(func) << 12) + (reg)))
+((UInt32)(PCIEX_BASE_ADDRESS + ((UInt8)(bus) << 20) + \
+((UInt8)(dev) << 15) + ((UInt8)(func) << 12) + (reg)))
 
 static __inline__ unsigned char inb(UInt16 port)
 {
@@ -69,7 +70,8 @@ UInt8 ReadPci8(UInt8 Bus, UInt8 Dev, UInt8 Fun, UInt16 Reg)
 {
 	if (Reg >= 0x100)
 	{
-		return MMIO_READ8(NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
+		// return MMIO_READ8(NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
+		return MMIO_READ8((UInt64)NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
 	}
 	else
 	{
@@ -84,41 +86,41 @@ extern "C" int cpu_number(void);
 class AppleIntelCPUPowerManagementInfo : public IOService
 {
 	OSDeclareDefaultStructors (AppleIntelCPUPowerManagementInfo);
-
+	
 private:
 	IOSimpleLock		*simpleLock;
 	IOWorkLoop			*workLoop;
 	IOTimerEventSource	*timerEventSource;
-
+	
 #if REPORT_GPU_STATS
 	IOMemoryDescriptor	*memDescriptor;
 	IOMemoryMap			*memoryMap;
 #endif
-
+	
 	IOReturn result		= kIOReturnSuccess;
-
+	
 	virtual IOReturn loopTimerEvent(void);
-
+	
 	void reportMSRs(void);
-
+	
 	bool loopLock = false;
-	bool dumpCStates = false;
-	bool igpuEnabled = false;
-
+	bool dumpCStates = true;
+	bool igpuEnabled = true;
+	
 	UInt16 Interval	= 50;
-
+	
 	UInt64	gCoreMultipliers		= 0ULL;
 	UInt64	gTriggeredPStates		= 0ULL;
-
+	
 	UInt64	gIGPUMultipliers		= 0ULL;
 	UInt64	gTriggeredIGPUPStates	= 0ULL;
-
+	
 public:
 	virtual IOService *	probe(IOService * provider, SInt32 * score);
 	virtual bool start(IOService * provider);
 	virtual void stop(IOService * provider);
 	virtual void free(void);
-
+	
 	UInt8	gMinRatio	= 0;
 	UInt8	gClockRatio	= 0;
 	UInt8	gMaxRatio	= 0;
@@ -129,6 +131,22 @@ OSDefineMetaClassAndStructors(AppleIntelCPUPowerManagementInfo, IOService)
 UInt8	gCPUModel	= 0x2A;
 UInt8	gCoreStates	= 0ULL;
 
-#if REPORT_GPU_STATS
-	UInt8	* gMchbar	= NULL;
+#if REPORT_C_STATES
+bool	gCheckC3	= true;
+bool	gCheckC6	= true;
+bool	gCheckC7	= false;
+
+UInt32	gC3Cores	= 0;
+UInt32	gC6Cores	= 0;
+UInt32	gC7Cores	= 0;
+
+UInt32	gTriggeredC3Cores	= 0;
+UInt32	gTriggeredC6Cores	= 0;
+UInt32	gTriggeredC7Cores	= 0;
 #endif
+
+UInt64	gCoreMultipliers = 0ULL;
+
+#if REPORT_GPU_STATS
+UInt8	* gMchbar	= NULL;
+#endif
\ No newline at end of file

From cf20c2cf2b827c3168d841309d5080cd8f71bac6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 30 Dec 2013 11:29:18 +0100
Subject: [PATCH 423/623] Updating script to v7.3 (from Lexar)

This is a major update and may not work for you.
Please report all bugs per e-mail. Thank you!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2873 +++++++++++++-------------
 1 file changed, 1478 insertions(+), 1395 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 61af213..c6a68f4 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -2,8 +2,8 @@
 #
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
-# Version 0.9 - Copyright (c) 2012 by † RevoGirl
-# Version 7.0 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 0.9 - Copyright (c) 2012 by RevoGirl
+# Version 7.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -77,7 +77,7 @@
 #			- board-id's for new iMac14,[1/2/3] added (Pike, October 2013)
 #			- board-id's for new MacBookPro11,[1/2/3] added (Pike, October 2013)
 #			- Cleanups and board-id for new MacPro6,1 added (Pike, October 2013)
-#			- Frequency error in i7-4700MQ data fixed, thanks to RehabMan (Pike, November 2013)
+#			– Frequency error in i7-4700MQ data fixed, thanks to RehabMan (Pike, November 2013)
 #			- Intel i5-4200M added (Pike, December 2013)
 #			- LFM fixed in the Intel i7-3930K data (Pike, December 2013)
 #
@@ -162,8 +162,9 @@ let gCallIasl=1
 #
 let gCallOpen=0
 
-#
-# Change this to 0 to stop it from injecting debug data.
+# 0 = no debug injection/debug statements executed.
+# 1 = inject debug data.
+# 3 = inject debug data and execute _debugPrint statements.
 #
 let gDebug=1
 
@@ -186,7 +187,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=7.0
+gScriptVersion=7.3
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -219,6 +220,10 @@ gProcessorNumber=""
 gBusFrequency=100
 let gUnmountEFIPartition=0
 
+gProductName=$(sw_vers -productName)
+gProductVersion="$(sw_vers -productVersion)"
+gBuildVersion=$(sw_vers -buildVersion)
+
 #
 # Maximum Turbo Clock Speed (user configurable)
 #
@@ -261,8 +266,8 @@ E3-1220,80,0,3100,3400,4,4
 gDesktopSandyBridgeCPUList=(
 i7-35355,120,1600,2666,2666,4,4
 # i7 Desktop Extreme Series
-i7-3970X,150,0,3500,4000,6,12
-i7-3960X,130,0,3300,3900,6,12
+i7-3970X,150,1200,3500,4000,6,12
+i7-3960X,130,1200,3300,3900,6,12
 i7-3930K,130,1200,3200,3800,6,12
 i7-3820,130,0,3600,3800,4,8
 # i7 Desktop series
@@ -557,142 +562,157 @@ i3-4010Y,12,800,1300,1300,2,4
 
 function _printHeader()
 {
-echo '/*'                                                                             >  $gSsdtPR
-echo ' * Intel ACPI Component Architecture'                                           >> $gSsdtPR
-echo ' * AML Disassembler version 20130210-00 [Feb 10 2013]'                          >> $gSsdtPR
-echo ' * Copyright (c) 2000 - 2013 Intel Corporation'                                 >> $gSsdtPR
-echo ' * '                                                                            >> $gSsdtPR
-echo ' * Original Table Header:'                                                      >> $gSsdtPR
-echo ' *     Signature        "SSDT"'                                                 >> $gSsdtPR
-echo ' *     Length           0x0000036A (874)'                                       >> $gSsdtPR
-echo ' *     Revision         0x01'                                                   >> $gSsdtPR
-echo ' *     Checksum         0x00'                                                   >> $gSsdtPR
-echo ' *     OEM ID           "APPLE "'                                               >> $gSsdtPR
-echo ' *     OEM Table ID     "CpuPm"'                                                >> $gSsdtPR
-printf ' *     OEM Revision     '$gRevision' (%d)\n' $gRevision                         >> $gSsdtPR
-echo ' *     Compiler ID      "INTL"'                                                 >> $gSsdtPR
-echo ' *     Compiler Version 0x20130210 (538116624)'                                 >> $gSsdtPR
-echo ' */'                                                                            >> $gSsdtPR
-echo ''                                                                               >> $gSsdtPR
-echo 'DefinitionBlock ("'$gSsdtID'.aml", "SSDT", 1, "APPLE ", "CpuPm", '$gRevision')' >> $gSsdtPR
-echo '{'                                                                              >> $gSsdtPR
+    echo '/*'                                                                             >  $gSsdtPR
+    echo ' * Intel ACPI Component Architecture'                                           >> $gSsdtPR
+    echo ' * AML Disassembler version 20130210-00 [Feb 10 2013]'                          >> $gSsdtPR
+    echo ' * Copyright (c) 2000 - 2013 Intel Corporation'                                 >> $gSsdtPR
+    echo ' * '                                                                            >> $gSsdtPR
+    echo ' * Original Table Header:'                                                      >> $gSsdtPR
+    echo ' *     Signature        "SSDT"'                                                 >> $gSsdtPR
+    echo ' *     Length           0x0000036A (874)'                                       >> $gSsdtPR
+    echo ' *     Revision         0x01'                                                   >> $gSsdtPR
+    echo ' *     Checksum         0x00'                                                   >> $gSsdtPR
+    echo ' *     OEM ID           "APPLE "'                                               >> $gSsdtPR
+    echo ' *     OEM Table ID     "CpuPm"'                                                >> $gSsdtPR
+  printf ' *     OEM Revision     '$gRevision' (%d)\n' $gRevision                         >> $gSsdtPR
+    echo ' *     Compiler ID      "INTL"'                                                 >> $gSsdtPR
+    echo ' *     Compiler Version 0x20130210 (538116624)'                                 >> $gSsdtPR
+    echo ' */'                                                                            >> $gSsdtPR
+    echo ''                                                                               >> $gSsdtPR
+    echo 'DefinitionBlock ("'$gSsdtID'.aml", "SSDT", 1, "APPLE ", "CpuPm", '$gRevision')' >> $gSsdtPR
+    echo '{'                                                                              >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
 function _printExternals()
 {
-let currentCPU=0;
+    let currentCPU=0;
 
-while [ $currentCPU -lt $gLogicalCPUs ]; do
-echo '    External ('${gScope}'.'${gProcessorNames[$currentCPU]}', DeviceObj)'  >> $gSsdtPR
-let currentCPU+=1
-done
+    while [ $currentCPU -lt $gLogicalCPUs ]; do
+        echo '    External ('${gScope}'.'${gProcessorNames[$currentCPU]}', DeviceObj)'  >> $gSsdtPR
+        let currentCPU+=1
+    done
 
-echo ''                                                                             >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
-function _printDebugInfo()
+function _injectDebugInfo()
 {
-if ((gDebug)); then
-echo '    Store ("ssdtPRGen version: '$gScriptVersion'", Debug)'                >> $gSsdtPR
-echo '    Store ("baseFrequency    : '$gBaseFrequency'", Debug)'                >> $gSsdtPR
-echo '    Store ("frequency        : '$frequency'", Debug)'                     >> $gSsdtPR
-echo '    Store ("busFrequency     : '$gBusFrequency'", Debug)'                 >> $gSsdtPR
-echo '    Store ("logicalCPUs      : '$gLogicalCPUs'", Debug)'                  >> $gSsdtPR
-echo '    Store ("tdp              : '$gTdp'", Debug)'                          >> $gSsdtPR
-echo '    Store ("packageLength    : '$packageLength'", Debug)'                 >> $gSsdtPR
-echo '    Store ("turboStates      : '$turboStates'", Debug)'                   >> $gSsdtPR
-echo '    Store ("maxTurboFrequency: '$maxTurboFrequency'", Debug)'             >> $gSsdtPR
-echo ''                                                                         >> $gSsdtPR
-fi
+    xcpm=0
+
+    #
+    # 'machdep.xcpm' is introduced in 10.8.5
+    #
+    if [[ $productVersion > "10.8.4" ]]; then
+      xcpm=$(/usr/sbin/sysctl -n machdep.xcpm.mode)
+    fi
+
+    echo '        Method (_INI, 0, NotSerialized)'                                      >> $gSsdtPR
+    echo '        {'                                                                    >> $gSsdtPR
+    echo '            Store ("ssdtPRGen version: '$gScriptVersion' / '$gProductName' '$gProductVersion' ('$gBuildVersion')", Debug)'  >> $gSsdtPR
+    echo '            Store ("baseFrequency    : '$gBaseFrequency'", Debug)'            >> $gSsdtPR
+    echo '            Store ("frequency        : '$frequency'", Debug)'                 >> $gSsdtPR
+    echo '            Store ("busFrequency     : '$gBusFrequency'", Debug)'             >> $gSsdtPR
+    echo '            Store ("logicalCPUs      : '$gLogicalCPUs'", Debug)'              >> $gSsdtPR
+    echo '            Store ("tdp              : '$gTdp'", Debug)'                      >> $gSsdtPR
+    echo '            Store ("packageLength    : '$packageLength'", Debug)'             >> $gSsdtPR
+    echo '            Store ("turboStates      : '$turboStates'", Debug)'               >> $gSsdtPR
+    echo '            Store ("maxTurboFrequency: '$maxTurboFrequency'", Debug)'         >> $gSsdtPR
+    echo '            Store ("machdep.xcpm.mode: '$xcpm'", Debug)'                      >> $gSsdtPR
+    echo '        }'                                                                    >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
 function _printProcessorDefinitions()
 {
-let currentCPU=0;
+    let currentCPU=0;
 
-while [ $currentCPU -lt $1 ]; do
-echo '    External ('${gScope}'.'${gProcessorNames[$currentCPU]}', DeviceObj)'  >> $gSsdtPR
-let currentCPU+=1
-done
+    while [ $currentCPU -lt $1 ]; do
+        echo '    External ('${gScope}'.'${gProcessorNames[$currentCPU]}', DeviceObj)'  >> $gSsdtPR
+        let currentCPU+=1
+    done
 
-echo ''                                                                             >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
 function _printScopeStart()
 {
-let turboStates=$1
-let packageLength=$2
-
-# TODO: Remove this when CPUPM for IB works properly!
-let useWorkArounds=0
-
-echo '    Scope ('${gScope}'.'${gProcessorNames[0]}')'                              >> $gSsdtPR
-echo '    {'                                                                        >> $gSsdtPR
-
-#
-# Do we need to create additional (Low Frequency) P-States?
-#
-
-if [ $gBridgeType -eq $IVY_BRIDGE ];
-then
-let lowFrequencyPStates=($gBaseFrequency/100)-8
-let packageLength=($2+$lowFrequencyPStates)
-
-printf "        Name (APLF, 0x%02x" $lowFrequencyPStates                    >> $gSsdtPR
-echo ')'                                                                    >> $gSsdtPR
-
-# TODO: Remove this when CPUPM for IB works properly!
-if ((gIvyWorkAround)); then
-let useWorkArounds=1
-fi
-fi
-
-#
-# Check number of Turbo states (for IASL optimization).
-#
-
-if [ $turboStates -eq 0 ];
-then
-# TODO: Remove this when CPUPM for IB works properly!
-if (($useWorkArounds));
-then
-echo '        Name (APSN, One)'                                     >> $gSsdtPR
-else
-echo '        Name (APSN, Zero)'                                    >> $gSsdtPR
-fi
-else
-# TODO: Remove this when CPUPM for IB works properly!
-if ((useWorkArounds)); then
-let turboStates+=1
-fi
-
-printf "        Name (APSN, 0x%02X)\n" $turboStates                           >> $gSsdtPR
-fi
-
-# TODO: Remove this when CPUPM for IB works properly!
-if (($useWorkArounds)); then
-let packageLength+=1
-fi
-
-printf "        Name (APSS, Package (0x%02X)\n" $packageLength                        >> $gSsdtPR
-echo '        {'                                                                    >> $gSsdtPR
-
-# TODO: Remove this when CPUPM for IB works properly!
-if (($useWorkArounds)); then
-let extraF=($maxTurboFrequency+1)
-let maxTDP=($gTdp*1000)
-let extraR=($maxTurboFrequency/100)+1
-echo "            /* Workaround for the Ivy Bridge PM 'bug' */"                 >> $gSsdtPR
-printf "            Package (0x06) { 0x%04X, 0x%06X, 0x0A, 0x0A, 0x%02X00, 0x%02X00 },\n" $extraF $maxTDP $extraR $extraR >> $gSsdtPR
-fi
+    let turboStates=$1
+    let packageLength=$2
+
+    # TODO: Remove this when CPUPM for IB works properly!
+    let useWorkArounds=0
+
+    echo '    Scope ('${gScope}'.'${gProcessorNames[0]}')'                              >> $gSsdtPR
+    echo '    {'                                                                        >> $gSsdtPR
+
+    if (( gDebug & 1 )); then
+        _injectDebugInfo
+    fi
+
+    #
+    # Do we need to create additional (Low Frequency) P-States?
+    #
+
+    if [ $gBridgeType -ne $SANDY_BRIDGE ];
+        then
+            let lowFrequencyPStates=($gBaseFrequency/100)-8
+            let packageLength=($2+$lowFrequencyPStates)
+
+            printf "        Name (APLF, 0x%02x" $lowFrequencyPStates                    >> $gSsdtPR
+            echo ')'                                                                    >> $gSsdtPR
+
+            # TODO: Remove this when CPUPM for IB works properly!
+            if [[ gIvyWorkAround && $gBridgeType -eq $IVY_BRIDGE ]]; then
+                let useWorkArounds=1
+            fi
+    fi
+
+    #
+    # Check number of Turbo states (for IASL optimization).
+    #
+
+    if [ $turboStates -eq 0 ];
+        then
+            # TODO: Remove this when CPUPM for IB works properly!
+            if (($useWorkArounds));
+                then
+                    echo '        Name (APSN, One)'                                     >> $gSsdtPR
+                else
+                    echo '        Name (APSN, Zero)'                                    >> $gSsdtPR
+            fi
+        else
+          # TODO: Remove this when CPUPM for IB works properly!
+          if ((useWorkArounds)); then
+              let turboStates+=1
+          fi
+
+          printf "        Name (APSN, 0x%02X)\n" $turboStates                           >> $gSsdtPR
+    fi
+
+    # TODO: Remove this when CPUPM for IB works properly!
+    if (($useWorkArounds)); then
+        let packageLength+=1
+    fi
+
+  printf "        Name (APSS, Package (0x%02X)\n" $packageLength                        >> $gSsdtPR
+    echo '        {'                                                                    >> $gSsdtPR
+
+    # TODO: Remove this when CPUPM for IB works properly!
+    if (($useWorkArounds)); then
+        let extraF=($maxTurboFrequency+1)
+        let maxTDP=($gTdp*1000)
+        let extraR=($maxTurboFrequency/100)+1
+        echo "            /* Workaround for the Ivy Bridge PM 'bug' */"                 >> $gSsdtPR
+      printf "            Package (0x06) { 0x%04X, 0x%06X, 0x0A, 0x0A, 0x%02X00, 0x%02X00 },\n" $extraF $maxTDP $extraR $extraR >> $gSsdtPR
+    fi
 }
 
 
@@ -700,102 +720,119 @@ fi
 
 function _printPackages()
 {
-let maxTDP=($1*1000)
-local maxNonTurboFrequency=$2
-local frequency=$3
-
-let minRatio=($gBaseFrequency/$gBusFrequency)
-let p1Ratio=($maxNonTurboFrequency/$gBusFrequency)
-let ratio=($frequency/$gBusFrequency)
-let powerRatio=($p1Ratio-1)
-
-#
-# Do we need to create additional (Low Frequency) P-States for Ivy bridge?
-#
-if [ $gBridgeType -eq $IVY_BRIDGE ]; then
-let minRatio=8
-fi
-
-if (($turboStates)); then
-echo '            /* High Frequency Modes (turbo) */'                           >> $gSsdtPR
-fi
-
-while [ $ratio -ge $minRatio ];
-do
-if [ $frequency -eq $gBaseFrequency ];
-then
-echo '            /* Low Frequency Mode */'                         >> $gSsdtPR
-fi
-
-if [ $frequency -eq $maxNonTurboFrequency ];
-then
-echo '            /* High Frequency Modes (non-turbo) */'           >> $gSsdtPR
-fi
-
-printf "            Package (0x06) { 0x%04X, " $frequency                   >> $gSsdtPR
-
-if [ $frequency -lt $maxNonTurboFrequency ];
-then
-power=$(echo "scale=6;m=((1.1-(($p1Ratio-$powerRatio)*0.00625))/1.1);(($powerRatio/$p1Ratio)*(m*m)*$maxTDP);" | bc | sed -e 's/.[0-9A-F]*$//')
-let powerRatio-=1
-else
-power=$maxTDP
-fi
-
-if [ $frequency -ge $gBaseFrequency ];
-then
-printf "0x%06X, " $power                                            >> $gSsdtPR
-else
-printf '    Zero, '                                                 >> $gSsdtPR
-fi
-
-printf "0x0A, 0x0A, 0x%02X00, 0x%02X00 }" $ratio $ratio                     >> $gSsdtPR
-
-let ratio-=1
-let frequency-=$gBusFrequency
+    let maxTDP=($1*1000)
+    local maxNonTurboFrequency=$2
+    local frequency=$3
+
+    let minRatio=($gBaseFrequency/$gBusFrequency)
+    let p1Ratio=($maxNonTurboFrequency/$gBusFrequency)
+    let ratio=($frequency/$gBusFrequency)
+    let powerRatio=($p1Ratio-1)
+
+    #
+    # Do we need to create additional (Low Frequency) P-States for Ivy bridge?
+    #
+    if [ $gBridgeType -eq $IVY_BRIDGE ]; then
+        let minRatio=8
+    fi
+
+    if (($turboStates)); then
+        echo '            /* High Frequency Modes (turbo) */'                           >> $gSsdtPR
+    fi
+
+    while [ $ratio -ge $minRatio ];
+        do
+            if [ $frequency -eq $gBaseFrequency ];
+                then
+                    echo '            /* Low Frequency Mode */'                         >> $gSsdtPR
+            fi
+
+            if [ $frequency -eq $maxNonTurboFrequency ];
+                then
+                    echo '            /* High Frequency Modes (non-turbo) */'           >> $gSsdtPR
+            fi
+
+            printf "            Package (0x06) { 0x%04X, " $frequency                   >> $gSsdtPR
+
+            if [ $frequency -lt $maxNonTurboFrequency ];
+                then
+                    power=$(echo "scale=6;m=((1.1-(($p1Ratio-$powerRatio)*0.00625))/1.1);(($powerRatio/$p1Ratio)*(m*m)*$maxTDP);" | bc | sed -e 's/.[0-9A-F]*$//')
+                    let powerRatio-=1
+                else
+                    power=$maxTDP
+            fi
+
+            if [ $frequency -ge $gBaseFrequency ];
+                then
+                    printf "0x%06X, " $power                                            >> $gSsdtPR
+                else
+                    printf '    Zero, '                                                 >> $gSsdtPR
+            fi
+
+            printf "0x0A, 0x0A, 0x%02X00, 0x%02X00 }" $ratio $ratio                     >> $gSsdtPR
+
+            let ratio-=1
+            let frequency-=$gBusFrequency
+
+            if [ $ratio -ge $minRatio ];
+                then
+                    echo ','                                                            >> $gSsdtPR
+                else
+                    echo ''                                                             >> $gSsdtPR
+            fi
+
+        done
+
+    echo '        })'                                                                   >> $gSsdtPR
+}
 
-if [ $ratio -ge $minRatio ];
-then
-echo ','                                                            >> $gSsdtPR
-else
-echo ''                                                             >> $gSsdtPR
-fi
 
-done
+#--------------------------------------------------------------------------------
 
-echo '        })'                                                                   >> $gSsdtPR
-echo ''                                                                             >> $gSsdtPR
+function _printMethodDSM()
+{
+    #
+    # New stand-alone version of Method _DSM - Copyright (c) 2009 by Master Chief
+    #
+    echo ''                                                                             >> $gSsdtPR
+    echo '        Method (_DSM, 4, NotSerialized)'                                      >> $gSsdtPR
+    echo '        {'                                                                    >> $gSsdtPR
+
+    if ((gDebug)); then
+        #
+        # Note: This will be called twice!
+        #
+        echo '            Store ("Method '${gProcessorNames[0]}'._DSM Called", Debug)'  >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+    fi
+
+    echo '            If (LEqual (Arg2, Zero))'                                         >> $gSsdtPR
+    echo '            {'                                                                >> $gSsdtPR
+    echo '                Return (Buffer (One)'                                         >> $gSsdtPR
+    echo '                {'                                                            >> $gSsdtPR
+    echo '                    0x03'                                                     >> $gSsdtPR
+    echo '                })'                                                           >> $gSsdtPR
+    echo '            }'                                                                >> $gSsdtPR
+    echo ''                                                                             >> $gSsdtPR
+    #
+    # This property is required to get X86Platform[Plugin/Shim].kext loaded.
+    #
+    echo '            Return (Package (0x02)'                                           >> $gSsdtPR
+    echo '            {'                                                                >> $gSsdtPR
+    echo '                "plugin-type",'                                               >> $gSsdtPR
+    echo '                One'                                                          >> $gSsdtPR
+    echo '            })'                                                               >> $gSsdtPR
+    echo '        }'                                                                    >> $gSsdtPR
+    echo '    }'                                                                        >> $gSsdtPR
 }
 
-
 #--------------------------------------------------------------------------------
 
-function _printMethodDSM()
+function _debugPrint()
 {
-#
-# New stand-alone version of Method _DSM - Copyright (c) 2009 by Master Chief
-#
-echo ''                                                                             >> $gSsdtPR
-echo '        Method (_DSM, 4, NotSerialized)'                                      >> $gSsdtPR
-echo '        {'                                                                    >> $gSsdtPR
-echo '            If (LEqual (Arg2, Zero))'                                         >> $gSsdtPR
-echo '            {'                                                                >> $gSsdtPR
-echo '                Return (Buffer (One)'                                         >> $gSsdtPR
-echo '                {'                                                            >> $gSsdtPR
-echo '                    0x03'                                                     >> $gSsdtPR
-echo '                })'                                                           >> $gSsdtPR
-echo '            }'                                                                >> $gSsdtPR
-echo ''                                                                             >> $gSsdtPR
-#
-# This property is required to get X86Platform[Plugin/Shim].kext loaded.
-#
-echo '            Return (Package (0x02)'                                           >> $gSsdtPR
-echo '            {'                                                                >> $gSsdtPR
-echo '                "plugin-type",'                                               >> $gSsdtPR
-echo '                One'                                                          >> $gSsdtPR
-echo '            })'                                                               >> $gSsdtPR
-echo '        }'                                                                    >> $gSsdtPR
-echo '    }'                                                                        >> $gSsdtPR
+    if (( gDebug & 2 )); then
+        echo "$1"
+    fi
 }
 
 #--------------------------------------------------------------------------------
@@ -814,223 +851,240 @@ function _printScopeACST()
 #
 # Note: C-state latency in uS and C-state power in mW.
 
-let C1=0
-let C2=0
-let C3=0
-let C6=0
-let C7=0
-local pkgLength=2
-local numberOfCStates=0
-
-#   echo ''                                                                             >> $gSsdtPR
-echo '        Method (ACST, 0, NotSerialized)'                                      >> $gSsdtPR
-echo '        {'                                                                    >> $gSsdtPR
-
-#
-# Are we injecting C-States for CPU1?
-#
-if [ $1 -eq 1 ];
-then
-# Yes (also used by CPU2, CPU3 and greater).
-let targetCStates=$gACST_CPU1
-latency_C1=0x03E8
-latency_C2=0x94
-latency_C3=0xC6
-
-if ((gDebug)); then
-echo '            Store ("'${gProcessorNames[1]}' C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
-echo ''                                                                 >> $gSsdtPR
-fi
-else
-#
-# C-States override for Mobile processors (CPU0 only)
-#
-if (($gTypeCPU == $gMobileCPU)); then
-echo 'Adjusting C-States for detected (mobile) processor'
-gACST_CPU0=29
-fi
-
-let targetCStates=$gACST_CPU0
-latency_C1=Zero
-latency_C3=0xCD
-latency_C6=0xF5
-latency_C7=0xF5
-
-if ((gDebug)); then
-echo '            Store ("'${gProcessorNames[0]}' C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
-echo ''                                                                 >> $gSsdtPR
-fi
-fi
-
-#
-# Checks to determine which C-State(s) we should inject.
-#
-if (($targetCStates & 1)); then
-let C1=1
-let numberOfCStates+=1
-let pkgLength+=1
-fi
-
-if (($targetCStates & 2)); then
-let C2=1
-let numberOfCStates+=1
-let pkgLength+=1
-fi
-
-if (($targetCStates & 4)); then
-let C3=1
-let numberOfCStates+=1
-let pkgLength+=1
-fi
-
-if (($targetCStates & 8)); then
-let C6=1
-let numberOfCStates+=1
-let pkgLength+=1
-fi
-
-if (($targetCStates & 16)); then
-let C7=1
-let numberOfCStates+=1
-let pkgLength+=1
-fi
-
-let hintCode=0x00
-
-echo "            /* Low Power Modes for ${gProcessorNames[$1]} */"                 >> $gSsdtPR
-printf "            Return (Package (0x%02x)\n" $pkgLength                            >> $gSsdtPR
-echo '            {'                                                                >> $gSsdtPR
-echo '                One,'                                                         >> $gSsdtPR
-printf "                0x%02x,\n" $numberOfCStates                                   >> $gSsdtPR
-echo '                Package (0x04)'                                               >> $gSsdtPR
-echo '                {'                                                            >> $gSsdtPR
-echo '                    ResourceTemplate ()'                                      >> $gSsdtPR
-echo '                    {'                                                        >> $gSsdtPR
-echo '                        Register (FFixedHW,'                                  >> $gSsdtPR
-echo '                            0x01,               // Bit Width'                 >> $gSsdtPR
-echo '                            0x02,               // Bit Offset'                >> $gSsdtPR
-printf "                            0x%016x, // Address\n" $hintCode                  >> $gSsdtPR
-echo '                            0x01,               // Access Size'               >> $gSsdtPR
-echo '                            )'                                                >> $gSsdtPR
-echo '                    },'                                                       >> $gSsdtPR
-echo '                    One,'                                                     >> $gSsdtPR
-echo '                    '$latency_C1','                                           >> $gSsdtPR
-echo '                    0x03E8'                                                   >> $gSsdtPR
-
-if (($C2)); then
-let hintCode+=0x10
-echo '                },'                                                       >> $gSsdtPR
-echo ''                                                                         >> $gSsdtPR
-echo '                Package (0x04)'                                           >> $gSsdtPR
-echo '                {'                                                        >> $gSsdtPR
-echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
-echo '                    {'                                                    >> $gSsdtPR
-echo '                        Register (FFixedHW,'                              >> $gSsdtPR
-echo '                            0x01,               // Bit Width'             >> $gSsdtPR
-echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
-printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
-echo '                            0x03,               // Access Size'           >> $gSsdtPR
-echo '                            )'                                            >> $gSsdtPR
-echo '                    },'                                                   >> $gSsdtPR
-echo '                    0x02,'                                                >> $gSsdtPR
-echo '                    '$latency_C2','                                       >> $gSsdtPR
-echo '                    0x01F4'                                               >> $gSsdtPR
-fi
-
-if (($C3)); then
-let hintCode+=0x10
-local power_C3=0x01F4
-#
-# Is this for CPU1?
-#
-if (($1)); then
-if [[ ${modelID:0:7} == "iMac13," ]];
-then
-local power_C3=0x15E
-latency_C3=0xA9
-else
-local power_C3=0xC8
-let hintCode+=0x10
-fi
-fi
-
-echo '                },'                                                       >> $gSsdtPR
-echo ''                                                                         >> $gSsdtPR
-echo '                Package (0x04)'                                           >> $gSsdtPR
-echo '                {'                                                        >> $gSsdtPR
-echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
-echo '                    {'                                                    >> $gSsdtPR
-echo '                        Register (FFixedHW,'                              >> $gSsdtPR
-echo '                            0x01,               // Bit Width'             >> $gSsdtPR
-echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
-printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
-echo '                            0x03,               // Access Size'           >> $gSsdtPR
-echo '                            )'                                            >> $gSsdtPR
-echo '                    },'                                                   >> $gSsdtPR
-echo '                    0x03,'                                                >> $gSsdtPR
-echo '                    '$latency_C3','                                       >> $gSsdtPR
-echo '                    '$power_C3                                            >> $gSsdtPR
-fi
-
-if (($C6)); then
-let hintCode+=0x10
-echo '                },'                                                       >> $gSsdtPR
-echo ''                                                                         >> $gSsdtPR
-echo '                Package (0x04)'                                           >> $gSsdtPR
-echo '                {'                                                        >> $gSsdtPR
-echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
-echo '                    {'                                                    >> $gSsdtPR
-echo '                        Register (FFixedHW,'                              >> $gSsdtPR
-echo '                            0x01,               // Bit Width'             >> $gSsdtPR
-echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
-printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
-echo '                            0x03,               // Access Size'           >> $gSsdtPR
-echo '                            )'                                            >> $gSsdtPR
-echo '                    },'                                                   >> $gSsdtPR
-echo '                    0x06,'                                                >> $gSsdtPR
-echo '                    '$latency_C6','                                       >> $gSsdtPR
-echo '                    0x015E'                                               >> $gSsdtPR
-fi
-
-if (($C7)); then
-#
-# If $hintCode is already 0x30 then use 0x31 otherwise 0x30
-#
-if [ $hintCode -eq 48 ];
-then
-let hintCode+=0x01
-else
-let hintCode+=0x10
-fi
-echo '                },'                                                       >> $gSsdtPR
-echo ''                                                                         >> $gSsdtPR
-echo '                Package (0x04)'                                           >> $gSsdtPR
-echo '                {'                                                        >> $gSsdtPR
-echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
-echo '                    {'                                                    >> $gSsdtPR
-echo '                        Register (FFixedHW,'                              >> $gSsdtPR
-echo '                            0x01,               // Bit Width'             >> $gSsdtPR
-echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
-printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
-echo '                            0x03,               // Access Size'           >> $gSsdtPR
-echo '                            )'                                            >> $gSsdtPR
-echo '                    },'                                                   >> $gSsdtPR
-echo '                    0x07,'                                                >> $gSsdtPR
-echo '                    '$latency_C7','                                       >> $gSsdtPR
-echo '                    0xC8'                                                 >> $gSsdtPR
-fi
-
-echo '                }'                                                            >> $gSsdtPR
-echo '            })'                                                               >> $gSsdtPR
-echo '        }'                                                                    >> $gSsdtPR
-
-#
-# We don't need a closing bracket here when we add method _DSM for Ivy Bridge.
-#
-
-if [ $gBridgeType -eq $SANDY_BRIDGE ]; then
-echo '    }'                                                                    >> $gSsdtPR
-fi
+    let C1=0
+    let C2=0
+    let C3=0
+    let C6=0
+    let C7=0
+    local pkgLength=2
+    local numberOfCStates=0
+
+    #
+    # Are we injecting C-States for CPU1?
+    #
+    if [ $1 -eq 1 ];
+      then
+        let targetCPU=1
+      else
+        let targetCPU=0
+    fi
+
+    echo ''                                                                             >> $gSsdtPR
+    echo '        Method (ACST, 0, NotSerialized)'                                      >> $gSsdtPR
+    echo '        {'                                                                    >> $gSsdtPR
+
+    if ((gDebug)); then
+        echo '            Store ("Method '${gProcessorNames[$targetCPU]}'.ACST Called", Debug)'  >> $gSsdtPR
+    fi
+
+    #
+    # Are we injecting C-States for CPU1?
+    #
+    if [ $targetCPU -eq 1 ];
+        then
+            # Yes (also used by CPU2, CPU3 and greater).
+            let targetCStates=$gACST_CPU1
+            latency_C1=0x03E8
+            latency_C2=0x94
+            latency_C3=0xC6
+        else
+            #
+            # C-States override for Mobile processors (CPU0 only)
+            #
+            if (($gTypeCPU == $gMobileCPU)); then
+                echo 'Adjusting C-States for detected (mobile) processor'
+                let gACST_CPU0=29
+            fi
+
+            let targetCStates=$gACST_CPU0
+            latency_C1=Zero
+            latency_C3=0xCD
+            latency_C6=0xF5
+            latency_C7=0xF5
+    fi
+
+    if ((gDebug)); then
+        echo '            Store ("'${gProcessorNames[$targetCPU]}' C-States    : '$targetCStates'", Debug)' >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+    fi
+
+
+    _debugPrint "targetCStates: $targetCStates"
+
+    #
+    # Checks to determine which C-State(s) we should inject.
+    #
+    if (($targetCStates & 1)); then
+        _debugPrint "Adding C1"
+        let C1=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
+
+    if (($targetCStates & 2)); then
+        _debugPrint "Adding C2"
+        let C2=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
+
+    if (($targetCStates & 4)); then
+        _debugPrint "Adding C3"
+        let C3=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
+
+    if (($targetCStates & 8)); then
+        _debugPrint "Adding C6"
+        let C6=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
+
+    if ((($targetCStates & 16) == 16)); then
+        _debugPrint "Adding C7"
+        let C7=1
+        let numberOfCStates+=1
+        let pkgLength+=1
+    fi
+
+    let hintCode=0x00
+
+    echo "            /* Low Power Modes for ${gProcessorNames[$1]} */"                 >> $gSsdtPR
+  printf "            Return (Package (0x%02x)\n" $pkgLength                            >> $gSsdtPR
+    echo '            {'                                                                >> $gSsdtPR
+    echo '                One,'                                                         >> $gSsdtPR
+  printf "                0x%02x,\n" $numberOfCStates                                   >> $gSsdtPR
+    echo '                Package (0x04)'                                               >> $gSsdtPR
+    echo '                {'                                                            >> $gSsdtPR
+    echo '                    ResourceTemplate ()'                                      >> $gSsdtPR
+    echo '                    {'                                                        >> $gSsdtPR
+    echo '                        Register (FFixedHW,'                                  >> $gSsdtPR
+    echo '                            0x01,               // Bit Width'                 >> $gSsdtPR
+    echo '                            0x02,               // Bit Offset'                >> $gSsdtPR
+  printf "                            0x%016x, // Address\n" $hintCode                  >> $gSsdtPR
+    echo '                            0x01,               // Access Size'               >> $gSsdtPR
+    echo '                            )'                                                >> $gSsdtPR
+    echo '                    },'                                                       >> $gSsdtPR
+    echo '                    One,'                                                     >> $gSsdtPR
+    echo '                    '$latency_C1','                                           >> $gSsdtPR
+    echo '                    0x03E8'                                                   >> $gSsdtPR
+
+    if (($C2)); then
+        let hintCode+=0x10
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x02,'                                                >> $gSsdtPR
+        echo '                    '$latency_C2','                                       >> $gSsdtPR
+        echo '                    0x01F4'                                               >> $gSsdtPR
+    fi
+
+    if (($C3)); then
+        let hintCode+=0x10
+        local power_C3=0x01F4
+        #
+        # Is this for CPU1?
+        #
+        if (($1)); then
+            if [[ ${modelID:0:7} == "iMac13," ]];
+                then
+                    local power_C3=0x15E
+                    latency_C3=0xA9
+                else
+                    local power_C3=0xC8
+                    let hintCode+=0x10
+            fi
+        fi
+
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x03,'                                                >> $gSsdtPR
+        echo '                    '$latency_C3','                                       >> $gSsdtPR
+        echo '                    '$power_C3                                            >> $gSsdtPR
+    fi
+
+    if (($C6)); then
+        let hintCode+=0x10
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x06,'                                                >> $gSsdtPR
+        echo '                    '$latency_C6','                                       >> $gSsdtPR
+        echo '                    0x015E'                                               >> $gSsdtPR
+    fi
+
+	if (($C7)); then
+        #
+        # If $hintCode is already 0x30 then use 0x31 otherwise 0x30
+        #
+        if [ $hintCode -eq 48 ];
+            then
+                let hintCode+=0x01
+            else
+                let hintCode+=0x10
+        fi
+        echo '                },'                                                       >> $gSsdtPR
+        echo ''                                                                         >> $gSsdtPR
+        echo '                Package (0x04)'                                           >> $gSsdtPR
+        echo '                {'                                                        >> $gSsdtPR
+        echo '                    ResourceTemplate ()'                                  >> $gSsdtPR
+        echo '                    {'                                                    >> $gSsdtPR
+        echo '                        Register (FFixedHW,'                              >> $gSsdtPR
+        echo '                            0x01,               // Bit Width'             >> $gSsdtPR
+        echo '                            0x02,               // Bit Offset'            >> $gSsdtPR
+      printf "                            0x%016x, // Address\n" $hintCode              >> $gSsdtPR
+        echo '                            0x03,               // Access Size'           >> $gSsdtPR
+        echo '                            )'                                            >> $gSsdtPR
+        echo '                    },'                                                   >> $gSsdtPR
+        echo '                    0x07,'                                                >> $gSsdtPR
+        echo '                    '$latency_C7','                                       >> $gSsdtPR
+        echo '                    0xC8'                                                 >> $gSsdtPR
+    fi
+
+    echo '                }'                                                            >> $gSsdtPR
+    echo '            })'                                                               >> $gSsdtPR
+    echo '        }'                                                                    >> $gSsdtPR
+
+    #
+    # We don't need a closing bracket here when we add method _DSM for Ivy Bridge.
+    #
+
+    if [ $gBridgeType -eq $SANDY_BRIDGE ]; then
+        echo '    }'                                                                    >> $gSsdtPR
+	fi
 }
 
 
@@ -1038,331 +1092,351 @@ fi
 
 function _printScopeCPUn()
 {
-let currentCPU=1;
-
-while [ $currentCPU -lt $gLogicalCPUs ]; do
-echo ''                                                                         >> $gSsdtPR
-echo '    Scope ('${gScope}'.'${gProcessorNames[$currentCPU]}')'                >> $gSsdtPR
-echo '    {'                                                                    >> $gSsdtPR
-echo '        Method (APSS, 0, NotSerialized) { Return ('${gScope}'.'${gProcessorNames[0]}'.APSS) }' >> $gSsdtPR
-
-#
-# IB CPUPM tries to parse/execute CPUn.ACST (see debug data) and thus we add
-# this method, conditionally, since SB CPUPM doesn't seem to care about it.
-#
-if [ $gBridgeType -ge $IVY_BRIDGE ]; then
-if [ $currentCPU -eq 1 ];
-then
-_printScopeACST 1
-else
-echo '        Method (ACST, 0, NotSerialized) { Return ('${gScope}'.'${gProcessorNames[1]}'.ACST ()) }' >> $gSsdtPR
-fi
-fi
-
-echo '    }'                                                                    >> $gSsdtPR
-let currentCPU+=1
-done
-
-echo '}'                                                                            >> $gSsdtPR
+    let currentCPU=1;
+
+    while [ $currentCPU -lt $gLogicalCPUs ]; do
+        echo ''                                                                         >> $gSsdtPR
+        echo '    Scope ('${gScope}'.'${gProcessorNames[$currentCPU]}')'                >> $gSsdtPR
+        echo '    {'                                                                    >> $gSsdtPR
+        echo '        Method (APSS, 0, NotSerialized)'                                  >> $gSsdtPR
+        echo '        {'                                                                >> $gSsdtPR
+
+        if ((gDebug)); then
+            echo '            Store ("Method '${gProcessorNames[$currentCPU]}'.APSS Called", Debug)'  >> $gSsdtPR
+            echo ''                                                                     >> $gSsdtPR
+        fi
+
+        echo '            Return ('${gScope}'.'${gProcessorNames[0]}'.APSS)'            >> $gSsdtPR
+        echo '        }'                                                                >> $gSsdtPR
+
+        #
+        # IB CPUPM tries to parse/execute CPUn.ACST (see debug data) and thus we add
+        # this method, conditionally, since SB CPUPM doesn't seem to care about it.
+        #
+        if [ $gBridgeType -ge $IVY_BRIDGE ]; then
+            if [ $currentCPU -eq 1 ];
+                then
+                    _printScopeACST 1
+                else
+                    echo ''                                                             >> $gSsdtPR
+                    echo '        Method (ACST, 0, NotSerialized) { Return ('${gScope}'.'${gProcessorNames[1]}'.ACST ()) }' >> $gSsdtPR
+            fi
+        fi
+
+        echo '    }'                                                                    >> $gSsdtPR
+        let currentCPU+=1
+    done
+
+    echo '}'                                                                            >> $gSsdtPR
 }
 
 #--------------------------------------------------------------------------------
 
 function _getModelName()
 {
-#
-# Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
-#
-echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *["=<>]//g' -e 's/compatible//'`
+    #
+    # Grab 'compatible' property from ioreg (stripped with sed / RegEX magic).
+    #
+    echo `ioreg -p IODeviceTree -d 2 -k compatible | grep compatible | sed -e 's/ *["=<>]//g' -e 's/compatible//'`
 }
 
 #--------------------------------------------------------------------------------
 
 function _getBoardID()
 {
-#
-# Grab 'board-id' property from ioreg (stripped with sed / RegEX magic).
-#
-boardID=$(ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *["=<>]//g' -e 's/board-id//')
+    #
+    # Grab 'board-id' property from ioreg (stripped with sed / RegEX magic).
+    #
+    boardID=$(ioreg -p IODeviceTree -d 2 -k board-id | grep board-id | sed -e 's/ *["=<>]//g' -e 's/board-id//')
 }
 
 #--------------------------------------------------------------------------------
 
 function _getProcessorNames()
 {
-local acpiNames=$(ioreg -p IODeviceTree -c IOACPIPlatformDevice -k cpu-type | egrep name  | sed -e 's/ *[-|="<a-z>]//g')
-gProcessorNames=($acpiNames)
+    local acpiNames=$(ioreg -p IODeviceTree -c IOACPIPlatformDevice -k cpu-type | egrep name  | sed -e 's/ *[-|="<a-z>]//g')
+    gProcessorNames=($acpiNames)
 
-if [[ ${#gProcessorNames[@]} -lt 2 ]]; then
-_exitWithError $PROCESSOR_NAMES_ERROR
-fi
+    if [[ ${#gProcessorNames[@]} -lt 2 ]]; then
+        _exitWithError $PROCESSOR_NAMES_ERROR
+    fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _updateProcessorNames()
 {
-if [[ $gLogicalCPUs -le 0x0f ]];
-then
-local label=${gProcLabel:0:3}
-else
-local label=${gProcLabel:0:2}
-fi
-
-if [[ $1 -gt ${#gProcessorNames[@]} ]]; then
-echo -e "\nWarning: Target CPU has $gLogicalCPUs logical cores, the running system only ${#gProcessorNames[@]}"
-echo    "         Now using '$label' to extent the current range to $gLogicalCPUs..."
-echo -e "         You may want to check/verify the generated $gSsdtID.dsl\n"
-fi
-
-let currentCPU=0
-
-while [ $currentCPU -lt $1 ];
-do
-if [[ $1 -gt 0x0f && $currentCPU -le 0x0f ]];
-then
-local filler='0'
-else
-local filler=''
-fi
-
-gProcessorNames[$currentCPU]=${label}${filler}$(echo "obase=16; ${currentCPU}" | bc)
-
-let currentCPU+=1
-done
+    if [[ $gLogicalCPUs -le 0x0f ]];
+        then
+             local label=${gProcLabel:0:3}
+        else
+             local label=${gProcLabel:0:2}
+    fi
+
+    if [[ $1 -gt ${#gProcessorNames[@]} ]]; then
+        echo -e "\nWarning: Target CPU has $gLogicalCPUs logical cores, the running system only ${#gProcessorNames[@]}"
+        echo    "         Now using '$label' to extent the current range to $gLogicalCPUs..."
+        echo -e "         You may want to check/verify the generated $gSsdtID.dsl\n"
+    fi
+
+    let currentCPU=0
+
+    while [ $currentCPU -lt $1 ];
+    do
+        if [[ $1 -gt 0x0f && $currentCPU -le 0x0f ]];
+            then
+                local filler='0'
+            else
+                local filler=''
+        fi
+
+        gProcessorNames[$currentCPU]=${label}${filler}$(echo "obase=16; ${currentCPU}" | bc)
+
+        let currentCPU+=1
+    done
 }
 
 #--------------------------------------------------------------------------------
 
 function _getProcessorScope()
 {
-#
-# We run egrep twice here for Snow Leopard compatibility, otherwise it fails.
-#
-if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5b830b') ]]; then
-printf 'Processor Declaration(s) Found in DSDT'
-fi
-
-if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5f50525f') ]];
-then
-gScope="\_PR_"
-echo ' (ACPI 1.0 compliant)'
-else
-gScope="\_SB_"
-fi
+    #
+    # We run egrep twice here for Snow Leopard compatibility, otherwise it fails.
+    #
+    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5b830b') ]]; then
+        printf 'Processor Declaration(s) Found in DSDT'
+    fi
+
+    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5f50525f') ]];
+        then
+            gScope="\_PR_"
+            echo ' (ACPI 1.0 compliant)'
+            return
+        else
+            gScope="\_SB_"
+            return
+    fi
+    #
+    # Additional/experimental code for support of broken ACPI tables.
+    #
+    if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5f5052') ]];
+        then
+            gScope="\_PR_"
+            echo ' (ACPI 1.0 compliant)'
+    fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUtype()
 {
-#
-# Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
-#
-local grepStr=$(ioreg -p IODeviceTree -n "${gProcessorNames[0]}"@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g')
-
-# Swap bytes with help of ${str:pos:num}
-#
-echo ${grepStr:2:2}${grepStr:0:2}
+    #
+    # Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
+    #
+    local grepStr=$(ioreg -p IODeviceTree -n "${gProcessorNames[0]}"@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g')
+
+    # Swap bytes with help of ${str:pos:num}
+    #
+    echo ${grepStr:2:2}${grepStr:0:2}
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUModel()
 {
-#
-# Returns the hexadecimal value of machdep.cpu.model
-#
-echo 0x$(echo "obase=16; `sysctl machdep.cpu.model | sed -e 's/^machdep.cpu.model: //'`" | bc)
+    #
+    # Returns the hexadecimal value of machdep.cpu.model
+    #
+    echo 0x$(echo "obase=16; `sysctl machdep.cpu.model | sed -e 's/^machdep.cpu.model: //'`" | bc)
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUSignature()
 {
-#
-# Returns the hexadecimal value of machdep.cpu.signature
-#
-echo 0x$(echo "obase=16; `sysctl machdep.cpu.signature | sed -e 's/^machdep.cpu.signature: //'`" | bc)
+    #
+    # Returns the hexadecimal value of machdep.cpu.signature
+    #
+    echo 0x$(echo "obase=16; `sysctl machdep.cpu.signature | sed -e 's/^machdep.cpu.signature: //'`" | bc)
 }
 
 #--------------------------------------------------------------------------------
 
 function _getSystemType()
 {
-#
-# Grab 'system-type' property from ioreg (stripped with sed / RegEX magic).
-#
-# Note: This property is checked (cmpb $0x02) in X86PlatformPlugin::configResourceCallback
-#
-echo `ioreg -p IODeviceTree -d 2 -k system-type | grep system-type | sed -e 's/ *[-="<0a-z>]//g'`
+    #
+    # Grab 'system-type' property from ioreg (stripped with sed / RegEX magic).
+    #
+    # Note: This property is checked (cmpb $0x02) in X86PlatformPlugin::configResourceCallback
+    #
+    echo `ioreg -p IODeviceTree -d 2 -k system-type | grep system-type | sed -e 's/ *[-="<0a-z>]//g'`
 }
 
 #--------------------------------------------------------------------------------
 
 function _findIasl()
 {
-if (($gCallIasl)); then
-#
-# Then we do a quick lookup of iasl (should also be there after the first run)
-#
-if [ ! -f /usr/local/bin/iasl ]; then
-printf "\nIASL not found. "
-#
-# First we check the target directory (should be there after the first run)
-#
-# XXX: Jeroen, try curl --create-dirs without the mkdir here ;)
-if [ ! -d /usr/local/bin ]; then
-printf "Creating target directory... "
-sudo mkdir -p /usr/local/bin/
-sudo chown -R root:wheel /usr/local/bin/
-fi
-
-printf "Downloading iasl...\n"
-sudo curl -o /usr/local/bin/iasl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl
+    if (($gCallIasl)); then
+        #
+        # Then we do a quick lookup of iasl (should also be there after the first run)
+        #
+        if [ ! -f /usr/local/bin/iasl ]; then
+            printf "\nIASL not found. "
+            #
+            # First we check the target directory (should be there after the first run)
+            #
+            # XXX: Jeroen, try curl --create-dirs without the mkdir here ;)
+            if [ ! -d /usr/local/bin ]; then
+                printf "Creating target directory... "
+                sudo mkdir -p /usr/local/bin/
+                sudo chown -R root:wheel /usr/local/bin/
+            fi
+
+            printf "Downloading iasl...\n"
+            sudo curl -o /usr/local/bin/iasl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl
 #           sudo curl https://raw.github.com/Piker-Alpha/RevoBoot/clang/i386/libsaio/acpi/Tools/iasl -o /usr/local/bin/iasl --create-dirs
-sudo chmod +x /usr/local/bin/iasl
-echo 'Done.'
-fi
+            sudo chmod +x /usr/local/bin/iasl
+            echo 'Done.'
+        fi
 
-iasl=/usr/local/bin/iasl
-fi
+        iasl=/usr/local/bin/iasl
+    fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _setDestinationPath
 {
-#
-# Checking for RevoBoot
-#
-if [ -d /Extra/ACPI ]; then
-gDestinationPath="/Extra/ACPI/"
-echo -e '\nACPI target directory changed to: '$gDestinationPath
-return
-fi
-
-#
-# Checking for Clover rev 1277 and greater (projectosx.com/forum/index.php?showtopic=2656&p=29129&#entry29129)
-#
-if [ -d /EFI/Clover/ACPI/patched ];
-then
-gDestinationPath="/EFI/Clover/ACPI/patched/"
-echo -e '\nACPI target directory changed to: $gDestinationPath'
-return
-else
-if [ -d /Volumes/EFI ];
-then
-if [ -d /Volumes/EFI/Clover/ACPI/patched ]; then
-gDestinationPath="/Volumes/EFI/CLOVER/ACPI/patched/"
-echo -e '\nACPI target directory changed to: '$gDestinationPath
-return
-fi
-else
-#
-# http://www.tonymacx86.com/ssdt/86906-ssdt-generation-script-ivybridge-pm-40.html#post604496
-#
-if [ -f /Library/Logs/CloverEFI/boot.log ];
-then
-echo 'Clover boot.log found'
-return
-else
-echo -e '\nWarning: Failed to locate the Clover boot.log'
-echo 'Creating temporarily mount point: /Volumes/EFI'
-sudo mkdir /Volumes/EFI
-printf 'Mounting EFI partition...\n'
-#
-# TODO: Get target disk from diskutil list
-#
-sudo mount_hfs /dev/disk0s1 /Volumes/EFI
-
-if [ -f /Volumes/EFI/Clover/ACPI/patched ];
-then
-let gUnmountEFIPartition=1
-gDestinationPath="/Volumes/EFI/CLOVER/ACPI/patched/"
-echo 'ACPI target directory changed to: '$gDestinationPath
-return
-else
-echo -e '\nUnmounting EFI partition...'
-sudo umount -f /Volumes/EFI
-echo 'Removing temporarily mount point...'
+    #
+    # Checking for RevoBoot
+    #
+    if [ -d /Extra/ACPI ]; then
+        gDestinationPath="/Extra/ACPI/"
+        echo -e '\nACPI target directory changed to: '$gDestinationPath
+        return
+    fi
+
+    #
+    # Checking for Clover rev 1277 and greater (projectosx.com/forum/index.php?showtopic=2656&p=29129&#entry29129)
+    #
+    if [ -d /EFI/Clover/ACPI/patched ];
+        then
+            gDestinationPath="/EFI/Clover/ACPI/patched/"
+            echo -e '\nACPI target directory changed to: $gDestinationPath'
+            return
+        else
+            if [ -d /Volumes/EFI ];
+                then
+                    if [ -d /Volumes/EFI/Clover/ACPI/patched ]; then
+                        gDestinationPath="/Volumes/EFI/CLOVER/ACPI/patched/"
+                        echo -e '\nACPI target directory changed to: '$gDestinationPath
+                        return
+                    fi
+                else
+                    #
+                    # http://www.tonymacx86.com/ssdt/86906-ssdt-generation-script-ivybridge-pm-40.html#post604496
+                    #
+                    if [ -f /Library/Logs/CloverEFI/boot.log ];
+                        then
+                            echo 'Clover boot.log found'
+                            return
+                        else
+                            echo -e '\nWarning: Failed to locate the Clover boot.log'
+                            echo 'Creating temporarily mount point: /Volumes/EFI'
+                            sudo mkdir /Volumes/EFI
+                            printf 'Mounting EFI partition...\n'
+                            #
+                            # TODO: Get target disk from diskutil list
+                            #
+                            sudo mount_hfs /dev/disk0s1 /Volumes/EFI
+
+                            if [ -f /Volumes/EFI/Clover/ACPI/patched ];
+                                then
+                                    let gUnmountEFIPartition=1
+                                    gDestinationPath="/Volumes/EFI/CLOVER/ACPI/patched/"
+                                    echo 'ACPI target directory changed to: '$gDestinationPath
+                                    return
+                                else
+                                    echo -e '\nUnmounting EFI partition...'
+                                    sudo umount -f /Volumes/EFI
+                                    echo 'Removing temporarily mount point...'
 #                                   sudo rm -r /Volumes/EFI
-return
-fi
-fi
-
-fi
-fi
-
-#
-# Checking for Clover (older versions)
-#
-if [ -d /EFI/ACPI/patched ]; then
-gDestinationPath="/EFI/ACPI/patched/"
-echo 'ACPI target directory changed to: '$gDestinationPath
-return
-fi
+                                    return
+                            fi
+                    fi
+
+            fi
+    fi
+
+    #
+    # Checking for Clover (older versions)
+    #
+    if [ -d /EFI/ACPI/patched ]; then
+        gDestinationPath="/EFI/ACPI/patched/"
+        echo 'ACPI target directory changed to: '$gDestinationPath
+        return
+    fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _getCPUNumberFromBrandString
 {
-#
-# Get CPU brandstring
-#
-local brandString=$(echo `sysctl machdep.cpu.brand_string` | sed -e 's/machdep.cpu.brand_string: //')
-#
-# Save default (0) delimiter
-#
-local ifs=$IFS
-#
-# Change delimiter to a space character
-#
-IFS=" "
-#
-# Split brandstring into array (data)
-#
-local data=($brandString)
+    #
+    # Get CPU brandstring
+    #
+    local brandString=$(echo `sysctl machdep.cpu.brand_string` | sed -e 's/machdep.cpu.brand_string: //')
+    #
+    # Save default (0) delimiter
+    #
+    local ifs=$IFS
+    #
+    # Change delimiter to a space character
+    #
+    IFS=" "
+    #
+    # Split brandstring into array (data)
+    #
+    local data=($brandString)
 #   local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "V2" "@" "2.5GHz")
 #   local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "@" "2.5GHz")
-#
-# Example from a MacBookPro10,2
-#
-# echo "${data[0]}" # Intel(R)
-# echo "${data[1]}" # Core(TM)
-# echo "${data[2]}" # i5-3210M
-# echo "${data[3]}" # CPU
-# echo "${data[4]}" # @
-# echo "${data[5]}" # 2.50GHz
-#
-# or: "Intel(R) Xeon(R) CPU E3-1230 V2 @ 3.30GHz"
-#
-# echo "${data[0]}" # Intel(R)
-# echo "${data[1]}" # Xeon(R)
-# echo "${data[2]}" # CPU
-# echo "${data[3]}" # E3-12XX
-# echo "${data[4]}" # V2
-# echo "${data[5]}" # @
-# echo "${data[6]}" # 3.30GHz
-
-#
-# Restore the default delimiter
-#
-IFS=$ifs
-
-let length=${#data[@]}
-
-if ((length > 6)); then
-echo 'Warning: Unexpected brandstring > "'${data[@]}'"'
-fi
-
-if [[ ${data[1]} == "Xeon(R)" && ${data[4]} == "V2" ]];
-then
-gProcessorNumber="${data[3]} ${data[4]}"
-else
-gProcessorNumber="${data[2]}"
-fi
+    #
+    # Example from a MacBookPro10,2
+    #
+    # echo "${data[0]}" # Intel(R)
+    # echo "${data[1]}" # Core(TM)
+    # echo "${data[2]}" # i5-3210M
+    # echo "${data[3]}" # CPU
+    # echo "${data[4]}" # @
+    # echo "${data[5]}" # 2.50GHz
+    #
+    # or: "Intel(R) Xeon(R) CPU E3-1230 V2 @ 3.30GHz"
+    #
+    # echo "${data[0]}" # Intel(R)
+    # echo "${data[1]}" # Xeon(R)
+    # echo "${data[2]}" # CPU
+    # echo "${data[3]}" # E3-12XX
+    # echo "${data[4]}" # V2
+    # echo "${data[5]}" # @
+    # echo "${data[6]}" # 3.30GHz
+
+    #
+    # Restore the default delimiter
+    #
+    IFS=$ifs
+
+    let length=${#data[@]}
+
+    if ((length > 6)); then
+        echo 'Warning: Unexpected brandstring > "'${data[@]}'"'
+    fi
+
+    if [[ ${data[1]} == "Xeon(R)" && ${data[4]} == "V2" ]];
+        then
+            gProcessorNumber="${data[3]} ${data[4]}"
+        else
+            gProcessorNumber="${data[2]}"
+    fi
 
 #   echo $gProcessorNumber
 }
@@ -1371,745 +1445,754 @@ fi
 
 function _getCPUDataByProcessorNumber
 {
-#
-# Local function definition
-#
-function __searchList()
-{
-local ifs=$IFS
-let targetType=0
-
-case $1 in
-2) local cpuSpecLists=("gDesktopSandyBridgeCPUList[@]" "gMobileSandyBridgeCPUList[@]" "gServerSandyBridgeCPUList[@]")
-;;
-4) local cpuSpecLists=("gDesktopIvyBridgeCPUList[@]" "gMobileIvyBridgeCPUList[@]" "gServerIvyBridgeCPUList[@]")
-;;
-8) local cpuSpecLists=("gDesktopHaswellCPUList[@]" "gMobileHaswellCPUList[@]" "gHaswellCPUList[@]")
-;;
-esac
-
-for cpuList in ${cpuSpecLists[@]}
-do
-let targetType+=1
-local targetCPUList=("${!cpuList}")
-
-for cpuData in "${targetCPUList[@]}"
-do
-IFS=","
-data=($cpuData)
-
-if [[ ${data[0]} == $gProcessorNumber ]]; then
-gProcessorData="$cpuData"
-let gTypeCPU=$targetType
-let gBridgeType=$1
-IFS=$ifs
-return
-fi
-done
-done
-
-IFS=$ifs
-}
-
-#
-# Local function callers
-#
-__searchList $SANDY_BRIDGE
-
-if (!(($gTypeCPU))); then
-__searchList $IVY_BRIDGE
-fi
-
-if (!(($gTypeCPU))); then
-__searchList $HASWELL
-fi
+    #
+    # Local function definition
+    #
+    function __searchList()
+    {
+        local ifs=$IFS
+        let targetType=0
+
+        case $1 in
+            2) local cpuSpecLists=("gDesktopSandyBridgeCPUList[@]" "gMobileSandyBridgeCPUList[@]" "gServerSandyBridgeCPUList[@]")
+               ;;
+            4) local cpuSpecLists=("gDesktopIvyBridgeCPUList[@]" "gMobileIvyBridgeCPUList[@]" "gServerIvyBridgeCPUList[@]")
+               ;;
+            8) local cpuSpecLists=("gDesktopHaswellCPUList[@]" "gMobileHaswellCPUList[@]" "gHaswellCPUList[@]")
+               ;;
+        esac
+
+        for cpuList in ${cpuSpecLists[@]}
+        do
+            let targetType+=1
+            local targetCPUList=("${!cpuList}")
+
+            for cpuData in "${targetCPUList[@]}"
+            do
+                IFS=","
+                data=($cpuData)
+
+                if [[ ${data[0]} == $gProcessorNumber ]]; then
+                    gProcessorData="$cpuData"
+                    let gTypeCPU=$targetType
+                    let gBridgeType=$1
+                    IFS=$ifs
+                    return
+                fi
+            done
+        done
+
+        IFS=$ifs
+    }
+
+    #
+    # Local function callers
+    #
+    __searchList $SANDY_BRIDGE
+
+    if (!(($gTypeCPU))); then
+        __searchList $IVY_BRIDGE
+    fi
+
+    if (!(($gTypeCPU))); then
+        __searchList $HASWELL
+    fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _showLowPowerStates()
 {
-#
-# Local function definition
-#
-function __print()
-{
-local mask=1
-local cStates=$1
-
-printf "Injected C-States for ${gProcessorNames[$2]} ("
-#
-# Haswell    : C0, C1, C1E, C2E, C3, C4, C6 and C7
-# Haswell-ULT: C0, C1, C1E, C2E, C3, C4, C6, C7, C8, C9 and C10
-#
-for state in C1 C2 C3 C6 C7 C8 C9 C10
-do
-if (($cStates & $mask)); then
-if (($mask > 1)); then
-printf ","
-fi
-
-printf "$state"
-fi
-
-let mask=$(($mask << 1))
-done
-
-echo ')'
-}
-
-#
-# Local function callers
-#
-__print $gACST_CPU0 0
-
-if [ $gBridgeType -ge $IVY_BRIDGE ]; then
-__print $gACST_CPU1 1
-fi
+    #
+    # Local function definition
+    #
+    function __print()
+    {
+        local mask=1
+        local cStates=$1
+
+        printf "Injected C-States for ${gProcessorNames[$2]} ("
+        #
+        # Haswell    : C0, C1, C1E, C2E, C3, C4, C6 and C7
+        # Haswell-ULT: C0, C1, C1E, C2E, C3, C4, C6, C7, C8, C9 and C10
+        #
+        for state in C1 C2 C3 C6 C7 C8 C9 C10
+        do
+            if (($cStates & $mask)); then
+               if (($mask > 1)); then
+                   printf ","
+               fi
+
+               printf "$state"
+            fi
+
+            let mask=$(($mask << 1))
+        done
+
+        echo ')'
+    }
+
+    #
+    # Local function callers
+    #
+    __print $gACST_CPU0 0
+
+    if [ $gBridgeType -ge $IVY_BRIDGE ]; then
+        __print $gACST_CPU1 1
+    fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _checkPlatformSupport()
 {
-#
-# Local function definition
-#
-function __searchList()
-{
-local data=`awk '/<key>'${1}'<\/key>.*/,/<\/array>/' /System/Library/CoreServices/PlatformSupport.plist`
-local targetList=(`echo $data | egrep -o '(<string>.*</string>)' | sed -e 's/<\/*string>//g'`)
-
-for item in "${targetList[@]}"
-do
-
-if [ "$item" == "$2" ]; then
-return 1
-fi
-done
-
-return 0
-}
-
-#
-# This check is required for Snow Leopard compatibility!
-#
-if [ -f /System/Library/CoreServices/PlatformSupport.plist ];
-then
-__searchList 'SupportedModelProperties' $1
-
-if (($? == 0)); then
-echo 'Warning: Model identifier ['$1'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
-fi
-
-__searchList 'SupportedBoardIds' $2
-
-if (($? == 0)); then
-echo 'Warning: boardID ['$2'] is missing from: /S*/L*/CoreServices/PlatformSupport.plist'
-fi
-else
-echo 'Warning: /S*/L*/C*/PlatformSupport.plist not found (normal for Snow Leopard)!'
-fi
+    #
+    # Local function definition
+    #
+    function __searchList()
+    {
+        local data=`awk '/<key>'${1}'<\/key>.*/,/<\/array>/' /System/Library/CoreServices/PlatformSupport.plist`
+        local targetList=(`echo $data | egrep -o '(<string>.*</string>)' | sed -e 's/<\/*string>//g'`)
+
+        for item in "${targetList[@]}"
+        do
+          if [ "$item" == "$2" ]; then
+              return 1
+          fi
+        done
+
+        return 0
+    }
+
+    #
+    # This check is required for Snow Leopard compatibility!
+    #
+    if [ -f /System/Library/CoreServices/PlatformSupport.plist ];
+        then
+            __searchList 'SupportedModelProperties' $1
+
+            if (($? == 0)); then
+              __searchList 'SupportedBoardIds' $2
+
+              if (($? == 0)); then
+                echo 'Warning: Model identifier ['$1'] and board-id ['$2'] missing in: /S*/L*/CoreServices/PlatformSupport.plist'
+              fi
+            fi
+        else
+            echo 'Warning: /S*/L*/C*/PlatformSupport.plist not found (normal for Snow Leopard)!'
+    fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _checkSMCKeys()
 {
-#
-# TODO: Check SMC keys to see if they are there and properly initialized!
-#
-# Note: Do <i>not</i> dump SMC keys with HWSensors/iStat or other SMC plug-ins installed!
-#
-local filename="/System/Library/Extensions/FakeSMC.kext/Contents/Info.plist"
-local data=`grep -so '<key>[a-zA-Z]*</key>' $filename | sed -e 's/<key>//' -e 's/<\/key>//g'`
-
-local status=`echo $data | grep -oe 'DPLM'`
-
-if [ $status == 'DPLM' ]; then
-# DPLM  [{lim]  (bytes 00 00 00 00 00)
-# CPU, Idle, IGPU, EGPU and Memory P-State limits
-echo "SMC key 'DPLM' found (OK)"
-fi
+    #
+    # TODO: Check SMC keys to see if they are there and properly initialized!
+    #
+    # Note: Do <i>not</i> dump SMC keys with HWSensors/iStat or other SMC plug-ins installed!
+    #
+    local filename="/System/Library/Extensions/FakeSMC.kext/Contents/Info.plist"
+    local data=`grep -so '<key>[a-zA-Z]*</key>' $filename | sed -e 's/<key>//' -e 's/<\/key>//g'`
+
+    local status=`echo $data | grep -oe 'DPLM'`
+
+    if [ $status == 'DPLM' ]; then
+        # DPLM  [{lim]  (bytes 00 00 00 00 00)
+        # CPU, Idle, IGPU, EGPU and Memory P-State limits
+        echo "SMC key 'DPLM' found (OK)"
+    fi
 set -x
-local status=`echo $data | grep -oe 'MSAL'`
+    local status=`echo $data | grep -oe 'MSAL'`
 
-if [ $status == 'MSAL' ]; then
-# MSAL  [hex_]  (bytes 4b)
-echo "SMC key 'MSAL' found (OK)"
-fi
+    if [ $status == 'MSAL' ]; then
+        # MSAL  [hex_]  (bytes 4b)
+        echo "SMC key 'MSAL' found (OK)"
+    fi
 }
 
 #--------------------------------------------------------------------------------
 
 function _initSandyBridgeSetup()
 {
-case $boardID in
-Mac-942B5BF58194151B)
-gSystemType=1
-gMacModelIdentifier="iMac12,1"
-gACST_CPU0=13   # C1, C3 and C6
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-942B59F58194171B)
-gSystemType=1
-gMacModelIdentifier="iMac12,2"
-gACST_CPU0=13   # C1, C3 and C6
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-8ED6AF5B48C039E1)
-gSystemType=1
-gMacModelIdentifier="Macmini5,1"
-gACST_CPU0=13   # C1, C3 and C6
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-4BC72D62AD45599E)
-gSystemType=1
-gMacModelIdentifier="Macmini5,2"
-gACST_CPU0=13   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-7BA5B2794B2CDB12)
-gSystemType=1
-gMacModelIdentifier="Macmini5,3"
-gACST_CPU0=13   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-94245B3640C91C81)
-gSystemType=2
-gMacModelIdentifier="MacBookPro8,1"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-94245A3940C91C80)
-gSystemType=2
-gMacModelIdentifier="MacBookPro8,2"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-942459F5819B171B)
-gSystemType=2
-gMacModelIdentifier="MacBookPro8,3"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-C08A6BB70A942AC2)
-gSystemType=2
-gMacModelIdentifier="MacBookAir4,1"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-742912EFDBEE19B3)
-gSystemType=2
-gMacModelIdentifier="MacBookAir4,2"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-esac
+	case $boardID in
+		Mac-942B5BF58194151B)
+			gSystemType=1
+			gMacModelIdentifier="iMac12,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-942B59F58194171B)
+			gSystemType=1
+			gMacModelIdentifier="iMac12,2"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-8ED6AF5B48C039E1)
+			gSystemType=1
+			gMacModelIdentifier="Macmini5,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-4BC72D62AD45599E)
+			gSystemType=1
+			gMacModelIdentifier="Macmini5,2"
+			gACST_CPU0=13   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-7BA5B2794B2CDB12)
+			gSystemType=1
+			gMacModelIdentifier="Macmini5,3"
+			gACST_CPU0=13   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-94245B3640C91C81)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro8,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-94245A3940C91C80)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro8,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-942459F5819B171B)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro8,3"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-C08A6BB70A942AC2)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir4,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+
+		Mac-742912EFDBEE19B3)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir4,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+			;;
+	esac
 }
 
 #--------------------------------------------------------------------------------
 
 function _initIvyBridgeSetup()
 {
-case $boardID in
-Mac-00BE6ED71E35EB86)
-gSystemType=1
-gMacModelIdentifier="iMac13,1"
-gACST_CPU0=13   # C1, C3 and C6
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-FC02E91DDD3FA6A4)
-gSystemType=1
-gMacModelIdentifier="iMac13,2"
-gACST_CPU0=13   # C1, C3 and C6
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-031AEE4D24BFF0B1)
-gSystemType=1
-gMacModelIdentifier="Macmini6,1"
-gACST_CPU0=13   # C1, C3 and C6
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-F65AE981FFA204ED)
-gSystemType=1
-gMacModelIdentifier="Macmini6,2"
-gACST_CPU0=13   # C1, C3 and C6
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-4B7AC7E43945597E)
-gSystemType=2
-gMacModelIdentifier="MacBookPro9,1"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-6F01561E16C75D06)
-gSystemType=2
-gMacModelIdentifier="MacBookPro9,2"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-C3EC7CD22292981F)
-gSystemType=2
-gMacModelIdentifier="MacBookPro10,1"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-AFD8A9D944EA4843)
-gSystemType=2
-gMacModelIdentifier="MacBookPro10,2"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-66F35F19FE2A0D05)
-gSystemType=2
-gMacModelIdentifier="MacBookAir5,1"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-2E6FAB96566FE58C)
-gSystemType=2
-gMacModelIdentifier="MacBookAir5,2"
-gACST_CPU0=29   # C1, C3, C6 and C7
-gACST_CPU1=7    # C1, C2 and C3
-;;
-esac
+	case $boardID in
+		Mac-00BE6ED71E35EB86)
+			gSystemType=1
+			gMacModelIdentifier="iMac13,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-FC02E91DDD3FA6A4)
+			gSystemType=1
+			gMacModelIdentifier="iMac13,2"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-031AEE4D24BFF0B1)
+			gSystemType=1
+			gMacModelIdentifier="Macmini6,1"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-F65AE981FFA204ED)
+			gSystemType=1
+			gMacModelIdentifier="Macmini6,2"
+			gACST_CPU0=13   # C1, C3 and C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-4B7AC7E43945597E)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro9,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-6F01561E16C75D06)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro9,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-C3EC7CD22292981F)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro10,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-AFD8A9D944EA4843)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro10,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-66F35F19FE2A0D05)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir5,1"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-2E6FAB96566FE58C)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir5,2"
+			gACST_CPU0=29   # C1, C3, C6 and C7
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+	esac
 }
 
 #--------------------------------------------------------------------------------
 
 function _initHaswellSetup()
 {
-case $boardID in
-Mac-031B6874CF7F642A)
-gSystemType=1
-gMacModelIdentifier="iMac14,1"
-gACST_CPU0=13   # C1, C2, C3, C6
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-27ADBB7B4CEE8E61)
-gSystemType=1
-gMacModelIdentifier="iMac14,2"
-gACST_CPU0=13   # C1, C2, C3, C6
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-77EB7D7DAF985301)
-gSystemType=1
-gMacModelIdentifier="iMac14,3"
-gACST_CPU0=13   # C1, C2, C3, C6
-gACST_CPU1=7    # C1, C2 and C3
-;;
-
-Mac-189A3D4F975D5FFC)
-gSystemType=2
-gMacModelIdentifier="MacBookPro11,1"
-gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-gACST_CPU1=31   # C1, C2, C3, C6 and C7
-;;
-
-Mac-3CBD00234E554E41)
-gSystemType=2
-gMacModelIdentifier="MacBookPro11,2"
-gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-gACST_CPU1=31   # C1, C2, C3, C6 and C7
-;;
-
-Mac-2BD1B31983FE1663)
-gSystemType=2
-gMacModelIdentifier="MacBookPro11,3"
-gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-gACST_CPU1=31   # C1, C2, C3, C6 and C7
-;;
-
-Mac-35C1E88140C3E6CF)
-gSystemType=2
-gMacModelIdentifier="MacBookAir6,1"
-gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-gACST_CPU1=31   # C1, C2, C3, C6 and C7
-;;
-
-Mac-7DF21CB3ED6977E5)
-gSystemType=2
-gMacModelIdentifier="MacBookAir6,2"
-gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-gACST_CPU1=31   # C1, C2, C3, C6 and C7
-;;
-
-Mac-F60DEB81FF30ACF6)
-gSystemType=1
-gMacModelIdentifier="MacPro6,1"
-gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
-gACST_CPU1=31   # C1, C2, C3, C6 and C7
-;;
-esac
+	case $boardID in
+		Mac-031B6874CF7F642A)
+			gSystemType=1
+			gMacModelIdentifier="iMac14,1"
+			gACST_CPU0=13   # C1, C2, C3, C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-27ADBB7B4CEE8E61)
+			gSystemType=1
+			gMacModelIdentifier="iMac14,2"
+			gACST_CPU0=15   # C1, C2, C3, C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-77EB7D7DAF985301)
+			gSystemType=1
+			gMacModelIdentifier="iMac14,3"
+			gACST_CPU0=15   # C1, C2, C3, C6
+			gACST_CPU1=7    # C1, C2 and C3
+		;;
+
+		Mac-189A3D4F975D5FFC)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro11,1"
+			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+			gACST_CPU1=31   # C1, C2, C3, C6 and C7
+		;;
+
+		Mac-3CBD00234E554E41)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro11,2"
+			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+			gACST_CPU1=31   # C1, C2, C3, C6 and C7
+		;;
+
+		Mac-2BD1B31983FE1663)
+			gSystemType=2
+			gMacModelIdentifier="MacBookPro11,3"
+			gACST_CPU0=253  # C1, C3, C6, C7, C8, C9 and C10
+			gACST_CPU1=31   # C1, C2, C3, C6 and C7
+		;;
+
+		Mac-35C1E88140C3E6CF)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir6,1"
+			gACST_CPU0=29   # C1, C3, C6, C7
+			gACST_CPU1=7    # C1, C2, C3
+		;;
+
+		Mac-7DF21CB3ED6977E5)
+			gSystemType=2
+			gMacModelIdentifier="MacBookAir6,2"
+			gACST_CPU0=29   # C1, C3, C6, C7
+			gACST_CPU1=7    # C1, C2, C3
+		;;
+
+		Mac-F60DEB81FF30ACF6)
+			gSystemType=3
+			gMacModelIdentifier="MacPro6,1"
+			gACST_CPU0=13   # C1, C3, C6
+			gACST_CPU1=13   # C1, C3, C6
+    esac
 }
 
 #--------------------------------------------------------------------------------
 
 function _exitWithError()
 {
-case "$1" in
-2) echo -e "\nError: 'MaxTurboFrequency' must be in the range of $frequency-$gMaxOCFrequency... exiting\n" 1>&2
-exit 2
-;;
-3) echo -e "\nError: 'TDP' must be in the range of 10-150 Watts... exiting\n" 1>&2
-exit 3
-;;
-4) echo -e "\nError: 'BridgeType' must be 0, 1 or 2... exiting\n" 1>&2
-exit 4
-;;
-5) echo -e "\nError: Unknown processor number... exiting\n" 1>&2
-exit 5
-;;
-6) echo -e "\nError: Processor label length is less than 3... exiting\n" 1>&2
-exit 6
-;;
-7) echo -e "\nError: Processor label not found... exiting\n" 1>&2
-exit 7
-;;
-8) echo -e "\nError: Processor Declaration not found... exiting\n" 1>&2
-exit 8
-;;
-*) exit 1
-;;
-esac
+    case "$1" in
+        2) echo -e "\nError: 'MaxTurboFrequency' must be in the range of $frequency-$gMaxOCFrequency... exiting\n" 1>&2
+           exit 2
+           ;;
+        3) echo -e "\nError: 'TDP' must be in the range of 10-150 Watts... exiting\n" 1>&2
+           exit 3
+           ;;
+        4) echo -e "\nError: 'BridgeType' must be 0, 1 or 2... exiting\n" 1>&2
+           exit 4
+           ;;
+        5) echo -e "\nError: Unknown processor number... exiting\n" 1>&2
+           exit 5
+           ;;
+        6) echo -e "\nError: Processor label length is less than 3... exiting\n" 1>&2
+           exit 6
+           ;;
+        7) echo -e "\nError: Processor label not found... exiting\n" 1>&2
+           exit 7
+           ;;
+        8) echo -e "\nError: Processor Declaration not found... exiting\n" 1>&2
+           exit 8
+           ;;
+        *) exit 1
+           ;;
+    esac
 }
 
 #--------------------------------------------------------------------------------
 
 function main()
 {
-printf "\nsdtPRGen.sh v$gScriptVersion Copyright (c) 2013 by Pike R. Alpha\n"
-echo   '----------------------------------------------------------------'
-
-let assumedTDP=0
-let modelSpecified=0
-let maxTurboFrequency=0
-
-_getCPUNumberFromBrandString
-
-if [[ "$1" != "" ]]; then
-# Sandy Bridge checks
-if [[ ${1:0:4} == "i3-2" || ${1:0:4} == "i5-2" || ${1:0:4} == "i7-2" ]]; then
-let modelSpecified=1
-gProcessorNumber=$1
-fi
-# Ivy Bridge checks
-if [[ ${1:0:4} == "i3-3" || ${1:0:4} == "i5-3" || ${1:0:4} == "i7-3" ]]; then
-let modelSpecified=1
-gProcessorNumber=$1
-fi
-# Haswell checks
-if [[ ${1:0:4} == "i3-4" || ${1:0:4} == "i5-4" || ${1:0:4} == "i7-4" ]]; then
-let modelSpecified=1
-gProcessorNumber=$1
-fi
-# Xeon check
-if [[ ${1:0:1} == "E" ]]; then
-let modelSpecified=1
-gProcessorNumber=$1
-fi
-fi
-
-_getCPUDataByProcessorNumber
-
-if [[ $modelSpecified -eq 1 && $gTypeCPU -eq 0 ]]; then
-_exitWithError $PROCESSOR_NUMBER_ERROR
-fi
-
-if [[ $gBridgeType -eq 0 ]]; then
-local model=$(_getCPUModel)
-
-if (($model==0x2A)); then
-let gTdp=95
-let gBridgeType=2
-fi
-
-if (($model==0x2D)); then
-let assumedTDP=1
-let gTdp=130
-let gBridgeType=2
-fi
-
-if (($model==0x3A || $model==0x3B || $model==0x3E)); then
-let assumedTDP=1
-let gTdp=77
-let gBridgeType=4
-fi
-
-# Haswell
-if (($model==0x3C)); then
-let assumedTDP=1
-let gTdp=84
-let gBridgeType=8
-let gMaxOCFrequency=8000
-fi
-
-# Haswell ULT
-if (($model==0x40)); then
-let assumedTDP=1
-let gTdp=15
-let gBridgeType=8
-fi
-fi
-
-case $gBridgeType in
-2) local bridgeTypeString="Sandy Bridge"
-;;
-4) local bridgeTypeString="Ivy Bridge"
-;;
-8) local bridgeTypeString="Haswell"
-;;
-*) local bridgeTypeString="Unknown"
-;;
-esac
-
-_getBoardID
-_getProcessorNames
-_getProcessorScope
-
-local modelID=$(_getModelName)
-local cpu_type=$(_getCPUtype)
-local currentSystemType=$(_getSystemType)
-local cpuSignature=$(_getCPUSignature)
-
-echo "Generating ${gSsdtID}.dsl for a $modelID [$boardID]"
-echo "$bridgeTypeString Core $gProcessorNumber processor [$cpuSignature] setup [0x$cpu_type]"
-
-#
-# gTypeCPU is greater than 0 when the processor is found in one of the CPU lists
-#
-if (($gTypeCPU));
-then
-local ifs=$IFS
-IFS=","
-local cpuData=($gProcessorData)
-let gTdp=${cpuData[1]}
-let lfm=${cpuData[2]}
-let frequency=${cpuData[3]}
-let maxTurboFrequency=${cpuData[4]}
-
-if [ $maxTurboFrequency == 0 ]; then
-let maxTurboFrequency=$frequency
-fi
-
-let gLogicalCPUs=${cpuData[6]}
-
-IFS=$ifs
-
-echo 'With a maximum TDP of '$gTdp' Watt, as specified by Intel'
-
-#
-# Check Low Frequency Mode (may be 0 aka still unknown)
-#
-if (($lfm > 0));
-then
-let gBaseFrequency=$lfm
-else
-echo -e "\nWarning: Low Frequency Mode is 0 (unknown)"
-
-if (($gTypeCPU == gMobileCPU));
-then
-echo -e "         Now using 1200 MHz for Mobile processor\n"
-let gBaseFrequency=1200
-else
-echo -e "         Now using 1600 MHz for Server/Desktop processors\n"
-let gBaseFrequency=1600
-fi
-fi
-else
-let gLogicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
-let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
-let frequency=($frequency / 1000000)
-
-if [[ $assumedTDP -eq 1 ]]; then
-echo 'With a maximum TDP of '$gTdp' Watt - assumed, may require override value!'
-fi
-fi
-
-#
-# Script argument checks
-#
-
-if [[ $# -ge 2 ]]; then
-if [[ "$2" =~ ^[0-9]+$ ]]; then
-if [[ $2 -lt $frequency || $2 -gt $gMaxOCFrequency ]];
-then
-_exitWithError $MAX_TURBO_FREQUENCY_ERROR
-else
-if [[ $2 -gt $maxTurboFrequency ]]; then
-echo "Override value: Max Turbo Frequency, now using: $2 MHz!"
-let maxTurboFrequency=$2
-fi
-fi
-fi
-fi
-
-if [ $# -ge 3 ]; then
-if [[ "$3" =~ ^[0-9]+$ ]];
-then
-if [[ $3 -lt 10 || $3 -gt 150 ]];
-then
-_exitWithError $MAX_TDP_ERROR
-else
-if [[ $gTdp != $3 ]]; then
-let gTdp=$3
-echo "Override value: Max TDP, now using: $gTdp Watt!"
-fi
-fi
-else
-_exitWithError $MAX_TDP_ERROR
-fi
-fi
-
-if [ $# -ge 4 ]; then
-if [[ "$4" =~ ^[0-9]+$ ]];
-then
-local detectedBridgeType=$gBridgeType
-
-case "$4" in
-0) let gBridgeType=2
-local bridgeTypeString='Sandy Bridge'
-;;
-1) let gBridgeType=4
-local bridgeTypeString='Ivy Bridge'
-;;
-2) let gBridgeType=8
-local bridgeTypeString='Haswell'
-;;
-*) _exitWithError $TARGET_CPU_ERROR
-;;
-esac
-
-if [[ $detectedBridgeType -ne $((2 << $4)) ]]; then
-echo "Override value: CPU type, now using: $bridgeTypeString"
-fi
-else
-_exitWithError $TARGET_CPU_ERROR
-fi
-fi
-
-if [ $# -eq 5 ]; then
-if [ ${#5} -eq 3 ];
-then
-gProcLabel=$(echo "$5" | tr '[:lower:]' '[:upper:]')
-echo "Override value: Now using '$gProcLabel' for ACPI processor names!"
-_updateProcessorNames ${#gProcessorNames[@]}
-else
-_exitWithError $PROCESSOR_LABEL_LENGTH_ERROR
-fi
-fi
-
-echo "Number logical CPU's: $gLogicalCPUs (Core Frequency: $frequency MHz)"
-
-if [ $gLogicalCPUs -gt ${#gProcessorNames[@]} ]; then
-_updateProcessorNames $gLogicalCPUs
-fi
-
-#
-# Check maxTurboFrequency
-#
-if [ $maxTurboFrequency -eq 0 ]; then
-_exitWithError $MAX_TURBO_FREQUENCY_ERROR
-fi
-
-#
-# Get number of Turbo states.
-#
-let turboStates=$(echo "(($maxTurboFrequency - $frequency) / 100)" | bc)
-
-#
-# Check number of Turbo states.
-#
-if [ $turboStates -lt 0 ]; then
-let turboStates=0
-fi
-
-#
-# Report number of Turbo States
-#
-if [ $turboStates -gt 0 ];
-then
-let minTurboFrequency=($frequency+100)
-echo "Number of Turbo States: $turboStates ($minTurboFrequency-$maxTurboFrequency MHz)"
-
-else
-echo "Number of Turbo States: 0"
-fi
-
-local packageLength=$(echo "((($maxTurboFrequency - $gBaseFrequency)+100) / 100)" | bc)
-
-echo "Number of P-States: $packageLength ($gBaseFrequency-$maxTurboFrequency MHz)"
-
-_printHeader
-_printExternals
-_printDebugInfo
-_printScopeStart $turboStates $packageLength
-_printPackages $gTdp $frequency $maxTurboFrequency
-
-if [ $gBridgeType -eq $SANDY_BRIDGE ];
-then
-local cpuTypeString="06"
-
-_initSandyBridgeSetup
-
-_printScopeACST 0
-_printScopeCPUn
-else
-local cpuTypeString="07"
-
-_initIvyBridgeSetup
-
-_printScopeACST 0
-_printMethodDSM
-_printScopeCPUn
-fi
-
-_showLowPowerStates
-_checkPlatformSupport $modelID $boardID
-
-#
-# Some IB CPUPM specific configuration checks
-#
-if [ $gBridgeType -ne $HASWELL ];
-then
-if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
-echo -e "\nWarning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
-fi
-
-if [ $gSystemType -eq 0 ];
-then
-echo -e "\nWarning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
-else
-if [ "$gMacModelIdentifier" != "$modelID" ]; then
-echo "Error: board-id [$boardID] and model [$modelID] mismatch"
-fi
-
-if [ $currentSystemType -ne $gSystemType ]; then
-echo -e "\nWarning: 'system-type' may be set improperly ($currentSystemType instead of $gSystemType)"
-fi
-fi
-fi
+    printf "\nssdtPRGen.sh v0.9 Copyright (c) 2011-2012 by † RevoGirl\n"
+    echo   '             v6.6 Copyright (c) 2013 by † Jeroen'
+    printf "             v$gScriptVersion Copyright (c) 2013-$(date "+%Y") by Pike R. Alpha\n"
+    echo   '----------------------------------------------------------------'
+    printf "System information: $gProductName $gProductVersion ($gBuildVersion)\n"
+
+    let assumedTDP=0
+    let modelSpecified=0
+    let maxTurboFrequency=0
+
+    _getCPUNumberFromBrandString
+
+    if [[ "$1" != "" ]]; then
+        # Sandy Bridge checks
+        if [[ ${1:0:4} == "i3-2" || ${1:0:4} == "i5-2" || ${1:0:4} == "i7-2" ]]; then
+            let modelSpecified=1
+            gProcessorNumber=$1
+        fi
+        # Ivy Bridge checks
+        if [[ ${1:0:4} == "i3-3" || ${1:0:4} == "i5-3" || ${1:0:4} == "i7-3" ]]; then
+            let modelSpecified=1
+            gProcessorNumber=$1
+        fi
+        # Haswell checks
+        if [[ ${1:0:4} == "i3-4" || ${1:0:4} == "i5-4" || ${1:0:4} == "i7-4" ]]; then
+            let modelSpecified=1
+            gProcessorNumber=$1
+        fi
+        # Xeon check
+        if [[ ${1:0:1} == "E" ]]; then
+            let modelSpecified=1
+            gProcessorNumber=$1
+        fi
+    fi
+
+    _getCPUDataByProcessorNumber
+
+    if [[ $modelSpecified -eq 1 && $gTypeCPU -eq 0 ]]; then
+       _exitWithError $PROCESSOR_NUMBER_ERROR
+    fi
+
+    if [[ $gBridgeType -eq 0 ]]; then
+        local model=$(_getCPUModel)
+
+        if (($model==0x2A)); then
+            let gTdp=95
+            let gBridgeType=2
+        fi
+
+        if (($model==0x2D)); then
+            let assumedTDP=1
+            let gTdp=130
+            let gBridgeType=2
+        fi
+
+        if (($model==0x3A || $model==0x3B || $model==0x3E)); then
+            let assumedTDP=1
+            let gTdp=77
+            let gBridgeType=4
+        fi
+
+        # Haswell
+        if (($model==0x3C)); then
+            let assumedTDP=1
+            let gTdp=84
+            let gBridgeType=8
+            let gMaxOCFrequency=8000
+        fi
+
+        # Haswell SVR
+        if (($model==0x3F)); then
+            let assumedTDP=1
+            let gTdp=130
+            let gBridgeType=8
+        fi
+
+        # Haswell ULT
+        if (($model==0x45)); then
+            let assumedTDP=1
+            let gTdp=15
+            let gBridgeType=8
+        fi
+    fi
+
+    case $gBridgeType in
+        2) local bridgeTypeString="Sandy Bridge"
+           ;;
+        4) local bridgeTypeString="Ivy Bridge"
+           ;;
+        8) local bridgeTypeString="Haswell"
+           ;;
+        *) local bridgeTypeString="Unknown"
+           ;;
+    esac
+
+    _getBoardID
+    _getProcessorNames
+    _getProcessorScope
+
+    local modelID=$(_getModelName)
+    local cpu_type=$(_getCPUtype)
+    local currentSystemType=$(_getSystemType)
+    local cpuSignature=$(_getCPUSignature)
+
+    echo "Generating ${gSsdtID}.dsl for a $modelID [$boardID]"
+    echo "$bridgeTypeString Core $gProcessorNumber processor [$cpuSignature] setup [0x$cpu_type]"
+
+    #
+    # gTypeCPU is greater than 0 when the processor is found in one of the CPU lists
+    #
+    if (($gTypeCPU));
+        then
+            local ifs=$IFS
+            IFS=","
+            local cpuData=($gProcessorData)
+            let gTdp=${cpuData[1]}
+            let lfm=${cpuData[2]}
+            let frequency=${cpuData[3]}
+            let maxTurboFrequency=${cpuData[4]}
+
+            if [ $maxTurboFrequency == 0 ]; then
+                let maxTurboFrequency=$frequency
+            fi
+
+            let gLogicalCPUs=${cpuData[6]}
+
+            IFS=$ifs
+
+            echo 'With a maximum TDP of '$gTdp' Watt, as specified by Intel'
+
+            #
+            # Check Low Frequency Mode (may be 0 aka still unknown)
+            #
+            if (($lfm > 0));
+                then
+                    let gBaseFrequency=$lfm
+                else
+                    echo -e "\nWarning: Low Frequency Mode is 0 (unknown/unconfirmed)"
+
+                    if (($gTypeCPU == gMobileCPU));
+                        then
+                            echo -e "         Now using 1200 MHz for Mobile processor\n"
+                            let gBaseFrequency=1200
+                        else
+                            echo -e "         Now using 1600 MHz for Server/Desktop processors\n"
+                            let gBaseFrequency=1600
+                    fi
+            fi
+        else
+            let gLogicalCPUs=$(echo `sysctl machdep.cpu.thread_count` | sed -e 's/^machdep.cpu.thread_count: //')
+            let frequency=$(echo `sysctl hw.cpufrequency` | sed -e 's/^hw.cpufrequency: //')
+            let frequency=($frequency / 1000000)
+
+            if [[ $assumedTDP -eq 1 ]]; then
+                echo 'With a maximum TDP of '$gTdp' Watt - assumed, may require override value!'
+            fi
+    fi
+
+    #
+    # Script argument checks
+    #
+
+    if [[ $# -ge 2 ]]; then
+        if [[ "$2" =~ ^[0-9]+$ ]]; then
+            if [[ $2 -lt $frequency || $2 -gt $gMaxOCFrequency ]];
+                then
+                    _exitWithError $MAX_TURBO_FREQUENCY_ERROR
+                else
+                    if [[ $2 -gt $maxTurboFrequency ]]; then
+                        echo "Override value: Max Turbo Frequency, now using: $2 MHz!"
+                        let maxTurboFrequency=$2
+                    fi
+            fi
+        fi
+    fi
+
+    if [ $# -ge 3 ]; then
+        if [[ "$3" =~ ^[0-9]+$ ]];
+            then
+                if [[ $3 -lt 10 || $3 -gt 150 ]];
+                    then
+                        _exitWithError $MAX_TDP_ERROR
+                    else
+                        if [[ $gTdp != $3 ]]; then
+                            let gTdp=$3
+                            echo "Override value: Max TDP, now using: $gTdp Watt!"
+                        fi
+                fi
+            else
+                _exitWithError $MAX_TDP_ERROR
+        fi
+    fi
+
+    if [ $# -ge 4 ]; then
+        if [[ "$4" =~ ^[0-9]+$ ]];
+            then
+                local detectedBridgeType=$gBridgeType
+
+                case "$4" in
+                    0) let gBridgeType=2
+                       local bridgeTypeString='Sandy Bridge'
+                       ;;
+                    1) let gBridgeType=4
+                       local bridgeTypeString='Ivy Bridge'
+                       ;;
+                    2) let gBridgeType=8
+                       local bridgeTypeString='Haswell'
+                       ;;
+                    *) _exitWithError $TARGET_CPU_ERROR
+                       ;;
+                esac
+
+                if [[ $detectedBridgeType -ne $((2 << $4)) ]]; then
+                    echo "Override value: CPU type, now using: $bridgeTypeString"
+                fi
+            else
+                _exitWithError $TARGET_CPU_ERROR
+        fi
+    fi
+
+    if [ $# -eq 5 ]; then
+        if [ ${#5} -eq 3 ];
+            then
+                gProcLabel=$(echo "$5" | tr '[:lower:]' '[:upper:]')
+                echo "Override value: Now using '$gProcLabel' for ACPI processor names!"
+                _updateProcessorNames ${#gProcessorNames[@]}
+            else
+                _exitWithError $PROCESSOR_LABEL_LENGTH_ERROR
+        fi
+    fi
+
+    echo "Number logical CPU's: $gLogicalCPUs (Core Frequency: $frequency MHz)"
+
+    if [ $gLogicalCPUs -gt ${#gProcessorNames[@]} ]; then
+        _updateProcessorNames $gLogicalCPUs
+    fi
+
+    #
+    # Check maxTurboFrequency
+    #
+    if [ $maxTurboFrequency -eq 0 ]; then
+        _exitWithError $MAX_TURBO_FREQUENCY_ERROR
+    fi
+
+	#
+    # Get number of Turbo states.
+    #
+    let turboStates=$(echo "(($maxTurboFrequency - $frequency) / 100)" | bc)
+
+    #
+    # Check number of Turbo states.
+    #
+    if [ $turboStates -lt 0 ]; then
+        let turboStates=0
+    fi
+
+    #
+    # Report number of Turbo States
+    #
+    if [ $turboStates -gt 0 ];
+        then
+            let minTurboFrequency=($frequency+100)
+            echo "Number of Turbo States: $turboStates ($minTurboFrequency-$maxTurboFrequency MHz)"
+
+        else
+            echo "Number of Turbo States: 0"
+    fi
+
+    local packageLength=$(echo "((($maxTurboFrequency - $gBaseFrequency)+100) / 100)" | bc)
+
+    echo "Number of P-States: $packageLength ($gBaseFrequency-$maxTurboFrequency MHz)"
+
+    _printHeader
+    _printExternals
+    _printScopeStart $turboStates $packageLength
+    _printPackages $gTdp $frequency $maxTurboFrequency
+
+    case "$gBridgeType" in
+        $SANDY_BRIDGE)
+            local cpuTypeString="06"
+            _initSandyBridgeSetup
+            _printScopeACST 0
+            _printScopeCPUn
+            ;;
+        $IVY_BRIDGE)
+            local cpuTypeString="07"
+            _initIvyBridgeSetup
+            _printScopeACST 0
+            _printMethodDSM
+            _printScopeCPUn
+            ;;
+        $HASWELL)
+            local cpuTypeString="08"
+            _initHaswellSetup
+            _printScopeACST 0
+            _printMethodDSM
+            _printScopeCPUn
+           ;;
+    esac
+
+    _showLowPowerStates
+    _checkPlatformSupport $modelID $boardID
+
+    #
+    # Some Sandy Bridge/Ivy Bridge CPUPM specific configuration checks
+    #
+    if [ $gBridgeType -ne $HASWELL ]; then
+        if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
+            echo -e "\nWarning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
+        fi
+
+        if [ $gSystemType -eq 0 ];
+            then
+                echo -e "\nWarning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
+            else
+                if [ "$gMacModelIdentifier" != "$modelID" ]; then
+                    echo "Error: board-id [$boardID] and model [$modelID] mismatch"
+                fi
+        fi
+    fi
+
+    if [ $currentSystemType -ne $gSystemType ]; then
+        echo -e "\nWarning: 'system-type' may be set improperly ($currentSystemType instead of $gSystemType)"
+    fi
 }
 
 #==================================== START =====================================
@@ -2117,52 +2200,52 @@ fi
 clear
 
 if [ $# -eq 0 ];
-then
-main "" $1 $2 $3 $4
-else
-if [[ "$1" =~ ^[0-9]+$ ]];
-then
-main "" $1 $2 $3 $4
-else
-main "$1" $2 $3 $4 $5
-fi
+    then
+        main "" $1 $2 $3 $4
+    else
+        if [[ "$1" =~ ^[0-9]+$ ]];
+            then
+                main "" $1 $2 $3 $4
+            else
+                main "$1" $2 $3 $4 $5
+        fi
 fi
 
 _findIasl
 
 if (($gCallIasl)); then
-#
-# Compile ssdt.dsl
-#
-"$iasl" $gSsdtPR
-
-#
-# Copy ssdt_pr.aml to /Extra/ssdt.aml (example)
-#
-if (($gAutoCopy)); then
-if [ -f ${gPath}/${gSsdtID}.aml ]; then
-_setDestinationPath
-echo -e
-read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
-case "$choice" in
-y|Y ) sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile}
-;;
-esac
-
-if (($gUnmountEFIPartition)); then
-echo -e '\nUnmounting EFI partition...'
-sudo umount -f /Volumes/EFI
-echo 'Removing temporarily mount point...'
-sudo rm -r /Volumes/EFI
-fi
-fi
-fi
+    #
+    # Compile ssdt.dsl
+    #
+    sudo "$iasl" $gSsdtPR
+
+    #
+    # Copy ssdt_pr.aml to /Extra/ssdt.aml (example)
+    #
+    if (($gAutoCopy)); then
+        if [ -f ${gPath}/${gSsdtID}.aml ]; then
+            _setDestinationPath
+            echo -e
+            read -p "Do you want to copy ${gPath}/${gSsdtID}.aml to ${gDestinationPath}${gDestinationFile}? (y/n)?" choice
+            case "$choice" in
+                y|Y ) sudo cp ${gPath}/${gSsdtID}.aml ${gDestinationPath}${gDestinationFile}
+                      ;;
+            esac
+
+            if (($gUnmountEFIPartition)); then
+                echo -e '\nUnmounting EFI partition...'
+                sudo umount -f /Volumes/EFI
+                echo 'Removing temporarily mount point...'
+                sudo rm -r /Volumes/EFI
+            fi
+        fi
+    fi
 
 fi
 
 if ((gCallOpen)); then
-open $gSsdtPR
+    open $gSsdtPR
 fi
 
 exit 0
-#================================================================================
\ No newline at end of file
+#================================================================================

From 9cb8a02aec7531ecda06fe12eb6fbe1b58c53fbd Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 31 Dec 2013 08:00:56 +0100
Subject: [PATCH 424/623] Intel E5-2695 V2 added

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index c6a68f4..47656f7 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 7.3 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 7.4 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -80,6 +80,7 @@
 #			– Frequency error in i7-4700MQ data fixed, thanks to RehabMan (Pike, November 2013)
 #			- Intel i5-4200M added (Pike, December 2013)
 #			- LFM fixed in the Intel i7-3930K data (Pike, December 2013)
+#			- Intel E5-2695 V2 added (Pike, December 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -187,7 +188,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=7.3
+gScriptVersion=7.4
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -376,6 +377,7 @@ gServerIvyBridgeCPUList=(
 'E3-1225 V2',77,0,3200,3600,4,4
 'E3-1220 V2',69,0,3100,3500,4,4
 'E3-1220L V2',17,0,2300,3500,2,4
+'E5-2695 V2',115,1200,2400,3200,12,24
 )
 
 gDesktopIvyBridgeCPUList=(

From 618edb00f59c2901a1e33eb6d05a48b370688a0a Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 31 Dec 2013 12:51:13 +0100
Subject: [PATCH 425/623] Intel i3-3250 added

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 47656f7..a17972e 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 7.4 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 7.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -81,6 +81,7 @@
 #			- Intel i5-4200M added (Pike, December 2013)
 #			- LFM fixed in the Intel i7-3930K data (Pike, December 2013)
 #			- Intel E5-2695 V2 added (Pike, December 2013)
+#			- Intel i3-3250 added (Pike, December 2013)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -188,7 +189,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=7.4
+gScriptVersion=7.5
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -407,6 +408,7 @@ i5-3333S,65,1600,2700,3200,4,4
 i5-3330S,65,1600,3700,3200,4,4
 i5-3330,77,1600,3000,3200,4,4
 # i3-3200 Desktop Processor Series
+i3-3250,55,1600,3500,0,2,4
 i3-3240,55,1600,3400,0,2,4
 i3-3240T,35,1600,2900,0,2,4
 i3-3225,55,1600,3300,0,2,4

From f7c6e3d309c0eefe68772eab84e1e7d86030a558 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 1 Jan 2014 03:47:25 +0100
Subject: [PATCH 426/623] Resolving KP

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 61 +++++++++++++------
 .../AppleIntelCPUPowerManagementInfo.h        |  8 +--
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 9c62709..a193215 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -13,7 +13,7 @@
 
 //==============================================================================
 
-void AppleIntelCPUPowerManagementInfo::reportMSRs(void)
+void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 {
 	IOLog("AICPUPMI: MSR_CORE_THREAD_COUNT......(0x35)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_THREAD_COUNT));
 	
@@ -50,24 +50,44 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(void)
 	IOLog("AICPUPMI: MSR_PP0_POWER_LIMIT........(0x638) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POWER_LIMIT));
 	IOLog("AICPUPMI: MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
 	IOLog("AICPUPMI: MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
-	
-	/* IOLog("AICPUPMI: MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
-	 IOLog("AICPUPMI: MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
-	 IOLog("AICPUPMI: MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
-	 IOLog("AICPUPMI: MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY)); */
-	
-	IOLog("AICPUPMI: MSR_CONFIG_TDP_NOMINAL.....(0x648) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_NOMINAL));
-	IOLog("AICPUPMI: MSR_CONFIG_TDP_LEVEL1......(0x649) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL1));
-	IOLog("AICPUPMI: MSR_CONFIG_TDP_LEVEL2......(0x64a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL2));
-	IOLog("AICPUPMI: MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
-	IOLog("AICPUPMI: MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
+
+	switch (aCPUModel)
+	{
+		case CPU_MODEL_SB_CORE:				// 0x2A - Intel 325462.pdf Vol.3C 35-120
+		case CPU_MODEL_HASWELL:				// 0x3C - Intel 325462.pdf Vol.3C 35-140
+		case CPU_MODEL_HASWELL_ULT:			// 0x45 - Intel 325462.pdf Vol.3C 35-140
+		case CPU_MODEL_CRYSTALWELL:			// 0x46 - Intel 325462.pdf Vol.3C 35-140
+
+			IOLog("AICPUPMI: MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
+			IOLog("AICPUPMI: MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
+			IOLog("AICPUPMI: MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
+			IOLog("AICPUPMI: MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY));
+			break;
+	}
+
+	switch (aCPUModel)
+	{
+		case CPU_MODEL_IB_CORE:				// 0x3A - Intel 325462.pdf Vol.3C 35-126
+		case CPU_MODEL_IB_CORE_EX:			// 0x3B - Intel 325462.pdf Vol.3C 35-126
+		case CPU_MODEL_IB_CORE_XEON:		// 0x3E - Intel 325462.pdf Vol.3C 35-126
+		case CPU_MODEL_HASWELL:				// 0x3C - Intel 325462.pdf Vol.3C 35-133
+		case CPU_MODEL_HASWELL_ULT:			// 0x45 - Intel 325462.pdf Vol.3C 35-133
+		case CPU_MODEL_CRYSTALWELL:			// 0x46 - Intel 325462.pdf Vol.3C 35-133
+
+			IOLog("AICPUPMI: MSR_CONFIG_TDP_NOMINAL.....(0x648) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_NOMINAL));
+			IOLog("AICPUPMI: MSR_CONFIG_TDP_LEVEL1......(0x649) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL1));
+			IOLog("AICPUPMI: MSR_CONFIG_TDP_LEVEL2......(0x64a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_LEVEL2));
+			IOLog("AICPUPMI: MSR_CONFIG_TDP_CONTROL.....(0x64b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CONFIG_TDP_CONTROL));
+			IOLog("AICPUPMI: MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
+			break;
+	}
 	
 	IOLog("AICPUPMI: MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
 	IOLog("AICPUPMI: MSR_PKG_C3_RESIDENCY.......(0x3f8) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C3_RESIDENCY));
 	IOLog("AICPUPMI: MSR_PKG_C6_RESIDENCY.......(0x3f9) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C6_RESIDENCY));
 	IOLog("AICPUPMI: MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
 	
-	if (gCPUModel == CPU_MODEL_HASWELL_ULT)
+	if (aCPUModel == CPU_MODEL_HASWELL_ULT) // 0x45 - Intel 325462.pdf Vol.3C 35-136
 	{
 		IOLog("AICPUPMI: MSR_PKG_C8_RESIDENCY.......(0x630) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
 		IOLog("AICPUPMI: MSR_PKG_C9_RESIDENCY.......(0x631) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
@@ -298,7 +318,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				uint32_t cpuid_reg[4];
 				do_cpuid(0x00000001, cpuid_reg);
 				
-				gCPUModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
+				UInt8 cpuModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
 				
 				// MWAIT information
 				do_cpuid(0x00000005, cpuid_reg);
@@ -307,7 +327,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				IOLog("AICPUPMI: MWAIT C-States     : %d\n", supportedMwaitCStates);
 				
 #if REPORT_MSRS
-				reportMSRs();
+				reportMSRs(cpuModel);
 #endif
 				msr = rdmsr64(MSR_PLATFORM_INFO);
 				gMinRatio = (UInt8)((msr >> 40) & 0xff);
@@ -395,9 +415,16 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 #endif
 				
 #if REPORT_C_STATES
-				if ((gCPUModel == CPU_MODEL_SB_CORE) || (gCPUModel == CPU_MODEL_SB_JAKETOWN) || (gCPUModel == CPU_MODEL_HASWELL))
+				switch (cpuModel) // TODO: Verify me!
 				{
-					gCheckC7 = true;
+					case CPU_MODEL_SB_CORE:			// 0x2A
+					case CPU_MODEL_SB_JAKETOWN:		// 0x2D
+					case CPU_MODEL_HASWELL:			// 0x3C
+					case CPU_MODEL_HASWELL_ULT:		// 0x45
+					case CPU_MODEL_CRYSTALWELL:		// 0x46
+
+						gCheckC7 = true;
+						break;
 				}
 #endif
 				timerEventSource->setTimeoutMS(1000);
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 034489e..6999713 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -101,11 +101,11 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 	
 	virtual IOReturn loopTimerEvent(void);
 	
-	void reportMSRs(void);
+	void reportMSRs(UInt8 aCPUModel);
 	
-	bool loopLock = false;
-	bool dumpCStates = true;
-	bool igpuEnabled = true;
+	bool loopLock = false;		// TODO: Use Info.plist
+	bool dumpCStates = true;	// TODO: Use Info.plist
+	bool igpuEnabled = true;	// TODO: Use Info.plist
 	
 	UInt16 Interval	= 50;
 	

From 9dbae13fca03b2c20cfdc4411f0b7ed7e5ec12f6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 1 Jan 2014 17:54:02 +0100
Subject: [PATCH 427/623] Cleanups

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 76 +++++++++----------
 .../AppleIntelCPUPowerManagementInfo.h        | 11 ++-
 2 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index a193215..bc8f868 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -51,18 +51,22 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 	IOLog("AICPUPMI: MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
 	IOLog("AICPUPMI: MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
 
-	switch (aCPUModel)
+	if (igpuEnabled)
 	{
-		case CPU_MODEL_SB_CORE:				// 0x2A - Intel 325462.pdf Vol.3C 35-120
-		case CPU_MODEL_HASWELL:				// 0x3C - Intel 325462.pdf Vol.3C 35-140
-		case CPU_MODEL_HASWELL_ULT:			// 0x45 - Intel 325462.pdf Vol.3C 35-140
-		case CPU_MODEL_CRYSTALWELL:			// 0x46 - Intel 325462.pdf Vol.3C 35-140
+		switch (aCPUModel)
+		{
+			case CPU_MODEL_SB_CORE:				// 0x2A - Intel 325462.pdf Vol.3C 35-120
+			case CPU_MODEL_IB_CORE:				// 0x3A - Intel 325462.pdf Vol.3C 35-125 (Referring to Table 35-13)
+			case CPU_MODEL_HASWELL:				// 0x3C - Intel 325462.pdf Vol.3C 35-140
+			case CPU_MODEL_HASWELL_ULT:			// 0x45 - Intel 325462.pdf Vol.3C 35-140
+			case CPU_MODEL_CRYSTALWELL:			// 0x46 - Intel 325462.pdf Vol.3C 35-140
 
-			IOLog("AICPUPMI: MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
-			IOLog("AICPUPMI: MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
-			IOLog("AICPUPMI: MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
-			IOLog("AICPUPMI: MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY));
-			break;
+				IOLog("AICPUPMI: MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
+				IOLog("AICPUPMI: MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
+				IOLog("AICPUPMI: MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
+				IOLog("AICPUPMI: MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY));
+				break;
+		}
 	}
 
 	switch (aCPUModel)
@@ -81,12 +85,12 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 			IOLog("AICPUPMI: MSR_TURBO_ACTIVATION_RATIO.(0x64c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_ACTIVATION_RATIO));
 			break;
 	}
-	
+
 	IOLog("AICPUPMI: MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
 	IOLog("AICPUPMI: MSR_PKG_C3_RESIDENCY.......(0x3f8) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C3_RESIDENCY));
 	IOLog("AICPUPMI: MSR_PKG_C6_RESIDENCY.......(0x3f9) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C6_RESIDENCY));
 	IOLog("AICPUPMI: MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
-	
+
 	if (aCPUModel == CPU_MODEL_HASWELL_ULT) // 0x45 - Intel 325462.pdf Vol.3C 35-136
 	{
 		IOLog("AICPUPMI: MSR_PKG_C8_RESIDENCY.......(0x630) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
@@ -167,9 +171,6 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 		if (gCoreMultipliers != gTriggeredPStates)
 #endif
 		{
-			// int currentBit = 0;
-			// UInt64 value = 0ULL;
-			
 			gTriggeredPStates = gCoreMultipliers;
 			IOLog("AICPUPMI: CPU P-States [ ");
 			
@@ -312,9 +313,6 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				UInt64  msr = rdmsr64(MSR_IA32_PERF_STS);
 				gCoreMultipliers |= (1ULL << (msr >> 8));
 				
-				// wrmsr64(IA32_ENERGY_PERF_BIAS, 15);
-				// wrmsr64(MSR_IA32_PERF_CONTROL, 0x2000);
-				
 				uint32_t cpuid_reg[4];
 				do_cpuid(0x00000001, cpuid_reg);
 				
@@ -325,31 +323,32 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				uint32_t supportedMwaitCStates = bitfield32(cpuid_reg[edx], 31,  0);
 				
 				IOLog("AICPUPMI: MWAIT C-States     : %d\n", supportedMwaitCStates);
-				
+
+				bool isIGPUEnabled = ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK)); // IGPU Enabled and Visible?
 #if REPORT_MSRS
 				reportMSRs(cpuModel);
 #endif
 				msr = rdmsr64(MSR_PLATFORM_INFO);
 				gMinRatio = (UInt8)((msr >> 40) & 0xff);
-				IOLog("AICPUPMI: Low Frequency Mode : %d00 MHz\n", gMinRatio);
+				IOLog("AICPUPMI: Low Frequency Mode.................: %d00 MHz\n", gMinRatio);
 				
 				gClockRatio = (UInt8)((msr >> 8) & 0xff);
-				IOLog("AICPUPMI: Clock Speed        : %d00 MHz\n", gClockRatio);
+				IOLog("AICPUPMI: Clock Speed (Max. Non-Turbo Freq.).: %d00 MHz\n", gClockRatio);
 				
 				if (!((rdmsr64(IA32_MISC_ENABLES) >> 32) & 0x40))	// Turbo Mode Enabled?
 				{
 					msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
 					gMaxRatio = (UInt8)(msr & 0xff);
-					IOLog("AICPUPMI: Max Turbo Frequency: %d00 MHz\n", gMaxRatio);
+					IOLog("AICPUPMI: Maximum Turbo Frequency............: %d00 MHz\n", gMaxRatio);
 				}
 				else
 				{
 					gMaxRatio = gClockRatio;
-					IOLog("AICPUPMI: Max Frequency      : %d00 MHz\n", gMaxRatio);
+					IOLog("AICPUPMI: Maximum Frequency..................: %d00 MHz\n", gMaxRatio);
 				}
 				
 #if REPORT_GPU_STATS
-				if ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK))
+				if (isIGPUEnabled)
 				{
 					IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
 					memDescriptor = IOMemoryDescriptor::withPhysicalAddress(address, 0x53, kIODirectionInOut);
@@ -362,7 +361,6 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 							
 							if (memoryMap != NULL)
 							{
-								igpuEnabled = true; // IGPU Enabled and Visible
 								gMchbar = (UInt8 *)memoryMap->getVirtualAddress();
 								
 								// Preventing a stupid (UEFI) BIOS limit.
@@ -372,29 +370,27 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 								}
 								
 								//
-								// Examples:
-								//			17 (multiplier) * 50 (frequency in MHz) =  850 MHz
-								//			22 (multiplier) * 50 (frequency in MHz) = 1100 MHz
-								//			6 P-States: 850, 900, 950, 1000, 1050 and 1100 MHz
-								//
+								// Examples IGPU multiplier:	17 (multiplier) * 50 (frequency in MHz) =  850 MHz
+								//								22 (multiplier) * 50 (frequency in MHz) = 1100 MHz
+								//								6 P-States: 850, 900, 950, 1000, 1050 and 1100 MHz
 								//
 								// Current RP-State, when the graphics engine is in RC6, this reflects the last used ratio.
-								IOLog("AICPUPMI: IGPU Current Frequency..: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x01])); // RP_STATE_RATIO (CURRENT_FREQUENCY)
+								IOLog("AICPUPMI: IGPU Current Frequency.............: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x01])); // RP_STATE_RATIO (CURRENT_FREQUENCY)
 								// Maximum RPN base frequency capability for the Integrated GFX Engine (GT).
-								IOLog("AICPUPMI: IGPU Min Frequency......: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x52])); // RPN_CAP (MIN_FREQUENCY)
+								IOLog("AICPUPMI: IGPU Minimum Frequency.............: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x52])); // RPN_CAP (MIN_FREQUENCY)
 								// Maximum RP1 base frequency capability for the Integrated GFX Engine (GT).
-								IOLog("AICPUPMI: IGPU Max Non-Turbo Freq.: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x51])); // RP1_CAP (MAX_NON_TURBO)
+								IOLog("AICPUPMI: IGPU Maximum Non-Turbo Frequency...: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x51])); // RP1_CAP (MAX_NON_TURBO)
 								// Maximum RP0 base frequency capability for the Integrated GFX Engine (GT).
-								IOLog("AICPUPMI: IGPU Max Turbo Frequency: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x50])); // RP0_CAP (MAX_TURBO))
+								IOLog("AICPUPMI: IGPU Maximum Turbo Frequency.......: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x50])); // RP0_CAP (MAX_TURBO))
 								
 								// Maximum base frequency limit for the Integrated GFX Engine (GT) allowed during run-time.
 								if (gMchbar[0x4C] == 255)
 								{
-									IOLog("AICPUPMI: IGPU Maximum limit......: No Limit\n"); // RPSTT_LIM
+									IOLog("AICPUPMI: IGPU Maximum limit.................: No Limit\n"); // RPSTT_LIM
 								}
 								else
 								{
-									IOLog("AICPUPMI: IGPU Maximum limit......: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x4C])); // RPSTT_LIM
+									IOLog("AICPUPMI: IGPU Maximum limit.................: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x4C])); // RPSTT_LIM
 								}
 							}
 							else
@@ -417,10 +413,10 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 #if REPORT_C_STATES
 				switch (cpuModel) // TODO: Verify me!
 				{
-					case CPU_MODEL_SB_CORE:			// 0x2A
-					case CPU_MODEL_SB_JAKETOWN:		// 0x2D
-					case CPU_MODEL_HASWELL:			// 0x3C
-					case CPU_MODEL_HASWELL_ULT:		// 0x45
+					case CPU_MODEL_SB_CORE:			// 0x2A - Intel 325462.pdf Vol.3C 35-111
+					case CPU_MODEL_SB_JAKETOWN:		// 0x2D - Intel 325462.pdf Vol.3C 35-111
+					case CPU_MODEL_HASWELL:			// 0x3C - Intel 325462.pdf Vol.3C 35-136
+					case CPU_MODEL_HASWELL_ULT:		// 0x45 - Intel 325462.pdf Vol.3C 35-136
 					case CPU_MODEL_CRYSTALWELL:		// 0x46
 
 						gCheckC7 = true;
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 6999713..8db6441 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -70,7 +70,6 @@ UInt8 ReadPci8(UInt8 Bus, UInt8 Dev, UInt8 Fun, UInt16 Reg)
 {
 	if (Reg >= 0x100)
 	{
-		// return MMIO_READ8(NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
 		return MMIO_READ8((UInt64)NB_PCIE_CFG_ADDRESS(Bus, Dev, Fun, Reg));
 	}
 	else
@@ -103,10 +102,11 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 	
 	void reportMSRs(UInt8 aCPUModel);
 	
-	bool loopLock = false;		// TODO: Use Info.plist
-	bool dumpCStates = true;	// TODO: Use Info.plist
-	bool igpuEnabled = true;	// TODO: Use Info.plist
-	
+	bool loopLock		= false;
+	bool igpuEnabled	= true;
+
+	bool dumpCStates	= true;	// TODO: Use Info.plist
+
 	UInt16 Interval	= 50;
 	
 	UInt64	gCoreMultipliers		= 0ULL;
@@ -128,7 +128,6 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 
 OSDefineMetaClassAndStructors(AppleIntelCPUPowerManagementInfo, IOService)
 
-UInt8	gCPUModel	= 0x2A;
 UInt8	gCoreStates	= 0ULL;
 
 #if REPORT_C_STATES

From 083992c28d9454d66c710c030dfc1e72278c0bc0 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 1 Jan 2014 18:19:18 +0100
Subject: [PATCH 428/623] And Sandy Bridge also (lost somehow)

---
 .../AppleIntelCPUPowerManagementInfo.cpp                         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index bc8f868..60e049d 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -71,6 +71,7 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 
 	switch (aCPUModel)
 	{
+		case CPU_MODEL_SB_CORE:				// 0x2A - Intel 325462.pdf Vol.3C 35-120
 		case CPU_MODEL_IB_CORE:				// 0x3A - Intel 325462.pdf Vol.3C 35-126
 		case CPU_MODEL_IB_CORE_EX:			// 0x3B - Intel 325462.pdf Vol.3C 35-126
 		case CPU_MODEL_IB_CORE_XEON:		// 0x3E - Intel 325462.pdf Vol.3C 35-126

From ea7fc37d27469e210075db14cd3fd55e2e8aed12 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 1 Jan 2014 18:33:31 +0100
Subject: [PATCH 429/623] Let's enable Ivy Bridge C-State logging again

---
 .../AppleIntelCPUPowerManagementInfo.cpp                       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 60e049d..0199917 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -416,6 +416,9 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				{
 					case CPU_MODEL_SB_CORE:			// 0x2A - Intel 325462.pdf Vol.3C 35-111
 					case CPU_MODEL_SB_JAKETOWN:		// 0x2D - Intel 325462.pdf Vol.3C 35-111
+					case CPU_MODEL_IB_CORE:			// 0x3A - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
+					case CPU_MODEL_IB_CORE_EX:		// 0x3B - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
+					case CPU_MODEL_IB_CORE_XEON:	// 0x3E - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
 					case CPU_MODEL_HASWELL:			// 0x3C - Intel 325462.pdf Vol.3C 35-136
 					case CPU_MODEL_HASWELL_ULT:		// 0x45 - Intel 325462.pdf Vol.3C 35-136
 					case CPU_MODEL_CRYSTALWELL:		// 0x46

From b1d417ea1a31c00261c3f86c42ca00d3c72b58dd Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 2 Jan 2014 00:28:15 +0100
Subject: [PATCH 430/623] Typo, optimisation and latency/system-type issues
 fixed

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index a17972e..2c2512c 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -610,7 +610,7 @@ function _injectDebugInfo()
     #
     # 'machdep.xcpm' is introduced in 10.8.5
     #
-    if [[ $productVersion > "10.8.4" ]]; then
+    if [[ $gProductVersion > "10.8.4" ]]; then
       xcpm=$(/usr/sbin/sysctl -n machdep.xcpm.mode)
     fi
 
@@ -670,8 +670,13 @@ function _printScopeStart()
             let lowFrequencyPStates=($gBaseFrequency/100)-8
             let packageLength=($2+$lowFrequencyPStates)
 
-            printf "        Name (APLF, 0x%02x" $lowFrequencyPStates                    >> $gSsdtPR
-            echo ')'                                                                    >> $gSsdtPR
+            if [[ lowFrequencyPStates -gt 0 ]];
+                then
+                    printf "        Name (APLF, 0x%02x)\n" $lowFrequencyPStates         >> $gSsdtPR
+                else
+                    # Prevent optimization warning.
+                    echo "        Name (APLF, Zero)"                                    >> $gSsdtPR
+            fi
 
             # TODO: Remove this when CPUPM for IB works properly!
             if [[ gIvyWorkAround && $gBridgeType -eq $IVY_BRIDGE ]]; then
@@ -902,6 +907,7 @@ function _printScopeACST()
 
             let targetCStates=$gACST_CPU0
             latency_C1=Zero
+            latency_C2=0x43
             latency_C3=0xCD
             latency_C6=0xF5
             latency_C7=0xF5
@@ -1766,7 +1772,14 @@ function _initIvyBridgeSetup()
 			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 		;;
-	esac
+
+		Mac-F60DEB81FF30ACF6)
+			gSystemType=3
+			gMacModelIdentifier="MacPro6,1"
+			gACST_CPU0=13   # C1, C3, C6
+			gACST_CPU1=13   # C1, C3, C6
+		;;
+esac
 }
 
 #--------------------------------------------------------------------------------
@@ -1777,21 +1790,21 @@ function _initHaswellSetup()
 		Mac-031B6874CF7F642A)
 			gSystemType=1
 			gMacModelIdentifier="iMac14,1"
-			gACST_CPU0=13   # C1, C2, C3, C6
+			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 		;;
 
 		Mac-27ADBB7B4CEE8E61)
 			gSystemType=1
 			gMacModelIdentifier="iMac14,2"
-			gACST_CPU0=15   # C1, C2, C3, C6
+			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 		;;
 
 		Mac-77EB7D7DAF985301)
 			gSystemType=1
 			gMacModelIdentifier="iMac14,3"
-			gACST_CPU0=15   # C1, C2, C3, C6
+			gACST_CPU0=29   # C1, C3, C6 and C7
 			gACST_CPU1=7    # C1, C2 and C3
 		;;
 
@@ -1835,6 +1848,7 @@ function _initHaswellSetup()
 			gMacModelIdentifier="MacPro6,1"
 			gACST_CPU0=13   # C1, C3, C6
 			gACST_CPU1=13   # C1, C3, C6
+		;;
     esac
 }
 

From 4d5dc7b8725507d67618e00e86f0bc605c9929a3 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 2 Jan 2014 01:15:30 +0100
Subject: [PATCH 431/623] Stop KP on SB/Haswell

---
 .../AppleIntelCPUPowerManagementInfo.cpp                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 0199917..e4e985a 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -57,11 +57,12 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 		{
 			case CPU_MODEL_SB_CORE:				// 0x2A - Intel 325462.pdf Vol.3C 35-120
 			case CPU_MODEL_IB_CORE:				// 0x3A - Intel 325462.pdf Vol.3C 35-125 (Referring to Table 35-13)
+				IOLog("AICPUPMI: MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
+
 			case CPU_MODEL_HASWELL:				// 0x3C - Intel 325462.pdf Vol.3C 35-140
 			case CPU_MODEL_HASWELL_ULT:			// 0x45 - Intel 325462.pdf Vol.3C 35-140
 			case CPU_MODEL_CRYSTALWELL:			// 0x46 - Intel 325462.pdf Vol.3C 35-140
 
-				IOLog("AICPUPMI: MSR_PP1_CURRENT_CONFIG.....(0x602) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_CURRENT_CONFIG));
 				IOLog("AICPUPMI: MSR_PP1_POWER_LIMIT........(0x640) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POWER_LIMIT));
 				IOLog("AICPUPMI: MSR_PP1_ENERGY_STATUS......(0x641) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_ENERGY_STATUS));
 				IOLog("AICPUPMI: MSR_PP1_POLICY.............(0x642) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP1_POLICY));
@@ -71,7 +72,6 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 
 	switch (aCPUModel)
 	{
-		case CPU_MODEL_SB_CORE:				// 0x2A - Intel 325462.pdf Vol.3C 35-120
 		case CPU_MODEL_IB_CORE:				// 0x3A - Intel 325462.pdf Vol.3C 35-126
 		case CPU_MODEL_IB_CORE_EX:			// 0x3B - Intel 325462.pdf Vol.3C 35-126
 		case CPU_MODEL_IB_CORE_XEON:		// 0x3E - Intel 325462.pdf Vol.3C 35-126

From d218aff6bde19429e9e9dbc53f826b55bdc95e73 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 2 Jan 2014 15:51:22 +0100
Subject: [PATCH 432/623] Fix KP on Xeon E5

The Intel datasheet states that it is supported on the E3-1200 but that
probably makes us crash on E5's
---
 .../AppleIntelCPUPowerManagementInfo.cpp                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index e4e985a..741384f 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -74,7 +74,7 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 	{
 		case CPU_MODEL_IB_CORE:				// 0x3A - Intel 325462.pdf Vol.3C 35-126
 		case CPU_MODEL_IB_CORE_EX:			// 0x3B - Intel 325462.pdf Vol.3C 35-126
-		case CPU_MODEL_IB_CORE_XEON:		// 0x3E - Intel 325462.pdf Vol.3C 35-126
+		// case CPU_MODEL_IB_CORE_XEON:		// 0x3E - Intel 325462.pdf Vol.3C 35-126
 		case CPU_MODEL_HASWELL:				// 0x3C - Intel 325462.pdf Vol.3C 35-133
 		case CPU_MODEL_HASWELL_ULT:			// 0x45 - Intel 325462.pdf Vol.3C 35-133
 		case CPU_MODEL_CRYSTALWELL:			// 0x46 - Intel 325462.pdf Vol.3C 35-133

From ff4beac1d7ad02100aa17722c83206e6b1190dad Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 2 Jan 2014 16:03:49 +0100
Subject: [PATCH 433/623] =?UTF-8?q?No=20C7=20for=20Intel=C2=AE=20Xeon?=
 =?UTF-8?q?=C2=AE=20E5-1600=20v2/E5-2600=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No C7 support for Intel® Xeon® Processor E5-1600 v2/E5-2600 v2 (Product
Families Datasheet Volume One of Two page 19)
---
 .../AppleIntelCPUPowerManagementInfo.cpp              | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 741384f..9959d7c 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -44,7 +44,14 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 	
 	IOLog("AICPUPMI: MSR_PKGC3_IRTL.............(0x60a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC3_IRTL));
 	IOLog("AICPUPMI: MSR_PKGC6_IRTL.............(0x60b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC6_IRTL));
-	IOLog("AICPUPMI: MSR_PKGC7_IRTL.............(0x60c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC7_IRTL));
+	
+	/*
+	 * No C7 support for Intel® Xeon® Processor E5-1600 v2/E5-2600 v2 (Product Families Datasheet Volume One of Two page 19)
+	 */
+	if (aCPUModel != CPU_MODEL_IB_CORE_XEON)
+	{
+		IOLog("AICPUPMI: MSR_PKGC7_IRTL.............(0x60c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC7_IRTL));
+	}
 	
 	IOLog("AICPUPMI: MSR_PP0_CURRENT_CONFIG.....(0x601) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_CURRENT_CONFIG));
 	IOLog("AICPUPMI: MSR_PP0_POWER_LIMIT........(0x638) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POWER_LIMIT));
@@ -418,7 +425,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 					case CPU_MODEL_SB_JAKETOWN:		// 0x2D - Intel 325462.pdf Vol.3C 35-111
 					case CPU_MODEL_IB_CORE:			// 0x3A - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
 					case CPU_MODEL_IB_CORE_EX:		// 0x3B - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
-					case CPU_MODEL_IB_CORE_XEON:	// 0x3E - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
+					// case CPU_MODEL_IB_CORE_XEON:	// 0x3E - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
 					case CPU_MODEL_HASWELL:			// 0x3C - Intel 325462.pdf Vol.3C 35-136
 					case CPU_MODEL_HASWELL_ULT:		// 0x45 - Intel 325462.pdf Vol.3C 35-136
 					case CPU_MODEL_CRYSTALWELL:		// 0x46

From 23ca80364a95ad4f81d97912387e8f0f578bdb11 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 2 Jan 2014 16:43:59 +0100
Subject: [PATCH 434/623] Cleanups and additional checks

---
 .../AppleIntelCPUPowerManagementInfo.cpp       | 18 ++++++++++++------
 .../AppleIntelCPUPowerManagementInfo.h         |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 9959d7c..cc96e1b 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -163,10 +163,8 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 	if (dumpCStates)
 	{
 		UInt32 magic = 0;
-		// IOSimpleLockLock(simpleLock);
 		mp_rendezvous_no_intrs(getCStates, &magic);
 		IOSleep(1);
-		// IOSimpleLockUnlock(simpleLock);
 	}
 #endif
 	
@@ -227,7 +225,7 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 		}
 	
 #if REPORT_C_STATES
-	if (gTriggeredC3Cores != gC3Cores)
+	if (gCheckC3 && (gTriggeredC3Cores != gC3Cores))
 	{
 		gTriggeredC3Cores = gC3Cores;
 		IOLog("AICPUPMI: CPU C3-Cores [ ");
@@ -245,7 +243,7 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 		IOLog("]\n");
 	}
 	
-	if (gTriggeredC6Cores != gC6Cores)
+	if (gCheckC6 && (gTriggeredC6Cores != gC6Cores))
 	{
 		gTriggeredC6Cores = gC6Cores;
 		IOLog("AICPUPMI: CPU C6-Cores [ ");
@@ -263,7 +261,7 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 		IOLog("]\n");
 	}
 	
-	if (gTriggeredC7Cores != gC7Cores)
+	if (gCheckC7 && (gTriggeredC7Cores != gC7Cores))
 	{
 		gTriggeredC7Cores = gC7Cores;
 		IOLog("AICPUPMI: CPU C7-Cores [ ");
@@ -326,13 +324,21 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				
 				UInt8 cpuModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
 				
+#if REPORT_GPU_STATS
+				bool isIGPUEnabled = ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK)); // IGPU Enabled and Visible?
+				
+				if (!isIGPUEnabled && igpuEnabled)
+				{
+					igpuEnabled = false;
+				}
+#endif
+
 				// MWAIT information
 				do_cpuid(0x00000005, cpuid_reg);
 				uint32_t supportedMwaitCStates = bitfield32(cpuid_reg[edx], 31,  0);
 				
 				IOLog("AICPUPMI: MWAIT C-States     : %d\n", supportedMwaitCStates);
 
-				bool isIGPUEnabled = ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK)); // IGPU Enabled and Visible?
 #if REPORT_MSRS
 				reportMSRs(cpuModel);
 #endif
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 8db6441..d5104ff 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -94,6 +94,8 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 #if REPORT_GPU_STATS
 	IOMemoryDescriptor	*memDescriptor;
 	IOMemoryMap			*memoryMap;
+
+	bool igpuEnabled	= true;
 #endif
 	
 	IOReturn result		= kIOReturnSuccess;
@@ -103,8 +105,6 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 	void reportMSRs(UInt8 aCPUModel);
 	
 	bool loopLock		= false;
-	bool igpuEnabled	= true;
-
 	bool dumpCStates	= true;	// TODO: Use Info.plist
 
 	UInt16 Interval	= 50;

From 293dc583ed515cf09673b6224d2002cb6fe16743 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 3 Jan 2014 02:26:53 +0100
Subject: [PATCH 435/623] Additional cleanups

---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 67 ++++++++++---------
 .../AppleIntelCPUPowerManagementInfo.h        |  8 +--
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index cc96e1b..c7b8e78 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Pike R. Alpha. All rights reserved.
+ * Copyright (c) 2012-2014 Pike R. Alpha. All rights reserved.
  *
  * Original idea and initial development of MSRDumper.kext (c) 2011 by RevoGirl.
  *
@@ -45,10 +45,7 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 	IOLog("AICPUPMI: MSR_PKGC3_IRTL.............(0x60a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC3_IRTL));
 	IOLog("AICPUPMI: MSR_PKGC6_IRTL.............(0x60b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC6_IRTL));
 	
-	/*
-	 * No C7 support for Intel® Xeon® Processor E5-1600 v2/E5-2600 v2 (Product Families Datasheet Volume One of Two page 19)
-	 */
-	if (aCPUModel != CPU_MODEL_IB_CORE_XEON)
+	if (gCheckC7)
 	{
 		IOLog("AICPUPMI: MSR_PKGC7_IRTL.............(0x60c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC7_IRTL));
 	}
@@ -58,6 +55,7 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 	IOLog("AICPUPMI: MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
 	IOLog("AICPUPMI: MSR_PP0_POLICY.............(0x63a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POLICY));
 
+#if REPORT_IGPU_P_STATES
 	if (igpuEnabled)
 	{
 		switch (aCPUModel)
@@ -76,6 +74,7 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 				break;
 		}
 	}
+#endif
 
 	switch (aCPUModel)
 	{
@@ -97,7 +96,11 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 	IOLog("AICPUPMI: MSR_PKG_C2_RESIDENCY.......(0x60d) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C2_RESIDENCY));
 	IOLog("AICPUPMI: MSR_PKG_C3_RESIDENCY.......(0x3f8) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C3_RESIDENCY));
 	IOLog("AICPUPMI: MSR_PKG_C6_RESIDENCY.......(0x3f9) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C6_RESIDENCY));
-	IOLog("AICPUPMI: MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+
+	if (gCheckC7)
+	{
+		IOLog("AICPUPMI: MSR_PKG_C7_RESIDENCY.......(0x3fa) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+	}
 
 	if (aCPUModel == CPU_MODEL_HASWELL_ULT) // 0x45 - Intel 325462.pdf Vol.3C 35-136
 	{
@@ -140,7 +143,7 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 	UInt8 currentMultiplier = (rdmsr64(MSR_IA32_PERF_STS) >> 8);
 	gCoreMultipliers |= (1ULL << currentMultiplier);
 	
-#if REPORT_GPU_STATS
+#if REPORT_IGPU_P_STATES
 	UInt8 currentIgpuMultiplier = 0;
 	
 	if (igpuEnabled)
@@ -171,7 +174,7 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 	int currentBit = 0;
 	UInt64 value = 0ULL;
 	
-#if REPORT_GPU_STATS
+#if REPORT_IGPU_P_STATES
 	if ((gCoreMultipliers != gTriggeredPStates) || (gIGPUMultipliers != gTriggeredIGPUPStates))
 #else
 		if (gCoreMultipliers != gTriggeredPStates)
@@ -197,7 +200,7 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 				}
 			}
 			
-#if REPORT_GPU_STATS
+#if REPORT_IGPU_P_STATES
 			if (igpuEnabled)
 			{
 				gTriggeredIGPUPStates = gIGPUMultipliers;
@@ -323,8 +326,26 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				do_cpuid(0x00000001, cpuid_reg);
 				
 				UInt8 cpuModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
-				
-#if REPORT_GPU_STATS
+
+#if REPORT_C_STATES
+				switch (cpuModel) // TODO: Verify me!
+				{
+					case CPU_MODEL_SB_CORE:			// 0x2A - Intel 325462.pdf Vol.3C 35-111
+					case CPU_MODEL_SB_JAKETOWN:		// 0x2D - Intel 325462.pdf Vol.3C 35-111
+					case CPU_MODEL_IB_CORE:			// 0x3A - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
+					case CPU_MODEL_IB_CORE_EX:		// 0x3B - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
+						// No C7 support for Intel® Xeon® Processor E5-1600 v2/E5-2600 v2 (Product Families Datasheet Volume One of Two page 19)
+						// case CPU_MODEL_IB_CORE_XEON:	// 0x3E - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
+					case CPU_MODEL_HASWELL:			// 0x3C - Intel 325462.pdf Vol.3C 35-136
+					case CPU_MODEL_HASWELL_ULT:		// 0x45 - Intel 325462.pdf Vol.3C 35-136
+					case CPU_MODEL_CRYSTALWELL:		// 0x46
+						
+						gCheckC7 = true;
+						break;
+				}
+#endif
+
+#if REPORT_IGPU_P_STATES
 				bool isIGPUEnabled = ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK)); // IGPU Enabled and Visible?
 				
 				if (!isIGPUEnabled && igpuEnabled)
@@ -332,12 +353,11 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 					igpuEnabled = false;
 				}
 #endif
-
 				// MWAIT information
 				do_cpuid(0x00000005, cpuid_reg);
 				uint32_t supportedMwaitCStates = bitfield32(cpuid_reg[edx], 31,  0);
 				
-				IOLog("AICPUPMI: MWAIT C-States     : %d\n", supportedMwaitCStates);
+				IOLog("AICPUPMI: MWAIT C-States.....................: %d\n", supportedMwaitCStates);
 
 #if REPORT_MSRS
 				reportMSRs(cpuModel);
@@ -361,7 +381,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 					IOLog("AICPUPMI: Maximum Frequency..................: %d00 MHz\n", gMaxRatio);
 				}
 				
-#if REPORT_GPU_STATS
+#if REPORT_IGPU_P_STATES
 				if (isIGPUEnabled)
 				{
 					IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
@@ -423,23 +443,6 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 					}
 				}
 #endif
-				
-#if REPORT_C_STATES
-				switch (cpuModel) // TODO: Verify me!
-				{
-					case CPU_MODEL_SB_CORE:			// 0x2A - Intel 325462.pdf Vol.3C 35-111
-					case CPU_MODEL_SB_JAKETOWN:		// 0x2D - Intel 325462.pdf Vol.3C 35-111
-					case CPU_MODEL_IB_CORE:			// 0x3A - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
-					case CPU_MODEL_IB_CORE_EX:		// 0x3B - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
-					// case CPU_MODEL_IB_CORE_XEON:	// 0x3E - Intel 325462.pdf Vol.3C 35-125 (Refering to Table 35-12)
-					case CPU_MODEL_HASWELL:			// 0x3C - Intel 325462.pdf Vol.3C 35-136
-					case CPU_MODEL_HASWELL_ULT:		// 0x45 - Intel 325462.pdf Vol.3C 35-136
-					case CPU_MODEL_CRYSTALWELL:		// 0x46
-
-						gCheckC7 = true;
-						break;
-				}
-#endif
 				timerEventSource->setTimeoutMS(1000);
 				
 				return true;
@@ -478,7 +481,7 @@ void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
 
 void AppleIntelCPUPowerManagementInfo::free()
 {
-#if REPORT_GPU_STATS
+#if REPORT_IGPU_P_STATES
 	if (igpuEnabled)
 	{
 		if (memoryMap)
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index d5104ff..e4545ae 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013 Pike R. Alpha. All rights reserved.
+ * Copyright (c) 2012-2014 Pike R. Alpha. All rights reserved.
  *
  * Original idea and initial development of MSRDumper.kext (c) 2011 by RevoGirl.
  *
@@ -22,7 +22,7 @@
 #define super IOService
 
 #define REPORT_MSRS			1
-#define REPORT_GPU_STATS	1
+#define REPORT_IGPU_P_STATES	1
 #define REPORT_C_STATES		1
 
 #define NB_BUS	0x00
@@ -91,7 +91,7 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 	IOWorkLoop			*workLoop;
 	IOTimerEventSource	*timerEventSource;
 	
-#if REPORT_GPU_STATS
+#if REPORT_IGPU_P_STATES
 	IOMemoryDescriptor	*memDescriptor;
 	IOMemoryMap			*memoryMap;
 
@@ -146,6 +146,6 @@ UInt32	gTriggeredC7Cores	= 0;
 
 UInt64	gCoreMultipliers = 0ULL;
 
-#if REPORT_GPU_STATS
+#if REPORT_IGPU_P_STATES
 UInt8	* gMchbar	= NULL;
 #endif
\ No newline at end of file

From e50b0ea851983e87f4acc383c62d59dda5a573ff Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Fri, 3 Jan 2014 21:31:26 +0100
Subject: [PATCH 436/623] Adding note

---
 i386/config/README | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/i386/config/README b/i386/config/README
index e9dc128..57fd990 100644
--- a/i386/config/README
+++ b/i386/config/README
@@ -52,6 +52,13 @@ People with working RevoBoot configurations can simply copy their settings.h to
 This will allow the RevoBoot build process to compile without errors, but make sure to use the latest 
 preprocessor options.
 
+Important: Open settings-template.h and search for:
+
+#define STATIC_NVRAM_ROM	{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN } // Example only!
+				// sudo nvram 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14:ROM=%01%02%03%04%05%06%07%08%09%0A%0B%NN%NN%NN%NN%NN%NN
+				// Note: Use your MAC address for the last six bytes!
+
+You must change this, or RevoBoot won't compile!
 
 ACPI/EFI/SMBIOS/data.h
 ----------------------

From 2091a18e74ca7bf6526105bae7721efad3f16b04 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 4 Jan 2014 18:07:10 +0100
Subject: [PATCH 437/623] Make Mavericks the default target

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5db3dc2..0c59c1f 100644
--- a/Makefile
+++ b/Makefile
@@ -50,10 +50,10 @@ VPATH = $(OBJROOT):$(SYMROOT)
 
 ifeq ($(MAKECMDGOALS),)
 	#
-	# No OS build target given. Build for Mountain Lion (default).
+	# No OS build target given. Build for Mavericks (default).
 	#
-	MAKE_TARGET_OS = 6;
-	MAKEGOAL = mountain-lion
+	MAKE_TARGET_OS = 10;
+	MAKEGOAL = mavericks
 else
 	#
 	# Setting MAKE_TARGET_OS and MAKEGOAL based on OS build target.

From 2987f5d47295533dc62ff2da44a808571fd96c70 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 4 Jan 2014 18:07:58 +0100
Subject: [PATCH 438/623] Adding support for Xeon E5 / MacPro6,1

---
 i386/libsaio/cpu/Intel/dynamic_data.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index a7bb118..51d81f5 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -345,6 +345,7 @@ void initCPUStruct(void)
 
 				case CPU_MODEL_IB_CORE:
 				case CPU_MODEL_IB_CORE_EX:
+				case CPU_MODEL_IB_CORE_XEON:
 					CoreBridgeType = IVY_BRIDGE;
 					hiBit = 31;
 					break;
@@ -390,6 +391,10 @@ void initCPUStruct(void)
 				{
 					gPlatform.CPU.Type = (0x900 + CoreBridgeType);		// Core i3
 				}
+				else if (strstr(gPlatform.CPU.BrandString, "Xeon(R)"))
+				{
+					gPlatform.CPU.Type = (0xA00 + CoreBridgeType);
+				}
 
 				msr = rdmsr64(MSR_PLATFORM_INFO);
 
@@ -544,7 +549,7 @@ void initCPUStruct(void)
 
 	_CPU_DEBUG_DUMP("CPU: NumCores/NumThreads   : %d/%d\n",				gPlatform.CPU.NumCores, gPlatform.CPU.NumThreads);
 
-	if (CoreBridgeType) // SandyBridge)
+	if (CoreBridgeType)
 	{
 		_CPU_DEBUG_DUMP("CPU: Min/Max busratio      : %d/%d\n",			gPlatform.CPU.MinBusRatio, gPlatform.CPU.MaxBusRatio);
 	}

From 7c6b8da1a7bfa98b792c7f5a2698982b81e262f7 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 4 Jan 2014 18:08:51 +0100
Subject: [PATCH 439/623] Renaming LION_RECOVERY_SUPPORT to RECOVERY_HD_SUPPORT

---
 i386/libsaio/stringTable.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/stringTable.c b/i386/libsaio/stringTable.c
index a6072d8..af42db0 100755
--- a/i386/libsaio/stringTable.c
+++ b/i386/libsaio/stringTable.c
@@ -371,7 +371,7 @@ long loadCABootPlist(void)
 
 	static char * dirspec[] =
 	{
-#if LION_RECOVERY_SUPPORT
+#if RECOVERY_HD_SUPPORT
 		"com.apple.recovery.boot",
 #endif
 
@@ -403,7 +403,7 @@ long loadCABootPlist(void)
 #if INSTALL_ESD_SUPPORT
 		int start = 0;
 		int end = 3;
-	#if LION_RECOVERY_SUPPORT
+	#if RECOVERY_HD_SUPPORT
 		start++;
 		end++;
 	#endif

From 16608af0a486b1daded293c5eabc64008ca7b863 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 4 Jan 2014 18:11:02 +0100
Subject: [PATCH 440/623] Adding latest model data / cleanups

---
 i386/libsaio/smbios/model_data.h | 37 +++++++++++++++++---------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 3b5c4d5..c445e01 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -64,16 +64,16 @@
 		#define SMB_PRODUCT_NAME	"iMac14,1"
 		#define SMB_BOARD_PRODUCT	"Mac-031B6874CF7F642A"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '1' }
-	#elif (TARGET_MODEL == IMAC_141)
+	#elif (TARGET_MODEL == IMAC_142)
 		#define SMB_BIOS_VERSION	"IM141.88Z.0118.B00.1309031249"
 		#define SMB_PRODUCT_NAME	"iMac14,2"
 		#define SMB_BOARD_PRODUCT	"Mac-27ADBB7B4CEE8E61"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '2' }
 	#else // Defaults to iMac 14,3
-        #define SMB_BIOS_VERSION	"IM143.88Z.0118.B00.1309031249"
-        #define SMB_PRODUCT_NAME	"iMac14,3"
-        #define SMB_BOARD_PRODUCT	"Mac-77EB7D7DAF985301"
-        #define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '3' }
+		#define SMB_BIOS_VERSION	"IM143.88Z.0118.B00.1309031249"
+		#define SMB_PRODUCT_NAME	"iMac14,3"
+		#define SMB_BOARD_PRODUCT	"Mac-77EB7D7DAF985301"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '3' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -180,24 +180,32 @@
 		#define SMB_BOARD_PRODUCT	"Mac-AFD8A9D944EA4843"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '2' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_111)
-		// Intel Core i5-4258U @ 2.90 GHz - 2 cores / 4 threads.
+		// Intel Core i5-4258U @ 2.40 GHz - 2 cores / 4 threads.
+		// Intel Core i5-4288U @ 2.60 GHz - 2 cores / 4 threads.
+		// Intel Core i7-4558U @ 2.80 GHz - 2 cores / 4 threads.
 		#define SMB_BIOS_VERSION	"MBP111.88Z.0138.B03.1310291227"
 		#define SMB_PRODUCT_NAME	"MacBookPro11,1"
 		#define SMB_BOARD_PRODUCT	"Mac-189A3D4F975D5FFC"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '1' }
-	#else // Defaults to MacBookPro11,2 (with NVIDIA graphics)
-		// Intel Core i5-4258U @ 2.90 GHz - 2 cores / 4 threads.
-		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B03.1310291227"
+	#elif (TARGET_MODEL == MACBOOK_PRO_112)
+		// Intel Core i7-4750HQ @ 2.00 GHz - 4 cores / 8 threads.
+		// Intel Core i7-4950HQ @ 2.40 GHz - 4 cores / 8 threads.
+		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B02.1310181745"
 		#define SMB_PRODUCT_NAME	"MacBookPro11,2"
 		#define SMB_BOARD_PRODUCT	"Mac-3CBD00234E554E41"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '2' }
+	#else
+		// Intel Core i7-4850HQ @ 2.30 GHz - 4 cores / 8 threads.
+		// Intel Core i7-4960HQ @ 2.60 GHz - 4 cores / 8 threads.
+		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B02.1310181745"
+		#define SMB_PRODUCT_NAME	"MacBookPro11,3"
+		#define SMB_BOARD_PRODUCT	"Mac-2BD1B31983FE1663"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '3' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
 
 
-
-
 #if TARGET_MODEL & MACMINI														// 16
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"Macmini"
@@ -232,17 +240,12 @@
 		#define SMB_PRODUCT_NAME	"Macmini6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-031AEE4D24BFF0B1"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '1' }
-	#elif (TARGET_MODEL == MACMINI_62) // Defaults to Macmini6,2
+	#else // Defaults to Macmini6,2
 		// Intel Core i7-3615QM @ 2.30 GHz (4 cores - 8 threads)
 		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B03.1211161202"
 		#define SMB_PRODUCT_NAME	"Macmini6,2"
 		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '2' }
-	#else // Defaults to Macmini7,1
-		#define SMB_BIOS_VERSION	"MM71.88Z.0106.B00.1307301121"
-		#define SMB_PRODUCT_NAME	"Macmini7,1"
-		#define SMB_BOARD_PRODUCT	"Mac-031B6874CF7F642A"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '7', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From aa3801dcc843a8987d36e9cd4b163e8a52ca0337 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 4 Jan 2014 18:12:01 +0100
Subject: [PATCH 441/623] Adding latest model data / MacPro6,1 system-type

---
 i386/libsaio/platform.h | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index d982352..454bf66 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -60,8 +60,9 @@
 #define IMAC_122				(IMAC | (3 << 15))
 #define IMAC_131				(IMAC | (4 << 15))
 #define IMAC_132				(IMAC | (5 << 15))
-#define IMAC_142				(IMAC | (6 << 15))
-#define IMAC_141				 IMAC						// Defaults to iMac14,1
+#define IMAC_141				(IMAC | (6 << 15))
+#define IMAC_141				(IMAC | (7 << 15))
+#define IMAC_143				 IMAC						// Defaults to iMac14,3
 
 #define MACBOOK_41				 MACBOOK					// Defaults to MacBook4,1
 
@@ -72,16 +73,17 @@
 #define MACBOOK_AIR_61			(MACBOOK_AIR | (5 << 15))
 #define MACBOOK_AIR_62			 MACBOOK_AIR				// Defaults to MacBookAir6,2
 
-#define MACBOOK_PRO_61			(MACBOOK_PRO | (1 << 15))
-#define MACBOOK_PRO_81			(MACBOOK_PRO | (2 << 15))
-#define MACBOOK_PRO_82			(MACBOOK_PRO | (3 << 15))
-#define MACBOOK_PRO_83			(MACBOOK_PRO | (4 << 15))
-#define MACBOOK_PRO_91			(MACBOOK_PRO | (5 << 15))
-#define MACBOOK_PRO_92			(MACBOOK_PRO | (6 << 15))
-#define MACBOOK_PRO_101			(MACBOOK_PRO | (7 << 15))
-#define MACBOOK_PRO_102			(MACBOOK_PRO | (8 << 15))
-#define MACBOOK_PRO_111			(MACBOOK_PRO | (9 << 15))
-#define MACBOOK_PRO_112			 MACBOOK_PRO				// Defaults to MacBookPro11,2
+#define MACBOOK_PRO_61			(MACBOOK_PRO | ( 1 << 15))
+#define MACBOOK_PRO_81			(MACBOOK_PRO | ( 2 << 15))
+#define MACBOOK_PRO_82			(MACBOOK_PRO | ( 3 << 15))
+#define MACBOOK_PRO_83			(MACBOOK_PRO | ( 4 << 15))
+#define MACBOOK_PRO_91			(MACBOOK_PRO | ( 5 << 15))
+#define MACBOOK_PRO_92			(MACBOOK_PRO | ( 6 << 15))
+#define MACBOOK_PRO_101			(MACBOOK_PRO | ( 7 << 15))
+#define MACBOOK_PRO_102			(MACBOOK_PRO | ( 8 << 15))
+#define MACBOOK_PRO_111			(MACBOOK_PRO | ( 9 << 15))
+#define MACBOOK_PRO_112			(MACBOOK_PRO | (10 << 15))
+#define MACBOOK_PRO_113			 MACBOOK_PRO				// Defaults to MacBookPro11,3
 
 #define MACMINI_41				(MACMINI | (1 << 15))
 #define MACMINI_51				(MACMINI | (2 << 15))
@@ -97,6 +99,12 @@
 #define MACPRO_51				(MACPRO | (3 << 15))
 #define MACPRO_61				 MACPRO						// Defaults to MacPro6,1
 
+#if ((TARGET_MODEL & MACPRO) == MACPRO)
+	#define PM_PROFILE_OVERRIDE	3
+#else
+	#define PM_PROFILE_OVERRIDE	1
+#endif
+
 //------------------------------------------------------------------------------
 
 // #define	LOAD_MODEL_SPECIFIC_STATIC_DATA	(LOAD_MODEL_SPECIFIC_ACPI_DATA || LOAD_MODEL_SPECIFIC_EFI_DATA || LOAD_MODEL_SPECIFIC_SMBIOS_DATA)
@@ -165,10 +173,7 @@ typedef struct _PlatformInfo_t
 												// later updated in boot.c with the actual version info.
 	
 	char *				ModelID;				// Initialized in platform.c and used in boot.c
-#if LOAD_MODEL_SPECIFIC_STATIC_DATA
 	char *				CommaLessModelID;		// Initialized in platform.c and used in i386/libsaio/ACPI/patcher.h,
-#endif												// i386/libsaio/efi.c and i386/libsaio/SMBIOS/static_data.h
-
 	char *				KextFileName;			// Initialized and used in drivers.c
 	char *				KextFileSpec;			// Initialized and used in drivers.c
 	char *				KextPlistSpec;			// Initialized and used in drivers.c
@@ -334,7 +339,7 @@ extern cpu_type_t gArchCPUType;	// DHP: Fix / remove me!
 
 extern PlatformInfo_t	gPlatform;
 
-extern void initPlatform(int biosDevice);
+extern void initPlatform(int biosDevice, bool bootRecoveryHD);
 
 extern cpu_type_t getArchCPUType(void);
 

From b9a915791f1db9a4bd96d6f642a457b163c43cf5 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 4 Jan 2014 18:12:58 +0100
Subject: [PATCH 442/623] Cleanups / MacPro6,1 system-type

---
 i386/libsaio/platform.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 974bbba..8ddea37 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -123,12 +123,14 @@ void enableHPET(void)
 //==============================================================================
 // Public function. Called from boot/common_boot only.
 
-void initPlatform(int biosDevice)
+void initPlatform(int biosDevice, bool bootRecoveryHD)
 {
 	memset(&gPlatform, 0, sizeof(gPlatform));
 
+	gPlatform.BootRecoveryHD = bootRecoveryHD;
+
 	// Copied from cpu/dynamic_data.h to make printf work this early on.
-#if DEBUG_CPU || DEBUG_PLATFORM
+#if DEBUG_STATE_ENABLED
 	extern void setVideoMode(int mode);
 	setVideoMode(0); // Switch to VGA_TEXT_MODE
 #endif
@@ -188,7 +190,7 @@ void initPlatform(int biosDevice)
 
 	// Determine system type based on product name. Used in
 	// acpi/patcher.h to update FADT->Preferred_PM_Profile
-	gPlatform.Type					= (strncmp(gPlatform.ModelID, "MacBook", 7) == 0) ? 2 : 1;
+	gPlatform.Type					= (strncmp(gPlatform.ModelID, "MacBook", 7) == 0) ? 2 : PM_PROFILE_OVERRIDE;
 
 	// Are we supposted to have a Mobile CPU?
 	if (gPlatform.Type == 2 && gPlatform.CPU.Mobile == false)
@@ -281,9 +283,13 @@ void initPlatform(int biosDevice)
 
 	_PLATFORM_DEBUG_DUMP("Static data for %d RAM BANKS used.\n", gPlatform.RAM.SlotCount);
 	_PLATFORM_DEBUG_SLEEP(10);
+#else
+	_PLATFORM_DEBUG_SLEEP(5);
 #endif
 
-	_PLATFORM_DEBUG_SLEEP(5);
+#if RECOVERY_HD_SUPPORT
+	_PLATFORM_DEBUG_DUMP("gPlatform.BootRecoveryHD: %s\n", gPlatform.BootRecoveryHD ? "True" : "False");
+#endif
 
 	initKernelBootConfig();
 

From ba85a18fe70e17d4b52c4f932251a420a275c259 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 4 Jan 2014 18:14:42 +0100
Subject: [PATCH 443/623] Add back RECOVERY_HD_SUPPORT

Also fixed a copy/paste error in my name
---
 i386/libsaio/disk.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index 944e7f3..6a84793 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -46,11 +46,11 @@
  *
  * Updates:
  *			- Cleanups and refactoring by DHP in 2010 and 2011.
- *			- Renamed LION_RECOVERY_SUPPORT to CORE_STARAGE_SUPPORT (PikerAlpha, November 2012).
- *			- Renamed LION_FILEVAULT_SUPPORT to CORE_STARAGE_SUPPORT (PikerAlpha, November 2012).
- *			- Renamed encryptedBootPartition to coreStoragePartition (PikerAlpha, November 2012).
- *			- OSBigEndian removed and some minor style nits (PikerAlpha, November 2012).
- *			- Unused #include <limits.h> removed (PikerAlpha, November 2012).
+ *			- Renamed LION_RECOVERY_SUPPORT to CORE_STORAGE_SUPPORT (Pike R. Alpha, November 2012).
+ *			- Renamed LION_FILEVAULT_SUPPORT to CORE_STORAGE_SUPPORT (Pike R. Alpha, November 2012).
+ *			- Renamed encryptedBootPartition to coreStoragePartition (Pike R. Alpha, November 2012).
+ *			- OSBigEndian removed and some minor style nits (Pike R. Alpha, November 2012).
+ *			- Unused #include <limits.h> removed (Pike R. Alpha, November 2012).
  *
  */
 
@@ -149,7 +149,7 @@ EFI_GUID const GPT_HFS_GUID					= { 0x48465300, 0x0000, 0x11AA, { 0xAA, 0x11, 0x
 // Apple TV
 EFI_GUID const GPT_HFSX_GUID				= { 0x5265636F, 0x7665, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
 
-#if CORE_STORAGE_SUPPORT || APPLE_RAID_SUPPORT
+#if CORE_STORAGE_SUPPORT || APPLE_RAID_SUPPORT || RECOVERY_HD_SUPPORT
 	// Apple_Boot (RAID helper partition and the 650 MB 'Recovery HD' partition).
 	EFI_GUID const GPT_BOOT_GUID			= { 0x426F6F74, 0x0000, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
 #endif
@@ -675,7 +675,7 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 										}
 #endif
 
-#if CORE_STORAGE_SUPPORT || APPLE_RAID_SUPPORT
+#if CORE_STORAGE_SUPPORT || APPLE_RAID_SUPPORT || RECOVERY_HD_SUPPORT
 										else if (compareEFIGUID(&GPT_BOOT_GUID, (EFI_GUID const *)gptMap->ent_type) == 0)
 										{
 											_DISK_DEBUG_DUMP("Matched: GPT_BOOT_GUID\n");
@@ -758,7 +758,16 @@ bool hasBootEFI(BVRef bvr)
 
 	sprintf(dirSpec, "hd(%d,%d)/System/Library/CoreServices/", BIOS_DEV_UNIT(bvr), bvr->part_no);
 
+#if RECOVERY_HD_SUPPORT
+	if (gPlatform.BootRecoveryHD)
+	{
+		sprintf(dirSpec, "hd(%d,%d)/com.apple.recovery.boot/", BIOS_DEV_UNIT(bvr), bvr->part_no);
+
+		_DISK_DEBUG_DUMP("Checking for boot.efi on Recovery HD\n");
+	}
+#else
 	_DISK_DEBUG_DUMP("In hasBootEFI(%d,%d)\n", BIOS_DEV_UNIT(bvr), bvr->part_no);
+#endif
 
 	if (GetFileInfo(dirSpec, "boot.efi", &flags, &time) == 0)
 	{

From aff4f7bbefc41935dc467536b0e55328d40e51e2 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 4 Jan 2014 18:15:30 +0100
Subject: [PATCH 444/623] Add back  RECOVERY_HD_SUPPORT

---
 i386/boot2/boot.c | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 179a387..c771e6b 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -190,27 +190,36 @@ void boot(int biosdev)
 	long flags, cachetime;
 #endif
 
-	initPlatform(biosdev);	// Passing on the boot drive.
+#if RECOVERY_HD_SUPPORT
+	/* extern void setVideoMode(int mode);
+	setVideoMode(0); // Switch to VGA_TEXT_MODE
+	printf("RecoveryHD boot support enabled\n");
 
-#if DEBUG_STATE_ENABLED
-	// Don't switch graphics mode / show boot logo when DEBUG is set to 1.
-	printf("\ngArchCPUType (CPU): %s\n", (gArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386");
-	sleep(3); // Silent sleep.
-#else
-	showBootLogo();
-#endif
+	bool bootRecoveryHD = false;
 
-#if LION_RECOVERY_SUPPORT
-	// A bit ugly maybe, but this will be changed sometime soon.
 	while (readKeyboardStatus())
 	{
 		int key = (bgetc() & 0xff);
-
+		printf("key: %d\n", key);
 		if ((key |= 0x20) == 'r')
 		{
-			gPlatform.BootRecoveryHD = true;
+			bootRecoveryHD = true;
+			printf("RecoveryHD boot support is active\n");
 		}
 	}
+
+	printf("bootRecoveryHD: %s\n", bootRecoveryHD ? "True" : "False"); */
+	initPlatform(biosdev, true);
+#else
+	initPlatform(biosdev, false);
+#endif
+
+#if DEBUG_STATE_ENABLED
+	// Don't switch graphics mode / show boot logo when DEBUG is set to 1.
+	printf("\ngArchCPUType (CPU): %s\n", (gArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386");
+	sleep(3); // Silent sleep.
+#else
+	showBootLogo();
 #endif
 
 #if (LOAD_MODEL_SPECIFIC_EFI_DATA == 0)
@@ -413,8 +422,19 @@ void boot(int biosdev)
 	if (haveCABootPlist) // Check boolean before doing more time consuming tasks.
 	{
 #if PRE_LINKED_KERNEL_SUPPORT
+		_BOOT_DEBUG_DUMP("Checking Kernel Cache key in com.apple.Boot.plist\n");
+
 		if (getValueForKey(kKernelCacheKey, &val, &length, &bootInfo->bootConfig))
 		{
+#if RECOVERY_HD_SUPPORT
+			_BOOT_DEBUG_DUMP("Kernel Cache key located in com.apple.Boot.plist\n");
+			_BOOT_DEBUG_DUMP("length: %d, val: %s\n", length, val);
+			// XXX: Required for booting from the Recovery HD.
+			if (strncmp(val, "\\com.apple.recovery.boot\\kernelcache", length) == 0)
+			{
+				val = "/com.apple.recovery.boot/kernelcache";
+			}
+#endif
 			if (length && GetFileInfo(NULL, val, &flags, &cachetime) == 0)
 			{
 				_BOOT_DEBUG_DUMP("Kernel Cache set to: %s\n", val);
@@ -450,7 +470,6 @@ void boot(int biosdev)
 		strcpy(bootFile, bootInfo->bootFile);
 
 #if PRE_LINKED_KERNEL_SUPPORT
-
 		_BOOT_DEBUG_DUMP("gBootMode = %d\n", gBootMode);
 
 		// Preliminary checks to prevent us from doing useless things.

From 05b58d2054f5d1effaf9028e2b83bd62f107afde Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 4 Jan 2014 18:50:13 +0100
Subject: [PATCH 445/623] Renaming LION_RECOVERY_SUPPORT to RECOVERY_HD_SUPPORT

Cleanups and copy/paste error in my name fixed.
---
 i386/config/settings-template.h | 80 ++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 35 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index f59030a..3429afa 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -9,32 +9,32 @@
  *			- Static CPU data simplified by DHP in Juni 2011 (thanks to MC and flAked for the idea).
  *			- Automatic creation / injection of SSDT_PR.aml added by DHP in June 2011.
  *			- New compiler directive (BOOT_TURBO_BOOST_RATIO) added by Jeroen (June 2011).
- *			- SMBIOS data logic moved to preprocessor code (PikerAlpha, October 2012).
- *			- STATIC_MODEL_NAME moved to libsaio/i386/SMBIOS/model_data.h (PikerAlpha, October 2012).
- *			- STATIC_MAC_PRODUCT_NAME moved to libsaio/i386/SMBIOS/model_data.h (PikerAlpha, October 2012).
- *			- STATIC_SMBIOS_MODEL_ID renamed to TARGET_MODEL (PikerAlpha, October 2012).
- *			- OVERRIDE_DYNAMIC_PRODUCT_DETECTION removed/no longer supported (PikerAlpha, October 2012).
- *			- INTEL_CORE_TECHNOLOGY per default set to 1 (PikerAlpha, October 2012).
- *			- INJECT_EFI_DEVICE_PROPERTIES per default set to 1 (PikerAlpha, October 2012).
+ *			- SMBIOS data logic moved to preprocessor code (Pike R. Alpha, October 2012).
+ *			- STATIC_MODEL_NAME moved to libsaio/i386/SMBIOS/model_data.h (Pike R. Alpha, October 2012).
+ *			- STATIC_MAC_PRODUCT_NAME moved to libsaio/i386/SMBIOS/model_data.h (Pike R. Alpha, October 2012).
+ *			- STATIC_SMBIOS_MODEL_ID renamed to TARGET_MODEL (Pike R. Alpha, October 2012).
+ *			- OVERRIDE_DYNAMIC_PRODUCT_DETECTION removed/no longer supported (Pike R. Alpha, October 2012).
+ *			- INTEL_CORE_TECHNOLOGY per default set to 1 (Pike R. Alpha, October 2012).
+ *			- INJECT_EFI_DEVICE_PROPERTIES per default set to 1 (Pike R. Alpha, October 2012).
  *			- SMBIOS base board serial# (SMB_BOARD_SERIAL_NUMBER) feature added (dgsga, October 2012).
- *			- LOAD_STATIC_EFI_DATA_FROM_EXTRA feature added (PikerAlpha, October 2012).
- *			- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA feature added (PikerAlpha, October 2012).
- *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
- *			- Restored lost STATIC_SMSERIALNUMBER (PikerAlpha, October 2012).
- *			- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
- *			- LOAD_STATIC_ACPI_DATA_FROM_EXTRA added (PikerAlpha, October 2012).
- *			- LOAD_STATIC_EFI_DATA_FROM_EXTRA renamed to LOAD_MODEL_SPECIFIC_EFI_DATA (PikerAlpha, October 2012).
- *			- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA renamed to LOAD_MODEL_SPECIFIC_SMBIOS_DATA (PikerAlpha, October 2012).
- *			- LOAD_MODEL_SPECIFIC_STATIC_DATA added (PikerAlpha, October 2012).
- *			- Option SET_MAX_STRUCTURE_LENGTH added (PikerAlpha, November 2012).
- *			- Option DISK_TARGET_SUPPORT added (PikerAlpha, November 2012).
- *			- DISK_TARGET_SUPPORT renamed to STARTUP_DISK_SUPPORT (PikerAlpha, November 2012).
- *			- New compiler directive USE_DEVICE_PATH in boot section (PikerAlpha, November 2012).
- *			- Always inject SMB_BOARD_SERIAL_NUMBER, required for iMessage (PikerAlpha, January 2013).
- *			- New compiler directives in EFI section added (PikerAlpha, January 2013).
- *			- STATIC_SYSTEM_ID renamed to SMB_STATIC_SYSTEM_UUID and moved to SMBIOS section (PikerAlpha, January 2013).
- *			- Renamed LION_INSTALL_SUPPORT to INSTALL_ESD_SUPPORT (PikerAlpha, April 2013).
- *
+ *			- LOAD_STATIC_EFI_DATA_FROM_EXTRA feature added (Pike R. Alpha, October 2012).
+ *			- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA feature added (Pike R. Alpha, October 2012).
+ *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (Pike R. Alpha, October 2012).
+ *			- Restored lost STATIC_SMSERIALNUMBER (Pike R. Alpha, October 2012).
+ *			- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (Pike R. Alpha, October 2012).
+ *			- LOAD_STATIC_ACPI_DATA_FROM_EXTRA added (Pike R. Alpha, October 2012).
+ *			- LOAD_STATIC_EFI_DATA_FROM_EXTRA renamed to LOAD_MODEL_SPECIFIC_EFI_DATA (Pike R. Alpha, October 2012).
+ *			- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA renamed to LOAD_MODEL_SPECIFIC_SMBIOS_DATA (Pike R. Alpha, October 2012).
+ *			- LOAD_MODEL_SPECIFIC_STATIC_DATA added (Pike R. Alpha, October 2012).
+ *			- Option SET_MAX_STRUCTURE_LENGTH added (Pike R. Alpha, November 2012).
+ *			- Option DISK_TARGET_SUPPORT added (Pike R. Alpha, November 2012).
+ *			- DISK_TARGET_SUPPORT renamed to STARTUP_DISK_SUPPORT (Pike R. Alpha, November 2012).
+ *			- New compiler directive USE_DEVICE_PATH in boot section (Pike R. Alpha, November 2012).
+ *			- Always inject SMB_BOARD_SERIAL_NUMBER, required for iMessage (Pike R. Alpha, January 2013).
+ *			- New compiler directives in EFI section added (Pike R. Alpha, January 2013).
+ *			- STATIC_SYSTEM_ID renamed to SMB_STATIC_SYSTEM_UUID and moved to SMBIOS section (Pike R. Alpha, January 2013).
+ *			- Renamed LION_INSTALL_SUPPORT to INSTALL_ESD_SUPPORT (Pike R. Alpha, April 2013).
+ *			- Renamed LION_RECOVERY_SUPPORT to RECOVERY_HD_SUPPORT (Pike R. Alpha, October 2013).
  */
 
 
@@ -145,7 +145,7 @@
 												// falls back to: /Extra/ACPI/[XXXX].aml when model specific data is not available.
 #endif
 
-#define AUTOMATIC_SSDT_PR_CREATION			1	// Set to 1 by default (support for Sandy Bridge only).
+#define AUTOMATIC_SSDT_PR_CREATION			0	// Set to 0 by default (support for Sandy Bridge only).
 												//
 												// This injects a custom SSDT (in configure mode) with:
 												//
@@ -161,7 +161,7 @@
 												//			and use it as STATIC_SSDT_PR_TABLE_DATA in RevoBoot/i386/config/ACPI/data.h
 
 
-#if AUTOMATIC_SSDT_PR_CREATION && STATIC_SSDT_PR_TABLE_INJECTION == 0
+#if (AUTOMATIC_SSDT_PR_CREATION == 1 && STATIC_SSDT_PR_TABLE_INJECTION == 0)
 	#define MAX_NUMBER_OF_P_STATES			22	// The i5-2500K need 18 for the base-range (1600-3300) plus 4 for the Turbo modes.
 												// The i7-2600K need 19 for the base-range (1600-3400) plus 4 for the Turbo modes.
 												// The i7-2700K need 20 for the base-range (1600-3500) plus 4 for the Turbo modes.
@@ -170,11 +170,11 @@
 												//
 												// Note: AICPUPM wants a P-State for each 100 MHz bank or it will fail (see note below).
 
-	#define DROP_FACTORY_SSDT_TABLES		1	// Set to 1 by default (this setting is required).
+	#define DROP_FACTORY_SSDT_TABLES		1	// Set to 1 by default (this setting may be required on some boards).
 												//
 												// Note: Do not change this setting (must drop SSDT tables).
 
-	#define NUMBER_OF_TURBO_STATES			4	// Set to 4 by default.
+	#define NUMBER_OF_TURBO_STATES			4	// Set to 4 by default. Use any number to override the number of Turbo States.
 												//
 												// Note:	Make sure to add a full range, one P-State for each 100 MHz when OC'ing
 												//			or AICPIPM will fail with: "P-State Stepper Error 18 at step N on CPU N"
@@ -189,10 +189,10 @@
 #else
 	#define OVERRIDE_ACPI_METHODS			0	// Set to 0 by default (do nothing).
 
-	#define DROP_FACTORY_SSDT_TABLES		0	// Set to 0 by default. Use 1 with caution (might disable SpeedStep).
+	#define DROP_FACTORY_SSDT_TABLES		0	// Set to 0 by default. Use 1 with caution (might disable CPU Power Management).
 #endif
 
-#define REPLACE_EXISTING_SSDT_TABLES		0	// Set to 0 by default. Use 1 with caution (might disable SpeedStep).
+#define REPLACE_EXISTING_SSDT_TABLES		0	// Set to 0 by default. Use 1 with caution (might disable CPU Power Management).
 												//
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
 
@@ -208,14 +208,17 @@
 //--------------------------------------------------------------- BOOT.C -------------------------------------------------------------------
 
 
-#define PRE_LINKED_KERNEL_SUPPORT			0	// Set to 1 by default. Change this to 0 to disable the use of pre-linked kernels.
+#define PRE_LINKED_KERNEL_SUPPORT			1	// Set to 1 by default. Change this to 0 to disable the use of pre-linked kernels.
 
 #define MUST_ENABLE_A20						0	// Set to 0 by default. Change this to 1 when your hardware requires it.
 
 #define SAFE_MALLOC							0	// Set to 0 by default. Change this to 1 when booting halts with a memory allocation error.
 
-#define LION_RECOVERY_SUPPORT				0	// Set to 0 by default. Change this to 1 to make RevoBoot search for the 'Recovery HD'
+#define RECOVERY_HD_SUPPORT					0	// Set to 0 by default. Change this to 1 to make RevoBoot search for the 'Recovery HD'
 												// partition and, when available, boot from it.
+#if (RECOVERY_HD_SUPPORT == 1 && PRE_LINKED_KERNEL_SUPPORT == 0)
+	#define PRE_LINKED_KERNEL_SUPPORT		1
+#endif
 
 #define STARTUP_DISK_SUPPORT				0	// Set to 0 by default. Change this to 1 for System Preference/Startup Disk support.
 
@@ -248,6 +251,7 @@
 												// Example:  0x2800 for 4.0 GHz on a i7-2600.
 
 #define DEBUG_CPU							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
+												//
 												// Note: CPU info data will not be displayed when USE_STATIC_CPU_DATA is set to 1
 
 #if DEBUG_CPU
@@ -285,7 +289,7 @@
 
 #define LEGACY_BIOS_READ_SUPPORT			0	// Set to 0 by default. Change this to 1 for crappy old BIOSes.
 
-#if LION_RECOVERY_SUPPORT
+#if RECOVERY_HD_SUPPORT
 	#define CORE_STORAGE_SUPPORT			1	// Set to 1 by default since booting from a 'Recovery HD' partition may requires us to skip
 												// (encrypted) CoreStorage partitions.
 #else
@@ -328,6 +332,9 @@
 
 #define EFI_SYSTEM_SERIAL_NUMBER			{ 'S', 'O', 'M', 'E', 'S', 'R', 'L', 'N', 'U', 'M', 'B', 'R' }
 
+												// Note: You can check your serial number by visiting the following link:
+												// https://selfsolve.apple.com/agreementWarrantyDynamic.do
+
 #define STATIC_NVRAM_ROM					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN } // Example only!
 												// sudo nvram 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14:ROM=%01%02%03%04%05%06%07%08%09%0A%0B%NN%NN%NN%NN%NN%NN
 												// Note: Use your MAC address for the last six bytes!
@@ -358,7 +365,10 @@
 
 #define INSTALL_ESD_SUPPORT					0	// Set to 0 by default. Setting this to 1 will make RevoBoot search in specific directories
 												// for com.apple.Boot.plist – required for Mac like Lion OS X installations.
-												
+
+#if (RECOVERY_HD_SUPPORT == 1 && INSTALL_ESD_SUPPORT == 0)
+	#define INSTALL_ESD_SUPPORT				1	// This setting is mandatory for RECOVERY_HD_SUPPORT
+#endif
 //-------------------------------------------------------------- SMBIOS.C ------------------------------------------------------------------
 
 

From a820784a6bb89c9960065a4430c87188061a0ecb Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 4 Jan 2014 20:11:46 +0100
Subject: [PATCH 446/623] Create MODEL file after the first run

---
 r | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/r b/r
index 530f117..9f02db6 100755
--- a/r
+++ b/r
@@ -20,9 +20,14 @@ if [[ "$1" =~ [iMac|Mac] ]];
       make MODEL=`cat MODEL` > out.log
     else
       #
-      # No default model found. Use the default (matches settings-template.h)
-      #
+      # No default model found. Create MODEL file for future use.
+	  #
+	  echo "Macmini" > MODEL
+	  #
+	  # Use Macmini as our default (matches settings-template.h)
+	  #
       make MODEL=Macmini > out.log
+
     fi;
 fi
 

From 3ae5f30aad3af60eab3aa01501ee501a8f4911a8 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 5 Jan 2014 01:06:11 +0100
Subject: [PATCH 447/623] Typo

---
 i386/libsaio/platform.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 454bf66..e2bd3a2 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -61,7 +61,7 @@
 #define IMAC_131				(IMAC | (4 << 15))
 #define IMAC_132				(IMAC | (5 << 15))
 #define IMAC_141				(IMAC | (6 << 15))
-#define IMAC_141				(IMAC | (7 << 15))
+#define IMAC_142				(IMAC | (7 << 15))
 #define IMAC_143				 IMAC						// Defaults to iMac14,3
 
 #define MACBOOK_41				 MACBOOK					// Defaults to MacBook4,1

From 11394e4c5b01cbe7930c042d974f5548890d5db6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 5 Jan 2014 14:13:01 +0100
Subject: [PATCH 448/623] Adding switches to enable/disable features in
 Info.plist

logMSRs = enabled by default
logIGPU = disabled by default
logCStates = enabled by default
---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 61 +++++++++++++++----
 .../AppleIntelCPUPowerManagementInfo.h        | 15 +++--
 ...nfo-AppleIntelCPUPowerManagementInfo.plist |  6 ++
 .../InfoPlist.strings                         |  2 +-
 4 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index c7b8e78..dc1cfe8 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -163,7 +163,7 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 	loopLock = true;
 	
 #if REPORT_C_STATES
-	if (dumpCStates)
+	if (logCStates)
 	{
 		UInt32 magic = 0;
 		mp_rendezvous_no_intrs(getCStates, &magic);
@@ -312,6 +312,33 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 		
 		if (simpleLock)
 		{
+#if REPORT_MSRS
+			OSBoolean * key_logMSRs = OSDynamicCast(OSBoolean, getProperty("logMSRs"));
+			
+			if (key_logMSRs)
+			{
+				logMSRs = (bool)key_logMSRs->getValue();
+			}
+#endif
+			
+#if REPORT_IGPU_P_STATES
+			OSBoolean * key_logIGPU = OSDynamicCast(OSBoolean, getProperty("logIGPU"));
+			
+			if (key_logIGPU)
+			{
+				igpuEnabled = (bool)key_logIGPU->getValue();
+			}
+#endif
+			
+#if REPORT_C_STATES
+			OSBoolean * key_logCStates = OSDynamicCast(OSBoolean, getProperty("logCStates"));
+			
+			if (key_logCStates)
+			{
+				logCStates = (bool)key_logCStates->getValue();
+			}
+#endif
+
 			timerEventSource = IOTimerEventSource::timerEventSource(this, OSMemberFunctionCast(IOTimerEventSource::Action, this, &AppleIntelCPUPowerManagementInfo::loopTimerEvent));
 			workLoop = getWorkLoop();
 			
@@ -321,13 +348,28 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				
 				UInt64  msr = rdmsr64(MSR_IA32_PERF_STS);
 				gCoreMultipliers |= (1ULL << (msr >> 8));
+
+#if REPORT_IGPU_P_STATES
+				bool isIGPUEnabled = ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK)); // IGPU Enabled and Visible?
 				
+				if (!isIGPUEnabled && igpuEnabled)
+				{
+					igpuEnabled = false;
+				}
+#endif
 				uint32_t cpuid_reg[4];
 				do_cpuid(0x00000001, cpuid_reg);
 				
 				UInt8 cpuModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
 
 #if REPORT_C_STATES
+				OSBoolean * key_logCStates = OSDynamicCast(OSBoolean, getProperty("logCStates"));
+				
+				if (key_logCStates)
+				{
+					logCStates = (bool)key_logCStates->getValue();
+				}
+
 				switch (cpuModel) // TODO: Verify me!
 				{
 					case CPU_MODEL_SB_CORE:			// 0x2A - Intel 325462.pdf Vol.3C 35-111
@@ -345,22 +387,17 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				}
 #endif
 
-#if REPORT_IGPU_P_STATES
-				bool isIGPUEnabled = ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK)); // IGPU Enabled and Visible?
-				
-				if (!isIGPUEnabled && igpuEnabled)
-				{
-					igpuEnabled = false;
-				}
-#endif
+#if REPORT_MSRS
 				// MWAIT information
 				do_cpuid(0x00000005, cpuid_reg);
 				uint32_t supportedMwaitCStates = bitfield32(cpuid_reg[edx], 31,  0);
 				
 				IOLog("AICPUPMI: MWAIT C-States.....................: %d\n", supportedMwaitCStates);
 
-#if REPORT_MSRS
-				reportMSRs(cpuModel);
+				if (logMSRs)
+				{
+					reportMSRs(cpuModel);
+				}
 #endif
 				msr = rdmsr64(MSR_PLATFORM_INFO);
 				gMinRatio = (UInt8)((msr >> 40) & 0xff);
@@ -382,7 +419,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				}
 				
 #if REPORT_IGPU_P_STATES
-				if (isIGPUEnabled)
+				if (igpuEnabled)
 				{
 					IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
 					memDescriptor = IOMemoryDescriptor::withPhysicalAddress(address, 0x53, kIODirectionInOut);
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index e4545ae..4c4356a 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -95,17 +95,24 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 	IOMemoryDescriptor	*memDescriptor;
 	IOMemoryMap			*memoryMap;
 
-	bool igpuEnabled	= true;
+	bool igpuEnabled	= false;	// Set <key>logIGPU</key> to <true/> in Info.plist to enable this feature.
 #endif
 	
 	IOReturn result		= kIOReturnSuccess;
 	
 	virtual IOReturn loopTimerEvent(void);
-	
+
+#if REPORT_MSRS
 	void reportMSRs(UInt8 aCPUModel);
-	
+
+	bool logMSRs		= true;		// Set <key>logIGPU</key> to <false/> in Info.plist to disable this feature.
+#endif
+
 	bool loopLock		= false;
-	bool dumpCStates	= true;	// TODO: Use Info.plist
+
+#if REPORT_C_STATES
+	bool logCStates		= true;		//  Set <key>logCStates</key> to <false/> in Info.plist to disable this feature.
+#endif
 
 	UInt16 Interval	= 50;
 	
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
index dfdd07c..ff48fad 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
@@ -36,6 +36,12 @@
 			<string>IOResources</string>
 			<key>IOResourceMatch</key>
 			<string>IOKit</string>
+			<key>logMSRs</key>
+			<true/>
+			<key>logIGPU</key>
+			<false/>
+			<key>logCStates</key>
+			<true/>
 		</dict>
 	</dict>
 	<key>OSBundleLibraries</key>
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/InfoPlist.strings b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/InfoPlist.strings
index 19f3055..8788023 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/InfoPlist.strings
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/InfoPlist.strings
@@ -1,2 +1,2 @@
 /* Localized versions of Info.plist keys */
-NSHumanReadableCopyright = "Copyright © 2012-2013 Pike R. Alpha. All rights reserved";
\ No newline at end of file
+NSHumanReadableCopyright = "Copyright © 2012-2014 Pike R. Alpha. All rights reserved";
\ No newline at end of file

From a1d7a856ac2e6aa3559ad32752c256b008fe453d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 6 Jan 2014 01:18:27 +0100
Subject: [PATCH 449/623] Sed RegEx error fixed in _getCPUtype

Thanks to 'Klonkrieger2' aka Mark for the tip!
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 2c2512c..075c604 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 7.5 - Copyright (c) 2013 by Pike <PikeRAlpha@yahoo.com>
+# Version 7.6 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -82,6 +82,7 @@
 #			- LFM fixed in the Intel i7-3930K data (Pike, December 2013)
 #			- Intel E5-2695 V2 added (Pike, December 2013)
 #			- Intel i3-3250 added (Pike, December 2013)
+#			- Sed RegEx error fixed in _getCPUtype (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -92,6 +93,7 @@
 #			- Thanks to 'BigDonkey' for his help with LFM (800 MHz) for Sandy Bridge mobility models.
 #			- Thanks to 'xpamamadeus' for the Clover boot.log tip.
 #			- Thanks to 'rileyfreeman' for the Intel i7-3930K LFM value.
+#			- Thanks to 'Klonkrieger2' aka Mark for the tip about the sed RegEx error in _getCPUtype.
 #
 # Usage (v1.0 - v4.9):
 #
@@ -189,7 +191,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=7.5
+gScriptVersion=7.6
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1243,7 +1245,7 @@ function _getCPUtype()
     #
     # Grab 'cpu-type' property from ioreg (stripped with sed / RegEX magic).
     #
-    local grepStr=$(ioreg -p IODeviceTree -n "${gProcessorNames[0]}"@0 -k cpu-type | grep cpu-type | sed -e 's/ *[-|="<a-z>]//g')
+    local grepStr=$(ioreg -p IODeviceTree -n "${gProcessorNames[0]}"@0 -k cpu-type | grep cpu-type | sed -e 's/["cputype" ,<>|=-]//g')
 
     # Swap bytes with help of ${str:pos:num}
     #

From 1f3605fec0c8939831142acbac27c241609c5578 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 8 Jan 2014 00:29:39 +0100
Subject: [PATCH 450/623] Fixed a typo 's/i7-26740M/i7-2674M'

Thanks to 'dhnguyen92' on Github issues for the tip
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 075c604..60df98e 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -83,6 +83,7 @@
 #			- Intel E5-2695 V2 added (Pike, December 2013)
 #			- Intel i3-3250 added (Pike, December 2013)
 #			- Sed RegEx error fixed in _getCPUtype (Pike, January 2014)
+#			- Fixed a typo 's/i7-26740M/i7-2674M' (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -94,6 +95,7 @@
 #			- Thanks to 'xpamamadeus' for the Clover boot.log tip.
 #			- Thanks to 'rileyfreeman' for the Intel i7-3930K LFM value.
 #			- Thanks to 'Klonkrieger2' aka Mark for the tip about the sed RegEx error in _getCPUtype.
+#			- Thanks to 'dhnguyen92' on Github issues for the tip about a typo in the i7-2674M data.
 #
 # Usage (v1.0 - v4.9):
 #
@@ -323,7 +325,7 @@ i7-2670QM,45,800,2200,3100,4,8
 i7-2675M,17,800,1600,2700,2,4
 i7-2655LE,25,800,2200,2900,2,4
 i7-2649M,25,800,2300,3200,2,4
-i7-26740M,32,800,2800,3500,2,4
+i7-2674M,32,800,2800,3500,2,4
 i7-2637M,17,800,1700,2800,2,4
 i7-2635QM,45,800,2000,2900,4,8
 i7-2630QM,45,800,2000,2900,4,8

From dacd2dcceda8f168b7ad044595d96dfa3dcfd1e7 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Thu, 9 Jan 2014 00:14:00 +0100
Subject: [PATCH 451/623] Typo in Haswell CPU list

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 60df98e..aa4bd2d 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 7.6 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 7.7 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -83,7 +83,8 @@
 #			- Intel E5-2695 V2 added (Pike, December 2013)
 #			- Intel i3-3250 added (Pike, December 2013)
 #			- Sed RegEx error fixed in _getCPUtype (Pike, January 2014)
-#			- Fixed a typo 's/i7-26740M/i7-2674M' (Pike, January 2014)
+#			- Fixed a typo 's/i7-26740M/i7-2674M/' (Pike, January 2014)
+#			- Fixed a typo 's/gHaswellCPUList/gServerHaswellCPUList/' (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -193,7 +194,7 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=7.6
+gScriptVersion=7.7
 
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
@@ -1472,7 +1473,7 @@ function _getCPUDataByProcessorNumber
                ;;
             4) local cpuSpecLists=("gDesktopIvyBridgeCPUList[@]" "gMobileIvyBridgeCPUList[@]" "gServerIvyBridgeCPUList[@]")
                ;;
-            8) local cpuSpecLists=("gDesktopHaswellCPUList[@]" "gMobileHaswellCPUList[@]" "gHaswellCPUList[@]")
+            8) local cpuSpecLists=("gDesktopHaswellCPUList[@]" "gMobileHaswellCPUList[@]" "gServerHaswellCPUList[@]")
                ;;
         esac
 

From c24fa04f7213a69f7657e9449a64625990a958ea Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 11 Jan 2014 13:39:24 +0100
Subject: [PATCH 452/623] Updating script to v7.8

Intel E5-26nn v2 Xeon Processors added
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 35 ++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index aa4bd2d..2939ecc 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 7.7 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 7.8 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivybridge (Pike, January 2013)
@@ -85,6 +85,7 @@
 #			- Sed RegEx error fixed in _getCPUtype (Pike, January 2014)
 #			- Fixed a typo 's/i7-26740M/i7-2674M/' (Pike, January 2014)
 #			- Fixed a typo 's/gHaswellCPUList/gServerHaswellCPUList/' (Pike, January 2014)
+#			- Intel E5-26nn v2 Xeon Processors added (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -135,6 +136,11 @@
 
 #================================= GLOBAL VARS ==================================
 
+#
+# Script version info.
+#
+gScriptVersion=7.8
+
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
 #
@@ -194,8 +200,6 @@ gScope="\_PR_"
 # Other global variables.
 #
 
-gScriptVersion=7.7
-
 gRevision='0x0000'${gScriptVersion:0:1}${gScriptVersion:2:1}'00'
 
 #
@@ -383,7 +387,29 @@ gServerIvyBridgeCPUList=(
 'E3-1225 V2',77,0,3200,3600,4,4
 'E3-1220 V2',69,0,3100,3500,4,4
 'E3-1220L V2',17,0,2300,3500,2,4
-'E5-2695 V2',115,1200,2400,3200,12,24
+# E5-2600 Xeon Processor Series
+'E5-2687W v2',150,1200,3400,4000,8,16
+'E5-2658 v2 ',95,1200,2400,3000,10,20
+'E5-2648L v2',70,1200,1900,2500,10,20
+'E5-2628L v2',70,1200,1900,2400,8,16
+'E5-2603 v2',80,1200,1800,1800,4,4
+'E5-2637 v2',130,1200,3500,3800,4,8
+'E5-2630L v2',60,1200,2400,2800,6,12
+'E5-2630 v2',80,1200,2600,3100,6,12
+'E5-2620 v2',80,1200,2100,2600,6,12
+'E5-2618L v2',50,1200,2000,2000,6,12
+'E5-2609 v2',80,1200,2500,2500,4,4
+'E5-2697 v2',130,1200,2700,3500,12,24
+'E5-2695 v2',115,1200,2400,3200,12,24
+'E5-2690 v2',130,1200,3000,3600,10,20
+'E5-2680 v2',115,1200,2800,3600,10,20
+'E5-2670 v2',115,1200,2500,3300,10,20
+'E5-2667 v2',130,1200,3300,4000,6,16
+'E5-2660 v2',95,1200,2200,3000,10,20
+'E5-2650L v2',70,1200,1700,2100,10,20
+'E5-2650 v2',95,1200,2600,3400,8,16
+'E5-2643 v2',130,1200,3500,3800,6,12
+'E5-2640 v2',95,1200,2000,2500,8,16
 )
 
 gDesktopIvyBridgeCPUList=(
@@ -497,6 +523,7 @@ gServerHaswellCPUList=(
 'E3-1230 V3',80,800,3300,3700,4,8
 'E3-1225 V3',80,800,3200,3600,4,4
 'E3-1220 V3',80,800,3100,3500,4,4
+'E3-1220L V3',13,800,1100,1500,2,4
 )
 
 gDesktopHaswellCPUList=(

From 37b1832184bfe06af5e6646c568d745fa4bc9b60 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 11 Jan 2014 18:24:21 +0100
Subject: [PATCH 453/623] Updating script to v7.9

Xeon detection code changes
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 110 +++++++++++++++------------
 1 file changed, 61 insertions(+), 49 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 2939ecc..240cb4d 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,10 +3,10 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 7.8 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 7.9 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
-#			- Added support for Ivybridge (Pike, January 2013)
+#			- Added support for Ivy Bridge (Pike, January 2013)
 #			- Filename error fixed (Pike, January 2013)
 #			- Namespace error fixed in _printScopeStart (Pike, January 2013)
 #			- Model and board-id checks added (Pike, January 2013)
@@ -114,10 +114,10 @@
 #
 #           - ./ssdtPRGen.sh E5-1650
 #
-#           - ./ssdtPRGen.sh 'E3-1220 V2'
-#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600
-#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70
-#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70 1
+#           - ./ssdtPRGen.sh 'E3-1220 v2'
+#           - ./ssdtPRGen.sh 'E3-1220 v2' 3600
+#           - ./ssdtPRGen.sh 'E3-1220 v2' 3600 70
+#           - ./ssdtPRGen.sh 'E3-1220 v2' 3600 70 1
 #
 # Usage (v5.5 and greater):
 #
@@ -125,11 +125,11 @@
 #
 #           - ./ssdtPRGen.sh E5-1650
 #
-#           - ./ssdtPRGen.sh 'E3-1220 V2'
-#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600
-#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70
-#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70 1
-#           - ./ssdtPRGen.sh 'E3-1220 V2' 3600 70 1 CPU
+#           - ./ssdtPRGen.sh 'E3-1220 v2'
+#           - ./ssdtPRGen.sh 'E3-1220 v2' 3600
+#           - ./ssdtPRGen.sh 'E3-1220 v2' 3600 70
+#           - ./ssdtPRGen.sh 'E3-1220 v2' 3600 70 1
+#           - ./ssdtPRGen.sh 'E3-1220 v2' 3600 70 1 CPU
 #
 
 # set -x # Used for tracing errors (can be used anywhere in the script).
@@ -139,7 +139,7 @@
 #
 # Script version info.
 #
-gScriptVersion=7.8
+gScriptVersion=7.9
 
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
@@ -374,19 +374,19 @@ i3-2310E,35,800,2100,0,2,4
 
 gServerIvyBridgeCPUList=(
 # E3-1200 Xeon Processor Series
-'E3-1290 V2',87,0,3700,4100,4,8
-'E3-1285 V2',65,0,3600,4000,
-'E3-1285L V2',0,0,3200,3900,
-'E3-1280 V2',69,0,3600,4000,4,8
-'E3-1275 V2',77,0,3500,3900,4,8
-'E3-1270 V2',69,0,3500,3900,4,8
-'E3-1265L V2',45,0,2500,3500,4,8
-'E3-1245 V2',77,0,3400,3800,4,8
-'E3-1240 V2',69,0,3400,3800,4,8
-'E3-1230 V2',69,0,3300,3700,4,8
-'E3-1225 V2',77,0,3200,3600,4,4
-'E3-1220 V2',69,0,3100,3500,4,4
-'E3-1220L V2',17,0,2300,3500,2,4
+'E3-1290 v2',87,0,3700,4100,4,8
+'E3-1285 v2',65,0,3600,4000,
+'E3-1285L v2',0,0,3200,3900,
+'E3-1280 v2',69,0,3600,4000,4,8
+'E3-1275 v2',77,0,3500,3900,4,8
+'E3-1270 v2',69,0,3500,3900,4,8
+'E3-1265L v2',45,0,2500,3500,4,8
+'E3-1245 v2',77,0,3400,3800,4,8
+'E3-1240 v2',69,0,3400,3800,4,8
+'E3-1230 v2',69,0,3300,3700,4,8
+'E3-1225 v2',77,0,3200,3600,4,4
+'E3-1220 v2',69,0,3100,3500,4,4
+'E3-1220L v2',17,0,2300,3500,2,4
 # E5-2600 Xeon Processor Series
 'E5-2687W v2',150,1200,3400,4000,8,16
 'E5-2658 v2 ',95,1200,2400,3000,10,20
@@ -509,21 +509,21 @@ i3-3110M,35,0,2400,0,2,4
 # New Haswell processors (with HD-4600 graphics)
 #
 gServerHaswellCPUList=(
-# E3-1200 V3 Xeon Processor Series
-'E3-1285L V3',65,800,3100,3900,4,8
-'E3-1285 V3',84,800,3600,4000,4,8
-'E3-1280 V3',82,800,3600,4000,4,8
-'E3-1275 V3',84,800,3500,3900,4,8
-'E3-1270 V3',80,800,3500,3900,4,8
-'E3-1268L V3',45,800,2300,3300,4,8
-'E3-1265L V3',45,800,2500,3700,4,8
-'E3-1245 V3',84,800,3400,3800,4,8
-'E3-1240 V3',80,800,3400,3800,4,8
-'E3-1230L V3',25,800,1800,2800,4,8
-'E3-1230 V3',80,800,3300,3700,4,8
-'E3-1225 V3',80,800,3200,3600,4,4
-'E3-1220 V3',80,800,3100,3500,4,4
-'E3-1220L V3',13,800,1100,1500,2,4
+# E3-1200 v3 Xeon Processor Series
+'E3-1285L v3',65,800,3100,3900,4,8
+'E3-1285 v3',84,800,3600,4000,4,8
+'E3-1280 v3',82,800,3600,4000,4,8
+'E3-1275 v3',84,800,3500,3900,4,8
+'E3-1270 v3',80,800,3500,3900,4,8
+'E3-1268L v3',45,800,2300,3300,4,8
+'E3-1265L v3',45,800,2500,3700,4,8
+'E3-1245 v3',84,800,3400,3800,4,8
+'E3-1240 v3',80,800,3400,3800,4,8
+'E3-1230L v3',25,800,1800,2800,4,8
+'E3-1230 v3',80,800,3300,3700,4,8
+'E3-1225 v3',80,800,3200,3600,4,4
+'E3-1220 v3',80,800,3100,3500,4,4
+'E3-1220L v3',13,800,1100,1500,2,4
 )
 
 gDesktopHaswellCPUList=(
@@ -1440,8 +1440,11 @@ function _getCPUNumberFromBrandString
     # Split brandstring into array (data)
     #
     local data=($brandString)
-#   local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "V2" "@" "2.5GHz")
-#   local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "@" "2.5GHz")
+    # local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "@" "2.5GHz")
+    # local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "v2" "@" "2.5GHz")
+    # local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "v3" "@" "2.5GHz")
+    # local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "0" "@" "2.5GHz")
+
     #
     # Example from a MacBookPro10,2
     #
@@ -1469,15 +1472,24 @@ function _getCPUNumberFromBrandString
 
     let length=${#data[@]}
 
-    if ((length > 6)); then
+    if ((length > 7)); then
         echo 'Warning: Unexpected brandstring > "'${data[@]}'"'
     fi
 
-    if [[ ${data[1]} == "Xeon(R)" && ${data[4]} == "V2" ]];
-        then
-            gProcessorNumber="${data[3]} ${data[4]}"
-        else
-            gProcessorNumber="${data[2]}"
+    #
+    # Is this a Xeon processor model?
+    #
+    if [[ "${data[1]}" == "Xeon(R)" ]];
+      then
+        #
+        # Yes. Check for lower/upper case 'v' or '0' for OEM processors. 
+        #
+        if [[ "${data[4]}" =~ "v" || "${data[4]}" =~ "V" || "${data[4]}" == "0" ]];
+          then
+              gProcessorNumber="${data[3]} ${data[4]}"
+          else
+              gProcessorNumber="${data[2]}"
+        fi
     fi
 
 #   echo $gProcessorNumber
@@ -2073,7 +2085,7 @@ function main()
             let frequency=($frequency / 1000000)
 
             if [[ $assumedTDP -eq 1 ]]; then
-                echo 'With a maximum TDP of '$gTdp' Watt - assumed, may require override value!'
+              echo "With a maximum TDP of ${gTdp} Watt - assumed/undetected CPU may require override value!"
             fi
     fi
 

From 6e0855696a620864bdc60ed10653aeac38849e08 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 12 Jan 2014 08:41:12 +0100
Subject: [PATCH 454/623] Updating script to 8.0

Brandstring detection changes.
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 36 ++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 240cb4d..075d0c7 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 7.9 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 8.0 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -86,6 +86,7 @@
 #			- Fixed a typo 's/i7-26740M/i7-2674M/' (Pike, January 2014)
 #			- Fixed a typo 's/gHaswellCPUList/gServerHaswellCPUList/' (Pike, January 2014)
 #			- Intel E5-26nn v2 Xeon Processors added (Pike, January 2014)
+#			- Show the CPU brandstring at all times (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -139,7 +140,7 @@
 #
 # Script version info.
 #
-gScriptVersion=7.9
+gScriptVersion=8.0
 
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
@@ -1429,6 +1430,10 @@ function _getCPUNumberFromBrandString
     #
     local brandString=$(echo `sysctl machdep.cpu.brand_string` | sed -e 's/machdep.cpu.brand_string: //')
     #
+    # Show brandstring (this helps me to debug stuff).
+    #
+    echo "Brandstring '${brandString}'"
+    #
     # Save default (0) delimiter
     #
     local ifs=$IFS
@@ -1440,6 +1445,9 @@ function _getCPUNumberFromBrandString
     # Split brandstring into array (data)
     #
     local data=($brandString)
+    #
+    # Teststrings
+    #
     # local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "@" "2.5GHz")
     # local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "v2" "@" "2.5GHz")
     # local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "v3" "@" "2.5GHz")
@@ -1473,7 +1481,7 @@ function _getCPUNumberFromBrandString
     let length=${#data[@]}
 
     if ((length > 7)); then
-        echo 'Warning: Unexpected brandstring > "'${data[@]}'"'
+        echo 'Warning: The brandstring has an unexpected length!'
     fi
 
     #
@@ -1484,15 +1492,25 @@ function _getCPUNumberFromBrandString
         #
         # Yes. Check for lower/upper case 'v' or '0' for OEM processors. 
         #
-        if [[ "${data[4]}" =~ "v" || "${data[4]}" =~ "V" || "${data[4]}" == "0" ]];
+        if [[ "${data[4]}" =~ "v" || "${data[4]}" =~ "V" ]];
           then
-              gProcessorNumber="${data[3]} ${data[4]}"
+              #
+              # Use a lowercase 'v' because that is what we use in our data.
+              #
+              gProcessorNumber="${data[3]} v${data[4]:1:1}"
+          elif [[ "${data[4]}" == "0" ]];
+              #
+              # OEM CPU's have been reported to use a "0" instead of "v2"
+              # and thus let's use that to make our data match the CPU.
+              #
+              gProcessorNumber="${data[3]} v2"
           else
+              #
+              # All other non-Xeon processor models.
+              #
               gProcessorNumber="${data[2]}"
         fi
     fi
-
-#   echo $gProcessorNumber
 }
 
 #--------------------------------------------------------------------------------
@@ -1943,6 +1961,10 @@ function main()
 
     _getCPUNumberFromBrandString
 
+    if ((gDebug)); then
+      echo $gProcessorNumber
+    fi
+
     if [[ "$1" != "" ]]; then
         # Sandy Bridge checks
         if [[ ${1:0:4} == "i3-2" || ${1:0:4} == "i5-2" || ${1:0:4} == "i7-2" ]]; then

From 0d17675d0407149707daa138f20e92beb7a41b41 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 12 Jan 2014 08:58:59 +0100
Subject: [PATCH 455/623] Updating script to 8.1

Error fixed in _getCPUNumberFromBrandString
Fixed cpu-type suggestion for MacPro6,1
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 38 ++++++++++++++++++----------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 075d0c7..8eab6a9 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 8.0 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 8.1 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -87,6 +87,7 @@
 #			- Fixed a typo 's/gHaswellCPUList/gServerHaswellCPUList/' (Pike, January 2014)
 #			- Intel E5-26nn v2 Xeon Processors added (Pike, January 2014)
 #			- Show the CPU brandstring at all times (Pike, January 2014)
+#			- Fixed cpu-type suggestion for MacPro6,1 (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -140,7 +141,7 @@
 #
 # Script version info.
 #
-gScriptVersion=8.0
+gScriptVersion=8.1
 
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
@@ -1432,7 +1433,7 @@ function _getCPUNumberFromBrandString
     #
     # Show brandstring (this helps me to debug stuff).
     #
-    echo "Brandstring '${brandString}'"
+    printf "Brandstring '${brandString}'"
     #
     # Save default (0) delimiter
     #
@@ -1499,11 +1500,12 @@ function _getCPUNumberFromBrandString
               #
               gProcessorNumber="${data[3]} v${data[4]:1:1}"
           elif [[ "${data[4]}" == "0" ]];
-              #
-              # OEM CPU's have been reported to use a "0" instead of "v2"
-              # and thus let's use that to make our data match the CPU.
-              #
-              gProcessorNumber="${data[3]} v2"
+              then
+                #
+                # OEM CPU's have been reported to use a "0" instead of "v2"
+                # and thus let's use that to make our data match the CPU.
+                #
+                gProcessorNumber="${data[3]} v2"
           else
               #
               # All other non-Xeon processor models.
@@ -2252,6 +2254,16 @@ function main()
             _printScopeCPUn
            ;;
     esac
+    #
+    # Is this a MacPro6,1 model?
+    #
+    if [[ $modelID == 'MacPro6,1' ]];
+      then
+        #
+        # Yes. Use the correct string/value for the cpu-type suggestion.
+        #
+        local cpuTypeString="0A"
+    fi
 
     _showLowPowerStates
     _checkPlatformSupport $modelID $boardID
@@ -2259,12 +2271,12 @@ function main()
     #
     # Some Sandy Bridge/Ivy Bridge CPUPM specific configuration checks
     #
-    if [ $gBridgeType -ne $HASWELL ]; then
-        if [ ${cpu_type:0:2} -ne $cpuTypeString ]; then
+    if [ $gBridgeType -ne $HASWELL ];
+      then
+        if [ ${cpu_type:0:2} -ne $cpuTypeString ];
+          then
             echo -e "\nWarning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
-        fi
-
-        if [ $gSystemType -eq 0 ];
+          elif [[ $gSystemType -eq 0 ]];
             then
                 echo -e "\nWarning: 'board-id' [$boardID] is not supported by $bridgeTypeString PM"
             else

From 8732365750c2dcc371ef693eefe871ff69f5d93e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 12 Jan 2014 13:46:24 +0100
Subject: [PATCH 456/623] Fixing a typo

Thanks to 'fabiosun' on Github issues for the tip about a typo in the
cpu-type check.
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 8eab6a9..3c2b3fd 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 8.1 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 8.2 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -100,6 +100,7 @@
 #			- Thanks to 'rileyfreeman' for the Intel i7-3930K LFM value.
 #			- Thanks to 'Klonkrieger2' aka Mark for the tip about the sed RegEx error in _getCPUtype.
 #			- Thanks to 'dhnguyen92' on Github issues for the tip about a typo in the i7-2674M data.
+#			- Thanks to 'fabiosun' on Github issues for the tip about a typo in the cpu-type check.
 #
 # Usage (v1.0 - v4.9):
 #
@@ -141,7 +142,7 @@
 #
 # Script version info.
 #
-gScriptVersion=8.1
+gScriptVersion=8.2
 
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
@@ -2262,7 +2263,7 @@ function main()
         #
         # Yes. Use the correct string/value for the cpu-type suggestion.
         #
-        local cpuTypeString="0A"
+        local cpuTypeString="0a"
     fi
 
     _showLowPowerStates
@@ -2273,7 +2274,7 @@ function main()
     #
     if [ $gBridgeType -ne $HASWELL ];
       then
-        if [ ${cpu_type:0:2} -ne $cpuTypeString ];
+        if [ ${cpu_type:0:2} != $cpuTypeString ];
           then
             echo -e "\nWarning: 'cpu-type' may be set improperly (0x$cpu_type instead of 0x$cpuTypeString${cpu_type:2:2})"
           elif [[ $gSystemType -eq 0 ]];

From 96e42f87434dbcd6cb0008e7c95cd0097ce04db7 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 13 Jan 2014 00:28:52 +0100
Subject: [PATCH 457/623] CPU detection fixed

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 3c2b3fd..aa5a259 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 8.2 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 8.3 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -142,7 +142,7 @@
 #
 # Script version info.
 #
-gScriptVersion=8.2
+gScriptVersion=8.3
 
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
@@ -1507,12 +1507,12 @@ function _getCPUNumberFromBrandString
                 # and thus let's use that to make our data match the CPU.
                 #
                 gProcessorNumber="${data[3]} v2"
-          else
-              #
-              # All other non-Xeon processor models.
-              #
-              gProcessorNumber="${data[2]}"
         fi
+      else
+        #
+        # All other non-Xeon processor models.
+        #
+        gProcessorNumber="${data[2]}"
     fi
 }
 

From 572caff8e61d88292e67d62e6eb5742e5cc1994b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 13 Jan 2014 00:39:23 +0100
Subject: [PATCH 458/623] _debugPrint should call printf instead of echo

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index aa5a259..0bf21c7 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -875,7 +875,7 @@ function _printMethodDSM()
 function _debugPrint()
 {
     if (( gDebug & 2 )); then
-        echo "$1"
+        printf "$1"
     fi
 }
 
@@ -954,41 +954,41 @@ function _printScopeACST()
     fi
 
 
-    _debugPrint "targetCStates: $targetCStates"
+    _debugPrint "targetCStates: $targetCStates\n"
 
     #
     # Checks to determine which C-State(s) we should inject.
     #
     if (($targetCStates & 1)); then
-        _debugPrint "Adding C1"
+        _debugPrint "Adding C1\n"
         let C1=1
         let numberOfCStates+=1
         let pkgLength+=1
     fi
 
     if (($targetCStates & 2)); then
-        _debugPrint "Adding C2"
+        _debugPrint "Adding C2\n"
         let C2=1
         let numberOfCStates+=1
         let pkgLength+=1
     fi
 
     if (($targetCStates & 4)); then
-        _debugPrint "Adding C3"
+        _debugPrint "Adding C3\n"
         let C3=1
         let numberOfCStates+=1
         let pkgLength+=1
     fi
 
     if (($targetCStates & 8)); then
-        _debugPrint "Adding C6"
+        _debugPrint "Adding C6\n"
         let C6=1
         let numberOfCStates+=1
         let pkgLength+=1
     fi
 
     if ((($targetCStates & 16) == 16)); then
-        _debugPrint "Adding C7"
+        _debugPrint "Adding C7\n"
         let C7=1
         let numberOfCStates+=1
         let pkgLength+=1
@@ -1434,7 +1434,7 @@ function _getCPUNumberFromBrandString
     #
     # Show brandstring (this helps me to debug stuff).
     #
-    printf "Brandstring '${brandString}'"
+    printf "Brandstring '${brandString}'\n"
     #
     # Save default (0) delimiter
     #
@@ -1454,6 +1454,7 @@ function _getCPUNumberFromBrandString
     # local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "v2" "@" "2.5GHz")
     # local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "v3" "@" "2.5GHz")
     # local data=("Intel(R)" "Xeon(R)" "CPU" "E3-1220" "0" "@" "2.5GHz")
+    # local data=("Intel(R)" "Core(TM)" "i5-4670K" "CPU" "@" "3.40GHz")
 
     #
     # Example from a MacBookPro10,2
@@ -1963,10 +1964,7 @@ function main()
     let maxTurboFrequency=0
 
     _getCPUNumberFromBrandString
-
-    if ((gDebug)); then
-      echo $gProcessorNumber
-    fi
+    _debugPrint "\ngProcessorNumber: $gProcessorNumber\n"
 
     if [[ "$1" != "" ]]; then
         # Sandy Bridge checks

From cde97153d0ce1ede1b8a161c22d4ea487570ce5c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 15 Jan 2014 00:04:01 +0100
Subject: [PATCH 459/623] Updating script to v8.4

Intel i7-4771 added
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 0bf21c7..e36a7ad 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 8.3 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 8.4 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -88,6 +88,7 @@
 #			- Intel E5-26nn v2 Xeon Processors added (Pike, January 2014)
 #			- Show the CPU brandstring at all times (Pike, January 2014)
 #			- Fixed cpu-type suggestion for MacPro6,1 (Pike, January 2014)
+#			- Intel i7-4771 added (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -142,7 +143,7 @@
 #
 # Script version info.
 #
-gScriptVersion=8.3
+gScriptVersion=8.4
 
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
@@ -536,6 +537,7 @@ i7-4930K,130,800,3400,3900,6,12
 i5-4820K,130,800,3700,3900,4,8
 # Socket 1150 (Standard Power)
 i7-4770K,84,800,3500,3900,4,8
+i7-4771,84,800,3500,3900,4,8
 i7-4770,84,800,3400,3900,4,8
 i5-4670K,84,800,3400,3800,4,4
 i5-4670,84,800,3400,3800,4,4

From a2f1a71fbb370c952459c4137b4f1b302c514f4e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 18 Jan 2014 12:42:54 +0100
Subject: [PATCH 460/623] Updating script to v8.5

Missing Intel Haswell/Crystal Well processor models added
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index e36a7ad..49e2ac6 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 8.4 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 8.5 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -89,6 +89,7 @@
 #			- Show the CPU brandstring at all times (Pike, January 2014)
 #			- Fixed cpu-type suggestion for MacPro6,1 (Pike, January 2014)
 #			- Intel i7-4771 added (Pike, January 2014)
+#			- A couple Intel Haswell/Crystal Well processor models added (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -143,7 +144,7 @@
 #
 # Script version info.
 #
-gScriptVersion=8.4
+gScriptVersion=8.5
 
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
@@ -570,9 +571,13 @@ i3-4340,54,800,3600,3600,2,4
 )
 
 gMobileHaswellCPUList=(
+# Socket FCBGA1364
+i7-4960HQ,47,800,2600,3800,4,8
 i7-4950HQ,47,800,2400,3600,4,8
 i7-4850HQ,47,800,2300,3500,4,8
 i7-4750HQ,47,800,2000,3200,4,8
+i7-4702HQ,37,800,2200,3200,4,8
+i7-4700HQ,47,800,2400,3600,4,8
 # Extreme Edition Series - socket FCPGA946
 i7-4930MX,57,800,3000,3900,4,8
 # Socket FCPGA946
@@ -581,11 +586,13 @@ i7-4800MQ,47,800,2700,3700,4,8
 i7-4702MQ,37,800,2200,3200,4,8
 i7-4700MQ,47,800,2400,3400,4,8
 i5-4200M,37,800,2500,3100,2,4
-# Socket FCBGA1364
-i7-4700HQ,47,800,2400,3600,4,8
-i7-4702HQ,37,800,2200,3200,4,8
 # Socket FCBGA1168
+i7-4650U,15,800,1700,3300,2,4
+i7-4650U,15,800,1700,3300,2,4
+i7-4600U,15,800,2100,3300,2,4
 i7-4558U,28,800,2800,3300,2,4
+i7-4550U,15,800,1500,3000,2,4
+i7-4500U,15,800,1800,3000,2,4
 i5-4350U,15,800,1400,2900,2,4
 i5-4288U,28,800,2600,3100,2,4
 i5-4258U,28,800,2400,2900,2,4

From 731e3bb3bf3d99f141bb689bf5e90d9b76fce980 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sat, 18 Jan 2014 12:51:06 +0100
Subject: [PATCH 461/623] Updating script to v8.6

Fixed a typo and the Intel i5-4440 is now also added
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 49e2ac6..86f7483 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 8.5 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 8.6 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -83,7 +83,7 @@
 #			- Intel E5-2695 V2 added (Pike, December 2013)
 #			- Intel i3-3250 added (Pike, December 2013)
 #			- Sed RegEx error fixed in _getCPUtype (Pike, January 2014)
-#			- Fixed a typo 's/i7-26740M/i7-2674M/' (Pike, January 2014)
+#			- Fixed a typo 's/i7-2640M/i7-2674M/' (Pike, January 2014)
 #			- Fixed a typo 's/gHaswellCPUList/gServerHaswellCPUList/' (Pike, January 2014)
 #			- Intel E5-26nn v2 Xeon Processors added (Pike, January 2014)
 #			- Show the CPU brandstring at all times (Pike, January 2014)
@@ -101,7 +101,7 @@
 #			- Thanks to 'xpamamadeus' for the Clover boot.log tip.
 #			- Thanks to 'rileyfreeman' for the Intel i7-3930K LFM value.
 #			- Thanks to 'Klonkrieger2' aka Mark for the tip about the sed RegEx error in _getCPUtype.
-#			- Thanks to 'dhnguyen92' on Github issues for the tip about a typo in the i7-2674M data.
+#			- Thanks to 'dhnguyen92' on Github issues for the tip about a typo in the i7-2640M model data.
 #			- Thanks to 'fabiosun' on Github issues for the tip about a typo in the cpu-type check.
 #
 # Usage (v1.0 - v4.9):
@@ -144,7 +144,7 @@
 #
 # Script version info.
 #
-gScriptVersion=8.5
+gScriptVersion=8.6
 
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
@@ -335,7 +335,7 @@ i7-2670QM,45,800,2200,3100,4,8
 i7-2675M,17,800,1600,2700,2,4
 i7-2655LE,25,800,2200,2900,2,4
 i7-2649M,25,800,2300,3200,2,4
-i7-2674M,32,800,2800,3500,2,4
+i7-2640M,35,800,2800,3500,2,4
 i7-2637M,17,800,1700,2800,2,4
 i7-2635QM,45,800,2000,2900,4,8
 i7-2630QM,45,800,2000,2900,4,8
@@ -543,6 +543,7 @@ i7-4770,84,800,3400,3900,4,8
 i5-4670K,84,800,3400,3800,4,4
 i5-4670,84,800,3400,3800,4,4
 i5-4570,84,800,3200,3600,4,4
+i5-4440,84,800,3100,3300,4,4
 i5-4430,84,800,3000,3200,4,4
 # Socket 1150 (Low Power)
 i7-4770S,65,800,3100,3900,4,8

From d69a3a0735e95170b092b8282213cbce781d84fc Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 19 Jan 2014 15:32:19 +0100
Subject: [PATCH 462/623] Fixed a couple of MSR name mixups.

---
 .../AppleIntelCPUPowerManagementInfo.cpp             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index dc1cfe8..5054d2a 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -104,13 +104,13 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 
 	if (aCPUModel == CPU_MODEL_HASWELL_ULT) // 0x45 - Intel 325462.pdf Vol.3C 35-136
 	{
-		IOLog("AICPUPMI: MSR_PKG_C8_RESIDENCY.......(0x630) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
-		IOLog("AICPUPMI: MSR_PKG_C9_RESIDENCY.......(0x631) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
-		IOLog("AICPUPMI: MSR_PKG_C10_RESIDENCY......(0x632) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C8_RESIDENCY.......(0x630) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C8_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C9_RESIDENCY.......(0x631) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C9_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C10_RESIDENCY......(0x632) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C10_RESIDENCY));
 		
-		IOLog("AICPUPMI: MSR_PKG_C8_LATENCY.........(0x633) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
-		IOLog("AICPUPMI: MSR_PKG_C9_LATENCY.........(0x634) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
-		IOLog("AICPUPMI: MSR_PKG_C10_LATENCY........(0x635) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C7_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C8_LATENCY.........(0x633) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C8_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C9_LATENCY.........(0x634) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C9_RESIDENCY));
+		IOLog("AICPUPMI: MSR_PKG_C10_LATENCY........(0x635) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_C10_RESIDENCY));
 	}
 }
 

From 3398399e942ea0ac66b6cb48f19b719bc0118de6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 19 Jan 2014 15:39:53 +0100
Subject: [PATCH 463/623] Updating script to v8.7

Moved a couple of Ivy Bridge desktop model processors to the right spot
Experimental code added for Gringo Vermelho
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 51 ++++++++++++++++------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 86f7483..8703117 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 8.6 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 8.7 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -90,6 +90,8 @@
 #			- Fixed cpu-type suggestion for MacPro6,1 (Pike, January 2014)
 #			- Intel i7-4771 added (Pike, January 2014)
 #			- A couple Intel Haswell/Crystal Well processor models added (Pike, January 2014)
+#			- Moved a couple of Ivy Bridge desktop model processors to the right spot (Pike, January 2014)
+#			- Experimental code added for Gringo Vermelho (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -98,6 +100,7 @@
 #			- Thanks to 'philip_petev' for his help with Snow Leopard/egrep incompatibility.
 #			- Thanks to 'RehabMan' for his help with Snow Leopard/egrep incompatibility.
 #			- Thanks to 'BigDonkey' for his help with LFM (800 MHz) for Sandy Bridge mobility models.
+#			- Thanks to 'rtcl777' on Github issues for the tip about a typo in the iMac12 board-id's.
 #			- Thanks to 'xpamamadeus' for the Clover boot.log tip.
 #			- Thanks to 'rileyfreeman' for the Intel i7-3930K LFM value.
 #			- Thanks to 'Klonkrieger2' aka Mark for the tip about the sed RegEx error in _getCPUtype.
@@ -144,7 +147,7 @@
 #
 # Script version info.
 #
-gScriptVersion=8.6
+gScriptVersion=8.7
 
 #
 # Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
@@ -285,7 +288,7 @@ i7-35355,120,1600,2666,2666,4,4
 i7-3970X,150,1200,3500,4000,6,12
 i7-3960X,130,1200,3300,3900,6,12
 i7-3930K,130,1200,3200,3800,6,12
-i7-3820,130,0,3600,3800,4,8
+i7-3820,130,1200,3600,3800,4,8
 # i7 Desktop series
 i7-2600S,65,1600,2800,3800,4,8
 i7-2600,95,1600,3400,3800,4,8
@@ -379,19 +382,17 @@ i3-2310E,35,800,2100,0,2,4
 
 gServerIvyBridgeCPUList=(
 # E3-1200 Xeon Processor Series
-'E3-1290 v2',87,0,3700,4100,4,8
-'E3-1285 v2',65,0,3600,4000,
-'E3-1285L v2',0,0,3200,3900,
-'E3-1280 v2',69,0,3600,4000,4,8
-'E3-1275 v2',77,0,3500,3900,4,8
-'E3-1270 v2',69,0,3500,3900,4,8
-'E3-1265L v2',45,0,2500,3500,4,8
-'E3-1245 v2',77,0,3400,3800,4,8
-'E3-1240 v2',69,0,3400,3800,4,8
-'E3-1230 v2',69,0,3300,3700,4,8
-'E3-1225 v2',77,0,3200,3600,4,4
-'E3-1220 v2',69,0,3100,3500,4,4
-'E3-1220L v2',17,0,2300,3500,2,4
+'E3-1290 v2',87,1200,3700,4100,4,8
+'E3-1280 v2',69,1200,3600,4000,4,8
+'E3-1275 v2',77,1200,3500,3900,4,8
+'E3-1270 v2',69,1200,3500,3900,4,8
+'E3-1265L v2',45,1200,2500,3500,4,8
+'E3-1245 v2',77,1200,3400,3800,4,8
+'E3-1240 v2',69,1200,3400,3800,4,8
+'E3-1230 v2',69,1200,3300,3700,4,8
+'E3-1225 v2',77,1200,3200,3600,4,4
+'E3-1220 v2',69,1200,3100,3500,4,4
+'E3-1220L v2',17,1200,2300,3500,2,4
 # E5-2600 Xeon Processor Series
 'E5-2687W v2',150,1200,3400,4000,8,16
 'E5-2658 v2 ',95,1200,2400,3000,10,20
@@ -418,6 +419,10 @@ gServerIvyBridgeCPUList=(
 )
 
 gDesktopIvyBridgeCPUList=(
+# Socket 2011 (Premium Power)
+i7-4960K,130,1200,3600,4000,6,12
+i7-4930K,130,1200,3400,3900,6,12
+i7-4820K,130,1200,3700,3900,4,8
 # i7-3700 Desktop Processor Series
 i7-3770T,45,1600,2500,3700,4,8
 i7-3770S,65,1600,3100,3900,4,8
@@ -532,10 +537,6 @@ gServerHaswellCPUList=(
 )
 
 gDesktopHaswellCPUList=(
-# Socket 2011 (Premium Power)
-i7-4960K,130,800,3600,4000,6,12
-i7-4930K,130,800,3400,3900,6,12
-i5-4820K,130,800,3700,3900,4,8
 # Socket 1150 (Standard Power)
 i7-4770K,84,800,3500,3900,4,8
 i7-4771,84,800,3500,3900,4,8
@@ -786,8 +787,14 @@ function _printPackages()
     #
     # Do we need to create additional (Low Frequency) P-States for Ivy bridge?
     #
-    if [ $gBridgeType -eq $IVY_BRIDGE ]; then
-        let minRatio=8
+    if [ $gBridgeType -eq $IVY_BRIDGE ];
+      then
+#       if [[ $gBaseFrequency -eq 1200 ]];
+#         then
+#           let minRatio=12
+#         else
+            let minRatio=8
+#       fi
     fi
 
     if (($turboStates)); then

From 14e3a1a17f2a0251e0715502096a4a5de576bed6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 20 Jan 2014 09:04:31 +0100
Subject: [PATCH 464/623] - fixed a typo so that checking gIvyWorkAround really
 works. - added extra OS checks (as a test) to filter out possibly unwanted
 LFM P-States. - changed gIvyWorkAround to 0 (was 1). - now also inject
 target/running processor models (to help me debug it).

p.s. We might need to change LFM_REQUIRED_OS to 1092 because I don't
know for sure when it change (additional testing required).
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 64 +++++++++++++++++-----------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 8703117..b851831 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 8.7 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 8.8 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -92,6 +92,8 @@
 #			- A couple Intel Haswell/Crystal Well processor models added (Pike, January 2014)
 #			- Moved a couple of Ivy Bridge desktop model processors to the right spot (Pike, January 2014)
 #			- Experimental code added for Gringo Vermelho (Pike, January 2014)
+#			- Fixed a typo so that checking gIvyWorkAround really works (Pike, January 2014)
+#			- Added extra OS checks (as a test) to filter out possibly unwanted LFM P-States (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -106,6 +108,7 @@
 #			- Thanks to 'Klonkrieger2' aka Mark for the tip about the sed RegEx error in _getCPUtype.
 #			- Thanks to 'dhnguyen92' on Github issues for the tip about a typo in the i7-2640M model data.
 #			- Thanks to 'fabiosun' on Github issues for the tip about a typo in the cpu-type check.
+#			- Thanks to 'Hackmodford ' on Github issues for testing/confirming that PM in Mavericks was changed.
 #
 # Usage (v1.0 - v4.9):
 #
@@ -147,12 +150,14 @@
 #
 # Script version info.
 #
-gScriptVersion=8.7
+gScriptVersion=8.8
 
 #
-# Change this to 0 when your CPU isn't stuck in Low Frequency Mode!
+# Change this to 1 when your CPU is stuck in Low Frequency Mode!
 #
-let gIvyWorkAround=1
+# Note: Injects extra Turbo P-State at he top with max-Turbo frequency + 1 MHz.
+#
+let gIvyWorkAround=0
 
 #
 # Asks for your confirmation to copy ssdt_pr.aml to /Extra/ssdt.aml (example)
@@ -181,13 +186,13 @@ let gCallIasl=1
 #
 # A value of 1 will make this script open ssdt_pr.dsl in the editor of your choice.
 #
-let gCallOpen=0
+let gCallOpen=1
 
 # 0 = no debug injection/debug statements executed.
 # 1 = inject debug data.
 # 3 = inject debug data and execute _debugPrint statements.
 #
-let gDebug=1
+let gDebug=0
 
 #
 # Lowest possible idle frequency (user configurable). Also known as Low Frequency Mode.
@@ -242,6 +247,7 @@ let gUnmountEFIPartition=0
 gProductName=$(sw_vers -productName)
 gProductVersion="$(sw_vers -productVersion)"
 gBuildVersion=$(sw_vers -buildVersion)
+let gOSVersion=$(echo $gProductVersion | tr -d '.')
 
 #
 # Maximum Turbo Clock Speed (user configurable)
@@ -256,6 +262,12 @@ let PROCESSOR_LABEL_LENGTH_ERROR=6
 let PROCESSOR_NAMES_ERROR=7
 let PROCESSOR_DECLARATION_ERROR=8
 
+#
+# First OS version number (?) that no longer requires
+# us to inject zeroed out Low Frequency Mode P-States.
+#
+let LFM_REQUIRED_OS=1091
+
 #
 # Processor Number, Max TDP, Low Frequency Mode, Clock Speed, Max Turbo Frequency, Cores, Threads
 #
@@ -654,15 +666,17 @@ function _injectDebugInfo()
     xcpm=0
 
     #
-    # 'machdep.xcpm' is introduced in 10.8.5
+    # Check OS version ('machdep.xcpm' is introduced in 10.8.5)
     #
-    if [[ $gProductVersion > "10.8.4" ]]; then
-      xcpm=$(/usr/sbin/sysctl -n machdep.xcpm.mode)
+    if [[ $gOSVersion > 1084 ]]; then
+        xcpm=$(/usr/sbin/sysctl -n machdep.xcpm.mode)
     fi
 
     echo '        Method (_INI, 0, NotSerialized)'                                      >> $gSsdtPR
     echo '        {'                                                                    >> $gSsdtPR
     echo '            Store ("ssdtPRGen version: '$gScriptVersion' / '$gProductName' '$gProductVersion' ('$gBuildVersion')", Debug)'  >> $gSsdtPR
+    echo '            Store ("target processor : '$gProcessorNumber'", Debug)'          >> $gSsdtPR
+    echo '            Store ("running processor: '$gBrandString'", Debug)'              >> $gSsdtPR
     echo '            Store ("baseFrequency    : '$gBaseFrequency'", Debug)'            >> $gSsdtPR
     echo '            Store ("frequency        : '$frequency'", Debug)'                 >> $gSsdtPR
     echo '            Store ("busFrequency     : '$gBusFrequency'", Debug)'             >> $gSsdtPR
@@ -710,10 +724,17 @@ function _printScopeStart()
     #
     # Do we need to create additional (Low Frequency) P-States?
     #
-
     if [ $gBridgeType -ne $SANDY_BRIDGE ];
         then
-            let lowFrequencyPStates=($gBaseFrequency/100)-8
+            let lowFrequencyPStates=0
+
+            #
+            # Do we need to add additional (Low Frequency) P-States for Ivy Bridge?
+            #
+            if [[ $gBridgeType -eq $IVY_BRIDGE && $gOSVersion < $LFM_REQUIRED_OS ]]; then
+                let lowFrequencyPStates=($gBaseFrequency/100)-8
+            fi
+
             let packageLength=($2+$lowFrequencyPStates)
 
             if [[ lowFrequencyPStates -gt 0 ]];
@@ -725,7 +746,7 @@ function _printScopeStart()
             fi
 
             # TODO: Remove this when CPUPM for IB works properly!
-            if [[ gIvyWorkAround && $gBridgeType -eq $IVY_BRIDGE ]]; then
+            if [[ $gBridgeType -eq $IVY_BRIDGE && $gIvyWorkAround -eq 1 ]]; then
                 let useWorkArounds=1
             fi
     fi
@@ -733,7 +754,6 @@ function _printScopeStart()
     #
     # Check number of Turbo states (for IASL optimization).
     #
-
     if [ $turboStates -eq 0 ];
         then
             # TODO: Remove this when CPUPM for IB works properly!
@@ -785,16 +805,11 @@ function _printPackages()
     let powerRatio=($p1Ratio-1)
 
     #
-    # Do we need to create additional (Low Frequency) P-States for Ivy bridge?
+    # Do we need to add additional (Low Frequency) P-States for Ivy Bridge?
     #
-    if [ $gBridgeType -eq $IVY_BRIDGE ];
+    if [[ $gBridgeType -eq $IVY_BRIDGE && $gOSVersion < $LFM_REQUIRED_OS ]];
       then
-#       if [[ $gBaseFrequency -eq 1200 ]];
-#         then
-#           let minRatio=12
-#         else
-            let minRatio=8
-#       fi
+        let minRatio=8
     fi
 
     if (($turboStates)); then
@@ -1447,11 +1462,11 @@ function _getCPUNumberFromBrandString
     #
     # Get CPU brandstring
     #
-    local brandString=$(echo `sysctl machdep.cpu.brand_string` | sed -e 's/machdep.cpu.brand_string: //')
+    gBrandString=$(echo `sysctl machdep.cpu.brand_string` | sed -e 's/machdep.cpu.brand_string: //')
     #
     # Show brandstring (this helps me to debug stuff).
     #
-    printf "Brandstring '${brandString}'\n"
+    printf "Brandstring '${gBrandString}'\n"
     #
     # Save default (0) delimiter
     #
@@ -1463,7 +1478,7 @@ function _getCPUNumberFromBrandString
     #
     # Split brandstring into array (data)
     #
-    local data=($brandString)
+    local data=($gBrandString)
     #
     # Teststrings
     #
@@ -1981,6 +1996,7 @@ function main()
     let maxTurboFrequency=0
 
     _getCPUNumberFromBrandString
+
     _debugPrint "\ngProcessorNumber: $gProcessorNumber\n"
 
     if [[ "$1" != "" ]]; then

From 411cde2b7adf7dabf486dd4dad0f07730f4d2bfd Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 21 Jan 2014 02:25:00 +0100
Subject: [PATCH 465/623] Preparations for the next update

- white space changes.
- text changes.
- duplicated pref read removed.
---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 162 +++++++++---------
 1 file changed, 81 insertions(+), 81 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 5054d2a..83171cf 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -16,40 +16,40 @@
 void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 {
 	IOLog("AICPUPMI: MSR_CORE_THREAD_COUNT......(0x35)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_CORE_THREAD_COUNT));
-	
+
 	IOLog("AICPUPMI: MSR_PLATFORM_INFO..........(0xCE)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PLATFORM_INFO));
-	
+
 	IOLog("AICPUPMI: MSR_PMG_CST_CONFIG_CONTROL.(0xE2)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_CST_CONFIG_CONTROL));
 	IOLog("AICPUPMI: MSR_PMG_IO_CAPTURE_BASE....(0xE4)  : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PMG_IO_CAPTURE_BASE));
 	IOLog("AICPUPMI: IA32_MPERF.................(0xE7)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MPERF));
 	IOLog("AICPUPMI: IA32_APERF.................(0xE8)  : 0x%llX\n", (unsigned long long)rdmsr64(IA32_APERF));
-	
+
 	IOLog("AICPUPMI: MSR_FLEX_RATIO.............(0x194) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_FLEX_RATIO));
 	IOLog("AICPUPMI: MSR_IA32_PERF_STATUS.......(0x198) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_STATUS));
 	IOLog("AICPUPMI: MSR_IA32_PERF_CONTROL......(0x199) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_IA32_PERF_CONTROL));
 	IOLog("AICPUPMI: IA32_CLOCK_MODULATION......(0x19A) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_CLOCK_MODULATION));
 	IOLog("AICPUPMI: IA32_THERM_STATUS..........(0x19C) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_THERM_STATUS));
-	
+
 	IOLog("AICPUPMI: IA32_MISC_ENABLES..........(0x1A0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_MISC_ENABLES));
 	IOLog("AICPUPMI: MSR_MISC_PWR_MGMT..........(0x1AA) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_MISC_PWR_MGMT));
 	IOLog("AICPUPMI: MSR_TURBO_RATIO_LIMIT......(0x1AD) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_TURBO_RATIO_LIMIT));
-	
+
 	IOLog("AICPUPMI: IA32_ENERGY_PERF_BIAS......(0x1B0) : 0x%llX\n", (unsigned long long)rdmsr64(IA32_ENERGY_PERF_BIAS));
-	
+
 	IOLog("AICPUPMI: MSR_POWER_CTL..............(0x1FC) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_POWER_CTL));
-	
+
 	IOLog("AICPUPMI: MSR_RAPL_POWER_UNIT........(0x606) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_RAPL_POWER_UNIT));
 	IOLog("AICPUPMI: MSR_PKG_POWER_LIMIT........(0x610) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_POWER_LIMIT));
 	IOLog("AICPUPMI: MSR_PKG_ENERGY_STATUS......(0x611) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKG_ENERGY_STATUS));
-	
+
 	IOLog("AICPUPMI: MSR_PKGC3_IRTL.............(0x60a) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC3_IRTL));
 	IOLog("AICPUPMI: MSR_PKGC6_IRTL.............(0x60b) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC6_IRTL));
-	
+
 	if (gCheckC7)
 	{
 		IOLog("AICPUPMI: MSR_PKGC7_IRTL.............(0x60c) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PKGC7_IRTL));
 	}
-	
+
 	IOLog("AICPUPMI: MSR_PP0_CURRENT_CONFIG.....(0x601) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_CURRENT_CONFIG));
 	IOLog("AICPUPMI: MSR_PP0_POWER_LIMIT........(0x638) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_POWER_LIMIT));
 	IOLog("AICPUPMI: MSR_PP0_ENERGY_STATUS......(0x639) : 0x%llX\n", (unsigned long long)rdmsr64(MSR_PP0_ENERGY_STATUS));
@@ -119,17 +119,17 @@ void AppleIntelCPUPowerManagementInfo::reportMSRs(UInt8 aCPUModel)
 inline void getCStates(void *magic)
 {
 	UInt32 logicalCoreNumber = cpu_number();
-	
+
 	if (gCheckC3 && rdmsr64(MSR_CORE_C3_RESIDENCY) > 0)
 	{
 		gC3Cores |= (1 << logicalCoreNumber);
 	}
-	
+
 	if (gCheckC6 && rdmsr64(MSR_CORE_C6_RESIDENCY) > 0)
 	{
 		gC6Cores |= (1 << logicalCoreNumber);
 	}
-	
+
 	if (gCheckC7 && rdmsr64(MSR_CORE_C7_RESIDENCY) > 0)
 	{
 		gC7Cores |= (1 << logicalCoreNumber);
@@ -142,26 +142,26 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 {
 	UInt8 currentMultiplier = (rdmsr64(MSR_IA32_PERF_STS) >> 8);
 	gCoreMultipliers |= (1ULL << currentMultiplier);
-	
+
 #if REPORT_IGPU_P_STATES
 	UInt8 currentIgpuMultiplier = 0;
-	
+
 	if (igpuEnabled)
 	{
 		currentIgpuMultiplier = (UInt8)gMchbar[1];
 		gIGPUMultipliers |= (1ULL << currentIgpuMultiplier);
 	}
 #endif
-	
+
 	timerEventSource->setTimeoutTicks(Interval);
-	
+
 	if (loopLock)
 	{
 		return kIOReturnTimeout;
 	}
-	
+
 	loopLock = true;
-	
+
 #if REPORT_C_STATES
 	if (logCStates)
 	{
@@ -170,10 +170,10 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 		IOSleep(1);
 	}
 #endif
-	
+
 	int currentBit = 0;
 	UInt64 value = 0ULL;
-	
+
 #if REPORT_IGPU_P_STATES
 	if ((gCoreMultipliers != gTriggeredPStates) || (gIGPUMultipliers != gTriggeredIGPUPStates))
 #else
@@ -182,11 +182,11 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 		{
 			gTriggeredPStates = gCoreMultipliers;
 			IOLog("AICPUPMI: CPU P-States [ ");
-			
+
 			for (currentBit = gMinRatio; currentBit <= gMaxRatio; currentBit++)
 			{
 				value = (1ULL << currentBit);
-				
+
 				if ((gTriggeredPStates & value) == value)
 				{
 					if (currentBit == currentMultiplier)
@@ -199,17 +199,17 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 					}
 				}
 			}
-			
+
 #if REPORT_IGPU_P_STATES
 			if (igpuEnabled)
 			{
 				gTriggeredIGPUPStates = gIGPUMultipliers;
 				IOLog("] iGPU P-States [ ");
-				
+
 				for (currentBit = 1; currentBit <= 32; currentBit++)
 				{
 					value = (1ULL << currentBit);
-					
+
 					if ((gTriggeredIGPUPStates & value) == value)
 					{
 						if (currentBit == currentIgpuMultiplier)
@@ -226,65 +226,65 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 #endif
 			IOLog("]\n");
 		}
-	
+
 #if REPORT_C_STATES
 	if (gCheckC3 && (gTriggeredC3Cores != gC3Cores))
 	{
 		gTriggeredC3Cores = gC3Cores;
 		IOLog("AICPUPMI: CPU C3-Cores [ ");
-		
+
 		for (currentBit = 0; currentBit <= 16; currentBit++)
 		{
 			value = (1ULL << currentBit);
-			
+
 			if ((gTriggeredC3Cores & value) == value)
 			{
 				IOLog("%d ", currentBit);
 			}
 		}
-		
+
 		IOLog("]\n");
 	}
-	
+
 	if (gCheckC6 && (gTriggeredC6Cores != gC6Cores))
 	{
 		gTriggeredC6Cores = gC6Cores;
 		IOLog("AICPUPMI: CPU C6-Cores [ ");
-		
+
 		for (currentBit = 0; currentBit <= 16; currentBit++)
 		{
 			value = (1ULL << currentBit);
-			
+
 			if ((gTriggeredC6Cores & value) == value)
 			{
 				IOLog("%d ", currentBit);
 			}
 		}
-		
+
 		IOLog("]\n");
 	}
-	
+
 	if (gCheckC7 && (gTriggeredC7Cores != gC7Cores))
 	{
 		gTriggeredC7Cores = gC7Cores;
 		IOLog("AICPUPMI: CPU C7-Cores [ ");
-		
+
 		for (currentBit = 0; currentBit <= 16; currentBit++)
 		{
 			value = (1ULL << currentBit);
-			
+
 			if ((gTriggeredC7Cores & value) == value)
 			{
 				IOLog("%d ", currentBit);
 			}
 		}
-		
+
 		IOLog("]\n");
 	}
 #endif
-	
+
 	loopLock = false;
-	
+
 	return kIOReturnSuccess;
 }
 
@@ -293,12 +293,12 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 IOService* AppleIntelCPUPowerManagementInfo::probe(IOService *provider, SInt32 *score)
 {
 	IOService *ret = super::probe(provider, score);
-	
+
 	if (ret != this)
 	{
 		return 0;
 	}
-	
+
 	return ret;
 }
 
@@ -309,49 +309,56 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 	if (IOService::start(provider))
 	{
 		simpleLock = IOSimpleLockAlloc();
-		
+
 		if (simpleLock)
 		{
+			IOLog("AICPUPMI: v%s Copyright © 2012-2014 Pike R. Alpha. All rights reserved\n", VERSION);
 #if REPORT_MSRS
 			OSBoolean * key_logMSRs = OSDynamicCast(OSBoolean, getProperty("logMSRs"));
-			
+
 			if (key_logMSRs)
 			{
 				logMSRs = (bool)key_logMSRs->getValue();
 			}
+
+			IOLog("AICPUPMI: logMSRs............................: %d\n", logMSRs);
 #endif
-			
+
 #if REPORT_IGPU_P_STATES
 			OSBoolean * key_logIGPU = OSDynamicCast(OSBoolean, getProperty("logIGPU"));
-			
+
 			if (key_logIGPU)
 			{
 				igpuEnabled = (bool)key_logIGPU->getValue();
 			}
+
+			IOLog("AICPUPMI: logIGPU............................: %d\n", igpuEnabled);
 #endif
-			
+
 #if REPORT_C_STATES
 			OSBoolean * key_logCStates = OSDynamicCast(OSBoolean, getProperty("logCStates"));
-			
+
 			if (key_logCStates)
 			{
 				logCStates = (bool)key_logCStates->getValue();
 			}
+
+			IOLog("AICPUPMI: logCStates.........................: %d\n", logCStates);
 #endif
 
 			timerEventSource = IOTimerEventSource::timerEventSource(this, OSMemberFunctionCast(IOTimerEventSource::Action, this, &AppleIntelCPUPowerManagementInfo::loopTimerEvent));
 			workLoop = getWorkLoop();
-			
+
 			if (timerEventSource && workLoop && (kIOReturnSuccess == workLoop->addEventSource(timerEventSource)))
 			{
 				this->registerService(0);
-				
+
 				UInt64  msr = rdmsr64(MSR_IA32_PERF_STS);
 				gCoreMultipliers |= (1ULL << (msr >> 8));
 
 #if REPORT_IGPU_P_STATES
 				bool isIGPUEnabled = ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK)); // IGPU Enabled and Visible?
-				
+
 				if (!isIGPUEnabled && igpuEnabled)
 				{
 					igpuEnabled = false;
@@ -359,17 +366,10 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 #endif
 				uint32_t cpuid_reg[4];
 				do_cpuid(0x00000001, cpuid_reg);
-				
+
 				UInt8 cpuModel = bitfield32(cpuid_reg[eax], 7,  4) + (bitfield32(cpuid_reg[eax], 19, 16) << 4);
 
 #if REPORT_C_STATES
-				OSBoolean * key_logCStates = OSDynamicCast(OSBoolean, getProperty("logCStates"));
-				
-				if (key_logCStates)
-				{
-					logCStates = (bool)key_logCStates->getValue();
-				}
-
 				switch (cpuModel) // TODO: Verify me!
 				{
 					case CPU_MODEL_SB_CORE:			// 0x2A - Intel 325462.pdf Vol.3C 35-111
@@ -381,7 +381,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 					case CPU_MODEL_HASWELL:			// 0x3C - Intel 325462.pdf Vol.3C 35-136
 					case CPU_MODEL_HASWELL_ULT:		// 0x45 - Intel 325462.pdf Vol.3C 35-136
 					case CPU_MODEL_CRYSTALWELL:		// 0x46
-						
+
 						gCheckC7 = true;
 						break;
 				}
@@ -391,7 +391,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				// MWAIT information
 				do_cpuid(0x00000005, cpuid_reg);
 				uint32_t supportedMwaitCStates = bitfield32(cpuid_reg[edx], 31,  0);
-				
+
 				IOLog("AICPUPMI: MWAIT C-States.....................: %d\n", supportedMwaitCStates);
 
 				if (logMSRs)
@@ -401,45 +401,45 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 #endif
 				msr = rdmsr64(MSR_PLATFORM_INFO);
 				gMinRatio = (UInt8)((msr >> 40) & 0xff);
-				IOLog("AICPUPMI: Low Frequency Mode.................: %d00 MHz\n", gMinRatio);
-				
+				IOLog("AICPUPMI: CPU Low Frequency Mode.............: %d00 MHz\n", gMinRatio);
+
 				gClockRatio = (UInt8)((msr >> 8) & 0xff);
-				IOLog("AICPUPMI: Clock Speed (Max. Non-Turbo Freq.).: %d00 MHz\n", gClockRatio);
-				
+				IOLog("AICPUPMI: CPU Maximum non-Turbo Frequency....: %d00 MHz\n", gClockRatio);
+
 				if (!((rdmsr64(IA32_MISC_ENABLES) >> 32) & 0x40))	// Turbo Mode Enabled?
 				{
 					msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
 					gMaxRatio = (UInt8)(msr & 0xff);
-					IOLog("AICPUPMI: Maximum Turbo Frequency............: %d00 MHz\n", gMaxRatio);
+					IOLog("AICPUPMI: CPU Maximum Turbo Frequency........: %d00 MHz\n", gMaxRatio);
 				}
 				else
 				{
 					gMaxRatio = gClockRatio;
-					IOLog("AICPUPMI: Maximum Frequency..................: %d00 MHz\n", gMaxRatio);
+					IOLog("AICPUPMI: CPU Maximum Frequency..............: %d00 MHz\n", gMaxRatio);
 				}
-				
+
 #if REPORT_IGPU_P_STATES
 				if (igpuEnabled)
 				{
 					IOPhysicalAddress address = (IOPhysicalAddress)(0xFED10000 + 0x5948);
 					memDescriptor = IOMemoryDescriptor::withPhysicalAddress(address, 0x53, kIODirectionInOut);
-					
+
 					if (memDescriptor != NULL)
 					{
 						if ((result = memDescriptor->prepare()) == kIOReturnSuccess)
 						{
 							memoryMap = memDescriptor->map();
-							
+
 							if (memoryMap != NULL)
 							{
 								gMchbar = (UInt8 *)memoryMap->getVirtualAddress();
-								
+
 								// Preventing a stupid (UEFI) BIOS limit.
 								if (gMchbar[0x4C] < gMchbar[0x50])
 								{
 									gMchbar[0x4C] = gMchbar[0x50];
 								}
-								
+
 								//
 								// Examples IGPU multiplier:	17 (multiplier) * 50 (frequency in MHz) =  850 MHz
 								//								22 (multiplier) * 50 (frequency in MHz) = 1100 MHz
@@ -453,7 +453,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 								IOLog("AICPUPMI: IGPU Maximum Non-Turbo Frequency...: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x51])); // RP1_CAP (MAX_NON_TURBO)
 								// Maximum RP0 base frequency capability for the Integrated GFX Engine (GT).
 								IOLog("AICPUPMI: IGPU Maximum Turbo Frequency.......: %4d MHz\n", IGPU_RATIO_TO_FREQUENCY((UInt8)gMchbar[0x50])); // RP0_CAP (MAX_TURBO))
-								
+
 								// Maximum base frequency limit for the Integrated GFX Engine (GT) allowed during run-time.
 								if (gMchbar[0x4C] == 255)
 								{
@@ -481,12 +481,12 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				}
 #endif
 				timerEventSource->setTimeoutMS(1000);
-				
+
 				return true;
 			}
 		}
 	}
-	
+
 	return false;
 }
 
@@ -498,7 +498,7 @@ void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
 	{
 		IOSimpleLockFree(simpleLock);
 	}
-	
+
 	if (timerEventSource)
 	{
 		if (workLoop)
@@ -506,11 +506,11 @@ void AppleIntelCPUPowerManagementInfo::stop(IOService *provider)
 			timerEventSource->cancelTimeout();
 			workLoop->removeEventSource(timerEventSource);
 		}
-		
+
 		timerEventSource->release();
 		timerEventSource = NULL;
 	}
-	
+
 	super::stop(provider);
 }
 
@@ -526,7 +526,7 @@ void AppleIntelCPUPowerManagementInfo::free()
 			memoryMap->release();
 			memoryMap = NULL;
 		}
-		
+
 		if (memDescriptor)
 		{
 			memDescriptor->release();
@@ -534,6 +534,6 @@ void AppleIntelCPUPowerManagementInfo::free()
 		}
 	}
 #endif
-	
+
 	super::free();
-}
\ No newline at end of file
+}

From dcb6fb5174f2b6a3dcf3ddd146b1d5235f40729e Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 21 Jan 2014 02:26:33 +0100
Subject: [PATCH 466/623] Preparations for the next update

- version number added.
---
 .../AppleIntelCPUPowerManagementInfo.h                      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 4c4356a..724d2a0 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -21,9 +21,11 @@
 
 #define super IOService
 
-#define REPORT_MSRS			1
+#define VERSION					"3.1"
+
+#define REPORT_MSRS				1
 #define REPORT_IGPU_P_STATES	1
-#define REPORT_C_STATES		1
+#define REPORT_C_STATES
 
 #define NB_BUS	0x00
 #define NB_DEV	0x00

From a775e933e1c889a16c7c37514175ea66c0aec5c0 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 21 Jan 2014 02:28:47 +0100
Subject: [PATCH 467/623] Preparations for the next update

Fixing a copy/paste error
---
 .../AppleIntelCPUPowerManagementInfo.h                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 724d2a0..3012bce 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -25,7 +25,7 @@
 
 #define REPORT_MSRS				1
 #define REPORT_IGPU_P_STATES	1
-#define REPORT_C_STATES
+#define REPORT_C_STATES			1
 
 #define NB_BUS	0x00
 #define NB_DEV	0x00

From 52d737ba5e73914ba57246b3c4a2cfac0bd30685 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 21 Jan 2014 02:33:49 +0100
Subject: [PATCH 468/623] Different IGPU enabled/visibility check

Note: When you get a KP after this change, then change it back and
report it on Github issues. Thanks!
---
 .../AppleIntelCPUPowerManagementInfo.cpp                 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 83171cf..8cce1fc 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -357,11 +357,12 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				gCoreMultipliers |= (1ULL << (msr >> 8));
 
 #if REPORT_IGPU_P_STATES
-				bool isIGPUEnabled = ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK)); // IGPU Enabled and Visible?
-
-				if (!isIGPUEnabled && igpuEnabled)
+				if (igpuEnabled)
 				{
-					igpuEnabled = false;
+					if ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK) == 0) // Is the IGPU enabled and visible?
+					{
+						igpuEnabled = false;
+					}
 				}
 #endif
 				uint32_t cpuid_reg[4];

From addbe430699f3953ea5dbea70d5c754ed344e211 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 21 Jan 2014 02:51:57 +0100
Subject: [PATCH 469/623] Add Intel Power Gadget style logging

Note: This does not show you the P-States that
AppleIntelCPUPowerManagement.kext/mach_kernel  activates, by writing to
the MSR 0x199, but instead shows you the actual state of the processor!
---
 .../AppleIntelCPUPowerManagementInfo.cpp      | 39 +++++++++++++++++++
 .../AppleIntelCPUPowerManagementInfo.h        |  5 +++
 ...nfo-AppleIntelCPUPowerManagementInfo.plist |  2 +
 3 files changed, 46 insertions(+)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 8cce1fc..698a38b 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -162,6 +162,30 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 
 	loopLock = true;
 
+#if REPORT_IPG_STYLE
+	if (logIPGStyle)
+	{
+		UInt64 mPerf = (rdmsr64(IA32_MPERF));
+		UInt64 aPerf = (rdmsr64(IA32_APERF));
+		wrmsr64(IA32_MPERF, 0ULL);
+		wrmsr64(IA32_APERF, 0ULL);
+		UInt16 busy = ((aPerf * 100) / mPerf);
+		UInt8 pState = (UInt8)(((34 + 0.5) * busy) / 100);
+
+		if (pState != currentMultiplier)
+		{
+			gCoreMultipliers |= (1ULL << pState);
+
+			if ((pState < currentMultiplier) && (pState < 8))
+			{
+				pState = 8;
+			}
+
+			wrmsr64(199, (pState << 8));
+		}
+	}
+#endif
+
 #if REPORT_C_STATES
 	if (logCStates)
 	{
@@ -177,7 +201,11 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 #if REPORT_IGPU_P_STATES
 	if ((gCoreMultipliers != gTriggeredPStates) || (gIGPUMultipliers != gTriggeredIGPUPStates))
 #else
+	#if REPORT_IPG_STYLE
+		if ((gCoreMultipliers != gTriggeredPStates) || (currentMultiplier != pState))
+	#else
 		if (gCoreMultipliers != gTriggeredPStates)
+	#endif
 #endif
 		{
 			gTriggeredPStates = gCoreMultipliers;
@@ -346,6 +374,17 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 			IOLog("AICPUPMI: logCStates.........................: %d\n", logCStates);
 #endif
 
+#if REPORT_IPG_STYLE
+			OSBoolean * key_logIPGStyle = OSDynamicCast(OSBoolean, getProperty("logIPGStyle"));
+			
+			if (key_logIPGStyle)
+			{
+				logIPGStyle = (bool)key_logIPGStyle->getValue();
+			}
+
+			IOLog("AICPUPMI: logIPGStyle........................: %d\n", logIPGStyle);
+#endif
+
 			timerEventSource = IOTimerEventSource::timerEventSource(this, OSMemberFunctionCast(IOTimerEventSource::Action, this, &AppleIntelCPUPowerManagementInfo::loopTimerEvent));
 			workLoop = getWorkLoop();
 
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 3012bce..f6db765 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -26,6 +26,7 @@
 #define REPORT_MSRS				1
 #define REPORT_IGPU_P_STATES	1
 #define REPORT_C_STATES			1
+#define REPORT_IPG_STYLE		1
 
 #define NB_BUS	0x00
 #define NB_DEV	0x00
@@ -116,6 +117,10 @@ class AppleIntelCPUPowerManagementInfo : public IOService
 	bool logCStates		= true;		//  Set <key>logCStates</key> to <false/> in Info.plist to disable this feature.
 #endif
 
+#if REPORT_IPG_STYLE
+	bool logIPGStyle	= true;		//  Set <key>logIPGStyle</key> to <false/> in Info.plist to disable this feature.
+#endif
+
 	UInt16 Interval	= 50;
 	
 	UInt64	gCoreMultipliers		= 0ULL;
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
index ff48fad..f40f1d7 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/Info-AppleIntelCPUPowerManagementInfo.plist
@@ -42,6 +42,8 @@
 			<false/>
 			<key>logCStates</key>
 			<true/>
+			<key>logIPGStyle</key>
+			<true/>
 		</dict>
 	</dict>
 	<key>OSBundleLibraries</key>

From 2c2aa68fe4952bd1af3910e57865e0f2dde6ac56 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 21 Jan 2014 11:18:27 +0100
Subject: [PATCH 470/623] Updating script to v8.9

- Reenable DEBUG data.
- Resetting gIvyWorkAround=1
- Adding a lost Return statement
- gIvyWorkAround now also controls the additional LFM P-States
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh          | 27 +++++++++++--------
 .../AppleIntelCPUPowerManagementInfo.cpp      | 15 ++++++-----
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index b851831..1c4fd48 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 8.8 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 8.9 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -94,6 +94,7 @@
 #			- Experimental code added for Gringo Vermelho (Pike, January 2014)
 #			- Fixed a typo so that checking gIvyWorkAround really works (Pike, January 2014)
 #			- Added extra OS checks (as a test) to filter out possibly unwanted LFM P-States (Pike, January 2014)
+#			- Let gIvyWorkAround control the additional LFM P-States (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -150,14 +151,16 @@
 #
 # Script version info.
 #
-gScriptVersion=8.8
+gScriptVersion=8.9
 
 #
 # Change this to 1 when your CPU is stuck in Low Frequency Mode!
 #
-# Note: Injects extra Turbo P-State at he top with max-Turbo frequency + 1 MHz.
+# 1 - Injects one extra Turbo P-State at he top with max-Turbo frequency + 1 MHz.
+# 2 - Injects N extra Turbo P-State at the bottom.
+# 3 - Injects both of them.
 #
-let gIvyWorkAround=0
+let gIvyWorkAround=2
 
 #
 # Asks for your confirmation to copy ssdt_pr.aml to /Extra/ssdt.aml (example)
@@ -192,7 +195,7 @@ let gCallOpen=1
 # 1 = inject debug data.
 # 3 = inject debug data and execute _debugPrint statements.
 #
-let gDebug=0
+let gDebug=1
 
 #
 # Lowest possible idle frequency (user configurable). Also known as Low Frequency Mode.
@@ -263,8 +266,9 @@ let PROCESSOR_NAMES_ERROR=7
 let PROCESSOR_DECLARATION_ERROR=8
 
 #
-# First OS version number (?) that no longer requires
-# us to inject zeroed out Low Frequency Mode P-States.
+# First OS version number that no longer requires extra Low Frequency Mode P-States.
+#
+# Note: For future use (when we figured out what we need).
 #
 let LFM_REQUIRED_OS=1091
 
@@ -685,6 +689,7 @@ function _injectDebugInfo()
     echo '            Store ("packageLength    : '$packageLength'", Debug)'             >> $gSsdtPR
     echo '            Store ("turboStates      : '$turboStates'", Debug)'               >> $gSsdtPR
     echo '            Store ("maxTurboFrequency: '$maxTurboFrequency'", Debug)'         >> $gSsdtPR
+    echo '            Store ("gIvyWorkAround   : '$gIvyWorkAround'", Debug)'            >> $gSsdtPR
     echo '            Store ("machdep.xcpm.mode: '$xcpm'", Debug)'                      >> $gSsdtPR
     echo '        }'                                                                    >> $gSsdtPR
     echo ''                                                                             >> $gSsdtPR
@@ -731,7 +736,7 @@ function _printScopeStart()
             #
             # Do we need to add additional (Low Frequency) P-States for Ivy Bridge?
             #
-            if [[ $gBridgeType -eq $IVY_BRIDGE && $gOSVersion < $LFM_REQUIRED_OS ]]; then
+            if (( $gBridgeType == $IVY_BRIDGE && $gIvyWorkAround & 2 )); then
                 let lowFrequencyPStates=($gBaseFrequency/100)-8
             fi
 
@@ -746,7 +751,7 @@ function _printScopeStart()
             fi
 
             # TODO: Remove this when CPUPM for IB works properly!
-            if [[ $gBridgeType -eq $IVY_BRIDGE && $gIvyWorkAround -eq 1 ]]; then
+            if (( $gBridgeType == $IVY_BRIDGE && $gIvyWorkAround & 1 )); then
                 let useWorkArounds=1
             fi
     fi
@@ -807,8 +812,7 @@ function _printPackages()
     #
     # Do we need to add additional (Low Frequency) P-States for Ivy Bridge?
     #
-    if [[ $gBridgeType -eq $IVY_BRIDGE && $gOSVersion < $LFM_REQUIRED_OS ]];
-      then
+    if (( $gBridgeType == $IVY_BRIDGE && $gIvyWorkAround & 2 )); then
         let minRatio=8
     fi
 
@@ -1282,6 +1286,7 @@ function _getProcessorScope()
     #
     if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5b830b') ]]; then
         printf 'Processor Declaration(s) Found in DSDT'
+        return
     fi
 
     if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5f50525f') ]];
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 698a38b..d4c159a 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -169,11 +169,12 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 		UInt64 aPerf = (rdmsr64(IA32_APERF));
 		wrmsr64(IA32_MPERF, 0ULL);
 		wrmsr64(IA32_APERF, 0ULL);
-		UInt16 busy = ((aPerf * 100) / mPerf);
-		UInt8 pState = (UInt8)(((34 + 0.5) * busy) / 100);
+//	UInt16 busy = ((aPerf * 100) / mPerf);
+		float busy = ((aPerf * 100) / mPerf);
+		UInt8 pState = (UInt8)(((gClockRatio + 0.5) * busy) / 100);
 
-		if (pState != currentMultiplier)
-		{
+/*		if (pState != currentMultiplier)
+		{ */
 			gCoreMultipliers |= (1ULL << pState);
 
 			if ((pState < currentMultiplier) && (pState < 8))
@@ -182,7 +183,7 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 			}
 
 			wrmsr64(199, (pState << 8));
-		}
+		// }
 	}
 #endif
 
@@ -384,6 +385,8 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 
 			IOLog("AICPUPMI: logIPGStyle........................: %d\n", logIPGStyle);
 #endif
+			UInt64 msr = rdmsr64(MSR_PLATFORM_INFO);
+			gClockRatio = (UInt8)((msr >> 8) & 0xff);
 
 			timerEventSource = IOTimerEventSource::timerEventSource(this, OSMemberFunctionCast(IOTimerEventSource::Action, this, &AppleIntelCPUPowerManagementInfo::loopTimerEvent));
 			workLoop = getWorkLoop();
@@ -392,7 +395,7 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 			{
 				this->registerService(0);
 
-				UInt64  msr = rdmsr64(MSR_IA32_PERF_STS);
+				msr = rdmsr64(MSR_IA32_PERF_STS);
 				gCoreMultipliers |= (1ULL << (msr >> 8));
 
 #if REPORT_IGPU_P_STATES

From 5316b0f21780131e400dc434a0369840ffd96446 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 21 Jan 2014 19:23:19 +0100
Subject: [PATCH 471/623] Updating script to v9.0

- Fixed a typo.
- Changed the default value of gIvyWorkAround back to its original
state.
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 1c4fd48..d115ea1 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 8.9 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 9.0 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -151,16 +151,16 @@
 #
 # Script version info.
 #
-gScriptVersion=8.9
+gScriptVersion=9.0
 
 #
 # Change this to 1 when your CPU is stuck in Low Frequency Mode!
 #
 # 1 - Injects one extra Turbo P-State at he top with max-Turbo frequency + 1 MHz.
-# 2 - Injects N extra Turbo P-State at the bottom.
+# 2 - Injects N extra Turbo P-States at the bottom.
 # 3 - Injects both of them.
 #
-let gIvyWorkAround=2
+let gIvyWorkAround=3
 
 #
 # Asks for your confirmation to copy ssdt_pr.aml to /Extra/ssdt.aml (example)

From cac87e0313f6f37ce7aafe2cfac42526584e3f3d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 26 Jan 2014 16:47:40 +0100
Subject: [PATCH 472/623] Style nit

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index d115ea1..5432eab 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -1285,7 +1285,7 @@ function _getProcessorScope()
     # We run egrep twice here for Snow Leopard compatibility, otherwise it fails.
     #
     if [[ $(ioreg -c AppleACPIPlatformExpert -rd1 -w0 | egrep -o 'DSDT"=<[0-9a-f]+' | egrep -o '5b830b') ]]; then
-        printf 'Processor Declaration(s) Found in DSDT'
+        echo 'Processor Declaration(s) Found in DSDT'
         return
     fi
 

From 9df46a190cdcefa6ac9d11cd2be740bb926ea1b4 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 27 Jan 2014 08:52:50 +0100
Subject: [PATCH 473/623] Update to version 3.2

Trying to resolve a KP
---
 .../AppleIntelCPUPowerManagementInfo.cpp        | 17 ++++++++---------
 .../AppleIntelCPUPowerManagementInfo.h          |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index d4c159a..6902f5f 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -361,6 +361,14 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				igpuEnabled = (bool)key_logIGPU->getValue();
 			}
 
+			if (igpuEnabled)
+			{
+				if ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK) == 0) // Is the IGPU enabled and visible?
+				{
+					igpuEnabled = false;
+				}
+			}
+
 			IOLog("AICPUPMI: logIGPU............................: %d\n", igpuEnabled);
 #endif
 
@@ -398,15 +406,6 @@ bool AppleIntelCPUPowerManagementInfo::start(IOService *provider)
 				msr = rdmsr64(MSR_IA32_PERF_STS);
 				gCoreMultipliers |= (1ULL << (msr >> 8));
 
-#if REPORT_IGPU_P_STATES
-				if (igpuEnabled)
-				{
-					if ((READ_PCI8_NB(DEVEN) & DEVEN_D2EN_MASK) == 0) // Is the IGPU enabled and visible?
-					{
-						igpuEnabled = false;
-					}
-				}
-#endif
 				uint32_t cpuid_reg[4];
 				do_cpuid(0x00000001, cpuid_reg);
 
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index f6db765..895b579 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -21,7 +21,7 @@
 
 #define super IOService
 
-#define VERSION					"3.1"
+#define VERSION					"3.2"
 
 #define REPORT_MSRS				1
 #define REPORT_IGPU_P_STATES	1

From bb81a024c06e06da336d33b0578d921e43471cbc Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 28 Jan 2014 21:20:15 +0100
Subject: [PATCH 474/623] Updating script to v9.1

Fixed a typo in processor data (i7-4960K should be i7-4960X)
---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 5432eab..09cb918 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -3,7 +3,7 @@
 # Script (ssdtPRGen.sh) to create ssdt-pr.dsl for Apple Power Management Support.
 #
 # Version 0.9 - Copyright (c) 2012 by RevoGirl
-# Version 9.0 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
+# Version 9.1 - Copyright (c) 2014 by Pike <PikeRAlpha@yahoo.com>
 #
 # Updates:
 #			- Added support for Ivy Bridge (Pike, January 2013)
@@ -95,6 +95,7 @@
 #			- Fixed a typo so that checking gIvyWorkAround really works (Pike, January 2014)
 #			- Added extra OS checks (as a test) to filter out possibly unwanted LFM P-States (Pike, January 2014)
 #			- Let gIvyWorkAround control the additional LFM P-States (Pike, January 2014)
+#			- Fixed a typo in processor data (i7-4960K should be i7-4960X) (Pike, January 2014)
 #
 # Contributors:
 #			- Thanks to Dave, toleda and Francis for their help (bug fixes and other improvements).
@@ -151,7 +152,7 @@
 #
 # Script version info.
 #
-gScriptVersion=9.0
+gScriptVersion=9.1
 
 #
 # Change this to 1 when your CPU is stuck in Low Frequency Mode!
@@ -436,7 +437,7 @@ gServerIvyBridgeCPUList=(
 
 gDesktopIvyBridgeCPUList=(
 # Socket 2011 (Premium Power)
-i7-4960K,130,1200,3600,4000,6,12
+i7-4960X,130,1200,3600,4000,6,12
 i7-4930K,130,1200,3400,3900,6,12
 i7-4820K,130,1200,3700,3900,4,8
 # i7-3700 Desktop Processor Series

From 1d13da4e5b8f4b10b896a7d0b43aac52ee7f097b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 28 Jan 2014 21:27:47 +0100
Subject: [PATCH 475/623] Updating to v3.3

Removed another KP trigger.
---
 .../AppleIntelCPUPowerManagementInfo.cpp                   | 7 +++++--
 .../AppleIntelCPUPowerManagementInfo.h                     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
index 6902f5f..41ae48a 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.cpp
@@ -181,8 +181,11 @@ IOReturn AppleIntelCPUPowerManagementInfo::loopTimerEvent(void)
 			{
 				pState = 8;
 			}
-
-			wrmsr64(199, (pState << 8));
+			/*
+			 * Commented out after fabio67 (fabiosun) confirmed that
+			 * the wrmsr() below triggered a KP on his configuration
+			 * wrmsr64(199, (pState << 8));
+			 */
 		// }
 	}
 #endif
diff --git a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
index 895b579..d3d35d4 100644
--- a/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
+++ b/i386/libsaio/cpu/tools/PMinfo/AppleIntelCPUPowerManagementInfo/AppleIntelCPUPowerManagementInfo.h
@@ -21,7 +21,7 @@
 
 #define super IOService
 
-#define VERSION					"3.2"
+#define VERSION					"3.3"
 
 #define REPORT_MSRS				1
 #define REPORT_IGPU_P_STATES	1

From fc43ab134fde8f72a9fa599b7265b7a7b8fde6c0 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 2 Feb 2014 22:51:48 +0100
Subject: [PATCH 476/623] Link to Github issues added for new bug reports

---
 i386/libsaio/acpi/Tools/ssdtPRGen.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/i386/libsaio/acpi/Tools/ssdtPRGen.sh b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
index 09cb918..7ca0a48 100755
--- a/i386/libsaio/acpi/Tools/ssdtPRGen.sh
+++ b/i386/libsaio/acpi/Tools/ssdtPRGen.sh
@@ -112,6 +112,11 @@
 #			- Thanks to 'fabiosun' on Github issues for the tip about a typo in the cpu-type check.
 #			- Thanks to 'Hackmodford ' on Github issues for testing/confirming that PM in Mavericks was changed.
 #
+# Bugs:
+#			- Bug reports can be filed at https://github.com/Piker-Alpha/RevoBoot/issues
+#			  Please provide clear steps to reproduce the bug, the output of the
+#			  script and the resulting SSDT.dsl Thank you!
+#
 # Usage (v1.0 - v4.9):
 #
 #           - ./ssdtPRGen.sh [max turbo frequency] [TDP] [CPU type]

From d7eb02f1532c07b3aa5b15fca17ae3d2d2ce2f2d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 12 Oct 2014 16:47:43 +0200
Subject: [PATCH 477/623] Yosemite specific bits and pieces

---
 i386/boot2/lzvn.c  | 556 +++++++++++++++++++++++++++++++++++++++++++++
 i386/libsaio/asm.s |  45 +++-
 i386/libsaio/efi.c | 149 +++++++++---
 3 files changed, 716 insertions(+), 34 deletions(-)
 create mode 100644 i386/boot2/lzvn.c

diff --git a/i386/boot2/lzvn.c b/i386/boot2/lzvn.c
new file mode 100644
index 0000000..f9b3e14
--- /dev/null
+++ b/i386/boot2/lzvn.c
@@ -0,0 +1,556 @@
+/*
+ * Copyright (c) 2014 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * Portions Copyright (c) 2003 Apple Computer, Inc.  All Rights
+ * Reserved.  This file contains Original Code and/or Modifications of
+ * Original Code as defined in and that are subject to the Apple Public
+ * Source License Version 2.0 (the "License").  You may not use this file
+ * except in compliance with the License.  Please obtain a copy of the
+ * License at http://www.apple.com/publicsource and read it before using
+ * this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ *
+ * The lzvn_decode function was first located and disassembled by Pike R.
+ * Alpha and later converted to flat C code by someone using the handle
+ * 'MinusZwei' over at insanelymac.com. This after Andy Vandijcke published
+ * a working version at the for mentioned website.
+ *
+ * Thanks to Andy Vandijcke and 'MinusZwei' for their work, but I (Pike
+ * R. Alpha) will not claim ownership of this work, other than the work
+ * that I have done, for educational purpose, to improve the readability
+ * so that it is understandable for everyone.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include <libkern/OSByteOrder.h>
+
+#define DEBUG_STATE_ENABLED			0
+
+
+#if DEBUG_STATE_ENABLED
+  #define _LZVN_DEBUG_DUMP(x...)	printf(x)
+#else
+  #define _LZVN_DEBUG_DUMP(x...)
+#endif
+
+#define LZVN_0		0
+#define LZVN_1		1
+#define LZVN_2		2
+#define LZVN_3		3
+#define LZVN_4		4
+#define LZVN_5		5
+#define LZVN_6		6
+#define LZVN_7		7
+#define LZVN_8		8
+#define LZVN_9		9
+#define LZVN_10		10
+#define LZVN_11		11
+
+#define CASE_TABLE	127
+
+//==============================================================================
+
+size_t lzvn_decode(void * decompressedData, size_t decompressedSize, void * compressedData, size_t compressedSize)
+{
+	const uint64_t decompBuffer = (const uint64_t)decompressedData;
+
+	size_t	length	= 0;															// xor	%rax,%rax
+
+	uint64_t compBuffer	= (uint64_t)compressedData;
+
+	uint64_t compBufferPointer	= 0;												// use p(ointer)?
+	uint64_t caseTableIndex	= 0;
+	uint64_t r10			= 0;
+	uint64_t currentLength	= 0;													// xor	%r12,%r12
+	uint64_t r12			= 0;
+
+	uint64_t address		= 0;													// ((uint64_t)compBuffer + compBufferPointer)
+	unsigned char byte_data	= 0;
+
+	uint8_t jmpTo			= CASE_TABLE;
+
+	/*
+	 * This jump table was developed by someone using the handle 'MnusZwei'
+	 * over at insanelymac.com
+	 */
+	static short caseTable[ 256 ] =
+	{
+		1,  1,  1,  1,    1,  1,  2,  3,    1,  1,  1,  1,    1,  1,  4,  3,
+		1,  1,  1,  1,    1,  1,  4,  3,    1,  1,  1,  1,    1,  1,  5,  3,
+		1,  1,  1,  1,    1,  1,  5,  3,    1,  1,  1,  1,    1,  1,  5,  3,
+		1,  1,  1,  1,    1,  1,  5,  3,    1,  1,  1,  1,    1,  1,  5,  3,
+		1,  1,  1,  1,    1,  1,  0,  3,    1,  1,  1,  1,    1,  1,  0,  3,
+		1,  1,  1,  1,    1,  1,  0,  3,    1,  1,  1,  1,    1,  1,  0,  3,
+		1,  1,  1,  1,    1,  1,  0,  3,    1,  1,  1,  1,    1,  1,  0,  3,
+		5,  5,  5,  5,    5,  5,  5,  5,    5,  5,  5,  5,    5,  5,  5,  5,
+		1,  1,  1,  1,    1,  1,  0,  3,    1,  1,  1,  1,    1,  1,  0,  3,
+		1,  1,  1,  1,    1,  1,  0,  3,    1,  1,  1,  1,    1,  1,  0,  3,
+		6,  6,  6,  6,    6,  6,  6,  6,    6,  6,  6,  6,    6,  6,  6,  6,
+		6,  6,  6,  6,    6,  6,  6,  6,    6,  6,  6,  6,    6,  6,  6,  6,
+		1,  1,  1,  1,    1,  1,  0,  3,    1,  1,  1,  1,    1,  1,  0,  3,
+		5,  5,  5,  5,    5,  5,  5,  5,    5,  5,  5,  5,    5,  5,  5,  5,
+		7,  8,  8,  8,    8,  8,  8,  8,    8,  8,  8,  8,    8,  8,  8,  8,
+		9, 10, 10, 10,   10, 10, 10, 10,   10, 10, 10, 10,   10, 10, 10, 10
+	};
+
+	decompressedSize -= 8;															// sub	$0x8,%rsi
+
+	if (decompressedSize < 8)														// jb	Llzvn_exit
+	{
+		return 0;
+	}
+
+	compressedSize = (compBuffer + compressedSize - 8);								// lea	-0x8(%rdx,%rcx,1),%rcx
+
+	if (compBuffer > compressedSize)												// cmp	%rcx,%rdx
+	{
+		return 0;																	// ja	Llzvn_exit
+	}
+
+	compBufferPointer = *(uint64_t *)compBuffer;									// mov	(%rdx),%r8
+	caseTableIndex = (compBufferPointer & 255);										// movzbq	(%rdx),%r9
+
+	do																				// jmpq	*(%rbx,%r9,8)
+	{
+		switch (jmpTo)																// our jump table
+		{
+			case CASE_TABLE: /******************************************************/
+
+				switch (caseTable[(uint8_t)caseTableIndex])
+				{
+					case 0: _LZVN_DEBUG_DUMP("caseTable[0]\n");
+
+							caseTableIndex >>= 6;									// shr	$0x6,%r9
+							compBuffer = (compBuffer + caseTableIndex + 1);			// lea	0x1(%rdx,%r9,1),%rdx
+						
+							if (compBuffer > compressedSize)						// cmp	%rcx,%rdx
+							{
+								return 0;											// ja	Llzvn_exit
+							}
+						
+							r10 = 56;												// mov	$0x38,%r10
+							r10 &= compBufferPointer;								// and	%r8,%r10
+							compBufferPointer >>= 8;								// shr	$0x8,%r8
+							r10 >>= 3;												// shr	$0x3,%r10
+							r10 += 3;												// add	$0x3,%r10
+						
+							jmpTo = LZVN_10;										// jmp	Llzvn_l10
+							break;
+						
+					case 1:	_LZVN_DEBUG_DUMP("caseTable[1]\n");
+
+							caseTableIndex >>= 6;									// shr	$0x6,%r9
+							compBuffer = (compBuffer + caseTableIndex + 2);			// lea	0x2(%rdx,%r9,1),%rdx
+
+							if (compBuffer > compressedSize)						// cmp	%rcx,%rdx
+							{
+								return 0;											// ja	Llzvn_exit
+							}
+						
+							r12 = compBufferPointer;								// mov	%r8,%r12
+							r12 = OSSwapInt64(r12);									// bswap	%r12
+							r10 = r12;												// mov	%r12,%r10
+							r12 <<= 5;												// shl	$0x5,%r12
+							r10 <<= 2;												// shl	$0x2,%r10
+							r12 >>= 53;												// shr	$0x35,%r12
+							r10 >>= 61;												// shr	$0x3d,%r10
+							compBufferPointer >>= 16;								// shr	$0x10,%r8
+							r10 += 3;												// add	$0x3,%r10
+
+							jmpTo = LZVN_10;										// jmp	Llzvn_l10
+							break;
+
+					case 2: _LZVN_DEBUG_DUMP("caseTable[2]\n");
+
+							return length;
+			
+					case 3: _LZVN_DEBUG_DUMP("caseTable[3]\n");
+
+							caseTableIndex >>= 6;									// shr	$0x6,%r9
+							compBuffer = (compBuffer + caseTableIndex + 3);			// lea	0x3(%rdx,%r9,1),%rdx
+
+							if (compBuffer > compressedSize)						// cmp	%rcx,%rdx
+							{
+								return 0;											// ja	Llzvn_exit
+							}
+						
+							r10 = 56;												// mov	$0x38,%r10
+							r12 = 65535;											// mov	$0xffff,%r12
+							r10 &= compBufferPointer;								// and	%r8,%r10
+							compBufferPointer >>= 8;								// shr	$0x8,%r8
+							r10 >>= 3;												// shr	$0x3,%r10
+							r12 &= compBufferPointer;								// and	%r8,%r12
+							compBufferPointer >>= 16;								// shr	$0x10,%r8
+							r10 += 3;												// add	$0x3,%r10
+						
+							jmpTo = LZVN_10;										// jmp	Llzvn_l10
+							break;
+						
+					case 4:	_LZVN_DEBUG_DUMP("caseTable[4]\n");
+
+							compBuffer += 1;										// add	$0x1,%rdx
+
+							if (compBuffer > compressedSize)						// cmp	%rcx,%rdx
+							{
+								return 0;											// ja	Llzvn_exit
+							}
+						
+							compBufferPointer = *(uint64_t *)compBuffer;			// mov	(%rdx),%r8
+							caseTableIndex = (compBufferPointer & 255);				// movzbq (%rdx),%r9
+						
+							jmpTo = CASE_TABLE;										// continue;
+							break;													// jmpq	*(%rbx,%r9,8)
+
+					case 5: _LZVN_DEBUG_DUMP("caseTable[5]\n");
+
+							return 0;												// Llzvn_table5;
+					
+					case 6: _LZVN_DEBUG_DUMP("caseTable[6]\n");
+
+							caseTableIndex >>= 3;									// shr	$0x3,%r9
+							caseTableIndex &= 3;									// and	$0x3,%r9
+							compBuffer = (compBuffer + caseTableIndex + 3);			// lea	0x3(%rdx,%r9,1),%rdx
+
+							if (compBuffer > compressedSize)						// cmp	%rcx,%rdx
+							{
+								return 0;											// ja	Llzvn_exit
+							}
+						
+							r10 = compBufferPointer;								// mov	%r8,%r10
+							r10 &= 775;												// and	$0x307,%r10
+							compBufferPointer >>= 10;								// shr	$0xa,%r8
+							r12 = (r10 & 255);										// movzbq %r10b,%r12
+							r10 >>= 8;												// shr	$0x8,%r10
+							r12 <<= 2;												// shl	$0x2,%r12
+							r10 |= r12;												// or	%r12,%r10
+							r12 = 16383;											// mov	$0x3fff,%r12
+							r10 += 3;												// add	$0x3,%r10
+							r12 &= compBufferPointer;								// and	%r8,%r12
+							compBufferPointer >>= 14;								// shr	$0xe,%r8
+
+							jmpTo = LZVN_10;										// jmp	Llzvn_l10
+							break;
+						
+					case 7:	_LZVN_DEBUG_DUMP("caseTable[7]\n");
+
+							compBufferPointer >>= 8;								// shr	$0x8,%r8
+							compBufferPointer &= 255;								// and	$0xff,%r8
+							compBufferPointer += 16;								// add	$0x10,%r8
+							compBuffer = (compBuffer + compBufferPointer + 2);		// lea	0x2(%rdx,%r8,1),%rdx
+
+							jmpTo = LZVN_0;											// jmp	Llzvn_l0
+							break;
+						
+					case 8: _LZVN_DEBUG_DUMP("caseTable[8]\n");
+
+							compBufferPointer &= 15;								// and	$0xf,%r8
+							compBuffer = (compBuffer + compBufferPointer + 1);		// lea	0x1(%rdx,%r8,1),%rdx
+						
+							jmpTo = LZVN_0;											// jmp	Llzvn_l0
+							break;
+					
+					case 9:	_LZVN_DEBUG_DUMP("caseTable[9]\n");
+
+							compBuffer += 2;										// add	$0x2,%rdx
+					
+							if (compBuffer > compressedSize)						// cmp	%rcx,%rdx
+							{
+								return 0;											// ja	Llzvn_exit
+							}
+
+							r10 = compBufferPointer;								// mov	%r8,%r10
+							r10 >>= 8;												// shr	$0x8,%r10
+							r10 &= 255;												// and	$0xff,%r10
+							r10 += 16;												// add	$0x10,%r10
+
+							jmpTo = LZVN_11;										// jmp	Llzvn_l11
+							break;
+
+					case 10:_LZVN_DEBUG_DUMP("caseTable[10]\n");
+
+							compBuffer += 1;										// add	$0x1,%rdx
+							
+							if (compBuffer > compressedSize)						// cmp	%rcx,%rdx
+							{
+								return 0;											// ja	Llzvn_exit
+							}
+						
+							r10 = compBufferPointer;								// mov	%r8,%r10
+							r10 &= 15;												// and	$0xf,%r10
+						
+							jmpTo = LZVN_11;										// jmp	Llzvn_l11
+							break;
+#if DEBUG_STATE_ENABLED
+					default:printf("default() caseTableIndex[%d]\n", (uint8_t)caseTableIndex);
+#endif
+				}																	// switch (caseTable[caseTableIndex])
+
+				break;
+
+			case LZVN_0: /**********************************************************/
+
+				_LZVN_DEBUG_DUMP("jmpTable(0)\n");
+
+				if (compBuffer > compressedSize)									// cmp	%rcx,%rdx
+				{
+					return 0;														// ja	Llzvn_exit
+				}
+				
+				currentLength = (length + compBufferPointer);						// lea	(%rax,%r8,1),%r11
+				compBufferPointer = -compBufferPointer;								// neg	%r8
+				
+				if (currentLength > decompressedSize)								// cmp	%rsi,%r11
+				{
+					jmpTo = LZVN_2;													// ja	Llzvn_l2
+					break;
+				}
+
+				currentLength = (decompBuffer + currentLength);						// lea	(%rdi,%r11,1),%r11
+
+			case LZVN_1: /**********************************************************/
+
+				do																	// Llzvn_l1:
+				{
+					_LZVN_DEBUG_DUMP("jmpTable(1)\n");
+
+//					address = (compBuffer + compBufferPointer);						// mov	(%rdx,%r8,1),%r9
+//					caseTableIndex = *(uint64_t *)address;
+					caseTableIndex = *(uint64_t *)((uint64_t)compBuffer + compBufferPointer);
+
+//					address = (currentLength + compBufferPointer);					// mov	%r9,(%r11,%r8,1)
+//					*(uint64_t *)address = caseTableIndex;
+					*(uint64_t *)((uint64_t)currentLength + compBufferPointer) = caseTableIndex;
+
+					compBufferPointer += 8;											// add	$0x8,%r8
+
+				} while ((UINT64_MAX - (compBufferPointer - 8)) >= 8);				// jae	Llzvn_l1
+
+				length = currentLength;												// mov	%r11,%rax
+				length -= decompBuffer;												// sub	%rdi,%rax
+				
+				compBufferPointer = *(uint64_t *)compBuffer;						// mov	(%rdx),%r8
+				caseTableIndex = (compBufferPointer & 255);							// movzbq (%rdx),%r9
+
+				jmpTo = CASE_TABLE;
+				break;																// jmpq	*(%rbx,%r9,8)
+
+			case LZVN_2: /**********************************************************/
+
+				_LZVN_DEBUG_DUMP("jmpTable(2)\n");
+
+				currentLength = (decompressedSize + 8);								// lea	0x8(%rsi),%r11
+
+			case LZVN_3: /***********************************************************/
+
+				do																	// Llzvn_l3:
+				{
+					_LZVN_DEBUG_DUMP("jmpTable(3)\n");
+
+					address = (compBuffer + compBufferPointer);						// movzbq (%rdx,%r8,1),%r9
+					caseTableIndex = *((uint64_t *)address);
+					caseTableIndex &= 255;
+					
+					address = (decompBuffer + length);								// mov	%r9b,(%rdi,%rax,1)
+					byte_data = (unsigned char)caseTableIndex;
+					memcpy((void *)address, &byte_data, sizeof(byte_data));
+					
+					length += 1;													// add	$0x1,%rax
+					
+					if (currentLength == length)									// cmp	%rax,%r11
+					{
+						return length;												// je	Llzvn_exit2
+					}
+					
+					compBufferPointer += 1;											// add	$0x1,%r8
+					
+				} while ((int64_t)compBufferPointer != 0);							// jne	Llzvn_l3
+				
+				compBufferPointer = *(uint64_t *)compBuffer;						// mov	(%rdx),%r8
+				caseTableIndex = (compBufferPointer & 255);							// movzbq	(%rdx),%r9
+
+				jmpTo = CASE_TABLE;
+				break;																// jmpq	*(%rbx,%r9,8)
+
+			case LZVN_4: /**********************************************************/
+
+				_LZVN_DEBUG_DUMP("jmpTable(4)\n");
+
+				currentLength = (decompressedSize + 8);								// lea	0x8(%rsi),%r11
+
+			case LZVN_9: /**********************************************************/
+
+				do																	// Llzvn_l9:
+				{
+					_LZVN_DEBUG_DUMP("jmpTable(9)\n");
+
+					address = (decompBuffer + compBufferPointer);					// movzbq (%rdi,%r8,1),%r9
+					byte_data = *((unsigned char *)address);
+					caseTableIndex = byte_data;
+					caseTableIndex &= 255;
+					compBufferPointer += 1;											// add	$0x1,%r8
+					
+					address = (decompBuffer + length);								// mov	%r9,(%rdi,%rax,1)
+					byte_data = (unsigned char)caseTableIndex;
+					memcpy((void *)address, &byte_data, sizeof(byte_data));
+					
+					length += 1;													// add	$0x1,%rax
+					
+					if (length == currentLength)									// cmp	%rax,%r11
+					{
+						return length;												// je	Llzvn_exit2
+					}
+
+					r10 -= 1;														// sub	$0x1,%r10
+					
+				} while (r10);														// jne	Llzvn_l9
+				
+				compBufferPointer = *(uint64_t *)compBuffer;						// mov	(%rdx),%r8
+				caseTableIndex = (compBufferPointer & 255);							// movzbq	(%rdx),%r9
+
+				jmpTo = CASE_TABLE;
+				break;																// jmpq	*(%rbx,%r9,8)
+
+			case LZVN_5: /**********************************************************/
+
+				do
+				{
+					_LZVN_DEBUG_DUMP("jmpTable(5)\n");
+
+					address = (decompBuffer + compBufferPointer);					// mov	(%rdi,%r8,1),%r9
+					caseTableIndex = *((uint64_t *)address);
+					compBufferPointer += 8;											// add	$0x8,%r8
+					
+					address = (decompBuffer + length);								// mov	%r9,(%rdi,%rax,1)
+					memcpy((void *)address, &caseTableIndex, sizeof(caseTableIndex));
+					
+					length += 8;													// add	$0x8,%rax
+					r10 -= 8;														// sub	$0x8,%r10
+					
+				} while ((r10 + 8) > 8);											// ja	Llzvn_l5
+
+				length += r10;														// add	%r10,%rax
+				compBufferPointer = *(uint64_t *)compBuffer;						// mov	(%rdx),%r8
+				caseTableIndex = (compBufferPointer & 255);							// movzbq	(%rdx),%r9
+
+				jmpTo = CASE_TABLE;
+				break;																// jmpq	*(%rbx,%r9,8)
+
+			case LZVN_10: /*********************************************************/
+
+				_LZVN_DEBUG_DUMP("jmpTable(10)\n");
+
+				currentLength = (length + caseTableIndex);							// lea	(%rax,%r9,1),%r11
+				currentLength += r10;												// add	%r10,%r11
+
+				if (currentLength < decompressedSize)								// cmp	%rsi,%r11 (block_end: jae	Llzvn_l8)
+				{
+					address = decompBuffer + length;								// mov	%r8,(%rdi,%rax,1)
+					memcpy((void *)address, &compBufferPointer, sizeof(compBufferPointer));
+						
+					length += caseTableIndex;										// add	%r9,%rax
+					compBufferPointer = length;										// mov	%rax,%r8
+						
+					if (compBufferPointer < r12)									// jb	Llzvn_exit
+					{
+						return 0;
+					}
+
+					compBufferPointer -= r12;										// sub	%r12,%r8
+
+					if (r12 < 8)													// cmp	$0x8,%r12
+					{
+						jmpTo = LZVN_4;												// jb	Llzvn_l4
+						break;
+					}
+
+					jmpTo = LZVN_5;													// jmpq	*(%rbx,%r9,8)
+					break;
+				}
+
+			case LZVN_8: /**********************************************************/
+
+				_LZVN_DEBUG_DUMP("jmpTable(8)\n");
+
+				if (caseTableIndex == 0)											// test	%r9,%r9
+				{
+					jmpTo = LZVN_7;													// jmpq	*(%rbx,%r9,8)
+					break;
+				}
+
+				currentLength = (decompressedSize + 8);								// lea	0x8(%rsi),%r11
+
+			case LZVN_6: /**********************************************************/
+
+				do
+				{
+					_LZVN_DEBUG_DUMP("jmpTable(6)\n");
+
+					address = (decompBuffer + length);								// mov	%r8b,(%rdi,%rax,1)
+					byte_data = (unsigned char)(compBufferPointer & 255);
+					memcpy((void *)address, &byte_data, sizeof(byte_data));
+					length += 1;													// add	$0x1,%rax
+						
+					if (length == currentLength)									// cmp	%rax,%r11
+					{
+						return length;												// je	Llzvn_exit2
+					}
+						
+					compBufferPointer >>= 8;										// shr	$0x8,%r8
+					caseTableIndex -= 1;											// sub	$0x1,%r9
+						
+				} while (caseTableIndex != 1);										// jne	Llzvn_l6
+
+			case LZVN_7: /**********************************************************/
+
+				_LZVN_DEBUG_DUMP("jmpTable(7)\n");
+
+				compBufferPointer = length;											// mov	%rax,%r8
+				compBufferPointer -= r12;											// sub	%r12,%r8
+
+				if (compBufferPointer < r12)										// jb	Llzvn_exit
+				{
+					return 0;
+				}
+
+				jmpTo = LZVN_4;
+				break;																// jmpq	*(%rbx,%r9,8)
+	
+			case LZVN_11: /*********************************************************/
+
+				_LZVN_DEBUG_DUMP("jmpTable(11)\n");
+
+				compBufferPointer = length;											// mov	%rax,%r8
+				compBufferPointer -= r12;											// sub	%r12,%r8
+				currentLength = (length + r10);										// lea	(%rax,%r10,1),%r11
+				
+				if (currentLength < decompressedSize)								// cmp	%rsi,%r11
+				{
+					if (r12 >= 8)													// cmp	$0x8,%r12
+					{
+						jmpTo = LZVN_5;												// jae	Llzvn_l5
+						break;
+					}
+				}
+				
+				jmpTo = LZVN_4;														// jmp	Llzvn_l4
+				break;
+		}																			// switch (jmpq)
+
+	} while (1);
+
+	return 0;
+}
diff --git a/i386/libsaio/asm.s b/i386/libsaio/asm.s
index a6312cf..e8c312b 100755
--- a/i386/libsaio/asm.s
+++ b/i386/libsaio/asm.s
@@ -334,24 +334,27 @@ LABEL(_halt)
     call    _bgetc
     jmp     _halt
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks, Mountain Lion and Lion
+#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks, Mountain Lion and Lion
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // disableIRQs()
 //
-// Port of a two liner hack in xnu/pexpert/i386/pe_init.c -> PE_init_platform()
+// Port of a two liner hack in xnu-1504.15.3/pexpert/i386/pe_init.c -> PE_init_platform()
 //
-// Note: Thanks to cparm for locating it and copying it to Chameleons' boot.c
+// Note: Thanks to 'cparm' for locating it and copying it to Chameleons' boot.c
 //
 LABEL(_disableIRQs)
 	// The ACPI specification dictates that the 8259 (PC-AT compatible) vectors 
 	// must be disabled (that is, masked) when enabling the ACPI APIC operation 
 	// but this isn't done (apparently) on all mobo's and thus we do that here.
+	//
+	// Vectors 0-7 are used in 16-bit real mode, vectors 0-31 in protected mode/
+	// long mode (vectors 32-255 are available for software defined interrupts).
 
 	push	%eax			// Saving register data
 
 	movb	$0xff, %al		// Load mask
-	outb	%al, $0x21		// Disable IRQ's 0-7 on Master PIC
-	outb	%al, $0xa1		// Disable IRQ's 8-15 on Slave PIC
+	outb	%al, $0x21		// Disable IRQ's 0-7 on Master PIC (0x21)
+	outb	%al, $0xa1		// Disable IRQ's 8-15 on Slave PIC (0xa1)
 
 	popl	%eax			// Restore register data
 
@@ -365,13 +368,13 @@ LABEL(_disableIRQs)
 // Passes boot arguments in %eax.
 //
 LABEL(_startMachKernel)
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks, Mountain Lion and Lion
-	call    _disableIRQs	// Taking care of a ACPI bug.
+#if ((MAKE_TARGET_OS & LION) == LION)	// Yosemite, Mavericks, Lion and Mountain Lion
+	call    _disableIRQs				// Taking care of an early reboot bug.
 #endif
 	push    %ebp
     mov     %esp, %ebp
 
-    mov     0xc(%ebp), %eax  // bootargs to mach_kernel
+    mov     0xc(%ebp), %eax  // bootargs to (mach_)kernel
     mov     0x8(%ebp), %ecx  // entry offset 
     mov     $0x28, %ebx      // segment
     push    %ebx
@@ -424,3 +427,29 @@ LABEL(__switch_stack)
     xorl    %edi, %edi
 
     ret
+
+#if (MAKE_TARGET_OS == YOSEMITE)
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+// computeRand()
+//
+
+LABEL(_computeRand)
+	pushl	%edx
+	mov		$0xa,	%edx
+
+Repeat:
+	rdrand	%eax
+	jae		Ok
+	jmp		Exit
+
+Ok:
+	dec		%edx
+	pause
+	jne		Repeat
+	mov		$0x0,	%eax
+
+Exit:
+	popl	%edx
+
+	ret
+#endif
diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 32f873e..500256c 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -28,19 +28,29 @@
  *
  * Updates:
  *
- *			- STATIC_MODEL_NAME moved over from settings.h (PikerAlpha, October 2012).
- *			- STATIC_MODEL_NAME renamed to EFI_MODEL_NAME (PikerAlpha, October 2012).
- *			- Now no longer includes platform.h (PikerAlpha, October 2012).
- *			- Data selector moved over from RevoBoot/i386/config/data.h (PikerAlpha, October 2012).
- *			- Get static EFI data (optional) from /Extra/EFI/[MacModelNN].bin (PikerAlpha, October 2012).
- *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
- *			- Check return of malloc call (PikerAlpha, November 2012).
- *			- Sam's workaround for iMessage breakage added (PikerAlpha, January 2013).
+ *			- STATIC_MODEL_NAME moved over from settings.h (Pike R. Alpha, October 2012).
+ *			- STATIC_MODEL_NAME renamed to EFI_MODEL_NAME (Pike R. Alpha, October 2012).
+ *			- Now no longer includes platform.h (Pike R. Alpha, October 2012).
+ *			- Data selector moved over from RevoBoot/i386/config/data.h (Pike R. Alpha, October 2012).
+ *			- Get static EFI data (optional) from /Extra/EFI/[MacModelNN].bin (Pike R. Alpha, October 2012).
+ *			- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (Pike R. Alpha, October 2012).
+ *			- Check return of malloc call (Pike R. Alpha, November 2012).
+ *			- Sam's workaround for iMessage breakage added (Pike R. Alpha, January 2013).
  *
  */
 
 #include "efi/fake_efi.h"
 
+//==============================================================================
+
+EFI_UINT32 getCPUTick(void)
+{
+	uint32_t value = 0;
+
+	__asm__ volatile("rdtsc" : "=A" (value));
+
+	return value;
+}
 
 //==============================================================================
 // Called from RevoBoot/i386/libsaio/platform.c
@@ -94,8 +104,27 @@ void initEFITree(void)
 
 	// Satisfying X86PlatformPlugin.kext
 	static EFI_UINT8 const STARTUP_POWER_EVENTS[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	DT__AddProperty(platformNode, "StartupPowerEvents", sizeof(STARTUP_POWER_EVENTS), (EFI_UINT8*) &STARTUP_POWER_EVENTS);
+	
+	/*
+	 *        IOPPF - IODeviceTree:/efi/platform/StartupPowerEvents: [value below]
+	 *  0x01		= Shutdown cause was a PWROK event (Same as GEN_PMCON_2 bit 0)
+	 *  0x02		= Shutdown cause was a SYS_PWROK event (Same as GEN_PMCON_2 bit 1)
+	 *  0x04		= Shutdown cause was a THRMTRIP# event (Same as GEN_PMCON_2 bit 3)
+	 *  0x08		= Rebooted due to a SYS_RESET# event (Same as GEN_PMCON_2 bit 4)
+	 *  0x10		= Power Failure (Same as GEN_PMCON_3 bit 1 PWR_FLR)
+	 *  0x20		= Loss of RTC Well Power (Same as GEN_PMCON_3 bit 2 RTC_PWR_STS)
+	 *  0x40		= General Reset Status (Same as GEN_PMCON_3 bit 9 GEN_RST_STS)
+	 *  0xffffff80	= SUS Well Power Loss (Same as GEN_PMCON_3 bit 14)
+	 *  0x10000		= Wake cause was a ME Wake event (Same as PRSTS bit 0, ME_WAKE_STS)
+	 *  0x20000		= Cold Reboot was ME Induced event (Same as PRSTS bit 1 ME_HRST_COLD_STS) = { 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00 };
+	 *  0x40000		= Warm Reboot was ME Induced event (Same as PRSTS bit 2 ME_HRST_WARM_STS)
+	 *  0x80000		= Shutdown was ME Induced event (Same as PRSTS bit 3 ME_HOST_PWRDN)
+	 *  0x100000	= Global reset ME Wachdog Timer event (Same as PRSTS bit 6)
+	 *  0x200000	= Global reset PowerManagment Wachdog Timer event (Same as PRSTS bit 15)
+	 */
 
+	DT__AddProperty(platformNode, "StartupPowerEvents", sizeof(STARTUP_POWER_EVENTS), (EFI_UINT8*) &STARTUP_POWER_EVENTS);
+	DT__AddProperty(platformNode, "InitialTSC", sizeof(uint64_t), &gPlatform.CPU.TSCFrequency);
 	DT__AddProperty(platformNode, "SystemSerialNumber", sizeof(SYSTEM_SERIAL_NUMBER), (EFI_CHAR16*) SYSTEM_SERIAL_NUMBER);
 
 	if (gPlatform.CPU.FSBFrequency)
@@ -105,7 +134,7 @@ void initEFITree(void)
 	}
 
 	Node * chosenNode = DT__AddChild(gPlatform.DT.RootNode, "chosen");
-
+	
 	if (chosenNode == 0)
 	{
 		stop("Couldn't create /chosen node"); // Mimics boot.efi
@@ -143,16 +172,13 @@ void initEFITree(void)
 	};
 
 	DT__AddProperty(chosenNode, "boot-file-path", sizeof(BOOT_FILE_PATH), (EFI_UINT8*) &BOOT_FILE_PATH);
-
-	static EFI_UINT8 const BOOT_ARGS[] = { 0x00 };
-
-	DT__AddProperty(chosenNode, "boot-args", sizeof(BOOT_ARGS), (EFI_UINT8*) &BOOT_ARGS);
-
+	DT__AddProperty(chosenNode, "boot-args", sizeof(bootArgs->CommandLine), (EFI_UINT8*)bootArgs->CommandLine);
+	
 	/* Adding kIOHibernateMachineSignatureKey (IOHibernatePrivate.h).
 	 *
 	 * This 'Hardware Signature' (offset 8 in the FACS table) is calculated by the BIOS on a best effort 
 	 * basis to indicate the base hardware configuration of the system such that different base hardware 
-	 * configurations  can have different hardware signature values. OSPM uses this information in waking 
+	 * configurations can have different hardware signature values. OSPM uses this information in waking
 	 * from an S4 state, by comparing the current hardware signature to the signature values saved in the 
 	 * non-volatile sleep image. If the values are not the same, OSPM assumes that the saved non-volatile 
 	 * image is from a different hardware configuration and cannot be restored.
@@ -162,17 +188,87 @@ void initEFITree(void)
 
 	DT__AddProperty(chosenNode, "machine-signature", sizeof(MACHINE_SIGNATURE), (EFI_UINT8*) &MACHINE_SIGNATURE);
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if (MAKE_TARGET_OS == YOSEMITE)
+	UInt8 index = 0;
+	EFI_UINT16 PMTimerValue = 0;
+	uint64_t randomValue, tempValue, cpuTick;
+	EFI_UINT32 ecx, esi, edi = 0;
+	EFI_UINT32 rcx, rdx, rsi, rdi;
+
+	randomValue = tempValue = ecx = esi = edi = 0;					// xor		%ecx,	%ecx
+	rcx = rdx = rsi = rdi = cpuTick = 0;
+
+																	// LEAF_1 - Feature Information (Function 01h).
+	if (gPlatform.CPU.ID[LEAF_1][2] & 0x40000000)					// Checking ecx:bit-30
+	{
+		EFI_UINT32 seedBuffer[16] = {0};
+		//
+		// Main loop to get 16 qwords (four bytes each).
+		//
+		for (index = 0; index < 16; index++)						// 0x17e12:
+		{
+			randomValue = computeRand();							// callq	0x18e20
+			cpuTick = getCPUTick();									// callq	0x121a7
+			randomValue = (randomValue ^ cpuTick);					// xor		%rdi,	%rax
+			seedBuffer[index] = randomValue;						// mov		%rax,(%r15,%rsi,8)
+		}															// jb		0x17e12
+		
+		DT__AddProperty(chosenNode, "random-seed", sizeof(seedBuffer), (EFI_UINT32*) &seedBuffer);
+	}
+	else
+	{
+		EFI_UINT8 seedBuffer[64] = {0};
+		//
+		// Main loop to get the 64 bytes.
+		//
+		do															// 0x17e55:
+		{
+			PMTimerValue = inw(0x408);								// in		(%dx),	%ax
+			esi = PMTimerValue;										// movzwl	%ax,	%esi
+
+			if (esi < ecx)											// cmp		%ecx,	%esi
+			{
+				continue;											// jb		0x17e55		(retry)
+			}
+
+			cpuTick = getCPUTick();									// callq	0x121a7
+			rcx = (cpuTick >> 8);									// mov		%rax,	%rcx
+																	// shr		$0x8,	%rcx
+			rdx = (cpuTick >> 10);									// mov		%rax,	%rdx
+																	// shr		$0x10,	%rdx
+			rdi = rsi;												// mov		%rsi,	%rdi
+			rdi = (rdi ^ cpuTick);									// xor		%rax,	%rdi
+			rdi = (rdi ^ rcx);										// xor		%rcx,	%rdi
+			rdi = (rdi ^ rdx);										// xor		%rdx,	%rdi
+
+			seedBuffer[index] = (rdi & 0xff);						// mov		%dil,	(%r15,%r12,1)
+
+			edi = (edi & 0x2f);										// and		$0x2f,	%edi
+			edi = (edi + esi);										// add		%esi,	%edi
+			index++;												// inc		r12
+			ecx = (edi & 0xffff);									// movzwl	%di,	%ecx
+
+		} while (index < 64);										// cmp		%r14d,	%r12d
+																	// jne		0x17e55		(next)
+
+		DT__AddProperty(chosenNode, "random-seed", sizeof(seedBuffer), (EFI_UINT8*) &seedBuffer);
+	}
+#endif
+
+#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 
 	// Used by boot.efi - cosmetic only node/properties on hacks.
 	Node * kernelCompatNode = DT__AddChild(efiNode, "kernel-compatibility");
 
 	static EFI_UINT8 const COMPAT_MODE[] = { 0x01, 0x00, 0x00, 0x00 };
 
-	DT__AddProperty(kernelCompatNode, "i386", sizeof(COMPAT_MODE), (EFI_UINT8*) &COMPAT_MODE);
-	DT__AddProperty(kernelCompatNode, "x86_64", sizeof(COMPAT_MODE), (EFI_UINT8*) &COMPAT_MODE);
+	#if ((MAKE_TARGET_OS == MAVERICKS) || (MAKE_TARGET_OS == YOSEMITE))
+		DT__AddProperty(kernelCompatNode, "x86_64", sizeof(COMPAT_MODE), (EFI_UINT8*) &COMPAT_MODE);
+	#else
+		DT__AddProperty(kernelCompatNode, "i386", sizeof(COMPAT_MODE), (EFI_UINT8*) &COMPAT_MODE);
+		DT__AddProperty(kernelCompatNode, "x86_64", sizeof(COMPAT_MODE), (EFI_UINT8*) &COMPAT_MODE);
+	#endif
 #endif
-
 	// Adding the options node breaks AppleEFINVRAM (missing hardware UUID).
 	// Node *optionsNode = DT__AddChild(gPlatform.DT.RootNode, "options");
 	// DT__AddProperty(optionsNode, "EFICapsuleResult", 4, "STAR"); // 53 54 41 52
@@ -308,15 +404,17 @@ bool initMultiProcessorTableAdress(void)
 
 void finalizeEFITree(EFI_UINT32 kernelAdler32)
 {
-	_EFI_DEBUG_DUMP("done).Calling setupEFITables(");
+	_EFI_DEBUG_DUMP("Calling setupEFITables()\n");
 
 	setupEFITables();
-	
+
+	_EFI_DEBUG_DUMP("Add property: boot-kernelcache-adler32 = %d\n", kernelAdler32);
 	DT__AddProperty(gPlatform.EFI.Nodes.Chosen, "boot-kernelcache-adler32", sizeof(EFI_UINT32), (EFI_UINT32*)kernelAdler32);
 
+	_EFI_DEBUG_DUMP("Calling setupSMBIOS()\n");
 	setupSMBIOS();
 
-	_EFI_DEBUG_DUMP("done).\nAdding EFI configuration table for SMBIOS(");
+	_EFI_DEBUG_DUMP("Adding EFI configuration table for SMBIOS(");
 
 	addConfigurationTable(&gPlatform.SMBIOS.Guid, &gPlatform.SMBIOS.BaseAddress, NULL);
 
@@ -329,13 +427,12 @@ void finalizeEFITree(EFI_UINT32 kernelAdler32)
 	// gPlatform.UUID is set in: RevoBoot/i386/libsaio/SMBIOS/[dynamic/static]_data.h
 	DT__AddProperty(gPlatform.EFI.Nodes.Platform, "system-id", 16, (EFI_CHAR8 *)gPlatform.UUID);
 #endif
-	
+
 	//
 	// Start of experimental code
 	//
-	
 	Node *revoEFINode = DT__AddChild(gPlatform.DT.RootNode, "RevoEFI");
-	
+
 #ifdef STATIC_NVRAM_ROM
 	static EFI_UINT8 const NVRAM_ROM_DATA[] = STATIC_NVRAM_ROM;
 #else

From d953fbd3fc1686b8ad19989d335b5dfb6a75a001 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 12 Oct 2014 17:30:21 +0200
Subject: [PATCH 478/623] June 2014 Yosemite update

---
 CHANGES                                    |  129 +-
 Makefile                                   |   66 +-
 README                                     |   45 +-
 VERSION                                    |    2 +-
 i386/boot2/Makefile                        |   12 +-
 i386/boot2/boot.c                          |  146 +-
 i386/boot2/boot.h                          |   10 +-
 i386/boot2/bootlogo.c                      |  240 ++-
 i386/boot2/bootlogo.h                      |   37 +-
 i386/boot2/drivers.c                       |  145 +-
 i386/boot2/graphics.c                      |   79 +-
 i386/boot2/picopng.c                       | 1796 ++++++++++++++++++++
 i386/boot2/picopng.h                       |   33 +
 i386/libsa/memory.h                        |    2 +-
 i386/libsa/zalloc.c                        |   15 +-
 i386/libsaio/Makefile                      |    2 +
 i386/libsaio/acpi.c                        |    2 +-
 i386/libsaio/acpi/essentials.h             |    4 +
 i386/libsaio/acpi/patcher.h                |    2 +-
 i386/libsaio/allocate.c                    |   38 +-
 i386/libsaio/bootstruct.c                  |   48 +-
 i386/libsaio/bootstruct.h                  |   41 +-
 i386/libsaio/cpu.c                         |    6 +-
 i386/libsaio/cpu/Intel/dynamic_data.h      |   18 +-
 i386/libsaio/cpu/essentials.h              |    2 +-
 i386/libsaio/device_tree.c                 |   13 +-
 i386/libsaio/device_tree.h                 |    1 -
 i386/libsaio/efi/efi.h                     |    2 +-
 i386/libsaio/efi/fake_efi.h                |    9 +-
 i386/libsaio/load.c                        |  177 +-
 i386/libsaio/platform.c                    |   18 +-
 i386/libsaio/platform.h                    |   13 +-
 i386/libsaio/saio_internal.h               |    3 +-
 i386/libsaio/smbios/dynamic_data.h         |    2 +-
 i386/libsaio/smbios/getters.h              |    4 +-
 i386/libsaio/smbios/model_data.h           |   29 +-
 i386/libsaio/smbios/tools/smbios2struct3.c |   10 +-
 i386/libsaio/sys.c                         |    8 +-
 38 files changed, 2855 insertions(+), 354 deletions(-)
 create mode 100644 i386/boot2/picopng.c
 create mode 100644 i386/boot2/picopng.h

diff --git a/CHANGES b/CHANGES
index ed274d1..c08c6d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,71 +1,76 @@
-RevoBoot v1.5.50 (Next Major Release)
+RevoBoot v2.0.00
 ================
-- Improved CPU detection (with new/additional CPU's).
-- Improved P-State generation (less settings).
+- Support for OS X 10.10 aka Yosemite added (Pike R. Alpha, June 2013).
+- VERSION updated to v2.0.00
+- LZVN decompression added for Yosemite.
+- IODeviceTree:/chosen/random-seed added for Yosemite.
+- kernel and kernelcache path updated for Yosemite.
+- boot2/picopng.c and boot2/picopng.c added (removed in v2.0.10).
+- bootstruct.c and bootstruct.h updated for Yosemite.
 
 
 RevoBoot v1.5.40
 ================
-- Support for OS X 10.9 aka Mavericks added (Piker, June 2013).
+- Support for OS X 10.9 aka Mavericks added (Pike R. Alpha, June 2013).
 - VERSION updated to v1.5.40
 
 
 RevoBoot v1.5.39
 ================
-- Fixed boot failure for InstallESD/BaseSystem.dmg/patched kernelcache (Piker, April 2013).
-- LION_INSTALL_SUPPORT renamed to INSTALL_ESD_SUPPORT (Piker, April 2013).
-- Stripped (unnecessary) argument from loadSystemConfig (Pike, April 2013).
-- Renamed function loadSystemConfig to loadCABootPlist (Pike, April 2013).
-- Simplified search for and read of com.apple.Boot.plist (Pike, April 2013).
+- Fixed boot failure for InstallESD/BaseSystem.dmg/patched kernelcache (Pike R. Alpha, April 2013).
+- LION_INSTALL_SUPPORT renamed to INSTALL_ESD_SUPPORT (Pike R. Alpha, April 2013).
+- Stripped (unnecessary) argument from loadSystemConfig (Pike R. Alpha, April 2013).
+- Renamed function loadSystemConfig to loadCABootPlist (Pike R. Alpha, April 2013).
+- Simplified search for and read of com.apple.Boot.plist (Pike R. Alpha, April 2013).
 - Board ID's for iMac12,n fixed (Jeroen, April 2013).
-- Settings template updated (Pike, April 2013).
+- Settings template updated (Pike R. Alpha, April 2013).
 - VERSION updated to v1.5.39
 
 
 RevoBoot v1.5.38
 ================
-- RevoBoot/i386/libsaio/efi.c modified to workaround iMessage login/registration problems (PikerAlpha, January 2013).
-- getBoardType in RevoBoot/i386/libsaio/SMBIOS/getters.h now always returns a board type (PikerAlpha, January 2013).
-- STATIC_NVRAM_ROM/STATIC_NVRAM_MLB added (used in efi.c) to settings-template.h (PikerAlpha, January 2013).
+- RevoBoot/i386/libsaio/efi.c modified to workaround iMessage login/registration problems (Pike R. Alpha, January 2013).
+- getBoardType in RevoBoot/i386/libsaio/SMBIOS/getters.h now always returns a board type (Pike R. Alpha, January 2013).
+- STATIC_NVRAM_ROM/STATIC_NVRAM_MLB added (used in efi.c) to settings-template.h (Pike R. Alpha, January 2013).
 - VERSION updated to v1.5.38
 
 
 RevoBoot v1.5.37
 ================
-- DISK_TARGET_SUPPORT in settings-template.h renamed to STARTUP_DISK_SUPPORT (PikerAlpha, November 2012).
-- Restored copyright of efi_tables.c to original developer (PikerAlpha, November 2012).
-- Renamed RevoBoot/i386/libsa/efi_tables.c to crc32.c (PikerAlpha, November 2012).
-- Moved GUID function from efi_tables.c to RevoBoot/i386/libsaio/guid.c (PikerAlpha, November 2012). 
-- Fixed some minor C99 issues / restoring gcc compatibility (PikerAlpha, November 2012).
+- DISK_TARGET_SUPPORT in settings-template.h renamed to STARTUP_DISK_SUPPORT (Pike R. Alpha, November 2012).
+- Restored copyright of efi_tables.c to original developer (Pike R. Alpha, November 2012).
+- Renamed RevoBoot/i386/libsa/efi_tables.c to crc32.c (Pike R. Alpha, November 2012).
+- Moved GUID function from efi_tables.c to RevoBoot/i386/libsaio/guid.c (Pike R. Alpha, November 2012). 
+- Fixed some minor C99 issues / restoring gcc compatibility (Pike R. Alpha, November 2012).
 - Cleanups and other minor improvements.
 - VERSION updated to v1.5.37
 
 
 RevoBoot v1.5.36
 ================
-- Now reading efi-boot-device-data from /Extra/NVRAM/nvramStorage.plist to select the Startup Disk (PikerAlpha, November 2012).
-- New DISK_TARGET_SUPPORT setting in settings-template.h (PikerAlpha, November 2012).
-- New file RevoBoot/i386/libsaio/base64.c (written by Sam) added (PikerAlpha, November 2012).
-- Support for data fields added (PikerAlpha, November 2012). 
-- Copied macro's from EDK2's EfiDevicePath.h to RevoBoot/i386/libsaio/efi/essentials.h (PikerAlpha, November 2012).
-- Port of EDK2's function (getGUIDFromDevicePath written by Sam) added (PikerAlpha, November 2012).
-- Function loadSystemConfig now calls new function loadConfigFile (PikerAlpha, November 2012).
+- Now reading efi-boot-device-data from /Extra/NVRAM/nvramStorage.plist to select the Startup Disk (Pike R. Alpha, November 2012).
+- New DISK_TARGET_SUPPORT setting in settings-template.h (Pike R. Alpha, November 2012).
+- New file RevoBoot/i386/libsaio/base64.c (written by Sam) added (Pike R. Alpha, November 2012).
+- Support for data fields added (Pike R. Alpha, November 2012). 
+- Copied macro's from EDK2's EfiDevicePath.h to RevoBoot/i386/libsaio/efi/essentials.h (Pike R. Alpha, November 2012).
+- Port of EDK2's function (getGUIDFromDevicePath written by Sam) added (Pike R. Alpha, November 2012).
+- Function loadSystemConfig now calls new function loadConfigFile (Pike R. Alpha, November 2012).
 - Cleanups and other minor improvements.
 - VERSION updated to v1.5.36
 
 
 RevoBoot v1.5.35
 ================
-- SMBIOS related enhancements for RevoBoot v1.5.35 (PikerAlpha, November 2012).
+- SMBIOS related enhancements for RevoBoot v1.5.35 (Pike R. Alpha, November 2012).
 - VERSION updated to v1.5.35
 
 
 RevoBoot v1.5.34
 ================
-- LOAD_STATIC_EFI_DATA_FROM_EXTRA in settings-template.h renamed to LOAD_MODEL_SPECIFIC_EFI_DATA (PikerAlpha, October 2012).
-- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA in settings-template.h renamed to LOAD_MODEL_SPECIFIC_SMBIOS_DATA (PikerAlpha, October 2012).
-- New LOAD_MODEL_SPECIFIC_ACPI_DATA setting in settings-template.h (PikerAlpha, October 2012).
-- New LOAD_MODEL_SPECIFIC_STATIC_DATA setting in settings-template.h (PikerAlpha, October 2012).
+- LOAD_STATIC_EFI_DATA_FROM_EXTRA in settings-template.h renamed to LOAD_MODEL_SPECIFIC_EFI_DATA (Pike R. Alpha, October 2012).
+- LOAD_STATIC_SMBIOS_DATA_FROM_EXTRA in settings-template.h renamed to LOAD_MODEL_SPECIFIC_SMBIOS_DATA (Pike R. Alpha, October 2012).
+- New LOAD_MODEL_SPECIFIC_ACPI_DATA setting in settings-template.h (Pike R. Alpha, October 2012).
+- New LOAD_MODEL_SPECIFIC_STATIC_DATA setting in settings-template.h (Pike R. Alpha, October 2012).
 - VERSION updated to v1.5.34
 
 Notes:
@@ -77,77 +82,77 @@ You <i>must</i> use the latest version of RevoBoot/i386/config/settings-template
 
 RevoBoot v1.5.33
 ================
-- Restored lost lines in RevoBoot/i386/libsaio/SMBIOS/static_data.h (PikerAlpha, November 2012).
+- Restored lost lines in RevoBoot/i386/libsaio/SMBIOS/static_data.h (Pike R. Alpha, November 2012).
 - VERSION updated to v1.5.33
 
 
 RevoBoot v1.5.32
 ================
-- Optionally include Recovery HD support code in boot.c (PikerAlpha, October 2012).
-- Renamed LION_RECOVERY_SUPPORT to CORE_STARAGE_SUPPORT in disk.c (PikerAlpha, October 2012).
-- Renamed LION_FILEVAULT_SUPPORT to CORE_STARAGE_SUPPORT in disk.c (PikerAlpha, November 2012).
-- Renamed encryptedBootPartition to coreStoragePartition in disk.c (PikerAlpha, October 2012).
-- Cleaned up settings-template.h (PikerAlpha, October 2012).
+- Optionally include Recovery HD support code in boot.c (Pike R. Alpha, October 2012).
+- Renamed LION_RECOVERY_SUPPORT to CORE_STARAGE_SUPPORT in disk.c (Pike R. Alpha, October 2012).
+- Renamed LION_FILEVAULT_SUPPORT to CORE_STARAGE_SUPPORT in disk.c (Pike R. Alpha, November 2012).
+- Renamed encryptedBootPartition to coreStoragePartition in disk.c (Pike R. Alpha, October 2012).
+- Cleaned up settings-template.h (Pike R. Alpha, October 2012).
 - VERSION updated to v1.5.32
 
 
 RevoBoot v1.5.31
 ================
-- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
-- Restored lost STATIC_SMSERIALNUMBER in setings-template.h (PikerAlpha, October 2012).
-- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
+- STATIC_SYSTEM_SERIAL_NUMBER renamed to EFI_SYSTEM_SERIAL_NUMBER (Pike R. Alpha, October 2012).
+- Restored lost STATIC_SMSERIALNUMBER in setings-template.h (Pike R. Alpha, October 2012).
+- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (Pike R. Alpha, October 2012).
 - VERSION updated to v1.5.31
 
 
 RevoBoot v1.5.30
 ================
-- Move/update /Extra/ data reading to RevoBoot/i386/libsaio/load.c (PikerAlpha, October 2012).
-- Option to read /Extra/EFI/[MacModelNN.bin] when static EFI data is used (PikerAlpha, October 2012).
-- Option to read /Extra/SMBIOS/[MacModelNN.bin] when static SMBIOS data is used (PikerAlpha, October 2012).
-- Makefile changes for above features(PikerAlpha, October 2012).
+- Move/update /Extra/ data reading to RevoBoot/i386/libsaio/load.c (Pike R. Alpha, October 2012).
+- Option to read /Extra/EFI/[MacModelNN.bin] when static EFI data is used (Pike R. Alpha, October 2012).
+- Option to read /Extra/SMBIOS/[MacModelNN.bin] when static SMBIOS data is used (Pike R. Alpha, October 2012).
+- Makefile changes for above features(Pike R. Alpha, October 2012).
 - VERSION updated to v1.5.30
 
 
 RevoBoot v1.5.25
 ================
-- RevoBoot/i386/config/data.h is no longer included with (PikerAlpha, October 2012).
-- New static data paths in RevoBoot/i386/libsaio/Makefile (PikerAlpha, October 2012).
-- Use model identifier as filename for static data (PikerAlpha, October 2012).
+- RevoBoot/i386/config/data.h is no longer included with (Pike R. Alpha, October 2012).
+- New static data paths in RevoBoot/i386/libsaio/Makefile (Pike R. Alpha, October 2012).
+- Use model identifier as filename for static data (Pike R. Alpha, October 2012).
 - VERSION updated to v1.5.25
 
 
 RevoBoot v1.5.23
 ================
-- Bug fix and cleanups in RevoBoot/i386/libsaio/SMBIOS/dynamic_data.h (PikerAlpha, October 2012).
+- Bug fix and cleanups in RevoBoot/i386/libsaio/SMBIOS/dynamic_data.h (Pike R. Alpha, October 2012).
 - VERSION updated to v1.5.23
 
 
 RevoBoot v1.5.22
 ================
-- Bug fix in RevoBoot/Makefile (PikerAlpha, October 2012).
+- Bug fix in RevoBoot/Makefile (Pike R. Alpha, October 2012).
 - VERSION updated to v1.5.22
 
 
 RevoBoot v1.5.21
 ================
-- Model data for new Macmini6,N added (PikerAlpha, October 2012).
+- Model data for new Macmini6,N added (Pike R. Alpha, October 2012).
 - VERSION updated to v1.5.21
 
 
 RevoBoot v1.5.20
 ================
-- Automatic data selection for ACPI/EFI and SMBIOS data (PikerAlpha, October 2012)
-- Copies ACPI/EFI/SMBIOS/data-template.h to [your model.h] for new configurations (PikerAlpha, October 2012)
+- Automatic data selection for ACPI/EFI and SMBIOS data (Pike R. Alpha, October 2012)
+- Copies ACPI/EFI/SMBIOS/data-template.h to [your model.h] for new configurations (Pike R. Alpha, October 2012)
 
 
 RevoBoot v1.5.10
 ================
-- Makefiles cleaned up/optimized (PikerAlpha, October 2012).
-- make now defaults to Mountain Lion (PikerAlpha, October 2012).
-- MODEL=[your model] argument added to makefiles (PikerAlpha, October 2012).
-- MODEL=$1 added to RevoBoot/r for optional model identifier (PikerAlpha, October 2012).
-- make now creates RevoBoot/i386/config/SETTINGS when missing (PikerAlpha, October 2012).
-- Makefile now copies settings-template.h to SETTINGS/[your model.h] when missing (PikerAlpha, October 2012).
+- Makefiles cleaned up/optimized (Pike R. Alpha, October 2012).
+- make now defaults to Mountain Lion (Pike R. Alpha, October 2012).
+- MODEL=[your model] argument added to makefiles (Pike R. Alpha, October 2012).
+- MODEL=$1 added to RevoBoot/r for optional model identifier (Pike R. Alpha, October 2012).
+- make now creates RevoBoot/i386/config/SETTINGS when missing (Pike R. Alpha, October 2012).
+- Makefile now copies settings-template.h to SETTINGS/[your model.h] when missing (Pike R. Alpha, October 2012).
 
 
 RevoBoot v1.5.01
@@ -157,16 +162,16 @@ RevoBoot v1.5.01
 
 RevoBoot v1.5.00
 ================
-- RevoBoot project forked (PikerAlpha, October 2012).
+- RevoBoot project forked (Pike R. Alpha, October 2012).
 - 
 - Time to say goodbye to some of the legacy code.  Something I will do with the help of Sam's notes, 
 - but not everything is written in stone.  Unfortenately.  Meaning that I will have to experiment and 
 - improvise.  Hopefully achieving the same goals that she had in mind for you.
 -
-- Support for self compiled libcc_kext.a (Xcode 4.5.1 compatibility) added (PikerAlpha, October 2012).
-- SMBIOS legacy code removed (PikerAlpha, October 2012).
-- EFI/SMBIOS data logic moved to preprocessor code (PikerAlpha, October 2012).
-- RevoBoot/i386/config/settings.h stripped for simplicity (PikerAlpha, October 2012).
+- Support for self compiled libcc_kext.a (Xcode 4.5.1 compatibility) added (Pike R. Alpha, October 2012).
+- SMBIOS legacy code removed (Pike R. Alpha, October 2012).
+- EFI/SMBIOS data logic moved to preprocessor code (Pike R. Alpha, October 2012).
+- RevoBoot/i386/config/settings.h stripped for simplicity (Pike R. Alpha, October 2012).
 - 
 - Note: If there is anything that doesn't work for you... let me know and I will look at it.
 -
diff --git a/Makefile b/Makefile
index 0c59c1f..c0b0927 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,8 @@
 #			- Output added for cp/mkdir/rm actions (PikerAlpha, November 2012).
 #			- New build target 'help' added (PikerAlpha, November 2012).
 #			- Cleanups and output changed (PikerAlpha, November 2012).
+#			- Yosemite support added (PikerAlpha, June 2014).
+#			- Changed default from Mavericks to Yosemite (PikerAlpha, June 2014).
 #
 
 #
@@ -50,33 +52,40 @@ VPATH = $(OBJROOT):$(SYMROOT)
 
 ifeq ($(MAKECMDGOALS),)
 	#
-	# No OS build target given. Build for Mavericks (default).
+	# No OS build target given. Build for Yosemite (default).
 	#
-	MAKE_TARGET_OS = 10;
-	MAKEGOAL = mavericks
+	MAKEGOAL = yosemite
+	MAKE_TARGET_OS = 26;
+	MAKE_TARGET_OS_VER = 10.10
 else
 	#
 	# Setting MAKE_TARGET_OS and MAKEGOAL based on OS build target.
 	#
-	ifeq ($(MAKECMDGOALS), mountain-lion)
-		MAKE_TARGET_OS = 6;
+	ifeq ($(MAKECMDGOALS), yosemite)
+		MAKEGOAL = yosemite
+		MAKE_TARGET_OS = 26;
+		MAKE_TARGET_OS_VER = 10.10
+	else ifeq ($(MAKECMDGOALS), mavericks)
+		MAKEGOAL = mavericks
+		MAKE_TARGET_OS = 10;
+		MAKE_TARGET_OS_VER = 10.9
+	else ifeq ($(MAKECMDGOALS), mountain-lion)
 		MAKEGOAL = mountain-lion
-	else
-		ifeq ($(MAKECMDGOALS), mavericks)
-			MAKE_TARGET_OS = 10;
-			MAKEGOAL = mavericks
-		else ifeq ($(MAKECMDGOALS), lion)
-			MAKE_TARGET_OS = 2;
-			MAKEGOAL = lion
-		else ifeq ($(MAKECMDGOALS), legacy)
-			MAKE_TARGET_OS = 1;
-			MAKEGOAL = legacy
-		endif
+		MAKE_TARGET_OS = 6;
+		MAKE_TARGET_OS_VER = 10.8
+	else ifeq ($(MAKECMDGOALS), lion)
+		MAKEGOAL = lion
+		MAKE_TARGET_OS = 2;
+		MAKE_TARGET_OS_VER = 10.7
+	else ifeq ($(MAKECMDGOALS), legacy)
+		MAKEGOAL = legacy
+		MAKE_TARGET_OS = 1;
+		MAKE_TARGET_OS_VER = 10.6
 	endif
 endif
 
 #
-# Export our make goal i.e. mavericks, mountain-lion, lion or legacy (snow-leopard or leopard).
+# Export our make goal i.e. yosemite, mavericks, mountain-lion, lion or legacy (snow-leopard or leopard).
 #
 
 export MAKEGOAL
@@ -87,6 +96,12 @@ export MAKEGOAL
 
 export PRODUCT_OS_TARGET = `echo $(MAKE_TARGET_OS)`
 
+#
+# Export target OS version (picked up by: i386/libsaio/Makefile) for platform.c
+#
+
+export PRODUCT_OS_TARGET_VERSION = `echo \"$(MAKE_TARGET_OS_VER)\"`
+
 #
 # Check if a target model was specified (example: make MODEL=16 mountain-lion).
 #
@@ -139,6 +154,23 @@ SETTINGS_DIR=$(CONFIG_DIR)/SETTINGS
 SETTINGS_FILE=$(SETTINGS_DIR)/$(MAKE_TARGET_MODEL).h
 
 $(MAKEGOAL):
+#
+# autoclean
+#
+	@if [ -d "$(OBJROOT)" ]; then \
+		echo "\t[RMDIR] $(OBJROOT)" > /dev/null; \
+	fi;
+
+	@if [ -d "$(SYMROOT)" ]; then \
+		echo "\t[RMDIR] $(SYMROOT)" > /dev/null; \
+	fi;
+
+	@rm -rf sym obj dst out.log 
+#
+# normal make goal
+#
+	@printf "Compiling RevoBoot, setup for a $(MODEL) running OS X $(MAKE_TARGET_OS_VER) ($@)\n\n" >&2;
+
 	@if [ ! -f $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE) ]; then \
 		echo "\t[CP] $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE)"; \
 		cp -n $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE); \
diff --git a/README b/README
index 251f26a..106ac27 100644
--- a/README
+++ b/README
@@ -1,36 +1,37 @@
-About this project:
--------------------
-This Open Source hobby project is maintained by Pike (http://pikeralpha.wordpress.com). A long time supporter of the RevoBoot project.
+- About this project
 
-Note that we do not tolerate/share any (links to) copyrighted material. We only use purchased software and we won't share any of it. Just get your copy of OS X in the Apple store. Should be affordable for everyone.
+This Open Source hobby project was first started by Master Chief, then taken over by RevoGitl (Samantha) and is now maintained by Pike R. Alpha (http://pikeralpha.wordpress.com). A long time supporter of the RevoBoot project.
+
+
+- Server.app
+
+RevoBoot works with the Server app for Mountain Lion (12C60) and Mavericks.
+
+
+- Fusion Drive Support
 
-Mountain Lion Server:
----------------------
-RevoBoot has been confirmed to work with the Server app for Mountain Lion and Mavaricks.
 
-Fusion Drive Support:
----------------------
 Apple's Fusion Drive* is a software implementation to speedup the boot and load process for frequently used applications, without limiting the storage capacity in a bad way. See also: http://support.apple.com/kb/HT5446
 
-The new Mac's that come with a Fusion Drive boot from the third (Recovery HD like) partition on the SSD. This partition is 134.2 MB in size and is called "Boot OS X".
-The Recovery HD partition can be found as third partition on the HDD. Setting up a Fusion Drive on a Mac need to be done with Internet Recovery.
+The new Mac's that come with a Fusion Drive, boot from the third (Recovery HD like) partition on the SSD. This partition is 134.2 MB in size and is called "Boot OS X". The Recovery HD partition can be found as third partition on the HDD. RevoBoot detects CoreStorage partitions and will boot from the boot helper partition on the SDD.
 
-RevoBoot detects CoreStorage partitions and will boot from the boot helper partition on the SDD.
 
-NetBoot/NetInstall:
--------------------
+- NetBoot/NetInstall
+
 People who have Mountain Lion Server setup and like to install their hack from it... sorry that won't work. The source 
-code snippets for it have been stripped out (by Master Chief in 2009) but we might fix this in future update of RevoBoot. 
+code snippets for it have been stripped out (by Master Chief in 2009). 
+
+
+- Xcode Support for Mountain Lion, Mavericks and Yosemite
+
+RevoBoot can be built on Snow Leopard, Lion and Mountain Lion. The latter requires Xcode 4.5.1 (and greater) and the latest 'command line tools' need to be installed. See change log for instructions.
+
 
-Xcode Support for Mountain Lion:
---------------------------------
-RevoBoot can be built on Snow Leopard, Lion, Mountain Lion (requires Xcode 4.5.1 or greater) and Mavericks, and the latest 'command line tools' need to be installed. See change log for instructions.
+- Configuration
 
-Configuration:
---------------
 Please note that RevoBoot must be configured for your hardware so start reading our WiKi. See also:
 
-https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder – sorry folks, no longer available!
+https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder
 
 We also have a configuration README available at:
 
@@ -38,6 +39,6 @@ https://github.com/RevoGirl/RevoBoot/blob/master/i386/config/README
 
 There's also RevoBuilder (a great tool for first starters) over at:
 
-https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder – sorry folks, no longer available!
+https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder
 
 Note: RevoBuilder is most likeky broken for RevoBoot v.1.5.00 and greater!
diff --git a/VERSION b/VERSION
index adecc24..f08cf98 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.40
+2.0.00
diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 765fb6e..fbc3645 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -35,9 +35,15 @@ VPATH = $(OBJROOT):$(SYMROOT)
 
 #
 # The order of object filenames below is important;
-#	
-
-OBJS = boot2.o boot.o bootlogo.o graphics.o drivers.o options.o lzss.o
+#
+OBJS = boot2.o boot.o bootlogo.o graphics.o drivers.o options.o lzss.o lzvn.o
+
+ifeq ($(MAKECMDGOALS), yosemite)
+#	OBJS = boot2.o boot.o bootlogo.o graphics.o picopng.o drivers.o options.o lzss.o
+OBJS+=picopng.o
+#else
+#	OBJS = boot2.o boot.o bootlogo.o graphics.o drivers.o options.o lzss.o
+endif
 
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index c771e6b..7fa4727 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -53,7 +53,6 @@
  *
  */
 
-
 #include "boot.h"
 #include "bootstruct.h"
 #include "sl.h"
@@ -168,6 +167,7 @@ void boot(int biosdev)
 
 	bool	haveCABootPlist	= false;
 	bool	quietBootMode	= true;
+	bool	bootRecoveryHD	= false;
 
 	void *fileLoadBuffer = (void *)kLoadAddr;
 
@@ -186,40 +186,55 @@ void boot(int biosdev)
 
 #if PRE_LINKED_KERNEL_SUPPORT
 	bool	mayUseKernelCache	= false;
+	bool	flushCaches			= false;
 
 	long flags, cachetime;
 #endif
 
-#if RECOVERY_HD_SUPPORT
-	/* extern void setVideoMode(int mode);
-	setVideoMode(0); // Switch to VGA_TEXT_MODE
-	printf("RecoveryHD boot support enabled\n");
+#if DEBUG_STATE_ENABLED
+	extern  void setVideoMode(int mode);
+	setVideoMode(VGA_TEXT_MODE);
+#endif
 
-	bool bootRecoveryHD = false;
+#if RECOVERY_HD_SUPPORT
+	#if DEBUG_BOOT
+		printf("RecoveryHD boot support enabled\n");
+	#endif
 
 	while (readKeyboardStatus())
 	{
 		int key = (bgetc() & 0xff);
-		printf("key: %d\n", key);
+		#if DEBUG_BOOT
+			printf("key: %d\n", key);
+		#endif
 		if ((key |= 0x20) == 'r')
 		{
 			bootRecoveryHD = true;
-			printf("RecoveryHD boot support is active\n");
+			#if DEBUG_BOOT
+				printf("RecoveryHD boot support is active\n");
+			#endif
 		}
 	}
-
-	printf("bootRecoveryHD: %s\n", bootRecoveryHD ? "True" : "False"); */
+#if DEBUG_BOOT
+	printf("bootRecoveryHD: %s\n", bootRecoveryHD ? "True" : "False");
+#endif
 	initPlatform(biosdev, true);
 #else
 	initPlatform(biosdev, false);
 #endif
 
-#if DEBUG_STATE_ENABLED
-	// Don't switch graphics mode / show boot logo when DEBUG is set to 1.
-	printf("\ngArchCPUType (CPU): %s\n", (gArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386");
-	sleep(3); // Silent sleep.
+#if DEBUG_BOOT
+	/*
+	 * In DEBUG mode we don't switch to graphics mode and do not show the Apple boot logo.
+	 */
+	printf("\nModel: %s\n", gPlatform.ModelID);
+
+	#if ((MAKE_TARGET_OS & LION) != LION)
+		printf("\ngArchCPUType (CPU): %s\n", (gArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386");
+		sleep(3); // Silent sleep.
+	#endif
 #else
-	showBootLogo();
+	showBootLogo(bootRecoveryHD);
 #endif
 
 #if (LOAD_MODEL_SPECIFIC_EFI_DATA == 0)
@@ -302,20 +317,28 @@ void boot(int biosdev)
 				gVerboseMode =	getValueForBootKey(kernelFlags, kVerboseModeFlag, &val, &length) || 
 								getValueForBootKey(kernelFlags, kSingleUserModeFlag, &val, &length);
 				
-				if (gVerboseMode)
+				/* if (gVerboseMode)
 				{
 #if (DEBUG_BOOT == false)
 					setVideoMode(VGA_TEXT_MODE);
 #endif
-				}
+				} */
 
-				// Check for -x (safe) and -f (flush cache) flags.
-				if (getValueForBootKey(kernelFlags, kSafeModeFlag, &val, &length) || 
-					getValueForBootKey(kernelFlags, kIgnoreCachesFlag, &val, &length))
+				// Check for -x (safe) flag.
+				if (getValueForBootKey(kernelFlags, kSafeModeFlag, &val, &length))
 				{
 					gBootMode = kBootModeSafe;
 				}
 
+				// Check for -f (flush cache) flag.
+				if (getValueForBootKey(kernelFlags, kIgnoreCachesFlag, &val, &length))
+				{
+					_BOOT_DEBUG_DUMP("Notice: -f (flush cache) specified!\n");
+#if PRE_LINKED_KERNEL_SUPPORT
+					flushCaches = true;
+#endif
+				}
+
 				// Is rootUUID still empty and 'boot-uuid=<value>' specified as kernel flag?
 				if (rootUUID[0] == '\0' && (getValueForBootKey(kernelFlags, kBootUUIDKey, &val, &length) && length == 36))
 				{
@@ -422,31 +445,43 @@ void boot(int biosdev)
 	if (haveCABootPlist) // Check boolean before doing more time consuming tasks.
 	{
 #if PRE_LINKED_KERNEL_SUPPORT
-		_BOOT_DEBUG_DUMP("Checking Kernel Cache key in com.apple.Boot.plist\n");
-
-		if (getValueForKey(kKernelCacheKey, &val, &length, &bootInfo->bootConfig))
+		/*
+		 * We cannot use the kernelcache from the Yosemite installer, not yet,
+		 * and thus we load: /System/Library/Caches/Startup/kernelcache instead
+		 */
+#if (MAKE_TARGET_OS == YOSEMITE)
+		// Installation directory located?
+		if (flushCaches == false) //  && (gPlatform.BootVolume->flags != kBVFlagInstallVolume))
 		{
-#if RECOVERY_HD_SUPPORT
-			_BOOT_DEBUG_DUMP("Kernel Cache key located in com.apple.Boot.plist\n");
-			_BOOT_DEBUG_DUMP("length: %d, val: %s\n", length, val);
-			// XXX: Required for booting from the Recovery HD.
-			if (strncmp(val, "\\com.apple.recovery.boot\\kernelcache", length) == 0)
+#endif // #if (MAKE_TARGET_OS == YOSEMITE)
+			_BOOT_DEBUG_DUMP("Checking Kernel Cache key in com.apple.Boot.plist\n");
+
+			if (getValueForKey(kKernelCacheKey, &val, &length, &bootInfo->bootConfig))
 			{
-				val = "/com.apple.recovery.boot/kernelcache";
-			}
+				_BOOT_DEBUG_DUMP("Kernel Cache key located in com.apple.Boot.plist\n");
+				_BOOT_DEBUG_DUMP("length: %d, val: %s\n", length, val);
+#if RECOVERY_HD_SUPPORT
+				// XXX: Required for booting from the Recovery HD.
+				if (strncmp(val, "\\com.apple.recovery.boot\\kernelcache", length) == 0)
+				{
+					val = "/com.apple.recovery.boot/kernelcache";
+				}
 #endif
-			if (length && GetFileInfo(NULL, val, &flags, &cachetime) == 0)
-			{
-				_BOOT_DEBUG_DUMP("Kernel Cache set to: %s\n", val);
+				if (length && GetFileInfo(NULL, val, &flags, &cachetime) == 0)
+				{
+					_BOOT_DEBUG_DUMP("Kernel Cache set to: %s\n", val);
 
-				// File located. Init kernelCacheFile so that we can use it as boot file.
-				gPlatform.KernelCachePath = strdup(val);
+					// File located. Init kernelCacheFile so that we can use it as boot file.
+					gPlatform.KernelCachePath = strdup(val);
 				
-				// Set flag to inform the load process to skip parts of the code.
-				gPlatform.KernelCacheSpecified = true;
+					// Set flag to inform the load process to skip parts of the code.
+					gPlatform.KernelCacheSpecified = true;
+				}
 			}
+#if (MAKE_TARGET_OS == YOSEMITE)
 		}
-		// _BOOT_DEBUG_ELSE_DUMP("No 'Kernel Cache' key given.\n");
+#endif // #if (MAKE_TARGET_OS == YOSEMITE)
+
 #endif
 		if (getBoolForKey(kQuietBootKey, &quietBootMode, &bootInfo->bootConfig) && !quietBootMode)
 		{
@@ -466,14 +501,17 @@ void boot(int biosdev)
 
 		getAndProcessBootArguments(kernelFlags);
 
-		// Initialize bootFile (defaults to: mach_kernel).
+		/* Initialize bootFile (defaults to: mach_kernel).
 		strcpy(bootFile, bootInfo->bootFile);
+		_BOOT_DEBUG_DUMP("bootFile: %s\n", bootFile);
+		_BOOT_DEBUG_DUMP("bootInfo->bootFile: %s\n", bootInfo->bootFile);
+		_BOOT_DEBUG_SLEEP(5); */
 
 #if PRE_LINKED_KERNEL_SUPPORT
 		_BOOT_DEBUG_DUMP("gBootMode = %d\n", gBootMode);
 
 		// Preliminary checks to prevent us from doing useless things.
-		mayUseKernelCache = ((gBootMode & kBootModeSafe) == 0);
+		mayUseKernelCache = ((flushCaches == false) && ((gBootMode & kBootModeSafe) == 0));
 
 		_BOOT_DEBUG_DUMP("mayUseKernelCache = %s\n", mayUseKernelCache ? "true" : "false");
 
@@ -490,18 +528,24 @@ void boot(int biosdev)
 		{
 			_BOOT_DEBUG_DUMP("Warning: kernelcache will be ignored!\n");
 
-			// True when 'Kernel Cache' is set in com.apple.Boot.plist
+			/* True when 'Kernel Cache' is set in com.apple.Boot.plist
 			if (gPlatform.KernelCacheSpecified == true)
 			{
 				sprintf(bootFile, "%s", bootInfo->bootFile);
-			}
+			} */
+#if (MAKE_TARGET_OS == YOSEMITE)
+//			else
+//			{
+				sprintf(bootFile, "/System/Library/Kernels/%s", bootInfo->bootFile);
+//			}
+#endif
 		}
 		else
 		{
 			// True when 'Kernel Cache' is set in com.apple.Boot.plist
 			if (gPlatform.KernelCacheSpecified == true)
 			{
-				_BOOT_DEBUG_DUMP("kernelcache: %s\n", gPlatform.KernelCachePath);
+				_BOOT_DEBUG_DUMP("kernelcache path: %s\n", gPlatform.KernelCachePath);
 
 				/*
 				 * Starting with Lion, we can take a shortcut by simply pointing 
@@ -539,7 +583,7 @@ void boot(int biosdev)
 				
 				_BOOT_DEBUG_DUMP("adler32: %08X\n", adler32);
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set (like Lion).
 
 				_BOOT_DEBUG_DUMP("Checking for kernelcache...\n");
 
@@ -608,14 +652,17 @@ void boot(int biosdev)
 #endif // PRE_LINKED_KERNEL_SUPPORT
 
 		/*
-		 * The bootFile normally points to 'mach_kernel' but it will be empty when a
+		 * The bootFile normally points to (mach_)kernel but it will be empty when a
 		 * pre-linked kernel was processed, and that is why we check the length here.
 		 */
 
 		if (strlen(bootFile))
 		{
+			_BOOT_DEBUG_DUMP("About to load: %s\n", bootFile);
+
 			retStatus = LoadThinFatFile(bootFile, &fileLoadBuffer);
 
+#if SUPPORT_32BIT_MODE
 			if (retStatus <= 0 && gArchCPUType == CPU_TYPE_X86_64)
 			{
 				_BOOT_DEBUG_DUMP("Load failed for arch=x86_64, trying arch=i386 now.\n");
@@ -626,6 +673,7 @@ void boot(int biosdev)
 			}
 
 			_BOOT_DEBUG_DUMP("LoadStatus(%d): %s\n", retStatus, bootFile);
+#endif // SUPPORT_32BIT_MODE
 		}
 
 		_BOOT_DEBUG_ELSE_DUMP("bootFile empty!\n");	// Should not happen, but helped me once already.
@@ -651,7 +699,7 @@ void boot(int biosdev)
 				stop("DecodeKernel() failed!");
 			}
 			
-			_BOOT_DEBUG_DUMP("execKernel-2\n");
+			_BOOT_DEBUG_DUMP("execKernel-2 address: 0x%x\n", kernelEntry);
 			
 			// Allocate and copy boot args.
 			moveKernelBootArgs();
@@ -690,13 +738,13 @@ void boot(int biosdev)
 			_BOOT_DEBUG_DUMP("execKernel-7 / gVerboseMode is %s\n", gVerboseMode ? "true" : "false");
 
 			// Did we switch to graphics mode yet (think verbose mode)?
-			if (gVerboseMode || bootArgs->Video.v_display == VGA_TEXT_MODE)
+			if (gVerboseMode || bootArgs->Video.v_display != GRAPHICS_MODE)
 			{
 				
-				_BOOT_DEBUG_SLEEP(6);
+				// _BOOT_DEBUG_SLEEP(6);
 				
 				// Switch to graphics mode and show the Apple logo on a gray-ish background.
-				showBootLogo(); // formerly drawBootGraphics();
+				showBootLogo(bootRecoveryHD);
 			}
 			
 			_BOOT_DEBUG_DUMP("execKernel-8\n");
diff --git a/i386/boot2/boot.h b/i386/boot2/boot.h
index b710e8e..c543955 100755
--- a/i386/boot2/boot.h
+++ b/i386/boot2/boot.h
@@ -34,6 +34,7 @@
 
 #include "platform.h"
 
+
 #if USE_STATIC_DISPLAY_RESOLUTION
 	#define DEFAULT_SCREEN_WIDTH	STATIC_SCREEN_WIDTH
 	#define DEFAULT_SCREEN_HEIGHT	STATIC_SCREEN_HEIGHT
@@ -81,7 +82,6 @@
 #define kACPIKey            "acpi"
 #define kScanSingleDriveKey "Scan Single Drive"
 #define kInsantMenuKey      "Instant Menu"
-#define kDefaultKernel      "mach_kernel"
 #define kWaitForKeypressKey "Wait"
 
 /*
@@ -130,7 +130,7 @@ enum
  * bootlogo.c
  */
 
-extern void showBootLogo();
+extern void showBootLogo(bool aBootRecoveryHDFlag);
 
 /*
  * fake_efi.c
@@ -177,6 +177,12 @@ extern long (*LoadExtraDrivers_p)(FileLoadDrivers_t FileLoadDrivers_p);
 
 extern int decompressLZSS(u_int8_t *dst, u_int8_t *src, u_int32_t srclen);
 
+/*
+ * lzss.c
+ */
+
+extern int lzvn_decode(void * decompressedData, uint32_t decompressedSize, void * compressedData, uint32_t compressedSize);
+
 /*
  * options.c
  */
diff --git a/i386/boot2/bootlogo.c b/i386/boot2/bootlogo.c
index 6244a67..f631fab 100755
--- a/i386/boot2/bootlogo.c
+++ b/i386/boot2/bootlogo.c
@@ -28,22 +28,202 @@
 
 #include "boot.h"
 #include "bootlogo.h"
-#include "appleClut8.h"
 #include "bootstruct.h"
+#include "appleClut8.h"
 
+#define DEBUG 0
 
 //==============================================================================
 
-unsigned long lookUpCLUTIndex(unsigned char index, unsigned char depth)
+unsigned long lookUpCLUTIndex(unsigned char index)
 {
 	long colorIndex = (index * 3);
 	long red   = appleClut8[ colorIndex   ];
 	long green = appleClut8[ colorIndex++ ];
 	long blue  = appleClut8[ colorIndex++ ];
-
+	
 	return (red << 16) | (green << 8) | blue;
 }
 
+//==============================================================================
+
+void * stosl(void * dst, long val, long len)
+{
+	asm volatile ("rep; stosl"
+				  : "=c" (len), "=D" (dst)
+				  : "0" (len), "1" (dst), "a" (val)
+				  : "memory" );
+	
+	return dst;
+}
+
+
+//==============================================================================
+
+void setBackgroundColor(uint32_t aBackGroundColor)
+{
+	long pixelBytes = VIDEO(depth) / 8;
+	
+	char * vram = (char *) VIDEO(baseAddr) + VIDEO(rowBytes) + pixelBytes;
+	
+	int width = VIDEO(width);
+	int height = VIDEO(height);
+	
+	int rem = (pixelBytes * width) % 4;
+	int length = pixelBytes * width / 4;
+	
+	while (height--)
+	{
+		bcopy(&aBackGroundColor, vram, rem);
+		stosl(vram + rem, aBackGroundColor, length);
+		vram += VIDEO(rowBytes);
+	}
+}
+
+//==============================================================================
+
+void drawDataRectangle(unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char * data)
+{
+	unsigned short drawWidth;
+	
+	long pixelBytes = VIDEO(depth) / 8;
+	
+	unsigned char * vram = (unsigned char *) VIDEO(baseAddr) + VIDEO(rowBytes) * y + pixelBytes * x;
+	
+	drawWidth = MIN(width, VIDEO(width) - x);
+	height = MIN(height, VIDEO(height) - y);
+	
+	while (height--)
+	{
+		bcopy( data, vram, drawWidth * pixelBytes );
+		vram += VIDEO(rowBytes);
+		data += width * pixelBytes;
+	}
+}
+
+#if (MAKE_TARGET_OS == YOSEMITE)
+
+#include "picopng.h"
+
+
+//==============================================================================
+
+void showBootLogo(bool aBootRecoveryHDFlag)
+{
+#if DEBUG
+	printf("aBootRecoveryHDFlag: %s\n", aBootRecoveryHDFlag ? "true" : "false");
+	sleep(1);
+#else
+	setVideoMode(GRAPHICS_MODE);
+#endif
+
+	uint32_t backGroundColor = 0xbfbfbf;
+
+	char filename[60] = "";
+	char targetLogoName[30] = "appleLogo_apple";
+
+	// bootArgs->flags |= kBootArgsFlagBlack is set by boot.efi (EFI var 'BlackMode')
+	if (bootArgs->flags & kBootArgsFlagBlackTheme) // kBootArgsFlagBlack)
+	{
+		backGroundColor = 0x030000;
+#if DEBUG
+		printf("Black mode active!\n");
+		sleep(1);
+#endif
+	}
+	else
+	{
+		sprintf(targetLogoName, "%s%s", targetLogoName, "_gray");
+#if DEBUG
+		printf("Gray mode active!\n");
+		sleep(1);
+#endif
+	}
+
+	// bootArgs->flags |= kBootArgsFlagHiDPI is set by boot.efi (EFI var 'UIScale')
+	sprintf(targetLogoName, "%s%s.png", targetLogoName, (bootArgs->flags & kBootArgsFlagHiDPI) ? "@2x" : "");
+#if DEBUG
+	printf("targetLogoName: %s\n", targetLogoName);
+	sleep(1);
+#endif
+	setBackgroundColor(backGroundColor);
+	
+	void *imageLoadBuffer = (void *)kLoadAddr;
+
+	sprintf(filename, "%s%s", (aBootRecoveryHDFlag) ? "/com.apple.Boot.P" : "", "/usr/standalone/i386/EfiLoginUI/appleLogo.efires");
+
+	int EFIResourceFile = open(filename, 0);
+	
+	if (EFIResourceFile >= 0)
+	{
+		int filesize = file_size(EFIResourceFile);
+		
+		if (read(EFIResourceFile, (char *) kLoadAddr, filesize) == filesize)
+		{
+			EFIRES_HEADER * header = (EFIRES_HEADER *) imageLoadBuffer;
+#if DEBUG
+			printf("\nheader->revision..: %d\n", header->revision);
+			printf("header->imageCount: %d\n", header->imageCount);
+#endif
+			int pos = sizeof(header);
+
+			for (int index = 0; index < header->imageCount; index++)
+			{
+				EFIRES_IMAGE_HEADER * imageHeader = (EFIRES_IMAGE_HEADER *) (imageLoadBuffer + pos);
+#if DEBUG
+				printf("imageHeader->filename.: %s\n", imageHeader->filename);
+				printf("imageHeader->offset...: %d\n", imageHeader->offset);
+				printf("imageHeader->imageSize: %d\n", imageHeader->imageSize);
+				sleep(2);
+#endif
+				if (strncmp((char *)imageHeader->filename, targetLogoName, strlen(targetLogoName)) == 0)
+				{
+					PNG_info_t *info = PNG_decode((imageLoadBuffer + imageHeader->offset), imageHeader->imageSize);
+#if DEBUG
+					printf("Apple logo image found!\n");
+					printf("Image width...........: %d\n", info->width);
+					printf("Image height..........: %d\n", info->height);
+					sleep(3);
+#endif
+					uint8_t *bootImage = malloc((info->width * 4) * info->height);
+					memcpy(bootImage, info->image->data, ((info->width * 4) * info->height));
+	
+					uint16_t x = (VIDEO(width) - MIN(info->width, VIDEO(width)) ) / 2;
+					uint16_t y = (VIDEO(height) - MIN(info->height, VIDEO(height)) ) / 2;
+	
+					blendImage(x, y, info->width, info->height, bootImage);
+					png_alloc_free_all();
+
+					free(bootImage);
+#if INTEL_VGA_REG_DUMP
+					setVideoMode(VGA_TEXT_MODE);
+#endif
+					// extern void vga(void);
+					// vga();
+
+					return;
+				}
+				else
+				{
+					pos += sizeof(EFIRES_IMAGE_HEADER);
+				}
+			}
+		}
+
+		close(EFIResourceFile);
+	}
+#if DEBUG
+	else
+	{
+		setVideoMode(VGA_TEXT_MODE);
+		error("showBootLogo(Error)");
+	}
+#endif
+
+}
+
+#else
+
 
 //==============================================================================
 
@@ -68,7 +248,7 @@ int convertImage(unsigned short width, unsigned short height, const unsigned cha
 
 			for (; index < size; index++)
 			{
-				img32[index] = lookUpCLUTIndex(imageData[index], depth);
+				img32[index] = lookUpCLUTIndex(imageData[index]);
 			}
 
 			img = (unsigned char *)img32;
@@ -81,46 +261,9 @@ int convertImage(unsigned short width, unsigned short height, const unsigned cha
 }
 
 
-//==============================================================================
+/*==============================================================================
 
-void * stosl(void * dst, long val, long len)
-{
-	asm volatile ("rep; stosl"
-				  : "=c" (len), "=D" (dst)
-				  : "0" (len), "1" (dst), "a" (val)
-				  : "memory" );
-
-	return dst;
-}
-
-
-//==============================================================================
-
-void drawColorRectangle(unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char colorIndex)
-{
-	long color = lookUpCLUTIndex(colorIndex, VIDEO(depth));
-	long pixelBytes = VIDEO(depth) / 8;
-
-	char * vram  = (char *) VIDEO(baseAddr) + VIDEO(rowBytes) * y + pixelBytes * x;
-
-	width = MIN(width, VIDEO(width) - x);
-	height = MIN(height, VIDEO(height) - y);
-
-	int rem = (pixelBytes * width) % 4;	
-	int length = pixelBytes * width / 4;
-
-	while (height--)
-	{
-		bcopy(&color, vram, rem);
-		stosl(vram + rem, color, length);
-		vram += VIDEO(rowBytes);
-	}
-}
-
-
-//==============================================================================
-
-void drawDataRectangle(unsigned short  x, unsigned short  y, unsigned short width, unsigned short  height, unsigned char * data)
+void drawDataRectangle(unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char * data)
 {
 	unsigned short drawWidth;
 
@@ -137,7 +280,7 @@ void drawDataRectangle(unsigned short  x, unsigned short  y, unsigned short widt
 		vram += VIDEO(rowBytes);
 		data += width * pixelBytes;
 	}
-}
+} */
 
 
 //==============================================================================
@@ -169,18 +312,15 @@ char * decodeRLE(const void * rleData, int rleBlocks, int outBytes)
 	return out;
 }
 
-
 //==============================================================================
 
-void showBootLogo()
+void showBootLogo(bool aBootRecoveryHDFlag)
 {
 	uint8_t *bootImageData = NULL;
 	uint8_t *appleBootLogo = (uint8_t *) decodeRLE(appleLogoRLE, 686, 16384); 
 
 	setVideoMode(GRAPHICS_MODE);
-
-	// Fill the background to 75% grey (same as BootX). 
-	drawColorRectangle(0, 0, VIDEO(width), VIDEO(height), 0x01);
+	setBackgroundColor(0xbfbfbf);
 
 	convertImage(APPLE_LOGO_WIDTH, APPLE_LOGO_HEIGHT, appleBootLogo, &bootImageData);
 
@@ -189,3 +329,5 @@ void showBootLogo()
 	free(bootImageData);
 	free(appleBootLogo); 
 }
+
+#endif
diff --git a/i386/boot2/bootlogo.h b/i386/boot2/bootlogo.h
index fbf18d4..0701596 100755
--- a/i386/boot2/bootlogo.h
+++ b/i386/boot2/bootlogo.h
@@ -5,7 +5,41 @@
 #define VIDEO(x) (bootArgs->Video.v_ ## x)
 
 
-const unsigned char appleLogoRLE[] =
+#if (MAKE_TARGET_OS == YOSEMITE)
+
+typedef struct
+{
+	uint16_t	revision;
+	uint16_t	imageCount;
+} __attribute__((packed)) EFIRES_HEADER;
+
+typedef struct
+{
+	char		filename[64];
+	uint32_t	offset;
+	uint32_t	imageSize;
+} __attribute__((packed)) EFIRES_IMAGE_HEADER;
+
+typedef struct
+{
+	char		signature[8];
+	uint32_t	length;
+	char		chunkType[4];
+	uint32_t	width;
+	uint32_t	height;
+	uint8_t		bitDepth;
+	uint8_t		colorType;
+	uint8_t		compressionMethod;
+	uint8_t		filterMethod;
+	uint8_t		interlaceMethod;
+	uint32_t	checksum;
+} __attribute__((packed)) IMAGE_CHUNK_HEADER;
+
+extern void blendImage(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t *data);
+
+#else
+
+const unsigned char appleLogoRLE[1372] =
 {
     0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0x50, 0x01, 0x01, 0x02, 0x01, 0x17,
     0x01, 0x34, 0x01, 0x47, 0x03, 0x50, 0x01, 0x13, 0x76, 0x01, 0x01, 0x03,
@@ -123,3 +157,4 @@ const unsigned char appleLogoRLE[] =
 	0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xff, 0x01,
 	0xff, 0x01, 0xb3, 0x01
 };
+#endif
diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index 75860b8..5df6cbc 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -199,14 +199,14 @@ long loadDrivers(char * dirSpec)
 
 		if ((gKextLoadStatus & 1) == 0)
 		{
-#if (MAKE_TARGET_OS == MAVERICKS)
+#if ((MAKE_TARGET_OS & MAVERICKS) == MAVERICKS) // Mavericks and Yosemite specifics.
 			_DRIVERS_DEBUG_DUMP("\nCalling loadKexts(\"/Library/Extensions\");\n");
 
-			// For Mavericks we first load the signed kexts.
+			/* For Mavericks we first load the signed kexts.
 			if (loadKexts("/Library/Extensions", 0) == EFI_SUCCESS)
 			{
 				_DRIVERS_DEBUG_DUMP("loadKexts(1) OK.\n");
-			}
+			} */
 #endif
 			_DRIVERS_DEBUG_DUMP("\nCalling loadKexts(\"/System/Library/Extensions\");\n");
 			// System kexts
@@ -309,7 +309,7 @@ static int loadMultiKext(char * path)
 
 		// Add the MKext to the memory map.
 		sprintf(segName, "DriversPackage-%lx", driversAddr);
-		AllocateMemoryRange(segName, driversAddr, driversLength, kBootDriverTypeMKEXT);
+		AllocateMemoryRange(segName, driversAddr, driversLength);
 
 		_DRIVERS_DEBUG_DUMP("loadMultiKext(Success : 0) @ 0x%08x\n", driversAddr);
 
@@ -355,12 +355,12 @@ static int loadKexts(char * targetFolder, bool isPluginRun)
 			{
 				sprintf(gPlatform.KextFileName, "%s/%s", targetFolder, dirEntryName);
 
-#if DEBUG_DRIVERS
+// #if DEBUG_DRIVERS
 				if (strlen(gPlatform.KextFileName) >= MAX_KEXT_PATH_LENGTH)
 				{
 					stop("Error: gPlatform.KextFileName >= %d chars. Change MAX_KEXT_PATH_LENGTH!", MAX_KEXT_PATH_LENGTH);
 				}
-#endif
+// #endif
 				// Determine bundle type.
 				isBundleType2 = (GetFileInfo(gPlatform.KextFileName, "Contents", &dirEntryFlags, &dirEntryTime) == 0);
 
@@ -372,12 +372,12 @@ static int loadKexts(char * targetFolder, bool isPluginRun)
 					// Setup plug-ins path.
 					sprintf(gPlatform.KextFileSpec, "%s/%sPlugIns", gPlatform.KextFileName, (isBundleType2) ? "Contents/" : "");
 
-#if DEBUG_DRIVERS
+// #if DEBUG_DRIVERS
 					if (strlen(gPlatform.KextFileSpec) >= MAX_KEXT_PATH_LENGTH)
 					{
 						stop("Error: gPlatform.KextFileSpec >= %d chars. Change MAX_KEXT_PATH_LENGTH!", MAX_KEXT_PATH_LENGTH);
 					}
-#endif
+// #endif
 					_DRIVERS_DEBUG_DUMP("R");
 
 					// Recursive call for kexts in the PlugIns folder.
@@ -398,9 +398,9 @@ static int loadPlist(char * targetFolder, bool isBundleType2)
     ModulePtr module;
     TagPtr    personalities;
 
-    char * plistBuffer = 0;
-    char * tmpExecutablePath = 0;
-    char * tmpBundlePath = 0;
+    char * plistBuffer			= NULL;
+    char * tmpExecutablePath	= NULL;
+    char * tmpBundlePath		= NULL;
 
     long plistLength, bundlePathLength, result = -1;
 
@@ -452,16 +452,20 @@ static int loadPlist(char * targetFolder, bool isBundleType2)
 
 			if (plistLength > 0)
 			{
+				_DRIVERS_DEBUG_DUMP("p");
+
 				plistLength += 1;
 				plistBuffer = malloc(plistLength);
 
 				if (plistBuffer)
 				{
+					_DRIVERS_DEBUG_DUMP("1");
 					strlcpy(plistBuffer, (char *)kLoadAddr, plistLength);
 
 					// parseXML returns 0 on success so we check that here.
 					if (parseXML(plistBuffer, &module, &personalities) == 0)
 					{
+						_DRIVERS_DEBUG_DUMP("2");
 						// Allocate memory for the driver path and the plist.
 						module->executablePath = tmpExecutablePath;
 						module->bundlePath = tmpBundlePath;
@@ -470,6 +474,7 @@ static int loadPlist(char * targetFolder, bool isBundleType2)
 
 						if (module->plistAddr)
 						{
+							_DRIVERS_DEBUG_DUMP("3");
 							// Tell free() to take no action for these two (by passing 0 as argument).
 							tmpBundlePath = tmpExecutablePath = 0;
 
@@ -523,6 +528,7 @@ static int loadPlist(char * targetFolder, bool isBundleType2)
 			// Free on failure only.
 			free(tmpBundlePath);
 		}
+		
 		// Free on failure only.
 		free(tmpExecutablePath);
 	}
@@ -555,12 +561,12 @@ static long loadMatchedModules(void)
                 fileName = prop->string;
 
                 sprintf(gPlatform.KextFileSpec, "%s%s", module->executablePath, fileName);
-#if DEBUG_DRIVERS
+// #if DEBUG_DRIVERS
 				if (strlen(gPlatform.KextFileSpec) >= MAX_KEXT_PATH_LENGTH)
 				{
 					stop("Error: gPlatform.KextFileSpec >= %d chars. Change MAX_KEXT_PATH_LENGTH!", MAX_KEXT_PATH_LENGTH);
 				}
-#endif
+// #endif
                 length = LoadThinFatFile(gPlatform.KextFileSpec, &executableAddr);
 
 				if (length == 0)
@@ -616,8 +622,8 @@ static long loadMatchedModules(void)
                 strcpy(driver->bundlePathAddr, module->bundlePath);
 
                 // Add an entry to the memory map.
-                sprintf(segName, "Driver-%lx", (unsigned long)driver);
-                AllocateMemoryRange(segName, driverAddr, driverLength, kBootDriverTypeKEXT);
+				sprintf(segName, "Driver-%lx", (unsigned long)driver);
+				AllocateMemoryRange(segName, driverAddr, driverLength);
             }
         }
         module = module->nextModule;
@@ -743,17 +749,21 @@ const char * gRequiredKexts[] =
 
 static bool isLoadableInSafeBoot(char * OSBundleRequired)
 {
-	if (gBootMode == kBootModeNormal)
+//	if (gBootMode == kBootModeNormal)
+	if (gBootMode == kBootModeSafe)
 	{
 		return (strcmp(OSBundleRequired, kOSBundleRequiredSafeBoot) != 0);
+		// return (strcmp(OSBundleRequired, kOSBundleRequiredRoot) != 0);
 	}
-	else if (gBootMode == kBootModeSafe)
+//	else if (gBootMode == kBootModeSafe)
+	else
 	{
 		if (strcmp(OSBundleRequired, kOSBundleRequiredRoot) == 0 ||
-			strcmp(OSBundleRequired, kOSBundleRequiredLocalRoot) == 0 ||
+			strcmp(OSBundleRequired, kOSBundleRequiredLocalRoot) == 0 / * ||
 			strcmp(OSBundleRequired, kOSBundleRequiredNetworkRoot) == 0 ||
 			strcmp(OSBundleRequired, kOSBundleRequiredSafeBoot)	== 0 ||
-			strcmp(OSBundleRequired, kOSBundleRequiredConsole))
+			strcmp(OSBundleRequired, kOSBundleRequiredConsole) * /
+			)
 		{
         
 			return true;
@@ -801,16 +811,59 @@ static long parseXML(char * buffer, ModulePtr * module, TagPtr * personalities)
 		return -1;
 	}
 
+	/* #define kAppleKernelExternalComponentKey	"AppleKernelExternalComponent"
+	#define kAppleSecurityExtensionKey	"AppleSecurityExtension"
+
+	TagPtr isKernelExternalComponent = XMLGetProperty(moduleDict, kAppleSecurityExtensionKey);
+	
+	if (isKernelExternalComponent->type == kTagTypeTrue)
+	{
+		XMLFreeTag(moduleDict);
+		//#if DEBUG_DRIVERS
+		printf("Dropping AppleKernelExternalComponent(1)\n");
+		sleep(1);
+		//#endif
+		return -2;
+	}
+
+	TagPtr isSecurityKext = XMLGetProperty(moduleDict, kAppleSecurityExtensionKey);
+
+	if (isSecurityKext->type == kTagTypeTrue)
+	{
+		XMLFreeTag(moduleDict);
+//#if DEBUG_DRIVERS
+		printf("Dropping AppleSecurityExtension\n");
+		sleep(1);
+//#endif
+		return -2;
+	}
+
+	#define	COM_APPLE_KEC "com.apple.kec."
+
+	TagPtr bundle_id = XMLGetProperty(moduleDict, kPropCFBundleIdentifier);
+	
+	if (strncmp(bundle_id, COM_APPLE_KEC, strlen(COM_APPLE_KEC)) == 0))
+	{
+//#if DEBUG_DRIVERS
+		printf("Dropping AppleKernelExternalComponent(2)\n");
+		sleep(1);
+//#endif
+		return -2;
+	} */
+
 	required = XMLGetProperty(moduleDict, kPropOSBundleRequired);
 
 	if ((required == 0) || (required->type != kTagTypeString) || !strcmp(required->string, "Safe Boot"))
+	// if ((required == 0) || (required->type != kTagTypeString) || !strcmp(required->string, "Root"))
 	// if ((required == 0) || (required->type != kTagTypeString) || !isLoadableInSafeBoot(required->string))
+	// if ( (required != NULL)  && (required->type == kTagTypeString) && !strcmp(required->string, "Safe Boot"))
 	{
 		XMLFreeTag(moduleDict);
 		return -2;
 	}
 
-	tmpModule = (ModulePtr)malloc(sizeof(Module));
+	// tmpModule = (ModulePtr)malloc(sizeof(Module));
+	tmpModule = malloc(sizeof(Module));
 
 	if (tmpModule == 0)
 	{
@@ -836,16 +889,14 @@ static long parseXML(char * buffer, ModulePtr * module, TagPtr * personalities)
 
 //==============================================================================
 
-long decodeKernel(void *binary, entry_t *rentry, char **raddr, int *rsize)
+long decodeKernel(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsize)
 {
 	// return DecodeMachO(binary, rentry, raddr, rsize);
-
-	void *buffer;
 	long ret;
 	unsigned long len;
 
-	u_int32_t uncompressedSize, size;
-	compressed_kernel_header * kernel_header = (compressed_kernel_header *) binary;
+	u_int32_t compressedSize, uncompressedSize, size = 0;
+	compressed_kernel_header * kernel_header = (compressed_kernel_header *) fileLoadBuffer;
 
 #if DEBUG_DRIVERS
 	printf("Kernel header data.\n");
@@ -858,12 +909,16 @@ long decodeKernel(void *binary, entry_t *rentry, char **raddr, int *rsize)
 	printf("platformName      : %s\n",		kernel_header->platformName);
 	printf("rootPath          : %s\n",		kernel_header->rootPath);
 	printf("Sleeping for 5 seconds...\n");
-	sleep(5);
 #endif
 
 	if (kernel_header->signature == OSSwapBigToHostConstInt32('comp'))
 	{
-		if (kernel_header->compressType != OSSwapBigToHostConstInt32('lzss'))
+		if (kernel_header->compressType != OSSwapBigToHostConstInt32('lzss')
+#if (MAKE_TARGET_OS == YOSEMITE)
+			&& kernel_header->compressType != OSSwapBigToHostConstInt32('lzvn')
+#endif
+			)
+
 		{
 			error("kernel compression is bad\n");
 			return -1;
@@ -880,40 +935,56 @@ long decodeKernel(void *binary, entry_t *rentry, char **raddr, int *rsize)
 			return -1;
 		}
 #endif
-
+		compressedSize = OSSwapBigToHostInt32(kernel_header->compressedSize);
 		uncompressedSize = OSSwapBigToHostInt32(kernel_header->uncompressedSize);
-		binary = buffer = malloc(uncompressedSize);
+		fileLoadBuffer = malloc(uncompressedSize);
 
-		size = decompressLZSS((u_int8_t *) binary, &kernel_header->data[0], OSSwapBigToHostInt32(kernel_header->compressedSize));
+#if (MAKE_TARGET_OS == YOSEMITE)
+		if (kernel_header->compressType == OSSwapBigToHostConstInt32('lzvn'))
+		{
+			void *tmpBuffer = malloc(uncompressedSize);
+			size = lzvn_decode(tmpBuffer, uncompressedSize, &kernel_header->data[0], compressedSize);
+			memcpy(fileLoadBuffer, tmpBuffer, uncompressedSize);
+			free(tmpBuffer);
+		} else
+#endif
+		if (kernel_header->compressType == OSSwapBigToHostConstInt32('lzss'))
+		{
+			size = decompressLZSS((u_int8_t *) fileLoadBuffer, &kernel_header->data[0], compressedSize);
+		}
 
 		if (uncompressedSize != size)
         {
-			error("Size mismatch from lzss: 0x08%x\n", size);
+			error("Size mismatch, is 0x%x but 0x%x is expected!\n", size, uncompressedSize);
 			return -1;
 		}
 
-		if (OSSwapBigToHostInt32(kernel_header->adler32) != localAdler32(binary, uncompressedSize))
+		if (OSSwapBigToHostInt32(kernel_header->adler32) != localAdler32(fileLoadBuffer, uncompressedSize))
 		{
-			printf("Adler mismatch\n");
+			printf("Adler mismatch, is 0x%x but 0x%x is expected\n", localAdler32(fileLoadBuffer, uncompressedSize));
 			return -1;
 		}
 	}
 
-	ret = ThinFatFile(&binary, &len);
+	ret = ThinFatFile(&fileLoadBuffer, &len);
 
 	if (ret == 0 && len == 0 && gArchCPUType == CPU_TYPE_X86_64)
 	{
 		gArchCPUType = CPU_TYPE_I386;
-		ret = ThinFatFile(&binary, &len);
+		ret = ThinFatFile(&fileLoadBuffer, &len);
 	}
 
-	ret = DecodeMachO(binary, rentry, raddr, rsize);
+	ret = DecodeMachO(fileLoadBuffer, rentry, raddr, rsize);
 
 	if (ret < 0 && gArchCPUType == CPU_TYPE_X86_64)
 	{
 		gArchCPUType = CPU_TYPE_I386;
-		ret = DecodeMachO(binary, rentry, raddr, rsize);
+		ret = DecodeMachO(fileLoadBuffer, rentry, raddr, rsize);
 	}
 
+#if DEBUG_DRIVERS
+	printf("decodeKernel(ret = %d)\n", ret);
+	sleep(5);
+#endif
 	return ret;
 }
diff --git a/i386/boot2/graphics.c b/i386/boot2/graphics.c
index bcc89bf..1e26c78 100755
--- a/i386/boot2/graphics.c
+++ b/i386/boot2/graphics.c
@@ -30,6 +30,7 @@
 #include "vbe.h"
 #include "bootstruct.h"
 
+
 //==============================================================================
 
 bool inGraphicsMode(void)
@@ -222,9 +223,8 @@ long setVESAGraphicsMode(unsigned short width, unsigned short height, unsigned c
 										 maColorModeBit | maModeIsSupportedBit | maGraphicsModeBit | maLinearFrameBufferAvailBit, 
 										 0, &minfo, &vesaVersion);
 #if DEBUG
-		printf("\nsetVESAGraphicsMode: %d\n%d\n%d\n%d\n%d\n%x\n%x\nPress a key...", mode, minfo.XResolution, 
+		printf("\nsetVESAGraphicsMode: %d\n%d\n%d\n%d\n%d\n%x\n%x\nSleeping for 25 seconds...", mode, minfo.XResolution,
 			   minfo.YResolution, minfo.BitsPerPixel, minfo.BytesPerScanline, minfo.PhysBasePtr_low, minfo.PhysBasePtr_high);
-		getc();
 #endif
 
 		if (mode == modeEndOfList)
@@ -247,13 +247,12 @@ long setVESAGraphicsMode(unsigned short width, unsigned short height, unsigned c
 		}
 
 		// Update bootArgs with the data provided by the selected VESA mode.
-		bootArgs->Video.v_display  = GRAPHICS_MODE;
-		bootArgs->Video.v_width    = minfo.XResolution; // 1920 or 1600
-		bootArgs->Video.v_height   = minfo.YResolution; // 1200 or 900
-		bootArgs->Video.v_depth    = minfo.BitsPerPixel; // 32
-		bootArgs->Video.v_rowBytes = minfo.BytesPerScanline; // 7680 or 6400
-
-		bootArgs->Video.v_baseAddr = VBEMakeUInt32(minfo.PhysBasePtr);
+		bootArgs->Video.v_display	= GRAPHICS_MODE;
+		bootArgs->Video.v_width		= minfo.XResolution;		/* 1920 or 1600 */
+		bootArgs->Video.v_height	= minfo.YResolution;		/* 1200 or 900 */
+		bootArgs->Video.v_depth		= minfo.BitsPerPixel;		/* 32 */
+		bootArgs->Video.v_rowBytes	= minfo.BytesPerScanline;	/* 7680 or 6400 */
+		bootArgs->Video.v_baseAddr	= VBEMakeUInt32(minfo.PhysBasePtr);
 	}
 	while (0);
 
@@ -346,7 +345,7 @@ void setVideoMode(int mode)
 	{
 		if ((status = initGraphicsMode()) == EFI_SUCCESS)
 		{
-			bootArgs->Video.v_display = (gVerboseMode) ? FB_TEXT_MODE : GRAPHICS_MODE;
+			bootArgs->Video.v_display = (gVerboseMode) ? /* 2 */ FB_TEXT_MODE : /* 1 */ GRAPHICS_MODE;
 		}
 	}
 
@@ -359,3 +358,63 @@ void setVideoMode(int mode)
 		bootArgs->Video.v_display = VGA_TEXT_MODE;
 	}
 }
+
+//==============================================================================
+
+#define MIN(x, y) ((x) < (y) ? (x) : (y))
+#define MAX(x, y) ((x) > (y) ? (x) : (y))
+
+#define VIDEO(x) (bootArgs->Video.v_ ## x)
+
+void blendImage(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t *data)
+{
+    uint8_t *vram = (uint8_t *) VIDEO(baseAddr) + VIDEO(rowBytes) * y + 4 * x;
+
+    uint16_t drawWidth = (MIN(width, VIDEO(width) - x) * 4);
+
+    height = MIN(height, VIDEO(height) - y);
+	width = (width * 4);
+
+    while (height--)
+	{
+		uint32_t s; uint32_t* d; // Source (img) and destination (bkgd) pixels
+		uint32_t a; // Alpha
+		uint32_t dstrb, dstg, srcrb, srcg, drb, dg, rb, g, tempB; // Intermediate variables
+		uint16_t pos = 0;
+
+		for (; pos < drawWidth; pos += 4)
+		{
+			// Fast pseudo-vector alpha blending, adapted from: http://www.stereopsis.com/doubleblend.html
+			s = *((uint32_t*) (data + pos));
+			d =   (uint32_t*) (vram + pos);
+
+			// Flip B and R in source
+			// TODO: use XCHG and inline assembly to do this in a faster, saner way
+			tempB = (s & 0xFF0000);                     // save B
+			s = (s & 0xFF00FFFF) | ((s & 0xFF) << 16);  // put R in B
+			s = (s & 0xFFFFFF00) | (tempB >> 16);       // put B in R
+		
+			a = (s >> 24) + 1;
+
+			dstrb = *d & 0xFF00FF;
+			dstg  = *d & 0xFF00;
+			srcrb =  s & 0xFF00FF;
+			srcg  =  s & 0xFF00;
+					
+			drb = srcrb - dstrb;
+			dg  =  srcg - dstg;
+			drb *= a;
+			dg *= a;
+			drb >>= 8;
+			dg  >>= 8;
+					
+			rb = (drb + dstrb) & 0xFF00FF;
+			g  = (dg  + dstg) & 0xFF00;
+					
+			*d = rb | g;
+		}
+
+        vram += VIDEO(rowBytes);
+        data += width;
+    }
+}
diff --git a/i386/boot2/picopng.c b/i386/boot2/picopng.c
new file mode 100644
index 0000000..733a7e2
--- /dev/null
+++ b/i386/boot2/picopng.c
@@ -0,0 +1,1796 @@
+// picoPNG version 20101224
+// Copyright (c) 2005-2010 Lode Vandevenne
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+//   1. The origin of this software must not be misrepresented; you must not
+//      claim that you wrote the original software. If you use this software
+//      in a product, an acknowledgment in the product documentation would be
+//      appreciated but is not required.
+//   2. Altered source versions must be plainly marked as such, and must not be
+//      misrepresented as being the original software.
+//   3. This notice may not be removed or altered from any source distribution.
+//
+// Note: Ported from CPP to C by kaitek.
+//
+
+#include <sys/types.h>
+#include "libsa.h"
+#include "picopng.h"
+
+
+/*************************************************************************************************/
+
+typedef struct png_alloc_node
+{
+	struct png_alloc_node *prev, *next;
+	void *addr;
+	size_t size;
+} png_alloc_node_t;
+
+png_alloc_node_t *png_alloc_head = NULL;
+png_alloc_node_t *png_alloc_tail = NULL;
+
+//==============================================================================
+
+png_alloc_node_t *png_alloc_find_node(void *addr)
+{
+	png_alloc_node_t *node;
+
+	for (node = png_alloc_head; node; node = node->next)
+	{
+		if (node->addr == addr)
+		{
+			break;
+		}
+	}
+
+	return node;
+}
+
+
+//==============================================================================
+
+void png_alloc_add_node(void *addr, size_t size)
+{
+	png_alloc_node_t *node;
+
+	if (png_alloc_find_node(addr))
+	{
+		return;
+	}
+
+	node = malloc(sizeof(png_alloc_node_t));
+	node->addr = addr;
+	node->size = size;
+	node->prev = png_alloc_tail;
+	node->next = NULL;
+	png_alloc_tail = node;
+
+	if (node->prev)
+	{
+		node->prev->next = node;
+	}
+
+	if (!png_alloc_head)
+	{
+		png_alloc_head = node;
+	}
+}
+
+
+//==============================================================================
+
+void png_alloc_remove_node(png_alloc_node_t *node)
+{
+	if (node->prev)
+	{
+		node->prev->next = node->next;
+	}
+
+	if (node->next)
+	{
+		node->next->prev = node->prev;
+	}
+
+	if (node == png_alloc_head)
+	{
+		png_alloc_head = node->next;
+	}
+
+	if (node == png_alloc_tail)
+	{
+		png_alloc_tail = node->prev;
+	}
+
+	node->prev = node->next = node->addr = NULL;
+	free(node);
+}
+
+
+//==============================================================================
+
+void *png_alloc_malloc(size_t size)
+{
+	void *addr = malloc(size);
+	png_alloc_add_node(addr, size);
+
+	return addr;
+}
+
+
+//==============================================================================
+
+void *png_alloc_realloc(void *addr, size_t size)
+{
+	void *new_addr;
+
+	if (!addr)
+	{
+		return png_alloc_malloc(size);
+	}
+
+	new_addr = realloc(addr, size);
+
+	if (new_addr != addr)
+	{
+		png_alloc_node_t *old_node;
+		old_node = png_alloc_find_node(addr);
+		png_alloc_remove_node(old_node);
+		png_alloc_add_node(new_addr, size);
+	}
+
+	return new_addr;
+}
+
+
+//==============================================================================
+
+void png_alloc_free(void *addr)
+{
+	png_alloc_node_t *node = png_alloc_find_node(addr);
+
+	if (!node)
+	{
+		return;
+	}
+
+	png_alloc_remove_node(node);
+	free(addr);
+}
+
+
+//==============================================================================
+
+void png_alloc_free_all()
+{
+	while (png_alloc_tail)
+	{
+		void *addr = png_alloc_tail->addr;
+		png_alloc_remove_node(png_alloc_tail);
+		free(addr);
+	}
+}
+
+
+//==============================================================================
+
+uint32_t vector32_resize(vector32_t *p, size_t size)
+{
+	/*
+	 * returns 1 if success, 0 if failure ==> nothing done
+	 */
+	if (size * sizeof(uint32_t) > p->allocsize)
+	{
+		size_t newsize = size * sizeof(uint32_t) * 2;
+		void *data = png_alloc_realloc(p->data, newsize);
+
+		if (data)
+		{
+			p->allocsize = newsize;
+			p->data = (uint32_t *) data;
+			p->size = size;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	else
+	{
+		p->size = size;
+	}
+
+	return 1;
+}
+
+
+//==============================================================================
+
+uint32_t vector32_resizev(vector32_t *p, size_t size, uint32_t value)
+{
+	/*
+	 * resize and give all new elements the value
+	 */
+	size_t oldsize = p->size, i;
+
+	if (!vector32_resize(p, size))
+	{
+		return 0;
+	}
+
+	for (i = oldsize; i < size; i++)
+	{
+		p->data[i] = value;
+	}
+
+	return 1;
+}
+
+
+//==============================================================================
+
+vector32_t *vector32_new(size_t size, uint32_t value)
+{
+	vector32_t *p = png_alloc_malloc(sizeof(vector32_t));
+
+	p->data = NULL;
+	p->size = p->allocsize = 0;
+
+	if (size && !vector32_resizev(p, size, value))
+	{
+		return NULL;
+	}
+
+	return p;
+}
+
+
+//==============================================================================
+
+uint32_t vector8_resize(vector8_t *p, size_t size)
+{
+	/*
+	 * returns 1 if success, 0 if failure ==> nothing done
+	 * xxx: the use of sizeof uint32_t here seems like a bug (this descends from the lodepng vector
+	 * compatibility functions which do the same). without this there is corruption in certain cases,
+	 * so this was probably done to cover up allocation bug(s) in the original picopng code!
+	 */
+	if (size * sizeof(uint32_t) > p->allocsize)
+	{
+		size_t newsize = size * sizeof(uint32_t) * 2;
+		void *data = png_alloc_realloc(p->data, newsize);
+
+		if (data)
+		{
+			p->allocsize = newsize;
+			p->data = (uint8_t *) data;
+			p->size = size;
+		}
+		else
+		{
+			return 0; // error: not enough memory
+		}
+	}
+	else
+	{
+		p->size = size;
+	}
+
+	return 1;
+}
+
+
+/*==============================================================================
+ *
+ * resize and give all new elements the value
+ */
+
+uint32_t vector8_resizev(vector8_t *p, size_t size, uint8_t value)
+{
+	size_t oldsize = p->size, i;
+
+	if (!vector8_resize(p, size))
+	{
+		return 0;
+	}
+
+	for (i = oldsize; i < size; i++)
+	{
+		p->data[i] = value;
+	}
+
+	return 1;
+}
+
+
+//==============================================================================
+
+vector8_t *vector8_new(size_t size, uint8_t value)
+{
+	vector8_t *p = png_alloc_malloc(sizeof(vector8_t));
+
+	p->data = NULL;
+	p->size = p->allocsize = 0;
+
+	if (size && !vector8_resizev(p, size, value))
+	{
+		return NULL;
+	}
+
+	return p;
+}
+
+
+//==============================================================================
+
+vector8_t *vector8_copy(vector8_t *p)
+{
+	vector8_t *q = vector8_new(p->size, 0);
+	uint32_t n;
+
+	for (n = 0; n < q->size; n++)
+	{
+		q->data[n] = p->data[n];
+	}
+
+	return q;
+}
+
+/*************************************************************************************************/
+
+const uint32_t LENBASE[29]		= { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258 };
+const uint32_t LENEXTRA[29]		= { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0 };
+const uint32_t DISTBASE[30]		= { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 };
+const uint32_t DISTEXTRA[30]	= { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13 };
+const uint32_t CLCL[19]			= { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; // Code Length Code Lengths
+
+/*************************************************************************************************/
+
+typedef struct
+{
+	// 2D representation of a huffman tree: The one dimension is "0" or "1", the other contains all
+	// nodes and leaves of the tree.
+	vector32_t *tree2d;
+} HuffmanTree;
+
+
+//==============================================================================
+
+HuffmanTree *HuffmanTree_new()
+{
+	HuffmanTree *tree = png_alloc_malloc(sizeof(HuffmanTree));
+	tree->tree2d = NULL;
+
+	return tree;
+}
+
+
+//==============================================================================
+
+int HuffmanTree_makeFromLengths(HuffmanTree *tree, const vector32_t *bitlen, uint32_t maxbitlen)
+{	// make tree given the lengths
+	uint32_t bits, n, i;
+	uint32_t numcodes = (uint32_t) bitlen->size, treepos = 0, nodefilled = 0;
+	vector32_t *tree1d, *blcount, *nextcode;
+	tree1d = vector32_new(numcodes, 0);
+	blcount = vector32_new(maxbitlen + 1, 0);
+	nextcode = vector32_new(maxbitlen + 1, 0);
+
+	for (bits = 0; bits < numcodes; bits++)
+	{
+		blcount->data[bitlen->data[bits]]++; // count number of instances of each code length
+	}
+
+	for (bits = 1; bits <= maxbitlen; bits++)
+	{
+		nextcode->data[bits] = (nextcode->data[bits - 1] + blcount->data[bits - 1]) << 1;
+	}
+
+	for (n = 0; n < numcodes; n++)
+	{
+		if (bitlen->data[n] != 0)
+		{
+			tree1d->data[n] = nextcode->data[bitlen->data[n]]++; // generate all the codes
+		}
+	}
+
+	// 0x7fff here means the tree2d isn't filled there yet
+	vector32_t *tree2d = vector32_new(numcodes * 2, 0x7fff);
+	tree->tree2d = tree2d;
+
+	for (n = 0; n < numcodes; n++) // the codes
+	{
+		for (i = 0; i < bitlen->data[n]; i++) // the bits for this code
+		{
+			uint32_t bit = (tree1d->data[n] >> (bitlen->data[n] - i - 1)) & 1;
+
+			if (treepos > numcodes - 2)
+			{
+				return 55;
+			}
+			if (tree2d->data[2 * treepos + bit] == 0x7fff) // not yet filled in
+			{
+				if (i + 1 == bitlen->data[n]) // last bit
+				{
+					tree2d->data[2 * treepos + bit] = n;
+					treepos = 0;
+				}
+				else // addresses are encoded as values > numcodes
+				{
+					tree2d->data[2 * treepos + bit] = ++nodefilled + numcodes;
+					treepos = nodefilled;
+				}
+			}
+			else // subtract numcodes from address to get address value
+			{
+				treepos = tree2d->data[2 * treepos + bit] - numcodes;
+			}
+		}
+	}
+
+	return 0;
+}
+
+
+//==============================================================================
+
+int HuffmanTree_decode(const HuffmanTree *tree, bool *decoded, uint32_t *result, size_t *treepos, uint32_t bit)
+{	// Decodes a symbol from the tree
+	const vector32_t *tree2d = tree->tree2d;
+	uint32_t numcodes = (uint32_t) tree2d->size / 2;
+
+	if (*treepos >= numcodes)
+	{
+		return 11; // error: you appeared outside the codetree
+	}
+
+	*result = tree2d->data[2 * (*treepos) + bit];
+	*decoded = (*result < numcodes);
+	*treepos = *decoded ? 0 : *result - numcodes;
+
+	return 0;
+}
+
+
+//==============================================================================
+
+int Inflator_error;
+
+uint32_t Zlib_readBitFromStream(size_t *bitp, const uint8_t *bits)
+{
+	uint32_t result = (bits[*bitp >> 3] >> (*bitp & 0x7)) & 1;
+	(*bitp)++;
+
+	return result;
+}
+
+
+//==============================================================================
+
+uint32_t Zlib_readBitsFromStream(size_t *bitp, const uint8_t *bits, size_t nbits)
+{
+	uint32_t i, result = 0;
+
+	for (i = 0; i < nbits; i++)
+	{
+		result += (Zlib_readBitFromStream(bitp, bits)) << i;
+	}
+
+	return result;
+}
+
+
+//==============================================================================
+
+void Inflator_generateFixedTrees(HuffmanTree *tree, HuffmanTree *treeD)
+{	// get the tree of a deflated block with fixed tree
+	size_t i;
+	vector32_t *bitlen, *bitlenD;
+	bitlen = vector32_new(288, 8);
+	bitlenD = vector32_new(32, 5);
+
+	for (i = 144; i <= 255; i++)
+	{
+		bitlen->data[i] = 9;
+	}
+
+	for (i = 256; i <= 279; i++)
+	{
+		bitlen->data[i] = 7;
+	}
+
+	HuffmanTree_makeFromLengths(tree, bitlen, 15);
+	HuffmanTree_makeFromLengths(treeD, bitlenD, 15);
+}
+
+
+//==============================================================================
+
+uint32_t Inflator_huffmanDecodeSymbol(const uint8_t *in, size_t *bp, const HuffmanTree *codetree, size_t inlength)
+{	// decode a single symbol from given list of bits with given code tree. returns the symbol
+	bool decoded = false;
+	uint32_t ct = 0;
+	size_t treepos = 0;
+
+	for (;;)
+	{
+		if ((*bp & 0x07) == 0 && (*bp >> 3) > inlength)
+		{
+			Inflator_error = 10; // error: end reached without endcode
+
+			return 0;
+		}
+
+		Inflator_error = HuffmanTree_decode(codetree, &decoded, &ct, &treepos, Zlib_readBitFromStream(bp, in));
+
+		if (Inflator_error)
+		{
+			return 0; // stop, an error happened
+		}
+
+		if (decoded)
+		{
+			return ct;
+		}
+	}
+}
+
+
+//==============================================================================
+
+void Inflator_getTreeInflateDynamic(HuffmanTree *tree, HuffmanTree *treeD, const uint8_t *in, size_t *bp, size_t inlength)
+{	// get the tree of a deflated block with dynamic tree, the tree itself is also Huffman
+	// compressed with a known tree
+	size_t i, n;
+	HuffmanTree *codelengthcodetree = HuffmanTree_new(); // the code tree for code length codes
+	vector32_t *bitlen, *bitlenD;
+	bitlen = vector32_new(288, 0);
+	bitlenD = vector32_new(32, 0);
+
+	if (*bp >> 3 >= inlength - 2)
+	{
+		Inflator_error = 49; // the bit pointer is or will go past the memory
+
+		return;
+	}
+
+	size_t HLIT = Zlib_readBitsFromStream(bp, in, 5) + 257;	// number of literal/length codes + 257
+	size_t HDIST = Zlib_readBitsFromStream(bp, in, 5) + 1;	// number of dist codes + 1
+	size_t HCLEN = Zlib_readBitsFromStream(bp, in, 4) + 4;	// number of code length codes + 4
+	vector32_t *codelengthcode; // lengths of tree to decode the lengths of the dynamic tree
+	codelengthcode = vector32_new(19, 0);
+
+	for (i = 0; i < 19; i++)
+	{
+		codelengthcode->data[CLCL[i]] = (i < HCLEN) ? Zlib_readBitsFromStream(bp, in, 3) : 0;
+	}
+
+	Inflator_error = HuffmanTree_makeFromLengths(codelengthcodetree, codelengthcode, 7);
+
+	if (Inflator_error)
+	{
+		return;
+	}
+
+	size_t replength;
+
+	for (i = 0; i < HLIT + HDIST; )
+	{
+		uint32_t code = Inflator_huffmanDecodeSymbol(in, bp, codelengthcodetree, inlength);
+
+		if (Inflator_error)
+		{
+			return;
+		}
+
+		if (code <= 15) // a length code
+		{
+			if (i < HLIT)
+			{
+				bitlen->data[i++] = code;
+			}
+			else
+			{
+				bitlenD->data[i++ - HLIT] = code;
+			}
+		}
+		else if (code == 16) // repeat previous
+		{
+			if (*bp >> 3 >= inlength)
+			{
+				Inflator_error = 50; // error, bit pointer jumps past memory
+
+				return;
+			}
+
+			replength = 3 + Zlib_readBitsFromStream(bp, in, 2);
+			uint32_t value; // set value to the previous code
+
+			if ((i - 1) < HLIT)
+			{
+				value = bitlen->data[i - 1];
+			}
+			else
+			{
+				value = bitlenD->data[i - HLIT - 1];
+			}
+
+			for (n = 0; n < replength; n++) // repeat this value in the next lengths
+			{
+				if (i >= HLIT + HDIST)
+				{
+					Inflator_error = 13; // error: i is larger than the amount of codes
+
+					return;
+				}
+
+				if (i < HLIT)
+				{
+					bitlen->data[i++] = value;
+				}
+				else
+				{
+					bitlenD->data[i++ - HLIT] = value;
+				}
+			}
+		}
+		else if (code == 17) // repeat "0" 3-10 times
+		{
+			if (*bp >> 3 >= inlength)
+			{
+				Inflator_error = 50; // error, bit pointer jumps past memory
+
+				return;
+			}
+
+			replength = 3 + Zlib_readBitsFromStream(bp, in, 3);
+
+			for (n = 0; n < replength; n++) // repeat this value in the next lengths
+			{
+				if (i >= HLIT + HDIST) {
+					Inflator_error = 14; // error: i is larger than the amount of codes
+
+					return;
+				}
+
+				if (i < HLIT)
+				{
+					bitlen->data[i++] = 0;
+				}
+				else
+				{
+					bitlenD->data[i++ - HLIT] = 0;
+				}
+			}
+		}
+		else if (code == 18) // repeat "0" 11-138 times
+		{
+			if (*bp >> 3 >= inlength)
+			{
+				Inflator_error = 50; // error, bit pointer jumps past memory
+
+				return;
+			}
+
+			replength = 11 + Zlib_readBitsFromStream(bp, in, 7);
+
+			for (n = 0; n < replength; n++) // repeat this value in the next lengths
+			{
+				if (i >= HLIT + HDIST)
+				{
+					Inflator_error = 15; // error: i is larger than the amount of codes
+
+					return;
+				}
+
+				if (i < HLIT)
+				{
+					bitlen->data[i++] = 0;
+				}
+				else
+				{
+					bitlenD->data[i++ - HLIT] = 0;
+				}
+			}
+		}
+		else
+		{
+			Inflator_error = 16; // error: an nonexitent code appeared. This can never happen.
+
+			return;
+		}
+	}
+
+	if (bitlen->data[256] == 0)
+	{
+		Inflator_error = 64; // the length of the end code 256 must be larger than 0
+		return;
+	}
+
+	// now we've finally got HLIT and HDIST, so generate the code trees, and the function is done
+	Inflator_error = HuffmanTree_makeFromLengths(tree, bitlen, 15);
+
+	if (Inflator_error)
+	{
+		return;
+	}
+
+	Inflator_error = HuffmanTree_makeFromLengths(treeD, bitlenD, 15);
+
+	if (Inflator_error)
+	{
+		return;
+	}
+}
+
+
+//==============================================================================
+
+void Inflator_inflateHuffmanBlock(vector8_t *out, const uint8_t *in, size_t *bp, size_t *pos, size_t inlength, uint32_t btype)
+{
+	HuffmanTree *codetree, *codetreeD; // the code tree for Huffman codes, dist codes
+	codetree = HuffmanTree_new();
+	codetreeD = HuffmanTree_new();
+
+	if (btype == 1)
+	{
+		Inflator_generateFixedTrees(codetree, codetreeD);
+	}
+	else if (btype == 2)
+	{
+		Inflator_getTreeInflateDynamic(codetree, codetreeD, in, bp, inlength);
+
+		if (Inflator_error)
+		{
+			return;
+		}
+	}
+	for (;;)
+	{
+		uint32_t code = Inflator_huffmanDecodeSymbol(in, bp, codetree, inlength);
+
+		if (Inflator_error)
+		{
+			return;
+		}
+
+		if (code == 256) // end code
+		{
+			return;
+		}
+		else if (code <= 255) // literal symbol
+		{
+			if (*pos >= out->size)
+			{
+				vector8_resize(out, (*pos + 1) * 2); // reserve more room
+			}
+
+			out->data[(*pos)++] = (uint8_t) code;
+		}
+		else if (code >= 257 && code <= 285) // length code
+		{
+			size_t length = LENBASE[code - 257], numextrabits = LENEXTRA[code - 257];
+
+			if ((*bp >> 3) >= inlength)
+			{
+				Inflator_error = 51; // error, bit pointer will jump past memory
+				return;
+			}
+
+			length += Zlib_readBitsFromStream(bp, in, numextrabits);
+			uint32_t codeD = Inflator_huffmanDecodeSymbol(in, bp, codetreeD, inlength);
+
+			if (Inflator_error)
+			{
+				return;
+			}
+
+			if (codeD > 29)
+			{
+				Inflator_error = 18; // error: invalid dist code (30-31 are never used)
+
+				return;
+			}
+
+			uint32_t dist = DISTBASE[codeD], numextrabitsD = DISTEXTRA[codeD];
+
+			if ((*bp >> 3) >= inlength)
+			{
+				Inflator_error = 51; // error, bit pointer will jump past memory
+
+				return;
+			}
+
+			dist += Zlib_readBitsFromStream(bp, in, numextrabitsD);
+			size_t start = *pos, back = start - dist; // backwards
+
+			if (*pos + length >= out->size)
+			{
+				vector8_resize(out, (*pos + length) * 2); // reserve more room
+			}
+
+			size_t i;
+
+			for (i = 0; i < length; i++)
+			{
+				out->data[(*pos)++] = out->data[back++];
+
+				if (back >= start)
+				{
+					back = start - dist;
+				}
+			}
+		}
+	}
+}
+
+
+#ifdef USE_ALL_1
+//==============================================================================
+
+void Inflator_inflateNoCompression(vector8_t *out, const uint8_t *in, size_t *bp, size_t *pos, size_t inlength)
+{
+	while ((*bp & 0x7) != 0)
+	{
+		(*bp)++; // go to first boundary of byte
+	}
+
+	size_t p = *bp / 8;
+
+	if (p >= inlength - 4)
+	{
+		Inflator_error = 52; // error, bit pointer will jump past memory
+
+		return;
+	}
+
+	uint32_t LEN = in[p] + 256 * in[p + 1];
+	uint32_t NLEN = in[p + 2] + 256 * in[p + 3];
+	p += 4;
+
+	if (LEN + NLEN != 65535)
+	{
+		Inflator_error = 21; // error: NLEN is not one's complement of LEN
+
+		return;
+	}
+
+	if (*pos + LEN >= out->size)
+	{
+		vector8_resize(out, *pos + LEN);
+	}
+
+	if (p + LEN > inlength)
+	{
+		Inflator_error = 23; // error: reading outside of in buffer
+
+		return;
+	}
+
+	uint32_t n;
+
+	for (n = 0; n < LEN; n++)
+	{
+		out->data[(*pos)++] = in[p++]; // read LEN bytes of literal data
+	}
+
+	*bp = p * 8;
+}
+#endif
+
+
+//==============================================================================
+
+void Inflator_inflate(vector8_t *out, const vector8_t *in, size_t inpos)
+{
+	size_t bp = 0, pos = 0; // bit pointer and byte pointer
+	Inflator_error = 0;
+	uint32_t BFINAL = 0;
+
+	while (!BFINAL && !Inflator_error)
+	{
+		if (bp >> 3 >= in->size)
+		{
+			Inflator_error = 52; // error, bit pointer will jump past memory
+
+			return;
+		}
+
+		BFINAL = Zlib_readBitFromStream(&bp, &in->data[inpos]);
+		uint32_t BTYPE = Zlib_readBitFromStream(&bp, &in->data[inpos]);
+		BTYPE += 2 * Zlib_readBitFromStream(&bp, &in->data[inpos]);
+
+/*		if (BTYPE == 3)
+		{
+			Inflator_error = 20; // error: invalid BTYPE
+
+			return;
+		}
+		else if (BTYPE == 0)
+		{
+			Inflator_inflateNoCompression(out, &in->data[inpos], &bp, &pos, in->size);
+		}
+		else
+		{*/
+			Inflator_inflateHuffmanBlock(out, &in->data[inpos], &bp, &pos, in->size, BTYPE);
+		//}
+	}
+
+	if (!Inflator_error)
+	{
+		vector8_resize(out, pos); // Only now we know the true size of out, resize it to that
+	}
+}
+
+
+#ifdef USE_ALL_1
+//==============================================================================
+
+int Zlib_decompress(vector8_t *out, const vector8_t *in) // returns error value
+{
+	if (in->size < 2)
+	{
+		return 53; // error, size of zlib data too small
+	}
+
+	if ((in->data[0] * 256 + in->data[1]) % 31 != 0)
+	{
+		// error: 256 * in->data[0] + in->data[1] must be a multiple of 31, the FCHECK value is
+		// supposed to be made that way
+		return 24;
+	}
+
+	uint32_t CM		= in->data[0] & 15;
+	uint32_t CINFO	= (in->data[0] >> 4) & 15;
+	uint32_t FDICT	= (in->data[1] >> 5) & 1;
+
+	if (CM != 8 || CINFO > 7)
+	{
+		// Error: only compression method 8: inflate with sliding window of 32k is supported by the PNG spec
+		return 25;
+	}
+
+	if (FDICT != 0)
+	{
+		// Error: the PNG specification states: "The additional flags shall not specify a preset dictionary."
+		return 26;
+	}
+
+	Inflator_inflate(out, in, 2);
+
+	return Inflator_error; // note: adler32 checksum was skipped and ignored
+}
+#endif
+
+
+//==============================================================================
+
+#define PNG_SIGNATURE	0x0a1a0a0d474e5089ull
+
+#define CHUNK_IHDR		0x52444849
+#define CHUNK_IDAT		0x54414449
+#define CHUNK_IEND		0x444e4549
+#define CHUNK_PLTE		0x45544c50
+#define CHUNK_tRNS		0x534e5274
+
+int PNG_error;
+
+
+#ifdef USE_ALL_1
+//==============================================================================
+
+uint32_t PNG_readBitFromReversedStream(size_t *bitp, const uint8_t *bits)
+{
+	uint32_t result = (bits[*bitp >> 3] >> (7 - (*bitp & 0x7))) & 1;
+	(*bitp)++;
+
+	return result;
+}
+
+
+//==============================================================================
+
+uint32_t PNG_readBitsFromReversedStream(size_t *bitp, const uint8_t *bits, uint32_t nbits)
+{
+	uint32_t i, result = 0;
+
+	for (i = nbits - 1; i < nbits; i--)
+	{
+		result += ((PNG_readBitFromReversedStream(bitp, bits)) << i);
+	}
+
+	return result;
+}
+
+
+//==============================================================================
+
+void PNG_setBitOfReversedStream(size_t *bitp, uint8_t *bits, uint32_t bit)
+{
+	bits[*bitp >> 3] |= (bit << (7 - (*bitp & 0x7)));
+	(*bitp)++;
+}
+#endif
+
+
+/* typedef struct Pixel32
+{
+    union
+	{
+        struct
+		{
+            uint8 b, g, r, a;
+        };
+        uint32 u;
+    };
+}; */
+
+//==============================================================================
+
+uint32_t PNG_read32bitInt(const uint8_t *buffer)
+{
+	return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
+}
+
+
+#ifdef USE_ALL_1
+//==============================================================================
+
+int PNG_checkColorValidity(uint32_t colorType, uint32_t bd) // return type is a LodePNG error code
+{
+	if ((colorType == 2 || colorType == 4 || colorType == 6))
+	{
+		if (!(bd == 8 || bd == 16))
+		{
+			return 37;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	else if (colorType == 0)
+	{
+		if (!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16))
+		{
+			return 37;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	else if (colorType == 3)
+	{
+		if (!(bd == 1 || bd == 2 || bd == 4 || bd == 8))
+		{
+			return 37;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	else
+	{
+		return 31; // nonexistent color type
+	}
+}
+
+
+//==============================================================================
+
+uint32_t PNG_getBpp(const PNG_info_t *info)
+{
+	uint32_t bitDepth = info->bitDepth;
+	uint32_t colorType = info->colorType;
+
+	if (colorType == 2)
+	{
+		return (3 * bitDepth);
+	}
+	else if (colorType >= 4)
+	{
+		return (colorType - 2) * bitDepth;
+	}
+	else
+	{
+		return bitDepth;
+	}
+}
+#endif
+
+
+//==============================================================================
+
+void PNG_readPngHeader(PNG_info_t *info, const uint8_t *in, size_t inlength)
+{
+	// read the information from the header and store it in the Info
+	if (inlength < 29)
+	{
+		PNG_error = 27; // error: the data length is smaller than the length of the header
+		return;
+	}
+
+	if (*(uint64_t *) in != PNG_SIGNATURE)
+	{
+		PNG_error = 28; // no PNG signature
+		return;
+	}
+
+	if (*(uint32_t *) &in[12] != CHUNK_IHDR)
+	{
+		PNG_error = 29; // error: it doesn't start with a IHDR chunk!
+		return;
+	}
+
+	info->width = PNG_read32bitInt(&in[16]);
+	info->height = PNG_read32bitInt(&in[20]);
+	info->bitDepth = in[24];
+	info->colorType = in[25];
+	info->compressionMethod = in[26];
+
+	if (in[26] != 0)
+	{
+		PNG_error = 32; // error: only compression method 0 is allowed in the specification
+		return;
+	}
+
+	info->filterMethod = in[27];
+
+	if (in[27] != 0)
+	{
+		PNG_error = 33; // error: only filter method 0 is allowed in the specification
+		return;
+	}
+
+	info->interlaceMethod = in[28];
+
+	if (in[28] > 1)
+	{
+		PNG_error = 34; // error: only interlace methods 0 and 1 exist in the specification
+		return;
+	}
+#ifdef USE_ALL_1
+	PNG_error = PNG_checkColorValidity(info->colorType, info->bitDepth);
+#endif
+}
+
+
+//==============================================================================
+
+int paethPredictor(int a, int b, int c) // Paeth predicter, used by PNG filter type 4
+{
+	int p = a + b - c;
+	int pa = p > a ? (p - a) : (a - p);
+	int pb = p > b ? (p - b) : (b - p);
+	int pc = p > c ? (p - c) : (c - p);
+
+	return (pa <= pb && pa <= pc) ? a : (pb <= pc ? b : c);
+}
+
+
+//==============================================================================
+
+// void PNG_unFilterScanline(uint8_t *recon, const uint8_t *scanline, const uint8_t *precon, size_t bytewidth, uint32_t filterType, size_t length)
+void PNG_unFilterScanline(uint8_t *recon, const uint8_t *scanline, const uint8_t *precon, size_t bytewidth, uint8_t filterType, size_t length)
+{
+	size_t i;
+
+	switch (filterType)
+	{
+		case 0:
+				for (i = 0; i < length; i++)
+				{
+					recon[i] = scanline[i];
+				}
+		break;
+
+		case 1: for (i = 0; i < bytewidth; i++)
+				{
+					recon[i] = scanline[i];
+				}
+
+				for (i = bytewidth; i < length; i++)
+				{
+					recon[i] = scanline[i] + recon[i - bytewidth];
+				}
+		break;
+
+		case 2: if (precon)
+				{
+					for (i = 0; i < length; i++)
+					{
+						recon[i] = scanline[i] + precon[i];
+					}
+				}
+				else
+				{
+					for (i = 0; i < length; i++)
+					{
+						recon[i] = scanline[i];
+					}
+				}
+		break;
+
+		case 3: if (precon)
+				{
+					for (i = 0; i < bytewidth; i++)
+					{
+						recon[i] = scanline[i] + precon[i] / 2;
+					}
+
+					for (i = bytewidth; i < length; i++)
+					{
+						recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) / 2);
+					}
+				}
+				else
+				{
+					for (i = 0; i < bytewidth; i++)
+					{
+						recon[i] = scanline[i];
+					}
+
+					for (i = bytewidth; i < length; i++)
+					{
+						recon[i] = scanline[i] + recon[i - bytewidth] / 2;
+					}
+				}
+		break;
+
+		case 4: if (precon)
+				{
+					for (i = 0; i < bytewidth; i++)
+					{
+						recon[i] = (uint8_t) (scanline[i] + paethPredictor(0, precon[i], 0));
+					}
+
+					for (i = bytewidth; i < length; i++)
+					{
+						recon[i] = (uint8_t) (scanline[i] + paethPredictor(recon[i - bytewidth], precon[i], precon[i - bytewidth]));
+					}
+				}
+				else
+				{
+					for (i = 0; i < bytewidth; i++)
+					{
+						recon[i] = scanline[i];
+					}
+
+					for (i = bytewidth; i < length; i++)
+					{
+						recon[i] = (uint8_t) (scanline[i] + paethPredictor(recon[i - bytewidth], 0, 0));
+					}
+				}
+		break;
+
+		default:	PNG_error = 36; // error: nonexistent filter type given
+					return;
+	}
+}
+
+#ifdef USE_ALL_1
+/*==============================================================================
+ * filter and reposition the pixels into the output when the image is Adam7 interlaced. This
+ * function can only do it after the full image is already decoded. The out buffer must have
+ * the correct allocated memory size already.
+ */
+
+void PNG_adam7Pass(uint8_t *out, uint8_t *linen, uint8_t *lineo, const uint8_t *in, uint32_t w,
+				   size_t passleft, size_t passtop, size_t spacex, size_t spacey, size_t passw, size_t passh, uint32_t bpp)
+{
+	if (passw)
+	{
+		size_t bytewidth = (bpp + 7) / 8, linelength = 1 + ((bpp * passw + 7) / 8);
+		uint32_t y = 0;
+
+		for (; y < passh; y++)
+		{
+			size_t i, b;
+			uint8_t filterType = in[y * linelength];
+			uint8_t *prevline = (y == 0) ? 0 : lineo;
+			PNG_unFilterScanline(linen, &in[y * linelength + 1], prevline, bytewidth, filterType, (w * bpp + 7) / 8);
+
+			if (!PNG_error)
+			{
+				if (bpp >= 8)
+				{
+					for (i = 0; i < passw; i++)
+					{
+						for (b = 0; b < bytewidth; b++) // b = current byte of this pixel
+						{
+							out[bytewidth * w * (passtop + spacey * y) + bytewidth * (passleft + spacex * i) + b] = linen[bytewidth * i + b];
+						}
+					}
+				}
+				else
+				{
+					for (i = 0; i < passw; i++)
+					{
+						size_t obp = bpp * w * (passtop + spacey * y) + bpp * (passleft + spacex * i);
+						size_t bp = i * bpp;
+
+						for (b = 0; b < bpp; b++)
+						{
+							PNG_setBitOfReversedStream(&obp, out, PNG_readBitFromReversedStream(&bp, linen));
+						}
+					}
+				}
+			}
+
+			uint8_t *temp = linen;
+			linen = lineo;
+			lineo = temp; // swap the two buffer pointers "line old" and "line new"
+		}
+	}
+}
+
+
+/*==============================================================================
+ * Converts any color type to 32-bit. 
+ * Returns a LodePNG error code
+ */
+
+int PNG_convert(const PNG_info_t *info, vector8_t *out, const uint8_t *in)
+{
+	size_t c, i;
+	uint32_t bitDepth, colorType;
+	bitDepth = info->bitDepth;
+	colorType = info->colorType;
+	size_t numpixels = info->width * info->height;
+	vector8_resize(out, numpixels * 4);
+	uint8_t *out_data = out->size ? out->data : 0;
+
+	size_t  bp = 0;
+	
+	if (bitDepth == 8 && colorType == 0) // Greyscale
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[i];
+			out_data[4 * i + 3] = (info->key_defined && (in[i] == info->key_r)) ? 0 : 255;
+		}
+	}
+	else if (bitDepth == 8 && colorType == 2) // RGB color
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			for (c = 0; c < 3; c++)
+			{
+				out_data[4 * i + c] = in[3 * i + c];
+			}
+
+			out_data[4 * i + 3] = (info->key_defined && (in[3 * i + 0] == info->key_r) && (in[3 * i + 1] == info->key_g) && (in[3 * i + 2] == info->key_b)) ? 0 : 255;
+		}
+	}
+	else if (bitDepth == 8 && colorType == 3) // indexed color (palette)
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			if (4U * in[i] >= info->palette->size)
+			{
+				return 46;
+			}
+
+			for (c = 0; c < 4; c++) // Get rgb colors from the palette
+			{
+				out_data[4 * i + c] = info->palette->data[4 * in[i] + c];
+			}
+		}
+	}
+	else if (bitDepth == 8 && colorType == 4) // Greyscale with alpha
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[2 * i + 0];
+			out_data[4 * i + 3] = in[2 * i + 1];
+		}
+	}
+	else if (bitDepth == 8 && colorType == 6)
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			for (c = 0; c < 4; c++)
+			{
+				out_data[4 * i + c] = in[4 * i + c]; // RGB with alpha
+			}
+		}
+	}
+	else if (bitDepth == 16 && colorType == 0) // Greyscale
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[2 * i];
+			out_data[4 * i + 3] = (info->key_defined && (256U * in[i] + in[i + 1] == info->key_r)) ? 0 : 255;
+		}
+	}
+	else if (bitDepth == 16 && colorType == 2) // RGB color
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			for (c = 0; c < 3; c++)
+			{
+				out_data[4 * i + c] = in[6 * i + 2 * c];
+			}
+
+			out_data[4 * i + 3] = (info->key_defined &&
+								   (256U * in[6 * i + 0] + in[6 * i + 1] == info->key_r) &&
+								   (256U * in[6 * i + 2] + in[6 * i + 3] == info->key_g) &&
+								   (256U * in[6 * i + 4] + in[6 * i + 5] == info->key_b)) ? 0 : 255;
+		}
+	}
+	else if (bitDepth == 16 && colorType == 4) // Greyscale with alpha
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[4 * i]; // msb
+			out_data[4 * i + 3] = in[4 * i + 2];
+		}
+	}
+	else if (bitDepth == 16 && colorType == 6)
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			for (c = 0; c < 4; c++)
+			{
+				out_data[4 * i + c] = in[8 * i + 2 * c]; // RGB with alpha
+			}
+		}
+	}
+	else if (bitDepth < 8 && colorType == 0) // Greyscale
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			uint32_t value = (PNG_readBitsFromReversedStream(&bp, in, bitDepth) * 255) / ((1 << bitDepth) - 1); // Scale value from 0 to 255
+			out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = (uint8_t) value;
+			out_data[4 * i + 3] = (info->key_defined && value && (((1U << bitDepth) - 1U) == info->key_r) && ((1U << bitDepth) - 1U)) ? 0 : 255;
+		}
+	}
+	else if (bitDepth < 8 && colorType == 3) // Palette
+	{
+		for (i = 0; i < numpixels; i++)
+		{
+			uint32_t value = PNG_readBitsFromReversedStream(&bp, in, bitDepth);
+
+			if (4 * value >= info->palette->size)
+			{
+				return 47;
+			}
+
+			for (c = 0; c < 4; c++) // Get RGB colors from the palette
+			{
+				out_data[4 * i + c] = info->palette->data[4 * value + c];
+			}
+		}
+	}
+	return 0;
+}
+#endif
+
+
+//==============================================================================
+
+PNG_info_t *PNG_info_new()
+{
+	PNG_info_t *info = png_alloc_malloc(sizeof(PNG_info_t));
+	uint32_t i;
+
+	for (i = 0; i < sizeof(PNG_info_t); i++)
+	{
+		((uint8_t *) info)[i] = 0;
+	}
+
+	info->palette	= vector8_new(0, 0);
+	info->image		= vector8_new(0, 0);
+
+	return info;
+}
+
+
+//==============================================================================
+
+PNG_info_t *PNG_decode(const uint8_t *in, uint32_t size)
+{
+	if (size == 0 || in == 0)
+	{
+		PNG_error = 48; // the given data is empty
+		return NULL;
+	}
+
+	PNG_error = 0;
+	PNG_info_t *info = PNG_info_new();
+	PNG_readPngHeader(info, in, size);
+
+	if (PNG_error)
+	{
+		return NULL;
+	}
+
+	size_t pos = 33; // first byte of the first chunk after the header
+	vector8_t *idat = NULL; // the data from IDAT chunks
+	bool IEND = false;
+	bool known_type = true;
+	info->key_defined = false;
+
+	/*
+	 * Loop through the chunks, ignoring unknown chunks and stopping at IEND chunk.
+	 * IDAT data is put at the start of the in buffer
+	 */
+	while (!IEND)
+	{
+		size_t i;
+
+		if (pos + 8 >= size)
+		{
+			PNG_error = 30; // error: size of the in buffer too small to contain next chunk
+			return NULL;
+		}
+
+		size_t chunkLength = PNG_read32bitInt(&in[pos]);
+		pos += 4;
+
+		if (chunkLength > 0x7fffffff)
+		{
+			PNG_error = 63;
+			return NULL;
+		}
+
+		if (pos + chunkLength >= size)
+		{
+			PNG_error = 35; // error: size of the in buffer too small to contain next chunk
+			return NULL;
+		}
+
+		uint32_t chunkType = *(uint32_t *) &in[pos];
+
+		if (chunkType == CHUNK_IDAT) // IDAT: compressed image data chunk
+		{
+			size_t offset = 0;
+
+			if (idat)
+			{
+				offset = idat->size;
+				vector8_resize(idat, offset + chunkLength);
+			}
+			else
+			{
+				idat = vector8_new(chunkLength, 0);
+			}
+
+			for (i = 0; i < chunkLength; i++)
+			{
+				idat->data[offset + i] = in[pos + 4 + i];
+			}
+
+			pos += (4 + chunkLength);
+		}
+		else if (chunkType == CHUNK_IEND) // IEND
+		{
+			pos += 4;
+			IEND = true;
+		}
+#ifdef USE_ALL_1
+		else if (chunkType == CHUNK_PLTE) // PLTE: palette chunk
+		{
+			size_t j;
+			pos += 4; // go after the 4 letters
+			vector8_resize(info->palette, 4 * (chunkLength / 3));
+
+			if (info->palette->size > (4 * 256))
+			{
+				PNG_error = 38; // error: palette too big
+				return NULL;
+			}
+
+			for (i = 0; i < info->palette->size; i += 4)
+			{
+				for (j = 0; j < 3; j++)
+				{
+					info->palette->data[i + j] = in[pos++]; // RGB
+				}
+
+				info->palette->data[i + 3] = 255; // alpha
+			}
+		}
+		else if (chunkType == CHUNK_tRNS) // tRNS: palette transparency chunk
+		{
+			pos += 4; // go after the 4 letters
+
+			if (info->colorType == 3)
+			{
+				if (4 * chunkLength > info->palette->size)
+				{
+					PNG_error = 39; // error: more alpha values given than there are palette entries
+					return NULL;
+				}
+
+				for (i = 0; i < chunkLength; i++)
+				{
+					info->palette->data[4 * i + 3] = in[pos++];
+				}
+			}
+			else if (info->colorType == 0)
+			{
+				if (chunkLength != 2)
+				{
+					PNG_error = 40; // error: this chunk must be 2 bytes for greyscale image
+					return NULL;
+				}
+
+				info->key_defined = true;
+				info->key_r = info->key_g = info->key_b = 256 * in[pos] + in[pos + 1];
+				pos += 2;
+			}
+			else if (info->colorType == 2)
+			{
+				if (chunkLength != 6)
+				{
+					PNG_error = 41; // error: this chunk must be 6 bytes for RGB image
+					return NULL;
+				}
+
+				info->key_defined = true;
+				info->key_r = 256 * in[pos] + in[pos + 1];
+				pos += 2;
+				info->key_g = 256 * in[pos] + in[pos + 1];
+				pos += 2;
+				info->key_b = 256 * in[pos] + in[pos + 1];
+				pos += 2;
+			}
+			else
+			{
+				PNG_error = 42; // error: tRNS chunk not allowed for other color models
+				return NULL;
+			}
+		}
+#endif
+		else // it's not an implemented chunk type, so ignore it: skip over the data
+		{
+			if (!(in[pos + 0] & 32))
+			{
+				// error: unknown critical chunk (5th bit of first byte of chunk type is 0)
+				PNG_error = 69;
+				return NULL;
+			}
+
+			pos += (chunkLength + 4); // skip 4 letters and uninterpreted data of unimplemented chunk
+			known_type = false;
+		}
+
+		pos += 4; // step over CRC (which is ignored)
+	}
+
+#if USE_ALL_1
+	uint32_t bpp = PNG_getBpp(info);
+#else
+	uint32_t bpp = 32;
+#endif
+	vector8_t *scanlines; // now the out buffer will be filled
+	scanlines = vector8_new(((info->width * (info->height * bpp + 7)) / 8) + info->height, 0);
+#if USE_ALL_1
+	PNG_error = Zlib_decompress(scanlines, idat);
+#else
+	Inflator_inflate(scanlines, idat, 2);
+	PNG_error = Inflator_error;
+#endif
+
+	if (PNG_error)
+	{
+		return NULL; // stop if the zlib decompressor returned an error
+	}
+
+	size_t bytewidth = (bpp + 7) / 8, outlength = (info->height * info->width * bpp + 7) / 8;
+	vector8_resize(info->image, outlength); // time to fill the out buffer
+	uint8_t *out_data = outlength ? info->image->data : 0;
+
+#ifdef USE_ALL_1
+	if (info->interlaceMethod == 0) // no interlace, just filter
+	{
+		size_t obp, bp;
+#endif
+		size_t y = 0;
+		size_t linestart = 0;
+		// length in bytes of a scanline, excluding the filtertype byte
+		size_t linelength = (info->width * bpp + 7) / 8;
+#ifdef USE_ALL_1
+		if (bpp >= 8) // byte per byte
+		{
+#endif
+			for (y = 0; y < info->height; y++)
+			{
+//				uint32_t filterType = scanlines->data[linestart];
+				uint8_t filterType = scanlines->data[linestart];
+				const uint8_t *prevline;
+				prevline = (y == 0) ? 0 : &out_data[(y - 1) * info->width * bytewidth];
+				PNG_unFilterScanline(&out_data[linestart - y], &scanlines->data[linestart + 1], prevline, bytewidth, filterType, linelength);
+
+				if (PNG_error)
+				{
+					return NULL;
+				}
+
+				linestart += (1 + linelength); // go to start of next scanline
+			}
+#ifdef USE_ALL_1
+		}
+		else // less than 8 bits per pixel, so fill it up bit per bit
+		{
+			vector8_t *templine; // only used if bpp < 8
+			templine = vector8_new((info->width * bpp + 7) >> 3, 0);
+
+			for (y = 0, obp = 0; y < info->height; y++)
+			{
+				// uint32_t filterType = scanlines->data[linestart];
+				uint8_t filterType = scanlines->data[linestart];
+				const uint8_t *prevline;
+				prevline = (y == 0) ? 0 : &out_data[(y - 1) * info->width * bytewidth];
+				PNG_unFilterScanline(templine->data, &scanlines->data[linestart + 1], prevline, bytewidth, filterType, linelength);
+
+				if (PNG_error)
+				{
+					return NULL;
+				}
+
+				for (bp = 0; bp < info->width * bpp;)
+				{
+					PNG_setBitOfReversedStream(&obp, out_data, PNG_readBitFromReversedStream(&bp, templine->data));
+				}
+
+				linestart += (1 + linelength); // go to start of next scanline
+			}
+		}
+	}
+	else // interlaceMethod is 1 (Adam7)
+	{
+		int i;
+		size_t passw[7] =
+		{
+			(info->width + 7) / 8, (info->width + 3) / 8, (info->width + 3) / 4,
+			(info->width + 1) / 4, (info->width + 1) / 2, (info->width + 0) / 2,
+			(info->width + 0) / 1
+		};
+
+		size_t passh[7] =
+		{
+			(info->height + 7) / 8, (info->height + 7) / 8, (info->height + 3) / 8,
+			(info->height + 3) / 4, (info->height + 1) / 4, (info->height + 1) / 2,
+			(info->height + 0) / 2
+		};
+
+		size_t passstart[7] = { 0 };
+		size_t pattern[28] = { 0, 4, 0, 2, 0, 1, 0, 0, 0, 4, 0, 2, 0, 1, 8, 8, 4, 4, 2, 2, 1, 8, 8,
+				8, 4, 4, 2, 2 }; // values for the adam7 passes
+
+		for (i = 0; i < 6; i++)
+		{
+			passstart[i + 1] = passstart[i] + passh[i] * ((passw[i] ? 1 : 0) + (passw[i] * bpp + 7) / 8);
+		}
+
+		vector8_t *scanlineo, *scanlinen; // "old" and "new" scanline
+		scanlineo = vector8_new((info->width * bpp + 7) / 8, 0);
+		scanlinen = vector8_new((info->width * bpp + 7) / 8, 0);
+
+		for (i = 0; i < 7; i++)
+		{
+			PNG_adam7Pass(out_data, scanlinen->data, scanlineo->data, &scanlines->data[passstart[i]],
+					info->width, pattern[i], pattern[i + 7], pattern[i + 14], pattern[i + 21],
+					passw[i], passh[i], bpp);
+		}
+	}
+
+	if (info->colorType != 6 || info->bitDepth != 8) // conversion needed
+	{
+		vector8_t *copy = vector8_copy(info->image); // xxx: is this copy necessary?
+		PNG_error = PNG_convert(info, info->image, copy->data);
+	}
+#endif
+	return info;
+}
diff --git a/i386/boot2/picopng.h b/i386/boot2/picopng.h
new file mode 100644
index 0000000..66c2c9e
--- /dev/null
+++ b/i386/boot2/picopng.h
@@ -0,0 +1,33 @@
+#ifndef _PICOPNG_H
+#define _PICOPNG_H
+
+#include <stdint.h>
+
+typedef struct {
+	uint32_t *data;
+	size_t size;
+	size_t allocsize;
+} vector32_t;
+
+typedef struct {
+	uint8_t *data;
+	size_t size;
+	size_t allocsize;
+} vector8_t;
+
+typedef struct {
+	uint32_t width, height;
+	uint32_t colorType, bitDepth;
+	uint32_t compressionMethod, filterMethod, interlaceMethod;
+	uint32_t key_r, key_g, key_b;
+	bool key_defined; // is a transparent color key given?
+	vector8_t *palette;
+	vector8_t *image;
+} PNG_info_t;
+
+PNG_info_t *PNG_decode(const uint8_t *in, uint32_t size);
+void png_alloc_free_all();
+
+extern int PNG_error;
+
+#endif
diff --git a/i386/libsa/memory.h b/i386/libsa/memory.h
index a769f12..5d9fda6 100755
--- a/i386/libsa/memory.h
+++ b/i386/libsa/memory.h
@@ -91,7 +91,7 @@
 
 //							0x00100000L
 #define KERNEL_ADDR			(VIDEO_ADDR + VIDEO_LEN)			// Kernel and MKexts/drivers.
-#define KERNEL_LEN			0x06000000L							// Size: 96 MB (128 MB for Chameleon).
+#define KERNEL_LEN			0x08000000L							// Size: 128 MB.
 																//
 																// Note: Can cause a stop("Kernel overflows available space")
 // Based on KERNEL_LEN		0x04100000L
diff --git a/i386/libsa/zalloc.c b/i386/libsa/zalloc.c
index 533ccf9..f9f4a92 100755
--- a/i386/libsa/zalloc.c
+++ b/i386/libsa/zalloc.c
@@ -52,9 +52,9 @@ static char * zalloc_base;
 static char * zalloc_end;
 
 #if SAFE_MALLOC
-	static void  (*zerror)(char *, size_t, const char *, int);
+	static void		(*zerror)(char *, size_t, const char *, int);
 #else
-	static void   (*zerror)(char *, size_t);
+	static void		(*zerror)(char *, size_t);
 #endif
 
 static void   zallocate(char * start,int size);
@@ -66,7 +66,7 @@ static void   zcoalesce(void);
 	size_t zalloced_size;
 #endif
 
-#define ZALLOC_NODES	16384
+#define ZALLOC_NODES	32767 /* was 16384 */
 
 #if SAFE_MALLOC
 	static void mallocError(char *addr, size_t size, const char *file, int line)
@@ -141,8 +141,9 @@ static void   zcoalesce(void);
  
 	for (i = 0; i < availableNodes; i++)
 	{
-		// find node with equal size, or if not found,
-                // then smallest node that fits.
+		/*
+		 * Find node with equal size, or if not found, then smallest node that fits.
+		 */
 		if (zavailable[i].size == size)
 		{
 			zallocate(ret = zavailable[i].start, size);
@@ -208,11 +209,13 @@ void free(void * pointer)
                   "subl $4, %%eax\n\t"
                   "movl 0(%%eax), %%eax" : "=a" (rp));
 #else
-        rp = 0;
+	rp = 0;
 #endif
 
 	if (!start)
+	{
         return;
+	}
 
 	for (i = 0; i < allocedNodes; i++)
 	{
diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index 49c531e..5aec3e6 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -11,6 +11,7 @@
 #			- Enabled clang compilation (dgsga, PikerAlpha, November 2012. Credits to Evan Lojewski for original work).
 #			- Output change and now using libtool instead of ar/ranlib (PikerAlpha, November 2012).
 #			- SAIO_OBJS changed / base64.o added (PikerAlpha, November 2012).
+#			- MAKE_TARGET_OS_VER added (PikerAlpha, June 2014).
 
 include ../MakePaths.dir
 
@@ -25,6 +26,7 @@ CFLAGS	= $(RC_CFLAGS) $(OPTIM) -arch i386 -g -Wmost \
 		-DRCZ_COMPRESSED_FILE_SUPPORT $(DEBUG) \
 		-DREVOBOOT_VERSION_INFO=\"RevoBoot\ v$(PRODUCT_VERSION_NUMBER)\" \
 		-DMAKE_TARGET_OS=$(PRODUCT_OS_TARGET) \
+		-DMAKE_TARGET_OS_VER=$(PRODUCT_OS_TARGET_VERSION) \
 		-DSETTINGS_FILE=SETTINGS/$(MAKE_TARGET_MODEL).h \
 		-DSTATIC_DATA_FILENAME=$(MAKE_TARGET_MODEL).bin \
 		-DACPI_DATA_FILE=../../config/$(MAKE_ACPI_DATA_FILE) \
diff --git a/i386/libsaio/acpi.c b/i386/libsaio/acpi.c
index c57ec93..5be5df4 100755
--- a/i386/libsaio/acpi.c
+++ b/i386/libsaio/acpi.c
@@ -44,7 +44,7 @@ void updateACPITableData(struct acpi_2_rsdp * rsdp, struct acpi_2_xsdt * xsdt, i
 {
 #if ACPI_10_SUPPORT
 
-	_ACPI_DEBUG_DUMP("\nPatching RSDP and RSDT tables... ");
+	_ACPI_DEBUG_DUMP("\nPatching RSDP and XSDT tables... ");
 
 	// Update revision info (fake ACPI 2.0).
 	rsdp->Revision = 1;
diff --git a/i386/libsaio/acpi/essentials.h b/i386/libsaio/acpi/essentials.h
index a68a031..d6bfbcf 100644
--- a/i386/libsaio/acpi/essentials.h
+++ b/i386/libsaio/acpi/essentials.h
@@ -172,7 +172,11 @@ typedef struct acpi_2_tables
 static ACPITables essentialTables[] =
 {
 	{ APIC, APIC_TABLE_SIGNATURE,	replaceTable,		kReplaceTable | kAddTable	},
+#if DROP_FACTORY_DMAR_TABLE
+	{ DMAR, DMAR_TABLE_SIGNATURE,	NULL,				kDropTable					},
+#else
 	{ DMAR, DMAR_TABLE_SIGNATURE,	NULL,				kReplaceTable | kAddTable	},
+#endif
 	{ NONE,	FACP_TABLE_SIGNATURE,	patchFACPTable,		kPatchTable					},
 	{ HPET, HPET_TABLE_SIGNATURE,	replaceTable,		kReplaceTable				},
 	{ MCFG, MCFG_TABLE_SIGNATURE,	NULL,				kReplaceTable				},
diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 4fe1470..8610c4a 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -545,7 +545,7 @@ void setupACPI(void)
 			// Yes, fix length.
 			patchedXSDT->Length -= (ADDRESS_WIDTH * dropOffset);
 
-			_ACPI_DEBUG_DUMP("patchedXSDT->Length (changed): %d\n", patchedXSDT->Length);
+			_ACPI_DEBUG_DUMP("patchedXSDT->Length (changed): %d/%d\n", patchedXSDT->Length, (patchedXSDT->Length / ADDRESS_WIDTH));
 		}
 
 		_ACPI_DEBUG_DUMP("\nRecalculating checksums / ");
diff --git a/i386/libsaio/allocate.c b/i386/libsaio/allocate.c
index eb84fbc..fda989b 100755
--- a/i386/libsaio/allocate.c
+++ b/i386/libsaio/allocate.c
@@ -23,7 +23,7 @@
  *
  *
  * Updates:
- *			- Layout change only (PikerAlpha, November 2012)
+ *			- Layout only change (PikerAlpha, November 2012)
  *
  */
 
@@ -39,31 +39,31 @@
 
 //==============================================================================
 
-long AllocateMemoryRange(char * rangeName, long start, long length, long type)
+long AllocateMemoryRange(char * rangeName, long start, long length)
 {
-	char *nameBuf = malloc(strlen(rangeName) + 1);
-
-	if (nameBuf)
+	if (rangeName)
 	{
-		strcpy(nameBuf, rangeName);
-
-		uint32_t *buffer = malloc(2 * sizeof(uint32_t));
-
-		if (buffer)
+		char *nameBuf = malloc(strlen(rangeName) + 1);
+	
+		if (nameBuf)
 		{
-			buffer[0] = start;
-			buffer[1] = length;
+			strcpy(nameBuf, rangeName);
+			uint32_t *buffer = malloc(2 * sizeof(uint32_t));
 
+			if (buffer)
+			{
+				buffer[0] = start;
+				buffer[1] = length;
 #if DEBUG
-			printf("AllocateMemoryRange : %s - 0x%lx - 0x%lx\n", nameBuf, length, start);
+				printf("AllocateMemoryRange(%s) @0x%lx, length 0x%lx\n", rangeName, start, length);
 #endif
+				DT__AddProperty(gPlatform.EFI.Nodes.MemoryMap, nameBuf, 2 * sizeof(uint32_t), (char *)buffer);
+			
+				return 0;
+			}
 
-			DT__AddProperty(gPlatform.EFI.Nodes.MemoryMap, nameBuf, 2 * sizeof(uint32_t), (char *)buffer);
-
-			return 0;
+			free(nameBuf);
 		}
-
-		free(nameBuf);
 	}
 
 	return -1;
@@ -91,7 +91,7 @@ long AllocateKernelMemory(long inSize)
 
 #if DEBUG
 	printf("AllocateKernelMemory: 0x%lx - 0x%lx\n", address, inSize);
-	getchar();
+	sleep(3);
 #endif
 
 	return address;
diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index 171fa06..e4fb55b 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -34,7 +34,7 @@ PrivateBootInfo_t *bootInfo;
 
 
 //==============================================================================
-// Called from: boot() (common_boot() in Chameleon) in boot.c
+// Called from function initPlatform in platform.c
 
 void initKernelBootConfig(void)
 {
@@ -49,8 +49,10 @@ void initKernelBootConfig(void)
 	bzero(bootArgs, sizeof(boot_args));
 	bzero(bootInfo, sizeof(PrivateBootInfo_t));
 
-	// Set the default kernel name to: 'mach_kernel'.
-	strcpy(bootInfo->bootFile, kDefaultKernel);
+	// Set kernel name to: '/System/Library/Kernels/kernel' for 10.10 and greater
+	// and 'mach_kernel' for all previous versions of OS X.
+	// strcpy(bootInfo->bootFile, kDefaultKernel);
+	sprintf(bootInfo->bootFile, "%s", kDefaultKernel);
 
 	// Get system memory map. Also update the size of the
 	// conventional/extended memory for backwards compatibility.
@@ -69,7 +71,6 @@ void initKernelBootConfig(void)
 	}
 
 	bootInfo->configEnd = bootInfo->config;
-
 	bootArgs->Video.v_display = VGA_TEXT_MODE;
 
 	// What Lion species is screaming here?
@@ -87,10 +88,38 @@ void initKernelBootConfig(void)
 	// EFI selection is based on the CPU type.
 	bootArgs->efiMode = (gPlatform.ArchCPUType == CPU_TYPE_X86_64) ? kBootArgsEfiMode64 : kBootArgsEfiMode32;
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 	// Lion's new debug output (replacing a couple of former boot arguments).
 	bootArgs->debugMode = EFI_DEBUG_MODE;					// Defined in config/settings.h
 #endif
+	
+#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+	// Adding a 16 KB log space.
+	bootArgs->performanceDataSize	= 0;
+	bootArgs->performanceDataStart	= 0;
+	
+	// AppleKeyStore.kext
+	bootArgs->keyStoreDataSize		= 0;
+	bootArgs->keyStoreDataStart		= 0;
+	
+	bootArgs->bootMemSize			= 0;
+	bootArgs->bootMemStart			= 0;
+	bootArgs->flags					= 0;
+
+#if REBOOT_ON_PANIC
+	bootArgs->flags					= kBootArgsFlagRebootOnPanic;
+#endif
+
+#if UISCALE_2X
+	bootArgs->flags					|= kBootArgsFlagHiDPI;
+#endif
+
+#if BLACKMODE
+	bootArgs->flags					|= kBootArgsFlagBlackTheme; // (kBootArgsFlagBlack + kBootArgsFlagBlackTheme);
+#endif
+
+	bootArgs->kslide				= 0;
+#endif
 }
 
 
@@ -171,7 +200,7 @@ void finalizeKernelBootConfig(void)
     bootArgs->deviceTreeP = (uint32_t)addr;
     bootArgs->deviceTreeLength = size;
 	
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 1 set like Lion.
+/* #if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 	// Adding a 16 KB log space.
 	bootArgs->performanceDataSize	= 0;
 	bootArgs->performanceDataStart	= 0;
@@ -182,9 +211,12 @@ void finalizeKernelBootConfig(void)
 
 	bootArgs->bootMemSize	= 0;
 	bootArgs->bootMemStart	= 0;
-#endif
+	
+	bootArgs->flags			= kBootArgsFlagBlack;
+	bootArgs->kslide		= 0;
+#endif */
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 	bootArgs->FSBFrequency	= gPlatform.CPU.FSBFrequency;
 #endif
 }
diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index 77e42cb..abc1864 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -30,7 +30,28 @@
 #include "bios.h"
 #include "platform.h"
 
-#define kDefaultKernel	"mach_kernel"
+#if (MAKE_TARGET_OS == YOSEMITE)
+	#define kDefaultKernel	"kernel"
+#else
+	#define kDefaultKernel	"mach_kernel"
+#endif
+
+// Bitfields for boot_args->flags
+#ifndef kBootArgsFlagRebootOnPanic
+	#define kBootArgsFlagRebootOnPanic	(1 << 0)
+#endif
+
+#ifndef kBootArgsFlagHiDPI
+	#define kBootArgsFlagHiDPI			(1 << 1)
+#endif
+
+#ifndef kBootArgsFlagBlack
+	#define kBootArgsFlagBlack			(1 << 2)
+#endif
+
+#ifndef kBootArgsFlagBlackTheme
+	#define kBootArgsFlagBlackTheme		(1 << 6)
+#endif
 
 // Snapshot constants with supported version / revision info.
 #define kBootArgsVersion_SnowLeopard	1
@@ -138,20 +159,19 @@ typedef struct PrivateBootInfo
 
 extern PrivateBootInfo_t *bootInfo; 
 
-
 typedef struct boot_args_new
 {
     uint16_t    Revision;							// Revision of boot_args structure.
     uint16_t    Version;							// Version of boot_args structure.
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION)				// Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
     uint8_t     efiMode;							// 32 = 32-bit, 64 = 64-bit.
 
     uint8_t     debugMode;							// Bit field with behavior changes.
 
-#if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
-    uint8_t     __reserved0;
-    uint8_t     __reserved1;
+// #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
+#if (MAKE_TARGET_OS & MOUNTAIN_LION)
+    uint16_t    flags;
 #else
     uint8_t     __reserved1[2];
 #endif
@@ -175,14 +195,14 @@ typedef struct boot_args_new
     uint32_t    efiRuntimeServicesPageStart;		// Physical address of defragmented runtime pages.
     uint32_t    efiRuntimeServicesPageCount;
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION)				// Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
     uint64_t    efiRuntimeServicesVirtualPageStart;	// Virtual address of defragmented runtime pages.
 #endif
 
     uint32_t    efiSystemTable;						// Physical address of system table in runtime area.
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// Mavericks and Mountain Lion also have bit 1 set like Lion.
-    uint32_t    __reserved2;
+#if ((MAKE_TARGET_OS & LION) == LION)				// Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+    uint32_t    kslide;
 
     uint32_t    performanceDataStart;				// Physical address of log.
     uint32_t    performanceDataSize;
@@ -196,7 +216,8 @@ typedef struct boot_args_new
     uint64_t    PhysicalMemorySize;
     uint64_t    FSBFrequency;
     
-#if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
+// #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
+#if (MAKE_TARGET_OS & MOUNTAIN_LION)
     uint64_t    pciConfigSpaceBaseAddress;
     uint32_t    pciConfigSpaceStartBusNumber;
     uint32_t    pciConfigSpaceEndBusNumber;
diff --git a/i386/libsaio/cpu.c b/i386/libsaio/cpu.c
index 7452c72..219374f 100644
--- a/i386/libsaio/cpu.c
+++ b/i386/libsaio/cpu.c
@@ -16,6 +16,7 @@
 #include "cpu/cpuid.h"
 #include "cpu/proc_reg.h"
 
+
 #if INTEL_CORE_TECHNOLOGY
 
 #if AUTOMATIC_SSDT_PR_CREATION || DEBUG_CPU_TDP
@@ -55,7 +56,7 @@ void initTurboRatios()
 {
 	// Get turbo ratio(s).
 	uint64_t msr = rdmsr64(MSR_TURBO_RATIO_LIMIT);
-	
+
 #if AUTOMATIC_SSDT_PR_CREATION || DEBUG_CPU_TURBO_RATIOS
 	// All CPU's have at least two cores (think mobility CPU here).
 	gPlatform.CPU.CoreTurboRatio[0] = bitfield32(msr, 7, 0);
@@ -216,7 +217,8 @@ void checkFlexRatioMSR(void)
 		}
 	}
 }
-#endif
+#endif // INTEL_CORE_TECHNOLOGY
+
 
 #if USE_STATIC_CPU_DATA
 
diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 51d81f5..f25485b 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -21,10 +21,9 @@
 
 #define DEFAULT_FSB				100000	// Hardcoded to 100MHz
 #define BASE_NHM_CLOCK_SOURCE	133333333ULL
-#define DEBUG_CPU_EXTREME		0
 
 //==============================================================================
-// DFE: Measures the TSC frequency in Hz (64-bit) using the ACPI PM timer
+// Measures TSC frequency using the i8254 Programmable Interval Timer counter 2
 
 static uint64_t getTSCFrequency(void)
 {
@@ -214,6 +213,14 @@ void initCPUStruct(void)
 	if ((getCachedCPUID(LEAF_80, eax) & 0x0000000f) >= 1)
 	{
 		do_cpuid(0x80000001, gPlatform.CPU.ID[LEAF_81]);		// Extended Feature Bits (Function 80000001h).
+
+		#if DEBUG_CPU
+		// Test if the LongMode-bit is set or not.
+		if ((getCachedCPUID(LEAF_81, edx) & 0x20000000) == 0x20000000)
+		{
+			_CPU_DEBUG_DUMP("CPU: LongMode (64-bit) is support\n");
+		}
+		#endif
 	}
 #if DEBUG_CPU_EXTREME
 	{
@@ -414,7 +421,7 @@ void initCPUStruct(void)
 #if AUTOMATIC_SSDT_PR_CREATION || DEBUG_CPU_TDP
 					gPlatform.CPU.TDP = getTDP();
 #endif
-					qpiSpeed = 0; // No QPI but DMI for Sandy Bridge processors.
+					qpiSpeed = 0; // No QPI but DMI for Sandy Bridge and greater processors.
 					
 					// Disable C1/C3 state auto demotion i.e. it won't change C3/C6/C7 requests to C1/C3.
 					// wrmsr64(MSR_PKG_CST_CONFIG_CONTROL, 0x1E000003ULL);
@@ -427,6 +434,11 @@ void initCPUStruct(void)
 					// msr = rdmsr64(MSR_PKG_CST_CONFIG_CONTROL);
 					// wrmsr64(MSR_MISC_PWR_MGMT, (msr & 0xFFFEFBFF));
 
+					wrmsr64(MSR_PKG_POWER_LIMIT, 0x4283E800DD8230);
+					// wrmsr64(MSR_PP0_CURRENT_CONFIG, 0x40101414000002F8);
+					wrmsr64(MSR_PP0_POWER_LIMIT, 0);
+					wrmsr64(MSR_PP1_POWER_LIMIT, 0);
+
 					checkFlexRatioMSR();
 				}
 #endif // #if INTEL_CORE_TECHNOLOGY
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 6ef5ada..a62543c 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -171,7 +171,7 @@
 #define CPU_MODEL_DALES_32NM		0x25	// Clarkdale, Arrandale
 #define CPU_MODEL_SB_CORE			0x2A	// Sandy Bridge Core Processors (LGA 1155)
 #define CPU_MODEL_WESTMERE			0x2C	// Gulftown, Westmere-EP, Westmere-WS
-#define CPU_MODEL_SB_JAKETOWN		0x2D	// Sandy Bridge Xeon Processors (LGA 2011)
+#define CPU_MODEL_SB_JAKETOWN		0x2D	// Sandy Bridge-EP, Sandy Bridge Xeon Processors (LGA 2011)
 #define CPU_MODEL_NEHALEM_EX		0x2E
 #define CPU_MODEL_WESTMERE_EX		0x2F
 #define CPU_MODEL_IB_CORE			0x3A	// Ivy Bridge Core Processors (LGA 1155)
diff --git a/i386/libsaio/device_tree.c b/i386/libsaio/device_tree.c
index 9949fc2..4e8a252 100755
--- a/i386/libsaio/device_tree.c
+++ b/i386/libsaio/device_tree.c
@@ -79,10 +79,6 @@ Property * DT__AddProperty(Node *node, const char *name, uint32_t length, void *
 {
 	Property *prop;
 
-#if (DEBUG_EFI & 2)
-		_EFI_DEBUG_DUMP("DT__AddProperty([Node '%s'], '%s', %d, 0x%x)\n", DT__GetName(node), name, length, value);
-#endif
-
 	if (freeProperties == NULL)
 	{
 		void *buf = malloc(kAllocSize);
@@ -113,6 +109,10 @@ Property * DT__AddProperty(Node *node, const char *name, uint32_t length, void *
 		}
 	}
 
+#if (DEBUG_EFI & 2)
+	_EFI_DEBUG_DUMP("DT__AddProperty([Node '%s'], '%s', %d, 0x%x)\n", DT__GetName(node), name, length, value);
+#endif
+
 	prop = freeProperties;
 	freeProperties = prop->next;
 
@@ -206,6 +206,7 @@ Node * DT__AddChild(Node *parent, const char *name)
 	}
 
 	DTInfo.numNodes++;
+	
 	DT__AddProperty(node, "name", strlen(name) + 1, (void *) name);
 
 	return node;
@@ -357,9 +358,7 @@ void DT__FlattenDeviceTree(void **buffer_p, uint32_t *length)
 	}
 #endif
     
-	totalSize = DTInfo.numNodes * sizeof(DeviceTreeNode) + 
-	DTInfo.numProperties * sizeof(DeviceTreeNodeProperty) +
-	DTInfo.totalPropertySize;
+	totalSize = DTInfo.numNodes * sizeof(DeviceTreeNode) + DTInfo.numProperties * sizeof(DeviceTreeNodeProperty) + DTInfo.totalPropertySize;
 
 #if (DEBUG_EFI & 2)
 	_EFI_DEBUG_DUMP("Total size 0x%x\n", totalSize);
diff --git a/i386/libsaio/device_tree.h b/i386/libsaio/device_tree.h
index 0bfbf23..b33a6fb 100755
--- a/i386/libsaio/device_tree.h
+++ b/i386/libsaio/device_tree.h
@@ -50,7 +50,6 @@ typedef struct _Node
 	struct _Node *		next;
 } Node;
 
-
 extern Property * DT__AddProperty(Node *node, const char *name, uint32_t length, void *value);
 
 extern Node * DT__AddChild(Node *parent, const char *name);
diff --git a/i386/libsaio/efi/efi.h b/i386/libsaio/efi/efi.h
index f5f834c..c19c789 100755
--- a/i386/libsaio/efi/efi.h
+++ b/i386/libsaio/efi/efi.h
@@ -44,7 +44,7 @@
 #define EFI_MAX_CONFIG_TABLES			5
 
 #if EFI_64_BIT
-	// Mountain Lion
+	// Mountain Lion, Mavericks and Yosemite
 	//
 	// movabs $0x8000000000000003,%rax
 	// ret
diff --git a/i386/libsaio/efi/fake_efi.h b/i386/libsaio/efi/fake_efi.h
index a471d88..87a988e 100755
--- a/i386/libsaio/efi/fake_efi.h
+++ b/i386/libsaio/efi/fake_efi.h
@@ -34,7 +34,6 @@
 
 #include "bootstruct.h"		// For bootArgs.
 
-
 //------------------------------------------------------------------------------
 
 extern void setupACPI(void);
@@ -120,6 +119,13 @@ extern EFI_STATUS addConfigurationTable(EFI_GUID const *pGuid, void * table, cha
 		{
 			DT__AddProperty(tableNode, "alias", strlen(tableAlias) + 1, (char *)tableAlias);
 		}
+		
+		if (strcmp(tableAlias, "ACPI_20") == 0)
+		{
+			Node *acpiTablesNode = DT__AddChild(tableNode, "ACPI Tables");
+
+			gPlatform.EFI.Nodes.ACPI_Tables = acpiTablesNode;
+		}
       
 		gPlatform.EFI.SystemTable->NumberOfTableEntries++;
 	}
@@ -127,7 +133,6 @@ extern EFI_STATUS addConfigurationTable(EFI_GUID const *pGuid, void * table, cha
 	return EFI_SUCCESS;
 }
 
-
 //==============================================================================
 // Allocate fake EFI system / runtime services table.
 
diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 4d6bd85..0c8f587 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -34,6 +34,7 @@
 #include <mach/machine/thread_status.h>
 
 #include <sl.h>
+#include "platform.h"
 
 /***
  * Backward compatibility fix for the SDK 10.7 version of loader.h
@@ -43,9 +44,18 @@
 	#define LC_MAIN (0x28|LC_REQ_DYLD) /* replacement for LC_UNIXTHREAD */
 #endif
 
-#define NVRAM_GUID_UINT64		0x3530454445314434
-#define OPTIONS_STRING_UINT64	0x736e6f6974706f2f
+#define NVRAM_GUID_UINT64				0x3530454445314434
+#define OPTIONS_STRING_UINT64			0x736e6f6974706f2f
 
+/***
+ * Tip: Reverse bytes if you search for the IDs with grep/HexEdit.
+ */
+// #define APPLE_HDA_PATCH_ID			0x11D419843D107410 10.9.2 and 10.9.3
+// #define APPLE_HDA_PATCH_ID				0x11D419843D397410
+// #define APPLE_HDA_TARGET_ID				0x10EC08923D397410
+
+// #define APPLE_HDA_CONTROLLER_PATCH_ID	0x30EB617500000C0C
+// #define APPLE_HDA_CONTROLLER_TARGET_ID	0x0EEB617500000C0C
 
 // Load MKext(s) or separate kexts (default behaviour / behavior).
 bool gLoadKernelDrivers = true;
@@ -53,7 +63,10 @@ bool gLoadKernelDrivers = true;
 // Private functions.
 static long DecodeSegment(long cmdBase, unsigned int*load_addr, unsigned int *load_size);
 static long DecodeUnixThread(long cmdBase, unsigned int *entry);
+
+#if ADD_SYMTAB
 static long DecodeSymbolTable(long cmdBase);
+#endif
 
 static unsigned long gBinaryAddress;
 
@@ -136,6 +149,7 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 	mH = (struct mach_header *)(gBinaryAddress);
 
 #if DEBUG
+	printf("In DecodeMachO()\n");
 	printf("magic:      %x\n", (unsigned)mH->magic);
 	printf("cputype:    %x\n", (unsigned)mH->cputype);
 	printf("cpusubtype: %x\n", (unsigned)mH->cpusubtype);
@@ -159,7 +173,7 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 
 			if (mH->magic != MH_MAGIC)
 			{
-				error("Mach-O file has bad magic number\n");
+				error("Mach-O (i386) file has bad magic number\n");
 				return -1;
 			}
 
@@ -175,7 +189,7 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 
 			if (mH->magic != MH_MAGIC_64)
 			{
-				error("Mach-O file has bad magic number\n");
+				error("Mach-O file (x86_64) has bad magic number\n");
 				return -1;
 			}
 
@@ -240,6 +254,7 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 	*rsize = vmend - vmaddr;
 	*raddr = (char *)vmaddr;
 
+#if ADD_SYMTAB
 	cmdBase = cmdstart;
 
 	for (cnt = 0; cnt < ncmds; cnt++)
@@ -257,11 +272,73 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 
 		cmdBase += cmdsize;
 	}
-	
+#endif
 	return ret;
 }
 
 
+/* #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION_NEW)
+//==============================================================================
+//
+// Kernel patch routine for iMessage
+//
+// This segment will be replaced by random data (since 18 April 2011) and released
+// when the kernel is done with it. Meaning that our data is short lived as well.
+if (strncmp(segname, "__KLD", 5) == 0)
+{
+	uint32_t	index	= 0;
+	uint32_t	offset	= sizeof(struct segment_command_64);
+	
+	while(offset < segCmd->cmdsize)
+	{
+		struct section_64 *section = (struct section_64 *)((char *)segCmd + offset);
+		offset += sizeof(struct section_64);
+		
+		if (strncmp((char *)section->sectname, "__cstring", 9) == 0)
+		{
+			uint64_t sectionStart	= (fileaddr + index);
+			uint64_t sectionEnd		= (fileaddr + filesize);
+			
+			unsigned char * baseAddress = (unsigned char *)sectionStart;
+			
+			// Search for the NVRAM GUID.
+			for (; baseAddress <= (unsigned char *)sectionEnd; baseAddress++)
+			{
+				if (*(uint64_t *)baseAddress == NVRAM_GUID_UINT64)
+				{
+					// Zero out NVRAM GUID
+					bzero((char *)baseAddress, 36);
+					// Replace/inject GUID replacement
+					memcpy((char *)baseAddress, "NVRAM", 5);
+					// Point to the end of the (former) NVRAM GUID string
+					baseAddress += 36;
+					
+					// Search for "/options" after the GUID.
+					for (; baseAddress <= (unsigned char *)sectionEnd; baseAddress++)
+					{
+						if (*(uint64_t *)baseAddress == OPTIONS_STRING_UINT64)
+						{
+							// Rename /option to /RevoEFI (just temporarily)
+							memcpy((unsigned char *)baseAddress, "/RevoEFI", 8);
+							// Prepare to break out early.
+							baseAddress = (unsigned char *)(sectionEnd + 1);
+							// Done.
+							break;
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			// Skip unwanted sections (which makes us a little faster).
+			index += section->size;
+		}
+	}
+}
+#endif */
+
+
 //==============================================================================
 // Private function. Called from DecodeMachO()
 // Refactoring and segment name fix for OS X 10.6+ by DHP in 2010.
@@ -282,14 +359,19 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 		filesize = segCmd->filesize;
 		segname = segCmd->segname;
 
-#if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
-		//
-		// Kernel patch routine for iMessage
+#if ((MAKE_TARGET_OS & LION) == LION)
+	//
+	// Kernel patch routine for iMessage (LION, MOUNTAIN_LION, MAVERICKS and YOSEMITE).
+	//
+	#if IMESSAGE_PATCH_ENABLED
 		//
 		// This segment will be replaced by random data (since 18 April 2011) and released
 		// when the kernel is done with it. Meaning that our data is short lived as well.
+		//
 		if (strncmp(segname, "__KLD", 5) == 0)
 		{
+			// printf ("__KLD found!\n");
+
 			uint32_t	index	= 0;
 			uint32_t	offset	= sizeof(struct segment_command_64);
 
@@ -300,6 +382,8 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 
 				if (strncmp((char *)section->sectname, "__cstring", 9) == 0)
 				{
+					// printf ("__KLD found!\n");
+
 					uint64_t sectionStart	= (fileaddr + index);
 					uint64_t sectionEnd		= (fileaddr + filesize);
 
@@ -310,6 +394,8 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 					{
 						if (*(uint64_t *)baseAddress == NVRAM_GUID_UINT64)
 						{
+							// printf ("NVRAM GUID found!\n");
+
 							// Zero out NVRAM GUID
 							bzero((char *)baseAddress, 36);
 							// Replace/inject GUID replacement
@@ -322,6 +408,8 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 							{
 								if (*(uint64_t *)baseAddress == OPTIONS_STRING_UINT64)
 								{
+									// printf ("/option renamed to /RevoEFI!\n");
+
 									// Rename /option to /RevoEFI (just temporarily)
 									memcpy((unsigned char *)baseAddress, "/RevoEFI", 8);
 									// Prepare to break out early.
@@ -339,8 +427,75 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 					index += section->size;
 				}
 			}
+#if DEBUG
+			sleep(5);
+#endif
 		}
+	#endif // #if IMESSAGE_PATCH_ENABLED
+
+#if KERNELCACHE_PATCHING_ENABLED
+	#if IMESSAGE_PATCH_ENABLED
+		else
+	#endif
+		if (strncmp(segname, "__PRELINK_TEXT", 14) == 0)
+		{
+			// printf("Target segname found: __PRELINK_TEXT\n");
+
+			uint32_t	index2	= 0;
+			uint32_t	offset2	= sizeof(struct segment_command_64);
+			
+			while(offset2 < segCmd->cmdsize)
+			{
+				struct section_64 *section2 = (struct section_64 *)((char *)segCmd + offset2);
+				offset2 += sizeof(struct section_64);
+
+				if (strncmp((char *)section2->sectname, "__text", 6) == 0)
+				{
+					// printf("Target section found: __PRELINK_TEXT\n");
+
+					uint64_t sectionStart2	= (fileaddr + index2);
+					uint64_t sectionEnd2	= (fileaddr + filesize);
+					
+					unsigned char * baseAddress2 = (unsigned char *)sectionStart2;
+					
+					// Search for APPLE_HDA_PATCH_ID byte sequence.
+					for (; baseAddress2 <= (unsigned char *)sectionEnd2; baseAddress2++)
+					{
+#ifdef APPLE_HDA_PATCH_ID
+						if (*(uint64_t *)baseAddress2 == APPLE_HDA_PATCH_ID)
+						{
+							// printf("DO APPLE_HDA_PATCH_ID\n");
+							// Replace APPLE_HDA_PATCH_ID with APPLE_HDA_TARGET_ID
+							*(uint64_t *)baseAddress2 = APPLE_HDA_TARGET_ID;
+						}
+#endif
+
+#ifdef APPLE_HDA_CONTROLLER_PATCH_ID
+	#if APPLE_HDA_PATCH_ID
+						else if
+	#else
+						if
+	#endif
+						(*(uint64_t *)baseAddress2 == APPLE_HDA_CONTROLLER_PATCH_ID)
+						{
+							// printf("DO APPLE_HDA_CONTROLLER_PATCH_ID\n");
+							// Replace APPLE_HDA_CONTROLLER_PATCH_ID with APPLE_HDA_CONTROLLER_TARGET_ID
+							*(uint64_t *)baseAddress2 = APPLE_HDA_CONTROLLER_TARGET_ID;
+						}
 #endif
+					}
+				}
+				else
+				{
+					// Skip unwanted sections.
+					index2 += section2->size;
+				}
+			}
+			// printf("sleeping for 2 seconds!\n");
+			// sleep(2);
+		}
+#endif // #if KERNELCACHE_PATCH_ENABLED
+#endif // #if ((MAKE_TARGET_OS & LION) == LION)
 	}
 	else
 	{
@@ -443,7 +598,7 @@ static long DecodeUnixThread(long cmdBase, unsigned int *entry)
 	}
 }
 
-
+#if ADD_SYMTAB
 //==============================================================================
 // Private function. Called from DecodeMachO()
 
@@ -468,7 +623,7 @@ static long DecodeSymbolTable(long cmdBase)
 	gSymbolTableSize = totalSize + sizeof(struct symtab_command);
 	gSymbolTableAddr = AllocateKernelMemory(gSymbolTableSize);
 	// Add the SymTab to the memory-map.
-	AllocateMemoryRange("Kernel-__SYMTAB", gSymbolTableAddr, gSymbolTableSize, -1);
+	AllocateMemoryRange("Kernel-__SYMTAB", gSymbolTableAddr, gSymbolTableSize);
 
 	symTableSave = (struct symtab_command *)gSymbolTableAddr;
 	tmpAddr = gSymbolTableAddr + sizeof(struct symtab_command);
@@ -482,7 +637,7 @@ static long DecodeSymbolTable(long cmdBase)
 
 	return 0;
 }
-
+#endif
 
 //==============================================================================
 // Public function (RevoBoot v1.5.30 and greater). Called from our ACPI patcher
diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 8ddea37..8910902 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -5,6 +5,8 @@
  * Updates:
  *
  *			- STATIC_SMBIOS_MODEL_ID renamed to SMB_PRODUCT_NAME (PikerAlpha, October 2012).
+ *			- Yosemite support added (PikerAlpha, June 2014).
+ *			- Replaced hard-coded OS version control with a flexible one (PikerAlpha, June 2014).
  *
  */
 
@@ -132,7 +134,7 @@ void initPlatform(int biosDevice, bool bootRecoveryHD)
 	// Copied from cpu/dynamic_data.h to make printf work this early on.
 #if DEBUG_STATE_ENABLED
 	extern void setVideoMode(int mode);
-	setVideoMode(0); // Switch to VGA_TEXT_MODE
+	setVideoMode(VGA_TEXT_MODE);
 #endif
 
 #if ENABLE_HPET
@@ -200,16 +202,10 @@ void initPlatform(int biosDevice, bool bootRecoveryHD)
 		gPlatform.CPU.Mobile		= true;	// Will be initialized in cpu/cpu_dynamic.h (used in smbios/dynamic_data.h)
 	}
 
-#if (MAKE_TARGET_OS == MAVERICKS)
-	gPlatform.OSVersion				= strdup("10.9");
-#elif (MAKE_TARGET_OS == LION)
-	gPlatform.OSVersion				= strdup("10.7");
-#elif (MAKE_TARGET_OS == MOUNTAIN_LION)
-	gPlatform.OSVersion				= strdup("10.8");
-#else // Snow Leopard
-	gPlatform.OSVersion				= strdup("10.6");
-#endif
-
+	// MAKE_TARGET_OS_VER is defined in RevoBoot/i386/libsaio/Makefile
+	// and exported from the main RevoBoot/Makefile
+	gPlatform.OSVersion				= MAKE_TARGET_OS_VER;
+	
 	// _PLATFORM_DEBUG_DUMP("REVOBOOT_OS_TARGET: %d\n", REVOBOOT_OS_TARGET);
 
 	gPlatform.OSType				= (int) MAKE_TARGET_OS;
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index e2bd3a2..4b29079 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -5,30 +5,38 @@
  *
  *			- SMBIOS data logic moved to preprocessor code (PikerAlpha, October 2012).
  *			- Now includes: RevoBoot/libsaoi/i386/SMBIOS/model_data.h (PikerAlpha, October 2012).
+ *			- DDR4 support added (PikerAlpha, June 2014).
+ *			- Yosemite support added (PikerAlpha, June 2014).
  *
  */
 
 #ifndef __LIBSAIO_PLATFORM_H
 #define __LIBSAIO_PLATFORM_H
 
+#define __LP64__	1
+
 #include "libsaio.h"
 #include "cpu/essentials.h"
 #include "efi/essentials.h"
 #include "efi/efi.h"
 #include "device_tree.h"
 
+
+
 //------------------------------------------------------------------------------
 
 #define	SNOW_LEOPARD			1	// Snow Leopard.
 #define LION					2	// Lion (the default).
 #define MOUNTAIN_LION			6	// Mountain Lion (includes Lion changes).
 #define MAVERICKS				10	// Mavericks (includes Lion changes).
+#define YOSEMITE				26	// Yosemite (incl. Lion/Mavericks changes).
 
 //------------------------------------------------------------------------------
 
 #define SMB_MEM_TYPE_DDR2		19
 #define SMB_MEM_TYPE_FBDIMM		20
 #define SMB_MEM_TYPE_DDR3		24
+#define SMB_MEM_TYPE_DDR4		26
 
 //------------------------------------------------------------------------------
 
@@ -39,6 +47,7 @@
 #define SMB_MEM_SIZE_8GB		(SMB_MEM_SIZE_1GB * 8)
 #define SMB_MEM_SIZE_16GB		(SMB_MEM_SIZE_1GB * 16)
 #define SMB_MEM_SIZE_32GB		(SMB_MEM_SIZE_1GB * 32)	// May not be supported!
+#define SMB_MEM_SIZE_64GB		(SMB_MEM_SIZE_1GB * 64)	// May not be supported!
 
 //------------------------------------------------------------------------------
 // All currently supported models are defined below.
@@ -284,7 +293,7 @@ typedef struct _PlatformInfo_t
 	{
 		Node *	RootNode;						// Path: /
 	} DT;
-	
+
 	struct EFI
 	{
 		EFI_SYSTEM_TABLE * SystemTable;			// Used to re-calculate the checksum at the end of the run.
@@ -296,6 +305,7 @@ typedef struct _PlatformInfo_t
 			
 			// EFI specific stuff.
 			Node *	ConfigurationTable;			// Path: /efi/configuration-table
+			Node *	ACPI_Tables;				// Path: /efi/configuration-table/ACPI Tables
 			Node *	RuntimeServices;			// Path: /efi/runtime-services
 			Node *	Platform;					// Path: /efi/platform
 		} Nodes;
@@ -329,6 +339,7 @@ typedef struct _PlatformInfo_t
 	
 } PlatformInfo_t;
 
+
 //------------------------------------------------------------------------------
 
 /* cpu/static_data.h & cpu/dynamic_data.h */
diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index ecdb389..1a4f627 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -41,6 +41,7 @@ extern void		real_to_prot(void);
 extern void		prot_to_real(void);
 extern void		halt(void);
 extern void		startMachKernel(unsigned int address, void *arg);
+extern uint64_t	computeRand(void);
 
 
 /* bios.s */
@@ -151,7 +152,7 @@ extern long		loadBinaryData(char *aFilePath, void **aMemoryAddress);
 
 /* memory.c */
 long			AllocateKernelMemory(long inSize);
-long			AllocateMemoryRange(char * rangeName, long start, long length, long type);
+long			AllocateMemoryRange(char * rangeName, long start, long length);
 
 
 /* platform.c */
diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 991c529..54fcc90 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -208,7 +208,7 @@ void setupSMBIOS(void)
 	//--------------------------------------------------------------------------
 
 	// Allocate 1 page of kernel memory (sufficient for a stripped SMBIOS table).
-	void * kernelMemory = (void *)AllocateKernelMemory(4096);
+	void * kernelMemory = (void *)AllocateKernelMemory(8192); // 4096);
 
 	// Setup a new Entry Point Structure at the beginning of the newly allocated memory page.
 	struct SMBEntryPoint * newEPS = (struct SMBEntryPoint *) kernelMemory;
diff --git a/i386/libsaio/smbios/getters.h b/i386/libsaio/smbios/getters.h
index 1ce0b59..09739a5 100755
--- a/i386/libsaio/smbios/getters.h
+++ b/i386/libsaio/smbios/getters.h
@@ -97,7 +97,7 @@ static SMBWord getFSBFrequency(void)
 
 	/*
 	 * Returning zero (0) here is invalid, but we can get away with it because 
-	 * of XNU's check in tsc.init() which effectively catches the invalid value 
+	 * of XNU's check in tsc_init() which effectively catches the invalid value
 	 * and set it to 100 MHz for Sandy Bridge CPU's (133 MHz when quad pumped).
 	 *
 	 * Note: We don't want to lose the OC feedback in GeekBench et all and that 
@@ -322,7 +322,7 @@ static const char * getBIOSDate(void)
 
 	// biosDate[10] = 0;
 
-	_SMBIOS_DEBUG_DUMP("biosData = %s\n", biosDate);
+	_SMBIOS_DEBUG_DUMP("biosDate = %s\n", biosDate);
 	_SMBIOS_DEBUG_SLEEP(5);
 
 	const char * retValue = biosDate;
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index c445e01..93a24df 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -69,11 +69,16 @@
 		#define SMB_PRODUCT_NAME	"iMac14,2"
 		#define SMB_BOARD_PRODUCT	"Mac-27ADBB7B4CEE8E61"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '2' }
-	#else // Defaults to iMac 14,3
+	#elif (TARGET_MODEL == IMAC_143)
 		#define SMB_BIOS_VERSION	"IM143.88Z.0118.B00.1309031249"
 		#define SMB_PRODUCT_NAME	"iMac14,3"
 		#define SMB_BOARD_PRODUCT	"Mac-77EB7D7DAF985301"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '3' }
+	#else // Defaults to iMac 14,4
+		#define SMB_BIOS_VERSION	"IM144.88Z.0179.B03.1405241029"
+		#define SMB_PRODUCT_NAME	"iMac14,4"
+		#define SMB_BOARD_PRODUCT	"Mac-81E3E92DD6088272"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '4' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -112,14 +117,14 @@
 	#elif (TARGET_MODEL == MACBOOK_AIR_61)
 		// Intel Core i5-4250U @ 1.30 GHz (2 cores - 4 threads)
 		// Intel Core i7-4650U @ 1.70 GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B04.1309271229"
+		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B12.1405241030"
 		#define SMB_PRODUCT_NAME	"MacBookAir6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-35C1E88140C3E6CF"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '6', ',', '1' }
 	#else // Defaults to MacBookAir6,2
 		// Intel Core i5-4250U @ 1.30 GHz (2 cores - 4 threads)
 		// Intel Core i7-4650U @ 1.70 GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B04.1309271229"
+		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B12.1405241030"
 		#define SMB_PRODUCT_NAME	"MacBookAir6,2"
 		#define SMB_BOARD_PRODUCT	"Mac-7DF21CB3ED6977E5"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '6', ',', '2' }
@@ -183,7 +188,7 @@
 		// Intel Core i5-4258U @ 2.40 GHz - 2 cores / 4 threads.
 		// Intel Core i5-4288U @ 2.60 GHz - 2 cores / 4 threads.
 		// Intel Core i7-4558U @ 2.80 GHz - 2 cores / 4 threads.
-		#define SMB_BIOS_VERSION	"MBP111.88Z.0138.B03.1310291227"
+		#define SMB_BIOS_VERSION	"MBP111.88Z.0138.B07.1402121134"
 		#define SMB_PRODUCT_NAME	"MacBookPro11,1"
 		#define SMB_BOARD_PRODUCT	"Mac-189A3D4F975D5FFC"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '1' }
@@ -197,7 +202,7 @@
 	#else
 		// Intel Core i7-4850HQ @ 2.30 GHz - 4 cores / 8 threads.
 		// Intel Core i7-4960HQ @ 2.60 GHz - 4 cores / 8 threads.
-		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B02.1310181745"
+		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B08.1406081756"
 		#define SMB_PRODUCT_NAME	"MacBookPro11,3"
 		#define SMB_BOARD_PRODUCT	"Mac-2BD1B31983FE1663"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '3' }
@@ -240,12 +245,24 @@
 		#define SMB_PRODUCT_NAME	"Macmini6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-031AEE4D24BFF0B1"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '1' }
-	#else // Defaults to Macmini6,2
+	#elif (TARGET_MODEL == MACMINI_62)
 		// Intel Core i7-3615QM @ 2.30 GHz (4 cores - 8 threads)
 		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B03.1211161202"
 		#define SMB_PRODUCT_NAME	"Macmini6,2"
 		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '2' }
+	#elif (TARGET_MODEL == MACMINI_71)
+		//
+		#define SMB_BIOS_VERSION	"MM71.88Z.0106.B03.1411161202"
+		#define SMB_PRODUCT_NAME	"Macmini7,1"
+		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '7', ',', '1' }
+	#else // Defaults to MacPro7,2
+		//
+		#define SMB_BIOS_VERSION	"MM71.88Z.0106.B03.1411161202"
+		#define SMB_PRODUCT_NAME	"Macmini7,2"
+		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '7', ',', '2' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
diff --git a/i386/libsaio/smbios/tools/smbios2struct3.c b/i386/libsaio/smbios/tools/smbios2struct3.c
index 1605831..659bcc9 100755
--- a/i386/libsaio/smbios/tools/smbios2struct3.c
+++ b/i386/libsaio/smbios/tools/smbios2struct3.c
@@ -394,7 +394,15 @@ int main(int argc, char * argv[])
 						droppedTables++;
 						droppedTableStructureStart = tablePtr;
 				}
-				
+
+				if (header->type == kSMBTypeProcessorInformation)
+				{
+					SMBProcessorInformation * cpuInfo = (SMBProcessorInformation *) tablePtr;
+					VERBOSE_DUMP("cpu.externalClock: %d\n", cpuInfo->externalClock);
+					VERBOSE_DUMP("cpu.maximumClock : %d\n", cpuInfo->maximumClock);
+					VERBOSE_DUMP("cpu.currentClock :%d\n", cpuInfo->currentClock);
+				}
+
 				VERBOSE_DUMP("Table: %3d %37s  @%p  Formatted area: %2d bytes  ", header->type, tableDescriptions[header->type], tablePtr, header->length);
 
 				// Skip the formatted area of the structure.
diff --git a/i386/libsaio/sys.c b/i386/libsaio/sys.c
index ab5fcd2..985cefb 100755
--- a/i386/libsaio/sys.c
+++ b/i386/libsaio/sys.c
@@ -603,9 +603,9 @@ struct dirstuff * vol_opendir(BVRef bvr, const char * path)
 		if (dirp->dir_path)
 		{
 			dirp->dir_bvr = bvr;
-		}
 
-		return dirp;
+			return dirp;
+		}
 	}
 
 	closedir(dirp);
@@ -633,9 +633,9 @@ struct dirstuff * opendir(const char * path)
 			if (dirp->dir_path)
 			{
 				dirp->dir_bvr = bvr;
+				
+				return dirp;
 			}
-
-			return dirp;
 		}
 	}
 

From 20c87fbb3088803002d855ea5a95f3379b7468ac Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 12 Oct 2014 17:35:42 +0200
Subject: [PATCH 479/623] Typo

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 106ac27..e9956d1 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 - About this project
 
-This Open Source hobby project was first started by Master Chief, then taken over by RevoGitl (Samantha) and is now maintained by Pike R. Alpha (http://pikeralpha.wordpress.com). A long time supporter of the RevoBoot project.
+This Open Source hobby project was first started by Master Chief, then taken over by RevoGirl (Samantha) and is now maintained by Pike R. Alpha (http://pikeralpha.wordpress.com). A long time supporter of the RevoBoot project.
 
 
 - Server.app

From 625305dfe61a510560eb9deb786f69a3cb079c1c Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 12 Oct 2014 17:42:19 +0200
Subject: [PATCH 480/623] README cleanups

---
 README | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/README b/README
index e9956d1..8aadc67 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 - About this project
 
-This Open Source hobby project was first started by Master Chief, then taken over by RevoGirl (Samantha) and is now maintained by Pike R. Alpha (http://pikeralpha.wordpress.com). A long time supporter of the RevoBoot project.
+This Open Source hobby project was first started by Master Chief, then taken over by DHP/RevoGirl (Samantha †) and is now maintained by Pike R. Alpha (http://pikeralpha.wordpress.com). A long time supporter of the RevoBoot project.
 
 
 - Server.app
@@ -29,16 +29,4 @@ RevoBoot can be built on Snow Leopard, Lion and Mountain Lion. The latter requir
 
 - Configuration
 
-Please note that RevoBoot must be configured for your hardware so start reading our WiKi. See also:
-
-https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder
-
-We also have a configuration README available at:
-
-https://github.com/RevoGirl/RevoBoot/blob/master/i386/config/README
-
-There's also RevoBuilder (a great tool for first starters) over at:
-
-https://github.com/blackosx/RevoBuilder/wiki/Using-RevoBuilder
-
-Note: RevoBuilder is most likeky broken for RevoBoot v.1.5.00 and greater!
+Please note that RevoBoot must be configured for your hardware specifically. This makes it on of, if not the most difficult boot loader to setup, but that's just what you have to do. And sorry, but don't expect any help from me, because I don't have the time for it.

From 3b10fc2ae38e264fbca321e04b52449cae9c7630 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 12 Oct 2014 17:58:56 +0200
Subject: [PATCH 481/623] Compiling now defaults to Macmini62

---
 Makefile                        | 34 ++++++++++++++++++---------------
 i386/config/settings-template.h |  3 ++-
 r                               | 33 ++++++++++++++++----------------
 3 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index c0b0927..ddecfda 100644
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,19 @@
 #
 # Updates:
 #
-#			- Major cleanup (PikerAlpha, October 2012).
-#			- Output improvements (PikerAlpha, October 2012).
-#			- Default build target is now Mountain Lion (PikerAlpha, October 2012).
-#			- PRODUCT_MODEL_TARGET for target build model added (PikerAlpha, October 2012).
-#			- Creates RevoBoot/config/SETTINGS when missing (PikerAlpha, October 2012).
-#			- Copies settings-template.h to SETTINGS/ModelnameNN.h when missing (PikerAlpha, October 2012).
-#			- Automatic ACPI/EFI/SMBIOS data selection (PikerAlpha, October 2012).
-#			- Copies ACPI/EFI/SMBIOS/data-template.h for new conigurations (PikerAlpha, October 2012).
-#			- Output added for cp/mkdir/rm actions (PikerAlpha, November 2012).
-#			- New build target 'help' added (PikerAlpha, November 2012).
-#			- Cleanups and output changed (PikerAlpha, November 2012).
-#			- Yosemite support added (PikerAlpha, June 2014).
-#			- Changed default from Mavericks to Yosemite (PikerAlpha, June 2014).
+#			- Major cleanup (Pike R. Alpha, October 2012).
+#			- Output improvements (Pike R. Alpha, October 2012).
+#			- Default build target is now Mountain Lion (Pike R. Alpha, October 2012).
+#			- PRODUCT_MODEL_TARGET for target build model added (Pike R. Alpha, October 2012).
+#			- Creates RevoBoot/config/SETTINGS when missing (Pike R. Alpha, October 2012).
+#			- Copies settings-template.h to SETTINGS/ModelnameNN.h when missing (Pike R. Alpha, October 2012).
+#			- Automatic ACPI/EFI/SMBIOS data selection (Pike R. Alpha, October 2012).
+#			- Copies ACPI/EFI/SMBIOS/data-template.h for new conigurations (Pike R. Alpha, October 2012).
+#			- Output added for cp/mkdir/rm actions (Pike R. Alpha, November 2012).
+#			- New build target 'help' added (Pike R. Alpha, November 2012).
+#			- Cleanups and output changed (Pike R. Alpha, November 2012).
+#			- Yosemite support added (Pike R. Alpha, June 2014).
+#			- Changed default from Mavericks to Yosemite (Pike R. Alpha, June 2014).
 #
 
 #
@@ -117,7 +117,7 @@ ifdef MODEL
 		#
 		DATA_FILE = $(MODEL)
 	else
-		export MAKE_TARGET_MODEL = default
+		export MAKE_TARGET_MODEL = Macmini62
 		#
 		# Include default/empty static data file (no model identifier specified).
 		#
@@ -127,7 +127,11 @@ else
 	#
 	# Include default settings template (no model identifier specified).
 	#
-	export MAKE_TARGET_MODEL = default
+	export MAKE_TARGET_MODEL = Macmini62
+	#
+	#
+	#
+	MODEL=Macmini62
 	#
 	# Include default/empty static data file (no model identifier specified).
 	#
diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 3429afa..8426894 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -335,8 +335,9 @@
 												// Note: You can check your serial number by visiting the following link:
 												// https://selfsolve.apple.com/agreementWarrantyDynamic.do
 
-#define STATIC_NVRAM_ROM					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN } // Example only!
+#define STATIC_NVRAM_ROM					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } // Example only!
 												// sudo nvram 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14:ROM=%01%02%03%04%05%06%07%08%09%0A%0B%NN%NN%NN%NN%NN%NN
+												//
 												// Note: Use your MAC address for the last six bytes!
 
 #define STATIC_NVRAM_MLB					{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11 } // Example only!
diff --git a/r b/r
index 9f02db6..eb1a405 100755
--- a/r
+++ b/r
@@ -1,5 +1,4 @@
 clear
-make clean
 #
 # Check argument for Mac model.
 #
@@ -13,21 +12,21 @@ if [[ "$1" =~ [iMac|Mac] ]];
     #
     # Check RevoBoot/MODEL for default model.
     #
-    if [ -f MODEL ]; then
-      #
-      # Get MacModelNN from MODEL (assuming it to be correct).
-      #
-      make MODEL=`cat MODEL` > out.log
-    else
-      #
-      # No default model found. Create MODEL file for future use.
-	  #
-	  echo "Macmini" > MODEL
-	  #
-	  # Use Macmini as our default (matches settings-template.h)
-	  #
-      make MODEL=Macmini > out.log
-
-    fi;
+    if [[ -f MODEL ]];
+      then
+        #
+        # Get MacModelNN from MODEL (assuming it to be correct).
+        #
+        make MODEL=`cat MODEL` > out.log
+      else
+        #
+        # No default model found. Create MODEL file for future use.
+        #
+        echo "Macmini62" > MODEL
+        #
+        # Use Macmini62 as our default (matches settings-template.h)
+        #
+        make MODEL=Macmini62 > out.log
+  fi;
 fi
 

From 716168d1c0353d15293a9a11381db58ebdd1d34d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 13 Oct 2014 18:32:15 +0200
Subject: [PATCH 482/623] Cleanups and minor changes

- White Apple logo didn't show when
RevoBoot/i386/config/EFI/Macmodel[nn].h was used
---
 i386/boot2/boot.c       |  9 +++++----
 i386/boot2/bootlogo.c   | 17 +++++++----------
 i386/libsa/Makefile     |  2 +-
 i386/libsaio/platform.c |  2 +-
 r                       |  8 ++++----
 5 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 7fa4727..957e026 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -58,8 +58,6 @@
 #include "sl.h"
 #include "libsa.h"
 
-#include "cpu/proc_reg.h"
-
 // DHP: Dump all global junk a.s.a.p.
 
 long gBootMode = kBootModeQuiet; // no longer defaults to 0 aka kBootModeNormal
@@ -237,12 +235,15 @@ void boot(int biosdev)
 	showBootLogo(bootRecoveryHD);
 #endif
 
-#if (LOAD_MODEL_SPECIFIC_EFI_DATA == 0)
+#if (LOAD_MODEL_SPECIFIC_EFI_DATA == 0 && BLACKMODE == 0)
 	/*
 	 * We can only make this call here when static EFI is included from:
 	 * RevoBoot/i386/config/EFI/[MacModelNN.h] Not when the data is read from:
 	 * /Extra/EFI/ because then RevoBoot/i386/libsaio/platform.c makes the call.
-	 */
+	 *
+ 	 * We can also <em>not</em> call it here if BLACKMODE is enabled, because
+	 * then it fails to load: /usr/standalone/i386/EfiLoginUI/appleLogo.efires
+ 	 */
 	initPartitionChain();
 #endif
 
diff --git a/i386/boot2/bootlogo.c b/i386/boot2/bootlogo.c
index f631fab..09999b8 100755
--- a/i386/boot2/bootlogo.c
+++ b/i386/boot2/bootlogo.c
@@ -105,7 +105,6 @@ void drawDataRectangle(unsigned short x, unsigned short y, unsigned short width,
 
 #include "picopng.h"
 
-
 //==============================================================================
 
 void showBootLogo(bool aBootRecoveryHDFlag)
@@ -149,8 +148,10 @@ void showBootLogo(bool aBootRecoveryHDFlag)
 	setBackgroundColor(backGroundColor);
 	
 	void *imageLoadBuffer = (void *)kLoadAddr;
-
-	sprintf(filename, "%s%s", (aBootRecoveryHDFlag) ? "/com.apple.Boot.P" : "", "/usr/standalone/i386/EfiLoginUI/appleLogo.efires");
+	//
+	// Rock, Paper, Scissors?
+	//
+	sprintf(filename, "%s", (aBootRecoveryHDFlag) ? "/com.apple.Boot.P" : "", "/usr/standalone/i386/EfiLoginUI/appleLogo.efires");
 
 	int EFIResourceFile = open(filename, 0);
 	
@@ -188,18 +189,14 @@ void showBootLogo(bool aBootRecoveryHDFlag)
 					uint8_t *bootImage = malloc((info->width * 4) * info->height);
 					memcpy(bootImage, info->image->data, ((info->width * 4) * info->height));
 	
+#if DEBUG
+					setVideoMode(GRAPHICS_MODE);
+#endif
 					uint16_t x = (VIDEO(width) - MIN(info->width, VIDEO(width)) ) / 2;
 					uint16_t y = (VIDEO(height) - MIN(info->height, VIDEO(height)) ) / 2;
-	
 					blendImage(x, y, info->width, info->height, bootImage);
 					png_alloc_free_all();
-
 					free(bootImage);
-#if INTEL_VGA_REG_DUMP
-					setVideoMode(VGA_TEXT_MODE);
-#endif
-					// extern void vga(void);
-					// vga();
 
 					return;
 				}
diff --git a/i386/libsa/Makefile b/i386/libsa/Makefile
index 70a5b85..d444af7 100644
--- a/i386/libsa/Makefile
+++ b/i386/libsa/Makefile
@@ -26,7 +26,7 @@ INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSAIODIR)
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
-SA_OBJS = prf.o printf.o zalloc.o string.o strtol.o setjmp.o crc32.o
+SA_OBJS = prf.o printf.o zalloc.o string.o strtol.o crc32.o
 
 LIBS = libsa.a
 
diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 8910902..61ea0ba 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -289,7 +289,7 @@ void initPlatform(int biosDevice, bool bootRecoveryHD)
 
 	initKernelBootConfig();
 
-#if (LOAD_MODEL_SPECIFIC_EFI_DATA)
+#if (LOAD_MODEL_SPECIFIC_EFI_DATA || BLACKMODE)
 	/*
 	 * We need to call this much earlier in the boot process when static EFI data
 	 * is read from: /Extra/EFI[MacModelNN.bin]. Otherwise LoadFile (load.c) fails.
diff --git a/r b/r
index eb1a405..896392f 100755
--- a/r
+++ b/r
@@ -7,17 +7,17 @@ if [[ "$1" =~ [iMac|Mac] ]];
     #
     # Use specified MacModelNN from argument.
     #
-    make MODEL=$1 > out.log
+    make MODEL=$1
   else
     #
     # Check RevoBoot/MODEL for default model.
     #
-    if [[ -f MODEL ]];
+    if [ -f MODEL ];
       then
         #
         # Get MacModelNN from MODEL (assuming it to be correct).
         #
-        make MODEL=`cat MODEL` > out.log
+        make MODEL=`cat MODEL`
       else
         #
         # No default model found. Create MODEL file for future use.
@@ -26,7 +26,7 @@ if [[ "$1" =~ [iMac|Mac] ]];
         #
         # Use Macmini62 as our default (matches settings-template.h)
         #
-        make MODEL=Macmini62 > out.log
+        make MODEL=Macmini62
   fi;
 fi
 

From 61cb044ded6b718a764a6957522cf1fca16571bf Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 15 Oct 2014 00:40:45 +0200
Subject: [PATCH 483/623] Moving logo related bits and pieces

---
 i386/boot2/boot.h | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/i386/boot2/boot.h b/i386/boot2/boot.h
index c543955..8bc41c5 100755
--- a/i386/boot2/boot.h
+++ b/i386/boot2/boot.h
@@ -43,19 +43,6 @@
 	#define DEFAULT_SCREEN_HEIGHT	1200
 #endif
 
-#define APPLE_LOGO_WIDTH  128
-#define APPLE_LOGO_HEIGHT 128
-
-/*
- * Used in showBootLogo. Now using the VIDEO() macro instead of the static 
- * values. This way the logo should be properly positioned. With or without 
- * specifying a "Graphics Mode" in com.apple.Boot.plist And no matter what 
- * values you've set in RevoBoot/i386/config/settings.h Should all be fine now.
- */
-
-#define APPLE_LOGO_X    ((VIDEO(width) - APPLE_LOGO_WIDTH) / 2)
-#define APPLE_LOGO_Y    ((VIDEO(height) - APPLE_LOGO_HEIGHT) / 2)
-
 /*
  * How long to wait (in seconds) to load the kernel after displaying the "boot:" prompt.
  */

From 528f084446becd2ca2db83fb1be57240f7fa7af6 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 15 Oct 2014 00:44:38 +0200
Subject: [PATCH 484/623] No more picopng

- this change reduces the size with ~ 6KB
---
 i386/boot2/Makefile   |    7 -
 i386/boot2/graphics.c |   60 --
 i386/boot2/picopng.c  | 1796 -----------------------------------------
 i386/boot2/picopng.h  |   33 -
 4 files changed, 1896 deletions(-)
 delete mode 100644 i386/boot2/picopng.c
 delete mode 100644 i386/boot2/picopng.h

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index fbc3645..4e12262 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -38,13 +38,6 @@ VPATH = $(OBJROOT):$(SYMROOT)
 #
 OBJS = boot2.o boot.o bootlogo.o graphics.o drivers.o options.o lzss.o lzvn.o
 
-ifeq ($(MAKECMDGOALS), yosemite)
-#	OBJS = boot2.o boot.o bootlogo.o graphics.o picopng.o drivers.o options.o lzss.o
-OBJS+=picopng.o
-#else
-#	OBJS = boot2.o boot.o bootlogo.o graphics.o drivers.o options.o lzss.o
-endif
-
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
 #
diff --git a/i386/boot2/graphics.c b/i386/boot2/graphics.c
index 1e26c78..165e777 100755
--- a/i386/boot2/graphics.c
+++ b/i386/boot2/graphics.c
@@ -358,63 +358,3 @@ void setVideoMode(int mode)
 		bootArgs->Video.v_display = VGA_TEXT_MODE;
 	}
 }
-
-//==============================================================================
-
-#define MIN(x, y) ((x) < (y) ? (x) : (y))
-#define MAX(x, y) ((x) > (y) ? (x) : (y))
-
-#define VIDEO(x) (bootArgs->Video.v_ ## x)
-
-void blendImage(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t *data)
-{
-    uint8_t *vram = (uint8_t *) VIDEO(baseAddr) + VIDEO(rowBytes) * y + 4 * x;
-
-    uint16_t drawWidth = (MIN(width, VIDEO(width) - x) * 4);
-
-    height = MIN(height, VIDEO(height) - y);
-	width = (width * 4);
-
-    while (height--)
-	{
-		uint32_t s; uint32_t* d; // Source (img) and destination (bkgd) pixels
-		uint32_t a; // Alpha
-		uint32_t dstrb, dstg, srcrb, srcg, drb, dg, rb, g, tempB; // Intermediate variables
-		uint16_t pos = 0;
-
-		for (; pos < drawWidth; pos += 4)
-		{
-			// Fast pseudo-vector alpha blending, adapted from: http://www.stereopsis.com/doubleblend.html
-			s = *((uint32_t*) (data + pos));
-			d =   (uint32_t*) (vram + pos);
-
-			// Flip B and R in source
-			// TODO: use XCHG and inline assembly to do this in a faster, saner way
-			tempB = (s & 0xFF0000);                     // save B
-			s = (s & 0xFF00FFFF) | ((s & 0xFF) << 16);  // put R in B
-			s = (s & 0xFFFFFF00) | (tempB >> 16);       // put B in R
-		
-			a = (s >> 24) + 1;
-
-			dstrb = *d & 0xFF00FF;
-			dstg  = *d & 0xFF00;
-			srcrb =  s & 0xFF00FF;
-			srcg  =  s & 0xFF00;
-					
-			drb = srcrb - dstrb;
-			dg  =  srcg - dstg;
-			drb *= a;
-			dg *= a;
-			drb >>= 8;
-			dg  >>= 8;
-					
-			rb = (drb + dstrb) & 0xFF00FF;
-			g  = (dg  + dstg) & 0xFF00;
-					
-			*d = rb | g;
-		}
-
-        vram += VIDEO(rowBytes);
-        data += width;
-    }
-}
diff --git a/i386/boot2/picopng.c b/i386/boot2/picopng.c
deleted file mode 100644
index 733a7e2..0000000
--- a/i386/boot2/picopng.c
+++ /dev/null
@@ -1,1796 +0,0 @@
-// picoPNG version 20101224
-// Copyright (c) 2005-2010 Lode Vandevenne
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-//   1. The origin of this software must not be misrepresented; you must not
-//      claim that you wrote the original software. If you use this software
-//      in a product, an acknowledgment in the product documentation would be
-//      appreciated but is not required.
-//   2. Altered source versions must be plainly marked as such, and must not be
-//      misrepresented as being the original software.
-//   3. This notice may not be removed or altered from any source distribution.
-//
-// Note: Ported from CPP to C by kaitek.
-//
-
-#include <sys/types.h>
-#include "libsa.h"
-#include "picopng.h"
-
-
-/*************************************************************************************************/
-
-typedef struct png_alloc_node
-{
-	struct png_alloc_node *prev, *next;
-	void *addr;
-	size_t size;
-} png_alloc_node_t;
-
-png_alloc_node_t *png_alloc_head = NULL;
-png_alloc_node_t *png_alloc_tail = NULL;
-
-//==============================================================================
-
-png_alloc_node_t *png_alloc_find_node(void *addr)
-{
-	png_alloc_node_t *node;
-
-	for (node = png_alloc_head; node; node = node->next)
-	{
-		if (node->addr == addr)
-		{
-			break;
-		}
-	}
-
-	return node;
-}
-
-
-//==============================================================================
-
-void png_alloc_add_node(void *addr, size_t size)
-{
-	png_alloc_node_t *node;
-
-	if (png_alloc_find_node(addr))
-	{
-		return;
-	}
-
-	node = malloc(sizeof(png_alloc_node_t));
-	node->addr = addr;
-	node->size = size;
-	node->prev = png_alloc_tail;
-	node->next = NULL;
-	png_alloc_tail = node;
-
-	if (node->prev)
-	{
-		node->prev->next = node;
-	}
-
-	if (!png_alloc_head)
-	{
-		png_alloc_head = node;
-	}
-}
-
-
-//==============================================================================
-
-void png_alloc_remove_node(png_alloc_node_t *node)
-{
-	if (node->prev)
-	{
-		node->prev->next = node->next;
-	}
-
-	if (node->next)
-	{
-		node->next->prev = node->prev;
-	}
-
-	if (node == png_alloc_head)
-	{
-		png_alloc_head = node->next;
-	}
-
-	if (node == png_alloc_tail)
-	{
-		png_alloc_tail = node->prev;
-	}
-
-	node->prev = node->next = node->addr = NULL;
-	free(node);
-}
-
-
-//==============================================================================
-
-void *png_alloc_malloc(size_t size)
-{
-	void *addr = malloc(size);
-	png_alloc_add_node(addr, size);
-
-	return addr;
-}
-
-
-//==============================================================================
-
-void *png_alloc_realloc(void *addr, size_t size)
-{
-	void *new_addr;
-
-	if (!addr)
-	{
-		return png_alloc_malloc(size);
-	}
-
-	new_addr = realloc(addr, size);
-
-	if (new_addr != addr)
-	{
-		png_alloc_node_t *old_node;
-		old_node = png_alloc_find_node(addr);
-		png_alloc_remove_node(old_node);
-		png_alloc_add_node(new_addr, size);
-	}
-
-	return new_addr;
-}
-
-
-//==============================================================================
-
-void png_alloc_free(void *addr)
-{
-	png_alloc_node_t *node = png_alloc_find_node(addr);
-
-	if (!node)
-	{
-		return;
-	}
-
-	png_alloc_remove_node(node);
-	free(addr);
-}
-
-
-//==============================================================================
-
-void png_alloc_free_all()
-{
-	while (png_alloc_tail)
-	{
-		void *addr = png_alloc_tail->addr;
-		png_alloc_remove_node(png_alloc_tail);
-		free(addr);
-	}
-}
-
-
-//==============================================================================
-
-uint32_t vector32_resize(vector32_t *p, size_t size)
-{
-	/*
-	 * returns 1 if success, 0 if failure ==> nothing done
-	 */
-	if (size * sizeof(uint32_t) > p->allocsize)
-	{
-		size_t newsize = size * sizeof(uint32_t) * 2;
-		void *data = png_alloc_realloc(p->data, newsize);
-
-		if (data)
-		{
-			p->allocsize = newsize;
-			p->data = (uint32_t *) data;
-			p->size = size;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-	else
-	{
-		p->size = size;
-	}
-
-	return 1;
-}
-
-
-//==============================================================================
-
-uint32_t vector32_resizev(vector32_t *p, size_t size, uint32_t value)
-{
-	/*
-	 * resize and give all new elements the value
-	 */
-	size_t oldsize = p->size, i;
-
-	if (!vector32_resize(p, size))
-	{
-		return 0;
-	}
-
-	for (i = oldsize; i < size; i++)
-	{
-		p->data[i] = value;
-	}
-
-	return 1;
-}
-
-
-//==============================================================================
-
-vector32_t *vector32_new(size_t size, uint32_t value)
-{
-	vector32_t *p = png_alloc_malloc(sizeof(vector32_t));
-
-	p->data = NULL;
-	p->size = p->allocsize = 0;
-
-	if (size && !vector32_resizev(p, size, value))
-	{
-		return NULL;
-	}
-
-	return p;
-}
-
-
-//==============================================================================
-
-uint32_t vector8_resize(vector8_t *p, size_t size)
-{
-	/*
-	 * returns 1 if success, 0 if failure ==> nothing done
-	 * xxx: the use of sizeof uint32_t here seems like a bug (this descends from the lodepng vector
-	 * compatibility functions which do the same). without this there is corruption in certain cases,
-	 * so this was probably done to cover up allocation bug(s) in the original picopng code!
-	 */
-	if (size * sizeof(uint32_t) > p->allocsize)
-	{
-		size_t newsize = size * sizeof(uint32_t) * 2;
-		void *data = png_alloc_realloc(p->data, newsize);
-
-		if (data)
-		{
-			p->allocsize = newsize;
-			p->data = (uint8_t *) data;
-			p->size = size;
-		}
-		else
-		{
-			return 0; // error: not enough memory
-		}
-	}
-	else
-	{
-		p->size = size;
-	}
-
-	return 1;
-}
-
-
-/*==============================================================================
- *
- * resize and give all new elements the value
- */
-
-uint32_t vector8_resizev(vector8_t *p, size_t size, uint8_t value)
-{
-	size_t oldsize = p->size, i;
-
-	if (!vector8_resize(p, size))
-	{
-		return 0;
-	}
-
-	for (i = oldsize; i < size; i++)
-	{
-		p->data[i] = value;
-	}
-
-	return 1;
-}
-
-
-//==============================================================================
-
-vector8_t *vector8_new(size_t size, uint8_t value)
-{
-	vector8_t *p = png_alloc_malloc(sizeof(vector8_t));
-
-	p->data = NULL;
-	p->size = p->allocsize = 0;
-
-	if (size && !vector8_resizev(p, size, value))
-	{
-		return NULL;
-	}
-
-	return p;
-}
-
-
-//==============================================================================
-
-vector8_t *vector8_copy(vector8_t *p)
-{
-	vector8_t *q = vector8_new(p->size, 0);
-	uint32_t n;
-
-	for (n = 0; n < q->size; n++)
-	{
-		q->data[n] = p->data[n];
-	}
-
-	return q;
-}
-
-/*************************************************************************************************/
-
-const uint32_t LENBASE[29]		= { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258 };
-const uint32_t LENEXTRA[29]		= { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0 };
-const uint32_t DISTBASE[30]		= { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 };
-const uint32_t DISTEXTRA[30]	= { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13 };
-const uint32_t CLCL[19]			= { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; // Code Length Code Lengths
-
-/*************************************************************************************************/
-
-typedef struct
-{
-	// 2D representation of a huffman tree: The one dimension is "0" or "1", the other contains all
-	// nodes and leaves of the tree.
-	vector32_t *tree2d;
-} HuffmanTree;
-
-
-//==============================================================================
-
-HuffmanTree *HuffmanTree_new()
-{
-	HuffmanTree *tree = png_alloc_malloc(sizeof(HuffmanTree));
-	tree->tree2d = NULL;
-
-	return tree;
-}
-
-
-//==============================================================================
-
-int HuffmanTree_makeFromLengths(HuffmanTree *tree, const vector32_t *bitlen, uint32_t maxbitlen)
-{	// make tree given the lengths
-	uint32_t bits, n, i;
-	uint32_t numcodes = (uint32_t) bitlen->size, treepos = 0, nodefilled = 0;
-	vector32_t *tree1d, *blcount, *nextcode;
-	tree1d = vector32_new(numcodes, 0);
-	blcount = vector32_new(maxbitlen + 1, 0);
-	nextcode = vector32_new(maxbitlen + 1, 0);
-
-	for (bits = 0; bits < numcodes; bits++)
-	{
-		blcount->data[bitlen->data[bits]]++; // count number of instances of each code length
-	}
-
-	for (bits = 1; bits <= maxbitlen; bits++)
-	{
-		nextcode->data[bits] = (nextcode->data[bits - 1] + blcount->data[bits - 1]) << 1;
-	}
-
-	for (n = 0; n < numcodes; n++)
-	{
-		if (bitlen->data[n] != 0)
-		{
-			tree1d->data[n] = nextcode->data[bitlen->data[n]]++; // generate all the codes
-		}
-	}
-
-	// 0x7fff here means the tree2d isn't filled there yet
-	vector32_t *tree2d = vector32_new(numcodes * 2, 0x7fff);
-	tree->tree2d = tree2d;
-
-	for (n = 0; n < numcodes; n++) // the codes
-	{
-		for (i = 0; i < bitlen->data[n]; i++) // the bits for this code
-		{
-			uint32_t bit = (tree1d->data[n] >> (bitlen->data[n] - i - 1)) & 1;
-
-			if (treepos > numcodes - 2)
-			{
-				return 55;
-			}
-			if (tree2d->data[2 * treepos + bit] == 0x7fff) // not yet filled in
-			{
-				if (i + 1 == bitlen->data[n]) // last bit
-				{
-					tree2d->data[2 * treepos + bit] = n;
-					treepos = 0;
-				}
-				else // addresses are encoded as values > numcodes
-				{
-					tree2d->data[2 * treepos + bit] = ++nodefilled + numcodes;
-					treepos = nodefilled;
-				}
-			}
-			else // subtract numcodes from address to get address value
-			{
-				treepos = tree2d->data[2 * treepos + bit] - numcodes;
-			}
-		}
-	}
-
-	return 0;
-}
-
-
-//==============================================================================
-
-int HuffmanTree_decode(const HuffmanTree *tree, bool *decoded, uint32_t *result, size_t *treepos, uint32_t bit)
-{	// Decodes a symbol from the tree
-	const vector32_t *tree2d = tree->tree2d;
-	uint32_t numcodes = (uint32_t) tree2d->size / 2;
-
-	if (*treepos >= numcodes)
-	{
-		return 11; // error: you appeared outside the codetree
-	}
-
-	*result = tree2d->data[2 * (*treepos) + bit];
-	*decoded = (*result < numcodes);
-	*treepos = *decoded ? 0 : *result - numcodes;
-
-	return 0;
-}
-
-
-//==============================================================================
-
-int Inflator_error;
-
-uint32_t Zlib_readBitFromStream(size_t *bitp, const uint8_t *bits)
-{
-	uint32_t result = (bits[*bitp >> 3] >> (*bitp & 0x7)) & 1;
-	(*bitp)++;
-
-	return result;
-}
-
-
-//==============================================================================
-
-uint32_t Zlib_readBitsFromStream(size_t *bitp, const uint8_t *bits, size_t nbits)
-{
-	uint32_t i, result = 0;
-
-	for (i = 0; i < nbits; i++)
-	{
-		result += (Zlib_readBitFromStream(bitp, bits)) << i;
-	}
-
-	return result;
-}
-
-
-//==============================================================================
-
-void Inflator_generateFixedTrees(HuffmanTree *tree, HuffmanTree *treeD)
-{	// get the tree of a deflated block with fixed tree
-	size_t i;
-	vector32_t *bitlen, *bitlenD;
-	bitlen = vector32_new(288, 8);
-	bitlenD = vector32_new(32, 5);
-
-	for (i = 144; i <= 255; i++)
-	{
-		bitlen->data[i] = 9;
-	}
-
-	for (i = 256; i <= 279; i++)
-	{
-		bitlen->data[i] = 7;
-	}
-
-	HuffmanTree_makeFromLengths(tree, bitlen, 15);
-	HuffmanTree_makeFromLengths(treeD, bitlenD, 15);
-}
-
-
-//==============================================================================
-
-uint32_t Inflator_huffmanDecodeSymbol(const uint8_t *in, size_t *bp, const HuffmanTree *codetree, size_t inlength)
-{	// decode a single symbol from given list of bits with given code tree. returns the symbol
-	bool decoded = false;
-	uint32_t ct = 0;
-	size_t treepos = 0;
-
-	for (;;)
-	{
-		if ((*bp & 0x07) == 0 && (*bp >> 3) > inlength)
-		{
-			Inflator_error = 10; // error: end reached without endcode
-
-			return 0;
-		}
-
-		Inflator_error = HuffmanTree_decode(codetree, &decoded, &ct, &treepos, Zlib_readBitFromStream(bp, in));
-
-		if (Inflator_error)
-		{
-			return 0; // stop, an error happened
-		}
-
-		if (decoded)
-		{
-			return ct;
-		}
-	}
-}
-
-
-//==============================================================================
-
-void Inflator_getTreeInflateDynamic(HuffmanTree *tree, HuffmanTree *treeD, const uint8_t *in, size_t *bp, size_t inlength)
-{	// get the tree of a deflated block with dynamic tree, the tree itself is also Huffman
-	// compressed with a known tree
-	size_t i, n;
-	HuffmanTree *codelengthcodetree = HuffmanTree_new(); // the code tree for code length codes
-	vector32_t *bitlen, *bitlenD;
-	bitlen = vector32_new(288, 0);
-	bitlenD = vector32_new(32, 0);
-
-	if (*bp >> 3 >= inlength - 2)
-	{
-		Inflator_error = 49; // the bit pointer is or will go past the memory
-
-		return;
-	}
-
-	size_t HLIT = Zlib_readBitsFromStream(bp, in, 5) + 257;	// number of literal/length codes + 257
-	size_t HDIST = Zlib_readBitsFromStream(bp, in, 5) + 1;	// number of dist codes + 1
-	size_t HCLEN = Zlib_readBitsFromStream(bp, in, 4) + 4;	// number of code length codes + 4
-	vector32_t *codelengthcode; // lengths of tree to decode the lengths of the dynamic tree
-	codelengthcode = vector32_new(19, 0);
-
-	for (i = 0; i < 19; i++)
-	{
-		codelengthcode->data[CLCL[i]] = (i < HCLEN) ? Zlib_readBitsFromStream(bp, in, 3) : 0;
-	}
-
-	Inflator_error = HuffmanTree_makeFromLengths(codelengthcodetree, codelengthcode, 7);
-
-	if (Inflator_error)
-	{
-		return;
-	}
-
-	size_t replength;
-
-	for (i = 0; i < HLIT + HDIST; )
-	{
-		uint32_t code = Inflator_huffmanDecodeSymbol(in, bp, codelengthcodetree, inlength);
-
-		if (Inflator_error)
-		{
-			return;
-		}
-
-		if (code <= 15) // a length code
-		{
-			if (i < HLIT)
-			{
-				bitlen->data[i++] = code;
-			}
-			else
-			{
-				bitlenD->data[i++ - HLIT] = code;
-			}
-		}
-		else if (code == 16) // repeat previous
-		{
-			if (*bp >> 3 >= inlength)
-			{
-				Inflator_error = 50; // error, bit pointer jumps past memory
-
-				return;
-			}
-
-			replength = 3 + Zlib_readBitsFromStream(bp, in, 2);
-			uint32_t value; // set value to the previous code
-
-			if ((i - 1) < HLIT)
-			{
-				value = bitlen->data[i - 1];
-			}
-			else
-			{
-				value = bitlenD->data[i - HLIT - 1];
-			}
-
-			for (n = 0; n < replength; n++) // repeat this value in the next lengths
-			{
-				if (i >= HLIT + HDIST)
-				{
-					Inflator_error = 13; // error: i is larger than the amount of codes
-
-					return;
-				}
-
-				if (i < HLIT)
-				{
-					bitlen->data[i++] = value;
-				}
-				else
-				{
-					bitlenD->data[i++ - HLIT] = value;
-				}
-			}
-		}
-		else if (code == 17) // repeat "0" 3-10 times
-		{
-			if (*bp >> 3 >= inlength)
-			{
-				Inflator_error = 50; // error, bit pointer jumps past memory
-
-				return;
-			}
-
-			replength = 3 + Zlib_readBitsFromStream(bp, in, 3);
-
-			for (n = 0; n < replength; n++) // repeat this value in the next lengths
-			{
-				if (i >= HLIT + HDIST) {
-					Inflator_error = 14; // error: i is larger than the amount of codes
-
-					return;
-				}
-
-				if (i < HLIT)
-				{
-					bitlen->data[i++] = 0;
-				}
-				else
-				{
-					bitlenD->data[i++ - HLIT] = 0;
-				}
-			}
-		}
-		else if (code == 18) // repeat "0" 11-138 times
-		{
-			if (*bp >> 3 >= inlength)
-			{
-				Inflator_error = 50; // error, bit pointer jumps past memory
-
-				return;
-			}
-
-			replength = 11 + Zlib_readBitsFromStream(bp, in, 7);
-
-			for (n = 0; n < replength; n++) // repeat this value in the next lengths
-			{
-				if (i >= HLIT + HDIST)
-				{
-					Inflator_error = 15; // error: i is larger than the amount of codes
-
-					return;
-				}
-
-				if (i < HLIT)
-				{
-					bitlen->data[i++] = 0;
-				}
-				else
-				{
-					bitlenD->data[i++ - HLIT] = 0;
-				}
-			}
-		}
-		else
-		{
-			Inflator_error = 16; // error: an nonexitent code appeared. This can never happen.
-
-			return;
-		}
-	}
-
-	if (bitlen->data[256] == 0)
-	{
-		Inflator_error = 64; // the length of the end code 256 must be larger than 0
-		return;
-	}
-
-	// now we've finally got HLIT and HDIST, so generate the code trees, and the function is done
-	Inflator_error = HuffmanTree_makeFromLengths(tree, bitlen, 15);
-
-	if (Inflator_error)
-	{
-		return;
-	}
-
-	Inflator_error = HuffmanTree_makeFromLengths(treeD, bitlenD, 15);
-
-	if (Inflator_error)
-	{
-		return;
-	}
-}
-
-
-//==============================================================================
-
-void Inflator_inflateHuffmanBlock(vector8_t *out, const uint8_t *in, size_t *bp, size_t *pos, size_t inlength, uint32_t btype)
-{
-	HuffmanTree *codetree, *codetreeD; // the code tree for Huffman codes, dist codes
-	codetree = HuffmanTree_new();
-	codetreeD = HuffmanTree_new();
-
-	if (btype == 1)
-	{
-		Inflator_generateFixedTrees(codetree, codetreeD);
-	}
-	else if (btype == 2)
-	{
-		Inflator_getTreeInflateDynamic(codetree, codetreeD, in, bp, inlength);
-
-		if (Inflator_error)
-		{
-			return;
-		}
-	}
-	for (;;)
-	{
-		uint32_t code = Inflator_huffmanDecodeSymbol(in, bp, codetree, inlength);
-
-		if (Inflator_error)
-		{
-			return;
-		}
-
-		if (code == 256) // end code
-		{
-			return;
-		}
-		else if (code <= 255) // literal symbol
-		{
-			if (*pos >= out->size)
-			{
-				vector8_resize(out, (*pos + 1) * 2); // reserve more room
-			}
-
-			out->data[(*pos)++] = (uint8_t) code;
-		}
-		else if (code >= 257 && code <= 285) // length code
-		{
-			size_t length = LENBASE[code - 257], numextrabits = LENEXTRA[code - 257];
-
-			if ((*bp >> 3) >= inlength)
-			{
-				Inflator_error = 51; // error, bit pointer will jump past memory
-				return;
-			}
-
-			length += Zlib_readBitsFromStream(bp, in, numextrabits);
-			uint32_t codeD = Inflator_huffmanDecodeSymbol(in, bp, codetreeD, inlength);
-
-			if (Inflator_error)
-			{
-				return;
-			}
-
-			if (codeD > 29)
-			{
-				Inflator_error = 18; // error: invalid dist code (30-31 are never used)
-
-				return;
-			}
-
-			uint32_t dist = DISTBASE[codeD], numextrabitsD = DISTEXTRA[codeD];
-
-			if ((*bp >> 3) >= inlength)
-			{
-				Inflator_error = 51; // error, bit pointer will jump past memory
-
-				return;
-			}
-
-			dist += Zlib_readBitsFromStream(bp, in, numextrabitsD);
-			size_t start = *pos, back = start - dist; // backwards
-
-			if (*pos + length >= out->size)
-			{
-				vector8_resize(out, (*pos + length) * 2); // reserve more room
-			}
-
-			size_t i;
-
-			for (i = 0; i < length; i++)
-			{
-				out->data[(*pos)++] = out->data[back++];
-
-				if (back >= start)
-				{
-					back = start - dist;
-				}
-			}
-		}
-	}
-}
-
-
-#ifdef USE_ALL_1
-//==============================================================================
-
-void Inflator_inflateNoCompression(vector8_t *out, const uint8_t *in, size_t *bp, size_t *pos, size_t inlength)
-{
-	while ((*bp & 0x7) != 0)
-	{
-		(*bp)++; // go to first boundary of byte
-	}
-
-	size_t p = *bp / 8;
-
-	if (p >= inlength - 4)
-	{
-		Inflator_error = 52; // error, bit pointer will jump past memory
-
-		return;
-	}
-
-	uint32_t LEN = in[p] + 256 * in[p + 1];
-	uint32_t NLEN = in[p + 2] + 256 * in[p + 3];
-	p += 4;
-
-	if (LEN + NLEN != 65535)
-	{
-		Inflator_error = 21; // error: NLEN is not one's complement of LEN
-
-		return;
-	}
-
-	if (*pos + LEN >= out->size)
-	{
-		vector8_resize(out, *pos + LEN);
-	}
-
-	if (p + LEN > inlength)
-	{
-		Inflator_error = 23; // error: reading outside of in buffer
-
-		return;
-	}
-
-	uint32_t n;
-
-	for (n = 0; n < LEN; n++)
-	{
-		out->data[(*pos)++] = in[p++]; // read LEN bytes of literal data
-	}
-
-	*bp = p * 8;
-}
-#endif
-
-
-//==============================================================================
-
-void Inflator_inflate(vector8_t *out, const vector8_t *in, size_t inpos)
-{
-	size_t bp = 0, pos = 0; // bit pointer and byte pointer
-	Inflator_error = 0;
-	uint32_t BFINAL = 0;
-
-	while (!BFINAL && !Inflator_error)
-	{
-		if (bp >> 3 >= in->size)
-		{
-			Inflator_error = 52; // error, bit pointer will jump past memory
-
-			return;
-		}
-
-		BFINAL = Zlib_readBitFromStream(&bp, &in->data[inpos]);
-		uint32_t BTYPE = Zlib_readBitFromStream(&bp, &in->data[inpos]);
-		BTYPE += 2 * Zlib_readBitFromStream(&bp, &in->data[inpos]);
-
-/*		if (BTYPE == 3)
-		{
-			Inflator_error = 20; // error: invalid BTYPE
-
-			return;
-		}
-		else if (BTYPE == 0)
-		{
-			Inflator_inflateNoCompression(out, &in->data[inpos], &bp, &pos, in->size);
-		}
-		else
-		{*/
-			Inflator_inflateHuffmanBlock(out, &in->data[inpos], &bp, &pos, in->size, BTYPE);
-		//}
-	}
-
-	if (!Inflator_error)
-	{
-		vector8_resize(out, pos); // Only now we know the true size of out, resize it to that
-	}
-}
-
-
-#ifdef USE_ALL_1
-//==============================================================================
-
-int Zlib_decompress(vector8_t *out, const vector8_t *in) // returns error value
-{
-	if (in->size < 2)
-	{
-		return 53; // error, size of zlib data too small
-	}
-
-	if ((in->data[0] * 256 + in->data[1]) % 31 != 0)
-	{
-		// error: 256 * in->data[0] + in->data[1] must be a multiple of 31, the FCHECK value is
-		// supposed to be made that way
-		return 24;
-	}
-
-	uint32_t CM		= in->data[0] & 15;
-	uint32_t CINFO	= (in->data[0] >> 4) & 15;
-	uint32_t FDICT	= (in->data[1] >> 5) & 1;
-
-	if (CM != 8 || CINFO > 7)
-	{
-		// Error: only compression method 8: inflate with sliding window of 32k is supported by the PNG spec
-		return 25;
-	}
-
-	if (FDICT != 0)
-	{
-		// Error: the PNG specification states: "The additional flags shall not specify a preset dictionary."
-		return 26;
-	}
-
-	Inflator_inflate(out, in, 2);
-
-	return Inflator_error; // note: adler32 checksum was skipped and ignored
-}
-#endif
-
-
-//==============================================================================
-
-#define PNG_SIGNATURE	0x0a1a0a0d474e5089ull
-
-#define CHUNK_IHDR		0x52444849
-#define CHUNK_IDAT		0x54414449
-#define CHUNK_IEND		0x444e4549
-#define CHUNK_PLTE		0x45544c50
-#define CHUNK_tRNS		0x534e5274
-
-int PNG_error;
-
-
-#ifdef USE_ALL_1
-//==============================================================================
-
-uint32_t PNG_readBitFromReversedStream(size_t *bitp, const uint8_t *bits)
-{
-	uint32_t result = (bits[*bitp >> 3] >> (7 - (*bitp & 0x7))) & 1;
-	(*bitp)++;
-
-	return result;
-}
-
-
-//==============================================================================
-
-uint32_t PNG_readBitsFromReversedStream(size_t *bitp, const uint8_t *bits, uint32_t nbits)
-{
-	uint32_t i, result = 0;
-
-	for (i = nbits - 1; i < nbits; i--)
-	{
-		result += ((PNG_readBitFromReversedStream(bitp, bits)) << i);
-	}
-
-	return result;
-}
-
-
-//==============================================================================
-
-void PNG_setBitOfReversedStream(size_t *bitp, uint8_t *bits, uint32_t bit)
-{
-	bits[*bitp >> 3] |= (bit << (7 - (*bitp & 0x7)));
-	(*bitp)++;
-}
-#endif
-
-
-/* typedef struct Pixel32
-{
-    union
-	{
-        struct
-		{
-            uint8 b, g, r, a;
-        };
-        uint32 u;
-    };
-}; */
-
-//==============================================================================
-
-uint32_t PNG_read32bitInt(const uint8_t *buffer)
-{
-	return (buffer[0] << 24) | (buffer[1] << 16) | (buffer[2] << 8) | buffer[3];
-}
-
-
-#ifdef USE_ALL_1
-//==============================================================================
-
-int PNG_checkColorValidity(uint32_t colorType, uint32_t bd) // return type is a LodePNG error code
-{
-	if ((colorType == 2 || colorType == 4 || colorType == 6))
-	{
-		if (!(bd == 8 || bd == 16))
-		{
-			return 37;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-	else if (colorType == 0)
-	{
-		if (!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16))
-		{
-			return 37;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-	else if (colorType == 3)
-	{
-		if (!(bd == 1 || bd == 2 || bd == 4 || bd == 8))
-		{
-			return 37;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-	else
-	{
-		return 31; // nonexistent color type
-	}
-}
-
-
-//==============================================================================
-
-uint32_t PNG_getBpp(const PNG_info_t *info)
-{
-	uint32_t bitDepth = info->bitDepth;
-	uint32_t colorType = info->colorType;
-
-	if (colorType == 2)
-	{
-		return (3 * bitDepth);
-	}
-	else if (colorType >= 4)
-	{
-		return (colorType - 2) * bitDepth;
-	}
-	else
-	{
-		return bitDepth;
-	}
-}
-#endif
-
-
-//==============================================================================
-
-void PNG_readPngHeader(PNG_info_t *info, const uint8_t *in, size_t inlength)
-{
-	// read the information from the header and store it in the Info
-	if (inlength < 29)
-	{
-		PNG_error = 27; // error: the data length is smaller than the length of the header
-		return;
-	}
-
-	if (*(uint64_t *) in != PNG_SIGNATURE)
-	{
-		PNG_error = 28; // no PNG signature
-		return;
-	}
-
-	if (*(uint32_t *) &in[12] != CHUNK_IHDR)
-	{
-		PNG_error = 29; // error: it doesn't start with a IHDR chunk!
-		return;
-	}
-
-	info->width = PNG_read32bitInt(&in[16]);
-	info->height = PNG_read32bitInt(&in[20]);
-	info->bitDepth = in[24];
-	info->colorType = in[25];
-	info->compressionMethod = in[26];
-
-	if (in[26] != 0)
-	{
-		PNG_error = 32; // error: only compression method 0 is allowed in the specification
-		return;
-	}
-
-	info->filterMethod = in[27];
-
-	if (in[27] != 0)
-	{
-		PNG_error = 33; // error: only filter method 0 is allowed in the specification
-		return;
-	}
-
-	info->interlaceMethod = in[28];
-
-	if (in[28] > 1)
-	{
-		PNG_error = 34; // error: only interlace methods 0 and 1 exist in the specification
-		return;
-	}
-#ifdef USE_ALL_1
-	PNG_error = PNG_checkColorValidity(info->colorType, info->bitDepth);
-#endif
-}
-
-
-//==============================================================================
-
-int paethPredictor(int a, int b, int c) // Paeth predicter, used by PNG filter type 4
-{
-	int p = a + b - c;
-	int pa = p > a ? (p - a) : (a - p);
-	int pb = p > b ? (p - b) : (b - p);
-	int pc = p > c ? (p - c) : (c - p);
-
-	return (pa <= pb && pa <= pc) ? a : (pb <= pc ? b : c);
-}
-
-
-//==============================================================================
-
-// void PNG_unFilterScanline(uint8_t *recon, const uint8_t *scanline, const uint8_t *precon, size_t bytewidth, uint32_t filterType, size_t length)
-void PNG_unFilterScanline(uint8_t *recon, const uint8_t *scanline, const uint8_t *precon, size_t bytewidth, uint8_t filterType, size_t length)
-{
-	size_t i;
-
-	switch (filterType)
-	{
-		case 0:
-				for (i = 0; i < length; i++)
-				{
-					recon[i] = scanline[i];
-				}
-		break;
-
-		case 1: for (i = 0; i < bytewidth; i++)
-				{
-					recon[i] = scanline[i];
-				}
-
-				for (i = bytewidth; i < length; i++)
-				{
-					recon[i] = scanline[i] + recon[i - bytewidth];
-				}
-		break;
-
-		case 2: if (precon)
-				{
-					for (i = 0; i < length; i++)
-					{
-						recon[i] = scanline[i] + precon[i];
-					}
-				}
-				else
-				{
-					for (i = 0; i < length; i++)
-					{
-						recon[i] = scanline[i];
-					}
-				}
-		break;
-
-		case 3: if (precon)
-				{
-					for (i = 0; i < bytewidth; i++)
-					{
-						recon[i] = scanline[i] + precon[i] / 2;
-					}
-
-					for (i = bytewidth; i < length; i++)
-					{
-						recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) / 2);
-					}
-				}
-				else
-				{
-					for (i = 0; i < bytewidth; i++)
-					{
-						recon[i] = scanline[i];
-					}
-
-					for (i = bytewidth; i < length; i++)
-					{
-						recon[i] = scanline[i] + recon[i - bytewidth] / 2;
-					}
-				}
-		break;
-
-		case 4: if (precon)
-				{
-					for (i = 0; i < bytewidth; i++)
-					{
-						recon[i] = (uint8_t) (scanline[i] + paethPredictor(0, precon[i], 0));
-					}
-
-					for (i = bytewidth; i < length; i++)
-					{
-						recon[i] = (uint8_t) (scanline[i] + paethPredictor(recon[i - bytewidth], precon[i], precon[i - bytewidth]));
-					}
-				}
-				else
-				{
-					for (i = 0; i < bytewidth; i++)
-					{
-						recon[i] = scanline[i];
-					}
-
-					for (i = bytewidth; i < length; i++)
-					{
-						recon[i] = (uint8_t) (scanline[i] + paethPredictor(recon[i - bytewidth], 0, 0));
-					}
-				}
-		break;
-
-		default:	PNG_error = 36; // error: nonexistent filter type given
-					return;
-	}
-}
-
-#ifdef USE_ALL_1
-/*==============================================================================
- * filter and reposition the pixels into the output when the image is Adam7 interlaced. This
- * function can only do it after the full image is already decoded. The out buffer must have
- * the correct allocated memory size already.
- */
-
-void PNG_adam7Pass(uint8_t *out, uint8_t *linen, uint8_t *lineo, const uint8_t *in, uint32_t w,
-				   size_t passleft, size_t passtop, size_t spacex, size_t spacey, size_t passw, size_t passh, uint32_t bpp)
-{
-	if (passw)
-	{
-		size_t bytewidth = (bpp + 7) / 8, linelength = 1 + ((bpp * passw + 7) / 8);
-		uint32_t y = 0;
-
-		for (; y < passh; y++)
-		{
-			size_t i, b;
-			uint8_t filterType = in[y * linelength];
-			uint8_t *prevline = (y == 0) ? 0 : lineo;
-			PNG_unFilterScanline(linen, &in[y * linelength + 1], prevline, bytewidth, filterType, (w * bpp + 7) / 8);
-
-			if (!PNG_error)
-			{
-				if (bpp >= 8)
-				{
-					for (i = 0; i < passw; i++)
-					{
-						for (b = 0; b < bytewidth; b++) // b = current byte of this pixel
-						{
-							out[bytewidth * w * (passtop + spacey * y) + bytewidth * (passleft + spacex * i) + b] = linen[bytewidth * i + b];
-						}
-					}
-				}
-				else
-				{
-					for (i = 0; i < passw; i++)
-					{
-						size_t obp = bpp * w * (passtop + spacey * y) + bpp * (passleft + spacex * i);
-						size_t bp = i * bpp;
-
-						for (b = 0; b < bpp; b++)
-						{
-							PNG_setBitOfReversedStream(&obp, out, PNG_readBitFromReversedStream(&bp, linen));
-						}
-					}
-				}
-			}
-
-			uint8_t *temp = linen;
-			linen = lineo;
-			lineo = temp; // swap the two buffer pointers "line old" and "line new"
-		}
-	}
-}
-
-
-/*==============================================================================
- * Converts any color type to 32-bit. 
- * Returns a LodePNG error code
- */
-
-int PNG_convert(const PNG_info_t *info, vector8_t *out, const uint8_t *in)
-{
-	size_t c, i;
-	uint32_t bitDepth, colorType;
-	bitDepth = info->bitDepth;
-	colorType = info->colorType;
-	size_t numpixels = info->width * info->height;
-	vector8_resize(out, numpixels * 4);
-	uint8_t *out_data = out->size ? out->data : 0;
-
-	size_t  bp = 0;
-	
-	if (bitDepth == 8 && colorType == 0) // Greyscale
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[i];
-			out_data[4 * i + 3] = (info->key_defined && (in[i] == info->key_r)) ? 0 : 255;
-		}
-	}
-	else if (bitDepth == 8 && colorType == 2) // RGB color
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			for (c = 0; c < 3; c++)
-			{
-				out_data[4 * i + c] = in[3 * i + c];
-			}
-
-			out_data[4 * i + 3] = (info->key_defined && (in[3 * i + 0] == info->key_r) && (in[3 * i + 1] == info->key_g) && (in[3 * i + 2] == info->key_b)) ? 0 : 255;
-		}
-	}
-	else if (bitDepth == 8 && colorType == 3) // indexed color (palette)
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			if (4U * in[i] >= info->palette->size)
-			{
-				return 46;
-			}
-
-			for (c = 0; c < 4; c++) // Get rgb colors from the palette
-			{
-				out_data[4 * i + c] = info->palette->data[4 * in[i] + c];
-			}
-		}
-	}
-	else if (bitDepth == 8 && colorType == 4) // Greyscale with alpha
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[2 * i + 0];
-			out_data[4 * i + 3] = in[2 * i + 1];
-		}
-	}
-	else if (bitDepth == 8 && colorType == 6)
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			for (c = 0; c < 4; c++)
-			{
-				out_data[4 * i + c] = in[4 * i + c]; // RGB with alpha
-			}
-		}
-	}
-	else if (bitDepth == 16 && colorType == 0) // Greyscale
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[2 * i];
-			out_data[4 * i + 3] = (info->key_defined && (256U * in[i] + in[i + 1] == info->key_r)) ? 0 : 255;
-		}
-	}
-	else if (bitDepth == 16 && colorType == 2) // RGB color
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			for (c = 0; c < 3; c++)
-			{
-				out_data[4 * i + c] = in[6 * i + 2 * c];
-			}
-
-			out_data[4 * i + 3] = (info->key_defined &&
-								   (256U * in[6 * i + 0] + in[6 * i + 1] == info->key_r) &&
-								   (256U * in[6 * i + 2] + in[6 * i + 3] == info->key_g) &&
-								   (256U * in[6 * i + 4] + in[6 * i + 5] == info->key_b)) ? 0 : 255;
-		}
-	}
-	else if (bitDepth == 16 && colorType == 4) // Greyscale with alpha
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = in[4 * i]; // msb
-			out_data[4 * i + 3] = in[4 * i + 2];
-		}
-	}
-	else if (bitDepth == 16 && colorType == 6)
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			for (c = 0; c < 4; c++)
-			{
-				out_data[4 * i + c] = in[8 * i + 2 * c]; // RGB with alpha
-			}
-		}
-	}
-	else if (bitDepth < 8 && colorType == 0) // Greyscale
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			uint32_t value = (PNG_readBitsFromReversedStream(&bp, in, bitDepth) * 255) / ((1 << bitDepth) - 1); // Scale value from 0 to 255
-			out_data[4 * i + 0] = out_data[4 * i + 1] = out_data[4 * i + 2] = (uint8_t) value;
-			out_data[4 * i + 3] = (info->key_defined && value && (((1U << bitDepth) - 1U) == info->key_r) && ((1U << bitDepth) - 1U)) ? 0 : 255;
-		}
-	}
-	else if (bitDepth < 8 && colorType == 3) // Palette
-	{
-		for (i = 0; i < numpixels; i++)
-		{
-			uint32_t value = PNG_readBitsFromReversedStream(&bp, in, bitDepth);
-
-			if (4 * value >= info->palette->size)
-			{
-				return 47;
-			}
-
-			for (c = 0; c < 4; c++) // Get RGB colors from the palette
-			{
-				out_data[4 * i + c] = info->palette->data[4 * value + c];
-			}
-		}
-	}
-	return 0;
-}
-#endif
-
-
-//==============================================================================
-
-PNG_info_t *PNG_info_new()
-{
-	PNG_info_t *info = png_alloc_malloc(sizeof(PNG_info_t));
-	uint32_t i;
-
-	for (i = 0; i < sizeof(PNG_info_t); i++)
-	{
-		((uint8_t *) info)[i] = 0;
-	}
-
-	info->palette	= vector8_new(0, 0);
-	info->image		= vector8_new(0, 0);
-
-	return info;
-}
-
-
-//==============================================================================
-
-PNG_info_t *PNG_decode(const uint8_t *in, uint32_t size)
-{
-	if (size == 0 || in == 0)
-	{
-		PNG_error = 48; // the given data is empty
-		return NULL;
-	}
-
-	PNG_error = 0;
-	PNG_info_t *info = PNG_info_new();
-	PNG_readPngHeader(info, in, size);
-
-	if (PNG_error)
-	{
-		return NULL;
-	}
-
-	size_t pos = 33; // first byte of the first chunk after the header
-	vector8_t *idat = NULL; // the data from IDAT chunks
-	bool IEND = false;
-	bool known_type = true;
-	info->key_defined = false;
-
-	/*
-	 * Loop through the chunks, ignoring unknown chunks and stopping at IEND chunk.
-	 * IDAT data is put at the start of the in buffer
-	 */
-	while (!IEND)
-	{
-		size_t i;
-
-		if (pos + 8 >= size)
-		{
-			PNG_error = 30; // error: size of the in buffer too small to contain next chunk
-			return NULL;
-		}
-
-		size_t chunkLength = PNG_read32bitInt(&in[pos]);
-		pos += 4;
-
-		if (chunkLength > 0x7fffffff)
-		{
-			PNG_error = 63;
-			return NULL;
-		}
-
-		if (pos + chunkLength >= size)
-		{
-			PNG_error = 35; // error: size of the in buffer too small to contain next chunk
-			return NULL;
-		}
-
-		uint32_t chunkType = *(uint32_t *) &in[pos];
-
-		if (chunkType == CHUNK_IDAT) // IDAT: compressed image data chunk
-		{
-			size_t offset = 0;
-
-			if (idat)
-			{
-				offset = idat->size;
-				vector8_resize(idat, offset + chunkLength);
-			}
-			else
-			{
-				idat = vector8_new(chunkLength, 0);
-			}
-
-			for (i = 0; i < chunkLength; i++)
-			{
-				idat->data[offset + i] = in[pos + 4 + i];
-			}
-
-			pos += (4 + chunkLength);
-		}
-		else if (chunkType == CHUNK_IEND) // IEND
-		{
-			pos += 4;
-			IEND = true;
-		}
-#ifdef USE_ALL_1
-		else if (chunkType == CHUNK_PLTE) // PLTE: palette chunk
-		{
-			size_t j;
-			pos += 4; // go after the 4 letters
-			vector8_resize(info->palette, 4 * (chunkLength / 3));
-
-			if (info->palette->size > (4 * 256))
-			{
-				PNG_error = 38; // error: palette too big
-				return NULL;
-			}
-
-			for (i = 0; i < info->palette->size; i += 4)
-			{
-				for (j = 0; j < 3; j++)
-				{
-					info->palette->data[i + j] = in[pos++]; // RGB
-				}
-
-				info->palette->data[i + 3] = 255; // alpha
-			}
-		}
-		else if (chunkType == CHUNK_tRNS) // tRNS: palette transparency chunk
-		{
-			pos += 4; // go after the 4 letters
-
-			if (info->colorType == 3)
-			{
-				if (4 * chunkLength > info->palette->size)
-				{
-					PNG_error = 39; // error: more alpha values given than there are palette entries
-					return NULL;
-				}
-
-				for (i = 0; i < chunkLength; i++)
-				{
-					info->palette->data[4 * i + 3] = in[pos++];
-				}
-			}
-			else if (info->colorType == 0)
-			{
-				if (chunkLength != 2)
-				{
-					PNG_error = 40; // error: this chunk must be 2 bytes for greyscale image
-					return NULL;
-				}
-
-				info->key_defined = true;
-				info->key_r = info->key_g = info->key_b = 256 * in[pos] + in[pos + 1];
-				pos += 2;
-			}
-			else if (info->colorType == 2)
-			{
-				if (chunkLength != 6)
-				{
-					PNG_error = 41; // error: this chunk must be 6 bytes for RGB image
-					return NULL;
-				}
-
-				info->key_defined = true;
-				info->key_r = 256 * in[pos] + in[pos + 1];
-				pos += 2;
-				info->key_g = 256 * in[pos] + in[pos + 1];
-				pos += 2;
-				info->key_b = 256 * in[pos] + in[pos + 1];
-				pos += 2;
-			}
-			else
-			{
-				PNG_error = 42; // error: tRNS chunk not allowed for other color models
-				return NULL;
-			}
-		}
-#endif
-		else // it's not an implemented chunk type, so ignore it: skip over the data
-		{
-			if (!(in[pos + 0] & 32))
-			{
-				// error: unknown critical chunk (5th bit of first byte of chunk type is 0)
-				PNG_error = 69;
-				return NULL;
-			}
-
-			pos += (chunkLength + 4); // skip 4 letters and uninterpreted data of unimplemented chunk
-			known_type = false;
-		}
-
-		pos += 4; // step over CRC (which is ignored)
-	}
-
-#if USE_ALL_1
-	uint32_t bpp = PNG_getBpp(info);
-#else
-	uint32_t bpp = 32;
-#endif
-	vector8_t *scanlines; // now the out buffer will be filled
-	scanlines = vector8_new(((info->width * (info->height * bpp + 7)) / 8) + info->height, 0);
-#if USE_ALL_1
-	PNG_error = Zlib_decompress(scanlines, idat);
-#else
-	Inflator_inflate(scanlines, idat, 2);
-	PNG_error = Inflator_error;
-#endif
-
-	if (PNG_error)
-	{
-		return NULL; // stop if the zlib decompressor returned an error
-	}
-
-	size_t bytewidth = (bpp + 7) / 8, outlength = (info->height * info->width * bpp + 7) / 8;
-	vector8_resize(info->image, outlength); // time to fill the out buffer
-	uint8_t *out_data = outlength ? info->image->data : 0;
-
-#ifdef USE_ALL_1
-	if (info->interlaceMethod == 0) // no interlace, just filter
-	{
-		size_t obp, bp;
-#endif
-		size_t y = 0;
-		size_t linestart = 0;
-		// length in bytes of a scanline, excluding the filtertype byte
-		size_t linelength = (info->width * bpp + 7) / 8;
-#ifdef USE_ALL_1
-		if (bpp >= 8) // byte per byte
-		{
-#endif
-			for (y = 0; y < info->height; y++)
-			{
-//				uint32_t filterType = scanlines->data[linestart];
-				uint8_t filterType = scanlines->data[linestart];
-				const uint8_t *prevline;
-				prevline = (y == 0) ? 0 : &out_data[(y - 1) * info->width * bytewidth];
-				PNG_unFilterScanline(&out_data[linestart - y], &scanlines->data[linestart + 1], prevline, bytewidth, filterType, linelength);
-
-				if (PNG_error)
-				{
-					return NULL;
-				}
-
-				linestart += (1 + linelength); // go to start of next scanline
-			}
-#ifdef USE_ALL_1
-		}
-		else // less than 8 bits per pixel, so fill it up bit per bit
-		{
-			vector8_t *templine; // only used if bpp < 8
-			templine = vector8_new((info->width * bpp + 7) >> 3, 0);
-
-			for (y = 0, obp = 0; y < info->height; y++)
-			{
-				// uint32_t filterType = scanlines->data[linestart];
-				uint8_t filterType = scanlines->data[linestart];
-				const uint8_t *prevline;
-				prevline = (y == 0) ? 0 : &out_data[(y - 1) * info->width * bytewidth];
-				PNG_unFilterScanline(templine->data, &scanlines->data[linestart + 1], prevline, bytewidth, filterType, linelength);
-
-				if (PNG_error)
-				{
-					return NULL;
-				}
-
-				for (bp = 0; bp < info->width * bpp;)
-				{
-					PNG_setBitOfReversedStream(&obp, out_data, PNG_readBitFromReversedStream(&bp, templine->data));
-				}
-
-				linestart += (1 + linelength); // go to start of next scanline
-			}
-		}
-	}
-	else // interlaceMethod is 1 (Adam7)
-	{
-		int i;
-		size_t passw[7] =
-		{
-			(info->width + 7) / 8, (info->width + 3) / 8, (info->width + 3) / 4,
-			(info->width + 1) / 4, (info->width + 1) / 2, (info->width + 0) / 2,
-			(info->width + 0) / 1
-		};
-
-		size_t passh[7] =
-		{
-			(info->height + 7) / 8, (info->height + 7) / 8, (info->height + 3) / 8,
-			(info->height + 3) / 4, (info->height + 1) / 4, (info->height + 1) / 2,
-			(info->height + 0) / 2
-		};
-
-		size_t passstart[7] = { 0 };
-		size_t pattern[28] = { 0, 4, 0, 2, 0, 1, 0, 0, 0, 4, 0, 2, 0, 1, 8, 8, 4, 4, 2, 2, 1, 8, 8,
-				8, 4, 4, 2, 2 }; // values for the adam7 passes
-
-		for (i = 0; i < 6; i++)
-		{
-			passstart[i + 1] = passstart[i] + passh[i] * ((passw[i] ? 1 : 0) + (passw[i] * bpp + 7) / 8);
-		}
-
-		vector8_t *scanlineo, *scanlinen; // "old" and "new" scanline
-		scanlineo = vector8_new((info->width * bpp + 7) / 8, 0);
-		scanlinen = vector8_new((info->width * bpp + 7) / 8, 0);
-
-		for (i = 0; i < 7; i++)
-		{
-			PNG_adam7Pass(out_data, scanlinen->data, scanlineo->data, &scanlines->data[passstart[i]],
-					info->width, pattern[i], pattern[i + 7], pattern[i + 14], pattern[i + 21],
-					passw[i], passh[i], bpp);
-		}
-	}
-
-	if (info->colorType != 6 || info->bitDepth != 8) // conversion needed
-	{
-		vector8_t *copy = vector8_copy(info->image); // xxx: is this copy necessary?
-		PNG_error = PNG_convert(info, info->image, copy->data);
-	}
-#endif
-	return info;
-}
diff --git a/i386/boot2/picopng.h b/i386/boot2/picopng.h
deleted file mode 100644
index 66c2c9e..0000000
--- a/i386/boot2/picopng.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _PICOPNG_H
-#define _PICOPNG_H
-
-#include <stdint.h>
-
-typedef struct {
-	uint32_t *data;
-	size_t size;
-	size_t allocsize;
-} vector32_t;
-
-typedef struct {
-	uint8_t *data;
-	size_t size;
-	size_t allocsize;
-} vector8_t;
-
-typedef struct {
-	uint32_t width, height;
-	uint32_t colorType, bitDepth;
-	uint32_t compressionMethod, filterMethod, interlaceMethod;
-	uint32_t key_r, key_g, key_b;
-	bool key_defined; // is a transparent color key given?
-	vector8_t *palette;
-	vector8_t *image;
-} PNG_info_t;
-
-PNG_info_t *PNG_decode(const uint8_t *in, uint32_t size);
-void png_alloc_free_all();
-
-extern int PNG_error;
-
-#endif

From bfe307945611e041527ccbbd9b0455f6f8dddf3d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 15 Oct 2014 00:46:15 +0200
Subject: [PATCH 485/623] Removing unused CLUT data

---
 i386/boot2/appleClut8.h | 96 -----------------------------------------
 1 file changed, 96 deletions(-)
 delete mode 100755 i386/boot2/appleClut8.h

diff --git a/i386/boot2/appleClut8.h b/i386/boot2/appleClut8.h
deleted file mode 100755
index 50416f7..0000000
--- a/i386/boot2/appleClut8.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All rights reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Portions Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights
- * Reserved.  This file contains Original Code and/or Modifications of
- * Original Code as defined in and that are subject to the Apple Public
- * Source License Version 2.0 (the "License").  You may not use this file
- * except in compliance with the License.  Please obtain a copy of the
- * License at http://www.apple.com/publicsource and read it before using
- * this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __BOOT2_APPLECLUT8_H
-#define __BOOT2_APPLECLUT8_H
-
-static const unsigned char appleClut8[ 256 * 3 ] =
-{
-	0xff,0xff,0xff, 0xbf,0xbf,0xbf, 0xbe,0xbe,0xbe, 0xbd,0xbd,0xbd,
-	0xbc,0xbc,0xbc, 0xff,0xff,0x00, 0xba,0xba,0xba, 0xb9,0xb9,0xb9,
-	0xb8,0xb8,0xb8, 0xb7,0xb7,0xb7, 0xb6,0xb6,0xb6, 0xb5,0xb5,0xb5,
-	0xb4,0xb4,0xb4, 0xb3,0xb3,0xb3, 0xb2,0xb2,0xb2, 0x00,0x00,0x00,
-	0xb1,0xb1,0xb1, 0xb0,0xb0,0xb0, 0xaf,0xaf,0xaf, 0xae,0xae,0xae,
-	0xad,0xad,0xad, 0xac,0xac,0xac, 0xab,0xab,0xab, 0xaa,0xaa,0xaa,
-	0xff,0x00,0xff, 0xa9,0xa9,0xa9, 0xa8,0xa8,0xa8, 0xa7,0xa7,0xa7,
-	0xa6,0xa6,0xa6, 0xa5,0xa5,0xa5, 0xa4,0xa4,0xa4, 0xa3,0xa3,0xa3,
-	0xa2,0xa2,0xa2, 0xa1,0xa1,0xa1, 0xa0,0xa0,0xa0, 0xff,0x00,0x00,
-	0x9f,0x9f,0x9f, 0x9e,0x9e,0x9e, 0x9d,0x9d,0x9d, 0x9c,0x9c,0x9c,
-	0x9b,0x9b,0x9b, 0x9a,0x9a,0x9a, 0xcc,0xcc,0xff, 0xcc,0xcc,0xcc,
-	0x99,0x99,0x99, 0x98,0x98,0x98, 0x97,0x97,0x97, 0x96,0x96,0x96,
-	0x95,0x95,0x95, 0x94,0x94,0x94, 0x93,0x93,0x93, 0x92,0x92,0x92,
-	0x91,0x91,0x91, 0x90,0x90,0x90, 0x8f,0x8f,0x8f, 0x8e,0x8e,0x8e,
-	0x8d,0x8d,0x8d, 0x8c,0x8c,0x8c, 0x8b,0x8b,0x8b, 0x8a,0x8a,0x8a,
-	0x89,0x89,0x89, 0x87,0x87,0x87, 0x86,0x86,0x86, 0x85,0x85,0x85,
-	0x84,0x84,0x84, 0x83,0x83,0x83, 0x82,0x82,0x82, 0x81,0x81,0x81,
-	0x80,0x80,0x80, 0x7f,0x7f,0x7f, 0x7e,0x7e,0x7e, 0x7d,0x7d,0x7d,
-	0x7c,0x7c,0x7c, 0x7b,0x7b,0x7b, 0x7a,0x7a,0x7a, 0x79,0x79,0x79,
-	0x78,0x78,0x78, 0x76,0x76,0x76, 0x75,0x75,0x75, 0x74,0x74,0x74,
-	0x73,0x73,0x73, 0x72,0x72,0x72, 0x71,0x71,0x71, 0x70,0x70,0x70,
-	0x6f,0x6f,0x6f, 0x6e,0x6e,0x6e, 0x6d,0x6d,0x6d, 0x6c,0x6c,0x6c,
-	0x6b,0x6b,0x6b, 0x6a,0x6a,0x6a, 0x69,0x69,0x69, 0x68,0x68,0x68,
-	0x67,0x67,0x67, 0x66,0x66,0x66, 0x64,0x64,0x64, 0x63,0x63,0x63,
-	0x62,0x62,0x62, 0x61,0x61,0x61, 0x60,0x60,0x60, 0x5f,0x5f,0x5f,
-	0x5e,0x5e,0x5e, 0x5d,0x5d,0x5d, 0x5c,0x5c,0x5c, 0x5b,0x5b,0x5b,
-	0x5a,0x5a,0x5a, 0x59,0x59,0x59, 0x58,0x58,0x58, 0x57,0x57,0x57,
-	0x56,0x56,0x56, 0x54,0x54,0x54, 0x53,0x53,0x53, 0x52,0x52,0x52,
-	0x51,0x51,0x51, 0x50,0x50,0x50, 0x4f,0x4f,0x4f, 0x4e,0x4e,0x4e,
-	0x4d,0x4d,0x4d, 0x4c,0x4c,0x4c, 0x4b,0x4b,0x4b, 0x4a,0x4a,0x4a,
-	0x49,0x49,0x49, 0x48,0x48,0x48, 0x47,0x47,0x47, 0x46,0x46,0x46,
-	0x45,0x45,0x45, 0x43,0x43,0x43, 0x42,0x42,0x42, 0x41,0x41,0x41,
-	0x40,0x40,0x40, 0x3f,0x3f,0x3f, 0x3e,0x3e,0x3e, 0x3d,0x3d,0x3d,
-	0x3c,0x3c,0x3c, 0x3b,0x3b,0x3b, 0x3a,0x3a,0x3a, 0x39,0x39,0x39,
-	0x38,0x38,0x38, 0x37,0x37,0x37, 0x36,0x36,0x36, 0x35,0x35,0x35,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x00,0xff,0xff, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x00,0xff,0x00, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x00,0x00,0xff, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0xdd,0x00,0x00, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x00,0xbb,0x00,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65,
-	0x65,0x65,0x65, 0x65,0x65,0x65, 0x65,0x65,0x65, 0xbb,0xbb,0xbb,
-	0x65,0x65,0x65, 0x88,0x88,0x88, 0x77,0x77,0x77, 0x55,0x55,0x55,
-	0x44,0x44,0x44, 0x22,0x22,0x22, 0x65,0x65,0x65, 0x00,0x00,0x00
-};
-
-#endif /* !__BOOT2_APPLECLUT8_H */

From 0cecbbf5f372dd5d6fbd1a034cbfccbfb409f2bd Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 15 Oct 2014 00:46:48 +0200
Subject: [PATCH 486/623] Stop drawing the background/logo twice

---
 i386/boot2/boot.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 957e026..d177375 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -231,7 +231,9 @@ void boot(int biosdev)
 		printf("\ngArchCPUType (CPU): %s\n", (gArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386");
 		sleep(3); // Silent sleep.
 	#endif
-#else
+#endif
+
+#if (DEBUG_STATE_ENABLED == 0)
 	showBootLogo(bootRecoveryHD);
 #endif
 
@@ -747,7 +749,7 @@ void boot(int biosdev)
 				// Switch to graphics mode and show the Apple logo on a gray-ish background.
 				showBootLogo(bootRecoveryHD);
 			}
-			
+
 			_BOOT_DEBUG_DUMP("execKernel-8\n");
 
 			startMachKernel(kernelEntry, bootArgs); // asm.s

From 55f23f2cdccfcc65e271b4c33f7d658f0fe35279 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 15 Oct 2014 00:49:20 +0200
Subject: [PATCH 487/623] Use LZVN packed logo data instead of old RLE data

---
 i386/boot2/bootlogo.c | 220 +++++-----------------------------
 i386/boot2/bootlogo.h | 268 ++++++++++++++++++++----------------------
 2 files changed, 155 insertions(+), 333 deletions(-)

diff --git a/i386/boot2/bootlogo.c b/i386/boot2/bootlogo.c
index 09999b8..e5bfe87 100755
--- a/i386/boot2/bootlogo.c
+++ b/i386/boot2/bootlogo.c
@@ -29,7 +29,6 @@
 #include "boot.h"
 #include "bootlogo.h"
 #include "bootstruct.h"
-#include "appleClut8.h"
 
 #define DEBUG 0
 
@@ -38,16 +37,16 @@
 unsigned long lookUpCLUTIndex(unsigned char index)
 {
 	long colorIndex = (index * 3);
-	long red   = appleClut8[ colorIndex   ];
-	long green = appleClut8[ colorIndex++ ];
-	long blue  = appleClut8[ colorIndex++ ];
+	long red   = AppleLogoBlackClut[ colorIndex   ];
+	long green = AppleLogoBlackClut[ colorIndex++ ];
+	long blue  = AppleLogoBlackClut[ colorIndex++ ];
 	
 	return (red << 16) | (green << 8) | blue;
 }
 
 //==============================================================================
 
-void * stosl(void * dst, long val, long len)
+void * stosl(void *dst, long val, long len)
 {
 	asm volatile ("rep; stosl"
 				  : "=c" (len), "=D" (dst)
@@ -71,10 +70,11 @@ void setBackgroundColor(uint32_t aBackGroundColor)
 	
 	int rem = (pixelBytes * width) % 4;
 	int length = pixelBytes * width / 4;
-	
+
+	bcopy(&aBackGroundColor, vram, rem);
+
 	while (height--)
 	{
-		bcopy(&aBackGroundColor, vram, rem);
 		stosl(vram + rem, aBackGroundColor, length);
 		vram += VIDEO(rowBytes);
 	}
@@ -82,7 +82,7 @@ void setBackgroundColor(uint32_t aBackGroundColor)
 
 //==============================================================================
 
-void drawDataRectangle(unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char * data)
+void drawDataRectangle(unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char *data)
 {
 	unsigned short drawWidth;
 	
@@ -95,133 +95,12 @@ void drawDataRectangle(unsigned short x, unsigned short y, unsigned short width,
 	
 	while (height--)
 	{
-		bcopy( data, vram, drawWidth * pixelBytes );
+		bcopy( data, vram, width * pixelBytes );
 		vram += VIDEO(rowBytes);
 		data += width * pixelBytes;
 	}
 }
 
-#if (MAKE_TARGET_OS == YOSEMITE)
-
-#include "picopng.h"
-
-//==============================================================================
-
-void showBootLogo(bool aBootRecoveryHDFlag)
-{
-#if DEBUG
-	printf("aBootRecoveryHDFlag: %s\n", aBootRecoveryHDFlag ? "true" : "false");
-	sleep(1);
-#else
-	setVideoMode(GRAPHICS_MODE);
-#endif
-
-	uint32_t backGroundColor = 0xbfbfbf;
-
-	char filename[60] = "";
-	char targetLogoName[30] = "appleLogo_apple";
-
-	// bootArgs->flags |= kBootArgsFlagBlack is set by boot.efi (EFI var 'BlackMode')
-	if (bootArgs->flags & kBootArgsFlagBlackTheme) // kBootArgsFlagBlack)
-	{
-		backGroundColor = 0x030000;
-#if DEBUG
-		printf("Black mode active!\n");
-		sleep(1);
-#endif
-	}
-	else
-	{
-		sprintf(targetLogoName, "%s%s", targetLogoName, "_gray");
-#if DEBUG
-		printf("Gray mode active!\n");
-		sleep(1);
-#endif
-	}
-
-	// bootArgs->flags |= kBootArgsFlagHiDPI is set by boot.efi (EFI var 'UIScale')
-	sprintf(targetLogoName, "%s%s.png", targetLogoName, (bootArgs->flags & kBootArgsFlagHiDPI) ? "@2x" : "");
-#if DEBUG
-	printf("targetLogoName: %s\n", targetLogoName);
-	sleep(1);
-#endif
-	setBackgroundColor(backGroundColor);
-	
-	void *imageLoadBuffer = (void *)kLoadAddr;
-	//
-	// Rock, Paper, Scissors?
-	//
-	sprintf(filename, "%s", (aBootRecoveryHDFlag) ? "/com.apple.Boot.P" : "", "/usr/standalone/i386/EfiLoginUI/appleLogo.efires");
-
-	int EFIResourceFile = open(filename, 0);
-	
-	if (EFIResourceFile >= 0)
-	{
-		int filesize = file_size(EFIResourceFile);
-		
-		if (read(EFIResourceFile, (char *) kLoadAddr, filesize) == filesize)
-		{
-			EFIRES_HEADER * header = (EFIRES_HEADER *) imageLoadBuffer;
-#if DEBUG
-			printf("\nheader->revision..: %d\n", header->revision);
-			printf("header->imageCount: %d\n", header->imageCount);
-#endif
-			int pos = sizeof(header);
-
-			for (int index = 0; index < header->imageCount; index++)
-			{
-				EFIRES_IMAGE_HEADER * imageHeader = (EFIRES_IMAGE_HEADER *) (imageLoadBuffer + pos);
-#if DEBUG
-				printf("imageHeader->filename.: %s\n", imageHeader->filename);
-				printf("imageHeader->offset...: %d\n", imageHeader->offset);
-				printf("imageHeader->imageSize: %d\n", imageHeader->imageSize);
-				sleep(2);
-#endif
-				if (strncmp((char *)imageHeader->filename, targetLogoName, strlen(targetLogoName)) == 0)
-				{
-					PNG_info_t *info = PNG_decode((imageLoadBuffer + imageHeader->offset), imageHeader->imageSize);
-#if DEBUG
-					printf("Apple logo image found!\n");
-					printf("Image width...........: %d\n", info->width);
-					printf("Image height..........: %d\n", info->height);
-					sleep(3);
-#endif
-					uint8_t *bootImage = malloc((info->width * 4) * info->height);
-					memcpy(bootImage, info->image->data, ((info->width * 4) * info->height));
-	
-#if DEBUG
-					setVideoMode(GRAPHICS_MODE);
-#endif
-					uint16_t x = (VIDEO(width) - MIN(info->width, VIDEO(width)) ) / 2;
-					uint16_t y = (VIDEO(height) - MIN(info->height, VIDEO(height)) ) / 2;
-					blendImage(x, y, info->width, info->height, bootImage);
-					png_alloc_free_all();
-					free(bootImage);
-
-					return;
-				}
-				else
-				{
-					pos += sizeof(EFIRES_IMAGE_HEADER);
-				}
-			}
-		}
-
-		close(EFIResourceFile);
-	}
-#if DEBUG
-	else
-	{
-		setVideoMode(VGA_TEXT_MODE);
-		error("showBootLogo(Error)");
-	}
-#endif
-
-}
-
-#else
-
-
 //==============================================================================
 
 int convertImage(unsigned short width, unsigned short height, const unsigned char *imageData, unsigned char **newImageData)
@@ -258,73 +137,34 @@ int convertImage(unsigned short width, unsigned short height, const unsigned cha
 }
 
 
-/*==============================================================================
-
-void drawDataRectangle(unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char * data)
-{
-	unsigned short drawWidth;
-
-	long pixelBytes = VIDEO(depth) / 8;
-
-	unsigned char * vram = (unsigned char *) VIDEO(baseAddr) + VIDEO(rowBytes) * y + pixelBytes * x;
-	
-	drawWidth = MIN(width, VIDEO(width) - x);
-	height = MIN(height, VIDEO(height) - y);
-
-	while (height--)
-	{
-		bcopy( data, vram, drawWidth * pixelBytes );
-		vram += VIDEO(rowBytes);
-		data += width * pixelBytes;
-	}
-} */
-
-
-//==============================================================================
-
-char * decodeRLE(const void * rleData, int rleBlocks, int outBytes)
-{
-	char *out, *cp;
-
-	struct RLEBlock
-	{
-		unsigned char count;
-		unsigned char value;
-	} * bp = (struct RLEBlock *) rleData;
-
-	out = cp = (char *) malloc(outBytes);
-
-	if (out == NULL)
-	{
-		return NULL;
-	}
-	
-	while (rleBlocks--)
-	{
-		memset( cp, bp->value, bp->count );
-		cp += bp->count;
-		bp++;
-	}
-
-	return out;
-}
-
 //==============================================================================
 
 void showBootLogo(bool aBootRecoveryHDFlag)
 {
-	uint8_t *bootImageData = NULL;
-	uint8_t *appleBootLogo = (uint8_t *) decodeRLE(appleLogoRLE, 686, 16384); 
-
 	setVideoMode(GRAPHICS_MODE);
+
+#if BLACKMODE
+	setBackgroundColor(0x030000);
+	uint32_t compressedSize = sizeof(AppleLogoBlackPacked);
+	void *logoData = (void *)AppleLogoBlackPacked;
+#else
 	setBackgroundColor(0xbfbfbf);
+	uint32_t compressedSize = sizeof(AppleLogoBlackPacked);
+	void *logoData = (void *)AppleLogoPacked;
+#endif
 
-	convertImage(APPLE_LOGO_WIDTH, APPLE_LOGO_HEIGHT, appleBootLogo, &bootImageData);
+	int logoSize = (APPLE_LOGO_WIDTH * APPLE_LOGO_HEIGHT);
+	void * decompressedData = malloc(logoSize);
 
-	drawDataRectangle(APPLE_LOGO_X, APPLE_LOGO_Y, APPLE_LOGO_WIDTH, APPLE_LOGO_HEIGHT, bootImageData);
+	if (decompressedData)
+	{
+		if (lzvn_decode(decompressedData, logoSize, logoData, compressedSize) == logoSize)
+		{
+			 uint8_t *bootImageData = NULL;
+			 convertImage(APPLE_LOGO_WIDTH, APPLE_LOGO_HEIGHT, decompressedData, &bootImageData);
+			 drawDataRectangle(APPLE_LOGO_X, APPLE_LOGO_Y, APPLE_LOGO_WIDTH, APPLE_LOGO_HEIGHT, bootImageData);
+		}
 
-	free(bootImageData);
-	free(appleBootLogo); 
+		free(decompressedData);
+	}
 }
-
-#endif
diff --git a/i386/boot2/bootlogo.h b/i386/boot2/bootlogo.h
index 0701596..2fb9b65 100755
--- a/i386/boot2/bootlogo.h
+++ b/i386/boot2/bootlogo.h
@@ -1,160 +1,142 @@
 
+#define APPLE_LOGO_WIDTH  84
+#define APPLE_LOGO_HEIGHT 103
+
+#define VIDEO(x) (bootArgs->Video.v_ ## x)
+
+/*
+ * Used in showBootLogo(). Now using the VIDEO() macro instead of the static
+ * values. This way the logo should be properly positioned. With or without
+ * specifying a "Graphics Mode" in com.apple.Boot.plist And no matter what
+ * values you've set in RevoBoot/i386/config/settings.h Should all be fine now.
+ */
+
+#define APPLE_LOGO_X    ((VIDEO(width) - APPLE_LOGO_WIDTH) / 2)
+#define APPLE_LOGO_Y    ((VIDEO(height) - APPLE_LOGO_HEIGHT) / 2)
+
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
 
-#define VIDEO(x) (bootArgs->Video.v_ ## x)
 
+#if ((MAKE_TARGET_OS == YOSEMITE) && (BLACKMODE == 1))
 
-#if (MAKE_TARGET_OS == YOSEMITE)
+//
+// LZVN packed data for white Apple logo (blackmode).
+//
 
-typedef struct
+static UInt8 AppleLogoBlackPacked[ 912 ] =
 {
-	uint16_t	revision;
-	uint16_t	imageCount;
-} __attribute__((packed)) EFIRES_HEADER;
+	0x68, 0x01, 0x00, 0xF0, 0xFF, 0xF0, 0xB7, 0xE4, 0x01, 0x02, 0x01, 0x00, 0xFA, 0xF0, 0x33, 0xE7,	0x03, 0x04, 0x05, 0x06, 0x06, 0x07, 0x00, 0xFA, 0xF0, 0x30, 0xE4, 0x08, 0x07, 0x05, 0x06, 0xF4,
+	0x38, 0x54, 0xF0, 0x31, 0x58, 0x52, 0x09, 0x38, 0x54, 0xF0, 0x31, 0xC8, 0x01, 0x01, 0x0A, 0x06,	0xF4, 0x38, 0x54, 0xF0, 0x2E, 0x68, 0xA5, 0x03, 0x00, 0x01, 0x68, 0xA5, 0x02, 0xF0, 0x2D, 0xC8,
+	0x01, 0x00, 0x0B, 0x06, 0xF7, 0x39, 0xF8, 0xF0, 0x2C, 0x38, 0x53, 0xF3, 0x6E, 0x0C, 0xF0, 0x2D,	0x6E, 0x0D, 0xF4, 0x9E, 0x06, 0x0E, 0xF0, 0x2E, 0x9E, 0x08, 0x0C, 0xF6, 0x9E, 0x06, 0x0D, 0xF0,
+	0x2D, 0x9E, 0x00, 0x0E, 0xF7, 0x6E, 0x0A, 0xF0, 0x2C, 0x6E, 0x01, 0xF5, 0x9E, 0x06, 0x0B, 0xF0,	0x2D, 0x9E, 0x00, 0x04, 0xF7, 0x6E, 0x0F, 0xF0, 0x2C, 0x38, 0xA7, 0xF5, 0x39, 0x4E, 0xF0, 0x39,
+	0x3B, 0x44, 0xF0, 0x2C, 0x39, 0xF5, 0xF3, 0x38, 0xFA, 0xF0, 0x2B, 0x38, 0xFB, 0xF4, 0xCE, 0x0A,	0x08, 0x00, 0xF0, 0x30, 0x6E, 0x03, 0xF3, 0x38, 0x53, 0xF0, 0x2D, 0x9E, 0x00, 0x07, 0xF4, 0x6E,
+	0x04, 0xF0, 0x2F, 0x38, 0x54, 0xC8, 0x01, 0x05, 0x03, 0x00, 0xF0, 0x34, 0x20, 0x54, 0x98, 0xA5,	0x05, 0x07, 0xF0, 0x32, 0x20, 0x54, 0xC8, 0x52, 0x05, 0x10, 0x0B, 0xF0, 0x37, 0x01, 0xF8, 0x98,
+	0x50, 0x02, 0x02, 0xF0, 0x28, 0xE4, 0x02, 0x07, 0x04, 0x0F, 0x00, 0x01, 0x9D, 0xCB, 0x10, 0x07,	0xFF, 0xE4, 0x08, 0x0B, 0x04, 0x0F, 0x11, 0x09, 0xE4, 0x06, 0x0F, 0x04, 0x09, 0x3B, 0x50, 0xF0,
+	0x0C, 0xC8, 0x01, 0x0B, 0x10, 0x06, 0xF6, 0x99, 0x93, 0x05, 0x04, 0xF9, 0xB1, 0x47, 0x1A, 0x08,	0x0B, 0x10, 0x01, 0x9D, 0xF0, 0x0C, 0x0E, 0xF0, 0x0A, 0x2F, 0x68, 0x07, 0x38, 0x01, 0xF1, 0x68,
+	0x35, 0x05, 0xF3, 0x6C, 0x49, 0x02, 0xF6, 0x20, 0x01, 0x68, 0x56, 0x04, 0xF0, 0x05, 0x68, 0x52,	0x03, 0xF9, 0x10, 0x01, 0x88, 0x36, 0x0A, 0x0B, 0x9D, 0x95, 0x0D, 0x0E, 0xF8, 0x38, 0x01, 0xF1,
+	0x3B, 0xFF, 0xF0, 0x00, 0x68, 0xF6, 0x08, 0xF4, 0x38, 0x01, 0xF5, 0x98, 0x6F, 0x0C, 0x0F, 0xF0,	0x00, 0x20, 0x01, 0x69, 0x58, 0x0A, 0xFF, 0x68, 0x87, 0x0D, 0xF0, 0x01, 0x38, 0x01, 0xF0, 0x09,
+	0x68, 0x55, 0x05, 0xFD, 0x68, 0x89, 0x0D, 0xF0, 0x05, 0x38, 0x01, 0xF0, 0x07, 0x38, 0x55, 0xFA,	0x38, 0x53, 0xF0, 0x25, 0x38, 0x55, 0xFA, 0x68, 0x53, 0x01, 0xF0, 0x28, 0x3C, 0xAF, 0xF9, 0x3A,
+	0x76, 0xF5, 0x38, 0x01, 0xF0, 0x1A, 0x6A, 0x53, 0x0C, 0xF7, 0x3C, 0xCB, 0xF1, 0x38, 0x01, 0xF0,	0x1E, 0x3D, 0x03, 0xF6, 0xA3, 0x04, 0x1B, 0x38, 0x01, 0xF0, 0x1A, 0x9E, 0x09, 0x00, 0xF9, 0x23,
+	0xC0, 0x38, 0x01, 0xF0, 0x21, 0xA3, 0xBE, 0x1F, 0x98, 0x01, 0x02, 0x06, 0xF0, 0x2A, 0x38, 0x53,	0xF7, 0x9E, 0x00, 0x10, 0xF0, 0x2A, 0x6E, 0x04, 0xF9, 0x39, 0x4E, 0xF0, 0x27, 0xA4, 0xF0, 0x24,
+	0x98, 0x01, 0x09, 0x06, 0xF0, 0x29, 0x3B, 0x43, 0xF9, 0x3A, 0x9C, 0xF0, 0x26, 0x38, 0xFA, 0xF8,	0x9E, 0x00, 0x08, 0xF0, 0x29, 0xA4, 0x15, 0x2E, 0xA2, 0x3D, 0x20, 0x38, 0x01, 0xF0, 0x1A, 0x38,
+	0xA7, 0xF9, 0x3B, 0x44, 0xF0, 0x27, 0xA4, 0xC5, 0x1F, 0x3A, 0xF1, 0xF0, 0x26, 0x68, 0x01, 0x00,	0xFB, 0x39, 0xA3, 0xF0, 0x25, 0xA4, 0x92, 0x27, 0x68, 0x01, 0x06, 0xF0, 0x26, 0xA4, 0x32, 0x1A,
+	0x68, 0x01, 0x06, 0xF0, 0x26, 0x38, 0x54, 0xFA, 0x3B, 0x46, 0xF0, 0x26, 0xA4, 0x61, 0x21, 0x3C,	0x41, 0xF0, 0x26, 0x38, 0x54, 0xF0, 0x8E, 0x6E, 0x09, 0xF0, 0x3B, 0x39, 0xF8, 0xF0, 0x3A, 0x6E,
+	0x10, 0xFB, 0x38, 0x54, 0xF0, 0x26, 0x6E, 0x0C, 0xF0, 0x3B, 0x3C, 0x97, 0xFA, 0x3B, 0xF0, 0xF0,	0x27, 0x39, 0xA5, 0xFA, 0x38, 0x54, 0xF0, 0x26, 0x38, 0xFD, 0xFA, 0x6E, 0x07, 0xF0, 0x28, 0x6E,
+	0x0B, 0xFA, 0xA2, 0x9A, 0x43, 0x38, 0x01, 0xF0, 0x1A, 0x38, 0xA9, 0xF9, 0xA2, 0x9F, 0x43, 0x38,	0x01, 0xF0, 0x1A, 0x3A, 0xA3, 0xF9, 0x3F, 0xD3, 0x09, 0xF0, 0x28, 0xA3, 0xE7, 0x1C, 0x3F, 0xDA,
+	0x08, 0xF0, 0x28, 0xAB, 0xF2, 0x34, 0x0C, 0x3F, 0xE0, 0x07, 0xF0, 0x27, 0xA4, 0xF0, 0x29, 0x6E,	0x0D, 0xF0, 0x2A, 0x38, 0x55, 0xF8, 0x6E, 0x0C, 0xF0, 0x2B, 0x69, 0x54, 0x0C, 0xF7, 0xA4, 0x2A,
+	0x35, 0x38, 0x01, 0xF0, 0x17, 0x39, 0xFE, 0xF4, 0x3F, 0x36, 0x08, 0xF0, 0x26, 0x20, 0x01, 0x6A,	0xFD, 0x0C, 0xF5, 0x3A, 0x4E, 0xF0, 0x28, 0x18, 0x01, 0x3C, 0xF8, 0xF2, 0xA2, 0xA7, 0x47, 0x38,
+	0x01, 0xF0, 0x20, 0x3C, 0x4F, 0xF2, 0x3F, 0xD0, 0x0B, 0xF0, 0x29, 0x10, 0x01, 0x3C, 0xF7, 0xF3,	0x3A, 0xF7, 0xF0, 0x28, 0x08, 0x01, 0x3D, 0xF3, 0xF4, 0x3C, 0x48, 0xF0, 0x27, 0x10, 0x01, 0xA3,
+	0x38, 0x26, 0x3A, 0xA3, 0xF0, 0x2B, 0x6E, 0x00, 0xF6, 0x38, 0xA9, 0xF0, 0x2A, 0x3D, 0x48, 0xF7,	0x38, 0xA9, 0xF0, 0x28, 0x3D, 0x47, 0xF8, 0x38, 0xA9, 0xF0, 0x28, 0x3D, 0xEF, 0xF9, 0x38, 0xA9,
+	0xF0, 0x26, 0x3D, 0xEE, 0xF9, 0x3F, 0x90, 0x08, 0xF0, 0x27, 0x6E, 0x03, 0xFC, 0x6E, 0x10, 0xF0,	0x25, 0xA4, 0x4F, 0x54, 0x6B, 0xF6, 0x08, 0xF0, 0x24, 0xAC, 0xE9, 0x20, 0x05, 0x3C, 0x9F, 0xF0,
+	0x25, 0xA4, 0xE5, 0x20, 0x10, 0x01, 0x3D, 0x48, 0xF0, 0x20, 0xA5, 0x37, 0x58, 0x69, 0xFC, 0x08,	0xF0, 0x20, 0xAB, 0x92, 0x1B, 0x05, 0x38, 0x01, 0x3F, 0x9A, 0x06, 0xF0, 0x1E, 0x39, 0xF4, 0xFB,
+	0x28, 0x01, 0x3A, 0xFA, 0xF0, 0x1C, 0xA7, 0x3C, 0x65, 0x39, 0x53, 0xF0, 0x1A, 0xA7, 0x6A, 0x5D,	0x3D, 0x4A, 0xF0, 0x18, 0xA7, 0x1F, 0x5C, 0x6F, 0x2B, 0x0E, 0x08, 0xF0, 0x18, 0x68, 0x53, 0x05,
+	0xF0, 0x09, 0x00, 0x55, 0x38, 0xAA, 0xF9, 0xE8, 0x0F, 0x0E, 0x09, 0x02, 0x02, 0x02, 0x0B, 0x07,	0x38, 0x1B, 0xF9, 0x6A, 0xED, 0x0A, 0xFF, 0x38, 0x01, 0xF5, 0xA3, 0xC8, 0x1B, 0xAA, 0x69, 0x5A,
+	0x0F, 0x68, 0x57, 0x0B, 0xF7, 0x68, 0xA6, 0x10, 0xF0, 0x0B, 0x10, 0x01, 0x6A, 0xA8, 0x03, 0xF2,	0xAB, 0x16, 0x56, 0x05, 0x9B, 0xC4, 0x01, 0x0E, 0xF4, 0x6A, 0x45, 0x0C, 0xF0, 0x05, 0x38, 0x01,
+	0xF5, 0x88, 0x39, 0x0B, 0x10, 0x98, 0x34, 0x0A, 0x04, 0xF0, 0x00, 0x8F, 0x62, 0x15, 0x03, 0x0E,	0x98, 0x52, 0x0F, 0x04, 0xF0, 0x16, 0x38, 0x01, 0xF0, 0xFF, 0xF0, 0x63, 0xE1, 0x00, 0x06, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
 
-typedef struct
-{
-	char		filename[64];
-	uint32_t	offset;
-	uint32_t	imageSize;
-} __attribute__((packed)) EFIRES_IMAGE_HEADER;
+//
+// CLUT (Color LookUp Table) for white Apple logo.
+//
 
-typedef struct
+static UInt8 AppleLogoBlackClut[ 64 ] =
 {
-	char		signature[8];
-	uint32_t	length;
-	char		chunkType[4];
-	uint32_t	width;
-	uint32_t	height;
-	uint8_t		bitDepth;
-	uint8_t		colorType;
-	uint8_t		compressionMethod;
-	uint8_t		filterMethod;
-	uint8_t		interlaceMethod;
-	uint32_t	checksum;
-} __attribute__((packed)) IMAGE_CHUNK_HEADER;
-
-extern void blendImage(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t *data);
+	0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x50, 0x50, 0x50, 0x9F, 0x9F, 0x9F, 0xEF,	0xEF, 0xEF, 0xFF, 0xFF, 0xFF, 0x80, 0x80, 0x80, 0x10, 0x10, 0x10, 0x70, 0x70, 0x70, 0xCF, 0xCF,
+	0xCF, 0x60, 0x60, 0x60, 0xDF, 0xDF, 0xDF, 0x30, 0x30, 0x30, 0x8F, 0x8F, 0x8F, 0xBF, 0xBF, 0xBF,	0xAF, 0xAF, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
 
 #else
 
-const unsigned char appleLogoRLE[1372] =
+//
+// LZVN packed data for grey Apple logo.
+//
+
+static UInt8 AppleLogoPacked[ 1392 ] =
 {
-    0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0x50, 0x01, 0x01, 0x02, 0x01, 0x17,
-    0x01, 0x34, 0x01, 0x47, 0x03, 0x50, 0x01, 0x13, 0x76, 0x01, 0x01, 0x03,
-    0x01, 0x20, 0x01, 0x40, 0x06, 0x50, 0x01, 0x13, 0x75, 0x01, 0x01, 0x1a,
-    0x01, 0x42, 0x07, 0x50, 0x01, 0xfa, 0x01, 0x0a, 0x73, 0x01, 0x01, 0x07,
-    0x01, 0x34, 0x09, 0x50, 0x01, 0x43, 0x01, 0x02, 0x72, 0x01, 0x01, 0x0e,
-    0x01, 0x43, 0x0a, 0x50, 0x01, 0x36, 0x72, 0x01, 0x01, 0x14, 0x01, 0x4a,
-    0x0b, 0x50, 0x01, 0x20, 0x71, 0x01, 0x01, 0x12, 0x01, 0x4b, 0x0b, 0x50,
-    0x01, 0x4d, 0x01, 0x0b, 0x70, 0x01, 0x01, 0x0b, 0x01, 0x48, 0x0c, 0x50,
-    0x01, 0xf9, 0x70, 0x01, 0x01, 0x03, 0x01, 0x3e, 0x0d, 0x50, 0x01, 0x1f,
-    0x70, 0x01, 0x01, 0x2f, 0x0d, 0x50, 0x01, 0x48, 0x01, 0x06, 0x6f, 0x01,
-    0x01, 0x15, 0x01, 0x4f, 0x0d, 0x50, 0x01, 0x27, 0x6f, 0x01, 0x01, 0x02,
-	0x01, 0x3f, 0x0d, 0x50, 0x01, 0x45, 0x01, 0xf7, 0x6f, 0x01, 0x01, 0x1d,
-	0x0e, 0x50, 0x01, 0x19, 0x6f, 0x01, 0x01, 0x02, 0x01, 0x40, 0x0d, 0x50,
-	0x01, 0x2f, 0x70, 0x01, 0x01, 0x15, 0x0d, 0x50, 0x01, 0x3b, 0x01, 0x03,
-	0x70, 0x01, 0x01, 0x34, 0x0c, 0x50, 0x01, 0x3f, 0x01, 0x07, 0x70, 0x01,
-	0x01, 0xf7, 0x01, 0x47, 0x0b, 0x50, 0x01, 0xf9, 0x01, 0x07, 0x71, 0x01,
-	0x01, 0x14, 0x0b, 0x50, 0x01, 0x36, 0x01, 0xf7, 0x72, 0x01, 0x01, 0x24,
-	0x09, 0x50, 0x01, 0x4d, 0x01, 0x28, 0x74, 0x01, 0x01, 0x33, 0x08, 0x50,
-	0x01, 0x3f, 0x01, 0x14, 0x75, 0x01, 0x01, 0x3a, 0x06, 0x50, 0x01, 0x41,
-	0x01, 0x1f, 0x01, 0x02, 0x76, 0x01, 0x01, 0x3a, 0x03, 0x50, 0x01, 0x48,
-	0x01, 0x35, 0x01, 0x17, 0x01, 0x02, 0x78, 0x01, 0x01, 0x15, 0x01, 0x33,
-	0x01, 0x27, 0x01, 0x15, 0x01, 0xf7, 0x67, 0x01, 0x01, 0x02, 0x01, 0x08,
-	0x01, 0x0e, 0x01, 0x13, 0x01, 0x14, 0x01, 0x12, 0x01, 0x0d, 0x01, 0x06,
-	0x01, 0x02, 0x1c, 0x01, 0x01, 0x04, 0x01, 0x0b, 0x01, 0x12, 0x01, 0x17,
-	0x01, 0x19, 0x01, 0x15, 0x01, 0x11, 0x01, 0x08, 0x01, 0x02, 0x4e, 0x01,
-	0x01, 0x02, 0x01, 0x11, 0x01, 0x26, 0x01, 0x39, 0x01, 0x44, 0x01, 0x4c,
-	0x01, 0x4f, 0x02, 0x50, 0x01, 0x4f, 0x01, 0x4d, 0x01, 0x4a, 0x01, 0x3f,
-	0x01, 0x31, 0x01, 0x19, 0x01, 0xf7, 0x15, 0x01, 0x01, 0x0b, 0x01, 0x1c,
-	0x01, 0x2e, 0x01, 0xf9, 0x01, 0x46, 0x01, 0x4d, 0x04, 0x50, 0x01, 0x4f,
-	0x01, 0x4b, 0x01, 0x42, 0x01, 0x34, 0x01, 0x1f, 0x01, 0x0a, 0x49, 0x01,
-	0x01, 0xf7, 0x01, 0x21, 0x01, 0x3f, 0x01, 0x4f, 0x0d, 0x50, 0x01, 0x47,
-	0x01, 0x2d, 0x01, 0x0d, 0x10, 0x01, 0x01, 0x0d, 0x01, 0x25, 0x01, 0x3d,
-	0x01, 0xfa, 0x0e, 0x50, 0x01, 0x4c, 0x01, 0x37, 0x01, 0x15, 0x45, 0x01,
-	0x01, 0x04, 0x01, 0x25, 0x01, 0x45, 0x12, 0x50, 0x01, 0x4d, 0x01, 0x39,
-	0x01, 0x19, 0x01, 0x02, 0x0a, 0x01, 0x01, 0x09, 0x01, 0x21, 0x01, 0xf9,
-	0x01, 0x4d, 0x14, 0x50, 0x01, 0xf9, 0x01, 0x15, 0x42, 0x01, 0x01, 0x17,
-	0x01, 0x42, 0x17, 0x50, 0x01, 0x42, 0x01, 0x27, 0x01, 0x0e, 0x01, 0x02,
-	0x03, 0x01, 0x01, 0x02, 0x01, 0x0b, 0x01, 0x1f, 0x01, 0x38, 0x01, 0x4b,
-	0x19, 0x50, 0x01, 0x33, 0x01, 0x06, 0x3e, 0x01, 0x01, 0x03, 0x01, 0x2e,
-	0x1b, 0x50, 0x01, 0x4d, 0x01, 0x43, 0x01, 0x3a, 0x01, 0x37, 0x01, 0x3a,
-	0x01, 0x42, 0x01, 0x4d, 0x1d, 0x50, 0x01, 0x42, 0x01, 0x0e, 0x3c, 0x01,
-	0x01, 0x0a, 0x01, 0xf9, 0x41, 0x50, 0x01, 0x48, 0x01, 0x13, 0x3a, 0x01,
-	0x01, 0x0d, 0x01, 0x45, 0x43, 0x50, 0x01, 0x4b, 0x01, 0x12, 0x38, 0x01,
-	0x01, 0x10, 0x01, 0x48, 0x45, 0x50, 0x01, 0x48, 0x01, 0x0b, 0x36, 0x01,
-	0x01, 0x0c, 0x01, 0x48, 0x47, 0x50, 0x01, 0x3d, 0x01, 0x03, 0x34, 0x01,
-	0x01, 0x07, 0x01, 0x42, 0x49, 0x50, 0x01, 0x21, 0x34, 0x01, 0x01, 0x37,
-	0x49, 0x50, 0x01, 0x42, 0x01, 0x12, 0x33, 0x01, 0x01, 0x22, 0x49, 0x50,
-	0x01, 0x34, 0x01, 0xf7, 0x33, 0x01, 0x01, 0x0b, 0x01, 0x4b, 0x48, 0x50,
-	0x01, 0x2c, 0x35, 0x01, 0x01, 0x36, 0x48, 0x50, 0x01, 0x29, 0x35, 0x01,
-	0x01, 0x11, 0x01, 0x4f, 0x47, 0x50, 0x01, 0x2e, 0x36, 0x01, 0x01, 0x36,
-	0x47, 0x50, 0x01, 0x3a, 0x01, 0x02, 0x35, 0x01, 0x01, 0x0b, 0x01, 0xfa,
-	0x46, 0x50, 0x01, 0x46, 0x01, 0x08, 0x36, 0x01, 0x01, 0x26, 0x46, 0x50,
-	0x01, 0x4e, 0x01, 0x15, 0x36, 0x01, 0x01, 0x02, 0x01, 0x40, 0x46, 0x50,
-	0x01, 0x31, 0x37, 0x01, 0x01, 0x0e, 0x01, 0x4e, 0x45, 0x50, 0x01, 0x49,
-	0x01, 0x08, 0x37, 0x01, 0x01, 0x25, 0x46, 0x50, 0x01, 0x29, 0x38, 0x01,
-	0x01, 0x39, 0x45, 0x50, 0x01, 0x4c, 0x01, 0x0a, 0x37, 0x01, 0x01, 0xf7,
-	0x01, 0x47, 0x45, 0x50, 0x01, 0x3a, 0x38, 0x01, 0x01, 0x10, 0x01, 0x4f,
-	0x45, 0x50, 0x01, 0x22, 0x38, 0x01, 0x01, 0x1d, 0x46, 0x50, 0x01, 0x12,
-	0x38, 0x01, 0x01, 0x29, 0x45, 0x50, 0x01, 0x4b, 0x01, 0x07, 0x38, 0x01,
-	0x01, 0x36, 0x45, 0x50, 0x01, 0x42, 0x01, 0x02, 0x38, 0x01, 0x01, 0xf9,
-	0x45, 0x50, 0x01, 0x3e, 0x39, 0x01, 0x01, 0x42, 0x45, 0x50, 0x01, 0x3c,
-	0x39, 0x01, 0x01, 0x46, 0x45, 0x50, 0x01, 0x3b, 0x39, 0x01, 0x01, 0x48,
-	0x45, 0x50, 0x01, 0xf9, 0x39, 0x01, 0x01, 0x48, 0x45, 0x50, 0x01, 0x3f,
-	0x01, 0x02, 0x38, 0x01, 0x01, 0x46, 0x45, 0x50, 0x01, 0x48, 0x01, 0xf7,
-	0x38, 0x01, 0x01, 0x43, 0x45, 0x50, 0x01, 0x4e, 0x01, 0x0e, 0x38, 0x01,
-	0x01, 0x3f, 0x46, 0x50, 0x01, 0x1c, 0x38, 0x01, 0x01, 0x3a, 0x46, 0x50,
-	0x01, 0x33, 0x38, 0x01, 0x01, 0x34, 0x46, 0x50, 0x01, 0x46, 0x01, 0x04,
-	0x37, 0x01, 0x01, 0x2c, 0x47, 0x50, 0x01, 0x19, 0x37, 0x01, 0x01, 0x1f,
-	0x47, 0x50, 0x01, 0x3a, 0x37, 0x01, 0x01, 0x15, 0x47, 0x50, 0x01, 0x4e,
-	0x01, 0x11, 0x36, 0x01, 0x01, 0x0a, 0x01, 0xfa, 0x47, 0x50, 0x01, 0x37,
-	0x36, 0x01, 0x01, 0x02, 0x01, 0x42, 0x47, 0x50, 0x01, 0x4f, 0x01, 0x15,
-	0x36, 0x01, 0x01, 0x37, 0x48, 0x50, 0x01, 0x42, 0x01, 0x04, 0x35, 0x01,
-	0x01, 0x25, 0x49, 0x50, 0x01, 0x2c, 0x35, 0x01, 0x01, 0x13, 0x49, 0x50,
-	0x01, 0x4e, 0x01, 0x15, 0x34, 0x01, 0x01, 0xf7, 0x01, 0x47, 0x49, 0x50,
-	0x01, 0x48, 0x01, 0x0b, 0x34, 0x01, 0x01, 0x37, 0x4a, 0x50, 0x01, 0x44,
-	0x01, 0x0a, 0x33, 0x01, 0x01, 0x1f, 0x4b, 0x50, 0x01, 0x44, 0x01, 0x0d,
-	0x32, 0x01, 0x01, 0x0a, 0x01, 0xfa, 0x4b, 0x50, 0x01, 0x48, 0x01, 0x17,
-	0x32, 0x01, 0x01, 0x3a, 0x4c, 0x50, 0x01, 0x4f, 0x01, 0x2c, 0x01, 0x04,
-	0x30, 0x01, 0x01, 0x1f, 0x4e, 0x50, 0x01, 0x41, 0x01, 0x19, 0x2f, 0x01,
-	0x01, 0x07, 0x01, 0x4a, 0x4e, 0x50, 0x01, 0x44, 0x30, 0x01, 0x01, 0x33,
-	0x4e, 0x50, 0x01, 0x36, 0x30, 0x01, 0x01, 0x14, 0x4e, 0x50, 0x01, 0x1f,
-	0x30, 0x01, 0x01, 0x02, 0x01, 0x3f, 0x4c, 0x50, 0x01, 0x4d, 0x01, 0x0b,
-	0x31, 0x01, 0x01, 0x1e, 0x4c, 0x50, 0x01, 0x3c, 0x32, 0x01, 0x01, 0x04,
-	0x01, 0x44, 0x4b, 0x50, 0x01, 0x20, 0x33, 0x01, 0x01, 0x20, 0x4a, 0x50,
-	0x01, 0x4a, 0x01, 0x07, 0x33, 0x01, 0x01, 0x04, 0x01, 0x43, 0x49, 0x50,
-	0x01, 0x30, 0x35, 0x01, 0x01, 0x1c, 0x48, 0x50, 0x01, 0x4d, 0x01, 0x0e,
-	0x35, 0x01, 0x01, 0x02, 0x01, 0x3e, 0x47, 0x50, 0x01, 0x36, 0x37, 0x01,
-	0x01, 0x14, 0x01, 0x4f, 0x45, 0x50, 0x01, 0x4d, 0x01, 0x0e, 0x38, 0x01,
-	0x01, 0x32, 0x45, 0x50, 0x01, 0x33, 0x39, 0x01, 0x01, 0x07, 0x01, 0x47,
-	0x43, 0x50, 0x01, 0x4b, 0x01, 0x0b, 0x3a, 0x01, 0x01, 0x1c, 0x43, 0x50,
-	0x01, 0x26, 0x3c, 0x01, 0x01, 0x37, 0x41, 0x50, 0x01, 0x41, 0x01, 0x04,
-	0x3c, 0x01, 0x01, 0x08, 0x01, 0x48, 0x3f, 0x50, 0x01, 0x4e, 0x01, 0x13,
-	0x3e, 0x01, 0x01, 0x19, 0x3f, 0x50, 0x01, 0x2d, 0x40, 0x01, 0x01, 0x2e,
-	0x3d, 0x50, 0x01, 0x3f, 0x01, 0x03, 0x40, 0x01, 0x01, 0x03, 0x01, 0xf9,
-	0x3b, 0x50, 0x01, 0x4a, 0x01, 0x0d, 0x42, 0x01, 0x01, 0x09, 0x01, 0x46,
-	0x39, 0x50, 0x01, 0x4e, 0x01, 0x19, 0x44, 0x01, 0x01, 0x11, 0x01, 0x4b,
-	0x38, 0x50, 0x01, 0x25, 0x46, 0x01, 0x01, 0x17, 0x01, 0x4d, 0x36, 0x50,
-	0x01, 0x2e, 0x48, 0x01, 0x01, 0x1b, 0x01, 0x4d, 0x34, 0x50, 0x01, 0x31,
-	0x4a, 0x01, 0x01, 0x17, 0x01, 0x4a, 0x14, 0x50, 0x01, 0x4d, 0x01, 0x44,
-	0x01, 0x3b, 0x01, 0x34, 0x01, 0x2e, 0x01, 0x2c, 0x01, 0x2e, 0x01, 0x35,
-	0x01, 0x3e, 0x01, 0x4a, 0x14, 0x50, 0x01, 0x2e, 0x4c, 0x01, 0x01, 0x0e,
-	0x01, 0x41, 0x10, 0x50, 0x01, 0x4a, 0x01, 0x37, 0x01, 0x1f, 0x01, 0x0c,
-	0x01, 0x03, 0x07, 0x01, 0x01, 0x06, 0x01, 0x15, 0x01, 0x2d, 0x01, 0x41,
-	0x0f, 0x50, 0x01, 0x4a, 0x01, 0x1f, 0x4e, 0x01, 0x01, 0xf7, 0x01, 0x2e,
-	0x01, 0xfa, 0x0b, 0x50, 0x01, 0x4f, 0x01, 0xf9, 0x01, 0x1e, 0x01, 0x07,
-	0x0e, 0x01, 0x01, 0x02, 0x01, 0x14, 0x01, 0x31, 0x01, 0x48, 0x0b, 0x50,
-	0x01, 0x37, 0x01, 0x0c, 0x51, 0x01, 0x01, 0x0d, 0x01, 0x2f, 0x01, 0x45,
-	0x01, 0x4f, 0x05, 0x50, 0x01, 0x4f, 0x01, 0x43, 0x01, 0x2e, 0x01, 0x11,
-	0x14, 0x01, 0x01, 0x07, 0x01, 0x1f, 0x01, 0x3c, 0x01, 0x4c, 0x04, 0x50,
-	0x01, 0x4f, 0x01, 0x46, 0x01, 0x33, 0x01, 0x13, 0x55, 0x01, 0x01, 0x04,
-	0x01, 0x12, 0x01, 0x1f, 0x01, 0x26, 0x01, 0x28, 0x01, 0x26, 0x01, 0x1e,
-	0x01, 0x10, 0x01, 0x02, 0x19, 0x01, 0x01, 0x09, 0x01, 0x16, 0x01, 0x1e,
-	0x01, 0x1f, 0x01, 0x1c, 0x01, 0x11, 0x01, 0x04, 0xff, 0x01, 0xff, 0x01,
-	0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xff, 0x01,
-	0xff, 0x01, 0xb3, 0x01
+	0x68, 0x01, 0x00, 0xF0, 0xFF, 0xF0, 0xB7, 0xE4, 0x01, 0x02, 0x03, 0x00, 0xFA, 0xF0, 0x33, 0xE7,	0x04, 0x05, 0x06, 0x07, 0x07, 0x08, 0x00, 0xFA, 0xF0, 0x30, 0xEA, 0x09, 0x0A, 0x06, 0x0B, 0x0C,
+	0x0D, 0x0D, 0x06, 0x0E, 0x00, 0xFA, 0xF0, 0x2F, 0xE9, 0x0F, 0x06, 0x10, 0x0D, 0x11, 0x12, 0x13,	0x13, 0x11, 0x38, 0x54, 0xF0, 0x2F, 0xEC, 0x01, 0x14, 0x0B, 0x0D, 0x15, 0x13, 0x16, 0x17, 0x17,
+	0x18, 0x15, 0x19, 0xFA, 0xF0, 0x2D, 0xE8, 0x1A, 0x0D, 0x06, 0x11, 0x13, 0x18, 0x17, 0x17, 0xF4,	0x39, 0xA4, 0xF0, 0x2D, 0xE5, 0x1B, 0x0B, 0x0D, 0x12, 0x16, 0x08, 0x52, 0x00, 0x54, 0x9E, 0x11,
+	0x09, 0xF0, 0x2F, 0xC8, 0xA5, 0x1B, 0x0B, 0x1C, 0xF2, 0x00, 0x01, 0xC8, 0xA5, 0x16, 0x1D, 0x1E,	0xF0, 0x2F, 0xE6, 0x00, 0x1F, 0x0B, 0x11, 0x13, 0x17, 0x28, 0x01, 0x69, 0xA3, 0x13, 0xF0, 0x2D,
+	0xC8, 0x53, 0x09, 0x18, 0x1C, 0xF6, 0x98, 0xFB, 0x18, 0x15, 0xF0, 0x2F, 0x98, 0xF9, 0x20, 0x06,	0xF3, 0x00, 0xFB, 0x9E, 0x21, 0x22, 0xF0, 0x2D, 0xC8, 0x53, 0x01, 0x10, 0x15, 0xF6, 0xCE, 0x17,
+	0x13, 0x23, 0xF0, 0x2F, 0x98, 0xFA, 0x00, 0x24, 0xF5, 0xE4, 0x17, 0x16, 0x25, 0x26, 0xFA, 0xF0,	0x29, 0xCE, 0x01, 0x0C, 0x12, 0xF6, 0xCE, 0x18, 0x12, 0x27, 0xF0, 0x2F, 0x98, 0xA7, 0x00, 0x28,
+	0xF6, 0x99, 0x4E, 0x13, 0x04, 0xF0, 0x2E, 0x9E, 0x00, 0x29, 0xF5, 0xCE, 0x16, 0x25, 0x2A, 0xF0,	0x30, 0x9A, 0x48, 0x01, 0x06, 0xF5, 0x9E, 0x2B, 0x2C, 0xF0, 0x2E, 0xE4, 0x00, 0x2D, 0x1C, 0x16,
+	0xF8, 0xE4, 0x16, 0x2B, 0x2E, 0x2F, 0xFA, 0xF0, 0x29, 0x04, 0xE2, 0x68, 0xFB, 0x11, 0x98, 0x53,	0x16, 0x30, 0xF0, 0x31, 0x99, 0x4F, 0x00, 0x0E, 0xF1, 0xE4, 0x18, 0x14, 0x31, 0x32, 0x38, 0x53,
+	0xF0, 0x2D, 0x90, 0x54, 0x00, 0x19, 0xE6, 0x18, 0x33, 0x1A, 0x34, 0x35, 0x00, 0x38, 0x01, 0xF0,	0x2E, 0xE9, 0x0E, 0x11, 0x13, 0x16, 0x33, 0x36, 0x37, 0x34, 0x2A, 0x38, 0xA5, 0xF0, 0x2E, 0x00,
+	0x01, 0xE7, 0x38, 0x39, 0x39, 0x3A, 0x3B, 0x34, 0x26, 0x38, 0x52, 0xF0, 0x20, 0xE4, 0x02, 0x36,	0x05, 0x3C, 0x00, 0x01, 0xE4, 0x3D, 0x36, 0x02, 0x00, 0xF8, 0xC8, 0x50, 0x1E, 0x3E, 0x3E, 0xF4,
+	0xE5, 0x09, 0x3F, 0x05, 0x3C, 0x07, 0x10, 0x01, 0xE5, 0x3C, 0x05, 0x30, 0x1F, 0x00, 0xFA, 0xF0,	0x0A, 0xE7, 0x3F, 0x21, 0x07, 0x40, 0x0B, 0x0C, 0x06, 0xF3, 0xE7, 0x0C, 0x0B, 0x40, 0x06, 0x05,
+	0x04, 0x00, 0xFA, 0xF3, 0xE4, 0x09, 0x3F, 0x29, 0x41, 0x00, 0x1E, 0x80, 0x01, 0x0D, 0x1C, 0x48,	0x22, 0x0D, 0xE4, 0x13, 0x42, 0x01, 0x00, 0x38, 0x01, 0xF0, 0x04, 0x0F, 0x68, 0x07, 0xE6, 0x06,
+	0x1C, 0x11, 0x15, 0x12, 0x13, 0x00, 0x01, 0xE7, 0x12, 0x15, 0x11, 0x0D, 0x0C, 0x0B, 0x06, 0x38,	0x35, 0xF1, 0xC8, 0x1F, 0x02, 0x43, 0x41, 0x00, 0x1E, 0x40, 0x01, 0x16, 0x10, 0x22, 0xE4, 0x06,
+	0x10, 0x41, 0x43, 0x38, 0x56, 0xF0, 0x03, 0x5F, 0x68, 0x07, 0x1A, 0x62, 0x8C, 0x16, 0xEA, 0x18,	0x16, 0x13, 0x12, 0x11, 0x0D, 0x10, 0x40, 0x14, 0x3F, 0x08, 0x36, 0xE7, 0x1F, 0x42, 0x13, 0x0B,
+	0x0C, 0x1C, 0x15, 0x30, 0x1E, 0x08, 0x01, 0x00, 0x22, 0xE6, 0x15, 0x1C, 0x0C, 0x41, 0x0A, 0x00,	0x38, 0x01, 0xFE, 0x8F, 0x68, 0x07, 0x09, 0x21, 0x38, 0x32, 0xF1, 0x08, 0x01, 0x00, 0x35, 0x80,
+	0xE3, 0x11, 0x06, 0xC8, 0x70, 0x44, 0x06, 0x40, 0xF1, 0x38, 0x1F, 0xF5, 0x00, 0x57, 0xE5, 0x13,	0x12, 0x1C, 0x10, 0x14, 0x39, 0x58, 0xFD, 0xE4, 0x1F, 0x13, 0x0C, 0x11, 0x38, 0x33, 0xF8, 0x18,
+	0x8C, 0xC8, 0xF3, 0x11, 0x1C, 0x0D, 0x33, 0xA0, 0x38, 0x01, 0xF3, 0xE5, 0x18, 0x13, 0x11, 0x06,	0x0D, 0x38, 0x55, 0xFB, 0xE4, 0x1F, 0x1C, 0x06, 0x15, 0x38, 0x34, 0xFC, 0x10, 0x57, 0x68, 0xF4,
+	0x13, 0xF5, 0x38, 0x01, 0xF5, 0xE4, 0x16, 0x12, 0x0D, 0x1C, 0x38, 0x55, 0xF9, 0xE4, 0x1F, 0x1C,	0x0D, 0x12, 0x38, 0x35, 0xF0, 0x00, 0x38, 0x01, 0xF0, 0x06, 0x98, 0x55, 0x18, 0x13, 0xFD, 0xE4,
+	0x01, 0x1C, 0x0D, 0x13, 0x38, 0x53, 0xF0, 0x20, 0x10, 0x55, 0x9E, 0x33, 0x09, 0xF9, 0x68, 0x53,	0x33, 0xF0, 0x26, 0x00, 0xFF, 0xC8, 0x53, 0x11, 0x29, 0x31, 0xFA, 0xCE, 0x08, 0x06, 0x12, 0xF0,
+	0x2A, 0xE5, 0x17, 0x13, 0x45, 0x46, 0x1E, 0xFA, 0xF3, 0xE4, 0x01, 0x10, 0x11, 0x16, 0xFA, 0xF0,	0x25, 0x6D, 0x03, 0x47, 0xF8, 0xAA, 0x05, 0x1B, 0x48, 0x38, 0x01, 0xF0, 0x1A, 0xE4, 0x13, 0x37,
+	0x49, 0x00, 0xFA, 0xF4, 0x68, 0xFA, 0x47, 0xF0, 0x28, 0xB3, 0xBE, 0x1F, 0x13, 0x37, 0x68, 0xFA,	0x4A, 0xF0, 0x27, 0x98, 0x53, 0x16, 0x30, 0xFB, 0xCE, 0x01, 0x06, 0x12, 0xF0, 0x29, 0xCE, 0x18,
+	0x2B, 0x32, 0xFC, 0x99, 0x4E, 0x00, 0x19, 0xF0, 0x29, 0xC8, 0x01, 0x13, 0x38, 0x00, 0xFD, 0x99,	0x4E, 0x4B, 0x15, 0xF0, 0x27, 0xB3, 0x57, 0x22, 0x16, 0x45, 0x98, 0xA7, 0x09, 0x06, 0xF0, 0x27,
+	0xCE, 0x18, 0x12, 0x4C, 0xFE, 0x99, 0xA2, 0x4D, 0x1C, 0xF0, 0x27, 0xB4, 0x14, 0x2E, 0x16, 0x45,	0x3F, 0x0F, 0x08, 0x38, 0x01, 0xF0, 0x1B, 0xCE, 0x12, 0x37, 0x00, 0xFE, 0x69, 0x4F, 0x2B, 0xF0,
+	0x25, 0xB4, 0xC5, 0x1F, 0x18, 0x11, 0x69, 0x4F, 0x48, 0xF0, 0x25, 0xC8, 0x01, 0x13, 0x25, 0x00,	0xFF, 0x39, 0xA3, 0xF0, 0x24, 0xC8, 0x01, 0x13, 0x4E, 0x00, 0xFF, 0x3A, 0x9E, 0xF0, 0x24, 0xAC,
+	0x8D, 0x38, 0x12, 0x69, 0xF7, 0x01, 0xF0, 0x25, 0xA4, 0x8F, 0x38, 0x6B, 0xED, 0x23, 0xF0, 0x25,	0xE4, 0x18, 0x11, 0x4F, 0x00, 0x38, 0x01, 0xF8, 0x68, 0x54, 0x4F, 0xF0, 0x7B, 0x6E, 0x3F, 0xF0,
+	0x3A, 0x9E, 0x15, 0x0E, 0xFD, 0x6E, 0x3E, 0xF0, 0x26, 0x6A, 0xA0, 0x12, 0xFD, 0x38, 0x54, 0xF0,	0x23, 0xCE, 0x17, 0x13, 0x33, 0xF0, 0x00, 0x6E, 0x1C, 0xF0, 0x26, 0x9E, 0x0D, 0x01, 0xFD, 0x6A,
+	0xF4, 0x43, 0xF0, 0x25, 0x9A, 0xF5, 0x16, 0x11, 0xFE, 0x68, 0x54, 0x4A, 0xF0, 0x25, 0xCE, 0x18,	0x15, 0x29, 0xFF, 0x6E, 0x4E, 0xF0, 0x25, 0x00, 0xFD, 0x3B, 0xF2, 0xF9, 0x6F, 0x89, 0x07, 0x50,
+	0xF0, 0x26, 0xE4, 0x18, 0x11, 0x51, 0x00, 0x38, 0x01, 0xF7, 0x6D, 0x94, 0x31, 0xF0, 0x26, 0x00,	0xA9, 0x6E, 0x08, 0xF9, 0x99, 0xF9, 0x22, 0x17, 0xF0, 0x27, 0x01, 0x52, 0x9E, 0x10, 0x1F, 0xFB,
+	0x39, 0xF9, 0xF0, 0x24, 0x00, 0xA9, 0xCE, 0x11, 0x17, 0x09, 0xFC, 0x68, 0x54, 0x4D, 0xF0, 0x27,	0xA4, 0xF1, 0x29, 0x99, 0x51, 0x52, 0x15, 0xF0, 0x28, 0x03, 0xA1, 0x68, 0x55, 0x06, 0xF8, 0x99,
+	0x51, 0x22, 0x4B, 0xF0, 0x28, 0x10, 0x55, 0x69, 0x54, 0x16, 0xF7, 0x68, 0xFD, 0x53, 0xF0, 0x27,	0x08, 0x55, 0xCE, 0x0D, 0x0B, 0x0A, 0xF9, 0x6F, 0x84, 0x09, 0x1F, 0xF0, 0x26, 0x08, 0x01, 0x07,
+	0xD0, 0x0C, 0x9D, 0x4B, 0x10, 0x13, 0xF6, 0x98, 0xFD, 0x35, 0x51, 0xF0, 0x2A, 0x08, 0x55, 0xE4,	0x15, 0x06, 0x0B, 0x3D, 0xFA, 0xF1, 0x68, 0xFD, 0x19, 0xF0, 0x29, 0x19, 0x00, 0xA2, 0xC5, 0x3B,
+	0x69, 0xFA, 0x2F, 0xF0, 0x28, 0x10, 0x01, 0xB2, 0x29, 0x4B, 0x16, 0x11, 0x98, 0xFD, 0x1E, 0x25,	0xF0, 0x2C, 0x00, 0x54, 0xAA, 0x3A, 0x26, 0x20, 0x68, 0xFD, 0x54, 0xF0, 0x2C, 0xC8, 0x01, 0x12,
+	0x55, 0x00, 0xF8, 0x98, 0xA9, 0x26, 0x3C, 0xF0, 0x2C, 0xB3, 0x38, 0x26, 0x16, 0x3C, 0x68, 0xA9,	0x56, 0xF0, 0x2A, 0xC8, 0x01, 0x13, 0x56, 0x00, 0xFA, 0x38, 0xA9, 0xF0, 0x28, 0xB3, 0xF6, 0x31,
+	0x16, 0x3C, 0x38, 0xA9, 0xF0, 0x27, 0x38, 0xA7, 0xF7, 0x38, 0xA9, 0xF0, 0x28, 0x38, 0xA7, 0xF9,	0x07, 0x2B, 0x0C, 0x38, 0xA9, 0xF0, 0x24, 0xAC, 0x81, 0x27, 0x13, 0x9E, 0x3E, 0x28, 0xF0, 0x26,
+	0xB4, 0xD2, 0x4D, 0x16, 0x25, 0x9B, 0x4D, 0x49, 0x29, 0xF0, 0x24, 0xB4, 0xE7, 0x56, 0x18, 0x14,	0x98, 0xFE, 0x2F, 0x01, 0xF0, 0x24, 0xB4, 0x44, 0x33, 0x13, 0x02, 0x08, 0x01, 0x98, 0xFE, 0x35,
+	0x45, 0xF0, 0x22, 0xB3, 0xAD, 0x3D, 0x16, 0x25, 0x30, 0x01, 0x98, 0xFE, 0x57, 0x44, 0xF0, 0x20,	0xB5, 0x37, 0x58, 0x18, 0x14, 0x9F, 0x15, 0x11, 0x2F, 0x2F, 0xF0, 0x20, 0xB6, 0xC0, 0x51, 0x13,
+	0x01, 0x99, 0x53, 0x22, 0x37, 0xF0, 0x1E, 0xB6, 0xA2, 0x55, 0x13, 0x3F, 0x99, 0x53, 0x26, 0x30,	0xF0, 0x1C, 0xE4, 0x16, 0x25, 0x2E, 0x00, 0x38, 0x01, 0xF0, 0x03, 0x98, 0x55, 0x32, 0x58, 0xF0,
+	0x1A, 0x3F, 0x5A, 0x17, 0xF0, 0x09, 0x98, 0x55, 0x2C, 0x2B, 0xFF, 0x50, 0x01, 0x18, 0x6E, 0x17,	0xFA, 0xB7, 0x1F, 0x5C, 0x18, 0x14, 0x98, 0xAA, 0x2F, 0x2E, 0xFB, 0xEB, 0x18, 0x16, 0x59, 0x1B,
+	0x5A, 0x5B, 0x5B, 0x5B, 0x55, 0x1A, 0x59, 0xA3, 0xD2, 0x4E, 0x9F, 0x10, 0x16, 0x18, 0x5C, 0xF0,	0x0E, 0xC9, 0xA9, 0x2F, 0x5D, 0x3F, 0xF8, 0x00, 0x51, 0xED, 0x55, 0x3A, 0x5D, 0x2E, 0x49, 0x3E,
+	0x3E, 0x3E, 0x26, 0x2A, 0x5D, 0x5E, 0x55, 0x38, 0x57, 0xF4, 0xCA, 0xED, 0x16, 0x5F, 0x2E, 0xF0,	0x03, 0x38, 0x01, 0xF5, 0xC8, 0xAB, 0x2E, 0x31, 0x60, 0xF3, 0xE6, 0x18, 0x16, 0x33, 0x30, 0x49,
+	0x5D, 0x38, 0x8A, 0xF2, 0xE5, 0x26, 0x5D, 0x49, 0x3F, 0x33, 0x20, 0x57, 0xE5, 0x18, 0x16, 0x60,	0x31, 0x34, 0x38, 0xA6, 0xF0, 0x09, 0x10, 0x01, 0xED, 0x35, 0x61, 0x37, 0x36, 0x33, 0x13, 0x16,
+	0x13, 0x62, 0x30, 0x31, 0x3B, 0x32, 0x38, 0x88, 0xF6, 0xED, 0x1E, 0x2E, 0x3B, 0x31, 0x3F, 0x59,	0x33, 0x13, 0x13, 0x59, 0x30, 0x31, 0x61, 0x3A, 0x45, 0xF0, 0x03, 0x38, 0x01, 0xF5, 0xE8, 0x26,
+	0x34, 0x3B, 0x5E, 0x5E, 0x5E, 0x63, 0x32, 0x38, 0x34, 0xFC, 0xC0, 0x1F, 0x35, 0x2E, 0x5D, 0x98,	0x52, 0x5D, 0x32, 0xF0, 0x16, 0x38, 0x01, 0xF0, 0xFF, 0xF0, 0x0F, 0xE1, 0x00, 0x06, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
+
+//
+// CLUT (Color LookUp Table) for grey Apple logo.
+//
+
+static UInt8 AppleLogoClut[ 304 ] =
+{
+	0xBF, 0xBF, 0xBF, 0xB3, 0xB3, 0xB3, 0xA6, 0xA6, 0xA6, 0xB2, 0xB2, 0xB2, 0xA0, 0xA0, 0xA0, 0x83,	0x83, 0x83, 0x67, 0x67, 0x67, 0x61, 0x61, 0x61, 0x90, 0x90, 0x90, 0xB9, 0xB9, 0xB9, 0x8F, 0x8F,
+	0x8F, 0x64, 0x64, 0x64, 0x66, 0x66, 0x66, 0x68, 0x68, 0x68, 0x97, 0x97, 0x97, 0x95, 0x95, 0x95,	0x65, 0x65, 0x65, 0x6A, 0x6A, 0x6A, 0x6C, 0x6C, 0x6C, 0x6D, 0x6D, 0x6D, 0x73, 0x73, 0x73, 0x6B,
+	0x6B, 0x6B, 0x6E, 0x6E, 0x6E, 0x70, 0x70, 0x70, 0x6F, 0x6F, 0x6F, 0x98, 0x98, 0x98, 0xA1, 0xA1,	0xA1, 0x9B, 0x9B, 0x9B, 0x69, 0x69, 0x69, 0x76, 0x76, 0x76, 0xC2, 0xC2, 0xC2, 0xAD, 0xAD, 0xAD,
+	0x8B, 0x8B, 0x8B, 0x7E, 0x7E, 0x7E, 0xC3, 0xC3, 0xC3, 0xAA, 0xAA, 0xAA, 0x87, 0x87, 0x87, 0x85,	0x85, 0x85, 0xC8, 0xC8, 0xC8, 0xBD, 0xBD, 0xBD, 0x8C, 0x8C, 0x8C, 0x72, 0x72, 0x72, 0xCB, 0xCB,
+	0xCB, 0x7F, 0x7F, 0x7F, 0xCA, 0xCA, 0xCA, 0xA4, 0xA4, 0xA4, 0xCC, 0xCC, 0xCC, 0xC0, 0xC0, 0xC0,	0x94, 0x94, 0x94, 0xB5, 0xB5, 0xB5, 0xCE, 0xCE, 0xCE, 0x74, 0x74, 0x74, 0xCF, 0xCF, 0xCF, 0xC6,
+	0xC6, 0xC6, 0x8E, 0x8E, 0x8E, 0xAE, 0xAE, 0xAE, 0xBE, 0xBE, 0xBE, 0xBB, 0xBB, 0xBB, 0xD0, 0xD0,	0xD0, 0xD5, 0xD5, 0xD5, 0x78, 0x78, 0x78, 0x7D, 0x7D, 0x7D, 0xC5, 0xC5, 0xC5, 0x9A, 0x9A, 0x9A,
+	0x63, 0x63, 0x63, 0x62, 0x62, 0x62, 0x89, 0x89, 0x89, 0x84, 0x84, 0x84, 0x79, 0x79, 0x79, 0x93,	0x93, 0x93, 0xCD, 0xCD, 0xCD, 0xA7, 0xA7, 0xA7, 0x7B, 0x7B, 0x7B, 0xC9, 0xC9, 0xC9, 0x82, 0x82,
+	0x82, 0x77, 0x77, 0x77, 0xC1, 0xC1, 0xC1, 0xA3, 0xA3, 0xA3, 0x9C, 0x9C, 0x9C, 0xAC, 0xAC, 0xAC,	0xA5, 0xA5, 0xA5, 0x71, 0x71, 0x71, 0xB7, 0xB7, 0xB7, 0x91, 0x91, 0x91, 0xA9, 0xA9, 0xA9, 0xAF,
+	0xAF, 0xAF, 0xAB, 0xAB, 0xAB, 0xC7, 0xC7, 0xC7, 0x86, 0x86, 0x86, 0x88, 0x88, 0x88, 0xA8, 0xA8,	0xA8, 0xBC, 0xBC, 0xBC, 0x80, 0x80, 0x80, 0xD1, 0xD1, 0xD1, 0xD7, 0xD7, 0xD7, 0x8D, 0x8D, 0x8D,
+	0x7A, 0x7A, 0x7A, 0xD4, 0xD4, 0xD4, 0x81, 0x81, 0x81, 0xD2, 0xD2, 0xD2, 0x00, 0x00, 0x00, 0x00
+};
+
 #endif

From 47b7319f78daf6e0f0bc51195655a96a7a66491f Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 15 Oct 2014 00:50:30 +0200
Subject: [PATCH 488/623] Streamlining make process

- you can now just use "make"
- defaults to Macmini62
---
 Makefile | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index ddecfda..5826971 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,8 @@ PAX = /bin/pax
 OBJROOT = `pwd`/obj
 SYMROOT = `pwd`/sym
 
+DEFAULT_MODEL=$(shell cat MODEL)
+
 #
 # Export version number (picked up by i386/libsaio/Makefile)
 #
@@ -103,12 +105,12 @@ export PRODUCT_OS_TARGET = `echo $(MAKE_TARGET_OS)`
 export PRODUCT_OS_TARGET_VERSION = `echo \"$(MAKE_TARGET_OS_VER)\"`
 
 #
-# Check if a target model was specified (example: make MODEL=16 mountain-lion).
+# Check if a target model was specified (example: make MODEL=MacPro61).
 #
 
 ifdef MODEL
 	#
-	# MODEL=[MacModelNN] specified, export target model as PRODUCT_MODEL_TARGET.
+	# MODEL=[MacModelNN] specified, export target model.
 	#
 	ifneq ($(MODEL),)
 		export MAKE_TARGET_MODEL = $(MODEL)
@@ -117,25 +119,41 @@ ifdef MODEL
 		#
 		DATA_FILE = $(MODEL)
 	else
+		#
+		# No. Use Macmini62 as a fallback default.
+		#
+		MODEL = Macmini62
 		export MAKE_TARGET_MODEL = Macmini62
 		#
-		# Include default/empty static data file (no model identifier specified).
+		# Include default/empty static data files (no model identifier specified).
 		#
 		DATA_FILE = data-template
 	endif
 else
 	#
-	# Include default settings template (no model identifier specified).
-	#
-	export MAKE_TARGET_MODEL = Macmini62
-	#
+	# MODEL=[MacModelNN], check if DEFAULT_MODEL was set (first run only).
 	#
-	#
-	MODEL=Macmini62
-	#
-	# Include default/empty static data file (no model identifier specified).
-	#
-	DATA_FILE = data-template
+	ifdef DEFAULT_MODEL
+		#
+		# Yes it is. Use Macmodel[nn] from RevoBoot/MODEL
+		#
+		MODEL = $(DEFAULT_MODEL)
+		export MAKE_TARGET_MODEL = $(MODEL)
+		#
+		# Include static ACPI/EFI/SMBIOS data files per model identifier.
+		#
+		DATA_FILE = $(MODEL)
+	else
+		#
+		# No. Use Macmini62 as a fallback default.
+		#
+		MODEL = Macmini62
+		export MAKE_TARGET_MODEL = $(MODEL)
+		#
+		# Include default/empty static data file (no model identifier specified).
+		#
+		DATA_FILE = data-template
+	endif
 endif
 
 #
@@ -173,7 +191,7 @@ $(MAKEGOAL):
 #
 # normal make goal
 #
-	@printf "Compiling RevoBoot, setup for a $(MODEL) running OS X $(MAKE_TARGET_OS_VER) ($@)\n\n" >&2;
+	@printf "\nCompiling RevoBoot, setup for a $(MODEL) running OS X $(MAKE_TARGET_OS_VER) ($@)\n" >&2;
 
 	@if [ ! -f $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE) ]; then \
 		echo "\t[CP] $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE)"; \

From d6ca6bacd861c6cce341bf0961736109e7b222ee Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 15 Oct 2014 00:52:21 +0200
Subject: [PATCH 489/623] Better ignore patterns

---
 .gitignore | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index b1b2a88..f738622 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,14 +7,9 @@ sym/*
 
 i386/config/SETTINGS/*.h
 
-i386/config/ACPI/default.h
-i386/config/ACPI/*Mac*.h
-
-i386/config/EFI/default.h
-i386/config/EFI/*Mac*.h
-
-i386/config/SMBIOS/default.h
-i386/config/SMBIOS/*Mac*.h
+i386/config/ACPI/*.h
+i386/config/EFI/*.h
+i386/config/SMBIOS/*.h
 
 i386/util/libcc_kext.a
 

From 59b0240b9cfd07d4f25280870f283b1a4a93cdfd Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Wed, 15 Oct 2014 01:10:37 +0200
Subject: [PATCH 490/623] Add support for grey logo

- Set BLACKMODE to 0 for pre-yosemite versions of OS X
---
 i386/boot2/bootlogo.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/i386/boot2/bootlogo.c b/i386/boot2/bootlogo.c
index e5bfe87..a2ec585 100755
--- a/i386/boot2/bootlogo.c
+++ b/i386/boot2/bootlogo.c
@@ -37,9 +37,15 @@
 unsigned long lookUpCLUTIndex(unsigned char index)
 {
 	long colorIndex = (index * 3);
+#if BLACKMODE
 	long red   = AppleLogoBlackClut[ colorIndex   ];
 	long green = AppleLogoBlackClut[ colorIndex++ ];
 	long blue  = AppleLogoBlackClut[ colorIndex++ ];
+#else
+	long red   = AppleLogoClut[ colorIndex   ];
+	long green = AppleLogoClut[ colorIndex++ ];
+	long blue  = AppleLogoClut[ colorIndex++ ];
+#endif
 	
 	return (red << 16) | (green << 8) | blue;
 }
@@ -56,7 +62,6 @@ void * stosl(void *dst, long val, long len)
 	return dst;
 }
 
-
 //==============================================================================
 
 void setBackgroundColor(uint32_t aBackGroundColor)
@@ -149,7 +154,7 @@ void showBootLogo(bool aBootRecoveryHDFlag)
 	void *logoData = (void *)AppleLogoBlackPacked;
 #else
 	setBackgroundColor(0xbfbfbf);
-	uint32_t compressedSize = sizeof(AppleLogoBlackPacked);
+	uint32_t compressedSize = sizeof(AppleLogoPacked);
 	void *logoData = (void *)AppleLogoPacked;
 #endif
 

From 646be94e730b09d220539e271d915da38dea66ec Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Sun, 19 Oct 2014 23:47:31 +0200
Subject: [PATCH 491/623] Helper program for ssdtPRGen.sh

---
 i386/libsaio/acpi/Tools/extractACPITables   | Bin 0 -> 9792 bytes
 i386/libsaio/acpi/Tools/extractACPITables.c |  78 ++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100755 i386/libsaio/acpi/Tools/extractACPITables
 create mode 100755 i386/libsaio/acpi/Tools/extractACPITables.c

diff --git a/i386/libsaio/acpi/Tools/extractACPITables b/i386/libsaio/acpi/Tools/extractACPITables
new file mode 100755
index 0000000000000000000000000000000000000000..adb1be020833c11c11cc2ef79fe4c4eec120b7eb
GIT binary patch
literal 9792
zcmeHNYit}>6~5~@iAj^%X$nmQg>9*e1C`e)R7ynwPu6yK6C1m>6Re18GG33fTkpe~
z9TU4!kg4O!qm9c7l`21w2m(a{70Ex4+NM&lAg>D40>6+zO@-QOT?G^&ltxjT<@@g3
zv1ezU0OIc)`QG!o_sp4dAHI9fymj;Mw>AqA*&xJhgAn2#l*vs(%!?=}A$Fl8P;`Aj
zd$Rj*_h3JzwGgRg*X3xZ4G+-u;qH;)+9tApORY>O9=?f<C~!%FuG{9ctr(!7y``;q
z8OXn<oFd=2)|||&pVjrEJvCZf6$R}*dbexuuxjD)UWX=SZ_Pj2)6-^l(zMVhXz!%5
zcSac?&$zEboqwsKZDsODRfC|tN1I*$I+UKgA8Kqvq3cumW10Mzp2?3FBwsroqskt~
zoIw6gpzCH@AGeI0>9z{`w-m5P9&_!sz<IKOvD5V~ZCLX)!+elK>dlh?<~*TYZ>)7a
zpVf;qxzR#apR}#p+VjkCzWM#)c=}&m*N+x_)2_~53;NSP&mQ@pz3tF@pzB%VPX0xe
zy=m2fyx$(*cZX*TSl3hI{)rNd-zjA;s``-k+w+-{<l4ILO@8x0cURI|voKII4&Vu$
zY5~wMsh3hA9>l)VK{_f#6HpWI0<Z_=s1Rv%xbc7xY{&V!6QzQVp9Efh2nL|P3-kbr
zAJ~?~9|yml^j`FbsXD;2qe}wYgNRKPtynfQ8XKF*j)5n98ijsrwV(U_mp6Yk{>t-j
zJTY<O3m0L|9pk1gc$qEYiyjY5XoI`#$9=~SWJge_qtEafZxs=-p_!s>=3>2>QOmGq
zVm(|+#|qX&F_!E<kg?n4+M*zK$h3-?LcSQ&T$Qv!yJ?hFyE`f{|I(f8#tW9&Q<%z+
z88*zV|A5*yu+Qi0^*?9B&%wceFLsEZ`zr1G+7ZXhDAa(5Q83j+8wP>nzgzJg;0a$s
zp`QG!6oe2)AdEm5fiMDL1lEbb!G!ak_ATv@c2FB0O3YmyNi2TtnFgE}j^W>FqO`3G
zhnmvk3Fl(v2n6%X%_lTh@p&i`rR|Bu$9@9Jx#S#wanBo-$Eb9EtDU=5tyUBBe`!9^
zASG8Sj{_&2O9{uE-M`rQG0%dDxp%H5op+PF&-bEs-b?Pj(Cb`HI9C$R(+j=M`@PNw
zl_qrSo3Fk`*PCDXDe67TiN&Xvnm>1fBH?tuoGcv|l{Y~robJ<-x#TjZlBFje+H<|~
z2gzR9bNy_T)Z(^ZN?(>cmMgEjs&f$>x6b|yV#xR`&AIs6$9M&8?pD>lKT+yF<@~10
z`7lwMI$ilO^q?#Az@@&IlXK^rl5-cDlGV4I%gyr>eDTup1?P8_K^iZavzqgE>G+Ek
z9;?`I2>91%RjnjJm8-24Jh$5Vfvm5}`X92sChLF7`d_lXF6$ezzA5XEWPMB4JP1`=
z8)V&xx_9yZDJZm|YO4uc=D9|!ypJcR?<4hBQeP+aCsGEf%cPzqb&k{zNd1Zwk0&d?
zAa#M%X;LesULtjq)JanJ;Ylmck$QyGG%1e#N}f~?sWDPRqz;49CMUC|79U6sWDR?~
zVCA}}@l($h6h()P(X3e%F*`RIYb~}Lxh&2|LVN~=;Kz7jc}n~WFbjWK5=di);=~of
z$%ws$_~Xb%mk{?#9w)D72SsGMCDO8Wb5j|*M<A#5cRqrP0Ppv&(C%(|z9GJCQ{UX?
zlbaSdzR>u68vn21NAQY|KBMrG!e<peukf1+|5@R`DSTDo>k9Kn742<N_+EuSt8kmb
zo`aY9g95N$$@x1VgfIeO1i}b}5eOp?Mj(tp7=bVXVFbbmgb@fM5JupCi@^2=qeq(e
zJtekx>J!QSJ_E@pYoK7+UFNtkm9@oF*3R-how}~ad*aAF*+$+TlKJR()+iPS&2iH*
z^C?rzPM2XJ-lJu+g_L0zEYHB~HD0X|BIO;O%&^IfyFQ8}G&1C~6<0|$J-4FpB-!6T
z`iz;f2hFT$6irbUR+|(LnnyFpa?W(;QN=COu+4bSfK}iH%nX}#$Yw*P^_@)0eA2Z0
z3_F!Z_FPHWWUs%8r>CM5?-}puGHe4K_s!Vm0P@C=C;akWGk?@hQ#{~`Gbv`#kh(*s
zII?OsbtCn<1LjOo%a0v0vQxMqLYpJ9jqerHQs73H##~A{F}Z_-P@Kf40QR_^N>9+l
zG=!;a!Hv*t1e`gYkq#`7L0Ix^Rwi@I%Givg2N50LRW#_iH2RpSDci(13kFBzft-=a
zi&kDwZ4gV$0~0*r=G$BOIR;a8-aQgiqP)`iHVS){(FRDS3n^!2nDSkzLayE5?b%w+
zv0WxPp#*GD{dfW9@3(WUUtL<#>w~mwO`p4b=}2jt4m3xYX>=QYO7iXv93RHJGhjB8
z(2m;Ae<Q#j4DiJO|J?xpLzm~HB%DDFW|ij^u%CZ7z<=oStN!hB8+&6Q+5&tm!1JOT
zf2;lXyF6+aj=21)z3~8_3-HY4egXwqaG9H@VRmjr;RNBJ^XhIJ3a<X-w-o%gh?mOh
z4zrV^!EYk|A6rp;`A|QHbvcLYSM!=gtz!!6S8z~TyLO@VRxQZ&)@$7c2Em=TE;P9P
lrnRPA-LC%gh8)-})IQ;E5bJK#>+k>WCZcway4_ode*+T7Wmf<I

literal 0
HcmV?d00001

diff --git a/i386/libsaio/acpi/Tools/extractACPITables.c b/i386/libsaio/acpi/Tools/extractACPITables.c
new file mode 100755
index 0000000..836dcca
--- /dev/null
+++ b/i386/libsaio/acpi/Tools/extractACPITables.c
@@ -0,0 +1,78 @@
+/*
+ * Name			: extractACPITables.c
+ * Version		: 0.1
+ * Type			: Command line tool
+ * Copyright	: Pike R. Alpha (c) September 2014
+ * Description	: ACPI table extractor.
+ *
+ * Usage		: ./extractACPITables	(writes table data to: /tmp/XXXX.aml)
+ *
+ * Compile with	: cc -O2 extractACPITables.c -o extractACPITables -Wall -framework IOKit -framework CoreFoundation
+ *
+ * Updates:
+ *			v0.1	initial version.
+ *			v0.2	renamed from acpiTableExtract.c to extractAcpiTables.c
+ */
+
+#include <stdio.h>
+
+#include <IOKit/IOKitLib.h>
+#include <CoreFoundation/CoreFoundation.h>
+
+//==============================================================================
+
+int main(int argc, char * argv[])
+{
+	char dirspec[32];
+	int filedesc, status = 0;
+
+	io_service_t	service;
+	CFDictionaryRef	tableDictionary;
+
+	//==================================================================================
+
+	if ((service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleACPIPlatformExpert"))))
+	{
+		if ((tableDictionary = (CFDictionaryRef) IORegistryEntryCreateCFProperty(service, CFSTR("ACPI Tables"), kCFAllocatorDefault, kNilOptions)))
+		{
+			CFIndex tableCount = CFDictionaryGetCount(tableDictionary);
+
+			CFStringRef	tableNames[tableCount];
+			CFDataRef	tableData[tableCount];
+
+			CFDictionaryGetKeysAndValues(tableDictionary, (const void **)&tableNames, (const void **)&tableData);
+
+			for (CFIndex i = 0; i < tableCount; i++)
+			{
+				UInt8 * buffer = (UInt8 *) CFDataGetBytePtr(tableData[i]);
+				UInt32 numBytes = (UInt32) CFDataGetLength(tableData[i]);
+				
+				sprintf(dirspec, "/tmp/%s.aml", CFStringGetCStringPtr(tableNames[i], kCFStringEncodingMacRoman));
+
+				if ((filedesc = open(dirspec, O_WRONLY|O_CREAT|O_TRUNC, 0644)) != -1)
+				{
+					write(filedesc, buffer, numBytes);
+					close(filedesc);
+				}
+				else
+				{
+					status = -3;
+				}
+			}
+
+			CFRelease(tableDictionary);
+		}
+		else
+		{
+			status = -2;
+		}
+
+		IOObjectRelease(service);
+
+		exit(status);	//  0 = success.
+						// -2 = tableDictionary is NULL.
+						// -3 = one or more writes failed.
+    }
+
+	exit(-1); // error (service is NULL).
+}

From 9b9946ea754f7b72a8e5afde2b0f7c16738ecf47 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 20 Oct 2014 21:08:58 +0200
Subject: [PATCH 492/623] Late 2014 iMac data added

- typo fixed.
- Macmini7,1 board-id correction.
---
 i386/libsaio/smbios/model_data.h | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 93a24df..105d94b 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -74,11 +74,23 @@
 		#define SMB_PRODUCT_NAME	"iMac14,3"
 		#define SMB_BOARD_PRODUCT	"Mac-77EB7D7DAF985301"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '3' }
-	#else // Defaults to iMac 14,4
+	#elif (TARGET_MODEL == IMAC_144)
 		#define SMB_BIOS_VERSION	"IM144.88Z.0179.B03.1405241029"
 		#define SMB_PRODUCT_NAME	"iMac14,4"
 		#define SMB_BOARD_PRODUCT	"Mac-81E3E92DD6088272"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '4' }
+	#elif (TARGET_MODEL == IMAC_152)
+		// Intel Core i7-4790K @ 4 GHz
+		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B00.1409291931"
+		#define SMB_PRODUCT_NAME	"iMac15,2"
+		#define SMB_BOARD_PRODUCT	"Mac-FA842E06C61E91C5"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '2' }
+	#else // Defaults to iMac 15,1
+		// Intel Core i5-4690 @ 3.50 GHz
+		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B00.1409291931"
+		#define SMB_PRODUCT_NAME	"iMac15,1"
+		#define SMB_BOARD_PRODUCT	"Mac-42FD25EABCABB274"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -251,18 +263,11 @@
 		#define SMB_PRODUCT_NAME	"Macmini6,2"
 		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '2' }
-	#elif (TARGET_MODEL == MACMINI_71)
-		//
-		#define SMB_BIOS_VERSION	"MM71.88Z.0106.B03.1411161202"
+	#else // Defaults to Macmini7,1
+		#define SMB_BIOS_VERSION	"MM71.88Z.0220.B00.1409291751"
 		#define SMB_PRODUCT_NAME	"Macmini7,1"
-		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
+		#define SMB_BOARD_PRODUCT	"Mac-35C5E08120C7EEAF"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '7', ',', '1' }
-	#else // Defaults to MacPro7,2
-		//
-		#define SMB_BIOS_VERSION	"MM71.88Z.0106.B03.1411161202"
-		#define SMB_PRODUCT_NAME	"Macmini7,2"
-		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '7', ',', '2' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From 58f20379d378242f6cb593f2e258b659da9f6499 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 3 Nov 2014 16:50:04 +0100
Subject: [PATCH 493/623] Updating script to v0.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– check arguments, use argv[1] as target table
---
 i386/libsaio/acpi/Tools/extractACPITables.c | 43 ++++++++++++++-------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/i386/libsaio/acpi/Tools/extractACPITables.c b/i386/libsaio/acpi/Tools/extractACPITables.c
index 836dcca..9b33a92 100755
--- a/i386/libsaio/acpi/Tools/extractACPITables.c
+++ b/i386/libsaio/acpi/Tools/extractACPITables.c
@@ -1,17 +1,21 @@
 /*
  * Name			: extractACPITables.c
- * Version		: 0.1
+ * Version		: 0.3
  * Type			: Command line tool
  * Copyright	: Pike R. Alpha (c) September 2014
  * Description	: ACPI table extractor.
  *
- * Usage		: ./extractACPITables	(writes table data to: /tmp/XXXX.aml)
+ * Usage		: ./extractACPITables			(writes all tables to: /tmp/XXXX.aml)
+ *				: ./extractACPITables DSDT		(writes DSDT.aml to: /tmp/DSDT.aml)
+ *				: ./extractACPITables SSDT		(writes all SSDT tables to: /tmp/SSDT.aml)
+ *				: ./extractACPITables SSDT-2	(writes SSDT-2.aml to: /tmp/SSDT-2.aml)
  *
  * Compile with	: cc -O2 extractACPITables.c -o extractACPITables -Wall -framework IOKit -framework CoreFoundation
  *
  * Updates:
  *			v0.1	initial version.
  *			v0.2	renamed from acpiTableExtract.c to extractAcpiTables.c
+ *			v0.3	check arguments, use argv[1] as target table.
  */
 
 #include <stdio.h>
@@ -24,13 +28,20 @@
 int main(int argc, char * argv[])
 {
 	char dirspec[32];
+	char tableName[8];
 	int filedesc, status = 0;
+	bool allTables = true;
 
 	io_service_t	service;
 	CFDictionaryRef	tableDictionary;
 
 	//==================================================================================
 
+	if (argc == 2)
+	{
+		allTables = false;
+	}
+
 	if ((service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleACPIPlatformExpert"))))
 	{
 		if ((tableDictionary = (CFDictionaryRef) IORegistryEntryCreateCFProperty(service, CFSTR("ACPI Tables"), kCFAllocatorDefault, kNilOptions)))
@@ -47,16 +58,21 @@ int main(int argc, char * argv[])
 				UInt8 * buffer = (UInt8 *) CFDataGetBytePtr(tableData[i]);
 				UInt32 numBytes = (UInt32) CFDataGetLength(tableData[i]);
 				
-				sprintf(dirspec, "/tmp/%s.aml", CFStringGetCStringPtr(tableNames[i], kCFStringEncodingMacRoman));
+				strcpy(tableName, CFStringGetCStringPtr(tableNames[i], kCFStringEncodingMacRoman));
 
-				if ((filedesc = open(dirspec, O_WRONLY|O_CREAT|O_TRUNC, 0644)) != -1)
+				if (allTables || (strncasecmp(argv[1], (char *)tableName, strlen(argv[1])) == 0))
 				{
-					write(filedesc, buffer, numBytes);
-					close(filedesc);
-				}
-				else
-				{
-					status = -3;
+					sprintf(dirspec, "/tmp/%s.aml", tableName);
+
+					if ((filedesc = open(dirspec, O_WRONLY|O_CREAT|O_TRUNC, 0644)) != -1)
+					{
+						write(filedesc, buffer, numBytes);
+						close(filedesc);
+					}
+					else
+					{
+						status = -3;
+					}
 				}
 			}
 
@@ -69,9 +85,10 @@ int main(int argc, char * argv[])
 
 		IOObjectRelease(service);
 
-		exit(status);	//  0 = success.
-						// -2 = tableDictionary is NULL.
-						// -3 = one or more writes failed.
+		//  0 = success.
+		// -2 = tableDictionary is NULL.
+		// -3 = one or more writes failed.
+		exit(status);
     }
 
 	exit(-1); // error (service is NULL).

From 1c7eebefe0db3a974a2d780eb93cac3fe1dcdecf Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:41:24 +0100
Subject: [PATCH 494/623] Comment only change.

---
 i386/libsaio/sys.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/sys.c b/i386/libsaio/sys.c
index 985cefb..4cc4a40 100755
--- a/i386/libsaio/sys.c
+++ b/i386/libsaio/sys.c
@@ -193,7 +193,7 @@ long LoadThinFatFile(const char *fileSpec, void **binary)
 	*binary = (void *)kLoadAddr;
 
 	// Read file into load buffer. The data in the load buffer will be
-	// overwritten by the next LoadFile() call.
+	// overwritten by the next call to LoadFile().
 
 	gFSLoadAddress = (void *) LOAD_ADDR;
 

From 746a894475b3ca79f57f8ec2468d0c573e1c0dd3 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:41:54 +0100
Subject: [PATCH 495/623] Whitespace only change.

---
 i386/libsaio/load.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 0c8f587..d91d1aa 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -50,7 +50,7 @@
 /***
  * Tip: Reverse bytes if you search for the IDs with grep/HexEdit.
  */
-// #define APPLE_HDA_PATCH_ID			0x11D419843D107410 10.9.2 and 10.9.3
+// #define APPLE_HDA_PATCH_ID				0x11D419843D107410 10.9.2 and 10.9.3
 // #define APPLE_HDA_PATCH_ID				0x11D419843D397410
 // #define APPLE_HDA_TARGET_ID				0x10EC08923D397410
 

From f030ec447edccf64367421efe807db697d5333fa Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:42:18 +0100
Subject: [PATCH 496/623] Comment only change.

---
 i386/boot2/lzvn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/boot2/lzvn.c b/i386/boot2/lzvn.c
index f9b3e14..2560c3b 100644
--- a/i386/boot2/lzvn.c
+++ b/i386/boot2/lzvn.c
@@ -84,7 +84,7 @@ size_t lzvn_decode(void * decompressedData, size_t decompressedSize, void * comp
 	uint8_t jmpTo			= CASE_TABLE;
 
 	/*
-	 * This jump table was developed by someone using the handle 'MnusZwei'
+	 * This jump table was developed by someone using the handle 'MinusZwei'
 	 * over at insanelymac.com
 	 */
 	static short caseTable[ 256 ] =

From d08bade9f1314b2dd2389420e93a5c7847090d20 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:43:11 +0100
Subject: [PATCH 497/623] Comment only change.

---
 i386/MakeInc.dir | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/MakeInc.dir b/i386/MakeInc.dir
index 6a87e1c..759c94b 100644
--- a/i386/MakeInc.dir
+++ b/i386/MakeInc.dir
@@ -3,10 +3,10 @@
 #
 # Updates:
 #
-#		- Major cleanup (PikerAlpha, October 2012).
+#		- Major cleanup (Pike R. Alpha, October 2012).
 #		- Fixed clang compilation (dgsga, November 2012).
-#		- Single pass compilation (PikerAlpha, November 2012).
-#		- Removed unused CPPFLAGS (PikerAlpha, November 2012).
+#		- Single pass compilation (Pike R. Alpha, November 2012).
+#		- Removed unused CPPFLAGS (Pike R. Alpha, November 2012).
 #
 
 

From c2954112b532c6a402b12edffbe9e46557fe10bc Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:43:20 +0100
Subject: [PATCH 498/623] Comment only change.

---
 i386/MakePaths.dir | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/MakePaths.dir b/i386/MakePaths.dir
index b4b04c5..5fe8cbd 100644
--- a/i386/MakePaths.dir
+++ b/i386/MakePaths.dir
@@ -3,7 +3,7 @@
 #
 # Updates:
 #
-#  	- Major cleanup (PikerAlpha, October 2012).
+#  	- Major cleanup (Pike R. Alpha, October 2012).
 #
 
 

From ee2e6e436e27f210e398a053f5c4e2aaf2003578 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:45:23 +0100
Subject: [PATCH 499/623] Style nit.

---
 i386/boot2/debug.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/boot2/debug.h b/i386/boot2/debug.h
index a015167..f298e41 100755
--- a/i386/boot2/debug.h
+++ b/i386/boot2/debug.h
@@ -9,9 +9,9 @@
 #define __REVO_CONFIG_SETTINGS
 
 #include "../config/settings.h"
-#define DEBUG_STATE_ENABLED		DEBUG_ACPI || DEBUG_BOOT || DEBUG_CPU || DEBUG_DISK || \
+#define DEBUG_STATE_ENABLED		(DEBUG_ACPI || DEBUG_BOOT || DEBUG_CPU || DEBUG_DISK || \
 					DEBUG_DRIVERS|| DEBUG_EFI || DEBUG_BOOT_GRAPHICS || \
-					DEBUG_PLATFORM || DEBUG_SMBIOS
+					DEBUG_PLATFORM || DEBUG_SMBIOS)
 
 #endif // __REVO_CONFIG_SETTINGS
 

From b899a630fc1dcee76413a6ddb27fb865b94b3616 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:49:42 +0100
Subject: [PATCH 500/623] New HelperPath detection.

---
 i386/libsaio/stringTable.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/stringTable.c b/i386/libsaio/stringTable.c
index af42db0..e8ac319 100755
--- a/i386/libsaio/stringTable.c
+++ b/i386/libsaio/stringTable.c
@@ -382,11 +382,8 @@ long loadCABootPlist(void)
 #endif
 		"Library/Preferences/SystemConfiguration" // The default.
 
-#if APPLE_RAID_SUPPORT
-		/*
-		 * This is a temporarily change to test RAID support, but it
-		 * will be rewritten right after Bryan confirms that it works.
-		 */
+#if (APPLE_RAID_SUPPORT || CORE_STORAGE_SUPPORT)
+		// Helper Locations
 		,
 		"com.apple.boot.P/Library/Preferences/SystemConfiguration",
 		"com.apple.boot.R/Library/Preferences/SystemConfiguration",
@@ -422,6 +419,14 @@ long loadCABootPlist(void)
 					// Installation data directory located
 					gPlatform.BootVolume->flags = kBVFlagInstallVolume;
 				}
+#endif
+#if (APPLE_RAID_SUPPORT || CORE_STORAGE_SUPPORT)
+				if (strncmp(path, "/com.apple.boot.", 16) == 0)
+				{
+					gPlatform.HelperPath = malloc(18);
+					bzero(gPlatform.HelperPath, 18);
+					strncpy(gPlatform.HelperPath, path, 17);
+				}
 #endif
 				break;
 			}

From e9b2d8ad98eec0ee75cc7205349fd687238b687a Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:49:55 +0100
Subject: [PATCH 501/623] New HelperPath detection.

---
 i386/libsaio/platform.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 61ea0ba..20f76bd 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -217,8 +217,9 @@ void initPlatform(int biosDevice, bool bootRecoveryHD)
 
 	_PLATFORM_DEBUG_DUMP("gPlatform.OSVersion: %s\n", gPlatform.OSVersion);
 
+	gPlatform.HelperPath			= NULL; // Will be initialized in stringTable.c
+
 	gPlatform.KernelCachePath		= strdup(kKernelCachePath);	// Used in boot.c and driver.c
-	
 	_PLATFORM_DEBUG_DUMP("Kernel cache path: %s\n", gPlatform.KernelCachePath);
 
 	gPlatform.BIOSDevice			= (biosDevice & kBIOSDevMask);	// Device number masked with 0xFF.

From 4ac8db02a4e05fe27d83ca19b241a8e89a4c7415 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:50:46 +0100
Subject: [PATCH 502/623] New HelperPath detection

- latest iMac models added.
---
 i386/libsaio/platform.h | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 4b29079..c3025bd 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -64,14 +64,17 @@
 // Additional model selectors to select a specific target model.
 //------------------------------------------------------------------------------
 
-#define IMAC_111				(IMAC | (1 << 15))
-#define IMAC_121				(IMAC | (2 << 15))
-#define IMAC_122				(IMAC | (3 << 15))
-#define IMAC_131				(IMAC | (4 << 15))
-#define IMAC_132				(IMAC | (5 << 15))
-#define IMAC_141				(IMAC | (6 << 15))
-#define IMAC_142				(IMAC | (7 << 15))
-#define IMAC_143				 IMAC						// Defaults to iMac14,3
+#define IMAC_111				(IMAC | ( 1 << 15))
+#define IMAC_121				(IMAC | ( 2 << 15))
+#define IMAC_122				(IMAC | ( 3 << 15))
+#define IMAC_131				(IMAC | ( 4 << 15))
+#define IMAC_132				(IMAC | ( 5 << 15))
+#define IMAC_141				(IMAC | ( 6 << 15))
+#define IMAC_142				(IMAC | ( 7 << 15))
+#define IMAC_143				(IMAC | ( 8 << 15))
+#define IMAC_144				(IMAC | ( 9 << 15))
+#define IMAC_152				(IMAC | (10 << 15))
+#define IMAC_151				 IMAC						// Defaults to iMac15,1
 
 #define MACBOOK_41				 MACBOOK					// Defaults to MacBook4,1
 
@@ -100,7 +103,6 @@
 #define MACMINI_53				(MACMINI | (4 << 15))
 #define MACMINI_61				(MACMINI | (5 << 15))
 #define MACMINI_62				(MACMINI | (6 << 15))
-#define MACMINI_72				(MACMINI | (7 << 15))
 #define MACMINI_71				 MACMINI					// Defaults to Macmini7,1
 
 #define MACPRO_31				(MACPRO | (1 << 15))
@@ -186,9 +188,8 @@ typedef struct _PlatformInfo_t
 	char *				KextFileName;			// Initialized and used in drivers.c
 	char *				KextFileSpec;			// Initialized and used in drivers.c
 	char *				KextPlistSpec;			// Initialized and used in drivers.c
-	
 	char *				KernelCachePath;		// Initialized in platform.c and used in boot.c, driver.c
-	
+	char *				HelperPath;				// Initialized in stringTable.c and used in boot.c 	
 #if PRE_LINKED_KERNEL_SUPPORT
 	bool				KernelCacheSpecified;	// Set to indicate that a full path is specified.
 #endif

From baa1f5cbafdc7390147dcdb14ceec11bee20799b Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:52:36 +0100
Subject: [PATCH 503/623] New HelperPath detection

- check for root UUID added.
---
 i386/boot2/boot.c | 88 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 31 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index d177375..fa12191 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -371,6 +371,14 @@ void boot(int biosdev)
 #endif
 			}
 		}
+		// Check for Root UUID (required for Fusion Drives).
+		if (rootUUID[0] == '\0' && (getValueForKey(kHelperRootUUIDKey, &val, &length, &bootInfo->bootConfig) && length == 36))
+		{
+			_BOOT_DEBUG_DUMP("Target boot-uuid=<%s>\n", val);
+			
+			// Yes. Copy its value into rootUUID.
+			strlcpy(rootUUID, val, 37);
+		}
 
 		/* Enable touching of a single BIOS device by setting 'Scan Single Drive' to yes.
 		if (getBoolForKey(kScanSingleDriveKey, &gScanSingleDrive, &bootInfo->bootConfig) && gScanSingleDrive)
@@ -554,53 +562,71 @@ void boot(int biosdev)
 				 * Starting with Lion, we can take a shortcut by simply pointing 
 				 * the 'bootFile' to the kernel cache and we are done.
 				 */
-
 				sprintf(bootFile, "%s", gPlatform.KernelCachePath);
 			}
+			else // Try to find a prelinked-kernel/kernelcache
+			{
+				char * preLinkedKernelPath = malloc(128);
 
-			/*
-			 * We might have been fired up from a USB thumbdrive (kickstart boot) and 
-			 * thus we have to check the kernel cache path first (might not be there).
-			 */
+				if (gPlatform.HelperPath) // com.apple.boot.[RPS]
+				{
+					sprintf(preLinkedKernelPath, "%s%s", gPlatform.HelperPath, gPlatform.KernelCachePath);
+				}
+				else
+				{
+					sprintf(preLinkedKernelPath, "%s", gPlatform.KernelCachePath);
+				}
 
-			else if (GetFileInfo(NULL, gPlatform.KernelCachePath, &flags, &cachetime) == 0)
-			{
-				static char preLinkedKernelPath[128];
-				static char adler32Key[PLATFORM_NAME_LEN + ROOT_PATH_LEN];
+				// Check kernelcache directory
+				if (GetFileInfo(NULL, preLinkedKernelPath, &flags, &cachetime) == 0)
+				{
+					static char adler32Key[PLATFORM_NAME_LEN + ROOT_PATH_LEN];
 				
-				// unsigned long adler32 = 0;
+					_BOOT_DEBUG_DUMP("Checking for pre-linked kernel...\n");
 				
-				preLinkedKernelPath[0] = '\0';
+					// Zero out platform info (name and kernel root path).
+					bzero(adler32Key, sizeof(adler32Key));
 				
-				_BOOT_DEBUG_DUMP("Checking for pre-linked kernel...\n");
+					// Construct key for the pre-linked kernel checksum (generated by adler32).
+					sprintf(adler32Key, gPlatform.ModelID);
+					sprintf(adler32Key + PLATFORM_NAME_LEN, "%s", BOOT_DEVICE_PATH);
+					sprintf(adler32Key + (PLATFORM_NAME_LEN + 38), "%s", bootInfo->bootFile);
 				
-				// Zero out platform info (name and kernel root path).
-				bzero(adler32Key, sizeof(adler32Key));
+					adler32 = Adler32((unsigned char *)adler32Key, sizeof(adler32Key));
 				
-				// Construct key for the pre-linked kernel checksum (generated by adler32).
-				sprintf(adler32Key, gPlatform.ModelID);
-				sprintf(adler32Key + PLATFORM_NAME_LEN, "%s", BOOT_DEVICE_PATH);
-				sprintf(adler32Key + (PLATFORM_NAME_LEN + 38), "%s", bootInfo->bootFile);
-				
-				adler32 = Adler32((unsigned char *)adler32Key, sizeof(adler32Key));
-				
-				_BOOT_DEBUG_DUMP("adler32: %08X\n", adler32);
+					_BOOT_DEBUG_DUMP("adler32: %08X\n", adler32);
 
 #if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set (like Lion).
 
-				_BOOT_DEBUG_DUMP("Checking for kernelcache...\n");
+					_BOOT_DEBUG_DUMP("Checking for kernelcache...\n");
 
-				if (GetFileInfo(gPlatform.KernelCachePath, (char *)kKernelCache, &flags, &cachetime) == 0)
-				{
-					sprintf(bootFile, "%s/%s", gPlatform.KernelCachePath, kKernelCache);
+					// if (GetFileInfo(gPlatform.KernelCachePath, (char *)kKernelCache, &flags, &cachetime) == 0)
+					if (GetFileInfo(preLinkedKernelPath, (char *)kKernelCache, &flags, &cachetime) == 0)
+					{
+						sprintf(bootFile, "%s/%s", preLinkedKernelPath, kKernelCache);
 
-					_BOOT_DEBUG_DUMP("Kernelcache located.\n");
+						_BOOT_DEBUG_DUMP("Kernelcache located.\n");
+					}
+					else
+					{
+						mayUseKernelCache = false;
+						_BOOT_DEBUG_DUMP("Failed to locate the kernelcache!\n");
+					}
+				}
+				else
+				{
+					mayUseKernelCache = false;
+					_BOOT_DEBUG_DUMP("Failed to locate the kernelcache directory!\n");
+				}
+				
+				if (mayUseKernelCache == false)
+				{
+					sprintf(bootFile, "/System/Library/Kernels/%s", bootInfo->bootFile);
+					_BOOT_DEBUG_DUMP("No kernelcache found, will load: %s!\n", bootInfo->bootFile);
 				}
 
-				_BOOT_DEBUG_ELSE_DUMP("Failed to locate the kernelcache. Will load: %s!\n", bootInfo->bootFile);
+				free(preLinkedKernelPath);
 			}
-
-			_BOOT_DEBUG_ELSE_DUMP("Failed to locate the kernelcache (directory)!\n");
 		}
 #else // Not for Mavericks/Mountain Lion/Lion, go easy with the Snow Leopard.
 
@@ -746,7 +772,7 @@ void boot(int biosdev)
 				
 				// _BOOT_DEBUG_SLEEP(6);
 				
-				// Switch to graphics mode and show the Apple logo on a gray-ish background.
+				// Switch to graphics mode and show the (white) Apple logo on a black/gray background.
 				showBootLogo(bootRecoveryHD);
 			}
 

From dbc62882fc825004efbba460b12b827885e4ca2d Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 23 Dec 2014 11:55:28 +0100
Subject: [PATCH 504/623] Adding boot0 and boot1h

---
 .gitignore          |    3 +
 i386/boot0/boot0.s  |  808 +++++++++++++++++++++++
 i386/boot1/boot1h.s | 1487 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 2298 insertions(+)
 create mode 100644 i386/boot0/boot0.s
 create mode 100644 i386/boot1/boot1h.s

diff --git a/.gitignore b/.gitignore
index f738622..98d0a72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@ out.log
 obj/*
 sym/*
 
+i386/boot0/boot0
+i386/boot1/boot1h
+
 i386/config/SETTINGS/*.h
 
 i386/config/ACPI/*.h
diff --git a/i386/boot0/boot0.s b/i386/boot0/boot0.s
new file mode 100644
index 0000000..7469671
--- /dev/null
+++ b/i386/boot0/boot0.s
@@ -0,0 +1,808 @@
+; Copyright (c) 1999-2003 Apple Computer, Inc. All rights reserved.
+;
+; @APPLE_LICENSE_HEADER_START@
+;
+; Portions Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights
+; Reserved.  This file contains Original Code and/or Modifications of
+; Original Code as defined in and that are subject to the Apple Public
+; Source License Version 2.0 (the "License").  You may not use this file
+; except in compliance with the License.  Please obtain a copy of the
+; License at http://www.apple.com/publicsource and read it before using
+; this file.
+;
+; The Original Code and all software distributed under the License are
+; distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+; EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+; INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+; FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
+; License for the specific language governing rights and limitations
+; under the License.
+;
+; @APPLE_LICENSE_HEADER_END@
+;
+; Boot Loader: boot0
+;
+; A small boot sector program written in x86 assembly whose only
+; responsibility is to locate the active partition, load the
+; partition booter into memory, and jump to the booter's entry point.
+; It leaves the boot drive in DL and a pointer to the partition entry in SI.
+;
+; This boot loader must be placed in the Master Boot Record.
+;
+; In order to coexist with a fdisk partition table (64 bytes), and
+; leave room for a two byte signature (0xAA55) in the end, boot0 is
+; restricted to 446 bytes (512 - 64 - 2). If boot0 did not have to
+; live in the MBR, then we would have 510 bytes to work with.
+;
+; boot0 is always loaded by the BIOS or another booter to 0:7C00h.
+;
+; This code is written for the NASM assembler.
+;   nasm boot0.s -o boot0
+
+;
+; This version of boot0 implements hybrid GUID/MBR partition scheme support
+;
+; Written by Tam‡s Kos‡rszky on 2008-03-10
+;
+; Turbo added EFI System Partition boot support
+;
+; Added KillerJK's switchPass2 modifications
+;
+
+;
+; Set to 1 to enable obscure debug messages.
+;
+DEBUG				EQU  0
+
+;
+; Set to 1 to enable verbose mode
+;
+VERBOSE				EQU  0
+
+;
+; Various constants.
+;
+kBoot0Segment		EQU  0x0000
+kBoot0Stack			EQU  0xFFF0			; boot0 stack pointer
+kBoot0LoadAddr		EQU  0x7C00			; boot0 load address
+kBoot0RelocAddr		EQU  0xE000			; boot0 relocated address
+
+kMBRBuffer			EQU  0x1000			; MBR buffer address
+kLBA1Buffer			EQU  0x1200			; LBA1 - GPT Partition Table Header buffer address
+kGPTABuffer			EQU  0x1400			; GUID Partition Entry Array buffer address
+
+kPartTableOffset	EQU  0x1be
+kMBRPartTable		EQU  kMBRBuffer + kPartTableOffset
+
+kSectorBytes		EQU  512			; sector size in bytes
+kBootSignature		EQU  0xAA55			; boot sector signature
+kHFSPSignature		EQU  'H+'			; HFS+ volume signature
+kHFSPCaseSignature	EQU  'HX'			; HFS+ volume case-sensitive signature
+kFAT32BootCodeOffset EQU  0x5a			; offset of boot code in FAT32 boot sector
+kBoot1FAT32Magic	EQU  'BO'			; Magic string to detect our boot1f32 code
+
+
+kGPTSignatureLow	EQU  'EFI '			; GUID Partition Table Header Signature
+kGPTSignatureHigh	EQU  'PART'
+kGUIDLastDwordOffs	EQU  12				; last 4 byte offset of a GUID
+
+kPartCount			EQU  4				; number of paritions per table
+kPartTypeHFS		EQU  0xaf			; HFS+ Filesystem type
+kPartTypeABHFS		EQU  0xab			; Apple_Boot partition
+kPartTypePMBR		EQU  0xee			; On all GUID Partition Table disks a Protective MBR (PMBR)
+										; in LBA 0 (that is, the first block) precedes the
+										; GUID Partition Table Header to maintain compatibility
+										; with existing tools that do not understand GPT partition structures.
+										; The Protective MBR has the same format as a legacy MBR
+										; and contains one partition entry with an OSType set to 0xEE
+										; reserving the entire space used on the disk by the GPT partitions,
+										; including all headers.
+
+kPartActive	        EQU  0x80			; active flag enabled
+kPartInactive	    EQU  0x00			; active flag disabled
+kHFSGUID	        EQU  0x48465300		; first 4 bytes of Apple HFS Partition Type GUID.
+kAppleGUID			EQU  0xACEC4365		; last 4 bytes of Apple type GUIDs.
+kEFISystemGUID		EQU  0x3BC93EC9		; last 4 bytes of EFI System Partition Type GUID:
+										; C12A7328-F81F-11D2-BA4B-00A0C93EC93B
+
+%ifdef FLOPPY
+kDriveNumber		EQU  0x00
+%else
+kDriveNumber		EQU  0x80
+%endif
+
+;
+; Format of fdisk partition entry.
+;
+; The symbol 'part_size' is automatically defined as an `EQU'
+; giving the size of the structure.
+;
+           struc part
+.bootid    resb 1      ; bootable or not
+.head      resb 1      ; starting head, sector, cylinder
+.sect      resb 1      ;
+.cyl       resb 1      ;
+.type      resb 1      ; partition type
+.endhead   resb 1      ; ending head, sector, cylinder
+.endsect   resb 1      ;
+.endcyl    resb 1      ;
+.lba       resd 1      ; starting lba
+.sectors   resd 1      ; size in sectors
+           endstruc
+
+;
+; Format of GPT Partition Table Header
+;
+							struc	gpth
+.Signature 					resb	8
+.Revision  					resb	4
+.HeaderSize					resb	4
+.HeaderCRC32				resb	4
+.Reserved					resb	4
+.MyLBA						resb	8
+.AlternateLBA				resb	8
+.FirstUsableLBA				resb	8
+.LastUsableLBA				resb	8
+.DiskGUID					resb	16
+.PartitionEntryLBA			resb	8
+.NumberOfPartitionEntries	resb	4
+.SizeOfPartitionEntry		resb	4
+.PartitionEntryArrayCRC32	resb	4
+							endstruc
+
+;
+; Format of GUID Partition Entry Array
+;
+						  	struc	gpta
+.PartitionTypeGUID			resb	16
+.UniquePartitionGUID		resb	16
+.StartingLBA				resb	8
+.EndingLBA					resb	8
+.Attributes					resb	8
+.PartitionName				resb	72
+							endstruc
+
+;
+; Macros.
+;
+%macro DebugCharMacro 1
+    mov   al, %1
+    call  print_char
+%endmacro
+
+%macro LogString 1
+    mov   di, %1
+    call  log_string
+%endmacro
+
+%if DEBUG
+%define DebugChar(x)  DebugCharMacro x
+%else
+%define DebugChar(x)
+%endif
+
+;--------------------------------------------------------------------------
+; Start of text segment.
+
+    SEGMENT .text
+
+    ORG     kBoot0RelocAddr
+
+;--------------------------------------------------------------------------
+; Boot code is loaded at 0:7C00h.
+;
+start:
+    ;
+    ; Set up the stack to grow down from kBoot0Segment:kBoot0Stack.
+    ; Interrupts should be off while the stack is being manipulated.
+    ;
+    cli                             ; interrupts off
+    xor     ax, ax                  ; zero ax
+    mov     ss, ax                  ; ss <- 0
+    mov     sp, kBoot0Stack         ; sp <- top of stack
+    sti                             ; reenable interrupts
+
+    mov     es, ax                  ; es <- 0
+    mov     ds, ax                  ; ds <- 0
+
+    ;
+    ; Relocate boot0 code.
+    ;
+    mov     si, kBoot0LoadAddr      ; si <- source
+    mov     di, kBoot0RelocAddr     ; di <- destination
+    cld                             ; auto-increment SI and/or DI registers
+    mov     cx, kSectorBytes/2      ; copy 256 words
+    repnz   movsw                   ; repeat string move (word) operation
+
+    ;
+    ; Code relocated, jump to start_reloc in relocated location.
+    ;
+    jmp     kBoot0Segment:start_reloc
+
+;--------------------------------------------------------------------------
+; Start execution from the relocated location.
+;
+start_reloc:
+
+    DebugChar('>')
+
+%if DEBUG
+    mov     al, dl
+    call    print_hex
+%endif
+
+    ;
+    ; Since this code may not always reside in the MBR, always start by
+    ; loading the MBR to kMBRBuffer and LBA1 to kGPTBuffer.
+    ;
+
+    xor     eax, eax
+    mov     [my_lba], eax			; store LBA sector 0 for read_lba function
+    mov     al, 2					; load two sectors: MBR and LBA1
+    mov     bx, kMBRBuffer			; MBR load address
+    call    load
+    jc      error					; MBR load error
+
+    ;
+    ; Look for the booter partition in the MBR partition table,
+    ; which is at offset kMBRPartTable.
+    ;
+    mov     si, kMBRPartTable		; pointer to partition table
+    call    find_boot				; will not return on success
+
+error:
+    LogString(boot_error_str)
+
+hang:
+    hlt
+    jmp     hang
+
+
+;--------------------------------------------------------------------------
+; Find the active (boot) partition and load the booter from the partition.
+;
+; Arguments:
+;   DL = drive number (0x80 + unit number)
+;   SI = pointer to fdisk partition table.
+;
+; Clobber list:
+;   EAX, BX, EBP
+;
+find_boot:
+
+    ;
+    ; Check for boot block signature 0xAA55 following the 4 partition
+    ; entries.
+    ;
+    cmp     WORD [si + part_size * kPartCount], kBootSignature
+    jne	    .exit        	  			; boot signature not found.
+
+    xor	    bx, bx						; BL will be set to 1 later in case of
+										; Protective MBR has been found
+
+    inc     bh							; BH = 1. Giving a chance for a second pass
+										; to boot an inactive but boot1h aware HFS+ partition
+										; by scanning the MBR partition entries again.
+
+.start_scan:
+    mov     cx, kPartCount          	; number of partition entries per table
+
+.loop:
+
+    ;
+    ; First scan through the partition table looking for the active
+    ; partition.
+    ;
+%if DEBUG
+    mov     al, [si + part.type] 	   ; print partition type
+    call    print_hex
+%endif
+
+    mov	    eax, [si + part.lba]					; save starting LBA of current 
+    mov	    [my_lba], eax							; MBR partition entry for read_lba function
+    cmp     BYTE [si + part.type], 0				; unused partition?
+    je      .continue  								; skip to next entry
+    cmp	    BYTE [si + part.type], kPartTypePMBR	; check for Protective MBR 
+    jne	    .testPass
+
+    mov     BYTE [si + part.bootid], kPartInactive	; found Protective MBR
+        											; clear active flag to make sure this protective
+													; partition won't be used as a bootable partition.
+    mov	    bl, 1									; Assume we can deal with GPT but try to scan
+					    							; later if not found any other bootable partitions.
+
+.testPass:
+    cmp	    bh, 1
+    jne	    .Pass2
+
+.Pass1:
+    cmp     BYTE [si + part.bootid], kPartActive	; In pass 1 we are walking on the standard path
+                                                    ; by trying to hop on the active partition.
+    jne     .continue
+    xor	  	dh, dh               					; Argument for loadBootSector to skip HFS+ partition
+											        ; signature check.
+    jmp     .tryToBoot
+
+.Pass2:
+    cmp	    BYTE [si + part.type], kPartTypeHFS		; In pass 2 we're going to find a HFS+ partition
+                                                    ; equipped with boot1h in its boot record
+                                                    ; regardless if it's active or not.
+    jne     .continue
+  	mov 	dh, 1                					; Argument for loadBootSector to check HFS+ partition signature.
+
+    DebugChar('*')
+
+    ;
+    ; Found boot partition, read boot sector to memory.
+    ;
+
+.tryToBoot:
+
+    call    loadBootSector
+    jne     .continue
+    jmp	    SHORT initBootLoader
+
+.continue:
+    add     si, BYTE part_size     			; advance SI to next partition entry
+    loop    .loop                 		 	; loop through all partition entries
+
+    ;
+    ; Scanned all partitions but not found any with active flag enabled
+    ; Anyway if we found a protective MBR before we still have a chance 
+    ; for a possible GPT Header at LBA 1
+    ;    
+    dec	    bl
+    jnz     .switchPass2					; didn't find Protective MBR before
+    call    checkGPT
+
+.switchPass2:
+    ;
+    ; Switching to Pass 2 
+    ; try to find a boot1h aware HFS+ MBR partition
+    ;
+    dec	    bh
+    mov	    si, kMBRPartTable				; set SI to first entry of MBR Partition table
+    jz      .start_scan						; scan again
+    
+.exit:
+    ret										; Giving up.
+
+
+    ;
+    ; Jump to partition booter. The drive number is already in register DL.
+    ; SI is pointing to the modified partition entry.
+    ;
+initBootLoader:    
+
+DebugChar('J')
+
+%if VERBOSE
+    LogString(done_str)
+%endif
+
+    jmp     kBoot0LoadAddr
+
+    
+    ; 
+    ; Found Protective MBR Partition Type: 0xEE
+    ; Check for 'EFI PART' string at the beginning
+    ; of LBA1 for possible GPT Table Header
+    ;
+checkGPT:
+    push    bx
+
+    mov	    di, kLBA1Buffer						; address of GUID Partition Table Header
+    cmp	    DWORD [di], kGPTSignatureLow		; looking for 'EFI '
+    jne	    .exit								; not found. Giving up.
+    cmp	    DWORD [di + 4], kGPTSignatureHigh   ; looking for 'PART'
+    jne	    .exit								; not found. Giving up indeed.
+    mov	    si, di
+
+    ;
+    ; Loading GUID Partition Table Array
+    ;
+    mov     eax, [si + gpth.PartitionEntryLBA]          ; starting LBA of GPT Array
+    mov     [my_lba], eax								; save starting LBA for read_lba function
+    mov     cx, [si + gpth.NumberOfPartitionEntries]	; number of GUID Partition Array entries
+    mov     bx, [si + gpth.SizeOfPartitionEntry]		; size of GUID Partition Array entry
+
+    push    bx											; push size of GUID Partition entry
+
+    ;
+    ; Calculating number of sectors we need to read for loading a GPT Array
+    ;
+;    push    dx							; preserve DX (DL = BIOS drive unit number)
+;    mov	    ax, cx					; AX * BX = number of entries * size of one entry
+;    mul     bx							; AX = total byte size of GPT Array
+;    pop	    dx						; restore DX
+;    shr     ax, 9						; convert to sectors
+
+    ;
+    ; ... or:
+    ; Current GPT Arrays uses 128 partition entries each 128 bytes long
+    ; 128 entries * 128 bytes long GPT Array entries / 512 bytes per sector = 32 sectors
+    ;
+	mov		al, 32					; maximum sector size of GPT Array (hardcoded method)
+
+    mov	    bx, kGPTABuffer
+    push    bx						; push address of GPT Array
+    call    load					; read GPT Array
+    pop	    si						; SI = address of GPT Array
+    pop	    bx						; BX = size of GUID Partition Array entry
+    jc	    error
+
+    ;
+    ; Walk through GUID Partition Table Array
+    ; and load boot record from first available HFS+ partition.
+    ;
+    ; If it has boot signature (0xAA55) then jump to it
+    ; otherwise skip to next partition.
+    ;
+
+%if VERBOSE
+    LogString(gpt_str)
+%endif
+
+.gpt_loop:
+
+    mov     eax, [si + gpta.PartitionTypeGUID + kGUIDLastDwordOffs]
+
+	cmp		eax, kAppleGUID			; check current GUID Partition for Apple's GUID type
+	je		.gpt_ok
+
+	;
+	; Turbo - also try EFI System Partition
+	;
+
+	cmp		eax, kEFISystemGUID		; check current GUID Partition for EFI System Partition GUID type
+	jne		.gpt_continue
+
+.gpt_ok:
+    ;
+    ; Found HFS Partition
+    ;
+
+    mov	    eax, [si + gpta.StartingLBA]			; load boot sector from StartingLBA
+    mov	    [my_lba], eax		
+	mov		dh, 1									; Argument for loadBootSector to check HFS+ partition signature.
+    call    loadBootSector
+    jne	    .gpt_continue							; no boot loader signature
+
+    mov	    si, kMBRPartTable						; fake the current GUID Partition
+    mov	    [si + part.lba], eax					; as MBR style partition for boot1h
+    mov     BYTE [si + part.type], kPartTypeHFS		; with HFS+ filesystem type (0xAF)
+    jmp	    SHORT initBootLoader    
+    
+.gpt_continue:
+
+    add	    si, bx									; advance SI to next partition entry
+    loop    .gpt_loop								; loop through all partition entries	
+
+.exit:
+    pop     bx
+    ret												; no more GUID partitions. Giving up.
+
+
+;--------------------------------------------------------------------------
+; loadBootSector - Load boot sector
+;
+; Arguments:
+;   DL = drive number (0x80 + unit number)
+;   DH = 0 skip HFS+ partition signature checking
+;        1 enable HFS+ partition signature checking
+;   [my_lba] = starting LBA.
+;
+; Returns:
+;   ZF = 0 if boot sector hasn't kBootSignature
+;        1 if boot sector has kBootSignature
+;
+loadBootSector:
+    pusha
+
+    mov     al, 3
+    mov     bx, kBoot0LoadAddr
+    call    load
+    jc      error
+
+	or		dh, dh
+	jz		.checkBootSignature
+	
+.checkHFSSignature:
+
+%if VERBOSE
+    LogString(test_str)
+%endif
+
+	;
+	; Looking for HFSPlus ('H+') or HFSPlus case-sensitive ('HX') signature.
+	;
+	mov		ax, [kBoot0LoadAddr + 2 * kSectorBytes]
+    cmp     ax, kHFSPSignature		; 'H+'
+	je		.checkBootSignature
+	cmp		ax, kHFSPCaseSignature	; 'HX'
+    je		.checkBootSignature
+
+	;
+	; Looking for boot1f32 magic string.
+	;
+	mov		ax, [kBoot0LoadAddr + kFAT32BootCodeOffset]
+	cmp		ax, kBoot1FAT32Magic
+    jne     .exit
+
+.checkBootSignature:
+    ;
+    ; Check for boot block signature 0xAA55
+    ;
+    mov	    di, bx
+    cmp     WORD [di + kSectorBytes - 2], kBootSignature
+
+.exit:
+
+    popa
+
+    ret
+
+
+;--------------------------------------------------------------------------
+; load - Load one or more sectors from a partition.
+;
+; Arguments:
+;   AL = number of 512-byte sectors to read.
+;   ES:BX = pointer to where the sectors should be stored.
+;   DL = drive number (0x80 + unit number)
+;   [my_lba] = starting LBA.
+;
+; Returns:
+;   CF = 0 success
+;        1 error
+;
+load:
+    push    cx
+
+.ebios:
+    mov     cx, 5                   ; load retry count
+.ebios_loop:
+    call    read_lba                ; use INT13/F42
+    jnc     .exit
+    loop    .ebios_loop
+
+.exit:
+    pop     cx
+    ret
+
+
+;--------------------------------------------------------------------------
+; read_lba - Read sectors from a partition using LBA addressing.
+;
+; Arguments:
+;   AL = number of 512-byte sectors to read (valid from 1-127).
+;   ES:BX = pointer to where the sectors should be stored.
+;   DL = drive number (0x80 + unit number)
+;   [my_lba] = starting LBA.
+;
+; Returns:
+;   CF = 0 success
+;        1 error
+;
+read_lba:
+    pushad                          ; save all registers
+    mov     bp, sp                  ; save current SP
+
+    ;
+    ; Create the Disk Address Packet structure for the
+    ; INT13/F42 (Extended Read Sectors) on the stack.
+    ;
+
+;   push    DWORD 0                 ; offset 12, upper 32-bit LBA
+    push    ds                      ; For sake of saving memory,
+    push    ds                      ; push DS register, which is 0.
+    mov     ecx, [my_lba]           ; offset 8, lower 32-bit LBA
+    push    ecx
+    push    es                      ; offset 6, memory segment
+    push    bx                      ; offset 4, memory offset
+    xor     ah, ah                  ; offset 3, must be 0
+    push    ax                      ; offset 2, number of sectors
+
+    ; It pushes 2 bytes with a smaller opcode than if WORD was used
+    push    BYTE 16                 ; offset 0-1, packet size
+
+    DebugChar('<')
+%if DEBUG
+    mov  eax, ecx
+    call print_hex
+%endif
+        
+    ;
+    ; INT13 Func 42 - Extended Read Sectors
+    ;
+    ; Arguments:
+    ;   AH    = 0x42
+    ;   DL    = drive number (80h + drive unit)
+    ;   DS:SI = pointer to Disk Address Packet
+    ;
+    ; Returns:
+    ;   AH    = return status (sucess is 0)
+    ;   carry = 0 success
+    ;           1 error
+    ;
+    ; Packet offset 2 indicates the number of sectors read
+    ; successfully.
+    ;
+    mov     si, sp
+    mov     ah, 0x42
+    int     0x13
+
+    jnc     .exit
+
+    DebugChar('R')                  ; indicate INT13/F42 error
+
+    ;
+    ; Issue a disk reset on error.
+    ; Should this be changed to Func 0xD to skip the diskette controller
+    ; reset?
+    ;
+    xor     ax, ax                  ; Func 0
+    int     0x13                    ; INT 13
+    stc                             ; set carry to indicate error
+
+.exit:
+    mov     sp, bp                  ; restore SP
+    popad
+    ret
+
+
+;--------------------------------------------------------------------------
+; Write a string with 'boot0: ' prefix to the console.
+;
+; Arguments:
+;   ES:DI   pointer to a NULL terminated string.
+;
+; Clobber list:
+;   DI
+;
+log_string:
+    pusha
+
+    push	di
+    mov		si, log_title_str
+    call	print_string
+
+    pop		si
+    call	print_string
+
+    popa
+
+    ret
+
+
+;--------------------------------------------------------------------------
+; Write a string to the console.
+;
+; Arguments:
+;   DS:SI   pointer to a NULL terminated string.
+;
+; Clobber list:
+;   AX, BX, SI
+;
+print_string:
+    mov     bx, 1                   ; BH=0, BL=1 (blue)
+    cld                             ; increment SI after each lodsb call
+.loop:
+    lodsb                           ; load a byte from DS:SI into AL
+    cmp     al, 0                   ; Is it a NULL?
+    je      .exit                   ; yes, all done
+    mov     ah, 0xE                 ; INT10 Func 0xE
+    int     0x10                    ; display byte in tty mode
+    jmp     short .loop
+.exit:
+    ret
+
+
+%if DEBUG
+
+;--------------------------------------------------------------------------
+; Write a ASCII character to the console.
+;
+; Arguments:
+;   AL = ASCII character.
+;
+print_char:
+    pusha
+    mov     bx, 1                   ; BH=0, BL=1 (blue)
+    mov     ah, 0x0e                ; bios INT 10, Function 0xE
+    int     0x10                    ; display byte in tty mode
+    popa
+    ret
+
+
+;--------------------------------------------------------------------------
+; Write the 4-byte value to the console in hex.
+;
+; Arguments:
+;   EAX = Value to be displayed in hex.
+;
+print_hex:
+    pushad
+    mov     cx, WORD 4
+    bswap   eax
+.loop:
+    push    ax
+    ror     al, 4
+    call    print_nibble            ; display upper nibble
+    pop     ax
+    call    print_nibble            ; display lower nibble
+    ror     eax, 8
+    loop    .loop
+
+    mov     al, 10                  ; carriage return
+    call    print_char
+    mov     al, 13
+    call    print_char
+
+    popad
+    ret
+
+print_nibble:
+    and     al, 0x0f
+    add     al, '0'
+    cmp     al, '9'
+    jna     .print_ascii
+    add     al, 'A' - '9' - 1
+.print_ascii:
+    call    print_char
+    ret
+
+getc:
+    pusha
+    mov    ah, 0
+    int    0x16
+    popa
+    ret
+%endif ;DEBUG
+
+
+;--------------------------------------------------------------------------
+; NULL terminated strings.
+;
+log_title_str		db  10, 13, 'boot0: ', 0
+
+%if VERBOSE
+gpt_str			db  'GPT', 0
+test_str		db  'test', 0
+done_str		db  'done', 0
+%endif
+
+boot_error_str   	db  'error', 0
+
+;--------------------------------------------------------------------------
+; Pad the rest of the 512 byte sized booter with zeroes. The last
+; two bytes is the mandatory boot sector signature.
+;
+; If the booter code becomes too large, then nasm will complain
+; that the 'times' argument is negative.
+
+;
+; According to EFI specification, maximum boot code size is 440 bytes 
+;
+
+;
+; XXX - compilation errors with debug enabled (see comment above about nasm)
+; Azi: boot0.s:808: error: TIMES value -111 is negative
+;      boot0.s:811: error: TIMES value -41 is negative
+;
+pad_boot:
+    times 440-($-$$) db 0
+
+pad_table_and_sig:
+    times 510-($-$$) db 0
+    dw    kBootSignature
+
+
+	ABSOLUTE 0xE400
+
+;
+; In memory variables.
+;
+my_lba			resd	1	; Starting LBA for read_lba function
+
+; END
diff --git a/i386/boot1/boot1h.s b/i386/boot1/boot1h.s
new file mode 100644
index 0000000..8932b86
--- /dev/null
+++ b/i386/boot1/boot1h.s
@@ -0,0 +1,1487 @@
+; Copyright (c) 1999-2003 Apple Computer, Inc. All rights reserved.
+;
+; @APPLE_LICENSE_HEADER_START@
+;
+; Portions Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights
+; Reserved.  This file contains Original Code and/or Modifications of
+; Original Code as defined in and that are subject to the Apple Public
+; Source License Version 2.0 (the "License").  You may not use this file
+; except in compliance with the License.  Please obtain a copy of the
+; License at http://www.apple.com/publicsource and read it before using
+; this file.
+;
+; The Original Code and all software distributed under the License are
+; distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+; EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+; INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+; FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
+; License for the specific language governing rights and limitations
+; under the License.
+;
+; @APPLE_LICENSE_HEADER_END@
+;
+; Partition Boot Loader: boot1h
+;
+; This program is designed to reside in sector 0+1 of an HFS+ partition.
+; It expects that the MBR has left the drive number in DL
+; and a pointer to the partition entry in SI.
+;
+; This version requires a BIOS with EBIOS (LBA) support.
+;
+; This code is written for the NASM assembler.
+;   nasm boot1.s -o boot1h
+
+;
+; This version of boot1h tries to find a stage2 boot file in the root folder.
+;
+; NOTE: this is an experimental version with multiple extent support.
+;
+; Written by Tamás Kosárszky on 2008-04-14
+;
+
+;
+; Set to 1 to enable obscure debug messages.
+;
+DEBUG				EQU		0
+
+;
+; Set to 1 to enable unused code.
+;
+UNUSED				EQU		0
+
+;
+; Set to 1 to enable verbose mode.
+;
+VERBOSE				EQU		0
+
+;
+; Various constants.
+;
+NULL		   		EQU		0
+CR					EQU		0x0D
+LF					EQU		0x0A
+
+mallocStart			EQU		0x1000								; start address of local workspace area
+maxSectorCount		EQU		64									; maximum sector count for readSectors
+maxNodeSize			EQU		16384
+
+kSectorBytes		EQU		512									; sector size in bytes
+kBootSignature		EQU		0xAA55								; boot sector signature
+
+kBoot1StackAddress	EQU		0xFFF0								; boot1 stack pointer
+kBoot1LoadAddr		EQU		0x7C00								; boot1 load address
+kBoot1RelocAddr		EQU		0xE000								; boot1 relocated address
+kBoot1Sector1Addr	EQU		kBoot1RelocAddr + kSectorBytes		; boot1 load address for sector 1
+kHFSPlusBuffer		EQU		kBoot1Sector1Addr + kSectorBytes	; HFS+ Volume Header address
+
+kBoot2Sectors		EQU		(145 * 1024 - 512) / kSectorBytes	; max size of 'boot' file in sectors
+kBoot2Segment		EQU		0x2000								; boot2 load segment
+kBoot2Address		EQU		kSectorBytes						; boot2 load address
+
+;
+; Format of fdisk partition entry.
+;
+; The symbol 'part_size' is automatically defined as an `EQU'
+; giving the size of the structure.
+;
+			struc part
+.bootid		resb 1		; bootable or not 
+.head		resb 1		; starting head, sector, cylinder
+.sect		resb 1		;
+.cyl		resb 1		;
+.type		resb 1		; partition type
+.endhead	resb 1		; ending head, sector, cylinder
+.endsect	resb 1		;
+.endcyl		resb 1		;
+.lba		resd 1		; starting lba
+.sectors	resd 1		; size in sectors
+			endstruc
+
+;-------------------------------------------------------------------------
+; HFS+ related structures and constants
+;
+kHFSPlusSignature		EQU		'H+'		; HFS+ volume signature
+kHFSPlusCaseSignature	EQU		'HX'		; HFS+ volume case-sensitive signature
+kHFSPlusCaseSigX		EQU		'X'			; upper byte of HFS+ volume case-sensitive signature
+kHFSPlusExtentDensity	EQU		8			; 8 extent descriptors / extent record
+
+;
+; HFSUniStr255
+;
+					struc	HFSUniStr255
+.length				resw	1
+.unicode			resw	255
+					endstruc
+
+;
+; HFSPlusExtentDescriptor
+;
+					struc	HFSPlusExtentDescriptor
+.startBlock			resd	1
+.blockCount			resd	1
+					endstruc
+
+;
+; HFSPlusForkData
+;
+					struc	HFSPlusForkData
+.logicalSize		resq	1
+.clumpSize			resd	1
+.totalBlocks		resd	1
+.extents			resb	kHFSPlusExtentDensity * HFSPlusExtentDescriptor_size
+					endstruc
+
+;
+; HFSPlusVolumeHeader
+;
+					struc	HFSPlusVolumeHeader
+.signature			resw	1
+.version			resw	1
+.attributes			resd	1
+.lastMountedVersion resd	1
+.journalInfoBlock	resd	1
+.createDate			resd	1
+.modifyDate			resd	1
+.backupDate			resd	1
+.checkedDate		resd	1
+.fileCount			resd	1
+.folderCount		resd	1
+.blockSize			resd	1
+.totalBlocks		resd	1
+.freeBlocks			resd	1
+.nextAllocation		resd	1
+.rsrcClumpSize		resd	1
+.dataClumpSize		resd	1
+.nextCatalogID		resd	1
+.writeCount			resd	1
+.encodingsBitmap	resq	1
+.finderInfo			resd	8
+.allocationFile		resb	HFSPlusForkData_size
+.extentsFile		resb	HFSPlusForkData_size
+.catalogFile		resb	HFSPlusForkData_size
+.attributesFile		resb	HFSPlusForkData_size
+.startupFile		resb	HFSPlusForkData_size
+					endstruc
+
+;
+; B-tree related structures and constants
+;
+
+kBTIndexNode		EQU		0
+kBTMaxRecordLength	EQU		264					; sizeof(kHFSPlusFileThreadRecord)
+kHFSRootParentID	EQU		1					; Parent ID of the root folder
+kHFSRootFolderID	EQU		2					; Folder ID of the root folder
+kHFSExtentsFileID	EQU		3					; File ID of the extents overflow file
+kHFSCatalogFileID	EQU		4					; File ID of the catalog file
+kHFSPlusFileRecord	EQU		0x200
+kForkTypeData		EQU		0
+kForkTypeResource	EQU		0xFF
+
+;
+; BTNodeDescriptor
+;
+					struc	BTNodeDescriptor
+.fLink				resd	1
+.bLink				resd	1
+.kind				resb	1
+.height				resb	1
+.numRecords			resw	1
+.reserved			resw	1
+					endstruc
+
+;
+; BTHeaderRec
+;
+					struc	BTHeaderRec
+.treeDepth			resw	1
+.rootNode			resd	1
+.leafRecords		resd	1
+.firstLeafNode		resd	1
+.lastLeafNode		resd	1
+.nodeSize			resw	1
+.maxKeyLength		resw	1
+.totalNodes			resd	1
+.freeNodes			resd	1
+.reserved1			resw	1
+.clumpSize			resd	1
+.btreeType			resb	1
+.keyCompareType		resb	1
+.attributes			resd	1
+.reserved3			resd	16
+					endstruc
+
+;
+; BTIndexRec
+;
+					struc	BTIndexRec
+.childID			resd	1
+					endstruc
+
+;
+; HFSPlusCatalogKey
+;
+					struc	HFSPlusCatalogKey
+;
+; won't use the keyLength field for easier addressing data inside this structure
+;
+;.keyLength			resw	1
+
+.parentID			resd	1
+.nodeName			resb	HFSUniStr255_size
+					endstruc
+
+;
+; HFSPlusExtentKey
+;
+					struc	HFSPlusExtentKey
+;
+; won't use the keyLength field for easier addressing data inside this structure
+;
+;.keyLength			resw	1
+
+.forkType			resb	1
+.pad				resb	1
+.fileID				resd	1
+.startBlock			resd	1
+					endstruc
+
+;
+; HFSPlusBSDInfo
+;
+					struc	HFSPlusBSDInfo
+.ownerID			resd	1
+.groupID			resd	1
+.adminFlags			resb	1
+.ownerFlags			resb	1
+.fileMode			resw	1
+.special			resd	1
+					endstruc
+
+;
+; FileInfo
+;
+					struc	FileInfo
+.fileType			resd	1
+.fileCreator		resd	1
+.finderFlags		resw	1
+.location			resw	2
+.reservedField		resw	1
+					endstruc
+
+;
+; ExtendedFileInfo
+;
+					struc	ExtendedFileInfo
+.reserved1			resw	4
+.extFinderFlags		resw	1
+.reserved2			resw	1
+.putAwayFolderID	resd	1
+					endstruc
+
+;
+; HFSPlusCatalogFile
+;
+					struc	HFSPlusCatalogFile
+.recordType			resw	1
+.flags				resw	1
+.reserved1			resd	1
+.fileID				resd	1
+.createDate			resd	1
+.contentModDate		resd	1
+.attributeModDate	resd	1
+.accessDate			resd	1
+.backupDate			resd	1
+.permissions		resb	HFSPlusBSDInfo_size
+.userInfo			resb	FileInfo_size
+.finderInfo			resb	ExtendedFileInfo_size
+.textEncoding		resd	1
+.reserved2			resd	1
+.dataFork			resb	HFSPlusForkData_size
+.resourceFork		resb	HFSPlusForkData_size
+					endstruc
+
+;
+; Macros.
+;
+%macro jmpabs 1
+	push	WORD %1
+	ret
+%endmacro
+
+%macro DebugCharMacro 1
+	pushad
+	mov		al, %1
+	call	print_char
+	call	getc
+	popad
+%endmacro
+
+%macro PrintCharMacro 1
+	pushad
+	mov		al, %1
+	call	print_char
+	popad
+%endmacro
+
+%macro PutCharMacro 1
+	call	print_char
+%endmacro
+
+%macro PrintHexMacro 1
+	call	print_hex
+%endmacro
+
+%macro PrintString 1
+	mov		si, %1
+	call	print_string
+%endmacro
+
+%macro LogString 1
+	mov		di, %1
+	call	log_string
+%endmacro
+
+%if DEBUG
+  %define DebugChar(x) DebugCharMacro x
+  %define PrintChar(x) PrintCharMacro x
+  %define PutChar(x) PutCharMacro
+  %define PrintHex(x) PrintHexMacro x
+%else
+  %define DebugChar(x)
+  %define PrintChar(x)
+  %define PutChar(x)
+  %define PrintHex(x)
+%endif
+
+;--------------------------------------------------------------------------
+; Start of text segment.
+
+    SEGMENT .text
+
+	ORG		kBoot1RelocAddr
+
+;--------------------------------------------------------------------------
+; Boot code is loaded at 0:7C00h.
+;
+start:
+    ;
+    ; Set up the stack to grow down from kBoot1StackSegment:kBoot1StackAddress.
+    ; Interrupts should be off while the stack is being manipulated.
+    ;
+
+    cli                             ; interrupts off
+    xor		ax, ax                  ; zero ax
+    mov		ss, ax                  ; ss <- 0
+    mov     sp, kBoot1StackAddress  ; sp <- top of stack
+    sti                             ; reenable interrupts
+
+    mov     ds, ax                  ; ds <- 0
+    mov     es, ax                  ; es <- 0
+
+    ;
+    ; Relocate boot1 code.
+    ;
+    push	si
+    mov		si, kBoot1LoadAddr		; si <- source
+    mov		di, kBoot1RelocAddr		; di <- destination
+    cld								; auto-increment SI and/or DI registers
+    mov		cx, kSectorBytes		; copy 256 words
+    rep		movsb					; repeat string move (word) operation
+    pop		si
+
+    ;
+    ; Code relocated, jump to startReloc in relocated location.
+    ;
+	; FIXME: Is there any way to instruct NASM to compile a near jump
+	; using absolute address instead of relative displacement?
+	;
+	jmpabs	startReloc
+
+;--------------------------------------------------------------------------
+; Start execution from the relocated location.
+;
+startReloc:
+
+    ;
+    ; Initializing global variables.
+    ;
+    mov     eax, [si + part.lba]
+    mov     [gPartLBA], eax				; save the current partition LBA offset
+    mov     [gBIOSDriveNumber], dl			; save BIOS drive number
+	mov		WORD [gMallocPtr], mallocStart	; set free space pointer
+
+    ;
+    ; Loading upper 512 bytes of boot1h and HFS+ Volume Header.
+    ;
+	xor		ecx, ecx						; sector 1 of current partition
+	inc		ecx
+    mov     al, 2							; read 2 sectors: sector 1 of boot1h + HFS+ Volume Header
+    mov     edx, kBoot1Sector1Addr
+    call    readLBA
+
+    ;
+    ; Initializing more global variables.
+    ;
+	mov		eax, [kHFSPlusBuffer + HFSPlusVolumeHeader.blockSize]
+	bswap	eax								; convert to little-endian
+	shr		eax, 9							; convert to sector unit
+	mov		[gBlockSize], eax				; save blockSize as little-endian sector unit!
+
+	;
+	; Looking for HFSPlus ('H+') or HFSPlus case-sensitive ('HX') signature.
+	;
+	mov		ax, [kHFSPlusBuffer + HFSPlusVolumeHeader.signature]
+	cmp		ax, kHFSPlusCaseSignature
+	je		findRootBoot
+    cmp     ax, kHFSPlusSignature
+    jne     error
+
+;--------------------------------------------------------------------------
+; Find stage2 boot file in a HFS+ Volume's root folder.
+;
+findRootBoot:
+	mov		al, kHFSCatalogFileID
+	lea		si, [searchCatalogKey]
+	lea		di, [kHFSPlusBuffer + HFSPlusVolumeHeader.catalogFile + HFSPlusForkData.extents]
+	call	lookUpBTree
+	jne		error
+
+	lea		si, [bp + BTree.recordDataPtr]
+	mov		si, [si]
+	cmp		WORD [si], kHFSPlusFileRecord
+	jne		error
+
+;  EAX = Catalog File ID
+;  	BX = read size in sectors
+;  ECX = file offset in sectors
+;  EDX = address of read buffer
+;   DI = address of HFSPlusForkData
+
+	;
+	; Use the second big-endian double-word as the file length in HFSPlusForkData.logicalSize
+	;
+	mov		ebx, [si + HFSPlusCatalogFile.dataFork + HFSPlusForkData.logicalSize + 4]
+	bswap	ebx									; convert file size to little-endian
+	add		ebx, kSectorBytes - 1				; adjust size before unit conversion
+	shr		ebx, 9								; convert file size to sector unit
+	cmp		bx, kBoot2Sectors					; check if bigger than max stage2 size
+	ja		error
+	mov		eax, [si + HFSPlusCatalogFile.fileID]
+	bswap	eax									; convert fileID to little-endian
+	xor		ecx, ecx
+	mov		edx, (kBoot2Segment << 4) + kBoot2Address
+	lea		di, [si + HFSPlusCatalogFile.dataFork + HFSPlusForkData.extents]
+	call	readExtent
+
+%if VERBOSE
+	LogString(root_str)
+%endif
+
+boot2:
+
+%if DEBUG
+	DebugChar ('!')
+%endif
+
+%if UNUSED
+	;
+	; Waiting for a key press.
+	;
+
+    mov     ah, 0
+    int		0x16
+%endif
+
+    mov     dl, [gBIOSDriveNumber]			; load BIOS drive number
+    jmp     kBoot2Segment:kBoot2Address
+
+error:
+
+%if VERBOSE
+    LogString(error_str)
+%endif
+
+hang:
+    hlt
+    jmp     hang
+
+;--------------------------------------------------------------------------
+; readSectors - Reads more than 127 sectors using LBA addressing.
+;
+; Arguments:
+;   AX = number of 512-byte sectors to read (valid from 1-1280).
+;   EDX = pointer to where the sectors should be stored.
+;   ECX = sector offset in partition
+;
+; Returns:
+;   CF = 0  success
+;        1 error
+;
+readSectors:
+	pushad
+	mov		bx, ax
+
+.loop:
+	xor		eax, eax						; EAX = 0
+	mov		al, bl							; assume we reached the last block.
+	cmp		bx, maxSectorCount				; check if we really reached the last block
+	jb		.readBlock						; yes, BX < MaxSectorCount
+	mov		al, maxSectorCount				; no, read MaxSectorCount
+
+.readBlock:
+	call	readLBA
+	sub		bx, ax							; decrease remaning sectors with the read amount
+	jz		.exit							; exit if no more sectors left to be loaded
+	add		ecx, eax						; adjust LBA sector offset
+	shl		ax, 9							; convert sectors to bytes
+	add		edx, eax						; adjust target memory location
+	jmp		.loop							; read remaining sectors
+
+.exit:
+	popad
+	ret
+
+;--------------------------------------------------------------------------
+; readLBA - Read sectors from a partition using LBA addressing.
+;
+; Arguments:
+;   AL = number of 512-byte sectors to read (valid from 1-127).
+;   EDX = pointer to where the sectors should be stored.
+;   ECX = sector offset in partition
+;   [bios_drive_number] = drive number (0x80 + unit number)
+;
+; Returns:
+;   CF = 0  success
+;        1 error
+;
+readLBA:
+    pushad                          		; save all registers
+    push    es								; save ES
+    mov     bp, sp                 			; save current SP
+
+    ;
+    ; Convert EDX to segment:offset model and set ES:BX
+    ;
+    ; Some BIOSes do not like offset to be negative while reading
+    ; from hard drives. This usually leads to "boot1: error" when trying
+    ; to boot from hard drive, while booting normally from USB flash.
+    ; The routines, responsible for this are apparently different.
+    ; Thus we split linear address slightly differently for these
+    ; capricious BIOSes to make sure offset is always positive.
+    ;
+
+	mov		bx, dx							; save offset to BX
+	and		bh, 0x0f						; keep low 12 bits
+	shr		edx, 4							; adjust linear address to segment base
+	xor		dl, dl							; mask low 8 bits
+	mov		es, dx							; save segment to ES
+
+    ;
+    ; Create the Disk Address Packet structure for the
+    ; INT13/F42 (Extended Read Sectors) on the stack.
+    ;
+
+    ; push    DWORD 0              			; offset 12, upper 32-bit LBA
+    push    ds                      		; For sake of saving memory,
+    push    ds                      		; push DS register, which is 0.
+
+    add     ecx, [gPartLBA]         		; offset 8, lower 32-bit LBA
+    push    ecx
+
+    push    es                      		; offset 6, memory segment
+
+    push    bx                      		; offset 4, memory offset
+
+    xor     ah, ah             				; offset 3, must be 0
+    push    ax                      		; offset 2, number of sectors
+
+    push    WORD 16                 		; offset 0-1, packet size
+
+    ;
+    ; INT13 Func 42 - Extended Read Sectors
+    ;
+    ; Arguments:
+    ;   AH    = 0x42
+    ;   [bios_drive_number] = drive number (0x80 + unit number)
+    ;   DS:SI = pointer to Disk Address Packet
+    ;
+    ; Returns:
+    ;   AH    = return status (sucess is 0)
+    ;   carry = 0 success
+    ;           1 error
+    ;
+    ; Packet offset 2 indicates the number of sectors read
+    ; successfully.
+    ;
+	mov     dl, [gBIOSDriveNumber]			; load BIOS drive number
+	mov     si, sp
+	mov     ah, 0x42
+	int     0x13
+
+	jc		error
+
+    ;
+    ; Issue a disk reset on error.
+    ; Should this be changed to Func 0xD to skip the diskette controller
+    ; reset?
+    ;
+;	xor     ax, ax                  		; Func 0
+;	int     0x13                    		; INT 13
+;	stc                             		; set carry to indicate error
+
+.exit:
+    mov     sp, bp                  		; restore SP
+    pop     es								; restore ES
+    popad
+    ret
+
+%if VERBOSE
+
+;--------------------------------------------------------------------------
+; Write a string with 'boot1: ' prefix to the console.
+;
+; Arguments:
+;   ES:DI   pointer to a NULL terminated string.
+;
+; Clobber list:
+;   DI
+;
+log_string:
+    pushad
+
+    push	di
+    mov		si, log_title_str
+    call	print_string
+
+    pop		si
+    call	print_string
+
+    popad
+
+    ret
+
+;-------------------------------------------------------------------------
+; Write a string to the console.
+;
+; Arguments:
+;   DS:SI   pointer to a NULL terminated string.
+;
+; Clobber list:
+;   AX, BX, SI
+;
+print_string:
+    mov     bx, 1                   		; BH=0, BL=1 (blue)
+
+.loop:
+    lodsb                           		; load a byte from DS:SI into AL
+    cmp     al, 0               			; Is it a NULL?
+    je      .exit                   		; yes, all done
+    mov     ah, 0xE                 		; INT10 Func 0xE
+    int     0x10                    		; display byte in tty mode
+    jmp     .loop
+
+.exit:
+    ret
+
+%endif ; VERBOSE
+
+%if DEBUG
+
+;--------------------------------------------------------------------------
+; Write the 4-byte value to the console in hex.
+;
+; Arguments:
+;   EAX = Value to be displayed in hex.
+;
+print_hex:
+    pushad
+    mov     cx, WORD 4
+    bswap   eax
+.loop:
+    push    ax
+    ror     al, 4
+    call    print_nibble            		; display upper nibble
+    pop     ax
+    call    print_nibble            		; display lower nibble
+    ror     eax, 8
+    loop    .loop
+
+%if UNUSED
+	mov     al, 10							; carriage return
+	call    print_char
+	mov     al, 13
+	call    print_char
+%endif ; UNUSED
+
+    popad
+    ret
+
+print_nibble:
+    and     al, 0x0f
+    add     al, '0'
+    cmp     al, '9'
+    jna     .print_ascii
+    add     al, 'A' - '9' - 1
+.print_ascii:
+    call    print_char
+    ret
+
+;--------------------------------------------------------------------------
+; getc - wait for a key press
+;
+getc:
+    pushad
+    mov     ah, 0
+    int		0x16
+    popad
+    ret
+
+;--------------------------------------------------------------------------
+; Write a ASCII character to the console.
+;
+; Arguments:
+;   AL = ASCII character.
+;
+print_char:
+    pushad
+    mov     bx, 1                   		; BH=0, BL=1 (blue)
+    mov     ah, 0x0e                		; bios INT 10, Function 0xE
+    int     0x10                    		; display byte in tty mode
+    popad
+    ret
+
+%endif ; DEBUG
+
+%if UNUSED
+
+;--------------------------------------------------------------------------
+; Convert null terminated string to HFSUniStr255
+;
+; Arguments:
+;   DS:DX   pointer to a NULL terminated string.
+;   ES:DI   pointer to result.
+;
+ConvertStrToUni:
+    pushad									; save registers
+    push	di								; save DI for unicode string length pointer
+    mov		si, dx							; use SI as source string pointer
+    xor		ax, ax							; AX = unicode character
+    mov		cl, al							; CL = string length
+
+.loop:
+    stosw									; store unicode character (length 0 at first run)
+    lodsb									; load next character to AL
+    inc		cl								; increment string length count
+    cmp		al, NULL						; check for string terminator
+    jne		.loop
+
+    pop		di								; restore unicode string length pointer
+    dec		cl								; ignoring terminator from length count
+    mov		[di], cl						; save string length
+    popad									; restore registers
+    ret
+
+%endif ; UNUSED
+
+;--------------------------------------------------------------------------
+; Convert big-endian HFSUniStr255 to little-endian
+;
+; Arguments:
+;   DS:SI = pointer to big-endian HFSUniStr255
+;	ES:DI = pointer to result buffer
+;
+ConvertHFSUniStr255ToLE:
+	pushad
+	lodsw
+	xchg	ah, al
+	stosw
+	cmp		al, 0
+	je		.exit
+	mov		cx, ax
+
+.loop:
+	lodsw
+	xchg	ah, al							; convert AX to little-endian
+
+	;
+	; When working with a case-sensitive HFS+ (HX) filesystem, we shouldn't change the case.
+	;
+	cmp		BYTE [kHFSPlusBuffer + HFSPlusVolumeHeader.signature + 1], kHFSPlusCaseSigX
+	je		.keepcase
+
+	or		ax, ax
+	jne		.convertToLE
+	dec		ax								; NULL must be the strongest char
+
+.convertToLE:
+	cmp		ah, 0
+	ja		.keepcase
+	cmp		al, 'A'
+	jb		.keepcase
+	cmp		al, 'Z'
+	ja		.keepcase
+	add		al, 32							; convert to lower-case
+
+.keepcase:
+	stosw
+	loop	.loop
+
+.exit:
+	popad
+	ret
+
+;--------------------------------------------------------------------------
+; compare HFSPlusExtentKey structures
+;
+; Arguments:
+;   DS:SI = search key
+;   ES:DI = trial key
+;
+; Returns:
+;	[BTree.searchResult] = result
+;	FLAGS = relation between search and trial keys
+;
+compareHFSPlusExtentKeys:
+	pushad
+
+	mov		dl, 0							; DL = result of comparison, DH = bestGuess
+	mov		eax, [si + HFSPlusExtentKey.fileID]
+	cmp		eax, [di + HFSPlusExtentKey.fileID]
+	jne		.checkFlags
+
+	cmp		BYTE [si + HFSPlusExtentKey.forkType], kForkTypeData
+	jne		.checkFlags
+
+	mov		eax, [si + HFSPlusExtentKey.startBlock]
+	cmp		eax, [di + HFSPlusExtentKey.startBlock]
+	je		compareHFSPlusCatalogKeys.exit
+
+.checkFlags:
+	ja		compareHFSPlusCatalogKeys.searchKeyGreater		; search key > trial key
+	jb		compareHFSPlusCatalogKeys.trialKeyGreater		; search key < trial key
+
+;--------------------------------------------------------------------------
+; Compare HFSPlusCatalogKey structures
+;
+; Arguments:
+;   DS:SI = search key
+;   ES:DI = trial key
+;
+; Returns:
+;	[BTree.searchResult] = result
+;	FLAGS = relation between search and trial keys
+;
+compareHFSPlusCatalogKeys:
+	pushad
+	xor		dx, dx					; DL = result of comparison, DH = bestGuess
+	xchg	si, di
+	lodsd
+	mov		ecx, eax				; ECX = trial parentID
+	xchg	si, di
+	lodsd							; EAX = search parentID
+	cmp		eax, ecx
+	ja		.searchKeyGreater		; search parentID > trial parentID
+	jb		.trialKeyGreater		; search parentID < trial parentID
+
+.compareNodeName:					; search parentID = trial parentID
+	xchg	si, di
+    lodsw
+    mov		cx, ax					; CX = trial nodeName.length
+	xchg	si, di
+    lodsw							; AX = search nodeName.length
+	cmp		cl, 0					; trial nodeName.length = 0?
+	je		.searchKeyGreater
+
+    cmp		ax, cx
+	je		.strCompare
+    ja		.searchStrLonger
+
+.trialStrLonger:
+    dec		dh
+    mov		cx, ax
+    jmp		.strCompare
+
+.searchStrLonger:
+    inc		dh
+
+.strCompare:
+    repe	cmpsw
+    ja		.searchKeyGreater
+    jb		.trialKeyGreater
+    mov		dl, dh
+    jmp		.exit
+
+.trialKeyGreater:
+    dec		dl
+    jmp		.exit
+
+.searchKeyGreater:
+    inc		dl
+
+.exit:
+	mov		[bp + BTree.searchResult], dl
+    cmp		dl, 0							; set flags to check relation between keys
+
+	popad
+	ret
+
+;--------------------------------------------------------------------------
+; Allocate memory
+;
+; Arguments:
+;   CX = size of requested memory
+;
+; Returns:
+;   BP = start address of allocated memory
+;
+; Clobber list:
+;   CX
+;
+malloc:
+	push	ax								; save AX
+	push	di								; save DI
+	mov		di, [gMallocPtr]				; start address of free space
+	push	di								; save free space start address
+	inc		di								;
+	inc		di								; keep the first word untouched
+	dec		cx								; for the last memory block pointer.
+	dec		cx								;
+	mov		al, NULL						; fill with zero
+	rep		stosb							; repeat fill
+	mov		[gMallocPtr], di				; adjust free space pointer
+	pop		bp								; BP = start address of allocated memory
+	mov		[di], bp						; set start address of allocated memory at next
+											; allocation block's free space address.
+	pop		di								; restore DI
+	pop		ax								; restore AX
+	ret
+
+%if UNUSED
+
+;--------------------------------------------------------------------------
+; Free allocated memory
+;
+; Returns:
+;   BP = start address of previously allocated memory
+;
+free:
+	lea		bp, [gMallocPtr]
+	mov		bp, [bp]
+	mov		[gMallocPtr], bp
+	ret
+
+%endif ; UNUSED
+
+;--------------------------------------------------------------------------
+; Static data.
+;
+
+%if VERBOSE
+root_str			db		'/boot', CR, LF, NULL
+%endif
+
+;--------------------------------------------------------------------------
+; Pad the rest of the 512 byte sized sector with zeroes. The last
+; two bytes is the mandatory boot sector signature.
+;
+; If the booter code becomes too large, then nasm will complain
+; that the 'times' argument is negative.
+
+;
+; XXX - compilation errors with debug enabled (see comment above about nasm)
+; Azi: boot1h.s:994: error: TIMES value -67 is negative
+;
+pad_table_and_sig:
+	times			510-($-$$) db 0
+	dw				kBootSignature
+
+;
+; Sector 1 code area
+;
+
+;--------------------------------------------------------------------------
+; lookUpBTree - initializes a new BTree instance and
+;               look up for HFSPlus Catalog File or Extent Overflow keys
+;
+; Arguments:
+;   AL = kHFSPlusFileID (Catalog or Extents Overflow)
+;	SI = address of searchKey
+;   DI = address of HFSPlusForkData.extents
+;
+; Returns:
+;   BP = address of BTree instance
+;  ECX = rootNode's logical offset in sectors
+;
+lookUpBTree:
+	mov		cx, BTree_size							; allocate memory with BTree_size
+	call	malloc									; BP = start address of allocated memory.
+	mov		[bp + BTree.fileID], al					; save fileFileID
+	mov		edx, [di]								; first extent of current file
+	call	blockToSector							; ECX = converted to sector unit
+	mov		al, 1									; 1 sector is enough for
+	xor		edx, edx								; reading current file's header.
+	lea		dx, [bp + BTree.BTHeaderBuffer]			; load into BTreeHeaderBuffer
+	call	readLBA									; read
+	mov		ax, [bp + BTree.BTHeaderBuffer + BTNodeDescriptor_size + BTHeaderRec.nodeSize]
+	xchg	ah, al									; convert to little-endian
+	mov		[bp + BTree.nodeSize], ax				; save nodeSize
+
+	;
+	; Always start the lookup process with the root node.
+	;
+	mov		edx, [bp + BTree.BTHeaderBuffer + BTNodeDescriptor_size + BTHeaderRec.rootNode]
+
+.readNode:
+	;
+	; Converting nodeID to sector unit
+	;
+	mov		ax, [bp + BTree.nodeSize]
+	shr		ax, 9									; convert nodeSize to sectors
+	mov		bx, ax									; BX = read sector count
+	cwde
+	bswap	edx										; convert node ID to little-endian
+	mul		edx										; multiply with nodeSize converted to sector unit
+	mov		ecx, eax								; ECX = file offset in BTree
+
+	mov		eax, [bp + BTree.fileID]
+	lea		edx, [bp + BTree.nodeBuffer]
+	call	readExtent
+
+	;
+	; AX = lowerBound = 0
+	;
+	xor		ax, ax
+
+	;
+	; BX = upperBound = numRecords - 1
+	;
+	mov		bx, [bp + BTree.nodeBuffer + BTNodeDescriptor.numRecords]
+	xchg	bh, bl
+	dec		bx
+
+.bsearch:
+	cmp		ax, bx
+	ja		.checkResult							; jump if lowerBound > upperBound
+
+	mov		cx, ax
+	add		cx, bx
+	shr		cx, 1									; test index = (lowerBound + upperBound / 2)
+
+	call	getBTreeRecord
+
+%if UNUSED
+	pushad
+	jl		.csearchLessThanTrial
+	jg		.csearchGreaterThanTrial
+	PrintChar('=')
+	jmp		.csearchCont
+.csearchGreaterThanTrial:
+	PrintChar('>')
+	jmp		.csearchCont
+.csearchLessThanTrial:
+	PrintChar('<')
+.csearchCont:
+	popad
+%endif ; UNUSED
+	
+.adjustBounds:
+	je		.checkResult
+	jl		.searchLessThanTrial
+	jg		.searchGreaterThanTrial
+	jmp		.bsearch
+
+.searchLessThanTrial:
+	mov		bx, cx
+	dec		bx										; upperBound = index - 1
+	jmp		.bsearch
+
+.searchGreaterThanTrial:
+	mov		ax, cx
+	inc		ax										; lowerBound = index + 1
+	jmp		.bsearch
+
+.checkResult:
+	cmp		BYTE [bp + BTree.searchResult], 0
+	jge		.foundKey
+
+	mov		cx, bx
+	call	getBTreeRecord
+
+.foundKey:
+	cmp		BYTE [bp + BTree.nodeBuffer + BTNodeDescriptor.kind], kBTIndexNode
+	jne		.exit
+
+	lea		bx, [bp + BTree.recordDataPtr]
+	mov		bx, [bx]
+	mov		edx, [bx]
+	jmp		.readNode
+
+.exit:
+	cmp		BYTE [bp + BTree.searchResult], 0
+	ret
+
+;--------------------------------------------------------------------------
+; getBTreeRecord - read and compare BTree record
+;
+; Arguments:
+;   CX = record index
+;   SI = address of search key
+;
+; Returns:
+;   [BTree.searchResult] = result of key compare
+;   [BTree.recordDataPtr] = address of record data
+;
+getBTreeRecord:
+	pushad
+	push	si									; save SI
+	lea		di, [bp + BTree.nodeBuffer]			; DI = start of nodeBuffer
+	push	di									; use later
+	mov		ax, [bp + BTree.nodeSize]			; get nodeSize
+	add		di, ax								; DI = beyond nodeBuffer
+	inc		cx									; increment index
+	shl		cx, 1								; * 2
+	sub		di, cx								; DI = pointer to record
+	mov		ax, [di]							; offset to record
+	xchg	ah, al								; convert to little-endian
+	pop		di									; start of nodeBuffer
+	add		di, ax								; DI = address of record key
+	mov		si, di								; save to SI
+	mov		ax, [di]							; keyLength
+	xchg	ah, al								; convert to little-endian
+	inc		ax									; suppress keySize (2 bytes)
+	inc		ax									;
+	add		di, ax								; DI = address of record data
+	mov		[bp + BTree.recordDataPtr], di		; save address of record data
+	lea		di, [bp + BTree.trialKey]
+	push	di									; save address of trialKey
+	lodsw										; suppress keySize (2 bytes)
+	;
+	; Don't need to compare as DWORD since all reserved CNIDs fits to a single byte
+	;
+	cmp		BYTE [bp + BTree.fileID], kHFSCatalogFileID
+	je		.prepareTrialCatalogKey
+
+.prepareTrialExtentKey:
+	mov		bx, compareHFSPlusExtentKeys
+	movsw										; copy forkType + pad
+	mov		cx, 2								; copy fileID + startBlock
+
+.extentLoop:
+	lodsd
+	bswap	eax									; convert to little-endian
+	stosd
+	loop	.extentLoop
+	jmp		.exit
+
+.prepareTrialCatalogKey:
+	mov		bx, compareHFSPlusCatalogKeys
+	lodsd
+	bswap	eax									; convert ParentID to little-endian
+	stosd
+	call	ConvertHFSUniStr255ToLE				; convert nodeName to little-endian
+
+.exit:
+	pop		di									; restore address of trialKey
+
+%if UNUSED
+;
+; Print catalog trial key
+;
+	pushad
+	mov		si, di
+	lodsd
+	PrintChar('k')
+	PrintHex()
+	lodsw
+	cmp		ax, 0
+	je		.printExit
+	mov		cx, ax
+.printLoop:
+	lodsw
+	call	print_char
+	loop	.printLoop
+.printExit:
+	popad
+;
+;
+;
+%endif ; UNUSED
+
+%if UNUSED
+;
+; Print extent trial key
+;
+	pushad
+	PrintChar('k')
+	mov		si, di
+	xor		eax, eax
+	lodsw
+	PrintHex()
+	lodsd
+	PrintHex()
+	lodsd
+	PrintHex()
+	popad
+;
+;
+;
+%endif ; UNUSED
+
+	pop		si									; restore SI
+	call	bx									; call key compare proc
+	popad
+	ret
+
+;--------------------------------------------------------------------------
+; readExtent - read extents from a HFS+ file (multiple extent support)
+;
+; Arguments:
+;  EAX = Catalog File ID
+;  	BX = read size in sectors
+;  ECX = file offset in sectors
+;  EDX = address of read buffer
+;   DI = address of HFSPlusForkData.extents
+;
+readExtent:
+	pushad
+	;
+	; Save Catalog File ID as part of a search HFSPlusExtentKey
+	; for a possible Extents Overflow lookup.
+	;
+	mov		[bp + BTree.searchExtentKey + HFSPlusExtentKey.fileID], eax
+	mov		[bp + BTree.readBufferPtr], edx
+	mov		ax, bx
+	cwde
+	mov		[bp + BTree.readSize], eax
+	mov		ebx, ecx							; EBX = file offset
+	xor		eax, eax
+	mov		[bp + BTree.currentExtentOffs], eax
+
+.beginExtentBlock:
+	mov		BYTE [bp + BTree.extentCount], 0
+
+.extentSearch:
+	cmp		BYTE [bp + BTree.extentCount], kHFSPlusExtentDensity
+	jb		.continue
+
+.getNextExtentBlock:
+	push	ebx
+	mov		eax, [bp + BTree.currentExtentOffs]
+
+	;
+	; Converting sector unit to HFS+ allocation block unit.
+	;
+	xor		edx, edx
+	div		DWORD [gBlockSize]				; divide with blockSize
+
+	;
+	; Preparing searchExtentKey's startBlock field.
+	;
+	mov		[bp + BTree.searchExtentKey + HFSPlusExtentKey.startBlock], eax
+
+	mov		al, kHFSExtentsFileID
+	lea		si, [bp + BTree.searchExtentKey]
+	lea		di, [kHFSPlusBuffer + HFSPlusVolumeHeader.extentsFile + HFSPlusForkData.extents]
+	call	lookUpBTree
+	jnz		NEAR .exit
+
+	;
+	; BP points to the new workspace allocated by lookUpBTree.
+	;
+	lea		di, [bp + BTree.recordDataPtr]
+	mov		di, [di]
+
+	;
+	; Switch back to the previous workspace.
+	;
+	lea		bp, [gMallocPtr]
+	mov		bp, [bp]
+	mov		[gMallocPtr], bp
+
+	pop		ebx
+	jmp		.beginExtentBlock
+
+.continue:
+	mov		edx, [di + HFSPlusExtentDescriptor.blockCount]
+	call	blockToSector								; ECX = converted current extent's blockCount to sectors
+	mov		eax, [bp + BTree.currentExtentOffs]			; EAX = current extent's start offset (sector)
+	mov		edx, eax
+	add		edx, ecx									; EDX = next extent's start offset (sector)
+	cmp		ebx, edx
+	mov		[bp + BTree.currentExtentOffs], edx			; set currentExtentOffs as the next extent's start offset
+	jae		.nextExtent									; jump to next extent if file offset > next extent's start offset
+
+.foundExtent:
+	mov		edx, ebx
+	sub		edx, eax									; EDX = relative offset within current extent
+	mov		eax, edx									; will be used below to determine read size
+	mov		esi, [bp + BTree.readSize]					; ESI = remaining sectors to be read
+	add		edx, esi
+	cmp		edx, ecx									; test if relative offset + readSize fits to this extent
+	jbe		.read										; read all remaining sectors from this extent
+
+.splitRead:
+	sub		ecx, eax									; read amount of sectors beginning at relative offset
+	mov		esi, ecx									; of current extent up to the end of current extent
+
+.read:
+	mov		edx, [di + HFSPlusExtentDescriptor.startBlock]
+	call	blockToSector								; ECX = converted to sectors
+	add		ecx, eax									; file offset converted to sectors
+
+	push	si
+	mov		ax, si
+	mov		edx, [bp + BTree.readBufferPtr]
+	call	readSectors
+	pop		si
+
+	add		ebx, esi
+	mov		ax, si
+	cwde
+	shl		ax, 9										; convert SI (read sector count) to byte unit
+	add		[bp + BTree.readBufferPtr], eax
+	sub		[bp + BTree.readSize], esi
+
+	jz		.exit
+
+.nextExtent:
+	add		di, kHFSPlusExtentDensity
+	inc		BYTE [bp + BTree.extentCount]
+	jmp		.extentSearch
+
+.exit:
+	popad
+	ret
+
+;--------------------------------------------------------------------------
+; Convert big-endian HFSPlus allocation block to sector unit
+;
+; Arguments:
+;   EDX = allocation block
+;
+; Returns:
+;   ECX = allocation block converted to sector unit
+;
+; Clobber list:
+;   EDX
+;
+blockToSector:
+	push	eax
+	mov		eax, [gBlockSize]
+	bswap	edx								; convert allocation block to little-endian
+	mul		edx				 				; multiply with block number
+	mov		ecx, eax						; result in EAX
+	pop		eax
+	ret
+
+%if UNUSED
+
+;--------------------------------------------------------------------------
+; Convert sector unit to HFSPlus allocation block unit
+;
+; Arguments:
+;   EDX = sector
+;
+; Returns:
+;   ECX = converted to allocation block unit
+;
+; Clobber list:
+;   EDX
+;
+sectorToBlock:
+	push	eax
+	mov		eax, edx
+	xor		edx, edx
+	div		DWORD [gBlockSize]				; divide with blockSize
+	mov		ecx, eax						; result in EAX
+	pop		eax
+	ret
+
+%endif ; UNUSED
+
+%if UNUSED
+
+;--------------------------------------------------------------------------
+; Convert big-endian BTree node ID to sector unit
+;
+; Arguments:
+;   EDX = node ID
+;
+; Returns:
+;   ECX = node ID converted to sector unit
+;
+; Clobber list:
+;   EDX
+;
+nodeToSector:
+	push	eax
+	mov		ax, [bp + BTree.nodeSize]
+	shr		ax, 9							; convert nodeSize to sectors
+	cwde
+	bswap	edx								; convert node ID to little-endian
+	mul		edx								; multiply with node ID
+	mov		ecx, eax						; result in EAX
+	pop		eax
+	ret
+
+%endif ; UNUSED
+
+;--------------------------------------------------------------------------
+; Static data.
+;
+
+%if VERBOSE
+log_title_str		db		'boot1: ', NULL
+error_str			db		'error', NULL
+%endif
+
+searchCatalogKey	dd		kHFSRootFolderID
+					dw		searchCatKeyNameLen
+searchCatKeyName	dw		'b', 'o', 'o', 't'			; must be lower case
+searchCatKeyNameLen	EQU		($ - searchCatKeyName) / 2
+
+;--------------------------------------------------------------------------
+; Pad the rest of the 512 byte sized sector with zeroes. The last
+; two bytes is the mandatory boot sector signature.
+;
+
+;
+; XXX - compilation errors with debug enabled
+; Azi: boot1h.s:1452: error: TIMES value -64 is negative
+;
+pad_sector_1:
+	times			1022-($-$$) db 0
+	dw				kBootSignature
+
+;
+; Local BTree variables
+;
+					struc			BTree
+.mallocLink			resw			1						; pointer to previously allocated memory block
+.fileID				resd			1						; will use as BYTE
+.nodeSize			resd			1						; will use as WORD
+.searchExtentKey	resb			HFSPlusExtentKey_size
+.searchResult		resb			1
+.trialKey			resb			kBTMaxRecordLength
+.recordDataPtr		resw			1
+.readBufferPtr		resd			1
+.currentExtentOffs	resd			1
+.readSize			resd			1
+.extentCount		resb			1
+	ALIGNB			2
+.BTHeaderBuffer		resb			kSectorBytes
+.nodeBuffer			resb			maxNodeSize
+					endstruc
+
+;
+; Global variables
+;
+
+	ABSOLUTE		kHFSPlusBuffer + HFSPlusVolumeHeader_size
+
+gPartLBA			resd	1
+gBIOSDriveNumber	resw	1
+gBlockSize			resd	1
+gMallocPtr			resw	1
+
+; END

From c8c4bd5ceb4192069173a598712d350c7f5da3b5 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 13 Jan 2015 16:55:38 +0100
Subject: [PATCH 505/623] Broadwell ULT support

---
 i386/libsaio/cpu/Intel/dynamic_data.h | 14 +++++++++++---
 i386/libsaio/cpu/essentials.h         |  2 ++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index f25485b..3b8a7d7 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -363,6 +363,12 @@ void initCPUStruct(void)
 					hiBit = 31;
 					break;
 
+//				case CPU_MODEL_BROADWELL:
+				case CPU_MODEL_BROADWELL_ULT:
+					CoreBridgeType = BROADWELL;
+					hiBit = 31;
+					break;
+
 				case CPU_MODEL_NEHALEM:
 				case CPU_MODEL_NEHALEM_EX:
 				case CPU_MODEL_FIELDS:
@@ -434,10 +440,12 @@ void initCPUStruct(void)
 					// msr = rdmsr64(MSR_PKG_CST_CONFIG_CONTROL);
 					// wrmsr64(MSR_MISC_PWR_MGMT, (msr & 0xFFFEFBFF));
 
-					wrmsr64(MSR_PKG_POWER_LIMIT, 0x4283E800DD8230);
+					// wrmsr64(MSR_PKG_POWER_LIMIT, 0x4283E800DD8230);
 					// wrmsr64(MSR_PP0_CURRENT_CONFIG, 0x40101414000002F8);
-					wrmsr64(MSR_PP0_POWER_LIMIT, 0);
-					wrmsr64(MSR_PP1_POWER_LIMIT, 0);
+					// wrmsr64(MSR_PP0_POWER_LIMIT, 0);
+					// wrmsr64(MSR_PP1_POWER_LIMIT, 0);
+					
+					// wrmsr64(MSR_TURBO_RATIO_LIMIT, 0x25252525);
 
 					checkFlexRatioMSR();
 				}
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index a62543c..9507287 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -183,6 +183,8 @@
 #define CPU_MODEL_HASWELL_ULT		0x45
 #define CPU_MODEL_CRYSTALWELL		0x46
 
+#define CPU_MODEL_BROADWELL_ULT		0x3D
+
 #define DALES_BRIDGE	1
 #define SANDY_BRIDGE	2
 #define IVY_BRIDGE		4

From 2b7975f604b10187f827bfac52d78e4de31b5c32 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Tue, 13 Jan 2015 16:59:02 +0100
Subject: [PATCH 506/623] Broadwell (ULT) support

---
 i386/libsaio/cpu/essentials.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 9507287..75ff4c5 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -189,5 +189,6 @@
 #define SANDY_BRIDGE	2
 #define IVY_BRIDGE		4
 #define HASWELL			8
+#define BROADWELL		16
 
 #endif /* !__LIBSAIO_CPU_ESSENTIALS_H */

From 31acc665c1e1f56a5cae75d78e3a820a02481ca0 Mon Sep 17 00:00:00 2001
From: Piker-Alpha <PikerAlpha@yahoo.com>
Date: Mon, 19 Jan 2015 20:03:43 +0100
Subject: [PATCH 507/623] Project X - update 1

(Broadwell based computer running traffic light OS)
---
 i386/boot2/boot.c                     |  15 +-
 i386/boot2/boot.h                     |  16 +-
 i386/boot2/options.c                  |   2 +-
 i386/libsaio/cpu/Intel/dynamic_data.h |   2 +-
 i386/libsaio/efi/fake_efi.h           |   7 -
 i386/libsaio/load.c                   |   4 +-
 i386/libsaio/platform.c               |   1 +
 i386/libsaio/platform.h               |  17 ++-
 i386/libsaio/xhci.h                   | 201 ++++++++++++++++++++++++++
 9 files changed, 232 insertions(+), 33 deletions(-)
 create mode 100755 i386/libsaio/xhci.h

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index fa12191..4ec8e12 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -58,10 +58,6 @@
 #include "sl.h"
 #include "libsa.h"
 
-// DHP: Dump all global junk a.s.a.p.
-
-long gBootMode = kBootModeQuiet; // no longer defaults to 0 aka kBootModeNormal
-
 //==============================================================================
 // Local adler32 function.
 
@@ -330,7 +326,7 @@ void boot(int biosdev)
 				// Check for -x (safe) flag.
 				if (getValueForBootKey(kernelFlags, kSafeModeFlag, &val, &length))
 				{
-					gBootMode = kBootModeSafe;
+					gPlatform.BootMode = kBootModeSafe;
 				}
 
 				// Check for -f (flush cache) flag.
@@ -496,7 +492,7 @@ void boot(int biosdev)
 #endif
 		if (getBoolForKey(kQuietBootKey, &quietBootMode, &bootInfo->bootConfig) && !quietBootMode)
 		{
-			gBootMode = kBootModeNormal; // Reversed from: gBootMode |= kBootModeQuiet;
+			gPlatform.BootMode = kBootModeNormal; // Reversed from: gPlatform.BootMode |= kBootModeQuiet;
 		}
 	}
 
@@ -519,10 +515,10 @@ void boot(int biosdev)
 		_BOOT_DEBUG_SLEEP(5); */
 
 #if PRE_LINKED_KERNEL_SUPPORT
-		_BOOT_DEBUG_DUMP("gBootMode = %d\n", gBootMode);
+		_BOOT_DEBUG_DUMP("gPlatform.BootMode = %d\n", gPlatform.BootMode);
 
 		// Preliminary checks to prevent us from doing useless things.
-		mayUseKernelCache = ((flushCaches == false) && ((gBootMode & kBootModeSafe) == 0));
+		mayUseKernelCache = ((flushCaches == false) && ((gPlatform.BootMode & kBootModeSafe) == 0));
 
 		_BOOT_DEBUG_DUMP("mayUseKernelCache = %s\n", mayUseKernelCache ? "true" : "false");
 
@@ -766,6 +762,9 @@ void boot(int biosdev)
 			
 			_BOOT_DEBUG_DUMP("execKernel-7 / gVerboseMode is %s\n", gVerboseMode ? "true" : "false");
 
+#if DISABLE_LEGACY_XHCI
+			disableLegacyXHCI();
+#endif
 			// Did we switch to graphics mode yet (think verbose mode)?
 			if (gVerboseMode || bootArgs->Video.v_display != GRAPHICS_MODE)
 			{
diff --git a/i386/boot2/boot.h b/i386/boot2/boot.h
index 8bc41c5..836f562 100755
--- a/i386/boot2/boot.h
+++ b/i386/boot2/boot.h
@@ -34,6 +34,10 @@
 
 #include "platform.h"
 
+#if DISABLE_LEGACY_XHCI
+	#include "pci.h"
+	#include "xhci.h"
+#endif
 
 #if USE_STATIC_DISPLAY_RESOLUTION
 	#define DEFAULT_SCREEN_WIDTH	STATIC_SCREEN_WIDTH
@@ -88,20 +92,8 @@
 
 #define kBootTimeout         -1
 
-// A global set by boot() to record the device that the booter was loaded from.
-
-extern long gBootMode;
 extern char bootPrompt[];
 
-// Kernel Boot Modes
-enum
-{
-	kBootModeNormal = 0,
-	kBootModeSafe   = 1,
-	kBootModeSecure = 2,
-	kBootModeQuiet  = 4
-};
-
 /* 
  * Note well that we take an easier approice, and this should not be 
  * confused with /chosen/boot-file-path because this is what we want.
diff --git a/i386/boot2/options.c b/i386/boot2/options.c
index 6cd692a..5cb0c1d 100755
--- a/i386/boot2/options.c
+++ b/i386/boot2/options.c
@@ -140,7 +140,7 @@ void getAndProcessBootArguments(char * configKernelFlags)
 			// printf("And action...\n");
 			if (gBootArgsPtr + 3 < gBootArgsEnd)
 			{
-				gBootMode = currentMode;
+				gPlatform.BootMode = currentMode;
 				copyArgument(0, bootFlags[index], 3, &argP, &cntRemaining);
 			}
 
diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 3b8a7d7..af6309e 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -420,7 +420,7 @@ void initCPUStruct(void)
 					requestMaxTurbo(maxBusRatio);
 				}
 
-				if (CoreBridgeType) // (SandyBridge || IvyBridge || Haswell)
+				if (CoreBridgeType) // (SandyBridge || IvyBridge || Haswell || Broadwell)
 				{
 					// gPlatform.CPU.Type += CoreBridgeType;
 
diff --git a/i386/libsaio/efi/fake_efi.h b/i386/libsaio/efi/fake_efi.h
index 87a988e..3a4f6ac 100755
--- a/i386/libsaio/efi/fake_efi.h
+++ b/i386/libsaio/efi/fake_efi.h
@@ -119,13 +119,6 @@ extern EFI_STATUS addConfigurationTable(EFI_GUID const *pGuid, void * table, cha
 		{
 			DT__AddProperty(tableNode, "alias", strlen(tableAlias) + 1, (char *)tableAlias);
 		}
-		
-		if (strcmp(tableAlias, "ACPI_20") == 0)
-		{
-			Node *acpiTablesNode = DT__AddChild(tableNode, "ACPI Tables");
-
-			gPlatform.EFI.Nodes.ACPI_Tables = acpiTablesNode;
-		}
       
 		gPlatform.EFI.SystemTable->NumberOfTableEntries++;
 	}
diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index d91d1aa..0f537bb 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -408,9 +408,9 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 							{
 								if (*(uint64_t *)baseAddress == OPTIONS_STRING_UINT64)
 								{
-									// printf ("/option renamed to /RevoEFI!\n");
+									// printf ("/options renamed to /RevoEFI!\n");
 
-									// Rename /option to /RevoEFI (just temporarily)
+									// Rename /options to /RevoEFI (just temporarily)
 									memcpy((unsigned char *)baseAddress, "/RevoEFI", 8);
 									// Prepare to break out early.
 									baseAddress = (unsigned char *)(sectionEnd + 1);
diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 20f76bd..aa95208 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -129,6 +129,7 @@ void initPlatform(int biosDevice, bool bootRecoveryHD)
 {
 	memset(&gPlatform, 0, sizeof(gPlatform));
 
+	gPlatform.BootMode = kBootModeQuiet; // no longer defaults to 0 aka kBootModeNormal
 	gPlatform.BootRecoveryHD = bootRecoveryHD;
 
 	// Copied from cpu/dynamic_data.h to make printf work this early on.
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index c3025bd..74be0bb 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -146,6 +146,17 @@
 	#define MAX_SLOTS	STATIC_RAM_SLOTS		// Defined in config/settings.h
 #endif
 
+//==============================================================================
+// Kernel boot modes (moved from boot.h)
+
+enum
+{
+	kBootModeNormal = 0,
+	kBootModeSafe   = 1,
+	kBootModeSecure = 2,
+	kBootModeQuiet  = 4
+};
+
 //==============================================================================
 
 typedef struct _RamSlotInfo_t
@@ -195,7 +206,9 @@ typedef struct _PlatformInfo_t
 #endif
 	
 	int					BIOSDevice;				// Initialized in platform.c (formely know as gBIOSDev).
-	
+
+	long				BootMode;				// Initialized in platform.c
+
 	BVRef				BootVolume;				// Initialized in disk.c
 	BVRef				BootPartitionChain;		// Initialized in sys.c
 	BVRef				RootVolume;				// Initialized in disk.c (used in sys.c).
@@ -306,7 +319,7 @@ typedef struct _PlatformInfo_t
 			
 			// EFI specific stuff.
 			Node *	ConfigurationTable;			// Path: /efi/configuration-table
-			Node *	ACPI_Tables;				// Path: /efi/configuration-table/ACPI Tables
+			// Node *	ACPI_Tables;				// Path: /efi/configuration-table/ACPI Tables
 			Node *	RuntimeServices;			// Path: /efi/runtime-services
 			Node *	Platform;					// Path: /efi/platform
 		} Nodes;
diff --git a/i386/libsaio/xhci.h b/i386/libsaio/xhci.h
new file mode 100755
index 0000000..e12eb61
--- /dev/null
+++ b/i386/libsaio/xhci.h
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2014 by Pike R. Alpha. All rights reserved.
+ */
+
+#define BIT31								0x80000000
+
+#define PCI_BUS_NUMBER						0x0
+#define XHCI_DEVICE_NUMBER					0x14
+#define XHCI_FUNCTION_NUMBER				0x0
+#define XHCI_ADDRESS						(BIT31 | (PCI_BUS_NUMBER << 16) | (XHCI_DEVICE_NUMBER << 11) | (XHCI_FUNCTION_NUMBER << 8))
+
+#define PCI_ADDR_REG						0xcf8
+#define PCI_DATA_REG						0xcfc
+
+#define XHCI_BASE_ADDRESS_REGISTER_0		0x10
+#define XHCI_BASE_ADDRESS_REGISTER_1		0x14
+
+#define XHCI_BIOS_OWNED						0x1
+#define XHCI_OS_OWNED						0x100
+
+#define XHCI_LEGACY_CONTROL_OFFSET			0x4
+#define XHCI_HCC_CAPABILITY_PARAMS_OFFSET	0x10
+
+#define XHCI_LEGACY_DISABLE_SMI				0xE1FE0
+#define XHCI_LEGACY_SMI_EVENTS				0xE0000000
+
+#define	USB_LEGACY_SUPPORT_ID				0x1
+
+/*------------------------------------------------------------------------------
+ * Format of xHCI Extended Capability Pointer Register (see table 146).
+ *------------------------------------------------------------------------------
+ * Bit 31:16	Capability Specific – RO. The definition and attributes of these
+ *				bits depends on the specific capability.
+ *------------------------------------------------------------------------------
+ * Bit 15:8		Next xHCI Extended Capability Pointer – RO. This field points to
+ *				the xHCI MMIO space offset of the next xHCI extended capability
+ *				pointer. A value of 00h indicates the end of the extended 
+ *				capability list. A non-zero value in this register indicates a 
+ *				relative offset, in Dwords, from this Dword to the beginning of 
+ *				the next extended capability. For example, assuming an effective 
+ *				address of this data structure is 350h and assuming a pointer 
+ *				value of 068h, we can calculate the following effective address:
+ *				350h + (068h << 2) -> 350h + 1A0h -> 4F0h
+ *------------------------------------------------------------------------------
+ * Bit 7:0		Capability ID – RO. This field identifies the xHCI Extended
+ *				capability. Refer to table 146 in specification for a list of
+ *				the valid xHCI extended capabilities.
+ *------------------------------------------------------------------------------*/
+
+typedef struct xHCI_ExtendedCapabilityPointer
+{
+	// USBLEGSUP - USB Legacy Support Capability Register
+	uint8_t		ID;
+	uint8_t		Next;
+	uint16_t	Capabilities;
+	// USBLEGCTLSTS - USB Legacy Support Control and Status Register
+	uint32_t	Value;
+} XHCI_EXTENDED_CAPABILITY_POINTER;
+
+
+//==============================================================================
+
+void disableLegacyXHCI(void)
+{
+	uint8_t timeout = 60;
+
+	// Get 32-bit xHCI MMIO address (no 64-bit support for legacy boot loaders).
+	outl(PCI_ADDR_REG, (XHCI_ADDRESS + XHCI_BASE_ADDRESS_REGISTER_0));
+	uint32_t addressBAR0 = inl(PCI_DATA_REG); // Example: 0xd3c00004
+
+	// Mask the lower bits to fix the MMIO BAR address (need 4KB page-alignment).
+	addressBAR0 &= 0xFFFFFFF0; // Example: 0xd3c00004 ->  0xd3c00000
+
+	// Read Host Controller Capability Parameters.
+	uint32_t hccparams = *(uint32_t const volatile*) (addressBAR0 + XHCI_HCC_CAPABILITY_PARAMS_OFFSET);
+	uint32_t extendedCapabilitiesPointer = (hccparams >> 16); // Example: 0x2000
+
+	_BOOT_DEBUG_DUMP("hccparams: 0x%x\n", hccparams); //  Example: 0x200077c1
+	_BOOT_DEBUG_DUMP("extendedCapabilitiesPointer: 0x%x\n", extendedCapabilitiesPointer);
+
+	// Shift value (basically multiply it by 4).
+	extendedCapabilitiesPointer = (extendedCapabilitiesPointer << 2); //  Example: (0x2000 << 2) = 0x8000
+	XHCI_EXTENDED_CAPABILITY_POINTER * xHCI_ECP = (XHCI_EXTENDED_CAPABILITY_POINTER *) (addressBAR0 + extendedCapabilitiesPointer);
+
+	while (xHCI_ECP->ID) // Main loop.
+	{
+		/*------------------------------------------------------------------------------
+		 * Format of USB Legacy Support Extended Capabilities (see table 146).
+		 * Note: Be aware that the bits here are shifted to the right (data >> 16).
+		 *------------------------------------------------------------------------------
+		 * Bit 15:9		Reserved.
+		 *------------------------------------------------------------------------------
+		 * Bit 8		HC OS Owned Semaphore – RW. Default = ‘0’. System software sets
+		 *				this bit to request ownership of the xHCI. Ownership is obtained
+		 *				when this bit reads as ‘1’ and the HC BIOS Owned Semaphore bit
+		 *				reads as ‘0’.
+		 *------------------------------------------------------------------------------
+		 * Bit 7:1		Reserved.
+		 *------------------------------------------------------------------------------
+		 * Bit 0		HC BIOS Owned Semaphore – RW. Default = ‘0’. The BIOS sets this
+		 *				bit to establish ownership of the xHC. System BIOS will set this
+		 *				bit to a ‘0’ in response to a request for ownership of the xHCI
+		 *				by system software.
+		 *------------------------------------------------------------------------------*/
+
+		_BOOT_DEBUG_DUMP("Capabilities: 0x%04x\n", xHCI_ECP->Capabilities);	// 0x0200, 0x0300, 0x0001, 0x0000, 0x0001
+		_BOOT_DEBUG_DUMP("Next........: 0x%02x\n", xHCI_ECP->Next);			// 0x08,   0x08,   0x0c,   0xff,   0x00
+		_BOOT_DEBUG_DUMP("ID..........: 0x%02x\n", xHCI_ECP->ID);			// 0x02,   0x02,   0xc1,   0xc0,   0x01
+
+		if (xHCI_ECP->ID == USB_LEGACY_SUPPORT_ID)
+		{
+			_BOOT_DEBUG_DUMP ("XHCI legacy mode enabled in BIOS!\n");
+
+			if (xHCI_ECP->Capabilities & XHCI_BIOS_OWNED)
+			{
+				_BOOT_DEBUG_DUMP ("XHCI is owned by BIOS!\n");
+
+				while (timeout--)
+				{
+					// Signal the BIOS that the Bootloader/OS wants control.
+					xHCI_ECP->Capabilities |= XHCI_OS_OWNED;
+					delay(1);
+
+					if ((xHCI_ECP->Capabilities & (XHCI_OS_OWNED | XHCI_BIOS_OWNED)) == XHCI_OS_OWNED) // Done?
+					{
+						_BOOT_DEBUG_DUMP("XHCI now owned by Bootloader/OS (attempts %d)!\n", (60 - timeout));
+						break;
+					}
+				}
+			}
+			/*------------------------------------------------------------------------------
+			 * Bit 31		SMI on BAR – RW1C. Default = ‘0’. This bit is set to ‘1’ whenever 
+			 *				the Base Address Register (BAR) is written.
+			 *------------------------------------------------------------------------------
+			 * Bit 30		SMI on PCI Command – RW1C. Default = ‘0’. This bit is set to ‘1’
+			 *				whenever the PCI Command Register is written.
+			 *------------------------------------------------------------------------------
+			 * Bit 29		SMI on OS Ownership Change – RW1C. Default = ‘0’. This bit is set
+			 *				to ‘1’ whenever the HC OS Owned Semaphore bit in the USBLEGSUP 
+			 *				register transitions from ‘1’ to a ‘0’ or ‘0’ to a ‘1’.
+			 *------------------------------------------------------------------------------
+			 * Bit 28:21	Reserved.
+			 *------------------------------------------------------------------------------
+			 * Bit 20		SMI on Host System Error – RO. Default = ‘0’. Shadow bit of Host 
+			 *				System Error (HSE) bit in the USBSTS register refer to Section 
+			 *				5.4.2 for definition and effects of the events associated with 
+			 *				this bit being set to ‘1’. To clear this bit to a ‘0’, system 
+			 *				software shall write a ‘1’ to the Host System Error (HSE) bit in 
+			 *				the USBSTS register.
+			 *------------------------------------------------------------------------------
+			 * Bit 19:17	Reserved.
+			 *------------------------------------------------------------------------------
+			 * Bit 16		SMI on Event Interrupt – RO. Default = ‘0’. Shadow bit of Event 
+			 *				Interrupt (EINT) bit in the USBSTS register. Refer to Section 
+			 *				5.4.2 for definition. This bit follows the state the Event 
+			 *				Interrupt (EINT) bit in the USBSTS register, e.g. it automatically 
+			 *				clears when EINT clears or set when EINT is set.
+			 *------------------------------------------------------------------------------
+			 * Bit 15		SMI on BAR Enable – RW. Default = ‘0’. When this bit is ‘1’ and 
+			 *				SMI on BAR is ‘1’, then the host controller will issue an SMI.
+			 *------------------------------------------------------------------------------
+			 * Bit 14		SMI on PCI Command Enable – RW. Default = ‘0’. When this bit is 
+			 *				‘1’ and SMI on PCI Command is ‘1’, then the host controller will 
+			 *				issue an SMI.
+			 *------------------------------------------------------------------------------
+			 * Bit 13		SMI on OS Ownership Enable – RW. Default = ‘0’. When this bit is 
+			 *				a ‘1’ AND the OS Ownership Change bit is ‘1’, the host controller 
+			 *				will issue an SMI.
+			 *------------------------------------------------------------------------------
+			 * Bit 12:5		Reserved.
+			 *------------------------------------------------------------------------------
+			 * Bit 4		SMI on Host System Error Enable – RW. Default = ‘0’. When this 
+			 *				bit is a ‘1’, and the SMI on Host System Error bit (below) in 
+			 *				this register is a ‘1’, the host controller will issue an SMI 
+			 *				immediately.
+			 *------------------------------------------------------------------------------
+			 * Bit 3:1		Reserved.
+			 *------------------------------------------------------------------------------
+			 * Bit 0		USB SMI Enable – RW. Default = ‘0’. When this bit is a ‘1’, and
+			 *				the SMI on Event Interrupt bit (below) in this register is a ‘1’,
+			 *				the host controller will issue an SMI immediately.
+			 *------------------------------------------------------------------------------*/
+
+			_BOOT_DEBUG_DUMP("Before fix: 0x%x\n", xHCI_ECP->Value); // 0x00002000 (bit 13)
+
+			xHCI_ECP->Value &= XHCI_LEGACY_DISABLE_SMI;
+			xHCI_ECP->Value |= XHCI_LEGACY_SMI_EVENTS;
+
+			_BOOT_DEBUG_DUMP("After fix: 0x%x\n", xHCI_ECP->Value);  // 0xe0000000 (bit 31:29)
+			break;
+		}
+		else
+		{
+			// Get next xHCI Extended Capabilities Structure.
+			extendedCapabilitiesPointer += (xHCI_ECP->Next << 2);
+			xHCI_ECP = (XHCI_EXTENDED_CAPABILITY_POINTER *) (addressBAR0 + extendedCapabilitiesPointer);
+		}
+	};
+	
+	_BOOT_DEBUG_SLEEP(5);
+}

From 066d89cfe576d2f871fd200abecec9e38dd31c05 Mon Sep 17 00:00:00 2001
From: Chief <chief@Mac-mini.local>
Date: Sat, 31 Jan 2015 10:30:10 +0100
Subject: [PATCH 508/623] Removing unused function

- improved Yosemite compatibility.
---
 i386/libsa/strtol.c |  8 --------
 i386/libsaio/vbe.c  | 35 -----------------------------------
 2 files changed, 43 deletions(-)

diff --git a/i386/libsa/strtol.c b/i386/libsa/strtol.c
index f6c724f..e321a21 100755
--- a/i386/libsa/strtol.c
+++ b/i386/libsa/strtol.c
@@ -95,14 +95,6 @@ static inline int isupper(char c)
 }
 
 
-//==========================================================================
-
-static inline int islower(char c)
-{
-	return (c >= 'a' && c <= 'z');
-}
-
-
 //==========================================================================
 
 static inline int isalpha(char c)
diff --git a/i386/libsaio/vbe.c b/i386/libsaio/vbe.c
index 0334610..412e3bf 100755
--- a/i386/libsaio/vbe.c
+++ b/i386/libsaio/vbe.c
@@ -34,41 +34,6 @@
 static biosBuf_t bb;
 
 
-//==============================================================================
-
-static inline void outi(int port, int index, int val)
-{
-    outw (port, (val << 8) | index);
-}
-
-
-//==============================================================================
-
-static inline void outib(int port, int index, int val)
-{
-    outb (port, index);
-    outb (port + 1, val);
-}
-
-
-//==============================================================================
-
-static inline int ini(int port, int index)
-{
-    outb (port, index);
-    return inb (port + 1);
-}
-
-
-//==============================================================================
-
-static inline void rmwi(int port, int index, int clear, int set)
-{
-    outb (port, index);
-    outb (port + 1, (inb (port + 1) & ~clear) | set);
-}
-
-
 //==============================================================================
 
 int getVBEInfo(void * infoBlock)

From 41132da0d951b151d1fd00addf4025bf88bd71a6 Mon Sep 17 00:00:00 2001
From: Chief <chief@Mac-mini.local>
Date: Sat, 31 Jan 2015 10:41:08 +0100
Subject: [PATCH 509/623] Adding new feature

- to patch the GNVS address.
---
 i386/libsaio/acpi/patcher.h | 61 +++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 8610c4a..16ca822 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -21,6 +21,29 @@
 #endif
 
 
+#if VERIFY_OPREGION_GNVS_ADDRESS
+//==============================================================================
+
+unsigned int search64bitPattern(unsigned int aStartAddress, int aNumberOfBytes, uint64_t aSearchPattern)
+{
+	unsigned char * baseAddress = (unsigned char *) aStartAddress;
+	unsigned char * endAddress = (baseAddress + aNumberOfBytes);
+
+	for (; baseAddress <= endAddress; baseAddress++)
+	{
+		if (*(uint64_t *)baseAddress == aSearchPattern)
+		{
+			_ACPI_DEBUG_DUMP("GNVS Address Found @ 0x%x\n", baseAddress);
+
+			return (unsigned int)baseAddress; // Found!
+		}
+	}
+
+	return 0; // Not found!
+}
+#endif // VERIFY_OPREGION_GNVS_ADDRESS
+
+
 #if (LOAD_EXTRA_ACPI_TABLES && (LOAD_DSDT_TABLE_FROM_EXTRA_ACPI || LOAD_SSDT_TABLE_FROM_EXTRA_ACPI))
 //==============================================================================
 
@@ -257,6 +280,44 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 	overrideACPIMethods(patchedFADT);
 #elif STATIC_DSDT_TABLE_INJECTION || (LOAD_EXTRA_ACPI_TABLES && LOAD_DSDT_TABLE_FROM_EXTRA_ACPI)
 	patchedFADT->DSDT = (uint32_t)customTables[DSDT].tableAddress; // The original DSDT without DSDT table injection!
+
+#if VERIFY_OPREGION_GNVS_ADDRESS
+	#define OP_REGION_GNVS_ADDRESS_LE 0x0C0053564E47805B
+	// First try to locate the OperationRegion (GNVS, SystemMemory, 0xNNNNNNNN, 0xNNNN) in the factory DSDT.
+	unsigned int opRegFactoryDSDTAddress = search64bitPattern(factoryFADT->DSDT + sizeof(ACPI_DSDT), 2000, OP_REGION_GNVS_ADDRESS_LE);
+
+	if (opRegFactoryDSDTAddress) // Found?
+	{
+		// Yes. Get the GNVS address.
+		unsigned int factoryDSDT_GNVS_Address = (*(uint32_t *)(opRegFactoryDSDTAddress + 8));
+
+		_ACPI_DEBUG_DUMP("GNVS address (0x%x) found @: 0x%x\n", factoryDSDT_GNVS_Address, opRegFactoryDSDTAddress);
+
+		// Now try to locate the OperationRegion (GNVS, SystemMemory, 0xNNNNNNNN, 0xNNNN) in the patched DSDT.
+		unsigned int opRegPatchedDSDTAddress = search64bitPattern(patchedFADT->DSDT + sizeof(ACPI_DSDT), 2000, OP_REGION_GNVS_ADDRESS_LE);
+
+		if (opRegPatchedDSDTAddress) // Found?
+		{
+			// Yes. Get the GNVS address.
+			unsigned int patchedDSDT_GNVS_Address = (*(uint32_t *)(opRegPatchedDSDTAddress + 8));
+
+			_ACPI_DEBUG_DUMP("GNVS address (0x%x) found @: 0x%08x\n", patchedDSDT_GNVS_Address, opRegPatchedDSDTAddress);
+
+			// Are both GNVS address values the same?
+			if (patchedDSDT_GNVS_Address != factoryDSDT_GNVS_Address)
+			{
+				_ACPI_DEBUG_DUMP("Patching GNVS address ... ");
+				// Copy the 4 address bytes from the factory DSDT into the patched DSDT.
+				// Note: We do not copy the length (may be different for a patched DSDT).
+				memcpy((void *)opRegPatchedDSDTAddress, (void *)opRegFactoryDSDTAddress, 4);
+
+				_ACPI_DEBUG_DUMP("Done.\n");
+			}
+		}
+
+		_ACPI_DEBUG_SLEEP(1);
+	}
+#endif // VERIFY_OPREGION_GNVS_ADDRESS
 		
 	_ACPI_DEBUG_DUMP("Replacing factory DSDT with ");
 

From 0e843a8f2de09882ba4963d6de28abac31eb3fcb Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Sat, 31 Jan 2015 10:47:46 +0100
Subject: [PATCH 510/623] Mandatory change for testers

---
 i386/libsaio/acpi/patcher.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 16ca822..6db8895 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -21,7 +21,7 @@
 #endif
 
 
-#if VERIFY_OPREGION_GNVS_ADDRESS
+// #if VERIFY_OPREGION_GNVS_ADDRESS
 //==============================================================================
 
 unsigned int search64bitPattern(unsigned int aStartAddress, int aNumberOfBytes, uint64_t aSearchPattern)
@@ -41,7 +41,7 @@ unsigned int search64bitPattern(unsigned int aStartAddress, int aNumberOfBytes,
 
 	return 0; // Not found!
 }
-#endif // VERIFY_OPREGION_GNVS_ADDRESS
+// #endif // VERIFY_OPREGION_GNVS_ADDRESS
 
 
 #if (LOAD_EXTRA_ACPI_TABLES && (LOAD_DSDT_TABLE_FROM_EXTRA_ACPI || LOAD_SSDT_TABLE_FROM_EXTRA_ACPI))
@@ -281,7 +281,7 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 #elif STATIC_DSDT_TABLE_INJECTION || (LOAD_EXTRA_ACPI_TABLES && LOAD_DSDT_TABLE_FROM_EXTRA_ACPI)
 	patchedFADT->DSDT = (uint32_t)customTables[DSDT].tableAddress; // The original DSDT without DSDT table injection!
 
-#if VERIFY_OPREGION_GNVS_ADDRESS
+// #if VERIFY_OPREGION_GNVS_ADDRESS
 	#define OP_REGION_GNVS_ADDRESS_LE 0x0C0053564E47805B
 	// First try to locate the OperationRegion (GNVS, SystemMemory, 0xNNNNNNNN, 0xNNNN) in the factory DSDT.
 	unsigned int opRegFactoryDSDTAddress = search64bitPattern(factoryFADT->DSDT + sizeof(ACPI_DSDT), 2000, OP_REGION_GNVS_ADDRESS_LE);
@@ -317,7 +317,7 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 
 		_ACPI_DEBUG_SLEEP(1);
 	}
-#endif // VERIFY_OPREGION_GNVS_ADDRESS
+// #endif // VERIFY_OPREGION_GNVS_ADDRESS
 		
 	_ACPI_DEBUG_DUMP("Replacing factory DSDT with ");
 

From a5886d296d9a18359ee901429cb3d2e6000d4903 Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Tue, 10 Mar 2015 18:56:39 +0100
Subject: [PATCH 511/623] New MacBook Air/MacBook Pro data added

---
 i386/libsaio/platform.h          |  7 +++++--
 i386/libsaio/smbios/model_data.h | 24 +++++++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 74be0bb..83827fc 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -83,7 +83,9 @@
 #define MACBOOK_AIR_51			(MACBOOK_AIR | (3 << 15))
 #define MACBOOK_AIR_52			(MACBOOK_AIR | (4 << 15))
 #define MACBOOK_AIR_61			(MACBOOK_AIR | (5 << 15))
-#define MACBOOK_AIR_62			 MACBOOK_AIR				// Defaults to MacBookAir6,2
+#define MACBOOK_AIR_62			(MACBOOK_AIR | (6 << 15))
+#define MACBOOK_AIR_71			(MACBOOK_AIR | (7 << 15))
+#define MACBOOK_AIR_72			 MACBOOK_AIR				// Defaults to MacBookAir7,2
 
 #define MACBOOK_PRO_61			(MACBOOK_PRO | ( 1 << 15))
 #define MACBOOK_PRO_81			(MACBOOK_PRO | ( 2 << 15))
@@ -95,7 +97,8 @@
 #define MACBOOK_PRO_102			(MACBOOK_PRO | ( 8 << 15))
 #define MACBOOK_PRO_111			(MACBOOK_PRO | ( 9 << 15))
 #define MACBOOK_PRO_112			(MACBOOK_PRO | (10 << 15))
-#define MACBOOK_PRO_113			 MACBOOK_PRO				// Defaults to MacBookPro11,3
+#define MACBOOK_PRO_113			(MACBOOK_PRO | (11 << 15))
+#define MACBOOK_PRO_121			 MACBOOK_PRO				// Defaults to MacBookPro12,1
 
 #define MACMINI_41				(MACMINI | (1 << 15))
 #define MACMINI_51				(MACMINI | (2 << 15))
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 105d94b..d32a811 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -133,13 +133,25 @@
 		#define SMB_PRODUCT_NAME	"MacBookAir6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-35C1E88140C3E6CF"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '6', ',', '1' }
-	#else // Defaults to MacBookAir6,2
+	#elif (TARGET_MODEL == MACBOOK_AIR_62)
 		// Intel Core i5-4250U @ 1.30 GHz (2 cores - 4 threads)
 		// Intel Core i7-4650U @ 1.70 GHz (2 cores - 4 threads)
 		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B12.1405241030"
 		#define SMB_PRODUCT_NAME	"MacBookAir6,2"
 		#define SMB_BOARD_PRODUCT	"Mac-7DF21CB3ED6977E5"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '6', ',', '2' }
+	#elif (TARGET_MODEL == MACBOOK_AIR_71)
+		// Intel Core i5-5250U @ 1.60 GHz (2 cores - 4 threads)
+		#define SMB_BIOS_VERSION	"MBA71.88Z.0166.B00.1502131457"
+		#define SMB_PRODUCT_NAME	"MacBookAir7,1"
+		#define SMB_BOARD_PRODUCT	"Mac-9F18E312C5C2BF0B"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '7', ',', '1' }
+	#else // Defaults to MacBookAir7,2
+		// Intel Core i5-5250U @ 1.60 GHz (2 cores - 4 threads)
+		#define SMB_BIOS_VERSION	"MBA71.88Z.0166.B00.1502131457"
+		#define SMB_PRODUCT_NAME	"MacBookAir7,2"
+		#define SMB_BOARD_PRODUCT	"Mac-937CB26E2E02BB01"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '7', ',', '2' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -211,13 +223,19 @@
 		#define SMB_PRODUCT_NAME	"MacBookPro11,2"
 		#define SMB_BOARD_PRODUCT	"Mac-3CBD00234E554E41"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '2' }
-	#else
+	#elif (TARGET_MODEL == MACBOOK_PRO_113)
 		// Intel Core i7-4850HQ @ 2.30 GHz - 4 cores / 8 threads.
 		// Intel Core i7-4960HQ @ 2.60 GHz - 4 cores / 8 threads.
 		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B08.1406081756"
 		#define SMB_PRODUCT_NAME	"MacBookPro11,3"
 		#define SMB_BOARD_PRODUCT	"Mac-2BD1B31983FE1663"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '3' }
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '2', ',', '1' }
+	#else
+		// Intel Core i5-5257U @ 2.70 GHz - 2 cores / 4 threads.
+		#define SMB_BIOS_VERSION	"MBP121.88Z.0167.B00.1502132146"
+		#define SMB_PRODUCT_NAME	"MacBookPro12,1"
+		#define SMB_BOARD_PRODUCT	"Mac-E43C1C25D4880AD6"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '2', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From a91dc5c6d80bdde2e8da79b3284a48d8f7624a48 Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Fri, 19 Jun 2015 14:50:43 +0200
Subject: [PATCH 512/623] Comment only change

---
 i386/libsa/zalloc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsa/zalloc.c b/i386/libsa/zalloc.c
index f9f4a92..70afdd2 100755
--- a/i386/libsa/zalloc.c
+++ b/i386/libsa/zalloc.c
@@ -66,7 +66,8 @@ static void   zcoalesce(void);
 	size_t zalloced_size;
 #endif
 
-#define ZALLOC_NODES	32767 /* was 16384 */
+#define ZALLOC_NODES	32767 /* This was 16384 */
+
 
 #if SAFE_MALLOC
 	static void mallocError(char *addr, size_t size, const char *file, int line)

From 9eb0ffb83578aba5c52b81ec2b784eade01188b9 Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Fri, 19 Jun 2015 14:50:58 +0200
Subject: [PATCH 513/623] Typo

---
 i386/boot1/boot1h.s | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/boot1/boot1h.s b/i386/boot1/boot1h.s
index 8932b86..2676767 100644
--- a/i386/boot1/boot1h.s
+++ b/i386/boot1/boot1h.s
@@ -29,7 +29,7 @@
 ; This version requires a BIOS with EBIOS (LBA) support.
 ;
 ; This code is written for the NASM assembler.
-;   nasm boot1.s -o boot1h
+;   nasm boot1h.s -o boot1h
 
 ;
 ; This version of boot1h tries to find a stage2 boot file in the root folder.

From 5774ac87599a7592562cefd3da41c492c745be38 Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Fri, 19 Jun 2015 14:51:38 +0200
Subject: [PATCH 514/623] Additional MacBook data

---
 i386/libsaio/smbios/model_data.h | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index d32a811..92823c8 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -100,10 +100,18 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"MacBook"
 
-	#define SMB_BIOS_VERSION	"MB41.88Z.0073.B00.0809221748"
-	#define SMB_PRODUCT_NAME	"MacBook4,1"
-	#define SMB_BOARD_PRODUCT	"Mac-F42D89C8"
-	#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', '4', ',', '1' }
+	#if (TARGET_MODEL == MACBOOK_41)
+		#define SMB_BIOS_VERSION	"MB41.88Z.0073.B00.0809221748"
+		#define SMB_PRODUCT_NAME	"MacBook4,1"
+		#define SMB_BOARD_PRODUCT	"Mac-F42D89C8"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', '4', ',', '1' }
+	#elif (TARGET_MODEL == MACBOOK_81)
+		// Intel Core M-5Y31 @ 1.10 GHz (2 cores, 4 threads)
+		#define SMB_BIOS_VERSION	"MB81.88Z.0164.B02.1503241252"
+		#define SMB_PRODUCT_NAME	"MacBook8,1"
+		#define SMB_BOARD_PRODUCT	"Mac-BE0E8AC46FE800CC"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', '8', ',', '1' }
+	#endif
 // -------------------------------------------------------------------------------------
 #endif
 
@@ -148,6 +156,7 @@
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '7', ',', '1' }
 	#else // Defaults to MacBookAir7,2
 		// Intel Core i5-5250U @ 1.60 GHz (2 cores - 4 threads)
+		// Intel Core i7-5650U @ 2.20 GHz (2 cores - 4 threads)
 		#define SMB_BIOS_VERSION	"MBA71.88Z.0166.B00.1502131457"
 		#define SMB_PRODUCT_NAME	"MacBookAir7,2"
 		#define SMB_BOARD_PRODUCT	"Mac-937CB26E2E02BB01"

From a840236f598e4f7bd2a6d5c5f53412b919c8aa33 Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Fri, 19 Jun 2015 14:52:33 +0200
Subject: [PATCH 515/623] Moving two include files

---
 i386/boot2/boot.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/i386/boot2/boot.h b/i386/boot2/boot.h
index 836f562..a09b6da 100755
--- a/i386/boot2/boot.h
+++ b/i386/boot2/boot.h
@@ -34,11 +34,6 @@
 
 #include "platform.h"
 
-#if DISABLE_LEGACY_XHCI
-	#include "pci.h"
-	#include "xhci.h"
-#endif
-
 #if USE_STATIC_DISPLAY_RESOLUTION
 	#define DEFAULT_SCREEN_WIDTH	STATIC_SCREEN_WIDTH
 	#define DEFAULT_SCREEN_HEIGHT	STATIC_SCREEN_HEIGHT

From 030f63ecb8acb6060ae2f55740c31e131b48b45e Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Fri, 19 Jun 2015 14:54:12 +0200
Subject: [PATCH 516/623] Adding support for El Capitan

---
 Makefile                  | 17 +++++---
 i386/boot2/boot.c         | 22 ++++++----
 i386/boot2/bootlogo.h     |  2 +-
 i386/boot2/drivers.c      |  7 ++--
 i386/libsaio/asm.s        |  6 +--
 i386/libsaio/bootstruct.c | 24 ++++++++---
 i386/libsaio/bootstruct.h | 86 +++++++++++++++++++++++++++++++--------
 i386/libsaio/efi.c        |  6 +--
 i386/libsaio/platform.h   | 13 +++---
 9 files changed, 131 insertions(+), 52 deletions(-)

diff --git a/Makefile b/Makefile
index 5826971..be71745 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@
 #			- Cleanups and output changed (Pike R. Alpha, November 2012).
 #			- Yosemite support added (Pike R. Alpha, June 2014).
 #			- Changed default from Mavericks to Yosemite (Pike R. Alpha, June 2014).
+#			- El Capitan support added (Pike R. Alpha, June 2015).
 #
 
 #
@@ -54,16 +55,20 @@ VPATH = $(OBJROOT):$(SYMROOT)
 
 ifeq ($(MAKECMDGOALS),)
 	#
-	# No OS build target given. Build for Yosemite (default).
+	# No OS build target given. Build for El Capitan (default).
 	#
-	MAKEGOAL = yosemite
-	MAKE_TARGET_OS = 26;
-	MAKE_TARGET_OS_VER = 10.10
+	MAKEGOAL = el-capitan
+	MAKE_TARGET_OS = 62;
+	MAKE_TARGET_OS_VER = 10.11
 else
 	#
 	# Setting MAKE_TARGET_OS and MAKEGOAL based on OS build target.
 	#
-	ifeq ($(MAKECMDGOALS), yosemite)
+	ifeq ($(MAKECMDGOALS), el-capitan)
+		MAKEGOAL = el-capitan
+		MAKE_TARGET_OS = 62;
+		MAKE_TARGET_OS_VER = 10.11
+	else ifeq ($(MAKECMDGOALS), yosemite)
 		MAKEGOAL = yosemite
 		MAKE_TARGET_OS = 26;
 		MAKE_TARGET_OS_VER = 10.10
@@ -87,7 +92,7 @@ else
 endif
 
 #
-# Export our make goal i.e. yosemite, mavericks, mountain-lion, lion or legacy (snow-leopard or leopard).
+# Export our make goal i.e. El Capitan, Yosemite, Mavericks, Mountain Lion, Lion or legacy (Snow Leopard or Leopard).
 #
 
 export MAKEGOAL
diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 4ec8e12..2155e68 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -58,6 +58,11 @@
 #include "sl.h"
 #include "libsa.h"
 
+#if DISABLE_LEGACY_XHCI
+	#include "pci.h"
+	#include "xhci.h"
+#endif
+
 //==============================================================================
 // Local adler32 function.
 
@@ -316,12 +321,13 @@ void boot(int biosdev)
 				gVerboseMode =	getValueForBootKey(kernelFlags, kVerboseModeFlag, &val, &length) || 
 								getValueForBootKey(kernelFlags, kSingleUserModeFlag, &val, &length);
 				
-				/* if (gVerboseMode)
+				if (gVerboseMode)
 				{
+					_BOOT_DEBUG_DUMP("Notice: -s (single user mode) and/or -v (verbose mode) specified!\n");
 #if (DEBUG_BOOT == false)
 					setVideoMode(VGA_TEXT_MODE);
 #endif
-				} */
+				}
 
 				// Check for -x (safe) flag.
 				if (getValueForBootKey(kernelFlags, kSafeModeFlag, &val, &length))
@@ -456,11 +462,11 @@ void boot(int biosdev)
 		 * We cannot use the kernelcache from the Yosemite installer, not yet,
 		 * and thus we load: /System/Library/Caches/Startup/kernelcache instead
 		 */
-#if (MAKE_TARGET_OS == YOSEMITE)
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
 		// Installation directory located?
 		if (flushCaches == false) //  && (gPlatform.BootVolume->flags != kBVFlagInstallVolume))
 		{
-#endif // #if (MAKE_TARGET_OS == YOSEMITE)
+#endif // #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE)
 			_BOOT_DEBUG_DUMP("Checking Kernel Cache key in com.apple.Boot.plist\n");
 
 			if (getValueForKey(kKernelCacheKey, &val, &length, &bootInfo->bootConfig))
@@ -485,9 +491,9 @@ void boot(int biosdev)
 					gPlatform.KernelCacheSpecified = true;
 				}
 			}
-#if (MAKE_TARGET_OS == YOSEMITE)
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
 		}
-#endif // #if (MAKE_TARGET_OS == YOSEMITE)
+#endif // #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE)
 
 #endif
 		if (getBoolForKey(kQuietBootKey, &quietBootMode, &bootInfo->bootConfig) && !quietBootMode)
@@ -540,7 +546,7 @@ void boot(int biosdev)
 			{
 				sprintf(bootFile, "%s", bootInfo->bootFile);
 			} */
-#if (MAKE_TARGET_OS == YOSEMITE)
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
 //			else
 //			{
 				sprintf(bootFile, "/System/Library/Kernels/%s", bootInfo->bootFile);
@@ -592,7 +598,7 @@ void boot(int biosdev)
 				
 					_BOOT_DEBUG_DUMP("adler32: %08X\n", adler32);
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set (like Lion).
+#if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set (like Lion).
 
 					_BOOT_DEBUG_DUMP("Checking for kernelcache...\n");
 
diff --git a/i386/boot2/bootlogo.h b/i386/boot2/bootlogo.h
index 2fb9b65..00a96b4 100755
--- a/i386/boot2/bootlogo.h
+++ b/i386/boot2/bootlogo.h
@@ -18,7 +18,7 @@
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
 
 
-#if ((MAKE_TARGET_OS == YOSEMITE) && (BLACKMODE == 1))
+#if (((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) && (BLACKMODE == 1))
 
 //
 // LZVN packed data for white Apple logo (blackmode).
diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index 5df6cbc..ae5c409 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -199,7 +199,7 @@ long loadDrivers(char * dirSpec)
 
 		if ((gKextLoadStatus & 1) == 0)
 		{
-#if ((MAKE_TARGET_OS & MAVERICKS) == MAVERICKS) // Mavericks and Yosemite specifics.
+#if ((MAKE_TARGET_OS & MAVERICKS) == MAVERICKS) // Mavericks, Yosemite and El Capitan specifics.
 			_DRIVERS_DEBUG_DUMP("\nCalling loadKexts(\"/Library/Extensions\");\n");
 
 			/* For Mavericks we first load the signed kexts.
@@ -626,6 +626,7 @@ static long loadMatchedModules(void)
 				AllocateMemoryRange(segName, driverAddr, driverLength);
             }
         }
+
         module = module->nextModule;
     }
 
@@ -914,7 +915,7 @@ long decodeKernel(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsiz
 	if (kernel_header->signature == OSSwapBigToHostConstInt32('comp'))
 	{
 		if (kernel_header->compressType != OSSwapBigToHostConstInt32('lzss')
-#if (MAKE_TARGET_OS == YOSEMITE)
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan
 			&& kernel_header->compressType != OSSwapBigToHostConstInt32('lzvn')
 #endif
 			)
@@ -939,7 +940,7 @@ long decodeKernel(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsiz
 		uncompressedSize = OSSwapBigToHostInt32(kernel_header->uncompressedSize);
 		fileLoadBuffer = malloc(uncompressedSize);
 
-#if (MAKE_TARGET_OS == YOSEMITE)
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan
 		if (kernel_header->compressType == OSSwapBigToHostConstInt32('lzvn'))
 		{
 			void *tmpBuffer = malloc(uncompressedSize);
diff --git a/i386/libsaio/asm.s b/i386/libsaio/asm.s
index e8c312b..cc6e08d 100755
--- a/i386/libsaio/asm.s
+++ b/i386/libsaio/asm.s
@@ -334,7 +334,7 @@ LABEL(_halt)
     call    _bgetc
     jmp     _halt
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks, Mountain Lion and Lion
+#if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks, Mountain Lion and Lion
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // disableIRQs()
 //
@@ -368,7 +368,7 @@ LABEL(_disableIRQs)
 // Passes boot arguments in %eax.
 //
 LABEL(_startMachKernel)
-#if ((MAKE_TARGET_OS & LION) == LION)	// Yosemite, Mavericks, Lion and Mountain Lion
+#if ((MAKE_TARGET_OS & LION) == LION)	// El Capitan, Yosemite, Mavericks, Lion and Mountain Lion
 	call    _disableIRQs				// Taking care of an early reboot bug.
 #endif
 	push    %ebp
@@ -428,7 +428,7 @@ LABEL(__switch_stack)
 
     ret
 
-#if (MAKE_TARGET_OS == YOSEMITE)
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // computeRand()
 //
diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index e4fb55b..744a55b 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -88,12 +88,12 @@ void initKernelBootConfig(void)
 	// EFI selection is based on the CPU type.
 	bootArgs->efiMode = (gPlatform.ArchCPUType == CPU_TYPE_X86_64) ? kBootArgsEfiMode64 : kBootArgsEfiMode32;
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 	// Lion's new debug output (replacing a couple of former boot arguments).
 	bootArgs->debugMode = EFI_DEBUG_MODE;					// Defined in config/settings.h
 #endif
 	
-#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 	// Adding a 16 KB log space.
 	bootArgs->performanceDataSize	= 0;
 	bootArgs->performanceDataStart	= 0;
@@ -104,6 +104,8 @@ void initKernelBootConfig(void)
 	
 	bootArgs->bootMemSize			= 0;
 	bootArgs->bootMemStart			= 0;
+	
+#if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
 	bootArgs->flags					= 0;
 
 #if REBOOT_ON_PANIC
@@ -118,8 +120,17 @@ void initKernelBootConfig(void)
 	bootArgs->flags					|= kBootArgsFlagBlackTheme; // (kBootArgsFlagBlack + kBootArgsFlagBlackTheme);
 #endif
 
-	bootArgs->kslide				= 0;
+#endif // #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
+
+#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)
+	bootArgs->flags					|= (kBootArgsFlagCSRBoot + kBootArgsFlagCSRActiveConfig + kBootArgsFlagCSRConfigMode);
+
+	bootArgs->csrActiveConfig		= CSR_VALID_FLAGS;
+	bootArgs->csrCapabilities		= (kBootArgsFlagCSRBoot + kBootArgsFlagLoginUI + kBootArgsFlagInstallUI);
 #endif
+
+	bootArgs->kslide				= 0;
+#endif // #if ((MAKE_TARGET_OS & LION) == LION)
 }
 
 
@@ -200,7 +211,7 @@ void finalizeKernelBootConfig(void)
     bootArgs->deviceTreeP = (uint32_t)addr;
     bootArgs->deviceTreeLength = size;
 	
-/* #if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+/* #if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 	// Adding a 16 KB log space.
 	bootArgs->performanceDataSize	= 0;
 	bootArgs->performanceDataStart	= 0;
@@ -216,8 +227,9 @@ void finalizeKernelBootConfig(void)
 	bootArgs->kslide		= 0;
 #endif */
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
-	bootArgs->FSBFrequency	= gPlatform.CPU.FSBFrequency;
+#if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+	bootArgs->PhysicalMemorySize	= (1024 * 1024 * 1024);
+	bootArgs->FSBFrequency			= gPlatform.CPU.FSBFrequency;
 #endif
 }
 
diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index abc1864..479bd14 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -20,6 +20,11 @@
  * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
+ *
+ * Updates:
+ *
+ *			- Yosemite support added (Pike R. Alpha, June 2014).
+ *			- El Capitan support added (Pike R. Alpha, June 2015).
  */
 
 #ifndef __BOOTSTRUCT_H
@@ -30,7 +35,7 @@
 #include "bios.h"
 #include "platform.h"
 
-#if (MAKE_TARGET_OS == YOSEMITE)
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // El Capitan and Yosemite
 	#define kDefaultKernel	"kernel"
 #else
 	#define kDefaultKernel	"mach_kernel"
@@ -38,19 +43,60 @@
 
 // Bitfields for boot_args->flags
 #ifndef kBootArgsFlagRebootOnPanic
-	#define kBootArgsFlagRebootOnPanic	(1 << 0)
+	#define kBootArgsFlagRebootOnPanic		(1 << 0)
 #endif
 
 #ifndef kBootArgsFlagHiDPI
-	#define kBootArgsFlagHiDPI			(1 << 1)
+	#define kBootArgsFlagHiDPI				(1 << 1)
 #endif
 
 #ifndef kBootArgsFlagBlack
-	#define kBootArgsFlagBlack			(1 << 2)
+	#define kBootArgsFlagBlack				(1 << 2)
 #endif
 
+#ifndef kBootArgsFlagCSRActiveConfig
+	#define kBootArgsFlagCSRActiveConfig	(1 << 3)
+#endif
+
+#ifndef kBootArgsFlagCSRConfigMode
+	#define kBootArgsFlagCSRConfigMode		(1 << 4)
+#endif
+
+#ifndef kBootArgsFlagCSRBoot
+	#define kBootArgsFlagCSRBoot			(1 << 5)
+#endif
+
+/* #define kBootArgsFlagBlackBg				(1 << 6) */
+
 #ifndef kBootArgsFlagBlackTheme
-	#define kBootArgsFlagBlackTheme		(1 << 6)
+	#define kBootArgsFlagBlackTheme			(1 << 6)
+#endif
+
+#ifndef kBootArgsFlagLoginUI
+	#define kBootArgsFlagLoginUI			(1 << 7)
+#endif
+
+#ifndef kBootArgsFlagInstallUI
+	#define kBootArgsFlagInstallUI			(1 << 8)
+#endif
+
+#ifndef CSR_VALID_FLAGS
+	/* Rootless configuration flags */
+	#define CSR_ALLOW_UNTRUSTED_KEXTS		(1 << 0)
+	#define CSR_ALLOW_UNRESTRICTED_FS		(1 << 1)
+	#define CSR_ALLOW_TASK_FOR_PID			(1 << 2)
+	#define CSR_ALLOW_KERNEL_DEBUGGER		(1 << 3)
+	#define CSR_ALLOW_APPLE_INTERNAL		(1 << 4)
+	#define CSR_ALLOW_UNRESTRICTED_DTRACE	(1 << 5)
+	#define CSR_ALLOW_UNRESTRICTED_NVRAM	(1 << 6)
+
+	#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
+			CSR_ALLOW_UNRESTRICTED_FS | \
+			CSR_ALLOW_TASK_FOR_PID | \
+			CSR_ALLOW_KERNEL_DEBUGGER | \
+			CSR_ALLOW_APPLE_INTERNAL | \
+			CSR_ALLOW_UNRESTRICTED_DTRACE | \
+			CSR_ALLOW_UNRESTRICTED_NVRAM)
 #endif
 
 // Snapshot constants with supported version / revision info.
@@ -164,13 +210,12 @@ typedef struct boot_args_new
     uint16_t    Revision;							// Revision of boot_args structure.
     uint16_t    Version;							// Version of boot_args structure.
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION)				// El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
     uint8_t     efiMode;							// 32 = 32-bit, 64 = 64-bit.
 
     uint8_t     debugMode;							// Bit field with behavior changes.
 
-// #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
-#if (MAKE_TARGET_OS & MOUNTAIN_LION)
+#if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
     uint16_t    flags;
 #else
     uint8_t     __reserved1[2];
@@ -195,13 +240,13 @@ typedef struct boot_args_new
     uint32_t    efiRuntimeServicesPageStart;		// Physical address of defragmented runtime pages.
     uint32_t    efiRuntimeServicesPageCount;
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION)				// El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
     uint64_t    efiRuntimeServicesVirtualPageStart;	// Virtual address of defragmented runtime pages.
 #endif
 
     uint32_t    efiSystemTable;						// Physical address of system table in runtime area.
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION)				// El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
     uint32_t    kslide;
 
     uint32_t    performanceDataStart;				// Physical address of log.
@@ -215,13 +260,20 @@ typedef struct boot_args_new
 
     uint64_t    PhysicalMemorySize;
     uint64_t    FSBFrequency;
-    
-// #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
-#if (MAKE_TARGET_OS & MOUNTAIN_LION)
+
     uint64_t    pciConfigSpaceBaseAddress;
-    uint32_t    pciConfigSpaceStartBusNumber;
-    uint32_t    pciConfigSpaceEndBusNumber;
-    uint32_t    __reserved4[730];
+	uint32_t    pciConfigSpaceStartBusNumber;
+	uint32_t    pciConfigSpaceEndBusNumber;
+
+#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)
+	uint32_t    csrActiveConfig;
+	uint32_t    csrCapabilities;
+	uint32_t    boot_SMC_plimit;
+	uint16_t	bootProgressMeterStart;
+	uint16_t	bootProgressMeterEnd;
+	uint32_t    __reserved4[726];
+#elif ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
+	uint32_t    __reserved4[730];
 #else
     uint32_t    __reserved4[734];
 #endif
@@ -235,7 +287,7 @@ typedef struct boot_args_new
     uint64_t    efiRuntimeServicesVirtualPageStart;	// Virtual address of defragmented runtime pages.
 
     uint32_t    __reserved3[2];
-#endif
+#endif // #if ((MAKE_TARGET_OS & LION) == LION)
 } kernel_boot_args;
 
 kernel_boot_args *bootArgs;
diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 500256c..59f0c80 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -188,7 +188,7 @@ void initEFITree(void)
 
 	DT__AddProperty(chosenNode, "machine-signature", sizeof(MACHINE_SIGNATURE), (EFI_UINT8*) &MACHINE_SIGNATURE);
 
-#if (MAKE_TARGET_OS == YOSEMITE)
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // El Capitan and Yosemite
 	UInt8 index = 0;
 	EFI_UINT16 PMTimerValue = 0;
 	uint64_t randomValue, tempValue, cpuTick;
@@ -255,14 +255,14 @@ void initEFITree(void)
 	}
 #endif
 
-#if ((MAKE_TARGET_OS & LION) == LION) // Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 
 	// Used by boot.efi - cosmetic only node/properties on hacks.
 	Node * kernelCompatNode = DT__AddChild(efiNode, "kernel-compatibility");
 
 	static EFI_UINT8 const COMPAT_MODE[] = { 0x01, 0x00, 0x00, 0x00 };
 
-	#if ((MAKE_TARGET_OS == MAVERICKS) || (MAKE_TARGET_OS == YOSEMITE))
+	#if ((MAKE_TARGET_OS & MAVERICKS) == MAVERICKS) // El Capitan, Yosemite and Mavericks.
 		DT__AddProperty(kernelCompatNode, "x86_64", sizeof(COMPAT_MODE), (EFI_UINT8*) &COMPAT_MODE);
 	#else
 		DT__AddProperty(kernelCompatNode, "i386", sizeof(COMPAT_MODE), (EFI_UINT8*) &COMPAT_MODE);
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 83827fc..59954e2 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -3,10 +3,11 @@
  *
  * Updates:
  *
- *			- SMBIOS data logic moved to preprocessor code (PikerAlpha, October 2012).
- *			- Now includes: RevoBoot/libsaoi/i386/SMBIOS/model_data.h (PikerAlpha, October 2012).
- *			- DDR4 support added (PikerAlpha, June 2014).
- *			- Yosemite support added (PikerAlpha, June 2014).
+ *			- SMBIOS data logic moved to preprocessor code (Pike R. Alpha, October 2012).
+ *			- Now includes: RevoBoot/libsaoi/i386/SMBIOS/model_data.h (Pike R. Alpha, October 2012).
+ *			- DDR4 support added (Pike R. Alpha, June 2014).
+ *			- Yosemite support added (Pike R. Alpha, June 2014).
+ *			- El Capitan support added (Pike R. Alpha, June 2015).
  *
  */
 
@@ -30,6 +31,7 @@
 #define MOUNTAIN_LION			6	// Mountain Lion (includes Lion changes).
 #define MAVERICKS				10	// Mavericks (includes Lion changes).
 #define YOSEMITE				26	// Yosemite (incl. Lion/Mavericks changes).
+#define EL_CAPITAN				62	// El Capitan (incl. Lion/Mavericks/Yosemite changes).
 
 //------------------------------------------------------------------------------
 
@@ -76,7 +78,8 @@
 #define IMAC_152				(IMAC | (10 << 15))
 #define IMAC_151				 IMAC						// Defaults to iMac15,1
 
-#define MACBOOK_41				 MACBOOK					// Defaults to MacBook4,1
+#define MACBOOK_41				(MACBOOK | ( 1 << 15))
+#define MACBOOK_81				(MACBOOK | ( 2 << 15))		// Defaults to MacBook8,1
 
 #define MACBOOK_AIR_41			(MACBOOK_AIR | (1 << 15))
 #define MACBOOK_AIR_42			(MACBOOK_AIR | (2 << 15))

From e7a2e6616ef905e2bf27f2418bce378369367c43 Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Fri, 19 Jun 2015 14:54:28 +0200
Subject: [PATCH 517/623] Cleanups

---
 .gitignore                  | 5 +++++
 i386/libsaio/acpi/patcher.h | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 98d0a72..966d393 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,8 @@ i386/libsaio/cpu/tools/PMinfoBackup
 i386/libsaio/smbios/tools/smbios2struct3
 i386/libsaio/smbios/tools/smbios2struct4
 
+*OLD*
+*BAK*
+*test*
+BACKUP
+
diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 6db8895..16ca822 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -21,7 +21,7 @@
 #endif
 
 
-// #if VERIFY_OPREGION_GNVS_ADDRESS
+#if VERIFY_OPREGION_GNVS_ADDRESS
 //==============================================================================
 
 unsigned int search64bitPattern(unsigned int aStartAddress, int aNumberOfBytes, uint64_t aSearchPattern)
@@ -41,7 +41,7 @@ unsigned int search64bitPattern(unsigned int aStartAddress, int aNumberOfBytes,
 
 	return 0; // Not found!
 }
-// #endif // VERIFY_OPREGION_GNVS_ADDRESS
+#endif // VERIFY_OPREGION_GNVS_ADDRESS
 
 
 #if (LOAD_EXTRA_ACPI_TABLES && (LOAD_DSDT_TABLE_FROM_EXTRA_ACPI || LOAD_SSDT_TABLE_FROM_EXTRA_ACPI))
@@ -281,7 +281,7 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 #elif STATIC_DSDT_TABLE_INJECTION || (LOAD_EXTRA_ACPI_TABLES && LOAD_DSDT_TABLE_FROM_EXTRA_ACPI)
 	patchedFADT->DSDT = (uint32_t)customTables[DSDT].tableAddress; // The original DSDT without DSDT table injection!
 
-// #if VERIFY_OPREGION_GNVS_ADDRESS
+#if VERIFY_OPREGION_GNVS_ADDRESS
 	#define OP_REGION_GNVS_ADDRESS_LE 0x0C0053564E47805B
 	// First try to locate the OperationRegion (GNVS, SystemMemory, 0xNNNNNNNN, 0xNNNN) in the factory DSDT.
 	unsigned int opRegFactoryDSDTAddress = search64bitPattern(factoryFADT->DSDT + sizeof(ACPI_DSDT), 2000, OP_REGION_GNVS_ADDRESS_LE);
@@ -317,7 +317,7 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 
 		_ACPI_DEBUG_SLEEP(1);
 	}
-// #endif // VERIFY_OPREGION_GNVS_ADDRESS
+#endif // VERIFY_OPREGION_GNVS_ADDRESS
 		
 	_ACPI_DEBUG_DUMP("Replacing factory DSDT with ");
 

From 2aae3b45f3672b1e58ff4294ec651efc3cdf81d0 Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Sat, 20 Jun 2015 11:54:17 +0200
Subject: [PATCH 518/623] Removed a global and some other minor changes

---
 i386/boot2/boot.c               | 12 ++++++------
 i386/boot2/drivers.c            |  8 ++++----
 i386/config/settings-template.h | 10 ++++++++--
 i386/libsaio/load.c             | 14 ++++++--------
 i386/libsaio/platform.c         |  4 +---
 i386/libsaio/platform.h         | 11 +++++++----
 i386/libsaio/sl.h               |  3 ---
 7 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 2155e68..6ae02b2 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -229,7 +229,7 @@ void boot(int biosdev)
 	printf("\nModel: %s\n", gPlatform.ModelID);
 
 	#if ((MAKE_TARGET_OS & LION) != LION)
-		printf("\ngArchCPUType (CPU): %s\n", (gArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386");
+		printf("\nArchCPUType (CPU): %s\n", (gPlatform.ArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386");
 		sleep(3); // Silent sleep.
 	#endif
 #endif
@@ -312,9 +312,9 @@ void boot(int biosdev)
 				// Is 'arch=<i386/x86_64>' specified as kernel flag?
 				if (getValueForBootKey(kernelFlags, "arch", &val, &length)) //  && len >= 4)
 				{
-					gArchCPUType = (strncmp(val, "x86_64", 6) == 0) ? CPU_TYPE_X86_64 : CPU_TYPE_I386;
+					gPlatform.ArchCPUType = (strncmp(val, "x86_64", 6) == 0) ? CPU_TYPE_X86_64 : CPU_TYPE_I386;
 
-					_BOOT_DEBUG_DUMP("gArchCPUType (c.a.B.plist): %s\n",  (gArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386");
+					_BOOT_DEBUG_DUMP("ArchCPUType (c.a.B.plist): %s\n",  (gPlatform.ArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386");
 				}
 				
 				// Check for -v (verbose) and -s (single user mode) flags.
@@ -655,7 +655,7 @@ void boot(int biosdev)
 				
 				// Create path to pre-linked kernel.
 				sprintf(preLinkedKernelPath, "%s/%s_%s.%08lX", gPlatform.KernelCachePath, kKernelCache, 
-						((gArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386"), adler32);
+						((gPlatform.ArchCPUType == CPU_TYPE_X86_64) ? "x86_64" : "i386"), adler32);
 
 				// Check if this file exists.
 				if ((GetFileInfo(NULL, preLinkedKernelPath, &flags, &cachetime) == 0) && ((flags & kFileTypeMask) == kFileTypeFlat))
@@ -694,11 +694,11 @@ void boot(int biosdev)
 			retStatus = LoadThinFatFile(bootFile, &fileLoadBuffer);
 
 #if SUPPORT_32BIT_MODE
-			if (retStatus <= 0 && gArchCPUType == CPU_TYPE_X86_64)
+			if (retStatus <= 0 && gPlatform.ArchCPUType == CPU_TYPE_X86_64)
 			{
 				_BOOT_DEBUG_DUMP("Load failed for arch=x86_64, trying arch=i386 now.\n");
 
-				gArchCPUType = CPU_TYPE_I386;
+				gPlatform.ArchCPUType = CPU_TYPE_I386;
 
 				retStatus = LoadThinFatFile(bootFile, &fileLoadBuffer);
 			}
diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index ae5c409..4d9a3cb 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -969,17 +969,17 @@ long decodeKernel(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsiz
 
 	ret = ThinFatFile(&fileLoadBuffer, &len);
 
-	if (ret == 0 && len == 0 && gArchCPUType == CPU_TYPE_X86_64)
+	if (ret == 0 && len == 0 && gPlatform.ArchCPUType == CPU_TYPE_X86_64)
 	{
-		gArchCPUType = CPU_TYPE_I386;
+		gPlatform.ArchCPUType = CPU_TYPE_I386;
 		ret = ThinFatFile(&fileLoadBuffer, &len);
 	}
 
 	ret = DecodeMachO(fileLoadBuffer, rentry, raddr, rsize);
 
-	if (ret < 0 && gArchCPUType == CPU_TYPE_X86_64)
+	if (ret < 0 && gPlatform.ArchCPUType == CPU_TYPE_X86_64)
 	{
-		gArchCPUType = CPU_TYPE_I386;
+		gPlatform.ArchCPUType = CPU_TYPE_I386;
 		ret = DecodeMachO(fileLoadBuffer, rentry, raddr, rsize);
 	}
 
diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 8426894..a393ef7 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -229,6 +229,8 @@
 												//			only to give us feedback for a future release of RevoBoot.
 #endif
 
+#define DISABLE_LEGACY_XHCI					0	// Set to 0 by default. Change this to 1 when you need to disable legacy XHCI.
+
 #define DEBUG_BOOT							0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
 
@@ -359,17 +361,20 @@
 #define STATIC_SCREEN_HEIGHT				1200	// Used (in RevoBoot v1.0.35 and greater) when USE_STATIC_DISPLAY_RESOLUTION is 1 and when 
 													// USE_STATIC_DISPLAY_RESOLUTION is 0 but getResolutionFromEDID() isn't supported (failed).
 
+#define BLACKMODE							1	// Show white Apple logo on a black background. Set to 0 for gray mode.
+
 #define DEBUG_BOOT_GRAPHICS					0	// Set to 0 by default. Use 1 when to see debug info.
 
 
 //------------------------------------------------------------ STRINGTABLE.H ----------------------------------------------------------------
 
 #define INSTALL_ESD_SUPPORT					0	// Set to 0 by default. Setting this to 1 will make RevoBoot search in specific directories
-												// for com.apple.Boot.plist – required for Mac like Lion OS X installations.
+												// for com.apple.Boot.plist – required for Mac like installations of OS X.
 
 #if (RECOVERY_HD_SUPPORT == 1 && INSTALL_ESD_SUPPORT == 0)
 	#define INSTALL_ESD_SUPPORT				1	// This setting is mandatory for RECOVERY_HD_SUPPORT
 #endif
+
 //-------------------------------------------------------------- SMBIOS.C ------------------------------------------------------------------
 
 
@@ -421,7 +426,8 @@
 
 #if USE_STATIC_SMBIOS_DATA
 												// Do nothing.
-#elif OVERRIDE_DYNAMIC_MEMORY_DETECTION
+#elif OVERRIDE_DYNAMIC_MEMORY_DETECTION			// See settings under SMBIOS.c
+
 												// Setup RAM module info. Please note that you may have to expand this when you have more RAM modules.
 	#define STATIC_RAM_SLOTS				4	// Number of RAM slots on mainboard.
 
diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 0f537bb..ffba2ef 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -70,8 +70,6 @@ static long DecodeSymbolTable(long cmdBase);
 
 static unsigned long gBinaryAddress;
 
-cpu_type_t gArchCPUType = 0; // CPU_TYPE_I386;
-
 
 //==============================================================================
 // Public function.
@@ -115,7 +113,7 @@ long ThinFatFile(void **binary, unsigned long *length)
 			fapsize = fap->size;
 		}
 
-		if (fapcputype == gArchCPUType)
+		if (fapcputype == gPlatform.ArchCPUType)
 		{
 			*binary = (void *) ((unsigned long)*binary + fapoffset);
 			size = fapsize;
@@ -160,14 +158,14 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 	sleep(5);
 #endif
 
-	/* if ((gArchCPUType == CPU_TYPE_I386   && mH->magic != MH_MAGIC) ||
-		(gArchCPUType == CPU_TYPE_X86_64 && mH->magic != MH_MAGIC_64))
+	/* if ((gPlatform.ArchCPUType == CPU_TYPE_I386   && mH->magic != MH_MAGIC) ||
+		(gPlatform.ArchCPUType == CPU_TYPE_X86_64 && mH->magic != MH_MAGIC_64))
 	{
 		error("Mach-O file has bad magic number\n");
 		return -1;
 	} */
 
-	switch (gArchCPUType)
+	switch (gPlatform.ArchCPUType)
 	{
 		case CPU_TYPE_I386:
 
@@ -202,7 +200,7 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 			return -1;
 	}
 
-	/* cmdstart = (unsigned long)gBinaryAddress + (gArchCPUType == CPU_TYPE_I386) ? sizeof(struct mach_header) :
+	/* cmdstart = (unsigned long)gBinaryAddress + (gPlatform.ArchCPUType == CPU_TYPE_I386) ? sizeof(struct mach_header) :
 																					sizeof(struct mach_header_64); */
 	cmdBase = cmdstart;
 	ncmds = mH->ncmds;
@@ -564,7 +562,7 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 
 static long DecodeUnixThread(long cmdBase, unsigned int *entry)
 {
-	switch (gArchCPUType)
+	switch (gPlatform.ArchCPUType)
 	{
 		case CPU_TYPE_I386:
 		{
diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index aa95208..149bd4f 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -166,11 +166,9 @@ void initPlatform(int biosDevice, bool bootRecoveryHD)
 	 * DHP: Booting with arch=i386 <i>and</i> setting this to CPU_TYPE_I386
 	 * and setting the EFI_64_BIT directive in private_data to 0 allowed me 
 	 * to boot in EFI32 mode. Even with my 64 bit configuration. Pretty sweet.
-	 *
-	 * Note to self: Get rid of gArchCPUType (global alarm) fast.
 	 */
 
-	gPlatform.ArchCPUType			= gArchCPUType = getArchCPUType();
+	gPlatform.ArchCPUType			= getArchCPUType();
 
 	gPlatform.AddressWidth			= (gPlatform.ArchCPUType == CPU_TYPE_X86_64) ? 8 : 4;
 
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 59954e2..3813207 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -130,8 +130,13 @@
 
 //------------------------------------------------------------------------------
 
-#define kKernelCachePath		"/System/Library/Caches/com.apple.kext.caches/Startup"
-#define kKernelCache			"kernelcache"
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
+	#define kKernelCachePath		"/System/Library/Prelinkedkernels"
+	#define kKernelCache			"prelinkedkernel"
+#else
+	#define kKernelCachePath		"/System/Library/Caches/com.apple.kext.caches/Startup"
+	#define kKernelCache			"kernelcache"
+#endif
 
 //------------------------------------------------------------------------------
 
@@ -366,8 +371,6 @@ typedef struct _PlatformInfo_t
 extern void initCPUStruct(void);
 
 /* platform.c */
-extern cpu_type_t gArchCPUType;	// DHP: Fix / remove me!
-
 extern PlatformInfo_t	gPlatform;
 
 extern void initPlatform(int biosDevice, bool bootRecoveryHD);
diff --git a/i386/libsaio/sl.h b/i386/libsaio/sl.h
index 2706a24..79715e0 100755
--- a/i386/libsaio/sl.h
+++ b/i386/libsaio/sl.h
@@ -65,7 +65,4 @@ enum
 
 extern void * gFSLoadAddress;
 
-// Used in: boot/drivers/load.c
-extern cpu_type_t gArchCPUType;	// Formerly known as archCpuType.
-
 #endif /* !__LIBSAIO_SL_H */

From 4facc3ccdc369f12185da8b678a513f306443ace Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Sun, 21 Jun 2015 18:44:56 +0200
Subject: [PATCH 519/623] Fix bootArgs->PhysicalMemorySize and typo

---
 i386/libsaio/bootstruct.c          |  2 +-
 i386/libsaio/platform.c            |  1 +
 i386/libsaio/platform.h            |  3 ++-
 i386/libsaio/smbios/dynamic_data.h | 13 +++++++++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index 744a55b..551b41e 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -228,7 +228,7 @@ void finalizeKernelBootConfig(void)
 #endif */
 
 #if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
-	bootArgs->PhysicalMemorySize	= (1024 * 1024 * 1024);
+	bootArgs->PhysicalMemorySize	= gPlatform.RAM.MemorySize;
 	bootArgs->FSBFrequency			= gPlatform.CPU.FSBFrequency;
 #endif
 }
diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 149bd4f..3ecf4ce 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -229,6 +229,7 @@ void initPlatform(int biosDevice, bool bootRecoveryHD)
 	gPlatform.UUID					= NULL;	// Will be initialized in RevoBoot/i386/libsaio/smbios/[dynamic/static]_data.h
 
 	gPlatform.RAM.SlotCount			= 0;	// Will be initialized further down (used in smbios/dynamic_data.h)
+	gPlatform.RAM.MemorySize		= 0;	// Will be initialized in setupSMBIOS()
 
 #if USE_STATIC_SMBIOS_DATA
 	// We don't have to do anything when static SMBIOS data is used.
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 3813207..2752850 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -131,7 +131,7 @@
 //------------------------------------------------------------------------------
 
 #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
-	#define kKernelCachePath		"/System/Library/Prelinkedkernels"
+	#define kKernelCachePath		"/System/Library/PrelinkedKernels"
 	#define kKernelCache			"prelinkedkernel"
 #else
 	#define kKernelCachePath		"/System/Library/Caches/com.apple.kext.caches/Startup"
@@ -309,6 +309,7 @@ typedef struct _PlatformInfo_t
 		uint8_t		Channels;					// Channel Configuration Single, Dual or Triple
 		uint8_t		SlotCount;					// Previously NoSlots; - Maximum no of slots available
 		uint8_t		Type;						// Standard SMBIOS v2.5 Memory Type
+		uint64_t	MemorySize;					// Initialised in setupSMBIOS() and used in initKernelBootConfig()
 		/* Remove me */
 		char *		BrandString;				// Branding String Memory Controller
 		RamSlotInfo_t	MODULE[MAX_SLOTS];		// Information about each slot
diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 54fcc90..53f8bd6 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -345,6 +345,19 @@ void setupSMBIOS(void)
 			memcpy(gPlatform.UUID, ((SMBSystemInformation *)factoryHeader)->uuid, 16);
 #endif
 		}
+		else if (currentStructureType == kSMBTypeMemoryDevice)
+		{
+			UInt64 memorySize = 0;
+#if DYNAMIC_RAM_OVERRIDE_SIZE
+			memorySize = getRAMSize();
+#else
+			memorySize = ((SMBMemoryDevice *)factoryHeader)->memorySize;
+#endif
+			if (memorySize > 0 && memorySize < 0xffff)
+			{
+				gPlatform.RAM.MemorySize += (memorySize << ((memorySize & 0x8000) ? 10 : 20));
+			}
+		}
 
 		// Init handle in the new header.
 		newHeader->handle = ++handle;

From 1d2e38e16ef5312362e90e0575e94f4edd73ef0f Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Sun, 21 Jun 2015 23:33:20 +0200
Subject: [PATCH 520/623] Also init gPlatform.RAM.MemorySize when static SMBIOS
 data is used

---
 i386/libsaio/smbios.c              | 20 ++++++++++++++++----
 i386/libsaio/smbios/dynamic_data.h |  1 -
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/smbios.c b/i386/libsaio/smbios.c
index ea22a46..7877b45 100755
--- a/i386/libsaio/smbios.c
+++ b/i386/libsaio/smbios.c
@@ -13,7 +13,7 @@
  */
 
 #include "platform.h"
-
+#include "smbios/smbios.h"
 
 #if USE_STATIC_SMBIOS_DATA
 //==============================================================================
@@ -78,12 +78,24 @@ void setupSMBIOS(void)
 		while (structureEnd > (structurePtr + sizeof(SMBStructHeader)))
 		{
 			struct SMBStructHeader * header = (struct SMBStructHeader *) structurePtr;
+			SMBByte currentStructureType = header->type;
+
+			if (currentStructureType == kSMBTypeMemoryDevice)
+			{
+				UInt64 memorySize = 0;
+#if DYNAMIC_RAM_OVERRIDE_SIZE
+				memorySize = getRAMSize();
+#else
+				memorySize = ((SMBMemoryDevice *)header)->memorySize;
+#endif
+				if (memorySize > 0 && memorySize < 0xffff)
+				{
+					gPlatform.RAM.MemorySize += (memorySize << ((memorySize & 0x8000) ? 10 : 20));
+				}
+			}
 
 #if SET_MAX_STRUCTURE_LENGTH
 			char * stringsPtr = structurePtr;
-		#if DEBUG_SMBIOS
-			SMBByte currentStructureType = header->type;
-		#endif
 #endif
 			// Skip the formatted area of the structure.
 			structurePtr += header->length;
diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 53f8bd6..53116b6 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -41,7 +41,6 @@
 
 #include "libsaio.h"
 
-#include "smbios.h"
 #include "model_data.h"
 
 #define IOSERVICE_PLATFORM_FEATURE	0x0000000000000001

From 4541d17179688f109592c35ee8483a2a415cc6a2 Mon Sep 17 00:00:00 2001
From: Chief <PikeRAlpha@yahoo.com>
Date: Tue, 14 Jul 2015 12:58:50 +0200
Subject: [PATCH 521/623] Allow untrusted kexts to load in DP3

---
 i386/libsaio/bootstruct.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index 551b41e..f316d6b 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -123,10 +123,11 @@ void initKernelBootConfig(void)
 #endif // #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
 
 #if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)
-	bootArgs->flags					|= (kBootArgsFlagCSRBoot + kBootArgsFlagCSRActiveConfig + kBootArgsFlagCSRConfigMode);
+	bootArgs->flags					|= kBootArgsFlagCSRActiveConfig;
 
-	bootArgs->csrActiveConfig		= CSR_VALID_FLAGS;
-	bootArgs->csrCapabilities		= (kBootArgsFlagCSRBoot + kBootArgsFlagLoginUI + kBootArgsFlagInstallUI);
+	bootArgs->csrActiveConfig		= CSR_ALLOW_UNTRUSTED_KEXTS;
+	bootArgs->csrCapabilities		= CSR_VALID_FLAGS;
+	bootArgs->boot_SMC_plimit		= 0;
 #endif
 
 	bootArgs->kslide				= 0;

From 8e400325a933c2cfafb189b73ba6d252bdd40c5f Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 15 Sep 2015 02:12:32 +0200
Subject: [PATCH 522/623] Improved kernel version detection.

---
 i386/libsaio/platform.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 2752850..22d99d1 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -204,7 +204,16 @@ typedef struct _PlatformInfo_t
 	
 	char *				OSVersion;				// OS version initialized with "10.6" in platform.c and
 												// later updated in boot.c with the actual version info.
-	
+
+	struct KERNEL								// Initialised in initKernelVersionInfo()
+	{
+		uint8_t			versionMajor;
+		
+		uint8_t			versionMinor;
+		
+		uint8_t			versionRevision;
+	} KERNEL;
+
 	char *				ModelID;				// Initialized in platform.c and used in boot.c
 	char *				CommaLessModelID;		// Initialized in platform.c and used in i386/libsaio/ACPI/patcher.h,
 	char *				KextFileName;			// Initialized and used in drivers.c

From 6c8069fa40ebba77d8743994172401a8a807368d Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 15 Sep 2015 02:13:43 +0200
Subject: [PATCH 523/623] Improved kernel version detection.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Removed old kernel/kext patch code.
– Cleanups and improved 32-bit support.
---
 i386/libsaio/load.c | 464 +++++++++++++++++++-------------------------
 1 file changed, 200 insertions(+), 264 deletions(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index ffba2ef..e2fe7dd 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -31,6 +31,7 @@
 
 #include <mach-o/fat.h>
 #include <mach-o/loader.h>
+#include <mach-o/nlist.h>
 #include <mach/machine/thread_status.h>
 
 #include <sl.h>
@@ -47,20 +48,11 @@
 #define NVRAM_GUID_UINT64				0x3530454445314434
 #define OPTIONS_STRING_UINT64			0x736e6f6974706f2f
 
-/***
- * Tip: Reverse bytes if you search for the IDs with grep/HexEdit.
- */
-// #define APPLE_HDA_PATCH_ID				0x11D419843D107410 10.9.2 and 10.9.3
-// #define APPLE_HDA_PATCH_ID				0x11D419843D397410
-// #define APPLE_HDA_TARGET_ID				0x10EC08923D397410
-
-// #define APPLE_HDA_CONTROLLER_PATCH_ID	0x30EB617500000C0C
-// #define APPLE_HDA_CONTROLLER_TARGET_ID	0x0EEB617500000C0C
-
 // Load MKext(s) or separate kexts (default behaviour / behavior).
 bool gLoadKernelDrivers = true;
 
 // Private functions.
+static long initKernelVersionInfo(unsigned long cmdbase, long listSize, unsigned int textSegmentVMAddress);
 static long DecodeSegment(long cmdBase, unsigned int*load_addr, unsigned int *load_size);
 static long DecodeUnixThread(long cmdBase, unsigned int *entry);
 
@@ -135,94 +127,105 @@ long ThinFatFile(void **binary, unsigned long *length)
 
 long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 {
-	struct mach_header *mH;
-	unsigned long  ncmds, cmdBase, cmd, cmdsize, cmdstart;
-	unsigned int vmaddr = ~0;
-	unsigned int vmend = 0;
-	unsigned long  cnt;
-	long  ret = -1;
-	unsigned int entry = 0;
-
-	gBinaryAddress = (unsigned long)binary;
-	mH = (struct mach_header *)(gBinaryAddress);
-
-#if DEBUG
-	printf("In DecodeMachO()\n");
-	printf("magic:      %x\n", (unsigned)mH->magic);
-	printf("cputype:    %x\n", (unsigned)mH->cputype);
-	printf("cpusubtype: %x\n", (unsigned)mH->cpusubtype);
-	printf("filetype:   %x\n", (unsigned)mH->filetype);
-	printf("ncmds:      %x\n", (unsigned)mH->ncmds);
-	printf("sizeofcmds: %x\n", (unsigned)mH->sizeofcmds);
-	printf("flags:      %x\n", (unsigned)mH->flags);
-	sleep(5);
-#endif
+	long ret								= -1;
 
-	/* if ((gPlatform.ArchCPUType == CPU_TYPE_I386   && mH->magic != MH_MAGIC) ||
-		(gPlatform.ArchCPUType == CPU_TYPE_X86_64 && mH->magic != MH_MAGIC_64))
-	{
-		error("Mach-O file has bad magic number\n");
-		return -1;
-	} */
-
-	switch (gPlatform.ArchCPUType)
-	{
-		case CPU_TYPE_I386:
-
-			if (mH->magic != MH_MAGIC)
-			{
-				error("Mach-O (i386) file has bad magic number\n");
-				return -1;
-			}
+	unsigned int vmaddr						= ~0;
+	unsigned int vmend						= 0;
+	unsigned int entry						= 0;
+	unsigned int load_addr					= 0;
+	unsigned int load_size					= 0;
+	unsigned int textSegmentVMAddress		= 0;
 
-			cmdstart = (unsigned long)gBinaryAddress + sizeof(struct mach_header);
-			break;
 
-		case CPU_TYPE_X86_64:
+	unsigned long ncmds						= 0;
+	unsigned long cmdBase					= 0;
+	unsigned long cmd						= 0;
+	unsigned long cmdsize					= 0;
+	unsigned long cmdstart					= 0;
+	unsigned long cnt						= 0;
+	unsigned long listSize					= 0;
 
-			if (mH->magic != MH_MAGIC_64 && mH->magic == MH_MAGIC)
-			{
-				return -1;
-			}
+	gBinaryAddress = (unsigned long)binary;
 
-			if (mH->magic != MH_MAGIC_64)
-			{
-				error("Mach-O file (x86_64) has bad magic number\n");
-				return -1;
-			}
+	if (gPlatform.ArchCPUType == CPU_TYPE_X86_64)
+	{
+		struct mach_header_64 * machHeader = (struct mach_header_64 *)(gBinaryAddress);
 
-			cmdstart = (unsigned long)gBinaryAddress + sizeof(struct mach_header_64);
-			break;
+		if (machHeader->magic != MH_MAGIC_64)
+		{
+			error("Mach-O file(X86_64) has a bad magic number!\n");
+			return -1;
+		}
 
-		default:
+		listSize = sizeof(struct nlist_64);
+		cmdstart = (unsigned long)gBinaryAddress + sizeof(struct mach_header_64);
+#if DEBUG
+		printf("In DecodeMachO()\n");
+		printf("magic:      %x\n", (unsigned)machHeader->magic);
+		printf("cputype:    %x\n", (unsigned)machHeader->cputype);
+		printf("cpusubtype: %x\n", (unsigned)machHeader->cpusubtype);
+		printf("filetype:   %x\n", (unsigned)machHeader->filetype);
+		printf("ncmds:      %x\n", (unsigned)machHeader->ncmds);
+		printf("sizeofcmds: %x\n", (unsigned)machHeader->sizeofcmds);
+		printf("flags:      %x\n", (unsigned)machHeader->flags);
+		sleep(5);
+#endif
+		ncmds = machHeader->ncmds;
+	}
+	else // if (gPlatform.ArchCPUType == CPU_TYPE_I386)
+	{
+		struct mach_header * machHeader = (struct mach_header *)(gBinaryAddress);
 
-			error("Unknown CPU type\n");
+		if (machHeader->magic != MH_MAGIC)
+		{
+			error("Mach-O file(i386) has a bad magic number!\n");
 			return -1;
+		}
+
+		listSize = sizeof(struct nlist);
+		cmdstart = (unsigned long)gBinaryAddress + sizeof(struct mach_header);
+#if DEBUG
+		printf("In DecodeMachO()\n");
+		printf("magic:      %x\n", (unsigned)machHeader->magic);
+		printf("cputype:    %x\n", (unsigned)machHeader->cputype);
+		printf("cpusubtype: %x\n", (unsigned)machHeader->cpusubtype);
+		printf("filetype:   %x\n", (unsigned)machHeader->filetype);
+		printf("ncmds:      %x\n", (unsigned)machHeader->ncmds);
+		printf("sizeofcmds: %x\n", (unsigned)machHeader->sizeofcmds);
+		printf("flags:      %x\n", (unsigned)machHeader->flags);
+		sleep(5);
+#endif
+		ncmds = machHeader->ncmds;
 	}
 
-	/* cmdstart = (unsigned long)gBinaryAddress + (gPlatform.ArchCPUType == CPU_TYPE_I386) ? sizeof(struct mach_header) :
-																					sizeof(struct mach_header_64); */
 	cmdBase = cmdstart;
-	ncmds = mH->ncmds;
 
 	for (cnt = 0; cnt < ncmds; cnt++)
 	{
 		cmd = ((long *)cmdBase)[0];
 		cmdsize = ((long *)cmdBase)[1];
-		unsigned int load_addr;
-		unsigned int load_size;
 
 		switch (cmd)
 		{
 			case LC_SEGMENT:
 			case LC_SEGMENT_64:
-				ret = DecodeSegment(cmdBase, &load_addr, &load_size);
+				// Returns 1 for __TEXT segment.
+				if (DecodeSegment(cmdBase, &load_addr, &load_size))
+				{
+					textSegmentVMAddress = load_addr;
+					ret = 0;
+				}
 
-				if (ret == 0 && load_size != 0 && load_addr >= KERNEL_ADDR)
+				if (load_size != 0 && load_addr >= KERNEL_ADDR)
 				{
 					vmaddr = min(vmaddr, load_addr);
 					vmend = max(vmend, load_addr + load_size);
 				}
+
+				break;
+				
+			case LC_SYMTAB:
+				initKernelVersionInfo(cmdBase, listSize, textSegmentVMAddress);
 				break;
 
 			case LC_MAIN:	/* Mountain Lion's replacement for LC_UNIXTHREAD */
@@ -230,9 +233,6 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 				ret = DecodeUnixThread(cmdBase, &entry);
 				break;
 
-			case LC_SYMTAB:
-				break;
-
 			default:
 #if NOTDEF
 				printf("Ignoring cmd type %d.\n", (unsigned)cmd);
@@ -275,67 +275,135 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 }
 
 
-/* #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION_NEW)
 //==============================================================================
-//
-// Kernel patch routine for iMessage
-//
-// This segment will be replaced by random data (since 18 April 2011) and released
-// when the kernel is done with it. Meaning that our data is short lived as well.
-if (strncmp(segname, "__KLD", 5) == 0)
+// Private function. Called from DecodeMachO()
+
+static long initKernelVersionInfo(unsigned long cmdBase, long listSize, unsigned int textSegmentVMAddress)
 {
-	uint32_t	index	= 0;
-	uint32_t	offset	= sizeof(struct segment_command_64);
-	
-	while(offset < segCmd->cmdsize)
+	struct symtab_command * symtab = (struct symtab_command *)cmdBase;
+
+	/*
+	 * Reverse search is quicker for symbols at the end of the symbol table (example with 20496 symbols):
+	 *
+	 * _version_revision	is symbol 18865 – first target symbol, iterated symbols: 1631
+	 * _version_minor		is symbol 18863 – second target symbol, iterated symbols: 1633
+	 * _version_major		is symbol 18862 – last target symbol, iterated symbols: 1634
+	 *
+	 * versus:
+	 *
+	 * _version_major		is symbol 18862 – first target symbol, iterated symbols: 18862
+	 * _version_minor		is symbol 18863 – ssecond target symbol, iterated symbols: 18863
+	 * _version_revision	is symbol 18865 – last target symbol, iterated symbols: 18865
+	 */
+
+	const char * targetSymbols[] = { "_version_revision", "_version_minor", "_version_major" };
+
+	char * symbolName = NULL;
+	char * loadBuffer = (char *)gBinaryAddress;
+
+	void * stringTable = (void *)(gBinaryAddress + symtab->stroff);
+
+	short index								= 0;
+
+	long symbolOffset						= 0;
+	long symbolLength						= 0;
+	long symbolNumber						= symtab->nsyms;
+
+	uint32_t pointer = gBinaryAddress + symtab->symoff + ((symtab->nsyms - 1) * listSize);
+
+	if (gPlatform.ArchCPUType == CPU_TYPE_X86_64)
 	{
-		struct section_64 *section = (struct section_64 *)((char *)segCmd + offset);
-		offset += sizeof(struct section_64);
-		
-		if (strncmp((char *)section->sectname, "__cstring", 9) == 0)
+		struct nlist_64 * nl = (struct nlist_64 *)pointer;
+	
+		while (symbolNumber > 0)
 		{
-			uint64_t sectionStart	= (fileaddr + index);
-			uint64_t sectionEnd		= (fileaddr + filesize);
-			
-			unsigned char * baseAddress = (unsigned char *)sectionStart;
+			nl = (struct nlist_64 *)pointer;
 			
-			// Search for the NVRAM GUID.
-			for (; baseAddress <= (unsigned char *)sectionEnd; baseAddress++)
+			if (nl->n_sect && nl->n_value)
 			{
-				if (*(uint64_t *)baseAddress == NVRAM_GUID_UINT64)
+				symbolName = (char *)stringTable + nl->n_un.n_strx;
+				symbolLength = strlen(symbolName);
+				symbolOffset = (nl->n_value - textSegmentVMAddress);
+				
+				if (symbolLength)
 				{
-					// Zero out NVRAM GUID
-					bzero((char *)baseAddress, 36);
-					// Replace/inject GUID replacement
-					memcpy((char *)baseAddress, "NVRAM", 5);
-					// Point to the end of the (former) NVRAM GUID string
-					baseAddress += 36;
-					
-					// Search for "/options" after the GUID.
-					for (; baseAddress <= (unsigned char *)sectionEnd; baseAddress++)
+					if (strcmp(symbolName, targetSymbols[index]) == 0)
 					{
-						if (*(uint64_t *)baseAddress == OPTIONS_STRING_UINT64)
+						switch(index)
 						{
-							// Rename /option to /RevoEFI (just temporarily)
-							memcpy((unsigned char *)baseAddress, "/RevoEFI", 8);
-							// Prepare to break out early.
-							baseAddress = (unsigned char *)(sectionEnd + 1);
-							// Done.
-							break;
+							case 0:
+								gPlatform.KERNEL.versionRevision = (uint8_t)loadBuffer[symbolOffset];
+								index++;
+								break;
+								
+							case 1:
+								gPlatform.KERNEL.versionMinor = (uint8_t)loadBuffer[symbolOffset];
+								index++;
+								break;
+								
+							case 2:
+								gPlatform.KERNEL.versionMajor = (uint8_t)loadBuffer[symbolOffset];
+								symbolNumber = 0;
+								break;
 						}
 					}
 				}
 			}
+			
+			symbolNumber--;
+			pointer -= listSize;
 		}
-		else
+	}
+	else // 32-bit compatibility code.
+	{
+		struct nlist * nl = (struct nlist *)pointer;
+		
+		while (symbolNumber > 0)
 		{
-			// Skip unwanted sections (which makes us a little faster).
-			index += section->size;
+			nl = (struct nlist *)pointer;
+			
+			if (nl->n_sect && nl->n_value)
+			{
+				symbolName = (char *)stringTable + nl->n_un.n_strx;
+				symbolLength = strlen(symbolName);
+				symbolOffset = (nl->n_value - textSegmentVMAddress);
+				
+				if (symbolLength)
+				{
+					if (strcmp(symbolName, targetSymbols[index]) == 0)
+					{
+						switch(index)
+						{
+							case 0:
+								gPlatform.KERNEL.versionRevision = (uint8_t)loadBuffer[symbolOffset];
+								index++;
+								break;
+								
+							case 1:
+								gPlatform.KERNEL.versionMinor = (uint8_t)loadBuffer[symbolOffset];
+								index++;
+								break;
+								
+							case 2:
+								gPlatform.KERNEL.versionMajor = (uint8_t)loadBuffer[symbolOffset];
+								symbolNumber = 0;
+								break;
+						}
+					}
+				}
+			}
+			
+			symbolNumber--;
+			pointer -= listSize;
 		}
 	}
-}
-#endif */
+#if DEBUG
+	printf("gPlatform.KERNEL.versionMmR: %d.%d.%d\n", gPlatform.KERNEL.versionMajor, gPlatform.KERNEL.versionMinor, gPlatform.KERNEL.versionRevision);
+	sleep(5);
+#endif
 
+	return 0;
+}
 
 //==============================================================================
 // Private function. Called from DecodeMachO()
@@ -343,169 +411,34 @@ if (strncmp(segname, "__KLD", 5) == 0)
 
 static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *load_size)
 {
-	char *segname;
-	long   vmsize, filesize;
-	unsigned long vmaddr, fileaddr;
+	char *segname	= NULL;
+
+	long retValue	= 0;
+	long vmsize		= 0;
+	long filesize	= 0;
+
+	unsigned long vmaddr	= 0;
+	unsigned long fileaddr	= 0;
 
 	if (((long *)cmdBase)[0] == LC_SEGMENT_64)
 	{
 		struct segment_command_64 *segCmd = (struct segment_command_64 *)cmdBase;
-
 		vmaddr = (segCmd->vmaddr & 0x3fffffff);
 		vmsize = segCmd->vmsize;
 		fileaddr = (gBinaryAddress + segCmd->fileoff);
 		filesize = segCmd->filesize;
 		segname = segCmd->segname;
-
-#if ((MAKE_TARGET_OS & LION) == LION)
-	//
-	// Kernel patch routine for iMessage (LION, MOUNTAIN_LION, MAVERICKS and YOSEMITE).
-	//
-	#if IMESSAGE_PATCH_ENABLED
-		//
-		// This segment will be replaced by random data (since 18 April 2011) and released
-		// when the kernel is done with it. Meaning that our data is short lived as well.
-		//
-		if (strncmp(segname, "__KLD", 5) == 0)
-		{
-			// printf ("__KLD found!\n");
-
-			uint32_t	index	= 0;
-			uint32_t	offset	= sizeof(struct segment_command_64);
-
-			while(offset < segCmd->cmdsize)
-			{
-				struct section_64 *section = (struct section_64 *)((char *)segCmd + offset);
-				offset += sizeof(struct section_64);
-
-				if (strncmp((char *)section->sectname, "__cstring", 9) == 0)
-				{
-					// printf ("__KLD found!\n");
-
-					uint64_t sectionStart	= (fileaddr + index);
-					uint64_t sectionEnd		= (fileaddr + filesize);
-
-					unsigned char * baseAddress = (unsigned char *)sectionStart;
-
-					// Search for the NVRAM GUID.
-					for (; baseAddress <= (unsigned char *)sectionEnd; baseAddress++)
-					{
-						if (*(uint64_t *)baseAddress == NVRAM_GUID_UINT64)
-						{
-							// printf ("NVRAM GUID found!\n");
-
-							// Zero out NVRAM GUID
-							bzero((char *)baseAddress, 36);
-							// Replace/inject GUID replacement
-							memcpy((char *)baseAddress, "NVRAM", 5);
-							// Point to the end of the (former) NVRAM GUID string
-							baseAddress += 36;
-
-							// Search for "/options" after the GUID.
-							for (; baseAddress <= (unsigned char *)sectionEnd; baseAddress++)
-							{
-								if (*(uint64_t *)baseAddress == OPTIONS_STRING_UINT64)
-								{
-									// printf ("/options renamed to /RevoEFI!\n");
-
-									// Rename /options to /RevoEFI (just temporarily)
-									memcpy((unsigned char *)baseAddress, "/RevoEFI", 8);
-									// Prepare to break out early.
-									baseAddress = (unsigned char *)(sectionEnd + 1);
-									// Done.
-									break;
-								}
-							}
-						}
-					}
-				}
-				else
-				{
-					// Skip unwanted sections (which makes us a little faster).
-					index += section->size;
-				}
-			}
-#if DEBUG
-			sleep(5);
-#endif
-		}
-	#endif // #if IMESSAGE_PATCH_ENABLED
-
-#if KERNELCACHE_PATCHING_ENABLED
-	#if IMESSAGE_PATCH_ENABLED
-		else
-	#endif
-		if (strncmp(segname, "__PRELINK_TEXT", 14) == 0)
-		{
-			// printf("Target segname found: __PRELINK_TEXT\n");
-
-			uint32_t	index2	= 0;
-			uint32_t	offset2	= sizeof(struct segment_command_64);
-			
-			while(offset2 < segCmd->cmdsize)
-			{
-				struct section_64 *section2 = (struct section_64 *)((char *)segCmd + offset2);
-				offset2 += sizeof(struct section_64);
-
-				if (strncmp((char *)section2->sectname, "__text", 6) == 0)
-				{
-					// printf("Target section found: __PRELINK_TEXT\n");
-
-					uint64_t sectionStart2	= (fileaddr + index2);
-					uint64_t sectionEnd2	= (fileaddr + filesize);
-					
-					unsigned char * baseAddress2 = (unsigned char *)sectionStart2;
-					
-					// Search for APPLE_HDA_PATCH_ID byte sequence.
-					for (; baseAddress2 <= (unsigned char *)sectionEnd2; baseAddress2++)
-					{
-#ifdef APPLE_HDA_PATCH_ID
-						if (*(uint64_t *)baseAddress2 == APPLE_HDA_PATCH_ID)
-						{
-							// printf("DO APPLE_HDA_PATCH_ID\n");
-							// Replace APPLE_HDA_PATCH_ID with APPLE_HDA_TARGET_ID
-							*(uint64_t *)baseAddress2 = APPLE_HDA_TARGET_ID;
-						}
-#endif
-
-#ifdef APPLE_HDA_CONTROLLER_PATCH_ID
-	#if APPLE_HDA_PATCH_ID
-						else if
-	#else
-						if
-	#endif
-						(*(uint64_t *)baseAddress2 == APPLE_HDA_CONTROLLER_PATCH_ID)
-						{
-							// printf("DO APPLE_HDA_CONTROLLER_PATCH_ID\n");
-							// Replace APPLE_HDA_CONTROLLER_PATCH_ID with APPLE_HDA_CONTROLLER_TARGET_ID
-							*(uint64_t *)baseAddress2 = APPLE_HDA_CONTROLLER_TARGET_ID;
-						}
-#endif
-					}
-				}
-				else
-				{
-					// Skip unwanted sections.
-					index2 += section2->size;
-				}
-			}
-			// printf("sleeping for 2 seconds!\n");
-			// sleep(2);
-		}
-#endif // #if KERNELCACHE_PATCH_ENABLED
-#endif // #if ((MAKE_TARGET_OS & LION) == LION)
 	}
 	else
 	{
 		struct segment_command *segCmd = (struct segment_command *)cmdBase;
-
 		vmaddr = (segCmd->vmaddr & 0x3fffffff);
-		vmsize = segCmd->vmsize;	  
+		vmsize = segCmd->vmsize;
 		fileaddr = (gBinaryAddress + segCmd->fileoff);
 		filesize = segCmd->filesize;
 		segname = segCmd->segname;
 	}
-
+	
 	// Pre-flight checks.
 	if (vmsize && filesize)
 	{
@@ -528,9 +461,12 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 			printf("Sleeping for 5 seconds...\n");
 			sleep(5);
 #endif
-			// Make boot() skip kernel / MKext(s) loading.
 			gLoadKernelDrivers = false;
 		}
+		else if (strncmp(segname, "__TEXT", 6) == 0)
+		{
+			retValue = 1;
+		}
 
 		// Copy from file load area.
 		if (filesize > 0)
@@ -553,7 +489,7 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 		*load_size = 0;			
 	}
 
-	return 0;
+	return retValue;
 }
 
 

From cd783afe443f2693f4084a99eedb1a2efeacb771 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Thu, 17 Sep 2015 08:03:16 +0200
Subject: [PATCH 524/623] Comment only changes.

---
 i386/libsaio/bootstruct.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index 479bd14..23c9e8e 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -55,40 +55,40 @@
 #endif
 
 #ifndef kBootArgsFlagCSRActiveConfig
-	#define kBootArgsFlagCSRActiveConfig	(1 << 3)
+	#define kBootArgsFlagCSRActiveConfig	(1 << 3)	// 8
 #endif
 
 #ifndef kBootArgsFlagCSRConfigMode
-	#define kBootArgsFlagCSRConfigMode		(1 << 4)
+	#define kBootArgsFlagCSRConfigMode		(1 << 4)	// 16
 #endif
 
 #ifndef kBootArgsFlagCSRBoot
-	#define kBootArgsFlagCSRBoot			(1 << 5)
+	#define kBootArgsFlagCSRBoot			(1 << 5)	// 32
 #endif
 
 /* #define kBootArgsFlagBlackBg				(1 << 6) */
 
 #ifndef kBootArgsFlagBlackTheme
-	#define kBootArgsFlagBlackTheme			(1 << 6)
+	#define kBootArgsFlagBlackTheme			(1 << 6)	// 64
 #endif
 
 #ifndef kBootArgsFlagLoginUI
-	#define kBootArgsFlagLoginUI			(1 << 7)
+	#define kBootArgsFlagLoginUI			(1 << 7)	// 128
 #endif
 
 #ifndef kBootArgsFlagInstallUI
-	#define kBootArgsFlagInstallUI			(1 << 8)
+	#define kBootArgsFlagInstallUI			(1 << 8)	// 256
 #endif
 
 #ifndef CSR_VALID_FLAGS
 	/* Rootless configuration flags */
-	#define CSR_ALLOW_UNTRUSTED_KEXTS		(1 << 0)
-	#define CSR_ALLOW_UNRESTRICTED_FS		(1 << 1)
-	#define CSR_ALLOW_TASK_FOR_PID			(1 << 2)
-	#define CSR_ALLOW_KERNEL_DEBUGGER		(1 << 3)
-	#define CSR_ALLOW_APPLE_INTERNAL		(1 << 4)
-	#define CSR_ALLOW_UNRESTRICTED_DTRACE	(1 << 5)
-	#define CSR_ALLOW_UNRESTRICTED_NVRAM	(1 << 6)
+	#define CSR_ALLOW_UNTRUSTED_KEXTS		(1 << 0)	// 1
+	#define CSR_ALLOW_UNRESTRICTED_FS		(1 << 1)	// 2
+	#define CSR_ALLOW_TASK_FOR_PID			(1 << 2)	// 4
+	#define CSR_ALLOW_KERNEL_DEBUGGER		(1 << 3)	// 8
+	#define CSR_ALLOW_APPLE_INTERNAL		(1 << 4)	// 16
+	#define CSR_ALLOW_UNRESTRICTED_DTRACE	(1 << 5)	// 32
+	#define CSR_ALLOW_UNRESTRICTED_NVRAM	(1 << 6)	// 64
 
 	#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
 			CSR_ALLOW_UNRESTRICTED_FS | \

From 1284678b5e09d3a8da4787101c228a1dbe61cfbd Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Thu, 17 Sep 2015 08:05:40 +0200
Subject: [PATCH 525/623] Adding new __TEXT,cstring (C String Literal).

---
 i386/libsaio/bootstruct.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index 23c9e8e..fcea25c 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -89,6 +89,7 @@
 	#define CSR_ALLOW_APPLE_INTERNAL		(1 << 4)	// 16
 	#define CSR_ALLOW_UNRESTRICTED_DTRACE	(1 << 5)	// 32
 	#define CSR_ALLOW_UNRESTRICTED_NVRAM	(1 << 6)	// 64
+	#define CSR_ALLOW_DEVICE_CONFIGURATION	(1 << 7)	// 128
 
 	#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
 			CSR_ALLOW_UNRESTRICTED_FS | \

From d132f48ba95c3793cc1a153a7727d805b06d2fac Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 27 Oct 2015 04:08:06 +0100
Subject: [PATCH 526/623] Cleanups checksum8 calls.

---
 i386/libsa/string.c                   |  2 +-
 i386/libsaio/acpi/patcher.h           | 10 +++++-----
 i386/libsaio/acpi/ssdt_pr_generator.h |  2 +-
 i386/libsaio/smbios/dynamic_data.h    |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/i386/libsa/string.c b/i386/libsa/string.c
index fcd2b64..5001837 100755
--- a/i386/libsa/string.c
+++ b/i386/libsa/string.c
@@ -397,7 +397,7 @@ uint8_t checksum8(void * start, unsigned int length)
         csum += *cp++;
 	}
 
-    return csum;
+	return (256 - csum); // ((255 - csum) + 1);
 }
 
 
diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 16ca822..8a402fb 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -217,7 +217,7 @@ void overrideACPIMethods(ACPI_FADT *patchedFADT)
 	}
 	// Fix checksum.
 	patchedDSDT->Checksum = 0;
-	patchedDSDT->Checksum = 256 - checksum8(patchedDSDT, sizeof(patchedDSDT));
+	patchedDSDT->Checksum = checksum8(patchedDSDT, sizeof(patchedDSDT));
 
 	// We're done. Using the patched factory DSDT now.
 	patchedFADT->DSDT = patchedFADT->X_DSDT = (uint32_t)patchedDSDT;
@@ -366,7 +366,7 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 	customTables[FACS].table = NULL;
 #endif	// STATIC_FACS_TABLE_INJECTION
 	patchedFADT->Checksum = 0;
-	patchedFADT->Checksum = 256 - checksum8(patchedFADT, sizeof(ACPI_FADT));
+	patchedFADT->Checksum = checksum8(patchedFADT, sizeof(ACPI_FADT));
 		
 	xsdtEntries[tableIndex - dropOffset] = (uint32_t)patchedFADT;
 
@@ -613,17 +613,17 @@ void setupACPI(void)
 
 		// Patch the checksum of the new XSDP table.
         patchedXSDT->Checksum = 0;
-        patchedXSDT->Checksum = 256 - checksum8(patchedXSDT, patchedXSDT->Length);
+        patchedXSDT->Checksum = checksum8(patchedXSDT, patchedXSDT->Length);
 
 		// Patch the checksum of the new RSDP table.
 		patchedRSDP->Checksum = 0;
-		patchedRSDP->Checksum = 256 - checksum8(patchedRSDP, 20);
+		patchedRSDP->Checksum = checksum8(patchedRSDP, 20);
 
 		// Patch the (extended) checksum of the RSDP for table revision 1 and greater. 
 		if (patchedRSDP->Revision)
 		{
 			patchedRSDP->ExtendedChecksum = 0;
-			patchedRSDP->ExtendedChecksum = 256 - checksum8(patchedRSDP, patchedRSDP->Length);
+			patchedRSDP->ExtendedChecksum = checksum8(patchedRSDP, patchedRSDP->Length);
 		}
     }
 
diff --git a/i386/libsaio/acpi/ssdt_pr_generator.h b/i386/libsaio/acpi/ssdt_pr_generator.h
index 417ad3e..e58f2c4 100644
--- a/i386/libsaio/acpi/ssdt_pr_generator.h
+++ b/i386/libsaio/acpi/ssdt_pr_generator.h
@@ -681,7 +681,7 @@ void generateSSDT_PR(void)
 	
 	header->Length		= bufferSize;
 	header->Checksum	= 0;
-	header->Checksum	= 256 - checksum8(buffer, header->Length);
+	header->Checksum	= checksum8(buffer, header->Length);
 
 	//--------------------------------------------------------------------------
 	// Updating customTables with the required data.
diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 53116b6..ce7eeaf 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -555,8 +555,8 @@ void setupSMBIOS(void)
 	newEPS->dmi.tableLength = (newtablesPtr - (char *)newEPS->dmi.tableAddress);
 
 	// Calculate new checksums.
-	newEPS->dmi.checksum	= 256 - checksum8(&newEPS->dmi, sizeof(newEPS->dmi));
-	newEPS->checksum		= 256 - checksum8(newEPS, sizeof(* newEPS));
+	newEPS->dmi.checksum	= checksum8(&newEPS->dmi, sizeof(newEPS->dmi));
+	newEPS->checksum		= checksum8(newEPS, sizeof(* newEPS));
 
 	_SMBIOS_DEBUG_DUMP("newEPS->dmi.structureCount: %d - tableLength: %d\n", newEPS->dmi.structureCount, newEPS->dmi.tableLength);
 

From f400721ad9ee13de9a515be0ddca7b6a0e57d207 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 27 Oct 2015 04:12:47 +0100
Subject: [PATCH 527/623] Cleanups checksum8 calls.

---
 i386/libsaio/smbios.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/smbios.c b/i386/libsaio/smbios.c
index 7877b45..fb4be53 100755
--- a/i386/libsaio/smbios.c
+++ b/i386/libsaio/smbios.c
@@ -137,8 +137,8 @@ void setupSMBIOS(void)
 	_SMBIOS_DEBUG_DUMP("newEPS->dmi.structureCount: %d\nnewEPS.dmi.tableLength: %d\n", newEPS->dmi.structureCount, newEPS->dmi.tableLength);
 
     // Take care of possible checksum errors
-    newEPS->dmi.checksum		= 256 - checksum8(&newEPS->dmi, sizeof(newEPS->dmi));
-    newEPS->checksum			= 256 - checksum8(newEPS, sizeof(* newEPS));
+    newEPS->dmi.checksum		= checksum8(&newEPS->dmi, sizeof(newEPS->dmi));
+    newEPS->checksum			= checksum8(newEPS, sizeof(* newEPS));
 
 	// Used to update the EFI Configuration Table (in efi.c) which is
 	// what AppleSMBIOS.kext reads to setup the SMBIOS table for OS X.

From cb8750e127c63e32ad148f93571e282a3089aa66 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 27 Oct 2015 04:13:24 +0100
Subject: [PATCH 528/623] Updating template file.

---
 i386/config/settings-template.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index a393ef7..0f2315b 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -363,6 +363,8 @@
 
 #define BLACKMODE							1	// Show white Apple logo on a black background. Set to 0 for gray mode.
 
+#define UISCALE_2X							0	// Set to 0 by default. Use 1 for HiDPI mode.
+
 #define DEBUG_BOOT_GRAPHICS					0	// Set to 0 by default. Use 1 when to see debug info.
 
 
@@ -421,6 +423,24 @@
 #define DEBUG_SMBIOS						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
 
+
+//---------------------------------------------------------------- LOAD.C ------------------------------------------------------------------
+
+#define PATCH_KEXT_LOADING						1	// Set to 1 by default.
+
+#define LOAD_EXECUTABLE_TARGET_UINT64			0x487074db8548c389ULL // 89c34885db747048 revered in HexEdit
+#define LOAD_EXECUTABLE_PATCH_UINT64			0x4812ebdb8548c389ULL
+
+#define PATCH_XCPI_SCOPE_MSRS					0	// Set to 0 by default.
+
+#define XCPM_SCOPE_MSRS_TARGET_UINT64			0x00000002000000E2ULL
+
+#define PATCH_LOAD_EXTRA_KEXTS					0	// Set to 0 by default.
+
+#define READ_STARTUP_EXTENSIONS_TARGET_UINT64	0xe805eb00000025e8ULL // e825000000eb05e8 revered in HexEdit
+#define READ_STARTUP_EXTENSIONS_PATCH_UINT64	0xe8909000000025e8ULL
+
+
 //-------------------------------------------------------------- PLATFORM.C ----------------------------------------------------------------
 
 

From 8bc693b690bfaa04bb310dbe0d2c72d1a31fbca5 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 27 Oct 2015 04:59:55 +0100
Subject: [PATCH 529/623] Moving RecoveryHD code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Cleanups/command/white space only changes.
– SIP Installer support.
– Missing Broadwell and Skylake code.
– Kernel patches for PM and kextloading added.
---
 i386/boot2/boot.c                     |  72 +++---
 i386/boot2/boot.h                     |   2 +-
 i386/boot2/bootlogo.c                 |   2 +-
 i386/libsaio/bootstruct.h             |   3 +-
 i386/libsaio/cpu.c                    |   2 +-
 i386/libsaio/cpu/Intel/dynamic_data.h |  32 ++-
 i386/libsaio/cpu/essentials.h         |   8 +
 i386/libsaio/efi.c                    |   5 +
 i386/libsaio/load.c                   | 345 +++++++++++++++++++-------
 i386/libsaio/platform.c               |  27 +-
 i386/libsaio/platform.h               |  13 +-
 11 files changed, 356 insertions(+), 155 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 6ae02b2..8d1603c 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -166,7 +166,7 @@ void boot(int biosdev)
 
 	bool	haveCABootPlist	= false;
 	bool	quietBootMode	= true;
-	bool	bootRecoveryHD	= false;
+	bool	kernelSpecified	= false;
 
 	void *fileLoadBuffer = (void *)kLoadAddr;
 
@@ -190,37 +190,7 @@ void boot(int biosdev)
 	long flags, cachetime;
 #endif
 
-#if DEBUG_STATE_ENABLED
-	extern  void setVideoMode(int mode);
-	setVideoMode(VGA_TEXT_MODE);
-#endif
-
-#if RECOVERY_HD_SUPPORT
-	#if DEBUG_BOOT
-		printf("RecoveryHD boot support enabled\n");
-	#endif
-
-	while (readKeyboardStatus())
-	{
-		int key = (bgetc() & 0xff);
-		#if DEBUG_BOOT
-			printf("key: %d\n", key);
-		#endif
-		if ((key |= 0x20) == 'r')
-		{
-			bootRecoveryHD = true;
-			#if DEBUG_BOOT
-				printf("RecoveryHD boot support is active\n");
-			#endif
-		}
-	}
-#if DEBUG_BOOT
-	printf("bootRecoveryHD: %s\n", bootRecoveryHD ? "True" : "False");
-#endif
-	initPlatform(biosdev, true);
-#else
-	initPlatform(biosdev, false);
-#endif
+	initPlatform(biosdev);
 
 #if DEBUG_BOOT
 	/*
@@ -235,7 +205,7 @@ void boot(int biosdev)
 #endif
 
 #if (DEBUG_STATE_ENABLED == 0)
-	showBootLogo(bootRecoveryHD);
+	showBootLogo();
 #endif
 
 #if (LOAD_MODEL_SPECIFIC_EFI_DATA == 0 && BLACKMODE == 0)
@@ -391,6 +361,7 @@ void boot(int biosdev)
 	else
 	{
 		_BOOT_DEBUG_DUMP("No com.apple.Boot.plist found.\n");
+		_BOOT_DEBUG_SLEEP(5);
 	}
 
 	// Was a target drive (per UUID) specified in com.apple.Boot.plist?
@@ -475,10 +446,18 @@ void boot(int biosdev)
 				_BOOT_DEBUG_DUMP("length: %d, val: %s\n", length, val);
 #if RECOVERY_HD_SUPPORT
 				// XXX: Required for booting from the Recovery HD.
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
+				// FIXME: This static check sucks!
+				if (strncmp(val, "\\com.apple.recovery.boot\\prelinkedkernel", length) == 0)
+				{
+					val = "/com.apple.recovery.boot/prelinkedkernel";
+				}
+#else
 				if (strncmp(val, "\\com.apple.recovery.boot\\kernelcache", length) == 0)
 				{
 					val = "/com.apple.recovery.boot/kernelcache";
 				}
+#endif // #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
 #endif
 				if (length && GetFileInfo(NULL, val, &flags, &cachetime) == 0)
 				{
@@ -493,6 +472,16 @@ void boot(int biosdev)
 			}
 #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
 		}
+		else
+		{
+			if (getValueForKey(kKernelNameKey, &val, &length, &bootInfo->bootConfig))
+			{
+				_BOOT_DEBUG_DUMP("Kernel key located in com.apple.Boot.plist\n");
+				_BOOT_DEBUG_DUMP("length: %d, val: %s\n", length, val);
+				strcpy(bootFile, val);
+				kernelSpecified = true;
+			}
+		}
 #endif // #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE)
 
 #endif
@@ -541,16 +530,19 @@ void boot(int biosdev)
 		{
 			_BOOT_DEBUG_DUMP("Warning: kernelcache will be ignored!\n");
 
-			/* True when 'Kernel Cache' is set in com.apple.Boot.plist
+			// True when 'Kernel Cache' is set in com.apple.Boot.plist
 			if (gPlatform.KernelCacheSpecified == true)
 			{
 				sprintf(bootFile, "%s", bootInfo->bootFile);
-			} */
+			}
 #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
-//			else
-//			{
-				sprintf(bootFile, "/System/Library/Kernels/%s", bootInfo->bootFile);
-//			}
+			else
+			{
+				if (!kernelSpecified)
+				{
+					sprintf(bootFile, "/System/Library/Kernels/%s", bootInfo->bootFile);
+				}
+			}
 #endif
 		}
 		else
@@ -778,7 +770,7 @@ void boot(int biosdev)
 				// _BOOT_DEBUG_SLEEP(6);
 				
 				// Switch to graphics mode and show the (white) Apple logo on a black/gray background.
-				showBootLogo(bootRecoveryHD);
+				showBootLogo();
 			}
 
 			_BOOT_DEBUG_DUMP("execKernel-8\n");
diff --git a/i386/boot2/boot.h b/i386/boot2/boot.h
index a09b6da..c7604bc 100755
--- a/i386/boot2/boot.h
+++ b/i386/boot2/boot.h
@@ -104,7 +104,7 @@ extern char bootPrompt[];
  * bootlogo.c
  */
 
-extern void showBootLogo(bool aBootRecoveryHDFlag);
+extern void showBootLogo();
 
 /*
  * fake_efi.c
diff --git a/i386/boot2/bootlogo.c b/i386/boot2/bootlogo.c
index a2ec585..1d837f3 100755
--- a/i386/boot2/bootlogo.c
+++ b/i386/boot2/bootlogo.c
@@ -144,7 +144,7 @@ int convertImage(unsigned short width, unsigned short height, const unsigned cha
 
 //==============================================================================
 
-void showBootLogo(bool aBootRecoveryHDFlag)
+void showBootLogo()
 {
 	setVideoMode(GRAPHICS_MODE);
 
diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index fcea25c..d8f5dd0 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -97,7 +97,8 @@
 			CSR_ALLOW_KERNEL_DEBUGGER | \
 			CSR_ALLOW_APPLE_INTERNAL | \
 			CSR_ALLOW_UNRESTRICTED_DTRACE | \
-			CSR_ALLOW_UNRESTRICTED_NVRAM)
+			CSR_ALLOW_UNRESTRICTED_NVRAM | \
+			CSR_ALLOW_DEVICE_CONFIGURATION)
 #endif
 
 // Snapshot constants with supported version / revision info.
diff --git a/i386/libsaio/cpu.c b/i386/libsaio/cpu.c
index 219374f..2f76821 100644
--- a/i386/libsaio/cpu.c
+++ b/i386/libsaio/cpu.c
@@ -203,7 +203,7 @@ void checkFlexRatioMSR(void)
 	if (msr & bit(16)) // Flex ratio enabled?
 	{
 		uint8_t flexRatio = ((msr >> 8) & 0xff);
-		
+
 		// Sanity checks.
 		if (flexRatio < gPlatform.CPU.MinBusRatio || flexRatio > gPlatform.CPU.MaxBusRatio)
 		{
diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index af6309e..d3ad72c 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -369,6 +369,12 @@ void initCPUStruct(void)
 					hiBit = 31;
 					break;
 
+				case CPU_MODEL_SKYLAKE:
+				case CPU_MODEL_SKYLAKE_H_S:
+					CoreBridgeType = SKYLAKE;
+					hiBit = 31;
+					break;
+
 				case CPU_MODEL_NEHALEM:
 				case CPU_MODEL_NEHALEM_EX:
 				case CPU_MODEL_FIELDS:
@@ -420,7 +426,7 @@ void initCPUStruct(void)
 					requestMaxTurbo(maxBusRatio);
 				}
 
-				if (CoreBridgeType) // (SandyBridge || IvyBridge || Haswell || Broadwell)
+				if (CoreBridgeType) // (SandyBridge || IvyBridge || Haswell || Broadwell || SkyLake)
 				{
 					// gPlatform.CPU.Type += CoreBridgeType;
 
@@ -428,25 +434,17 @@ void initCPUStruct(void)
 					gPlatform.CPU.TDP = getTDP();
 #endif
 					qpiSpeed = 0; // No QPI but DMI for Sandy Bridge and greater processors.
-					
-					// Disable C1/C3 state auto demotion i.e. it won't change C3/C6/C7 requests to C1/C3.
-					// wrmsr64(MSR_PKG_CST_CONFIG_CONTROL, 0x1E000003ULL);
-
-					// Disable EIST Hardware coordination (letting AICPUPM.kext handle it).
-					// msr = rdmsr64(MSR_MISC_PWR_MGMT);
-					// wrmsr64(MSR_MISC_PWR_MGMT, (msr | 1));
 
-					// Disable I/O MWAIT Redirection.
-					// msr = rdmsr64(MSR_PKG_CST_CONFIG_CONTROL);
-					// wrmsr64(MSR_MISC_PWR_MGMT, (msr & 0xFFFEFBFF));
+					// Check bit-15 of MSR 0xE2 to see if it is locked.
+					msr = rdmsr64(MSR_PKG_CST_CONFIG_CONTROL);
 
-					// wrmsr64(MSR_PKG_POWER_LIMIT, 0x4283E800DD8230);
-					// wrmsr64(MSR_PP0_CURRENT_CONFIG, 0x40101414000002F8);
-					// wrmsr64(MSR_PP0_POWER_LIMIT, 0);
-					// wrmsr64(MSR_PP1_POWER_LIMIT, 0);
-					
-					// wrmsr64(MSR_TURBO_RATIO_LIMIT, 0x25252525);
+#if PATCH_XCPI_SCOPE_MSRS
+					gPlatform.CPU.CstConfigMsrLocked = (msr & 0x8000);
+#endif
 
+#if DEBUG_CPU
+					printf("MSR_PKG_CST_CONFIG_CONTROL(locked): 0x%x\n", msr);
+#endif
 					checkFlexRatioMSR();
 				}
 #endif // #if INTEL_CORE_TECHNOLOGY
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 75ff4c5..72653f2 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -183,12 +183,20 @@
 #define CPU_MODEL_HASWELL_ULT		0x45
 #define CPU_MODEL_CRYSTALWELL		0x46
 
+#define CPU_MODEL_BROADWELL			0x3D
+#define CPU_MODEL_BROADWELL_ULX		0x3D
 #define CPU_MODEL_BROADWELL_ULT		0x3D
+#define CPU_MODEL_BROADWELL_H		0x47
+#define CPU_MODEL_BRYSTALWELL		0x4C
+
+#define CPU_MODEL_SKYLAKE			0x4E
+#define CPU_MODEL_SKYLAKE_H_S		0x5E
 
 #define DALES_BRIDGE	1
 #define SANDY_BRIDGE	2
 #define IVY_BRIDGE		4
 #define HASWELL			8
 #define BROADWELL		16
+#define SKYLAKE			32
 
 #endif /* !__LIBSAIO_CPU_ESSENTIALS_H */
diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 59f0c80..fc34646 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -131,6 +131,7 @@ void initEFITree(void)
 	{
 		_EFI_DEBUG_DUMP("Adding FSBFrequency property (%dMHz)\n", (gPlatform.CPU.FSBFrequency / 1000));
 		DT__AddProperty(platformNode, "FSBFrequency", sizeof(uint64_t), &gPlatform.CPU.FSBFrequency);
+		// DT__AddProperty(platformNode, "ARTFrequency", sizeof(uint64_t), &gPlatform.CPU.FSBFrequency);
 	}
 
 	Node * chosenNode = DT__AddChild(gPlatform.DT.RootNode, "chosen");
@@ -252,6 +253,10 @@ void initEFITree(void)
 																	// jne		0x17e55		(next)
 
 		DT__AddProperty(chosenNode, "random-seed", sizeof(seedBuffer), (EFI_UINT8*) &seedBuffer);
+		
+		DT__AddProperty(chosenNode, "booter-name", 12, "bootbase.efi");
+		DT__AddProperty(chosenNode, "booter-version", 11, "version:307");
+		DT__AddProperty(chosenNode, "booter-build-time", 28, "Fri Sep  4 15:34:00 PDT 2015");
 	}
 #endif
 
diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index e2fe7dd..6f42695 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -45,19 +45,22 @@
 	#define LC_MAIN (0x28|LC_REQ_DYLD) /* replacement for LC_UNIXTHREAD */
 #endif
 
-#define NVRAM_GUID_UINT64				0x3530454445314434
-#define OPTIONS_STRING_UINT64			0x736e6f6974706f2f
-
 // Load MKext(s) or separate kexts (default behaviour / behavior).
 bool gLoadKernelDrivers = true;
 
 // Private functions.
-static long initKernelVersionInfo(unsigned long cmdbase, long listSize, unsigned int textSegmentVMAddress);
+#if (PATCH_KEXT_LOADING && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+	static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress);
+#endif
+
+static long initKernelVersionInfo(unsigned long cmdbase, long listSize, unsigned int textSegmentAddress);
 static long DecodeSegment(long cmdBase, unsigned int*load_addr, unsigned int *load_size);
 static long DecodeUnixThread(long cmdBase, unsigned int *entry);
 
+#define ADD_SYMTAB	1
+
 #if ADD_SYMTAB
-static long DecodeSymbolTable(long cmdBase);
+	static long DecodeSymbolTable(long cmdBase);
 #endif
 
 static unsigned long gBinaryAddress;
@@ -127,23 +130,24 @@ long ThinFatFile(void **binary, unsigned long *length)
 
 long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 {
-	long ret								= -1;
-
-	unsigned int vmaddr						= ~0;
-	unsigned int vmend						= 0;
-	unsigned int entry						= 0;
-	unsigned int load_addr					= 0;
-	unsigned int load_size					= 0;
-	unsigned int textSegmentVMAddress		= 0;
-
-
-	unsigned long ncmds						= 0;
-	unsigned long cmdBase					= 0;
-	unsigned long cmd						= 0;
-	unsigned long cmdsize					= 0;
-	unsigned long cmdstart					= 0;
-	unsigned long cnt						= 0;
-	unsigned long listSize					= 0;
+	long ret						= -1;
+	long sectionNumber				= 0;
+
+	unsigned int vmaddr				= ~0;
+	unsigned int vmend				= 0;
+	unsigned int entry				= 0;
+	unsigned int load_addr			= 0;
+	unsigned int load_size			= 0;
+	unsigned int textSegmentAddress	= 0;
+	unsigned int vldSegmentAddress	= 0;
+
+	unsigned long ncmds				= 0;
+	unsigned long cmdBase			= 0;
+	unsigned long cmd				= 0;
+	unsigned long cmdsize			= 0;
+	unsigned long cmdstart			= 0;
+	unsigned long cnt				= 0;
+	unsigned long listSize			= 0;
 
 	gBinaryAddress = (unsigned long)binary;
 
@@ -209,10 +213,16 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 		{
 			case LC_SEGMENT:
 			case LC_SEGMENT_64:
-				// Returns 1 for __TEXT segment.
-				if (DecodeSegment(cmdBase, &load_addr, &load_size))
+				sectionNumber = DecodeSegment(cmdBase, &load_addr, &load_size);
+
+				if (sectionNumber == 1) // __TEXT,__text
+				{
+					textSegmentAddress = cmdBase;
+					ret = 0;
+				}
+				else if (sectionNumber == 25) // __KLD,__text
 				{
-					textSegmentVMAddress = load_addr;
+					vldSegmentAddress = cmdBase;
 					ret = 0;
 				}
 
@@ -223,9 +233,12 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 				}
 
 				break;
-				
+
 			case LC_SYMTAB:
-				initKernelVersionInfo(cmdBase, listSize, textSegmentVMAddress);
+				initKernelVersionInfo(cmdBase, listSize, textSegmentAddress);
+#if (PATCH_KEXT_LOADING && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+				patchLoadExecutable(cmdBase, listSize, textSegmentAddress, vldSegmentAddress);
+#endif
 				break;
 
 			case LC_MAIN:	/* Mountain Lion's replacement for LC_UNIXTHREAD */
@@ -274,6 +287,163 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 	return ret;
 }
 
+#if (PATCH_KEXT_LOADING && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+
+//==============================================================================
+// Private function. Called from DecodeMachO()
+
+static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress)
+{
+	// printf("patchLoadExecutable() called\n");
+	// sleep(1);
+
+	char * symbolName = NULL;
+
+	// Skip the first 3000 symbols, to make it located our target quicker.
+	int skippedSymbolCount	= 0; // (3000 * listSize);
+
+	long symbolNumber		= 0;
+
+	struct symtab_command * symtab = (struct symtab_command *)cmdBase;
+	struct segment_command_64 * textSegment = (struct segment_command_64 *)textSegmentAddress;
+	// struct segment_command_64 * vldSegment = (struct segment_command_64 *)vldSegmentAddress;
+
+	void * stringTable = (void *)(gBinaryAddress + symtab->stroff);
+
+	uint32_t pointer = (gBinaryAddress + symtab->symoff + skippedSymbolCount);
+
+	while (symbolNumber < symtab->nsyms)
+	{
+		struct nlist_64 * nl = (struct nlist_64 *)pointer;
+
+#if PATCH_KEXT_LOADING
+		if ((nl->n_sect == 1 /* __TEXT,__text */) && nl->n_value)
+		{
+			symbolName = (char *)stringTable + nl->n_un.n_strx;
+
+			if (strcmp(symbolName, "__ZN6OSKext14loadExecutableEv") == 0)
+			{
+				int64_t offset = (nl->n_value - textSegment->vmaddr);
+				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				uint64_t endAddress = (startAddress + 0x200);
+
+				/* printf("__ZN6OSKext14loadExecutableEv found!\n");
+ 				printf("offset..............: 0x%llx\n", offset);
+				printf("textSegment->vmaddr.: 0x%llx\n", textSegment->vmaddr);
+				printf("textSegment->fileoff: 0x%llx\n", textSegment->fileoff);
+				printf("startAddress........: 0x%llx\n", startAddress);
+				printf("endAddress..........: 0x%llx\n", endAddress);
+				sleep(5); */
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					if (*(uint64_t *)p == LOAD_EXECUTABLE_TARGET_UINT64)
+					{
+						/* printf("Found @ 0x%llx ", (uint64_t)p - startAddress);
+						printf("Symbol-number: %ld\n", (symbolNumber + (skippedSymbolCount / listSize) + 1));
+						sleep(3); */
+
+						*(uint64_t *)p = LOAD_EXECUTABLE_PATCH_UINT64;
+						p = (unsigned char *)endAddress;
+					}
+				}
+			}
+		}
+#endif
+
+#if PATCH_XCPI_SCOPE_MSRS
+	#if PATCH_KEXT_LOADING
+		else
+	#endif
+		if (((nl->n_sect == 8 /* __DATA,__data */) && nl->n_value) && gPlatform.CPU.CstConfigMsrLocked)
+		{
+			symbolName = (char *)stringTable + nl->n_un.n_strx;
+		
+			if (strcmp(symbolName, "_xcpm_core_scope_msrs") == 0)
+			{
+				int64_t offset = (nl->n_value - textSegment->vmaddr);
+				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				uint64_t endAddress = (startAddress + 0x3f);
+
+				/* printf("_xcpm_core_scope_msrs found!\n");
+				printf("offset..............: 0x%llx\n", offset);
+				printf("textSegment->vmaddr.: 0x%llx\n", textSegment->vmaddr);
+				printf("textSegment->fileoff: 0x%llx\n", textSegment->fileoff);
+				printf("startAddress........: 0x%llx\n", startAddress);
+				printf("endAddress..........: 0x%llx\n", endAddress);
+				sleep(5); */
+
+				unsigned char * p = (unsigned char *)startAddress;
+				
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					// Note: We don't need this check.
+					if (*(uint64_t *)p == XCPM_SCOPE_MSRS_TARGET_UINT64)
+					{
+						/* printf("Found @ 0x%llx ", (uint64_t)p - startAddress);
+						printf("Symbol-number: %ld\n", (symbolNumber + (skippedSymbolCount / listSize) + 1));
+						sleep(3); */
+						
+						*(uint64_t *)p = 0x0000000000000000ULL;
+						p += 0x30;
+						*(uint64_t *)p = 0x0000000000000000ULL;
+						p += 0x30;
+						*(uint64_t *)p = 0x0000000000000000ULL;
+						p = (unsigned char *)endAddress;
+					}
+				}
+			}
+		}
+#endif
+
+#if PATCH_LOAD_EXTRA_KEXTS
+	#if (PATCH_KEXT_LOADING || PATCH_XCPI_SCOPE_MSRS)
+		else
+	#endif
+		if ((nl->n_sect == 25 / * __KLD,__text * /) && nl->n_value)
+		{
+			symbolName = (char *)stringTable + nl->n_un.n_strx;
+			
+			if (strcmp(symbolName, "__ZN12KLDBootstrap21readStartupExtensionsEv") == 0)
+			{
+				int64_t offset = (nl->n_value - textSegment->vmaddr);
+				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				uint64_t endAddress = (startAddress + 0x3f);
+				
+				/* printf("__ZN12KLDBootstrap21readStartupExtensionsEv found!\n");
+				printf("offset..............: 0x%llx\n", offset);
+				printf("vldSegment->vmaddr..: 0x%llx\n", vldSegment->vmaddr);
+				printf("vldSegment->fileoff.: 0x%llx\n", vldSegment->fileoff);
+				printf("startAddress........: 0x%llx\n", startAddress);
+				printf("endAddress..........: 0x%llx\n", endAddress);
+				sleep(5); */
+ 
+				unsigned char * p = (unsigned char *)startAddress;
+				
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					if (*(uint64_t *)p == READ_STARTUP_EXTENSIONS_TARGET_UINT64)
+					{
+						/* printf("Found @ 0x%llx ", (uint64_t)p - startAddress);
+						printf("Symbol-number: %ld\n", (symbolNumber + (skippedSymbolCount / listSize) + 1));
+						sleep(3); */
+						
+						*(uint64_t *)p = READ_STARTUP_EXTENSIONS_PATCH_UINT64;
+						p = (unsigned char *)endAddress;
+					}
+				}
+			}
+		}
+#endif
+		symbolNumber++;
+		pointer += listSize; // Point to next symbol.
+	}
+
+	return 0;
+}
+#endif
 
 //==============================================================================
 // Private function. Called from DecodeMachO()
@@ -311,41 +481,40 @@ static long initKernelVersionInfo(unsigned long cmdBase, long listSize, unsigned
 
 	uint32_t pointer = gBinaryAddress + symtab->symoff + ((symtab->nsyms - 1) * listSize);
 
+#if ((MAKE_TARGET_OS & SNOW_LEOPARD) == SNOW_LEOPARD)
 	if (gPlatform.ArchCPUType == CPU_TYPE_X86_64)
 	{
+#endif
 		struct nlist_64 * nl = (struct nlist_64 *)pointer;
 	
 		while (symbolNumber > 0)
 		{
 			nl = (struct nlist_64 *)pointer;
 			
-			if (nl->n_sect && nl->n_value)
+			if ((nl->n_sect == 2 /* __TEXT,__const */) && nl->n_value)
 			{
 				symbolName = (char *)stringTable + nl->n_un.n_strx;
 				symbolLength = strlen(symbolName);
 				symbolOffset = (nl->n_value - textSegmentVMAddress);
 				
-				if (symbolLength)
+				if (symbolLength && (strcmp(symbolName, targetSymbols[index]) == 0))
 				{
-					if (strcmp(symbolName, targetSymbols[index]) == 0)
+					switch(index)
 					{
-						switch(index)
-						{
-							case 0:
-								gPlatform.KERNEL.versionRevision = (uint8_t)loadBuffer[symbolOffset];
-								index++;
-								break;
-								
-							case 1:
-								gPlatform.KERNEL.versionMinor = (uint8_t)loadBuffer[symbolOffset];
-								index++;
-								break;
-								
-							case 2:
-								gPlatform.KERNEL.versionMajor = (uint8_t)loadBuffer[symbolOffset];
-								symbolNumber = 0;
-								break;
-						}
+						case 0:
+							gPlatform.KERNEL.versionRevision = (uint8_t)loadBuffer[symbolOffset];
+							index++;
+							break;
+							
+						case 1:
+							gPlatform.KERNEL.versionMinor = (uint8_t)loadBuffer[symbolOffset];
+							index++;
+							break;
+							
+						case 2:
+							gPlatform.KERNEL.versionMajor = (uint8_t)loadBuffer[symbolOffset];
+							symbolNumber = 0;
+							break;
 					}
 				}
 			}
@@ -353,6 +522,7 @@ static long initKernelVersionInfo(unsigned long cmdBase, long listSize, unsigned
 			symbolNumber--;
 			pointer -= listSize;
 		}
+#if ((MAKE_TARGET_OS & SNOW_LEOPARD) == SNOW_LEOPARD)
 	}
 	else // 32-bit compatibility code.
 	{
@@ -362,33 +532,30 @@ static long initKernelVersionInfo(unsigned long cmdBase, long listSize, unsigned
 		{
 			nl = (struct nlist *)pointer;
 			
-			if (nl->n_sect && nl->n_value)
+			if ((nl->n_sect == 2 /* __TEXT,__const */) && nl->n_value)
 			{
 				symbolName = (char *)stringTable + nl->n_un.n_strx;
 				symbolLength = strlen(symbolName);
 				symbolOffset = (nl->n_value - textSegmentVMAddress);
 				
-				if (symbolLength)
+				if (symbolLength && (strcmp(symbolName, targetSymbols[index]) == 0))
 				{
-					if (strcmp(symbolName, targetSymbols[index]) == 0)
+					switch(index)
 					{
-						switch(index)
-						{
-							case 0:
-								gPlatform.KERNEL.versionRevision = (uint8_t)loadBuffer[symbolOffset];
-								index++;
-								break;
-								
-							case 1:
-								gPlatform.KERNEL.versionMinor = (uint8_t)loadBuffer[symbolOffset];
-								index++;
-								break;
-								
-							case 2:
-								gPlatform.KERNEL.versionMajor = (uint8_t)loadBuffer[symbolOffset];
-								symbolNumber = 0;
-								break;
-						}
+						case 0:
+							gPlatform.KERNEL.versionRevision = (uint8_t)loadBuffer[symbolOffset];
+							index++;
+							break;
+							
+						case 1:
+							gPlatform.KERNEL.versionMinor = (uint8_t)loadBuffer[symbolOffset];
+							index++;
+							break;
+							
+						case 2:
+							gPlatform.KERNEL.versionMajor = (uint8_t)loadBuffer[symbolOffset];
+							symbolNumber = 0;
+							break;
 					}
 				}
 			}
@@ -397,6 +564,8 @@ static long initKernelVersionInfo(unsigned long cmdBase, long listSize, unsigned
 			pointer -= listSize;
 		}
 	}
+#endif
+
 #if DEBUG
 	printf("gPlatform.KERNEL.versionMmR: %d.%d.%d\n", gPlatform.KERNEL.versionMajor, gPlatform.KERNEL.versionMinor, gPlatform.KERNEL.versionRevision);
 	sleep(5);
@@ -411,32 +580,32 @@ static long initKernelVersionInfo(unsigned long cmdBase, long listSize, unsigned
 
 static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *load_size)
 {
-	char *segname	= NULL;
+	char *segmentName	= NULL;
 
-	long retValue	= 0;
-	long vmsize		= 0;
-	long filesize	= 0;
+	long retValue		= 0;
+	long vmsize			= 0;
+	long filesize		= 0;
 
-	unsigned long vmaddr	= 0;
-	unsigned long fileaddr	= 0;
+	unsigned long vmaddr		= 0;
+	unsigned long fileAddress	= 0;
 
 	if (((long *)cmdBase)[0] == LC_SEGMENT_64)
 	{
 		struct segment_command_64 *segCmd = (struct segment_command_64 *)cmdBase;
-		vmaddr = (segCmd->vmaddr & 0x3fffffff);
-		vmsize = segCmd->vmsize;
-		fileaddr = (gBinaryAddress + segCmd->fileoff);
-		filesize = segCmd->filesize;
-		segname = segCmd->segname;
+		vmaddr			= (segCmd->vmaddr & 0x3fffffff);
+		vmsize			= segCmd->vmsize;
+		fileAddress		= (gBinaryAddress + segCmd->fileoff);
+		filesize		= segCmd->filesize;
+		segmentName		= segCmd->segname;
 	}
 	else
 	{
 		struct segment_command *segCmd = (struct segment_command *)cmdBase;
-		vmaddr = (segCmd->vmaddr & 0x3fffffff);
-		vmsize = segCmd->vmsize;
-		fileaddr = (gBinaryAddress + segCmd->fileoff);
-		filesize = segCmd->filesize;
-		segname = segCmd->segname;
+		vmaddr			= (segCmd->vmaddr & 0x3fffffff);
+		vmsize			= segCmd->vmsize;
+		fileAddress		= (gBinaryAddress + segCmd->fileoff);
+		filesize		= segCmd->filesize;
+		segmentName		= segCmd->segname;
 	}
 	
 	// Pre-flight checks.
@@ -454,7 +623,7 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 		 * __PRELINK_TEXT, __PRELINK_STATE, __PRELINK_INFO versus __PRELINK in 10.5
 		 */
 
-		if (gLoadKernelDrivers && strncmp(segname, "__PRELINK", 9) == 0)
+		if (gLoadKernelDrivers && strncmp(segmentName, "__PRELINK", 9) == 0)
 		{
 #if DEBUG
 			printf("Setting: gLoadKernelDrivers to false.\n");
@@ -463,15 +632,19 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 #endif
 			gLoadKernelDrivers = false;
 		}
-		else if (strncmp(segname, "__TEXT", 6) == 0)
+		else if (strncmp(segmentName, "__TEXT", 6) == 0)
 		{
 			retValue = 1;
 		}
+		else if (strncmp(segmentName, "__KLD", 5) == 0)
+		{
+			retValue = 25;
+		}
 
 		// Copy from file load area.
 		if (filesize > 0)
 		{
-			bcopy((char *)fileaddr, (char *)vmaddr, vmsize > filesize ? filesize : vmsize);
+			bcopy((char *)fileAddress, (char *)vmaddr, vmsize > filesize ? filesize : vmsize);
 		}
 
 		// Zero space at the end of the segment.
diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 3ecf4ce..a01bceb 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -125,12 +125,11 @@ void enableHPET(void)
 //==============================================================================
 // Public function. Called from boot/common_boot only.
 
-void initPlatform(int biosDevice, bool bootRecoveryHD)
+void initPlatform(int biosDevice)
 {
 	memset(&gPlatform, 0, sizeof(gPlatform));
 
 	gPlatform.BootMode = kBootModeQuiet; // no longer defaults to 0 aka kBootModeNormal
-	gPlatform.BootRecoveryHD = bootRecoveryHD;
 
 	// Copied from cpu/dynamic_data.h to make printf work this early on.
 #if DEBUG_STATE_ENABLED
@@ -284,11 +283,29 @@ void initPlatform(int biosDevice, bool bootRecoveryHD)
 	_PLATFORM_DEBUG_SLEEP(5);
 #endif
 
+	initKernelBootConfig();
+
 #if RECOVERY_HD_SUPPORT
-	_PLATFORM_DEBUG_DUMP("gPlatform.BootRecoveryHD: %s\n", gPlatform.BootRecoveryHD ? "True" : "False");
-#endif
+	int version = 1;
 
-	initKernelBootConfig();
+	printf("\nRecovery HD boot support enabled\n");
+	printf("Recovery HD boot support is: enabled in version %d!\n", version);
+
+	int key = (bgetc() & 0xff);
+	printf("key: %d\n", key);
+
+	if ( ((key |= 0x20) == 0x33) || ((key |= 0x20) == 114) )
+	{
+		gPlatform.BootRecoveryHD = true;
+		gPlatform.BootMode = kBootModeNormal;
+	}
+
+	printf("gPlatform.BootRecoveryHD: %s\n", gPlatform.BootRecoveryHD ? "True" : "False");
+	sleep(1);
+#else
+	gPlatform.BootMode = kBootModeNormal;
+	gPlatform.BootRecoveryHD = false;
+#endif
 
 #if (LOAD_MODEL_SPECIFIC_EFI_DATA || BLACKMODE)
 	/*
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 22d99d1..6ecfbfb 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -75,8 +75,11 @@
 #define IMAC_142				(IMAC | ( 7 << 15))
 #define IMAC_143				(IMAC | ( 8 << 15))
 #define IMAC_144				(IMAC | ( 9 << 15))
-#define IMAC_152				(IMAC | (10 << 15))
-#define IMAC_151				 IMAC						// Defaults to iMac15,1
+#define IMAC_151				(IMAC | (10 << 15))
+#define IMAC_152				(IMAC | (11 << 15))
+#define IMAC_161				(IMAC | (12 << 15))
+#define IMAC_162				(IMAC | (13 << 15))
+#define IMAC_171				 IMAC						// Defaults to iMac17,1
 
 #define MACBOOK_41				(MACBOOK | ( 1 << 15))
 #define MACBOOK_81				(MACBOOK | ( 2 << 15))		// Defaults to MacBook8,1
@@ -252,6 +255,10 @@ typedef struct _PlatformInfo_t
 	struct CPU
 	{
 		bool		Mobile;						// Set to true (in cpu/dynamic_data.h) for Mobile CPU's.
+
+#if PATCH_XCPI_SCOPE_MSRS
+		bool		CstConfigMsrLocked;			// Initialised in cpu/dynamic_data.h and used in load.c
+#endif
 		uint16_t	Type;						// CPU type ('cpu-type') used in the SMBIOS patcher.
 		uint32_t	Features;					// CPU Features like MMX, SSE2, VT, MobileCPU
 		uint32_t	Vendor;						// Vendor
@@ -383,7 +390,7 @@ extern void initCPUStruct(void);
 /* platform.c */
 extern PlatformInfo_t	gPlatform;
 
-extern void initPlatform(int biosDevice, bool bootRecoveryHD);
+extern void initPlatform(int biosDevice);
 
 extern cpu_type_t getArchCPUType(void);
 

From fd3f8e4574267cef579bdfafaa52037dcc6b6bb8 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 27 Oct 2015 05:22:54 +0100
Subject: [PATCH 530/623] Whitespace only change.

---
 i386/libsaio/load.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 6f42695..903ff10 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -402,7 +402,7 @@ static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned l
 	#if (PATCH_KEXT_LOADING || PATCH_XCPI_SCOPE_MSRS)
 		else
 	#endif
-		if ((nl->n_sect == 25 / * __KLD,__text * /) && nl->n_value)
+		if ((nl->n_sect == 25 /* __KLD,__text */) && nl->n_value)
 		{
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
 			

From 0ef1ff7600399d8c1f7b5d6817f6600ff1f7f1aa Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 2 Nov 2015 14:27:34 +0100
Subject: [PATCH 531/623] Preparations for ART support.

---
 i386/libsaio/efi.c      | 6 +++++-
 i386/libsaio/platform.h | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index fc34646..04bb88a 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -131,7 +131,11 @@ void initEFITree(void)
 	{
 		_EFI_DEBUG_DUMP("Adding FSBFrequency property (%dMHz)\n", (gPlatform.CPU.FSBFrequency / 1000));
 		DT__AddProperty(platformNode, "FSBFrequency", sizeof(uint64_t), &gPlatform.CPU.FSBFrequency);
-		// DT__AddProperty(platformNode, "ARTFrequency", sizeof(uint64_t), &gPlatform.CPU.FSBFrequency);
+	}
+
+	if (gPlatform.XHCI.ARTFrequency)
+	{
+		DT__AddProperty(platformNode, "ARTFrequency", sizeof(uint64_t), &gPlatform.XHCI.ARTFrequency);
 	}
 
 	Node * chosenNode = DT__AddChild(gPlatform.DT.RootNode, "chosen");
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 6ecfbfb..e563a8e 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -379,6 +379,11 @@ typedef struct _PlatformInfo_t
 		 } DMI; */
 	} SMBIOS;
 	
+	struct XHCI
+	{
+		uint64_t ARTFrequency;
+	} XHCI;
+	
 } PlatformInfo_t;
 
 

From e9e33081bc633f5e0cd660e4ab08e9936a710cd8 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 2 Nov 2015 14:28:47 +0100
Subject: [PATCH 532/623] Add selective SSDT table drop support.

---
 i386/libsaio/acpi/patcher.h | 56 +++++++++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 11 deletions(-)

diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 8a402fb..9f4ae0d 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -290,9 +290,9 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 	{
 		// Yes. Get the GNVS address.
 		unsigned int factoryDSDT_GNVS_Address = (*(uint32_t *)(opRegFactoryDSDTAddress + 8));
-
-		_ACPI_DEBUG_DUMP("GNVS address (0x%x) found @: 0x%x\n", factoryDSDT_GNVS_Address, opRegFactoryDSDTAddress);
-
+#if (DEBUG_ACPI || DUMP_OPREGION_GNVS_ADDRESS)
+		printf("GNVS address (0x%x) found @: 0x%x\n", factoryDSDT_GNVS_Address, opRegFactoryDSDTAddress);
+#endif
 		// Now try to locate the OperationRegion (GNVS, SystemMemory, 0xNNNNNNNN, 0xNNNN) in the patched DSDT.
 		unsigned int opRegPatchedDSDTAddress = search64bitPattern(patchedFADT->DSDT + sizeof(ACPI_DSDT), 2000, OP_REGION_GNVS_ADDRESS_LE);
 
@@ -300,9 +300,9 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 		{
 			// Yes. Get the GNVS address.
 			unsigned int patchedDSDT_GNVS_Address = (*(uint32_t *)(opRegPatchedDSDTAddress + 8));
-
-			_ACPI_DEBUG_DUMP("GNVS address (0x%x) found @: 0x%08x\n", patchedDSDT_GNVS_Address, opRegPatchedDSDTAddress);
-
+#if (DEBUG_ACPI || DUMP_OPREGION_GNVS_ADDRESS)
+			printf("GNVS address (0x%x) found @: 0x%08x\n", patchedDSDT_GNVS_Address, opRegPatchedDSDTAddress);
+#endif
 			// Are both GNVS address values the same?
 			if (patchedDSDT_GNVS_Address != factoryDSDT_GNVS_Address)
 			{
@@ -314,8 +314,9 @@ bool patchFACPTable(ENTRIES * xsdtEntries, int tableIndex, int dropOffset)
 				_ACPI_DEBUG_DUMP("Done.\n");
 			}
 		}
-
-		_ACPI_DEBUG_SLEEP(1);
+#if (DEBUG_ACPI || DUMP_OPREGION_GNVS_ADDRESS)
+		sleep(1);
+#endif
 	}
 #endif // VERIFY_OPREGION_GNVS_ADDRESS
 		
@@ -410,6 +411,10 @@ void setupACPI(void)
 
 	_ACPI_DEBUG_DUMP("\n");
 
+#if DROP_SELECTED_SSDT_TABLE
+	const char * oemTableIdTargets[] = OEM_TABLE_ID_TARGETS;
+#endif
+
 	int cti = 0; // CustomTableIndex
 
 	for (; customTables[cti].table; cti++)
@@ -537,9 +542,38 @@ void setupACPI(void)
 					}
 					else if (essentialTables[idx].action & kDropTable)
 					{
-						_ACPI_DEBUG_DUMP("Dropping table: %s (on request)\n", tableName);
-						
-						dropOffset++;
+#if DROP_SELECTED_SSDT_TABLE
+						short tid = 0;
+
+						if (tableSignature == SSDT_TABLE_SIGNATURE)
+						{
+							ACPI_SSDT * currentTable = (ACPI_SSDT *)table;
+
+							_ACPI_DEBUG_DUMP("Checking SSDT(%s)\n", currentTable->OEMTableId);
+							
+							do
+							{
+								if (strncmp(currentTable->OEMTableId, oemTableIdTargets[tid], strlen(currentTable->OEMTableId)) == 0)
+								{
+									_ACPI_DEBUG_DUMP("Dropping table: %s (on request)\n", tableName);
+
+									dropOffset++;
+
+									break;
+								}
+
+								tid++;
+							} while (oemTableIdTargets[tid] != 0);
+						}
+						else
+						{
+#endif
+							_ACPI_DEBUG_DUMP("Dropping table: %s (on request)\n", tableName);
+
+							dropOffset++;
+#if DROP_SELECTED_SSDT_TABLE
+						}
+#endif
 					}
 				}
 

From 5f09555201c8c9fb2cc3479470af151d1de39a71 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 2 Nov 2015 14:29:05 +0100
Subject: [PATCH 533/623] White space only change.

---
 i386/libsaio/sys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/sys.c b/i386/libsaio/sys.c
index 4cc4a40..a086505 100755
--- a/i386/libsaio/sys.c
+++ b/i386/libsaio/sys.c
@@ -467,7 +467,7 @@ int open(const char * path, int flags)
 				// Load entire file into memory. Unnecessary open() calls must be avoided.
 				gFSLoadAddress = io->i_buf;
 				io->i_filesize = bvr->fs_loadfile(bvr, (char *)filePath);
-			
+
 				if (io->i_filesize > 0)
 				{
 					return fdesc;
@@ -665,7 +665,7 @@ int closedir(struct dirstuff * dirp)
 
 //==============================================================================
 
-int readdir(struct dirstuff * dirp, const char ** name, long * flags,long * time)
+int readdir(struct dirstuff * dirp, const char ** name, long * flags, long * time)
 {
 	return dirp->dir_bvr->fs_getdirentry(dirp->dir_bvr, 
 										 /* dirPath */   dirp->dir_path,

From 62d46b0856f9af69c197f98d6bdd6301a01688a3 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 2 Nov 2015 14:29:31 +0100
Subject: [PATCH 534/623] Adding some new model data.

---
 i386/libsaio/smbios/model_data.h | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 92823c8..b01388f 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -85,12 +85,35 @@
 		#define SMB_PRODUCT_NAME	"iMac15,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FA842E06C61E91C5"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '2' }
-	#else // Defaults to iMac 15,1
-		// Intel Core i5-4690 @ 3.50 GHz
+	#elif (TARGET_MODEL == IMAC_151)
+		// Intel Core i5-4690 @ 3.5 GHz
 		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B00.1409291931"
 		#define SMB_PRODUCT_NAME	"iMac15,1"
 		#define SMB_BOARD_PRODUCT	"Mac-42FD25EABCABB274"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '1' }
+	#elif (TARGET_MODEL == IMAC_162)
+		// Intel Core i5-5575R @ 2.8 GHz & Intel Core i5-5675R @ 3.1 GHz
+		// Intel Iris Pro Graphics 6200
+		// (21.5inch Late 2015)
+		#define SMB_BIOS_VERSION	"IM162.88Z.0206.B00.1508281353"
+		#define SMB_PRODUCT_NAME	"iMac16,2"
+		#define SMB_BOARD_PRODUCT	"Mac-FFE5EF870D7BA81A"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '6', ',', '2' }
+	#elif (TARGET_MODEL == IMAC_171)
+		// Intel Core i5-6500 @ 3.2 GHz
+		// AMD Radeon R9 M390
+		// (Retina 5k, 27inch Late 2015)
+		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B00.1509221819"
+		#define SMB_PRODUCT_NAME	"iMac17,1"
+		#define SMB_BOARD_PRODUCT	"Mac-DB15BD556843C820"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '7', ',', '1' }
+	/* #elif (TARGET_MODEL == IMAC_171) // Intel Core i5-6600 @ 3.3 GHz
+		// AMD Radeon R9 M395
+		// (Retina 5k, 27inch Late 2015)
+		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B00.1509221819"
+		#define SMB_PRODUCT_NAME	"iMac17,1"
+		#define SMB_BOARD_PRODUCT	"Mac-B809C3757DA9BB8D"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '7', ',', '1' } */
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From 9e19f730adb7b6977e01b721164d506bfef8b1ec Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@www.vumc.nl>
Date: Mon, 11 Jan 2016 14:15:26 +0100
Subject: [PATCH 535/623] Adding new SMBOemSMCVersion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Missing RAM types added.
– Also reworded some of the comments.
---
 i386/libsaio/smbios/smbios.h | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/i386/libsaio/smbios/smbios.h b/i386/libsaio/smbios/smbios.h
index f7ddf95..3be110f 100755
--- a/i386/libsaio/smbios/smbios.h
+++ b/i386/libsaio/smbios/smbios.h
@@ -481,10 +481,16 @@ static const char * SMBMemoryDeviceTypes[] =
     "DDR SDRAM",    /* 12h  DDR */
     "DDR2 SDRAM",   /* 13h  DDR2 */
     "DDR2 FB-DIMM", /* 14h  DDR2 FB-DIMM */
-    "RAM",			/* 15h  unused */
-    "RAM",			/* 16h  unused */
-    "RAM",			/* 17h  unused */
+    "RESERVED",		/* 15h  Reserved */
+    "RESERVED",		/* 16h  Reserved */
+    "RESERVED",		/* 17h  Reserved */
     "DDR3",			/* 18h  DDR3, chosen in [5776134] */
+    "FBD2",			/* 19h  FBD2 */
+    "DDR4",			/* 1Ah  DDR4 */
+    "LPDDR",		/* 1Bh  LPDDR */
+    "LPDDR2",		/* 1Ch  LPDDR2 */
+    "LPDDR3",		/* 1Dh  LPDDR3 */
+    "LPDDR3",		/* 1Eh  LPDDR5 */
 };
 
 static const int kSMBMemoryDeviceTypeCount = sizeof(SMBMemoryDeviceTypes) / sizeof(SMBMemoryDeviceTypes[0]);
@@ -492,31 +498,40 @@ static const int kSMBMemoryDeviceTypeCount = sizeof(SMBMemoryDeviceTypes) / size
 
 
 //
-// OEM Processor Type (Apple Specific - Type 0x83/131)
+// OEM – Apple Processor Type (type 0x83/131)
 //
 
 struct SMBOemProcessorType
 {
 	SMB_STRUCT_HEADER
-	SMBWord    ProcessorType;
+	SMBWord		ProcessorType;
 } __attribute__((packed)) SMBOemProcessorType;
 
 
 //
-// OEM Processor Bus Speed (Apple Specific - Type 0x84/132)
+// OEM – Apple Processor Bus Speed (type 0x84/132)
 //
 struct SMBOemProcessorBusSpeed
 {
 	SMB_STRUCT_HEADER
-	SMBWord    ProcessorBusSpeed;   // MT/s unit
+	SMBWord		ProcessorBusSpeed;   // MT/s unit
 } __attribute__((packed)) SMBOemProcessorBusSpeed;
 
 
 //
-// OEM Platform Feature (Apple Specific - Type 0x85/133 / AppleSMBIOS-43)
+// OEM – Apple Platform Features (type 0x85/133 / AppleSMBIOS-43)
 //
 struct SMBOemPlatformFeature
 {
 	SMB_STRUCT_HEADER
-	SMBWord    PlatformFeature;
+	SMBWord		PlatformFeature;
 } __attribute__((packed)) SMBOemPlatformFeature;
+
+//
+// OEM – Apple SMC Version (type 0x86/134)
+//
+struct SMBOemSMCVersion
+{
+	SMB_STRUCT_HEADER
+	SMBString	SMCVersion
+} __attribute__((packed)) SMBOemSMCVersion;

From 9546e0c460da21c9bc24c3b7490b9ca811f852c5 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@www.vumc.nl>
Date: Mon, 11 Jan 2016 14:16:21 +0100
Subject: [PATCH 536/623] Comment only change.

---
 i386/libsaio/load.c   | 2 +-
 i386/libsaio/smbios.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 903ff10..7603c43 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -379,7 +379,7 @@ static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned l
 				
 				for (; p <= (unsigned char *)endAddress; p++)
 				{
-					// Note: We don't need this check.
+					// Note: We don't really need this check.
 					if (*(uint64_t *)p == XCPM_SCOPE_MSRS_TARGET_UINT64)
 					{
 						/* printf("Found @ 0x%llx ", (uint64_t)p - startAddress);
diff --git a/i386/libsaio/smbios.c b/i386/libsaio/smbios.c
index fb4be53..0830aa2 100755
--- a/i386/libsaio/smbios.c
+++ b/i386/libsaio/smbios.c
@@ -136,7 +136,7 @@ void setupSMBIOS(void)
 	 */
 	_SMBIOS_DEBUG_DUMP("newEPS->dmi.structureCount: %d\nnewEPS.dmi.tableLength: %d\n", newEPS->dmi.structureCount, newEPS->dmi.tableLength);
 
-    // Take care of possible checksum errors
+    // Calculate checksums
     newEPS->dmi.checksum		= checksum8(&newEPS->dmi, sizeof(newEPS->dmi));
     newEPS->checksum			= checksum8(newEPS, sizeof(* newEPS));
 

From f71e890cf7012423168660baac311d0787262902 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@www.vumc.nl>
Date: Mon, 11 Jan 2016 14:18:08 +0100
Subject: [PATCH 537/623] Taking care of the bus frequency error.

---
 i386/libsaio/smbios/getters.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/i386/libsaio/smbios/getters.h b/i386/libsaio/smbios/getters.h
index 09739a5..3867e2c 100755
--- a/i386/libsaio/smbios/getters.h
+++ b/i386/libsaio/smbios/getters.h
@@ -95,6 +95,11 @@ static SMBWord getFSBFrequency(void)
 {
 	_SMBIOS_DEBUG_DUMP("In getFSBFrequency() = %d Hz\n", (gPlatform.CPU.FSBFrequency < 100500000) ? 0 : (gPlatform.CPU.FSBFrequency / 1000000));
 
+	if (gPlatform.CPU.QPISpeed == 0)
+	{
+		return ((gPlatform.CPU.FSBFrequency / 1000000) / 4);
+	}
+
 	/*
 	 * Returning zero (0) here is invalid, but we can get away with it because 
 	 * of XNU's check in tsc_init() which effectively catches the invalid value

From efa5a66cbaeb31886cb1c40746f83700051b08fb Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@www.vumc.nl>
Date: Mon, 11 Jan 2016 15:59:54 +0100
Subject: [PATCH 538/623] Typo

---
 i386/libsaio/smbios/smbios.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/smbios.h b/i386/libsaio/smbios/smbios.h
index 3be110f..3ff3953 100755
--- a/i386/libsaio/smbios/smbios.h
+++ b/i386/libsaio/smbios/smbios.h
@@ -533,5 +533,5 @@ struct SMBOemPlatformFeature
 struct SMBOemSMCVersion
 {
 	SMB_STRUCT_HEADER
-	SMBString	SMCVersion
+	SMBString	SMCVersion;
 } __attribute__((packed)) SMBOemSMCVersion;

From 4a341a04f6108bb5f4a1180db92825d79342ab7a Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@www.vumc.nl>
Date: Mon, 11 Jan 2016 17:17:07 +0100
Subject: [PATCH 539/623] SMBIOS extractor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 – for use with: dmidecode --from-file SMBIOS.bin
---
 i386/libsaio/smbios/tools/smbiosXtract.c | 115 +++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100755 i386/libsaio/smbios/tools/smbiosXtract.c

diff --git a/i386/libsaio/smbios/tools/smbiosXtract.c b/i386/libsaio/smbios/tools/smbiosXtract.c
new file mode 100755
index 0000000..dbdec80
--- /dev/null
+++ b/i386/libsaio/smbios/tools/smbiosXtract.c
@@ -0,0 +1,115 @@
+/*
+ *
+ * Name			: smbiosXtract
+ * Version		: 0.0.1
+ * Type			: Command line tool
+ * Copyright	: Pike R. Alpha (c) 2016
+ * Description	: SMBIOS extractor for use with: dmidecode --from-file SMBIOS.bin
+ *
+ * Usage		: sudo ./smbiosXtract
+ *
+ * Compile with	: cc smbiosXtract.c -o smbiosXtract -Wall -framework IOKit -framework CoreFoundation
+ *
+ * Updates		: None so far.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+
+#include <IOKit/IOKitLib.h>
+#include <CoreFoundation/CoreFoundation.h>
+
+#include "../smbios.h"
+
+//==============================================================================
+
+uint8_t checksum8(const uint8_t *cp, uint8_t length)
+{
+	uint8_t sum = 0;
+	uint8_t i = 0;
+	
+	for (; i < length; i++)
+	{
+		sum += *cp++;
+	}
+	
+	return sum;
+}
+
+//==============================================================================
+
+int main(void)
+{
+	char dirspec[128];
+	int filedesc = 0;
+
+	mach_port_t		masterPort;
+    io_service_t	service = MACH_PORT_NULL;
+	CFDataRef		dataRef;
+
+	UInt8 entryPointLength = 0;
+	UInt16 tableLength = 0;
+	UInt32 bytesWritten = 0;
+
+	IOMasterPort(MACH_PORT_NULL, &masterPort);
+
+	//==================================================================================
+
+	service = IOServiceGetMatchingService(masterPort, IOServiceMatching("AppleSMBIOS"));
+
+    if (service)
+	{
+		dataRef = (CFDataRef) IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS-EPS"), kCFAllocatorDefault, kNilOptions);
+
+		if (dataRef)
+		{
+			struct SMBEntryPoint * eps = (struct SMBEntryPoint *) CFDataGetBytePtr(dataRef);
+			entryPointLength = eps->entryPointLength;
+			tableLength = eps->dmi.tableLength;
+
+			// Point table address to data.
+			eps->dmi.tableAddress = 0x20;
+
+			// Zero out checksums.
+			eps->checksum = 0;
+			eps->dmi.checksum = 0;
+
+			// Recalculate checksums.
+			eps->dmi.checksum = (256 - checksum8(CFDataGetBytePtr(dataRef) + 0x10, 0x0f));
+			eps->checksum = (256 - checksum8(CFDataGetBytePtr(dataRef), 0x1f));
+
+			sprintf (dirspec, "SMBIOS.bin");
+			filedesc = open(dirspec, O_WRONLY|O_CREAT|O_TRUNC, 0644);
+			
+			if (filedesc == -1)
+			{
+				printf("Error: Unable to open SMBIOS.bin!\n");
+				close (filedesc);
+				CFRelease(dataRef);
+			}
+			else
+			{
+				bytesWritten = write(filedesc, (char *)CFDataGetBytePtr(dataRef), (entryPointLength + 1));
+				close (filedesc);
+				CFRelease(dataRef);
+				dataRef = (CFDataRef) IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS"), kCFAllocatorDefault, kNilOptions);
+
+				if (dataRef)
+				{
+					filedesc = open(dirspec, O_WRONLY|O_APPEND, 0644);
+					bytesWritten += write(filedesc, (char *)CFDataGetBytePtr(dataRef), tableLength);
+					printf("%d bytes written to SMBIOS.bin for use with: dmidecode --from-dump SMBIOS.bin\n", bytesWritten);
+					close (filedesc);
+					CFRelease(dataRef);
+				}
+			}
+		}
+
+		IOObjectRelease(service);
+    }
+
+	exit(0);
+}

From 5d4c440f7b8e2adc293d714142cab1de1731426b Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 13:49:29 +0200
Subject: [PATCH 540/623] Removing old debug output.

---
 i386/libsaio/hfs.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/hfs.c b/i386/libsaio/hfs.c
index b04f54e..676d176 100755
--- a/i386/libsaio/hfs.c
+++ b/i386/libsaio/hfs.c
@@ -514,8 +514,6 @@ long HFSGetFileBlock(CICell ih, char *filePath, unsigned long long *firstBlock)
 	
 	if ((result == -1) || ((flags & kFileTypeMask) != kFileTypeFlat))
 	{
-		printf("HFS: Resolve path %s failed\n", filePath);
-		
 		return -1L;
 	}
 	
@@ -586,8 +584,6 @@ static long ReadFile(void * file, uint64_t * length, void * base, uint64_t offse
 	
 	if (offset > fileLength)
 	{
-		printf("Offset is too large.\n");
-		
 		return -1L;
 	}
 	
@@ -918,6 +914,7 @@ static long ReadBTreeEntry(long btree, void * key, char * entry, long * dirIndex
 			extent		= (HFSExtentDescriptor *)&gHFSMDB->drCTExtRec;
 			extentSize	= SWAP_BE32(gHFSMDB->drCTFlSize);
 		}
+
 		extentFile = kHFSCatalogFileID;
 	}
 	else
@@ -1026,6 +1023,7 @@ static long ReadBTreeEntry(long btree, void * key, char * entry, long * dirIndex
 	if (result != 0)
 	{
 		free(nodeBuf);
+
 		return -1;
 	}
 	

From e83801f1913cb4596c88a566052b11c9332a6a21 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 13:49:55 +0200
Subject: [PATCH 541/623] Adding support for Sierra.

---
 Makefile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index be71745..230ee11 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@
 #			- Yosemite support added (Pike R. Alpha, June 2014).
 #			- Changed default from Mavericks to Yosemite (Pike R. Alpha, June 2014).
 #			- El Capitan support added (Pike R. Alpha, June 2015).
+#			- Sierra support added (Pike R. Alpha, June 2016).
 #
 
 #
@@ -55,16 +56,20 @@ VPATH = $(OBJROOT):$(SYMROOT)
 
 ifeq ($(MAKECMDGOALS),)
 	#
-	# No OS build target given. Build for El Capitan (default).
+	# No OS build target given. Build for Sierra (default).
 	#
-	MAKEGOAL = el-capitan
-	MAKE_TARGET_OS = 62;
-	MAKE_TARGET_OS_VER = 10.11
+	MAKEGOAL = sierra
+	MAKE_TARGET_OS = 126;
+	MAKE_TARGET_OS_VER = 10.12
 else
 	#
 	# Setting MAKE_TARGET_OS and MAKEGOAL based on OS build target.
 	#
-	ifeq ($(MAKECMDGOALS), el-capitan)
+	ifeq ($(MAKECMDGOALS), sierra)
+		MAKEGOAL = sierra
+		MAKE_TARGET_OS = 126;
+		MAKE_TARGET_OS_VER = 10.12
+	else ifeq ($(MAKECMDGOALS), el-capitan)
 		MAKEGOAL = el-capitan
 		MAKE_TARGET_OS = 62;
 		MAKE_TARGET_OS_VER = 10.11
@@ -92,7 +97,7 @@ else
 endif
 
 #
-# Export our make goal i.e. El Capitan, Yosemite, Mavericks, Mountain Lion, Lion or legacy (Snow Leopard or Leopard).
+# Export our make goal i.e. Sierra, El Capitan, Yosemite, Mavericks, Mountain Lion, Lion or legacy (Snow Leopard or Leopard).
 #
 
 export MAKEGOAL

From 0e1a00e0c31dcf0f5f794991669b26c2b03b7617 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 13:50:51 +0200
Subject: [PATCH 542/623] Sierra/Skylake support and some missing model data
 added.

---
 i386/libsaio/platform.h | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index e563a8e..9a86c4d 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -30,8 +30,9 @@
 #define LION					2	// Lion (the default).
 #define MOUNTAIN_LION			6	// Mountain Lion (includes Lion changes).
 #define MAVERICKS				10	// Mavericks (includes Lion changes).
-#define YOSEMITE				26	// Yosemite (incl. Lion/Mavericks changes).
-#define EL_CAPITAN				62	// El Capitan (incl. Lion/Mavericks/Yosemite changes).
+#define YOSEMITE				26	// Yosemite (includes Lion and Mavericks changes).
+#define EL_CAPITAN				62	// El Capitan (includes Lion/Mavericks and Yosemite changes).
+#define SIERRA					126	// Sierra (includes Lion/Mavericks/Yosemite and El Capitan changes).
 
 //------------------------------------------------------------------------------
 
@@ -82,7 +83,9 @@
 #define IMAC_171				 IMAC						// Defaults to iMac17,1
 
 #define MACBOOK_41				(MACBOOK | ( 1 << 15))
-#define MACBOOK_81				(MACBOOK | ( 2 << 15))		// Defaults to MacBook8,1
+#define MACBOOK_81				(MACBOOK | ( 2 << 15))
+#define MACBOOK_82				(MACBOOK | ( 3 << 15))
+#define MACBOOK_91				 MACBOOK					// Defaults to MacBook9,1
 
 #define MACBOOK_AIR_41			(MACBOOK_AIR | (1 << 15))
 #define MACBOOK_AIR_42			(MACBOOK_AIR | (2 << 15))
@@ -104,7 +107,10 @@
 #define MACBOOK_PRO_111			(MACBOOK_PRO | ( 9 << 15))
 #define MACBOOK_PRO_112			(MACBOOK_PRO | (10 << 15))
 #define MACBOOK_PRO_113			(MACBOOK_PRO | (11 << 15))
-#define MACBOOK_PRO_121			 MACBOOK_PRO				// Defaults to MacBookPro12,1
+#define MACBOOK_PRO_114			(MACBOOK_PRO | (12 << 15))
+#define MACBOOK_PRO_115			(MACBOOK_PRO | (13 << 15))
+#define MACBOOK_PRO_121			(MACBOOK_PRO | (14 << 15))
+#define MACBOOK_PRO_131			 MACBOOK_PRO				// Defaults to MacBookPro13,1
 
 #define MACMINI_41				(MACMINI | (1 << 15))
 #define MACMINI_51				(MACMINI | (2 << 15))
@@ -280,7 +286,8 @@ typedef struct _PlatformInfo_t
 		uint64_t	TSCFrequency;				// TSC Frequency Hz
 		uint64_t	FSBFrequency;				// FSB Frequency Hz
 		uint64_t	CPUFrequency;				// CPU Frequency Hz
-		
+		uint64_t	ARTFrequency;				// ART Frequency Hz
+
 		uint32_t	QPISpeed;					// QuickPath Interconnect Bus Speed
 		
 		uint8_t		NumberOfTurboRatios;		// Jeroen: initialized in cpu.c and used in ACPI/ssdt_pr_generator.h
@@ -378,12 +385,7 @@ typedef struct _PlatformInfo_t
 		 UInt8	CcdRevision;
 		 } DMI; */
 	} SMBIOS;
-	
-	struct XHCI
-	{
-		uint64_t ARTFrequency;
-	} XHCI;
-	
+
 } PlatformInfo_t;
 
 

From 43fe6c02466bef530c91f8813d43b80b49de66a6 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 13:51:53 +0200
Subject: [PATCH 543/623] Variable name change (for Skylake).

---
 i386/libsaio/efi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 04bb88a..abc05d2 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -133,9 +133,9 @@ void initEFITree(void)
 		DT__AddProperty(platformNode, "FSBFrequency", sizeof(uint64_t), &gPlatform.CPU.FSBFrequency);
 	}
 
-	if (gPlatform.XHCI.ARTFrequency)
+	if (gPlatform.CPU.ARTFrequency)
 	{
-		DT__AddProperty(platformNode, "ARTFrequency", sizeof(uint64_t), &gPlatform.XHCI.ARTFrequency);
+		DT__AddProperty(platformNode, "ARTFrequency", sizeof(uint64_t), &gPlatform.CPU.ARTFrequency);
 	}
 
 	Node * chosenNode = DT__AddChild(gPlatform.DT.RootNode, "chosen");

From 62852b0d1b18e8cbe82e4f77f0ef970e15449f9d Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 13:52:21 +0200
Subject: [PATCH 544/623] Skylake/new Xeons support.

---
 i386/libsaio/cpu/essentials.h | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 72653f2..afa7011 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -77,6 +77,8 @@
 #define MSR_TEMPERATURE_TARGET		0x01A2
 #define MSR_MISC_PWR_MGMT			0x01AA
 #define	MSR_TURBO_RATIO_LIMIT		0x01AD
+#define	MSR_TURBO_RATIO_LIMIT_1		0x01AE
+#define	MSR_TURBO_RATIO_LIMIT_2		0x01AF
 
 #define IA32_ENERGY_PERF_BIAS		0x01B0
 #define IA32_PLATFORM_DCA_CAP		0x01F8
@@ -148,17 +150,19 @@
 
 // CPUID leaf index values (pointing to the right spot in CPUID/LEAF array).
 
-#define LEAF_0				0			// DHP: Formerly known as CPUID_n
+#define LEAF_0				0		// Basic CPUID Information
 #define LEAF_1				1
 #define LEAF_2				2
-#define LEAF_4				3
-#define LEAF_5				4
-#define LEAF_6				5
-#define LEAF_B				6
-#define LEAF_80				7
-#define LEAF_81				8
-
-#define MAX_CPUID_LEAVES	9			// DHP: Formerly known as MAX_CPUID
+#define LEAF_4				3		// Deterministic Cache Parameters Leaf
+#define LEAF_5				4		// MONITOR/MWAIT Leaf
+#define LEAF_6				5		// Thermal and Power Management Leaf
+#define LEAF_B				6		// Extended Topology Enumeration Leaf
+#define LEAF_15				7		// Time Stamp Counter/Core Crystal Clock Information-leaf
+#define LEAF_16				8		// Processor Frequency Information Leaf
+#define LEAF_80				9		// Extended Function CPUID Information
+#define LEAF_81				10
+
+#define MAX_CPUID_LEAVES	11		// DHP: Formerly known as MAX_CPUID
 
 /* Copied from: xnu/osfmk/i386/cpuid.h */
 #define CPU_MODEL_YONAH  			0x0E

From cffba42e268518c15805da625fdd70c0085a2a11 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 13:52:34 +0200
Subject: [PATCH 545/623] New Xeons support.

---
 i386/libsaio/cpu.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/i386/libsaio/cpu.c b/i386/libsaio/cpu.c
index 2f76821..ab7af82 100644
--- a/i386/libsaio/cpu.c
+++ b/i386/libsaio/cpu.c
@@ -81,6 +81,36 @@ void initTurboRatios()
 		// Westmere-EX support (E7-2820/E7-2830).
 		gPlatform.CPU.CoreTurboRatio[6] = ((msr >> 48) & 0xff);
 		gPlatform.CPU.CoreTurboRatio[7] = ((msr >> 56) & 0xff);
+#endif
+
+#if STATIC_CPU_NumCores >= 10			// 20 threads.
+		msr = rdmsr64(MSR_TURBO_RATIO_LIMIT_1);
+
+		gPlatform.CPU.CoreTurboRatio[8] = bitfield32(msr, 7, 0);
+		gPlatform.CPU.CoreTurboRatio[9] = bitfield32(msr, 15, 8);
+#endif
+
+#if STATIC_CPU_NumCores >= 12			// 24 threads.
+		gPlatform.CPU.CoreTurboRatio[10] = bitfield32(msr, 23, 16);
+		gPlatform.CPU.CoreTurboRatio[11] = bitfield32(msr, 31, 24);
+#endif
+
+#if STATIC_CPU_NumCores >= 16			// 32 threads.
+		gPlatform.CPU.CoreTurboRatio[12] = ((msr >> 32) & 0xff);
+		gPlatform.CPU.CoreTurboRatio[13] = ((msr >> 40) & 0xff);
+		gPlatform.CPU.CoreTurboRatio[14] = ((msr >> 48) & 0xff);
+		gPlatform.CPU.CoreTurboRatio[15] = ((msr >> 56) & 0xff);
+#endif
+		
+#if STATIC_CPU_NumCores >= 18			// 36 threads.
+		// Intel® Xeon® Processor E5 v3 Family (0x3F – based on the Haswell-E microarchitecture)
+		// Intel® Xeon® Processor E7 v2 Family (0x3E – based on the Ivy Bridge-E microarchitecture)
+		// can check bit-64 to see if the two extra Turbo MSR's are being used or not.
+		msr = rdmsr64(MSR_TURBO_RATIO_LIMIT_2);
+		
+		gPlatform.CPU.CoreTurboRatio[16] = bitfield32(msr, 7, 0);
+		gPlatform.CPU.CoreTurboRatio[17] = bitfield32(msr, 15, 8);
+
 #endif
 	}
 

From d33fbe8ad38cc27d80b2d95508b624d257005816 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 13:52:45 +0200
Subject: [PATCH 546/623] Skylake support.

---
 i386/libsaio/cpu/Intel/dynamic_data.h | 162 ++++++++++++++++----------
 1 file changed, 99 insertions(+), 63 deletions(-)

diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index d3ad72c..6d7eb2c 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -21,92 +21,119 @@
 
 #define DEFAULT_FSB				100000	// Hardcoded to 100MHz
 #define BASE_NHM_CLOCK_SOURCE	133333333ULL
+#define BASE_ART_CLOCK_SOURCE 	24000000ULL	// 24Mhz
 
 //==============================================================================
 // Measures TSC frequency using the i8254 Programmable Interval Timer counter 2
 
 static uint64_t getTSCFrequency(void)
 {
-	// DFE: This constant comes from older xnu:
-	#define CLKNUM					1193182	// formerly 1193167
-
-	// DFE: These two constants come from Linux except CLOCK_TICK_RATE replaced with CLKNUM
-	#define CALIBRATE_TIME_MSEC		30
-	#define CALIBRATE_LATCH ((CLKNUM * CALIBRATE_TIME_MSEC + 1000/2)/1000)
-
+	int i;
+	
+	uint64_t retval = 0;
 	uint64_t tscStart;
 	uint64_t tscEnd;
 	uint64_t tscDelta = 0xffffffffffffffffULL;
+	
 	unsigned long pollCount;
-	uint64_t retval = 0;
-	int i;
-
-	/* Time how many TSC ticks elapse in 30 msec using the 8254 PIT
-	 * counter 2.  We run this loop 3 times to make sure the cache
-	 * is hot and we take the minimum delta from all of the runs.
-	 * That is to say that we're biased towards measuring the minimum
-	 * number of TSC ticks that occur while waiting for the timer to
-	 * expire.  That theoretically helps avoid inconsistencies when
-	 * running under a VM if the TSC is not virtualized and the host
-	 * steals time.  The TSC is normally virtualized for VMware.
-	 */
-
-	for (i = 0; i < 10; ++i)
+	
+	if (getCachedCPUID(LEAF_0, eax) > 0x14) // Intel Skylake Processors.
 	{
-		enable_PIT2();
-		set_PIT2_mode0(CALIBRATE_LATCH);
-		tscStart = rdtsc64();
-		pollCount = poll_PIT2_gate();
-		tscEnd = rdtsc64();
-		/* The poll loop must have run at least a few times for accuracy */
-
-		if (pollCount <= 1)
+#if DEBUG_CPU
+		printf("LEAF_15[eax]: 0x%x\n", getCachedCPUID(LEAF_15, eax)); // 0x02		(numerator is always 2)
+		printf("LEAF_15[ebx]: 0x%x\n", getCachedCPUID(LEAF_15, ebx)); // 0x11c	(denominator i.e. 284 = 3.4GHz and 334 = 4GHz)
+		printf("LEAF_15[ecx]: 0x%x\n", getCachedCPUID(LEAF_15, ecx)); // 0x00		(frequency = Intel reserved)
+		printf("LEAF_15[edx]: 0x%x\n", getCachedCPUID(LEAF_15, edx)); // 0x00
+		
+		printf("LEAF_16[eax]: 0x%x\n", getCachedCPUID(LEAF_16, eax)); // 0xd48	(clock speed i.e. 3408MHz for the i7-6700)
+		printf("LEAF_16[ebx]: 0x%x\n", getCachedCPUID(LEAF_16, ebx)); // 0xfa0	(maximum turbo clock speed i.e. 4GHz for the i7-6700)
+		printf("LEAF_16[ecx]: 0x%x\n", getCachedCPUID(LEAF_16, ecx)); // 0x64		(bus speed i.e. 100MHz)
+		printf("LEAF_16[edx]: 0x%x\n", getCachedCPUID(LEAF_16, edx)); // 0x00
+#endif
+		//
+		// Examples:
+		//
+		// 24000000 * 284 / 2 = 3408000000 for the Intel i7-6700  @ 3.4GHz
+		// 24000000 * 334 / 2 = 4008000000 for the Intel i7-6700K @ 4.0GHz
+		//
+		return (BASE_ART_CLOCK_SOURCE * getCachedCPUID(LEAF_15, ebx) / getCachedCPUID(LEAF_15, eax));
+	}
+	else
+	{
+		// DFE: This constant comes from older xnu:
+		#define CLKNUM					1193182	// formerly 1193167
+
+		// DFE: These two constants come from Linux except CLOCK_TICK_RATE replaced with CLKNUM
+		#define CALIBRATE_TIME_MSEC		30
+		#define CALIBRATE_LATCH ((CLKNUM * CALIBRATE_TIME_MSEC + 1000/2)/1000)
+
+		/* Time how many TSC ticks elapse in 30 msec using the 8254 PIT
+		 * counter 2.  We run this loop 3 times to make sure the cache
+		 * is hot and we take the minimum delta from all of the runs.
+		 * That is to say that we're biased towards measuring the minimum
+		 * number of TSC ticks that occur while waiting for the timer to
+		 * expire.  That theoretically helps avoid inconsistencies when
+		 * running under a VM if the TSC is not virtualized and the host
+		 * steals time.  The TSC is normally virtualized for VMware.
+		 */
+
+		for (i = 0; i < 10; ++i)
 		{
-			continue;
+			enable_PIT2();
+			set_PIT2_mode0(CALIBRATE_LATCH);
+			tscStart = rdtsc64();
+			pollCount = poll_PIT2_gate();
+			tscEnd = rdtsc64();
+			/* The poll loop must have run at least a few times for accuracy */
+
+			if (pollCount <= 1)
+			{
+				continue;
+			}
+
+			/* The TSC must increment at LEAST once every millisecond.  We
+			 * should have waited exactly 30 msec so the TSC delta should
+			 * be >= 30.  Anything less and the processor is way too slow.
+			 */
+
+			if ((tscEnd - tscStart) <= CALIBRATE_TIME_MSEC)
+			{
+				continue;
+			}
+
+			// tscDelta = min(tscDelta, (tscEnd - tscStart))
+			if ((tscEnd - tscStart) < tscDelta)
+			{
+				tscDelta = tscEnd - tscStart;
+			}
 		}
 
-		/* The TSC must increment at LEAST once every millisecond.  We
-		 * should have waited exactly 30 msec so the TSC delta should
-		 * be >= 30.  Anything less and the processor is way too slow.
+		/* tscDelta is now the least number of TSC ticks the processor made in
+		 * a timespan of 0.03 s (e.g. 30 milliseconds)
+		 * Linux thus divides by 30 which gives the answer in kiloHertz because
+		 * 1 / ms = kHz.  But we're xnu and most of the rest of the code uses
+		 * Hz so we need to convert our milliseconds to seconds.  Since we're
+		 * dividing by the milliseconds, we simply multiply by 1000.
+		 */
+
+		/* Unlike linux, we're not limited to 32-bit, but we do need to take care
+		 * that we're going to multiply by 1000 first so we do need at least some
+		 * arithmetic headroom.  For now, 32-bit should be enough.
+		 * Also unlike Linux, our compiler can do 64-bit integer arithmetic.
 		 */
 
-		if ((tscEnd - tscStart) <= CALIBRATE_TIME_MSEC)
+		if (tscDelta > (1ULL << 32))
 		{
-			continue;
+			retval = 0;
 		}
-
-		// tscDelta = min(tscDelta, (tscEnd - tscStart))
-		if ((tscEnd - tscStart) < tscDelta)
+		else
 		{
-			tscDelta = tscEnd - tscStart;
+			retval = tscDelta * 1000 / 30;
 		}
-	}
 
-	/* tscDelta is now the least number of TSC ticks the processor made in
-	 * a timespan of 0.03 s (e.g. 30 milliseconds)
-	 * Linux thus divides by 30 which gives the answer in kiloHertz because
-	 * 1 / ms = kHz.  But we're xnu and most of the rest of the code uses
-	 * Hz so we need to convert our milliseconds to seconds.  Since we're
-	 * dividing by the milliseconds, we simply multiply by 1000.
-	 */
-
-	/* Unlike linux, we're not limited to 32-bit, but we do need to take care
-	 * that we're going to multiply by 1000 first so we do need at least some
-	 * arithmetic headroom.  For now, 32-bit should be enough.
-	 * Also unlike Linux, our compiler can do 64-bit integer arithmetic.
-	 */
-
-	if (tscDelta > (1ULL << 32))
-	{
-		retval = 0;
-	}
-	else
-	{
-		retval = tscDelta * 1000 / 30;
+		disable_PIT2();
 	}
 
-	disable_PIT2();
-
 	return retval;
 }
 
@@ -195,6 +222,9 @@ void initCPUStruct(void)
 	_CPU_DEBUG_SLEEP(5);
 #endif
 
+	do_cpuid(0x00000015, gPlatform.CPU.ID[LEAF_15]);
+	do_cpuid(0x00000016, gPlatform.CPU.ID[LEAF_16]);
+
 #if DEBUG_TSS_SUPPORT
 	do_cpuid(0x00000006, gPlatform.CPU.ID[LEAF_6]);				// Thermal and Power Leaf (Function 06h).
 
@@ -373,6 +403,12 @@ void initCPUStruct(void)
 				case CPU_MODEL_SKYLAKE_H_S:
 					CoreBridgeType = SKYLAKE;
 					hiBit = 31;
+					// gPlatform.CPU.ARTFrequency = (3427489466 * 2 / 284) = 24137249,76056338028169 MHz
+					// 3427489466 / 34 = 100808513,705882352941176
+					// 100808498 * 2 = 201616996
+					// 201616996 / 284 = 709919
+					// 709919 * 284 = 201616996 / 2 = 100808498
+					gPlatform.CPU.ARTFrequency = 0; // BASE_ART_CLOCK_SOURCE; // (tscFrequency * getCachedCPUID(LEAF_x15, eax) / getCachedCPUID(LEAF_x15, ebx));
 					break;
 
 				case CPU_MODEL_NEHALEM:

From 2ee66b396e9564f8c2364e1eb3039830384c0ae1 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 13:53:57 +0200
Subject: [PATCH 547/623] Minor/unimportant changes.

---
 i386/boot2/bootlogo.c |  4 ++--
 i386/boot2/drivers.c  | 13 +++++++++----
 i386/boot2/options.c  |  1 +
 i386/libsaio/pci.h    | 11 +++++++++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/i386/boot2/bootlogo.c b/i386/boot2/bootlogo.c
index 1d837f3..2fd5609 100755
--- a/i386/boot2/bootlogo.c
+++ b/i386/boot2/bootlogo.c
@@ -37,7 +37,7 @@
 unsigned long lookUpCLUTIndex(unsigned char index)
 {
 	long colorIndex = (index * 3);
-#if BLACKMODE
+#if (((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) && (BLACKMODE == 1)) // Yosemite, El Capitan and Sierra.
 	long red   = AppleLogoBlackClut[ colorIndex   ];
 	long green = AppleLogoBlackClut[ colorIndex++ ];
 	long blue  = AppleLogoBlackClut[ colorIndex++ ];
@@ -148,7 +148,7 @@ void showBootLogo()
 {
 	setVideoMode(GRAPHICS_MODE);
 
-#if BLACKMODE
+#if (((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) && (BLACKMODE == 1)) // Yosemite, El Capitan and Sierra.
 	setBackgroundColor(0x030000);
 	uint32_t compressedSize = sizeof(AppleLogoBlackPacked);
 	void *logoData = (void *)AppleLogoBlackPacked;
diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index 4d9a3cb..3e68dd5 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -355,12 +355,17 @@ static int loadKexts(char * targetFolder, bool isPluginRun)
 			{
 				sprintf(gPlatform.KextFileName, "%s/%s", targetFolder, dirEntryName);
 
-// #if DEBUG_DRIVERS
 				if (strlen(gPlatform.KextFileName) >= MAX_KEXT_PATH_LENGTH)
 				{
 					stop("Error: gPlatform.KextFileName >= %d chars. Change MAX_KEXT_PATH_LENGTH!", MAX_KEXT_PATH_LENGTH);
 				}
-// #endif
+
+#if DEBUG_DRIVERS
+				if (!isPluginRun && ((strcmp(dirEntryName, "AppleEmulator.kext") == 0) || (strcmp(dirEntryName, "FakeSMC.kext") == 0)))
+				{
+					printf("loadKext(%s) found\n", dirEntryName);
+				}
+#endif
 				// Determine bundle type.
 				isBundleType2 = (GetFileInfo(gPlatform.KextFileName, "Contents", &dirEntryFlags, &dirEntryTime) == 0);
 
@@ -396,7 +401,7 @@ static int loadKexts(char * targetFolder, bool isPluginRun)
 static int loadPlist(char * targetFolder, bool isBundleType2)
 {
     ModulePtr module;
-    TagPtr    personalities;
+    TagPtr    personalities		= NULL;
 
     char * plistBuffer			= NULL;
     char * tmpExecutablePath	= NULL;
@@ -962,7 +967,7 @@ long decodeKernel(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsiz
 
 		if (OSSwapBigToHostInt32(kernel_header->adler32) != localAdler32(fileLoadBuffer, uncompressedSize))
 		{
-			printf("Adler mismatch, is 0x%x but 0x%x is expected\n", localAdler32(fileLoadBuffer, uncompressedSize));
+			printf("Adler mismatch, is 0x%x but 0x%x is expected\n", OSSwapBigToHostInt32(kernel_header->adler32), localAdler32(fileLoadBuffer, uncompressedSize));
 			return -1;
 		}
 	}
diff --git a/i386/boot2/options.c b/i386/boot2/options.c
index 5cb0c1d..fffa8eb 100755
--- a/i386/boot2/options.c
+++ b/i386/boot2/options.c
@@ -92,6 +92,7 @@ void getAndProcessBootArguments(char * configKernelFlags)
 	int bootModes[6]			= { -1, kBootModeNormal, kBootModeNormal, -1, kBootModeSafe, kBootModeNormal };
 	const char * bootFlags[6]	= { "", kVerboseModeFlag, kSingleUserModeFlag, "", kSafeModeFlag, kIgnoreCachesFlag };
 
+	bzero(gBootArgs, sizeof(gBootArgs));
 	skipblanks(&cp);
 
     while (readKeyboardStatus())
diff --git a/i386/libsaio/pci.h b/i386/libsaio/pci.h
index e48456a..f472f38 100755
--- a/i386/libsaio/pci.h
+++ b/i386/libsaio/pci.h
@@ -20,12 +20,20 @@ uint32_t pciConfigRead( uint8_t readType, uint32_t pciAddress, uint8_t pciRegist
 //==============================================================================
 // Note: Currently only called from: i386/libsaio/cpu/dynamic_data.h
 
+static inline uint8_t pciConfigRead8(uint32_t pciAddress, uint8_t pciRegister)
+{
+	return (uint8_t)pciConfigRead(READ_BYTE, pciAddress, pciRegister);
+}
+
+//==============================================================================
+// Note: Currently only called from: i386/libsaio/cpu/dynamic_data.h
+
+
 static inline uint16_t pciConfigRead16(uint32_t pciAddress, uint8_t pciRegister)
 {
 	return (uint16_t)pciConfigRead(READ_WORD, pciAddress, pciRegister);
 }
 
-
 //==============================================================================
 // Note: Currently only called from: i386/libsaio/cpu/dynamic_data.h
 
@@ -33,4 +41,3 @@ static inline uint32_t pciConfigRead32(uint32_t pciAddress, uint8_t pciRegister)
 {
 	return (uint32_t)pciConfigRead(READ_LONG, pciAddress, pciRegister);
 }
-

From 86c740e6182da9cb58911964c709004cdc6d2784 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 13:55:10 +0200
Subject: [PATCH 548/623] SIP changes.

---
 i386/libsaio/bootstruct.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index d8f5dd0..a5439e1 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -101,6 +101,13 @@
 			CSR_ALLOW_DEVICE_CONFIGURATION)
 #endif
 
+/* CSR capabilities that a booter can give to the system */
+#define CSR_CAPABILITY_UNLIMITED				(1 << 0)
+#define CSR_CAPABILITY_CONFIG					(1 << 1)
+#define CSR_CAPABILITY_APPLE_INTERNAL			(1 << 2)
+
+#define CSR_VALID_CAPABILITIES (CSR_CAPABILITY_UNLIMITED | CSR_CAPABILITY_CONFIG | CSR_CAPABILITY_APPLE_INTERNAL)
+
 // Snapshot constants with supported version / revision info.
 #define kBootArgsVersion_SnowLeopard	1
 #define kBootArgsRevision_SnowLeopard	6

From fc469aa54304cf9f407368bed8cf16469666b881 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 13:56:18 +0200
Subject: [PATCH 549/623] Don't set bootArgs->flags to kBootArgsFlagBlack

---
 i386/libsaio/bootstruct.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index f316d6b..fd2a351 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -123,10 +123,12 @@ void initKernelBootConfig(void)
 #endif // #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
 
 #if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)
-	bootArgs->flags					|= kBootArgsFlagCSRActiveConfig;
+	bootArgs->flags					|= (kBootArgsFlagCSRConfigMode + kBootArgsFlagCSRBoot);
+
+	bootArgs->csrActiveConfig		= CSR_ALLOW_DEVICE_CONFIGURATION;
+
+	bootArgs->csrCapabilities		= CSR_CAPABILITY_UNLIMITED;
 
-	bootArgs->csrActiveConfig		= CSR_ALLOW_UNTRUSTED_KEXTS;
-	bootArgs->csrCapabilities		= CSR_VALID_FLAGS;
 	bootArgs->boot_SMC_plimit		= 0;
 #endif
 
@@ -212,7 +214,7 @@ void finalizeKernelBootConfig(void)
     bootArgs->deviceTreeP = (uint32_t)addr;
     bootArgs->deviceTreeLength = size;
 	
-/* #if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+#if ((MAKE_TARGET_OS & LION) == LION) // All OS versions greater than Lion have bit 1 set.
 	// Adding a 16 KB log space.
 	bootArgs->performanceDataSize	= 0;
 	bootArgs->performanceDataStart	= 0;
@@ -224,9 +226,12 @@ void finalizeKernelBootConfig(void)
 	bootArgs->bootMemSize	= 0;
 	bootArgs->bootMemStart	= 0;
 	
-	bootArgs->flags			= kBootArgsFlagBlack;
 	bootArgs->kslide		= 0;
-#endif */
+#endif
+	
+#if (((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION) && (BLACKMODE == 1))
+	bootArgs->flags			|= kBootArgsFlagBlack;
+#endif
 
 #if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 	bootArgs->PhysicalMemorySize	= gPlatform.RAM.MemorySize;

From bcf30eece7b8e293af595e558b527924bd731144 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 14:00:42 +0200
Subject: [PATCH 550/623] Catch installation issues.

---
 i386/libsaio/stringTable.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/stringTable.c b/i386/libsaio/stringTable.c
index e8ac319..2558523 100755
--- a/i386/libsaio/stringTable.c
+++ b/i386/libsaio/stringTable.c
@@ -357,6 +357,10 @@ long loadConfigFile(const char * configFile, config_file_t *config)
 		{
 			return EFI_SUCCESS;
 		}
+		else
+		{
+			error("ERROR: failed to parse: com.apple.Boot.plist");
+		}
 	}
 
 	return (long)(EFI_INVALID_PARAMETER | EFI_NOT_FOUND);
@@ -376,8 +380,8 @@ long loadCABootPlist(void)
 #endif
 
 #if INSTALL_ESD_SUPPORT
-		".IABootFiles",
 		"OS X Install Data",
+		".IABootFiles",
 		"Mac OS X Install Data",
 #endif
 		"Library/Preferences/SystemConfiguration" // The default.
@@ -405,10 +409,26 @@ long loadCABootPlist(void)
 		end++;
 	#endif
 #endif
+		char dirSpec[80];
+
+		sprintf(dirSpec, "/.IABootFiles/", BIOS_DEV_UNIT(gPlatform.BootVolume), gPlatform.BootVolume->part_no);
+
+#if DEBUG_BOOT
+		long flagss, time;
+
+		if (GetFileInfo(dirSpec, "com.apple.Boot.plist", &flagss, &time) == 0)
+		{
+			printf("/.IABootFiles/com.apple.Boot.plist found on bvr->part_no: %d\n", gPlatform.BootVolume->part_no);
+			sleep(3);
+		}
+#endif
+
 		for (; i < len; i++)
 		{
 			bzero(path, 80);
 			sprintf(path, "/%s/%s", dirspec[i], "com.apple.Boot.plist");
+
+			// Try to load com.apple.Boot.plist
 			retValue = loadConfigFile(path, &bootInfo->bootConfig);
 			
 			if (retValue == EFI_SUCCESS)
@@ -420,6 +440,7 @@ long loadCABootPlist(void)
 					gPlatform.BootVolume->flags = kBVFlagInstallVolume;
 				}
 #endif
+
 #if (APPLE_RAID_SUPPORT || CORE_STORAGE_SUPPORT)
 				if (strncmp(path, "/com.apple.boot.", 16) == 0)
 				{

From 506dc8a4a509dbb375d07f01557777cf109cd6f3 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 18 Jun 2016 14:03:00 +0200
Subject: [PATCH 551/623] Whitespace and comment changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– make sure that we have a kernel/prelinkedkernel to load.
---
 i386/boot2/boot.c | 78 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 28 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 8d1603c..e7f50b2 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -166,7 +166,6 @@ void boot(int biosdev)
 
 	bool	haveCABootPlist	= false;
 	bool	quietBootMode	= true;
-	bool	kernelSpecified	= false;
 
 	void *fileLoadBuffer = (void *)kLoadAddr;
 
@@ -186,9 +185,10 @@ void boot(int biosdev)
 #if PRE_LINKED_KERNEL_SUPPORT
 	bool	mayUseKernelCache	= false;
 	bool	flushCaches			= false;
+	bool	kernelSpecified	= false;
+#endif
 
 	long flags, cachetime;
-#endif
 
 	initPlatform(biosdev);
 
@@ -433,7 +433,7 @@ void boot(int biosdev)
 		 * We cannot use the kernelcache from the Yosemite installer, not yet,
 		 * and thus we load: /System/Library/Caches/Startup/kernelcache instead
 		 */
-#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite, El Capitan and Sierra.
 		// Installation directory located?
 		if (flushCaches == false) //  && (gPlatform.BootVolume->flags != kBVFlagInstallVolume))
 		{
@@ -446,7 +446,7 @@ void boot(int biosdev)
 				_BOOT_DEBUG_DUMP("length: %d, val: %s\n", length, val);
 #if RECOVERY_HD_SUPPORT
 				// XXX: Required for booting from the Recovery HD.
-#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite, El Capitan and Sierra.
 				// FIXME: This static check sucks!
 				if (strncmp(val, "\\com.apple.recovery.boot\\prelinkedkernel", length) == 0)
 				{
@@ -457,8 +457,8 @@ void boot(int biosdev)
 				{
 					val = "/com.apple.recovery.boot/kernelcache";
 				}
-#endif // #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
-#endif
+#endif // #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite, El Capitan and Sierra.
+#endif // #if RECOVERY_HD_SUPPORT
 				if (length && GetFileInfo(NULL, val, &flags, &cachetime) == 0)
 				{
 					_BOOT_DEBUG_DUMP("Kernel Cache set to: %s\n", val);
@@ -470,7 +470,7 @@ void boot(int biosdev)
 					gPlatform.KernelCacheSpecified = true;
 				}
 			}
-#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite, El Capitan and Sierra.
 		}
 		else
 		{
@@ -484,7 +484,15 @@ void boot(int biosdev)
 		}
 #endif // #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE)
 
-#endif
+#else // #if PRELINKED_KERNEL_SUPPORT
+	#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite, El Capitan and Sierra.
+		sprintf(bootFile, "/System/Library/Kernels/%s", bootInfo->bootFile);
+	#else
+		// Set to mach_kernel for Mavericks and earlier versions of OS X.
+		sprintf(bootFile, "/%s", bootInfo->bootFile);
+	#endif
+#endif // #if PRELINKED_KERNEL_SUPPORT
+		
 		if (getBoolForKey(kQuietBootKey, &quietBootMode, &bootInfo->bootConfig) && !quietBootMode)
 		{
 			gPlatform.BootMode = kBootModeNormal; // Reversed from: gPlatform.BootMode |= kBootModeQuiet;
@@ -535,7 +543,7 @@ void boot(int biosdev)
 			{
 				sprintf(bootFile, "%s", bootInfo->bootFile);
 			}
-#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite and El Capitan.
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite, El Capitan and Sierra.
 			else
 			{
 				if (!kernelSpecified)
@@ -590,7 +598,7 @@ void boot(int biosdev)
 				
 					_BOOT_DEBUG_DUMP("adler32: %08X\n", adler32);
 
-#if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set (like Lion).
+#if ((MAKE_TARGET_OS & LION) == LION) // Sierra, El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set (like Lion).
 
 					_BOOT_DEBUG_DUMP("Checking for kernelcache...\n");
 
@@ -615,8 +623,14 @@ void boot(int biosdev)
 				
 				if (mayUseKernelCache == false)
 				{
-					sprintf(bootFile, "/System/Library/Kernels/%s", bootInfo->bootFile);
 					_BOOT_DEBUG_DUMP("No kernelcache found, will load: %s!\n", bootInfo->bootFile);
+
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite, El Capitan and Sierra.
+					sprintf(bootFile, "/System/Library/Kernels/%s", bootInfo->bootFile);
+#else
+					// Set to mach_kernel for Mavericks and earlier versions of OS X.
+					sprintf(bootFile, "/%s", bootInfo->bootFile);
+#endif
 				}
 
 				free(preLinkedKernelPath);
@@ -675,31 +689,41 @@ void boot(int biosdev)
 #endif // PRE_LINKED_KERNEL_SUPPORT
 
 		/*
-		 * The bootFile normally points to (mach_)kernel but it will be empty when a
-		 * pre-linked kernel was processed, and that is why we check the length here.
+		 * The 'bootFile' normally points to (mach_)kernel but will be empty when
+		 * a prelinkedkernel was processed, or when prelinkedkernel support is
+		 * disabled in the settings file, which is why we check the length here.
 		 */
 
-		if (strlen(bootFile))
+		if (strlen(bootFile) == 0)
 		{
-			_BOOT_DEBUG_DUMP("About to load: %s\n", bootFile);
+#if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // Yosemite, El Capitan and Sierra.
+			sprintf(bootFile, "/System/Library/Kernels/%s", bootInfo->bootFile);
+#else
+			// Set to mach_kernel for Mavericks and earlier versions of OS X.
+			sprintf(bootFile, "/%s", bootInfo->bootFile);
+#endif
+			if (GetFileInfo(NULL, bootFile, &flags, &cachetime))
+			{
+				stop("ERROR: %s not found!\n", bootFile);
+			}
+		}
 
-			retStatus = LoadThinFatFile(bootFile, &fileLoadBuffer);
+		_BOOT_DEBUG_DUMP("About to load: %s\n", bootFile);
 
-#if SUPPORT_32BIT_MODE
-			if (retStatus <= 0 && gPlatform.ArchCPUType == CPU_TYPE_X86_64)
-			{
-				_BOOT_DEBUG_DUMP("Load failed for arch=x86_64, trying arch=i386 now.\n");
+		retStatus = LoadThinFatFile(bootFile, &fileLoadBuffer);
 
-				gPlatform.ArchCPUType = CPU_TYPE_I386;
+#if SUPPORT_32BIT_MODE
+		if (retStatus <= 0 && gPlatform.ArchCPUType == CPU_TYPE_X86_64)
+		{
+			_BOOT_DEBUG_DUMP("Load failed for arch=x86_64, trying arch=i386 now.\n");
 
-				retStatus = LoadThinFatFile(bootFile, &fileLoadBuffer);
-			}
+			gPlatform.ArchCPUType = CPU_TYPE_I386;
 
-			_BOOT_DEBUG_DUMP("LoadStatus(%d): %s\n", retStatus, bootFile);
-#endif // SUPPORT_32BIT_MODE
+			retStatus = LoadThinFatFile(bootFile, &fileLoadBuffer);
 		}
+#endif // SUPPORT_32BIT_MODE
 
-		_BOOT_DEBUG_ELSE_DUMP("bootFile empty!\n");	// Should not happen, but helped me once already.
+		_BOOT_DEBUG_DUMP("LoadStatus(%d): %s\n", retStatus, bootFile);
 
 		/*
 		 * Time to fire up the kernel - previously known as execKernel()
@@ -753,7 +777,6 @@ void boot(int biosdev)
 				sleep(kBootErrorTimeout);
 			}
 #endif
-			
 			_BOOT_DEBUG_DUMP("execKernel-6\n");
 			
 			finalizeKernelBootConfig();
@@ -766,7 +789,6 @@ void boot(int biosdev)
 			// Did we switch to graphics mode yet (think verbose mode)?
 			if (gVerboseMode || bootArgs->Video.v_display != GRAPHICS_MODE)
 			{
-				
 				// _BOOT_DEBUG_SLEEP(6);
 				
 				// Switch to graphics mode and show the (white) Apple logo on a black/gray background.

From ddd489b47fa07d52b47edd39f80eb4b9f62f3ba3 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Wed, 29 Jun 2016 15:48:20 +0200
Subject: [PATCH 552/623] Renaming a preprocessor directive.

---
 i386/boot2/boot.c       | 18 +++++++++---------
 i386/libsaio/platform.h |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index e7f50b2..5bb964a 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -182,7 +182,7 @@ void boot(int biosdev)
 	bootFile[0] = '\0';
 	rootUUID[0] = '\0';
 
-#if PRE_LINKED_KERNEL_SUPPORT
+#if PRELINKED_KERNEL_SUPPORT
 	bool	mayUseKernelCache	= false;
 	bool	flushCaches			= false;
 	bool	kernelSpecified	= false;
@@ -309,7 +309,7 @@ void boot(int biosdev)
 				if (getValueForBootKey(kernelFlags, kIgnoreCachesFlag, &val, &length))
 				{
 					_BOOT_DEBUG_DUMP("Notice: -f (flush cache) specified!\n");
-#if PRE_LINKED_KERNEL_SUPPORT
+#if PRELINKED_KERNEL_SUPPORT
 					flushCaches = true;
 #endif
 				}
@@ -428,7 +428,7 @@ void boot(int biosdev)
 
 	if (haveCABootPlist) // Check boolean before doing more time consuming tasks.
 	{
-#if PRE_LINKED_KERNEL_SUPPORT
+#if PRELINKED_KERNEL_SUPPORT
 		/*
 		 * We cannot use the kernelcache from the Yosemite installer, not yet,
 		 * and thus we load: /System/Library/Caches/Startup/kernelcache instead
@@ -517,7 +517,7 @@ void boot(int biosdev)
 		_BOOT_DEBUG_DUMP("bootInfo->bootFile: %s\n", bootInfo->bootFile);
 		_BOOT_DEBUG_SLEEP(5); */
 
-#if PRE_LINKED_KERNEL_SUPPORT
+#if PRELINKED_KERNEL_SUPPORT
 		_BOOT_DEBUG_DUMP("gPlatform.BootMode = %d\n", gPlatform.BootMode);
 
 		// Preliminary checks to prevent us from doing useless things.
@@ -526,10 +526,10 @@ void boot(int biosdev)
 		_BOOT_DEBUG_DUMP("mayUseKernelCache = %s\n", mayUseKernelCache ? "true" : "false");
 
 		/* 
-		 * A pre-linked kernel, or kernelcache, requires you to have all essential kexts for your
+		 * A prelinkedkernel or kernelcache requires you to have all essential kexts for your
 		 * configuration, including FakeSMC.kext in: /System/Library/Extensions/ 
 		 * Not in /Extra/Extensions/ because this directory will be ignored, completely when a 
-		 * pre-linked kernel or kernelcache is used!
+		 * prelinkedkernel or kernelcache is used!
 		 *
 		 * Note: Not following this word of advise will render your system incapable of booting!
 		 */
@@ -566,7 +566,7 @@ void boot(int biosdev)
 				 */
 				sprintf(bootFile, "%s", gPlatform.KernelCachePath);
 			}
-			else // Try to find a prelinked-kernel/kernelcache
+			else // Try to find a prelinkedkernel/kernelcache
 			{
 				char * preLinkedKernelPath = malloc(128);
 
@@ -584,7 +584,7 @@ void boot(int biosdev)
 				{
 					static char adler32Key[PLATFORM_NAME_LEN + ROOT_PATH_LEN];
 				
-					_BOOT_DEBUG_DUMP("Checking for pre-linked kernel...\n");
+					_BOOT_DEBUG_DUMP("Checking for prelinkedkernel...\n");
 				
 					// Zero out platform info (name and kernel root path).
 					bzero(adler32Key, sizeof(adler32Key));
@@ -686,7 +686,7 @@ void boot(int biosdev)
 		}
 #endif // #if ((MAKE_TARGET_OS & LION) == LION)
 
-#endif // PRE_LINKED_KERNEL_SUPPORT
+#endif // PRELINKED_KERNEL_SUPPORT
 
 		/*
 		 * The 'bootFile' normally points to (mach_)kernel but will be empty when
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 9a86c4d..381a99b 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -230,7 +230,7 @@ typedef struct _PlatformInfo_t
 	char *				KextPlistSpec;			// Initialized and used in drivers.c
 	char *				KernelCachePath;		// Initialized in platform.c and used in boot.c, driver.c
 	char *				HelperPath;				// Initialized in stringTable.c and used in boot.c 	
-#if PRE_LINKED_KERNEL_SUPPORT
+#if PRELINKED_KERNEL_SUPPORT
 	bool				KernelCacheSpecified;	// Set to indicate that a full path is specified.
 #endif
 	

From eec1931ce5ddd88d913351e81dd23a87f2cb17ab Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Wed, 29 Jun 2016 15:50:06 +0200
Subject: [PATCH 553/623] Sierra kernel patch (fixed endAddress).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Comment only change.
– Debug only output change.
---
 i386/libsaio/load.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 7603c43..9b24a4d 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -294,12 +294,14 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 
 static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress)
 {
-	// printf("patchLoadExecutable() called\n");
-	// sleep(1);
+#if (DEBUG_BOOT && PATCH_KEXT_LOADING && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+	printf("patchLoadExecutable() called\n");
+	sleep(1);
+#endif
 
 	char * symbolName = NULL;
 
-	// Skip the first 3000 symbols, to make it located our target quicker.
+	// Skip the first 3000 symbols, to speed up the search process.
 	int skippedSymbolCount	= 0; // (3000 * listSize);
 
 	long symbolNumber		= 0;
@@ -325,7 +327,7 @@ static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned l
 			{
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
-				uint64_t endAddress = (startAddress + 0x200);
+				uint64_t endAddress = (startAddress + 0x300);
 
 				/* printf("__ZN6OSKext14loadExecutableEv found!\n");
  				printf("offset..............: 0x%llx\n", offset);

From 32a6205fd6a473483666bdbc8f420e433ce55931 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Wed, 29 Jun 2016 15:51:05 +0200
Subject: [PATCH 554/623] Add support for loading kexts from:
 /Extra/Extensions/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Debug only change.
---
 i386/boot2/drivers.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index 3e68dd5..6006dae 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -197,6 +197,21 @@ long loadDrivers(char * dirSpec)
 	{
 		_DRIVERS_DEBUG_DUMP("gKextLoadStatus != 3\n");
 
+#if (PATCH_LOAD_EXTRA_KEXTS && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)) // El Capitan and Sierra.
+		// Yes we do. Start by looking for kexts in: /Extra/Extensions/
+		if ((gKextLoadStatus & 2) == 0)
+		{
+			_DRIVERS_DEBUG_DUMP("Calling loadKexts(\"/Extra/Extensions\");\n");
+		 
+			if (loadKexts("/Extra/Extensions", 0) == EFI_SUCCESS)
+			{
+				_DRIVERS_DEBUG_DUMP("loadKexts(2) OK.\n");
+			}
+
+			_DRIVERS_DEBUG_DUMP("\n");
+		}
+#endif
+		// Now progress to the system kexts.
 		if ((gKextLoadStatus & 1) == 0)
 		{
 #if ((MAKE_TARGET_OS & MAVERICKS) == MAVERICKS) // Mavericks, Yosemite and El Capitan specifics.
@@ -205,14 +220,14 @@ long loadDrivers(char * dirSpec)
 			/* For Mavericks we first load the signed kexts.
 			if (loadKexts("/Library/Extensions", 0) == EFI_SUCCESS)
 			{
-				_DRIVERS_DEBUG_DUMP("loadKexts(1) OK.\n");
+				_DRIVERS_DEBUG_DUMP("loadKexts(2) OK.\n");
 			} */
 #endif
 			_DRIVERS_DEBUG_DUMP("\nCalling loadKexts(\"/System/Library/Extensions\");\n");
 			// System kexts
 			if (loadKexts("/System/Library/Extensions", 0) == EFI_SUCCESS)
 			{
-				_DRIVERS_DEBUG_DUMP("loadKexts(2) OK.\n");
+				_DRIVERS_DEBUG_DUMP("loadKexts(3) OK.\n");
 			}
 			_DRIVERS_DEBUG_DUMP("\n");
 		}
@@ -361,7 +376,10 @@ static int loadKexts(char * targetFolder, bool isPluginRun)
 				}
 
 #if DEBUG_DRIVERS
-				if (!isPluginRun && ((strcmp(dirEntryName, "AppleEmulator.kext") == 0) || (strcmp(dirEntryName, "FakeSMC.kext") == 0)))
+				// Show essential kexts.
+				if (!isPluginRun && ((strcmp(dirEntryName, "AppleEmulator.kext") == 0) ||
+									 (strcmp(dirEntryName, "FakeSMC.kext") == 0) ||
+									 (strcmp(dirEntryName, "IONVMeFamily.kext") == 0)))
 				{
 					printf("loadKext(%s) found\n", dirEntryName);
 				}

From 7b9852d1836333e040d821126bd8de817cfc8380 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Wed, 29 Jun 2016 15:51:24 +0200
Subject: [PATCH 555/623] First change for APFS support.

---
 i386/libsaio/disk.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index 6a84793..6f19f72 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -177,6 +177,10 @@ EFI_GUID const GPT_HFSX_GUID				= { 0x5265636F, 0x7665, 0x11AA, { 0xAA, 0x11, 0x
 	EFI_GUID const GPT_CORESTORAGE_GUID		= { 0x53746F72, 0x6167, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
 #endif
 
+#if APFS_SUPPORT
+	// Aople File System (7C3457EF-0000-11AA-AA11-00306543ECAC)
+	EFI_GUID const APFS_GUID				= { 0x7C3457EF, 0x0000, 0x11AA, { 0xAA, 0x11, 0x00, 0x30, 0x65, 0x43, 0xEC, 0xAC } };
+#endif
 
 //==============================================================================
 

From 845fa810cc5a6ca51eeadb1c8e88041dd933538d Mon Sep 17 00:00:00 2001
From: Alex James <theracermaster@gmail.com>
Date: Sun, 24 Jul 2016 20:28:20 -0500
Subject: [PATCH 556/623] Add additional iMac/MacBook/Mac mini/Mac Pro model
 data.

---
 i386/libsaio/platform.h          |  17 +--
 i386/libsaio/smbios/model_data.h | 235 ++++++++++++++++++++++---------
 2 files changed, 174 insertions(+), 78 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 381a99b..6e09088 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -72,14 +72,15 @@
 #define IMAC_122				(IMAC | ( 3 << 15))
 #define IMAC_131				(IMAC | ( 4 << 15))
 #define IMAC_132				(IMAC | ( 5 << 15))
-#define IMAC_141				(IMAC | ( 6 << 15))
-#define IMAC_142				(IMAC | ( 7 << 15))
-#define IMAC_143				(IMAC | ( 8 << 15))
-#define IMAC_144				(IMAC | ( 9 << 15))
-#define IMAC_151				(IMAC | (10 << 15))
-#define IMAC_152				(IMAC | (11 << 15))
-#define IMAC_161				(IMAC | (12 << 15))
-#define IMAC_162				(IMAC | (13 << 15))
+#define IMAC_133				(IMAC | ( 6 << 15))
+#define IMAC_141				(IMAC | ( 7 << 15))
+#define IMAC_142				(IMAC | ( 8 << 15))
+#define IMAC_143				(IMAC | ( 9 << 15))
+#define IMAC_144				(IMAC | (10 << 15))
+#define IMAC_151				(IMAC | (11 << 15))
+#define IMAC_152				(IMAC | (12 << 15))
+#define IMAC_161				(IMAC | (13 << 15))
+#define IMAC_162				(IMAC | (14 << 15))
 #define IMAC_171				 IMAC						// Defaults to iMac17,1
 
 #define MACBOOK_41				(MACBOOK | ( 1 << 15))
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index b01388f..34f170e 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -34,83 +34,139 @@
 // -------------------------------------------------------------------------------------
 	#define SMB_FAMILY	"iMac"
 
-	#if (TARGET_MODEL == IMAC_111)
-		#define SMB_BIOS_VERSION	"IM111.88Z.0034.B00.0910301727"
+	#if (TARGET_MODEL == IMAC_111) // 27-inch, Late 2009
+		// Intel Core i5-750 @ 2.66 GHz - 4 cores / 4 threads
+		// Intel Core i7-860 @ 2.80 GHz - 4 cores / 8 threads
+		// ATI Radeon HD 4850
+		#define SMB_BIOS_VERSION	"IM111.88Z.0034.B04.1509231906"
 		#define SMB_PRODUCT_NAME	"iMac11,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F2268DAE"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '1', ',', '1' }
-	#elif (TARGET_MODEL == IMAC_121)
-		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
+	#elif (TARGET_MODEL == IMAC_121) // 21.5-inch, Mid 2011
+		// Intel Core i3-2100 @ 3.10 GHz - 2 cores / 4 threads
+		// Intel Core i5-2400S @ 2.50 GHz - 4 cores / 4 threads
+		// Intel Core i5-2500S @ 2.70 GHz - 4 cores / 4 threads
+		// Intel Core i7-2600S @ 2.80 GHz - 4 cores / 8 threads
+		// AMD Radeon HD 6750M & AMD Radeon HD 6770M
+		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B23.1510261412"
 		#define SMB_PRODUCT_NAME	"iMac12,1"
 		#define SMB_BOARD_PRODUCT	"Mac-942B5BF58194151B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
-	#elif (TARGET_MODEL == IMAC_122)
-		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B1D.1110171110"
+	#elif (TARGET_MODEL == IMAC_122) // 27-inch, Mid 2011
+		// Intel Core i5-2400 @ 3.10 GHz - 4 cores / 4 threads
+		// Intel Core i5-2500S @ 2.70 GHz - 4 cores / 4 threads
+		// Intel Core i7-2600 @ 3.40 GHz - 4 cores / 8 threads
+		// AMD Radeon HD 6770M & AMD Radeon HD 6970M
+		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B23.1510261412"
 		#define SMB_PRODUCT_NAME	"iMac12,2"
 		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '2' }
-	#elif (TARGET_MODEL == IMAC_131)
-		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
+	#elif (TARGET_MODEL == IMAC_131) // 21.5-inch, Late 2012
+		// Intel Core i5-3335S @ 2.70 GHz - 4 cores / 4 threads
+		// Intel Core i5-3470S @ 2.90 GHz - 4 cores / 4 threads
+		// Intel Core i7-3770S @ 3.10 GHz - 4 cores / 8 threads
+		// NVIDIA GeForce GT 640M & NVIDIA GeForce GT 650M
+		#define SMB_BIOS_VERSION	"IM131.88Z.010A.B09.1509111558"
 		#define SMB_PRODUCT_NAME	"iMac13,1"
 		#define SMB_BOARD_PRODUCT	"Mac-00BE6ED71E35EB86"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '1' }
-	#elif (TARGET_MODEL == IMAC_132)
-		#define SMB_BIOS_VERSION	"IM131.88Z.00CE.B00.1203281326"
+	#elif (TARGET_MODEL == IMAC_132) // 27-inch, Late 2012
+		// Intel Core i5-3470S @ 2.9 GHz - 4 cores / 4 threads
+		// Intel Core i5-3470 @ 3.2 GHz - 4 cores / 4 threads
+		// Intel Core i7-3770 @ 3.4 GHz - 4 cores / 8 threads
+		// NVIDIA GeForce GTX 660M, NVIDIA GeForce GTX 675MX & NVIDIA GeForce GTX 680MX
+		#define SMB_BIOS_VERSION	"IM131.88Z.010A.B09.1509111558"
 		#define SMB_PRODUCT_NAME	"iMac13,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FC02E91DDD3FA6A4"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '2' }
-	#elif (TARGET_MODEL == IMAC_141)
-		#define SMB_BIOS_VERSION	"IM141.88Z.0118.B00.1309031248"
+	#elif (TARGET_MODEL == IMAC_133) // 21.5-inch, Early 2013 (Education)
+		// Intel Core i3-3225 @ 3.30 GHz - 2 cores / 4 threads
+		// Intel HD Graphics 4000
+		#define SMB_BIOS_VERSION	"IM131.88Z.010A.B09.1509111558"
+		#define SMB_PRODUCT_NAME	"iMac13,3"
+		#define SMB_BOARD_PRODUCT	"Mac-7DF2A3B5E5D671ED"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '3' }
+	#elif (TARGET_MODEL == IMAC_141) // 21.5-inch, Late 2013
+		// Intel Core i5-4570R @ 2.70 GHz - 4 cores / 4 threads
+		// Intel Iris Pro Graphics 5200
+		#define SMB_BIOS_VERSION	"IM141.88Z.0118.B13.1602221714"
 		#define SMB_PRODUCT_NAME	"iMac14,1"
 		#define SMB_BOARD_PRODUCT	"Mac-031B6874CF7F642A"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '1' }
-	#elif (TARGET_MODEL == IMAC_142)
-		#define SMB_BIOS_VERSION	"IM141.88Z.0118.B00.1309031249"
+	#elif (TARGET_MODEL == IMAC_142) // 27-inch, Late 2013
+		// Intel Core i5-4570 @ 3.20 GHz - 4 cores / 4 threads
+		// Intel Core i5-4670 @ 3.40 GHz - 4 cores / 4 threads
+		// Intel Core i7-4771 @ 3.50 GHz - 4 cores / 8 threads
+		// NVIDIA GeForce GT 755M, NVIDIA GeForce GTX 775M & NVIDIA GeForce GTX 780M
+		#define SMB_BIOS_VERSION	"IM142.88Z.0118.B13.1602221716"
 		#define SMB_PRODUCT_NAME	"iMac14,2"
 		#define SMB_BOARD_PRODUCT	"Mac-27ADBB7B4CEE8E61"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '2' }
-	#elif (TARGET_MODEL == IMAC_143)
-		#define SMB_BIOS_VERSION	"IM143.88Z.0118.B00.1309031249"
+	#elif (TARGET_MODEL == IMAC_143) // 21.5-inch, Late 2013
+		// Intel Core i5-4570S @ 2.80 GHz - 4 cores / 4 threads
+		// Intel Core i7-4770S @ 3.10 GHz - 4 cores / 8 threads
+		// NVIDIA GeForce GT 750M
+		#define SMB_BIOS_VERSION	"IM143.88Z.0118.B13.1602221716"
 		#define SMB_PRODUCT_NAME	"iMac14,3"
 		#define SMB_BOARD_PRODUCT	"Mac-77EB7D7DAF985301"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '3' }
-	#elif (TARGET_MODEL == IMAC_144)
-		#define SMB_BIOS_VERSION	"IM144.88Z.0179.B03.1405241029"
+	#elif (TARGET_MODEL == IMAC_144) // 21.5-inch, Mid 2014
+		// Intel Core i5-4260U @ 1.40 GHz - 2 cores / 4 threads
+		// Intel HD Graphics 5000
+		#define SMB_BIOS_VERSION	"IM144.88Z.0179.B13.1602221719"
 		#define SMB_PRODUCT_NAME	"iMac14,4"
 		#define SMB_BOARD_PRODUCT	"Mac-81E3E92DD6088272"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '4' }
-	#elif (TARGET_MODEL == IMAC_152)
-		// Intel Core i7-4790K @ 4 GHz
-		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B00.1409291931"
-		#define SMB_PRODUCT_NAME	"iMac15,2"
-		#define SMB_BOARD_PRODUCT	"Mac-FA842E06C61E91C5"
-		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '2' }
-	#elif (TARGET_MODEL == IMAC_151)
-		// Intel Core i5-4690 @ 3.5 GHz
-		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B00.1409291931"
+	#elif (TARGET_MODEL == IMAC_151) // Retina 5K, 27-inch, Late 2014
+		// Intel Core i5-4690 @ 3.50 GHz - 4 cores / 4 threads
+		// Intel Core i7-4790K @ 4.00 GHz - 4 cores / 8 threads
+		// AMD Radeon R9 M290X, AMD Radeon R9 M295X
+		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B06.1602221600"
 		#define SMB_PRODUCT_NAME	"iMac15,1"
 		#define SMB_BOARD_PRODUCT	"Mac-42FD25EABCABB274"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '1' }
-	#elif (TARGET_MODEL == IMAC_162)
-		// Intel Core i5-5575R @ 2.8 GHz & Intel Core i5-5675R @ 3.1 GHz
+	#elif (TARGET_MODEL == IMAC_152) // Retina 5K, 27-inch, Mid 2015
+		// Intel Core i5-4590 @ 3.30 GHz - 4 cores / 4 threads
+		// AMD Radeon R9 M290
+		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B06.1602221600"
+		#define SMB_PRODUCT_NAME	"iMac15,2"
+		#define SMB_BOARD_PRODUCT	"Mac-FA842E06C61E91C5"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '2' }
+	#elif (TARGET_MODEL == IMAC_161) // 21.5-inch, Late 2015
+		// Intel Core i5-5250U @ 1.60 GHz - 2 cores / 4 threads
+		// Intel HD Graphics 6000
+		#define SMB_BIOS_VERSION	"IM161.88Z.0207.B03.1602181033"
+		#define SMB_PRODUCT_NAME	"iMac16,1"
+		#define SMB_BOARD_PRODUCT	"Mac-A369DDC4E67F1C45"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '6', ',', '1' }
+	#elif (TARGET_MODEL == IMAC_162) // Retina 5K, 21.5-inch, Late 2015
+		// Intel Core i5-5575R @ 2.80 GHz - 4 cores / 4 threads
+		// Intel Core i5-5675R @ 3.10 GHz - 4 cores / 4 threads
+		// Intel Core i7-5775R @ 3.30 GHz - 4 cores / 8 threads
 		// Intel Iris Pro Graphics 6200
-		// (21.5inch Late 2015)
 		#define SMB_BIOS_VERSION	"IM162.88Z.0206.B00.1508281353"
 		#define SMB_PRODUCT_NAME	"iMac16,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FFE5EF870D7BA81A"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '6', ',', '2' }
-	#elif (TARGET_MODEL == IMAC_171)
-		// Intel Core i5-6500 @ 3.2 GHz
+	#else // Defaults to iMac17,1 (Retina 5K, 27-inch, Late 2015)
+		// Intel Core i5-6500 @ 3.20 GHz - 4 cores / 4 threads
+		// AMD Radeon R9 M380
+		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B08.1604111319"
+		#define SMB_PRODUCT_NAME	"iMac17,1"
+		#define SMB_BOARD_PRODUCT	"Mac-65CE76090165799A"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '7', ',', '1' }
+	/* #elif (TARGET_MODEL == IMAC_171) // Retina 5K, 27-inch, Late 2015
+		// Intel Core i5-6500 @ 3.20 GHz - 4 cores / 4 threads
 		// AMD Radeon R9 M390
-		// (Retina 5k, 27inch Late 2015)
-		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B00.1509221819"
+		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B08.1604111319"
 		#define SMB_PRODUCT_NAME	"iMac17,1"
 		#define SMB_BOARD_PRODUCT	"Mac-DB15BD556843C820"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '7', ',', '1' }
-	/* #elif (TARGET_MODEL == IMAC_171) // Intel Core i5-6600 @ 3.3 GHz
-		// AMD Radeon R9 M395
-		// (Retina 5k, 27inch Late 2015)
-		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B00.1509221819"
+	#elif (TARGET_MODEL == IMAC_171) // Retina 5K, 27-inch, Late 2015
+		// Intel Core i5-6600 @ 3.30 GHz - 4 cores / 4 threads
+		// Intel Core i7-6700K @ 4.00 GHz - 4 cores / 8 threads
+		// AMD Radeon R9 M395 & AMD Radeon R9 M395X
+		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B08.1604111319"
 		#define SMB_PRODUCT_NAME	"iMac17,1"
 		#define SMB_BOARD_PRODUCT	"Mac-B809C3757DA9BB8D"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '7', ',', '1' } */
@@ -130,10 +186,20 @@
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', '4', ',', '1' }
 	#elif (TARGET_MODEL == MACBOOK_81)
 		// Intel Core M-5Y31 @ 1.10 GHz (2 cores, 4 threads)
-		#define SMB_BIOS_VERSION	"MB81.88Z.0164.B02.1503241252"
+		// Intel Core M-5Y51 @ 1.20 GHz (2 cores, 4 threads)
+		// Intel Core M-5Y71 @ 1.30 GHz (2 cores, 4 threads)
+		#define SMB_BIOS_VERSION	"MB81.88Z.0164.B13.1602161331"
 		#define SMB_PRODUCT_NAME	"MacBook8,1"
 		#define SMB_BOARD_PRODUCT	"Mac-BE0E8AC46FE800CC"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', '8', ',', '1' }
+	#else // Defaults to MacBook9,1
+		// Intel Core m3-6Y30 @ 1.10 GHz (2 cores, 4 threads)
+		// Intel Core m5-6Y54 @ 1.20 GHz (2 cores, 4 threads)
+		// Intel Core m7-6Y75 @ 1.30 GHz (2 cores, 4 threads)
+		#define SMB_BIOS_VERSION	"MB91.88Z.0154.B04.1604191425"
+		#define SMB_PRODUCT_NAME	"MacBook9,1"
+		#define SMB_BOARD_PRODUCT	"Mac-9AE82516C7C6B903"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', '9', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -146,41 +212,55 @@
 	#if (TARGET_MODEL == MACBOOK_AIR_41)
 		// Intel Core i5-2467M @ 1.6GHz (2 cores - 4 threads)
 		// Intel Core i7-2677M @ 1.8GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA41.88Z.0077.B08.1109011050"
+		#define SMB_BIOS_VERSION	"MBA41.88Z.0077.B14.1510261805"
 		#define SMB_PRODUCT_NAME	"MacBookAir4,1"
 		#define SMB_BOARD_PRODUCT	"Mac-C08A6BB70A942AC2"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '4', ',', '1' }
 	#elif (TARGET_MODEL == MACBOOK_AIR_42)
 		// Intel Core i5-2557M @ 1.7GHz (2 cores - 4 threads)
 		// Intel Core i7-2677M @ 1.8GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA41.88Z.0077.B08.1109011050"
+		#define SMB_BIOS_VERSION	"MBA41.88Z.0077.B14.1510261805"
 		#define SMB_PRODUCT_NAME	"MacBookAir4,2"
 		#define SMB_BOARD_PRODUCT	"Mac-742912EFDBEE19B3"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '4', ',', '2' }
+	#elif (TARGET_MODEL == MACBOOK_AIR_51)
+		// Intel Core i5-3317U @ 1.7GHz (2 cores - 4 threads)
+		// Intel Core i7-3667U @ 2.0GHz (2 cores - 4 threads)
+		#define SMB_BIOS_VERSION	"MBA51.88Z.00EF.B04.1509111654"
+		#define SMB_PRODUCT_NAME	"MacBookAir5,1"
+		#define SMB_BOARD_PRODUCT	"Mac-66F35F19FE2A0D05"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '5', ',', '1' }
+	#elif (TARGET_MODEL == MACBOOK_AIR_52)
+		// Intel Core i5-3317U @ 1.7GHz (2 cores - 4 threads)
+		// Intel Core i7-3667U @ 2.0GHz (2 cores - 4 threads)
+		#define SMB_BIOS_VERSION	"MBA51.88Z.00EF.B04.1509111654"
+		#define SMB_PRODUCT_NAME	"MacBookAir5,2"
+		#define SMB_BOARD_PRODUCT	"Mac-2E6FAB96566FE58C"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '5', ',', '2' }
 	#elif (TARGET_MODEL == MACBOOK_AIR_61)
-		// Intel Core i5-4250U @ 1.30 GHz (2 cores - 4 threads)
-		// Intel Core i7-4650U @ 1.70 GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B12.1405241030"
+		// Intel Core i5-3427U @ 1.8GHz (2 cores - 4 threads)
+		// Intel Core i7-4650U @ 1.7GHz (2 cores - 4 threads)
+		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B22.1602221559"
 		#define SMB_PRODUCT_NAME	"MacBookAir6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-35C1E88140C3E6CF"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '6', ',', '1' }
 	#elif (TARGET_MODEL == MACBOOK_AIR_62)
 		// Intel Core i5-4250U @ 1.30 GHz (2 cores - 4 threads)
 		// Intel Core i7-4650U @ 1.70 GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B12.1405241030"
+		#define SMB_BIOS_VERSION	"MBA61.88Z.0099.B22.1602221559"
 		#define SMB_PRODUCT_NAME	"MacBookAir6,2"
 		#define SMB_BOARD_PRODUCT	"Mac-7DF21CB3ED6977E5"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '6', ',', '2' }
 	#elif (TARGET_MODEL == MACBOOK_AIR_71)
 		// Intel Core i5-5250U @ 1.60 GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA71.88Z.0166.B00.1502131457"
+		#define SMB_BIOS_VERSION	"MBA71.88Z.0166.B12.1602221953"
 		#define SMB_PRODUCT_NAME	"MacBookAir7,1"
 		#define SMB_BOARD_PRODUCT	"Mac-9F18E312C5C2BF0B"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '7', ',', '1' }
 	#else // Defaults to MacBookAir7,2
 		// Intel Core i5-5250U @ 1.60 GHz (2 cores - 4 threads)
 		// Intel Core i7-5650U @ 2.20 GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MBA71.88Z.0166.B00.1502131457"
+		#define SMB_BIOS_VERSION	"MBA71.88Z.0166.B12.1602221953"
 		#define SMB_PRODUCT_NAME	"MacBookAir7,2"
 		#define SMB_BOARD_PRODUCT	"Mac-937CB26E2E02BB01"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'A', 'i', 'r', '7', ',', '2' }
@@ -194,34 +274,34 @@
 	#define SMB_FAMILY	"MacBookPro"
 
 	#if(TARGET_MODEL == MACBOOK_PRO_61)
-		#define SMB_BIOS_VERSION	"MBP61.88Z.0057.B0C.1007261552"
+		#define SMB_BIOS_VERSION	"MBP61.88Z.0057.B11.1509232013"
 		#define SMB_PRODUCT_NAME	"MacBookPro6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F22589C8"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '6', ',', '1' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_81)
-		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
+		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B2C.1510261540"
 		#define SMB_PRODUCT_NAME	"MacBookPro8,1"
 		#define SMB_BOARD_PRODUCT	"Mac-94245B3640C91C81"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '1' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_82)
-		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
+		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B2C.1510261540"
 		#define SMB_PRODUCT_NAME	"MacBookPro8,2"
 		#define SMB_BOARD_PRODUCT	"Mac-94245A3940C91C80"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '2' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_83)
-		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B27.1201241646"
+		#define SMB_BIOS_VERSION	"MBP81.88Z.0047.B2C.1510261540"
 		#define SMB_PRODUCT_NAME	"MacBookPro8,3"
 		#define SMB_BOARD_PRODUCT	"Mac-942459F5819B171B"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '8', ',', '3' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_91)
 		// Intel Core i7-3820QM @ 2.70 GHz - 4 cores / 8 threads.
-		#define SMB_BIOS_VERSION	"MBP91.88Z.00D3.B02.1203281326"
+		#define SMB_BIOS_VERSION	"MBP91.88Z.00D3.B0D.1602221713"
 		#define SMB_PRODUCT_NAME	"MacBookPro9,1"
 		#define SMB_BOARD_PRODUCT	"Mac-4B7AC7E43945597E"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '9', ',', '1' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_92)
 		// Intel Core i7-3820QM @ 2.70 GHz - 4 cores / 8 threads.
-		#define SMB_BIOS_VERSION	"MBP91.88Z.00D3.B02.1203281326"
+		#define SMB_BIOS_VERSION	"MBP91.88Z.00D3.B0D.1602221713"
 		#define SMB_PRODUCT_NAME	"MacBookPro9,2"
 		#define SMB_BOARD_PRODUCT	"Mac-6F01561E16C75D06"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '9', ',', '2' }
@@ -229,14 +309,14 @@
 		// Intel Core i7-3635QM @ 2.40 GHz - 4 cores / 8 threads.
 		// Intel Core i7-3740QM @ 2.70 GHz - 4 cores / 8 threads.
 		// Intel Core i7-3840QM @ 2.80 GHz - 4 cores / 8 threads.
-		#define SMB_BIOS_VERSION	"MBP101.88Z.00EE.B03.1212211437"
+		#define SMB_BIOS_VERSION	"MBP101.88Z.00EE.B0A.1509111559"
 		#define SMB_PRODUCT_NAME	"MacBookPro10,1"
 		#define SMB_BOARD_PRODUCT	"Mac-C3EC7CD22292981F"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '1' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_102)
 		// Intel Core i5-3230QM @ 2.60 GHz - 2 cores / 4 threads.
 		// Intel Core i7-3540QM @ 3.00 GHz - 2 cores / 4 threads.
-		#define SMB_BIOS_VERSION	"MBP102.88Z.0106.B03.1211161133"
+		#define SMB_BIOS_VERSION	"MBP102.88Z.0106.B0A.1509130955"
 		#define SMB_PRODUCT_NAME	"MacBookPro10,2"
 		#define SMB_BOARD_PRODUCT	"Mac-AFD8A9D944EA4843"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '0', ',', '2' }
@@ -244,27 +324,42 @@
 		// Intel Core i5-4258U @ 2.40 GHz - 2 cores / 4 threads.
 		// Intel Core i5-4288U @ 2.60 GHz - 2 cores / 4 threads.
 		// Intel Core i7-4558U @ 2.80 GHz - 2 cores / 4 threads.
-		#define SMB_BIOS_VERSION	"MBP111.88Z.0138.B07.1402121134"
+		#define SMB_BIOS_VERSION	"MBP111.88Z.0138.B17.1602221718"
 		#define SMB_PRODUCT_NAME	"MacBookPro11,1"
 		#define SMB_BOARD_PRODUCT	"Mac-189A3D4F975D5FFC"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '1' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_112)
 		// Intel Core i7-4750HQ @ 2.00 GHz - 4 cores / 8 threads.
 		// Intel Core i7-4950HQ @ 2.40 GHz - 4 cores / 8 threads.
-		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B02.1310181745"
+		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B17.1602221600"
 		#define SMB_PRODUCT_NAME	"MacBookPro11,2"
 		#define SMB_BOARD_PRODUCT	"Mac-3CBD00234E554E41"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '2' }
 	#elif (TARGET_MODEL == MACBOOK_PRO_113)
 		// Intel Core i7-4850HQ @ 2.30 GHz - 4 cores / 8 threads.
 		// Intel Core i7-4960HQ @ 2.60 GHz - 4 cores / 8 threads.
-		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B08.1406081756"
+		#define SMB_BIOS_VERSION	"MBP112.88Z.0138.B17.1602221600"
 		#define SMB_PRODUCT_NAME	"MacBookPro11,3"
 		#define SMB_BOARD_PRODUCT	"Mac-2BD1B31983FE1663"
-		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '2', ',', '1' }
-	#else
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '3' }
+	#elif (TARGET_MODEL == MACBOOK_PRO_114)
+		// Intel Core i7-4770HQ @ 2.20 GHz - 4 cores / 8 threads.
+		// Intel Core i7-4870HQ @ 2.50 GHz - 4 cores / 8 threads.
+		// Intel Core i7-4980HQ @ 2.80 GHz - 4 cores / 8 threads.
+		#define SMB_BIOS_VERSION	"MBP114.88Z.0172.B09.1602151732"
+		#define SMB_PRODUCT_NAME	"MacBookPro11,3"
+		#define SMB_BOARD_PRODUCT	"Mac-06F11FD93F0323C5"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '4' }
+	#elif (TARGET_MODEL == MACBOOK_PRO_115)
+		// Intel Core i7-4870HQ @ 2.50 GHz - 4 cores / 8 threads.
+		// Intel Core i7-4980HQ @ 2.80 GHz - 4 cores / 8 threads.
+		#define SMB_BIOS_VERSION	"MBP114.88Z.0172.B09.1602151732"
+		#define SMB_PRODUCT_NAME	"MacBookPro11,5"
+		#define SMB_BOARD_PRODUCT	"Mac-06F11F11946D27C5"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '5' }
+	#else // Defaults to MacBookPro12,1
 		// Intel Core i5-5257U @ 2.70 GHz - 2 cores / 4 threads.
-		#define SMB_BIOS_VERSION	"MBP121.88Z.0167.B00.1502132146"
+		#define SMB_BIOS_VERSION	"MBP121.88Z.0167.B16.1602111810"
 		#define SMB_PRODUCT_NAME	"MacBookPro12,1"
 		#define SMB_BOARD_PRODUCT	"Mac-E43C1C25D4880AD6"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '2', ',', '1' }
@@ -285,36 +380,36 @@
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '4', ',', '1' }
 	#elif (TARGET_MODEL == MACMINI_51)
 		// Intel Core i5-2415M @ 2.3 GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MM51.88Z.0077.B10.1201241549"
+		#define SMB_BIOS_VERSION	"MM51.88Z.0077.B14.1510261805"
 		#define SMB_PRODUCT_NAME	"Macmini5,1"
 		#define SMB_BOARD_PRODUCT	"Mac-8ED6AF5B48C039E1"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '5', ',', '1' }
 	#elif (TARGET_MODEL == MACMINI_52)
 		// Intel Core i5-2520M @ 2.5GHz (2 cores - 4 threads)
-		#define SMB_BIOS_VERSION	"MM51.88Z.0077.B10.1201241549"
+		#define SMB_BIOS_VERSION	"MM51.88Z.0077.B14.1510261805"
 		#define SMB_PRODUCT_NAME	"Macmini5,2"
 		#define SMB_BOARD_PRODUCT	"Mac-4BC72D62AD45599E"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '5', ',', '2' }
 	#elif (TARGET_MODEL == MACMINI_53)
 		// Intel Core i7-2635QM @ 2.0GHz (4 cores - 8 threads)
-		#define SMB_BIOS_VERSION	"MM51.88Z.0077.B10.1201241549"
+		#define SMB_BIOS_VERSION	"MM51.88Z.0077.B14.1510261805"
 		#define SMB_PRODUCT_NAME	"Macmini5,3"
 		#define SMB_BOARD_PRODUCT	"Mac-7BA5B2794B2CDB12"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '5', ',', '3' }
 	#elif (TARGET_MODEL == MACMINI_61)
 		// Intel Core i5-3210M @ 2.50 GH (2 cores - 4 theeads)
-		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B03.1211161202"
+		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B0A.1509111654"
 		#define SMB_PRODUCT_NAME	"Macmini6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-031AEE4D24BFF0B1"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '1' }
 	#elif (TARGET_MODEL == MACMINI_62)
 		// Intel Core i7-3615QM @ 2.30 GHz (4 cores - 8 threads)
-		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B03.1211161202"
+		#define SMB_BIOS_VERSION	"MM61.88Z.0106.B0A.1509111654"
 		#define SMB_PRODUCT_NAME	"Macmini6,2"
 		#define SMB_BOARD_PRODUCT	"Mac-F65AE981FFA204ED"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '6', ',', '2' }
 	#else // Defaults to Macmini7,1
-		#define SMB_BIOS_VERSION	"MM71.88Z.0220.B00.1409291751"
+		#define SMB_BIOS_VERSION	"MM71.88Z.0220.B07.1602221546"
 		#define SMB_PRODUCT_NAME	"Macmini7,1"
 		#define SMB_BOARD_PRODUCT	"Mac-35C5E08120C7EEAF"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'm', 'i', 'n', 'i', '7', ',', '1' }
@@ -333,7 +428,7 @@
 		#define SMB_BOARD_PRODUCT	"Mac-F4208DC8"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '3', ',', '1' }
 	#elif (TARGET_MODEL == MACPRO_41)
-		#define SMB_BIOS_VERSION	"MP41.88Z.0081.B04.0903051113"
+		#define SMB_BIOS_VERSION	"MP41.88Z.0081.B08.1001221313"
 		#define SMB_PRODUCT_NAME	"MacPro4,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F221BEC8"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '4', ',', '1' }
@@ -343,10 +438,10 @@
 		#define SMB_BOARD_PRODUCT	"Mac-F221BEC8"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '5', ',', '1' }
 	#else // Defaults to MacPro6,1
-		#define SMB_BIOS_VERSION	"MP61.88Z.0116.B04.1312061508"
+		#define SMB_BIOS_VERSION	"MP61.88Z.0116.B17.1602221600"
 		#define SMB_PRODUCT_NAME	"MacPro6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F60DEB81FF30ACF6"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '6', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
-#endif
\ No newline at end of file
+#endif

From c3f20cd9c4a7df0eb0f6e7d068bf85330d004b2b Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Thu, 4 Aug 2016 01:23:14 +0200
Subject: [PATCH 557/623] Update from local tree
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Warning: DYNAMIC_RAM_OVERRIDE_SIZE is renamed to
STATIC_RAM_OVERRIDE_SIZE (fix your settings file).
---
 i386/boot2/graphics.c                 | 15 +++---
 i386/libsaio/acpi/patcher.h           |  5 +-
 i386/libsaio/bootstruct.c             | 71 +++++++++++++++++----------
 i386/libsaio/bootstruct.h             |  2 +
 i386/libsaio/cpu.c                    | 12 ++++-
 i386/libsaio/cpu/Intel/dynamic_data.h | 12 +++--
 i386/libsaio/cpu/essentials.h         |  5 +-
 i386/libsaio/efi.c                    | 17 ++++---
 i386/libsaio/platform.c               | 20 ++++++--
 i386/libsaio/smbios.c                 |  2 +-
 i386/libsaio/smbios/dynamic_data.h    | 19 ++++---
 11 files changed, 118 insertions(+), 62 deletions(-)

diff --git a/i386/boot2/graphics.c b/i386/boot2/graphics.c
index 165e777..55673ec 100755
--- a/i386/boot2/graphics.c
+++ b/i386/boot2/graphics.c
@@ -93,7 +93,7 @@ static unsigned short getVESAModeWithProperties(unsigned short width, unsigned s
 #if DEBUG
 		printf("Mode %x: %dx%dx%d mm:%d attr:%x\n", * modePtr, modeInfo.XResolution, modeInfo.YResolution, modeInfo.BitsPerPixel, 
 													modeInfo.MemoryModel, modeInfo.ModeAttributes);
-		sleep(1);
+		sleep(10);
 #endif
 
 		// Filter out unwanted modes based on mode attributes.
@@ -212,7 +212,7 @@ long setVESAGraphicsMode(unsigned short width, unsigned short height, unsigned c
 {
 	VBEModeInfoBlock	minfo;
 
-	unsigned short	mode = 280; // Default to 1024 * 768 * 32 (1920 * 1200 * 32 would be 330)
+	unsigned short	mode = 280; // Defaults to 1024 * 768 * 32 (1920 * 1200 * 32 would be 330)
 	unsigned short	vesaVersion;
 
 	long status = (long)EFI_UNSUPPORTED;
@@ -224,7 +224,8 @@ long setVESAGraphicsMode(unsigned short width, unsigned short height, unsigned c
 										 0, &minfo, &vesaVersion);
 #if DEBUG
 		printf("\nsetVESAGraphicsMode: %d\n%d\n%d\n%d\n%d\n%x\n%x\nSleeping for 25 seconds...", mode, minfo.XResolution,
-			   minfo.YResolution, minfo.BitsPerPixel, minfo.BytesPerScanline, minfo.PhysBasePtr_low, minfo.PhysBasePtr_high);
+			   minfo.YResolution, minfo.BitsPerPixel, minfo.BytesPerScanline, minfo.PhysBasePtr_low, minfo.PhysBasePtr_high, VBEMakeUInt32(minfo.PhysBasePtr));
+		sleep(25);
 #endif
 
 		if (mode == modeEndOfList)
@@ -248,10 +249,10 @@ long setVESAGraphicsMode(unsigned short width, unsigned short height, unsigned c
 
 		// Update bootArgs with the data provided by the selected VESA mode.
 		bootArgs->Video.v_display	= GRAPHICS_MODE;
-		bootArgs->Video.v_width		= minfo.XResolution;		/* 1920 or 1600 */
-		bootArgs->Video.v_height	= minfo.YResolution;		/* 1200 or 900 */
-		bootArgs->Video.v_depth		= minfo.BitsPerPixel;		/* 32 */
-		bootArgs->Video.v_rowBytes	= minfo.BytesPerScanline;	/* 7680 or 6400 */
+		bootArgs->Video.v_width		= minfo.XResolution;		/* Examples: 1920, 1600, 1680 */
+		bootArgs->Video.v_height	= minfo.YResolution;		/* Examples: 1200, 1050 900 */
+		bootArgs->Video.v_depth		= minfo.BitsPerPixel;		/* Examples: 8, 30, 32 */
+		bootArgs->Video.v_rowBytes	= minfo.BytesPerScanline;	/* Examples: 7680, 6720, 6400 */
 		bootArgs->Video.v_baseAddr	= VBEMakeUInt32(minfo.PhysBasePtr);
 	}
 	while (0);
diff --git a/i386/libsaio/acpi/patcher.h b/i386/libsaio/acpi/patcher.h
index 9f4ae0d..79aca88 100644
--- a/i386/libsaio/acpi/patcher.h
+++ b/i386/libsaio/acpi/patcher.h
@@ -49,10 +49,11 @@ unsigned int search64bitPattern(unsigned int aStartAddress, int aNumberOfBytes,
 
 int loadACPITable(int tableIndex)
 {
-	char dirSpec[48] = "";
+	char dirSpec[48];
 	long fileSize = 0;
 	void * tableAddress = (void *)kLoadAddr;
-
+	
+	bzero(dirSpec, 48);
 #if LOAD_MODEL_SPECIFIC_ACPI_DATA
 	// Example: /Extra/ACPI/DSDT-MacBookPro101.aml
 	//          0123456789 0123456789 0123456789 1
diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index fd2a351..541786f 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -95,44 +95,62 @@ void initKernelBootConfig(void)
 	
 #if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 	// Adding a 16 KB log space.
-	bootArgs->performanceDataSize	= 0;
-	bootArgs->performanceDataStart	= 0;
+	bootArgs->performanceDataSize			= 0;
+	bootArgs->performanceDataStart			= 0;
 	
 	// AppleKeyStore.kext
-	bootArgs->keyStoreDataSize		= 0;
-	bootArgs->keyStoreDataStart		= 0;
+	bootArgs->keyStoreDataSize				= 0;
+	bootArgs->keyStoreDataStart				= 0;
 	
-	bootArgs->bootMemSize			= 0;
-	bootArgs->bootMemStart			= 0;
+	bootArgs->bootMemSize					= 0;
+	bootArgs->bootMemStart					= 0;
 	
 #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
-	bootArgs->flags					= 0;
+	bootArgs->flags							= 0;
 
 #if REBOOT_ON_PANIC
-	bootArgs->flags					= kBootArgsFlagRebootOnPanic;
+	bootArgs- >flags						|= kBootArgsFlagRebootOnPanic;
 #endif
 
 #if UISCALE_2X
-	bootArgs->flags					|= kBootArgsFlagHiDPI;
+	bootArgs->flags							|= kBootArgsFlagHiDPI;
 #endif
 
 #if BLACKMODE
-	bootArgs->flags					|= kBootArgsFlagBlackTheme; // (kBootArgsFlagBlack + kBootArgsFlagBlackTheme);
+	bootArgs->flags							|= kBootArgsFlagBlackTheme; // (kBootArgsFlagBlack + kBootArgsFlagBlackTheme);
 #endif
 
 #endif // #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
 
-#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)
-	bootArgs->flags					|= (kBootArgsFlagCSRConfigMode + kBootArgsFlagCSRBoot);
+#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN) // El Capitan and Sierra
+	bootArgs->flags							|= (kBootArgsFlagCSRConfigMode + kBootArgsFlagCSRBoot);
 
-	bootArgs->csrActiveConfig		= CSR_ALLOW_DEVICE_CONFIGURATION;
+	bootArgs->csrActiveConfig				= CSR_ALLOW_DEVICE_CONFIGURATION;
 
-	bootArgs->csrCapabilities		= CSR_CAPABILITY_UNLIMITED;
+	bootArgs->csrCapabilities				= CSR_CAPABILITY_UNLIMITED;
 
-	bootArgs->boot_SMC_plimit		= 0;
-#endif
+	bootArgs->boot_SMC_plimit				= 0;
+	bootArgs->bootProgressMeterStart		= 0;
+	bootArgs->bootProgressMeterEnd			= 1024;
 
-	bootArgs->kslide				= 0;
+/*	enum
+	{
+		kProgressMeterMax    = 1024,
+		kProgressMeterEnd    = 512,
+	};
+
+	if (bootArgs->flags & kBootArgsFlagInstallUI)
+	{
+		// Values from 0 to 1024
+		vc_progress_meter_start = (bootargs->bootProgressMeterStart * kProgressMeterMax) / 65535;
+		vc_progress_meter_end   = (bootargs->bootProgressMeterEnd   * kProgressMeterMax) / 65535;
+ 
+		bootArgs->bootProgressMeterStart	= 0;
+		bootArgs->bootProgressMeterEnd		= 1024;
+	} */
+
+#endif
+	bootArgs->kslide						= 0;
 #endif // #if ((MAKE_TARGET_OS & LION) == LION)
 }
 
@@ -220,18 +238,21 @@ void finalizeKernelBootConfig(void)
 	bootArgs->performanceDataStart	= 0;
 
 	// AppleKeyStore.kext
-	bootArgs->keyStoreDataSize	= 0;
-	bootArgs->keyStoreDataStart	= 0;
+	bootArgs->keyStoreDataSize		= 0;
+	bootArgs->keyStoreDataStart		= 0;
 
-	bootArgs->bootMemSize	= 0;
-	bootArgs->bootMemStart	= 0;
+	bootArgs->bootMemSize			= 0;
+	bootArgs->bootMemStart			= 0;
 	
-	bootArgs->kslide		= 0;
+	bootArgs->kslide				= 0;
 #endif
 	
-#if (((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION) && (BLACKMODE == 1))
-	bootArgs->flags			|= kBootArgsFlagBlack;
-#endif
+/* #if (((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION) && (BLACKMODE == 1))
+	//
+	// Note: Hides the white progressbar and efi://chosen/IOProgressBackbuffer is missing.
+	//
+ 	bootArgs->flags			|= kBootArgsFlagBlack;
+#endif */
 
 #if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
 	bootArgs->PhysicalMemorySize	= gPlatform.RAM.MemorySize;
diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index a5439e1..9b16402 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -70,10 +70,12 @@
 
 #ifndef kBootArgsFlagBlackTheme
 	#define kBootArgsFlagBlackTheme			(1 << 6)	// 64
+	// Selects the white progressbar (xnu/osfmk/console/video_console.c)
 #endif
 
 #ifndef kBootArgsFlagLoginUI
 	#define kBootArgsFlagLoginUI			(1 << 7)	// 128
+	// Selects the white progressbar (xnu/osfmk/console/video_console.c)
 #endif
 
 #ifndef kBootArgsFlagInstallUI
diff --git a/i386/libsaio/cpu.c b/i386/libsaio/cpu.c
index ab7af82..dff29ff 100644
--- a/i386/libsaio/cpu.c
+++ b/i386/libsaio/cpu.c
@@ -233,7 +233,9 @@ void checkFlexRatioMSR(void)
 	if (msr & bit(16)) // Flex ratio enabled?
 	{
 		uint8_t flexRatio = ((msr >> 8) & 0xff);
-
+#if DEBUG_CPU
+		printf("MSR(%x) Flex ratio enabled!\n", MSR_FLEX_RATIO);
+#endif
 		// Sanity checks.
 		if (flexRatio < gPlatform.CPU.MinBusRatio || flexRatio > gPlatform.CPU.MaxBusRatio)
 		{
@@ -246,6 +248,14 @@ void checkFlexRatioMSR(void)
 			gPlatform.CPU.MaxBusRatio = flexRatio;
 		}
 	}
+#if DEBUG_CPU
+	else
+	{
+		printf("MSR(%x) Flex ratio NOT Enabled\n", MSR_FLEX_RATIO);
+	}
+
+	sleep(1);
+#endif
 }
 #endif // INTEL_CORE_TECHNOLOGY
 
diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 6d7eb2c..22c14bd 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -393,14 +393,20 @@ void initCPUStruct(void)
 					hiBit = 31;
 					break;
 
-//				case CPU_MODEL_BROADWELL:
-				case CPU_MODEL_BROADWELL_ULT:
+				case CPU_MODEL_BROADWELL:
+//				case CPU_MODEL_BROADWELL_ULT:
+				case CPU_MODEL_BROADWELL_H:
+				case CPU_MODEL_BRYSTALWELL:
+				case CPU_MODEL_BROADWELL_E:
+
 					CoreBridgeType = BROADWELL;
 					hiBit = 31;
 					break;
 
 				case CPU_MODEL_SKYLAKE:
-				case CPU_MODEL_SKYLAKE_H_S:
+//				case CPU_MODEL_SKYLAKE_ULT:
+//				case CPU_MODEL_SKYLAKE_ULX:
+				case CPU_MODEL_SKYLAKE_DT:
 					CoreBridgeType = SKYLAKE;
 					hiBit = 31;
 					// gPlatform.CPU.ARTFrequency = (3427489466 * 2 / 284) = 24137249,76056338028169 MHz
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index afa7011..2c8671d 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -192,9 +192,12 @@
 #define CPU_MODEL_BROADWELL_ULT		0x3D
 #define CPU_MODEL_BROADWELL_H		0x47
 #define CPU_MODEL_BRYSTALWELL		0x4C
+#define CPU_MODEL_BROADWELL_E		0x4F
 
 #define CPU_MODEL_SKYLAKE			0x4E
-#define CPU_MODEL_SKYLAKE_H_S		0x5E
+#define CPU_MODEL_SKYLAKE_ULT		0x4E
+#define CPU_MODEL_SKYLAKE_ULX		0x4E
+#define CPU_MODEL_SKYLAKE_DT		0x5E
 
 #define DALES_BRIDGE	1
 #define SANDY_BRIDGE	2
diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index abc05d2..a90389e 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -75,6 +75,7 @@ void initEFITree(void)
 
 	DT__AddProperty(gPlatform.DT.RootNode, "model", 5, ACPI);
 	DT__AddProperty(gPlatform.DT.RootNode, "compatible", 5, ACPI);
+	// DT__AddProperty(gPlatform.DT.RootNode, "has-safe-sleep", 1, 0);
 	
 	Node * efiNode = DT__AddChild(gPlatform.DT.RootNode, "efi");
 
@@ -126,6 +127,7 @@ void initEFITree(void)
 	DT__AddProperty(platformNode, "StartupPowerEvents", sizeof(STARTUP_POWER_EVENTS), (EFI_UINT8*) &STARTUP_POWER_EVENTS);
 	DT__AddProperty(platformNode, "InitialTSC", sizeof(uint64_t), &gPlatform.CPU.TSCFrequency);
 	DT__AddProperty(platformNode, "SystemSerialNumber", sizeof(SYSTEM_SERIAL_NUMBER), (EFI_CHAR16*) SYSTEM_SERIAL_NUMBER);
+	// DT__AddProperty(platformNode, "nv-edid", sizeof(EFI_UINT8), (EFI_CHAR8*) 0);
 
 	if (gPlatform.CPU.FSBFrequency)
 	{
@@ -222,7 +224,8 @@ void initEFITree(void)
 	}
 	else
 	{
-		EFI_UINT8 seedBuffer[64] = {0};
+		EFI_UINT8 seedBufferAlternative[64];
+		bzero(seedBufferAlternative, 64);
 		//
 		// Main loop to get the 64 bytes.
 		//
@@ -246,7 +249,7 @@ void initEFITree(void)
 			rdi = (rdi ^ rcx);										// xor		%rcx,	%rdi
 			rdi = (rdi ^ rdx);										// xor		%rdx,	%rdi
 
-			seedBuffer[index] = (rdi & 0xff);						// mov		%dil,	(%r15,%r12,1)
+			seedBufferAlternative[index] = (rdi & 0xff);						// mov		%dil,	(%r15,%r12,1)
 
 			edi = (edi & 0x2f);										// and		$0x2f,	%edi
 			edi = (edi + esi);										// add		%esi,	%edi
@@ -256,12 +259,12 @@ void initEFITree(void)
 		} while (index < 64);										// cmp		%r14d,	%r12d
 																	// jne		0x17e55		(next)
 
-		DT__AddProperty(chosenNode, "random-seed", sizeof(seedBuffer), (EFI_UINT8*) &seedBuffer);
-		
-		DT__AddProperty(chosenNode, "booter-name", 12, "bootbase.efi");
-		DT__AddProperty(chosenNode, "booter-version", 11, "version:307");
-		DT__AddProperty(chosenNode, "booter-build-time", 28, "Fri Sep  4 15:34:00 PDT 2015");
+		DT__AddProperty(chosenNode, "random-seed", sizeof(seedBufferAlternative), (EFI_UINT8*) &seedBufferAlternative);
 	}
+
+	DT__AddProperty(chosenNode, "booter-name", 12, "bootbase.efi");
+	DT__AddProperty(chosenNode, "booter-version", 11, "version:307");
+	DT__AddProperty(chosenNode, "booter-build-time", 28, "Fri Sep  4 15:34:00 PDT 2015");
 #endif
 
 #if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index a01bceb..1389c22 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -238,25 +238,27 @@ void initPlatform(int biosDevice)
 	const char * ramPartNumber[]	= STATIC_RAM_PART_NUMBERS;
 	const char * ramSerialNumber[]	= STATIC_RAM_SERIAL_NUMBERS;
 
-#if DYNAMIC_RAM_OVERRIDE_SIZE
-	int ramSize[]					= DYNAMIC_RAM_OVERRIDE_SIZES;
+#if STATIC_RAM_OVERRIDE_SIZE
+	int ramSize[]					= STATIC_RAM_OVERRIDE_SIZES;
 #endif
 
 	int i = 0;
+	int populatedSlotCount = 0;
 
 	// Loop through the static RAM vendors (might be different).
 	for (; i < STATIC_RAM_SLOTS; i++)
 	{
 		gPlatform.RAM.SlotCount++;
 
-		// We check for "N/A" so make sure you use that in config/settings.h
+		// We check for "N/A" so make sure you use that in config/settings.h for unused RAM banks.
 		if (strcmp(ramVendor[i], "N/A") != 0)
 		{
 			_PLATFORM_DEBUG_DUMP("Slot:%d, ", i); 
 
+			populatedSlotCount++;
 			gPlatform.RAM.MODULE[i].InUse			= true;
-			gPlatform.RAM.MODULE[i].Type			= DYNAMIC_RAM_OVERRIDE_TYPE;
-#if DYNAMIC_RAM_OVERRIDE_SIZE
+			gPlatform.RAM.MODULE[i].Type			= STATIC_RAM_OVERRIDE_TYPE;
+#if STATIC_RAM_OVERRIDE_SIZE
 			gPlatform.RAM.MODULE[i].Size			= ramSize[i];
 
 			_PLATFORM_DEBUG_DUMP("Size:%d, ", gPlatform.RAM.MODULE[i].Size); 
@@ -269,12 +271,20 @@ void initPlatform(int biosDevice)
 								 gPlatform.RAM.MODULE[i].Vendor,
 								 gPlatform.RAM.MODULE[i].PartNumber,
 								 gPlatform.RAM.MODULE[i].SerialNumber);
+           	_PLATFORM_DEBUG_SLEEP(2);
 		}
 		else
 		{
 			// Properly initialized for: smbios/dynamic_data.h which relies on it.
 			gPlatform.RAM.MODULE[i].InUse			= false;
 		}
+		
+		_PLATFORM_DEBUG_SLEEP(1);
+	}
+	
+	if (populatedSlotCount < 2)
+	{
+		stop("At least 2 RAM banks required, check vendors in configuration file)!\n");
 	}
 
 	_PLATFORM_DEBUG_DUMP("Static data for %d RAM BANKS used.\n", gPlatform.RAM.SlotCount);
diff --git a/i386/libsaio/smbios.c b/i386/libsaio/smbios.c
index 0830aa2..d4bf1b0 100755
--- a/i386/libsaio/smbios.c
+++ b/i386/libsaio/smbios.c
@@ -83,7 +83,7 @@ void setupSMBIOS(void)
 			if (currentStructureType == kSMBTypeMemoryDevice)
 			{
 				UInt64 memorySize = 0;
-#if DYNAMIC_RAM_OVERRIDE_SIZE
+#if STATIC_RAM_OVERRIDE_SIZE
 				memorySize = getRAMSize();
 #else
 				memorySize = ((SMBMemoryDevice *)header)->memorySize;
diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index ce7eeaf..3acb01f 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -160,7 +160,7 @@ struct SMBProperty SMBProperties[] =
 	
 	//----------------------------------------------------------------------------------------------------
 
-#if DYNAMIC_RAM_OVERRIDE_ERROR_HANDLE
+#if STATIC_RAM_OVERRIDE_ERROR_HANDLE
 	// Handle or instance number associated with any error that was previously detected for the device.
 	// If the system does not provide the error information structure, then this field contains FFFEh;
 	// otherwise this field contains either FFFFh (if no error was detected) or the handle (number) of
@@ -168,18 +168,18 @@ struct SMBProperty SMBProperties[] =
 	{ kSMBTypeMemoryDevice,			0x06,	kSMBWord,		.plainData		= 0xFFFE					},
 #endif
 
-#if DYNAMIC_RAM_OVERRIDE_SIZE
+#if STATIC_RAM_OVERRIDE_SIZE
 	{ kSMBTypeMemoryDevice,			0x0c,	kSMBWord,		.getSMBWord		= getRAMSize				},
 #endif
 	
 	{ kSMBTypeMemoryDevice,			0x10,	kSMBString,		.getSMBString	= NULL						},
 	{ kSMBTypeMemoryDevice,			0x11,	kSMBString,		.getSMBString	= NULL						},
 
-#if DYNAMIC_RAM_OVERRIDE_TYPE
+#if STATIC_RAM_OVERRIDE_TYPE
 	{ kSMBTypeMemoryDevice,			0x12,	kSMBByte,		.getSMBByte		= getRAMType				},
 #endif
 
-#if DYNAMIC_RAM_OVERRIDE_FREQUENCY  
+#if STATIC_RAM_OVERRIDE_FREQUENCY
 	{ kSMBTypeMemoryDevice,			0x15,	kSMBWord,		.getSMBWord		= getRAMFrequency			},
 #endif
 
@@ -206,14 +206,13 @@ void setupSMBIOS(void)
 	// return;
 	//--------------------------------------------------------------------------
 
-	// Allocate 1 page of kernel memory (sufficient for a stripped SMBIOS table).
-	void * kernelMemory = (void *)AllocateKernelMemory(8192); // 4096);
+	// Allocate 4 pages of kernel memory (enough for a stripped SMBIOS table).
+	void * kernelMemory = (void *)AllocateKernelMemory(8192); // 4096
 
 	// Setup a new Entry Point Structure at the beginning of the newly allocated memory page.
 	struct SMBEntryPoint * newEPS = (struct SMBEntryPoint *) kernelMemory;
 
-	// Clear the first K bytes (new table will be even shorter).
-	bzero(kernelMemory, 1024);
+	bzero(kernelMemory, 8192);
 
 	newEPS->anchor[0]			= 0x5f;							// _
 	newEPS->anchor[1]			= 0x53;							// S
@@ -289,7 +288,7 @@ void setupSMBIOS(void)
 		newtablesPtr += 8;
 	}
 
-#if (DYNAMIC_RAM_OVERRIDE_ERROR_HANDLE || DYNAMIC_RAM_OVERRIDE_SIZE || DYNAMIC_RAM_OVERRIDE_TYPE || DYNAMIC_RAM_OVERRIDE_FREQUENCY)
+#if (STATIC_RAM_OVERRIDE_ERROR_HANDLE || STATIC_RAM_OVERRIDE_SIZE || STATIC_RAM_OVERRIDE_TYPE || STATIC_RAM_OVERRIDE_FREQUENCY)
 	requiredStructures[17].stop = (sizeof(SMBProperties) / sizeof(SMBProperties[0])) -1;
 #endif
 
@@ -347,7 +346,7 @@ void setupSMBIOS(void)
 		else if (currentStructureType == kSMBTypeMemoryDevice)
 		{
 			UInt64 memorySize = 0;
-#if DYNAMIC_RAM_OVERRIDE_SIZE
+#if STATIC_RAM_OVERRIDE_SIZE
 			memorySize = getRAMSize();
 #else
 			memorySize = ((SMBMemoryDevice *)factoryHeader)->memorySize;

From aed86396895ba7eb4d691b73e7dbffae9f7e2366 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Thu, 4 Aug 2016 01:28:47 +0200
Subject: [PATCH 558/623] Update from local tree
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Warning: Review required for getFSBFrequency()
---
 i386/libsaio/smbios/getters.h | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/i386/libsaio/smbios/getters.h b/i386/libsaio/smbios/getters.h
index 3867e2c..0d6008d 100755
--- a/i386/libsaio/smbios/getters.h
+++ b/i386/libsaio/smbios/getters.h
@@ -27,12 +27,12 @@
 #define NOT_AVAILABLE	"N/A"
 #define RAM_SLOT_EMPTY	""
 
-#ifndef DYNAMIC_RAM_OVERRIDE_TYPE
-	#define DYNAMIC_RAM_OVERRIDE_TYPE	SMB_MEM_TYPE_DDR3
+#ifndef STATIC_RAM_OVERRIDE_TYPE
+	#define STATIC_RAM_OVERRIDE_TYPE	SMB_MEM_TYPE_DDR3
 #endif
 
-#ifndef DYNAMIC_RAM_OVERRIDE_FREQUENCY
-	#define DYNAMIC_RAM_OVERRIDE_FREQUENCY 1066
+#ifndef STATIC_RAM_OVERRIDE_FREQUENCY
+	#define STATIC_RAM_OVERRIDE_FREQUENCY 1066
 #endif
 
 /*==============================================================================
@@ -93,7 +93,8 @@ static inline struct SMBEntryPoint * getEPSAddress(void)
 
 static SMBWord getFSBFrequency(void)
 {
-	_SMBIOS_DEBUG_DUMP("In getFSBFrequency() = %d Hz\n", (gPlatform.CPU.FSBFrequency < 100500000) ? 0 : (gPlatform.CPU.FSBFrequency / 1000000));
+	// _SMBIOS_DEBUG_DUMP("In getFSBFrequency() = %d Hz\n", (gPlatform.CPU.FSBFrequency < 100500000) ? 0 : (gPlatform.CPU.FSBFrequency / 1000000));
+	_SMBIOS_DEBUG_DUMP("In getFSBFrequency() = %d Hz\n", (gPlatform.CPU.FSBFrequency == 0) ? 0 : (gPlatform.CPU.FSBFrequency / 1000000));
 
 	if (gPlatform.CPU.QPISpeed == 0)
 	{
@@ -112,7 +113,7 @@ static SMBWord getFSBFrequency(void)
 	 *		 (for example) report 412 MHz instead of 103 MHz.
 	 */
 
-	return (gPlatform.CPU.FSBFrequency < 100500000) ? 0 : (gPlatform.CPU.FSBFrequency / 1000000);
+	return 100; // (gPlatform.CPU.FSBFrequency < 100500000) ? 0 : (gPlatform.CPU.FSBFrequency / 1000000);
 }
 
 
@@ -136,8 +137,8 @@ static SMBWord getCPUType(void)
 }
 
 
-//==============================================================================
 #if OVERRIDE_DYNAMIC_MEMORY_DETECTION
+//==============================================================================
 
 int getSlotNumber(int slotNumber)
 {
@@ -156,7 +157,7 @@ int getSlotNumber(int slotNumber)
 	}
 
 #if DEBUG_SMBIOS
-	// sleep(1);	// Silent sleep (for debug only / slows down the process).
+	sleep(1);	// Silent sleep (for debug only / slows down the process).
 #endif
 
 	return slotNumber;
@@ -164,8 +165,8 @@ int getSlotNumber(int slotNumber)
 #endif
 
 
+#if STATIC_RAM_OVERRIDE_SIZE
 //==============================================================================
-#if DYNAMIC_RAM_OVERRIDE_SIZE
 
 static SMBWord getRAMSize(void)
 {
@@ -183,28 +184,28 @@ static SMBWord getRAMSize(void)
 #endif
 
 
+#if STATIC_RAM_OVERRIDE_TYPE
 //==============================================================================
-#if DYNAMIC_RAM_OVERRIDE_TYPE
 
 static SMBByte getRAMType(void)
 {
 #if (DEBUG_SMBIOS == 2)
-	_SMBIOS_DEBUG_DUMP("In getRAMType() = %s\n", SMBMemoryDeviceTypes[DYNAMIC_RAM_OVERRIDE_TYPE]);
+	_SMBIOS_DEBUG_DUMP("In getRAMType() = %s\n", SMBMemoryDeviceTypes[STATIC_RAM_OVERRIDE_TYPE]);
 #endif
 
-	return DYNAMIC_RAM_OVERRIDE_TYPE;
+	return STATIC_RAM_OVERRIDE_TYPE;
 }
 #endif
 
 
+#if STATIC_RAM_OVERRIDE_FREQUENCY
 //==============================================================================
-#if DYNAMIC_RAM_OVERRIDE_FREQUENCY
 
 static SMBWord getRAMFrequency(void)
 {
-	_SMBIOS_DEBUG_DUMP("In getRAMFrequency() = %d\n", DYNAMIC_RAM_OVERRIDE_FREQUENCY);
+	_SMBIOS_DEBUG_DUMP("In getRAMFrequency() = %d\n", STATIC_RAM_OVERRIDE_FREQUENCY);
 
-	return DYNAMIC_RAM_OVERRIDE_FREQUENCY;
+	return STATIC_RAM_OVERRIDE_FREQUENCY;
 }
 #endif
 

From cabc85f0ed86b5e2d3a7388c62d327ad0f3a6e97 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Thu, 4 Aug 2016 01:29:19 +0200
Subject: [PATCH 559/623] Keeping AppleAPIC.kext ready for the undo.

---
 i386/boot2/boot.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 5bb964a..4d07c85 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -63,6 +63,10 @@
 	#include "xhci.h"
 #endif
 
+#if PATCH_APIC_RET
+	#include "backup/apic.h"
+#endif
+
 //==============================================================================
 // Local adler32 function.
 
@@ -786,17 +790,20 @@ void boot(int biosdev)
 #if DISABLE_LEGACY_XHCI
 			disableLegacyXHCI();
 #endif
+
+#if PATCH_APIC_RET
+			patchApicRedirectionTables();
+#endif
+
 			// Did we switch to graphics mode yet (think verbose mode)?
 			if (gVerboseMode || bootArgs->Video.v_display != GRAPHICS_MODE)
 			{
-				// _BOOT_DEBUG_SLEEP(6);
-				
 				// Switch to graphics mode and show the (white) Apple logo on a black/gray background.
 				showBootLogo();
+				
+				_BOOT_DEBUG_SLEEP(5);
 			}
 
-			_BOOT_DEBUG_DUMP("execKernel-8\n");
-
 			startMachKernel(kernelEntry, bootArgs); // asm.s
 		}
 

From 7da67793401d0122f639aa09d23cc9a89da91563 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Thu, 4 Aug 2016 13:40:01 +0200
Subject: [PATCH 560/623] Updating settings template.

---
 i386/config/settings-template.h | 40 +++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 0f2315b..cc6a4c8 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -35,6 +35,11 @@
  *			- STATIC_SYSTEM_ID renamed to SMB_STATIC_SYSTEM_UUID and moved to SMBIOS section (Pike R. Alpha, January 2013).
  *			- Renamed LION_INSTALL_SUPPORT to INSTALL_ESD_SUPPORT (Pike R. Alpha, April 2013).
  *			- Renamed LION_RECOVERY_SUPPORT to RECOVERY_HD_SUPPORT (Pike R. Alpha, October 2013).
+ *			- PRE_LINKED_KERNEL_SUPPORT renamed to PRELINKED_KERNEL_SUPPORT (Pike R. Alpha, October 2015).
+ *			- DYNAMIC_RAM_OVERRIDE_TYPE renamed to STATIC_RAM_OVERRIDE_TYPE (Pike R. Alpha, July 2016).
+ *			- DYNAMIC_RAM_OVERRIDE_SIZE renamed to STATIC_RAM_OVERRIDE_SIZE
+ *			- DYNAMIC_RAM_OVERRIDE_SIZES renamed to  STATIC_RAM_OVERRIDE_SIZES
+ *			- DYNAMIC_RAM_OVERRIDE_FREQUENCY renamed to STATIC_RAM_OVERRIDE_FREQUENCY
  */
 
 
@@ -124,7 +129,7 @@
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
 
 
-#define LOAD_DSDT_TABLE_FROM_EXTRA_ACPI		0	// Set to 0 by default. Use 1 when your setup requires a modified DSDT table 
+#define LOAD_DSDT_TABLE_FROM_EXTRA_ACPI		0	// Set to 0 by default. Use 1 when your setup requires a modified DSDT table
 												// and you want to load: /Extra/ACPI/dsdt.aml instead of injecting a static 
 												// DSDT table from: RevoBoot/i386/config/ACPI/data.h 
 												//
@@ -192,6 +197,20 @@
 	#define DROP_FACTORY_SSDT_TABLES		0	// Set to 0 by default. Use 1 with caution (might disable CPU Power Management).
 #endif
 
+#if DROP_FACTORY_SSDT_TABLES
+	#define DROP_SELECTED_SSDT_TABLE		1	// Set to 0 by default.
+	//
+	// Haswell (example)
+	//
+	// #define OEM_TABLE_ID_TARGETS			{  "CpuPm", "Cpu0Ist", 0 }
+	//
+	// Skylake (example)
+	//
+	// #define OEM_TABLE_ID_TARGETS			{  "sensrhub", "Ther_Rvp", "SaSsdt ", "CpuSsdt", "PtidDevc", "SataTabl", "xh_rvp10", 0 }
+	// #define OEM_TABLE_ID_TARGETS			{  "sensrhub", "Ther_Rvp",                       "PtidDevc", "SataTabl", "xh_rvp10", 0 }
+	#define OEM_TABLE_ID_TARGETS			{  "SataTabl", "PmMgt", 0 }
+#endif
+
 #define REPLACE_EXISTING_SSDT_TABLES		0	// Set to 0 by default. Use 1 with caution (might disable CPU Power Management).
 												//
 												// Note: Don't forget to set PATCH_ACPI_TABLE_DATA to 1.
@@ -201,6 +220,11 @@
 												// Note:	Don't forget to set PATCH_ACPI_TABLE_DATA to 1 and keep in mind that this can 
 												//			only change the headers of injected/replaced tables. Not the factory tables.
 
+#define VERIFY_OPREGION_GNVS_ADDRESS		1	// Set to 0 by default.
+
+#if VERIFY_OPREGION_GNVS_ADDRESS
+	#define DUMP_OPREGION_GNVS_ADDRESS		0	// Set to 0 by default.
+#endif
 
 #define DEBUG_ACPI							0	// Set to 0 by default. Use 1 when things don't seem to work for you.
 
@@ -208,7 +232,7 @@
 //--------------------------------------------------------------- BOOT.C -------------------------------------------------------------------
 
 
-#define PRE_LINKED_KERNEL_SUPPORT			1	// Set to 1 by default. Change this to 0 to disable the use of pre-linked kernels.
+#define PRELINKED_KERNEL_SUPPORT			1	// Set to 1 by default. Change this to 0 to disable the use of pre-linked kernels.
 
 #define MUST_ENABLE_A20						0	// Set to 0 by default. Change this to 1 when your hardware requires it.
 
@@ -216,8 +240,8 @@
 
 #define RECOVERY_HD_SUPPORT					0	// Set to 0 by default. Change this to 1 to make RevoBoot search for the 'Recovery HD'
 												// partition and, when available, boot from it.
-#if (RECOVERY_HD_SUPPORT == 1 && PRE_LINKED_KERNEL_SUPPORT == 0)
-	#define PRE_LINKED_KERNEL_SUPPORT		1
+#if (RECOVERY_HD_SUPPORT == 1 && PRELINKED_KERNEL_SUPPORT == 0)
+	#define PRELINKED_KERNEL_SUPPORT		1
 #endif
 
 #define STARTUP_DISK_SUPPORT				0	// Set to 0 by default. Change this to 1 for System Preference/Startup Disk support.
@@ -474,4 +498,12 @@
 
 #define DEBUG_PLATFORM						0	// Set to 0 by default. Change this to 1 when things don't seem to work for you.
 
+//---------------------------------------------------------------- XHCI.H ------------------------------------------------------------------
+
+#define DISABLE_LEGACY_XHCI					0	// Set to 0 by default. Change this to 1 when you need to disable legacy XHCI.
+
+#define DEBUG_XHCI							0
+
+
+
 //================================================================= END ====================================================================

From f1629451a1be4f3b803dcd80e3d0844699e60045 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Fri, 5 Aug 2016 14:14:39 +0200
Subject: [PATCH 561/623] Typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– PATCH_XCPI_SCOPE_MSRS renamed to PATCH_XCPM_SCOPE_MSRS
---
 i386/libsaio/cpu/Intel/dynamic_data.h | 2 +-
 i386/libsaio/platform.h               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 22c14bd..3b2992a 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -480,7 +480,7 @@ void initCPUStruct(void)
 					// Check bit-15 of MSR 0xE2 to see if it is locked.
 					msr = rdmsr64(MSR_PKG_CST_CONFIG_CONTROL);
 
-#if PATCH_XCPI_SCOPE_MSRS
+#if PATCH_XCPM_SCOPE_MSRS
 					gPlatform.CPU.CstConfigMsrLocked = (msr & 0x8000);
 #endif
 
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 6e09088..163bd2f 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -263,7 +263,7 @@ typedef struct _PlatformInfo_t
 	{
 		bool		Mobile;						// Set to true (in cpu/dynamic_data.h) for Mobile CPU's.
 
-#if PATCH_XCPI_SCOPE_MSRS
+#if PATCH_XCPM_SCOPE_MSRS
 		bool		CstConfigMsrLocked;			// Initialised in cpu/dynamic_data.h and used in load.c
 #endif
 		uint16_t	Type;						// CPU type ('cpu-type') used in the SMBIOS patcher.

From a9f538a87fc5b9226fff5288a74f3bc772a3697c Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Fri, 5 Aug 2016 14:17:00 +0200
Subject: [PATCH 562/623] Typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– PATCH_XCPI_SCOPE_MSRS renamed to PATCH_XCPM_SCOPE_MSRS
---
 i386/config/settings-template.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index cc6a4c8..506a204 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -40,6 +40,7 @@
  *			- DYNAMIC_RAM_OVERRIDE_SIZE renamed to STATIC_RAM_OVERRIDE_SIZE
  *			- DYNAMIC_RAM_OVERRIDE_SIZES renamed to  STATIC_RAM_OVERRIDE_SIZES
  *			- DYNAMIC_RAM_OVERRIDE_FREQUENCY renamed to STATIC_RAM_OVERRIDE_FREQUENCY
+ *			- PATCH_XCPI_SCOPE_MSRS renamed to PATCH_XCPM_SCOPE_MSRS
  */
 
 
@@ -455,7 +456,7 @@
 #define LOAD_EXECUTABLE_TARGET_UINT64			0x487074db8548c389ULL // 89c34885db747048 revered in HexEdit
 #define LOAD_EXECUTABLE_PATCH_UINT64			0x4812ebdb8548c389ULL
 
-#define PATCH_XCPI_SCOPE_MSRS					0	// Set to 0 by default.
+#define PATCH_XCPM_SCOPE_MSRS					0	// Set to 0 by default.
 
 #define XCPM_SCOPE_MSRS_TARGET_UINT64			0x00000002000000E2ULL
 

From d3fdff483dd0ae6e00942513f1bfb8573b16d2d6 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Wed, 10 Aug 2016 16:46:59 +0200
Subject: [PATCH 563/623] New processor models.

---
 i386/libsaio/cpu/essentials.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 2c8671d..ad3e4a3 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -193,12 +193,17 @@
 #define CPU_MODEL_BROADWELL_H		0x47
 #define CPU_MODEL_BRYSTALWELL		0x4C
 #define CPU_MODEL_BROADWELL_E		0x4F
+#define CPU_MODEL_BROADWELL_DE		0x56
 
 #define CPU_MODEL_SKYLAKE			0x4E
 #define CPU_MODEL_SKYLAKE_ULT		0x4E
 #define CPU_MODEL_SKYLAKE_ULX		0x4E
+#define CPU_MODEL_SKYLAKE_X			0x55
 #define CPU_MODEL_SKYLAKE_DT		0x5E
 
+#define CPU_MODEL_KABYLAKE			0x8E
+#define CPU_MODEL_KABYLAKE_DT		0x9E
+
 #define DALES_BRIDGE	1
 #define SANDY_BRIDGE	2
 #define IVY_BRIDGE		4

From 15b45c4c7f9865cbc510b127950e6de0268c486b Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Wed, 10 Aug 2016 16:53:30 +0200
Subject: [PATCH 564/623] Additional changes for new processor models.

---
 i386/libsaio/cpu/Intel/dynamic_data.h | 10 ++++++++--
 i386/libsaio/cpu/essentials.h         |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 3b2992a..b9df711 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -398,7 +398,7 @@ void initCPUStruct(void)
 				case CPU_MODEL_BROADWELL_H:
 				case CPU_MODEL_BRYSTALWELL:
 				case CPU_MODEL_BROADWELL_E:
-
+				case CPU_MODEL_BROADWELL_DE:
 					CoreBridgeType = BROADWELL;
 					hiBit = 31;
 					break;
@@ -407,6 +407,7 @@ void initCPUStruct(void)
 //				case CPU_MODEL_SKYLAKE_ULT:
 //				case CPU_MODEL_SKYLAKE_ULX:
 				case CPU_MODEL_SKYLAKE_DT:
+				case CPU_MODEL_SKYLAKE_X:
 					CoreBridgeType = SKYLAKE;
 					hiBit = 31;
 					// gPlatform.CPU.ARTFrequency = (3427489466 * 2 / 284) = 24137249,76056338028169 MHz
@@ -417,6 +418,11 @@ void initCPUStruct(void)
 					gPlatform.CPU.ARTFrequency = 0; // BASE_ART_CLOCK_SOURCE; // (tscFrequency * getCachedCPUID(LEAF_x15, eax) / getCachedCPUID(LEAF_x15, ebx));
 					break;
 
+				case CPU_MODEL_KABYLAKE:
+				case CPU_MODEL_KABYLAKE_DT:
+					CoreBridgeType = KABYLAKE;
+					hiBit = 31;
+
 				case CPU_MODEL_NEHALEM:
 				case CPU_MODEL_NEHALEM_EX:
 				case CPU_MODEL_FIELDS:
@@ -468,7 +474,7 @@ void initCPUStruct(void)
 					requestMaxTurbo(maxBusRatio);
 				}
 
-				if (CoreBridgeType) // (SandyBridge || IvyBridge || Haswell || Broadwell || SkyLake)
+				if (CoreBridgeType) // (SandyBridge || IvyBridge || Haswell || Broadwell || SkyLake || KabyLake)
 				{
 					// gPlatform.CPU.Type += CoreBridgeType;
 
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index ad3e4a3..c038081 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -210,5 +210,6 @@
 #define HASWELL			8
 #define BROADWELL		16
 #define SKYLAKE			32
+#define KABYLAKE		64
 
 #endif /* !__LIBSAIO_CPU_ESSENTIALS_H */

From 6c984d2c950a0127f74adb4edc37ddd38627c95b Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 15 Aug 2016 10:31:16 +0200
Subject: [PATCH 565/623] Unimportant change; only renaming a variable.

---
 i386/boot2/boot.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 4d07c85..38e1505 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -171,7 +171,7 @@ void boot(int biosdev)
 	bool	haveCABootPlist	= false;
 	bool	quietBootMode	= true;
 
-	void *fileLoadBuffer = (void *)kLoadAddr;
+	void *loadBuffer = (void *)kLoadAddr;
 
 	char bootFile[256];
 	char rootUUID[37];
@@ -676,7 +676,7 @@ void boot(int biosdev)
 					if (LoadFile((const char *)preLinkedKernelPath))
 					{
 						retStatus = 1;
-						fileLoadBuffer = (void *)kLoadAddr;
+						loadBuffer = (void *)kLoadAddr;
 						bootFile[0] = 0;
 					}
 
@@ -714,7 +714,7 @@ void boot(int biosdev)
 
 		_BOOT_DEBUG_DUMP("About to load: %s\n", bootFile);
 
-		retStatus = LoadThinFatFile(bootFile, &fileLoadBuffer);
+		retStatus = LoadThinFatFile(bootFile, &loadBuffer);
 
 #if SUPPORT_32BIT_MODE
 		if (retStatus <= 0 && gPlatform.ArchCPUType == CPU_TYPE_X86_64)
@@ -723,7 +723,7 @@ void boot(int biosdev)
 
 			gPlatform.ArchCPUType = CPU_TYPE_I386;
 
-			retStatus = LoadThinFatFile(bootFile, &fileLoadBuffer);
+			retStatus = LoadThinFatFile(bootFile, &loadBuffer);
 		}
 #endif // SUPPORT_32BIT_MODE
 
@@ -745,7 +745,7 @@ void boot(int biosdev)
 			
 			_BOOT_DEBUG_DUMP("execKernel-1\n");
 			
-			if (decodeKernel(fileLoadBuffer, &kernelEntry, (char **) &bootArgs->kaddr, (int *)&bootArgs->ksize) != 0)
+			if (decodeKernel(loadBuffer, &kernelEntry, (char **) &bootArgs->kaddr, (int *)&bootArgs->ksize) != 0)
 			{
 				stop("DecodeKernel() failed!");
 			}

From a506e70fda1b304f26b77c601bacfb9159da83ff Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 15 Aug 2016 10:32:41 +0200
Subject: [PATCH 566/623] Use Lower Camel Case for function names.

---
 i386/boot2/drivers.c         | 16 ++++++++++------
 i386/libsaio/saio_internal.h |  5 +++--
 i386/libsaio/saio_types.h    |  2 +-
 i386/libsaio/sys.c           |  7 ++++---
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index 6006dae..6d1c2be 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -27,6 +27,10 @@
  *  Copyright (c) 2000 Apple Computer, Inc.
  *
  *  DRI: Josh de Cesare
+ *
+ * Updates:
+ *			- Use Lower Camel Case for function names (Pike R. Alpha, July 2016)
+ *
  */
 
 #include <mach-o/fat.h>
@@ -106,7 +110,7 @@ static long matchLibraries(void);
 
 #ifdef NOTDEF
 	static ModulePtr	findModule(char *name);
-	static void			ThinFatFile(void **loadAddrP, unsigned long *lengthP);
+	static void			thinFatFile(void **loadAddrP, unsigned long *lengthP);
 #endif
 
 static long parseXML(char *buffer, ModulePtr *module, TagPtr *personalities);
@@ -608,7 +612,7 @@ static long loadMatchedModules(void)
                 //driverModuleAddr = (void *)kLoadAddr;
                 //if (length != 0)
                 //{
-                //    ThinFatFile(&driverModuleAddr, &length);
+                //    thinFatFile(&driverModuleAddr, &length);
                 //}
 
                 // Make room in the image area.
@@ -990,20 +994,20 @@ long decodeKernel(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsiz
 		}
 	}
 
-	ret = ThinFatFile(&fileLoadBuffer, &len);
+	ret = thinFatFile(&fileLoadBuffer, &len);
 
 	if (ret == 0 && len == 0 && gPlatform.ArchCPUType == CPU_TYPE_X86_64)
 	{
 		gPlatform.ArchCPUType = CPU_TYPE_I386;
-		ret = ThinFatFile(&fileLoadBuffer, &len);
+		ret = thinFatFile(&fileLoadBuffer, &len);
 	}
 
-	ret = DecodeMachO(fileLoadBuffer, rentry, raddr, rsize);
+	ret = decodeMachO(fileLoadBuffer, rentry, raddr, rsize);
 
 	if (ret < 0 && gPlatform.ArchCPUType == CPU_TYPE_X86_64)
 	{
 		gPlatform.ArchCPUType = CPU_TYPE_I386;
-		ret = DecodeMachO(fileLoadBuffer, rentry, raddr, rsize);
+		ret = decodeMachO(fileLoadBuffer, rentry, raddr, rsize);
 	}
 
 #if DEBUG_DRIVERS
diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index 1a4f627..eecf89b 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -26,6 +26,7 @@
  *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
  *			- Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
  *			- Stripped (unnecessary) argument from loadSystemConfig (PikerAlpha, April 2013).
+ *			- Use Lower Camel Case for function names (Pike R. Alpha, July 2016)
  *
  */
 
@@ -145,8 +146,8 @@ extern void		utf_decodestr(const u_int8_t *utf8p, u_int16_t *ucsp, u_int16_t *uc
 
 /* load.c */
 extern bool		gLoadKernelDrivers;
-extern long		ThinFatFile(void **binary, unsigned long *length);
-extern long		DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize);
+extern long		thinFatFile(void **binary, unsigned long *length);
+extern long		decodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize);
 extern long		loadBinaryData(char *aFilePath, void **aMemoryAddress);
 
 
diff --git a/i386/libsaio/saio_types.h b/i386/libsaio/saio_types.h
index 90e67c3..7b4942c 100755
--- a/i386/libsaio/saio_types.h
+++ b/i386/libsaio/saio_types.h
@@ -65,7 +65,7 @@ typedef struct Tag
 typedef struct
 {
 	char	plist[4096];	// buffer for plist
-	TagPtr	dictionary;		// buffer for xml dictionary
+	TagPtr	dictionary;		// buffer for XML dictionary
 	bool  canOverride;		// flag to mark a dictionary can be overriden
 } config_file_t;
 
diff --git a/i386/libsaio/sys.c b/i386/libsaio/sys.c
index a086505..65af47d 100755
--- a/i386/libsaio/sys.c
+++ b/i386/libsaio/sys.c
@@ -53,7 +53,8 @@
  * Copyright 2007 VMware Inc. "Preboot" ramdisk support added by David Elliott
  *
  * Updates:
- *			- Cleanups, white space and layout changes (PikerAlpha, November2012)
+ *			- Cleanups, white space and layout changes (Pike R. Alpha, November 2012)
+ *			- Use Lower Camel Case for function names (Pike R. Alpha, July 2016)
  *
  */
 
@@ -206,7 +207,7 @@ long LoadThinFatFile(const char *fileSpec, void **binary)
 
 		if (length > 0)
 		{
-			if (ThinFatFile(binary, &length) == 0)
+			if (thinFatFile(binary, &length) == 0)
 			{
 				if (length == 0)
 				{
@@ -237,7 +238,7 @@ long LoadThinFatFile(const char *fileSpec, void **binary)
 
 		if (length > 0)
 		{
-			ThinFatFile(binary, &length);
+			thinFatFile(binary, &length);
 		}
 	}
 

From a221cc2693d93ac35a6f963b0133ea2e0505c447 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 15 Aug 2016 10:39:37 +0200
Subject: [PATCH 567/623] New debug output (moved over from load.c).

---
 i386/boot2/debug.h | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/i386/boot2/debug.h b/i386/boot2/debug.h
index f298e41..3da5c24 100755
--- a/i386/boot2/debug.h
+++ b/i386/boot2/debug.h
@@ -109,5 +109,37 @@
 #endif
 
 
+#if DEBUG_KERNEL_PATCHER
+	#define DEBUG_SYMBOL_FOUND(symbol, offset, vmaddr, fileoff, start, end)	\
+						printf("Symbol %s found!\n", symbol);				\
+						printf("offset..............: 0x%llx\n", offset);	\
+						printf("textSegment->vmaddr.: 0x%llx\n", vmaddr);	\
+						printf("textSegment->fileoff: 0x%llx\n", fileoff);	\
+						printf("startAddress........: 0x%llx\n", start);	\
+						printf("endAddress..........: 0x%llx\n", end);		\
+						sleep(3);
+
+	#define DEBUG_PATCH_STATUS(symbol, address, number, seconds)			\
+						printf("Patched %s(0x%llx) symbol-number: %ld\n", symbol, address, number);	\
+																									\
+						if (seconds)																\
+						{																			\
+							sleep(seconds);															\
+						}
+
+	#define DEBUG_DISABLED_MSR(msr, seconds)				\
+						printf("Disabling MSR: 0x%x\n");	\
+															\
+						if (seconds)						\
+						{									\
+							sleep(seconds);					\
+						}
+
+#else
+	#define DEBUG_SYMBOL_FOUND(symbol, offset, vmaddr, fileoff, start, end)
+	#define DEBUG_SYMBOL_PATCH(symbol, address, number, seconds)
+	#define DEBUG_DISABLE_MSR(msr, seconds)
+#endif
+
 #endif // __REVO_DEBUG_H
 

From 924fba83426b7689e990217ae5322b95164fc3ce Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 15 Aug 2016 11:20:06 +0200
Subject: [PATCH 568/623] Another big update.

---
 i386/libsaio/load.c | 444 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 335 insertions(+), 109 deletions(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 9b24a4d..00153b0 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -24,8 +24,17 @@
  * Copyright (c) 1998-2003 Apple Computer, Inc.
  *
  * Updates:
- *			- White space changes (PikerAlpha, November 2012)
- *			- Mountain Lion kernel patch for iMessage implemented (PikerAlpha, January 2013)
+ *			- White space changes (Pike R. Alpha, November 2012)
+ *			- Mountain Lion kernel patch for iMessage implemented (Pike R. Alpha, January 2013)
+ *			- Patch for __ZN6OSKext14loadExecutableEv added (Pike R. Alpha, 2015)
+ *			- Patch for __ZN12KLDBootstrap21readStartupExtensionsEv added.
+ *			- Use Lower Camel Case for function names (Pike R. Alpha, July 2016)
+ *			- Add _cpuid_set_info/_xcpm_bootstrap/_xcpm_idle to patches.
+ *			- Dump global gBinaryAddress and use loadAddress argument.
+ *			- New and improved patching routines (getting ready for smarter patching).
+ *			- Renamed patchLoadExecutable to patchKernel (Pike R. Alpha, August 2016)
+ *			- New and improved debug output (see also boot2/debug.h)
+ *			- Made some preparations to move patchKernel() to patcher.c
  *
  */
 
@@ -49,27 +58,25 @@
 bool gLoadKernelDrivers = true;
 
 // Private functions.
-#if (PATCH_KEXT_LOADING && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
-	static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress);
+#if (PATCH_KERNEL && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+	static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress);
 #endif
 
-static long initKernelVersionInfo(unsigned long cmdbase, long listSize, unsigned int textSegmentAddress);
-static long DecodeSegment(long cmdBase, unsigned int*load_addr, unsigned int *load_size);
-static long DecodeUnixThread(long cmdBase, unsigned int *entry);
+static long initKernelVersionInfo(unsigned long loadAddress, unsigned long cmdbase, long listSize, unsigned int textSegmentAddress);
+static long decodeSegment(unsigned long loadAddress, long cmdBase, unsigned int*load_addr, unsigned int *load_size);
+static long decodeUnixThread(long cmdBase, unsigned int *entry);
 
 #define ADD_SYMTAB	1
 
 #if ADD_SYMTAB
-	static long DecodeSymbolTable(long cmdBase);
+	static long decodeSymbolTable(unsigned long loadAddress, long cmdBase);
 #endif
 
-static unsigned long gBinaryAddress;
-
 
 //==============================================================================
 // Public function.
 
-long ThinFatFile(void **binary, unsigned long *length)
+long thinFatFile(void **binary, unsigned long *length)
 {
 	unsigned long nfat, swapped, size = 0;
 	struct fat_header *fhp = (struct fat_header *)*binary;
@@ -126,9 +133,9 @@ long ThinFatFile(void **binary, unsigned long *length)
 
 
 //==============================================================================
-// Called from DecodeKernel() in drivers.c
+// Called from decodeKernel() in drivers.c
 
-long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
+long decodeMachO(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsize)
 {
 	long ret						= -1;
 	long sectionNumber				= 0;
@@ -149,11 +156,11 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 	unsigned long cnt				= 0;
 	unsigned long listSize			= 0;
 
-	gBinaryAddress = (unsigned long)binary;
+	unsigned long loadAddress = (unsigned long)fileLoadBuffer;
 
 	if (gPlatform.ArchCPUType == CPU_TYPE_X86_64)
 	{
-		struct mach_header_64 * machHeader = (struct mach_header_64 *)(gBinaryAddress);
+		struct mach_header_64 * machHeader = (struct mach_header_64 *)(loadAddress);
 
 		if (machHeader->magic != MH_MAGIC_64)
 		{
@@ -162,9 +169,9 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 		}
 
 		listSize = sizeof(struct nlist_64);
-		cmdstart = (unsigned long)gBinaryAddress + sizeof(struct mach_header_64);
+		cmdstart = loadAddress + sizeof(struct mach_header_64);
 #if DEBUG
-		printf("In DecodeMachO()\n");
+		printf("In decodeMachO()\n");
 		printf("magic:      %x\n", (unsigned)machHeader->magic);
 		printf("cputype:    %x\n", (unsigned)machHeader->cputype);
 		printf("cpusubtype: %x\n", (unsigned)machHeader->cpusubtype);
@@ -176,9 +183,10 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 #endif
 		ncmds = machHeader->ncmds;
 	}
+#if ((MAKE_TARGET_OS & SNOW_LEOPARD) == SNOW_LEOPARD)
 	else // if (gPlatform.ArchCPUType == CPU_TYPE_I386)
 	{
-		struct mach_header * machHeader = (struct mach_header *)(gBinaryAddress);
+		struct mach_header * machHeader = (struct mach_header *)(loadAddress);
 
 		if (machHeader->magic != MH_MAGIC)
 		{
@@ -187,9 +195,9 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 		}
 
 		listSize = sizeof(struct nlist);
-		cmdstart = (unsigned long)gBinaryAddress + sizeof(struct mach_header);
+		cmdstart = loadAddress + sizeof(struct mach_header);
 #if DEBUG
-		printf("In DecodeMachO()\n");
+		printf("In decodeMachO()\n");
 		printf("magic:      %x\n", (unsigned)machHeader->magic);
 		printf("cputype:    %x\n", (unsigned)machHeader->cputype);
 		printf("cpusubtype: %x\n", (unsigned)machHeader->cpusubtype);
@@ -201,6 +209,7 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 #endif
 		ncmds = machHeader->ncmds;
 	}
+#endif
 
 	cmdBase = cmdstart;
 
@@ -213,7 +222,7 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 		{
 			case LC_SEGMENT:
 			case LC_SEGMENT_64:
-				sectionNumber = DecodeSegment(cmdBase, &load_addr, &load_size);
+				sectionNumber = decodeSegment(loadAddress, cmdBase, &load_addr, &load_size);
 
 				if (sectionNumber == 1) // __TEXT,__text
 				{
@@ -235,15 +244,15 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 				break;
 
 			case LC_SYMTAB:
-				initKernelVersionInfo(cmdBase, listSize, textSegmentAddress);
-#if (PATCH_KEXT_LOADING && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
-				patchLoadExecutable(cmdBase, listSize, textSegmentAddress, vldSegmentAddress);
+				initKernelVersionInfo(loadAddress, cmdBase, listSize, textSegmentAddress);
+#if (PATCH_KERNEL && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+				patchKernel(loadAddress, cmdBase, listSize, textSegmentAddress, vldSegmentAddress);
 #endif
 				break;
 
 			case LC_MAIN:	/* Mountain Lion's replacement for LC_UNIXTHREAD */
 			case LC_UNIXTHREAD:
-				ret = DecodeUnixThread(cmdBase, &entry);
+				ret = decodeUnixThread(cmdBase, &entry);
 				break;
 
 			default:
@@ -275,7 +284,7 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 		
 		if (cmd == LC_SYMTAB)
 		{
-			if (DecodeSymbolTable(cmdBase) != 0)
+			if (decodeSymbolTable(loadAddress, cmdBase) != 0)
 			{
 				return -1;
 			}
@@ -287,15 +296,15 @@ long DecodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize)
 	return ret;
 }
 
-#if (PATCH_KEXT_LOADING && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+#if (PATCH_KERNEL && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
 
 //==============================================================================
-// Private function. Called from DecodeMachO()
+// Private function. Called from decodeMachO()
 
-static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress)
+static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress)
 {
-#if (DEBUG_BOOT && PATCH_KEXT_LOADING && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
-	printf("patchLoadExecutable() called\n");
+#if DEBUG_KERNEL_PATCHER
+	printf("patchKernel() called\n");
 	sleep(1);
 #endif
 
@@ -308,100 +317,325 @@ static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned l
 
 	struct symtab_command * symtab = (struct symtab_command *)cmdBase;
 	struct segment_command_64 * textSegment = (struct segment_command_64 *)textSegmentAddress;
-	// struct segment_command_64 * vldSegment = (struct segment_command_64 *)vldSegmentAddress;
+#if PRELINKED_KERNEL_SUPPORT
+	struct segment_command_64 * vldSegment = (struct segment_command_64 *)vldSegmentAddress;
+#endif
+	void * stringTable = (void *)(loadAddress + symtab->stroff);
 
-	void * stringTable = (void *)(gBinaryAddress + symtab->stroff);
+	const uint16_t targetMSRs[] = { 0xE2, 0x01A0, /* 0x01FC, */ 0x01AA, 0x0620, /* 0x064C, */ 0x063A, 0x0642 };
 
-	uint32_t pointer = (gBinaryAddress + symtab->symoff + skippedSymbolCount);
+	uint32_t pointer = (loadAddress + symtab->symoff + skippedSymbolCount);
 
 	while (symbolNumber < symtab->nsyms)
 	{
 		struct nlist_64 * nl = (struct nlist_64 *)pointer;
 
-#if PATCH_KEXT_LOADING
+#if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
+		int64_t offset			= 0;
+		uint64_t startAddress	= 0;
+		uint64_t endAddress		= 0;
+
 		if ((nl->n_sect == 1 /* __TEXT,__text */) && nl->n_value)
 		{
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
-
+#if PATCH_KEXT_LOADING
 			if (strcmp(symbolName, "__ZN6OSKext14loadExecutableEv") == 0)
 			{
-				int64_t offset = (nl->n_value - textSegment->vmaddr);
-				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
-				uint64_t endAddress = (startAddress + 0x300);
-
-				/* printf("__ZN6OSKext14loadExecutableEv found!\n");
- 				printf("offset..............: 0x%llx\n", offset);
-				printf("textSegment->vmaddr.: 0x%llx\n", textSegment->vmaddr);
-				printf("textSegment->fileoff: 0x%llx\n", textSegment->fileoff);
-				printf("startAddress........: 0x%llx\n", startAddress);
-				printf("endAddress..........: 0x%llx\n", endAddress);
-				sleep(5); */
+				offset = (nl->n_value - textSegment->vmaddr);
+				startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				endAddress = (startAddress + 0x300);
 
 				unsigned char * p = (unsigned char *)startAddress;
 
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
+
 				for (; p <= (unsigned char *)endAddress; p++)
 				{
-					if (*(uint64_t *)p == LOAD_EXECUTABLE_TARGET_UINT64)
+					//
+					// New search pattern: 0x48xx74db854c3789
+					//
+					if ((*(uint32_t *)p == 0x8548c389) && (*(uint16_t *)(p+4) == 0x74db) && (*(uint8_t *)(p+7) == 0x48))
 					{
-						/* printf("Found @ 0x%llx ", (uint64_t)p - startAddress);
-						printf("Symbol-number: %ld\n", (symbolNumber + (skippedSymbolCount / listSize) + 1));
-						sleep(3); */
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x4812ebdb8548c389;
+						p = (unsigned char *)endAddress;
+					}
 
-						*(uint64_t *)p = LOAD_EXECUTABLE_PATCH_UINT64;
+					/* Old search patterns – macOS Sierra DP1 = 89 c3 48 85 db 74 77 48 in HexEdit
+					if (*(uint64_t *)p == 0x487774db8548e789)
+					{ //                      ^^^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x4812ebdb8548e789; // 89 c3 48 85 db eb 12 48 in HexEdit
+						//                   ^^^^
 						p = (unsigned char *)endAddress;
 					}
+					else if (*(uint64_t *)p == 0x487174db8548c389) // macOS Sierra DP[2-5] = 89 c3 48 85 db 74 77 48  in HexEdit
+					{
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x4812ebdb8548c389;
+						//                   ^^^^
+						p = (unsigned char *)endAddress;
+					} */
 				}
 			}
-		}
-#endif
+#endif // #if PATCH_KEXT_LOADING
 
-#if PATCH_XCPI_SCOPE_MSRS
+#if PATCH_CPUID_SET_INFO
 	#if PATCH_KEXT_LOADING
+			else
+	#endif
+			if (strcmp(symbolName, "_cpuid_set_info") == 0)
+			{
+				offset = (nl->n_value - textSegment->vmaddr);
+				startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				endAddress = (startAddress + 0x2100);
+
+				unsigned char * p = (unsigned char *)startAddress;
+				
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
+
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					// Broadwell E (0x4F)	-> Broadwell (0x47)		=> 0x4F-0x47 = 0x08	-> change 0xE9 into 0xE1
+					// Haswell E (0x3F)		-> Haswell (0x3C)		=> 0x3F-0x3C = 0x03	-> change 0xE9 into 0xE6
+					// Ivy Bridge E (0x3E)	-> Ivy Bridge (0x3A)	=> 0x3E-0x3A = 0x04	-> change 0xE9 into 0xE5
+
+					if (*(uint64_t *)p == 0xf883e9c083c4b60f) // Reversed 0f b6 c4 83 c0 e9 83 f8 (47) (8 bytes).
+					{ //                        ^^                                       ^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						// 0xff - 0xe9 = 0x16 + 0x01 = 0x17 + (0x4f - 0x47 = 0x08) = 0x1f (0x4f - 0x1f = 0x38)
+						*(uint64_t *)p = 0xf8839000000030b8; // Reversed b8 30 00 00 00 90 83 f8 (47) (8 bytes).
+						p = (unsigned char *)endAddress;
+					}
+					else if (*(uint64_t *)p == 0xf883f1c083c4b60f) // Reversed 0f b6 c4 83 c0 f1 83 f8 (47) (8 bytes).
+					{ //                             ^^                                       ^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+						
+						// 0xff - 0xf1 = 0x0e + 0x01 = 0x0f + (0x4f - 0x47 = 0x08) = 0x17 (0x4f - 0x17 = 0x38)
+						*(uint64_t *)p = 0xf8839000000038b8; // Reversed b8 38 00 00 00 90 83 f8 (47) (8 bytes).
+						p = (unsigned char *)endAddress;
+					}
+
+					/* Broadwell_E (0x4F) -> Broadwell (0x47)
+					if (*(uint64_t *)p == 0x47f883e9c083c4b6) // Reversed (0f) b6 c4 83 c0 e9 83 f8 47 (8 bytes).
+					{ //                          ^^                                       ^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x47f883e1c083c4b6; // Reversed (0f) b6 c4 83 c0 e1 83 f8 47 (8 bytes).
+						p = (unsigned char *)endAddress;
+					}
+					else if (*(uint64_t *)p == 0x4ff883f1c083c4b6) // Reversed (0f) b6 c4 83 c0 f1 83 f8 4f (8 bytes).
+					{ //                               ^^                                       ^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x4ff883e9c083c4b6; // Reversed (0f) b6 c4 83 c0 e9 83 f8 4F (8 bytes).
+						p = (unsigned char *)endAddress;
+					} */
+				}
+			}
+#endif
+			else if (strcmp(symbolName, "_xcpm_bootstrap") == 0)
+			{
+				offset = (nl->n_value - textSegment->vmaddr);
+				startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				endAddress = (startAddress + 0x100);
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
+
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					if (*(uint64_t *)p == 0x1c7722fb83c4c383) // Reversed of HexEdit: 83 C3 C4 83 FB 22 77 1C
+					{ //                              ˆˆ                                    ˆˆ
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x1c7722fb83bcc383; // Reversed of HexEdit: 83 C3 BC 83 FB 22 77 1C
+						//                           ˆˆ                                    ˆˆ
+					}
+				}
+			}
+
+			else if (strcmp(symbolName, "_xcpm_idle") == 0)
+			{
+				offset = (nl->n_value - textSegment->vmaddr);
+				startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				endAddress = (startAddress + 0x200);
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
+
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					if (*(uint64_t *)p == 0x300f000000e2b920)// (48 C1 EA) 20 B9 E2 00 00 00 0F 30 reversed
+					{
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x9090000000e2b920; // Reversed (48 C1 EA) 20 B9 E2 00 00 00 90 90 (8 bytes).
+					}
+				}
+			}
+		}
+#endif // #if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
+
+#if PATCH_XCPM_SCOPE_MSRS
+	#if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
 		else
 	#endif
 		if (((nl->n_sect == 8 /* __DATA,__data */) && nl->n_value) && gPlatform.CPU.CstConfigMsrLocked)
 		{
+			UInt8 repeat = 0;
+
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
-		
-			if (strcmp(symbolName, "_xcpm_core_scope_msrs") == 0)
+
+			if (strcmp(symbolName, "_xcpm_SMT_scope_msrs") == 0)
+			{
+				int64_t offset = (nl->n_value - textSegment->vmaddr);
+				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				
+				unsigned char * p = (unsigned char *)startAddress;
+				
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
+				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+				//
+				// Zero out MSR 0xE2 (and MSR 0x01A0
+				//
+				for (repeat = 0; repeat < 8; repeat++)
+				{
+					*(uint64_t *)p = 0x0000000000000000ULL;
+					p += 0x08;
+				}
+			}
+			else if (strcmp(symbolName, "_xcpm_core_scope_msrs") == 0)
 			{
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
-				uint64_t endAddress = (startAddress + 0x3f);
 
-				/* printf("_xcpm_core_scope_msrs found!\n");
-				printf("offset..............: 0x%llx\n", offset);
-				printf("textSegment->vmaddr.: 0x%llx\n", textSegment->vmaddr);
-				printf("textSegment->fileoff: 0x%llx\n", textSegment->fileoff);
-				printf("startAddress........: 0x%llx\n", startAddress);
-				printf("endAddress..........: 0x%llx\n", endAddress);
-				sleep(5); */
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
+				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+				//
+				// Zero out CPU bits of MSR 0xE2
+				//
+				// *(uint64_t *) = 0x0000000000000000ULL;
+				*(uint32_t *)(p + 4) = 0x00000000UL;
+				//
+				// Skip to second MSR 0xE2
+				//
+				p += 0x30;
+				//
+				// Zero out CPU bits of MSR 0xE2
+				//
+				// *(uint64_t *) = 0x0000000000000000ULL;
+				*(uint32_t *)(p + 4) = 0x00000000UL;
+			}
+			else if (strcmp(symbolName, "_xcpm_pkg_scope_msrs") == 0)
+			{
+				int64_t offset = (nl->n_value - textSegment->vmaddr);
+				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 
 				unsigned char * p = (unsigned char *)startAddress;
 				
-				for (; p <= (unsigned char *)endAddress; p++)
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
+				
+				//
+				// New way of patching.
+				//
+				for (unsigned char target_msr = 0; target_msr < 7; target_msr++)
 				{
-					// Note: We don't really need this check.
-					if (*(uint64_t *)p == XCPM_SCOPE_MSRS_TARGET_UINT64)
+					//
+					// Secondary for-loop to find MSRs that we need to disable.
+					//
+					for (unsigned char msr_to_disable = 0; msr_to_disable < 6; msr_to_disable++)
 					{
-						/* printf("Found @ 0x%llx ", (uint64_t)p - startAddress);
-						printf("Symbol-number: %ld\n", (symbolNumber + (skippedSymbolCount / listSize) + 1));
-						sleep(3); */
-						
-						*(uint64_t *)p = 0x0000000000000000ULL;
-						p += 0x30;
-						*(uint64_t *)p = 0x0000000000000000ULL;
-						p += 0x30;
-						*(uint64_t *)p = 0x0000000000000000ULL;
-						p = (unsigned char *)endAddress;
+						//
+						// Is this a MSR that we need to disable?
+						//
+						if (*(uint16_t *)p == targetMSRs[msr_to_disable])
+						{
+							//
+							// Yes.
+							//
+							DEBUG_DISABLED_MSR(targetMSRs[msr_to_disable], 1)
+							//
+							// Zero out the 32-bit CPU-bits field.
+							//
+							*(uint32_t *)(p + 4) = 0x00000000UL;
+							//
+							// The MSR is now disabled. Break out of secondary for loop.
+							//
+							break;
+						}
 					}
+
+					p += 0x30;
 				}
+
+				/* Old way of patching.
+				//
+				// Zero out MSR 0x01A0
+				//
+				*(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x01FC
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x01FC
+				//
+				// *(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x01AA
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x01AA
+				//
+				*(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x0620
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x0620
+				//
+				*(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x064C
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x064C
+				//
+				// *(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x063A
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x063A
+				//
+				*(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x0642
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x0642
+				//
+				*(uint64_t *)p = 0x0000000000000000ULL; */
 			}
 		}
-#endif
+#endif // #if PATCH_XCPM_SCOPE_MSRS
 
-#if PATCH_LOAD_EXTRA_KEXTS
-	#if (PATCH_KEXT_LOADING || PATCH_XCPI_SCOPE_MSRS)
+#if (PATCH_LOAD_EXTRA_KEXTS && PRELINKED_KERNEL_SUPPORT)
+	#if (PATCH_KEXT_LOADING || PATCH_XCPM_SCOPE_MSRS)
 		else
 	#endif
 		if ((nl->n_sect == 25 /* __KLD,__text */) && nl->n_value)
@@ -414,25 +648,17 @@ static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned l
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				uint64_t endAddress = (startAddress + 0x3f);
 				
-				/* printf("__ZN12KLDBootstrap21readStartupExtensionsEv found!\n");
-				printf("offset..............: 0x%llx\n", offset);
-				printf("vldSegment->vmaddr..: 0x%llx\n", vldSegment->vmaddr);
-				printf("vldSegment->fileoff.: 0x%llx\n", vldSegment->fileoff);
-				printf("startAddress........: 0x%llx\n", startAddress);
-				printf("endAddress..........: 0x%llx\n", endAddress);
-				sleep(5); */
- 
 				unsigned char * p = (unsigned char *)startAddress;
-				
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
+
 				for (; p <= (unsigned char *)endAddress; p++)
 				{
-					if (*(uint64_t *)p == READ_STARTUP_EXTENSIONS_TARGET_UINT64)
+					if (*(uint64_t *)p == 0xe805eb00000025e8)
 					{
-						/* printf("Found @ 0x%llx ", (uint64_t)p - startAddress);
-						printf("Symbol-number: %ld\n", (symbolNumber + (skippedSymbolCount / listSize) + 1));
-						sleep(3); */
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
 						
-						*(uint64_t *)p = READ_STARTUP_EXTENSIONS_PATCH_UINT64;
+						*(uint64_t *)p = 0xe8909000000025e8;
 						p = (unsigned char *)endAddress;
 					}
 				}
@@ -448,9 +674,9 @@ static long patchLoadExecutable(unsigned long cmdBase, long listSize, unsigned l
 #endif
 
 //==============================================================================
-// Private function. Called from DecodeMachO()
+// Private function. Called from decodeMachO()
 
-static long initKernelVersionInfo(unsigned long cmdBase, long listSize, unsigned int textSegmentVMAddress)
+static long initKernelVersionInfo(unsigned long loadAddress, unsigned long cmdBase, long listSize, unsigned int textSegmentVMAddress)
 {
 	struct symtab_command * symtab = (struct symtab_command *)cmdBase;
 
@@ -471,9 +697,9 @@ static long initKernelVersionInfo(unsigned long cmdBase, long listSize, unsigned
 	const char * targetSymbols[] = { "_version_revision", "_version_minor", "_version_major" };
 
 	char * symbolName = NULL;
-	char * loadBuffer = (char *)gBinaryAddress;
+	char * loadBuffer = (char *)loadAddress;
 
-	void * stringTable = (void *)(gBinaryAddress + symtab->stroff);
+	void * stringTable = (void *)(loadAddress + symtab->stroff);
 
 	short index								= 0;
 
@@ -481,7 +707,7 @@ static long initKernelVersionInfo(unsigned long cmdBase, long listSize, unsigned
 	long symbolLength						= 0;
 	long symbolNumber						= symtab->nsyms;
 
-	uint32_t pointer = gBinaryAddress + symtab->symoff + ((symtab->nsyms - 1) * listSize);
+	uint32_t pointer = loadAddress + symtab->symoff + ((symtab->nsyms - 1) * listSize);
 
 #if ((MAKE_TARGET_OS & SNOW_LEOPARD) == SNOW_LEOPARD)
 	if (gPlatform.ArchCPUType == CPU_TYPE_X86_64)
@@ -577,10 +803,10 @@ static long initKernelVersionInfo(unsigned long cmdBase, long listSize, unsigned
 }
 
 //==============================================================================
-// Private function. Called from DecodeMachO()
+// Private function. Called from decodeMachO()
 // Refactoring and segment name fix for OS X 10.6+ by DHP in 2010.
 
-static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *load_size)
+static long decodeSegment(unsigned long loadAddress, long cmdBase, unsigned int *load_addr, unsigned int *load_size)
 {
 	char *segmentName	= NULL;
 
@@ -596,7 +822,7 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 		struct segment_command_64 *segCmd = (struct segment_command_64 *)cmdBase;
 		vmaddr			= (segCmd->vmaddr & 0x3fffffff);
 		vmsize			= segCmd->vmsize;
-		fileAddress		= (gBinaryAddress + segCmd->fileoff);
+		fileAddress		= (loadAddress + segCmd->fileoff);
 		filesize		= segCmd->filesize;
 		segmentName		= segCmd->segname;
 	}
@@ -605,7 +831,7 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 		struct segment_command *segCmd = (struct segment_command *)cmdBase;
 		vmaddr			= (segCmd->vmaddr & 0x3fffffff);
 		vmsize			= segCmd->vmsize;
-		fileAddress		= (gBinaryAddress + segCmd->fileoff);
+		fileAddress		= (loadAddress + segCmd->fileoff);
 		filesize		= segCmd->filesize;
 		segmentName		= segCmd->segname;
 	}
@@ -669,9 +895,9 @@ static long DecodeSegment(long cmdBase, unsigned int *load_addr, unsigned int *l
 
 
 //==============================================================================
-// Private function. Called from DecodeMachO()
+// Private function. Called from decodeMachO()
 
-static long DecodeUnixThread(long cmdBase, unsigned int *entry)
+static long decodeUnixThread(long cmdBase, unsigned int *entry)
 {
 	switch (gPlatform.ArchCPUType)
 	{
@@ -709,9 +935,9 @@ static long DecodeUnixThread(long cmdBase, unsigned int *entry)
 
 #if ADD_SYMTAB
 //==============================================================================
-// Private function. Called from DecodeMachO()
+// Private function. Called from decodeMachO()
 
-static long DecodeSymbolTable(long cmdBase)
+static long decodeSymbolTable(unsigned long loadAddress, long cmdBase)
 {
 	long tmpAddr, symsSize, totalSize;
 	long gSymbolTableAddr;
@@ -742,7 +968,7 @@ static long DecodeSymbolTable(long cmdBase)
 	symTableSave->stroff = tmpAddr + symsSize;
 	symTableSave->strsize = symTab->strsize;
 	
-	bcopy((char *)(gBinaryAddress + symTab->symoff), (char *)tmpAddr, totalSize);
+	bcopy((char *)(loadAddress + symTab->symoff), (char *)tmpAddr, totalSize);
 
 	return 0;
 }

From 34f20eff4fa89d366c4f909b7a656189302510d3 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 15 Aug 2016 11:57:00 +0200
Subject: [PATCH 569/623] Comments and white space changes.

---
 i386/libsaio/load.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 00153b0..f1496e1 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -320,6 +320,7 @@ static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long l
 #if PRELINKED_KERNEL_SUPPORT
 	struct segment_command_64 * vldSegment = (struct segment_command_64 *)vldSegmentAddress;
 #endif
+
 	void * stringTable = (void *)(loadAddress + symtab->stroff);
 
 	const uint16_t targetMSRs[] = { 0xE2, 0x01A0, /* 0x01FC, */ 0x01AA, 0x0620, /* 0x064C, */ 0x063A, 0x0642 };
@@ -372,7 +373,7 @@ static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long l
 						p = (unsigned char *)endAddress;
 					}
 					else if (*(uint64_t *)p == 0x487174db8548c389) // macOS Sierra DP[2-5] = 89 c3 48 85 db 74 77 48  in HexEdit
-					{
+					{ //                           ^^^^
 						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
 
 						*(uint64_t *)p = 0x4812ebdb8548c389;
@@ -460,7 +461,7 @@ static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long l
 				}
 			}
 
-			else if (strcmp(symbolName, "_xcpm_idle") == 0)
+			else if (strcmp(symbolName, "_xcpm_idle") == 0) // 2 MSRs (0xE2, 0xE2)
 			{
 				offset = (nl->n_value - textSegment->vmaddr);
 				startAddress = (uint64_t)(textSegment->vmaddr + offset);
@@ -476,7 +477,8 @@ static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long l
 					{
 						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
 
-						*(uint64_t *)p = 0x9090000000e2b920; // Reversed (48 C1 EA) 20 B9 E2 00 00 00 90 90 (8 bytes).
+						// *(uint64_t *)p = 0x9090000000e2b920; // Reversed (48 C1 EA) 20 B9 E2 00 00 00 90 90 (8 bytes).
+						*(uint32_t *)p = 0x90900000; // Reversed 00 00 90 90 (4 bytes).
 					}
 				}
 			}
@@ -493,7 +495,7 @@ static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long l
 
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
 
-			if (strcmp(symbolName, "_xcpm_SMT_scope_msrs") == 0)
+			if (strcmp(symbolName, "_xcpm_SMT_scope_msrs") == 0) // 11 MSRs (0xE2, 0x01A0, 0x01B0, 0x01B0, 0x01B0, 0x0609, 0x038D, 0x038F, 0x0187, 0x0188, 0x0189)
 			{
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
@@ -503,7 +505,7 @@ static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long l
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
 				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
 				//
-				// Zero out MSR 0xE2 (and MSR 0x01A0
+				// Zero out MSR 0xE2 and MSR 0x01A0
 				//
 				for (repeat = 0; repeat < 8; repeat++)
 				{
@@ -511,7 +513,7 @@ static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long l
 					p += 0x08;
 				}
 			}
-			else if (strcmp(symbolName, "_xcpm_core_scope_msrs") == 0)
+			else if (strcmp(symbolName, "_xcpm_core_scope_msrs") == 0) // 2 MSRs (0xE2, 0xE2)
 			{
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
@@ -535,15 +537,19 @@ static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long l
 				// *(uint64_t *) = 0x0000000000000000ULL;
 				*(uint32_t *)(p + 4) = 0x00000000UL;
 			}
-			else if (strcmp(symbolName, "_xcpm_pkg_scope_msrs") == 0)
+			else if (strcmp(symbolName, "_xcpm_pkg_scope_msrs") == 0) // 7 MSRs (0x01A0, 0x01FC, 0x01AA, 0x0620, 0x064C, 0x063A, 0x0642)
 			{
+				//
+				// 0x064C MSR_TURBO_ACTIVATION_RATIO (Ivy Bridge Haswell E)
+				// 0x063A MSR_PP0_POLICY
+				// 0x0642 MSR_PP1_POLICY (not supported for server platform)
+				//
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 
 				unsigned char * p = (unsigned char *)startAddress;
-				
+
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
-				
 				//
 				// New way of patching.
 				//

From 5bbcb26428bc4f0c690f4441d864abdf8781e803 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 15 Aug 2016 12:04:34 +0200
Subject: [PATCH 570/623] Moving patchKernel to patcher.c

---
 i386/libsaio/Makefile        |  19 +-
 i386/libsaio/load.c          | 388 +--------------------------------
 i386/libsaio/patcher.c       | 400 +++++++++++++++++++++++++++++++++++
 i386/libsaio/saio_internal.h |   4 +
 4 files changed, 415 insertions(+), 396 deletions(-)
 create mode 100755 i386/libsaio/patcher.c

diff --git a/i386/libsaio/Makefile b/i386/libsaio/Makefile
index 5aec3e6..0e37b22 100644
--- a/i386/libsaio/Makefile
+++ b/i386/libsaio/Makefile
@@ -3,15 +3,16 @@
 #
 # Updates:
 #
-#			- Major cleanup (PikerAlpha, October 2012).
-#			- DMAKE_TARGET_MODEL added (PikerAlpha, October 2012).
-#			- Static data selectors added (PikerAlpha, October 2012).
-#			- STATIC_DATA_FILENAME added (PikerAlpha, October 2012).
-#			- Output added for rm/ar/ranlib actions (PikerAlpha, November 2012).
+#			- Major cleanup (Pike R. Alpha, October 2012).
+#			- DMAKE_TARGET_MODEL added (Pike R. Alpha, October 2012).
+#			- Static data selectors added (Pike R. Alpha, October 2012).
+#			- STATIC_DATA_FILENAME added (Pike R> Alpha, October 2012).
+#			- Output added for rm/ar/ranlib actions (Pike R> Alpha, November 2012).
 #			- Enabled clang compilation (dgsga, PikerAlpha, November 2012. Credits to Evan Lojewski for original work).
-#			- Output change and now using libtool instead of ar/ranlib (PikerAlpha, November 2012).
-#			- SAIO_OBJS changed / base64.o added (PikerAlpha, November 2012).
-#			- MAKE_TARGET_OS_VER added (PikerAlpha, June 2014).
+#			- Output change and now using libtool instead of ar/ranlib (Pike R. Alpha, November 2012).
+#			- SAIO_OBJS changed / base64.o added (Pike R. Alpha, November 2012).
+#			- MAKE_TARGET_OS_VER added (Pike R. Alpha, June 2014).
+#			- patcher.c added (Pike R. Alpha, August 2016).
 
 include ../MakePaths.dir
 
@@ -41,7 +42,7 @@ INC = -I. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR)
 VPATH = $(OBJROOT):$(SYMROOT)
 
 SAIO_OBJS =	table.o asm.o bios.o biosfn.o guid.o disk.o sys.o cache.o \
-		bootstruct.o base64.o stringTable.o load.o pci.o allocate.o \
+		bootstruct.o base64.o stringTable.o patcher.o load.o pci.o allocate.o \
 		vbe.o hfs.o hfs_compare.o xml.o md5c.o device_tree.o cpu.o \
 		platform.o acpi.o smbios.o efi.o console.o 
 
diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index f1496e1..4ca61f9 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -35,6 +35,7 @@
  *			- Renamed patchLoadExecutable to patchKernel (Pike R. Alpha, August 2016)
  *			- New and improved debug output (see also boot2/debug.h)
  *			- Made some preparations to move patchKernel() to patcher.c
+ *			- Moved function patchKernel to patcher.c
  *
  */
 
@@ -57,11 +58,6 @@
 // Load MKext(s) or separate kexts (default behaviour / behavior).
 bool gLoadKernelDrivers = true;
 
-// Private functions.
-#if (PATCH_KERNEL && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
-	static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress);
-#endif
-
 static long initKernelVersionInfo(unsigned long loadAddress, unsigned long cmdbase, long listSize, unsigned int textSegmentAddress);
 static long decodeSegment(unsigned long loadAddress, long cmdBase, unsigned int*load_addr, unsigned int *load_size);
 static long decodeUnixThread(long cmdBase, unsigned int *entry);
@@ -296,388 +292,6 @@ long decodeMachO(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsize
 	return ret;
 }
 
-#if (PATCH_KERNEL && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
-
-//==============================================================================
-// Private function. Called from decodeMachO()
-
-static long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress)
-{
-#if DEBUG_KERNEL_PATCHER
-	printf("patchKernel() called\n");
-	sleep(1);
-#endif
-
-	char * symbolName = NULL;
-
-	// Skip the first 3000 symbols, to speed up the search process.
-	int skippedSymbolCount	= 0; // (3000 * listSize);
-
-	long symbolNumber		= 0;
-
-	struct symtab_command * symtab = (struct symtab_command *)cmdBase;
-	struct segment_command_64 * textSegment = (struct segment_command_64 *)textSegmentAddress;
-#if PRELINKED_KERNEL_SUPPORT
-	struct segment_command_64 * vldSegment = (struct segment_command_64 *)vldSegmentAddress;
-#endif
-
-	void * stringTable = (void *)(loadAddress + symtab->stroff);
-
-	const uint16_t targetMSRs[] = { 0xE2, 0x01A0, /* 0x01FC, */ 0x01AA, 0x0620, /* 0x064C, */ 0x063A, 0x0642 };
-
-	uint32_t pointer = (loadAddress + symtab->symoff + skippedSymbolCount);
-
-	while (symbolNumber < symtab->nsyms)
-	{
-		struct nlist_64 * nl = (struct nlist_64 *)pointer;
-
-#if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
-		int64_t offset			= 0;
-		uint64_t startAddress	= 0;
-		uint64_t endAddress		= 0;
-
-		if ((nl->n_sect == 1 /* __TEXT,__text */) && nl->n_value)
-		{
-			symbolName = (char *)stringTable + nl->n_un.n_strx;
-#if PATCH_KEXT_LOADING
-			if (strcmp(symbolName, "__ZN6OSKext14loadExecutableEv") == 0)
-			{
-				offset = (nl->n_value - textSegment->vmaddr);
-				startAddress = (uint64_t)(textSegment->vmaddr + offset);
-				endAddress = (startAddress + 0x300);
-
-				unsigned char * p = (unsigned char *)startAddress;
-
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
-
-				for (; p <= (unsigned char *)endAddress; p++)
-				{
-					//
-					// New search pattern: 0x48xx74db854c3789
-					//
-					if ((*(uint32_t *)p == 0x8548c389) && (*(uint16_t *)(p+4) == 0x74db) && (*(uint8_t *)(p+7) == 0x48))
-					{
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						*(uint64_t *)p = 0x4812ebdb8548c389;
-						p = (unsigned char *)endAddress;
-					}
-
-					/* Old search patterns – macOS Sierra DP1 = 89 c3 48 85 db 74 77 48 in HexEdit
-					if (*(uint64_t *)p == 0x487774db8548e789)
-					{ //                      ^^^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						*(uint64_t *)p = 0x4812ebdb8548e789; // 89 c3 48 85 db eb 12 48 in HexEdit
-						//                   ^^^^
-						p = (unsigned char *)endAddress;
-					}
-					else if (*(uint64_t *)p == 0x487174db8548c389) // macOS Sierra DP[2-5] = 89 c3 48 85 db 74 77 48  in HexEdit
-					{ //                           ^^^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						*(uint64_t *)p = 0x4812ebdb8548c389;
-						//                   ^^^^
-						p = (unsigned char *)endAddress;
-					} */
-				}
-			}
-#endif // #if PATCH_KEXT_LOADING
-
-#if PATCH_CPUID_SET_INFO
-	#if PATCH_KEXT_LOADING
-			else
-	#endif
-			if (strcmp(symbolName, "_cpuid_set_info") == 0)
-			{
-				offset = (nl->n_value - textSegment->vmaddr);
-				startAddress = (uint64_t)(textSegment->vmaddr + offset);
-				endAddress = (startAddress + 0x2100);
-
-				unsigned char * p = (unsigned char *)startAddress;
-				
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
-
-				for (; p <= (unsigned char *)endAddress; p++)
-				{
-					// Broadwell E (0x4F)	-> Broadwell (0x47)		=> 0x4F-0x47 = 0x08	-> change 0xE9 into 0xE1
-					// Haswell E (0x3F)		-> Haswell (0x3C)		=> 0x3F-0x3C = 0x03	-> change 0xE9 into 0xE6
-					// Ivy Bridge E (0x3E)	-> Ivy Bridge (0x3A)	=> 0x3E-0x3A = 0x04	-> change 0xE9 into 0xE5
-
-					if (*(uint64_t *)p == 0xf883e9c083c4b60f) // Reversed 0f b6 c4 83 c0 e9 83 f8 (47) (8 bytes).
-					{ //                        ^^                                       ^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						// 0xff - 0xe9 = 0x16 + 0x01 = 0x17 + (0x4f - 0x47 = 0x08) = 0x1f (0x4f - 0x1f = 0x38)
-						*(uint64_t *)p = 0xf8839000000030b8; // Reversed b8 30 00 00 00 90 83 f8 (47) (8 bytes).
-						p = (unsigned char *)endAddress;
-					}
-					else if (*(uint64_t *)p == 0xf883f1c083c4b60f) // Reversed 0f b6 c4 83 c0 f1 83 f8 (47) (8 bytes).
-					{ //                             ^^                                       ^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-						
-						// 0xff - 0xf1 = 0x0e + 0x01 = 0x0f + (0x4f - 0x47 = 0x08) = 0x17 (0x4f - 0x17 = 0x38)
-						*(uint64_t *)p = 0xf8839000000038b8; // Reversed b8 38 00 00 00 90 83 f8 (47) (8 bytes).
-						p = (unsigned char *)endAddress;
-					}
-
-					/* Broadwell_E (0x4F) -> Broadwell (0x47)
-					if (*(uint64_t *)p == 0x47f883e9c083c4b6) // Reversed (0f) b6 c4 83 c0 e9 83 f8 47 (8 bytes).
-					{ //                          ^^                                       ^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						*(uint64_t *)p = 0x47f883e1c083c4b6; // Reversed (0f) b6 c4 83 c0 e1 83 f8 47 (8 bytes).
-						p = (unsigned char *)endAddress;
-					}
-					else if (*(uint64_t *)p == 0x4ff883f1c083c4b6) // Reversed (0f) b6 c4 83 c0 f1 83 f8 4f (8 bytes).
-					{ //                               ^^                                       ^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						*(uint64_t *)p = 0x4ff883e9c083c4b6; // Reversed (0f) b6 c4 83 c0 e9 83 f8 4F (8 bytes).
-						p = (unsigned char *)endAddress;
-					} */
-				}
-			}
-#endif
-			else if (strcmp(symbolName, "_xcpm_bootstrap") == 0)
-			{
-				offset = (nl->n_value - textSegment->vmaddr);
-				startAddress = (uint64_t)(textSegment->vmaddr + offset);
-				endAddress = (startAddress + 0x100);
-
-				unsigned char * p = (unsigned char *)startAddress;
-
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
-
-				for (; p <= (unsigned char *)endAddress; p++)
-				{
-					if (*(uint64_t *)p == 0x1c7722fb83c4c383) // Reversed of HexEdit: 83 C3 C4 83 FB 22 77 1C
-					{ //                              ˆˆ                                    ˆˆ
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						*(uint64_t *)p = 0x1c7722fb83bcc383; // Reversed of HexEdit: 83 C3 BC 83 FB 22 77 1C
-						//                           ˆˆ                                    ˆˆ
-					}
-				}
-			}
-
-			else if (strcmp(symbolName, "_xcpm_idle") == 0) // 2 MSRs (0xE2, 0xE2)
-			{
-				offset = (nl->n_value - textSegment->vmaddr);
-				startAddress = (uint64_t)(textSegment->vmaddr + offset);
-				endAddress = (startAddress + 0x200);
-
-				unsigned char * p = (unsigned char *)startAddress;
-
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
-
-				for (; p <= (unsigned char *)endAddress; p++)
-				{
-					if (*(uint64_t *)p == 0x300f000000e2b920)// (48 C1 EA) 20 B9 E2 00 00 00 0F 30 reversed
-					{
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						// *(uint64_t *)p = 0x9090000000e2b920; // Reversed (48 C1 EA) 20 B9 E2 00 00 00 90 90 (8 bytes).
-						*(uint32_t *)p = 0x90900000; // Reversed 00 00 90 90 (4 bytes).
-					}
-				}
-			}
-		}
-#endif // #if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
-
-#if PATCH_XCPM_SCOPE_MSRS
-	#if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
-		else
-	#endif
-		if (((nl->n_sect == 8 /* __DATA,__data */) && nl->n_value) && gPlatform.CPU.CstConfigMsrLocked)
-		{
-			UInt8 repeat = 0;
-
-			symbolName = (char *)stringTable + nl->n_un.n_strx;
-
-			if (strcmp(symbolName, "_xcpm_SMT_scope_msrs") == 0) // 11 MSRs (0xE2, 0x01A0, 0x01B0, 0x01B0, 0x01B0, 0x0609, 0x038D, 0x038F, 0x0187, 0x0188, 0x0189)
-			{
-				int64_t offset = (nl->n_value - textSegment->vmaddr);
-				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
-				
-				unsigned char * p = (unsigned char *)startAddress;
-				
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
-				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-				//
-				// Zero out MSR 0xE2 and MSR 0x01A0
-				//
-				for (repeat = 0; repeat < 8; repeat++)
-				{
-					*(uint64_t *)p = 0x0000000000000000ULL;
-					p += 0x08;
-				}
-			}
-			else if (strcmp(symbolName, "_xcpm_core_scope_msrs") == 0) // 2 MSRs (0xE2, 0xE2)
-			{
-				int64_t offset = (nl->n_value - textSegment->vmaddr);
-				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
-
-				unsigned char * p = (unsigned char *)startAddress;
-
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
-				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-				//
-				// Zero out CPU bits of MSR 0xE2
-				//
-				// *(uint64_t *) = 0x0000000000000000ULL;
-				*(uint32_t *)(p + 4) = 0x00000000UL;
-				//
-				// Skip to second MSR 0xE2
-				//
-				p += 0x30;
-				//
-				// Zero out CPU bits of MSR 0xE2
-				//
-				// *(uint64_t *) = 0x0000000000000000ULL;
-				*(uint32_t *)(p + 4) = 0x00000000UL;
-			}
-			else if (strcmp(symbolName, "_xcpm_pkg_scope_msrs") == 0) // 7 MSRs (0x01A0, 0x01FC, 0x01AA, 0x0620, 0x064C, 0x063A, 0x0642)
-			{
-				//
-				// 0x064C MSR_TURBO_ACTIVATION_RATIO (Ivy Bridge Haswell E)
-				// 0x063A MSR_PP0_POLICY
-				// 0x0642 MSR_PP1_POLICY (not supported for server platform)
-				//
-				int64_t offset = (nl->n_value - textSegment->vmaddr);
-				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
-
-				unsigned char * p = (unsigned char *)startAddress;
-
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
-				//
-				// New way of patching.
-				//
-				for (unsigned char target_msr = 0; target_msr < 7; target_msr++)
-				{
-					//
-					// Secondary for-loop to find MSRs that we need to disable.
-					//
-					for (unsigned char msr_to_disable = 0; msr_to_disable < 6; msr_to_disable++)
-					{
-						//
-						// Is this a MSR that we need to disable?
-						//
-						if (*(uint16_t *)p == targetMSRs[msr_to_disable])
-						{
-							//
-							// Yes.
-							//
-							DEBUG_DISABLED_MSR(targetMSRs[msr_to_disable], 1)
-							//
-							// Zero out the 32-bit CPU-bits field.
-							//
-							*(uint32_t *)(p + 4) = 0x00000000UL;
-							//
-							// The MSR is now disabled. Break out of secondary for loop.
-							//
-							break;
-						}
-					}
-
-					p += 0x30;
-				}
-
-				/* Old way of patching.
-				//
-				// Zero out MSR 0x01A0
-				//
-				*(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x01FC
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x01FC
-				//
-				// *(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x01AA
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x01AA
-				//
-				*(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x0620
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x0620
-				//
-				*(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x064C
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x064C
-				//
-				// *(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x063A
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x063A
-				//
-				*(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x0642
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x0642
-				//
-				*(uint64_t *)p = 0x0000000000000000ULL; */
-			}
-		}
-#endif // #if PATCH_XCPM_SCOPE_MSRS
-
-#if (PATCH_LOAD_EXTRA_KEXTS && PRELINKED_KERNEL_SUPPORT)
-	#if (PATCH_KEXT_LOADING || PATCH_XCPM_SCOPE_MSRS)
-		else
-	#endif
-		if ((nl->n_sect == 25 /* __KLD,__text */) && nl->n_value)
-		{
-			symbolName = (char *)stringTable + nl->n_un.n_strx;
-			
-			if (strcmp(symbolName, "__ZN12KLDBootstrap21readStartupExtensionsEv") == 0)
-			{
-				int64_t offset = (nl->n_value - textSegment->vmaddr);
-				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
-				uint64_t endAddress = (startAddress + 0x3f);
-				
-				unsigned char * p = (unsigned char *)startAddress;
-
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
-
-				for (; p <= (unsigned char *)endAddress; p++)
-				{
-					if (*(uint64_t *)p == 0xe805eb00000025e8)
-					{
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-						
-						*(uint64_t *)p = 0xe8909000000025e8;
-						p = (unsigned char *)endAddress;
-					}
-				}
-			}
-		}
-#endif
-		symbolNumber++;
-		pointer += listSize; // Point to next symbol.
-	}
-
-	return 0;
-}
-#endif
 
 //==============================================================================
 // Private function. Called from decodeMachO()
diff --git a/i386/libsaio/patcher.c b/i386/libsaio/patcher.c
new file mode 100755
index 0000000..f81ac6e
--- /dev/null
+++ b/i386/libsaio/patcher.c
@@ -0,0 +1,400 @@
+/*
+ * Copyright (c) 2016 Pike R. Alpha. All rights reserved.
+ *
+ * Updates:
+ *			- Moved function patchKernel from load.c to patcher.c (Pike R. Alpha, August 2016)
+ *
+ */
+
+#include <mach-o/fat.h>
+#include <mach-o/loader.h>
+#include <mach-o/nlist.h>
+
+#include "platform.h"
+
+#if (PATCH_KERNEL && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+
+#define PATCH_KEXT_LOADING	1
+
+
+//==============================================================================
+// Called from decodeMachO()
+
+long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress)
+{
+#if DEBUG_KERNEL_PATCHER
+	printf("patchKernel() called\n");
+	sleep(1);
+#endif
+
+	char * symbolName = NULL;
+
+	// Skip the first 3000 symbols, to speed up the search process.
+	int skippedSymbolCount	= 0; // (3000 * listSize);
+
+	long symbolNumber		= 0;
+
+	struct symtab_command * symtab = (struct symtab_command *)cmdBase;
+	struct segment_command_64 * textSegment = (struct segment_command_64 *)textSegmentAddress;
+#if PRELINKED_KERNEL_SUPPORT
+	struct segment_command_64 * vldSegment = (struct segment_command_64 *)vldSegmentAddress;
+#endif
+
+	void * stringTable = (void *)(loadAddress + symtab->stroff);
+
+	const uint16_t targetMSRs[] = { 0xE2, 0x01A0, /* 0x01FC, */ 0x01AA, 0x0620, /* 0x064C, */ 0x063A, 0x0642 };
+
+	uint32_t pointer = (loadAddress + symtab->symoff + skippedSymbolCount);
+
+	while (symbolNumber < symtab->nsyms)
+	{
+		struct nlist_64 * nl = (struct nlist_64 *)pointer;
+
+#if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
+        int64_t offset			= 0;
+        uint64_t startAddress	= 0;
+        uint64_t endAddress		= 0;
+
+		if ((nl->n_sect == 1 /* __TEXT,__text */) && nl->n_value)
+		{
+			symbolName = (char *)stringTable + nl->n_un.n_strx;
+#if PATCH_KEXT_LOADING
+			if (strcmp(symbolName, "__ZN6OSKext14loadExecutableEv") == 0)
+			{
+				offset = (nl->n_value - textSegment->vmaddr);
+				startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				endAddress = (startAddress + 0x300);
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
+
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					//
+					// New search pattern: 0x48xx74db854c3789
+					//
+					if ((*(uint32_t *)p == 0x8548c389) && (*(uint16_t *)(p+4) == 0x74db) && (*(uint8_t *)(p+7) == 0x48))
+					{
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+						
+						*(uint64_t *)p = 0x4812ebdb8548c389;
+						p = (unsigned char *)endAddress;
+					}
+
+					/* Old search patterns – macOS Sierra DP1 = 89 c3 48 85 db 74 77 48 in HexEdit
+					if (*(uint64_t *)p == 0x487774db8548e789)
+					{ //                      ^^^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x4812ebdb8548e789; // 89 c3 48 85 db eb 12 48 in HexEdit
+						//                 ^^^^
+						p = (unsigned char *)endAddress;
+					}
+					else if (*(uint64_t *)p == 0x487174db8548c389) // macOS Sierra DP[2-5] = 89 c3 48 85 db 74 77 48  in HexEdit
+					{ //                           ^^^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+						
+						*(uint64_t *)p = 0x4812ebdb8548c389;
+						//                   ^^^^
+						p = (unsigned char *)endAddress;
+					} */
+				}
+			}
+#endif // #if PATCH_KEXT_LOADING
+
+#if PATCH_CPUID_SET_INFO
+	#if PATCH_KEXT_LOADING
+			else
+	#endif
+			if (strcmp(symbolName, "_cpuid_set_info") == 0)
+			{
+				offset = (nl->n_value - textSegment->vmaddr);
+				startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				endAddress = (startAddress + 0x2100);
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
+
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					// Broadwell E (0x4F)	-> Broadwell (0x47)		=> 0x4F-0x47 = 0x08	-> change 0xE9 into 0xE1
+					// Haswell E (0x3F)		-> Haswell (0x3C)		=> 0x3F-0x3C = 0x03	-> change 0xE9 into 0xE6
+					// Ivy Bridge E (0x3E)	-> Ivy Bridge (0x3A)	=> 0x3E-0x3A = 0x04	-> change 0xE9 into 0xE5
+
+					if (*(uint64_t *)p == 0xf883e9c083c4b60f) // Reversed 0f b6 c4 83 c0 e9 83 f8 (47) (8 bytes).
+					{ //                        ^^                                       ^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						// 0xff - 0xe9 = 0x16 + 0x01 = 0x17 + (0x4f - 0x47 = 0x08) = 0x1f (0x4f - 0x1f = 0x38)
+						*(uint64_t *)p = 0xf8839000000030b8; // Reversed b8 30 00 00 00 90 83 f8 (47) (8 bytes).
+						p = (unsigned char *)endAddress;
+					}
+					else if (*(uint64_t *)p == 0xf883f1c083c4b60f) // Reversed 0f b6 c4 83 c0 f1 83 f8 (47) (8 bytes).
+					{ //                               ^^                                  ^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+						
+						// 0xff - 0xf1 = 0x0e + 0x01 = 0x0f + (0x4f - 0x47 = 0x08) = 0x17 (0x4f - 0x17 = 0x38)
+						*(uint64_t *)p = 0xf8839000000038b8; // Reversed b8 38 00 00 00 90 83 f8 (47) (8 bytes).
+						p = (unsigned char *)endAddress;
+					}
+
+					/* Broadwell_E (0x4F) -> Broadwell (0x47)
+					if (*(uint64_t *)p == 0x47f883e9c083c4b6) // Reversed (0f) b6 c4 83 c0 e9 83 f8 47 (8 bytes).
+					{ //                          ^^                                       ^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x47f883e1c083c4b6; // Reversed (0f) b6 c4 83 c0 e1 83 f8 47 (8 bytes).
+						p = (unsigned char *)endAddress;
+					}
+					else if (*(uint64_t *)p == 0x4ff883f1c083c4b6) // Reversed (0f) b6 c4 83 c0 f1 83 f8 4f (8 bytes).
+					{ //                               ^^                                       ^^
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x4ff883e9c083c4b6; // Reversed (0f) b6 c4 83 c0 e9 83 f8 4F (8 bytes).
+						p = (unsigned char *)endAddress;
+					} */
+				}
+			}
+#endif
+			else if (strcmp(symbolName, "_xcpm_bootstrap") == 0)
+			{
+				offset = (nl->n_value - textSegment->vmaddr);
+				startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				endAddress = (startAddress + 0x100);
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
+
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					if (*(uint64_t *)p == 0x1c7722fb83c4c383) // Reversed of HexEdit: 83 C3 C4 83 FB 22 77 1C
+					{ //                              ˆˆ                                    ˆˆ
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0x1c7722fb83bcc383; // Reversed of HexEdit: 83 C3 BC 83 FB 22 77 1C
+						//                           ˆˆ                                    ˆˆ
+					}
+				}
+			}
+
+			else if (strcmp(symbolName, "_xcpm_idle") == 0) // 2 MSRs (0xE2, 0xE2)
+			{
+				offset = (nl->n_value - textSegment->vmaddr);
+				startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				endAddress = (startAddress + 0x200);
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
+
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					if (*(uint64_t *)p == 0x300f000000e2b920)// (48 C1 EA) 20 B9 E2 00 00 00 0F 30 reversed
+					{
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						// *(uint64_t *)p = 0x9090000000e2b920; // Reversed (48 C1 EA) 20 B9 E2 00 00 00 90 90 (8 bytes).
+						*(uint32_t *)p = 0x90900000; // Reversed 00 00 90 90 (4 bytes).
+					}
+				}
+			}
+		}
+#endif // #if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
+
+#if PATCH_XCPM_SCOPE_MSRS
+	#if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
+		else
+	#endif
+		if (((nl->n_sect == 8 /* __DATA,__data */) && nl->n_value) && gPlatform.CPU.CstConfigMsrLocked)
+		{
+			UInt8 repeat = 0;
+
+			symbolName = (char *)stringTable + nl->n_un.n_strx;
+
+			if (strcmp(symbolName, "_xcpm_SMT_scope_msrs") == 0) // 11 MSRs (0xE2, 0x01A0, 0x01B0, 0x01B0, 0x01B0, 0x0609, 0x038D, 0x038F, 0x0187, 0x0188, 0x0189)
+			{
+				int64_t offset = (nl->n_value - textSegment->vmaddr);
+				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
+				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+				//
+				// Zero out MSR 0xE2 and MSR 0x01A0
+				//
+				for (repeat = 0; repeat < 8; repeat++)
+				{
+					*(uint64_t *)p = 0x0000000000000000ULL;
+					p += 0x08;
+				}
+			}
+			else if (strcmp(symbolName, "_xcpm_core_scope_msrs") == 0) // 2 MSRs (0xE2, 0xE2)
+			{
+				int64_t offset = (nl->n_value - textSegment->vmaddr);
+				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
+				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+				//
+				// Zero out CPU bits of MSR 0xE2
+				//
+				// *(uint64_t *) = 0x0000000000000000ULL;
+				*(uint32_t *)(p + 4) = 0x00000000UL;
+				//
+				// Skip to second MSR 0xE2
+				//
+				p += 0x30;
+				//
+				// Zero out CPU bits of MSR 0xE2
+				//
+				// *(uint64_t *) = 0x0000000000000000ULL;
+				*(uint32_t *)(p + 4) = 0x00000000UL;
+			}
+			else if (strcmp(symbolName, "_xcpm_pkg_scope_msrs") == 0) // 7 MSRs (0x01A0, 0x01FC, 0x01AA, 0x0620, 0x064C, 0x063A, 0x0642)
+			{
+				//
+				// 0x064C MSR_TURBO_ACTIVATION_RATIO (Ivy Bridge Haswell E)
+				// 0x063A MSR_PP0_POLICY
+				// 0x0642 MSR_PP1_POLICY (not supported for server platform)
+				//
+				int64_t offset = (nl->n_value - textSegment->vmaddr);
+				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
+				//
+				// New way of patching.
+				//
+				for (unsigned char target_msr = 0; target_msr < 7; target_msr++)
+				{
+					//
+					// Secondary for-loop to find MSRs that we need to disable.
+					//
+					for (unsigned char msr_to_disable = 0; msr_to_disable < 6; msr_to_disable++)
+					{
+						//
+						// Is this a MSR that we need to disable?
+						//
+						if (*(uint16_t *)p == targetMSRs[msr_to_disable])
+						{
+							//
+							// Yes.
+							//
+							DEBUG_DISABLED_MSR(targetMSRs[msr_to_disable], 1)
+							//
+							// Zero out the 32-bit CPU-bits field.
+							//
+							*(uint32_t *)(p + 4) = 0x00000000UL;
+							//
+							// The MSR is now disabled. Break out of secondary for loop.
+							//
+							break;
+						}
+					}
+					
+					p += 0x30;
+				}
+
+				/* Old way of patching.
+				//
+				// Zero out MSR 0x01A0
+				//
+				*(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x01FC
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x01FC
+				//
+				// *(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x01AA
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x01AA
+				//
+				*(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x0620
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x0620
+				//
+				*(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x064C
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x064C
+				//
+				// *(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x063A
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x063A
+				//
+				*(uint64_t *)p = 0x0000000000000000ULL;
+				//
+				// Skip to MSR 0x0642
+				//
+				p += 0x30;
+				//
+				// Zero out MSR 0x0642
+				//
+				*(uint64_t *)p = 0x0000000000000000ULL; */
+			}
+		}
+#endif // #if PATCH_XCPM_SCOPE_MSRS
+
+#if (PATCH_LOAD_EXTRA_KEXTS && PRELINKED_KERNEL_SUPPORT)
+	#if (PATCH_KEXT_LOADING || PATCH_XCPM_SCOPE_MSRS)
+		else
+	#endif
+		if ((nl->n_sect == 25 /* __KLD,__text */) && nl->n_value)
+		{
+			symbolName = (char *)stringTable + nl->n_un.n_strx;
+			
+			if (strcmp(symbolName, "__ZN12KLDBootstrap21readStartupExtensionsEv") == 0)
+			{
+				int64_t offset = (nl->n_value - textSegment->vmaddr);
+				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
+				uint64_t endAddress = (startAddress + 0x3f);
+
+				unsigned char * p = (unsigned char *)startAddress;
+
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
+				
+				for (; p <= (unsigned char *)endAddress; p++)
+				{
+					if (*(uint64_t *)p == 0xe805eb00000025e8)
+					{
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+
+						*(uint64_t *)p = 0xe8909000000025e8;
+						p = (unsigned char *)endAddress;
+					}
+				}
+			}
+		}
+#endif // #if (PATCH_LOAD_EXTRA_KEXTS && PRELINKED_KERNEL_SUPPORT)
+
+		symbolNumber++;
+		pointer += listSize; // Point to next symbol.
+	}
+
+	return 0;
+}
+#endif
diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index eecf89b..7f3590c 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -151,6 +151,10 @@ extern long		decodeMachO(void *binary, entry_t *rentry, char **raddr, int *rsize
 extern long		loadBinaryData(char *aFilePath, void **aMemoryAddress);
 
 
+/* patcher.c */
+extern long		patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress);
+
+
 /* memory.c */
 long			AllocateKernelMemory(long inSize);
 long			AllocateMemoryRange(char * rangeName, long start, long length);

From c343e416b38889c8b4e869c9ced841fa5cbd6754 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 15 Aug 2016 14:55:38 +0200
Subject: [PATCH 571/623] Show MSR number instead of 0x00.

---
 i386/boot2/debug.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i386/boot2/debug.h b/i386/boot2/debug.h
index 3da5c24..bb7c4b7 100755
--- a/i386/boot2/debug.h
+++ b/i386/boot2/debug.h
@@ -127,12 +127,12 @@
 							sleep(seconds);															\
 						}
 
-	#define DEBUG_DISABLED_MSR(msr, seconds)				\
-						printf("Disabling MSR: 0x%x\n");	\
-															\
-						if (seconds)						\
-						{									\
-							sleep(seconds);					\
+	#define DEBUG_DISABLED_MSR(msr, seconds)					\
+						printf("Disabling MSR: 0x%x\n", msr);	\
+																\
+						if (seconds)							\
+						{										\
+							sleep(seconds);						\
 						}
 
 #else

From dddac45c2c8ac6153fef5cc9734987d157c793d8 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Mon, 15 Aug 2016 17:31:23 +0200
Subject: [PATCH 572/623] Cleanups

---
 i386/boot2/debug.h     |  16 ++--
 i386/libsaio/patcher.c | 172 +++++++++++++----------------------------
 2 files changed, 60 insertions(+), 128 deletions(-)

diff --git a/i386/boot2/debug.h b/i386/boot2/debug.h
index bb7c4b7..a039698 100755
--- a/i386/boot2/debug.h
+++ b/i386/boot2/debug.h
@@ -117,14 +117,14 @@
 						printf("textSegment->fileoff: 0x%llx\n", fileoff);	\
 						printf("startAddress........: 0x%llx\n", start);	\
 						printf("endAddress..........: 0x%llx\n", end);		\
-						sleep(3);
-
-	#define DEBUG_PATCH_STATUS(symbol, address, number, seconds)			\
-						printf("Patched %s(0x%llx) symbol-number: %ld\n", symbol, address, number);	\
-																									\
-						if (seconds)																\
-						{																			\
-							sleep(seconds);															\
+						sleep(1);
+
+	#define DEBUG_PATCH_STATUS(symbol, address, seconds)					\
+						printf("Patched %s(@ 0x%x)\n", symbol, address);	\
+																			\
+						if (seconds)										\
+						{													\
+							sleep(seconds);									\
 						}
 
 	#define DEBUG_DISABLED_MSR(msr, seconds)					\
diff --git a/i386/libsaio/patcher.c b/i386/libsaio/patcher.c
index f81ac6e..4fd3d1c 100755
--- a/i386/libsaio/patcher.c
+++ b/i386/libsaio/patcher.c
@@ -3,6 +3,7 @@
  *
  * Updates:
  *			- Moved function patchKernel from load.c to patcher.c (Pike R. Alpha, August 2016)
+ *			- Cleanups/removed some of the old style patches (more to follow).
  *
  */
 
@@ -28,8 +29,10 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 #endif
 
 	char * symbolName = NULL;
-
-	// Skip the first 3000 symbols, to speed up the search process.
+	unsigned char * p = NULL;
+	//
+	// Option to skip first nth symbols (speeds up the search process).
+	//
 	int skippedSymbolCount	= 0; // (3000 * listSize);
 
 	long symbolNumber		= 0;
@@ -46,14 +49,21 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 
 	uint32_t pointer = (loadAddress + symtab->symoff + skippedSymbolCount);
 
+	int64_t offset			= 0;
+
+	uint64_t startAddress	= 0;
+	uint64_t endAddress		= 0;
+	//
+	// Main while loop.
+	//
 	while (symbolNumber < symtab->nsyms)
 	{
 		struct nlist_64 * nl = (struct nlist_64 *)pointer;
 
 #if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
-        int64_t offset			= 0;
-        uint64_t startAddress	= 0;
-        uint64_t endAddress		= 0;
+        offset			= 0;
+        startAddress	= 0;
+        endAddress		= 0;
 
 		if ((nl->n_sect == 1 /* __TEXT,__text */) && nl->n_value)
 		{
@@ -65,40 +75,22 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				endAddress = (startAddress + 0x300);
 
-				unsigned char * p = (unsigned char *)startAddress;
+				p = (unsigned char *)startAddress;
 
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
 
 				for (; p <= (unsigned char *)endAddress; p++)
 				{
 					//
-					// New search pattern: 0x48xx74db854c3789
+					// Search pattern: 0x48xx74db854c3789
 					//
 					if ((*(uint32_t *)p == 0x8548c389) && (*(uint16_t *)(p+4) == 0x74db) && (*(uint8_t *)(p+7) == 0x48))
 					{
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 						
 						*(uint64_t *)p = 0x4812ebdb8548c389;
 						p = (unsigned char *)endAddress;
 					}
-
-					/* Old search patterns – macOS Sierra DP1 = 89 c3 48 85 db 74 77 48 in HexEdit
-					if (*(uint64_t *)p == 0x487774db8548e789)
-					{ //                      ^^^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						*(uint64_t *)p = 0x4812ebdb8548e789; // 89 c3 48 85 db eb 12 48 in HexEdit
-						//                 ^^^^
-						p = (unsigned char *)endAddress;
-					}
-					else if (*(uint64_t *)p == 0x487174db8548c389) // macOS Sierra DP[2-5] = 89 c3 48 85 db 74 77 48  in HexEdit
-					{ //                           ^^^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-						
-						*(uint64_t *)p = 0x4812ebdb8548c389;
-						//                   ^^^^
-						p = (unsigned char *)endAddress;
-					} */
 				}
 			}
 #endif // #if PATCH_KEXT_LOADING
@@ -113,7 +105,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				endAddress = (startAddress + 0x2100);
 
-				unsigned char * p = (unsigned char *)startAddress;
+				p = (unsigned char *)startAddress;
 
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
 
@@ -123,9 +115,12 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 					// Haswell E (0x3F)		-> Haswell (0x3C)		=> 0x3F-0x3C = 0x03	-> change 0xE9 into 0xE6
 					// Ivy Bridge E (0x3E)	-> Ivy Bridge (0x3A)	=> 0x3E-0x3A = 0x04	-> change 0xE9 into 0xE5
 
+					//
+					// TODO: Port the patch routine from Vector.
+					//
 					if (*(uint64_t *)p == 0xf883e9c083c4b60f) // Reversed 0f b6 c4 83 c0 e9 83 f8 (47) (8 bytes).
 					{ //                        ^^                                       ^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 
 						// 0xff - 0xe9 = 0x16 + 0x01 = 0x17 + (0x4f - 0x47 = 0x08) = 0x1f (0x4f - 0x1f = 0x38)
 						*(uint64_t *)p = 0xf8839000000030b8; // Reversed b8 30 00 00 00 90 83 f8 (47) (8 bytes).
@@ -133,28 +128,12 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 					}
 					else if (*(uint64_t *)p == 0xf883f1c083c4b60f) // Reversed 0f b6 c4 83 c0 f1 83 f8 (47) (8 bytes).
 					{ //                               ^^                                  ^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 						
 						// 0xff - 0xf1 = 0x0e + 0x01 = 0x0f + (0x4f - 0x47 = 0x08) = 0x17 (0x4f - 0x17 = 0x38)
 						*(uint64_t *)p = 0xf8839000000038b8; // Reversed b8 38 00 00 00 90 83 f8 (47) (8 bytes).
 						p = (unsigned char *)endAddress;
 					}
-
-					/* Broadwell_E (0x4F) -> Broadwell (0x47)
-					if (*(uint64_t *)p == 0x47f883e9c083c4b6) // Reversed (0f) b6 c4 83 c0 e9 83 f8 47 (8 bytes).
-					{ //                          ^^                                       ^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						*(uint64_t *)p = 0x47f883e1c083c4b6; // Reversed (0f) b6 c4 83 c0 e1 83 f8 47 (8 bytes).
-						p = (unsigned char *)endAddress;
-					}
-					else if (*(uint64_t *)p == 0x4ff883f1c083c4b6) // Reversed (0f) b6 c4 83 c0 f1 83 f8 4f (8 bytes).
-					{ //                               ^^                                       ^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
-
-						*(uint64_t *)p = 0x4ff883e9c083c4b6; // Reversed (0f) b6 c4 83 c0 e9 83 f8 4F (8 bytes).
-						p = (unsigned char *)endAddress;
-					} */
 				}
 			}
 #endif
@@ -164,15 +143,18 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				endAddress = (startAddress + 0x100);
 
-				unsigned char * p = (unsigned char *)startAddress;
+				p = (unsigned char *)startAddress;
 
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
 
 				for (; p <= (unsigned char *)endAddress; p++)
 				{
+					//
+					// TODO: Port the patch routine from Vector.
+					//
 					if (*(uint64_t *)p == 0x1c7722fb83c4c383) // Reversed of HexEdit: 83 C3 C4 83 FB 22 77 1C
 					{ //                              ˆˆ                                    ˆˆ
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 
 						*(uint64_t *)p = 0x1c7722fb83bcc383; // Reversed of HexEdit: 83 C3 BC 83 FB 22 77 1C
 						//                           ˆˆ                                    ˆˆ
@@ -186,7 +168,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				endAddress = (startAddress + 0x200);
 
-				unsigned char * p = (unsigned char *)startAddress;
+				p = (unsigned char *)startAddress;
 
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
 
@@ -194,10 +176,9 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				{
 					if (*(uint64_t *)p == 0x300f000000e2b920)// (48 C1 EA) 20 B9 E2 00 00 00 0F 30 reversed
 					{
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 
-						// *(uint64_t *)p = 0x9090000000e2b920; // Reversed (48 C1 EA) 20 B9 E2 00 00 00 90 90 (8 bytes).
-						*(uint32_t *)p = 0x90900000; // Reversed 00 00 90 90 (4 bytes).
+						*(uint32_t *)(p + 4) = 0x90900000; // Reversed 00 00 90 90 (4 bytes).
 					}
 				}
 			}
@@ -219,15 +200,19 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 
-				unsigned char * p = (unsigned char *)startAddress;
+				p = (unsigned char *)startAddress;
 
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
-				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, startAddress)
+				//
+				// TODO: Port the patch routine from Vector.
+				//
 				//
 				// Zero out MSR 0xE2 and MSR 0x01A0
 				//
 				for (repeat = 0; repeat < 8; repeat++)
 				{
+					DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
+
 					*(uint64_t *)p = 0x0000000000000000ULL;
 					p += 0x08;
 				}
@@ -237,14 +222,16 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 
-				unsigned char * p = (unsigned char *)startAddress;
+				p = (unsigned char *)startAddress;
 
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
-				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, startAddress)
+				//
+				// TODO: Port the patch routine from Vector.
+				//
+				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 				//
 				// Zero out CPU bits of MSR 0xE2
 				//
-				// *(uint64_t *) = 0x0000000000000000ULL;
 				*(uint32_t *)(p + 4) = 0x00000000UL;
 				//
 				// Skip to second MSR 0xE2
@@ -253,7 +240,6 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				//
 				// Zero out CPU bits of MSR 0xE2
 				//
-				// *(uint64_t *) = 0x0000000000000000ULL;
 				*(uint32_t *)(p + 4) = 0x00000000UL;
 			}
 			else if (strcmp(symbolName, "_xcpm_pkg_scope_msrs") == 0) // 7 MSRs (0x01A0, 0x01FC, 0x01AA, 0x0620, 0x064C, 0x063A, 0x0642)
@@ -266,18 +252,18 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 
-				unsigned char * p = (unsigned char *)startAddress;
+				p = (unsigned char *)startAddress;
 
-				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, 0)
+				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, startAddress)
 				//
-				// New way of patching.
+				// TODO: Port the patch routine from Vector.
 				//
-				for (unsigned char target_msr = 0; target_msr < 7; target_msr++)
+				for (short target_msr = 0; target_msr < 7; target_msr++)
 				{
 					//
 					// Secondary for-loop to find MSRs that we need to disable.
 					//
-					for (unsigned char msr_to_disable = 0; msr_to_disable < 6; msr_to_disable++)
+					for (short msr_to_disable = 0; msr_to_disable < 6; msr_to_disable++)
 					{
 						//
 						// Is this a MSR that we need to disable?
@@ -301,60 +287,6 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 					
 					p += 0x30;
 				}
-
-				/* Old way of patching.
-				//
-				// Zero out MSR 0x01A0
-				//
-				*(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x01FC
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x01FC
-				//
-				// *(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x01AA
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x01AA
-				//
-				*(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x0620
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x0620
-				//
-				*(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x064C
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x064C
-				//
-				// *(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x063A
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x063A
-				//
-				*(uint64_t *)p = 0x0000000000000000ULL;
-				//
-				// Skip to MSR 0x0642
-				//
-				p += 0x30;
-				//
-				// Zero out MSR 0x0642
-				//
-				*(uint64_t *)p = 0x0000000000000000ULL; */
 			}
 		}
 #endif // #if PATCH_XCPM_SCOPE_MSRS
@@ -373,7 +305,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				uint64_t endAddress = (startAddress + 0x3f);
 
-				unsigned char * p = (unsigned char *)startAddress;
+				p = (unsigned char *)startAddress;
 
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
 				
@@ -381,7 +313,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				{
 					if (*(uint64_t *)p == 0xe805eb00000025e8)
 					{
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), (symbolNumber + (skippedSymbolCount / listSize) + 1), 1)
+						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 
 						*(uint64_t *)p = 0xe8909000000025e8;
 						p = (unsigned char *)endAddress;

From 7ea65dd50bfd811765379f75d73b1bdc109237a1 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 16 Aug 2016 22:58:39 +0200
Subject: [PATCH 573/623] Comment only changes.

---
 i386/libsaio/saio_internal.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/saio_internal.h b/i386/libsaio/saio_internal.h
index 7f3590c..7d3789b 100755
--- a/i386/libsaio/saio_internal.h
+++ b/i386/libsaio/saio_internal.h
@@ -23,9 +23,9 @@
  *
  * Updates:
  *
- *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (PikerAlpha, October 2012).
- *			- Tidied up (spaces -> tabs) (PikerAlpha, October 2012).
- *			- Stripped (unnecessary) argument from loadSystemConfig (PikerAlpha, April 2013).
+ *  		- loadBinaryData(load.c) and toLowerCase(string.c) added (Pike R. Alpha, October 2012).
+ *			- Tidied up (spaces -> tabs) (Pike R. Alpha, October 2012).
+ *			- Stripped (unnecessary) argument from loadSystemConfig (Pike R. Alpha, April 2013).
  *			- Use Lower Camel Case for function names (Pike R. Alpha, July 2016)
  *
  */

From fd487eb0c9dc5847e3090bd2be24a845bb4ec12a Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 16 Aug 2016 23:01:30 +0200
Subject: [PATCH 574/623] Essential patches should always be available.

---
 i386/libsaio/cpu/Intel/dynamic_data.h | 4 +---
 i386/libsaio/cpu/essentials.h         | 2 +-
 i386/libsaio/platform.h               | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index b9df711..2f5c47e 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -388,6 +388,7 @@ void initCPUStruct(void)
 					break;
 
 				case CPU_MODEL_HASWELL:
+				case CPU_MODEL_HASWELL_E:
 				case CPU_MODEL_HASWELL_ULT:
 					CoreBridgeType = HASWELL;
 					hiBit = 31;
@@ -486,10 +487,7 @@ void initCPUStruct(void)
 					// Check bit-15 of MSR 0xE2 to see if it is locked.
 					msr = rdmsr64(MSR_PKG_CST_CONFIG_CONTROL);
 
-#if PATCH_XCPM_SCOPE_MSRS
 					gPlatform.CPU.CstConfigMsrLocked = (msr & 0x8000);
-#endif
-
 #if DEBUG_CPU
 					printf("MSR_PKG_CST_CONFIG_CONTROL(locked): 0x%x\n", msr);
 #endif
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index c038081..65204a2 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -183,7 +183,7 @@
 #define CPU_MODEL_IB_CORE_XEON		0x3E
 
 #define CPU_MODEL_HASWELL			0x3C
-#define CPU_MODEL_HASWELL_SVR		0x3F
+#define CPU_MODEL_HASWELL_E			0x3F
 #define CPU_MODEL_HASWELL_ULT		0x45
 #define CPU_MODEL_CRYSTALWELL		0x46
 
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 163bd2f..3ae3531 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -262,10 +262,8 @@ typedef struct _PlatformInfo_t
 	struct CPU
 	{
 		bool		Mobile;						// Set to true (in cpu/dynamic_data.h) for Mobile CPU's.
-
-#if PATCH_XCPM_SCOPE_MSRS
 		bool		CstConfigMsrLocked;			// Initialised in cpu/dynamic_data.h and used in load.c
-#endif
+
 		uint16_t	Type;						// CPU type ('cpu-type') used in the SMBIOS patcher.
 		uint32_t	Features;					// CPU Features like MMX, SSE2, VT, MobileCPU
 		uint32_t	Vendor;						// Vendor

From e30e008adfea0afea2d4bd16c16ae56c62870b5a Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 16 Aug 2016 23:01:51 +0200
Subject: [PATCH 575/623] Port from Vector.

---
 i386/libsaio/patcher.c | 353 ++++++++++++++++++++++++-----------------
 1 file changed, 209 insertions(+), 144 deletions(-)

diff --git a/i386/libsaio/patcher.c b/i386/libsaio/patcher.c
index 4fd3d1c..10078ca 100755
--- a/i386/libsaio/patcher.c
+++ b/i386/libsaio/patcher.c
@@ -4,6 +4,11 @@
  * Updates:
  *			- Moved function patchKernel from load.c to patcher.c (Pike R. Alpha, August 2016)
  *			- Cleanups/removed some of the old style patches (more to follow).
+ *			- Function disableMSRs added.
+ *			- Patch bit mask added to speedup the main while loop.
+ *			- Reducing the number of compiler derectives (make it much easier to handle).
+ *			- Latest source code from Vector implemented.
+ *			- Checks added to catch errors in config.h (think MacPro61.h etc).
  *
  */
 
@@ -14,10 +19,50 @@
 #include "platform.h"
 
 #if (PATCH_KERNEL && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+//==============================================================================
+// Called from patchKernel()
 
-#define PATCH_KEXT_LOADING	1
-
+void disableMSRs(unsigned char * aPointer, uint8_t aNumberOfTargetMSRs)
+{
+	//
+	// Array with target MSRs that we need to disable.
+	//
+	const uint16_t targetMSRs[] = { 0xE2, 0x01A0, /* 0x01FC, */ 0x01AA, 0x0620, /* 0x064C, */ 0x063A, 0x0642 };
+	//
+	// Main for-loop.
+	//
+	for (char x = 0; x < aNumberOfTargetMSRs; x++)
+	{
+		//
+		// Secondary for-loop to find MSRs that we need to disable.
+		//
+		for (uint8_t y = 0; y < (sizeof(targetMSRs) / sizeof(short)); y++)
+		{
+			//
+			// Target MSR?
+			//
+			if (*(uint16_t *)aPointer == targetMSRs[y])
+			{
+				//
+				// Yes.
+				//
+				DEBUG_DISABLED_MSR(targetMSRs[y], 1)
+				//
+				// Zero out the 32-bit CPU-bits field.
+				//
+				*(uint32_t *)(aPointer + 4) = 0x00000000UL;
+				//
+				// Done (MSR is disabled).
+				//
+				break;
+			}
+		}
+		
+		aPointer += 0x30;
+	}
+}
 
+			 
 //==============================================================================
 // Called from decodeMachO()
 
@@ -37,291 +82,311 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 
 	long symbolNumber		= 0;
 
+	uint32_t targetSections	= 9;
+	uint32_t targetPatches	= 1;
+
 	struct symtab_command * symtab = (struct symtab_command *)cmdBase;
 	struct segment_command_64 * textSegment = (struct segment_command_64 *)textSegmentAddress;
 #if PRELINKED_KERNEL_SUPPORT
 	struct segment_command_64 * vldSegment = (struct segment_command_64 *)vldSegmentAddress;
+	
+	targetSections |= 25;
 #endif
 
 	void * stringTable = (void *)(loadAddress + symtab->stroff);
 
-	const uint16_t targetMSRs[] = { 0xE2, 0x01A0, /* 0x01FC, */ 0x01AA, 0x0620, /* 0x064C, */ 0x063A, 0x0642 };
-
 	uint32_t pointer = (loadAddress + symtab->symoff + skippedSymbolCount);
-
+	
 	int64_t offset			= 0;
 
 	uint64_t startAddress	= 0;
 	uint64_t endAddress		= 0;
+
+	uint8_t cpuid_set_info_ModelCorrection = 0;
+	uint8_t xcpm_bootstrap_ModelCorrection = 0;
+
+#if (PATCH_CPUID_SET_INFO == 0)
+	switch (gPlatform.CPU.Model)
+	{
+		case CPU_MODEL_BROADWELL_E:
+			targetPatches					+= 2;
+			cpuid_set_info_ModelCorrection	= -8;
+			break;
+	}
+#else
+	targetPatches							+= 2;
+	cpuid_set_info_ModelCorrection			= PATCH_CPUID_SET_INFO;
+#endif
+	
+#if (PATCH_XCPM_BOOTSTRAP == 0)
+	switch (gPlatform.CPU.Model)
+	{
+		case CPU_MODEL_IB_CORE:
+			targetPatches					+= 4;
+			xcpm_bootstrap_ModelCorrection	= -1;
+			break;
+
+		case CPU_MODEL_IB_CORE_EX:
+			targetPatches					+= 4;
+			xcpm_bootstrap_ModelCorrection	= -2;
+			break;
+			
+		case CPU_MODEL_HASWELL_E:
+			targetPatches					+= 4;
+			xcpm_bootstrap_ModelCorrection	= -3;
+			break;
+			
+		case CPU_MODEL_BROADWELL_E:
+			targetPatches					+= 4;
+			xcpm_bootstrap_ModelCorrection	= -8;
+			break;
+	}
+#else
+	targetPatches							+= 4;
+	xcpm_bootstrap_ModelCorrection			= PATCH_XCPM_BOOTSTRAP;
+#endif
+	//
+	// Is MSR(0xE2) locked (bit-15 set)?
+	//
+	if (gPlatform.CPU.CstConfigMsrLocked)
+	{
+		//
+		// Yes. Enable patches: _xcpm_idle(8), _xcpm_SMT_scope_msrs(16), _xcpm_core_scope_msrs(32), _xcpm_pkg_scope_msrs(64)
+		//
+		targetPatches += 120;
+	}
 	//
 	// Main while loop.
 	//
-	while (symbolNumber < symtab->nsyms)
+	while ((symbolNumber < symtab->nsyms) && targetSections)
 	{
 		struct nlist_64 * nl = (struct nlist_64 *)pointer;
 
-#if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
         offset			= 0;
         startAddress	= 0;
         endAddress		= 0;
 
-		if ((nl->n_sect == 1 /* __TEXT,__text */) && nl->n_value)
+		if (nl->n_sect == 1 && nl->n_value && (targetSections & nl->n_sect)) // __TEXT,__text
 		{
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
-#if PATCH_KEXT_LOADING
-			if (strcmp(symbolName, "__ZN6OSKext14loadExecutableEv") == 0)
+
+			if ((targetPatches & 1) && strcmp(symbolName, "__ZN6OSKext14loadExecutableEv") == 0)
 			{
 				offset = (nl->n_value - textSegment->vmaddr);
 				startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				endAddress = (startAddress + 0x300);
 
-				p = (unsigned char *)startAddress;
-
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
 
-				for (; p <= (unsigned char *)endAddress; p++)
+				for (p = (unsigned char *)startAddress; p <= (unsigned char *)endAddress; p++)
 				{
 					//
-					// Search pattern: 0x48xx74db854c3789
+					// Search pattern: 89 C3 48 85 DB 74 71 48 (in HexEdit)
 					//
-					if ((*(uint32_t *)p == 0x8548c389) && (*(uint16_t *)(p+4) == 0x74db) && (*(uint8_t *)(p+7) == 0x48))
+					if ((*(uint32_t *)p == 0x8548c389) && (*(uint16_t *)(p + 4) == 0x74db) && (*(uint8_t *)(p + 7) == 0x48))
 					{
 						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 						
 						*(uint64_t *)p = 0x4812ebdb8548c389;
+						//                   ^^^^
+						//
+						// Done. Disable this patch.
+						//
 						p = (unsigned char *)endAddress;
+						targetPatches =~ 1;
 					}
 				}
 			}
-#endif // #if PATCH_KEXT_LOADING
-
-#if PATCH_CPUID_SET_INFO
-	#if PATCH_KEXT_LOADING
-			else
-	#endif
-			if (strcmp(symbolName, "_cpuid_set_info") == 0)
+			else if ((targetPatches & 2) && strcmp(symbolName, "_cpuid_set_info") == 0)
 			{
 				offset = (nl->n_value - textSegment->vmaddr);
 				startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				endAddress = (startAddress + 0x2100);
 
-				p = (unsigned char *)startAddress;
-
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
 
-				for (; p <= (unsigned char *)endAddress; p++)
+				for (p = (unsigned char *)startAddress; p <= (unsigned char *)endAddress; p++)
 				{
-					// Broadwell E (0x4F)	-> Broadwell (0x47)		=> 0x4F-0x47 = 0x08	-> change 0xE9 into 0xE1
-					// Haswell E (0x3F)		-> Haswell (0x3C)		=> 0x3F-0x3C = 0x03	-> change 0xE9 into 0xE6
-					// Ivy Bridge E (0x3E)	-> Ivy Bridge (0x3A)	=> 0x3E-0x3A = 0x04	-> change 0xE9 into 0xE5
-
 					//
-					// TODO: Port the patch routine from Vector.
+					// Search pattern: 0F B6 C4 83 C0 E9 83 F8 (in HexEdit).
 					//
-					if (*(uint64_t *)p == 0xf883e9c083c4b60f) // Reversed 0f b6 c4 83 c0 e9 83 f8 (47) (8 bytes).
-					{ //                        ^^                                       ^^
+					if ((*(uint32_t *)p == 0x83c4b60f) && (*(uint8_t *)(p + 4) == 0xc0) && (*(uint16_t *)(p + 6) == 0xf883))
+					{
 						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 
-						// 0xff - 0xe9 = 0x16 + 0x01 = 0x17 + (0x4f - 0x47 = 0x08) = 0x1f (0x4f - 0x1f = 0x38)
-						*(uint64_t *)p = 0xf8839000000030b8; // Reversed b8 30 00 00 00 90 83 f8 (47) (8 bytes).
-						p = (unsigned char *)endAddress;
-					}
-					else if (*(uint64_t *)p == 0xf883f1c083c4b60f) // Reversed 0f b6 c4 83 c0 f1 83 f8 (47) (8 bytes).
-					{ //                               ^^                                  ^^
-						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
-						
-						// 0xff - 0xf1 = 0x0e + 0x01 = 0x0f + (0x4f - 0x47 = 0x08) = 0x17 (0x4f - 0x17 = 0x38)
-						*(uint64_t *)p = 0xf8839000000038b8; // Reversed b8 38 00 00 00 90 83 f8 (47) (8 bytes).
+						// *(uint8_t *)(p + 5) = (*(uint8_t *)(p + 5) + PATCH_CPUID_SET_INFO);
+						*(uint8_t *)(p + 5) = (*(uint8_t *)(p + 5) + cpuid_set_info_ModelCorrection);
+						//
+						// Done. Disable this patch.
+						//
 						p = (unsigned char *)endAddress;
+						targetPatches =~ 2;
 					}
 				}
 			}
-#endif
-			else if (strcmp(symbolName, "_xcpm_bootstrap") == 0)
+			else if ((targetPatches & 4) && strcmp(symbolName, "_xcpm_bootstrap") == 0)
 			{
 				offset = (nl->n_value - textSegment->vmaddr);
 				startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				endAddress = (startAddress + 0x100);
 
-				p = (unsigned char *)startAddress;
-
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
 
-				for (; p <= (unsigned char *)endAddress; p++)
+				for (p = (unsigned char *)startAddress; p <= (unsigned char *)endAddress; p++)
 				{
 					//
-					// TODO: Port the patch routine from Vector.
+					// Search pattern: 83 C3 xx 83 FB 22 77 1C (in HexEdit).
 					//
-					if (*(uint64_t *)p == 0x1c7722fb83c4c383) // Reversed of HexEdit: 83 C3 C4 83 FB 22 77 1C
-					{ //                              ˆˆ                                    ˆˆ
+					if ((*(uint16_t *)p == 0xc383) && (*(uint32_t *)(p + 3) == 0x7722fb83) && (*(uint8_t *)(p + 7) == 0x1C))
+					{
 						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 
-						*(uint64_t *)p = 0x1c7722fb83bcc383; // Reversed of HexEdit: 83 C3 BC 83 FB 22 77 1C
-						//                           ˆˆ                                    ˆˆ
+						// *(uint8_t *)(p + 2) = (*(uint8_t *)(p + 2) + PATCH_XCPM_BOOTSTRAP);
+						*(uint8_t *)(p + 2) = (*(uint8_t *)(p + 2) + xcpm_bootstrap_ModelCorrection);
+						//
+						// Done. Disable this patch.
+						//
+						p = (unsigned char *)endAddress;
+						targetPatches =~ 4;
 					}
 				}
 			}
-
-			else if (strcmp(symbolName, "_xcpm_idle") == 0) // 2 MSRs (0xE2, 0xE2)
+			else if ((targetPatches & 8) && strcmp(symbolName, "_xcpm_idle") == 0) // 2 MSRs (0xE2, 0xE2)
 			{
 				offset = (nl->n_value - textSegment->vmaddr);
 				startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				endAddress = (startAddress + 0x200);
 
-				p = (unsigned char *)startAddress;
-
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
 
-				for (; p <= (unsigned char *)endAddress; p++)
+				for (p = (unsigned char *)startAddress; p <= (unsigned char *)endAddress; p++)
 				{
 					if (*(uint64_t *)p == 0x300f000000e2b920)// (48 C1 EA) 20 B9 E2 00 00 00 0F 30 reversed
 					{
 						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 
 						*(uint32_t *)(p + 4) = 0x90900000; // Reversed 00 00 90 90 (4 bytes).
+						//
+						// Done. Disable this patch.
+						//
+						p = (unsigned char *)endAddress;
+						targetPatches =~ 8;
 					}
 				}
 			}
+			//
+			// Are we done patching for this section?
+			//
+			if (targetPatches == 0)
+			{
+				//
+				// Yes. Disable this section.
+				//
+				targetSections =~ nl->n_sect;
+			}
 		}
-#endif // #if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
-
-#if PATCH_XCPM_SCOPE_MSRS
-	#if PATCH_KEXT_LOADING || PATCH_CPUID_SET_INFO
-		else
-	#endif
-		if (((nl->n_sect == 8 /* __DATA,__data */) && nl->n_value) && gPlatform.CPU.CstConfigMsrLocked)
+		else if (nl->n_sect == 8 && nl->n_value && (targetSections & nl->n_sect)) // __DATA,__data
 		{
-			UInt8 repeat = 0;
-
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
 
-			if (strcmp(symbolName, "_xcpm_SMT_scope_msrs") == 0) // 11 MSRs (0xE2, 0x01A0, 0x01B0, 0x01B0, 0x01B0, 0x0609, 0x038D, 0x038F, 0x0187, 0x0188, 0x0189)
+			if ((targetPatches & 16) && strcmp(symbolName, "_xcpm_SMT_scope_msrs") == 0)
 			{
+				//
+				// 11 MSRs (0xE2, 0x01A0, 0x01B0, 0x01B0, 0x01B0, 0x0609, 0x038D, 0x038F, 0x0187, 0x0188, 0x0189)
+				//
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 
-				p = (unsigned char *)startAddress;
-
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, startAddress)
 				//
-				// TODO: Port the patch routine from Vector.
+				// Disable MSR's from config.h
 				//
+				disableMSRs((unsigned char *)startAddress, 11);
 				//
-				// Zero out MSR 0xE2 and MSR 0x01A0
+				// Done. Disable this patch.
 				//
-				for (repeat = 0; repeat < 8; repeat++)
-				{
-					DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
-
-					*(uint64_t *)p = 0x0000000000000000ULL;
-					p += 0x08;
-				}
+				targetPatches =~ 16;
 			}
-			else if (strcmp(symbolName, "_xcpm_core_scope_msrs") == 0) // 2 MSRs (0xE2, 0xE2)
+			else if ((targetPatches & 32) && strcmp(symbolName, "_xcpm_core_scope_msrs") == 0)
 			{
+				//
+				// 2 MSRs (0xE2, 0xE2)
+				//
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 
-				p = (unsigned char *)startAddress;
-
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, startAddress)
 				//
-				// TODO: Port the patch routine from Vector.
+				// Disable MSR's from config.h
 				//
-				DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
+				disableMSRs((unsigned char *)startAddress, 2);
 				//
-				// Zero out CPU bits of MSR 0xE2
+				// Done. Disable this patch.
 				//
-				*(uint32_t *)(p + 4) = 0x00000000UL;
-				//
-				// Skip to second MSR 0xE2
-				//
-				p += 0x30;
-				//
-				// Zero out CPU bits of MSR 0xE2
-				//
-				*(uint32_t *)(p + 4) = 0x00000000UL;
+				targetPatches =~ 32;
 			}
-			else if (strcmp(symbolName, "_xcpm_pkg_scope_msrs") == 0) // 7 MSRs (0x01A0, 0x01FC, 0x01AA, 0x0620, 0x064C, 0x063A, 0x0642)
+			else if ((targetPatches & 64) && strcmp(symbolName, "_xcpm_pkg_scope_msrs") == 0)
 			{
 				//
-				// 0x064C MSR_TURBO_ACTIVATION_RATIO (Ivy Bridge Haswell E)
-				// 0x063A MSR_PP0_POLICY
-				// 0x0642 MSR_PP1_POLICY (not supported for server platform)
+				// 7 MSRs (0x01A0, 0x01FC, 0x01AA, 0x0620, 0x064C, 0x063A, 0x0642)
 				//
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 
-				p = (unsigned char *)startAddress;
-
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, startAddress)
 				//
-				// TODO: Port the patch routine from Vector.
+				// Disable MSR's from config.h
 				//
-				for (short target_msr = 0; target_msr < 7; target_msr++)
-				{
-					//
-					// Secondary for-loop to find MSRs that we need to disable.
-					//
-					for (short msr_to_disable = 0; msr_to_disable < 6; msr_to_disable++)
-					{
-						//
-						// Is this a MSR that we need to disable?
-						//
-						if (*(uint16_t *)p == targetMSRs[msr_to_disable])
-						{
-							//
-							// Yes.
-							//
-							DEBUG_DISABLED_MSR(targetMSRs[msr_to_disable], 1)
-							//
-							// Zero out the 32-bit CPU-bits field.
-							//
-							*(uint32_t *)(p + 4) = 0x00000000UL;
-							//
-							// The MSR is now disabled. Break out of secondary for loop.
-							//
-							break;
-						}
-					}
-					
-					p += 0x30;
-				}
+				disableMSRs((unsigned char *)startAddress, 7);
+				//
+				// Done. Disable this patch.
+				//
+				targetPatches =~ 64;
+
+			}
+			//
+			// Are we done patching for this section?
+			//
+			if ((targetPatches & 112) == 0)
+			{
+				//
+				// Yes. Disable this section.
+				//
+				targetSections =~ nl->n_sect;
 			}
 		}
-#endif // #if PATCH_XCPM_SCOPE_MSRS
-
-#if (PATCH_LOAD_EXTRA_KEXTS && PRELINKED_KERNEL_SUPPORT)
-	#if (PATCH_KEXT_LOADING || PATCH_XCPM_SCOPE_MSRS)
-		else
-	#endif
-		if ((nl->n_sect == 25 /* __KLD,__text */) && nl->n_value)
+#if PRELINKED_KERNEL_SUPPORT
+		else if (nl->n_sect == 25 && nl->n_value && (targetSections & nl->n_sect)) // __KLD,__text
 		{
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
 			
-			if (strcmp(symbolName, "__ZN12KLDBootstrap21readStartupExtensionsEv") == 0)
+			if ((targetPatches & 128) && strcmp(symbolName, "__ZN12KLDBootstrap21readStartupExtensionsEv") == 0)
 			{
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				uint64_t endAddress = (startAddress + 0x3f);
 
-				p = (unsigned char *)startAddress;
-
 				DEBUG_SYMBOL_FOUND(symbolName, offset, textSegment->vmaddr, textSegment->fileoff, startAddress, endAddress)
 				
-				for (; p <= (unsigned char *)endAddress; p++)
+				for (p = (unsigned char *)startAddress; p <= (unsigned char *)endAddress; p++)
 				{
-					if (*(uint64_t *)p == 0xe805eb00000025e8)
-					{
+					if (*(uint64_t *)p == 0xe805eb00000025e8) // E8 25 00 00 00 EB 05 E8 (in HexEdit)
+					{ //                      ^^^^
 						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 
-						*(uint64_t *)p = 0xe8909000000025e8;
+						*(uint64_t *)p = 0xe8909000000025e8; // E8 25 00 00 00 90 90 E8 (in HexEdit)
+						//                   ^^^^
+						//
+						// Disable this section.
+						//
 						p = (unsigned char *)endAddress;
+						targetPatches =~ 128;
+						targetSections =~ nl->n_sect;
 					}
 				}
 			}
 		}
-#endif // #if (PATCH_LOAD_EXTRA_KEXTS && PRELINKED_KERNEL_SUPPORT)
+#endif // #if PRELINKED_KERNEL_SUPPORT
 
 		symbolNumber++;
 		pointer += listSize; // Point to next symbol.

From 64a01c24d07dbc6d1b620adbe71b76808c643a0a Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Tue, 16 Aug 2016 23:17:41 +0200
Subject: [PATCH 576/623] Updated settings template.

---
 i386/config/settings-template.h | 34 +++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 506a204..dfd0ae6 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -41,6 +41,8 @@
  *			- DYNAMIC_RAM_OVERRIDE_SIZES renamed to  STATIC_RAM_OVERRIDE_SIZES
  *			- DYNAMIC_RAM_OVERRIDE_FREQUENCY renamed to STATIC_RAM_OVERRIDE_FREQUENCY
  *			- PATCH_XCPI_SCOPE_MSRS renamed to PATCH_XCPM_SCOPE_MSRS
+ *			- PATCH_XCPI_SCOPE_MSRS removed (Pike R. Alpha, August 2016).
+ *			- PATCH_KERNEL, DEBUG_KERNEL_PATCHER, PATCH_XCPM_BOOTSTRAP and PATCH_CPUID_SET_INFO added.
  */
 
 
@@ -423,7 +425,7 @@
 
 #define TARGET_MODEL					MACMINI	// Set to MACMINI by default. Supported models are:
 												//
-												// IMAC and IMAC_131, IMAC_122, IMAC_111, IMAC_121
+												// IMAC and IMAC_171, IMAC_16n, IMAC_15n, IMAC_14n, IMAC_131, IMAC_12n, IMAC_111
 												// MACBOOK and MACBOOK_41
 												// MACBOOKAIR and MACBOOKAIR_42, MACBOOKAIR_41
 												// MACBOOKPRO and MACBOOKPRO_101, MACBOOKPRO_91, MACBOOKPRO_83, MACBOOKPRO_82,
@@ -449,21 +451,29 @@
 
 
 
-//---------------------------------------------------------------- LOAD.C ------------------------------------------------------------------
+//-------------------------------------------------------------- PATCHER.C -----------------------------------------------------------------
 
-#define PATCH_KEXT_LOADING						1	// Set to 1 by default.
-
-#define LOAD_EXECUTABLE_TARGET_UINT64			0x487074db8548c389ULL // 89c34885db747048 revered in HexEdit
-#define LOAD_EXECUTABLE_PATCH_UINT64			0x4812ebdb8548c389ULL
-
-#define PATCH_XCPM_SCOPE_MSRS					0	// Set to 0 by default.
+#define PATCH_KERNEL						1	// Set to 1 by default.
+												//
+												// Note: A value of 0 will trigger a panic without a prelinkedkernel, and your computer may
+												//		  not boot without patches.
 
-#define XCPM_SCOPE_MSRS_TARGET_UINT64			0x00000002000000E2ULL
+												//
+												// Override value examples:
+												//
+												// Use -8 for Broadwell E to Broadwell H
+												// Use -3 for Haswell E to Haswell
+												// Use 3 for Ivy Bridge to Haswell (untested and unconfirmed).
+												// Use 2 for Ivy Bridge E to Haswell (untested and unconfirmed).
+												//
+#define PATCH_XCPM_BOOTSTRAP				0	// Set to 0 by default. Change this to the value that you want for your processor.
 
-#define PATCH_LOAD_EXTRA_KEXTS					0	// Set to 0 by default.
+#define PATCH_CPUID_SET_INFO				0	// Set to 0 by default. Change this to the value that you want for your processor.
+												//
+												// Note: Not required for Haswell E and Ivy Bridge E processors.
+												//
 
-#define READ_STARTUP_EXTENSIONS_TARGET_UINT64	0xe805eb00000025e8ULL // e825000000eb05e8 revered in HexEdit
-#define READ_STARTUP_EXTENSIONS_PATCH_UINT64	0xe8909000000025e8ULL
+#define DEBUG_KERNEL_PATCHER				0	// Set to 0 by default. Use 1 to trace patches (symbol name, address and number).
 
 
 //-------------------------------------------------------------- PLATFORM.C ----------------------------------------------------------------

From e2db0e0b50628432689481dd655576df9d194724 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Thu, 18 Aug 2016 08:59:16 +0200
Subject: [PATCH 577/623] Fine-grained debug output.

---
 i386/boot2/debug.h              | 14 +++++++++-----
 i386/config/settings-template.h |  7 +++++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/i386/boot2/debug.h b/i386/boot2/debug.h
index a039698..fe868df 100755
--- a/i386/boot2/debug.h
+++ b/i386/boot2/debug.h
@@ -109,7 +109,7 @@
 #endif
 
 
-#if DEBUG_KERNEL_PATCHER
+#if (DEBUG_KERNEL_PATCHER & 1)
 	#define DEBUG_SYMBOL_FOUND(symbol, offset, vmaddr, fileoff, start, end)	\
 						printf("Symbol %s found!\n", symbol);				\
 						printf("offset..............: 0x%llx\n", offset);	\
@@ -118,7 +118,11 @@
 						printf("startAddress........: 0x%llx\n", start);	\
 						printf("endAddress..........: 0x%llx\n", end);		\
 						sleep(1);
+#else
+	#define DEBUG_SYMBOL_FOUND(symbol, offset, vmaddr, fileoff, start, end)
+#endif
 
+#if (DEBUG_KERNEL_PATCHER & 2)
 	#define DEBUG_PATCH_STATUS(symbol, address, seconds)					\
 						printf("Patched %s(@ 0x%x)\n", symbol, address);	\
 																			\
@@ -126,7 +130,11 @@
 						{													\
 							sleep(seconds);									\
 						}
+#else
+	#define DEBUG_SYMBOL_PATCH(symbol, address, number, seconds)
+#endif
 
+#if (DEBUG_KERNEL_PATCHER & 4)
 	#define DEBUG_DISABLED_MSR(msr, seconds)					\
 						printf("Disabling MSR: 0x%x\n", msr);	\
 																\
@@ -134,12 +142,8 @@
 						{										\
 							sleep(seconds);						\
 						}
-
 #else
-	#define DEBUG_SYMBOL_FOUND(symbol, offset, vmaddr, fileoff, start, end)
-	#define DEBUG_SYMBOL_PATCH(symbol, address, number, seconds)
 	#define DEBUG_DISABLE_MSR(msr, seconds)
 #endif
 
 #endif // __REVO_DEBUG_H
-
diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index dfd0ae6..1d9cd1f 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -473,8 +473,11 @@
 												// Note: Not required for Haswell E and Ivy Bridge E processors.
 												//
 
-#define DEBUG_KERNEL_PATCHER				0	// Set to 0 by default. Use 1 to trace patches (symbol name, address and number).
-
+#define DEBUG_KERNEL_PATCHER				0	// Set to 0 by default, and the following bits can be set:
+												//
+												// A value of 1 (bit-0) shows the symbol name, offset and address range.
+												// A value of 2 (bit-1) shows the patch status.
+												// A value of 4 (bit-2) shows the disabled MSR's.
 
 //-------------------------------------------------------------- PLATFORM.C ----------------------------------------------------------------
 

From ddd1a1f8f975b47ef65657652aa05fcabb572474 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Thu, 18 Aug 2016 11:41:46 +0200
Subject: [PATCH 578/623] Fix for non-debug builds.

---
 i386/boot2/debug.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/boot2/debug.h b/i386/boot2/debug.h
index fe868df..0c439ed 100755
--- a/i386/boot2/debug.h
+++ b/i386/boot2/debug.h
@@ -131,7 +131,7 @@
 							sleep(seconds);									\
 						}
 #else
-	#define DEBUG_SYMBOL_PATCH(symbol, address, number, seconds)
+	#define DEBUG_PATCH_STATUS(symbol, address, seconds)
 #endif
 
 #if (DEBUG_KERNEL_PATCHER & 4)
@@ -143,7 +143,7 @@
 							sleep(seconds);						\
 						}
 #else
-	#define DEBUG_DISABLE_MSR(msr, seconds)
+	#define DEBUG_DISABLED_MSR(msr, seconds)
 #endif
 
 #endif // __REVO_DEBUG_H

From b47b6dd09b734a9fdc0aa602edfde2e9deb76393 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Thu, 18 Aug 2016 11:43:30 +0200
Subject: [PATCH 579/623] Commenting out old compiler directive.

---
 i386/boot2/drivers.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index 6d1c2be..dcac46a 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -201,7 +201,8 @@ long loadDrivers(char * dirSpec)
 	{
 		_DRIVERS_DEBUG_DUMP("gKextLoadStatus != 3\n");
 
-#if (PATCH_LOAD_EXTRA_KEXTS && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)) // El Capitan and Sierra.
+// #if (PATCH_LOAD_EXTRA_KEXTS && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)) // El Capitan and Sierra.
+#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN) // El Capitan and Sierra.
 		// Yes we do. Start by looking for kexts in: /Extra/Extensions/
 		if ((gKextLoadStatus & 2) == 0)
 		{

From 913b1551a0f7df5c6471a2554c169733c33c955c Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 20 Aug 2016 16:49:08 +0200
Subject: [PATCH 580/623] Brushing off some of the collected dust...

---
 i386/boot2/bootlogo.c                 | 18 ++++++-------
 i386/libsaio/bootstruct.c             |  2 +-
 i386/libsaio/cpu/Intel/dynamic_data.h |  7 ++---
 i386/libsaio/disk.c                   | 11 ++++++--
 i386/libsaio/efi.c                    | 17 +++++++-----
 i386/libsaio/hfs.c                    | 37 +++++++++++++--------------
 i386/libsaio/load.c                   |  4 +--
 i386/libsaio/sys.c                    | 13 +++-------
 8 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/i386/boot2/bootlogo.c b/i386/boot2/bootlogo.c
index 2fd5609..649de2d 100755
--- a/i386/boot2/bootlogo.c
+++ b/i386/boot2/bootlogo.c
@@ -89,20 +89,20 @@ void setBackgroundColor(uint32_t aBackGroundColor)
 
 void drawDataRectangle(unsigned short x, unsigned short y, unsigned short width, unsigned short height, unsigned char *data)
 {
-	unsigned short drawWidth;
-	
 	long pixelBytes = VIDEO(depth) / 8;
 	
-	unsigned char * vram = (unsigned char *) VIDEO(baseAddr) + VIDEO(rowBytes) * y + pixelBytes * x;
+	char * vram = (char *) VIDEO(baseAddr) + VIDEO(rowBytes) * y + pixelBytes * x;
 	
-	drawWidth = MIN(width, VIDEO(width) - x);
 	height = MIN(height, VIDEO(height) - y);
-	
-	while (height--)
+
+	if (data)
 	{
-		bcopy( data, vram, width * pixelBytes );
-		vram += VIDEO(rowBytes);
-		data += width * pixelBytes;
+		while (height--)
+		{
+			bcopy(data, vram, (width * pixelBytes));
+			vram += VIDEO(rowBytes);
+			data += (width * pixelBytes);
+		}
 	}
 }
 
diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index 541786f..902635c 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -38,7 +38,7 @@ PrivateBootInfo_t *bootInfo;
 
 void initKernelBootConfig(void)
 {
-	bootArgs = (kernel_boot_args *)malloc(sizeof(boot_args));
+	bootArgs = (kernel_boot_args *)malloc(sizeof(kernel_boot_args));
 	bootInfo = (PrivateBootInfo_t *)malloc(sizeof(PrivateBootInfo_t));
 
 	if (bootArgs == 0 || bootInfo == 0)
diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 2f5c47e..3485e43 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -192,14 +192,12 @@ void initCPUStruct(void)
 	// bool IvyBridge	= false;
 	uint8_t		CoreBridgeType = 0;
 
-	uint8_t		maxcoef, maxdiv, currcoef, currdiv;
+	uint8_t		maxdiv, currcoef, currdiv;
 
 	uint32_t	qpiSpeed = 0;
 
 	uint64_t	tscFrequency, fsbFrequency, cpuFrequency, msr;
 
-	maxcoef = maxdiv = currcoef = currdiv = 0;
-
 	// Get and cache CPUID data.
 	do_cpuid( 0x00000000, gPlatform.CPU.ID[LEAF_0]);			// Vendor-ID and Largest Standard Function (Function 0h).
 	do_cpuid( 0x00000001, gPlatform.CPU.ID[LEAF_1]);			// Feature Information (Function 01h).
@@ -423,6 +421,7 @@ void initCPUStruct(void)
 				case CPU_MODEL_KABYLAKE_DT:
 					CoreBridgeType = KABYLAKE;
 					hiBit = 31;
+					break;
 
 				case CPU_MODEL_NEHALEM:
 				case CPU_MODEL_NEHALEM_EX:
@@ -499,6 +498,8 @@ void initCPUStruct(void)
 			}
 			else // For all other (mostly older) Intel CPU models.
 			{
+				uint8_t maxcoef = maxdiv = currcoef = currdiv = 0;
+
 				//--------------------------------------------------------------------------
 				// Get core and thread count - the old way.
 
diff --git a/i386/libsaio/disk.c b/i386/libsaio/disk.c
index 6f19f72..85b902f 100644
--- a/i386/libsaio/disk.c
+++ b/i386/libsaio/disk.c
@@ -741,9 +741,16 @@ BVRef diskScanGPTBootVolumes(int biosdev, int * countPtr)
 			}
 		}
 	}
-	_DISK_DEBUG_ELSE_DUMP("Failed to read boot sector from BIOS device %02xh\n", biosdev);
+	else
+	{
+		_DISK_DEBUG_DUMP("Failed to read boot sector from BIOS device %02xh\n", biosdev);
+
+		if (buffer)
+		{
+			free(buffer);
+		}
+	}
 
-	free(buffer);
 	*countPtr = 0;
 
 	_DISK_DEBUG_SLEEP(5);
diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index a90389e..970def0 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -196,14 +196,17 @@ void initEFITree(void)
 	DT__AddProperty(chosenNode, "machine-signature", sizeof(MACHINE_SIGNATURE), (EFI_UINT8*) &MACHINE_SIGNATURE);
 
 #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // El Capitan and Yosemite
-	UInt8 index = 0;
-	EFI_UINT16 PMTimerValue = 0;
-	uint64_t randomValue, tempValue, cpuTick;
+	UInt8 index				= 0;
+
+	uint64_t randomValue	= 0;
+	uint64_t cpuTick		= 0;
+
+	EFI_UINT16 PMTimerValue	= 0;
+
 	EFI_UINT32 ecx, esi, edi = 0;
-	EFI_UINT32 rcx, rdx, rsi, rdi;
+	EFI_UINT32 rcx, rdx, rdi, rsi = 0;
 
-	randomValue = tempValue = ecx = esi = edi = 0;					// xor		%ecx,	%ecx
-	rcx = rdx = rsi = rdi = cpuTick = 0;
+	ecx = 0;														// xor		%ecx,	%ecx
 
 																	// LEAF_1 - Feature Information (Function 01h).
 	if (gPlatform.CPU.ID[LEAF_1][2] & 0x40000000)					// Checking ecx:bit-30
@@ -249,7 +252,7 @@ void initEFITree(void)
 			rdi = (rdi ^ rcx);										// xor		%rcx,	%rdi
 			rdi = (rdi ^ rdx);										// xor		%rdx,	%rdi
 
-			seedBufferAlternative[index] = (rdi & 0xff);						// mov		%dil,	(%r15,%r12,1)
+			seedBufferAlternative[index] = (rdi & 0xff);			// mov		%dil,	(%r15,%r12,1)
 
 			edi = (edi & 0x2f);										// and		$0x2f,	%edi
 			edi = (edi + esi);										// add		%esi,	%edi
diff --git a/i386/libsaio/hfs.c b/i386/libsaio/hfs.c
index 676d176..3da5ff2 100755
--- a/i386/libsaio/hfs.c
+++ b/i386/libsaio/hfs.c
@@ -761,7 +761,7 @@ static long GetCatalogEntry(long * dirIndex, char ** name, long * flags, long *
 	void *extent;
 	char *nodeBuf, *testKey, *entry;
 	
-	BTNodeDescriptor  *node;
+	BTNodeDescriptor  *node = NULL;
 	
 	if (gIsHFSPlus)
 	{
@@ -774,9 +774,13 @@ static long GetCatalogEntry(long * dirIndex, char ** name, long * flags, long *
 		extentSize	= SWAP_BE32(gHFSMDB->drCTFlSize);
 	}
 	
-	nodeSize	= SWAP_BE16(gBTHeaders[kBTreeCatalog]->nodeSize);
-	nodeBuf		= (char *)malloc(nodeSize);
-	node		= (BTNodeDescriptor *)nodeBuf;
+	nodeSize		= SWAP_BE16(gBTHeaders[kBTreeCatalog]->nodeSize);
+	nodeBuf			= (char *)malloc(nodeSize);
+	
+	if (nodeBuf)
+	{
+		node = (BTNodeDescriptor *)nodeBuf;
+	}
 	
 	index   = *dirIndex % nodeSize;
 	curNode = *dirIndex / nodeSize;
@@ -793,8 +797,7 @@ static long GetCatalogEntry(long * dirIndex, char ** name, long * flags, long *
 	}
 	else
 	{
-		strncpy(gTempStr, (const char *)&((HFSCatalogKey *)testKey)->nodeName[1],
-				((HFSCatalogKey *)testKey)->nodeName[0]);
+		strncpy(gTempStr, (const char *)&((HFSCatalogKey *)testKey)->nodeName[1], ((HFSCatalogKey *)testKey)->nodeName[0]);
 		
 		gTempStr[((HFSCatalogKey *)testKey)->nodeName[0]] = '\0';
 	}
@@ -804,7 +807,7 @@ static long GetCatalogEntry(long * dirIndex, char ** name, long * flags, long *
 	// Update dirIndex.
 	index++;
 	
-	if (index == SWAP_BE16(node->numRecords))
+	if (node && (index == SWAP_BE16(node->numRecords)))
 	{
 		index = 0;
 		curNode = SWAP_BE32(node->fLink);
@@ -832,13 +835,6 @@ static long ReadCatalogEntry(char * fileName, long dirID, void * entry, long * d
 	if (gIsHFSPlus)
 	{
 		hfsPlusKey->parentID = SWAP_BE32(dirID);
-		length = strlen(fileName);
-		
-		if (length > 255)
-		{
-			length = 255;
-		}
-		
 		utf_decodestr((u_int8_t *)fileName, hfsPlusKey->nodeName.unicode, &(hfsPlusKey->nodeName.length), 512);
 	}
 	else
@@ -896,7 +892,7 @@ static long ReadBTreeEntry(long btree, void * key, char * entry, long * dirIndex
 	long nodeSize, result = 0, entrySize = 0;
 	long curNode, index = 0, lowerBound, upperBound;
 	long extentSize;
-	char *testKey, *recordData;
+	char *testKey, *recordData = NULL;
 	char *nodeBuf;
 	
 	BTNodeDescriptor *node;
@@ -1009,7 +1005,7 @@ static long ReadBTreeEntry(long btree, void * key, char * entry, long * dirIndex
 		}
 		
 		// Found the closest key... Recurse on it if this is an index node.
-		if (node->kind == kBTIndexNode)
+		if (recordData && node->kind == kBTIndexNode)
 		{
 			curNode = SWAP_BE32( *((long *)recordData) );
 		}
@@ -1060,9 +1056,12 @@ static long ReadBTreeEntry(long btree, void * key, char * entry, long * dirIndex
 			entrySize = sizeof(HFSExtentRecord);
 		}
 	}
-	
-	bcopy(recordData, entry, entrySize);
-	
+
+	if (recordData)
+	{
+		bcopy(recordData, entry, entrySize);
+	}
+
 	// Update dirIndex.
 	if (dirIndex != 0)
 	{
diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 4ca61f9..4c0f76e 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -333,11 +333,9 @@ static long initKernelVersionInfo(unsigned long loadAddress, unsigned long cmdBa
 	if (gPlatform.ArchCPUType == CPU_TYPE_X86_64)
 	{
 #endif
-		struct nlist_64 * nl = (struct nlist_64 *)pointer;
-	
 		while (symbolNumber > 0)
 		{
-			nl = (struct nlist_64 *)pointer;
+			struct nlist_64 * nl = (struct nlist_64 *)pointer;
 			
 			if ((nl->n_sect == 2 /* __TEXT,__const */) && nl->n_value)
 			{
diff --git a/i386/libsaio/sys.c b/i386/libsaio/sys.c
index 65af47d..f86b30a 100755
--- a/i386/libsaio/sys.c
+++ b/i386/libsaio/sys.c
@@ -272,7 +272,6 @@ long CreateUUIDString(uint8_t uubytes[], int nbytes, char *uuidStr)
 
 
 	// generate the text: e.g. 5EB1869F-C4FA-3502-BDEB-3B8ED5D87292
-	i = 0;
 	fmtbase = 0;
 
 	for (fmtidx = 0; fmtidx < sizeof(uuidfmt); fmtidx++)
@@ -715,7 +714,7 @@ BVRef getBootVolumeRef(const char * path, const char ** outPath)
 {
 	const char * cp;
 	BVRef bvr = gPlatform.RootVolume;
-	int biosdev = gPlatform.BIOSDevice;
+	int biosdev;
 
 	// Search for left parenthesis in the path specification.
 
@@ -910,25 +909,21 @@ BVRef getTargetRootVolume(char *rootUUID)
 	#define FIRST_HDD_TO_CHECK	0x80
 	#define LAST_HDD_TO_CHECK	0x86	// Limits drive scanning to 6 (top).
 	
-	BVRef bvr = NULL;
-	BVRef chain = gPlatform.BootPartitionChain;
-
-	int _bvCount = 0;
 	int hdIndex = FIRST_HDD_TO_CHECK;
 
 	while(hdIndex <= LAST_HDD_TO_CHECK)
 	{
 		if (testBiosread(hdIndex, 0) == 0)
 		{
-			_bvCount = 0;
+			int _bvCount = 0;
 			scanBootVolumes(hdIndex, &_bvCount);
 		
 			if (_bvCount)
 			{
-				chain = getBVChainForBIOSDev(hdIndex);
+				BVRef chain = getBVChainForBIOSDev(hdIndex);
 
 				// Traverse back from the last to the first partition in the chain.
-				for (bvr = chain; bvr; bvr = bvr->next)
+				for (BVRef bvr = chain; bvr; bvr = bvr->next)
 				{
 					if ((bvr->biosdev == hdIndex) && ((bvr->flags & kBVFlagSystemVolume) || (bvr->flags & kBVFlagInstallVolume)))
 					{

From 9444db5beb05eddebad8450dbf272eb107cf7971 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 20 Aug 2016 16:49:36 +0200
Subject: [PATCH 581/623] Moving targetMSRs to configuration file

---
 i386/config/settings-template.h |  3 +++
 i386/libsaio/patcher.c          | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/i386/config/settings-template.h b/i386/config/settings-template.h
index 1d9cd1f..2df55d1 100755
--- a/i386/config/settings-template.h
+++ b/i386/config/settings-template.h
@@ -43,6 +43,7 @@
  *			- PATCH_XCPI_SCOPE_MSRS renamed to PATCH_XCPM_SCOPE_MSRS
  *			- PATCH_XCPI_SCOPE_MSRS removed (Pike R. Alpha, August 2016).
  *			- PATCH_KERNEL, DEBUG_KERNEL_PATCHER, PATCH_XCPM_BOOTSTRAP and PATCH_CPUID_SET_INFO added.
+ *			- Moving targetMSRs to configuration file.
  */
 
 
@@ -473,6 +474,8 @@
 												// Note: Not required for Haswell E and Ivy Bridge E processors.
 												//
 
+#define TARGET_XCPM_SCOPE_MSRS				{ 0xE2, 0x01A0, /* 0x01FC, */ 0x01AA, 0x0620, /* 0x064C, */ 0x063A, 0x0642 }
+
 #define DEBUG_KERNEL_PATCHER				0	// Set to 0 by default, and the following bits can be set:
 												//
 												// A value of 1 (bit-0) shows the symbol name, offset and address range.
diff --git a/i386/libsaio/patcher.c b/i386/libsaio/patcher.c
index 10078ca..d251f06 100755
--- a/i386/libsaio/patcher.c
+++ b/i386/libsaio/patcher.c
@@ -9,9 +9,14 @@
  *			- Reducing the number of compiler derectives (make it much easier to handle).
  *			- Latest source code from Vector implemented.
  *			- Checks added to catch errors in config.h (think MacPro61.h etc).
+ *			- Moving targetMSRs to configuration file.
  *
  */
 
+//
+// TODO: Add and verify patch data for El Capitan and make diableMSRs smarter.
+//
+
 #include <mach-o/fat.h>
 #include <mach-o/loader.h>
 #include <mach-o/nlist.h>
@@ -25,9 +30,9 @@
 void disableMSRs(unsigned char * aPointer, uint8_t aNumberOfTargetMSRs)
 {
 	//
-	// Array with target MSRs that we need to disable.
+	// Array from configuration file with target MSRs that need to be disable.
 	//
-	const uint16_t targetMSRs[] = { 0xE2, 0x01A0, /* 0x01FC, */ 0x01AA, 0x0620, /* 0x064C, */ 0x063A, 0x0642 };
+	const uint16_t targetMSRs[] = TARGET_XCPM_SCOPE_MSRS;
 	//
 	// Main for-loop.
 	//
@@ -121,22 +126,22 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 #if (PATCH_XCPM_BOOTSTRAP == 0)
 	switch (gPlatform.CPU.Model)
 	{
-		case CPU_MODEL_IB_CORE:
+		case CPU_MODEL_IB_CORE:		// Verification required!
 			targetPatches					+= 4;
 			xcpm_bootstrap_ModelCorrection	= -1;
 			break;
 
-		case CPU_MODEL_IB_CORE_EX:
+		case CPU_MODEL_IB_CORE_EX:	// Verification required!
 			targetPatches					+= 4;
 			xcpm_bootstrap_ModelCorrection	= -2;
 			break;
 			
-		case CPU_MODEL_HASWELL_E:
+		case CPU_MODEL_HASWELL_E:	// Confirmed working in El Capitan and Sierra.
 			targetPatches					+= 4;
 			xcpm_bootstrap_ModelCorrection	= -3;
 			break;
 			
-		case CPU_MODEL_BROADWELL_E:
+		case CPU_MODEL_BROADWELL_E:	// Confirmed working in El Capitan and Sierra.
 			targetPatches					+= 4;
 			xcpm_bootstrap_ModelCorrection	= -8;
 			break;
@@ -162,10 +167,6 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 	{
 		struct nlist_64 * nl = (struct nlist_64 *)pointer;
 
-        offset			= 0;
-        startAddress	= 0;
-        endAddress		= 0;
-
 		if (nl->n_sect == 1 && nl->n_value && (targetSections & nl->n_sect)) // __TEXT,__text
 		{
 			symbolName = (char *)stringTable + nl->n_un.n_strx;

From f6e9af58f54c68be033dcb472787b13e68af98fd Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 20 Aug 2016 18:46:53 +0200
Subject: [PATCH 582/623] Fix enabling/disabling of patch sets.

---
 i386/libsaio/patcher.c | 46 +++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/i386/libsaio/patcher.c b/i386/libsaio/patcher.c
index d251f06..9779427 100755
--- a/i386/libsaio/patcher.c
+++ b/i386/libsaio/patcher.c
@@ -160,6 +160,13 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 		//
 		targetPatches += 120;
 	}
+	else
+	{
+		//
+		// No. Enabling a limited patch set.
+		//
+		targetPatches += 80;
+	}
 	//
 	// Main while loop.
 	//
@@ -194,7 +201,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 						// Done. Disable this patch.
 						//
 						p = (unsigned char *)endAddress;
-						targetPatches =~ 1;
+						targetPatches -= 1;
 					}
 				}
 			}
@@ -221,7 +228,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 						// Done. Disable this patch.
 						//
 						p = (unsigned char *)endAddress;
-						targetPatches =~ 2;
+						targetPatches -= 2;
 					}
 				}
 			}
@@ -248,12 +255,13 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 						// Done. Disable this patch.
 						//
 						p = (unsigned char *)endAddress;
-						targetPatches =~ 4;
+						targetPatches -= 4;
 					}
 				}
 			}
 			else if ((targetPatches & 8) && strcmp(symbolName, "_xcpm_idle") == 0) // 2 MSRs (0xE2, 0xE2)
 			{
+				uint8_t patch_count = 0;
 				offset = (nl->n_value - textSegment->vmaddr);
 				startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				endAddress = (startAddress + 0x200);
@@ -264,14 +272,20 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				{
 					if (*(uint64_t *)p == 0x300f000000e2b920)// (48 C1 EA) 20 B9 E2 00 00 00 0F 30 reversed
 					{
+						patch_count++;
+
 						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
 
 						*(uint32_t *)(p + 4) = 0x90900000; // Reversed 00 00 90 90 (4 bytes).
-						//
-						// Done. Disable this patch.
-						//
-						p = (unsigned char *)endAddress;
-						targetPatches =~ 8;
+						
+						if (patch_count == 2)
+						{
+							//
+							// Done. Disable this patch.
+							//
+							p = (unsigned char *)endAddress;
+							targetPatches -= 8;
+						}
 					}
 				}
 			}
@@ -283,7 +297,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				//
 				// Yes. Disable this section.
 				//
-				targetSections =~ nl->n_sect;
+				targetSections -= nl->n_sect;
 			}
 		}
 		else if (nl->n_sect == 8 && nl->n_value && (targetSections & nl->n_sect)) // __DATA,__data
@@ -306,7 +320,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				//
 				// Done. Disable this patch.
 				//
-				targetPatches =~ 16;
+				targetPatches -= 16;
 			}
 			else if ((targetPatches & 32) && strcmp(symbolName, "_xcpm_core_scope_msrs") == 0)
 			{
@@ -324,7 +338,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				//
 				// Done. Disable this patch.
 				//
-				targetPatches =~ 32;
+				targetPatches -= 32;
 			}
 			else if ((targetPatches & 64) && strcmp(symbolName, "_xcpm_pkg_scope_msrs") == 0)
 			{
@@ -342,18 +356,18 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				//
 				// Done. Disable this patch.
 				//
-				targetPatches =~ 64;
+				targetPatches -= 64;
 
 			}
 			//
 			// Are we done patching for this section?
 			//
-			if ((targetPatches & 112) == 0)
+			if (targetPatches == 0)
 			{
 				//
 				// Yes. Disable this section.
 				//
-				targetSections =~ nl->n_sect;
+				targetSections -= nl->n_sect;
 			}
 		}
 #if PRELINKED_KERNEL_SUPPORT
@@ -381,8 +395,8 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 						// Disable this section.
 						//
 						p = (unsigned char *)endAddress;
-						targetPatches =~ 128;
-						targetSections =~ nl->n_sect;
+						targetPatches -= 128;
+						targetSections -= nl->n_sect;
 					}
 				}
 			}

From 7cf65b3a66782385f0173b8667c36c5b6a9404c9 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sat, 20 Aug 2016 22:00:27 +0200
Subject: [PATCH 583/623] More dust...

---
 i386/boot2/drivers.c |  5 ++++-
 i386/libsaio/vbe.c   | 19 ++++++++++---------
 i386/libsaio/xml.c   | 16 +++++-----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index dcac46a..c760fb4 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -1003,7 +1003,10 @@ long decodeKernel(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsiz
 		ret = thinFatFile(&fileLoadBuffer, &len);
 	}
 
-	ret = decodeMachO(fileLoadBuffer, rentry, raddr, rsize);
+	if (ret && len)
+	{
+		ret = decodeMachO(fileLoadBuffer, rentry, raddr, rsize);
+	}
 
 	if (ret < 0 && gPlatform.ArchCPUType == CPU_TYPE_X86_64)
 	{
diff --git a/i386/libsaio/vbe.c b/i386/libsaio/vbe.c
index 412e3bf..1285e6a 100755
--- a/i386/libsaio/vbe.c
+++ b/i386/libsaio/vbe.c
@@ -109,6 +109,8 @@ unsigned long getResolutionFromEDID(void)
 	UInt8 targetBlock = 0;
 	const UInt8 header[] = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00	};
 
+	bzero(data, 128);
+
 	do
 	{
 		bb.intno	= 0x10;
@@ -132,10 +134,9 @@ unsigned long getResolutionFromEDID(void)
 			}
 
 #if DEBUG_BOOT_GRAPHICS
-			short i = 0;
 			short r = 0;
 
-			for (i = 0; i < 128; i++)
+			for (short i = 0; i < 128; i++)
 			{
 				printf(" %02x", data[i]);
 
@@ -146,15 +147,15 @@ unsigned long getResolutionFromEDID(void)
 					r = 0;
 					printf("\n");
 				}
-			}
 
-			sleep(1);
-#endif
-			if (data[126] == 0)
-			{
-				targetBlock = 0;
-			}
+				sleep(1);
 
+				if (data[126] == 0)
+				{
+					targetBlock = 0;
+				}
+			}
+#endif
 			return (((data[56] | ((data[58] & 0xF0) << 4)) << 16) | (data[59] | ((data[61] & 0xF0) << 4)));
 		}
 		else
diff --git a/i386/libsaio/xml.c b/i386/libsaio/xml.c
index a373393..5c528cb 100755
--- a/i386/libsaio/xml.c
+++ b/i386/libsaio/xml.c
@@ -642,13 +642,11 @@ void XMLFreeTag(TagPtr tag)
 
 static char * NewSymbol(char * string)
 {
-	static SymbolPtr lastGuy = 0;
-
 	// Look for string in the list of symbols.
 	SymbolPtr symbol = FindSymbol(string, 0);
 
 	// Add new symbol.
-	if (symbol == 0)
+	if (symbol == NULL)
 	{
 		symbol = (SymbolPtr)malloc(sizeof(Symbol) + 1 + strlen(string));
 
@@ -661,6 +659,9 @@ static char * NewSymbol(char * string)
 			// Add the symbol to the list.
 			symbol->next = gSymbolsHead;
 			gSymbolsHead = symbol;
+			
+			// Update the refCount.
+			symbol->refCount++;
 		}
 		else
 		{
@@ -668,14 +669,7 @@ static char * NewSymbol(char * string)
 		}
 	}
 
-	// Update the refCount and return the string.
-	symbol->refCount++;
-
-	if (lastGuy && lastGuy->next != 0)
-	{
-		stop ("xml.c");
-	}
-
+	// Return the string
 	return symbol->string;
 }
 

From 5a1ad5baa4e9f41f7399a1779d66ec6c8c563220 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sun, 21 Aug 2016 11:29:06 +0200
Subject: [PATCH 584/623] Sierra target compilation

---
 i386/boot2/boot.c         |   4 +-
 i386/boot2/bootlogo.h     |   2 +-
 i386/boot2/graphics.c     |  30 +++----
 i386/libsaio/bootstruct.c |   2 +-
 i386/libsaio/bootstruct.h | 164 +++++++++++++++++++++++---------------
 i386/libsaio/console.c    |   8 +-
 i386/libsaio/hfs.c        |   2 +-
 i386/libsaio/platform.c   |   3 +-
 i386/libsaio/xml.c        |   2 +-
 9 files changed, 126 insertions(+), 91 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 38e1505..9e021f8 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -189,7 +189,7 @@ void boot(int biosdev)
 #if PRELINKED_KERNEL_SUPPORT
 	bool	mayUseKernelCache	= false;
 	bool	flushCaches			= false;
-	bool	kernelSpecified	= false;
+	bool	kernelSpecified		= false;
 #endif
 
 	long flags, cachetime;
@@ -796,7 +796,7 @@ void boot(int biosdev)
 #endif
 
 			// Did we switch to graphics mode yet (think verbose mode)?
-			if (gVerboseMode || bootArgs->Video.v_display != GRAPHICS_MODE)
+			if (gVerboseMode || bootArgs->Video_V1.v_display != GRAPHICS_MODE)
 			{
 				// Switch to graphics mode and show the (white) Apple logo on a black/gray background.
 				showBootLogo();
diff --git a/i386/boot2/bootlogo.h b/i386/boot2/bootlogo.h
index 00a96b4..342fa85 100755
--- a/i386/boot2/bootlogo.h
+++ b/i386/boot2/bootlogo.h
@@ -2,7 +2,7 @@
 #define APPLE_LOGO_WIDTH  84
 #define APPLE_LOGO_HEIGHT 103
 
-#define VIDEO(x) (bootArgs->Video.v_ ## x)
+#define VIDEO(x) (bootArgs->Video_V1.v_ ## x)
 
 /*
  * Used in showBootLogo(). Now using the VIDEO() macro instead of the static
diff --git a/i386/boot2/graphics.c b/i386/boot2/graphics.c
index 55673ec..4c77f5b 100755
--- a/i386/boot2/graphics.c
+++ b/i386/boot2/graphics.c
@@ -35,7 +35,7 @@
 
 bool inGraphicsMode(void)
 {
-    return (bootArgs->Video.v_display == GRAPHICS_MODE);
+    return (bootArgs->Video_V1.v_display == GRAPHICS_MODE);
 }
 
 
@@ -195,12 +195,12 @@ static int setVESATextMode(unsigned short cols, unsigned short rows, unsigned ch
 
 	// Update bootArgs with the data provided by the selected VESA mode.
 
-	bootArgs->Video.v_display  = VGA_TEXT_MODE;
-	bootArgs->Video.v_width    = minfo.XResolution;
-	bootArgs->Video.v_height   = minfo.YResolution;
-	bootArgs->Video.v_depth    = 8;
-	bootArgs->Video.v_baseAddr = 0xb8000;
-	bootArgs->Video.v_rowBytes = 0x8000;
+	bootArgs->Video_V1.v_display  = VGA_TEXT_MODE;
+	bootArgs->Video_V1.v_width    = minfo.XResolution;
+	bootArgs->Video_V1.v_height   = minfo.YResolution;
+	bootArgs->Video_V1.v_depth    = 8;
+	bootArgs->Video_V1.v_baseAddr = 0xb8000;
+	bootArgs->Video_V1.v_rowBytes = 0x8000;
 
 	return EFI_SUCCESS;  // always return success
 }
@@ -248,12 +248,12 @@ long setVESAGraphicsMode(unsigned short width, unsigned short height, unsigned c
 		}
 
 		// Update bootArgs with the data provided by the selected VESA mode.
-		bootArgs->Video.v_display	= GRAPHICS_MODE;
-		bootArgs->Video.v_width		= minfo.XResolution;		/* Examples: 1920, 1600, 1680 */
-		bootArgs->Video.v_height	= minfo.YResolution;		/* Examples: 1200, 1050 900 */
-		bootArgs->Video.v_depth		= minfo.BitsPerPixel;		/* Examples: 8, 30, 32 */
-		bootArgs->Video.v_rowBytes	= minfo.BytesPerScanline;	/* Examples: 7680, 6720, 6400 */
-		bootArgs->Video.v_baseAddr	= VBEMakeUInt32(minfo.PhysBasePtr);
+		bootArgs->Video_V1.v_display	= GRAPHICS_MODE;
+		bootArgs->Video_V1.v_width		= minfo.XResolution;		/* Examples: 1920, 1600, 1680 */
+		bootArgs->Video_V1.v_height	= minfo.YResolution;		/* Examples: 1200, 1050 900 */
+		bootArgs->Video_V1.v_depth		= minfo.BitsPerPixel;		/* Examples: 8, 30, 32 */
+		bootArgs->Video_V1.v_rowBytes	= minfo.BytesPerScanline;	/* Examples: 7680, 6720, 6400 */
+		bootArgs->Video_V1.v_baseAddr	= VBEMakeUInt32(minfo.PhysBasePtr);
 	}
 	while (0);
 
@@ -346,7 +346,7 @@ void setVideoMode(int mode)
 	{
 		if ((status = initGraphicsMode()) == EFI_SUCCESS)
 		{
-			bootArgs->Video.v_display = (gVerboseMode) ? /* 2 */ FB_TEXT_MODE : /* 1 */ GRAPHICS_MODE;
+			bootArgs->Video_V1.v_display = (gVerboseMode) ? /* 2 */ FB_TEXT_MODE : /* 1 */ GRAPHICS_MODE;
 		}
 	}
 
@@ -356,6 +356,6 @@ void setVideoMode(int mode)
 		params[1] = 25;
 
 		setVESATextMode(params[0], params[1], 4);
-		bootArgs->Video.v_display = VGA_TEXT_MODE;
+		bootArgs->Video_V1.v_display = VGA_TEXT_MODE;
 	}
 }
diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index 902635c..2801ec0 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -71,7 +71,7 @@ void initKernelBootConfig(void)
 	}
 
 	bootInfo->configEnd = bootInfo->config;
-	bootArgs->Video.v_display = VGA_TEXT_MODE;
+	bootArgs->Video_V1.v_display = VGA_TEXT_MODE;
 
 	// What Lion species is screaming here?
 	if ((gPlatform.OSType & LION) == LION)
diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index 9b16402..7dfbdce 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -25,6 +25,7 @@
  *
  *			- Yosemite support added (Pike R. Alpha, June 2014).
  *			- El Capitan support added (Pike R. Alpha, June 2015).
+ *			- Sierra support added (Pike R. Alpha, August 2016).
  */
 
 #ifndef __BOOTSTRUCT_H
@@ -35,6 +36,34 @@
 #include "bios.h"
 #include "platform.h"
 
+/*
+ * Video information (from boot.h)
+ */
+
+struct Boot_Video_V1
+{
+	uint32_t	v_baseAddr;		// Base address (32-bit) of video memory.
+	uint32_t	v_display;		// Display Code (if Applicable.
+	uint32_t	v_rowBytes;		// Number of bytes per pixel row.
+	uint32_t	v_width;		// Width.
+	uint32_t	v_height;		// Height.
+	uint32_t	v_depth;		// Pixel Depth.
+};
+typedef struct Boot_Video_V1	Boot_Video_V1;
+
+struct Boot_Video_V2
+{
+	uint32_t	v_display;		// Display Code (if Applicable.
+	uint32_t	v_rowBytes;		// Number of bytes per pixel row.
+	uint32_t	v_width;		// Width.
+	uint32_t	v_height;		// Height.
+	uint32_t	v_depth;		// Pixel Depth.
+	uint32_t	v_resv[7];		// Reserved.
+	uint32_t	v_baseAddr;		// Base address (64-bit) of video memory.
+};
+typedef struct Boot_Video_V2	Boot_Video_V2;
+
+
 #if ((MAKE_TARGET_OS & YOSEMITE) == YOSEMITE) // El Capitan and Yosemite
 	#define kDefaultKernel	"kernel"
 #else
@@ -192,25 +221,25 @@ enum
  */
 typedef struct PrivateBootInfo
 {
-    int              convmem;                      // conventional memory
-    int              extmem;                       // extended memory
+	int				convmem;							// conventional memory
+	int				extmem;								// extended memory
 
-    char             bootFile[128];                // kernel file name
+	char			bootFile[128];						// kernel file name
 
-    unsigned long    memoryMapCount;
-    MemoryRange      memoryMap[kMemoryMapCountMax];
+	unsigned long	memoryMapCount;
+	MemoryRange		memoryMap[kMemoryMapCountMax];
 
-    PCI_bus_info_t   pciInfo;
+	PCI_bus_info_t	pciInfo;
 
-    char *           configEnd;                    // pointer to end of config files
-    char             config[CONFIG_SIZE];
+	char *			configEnd;							// pointer to end of config files
+	char			config[CONFIG_SIZE];
 
-    config_file_t    bootConfig;		           // com.apple.Boot.plist
+	config_file_t	bootConfig;							// com.apple.Boot.plist
 
-    config_file_t    smbiosConfig;				   // smbios.plist
+	config_file_t	smbiosConfig;						// smbios.plist
 
 #if RAMDISK_SUPPORT
-    config_file_t    ramdiskConfig;                // RAMDisk.plist
+	config_file_t	ramdiskConfig;						// RAMDisk.plist
 #endif
 } PrivateBootInfo_t;
 
@@ -218,86 +247,93 @@ extern PrivateBootInfo_t *bootInfo;
 
 typedef struct boot_args_new
 {
-    uint16_t    Revision;							// Revision of boot_args structure.
-    uint16_t    Version;							// Version of boot_args structure.
+	uint16_t		Revision;							// Revision of boot_args structure.
+	uint16_t		Version;							// Version of boot_args structure.
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
-    uint8_t     efiMode;							// 32 = 32-bit, 64 = 64-bit.
+#if ((MAKE_TARGET_OS & LION) == LION)					// El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+	uint8_t			efiMode;							// 32 = 32-bit, 64 = 64-bit.
 
-    uint8_t     debugMode;							// Bit field with behavior changes.
+	uint8_t			debugMode;							// Bit field with behavior changes.
 
 #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
-    uint16_t    flags;
+	uint16_t		flags;
 #else
-    uint8_t     __reserved1[2];
+	uint8_t			__reserved1[2];
 #endif
 
 #endif	
-    char        CommandLine[BOOT_LINE_LENGTH];		// Passed in command line.
-	
-    uint32_t    MemoryMap;							// Physical address of memory map.
-    uint32_t    MemoryMapSize;
-    uint32_t    MemoryMapDescriptorSize;
-    uint32_t    MemoryMapDescriptorVersion;
+	char			CommandLine[BOOT_LINE_LENGTH];		// Passed in command line.
 	
-    Boot_Video	Video;								// Video Information.
-	
-    uint32_t    deviceTreeP;						// Physical address of flattened device tree.
-    uint32_t    deviceTreeLength;					// Length of flattened tree.
-	
-    uint32_t    kaddr;								// Physical address of beginning of kernel text.
-    uint32_t    ksize;								// Size of combined kernel text+data+efi.
-	
-    uint32_t    efiRuntimeServicesPageStart;		// Physical address of defragmented runtime pages.
-    uint32_t    efiRuntimeServicesPageCount;
+	uint32_t		MemoryMap;							// Physical address of memory map.
+	uint32_t		MemoryMapSize;
+	uint32_t		MemoryMapDescriptorSize;
+	uint32_t		MemoryMapDescriptorVersion;
+
+	Boot_Video_V1	Video_V1;							// Video V1 Information.
+
+	uint32_t		deviceTreeP;						// Physical address of flattened device tree.
+	uint32_t		deviceTreeLength;					// Length of flattened tree.
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
-    uint64_t    efiRuntimeServicesVirtualPageStart;	// Virtual address of defragmented runtime pages.
+	uint32_t		kaddr;								// Physical address of beginning of kernel text.
+	uint32_t		ksize;								// Size of combined kernel text+data+efi.
+
+	uint32_t		efiRuntimeServicesPageStart;		// Physical address of defragmented runtime pages.
+	uint32_t		efiRuntimeServicesPageCount;
+
+#if ((MAKE_TARGET_OS & LION) == LION)					// El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+	uint64_t		efiRuntimeServicesVirtualPageStart;	// Virtual address of defragmented runtime pages.
 #endif
 
-    uint32_t    efiSystemTable;						// Physical address of system table in runtime area.
+	uint32_t		efiSystemTable;						// Physical address of system table in runtime area.
+
+#if ((MAKE_TARGET_OS & LION) == LION)					// El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
+	uint32_t		kslide;
 
-#if ((MAKE_TARGET_OS & LION) == LION)				// El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.
-    uint32_t    kslide;
+	uint32_t		performanceDataStart;				// Physical address of log.
+	uint32_t		performanceDataSize;
 
-    uint32_t    performanceDataStart;				// Physical address of log.
-    uint32_t    performanceDataSize;
+	uint32_t		keyStoreDataStart;					// Physical address of key store data.
+	uint32_t		keyStoreDataSize;
 
-    uint32_t    keyStoreDataStart;					// Physical address of key store data.
-    uint32_t    keyStoreDataSize;
+	uint64_t		bootMemStart;						// Physical address of interperter boot memory.
+	uint64_t		bootMemSize;
 
-    uint64_t	bootMemStart;						// Physical address of interperter boot memory.
-    uint64_t	bootMemSize;
+	uint64_t		PhysicalMemorySize;
+	uint64_t		FSBFrequency;
 
-    uint64_t    PhysicalMemorySize;
-    uint64_t    FSBFrequency;
+	uint64_t		pciConfigSpaceBaseAddress;
+	uint32_t		pciConfigSpaceStartBusNumber;
+	uint32_t		pciConfigSpaceEndBusNumber;
+
+#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)		// El Capitan and Sierra.
+	uint32_t		csrActiveConfig;
+	uint32_t		csrCapabilities;
+	uint32_t		boot_SMC_plimit;
+	uint16_t		bootProgressMeterStart;
+	uint16_t		bootProgressMeterEnd;
+#endif
 
-    uint64_t    pciConfigSpaceBaseAddress;
-	uint32_t    pciConfigSpaceStartBusNumber;
-	uint32_t    pciConfigSpaceEndBusNumber;
+#if ((MAKE_TARGET_OS & SIERRA) == SIERRA)				// Sierra only.
+	Boot_Video_V2	Video_V2;							// Video V2 Information.
 
-#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)
-	uint32_t    csrActiveConfig;
-	uint32_t    csrCapabilities;
-	uint32_t    boot_SMC_plimit;
-	uint16_t	bootProgressMeterStart;
-	uint16_t	bootProgressMeterEnd;
-	uint32_t    __reserved4[726];
+	uint32_t		__reserved4[712];
+#elif ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)
+	uint32_t		__reserved4[726];
 #elif ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
-	uint32_t    __reserved4[730];
+	uint32_t		__reserved4[730];
 #else
-    uint32_t    __reserved4[734];
+	uint32_t		__reserved4[734];
 #endif
 
 #else
-    uint8_t     efiMode;							// 32 = 32-bit, 64 = 64-bit.
+	uint8_t			efiMode;							// 32 = 32-bit, 64 = 64-bit.
 
-    uint8_t     __reserved1[3];
-    uint32_t    __reserved2[3];
+	uint8_t			__reserved1[3];
+	uint32_t		__reserved2[3];
 
-    uint64_t    efiRuntimeServicesVirtualPageStart;	// Virtual address of defragmented runtime pages.
+	uint64_t		efiRuntimeServicesVirtualPageStart;	// Virtual address of defragmented runtime pages.
 
-    uint32_t    __reserved3[2];
+	uint32_t		__reserved3[2];
 #endif // #if ((MAKE_TARGET_OS & LION) == LION)
 } kernel_boot_args;
 
diff --git a/i386/libsaio/console.c b/i386/libsaio/console.c
index 0d5db5d..ded983b 100755
--- a/i386/libsaio/console.c
+++ b/i386/libsaio/console.c
@@ -118,7 +118,7 @@ int printf(const char * fmt, ...)
 	va_list ap;
 	va_start(ap, fmt);
 
-	if (bootArgs->Video.v_display == VGA_TEXT_MODE)
+	if (bootArgs->Video_V1.v_display == VGA_TEXT_MODE)
 	{
 		prf(fmt, ap, putchar, 0);
 	}
@@ -139,7 +139,7 @@ int verbose(const char * fmt, ...)
 	{
 		va_start(ap, fmt);
 
-		if (bootArgs->Video.v_display == VGA_TEXT_MODE)
+		if (bootArgs->Video_V1.v_display == VGA_TEXT_MODE)
 		{
 			prf(fmt, ap, putchar, 0);
 		}
@@ -159,7 +159,7 @@ int error(const char * fmt, ...)
 	gErrors = true;
 	va_start(ap, fmt);
 
-	if (bootArgs->Video.v_display == VGA_TEXT_MODE)
+	if (bootArgs->Video_V1.v_display == VGA_TEXT_MODE)
 	{
 		prf(fmt, ap, putchar, 0);
 	}
@@ -179,7 +179,7 @@ void stop(const char * fmt, ...)
 	printf("\n");
 	va_start(ap, fmt);
 
-	if (bootArgs->Video.v_display == VGA_TEXT_MODE)
+	if (bootArgs->Video_V1.v_display == VGA_TEXT_MODE)
 	{
 		prf(fmt, ap, putchar, 0);
 	}
diff --git a/i386/libsaio/hfs.c b/i386/libsaio/hfs.c
index 3da5ff2..48c6ee4 100755
--- a/i386/libsaio/hfs.c
+++ b/i386/libsaio/hfs.c
@@ -1075,7 +1075,7 @@ static long ReadBTreeEntry(long btree, void * key, char * entry, long * dirIndex
 		
 		*dirIndex = curNode * nodeSize + index;
 	}
-	
+
 	free(nodeBuf);
 	
 	return 0;
diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 1389c22..77c037a 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -242,11 +242,10 @@ void initPlatform(int biosDevice)
 	int ramSize[]					= STATIC_RAM_OVERRIDE_SIZES;
 #endif
 
-	int i = 0;
 	int populatedSlotCount = 0;
 
 	// Loop through the static RAM vendors (might be different).
-	for (; i < STATIC_RAM_SLOTS; i++)
+	for (int i = 0; i < STATIC_RAM_SLOTS; i++)
 	{
 		gPlatform.RAM.SlotCount++;
 
diff --git a/i386/libsaio/xml.c b/i386/libsaio/xml.c
index 5c528cb..de4e601 100755
--- a/i386/libsaio/xml.c
+++ b/i386/libsaio/xml.c
@@ -665,7 +665,7 @@ static char * NewSymbol(char * string)
 		}
 		else
 		{
-			stop ("xml.c");
+			stop ("xml.c (symbol == NULL)");
 		}
 	}
 

From eda92fb18a5f7abec065cc49ac43a8ef65d6738d Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sun, 21 Aug 2016 12:23:13 +0200
Subject: [PATCH 585/623] Fix wrong var size.

---
 i386/libsaio/bootstruct.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index 7dfbdce..1c9a419 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -59,7 +59,7 @@ struct Boot_Video_V2
 	uint32_t	v_height;		// Height.
 	uint32_t	v_depth;		// Pixel Depth.
 	uint32_t	v_resv[7];		// Reserved.
-	uint32_t	v_baseAddr;		// Base address (64-bit) of video memory.
+	uint64_t	v_baseAddr;		// Base address (64-bit) of video memory.
 };
 typedef struct Boot_Video_V2	Boot_Video_V2;
 

From bc0545eba3c496fbc9e81bd5cce074a114baa770 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sun, 21 Aug 2016 13:51:54 +0200
Subject: [PATCH 586/623] Fix regression from commit 7cf65b3

---
 i386/libsaio/xml.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/i386/libsaio/xml.c b/i386/libsaio/xml.c
index de4e601..98061d4 100755
--- a/i386/libsaio/xml.c
+++ b/i386/libsaio/xml.c
@@ -22,8 +22,9 @@
  * @APPLE_LICENSE_HEADER_END@
  *
  * Updates:
- *			- Cleanups, white space and layout changes (PikerAlpha, November 2012)
- *			- New/improved kXMLTagData support (PikerAlpha, November 2012)
+ *			- Cleanups, white space and layout changes (Pike R. Alpha, November 2012)
+ *			- New/improved kXMLTagData support (Pike R. Alpha, November 2012)
+ *			- Cleanups and regression in function NewSymbol fixed (Pike R. Alpha, August 2016)
  *
  */
 
@@ -659,15 +660,18 @@ static char * NewSymbol(char * string)
 			// Add the symbol to the list.
 			symbol->next = gSymbolsHead;
 			gSymbolsHead = symbol;
-			
-			// Update the refCount.
-			symbol->refCount++;
 		}
 		else
 		{
 			stop ("xml.c (symbol == NULL)");
 		}
 	}
+	
+	if (symbol)
+	{
+		// Update the refCount.
+		symbol->refCount++;
+	}
 
 	// Return the string
 	return symbol->string;

From 9cd39b7772a29bc685bd9d162cfe0bf703ab9321 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <PikeRAlpha@yahoo.com>
Date: Sun, 21 Aug 2016 13:52:56 +0200
Subject: [PATCH 587/623] Check size of the boot_args structures.

---
 i386/libsaio/bootstruct.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index 2801ec0..f7773f4 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -41,6 +41,11 @@ void initKernelBootConfig(void)
 	bootArgs = (kernel_boot_args *)malloc(sizeof(kernel_boot_args));
 	bootInfo = (PrivateBootInfo_t *)malloc(sizeof(PrivateBootInfo_t));
 
+	if (sizeof(kernel_boot_args) != sizeof(boot_args))
+	{
+		stop("Size of kernel_boot_args != boot_args\n");
+	}
+
 	if (bootArgs == 0 || bootInfo == 0)
 	{
 		stop("Couldn't allocate boot info\n");

From d4f4354f4d4c8b07ea7f365ae1bda27390e6545c Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Fri, 28 Oct 2016 02:37:14 +0200
Subject: [PATCH 588/623] New MacBook Pro SMBIOS data.

---
 i386/libsaio/platform.h          |  4 +++-
 i386/libsaio/smbios/model_data.h | 20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 3ae3531..9c540b3 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -111,7 +111,9 @@
 #define MACBOOK_PRO_114			(MACBOOK_PRO | (12 << 15))
 #define MACBOOK_PRO_115			(MACBOOK_PRO | (13 << 15))
 #define MACBOOK_PRO_121			(MACBOOK_PRO | (14 << 15))
-#define MACBOOK_PRO_131			 MACBOOK_PRO				// Defaults to MacBookPro13,1
+#define MACBOOK_PRO_131			(MACBOOK_PRO | (15 << 15))
+#define MACBOOK_PRO_132			(MACBOOK_PRO | (16 << 15))
+#define MACBOOK_PRO_133			 MACBOOK_PRO				// Defaults to MacBookPro13,3
 
 #define MACMINI_41				(MACMINI | (1 << 15))
 #define MACMINI_51				(MACMINI | (2 << 15))
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 34f170e..feff835 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -357,12 +357,30 @@
 		#define SMB_PRODUCT_NAME	"MacBookPro11,5"
 		#define SMB_BOARD_PRODUCT	"Mac-06F11F11946D27C5"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '1', ',', '5' }
-	#else // Defaults to MacBookPro12,1
+	#elif (TARGET_MODEL == MACBOOK_PRO_121)
 		// Intel Core i5-5257U @ 2.70 GHz - 2 cores / 4 threads.
 		#define SMB_BIOS_VERSION	"MBP121.88Z.0167.B16.1602111810"
 		#define SMB_PRODUCT_NAME	"MacBookPro12,1"
 		#define SMB_BOARD_PRODUCT	"Mac-E43C1C25D4880AD6"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '2', ',', '1' }
+    #elif (TARGET_MODEL == MACBOOK_PRO_131)
+        // Intel Core...
+        #define SMB_BIOS_VERSION	"MBP131.88Z.0205.B02.1610121536"
+        #define SMB_PRODUCT_NAME	"MacBookPro13,1"
+        #define SMB_BOARD_PRODUCT	"Mac-473D31EABEB93F9B"
+        #define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '3', ',', '1' }
+    #elif (TARGET_MODEL == MACBOOK_PRO_132)
+        // Intel Core...
+        #define SMB_BIOS_VERSION	"MBP132.88Z.0223.B00.1610201042"
+        #define SMB_PRODUCT_NAME	"MacBookPro13,2"
+        #define SMB_BOARD_PRODUCT	"Mac-66E35819EE2D0D05"
+        #define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '3', ',', '2' }
+    #else // Defaults to MacBookPro13,3
+        // Intel Core i7-6...
+        #define SMB_BIOS_VERSION	"MBP133.88Z.0223.B00.1610201042"
+        #define SMB_PRODUCT_NAME	"MacBookPro13,3"
+        #define SMB_BOARD_PRODUCT	"Mac-A5C67F76ED83108C"
+        #define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '3', ',', '3' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From 84d3f425b75ae7534346cae6d449c306ffa4670a Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Sat, 29 Oct 2016 10:26:38 +0200
Subject: [PATCH 589/623] Comments only change.

---
 i386/libsaio/smbios/model_data.h | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index feff835..e16fd66 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -364,19 +364,27 @@
 		#define SMB_BOARD_PRODUCT	"Mac-E43C1C25D4880AD6"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '2', ',', '1' }
     #elif (TARGET_MODEL == MACBOOK_PRO_131)
-        // Intel Core...
+        // 13-inch without Touch Bar / Touch ID
+        // Intel Core i5-6360U 2.0 GHz (max Turbo Boost 3.1 GHz)
+        // Intel Core i7-6660U 2.4 GHz (max Turbo Boost 3.4 GHz)
         #define SMB_BIOS_VERSION	"MBP131.88Z.0205.B02.1610121536"
         #define SMB_PRODUCT_NAME	"MacBookPro13,1"
         #define SMB_BOARD_PRODUCT	"Mac-473D31EABEB93F9B"
         #define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '3', ',', '1' }
     #elif (TARGET_MODEL == MACBOOK_PRO_132)
-        // Intel Core...
+        // 13-inch with Touch Bar / Touch ID
+        // Intel Core i5-6267U 2.9 GHz (max Turbo Boost 3.3 GHz)
+        // Intel Core i5-6287U 3.1 GHz (max Turbo Boost 3.5 GHz)
+        // Intel Core i7-6567U 3.3 GHz (max Turbo Boost 3.6 GHz)
         #define SMB_BIOS_VERSION	"MBP132.88Z.0223.B00.1610201042"
         #define SMB_PRODUCT_NAME	"MacBookPro13,2"
         #define SMB_BOARD_PRODUCT	"Mac-66E35819EE2D0D05"
         #define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '3', ',', '2' }
     #else // Defaults to MacBookPro13,3
-        // Intel Core i7-6...
+        // 15-inch with Touch Bar / Touch ID
+        // Intel Core i7-6700HQ 2.6 GHz (max Turbo Boost 3.5 GHz)
+        // Intel Core i7-6820HQ 2.7 GHz (max Turbo Boost 3.6 GHz)
+        // Intel Core i7-6920HQ 2.9 GHz (max Turbo Boost 3.8 GHz)
         #define SMB_BIOS_VERSION	"MBP133.88Z.0223.B00.1610201042"
         #define SMB_PRODUCT_NAME	"MacBookPro13,3"
         #define SMB_BOARD_PRODUCT	"Mac-A5C67F76ED83108C"

From e67da6d867fa7bc7ae38b838d3f617c9f575d0dc Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Sun, 30 Oct 2016 14:14:57 +0100
Subject: [PATCH 590/623] Updating firmware version info.

---
 i386/libsaio/smbios/model_data.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index e16fd66..1776cc0 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -121,14 +121,14 @@
 		// Intel Core i5-4690 @ 3.50 GHz - 4 cores / 4 threads
 		// Intel Core i7-4790K @ 4.00 GHz - 4 cores / 8 threads
 		// AMD Radeon R9 M290X, AMD Radeon R9 M295X
-		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B06.1602221600"
+		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B07.1607221823"
 		#define SMB_PRODUCT_NAME	"iMac15,1"
 		#define SMB_BOARD_PRODUCT	"Mac-42FD25EABCABB274"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '1' }
 	#elif (TARGET_MODEL == IMAC_152) // Retina 5K, 27-inch, Mid 2015
 		// Intel Core i5-4590 @ 3.30 GHz - 4 cores / 4 threads
 		// AMD Radeon R9 M290
-		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B06.1602221600"
+		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B07.1607221823"
 		#define SMB_PRODUCT_NAME	"iMac15,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FA842E06C61E91C5"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '2' }
@@ -144,14 +144,14 @@
 		// Intel Core i5-5675R @ 3.10 GHz - 4 cores / 4 threads
 		// Intel Core i7-5775R @ 3.30 GHz - 4 cores / 8 threads
 		// Intel Iris Pro Graphics 6200
-		#define SMB_BIOS_VERSION	"IM162.88Z.0206.B00.1508281353"
+		#define SMB_BIOS_VERSION	"IM162.88Z.0206.B01.1607221823"
 		#define SMB_PRODUCT_NAME	"iMac16,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FFE5EF870D7BA81A"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '6', ',', '2' }
 	#else // Defaults to iMac17,1 (Retina 5K, 27-inch, Late 2015)
 		// Intel Core i5-6500 @ 3.20 GHz - 4 cores / 4 threads
 		// AMD Radeon R9 M380
-		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B08.1604111319"
+		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B09.1607221343"
 		#define SMB_PRODUCT_NAME	"iMac17,1"
 		#define SMB_BOARD_PRODUCT	"Mac-65CE76090165799A"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '7', ',', '1' }
@@ -188,7 +188,7 @@
 		// Intel Core M-5Y31 @ 1.10 GHz (2 cores, 4 threads)
 		// Intel Core M-5Y51 @ 1.20 GHz (2 cores, 4 threads)
 		// Intel Core M-5Y71 @ 1.30 GHz (2 cores, 4 threads)
-		#define SMB_BIOS_VERSION	"MB81.88Z.0164.B13.1602161331"
+		#define SMB_BIOS_VERSION	"MB81.88Z.0164.B18.1608121416"
 		#define SMB_PRODUCT_NAME	"MacBook8,1"
 		#define SMB_BOARD_PRODUCT	"Mac-BE0E8AC46FE800CC"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', '8', ',', '1' }
@@ -464,7 +464,7 @@
 		#define SMB_BOARD_PRODUCT	"Mac-F221BEC8"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '5', ',', '1' }
 	#else // Defaults to MacPro6,1
-		#define SMB_BIOS_VERSION	"MP61.88Z.0116.B17.1602221600"
+		#define SMB_BIOS_VERSION	"MP61.88Z.0116.B20.1610051057"
 		#define SMB_PRODUCT_NAME	"MacPro6,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F60DEB81FF30ACF6"
 		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'P', 'r', 'o', '6', ',', '1' }

From e11b0a7c01f4c25f571301914279492c890ca57c Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Fri, 17 Feb 2017 10:16:35 +0100
Subject: [PATCH 591/623] Comment only changes.

---
 i386/libsaio/bootstruct.h             | 18 ++++++++++--------
 i386/libsaio/cpu/Intel/dynamic_data.h | 12 ++++++------
 i386/libsaio/platform.c               |  6 +++---
 i386/libsaio/smbios/model_data.h      |  6 +++---
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index 1c9a419..e39998d 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -43,7 +43,7 @@
 struct Boot_Video_V1
 {
 	uint32_t	v_baseAddr;		// Base address (32-bit) of video memory.
-	uint32_t	v_display;		// Display Code (if Applicable.
+	uint32_t	v_display;		// Display Code (if Applicable).
 	uint32_t	v_rowBytes;		// Number of bytes per pixel row.
 	uint32_t	v_width;		// Width.
 	uint32_t	v_height;		// Height.
@@ -53,7 +53,7 @@ typedef struct Boot_Video_V1	Boot_Video_V1;
 
 struct Boot_Video_V2
 {
-	uint32_t	v_display;		// Display Code (if Applicable.
+	uint32_t	v_display;		// Display Code (if Applicable).
 	uint32_t	v_rowBytes;		// Number of bytes per pixel row.
 	uint32_t	v_width;		// Width.
 	uint32_t	v_height;		// Height.
@@ -72,15 +72,15 @@ typedef struct Boot_Video_V2	Boot_Video_V2;
 
 // Bitfields for boot_args->flags
 #ifndef kBootArgsFlagRebootOnPanic
-	#define kBootArgsFlagRebootOnPanic		(1 << 0)
+	#define kBootArgsFlagRebootOnPanic		(1 << 0)	// 1
 #endif
 
 #ifndef kBootArgsFlagHiDPI
-	#define kBootArgsFlagHiDPI				(1 << 1)
+	#define kBootArgsFlagHiDPI				(1 << 1)	// 2
 #endif
 
 #ifndef kBootArgsFlagBlack
-	#define kBootArgsFlagBlack				(1 << 2)
+	#define kBootArgsFlagBlack				(1 << 2)	// 4 (Boot without the white progressbar)
 #endif
 
 #ifndef kBootArgsFlagCSRActiveConfig
@@ -121,6 +121,7 @@ typedef struct Boot_Video_V2	Boot_Video_V2;
 	#define CSR_ALLOW_UNRESTRICTED_DTRACE	(1 << 5)	// 32
 	#define CSR_ALLOW_UNRESTRICTED_NVRAM	(1 << 6)	// 64
 	#define CSR_ALLOW_DEVICE_CONFIGURATION	(1 << 7)	// 128
+	#define CSR_ALLOW_ANY_RECOVERY_OS		(1 << 8)	// 256
 
 	#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
 			CSR_ALLOW_UNRESTRICTED_FS | \
@@ -129,7 +130,8 @@ typedef struct Boot_Video_V2	Boot_Video_V2;
 			CSR_ALLOW_APPLE_INTERNAL | \
 			CSR_ALLOW_UNRESTRICTED_DTRACE | \
 			CSR_ALLOW_UNRESTRICTED_NVRAM | \
-			CSR_ALLOW_DEVICE_CONFIGURATION)
+			CSR_ALLOW_DEVICE_CONFIGURATION | \
+			CSR_ALLOW_ANY_RECOVERY_OS)
 #endif
 
 /* CSR capabilities that a booter can give to the system */
@@ -269,7 +271,7 @@ typedef struct boot_args_new
 	uint32_t		MemoryMapDescriptorSize;
 	uint32_t		MemoryMapDescriptorVersion;
 
-	Boot_Video_V1	Video_V1;							// Video V1 Information.
+	Boot_Video_V1	Video_V1;							// Video V1 Information (for backward compatibility).
 
 	uint32_t		deviceTreeP;						// Physical address of flattened device tree.
 	uint32_t		deviceTreeLength;					// Length of flattened tree.
@@ -314,7 +316,7 @@ typedef struct boot_args_new
 #endif
 
 #if ((MAKE_TARGET_OS & SIERRA) == SIERRA)				// Sierra only.
-	Boot_Video_V2	Video_V2;							// Video V2 Information.
+	Boot_Video_V2	Video_V2;							// Video V2 Information (with a 64-bit v_baseAddr).
 
 	uint32_t		__reserved4[712];
 #elif ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)
diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 3485e43..005ffb8 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -40,14 +40,14 @@ static uint64_t getTSCFrequency(void)
 	if (getCachedCPUID(LEAF_0, eax) > 0x14) // Intel Skylake Processors.
 	{
 #if DEBUG_CPU
-		printf("LEAF_15[eax]: 0x%x\n", getCachedCPUID(LEAF_15, eax)); // 0x02		(numerator is always 2)
-		printf("LEAF_15[ebx]: 0x%x\n", getCachedCPUID(LEAF_15, ebx)); // 0x11c	(denominator i.e. 284 = 3.4GHz and 334 = 4GHz)
-		printf("LEAF_15[ecx]: 0x%x\n", getCachedCPUID(LEAF_15, ecx)); // 0x00		(frequency = Intel reserved)
+		printf("LEAF_15[eax]: 0x%x\n", getCachedCPUID(LEAF_15, eax)); // 0x02 (numerator is always 2)
+		printf("LEAF_15[ebx]: 0x%x\n", getCachedCPUID(LEAF_15, ebx)); // 0x11c (denominator i.e. 284 = 3.4GHz and 334 = 4GHz)
+		printf("LEAF_15[ecx]: 0x%x\n", getCachedCPUID(LEAF_15, ecx)); // 0x00 (frequency = Intel reserved)
 		printf("LEAF_15[edx]: 0x%x\n", getCachedCPUID(LEAF_15, edx)); // 0x00
 		
-		printf("LEAF_16[eax]: 0x%x\n", getCachedCPUID(LEAF_16, eax)); // 0xd48	(clock speed i.e. 3408MHz for the i7-6700)
-		printf("LEAF_16[ebx]: 0x%x\n", getCachedCPUID(LEAF_16, ebx)); // 0xfa0	(maximum turbo clock speed i.e. 4GHz for the i7-6700)
-		printf("LEAF_16[ecx]: 0x%x\n", getCachedCPUID(LEAF_16, ecx)); // 0x64		(bus speed i.e. 100MHz)
+		printf("LEAF_16[eax]: 0x%x\n", getCachedCPUID(LEAF_16, eax)); // 0xd48 (clock speed i.e. 3408MHz for the i7-6700)
+		printf("LEAF_16[ebx]: 0x%x\n", getCachedCPUID(LEAF_16, ebx)); // 0xfa0 (maximum turbo clock speed i.e. 4GHz for the i7-6700)
+		printf("LEAF_16[ecx]: 0x%x\n", getCachedCPUID(LEAF_16, ecx)); // 0x64 (bus speed i.e. 100MHz)
 		printf("LEAF_16[edx]: 0x%x\n", getCachedCPUID(LEAF_16, edx)); // 0x00
 #endif
 		//
diff --git a/i386/libsaio/platform.c b/i386/libsaio/platform.c
index 77c037a..c6b4f42 100644
--- a/i386/libsaio/platform.c
+++ b/i386/libsaio/platform.c
@@ -4,9 +4,9 @@
  *
  * Updates:
  *
- *			- STATIC_SMBIOS_MODEL_ID renamed to SMB_PRODUCT_NAME (PikerAlpha, October 2012).
- *			- Yosemite support added (PikerAlpha, June 2014).
- *			- Replaced hard-coded OS version control with a flexible one (PikerAlpha, June 2014).
+ *			- STATIC_SMBIOS_MODEL_ID renamed to SMB_PRODUCT_NAME (Pike R. Alpha, October 2012).
+ *			- Yosemite support added (Pike R. Alpha, June 2014).
+ *			- Replaced hard-coded OS version control with a flexible one (Pike R. Alpha, June 2014).
  *
  */
 
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 1776cc0..802d8f3 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -382,9 +382,9 @@
         #define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '3', ',', '2' }
     #else // Defaults to MacBookPro13,3
         // 15-inch with Touch Bar / Touch ID
-        // Intel Core i7-6700HQ 2.6 GHz (max Turbo Boost 3.5 GHz)
-        // Intel Core i7-6820HQ 2.7 GHz (max Turbo Boost 3.6 GHz)
-        // Intel Core i7-6920HQ 2.9 GHz (max Turbo Boost 3.8 GHz)
+        // Intel Core i7-6700HQ 2.6 GHz (max Turbo Boost 3.5 GHz) 45W
+        // Intel Core i7-6820HQ 2.7 GHz (max Turbo Boost 3.6 GHz) 45W
+        // Intel Core i7-6920HQ 2.9 GHz (max Turbo Boost 3.8 GHz) 45W
         #define SMB_BIOS_VERSION	"MBP133.88Z.0223.B00.1610201042"
         #define SMB_PRODUCT_NAME	"MacBookPro13,3"
         #define SMB_BOARD_PRODUCT	"Mac-A5C67F76ED83108C"

From 4c74f7794987b3630fe89aee9445b9a829347760 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Fri, 17 Feb 2017 10:17:31 +0100
Subject: [PATCH 592/623] Adding forgotten macOS support.

---
 i386/libsaio/stringTable.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/stringTable.c b/i386/libsaio/stringTable.c
index 2558523..1575848 100755
--- a/i386/libsaio/stringTable.c
+++ b/i386/libsaio/stringTable.c
@@ -380,6 +380,7 @@ long loadCABootPlist(void)
 #endif
 
 #if INSTALL_ESD_SUPPORT
+		"macOS Install Data",
 		"OS X Install Data",
 		".IABootFiles",
 		"Mac OS X Install Data",
@@ -403,7 +404,7 @@ long loadCABootPlist(void)
 		int len = (sizeof(dirspec) / sizeof(dirspec[0]));
 #if INSTALL_ESD_SUPPORT
 		int start = 0;
-		int end = 3;
+		int end = 4;
 	#if RECOVERY_HD_SUPPORT
 		start++;
 		end++;

From 05ff1ff680bea384da6203e935885b3a430e7adb Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Fri, 17 Feb 2017 10:18:25 +0100
Subject: [PATCH 593/623] Use correct format for booter properties.

---
 i386/libsaio/efi.c | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/efi.c b/i386/libsaio/efi.c
index 970def0..4b83600 100755
--- a/i386/libsaio/efi.c
+++ b/i386/libsaio/efi.c
@@ -98,6 +98,8 @@ void initEFITree(void)
 	// Satisfying AppleACPIPlatform.kext
 	static EFI_UINT8 const DEVICE_PATHS_SUPPORTED[] = { 0x01, 0x00, 0x00, 0x00 };
 
+	DT__AddProperty(platformNode, "device-colors", sizeof(DEVICE_PATHS_SUPPORTED), (EFI_UINT8*) &DEVICE_PATHS_SUPPORTED);
+
 	DT__AddProperty(platformNode, "DevicePathsSupported", sizeof(DEVICE_PATHS_SUPPORTED), (EFI_UINT8*) &DEVICE_PATHS_SUPPORTED);
 
 	// The use of sizeof() here is mandatory (to prevent breakage).
@@ -265,9 +267,27 @@ void initEFITree(void)
 		DT__AddProperty(chosenNode, "random-seed", sizeof(seedBufferAlternative), (EFI_UINT8*) &seedBufferAlternative);
 	}
 
-	DT__AddProperty(chosenNode, "booter-name", 12, "bootbase.efi");
-	DT__AddProperty(chosenNode, "booter-version", 11, "version:307");
-	DT__AddProperty(chosenNode, "booter-build-time", 28, "Fri Sep  4 15:34:00 PDT 2015");
+	static EFI_UINT8 const booterName[] =
+	{
+		0x62, 0x6f, 0x6f, 0x74, 0x2e, 0x65, 0x66, 0x69, 0x00
+	};
+
+	DT__AddProperty(chosenNode, "booter-name", sizeof(booterName), (EFI_UINT8*) &booterName);
+
+	static EFI_UINT8 const booterVersion[] =
+	{
+		0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x33, 0x32, 0x34, 0x2e, 0x33, 0x30, 0x2e, 0x32, 0x00
+	};
+
+	DT__AddProperty(chosenNode, "booter-version", sizeof(booterVersion), (EFI_UINT8*) &booterVersion);
+
+	static EFI_UINT8 const booterBuildTime[] =
+	{
+		0x54, 0x68, 0x75, 0x20, 0x4E, 0x6F, 0x76, 0x20, 0x31, 0x30, 0x20, 0x31, 0x35, 0x3A, 0x34, 0x33, 0x3A,
+		0x32, 0x38, 0x20, 0x50, 0x53, 0x54, 0x20, 0x32, 0x30, 0x31, 0x36, 0x00
+	};
+
+	DT__AddProperty(chosenNode, "booter-build-time", sizeof(booterBuildTime), (EFI_UINT8*) &booterBuildTime);
 #endif
 
 #if ((MAKE_TARGET_OS & LION) == LION) // El Capitan, Yosemite, Mavericks and Mountain Lion also have bit 1 set like Lion.

From 8b44d51e4ee5a1accd2ffa8e75916a632c096b1c Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Fri, 17 Feb 2017 10:20:55 +0100
Subject: [PATCH 594/623] Make debug data more visible.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Wait 1 second after displaying a row of bytes.
---
 i386/libsaio/vbe.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/i386/libsaio/vbe.c b/i386/libsaio/vbe.c
index 1285e6a..8797c3b 100755
--- a/i386/libsaio/vbe.c
+++ b/i386/libsaio/vbe.c
@@ -146,10 +146,9 @@ unsigned long getResolutionFromEDID(void)
 				{
 					r = 0;
 					printf("\n");
+					sleep(1);
 				}
 
-				sleep(1);
-
 				if (data[126] == 0)
 				{
 					targetBlock = 0;

From 63fdb6570b334bdb2100c973ce75147de0ed62b6 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Fri, 17 Feb 2017 10:21:16 +0100
Subject: [PATCH 595/623] Adding back a removed function.

---
 i386/libsaio/biosfn.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/i386/libsaio/biosfn.c b/i386/libsaio/biosfn.c
index 61f09c5..3da65e9 100755
--- a/i386/libsaio/biosfn.c
+++ b/i386/libsaio/biosfn.c
@@ -644,3 +644,14 @@ void delay(int ms)
     bb.edx.rr	= ms & 0xFFFF;
     bios(&bb);
 }
+
+
+//==============================================================================
+
+void setCursorType(int type)
+{
+	bb.intno   = 0x10;
+	bb.eax.r.h = 0x01;
+	bb.ecx.rr  = type;
+	bios(&bb);
+}

From 558d315bd7652e2a0e61cb93cb7ba2bd0ed32d4e Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Wed, 29 Mar 2017 12:02:11 +0200
Subject: [PATCH 596/623] Fix path names

---
 i386/libsaio/cpu.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/cpu.c b/i386/libsaio/cpu.c
index dff29ff..0fb5cd8 100644
--- a/i386/libsaio/cpu.c
+++ b/i386/libsaio/cpu.c
@@ -263,17 +263,17 @@ void checkFlexRatioMSR(void)
 #if USE_STATIC_CPU_DATA
 
 	#if CPU_VENDOR_ID == CPU_VENDOR_INTEL
-		#include "cpu/intel/static_data.h"
+		#include "cpu/Intel/static_data.h"
 	#else
-		#include "cpu/amd/static_data.h"
+		#include "cpu/AMD/static_data.h"
 	#endif
 
 #else
 
 	#if CPU_VENDOR_ID == CPU_VENDOR_INTEL
-		#include "cpu/intel/dynamic_data.h"
+		#include "cpu/Intel/dynamic_data.h"
 	#else
-		#include "cpu/amd/dynamic_data.h"
+		#include "cpu/AMD/dynamic_data.h"
 	#endif
 
 #endif

From b1261e836c6103f0a5e6e8a18f6fc0fb2e8b9c11 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Wed, 29 Mar 2017 12:46:15 +0200
Subject: [PATCH 597/623] Support for macOS 10.13 added (preliminary)

---
 Makefile                | 22 ++++++++++++++++------
 i386/libsaio/platform.h |  5 +++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 230ee11..ea146b3 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@
 #			- Changed default from Mavericks to Yosemite (Pike R. Alpha, June 2014).
 #			- El Capitan support added (Pike R. Alpha, June 2015).
 #			- Sierra support added (Pike R. Alpha, June 2016).
+#			- macOS 10.13 support added (Pike R. Alpha, March 2017).
 #
 
 #
@@ -50,25 +51,34 @@ EXCLUDE = --exclude=.DS_Store --exclude=sym --exclude=obj --exclude=*.sh
 
 VPATH = $(OBJROOT):$(SYMROOT)
 
+OS_TYPE = "OS\ X"
+
 #
 # Check if OS build target is specified (example: make mountain-lion).
 #
 
 ifeq ($(MAKECMDGOALS),)
 	#
-	# No OS build target given. Build for Sierra (default).
+	# No OS build target given. Build for CodeName (default).
 	#
-	MAKEGOAL = sierra
-	MAKE_TARGET_OS = 126;
-	MAKE_TARGET_OS_VER = 10.12
+	MAKEGOAL = codename
+	MAKE_TARGET_OS = 254;
+	MAKE_TARGET_OS_VER = 10.13
+        OS_TYPE = "macOS"
 else
 	#
 	# Setting MAKE_TARGET_OS and MAKEGOAL based on OS build target.
 	#
-	ifeq ($(MAKECMDGOALS), sierra)
+	ifeq ($(MAKECMDGOALS), codename)
+		MAKEGOAL = codename
+		MAKE_TARGET_OS = 254;
+		MAKE_TARGET_OS_VER = 10.13
+                OS_TYPE = "macOS"
+	else ifeq ($(MAKECMDGOALS), sierra)
 		MAKEGOAL = sierra
 		MAKE_TARGET_OS = 126;
 		MAKE_TARGET_OS_VER = 10.12
+                OS_TYPE = "macOS"
 	else ifeq ($(MAKECMDGOALS), el-capitan)
 		MAKEGOAL = el-capitan
 		MAKE_TARGET_OS = 62;
@@ -201,7 +211,7 @@ $(MAKEGOAL):
 #
 # normal make goal
 #
-	@printf "\nCompiling RevoBoot, setup for a $(MODEL) running OS X $(MAKE_TARGET_OS_VER) ($@)\n" >&2;
+	@printf "\nCompiling RevoBoot, setup for a $(MODEL) running $(OS_TYPE) $(MAKE_TARGET_OS_VER) ($@)\n" >&2;
 
 	@if [ ! -f $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE) ]; then \
 		echo "\t[CP] $(CONFIG_DIR)/ACPI/data-template.h $(CONFIG_DIR)/$(MAKE_ACPI_DATA_FILE)"; \
diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 9c540b3..ffd6c66 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -33,6 +33,7 @@
 #define YOSEMITE				26	// Yosemite (includes Lion and Mavericks changes).
 #define EL_CAPITAN				62	// El Capitan (includes Lion/Mavericks and Yosemite changes).
 #define SIERRA					126	// Sierra (includes Lion/Mavericks/Yosemite and El Capitan changes).
+#define CODENAME				254	// CodeName (includes Lion/Mavericks/Yosemite/El Capitan and Sierra changes).
 
 //------------------------------------------------------------------------------
 
@@ -81,6 +82,7 @@
 #define IMAC_152				(IMAC | (12 << 15))
 #define IMAC_161				(IMAC | (13 << 15))
 #define IMAC_162				(IMAC | (14 << 15))
+#define IMAC_181				(IMAC | (15 << 15))
 #define IMAC_171				 IMAC						// Defaults to iMac17,1
 
 #define MACBOOK_41				(MACBOOK | ( 1 << 15))
@@ -121,13 +123,16 @@
 #define MACMINI_53				(MACMINI | (4 << 15))
 #define MACMINI_61				(MACMINI | (5 << 15))
 #define MACMINI_62				(MACMINI | (6 << 15))
+#define MACMINI_81				(MACMINI | (7 << 15))
 #define MACMINI_71				 MACMINI					// Defaults to Macmini7,1
 
 #define MACPRO_31				(MACPRO | (1 << 15))
 #define MACPRO_41				(MACPRO | (2 << 15))
 #define MACPRO_51				(MACPRO | (3 << 15))
+#define MACPRO_71				(MACPRO | (4 << 15))
 #define MACPRO_61				 MACPRO						// Defaults to MacPro6,1
 
+
 #if ((TARGET_MODEL & MACPRO) == MACPRO)
 	#define PM_PROFILE_OVERRIDE	3
 #else

From afc40cd271c6344ed2ba25561785f0f46234ffac Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@bryans-iMac-on-M2.local>
Date: Wed, 29 Mar 2017 12:48:51 +0200
Subject: [PATCH 598/623] Cleanups

---
 i386/libsaio/bootstruct.c | 15 +++++++-------
 i386/libsaio/load.c       |  2 +-
 i386/libsaio/patcher.c    | 42 +++++++++++++++++++++++++++++----------
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index f7773f4..8f15e4f 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -43,7 +43,7 @@ void initKernelBootConfig(void)
 
 	if (sizeof(kernel_boot_args) != sizeof(boot_args))
 	{
-		stop("Size of kernel_boot_args != boot_args\n");
+		printf("Warning: sizeof(%d != %d)\n", sizeof(kernel_boot_args), sizeof(boot_args));
 	}
 
 	if (bootArgs == 0 || bootInfo == 0)
@@ -62,9 +62,7 @@ void initKernelBootConfig(void)
 	// Get system memory map. Also update the size of the
 	// conventional/extended memory for backwards compatibility.
 
-	bootInfo->memoryMapCount = getMemoryMap(bootInfo->memoryMap, kMemoryMapCountMax,
-											(unsigned long *) &bootInfo->convmem, 
-											(unsigned long *) &bootInfo->extmem);
+	bootInfo->memoryMapCount = getMemoryMap(bootInfo->memoryMap, kMemoryMapCountMax, (unsigned long *) &bootInfo->convmem, (unsigned long *) &bootInfo->extmem);
 
 	if (bootInfo->memoryMapCount == 0)
 	{
@@ -76,8 +74,10 @@ void initKernelBootConfig(void)
 	}
 
 	bootInfo->configEnd = bootInfo->config;
-	bootArgs->Video_V1.v_display = VGA_TEXT_MODE;
 
+	bootArgs->Video_V1.v_display = VGA_TEXT_MODE;
+	// bootArgs->Video_V2.v_display = VGA_TEXT_MODE;
+	
 	// What Lion species is screaming here?
 	if ((gPlatform.OSType & LION) == LION)
 	{
@@ -122,7 +122,7 @@ void initKernelBootConfig(void)
 #endif
 
 #if BLACKMODE
-	bootArgs->flags							|= kBootArgsFlagBlackTheme; // (kBootArgsFlagBlack + kBootArgsFlagBlackTheme);
+	bootArgs->flags							|= kBootArgsFlagBlackTheme;
 #endif
 
 #endif // #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
@@ -135,8 +135,9 @@ void initKernelBootConfig(void)
 	bootArgs->csrCapabilities				= CSR_CAPABILITY_UNLIMITED;
 
 	bootArgs->boot_SMC_plimit				= 0;
+
 	bootArgs->bootProgressMeterStart		= 0;
-	bootArgs->bootProgressMeterEnd			= 1024;
+	bootArgs->bootProgressMeterEnd			= 0; // 1024;
 
 /*	enum
 	{
diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 4c0f76e..9f8a579 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -241,7 +241,7 @@ long decodeMachO(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsize
 
 			case LC_SYMTAB:
 				initKernelVersionInfo(loadAddress, cmdBase, listSize, textSegmentAddress);
-#if (PATCH_KERNEL && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)
 				patchKernel(loadAddress, cmdBase, listSize, textSegmentAddress, vldSegmentAddress);
 #endif
 				break;
diff --git a/i386/libsaio/patcher.c b/i386/libsaio/patcher.c
index 9779427..81d8396 100755
--- a/i386/libsaio/patcher.c
+++ b/i386/libsaio/patcher.c
@@ -23,7 +23,16 @@
 
 #include "platform.h"
 
-#if (PATCH_KERNEL && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+#ifndef PATCH_CPUID_SET_INFO
+	#define PATCH_CPUID_SET_INFO	-1
+#endif
+
+#ifndef PATCH_XCPM_BOOTSTRAP
+	#define PATCH_XCPM_BOOTSTRAP	-1
+#endif
+
+
+#if (PATCH_KERNEL_XCPM && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
 //==============================================================================
 // Called from patchKernel()
 
@@ -66,17 +75,18 @@ void disableMSRs(unsigned char * aPointer, uint8_t aNumberOfTargetMSRs)
 		aPointer += 0x30;
 	}
 }
+#endif
+
 
-			 
 //==============================================================================
 // Called from decodeMachO()
 
 long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize, unsigned long textSegmentAddress, unsigned long vldSegmentAddress)
 {
-#if DEBUG_KERNEL_PATCHER
-	printf("patchKernel() called\n");
-	sleep(1);
-#endif
+	#if DEBUG_KERNEL_PATCHER
+		printf("patchKernel(%d/%d/%d) called\n", PRELINKED_KERNEL_SUPPORT, PATCH_CPUID_SET_INFO, PATCH_XCPM_BOOTSTRAP);
+		sleep(1);
+	#endif
 
 	char * symbolName = NULL;
 	unsigned char * p = NULL;
@@ -93,7 +103,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 	struct symtab_command * symtab = (struct symtab_command *)cmdBase;
 	struct segment_command_64 * textSegment = (struct segment_command_64 *)textSegmentAddress;
 #if PRELINKED_KERNEL_SUPPORT
-	struct segment_command_64 * vldSegment = (struct segment_command_64 *)vldSegmentAddress;
+	// struct segment_command_64 * vldSegment = (struct segment_command_64 *)vldSegmentAddress;
 	
 	targetSections |= 25;
 #endif
@@ -107,6 +117,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 	uint64_t startAddress	= 0;
 	uint64_t endAddress		= 0;
 
+#if (PATCH_KERNEL_XCPM && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
 	uint8_t cpuid_set_info_ModelCorrection = 0;
 	uint8_t xcpm_bootstrap_ModelCorrection = 0;
 
@@ -145,11 +156,15 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 			targetPatches					+= 4;
 			xcpm_bootstrap_ModelCorrection	= -8;
 			break;
+			
+		default:
+			return 0;
 	}
 #else
 	targetPatches							+= 4;
 	xcpm_bootstrap_ModelCorrection			= PATCH_XCPM_BOOTSTRAP;
 #endif
+
 	//
 	// Is MSR(0xE2) locked (bit-15 set)?
 	//
@@ -167,6 +182,8 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 		//
 		targetPatches += 80;
 	}
+#endif // #if (PATCH_KERNEL_XCPM && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
+
 	//
 	// Main while loop.
 	//
@@ -174,7 +191,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 	{
 		struct nlist_64 * nl = (struct nlist_64 *)pointer;
 
-		if (nl->n_sect == 1 && nl->n_value && (targetSections & nl->n_sect)) // __TEXT,__text
+		if (nl->n_sect == 1 && nl->n_value && (targetSections & nl->n_sect))	// __TEXT,__text
 		{
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
 
@@ -205,6 +222,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 					}
 				}
 			}
+#if (PATCH_KERNEL_XCPM && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
 			else if ((targetPatches & 2) && strcmp(symbolName, "_cpuid_set_info") == 0)
 			{
 				offset = (nl->n_value - textSegment->vmaddr);
@@ -289,6 +307,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 					}
 				}
 			}
+#endif // #if (PATCH_KERNEL_XCPM && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
 			//
 			// Are we done patching for this section?
 			//
@@ -300,10 +319,11 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				targetSections -= nl->n_sect;
 			}
 		}
-		else if (nl->n_sect == 8 && nl->n_value && (targetSections & nl->n_sect)) // __DATA,__data
+		else if (nl->n_sect == 8 && nl->n_value && (targetSections & nl->n_sect))	// __DATA,__data
 		{
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
 
+#if (PATCH_KERNEL_XCPM && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
 			if ((targetPatches & 16) && strcmp(symbolName, "_xcpm_SMT_scope_msrs") == 0)
 			{
 				//
@@ -359,6 +379,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				targetPatches -= 64;
 
 			}
+#endif // #if (PATCH_KERNEL_XCPM && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
 			//
 			// Are we done patching for this section?
 			//
@@ -371,7 +392,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 			}
 		}
 #if PRELINKED_KERNEL_SUPPORT
-		else if (nl->n_sect == 25 && nl->n_value && (targetSections & nl->n_sect)) // __KLD,__text
+		else if (nl->n_sect == 25 && nl->n_value && (targetSections & nl->n_sect))	// __KLD,__text
 		{
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
 			
@@ -409,4 +430,3 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 
 	return 0;
 }
-#endif

From ad75fe3167ebe0a8c33081ff1b9ccc9402b9e468 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Tue, 6 Jun 2017 23:51:06 +0200
Subject: [PATCH 599/623] Data for new iMac18,x and MacBookPro14,x

---
 i386/libsaio/smbios/model_data.h | 81 +++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 27 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 802d8f3..924a84b 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -16,13 +16,14 @@
  *			- Dynamic and static SMBIOS data gathering added by DHP in 2010.
  *			- Complete rewrite / overhaul by DHP in Februari 2011.
  *			- Coding style changes by DHP in Februari 2011.
- *			- Model data stripped and simplified (PikerAlpha, October 2012).
- *			- EFI/SMBIOS data logic moved to preprocessor code (PikerAlpha, October 2012).
- *			- SMB_PRODUCT_NAME renamed/moved over from settings.h (PikerAlpha, October 2012).
- *			- EFI_MODEL_NAME renamed/moved over from settings.h (PikerAlpha, October 2012).
- *			- Data for new MacBookPro and Macmini added (PikerAlpha, October 2012).
- *			- Data for iMac13,2 and MacBookPro9,2 added (PikerAlpha, October 2013).
- *			- Typo in SMB_BOARD_PRODUCT for iMac12,n fixed (PikerAlpha, April 2013).
+ *			- Model data stripped and simplified (Pike R. Alpha, October 2012).
+ *			- EFI/SMBIOS data logic moved to preprocessor code (Pike R. Alpha, October 2012).
+ *			- SMB_PRODUCT_NAME renamed/moved over from settings.h (Pike R. Alpha, October 2012).
+ *			- EFI_MODEL_NAME renamed/moved over from settings.h (Pike R. Alpha, October 2012).
+ *			- Data for new MacBookPro and Macmini added (Pike R. Alpha, October 2012).
+ *			- Data for iMac13,2 and MacBookPro9,2 added (Pike R. Alpha, October 2013).
+ *			- Typo in SMB_BOARD_PRODUCT for iMac12,n fixed (Pike R. Alpha, April 2013).
+  *			- Data for new iMac18,x and MacBookPro14,x added (Pike R. Alpha, June 2017).
  *
  * Credits:
  *			- blackosx, DB1, dgsga, FKA, humph, scrax and STLVNUB (testers).
@@ -148,28 +149,28 @@
 		#define SMB_PRODUCT_NAME	"iMac16,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FFE5EF870D7BA81A"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '6', ',', '2' }
-	#else // Defaults to iMac17,1 (Retina 5K, 27-inch, Late 2015)
+	#elif (TARGET_MODEL == IMAC_171) // (Retina 5K, 27-inch, Late 2015)
 		// Intel Core i5-6500 @ 3.20 GHz - 4 cores / 4 threads
 		// AMD Radeon R9 M380
 		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B09.1607221343"
 		#define SMB_PRODUCT_NAME	"iMac17,1"
 		#define SMB_BOARD_PRODUCT	"Mac-65CE76090165799A"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '7', ',', '1' }
-	/* #elif (TARGET_MODEL == IMAC_171) // Retina 5K, 27-inch, Late 2015
-		// Intel Core i5-6500 @ 3.20 GHz - 4 cores / 4 threads
-		// AMD Radeon R9 M390
-		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B08.1604111319"
-		#define SMB_PRODUCT_NAME	"iMac17,1"
-		#define SMB_BOARD_PRODUCT	"Mac-DB15BD556843C820"
-		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '7', ',', '1' }
-	#elif (TARGET_MODEL == IMAC_171) // Retina 5K, 27-inch, Late 2015
-		// Intel Core i5-6600 @ 3.30 GHz - 4 cores / 4 threads
-		// Intel Core i7-6700K @ 4.00 GHz - 4 cores / 8 threads
-		// AMD Radeon R9 M395 & AMD Radeon R9 M395X
-		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B08.1604111319"
-		#define SMB_PRODUCT_NAME	"iMac17,1"
-		#define SMB_BOARD_PRODUCT	"Mac-B809C3757DA9BB8D"
-		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '7', ',', '1' } */
+	#elif (TARGET_MODEL == IMAC_181) // Retina 5K, 27-inch, 2017
+		#define SMB_BIOS_VERSION	"IM181.88Z.0145.B07.1705082121"
+		#define SMB_PRODUCT_NAME	"iMac18,1"
+		#define SMB_BOARD_PRODUCT	"Mac-4B682C642B45593E"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '8', ',', '1' }
+	#elif (TARGET_MODEL == IMAC_182) // Retina 5K, 27-inch, 2017
+		#define SMB_BIOS_VERSION	"IM182.88Z.0145.B07.1705082121"
+		#define SMB_PRODUCT_NAME	"iMac18,2"
+		#define SMB_BOARD_PRODUCT	"Mac-77F17D7DA9285301"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '8', ',', '2' }
+	#else // Defaults to iMac18,3 Retina 5K, 27-inch, 2017
+		#define SMB_BIOS_VERSION	"IM183.88Z.0145.B07.1705082121"
+		#define SMB_PRODUCT_NAME	"iMac18,3"
+		#define SMB_BOARD_PRODUCT	"Mac-BE088AF8C5EB4FA2"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '8', ',', '3' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
@@ -380,15 +381,41 @@
         #define SMB_PRODUCT_NAME	"MacBookPro13,2"
         #define SMB_BOARD_PRODUCT	"Mac-66E35819EE2D0D05"
         #define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '3', ',', '2' }
-    #else // Defaults to MacBookPro13,3
+    #elif (TARGET_MODEL == MACBOOK_PRO_133)
         // 15-inch with Touch Bar / Touch ID
-        // Intel Core i7-6700HQ 2.6 GHz (max Turbo Boost 3.5 GHz) 45W
-        // Intel Core i7-6820HQ 2.7 GHz (max Turbo Boost 3.6 GHz) 45W
-        // Intel Core i7-6920HQ 2.9 GHz (max Turbo Boost 3.8 GHz) 45W
+        // Intel Core i7-6700HQ 2.6 GHz (max Turbo Boost 3.5 GHz)
+        // Intel Core i7-6820HQ 2.7 GHz (max Turbo Boost 3.6 GHz)
+        // Intel Core i7-6920HQ 2.9 GHz (max Turbo Boost 3.8 GHz)
         #define SMB_BIOS_VERSION	"MBP133.88Z.0223.B00.1610201042"
         #define SMB_PRODUCT_NAME	"MacBookPro13,3"
         #define SMB_BOARD_PRODUCT	"Mac-A5C67F76ED83108C"
         #define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '3', ',', '3' }
+	#elif (TARGET_MODEL == MACBOOK_PRO_141)
+		// 13-inch without Touch Bar / Touch ID
+		// Intel Core i5-7360U 2.3 GHz (max Turbo Boost 3.6 GHz)
+		// Intel Core i7-7660U 2.5 GHz (max Turbo Boost 4.0 GHz)
+		#define SMB_BIOS_VERSION	"MBP141.88Z.0160.B00.1705082121"
+		#define SMB_PRODUCT_NAME	"MacBookPro14,1"
+		#define SMB_BOARD_PRODUCT	"Mac-B4831CEBD52A0C4C"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '4', ',', '1' }
+	#elif (TARGET_MODEL == MACBOOK_PRO_142)
+		// 13-inch with Touch Bar / Touch ID
+		// Intel Core i5-7267U 3.1 GHz (max Turbo Boost 3.5 GHz)
+		// Intel Core i5-7287U 3.3 GHz (max Turbo Boost 3.7 GHz)
+		// Intel Core i7-7567U 3.5 GHz (max Turbo Boost 4.0 GHz)
+		#define SMB_BIOS_VERSION	"MBP142.88Z.0160.B00.1705082121"
+		#define SMB_PRODUCT_NAME	"MacBookPro14,2"
+		#define SMB_BOARD_PRODUCT	"Mac-CAD6701F7CEA0921 "
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '4', ',', '2' }
+	#else // Defaults to MacBookPro14,3
+		// 15-inch with Touch Bar / Touch ID
+		// Intel Core i7-7700HQ 2.8 GHz (max Turbo Boost 3.8 GHz)
+		// Intel Core i7-7820HQ 2.9 GHz (max Turbo Boost 3.9 GHz)
+		// Intel Core i7-7920HQ 3.1 GHz (max Turbo Boost 4.1 GHz)
+		#define SMB_BIOS_VERSION	"MBP143.88Z.0160.B00.1705090111"
+		#define SMB_PRODUCT_NAME	"MacBookPro14,3"
+		#define SMB_BOARD_PRODUCT	"Mac-551B86E5744E2388"
+		#define EFI_MODEL_NAME		{ 'M', 'a', 'c', 'B', 'o', 'o', 'k', 'P', 'r', 'o', '1', '4', ',', '3' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From ffa14604924c287196cfc122f85d0b8ca93ba48e Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Tue, 6 Jun 2017 23:59:40 +0200
Subject: [PATCH 600/623] Update macOS name

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ea146b3..b8905d2 100644
--- a/Makefile
+++ b/Makefile
@@ -59,9 +59,9 @@ OS_TYPE = "OS\ X"
 
 ifeq ($(MAKECMDGOALS),)
 	#
-	# No OS build target given. Build for CodeName (default).
+	# No OS build target given. Build for High Sierra (default).
 	#
-	MAKEGOAL = codename
+	MAKEGOAL = high-sierra
 	MAKE_TARGET_OS = 254;
 	MAKE_TARGET_OS_VER = 10.13
         OS_TYPE = "macOS"
@@ -69,8 +69,8 @@ else
 	#
 	# Setting MAKE_TARGET_OS and MAKEGOAL based on OS build target.
 	#
-	ifeq ($(MAKECMDGOALS), codename)
-		MAKEGOAL = codename
+	ifeq ($(MAKECMDGOALS), high-sierra)
+		MAKEGOAL = high-sierra
 		MAKE_TARGET_OS = 254;
 		MAKE_TARGET_OS_VER = 10.13
                 OS_TYPE = "macOS"

From 3fc3c668ebfe390c0f68efed73b1acef1558d202 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Wed, 7 Jun 2017 00:00:40 +0200
Subject: [PATCH 601/623] Fix macOS name and add new model data

---
 i386/libsaio/platform.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index ffd6c66..76257e2 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -33,7 +33,7 @@
 #define YOSEMITE				26	// Yosemite (includes Lion and Mavericks changes).
 #define EL_CAPITAN				62	// El Capitan (includes Lion/Mavericks and Yosemite changes).
 #define SIERRA					126	// Sierra (includes Lion/Mavericks/Yosemite and El Capitan changes).
-#define CODENAME				254	// CodeName (includes Lion/Mavericks/Yosemite/El Capitan and Sierra changes).
+#define HIGH_SIERRA				254	// High Sierra (includes Lion/Mavericks/Yosemite/El Capitan and Sierra changes).
 
 //------------------------------------------------------------------------------
 
@@ -82,8 +82,10 @@
 #define IMAC_152				(IMAC | (12 << 15))
 #define IMAC_161				(IMAC | (13 << 15))
 #define IMAC_162				(IMAC | (14 << 15))
-#define IMAC_181				(IMAC | (15 << 15))
-#define IMAC_171				 IMAC						// Defaults to iMac17,1
+#define IMAC_171				(IMAC | (15 << 15))
+#define IMAC_181				(IMAC | (16 << 15))
+#define IMAC_182				(IMAC | (17 << 15))
+#define IMAC_183				 IMAC						// Defaults to iMac18,3
 
 #define MACBOOK_41				(MACBOOK | ( 1 << 15))
 #define MACBOOK_81				(MACBOOK | ( 2 << 15))
@@ -115,7 +117,10 @@
 #define MACBOOK_PRO_121			(MACBOOK_PRO | (14 << 15))
 #define MACBOOK_PRO_131			(MACBOOK_PRO | (15 << 15))
 #define MACBOOK_PRO_132			(MACBOOK_PRO | (16 << 15))
-#define MACBOOK_PRO_133			 MACBOOK_PRO				// Defaults to MacBookPro13,3
+#define MACBOOK_PRO_133			(MACBOOK_PRO | (17 << 15))
+#define MACBOOK_PRO_141			(MACBOOK_PRO | (18 << 15))
+#define MACBOOK_PRO_142			(MACBOOK_PRO | (19 << 15))
+#define MACBOOK_PRO_143			 MACBOOK_PRO				// Defaults to MacBookPro14,3
 
 #define MACMINI_41				(MACMINI | (1 << 15))
 #define MACMINI_51				(MACMINI | (2 << 15))

From 0ae4d48ce402089f2c847bde702ff5092d3629c3 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Tue, 13 Jun 2017 14:00:22 +0200
Subject: [PATCH 602/623] High Sierra installer fix.

---
 i386/libsaio/stringTable.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/stringTable.c b/i386/libsaio/stringTable.c
index 1575848..1d9ca20 100755
--- a/i386/libsaio/stringTable.c
+++ b/i386/libsaio/stringTable.c
@@ -380,7 +380,11 @@ long loadCABootPlist(void)
 #endif
 
 #if INSTALL_ESD_SUPPORT
+	#if ((MAKE_TARGET_OS & HIGH_SIERRA) == HIGH_SIERRA)
+		"macOS Install Data/Locked Files/Boot Files",
+	#else
 		"macOS Install Data",
+	#endif
 		"OS X Install Data",
 		".IABootFiles",
 		"Mac OS X Install Data",
@@ -435,7 +439,7 @@ long loadCABootPlist(void)
 			if (retValue == EFI_SUCCESS)
 			{
 #if INSTALL_ESD_SUPPORT
-				if (i > start && i < end)
+				if (i >= start && i < end)
 				{
 					// Installation data directory located
 					gPlatform.BootVolume->flags = kBVFlagInstallVolume;

From 6162c15f5d59036881e227bd61553734a4e07fcd Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Tue, 13 Jun 2017 14:00:46 +0200
Subject: [PATCH 603/623] Add missing script.

---
 c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/c b/c
index 1928ec4..c55419b 100755
--- a/c
+++ b/c
@@ -1,3 +1,58 @@
-sudo cp sym/i386/boot /Volumes/$1/
-sudo diskutil unmount /Volumes/$1
+#!/bin/sh
 
+#
+# Bash script executed from: RevoBoot/i386/boot2/Makefile
+#
+#
+# Version 1.1 - Copyright (c) 2013-2017 by Pike R. Alpha
+#
+# Updates:
+#		- v1.1 Improved output (Pike R. Alpha, June 2017).	
+#
+
+let index=0
+
+#
+# Collect available volume name.
+#
+targetVolumes=($(ls /Volumes | sort))
+
+echo "\nAvailable target volumes:\n"
+
+for volume in "${targetVolumes[@]}"
+do
+    echo "[$index] $volume"
+    let index++
+done
+
+echo ""
+
+#
+# Ask to select a target volume.
+#
+read -p "Select a target volume for the boot file: " volumeNumber
+
+#
+# Verify selection.
+#
+if [ $volumeNumber -gt $index ];
+  then
+    printf "\nError: Invalid Option ($volumeNumber)!\nAborting ...\n"
+    exit 0
+  else
+    echo "Copying RevoBoot/sym/i386/boot to: /Volumes/${targetVolumes[$volumeNumber]}/"
+    sudo cp ../../sym/i386/boot "/Volumes/${targetVolumes[$volumeNumber]}/"
+    #
+    # Compare files.
+    #
+    cmp -s ../../sym/i386/boot /Volumes/${targetVolumes[$volumeNumber]}/boot
+    #
+    # Check status (zero is ok).
+    #
+    if [[ $? -ne 0 ]];
+      then
+        echo "Error: Copying boot file failed!"
+      else
+        echo "Done!"
+    fi 
+fi

From 14809f77ef59f8f1217bb38e40d65dc15618f357 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Tue, 13 Jun 2017 14:01:34 +0200
Subject: [PATCH 604/623] Call copy script from Makefile.

---
 i386/boot2/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 4e12262..6d11e76 100644
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -84,6 +84,8 @@ boot:	$(OBJS)
 		exit 1;\
 	else \
 		echo "=========== boot is $$size bytes ============"; \
-	fi)
+	fi) \
+
+	@../../c
 
 include ../MakeInc.dir

From 6545cc2d8561aedfb8d89d028bc2195f07071614 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Tue, 13 Jun 2017 14:02:26 +0200
Subject: [PATCH 605/623] Adding a forgotten update.

---
 i386/libsaio/smbios/smbios.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/i386/libsaio/smbios/smbios.h b/i386/libsaio/smbios/smbios.h
index 3ff3953..c28c1b0 100755
--- a/i386/libsaio/smbios/smbios.h
+++ b/i386/libsaio/smbios/smbios.h
@@ -110,6 +110,7 @@ enum {
     kSMBTypeOemProcessorType            = 131,
     kSMBTypeOemProcessorBusSpeed        = 132,
 	kSMBTypeOemPlatformFeature          = 133,
+	kSMBTypeOemSMCVersion				= 134,
 
 	// Structures dropped by RevoBoot.
 	kSMBUnused							= 255

From 2535cf254897a6957b8bfec6794a4023d0a228ea Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Tue, 13 Jun 2017 14:03:03 +0200
Subject: [PATCH 606/623] More SMBIOS data updates.

---
 i386/libsaio/smbios/model_data.h | 41 +++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 924a84b..708737d 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -39,7 +39,7 @@
 		// Intel Core i5-750 @ 2.66 GHz - 4 cores / 4 threads
 		// Intel Core i7-860 @ 2.80 GHz - 4 cores / 8 threads
 		// ATI Radeon HD 4850
-		#define SMB_BIOS_VERSION	"IM111.88Z.0034.B04.1509231906"
+		#define SMB_BIOS_VERSION	"IM111.88Z.0034.B12.1705021416"
 		#define SMB_PRODUCT_NAME	"iMac11,1"
 		#define SMB_BOARD_PRODUCT	"Mac-F2268DAE"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '1', ',', '1' }
@@ -49,7 +49,7 @@
 		// Intel Core i5-2500S @ 2.70 GHz - 4 cores / 4 threads
 		// Intel Core i7-2600S @ 2.80 GHz - 4 cores / 8 threads
 		// AMD Radeon HD 6750M & AMD Radeon HD 6770M
-		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B23.1510261412"
+		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B33.1705101231"
 		#define SMB_PRODUCT_NAME	"iMac12,1"
 		#define SMB_BOARD_PRODUCT	"Mac-942B5BF58194151B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '1' }
@@ -58,7 +58,7 @@
 		// Intel Core i5-2500S @ 2.70 GHz - 4 cores / 4 threads
 		// Intel Core i7-2600 @ 3.40 GHz - 4 cores / 8 threads
 		// AMD Radeon HD 6770M & AMD Radeon HD 6970M
-		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B23.1510261412"
+		#define SMB_BIOS_VERSION	"IM121.88Z.0047.B33.1705101231"
 		#define SMB_PRODUCT_NAME	"iMac12,2"
 		#define SMB_BOARD_PRODUCT	"Mac-942B59F58194171B"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '2', ',', '2' }
@@ -67,7 +67,7 @@
 		// Intel Core i5-3470S @ 2.90 GHz - 4 cores / 4 threads
 		// Intel Core i7-3770S @ 3.10 GHz - 4 cores / 8 threads
 		// NVIDIA GeForce GT 640M & NVIDIA GeForce GT 650M
-		#define SMB_BIOS_VERSION	"IM131.88Z.010A.B09.1509111558"
+		#define SMB_BIOS_VERSION	"IM131.88Z.010A.B1C.1705011311"
 		#define SMB_PRODUCT_NAME	"iMac13,1"
 		#define SMB_BOARD_PRODUCT	"Mac-00BE6ED71E35EB86"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '1' }
@@ -76,21 +76,21 @@
 		// Intel Core i5-3470 @ 3.2 GHz - 4 cores / 4 threads
 		// Intel Core i7-3770 @ 3.4 GHz - 4 cores / 8 threads
 		// NVIDIA GeForce GTX 660M, NVIDIA GeForce GTX 675MX & NVIDIA GeForce GTX 680MX
-		#define SMB_BIOS_VERSION	"IM131.88Z.010A.B09.1509111558"
+		#define SMB_BIOS_VERSION	"IM131.88Z.010A.B1C.1705011311"
 		#define SMB_PRODUCT_NAME	"iMac13,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FC02E91DDD3FA6A4"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '2' }
 	#elif (TARGET_MODEL == IMAC_133) // 21.5-inch, Early 2013 (Education)
 		// Intel Core i3-3225 @ 3.30 GHz - 2 cores / 4 threads
 		// Intel HD Graphics 4000
-		#define SMB_BIOS_VERSION	"IM131.88Z.010A.B09.1509111558"
+		#define SMB_BIOS_VERSION	"IM131.88Z.010A.B1C.1705011311"
 		#define SMB_PRODUCT_NAME	"iMac13,3"
 		#define SMB_BOARD_PRODUCT	"Mac-7DF2A3B5E5D671ED"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '3', ',', '3' }
 	#elif (TARGET_MODEL == IMAC_141) // 21.5-inch, Late 2013
 		// Intel Core i5-4570R @ 2.70 GHz - 4 cores / 4 threads
 		// Intel Iris Pro Graphics 5200
-		#define SMB_BIOS_VERSION	"IM141.88Z.0118.B13.1602221714"
+		#define SMB_BIOS_VERSION	"IM141.88Z.0118.B46.1705011412"
 		#define SMB_PRODUCT_NAME	"iMac14,1"
 		#define SMB_BOARD_PRODUCT	"Mac-031B6874CF7F642A"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '1' }
@@ -99,7 +99,7 @@
 		// Intel Core i5-4670 @ 3.40 GHz - 4 cores / 4 threads
 		// Intel Core i7-4771 @ 3.50 GHz - 4 cores / 8 threads
 		// NVIDIA GeForce GT 755M, NVIDIA GeForce GTX 775M & NVIDIA GeForce GTX 780M
-		#define SMB_BIOS_VERSION	"IM142.88Z.0118.B13.1602221716"
+		#define SMB_BIOS_VERSION	"IM142.88Z.0118.B46.1705011513"
 		#define SMB_PRODUCT_NAME	"iMac14,2"
 		#define SMB_BOARD_PRODUCT	"Mac-27ADBB7B4CEE8E61"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '2' }
@@ -114,7 +114,7 @@
 	#elif (TARGET_MODEL == IMAC_144) // 21.5-inch, Mid 2014
 		// Intel Core i5-4260U @ 1.40 GHz - 2 cores / 4 threads
 		// Intel HD Graphics 5000
-		#define SMB_BIOS_VERSION	"IM144.88Z.0179.B13.1602221719"
+		#define SMB_BIOS_VERSION	"IM144.88Z.0179.B30.1705011718"
 		#define SMB_PRODUCT_NAME	"iMac14,4"
 		#define SMB_BOARD_PRODUCT	"Mac-81E3E92DD6088272"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '4', ',', '4' }
@@ -122,21 +122,21 @@
 		// Intel Core i5-4690 @ 3.50 GHz - 4 cores / 4 threads
 		// Intel Core i7-4790K @ 4.00 GHz - 4 cores / 8 threads
 		// AMD Radeon R9 M290X, AMD Radeon R9 M295X
-		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B07.1607221823"
+		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B26.1705011718"
 		#define SMB_PRODUCT_NAME	"iMac15,1"
 		#define SMB_BOARD_PRODUCT	"Mac-42FD25EABCABB274"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '1' }
 	#elif (TARGET_MODEL == IMAC_152) // Retina 5K, 27-inch, Mid 2015
 		// Intel Core i5-4590 @ 3.30 GHz - 4 cores / 4 threads
 		// AMD Radeon R9 M290
-		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B07.1607221823"
+		#define SMB_BIOS_VERSION	"IM151.88Z.0207.B26.1705011718"
 		#define SMB_PRODUCT_NAME	"iMac15,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FA842E06C61E91C5"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '5', ',', '2' }
 	#elif (TARGET_MODEL == IMAC_161) // 21.5-inch, Late 2015
 		// Intel Core i5-5250U @ 1.60 GHz - 2 cores / 4 threads
 		// Intel HD Graphics 6000
-		#define SMB_BIOS_VERSION	"IM161.88Z.0207.B03.1602181033"
+		#define SMB_BIOS_VERSION	"IM161.88Z.0207.B19.1705011046"
 		#define SMB_PRODUCT_NAME	"iMac16,1"
 		#define SMB_BOARD_PRODUCT	"Mac-A369DDC4E67F1C45"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '6', ',', '1' }
@@ -145,14 +145,14 @@
 		// Intel Core i5-5675R @ 3.10 GHz - 4 cores / 4 threads
 		// Intel Core i7-5775R @ 3.30 GHz - 4 cores / 8 threads
 		// Intel Iris Pro Graphics 6200
-		#define SMB_BIOS_VERSION	"IM162.88Z.0206.B01.1607221823"
+		#define SMB_BIOS_VERSION	"IM162.88Z.0206.B19.1705011413"
 		#define SMB_PRODUCT_NAME	"iMac16,2"
 		#define SMB_BOARD_PRODUCT	"Mac-FFE5EF870D7BA81A"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '6', ',', '2' }
 	#elif (TARGET_MODEL == IMAC_171) // (Retina 5K, 27-inch, Late 2015)
 		// Intel Core i5-6500 @ 3.20 GHz - 4 cores / 4 threads
 		// AMD Radeon R9 M380
-		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B09.1607221343"
+		#define SMB_BIOS_VERSION	"IM171.88Z.0105.B25.1704292104"
 		#define SMB_PRODUCT_NAME	"iMac17,1"
 		#define SMB_BOARD_PRODUCT	"Mac-65CE76090165799A"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '7', ',', '1' }
@@ -498,3 +498,16 @@
 	#endif
 // -------------------------------------------------------------------------------------
 #endif
+
+#if TARGET_MODEL & IMACPRO														// 64
+// -------------------------------------------------------------------------------------
+	#define SMB_FAMILY	"iMacPro"
+
+	#if (TARGET_MODEL == IMACPRO_10)
+		#define SMB_BIOS_VERSION	"IMP10.88Z.0058.B00.1705091711"
+		#define SMB_PRODUCT_NAME	"iMacPro1,1"
+		#define SMB_BOARD_PRODUCT	"Mac-CF21D135A7D34AA6"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', 'P', 'r', 'o', '1', ',', '0' }
+	#endif
+// -------------------------------------------------------------------------------------
+#endif

From 3b8b3492d3ce515ccbef13d513a4bf23345b4a6f Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Tue, 13 Jun 2017 14:03:26 +0200
Subject: [PATCH 607/623] High Sierra compatibility.

---
 i386/libsaio/bootstruct.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index e39998d..69623f4 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -315,7 +315,14 @@ typedef struct boot_args_new
 	uint16_t		bootProgressMeterEnd;
 #endif
 
-#if ((MAKE_TARGET_OS & SIERRA) == SIERRA)				// Sierra only.
+#if ((MAKE_TARGET_OS & HIGH_SIERRA) == HIGH_SIERRA)		// High Sierra only.
+	Boot_Video_V2	Video_V2;							// Video V2 Information (with a 64-bit v_baseAddr).
+
+	uint32_t		apfsDataStart;						// Physical address of apfs volume key structure.
+	uint32_t		apfsDataSize;
+
+	uint32_t		__reserved4[710];
+#elif ((MAKE_TARGET_OS & SIERRA) == SIERRA)				// Sierra only.
 	Boot_Video_V2	Video_V2;							// Video V2 Information (with a 64-bit v_baseAddr).
 
 	uint32_t		__reserved4[712];

From 1debc5ea5c21da8102d81a52bfe8d4ae14b3d66b Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Tue, 13 Jun 2017 14:04:37 +0200
Subject: [PATCH 608/623] High Sierra Installer fix.

---
 i386/libsaio/bootstruct.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index 8f15e4f..5061fbf 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -128,11 +128,11 @@ void initKernelBootConfig(void)
 #endif // #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
 
 #if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN) // El Capitan and Sierra
-	bootArgs->flags							|= (kBootArgsFlagCSRConfigMode + kBootArgsFlagCSRBoot);
+	bootArgs->flags							|= (kBootArgsFlagCSRActiveConfig + kBootArgsFlagCSRConfigMode + kBootArgsFlagCSRBoot + kBootArgsFlagInstallUI);
 
 	bootArgs->csrActiveConfig				= CSR_ALLOW_DEVICE_CONFIGURATION;
 
-	bootArgs->csrCapabilities				= CSR_CAPABILITY_UNLIMITED;
+	bootArgs->csrCapabilities				= CSR_VALID_FLAGS; // CSR_CAPABILITY_UNLIMITED;
 
 	bootArgs->boot_SMC_plimit				= 0;
 

From 35a183bea91ede7929984a3b8145bd00c4cde8da Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Tue, 13 Jun 2017 14:07:03 +0200
Subject: [PATCH 609/623] WIP SMBIOS changes.

---
 i386/libsaio/smbios/dynamic_data.h | 70 +++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index 3acb01f..b59cb27 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -252,7 +252,7 @@ void setupSMBIOS(void)
 	SMBWord handle = 1;
 
 	//------------------------------------------------------------------------------
-	// Add SMBOemProcessorType structure.
+	// Add SMBOemProcessorType structure (131)
 
 	struct SMBStructHeader * newHeader = (struct SMBStructHeader *) newtablesPtr;
 
@@ -269,7 +269,41 @@ void setupSMBIOS(void)
 	newtablesPtr += 8;
 
 	//------------------------------------------------------------------------------
-	// Add SMBOemProcessorBusSpeed structure (when we have something to inject).
+	// Add SMBFirmwareVolume structure (128).
+	
+	newHeader = (struct SMBStructHeader *) newtablesPtr;
+
+	newHeader->type		= kSMBTypeFirmwareVolume;
+	newHeader->length	= 6;
+	newHeader->handle	= handle;
+
+	newtablesPtr += 4;
+
+	struct SMBFirmwareVolume * firmwareVolume = (struct SMBFirmwareVolume *) newtablesPtr;
+
+	firmwareVolume->RegionCount				= 1;
+	firmwareVolume->Reserved[0]				= 0x00;
+	firmwareVolume->Reserved[1]				= 0x00;
+	firmwareVolume->Reserved[2]				= 0x00;
+	firmwareVolume->FirmwareFeatures		= 0xC003FF37;	// getFirmwareFeatures();
+	firmwareVolume->FirmwareFeaturesMask	= 0xFFFFFFFF;	// getFirmwareFeaturesEx();
+	firmwareVolume->RegionType[0]			= FW_REGION_MAIN;
+	firmwareVolume->RegionType[1]			= FW_REGION_RESERVED;
+	firmwareVolume->RegionType[2]			= FW_REGION_RESERVED;
+	firmwareVolume->RegionType[3]			= FW_REGION_RESERVED;
+	firmwareVolume->RegionType[4]			= FW_REGION_RESERVED;
+	firmwareVolume->RegionType[5]			= FW_REGION_RESERVED;
+	firmwareVolume->RegionType[6]			= FW_REGION_RESERVED;
+	firmwareVolume->RegionType[7]			= FW_REGION_RESERVED;
+	
+	// Update EPS
+	newEPS->dmi.tableLength += sizeof(firmwareVolume);
+	newEPS->dmi.structureCount++;
+	
+	newtablesPtr += sizeof(firmwareVolume);
+
+	//------------------------------------------------------------------------------
+	// Add SMBOemProcessorBusSpeed structure (132/when we have something to inject).
 
 	if (gPlatform.CPU.QPISpeed)
 	{
@@ -287,6 +321,38 @@ void setupSMBIOS(void)
 
 		newtablesPtr += 8;
 	}
+	
+	//------------------------------------------------------------------------------
+	// Add SMBOemPlatformFeature structure (133).
+	
+	newHeader = (struct SMBStructHeader *) newtablesPtr;
+		
+	newHeader->type		= kSMBTypeOemPlatformFeature;
+	newHeader->length	= 6;
+	newHeader->handle	= ++handle;
+		
+	*((uint16_t *)(((char *)newHeader) + 4)) = 0xFFFF;
+		
+	// Update EPS
+	newEPS->dmi.tableLength += 8;
+	newEPS->dmi.structureCount++;
+		
+	newtablesPtr += 8;
+	
+	/*------------------------------------------------------------------------------
+	// Add SMBOemSMCVersion structure (134).
+	
+	newHeader = (struct SMBStructHeader *) newtablesPtr;
+	
+	newHeader->type		= kSMBTypeOemSMCVersion;
+	newHeader->length	= 6;
+	newHeader->handle	= ++handle;
+	
+	// Update EPS
+	newEPS->dmi.tableLength += 8;
+	newEPS->dmi.structureCount++;
+	
+	newtablesPtr += 8; */
 
 #if (STATIC_RAM_OVERRIDE_ERROR_HANDLE || STATIC_RAM_OVERRIDE_SIZE || STATIC_RAM_OVERRIDE_TYPE || STATIC_RAM_OVERRIDE_FREQUENCY)
 	requiredStructures[17].stop = (sizeof(SMBProperties) / sizeof(SMBProperties[0])) -1;

From cf3da97001c8827f7726616c42f76d33724a6b1c Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Wed, 14 Jun 2017 07:14:13 +0200
Subject: [PATCH 610/623] Updating script to v1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Fix typo.
– Ask to reboot
---
 c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/c b/c
index c55419b..4cb5f46 100755
--- a/c
+++ b/c
@@ -4,16 +4,17 @@
 # Bash script executed from: RevoBoot/i386/boot2/Makefile
 #
 #
-# Version 1.1 - Copyright (c) 2013-2017 by Pike R. Alpha
+# Version 1.2 - Copyright (c) 2013-2017 by Pike R. Alpha
 #
 # Updates:
 #		- v1.1 Improved output (Pike R. Alpha, June 2017).	
-#
+#               - v1.2 Fix typo (Pike R. Alpha, June 2017).
+#               -      Now also asks if you want to reboot.
 
 let index=0
 
 #
-# Collect available volume name.
+# Collect available volume names.
 #
 targetVolumes=($(ls /Volumes | sort))
 
@@ -53,6 +54,14 @@ if [ $volumeNumber -gt $index ];
       then
         echo "Error: Copying boot file failed!"
       else
-        echo "Done!"
+        echo ""
+        read -p "Do you want to reboot now (y/n) ?" shouldReboot
+
+        if [ $shouldReboot == "y" ];
+          then
+            sudo reboot now
+          else
+            echo "Done!"
+        fi
     fi 
 fi

From 7c0cd56cfd22d7cda27b0bdf2cb7e8a71282e461 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Wed, 14 Jun 2017 07:15:31 +0200
Subject: [PATCH 611/623] Adding a few new getters

---
 i386/libsaio/smbios/getters.h | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/getters.h b/i386/libsaio/smbios/getters.h
index 0d6008d..6117fbe 100755
--- a/i386/libsaio/smbios/getters.h
+++ b/i386/libsaio/smbios/getters.h
@@ -333,7 +333,7 @@ static const char * getBIOSDate(void)
 
 	const char * retValue = biosDate;
 
-	return retValue; // Example: "01/24/2012";
+	return "05/01/2017"; // retValue; // Example: "01/24/2012";
 }
 
 //==============================================================================
@@ -367,3 +367,24 @@ static SMBByte getBoardType(void)
 	return 0x0a;
 #endif
 }
+
+//==============================================================================
+
+static SMBDWord getFirmwareFeatures(void)
+{
+	return 0xE907F537;
+}
+
+//==============================================================================
+
+static SMBDWord getFirmwareFeaturesEx(void)
+{
+	return 0xFFFFFFFF;
+}
+
+//==============================================================================
+
+static SMBDWord getROMFeatures(void)
+{
+	return 0xFFFFFFFF;
+}

From 532e81238307562984da7e2e57194e5d108d3320 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Wed, 14 Jun 2017 07:21:45 +0200
Subject: [PATCH 612/623] Fixed SMBFirmwareVolume and moved some code

---
 i386/libsaio/smbios/dynamic_data.h | 104 ++++++++++++-----------------
 1 file changed, 43 insertions(+), 61 deletions(-)

diff --git a/i386/libsaio/smbios/dynamic_data.h b/i386/libsaio/smbios/dynamic_data.h
index b59cb27..f607040 100755
--- a/i386/libsaio/smbios/dynamic_data.h
+++ b/i386/libsaio/smbios/dynamic_data.h
@@ -8,17 +8,18 @@
  *			- Complete rewrite / overhaul by DHP in Februari 2011.
  *			- More work, including bug fixes by DHP in Februari 2011.
  *			- Do more with cleaner and faster code in less bytes (DHP in March 2012).
- *			- SMBIOS data logic moved to preprocessor code (PikerAlpha, October 2012).
- *			- SMBProperties changed for speed and simplicity (PikerAlpha, October 2012).
- *			- Calls with SMBProperties.keyString cleaned up (PikerAlpha, October 2012).
- *			- Fixed requiredStructures.start/stop values (PikerAlpha, October 2012).
- *			- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (PikerAlpha, October 2012).
- *			- Removed some unused experimental code snippets (PikerAlpha, November 2012).
- *			- Option SET_MAX_STRUCTURE_LENGTH to verify/fix newEPS->maxStructureSize (PikerAlpha, November 2012).
- *			- Allow DEBUG_SMBIOS = 2 to filter out some of the output (PikerAlpha, November 2012).
- *			- Pre-compiler directive PROBOARD removed, which is required for iMessage (PikerAlpha, January 2013).
- *			- SMBStructure.start[2] was 13 but should have been 11 (PikerAlpha, January 2013).
- *			- Override factory SystemID when (PikerAlpha, January 2013).
+ *			- SMBIOS data logic moved to preprocessor code (Pike R. Alpha, October 2012).
+ *			- SMBProperties changed for speed and simplicity (Pike R. Alpha, October 2012).
+ *			- Calls with SMBProperties.keyString cleaned up (Pike R. Alpha, October 2012).
+ *			- Fixed requiredStructures.start/stop values (Pike R. Alpha, October 2012).
+ *			- STATIC_SMSERIALNUMBER renamed to SMB_SYSTEM_SERIAL_NUMBER (Pike R. Alpha, October 2012).
+ *			- Removed some unused experimental code snippets (Pike R. Alpha, November 2012).
+ *			- Option SET_MAX_STRUCTURE_LENGTH to verify/fix newEPS->maxStructureSize (Pike R. Alpha, November 2012).
+ *			- Allow DEBUG_SMBIOS = 2 to filter out some of the output (Pike R. Alpha, November 2012).
+ *			- Pre-compiler directive PROBOARD removed, which is required for iMessage (Pike R. Alpha, January 2013).
+ *			- SMBStructure.start[2] was 13 but should have been 11 (Pike R. Alpha, January 2013).
+ *			- Override factory SystemID when (Pike R. Alpha, January 2013).
+  *			- Add table type 128 for High Sierra (Pike R. Alpha, June 2017).
  *
  * Credits:
  *			- Kabyl (see notes in source code)
@@ -271,36 +272,34 @@ void setupSMBIOS(void)
 	//------------------------------------------------------------------------------
 	// Add SMBFirmwareVolume structure (128).
 	
-	newHeader = (struct SMBStructHeader *) newtablesPtr;
+	struct SMBFirmwareVolume * firmwareVolume = (struct SMBFirmwareVolume *) newtablesPtr;
 
-	newHeader->type		= kSMBTypeFirmwareVolume;
-	newHeader->length	= 6;
-	newHeader->handle	= handle;
+	bzero(firmwareVolume, sizeof(struct SMBFirmwareVolume));
 
-	newtablesPtr += 4;
+	firmwareVolume->header.type				= kSMBTypeFirmwareVolume;
+	firmwareVolume->header.length			= sizeof(struct SMBFirmwareVolume);
+	firmwareVolume->header.handle			= ++handle;
 
-	struct SMBFirmwareVolume * firmwareVolume = (struct SMBFirmwareVolume *) newtablesPtr;
-
-	firmwareVolume->RegionCount				= 1;
-	firmwareVolume->Reserved[0]				= 0x00;
-	firmwareVolume->Reserved[1]				= 0x00;
-	firmwareVolume->Reserved[2]				= 0x00;
-	firmwareVolume->FirmwareFeatures		= 0xC003FF37;	// getFirmwareFeatures();
-	firmwareVolume->FirmwareFeaturesMask	= 0xFFFFFFFF;	// getFirmwareFeaturesEx();
-	firmwareVolume->RegionType[0]			= FW_REGION_MAIN;
+	firmwareVolume->RegionCount				= (SMBByte) 1;
+	firmwareVolume->Reserved[0]				= (SMBByte) 0;
+	firmwareVolume->Reserved[1]				= (SMBByte) 0;
+	firmwareVolume->Reserved[2]				= (SMBByte) 0;
+	firmwareVolume->FirmwareFeatures		= getFirmwareFeatures();
+	firmwareVolume->FirmwareFeaturesMask	= getFirmwareFeaturesEx();
+	/* firmwareVolume->RegionType[0]			= FW_REGION_MAIN;
 	firmwareVolume->RegionType[1]			= FW_REGION_RESERVED;
 	firmwareVolume->RegionType[2]			= FW_REGION_RESERVED;
 	firmwareVolume->RegionType[3]			= FW_REGION_RESERVED;
 	firmwareVolume->RegionType[4]			= FW_REGION_RESERVED;
 	firmwareVolume->RegionType[5]			= FW_REGION_RESERVED;
 	firmwareVolume->RegionType[6]			= FW_REGION_RESERVED;
-	firmwareVolume->RegionType[7]			= FW_REGION_RESERVED;
-	
+	firmwareVolume->RegionType[7]			= FW_REGION_RESERVED; */
+
 	// Update EPS
-	newEPS->dmi.tableLength += sizeof(firmwareVolume);
+	newEPS->dmi.tableLength += sizeof(struct SMBFirmwareVolume) + 2;
 	newEPS->dmi.structureCount++;
 	
-	newtablesPtr += sizeof(firmwareVolume);
+	newtablesPtr += sizeof(struct SMBFirmwareVolume) + 2;
 
 	//------------------------------------------------------------------------------
 	// Add SMBOemProcessorBusSpeed structure (132/when we have something to inject).
@@ -322,38 +321,6 @@ void setupSMBIOS(void)
 		newtablesPtr += 8;
 	}
 	
-	//------------------------------------------------------------------------------
-	// Add SMBOemPlatformFeature structure (133).
-	
-	newHeader = (struct SMBStructHeader *) newtablesPtr;
-		
-	newHeader->type		= kSMBTypeOemPlatformFeature;
-	newHeader->length	= 6;
-	newHeader->handle	= ++handle;
-		
-	*((uint16_t *)(((char *)newHeader) + 4)) = 0xFFFF;
-		
-	// Update EPS
-	newEPS->dmi.tableLength += 8;
-	newEPS->dmi.structureCount++;
-		
-	newtablesPtr += 8;
-	
-	/*------------------------------------------------------------------------------
-	// Add SMBOemSMCVersion structure (134).
-	
-	newHeader = (struct SMBStructHeader *) newtablesPtr;
-	
-	newHeader->type		= kSMBTypeOemSMCVersion;
-	newHeader->length	= 6;
-	newHeader->handle	= ++handle;
-	
-	// Update EPS
-	newEPS->dmi.tableLength += 8;
-	newEPS->dmi.structureCount++;
-	
-	newtablesPtr += 8; */
-
 #if (STATIC_RAM_OVERRIDE_ERROR_HANDLE || STATIC_RAM_OVERRIDE_SIZE || STATIC_RAM_OVERRIDE_TYPE || STATIC_RAM_OVERRIDE_FREQUENCY)
 	requiredStructures[17].stop = (sizeof(SMBProperties) / sizeof(SMBProperties[0])) -1;
 #endif
@@ -600,6 +567,21 @@ void setupSMBIOS(void)
   
 	newtablesPtr += 0x0E;
 
+	/*------------------------------------------------------------------------------
+	 // Add SMBOemSMCVersion structure (134).
+	 
+	 newHeader = (struct SMBStructHeader *) newtablesPtr;
+	 
+	 newHeader->type		= kSMBTypeOemSMCVersion;
+	 newHeader->length	= 6;
+	 newHeader->handle	= ++handle;
+	 
+	 // Update EPS
+	 newEPS->dmi.tableLength += 8;
+	 newEPS->dmi.structureCount++;
+	 
+	 newtablesPtr += 8; */
+
 	//------------------------------------------------------------------------------
 	// Add EndOfTable structure.
 

From 32b9377762a55266324c597abe1139c8a0d1f354 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Wed, 14 Jun 2017 07:34:14 +0200
Subject: [PATCH 613/623] Quick messy patch for High Sierra

---
 i386/libsaio/patcher.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/i386/libsaio/patcher.c b/i386/libsaio/patcher.c
index 81d8396..7f3692b 100755
--- a/i386/libsaio/patcher.c
+++ b/i386/libsaio/patcher.c
@@ -105,7 +105,9 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 #if PRELINKED_KERNEL_SUPPORT
 	// struct segment_command_64 * vldSegment = (struct segment_command_64 *)vldSegmentAddress;
 	
-	targetSections |= 25;
+	// targetSections |= 25;	// El Capitan
+	// targetSections |= 26;	// Sierra
+	targetSections |= 27;		// High Sierra
 #endif
 
 	void * stringTable = (void *)(loadAddress + symtab->stroff);
@@ -177,10 +179,17 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 	}
 	else
 	{
+#if PRELINKED_KERNEL_SUPPORT
+		//
+		// Yes. Enable patche: _xcpm_SMT_scope_msrs(16), _xcpm_pkg_scope_msrs(64), __ZN12KLDBootstrap21readStartupExtensionsEv(128)
+		//
+		targetPatches += 208;
+#else
 		//
-		// No. Enabling a limited patch set.
+		// No. Enabling a limited patch set: _xcpm_SMT_scope_msrs(16), _xcpm_pkg_scope_msrs(64)
 		//
 		targetPatches += 80;
+#endif
 	}
 #endif // #if (PATCH_KERNEL_XCPM && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
 
@@ -392,12 +401,14 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 			}
 		}
 #if PRELINKED_KERNEL_SUPPORT
-		else if (nl->n_sect == 25 && nl->n_value && (targetSections & nl->n_sect))	// __KLD,__text
+		else if (/* nl->n_sect == 27 && */ nl->n_value /* && (targetSections & nl->n_sect) */)	// __KLD,__text
 		{
 			symbolName = (char *)stringTable + nl->n_un.n_strx;
-			
-			if ((targetPatches & 128) && strcmp(symbolName, "__ZN12KLDBootstrap21readStartupExtensionsEv") == 0)
+
+			if (/* (targetPatches & 128) && */ strcmp(symbolName, "__ZN12KLDBootstrap21readStartupExtensionsEv") == 0)
 			{
+				printf("nl->n_sect: %ld\n", nl->n_sect);
+
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				uint64_t endAddress = (startAddress + 0x3f);
@@ -416,7 +427,7 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 						// Disable this section.
 						//
 						p = (unsigned char *)endAddress;
-						targetPatches -= 128;
+						// targetPatches -= 128;
 						targetSections -= nl->n_sect;
 					}
 				}

From 0f15ebe1442d8743d0f67f33a3a0f41f70e779a3 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@Chiefs-iMac.local>
Date: Mon, 3 Jul 2017 01:13:41 +0200
Subject: [PATCH 614/623] iMac now defaults to iMac19,1

---
 i386/libsaio/platform.h          | 3 ++-
 i386/libsaio/smbios/model_data.h | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/platform.h b/i386/libsaio/platform.h
index 76257e2..b66030f 100644
--- a/i386/libsaio/platform.h
+++ b/i386/libsaio/platform.h
@@ -85,7 +85,8 @@
 #define IMAC_171				(IMAC | (15 << 15))
 #define IMAC_181				(IMAC | (16 << 15))
 #define IMAC_182				(IMAC | (17 << 15))
-#define IMAC_183				 IMAC						// Defaults to iMac18,3
+#define IMAC_183				(IMAC | (18 << 15))
+#define IMAC_191				 IMAC						// Defaults to iMac19,1
 
 #define MACBOOK_41				(MACBOOK | ( 1 << 15))
 #define MACBOOK_81				(MACBOOK | ( 2 << 15))
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index 708737d..e7820d1 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -166,11 +166,16 @@
 		#define SMB_PRODUCT_NAME	"iMac18,2"
 		#define SMB_BOARD_PRODUCT	"Mac-77F17D7DA9285301"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '8', ',', '2' }
-	#else // Defaults to iMac18,3 Retina 5K, 27-inch, 2017
+	#elif (TARGET_MODEL == IMAC_183) // Defaults to iMac18,3 Retina 5K, 27-inch, 2017
 		#define SMB_BIOS_VERSION	"IM183.88Z.0145.B07.1705082121"
 		#define SMB_PRODUCT_NAME	"iMac18,3"
 		#define SMB_BOARD_PRODUCT	"Mac-BE088AF8C5EB4FA2"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '8', ',', '3' }
+	#else // Defaults to iMac19,1 Retina 5K, 27-inch, 2017
+		#define SMB_BIOS_VERSION	"IM191.88Z.0058.B00.1705091711"
+		#define SMB_PRODUCT_NAME	"iMac19,1"
+		#define SMB_BOARD_PRODUCT	"Mac-CF21D135A7D34AA6"
+		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '9', ',', '1' }
 	#endif
 // -------------------------------------------------------------------------------------
 #endif

From 52aca1b65129a73b58ca10bbce1417a78b94a166 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@Chiefs-iMac.local>
Date: Mon, 3 Jul 2017 01:14:07 +0200
Subject: [PATCH 615/623] More precise search pattern.

---
 i386/libsaio/patcher.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/libsaio/patcher.c b/i386/libsaio/patcher.c
index 7f3692b..acbb919 100755
--- a/i386/libsaio/patcher.c
+++ b/i386/libsaio/patcher.c
@@ -216,7 +216,9 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 				{
 					//
 					// Search pattern: 89 C3 48 85 DB 74 71 48 (in HexEdit)
+					// Search pattern: 89 C3 48 85 DB 74 69 48 8b 03 48 89 df ff 50 28 (in HexEdit for High Sierra DP1)
 					//
+					// if ((*(uint32_t *)p == 0x8548c389) && (*(uint16_t *)(p + 4) == 0x74db) && (*(uint8_t *)(p + 7) == 0x48) && (*(uint64_t *)(p + 8) == 0x2850ffdf8948038b))
 					if ((*(uint32_t *)p == 0x8548c389) && (*(uint16_t *)(p + 4) == 0x74db) && (*(uint8_t *)(p + 7) == 0x48))
 					{
 						DEBUG_PATCH_STATUS(symbolName, ((uint64_t)p - startAddress), 1)
@@ -407,8 +409,6 @@ long patchKernel(unsigned long loadAddress, unsigned long cmdBase, long listSize
 
 			if (/* (targetPatches & 128) && */ strcmp(symbolName, "__ZN12KLDBootstrap21readStartupExtensionsEv") == 0)
 			{
-				printf("nl->n_sect: %ld\n", nl->n_sect);
-
 				int64_t offset = (nl->n_value - textSegment->vmaddr);
 				uint64_t startAddress = (uint64_t)(textSegment->vmaddr + offset);
 				uint64_t endAddress = (startAddress + 0x3f);

From 5ed5d5659c46683a8f550b00290264bdc7806d2b Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@Chiefs-iMac.local>
Date: Mon, 3 Jul 2017 01:14:21 +0200
Subject: [PATCH 616/623] Fix extensions issue.

---
 i386/boot2/drivers.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index c760fb4..f904a94 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -384,6 +384,7 @@ static int loadKexts(char * targetFolder, bool isPluginRun)
 				// Show essential kexts.
 				if (!isPluginRun && ((strcmp(dirEntryName, "AppleEmulator.kext") == 0) ||
 									 (strcmp(dirEntryName, "FakeSMC.kext") == 0) ||
+ 									 (strcmp(dirEntryName, "AppleSMC.kext") == 0) ||
 									 (strcmp(dirEntryName, "IONVMeFamily.kext") == 0)))
 				{
 					printf("loadKext(%s) found\n", dirEntryName);
@@ -399,7 +400,7 @@ static int loadKexts(char * targetFolder, bool isPluginRun)
 				{
 					// Setup plug-ins path.
 					sprintf(gPlatform.KextFileSpec, "%s/%sPlugIns", gPlatform.KextFileName, (isBundleType2) ? "Contents/" : "");
-
+					
 // #if DEBUG_DRIVERS
 					if (strlen(gPlatform.KextFileSpec) >= MAX_KEXT_PATH_LENGTH)
 					{
@@ -808,7 +809,7 @@ static bool isLoadableInSafeBoot(char * OSBundleRequired)
 static long parseXML(char * buffer, ModulePtr * module, TagPtr * personalities)
 {
 	long       length, pos = 0;
-	TagPtr     moduleDict, required;
+	TagPtr     moduleDict, required, identifier;
 	ModulePtr  tmpModule;
   
 	while (1)
@@ -887,8 +888,17 @@ static long parseXML(char * buffer, ModulePtr * module, TagPtr * personalities)
 	// if ((required == 0) || (required->type != kTagTypeString) || !isLoadableInSafeBoot(required->string))
 	// if ( (required != NULL)  && (required->type == kTagTypeString) && !strcmp(required->string, "Safe Boot"))
 	{
-		XMLFreeTag(moduleDict);
-		return -2;
+		identifier = XMLGetProperty(moduleDict, "CFBundleIdentifier");
+		
+		if (strcmp(identifier->string, "com.apple.driver.AppleSMC") == 0)
+		{
+			_DRIVERS_DEBUG_DUMP("Forced load of: AppleSMC.kext\n");
+		}
+		else
+		{
+			XMLFreeTag(moduleDict);
+			return -2;
+		}
 	}
 
 	// tmpModule = (ModulePtr)malloc(sizeof(Module));

From ee72a32e8f93f9a393c0e3c78f46f6d65b1946d5 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@Chiefs-iMac.local>
Date: Mon, 31 Jul 2017 20:19:52 +0200
Subject: [PATCH 617/623] Helper tools

---
 fdisk440 | Bin 0 -> 89044 bytes
 i        |  71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100755 fdisk440
 create mode 100755 i

diff --git a/fdisk440 b/fdisk440
new file mode 100755
index 0000000000000000000000000000000000000000..f2d042f668b23d8d5dbb0ea3b56af152e61ddd19
GIT binary patch
literal 89044
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
Swjam&g2pG3M;A1%iTodb>7~H{

literal 0
HcmV?d00001

diff --git a/i b/i
new file mode 100755
index 0000000..608be42
--- /dev/null
+++ b/i
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+#
+# Bash script to install boot files.
+#
+#
+# Version 1.2 - Copyright (c) 2013-2017 by Pike R. Alpha
+#
+# Updates:
+#			- 1.1 Verbose output added.
+#			- 1.2 Check files/run nasm for missing boot files.
+#
+
+pwd=$(pwd)
+
+if [ ! -e i386/boot0/boot0 ];
+  then
+    cd i386/boot0
+    echo "Running nasm for boot0 ..."
+    nasm boot0.s -o boot0
+    cd "${pwd}"
+fi
+
+if [ ! -e i386/boot0/boot1h ];
+  then
+    cd "i386/boot1"
+    echo "Running nasm for boot1h ..."
+    nasm boot1h.s -o boot1h
+    cd "${pwd}"
+fi
+
+let index=0
+
+if [[ -e "i386/boot0/boot0" && -e "i386/boot1/boot1h" ]];
+  then
+    #
+    # Collect available volume names.
+    #
+    cd /Volumes/
+    targetVolumes=(*)
+    cd "${pwd}"
+
+    echo "\nAvailable target volumes:\n"
+
+    for volume in "${targetVolumes[@]}"
+      do
+        echo "[$index] $volume"
+        let index++
+      done
+
+    echo ""
+
+    #
+    # Ask to select a target volume.
+    #
+    read -p "Select a target volume for the boot files: " volumeNumber
+
+    #
+    # Path to target volume.
+    #
+    targetVolume="/Volumes/${targetVolumes[$volumeNumber]}"
+
+    #
+    # Get device identifier.
+    #
+    disk=$(diskutil info "${targetVolume}" | awk '$1$2$3 == "PartofWhole:" { print $4 }')
+
+    sudo ./fdisk440 -f i386/boot0/boot0 -u -y "/dev/r${disk}"
+
+    sudo dd if=i386/boot1/boot1h of="/dev/r${disk}s2"
+fi

From 328a5ed2f947d4118b93da96dc05a5f9dc971914 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@Chiefs-iMac.local>
Date: Mon, 31 Jul 2017 20:20:35 +0200
Subject: [PATCH 618/623] No more sleep after logo

---
 i386/boot2/boot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 9e021f8..797bac3 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -798,10 +798,10 @@ void boot(int biosdev)
 			// Did we switch to graphics mode yet (think verbose mode)?
 			if (gVerboseMode || bootArgs->Video_V1.v_display != GRAPHICS_MODE)
 			{
+				// _BOOT_DEBUG_SLEEP(5);
+
 				// Switch to graphics mode and show the (white) Apple logo on a black/gray background.
 				showBootLogo();
-				
-				_BOOT_DEBUG_SLEEP(5);
 			}
 
 			startMachKernel(kernelEntry, bootArgs); // asm.s

From ad921dfda9ebe7b6480b8ddd403496d6dc704025 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@Chiefs-iMac.local>
Date: Mon, 31 Jul 2017 20:21:07 +0200
Subject: [PATCH 619/623] Return BIOS date instead of a fixed value

---
 i386/libsaio/smbios/getters.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i386/libsaio/smbios/getters.h b/i386/libsaio/smbios/getters.h
index 6117fbe..6be3b51 100755
--- a/i386/libsaio/smbios/getters.h
+++ b/i386/libsaio/smbios/getters.h
@@ -333,7 +333,7 @@ static const char * getBIOSDate(void)
 
 	const char * retValue = biosDate;
 
-	return "05/01/2017"; // retValue; // Example: "01/24/2012";
+	return retValue; // Example: "01/24/2012";
 }
 
 //==============================================================================

From eb53c9abf026cd27effae2f40f2fcc4abf45cc1b Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <chief@Chiefs-iMac.local>
Date: Mon, 31 Jul 2017 20:22:48 +0200
Subject: [PATCH 620/623] Improved HS support

---
 i386/libsaio/bootstruct.c |  9 +++++---
 i386/libsaio/bootstruct.h | 44 +++++++++++++++++++++++++++++----------
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
index 5061fbf..7d05a14 100755
--- a/i386/libsaio/bootstruct.c
+++ b/i386/libsaio/bootstruct.c
@@ -127,12 +127,15 @@ void initKernelBootConfig(void)
 
 #endif // #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
 
-#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN) // El Capitan and Sierra
+#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN) // El Capitan, Sierra and High Sierra.
+	// csr_init()							checks for: kBootArgsFlagCSRActiveConfig and kBootArgsFlagCSRConfigMode
+	// csr_get_active_config()				checks for: kBootArgsFlagCSRActiveConfig
+	// csr_check(csr_config_t mask)			checks for: kBootArgsFlagCSRConfigMode
 	bootArgs->flags							|= (kBootArgsFlagCSRActiveConfig + kBootArgsFlagCSRConfigMode + kBootArgsFlagCSRBoot + kBootArgsFlagInstallUI);
 
-	bootArgs->csrActiveConfig				= CSR_ALLOW_DEVICE_CONFIGURATION;
+	bootArgs->csrActiveConfig				= CSR_ALWAYS_ENFORCED_FLAGS;
 
-	bootArgs->csrCapabilities				= CSR_VALID_FLAGS; // CSR_CAPABILITY_UNLIMITED;
+	bootArgs->csrCapabilities				= CSR_VALID_CAPABILITIES;
 
 	bootArgs->boot_SMC_plimit				= 0;
 
diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index 69623f4..c08994e 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -26,6 +26,7 @@
  *			- Yosemite support added (Pike R. Alpha, June 2014).
  *			- El Capitan support added (Pike R. Alpha, June 2015).
  *			- Sierra support added (Pike R. Alpha, August 2016).
+ *			- High Sierra support added (Pike R. Alpha, June 2017).
  */
 
 #ifndef __BOOTSTRUCT_H
@@ -111,8 +112,12 @@ typedef struct Boot_Video_V2	Boot_Video_V2;
 	#define kBootArgsFlagInstallUI			(1 << 8)	// 256
 #endif
 
+#ifndef kBootArgsFlagUnknownHS
+	#define kBootArgsFlagUnknownHS			(1 << 9)	// 512 (High Sierra only)
+#endif
+
+/* SIP (System Integrity Protection) booter configuration flags */
 #ifndef CSR_VALID_FLAGS
-	/* Rootless configuration flags */
 	#define CSR_ALLOW_UNTRUSTED_KEXTS		(1 << 0)	// 1
 	#define CSR_ALLOW_UNRESTRICTED_FS		(1 << 1)	// 2
 	#define CSR_ALLOW_TASK_FOR_PID			(1 << 2)	// 4
@@ -122,18 +127,35 @@ typedef struct Boot_Video_V2	Boot_Video_V2;
 	#define CSR_ALLOW_UNRESTRICTED_NVRAM	(1 << 6)	// 64
 	#define CSR_ALLOW_DEVICE_CONFIGURATION	(1 << 7)	// 128
 	#define CSR_ALLOW_ANY_RECOVERY_OS		(1 << 8)	// 256
-
-	#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
-			CSR_ALLOW_UNRESTRICTED_FS | \
-			CSR_ALLOW_TASK_FOR_PID | \
-			CSR_ALLOW_KERNEL_DEBUGGER | \
-			CSR_ALLOW_APPLE_INTERNAL | \
-			CSR_ALLOW_UNRESTRICTED_DTRACE | \
-			CSR_ALLOW_UNRESTRICTED_NVRAM | \
-			CSR_ALLOW_DEVICE_CONFIGURATION | \
-			CSR_ALLOW_ANY_RECOVERY_OS)
+	#define CSR_ALLOW_UNKNOWN_HS			(1 << 9)	// 512 (High Sierra only)
+
+	#if ((MAKE_TARGET_OS & HIGH_SIERRA) == HIGH_SIERRA)
+		#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
+				CSR_ALLOW_UNRESTRICTED_FS | \
+				CSR_ALLOW_TASK_FOR_PID | \
+				CSR_ALLOW_KERNEL_DEBUGGER | \
+				CSR_ALLOW_APPLE_INTERNAL | \
+				CSR_ALLOW_UNRESTRICTED_DTRACE | \
+				CSR_ALLOW_UNRESTRICTED_NVRAM | \
+				CSR_ALLOW_DEVICE_CONFIGURATION | \
+				CSR_ALLOW_ANY_RECOVERY_OS | \
+				CSR_ALLOW_UNKNOWN_HS)
+	#else
+		#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
+				CSR_ALLOW_UNRESTRICTED_FS | \
+				CSR_ALLOW_TASK_FOR_PID | \
+				CSR_ALLOW_KERNEL_DEBUGGER | \
+				CSR_ALLOW_APPLE_INTERNAL | \
+				CSR_ALLOW_UNRESTRICTED_DTRACE | \
+				CSR_ALLOW_UNRESTRICTED_NVRAM | \
+				CSR_ALLOW_DEVICE_CONFIGURATION | \
+				CSR_ALLOW_ANY_RECOVERY_OS)
+	#endif
 #endif
 
+/* Used in csr_check(csr_config_t mask) */
+#define CSR_ALWAYS_ENFORCED_FLAGS (CSR_ALLOW_DEVICE_CONFIGURATION | CSR_ALLOW_ANY_RECOVERY_OS)
+
 /* CSR capabilities that a booter can give to the system */
 #define CSR_CAPABILITY_UNLIMITED				(1 << 0)
 #define CSR_CAPABILITY_CONFIG					(1 << 1)

From 8cd99f49b4fbc4074e50be1928ff176677781265 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@Bryans-iMac.local>
Date: Fri, 15 Sep 2017 21:28:42 +0200
Subject: [PATCH 621/623] Updating script to v1.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Improved volume name support. Thanks to ‘M’.
---
 c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/c b/c
index 4cb5f46..de746e2 100755
--- a/c
+++ b/c
@@ -4,19 +4,36 @@
 # Bash script executed from: RevoBoot/i386/boot2/Makefile
 #
 #
-# Version 1.2 - Copyright (c) 2013-2017 by Pike R. Alpha
+# Version 1.3 - Copyright (c) 2013-2017 by Pike R. Alpha
 #
 # Updates:
-#		- v1.1 Improved output (Pike R. Alpha, June 2017).	
-#               - v1.2 Fix typo (Pike R. Alpha, June 2017).
-#               -      Now also asks if you want to reboot.
+#          - v1.1 Improved output (Pike R. Alpha, June 2017).
+#          - v1.2 Fix typo (Pike R. Alpha, June 2017).
+#          -      Now also asks if you want to reboot.
+#          - v1.3 Improved volume name support. Thanks to 'M':
+#          -      https://pikeralpha.wordpress.com/2017/06/22/script-to-upgrade-macos-high-sierra-dp1-to-dp2/#comment-10216
 
 let index=0
 
+#
+# Get currect working directory.
+#
+workingDirectory=$(pwd)
+
+#
+# Change additional shell optional behavior (expand unmatched names to a null string).
+#
+shopt -s nullglob
+
+#
+# Change to Volumes folder.
+#
+cd /Volumes
+
 #
 # Collect available volume names.
 #
-targetVolumes=($(ls /Volumes | sort))
+targetVolumes=(*)
 
 echo "\nAvailable target volumes:\n"
 
@@ -41,6 +58,7 @@ if [ $volumeNumber -gt $index ];
     printf "\nError: Invalid Option ($volumeNumber)!\nAborting ...\n"
     exit 0
   else
+    cd "${workingDirectory}"
     echo "Copying RevoBoot/sym/i386/boot to: /Volumes/${targetVolumes[$volumeNumber]}/"
     sudo cp ../../sym/i386/boot "/Volumes/${targetVolumes[$volumeNumber]}/"
     #

From bbf679eea70ef533b4290e4d4f43570272c48de7 Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@iMac-Pro.local>
Date: Fri, 13 Oct 2017 01:39:47 +0200
Subject: [PATCH 622/623] Whitespace changes and some minor changes.

---
 i386/boot2/boot.c                     | 12 ++++++++++++
 i386/boot2/drivers.c                  |  4 ++--
 i386/boot2/graphics.c                 | 10 ++++++++--
 i386/libsaio/bootstruct.h             |  4 ++--
 i386/libsaio/cpu/Intel/dynamic_data.h |  4 ++--
 i386/libsaio/cpu/essentials.h         |  6 +++++-
 6 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/i386/boot2/boot.c b/i386/boot2/boot.c
index 797bac3..0056cc6 100755
--- a/i386/boot2/boot.c
+++ b/i386/boot2/boot.c
@@ -340,6 +340,18 @@ void boot(int biosdev)
 
 					gPlatform.BootVolume->flags |= kBVFlagInstallVolume;
 				}
+				else if (getValueForBootKey(kernelFlags, "auth-root-dmg", &val, &length))
+				{
+					_BOOT_DEBUG_DUMP("Target auth-root-dmg=%s\n", val);
+
+					gPlatform.BootVolume->flags |= kBVFlagInstallVolume;
+				}
+				else if (getValueForBootKey(kernelFlags, "rp=file:///", &val, &length))
+				{
+					_BOOT_DEBUG_DUMP("Target rp=%s\n", val);
+
+					gPlatform.BootVolume->flags |= kBVFlagInstallVolume;
+				}
 				else
 				{
 					gPlatform.BootVolume->flags = ~kBVFlagInstallVolume;
diff --git a/i386/boot2/drivers.c b/i386/boot2/drivers.c
index f904a94..c675718 100755
--- a/i386/boot2/drivers.c
+++ b/i386/boot2/drivers.c
@@ -384,7 +384,7 @@ static int loadKexts(char * targetFolder, bool isPluginRun)
 				// Show essential kexts.
 				if (!isPluginRun && ((strcmp(dirEntryName, "AppleEmulator.kext") == 0) ||
 									 (strcmp(dirEntryName, "FakeSMC.kext") == 0) ||
- 									 (strcmp(dirEntryName, "AppleSMC.kext") == 0) ||
+									 (strcmp(dirEntryName, "AppleSMC.kext") == 0) ||
 									 (strcmp(dirEntryName, "IONVMeFamily.kext") == 0)))
 				{
 					printf("loadKext(%s) found\n", dirEntryName);
@@ -400,7 +400,7 @@ static int loadKexts(char * targetFolder, bool isPluginRun)
 				{
 					// Setup plug-ins path.
 					sprintf(gPlatform.KextFileSpec, "%s/%sPlugIns", gPlatform.KextFileName, (isBundleType2) ? "Contents/" : "");
-					
+
 // #if DEBUG_DRIVERS
 					if (strlen(gPlatform.KextFileSpec) >= MAX_KEXT_PATH_LENGTH)
 					{
diff --git a/i386/boot2/graphics.c b/i386/boot2/graphics.c
index 4c77f5b..3277b01 100755
--- a/i386/boot2/graphics.c
+++ b/i386/boot2/graphics.c
@@ -239,6 +239,12 @@ long setVESAGraphicsMode(unsigned short width, unsigned short height, unsigned c
 		{
 			break;
 		}
+#if DEBUG_BOOT_GRAPHICS
+		else
+		{
+			printf ("VESA Graphics mode: %d\n", mode);
+		}
+#endif
 
 		// Is this required for buggy Video BIOS implementations? If so for which adapter?
 		
@@ -250,8 +256,8 @@ long setVESAGraphicsMode(unsigned short width, unsigned short height, unsigned c
 		// Update bootArgs with the data provided by the selected VESA mode.
 		bootArgs->Video_V1.v_display	= GRAPHICS_MODE;
 		bootArgs->Video_V1.v_width		= minfo.XResolution;		/* Examples: 1920, 1600, 1680 */
-		bootArgs->Video_V1.v_height	= minfo.YResolution;		/* Examples: 1200, 1050 900 */
-		bootArgs->Video_V1.v_depth		= minfo.BitsPerPixel;		/* Examples: 8, 30, 32 */
+		bootArgs->Video_V1.v_height		= minfo.YResolution;		/* Examples: 1200, 1050 900 */
+		bootArgs->Video_V1.v_depth		= minfo.BitsPerPixel;		/* Examples: 8, 30, 32, 64 */
 		bootArgs->Video_V1.v_rowBytes	= minfo.BytesPerScanline;	/* Examples: 7680, 6720, 6400 */
 		bootArgs->Video_V1.v_baseAddr	= VBEMakeUInt32(minfo.PhysBasePtr);
 	}
diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
index c08994e..3281cb9 100755
--- a/i386/libsaio/bootstruct.h
+++ b/i386/libsaio/bootstruct.h
@@ -127,7 +127,7 @@ typedef struct Boot_Video_V2	Boot_Video_V2;
 	#define CSR_ALLOW_UNRESTRICTED_NVRAM	(1 << 6)	// 64
 	#define CSR_ALLOW_DEVICE_CONFIGURATION	(1 << 7)	// 128
 	#define CSR_ALLOW_ANY_RECOVERY_OS		(1 << 8)	// 256
-	#define CSR_ALLOW_UNKNOWN_HS			(1 << 9)	// 512 (High Sierra only)
+	#define CSR_ALLOW_UNAPPROVED_KEXTS		(1 << 9)	// 512 (High Sierra only)
 
 	#if ((MAKE_TARGET_OS & HIGH_SIERRA) == HIGH_SIERRA)
 		#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
@@ -139,7 +139,7 @@ typedef struct Boot_Video_V2	Boot_Video_V2;
 				CSR_ALLOW_UNRESTRICTED_NVRAM | \
 				CSR_ALLOW_DEVICE_CONFIGURATION | \
 				CSR_ALLOW_ANY_RECOVERY_OS | \
-				CSR_ALLOW_UNKNOWN_HS)
+				CSR_ALLOW_UNAPPROVED_KEXTS)
 	#else
 		#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
 				CSR_ALLOW_UNRESTRICTED_FS | \
diff --git a/i386/libsaio/cpu/Intel/dynamic_data.h b/i386/libsaio/cpu/Intel/dynamic_data.h
index 005ffb8..5b80535 100644
--- a/i386/libsaio/cpu/Intel/dynamic_data.h
+++ b/i386/libsaio/cpu/Intel/dynamic_data.h
@@ -406,7 +406,7 @@ void initCPUStruct(void)
 //				case CPU_MODEL_SKYLAKE_ULT:
 //				case CPU_MODEL_SKYLAKE_ULX:
 				case CPU_MODEL_SKYLAKE_DT:
-				case CPU_MODEL_SKYLAKE_X:
+				case CPU_MODEL_SKYLAKE_W:
 					CoreBridgeType = SKYLAKE;
 					hiBit = 31;
 					// gPlatform.CPU.ARTFrequency = (3427489466 * 2 / 284) = 24137249,76056338028169 MHz
@@ -588,7 +588,7 @@ void initCPUStruct(void)
 		}
 	}
 	
-#if DEBUG_CPU
+#if (DEBUG_CPU && INTEL_CORE_TECHNOLOGY == 0)
 	gPlatform.CPU.MaxCoef		= maxcoef;
 	gPlatform.CPU.MaxDiv		= maxdiv;
 	gPlatform.CPU.CurrCoef		= currcoef;
diff --git a/i386/libsaio/cpu/essentials.h b/i386/libsaio/cpu/essentials.h
index 65204a2..ebc8f03 100755
--- a/i386/libsaio/cpu/essentials.h
+++ b/i386/libsaio/cpu/essentials.h
@@ -198,12 +198,16 @@
 #define CPU_MODEL_SKYLAKE			0x4E
 #define CPU_MODEL_SKYLAKE_ULT		0x4E
 #define CPU_MODEL_SKYLAKE_ULX		0x4E
-#define CPU_MODEL_SKYLAKE_X			0x55
 #define CPU_MODEL_SKYLAKE_DT		0x5E
+#define CPU_MODEL_SKYLAKE_W			0x55
 
 #define CPU_MODEL_KABYLAKE			0x8E
+#define CPU_MODEL_KABYLAKE_ULT		0x8E
+#define CPU_MODEL_KABYLAKE_ULX		0x8E
 #define CPU_MODEL_KABYLAKE_DT		0x9E
 
+#define CPU_MODEL_CANNONLAKE		0x66
+
 #define DALES_BRIDGE	1
 #define SANDY_BRIDGE	2
 #define IVY_BRIDGE		4

From 613d72be66f09d9cec27913625a9fba63d197bfc Mon Sep 17 00:00:00 2001
From: "Pike R. Alpha" <bryan@iMac-Pro.local>
Date: Sun, 15 Oct 2017 13:16:18 +0200
Subject: [PATCH 623/623] Some minor changes carried over from another drive.

---
 i386/libsaio/load.c              |  2 +-
 i386/libsaio/smbios/getters.h    | 10 +++++++++-
 i386/libsaio/smbios/model_data.h |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/i386/libsaio/load.c b/i386/libsaio/load.c
index 9f8a579..4c0f76e 100755
--- a/i386/libsaio/load.c
+++ b/i386/libsaio/load.c
@@ -241,7 +241,7 @@ long decodeMachO(void *fileLoadBuffer, entry_t *rentry, char **raddr, int *rsize
 
 			case LC_SYMTAB:
 				initKernelVersionInfo(loadAddress, cmdBase, listSize, textSegmentAddress);
-#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN)
+#if (PATCH_KERNEL && ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN))
 				patchKernel(loadAddress, cmdBase, listSize, textSegmentAddress, vldSegmentAddress);
 #endif
 				break;
diff --git a/i386/libsaio/smbios/getters.h b/i386/libsaio/smbios/getters.h
index 6be3b51..17ae79e 100755
--- a/i386/libsaio/smbios/getters.h
+++ b/i386/libsaio/smbios/getters.h
@@ -372,7 +372,15 @@ static SMBByte getBoardType(void)
 
 static SMBDWord getFirmwareFeatures(void)
 {
-	return 0xE907F537;
+	return 0xE80FE137;
+	/*
+	 * With 0xE907F537 you'll get:
+	 *
+	 * OSInstaller[574]: ROM Features returned: 3909612855
+	 * OSInstaller[574]: ROM does not support APFS
+	 *
+	 * Note: It is bit-19 (0x80000) that adds support for APFS.
+	 */
 }
 
 //==============================================================================
diff --git a/i386/libsaio/smbios/model_data.h b/i386/libsaio/smbios/model_data.h
index e7820d1..50f2040 100644
--- a/i386/libsaio/smbios/model_data.h
+++ b/i386/libsaio/smbios/model_data.h
@@ -172,7 +172,7 @@
 		#define SMB_BOARD_PRODUCT	"Mac-BE088AF8C5EB4FA2"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '8', ',', '3' }
 	#else // Defaults to iMac19,1 Retina 5K, 27-inch, 2017
-		#define SMB_BIOS_VERSION	"IM191.88Z.0058.B00.1705091711"
+		#define SMB_BIOS_VERSION	"IM191.88Z.0058.B00.1708081711"
 		#define SMB_PRODUCT_NAME	"iMac19,1"
 		#define SMB_BOARD_PRODUCT	"Mac-CF21D135A7D34AA6"
 		#define EFI_MODEL_NAME		{ 'i', 'M', 'a', 'c', '1', '9', ',', '1' }